]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blob - test/3.14.2/grsecurity-3.0-3.14.2-201405041244.patch
projects / thirdparty / grsecurity-scrape.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
blame | history | raw | HEAD
Auto commit, grsecurity-3.1-4.9.16-201703180820.patch added.
[thirdparty/grsecurity-scrape.git] / test / 3.14.2 / grsecurity-3.0-3.14.2-201405041244.patch
1 diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2 index b89a739..e289b9b 100644
3 --- a/Documentation/dontdiff
4 +++ b/Documentation/dontdiff
5 @@ -2,9 +2,11 @@
6 *.aux
7 *.bin
8 *.bz2
9 +*.c.[012]*.*
10 *.cis
11 *.cpio
12 *.csp
13 +*.dbg
14 *.dsp
15 *.dvi
16 *.elf
17 @@ -14,6 +16,7 @@
18 *.gcov
19 *.gen.S
20 *.gif
21 +*.gmo
22 *.grep
23 *.grp
24 *.gz
25 @@ -48,14 +51,17 @@
26 *.tab.h
27 *.tex
28 *.ver
29 +*.vim
30 *.xml
31 *.xz
32 *_MODULES
33 +*_reg_safe.h
34 *_vga16.c
35 *~
36 \#*#
37 *.9
38 -.*
39 +.[^g]*
40 +.gen*
41 .*.d
42 .mm
43 53c700_d.h
44 @@ -69,9 +75,11 @@ Image
45 Module.markers
46 Module.symvers
47 PENDING
48 +PERF*
49 SCCS
50 System.map*
51 TAGS
52 +TRACEEVENT-CFLAGS
53 aconf
54 af_names.h
55 aic7*reg.h*
56 @@ -80,6 +88,7 @@ aic7*seq.h*
57 aicasm
58 aicdb.h*
59 altivec*.c
60 +ashldi3.S
61 asm-offsets.h
62 asm_offsets.h
63 autoconf.h*
64 @@ -92,32 +101,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 @@ -125,12 +142,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 @@ -145,14 +165,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 @@ -162,14 +182,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 @@ -185,6 +206,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 @@ -194,6 +217,7 @@ perf-archive
165 piggyback
166 piggy.gzip
167 piggy.S
168 +pmu-*
169 pnmtologo
170 ppc_defs.h*
171 pss_boot.h
172 @@ -203,7 +227,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 @@ -213,8 +242,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 @@ -224,6 +257,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 @@ -235,13 +269,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 @@ -249,9 +287,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 7116fda..d8ed6e8 100644
239 --- a/Documentation/kernel-parameters.txt
240 +++ b/Documentation/kernel-parameters.txt
241 @@ -1084,6 +1084,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 @@ -2080,6 +2084,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 @@ -2347,6 +2355,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 b2f7de8..9e2b63f 100644
291 --- a/Makefile
292 +++ b/Makefile
293 @@ -244,8 +244,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
294
295 HOSTCC = gcc
296 HOSTCXX = g++
297 -HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
298 -HOSTCXXFLAGS = -O2
299 +HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
300 +HOSTCFLAGS += $(call cc-option, -Wno-empty-body)
301 +HOSTCXXFLAGS = -O2 -Wall -W -Wno-array-bounds
302
303 # Decide whether to build built-in, modular, or both.
304 # Normally, just do built-in.
305 @@ -423,8 +424,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
306 # Rules shared between *config targets and build targets
307
308 # Basic helpers built in scripts/
309 -PHONY += scripts_basic
310 -scripts_basic:
311 +PHONY += scripts_basic gcc-plugins
312 +scripts_basic: gcc-plugins
313 $(Q)$(MAKE) $(build)=scripts/basic
314 $(Q)rm -f .tmp_quiet_recordmcount
315
316 @@ -585,6 +586,72 @@ else
317 KBUILD_CFLAGS += -O2
318 endif
319
320 +ifndef DISABLE_PAX_PLUGINS
321 +ifeq ($(call cc-ifversion, -ge, 0408, y), y)
322 +PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCXX)" "$(HOSTCXX)" "$(CC)")
323 +else
324 +PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(HOSTCXX)" "$(CC)")
325 +endif
326 +ifneq ($(PLUGINCC),)
327 +ifdef CONFIG_PAX_CONSTIFY_PLUGIN
328 +CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
329 +endif
330 +ifdef CONFIG_PAX_MEMORY_STACKLEAK
331 +STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
332 +STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
333 +endif
334 +ifdef CONFIG_KALLOCSTAT_PLUGIN
335 +KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
336 +endif
337 +ifdef CONFIG_PAX_KERNEXEC_PLUGIN
338 +KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
339 +KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
340 +KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
341 +endif
342 +ifdef CONFIG_GRKERNSEC_RANDSTRUCT
343 +RANDSTRUCT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/randomize_layout_plugin.so -DRANDSTRUCT_PLUGIN
344 +ifdef CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE
345 +RANDSTRUCT_PLUGIN_CFLAGS += -fplugin-arg-randomize_layout_plugin-performance-mode
346 +endif
347 +endif
348 +ifdef CONFIG_CHECKER_PLUGIN
349 +ifeq ($(call cc-ifversion, -ge, 0406, y), y)
350 +CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
351 +endif
352 +endif
353 +COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
354 +ifdef CONFIG_PAX_SIZE_OVERFLOW
355 +SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
356 +endif
357 +ifdef CONFIG_PAX_LATENT_ENTROPY
358 +LATENT_ENTROPY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/latent_entropy_plugin.so -DLATENT_ENTROPY_PLUGIN
359 +endif
360 +ifdef CONFIG_PAX_MEMORY_STRUCTLEAK
361 +STRUCTLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/structleak_plugin.so -DSTRUCTLEAK_PLUGIN
362 +endif
363 +GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
364 +GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS)
365 +GCC_PLUGINS_CFLAGS += $(SIZE_OVERFLOW_PLUGIN_CFLAGS) $(LATENT_ENTROPY_PLUGIN_CFLAGS) $(STRUCTLEAK_PLUGIN_CFLAGS)
366 +GCC_PLUGINS_CFLAGS += $(RANDSTRUCT_PLUGIN_CFLAGS)
367 +GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
368 +export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGINS_AFLAGS CONSTIFY_PLUGIN LATENT_ENTROPY_PLUGIN_CFLAGS
369 +ifeq ($(KBUILD_EXTMOD),)
370 +gcc-plugins:
371 + $(Q)$(MAKE) $(build)=tools/gcc
372 +else
373 +gcc-plugins: ;
374 +endif
375 +else
376 +gcc-plugins:
377 +ifeq ($(call cc-ifversion, -ge, 0405, y), y)
378 + $(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.))
379 +else
380 + $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
381 +endif
382 + $(Q)echo "PAX_MEMORY_STACKLEAK, constification, PAX_LATENT_ENTROPY and other features will be less secure. PAX_SIZE_OVERFLOW will not be active."
383 +endif
384 +endif
385 +
386 include $(srctree)/arch/$(SRCARCH)/Makefile
387
388 ifdef CONFIG_READABLE_ASM
389 @@ -779,7 +846,7 @@ export mod_sign_cmd
390
391
392 ifeq ($(KBUILD_EXTMOD),)
393 -core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
394 +core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
395
396 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
397 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
398 @@ -828,6 +895,8 @@ endif
399
400 # The actual objects are generated when descending,
401 # make sure no implicit rule kicks in
402 +$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
403 +$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
404 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
405
406 # Handle descending into subdirectories listed in $(vmlinux-dirs)
407 @@ -837,7 +906,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
408 # Error messages still appears in the original language
409
410 PHONY += $(vmlinux-dirs)
411 -$(vmlinux-dirs): prepare scripts
412 +$(vmlinux-dirs): gcc-plugins prepare scripts
413 $(Q)$(MAKE) $(build)=$@
414
415 define filechk_kernel.release
416 @@ -880,10 +949,13 @@ prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
417
418 archprepare: archheaders archscripts prepare1 scripts_basic
419
420 +prepare0: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
421 +prepare0: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
422 prepare0: archprepare FORCE
423 $(Q)$(MAKE) $(build)=.
424
425 # All the preparing..
426 +prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
427 prepare: prepare0
428
429 # Generate some files
430 @@ -991,6 +1063,8 @@ all: modules
431 # using awk while concatenating to the final file.
432
433 PHONY += modules
434 +modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
435 +modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
436 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
437 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
438 @$(kecho) ' Building modules, stage 2.';
439 @@ -1006,7 +1080,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
440
441 # Target to prepare building external modules
442 PHONY += modules_prepare
443 -modules_prepare: prepare scripts
444 +modules_prepare: gcc-plugins prepare scripts
445
446 # Target to install modules
447 PHONY += modules_install
448 @@ -1072,7 +1146,8 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
449 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
450 signing_key.priv signing_key.x509 x509.genkey \
451 extra_certificates signing_key.x509.keyid \
452 - signing_key.x509.signer
453 + signing_key.x509.signer tools/gcc/size_overflow_hash.h \
454 + tools/gcc/randomize_layout_seed.h
455
456 # clean - Delete most, but leave enough to build external modules
457 #
458 @@ -1112,6 +1187,7 @@ distclean: mrproper
459 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
460 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
461 -o -name '.*.rej' \
462 + -o -name '.*.rej' -o -name '*.so' \
463 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
464 -type f -print | xargs rm -f
465
466 @@ -1273,6 +1349,8 @@ PHONY += $(module-dirs) modules
467 $(module-dirs): crmodverdir $(objtree)/Module.symvers
468 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
469
470 +modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
471 +modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
472 modules: $(module-dirs)
473 @$(kecho) ' Building modules, stage 2.';
474 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
475 @@ -1412,17 +1490,21 @@ else
476 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
477 endif
478
479 -%.s: %.c prepare scripts FORCE
480 +%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
481 +%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
482 +%.s: %.c gcc-plugins prepare scripts FORCE
483 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
484 %.i: %.c prepare scripts FORCE
485 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
486 -%.o: %.c prepare scripts FORCE
487 +%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
488 +%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
489 +%.o: %.c gcc-plugins prepare scripts FORCE
490 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
491 %.lst: %.c prepare scripts FORCE
492 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
493 -%.s: %.S prepare scripts FORCE
494 +%.s: %.S gcc-plugins prepare scripts FORCE
495 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
496 -%.o: %.S prepare scripts FORCE
497 +%.o: %.S gcc-plugins prepare scripts FORCE
498 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
499 %.symtypes: %.c prepare scripts FORCE
500 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
501 @@ -1432,11 +1514,15 @@ endif
502 $(cmd_crmodverdir)
503 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
504 $(build)=$(build-dir)
505 -%/: prepare scripts FORCE
506 +%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
507 +%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
508 +%/: gcc-plugins prepare scripts FORCE
509 $(cmd_crmodverdir)
510 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
511 $(build)=$(build-dir)
512 -%.ko: prepare scripts FORCE
513 +%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
514 +%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
515 +%.ko: gcc-plugins prepare scripts FORCE
516 $(cmd_crmodverdir)
517 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
518 $(build)=$(build-dir) $(@:.ko=.o)
519 diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
520 index 78b03ef..da28a51 100644
521 --- a/arch/alpha/include/asm/atomic.h
522 +++ b/arch/alpha/include/asm/atomic.h
523 @@ -292,6 +292,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
524 #define atomic_dec(v) atomic_sub(1,(v))
525 #define atomic64_dec(v) atomic64_sub(1,(v))
526
527 +#define atomic64_read_unchecked(v) atomic64_read(v)
528 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
529 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
530 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
531 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
532 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
533 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
534 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
535 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
536 +
537 #define smp_mb__before_atomic_dec() smp_mb()
538 #define smp_mb__after_atomic_dec() smp_mb()
539 #define smp_mb__before_atomic_inc() smp_mb()
540 diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
541 index ad368a9..fbe0f25 100644
542 --- a/arch/alpha/include/asm/cache.h
543 +++ b/arch/alpha/include/asm/cache.h
544 @@ -4,19 +4,19 @@
545 #ifndef __ARCH_ALPHA_CACHE_H
546 #define __ARCH_ALPHA_CACHE_H
547
548 +#include <linux/const.h>
549
550 /* Bytes per L1 (data) cache line. */
551 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
552 -# define L1_CACHE_BYTES 64
553 # define L1_CACHE_SHIFT 6
554 #else
555 /* Both EV4 and EV5 are write-through, read-allocate,
556 direct-mapped, physical.
557 */
558 -# define L1_CACHE_BYTES 32
559 # define L1_CACHE_SHIFT 5
560 #endif
561
562 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
563 #define SMP_CACHE_BYTES L1_CACHE_BYTES
564
565 #endif
566 diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
567 index 968d999..d36b2df 100644
568 --- a/arch/alpha/include/asm/elf.h
569 +++ b/arch/alpha/include/asm/elf.h
570 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
571
572 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
573
574 +#ifdef CONFIG_PAX_ASLR
575 +#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
576 +
577 +#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
578 +#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
579 +#endif
580 +
581 /* $0 is set by ld.so to a pointer to a function which might be
582 registered using atexit. This provides a mean for the dynamic
583 linker to call DT_FINI functions for shared libraries that have
584 diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
585 index aab14a0..b4fa3e7 100644
586 --- a/arch/alpha/include/asm/pgalloc.h
587 +++ b/arch/alpha/include/asm/pgalloc.h
588 @@ -29,6 +29,12 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
589 pgd_set(pgd, pmd);
590 }
591
592 +static inline void
593 +pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
594 +{
595 + pgd_populate(mm, pgd, pmd);
596 +}
597 +
598 extern pgd_t *pgd_alloc(struct mm_struct *mm);
599
600 static inline void
601 diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
602 index d8f9b7e..f6222fa 100644
603 --- a/arch/alpha/include/asm/pgtable.h
604 +++ b/arch/alpha/include/asm/pgtable.h
605 @@ -102,6 +102,17 @@ struct vm_area_struct;
606 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
607 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
608 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
609 +
610 +#ifdef CONFIG_PAX_PAGEEXEC
611 +# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
612 +# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
613 +# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
614 +#else
615 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
616 +# define PAGE_COPY_NOEXEC PAGE_COPY
617 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
618 +#endif
619 +
620 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
621
622 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
623 diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
624 index 2fd00b7..cfd5069 100644
625 --- a/arch/alpha/kernel/module.c
626 +++ b/arch/alpha/kernel/module.c
627 @@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
628
629 /* The small sections were sorted to the end of the segment.
630 The following should definitely cover them. */
631 - gp = (u64)me->module_core + me->core_size - 0x8000;
632 + gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
633 got = sechdrs[me->arch.gotsecindex].sh_addr;
634
635 for (i = 0; i < n; i++) {
636 diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
637 index 1402fcc..0b1abd2 100644
638 --- a/arch/alpha/kernel/osf_sys.c
639 +++ b/arch/alpha/kernel/osf_sys.c
640 @@ -1298,10 +1298,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
641 generic version except that we know how to honor ADDR_LIMIT_32BIT. */
642
643 static unsigned long
644 -arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
645 - unsigned long limit)
646 +arch_get_unmapped_area_1(struct file *filp, unsigned long addr, unsigned long len,
647 + unsigned long limit, unsigned long flags)
648 {
649 struct vm_unmapped_area_info info;
650 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
651
652 info.flags = 0;
653 info.length = len;
654 @@ -1309,6 +1310,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
655 info.high_limit = limit;
656 info.align_mask = 0;
657 info.align_offset = 0;
658 + info.threadstack_offset = offset;
659 return vm_unmapped_area(&info);
660 }
661
662 @@ -1341,20 +1343,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
663 merely specific addresses, but regions of memory -- perhaps
664 this feature should be incorporated into all ports? */
665
666 +#ifdef CONFIG_PAX_RANDMMAP
667 + if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
668 +#endif
669 +
670 if (addr) {
671 - addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
672 + addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(addr), len, limit, flags);
673 if (addr != (unsigned long) -ENOMEM)
674 return addr;
675 }
676
677 /* Next, try allocating at TASK_UNMAPPED_BASE. */
678 - addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
679 - len, limit);
680 + addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(current->mm->mmap_base), len, limit, flags);
681 +
682 if (addr != (unsigned long) -ENOMEM)
683 return addr;
684
685 /* Finally, try allocating in low memory. */
686 - addr = arch_get_unmapped_area_1 (PAGE_SIZE, len, limit);
687 + addr = arch_get_unmapped_area_1 (filp, PAGE_SIZE, len, limit, flags);
688
689 return addr;
690 }
691 diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
692 index 98838a0..b304fb4 100644
693 --- a/arch/alpha/mm/fault.c
694 +++ b/arch/alpha/mm/fault.c
695 @@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
696 __reload_thread(pcb);
697 }
698
699 +#ifdef CONFIG_PAX_PAGEEXEC
700 +/*
701 + * PaX: decide what to do with offenders (regs->pc = fault address)
702 + *
703 + * returns 1 when task should be killed
704 + * 2 when patched PLT trampoline was detected
705 + * 3 when unpatched PLT trampoline was detected
706 + */
707 +static int pax_handle_fetch_fault(struct pt_regs *regs)
708 +{
709 +
710 +#ifdef CONFIG_PAX_EMUPLT
711 + int err;
712 +
713 + do { /* PaX: patched PLT emulation #1 */
714 + unsigned int ldah, ldq, jmp;
715 +
716 + err = get_user(ldah, (unsigned int *)regs->pc);
717 + err |= get_user(ldq, (unsigned int *)(regs->pc+4));
718 + err |= get_user(jmp, (unsigned int *)(regs->pc+8));
719 +
720 + if (err)
721 + break;
722 +
723 + if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
724 + (ldq & 0xFFFF0000U) == 0xA77B0000U &&
725 + jmp == 0x6BFB0000U)
726 + {
727 + unsigned long r27, addr;
728 + unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
729 + unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
730 +
731 + addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
732 + err = get_user(r27, (unsigned long *)addr);
733 + if (err)
734 + break;
735 +
736 + regs->r27 = r27;
737 + regs->pc = r27;
738 + return 2;
739 + }
740 + } while (0);
741 +
742 + do { /* PaX: patched PLT emulation #2 */
743 + unsigned int ldah, lda, br;
744 +
745 + err = get_user(ldah, (unsigned int *)regs->pc);
746 + err |= get_user(lda, (unsigned int *)(regs->pc+4));
747 + err |= get_user(br, (unsigned int *)(regs->pc+8));
748 +
749 + if (err)
750 + break;
751 +
752 + if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
753 + (lda & 0xFFFF0000U) == 0xA77B0000U &&
754 + (br & 0xFFE00000U) == 0xC3E00000U)
755 + {
756 + unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
757 + unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
758 + unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
759 +
760 + regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
761 + regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
762 + return 2;
763 + }
764 + } while (0);
765 +
766 + do { /* PaX: unpatched PLT emulation */
767 + unsigned int br;
768 +
769 + err = get_user(br, (unsigned int *)regs->pc);
770 +
771 + if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
772 + unsigned int br2, ldq, nop, jmp;
773 + unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
774 +
775 + addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
776 + err = get_user(br2, (unsigned int *)addr);
777 + err |= get_user(ldq, (unsigned int *)(addr+4));
778 + err |= get_user(nop, (unsigned int *)(addr+8));
779 + err |= get_user(jmp, (unsigned int *)(addr+12));
780 + err |= get_user(resolver, (unsigned long *)(addr+16));
781 +
782 + if (err)
783 + break;
784 +
785 + if (br2 == 0xC3600000U &&
786 + ldq == 0xA77B000CU &&
787 + nop == 0x47FF041FU &&
788 + jmp == 0x6B7B0000U)
789 + {
790 + regs->r28 = regs->pc+4;
791 + regs->r27 = addr+16;
792 + regs->pc = resolver;
793 + return 3;
794 + }
795 + }
796 + } while (0);
797 +#endif
798 +
799 + return 1;
800 +}
801 +
802 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
803 +{
804 + unsigned long i;
805 +
806 + printk(KERN_ERR "PAX: bytes at PC: ");
807 + for (i = 0; i < 5; i++) {
808 + unsigned int c;
809 + if (get_user(c, (unsigned int *)pc+i))
810 + printk(KERN_CONT "???????? ");
811 + else
812 + printk(KERN_CONT "%08x ", c);
813 + }
814 + printk("\n");
815 +}
816 +#endif
817
818 /*
819 * This routine handles page faults. It determines the address,
820 @@ -133,8 +251,29 @@ retry:
821 good_area:
822 si_code = SEGV_ACCERR;
823 if (cause < 0) {
824 - if (!(vma->vm_flags & VM_EXEC))
825 + if (!(vma->vm_flags & VM_EXEC)) {
826 +
827 +#ifdef CONFIG_PAX_PAGEEXEC
828 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
829 + goto bad_area;
830 +
831 + up_read(&mm->mmap_sem);
832 + switch (pax_handle_fetch_fault(regs)) {
833 +
834 +#ifdef CONFIG_PAX_EMUPLT
835 + case 2:
836 + case 3:
837 + return;
838 +#endif
839 +
840 + }
841 + pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
842 + do_group_exit(SIGKILL);
843 +#else
844 goto bad_area;
845 +#endif
846 +
847 + }
848 } else if (!cause) {
849 /* Allow reads even for write-only mappings */
850 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
851 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
852 index 1594945..adf4001 100644
853 --- a/arch/arm/Kconfig
854 +++ b/arch/arm/Kconfig
855 @@ -1862,7 +1862,7 @@ config ALIGNMENT_TRAP
856
857 config UACCESS_WITH_MEMCPY
858 bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
859 - depends on MMU
860 + depends on MMU && !PAX_MEMORY_UDEREF
861 default y if CPU_FEROCEON
862 help
863 Implement faster copy_to_user and clear_user methods for CPU
864 @@ -2125,6 +2125,7 @@ config XIP_PHYS_ADDR
865 config KEXEC
866 bool "Kexec system call (EXPERIMENTAL)"
867 depends on (!SMP || PM_SLEEP_SMP)
868 + depends on !GRKERNSEC_KMEM
869 help
870 kexec is a system call that implements the ability to shutdown your
871 current kernel, and to start another kernel. It is like a reboot
872 diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
873 index 62d2cb5..09d45e3 100644
874 --- a/arch/arm/include/asm/atomic.h
875 +++ b/arch/arm/include/asm/atomic.h
876 @@ -18,17 +18,35 @@
877 #include <asm/barrier.h>
878 #include <asm/cmpxchg.h>
879
880 +#ifdef CONFIG_GENERIC_ATOMIC64
881 +#include <asm-generic/atomic64.h>
882 +#endif
883 +
884 #define ATOMIC_INIT(i) { (i) }
885
886 #ifdef __KERNEL__
887
888 +#define _ASM_EXTABLE(from, to) \
889 +" .pushsection __ex_table,\"a\"\n"\
890 +" .align 3\n" \
891 +" .long " #from ", " #to"\n" \
892 +" .popsection"
893 +
894 /*
895 * On ARM, ordinary assignment (str instruction) doesn't clear the local
896 * strex/ldrex monitor on some implementations. The reason we can use it for
897 * atomic_set() is the clrex or dummy strex done on every exception return.
898 */
899 #define atomic_read(v) (*(volatile int *)&(v)->counter)
900 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
901 +{
902 + return v->counter;
903 +}
904 #define atomic_set(v,i) (((v)->counter) = (i))
905 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
906 +{
907 + v->counter = i;
908 +}
909
910 #if __LINUX_ARM_ARCH__ >= 6
911
912 @@ -44,6 +62,36 @@ static inline void atomic_add(int i, atomic_t *v)
913
914 prefetchw(&v->counter);
915 __asm__ __volatile__("@ atomic_add\n"
916 +"1: ldrex %1, [%3]\n"
917 +" adds %0, %1, %4\n"
918 +
919 +#ifdef CONFIG_PAX_REFCOUNT
920 +" bvc 3f\n"
921 +"2: bkpt 0xf103\n"
922 +"3:\n"
923 +#endif
924 +
925 +" strex %1, %0, [%3]\n"
926 +" teq %1, #0\n"
927 +" bne 1b"
928 +
929 +#ifdef CONFIG_PAX_REFCOUNT
930 +"\n4:\n"
931 + _ASM_EXTABLE(2b, 4b)
932 +#endif
933 +
934 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
935 + : "r" (&v->counter), "Ir" (i)
936 + : "cc");
937 +}
938 +
939 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
940 +{
941 + unsigned long tmp;
942 + int result;
943 +
944 + prefetchw(&v->counter);
945 + __asm__ __volatile__("@ atomic_add_unchecked\n"
946 "1: ldrex %0, [%3]\n"
947 " add %0, %0, %4\n"
948 " strex %1, %0, [%3]\n"
949 @@ -62,6 +110,42 @@ static inline int atomic_add_return(int i, atomic_t *v)
950 smp_mb();
951
952 __asm__ __volatile__("@ atomic_add_return\n"
953 +"1: ldrex %1, [%3]\n"
954 +" adds %0, %1, %4\n"
955 +
956 +#ifdef CONFIG_PAX_REFCOUNT
957 +" bvc 3f\n"
958 +" mov %0, %1\n"
959 +"2: bkpt 0xf103\n"
960 +"3:\n"
961 +#endif
962 +
963 +" strex %1, %0, [%3]\n"
964 +" teq %1, #0\n"
965 +" bne 1b"
966 +
967 +#ifdef CONFIG_PAX_REFCOUNT
968 +"\n4:\n"
969 + _ASM_EXTABLE(2b, 4b)
970 +#endif
971 +
972 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
973 + : "r" (&v->counter), "Ir" (i)
974 + : "cc");
975 +
976 + smp_mb();
977 +
978 + return result;
979 +}
980 +
981 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
982 +{
983 + unsigned long tmp;
984 + int result;
985 +
986 + smp_mb();
987 +
988 + __asm__ __volatile__("@ atomic_add_return_unchecked\n"
989 "1: ldrex %0, [%3]\n"
990 " add %0, %0, %4\n"
991 " strex %1, %0, [%3]\n"
992 @@ -83,6 +167,36 @@ static inline void atomic_sub(int i, atomic_t *v)
993
994 prefetchw(&v->counter);
995 __asm__ __volatile__("@ atomic_sub\n"
996 +"1: ldrex %1, [%3]\n"
997 +" subs %0, %1, %4\n"
998 +
999 +#ifdef CONFIG_PAX_REFCOUNT
1000 +" bvc 3f\n"
1001 +"2: bkpt 0xf103\n"
1002 +"3:\n"
1003 +#endif
1004 +
1005 +" strex %1, %0, [%3]\n"
1006 +" teq %1, #0\n"
1007 +" bne 1b"
1008 +
1009 +#ifdef CONFIG_PAX_REFCOUNT
1010 +"\n4:\n"
1011 + _ASM_EXTABLE(2b, 4b)
1012 +#endif
1013 +
1014 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1015 + : "r" (&v->counter), "Ir" (i)
1016 + : "cc");
1017 +}
1018 +
1019 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
1020 +{
1021 + unsigned long tmp;
1022 + int result;
1023 +
1024 + prefetchw(&v->counter);
1025 + __asm__ __volatile__("@ atomic_sub_unchecked\n"
1026 "1: ldrex %0, [%3]\n"
1027 " sub %0, %0, %4\n"
1028 " strex %1, %0, [%3]\n"
1029 @@ -101,11 +215,25 @@ static inline int atomic_sub_return(int i, atomic_t *v)
1030 smp_mb();
1031
1032 __asm__ __volatile__("@ atomic_sub_return\n"
1033 -"1: ldrex %0, [%3]\n"
1034 -" sub %0, %0, %4\n"
1035 +"1: ldrex %1, [%3]\n"
1036 +" subs %0, %1, %4\n"
1037 +
1038 +#ifdef CONFIG_PAX_REFCOUNT
1039 +" bvc 3f\n"
1040 +" mov %0, %1\n"
1041 +"2: bkpt 0xf103\n"
1042 +"3:\n"
1043 +#endif
1044 +
1045 " strex %1, %0, [%3]\n"
1046 " teq %1, #0\n"
1047 " bne 1b"
1048 +
1049 +#ifdef CONFIG_PAX_REFCOUNT
1050 +"\n4:\n"
1051 + _ASM_EXTABLE(2b, 4b)
1052 +#endif
1053 +
1054 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1055 : "r" (&v->counter), "Ir" (i)
1056 : "cc");
1057 @@ -138,6 +266,28 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
1058 return oldval;
1059 }
1060
1061 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1062 +{
1063 + unsigned long oldval, res;
1064 +
1065 + smp_mb();
1066 +
1067 + do {
1068 + __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1069 + "ldrex %1, [%3]\n"
1070 + "mov %0, #0\n"
1071 + "teq %1, %4\n"
1072 + "strexeq %0, %5, [%3]\n"
1073 + : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1074 + : "r" (&ptr->counter), "Ir" (old), "r" (new)
1075 + : "cc");
1076 + } while (res);
1077 +
1078 + smp_mb();
1079 +
1080 + return oldval;
1081 +}
1082 +
1083 #else /* ARM_ARCH_6 */
1084
1085 #ifdef CONFIG_SMP
1086 @@ -156,7 +306,17 @@ static inline int atomic_add_return(int i, atomic_t *v)
1087
1088 return val;
1089 }
1090 +
1091 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
1092 +{
1093 + return atomic_add_return(i, v);
1094 +}
1095 +
1096 #define atomic_add(i, v) (void) atomic_add_return(i, v)
1097 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
1098 +{
1099 + (void) atomic_add_return(i, v);
1100 +}
1101
1102 static inline int atomic_sub_return(int i, atomic_t *v)
1103 {
1104 @@ -171,6 +331,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
1105 return val;
1106 }
1107 #define atomic_sub(i, v) (void) atomic_sub_return(i, v)
1108 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
1109 +{
1110 + (void) atomic_sub_return(i, v);
1111 +}
1112
1113 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1114 {
1115 @@ -186,9 +350,18 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1116 return ret;
1117 }
1118
1119 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1120 +{
1121 + return atomic_cmpxchg(v, old, new);
1122 +}
1123 +
1124 #endif /* __LINUX_ARM_ARCH__ */
1125
1126 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1127 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1128 +{
1129 + return xchg(&v->counter, new);
1130 +}
1131
1132 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1133 {
1134 @@ -201,11 +374,27 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1135 }
1136
1137 #define atomic_inc(v) atomic_add(1, v)
1138 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1139 +{
1140 + atomic_add_unchecked(1, v);
1141 +}
1142 #define atomic_dec(v) atomic_sub(1, v)
1143 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1144 +{
1145 + atomic_sub_unchecked(1, v);
1146 +}
1147
1148 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1149 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1150 +{
1151 + return atomic_add_return_unchecked(1, v) == 0;
1152 +}
1153 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1154 #define atomic_inc_return(v) (atomic_add_return(1, v))
1155 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1156 +{
1157 + return atomic_add_return_unchecked(1, v);
1158 +}
1159 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1160 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1161
1162 @@ -221,6 +410,14 @@ typedef struct {
1163 long long counter;
1164 } atomic64_t;
1165
1166 +#ifdef CONFIG_PAX_REFCOUNT
1167 +typedef struct {
1168 + long long counter;
1169 +} atomic64_unchecked_t;
1170 +#else
1171 +typedef atomic64_t atomic64_unchecked_t;
1172 +#endif
1173 +
1174 #define ATOMIC64_INIT(i) { (i) }
1175
1176 #ifdef CONFIG_ARM_LPAE
1177 @@ -237,6 +434,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1178 return result;
1179 }
1180
1181 +static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1182 +{
1183 + long long result;
1184 +
1185 + __asm__ __volatile__("@ atomic64_read_unchecked\n"
1186 +" ldrd %0, %H0, [%1]"
1187 + : "=&r" (result)
1188 + : "r" (&v->counter), "Qo" (v->counter)
1189 + );
1190 +
1191 + return result;
1192 +}
1193 +
1194 static inline void atomic64_set(atomic64_t *v, long long i)
1195 {
1196 __asm__ __volatile__("@ atomic64_set\n"
1197 @@ -245,6 +455,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1198 : "r" (&v->counter), "r" (i)
1199 );
1200 }
1201 +
1202 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1203 +{
1204 + __asm__ __volatile__("@ atomic64_set_unchecked\n"
1205 +" strd %2, %H2, [%1]"
1206 + : "=Qo" (v->counter)
1207 + : "r" (&v->counter), "r" (i)
1208 + );
1209 +}
1210 #else
1211 static inline long long atomic64_read(const atomic64_t *v)
1212 {
1213 @@ -259,6 +478,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1214 return result;
1215 }
1216
1217 +static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1218 +{
1219 + long long result;
1220 +
1221 + __asm__ __volatile__("@ atomic64_read_unchecked\n"
1222 +" ldrexd %0, %H0, [%1]"
1223 + : "=&r" (result)
1224 + : "r" (&v->counter), "Qo" (v->counter)
1225 + );
1226 +
1227 + return result;
1228 +}
1229 +
1230 static inline void atomic64_set(atomic64_t *v, long long i)
1231 {
1232 long long tmp;
1233 @@ -273,6 +505,21 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1234 : "r" (&v->counter), "r" (i)
1235 : "cc");
1236 }
1237 +
1238 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1239 +{
1240 + long long tmp;
1241 +
1242 + prefetchw(&v->counter);
1243 + __asm__ __volatile__("@ atomic64_set_unchecked\n"
1244 +"1: ldrexd %0, %H0, [%2]\n"
1245 +" strexd %0, %3, %H3, [%2]\n"
1246 +" teq %0, #0\n"
1247 +" bne 1b"
1248 + : "=&r" (tmp), "=Qo" (v->counter)
1249 + : "r" (&v->counter), "r" (i)
1250 + : "cc");
1251 +}
1252 #endif
1253
1254 static inline void atomic64_add(long long i, atomic64_t *v)
1255 @@ -284,6 +531,37 @@ static inline void atomic64_add(long long i, atomic64_t *v)
1256 __asm__ __volatile__("@ atomic64_add\n"
1257 "1: ldrexd %0, %H0, [%3]\n"
1258 " adds %Q0, %Q0, %Q4\n"
1259 +" adcs %R0, %R0, %R4\n"
1260 +
1261 +#ifdef CONFIG_PAX_REFCOUNT
1262 +" bvc 3f\n"
1263 +"2: bkpt 0xf103\n"
1264 +"3:\n"
1265 +#endif
1266 +
1267 +" strexd %1, %0, %H0, [%3]\n"
1268 +" teq %1, #0\n"
1269 +" bne 1b"
1270 +
1271 +#ifdef CONFIG_PAX_REFCOUNT
1272 +"\n4:\n"
1273 + _ASM_EXTABLE(2b, 4b)
1274 +#endif
1275 +
1276 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1277 + : "r" (&v->counter), "r" (i)
1278 + : "cc");
1279 +}
1280 +
1281 +static inline void atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
1282 +{
1283 + long long result;
1284 + unsigned long tmp;
1285 +
1286 + prefetchw(&v->counter);
1287 + __asm__ __volatile__("@ atomic64_add_unchecked\n"
1288 +"1: ldrexd %0, %H0, [%3]\n"
1289 +" adds %Q0, %Q0, %Q4\n"
1290 " adc %R0, %R0, %R4\n"
1291 " strexd %1, %0, %H0, [%3]\n"
1292 " teq %1, #0\n"
1293 @@ -303,6 +581,44 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
1294 __asm__ __volatile__("@ atomic64_add_return\n"
1295 "1: ldrexd %0, %H0, [%3]\n"
1296 " adds %Q0, %Q0, %Q4\n"
1297 +" adcs %R0, %R0, %R4\n"
1298 +
1299 +#ifdef CONFIG_PAX_REFCOUNT
1300 +" bvc 3f\n"
1301 +" mov %0, %1\n"
1302 +" mov %H0, %H1\n"
1303 +"2: bkpt 0xf103\n"
1304 +"3:\n"
1305 +#endif
1306 +
1307 +" strexd %1, %0, %H0, [%3]\n"
1308 +" teq %1, #0\n"
1309 +" bne 1b"
1310 +
1311 +#ifdef CONFIG_PAX_REFCOUNT
1312 +"\n4:\n"
1313 + _ASM_EXTABLE(2b, 4b)
1314 +#endif
1315 +
1316 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1317 + : "r" (&v->counter), "r" (i)
1318 + : "cc");
1319 +
1320 + smp_mb();
1321 +
1322 + return result;
1323 +}
1324 +
1325 +static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
1326 +{
1327 + long long result;
1328 + unsigned long tmp;
1329 +
1330 + smp_mb();
1331 +
1332 + __asm__ __volatile__("@ atomic64_add_return_unchecked\n"
1333 +"1: ldrexd %0, %H0, [%3]\n"
1334 +" adds %Q0, %Q0, %Q4\n"
1335 " adc %R0, %R0, %R4\n"
1336 " strexd %1, %0, %H0, [%3]\n"
1337 " teq %1, #0\n"
1338 @@ -325,6 +641,37 @@ static inline void atomic64_sub(long long i, atomic64_t *v)
1339 __asm__ __volatile__("@ atomic64_sub\n"
1340 "1: ldrexd %0, %H0, [%3]\n"
1341 " subs %Q0, %Q0, %Q4\n"
1342 +" sbcs %R0, %R0, %R4\n"
1343 +
1344 +#ifdef CONFIG_PAX_REFCOUNT
1345 +" bvc 3f\n"
1346 +"2: bkpt 0xf103\n"
1347 +"3:\n"
1348 +#endif
1349 +
1350 +" strexd %1, %0, %H0, [%3]\n"
1351 +" teq %1, #0\n"
1352 +" bne 1b"
1353 +
1354 +#ifdef CONFIG_PAX_REFCOUNT
1355 +"\n4:\n"
1356 + _ASM_EXTABLE(2b, 4b)
1357 +#endif
1358 +
1359 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1360 + : "r" (&v->counter), "r" (i)
1361 + : "cc");
1362 +}
1363 +
1364 +static inline void atomic64_sub_unchecked(long long i, atomic64_unchecked_t *v)
1365 +{
1366 + long long result;
1367 + unsigned long tmp;
1368 +
1369 + prefetchw(&v->counter);
1370 + __asm__ __volatile__("@ atomic64_sub_unchecked\n"
1371 +"1: ldrexd %0, %H0, [%3]\n"
1372 +" subs %Q0, %Q0, %Q4\n"
1373 " sbc %R0, %R0, %R4\n"
1374 " strexd %1, %0, %H0, [%3]\n"
1375 " teq %1, #0\n"
1376 @@ -344,16 +691,29 @@ static inline long long atomic64_sub_return(long long i, atomic64_t *v)
1377 __asm__ __volatile__("@ atomic64_sub_return\n"
1378 "1: ldrexd %0, %H0, [%3]\n"
1379 " subs %Q0, %Q0, %Q4\n"
1380 -" sbc %R0, %R0, %R4\n"
1381 +" sbcs %R0, %R0, %R4\n"
1382 +
1383 +#ifdef CONFIG_PAX_REFCOUNT
1384 +" bvc 3f\n"
1385 +" mov %0, %1\n"
1386 +" mov %H0, %H1\n"
1387 +"2: bkpt 0xf103\n"
1388 +"3:\n"
1389 +#endif
1390 +
1391 " strexd %1, %0, %H0, [%3]\n"
1392 " teq %1, #0\n"
1393 " bne 1b"
1394 +
1395 +#ifdef CONFIG_PAX_REFCOUNT
1396 +"\n4:\n"
1397 + _ASM_EXTABLE(2b, 4b)
1398 +#endif
1399 +
1400 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1401 : "r" (&v->counter), "r" (i)
1402 : "cc");
1403
1404 - smp_mb();
1405 -
1406 return result;
1407 }
1408
1409 @@ -382,6 +742,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1410 return oldval;
1411 }
1412
1413 +static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, long long old,
1414 + long long new)
1415 +{
1416 + long long oldval;
1417 + unsigned long res;
1418 +
1419 + smp_mb();
1420 +
1421 + do {
1422 + __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1423 + "ldrexd %1, %H1, [%3]\n"
1424 + "mov %0, #0\n"
1425 + "teq %1, %4\n"
1426 + "teqeq %H1, %H4\n"
1427 + "strexdeq %0, %5, %H5, [%3]"
1428 + : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1429 + : "r" (&ptr->counter), "r" (old), "r" (new)
1430 + : "cc");
1431 + } while (res);
1432 +
1433 + smp_mb();
1434 +
1435 + return oldval;
1436 +}
1437 +
1438 static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1439 {
1440 long long result;
1441 @@ -406,20 +791,34 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1442 static inline long long atomic64_dec_if_positive(atomic64_t *v)
1443 {
1444 long long result;
1445 - unsigned long tmp;
1446 + u64 tmp;
1447
1448 smp_mb();
1449
1450 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1451 -"1: ldrexd %0, %H0, [%3]\n"
1452 -" subs %Q0, %Q0, #1\n"
1453 -" sbc %R0, %R0, #0\n"
1454 +"1: ldrexd %1, %H1, [%3]\n"
1455 +" subs %Q0, %Q1, #1\n"
1456 +" sbcs %R0, %R1, #0\n"
1457 +
1458 +#ifdef CONFIG_PAX_REFCOUNT
1459 +" bvc 3f\n"
1460 +" mov %Q0, %Q1\n"
1461 +" mov %R0, %R1\n"
1462 +"2: bkpt 0xf103\n"
1463 +"3:\n"
1464 +#endif
1465 +
1466 " teq %R0, #0\n"
1467 -" bmi 2f\n"
1468 +" bmi 4f\n"
1469 " strexd %1, %0, %H0, [%3]\n"
1470 " teq %1, #0\n"
1471 " bne 1b\n"
1472 -"2:"
1473 +"4:\n"
1474 +
1475 +#ifdef CONFIG_PAX_REFCOUNT
1476 + _ASM_EXTABLE(2b, 4b)
1477 +#endif
1478 +
1479 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1480 : "r" (&v->counter)
1481 : "cc");
1482 @@ -442,13 +841,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1483 " teq %0, %5\n"
1484 " teqeq %H0, %H5\n"
1485 " moveq %1, #0\n"
1486 -" beq 2f\n"
1487 +" beq 4f\n"
1488 " adds %Q0, %Q0, %Q6\n"
1489 -" adc %R0, %R0, %R6\n"
1490 +" adcs %R0, %R0, %R6\n"
1491 +
1492 +#ifdef CONFIG_PAX_REFCOUNT
1493 +" bvc 3f\n"
1494 +"2: bkpt 0xf103\n"
1495 +"3:\n"
1496 +#endif
1497 +
1498 " strexd %2, %0, %H0, [%4]\n"
1499 " teq %2, #0\n"
1500 " bne 1b\n"
1501 -"2:"
1502 +"4:\n"
1503 +
1504 +#ifdef CONFIG_PAX_REFCOUNT
1505 + _ASM_EXTABLE(2b, 4b)
1506 +#endif
1507 +
1508 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1509 : "r" (&v->counter), "r" (u), "r" (a)
1510 : "cc");
1511 @@ -461,10 +872,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1512
1513 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1514 #define atomic64_inc(v) atomic64_add(1LL, (v))
1515 +#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1516 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1517 +#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1518 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1519 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1520 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1521 +#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1522 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1523 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1524 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1525 diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1526 index 75fe66b..ba3dee4 100644
1527 --- a/arch/arm/include/asm/cache.h
1528 +++ b/arch/arm/include/asm/cache.h
1529 @@ -4,8 +4,10 @@
1530 #ifndef __ASMARM_CACHE_H
1531 #define __ASMARM_CACHE_H
1532
1533 +#include <linux/const.h>
1534 +
1535 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1536 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1537 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1538
1539 /*
1540 * Memory returned by kmalloc() may be used for DMA, so we must make
1541 @@ -24,5 +26,6 @@
1542 #endif
1543
1544 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1545 +#define __read_only __attribute__ ((__section__(".data..read_only")))
1546
1547 #endif
1548 diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1549 index 8b8b616..d973d24 100644
1550 --- a/arch/arm/include/asm/cacheflush.h
1551 +++ b/arch/arm/include/asm/cacheflush.h
1552 @@ -116,7 +116,7 @@ struct cpu_cache_fns {
1553 void (*dma_unmap_area)(const void *, size_t, int);
1554
1555 void (*dma_flush_range)(const void *, const void *);
1556 -};
1557 +} __no_const;
1558
1559 /*
1560 * Select the calling method
1561 diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1562 index 5233151..87a71fa 100644
1563 --- a/arch/arm/include/asm/checksum.h
1564 +++ b/arch/arm/include/asm/checksum.h
1565 @@ -37,7 +37,19 @@ __wsum
1566 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1567
1568 __wsum
1569 -csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1570 +__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1571 +
1572 +static inline __wsum
1573 +csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1574 +{
1575 + __wsum ret;
1576 + pax_open_userland();
1577 + ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1578 + pax_close_userland();
1579 + return ret;
1580 +}
1581 +
1582 +
1583
1584 /*
1585 * Fold a partial checksum without adding pseudo headers
1586 diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1587 index df2fbba..63fe3e1 100644
1588 --- a/arch/arm/include/asm/cmpxchg.h
1589 +++ b/arch/arm/include/asm/cmpxchg.h
1590 @@ -102,6 +102,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1591
1592 #define xchg(ptr,x) \
1593 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1594 +#define xchg_unchecked(ptr,x) \
1595 + ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1596
1597 #include <asm-generic/cmpxchg-local.h>
1598
1599 diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1600 index 6ddbe44..b5e38b1 100644
1601 --- a/arch/arm/include/asm/domain.h
1602 +++ b/arch/arm/include/asm/domain.h
1603 @@ -48,18 +48,37 @@
1604 * Domain types
1605 */
1606 #define DOMAIN_NOACCESS 0
1607 -#define DOMAIN_CLIENT 1
1608 #ifdef CONFIG_CPU_USE_DOMAINS
1609 +#define DOMAIN_USERCLIENT 1
1610 +#define DOMAIN_KERNELCLIENT 1
1611 #define DOMAIN_MANAGER 3
1612 +#define DOMAIN_VECTORS DOMAIN_USER
1613 #else
1614 +
1615 +#ifdef CONFIG_PAX_KERNEXEC
1616 #define DOMAIN_MANAGER 1
1617 +#define DOMAIN_KERNEXEC 3
1618 +#else
1619 +#define DOMAIN_MANAGER 1
1620 +#endif
1621 +
1622 +#ifdef CONFIG_PAX_MEMORY_UDEREF
1623 +#define DOMAIN_USERCLIENT 0
1624 +#define DOMAIN_UDEREF 1
1625 +#define DOMAIN_VECTORS DOMAIN_KERNEL
1626 +#else
1627 +#define DOMAIN_USERCLIENT 1
1628 +#define DOMAIN_VECTORS DOMAIN_USER
1629 +#endif
1630 +#define DOMAIN_KERNELCLIENT 1
1631 +
1632 #endif
1633
1634 #define domain_val(dom,type) ((type) << (2*(dom)))
1635
1636 #ifndef __ASSEMBLY__
1637
1638 -#ifdef CONFIG_CPU_USE_DOMAINS
1639 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1640 static inline void set_domain(unsigned val)
1641 {
1642 asm volatile(
1643 @@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1644 isb();
1645 }
1646
1647 -#define modify_domain(dom,type) \
1648 - do { \
1649 - struct thread_info *thread = current_thread_info(); \
1650 - unsigned int domain = thread->cpu_domain; \
1651 - domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1652 - thread->cpu_domain = domain | domain_val(dom, type); \
1653 - set_domain(thread->cpu_domain); \
1654 - } while (0)
1655 -
1656 +extern void modify_domain(unsigned int dom, unsigned int type);
1657 #else
1658 static inline void set_domain(unsigned val) { }
1659 static inline void modify_domain(unsigned dom, unsigned type) { }
1660 diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1661 index f4b46d3..abc9b2b 100644
1662 --- a/arch/arm/include/asm/elf.h
1663 +++ b/arch/arm/include/asm/elf.h
1664 @@ -114,7 +114,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1665 the loader. We need to make sure that it is out of the way of the program
1666 that it will "exec", and that there is sufficient room for the brk. */
1667
1668 -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1669 +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1670 +
1671 +#ifdef CONFIG_PAX_ASLR
1672 +#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1673 +
1674 +#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1675 +#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1676 +#endif
1677
1678 /* When the program starts, a1 contains a pointer to a function to be
1679 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1680 @@ -124,10 +131,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1681 extern void elf_set_personality(const struct elf32_hdr *);
1682 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1683
1684 -struct mm_struct;
1685 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1686 -#define arch_randomize_brk arch_randomize_brk
1687 -
1688 #ifdef CONFIG_MMU
1689 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
1690 struct linux_binprm;
1691 diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1692 index de53547..52b9a28 100644
1693 --- a/arch/arm/include/asm/fncpy.h
1694 +++ b/arch/arm/include/asm/fncpy.h
1695 @@ -81,7 +81,9 @@
1696 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1697 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1698 \
1699 + pax_open_kernel(); \
1700 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1701 + pax_close_kernel(); \
1702 flush_icache_range((unsigned long)(dest_buf), \
1703 (unsigned long)(dest_buf) + (size)); \
1704 \
1705 diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1706 index e42cf59..7b94b8f 100644
1707 --- a/arch/arm/include/asm/futex.h
1708 +++ b/arch/arm/include/asm/futex.h
1709 @@ -50,6 +50,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1710 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1711 return -EFAULT;
1712
1713 + pax_open_userland();
1714 +
1715 smp_mb();
1716 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1717 "1: ldrex %1, [%4]\n"
1718 @@ -65,6 +67,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1719 : "cc", "memory");
1720 smp_mb();
1721
1722 + pax_close_userland();
1723 +
1724 *uval = val;
1725 return ret;
1726 }
1727 @@ -95,6 +99,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1728 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1729 return -EFAULT;
1730
1731 + pax_open_userland();
1732 +
1733 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1734 "1: " TUSER(ldr) " %1, [%4]\n"
1735 " teq %1, %2\n"
1736 @@ -105,6 +111,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1737 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1738 : "cc", "memory");
1739
1740 + pax_close_userland();
1741 +
1742 *uval = val;
1743 return ret;
1744 }
1745 @@ -127,6 +135,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1746 return -EFAULT;
1747
1748 pagefault_disable(); /* implies preempt_disable() */
1749 + pax_open_userland();
1750
1751 switch (op) {
1752 case FUTEX_OP_SET:
1753 @@ -148,6 +157,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1754 ret = -ENOSYS;
1755 }
1756
1757 + pax_close_userland();
1758 pagefault_enable(); /* subsumes preempt_enable() */
1759
1760 if (!ret) {
1761 diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1762 index 83eb2f7..ed77159 100644
1763 --- a/arch/arm/include/asm/kmap_types.h
1764 +++ b/arch/arm/include/asm/kmap_types.h
1765 @@ -4,6 +4,6 @@
1766 /*
1767 * This is the "bare minimum". AIO seems to require this.
1768 */
1769 -#define KM_TYPE_NR 16
1770 +#define KM_TYPE_NR 17
1771
1772 #endif
1773 diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1774 index 9e614a1..3302cca 100644
1775 --- a/arch/arm/include/asm/mach/dma.h
1776 +++ b/arch/arm/include/asm/mach/dma.h
1777 @@ -22,7 +22,7 @@ struct dma_ops {
1778 int (*residue)(unsigned int, dma_t *); /* optional */
1779 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1780 const char *type;
1781 -};
1782 +} __do_const;
1783
1784 struct dma_struct {
1785 void *addr; /* single DMA address */
1786 diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1787 index f98c7f3..e5c626d 100644
1788 --- a/arch/arm/include/asm/mach/map.h
1789 +++ b/arch/arm/include/asm/mach/map.h
1790 @@ -23,17 +23,19 @@ struct map_desc {
1791
1792 /* types 0-3 are defined in asm/io.h */
1793 enum {
1794 - MT_UNCACHED = 4,
1795 - MT_CACHECLEAN,
1796 - MT_MINICLEAN,
1797 + MT_UNCACHED_RW = 4,
1798 + MT_CACHECLEAN_RO,
1799 + MT_MINICLEAN_RO,
1800 MT_LOW_VECTORS,
1801 MT_HIGH_VECTORS,
1802 - MT_MEMORY_RWX,
1803 + __MT_MEMORY_RWX,
1804 MT_MEMORY_RW,
1805 - MT_ROM,
1806 - MT_MEMORY_RWX_NONCACHED,
1807 + MT_MEMORY_RX,
1808 + MT_ROM_RX,
1809 + MT_MEMORY_RW_NONCACHED,
1810 + MT_MEMORY_RX_NONCACHED,
1811 MT_MEMORY_RW_DTCM,
1812 - MT_MEMORY_RWX_ITCM,
1813 + MT_MEMORY_RX_ITCM,
1814 MT_MEMORY_RW_SO,
1815 MT_MEMORY_DMA_READY,
1816 };
1817 diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1818 index f94784f..9a09a4a 100644
1819 --- a/arch/arm/include/asm/outercache.h
1820 +++ b/arch/arm/include/asm/outercache.h
1821 @@ -35,7 +35,7 @@ struct outer_cache_fns {
1822 #endif
1823 void (*set_debug)(unsigned long);
1824 void (*resume)(void);
1825 -};
1826 +} __no_const;
1827
1828 extern struct outer_cache_fns outer_cache;
1829
1830 diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1831 index 4355f0e..cd9168e 100644
1832 --- a/arch/arm/include/asm/page.h
1833 +++ b/arch/arm/include/asm/page.h
1834 @@ -23,6 +23,7 @@
1835
1836 #else
1837
1838 +#include <linux/compiler.h>
1839 #include <asm/glue.h>
1840
1841 /*
1842 @@ -114,7 +115,7 @@ struct cpu_user_fns {
1843 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1844 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1845 unsigned long vaddr, struct vm_area_struct *vma);
1846 -};
1847 +} __no_const;
1848
1849 #ifdef MULTI_USER
1850 extern struct cpu_user_fns cpu_user;
1851 diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1852 index 78a7793..e3dc06c 100644
1853 --- a/arch/arm/include/asm/pgalloc.h
1854 +++ b/arch/arm/include/asm/pgalloc.h
1855 @@ -17,6 +17,7 @@
1856 #include <asm/processor.h>
1857 #include <asm/cacheflush.h>
1858 #include <asm/tlbflush.h>
1859 +#include <asm/system_info.h>
1860
1861 #define check_pgt_cache() do { } while (0)
1862
1863 @@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1864 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1865 }
1866
1867 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1868 +{
1869 + pud_populate(mm, pud, pmd);
1870 +}
1871 +
1872 #else /* !CONFIG_ARM_LPAE */
1873
1874 /*
1875 @@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1876 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1877 #define pmd_free(mm, pmd) do { } while (0)
1878 #define pud_populate(mm,pmd,pte) BUG()
1879 +#define pud_populate_kernel(mm,pmd,pte) BUG()
1880
1881 #endif /* CONFIG_ARM_LPAE */
1882
1883 @@ -128,6 +135,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1884 __free_page(pte);
1885 }
1886
1887 +static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1888 +{
1889 +#ifdef CONFIG_ARM_LPAE
1890 + pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1891 +#else
1892 + if (addr & SECTION_SIZE)
1893 + pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1894 + else
1895 + pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1896 +#endif
1897 + flush_pmd_entry(pmdp);
1898 +}
1899 +
1900 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1901 pmdval_t prot)
1902 {
1903 @@ -157,7 +177,7 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep)
1904 static inline void
1905 pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep)
1906 {
1907 - __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE);
1908 + __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE | __supported_pmd_mask);
1909 }
1910 #define pmd_pgtable(pmd) pmd_page(pmd)
1911
1912 diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1913 index 5cfba15..f415e1a 100644
1914 --- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1915 +++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1916 @@ -20,12 +20,15 @@
1917 #define PMD_TYPE_FAULT (_AT(pmdval_t, 0) << 0)
1918 #define PMD_TYPE_TABLE (_AT(pmdval_t, 1) << 0)
1919 #define PMD_TYPE_SECT (_AT(pmdval_t, 2) << 0)
1920 +#define PMD_PXNTABLE (_AT(pmdval_t, 1) << 2) /* v7 */
1921 #define PMD_BIT4 (_AT(pmdval_t, 1) << 4)
1922 #define PMD_DOMAIN(x) (_AT(pmdval_t, (x)) << 5)
1923 #define PMD_PROTECTION (_AT(pmdval_t, 1) << 9) /* v5 */
1924 +
1925 /*
1926 * - section
1927 */
1928 +#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1929 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1930 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1931 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1932 @@ -37,6 +40,7 @@
1933 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1934 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1935 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1936 +#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1937
1938 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1939 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1940 @@ -66,6 +70,7 @@
1941 * - extended small page/tiny page
1942 */
1943 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1944 +#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1945 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1946 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1947 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1948 diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1949 index dfff709..ed4c4e7 100644
1950 --- a/arch/arm/include/asm/pgtable-2level.h
1951 +++ b/arch/arm/include/asm/pgtable-2level.h
1952 @@ -126,6 +126,9 @@
1953 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1954 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1955
1956 +/* Two-level page tables only have PXN in the PGD, not in the PTE. */
1957 +#define L_PTE_PXN (_AT(pteval_t, 0))
1958 +
1959 /*
1960 * These are the memory types, defined to be compatible with
1961 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
1962 diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h
1963 index 626989f..9d67a33 100644
1964 --- a/arch/arm/include/asm/pgtable-3level-hwdef.h
1965 +++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
1966 @@ -75,6 +75,7 @@
1967 #define PTE_EXT_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1968 #define PTE_EXT_AF (_AT(pteval_t, 1) << 10) /* Access Flag */
1969 #define PTE_EXT_NG (_AT(pteval_t, 1) << 11) /* nG */
1970 +#define PTE_EXT_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1971 #define PTE_EXT_XN (_AT(pteval_t, 1) << 54) /* XN */
1972
1973 /*
1974 diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
1975 index 85c60ad..b0bbd7e 100644
1976 --- a/arch/arm/include/asm/pgtable-3level.h
1977 +++ b/arch/arm/include/asm/pgtable-3level.h
1978 @@ -82,6 +82,7 @@
1979 #define L_PTE_RDONLY (_AT(pteval_t, 1) << 7) /* AP[2] */
1980 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1981 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
1982 +#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1983 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
1984 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55) /* unused */
1985 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56) /* unused */
1986 @@ -95,6 +96,7 @@
1987 /*
1988 * To be used in assembly code with the upper page attributes.
1989 */
1990 +#define L_PTE_PXN_HIGH (1 << (53 - 32))
1991 #define L_PTE_XN_HIGH (1 << (54 - 32))
1992 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
1993
1994 diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
1995 index 7d59b52..27a12f8 100644
1996 --- a/arch/arm/include/asm/pgtable.h
1997 +++ b/arch/arm/include/asm/pgtable.h
1998 @@ -33,6 +33,9 @@
1999 #include <asm/pgtable-2level.h>
2000 #endif
2001
2002 +#define ktla_ktva(addr) (addr)
2003 +#define ktva_ktla(addr) (addr)
2004 +
2005 /*
2006 * Just any arbitrary offset to the start of the vmalloc VM area: the
2007 * current 8MB value just means that there will be a 8MB "hole" after the
2008 @@ -48,6 +51,9 @@
2009 #define LIBRARY_TEXT_START 0x0c000000
2010
2011 #ifndef __ASSEMBLY__
2012 +extern pteval_t __supported_pte_mask;
2013 +extern pmdval_t __supported_pmd_mask;
2014 +
2015 extern void __pte_error(const char *file, int line, pte_t);
2016 extern void __pmd_error(const char *file, int line, pmd_t);
2017 extern void __pgd_error(const char *file, int line, pgd_t);
2018 @@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2019 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
2020 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
2021
2022 +#define __HAVE_ARCH_PAX_OPEN_KERNEL
2023 +#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2024 +
2025 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2026 +#include <asm/domain.h>
2027 +#include <linux/thread_info.h>
2028 +#include <linux/preempt.h>
2029 +
2030 +static inline int test_domain(int domain, int domaintype)
2031 +{
2032 + return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2033 +}
2034 +#endif
2035 +
2036 +#ifdef CONFIG_PAX_KERNEXEC
2037 +static inline unsigned long pax_open_kernel(void) {
2038 +#ifdef CONFIG_ARM_LPAE
2039 + /* TODO */
2040 +#else
2041 + preempt_disable();
2042 + BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2043 + modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2044 +#endif
2045 + return 0;
2046 +}
2047 +
2048 +static inline unsigned long pax_close_kernel(void) {
2049 +#ifdef CONFIG_ARM_LPAE
2050 + /* TODO */
2051 +#else
2052 + BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2053 + /* DOMAIN_MANAGER = "client" under KERNEXEC */
2054 + modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2055 + preempt_enable_no_resched();
2056 +#endif
2057 + return 0;
2058 +}
2059 +#else
2060 +static inline unsigned long pax_open_kernel(void) { return 0; }
2061 +static inline unsigned long pax_close_kernel(void) { return 0; }
2062 +#endif
2063 +
2064 /*
2065 * This is the lowest virtual address we can permit any user space
2066 * mapping to be mapped at. This is particularly important for
2067 @@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2068 /*
2069 * The pgprot_* and protection_map entries will be fixed up in runtime
2070 * to include the cachable and bufferable bits based on memory policy,
2071 - * as well as any architecture dependent bits like global/ASID and SMP
2072 - * shared mapping bits.
2073 + * as well as any architecture dependent bits like global/ASID, PXN,
2074 + * and SMP shared mapping bits.
2075 */
2076 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2077
2078 @@ -262,7 +310,7 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; }
2079 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2080 {
2081 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2082 - L_PTE_NONE | L_PTE_VALID;
2083 + L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2084 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2085 return pte;
2086 }
2087 diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2088 index c4ae171..ea0c0c2 100644
2089 --- a/arch/arm/include/asm/psci.h
2090 +++ b/arch/arm/include/asm/psci.h
2091 @@ -29,7 +29,7 @@ struct psci_operations {
2092 int (*cpu_off)(struct psci_power_state state);
2093 int (*cpu_on)(unsigned long cpuid, unsigned long entry_point);
2094 int (*migrate)(unsigned long cpuid);
2095 -};
2096 +} __no_const;
2097
2098 extern struct psci_operations psci_ops;
2099 extern struct smp_operations psci_smp_ops;
2100 diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2101 index 22a3b9b..7f214ee 100644
2102 --- a/arch/arm/include/asm/smp.h
2103 +++ b/arch/arm/include/asm/smp.h
2104 @@ -112,7 +112,7 @@ struct smp_operations {
2105 int (*cpu_disable)(unsigned int cpu);
2106 #endif
2107 #endif
2108 -};
2109 +} __no_const;
2110
2111 /*
2112 * set platform specific SMP operations
2113 diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2114 index 71a06b2..8bb9ae1 100644
2115 --- a/arch/arm/include/asm/thread_info.h
2116 +++ b/arch/arm/include/asm/thread_info.h
2117 @@ -88,9 +88,9 @@ struct thread_info {
2118 .flags = 0, \
2119 .preempt_count = INIT_PREEMPT_COUNT, \
2120 .addr_limit = KERNEL_DS, \
2121 - .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2122 - domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2123 - domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2124 + .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2125 + domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2126 + domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2127 .restart_block = { \
2128 .fn = do_no_restart_syscall, \
2129 }, \
2130 @@ -157,7 +157,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2131 #define TIF_SYSCALL_AUDIT 9
2132 #define TIF_SYSCALL_TRACEPOINT 10
2133 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2134 -#define TIF_NOHZ 12 /* in adaptive nohz mode */
2135 +/* within 8 bits of TIF_SYSCALL_TRACE
2136 + * to meet flexible second operand requirements
2137 + */
2138 +#define TIF_GRSEC_SETXID 12
2139 +#define TIF_NOHZ 13 /* in adaptive nohz mode */
2140 #define TIF_USING_IWMMXT 17
2141 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2142 #define TIF_RESTORE_SIGMASK 20
2143 @@ -170,10 +174,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2144 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2145 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2146 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2147 +#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2148
2149 /* Checks for any syscall work in entry-common.S */
2150 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2151 - _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2152 + _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2153
2154 /*
2155 * Change these and you break ASM code in entry-common.S
2156 diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2157 index 72abdc5..35acac1 100644
2158 --- a/arch/arm/include/asm/uaccess.h
2159 +++ b/arch/arm/include/asm/uaccess.h
2160 @@ -18,6 +18,7 @@
2161 #include <asm/domain.h>
2162 #include <asm/unified.h>
2163 #include <asm/compiler.h>
2164 +#include <asm/pgtable.h>
2165
2166 #if __LINUX_ARM_ARCH__ < 6
2167 #include <asm-generic/uaccess-unaligned.h>
2168 @@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2169 static inline void set_fs(mm_segment_t fs)
2170 {
2171 current_thread_info()->addr_limit = fs;
2172 - modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2173 + modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2174 }
2175
2176 #define segment_eq(a,b) ((a) == (b))
2177
2178 +#define __HAVE_ARCH_PAX_OPEN_USERLAND
2179 +#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2180 +
2181 +static inline void pax_open_userland(void)
2182 +{
2183 +
2184 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2185 + if (segment_eq(get_fs(), USER_DS)) {
2186 + BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2187 + modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2188 + }
2189 +#endif
2190 +
2191 +}
2192 +
2193 +static inline void pax_close_userland(void)
2194 +{
2195 +
2196 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2197 + if (segment_eq(get_fs(), USER_DS)) {
2198 + BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2199 + modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2200 + }
2201 +#endif
2202 +
2203 +}
2204 +
2205 #define __addr_ok(addr) ({ \
2206 unsigned long flag; \
2207 __asm__("cmp %2, %0; movlo %0, #0" \
2208 @@ -150,8 +178,12 @@ extern int __get_user_4(void *);
2209
2210 #define get_user(x,p) \
2211 ({ \
2212 + int __e; \
2213 might_fault(); \
2214 - __get_user_check(x,p); \
2215 + pax_open_userland(); \
2216 + __e = __get_user_check(x,p); \
2217 + pax_close_userland(); \
2218 + __e; \
2219 })
2220
2221 extern int __put_user_1(void *, unsigned int);
2222 @@ -195,8 +227,12 @@ extern int __put_user_8(void *, unsigned long long);
2223
2224 #define put_user(x,p) \
2225 ({ \
2226 + int __e; \
2227 might_fault(); \
2228 - __put_user_check(x,p); \
2229 + pax_open_userland(); \
2230 + __e = __put_user_check(x,p); \
2231 + pax_close_userland(); \
2232 + __e; \
2233 })
2234
2235 #else /* CONFIG_MMU */
2236 @@ -220,6 +256,7 @@ static inline void set_fs(mm_segment_t fs)
2237
2238 #endif /* CONFIG_MMU */
2239
2240 +#define access_ok_noprefault(type,addr,size) access_ok((type),(addr),(size))
2241 #define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
2242
2243 #define user_addr_max() \
2244 @@ -237,13 +274,17 @@ static inline void set_fs(mm_segment_t fs)
2245 #define __get_user(x,ptr) \
2246 ({ \
2247 long __gu_err = 0; \
2248 + pax_open_userland(); \
2249 __get_user_err((x),(ptr),__gu_err); \
2250 + pax_close_userland(); \
2251 __gu_err; \
2252 })
2253
2254 #define __get_user_error(x,ptr,err) \
2255 ({ \
2256 + pax_open_userland(); \
2257 __get_user_err((x),(ptr),err); \
2258 + pax_close_userland(); \
2259 (void) 0; \
2260 })
2261
2262 @@ -319,13 +360,17 @@ do { \
2263 #define __put_user(x,ptr) \
2264 ({ \
2265 long __pu_err = 0; \
2266 + pax_open_userland(); \
2267 __put_user_err((x),(ptr),__pu_err); \
2268 + pax_close_userland(); \
2269 __pu_err; \
2270 })
2271
2272 #define __put_user_error(x,ptr,err) \
2273 ({ \
2274 + pax_open_userland(); \
2275 __put_user_err((x),(ptr),err); \
2276 + pax_close_userland(); \
2277 (void) 0; \
2278 })
2279
2280 @@ -425,11 +470,44 @@ do { \
2281
2282
2283 #ifdef CONFIG_MMU
2284 -extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2285 -extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2286 +extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2287 +extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2288 +
2289 +static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2290 +{
2291 + unsigned long ret;
2292 +
2293 + check_object_size(to, n, false);
2294 + pax_open_userland();
2295 + ret = ___copy_from_user(to, from, n);
2296 + pax_close_userland();
2297 + return ret;
2298 +}
2299 +
2300 +static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2301 +{
2302 + unsigned long ret;
2303 +
2304 + check_object_size(from, n, true);
2305 + pax_open_userland();
2306 + ret = ___copy_to_user(to, from, n);
2307 + pax_close_userland();
2308 + return ret;
2309 +}
2310 +
2311 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2312 -extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2313 +extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2314 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2315 +
2316 +static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2317 +{
2318 + unsigned long ret;
2319 + pax_open_userland();
2320 + ret = ___clear_user(addr, n);
2321 + pax_close_userland();
2322 + return ret;
2323 +}
2324 +
2325 #else
2326 #define __copy_from_user(to,from,n) (memcpy(to, (void __force *)from, n), 0)
2327 #define __copy_to_user(to,from,n) (memcpy((void __force *)to, from, n), 0)
2328 @@ -438,6 +516,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2329
2330 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2331 {
2332 + if ((long)n < 0)
2333 + return n;
2334 +
2335 if (access_ok(VERIFY_READ, from, n))
2336 n = __copy_from_user(to, from, n);
2337 else /* security hole - plug it */
2338 @@ -447,6 +528,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2339
2340 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2341 {
2342 + if ((long)n < 0)
2343 + return n;
2344 +
2345 if (access_ok(VERIFY_WRITE, to, n))
2346 n = __copy_to_user(to, from, n);
2347 return n;
2348 diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2349 index 5af0ed1..cea83883 100644
2350 --- a/arch/arm/include/uapi/asm/ptrace.h
2351 +++ b/arch/arm/include/uapi/asm/ptrace.h
2352 @@ -92,7 +92,7 @@
2353 * ARMv7 groups of PSR bits
2354 */
2355 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2356 -#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2357 +#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2358 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2359 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2360
2361 diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2362 index 85e664b..419a1cd 100644
2363 --- a/arch/arm/kernel/armksyms.c
2364 +++ b/arch/arm/kernel/armksyms.c
2365 @@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2366
2367 /* networking */
2368 EXPORT_SYMBOL(csum_partial);
2369 -EXPORT_SYMBOL(csum_partial_copy_from_user);
2370 +EXPORT_SYMBOL(__csum_partial_copy_from_user);
2371 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2372 EXPORT_SYMBOL(__csum_ipv6_magic);
2373
2374 @@ -91,9 +91,9 @@ EXPORT_SYMBOL(__memzero);
2375 #ifdef CONFIG_MMU
2376 EXPORT_SYMBOL(copy_page);
2377
2378 -EXPORT_SYMBOL(__copy_from_user);
2379 -EXPORT_SYMBOL(__copy_to_user);
2380 -EXPORT_SYMBOL(__clear_user);
2381 +EXPORT_SYMBOL(___copy_from_user);
2382 +EXPORT_SYMBOL(___copy_to_user);
2383 +EXPORT_SYMBOL(___clear_user);
2384
2385 EXPORT_SYMBOL(__get_user_1);
2386 EXPORT_SYMBOL(__get_user_2);
2387 diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2388 index 1879e8d..b2207fc 100644
2389 --- a/arch/arm/kernel/entry-armv.S
2390 +++ b/arch/arm/kernel/entry-armv.S
2391 @@ -47,6 +47,87 @@
2392 9997:
2393 .endm
2394
2395 + .macro pax_enter_kernel
2396 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2397 + @ make aligned space for saved DACR
2398 + sub sp, sp, #8
2399 + @ save regs
2400 + stmdb sp!, {r1, r2}
2401 + @ read DACR from cpu_domain into r1
2402 + mov r2, sp
2403 + @ assume 8K pages, since we have to split the immediate in two
2404 + bic r2, r2, #(0x1fc0)
2405 + bic r2, r2, #(0x3f)
2406 + ldr r1, [r2, #TI_CPU_DOMAIN]
2407 + @ store old DACR on stack
2408 + str r1, [sp, #8]
2409 +#ifdef CONFIG_PAX_KERNEXEC
2410 + @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2411 + bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2412 + orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2413 +#endif
2414 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2415 + @ set current DOMAIN_USER to DOMAIN_NOACCESS
2416 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2417 +#endif
2418 + @ write r1 to current_thread_info()->cpu_domain
2419 + str r1, [r2, #TI_CPU_DOMAIN]
2420 + @ write r1 to DACR
2421 + mcr p15, 0, r1, c3, c0, 0
2422 + @ instruction sync
2423 + instr_sync
2424 + @ restore regs
2425 + ldmia sp!, {r1, r2}
2426 +#endif
2427 + .endm
2428 +
2429 + .macro pax_open_userland
2430 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2431 + @ save regs
2432 + stmdb sp!, {r0, r1}
2433 + @ read DACR from cpu_domain into r1
2434 + mov r0, sp
2435 + @ assume 8K pages, since we have to split the immediate in two
2436 + bic r0, r0, #(0x1fc0)
2437 + bic r0, r0, #(0x3f)
2438 + ldr r1, [r0, #TI_CPU_DOMAIN]
2439 + @ set current DOMAIN_USER to DOMAIN_CLIENT
2440 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2441 + orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2442 + @ write r1 to current_thread_info()->cpu_domain
2443 + str r1, [r0, #TI_CPU_DOMAIN]
2444 + @ write r1 to DACR
2445 + mcr p15, 0, r1, c3, c0, 0
2446 + @ instruction sync
2447 + instr_sync
2448 + @ restore regs
2449 + ldmia sp!, {r0, r1}
2450 +#endif
2451 + .endm
2452 +
2453 + .macro pax_close_userland
2454 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2455 + @ save regs
2456 + stmdb sp!, {r0, r1}
2457 + @ read DACR from cpu_domain into r1
2458 + mov r0, sp
2459 + @ assume 8K pages, since we have to split the immediate in two
2460 + bic r0, r0, #(0x1fc0)
2461 + bic r0, r0, #(0x3f)
2462 + ldr r1, [r0, #TI_CPU_DOMAIN]
2463 + @ set current DOMAIN_USER to DOMAIN_NOACCESS
2464 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2465 + @ write r1 to current_thread_info()->cpu_domain
2466 + str r1, [r0, #TI_CPU_DOMAIN]
2467 + @ write r1 to DACR
2468 + mcr p15, 0, r1, c3, c0, 0
2469 + @ instruction sync
2470 + instr_sync
2471 + @ restore regs
2472 + ldmia sp!, {r0, r1}
2473 +#endif
2474 + .endm
2475 +
2476 .macro pabt_helper
2477 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2478 #ifdef MULTI_PABORT
2479 @@ -89,11 +170,15 @@
2480 * Invalid mode handlers
2481 */
2482 .macro inv_entry, reason
2483 +
2484 + pax_enter_kernel
2485 +
2486 sub sp, sp, #S_FRAME_SIZE
2487 ARM( stmib sp, {r1 - lr} )
2488 THUMB( stmia sp, {r0 - r12} )
2489 THUMB( str sp, [sp, #S_SP] )
2490 THUMB( str lr, [sp, #S_LR] )
2491 +
2492 mov r1, #\reason
2493 .endm
2494
2495 @@ -149,7 +234,11 @@ ENDPROC(__und_invalid)
2496 .macro svc_entry, stack_hole=0
2497 UNWIND(.fnstart )
2498 UNWIND(.save {r0 - pc} )
2499 +
2500 + pax_enter_kernel
2501 +
2502 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2503 +
2504 #ifdef CONFIG_THUMB2_KERNEL
2505 SPFIX( str r0, [sp] ) @ temporarily saved
2506 SPFIX( mov r0, sp )
2507 @@ -164,7 +253,12 @@ ENDPROC(__und_invalid)
2508 ldmia r0, {r3 - r5}
2509 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2510 mov r6, #-1 @ "" "" "" ""
2511 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2512 + @ offset sp by 8 as done in pax_enter_kernel
2513 + add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2514 +#else
2515 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2516 +#endif
2517 SPFIX( addeq r2, r2, #4 )
2518 str r3, [sp, #-4]! @ save the "real" r0 copied
2519 @ from the exception stack
2520 @@ -317,6 +411,9 @@ ENDPROC(__pabt_svc)
2521 .macro usr_entry
2522 UNWIND(.fnstart )
2523 UNWIND(.cantunwind ) @ don't unwind the user space
2524 +
2525 + pax_enter_kernel_user
2526 +
2527 sub sp, sp, #S_FRAME_SIZE
2528 ARM( stmib sp, {r1 - r12} )
2529 THUMB( stmia sp, {r0 - r12} )
2530 @@ -416,7 +513,9 @@ __und_usr:
2531 tst r3, #PSR_T_BIT @ Thumb mode?
2532 bne __und_usr_thumb
2533 sub r4, r2, #4 @ ARM instr at LR - 4
2534 + pax_open_userland
2535 1: ldrt r0, [r4]
2536 + pax_close_userland
2537 ARM_BE8(rev r0, r0) @ little endian instruction
2538
2539 @ r0 = 32-bit ARM instruction which caused the exception
2540 @@ -450,11 +549,15 @@ __und_usr_thumb:
2541 */
2542 .arch armv6t2
2543 #endif
2544 + pax_open_userland
2545 2: ldrht r5, [r4]
2546 + pax_close_userland
2547 ARM_BE8(rev16 r5, r5) @ little endian instruction
2548 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2549 blo __und_usr_fault_16 @ 16bit undefined instruction
2550 + pax_open_userland
2551 3: ldrht r0, [r2]
2552 + pax_close_userland
2553 ARM_BE8(rev16 r0, r0) @ little endian instruction
2554 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2555 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2556 @@ -484,7 +587,8 @@ ENDPROC(__und_usr)
2557 */
2558 .pushsection .fixup, "ax"
2559 .align 2
2560 -4: mov pc, r9
2561 +4: pax_close_userland
2562 + mov pc, r9
2563 .popsection
2564 .pushsection __ex_table,"a"
2565 .long 1b, 4b
2566 @@ -694,7 +798,7 @@ ENTRY(__switch_to)
2567 THUMB( str lr, [ip], #4 )
2568 ldr r4, [r2, #TI_TP_VALUE]
2569 ldr r5, [r2, #TI_TP_VALUE + 4]
2570 -#ifdef CONFIG_CPU_USE_DOMAINS
2571 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2572 ldr r6, [r2, #TI_CPU_DOMAIN]
2573 #endif
2574 switch_tls r1, r4, r5, r3, r7
2575 @@ -703,7 +807,7 @@ ENTRY(__switch_to)
2576 ldr r8, =__stack_chk_guard
2577 ldr r7, [r7, #TSK_STACK_CANARY]
2578 #endif
2579 -#ifdef CONFIG_CPU_USE_DOMAINS
2580 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2581 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2582 #endif
2583 mov r5, r0
2584 diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2585 index a2dcafd..1048b5a 100644
2586 --- a/arch/arm/kernel/entry-common.S
2587 +++ b/arch/arm/kernel/entry-common.S
2588 @@ -10,18 +10,46 @@
2589
2590 #include <asm/unistd.h>
2591 #include <asm/ftrace.h>
2592 +#include <asm/domain.h>
2593 #include <asm/unwind.h>
2594
2595 +#include "entry-header.S"
2596 +
2597 #ifdef CONFIG_NEED_RET_TO_USER
2598 #include <mach/entry-macro.S>
2599 #else
2600 .macro arch_ret_to_user, tmp1, tmp2
2601 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2602 + @ save regs
2603 + stmdb sp!, {r1, r2}
2604 + @ read DACR from cpu_domain into r1
2605 + mov r2, sp
2606 + @ assume 8K pages, since we have to split the immediate in two
2607 + bic r2, r2, #(0x1fc0)
2608 + bic r2, r2, #(0x3f)
2609 + ldr r1, [r2, #TI_CPU_DOMAIN]
2610 +#ifdef CONFIG_PAX_KERNEXEC
2611 + @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2612 + bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2613 + orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2614 +#endif
2615 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2616 + @ set current DOMAIN_USER to DOMAIN_UDEREF
2617 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2618 + orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2619 +#endif
2620 + @ write r1 to current_thread_info()->cpu_domain
2621 + str r1, [r2, #TI_CPU_DOMAIN]
2622 + @ write r1 to DACR
2623 + mcr p15, 0, r1, c3, c0, 0
2624 + @ instruction sync
2625 + instr_sync
2626 + @ restore regs
2627 + ldmia sp!, {r1, r2}
2628 +#endif
2629 .endm
2630 #endif
2631
2632 -#include "entry-header.S"
2633 -
2634 -
2635 .align 5
2636 /*
2637 * This is the fast syscall return path. We do as little as
2638 @@ -411,6 +439,12 @@ ENTRY(vector_swi)
2639 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2640 #endif
2641
2642 + /*
2643 + * do this here to avoid a performance hit of wrapping the code above
2644 + * that directly dereferences userland to parse the SWI instruction
2645 + */
2646 + pax_enter_kernel_user
2647 +
2648 adr tbl, sys_call_table @ load syscall table pointer
2649
2650 #if defined(CONFIG_OABI_COMPAT)
2651 diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2652 index 39f89fb..d612bd9 100644
2653 --- a/arch/arm/kernel/entry-header.S
2654 +++ b/arch/arm/kernel/entry-header.S
2655 @@ -184,6 +184,60 @@
2656 msr cpsr_c, \rtemp @ switch back to the SVC mode
2657 .endm
2658
2659 + .macro pax_enter_kernel_user
2660 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2661 + @ save regs
2662 + stmdb sp!, {r0, r1}
2663 + @ read DACR from cpu_domain into r1
2664 + mov r0, sp
2665 + @ assume 8K pages, since we have to split the immediate in two
2666 + bic r0, r0, #(0x1fc0)
2667 + bic r0, r0, #(0x3f)
2668 + ldr r1, [r0, #TI_CPU_DOMAIN]
2669 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2670 + @ set current DOMAIN_USER to DOMAIN_NOACCESS
2671 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2672 +#endif
2673 +#ifdef CONFIG_PAX_KERNEXEC
2674 + @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2675 + bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2676 + orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2677 +#endif
2678 + @ write r1 to current_thread_info()->cpu_domain
2679 + str r1, [r0, #TI_CPU_DOMAIN]
2680 + @ write r1 to DACR
2681 + mcr p15, 0, r1, c3, c0, 0
2682 + @ instruction sync
2683 + instr_sync
2684 + @ restore regs
2685 + ldmia sp!, {r0, r1}
2686 +#endif
2687 + .endm
2688 +
2689 + .macro pax_exit_kernel
2690 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2691 + @ save regs
2692 + stmdb sp!, {r0, r1}
2693 + @ read old DACR from stack into r1
2694 + ldr r1, [sp, #(8 + S_SP)]
2695 + sub r1, r1, #8
2696 + ldr r1, [r1]
2697 +
2698 + @ write r1 to current_thread_info()->cpu_domain
2699 + mov r0, sp
2700 + @ assume 8K pages, since we have to split the immediate in two
2701 + bic r0, r0, #(0x1fc0)
2702 + bic r0, r0, #(0x3f)
2703 + str r1, [r0, #TI_CPU_DOMAIN]
2704 + @ write r1 to DACR
2705 + mcr p15, 0, r1, c3, c0, 0
2706 + @ instruction sync
2707 + instr_sync
2708 + @ restore regs
2709 + ldmia sp!, {r0, r1}
2710 +#endif
2711 + .endm
2712 +
2713 #ifndef CONFIG_THUMB2_KERNEL
2714 .macro svc_exit, rpsr, irq = 0
2715 .if \irq != 0
2716 @@ -203,6 +257,9 @@
2717 blne trace_hardirqs_off
2718 #endif
2719 .endif
2720 +
2721 + pax_exit_kernel
2722 +
2723 msr spsr_cxsf, \rpsr
2724 #if defined(CONFIG_CPU_V6)
2725 ldr r0, [sp]
2726 @@ -266,6 +323,9 @@
2727 blne trace_hardirqs_off
2728 #endif
2729 .endif
2730 +
2731 + pax_exit_kernel
2732 +
2733 ldr lr, [sp, #S_SP] @ top of the stack
2734 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2735 clrex @ clear the exclusive monitor
2736 diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2737 index 918875d..cd5fa27 100644
2738 --- a/arch/arm/kernel/fiq.c
2739 +++ b/arch/arm/kernel/fiq.c
2740 @@ -87,7 +87,10 @@ void set_fiq_handler(void *start, unsigned int length)
2741 void *base = vectors_page;
2742 unsigned offset = FIQ_OFFSET;
2743
2744 + pax_open_kernel();
2745 memcpy(base + offset, start, length);
2746 + pax_close_kernel();
2747 +
2748 if (!cache_is_vipt_nonaliasing())
2749 flush_icache_range((unsigned long)base + offset, offset +
2750 length);
2751 diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2752 index f5f381d..a6f36a1 100644
2753 --- a/arch/arm/kernel/head.S
2754 +++ b/arch/arm/kernel/head.S
2755 @@ -437,7 +437,7 @@ __enable_mmu:
2756 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2757 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2758 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2759 - domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2760 + domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2761 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2762 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2763 #endif
2764 diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2765 index 45e4781..8eac93d 100644
2766 --- a/arch/arm/kernel/module.c
2767 +++ b/arch/arm/kernel/module.c
2768 @@ -38,12 +38,39 @@
2769 #endif
2770
2771 #ifdef CONFIG_MMU
2772 -void *module_alloc(unsigned long size)
2773 +static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2774 {
2775 + if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2776 + return NULL;
2777 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2778 - GFP_KERNEL, PAGE_KERNEL_EXEC, NUMA_NO_NODE,
2779 + GFP_KERNEL, prot, NUMA_NO_NODE,
2780 __builtin_return_address(0));
2781 }
2782 +
2783 +void *module_alloc(unsigned long size)
2784 +{
2785 +
2786 +#ifdef CONFIG_PAX_KERNEXEC
2787 + return __module_alloc(size, PAGE_KERNEL);
2788 +#else
2789 + return __module_alloc(size, PAGE_KERNEL_EXEC);
2790 +#endif
2791 +
2792 +}
2793 +
2794 +#ifdef CONFIG_PAX_KERNEXEC
2795 +void module_free_exec(struct module *mod, void *module_region)
2796 +{
2797 + module_free(mod, module_region);
2798 +}
2799 +EXPORT_SYMBOL(module_free_exec);
2800 +
2801 +void *module_alloc_exec(unsigned long size)
2802 +{
2803 + return __module_alloc(size, PAGE_KERNEL_EXEC);
2804 +}
2805 +EXPORT_SYMBOL(module_alloc_exec);
2806 +#endif
2807 #endif
2808
2809 int
2810 diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2811 index 07314af..c46655c 100644
2812 --- a/arch/arm/kernel/patch.c
2813 +++ b/arch/arm/kernel/patch.c
2814 @@ -18,6 +18,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2815 bool thumb2 = IS_ENABLED(CONFIG_THUMB2_KERNEL);
2816 int size;
2817
2818 + pax_open_kernel();
2819 if (thumb2 && __opcode_is_thumb16(insn)) {
2820 *(u16 *)addr = __opcode_to_mem_thumb16(insn);
2821 size = sizeof(u16);
2822 @@ -39,6 +40,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2823 *(u32 *)addr = insn;
2824 size = sizeof(u32);
2825 }
2826 + pax_close_kernel();
2827
2828 flush_icache_range((uintptr_t)(addr),
2829 (uintptr_t)(addr) + size);
2830 diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2831 index 92f7b15..7048500 100644
2832 --- a/arch/arm/kernel/process.c
2833 +++ b/arch/arm/kernel/process.c
2834 @@ -217,6 +217,7 @@ void machine_power_off(void)
2835
2836 if (pm_power_off)
2837 pm_power_off();
2838 + BUG();
2839 }
2840
2841 /*
2842 @@ -230,7 +231,7 @@ void machine_power_off(void)
2843 * executing pre-reset code, and using RAM that the primary CPU's code wishes
2844 * to use. Implementing such co-ordination would be essentially impossible.
2845 */
2846 -void machine_restart(char *cmd)
2847 +__noreturn void machine_restart(char *cmd)
2848 {
2849 local_irq_disable();
2850 smp_send_stop();
2851 @@ -253,8 +254,8 @@ void __show_regs(struct pt_regs *regs)
2852
2853 show_regs_print_info(KERN_DEFAULT);
2854
2855 - print_symbol("PC is at %s\n", instruction_pointer(regs));
2856 - print_symbol("LR is at %s\n", regs->ARM_lr);
2857 + printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2858 + printk("LR is at %pA\n", (void *)regs->ARM_lr);
2859 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2860 "sp : %08lx ip : %08lx fp : %08lx\n",
2861 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2862 @@ -425,12 +426,6 @@ unsigned long get_wchan(struct task_struct *p)
2863 return 0;
2864 }
2865
2866 -unsigned long arch_randomize_brk(struct mm_struct *mm)
2867 -{
2868 - unsigned long range_end = mm->brk + 0x02000000;
2869 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2870 -}
2871 -
2872 #ifdef CONFIG_MMU
2873 #ifdef CONFIG_KUSER_HELPERS
2874 /*
2875 @@ -446,7 +441,7 @@ static struct vm_area_struct gate_vma = {
2876
2877 static int __init gate_vma_init(void)
2878 {
2879 - gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2880 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2881 return 0;
2882 }
2883 arch_initcall(gate_vma_init);
2884 @@ -472,41 +467,16 @@ int in_gate_area_no_mm(unsigned long addr)
2885
2886 const char *arch_vma_name(struct vm_area_struct *vma)
2887 {
2888 - return is_gate_vma(vma) ? "[vectors]" :
2889 - (vma->vm_mm && vma->vm_start == vma->vm_mm->context.sigpage) ?
2890 - "[sigpage]" : NULL;
2891 + return is_gate_vma(vma) ? "[vectors]" : NULL;
2892 }
2893
2894 -static struct page *signal_page;
2895 -extern struct page *get_signal_page(void);
2896 -
2897 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2898 {
2899 struct mm_struct *mm = current->mm;
2900 - unsigned long addr;
2901 - int ret;
2902 -
2903 - if (!signal_page)
2904 - signal_page = get_signal_page();
2905 - if (!signal_page)
2906 - return -ENOMEM;
2907
2908 down_write(&mm->mmap_sem);
2909 - addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
2910 - if (IS_ERR_VALUE(addr)) {
2911 - ret = addr;
2912 - goto up_fail;
2913 - }
2914 -
2915 - ret = install_special_mapping(mm, addr, PAGE_SIZE,
2916 - VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
2917 - &signal_page);
2918 -
2919 - if (ret == 0)
2920 - mm->context.sigpage = addr;
2921 -
2922 - up_fail:
2923 + mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
2924 up_write(&mm->mmap_sem);
2925 - return ret;
2926 + return 0;
2927 }
2928 #endif
2929 diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
2930 index 4693188..4596c5e 100644
2931 --- a/arch/arm/kernel/psci.c
2932 +++ b/arch/arm/kernel/psci.c
2933 @@ -24,7 +24,7 @@
2934 #include <asm/opcodes-virt.h>
2935 #include <asm/psci.h>
2936
2937 -struct psci_operations psci_ops;
2938 +struct psci_operations psci_ops __read_only;
2939
2940 static int (*invoke_psci_fn)(u32, u32, u32, u32);
2941
2942 diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
2943 index 0dd3b79..e018f64 100644
2944 --- a/arch/arm/kernel/ptrace.c
2945 +++ b/arch/arm/kernel/ptrace.c
2946 @@ -929,10 +929,19 @@ static int tracehook_report_syscall(struct pt_regs *regs,
2947 return current_thread_info()->syscall;
2948 }
2949
2950 +#ifdef CONFIG_GRKERNSEC_SETXID
2951 +extern void gr_delayed_cred_worker(void);
2952 +#endif
2953 +
2954 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
2955 {
2956 current_thread_info()->syscall = scno;
2957
2958 +#ifdef CONFIG_GRKERNSEC_SETXID
2959 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
2960 + gr_delayed_cred_worker();
2961 +#endif
2962 +
2963 /* Do the secure computing check first; failures should be fast. */
2964 if (secure_computing(scno) == -1)
2965 return -1;
2966 diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
2967 index 1e8b030..37c3022 100644
2968 --- a/arch/arm/kernel/setup.c
2969 +++ b/arch/arm/kernel/setup.c
2970 @@ -100,21 +100,23 @@ EXPORT_SYMBOL(system_serial_high);
2971 unsigned int elf_hwcap __read_mostly;
2972 EXPORT_SYMBOL(elf_hwcap);
2973
2974 +pteval_t __supported_pte_mask __read_only;
2975 +pmdval_t __supported_pmd_mask __read_only;
2976
2977 #ifdef MULTI_CPU
2978 -struct processor processor __read_mostly;
2979 +struct processor processor __read_only;
2980 #endif
2981 #ifdef MULTI_TLB
2982 -struct cpu_tlb_fns cpu_tlb __read_mostly;
2983 +struct cpu_tlb_fns cpu_tlb __read_only;
2984 #endif
2985 #ifdef MULTI_USER
2986 -struct cpu_user_fns cpu_user __read_mostly;
2987 +struct cpu_user_fns cpu_user __read_only;
2988 #endif
2989 #ifdef MULTI_CACHE
2990 -struct cpu_cache_fns cpu_cache __read_mostly;
2991 +struct cpu_cache_fns cpu_cache __read_only;
2992 #endif
2993 #ifdef CONFIG_OUTER_CACHE
2994 -struct outer_cache_fns outer_cache __read_mostly;
2995 +struct outer_cache_fns outer_cache __read_only;
2996 EXPORT_SYMBOL(outer_cache);
2997 #endif
2998
2999 @@ -247,9 +249,13 @@ static int __get_cpu_architecture(void)
3000 asm("mrc p15, 0, %0, c0, c1, 4"
3001 : "=r" (mmfr0));
3002 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3003 - (mmfr0 & 0x000000f0) >= 0x00000030)
3004 + (mmfr0 & 0x000000f0) >= 0x00000030) {
3005 cpu_arch = CPU_ARCH_ARMv7;
3006 - else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3007 + if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3008 + __supported_pte_mask |= L_PTE_PXN;
3009 + __supported_pmd_mask |= PMD_PXNTABLE;
3010 + }
3011 + } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3012 (mmfr0 & 0x000000f0) == 0x00000020)
3013 cpu_arch = CPU_ARCH_ARMv6;
3014 else
3015 diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3016 index 04d6388..5115238 100644
3017 --- a/arch/arm/kernel/signal.c
3018 +++ b/arch/arm/kernel/signal.c
3019 @@ -23,8 +23,6 @@
3020
3021 extern const unsigned long sigreturn_codes[7];
3022
3023 -static unsigned long signal_return_offset;
3024 -
3025 #ifdef CONFIG_CRUNCH
3026 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3027 {
3028 @@ -395,8 +393,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3029 * except when the MPU has protected the vectors
3030 * page from PL0
3031 */
3032 - retcode = mm->context.sigpage + signal_return_offset +
3033 - (idx << 2) + thumb;
3034 + retcode = mm->context.sigpage + (idx << 2) + thumb;
3035 } else
3036 #endif
3037 {
3038 @@ -600,33 +597,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3039 } while (thread_flags & _TIF_WORK_MASK);
3040 return 0;
3041 }
3042 -
3043 -struct page *get_signal_page(void)
3044 -{
3045 - unsigned long ptr;
3046 - unsigned offset;
3047 - struct page *page;
3048 - void *addr;
3049 -
3050 - page = alloc_pages(GFP_KERNEL, 0);
3051 -
3052 - if (!page)
3053 - return NULL;
3054 -
3055 - addr = page_address(page);
3056 -
3057 - /* Give the signal return code some randomness */
3058 - offset = 0x200 + (get_random_int() & 0x7fc);
3059 - signal_return_offset = offset;
3060 -
3061 - /*
3062 - * Copy signal return handlers into the vector page, and
3063 - * set sigreturn to be a pointer to these.
3064 - */
3065 - memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3066 -
3067 - ptr = (unsigned long)addr + offset;
3068 - flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3069 -
3070 - return page;
3071 -}
3072 diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3073 index b7b4c86..47c4f77 100644
3074 --- a/arch/arm/kernel/smp.c
3075 +++ b/arch/arm/kernel/smp.c
3076 @@ -73,7 +73,7 @@ enum ipi_msg_type {
3077
3078 static DECLARE_COMPLETION(cpu_running);
3079
3080 -static struct smp_operations smp_ops;
3081 +static struct smp_operations smp_ops __read_only;
3082
3083 void __init smp_set_ops(struct smp_operations *ops)
3084 {
3085 diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
3086 index 7a3be1d..b00c7de 100644
3087 --- a/arch/arm/kernel/tcm.c
3088 +++ b/arch/arm/kernel/tcm.c
3089 @@ -61,7 +61,7 @@ static struct map_desc itcm_iomap[] __initdata = {
3090 .virtual = ITCM_OFFSET,
3091 .pfn = __phys_to_pfn(ITCM_OFFSET),
3092 .length = 0,
3093 - .type = MT_MEMORY_RWX_ITCM,
3094 + .type = MT_MEMORY_RX_ITCM,
3095 }
3096 };
3097
3098 @@ -267,7 +267,9 @@ no_dtcm:
3099 start = &__sitcm_text;
3100 end = &__eitcm_text;
3101 ram = &__itcm_start;
3102 + pax_open_kernel();
3103 memcpy(start, ram, itcm_code_sz);
3104 + pax_close_kernel();
3105 pr_debug("CPU ITCM: copied code from %p - %p\n",
3106 start, end);
3107 itcm_present = true;
3108 diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3109 index 172ee18..ce4ec3d 100644
3110 --- a/arch/arm/kernel/traps.c
3111 +++ b/arch/arm/kernel/traps.c
3112 @@ -62,7 +62,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3113 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3114 {
3115 #ifdef CONFIG_KALLSYMS
3116 - printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3117 + printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3118 #else
3119 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3120 #endif
3121 @@ -264,6 +264,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3122 static int die_owner = -1;
3123 static unsigned int die_nest_count;
3124
3125 +extern void gr_handle_kernel_exploit(void);
3126 +
3127 static unsigned long oops_begin(void)
3128 {
3129 int cpu;
3130 @@ -306,6 +308,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3131 panic("Fatal exception in interrupt");
3132 if (panic_on_oops)
3133 panic("Fatal exception");
3134 +
3135 + gr_handle_kernel_exploit();
3136 +
3137 if (signr)
3138 do_exit(signr);
3139 }
3140 @@ -642,7 +647,9 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
3141 * The user helper at 0xffff0fe0 must be used instead.
3142 * (see entry-armv.S for details)
3143 */
3144 + pax_open_kernel();
3145 *((unsigned int *)0xffff0ff0) = regs->ARM_r0;
3146 + pax_close_kernel();
3147 }
3148 return 0;
3149
3150 @@ -899,7 +906,11 @@ void __init early_trap_init(void *vectors_base)
3151 kuser_init(vectors_base);
3152
3153 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3154 - modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3155 +
3156 +#ifndef CONFIG_PAX_MEMORY_UDEREF
3157 + modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3158 +#endif
3159 +
3160 #else /* ifndef CONFIG_CPU_V7M */
3161 /*
3162 * on V7-M there is no need to copy the vector table to a dedicated
3163 diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3164 index 7bcee5c..e2f3249 100644
3165 --- a/arch/arm/kernel/vmlinux.lds.S
3166 +++ b/arch/arm/kernel/vmlinux.lds.S
3167 @@ -8,7 +8,11 @@
3168 #include <asm/thread_info.h>
3169 #include <asm/memory.h>
3170 #include <asm/page.h>
3171 -
3172 +
3173 +#ifdef CONFIG_PAX_KERNEXEC
3174 +#include <asm/pgtable.h>
3175 +#endif
3176 +
3177 #define PROC_INFO \
3178 . = ALIGN(4); \
3179 VMLINUX_SYMBOL(__proc_info_begin) = .; \
3180 @@ -34,7 +38,7 @@
3181 #endif
3182
3183 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3184 - defined(CONFIG_GENERIC_BUG)
3185 + defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3186 #define ARM_EXIT_KEEP(x) x
3187 #define ARM_EXIT_DISCARD(x)
3188 #else
3189 @@ -90,6 +94,11 @@ SECTIONS
3190 _text = .;
3191 HEAD_TEXT
3192 }
3193 +
3194 +#ifdef CONFIG_PAX_KERNEXEC
3195 + . = ALIGN(1<<SECTION_SHIFT);
3196 +#endif
3197 +
3198 .text : { /* Real text segment */
3199 _stext = .; /* Text and read-only data */
3200 __exception_text_start = .;
3201 @@ -112,6 +121,8 @@ SECTIONS
3202 ARM_CPU_KEEP(PROC_INFO)
3203 }
3204
3205 + _etext = .; /* End of text section */
3206 +
3207 RO_DATA(PAGE_SIZE)
3208
3209 . = ALIGN(4);
3210 @@ -142,7 +153,9 @@ SECTIONS
3211
3212 NOTES
3213
3214 - _etext = .; /* End of text and rodata section */
3215 +#ifdef CONFIG_PAX_KERNEXEC
3216 + . = ALIGN(1<<SECTION_SHIFT);
3217 +#endif
3218
3219 #ifndef CONFIG_XIP_KERNEL
3220 . = ALIGN(PAGE_SIZE);
3221 @@ -220,6 +233,11 @@ SECTIONS
3222 . = PAGE_OFFSET + TEXT_OFFSET;
3223 #else
3224 __init_end = .;
3225 +
3226 +#ifdef CONFIG_PAX_KERNEXEC
3227 + . = ALIGN(1<<SECTION_SHIFT);
3228 +#endif
3229 +
3230 . = ALIGN(THREAD_SIZE);
3231 __data_loc = .;
3232 #endif
3233 diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3234 index bd18bb8..87ede26 100644
3235 --- a/arch/arm/kvm/arm.c
3236 +++ b/arch/arm/kvm/arm.c
3237 @@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
3238 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3239
3240 /* The VMID used in the VTTBR */
3241 -static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3242 +static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3243 static u8 kvm_next_vmid;
3244 static DEFINE_SPINLOCK(kvm_vmid_lock);
3245
3246 @@ -408,7 +408,7 @@ void force_vm_exit(const cpumask_t *mask)
3247 */
3248 static bool need_new_vmid_gen(struct kvm *kvm)
3249 {
3250 - return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3251 + return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3252 }
3253
3254 /**
3255 @@ -441,7 +441,7 @@ static void update_vttbr(struct kvm *kvm)
3256
3257 /* First user of a new VMID generation? */
3258 if (unlikely(kvm_next_vmid == 0)) {
3259 - atomic64_inc(&kvm_vmid_gen);
3260 + atomic64_inc_unchecked(&kvm_vmid_gen);
3261 kvm_next_vmid = 1;
3262
3263 /*
3264 @@ -458,7 +458,7 @@ static void update_vttbr(struct kvm *kvm)
3265 kvm_call_hyp(__kvm_flush_vm_context);
3266 }
3267
3268 - kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3269 + kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3270 kvm->arch.vmid = kvm_next_vmid;
3271 kvm_next_vmid++;
3272
3273 diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3274 index 14a0d98..7771a7d 100644
3275 --- a/arch/arm/lib/clear_user.S
3276 +++ b/arch/arm/lib/clear_user.S
3277 @@ -12,14 +12,14 @@
3278
3279 .text
3280
3281 -/* Prototype: int __clear_user(void *addr, size_t sz)
3282 +/* Prototype: int ___clear_user(void *addr, size_t sz)
3283 * Purpose : clear some user memory
3284 * Params : addr - user memory address to clear
3285 * : sz - number of bytes to clear
3286 * Returns : number of bytes NOT cleared
3287 */
3288 ENTRY(__clear_user_std)
3289 -WEAK(__clear_user)
3290 +WEAK(___clear_user)
3291 stmfd sp!, {r1, lr}
3292 mov r2, #0
3293 cmp r1, #4
3294 @@ -44,7 +44,7 @@ WEAK(__clear_user)
3295 USER( strnebt r2, [r0])
3296 mov r0, #0
3297 ldmfd sp!, {r1, pc}
3298 -ENDPROC(__clear_user)
3299 +ENDPROC(___clear_user)
3300 ENDPROC(__clear_user_std)
3301
3302 .pushsection .fixup,"ax"
3303 diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3304 index 66a477a..bee61d3 100644
3305 --- a/arch/arm/lib/copy_from_user.S
3306 +++ b/arch/arm/lib/copy_from_user.S
3307 @@ -16,7 +16,7 @@
3308 /*
3309 * Prototype:
3310 *
3311 - * size_t __copy_from_user(void *to, const void *from, size_t n)
3312 + * size_t ___copy_from_user(void *to, const void *from, size_t n)
3313 *
3314 * Purpose:
3315 *
3316 @@ -84,11 +84,11 @@
3317
3318 .text
3319
3320 -ENTRY(__copy_from_user)
3321 +ENTRY(___copy_from_user)
3322
3323 #include "copy_template.S"
3324
3325 -ENDPROC(__copy_from_user)
3326 +ENDPROC(___copy_from_user)
3327
3328 .pushsection .fixup,"ax"
3329 .align 0
3330 diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3331 index 6ee2f67..d1cce76 100644
3332 --- a/arch/arm/lib/copy_page.S
3333 +++ b/arch/arm/lib/copy_page.S
3334 @@ -10,6 +10,7 @@
3335 * ASM optimised string functions
3336 */
3337 #include <linux/linkage.h>
3338 +#include <linux/const.h>
3339 #include <asm/assembler.h>
3340 #include <asm/asm-offsets.h>
3341 #include <asm/cache.h>
3342 diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3343 index d066df6..df28194 100644
3344 --- a/arch/arm/lib/copy_to_user.S
3345 +++ b/arch/arm/lib/copy_to_user.S
3346 @@ -16,7 +16,7 @@
3347 /*
3348 * Prototype:
3349 *
3350 - * size_t __copy_to_user(void *to, const void *from, size_t n)
3351 + * size_t ___copy_to_user(void *to, const void *from, size_t n)
3352 *
3353 * Purpose:
3354 *
3355 @@ -88,11 +88,11 @@
3356 .text
3357
3358 ENTRY(__copy_to_user_std)
3359 -WEAK(__copy_to_user)
3360 +WEAK(___copy_to_user)
3361
3362 #include "copy_template.S"
3363
3364 -ENDPROC(__copy_to_user)
3365 +ENDPROC(___copy_to_user)
3366 ENDPROC(__copy_to_user_std)
3367
3368 .pushsection .fixup,"ax"
3369 diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3370 index 7d08b43..f7ca7ea 100644
3371 --- a/arch/arm/lib/csumpartialcopyuser.S
3372 +++ b/arch/arm/lib/csumpartialcopyuser.S
3373 @@ -57,8 +57,8 @@
3374 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3375 */
3376
3377 -#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3378 -#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3379 +#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3380 +#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3381
3382 #include "csumpartialcopygeneric.S"
3383
3384 diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3385 index 5306de3..aed6d03 100644
3386 --- a/arch/arm/lib/delay.c
3387 +++ b/arch/arm/lib/delay.c
3388 @@ -28,7 +28,7 @@
3389 /*
3390 * Default to the loop-based delay implementation.
3391 */
3392 -struct arm_delay_ops arm_delay_ops = {
3393 +struct arm_delay_ops arm_delay_ops __read_only = {
3394 .delay = __loop_delay,
3395 .const_udelay = __loop_const_udelay,
3396 .udelay = __loop_udelay,
3397 diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3398 index 3e58d71..029817c 100644
3399 --- a/arch/arm/lib/uaccess_with_memcpy.c
3400 +++ b/arch/arm/lib/uaccess_with_memcpy.c
3401 @@ -136,7 +136,7 @@ out:
3402 }
3403
3404 unsigned long
3405 -__copy_to_user(void __user *to, const void *from, unsigned long n)
3406 +___copy_to_user(void __user *to, const void *from, unsigned long n)
3407 {
3408 /*
3409 * This test is stubbed out of the main function above to keep
3410 @@ -190,7 +190,7 @@ out:
3411 return n;
3412 }
3413
3414 -unsigned long __clear_user(void __user *addr, unsigned long n)
3415 +unsigned long ___clear_user(void __user *addr, unsigned long n)
3416 {
3417 /* See rational for this in __copy_to_user() above. */
3418 if (n < 64)
3419 diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
3420 index f7ca97b..3d7e719 100644
3421 --- a/arch/arm/mach-at91/setup.c
3422 +++ b/arch/arm/mach-at91/setup.c
3423 @@ -81,7 +81,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
3424
3425 desc->pfn = __phys_to_pfn(base);
3426 desc->length = length;
3427 - desc->type = MT_MEMORY_RWX_NONCACHED;
3428 + desc->type = MT_MEMORY_RW_NONCACHED;
3429
3430 pr_info("AT91: sram at 0x%lx of 0x%x mapped at 0x%lx\n",
3431 base, length, desc->virtual);
3432 diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
3433 index f3407a5..bd4256f 100644
3434 --- a/arch/arm/mach-kirkwood/common.c
3435 +++ b/arch/arm/mach-kirkwood/common.c
3436 @@ -156,7 +156,16 @@ static void clk_gate_fn_disable(struct clk_hw *hw)
3437 clk_gate_ops.disable(hw);
3438 }
3439
3440 -static struct clk_ops clk_gate_fn_ops;
3441 +static int clk_gate_fn_is_enabled(struct clk_hw *hw)
3442 +{
3443 + return clk_gate_ops.is_enabled(hw);
3444 +}
3445 +
3446 +static struct clk_ops clk_gate_fn_ops = {
3447 + .enable = clk_gate_fn_enable,
3448 + .disable = clk_gate_fn_disable,
3449 + .is_enabled = clk_gate_fn_is_enabled,
3450 +};
3451
3452 static struct clk __init *clk_register_gate_fn(struct device *dev,
3453 const char *name,
3454 @@ -190,14 +199,6 @@ static struct clk __init *clk_register_gate_fn(struct device *dev,
3455 gate_fn->fn_en = fn_en;
3456 gate_fn->fn_dis = fn_dis;
3457
3458 - /* ops is the gate ops, but with our enable/disable functions */
3459 - if (clk_gate_fn_ops.enable != clk_gate_fn_enable ||
3460 - clk_gate_fn_ops.disable != clk_gate_fn_disable) {
3461 - clk_gate_fn_ops = clk_gate_ops;
3462 - clk_gate_fn_ops.enable = clk_gate_fn_enable;
3463 - clk_gate_fn_ops.disable = clk_gate_fn_disable;
3464 - }
3465 -
3466 clk = clk_register(dev, &gate_fn->gate.hw);
3467
3468 if (IS_ERR(clk))
3469 diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3470 index aead77a..a2253fa 100644
3471 --- a/arch/arm/mach-omap2/board-n8x0.c
3472 +++ b/arch/arm/mach-omap2/board-n8x0.c
3473 @@ -568,7 +568,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3474 }
3475 #endif
3476
3477 -static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3478 +static struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3479 .late_init = n8x0_menelaus_late_init,
3480 };
3481
3482 diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
3483 index ab43755..ccfa231 100644
3484 --- a/arch/arm/mach-omap2/gpmc.c
3485 +++ b/arch/arm/mach-omap2/gpmc.c
3486 @@ -148,7 +148,6 @@ struct omap3_gpmc_regs {
3487 };
3488
3489 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
3490 -static struct irq_chip gpmc_irq_chip;
3491 static int gpmc_irq_start;
3492
3493 static struct resource gpmc_mem_root;
3494 @@ -716,6 +715,18 @@ static void gpmc_irq_noop(struct irq_data *data) { }
3495
3496 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
3497
3498 +static struct irq_chip gpmc_irq_chip = {
3499 + .name = "gpmc",
3500 + .irq_startup = gpmc_irq_noop_ret,
3501 + .irq_enable = gpmc_irq_enable,
3502 + .irq_disable = gpmc_irq_disable,
3503 + .irq_shutdown = gpmc_irq_noop,
3504 + .irq_ack = gpmc_irq_noop,
3505 + .irq_mask = gpmc_irq_noop,
3506 + .irq_unmask = gpmc_irq_noop,
3507 +
3508 +};
3509 +
3510 static int gpmc_setup_irq(void)
3511 {
3512 int i;
3513 @@ -730,15 +741,6 @@ static int gpmc_setup_irq(void)
3514 return gpmc_irq_start;
3515 }
3516
3517 - gpmc_irq_chip.name = "gpmc";
3518 - gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
3519 - gpmc_irq_chip.irq_enable = gpmc_irq_enable;
3520 - gpmc_irq_chip.irq_disable = gpmc_irq_disable;
3521 - gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
3522 - gpmc_irq_chip.irq_ack = gpmc_irq_noop;
3523 - gpmc_irq_chip.irq_mask = gpmc_irq_noop;
3524 - gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
3525 -
3526 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
3527 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
3528
3529 diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3530 index 667915d..2ee1219 100644
3531 --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3532 +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3533 @@ -84,7 +84,7 @@ struct cpu_pm_ops {
3534 int (*finish_suspend)(unsigned long cpu_state);
3535 void (*resume)(void);
3536 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3537 -};
3538 +} __no_const;
3539
3540 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3541 static struct powerdomain *mpuss_pd;
3542 @@ -102,7 +102,7 @@ static void dummy_cpu_resume(void)
3543 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3544 {}
3545
3546 -struct cpu_pm_ops omap_pm_ops = {
3547 +static struct cpu_pm_ops omap_pm_ops __read_only = {
3548 .finish_suspend = default_finish_suspend,
3549 .resume = dummy_cpu_resume,
3550 .scu_prepare = dummy_scu_prepare,
3551 diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3552 index 3664562..72f85c6 100644
3553 --- a/arch/arm/mach-omap2/omap-wakeupgen.c
3554 +++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3555 @@ -343,7 +343,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3556 return NOTIFY_OK;
3557 }
3558
3559 -static struct notifier_block __refdata irq_hotplug_notifier = {
3560 +static struct notifier_block irq_hotplug_notifier = {
3561 .notifier_call = irq_cpu_hotplug_notify,
3562 };
3563
3564 diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3565 index 01ef59d..32ae28a8 100644
3566 --- a/arch/arm/mach-omap2/omap_device.c
3567 +++ b/arch/arm/mach-omap2/omap_device.c
3568 @@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3569 struct platform_device __init *omap_device_build(const char *pdev_name,
3570 int pdev_id,
3571 struct omap_hwmod *oh,
3572 - void *pdata, int pdata_len)
3573 + const void *pdata, int pdata_len)
3574 {
3575 struct omap_hwmod *ohs[] = { oh };
3576
3577 @@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3578 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3579 int pdev_id,
3580 struct omap_hwmod **ohs,
3581 - int oh_cnt, void *pdata,
3582 + int oh_cnt, const void *pdata,
3583 int pdata_len)
3584 {
3585 int ret = -ENOMEM;
3586 diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3587 index 78c02b3..c94109a 100644
3588 --- a/arch/arm/mach-omap2/omap_device.h
3589 +++ b/arch/arm/mach-omap2/omap_device.h
3590 @@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3591 /* Core code interface */
3592
3593 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3594 - struct omap_hwmod *oh, void *pdata,
3595 + struct omap_hwmod *oh, const void *pdata,
3596 int pdata_len);
3597
3598 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3599 struct omap_hwmod **oh, int oh_cnt,
3600 - void *pdata, int pdata_len);
3601 + const void *pdata, int pdata_len);
3602
3603 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3604 struct omap_hwmod **ohs, int oh_cnt);
3605 diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3606 index 1f33f5d..b29fa75 100644
3607 --- a/arch/arm/mach-omap2/omap_hwmod.c
3608 +++ b/arch/arm/mach-omap2/omap_hwmod.c
3609 @@ -194,10 +194,10 @@ struct omap_hwmod_soc_ops {
3610 int (*init_clkdm)(struct omap_hwmod *oh);
3611 void (*update_context_lost)(struct omap_hwmod *oh);
3612 int (*get_context_lost)(struct omap_hwmod *oh);
3613 -};
3614 +} __no_const;
3615
3616 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3617 -static struct omap_hwmod_soc_ops soc_ops;
3618 +static struct omap_hwmod_soc_ops soc_ops __read_only;
3619
3620 /* omap_hwmod_list contains all registered struct omap_hwmods */
3621 static LIST_HEAD(omap_hwmod_list);
3622 diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3623 index 95fee54..cfa9cf1 100644
3624 --- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3625 +++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3626 @@ -10,6 +10,7 @@
3627
3628 #include <linux/kernel.h>
3629 #include <linux/init.h>
3630 +#include <asm/pgtable.h>
3631
3632 #include "powerdomain.h"
3633
3634 @@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3635
3636 void __init am43xx_powerdomains_init(void)
3637 {
3638 - omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3639 + pax_open_kernel();
3640 + *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3641 + pax_close_kernel();
3642 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3643 pwrdm_register_pwrdms(powerdomains_am43xx);
3644 pwrdm_complete_init();
3645 diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3646 index d15c7bb..b2d1f0c 100644
3647 --- a/arch/arm/mach-omap2/wd_timer.c
3648 +++ b/arch/arm/mach-omap2/wd_timer.c
3649 @@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3650 struct omap_hwmod *oh;
3651 char *oh_name = "wd_timer2";
3652 char *dev_name = "omap_wdt";
3653 - struct omap_wd_timer_platform_data pdata;
3654 + static struct omap_wd_timer_platform_data pdata = {
3655 + .read_reset_sources = prm_read_reset_sources
3656 + };
3657
3658 if (!cpu_class_is_omap2() || of_have_populated_dt())
3659 return 0;
3660 @@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3661 return -EINVAL;
3662 }
3663
3664 - pdata.read_reset_sources = prm_read_reset_sources;
3665 -
3666 pdev = omap_device_build(dev_name, id, oh, &pdata,
3667 sizeof(struct omap_wd_timer_platform_data));
3668 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3669 diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3670 index b82dcae..44ee5b6 100644
3671 --- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3672 +++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3673 @@ -180,7 +180,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3674 bool entered_lp2 = false;
3675
3676 if (tegra_pending_sgi())
3677 - ACCESS_ONCE(abort_flag) = true;
3678 + ACCESS_ONCE_RW(abort_flag) = true;
3679
3680 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3681
3682 diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3683 index 2dea8b5..6499da2 100644
3684 --- a/arch/arm/mach-ux500/setup.h
3685 +++ b/arch/arm/mach-ux500/setup.h
3686 @@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3687 .type = MT_DEVICE, \
3688 }
3689
3690 -#define __MEM_DEV_DESC(x, sz) { \
3691 - .virtual = IO_ADDRESS(x), \
3692 - .pfn = __phys_to_pfn(x), \
3693 - .length = sz, \
3694 - .type = MT_MEMORY_RWX, \
3695 -}
3696 -
3697 extern struct smp_operations ux500_smp_ops;
3698 extern void ux500_cpu_die(unsigned int cpu);
3699
3700 diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3701 index 1f8fed9..14d7823 100644
3702 --- a/arch/arm/mm/Kconfig
3703 +++ b/arch/arm/mm/Kconfig
3704 @@ -446,7 +446,7 @@ config CPU_32v5
3705
3706 config CPU_32v6
3707 bool
3708 - select CPU_USE_DOMAINS if CPU_V6 && MMU
3709 + select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3710 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3711
3712 config CPU_32v6K
3713 @@ -601,6 +601,7 @@ config CPU_CP15_MPU
3714
3715 config CPU_USE_DOMAINS
3716 bool
3717 + depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3718 help
3719 This option enables or disables the use of domain switching
3720 via the set_fs() function.
3721 @@ -800,6 +801,7 @@ config NEED_KUSER_HELPERS
3722 config KUSER_HELPERS
3723 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3724 default y
3725 + depends on !(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND
3726 help
3727 Warning: disabling this option may break user programs.
3728
3729 @@ -812,7 +814,7 @@ config KUSER_HELPERS
3730 See Documentation/arm/kernel_user_helpers.txt for details.
3731
3732 However, the fixed address nature of these helpers can be used
3733 - by ROP (return orientated programming) authors when creating
3734 + by ROP (Return Oriented Programming) authors when creating
3735 exploits.
3736
3737 If all of the binaries and libraries which run on your platform
3738 diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3739 index 9240364..a2b8cf3 100644
3740 --- a/arch/arm/mm/alignment.c
3741 +++ b/arch/arm/mm/alignment.c
3742 @@ -212,10 +212,12 @@ union offset_union {
3743 #define __get16_unaligned_check(ins,val,addr) \
3744 do { \
3745 unsigned int err = 0, v, a = addr; \
3746 + pax_open_userland(); \
3747 __get8_unaligned_check(ins,v,a,err); \
3748 val = v << ((BE) ? 8 : 0); \
3749 __get8_unaligned_check(ins,v,a,err); \
3750 val |= v << ((BE) ? 0 : 8); \
3751 + pax_close_userland(); \
3752 if (err) \
3753 goto fault; \
3754 } while (0)
3755 @@ -229,6 +231,7 @@ union offset_union {
3756 #define __get32_unaligned_check(ins,val,addr) \
3757 do { \
3758 unsigned int err = 0, v, a = addr; \
3759 + pax_open_userland(); \
3760 __get8_unaligned_check(ins,v,a,err); \
3761 val = v << ((BE) ? 24 : 0); \
3762 __get8_unaligned_check(ins,v,a,err); \
3763 @@ -237,6 +240,7 @@ union offset_union {
3764 val |= v << ((BE) ? 8 : 16); \
3765 __get8_unaligned_check(ins,v,a,err); \
3766 val |= v << ((BE) ? 0 : 24); \
3767 + pax_close_userland(); \
3768 if (err) \
3769 goto fault; \
3770 } while (0)
3771 @@ -250,6 +254,7 @@ union offset_union {
3772 #define __put16_unaligned_check(ins,val,addr) \
3773 do { \
3774 unsigned int err = 0, v = val, a = addr; \
3775 + pax_open_userland(); \
3776 __asm__( FIRST_BYTE_16 \
3777 ARM( "1: "ins" %1, [%2], #1\n" ) \
3778 THUMB( "1: "ins" %1, [%2]\n" ) \
3779 @@ -269,6 +274,7 @@ union offset_union {
3780 " .popsection\n" \
3781 : "=r" (err), "=&r" (v), "=&r" (a) \
3782 : "0" (err), "1" (v), "2" (a)); \
3783 + pax_close_userland(); \
3784 if (err) \
3785 goto fault; \
3786 } while (0)
3787 @@ -282,6 +288,7 @@ union offset_union {
3788 #define __put32_unaligned_check(ins,val,addr) \
3789 do { \
3790 unsigned int err = 0, v = val, a = addr; \
3791 + pax_open_userland(); \
3792 __asm__( FIRST_BYTE_32 \
3793 ARM( "1: "ins" %1, [%2], #1\n" ) \
3794 THUMB( "1: "ins" %1, [%2]\n" ) \
3795 @@ -311,6 +318,7 @@ union offset_union {
3796 " .popsection\n" \
3797 : "=r" (err), "=&r" (v), "=&r" (a) \
3798 : "0" (err), "1" (v), "2" (a)); \
3799 + pax_close_userland(); \
3800 if (err) \
3801 goto fault; \
3802 } while (0)
3803 diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3804 index 7abde2c..9df495f 100644
3805 --- a/arch/arm/mm/cache-l2x0.c
3806 +++ b/arch/arm/mm/cache-l2x0.c
3807 @@ -46,7 +46,7 @@ struct l2x0_of_data {
3808 void (*setup)(const struct device_node *, u32 *, u32 *);
3809 void (*save)(void);
3810 struct outer_cache_fns outer_cache;
3811 -};
3812 +} __do_const;
3813
3814 static bool of_init = false;
3815
3816 diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3817 index 6eb97b3..ac509f6 100644
3818 --- a/arch/arm/mm/context.c
3819 +++ b/arch/arm/mm/context.c
3820 @@ -43,7 +43,7 @@
3821 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3822
3823 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3824 -static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3825 +static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3826 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3827
3828 static DEFINE_PER_CPU(atomic64_t, active_asids);
3829 @@ -182,7 +182,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3830 {
3831 static u32 cur_idx = 1;
3832 u64 asid = atomic64_read(&mm->context.id);
3833 - u64 generation = atomic64_read(&asid_generation);
3834 + u64 generation = atomic64_read_unchecked(&asid_generation);
3835
3836 if (asid != 0 && is_reserved_asid(asid)) {
3837 /*
3838 @@ -203,7 +203,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3839 */
3840 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3841 if (asid == NUM_USER_ASIDS) {
3842 - generation = atomic64_add_return(ASID_FIRST_VERSION,
3843 + generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3844 &asid_generation);
3845 flush_context(cpu);
3846 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3847 @@ -234,14 +234,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3848 cpu_set_reserved_ttbr0();
3849
3850 asid = atomic64_read(&mm->context.id);
3851 - if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3852 + if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3853 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3854 goto switch_mm_fastpath;
3855
3856 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3857 /* Check that our ASID belongs to the current generation. */
3858 asid = atomic64_read(&mm->context.id);
3859 - if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3860 + if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3861 asid = new_context(mm, cpu);
3862 atomic64_set(&mm->context.id, asid);
3863 }
3864 diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3865 index eb8830a..5360ce7 100644
3866 --- a/arch/arm/mm/fault.c
3867 +++ b/arch/arm/mm/fault.c
3868 @@ -25,6 +25,7 @@
3869 #include <asm/system_misc.h>
3870 #include <asm/system_info.h>
3871 #include <asm/tlbflush.h>
3872 +#include <asm/sections.h>
3873
3874 #include "fault.h"
3875
3876 @@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3877 if (fixup_exception(regs))
3878 return;
3879
3880 +#ifdef CONFIG_PAX_MEMORY_UDEREF
3881 + if (addr < TASK_SIZE) {
3882 + if (current->signal->curr_ip)
3883 + 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),
3884 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3885 + else
3886 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3887 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3888 + }
3889 +#endif
3890 +
3891 +#ifdef CONFIG_PAX_KERNEXEC
3892 + if ((fsr & FSR_WRITE) &&
3893 + (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3894 + (MODULES_VADDR <= addr && addr < MODULES_END)))
3895 + {
3896 + if (current->signal->curr_ip)
3897 + 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),
3898 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3899 + else
3900 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3901 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3902 + }
3903 +#endif
3904 +
3905 /*
3906 * No handler, we'll have to terminate things with extreme prejudice.
3907 */
3908 @@ -174,6 +200,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3909 }
3910 #endif
3911
3912 +#ifdef CONFIG_PAX_PAGEEXEC
3913 + if (fsr & FSR_LNX_PF) {
3914 + pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3915 + do_group_exit(SIGKILL);
3916 + }
3917 +#endif
3918 +
3919 tsk->thread.address = addr;
3920 tsk->thread.error_code = fsr;
3921 tsk->thread.trap_no = 14;
3922 @@ -401,6 +434,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3923 }
3924 #endif /* CONFIG_MMU */
3925
3926 +#ifdef CONFIG_PAX_PAGEEXEC
3927 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3928 +{
3929 + long i;
3930 +
3931 + printk(KERN_ERR "PAX: bytes at PC: ");
3932 + for (i = 0; i < 20; i++) {
3933 + unsigned char c;
3934 + if (get_user(c, (__force unsigned char __user *)pc+i))
3935 + printk(KERN_CONT "?? ");
3936 + else
3937 + printk(KERN_CONT "%02x ", c);
3938 + }
3939 + printk("\n");
3940 +
3941 + printk(KERN_ERR "PAX: bytes at SP-4: ");
3942 + for (i = -1; i < 20; i++) {
3943 + unsigned long c;
3944 + if (get_user(c, (__force unsigned long __user *)sp+i))
3945 + printk(KERN_CONT "???????? ");
3946 + else
3947 + printk(KERN_CONT "%08lx ", c);
3948 + }
3949 + printk("\n");
3950 +}
3951 +#endif
3952 +
3953 /*
3954 * First Level Translation Fault Handler
3955 *
3956 @@ -548,9 +608,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3957 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
3958 struct siginfo info;
3959
3960 +#ifdef CONFIG_PAX_MEMORY_UDEREF
3961 + if (addr < TASK_SIZE && is_domain_fault(fsr)) {
3962 + if (current->signal->curr_ip)
3963 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3964 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3965 + else
3966 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3967 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3968 + goto die;
3969 + }
3970 +#endif
3971 +
3972 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
3973 return;
3974
3975 +die:
3976 printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
3977 inf->name, fsr, addr);
3978
3979 @@ -574,15 +647,98 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
3980 ifsr_info[nr].name = name;
3981 }
3982
3983 +asmlinkage int sys_sigreturn(struct pt_regs *regs);
3984 +asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
3985 +
3986 asmlinkage void __exception
3987 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
3988 {
3989 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
3990 struct siginfo info;
3991 + unsigned long pc = instruction_pointer(regs);
3992 +
3993 + if (user_mode(regs)) {
3994 + unsigned long sigpage = current->mm->context.sigpage;
3995 +
3996 + if (sigpage <= pc && pc < sigpage + 7*4) {
3997 + if (pc < sigpage + 3*4)
3998 + sys_sigreturn(regs);
3999 + else
4000 + sys_rt_sigreturn(regs);
4001 + return;
4002 + }
4003 + if (pc == 0xffff0f60UL) {
4004 + /*
4005 + * PaX: __kuser_cmpxchg64 emulation
4006 + */
4007 + // TODO
4008 + //regs->ARM_pc = regs->ARM_lr;
4009 + //return;
4010 + }
4011 + if (pc == 0xffff0fa0UL) {
4012 + /*
4013 + * PaX: __kuser_memory_barrier emulation
4014 + */
4015 + // dmb(); implied by the exception
4016 + regs->ARM_pc = regs->ARM_lr;
4017 + return;
4018 + }
4019 + if (pc == 0xffff0fc0UL) {
4020 + /*
4021 + * PaX: __kuser_cmpxchg emulation
4022 + */
4023 + // TODO
4024 + //long new;
4025 + //int op;
4026 +
4027 + //op = FUTEX_OP_SET << 28;
4028 + //new = futex_atomic_op_inuser(op, regs->ARM_r2);
4029 + //regs->ARM_r0 = old != new;
4030 + //regs->ARM_pc = regs->ARM_lr;
4031 + //return;
4032 + }
4033 + if (pc == 0xffff0fe0UL) {
4034 + /*
4035 + * PaX: __kuser_get_tls emulation
4036 + */
4037 + regs->ARM_r0 = current_thread_info()->tp_value[0];
4038 + regs->ARM_pc = regs->ARM_lr;
4039 + return;
4040 + }
4041 + }
4042 +
4043 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4044 + else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
4045 + if (current->signal->curr_ip)
4046 + 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),
4047 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4048 + pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4049 + else
4050 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4051 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4052 + pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4053 + goto die;
4054 + }
4055 +#endif
4056 +
4057 +#ifdef CONFIG_PAX_REFCOUNT
4058 + if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4059 + unsigned int bkpt;
4060 +
4061 + if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4062 + current->thread.error_code = ifsr;
4063 + current->thread.trap_no = 0;
4064 + pax_report_refcount_overflow(regs);
4065 + fixup_exception(regs);
4066 + return;
4067 + }
4068 + }
4069 +#endif
4070
4071 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4072 return;
4073
4074 +die:
4075 printk(KERN_ALERT "Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4076 inf->name, ifsr, addr);
4077
4078 diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4079 index cf08bdf..772656c 100644
4080 --- a/arch/arm/mm/fault.h
4081 +++ b/arch/arm/mm/fault.h
4082 @@ -3,6 +3,7 @@
4083
4084 /*
4085 * Fault status register encodings. We steal bit 31 for our own purposes.
4086 + * Set when the FSR value is from an instruction fault.
4087 */
4088 #define FSR_LNX_PF (1 << 31)
4089 #define FSR_WRITE (1 << 11)
4090 @@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4091 }
4092 #endif
4093
4094 +/* valid for LPAE and !LPAE */
4095 +static inline int is_xn_fault(unsigned int fsr)
4096 +{
4097 + return ((fsr_fs(fsr) & 0x3c) == 0xc);
4098 +}
4099 +
4100 +static inline int is_domain_fault(unsigned int fsr)
4101 +{
4102 + return ((fsr_fs(fsr) & 0xD) == 0x9);
4103 +}
4104 +
4105 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4106 unsigned long search_exception_table(unsigned long addr);
4107
4108 diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4109 index 804d615..fcec50a 100644
4110 --- a/arch/arm/mm/init.c
4111 +++ b/arch/arm/mm/init.c
4112 @@ -30,6 +30,8 @@
4113 #include <asm/setup.h>
4114 #include <asm/tlb.h>
4115 #include <asm/fixmap.h>
4116 +#include <asm/system_info.h>
4117 +#include <asm/cp15.h>
4118
4119 #include <asm/mach/arch.h>
4120 #include <asm/mach/map.h>
4121 @@ -625,7 +627,46 @@ void free_initmem(void)
4122 {
4123 #ifdef CONFIG_HAVE_TCM
4124 extern char __tcm_start, __tcm_end;
4125 +#endif
4126
4127 +#ifdef CONFIG_PAX_KERNEXEC
4128 + unsigned long addr;
4129 + pgd_t *pgd;
4130 + pud_t *pud;
4131 + pmd_t *pmd;
4132 + int cpu_arch = cpu_architecture();
4133 + unsigned int cr = get_cr();
4134 +
4135 + if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4136 + /* make pages tables, etc before .text NX */
4137 + for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4138 + pgd = pgd_offset_k(addr);
4139 + pud = pud_offset(pgd, addr);
4140 + pmd = pmd_offset(pud, addr);
4141 + __section_update(pmd, addr, PMD_SECT_XN);
4142 + }
4143 + /* make init NX */
4144 + for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4145 + pgd = pgd_offset_k(addr);
4146 + pud = pud_offset(pgd, addr);
4147 + pmd = pmd_offset(pud, addr);
4148 + __section_update(pmd, addr, PMD_SECT_XN);
4149 + }
4150 + /* make kernel code/rodata RX */
4151 + for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4152 + pgd = pgd_offset_k(addr);
4153 + pud = pud_offset(pgd, addr);
4154 + pmd = pmd_offset(pud, addr);
4155 +#ifdef CONFIG_ARM_LPAE
4156 + __section_update(pmd, addr, PMD_SECT_RDONLY);
4157 +#else
4158 + __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4159 +#endif
4160 + }
4161 + }
4162 +#endif
4163 +
4164 +#ifdef CONFIG_HAVE_TCM
4165 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4166 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4167 #endif
4168 diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4169 index f9c32ba..8540068 100644
4170 --- a/arch/arm/mm/ioremap.c
4171 +++ b/arch/arm/mm/ioremap.c
4172 @@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4173 unsigned int mtype;
4174
4175 if (cached)
4176 - mtype = MT_MEMORY_RWX;
4177 + mtype = MT_MEMORY_RX;
4178 else
4179 - mtype = MT_MEMORY_RWX_NONCACHED;
4180 + mtype = MT_MEMORY_RX_NONCACHED;
4181
4182 return __arm_ioremap_caller(phys_addr, size, mtype,
4183 __builtin_return_address(0));
4184 diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4185 index 5e85ed3..b10a7ed 100644
4186 --- a/arch/arm/mm/mmap.c
4187 +++ b/arch/arm/mm/mmap.c
4188 @@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4189 struct vm_area_struct *vma;
4190 int do_align = 0;
4191 int aliasing = cache_is_vipt_aliasing();
4192 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4193 struct vm_unmapped_area_info info;
4194
4195 /*
4196 @@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4197 if (len > TASK_SIZE)
4198 return -ENOMEM;
4199
4200 +#ifdef CONFIG_PAX_RANDMMAP
4201 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4202 +#endif
4203 +
4204 if (addr) {
4205 if (do_align)
4206 addr = COLOUR_ALIGN(addr, pgoff);
4207 @@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4208 addr = PAGE_ALIGN(addr);
4209
4210 vma = find_vma(mm, addr);
4211 - if (TASK_SIZE - len >= addr &&
4212 - (!vma || addr + len <= vma->vm_start))
4213 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4214 return addr;
4215 }
4216
4217 @@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4218 info.high_limit = TASK_SIZE;
4219 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4220 info.align_offset = pgoff << PAGE_SHIFT;
4221 + info.threadstack_offset = offset;
4222 return vm_unmapped_area(&info);
4223 }
4224
4225 @@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4226 unsigned long addr = addr0;
4227 int do_align = 0;
4228 int aliasing = cache_is_vipt_aliasing();
4229 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4230 struct vm_unmapped_area_info info;
4231
4232 /*
4233 @@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4234 return addr;
4235 }
4236
4237 +#ifdef CONFIG_PAX_RANDMMAP
4238 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4239 +#endif
4240 +
4241 /* requesting a specific address */
4242 if (addr) {
4243 if (do_align)
4244 @@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4245 else
4246 addr = PAGE_ALIGN(addr);
4247 vma = find_vma(mm, addr);
4248 - if (TASK_SIZE - len >= addr &&
4249 - (!vma || addr + len <= vma->vm_start))
4250 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4251 return addr;
4252 }
4253
4254 @@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4255 info.high_limit = mm->mmap_base;
4256 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4257 info.align_offset = pgoff << PAGE_SHIFT;
4258 + info.threadstack_offset = offset;
4259 addr = vm_unmapped_area(&info);
4260
4261 /*
4262 @@ -173,6 +183,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4263 {
4264 unsigned long random_factor = 0UL;
4265
4266 +#ifdef CONFIG_PAX_RANDMMAP
4267 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4268 +#endif
4269 +
4270 /* 8 bits of randomness in 20 address space bits */
4271 if ((current->flags & PF_RANDOMIZE) &&
4272 !(current->personality & ADDR_NO_RANDOMIZE))
4273 @@ -180,9 +194,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4274
4275 if (mmap_is_legacy()) {
4276 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4277 +
4278 +#ifdef CONFIG_PAX_RANDMMAP
4279 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4280 + mm->mmap_base += mm->delta_mmap;
4281 +#endif
4282 +
4283 mm->get_unmapped_area = arch_get_unmapped_area;
4284 } else {
4285 mm->mmap_base = mmap_base(random_factor);
4286 +
4287 +#ifdef CONFIG_PAX_RANDMMAP
4288 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4289 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4290 +#endif
4291 +
4292 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4293 }
4294 }
4295 diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4296 index a623cb3..a896d84 100644
4297 --- a/arch/arm/mm/mmu.c
4298 +++ b/arch/arm/mm/mmu.c
4299 @@ -39,6 +39,22 @@
4300 #include "mm.h"
4301 #include "tcm.h"
4302
4303 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4304 +void modify_domain(unsigned int dom, unsigned int type)
4305 +{
4306 + struct thread_info *thread = current_thread_info();
4307 + unsigned int domain = thread->cpu_domain;
4308 + /*
4309 + * DOMAIN_MANAGER might be defined to some other value,
4310 + * use the arch-defined constant
4311 + */
4312 + domain &= ~domain_val(dom, 3);
4313 + thread->cpu_domain = domain | domain_val(dom, type);
4314 + set_domain(thread->cpu_domain);
4315 +}
4316 +EXPORT_SYMBOL(modify_domain);
4317 +#endif
4318 +
4319 /*
4320 * empty_zero_page is a special page that is used for
4321 * zero-initialized data and COW.
4322 @@ -235,7 +251,15 @@ __setup("noalign", noalign_setup);
4323 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4324 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4325
4326 -static struct mem_type mem_types[] = {
4327 +#ifdef CONFIG_PAX_KERNEXEC
4328 +#define L_PTE_KERNEXEC L_PTE_RDONLY
4329 +#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4330 +#else
4331 +#define L_PTE_KERNEXEC L_PTE_DIRTY
4332 +#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4333 +#endif
4334 +
4335 +static struct mem_type mem_types[] __read_only = {
4336 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4337 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4338 L_PTE_SHARED,
4339 @@ -264,19 +288,19 @@ static struct mem_type mem_types[] = {
4340 .prot_sect = PROT_SECT_DEVICE,
4341 .domain = DOMAIN_IO,
4342 },
4343 - [MT_UNCACHED] = {
4344 + [MT_UNCACHED_RW] = {
4345 .prot_pte = PROT_PTE_DEVICE,
4346 .prot_l1 = PMD_TYPE_TABLE,
4347 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4348 .domain = DOMAIN_IO,
4349 },
4350 - [MT_CACHECLEAN] = {
4351 - .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4352 + [MT_CACHECLEAN_RO] = {
4353 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4354 .domain = DOMAIN_KERNEL,
4355 },
4356 #ifndef CONFIG_ARM_LPAE
4357 - [MT_MINICLEAN] = {
4358 - .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4359 + [MT_MINICLEAN_RO] = {
4360 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4361 .domain = DOMAIN_KERNEL,
4362 },
4363 #endif
4364 @@ -284,15 +308,15 @@ static struct mem_type mem_types[] = {
4365 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4366 L_PTE_RDONLY,
4367 .prot_l1 = PMD_TYPE_TABLE,
4368 - .domain = DOMAIN_USER,
4369 + .domain = DOMAIN_VECTORS,
4370 },
4371 [MT_HIGH_VECTORS] = {
4372 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4373 L_PTE_USER | L_PTE_RDONLY,
4374 .prot_l1 = PMD_TYPE_TABLE,
4375 - .domain = DOMAIN_USER,
4376 + .domain = DOMAIN_VECTORS,
4377 },
4378 - [MT_MEMORY_RWX] = {
4379 + [__MT_MEMORY_RWX] = {
4380 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4381 .prot_l1 = PMD_TYPE_TABLE,
4382 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4383 @@ -305,17 +329,30 @@ static struct mem_type mem_types[] = {
4384 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4385 .domain = DOMAIN_KERNEL,
4386 },
4387 - [MT_ROM] = {
4388 - .prot_sect = PMD_TYPE_SECT,
4389 + [MT_MEMORY_RX] = {
4390 + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4391 + .prot_l1 = PMD_TYPE_TABLE,
4392 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4393 + .domain = DOMAIN_KERNEL,
4394 + },
4395 + [MT_ROM_RX] = {
4396 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4397 .domain = DOMAIN_KERNEL,
4398 },
4399 - [MT_MEMORY_RWX_NONCACHED] = {
4400 + [MT_MEMORY_RW_NONCACHED] = {
4401 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4402 L_PTE_MT_BUFFERABLE,
4403 .prot_l1 = PMD_TYPE_TABLE,
4404 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4405 .domain = DOMAIN_KERNEL,
4406 },
4407 + [MT_MEMORY_RX_NONCACHED] = {
4408 + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4409 + L_PTE_MT_BUFFERABLE,
4410 + .prot_l1 = PMD_TYPE_TABLE,
4411 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4412 + .domain = DOMAIN_KERNEL,
4413 + },
4414 [MT_MEMORY_RW_DTCM] = {
4415 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4416 L_PTE_XN,
4417 @@ -323,9 +360,10 @@ static struct mem_type mem_types[] = {
4418 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4419 .domain = DOMAIN_KERNEL,
4420 },
4421 - [MT_MEMORY_RWX_ITCM] = {
4422 - .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4423 + [MT_MEMORY_RX_ITCM] = {
4424 + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4425 .prot_l1 = PMD_TYPE_TABLE,
4426 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4427 .domain = DOMAIN_KERNEL,
4428 },
4429 [MT_MEMORY_RW_SO] = {
4430 @@ -524,9 +562,14 @@ static void __init build_mem_type_table(void)
4431 * Mark cache clean areas and XIP ROM read only
4432 * from SVC mode and no access from userspace.
4433 */
4434 - mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4435 - mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4436 - mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4437 + mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4438 +#ifdef CONFIG_PAX_KERNEXEC
4439 + mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4440 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4441 + mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4442 +#endif
4443 + mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4444 + mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4445 #endif
4446
4447 if (is_smp()) {
4448 @@ -542,13 +585,17 @@ static void __init build_mem_type_table(void)
4449 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4450 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4451 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4452 - mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4453 - mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4454 + mem_types[__MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4455 + mem_types[__MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4456 mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4457 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4458 + mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4459 + mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4460 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4461 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4462 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4463 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4464 + mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4465 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4466 + mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4467 }
4468 }
4469
4470 @@ -559,15 +606,20 @@ static void __init build_mem_type_table(void)
4471 if (cpu_arch >= CPU_ARCH_ARMv6) {
4472 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4473 /* Non-cacheable Normal is XCB = 001 */
4474 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4475 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4476 + PMD_SECT_BUFFERED;
4477 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4478 PMD_SECT_BUFFERED;
4479 } else {
4480 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4481 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4482 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4483 + PMD_SECT_TEX(1);
4484 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4485 PMD_SECT_TEX(1);
4486 }
4487 } else {
4488 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4489 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4490 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4491 }
4492
4493 #ifdef CONFIG_ARM_LPAE
4494 @@ -583,6 +635,8 @@ static void __init build_mem_type_table(void)
4495 vecs_pgprot |= PTE_EXT_AF;
4496 #endif
4497
4498 + user_pgprot |= __supported_pte_mask;
4499 +
4500 for (i = 0; i < 16; i++) {
4501 pteval_t v = pgprot_val(protection_map[i]);
4502 protection_map[i] = __pgprot(v | user_pgprot);
4503 @@ -600,21 +654,24 @@ static void __init build_mem_type_table(void)
4504
4505 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4506 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4507 - mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4508 - mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4509 + mem_types[__MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4510 + mem_types[__MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4511 mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4512 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4513 + mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4514 + mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4515 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4516 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4517 - mem_types[MT_ROM].prot_sect |= cp->pmd;
4518 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4519 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4520 + mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4521
4522 switch (cp->pmd) {
4523 case PMD_SECT_WT:
4524 - mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4525 + mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4526 break;
4527 case PMD_SECT_WB:
4528 case PMD_SECT_WBWA:
4529 - mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4530 + mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4531 break;
4532 }
4533 pr_info("Memory policy: %sData cache %s\n",
4534 @@ -832,7 +889,7 @@ static void __init create_mapping(struct map_desc *md)
4535 return;
4536 }
4537
4538 - if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4539 + if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4540 md->virtual >= PAGE_OFFSET &&
4541 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4542 printk(KERN_WARNING "BUG: mapping for 0x%08llx"
4543 @@ -1247,18 +1304,15 @@ void __init arm_mm_memblock_reserve(void)
4544 * called function. This means you can't use any function or debugging
4545 * method which may touch any device, otherwise the kernel _will_ crash.
4546 */
4547 +
4548 +static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4549 +
4550 static void __init devicemaps_init(const struct machine_desc *mdesc)
4551 {
4552 struct map_desc map;
4553 unsigned long addr;
4554 - void *vectors;
4555
4556 - /*
4557 - * Allocate the vector page early.
4558 - */
4559 - vectors = early_alloc(PAGE_SIZE * 2);
4560 -
4561 - early_trap_init(vectors);
4562 + early_trap_init(&vectors);
4563
4564 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4565 pmd_clear(pmd_off_k(addr));
4566 @@ -1271,7 +1325,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4567 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4568 map.virtual = MODULES_VADDR;
4569 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4570 - map.type = MT_ROM;
4571 + map.type = MT_ROM_RX;
4572 create_mapping(&map);
4573 #endif
4574
4575 @@ -1282,14 +1336,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4576 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4577 map.virtual = FLUSH_BASE;
4578 map.length = SZ_1M;
4579 - map.type = MT_CACHECLEAN;
4580 + map.type = MT_CACHECLEAN_RO;
4581 create_mapping(&map);
4582 #endif
4583 #ifdef FLUSH_BASE_MINICACHE
4584 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4585 map.virtual = FLUSH_BASE_MINICACHE;
4586 map.length = SZ_1M;
4587 - map.type = MT_MINICLEAN;
4588 + map.type = MT_MINICLEAN_RO;
4589 create_mapping(&map);
4590 #endif
4591
4592 @@ -1298,7 +1352,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4593 * location (0xffff0000). If we aren't using high-vectors, also
4594 * create a mapping at the low-vectors virtual address.
4595 */
4596 - map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4597 + map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4598 map.virtual = 0xffff0000;
4599 map.length = PAGE_SIZE;
4600 #ifdef CONFIG_KUSER_HELPERS
4601 @@ -1355,8 +1409,10 @@ static void __init kmap_init(void)
4602 static void __init map_lowmem(void)
4603 {
4604 struct memblock_region *reg;
4605 +#ifndef CONFIG_PAX_KERNEXEC
4606 unsigned long kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4607 unsigned long kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4608 +#endif
4609
4610 /* Map all the lowmem memory banks. */
4611 for_each_memblock(memory, reg) {
4612 @@ -1369,11 +1425,48 @@ static void __init map_lowmem(void)
4613 if (start >= end)
4614 break;
4615
4616 +#ifdef CONFIG_PAX_KERNEXEC
4617 + map.pfn = __phys_to_pfn(start);
4618 + map.virtual = __phys_to_virt(start);
4619 + map.length = end - start;
4620 +
4621 + if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4622 + struct map_desc kernel;
4623 + struct map_desc initmap;
4624 +
4625 + /* when freeing initmem we will make this RW */
4626 + initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4627 + initmap.virtual = (unsigned long)__init_begin;
4628 + initmap.length = _sdata - __init_begin;
4629 + initmap.type = __MT_MEMORY_RWX;
4630 + create_mapping(&initmap);
4631 +
4632 + /* when freeing initmem we will make this RX */
4633 + kernel.pfn = __phys_to_pfn(__pa(_stext));
4634 + kernel.virtual = (unsigned long)_stext;
4635 + kernel.length = __init_begin - _stext;
4636 + kernel.type = __MT_MEMORY_RWX;
4637 + create_mapping(&kernel);
4638 +
4639 + if (map.virtual < (unsigned long)_stext) {
4640 + map.length = (unsigned long)_stext - map.virtual;
4641 + map.type = __MT_MEMORY_RWX;
4642 + create_mapping(&map);
4643 + }
4644 +
4645 + map.pfn = __phys_to_pfn(__pa(_sdata));
4646 + map.virtual = (unsigned long)_sdata;
4647 + map.length = end - __pa(_sdata);
4648 + }
4649 +
4650 + map.type = MT_MEMORY_RW;
4651 + create_mapping(&map);
4652 +#else
4653 if (end < kernel_x_start || start >= kernel_x_end) {
4654 map.pfn = __phys_to_pfn(start);
4655 map.virtual = __phys_to_virt(start);
4656 map.length = end - start;
4657 - map.type = MT_MEMORY_RWX;
4658 + map.type = __MT_MEMORY_RWX;
4659
4660 create_mapping(&map);
4661 } else {
4662 @@ -1390,7 +1483,7 @@ static void __init map_lowmem(void)
4663 map.pfn = __phys_to_pfn(kernel_x_start);
4664 map.virtual = __phys_to_virt(kernel_x_start);
4665 map.length = kernel_x_end - kernel_x_start;
4666 - map.type = MT_MEMORY_RWX;
4667 + map.type = __MT_MEMORY_RWX;
4668
4669 create_mapping(&map);
4670
4671 @@ -1403,6 +1496,7 @@ static void __init map_lowmem(void)
4672 create_mapping(&map);
4673 }
4674 }
4675 +#endif
4676 }
4677 }
4678
4679 diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4680 index 5b217f4..c23f40e 100644
4681 --- a/arch/arm/plat-iop/setup.c
4682 +++ b/arch/arm/plat-iop/setup.c
4683 @@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4684 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4685 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4686 .length = IOP3XX_PERIPHERAL_SIZE,
4687 - .type = MT_UNCACHED,
4688 + .type = MT_UNCACHED_RW,
4689 },
4690 };
4691
4692 diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4693 index a5bc92d..0bb4730 100644
4694 --- a/arch/arm/plat-omap/sram.c
4695 +++ b/arch/arm/plat-omap/sram.c
4696 @@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4697 * Looks like we need to preserve some bootloader code at the
4698 * beginning of SRAM for jumping to flash for reboot to work...
4699 */
4700 + pax_open_kernel();
4701 memset_io(omap_sram_base + omap_sram_skip, 0,
4702 omap_sram_size - omap_sram_skip);
4703 + pax_close_kernel();
4704 }
4705 diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
4706 index ce6d763..cfea917 100644
4707 --- a/arch/arm/plat-samsung/include/plat/dma-ops.h
4708 +++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
4709 @@ -47,7 +47,7 @@ struct samsung_dma_ops {
4710 int (*started)(unsigned ch);
4711 int (*flush)(unsigned ch);
4712 int (*stop)(unsigned ch);
4713 -};
4714 +} __no_const;
4715
4716 extern void *samsung_dmadev_get_ops(void);
4717 extern void *s3c_dma_get_ops(void);
4718 diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4719 index 6c0f684..5faea9d 100644
4720 --- a/arch/arm64/include/asm/uaccess.h
4721 +++ b/arch/arm64/include/asm/uaccess.h
4722 @@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4723 flag; \
4724 })
4725
4726 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4727 #define access_ok(type, addr, size) __range_ok(addr, size)
4728 #define user_addr_max get_fs
4729
4730 diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4731 index c3a58a1..78fbf54 100644
4732 --- a/arch/avr32/include/asm/cache.h
4733 +++ b/arch/avr32/include/asm/cache.h
4734 @@ -1,8 +1,10 @@
4735 #ifndef __ASM_AVR32_CACHE_H
4736 #define __ASM_AVR32_CACHE_H
4737
4738 +#include <linux/const.h>
4739 +
4740 #define L1_CACHE_SHIFT 5
4741 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4742 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4743
4744 /*
4745 * Memory returned by kmalloc() may be used for DMA, so we must make
4746 diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4747 index d232888..87c8df1 100644
4748 --- a/arch/avr32/include/asm/elf.h
4749 +++ b/arch/avr32/include/asm/elf.h
4750 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4751 the loader. We need to make sure that it is out of the way of the program
4752 that it will "exec", and that there is sufficient room for the brk. */
4753
4754 -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
4755 +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4756
4757 +#ifdef CONFIG_PAX_ASLR
4758 +#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4759 +
4760 +#define PAX_DELTA_MMAP_LEN 15
4761 +#define PAX_DELTA_STACK_LEN 15
4762 +#endif
4763
4764 /* This yields a mask that user programs can use to figure out what
4765 instruction set this CPU supports. This could be done in user space,
4766 diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4767 index 479330b..53717a8 100644
4768 --- a/arch/avr32/include/asm/kmap_types.h
4769 +++ b/arch/avr32/include/asm/kmap_types.h
4770 @@ -2,9 +2,9 @@
4771 #define __ASM_AVR32_KMAP_TYPES_H
4772
4773 #ifdef CONFIG_DEBUG_HIGHMEM
4774 -# define KM_TYPE_NR 29
4775 +# define KM_TYPE_NR 30
4776 #else
4777 -# define KM_TYPE_NR 14
4778 +# define KM_TYPE_NR 15
4779 #endif
4780
4781 #endif /* __ASM_AVR32_KMAP_TYPES_H */
4782 diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
4783 index 0eca933..eb78c7b 100644
4784 --- a/arch/avr32/mm/fault.c
4785 +++ b/arch/avr32/mm/fault.c
4786 @@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
4787
4788 int exception_trace = 1;
4789
4790 +#ifdef CONFIG_PAX_PAGEEXEC
4791 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4792 +{
4793 + unsigned long i;
4794 +
4795 + printk(KERN_ERR "PAX: bytes at PC: ");
4796 + for (i = 0; i < 20; i++) {
4797 + unsigned char c;
4798 + if (get_user(c, (unsigned char *)pc+i))
4799 + printk(KERN_CONT "???????? ");
4800 + else
4801 + printk(KERN_CONT "%02x ", c);
4802 + }
4803 + printk("\n");
4804 +}
4805 +#endif
4806 +
4807 /*
4808 * This routine handles page faults. It determines the address and the
4809 * problem, and then passes it off to one of the appropriate routines.
4810 @@ -176,6 +193,16 @@ bad_area:
4811 up_read(&mm->mmap_sem);
4812
4813 if (user_mode(regs)) {
4814 +
4815 +#ifdef CONFIG_PAX_PAGEEXEC
4816 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4817 + if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
4818 + pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
4819 + do_group_exit(SIGKILL);
4820 + }
4821 + }
4822 +#endif
4823 +
4824 if (exception_trace && printk_ratelimit())
4825 printk("%s%s[%d]: segfault at %08lx pc %08lx "
4826 "sp %08lx ecr %lu\n",
4827 diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
4828 index 568885a..f8008df 100644
4829 --- a/arch/blackfin/include/asm/cache.h
4830 +++ b/arch/blackfin/include/asm/cache.h
4831 @@ -7,6 +7,7 @@
4832 #ifndef __ARCH_BLACKFIN_CACHE_H
4833 #define __ARCH_BLACKFIN_CACHE_H
4834
4835 +#include <linux/const.h>
4836 #include <linux/linkage.h> /* for asmlinkage */
4837
4838 /*
4839 @@ -14,7 +15,7 @@
4840 * Blackfin loads 32 bytes for cache
4841 */
4842 #define L1_CACHE_SHIFT 5
4843 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4844 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4845 #define SMP_CACHE_BYTES L1_CACHE_BYTES
4846
4847 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
4848 diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
4849 index aea2718..3639a60 100644
4850 --- a/arch/cris/include/arch-v10/arch/cache.h
4851 +++ b/arch/cris/include/arch-v10/arch/cache.h
4852 @@ -1,8 +1,9 @@
4853 #ifndef _ASM_ARCH_CACHE_H
4854 #define _ASM_ARCH_CACHE_H
4855
4856 +#include <linux/const.h>
4857 /* Etrax 100LX have 32-byte cache-lines. */
4858 -#define L1_CACHE_BYTES 32
4859 #define L1_CACHE_SHIFT 5
4860 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4861
4862 #endif /* _ASM_ARCH_CACHE_H */
4863 diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
4864 index 7caf25d..ee65ac5 100644
4865 --- a/arch/cris/include/arch-v32/arch/cache.h
4866 +++ b/arch/cris/include/arch-v32/arch/cache.h
4867 @@ -1,11 +1,12 @@
4868 #ifndef _ASM_CRIS_ARCH_CACHE_H
4869 #define _ASM_CRIS_ARCH_CACHE_H
4870
4871 +#include <linux/const.h>
4872 #include <arch/hwregs/dma.h>
4873
4874 /* A cache-line is 32 bytes. */
4875 -#define L1_CACHE_BYTES 32
4876 #define L1_CACHE_SHIFT 5
4877 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4878
4879 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4880
4881 diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
4882 index b86329d..6709906 100644
4883 --- a/arch/frv/include/asm/atomic.h
4884 +++ b/arch/frv/include/asm/atomic.h
4885 @@ -186,6 +186,16 @@ static inline void atomic64_dec(atomic64_t *v)
4886 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
4887 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
4888
4889 +#define atomic64_read_unchecked(v) atomic64_read(v)
4890 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4891 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4892 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4893 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4894 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
4895 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4896 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
4897 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4898 +
4899 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
4900 {
4901 int c, old;
4902 diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
4903 index 2797163..c2a401d 100644
4904 --- a/arch/frv/include/asm/cache.h
4905 +++ b/arch/frv/include/asm/cache.h
4906 @@ -12,10 +12,11 @@
4907 #ifndef __ASM_CACHE_H
4908 #define __ASM_CACHE_H
4909
4910 +#include <linux/const.h>
4911
4912 /* bytes per L1 cache line */
4913 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
4914 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4915 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4916
4917 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
4918 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
4919 diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
4920 index 43901f2..0d8b865 100644
4921 --- a/arch/frv/include/asm/kmap_types.h
4922 +++ b/arch/frv/include/asm/kmap_types.h
4923 @@ -2,6 +2,6 @@
4924 #ifndef _ASM_KMAP_TYPES_H
4925 #define _ASM_KMAP_TYPES_H
4926
4927 -#define KM_TYPE_NR 17
4928 +#define KM_TYPE_NR 18
4929
4930 #endif
4931 diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
4932 index 836f147..4cf23f5 100644
4933 --- a/arch/frv/mm/elf-fdpic.c
4934 +++ b/arch/frv/mm/elf-fdpic.c
4935 @@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
4936 {
4937 struct vm_area_struct *vma;
4938 struct vm_unmapped_area_info info;
4939 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
4940
4941 if (len > TASK_SIZE)
4942 return -ENOMEM;
4943 @@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
4944 if (addr) {
4945 addr = PAGE_ALIGN(addr);
4946 vma = find_vma(current->mm, addr);
4947 - if (TASK_SIZE - len >= addr &&
4948 - (!vma || addr + len <= vma->vm_start))
4949 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4950 goto success;
4951 }
4952
4953 @@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
4954 info.high_limit = (current->mm->start_stack - 0x00200000);
4955 info.align_mask = 0;
4956 info.align_offset = 0;
4957 + info.threadstack_offset = offset;
4958 addr = vm_unmapped_area(&info);
4959 if (!(addr & ~PAGE_MASK))
4960 goto success;
4961 diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
4962 index f4ca594..adc72fd6 100644
4963 --- a/arch/hexagon/include/asm/cache.h
4964 +++ b/arch/hexagon/include/asm/cache.h
4965 @@ -21,9 +21,11 @@
4966 #ifndef __ASM_CACHE_H
4967 #define __ASM_CACHE_H
4968
4969 +#include <linux/const.h>
4970 +
4971 /* Bytes per L1 cache line */
4972 -#define L1_CACHE_SHIFT (5)
4973 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4974 +#define L1_CACHE_SHIFT 5
4975 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4976
4977 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
4978 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
4979 diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
4980 index 0c8e553..112d734 100644
4981 --- a/arch/ia64/Kconfig
4982 +++ b/arch/ia64/Kconfig
4983 @@ -544,6 +544,7 @@ source "drivers/sn/Kconfig"
4984 config KEXEC
4985 bool "kexec system call"
4986 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
4987 + depends on !GRKERNSEC_KMEM
4988 help
4989 kexec is a system call that implements the ability to shutdown your
4990 current kernel, and to start another kernel. It is like a reboot
4991 diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
4992 index 6e6fe18..a6ae668 100644
4993 --- a/arch/ia64/include/asm/atomic.h
4994 +++ b/arch/ia64/include/asm/atomic.h
4995 @@ -208,6 +208,16 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
4996 #define atomic64_inc(v) atomic64_add(1, (v))
4997 #define atomic64_dec(v) atomic64_sub(1, (v))
4998
4999 +#define atomic64_read_unchecked(v) atomic64_read(v)
5000 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5001 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5002 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5003 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5004 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
5005 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5006 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
5007 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5008 +
5009 /* Atomic operations are already serializing */
5010 #define smp_mb__before_atomic_dec() barrier()
5011 #define smp_mb__after_atomic_dec() barrier()
5012 diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5013 index 988254a..e1ee885 100644
5014 --- a/arch/ia64/include/asm/cache.h
5015 +++ b/arch/ia64/include/asm/cache.h
5016 @@ -1,6 +1,7 @@
5017 #ifndef _ASM_IA64_CACHE_H
5018 #define _ASM_IA64_CACHE_H
5019
5020 +#include <linux/const.h>
5021
5022 /*
5023 * Copyright (C) 1998-2000 Hewlett-Packard Co
5024 @@ -9,7 +10,7 @@
5025
5026 /* Bytes per L1 (data) cache line. */
5027 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5028 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5029 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5030
5031 #ifdef CONFIG_SMP
5032 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5033 diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5034 index 5a83c5c..4d7f553 100644
5035 --- a/arch/ia64/include/asm/elf.h
5036 +++ b/arch/ia64/include/asm/elf.h
5037 @@ -42,6 +42,13 @@
5038 */
5039 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5040
5041 +#ifdef CONFIG_PAX_ASLR
5042 +#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5043 +
5044 +#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5045 +#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5046 +#endif
5047 +
5048 #define PT_IA_64_UNWIND 0x70000001
5049
5050 /* IA-64 relocations: */
5051 diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5052 index 5767cdf..7462574 100644
5053 --- a/arch/ia64/include/asm/pgalloc.h
5054 +++ b/arch/ia64/include/asm/pgalloc.h
5055 @@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5056 pgd_val(*pgd_entry) = __pa(pud);
5057 }
5058
5059 +static inline void
5060 +pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5061 +{
5062 + pgd_populate(mm, pgd_entry, pud);
5063 +}
5064 +
5065 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5066 {
5067 return quicklist_alloc(0, GFP_KERNEL, NULL);
5068 @@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5069 pud_val(*pud_entry) = __pa(pmd);
5070 }
5071
5072 +static inline void
5073 +pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5074 +{
5075 + pud_populate(mm, pud_entry, pmd);
5076 +}
5077 +
5078 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5079 {
5080 return quicklist_alloc(0, GFP_KERNEL, NULL);
5081 diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5082 index 7935115..c0eca6a 100644
5083 --- a/arch/ia64/include/asm/pgtable.h
5084 +++ b/arch/ia64/include/asm/pgtable.h
5085 @@ -12,7 +12,7 @@
5086 * David Mosberger-Tang <davidm@hpl.hp.com>
5087 */
5088
5089 -
5090 +#include <linux/const.h>
5091 #include <asm/mman.h>
5092 #include <asm/page.h>
5093 #include <asm/processor.h>
5094 @@ -142,6 +142,17 @@
5095 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5096 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5097 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5098 +
5099 +#ifdef CONFIG_PAX_PAGEEXEC
5100 +# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5101 +# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5102 +# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5103 +#else
5104 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
5105 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
5106 +# define PAGE_COPY_NOEXEC PAGE_COPY
5107 +#endif
5108 +
5109 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5110 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5111 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5112 diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5113 index 45698cd..e8e2dbc 100644
5114 --- a/arch/ia64/include/asm/spinlock.h
5115 +++ b/arch/ia64/include/asm/spinlock.h
5116 @@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5117 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5118
5119 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5120 - ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5121 + ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5122 }
5123
5124 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5125 diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5126 index 449c8c0..3d4b1e9 100644
5127 --- a/arch/ia64/include/asm/uaccess.h
5128 +++ b/arch/ia64/include/asm/uaccess.h
5129 @@ -70,6 +70,7 @@
5130 && ((segment).seg == KERNEL_DS.seg \
5131 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5132 })
5133 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5134 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5135
5136 /*
5137 @@ -240,12 +241,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5138 static inline unsigned long
5139 __copy_to_user (void __user *to, const void *from, unsigned long count)
5140 {
5141 + if (count > INT_MAX)
5142 + return count;
5143 +
5144 + if (!__builtin_constant_p(count))
5145 + check_object_size(from, count, true);
5146 +
5147 return __copy_user(to, (__force void __user *) from, count);
5148 }
5149
5150 static inline unsigned long
5151 __copy_from_user (void *to, const void __user *from, unsigned long count)
5152 {
5153 + if (count > INT_MAX)
5154 + return count;
5155 +
5156 + if (!__builtin_constant_p(count))
5157 + check_object_size(to, count, false);
5158 +
5159 return __copy_user((__force void __user *) to, from, count);
5160 }
5161
5162 @@ -255,10 +268,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5163 ({ \
5164 void __user *__cu_to = (to); \
5165 const void *__cu_from = (from); \
5166 - long __cu_len = (n); \
5167 + unsigned long __cu_len = (n); \
5168 \
5169 - if (__access_ok(__cu_to, __cu_len, get_fs())) \
5170 + if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5171 + if (!__builtin_constant_p(n)) \
5172 + check_object_size(__cu_from, __cu_len, true); \
5173 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5174 + } \
5175 __cu_len; \
5176 })
5177
5178 @@ -266,11 +282,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5179 ({ \
5180 void *__cu_to = (to); \
5181 const void __user *__cu_from = (from); \
5182 - long __cu_len = (n); \
5183 + unsigned long __cu_len = (n); \
5184 \
5185 __chk_user_ptr(__cu_from); \
5186 - if (__access_ok(__cu_from, __cu_len, get_fs())) \
5187 + if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5188 + if (!__builtin_constant_p(n)) \
5189 + check_object_size(__cu_to, __cu_len, false); \
5190 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5191 + } \
5192 __cu_len; \
5193 })
5194
5195 diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5196 index 24603be..948052d 100644
5197 --- a/arch/ia64/kernel/module.c
5198 +++ b/arch/ia64/kernel/module.c
5199 @@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
5200 void
5201 module_free (struct module *mod, void *module_region)
5202 {
5203 - if (mod && mod->arch.init_unw_table &&
5204 - module_region == mod->module_init) {
5205 + if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
5206 unw_remove_unwind_table(mod->arch.init_unw_table);
5207 mod->arch.init_unw_table = NULL;
5208 }
5209 @@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5210 }
5211
5212 static inline int
5213 +in_init_rx (const struct module *mod, uint64_t addr)
5214 +{
5215 + return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5216 +}
5217 +
5218 +static inline int
5219 +in_init_rw (const struct module *mod, uint64_t addr)
5220 +{
5221 + return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5222 +}
5223 +
5224 +static inline int
5225 in_init (const struct module *mod, uint64_t addr)
5226 {
5227 - return addr - (uint64_t) mod->module_init < mod->init_size;
5228 + return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5229 +}
5230 +
5231 +static inline int
5232 +in_core_rx (const struct module *mod, uint64_t addr)
5233 +{
5234 + return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5235 +}
5236 +
5237 +static inline int
5238 +in_core_rw (const struct module *mod, uint64_t addr)
5239 +{
5240 + return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5241 }
5242
5243 static inline int
5244 in_core (const struct module *mod, uint64_t addr)
5245 {
5246 - return addr - (uint64_t) mod->module_core < mod->core_size;
5247 + return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5248 }
5249
5250 static inline int
5251 @@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5252 break;
5253
5254 case RV_BDREL:
5255 - val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5256 + if (in_init_rx(mod, val))
5257 + val -= (uint64_t) mod->module_init_rx;
5258 + else if (in_init_rw(mod, val))
5259 + val -= (uint64_t) mod->module_init_rw;
5260 + else if (in_core_rx(mod, val))
5261 + val -= (uint64_t) mod->module_core_rx;
5262 + else if (in_core_rw(mod, val))
5263 + val -= (uint64_t) mod->module_core_rw;
5264 break;
5265
5266 case RV_LTV:
5267 @@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5268 * addresses have been selected...
5269 */
5270 uint64_t gp;
5271 - if (mod->core_size > MAX_LTOFF)
5272 + if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5273 /*
5274 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5275 * at the end of the module.
5276 */
5277 - gp = mod->core_size - MAX_LTOFF / 2;
5278 + gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5279 else
5280 - gp = mod->core_size / 2;
5281 - gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5282 + gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5283 + gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5284 mod->arch.gp = gp;
5285 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5286 }
5287 diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5288 index ab33328..f39506c 100644
5289 --- a/arch/ia64/kernel/palinfo.c
5290 +++ b/arch/ia64/kernel/palinfo.c
5291 @@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5292 return NOTIFY_OK;
5293 }
5294
5295 -static struct notifier_block __refdata palinfo_cpu_notifier =
5296 +static struct notifier_block palinfo_cpu_notifier =
5297 {
5298 .notifier_call = palinfo_cpu_callback,
5299 .priority = 0,
5300 diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5301 index 41e33f8..65180b2a 100644
5302 --- a/arch/ia64/kernel/sys_ia64.c
5303 +++ b/arch/ia64/kernel/sys_ia64.c
5304 @@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5305 unsigned long align_mask = 0;
5306 struct mm_struct *mm = current->mm;
5307 struct vm_unmapped_area_info info;
5308 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5309
5310 if (len > RGN_MAP_LIMIT)
5311 return -ENOMEM;
5312 @@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5313 if (REGION_NUMBER(addr) == RGN_HPAGE)
5314 addr = 0;
5315 #endif
5316 +
5317 +#ifdef CONFIG_PAX_RANDMMAP
5318 + if (mm->pax_flags & MF_PAX_RANDMMAP)
5319 + addr = mm->free_area_cache;
5320 + else
5321 +#endif
5322 +
5323 if (!addr)
5324 addr = TASK_UNMAPPED_BASE;
5325
5326 @@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5327 info.high_limit = TASK_SIZE;
5328 info.align_mask = align_mask;
5329 info.align_offset = 0;
5330 + info.threadstack_offset = offset;
5331 return vm_unmapped_area(&info);
5332 }
5333
5334 diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5335 index 84f8a52..7c76178 100644
5336 --- a/arch/ia64/kernel/vmlinux.lds.S
5337 +++ b/arch/ia64/kernel/vmlinux.lds.S
5338 @@ -192,7 +192,7 @@ SECTIONS {
5339 /* Per-cpu data: */
5340 . = ALIGN(PERCPU_PAGE_SIZE);
5341 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5342 - __phys_per_cpu_start = __per_cpu_load;
5343 + __phys_per_cpu_start = per_cpu_load;
5344 /*
5345 * ensure percpu data fits
5346 * into percpu page size
5347 diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5348 index 7225dad..2a7c8256 100644
5349 --- a/arch/ia64/mm/fault.c
5350 +++ b/arch/ia64/mm/fault.c
5351 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5352 return pte_present(pte);
5353 }
5354
5355 +#ifdef CONFIG_PAX_PAGEEXEC
5356 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5357 +{
5358 + unsigned long i;
5359 +
5360 + printk(KERN_ERR "PAX: bytes at PC: ");
5361 + for (i = 0; i < 8; i++) {
5362 + unsigned int c;
5363 + if (get_user(c, (unsigned int *)pc+i))
5364 + printk(KERN_CONT "???????? ");
5365 + else
5366 + printk(KERN_CONT "%08x ", c);
5367 + }
5368 + printk("\n");
5369 +}
5370 +#endif
5371 +
5372 # define VM_READ_BIT 0
5373 # define VM_WRITE_BIT 1
5374 # define VM_EXEC_BIT 2
5375 @@ -151,8 +168,21 @@ retry:
5376 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5377 goto bad_area;
5378
5379 - if ((vma->vm_flags & mask) != mask)
5380 + if ((vma->vm_flags & mask) != mask) {
5381 +
5382 +#ifdef CONFIG_PAX_PAGEEXEC
5383 + if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5384 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5385 + goto bad_area;
5386 +
5387 + up_read(&mm->mmap_sem);
5388 + pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5389 + do_group_exit(SIGKILL);
5390 + }
5391 +#endif
5392 +
5393 goto bad_area;
5394 + }
5395
5396 /*
5397 * If for any reason at all we couldn't handle the fault, make
5398 diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5399 index 68232db..6ca80af 100644
5400 --- a/arch/ia64/mm/hugetlbpage.c
5401 +++ b/arch/ia64/mm/hugetlbpage.c
5402 @@ -154,6 +154,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5403 unsigned long pgoff, unsigned long flags)
5404 {
5405 struct vm_unmapped_area_info info;
5406 + unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5407
5408 if (len > RGN_MAP_LIMIT)
5409 return -ENOMEM;
5410 @@ -177,6 +178,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5411 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5412 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5413 info.align_offset = 0;
5414 + info.threadstack_offset = offset;
5415 return vm_unmapped_area(&info);
5416 }
5417
5418 diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5419 index 25c3502..560dae7 100644
5420 --- a/arch/ia64/mm/init.c
5421 +++ b/arch/ia64/mm/init.c
5422 @@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5423 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5424 vma->vm_end = vma->vm_start + PAGE_SIZE;
5425 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5426 +
5427 +#ifdef CONFIG_PAX_PAGEEXEC
5428 + if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5429 + vma->vm_flags &= ~VM_EXEC;
5430 +
5431 +#ifdef CONFIG_PAX_MPROTECT
5432 + if (current->mm->pax_flags & MF_PAX_MPROTECT)
5433 + vma->vm_flags &= ~VM_MAYEXEC;
5434 +#endif
5435 +
5436 + }
5437 +#endif
5438 +
5439 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5440 down_write(&current->mm->mmap_sem);
5441 if (insert_vm_struct(current->mm, vma)) {
5442 diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5443 index 40b3ee9..8c2c112 100644
5444 --- a/arch/m32r/include/asm/cache.h
5445 +++ b/arch/m32r/include/asm/cache.h
5446 @@ -1,8 +1,10 @@
5447 #ifndef _ASM_M32R_CACHE_H
5448 #define _ASM_M32R_CACHE_H
5449
5450 +#include <linux/const.h>
5451 +
5452 /* L1 cache line size */
5453 #define L1_CACHE_SHIFT 4
5454 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5455 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5456
5457 #endif /* _ASM_M32R_CACHE_H */
5458 diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5459 index 82abd15..d95ae5d 100644
5460 --- a/arch/m32r/lib/usercopy.c
5461 +++ b/arch/m32r/lib/usercopy.c
5462 @@ -14,6 +14,9 @@
5463 unsigned long
5464 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5465 {
5466 + if ((long)n < 0)
5467 + return n;
5468 +
5469 prefetch(from);
5470 if (access_ok(VERIFY_WRITE, to, n))
5471 __copy_user(to,from,n);
5472 @@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5473 unsigned long
5474 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5475 {
5476 + if ((long)n < 0)
5477 + return n;
5478 +
5479 prefetchw(to);
5480 if (access_ok(VERIFY_READ, from, n))
5481 __copy_user_zeroing(to,from,n);
5482 diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5483 index 0395c51..5f26031 100644
5484 --- a/arch/m68k/include/asm/cache.h
5485 +++ b/arch/m68k/include/asm/cache.h
5486 @@ -4,9 +4,11 @@
5487 #ifndef __ARCH_M68K_CACHE_H
5488 #define __ARCH_M68K_CACHE_H
5489
5490 +#include <linux/const.h>
5491 +
5492 /* bytes per L1 cache line */
5493 #define L1_CACHE_SHIFT 4
5494 -#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5495 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5496
5497 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5498
5499 diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5500 index 0424315..defcca9 100644
5501 --- a/arch/metag/mm/hugetlbpage.c
5502 +++ b/arch/metag/mm/hugetlbpage.c
5503 @@ -205,6 +205,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5504 info.high_limit = TASK_SIZE;
5505 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5506 info.align_offset = 0;
5507 + info.threadstack_offset = 0;
5508 return vm_unmapped_area(&info);
5509 }
5510
5511 diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5512 index 4efe96a..60e8699 100644
5513 --- a/arch/microblaze/include/asm/cache.h
5514 +++ b/arch/microblaze/include/asm/cache.h
5515 @@ -13,11 +13,12 @@
5516 #ifndef _ASM_MICROBLAZE_CACHE_H
5517 #define _ASM_MICROBLAZE_CACHE_H
5518
5519 +#include <linux/const.h>
5520 #include <asm/registers.h>
5521
5522 #define L1_CACHE_SHIFT 5
5523 /* word-granular cache in microblaze */
5524 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5525 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5526
5527 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5528
5529 diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5530 index 95fa1f1..56a6fa2 100644
5531 --- a/arch/mips/Kconfig
5532 +++ b/arch/mips/Kconfig
5533 @@ -2298,6 +2298,7 @@ source "kernel/Kconfig.preempt"
5534
5535 config KEXEC
5536 bool "Kexec system call"
5537 + depends on !GRKERNSEC_KMEM
5538 help
5539 kexec is a system call that implements the ability to shutdown your
5540 current kernel, and to start another kernel. It is like a reboot
5541 diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5542 index 02f2444..506969c 100644
5543 --- a/arch/mips/cavium-octeon/dma-octeon.c
5544 +++ b/arch/mips/cavium-octeon/dma-octeon.c
5545 @@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5546 if (dma_release_from_coherent(dev, order, vaddr))
5547 return;
5548
5549 - swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5550 + swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5551 }
5552
5553 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5554 diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5555 index 7eed2f2..c4e385d 100644
5556 --- a/arch/mips/include/asm/atomic.h
5557 +++ b/arch/mips/include/asm/atomic.h
5558 @@ -21,15 +21,39 @@
5559 #include <asm/cmpxchg.h>
5560 #include <asm/war.h>
5561
5562 +#ifdef CONFIG_GENERIC_ATOMIC64
5563 +#include <asm-generic/atomic64.h>
5564 +#endif
5565 +
5566 #define ATOMIC_INIT(i) { (i) }
5567
5568 +#ifdef CONFIG_64BIT
5569 +#define _ASM_EXTABLE(from, to) \
5570 +" .section __ex_table,\"a\"\n" \
5571 +" .dword " #from ", " #to"\n" \
5572 +" .previous\n"
5573 +#else
5574 +#define _ASM_EXTABLE(from, to) \
5575 +" .section __ex_table,\"a\"\n" \
5576 +" .word " #from ", " #to"\n" \
5577 +" .previous\n"
5578 +#endif
5579 +
5580 /*
5581 * atomic_read - read atomic variable
5582 * @v: pointer of type atomic_t
5583 *
5584 * Atomically reads the value of @v.
5585 */
5586 -#define atomic_read(v) (*(volatile int *)&(v)->counter)
5587 +static inline int atomic_read(const atomic_t *v)
5588 +{
5589 + return (*(volatile const int *) &v->counter);
5590 +}
5591 +
5592 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5593 +{
5594 + return (*(volatile const int *) &v->counter);
5595 +}
5596
5597 /*
5598 * atomic_set - set atomic variable
5599 @@ -38,7 +62,15 @@
5600 *
5601 * Atomically sets the value of @v to @i.
5602 */
5603 -#define atomic_set(v, i) ((v)->counter = (i))
5604 +static inline void atomic_set(atomic_t *v, int i)
5605 +{
5606 + v->counter = i;
5607 +}
5608 +
5609 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5610 +{
5611 + v->counter = i;
5612 +}
5613
5614 /*
5615 * atomic_add - add integer to atomic variable
5616 @@ -47,7 +79,67 @@
5617 *
5618 * Atomically adds @i to @v.
5619 */
5620 -static __inline__ void atomic_add(int i, atomic_t * v)
5621 +static __inline__ void atomic_add(int i, atomic_t *v)
5622 +{
5623 + int temp;
5624 +
5625 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
5626 + __asm__ __volatile__(
5627 + " .set mips3 \n"
5628 + "1: ll %0, %1 # atomic_add \n"
5629 +#ifdef CONFIG_PAX_REFCOUNT
5630 + /* Exception on overflow. */
5631 + "2: add %0, %2 \n"
5632 +#else
5633 + " addu %0, %2 \n"
5634 +#endif
5635 + " sc %0, %1 \n"
5636 + " beqzl %0, 1b \n"
5637 +#ifdef CONFIG_PAX_REFCOUNT
5638 + "3: \n"
5639 + _ASM_EXTABLE(2b, 3b)
5640 +#endif
5641 + " .set mips0 \n"
5642 + : "=&r" (temp), "+m" (v->counter)
5643 + : "Ir" (i));
5644 + } else if (kernel_uses_llsc) {
5645 + __asm__ __volatile__(
5646 + " .set mips3 \n"
5647 + "1: ll %0, %1 # atomic_add \n"
5648 +#ifdef CONFIG_PAX_REFCOUNT
5649 + /* Exception on overflow. */
5650 + "2: add %0, %2 \n"
5651 +#else
5652 + " addu %0, %2 \n"
5653 +#endif
5654 + " sc %0, %1 \n"
5655 + " beqz %0, 1b \n"
5656 +#ifdef CONFIG_PAX_REFCOUNT
5657 + "3: \n"
5658 + _ASM_EXTABLE(2b, 3b)
5659 +#endif
5660 + " .set mips0 \n"
5661 + : "=&r" (temp), "+m" (v->counter)
5662 + : "Ir" (i));
5663 + } else {
5664 + unsigned long flags;
5665 +
5666 + raw_local_irq_save(flags);
5667 + __asm__ __volatile__(
5668 +#ifdef CONFIG_PAX_REFCOUNT
5669 + /* Exception on overflow. */
5670 + "1: add %0, %1 \n"
5671 + "2: \n"
5672 + _ASM_EXTABLE(1b, 2b)
5673 +#else
5674 + " addu %0, %1 \n"
5675 +#endif
5676 + : "+r" (v->counter) : "Ir" (i));
5677 + raw_local_irq_restore(flags);
5678 + }
5679 +}
5680 +
5681 +static __inline__ void atomic_add_unchecked(int i, atomic_unchecked_t *v)
5682 {
5683 if (kernel_uses_llsc && R10000_LLSC_WAR) {
5684 int temp;
5685 @@ -90,7 +182,67 @@ static __inline__ void atomic_add(int i, atomic_t * v)
5686 *
5687 * Atomically subtracts @i from @v.
5688 */
5689 -static __inline__ void atomic_sub(int i, atomic_t * v)
5690 +static __inline__ void atomic_sub(int i, atomic_t *v)
5691 +{
5692 + int temp;
5693 +
5694 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
5695 + __asm__ __volatile__(
5696 + " .set mips3 \n"
5697 + "1: ll %0, %1 # atomic64_sub \n"
5698 +#ifdef CONFIG_PAX_REFCOUNT
5699 + /* Exception on overflow. */
5700 + "2: sub %0, %2 \n"
5701 +#else
5702 + " subu %0, %2 \n"
5703 +#endif
5704 + " sc %0, %1 \n"
5705 + " beqzl %0, 1b \n"
5706 +#ifdef CONFIG_PAX_REFCOUNT
5707 + "3: \n"
5708 + _ASM_EXTABLE(2b, 3b)
5709 +#endif
5710 + " .set mips0 \n"
5711 + : "=&r" (temp), "+m" (v->counter)
5712 + : "Ir" (i));
5713 + } else if (kernel_uses_llsc) {
5714 + __asm__ __volatile__(
5715 + " .set mips3 \n"
5716 + "1: ll %0, %1 # atomic64_sub \n"
5717 +#ifdef CONFIG_PAX_REFCOUNT
5718 + /* Exception on overflow. */
5719 + "2: sub %0, %2 \n"
5720 +#else
5721 + " subu %0, %2 \n"
5722 +#endif
5723 + " sc %0, %1 \n"
5724 + " beqz %0, 1b \n"
5725 +#ifdef CONFIG_PAX_REFCOUNT
5726 + "3: \n"
5727 + _ASM_EXTABLE(2b, 3b)
5728 +#endif
5729 + " .set mips0 \n"
5730 + : "=&r" (temp), "+m" (v->counter)
5731 + : "Ir" (i));
5732 + } else {
5733 + unsigned long flags;
5734 +
5735 + raw_local_irq_save(flags);
5736 + __asm__ __volatile__(
5737 +#ifdef CONFIG_PAX_REFCOUNT
5738 + /* Exception on overflow. */
5739 + "1: sub %0, %1 \n"
5740 + "2: \n"
5741 + _ASM_EXTABLE(1b, 2b)
5742 +#else
5743 + " subu %0, %1 \n"
5744 +#endif
5745 + : "+r" (v->counter) : "Ir" (i));
5746 + raw_local_irq_restore(flags);
5747 + }
5748 +}
5749 +
5750 +static __inline__ void atomic_sub_unchecked(long i, atomic_unchecked_t *v)
5751 {
5752 if (kernel_uses_llsc && R10000_LLSC_WAR) {
5753 int temp;
5754 @@ -129,7 +281,93 @@ static __inline__ void atomic_sub(int i, atomic_t * v)
5755 /*
5756 * Same as above, but return the result value
5757 */
5758 -static __inline__ int atomic_add_return(int i, atomic_t * v)
5759 +static __inline__ int atomic_add_return(int i, atomic_t *v)
5760 +{
5761 + int result;
5762 + int temp;
5763 +
5764 + smp_mb__before_llsc();
5765 +
5766 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
5767 + __asm__ __volatile__(
5768 + " .set mips3 \n"
5769 + "1: ll %1, %2 # atomic_add_return \n"
5770 +#ifdef CONFIG_PAX_REFCOUNT
5771 + "2: add %0, %1, %3 \n"
5772 +#else
5773 + " addu %0, %1, %3 \n"
5774 +#endif
5775 + " sc %0, %2 \n"
5776 + " beqzl %0, 1b \n"
5777 +#ifdef CONFIG_PAX_REFCOUNT
5778 + " b 4f \n"
5779 + " .set noreorder \n"
5780 + "3: b 5f \n"
5781 + " move %0, %1 \n"
5782 + " .set reorder \n"
5783 + _ASM_EXTABLE(2b, 3b)
5784 +#endif
5785 + "4: addu %0, %1, %3 \n"
5786 +#ifdef CONFIG_PAX_REFCOUNT
5787 + "5: \n"
5788 +#endif
5789 + " .set mips0 \n"
5790 + : "=&r" (result), "=&r" (temp), "+m" (v->counter)
5791 + : "Ir" (i));
5792 + } else if (kernel_uses_llsc) {
5793 + __asm__ __volatile__(
5794 + " .set mips3 \n"
5795 + "1: ll %1, %2 # atomic_add_return \n"
5796 +#ifdef CONFIG_PAX_REFCOUNT
5797 + "2: add %0, %1, %3 \n"
5798 +#else
5799 + " addu %0, %1, %3 \n"
5800 +#endif
5801 + " sc %0, %2 \n"
5802 + " bnez %0, 4f \n"
5803 + " b 1b \n"
5804 +#ifdef CONFIG_PAX_REFCOUNT
5805 + " .set noreorder \n"
5806 + "3: b 5f \n"
5807 + " move %0, %1 \n"
5808 + " .set reorder \n"
5809 + _ASM_EXTABLE(2b, 3b)
5810 +#endif
5811 + "4: addu %0, %1, %3 \n"
5812 +#ifdef CONFIG_PAX_REFCOUNT
5813 + "5: \n"
5814 +#endif
5815 + " .set mips0 \n"
5816 + : "=&r" (result), "=&r" (temp), "+m" (v->counter)
5817 + : "Ir" (i));
5818 + } else {
5819 + unsigned long flags;
5820 +
5821 + raw_local_irq_save(flags);
5822 + __asm__ __volatile__(
5823 + " lw %0, %1 \n"
5824 +#ifdef CONFIG_PAX_REFCOUNT
5825 + /* Exception on overflow. */
5826 + "1: add %0, %2 \n"
5827 +#else
5828 + " addu %0, %2 \n"
5829 +#endif
5830 + " sw %0, %1 \n"
5831 +#ifdef CONFIG_PAX_REFCOUNT
5832 + /* Note: Dest reg is not modified on overflow */
5833 + "2: \n"
5834 + _ASM_EXTABLE(1b, 2b)
5835 +#endif
5836 + : "=&r" (result), "+m" (v->counter) : "Ir" (i));
5837 + raw_local_irq_restore(flags);
5838 + }
5839 +
5840 + smp_llsc_mb();
5841 +
5842 + return result;
5843 +}
5844 +
5845 +static __inline__ int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
5846 {
5847 int result;
5848
5849 @@ -178,7 +416,93 @@ static __inline__ int atomic_add_return(int i, atomic_t * v)
5850 return result;
5851 }
5852
5853 -static __inline__ int atomic_sub_return(int i, atomic_t * v)
5854 +static __inline__ int atomic_sub_return(int i, atomic_t *v)
5855 +{
5856 + int result;
5857 + int temp;
5858 +
5859 + smp_mb__before_llsc();
5860 +
5861 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
5862 + __asm__ __volatile__(
5863 + " .set mips3 \n"
5864 + "1: ll %1, %2 # atomic_sub_return \n"
5865 +#ifdef CONFIG_PAX_REFCOUNT
5866 + "2: sub %0, %1, %3 \n"
5867 +#else
5868 + " subu %0, %1, %3 \n"
5869 +#endif
5870 + " sc %0, %2 \n"
5871 + " beqzl %0, 1b \n"
5872 +#ifdef CONFIG_PAX_REFCOUNT
5873 + " b 4f \n"
5874 + " .set noreorder \n"
5875 + "3: b 5f \n"
5876 + " move %0, %1 \n"
5877 + " .set reorder \n"
5878 + _ASM_EXTABLE(2b, 3b)
5879 +#endif
5880 + "4: subu %0, %1, %3 \n"
5881 +#ifdef CONFIG_PAX_REFCOUNT
5882 + "5: \n"
5883 +#endif
5884 + " .set mips0 \n"
5885 + : "=&r" (result), "=&r" (temp), "=m" (v->counter)
5886 + : "Ir" (i), "m" (v->counter)
5887 + : "memory");
5888 + } else if (kernel_uses_llsc) {
5889 + __asm__ __volatile__(
5890 + " .set mips3 \n"
5891 + "1: ll %1, %2 # atomic_sub_return \n"
5892 +#ifdef CONFIG_PAX_REFCOUNT
5893 + "2: sub %0, %1, %3 \n"
5894 +#else
5895 + " subu %0, %1, %3 \n"
5896 +#endif
5897 + " sc %0, %2 \n"
5898 + " bnez %0, 4f \n"
5899 + " b 1b \n"
5900 +#ifdef CONFIG_PAX_REFCOUNT
5901 + " .set noreorder \n"
5902 + "3: b 5f \n"
5903 + " move %0, %1 \n"
5904 + " .set reorder \n"
5905 + _ASM_EXTABLE(2b, 3b)
5906 +#endif
5907 + "4: subu %0, %1, %3 \n"
5908 +#ifdef CONFIG_PAX_REFCOUNT
5909 + "5: \n"
5910 +#endif
5911 + " .set mips0 \n"
5912 + : "=&r" (result), "=&r" (temp), "+m" (v->counter)
5913 + : "Ir" (i));
5914 + } else {
5915 + unsigned long flags;
5916 +
5917 + raw_local_irq_save(flags);
5918 + __asm__ __volatile__(
5919 + " lw %0, %1 \n"
5920 +#ifdef CONFIG_PAX_REFCOUNT
5921 + /* Exception on overflow. */
5922 + "1: sub %0, %2 \n"
5923 +#else
5924 + " subu %0, %2 \n"
5925 +#endif
5926 + " sw %0, %1 \n"
5927 +#ifdef CONFIG_PAX_REFCOUNT
5928 + /* Note: Dest reg is not modified on overflow */
5929 + "2: \n"
5930 + _ASM_EXTABLE(1b, 2b)
5931 +#endif
5932 + : "=&r" (result), "+m" (v->counter) : "Ir" (i));
5933 + raw_local_irq_restore(flags);
5934 + }
5935 +
5936 + smp_llsc_mb();
5937 +
5938 + return result;
5939 +}
5940 +static __inline__ int atomic_sub_return_unchecked(int i, atomic_unchecked_t *v)
5941 {
5942 int result;
5943
5944 @@ -238,7 +562,7 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v)
5945 * Atomically test @v and subtract @i if @v is greater or equal than @i.
5946 * The function returns the old value of @v minus @i.
5947 */
5948 -static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5949 +static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
5950 {
5951 int result;
5952
5953 @@ -295,8 +619,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5954 return result;
5955 }
5956
5957 -#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
5958 -#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
5959 +static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
5960 +{
5961 + return cmpxchg(&v->counter, old, new);
5962 +}
5963 +
5964 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
5965 + int new)
5966 +{
5967 + return cmpxchg(&(v->counter), old, new);
5968 +}
5969 +
5970 +static inline int atomic_xchg(atomic_t *v, int new)
5971 +{
5972 + return xchg(&v->counter, new);
5973 +}
5974 +
5975 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
5976 +{
5977 + return xchg(&(v->counter), new);
5978 +}
5979
5980 /**
5981 * __atomic_add_unless - add unless the number is a given value
5982 @@ -324,6 +666,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5983
5984 #define atomic_dec_return(v) atomic_sub_return(1, (v))
5985 #define atomic_inc_return(v) atomic_add_return(1, (v))
5986 +static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
5987 +{
5988 + return atomic_add_return_unchecked(1, v);
5989 +}
5990
5991 /*
5992 * atomic_sub_and_test - subtract value from variable and test result
5993 @@ -345,6 +691,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5994 * other cases.
5995 */
5996 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
5997 +static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
5998 +{
5999 + return atomic_add_return_unchecked(1, v) == 0;
6000 +}
6001
6002 /*
6003 * atomic_dec_and_test - decrement by 1 and test
6004 @@ -369,6 +719,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6005 * Atomically increments @v by 1.
6006 */
6007 #define atomic_inc(v) atomic_add(1, (v))
6008 +static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
6009 +{
6010 + atomic_add_unchecked(1, v);
6011 +}
6012
6013 /*
6014 * atomic_dec - decrement and test
6015 @@ -377,6 +731,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6016 * Atomically decrements @v by 1.
6017 */
6018 #define atomic_dec(v) atomic_sub(1, (v))
6019 +static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
6020 +{
6021 + atomic_sub_unchecked(1, v);
6022 +}
6023
6024 /*
6025 * atomic_add_negative - add and test if negative
6026 @@ -398,14 +756,30 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6027 * @v: pointer of type atomic64_t
6028 *
6029 */
6030 -#define atomic64_read(v) (*(volatile long *)&(v)->counter)
6031 +static inline long atomic64_read(const atomic64_t *v)
6032 +{
6033 + return (*(volatile const long *) &v->counter);
6034 +}
6035 +
6036 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6037 +{
6038 + return (*(volatile const long *) &v->counter);
6039 +}
6040
6041 /*
6042 * atomic64_set - set atomic variable
6043 * @v: pointer of type atomic64_t
6044 * @i: required value
6045 */
6046 -#define atomic64_set(v, i) ((v)->counter = (i))
6047 +static inline void atomic64_set(atomic64_t *v, long i)
6048 +{
6049 + v->counter = i;
6050 +}
6051 +
6052 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6053 +{
6054 + v->counter = i;
6055 +}
6056
6057 /*
6058 * atomic64_add - add integer to atomic variable
6059 @@ -414,7 +788,66 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6060 *
6061 * Atomically adds @i to @v.
6062 */
6063 -static __inline__ void atomic64_add(long i, atomic64_t * v)
6064 +static __inline__ void atomic64_add(long i, atomic64_t *v)
6065 +{
6066 + long temp;
6067 +
6068 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
6069 + __asm__ __volatile__(
6070 + " .set mips3 \n"
6071 + "1: lld %0, %1 # atomic64_add \n"
6072 +#ifdef CONFIG_PAX_REFCOUNT
6073 + /* Exception on overflow. */
6074 + "2: dadd %0, %2 \n"
6075 +#else
6076 + " daddu %0, %2 \n"
6077 +#endif
6078 + " scd %0, %1 \n"
6079 + " beqzl %0, 1b \n"
6080 +#ifdef CONFIG_PAX_REFCOUNT
6081 + "3: \n"
6082 + _ASM_EXTABLE(2b, 3b)
6083 +#endif
6084 + " .set mips0 \n"
6085 + : "=&r" (temp), "+m" (v->counter)
6086 + : "Ir" (i));
6087 + } else if (kernel_uses_llsc) {
6088 + __asm__ __volatile__(
6089 + " .set mips3 \n"
6090 + "1: lld %0, %1 # atomic64_add \n"
6091 +#ifdef CONFIG_PAX_REFCOUNT
6092 + /* Exception on overflow. */
6093 + "2: dadd %0, %2 \n"
6094 +#else
6095 + " daddu %0, %2 \n"
6096 +#endif
6097 + " scd %0, %1 \n"
6098 + " beqz %0, 1b \n"
6099 +#ifdef CONFIG_PAX_REFCOUNT
6100 + "3: \n"
6101 + _ASM_EXTABLE(2b, 3b)
6102 +#endif
6103 + " .set mips0 \n"
6104 + : "=&r" (temp), "+m" (v->counter)
6105 + : "Ir" (i));
6106 + } else {
6107 + unsigned long flags;
6108 +
6109 + raw_local_irq_save(flags);
6110 + __asm__ __volatile__(
6111 +#ifdef CONFIG_PAX_REFCOUNT
6112 + /* Exception on overflow. */
6113 + "1: dadd %0, %1 \n"
6114 + "2: \n"
6115 + _ASM_EXTABLE(1b, 2b)
6116 +#else
6117 + " daddu %0, %1 \n"
6118 +#endif
6119 + : "+r" (v->counter) : "Ir" (i));
6120 + raw_local_irq_restore(flags);
6121 + }
6122 +}
6123 +static __inline__ void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
6124 {
6125 if (kernel_uses_llsc && R10000_LLSC_WAR) {
6126 long temp;
6127 @@ -457,7 +890,67 @@ static __inline__ void atomic64_add(long i, atomic64_t * v)
6128 *
6129 * Atomically subtracts @i from @v.
6130 */
6131 -static __inline__ void atomic64_sub(long i, atomic64_t * v)
6132 +static __inline__ void atomic64_sub(long i, atomic64_t *v)
6133 +{
6134 + long temp;
6135 +
6136 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
6137 + __asm__ __volatile__(
6138 + " .set mips3 \n"
6139 + "1: lld %0, %1 # atomic64_sub \n"
6140 +#ifdef CONFIG_PAX_REFCOUNT
6141 + /* Exception on overflow. */
6142 + "2: dsub %0, %2 \n"
6143 +#else
6144 + " dsubu %0, %2 \n"
6145 +#endif
6146 + " scd %0, %1 \n"
6147 + " beqzl %0, 1b \n"
6148 +#ifdef CONFIG_PAX_REFCOUNT
6149 + "3: \n"
6150 + _ASM_EXTABLE(2b, 3b)
6151 +#endif
6152 + " .set mips0 \n"
6153 + : "=&r" (temp), "+m" (v->counter)
6154 + : "Ir" (i));
6155 + } else if (kernel_uses_llsc) {
6156 + __asm__ __volatile__(
6157 + " .set mips3 \n"
6158 + "1: lld %0, %1 # atomic64_sub \n"
6159 +#ifdef CONFIG_PAX_REFCOUNT
6160 + /* Exception on overflow. */
6161 + "2: dsub %0, %2 \n"
6162 +#else
6163 + " dsubu %0, %2 \n"
6164 +#endif
6165 + " scd %0, %1 \n"
6166 + " beqz %0, 1b \n"
6167 +#ifdef CONFIG_PAX_REFCOUNT
6168 + "3: \n"
6169 + _ASM_EXTABLE(2b, 3b)
6170 +#endif
6171 + " .set mips0 \n"
6172 + : "=&r" (temp), "+m" (v->counter)
6173 + : "Ir" (i));
6174 + } else {
6175 + unsigned long flags;
6176 +
6177 + raw_local_irq_save(flags);
6178 + __asm__ __volatile__(
6179 +#ifdef CONFIG_PAX_REFCOUNT
6180 + /* Exception on overflow. */
6181 + "1: dsub %0, %1 \n"
6182 + "2: \n"
6183 + _ASM_EXTABLE(1b, 2b)
6184 +#else
6185 + " dsubu %0, %1 \n"
6186 +#endif
6187 + : "+r" (v->counter) : "Ir" (i));
6188 + raw_local_irq_restore(flags);
6189 + }
6190 +}
6191 +
6192 +static __inline__ void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
6193 {
6194 if (kernel_uses_llsc && R10000_LLSC_WAR) {
6195 long temp;
6196 @@ -496,7 +989,93 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v)
6197 /*
6198 * Same as above, but return the result value
6199 */
6200 -static __inline__ long atomic64_add_return(long i, atomic64_t * v)
6201 +static __inline__ long atomic64_add_return(long i, atomic64_t *v)
6202 +{
6203 + long result;
6204 + long temp;
6205 +
6206 + smp_mb__before_llsc();
6207 +
6208 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
6209 + __asm__ __volatile__(
6210 + " .set mips3 \n"
6211 + "1: lld %1, %2 # atomic64_add_return \n"
6212 +#ifdef CONFIG_PAX_REFCOUNT
6213 + "2: dadd %0, %1, %3 \n"
6214 +#else
6215 + " daddu %0, %1, %3 \n"
6216 +#endif
6217 + " scd %0, %2 \n"
6218 + " beqzl %0, 1b \n"
6219 +#ifdef CONFIG_PAX_REFCOUNT
6220 + " b 4f \n"
6221 + " .set noreorder \n"
6222 + "3: b 5f \n"
6223 + " move %0, %1 \n"
6224 + " .set reorder \n"
6225 + _ASM_EXTABLE(2b, 3b)
6226 +#endif
6227 + "4: daddu %0, %1, %3 \n"
6228 +#ifdef CONFIG_PAX_REFCOUNT
6229 + "5: \n"
6230 +#endif
6231 + " .set mips0 \n"
6232 + : "=&r" (result), "=&r" (temp), "+m" (v->counter)
6233 + : "Ir" (i));
6234 + } else if (kernel_uses_llsc) {
6235 + __asm__ __volatile__(
6236 + " .set mips3 \n"
6237 + "1: lld %1, %2 # atomic64_add_return \n"
6238 +#ifdef CONFIG_PAX_REFCOUNT
6239 + "2: dadd %0, %1, %3 \n"
6240 +#else
6241 + " daddu %0, %1, %3 \n"
6242 +#endif
6243 + " scd %0, %2 \n"
6244 + " bnez %0, 4f \n"
6245 + " b 1b \n"
6246 +#ifdef CONFIG_PAX_REFCOUNT
6247 + " .set noreorder \n"
6248 + "3: b 5f \n"
6249 + " move %0, %1 \n"
6250 + " .set reorder \n"
6251 + _ASM_EXTABLE(2b, 3b)
6252 +#endif
6253 + "4: daddu %0, %1, %3 \n"
6254 +#ifdef CONFIG_PAX_REFCOUNT
6255 + "5: \n"
6256 +#endif
6257 + " .set mips0 \n"
6258 + : "=&r" (result), "=&r" (temp), "=m" (v->counter)
6259 + : "Ir" (i), "m" (v->counter)
6260 + : "memory");
6261 + } else {
6262 + unsigned long flags;
6263 +
6264 + raw_local_irq_save(flags);
6265 + __asm__ __volatile__(
6266 + " ld %0, %1 \n"
6267 +#ifdef CONFIG_PAX_REFCOUNT
6268 + /* Exception on overflow. */
6269 + "1: dadd %0, %2 \n"
6270 +#else
6271 + " daddu %0, %2 \n"
6272 +#endif
6273 + " sd %0, %1 \n"
6274 +#ifdef CONFIG_PAX_REFCOUNT
6275 + /* Note: Dest reg is not modified on overflow */
6276 + "2: \n"
6277 + _ASM_EXTABLE(1b, 2b)
6278 +#endif
6279 + : "=&r" (result), "+m" (v->counter) : "Ir" (i));
6280 + raw_local_irq_restore(flags);
6281 + }
6282 +
6283 + smp_llsc_mb();
6284 +
6285 + return result;
6286 +}
6287 +static __inline__ long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
6288 {
6289 long result;
6290
6291 @@ -546,7 +1125,97 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v)
6292 return result;
6293 }
6294
6295 -static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
6296 +static __inline__ long atomic64_sub_return(long i, atomic64_t *v)
6297 +{
6298 + long result;
6299 + long temp;
6300 +
6301 + smp_mb__before_llsc();
6302 +
6303 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
6304 + long temp;
6305 +
6306 + __asm__ __volatile__(
6307 + " .set mips3 \n"
6308 + "1: lld %1, %2 # atomic64_sub_return \n"
6309 +#ifdef CONFIG_PAX_REFCOUNT
6310 + "2: dsub %0, %1, %3 \n"
6311 +#else
6312 + " dsubu %0, %1, %3 \n"
6313 +#endif
6314 + " scd %0, %2 \n"
6315 + " beqzl %0, 1b \n"
6316 +#ifdef CONFIG_PAX_REFCOUNT
6317 + " b 4f \n"
6318 + " .set noreorder \n"
6319 + "3: b 5f \n"
6320 + " move %0, %1 \n"
6321 + " .set reorder \n"
6322 + _ASM_EXTABLE(2b, 3b)
6323 +#endif
6324 + "4: dsubu %0, %1, %3 \n"
6325 +#ifdef CONFIG_PAX_REFCOUNT
6326 + "5: \n"
6327 +#endif
6328 + " .set mips0 \n"
6329 + : "=&r" (result), "=&r" (temp), "=m" (v->counter)
6330 + : "Ir" (i), "m" (v->counter)
6331 + : "memory");
6332 + } else if (kernel_uses_llsc) {
6333 + __asm__ __volatile__(
6334 + " .set mips3 \n"
6335 + "1: lld %1, %2 # atomic64_sub_return \n"
6336 +#ifdef CONFIG_PAX_REFCOUNT
6337 + "2: dsub %0, %1, %3 \n"
6338 +#else
6339 + " dsubu %0, %1, %3 \n"
6340 +#endif
6341 + " scd %0, %2 \n"
6342 + " bnez %0, 4f \n"
6343 + " b 1b \n"
6344 +#ifdef CONFIG_PAX_REFCOUNT
6345 + " .set noreorder \n"
6346 + "3: b 5f \n"
6347 + " move %0, %1 \n"
6348 + " .set reorder \n"
6349 + _ASM_EXTABLE(2b, 3b)
6350 +#endif
6351 + "4: dsubu %0, %1, %3 \n"
6352 +#ifdef CONFIG_PAX_REFCOUNT
6353 + "5: \n"
6354 +#endif
6355 + " .set mips0 \n"
6356 + : "=&r" (result), "=&r" (temp), "=m" (v->counter)
6357 + : "Ir" (i), "m" (v->counter)
6358 + : "memory");
6359 + } else {
6360 + unsigned long flags;
6361 +
6362 + raw_local_irq_save(flags);
6363 + __asm__ __volatile__(
6364 + " ld %0, %1 \n"
6365 +#ifdef CONFIG_PAX_REFCOUNT
6366 + /* Exception on overflow. */
6367 + "1: dsub %0, %2 \n"
6368 +#else
6369 + " dsubu %0, %2 \n"
6370 +#endif
6371 + " sd %0, %1 \n"
6372 +#ifdef CONFIG_PAX_REFCOUNT
6373 + /* Note: Dest reg is not modified on overflow */
6374 + "2: \n"
6375 + _ASM_EXTABLE(1b, 2b)
6376 +#endif
6377 + : "=&r" (result), "+m" (v->counter) : "Ir" (i));
6378 + raw_local_irq_restore(flags);
6379 + }
6380 +
6381 + smp_llsc_mb();
6382 +
6383 + return result;
6384 +}
6385 +
6386 +static __inline__ long atomic64_sub_return_unchecked(long i, atomic64_unchecked_t *v)
6387 {
6388 long result;
6389
6390 @@ -605,7 +1274,7 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
6391 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6392 * The function returns the old value of @v minus @i.
6393 */
6394 -static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6395 +static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6396 {
6397 long result;
6398
6399 @@ -662,9 +1331,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6400 return result;
6401 }
6402
6403 -#define atomic64_cmpxchg(v, o, n) \
6404 - ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6405 -#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6406 +static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6407 +{
6408 + return cmpxchg(&v->counter, old, new);
6409 +}
6410 +
6411 +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6412 + long new)
6413 +{
6414 + return cmpxchg(&(v->counter), old, new);
6415 +}
6416 +
6417 +static inline long atomic64_xchg(atomic64_t *v, long new)
6418 +{
6419 + return xchg(&v->counter, new);
6420 +}
6421 +
6422 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6423 +{
6424 + return xchg(&(v->counter), new);
6425 +}
6426
6427 /**
6428 * atomic64_add_unless - add unless the number is a given value
6429 @@ -694,6 +1380,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6430
6431 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6432 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6433 +#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6434
6435 /*
6436 * atomic64_sub_and_test - subtract value from variable and test result
6437 @@ -715,6 +1402,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6438 * other cases.
6439 */
6440 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6441 +#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6442
6443 /*
6444 * atomic64_dec_and_test - decrement by 1 and test
6445 @@ -739,6 +1427,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6446 * Atomically increments @v by 1.
6447 */
6448 #define atomic64_inc(v) atomic64_add(1, (v))
6449 +#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6450
6451 /*
6452 * atomic64_dec - decrement and test
6453 @@ -747,6 +1436,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6454 * Atomically decrements @v by 1.
6455 */
6456 #define atomic64_dec(v) atomic64_sub(1, (v))
6457 +#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6458
6459 /*
6460 * atomic64_add_negative - add and test if negative
6461 diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6462 index b4db69f..8f3b093 100644
6463 --- a/arch/mips/include/asm/cache.h
6464 +++ b/arch/mips/include/asm/cache.h
6465 @@ -9,10 +9,11 @@
6466 #ifndef _ASM_CACHE_H
6467 #define _ASM_CACHE_H
6468
6469 +#include <linux/const.h>
6470 #include <kmalloc.h>
6471
6472 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6473 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6474 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6475
6476 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6477 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6478 diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6479 index d414405..6bb4ba2 100644
6480 --- a/arch/mips/include/asm/elf.h
6481 +++ b/arch/mips/include/asm/elf.h
6482 @@ -398,13 +398,16 @@ extern const char *__elf_platform;
6483 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6484 #endif
6485
6486 +#ifdef CONFIG_PAX_ASLR
6487 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6488 +
6489 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6490 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6491 +#endif
6492 +
6493 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6494 struct linux_binprm;
6495 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6496 int uses_interp);
6497
6498 -struct mm_struct;
6499 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
6500 -#define arch_randomize_brk arch_randomize_brk
6501 -
6502 #endif /* _ASM_ELF_H */
6503 diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6504 index c1f6afa..38cc6e9 100644
6505 --- a/arch/mips/include/asm/exec.h
6506 +++ b/arch/mips/include/asm/exec.h
6507 @@ -12,6 +12,6 @@
6508 #ifndef _ASM_EXEC_H
6509 #define _ASM_EXEC_H
6510
6511 -extern unsigned long arch_align_stack(unsigned long sp);
6512 +#define arch_align_stack(x) ((x) & ~0xfUL)
6513
6514 #endif /* _ASM_EXEC_H */
6515 diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6516 index 9e8ef59..1139d6b 100644
6517 --- a/arch/mips/include/asm/hw_irq.h
6518 +++ b/arch/mips/include/asm/hw_irq.h
6519 @@ -10,7 +10,7 @@
6520
6521 #include <linux/atomic.h>
6522
6523 -extern atomic_t irq_err_count;
6524 +extern atomic_unchecked_t irq_err_count;
6525
6526 /*
6527 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6528 diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6529 index d44622c..64990d2 100644
6530 --- a/arch/mips/include/asm/local.h
6531 +++ b/arch/mips/include/asm/local.h
6532 @@ -12,15 +12,25 @@ typedef struct
6533 atomic_long_t a;
6534 } local_t;
6535
6536 +typedef struct {
6537 + atomic_long_unchecked_t a;
6538 +} local_unchecked_t;
6539 +
6540 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6541
6542 #define local_read(l) atomic_long_read(&(l)->a)
6543 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6544 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6545 +#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6546
6547 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6548 +#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6549 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6550 +#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6551 #define local_inc(l) atomic_long_inc(&(l)->a)
6552 +#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6553 #define local_dec(l) atomic_long_dec(&(l)->a)
6554 +#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6555
6556 /*
6557 * Same as above, but return the result value
6558 @@ -70,6 +80,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6559 return result;
6560 }
6561
6562 +static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6563 +{
6564 + unsigned long result;
6565 +
6566 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
6567 + unsigned long temp;
6568 +
6569 + __asm__ __volatile__(
6570 + " .set mips3 \n"
6571 + "1:" __LL "%1, %2 # local_add_return \n"
6572 + " addu %0, %1, %3 \n"
6573 + __SC "%0, %2 \n"
6574 + " beqzl %0, 1b \n"
6575 + " addu %0, %1, %3 \n"
6576 + " .set mips0 \n"
6577 + : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6578 + : "Ir" (i), "m" (l->a.counter)
6579 + : "memory");
6580 + } else if (kernel_uses_llsc) {
6581 + unsigned long temp;
6582 +
6583 + __asm__ __volatile__(
6584 + " .set mips3 \n"
6585 + "1:" __LL "%1, %2 # local_add_return \n"
6586 + " addu %0, %1, %3 \n"
6587 + __SC "%0, %2 \n"
6588 + " beqz %0, 1b \n"
6589 + " addu %0, %1, %3 \n"
6590 + " .set mips0 \n"
6591 + : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6592 + : "Ir" (i), "m" (l->a.counter)
6593 + : "memory");
6594 + } else {
6595 + unsigned long flags;
6596 +
6597 + local_irq_save(flags);
6598 + result = l->a.counter;
6599 + result += i;
6600 + l->a.counter = result;
6601 + local_irq_restore(flags);
6602 + }
6603 +
6604 + return result;
6605 +}
6606 +
6607 static __inline__ long local_sub_return(long i, local_t * l)
6608 {
6609 unsigned long result;
6610 @@ -117,6 +172,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6611
6612 #define local_cmpxchg(l, o, n) \
6613 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6614 +#define local_cmpxchg_unchecked(l, o, n) \
6615 + ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6616 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6617
6618 /**
6619 diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6620 index 5e08bcc..cfedefc 100644
6621 --- a/arch/mips/include/asm/page.h
6622 +++ b/arch/mips/include/asm/page.h
6623 @@ -120,7 +120,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6624 #ifdef CONFIG_CPU_MIPS32
6625 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6626 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6627 - #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6628 + #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6629 #else
6630 typedef struct { unsigned long long pte; } pte_t;
6631 #define pte_val(x) ((x).pte)
6632 diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6633 index b336037..5b874cc 100644
6634 --- a/arch/mips/include/asm/pgalloc.h
6635 +++ b/arch/mips/include/asm/pgalloc.h
6636 @@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6637 {
6638 set_pud(pud, __pud((unsigned long)pmd));
6639 }
6640 +
6641 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6642 +{
6643 + pud_populate(mm, pud, pmd);
6644 +}
6645 #endif
6646
6647 /*
6648 diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6649 index 008324d..f67c239 100644
6650 --- a/arch/mips/include/asm/pgtable.h
6651 +++ b/arch/mips/include/asm/pgtable.h
6652 @@ -20,6 +20,9 @@
6653 #include <asm/io.h>
6654 #include <asm/pgtable-bits.h>
6655
6656 +#define ktla_ktva(addr) (addr)
6657 +#define ktva_ktla(addr) (addr)
6658 +
6659 struct mm_struct;
6660 struct vm_area_struct;
6661
6662 diff --git a/arch/mips/include/asm/smtc_proc.h b/arch/mips/include/asm/smtc_proc.h
6663 index 25da651..ae2a259 100644
6664 --- a/arch/mips/include/asm/smtc_proc.h
6665 +++ b/arch/mips/include/asm/smtc_proc.h
6666 @@ -18,6 +18,6 @@ extern struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS];
6667
6668 /* Count of number of recoveries of "stolen" FPU access rights on 34K */
6669
6670 -extern atomic_t smtc_fpu_recoveries;
6671 +extern atomic_unchecked_t smtc_fpu_recoveries;
6672
6673 #endif /* __ASM_SMTC_PROC_H */
6674 diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6675 index 24846f9..61c49f0 100644
6676 --- a/arch/mips/include/asm/thread_info.h
6677 +++ b/arch/mips/include/asm/thread_info.h
6678 @@ -116,6 +116,8 @@ static inline struct thread_info *current_thread_info(void)
6679 #define TIF_LOAD_WATCH 25 /* If set, load watch registers */
6680 #define TIF_SYSCALL_TRACEPOINT 26 /* syscall tracepoint instrumentation */
6681 #define TIF_32BIT_FPREGS 27 /* 32-bit floating point registers */
6682 +/* li takes a 32bit immediate */
6683 +#define TIF_GRSEC_SETXID 29 /* update credentials on syscall entry/exit */
6684 #define TIF_SYSCALL_TRACE 31 /* syscall trace active */
6685
6686 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
6687 @@ -134,13 +136,14 @@ static inline struct thread_info *current_thread_info(void)
6688 #define _TIF_LOAD_WATCH (1<<TIF_LOAD_WATCH)
6689 #define _TIF_32BIT_FPREGS (1<<TIF_32BIT_FPREGS)
6690 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6691 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6692
6693 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6694 - _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6695 + _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6696
6697 /* work to do in syscall_trace_leave() */
6698 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6699 - _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6700 + _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6701
6702 /* work to do on interrupt/exception return */
6703 #define _TIF_WORK_MASK \
6704 @@ -148,7 +151,7 @@ static inline struct thread_info *current_thread_info(void)
6705 /* work to do on any return to u-space */
6706 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6707 _TIF_WORK_SYSCALL_EXIT | \
6708 - _TIF_SYSCALL_TRACEPOINT)
6709 + _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6710
6711 /*
6712 * We stash processor id into a COP0 register to retrieve it fast
6713 diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6714 index f3fa375..3af6637 100644
6715 --- a/arch/mips/include/asm/uaccess.h
6716 +++ b/arch/mips/include/asm/uaccess.h
6717 @@ -128,6 +128,7 @@ extern u64 __ua_limit;
6718 __ok == 0; \
6719 })
6720
6721 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6722 #define access_ok(type, addr, size) \
6723 likely(__access_ok((addr), (size), __access_mask))
6724
6725 diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6726 index 1188e00..41cf144 100644
6727 --- a/arch/mips/kernel/binfmt_elfn32.c
6728 +++ b/arch/mips/kernel/binfmt_elfn32.c
6729 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6730 #undef ELF_ET_DYN_BASE
6731 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6732
6733 +#ifdef CONFIG_PAX_ASLR
6734 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6735 +
6736 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6737 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6738 +#endif
6739 +
6740 #include <asm/processor.h>
6741 #include <linux/module.h>
6742 #include <linux/elfcore.h>
6743 diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6744 index 7faf5f2..f3d3cf4 100644
6745 --- a/arch/mips/kernel/binfmt_elfo32.c
6746 +++ b/arch/mips/kernel/binfmt_elfo32.c
6747 @@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6748 #undef ELF_ET_DYN_BASE
6749 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6750
6751 +#ifdef CONFIG_PAX_ASLR
6752 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6753 +
6754 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6755 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6756 +#endif
6757 +
6758 #include <asm/processor.h>
6759
6760 /*
6761 diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6762 index 2b91fe8..fe4f6b4 100644
6763 --- a/arch/mips/kernel/i8259.c
6764 +++ b/arch/mips/kernel/i8259.c
6765 @@ -205,7 +205,7 @@ spurious_8259A_irq:
6766 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6767 spurious_irq_mask |= irqmask;
6768 }
6769 - atomic_inc(&irq_err_count);
6770 + atomic_inc_unchecked(&irq_err_count);
6771 /*
6772 * Theoretically we do not have to handle this IRQ,
6773 * but in Linux this does not cause problems and is
6774 diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6775 index 44a1f79..2bd6aa3 100644
6776 --- a/arch/mips/kernel/irq-gt641xx.c
6777 +++ b/arch/mips/kernel/irq-gt641xx.c
6778 @@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6779 }
6780 }
6781
6782 - atomic_inc(&irq_err_count);
6783 + atomic_inc_unchecked(&irq_err_count);
6784 }
6785
6786 void __init gt641xx_irq_init(void)
6787 diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6788 index d1fea7a..45602ea 100644
6789 --- a/arch/mips/kernel/irq.c
6790 +++ b/arch/mips/kernel/irq.c
6791 @@ -77,17 +77,17 @@ void ack_bad_irq(unsigned int irq)
6792 printk("unexpected IRQ # %d\n", irq);
6793 }
6794
6795 -atomic_t irq_err_count;
6796 +atomic_unchecked_t irq_err_count;
6797
6798 int arch_show_interrupts(struct seq_file *p, int prec)
6799 {
6800 - seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6801 + seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6802 return 0;
6803 }
6804
6805 asmlinkage void spurious_interrupt(void)
6806 {
6807 - atomic_inc(&irq_err_count);
6808 + atomic_inc_unchecked(&irq_err_count);
6809 }
6810
6811 void __init init_IRQ(void)
6812 diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6813 index 6ae540e..b7396dc 100644
6814 --- a/arch/mips/kernel/process.c
6815 +++ b/arch/mips/kernel/process.c
6816 @@ -562,15 +562,3 @@ unsigned long get_wchan(struct task_struct *task)
6817 out:
6818 return pc;
6819 }
6820 -
6821 -/*
6822 - * Don't forget that the stack pointer must be aligned on a 8 bytes
6823 - * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6824 - */
6825 -unsigned long arch_align_stack(unsigned long sp)
6826 -{
6827 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6828 - sp -= get_random_int() & ~PAGE_MASK;
6829 -
6830 - return sp & ALMASK;
6831 -}
6832 diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6833 index 7da9b76..21578be 100644
6834 --- a/arch/mips/kernel/ptrace.c
6835 +++ b/arch/mips/kernel/ptrace.c
6836 @@ -658,6 +658,10 @@ long arch_ptrace(struct task_struct *child, long request,
6837 return ret;
6838 }
6839
6840 +#ifdef CONFIG_GRKERNSEC_SETXID
6841 +extern void gr_delayed_cred_worker(void);
6842 +#endif
6843 +
6844 /*
6845 * Notification of system call entry/exit
6846 * - triggered by current->work.syscall_trace
6847 @@ -674,6 +678,11 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs)
6848 tracehook_report_syscall_entry(regs))
6849 ret = -1;
6850
6851 +#ifdef CONFIG_GRKERNSEC_SETXID
6852 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6853 + gr_delayed_cred_worker();
6854 +#endif
6855 +
6856 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6857 trace_sys_enter(regs, regs->regs[2]);
6858
6859 diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
6860 index 07fc524..b9d7f28 100644
6861 --- a/arch/mips/kernel/reset.c
6862 +++ b/arch/mips/kernel/reset.c
6863 @@ -13,6 +13,7 @@
6864 #include <linux/reboot.h>
6865
6866 #include <asm/reboot.h>
6867 +#include <asm/bug.h>
6868
6869 /*
6870 * Urgs ... Too many MIPS machines to handle this in a generic way.
6871 @@ -29,16 +30,19 @@ void machine_restart(char *command)
6872 {
6873 if (_machine_restart)
6874 _machine_restart(command);
6875 + BUG();
6876 }
6877
6878 void machine_halt(void)
6879 {
6880 if (_machine_halt)
6881 _machine_halt();
6882 + BUG();
6883 }
6884
6885 void machine_power_off(void)
6886 {
6887 if (pm_power_off)
6888 pm_power_off();
6889 + BUG();
6890 }
6891 diff --git a/arch/mips/kernel/smtc-proc.c b/arch/mips/kernel/smtc-proc.c
6892 index c10aa84..9ec2e60 100644
6893 --- a/arch/mips/kernel/smtc-proc.c
6894 +++ b/arch/mips/kernel/smtc-proc.c
6895 @@ -31,7 +31,7 @@ unsigned long selfipis[NR_CPUS];
6896
6897 struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS];
6898
6899 -atomic_t smtc_fpu_recoveries;
6900 +atomic_unchecked_t smtc_fpu_recoveries;
6901
6902 static int smtc_proc_show(struct seq_file *m, void *v)
6903 {
6904 @@ -48,7 +48,7 @@ static int smtc_proc_show(struct seq_file *m, void *v)
6905 for(i = 0; i < NR_CPUS; i++)
6906 seq_printf(m, "%d: %ld\n", i, smtc_cpu_stats[i].selfipis);
6907 seq_printf(m, "%d Recoveries of \"stolen\" FPU\n",
6908 - atomic_read(&smtc_fpu_recoveries));
6909 + atomic_read_unchecked(&smtc_fpu_recoveries));
6910 return 0;
6911 }
6912
6913 @@ -73,7 +73,7 @@ void init_smtc_stats(void)
6914 smtc_cpu_stats[i].selfipis = 0;
6915 }
6916
6917 - atomic_set(&smtc_fpu_recoveries, 0);
6918 + atomic_set_unchecked(&smtc_fpu_recoveries, 0);
6919
6920 proc_create("smtc", 0444, NULL, &smtc_proc_fops);
6921 }
6922 diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
6923 index dfc1b91..11a2c07 100644
6924 --- a/arch/mips/kernel/smtc.c
6925 +++ b/arch/mips/kernel/smtc.c
6926 @@ -1359,7 +1359,7 @@ void smtc_soft_dump(void)
6927 }
6928 smtc_ipi_qdump();
6929 printk("%d Recoveries of \"stolen\" FPU\n",
6930 - atomic_read(&smtc_fpu_recoveries));
6931 + atomic_read_unchecked(&smtc_fpu_recoveries));
6932 }
6933
6934
6935 diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6936 index c24ad5f..9983ab2 100644
6937 --- a/arch/mips/kernel/sync-r4k.c
6938 +++ b/arch/mips/kernel/sync-r4k.c
6939 @@ -20,8 +20,8 @@
6940 #include <asm/mipsregs.h>
6941
6942 static atomic_t count_start_flag = ATOMIC_INIT(0);
6943 -static atomic_t count_count_start = ATOMIC_INIT(0);
6944 -static atomic_t count_count_stop = ATOMIC_INIT(0);
6945 +static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6946 +static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6947 static atomic_t count_reference = ATOMIC_INIT(0);
6948
6949 #define COUNTON 100
6950 @@ -68,13 +68,13 @@ void synchronise_count_master(int cpu)
6951
6952 for (i = 0; i < NR_LOOPS; i++) {
6953 /* slaves loop on '!= 2' */
6954 - while (atomic_read(&count_count_start) != 1)
6955 + while (atomic_read_unchecked(&count_count_start) != 1)
6956 mb();
6957 - atomic_set(&count_count_stop, 0);
6958 + atomic_set_unchecked(&count_count_stop, 0);
6959 smp_wmb();
6960
6961 /* this lets the slaves write their count register */
6962 - atomic_inc(&count_count_start);
6963 + atomic_inc_unchecked(&count_count_start);
6964
6965 /*
6966 * Everyone initialises count in the last loop:
6967 @@ -85,11 +85,11 @@ void synchronise_count_master(int cpu)
6968 /*
6969 * Wait for all slaves to leave the synchronization point:
6970 */
6971 - while (atomic_read(&count_count_stop) != 1)
6972 + while (atomic_read_unchecked(&count_count_stop) != 1)
6973 mb();
6974 - atomic_set(&count_count_start, 0);
6975 + atomic_set_unchecked(&count_count_start, 0);
6976 smp_wmb();
6977 - atomic_inc(&count_count_stop);
6978 + atomic_inc_unchecked(&count_count_stop);
6979 }
6980 /* Arrange for an interrupt in a short while */
6981 write_c0_compare(read_c0_count() + COUNTON);
6982 @@ -130,8 +130,8 @@ void synchronise_count_slave(int cpu)
6983 initcount = atomic_read(&count_reference);
6984
6985 for (i = 0; i < NR_LOOPS; i++) {
6986 - atomic_inc(&count_count_start);
6987 - while (atomic_read(&count_count_start) != 2)
6988 + atomic_inc_unchecked(&count_count_start);
6989 + while (atomic_read_unchecked(&count_count_start) != 2)
6990 mb();
6991
6992 /*
6993 @@ -140,8 +140,8 @@ void synchronise_count_slave(int cpu)
6994 if (i == NR_LOOPS-1)
6995 write_c0_count(initcount);
6996
6997 - atomic_inc(&count_count_stop);
6998 - while (atomic_read(&count_count_stop) != 2)
6999 + atomic_inc_unchecked(&count_count_stop);
7000 + while (atomic_read_unchecked(&count_count_stop) != 2)
7001 mb();
7002 }
7003 /* Arrange for an interrupt in a short while */
7004 diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
7005 index e0b4996..6b43ce7 100644
7006 --- a/arch/mips/kernel/traps.c
7007 +++ b/arch/mips/kernel/traps.c
7008 @@ -691,7 +691,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
7009 siginfo_t info;
7010
7011 prev_state = exception_enter();
7012 - die_if_kernel("Integer overflow", regs);
7013 + if (unlikely(!user_mode(regs))) {
7014 +
7015 +#ifdef CONFIG_PAX_REFCOUNT
7016 + if (fixup_exception(regs)) {
7017 + pax_report_refcount_overflow(regs);
7018 + exception_exit(prev_state);
7019 + return;
7020 + }
7021 +#endif
7022 +
7023 + die("Integer overflow", regs);
7024 + }
7025
7026 info.si_code = FPE_INTOVF;
7027 info.si_signo = SIGFPE;
7028 diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
7029 index becc42b..9e43d4b 100644
7030 --- a/arch/mips/mm/fault.c
7031 +++ b/arch/mips/mm/fault.c
7032 @@ -28,6 +28,23 @@
7033 #include <asm/highmem.h> /* For VMALLOC_END */
7034 #include <linux/kdebug.h>
7035
7036 +#ifdef CONFIG_PAX_PAGEEXEC
7037 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7038 +{
7039 + unsigned long i;
7040 +
7041 + printk(KERN_ERR "PAX: bytes at PC: ");
7042 + for (i = 0; i < 5; i++) {
7043 + unsigned int c;
7044 + if (get_user(c, (unsigned int *)pc+i))
7045 + printk(KERN_CONT "???????? ");
7046 + else
7047 + printk(KERN_CONT "%08x ", c);
7048 + }
7049 + printk("\n");
7050 +}
7051 +#endif
7052 +
7053 /*
7054 * This routine handles page faults. It determines the address,
7055 * and the problem, and then passes it off to one of the appropriate
7056 @@ -199,6 +216,14 @@ bad_area:
7057 bad_area_nosemaphore:
7058 /* User mode accesses just cause a SIGSEGV */
7059 if (user_mode(regs)) {
7060 +
7061 +#ifdef CONFIG_PAX_PAGEEXEC
7062 + if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
7063 + pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
7064 + do_group_exit(SIGKILL);
7065 + }
7066 +#endif
7067 +
7068 tsk->thread.cp0_badvaddr = address;
7069 tsk->thread.error_code = write;
7070 #if 0
7071 diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
7072 index f1baadd..5472dca 100644
7073 --- a/arch/mips/mm/mmap.c
7074 +++ b/arch/mips/mm/mmap.c
7075 @@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7076 struct vm_area_struct *vma;
7077 unsigned long addr = addr0;
7078 int do_color_align;
7079 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
7080 struct vm_unmapped_area_info info;
7081
7082 if (unlikely(len > TASK_SIZE))
7083 @@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7084 do_color_align = 1;
7085
7086 /* requesting a specific address */
7087 +
7088 +#ifdef CONFIG_PAX_RANDMMAP
7089 + if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
7090 +#endif
7091 +
7092 if (addr) {
7093 if (do_color_align)
7094 addr = COLOUR_ALIGN(addr, pgoff);
7095 @@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7096 addr = PAGE_ALIGN(addr);
7097
7098 vma = find_vma(mm, addr);
7099 - if (TASK_SIZE - len >= addr &&
7100 - (!vma || addr + len <= vma->vm_start))
7101 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
7102 return addr;
7103 }
7104
7105 info.length = len;
7106 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
7107 info.align_offset = pgoff << PAGE_SHIFT;
7108 + info.threadstack_offset = offset;
7109
7110 if (dir == DOWN) {
7111 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
7112 @@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7113 {
7114 unsigned long random_factor = 0UL;
7115
7116 +#ifdef CONFIG_PAX_RANDMMAP
7117 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7118 +#endif
7119 +
7120 if (current->flags & PF_RANDOMIZE) {
7121 random_factor = get_random_int();
7122 random_factor = random_factor << PAGE_SHIFT;
7123 @@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7124
7125 if (mmap_is_legacy()) {
7126 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
7127 +
7128 +#ifdef CONFIG_PAX_RANDMMAP
7129 + if (mm->pax_flags & MF_PAX_RANDMMAP)
7130 + mm->mmap_base += mm->delta_mmap;
7131 +#endif
7132 +
7133 mm->get_unmapped_area = arch_get_unmapped_area;
7134 } else {
7135 mm->mmap_base = mmap_base(random_factor);
7136 +
7137 +#ifdef CONFIG_PAX_RANDMMAP
7138 + if (mm->pax_flags & MF_PAX_RANDMMAP)
7139 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7140 +#endif
7141 +
7142 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
7143 }
7144 }
7145
7146 -static inline unsigned long brk_rnd(void)
7147 -{
7148 - unsigned long rnd = get_random_int();
7149 -
7150 - rnd = rnd << PAGE_SHIFT;
7151 - /* 8MB for 32bit, 256MB for 64bit */
7152 - if (TASK_IS_32BIT_ADDR)
7153 - rnd = rnd & 0x7ffffful;
7154 - else
7155 - rnd = rnd & 0xffffffful;
7156 -
7157 - return rnd;
7158 -}
7159 -
7160 -unsigned long arch_randomize_brk(struct mm_struct *mm)
7161 -{
7162 - unsigned long base = mm->brk;
7163 - unsigned long ret;
7164 -
7165 - ret = PAGE_ALIGN(base + brk_rnd());
7166 -
7167 - if (ret < mm->brk)
7168 - return mm->brk;
7169 -
7170 - return ret;
7171 -}
7172 -
7173 int __virt_addr_valid(const volatile void *kaddr)
7174 {
7175 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
7176 diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
7177 index 59cccd9..f39ac2f 100644
7178 --- a/arch/mips/pci/pci-octeon.c
7179 +++ b/arch/mips/pci/pci-octeon.c
7180 @@ -327,8 +327,8 @@ static int octeon_write_config(struct pci_bus *bus, unsigned int devfn,
7181
7182
7183 static struct pci_ops octeon_pci_ops = {
7184 - octeon_read_config,
7185 - octeon_write_config,
7186 + .read = octeon_read_config,
7187 + .write = octeon_write_config,
7188 };
7189
7190 static struct resource octeon_pci_mem_resource = {
7191 diff --git a/arch/mips/pci/pcie-octeon.c b/arch/mips/pci/pcie-octeon.c
7192 index 5e36c33..eb4a17b 100644
7193 --- a/arch/mips/pci/pcie-octeon.c
7194 +++ b/arch/mips/pci/pcie-octeon.c
7195 @@ -1792,8 +1792,8 @@ static int octeon_dummy_write_config(struct pci_bus *bus, unsigned int devfn,
7196 }
7197
7198 static struct pci_ops octeon_pcie0_ops = {
7199 - octeon_pcie0_read_config,
7200 - octeon_pcie0_write_config,
7201 + .read = octeon_pcie0_read_config,
7202 + .write = octeon_pcie0_write_config,
7203 };
7204
7205 static struct resource octeon_pcie0_mem_resource = {
7206 @@ -1813,8 +1813,8 @@ static struct pci_controller octeon_pcie0_controller = {
7207 };
7208
7209 static struct pci_ops octeon_pcie1_ops = {
7210 - octeon_pcie1_read_config,
7211 - octeon_pcie1_write_config,
7212 + .read = octeon_pcie1_read_config,
7213 + .write = octeon_pcie1_write_config,
7214 };
7215
7216 static struct resource octeon_pcie1_mem_resource = {
7217 @@ -1834,8 +1834,8 @@ static struct pci_controller octeon_pcie1_controller = {
7218 };
7219
7220 static struct pci_ops octeon_dummy_ops = {
7221 - octeon_dummy_read_config,
7222 - octeon_dummy_write_config,
7223 + .read = octeon_dummy_read_config,
7224 + .write = octeon_dummy_write_config,
7225 };
7226
7227 static struct resource octeon_dummy_mem_resource = {
7228 diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7229 index a2358b4..7cead4f 100644
7230 --- a/arch/mips/sgi-ip27/ip27-nmi.c
7231 +++ b/arch/mips/sgi-ip27/ip27-nmi.c
7232 @@ -187,9 +187,9 @@ void
7233 cont_nmi_dump(void)
7234 {
7235 #ifndef REAL_NMI_SIGNAL
7236 - static atomic_t nmied_cpus = ATOMIC_INIT(0);
7237 + static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7238
7239 - atomic_inc(&nmied_cpus);
7240 + atomic_inc_unchecked(&nmied_cpus);
7241 #endif
7242 /*
7243 * Only allow 1 cpu to proceed
7244 @@ -233,7 +233,7 @@ cont_nmi_dump(void)
7245 udelay(10000);
7246 }
7247 #else
7248 - while (atomic_read(&nmied_cpus) != num_online_cpus());
7249 + while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7250 #endif
7251
7252 /*
7253 diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7254 index a046b30..6799527 100644
7255 --- a/arch/mips/sni/rm200.c
7256 +++ b/arch/mips/sni/rm200.c
7257 @@ -270,7 +270,7 @@ spurious_8259A_irq:
7258 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7259 spurious_irq_mask |= irqmask;
7260 }
7261 - atomic_inc(&irq_err_count);
7262 + atomic_inc_unchecked(&irq_err_count);
7263 /*
7264 * Theoretically we do not have to handle this IRQ,
7265 * but in Linux this does not cause problems and is
7266 diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7267 index 41e873b..34d33a7 100644
7268 --- a/arch/mips/vr41xx/common/icu.c
7269 +++ b/arch/mips/vr41xx/common/icu.c
7270 @@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7271
7272 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7273
7274 - atomic_inc(&irq_err_count);
7275 + atomic_inc_unchecked(&irq_err_count);
7276
7277 return -1;
7278 }
7279 diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7280 index ae0e4ee..e8f0692 100644
7281 --- a/arch/mips/vr41xx/common/irq.c
7282 +++ b/arch/mips/vr41xx/common/irq.c
7283 @@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7284 irq_cascade_t *cascade;
7285
7286 if (irq >= NR_IRQS) {
7287 - atomic_inc(&irq_err_count);
7288 + atomic_inc_unchecked(&irq_err_count);
7289 return;
7290 }
7291
7292 @@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7293 ret = cascade->get_irq(irq);
7294 irq = ret;
7295 if (ret < 0)
7296 - atomic_inc(&irq_err_count);
7297 + atomic_inc_unchecked(&irq_err_count);
7298 else
7299 irq_dispatch(irq);
7300 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7301 diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7302 index 967d144..db12197 100644
7303 --- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7304 +++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7305 @@ -11,12 +11,14 @@
7306 #ifndef _ASM_PROC_CACHE_H
7307 #define _ASM_PROC_CACHE_H
7308
7309 +#include <linux/const.h>
7310 +
7311 /* L1 cache */
7312
7313 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7314 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7315 -#define L1_CACHE_BYTES 16 /* bytes per entry */
7316 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7317 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7318 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7319
7320 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7321 diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7322 index bcb5df2..84fabd2 100644
7323 --- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7324 +++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7325 @@ -16,13 +16,15 @@
7326 #ifndef _ASM_PROC_CACHE_H
7327 #define _ASM_PROC_CACHE_H
7328
7329 +#include <linux/const.h>
7330 +
7331 /*
7332 * L1 cache
7333 */
7334 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7335 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7336 -#define L1_CACHE_BYTES 32 /* bytes per entry */
7337 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7338 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7339 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7340
7341 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7342 diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7343 index 4ce7a01..449202a 100644
7344 --- a/arch/openrisc/include/asm/cache.h
7345 +++ b/arch/openrisc/include/asm/cache.h
7346 @@ -19,11 +19,13 @@
7347 #ifndef __ASM_OPENRISC_CACHE_H
7348 #define __ASM_OPENRISC_CACHE_H
7349
7350 +#include <linux/const.h>
7351 +
7352 /* FIXME: How can we replace these with values from the CPU...
7353 * they shouldn't be hard-coded!
7354 */
7355
7356 -#define L1_CACHE_BYTES 16
7357 #define L1_CACHE_SHIFT 4
7358 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7359
7360 #endif /* __ASM_OPENRISC_CACHE_H */
7361 diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7362 index 472886c..00e7df9 100644
7363 --- a/arch/parisc/include/asm/atomic.h
7364 +++ b/arch/parisc/include/asm/atomic.h
7365 @@ -252,6 +252,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7366 return dec;
7367 }
7368
7369 +#define atomic64_read_unchecked(v) atomic64_read(v)
7370 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7371 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7372 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7373 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7374 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
7375 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7376 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
7377 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7378 +
7379 #endif /* !CONFIG_64BIT */
7380
7381
7382 diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7383 index 47f11c7..3420df2 100644
7384 --- a/arch/parisc/include/asm/cache.h
7385 +++ b/arch/parisc/include/asm/cache.h
7386 @@ -5,6 +5,7 @@
7387 #ifndef __ARCH_PARISC_CACHE_H
7388 #define __ARCH_PARISC_CACHE_H
7389
7390 +#include <linux/const.h>
7391
7392 /*
7393 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7394 @@ -15,13 +16,13 @@
7395 * just ruin performance.
7396 */
7397 #ifdef CONFIG_PA20
7398 -#define L1_CACHE_BYTES 64
7399 #define L1_CACHE_SHIFT 6
7400 #else
7401 -#define L1_CACHE_BYTES 32
7402 #define L1_CACHE_SHIFT 5
7403 #endif
7404
7405 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7406 +
7407 #ifndef __ASSEMBLY__
7408
7409 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7410 diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7411 index 3391d06..c23a2cc 100644
7412 --- a/arch/parisc/include/asm/elf.h
7413 +++ b/arch/parisc/include/asm/elf.h
7414 @@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7415
7416 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7417
7418 +#ifdef CONFIG_PAX_ASLR
7419 +#define PAX_ELF_ET_DYN_BASE 0x10000UL
7420 +
7421 +#define PAX_DELTA_MMAP_LEN 16
7422 +#define PAX_DELTA_STACK_LEN 16
7423 +#endif
7424 +
7425 /* This yields a mask that user programs can use to figure out what
7426 instruction set this CPU supports. This could be done in user space,
7427 but it's not easy, and we've already done it here. */
7428 diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7429 index f213f5b..0af3e8e 100644
7430 --- a/arch/parisc/include/asm/pgalloc.h
7431 +++ b/arch/parisc/include/asm/pgalloc.h
7432 @@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7433 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7434 }
7435
7436 +static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7437 +{
7438 + pgd_populate(mm, pgd, pmd);
7439 +}
7440 +
7441 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7442 {
7443 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7444 @@ -93,6 +98,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7445 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7446 #define pmd_free(mm, x) do { } while (0)
7447 #define pgd_populate(mm, pmd, pte) BUG()
7448 +#define pgd_populate_kernel(mm, pmd, pte) BUG()
7449
7450 #endif
7451
7452 diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7453 index 22b89d1..ce34230 100644
7454 --- a/arch/parisc/include/asm/pgtable.h
7455 +++ b/arch/parisc/include/asm/pgtable.h
7456 @@ -223,6 +223,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7457 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7458 #define PAGE_COPY PAGE_EXECREAD
7459 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7460 +
7461 +#ifdef CONFIG_PAX_PAGEEXEC
7462 +# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7463 +# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7464 +# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7465 +#else
7466 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
7467 +# define PAGE_COPY_NOEXEC PAGE_COPY
7468 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
7469 +#endif
7470 +
7471 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7472 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7473 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7474 diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7475 index 4006964..fcb3cc2 100644
7476 --- a/arch/parisc/include/asm/uaccess.h
7477 +++ b/arch/parisc/include/asm/uaccess.h
7478 @@ -246,10 +246,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7479 const void __user *from,
7480 unsigned long n)
7481 {
7482 - int sz = __compiletime_object_size(to);
7483 + size_t sz = __compiletime_object_size(to);
7484 int ret = -EFAULT;
7485
7486 - if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7487 + if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7488 ret = __copy_from_user(to, from, n);
7489 else
7490 copy_from_user_overflow();
7491 diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7492 index 50dfafc..b9fc230 100644
7493 --- a/arch/parisc/kernel/module.c
7494 +++ b/arch/parisc/kernel/module.c
7495 @@ -98,16 +98,38 @@
7496
7497 /* three functions to determine where in the module core
7498 * or init pieces the location is */
7499 +static inline int in_init_rx(struct module *me, void *loc)
7500 +{
7501 + return (loc >= me->module_init_rx &&
7502 + loc < (me->module_init_rx + me->init_size_rx));
7503 +}
7504 +
7505 +static inline int in_init_rw(struct module *me, void *loc)
7506 +{
7507 + return (loc >= me->module_init_rw &&
7508 + loc < (me->module_init_rw + me->init_size_rw));
7509 +}
7510 +
7511 static inline int in_init(struct module *me, void *loc)
7512 {
7513 - return (loc >= me->module_init &&
7514 - loc <= (me->module_init + me->init_size));
7515 + return in_init_rx(me, loc) || in_init_rw(me, loc);
7516 +}
7517 +
7518 +static inline int in_core_rx(struct module *me, void *loc)
7519 +{
7520 + return (loc >= me->module_core_rx &&
7521 + loc < (me->module_core_rx + me->core_size_rx));
7522 +}
7523 +
7524 +static inline int in_core_rw(struct module *me, void *loc)
7525 +{
7526 + return (loc >= me->module_core_rw &&
7527 + loc < (me->module_core_rw + me->core_size_rw));
7528 }
7529
7530 static inline int in_core(struct module *me, void *loc)
7531 {
7532 - return (loc >= me->module_core &&
7533 - loc <= (me->module_core + me->core_size));
7534 + return in_core_rx(me, loc) || in_core_rw(me, loc);
7535 }
7536
7537 static inline int in_local(struct module *me, void *loc)
7538 @@ -371,13 +393,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7539 }
7540
7541 /* align things a bit */
7542 - me->core_size = ALIGN(me->core_size, 16);
7543 - me->arch.got_offset = me->core_size;
7544 - me->core_size += gots * sizeof(struct got_entry);
7545 + me->core_size_rw = ALIGN(me->core_size_rw, 16);
7546 + me->arch.got_offset = me->core_size_rw;
7547 + me->core_size_rw += gots * sizeof(struct got_entry);
7548
7549 - me->core_size = ALIGN(me->core_size, 16);
7550 - me->arch.fdesc_offset = me->core_size;
7551 - me->core_size += fdescs * sizeof(Elf_Fdesc);
7552 + me->core_size_rw = ALIGN(me->core_size_rw, 16);
7553 + me->arch.fdesc_offset = me->core_size_rw;
7554 + me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7555
7556 me->arch.got_max = gots;
7557 me->arch.fdesc_max = fdescs;
7558 @@ -395,7 +417,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7559
7560 BUG_ON(value == 0);
7561
7562 - got = me->module_core + me->arch.got_offset;
7563 + got = me->module_core_rw + me->arch.got_offset;
7564 for (i = 0; got[i].addr; i++)
7565 if (got[i].addr == value)
7566 goto out;
7567 @@ -413,7 +435,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7568 #ifdef CONFIG_64BIT
7569 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7570 {
7571 - Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7572 + Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7573
7574 if (!value) {
7575 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7576 @@ -431,7 +453,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7577
7578 /* Create new one */
7579 fdesc->addr = value;
7580 - fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7581 + fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7582 return (Elf_Addr)fdesc;
7583 }
7584 #endif /* CONFIG_64BIT */
7585 @@ -843,7 +865,7 @@ register_unwind_table(struct module *me,
7586
7587 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7588 end = table + sechdrs[me->arch.unwind_section].sh_size;
7589 - gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7590 + gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7591
7592 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7593 me->arch.unwind_section, table, end, gp);
7594 diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7595 index b7cadc4..bf4a32d 100644
7596 --- a/arch/parisc/kernel/sys_parisc.c
7597 +++ b/arch/parisc/kernel/sys_parisc.c
7598 @@ -89,6 +89,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7599 unsigned long task_size = TASK_SIZE;
7600 int do_color_align, last_mmap;
7601 struct vm_unmapped_area_info info;
7602 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7603
7604 if (len > task_size)
7605 return -ENOMEM;
7606 @@ -106,6 +107,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7607 goto found_addr;
7608 }
7609
7610 +#ifdef CONFIG_PAX_RANDMMAP
7611 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7612 +#endif
7613 +
7614 if (addr) {
7615 if (do_color_align && last_mmap)
7616 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7617 @@ -124,6 +129,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7618 info.high_limit = mmap_upper_limit();
7619 info.align_mask = last_mmap ? (PAGE_MASK & (SHMLBA - 1)) : 0;
7620 info.align_offset = shared_align_offset(last_mmap, pgoff);
7621 + info.threadstack_offset = offset;
7622 addr = vm_unmapped_area(&info);
7623
7624 found_addr:
7625 @@ -143,6 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7626 unsigned long addr = addr0;
7627 int do_color_align, last_mmap;
7628 struct vm_unmapped_area_info info;
7629 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7630
7631 #ifdef CONFIG_64BIT
7632 /* This should only ever run for 32-bit processes. */
7633 @@ -167,6 +174,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7634 }
7635
7636 /* requesting a specific address */
7637 +#ifdef CONFIG_PAX_RANDMMAP
7638 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7639 +#endif
7640 +
7641 if (addr) {
7642 if (do_color_align && last_mmap)
7643 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7644 @@ -184,6 +195,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7645 info.high_limit = mm->mmap_base;
7646 info.align_mask = last_mmap ? (PAGE_MASK & (SHMLBA - 1)) : 0;
7647 info.align_offset = shared_align_offset(last_mmap, pgoff);
7648 + info.threadstack_offset = offset;
7649 addr = vm_unmapped_area(&info);
7650 if (!(addr & ~PAGE_MASK))
7651 goto found_addr;
7652 @@ -249,6 +261,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7653 mm->mmap_legacy_base = mmap_legacy_base();
7654 mm->mmap_base = mmap_upper_limit();
7655
7656 +#ifdef CONFIG_PAX_RANDMMAP
7657 + if (mm->pax_flags & MF_PAX_RANDMMAP) {
7658 + mm->mmap_legacy_base += mm->delta_mmap;
7659 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7660 + }
7661 +#endif
7662 +
7663 if (mmap_is_legacy()) {
7664 mm->mmap_base = mm->mmap_legacy_base;
7665 mm->get_unmapped_area = arch_get_unmapped_area;
7666 diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7667 index 1cd1d0c..44ec918 100644
7668 --- a/arch/parisc/kernel/traps.c
7669 +++ b/arch/parisc/kernel/traps.c
7670 @@ -722,9 +722,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7671
7672 down_read(&current->mm->mmap_sem);
7673 vma = find_vma(current->mm,regs->iaoq[0]);
7674 - if (vma && (regs->iaoq[0] >= vma->vm_start)
7675 - && (vma->vm_flags & VM_EXEC)) {
7676 -
7677 + if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7678 fault_address = regs->iaoq[0];
7679 fault_space = regs->iasq[0];
7680
7681 diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7682 index 9d08c71..e2b4d20 100644
7683 --- a/arch/parisc/mm/fault.c
7684 +++ b/arch/parisc/mm/fault.c
7685 @@ -15,6 +15,7 @@
7686 #include <linux/sched.h>
7687 #include <linux/interrupt.h>
7688 #include <linux/module.h>
7689 +#include <linux/unistd.h>
7690
7691 #include <asm/uaccess.h>
7692 #include <asm/traps.h>
7693 @@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, exception_data);
7694 static unsigned long
7695 parisc_acctyp(unsigned long code, unsigned int inst)
7696 {
7697 - if (code == 6 || code == 16)
7698 + if (code == 6 || code == 7 || code == 16)
7699 return VM_EXEC;
7700
7701 switch (inst & 0xf0000000) {
7702 @@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7703 }
7704 #endif
7705
7706 +#ifdef CONFIG_PAX_PAGEEXEC
7707 +/*
7708 + * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7709 + *
7710 + * returns 1 when task should be killed
7711 + * 2 when rt_sigreturn trampoline was detected
7712 + * 3 when unpatched PLT trampoline was detected
7713 + */
7714 +static int pax_handle_fetch_fault(struct pt_regs *regs)
7715 +{
7716 +
7717 +#ifdef CONFIG_PAX_EMUPLT
7718 + int err;
7719 +
7720 + do { /* PaX: unpatched PLT emulation */
7721 + unsigned int bl, depwi;
7722 +
7723 + err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7724 + err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7725 +
7726 + if (err)
7727 + break;
7728 +
7729 + if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7730 + unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7731 +
7732 + err = get_user(ldw, (unsigned int *)addr);
7733 + err |= get_user(bv, (unsigned int *)(addr+4));
7734 + err |= get_user(ldw2, (unsigned int *)(addr+8));
7735 +
7736 + if (err)
7737 + break;
7738 +
7739 + if (ldw == 0x0E801096U &&
7740 + bv == 0xEAC0C000U &&
7741 + ldw2 == 0x0E881095U)
7742 + {
7743 + unsigned int resolver, map;
7744 +
7745 + err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7746 + err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7747 + if (err)
7748 + break;
7749 +
7750 + regs->gr[20] = instruction_pointer(regs)+8;
7751 + regs->gr[21] = map;
7752 + regs->gr[22] = resolver;
7753 + regs->iaoq[0] = resolver | 3UL;
7754 + regs->iaoq[1] = regs->iaoq[0] + 4;
7755 + return 3;
7756 + }
7757 + }
7758 + } while (0);
7759 +#endif
7760 +
7761 +#ifdef CONFIG_PAX_EMUTRAMP
7762 +
7763 +#ifndef CONFIG_PAX_EMUSIGRT
7764 + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7765 + return 1;
7766 +#endif
7767 +
7768 + do { /* PaX: rt_sigreturn emulation */
7769 + unsigned int ldi1, ldi2, bel, nop;
7770 +
7771 + err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7772 + err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7773 + err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7774 + err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7775 +
7776 + if (err)
7777 + break;
7778 +
7779 + if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7780 + ldi2 == 0x3414015AU &&
7781 + bel == 0xE4008200U &&
7782 + nop == 0x08000240U)
7783 + {
7784 + regs->gr[25] = (ldi1 & 2) >> 1;
7785 + regs->gr[20] = __NR_rt_sigreturn;
7786 + regs->gr[31] = regs->iaoq[1] + 16;
7787 + regs->sr[0] = regs->iasq[1];
7788 + regs->iaoq[0] = 0x100UL;
7789 + regs->iaoq[1] = regs->iaoq[0] + 4;
7790 + regs->iasq[0] = regs->sr[2];
7791 + regs->iasq[1] = regs->sr[2];
7792 + return 2;
7793 + }
7794 + } while (0);
7795 +#endif
7796 +
7797 + return 1;
7798 +}
7799 +
7800 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7801 +{
7802 + unsigned long i;
7803 +
7804 + printk(KERN_ERR "PAX: bytes at PC: ");
7805 + for (i = 0; i < 5; i++) {
7806 + unsigned int c;
7807 + if (get_user(c, (unsigned int *)pc+i))
7808 + printk(KERN_CONT "???????? ");
7809 + else
7810 + printk(KERN_CONT "%08x ", c);
7811 + }
7812 + printk("\n");
7813 +}
7814 +#endif
7815 +
7816 int fixup_exception(struct pt_regs *regs)
7817 {
7818 const struct exception_table_entry *fix;
7819 @@ -210,8 +321,33 @@ retry:
7820
7821 good_area:
7822
7823 - if ((vma->vm_flags & acc_type) != acc_type)
7824 + if ((vma->vm_flags & acc_type) != acc_type) {
7825 +
7826 +#ifdef CONFIG_PAX_PAGEEXEC
7827 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7828 + (address & ~3UL) == instruction_pointer(regs))
7829 + {
7830 + up_read(&mm->mmap_sem);
7831 + switch (pax_handle_fetch_fault(regs)) {
7832 +
7833 +#ifdef CONFIG_PAX_EMUPLT
7834 + case 3:
7835 + return;
7836 +#endif
7837 +
7838 +#ifdef CONFIG_PAX_EMUTRAMP
7839 + case 2:
7840 + return;
7841 +#endif
7842 +
7843 + }
7844 + pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7845 + do_group_exit(SIGKILL);
7846 + }
7847 +#endif
7848 +
7849 goto bad_area;
7850 + }
7851
7852 /*
7853 * If for any reason at all we couldn't handle the fault, make
7854 diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7855 index 957bf34..3430cc8 100644
7856 --- a/arch/powerpc/Kconfig
7857 +++ b/arch/powerpc/Kconfig
7858 @@ -393,6 +393,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7859 config KEXEC
7860 bool "kexec system call"
7861 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7862 + depends on !GRKERNSEC_KMEM
7863 help
7864 kexec is a system call that implements the ability to shutdown your
7865 current kernel, and to start another kernel. It is like a reboot
7866 diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7867 index e3b1d41..8e81edf 100644
7868 --- a/arch/powerpc/include/asm/atomic.h
7869 +++ b/arch/powerpc/include/asm/atomic.h
7870 @@ -523,6 +523,16 @@ static __inline__ long atomic64_inc_not_zero(atomic64_t *v)
7871 return t1;
7872 }
7873
7874 +#define atomic64_read_unchecked(v) atomic64_read(v)
7875 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7876 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7877 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7878 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7879 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
7880 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7881 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
7882 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7883 +
7884 #endif /* __powerpc64__ */
7885
7886 #endif /* __KERNEL__ */
7887 diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
7888 index ed0afc1..0332825 100644
7889 --- a/arch/powerpc/include/asm/cache.h
7890 +++ b/arch/powerpc/include/asm/cache.h
7891 @@ -3,6 +3,7 @@
7892
7893 #ifdef __KERNEL__
7894
7895 +#include <linux/const.h>
7896
7897 /* bytes per L1 cache line */
7898 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
7899 @@ -22,7 +23,7 @@
7900 #define L1_CACHE_SHIFT 7
7901 #endif
7902
7903 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
7904 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7905
7906 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7907
7908 diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
7909 index 935b5e7..7001d2d 100644
7910 --- a/arch/powerpc/include/asm/elf.h
7911 +++ b/arch/powerpc/include/asm/elf.h
7912 @@ -28,8 +28,19 @@
7913 the loader. We need to make sure that it is out of the way of the program
7914 that it will "exec", and that there is sufficient room for the brk. */
7915
7916 -extern unsigned long randomize_et_dyn(unsigned long base);
7917 -#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
7918 +#define ELF_ET_DYN_BASE (0x20000000)
7919 +
7920 +#ifdef CONFIG_PAX_ASLR
7921 +#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
7922 +
7923 +#ifdef __powerpc64__
7924 +#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
7925 +#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
7926 +#else
7927 +#define PAX_DELTA_MMAP_LEN 15
7928 +#define PAX_DELTA_STACK_LEN 15
7929 +#endif
7930 +#endif
7931
7932 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
7933
7934 @@ -127,10 +138,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
7935 (0x7ff >> (PAGE_SHIFT - 12)) : \
7936 (0x3ffff >> (PAGE_SHIFT - 12)))
7937
7938 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
7939 -#define arch_randomize_brk arch_randomize_brk
7940 -
7941 -
7942 #ifdef CONFIG_SPU_BASE
7943 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
7944 #define NT_SPU 1
7945 diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
7946 index 8196e9c..d83a9f3 100644
7947 --- a/arch/powerpc/include/asm/exec.h
7948 +++ b/arch/powerpc/include/asm/exec.h
7949 @@ -4,6 +4,6 @@
7950 #ifndef _ASM_POWERPC_EXEC_H
7951 #define _ASM_POWERPC_EXEC_H
7952
7953 -extern unsigned long arch_align_stack(unsigned long sp);
7954 +#define arch_align_stack(x) ((x) & ~0xfUL)
7955
7956 #endif /* _ASM_POWERPC_EXEC_H */
7957 diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
7958 index 5acabbd..7ea14fa 100644
7959 --- a/arch/powerpc/include/asm/kmap_types.h
7960 +++ b/arch/powerpc/include/asm/kmap_types.h
7961 @@ -10,7 +10,7 @@
7962 * 2 of the License, or (at your option) any later version.
7963 */
7964
7965 -#define KM_TYPE_NR 16
7966 +#define KM_TYPE_NR 17
7967
7968 #endif /* __KERNEL__ */
7969 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
7970 diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
7971 index b8da913..60b608a 100644
7972 --- a/arch/powerpc/include/asm/local.h
7973 +++ b/arch/powerpc/include/asm/local.h
7974 @@ -9,15 +9,26 @@ typedef struct
7975 atomic_long_t a;
7976 } local_t;
7977
7978 +typedef struct
7979 +{
7980 + atomic_long_unchecked_t a;
7981 +} local_unchecked_t;
7982 +
7983 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
7984
7985 #define local_read(l) atomic_long_read(&(l)->a)
7986 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
7987 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
7988 +#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
7989
7990 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
7991 +#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
7992 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
7993 +#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
7994 #define local_inc(l) atomic_long_inc(&(l)->a)
7995 +#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
7996 #define local_dec(l) atomic_long_dec(&(l)->a)
7997 +#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
7998
7999 static __inline__ long local_add_return(long a, local_t *l)
8000 {
8001 @@ -35,6 +46,7 @@ static __inline__ long local_add_return(long a, local_t *l)
8002
8003 return t;
8004 }
8005 +#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
8006
8007 #define local_add_negative(a, l) (local_add_return((a), (l)) < 0)
8008
8009 @@ -54,6 +66,7 @@ static __inline__ long local_sub_return(long a, local_t *l)
8010
8011 return t;
8012 }
8013 +#define local_sub_return_unchecked(i, l) atomic_long_sub_return_unchecked((i), (&(l)->a))
8014
8015 static __inline__ long local_inc_return(local_t *l)
8016 {
8017 @@ -101,6 +114,8 @@ static __inline__ long local_dec_return(local_t *l)
8018
8019 #define local_cmpxchg(l, o, n) \
8020 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8021 +#define local_cmpxchg_unchecked(l, o, n) \
8022 + (cmpxchg_local(&((l)->a.counter), (o), (n)))
8023 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8024
8025 /**
8026 diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8027 index 8565c25..2865190 100644
8028 --- a/arch/powerpc/include/asm/mman.h
8029 +++ b/arch/powerpc/include/asm/mman.h
8030 @@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8031 }
8032 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8033
8034 -static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8035 +static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8036 {
8037 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8038 }
8039 diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8040 index 32e4e21..62afb12 100644
8041 --- a/arch/powerpc/include/asm/page.h
8042 +++ b/arch/powerpc/include/asm/page.h
8043 @@ -230,8 +230,9 @@ extern long long virt_phys_offset;
8044 * and needs to be executable. This means the whole heap ends
8045 * up being executable.
8046 */
8047 -#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8048 - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8049 +#define VM_DATA_DEFAULT_FLAGS32 \
8050 + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8051 + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8052
8053 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8054 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8055 @@ -259,6 +260,9 @@ extern long long virt_phys_offset;
8056 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8057 #endif
8058
8059 +#define ktla_ktva(addr) (addr)
8060 +#define ktva_ktla(addr) (addr)
8061 +
8062 #ifndef CONFIG_PPC_BOOK3S_64
8063 /*
8064 * Use the top bit of the higher-level page table entries to indicate whether
8065 diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8066 index 88693ce..ac6f9ab 100644
8067 --- a/arch/powerpc/include/asm/page_64.h
8068 +++ b/arch/powerpc/include/asm/page_64.h
8069 @@ -153,15 +153,18 @@ do { \
8070 * stack by default, so in the absence of a PT_GNU_STACK program header
8071 * we turn execute permission off.
8072 */
8073 -#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8074 - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8075 +#define VM_STACK_DEFAULT_FLAGS32 \
8076 + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8077 + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8078
8079 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8080 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8081
8082 +#ifndef CONFIG_PAX_PAGEEXEC
8083 #define VM_STACK_DEFAULT_FLAGS \
8084 (is_32bit_task() ? \
8085 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8086 +#endif
8087
8088 #include <asm-generic/getorder.h>
8089
8090 diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8091 index 4b0be20..c15a27d 100644
8092 --- a/arch/powerpc/include/asm/pgalloc-64.h
8093 +++ b/arch/powerpc/include/asm/pgalloc-64.h
8094 @@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8095 #ifndef CONFIG_PPC_64K_PAGES
8096
8097 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8098 +#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8099
8100 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8101 {
8102 @@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8103 pud_set(pud, (unsigned long)pmd);
8104 }
8105
8106 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8107 +{
8108 + pud_populate(mm, pud, pmd);
8109 +}
8110 +
8111 #define pmd_populate(mm, pmd, pte_page) \
8112 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8113 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8114 @@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8115 #endif
8116
8117 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8118 +#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8119
8120 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8121 pte_t *pte)
8122 diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8123 index 3ebb188..e17dddf 100644
8124 --- a/arch/powerpc/include/asm/pgtable.h
8125 +++ b/arch/powerpc/include/asm/pgtable.h
8126 @@ -2,6 +2,7 @@
8127 #define _ASM_POWERPC_PGTABLE_H
8128 #ifdef __KERNEL__
8129
8130 +#include <linux/const.h>
8131 #ifndef __ASSEMBLY__
8132 #include <linux/mmdebug.h>
8133 #include <asm/processor.h> /* For TASK_SIZE */
8134 diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8135 index 4aad413..85d86bf 100644
8136 --- a/arch/powerpc/include/asm/pte-hash32.h
8137 +++ b/arch/powerpc/include/asm/pte-hash32.h
8138 @@ -21,6 +21,7 @@
8139 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
8140 #define _PAGE_USER 0x004 /* usermode access allowed */
8141 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8142 +#define _PAGE_EXEC _PAGE_GUARDED
8143 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8144 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8145 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8146 diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8147 index 90c06ec..3517221 100644
8148 --- a/arch/powerpc/include/asm/reg.h
8149 +++ b/arch/powerpc/include/asm/reg.h
8150 @@ -248,6 +248,7 @@
8151 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8152 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8153 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8154 +#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8155 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8156 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8157 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8158 diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8159 index 084e080..9415a3d 100644
8160 --- a/arch/powerpc/include/asm/smp.h
8161 +++ b/arch/powerpc/include/asm/smp.h
8162 @@ -51,7 +51,7 @@ struct smp_ops_t {
8163 int (*cpu_disable)(void);
8164 void (*cpu_die)(unsigned int nr);
8165 int (*cpu_bootable)(unsigned int nr);
8166 -};
8167 +} __no_const;
8168
8169 extern void smp_send_debugger_break(void);
8170 extern void start_secondary_resume(void);
8171 diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8172 index b034ecd..af7e31f 100644
8173 --- a/arch/powerpc/include/asm/thread_info.h
8174 +++ b/arch/powerpc/include/asm/thread_info.h
8175 @@ -107,6 +107,8 @@ static inline struct thread_info *current_thread_info(void)
8176 #if defined(CONFIG_PPC64)
8177 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8178 #endif
8179 +/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8180 +#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8181
8182 /* as above, but as bit values */
8183 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8184 @@ -125,9 +127,10 @@ static inline struct thread_info *current_thread_info(void)
8185 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8186 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8187 #define _TIF_NOHZ (1<<TIF_NOHZ)
8188 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8189 #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8190 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8191 - _TIF_NOHZ)
8192 + _TIF_NOHZ | _TIF_GRSEC_SETXID)
8193
8194 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8195 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8196 diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8197 index 9485b43..3bd3c16 100644
8198 --- a/arch/powerpc/include/asm/uaccess.h
8199 +++ b/arch/powerpc/include/asm/uaccess.h
8200 @@ -58,6 +58,7 @@
8201
8202 #endif
8203
8204 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8205 #define access_ok(type, addr, size) \
8206 (__chk_user_ptr(addr), \
8207 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8208 @@ -318,52 +319,6 @@ do { \
8209 extern unsigned long __copy_tofrom_user(void __user *to,
8210 const void __user *from, unsigned long size);
8211
8212 -#ifndef __powerpc64__
8213 -
8214 -static inline unsigned long copy_from_user(void *to,
8215 - const void __user *from, unsigned long n)
8216 -{
8217 - unsigned long over;
8218 -
8219 - if (access_ok(VERIFY_READ, from, n))
8220 - return __copy_tofrom_user((__force void __user *)to, from, n);
8221 - if ((unsigned long)from < TASK_SIZE) {
8222 - over = (unsigned long)from + n - TASK_SIZE;
8223 - return __copy_tofrom_user((__force void __user *)to, from,
8224 - n - over) + over;
8225 - }
8226 - return n;
8227 -}
8228 -
8229 -static inline unsigned long copy_to_user(void __user *to,
8230 - const void *from, unsigned long n)
8231 -{
8232 - unsigned long over;
8233 -
8234 - if (access_ok(VERIFY_WRITE, to, n))
8235 - return __copy_tofrom_user(to, (__force void __user *)from, n);
8236 - if ((unsigned long)to < TASK_SIZE) {
8237 - over = (unsigned long)to + n - TASK_SIZE;
8238 - return __copy_tofrom_user(to, (__force void __user *)from,
8239 - n - over) + over;
8240 - }
8241 - return n;
8242 -}
8243 -
8244 -#else /* __powerpc64__ */
8245 -
8246 -#define __copy_in_user(to, from, size) \
8247 - __copy_tofrom_user((to), (from), (size))
8248 -
8249 -extern unsigned long copy_from_user(void *to, const void __user *from,
8250 - unsigned long n);
8251 -extern unsigned long copy_to_user(void __user *to, const void *from,
8252 - unsigned long n);
8253 -extern unsigned long copy_in_user(void __user *to, const void __user *from,
8254 - unsigned long n);
8255 -
8256 -#endif /* __powerpc64__ */
8257 -
8258 static inline unsigned long __copy_from_user_inatomic(void *to,
8259 const void __user *from, unsigned long n)
8260 {
8261 @@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8262 if (ret == 0)
8263 return 0;
8264 }
8265 +
8266 + if (!__builtin_constant_p(n))
8267 + check_object_size(to, n, false);
8268 +
8269 return __copy_tofrom_user((__force void __user *)to, from, n);
8270 }
8271
8272 @@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8273 if (ret == 0)
8274 return 0;
8275 }
8276 +
8277 + if (!__builtin_constant_p(n))
8278 + check_object_size(from, n, true);
8279 +
8280 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8281 }
8282
8283 @@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8284 return __copy_to_user_inatomic(to, from, size);
8285 }
8286
8287 +#ifndef __powerpc64__
8288 +
8289 +static inline unsigned long __must_check copy_from_user(void *to,
8290 + const void __user *from, unsigned long n)
8291 +{
8292 + unsigned long over;
8293 +
8294 + if ((long)n < 0)
8295 + return n;
8296 +
8297 + if (access_ok(VERIFY_READ, from, n)) {
8298 + if (!__builtin_constant_p(n))
8299 + check_object_size(to, n, false);
8300 + return __copy_tofrom_user((__force void __user *)to, from, n);
8301 + }
8302 + if ((unsigned long)from < TASK_SIZE) {
8303 + over = (unsigned long)from + n - TASK_SIZE;
8304 + if (!__builtin_constant_p(n - over))
8305 + check_object_size(to, n - over, false);
8306 + return __copy_tofrom_user((__force void __user *)to, from,
8307 + n - over) + over;
8308 + }
8309 + return n;
8310 +}
8311 +
8312 +static inline unsigned long __must_check copy_to_user(void __user *to,
8313 + const void *from, unsigned long n)
8314 +{
8315 + unsigned long over;
8316 +
8317 + if ((long)n < 0)
8318 + return n;
8319 +
8320 + if (access_ok(VERIFY_WRITE, to, n)) {
8321 + if (!__builtin_constant_p(n))
8322 + check_object_size(from, n, true);
8323 + return __copy_tofrom_user(to, (__force void __user *)from, n);
8324 + }
8325 + if ((unsigned long)to < TASK_SIZE) {
8326 + over = (unsigned long)to + n - TASK_SIZE;
8327 + if (!__builtin_constant_p(n))
8328 + check_object_size(from, n - over, true);
8329 + return __copy_tofrom_user(to, (__force void __user *)from,
8330 + n - over) + over;
8331 + }
8332 + return n;
8333 +}
8334 +
8335 +#else /* __powerpc64__ */
8336 +
8337 +#define __copy_in_user(to, from, size) \
8338 + __copy_tofrom_user((to), (from), (size))
8339 +
8340 +static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8341 +{
8342 + if ((long)n < 0 || n > INT_MAX)
8343 + return n;
8344 +
8345 + if (!__builtin_constant_p(n))
8346 + check_object_size(to, n, false);
8347 +
8348 + if (likely(access_ok(VERIFY_READ, from, n)))
8349 + n = __copy_from_user(to, from, n);
8350 + else
8351 + memset(to, 0, n);
8352 + return n;
8353 +}
8354 +
8355 +static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8356 +{
8357 + if ((long)n < 0 || n > INT_MAX)
8358 + return n;
8359 +
8360 + if (likely(access_ok(VERIFY_WRITE, to, n))) {
8361 + if (!__builtin_constant_p(n))
8362 + check_object_size(from, n, true);
8363 + n = __copy_to_user(to, from, n);
8364 + }
8365 + return n;
8366 +}
8367 +
8368 +extern unsigned long copy_in_user(void __user *to, const void __user *from,
8369 + unsigned long n);
8370 +
8371 +#endif /* __powerpc64__ */
8372 +
8373 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8374
8375 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8376 diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8377 index fcc9a89..07be2bb 100644
8378 --- a/arch/powerpc/kernel/Makefile
8379 +++ b/arch/powerpc/kernel/Makefile
8380 @@ -26,6 +26,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8381 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8382 endif
8383
8384 +CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8385 +
8386 obj-y := cputable.o ptrace.o syscalls.o \
8387 irq.o align.o signal_32.o pmc.o vdso.o \
8388 process.o systbl.o idle.o \
8389 diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8390 index 063b65d..7a26e9d 100644
8391 --- a/arch/powerpc/kernel/exceptions-64e.S
8392 +++ b/arch/powerpc/kernel/exceptions-64e.S
8393 @@ -771,6 +771,7 @@ storage_fault_common:
8394 std r14,_DAR(r1)
8395 std r15,_DSISR(r1)
8396 addi r3,r1,STACK_FRAME_OVERHEAD
8397 + bl .save_nvgprs
8398 mr r4,r14
8399 mr r5,r15
8400 ld r14,PACA_EXGEN+EX_R14(r13)
8401 @@ -779,8 +780,7 @@ storage_fault_common:
8402 cmpdi r3,0
8403 bne- 1f
8404 b .ret_from_except_lite
8405 -1: bl .save_nvgprs
8406 - mr r5,r3
8407 +1: mr r5,r3
8408 addi r3,r1,STACK_FRAME_OVERHEAD
8409 ld r4,_DAR(r1)
8410 bl .bad_page_fault
8411 diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8412 index 38d5073..f00af8d 100644
8413 --- a/arch/powerpc/kernel/exceptions-64s.S
8414 +++ b/arch/powerpc/kernel/exceptions-64s.S
8415 @@ -1584,10 +1584,10 @@ handle_page_fault:
8416 11: ld r4,_DAR(r1)
8417 ld r5,_DSISR(r1)
8418 addi r3,r1,STACK_FRAME_OVERHEAD
8419 + bl .save_nvgprs
8420 bl .do_page_fault
8421 cmpdi r3,0
8422 beq+ 12f
8423 - bl .save_nvgprs
8424 mr r5,r3
8425 addi r3,r1,STACK_FRAME_OVERHEAD
8426 lwz r4,_DAR(r1)
8427 diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8428 index 6cff040..74ac5d1 100644
8429 --- a/arch/powerpc/kernel/module_32.c
8430 +++ b/arch/powerpc/kernel/module_32.c
8431 @@ -161,7 +161,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8432 me->arch.core_plt_section = i;
8433 }
8434 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8435 - printk("Module doesn't contain .plt or .init.plt sections.\n");
8436 + printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
8437 return -ENOEXEC;
8438 }
8439
8440 @@ -191,11 +191,16 @@ static uint32_t do_plt_call(void *location,
8441
8442 DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8443 /* Init, or core PLT? */
8444 - if (location >= mod->module_core
8445 - && location < mod->module_core + mod->core_size)
8446 + if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8447 + (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8448 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8449 - else
8450 + else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8451 + (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8452 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8453 + else {
8454 + printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8455 + return ~0UL;
8456 + }
8457
8458 /* Find this entry, or if that fails, the next avail. entry */
8459 while (entry->jump[0]) {
8460 @@ -299,7 +304,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8461 }
8462 #ifdef CONFIG_DYNAMIC_FTRACE
8463 module->arch.tramp =
8464 - do_plt_call(module->module_core,
8465 + do_plt_call(module->module_core_rx,
8466 (unsigned long)ftrace_caller,
8467 sechdrs, module);
8468 #endif
8469 diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8470 index af064d2..ce56147 100644
8471 --- a/arch/powerpc/kernel/process.c
8472 +++ b/arch/powerpc/kernel/process.c
8473 @@ -1009,8 +1009,8 @@ void show_regs(struct pt_regs * regs)
8474 * Lookup NIP late so we have the best change of getting the
8475 * above info out without failing
8476 */
8477 - printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8478 - printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8479 + printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8480 + printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8481 #endif
8482 show_stack(current, (unsigned long *) regs->gpr[1]);
8483 if (!user_mode(regs))
8484 @@ -1532,10 +1532,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8485 newsp = stack[0];
8486 ip = stack[STACK_FRAME_LR_SAVE];
8487 if (!firstframe || ip != lr) {
8488 - printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8489 + printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8490 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8491 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
8492 - printk(" (%pS)",
8493 + printk(" (%pA)",
8494 (void *)current->ret_stack[curr_frame].ret);
8495 curr_frame--;
8496 }
8497 @@ -1555,7 +1555,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8498 struct pt_regs *regs = (struct pt_regs *)
8499 (sp + STACK_FRAME_OVERHEAD);
8500 lr = regs->link;
8501 - printk("--- Exception: %lx at %pS\n LR = %pS\n",
8502 + printk("--- Exception: %lx at %pA\n LR = %pA\n",
8503 regs->trap, (void *)regs->nip, (void *)lr);
8504 firstframe = 1;
8505 }
8506 @@ -1591,58 +1591,3 @@ void notrace __ppc64_runlatch_off(void)
8507 mtspr(SPRN_CTRLT, ctrl);
8508 }
8509 #endif /* CONFIG_PPC64 */
8510 -
8511 -unsigned long arch_align_stack(unsigned long sp)
8512 -{
8513 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8514 - sp -= get_random_int() & ~PAGE_MASK;
8515 - return sp & ~0xf;
8516 -}
8517 -
8518 -static inline unsigned long brk_rnd(void)
8519 -{
8520 - unsigned long rnd = 0;
8521 -
8522 - /* 8MB for 32bit, 1GB for 64bit */
8523 - if (is_32bit_task())
8524 - rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
8525 - else
8526 - rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
8527 -
8528 - return rnd << PAGE_SHIFT;
8529 -}
8530 -
8531 -unsigned long arch_randomize_brk(struct mm_struct *mm)
8532 -{
8533 - unsigned long base = mm->brk;
8534 - unsigned long ret;
8535 -
8536 -#ifdef CONFIG_PPC_STD_MMU_64
8537 - /*
8538 - * If we are using 1TB segments and we are allowed to randomise
8539 - * the heap, we can put it above 1TB so it is backed by a 1TB
8540 - * segment. Otherwise the heap will be in the bottom 1TB
8541 - * which always uses 256MB segments and this may result in a
8542 - * performance penalty.
8543 - */
8544 - if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
8545 - base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
8546 -#endif
8547 -
8548 - ret = PAGE_ALIGN(base + brk_rnd());
8549 -
8550 - if (ret < mm->brk)
8551 - return mm->brk;
8552 -
8553 - return ret;
8554 -}
8555 -
8556 -unsigned long randomize_et_dyn(unsigned long base)
8557 -{
8558 - unsigned long ret = PAGE_ALIGN(base + brk_rnd());
8559 -
8560 - if (ret < base)
8561 - return base;
8562 -
8563 - return ret;
8564 -}
8565 diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
8566 index 2e3d2bf..35df241 100644
8567 --- a/arch/powerpc/kernel/ptrace.c
8568 +++ b/arch/powerpc/kernel/ptrace.c
8569 @@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
8570 return ret;
8571 }
8572
8573 +#ifdef CONFIG_GRKERNSEC_SETXID
8574 +extern void gr_delayed_cred_worker(void);
8575 +#endif
8576 +
8577 /*
8578 * We must return the syscall number to actually look up in the table.
8579 * This can be -1L to skip running any syscall at all.
8580 @@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
8581
8582 secure_computing_strict(regs->gpr[0]);
8583
8584 +#ifdef CONFIG_GRKERNSEC_SETXID
8585 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
8586 + gr_delayed_cred_worker();
8587 +#endif
8588 +
8589 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
8590 tracehook_report_syscall_entry(regs))
8591 /*
8592 @@ -1808,6 +1817,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
8593 {
8594 int step;
8595
8596 +#ifdef CONFIG_GRKERNSEC_SETXID
8597 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
8598 + gr_delayed_cred_worker();
8599 +#endif
8600 +
8601 audit_syscall_exit(regs);
8602
8603 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
8604 diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
8605 index a67e00a..f71d8c7 100644
8606 --- a/arch/powerpc/kernel/signal_32.c
8607 +++ b/arch/powerpc/kernel/signal_32.c
8608 @@ -1011,7 +1011,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
8609 /* Save user registers on the stack */
8610 frame = &rt_sf->uc.uc_mcontext;
8611 addr = frame;
8612 - if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
8613 + if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
8614 sigret = 0;
8615 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
8616 } else {
8617 diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
8618 index 8d253c2..405b337 100644
8619 --- a/arch/powerpc/kernel/signal_64.c
8620 +++ b/arch/powerpc/kernel/signal_64.c
8621 @@ -758,7 +758,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
8622 current->thread.fp_state.fpscr = 0;
8623
8624 /* Set up to return from userspace. */
8625 - if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
8626 + if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
8627 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
8628 } else {
8629 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
8630 diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
8631 index 33cd7a0..d615344 100644
8632 --- a/arch/powerpc/kernel/traps.c
8633 +++ b/arch/powerpc/kernel/traps.c
8634 @@ -142,6 +142,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
8635 return flags;
8636 }
8637
8638 +extern void gr_handle_kernel_exploit(void);
8639 +
8640 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
8641 int signr)
8642 {
8643 @@ -191,6 +193,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
8644 panic("Fatal exception in interrupt");
8645 if (panic_on_oops)
8646 panic("Fatal exception");
8647 +
8648 + gr_handle_kernel_exploit();
8649 +
8650 do_exit(signr);
8651 }
8652
8653 diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
8654 index 094e45c..d82b848 100644
8655 --- a/arch/powerpc/kernel/vdso.c
8656 +++ b/arch/powerpc/kernel/vdso.c
8657 @@ -35,6 +35,7 @@
8658 #include <asm/vdso.h>
8659 #include <asm/vdso_datapage.h>
8660 #include <asm/setup.h>
8661 +#include <asm/mman.h>
8662
8663 #undef DEBUG
8664
8665 @@ -221,7 +222,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
8666 vdso_base = VDSO32_MBASE;
8667 #endif
8668
8669 - current->mm->context.vdso_base = 0;
8670 + current->mm->context.vdso_base = ~0UL;
8671
8672 /* vDSO has a problem and was disabled, just don't "enable" it for the
8673 * process
8674 @@ -241,7 +242,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
8675 vdso_base = get_unmapped_area(NULL, vdso_base,
8676 (vdso_pages << PAGE_SHIFT) +
8677 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
8678 - 0, 0);
8679 + 0, MAP_PRIVATE | MAP_EXECUTABLE);
8680 if (IS_ERR_VALUE(vdso_base)) {
8681 rc = vdso_base;
8682 goto fail_mmapsem;
8683 diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
8684 index 3cf541a..ab2d825 100644
8685 --- a/arch/powerpc/kvm/powerpc.c
8686 +++ b/arch/powerpc/kvm/powerpc.c
8687 @@ -1153,7 +1153,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
8688 }
8689 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
8690
8691 -int kvm_arch_init(void *opaque)
8692 +int kvm_arch_init(const void *opaque)
8693 {
8694 return 0;
8695 }
8696 diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
8697 index 5eea6f3..5d10396 100644
8698 --- a/arch/powerpc/lib/usercopy_64.c
8699 +++ b/arch/powerpc/lib/usercopy_64.c
8700 @@ -9,22 +9,6 @@
8701 #include <linux/module.h>
8702 #include <asm/uaccess.h>
8703
8704 -unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
8705 -{
8706 - if (likely(access_ok(VERIFY_READ, from, n)))
8707 - n = __copy_from_user(to, from, n);
8708 - else
8709 - memset(to, 0, n);
8710 - return n;
8711 -}
8712 -
8713 -unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
8714 -{
8715 - if (likely(access_ok(VERIFY_WRITE, to, n)))
8716 - n = __copy_to_user(to, from, n);
8717 - return n;
8718 -}
8719 -
8720 unsigned long copy_in_user(void __user *to, const void __user *from,
8721 unsigned long n)
8722 {
8723 @@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
8724 return n;
8725 }
8726
8727 -EXPORT_SYMBOL(copy_from_user);
8728 -EXPORT_SYMBOL(copy_to_user);
8729 EXPORT_SYMBOL(copy_in_user);
8730
8731 diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
8732 index 51ab9e7..7d3c78b 100644
8733 --- a/arch/powerpc/mm/fault.c
8734 +++ b/arch/powerpc/mm/fault.c
8735 @@ -33,6 +33,10 @@
8736 #include <linux/magic.h>
8737 #include <linux/ratelimit.h>
8738 #include <linux/context_tracking.h>
8739 +#include <linux/slab.h>
8740 +#include <linux/pagemap.h>
8741 +#include <linux/compiler.h>
8742 +#include <linux/unistd.h>
8743
8744 #include <asm/firmware.h>
8745 #include <asm/page.h>
8746 @@ -69,6 +73,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
8747 }
8748 #endif
8749
8750 +#ifdef CONFIG_PAX_PAGEEXEC
8751 +/*
8752 + * PaX: decide what to do with offenders (regs->nip = fault address)
8753 + *
8754 + * returns 1 when task should be killed
8755 + */
8756 +static int pax_handle_fetch_fault(struct pt_regs *regs)
8757 +{
8758 + return 1;
8759 +}
8760 +
8761 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
8762 +{
8763 + unsigned long i;
8764 +
8765 + printk(KERN_ERR "PAX: bytes at PC: ");
8766 + for (i = 0; i < 5; i++) {
8767 + unsigned int c;
8768 + if (get_user(c, (unsigned int __user *)pc+i))
8769 + printk(KERN_CONT "???????? ");
8770 + else
8771 + printk(KERN_CONT "%08x ", c);
8772 + }
8773 + printk("\n");
8774 +}
8775 +#endif
8776 +
8777 /*
8778 * Check whether the instruction at regs->nip is a store using
8779 * an update addressing form which will update r1.
8780 @@ -216,7 +247,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
8781 * indicate errors in DSISR but can validly be set in SRR1.
8782 */
8783 if (trap == 0x400)
8784 - error_code &= 0x48200000;
8785 + error_code &= 0x58200000;
8786 else
8787 is_write = error_code & DSISR_ISSTORE;
8788 #else
8789 @@ -378,7 +409,7 @@ good_area:
8790 * "undefined". Of those that can be set, this is the only
8791 * one which seems bad.
8792 */
8793 - if (error_code & 0x10000000)
8794 + if (error_code & DSISR_GUARDED)
8795 /* Guarded storage error. */
8796 goto bad_area;
8797 #endif /* CONFIG_8xx */
8798 @@ -393,7 +424,7 @@ good_area:
8799 * processors use the same I/D cache coherency mechanism
8800 * as embedded.
8801 */
8802 - if (error_code & DSISR_PROTFAULT)
8803 + if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
8804 goto bad_area;
8805 #endif /* CONFIG_PPC_STD_MMU */
8806
8807 @@ -483,6 +514,23 @@ bad_area:
8808 bad_area_nosemaphore:
8809 /* User mode accesses cause a SIGSEGV */
8810 if (user_mode(regs)) {
8811 +
8812 +#ifdef CONFIG_PAX_PAGEEXEC
8813 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
8814 +#ifdef CONFIG_PPC_STD_MMU
8815 + if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
8816 +#else
8817 + if (is_exec && regs->nip == address) {
8818 +#endif
8819 + switch (pax_handle_fetch_fault(regs)) {
8820 + }
8821 +
8822 + pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
8823 + do_group_exit(SIGKILL);
8824 + }
8825 + }
8826 +#endif
8827 +
8828 _exception(SIGSEGV, regs, code, address);
8829 goto bail;
8830 }
8831 diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
8832 index cb8bdbe..cde4bc7 100644
8833 --- a/arch/powerpc/mm/mmap.c
8834 +++ b/arch/powerpc/mm/mmap.c
8835 @@ -53,10 +53,14 @@ static inline int mmap_is_legacy(void)
8836 return sysctl_legacy_va_layout;
8837 }
8838
8839 -static unsigned long mmap_rnd(void)
8840 +static unsigned long mmap_rnd(struct mm_struct *mm)
8841 {
8842 unsigned long rnd = 0;
8843
8844 +#ifdef CONFIG_PAX_RANDMMAP
8845 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
8846 +#endif
8847 +
8848 if (current->flags & PF_RANDOMIZE) {
8849 /* 8MB for 32bit, 1GB for 64bit */
8850 if (is_32bit_task())
8851 @@ -67,7 +71,7 @@ static unsigned long mmap_rnd(void)
8852 return rnd << PAGE_SHIFT;
8853 }
8854
8855 -static inline unsigned long mmap_base(void)
8856 +static inline unsigned long mmap_base(struct mm_struct *mm)
8857 {
8858 unsigned long gap = rlimit(RLIMIT_STACK);
8859
8860 @@ -76,7 +80,7 @@ static inline unsigned long mmap_base(void)
8861 else if (gap > MAX_GAP)
8862 gap = MAX_GAP;
8863
8864 - return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
8865 + return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd(mm));
8866 }
8867
8868 /*
8869 @@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
8870 */
8871 if (mmap_is_legacy()) {
8872 mm->mmap_base = TASK_UNMAPPED_BASE;
8873 +
8874 +#ifdef CONFIG_PAX_RANDMMAP
8875 + if (mm->pax_flags & MF_PAX_RANDMMAP)
8876 + mm->mmap_base += mm->delta_mmap;
8877 +#endif
8878 +
8879 mm->get_unmapped_area = arch_get_unmapped_area;
8880 } else {
8881 - mm->mmap_base = mmap_base();
8882 + mm->mmap_base = mmap_base(mm);
8883 +
8884 +#ifdef CONFIG_PAX_RANDMMAP
8885 + if (mm->pax_flags & MF_PAX_RANDMMAP)
8886 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
8887 +#endif
8888 +
8889 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
8890 }
8891 }
8892 diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
8893 index b0c75cc..ef7fb93 100644
8894 --- a/arch/powerpc/mm/slice.c
8895 +++ b/arch/powerpc/mm/slice.c
8896 @@ -103,7 +103,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
8897 if ((mm->task_size - len) < addr)
8898 return 0;
8899 vma = find_vma(mm, addr);
8900 - return (!vma || (addr + len) <= vma->vm_start);
8901 + return check_heap_stack_gap(vma, addr, len, 0);
8902 }
8903
8904 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
8905 @@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
8906 info.align_offset = 0;
8907
8908 addr = TASK_UNMAPPED_BASE;
8909 +
8910 +#ifdef CONFIG_PAX_RANDMMAP
8911 + if (mm->pax_flags & MF_PAX_RANDMMAP)
8912 + addr += mm->delta_mmap;
8913 +#endif
8914 +
8915 while (addr < TASK_SIZE) {
8916 info.low_limit = addr;
8917 if (!slice_scan_available(addr, available, 1, &addr))
8918 @@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
8919 if (fixed && addr > (mm->task_size - len))
8920 return -ENOMEM;
8921
8922 +#ifdef CONFIG_PAX_RANDMMAP
8923 + if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
8924 + addr = 0;
8925 +#endif
8926 +
8927 /* If hint, make sure it matches our alignment restrictions */
8928 if (!fixed && addr) {
8929 addr = _ALIGN_UP(addr, 1ul << pshift);
8930 diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
8931 index 4278acf..67fd0e6 100644
8932 --- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
8933 +++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
8934 @@ -400,8 +400,8 @@ static int scc_pciex_write_config(struct pci_bus *bus, unsigned int devfn,
8935 }
8936
8937 static struct pci_ops scc_pciex_pci_ops = {
8938 - scc_pciex_read_config,
8939 - scc_pciex_write_config,
8940 + .read = scc_pciex_read_config,
8941 + .write = scc_pciex_write_config,
8942 };
8943
8944 static void pciex_clear_intr_all(unsigned int __iomem *base)
8945 diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
8946 index 9098692..3d54cd1 100644
8947 --- a/arch/powerpc/platforms/cell/spufs/file.c
8948 +++ b/arch/powerpc/platforms/cell/spufs/file.c
8949 @@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
8950 return VM_FAULT_NOPAGE;
8951 }
8952
8953 -static int spufs_mem_mmap_access(struct vm_area_struct *vma,
8954 +static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
8955 unsigned long address,
8956 - void *buf, int len, int write)
8957 + void *buf, size_t len, int write)
8958 {
8959 struct spu_context *ctx = vma->vm_file->private_data;
8960 unsigned long offset = address - vma->vm_start;
8961 diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
8962 index fa9aaf7..3f5d836 100644
8963 --- a/arch/s390/include/asm/atomic.h
8964 +++ b/arch/s390/include/asm/atomic.h
8965 @@ -398,6 +398,16 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
8966 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
8967 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
8968
8969 +#define atomic64_read_unchecked(v) atomic64_read(v)
8970 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
8971 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
8972 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
8973 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
8974 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
8975 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
8976 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
8977 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
8978 +
8979 #define smp_mb__before_atomic_dec() smp_mb()
8980 #define smp_mb__after_atomic_dec() smp_mb()
8981 #define smp_mb__before_atomic_inc() smp_mb()
8982 diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
8983 index 4d7ccac..d03d0ad 100644
8984 --- a/arch/s390/include/asm/cache.h
8985 +++ b/arch/s390/include/asm/cache.h
8986 @@ -9,8 +9,10 @@
8987 #ifndef __ARCH_S390_CACHE_H
8988 #define __ARCH_S390_CACHE_H
8989
8990 -#define L1_CACHE_BYTES 256
8991 +#include <linux/const.h>
8992 +
8993 #define L1_CACHE_SHIFT 8
8994 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8995 #define NET_SKB_PAD 32
8996
8997 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
8998 diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
8999 index 78f4f87..598ce39 100644
9000 --- a/arch/s390/include/asm/elf.h
9001 +++ b/arch/s390/include/asm/elf.h
9002 @@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
9003 the loader. We need to make sure that it is out of the way of the program
9004 that it will "exec", and that there is sufficient room for the brk. */
9005
9006 -extern unsigned long randomize_et_dyn(unsigned long base);
9007 -#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
9008 +#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
9009 +
9010 +#ifdef CONFIG_PAX_ASLR
9011 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9012 +
9013 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9014 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9015 +#endif
9016
9017 /* This yields a mask that user programs can use to figure out what
9018 instruction set this CPU supports. */
9019 @@ -222,9 +228,6 @@ struct linux_binprm;
9020 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
9021 int arch_setup_additional_pages(struct linux_binprm *, int);
9022
9023 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
9024 -#define arch_randomize_brk arch_randomize_brk
9025 -
9026 void *fill_cpu_elf_notes(void *ptr, struct save_area *sa);
9027
9028 #endif
9029 diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9030 index c4a93d6..4d2a9b4 100644
9031 --- a/arch/s390/include/asm/exec.h
9032 +++ b/arch/s390/include/asm/exec.h
9033 @@ -7,6 +7,6 @@
9034 #ifndef __ASM_EXEC_H
9035 #define __ASM_EXEC_H
9036
9037 -extern unsigned long arch_align_stack(unsigned long sp);
9038 +#define arch_align_stack(x) ((x) & ~0xfUL)
9039
9040 #endif /* __ASM_EXEC_H */
9041 diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9042 index 79330af..254cf37 100644
9043 --- a/arch/s390/include/asm/uaccess.h
9044 +++ b/arch/s390/include/asm/uaccess.h
9045 @@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9046 __range_ok((unsigned long)(addr), (size)); \
9047 })
9048
9049 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9050 #define access_ok(type, addr, size) __access_ok(addr, size)
9051
9052 /*
9053 @@ -245,6 +246,10 @@ static inline unsigned long __must_check
9054 copy_to_user(void __user *to, const void *from, unsigned long n)
9055 {
9056 might_fault();
9057 +
9058 + if ((long)n < 0)
9059 + return n;
9060 +
9061 return __copy_to_user(to, from, n);
9062 }
9063
9064 @@ -268,6 +273,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
9065 static inline unsigned long __must_check
9066 __copy_from_user(void *to, const void __user *from, unsigned long n)
9067 {
9068 + if ((long)n < 0)
9069 + return n;
9070 +
9071 return uaccess.copy_from_user(n, from, to);
9072 }
9073
9074 @@ -296,10 +304,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9075 static inline unsigned long __must_check
9076 copy_from_user(void *to, const void __user *from, unsigned long n)
9077 {
9078 - unsigned int sz = __compiletime_object_size(to);
9079 + size_t sz = __compiletime_object_size(to);
9080
9081 might_fault();
9082 - if (unlikely(sz != -1 && sz < n)) {
9083 +
9084 + if ((long)n < 0)
9085 + return n;
9086 +
9087 + if (unlikely(sz != (size_t)-1 && sz < n)) {
9088 copy_from_user_overflow();
9089 return n;
9090 }
9091 diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9092 index b89b591..fd9609d 100644
9093 --- a/arch/s390/kernel/module.c
9094 +++ b/arch/s390/kernel/module.c
9095 @@ -169,11 +169,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9096
9097 /* Increase core size by size of got & plt and set start
9098 offsets for got and plt. */
9099 - me->core_size = ALIGN(me->core_size, 4);
9100 - me->arch.got_offset = me->core_size;
9101 - me->core_size += me->arch.got_size;
9102 - me->arch.plt_offset = me->core_size;
9103 - me->core_size += me->arch.plt_size;
9104 + me->core_size_rw = ALIGN(me->core_size_rw, 4);
9105 + me->arch.got_offset = me->core_size_rw;
9106 + me->core_size_rw += me->arch.got_size;
9107 + me->arch.plt_offset = me->core_size_rx;
9108 + me->core_size_rx += me->arch.plt_size;
9109 return 0;
9110 }
9111
9112 @@ -289,7 +289,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9113 if (info->got_initialized == 0) {
9114 Elf_Addr *gotent;
9115
9116 - gotent = me->module_core + me->arch.got_offset +
9117 + gotent = me->module_core_rw + me->arch.got_offset +
9118 info->got_offset;
9119 *gotent = val;
9120 info->got_initialized = 1;
9121 @@ -312,7 +312,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9122 rc = apply_rela_bits(loc, val, 0, 64, 0);
9123 else if (r_type == R_390_GOTENT ||
9124 r_type == R_390_GOTPLTENT) {
9125 - val += (Elf_Addr) me->module_core - loc;
9126 + val += (Elf_Addr) me->module_core_rw - loc;
9127 rc = apply_rela_bits(loc, val, 1, 32, 1);
9128 }
9129 break;
9130 @@ -325,7 +325,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9131 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9132 if (info->plt_initialized == 0) {
9133 unsigned int *ip;
9134 - ip = me->module_core + me->arch.plt_offset +
9135 + ip = me->module_core_rx + me->arch.plt_offset +
9136 info->plt_offset;
9137 #ifndef CONFIG_64BIT
9138 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
9139 @@ -350,7 +350,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9140 val - loc + 0xffffUL < 0x1ffffeUL) ||
9141 (r_type == R_390_PLT32DBL &&
9142 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9143 - val = (Elf_Addr) me->module_core +
9144 + val = (Elf_Addr) me->module_core_rx +
9145 me->arch.plt_offset +
9146 info->plt_offset;
9147 val += rela->r_addend - loc;
9148 @@ -372,7 +372,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9149 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9150 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9151 val = val + rela->r_addend -
9152 - ((Elf_Addr) me->module_core + me->arch.got_offset);
9153 + ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9154 if (r_type == R_390_GOTOFF16)
9155 rc = apply_rela_bits(loc, val, 0, 16, 0);
9156 else if (r_type == R_390_GOTOFF32)
9157 @@ -382,7 +382,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9158 break;
9159 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9160 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9161 - val = (Elf_Addr) me->module_core + me->arch.got_offset +
9162 + val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9163 rela->r_addend - loc;
9164 if (r_type == R_390_GOTPC)
9165 rc = apply_rela_bits(loc, val, 1, 32, 0);
9166 diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9167 index dd14532..1dfc145 100644
9168 --- a/arch/s390/kernel/process.c
9169 +++ b/arch/s390/kernel/process.c
9170 @@ -242,37 +242,3 @@ unsigned long get_wchan(struct task_struct *p)
9171 }
9172 return 0;
9173 }
9174 -
9175 -unsigned long arch_align_stack(unsigned long sp)
9176 -{
9177 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9178 - sp -= get_random_int() & ~PAGE_MASK;
9179 - return sp & ~0xf;
9180 -}
9181 -
9182 -static inline unsigned long brk_rnd(void)
9183 -{
9184 - /* 8MB for 32bit, 1GB for 64bit */
9185 - if (is_32bit_task())
9186 - return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9187 - else
9188 - return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9189 -}
9190 -
9191 -unsigned long arch_randomize_brk(struct mm_struct *mm)
9192 -{
9193 - unsigned long ret;
9194 -
9195 - ret = PAGE_ALIGN(mm->brk + brk_rnd());
9196 - return (ret > mm->brk) ? ret : mm->brk;
9197 -}
9198 -
9199 -unsigned long randomize_et_dyn(unsigned long base)
9200 -{
9201 - unsigned long ret;
9202 -
9203 - if (!(current->flags & PF_RANDOMIZE))
9204 - return base;
9205 - ret = PAGE_ALIGN(base + brk_rnd());
9206 - return (ret > base) ? ret : base;
9207 -}
9208 diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9209 index 9b436c2..54fbf0a 100644
9210 --- a/arch/s390/mm/mmap.c
9211 +++ b/arch/s390/mm/mmap.c
9212 @@ -95,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9213 */
9214 if (mmap_is_legacy()) {
9215 mm->mmap_base = mmap_base_legacy();
9216 +
9217 +#ifdef CONFIG_PAX_RANDMMAP
9218 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9219 + mm->mmap_base += mm->delta_mmap;
9220 +#endif
9221 +
9222 mm->get_unmapped_area = arch_get_unmapped_area;
9223 } else {
9224 mm->mmap_base = mmap_base();
9225 +
9226 +#ifdef CONFIG_PAX_RANDMMAP
9227 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9228 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9229 +#endif
9230 +
9231 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9232 }
9233 }
9234 @@ -170,9 +182,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9235 */
9236 if (mmap_is_legacy()) {
9237 mm->mmap_base = mmap_base_legacy();
9238 +
9239 +#ifdef CONFIG_PAX_RANDMMAP
9240 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9241 + mm->mmap_base += mm->delta_mmap;
9242 +#endif
9243 +
9244 mm->get_unmapped_area = s390_get_unmapped_area;
9245 } else {
9246 mm->mmap_base = mmap_base();
9247 +
9248 +#ifdef CONFIG_PAX_RANDMMAP
9249 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9250 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9251 +#endif
9252 +
9253 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9254 }
9255 }
9256 diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9257 index ae3d59f..f65f075 100644
9258 --- a/arch/score/include/asm/cache.h
9259 +++ b/arch/score/include/asm/cache.h
9260 @@ -1,7 +1,9 @@
9261 #ifndef _ASM_SCORE_CACHE_H
9262 #define _ASM_SCORE_CACHE_H
9263
9264 +#include <linux/const.h>
9265 +
9266 #define L1_CACHE_SHIFT 4
9267 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9268 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9269
9270 #endif /* _ASM_SCORE_CACHE_H */
9271 diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9272 index f9f3cd5..58ff438 100644
9273 --- a/arch/score/include/asm/exec.h
9274 +++ b/arch/score/include/asm/exec.h
9275 @@ -1,6 +1,6 @@
9276 #ifndef _ASM_SCORE_EXEC_H
9277 #define _ASM_SCORE_EXEC_H
9278
9279 -extern unsigned long arch_align_stack(unsigned long sp);
9280 +#define arch_align_stack(x) (x)
9281
9282 #endif /* _ASM_SCORE_EXEC_H */
9283 diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9284 index a1519ad3..e8ac1ff 100644
9285 --- a/arch/score/kernel/process.c
9286 +++ b/arch/score/kernel/process.c
9287 @@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9288
9289 return task_pt_regs(task)->cp0_epc;
9290 }
9291 -
9292 -unsigned long arch_align_stack(unsigned long sp)
9293 -{
9294 - return sp;
9295 -}
9296 diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9297 index ef9e555..331bd29 100644
9298 --- a/arch/sh/include/asm/cache.h
9299 +++ b/arch/sh/include/asm/cache.h
9300 @@ -9,10 +9,11 @@
9301 #define __ASM_SH_CACHE_H
9302 #ifdef __KERNEL__
9303
9304 +#include <linux/const.h>
9305 #include <linux/init.h>
9306 #include <cpu/cache.h>
9307
9308 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9309 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9310
9311 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9312
9313 diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9314 index 6777177..cb5e44f 100644
9315 --- a/arch/sh/mm/mmap.c
9316 +++ b/arch/sh/mm/mmap.c
9317 @@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9318 struct mm_struct *mm = current->mm;
9319 struct vm_area_struct *vma;
9320 int do_colour_align;
9321 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9322 struct vm_unmapped_area_info info;
9323
9324 if (flags & MAP_FIXED) {
9325 @@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9326 if (filp || (flags & MAP_SHARED))
9327 do_colour_align = 1;
9328
9329 +#ifdef CONFIG_PAX_RANDMMAP
9330 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9331 +#endif
9332 +
9333 if (addr) {
9334 if (do_colour_align)
9335 addr = COLOUR_ALIGN(addr, pgoff);
9336 @@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9337 addr = PAGE_ALIGN(addr);
9338
9339 vma = find_vma(mm, addr);
9340 - if (TASK_SIZE - len >= addr &&
9341 - (!vma || addr + len <= vma->vm_start))
9342 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9343 return addr;
9344 }
9345
9346 info.flags = 0;
9347 info.length = len;
9348 - info.low_limit = TASK_UNMAPPED_BASE;
9349 + info.low_limit = mm->mmap_base;
9350 info.high_limit = TASK_SIZE;
9351 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9352 info.align_offset = pgoff << PAGE_SHIFT;
9353 @@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9354 struct mm_struct *mm = current->mm;
9355 unsigned long addr = addr0;
9356 int do_colour_align;
9357 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9358 struct vm_unmapped_area_info info;
9359
9360 if (flags & MAP_FIXED) {
9361 @@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9362 if (filp || (flags & MAP_SHARED))
9363 do_colour_align = 1;
9364
9365 +#ifdef CONFIG_PAX_RANDMMAP
9366 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9367 +#endif
9368 +
9369 /* requesting a specific address */
9370 if (addr) {
9371 if (do_colour_align)
9372 @@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9373 addr = PAGE_ALIGN(addr);
9374
9375 vma = find_vma(mm, addr);
9376 - if (TASK_SIZE - len >= addr &&
9377 - (!vma || addr + len <= vma->vm_start))
9378 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9379 return addr;
9380 }
9381
9382 @@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9383 VM_BUG_ON(addr != -ENOMEM);
9384 info.flags = 0;
9385 info.low_limit = TASK_UNMAPPED_BASE;
9386 +
9387 +#ifdef CONFIG_PAX_RANDMMAP
9388 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9389 + info.low_limit += mm->delta_mmap;
9390 +#endif
9391 +
9392 info.high_limit = TASK_SIZE;
9393 addr = vm_unmapped_area(&info);
9394 }
9395 diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9396 index be56a24..443328f 100644
9397 --- a/arch/sparc/include/asm/atomic_64.h
9398 +++ b/arch/sparc/include/asm/atomic_64.h
9399 @@ -14,18 +14,40 @@
9400 #define ATOMIC64_INIT(i) { (i) }
9401
9402 #define atomic_read(v) (*(volatile int *)&(v)->counter)
9403 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9404 +{
9405 + return v->counter;
9406 +}
9407 #define atomic64_read(v) (*(volatile long *)&(v)->counter)
9408 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9409 +{
9410 + return v->counter;
9411 +}
9412
9413 #define atomic_set(v, i) (((v)->counter) = i)
9414 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9415 +{
9416 + v->counter = i;
9417 +}
9418 #define atomic64_set(v, i) (((v)->counter) = i)
9419 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9420 +{
9421 + v->counter = i;
9422 +}
9423
9424 extern void atomic_add(int, atomic_t *);
9425 +extern void atomic_add_unchecked(int, atomic_unchecked_t *);
9426 extern void atomic64_add(long, atomic64_t *);
9427 +extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
9428 extern void atomic_sub(int, atomic_t *);
9429 +extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
9430 extern void atomic64_sub(long, atomic64_t *);
9431 +extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
9432
9433 extern int atomic_add_ret(int, atomic_t *);
9434 +extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
9435 extern long atomic64_add_ret(long, atomic64_t *);
9436 +extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
9437 extern int atomic_sub_ret(int, atomic_t *);
9438 extern long atomic64_sub_ret(long, atomic64_t *);
9439
9440 @@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomic64_t *);
9441 #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
9442
9443 #define atomic_inc_return(v) atomic_add_ret(1, v)
9444 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9445 +{
9446 + return atomic_add_ret_unchecked(1, v);
9447 +}
9448 #define atomic64_inc_return(v) atomic64_add_ret(1, v)
9449 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9450 +{
9451 + return atomic64_add_ret_unchecked(1, v);
9452 +}
9453
9454 #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
9455 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
9456
9457 #define atomic_add_return(i, v) atomic_add_ret(i, v)
9458 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
9459 +{
9460 + return atomic_add_ret_unchecked(i, v);
9461 +}
9462 #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
9463 +static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
9464 +{
9465 + return atomic64_add_ret_unchecked(i, v);
9466 +}
9467
9468 /*
9469 * atomic_inc_and_test - increment and test
9470 @@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomic64_t *);
9471 * other cases.
9472 */
9473 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9474 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9475 +{
9476 + return atomic_inc_return_unchecked(v) == 0;
9477 +}
9478 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9479
9480 #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
9481 @@ -59,25 +101,60 @@ extern long atomic64_sub_ret(long, atomic64_t *);
9482 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
9483
9484 #define atomic_inc(v) atomic_add(1, v)
9485 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9486 +{
9487 + atomic_add_unchecked(1, v);
9488 +}
9489 #define atomic64_inc(v) atomic64_add(1, v)
9490 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9491 +{
9492 + atomic64_add_unchecked(1, v);
9493 +}
9494
9495 #define atomic_dec(v) atomic_sub(1, v)
9496 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9497 +{
9498 + atomic_sub_unchecked(1, v);
9499 +}
9500 #define atomic64_dec(v) atomic64_sub(1, v)
9501 +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9502 +{
9503 + atomic64_sub_unchecked(1, v);
9504 +}
9505
9506 #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
9507 #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
9508
9509 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
9510 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9511 +{
9512 + return cmpxchg(&v->counter, old, new);
9513 +}
9514 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
9515 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9516 +{
9517 + return xchg(&v->counter, new);
9518 +}
9519
9520 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9521 {
9522 - int c, old;
9523 + int c, old, new;
9524 c = atomic_read(v);
9525 for (;;) {
9526 - if (unlikely(c == (u)))
9527 + if (unlikely(c == u))
9528 break;
9529 - old = atomic_cmpxchg((v), c, c + (a));
9530 +
9531 + asm volatile("addcc %2, %0, %0\n"
9532 +
9533 +#ifdef CONFIG_PAX_REFCOUNT
9534 + "tvs %%icc, 6\n"
9535 +#endif
9536 +
9537 + : "=r" (new)
9538 + : "0" (c), "ir" (a)
9539 + : "cc");
9540 +
9541 + old = atomic_cmpxchg(v, c, new);
9542 if (likely(old == c))
9543 break;
9544 c = old;
9545 @@ -88,20 +165,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9546 #define atomic64_cmpxchg(v, o, n) \
9547 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
9548 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
9549 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
9550 +{
9551 + return xchg(&v->counter, new);
9552 +}
9553
9554 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
9555 {
9556 - long c, old;
9557 + long c, old, new;
9558 c = atomic64_read(v);
9559 for (;;) {
9560 - if (unlikely(c == (u)))
9561 + if (unlikely(c == u))
9562 break;
9563 - old = atomic64_cmpxchg((v), c, c + (a));
9564 +
9565 + asm volatile("addcc %2, %0, %0\n"
9566 +
9567 +#ifdef CONFIG_PAX_REFCOUNT
9568 + "tvs %%xcc, 6\n"
9569 +#endif
9570 +
9571 + : "=r" (new)
9572 + : "0" (c), "ir" (a)
9573 + : "cc");
9574 +
9575 + old = atomic64_cmpxchg(v, c, new);
9576 if (likely(old == c))
9577 break;
9578 c = old;
9579 }
9580 - return c != (u);
9581 + return c != u;
9582 }
9583
9584 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9585 diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
9586 index 5bb6991..5c2132e 100644
9587 --- a/arch/sparc/include/asm/cache.h
9588 +++ b/arch/sparc/include/asm/cache.h
9589 @@ -7,10 +7,12 @@
9590 #ifndef _SPARC_CACHE_H
9591 #define _SPARC_CACHE_H
9592
9593 +#include <linux/const.h>
9594 +
9595 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
9596
9597 #define L1_CACHE_SHIFT 5
9598 -#define L1_CACHE_BYTES 32
9599 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9600
9601 #ifdef CONFIG_SPARC32
9602 #define SMP_CACHE_BYTES_SHIFT 5
9603 diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
9604 index a24e41f..47677ff 100644
9605 --- a/arch/sparc/include/asm/elf_32.h
9606 +++ b/arch/sparc/include/asm/elf_32.h
9607 @@ -114,6 +114,13 @@ typedef struct {
9608
9609 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
9610
9611 +#ifdef CONFIG_PAX_ASLR
9612 +#define PAX_ELF_ET_DYN_BASE 0x10000UL
9613 +
9614 +#define PAX_DELTA_MMAP_LEN 16
9615 +#define PAX_DELTA_STACK_LEN 16
9616 +#endif
9617 +
9618 /* This yields a mask that user programs can use to figure out what
9619 instruction set this cpu supports. This can NOT be done in userspace
9620 on Sparc. */
9621 diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
9622 index 370ca1e..d4f4a98 100644
9623 --- a/arch/sparc/include/asm/elf_64.h
9624 +++ b/arch/sparc/include/asm/elf_64.h
9625 @@ -189,6 +189,13 @@ typedef struct {
9626 #define ELF_ET_DYN_BASE 0x0000010000000000UL
9627 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
9628
9629 +#ifdef CONFIG_PAX_ASLR
9630 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
9631 +
9632 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
9633 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
9634 +#endif
9635 +
9636 extern unsigned long sparc64_elf_hwcap;
9637 #define ELF_HWCAP sparc64_elf_hwcap
9638
9639 diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
9640 index 9b1c36d..209298b 100644
9641 --- a/arch/sparc/include/asm/pgalloc_32.h
9642 +++ b/arch/sparc/include/asm/pgalloc_32.h
9643 @@ -33,6 +33,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
9644 }
9645
9646 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
9647 +#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
9648
9649 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
9650 unsigned long address)
9651 diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
9652 index bcfe063..b333142 100644
9653 --- a/arch/sparc/include/asm/pgalloc_64.h
9654 +++ b/arch/sparc/include/asm/pgalloc_64.h
9655 @@ -26,6 +26,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
9656 }
9657
9658 #define pud_populate(MM, PUD, PMD) pud_set(PUD, PMD)
9659 +#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
9660
9661 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
9662 {
9663 diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
9664 index 59ba6f6..4518128 100644
9665 --- a/arch/sparc/include/asm/pgtable.h
9666 +++ b/arch/sparc/include/asm/pgtable.h
9667 @@ -5,4 +5,8 @@
9668 #else
9669 #include <asm/pgtable_32.h>
9670 #endif
9671 +
9672 +#define ktla_ktva(addr) (addr)
9673 +#define ktva_ktla(addr) (addr)
9674 +
9675 #endif
9676 diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
9677 index 502f632..da1917f 100644
9678 --- a/arch/sparc/include/asm/pgtable_32.h
9679 +++ b/arch/sparc/include/asm/pgtable_32.h
9680 @@ -50,6 +50,9 @@ extern unsigned long calc_highpages(void);
9681 #define PAGE_SHARED SRMMU_PAGE_SHARED
9682 #define PAGE_COPY SRMMU_PAGE_COPY
9683 #define PAGE_READONLY SRMMU_PAGE_RDONLY
9684 +#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
9685 +#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
9686 +#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
9687 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
9688
9689 /* Top-level page directory - dummy used by init-mm.
9690 @@ -62,18 +65,18 @@ extern unsigned long ptr_in_current_pgd;
9691
9692 /* xwr */
9693 #define __P000 PAGE_NONE
9694 -#define __P001 PAGE_READONLY
9695 -#define __P010 PAGE_COPY
9696 -#define __P011 PAGE_COPY
9697 +#define __P001 PAGE_READONLY_NOEXEC
9698 +#define __P010 PAGE_COPY_NOEXEC
9699 +#define __P011 PAGE_COPY_NOEXEC
9700 #define __P100 PAGE_READONLY
9701 #define __P101 PAGE_READONLY
9702 #define __P110 PAGE_COPY
9703 #define __P111 PAGE_COPY
9704
9705 #define __S000 PAGE_NONE
9706 -#define __S001 PAGE_READONLY
9707 -#define __S010 PAGE_SHARED
9708 -#define __S011 PAGE_SHARED
9709 +#define __S001 PAGE_READONLY_NOEXEC
9710 +#define __S010 PAGE_SHARED_NOEXEC
9711 +#define __S011 PAGE_SHARED_NOEXEC
9712 #define __S100 PAGE_READONLY
9713 #define __S101 PAGE_READONLY
9714 #define __S110 PAGE_SHARED
9715 diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
9716 index 79da178..c2eede8 100644
9717 --- a/arch/sparc/include/asm/pgtsrmmu.h
9718 +++ b/arch/sparc/include/asm/pgtsrmmu.h
9719 @@ -115,6 +115,11 @@
9720 SRMMU_EXEC | SRMMU_REF)
9721 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
9722 SRMMU_EXEC | SRMMU_REF)
9723 +
9724 +#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
9725 +#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
9726 +#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
9727 +
9728 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
9729 SRMMU_DIRTY | SRMMU_REF)
9730
9731 diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
9732 index 9689176..63c18ea 100644
9733 --- a/arch/sparc/include/asm/spinlock_64.h
9734 +++ b/arch/sparc/include/asm/spinlock_64.h
9735 @@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
9736
9737 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
9738
9739 -static void inline arch_read_lock(arch_rwlock_t *lock)
9740 +static inline void arch_read_lock(arch_rwlock_t *lock)
9741 {
9742 unsigned long tmp1, tmp2;
9743
9744 __asm__ __volatile__ (
9745 "1: ldsw [%2], %0\n"
9746 " brlz,pn %0, 2f\n"
9747 -"4: add %0, 1, %1\n"
9748 +"4: addcc %0, 1, %1\n"
9749 +
9750 +#ifdef CONFIG_PAX_REFCOUNT
9751 +" tvs %%icc, 6\n"
9752 +#endif
9753 +
9754 " cas [%2], %0, %1\n"
9755 " cmp %0, %1\n"
9756 " bne,pn %%icc, 1b\n"
9757 @@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
9758 " .previous"
9759 : "=&r" (tmp1), "=&r" (tmp2)
9760 : "r" (lock)
9761 - : "memory");
9762 + : "memory", "cc");
9763 }
9764
9765 -static int inline arch_read_trylock(arch_rwlock_t *lock)
9766 +static inline int arch_read_trylock(arch_rwlock_t *lock)
9767 {
9768 int tmp1, tmp2;
9769
9770 @@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
9771 "1: ldsw [%2], %0\n"
9772 " brlz,a,pn %0, 2f\n"
9773 " mov 0, %0\n"
9774 -" add %0, 1, %1\n"
9775 +" addcc %0, 1, %1\n"
9776 +
9777 +#ifdef CONFIG_PAX_REFCOUNT
9778 +" tvs %%icc, 6\n"
9779 +#endif
9780 +
9781 " cas [%2], %0, %1\n"
9782 " cmp %0, %1\n"
9783 " bne,pn %%icc, 1b\n"
9784 @@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
9785 return tmp1;
9786 }
9787
9788 -static void inline arch_read_unlock(arch_rwlock_t *lock)
9789 +static inline void arch_read_unlock(arch_rwlock_t *lock)
9790 {
9791 unsigned long tmp1, tmp2;
9792
9793 __asm__ __volatile__(
9794 "1: lduw [%2], %0\n"
9795 -" sub %0, 1, %1\n"
9796 +" subcc %0, 1, %1\n"
9797 +
9798 +#ifdef CONFIG_PAX_REFCOUNT
9799 +" tvs %%icc, 6\n"
9800 +#endif
9801 +
9802 " cas [%2], %0, %1\n"
9803 " cmp %0, %1\n"
9804 " bne,pn %%xcc, 1b\n"
9805 @@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
9806 : "memory");
9807 }
9808
9809 -static void inline arch_write_lock(arch_rwlock_t *lock)
9810 +static inline void arch_write_lock(arch_rwlock_t *lock)
9811 {
9812 unsigned long mask, tmp1, tmp2;
9813
9814 @@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
9815 : "memory");
9816 }
9817
9818 -static void inline arch_write_unlock(arch_rwlock_t *lock)
9819 +static inline void arch_write_unlock(arch_rwlock_t *lock)
9820 {
9821 __asm__ __volatile__(
9822 " stw %%g0, [%0]"
9823 @@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
9824 : "memory");
9825 }
9826
9827 -static int inline arch_write_trylock(arch_rwlock_t *lock)
9828 +static inline int arch_write_trylock(arch_rwlock_t *lock)
9829 {
9830 unsigned long mask, tmp1, tmp2, result;
9831
9832 diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
9833 index 96efa7a..16858bf 100644
9834 --- a/arch/sparc/include/asm/thread_info_32.h
9835 +++ b/arch/sparc/include/asm/thread_info_32.h
9836 @@ -49,6 +49,8 @@ struct thread_info {
9837 unsigned long w_saved;
9838
9839 struct restart_block restart_block;
9840 +
9841 + unsigned long lowest_stack;
9842 };
9843
9844 /*
9845 diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
9846 index a5f01ac..703b554 100644
9847 --- a/arch/sparc/include/asm/thread_info_64.h
9848 +++ b/arch/sparc/include/asm/thread_info_64.h
9849 @@ -63,6 +63,8 @@ struct thread_info {
9850 struct pt_regs *kern_una_regs;
9851 unsigned int kern_una_insn;
9852
9853 + unsigned long lowest_stack;
9854 +
9855 unsigned long fpregs[0] __attribute__ ((aligned(64)));
9856 };
9857
9858 @@ -188,12 +190,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
9859 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
9860 /* flag bit 4 is available */
9861 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
9862 -/* flag bit 6 is available */
9863 +#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
9864 #define TIF_32BIT 7 /* 32-bit binary */
9865 #define TIF_NOHZ 8 /* in adaptive nohz mode */
9866 #define TIF_SECCOMP 9 /* secure computing */
9867 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
9868 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
9869 +
9870 /* NOTE: Thread flags >= 12 should be ones we have no interest
9871 * in using in assembly, else we can't use the mask as
9872 * an immediate value in instructions such as andcc.
9873 @@ -213,12 +216,18 @@ register struct thread_info *current_thread_info_reg asm("g6");
9874 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
9875 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
9876 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
9877 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
9878
9879 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
9880 _TIF_DO_NOTIFY_RESUME_MASK | \
9881 _TIF_NEED_RESCHED)
9882 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
9883
9884 +#define _TIF_WORK_SYSCALL \
9885 + (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
9886 + _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
9887 +
9888 +
9889 /*
9890 * Thread-synchronous status.
9891 *
9892 diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
9893 index 0167d26..767bb0c 100644
9894 --- a/arch/sparc/include/asm/uaccess.h
9895 +++ b/arch/sparc/include/asm/uaccess.h
9896 @@ -1,5 +1,6 @@
9897 #ifndef ___ASM_SPARC_UACCESS_H
9898 #define ___ASM_SPARC_UACCESS_H
9899 +
9900 #if defined(__sparc__) && defined(__arch64__)
9901 #include <asm/uaccess_64.h>
9902 #else
9903 diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
9904 index 53a28dd..50c38c3 100644
9905 --- a/arch/sparc/include/asm/uaccess_32.h
9906 +++ b/arch/sparc/include/asm/uaccess_32.h
9907 @@ -250,27 +250,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
9908
9909 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9910 {
9911 - if (n && __access_ok((unsigned long) to, n))
9912 + if ((long)n < 0)
9913 + return n;
9914 +
9915 + if (n && __access_ok((unsigned long) to, n)) {
9916 + if (!__builtin_constant_p(n))
9917 + check_object_size(from, n, true);
9918 return __copy_user(to, (__force void __user *) from, n);
9919 - else
9920 + } else
9921 return n;
9922 }
9923
9924 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
9925 {
9926 + if ((long)n < 0)
9927 + return n;
9928 +
9929 + if (!__builtin_constant_p(n))
9930 + check_object_size(from, n, true);
9931 +
9932 return __copy_user(to, (__force void __user *) from, n);
9933 }
9934
9935 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9936 {
9937 - if (n && __access_ok((unsigned long) from, n))
9938 + if ((long)n < 0)
9939 + return n;
9940 +
9941 + if (n && __access_ok((unsigned long) from, n)) {
9942 + if (!__builtin_constant_p(n))
9943 + check_object_size(to, n, false);
9944 return __copy_user((__force void __user *) to, from, n);
9945 - else
9946 + } else
9947 return n;
9948 }
9949
9950 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
9951 {
9952 + if ((long)n < 0)
9953 + return n;
9954 +
9955 return __copy_user((__force void __user *) to, from, n);
9956 }
9957
9958 diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
9959 index ad7e178..c9e7423 100644
9960 --- a/arch/sparc/include/asm/uaccess_64.h
9961 +++ b/arch/sparc/include/asm/uaccess_64.h
9962 @@ -10,6 +10,7 @@
9963 #include <linux/compiler.h>
9964 #include <linux/string.h>
9965 #include <linux/thread_info.h>
9966 +#include <linux/kernel.h>
9967 #include <asm/asi.h>
9968 #include <asm/spitfire.h>
9969 #include <asm-generic/uaccess-unaligned.h>
9970 @@ -214,8 +215,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
9971 static inline unsigned long __must_check
9972 copy_from_user(void *to, const void __user *from, unsigned long size)
9973 {
9974 - unsigned long ret = ___copy_from_user(to, from, size);
9975 + unsigned long ret;
9976
9977 + if ((long)size < 0 || size > INT_MAX)
9978 + return size;
9979 +
9980 + if (!__builtin_constant_p(size))
9981 + check_object_size(to, size, false);
9982 +
9983 + ret = ___copy_from_user(to, from, size);
9984 if (unlikely(ret))
9985 ret = copy_from_user_fixup(to, from, size);
9986
9987 @@ -231,8 +239,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
9988 static inline unsigned long __must_check
9989 copy_to_user(void __user *to, const void *from, unsigned long size)
9990 {
9991 - unsigned long ret = ___copy_to_user(to, from, size);
9992 + unsigned long ret;
9993
9994 + if ((long)size < 0 || size > INT_MAX)
9995 + return size;
9996 +
9997 + if (!__builtin_constant_p(size))
9998 + check_object_size(from, size, true);
9999 +
10000 + ret = ___copy_to_user(to, from, size);
10001 if (unlikely(ret))
10002 ret = copy_to_user_fixup(to, from, size);
10003 return ret;
10004 diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10005 index d15cc17..d0ae796 100644
10006 --- a/arch/sparc/kernel/Makefile
10007 +++ b/arch/sparc/kernel/Makefile
10008 @@ -4,7 +4,7 @@
10009 #
10010
10011 asflags-y := -ansi
10012 -ccflags-y := -Werror
10013 +#ccflags-y := -Werror
10014
10015 extra-y := head_$(BITS).o
10016
10017 diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10018 index 510baec..9ff2607 100644
10019 --- a/arch/sparc/kernel/process_32.c
10020 +++ b/arch/sparc/kernel/process_32.c
10021 @@ -115,14 +115,14 @@ void show_regs(struct pt_regs *r)
10022
10023 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10024 r->psr, r->pc, r->npc, r->y, print_tainted());
10025 - printk("PC: <%pS>\n", (void *) r->pc);
10026 + printk("PC: <%pA>\n", (void *) r->pc);
10027 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10028 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10029 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10030 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10031 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10032 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10033 - printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10034 + printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10035
10036 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10037 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10038 @@ -159,7 +159,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10039 rw = (struct reg_window32 *) fp;
10040 pc = rw->ins[7];
10041 printk("[%08lx : ", pc);
10042 - printk("%pS ] ", (void *) pc);
10043 + printk("%pA ] ", (void *) pc);
10044 fp = rw->ins[6];
10045 } while (++count < 16);
10046 printk("\n");
10047 diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10048 index d7b4967..2edf827 100644
10049 --- a/arch/sparc/kernel/process_64.c
10050 +++ b/arch/sparc/kernel/process_64.c
10051 @@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10052 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10053 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10054 if (regs->tstate & TSTATE_PRIV)
10055 - printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10056 + printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10057 }
10058
10059 void show_regs(struct pt_regs *regs)
10060 @@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10061
10062 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10063 regs->tpc, regs->tnpc, regs->y, print_tainted());
10064 - printk("TPC: <%pS>\n", (void *) regs->tpc);
10065 + printk("TPC: <%pA>\n", (void *) regs->tpc);
10066 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10067 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10068 regs->u_regs[3]);
10069 @@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10070 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10071 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10072 regs->u_regs[15]);
10073 - printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10074 + printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10075 show_regwindow(regs);
10076 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10077 }
10078 @@ -272,7 +272,7 @@ void arch_trigger_all_cpu_backtrace(void)
10079 ((tp && tp->task) ? tp->task->pid : -1));
10080
10081 if (gp->tstate & TSTATE_PRIV) {
10082 - printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10083 + printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10084 (void *) gp->tpc,
10085 (void *) gp->o7,
10086 (void *) gp->i7,
10087 diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10088 index 79cc0d1..ec62734 100644
10089 --- a/arch/sparc/kernel/prom_common.c
10090 +++ b/arch/sparc/kernel/prom_common.c
10091 @@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10092
10093 unsigned int prom_early_allocated __initdata;
10094
10095 -static struct of_pdt_ops prom_sparc_ops __initdata = {
10096 +static struct of_pdt_ops prom_sparc_ops __initconst = {
10097 .nextprop = prom_common_nextprop,
10098 .getproplen = prom_getproplen,
10099 .getproperty = prom_getproperty,
10100 diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10101 index c13c9f2..d572c34 100644
10102 --- a/arch/sparc/kernel/ptrace_64.c
10103 +++ b/arch/sparc/kernel/ptrace_64.c
10104 @@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10105 return ret;
10106 }
10107
10108 +#ifdef CONFIG_GRKERNSEC_SETXID
10109 +extern void gr_delayed_cred_worker(void);
10110 +#endif
10111 +
10112 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10113 {
10114 int ret = 0;
10115 @@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10116 if (test_thread_flag(TIF_NOHZ))
10117 user_exit();
10118
10119 +#ifdef CONFIG_GRKERNSEC_SETXID
10120 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10121 + gr_delayed_cred_worker();
10122 +#endif
10123 +
10124 if (test_thread_flag(TIF_SYSCALL_TRACE))
10125 ret = tracehook_report_syscall_entry(regs);
10126
10127 @@ -1093,6 +1102,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10128 if (test_thread_flag(TIF_NOHZ))
10129 user_exit();
10130
10131 +#ifdef CONFIG_GRKERNSEC_SETXID
10132 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10133 + gr_delayed_cred_worker();
10134 +#endif
10135 +
10136 audit_syscall_exit(regs);
10137
10138 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10139 diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10140 index b085311..6f885f7 100644
10141 --- a/arch/sparc/kernel/smp_64.c
10142 +++ b/arch/sparc/kernel/smp_64.c
10143 @@ -870,8 +870,8 @@ extern unsigned long xcall_flush_dcache_page_cheetah;
10144 extern unsigned long xcall_flush_dcache_page_spitfire;
10145
10146 #ifdef CONFIG_DEBUG_DCFLUSH
10147 -extern atomic_t dcpage_flushes;
10148 -extern atomic_t dcpage_flushes_xcall;
10149 +extern atomic_unchecked_t dcpage_flushes;
10150 +extern atomic_unchecked_t dcpage_flushes_xcall;
10151 #endif
10152
10153 static inline void __local_flush_dcache_page(struct page *page)
10154 @@ -895,7 +895,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10155 return;
10156
10157 #ifdef CONFIG_DEBUG_DCFLUSH
10158 - atomic_inc(&dcpage_flushes);
10159 + atomic_inc_unchecked(&dcpage_flushes);
10160 #endif
10161
10162 this_cpu = get_cpu();
10163 @@ -919,7 +919,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10164 xcall_deliver(data0, __pa(pg_addr),
10165 (u64) pg_addr, cpumask_of(cpu));
10166 #ifdef CONFIG_DEBUG_DCFLUSH
10167 - atomic_inc(&dcpage_flushes_xcall);
10168 + atomic_inc_unchecked(&dcpage_flushes_xcall);
10169 #endif
10170 }
10171 }
10172 @@ -938,7 +938,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10173 preempt_disable();
10174
10175 #ifdef CONFIG_DEBUG_DCFLUSH
10176 - atomic_inc(&dcpage_flushes);
10177 + atomic_inc_unchecked(&dcpage_flushes);
10178 #endif
10179 data0 = 0;
10180 pg_addr = page_address(page);
10181 @@ -955,7 +955,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10182 xcall_deliver(data0, __pa(pg_addr),
10183 (u64) pg_addr, cpu_online_mask);
10184 #ifdef CONFIG_DEBUG_DCFLUSH
10185 - atomic_inc(&dcpage_flushes_xcall);
10186 + atomic_inc_unchecked(&dcpage_flushes_xcall);
10187 #endif
10188 }
10189 __local_flush_dcache_page(page);
10190 diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10191 index 3a8d184..49498a8 100644
10192 --- a/arch/sparc/kernel/sys_sparc_32.c
10193 +++ b/arch/sparc/kernel/sys_sparc_32.c
10194 @@ -52,7 +52,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10195 if (len > TASK_SIZE - PAGE_SIZE)
10196 return -ENOMEM;
10197 if (!addr)
10198 - addr = TASK_UNMAPPED_BASE;
10199 + addr = current->mm->mmap_base;
10200
10201 info.flags = 0;
10202 info.length = len;
10203 diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10204 index beb0b5a..5a153f7 100644
10205 --- a/arch/sparc/kernel/sys_sparc_64.c
10206 +++ b/arch/sparc/kernel/sys_sparc_64.c
10207 @@ -88,13 +88,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10208 struct vm_area_struct * vma;
10209 unsigned long task_size = TASK_SIZE;
10210 int do_color_align;
10211 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10212 struct vm_unmapped_area_info info;
10213
10214 if (flags & MAP_FIXED) {
10215 /* We do not accept a shared mapping if it would violate
10216 * cache aliasing constraints.
10217 */
10218 - if ((flags & MAP_SHARED) &&
10219 + if ((filp || (flags & MAP_SHARED)) &&
10220 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10221 return -EINVAL;
10222 return addr;
10223 @@ -109,6 +110,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10224 if (filp || (flags & MAP_SHARED))
10225 do_color_align = 1;
10226
10227 +#ifdef CONFIG_PAX_RANDMMAP
10228 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10229 +#endif
10230 +
10231 if (addr) {
10232 if (do_color_align)
10233 addr = COLOR_ALIGN(addr, pgoff);
10234 @@ -116,22 +121,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10235 addr = PAGE_ALIGN(addr);
10236
10237 vma = find_vma(mm, addr);
10238 - if (task_size - len >= addr &&
10239 - (!vma || addr + len <= vma->vm_start))
10240 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10241 return addr;
10242 }
10243
10244 info.flags = 0;
10245 info.length = len;
10246 - info.low_limit = TASK_UNMAPPED_BASE;
10247 + info.low_limit = mm->mmap_base;
10248 info.high_limit = min(task_size, VA_EXCLUDE_START);
10249 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10250 info.align_offset = pgoff << PAGE_SHIFT;
10251 + info.threadstack_offset = offset;
10252 addr = vm_unmapped_area(&info);
10253
10254 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10255 VM_BUG_ON(addr != -ENOMEM);
10256 info.low_limit = VA_EXCLUDE_END;
10257 +
10258 +#ifdef CONFIG_PAX_RANDMMAP
10259 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10260 + info.low_limit += mm->delta_mmap;
10261 +#endif
10262 +
10263 info.high_limit = task_size;
10264 addr = vm_unmapped_area(&info);
10265 }
10266 @@ -149,6 +160,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10267 unsigned long task_size = STACK_TOP32;
10268 unsigned long addr = addr0;
10269 int do_color_align;
10270 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10271 struct vm_unmapped_area_info info;
10272
10273 /* This should only ever run for 32-bit processes. */
10274 @@ -158,7 +170,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10275 /* We do not accept a shared mapping if it would violate
10276 * cache aliasing constraints.
10277 */
10278 - if ((flags & MAP_SHARED) &&
10279 + if ((filp || (flags & MAP_SHARED)) &&
10280 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10281 return -EINVAL;
10282 return addr;
10283 @@ -171,6 +183,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10284 if (filp || (flags & MAP_SHARED))
10285 do_color_align = 1;
10286
10287 +#ifdef CONFIG_PAX_RANDMMAP
10288 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10289 +#endif
10290 +
10291 /* requesting a specific address */
10292 if (addr) {
10293 if (do_color_align)
10294 @@ -179,8 +195,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10295 addr = PAGE_ALIGN(addr);
10296
10297 vma = find_vma(mm, addr);
10298 - if (task_size - len >= addr &&
10299 - (!vma || addr + len <= vma->vm_start))
10300 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10301 return addr;
10302 }
10303
10304 @@ -190,6 +205,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10305 info.high_limit = mm->mmap_base;
10306 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10307 info.align_offset = pgoff << PAGE_SHIFT;
10308 + info.threadstack_offset = offset;
10309 addr = vm_unmapped_area(&info);
10310
10311 /*
10312 @@ -202,6 +218,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10313 VM_BUG_ON(addr != -ENOMEM);
10314 info.flags = 0;
10315 info.low_limit = TASK_UNMAPPED_BASE;
10316 +
10317 +#ifdef CONFIG_PAX_RANDMMAP
10318 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10319 + info.low_limit += mm->delta_mmap;
10320 +#endif
10321 +
10322 info.high_limit = STACK_TOP32;
10323 addr = vm_unmapped_area(&info);
10324 }
10325 @@ -258,10 +280,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10326 EXPORT_SYMBOL(get_fb_unmapped_area);
10327
10328 /* Essentially the same as PowerPC. */
10329 -static unsigned long mmap_rnd(void)
10330 +static unsigned long mmap_rnd(struct mm_struct *mm)
10331 {
10332 unsigned long rnd = 0UL;
10333
10334 +#ifdef CONFIG_PAX_RANDMMAP
10335 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10336 +#endif
10337 +
10338 if (current->flags & PF_RANDOMIZE) {
10339 unsigned long val = get_random_int();
10340 if (test_thread_flag(TIF_32BIT))
10341 @@ -274,7 +300,7 @@ static unsigned long mmap_rnd(void)
10342
10343 void arch_pick_mmap_layout(struct mm_struct *mm)
10344 {
10345 - unsigned long random_factor = mmap_rnd();
10346 + unsigned long random_factor = mmap_rnd(mm);
10347 unsigned long gap;
10348
10349 /*
10350 @@ -287,6 +313,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10351 gap == RLIM_INFINITY ||
10352 sysctl_legacy_va_layout) {
10353 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10354 +
10355 +#ifdef CONFIG_PAX_RANDMMAP
10356 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10357 + mm->mmap_base += mm->delta_mmap;
10358 +#endif
10359 +
10360 mm->get_unmapped_area = arch_get_unmapped_area;
10361 } else {
10362 /* We know it's 32-bit */
10363 @@ -298,6 +330,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10364 gap = (task_size / 6 * 5);
10365
10366 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10367 +
10368 +#ifdef CONFIG_PAX_RANDMMAP
10369 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10370 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10371 +#endif
10372 +
10373 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10374 }
10375 }
10376 diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10377 index 33a17e7..d87fb1f 100644
10378 --- a/arch/sparc/kernel/syscalls.S
10379 +++ b/arch/sparc/kernel/syscalls.S
10380 @@ -52,7 +52,7 @@ sys32_rt_sigreturn:
10381 #endif
10382 .align 32
10383 1: ldx [%g6 + TI_FLAGS], %l5
10384 - andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10385 + andcc %l5, _TIF_WORK_SYSCALL, %g0
10386 be,pt %icc, rtrap
10387 nop
10388 call syscall_trace_leave
10389 @@ -184,7 +184,7 @@ linux_sparc_syscall32:
10390
10391 srl %i3, 0, %o3 ! IEU0
10392 srl %i2, 0, %o2 ! IEU0 Group
10393 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10394 + andcc %l0, _TIF_WORK_SYSCALL, %g0
10395 bne,pn %icc, linux_syscall_trace32 ! CTI
10396 mov %i0, %l5 ! IEU1
10397 5: call %l7 ! CTI Group brk forced
10398 @@ -208,7 +208,7 @@ linux_sparc_syscall:
10399
10400 mov %i3, %o3 ! IEU1
10401 mov %i4, %o4 ! IEU0 Group
10402 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10403 + andcc %l0, _TIF_WORK_SYSCALL, %g0
10404 bne,pn %icc, linux_syscall_trace ! CTI Group
10405 mov %i0, %l5 ! IEU0
10406 2: call %l7 ! CTI Group brk forced
10407 @@ -223,7 +223,7 @@ ret_sys_call:
10408
10409 cmp %o0, -ERESTART_RESTARTBLOCK
10410 bgeu,pn %xcc, 1f
10411 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10412 + andcc %l0, _TIF_WORK_SYSCALL, %g0
10413 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10414
10415 2:
10416 diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10417 index 6629829..036032d 100644
10418 --- a/arch/sparc/kernel/traps_32.c
10419 +++ b/arch/sparc/kernel/traps_32.c
10420 @@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10421 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10422 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10423
10424 +extern void gr_handle_kernel_exploit(void);
10425 +
10426 void die_if_kernel(char *str, struct pt_regs *regs)
10427 {
10428 static int die_counter;
10429 @@ -76,15 +78,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
10430 count++ < 30 &&
10431 (((unsigned long) rw) >= PAGE_OFFSET) &&
10432 !(((unsigned long) rw) & 0x7)) {
10433 - printk("Caller[%08lx]: %pS\n", rw->ins[7],
10434 + printk("Caller[%08lx]: %pA\n", rw->ins[7],
10435 (void *) rw->ins[7]);
10436 rw = (struct reg_window32 *)rw->ins[6];
10437 }
10438 }
10439 printk("Instruction DUMP:");
10440 instruction_dump ((unsigned long *) regs->pc);
10441 - if(regs->psr & PSR_PS)
10442 + if(regs->psr & PSR_PS) {
10443 + gr_handle_kernel_exploit();
10444 do_exit(SIGKILL);
10445 + }
10446 do_exit(SIGSEGV);
10447 }
10448
10449 diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10450 index 4ced92f..965eeed 100644
10451 --- a/arch/sparc/kernel/traps_64.c
10452 +++ b/arch/sparc/kernel/traps_64.c
10453 @@ -77,7 +77,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10454 i + 1,
10455 p->trapstack[i].tstate, p->trapstack[i].tpc,
10456 p->trapstack[i].tnpc, p->trapstack[i].tt);
10457 - printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10458 + printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10459 }
10460 }
10461
10462 @@ -97,6 +97,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10463
10464 lvl -= 0x100;
10465 if (regs->tstate & TSTATE_PRIV) {
10466 +
10467 +#ifdef CONFIG_PAX_REFCOUNT
10468 + if (lvl == 6)
10469 + pax_report_refcount_overflow(regs);
10470 +#endif
10471 +
10472 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
10473 die_if_kernel(buffer, regs);
10474 }
10475 @@ -115,11 +121,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
10476 void bad_trap_tl1(struct pt_regs *regs, long lvl)
10477 {
10478 char buffer[32];
10479 -
10480 +
10481 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
10482 0, lvl, SIGTRAP) == NOTIFY_STOP)
10483 return;
10484
10485 +#ifdef CONFIG_PAX_REFCOUNT
10486 + if (lvl == 6)
10487 + pax_report_refcount_overflow(regs);
10488 +#endif
10489 +
10490 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
10491
10492 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
10493 @@ -1149,7 +1160,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
10494 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
10495 printk("%s" "ERROR(%d): ",
10496 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
10497 - printk("TPC<%pS>\n", (void *) regs->tpc);
10498 + printk("TPC<%pA>\n", (void *) regs->tpc);
10499 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
10500 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
10501 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
10502 @@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10503 smp_processor_id(),
10504 (type & 0x1) ? 'I' : 'D',
10505 regs->tpc);
10506 - printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
10507 + printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
10508 panic("Irrecoverable Cheetah+ parity error.");
10509 }
10510
10511 @@ -1764,7 +1775,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10512 smp_processor_id(),
10513 (type & 0x1) ? 'I' : 'D',
10514 regs->tpc);
10515 - printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
10516 + printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
10517 }
10518
10519 struct sun4v_error_entry {
10520 @@ -1837,8 +1848,8 @@ struct sun4v_error_entry {
10521 /*0x38*/u64 reserved_5;
10522 };
10523
10524 -static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
10525 -static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
10526 +static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
10527 +static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
10528
10529 static const char *sun4v_err_type_to_str(u8 type)
10530 {
10531 @@ -1930,7 +1941,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
10532 }
10533
10534 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
10535 - int cpu, const char *pfx, atomic_t *ocnt)
10536 + int cpu, const char *pfx, atomic_unchecked_t *ocnt)
10537 {
10538 u64 *raw_ptr = (u64 *) ent;
10539 u32 attrs;
10540 @@ -1988,8 +1999,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
10541
10542 show_regs(regs);
10543
10544 - if ((cnt = atomic_read(ocnt)) != 0) {
10545 - atomic_set(ocnt, 0);
10546 + if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
10547 + atomic_set_unchecked(ocnt, 0);
10548 wmb();
10549 printk("%s: Queue overflowed %d times.\n",
10550 pfx, cnt);
10551 @@ -2046,7 +2057,7 @@ out:
10552 */
10553 void sun4v_resum_overflow(struct pt_regs *regs)
10554 {
10555 - atomic_inc(&sun4v_resum_oflow_cnt);
10556 + atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
10557 }
10558
10559 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
10560 @@ -2099,7 +2110,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
10561 /* XXX Actually even this can make not that much sense. Perhaps
10562 * XXX we should just pull the plug and panic directly from here?
10563 */
10564 - atomic_inc(&sun4v_nonresum_oflow_cnt);
10565 + atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
10566 }
10567
10568 unsigned long sun4v_err_itlb_vaddr;
10569 @@ -2114,9 +2125,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
10570
10571 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
10572 regs->tpc, tl);
10573 - printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
10574 + printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
10575 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
10576 - printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
10577 + printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
10578 (void *) regs->u_regs[UREG_I7]);
10579 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
10580 "pte[%lx] error[%lx]\n",
10581 @@ -2138,9 +2149,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
10582
10583 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
10584 regs->tpc, tl);
10585 - printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
10586 + printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
10587 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
10588 - printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
10589 + printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
10590 (void *) regs->u_regs[UREG_I7]);
10591 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
10592 "pte[%lx] error[%lx]\n",
10593 @@ -2359,13 +2370,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10594 fp = (unsigned long)sf->fp + STACK_BIAS;
10595 }
10596
10597 - printk(" [%016lx] %pS\n", pc, (void *) pc);
10598 + printk(" [%016lx] %pA\n", pc, (void *) pc);
10599 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
10600 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
10601 int index = tsk->curr_ret_stack;
10602 if (tsk->ret_stack && index >= graph) {
10603 pc = tsk->ret_stack[index - graph].ret;
10604 - printk(" [%016lx] %pS\n", pc, (void *) pc);
10605 + printk(" [%016lx] %pA\n", pc, (void *) pc);
10606 graph++;
10607 }
10608 }
10609 @@ -2383,6 +2394,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
10610 return (struct reg_window *) (fp + STACK_BIAS);
10611 }
10612
10613 +extern void gr_handle_kernel_exploit(void);
10614 +
10615 void die_if_kernel(char *str, struct pt_regs *regs)
10616 {
10617 static int die_counter;
10618 @@ -2411,7 +2424,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
10619 while (rw &&
10620 count++ < 30 &&
10621 kstack_valid(tp, (unsigned long) rw)) {
10622 - printk("Caller[%016lx]: %pS\n", rw->ins[7],
10623 + printk("Caller[%016lx]: %pA\n", rw->ins[7],
10624 (void *) rw->ins[7]);
10625
10626 rw = kernel_stack_up(rw);
10627 @@ -2424,8 +2437,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
10628 }
10629 user_instruction_dump ((unsigned int __user *) regs->tpc);
10630 }
10631 - if (regs->tstate & TSTATE_PRIV)
10632 + if (regs->tstate & TSTATE_PRIV) {
10633 + gr_handle_kernel_exploit();
10634 do_exit(SIGKILL);
10635 + }
10636 do_exit(SIGSEGV);
10637 }
10638 EXPORT_SYMBOL(die_if_kernel);
10639 diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
10640 index 3c1a7cb..73e1923 100644
10641 --- a/arch/sparc/kernel/unaligned_64.c
10642 +++ b/arch/sparc/kernel/unaligned_64.c
10643 @@ -289,7 +289,7 @@ static void log_unaligned(struct pt_regs *regs)
10644 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
10645
10646 if (__ratelimit(&ratelimit)) {
10647 - printk("Kernel unaligned access at TPC[%lx] %pS\n",
10648 + printk("Kernel unaligned access at TPC[%lx] %pA\n",
10649 regs->tpc, (void *) regs->tpc);
10650 }
10651 }
10652 diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
10653 index dbe119b..089c7c1 100644
10654 --- a/arch/sparc/lib/Makefile
10655 +++ b/arch/sparc/lib/Makefile
10656 @@ -2,7 +2,7 @@
10657 #
10658
10659 asflags-y := -ansi -DST_DIV0=0x02
10660 -ccflags-y := -Werror
10661 +#ccflags-y := -Werror
10662
10663 lib-$(CONFIG_SPARC32) += ashrdi3.o
10664 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
10665 diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
10666 index 85c233d..68500e0 100644
10667 --- a/arch/sparc/lib/atomic_64.S
10668 +++ b/arch/sparc/lib/atomic_64.S
10669 @@ -17,7 +17,12 @@
10670 ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
10671 BACKOFF_SETUP(%o2)
10672 1: lduw [%o1], %g1
10673 - add %g1, %o0, %g7
10674 + addcc %g1, %o0, %g7
10675 +
10676 +#ifdef CONFIG_PAX_REFCOUNT
10677 + tvs %icc, 6
10678 +#endif
10679 +
10680 cas [%o1], %g1, %g7
10681 cmp %g1, %g7
10682 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10683 @@ -27,10 +32,28 @@ ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
10684 2: BACKOFF_SPIN(%o2, %o3, 1b)
10685 ENDPROC(atomic_add)
10686
10687 +ENTRY(atomic_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
10688 + BACKOFF_SETUP(%o2)
10689 +1: lduw [%o1], %g1
10690 + add %g1, %o0, %g7
10691 + cas [%o1], %g1, %g7
10692 + cmp %g1, %g7
10693 + bne,pn %icc, 2f
10694 + nop
10695 + retl
10696 + nop
10697 +2: BACKOFF_SPIN(%o2, %o3, 1b)
10698 +ENDPROC(atomic_add_unchecked)
10699 +
10700 ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
10701 BACKOFF_SETUP(%o2)
10702 1: lduw [%o1], %g1
10703 - sub %g1, %o0, %g7
10704 + subcc %g1, %o0, %g7
10705 +
10706 +#ifdef CONFIG_PAX_REFCOUNT
10707 + tvs %icc, 6
10708 +#endif
10709 +
10710 cas [%o1], %g1, %g7
10711 cmp %g1, %g7
10712 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10713 @@ -40,10 +63,28 @@ ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
10714 2: BACKOFF_SPIN(%o2, %o3, 1b)
10715 ENDPROC(atomic_sub)
10716
10717 +ENTRY(atomic_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
10718 + BACKOFF_SETUP(%o2)
10719 +1: lduw [%o1], %g1
10720 + sub %g1, %o0, %g7
10721 + cas [%o1], %g1, %g7
10722 + cmp %g1, %g7
10723 + bne,pn %icc, 2f
10724 + nop
10725 + retl
10726 + nop
10727 +2: BACKOFF_SPIN(%o2, %o3, 1b)
10728 +ENDPROC(atomic_sub_unchecked)
10729 +
10730 ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
10731 BACKOFF_SETUP(%o2)
10732 1: lduw [%o1], %g1
10733 - add %g1, %o0, %g7
10734 + addcc %g1, %o0, %g7
10735 +
10736 +#ifdef CONFIG_PAX_REFCOUNT
10737 + tvs %icc, 6
10738 +#endif
10739 +
10740 cas [%o1], %g1, %g7
10741 cmp %g1, %g7
10742 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10743 @@ -53,10 +94,29 @@ ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
10744 2: BACKOFF_SPIN(%o2, %o3, 1b)
10745 ENDPROC(atomic_add_ret)
10746
10747 +ENTRY(atomic_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
10748 + BACKOFF_SETUP(%o2)
10749 +1: lduw [%o1], %g1
10750 + addcc %g1, %o0, %g7
10751 + cas [%o1], %g1, %g7
10752 + cmp %g1, %g7
10753 + bne,pn %icc, 2f
10754 + add %g7, %o0, %g7
10755 + sra %g7, 0, %o0
10756 + retl
10757 + nop
10758 +2: BACKOFF_SPIN(%o2, %o3, 1b)
10759 +ENDPROC(atomic_add_ret_unchecked)
10760 +
10761 ENTRY(atomic_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
10762 BACKOFF_SETUP(%o2)
10763 1: lduw [%o1], %g1
10764 - sub %g1, %o0, %g7
10765 + subcc %g1, %o0, %g7
10766 +
10767 +#ifdef CONFIG_PAX_REFCOUNT
10768 + tvs %icc, 6
10769 +#endif
10770 +
10771 cas [%o1], %g1, %g7
10772 cmp %g1, %g7
10773 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10774 @@ -69,7 +129,12 @@ ENDPROC(atomic_sub_ret)
10775 ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
10776 BACKOFF_SETUP(%o2)
10777 1: ldx [%o1], %g1
10778 - add %g1, %o0, %g7
10779 + addcc %g1, %o0, %g7
10780 +
10781 +#ifdef CONFIG_PAX_REFCOUNT
10782 + tvs %xcc, 6
10783 +#endif
10784 +
10785 casx [%o1], %g1, %g7
10786 cmp %g1, %g7
10787 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
10788 @@ -79,10 +144,28 @@ ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
10789 2: BACKOFF_SPIN(%o2, %o3, 1b)
10790 ENDPROC(atomic64_add)
10791
10792 +ENTRY(atomic64_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
10793 + BACKOFF_SETUP(%o2)
10794 +1: ldx [%o1], %g1
10795 + addcc %g1, %o0, %g7
10796 + casx [%o1], %g1, %g7
10797 + cmp %g1, %g7
10798 + bne,pn %xcc, 2f
10799 + nop
10800 + retl
10801 + nop
10802 +2: BACKOFF_SPIN(%o2, %o3, 1b)
10803 +ENDPROC(atomic64_add_unchecked)
10804 +
10805 ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
10806 BACKOFF_SETUP(%o2)
10807 1: ldx [%o1], %g1
10808 - sub %g1, %o0, %g7
10809 + subcc %g1, %o0, %g7
10810 +
10811 +#ifdef CONFIG_PAX_REFCOUNT
10812 + tvs %xcc, 6
10813 +#endif
10814 +
10815 casx [%o1], %g1, %g7
10816 cmp %g1, %g7
10817 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
10818 @@ -92,10 +175,28 @@ ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
10819 2: BACKOFF_SPIN(%o2, %o3, 1b)
10820 ENDPROC(atomic64_sub)
10821
10822 +ENTRY(atomic64_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
10823 + BACKOFF_SETUP(%o2)
10824 +1: ldx [%o1], %g1
10825 + subcc %g1, %o0, %g7
10826 + casx [%o1], %g1, %g7
10827 + cmp %g1, %g7
10828 + bne,pn %xcc, 2f
10829 + nop
10830 + retl
10831 + nop
10832 +2: BACKOFF_SPIN(%o2, %o3, 1b)
10833 +ENDPROC(atomic64_sub_unchecked)
10834 +
10835 ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
10836 BACKOFF_SETUP(%o2)
10837 1: ldx [%o1], %g1
10838 - add %g1, %o0, %g7
10839 + addcc %g1, %o0, %g7
10840 +
10841 +#ifdef CONFIG_PAX_REFCOUNT
10842 + tvs %xcc, 6
10843 +#endif
10844 +
10845 casx [%o1], %g1, %g7
10846 cmp %g1, %g7
10847 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
10848 @@ -105,10 +206,29 @@ ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
10849 2: BACKOFF_SPIN(%o2, %o3, 1b)
10850 ENDPROC(atomic64_add_ret)
10851
10852 +ENTRY(atomic64_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
10853 + BACKOFF_SETUP(%o2)
10854 +1: ldx [%o1], %g1
10855 + addcc %g1, %o0, %g7
10856 + casx [%o1], %g1, %g7
10857 + cmp %g1, %g7
10858 + bne,pn %xcc, 2f
10859 + add %g7, %o0, %g7
10860 + mov %g7, %o0
10861 + retl
10862 + nop
10863 +2: BACKOFF_SPIN(%o2, %o3, 1b)
10864 +ENDPROC(atomic64_add_ret_unchecked)
10865 +
10866 ENTRY(atomic64_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
10867 BACKOFF_SETUP(%o2)
10868 1: ldx [%o1], %g1
10869 - sub %g1, %o0, %g7
10870 + subcc %g1, %o0, %g7
10871 +
10872 +#ifdef CONFIG_PAX_REFCOUNT
10873 + tvs %xcc, 6
10874 +#endif
10875 +
10876 casx [%o1], %g1, %g7
10877 cmp %g1, %g7
10878 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
10879 diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
10880 index 323335b..ed85ea2 100644
10881 --- a/arch/sparc/lib/ksyms.c
10882 +++ b/arch/sparc/lib/ksyms.c
10883 @@ -100,12 +100,18 @@ EXPORT_SYMBOL(__clear_user);
10884
10885 /* Atomic counter implementation. */
10886 EXPORT_SYMBOL(atomic_add);
10887 +EXPORT_SYMBOL(atomic_add_unchecked);
10888 EXPORT_SYMBOL(atomic_add_ret);
10889 +EXPORT_SYMBOL(atomic_add_ret_unchecked);
10890 EXPORT_SYMBOL(atomic_sub);
10891 +EXPORT_SYMBOL(atomic_sub_unchecked);
10892 EXPORT_SYMBOL(atomic_sub_ret);
10893 EXPORT_SYMBOL(atomic64_add);
10894 +EXPORT_SYMBOL(atomic64_add_unchecked);
10895 EXPORT_SYMBOL(atomic64_add_ret);
10896 +EXPORT_SYMBOL(atomic64_add_ret_unchecked);
10897 EXPORT_SYMBOL(atomic64_sub);
10898 +EXPORT_SYMBOL(atomic64_sub_unchecked);
10899 EXPORT_SYMBOL(atomic64_sub_ret);
10900 EXPORT_SYMBOL(atomic64_dec_if_positive);
10901
10902 diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
10903 index 30c3ecc..736f015 100644
10904 --- a/arch/sparc/mm/Makefile
10905 +++ b/arch/sparc/mm/Makefile
10906 @@ -2,7 +2,7 @@
10907 #
10908
10909 asflags-y := -ansi
10910 -ccflags-y := -Werror
10911 +#ccflags-y := -Werror
10912
10913 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
10914 obj-y += fault_$(BITS).o
10915 diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
10916 index 59dbd46..1dd7f5e 100644
10917 --- a/arch/sparc/mm/fault_32.c
10918 +++ b/arch/sparc/mm/fault_32.c
10919 @@ -21,6 +21,9 @@
10920 #include <linux/perf_event.h>
10921 #include <linux/interrupt.h>
10922 #include <linux/kdebug.h>
10923 +#include <linux/slab.h>
10924 +#include <linux/pagemap.h>
10925 +#include <linux/compiler.h>
10926
10927 #include <asm/page.h>
10928 #include <asm/pgtable.h>
10929 @@ -159,6 +162,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
10930 return safe_compute_effective_address(regs, insn);
10931 }
10932
10933 +#ifdef CONFIG_PAX_PAGEEXEC
10934 +#ifdef CONFIG_PAX_DLRESOLVE
10935 +static void pax_emuplt_close(struct vm_area_struct *vma)
10936 +{
10937 + vma->vm_mm->call_dl_resolve = 0UL;
10938 +}
10939 +
10940 +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
10941 +{
10942 + unsigned int *kaddr;
10943 +
10944 + vmf->page = alloc_page(GFP_HIGHUSER);
10945 + if (!vmf->page)
10946 + return VM_FAULT_OOM;
10947 +
10948 + kaddr = kmap(vmf->page);
10949 + memset(kaddr, 0, PAGE_SIZE);
10950 + kaddr[0] = 0x9DE3BFA8U; /* save */
10951 + flush_dcache_page(vmf->page);
10952 + kunmap(vmf->page);
10953 + return VM_FAULT_MAJOR;
10954 +}
10955 +
10956 +static const struct vm_operations_struct pax_vm_ops = {
10957 + .close = pax_emuplt_close,
10958 + .fault = pax_emuplt_fault
10959 +};
10960 +
10961 +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
10962 +{
10963 + int ret;
10964 +
10965 + INIT_LIST_HEAD(&vma->anon_vma_chain);
10966 + vma->vm_mm = current->mm;
10967 + vma->vm_start = addr;
10968 + vma->vm_end = addr + PAGE_SIZE;
10969 + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
10970 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
10971 + vma->vm_ops = &pax_vm_ops;
10972 +
10973 + ret = insert_vm_struct(current->mm, vma);
10974 + if (ret)
10975 + return ret;
10976 +
10977 + ++current->mm->total_vm;
10978 + return 0;
10979 +}
10980 +#endif
10981 +
10982 +/*
10983 + * PaX: decide what to do with offenders (regs->pc = fault address)
10984 + *
10985 + * returns 1 when task should be killed
10986 + * 2 when patched PLT trampoline was detected
10987 + * 3 when unpatched PLT trampoline was detected
10988 + */
10989 +static int pax_handle_fetch_fault(struct pt_regs *regs)
10990 +{
10991 +
10992 +#ifdef CONFIG_PAX_EMUPLT
10993 + int err;
10994 +
10995 + do { /* PaX: patched PLT emulation #1 */
10996 + unsigned int sethi1, sethi2, jmpl;
10997 +
10998 + err = get_user(sethi1, (unsigned int *)regs->pc);
10999 + err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11000 + err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11001 +
11002 + if (err)
11003 + break;
11004 +
11005 + if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11006 + (sethi2 & 0xFFC00000U) == 0x03000000U &&
11007 + (jmpl & 0xFFFFE000U) == 0x81C06000U)
11008 + {
11009 + unsigned int addr;
11010 +
11011 + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11012 + addr = regs->u_regs[UREG_G1];
11013 + addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11014 + regs->pc = addr;
11015 + regs->npc = addr+4;
11016 + return 2;
11017 + }
11018 + } while (0);
11019 +
11020 + do { /* PaX: patched PLT emulation #2 */
11021 + unsigned int ba;
11022 +
11023 + err = get_user(ba, (unsigned int *)regs->pc);
11024 +
11025 + if (err)
11026 + break;
11027 +
11028 + if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11029 + unsigned int addr;
11030 +
11031 + if ((ba & 0xFFC00000U) == 0x30800000U)
11032 + addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11033 + else
11034 + addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11035 + regs->pc = addr;
11036 + regs->npc = addr+4;
11037 + return 2;
11038 + }
11039 + } while (0);
11040 +
11041 + do { /* PaX: patched PLT emulation #3 */
11042 + unsigned int sethi, bajmpl, nop;
11043 +
11044 + err = get_user(sethi, (unsigned int *)regs->pc);
11045 + err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11046 + err |= get_user(nop, (unsigned int *)(regs->pc+8));
11047 +
11048 + if (err)
11049 + break;
11050 +
11051 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11052 + ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11053 + nop == 0x01000000U)
11054 + {
11055 + unsigned int addr;
11056 +
11057 + addr = (sethi & 0x003FFFFFU) << 10;
11058 + regs->u_regs[UREG_G1] = addr;
11059 + if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11060 + addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11061 + else
11062 + addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11063 + regs->pc = addr;
11064 + regs->npc = addr+4;
11065 + return 2;
11066 + }
11067 + } while (0);
11068 +
11069 + do { /* PaX: unpatched PLT emulation step 1 */
11070 + unsigned int sethi, ba, nop;
11071 +
11072 + err = get_user(sethi, (unsigned int *)regs->pc);
11073 + err |= get_user(ba, (unsigned int *)(regs->pc+4));
11074 + err |= get_user(nop, (unsigned int *)(regs->pc+8));
11075 +
11076 + if (err)
11077 + break;
11078 +
11079 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11080 + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11081 + nop == 0x01000000U)
11082 + {
11083 + unsigned int addr, save, call;
11084 +
11085 + if ((ba & 0xFFC00000U) == 0x30800000U)
11086 + addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11087 + else
11088 + addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11089 +
11090 + err = get_user(save, (unsigned int *)addr);
11091 + err |= get_user(call, (unsigned int *)(addr+4));
11092 + err |= get_user(nop, (unsigned int *)(addr+8));
11093 + if (err)
11094 + break;
11095 +
11096 +#ifdef CONFIG_PAX_DLRESOLVE
11097 + if (save == 0x9DE3BFA8U &&
11098 + (call & 0xC0000000U) == 0x40000000U &&
11099 + nop == 0x01000000U)
11100 + {
11101 + struct vm_area_struct *vma;
11102 + unsigned long call_dl_resolve;
11103 +
11104 + down_read(&current->mm->mmap_sem);
11105 + call_dl_resolve = current->mm->call_dl_resolve;
11106 + up_read(&current->mm->mmap_sem);
11107 + if (likely(call_dl_resolve))
11108 + goto emulate;
11109 +
11110 + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11111 +
11112 + down_write(&current->mm->mmap_sem);
11113 + if (current->mm->call_dl_resolve) {
11114 + call_dl_resolve = current->mm->call_dl_resolve;
11115 + up_write(&current->mm->mmap_sem);
11116 + if (vma)
11117 + kmem_cache_free(vm_area_cachep, vma);
11118 + goto emulate;
11119 + }
11120 +
11121 + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11122 + if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11123 + up_write(&current->mm->mmap_sem);
11124 + if (vma)
11125 + kmem_cache_free(vm_area_cachep, vma);
11126 + return 1;
11127 + }
11128 +
11129 + if (pax_insert_vma(vma, call_dl_resolve)) {
11130 + up_write(&current->mm->mmap_sem);
11131 + kmem_cache_free(vm_area_cachep, vma);
11132 + return 1;
11133 + }
11134 +
11135 + current->mm->call_dl_resolve = call_dl_resolve;
11136 + up_write(&current->mm->mmap_sem);
11137 +
11138 +emulate:
11139 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11140 + regs->pc = call_dl_resolve;
11141 + regs->npc = addr+4;
11142 + return 3;
11143 + }
11144 +#endif
11145 +
11146 + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11147 + if ((save & 0xFFC00000U) == 0x05000000U &&
11148 + (call & 0xFFFFE000U) == 0x85C0A000U &&
11149 + nop == 0x01000000U)
11150 + {
11151 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11152 + regs->u_regs[UREG_G2] = addr + 4;
11153 + addr = (save & 0x003FFFFFU) << 10;
11154 + addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11155 + regs->pc = addr;
11156 + regs->npc = addr+4;
11157 + return 3;
11158 + }
11159 + }
11160 + } while (0);
11161 +
11162 + do { /* PaX: unpatched PLT emulation step 2 */
11163 + unsigned int save, call, nop;
11164 +
11165 + err = get_user(save, (unsigned int *)(regs->pc-4));
11166 + err |= get_user(call, (unsigned int *)regs->pc);
11167 + err |= get_user(nop, (unsigned int *)(regs->pc+4));
11168 + if (err)
11169 + break;
11170 +
11171 + if (save == 0x9DE3BFA8U &&
11172 + (call & 0xC0000000U) == 0x40000000U &&
11173 + nop == 0x01000000U)
11174 + {
11175 + unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11176 +
11177 + regs->u_regs[UREG_RETPC] = regs->pc;
11178 + regs->pc = dl_resolve;
11179 + regs->npc = dl_resolve+4;
11180 + return 3;
11181 + }
11182 + } while (0);
11183 +#endif
11184 +
11185 + return 1;
11186 +}
11187 +
11188 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11189 +{
11190 + unsigned long i;
11191 +
11192 + printk(KERN_ERR "PAX: bytes at PC: ");
11193 + for (i = 0; i < 8; i++) {
11194 + unsigned int c;
11195 + if (get_user(c, (unsigned int *)pc+i))
11196 + printk(KERN_CONT "???????? ");
11197 + else
11198 + printk(KERN_CONT "%08x ", c);
11199 + }
11200 + printk("\n");
11201 +}
11202 +#endif
11203 +
11204 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11205 int text_fault)
11206 {
11207 @@ -229,6 +503,24 @@ good_area:
11208 if (!(vma->vm_flags & VM_WRITE))
11209 goto bad_area;
11210 } else {
11211 +
11212 +#ifdef CONFIG_PAX_PAGEEXEC
11213 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11214 + up_read(&mm->mmap_sem);
11215 + switch (pax_handle_fetch_fault(regs)) {
11216 +
11217 +#ifdef CONFIG_PAX_EMUPLT
11218 + case 2:
11219 + case 3:
11220 + return;
11221 +#endif
11222 +
11223 + }
11224 + pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11225 + do_group_exit(SIGKILL);
11226 + }
11227 +#endif
11228 +
11229 /* Allow reads even for write-only mappings */
11230 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11231 goto bad_area;
11232 diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11233 index 69bb818..6ca35c8 100644
11234 --- a/arch/sparc/mm/fault_64.c
11235 +++ b/arch/sparc/mm/fault_64.c
11236 @@ -22,6 +22,9 @@
11237 #include <linux/kdebug.h>
11238 #include <linux/percpu.h>
11239 #include <linux/context_tracking.h>
11240 +#include <linux/slab.h>
11241 +#include <linux/pagemap.h>
11242 +#include <linux/compiler.h>
11243
11244 #include <asm/page.h>
11245 #include <asm/pgtable.h>
11246 @@ -75,7 +78,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11247 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11248 regs->tpc);
11249 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11250 - printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11251 + printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11252 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11253 dump_stack();
11254 unhandled_fault(regs->tpc, current, regs);
11255 @@ -271,6 +274,466 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
11256 show_regs(regs);
11257 }
11258
11259 +#ifdef CONFIG_PAX_PAGEEXEC
11260 +#ifdef CONFIG_PAX_DLRESOLVE
11261 +static void pax_emuplt_close(struct vm_area_struct *vma)
11262 +{
11263 + vma->vm_mm->call_dl_resolve = 0UL;
11264 +}
11265 +
11266 +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11267 +{
11268 + unsigned int *kaddr;
11269 +
11270 + vmf->page = alloc_page(GFP_HIGHUSER);
11271 + if (!vmf->page)
11272 + return VM_FAULT_OOM;
11273 +
11274 + kaddr = kmap(vmf->page);
11275 + memset(kaddr, 0, PAGE_SIZE);
11276 + kaddr[0] = 0x9DE3BFA8U; /* save */
11277 + flush_dcache_page(vmf->page);
11278 + kunmap(vmf->page);
11279 + return VM_FAULT_MAJOR;
11280 +}
11281 +
11282 +static const struct vm_operations_struct pax_vm_ops = {
11283 + .close = pax_emuplt_close,
11284 + .fault = pax_emuplt_fault
11285 +};
11286 +
11287 +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11288 +{
11289 + int ret;
11290 +
11291 + INIT_LIST_HEAD(&vma->anon_vma_chain);
11292 + vma->vm_mm = current->mm;
11293 + vma->vm_start = addr;
11294 + vma->vm_end = addr + PAGE_SIZE;
11295 + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11296 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11297 + vma->vm_ops = &pax_vm_ops;
11298 +
11299 + ret = insert_vm_struct(current->mm, vma);
11300 + if (ret)
11301 + return ret;
11302 +
11303 + ++current->mm->total_vm;
11304 + return 0;
11305 +}
11306 +#endif
11307 +
11308 +/*
11309 + * PaX: decide what to do with offenders (regs->tpc = fault address)
11310 + *
11311 + * returns 1 when task should be killed
11312 + * 2 when patched PLT trampoline was detected
11313 + * 3 when unpatched PLT trampoline was detected
11314 + */
11315 +static int pax_handle_fetch_fault(struct pt_regs *regs)
11316 +{
11317 +
11318 +#ifdef CONFIG_PAX_EMUPLT
11319 + int err;
11320 +
11321 + do { /* PaX: patched PLT emulation #1 */
11322 + unsigned int sethi1, sethi2, jmpl;
11323 +
11324 + err = get_user(sethi1, (unsigned int *)regs->tpc);
11325 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11326 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11327 +
11328 + if (err)
11329 + break;
11330 +
11331 + if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11332 + (sethi2 & 0xFFC00000U) == 0x03000000U &&
11333 + (jmpl & 0xFFFFE000U) == 0x81C06000U)
11334 + {
11335 + unsigned long addr;
11336 +
11337 + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11338 + addr = regs->u_regs[UREG_G1];
11339 + addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11340 +
11341 + if (test_thread_flag(TIF_32BIT))
11342 + addr &= 0xFFFFFFFFUL;
11343 +
11344 + regs->tpc = addr;
11345 + regs->tnpc = addr+4;
11346 + return 2;
11347 + }
11348 + } while (0);
11349 +
11350 + do { /* PaX: patched PLT emulation #2 */
11351 + unsigned int ba;
11352 +
11353 + err = get_user(ba, (unsigned int *)regs->tpc);
11354 +
11355 + if (err)
11356 + break;
11357 +
11358 + if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11359 + unsigned long addr;
11360 +
11361 + if ((ba & 0xFFC00000U) == 0x30800000U)
11362 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11363 + else
11364 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11365 +
11366 + if (test_thread_flag(TIF_32BIT))
11367 + addr &= 0xFFFFFFFFUL;
11368 +
11369 + regs->tpc = addr;
11370 + regs->tnpc = addr+4;
11371 + return 2;
11372 + }
11373 + } while (0);
11374 +
11375 + do { /* PaX: patched PLT emulation #3 */
11376 + unsigned int sethi, bajmpl, nop;
11377 +
11378 + err = get_user(sethi, (unsigned int *)regs->tpc);
11379 + err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11380 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11381 +
11382 + if (err)
11383 + break;
11384 +
11385 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11386 + ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11387 + nop == 0x01000000U)
11388 + {
11389 + unsigned long addr;
11390 +
11391 + addr = (sethi & 0x003FFFFFU) << 10;
11392 + regs->u_regs[UREG_G1] = addr;
11393 + if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11394 + addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11395 + else
11396 + addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11397 +
11398 + if (test_thread_flag(TIF_32BIT))
11399 + addr &= 0xFFFFFFFFUL;
11400 +
11401 + regs->tpc = addr;
11402 + regs->tnpc = addr+4;
11403 + return 2;
11404 + }
11405 + } while (0);
11406 +
11407 + do { /* PaX: patched PLT emulation #4 */
11408 + unsigned int sethi, mov1, call, mov2;
11409 +
11410 + err = get_user(sethi, (unsigned int *)regs->tpc);
11411 + err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11412 + err |= get_user(call, (unsigned int *)(regs->tpc+8));
11413 + err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11414 +
11415 + if (err)
11416 + break;
11417 +
11418 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11419 + mov1 == 0x8210000FU &&
11420 + (call & 0xC0000000U) == 0x40000000U &&
11421 + mov2 == 0x9E100001U)
11422 + {
11423 + unsigned long addr;
11424 +
11425 + regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11426 + addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11427 +
11428 + if (test_thread_flag(TIF_32BIT))
11429 + addr &= 0xFFFFFFFFUL;
11430 +
11431 + regs->tpc = addr;
11432 + regs->tnpc = addr+4;
11433 + return 2;
11434 + }
11435 + } while (0);
11436 +
11437 + do { /* PaX: patched PLT emulation #5 */
11438 + unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11439 +
11440 + err = get_user(sethi, (unsigned int *)regs->tpc);
11441 + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11442 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11443 + err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11444 + err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11445 + err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11446 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11447 + err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11448 +
11449 + if (err)
11450 + break;
11451 +
11452 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11453 + (sethi1 & 0xFFC00000U) == 0x03000000U &&
11454 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11455 + (or1 & 0xFFFFE000U) == 0x82106000U &&
11456 + (or2 & 0xFFFFE000U) == 0x8A116000U &&
11457 + sllx == 0x83287020U &&
11458 + jmpl == 0x81C04005U &&
11459 + nop == 0x01000000U)
11460 + {
11461 + unsigned long addr;
11462 +
11463 + regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11464 + regs->u_regs[UREG_G1] <<= 32;
11465 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11466 + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11467 + regs->tpc = addr;
11468 + regs->tnpc = addr+4;
11469 + return 2;
11470 + }
11471 + } while (0);
11472 +
11473 + do { /* PaX: patched PLT emulation #6 */
11474 + unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11475 +
11476 + err = get_user(sethi, (unsigned int *)regs->tpc);
11477 + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11478 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11479 + err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11480 + err |= get_user(or, (unsigned int *)(regs->tpc+16));
11481 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11482 + err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11483 +
11484 + if (err)
11485 + break;
11486 +
11487 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11488 + (sethi1 & 0xFFC00000U) == 0x03000000U &&
11489 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11490 + sllx == 0x83287020U &&
11491 + (or & 0xFFFFE000U) == 0x8A116000U &&
11492 + jmpl == 0x81C04005U &&
11493 + nop == 0x01000000U)
11494 + {
11495 + unsigned long addr;
11496 +
11497 + regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11498 + regs->u_regs[UREG_G1] <<= 32;
11499 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11500 + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11501 + regs->tpc = addr;
11502 + regs->tnpc = addr+4;
11503 + return 2;
11504 + }
11505 + } while (0);
11506 +
11507 + do { /* PaX: unpatched PLT emulation step 1 */
11508 + unsigned int sethi, ba, nop;
11509 +
11510 + err = get_user(sethi, (unsigned int *)regs->tpc);
11511 + err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11512 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11513 +
11514 + if (err)
11515 + break;
11516 +
11517 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11518 + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11519 + nop == 0x01000000U)
11520 + {
11521 + unsigned long addr;
11522 + unsigned int save, call;
11523 + unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11524 +
11525 + if ((ba & 0xFFC00000U) == 0x30800000U)
11526 + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11527 + else
11528 + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11529 +
11530 + if (test_thread_flag(TIF_32BIT))
11531 + addr &= 0xFFFFFFFFUL;
11532 +
11533 + err = get_user(save, (unsigned int *)addr);
11534 + err |= get_user(call, (unsigned int *)(addr+4));
11535 + err |= get_user(nop, (unsigned int *)(addr+8));
11536 + if (err)
11537 + break;
11538 +
11539 +#ifdef CONFIG_PAX_DLRESOLVE
11540 + if (save == 0x9DE3BFA8U &&
11541 + (call & 0xC0000000U) == 0x40000000U &&
11542 + nop == 0x01000000U)
11543 + {
11544 + struct vm_area_struct *vma;
11545 + unsigned long call_dl_resolve;
11546 +
11547 + down_read(&current->mm->mmap_sem);
11548 + call_dl_resolve = current->mm->call_dl_resolve;
11549 + up_read(&current->mm->mmap_sem);
11550 + if (likely(call_dl_resolve))
11551 + goto emulate;
11552 +
11553 + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11554 +
11555 + down_write(&current->mm->mmap_sem);
11556 + if (current->mm->call_dl_resolve) {
11557 + call_dl_resolve = current->mm->call_dl_resolve;
11558 + up_write(&current->mm->mmap_sem);
11559 + if (vma)
11560 + kmem_cache_free(vm_area_cachep, vma);
11561 + goto emulate;
11562 + }
11563 +
11564 + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11565 + if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11566 + up_write(&current->mm->mmap_sem);
11567 + if (vma)
11568 + kmem_cache_free(vm_area_cachep, vma);
11569 + return 1;
11570 + }
11571 +
11572 + if (pax_insert_vma(vma, call_dl_resolve)) {
11573 + up_write(&current->mm->mmap_sem);
11574 + kmem_cache_free(vm_area_cachep, vma);
11575 + return 1;
11576 + }
11577 +
11578 + current->mm->call_dl_resolve = call_dl_resolve;
11579 + up_write(&current->mm->mmap_sem);
11580 +
11581 +emulate:
11582 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11583 + regs->tpc = call_dl_resolve;
11584 + regs->tnpc = addr+4;
11585 + return 3;
11586 + }
11587 +#endif
11588 +
11589 + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11590 + if ((save & 0xFFC00000U) == 0x05000000U &&
11591 + (call & 0xFFFFE000U) == 0x85C0A000U &&
11592 + nop == 0x01000000U)
11593 + {
11594 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11595 + regs->u_regs[UREG_G2] = addr + 4;
11596 + addr = (save & 0x003FFFFFU) << 10;
11597 + addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11598 +
11599 + if (test_thread_flag(TIF_32BIT))
11600 + addr &= 0xFFFFFFFFUL;
11601 +
11602 + regs->tpc = addr;
11603 + regs->tnpc = addr+4;
11604 + return 3;
11605 + }
11606 +
11607 + /* PaX: 64-bit PLT stub */
11608 + err = get_user(sethi1, (unsigned int *)addr);
11609 + err |= get_user(sethi2, (unsigned int *)(addr+4));
11610 + err |= get_user(or1, (unsigned int *)(addr+8));
11611 + err |= get_user(or2, (unsigned int *)(addr+12));
11612 + err |= get_user(sllx, (unsigned int *)(addr+16));
11613 + err |= get_user(add, (unsigned int *)(addr+20));
11614 + err |= get_user(jmpl, (unsigned int *)(addr+24));
11615 + err |= get_user(nop, (unsigned int *)(addr+28));
11616 + if (err)
11617 + break;
11618 +
11619 + if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
11620 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11621 + (or1 & 0xFFFFE000U) == 0x88112000U &&
11622 + (or2 & 0xFFFFE000U) == 0x8A116000U &&
11623 + sllx == 0x89293020U &&
11624 + add == 0x8A010005U &&
11625 + jmpl == 0x89C14000U &&
11626 + nop == 0x01000000U)
11627 + {
11628 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11629 + regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11630 + regs->u_regs[UREG_G4] <<= 32;
11631 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11632 + regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
11633 + regs->u_regs[UREG_G4] = addr + 24;
11634 + addr = regs->u_regs[UREG_G5];
11635 + regs->tpc = addr;
11636 + regs->tnpc = addr+4;
11637 + return 3;
11638 + }
11639 + }
11640 + } while (0);
11641 +
11642 +#ifdef CONFIG_PAX_DLRESOLVE
11643 + do { /* PaX: unpatched PLT emulation step 2 */
11644 + unsigned int save, call, nop;
11645 +
11646 + err = get_user(save, (unsigned int *)(regs->tpc-4));
11647 + err |= get_user(call, (unsigned int *)regs->tpc);
11648 + err |= get_user(nop, (unsigned int *)(regs->tpc+4));
11649 + if (err)
11650 + break;
11651 +
11652 + if (save == 0x9DE3BFA8U &&
11653 + (call & 0xC0000000U) == 0x40000000U &&
11654 + nop == 0x01000000U)
11655 + {
11656 + unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11657 +
11658 + if (test_thread_flag(TIF_32BIT))
11659 + dl_resolve &= 0xFFFFFFFFUL;
11660 +
11661 + regs->u_regs[UREG_RETPC] = regs->tpc;
11662 + regs->tpc = dl_resolve;
11663 + regs->tnpc = dl_resolve+4;
11664 + return 3;
11665 + }
11666 + } while (0);
11667 +#endif
11668 +
11669 + do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
11670 + unsigned int sethi, ba, nop;
11671 +
11672 + err = get_user(sethi, (unsigned int *)regs->tpc);
11673 + err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11674 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11675 +
11676 + if (err)
11677 + break;
11678 +
11679 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11680 + (ba & 0xFFF00000U) == 0x30600000U &&
11681 + nop == 0x01000000U)
11682 + {
11683 + unsigned long addr;
11684 +
11685 + addr = (sethi & 0x003FFFFFU) << 10;
11686 + regs->u_regs[UREG_G1] = addr;
11687 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11688 +
11689 + if (test_thread_flag(TIF_32BIT))
11690 + addr &= 0xFFFFFFFFUL;
11691 +
11692 + regs->tpc = addr;
11693 + regs->tnpc = addr+4;
11694 + return 2;
11695 + }
11696 + } while (0);
11697 +
11698 +#endif
11699 +
11700 + return 1;
11701 +}
11702 +
11703 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11704 +{
11705 + unsigned long i;
11706 +
11707 + printk(KERN_ERR "PAX: bytes at PC: ");
11708 + for (i = 0; i < 8; i++) {
11709 + unsigned int c;
11710 + if (get_user(c, (unsigned int *)pc+i))
11711 + printk(KERN_CONT "???????? ");
11712 + else
11713 + printk(KERN_CONT "%08x ", c);
11714 + }
11715 + printk("\n");
11716 +}
11717 +#endif
11718 +
11719 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
11720 {
11721 enum ctx_state prev_state = exception_enter();
11722 @@ -344,6 +807,29 @@ retry:
11723 if (!vma)
11724 goto bad_area;
11725
11726 +#ifdef CONFIG_PAX_PAGEEXEC
11727 + /* PaX: detect ITLB misses on non-exec pages */
11728 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
11729 + !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
11730 + {
11731 + if (address != regs->tpc)
11732 + goto good_area;
11733 +
11734 + up_read(&mm->mmap_sem);
11735 + switch (pax_handle_fetch_fault(regs)) {
11736 +
11737 +#ifdef CONFIG_PAX_EMUPLT
11738 + case 2:
11739 + case 3:
11740 + return;
11741 +#endif
11742 +
11743 + }
11744 + pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
11745 + do_group_exit(SIGKILL);
11746 + }
11747 +#endif
11748 +
11749 /* Pure DTLB misses do not tell us whether the fault causing
11750 * load/store/atomic was a write or not, it only says that there
11751 * was no match. So in such a case we (carefully) read the
11752 diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
11753 index 9bd9ce8..dc84852 100644
11754 --- a/arch/sparc/mm/hugetlbpage.c
11755 +++ b/arch/sparc/mm/hugetlbpage.c
11756 @@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
11757 unsigned long addr,
11758 unsigned long len,
11759 unsigned long pgoff,
11760 - unsigned long flags)
11761 + unsigned long flags,
11762 + unsigned long offset)
11763 {
11764 + struct mm_struct *mm = current->mm;
11765 unsigned long task_size = TASK_SIZE;
11766 struct vm_unmapped_area_info info;
11767
11768 @@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
11769
11770 info.flags = 0;
11771 info.length = len;
11772 - info.low_limit = TASK_UNMAPPED_BASE;
11773 + info.low_limit = mm->mmap_base;
11774 info.high_limit = min(task_size, VA_EXCLUDE_START);
11775 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
11776 info.align_offset = 0;
11777 + info.threadstack_offset = offset;
11778 addr = vm_unmapped_area(&info);
11779
11780 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
11781 VM_BUG_ON(addr != -ENOMEM);
11782 info.low_limit = VA_EXCLUDE_END;
11783 +
11784 +#ifdef CONFIG_PAX_RANDMMAP
11785 + if (mm->pax_flags & MF_PAX_RANDMMAP)
11786 + info.low_limit += mm->delta_mmap;
11787 +#endif
11788 +
11789 info.high_limit = task_size;
11790 addr = vm_unmapped_area(&info);
11791 }
11792 @@ -55,7 +64,8 @@ static unsigned long
11793 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
11794 const unsigned long len,
11795 const unsigned long pgoff,
11796 - const unsigned long flags)
11797 + const unsigned long flags,
11798 + const unsigned long offset)
11799 {
11800 struct mm_struct *mm = current->mm;
11801 unsigned long addr = addr0;
11802 @@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
11803 info.high_limit = mm->mmap_base;
11804 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
11805 info.align_offset = 0;
11806 + info.threadstack_offset = offset;
11807 addr = vm_unmapped_area(&info);
11808
11809 /*
11810 @@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
11811 VM_BUG_ON(addr != -ENOMEM);
11812 info.flags = 0;
11813 info.low_limit = TASK_UNMAPPED_BASE;
11814 +
11815 +#ifdef CONFIG_PAX_RANDMMAP
11816 + if (mm->pax_flags & MF_PAX_RANDMMAP)
11817 + info.low_limit += mm->delta_mmap;
11818 +#endif
11819 +
11820 info.high_limit = STACK_TOP32;
11821 addr = vm_unmapped_area(&info);
11822 }
11823 @@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
11824 struct mm_struct *mm = current->mm;
11825 struct vm_area_struct *vma;
11826 unsigned long task_size = TASK_SIZE;
11827 + unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
11828
11829 if (test_thread_flag(TIF_32BIT))
11830 task_size = STACK_TOP32;
11831 @@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
11832 return addr;
11833 }
11834
11835 +#ifdef CONFIG_PAX_RANDMMAP
11836 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
11837 +#endif
11838 +
11839 if (addr) {
11840 addr = ALIGN(addr, HPAGE_SIZE);
11841 vma = find_vma(mm, addr);
11842 - if (task_size - len >= addr &&
11843 - (!vma || addr + len <= vma->vm_start))
11844 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
11845 return addr;
11846 }
11847 if (mm->get_unmapped_area == arch_get_unmapped_area)
11848 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
11849 - pgoff, flags);
11850 + pgoff, flags, offset);
11851 else
11852 return hugetlb_get_unmapped_area_topdown(file, addr, len,
11853 - pgoff, flags);
11854 + pgoff, flags, offset);
11855 }
11856
11857 pte_t *huge_pte_alloc(struct mm_struct *mm,
11858 diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
11859 index eafbc65..5a8070d 100644
11860 --- a/arch/sparc/mm/init_64.c
11861 +++ b/arch/sparc/mm/init_64.c
11862 @@ -188,9 +188,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
11863 int num_kernel_image_mappings;
11864
11865 #ifdef CONFIG_DEBUG_DCFLUSH
11866 -atomic_t dcpage_flushes = ATOMIC_INIT(0);
11867 +atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
11868 #ifdef CONFIG_SMP
11869 -atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
11870 +atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
11871 #endif
11872 #endif
11873
11874 @@ -198,7 +198,7 @@ inline void flush_dcache_page_impl(struct page *page)
11875 {
11876 BUG_ON(tlb_type == hypervisor);
11877 #ifdef CONFIG_DEBUG_DCFLUSH
11878 - atomic_inc(&dcpage_flushes);
11879 + atomic_inc_unchecked(&dcpage_flushes);
11880 #endif
11881
11882 #ifdef DCACHE_ALIASING_POSSIBLE
11883 @@ -466,10 +466,10 @@ void mmu_info(struct seq_file *m)
11884
11885 #ifdef CONFIG_DEBUG_DCFLUSH
11886 seq_printf(m, "DCPageFlushes\t: %d\n",
11887 - atomic_read(&dcpage_flushes));
11888 + atomic_read_unchecked(&dcpage_flushes));
11889 #ifdef CONFIG_SMP
11890 seq_printf(m, "DCPageFlushesXC\t: %d\n",
11891 - atomic_read(&dcpage_flushes_xcall));
11892 + atomic_read_unchecked(&dcpage_flushes_xcall));
11893 #endif /* CONFIG_SMP */
11894 #endif /* CONFIG_DEBUG_DCFLUSH */
11895 }
11896 diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
11897 index b3692ce..e4517c9 100644
11898 --- a/arch/tile/Kconfig
11899 +++ b/arch/tile/Kconfig
11900 @@ -184,6 +184,7 @@ source "kernel/Kconfig.hz"
11901
11902 config KEXEC
11903 bool "kexec system call"
11904 + depends on !GRKERNSEC_KMEM
11905 ---help---
11906 kexec is a system call that implements the ability to shutdown your
11907 current kernel, and to start another kernel. It is like a reboot
11908 diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
11909 index ad220ee..2f537b3 100644
11910 --- a/arch/tile/include/asm/atomic_64.h
11911 +++ b/arch/tile/include/asm/atomic_64.h
11912 @@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
11913
11914 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
11915
11916 +#define atomic64_read_unchecked(v) atomic64_read(v)
11917 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
11918 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
11919 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
11920 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
11921 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
11922 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
11923 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
11924 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
11925 +
11926 /* Atomic dec and inc don't implement barrier, so provide them if needed. */
11927 #define smp_mb__before_atomic_dec() smp_mb()
11928 #define smp_mb__after_atomic_dec() smp_mb()
11929 diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
11930 index 6160761..00cac88 100644
11931 --- a/arch/tile/include/asm/cache.h
11932 +++ b/arch/tile/include/asm/cache.h
11933 @@ -15,11 +15,12 @@
11934 #ifndef _ASM_TILE_CACHE_H
11935 #define _ASM_TILE_CACHE_H
11936
11937 +#include <linux/const.h>
11938 #include <arch/chip.h>
11939
11940 /* bytes per L1 data cache line */
11941 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
11942 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
11943 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
11944
11945 /* bytes per L2 cache line */
11946 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
11947 diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
11948 index b6cde32..c0cb736 100644
11949 --- a/arch/tile/include/asm/uaccess.h
11950 +++ b/arch/tile/include/asm/uaccess.h
11951 @@ -414,9 +414,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
11952 const void __user *from,
11953 unsigned long n)
11954 {
11955 - int sz = __compiletime_object_size(to);
11956 + size_t sz = __compiletime_object_size(to);
11957
11958 - if (likely(sz == -1 || sz >= n))
11959 + if (likely(sz == (size_t)-1 || sz >= n))
11960 n = _copy_from_user(to, from, n);
11961 else
11962 copy_from_user_overflow();
11963 diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
11964 index 0cb3bba..7338b2d 100644
11965 --- a/arch/tile/mm/hugetlbpage.c
11966 +++ b/arch/tile/mm/hugetlbpage.c
11967 @@ -212,6 +212,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
11968 info.high_limit = TASK_SIZE;
11969 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
11970 info.align_offset = 0;
11971 + info.threadstack_offset = 0;
11972 return vm_unmapped_area(&info);
11973 }
11974
11975 @@ -229,6 +230,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
11976 info.high_limit = current->mm->mmap_base;
11977 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
11978 info.align_offset = 0;
11979 + info.threadstack_offset = 0;
11980 addr = vm_unmapped_area(&info);
11981
11982 /*
11983 diff --git a/arch/um/Makefile b/arch/um/Makefile
11984 index 36e658a..71a5c5a 100644
11985 --- a/arch/um/Makefile
11986 +++ b/arch/um/Makefile
11987 @@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
11988 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
11989 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
11990
11991 +ifdef CONSTIFY_PLUGIN
11992 +USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
11993 +endif
11994 +
11995 #This will adjust *FLAGS accordingly to the platform.
11996 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
11997
11998 diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
11999 index 19e1bdd..3665b77 100644
12000 --- a/arch/um/include/asm/cache.h
12001 +++ b/arch/um/include/asm/cache.h
12002 @@ -1,6 +1,7 @@
12003 #ifndef __UM_CACHE_H
12004 #define __UM_CACHE_H
12005
12006 +#include <linux/const.h>
12007
12008 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12009 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12010 @@ -12,6 +13,6 @@
12011 # define L1_CACHE_SHIFT 5
12012 #endif
12013
12014 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12015 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12016
12017 #endif
12018 diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12019 index 2e0a6b1..a64d0f5 100644
12020 --- a/arch/um/include/asm/kmap_types.h
12021 +++ b/arch/um/include/asm/kmap_types.h
12022 @@ -8,6 +8,6 @@
12023
12024 /* No more #include "asm/arch/kmap_types.h" ! */
12025
12026 -#define KM_TYPE_NR 14
12027 +#define KM_TYPE_NR 15
12028
12029 #endif
12030 diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12031 index 5ff53d9..5850cdf 100644
12032 --- a/arch/um/include/asm/page.h
12033 +++ b/arch/um/include/asm/page.h
12034 @@ -14,6 +14,9 @@
12035 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12036 #define PAGE_MASK (~(PAGE_SIZE-1))
12037
12038 +#define ktla_ktva(addr) (addr)
12039 +#define ktva_ktla(addr) (addr)
12040 +
12041 #ifndef __ASSEMBLY__
12042
12043 struct page;
12044 diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12045 index 0032f92..cd151e0 100644
12046 --- a/arch/um/include/asm/pgtable-3level.h
12047 +++ b/arch/um/include/asm/pgtable-3level.h
12048 @@ -58,6 +58,7 @@
12049 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12050 #define pud_populate(mm, pud, pmd) \
12051 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12052 +#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12053
12054 #ifdef CONFIG_64BIT
12055 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12056 diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12057 index eecc414..48adb87 100644
12058 --- a/arch/um/kernel/process.c
12059 +++ b/arch/um/kernel/process.c
12060 @@ -356,22 +356,6 @@ int singlestepping(void * t)
12061 return 2;
12062 }
12063
12064 -/*
12065 - * Only x86 and x86_64 have an arch_align_stack().
12066 - * All other arches have "#define arch_align_stack(x) (x)"
12067 - * in their asm/system.h
12068 - * As this is included in UML from asm-um/system-generic.h,
12069 - * we can use it to behave as the subarch does.
12070 - */
12071 -#ifndef arch_align_stack
12072 -unsigned long arch_align_stack(unsigned long sp)
12073 -{
12074 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12075 - sp -= get_random_int() % 8192;
12076 - return sp & ~0xf;
12077 -}
12078 -#endif
12079 -
12080 unsigned long get_wchan(struct task_struct *p)
12081 {
12082 unsigned long stack_page, sp, ip;
12083 diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12084 index ad8f795..2c7eec6 100644
12085 --- a/arch/unicore32/include/asm/cache.h
12086 +++ b/arch/unicore32/include/asm/cache.h
12087 @@ -12,8 +12,10 @@
12088 #ifndef __UNICORE_CACHE_H__
12089 #define __UNICORE_CACHE_H__
12090
12091 -#define L1_CACHE_SHIFT (5)
12092 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12093 +#include <linux/const.h>
12094 +
12095 +#define L1_CACHE_SHIFT 5
12096 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12097
12098 /*
12099 * Memory returned by kmalloc() may be used for DMA, so we must make
12100 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12101 index 0af5250..59f9597 100644
12102 --- a/arch/x86/Kconfig
12103 +++ b/arch/x86/Kconfig
12104 @@ -126,7 +126,7 @@ config X86
12105 select RTC_LIB
12106 select HAVE_DEBUG_STACKOVERFLOW
12107 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12108 - select HAVE_CC_STACKPROTECTOR
12109 + select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12110
12111 config INSTRUCTION_DECODER
12112 def_bool y
12113 @@ -251,7 +251,7 @@ config X86_HT
12114
12115 config X86_32_LAZY_GS
12116 def_bool y
12117 - depends on X86_32 && !CC_STACKPROTECTOR
12118 + depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12119
12120 config ARCH_HWEIGHT_CFLAGS
12121 string
12122 @@ -589,6 +589,7 @@ config SCHED_OMIT_FRAME_POINTER
12123
12124 menuconfig HYPERVISOR_GUEST
12125 bool "Linux guest support"
12126 + depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12127 ---help---
12128 Say Y here to enable options for running Linux under various hyper-
12129 visors. This option enables basic hypervisor detection and platform
12130 @@ -1111,7 +1112,7 @@ choice
12131
12132 config NOHIGHMEM
12133 bool "off"
12134 - depends on !X86_NUMAQ
12135 + depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12136 ---help---
12137 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12138 However, the address space of 32-bit x86 processors is only 4
12139 @@ -1148,7 +1149,7 @@ config NOHIGHMEM
12140
12141 config HIGHMEM4G
12142 bool "4GB"
12143 - depends on !X86_NUMAQ
12144 + depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12145 ---help---
12146 Select this if you have a 32-bit processor and between 1 and 4
12147 gigabytes of physical RAM.
12148 @@ -1201,7 +1202,7 @@ config PAGE_OFFSET
12149 hex
12150 default 0xB0000000 if VMSPLIT_3G_OPT
12151 default 0x80000000 if VMSPLIT_2G
12152 - default 0x78000000 if VMSPLIT_2G_OPT
12153 + default 0x70000000 if VMSPLIT_2G_OPT
12154 default 0x40000000 if VMSPLIT_1G
12155 default 0xC0000000
12156 depends on X86_32
12157 @@ -1605,6 +1606,7 @@ source kernel/Kconfig.hz
12158
12159 config KEXEC
12160 bool "kexec system call"
12161 + depends on !GRKERNSEC_KMEM
12162 ---help---
12163 kexec is a system call that implements the ability to shutdown your
12164 current kernel, and to start another kernel. It is like a reboot
12165 @@ -1756,7 +1758,9 @@ config X86_NEED_RELOCS
12166
12167 config PHYSICAL_ALIGN
12168 hex "Alignment value to which kernel should be aligned"
12169 - default "0x200000"
12170 + default "0x1000000"
12171 + range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12172 + range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12173 range 0x2000 0x1000000 if X86_32
12174 range 0x200000 0x1000000 if X86_64
12175 ---help---
12176 @@ -1836,9 +1840,10 @@ config DEBUG_HOTPLUG_CPU0
12177 If unsure, say N.
12178
12179 config COMPAT_VDSO
12180 - def_bool y
12181 + def_bool n
12182 prompt "Compat VDSO support"
12183 depends on X86_32 || IA32_EMULATION
12184 + depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12185 ---help---
12186 Map the 32-bit VDSO to the predictable old-style address too.
12187
12188 diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12189 index f3aaf23..a1d3c49 100644
12190 --- a/arch/x86/Kconfig.cpu
12191 +++ b/arch/x86/Kconfig.cpu
12192 @@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12193
12194 config X86_F00F_BUG
12195 def_bool y
12196 - depends on M586MMX || M586TSC || M586 || M486
12197 + depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12198
12199 config X86_INVD_BUG
12200 def_bool y
12201 @@ -327,7 +327,7 @@ config X86_INVD_BUG
12202
12203 config X86_ALIGNMENT_16
12204 def_bool y
12205 - depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12206 + depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12207
12208 config X86_INTEL_USERCOPY
12209 def_bool y
12210 @@ -369,7 +369,7 @@ config X86_CMPXCHG64
12211 # generates cmov.
12212 config X86_CMOV
12213 def_bool y
12214 - depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12215 + depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12216
12217 config X86_MINIMUM_CPU_FAMILY
12218 int
12219 diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12220 index 321a52c..3d51a5e 100644
12221 --- a/arch/x86/Kconfig.debug
12222 +++ b/arch/x86/Kconfig.debug
12223 @@ -84,7 +84,7 @@ config X86_PTDUMP
12224 config DEBUG_RODATA
12225 bool "Write protect kernel read-only data structures"
12226 default y
12227 - depends on DEBUG_KERNEL
12228 + depends on DEBUG_KERNEL && BROKEN
12229 ---help---
12230 Mark the kernel read-only data as write-protected in the pagetables,
12231 in order to catch accidental (and incorrect) writes to such const
12232 @@ -102,7 +102,7 @@ config DEBUG_RODATA_TEST
12233
12234 config DEBUG_SET_MODULE_RONX
12235 bool "Set loadable kernel module data as NX and text as RO"
12236 - depends on MODULES
12237 + depends on MODULES && BROKEN
12238 ---help---
12239 This option helps catch unintended modifications to loadable
12240 kernel module's text and read-only data. It also prevents execution
12241 diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12242 index eeda43a..5a238be 100644
12243 --- a/arch/x86/Makefile
12244 +++ b/arch/x86/Makefile
12245 @@ -71,14 +71,12 @@ ifeq ($(CONFIG_X86_32),y)
12246 # CPU-specific tuning. Anything which can be shared with UML should go here.
12247 include $(srctree)/arch/x86/Makefile_32.cpu
12248 KBUILD_CFLAGS += $(cflags-y)
12249 -
12250 - # temporary until string.h is fixed
12251 - KBUILD_CFLAGS += -ffreestanding
12252 else
12253 BITS := 64
12254 UTS_MACHINE := x86_64
12255 CHECKFLAGS += -D__x86_64__ -m64
12256
12257 + biarch := $(call cc-option,-m64)
12258 KBUILD_AFLAGS += -m64
12259 KBUILD_CFLAGS += -m64
12260
12261 @@ -111,6 +109,9 @@ else
12262 KBUILD_CFLAGS += -maccumulate-outgoing-args
12263 endif
12264
12265 +# temporary until string.h is fixed
12266 +KBUILD_CFLAGS += -ffreestanding
12267 +
12268 # Make sure compiler does not have buggy stack-protector support.
12269 ifdef CONFIG_CC_STACKPROTECTOR
12270 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12271 @@ -267,3 +268,12 @@ define archhelp
12272 echo ' FDINITRD=file initrd for the booted kernel'
12273 echo ' kvmconfig - Enable additional options for guest kernel support'
12274 endef
12275 +
12276 +define OLD_LD
12277 +
12278 +*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12279 +*** Please upgrade your binutils to 2.18 or newer
12280 +endef
12281 +
12282 +archprepare:
12283 + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12284 diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12285 index 878df7e..a803913 100644
12286 --- a/arch/x86/boot/Makefile
12287 +++ b/arch/x86/boot/Makefile
12288 @@ -52,6 +52,9 @@ $(obj)/cpustr.h: $(obj)/mkcpustr FORCE
12289 # ---------------------------------------------------------------------------
12290
12291 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12292 +ifdef CONSTIFY_PLUGIN
12293 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12294 +endif
12295 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12296 GCOV_PROFILE := n
12297
12298 diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12299 index 878e4b9..20537ab 100644
12300 --- a/arch/x86/boot/bitops.h
12301 +++ b/arch/x86/boot/bitops.h
12302 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12303 u8 v;
12304 const u32 *p = (const u32 *)addr;
12305
12306 - asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12307 + asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12308 return v;
12309 }
12310
12311 @@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12312
12313 static inline void set_bit(int nr, void *addr)
12314 {
12315 - asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12316 + asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12317 }
12318
12319 #endif /* BOOT_BITOPS_H */
12320 diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12321 index 50f8c5e..4f84fff 100644
12322 --- a/arch/x86/boot/boot.h
12323 +++ b/arch/x86/boot/boot.h
12324 @@ -84,7 +84,7 @@ static inline void io_delay(void)
12325 static inline u16 ds(void)
12326 {
12327 u16 seg;
12328 - asm("movw %%ds,%0" : "=rm" (seg));
12329 + asm volatile("movw %%ds,%0" : "=rm" (seg));
12330 return seg;
12331 }
12332
12333 @@ -180,7 +180,7 @@ static inline void wrgs32(u32 v, addr_t addr)
12334 static inline int memcmp(const void *s1, const void *s2, size_t len)
12335 {
12336 u8 diff;
12337 - asm("repe; cmpsb; setnz %0"
12338 + asm volatile("repe; cmpsb; setnz %0"
12339 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
12340 return diff;
12341 }
12342 diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12343 index 0fcd913..3bb5c42 100644
12344 --- a/arch/x86/boot/compressed/Makefile
12345 +++ b/arch/x86/boot/compressed/Makefile
12346 @@ -16,6 +16,9 @@ KBUILD_CFLAGS += $(cflags-y)
12347 KBUILD_CFLAGS += -mno-mmx -mno-sse
12348 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12349 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12350 +ifdef CONSTIFY_PLUGIN
12351 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12352 +endif
12353
12354 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12355 GCOV_PROFILE := n
12356 diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12357 index a53440e..c3dbf1e 100644
12358 --- a/arch/x86/boot/compressed/efi_stub_32.S
12359 +++ b/arch/x86/boot/compressed/efi_stub_32.S
12360 @@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12361 * parameter 2, ..., param n. To make things easy, we save the return
12362 * address of efi_call_phys in a global variable.
12363 */
12364 - popl %ecx
12365 - movl %ecx, saved_return_addr(%edx)
12366 - /* get the function pointer into ECX*/
12367 - popl %ecx
12368 - movl %ecx, efi_rt_function_ptr(%edx)
12369 + popl saved_return_addr(%edx)
12370 + popl efi_rt_function_ptr(%edx)
12371
12372 /*
12373 * 3. Call the physical function.
12374 */
12375 - call *%ecx
12376 + call *efi_rt_function_ptr(%edx)
12377
12378 /*
12379 * 4. Balance the stack. And because EAX contain the return value,
12380 @@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12381 1: popl %edx
12382 subl $1b, %edx
12383
12384 - movl efi_rt_function_ptr(%edx), %ecx
12385 - pushl %ecx
12386 + pushl efi_rt_function_ptr(%edx)
12387
12388 /*
12389 * 10. Push the saved return address onto the stack and return.
12390 */
12391 - movl saved_return_addr(%edx), %ecx
12392 - pushl %ecx
12393 - ret
12394 + jmpl *saved_return_addr(%edx)
12395 ENDPROC(efi_call_phys)
12396 .previous
12397
12398 diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12399 index 9116aac..abbcdb1 100644
12400 --- a/arch/x86/boot/compressed/head_32.S
12401 +++ b/arch/x86/boot/compressed/head_32.S
12402 @@ -117,10 +117,10 @@ preferred_addr:
12403 addl %eax, %ebx
12404 notl %eax
12405 andl %eax, %ebx
12406 - cmpl $LOAD_PHYSICAL_ADDR, %ebx
12407 + cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12408 jge 1f
12409 #endif
12410 - movl $LOAD_PHYSICAL_ADDR, %ebx
12411 + movl $____LOAD_PHYSICAL_ADDR, %ebx
12412 1:
12413
12414 /* Target address to relocate to for decompression */
12415 diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12416 index c5c1ae0..2e76d0e 100644
12417 --- a/arch/x86/boot/compressed/head_64.S
12418 +++ b/arch/x86/boot/compressed/head_64.S
12419 @@ -94,10 +94,10 @@ ENTRY(startup_32)
12420 addl %eax, %ebx
12421 notl %eax
12422 andl %eax, %ebx
12423 - cmpl $LOAD_PHYSICAL_ADDR, %ebx
12424 + cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12425 jge 1f
12426 #endif
12427 - movl $LOAD_PHYSICAL_ADDR, %ebx
12428 + movl $____LOAD_PHYSICAL_ADDR, %ebx
12429 1:
12430
12431 /* Target address to relocate to for decompression */
12432 @@ -271,10 +271,10 @@ preferred_addr:
12433 addq %rax, %rbp
12434 notq %rax
12435 andq %rax, %rbp
12436 - cmpq $LOAD_PHYSICAL_ADDR, %rbp
12437 + cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12438 jge 1f
12439 #endif
12440 - movq $LOAD_PHYSICAL_ADDR, %rbp
12441 + movq $____LOAD_PHYSICAL_ADDR, %rbp
12442 1:
12443
12444 /* Target address to relocate to for decompression */
12445 @@ -366,8 +366,8 @@ gdt:
12446 .long gdt
12447 .word 0
12448 .quad 0x0000000000000000 /* NULL descriptor */
12449 - .quad 0x00af9a000000ffff /* __KERNEL_CS */
12450 - .quad 0x00cf92000000ffff /* __KERNEL_DS */
12451 + .quad 0x00af9b000000ffff /* __KERNEL_CS */
12452 + .quad 0x00cf93000000ffff /* __KERNEL_DS */
12453 .quad 0x0080890000000000 /* TS descriptor */
12454 .quad 0x0000000000000000 /* TS continued */
12455 gdt_end:
12456 diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12457 index 196eaf3..c96716d 100644
12458 --- a/arch/x86/boot/compressed/misc.c
12459 +++ b/arch/x86/boot/compressed/misc.c
12460 @@ -218,7 +218,7 @@ void __putstr(const char *s)
12461
12462 void *memset(void *s, int c, size_t n)
12463 {
12464 - int i;
12465 + size_t i;
12466 char *ss = s;
12467
12468 for (i = 0; i < n; i++)
12469 @@ -277,7 +277,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12470 * Calculate the delta between where vmlinux was linked to load
12471 * and where it was actually loaded.
12472 */
12473 - delta = min_addr - LOAD_PHYSICAL_ADDR;
12474 + delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12475 if (!delta) {
12476 debug_putstr("No relocation needed... ");
12477 return;
12478 @@ -347,7 +347,7 @@ static void parse_elf(void *output)
12479 Elf32_Ehdr ehdr;
12480 Elf32_Phdr *phdrs, *phdr;
12481 #endif
12482 - void *dest;
12483 + void *dest, *prev;
12484 int i;
12485
12486 memcpy(&ehdr, output, sizeof(ehdr));
12487 @@ -374,13 +374,16 @@ static void parse_elf(void *output)
12488 case PT_LOAD:
12489 #ifdef CONFIG_RELOCATABLE
12490 dest = output;
12491 - dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12492 + dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12493 #else
12494 dest = (void *)(phdr->p_paddr);
12495 #endif
12496 memcpy(dest,
12497 output + phdr->p_offset,
12498 phdr->p_filesz);
12499 + if (i)
12500 + memset(prev, 0xff, dest - prev);
12501 + prev = dest + phdr->p_filesz;
12502 break;
12503 default: /* Ignore other PT_* */ break;
12504 }
12505 @@ -430,7 +433,7 @@ asmlinkage void *decompress_kernel(void *rmode, memptr heap,
12506 error("Destination address too large");
12507 #endif
12508 #ifndef CONFIG_RELOCATABLE
12509 - if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12510 + if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12511 error("Wrong destination address");
12512 #endif
12513
12514 diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12515 index 100a9a1..bb3bdb0 100644
12516 --- a/arch/x86/boot/cpucheck.c
12517 +++ b/arch/x86/boot/cpucheck.c
12518 @@ -117,9 +117,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12519 u32 ecx = MSR_K7_HWCR;
12520 u32 eax, edx;
12521
12522 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12523 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12524 eax &= ~(1 << 15);
12525 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12526 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12527
12528 get_cpuflags(); /* Make sure it really did something */
12529 err = check_cpuflags();
12530 @@ -132,9 +132,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12531 u32 ecx = MSR_VIA_FCR;
12532 u32 eax, edx;
12533
12534 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12535 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12536 eax |= (1<<1)|(1<<7);
12537 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12538 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12539
12540 set_bit(X86_FEATURE_CX8, cpu.flags);
12541 err = check_cpuflags();
12542 @@ -145,12 +145,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12543 u32 eax, edx;
12544 u32 level = 1;
12545
12546 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12547 - asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12548 - asm("cpuid"
12549 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12550 + asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12551 + asm volatile("cpuid"
12552 : "+a" (level), "=d" (cpu.flags[0])
12553 : : "ecx", "ebx");
12554 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12555 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12556
12557 err = check_cpuflags();
12558 }
12559 diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12560 index ec3b8ba..6a0db1f 100644
12561 --- a/arch/x86/boot/header.S
12562 +++ b/arch/x86/boot/header.S
12563 @@ -416,10 +416,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12564 # single linked list of
12565 # struct setup_data
12566
12567 -pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12568 +pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12569
12570 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12571 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12572 +#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12573 +#else
12574 #define VO_INIT_SIZE (VO__end - VO__text)
12575 +#endif
12576 #if ZO_INIT_SIZE > VO_INIT_SIZE
12577 #define INIT_SIZE ZO_INIT_SIZE
12578 #else
12579 diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
12580 index db75d07..8e6d0af 100644
12581 --- a/arch/x86/boot/memory.c
12582 +++ b/arch/x86/boot/memory.c
12583 @@ -19,7 +19,7 @@
12584
12585 static int detect_memory_e820(void)
12586 {
12587 - int count = 0;
12588 + unsigned int count = 0;
12589 struct biosregs ireg, oreg;
12590 struct e820entry *desc = boot_params.e820_map;
12591 static struct e820entry buf; /* static so it is zeroed */
12592 diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
12593 index 11e8c6e..fdbb1ed 100644
12594 --- a/arch/x86/boot/video-vesa.c
12595 +++ b/arch/x86/boot/video-vesa.c
12596 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
12597
12598 boot_params.screen_info.vesapm_seg = oreg.es;
12599 boot_params.screen_info.vesapm_off = oreg.di;
12600 + boot_params.screen_info.vesapm_size = oreg.cx;
12601 }
12602
12603 /*
12604 diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
12605 index 43eda28..5ab5fdb 100644
12606 --- a/arch/x86/boot/video.c
12607 +++ b/arch/x86/boot/video.c
12608 @@ -96,7 +96,7 @@ static void store_mode_params(void)
12609 static unsigned int get_entry(void)
12610 {
12611 char entry_buf[4];
12612 - int i, len = 0;
12613 + unsigned int i, len = 0;
12614 int key;
12615 unsigned int v;
12616
12617 diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
12618 index 9105655..41779c1 100644
12619 --- a/arch/x86/crypto/aes-x86_64-asm_64.S
12620 +++ b/arch/x86/crypto/aes-x86_64-asm_64.S
12621 @@ -8,6 +8,8 @@
12622 * including this sentence is retained in full.
12623 */
12624
12625 +#include <asm/alternative-asm.h>
12626 +
12627 .extern crypto_ft_tab
12628 .extern crypto_it_tab
12629 .extern crypto_fl_tab
12630 @@ -70,6 +72,8 @@
12631 je B192; \
12632 leaq 32(r9),r9;
12633
12634 +#define ret pax_force_retaddr; ret
12635 +
12636 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
12637 movq r1,r2; \
12638 movq r3,r4; \
12639 diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
12640 index 477e9d7..c92c7d8 100644
12641 --- a/arch/x86/crypto/aesni-intel_asm.S
12642 +++ b/arch/x86/crypto/aesni-intel_asm.S
12643 @@ -31,6 +31,7 @@
12644
12645 #include <linux/linkage.h>
12646 #include <asm/inst.h>
12647 +#include <asm/alternative-asm.h>
12648
12649 #ifdef __x86_64__
12650 .data
12651 @@ -205,7 +206,7 @@ enc: .octa 0x2
12652 * num_initial_blocks = b mod 4
12653 * encrypt the initial num_initial_blocks blocks and apply ghash on
12654 * the ciphertext
12655 -* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12656 +* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12657 * are clobbered
12658 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
12659 */
12660 @@ -214,8 +215,8 @@ enc: .octa 0x2
12661 .macro INITIAL_BLOCKS_DEC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
12662 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
12663 mov arg7, %r10 # %r10 = AAD
12664 - mov arg8, %r12 # %r12 = aadLen
12665 - mov %r12, %r11
12666 + mov arg8, %r15 # %r15 = aadLen
12667 + mov %r15, %r11
12668 pxor %xmm\i, %xmm\i
12669 _get_AAD_loop\num_initial_blocks\operation:
12670 movd (%r10), \TMP1
12671 @@ -223,15 +224,15 @@ _get_AAD_loop\num_initial_blocks\operation:
12672 psrldq $4, %xmm\i
12673 pxor \TMP1, %xmm\i
12674 add $4, %r10
12675 - sub $4, %r12
12676 + sub $4, %r15
12677 jne _get_AAD_loop\num_initial_blocks\operation
12678 cmp $16, %r11
12679 je _get_AAD_loop2_done\num_initial_blocks\operation
12680 - mov $16, %r12
12681 + mov $16, %r15
12682 _get_AAD_loop2\num_initial_blocks\operation:
12683 psrldq $4, %xmm\i
12684 - sub $4, %r12
12685 - cmp %r11, %r12
12686 + sub $4, %r15
12687 + cmp %r11, %r15
12688 jne _get_AAD_loop2\num_initial_blocks\operation
12689 _get_AAD_loop2_done\num_initial_blocks\operation:
12690 movdqa SHUF_MASK(%rip), %xmm14
12691 @@ -443,7 +444,7 @@ _initial_blocks_done\num_initial_blocks\operation:
12692 * num_initial_blocks = b mod 4
12693 * encrypt the initial num_initial_blocks blocks and apply ghash on
12694 * the ciphertext
12695 -* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12696 +* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12697 * are clobbered
12698 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
12699 */
12700 @@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
12701 .macro INITIAL_BLOCKS_ENC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
12702 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
12703 mov arg7, %r10 # %r10 = AAD
12704 - mov arg8, %r12 # %r12 = aadLen
12705 - mov %r12, %r11
12706 + mov arg8, %r15 # %r15 = aadLen
12707 + mov %r15, %r11
12708 pxor %xmm\i, %xmm\i
12709 _get_AAD_loop\num_initial_blocks\operation:
12710 movd (%r10), \TMP1
12711 @@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
12712 psrldq $4, %xmm\i
12713 pxor \TMP1, %xmm\i
12714 add $4, %r10
12715 - sub $4, %r12
12716 + sub $4, %r15
12717 jne _get_AAD_loop\num_initial_blocks\operation
12718 cmp $16, %r11
12719 je _get_AAD_loop2_done\num_initial_blocks\operation
12720 - mov $16, %r12
12721 + mov $16, %r15
12722 _get_AAD_loop2\num_initial_blocks\operation:
12723 psrldq $4, %xmm\i
12724 - sub $4, %r12
12725 - cmp %r11, %r12
12726 + sub $4, %r15
12727 + cmp %r11, %r15
12728 jne _get_AAD_loop2\num_initial_blocks\operation
12729 _get_AAD_loop2_done\num_initial_blocks\operation:
12730 movdqa SHUF_MASK(%rip), %xmm14
12731 @@ -1269,7 +1270,7 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst
12732 *
12733 *****************************************************************************/
12734 ENTRY(aesni_gcm_dec)
12735 - push %r12
12736 + push %r15
12737 push %r13
12738 push %r14
12739 mov %rsp, %r14
12740 @@ -1279,8 +1280,8 @@ ENTRY(aesni_gcm_dec)
12741 */
12742 sub $VARIABLE_OFFSET, %rsp
12743 and $~63, %rsp # align rsp to 64 bytes
12744 - mov %arg6, %r12
12745 - movdqu (%r12), %xmm13 # %xmm13 = HashKey
12746 + mov %arg6, %r15
12747 + movdqu (%r15), %xmm13 # %xmm13 = HashKey
12748 movdqa SHUF_MASK(%rip), %xmm2
12749 PSHUFB_XMM %xmm2, %xmm13
12750
12751 @@ -1308,10 +1309,10 @@ ENTRY(aesni_gcm_dec)
12752 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
12753 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
12754 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
12755 - mov %r13, %r12
12756 - and $(3<<4), %r12
12757 + mov %r13, %r15
12758 + and $(3<<4), %r15
12759 jz _initial_num_blocks_is_0_decrypt
12760 - cmp $(2<<4), %r12
12761 + cmp $(2<<4), %r15
12762 jb _initial_num_blocks_is_1_decrypt
12763 je _initial_num_blocks_is_2_decrypt
12764 _initial_num_blocks_is_3_decrypt:
12765 @@ -1361,16 +1362,16 @@ _zero_cipher_left_decrypt:
12766 sub $16, %r11
12767 add %r13, %r11
12768 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
12769 - lea SHIFT_MASK+16(%rip), %r12
12770 - sub %r13, %r12
12771 + lea SHIFT_MASK+16(%rip), %r15
12772 + sub %r13, %r15
12773 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
12774 # (%r13 is the number of bytes in plaintext mod 16)
12775 - movdqu (%r12), %xmm2 # get the appropriate shuffle mask
12776 + movdqu (%r15), %xmm2 # get the appropriate shuffle mask
12777 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
12778
12779 movdqa %xmm1, %xmm2
12780 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
12781 - movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
12782 + movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
12783 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
12784 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
12785 pand %xmm1, %xmm2
12786 @@ -1399,9 +1400,9 @@ _less_than_8_bytes_left_decrypt:
12787 sub $1, %r13
12788 jne _less_than_8_bytes_left_decrypt
12789 _multiple_of_16_bytes_decrypt:
12790 - mov arg8, %r12 # %r13 = aadLen (number of bytes)
12791 - shl $3, %r12 # convert into number of bits
12792 - movd %r12d, %xmm15 # len(A) in %xmm15
12793 + mov arg8, %r15 # %r13 = aadLen (number of bytes)
12794 + shl $3, %r15 # convert into number of bits
12795 + movd %r15d, %xmm15 # len(A) in %xmm15
12796 shl $3, %arg4 # len(C) in bits (*128)
12797 MOVQ_R64_XMM %arg4, %xmm1
12798 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
12799 @@ -1440,7 +1441,8 @@ _return_T_done_decrypt:
12800 mov %r14, %rsp
12801 pop %r14
12802 pop %r13
12803 - pop %r12
12804 + pop %r15
12805 + pax_force_retaddr
12806 ret
12807 ENDPROC(aesni_gcm_dec)
12808
12809 @@ -1529,7 +1531,7 @@ ENDPROC(aesni_gcm_dec)
12810 * poly = x^128 + x^127 + x^126 + x^121 + 1
12811 ***************************************************************************/
12812 ENTRY(aesni_gcm_enc)
12813 - push %r12
12814 + push %r15
12815 push %r13
12816 push %r14
12817 mov %rsp, %r14
12818 @@ -1539,8 +1541,8 @@ ENTRY(aesni_gcm_enc)
12819 #
12820 sub $VARIABLE_OFFSET, %rsp
12821 and $~63, %rsp
12822 - mov %arg6, %r12
12823 - movdqu (%r12), %xmm13
12824 + mov %arg6, %r15
12825 + movdqu (%r15), %xmm13
12826 movdqa SHUF_MASK(%rip), %xmm2
12827 PSHUFB_XMM %xmm2, %xmm13
12828
12829 @@ -1564,13 +1566,13 @@ ENTRY(aesni_gcm_enc)
12830 movdqa %xmm13, HashKey(%rsp)
12831 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
12832 and $-16, %r13
12833 - mov %r13, %r12
12834 + mov %r13, %r15
12835
12836 # Encrypt first few blocks
12837
12838 - and $(3<<4), %r12
12839 + and $(3<<4), %r15
12840 jz _initial_num_blocks_is_0_encrypt
12841 - cmp $(2<<4), %r12
12842 + cmp $(2<<4), %r15
12843 jb _initial_num_blocks_is_1_encrypt
12844 je _initial_num_blocks_is_2_encrypt
12845 _initial_num_blocks_is_3_encrypt:
12846 @@ -1623,14 +1625,14 @@ _zero_cipher_left_encrypt:
12847 sub $16, %r11
12848 add %r13, %r11
12849 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
12850 - lea SHIFT_MASK+16(%rip), %r12
12851 - sub %r13, %r12
12852 + lea SHIFT_MASK+16(%rip), %r15
12853 + sub %r13, %r15
12854 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
12855 # (%r13 is the number of bytes in plaintext mod 16)
12856 - movdqu (%r12), %xmm2 # get the appropriate shuffle mask
12857 + movdqu (%r15), %xmm2 # get the appropriate shuffle mask
12858 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
12859 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
12860 - movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
12861 + movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
12862 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
12863 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
12864 movdqa SHUF_MASK(%rip), %xmm10
12865 @@ -1663,9 +1665,9 @@ _less_than_8_bytes_left_encrypt:
12866 sub $1, %r13
12867 jne _less_than_8_bytes_left_encrypt
12868 _multiple_of_16_bytes_encrypt:
12869 - mov arg8, %r12 # %r12 = addLen (number of bytes)
12870 - shl $3, %r12
12871 - movd %r12d, %xmm15 # len(A) in %xmm15
12872 + mov arg8, %r15 # %r15 = addLen (number of bytes)
12873 + shl $3, %r15
12874 + movd %r15d, %xmm15 # len(A) in %xmm15
12875 shl $3, %arg4 # len(C) in bits (*128)
12876 MOVQ_R64_XMM %arg4, %xmm1
12877 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
12878 @@ -1704,7 +1706,8 @@ _return_T_done_encrypt:
12879 mov %r14, %rsp
12880 pop %r14
12881 pop %r13
12882 - pop %r12
12883 + pop %r15
12884 + pax_force_retaddr
12885 ret
12886 ENDPROC(aesni_gcm_enc)
12887
12888 @@ -1722,6 +1725,7 @@ _key_expansion_256a:
12889 pxor %xmm1, %xmm0
12890 movaps %xmm0, (TKEYP)
12891 add $0x10, TKEYP
12892 + pax_force_retaddr
12893 ret
12894 ENDPROC(_key_expansion_128)
12895 ENDPROC(_key_expansion_256a)
12896 @@ -1748,6 +1752,7 @@ _key_expansion_192a:
12897 shufps $0b01001110, %xmm2, %xmm1
12898 movaps %xmm1, 0x10(TKEYP)
12899 add $0x20, TKEYP
12900 + pax_force_retaddr
12901 ret
12902 ENDPROC(_key_expansion_192a)
12903
12904 @@ -1768,6 +1773,7 @@ _key_expansion_192b:
12905
12906 movaps %xmm0, (TKEYP)
12907 add $0x10, TKEYP
12908 + pax_force_retaddr
12909 ret
12910 ENDPROC(_key_expansion_192b)
12911
12912 @@ -1781,6 +1787,7 @@ _key_expansion_256b:
12913 pxor %xmm1, %xmm2
12914 movaps %xmm2, (TKEYP)
12915 add $0x10, TKEYP
12916 + pax_force_retaddr
12917 ret
12918 ENDPROC(_key_expansion_256b)
12919
12920 @@ -1894,6 +1901,7 @@ ENTRY(aesni_set_key)
12921 #ifndef __x86_64__
12922 popl KEYP
12923 #endif
12924 + pax_force_retaddr
12925 ret
12926 ENDPROC(aesni_set_key)
12927
12928 @@ -1916,6 +1924,7 @@ ENTRY(aesni_enc)
12929 popl KLEN
12930 popl KEYP
12931 #endif
12932 + pax_force_retaddr
12933 ret
12934 ENDPROC(aesni_enc)
12935
12936 @@ -1974,6 +1983,7 @@ _aesni_enc1:
12937 AESENC KEY STATE
12938 movaps 0x70(TKEYP), KEY
12939 AESENCLAST KEY STATE
12940 + pax_force_retaddr
12941 ret
12942 ENDPROC(_aesni_enc1)
12943
12944 @@ -2083,6 +2093,7 @@ _aesni_enc4:
12945 AESENCLAST KEY STATE2
12946 AESENCLAST KEY STATE3
12947 AESENCLAST KEY STATE4
12948 + pax_force_retaddr
12949 ret
12950 ENDPROC(_aesni_enc4)
12951
12952 @@ -2106,6 +2117,7 @@ ENTRY(aesni_dec)
12953 popl KLEN
12954 popl KEYP
12955 #endif
12956 + pax_force_retaddr
12957 ret
12958 ENDPROC(aesni_dec)
12959
12960 @@ -2164,6 +2176,7 @@ _aesni_dec1:
12961 AESDEC KEY STATE
12962 movaps 0x70(TKEYP), KEY
12963 AESDECLAST KEY STATE
12964 + pax_force_retaddr
12965 ret
12966 ENDPROC(_aesni_dec1)
12967
12968 @@ -2273,6 +2286,7 @@ _aesni_dec4:
12969 AESDECLAST KEY STATE2
12970 AESDECLAST KEY STATE3
12971 AESDECLAST KEY STATE4
12972 + pax_force_retaddr
12973 ret
12974 ENDPROC(_aesni_dec4)
12975
12976 @@ -2331,6 +2345,7 @@ ENTRY(aesni_ecb_enc)
12977 popl KEYP
12978 popl LEN
12979 #endif
12980 + pax_force_retaddr
12981 ret
12982 ENDPROC(aesni_ecb_enc)
12983
12984 @@ -2390,6 +2405,7 @@ ENTRY(aesni_ecb_dec)
12985 popl KEYP
12986 popl LEN
12987 #endif
12988 + pax_force_retaddr
12989 ret
12990 ENDPROC(aesni_ecb_dec)
12991
12992 @@ -2432,6 +2448,7 @@ ENTRY(aesni_cbc_enc)
12993 popl LEN
12994 popl IVP
12995 #endif
12996 + pax_force_retaddr
12997 ret
12998 ENDPROC(aesni_cbc_enc)
12999
13000 @@ -2523,6 +2540,7 @@ ENTRY(aesni_cbc_dec)
13001 popl LEN
13002 popl IVP
13003 #endif
13004 + pax_force_retaddr
13005 ret
13006 ENDPROC(aesni_cbc_dec)
13007
13008 @@ -2550,6 +2568,7 @@ _aesni_inc_init:
13009 mov $1, TCTR_LOW
13010 MOVQ_R64_XMM TCTR_LOW INC
13011 MOVQ_R64_XMM CTR TCTR_LOW
13012 + pax_force_retaddr
13013 ret
13014 ENDPROC(_aesni_inc_init)
13015
13016 @@ -2579,6 +2598,7 @@ _aesni_inc:
13017 .Linc_low:
13018 movaps CTR, IV
13019 PSHUFB_XMM BSWAP_MASK IV
13020 + pax_force_retaddr
13021 ret
13022 ENDPROC(_aesni_inc)
13023
13024 @@ -2640,6 +2660,7 @@ ENTRY(aesni_ctr_enc)
13025 .Lctr_enc_ret:
13026 movups IV, (IVP)
13027 .Lctr_enc_just_ret:
13028 + pax_force_retaddr
13029 ret
13030 ENDPROC(aesni_ctr_enc)
13031
13032 @@ -2766,6 +2787,7 @@ ENTRY(aesni_xts_crypt8)
13033 pxor INC, STATE4
13034 movdqu STATE4, 0x70(OUTP)
13035
13036 + pax_force_retaddr
13037 ret
13038 ENDPROC(aesni_xts_crypt8)
13039
13040 diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13041 index 246c670..466e2d6 100644
13042 --- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13043 +++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13044 @@ -21,6 +21,7 @@
13045 */
13046
13047 #include <linux/linkage.h>
13048 +#include <asm/alternative-asm.h>
13049
13050 .file "blowfish-x86_64-asm.S"
13051 .text
13052 @@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13053 jnz .L__enc_xor;
13054
13055 write_block();
13056 + pax_force_retaddr
13057 ret;
13058 .L__enc_xor:
13059 xor_block();
13060 + pax_force_retaddr
13061 ret;
13062 ENDPROC(__blowfish_enc_blk)
13063
13064 @@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13065
13066 movq %r11, %rbp;
13067
13068 + pax_force_retaddr
13069 ret;
13070 ENDPROC(blowfish_dec_blk)
13071
13072 @@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13073
13074 popq %rbx;
13075 popq %rbp;
13076 + pax_force_retaddr
13077 ret;
13078
13079 .L__enc_xor4:
13080 @@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13081
13082 popq %rbx;
13083 popq %rbp;
13084 + pax_force_retaddr
13085 ret;
13086 ENDPROC(__blowfish_enc_blk_4way)
13087
13088 @@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13089 popq %rbx;
13090 popq %rbp;
13091
13092 + pax_force_retaddr
13093 ret;
13094 ENDPROC(blowfish_dec_blk_4way)
13095 diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13096 index ce71f92..1dce7ec 100644
13097 --- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13098 +++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13099 @@ -16,6 +16,7 @@
13100 */
13101
13102 #include <linux/linkage.h>
13103 +#include <asm/alternative-asm.h>
13104
13105 #define CAMELLIA_TABLE_BYTE_LEN 272
13106
13107 @@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13108 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13109 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13110 %rcx, (%r9));
13111 + pax_force_retaddr
13112 ret;
13113 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13114
13115 @@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13116 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13117 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13118 %rax, (%r9));
13119 + pax_force_retaddr
13120 ret;
13121 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13122
13123 @@ -780,6 +783,7 @@ __camellia_enc_blk16:
13124 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13125 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13126
13127 + pax_force_retaddr
13128 ret;
13129
13130 .align 8
13131 @@ -865,6 +869,7 @@ __camellia_dec_blk16:
13132 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13133 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13134
13135 + pax_force_retaddr
13136 ret;
13137
13138 .align 8
13139 @@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13140 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13141 %xmm8, %rsi);
13142
13143 + pax_force_retaddr
13144 ret;
13145 ENDPROC(camellia_ecb_enc_16way)
13146
13147 @@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13148 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13149 %xmm8, %rsi);
13150
13151 + pax_force_retaddr
13152 ret;
13153 ENDPROC(camellia_ecb_dec_16way)
13154
13155 @@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13156 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13157 %xmm8, %rsi);
13158
13159 + pax_force_retaddr
13160 ret;
13161 ENDPROC(camellia_cbc_dec_16way)
13162
13163 @@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13164 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13165 %xmm8, %rsi);
13166
13167 + pax_force_retaddr
13168 ret;
13169 ENDPROC(camellia_ctr_16way)
13170
13171 @@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13172 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13173 %xmm8, %rsi);
13174
13175 + pax_force_retaddr
13176 ret;
13177 ENDPROC(camellia_xts_crypt_16way)
13178
13179 diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13180 index 0e0b886..5a3123c 100644
13181 --- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13182 +++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13183 @@ -11,6 +11,7 @@
13184 */
13185
13186 #include <linux/linkage.h>
13187 +#include <asm/alternative-asm.h>
13188
13189 #define CAMELLIA_TABLE_BYTE_LEN 272
13190
13191 @@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13192 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13193 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13194 %rcx, (%r9));
13195 + pax_force_retaddr
13196 ret;
13197 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13198
13199 @@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13200 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13201 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13202 %rax, (%r9));
13203 + pax_force_retaddr
13204 ret;
13205 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13206
13207 @@ -820,6 +823,7 @@ __camellia_enc_blk32:
13208 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13209 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13210
13211 + pax_force_retaddr
13212 ret;
13213
13214 .align 8
13215 @@ -905,6 +909,7 @@ __camellia_dec_blk32:
13216 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13217 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13218
13219 + pax_force_retaddr
13220 ret;
13221
13222 .align 8
13223 @@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13224
13225 vzeroupper;
13226
13227 + pax_force_retaddr
13228 ret;
13229 ENDPROC(camellia_ecb_enc_32way)
13230
13231 @@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13232
13233 vzeroupper;
13234
13235 + pax_force_retaddr
13236 ret;
13237 ENDPROC(camellia_ecb_dec_32way)
13238
13239 @@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13240
13241 vzeroupper;
13242
13243 + pax_force_retaddr
13244 ret;
13245 ENDPROC(camellia_cbc_dec_32way)
13246
13247 @@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13248
13249 vzeroupper;
13250
13251 + pax_force_retaddr
13252 ret;
13253 ENDPROC(camellia_ctr_32way)
13254
13255 @@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13256
13257 vzeroupper;
13258
13259 + pax_force_retaddr
13260 ret;
13261 ENDPROC(camellia_xts_crypt_32way)
13262
13263 diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13264 index 310319c..db3d7b5 100644
13265 --- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13266 +++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13267 @@ -21,6 +21,7 @@
13268 */
13269
13270 #include <linux/linkage.h>
13271 +#include <asm/alternative-asm.h>
13272
13273 .file "camellia-x86_64-asm_64.S"
13274 .text
13275 @@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13276 enc_outunpack(mov, RT1);
13277
13278 movq RRBP, %rbp;
13279 + pax_force_retaddr
13280 ret;
13281
13282 .L__enc_xor:
13283 enc_outunpack(xor, RT1);
13284
13285 movq RRBP, %rbp;
13286 + pax_force_retaddr
13287 ret;
13288 ENDPROC(__camellia_enc_blk)
13289
13290 @@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13291 dec_outunpack();
13292
13293 movq RRBP, %rbp;
13294 + pax_force_retaddr
13295 ret;
13296 ENDPROC(camellia_dec_blk)
13297
13298 @@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13299
13300 movq RRBP, %rbp;
13301 popq %rbx;
13302 + pax_force_retaddr
13303 ret;
13304
13305 .L__enc2_xor:
13306 @@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13307
13308 movq RRBP, %rbp;
13309 popq %rbx;
13310 + pax_force_retaddr
13311 ret;
13312 ENDPROC(__camellia_enc_blk_2way)
13313
13314 @@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13315
13316 movq RRBP, %rbp;
13317 movq RXOR, %rbx;
13318 + pax_force_retaddr
13319 ret;
13320 ENDPROC(camellia_dec_blk_2way)
13321 diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13322 index c35fd5d..2d8c7db 100644
13323 --- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13324 +++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13325 @@ -24,6 +24,7 @@
13326 */
13327
13328 #include <linux/linkage.h>
13329 +#include <asm/alternative-asm.h>
13330
13331 .file "cast5-avx-x86_64-asm_64.S"
13332
13333 @@ -281,6 +282,7 @@ __cast5_enc_blk16:
13334 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13335 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13336
13337 + pax_force_retaddr
13338 ret;
13339 ENDPROC(__cast5_enc_blk16)
13340
13341 @@ -352,6 +354,7 @@ __cast5_dec_blk16:
13342 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13343 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13344
13345 + pax_force_retaddr
13346 ret;
13347
13348 .L__skip_dec:
13349 @@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13350 vmovdqu RR4, (6*4*4)(%r11);
13351 vmovdqu RL4, (7*4*4)(%r11);
13352
13353 + pax_force_retaddr
13354 ret;
13355 ENDPROC(cast5_ecb_enc_16way)
13356
13357 @@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13358 vmovdqu RR4, (6*4*4)(%r11);
13359 vmovdqu RL4, (7*4*4)(%r11);
13360
13361 + pax_force_retaddr
13362 ret;
13363 ENDPROC(cast5_ecb_dec_16way)
13364
13365 @@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13366 * %rdx: src
13367 */
13368
13369 - pushq %r12;
13370 + pushq %r14;
13371
13372 movq %rsi, %r11;
13373 - movq %rdx, %r12;
13374 + movq %rdx, %r14;
13375
13376 vmovdqu (0*16)(%rdx), RL1;
13377 vmovdqu (1*16)(%rdx), RR1;
13378 @@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13379 call __cast5_dec_blk16;
13380
13381 /* xor with src */
13382 - vmovq (%r12), RX;
13383 + vmovq (%r14), RX;
13384 vpshufd $0x4f, RX, RX;
13385 vpxor RX, RR1, RR1;
13386 - vpxor 0*16+8(%r12), RL1, RL1;
13387 - vpxor 1*16+8(%r12), RR2, RR2;
13388 - vpxor 2*16+8(%r12), RL2, RL2;
13389 - vpxor 3*16+8(%r12), RR3, RR3;
13390 - vpxor 4*16+8(%r12), RL3, RL3;
13391 - vpxor 5*16+8(%r12), RR4, RR4;
13392 - vpxor 6*16+8(%r12), RL4, RL4;
13393 + vpxor 0*16+8(%r14), RL1, RL1;
13394 + vpxor 1*16+8(%r14), RR2, RR2;
13395 + vpxor 2*16+8(%r14), RL2, RL2;
13396 + vpxor 3*16+8(%r14), RR3, RR3;
13397 + vpxor 4*16+8(%r14), RL3, RL3;
13398 + vpxor 5*16+8(%r14), RR4, RR4;
13399 + vpxor 6*16+8(%r14), RL4, RL4;
13400
13401 vmovdqu RR1, (0*16)(%r11);
13402 vmovdqu RL1, (1*16)(%r11);
13403 @@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13404 vmovdqu RR4, (6*16)(%r11);
13405 vmovdqu RL4, (7*16)(%r11);
13406
13407 - popq %r12;
13408 + popq %r14;
13409
13410 + pax_force_retaddr
13411 ret;
13412 ENDPROC(cast5_cbc_dec_16way)
13413
13414 @@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13415 * %rcx: iv (big endian, 64bit)
13416 */
13417
13418 - pushq %r12;
13419 + pushq %r14;
13420
13421 movq %rsi, %r11;
13422 - movq %rdx, %r12;
13423 + movq %rdx, %r14;
13424
13425 vpcmpeqd RTMP, RTMP, RTMP;
13426 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13427 @@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13428 call __cast5_enc_blk16;
13429
13430 /* dst = src ^ iv */
13431 - vpxor (0*16)(%r12), RR1, RR1;
13432 - vpxor (1*16)(%r12), RL1, RL1;
13433 - vpxor (2*16)(%r12), RR2, RR2;
13434 - vpxor (3*16)(%r12), RL2, RL2;
13435 - vpxor (4*16)(%r12), RR3, RR3;
13436 - vpxor (5*16)(%r12), RL3, RL3;
13437 - vpxor (6*16)(%r12), RR4, RR4;
13438 - vpxor (7*16)(%r12), RL4, RL4;
13439 + vpxor (0*16)(%r14), RR1, RR1;
13440 + vpxor (1*16)(%r14), RL1, RL1;
13441 + vpxor (2*16)(%r14), RR2, RR2;
13442 + vpxor (3*16)(%r14), RL2, RL2;
13443 + vpxor (4*16)(%r14), RR3, RR3;
13444 + vpxor (5*16)(%r14), RL3, RL3;
13445 + vpxor (6*16)(%r14), RR4, RR4;
13446 + vpxor (7*16)(%r14), RL4, RL4;
13447 vmovdqu RR1, (0*16)(%r11);
13448 vmovdqu RL1, (1*16)(%r11);
13449 vmovdqu RR2, (2*16)(%r11);
13450 @@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13451 vmovdqu RR4, (6*16)(%r11);
13452 vmovdqu RL4, (7*16)(%r11);
13453
13454 - popq %r12;
13455 + popq %r14;
13456
13457 + pax_force_retaddr
13458 ret;
13459 ENDPROC(cast5_ctr_16way)
13460 diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13461 index e3531f8..e123f35 100644
13462 --- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13463 +++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13464 @@ -24,6 +24,7 @@
13465 */
13466
13467 #include <linux/linkage.h>
13468 +#include <asm/alternative-asm.h>
13469 #include "glue_helper-asm-avx.S"
13470
13471 .file "cast6-avx-x86_64-asm_64.S"
13472 @@ -295,6 +296,7 @@ __cast6_enc_blk8:
13473 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13474 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13475
13476 + pax_force_retaddr
13477 ret;
13478 ENDPROC(__cast6_enc_blk8)
13479
13480 @@ -340,6 +342,7 @@ __cast6_dec_blk8:
13481 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13482 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13483
13484 + pax_force_retaddr
13485 ret;
13486 ENDPROC(__cast6_dec_blk8)
13487
13488 @@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13489
13490 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13491
13492 + pax_force_retaddr
13493 ret;
13494 ENDPROC(cast6_ecb_enc_8way)
13495
13496 @@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13497
13498 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13499
13500 + pax_force_retaddr
13501 ret;
13502 ENDPROC(cast6_ecb_dec_8way)
13503
13504 @@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13505 * %rdx: src
13506 */
13507
13508 - pushq %r12;
13509 + pushq %r14;
13510
13511 movq %rsi, %r11;
13512 - movq %rdx, %r12;
13513 + movq %rdx, %r14;
13514
13515 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13516
13517 call __cast6_dec_blk8;
13518
13519 - store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13520 + store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13521
13522 - popq %r12;
13523 + popq %r14;
13524
13525 + pax_force_retaddr
13526 ret;
13527 ENDPROC(cast6_cbc_dec_8way)
13528
13529 @@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13530 * %rcx: iv (little endian, 128bit)
13531 */
13532
13533 - pushq %r12;
13534 + pushq %r14;
13535
13536 movq %rsi, %r11;
13537 - movq %rdx, %r12;
13538 + movq %rdx, %r14;
13539
13540 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13541 RD2, RX, RKR, RKM);
13542
13543 call __cast6_enc_blk8;
13544
13545 - store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13546 + store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13547
13548 - popq %r12;
13549 + popq %r14;
13550
13551 + pax_force_retaddr
13552 ret;
13553 ENDPROC(cast6_ctr_8way)
13554
13555 @@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13556 /* dst <= regs xor IVs(in dst) */
13557 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13558
13559 + pax_force_retaddr
13560 ret;
13561 ENDPROC(cast6_xts_enc_8way)
13562
13563 @@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13564 /* dst <= regs xor IVs(in dst) */
13565 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13566
13567 + pax_force_retaddr
13568 ret;
13569 ENDPROC(cast6_xts_dec_8way)
13570 diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13571 index dbc4339..de6e120 100644
13572 --- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13573 +++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13574 @@ -45,6 +45,7 @@
13575
13576 #include <asm/inst.h>
13577 #include <linux/linkage.h>
13578 +#include <asm/alternative-asm.h>
13579
13580 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
13581
13582 @@ -312,6 +313,7 @@ do_return:
13583 popq %rsi
13584 popq %rdi
13585 popq %rbx
13586 + pax_force_retaddr
13587 ret
13588
13589 ################################################################
13590 diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
13591 index 185fad4..ff4cd36 100644
13592 --- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
13593 +++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
13594 @@ -18,6 +18,7 @@
13595
13596 #include <linux/linkage.h>
13597 #include <asm/inst.h>
13598 +#include <asm/alternative-asm.h>
13599
13600 .data
13601
13602 @@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
13603 psrlq $1, T2
13604 pxor T2, T1
13605 pxor T1, DATA
13606 + pax_force_retaddr
13607 ret
13608 ENDPROC(__clmul_gf128mul_ble)
13609
13610 @@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
13611 call __clmul_gf128mul_ble
13612 PSHUFB_XMM BSWAP DATA
13613 movups DATA, (%rdi)
13614 + pax_force_retaddr
13615 ret
13616 ENDPROC(clmul_ghash_mul)
13617
13618 @@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
13619 PSHUFB_XMM BSWAP DATA
13620 movups DATA, (%rdi)
13621 .Lupdate_just_ret:
13622 + pax_force_retaddr
13623 ret
13624 ENDPROC(clmul_ghash_update)
13625 diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
13626 index 9279e0b..c4b3d2c 100644
13627 --- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
13628 +++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
13629 @@ -1,4 +1,5 @@
13630 #include <linux/linkage.h>
13631 +#include <asm/alternative-asm.h>
13632
13633 # enter salsa20_encrypt_bytes
13634 ENTRY(salsa20_encrypt_bytes)
13635 @@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
13636 add %r11,%rsp
13637 mov %rdi,%rax
13638 mov %rsi,%rdx
13639 + pax_force_retaddr
13640 ret
13641 # bytesatleast65:
13642 ._bytesatleast65:
13643 @@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
13644 add %r11,%rsp
13645 mov %rdi,%rax
13646 mov %rsi,%rdx
13647 + pax_force_retaddr
13648 ret
13649 ENDPROC(salsa20_keysetup)
13650
13651 @@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
13652 add %r11,%rsp
13653 mov %rdi,%rax
13654 mov %rsi,%rdx
13655 + pax_force_retaddr
13656 ret
13657 ENDPROC(salsa20_ivsetup)
13658 diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
13659 index 2f202f4..d9164d6 100644
13660 --- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
13661 +++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
13662 @@ -24,6 +24,7 @@
13663 */
13664
13665 #include <linux/linkage.h>
13666 +#include <asm/alternative-asm.h>
13667 #include "glue_helper-asm-avx.S"
13668
13669 .file "serpent-avx-x86_64-asm_64.S"
13670 @@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
13671 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13672 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13673
13674 + pax_force_retaddr
13675 ret;
13676 ENDPROC(__serpent_enc_blk8_avx)
13677
13678 @@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
13679 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
13680 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
13681
13682 + pax_force_retaddr
13683 ret;
13684 ENDPROC(__serpent_dec_blk8_avx)
13685
13686 @@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
13687
13688 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13689
13690 + pax_force_retaddr
13691 ret;
13692 ENDPROC(serpent_ecb_enc_8way_avx)
13693
13694 @@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
13695
13696 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
13697
13698 + pax_force_retaddr
13699 ret;
13700 ENDPROC(serpent_ecb_dec_8way_avx)
13701
13702 @@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
13703
13704 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
13705
13706 + pax_force_retaddr
13707 ret;
13708 ENDPROC(serpent_cbc_dec_8way_avx)
13709
13710 @@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
13711
13712 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13713
13714 + pax_force_retaddr
13715 ret;
13716 ENDPROC(serpent_ctr_8way_avx)
13717
13718 @@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
13719 /* dst <= regs xor IVs(in dst) */
13720 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13721
13722 + pax_force_retaddr
13723 ret;
13724 ENDPROC(serpent_xts_enc_8way_avx)
13725
13726 @@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
13727 /* dst <= regs xor IVs(in dst) */
13728 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
13729
13730 + pax_force_retaddr
13731 ret;
13732 ENDPROC(serpent_xts_dec_8way_avx)
13733 diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
13734 index b222085..abd483c 100644
13735 --- a/arch/x86/crypto/serpent-avx2-asm_64.S
13736 +++ b/arch/x86/crypto/serpent-avx2-asm_64.S
13737 @@ -15,6 +15,7 @@
13738 */
13739
13740 #include <linux/linkage.h>
13741 +#include <asm/alternative-asm.h>
13742 #include "glue_helper-asm-avx2.S"
13743
13744 .file "serpent-avx2-asm_64.S"
13745 @@ -610,6 +611,7 @@ __serpent_enc_blk16:
13746 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13747 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13748
13749 + pax_force_retaddr
13750 ret;
13751 ENDPROC(__serpent_enc_blk16)
13752
13753 @@ -664,6 +666,7 @@ __serpent_dec_blk16:
13754 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
13755 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
13756
13757 + pax_force_retaddr
13758 ret;
13759 ENDPROC(__serpent_dec_blk16)
13760
13761 @@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
13762
13763 vzeroupper;
13764
13765 + pax_force_retaddr
13766 ret;
13767 ENDPROC(serpent_ecb_enc_16way)
13768
13769 @@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
13770
13771 vzeroupper;
13772
13773 + pax_force_retaddr
13774 ret;
13775 ENDPROC(serpent_ecb_dec_16way)
13776
13777 @@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
13778
13779 vzeroupper;
13780
13781 + pax_force_retaddr
13782 ret;
13783 ENDPROC(serpent_cbc_dec_16way)
13784
13785 @@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
13786
13787 vzeroupper;
13788
13789 + pax_force_retaddr
13790 ret;
13791 ENDPROC(serpent_ctr_16way)
13792
13793 @@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
13794
13795 vzeroupper;
13796
13797 + pax_force_retaddr
13798 ret;
13799 ENDPROC(serpent_xts_enc_16way)
13800
13801 @@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
13802
13803 vzeroupper;
13804
13805 + pax_force_retaddr
13806 ret;
13807 ENDPROC(serpent_xts_dec_16way)
13808 diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
13809 index acc066c..1559cc4 100644
13810 --- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
13811 +++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
13812 @@ -25,6 +25,7 @@
13813 */
13814
13815 #include <linux/linkage.h>
13816 +#include <asm/alternative-asm.h>
13817
13818 .file "serpent-sse2-x86_64-asm_64.S"
13819 .text
13820 @@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
13821 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13822 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13823
13824 + pax_force_retaddr
13825 ret;
13826
13827 .L__enc_xor8:
13828 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13829 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13830
13831 + pax_force_retaddr
13832 ret;
13833 ENDPROC(__serpent_enc_blk_8way)
13834
13835 @@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
13836 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
13837 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
13838
13839 + pax_force_retaddr
13840 ret;
13841 ENDPROC(serpent_dec_blk_8way)
13842 diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
13843 index a410950..9dfe7ad 100644
13844 --- a/arch/x86/crypto/sha1_ssse3_asm.S
13845 +++ b/arch/x86/crypto/sha1_ssse3_asm.S
13846 @@ -29,6 +29,7 @@
13847 */
13848
13849 #include <linux/linkage.h>
13850 +#include <asm/alternative-asm.h>
13851
13852 #define CTX %rdi // arg1
13853 #define BUF %rsi // arg2
13854 @@ -75,9 +76,9 @@
13855
13856 push %rbx
13857 push %rbp
13858 - push %r12
13859 + push %r14
13860
13861 - mov %rsp, %r12
13862 + mov %rsp, %r14
13863 sub $64, %rsp # allocate workspace
13864 and $~15, %rsp # align stack
13865
13866 @@ -99,11 +100,12 @@
13867 xor %rax, %rax
13868 rep stosq
13869
13870 - mov %r12, %rsp # deallocate workspace
13871 + mov %r14, %rsp # deallocate workspace
13872
13873 - pop %r12
13874 + pop %r14
13875 pop %rbp
13876 pop %rbx
13877 + pax_force_retaddr
13878 ret
13879
13880 ENDPROC(\name)
13881 diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
13882 index 642f156..51a513c 100644
13883 --- a/arch/x86/crypto/sha256-avx-asm.S
13884 +++ b/arch/x86/crypto/sha256-avx-asm.S
13885 @@ -49,6 +49,7 @@
13886
13887 #ifdef CONFIG_AS_AVX
13888 #include <linux/linkage.h>
13889 +#include <asm/alternative-asm.h>
13890
13891 ## assume buffers not aligned
13892 #define VMOVDQ vmovdqu
13893 @@ -460,6 +461,7 @@ done_hash:
13894 popq %r13
13895 popq %rbp
13896 popq %rbx
13897 + pax_force_retaddr
13898 ret
13899 ENDPROC(sha256_transform_avx)
13900
13901 diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
13902 index 9e86944..3795e6a 100644
13903 --- a/arch/x86/crypto/sha256-avx2-asm.S
13904 +++ b/arch/x86/crypto/sha256-avx2-asm.S
13905 @@ -50,6 +50,7 @@
13906
13907 #ifdef CONFIG_AS_AVX2
13908 #include <linux/linkage.h>
13909 +#include <asm/alternative-asm.h>
13910
13911 ## assume buffers not aligned
13912 #define VMOVDQ vmovdqu
13913 @@ -720,6 +721,7 @@ done_hash:
13914 popq %r12
13915 popq %rbp
13916 popq %rbx
13917 + pax_force_retaddr
13918 ret
13919 ENDPROC(sha256_transform_rorx)
13920
13921 diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
13922 index f833b74..8c62a9e 100644
13923 --- a/arch/x86/crypto/sha256-ssse3-asm.S
13924 +++ b/arch/x86/crypto/sha256-ssse3-asm.S
13925 @@ -47,6 +47,7 @@
13926 ########################################################################
13927
13928 #include <linux/linkage.h>
13929 +#include <asm/alternative-asm.h>
13930
13931 ## assume buffers not aligned
13932 #define MOVDQ movdqu
13933 @@ -471,6 +472,7 @@ done_hash:
13934 popq %rbp
13935 popq %rbx
13936
13937 + pax_force_retaddr
13938 ret
13939 ENDPROC(sha256_transform_ssse3)
13940
13941 diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
13942 index 974dde9..a823ff9 100644
13943 --- a/arch/x86/crypto/sha512-avx-asm.S
13944 +++ b/arch/x86/crypto/sha512-avx-asm.S
13945 @@ -49,6 +49,7 @@
13946
13947 #ifdef CONFIG_AS_AVX
13948 #include <linux/linkage.h>
13949 +#include <asm/alternative-asm.h>
13950
13951 .text
13952
13953 @@ -364,6 +365,7 @@ updateblock:
13954 mov frame_RSPSAVE(%rsp), %rsp
13955
13956 nowork:
13957 + pax_force_retaddr
13958 ret
13959 ENDPROC(sha512_transform_avx)
13960
13961 diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
13962 index 568b961..ed20c37 100644
13963 --- a/arch/x86/crypto/sha512-avx2-asm.S
13964 +++ b/arch/x86/crypto/sha512-avx2-asm.S
13965 @@ -51,6 +51,7 @@
13966
13967 #ifdef CONFIG_AS_AVX2
13968 #include <linux/linkage.h>
13969 +#include <asm/alternative-asm.h>
13970
13971 .text
13972
13973 @@ -678,6 +679,7 @@ done_hash:
13974
13975 # Restore Stack Pointer
13976 mov frame_RSPSAVE(%rsp), %rsp
13977 + pax_force_retaddr
13978 ret
13979 ENDPROC(sha512_transform_rorx)
13980
13981 diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
13982 index fb56855..6edd768 100644
13983 --- a/arch/x86/crypto/sha512-ssse3-asm.S
13984 +++ b/arch/x86/crypto/sha512-ssse3-asm.S
13985 @@ -48,6 +48,7 @@
13986 ########################################################################
13987
13988 #include <linux/linkage.h>
13989 +#include <asm/alternative-asm.h>
13990
13991 .text
13992
13993 @@ -363,6 +364,7 @@ updateblock:
13994 mov frame_RSPSAVE(%rsp), %rsp
13995
13996 nowork:
13997 + pax_force_retaddr
13998 ret
13999 ENDPROC(sha512_transform_ssse3)
14000
14001 diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14002 index 0505813..b067311 100644
14003 --- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14004 +++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14005 @@ -24,6 +24,7 @@
14006 */
14007
14008 #include <linux/linkage.h>
14009 +#include <asm/alternative-asm.h>
14010 #include "glue_helper-asm-avx.S"
14011
14012 .file "twofish-avx-x86_64-asm_64.S"
14013 @@ -284,6 +285,7 @@ __twofish_enc_blk8:
14014 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14015 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14016
14017 + pax_force_retaddr
14018 ret;
14019 ENDPROC(__twofish_enc_blk8)
14020
14021 @@ -324,6 +326,7 @@ __twofish_dec_blk8:
14022 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14023 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14024
14025 + pax_force_retaddr
14026 ret;
14027 ENDPROC(__twofish_dec_blk8)
14028
14029 @@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14030
14031 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14032
14033 + pax_force_retaddr
14034 ret;
14035 ENDPROC(twofish_ecb_enc_8way)
14036
14037 @@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14038
14039 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14040
14041 + pax_force_retaddr
14042 ret;
14043 ENDPROC(twofish_ecb_dec_8way)
14044
14045 @@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14046 * %rdx: src
14047 */
14048
14049 - pushq %r12;
14050 + pushq %r14;
14051
14052 movq %rsi, %r11;
14053 - movq %rdx, %r12;
14054 + movq %rdx, %r14;
14055
14056 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14057
14058 call __twofish_dec_blk8;
14059
14060 - store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14061 + store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14062
14063 - popq %r12;
14064 + popq %r14;
14065
14066 + pax_force_retaddr
14067 ret;
14068 ENDPROC(twofish_cbc_dec_8way)
14069
14070 @@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14071 * %rcx: iv (little endian, 128bit)
14072 */
14073
14074 - pushq %r12;
14075 + pushq %r14;
14076
14077 movq %rsi, %r11;
14078 - movq %rdx, %r12;
14079 + movq %rdx, %r14;
14080
14081 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14082 RD2, RX0, RX1, RY0);
14083
14084 call __twofish_enc_blk8;
14085
14086 - store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14087 + store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14088
14089 - popq %r12;
14090 + popq %r14;
14091
14092 + pax_force_retaddr
14093 ret;
14094 ENDPROC(twofish_ctr_8way)
14095
14096 @@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14097 /* dst <= regs xor IVs(in dst) */
14098 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14099
14100 + pax_force_retaddr
14101 ret;
14102 ENDPROC(twofish_xts_enc_8way)
14103
14104 @@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14105 /* dst <= regs xor IVs(in dst) */
14106 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14107
14108 + pax_force_retaddr
14109 ret;
14110 ENDPROC(twofish_xts_dec_8way)
14111 diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14112 index 1c3b7ce..02f578d 100644
14113 --- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14114 +++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14115 @@ -21,6 +21,7 @@
14116 */
14117
14118 #include <linux/linkage.h>
14119 +#include <asm/alternative-asm.h>
14120
14121 .file "twofish-x86_64-asm-3way.S"
14122 .text
14123 @@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14124 popq %r13;
14125 popq %r14;
14126 popq %r15;
14127 + pax_force_retaddr
14128 ret;
14129
14130 .L__enc_xor3:
14131 @@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14132 popq %r13;
14133 popq %r14;
14134 popq %r15;
14135 + pax_force_retaddr
14136 ret;
14137 ENDPROC(__twofish_enc_blk_3way)
14138
14139 @@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14140 popq %r13;
14141 popq %r14;
14142 popq %r15;
14143 + pax_force_retaddr
14144 ret;
14145 ENDPROC(twofish_dec_blk_3way)
14146 diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14147 index a039d21..524b8b2 100644
14148 --- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14149 +++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14150 @@ -22,6 +22,7 @@
14151
14152 #include <linux/linkage.h>
14153 #include <asm/asm-offsets.h>
14154 +#include <asm/alternative-asm.h>
14155
14156 #define a_offset 0
14157 #define b_offset 4
14158 @@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14159
14160 popq R1
14161 movq $1,%rax
14162 + pax_force_retaddr
14163 ret
14164 ENDPROC(twofish_enc_blk)
14165
14166 @@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14167
14168 popq R1
14169 movq $1,%rax
14170 + pax_force_retaddr
14171 ret
14172 ENDPROC(twofish_dec_blk)
14173 diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14174 index d21ff89..6da8e6e 100644
14175 --- a/arch/x86/ia32/ia32_aout.c
14176 +++ b/arch/x86/ia32/ia32_aout.c
14177 @@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14178 unsigned long dump_start, dump_size;
14179 struct user32 dump;
14180
14181 + memset(&dump, 0, sizeof(dump));
14182 +
14183 fs = get_fs();
14184 set_fs(KERNEL_DS);
14185 has_dumped = 1;
14186 diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14187 index 2206757..85cbcfa 100644
14188 --- a/arch/x86/ia32/ia32_signal.c
14189 +++ b/arch/x86/ia32/ia32_signal.c
14190 @@ -218,7 +218,7 @@ asmlinkage long sys32_sigreturn(void)
14191 if (__get_user(set.sig[0], &frame->sc.oldmask)
14192 || (_COMPAT_NSIG_WORDS > 1
14193 && __copy_from_user((((char *) &set.sig) + 4),
14194 - &frame->extramask,
14195 + frame->extramask,
14196 sizeof(frame->extramask))))
14197 goto badframe;
14198
14199 @@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14200 sp -= frame_size;
14201 /* Align the stack pointer according to the i386 ABI,
14202 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14203 - sp = ((sp + 4) & -16ul) - 4;
14204 + sp = ((sp - 12) & -16ul) - 4;
14205 return (void __user *) sp;
14206 }
14207
14208 @@ -386,7 +386,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14209 restorer = VDSO32_SYMBOL(current->mm->context.vdso,
14210 sigreturn);
14211 else
14212 - restorer = &frame->retcode;
14213 + restorer = frame->retcode;
14214 }
14215
14216 put_user_try {
14217 @@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14218 * These are actually not used anymore, but left because some
14219 * gdb versions depend on them as a marker.
14220 */
14221 - put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14222 + put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14223 } put_user_catch(err);
14224
14225 if (err)
14226 @@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14227 0xb8,
14228 __NR_ia32_rt_sigreturn,
14229 0x80cd,
14230 - 0,
14231 + 0
14232 };
14233
14234 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14235 @@ -461,16 +461,18 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14236
14237 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14238 restorer = ksig->ka.sa.sa_restorer;
14239 + else if (current->mm->context.vdso)
14240 + /* Return stub is in 32bit vsyscall page */
14241 + restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
14242 else
14243 - restorer = VDSO32_SYMBOL(current->mm->context.vdso,
14244 - rt_sigreturn);
14245 + restorer = frame->retcode;
14246 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14247
14248 /*
14249 * Not actually used anymore, but left because some gdb
14250 * versions need it.
14251 */
14252 - put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14253 + put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14254 } put_user_catch(err);
14255
14256 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14257 diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14258 index 4299eb0..c0687a7 100644
14259 --- a/arch/x86/ia32/ia32entry.S
14260 +++ b/arch/x86/ia32/ia32entry.S
14261 @@ -15,8 +15,10 @@
14262 #include <asm/irqflags.h>
14263 #include <asm/asm.h>
14264 #include <asm/smap.h>
14265 +#include <asm/pgtable.h>
14266 #include <linux/linkage.h>
14267 #include <linux/err.h>
14268 +#include <asm/alternative-asm.h>
14269
14270 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14271 #include <linux/elf-em.h>
14272 @@ -62,12 +64,12 @@
14273 */
14274 .macro LOAD_ARGS32 offset, _r9=0
14275 .if \_r9
14276 - movl \offset+16(%rsp),%r9d
14277 + movl \offset+R9(%rsp),%r9d
14278 .endif
14279 - movl \offset+40(%rsp),%ecx
14280 - movl \offset+48(%rsp),%edx
14281 - movl \offset+56(%rsp),%esi
14282 - movl \offset+64(%rsp),%edi
14283 + movl \offset+RCX(%rsp),%ecx
14284 + movl \offset+RDX(%rsp),%edx
14285 + movl \offset+RSI(%rsp),%esi
14286 + movl \offset+RDI(%rsp),%edi
14287 movl %eax,%eax /* zero extension */
14288 .endm
14289
14290 @@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
14291 ENDPROC(native_irq_enable_sysexit)
14292 #endif
14293
14294 + .macro pax_enter_kernel_user
14295 + pax_set_fptr_mask
14296 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14297 + call pax_enter_kernel_user
14298 +#endif
14299 + .endm
14300 +
14301 + .macro pax_exit_kernel_user
14302 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14303 + call pax_exit_kernel_user
14304 +#endif
14305 +#ifdef CONFIG_PAX_RANDKSTACK
14306 + pushq %rax
14307 + pushq %r11
14308 + call pax_randomize_kstack
14309 + popq %r11
14310 + popq %rax
14311 +#endif
14312 + .endm
14313 +
14314 + .macro pax_erase_kstack
14315 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14316 + call pax_erase_kstack
14317 +#endif
14318 + .endm
14319 +
14320 /*
14321 * 32bit SYSENTER instruction entry.
14322 *
14323 @@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
14324 CFI_REGISTER rsp,rbp
14325 SWAPGS_UNSAFE_STACK
14326 movq PER_CPU_VAR(kernel_stack), %rsp
14327 - addq $(KERNEL_STACK_OFFSET),%rsp
14328 - /*
14329 - * No need to follow this irqs on/off section: the syscall
14330 - * disabled irqs, here we enable it straight after entry:
14331 - */
14332 - ENABLE_INTERRUPTS(CLBR_NONE)
14333 movl %ebp,%ebp /* zero extension */
14334 pushq_cfi $__USER32_DS
14335 /*CFI_REL_OFFSET ss,0*/
14336 @@ -135,24 +157,49 @@ ENTRY(ia32_sysenter_target)
14337 CFI_REL_OFFSET rsp,0
14338 pushfq_cfi
14339 /*CFI_REL_OFFSET rflags,0*/
14340 - movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
14341 - CFI_REGISTER rip,r10
14342 + orl $X86_EFLAGS_IF,(%rsp)
14343 + GET_THREAD_INFO(%r11)
14344 + movl TI_sysenter_return(%r11), %r11d
14345 + CFI_REGISTER rip,r11
14346 pushq_cfi $__USER32_CS
14347 /*CFI_REL_OFFSET cs,0*/
14348 movl %eax, %eax
14349 - pushq_cfi %r10
14350 + pushq_cfi %r11
14351 CFI_REL_OFFSET rip,0
14352 pushq_cfi %rax
14353 cld
14354 SAVE_ARGS 0,1,0
14355 + pax_enter_kernel_user
14356 +
14357 +#ifdef CONFIG_PAX_RANDKSTACK
14358 + pax_erase_kstack
14359 +#endif
14360 +
14361 + /*
14362 + * No need to follow this irqs on/off section: the syscall
14363 + * disabled irqs, here we enable it straight after entry:
14364 + */
14365 + ENABLE_INTERRUPTS(CLBR_NONE)
14366 /* no need to do an access_ok check here because rbp has been
14367 32bit zero extended */
14368 +
14369 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14370 + addq pax_user_shadow_base,%rbp
14371 + ASM_PAX_OPEN_USERLAND
14372 +#endif
14373 +
14374 ASM_STAC
14375 1: movl (%rbp),%ebp
14376 _ASM_EXTABLE(1b,ia32_badarg)
14377 ASM_CLAC
14378 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14379 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14380 +
14381 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14382 + ASM_PAX_CLOSE_USERLAND
14383 +#endif
14384 +
14385 + GET_THREAD_INFO(%r11)
14386 + orl $TS_COMPAT,TI_status(%r11)
14387 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14388 CFI_REMEMBER_STATE
14389 jnz sysenter_tracesys
14390 cmpq $(IA32_NR_syscalls-1),%rax
14391 @@ -162,15 +209,18 @@ sysenter_do_call:
14392 sysenter_dispatch:
14393 call *ia32_sys_call_table(,%rax,8)
14394 movq %rax,RAX-ARGOFFSET(%rsp)
14395 + GET_THREAD_INFO(%r11)
14396 DISABLE_INTERRUPTS(CLBR_NONE)
14397 TRACE_IRQS_OFF
14398 - testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14399 + testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14400 jnz sysexit_audit
14401 sysexit_from_sys_call:
14402 - andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14403 + pax_exit_kernel_user
14404 + pax_erase_kstack
14405 + andl $~TS_COMPAT,TI_status(%r11)
14406 /* clear IF, that popfq doesn't enable interrupts early */
14407 - andl $~0x200,EFLAGS-R11(%rsp)
14408 - movl RIP-R11(%rsp),%edx /* User %eip */
14409 + andl $~X86_EFLAGS_IF,EFLAGS(%rsp)
14410 + movl RIP(%rsp),%edx /* User %eip */
14411 CFI_REGISTER rip,rdx
14412 RESTORE_ARGS 0,24,0,0,0,0
14413 xorq %r8,%r8
14414 @@ -193,6 +243,9 @@ sysexit_from_sys_call:
14415 movl %eax,%esi /* 2nd arg: syscall number */
14416 movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
14417 call __audit_syscall_entry
14418 +
14419 + pax_erase_kstack
14420 +
14421 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
14422 cmpq $(IA32_NR_syscalls-1),%rax
14423 ja ia32_badsys
14424 @@ -204,7 +257,7 @@ sysexit_from_sys_call:
14425 .endm
14426
14427 .macro auditsys_exit exit
14428 - testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14429 + testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14430 jnz ia32_ret_from_sys_call
14431 TRACE_IRQS_ON
14432 ENABLE_INTERRUPTS(CLBR_NONE)
14433 @@ -215,11 +268,12 @@ sysexit_from_sys_call:
14434 1: setbe %al /* 1 if error, 0 if not */
14435 movzbl %al,%edi /* zero-extend that into %edi */
14436 call __audit_syscall_exit
14437 + GET_THREAD_INFO(%r11)
14438 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
14439 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14440 DISABLE_INTERRUPTS(CLBR_NONE)
14441 TRACE_IRQS_OFF
14442 - testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14443 + testl %edi,TI_flags(%r11)
14444 jz \exit
14445 CLEAR_RREGS -ARGOFFSET
14446 jmp int_with_check
14447 @@ -237,7 +291,7 @@ sysexit_audit:
14448
14449 sysenter_tracesys:
14450 #ifdef CONFIG_AUDITSYSCALL
14451 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14452 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14453 jz sysenter_auditsys
14454 #endif
14455 SAVE_REST
14456 @@ -249,6 +303,9 @@ sysenter_tracesys:
14457 RESTORE_REST
14458 cmpq $(IA32_NR_syscalls-1),%rax
14459 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14460 +
14461 + pax_erase_kstack
14462 +
14463 jmp sysenter_do_call
14464 CFI_ENDPROC
14465 ENDPROC(ia32_sysenter_target)
14466 @@ -276,19 +333,25 @@ ENDPROC(ia32_sysenter_target)
14467 ENTRY(ia32_cstar_target)
14468 CFI_STARTPROC32 simple
14469 CFI_SIGNAL_FRAME
14470 - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
14471 + CFI_DEF_CFA rsp,0
14472 CFI_REGISTER rip,rcx
14473 /*CFI_REGISTER rflags,r11*/
14474 SWAPGS_UNSAFE_STACK
14475 movl %esp,%r8d
14476 CFI_REGISTER rsp,r8
14477 movq PER_CPU_VAR(kernel_stack),%rsp
14478 + SAVE_ARGS 8*6,0,0
14479 + pax_enter_kernel_user
14480 +
14481 +#ifdef CONFIG_PAX_RANDKSTACK
14482 + pax_erase_kstack
14483 +#endif
14484 +
14485 /*
14486 * No need to follow this irqs on/off section: the syscall
14487 * disabled irqs and here we enable it straight after entry:
14488 */
14489 ENABLE_INTERRUPTS(CLBR_NONE)
14490 - SAVE_ARGS 8,0,0
14491 movl %eax,%eax /* zero extension */
14492 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14493 movq %rcx,RIP-ARGOFFSET(%rsp)
14494 @@ -304,12 +367,25 @@ ENTRY(ia32_cstar_target)
14495 /* no need to do an access_ok check here because r8 has been
14496 32bit zero extended */
14497 /* hardware stack frame is complete now */
14498 +
14499 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14500 + ASM_PAX_OPEN_USERLAND
14501 + movq pax_user_shadow_base,%r8
14502 + addq RSP-ARGOFFSET(%rsp),%r8
14503 +#endif
14504 +
14505 ASM_STAC
14506 1: movl (%r8),%r9d
14507 _ASM_EXTABLE(1b,ia32_badarg)
14508 ASM_CLAC
14509 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14510 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14511 +
14512 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14513 + ASM_PAX_CLOSE_USERLAND
14514 +#endif
14515 +
14516 + GET_THREAD_INFO(%r11)
14517 + orl $TS_COMPAT,TI_status(%r11)
14518 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14519 CFI_REMEMBER_STATE
14520 jnz cstar_tracesys
14521 cmpq $IA32_NR_syscalls-1,%rax
14522 @@ -319,13 +395,16 @@ cstar_do_call:
14523 cstar_dispatch:
14524 call *ia32_sys_call_table(,%rax,8)
14525 movq %rax,RAX-ARGOFFSET(%rsp)
14526 + GET_THREAD_INFO(%r11)
14527 DISABLE_INTERRUPTS(CLBR_NONE)
14528 TRACE_IRQS_OFF
14529 - testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14530 + testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14531 jnz sysretl_audit
14532 sysretl_from_sys_call:
14533 - andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14534 - RESTORE_ARGS 0,-ARG_SKIP,0,0,0
14535 + pax_exit_kernel_user
14536 + pax_erase_kstack
14537 + andl $~TS_COMPAT,TI_status(%r11)
14538 + RESTORE_ARGS 0,-ORIG_RAX,0,0,0
14539 movl RIP-ARGOFFSET(%rsp),%ecx
14540 CFI_REGISTER rip,rcx
14541 movl EFLAGS-ARGOFFSET(%rsp),%r11d
14542 @@ -352,7 +431,7 @@ sysretl_audit:
14543
14544 cstar_tracesys:
14545 #ifdef CONFIG_AUDITSYSCALL
14546 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14547 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14548 jz cstar_auditsys
14549 #endif
14550 xchgl %r9d,%ebp
14551 @@ -366,11 +445,19 @@ cstar_tracesys:
14552 xchgl %ebp,%r9d
14553 cmpq $(IA32_NR_syscalls-1),%rax
14554 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14555 +
14556 + pax_erase_kstack
14557 +
14558 jmp cstar_do_call
14559 END(ia32_cstar_target)
14560
14561 ia32_badarg:
14562 ASM_CLAC
14563 +
14564 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14565 + ASM_PAX_CLOSE_USERLAND
14566 +#endif
14567 +
14568 movq $-EFAULT,%rax
14569 jmp ia32_sysret
14570 CFI_ENDPROC
14571 @@ -407,19 +494,26 @@ ENTRY(ia32_syscall)
14572 CFI_REL_OFFSET rip,RIP-RIP
14573 PARAVIRT_ADJUST_EXCEPTION_FRAME
14574 SWAPGS
14575 - /*
14576 - * No need to follow this irqs on/off section: the syscall
14577 - * disabled irqs and here we enable it straight after entry:
14578 - */
14579 - ENABLE_INTERRUPTS(CLBR_NONE)
14580 movl %eax,%eax
14581 pushq_cfi %rax
14582 cld
14583 /* note the registers are not zero extended to the sf.
14584 this could be a problem. */
14585 SAVE_ARGS 0,1,0
14586 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14587 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14588 + pax_enter_kernel_user
14589 +
14590 +#ifdef CONFIG_PAX_RANDKSTACK
14591 + pax_erase_kstack
14592 +#endif
14593 +
14594 + /*
14595 + * No need to follow this irqs on/off section: the syscall
14596 + * disabled irqs and here we enable it straight after entry:
14597 + */
14598 + ENABLE_INTERRUPTS(CLBR_NONE)
14599 + GET_THREAD_INFO(%r11)
14600 + orl $TS_COMPAT,TI_status(%r11)
14601 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14602 jnz ia32_tracesys
14603 cmpq $(IA32_NR_syscalls-1),%rax
14604 ja ia32_badsys
14605 @@ -442,6 +536,9 @@ ia32_tracesys:
14606 RESTORE_REST
14607 cmpq $(IA32_NR_syscalls-1),%rax
14608 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
14609 +
14610 + pax_erase_kstack
14611 +
14612 jmp ia32_do_call
14613 END(ia32_syscall)
14614
14615 diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
14616 index 8e0ceec..af13504 100644
14617 --- a/arch/x86/ia32/sys_ia32.c
14618 +++ b/arch/x86/ia32/sys_ia32.c
14619 @@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
14620 */
14621 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
14622 {
14623 - typeof(ubuf->st_uid) uid = 0;
14624 - typeof(ubuf->st_gid) gid = 0;
14625 + typeof(((struct stat64 *)0)->st_uid) uid = 0;
14626 + typeof(((struct stat64 *)0)->st_gid) gid = 0;
14627 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
14628 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
14629 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
14630 diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
14631 index 372231c..51b537d 100644
14632 --- a/arch/x86/include/asm/alternative-asm.h
14633 +++ b/arch/x86/include/asm/alternative-asm.h
14634 @@ -18,6 +18,45 @@
14635 .endm
14636 #endif
14637
14638 +#ifdef KERNEXEC_PLUGIN
14639 + .macro pax_force_retaddr_bts rip=0
14640 + btsq $63,\rip(%rsp)
14641 + .endm
14642 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
14643 + .macro pax_force_retaddr rip=0, reload=0
14644 + btsq $63,\rip(%rsp)
14645 + .endm
14646 + .macro pax_force_fptr ptr
14647 + btsq $63,\ptr
14648 + .endm
14649 + .macro pax_set_fptr_mask
14650 + .endm
14651 +#endif
14652 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
14653 + .macro pax_force_retaddr rip=0, reload=0
14654 + .if \reload
14655 + pax_set_fptr_mask
14656 + .endif
14657 + orq %r12,\rip(%rsp)
14658 + .endm
14659 + .macro pax_force_fptr ptr
14660 + orq %r12,\ptr
14661 + .endm
14662 + .macro pax_set_fptr_mask
14663 + movabs $0x8000000000000000,%r12
14664 + .endm
14665 +#endif
14666 +#else
14667 + .macro pax_force_retaddr rip=0, reload=0
14668 + .endm
14669 + .macro pax_force_fptr ptr
14670 + .endm
14671 + .macro pax_force_retaddr_bts rip=0
14672 + .endm
14673 + .macro pax_set_fptr_mask
14674 + .endm
14675 +#endif
14676 +
14677 .macro altinstruction_entry orig alt feature orig_len alt_len
14678 .long \orig - .
14679 .long \alt - .
14680 diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
14681 index 0a3f9c9..c9d081d 100644
14682 --- a/arch/x86/include/asm/alternative.h
14683 +++ b/arch/x86/include/asm/alternative.h
14684 @@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
14685 ".pushsection .discard,\"aw\",@progbits\n" \
14686 DISCARD_ENTRY(1) \
14687 ".popsection\n" \
14688 - ".pushsection .altinstr_replacement, \"ax\"\n" \
14689 + ".pushsection .altinstr_replacement, \"a\"\n" \
14690 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
14691 ".popsection"
14692
14693 @@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
14694 DISCARD_ENTRY(1) \
14695 DISCARD_ENTRY(2) \
14696 ".popsection\n" \
14697 - ".pushsection .altinstr_replacement, \"ax\"\n" \
14698 + ".pushsection .altinstr_replacement, \"a\"\n" \
14699 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
14700 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
14701 ".popsection"
14702 diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
14703 index 1d2091a..f5074c1 100644
14704 --- a/arch/x86/include/asm/apic.h
14705 +++ b/arch/x86/include/asm/apic.h
14706 @@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
14707
14708 #ifdef CONFIG_X86_LOCAL_APIC
14709
14710 -extern unsigned int apic_verbosity;
14711 +extern int apic_verbosity;
14712 extern int local_apic_timer_c2_ok;
14713
14714 extern int disable_apic;
14715 diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
14716 index 20370c6..a2eb9b0 100644
14717 --- a/arch/x86/include/asm/apm.h
14718 +++ b/arch/x86/include/asm/apm.h
14719 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
14720 __asm__ __volatile__(APM_DO_ZERO_SEGS
14721 "pushl %%edi\n\t"
14722 "pushl %%ebp\n\t"
14723 - "lcall *%%cs:apm_bios_entry\n\t"
14724 + "lcall *%%ss:apm_bios_entry\n\t"
14725 "setc %%al\n\t"
14726 "popl %%ebp\n\t"
14727 "popl %%edi\n\t"
14728 @@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
14729 __asm__ __volatile__(APM_DO_ZERO_SEGS
14730 "pushl %%edi\n\t"
14731 "pushl %%ebp\n\t"
14732 - "lcall *%%cs:apm_bios_entry\n\t"
14733 + "lcall *%%ss:apm_bios_entry\n\t"
14734 "setc %%bl\n\t"
14735 "popl %%ebp\n\t"
14736 "popl %%edi\n\t"
14737 diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
14738 index b17f4f4..9620151 100644
14739 --- a/arch/x86/include/asm/atomic.h
14740 +++ b/arch/x86/include/asm/atomic.h
14741 @@ -23,7 +23,18 @@
14742 */
14743 static inline int atomic_read(const atomic_t *v)
14744 {
14745 - return (*(volatile int *)&(v)->counter);
14746 + return (*(volatile const int *)&(v)->counter);
14747 +}
14748 +
14749 +/**
14750 + * atomic_read_unchecked - read atomic variable
14751 + * @v: pointer of type atomic_unchecked_t
14752 + *
14753 + * Atomically reads the value of @v.
14754 + */
14755 +static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
14756 +{
14757 + return (*(volatile const int *)&(v)->counter);
14758 }
14759
14760 /**
14761 @@ -39,6 +50,18 @@ static inline void atomic_set(atomic_t *v, int i)
14762 }
14763
14764 /**
14765 + * atomic_set_unchecked - set atomic variable
14766 + * @v: pointer of type atomic_unchecked_t
14767 + * @i: required value
14768 + *
14769 + * Atomically sets the value of @v to @i.
14770 + */
14771 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
14772 +{
14773 + v->counter = i;
14774 +}
14775 +
14776 +/**
14777 * atomic_add - add integer to atomic variable
14778 * @i: integer value to add
14779 * @v: pointer of type atomic_t
14780 @@ -47,7 +70,29 @@ static inline void atomic_set(atomic_t *v, int i)
14781 */
14782 static inline void atomic_add(int i, atomic_t *v)
14783 {
14784 - asm volatile(LOCK_PREFIX "addl %1,%0"
14785 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
14786 +
14787 +#ifdef CONFIG_PAX_REFCOUNT
14788 + "jno 0f\n"
14789 + LOCK_PREFIX "subl %1,%0\n"
14790 + "int $4\n0:\n"
14791 + _ASM_EXTABLE(0b, 0b)
14792 +#endif
14793 +
14794 + : "+m" (v->counter)
14795 + : "ir" (i));
14796 +}
14797 +
14798 +/**
14799 + * atomic_add_unchecked - add integer to atomic variable
14800 + * @i: integer value to add
14801 + * @v: pointer of type atomic_unchecked_t
14802 + *
14803 + * Atomically adds @i to @v.
14804 + */
14805 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
14806 +{
14807 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
14808 : "+m" (v->counter)
14809 : "ir" (i));
14810 }
14811 @@ -61,7 +106,29 @@ static inline void atomic_add(int i, atomic_t *v)
14812 */
14813 static inline void atomic_sub(int i, atomic_t *v)
14814 {
14815 - asm volatile(LOCK_PREFIX "subl %1,%0"
14816 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
14817 +
14818 +#ifdef CONFIG_PAX_REFCOUNT
14819 + "jno 0f\n"
14820 + LOCK_PREFIX "addl %1,%0\n"
14821 + "int $4\n0:\n"
14822 + _ASM_EXTABLE(0b, 0b)
14823 +#endif
14824 +
14825 + : "+m" (v->counter)
14826 + : "ir" (i));
14827 +}
14828 +
14829 +/**
14830 + * atomic_sub_unchecked - subtract integer from atomic variable
14831 + * @i: integer value to subtract
14832 + * @v: pointer of type atomic_unchecked_t
14833 + *
14834 + * Atomically subtracts @i from @v.
14835 + */
14836 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
14837 +{
14838 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
14839 : "+m" (v->counter)
14840 : "ir" (i));
14841 }
14842 @@ -77,7 +144,7 @@ static inline void atomic_sub(int i, atomic_t *v)
14843 */
14844 static inline int atomic_sub_and_test(int i, atomic_t *v)
14845 {
14846 - GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
14847 + GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
14848 }
14849
14850 /**
14851 @@ -88,7 +155,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
14852 */
14853 static inline void atomic_inc(atomic_t *v)
14854 {
14855 - asm volatile(LOCK_PREFIX "incl %0"
14856 + asm volatile(LOCK_PREFIX "incl %0\n"
14857 +
14858 +#ifdef CONFIG_PAX_REFCOUNT
14859 + "jno 0f\n"
14860 + LOCK_PREFIX "decl %0\n"
14861 + "int $4\n0:\n"
14862 + _ASM_EXTABLE(0b, 0b)
14863 +#endif
14864 +
14865 + : "+m" (v->counter));
14866 +}
14867 +
14868 +/**
14869 + * atomic_inc_unchecked - increment atomic variable
14870 + * @v: pointer of type atomic_unchecked_t
14871 + *
14872 + * Atomically increments @v by 1.
14873 + */
14874 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
14875 +{
14876 + asm volatile(LOCK_PREFIX "incl %0\n"
14877 : "+m" (v->counter));
14878 }
14879
14880 @@ -100,7 +187,27 @@ static inline void atomic_inc(atomic_t *v)
14881 */
14882 static inline void atomic_dec(atomic_t *v)
14883 {
14884 - asm volatile(LOCK_PREFIX "decl %0"
14885 + asm volatile(LOCK_PREFIX "decl %0\n"
14886 +
14887 +#ifdef CONFIG_PAX_REFCOUNT
14888 + "jno 0f\n"
14889 + LOCK_PREFIX "incl %0\n"
14890 + "int $4\n0:\n"
14891 + _ASM_EXTABLE(0b, 0b)
14892 +#endif
14893 +
14894 + : "+m" (v->counter));
14895 +}
14896 +
14897 +/**
14898 + * atomic_dec_unchecked - decrement atomic variable
14899 + * @v: pointer of type atomic_unchecked_t
14900 + *
14901 + * Atomically decrements @v by 1.
14902 + */
14903 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
14904 +{
14905 + asm volatile(LOCK_PREFIX "decl %0\n"
14906 : "+m" (v->counter));
14907 }
14908
14909 @@ -114,7 +221,7 @@ static inline void atomic_dec(atomic_t *v)
14910 */
14911 static inline int atomic_dec_and_test(atomic_t *v)
14912 {
14913 - GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
14914 + GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
14915 }
14916
14917 /**
14918 @@ -127,7 +234,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
14919 */
14920 static inline int atomic_inc_and_test(atomic_t *v)
14921 {
14922 - GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
14923 + GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
14924 +}
14925 +
14926 +/**
14927 + * atomic_inc_and_test_unchecked - increment and test
14928 + * @v: pointer of type atomic_unchecked_t
14929 + *
14930 + * Atomically increments @v by 1
14931 + * and returns true if the result is zero, or false for all
14932 + * other cases.
14933 + */
14934 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
14935 +{
14936 + GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
14937 }
14938
14939 /**
14940 @@ -141,7 +261,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
14941 */
14942 static inline int atomic_add_negative(int i, atomic_t *v)
14943 {
14944 - GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
14945 + GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
14946 }
14947
14948 /**
14949 @@ -153,6 +273,18 @@ static inline int atomic_add_negative(int i, atomic_t *v)
14950 */
14951 static inline int atomic_add_return(int i, atomic_t *v)
14952 {
14953 + return i + xadd_check_overflow(&v->counter, i);
14954 +}
14955 +
14956 +/**
14957 + * atomic_add_return_unchecked - add integer and return
14958 + * @i: integer value to add
14959 + * @v: pointer of type atomic_unchecked_t
14960 + *
14961 + * Atomically adds @i to @v and returns @i + @v
14962 + */
14963 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
14964 +{
14965 return i + xadd(&v->counter, i);
14966 }
14967
14968 @@ -169,9 +301,18 @@ static inline int atomic_sub_return(int i, atomic_t *v)
14969 }
14970
14971 #define atomic_inc_return(v) (atomic_add_return(1, v))
14972 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
14973 +{
14974 + return atomic_add_return_unchecked(1, v);
14975 +}
14976 #define atomic_dec_return(v) (atomic_sub_return(1, v))
14977
14978 -static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
14979 +static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
14980 +{
14981 + return cmpxchg(&v->counter, old, new);
14982 +}
14983 +
14984 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
14985 {
14986 return cmpxchg(&v->counter, old, new);
14987 }
14988 @@ -181,6 +322,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
14989 return xchg(&v->counter, new);
14990 }
14991
14992 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
14993 +{
14994 + return xchg(&v->counter, new);
14995 +}
14996 +
14997 /**
14998 * __atomic_add_unless - add unless the number is already a given value
14999 * @v: pointer of type atomic_t
15000 @@ -190,14 +336,27 @@ static inline int atomic_xchg(atomic_t *v, int new)
15001 * Atomically adds @a to @v, so long as @v was not already @u.
15002 * Returns the old value of @v.
15003 */
15004 -static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15005 +static inline int __intentional_overflow(-1) __atomic_add_unless(atomic_t *v, int a, int u)
15006 {
15007 - int c, old;
15008 + int c, old, new;
15009 c = atomic_read(v);
15010 for (;;) {
15011 - if (unlikely(c == (u)))
15012 + if (unlikely(c == u))
15013 break;
15014 - old = atomic_cmpxchg((v), c, c + (a));
15015 +
15016 + asm volatile("addl %2,%0\n"
15017 +
15018 +#ifdef CONFIG_PAX_REFCOUNT
15019 + "jno 0f\n"
15020 + "subl %2,%0\n"
15021 + "int $4\n0:\n"
15022 + _ASM_EXTABLE(0b, 0b)
15023 +#endif
15024 +
15025 + : "=r" (new)
15026 + : "0" (c), "ir" (a));
15027 +
15028 + old = atomic_cmpxchg(v, c, new);
15029 if (likely(old == c))
15030 break;
15031 c = old;
15032 @@ -206,6 +365,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15033 }
15034
15035 /**
15036 + * atomic_inc_not_zero_hint - increment if not null
15037 + * @v: pointer of type atomic_t
15038 + * @hint: probable value of the atomic before the increment
15039 + *
15040 + * This version of atomic_inc_not_zero() gives a hint of probable
15041 + * value of the atomic. This helps processor to not read the memory
15042 + * before doing the atomic read/modify/write cycle, lowering
15043 + * number of bus transactions on some arches.
15044 + *
15045 + * Returns: 0 if increment was not done, 1 otherwise.
15046 + */
15047 +#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15048 +static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15049 +{
15050 + int val, c = hint, new;
15051 +
15052 + /* sanity test, should be removed by compiler if hint is a constant */
15053 + if (!hint)
15054 + return __atomic_add_unless(v, 1, 0);
15055 +
15056 + do {
15057 + asm volatile("incl %0\n"
15058 +
15059 +#ifdef CONFIG_PAX_REFCOUNT
15060 + "jno 0f\n"
15061 + "decl %0\n"
15062 + "int $4\n0:\n"
15063 + _ASM_EXTABLE(0b, 0b)
15064 +#endif
15065 +
15066 + : "=r" (new)
15067 + : "0" (c));
15068 +
15069 + val = atomic_cmpxchg(v, c, new);
15070 + if (val == c)
15071 + return 1;
15072 + c = val;
15073 + } while (c);
15074 +
15075 + return 0;
15076 +}
15077 +
15078 +/**
15079 * atomic_inc_short - increment of a short integer
15080 * @v: pointer to type int
15081 *
15082 @@ -234,14 +436,37 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
15083 #endif
15084
15085 /* These are x86-specific, used by some header files */
15086 -#define atomic_clear_mask(mask, addr) \
15087 - asm volatile(LOCK_PREFIX "andl %0,%1" \
15088 - : : "r" (~(mask)), "m" (*(addr)) : "memory")
15089 +static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15090 +{
15091 + asm volatile(LOCK_PREFIX "andl %1,%0"
15092 + : "+m" (v->counter)
15093 + : "r" (~(mask))
15094 + : "memory");
15095 +}
15096
15097 -#define atomic_set_mask(mask, addr) \
15098 - asm volatile(LOCK_PREFIX "orl %0,%1" \
15099 - : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15100 - : "memory")
15101 +static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15102 +{
15103 + asm volatile(LOCK_PREFIX "andl %1,%0"
15104 + : "+m" (v->counter)
15105 + : "r" (~(mask))
15106 + : "memory");
15107 +}
15108 +
15109 +static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15110 +{
15111 + asm volatile(LOCK_PREFIX "orl %1,%0"
15112 + : "+m" (v->counter)
15113 + : "r" (mask)
15114 + : "memory");
15115 +}
15116 +
15117 +static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15118 +{
15119 + asm volatile(LOCK_PREFIX "orl %1,%0"
15120 + : "+m" (v->counter)
15121 + : "r" (mask)
15122 + : "memory");
15123 +}
15124
15125 /* Atomic operations are already serializing on x86 */
15126 #define smp_mb__before_atomic_dec() barrier()
15127 diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15128 index b154de7..bf18a5a 100644
15129 --- a/arch/x86/include/asm/atomic64_32.h
15130 +++ b/arch/x86/include/asm/atomic64_32.h
15131 @@ -12,6 +12,14 @@ typedef struct {
15132 u64 __aligned(8) counter;
15133 } atomic64_t;
15134
15135 +#ifdef CONFIG_PAX_REFCOUNT
15136 +typedef struct {
15137 + u64 __aligned(8) counter;
15138 +} atomic64_unchecked_t;
15139 +#else
15140 +typedef atomic64_t atomic64_unchecked_t;
15141 +#endif
15142 +
15143 #define ATOMIC64_INIT(val) { (val) }
15144
15145 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15146 @@ -37,21 +45,31 @@ typedef struct {
15147 ATOMIC64_DECL_ONE(sym##_386)
15148
15149 ATOMIC64_DECL_ONE(add_386);
15150 +ATOMIC64_DECL_ONE(add_unchecked_386);
15151 ATOMIC64_DECL_ONE(sub_386);
15152 +ATOMIC64_DECL_ONE(sub_unchecked_386);
15153 ATOMIC64_DECL_ONE(inc_386);
15154 +ATOMIC64_DECL_ONE(inc_unchecked_386);
15155 ATOMIC64_DECL_ONE(dec_386);
15156 +ATOMIC64_DECL_ONE(dec_unchecked_386);
15157 #endif
15158
15159 #define alternative_atomic64(f, out, in...) \
15160 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15161
15162 ATOMIC64_DECL(read);
15163 +ATOMIC64_DECL(read_unchecked);
15164 ATOMIC64_DECL(set);
15165 +ATOMIC64_DECL(set_unchecked);
15166 ATOMIC64_DECL(xchg);
15167 ATOMIC64_DECL(add_return);
15168 +ATOMIC64_DECL(add_return_unchecked);
15169 ATOMIC64_DECL(sub_return);
15170 +ATOMIC64_DECL(sub_return_unchecked);
15171 ATOMIC64_DECL(inc_return);
15172 +ATOMIC64_DECL(inc_return_unchecked);
15173 ATOMIC64_DECL(dec_return);
15174 +ATOMIC64_DECL(dec_return_unchecked);
15175 ATOMIC64_DECL(dec_if_positive);
15176 ATOMIC64_DECL(inc_not_zero);
15177 ATOMIC64_DECL(add_unless);
15178 @@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15179 }
15180
15181 /**
15182 + * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15183 + * @p: pointer to type atomic64_unchecked_t
15184 + * @o: expected value
15185 + * @n: new value
15186 + *
15187 + * Atomically sets @v to @n if it was equal to @o and returns
15188 + * the old value.
15189 + */
15190 +
15191 +static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15192 +{
15193 + return cmpxchg64(&v->counter, o, n);
15194 +}
15195 +
15196 +/**
15197 * atomic64_xchg - xchg atomic64 variable
15198 * @v: pointer to type atomic64_t
15199 * @n: value to assign
15200 @@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15201 }
15202
15203 /**
15204 + * atomic64_set_unchecked - set atomic64 variable
15205 + * @v: pointer to type atomic64_unchecked_t
15206 + * @n: value to assign
15207 + *
15208 + * Atomically sets the value of @v to @n.
15209 + */
15210 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15211 +{
15212 + unsigned high = (unsigned)(i >> 32);
15213 + unsigned low = (unsigned)i;
15214 + alternative_atomic64(set, /* no output */,
15215 + "S" (v), "b" (low), "c" (high)
15216 + : "eax", "edx", "memory");
15217 +}
15218 +
15219 +/**
15220 * atomic64_read - read atomic64 variable
15221 * @v: pointer to type atomic64_t
15222 *
15223 @@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15224 }
15225
15226 /**
15227 + * atomic64_read_unchecked - read atomic64 variable
15228 + * @v: pointer to type atomic64_unchecked_t
15229 + *
15230 + * Atomically reads the value of @v and returns it.
15231 + */
15232 +static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15233 +{
15234 + long long r;
15235 + alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15236 + return r;
15237 + }
15238 +
15239 +/**
15240 * atomic64_add_return - add and return
15241 * @i: integer value to add
15242 * @v: pointer to type atomic64_t
15243 @@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15244 return i;
15245 }
15246
15247 +/**
15248 + * atomic64_add_return_unchecked - add and return
15249 + * @i: integer value to add
15250 + * @v: pointer to type atomic64_unchecked_t
15251 + *
15252 + * Atomically adds @i to @v and returns @i + *@v
15253 + */
15254 +static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15255 +{
15256 + alternative_atomic64(add_return_unchecked,
15257 + ASM_OUTPUT2("+A" (i), "+c" (v)),
15258 + ASM_NO_INPUT_CLOBBER("memory"));
15259 + return i;
15260 +}
15261 +
15262 /*
15263 * Other variants with different arithmetic operators:
15264 */
15265 @@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15266 return a;
15267 }
15268
15269 +static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15270 +{
15271 + long long a;
15272 + alternative_atomic64(inc_return_unchecked, "=&A" (a),
15273 + "S" (v) : "memory", "ecx");
15274 + return a;
15275 +}
15276 +
15277 static inline long long atomic64_dec_return(atomic64_t *v)
15278 {
15279 long long a;
15280 @@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15281 }
15282
15283 /**
15284 + * atomic64_add_unchecked - add integer to atomic64 variable
15285 + * @i: integer value to add
15286 + * @v: pointer to type atomic64_unchecked_t
15287 + *
15288 + * Atomically adds @i to @v.
15289 + */
15290 +static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15291 +{
15292 + __alternative_atomic64(add_unchecked, add_return_unchecked,
15293 + ASM_OUTPUT2("+A" (i), "+c" (v)),
15294 + ASM_NO_INPUT_CLOBBER("memory"));
15295 + return i;
15296 +}
15297 +
15298 +/**
15299 * atomic64_sub - subtract the atomic64 variable
15300 * @i: integer value to subtract
15301 * @v: pointer to type atomic64_t
15302 diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15303 index 46e9052..ae45136 100644
15304 --- a/arch/x86/include/asm/atomic64_64.h
15305 +++ b/arch/x86/include/asm/atomic64_64.h
15306 @@ -18,7 +18,19 @@
15307 */
15308 static inline long atomic64_read(const atomic64_t *v)
15309 {
15310 - return (*(volatile long *)&(v)->counter);
15311 + return (*(volatile const long *)&(v)->counter);
15312 +}
15313 +
15314 +/**
15315 + * atomic64_read_unchecked - read atomic64 variable
15316 + * @v: pointer of type atomic64_unchecked_t
15317 + *
15318 + * Atomically reads the value of @v.
15319 + * Doesn't imply a read memory barrier.
15320 + */
15321 +static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15322 +{
15323 + return (*(volatile const long *)&(v)->counter);
15324 }
15325
15326 /**
15327 @@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15328 }
15329
15330 /**
15331 + * atomic64_set_unchecked - set atomic64 variable
15332 + * @v: pointer to type atomic64_unchecked_t
15333 + * @i: required value
15334 + *
15335 + * Atomically sets the value of @v to @i.
15336 + */
15337 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15338 +{
15339 + v->counter = i;
15340 +}
15341 +
15342 +/**
15343 * atomic64_add - add integer to atomic64 variable
15344 * @i: integer value to add
15345 * @v: pointer to type atomic64_t
15346 @@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15347 */
15348 static inline void atomic64_add(long i, atomic64_t *v)
15349 {
15350 + asm volatile(LOCK_PREFIX "addq %1,%0\n"
15351 +
15352 +#ifdef CONFIG_PAX_REFCOUNT
15353 + "jno 0f\n"
15354 + LOCK_PREFIX "subq %1,%0\n"
15355 + "int $4\n0:\n"
15356 + _ASM_EXTABLE(0b, 0b)
15357 +#endif
15358 +
15359 + : "=m" (v->counter)
15360 + : "er" (i), "m" (v->counter));
15361 +}
15362 +
15363 +/**
15364 + * atomic64_add_unchecked - add integer to atomic64 variable
15365 + * @i: integer value to add
15366 + * @v: pointer to type atomic64_unchecked_t
15367 + *
15368 + * Atomically adds @i to @v.
15369 + */
15370 +static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15371 +{
15372 asm volatile(LOCK_PREFIX "addq %1,%0"
15373 : "=m" (v->counter)
15374 : "er" (i), "m" (v->counter));
15375 @@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15376 */
15377 static inline void atomic64_sub(long i, atomic64_t *v)
15378 {
15379 - asm volatile(LOCK_PREFIX "subq %1,%0"
15380 + asm volatile(LOCK_PREFIX "subq %1,%0\n"
15381 +
15382 +#ifdef CONFIG_PAX_REFCOUNT
15383 + "jno 0f\n"
15384 + LOCK_PREFIX "addq %1,%0\n"
15385 + "int $4\n0:\n"
15386 + _ASM_EXTABLE(0b, 0b)
15387 +#endif
15388 +
15389 + : "=m" (v->counter)
15390 + : "er" (i), "m" (v->counter));
15391 +}
15392 +
15393 +/**
15394 + * atomic64_sub_unchecked - subtract the atomic64 variable
15395 + * @i: integer value to subtract
15396 + * @v: pointer to type atomic64_unchecked_t
15397 + *
15398 + * Atomically subtracts @i from @v.
15399 + */
15400 +static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15401 +{
15402 + asm volatile(LOCK_PREFIX "subq %1,%0\n"
15403 : "=m" (v->counter)
15404 : "er" (i), "m" (v->counter));
15405 }
15406 @@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15407 */
15408 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15409 {
15410 - GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15411 + GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15412 }
15413
15414 /**
15415 @@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15416 */
15417 static inline void atomic64_inc(atomic64_t *v)
15418 {
15419 + asm volatile(LOCK_PREFIX "incq %0\n"
15420 +
15421 +#ifdef CONFIG_PAX_REFCOUNT
15422 + "jno 0f\n"
15423 + LOCK_PREFIX "decq %0\n"
15424 + "int $4\n0:\n"
15425 + _ASM_EXTABLE(0b, 0b)
15426 +#endif
15427 +
15428 + : "=m" (v->counter)
15429 + : "m" (v->counter));
15430 +}
15431 +
15432 +/**
15433 + * atomic64_inc_unchecked - increment atomic64 variable
15434 + * @v: pointer to type atomic64_unchecked_t
15435 + *
15436 + * Atomically increments @v by 1.
15437 + */
15438 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15439 +{
15440 asm volatile(LOCK_PREFIX "incq %0"
15441 : "=m" (v->counter)
15442 : "m" (v->counter));
15443 @@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15444 */
15445 static inline void atomic64_dec(atomic64_t *v)
15446 {
15447 - asm volatile(LOCK_PREFIX "decq %0"
15448 + asm volatile(LOCK_PREFIX "decq %0\n"
15449 +
15450 +#ifdef CONFIG_PAX_REFCOUNT
15451 + "jno 0f\n"
15452 + LOCK_PREFIX "incq %0\n"
15453 + "int $4\n0:\n"
15454 + _ASM_EXTABLE(0b, 0b)
15455 +#endif
15456 +
15457 + : "=m" (v->counter)
15458 + : "m" (v->counter));
15459 +}
15460 +
15461 +/**
15462 + * atomic64_dec_unchecked - decrement atomic64 variable
15463 + * @v: pointer to type atomic64_t
15464 + *
15465 + * Atomically decrements @v by 1.
15466 + */
15467 +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15468 +{
15469 + asm volatile(LOCK_PREFIX "decq %0\n"
15470 : "=m" (v->counter)
15471 : "m" (v->counter));
15472 }
15473 @@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15474 */
15475 static inline int atomic64_dec_and_test(atomic64_t *v)
15476 {
15477 - GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15478 + GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15479 }
15480
15481 /**
15482 @@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15483 */
15484 static inline int atomic64_inc_and_test(atomic64_t *v)
15485 {
15486 - GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15487 + GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15488 }
15489
15490 /**
15491 @@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15492 */
15493 static inline int atomic64_add_negative(long i, atomic64_t *v)
15494 {
15495 - GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15496 + GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15497 }
15498
15499 /**
15500 @@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15501 */
15502 static inline long atomic64_add_return(long i, atomic64_t *v)
15503 {
15504 + return i + xadd_check_overflow(&v->counter, i);
15505 +}
15506 +
15507 +/**
15508 + * atomic64_add_return_unchecked - add and return
15509 + * @i: integer value to add
15510 + * @v: pointer to type atomic64_unchecked_t
15511 + *
15512 + * Atomically adds @i to @v and returns @i + @v
15513 + */
15514 +static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15515 +{
15516 return i + xadd(&v->counter, i);
15517 }
15518
15519 @@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15520 }
15521
15522 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15523 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15524 +{
15525 + return atomic64_add_return_unchecked(1, v);
15526 +}
15527 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15528
15529 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15530 @@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15531 return cmpxchg(&v->counter, old, new);
15532 }
15533
15534 +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15535 +{
15536 + return cmpxchg(&v->counter, old, new);
15537 +}
15538 +
15539 static inline long atomic64_xchg(atomic64_t *v, long new)
15540 {
15541 return xchg(&v->counter, new);
15542 @@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15543 */
15544 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15545 {
15546 - long c, old;
15547 + long c, old, new;
15548 c = atomic64_read(v);
15549 for (;;) {
15550 - if (unlikely(c == (u)))
15551 + if (unlikely(c == u))
15552 break;
15553 - old = atomic64_cmpxchg((v), c, c + (a));
15554 +
15555 + asm volatile("add %2,%0\n"
15556 +
15557 +#ifdef CONFIG_PAX_REFCOUNT
15558 + "jno 0f\n"
15559 + "sub %2,%0\n"
15560 + "int $4\n0:\n"
15561 + _ASM_EXTABLE(0b, 0b)
15562 +#endif
15563 +
15564 + : "=r" (new)
15565 + : "0" (c), "ir" (a));
15566 +
15567 + old = atomic64_cmpxchg(v, c, new);
15568 if (likely(old == c))
15569 break;
15570 c = old;
15571 }
15572 - return c != (u);
15573 + return c != u;
15574 }
15575
15576 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
15577 diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
15578 index 9fc1af7..fc71228 100644
15579 --- a/arch/x86/include/asm/bitops.h
15580 +++ b/arch/x86/include/asm/bitops.h
15581 @@ -49,7 +49,7 @@
15582 * a mask operation on a byte.
15583 */
15584 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
15585 -#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
15586 +#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
15587 #define CONST_MASK(nr) (1 << ((nr) & 7))
15588
15589 /**
15590 @@ -205,7 +205,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
15591 */
15592 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
15593 {
15594 - GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
15595 + GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
15596 }
15597
15598 /**
15599 @@ -251,7 +251,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
15600 */
15601 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
15602 {
15603 - GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
15604 + GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
15605 }
15606
15607 /**
15608 @@ -304,7 +304,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
15609 */
15610 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
15611 {
15612 - GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
15613 + GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
15614 }
15615
15616 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
15617 @@ -345,7 +345,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
15618 *
15619 * Undefined if no bit exists, so code should check against 0 first.
15620 */
15621 -static inline unsigned long __ffs(unsigned long word)
15622 +static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
15623 {
15624 asm("rep; bsf %1,%0"
15625 : "=r" (word)
15626 @@ -359,7 +359,7 @@ static inline unsigned long __ffs(unsigned long word)
15627 *
15628 * Undefined if no zero exists, so code should check against ~0UL first.
15629 */
15630 -static inline unsigned long ffz(unsigned long word)
15631 +static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
15632 {
15633 asm("rep; bsf %1,%0"
15634 : "=r" (word)
15635 @@ -373,7 +373,7 @@ static inline unsigned long ffz(unsigned long word)
15636 *
15637 * Undefined if no set bit exists, so code should check against 0 first.
15638 */
15639 -static inline unsigned long __fls(unsigned long word)
15640 +static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
15641 {
15642 asm("bsr %1,%0"
15643 : "=r" (word)
15644 @@ -436,7 +436,7 @@ static inline int ffs(int x)
15645 * set bit if value is nonzero. The last (most significant) bit is
15646 * at position 32.
15647 */
15648 -static inline int fls(int x)
15649 +static inline int __intentional_overflow(-1) fls(int x)
15650 {
15651 int r;
15652
15653 @@ -478,7 +478,7 @@ static inline int fls(int x)
15654 * at position 64.
15655 */
15656 #ifdef CONFIG_X86_64
15657 -static __always_inline int fls64(__u64 x)
15658 +static __always_inline long fls64(__u64 x)
15659 {
15660 int bitpos = -1;
15661 /*
15662 diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
15663 index 4fa687a..60f2d39 100644
15664 --- a/arch/x86/include/asm/boot.h
15665 +++ b/arch/x86/include/asm/boot.h
15666 @@ -6,10 +6,15 @@
15667 #include <uapi/asm/boot.h>
15668
15669 /* Physical address where kernel should be loaded. */
15670 -#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
15671 +#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
15672 + (CONFIG_PHYSICAL_ALIGN - 1)) \
15673 & ~(CONFIG_PHYSICAL_ALIGN - 1))
15674
15675 +#ifndef __ASSEMBLY__
15676 +extern unsigned char __LOAD_PHYSICAL_ADDR[];
15677 +#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
15678 +#endif
15679 +
15680 /* Minimum kernel alignment, as a power of two */
15681 #ifdef CONFIG_X86_64
15682 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
15683 diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
15684 index 48f99f1..d78ebf9 100644
15685 --- a/arch/x86/include/asm/cache.h
15686 +++ b/arch/x86/include/asm/cache.h
15687 @@ -5,12 +5,13 @@
15688
15689 /* L1 cache line size */
15690 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
15691 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
15692 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
15693
15694 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
15695 +#define __read_only __attribute__((__section__(".data..read_only")))
15696
15697 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
15698 -#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
15699 +#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
15700
15701 #ifdef CONFIG_X86_VSMP
15702 #ifdef CONFIG_SMP
15703 diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
15704 index 9863ee3..4a1f8e1 100644
15705 --- a/arch/x86/include/asm/cacheflush.h
15706 +++ b/arch/x86/include/asm/cacheflush.h
15707 @@ -27,7 +27,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
15708 unsigned long pg_flags = pg->flags & _PGMT_MASK;
15709
15710 if (pg_flags == _PGMT_DEFAULT)
15711 - return -1;
15712 + return ~0UL;
15713 else if (pg_flags == _PGMT_WC)
15714 return _PAGE_CACHE_WC;
15715 else if (pg_flags == _PGMT_UC_MINUS)
15716 diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
15717 index cb4c73b..c473c29 100644
15718 --- a/arch/x86/include/asm/calling.h
15719 +++ b/arch/x86/include/asm/calling.h
15720 @@ -82,103 +82,113 @@ For 32-bit we have the following conventions - kernel is built with
15721 #define RSP 152
15722 #define SS 160
15723
15724 -#define ARGOFFSET R11
15725 -#define SWFRAME ORIG_RAX
15726 +#define ARGOFFSET R15
15727
15728 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1
15729 - subq $9*8+\addskip, %rsp
15730 - CFI_ADJUST_CFA_OFFSET 9*8+\addskip
15731 - movq_cfi rdi, 8*8
15732 - movq_cfi rsi, 7*8
15733 - movq_cfi rdx, 6*8
15734 + subq $ORIG_RAX-ARGOFFSET+\addskip, %rsp
15735 + CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+\addskip
15736 + movq_cfi rdi, RDI
15737 + movq_cfi rsi, RSI
15738 + movq_cfi rdx, RDX
15739
15740 .if \save_rcx
15741 - movq_cfi rcx, 5*8
15742 + movq_cfi rcx, RCX
15743 .endif
15744
15745 - movq_cfi rax, 4*8
15746 + movq_cfi rax, RAX
15747
15748 .if \save_r891011
15749 - movq_cfi r8, 3*8
15750 - movq_cfi r9, 2*8
15751 - movq_cfi r10, 1*8
15752 - movq_cfi r11, 0*8
15753 + movq_cfi r8, R8
15754 + movq_cfi r9, R9
15755 + movq_cfi r10, R10
15756 + movq_cfi r11, R11
15757 .endif
15758
15759 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15760 + movq_cfi r12, R12
15761 +#endif
15762 +
15763 .endm
15764
15765 -#define ARG_SKIP (9*8)
15766 +#define ARG_SKIP ORIG_RAX
15767
15768 .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
15769 rstor_r8910=1, rstor_rdx=1
15770 +
15771 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15772 + movq_cfi_restore R12, r12
15773 +#endif
15774 +
15775 .if \rstor_r11
15776 - movq_cfi_restore 0*8, r11
15777 + movq_cfi_restore R11, r11
15778 .endif
15779
15780 .if \rstor_r8910
15781 - movq_cfi_restore 1*8, r10
15782 - movq_cfi_restore 2*8, r9
15783 - movq_cfi_restore 3*8, r8
15784 + movq_cfi_restore R10, r10
15785 + movq_cfi_restore R9, r9
15786 + movq_cfi_restore R8, r8
15787 .endif
15788
15789 .if \rstor_rax
15790 - movq_cfi_restore 4*8, rax
15791 + movq_cfi_restore RAX, rax
15792 .endif
15793
15794 .if \rstor_rcx
15795 - movq_cfi_restore 5*8, rcx
15796 + movq_cfi_restore RCX, rcx
15797 .endif
15798
15799 .if \rstor_rdx
15800 - movq_cfi_restore 6*8, rdx
15801 + movq_cfi_restore RDX, rdx
15802 .endif
15803
15804 - movq_cfi_restore 7*8, rsi
15805 - movq_cfi_restore 8*8, rdi
15806 + movq_cfi_restore RSI, rsi
15807 + movq_cfi_restore RDI, rdi
15808
15809 - .if ARG_SKIP+\addskip > 0
15810 - addq $ARG_SKIP+\addskip, %rsp
15811 - CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
15812 + .if ORIG_RAX+\addskip > 0
15813 + addq $ORIG_RAX+\addskip, %rsp
15814 + CFI_ADJUST_CFA_OFFSET -(ORIG_RAX+\addskip)
15815 .endif
15816 .endm
15817
15818 - .macro LOAD_ARGS offset, skiprax=0
15819 - movq \offset(%rsp), %r11
15820 - movq \offset+8(%rsp), %r10
15821 - movq \offset+16(%rsp), %r9
15822 - movq \offset+24(%rsp), %r8
15823 - movq \offset+40(%rsp), %rcx
15824 - movq \offset+48(%rsp), %rdx
15825 - movq \offset+56(%rsp), %rsi
15826 - movq \offset+64(%rsp), %rdi
15827 + .macro LOAD_ARGS skiprax=0
15828 + movq R11(%rsp), %r11
15829 + movq R10(%rsp), %r10
15830 + movq R9(%rsp), %r9
15831 + movq R8(%rsp), %r8
15832 + movq RCX(%rsp), %rcx
15833 + movq RDX(%rsp), %rdx
15834 + movq RSI(%rsp), %rsi
15835 + movq RDI(%rsp), %rdi
15836 .if \skiprax
15837 .else
15838 - movq \offset+72(%rsp), %rax
15839 + movq RAX(%rsp), %rax
15840 .endif
15841 .endm
15842
15843 -#define REST_SKIP (6*8)
15844 -
15845 .macro SAVE_REST
15846 - subq $REST_SKIP, %rsp
15847 - CFI_ADJUST_CFA_OFFSET REST_SKIP
15848 - movq_cfi rbx, 5*8
15849 - movq_cfi rbp, 4*8
15850 - movq_cfi r12, 3*8
15851 - movq_cfi r13, 2*8
15852 - movq_cfi r14, 1*8
15853 - movq_cfi r15, 0*8
15854 + movq_cfi rbx, RBX
15855 + movq_cfi rbp, RBP
15856 +
15857 +#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15858 + movq_cfi r12, R12
15859 +#endif
15860 +
15861 + movq_cfi r13, R13
15862 + movq_cfi r14, R14
15863 + movq_cfi r15, R15
15864 .endm
15865
15866 .macro RESTORE_REST
15867 - movq_cfi_restore 0*8, r15
15868 - movq_cfi_restore 1*8, r14
15869 - movq_cfi_restore 2*8, r13
15870 - movq_cfi_restore 3*8, r12
15871 - movq_cfi_restore 4*8, rbp
15872 - movq_cfi_restore 5*8, rbx
15873 - addq $REST_SKIP, %rsp
15874 - CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
15875 + movq_cfi_restore R15, r15
15876 + movq_cfi_restore R14, r14
15877 + movq_cfi_restore R13, r13
15878 +
15879 +#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15880 + movq_cfi_restore R12, r12
15881 +#endif
15882 +
15883 + movq_cfi_restore RBP, rbp
15884 + movq_cfi_restore RBX, rbx
15885 .endm
15886
15887 .macro SAVE_ALL
15888 diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
15889 index f50de69..2b0a458 100644
15890 --- a/arch/x86/include/asm/checksum_32.h
15891 +++ b/arch/x86/include/asm/checksum_32.h
15892 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
15893 int len, __wsum sum,
15894 int *src_err_ptr, int *dst_err_ptr);
15895
15896 +asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
15897 + int len, __wsum sum,
15898 + int *src_err_ptr, int *dst_err_ptr);
15899 +
15900 +asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
15901 + int len, __wsum sum,
15902 + int *src_err_ptr, int *dst_err_ptr);
15903 +
15904 /*
15905 * Note: when you get a NULL pointer exception here this means someone
15906 * passed in an incorrect kernel address to one of these functions.
15907 @@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
15908
15909 might_sleep();
15910 stac();
15911 - ret = csum_partial_copy_generic((__force void *)src, dst,
15912 + ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
15913 len, sum, err_ptr, NULL);
15914 clac();
15915
15916 @@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
15917 might_sleep();
15918 if (access_ok(VERIFY_WRITE, dst, len)) {
15919 stac();
15920 - ret = csum_partial_copy_generic(src, (__force void *)dst,
15921 + ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
15922 len, sum, NULL, err_ptr);
15923 clac();
15924 return ret;
15925 diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
15926 index d47786a..2d8883e 100644
15927 --- a/arch/x86/include/asm/cmpxchg.h
15928 +++ b/arch/x86/include/asm/cmpxchg.h
15929 @@ -14,8 +14,12 @@ extern void __cmpxchg_wrong_size(void)
15930 __compiletime_error("Bad argument size for cmpxchg");
15931 extern void __xadd_wrong_size(void)
15932 __compiletime_error("Bad argument size for xadd");
15933 +extern void __xadd_check_overflow_wrong_size(void)
15934 + __compiletime_error("Bad argument size for xadd_check_overflow");
15935 extern void __add_wrong_size(void)
15936 __compiletime_error("Bad argument size for add");
15937 +extern void __add_check_overflow_wrong_size(void)
15938 + __compiletime_error("Bad argument size for add_check_overflow");
15939
15940 /*
15941 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
15942 @@ -67,6 +71,38 @@ extern void __add_wrong_size(void)
15943 __ret; \
15944 })
15945
15946 +#ifdef CONFIG_PAX_REFCOUNT
15947 +#define __xchg_op_check_overflow(ptr, arg, op, lock) \
15948 + ({ \
15949 + __typeof__ (*(ptr)) __ret = (arg); \
15950 + switch (sizeof(*(ptr))) { \
15951 + case __X86_CASE_L: \
15952 + asm volatile (lock #op "l %0, %1\n" \
15953 + "jno 0f\n" \
15954 + "mov %0,%1\n" \
15955 + "int $4\n0:\n" \
15956 + _ASM_EXTABLE(0b, 0b) \
15957 + : "+r" (__ret), "+m" (*(ptr)) \
15958 + : : "memory", "cc"); \
15959 + break; \
15960 + case __X86_CASE_Q: \
15961 + asm volatile (lock #op "q %q0, %1\n" \
15962 + "jno 0f\n" \
15963 + "mov %0,%1\n" \
15964 + "int $4\n0:\n" \
15965 + _ASM_EXTABLE(0b, 0b) \
15966 + : "+r" (__ret), "+m" (*(ptr)) \
15967 + : : "memory", "cc"); \
15968 + break; \
15969 + default: \
15970 + __ ## op ## _check_overflow_wrong_size(); \
15971 + } \
15972 + __ret; \
15973 + })
15974 +#else
15975 +#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
15976 +#endif
15977 +
15978 /*
15979 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
15980 * Since this is generally used to protect other memory information, we
15981 @@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
15982 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
15983 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
15984
15985 +#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
15986 +#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
15987 +
15988 #define __add(ptr, inc, lock) \
15989 ({ \
15990 __typeof__ (*(ptr)) __ret = (inc); \
15991 diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
15992 index 59c6c40..5e0b22c 100644
15993 --- a/arch/x86/include/asm/compat.h
15994 +++ b/arch/x86/include/asm/compat.h
15995 @@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
15996 typedef u32 compat_uint_t;
15997 typedef u32 compat_ulong_t;
15998 typedef u64 __attribute__((aligned(4))) compat_u64;
15999 -typedef u32 compat_uptr_t;
16000 +typedef u32 __user compat_uptr_t;
16001
16002 struct compat_timespec {
16003 compat_time_t tv_sec;
16004 diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16005 index e099f95..5aa0fb2 100644
16006 --- a/arch/x86/include/asm/cpufeature.h
16007 +++ b/arch/x86/include/asm/cpufeature.h
16008 @@ -203,7 +203,7 @@
16009 #define X86_FEATURE_DECODEASSISTS (8*32+12) /* AMD Decode Assists support */
16010 #define X86_FEATURE_PAUSEFILTER (8*32+13) /* AMD filtered pause intercept */
16011 #define X86_FEATURE_PFTHRESHOLD (8*32+14) /* AMD pause filter threshold */
16012 -
16013 +#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16014
16015 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16016 #define X86_FEATURE_FSGSBASE (9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16017 @@ -211,7 +211,7 @@
16018 #define X86_FEATURE_BMI1 (9*32+ 3) /* 1st group bit manipulation extensions */
16019 #define X86_FEATURE_HLE (9*32+ 4) /* Hardware Lock Elision */
16020 #define X86_FEATURE_AVX2 (9*32+ 5) /* AVX2 instructions */
16021 -#define X86_FEATURE_SMEP (9*32+ 7) /* Supervisor Mode Execution Protection */
16022 +#define X86_FEATURE_SMEP (9*32+ 7) /* Supervisor Mode Execution Prevention */
16023 #define X86_FEATURE_BMI2 (9*32+ 8) /* 2nd group bit manipulation extensions */
16024 #define X86_FEATURE_ERMS (9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16025 #define X86_FEATURE_INVPCID (9*32+10) /* Invalidate Processor Context ID */
16026 @@ -354,6 +354,7 @@ extern const char * const x86_power_flags[32];
16027 #undef cpu_has_centaur_mcr
16028 #define cpu_has_centaur_mcr 0
16029
16030 +#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16031 #endif /* CONFIG_X86_64 */
16032
16033 #if __GNUC__ >= 4
16034 @@ -406,7 +407,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16035
16036 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16037 t_warn:
16038 - warn_pre_alternatives();
16039 + if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
16040 + warn_pre_alternatives();
16041 return false;
16042 #endif
16043
16044 @@ -426,7 +428,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16045 ".section .discard,\"aw\",@progbits\n"
16046 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16047 ".previous\n"
16048 - ".section .altinstr_replacement,\"ax\"\n"
16049 + ".section .altinstr_replacement,\"a\"\n"
16050 "3: movb $1,%0\n"
16051 "4:\n"
16052 ".previous\n"
16053 @@ -463,7 +465,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16054 " .byte 2b - 1b\n" /* src len */
16055 " .byte 4f - 3f\n" /* repl len */
16056 ".previous\n"
16057 - ".section .altinstr_replacement,\"ax\"\n"
16058 + ".section .altinstr_replacement,\"a\"\n"
16059 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
16060 "4:\n"
16061 ".previous\n"
16062 @@ -496,7 +498,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16063 ".section .discard,\"aw\",@progbits\n"
16064 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16065 ".previous\n"
16066 - ".section .altinstr_replacement,\"ax\"\n"
16067 + ".section .altinstr_replacement,\"a\"\n"
16068 "3: movb $0,%0\n"
16069 "4:\n"
16070 ".previous\n"
16071 @@ -510,7 +512,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16072 ".section .discard,\"aw\",@progbits\n"
16073 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16074 ".previous\n"
16075 - ".section .altinstr_replacement,\"ax\"\n"
16076 + ".section .altinstr_replacement,\"a\"\n"
16077 "5: movb $1,%0\n"
16078 "6:\n"
16079 ".previous\n"
16080 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16081 index 50d033a..37deb26 100644
16082 --- a/arch/x86/include/asm/desc.h
16083 +++ b/arch/x86/include/asm/desc.h
16084 @@ -4,6 +4,7 @@
16085 #include <asm/desc_defs.h>
16086 #include <asm/ldt.h>
16087 #include <asm/mmu.h>
16088 +#include <asm/pgtable.h>
16089
16090 #include <linux/smp.h>
16091 #include <linux/percpu.h>
16092 @@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16093
16094 desc->type = (info->read_exec_only ^ 1) << 1;
16095 desc->type |= info->contents << 2;
16096 + desc->type |= info->seg_not_present ^ 1;
16097
16098 desc->s = 1;
16099 desc->dpl = 0x3;
16100 @@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16101 }
16102
16103 extern struct desc_ptr idt_descr;
16104 -extern gate_desc idt_table[];
16105 -extern struct desc_ptr debug_idt_descr;
16106 -extern gate_desc debug_idt_table[];
16107 -
16108 -struct gdt_page {
16109 - struct desc_struct gdt[GDT_ENTRIES];
16110 -} __attribute__((aligned(PAGE_SIZE)));
16111 -
16112 -DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16113 +extern gate_desc idt_table[IDT_ENTRIES];
16114 +extern const struct desc_ptr debug_idt_descr;
16115 +extern gate_desc debug_idt_table[IDT_ENTRIES];
16116
16117 +extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16118 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16119 {
16120 - return per_cpu(gdt_page, cpu).gdt;
16121 + return cpu_gdt_table[cpu];
16122 }
16123
16124 #ifdef CONFIG_X86_64
16125 @@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16126 unsigned long base, unsigned dpl, unsigned flags,
16127 unsigned short seg)
16128 {
16129 - gate->a = (seg << 16) | (base & 0xffff);
16130 - gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16131 + gate->gate.offset_low = base;
16132 + gate->gate.seg = seg;
16133 + gate->gate.reserved = 0;
16134 + gate->gate.type = type;
16135 + gate->gate.s = 0;
16136 + gate->gate.dpl = dpl;
16137 + gate->gate.p = 1;
16138 + gate->gate.offset_high = base >> 16;
16139 }
16140
16141 #endif
16142 @@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16143
16144 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16145 {
16146 + pax_open_kernel();
16147 memcpy(&idt[entry], gate, sizeof(*gate));
16148 + pax_close_kernel();
16149 }
16150
16151 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16152 {
16153 + pax_open_kernel();
16154 memcpy(&ldt[entry], desc, 8);
16155 + pax_close_kernel();
16156 }
16157
16158 static inline void
16159 @@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16160 default: size = sizeof(*gdt); break;
16161 }
16162
16163 + pax_open_kernel();
16164 memcpy(&gdt[entry], desc, size);
16165 + pax_close_kernel();
16166 }
16167
16168 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16169 @@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16170
16171 static inline void native_load_tr_desc(void)
16172 {
16173 + pax_open_kernel();
16174 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16175 + pax_close_kernel();
16176 }
16177
16178 static inline void native_load_gdt(const struct desc_ptr *dtr)
16179 @@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16180 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16181 unsigned int i;
16182
16183 + pax_open_kernel();
16184 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16185 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16186 + pax_close_kernel();
16187 }
16188
16189 #define _LDT_empty(info) \
16190 @@ -287,7 +300,7 @@ static inline void load_LDT(mm_context_t *pc)
16191 preempt_enable();
16192 }
16193
16194 -static inline unsigned long get_desc_base(const struct desc_struct *desc)
16195 +static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16196 {
16197 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16198 }
16199 @@ -311,7 +324,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16200 }
16201
16202 #ifdef CONFIG_X86_64
16203 -static inline void set_nmi_gate(int gate, void *addr)
16204 +static inline void set_nmi_gate(int gate, const void *addr)
16205 {
16206 gate_desc s;
16207
16208 @@ -321,14 +334,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16209 #endif
16210
16211 #ifdef CONFIG_TRACING
16212 -extern struct desc_ptr trace_idt_descr;
16213 -extern gate_desc trace_idt_table[];
16214 +extern const struct desc_ptr trace_idt_descr;
16215 +extern gate_desc trace_idt_table[IDT_ENTRIES];
16216 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16217 {
16218 write_idt_entry(trace_idt_table, entry, gate);
16219 }
16220
16221 -static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16222 +static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16223 unsigned dpl, unsigned ist, unsigned seg)
16224 {
16225 gate_desc s;
16226 @@ -348,7 +361,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16227 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16228 #endif
16229
16230 -static inline void _set_gate(int gate, unsigned type, void *addr,
16231 +static inline void _set_gate(int gate, unsigned type, const void *addr,
16232 unsigned dpl, unsigned ist, unsigned seg)
16233 {
16234 gate_desc s;
16235 @@ -371,9 +384,9 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16236 #define set_intr_gate(n, addr) \
16237 do { \
16238 BUG_ON((unsigned)n > 0xFF); \
16239 - _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16240 + _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16241 __KERNEL_CS); \
16242 - _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16243 + _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16244 0, 0, __KERNEL_CS); \
16245 } while (0)
16246
16247 @@ -401,19 +414,19 @@ static inline void alloc_system_vector(int vector)
16248 /*
16249 * This routine sets up an interrupt gate at directory privilege level 3.
16250 */
16251 -static inline void set_system_intr_gate(unsigned int n, void *addr)
16252 +static inline void set_system_intr_gate(unsigned int n, const void *addr)
16253 {
16254 BUG_ON((unsigned)n > 0xFF);
16255 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16256 }
16257
16258 -static inline void set_system_trap_gate(unsigned int n, void *addr)
16259 +static inline void set_system_trap_gate(unsigned int n, const void *addr)
16260 {
16261 BUG_ON((unsigned)n > 0xFF);
16262 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16263 }
16264
16265 -static inline void set_trap_gate(unsigned int n, void *addr)
16266 +static inline void set_trap_gate(unsigned int n, const void *addr)
16267 {
16268 BUG_ON((unsigned)n > 0xFF);
16269 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16270 @@ -422,16 +435,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16271 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16272 {
16273 BUG_ON((unsigned)n > 0xFF);
16274 - _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16275 + _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16276 }
16277
16278 -static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16279 +static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16280 {
16281 BUG_ON((unsigned)n > 0xFF);
16282 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16283 }
16284
16285 -static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16286 +static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16287 {
16288 BUG_ON((unsigned)n > 0xFF);
16289 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16290 @@ -503,4 +516,17 @@ static inline void load_current_idt(void)
16291 else
16292 load_idt((const struct desc_ptr *)&idt_descr);
16293 }
16294 +
16295 +#ifdef CONFIG_X86_32
16296 +static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16297 +{
16298 + struct desc_struct d;
16299 +
16300 + if (likely(limit))
16301 + limit = (limit - 1UL) >> PAGE_SHIFT;
16302 + pack_descriptor(&d, base, limit, 0xFB, 0xC);
16303 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16304 +}
16305 +#endif
16306 +
16307 #endif /* _ASM_X86_DESC_H */
16308 diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16309 index 278441f..b95a174 100644
16310 --- a/arch/x86/include/asm/desc_defs.h
16311 +++ b/arch/x86/include/asm/desc_defs.h
16312 @@ -31,6 +31,12 @@ struct desc_struct {
16313 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16314 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16315 };
16316 + struct {
16317 + u16 offset_low;
16318 + u16 seg;
16319 + unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16320 + unsigned offset_high: 16;
16321 + } gate;
16322 };
16323 } __attribute__((packed));
16324
16325 diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16326 index ced283a..ffe04cc 100644
16327 --- a/arch/x86/include/asm/div64.h
16328 +++ b/arch/x86/include/asm/div64.h
16329 @@ -39,7 +39,7 @@
16330 __mod; \
16331 })
16332
16333 -static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16334 +static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16335 {
16336 union {
16337 u64 v64;
16338 diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16339 index 9c999c1..3860cb8 100644
16340 --- a/arch/x86/include/asm/elf.h
16341 +++ b/arch/x86/include/asm/elf.h
16342 @@ -243,7 +243,25 @@ extern int force_personality32;
16343 the loader. We need to make sure that it is out of the way of the program
16344 that it will "exec", and that there is sufficient room for the brk. */
16345
16346 +#ifdef CONFIG_PAX_SEGMEXEC
16347 +#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16348 +#else
16349 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16350 +#endif
16351 +
16352 +#ifdef CONFIG_PAX_ASLR
16353 +#ifdef CONFIG_X86_32
16354 +#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16355 +
16356 +#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16357 +#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16358 +#else
16359 +#define PAX_ELF_ET_DYN_BASE 0x400000UL
16360 +
16361 +#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16362 +#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16363 +#endif
16364 +#endif
16365
16366 /* This yields a mask that user programs can use to figure out what
16367 instruction set this CPU supports. This could be done in user space,
16368 @@ -296,16 +314,12 @@ do { \
16369
16370 #define ARCH_DLINFO \
16371 do { \
16372 - if (vdso_enabled) \
16373 - NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16374 - (unsigned long)current->mm->context.vdso); \
16375 + NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16376 } while (0)
16377
16378 #define ARCH_DLINFO_X32 \
16379 do { \
16380 - if (vdso_enabled) \
16381 - NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16382 - (unsigned long)current->mm->context.vdso); \
16383 + NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16384 } while (0)
16385
16386 #define AT_SYSINFO 32
16387 @@ -320,7 +334,7 @@ else \
16388
16389 #endif /* !CONFIG_X86_32 */
16390
16391 -#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16392 +#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16393
16394 #define VDSO_ENTRY \
16395 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
16396 @@ -336,9 +350,6 @@ extern int x32_setup_additional_pages(struct linux_binprm *bprm,
16397 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
16398 #define compat_arch_setup_additional_pages syscall32_setup_pages
16399
16400 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
16401 -#define arch_randomize_brk arch_randomize_brk
16402 -
16403 /*
16404 * True on X86_32 or when emulating IA32 on X86_64
16405 */
16406 diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16407 index 77a99ac..39ff7f5 100644
16408 --- a/arch/x86/include/asm/emergency-restart.h
16409 +++ b/arch/x86/include/asm/emergency-restart.h
16410 @@ -1,6 +1,6 @@
16411 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16412 #define _ASM_X86_EMERGENCY_RESTART_H
16413
16414 -extern void machine_emergency_restart(void);
16415 +extern void machine_emergency_restart(void) __noreturn;
16416
16417 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16418 diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16419 index d3d7469..677ef72 100644
16420 --- a/arch/x86/include/asm/floppy.h
16421 +++ b/arch/x86/include/asm/floppy.h
16422 @@ -229,18 +229,18 @@ static struct fd_routine_l {
16423 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16424 } fd_routine[] = {
16425 {
16426 - request_dma,
16427 - free_dma,
16428 - get_dma_residue,
16429 - dma_mem_alloc,
16430 - hard_dma_setup
16431 + ._request_dma = request_dma,
16432 + ._free_dma = free_dma,
16433 + ._get_dma_residue = get_dma_residue,
16434 + ._dma_mem_alloc = dma_mem_alloc,
16435 + ._dma_setup = hard_dma_setup
16436 },
16437 {
16438 - vdma_request_dma,
16439 - vdma_nop,
16440 - vdma_get_dma_residue,
16441 - vdma_mem_alloc,
16442 - vdma_dma_setup
16443 + ._request_dma = vdma_request_dma,
16444 + ._free_dma = vdma_nop,
16445 + ._get_dma_residue = vdma_get_dma_residue,
16446 + ._dma_mem_alloc = vdma_mem_alloc,
16447 + ._dma_setup = vdma_dma_setup
16448 }
16449 };
16450
16451 diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16452 index cea1c76..6c0d79b 100644
16453 --- a/arch/x86/include/asm/fpu-internal.h
16454 +++ b/arch/x86/include/asm/fpu-internal.h
16455 @@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16456 #define user_insn(insn, output, input...) \
16457 ({ \
16458 int err; \
16459 + pax_open_userland(); \
16460 asm volatile(ASM_STAC "\n" \
16461 - "1:" #insn "\n\t" \
16462 + "1:" \
16463 + __copyuser_seg \
16464 + #insn "\n\t" \
16465 "2: " ASM_CLAC "\n" \
16466 ".section .fixup,\"ax\"\n" \
16467 "3: movl $-1,%[err]\n" \
16468 @@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16469 _ASM_EXTABLE(1b, 3b) \
16470 : [err] "=r" (err), output \
16471 : "0"(0), input); \
16472 + pax_close_userland(); \
16473 err; \
16474 })
16475
16476 @@ -298,7 +302,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16477 "fnclex\n\t"
16478 "emms\n\t"
16479 "fildl %P[addr]" /* set F?P to defined value */
16480 - : : [addr] "m" (tsk->thread.fpu.has_fpu));
16481 + : : [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
16482 }
16483
16484 return fpu_restore_checking(&tsk->thread.fpu);
16485 diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16486 index b4c1f54..e290c08 100644
16487 --- a/arch/x86/include/asm/futex.h
16488 +++ b/arch/x86/include/asm/futex.h
16489 @@ -12,6 +12,7 @@
16490 #include <asm/smap.h>
16491
16492 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16493 + typecheck(u32 __user *, uaddr); \
16494 asm volatile("\t" ASM_STAC "\n" \
16495 "1:\t" insn "\n" \
16496 "2:\t" ASM_CLAC "\n" \
16497 @@ -20,15 +21,16 @@
16498 "\tjmp\t2b\n" \
16499 "\t.previous\n" \
16500 _ASM_EXTABLE(1b, 3b) \
16501 - : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16502 + : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16503 : "i" (-EFAULT), "0" (oparg), "1" (0))
16504
16505 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16506 + typecheck(u32 __user *, uaddr); \
16507 asm volatile("\t" ASM_STAC "\n" \
16508 "1:\tmovl %2, %0\n" \
16509 "\tmovl\t%0, %3\n" \
16510 "\t" insn "\n" \
16511 - "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16512 + "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16513 "\tjnz\t1b\n" \
16514 "3:\t" ASM_CLAC "\n" \
16515 "\t.section .fixup,\"ax\"\n" \
16516 @@ -38,7 +40,7 @@
16517 _ASM_EXTABLE(1b, 4b) \
16518 _ASM_EXTABLE(2b, 4b) \
16519 : "=&a" (oldval), "=&r" (ret), \
16520 - "+m" (*uaddr), "=&r" (tem) \
16521 + "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
16522 : "r" (oparg), "i" (-EFAULT), "1" (0))
16523
16524 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16525 @@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16526
16527 pagefault_disable();
16528
16529 + pax_open_userland();
16530 switch (op) {
16531 case FUTEX_OP_SET:
16532 - __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
16533 + __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
16534 break;
16535 case FUTEX_OP_ADD:
16536 - __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
16537 + __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
16538 uaddr, oparg);
16539 break;
16540 case FUTEX_OP_OR:
16541 @@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16542 default:
16543 ret = -ENOSYS;
16544 }
16545 + pax_close_userland();
16546
16547 pagefault_enable();
16548
16549 diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
16550 index 67d69b8..50e4b77 100644
16551 --- a/arch/x86/include/asm/hw_irq.h
16552 +++ b/arch/x86/include/asm/hw_irq.h
16553 @@ -165,8 +165,8 @@ extern void setup_ioapic_dest(void);
16554 extern void enable_IO_APIC(void);
16555
16556 /* Statistics */
16557 -extern atomic_t irq_err_count;
16558 -extern atomic_t irq_mis_count;
16559 +extern atomic_unchecked_t irq_err_count;
16560 +extern atomic_unchecked_t irq_mis_count;
16561
16562 /* EISA */
16563 extern void eisa_set_level_irq(unsigned int irq);
16564 diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
16565 index a203659..9889f1c 100644
16566 --- a/arch/x86/include/asm/i8259.h
16567 +++ b/arch/x86/include/asm/i8259.h
16568 @@ -62,7 +62,7 @@ struct legacy_pic {
16569 void (*init)(int auto_eoi);
16570 int (*irq_pending)(unsigned int irq);
16571 void (*make_irq)(unsigned int irq);
16572 -};
16573 +} __do_const;
16574
16575 extern struct legacy_pic *legacy_pic;
16576 extern struct legacy_pic null_legacy_pic;
16577 diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
16578 index 91d9c69..dfae7d0 100644
16579 --- a/arch/x86/include/asm/io.h
16580 +++ b/arch/x86/include/asm/io.h
16581 @@ -51,12 +51,12 @@ static inline void name(type val, volatile void __iomem *addr) \
16582 "m" (*(volatile type __force *)addr) barrier); }
16583
16584 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
16585 -build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
16586 -build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
16587 +build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
16588 +build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
16589
16590 build_mmio_read(__readb, "b", unsigned char, "=q", )
16591 -build_mmio_read(__readw, "w", unsigned short, "=r", )
16592 -build_mmio_read(__readl, "l", unsigned int, "=r", )
16593 +build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
16594 +build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
16595
16596 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
16597 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
16598 @@ -184,7 +184,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
16599 return ioremap_nocache(offset, size);
16600 }
16601
16602 -extern void iounmap(volatile void __iomem *addr);
16603 +extern void iounmap(const volatile void __iomem *addr);
16604
16605 extern void set_iounmap_nonlazy(void);
16606
16607 @@ -194,6 +194,17 @@ extern void set_iounmap_nonlazy(void);
16608
16609 #include <linux/vmalloc.h>
16610
16611 +#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
16612 +static inline int valid_phys_addr_range(unsigned long addr, size_t count)
16613 +{
16614 + return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
16615 +}
16616 +
16617 +static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
16618 +{
16619 + return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
16620 +}
16621 +
16622 /*
16623 * Convert a virtual cached pointer to an uncached pointer
16624 */
16625 diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
16626 index bba3cf8..06bc8da 100644
16627 --- a/arch/x86/include/asm/irqflags.h
16628 +++ b/arch/x86/include/asm/irqflags.h
16629 @@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
16630 sti; \
16631 sysexit
16632
16633 +#define GET_CR0_INTO_RDI mov %cr0, %rdi
16634 +#define SET_RDI_INTO_CR0 mov %rdi, %cr0
16635 +#define GET_CR3_INTO_RDI mov %cr3, %rdi
16636 +#define SET_RDI_INTO_CR3 mov %rdi, %cr3
16637 +
16638 #else
16639 #define INTERRUPT_RETURN iret
16640 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
16641 diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
16642 index 9454c16..e4100e3 100644
16643 --- a/arch/x86/include/asm/kprobes.h
16644 +++ b/arch/x86/include/asm/kprobes.h
16645 @@ -38,13 +38,8 @@ typedef u8 kprobe_opcode_t;
16646 #define RELATIVEJUMP_SIZE 5
16647 #define RELATIVECALL_OPCODE 0xe8
16648 #define RELATIVE_ADDR_SIZE 4
16649 -#define MAX_STACK_SIZE 64
16650 -#define MIN_STACK_SIZE(ADDR) \
16651 - (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
16652 - THREAD_SIZE - (unsigned long)(ADDR))) \
16653 - ? (MAX_STACK_SIZE) \
16654 - : (((unsigned long)current_thread_info()) + \
16655 - THREAD_SIZE - (unsigned long)(ADDR)))
16656 +#define MAX_STACK_SIZE 64UL
16657 +#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
16658
16659 #define flush_insn_slot(p) do { } while (0)
16660
16661 diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
16662 index 4ad6560..75c7bdd 100644
16663 --- a/arch/x86/include/asm/local.h
16664 +++ b/arch/x86/include/asm/local.h
16665 @@ -10,33 +10,97 @@ typedef struct {
16666 atomic_long_t a;
16667 } local_t;
16668
16669 +typedef struct {
16670 + atomic_long_unchecked_t a;
16671 +} local_unchecked_t;
16672 +
16673 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
16674
16675 #define local_read(l) atomic_long_read(&(l)->a)
16676 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
16677 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
16678 +#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
16679
16680 static inline void local_inc(local_t *l)
16681 {
16682 - asm volatile(_ASM_INC "%0"
16683 + asm volatile(_ASM_INC "%0\n"
16684 +
16685 +#ifdef CONFIG_PAX_REFCOUNT
16686 + "jno 0f\n"
16687 + _ASM_DEC "%0\n"
16688 + "int $4\n0:\n"
16689 + _ASM_EXTABLE(0b, 0b)
16690 +#endif
16691 +
16692 + : "+m" (l->a.counter));
16693 +}
16694 +
16695 +static inline void local_inc_unchecked(local_unchecked_t *l)
16696 +{
16697 + asm volatile(_ASM_INC "%0\n"
16698 : "+m" (l->a.counter));
16699 }
16700
16701 static inline void local_dec(local_t *l)
16702 {
16703 - asm volatile(_ASM_DEC "%0"
16704 + asm volatile(_ASM_DEC "%0\n"
16705 +
16706 +#ifdef CONFIG_PAX_REFCOUNT
16707 + "jno 0f\n"
16708 + _ASM_INC "%0\n"
16709 + "int $4\n0:\n"
16710 + _ASM_EXTABLE(0b, 0b)
16711 +#endif
16712 +
16713 + : "+m" (l->a.counter));
16714 +}
16715 +
16716 +static inline void local_dec_unchecked(local_unchecked_t *l)
16717 +{
16718 + asm volatile(_ASM_DEC "%0\n"
16719 : "+m" (l->a.counter));
16720 }
16721
16722 static inline void local_add(long i, local_t *l)
16723 {
16724 - asm volatile(_ASM_ADD "%1,%0"
16725 + asm volatile(_ASM_ADD "%1,%0\n"
16726 +
16727 +#ifdef CONFIG_PAX_REFCOUNT
16728 + "jno 0f\n"
16729 + _ASM_SUB "%1,%0\n"
16730 + "int $4\n0:\n"
16731 + _ASM_EXTABLE(0b, 0b)
16732 +#endif
16733 +
16734 + : "+m" (l->a.counter)
16735 + : "ir" (i));
16736 +}
16737 +
16738 +static inline void local_add_unchecked(long i, local_unchecked_t *l)
16739 +{
16740 + asm volatile(_ASM_ADD "%1,%0\n"
16741 : "+m" (l->a.counter)
16742 : "ir" (i));
16743 }
16744
16745 static inline void local_sub(long i, local_t *l)
16746 {
16747 - asm volatile(_ASM_SUB "%1,%0"
16748 + asm volatile(_ASM_SUB "%1,%0\n"
16749 +
16750 +#ifdef CONFIG_PAX_REFCOUNT
16751 + "jno 0f\n"
16752 + _ASM_ADD "%1,%0\n"
16753 + "int $4\n0:\n"
16754 + _ASM_EXTABLE(0b, 0b)
16755 +#endif
16756 +
16757 + : "+m" (l->a.counter)
16758 + : "ir" (i));
16759 +}
16760 +
16761 +static inline void local_sub_unchecked(long i, local_unchecked_t *l)
16762 +{
16763 + asm volatile(_ASM_SUB "%1,%0\n"
16764 : "+m" (l->a.counter)
16765 : "ir" (i));
16766 }
16767 @@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
16768 */
16769 static inline int local_sub_and_test(long i, local_t *l)
16770 {
16771 - GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
16772 + GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
16773 }
16774
16775 /**
16776 @@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
16777 */
16778 static inline int local_dec_and_test(local_t *l)
16779 {
16780 - GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
16781 + GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
16782 }
16783
16784 /**
16785 @@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
16786 */
16787 static inline int local_inc_and_test(local_t *l)
16788 {
16789 - GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
16790 + GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
16791 }
16792
16793 /**
16794 @@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
16795 */
16796 static inline int local_add_negative(long i, local_t *l)
16797 {
16798 - GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
16799 + GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
16800 }
16801
16802 /**
16803 @@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
16804 static inline long local_add_return(long i, local_t *l)
16805 {
16806 long __i = i;
16807 + asm volatile(_ASM_XADD "%0, %1\n"
16808 +
16809 +#ifdef CONFIG_PAX_REFCOUNT
16810 + "jno 0f\n"
16811 + _ASM_MOV "%0,%1\n"
16812 + "int $4\n0:\n"
16813 + _ASM_EXTABLE(0b, 0b)
16814 +#endif
16815 +
16816 + : "+r" (i), "+m" (l->a.counter)
16817 + : : "memory");
16818 + return i + __i;
16819 +}
16820 +
16821 +/**
16822 + * local_add_return_unchecked - add and return
16823 + * @i: integer value to add
16824 + * @l: pointer to type local_unchecked_t
16825 + *
16826 + * Atomically adds @i to @l and returns @i + @l
16827 + */
16828 +static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
16829 +{
16830 + long __i = i;
16831 asm volatile(_ASM_XADD "%0, %1;"
16832 : "+r" (i), "+m" (l->a.counter)
16833 : : "memory");
16834 @@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
16835
16836 #define local_cmpxchg(l, o, n) \
16837 (cmpxchg_local(&((l)->a.counter), (o), (n)))
16838 +#define local_cmpxchg_unchecked(l, o, n) \
16839 + (cmpxchg_local(&((l)->a.counter), (o), (n)))
16840 /* Always has a lock prefix */
16841 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
16842
16843 diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
16844 new file mode 100644
16845 index 0000000..2bfd3ba
16846 --- /dev/null
16847 +++ b/arch/x86/include/asm/mman.h
16848 @@ -0,0 +1,15 @@
16849 +#ifndef _X86_MMAN_H
16850 +#define _X86_MMAN_H
16851 +
16852 +#include <uapi/asm/mman.h>
16853 +
16854 +#ifdef __KERNEL__
16855 +#ifndef __ASSEMBLY__
16856 +#ifdef CONFIG_X86_32
16857 +#define arch_mmap_check i386_mmap_check
16858 +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
16859 +#endif
16860 +#endif
16861 +#endif
16862 +
16863 +#endif /* X86_MMAN_H */
16864 diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
16865 index 5f55e69..e20bfb1 100644
16866 --- a/arch/x86/include/asm/mmu.h
16867 +++ b/arch/x86/include/asm/mmu.h
16868 @@ -9,7 +9,7 @@
16869 * we put the segment information here.
16870 */
16871 typedef struct {
16872 - void *ldt;
16873 + struct desc_struct *ldt;
16874 int size;
16875
16876 #ifdef CONFIG_X86_64
16877 @@ -18,7 +18,19 @@ typedef struct {
16878 #endif
16879
16880 struct mutex lock;
16881 - void *vdso;
16882 + unsigned long vdso;
16883 +
16884 +#ifdef CONFIG_X86_32
16885 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
16886 + unsigned long user_cs_base;
16887 + unsigned long user_cs_limit;
16888 +
16889 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
16890 + cpumask_t cpu_user_cs_mask;
16891 +#endif
16892 +
16893 +#endif
16894 +#endif
16895 } mm_context_t;
16896
16897 #ifdef CONFIG_SMP
16898 diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
16899 index be12c53..4d24039 100644
16900 --- a/arch/x86/include/asm/mmu_context.h
16901 +++ b/arch/x86/include/asm/mmu_context.h
16902 @@ -24,6 +24,20 @@ void destroy_context(struct mm_struct *mm);
16903
16904 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
16905 {
16906 +
16907 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16908 + if (!(static_cpu_has(X86_FEATURE_PCID))) {
16909 + unsigned int i;
16910 + pgd_t *pgd;
16911 +
16912 + pax_open_kernel();
16913 + pgd = get_cpu_pgd(smp_processor_id(), kernel);
16914 + for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
16915 + set_pgd_batched(pgd+i, native_make_pgd(0));
16916 + pax_close_kernel();
16917 + }
16918 +#endif
16919 +
16920 #ifdef CONFIG_SMP
16921 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
16922 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
16923 @@ -34,16 +48,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
16924 struct task_struct *tsk)
16925 {
16926 unsigned cpu = smp_processor_id();
16927 +#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
16928 + int tlbstate = TLBSTATE_OK;
16929 +#endif
16930
16931 if (likely(prev != next)) {
16932 #ifdef CONFIG_SMP
16933 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
16934 + tlbstate = this_cpu_read(cpu_tlbstate.state);
16935 +#endif
16936 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
16937 this_cpu_write(cpu_tlbstate.active_mm, next);
16938 #endif
16939 cpumask_set_cpu(cpu, mm_cpumask(next));
16940
16941 /* Re-load page tables */
16942 +#ifdef CONFIG_PAX_PER_CPU_PGD
16943 + pax_open_kernel();
16944 +
16945 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16946 + if (static_cpu_has(X86_FEATURE_PCID))
16947 + __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
16948 + else
16949 +#endif
16950 +
16951 + __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
16952 + __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
16953 + pax_close_kernel();
16954 + 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));
16955 +
16956 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16957 + if (static_cpu_has(X86_FEATURE_PCID)) {
16958 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
16959 + u64 descriptor[2];
16960 + descriptor[0] = PCID_USER;
16961 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
16962 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
16963 + descriptor[0] = PCID_KERNEL;
16964 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
16965 + }
16966 + } else {
16967 + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
16968 + if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
16969 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
16970 + else
16971 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
16972 + }
16973 + } else
16974 +#endif
16975 +
16976 + load_cr3(get_cpu_pgd(cpu, kernel));
16977 +#else
16978 load_cr3(next->pgd);
16979 +#endif
16980
16981 /* Stop flush ipis for the previous mm */
16982 cpumask_clear_cpu(cpu, mm_cpumask(prev));
16983 @@ -51,9 +108,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
16984 /* Load the LDT, if the LDT is different: */
16985 if (unlikely(prev->context.ldt != next->context.ldt))
16986 load_LDT_nolock(&next->context);
16987 +
16988 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
16989 + if (!(__supported_pte_mask & _PAGE_NX)) {
16990 + smp_mb__before_clear_bit();
16991 + cpu_clear(cpu, prev->context.cpu_user_cs_mask);
16992 + smp_mb__after_clear_bit();
16993 + cpu_set(cpu, next->context.cpu_user_cs_mask);
16994 + }
16995 +#endif
16996 +
16997 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
16998 + if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
16999 + prev->context.user_cs_limit != next->context.user_cs_limit))
17000 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17001 +#ifdef CONFIG_SMP
17002 + else if (unlikely(tlbstate != TLBSTATE_OK))
17003 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17004 +#endif
17005 +#endif
17006 +
17007 }
17008 + else {
17009 +
17010 +#ifdef CONFIG_PAX_PER_CPU_PGD
17011 + pax_open_kernel();
17012 +
17013 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17014 + if (static_cpu_has(X86_FEATURE_PCID))
17015 + __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17016 + else
17017 +#endif
17018 +
17019 + __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17020 + __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17021 + pax_close_kernel();
17022 + 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));
17023 +
17024 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17025 + if (static_cpu_has(X86_FEATURE_PCID)) {
17026 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
17027 + u64 descriptor[2];
17028 + descriptor[0] = PCID_USER;
17029 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17030 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17031 + descriptor[0] = PCID_KERNEL;
17032 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17033 + }
17034 + } else {
17035 + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17036 + if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17037 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17038 + else
17039 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17040 + }
17041 + } else
17042 +#endif
17043 +
17044 + load_cr3(get_cpu_pgd(cpu, kernel));
17045 +#endif
17046 +
17047 #ifdef CONFIG_SMP
17048 - else {
17049 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17050 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17051
17052 @@ -70,11 +185,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17053 * tlb flush IPI delivery. We must reload CR3
17054 * to make sure to use no freed page tables.
17055 */
17056 +
17057 +#ifndef CONFIG_PAX_PER_CPU_PGD
17058 load_cr3(next->pgd);
17059 +#endif
17060 +
17061 load_LDT_nolock(&next->context);
17062 +
17063 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17064 + if (!(__supported_pte_mask & _PAGE_NX))
17065 + cpu_set(cpu, next->context.cpu_user_cs_mask);
17066 +#endif
17067 +
17068 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17069 +#ifdef CONFIG_PAX_PAGEEXEC
17070 + if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17071 +#endif
17072 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17073 +#endif
17074 +
17075 }
17076 +#endif
17077 }
17078 -#endif
17079 }
17080
17081 #define activate_mm(prev, next) \
17082 diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17083 index e3b7819..b257c64 100644
17084 --- a/arch/x86/include/asm/module.h
17085 +++ b/arch/x86/include/asm/module.h
17086 @@ -5,6 +5,7 @@
17087
17088 #ifdef CONFIG_X86_64
17089 /* X86_64 does not define MODULE_PROC_FAMILY */
17090 +#define MODULE_PROC_FAMILY ""
17091 #elif defined CONFIG_M486
17092 #define MODULE_PROC_FAMILY "486 "
17093 #elif defined CONFIG_M586
17094 @@ -57,8 +58,20 @@
17095 #error unknown processor family
17096 #endif
17097
17098 -#ifdef CONFIG_X86_32
17099 -# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17100 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17101 +#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17102 +#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17103 +#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17104 +#else
17105 +#define MODULE_PAX_KERNEXEC ""
17106 #endif
17107
17108 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17109 +#define MODULE_PAX_UDEREF "UDEREF "
17110 +#else
17111 +#define MODULE_PAX_UDEREF ""
17112 +#endif
17113 +
17114 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17115 +
17116 #endif /* _ASM_X86_MODULE_H */
17117 diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17118 index 86f9301..b365cda 100644
17119 --- a/arch/x86/include/asm/nmi.h
17120 +++ b/arch/x86/include/asm/nmi.h
17121 @@ -40,11 +40,11 @@ struct nmiaction {
17122 nmi_handler_t handler;
17123 unsigned long flags;
17124 const char *name;
17125 -};
17126 +} __do_const;
17127
17128 #define register_nmi_handler(t, fn, fg, n, init...) \
17129 ({ \
17130 - static struct nmiaction init fn##_na = { \
17131 + static const struct nmiaction init fn##_na = { \
17132 .handler = (fn), \
17133 .name = (n), \
17134 .flags = (fg), \
17135 @@ -52,7 +52,7 @@ struct nmiaction {
17136 __register_nmi_handler((t), &fn##_na); \
17137 })
17138
17139 -int __register_nmi_handler(unsigned int, struct nmiaction *);
17140 +int __register_nmi_handler(unsigned int, const struct nmiaction *);
17141
17142 void unregister_nmi_handler(unsigned int, const char *);
17143
17144 diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17145 index 775873d..de5f0304 100644
17146 --- a/arch/x86/include/asm/page.h
17147 +++ b/arch/x86/include/asm/page.h
17148 @@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17149 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17150
17151 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17152 +#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17153
17154 #define __boot_va(x) __va(x)
17155 #define __boot_pa(x) __pa(x)
17156 diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17157 index 0f1ddee..e2fc3d1 100644
17158 --- a/arch/x86/include/asm/page_64.h
17159 +++ b/arch/x86/include/asm/page_64.h
17160 @@ -7,9 +7,9 @@
17161
17162 /* duplicated to the one in bootmem.h */
17163 extern unsigned long max_pfn;
17164 -extern unsigned long phys_base;
17165 +extern const unsigned long phys_base;
17166
17167 -static inline unsigned long __phys_addr_nodebug(unsigned long x)
17168 +static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17169 {
17170 unsigned long y = x - __START_KERNEL_map;
17171
17172 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17173 index cd6e1610..70f4418 100644
17174 --- a/arch/x86/include/asm/paravirt.h
17175 +++ b/arch/x86/include/asm/paravirt.h
17176 @@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17177 return (pmd_t) { ret };
17178 }
17179
17180 -static inline pmdval_t pmd_val(pmd_t pmd)
17181 +static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17182 {
17183 pmdval_t ret;
17184
17185 @@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17186 val);
17187 }
17188
17189 +static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17190 +{
17191 + pgdval_t val = native_pgd_val(pgd);
17192 +
17193 + if (sizeof(pgdval_t) > sizeof(long))
17194 + PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17195 + val, (u64)val >> 32);
17196 + else
17197 + PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17198 + val);
17199 +}
17200 +
17201 static inline void pgd_clear(pgd_t *pgdp)
17202 {
17203 set_pgd(pgdp, __pgd(0));
17204 @@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17205 pv_mmu_ops.set_fixmap(idx, phys, flags);
17206 }
17207
17208 +#ifdef CONFIG_PAX_KERNEXEC
17209 +static inline unsigned long pax_open_kernel(void)
17210 +{
17211 + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17212 +}
17213 +
17214 +static inline unsigned long pax_close_kernel(void)
17215 +{
17216 + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17217 +}
17218 +#else
17219 +static inline unsigned long pax_open_kernel(void) { return 0; }
17220 +static inline unsigned long pax_close_kernel(void) { return 0; }
17221 +#endif
17222 +
17223 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17224
17225 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17226 @@ -906,7 +933,7 @@ extern void default_banner(void);
17227
17228 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17229 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17230 -#define PARA_INDIRECT(addr) *%cs:addr
17231 +#define PARA_INDIRECT(addr) *%ss:addr
17232 #endif
17233
17234 #define INTERRUPT_RETURN \
17235 @@ -981,6 +1008,21 @@ extern void default_banner(void);
17236 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
17237 CLBR_NONE, \
17238 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
17239 +
17240 +#define GET_CR0_INTO_RDI \
17241 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17242 + mov %rax,%rdi
17243 +
17244 +#define SET_RDI_INTO_CR0 \
17245 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17246 +
17247 +#define GET_CR3_INTO_RDI \
17248 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17249 + mov %rax,%rdi
17250 +
17251 +#define SET_RDI_INTO_CR3 \
17252 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17253 +
17254 #endif /* CONFIG_X86_32 */
17255
17256 #endif /* __ASSEMBLY__ */
17257 diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17258 index 7549b8b..f0edfda 100644
17259 --- a/arch/x86/include/asm/paravirt_types.h
17260 +++ b/arch/x86/include/asm/paravirt_types.h
17261 @@ -84,7 +84,7 @@ struct pv_init_ops {
17262 */
17263 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17264 unsigned long addr, unsigned len);
17265 -};
17266 +} __no_const __no_randomize_layout;
17267
17268
17269 struct pv_lazy_ops {
17270 @@ -92,13 +92,13 @@ struct pv_lazy_ops {
17271 void (*enter)(void);
17272 void (*leave)(void);
17273 void (*flush)(void);
17274 -};
17275 +} __no_randomize_layout;
17276
17277 struct pv_time_ops {
17278 unsigned long long (*sched_clock)(void);
17279 unsigned long long (*steal_clock)(int cpu);
17280 unsigned long (*get_tsc_khz)(void);
17281 -};
17282 +} __no_const __no_randomize_layout;
17283
17284 struct pv_cpu_ops {
17285 /* hooks for various privileged instructions */
17286 @@ -192,7 +192,7 @@ struct pv_cpu_ops {
17287
17288 void (*start_context_switch)(struct task_struct *prev);
17289 void (*end_context_switch)(struct task_struct *next);
17290 -};
17291 +} __no_const __no_randomize_layout;
17292
17293 struct pv_irq_ops {
17294 /*
17295 @@ -215,7 +215,7 @@ struct pv_irq_ops {
17296 #ifdef CONFIG_X86_64
17297 void (*adjust_exception_frame)(void);
17298 #endif
17299 -};
17300 +} __no_randomize_layout;
17301
17302 struct pv_apic_ops {
17303 #ifdef CONFIG_X86_LOCAL_APIC
17304 @@ -223,7 +223,7 @@ struct pv_apic_ops {
17305 unsigned long start_eip,
17306 unsigned long start_esp);
17307 #endif
17308 -};
17309 +} __no_const __no_randomize_layout;
17310
17311 struct pv_mmu_ops {
17312 unsigned long (*read_cr2)(void);
17313 @@ -313,6 +313,7 @@ struct pv_mmu_ops {
17314 struct paravirt_callee_save make_pud;
17315
17316 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17317 + void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17318 #endif /* PAGETABLE_LEVELS == 4 */
17319 #endif /* PAGETABLE_LEVELS >= 3 */
17320
17321 @@ -324,7 +325,13 @@ struct pv_mmu_ops {
17322 an mfn. We can tell which is which from the index. */
17323 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17324 phys_addr_t phys, pgprot_t flags);
17325 -};
17326 +
17327 +#ifdef CONFIG_PAX_KERNEXEC
17328 + unsigned long (*pax_open_kernel)(void);
17329 + unsigned long (*pax_close_kernel)(void);
17330 +#endif
17331 +
17332 +} __no_randomize_layout;
17333
17334 struct arch_spinlock;
17335 #ifdef CONFIG_SMP
17336 @@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17337 struct pv_lock_ops {
17338 struct paravirt_callee_save lock_spinning;
17339 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17340 -};
17341 +} __no_randomize_layout;
17342
17343 /* This contains all the paravirt structures: we get a convenient
17344 * number for each function using the offset which we use to indicate
17345 - * what to patch. */
17346 + * what to patch.
17347 + * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17348 + */
17349 +
17350 struct paravirt_patch_template {
17351 struct pv_init_ops pv_init_ops;
17352 struct pv_time_ops pv_time_ops;
17353 @@ -349,7 +359,7 @@ struct paravirt_patch_template {
17354 struct pv_apic_ops pv_apic_ops;
17355 struct pv_mmu_ops pv_mmu_ops;
17356 struct pv_lock_ops pv_lock_ops;
17357 -};
17358 +} __no_randomize_layout;
17359
17360 extern struct pv_info pv_info;
17361 extern struct pv_init_ops pv_init_ops;
17362 diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17363 index c4412e9..90e88c5 100644
17364 --- a/arch/x86/include/asm/pgalloc.h
17365 +++ b/arch/x86/include/asm/pgalloc.h
17366 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17367 pmd_t *pmd, pte_t *pte)
17368 {
17369 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17370 + set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17371 +}
17372 +
17373 +static inline void pmd_populate_user(struct mm_struct *mm,
17374 + pmd_t *pmd, pte_t *pte)
17375 +{
17376 + paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17377 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17378 }
17379
17380 @@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17381
17382 #ifdef CONFIG_X86_PAE
17383 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17384 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17385 +{
17386 + pud_populate(mm, pudp, pmd);
17387 +}
17388 #else /* !CONFIG_X86_PAE */
17389 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17390 {
17391 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17392 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17393 }
17394 +
17395 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17396 +{
17397 + paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17398 + set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17399 +}
17400 #endif /* CONFIG_X86_PAE */
17401
17402 #if PAGETABLE_LEVELS > 3
17403 @@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17404 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17405 }
17406
17407 +static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17408 +{
17409 + paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17410 + set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17411 +}
17412 +
17413 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17414 {
17415 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17416 diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17417 index 0d193e2..bf59aeb 100644
17418 --- a/arch/x86/include/asm/pgtable-2level.h
17419 +++ b/arch/x86/include/asm/pgtable-2level.h
17420 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17421
17422 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17423 {
17424 + pax_open_kernel();
17425 *pmdp = pmd;
17426 + pax_close_kernel();
17427 }
17428
17429 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17430 diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
17431 index 81bb91b..9392125 100644
17432 --- a/arch/x86/include/asm/pgtable-3level.h
17433 +++ b/arch/x86/include/asm/pgtable-3level.h
17434 @@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17435
17436 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17437 {
17438 + pax_open_kernel();
17439 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
17440 + pax_close_kernel();
17441 }
17442
17443 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17444 {
17445 + pax_open_kernel();
17446 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
17447 + pax_close_kernel();
17448 }
17449
17450 /*
17451 diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
17452 index bbc8b12..f228861 100644
17453 --- a/arch/x86/include/asm/pgtable.h
17454 +++ b/arch/x86/include/asm/pgtable.h
17455 @@ -45,6 +45,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17456
17457 #ifndef __PAGETABLE_PUD_FOLDED
17458 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
17459 +#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
17460 #define pgd_clear(pgd) native_pgd_clear(pgd)
17461 #endif
17462
17463 @@ -82,12 +83,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17464
17465 #define arch_end_context_switch(prev) do {} while(0)
17466
17467 +#define pax_open_kernel() native_pax_open_kernel()
17468 +#define pax_close_kernel() native_pax_close_kernel()
17469 #endif /* CONFIG_PARAVIRT */
17470
17471 +#define __HAVE_ARCH_PAX_OPEN_KERNEL
17472 +#define __HAVE_ARCH_PAX_CLOSE_KERNEL
17473 +
17474 +#ifdef CONFIG_PAX_KERNEXEC
17475 +static inline unsigned long native_pax_open_kernel(void)
17476 +{
17477 + unsigned long cr0;
17478 +
17479 + preempt_disable();
17480 + barrier();
17481 + cr0 = read_cr0() ^ X86_CR0_WP;
17482 + BUG_ON(cr0 & X86_CR0_WP);
17483 + write_cr0(cr0);
17484 + return cr0 ^ X86_CR0_WP;
17485 +}
17486 +
17487 +static inline unsigned long native_pax_close_kernel(void)
17488 +{
17489 + unsigned long cr0;
17490 +
17491 + cr0 = read_cr0() ^ X86_CR0_WP;
17492 + BUG_ON(!(cr0 & X86_CR0_WP));
17493 + write_cr0(cr0);
17494 + barrier();
17495 + preempt_enable_no_resched();
17496 + return cr0 ^ X86_CR0_WP;
17497 +}
17498 +#else
17499 +static inline unsigned long native_pax_open_kernel(void) { return 0; }
17500 +static inline unsigned long native_pax_close_kernel(void) { return 0; }
17501 +#endif
17502 +
17503 /*
17504 * The following only work if pte_present() is true.
17505 * Undefined behaviour if not..
17506 */
17507 +static inline int pte_user(pte_t pte)
17508 +{
17509 + return pte_val(pte) & _PAGE_USER;
17510 +}
17511 +
17512 static inline int pte_dirty(pte_t pte)
17513 {
17514 return pte_flags(pte) & _PAGE_DIRTY;
17515 @@ -148,6 +188,11 @@ static inline unsigned long pud_pfn(pud_t pud)
17516 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
17517 }
17518
17519 +static inline unsigned long pgd_pfn(pgd_t pgd)
17520 +{
17521 + return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
17522 +}
17523 +
17524 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
17525
17526 static inline int pmd_large(pmd_t pte)
17527 @@ -201,9 +246,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
17528 return pte_clear_flags(pte, _PAGE_RW);
17529 }
17530
17531 +static inline pte_t pte_mkread(pte_t pte)
17532 +{
17533 + return __pte(pte_val(pte) | _PAGE_USER);
17534 +}
17535 +
17536 static inline pte_t pte_mkexec(pte_t pte)
17537 {
17538 - return pte_clear_flags(pte, _PAGE_NX);
17539 +#ifdef CONFIG_X86_PAE
17540 + if (__supported_pte_mask & _PAGE_NX)
17541 + return pte_clear_flags(pte, _PAGE_NX);
17542 + else
17543 +#endif
17544 + return pte_set_flags(pte, _PAGE_USER);
17545 +}
17546 +
17547 +static inline pte_t pte_exprotect(pte_t pte)
17548 +{
17549 +#ifdef CONFIG_X86_PAE
17550 + if (__supported_pte_mask & _PAGE_NX)
17551 + return pte_set_flags(pte, _PAGE_NX);
17552 + else
17553 +#endif
17554 + return pte_clear_flags(pte, _PAGE_USER);
17555 }
17556
17557 static inline pte_t pte_mkdirty(pte_t pte)
17558 @@ -430,6 +495,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
17559 #endif
17560
17561 #ifndef __ASSEMBLY__
17562 +
17563 +#ifdef CONFIG_PAX_PER_CPU_PGD
17564 +extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
17565 +enum cpu_pgd_type {kernel = 0, user = 1};
17566 +static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
17567 +{
17568 + return cpu_pgd[cpu][type];
17569 +}
17570 +#endif
17571 +
17572 #include <linux/mm_types.h>
17573 #include <linux/mmdebug.h>
17574 #include <linux/log2.h>
17575 @@ -570,7 +645,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
17576 * Currently stuck as a macro due to indirect forward reference to
17577 * linux/mmzone.h's __section_mem_map_addr() definition:
17578 */
17579 -#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
17580 +#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
17581
17582 /* Find an entry in the second-level page table.. */
17583 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
17584 @@ -610,7 +685,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
17585 * Currently stuck as a macro due to indirect forward reference to
17586 * linux/mmzone.h's __section_mem_map_addr() definition:
17587 */
17588 -#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
17589 +#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
17590
17591 /* to find an entry in a page-table-directory. */
17592 static inline unsigned long pud_index(unsigned long address)
17593 @@ -625,7 +700,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
17594
17595 static inline int pgd_bad(pgd_t pgd)
17596 {
17597 - return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
17598 + return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
17599 }
17600
17601 static inline int pgd_none(pgd_t pgd)
17602 @@ -648,7 +723,12 @@ static inline int pgd_none(pgd_t pgd)
17603 * pgd_offset() returns a (pgd_t *)
17604 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
17605 */
17606 -#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
17607 +#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
17608 +
17609 +#ifdef CONFIG_PAX_PER_CPU_PGD
17610 +#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
17611 +#endif
17612 +
17613 /*
17614 * a shortcut which implies the use of the kernel's pgd, instead
17615 * of a process's
17616 @@ -659,6 +739,23 @@ static inline int pgd_none(pgd_t pgd)
17617 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
17618 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
17619
17620 +#ifdef CONFIG_X86_32
17621 +#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
17622 +#else
17623 +#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
17624 +#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
17625 +
17626 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17627 +#ifdef __ASSEMBLY__
17628 +#define pax_user_shadow_base pax_user_shadow_base(%rip)
17629 +#else
17630 +extern unsigned long pax_user_shadow_base;
17631 +extern pgdval_t clone_pgd_mask;
17632 +#endif
17633 +#endif
17634 +
17635 +#endif
17636 +
17637 #ifndef __ASSEMBLY__
17638
17639 extern int direct_gbpages;
17640 @@ -825,11 +922,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
17641 * dst and src can be on the same page, but the range must not overlap,
17642 * and must not cross a page boundary.
17643 */
17644 -static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
17645 +static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
17646 {
17647 - memcpy(dst, src, count * sizeof(pgd_t));
17648 + pax_open_kernel();
17649 + while (count--)
17650 + *dst++ = *src++;
17651 + pax_close_kernel();
17652 }
17653
17654 +#ifdef CONFIG_PAX_PER_CPU_PGD
17655 +extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
17656 +#endif
17657 +
17658 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17659 +extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
17660 +#else
17661 +static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
17662 +#endif
17663 +
17664 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
17665 static inline int page_level_shift(enum pg_level level)
17666 {
17667 diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
17668 index 9ee3221..b979c6b 100644
17669 --- a/arch/x86/include/asm/pgtable_32.h
17670 +++ b/arch/x86/include/asm/pgtable_32.h
17671 @@ -25,9 +25,6 @@
17672 struct mm_struct;
17673 struct vm_area_struct;
17674
17675 -extern pgd_t swapper_pg_dir[1024];
17676 -extern pgd_t initial_page_table[1024];
17677 -
17678 static inline void pgtable_cache_init(void) { }
17679 static inline void check_pgt_cache(void) { }
17680 void paging_init(void);
17681 @@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
17682 # include <asm/pgtable-2level.h>
17683 #endif
17684
17685 +extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
17686 +extern pgd_t initial_page_table[PTRS_PER_PGD];
17687 +#ifdef CONFIG_X86_PAE
17688 +extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
17689 +#endif
17690 +
17691 #if defined(CONFIG_HIGHPTE)
17692 #define pte_offset_map(dir, address) \
17693 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
17694 @@ -62,12 +65,17 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
17695 /* Clear a kernel PTE and flush it from the TLB */
17696 #define kpte_clear_flush(ptep, vaddr) \
17697 do { \
17698 + pax_open_kernel(); \
17699 pte_clear(&init_mm, (vaddr), (ptep)); \
17700 + pax_close_kernel(); \
17701 __flush_tlb_one((vaddr)); \
17702 } while (0)
17703
17704 #endif /* !__ASSEMBLY__ */
17705
17706 +#define HAVE_ARCH_UNMAPPED_AREA
17707 +#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
17708 +
17709 /*
17710 * kern_addr_valid() is (1) for FLATMEM and (0) for
17711 * SPARSEMEM and DISCONTIGMEM
17712 diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
17713 index ed5903b..c7fe163 100644
17714 --- a/arch/x86/include/asm/pgtable_32_types.h
17715 +++ b/arch/x86/include/asm/pgtable_32_types.h
17716 @@ -8,7 +8,7 @@
17717 */
17718 #ifdef CONFIG_X86_PAE
17719 # include <asm/pgtable-3level_types.h>
17720 -# define PMD_SIZE (1UL << PMD_SHIFT)
17721 +# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
17722 # define PMD_MASK (~(PMD_SIZE - 1))
17723 #else
17724 # include <asm/pgtable-2level_types.h>
17725 @@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
17726 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
17727 #endif
17728
17729 +#ifdef CONFIG_PAX_KERNEXEC
17730 +#ifndef __ASSEMBLY__
17731 +extern unsigned char MODULES_EXEC_VADDR[];
17732 +extern unsigned char MODULES_EXEC_END[];
17733 +#endif
17734 +#include <asm/boot.h>
17735 +#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
17736 +#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
17737 +#else
17738 +#define ktla_ktva(addr) (addr)
17739 +#define ktva_ktla(addr) (addr)
17740 +#endif
17741 +
17742 #define MODULES_VADDR VMALLOC_START
17743 #define MODULES_END VMALLOC_END
17744 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
17745 diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
17746 index e22c1db..23a625a 100644
17747 --- a/arch/x86/include/asm/pgtable_64.h
17748 +++ b/arch/x86/include/asm/pgtable_64.h
17749 @@ -16,10 +16,14 @@
17750
17751 extern pud_t level3_kernel_pgt[512];
17752 extern pud_t level3_ident_pgt[512];
17753 +extern pud_t level3_vmalloc_start_pgt[512];
17754 +extern pud_t level3_vmalloc_end_pgt[512];
17755 +extern pud_t level3_vmemmap_pgt[512];
17756 +extern pud_t level2_vmemmap_pgt[512];
17757 extern pmd_t level2_kernel_pgt[512];
17758 extern pmd_t level2_fixmap_pgt[512];
17759 -extern pmd_t level2_ident_pgt[512];
17760 -extern pgd_t init_level4_pgt[];
17761 +extern pmd_t level2_ident_pgt[512*2];
17762 +extern pgd_t init_level4_pgt[512];
17763
17764 #define swapper_pg_dir init_level4_pgt
17765
17766 @@ -61,7 +65,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17767
17768 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17769 {
17770 + pax_open_kernel();
17771 *pmdp = pmd;
17772 + pax_close_kernel();
17773 }
17774
17775 static inline void native_pmd_clear(pmd_t *pmd)
17776 @@ -97,7 +103,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
17777
17778 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17779 {
17780 + pax_open_kernel();
17781 *pudp = pud;
17782 + pax_close_kernel();
17783 }
17784
17785 static inline void native_pud_clear(pud_t *pud)
17786 @@ -107,6 +115,13 @@ static inline void native_pud_clear(pud_t *pud)
17787
17788 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
17789 {
17790 + pax_open_kernel();
17791 + *pgdp = pgd;
17792 + pax_close_kernel();
17793 +}
17794 +
17795 +static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17796 +{
17797 *pgdp = pgd;
17798 }
17799
17800 diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
17801 index c883bf7..19970b3 100644
17802 --- a/arch/x86/include/asm/pgtable_64_types.h
17803 +++ b/arch/x86/include/asm/pgtable_64_types.h
17804 @@ -61,6 +61,11 @@ typedef struct { pteval_t pte; } pte_t;
17805 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
17806 #define MODULES_END _AC(0xffffffffff000000, UL)
17807 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
17808 +#define MODULES_EXEC_VADDR MODULES_VADDR
17809 +#define MODULES_EXEC_END MODULES_END
17810 +
17811 +#define ktla_ktva(addr) (addr)
17812 +#define ktva_ktla(addr) (addr)
17813
17814 #define EARLY_DYNAMIC_PAGE_TABLES 64
17815
17816 diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
17817 index 94e40f1..ebd03e4 100644
17818 --- a/arch/x86/include/asm/pgtable_types.h
17819 +++ b/arch/x86/include/asm/pgtable_types.h
17820 @@ -16,13 +16,12 @@
17821 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
17822 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
17823 #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
17824 -#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
17825 +#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */
17826 #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */
17827 #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */
17828 #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */
17829 -#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1
17830 -#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1
17831 -#define _PAGE_BIT_SPLITTING _PAGE_BIT_UNUSED1 /* only valid on a PSE pmd */
17832 +#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL
17833 +#define _PAGE_BIT_SPLITTING _PAGE_BIT_SPECIAL /* only valid on a PSE pmd */
17834 #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
17835
17836 /* If _PAGE_BIT_PRESENT is clear, we use these: */
17837 @@ -40,7 +39,6 @@
17838 #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY)
17839 #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE)
17840 #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)
17841 -#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)
17842 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
17843 #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
17844 #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
17845 @@ -87,8 +85,10 @@
17846
17847 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
17848 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
17849 -#else
17850 +#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
17851 #define _PAGE_NX (_AT(pteval_t, 0))
17852 +#else
17853 +#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
17854 #endif
17855
17856 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
17857 @@ -147,6 +147,9 @@
17858 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
17859 _PAGE_ACCESSED)
17860
17861 +#define PAGE_READONLY_NOEXEC PAGE_READONLY
17862 +#define PAGE_SHARED_NOEXEC PAGE_SHARED
17863 +
17864 #define __PAGE_KERNEL_EXEC \
17865 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
17866 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
17867 @@ -157,7 +160,7 @@
17868 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
17869 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
17870 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
17871 -#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
17872 +#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
17873 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
17874 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
17875 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
17876 @@ -219,8 +222,8 @@
17877 * bits are combined, this will alow user to access the high address mapped
17878 * VDSO in the presence of CONFIG_COMPAT_VDSO
17879 */
17880 -#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
17881 -#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */
17882 +#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
17883 +#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
17884 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
17885 #endif
17886
17887 @@ -258,7 +261,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
17888 {
17889 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
17890 }
17891 +#endif
17892
17893 +#if PAGETABLE_LEVELS == 3
17894 +#include <asm-generic/pgtable-nopud.h>
17895 +#endif
17896 +
17897 +#if PAGETABLE_LEVELS == 2
17898 +#include <asm-generic/pgtable-nopmd.h>
17899 +#endif
17900 +
17901 +#ifndef __ASSEMBLY__
17902 #if PAGETABLE_LEVELS > 3
17903 typedef struct { pudval_t pud; } pud_t;
17904
17905 @@ -272,8 +285,6 @@ static inline pudval_t native_pud_val(pud_t pud)
17906 return pud.pud;
17907 }
17908 #else
17909 -#include <asm-generic/pgtable-nopud.h>
17910 -
17911 static inline pudval_t native_pud_val(pud_t pud)
17912 {
17913 return native_pgd_val(pud.pgd);
17914 @@ -293,8 +304,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
17915 return pmd.pmd;
17916 }
17917 #else
17918 -#include <asm-generic/pgtable-nopmd.h>
17919 -
17920 static inline pmdval_t native_pmd_val(pmd_t pmd)
17921 {
17922 return native_pgd_val(pmd.pud.pgd);
17923 @@ -334,7 +343,6 @@ typedef struct page *pgtable_t;
17924
17925 extern pteval_t __supported_pte_mask;
17926 extern void set_nx(void);
17927 -extern int nx_enabled;
17928
17929 #define pgprot_writecombine pgprot_writecombine
17930 extern pgprot_t pgprot_writecombine(pgprot_t prot);
17931 diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
17932 index c8b0519..fd29e73 100644
17933 --- a/arch/x86/include/asm/preempt.h
17934 +++ b/arch/x86/include/asm/preempt.h
17935 @@ -87,7 +87,7 @@ static __always_inline void __preempt_count_sub(int val)
17936 */
17937 static __always_inline bool __preempt_count_dec_and_test(void)
17938 {
17939 - GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
17940 + GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
17941 }
17942
17943 /*
17944 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
17945 index fdedd38..95c02c2 100644
17946 --- a/arch/x86/include/asm/processor.h
17947 +++ b/arch/x86/include/asm/processor.h
17948 @@ -128,7 +128,7 @@ struct cpuinfo_x86 {
17949 /* Index into per_cpu list: */
17950 u16 cpu_index;
17951 u32 microcode;
17952 -} __attribute__((__aligned__(SMP_CACHE_BYTES)));
17953 +} __attribute__((__aligned__(SMP_CACHE_BYTES))) __randomize_layout;
17954
17955 #define X86_VENDOR_INTEL 0
17956 #define X86_VENDOR_CYRIX 1
17957 @@ -199,9 +199,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
17958 : "memory");
17959 }
17960
17961 +/* invpcid (%rdx),%rax */
17962 +#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
17963 +
17964 +#define INVPCID_SINGLE_ADDRESS 0UL
17965 +#define INVPCID_SINGLE_CONTEXT 1UL
17966 +#define INVPCID_ALL_GLOBAL 2UL
17967 +#define INVPCID_ALL_MONGLOBAL 3UL
17968 +
17969 +#define PCID_KERNEL 0UL
17970 +#define PCID_USER 1UL
17971 +#define PCID_NOFLUSH (1UL << 63)
17972 +
17973 static inline void load_cr3(pgd_t *pgdir)
17974 {
17975 - write_cr3(__pa(pgdir));
17976 + write_cr3(__pa(pgdir) | PCID_KERNEL);
17977 }
17978
17979 #ifdef CONFIG_X86_32
17980 @@ -283,7 +295,7 @@ struct tss_struct {
17981
17982 } ____cacheline_aligned;
17983
17984 -DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
17985 +extern struct tss_struct init_tss[NR_CPUS];
17986
17987 /*
17988 * Save the original ist values for checking stack pointers during debugging
17989 @@ -470,6 +482,7 @@ struct thread_struct {
17990 unsigned short ds;
17991 unsigned short fsindex;
17992 unsigned short gsindex;
17993 + unsigned short ss;
17994 #endif
17995 #ifdef CONFIG_X86_32
17996 unsigned long ip;
17997 @@ -579,29 +592,8 @@ static inline void load_sp0(struct tss_struct *tss,
17998 extern unsigned long mmu_cr4_features;
17999 extern u32 *trampoline_cr4_features;
18000
18001 -static inline void set_in_cr4(unsigned long mask)
18002 -{
18003 - unsigned long cr4;
18004 -
18005 - mmu_cr4_features |= mask;
18006 - if (trampoline_cr4_features)
18007 - *trampoline_cr4_features = mmu_cr4_features;
18008 - cr4 = read_cr4();
18009 - cr4 |= mask;
18010 - write_cr4(cr4);
18011 -}
18012 -
18013 -static inline void clear_in_cr4(unsigned long mask)
18014 -{
18015 - unsigned long cr4;
18016 -
18017 - mmu_cr4_features &= ~mask;
18018 - if (trampoline_cr4_features)
18019 - *trampoline_cr4_features = mmu_cr4_features;
18020 - cr4 = read_cr4();
18021 - cr4 &= ~mask;
18022 - write_cr4(cr4);
18023 -}
18024 +extern void set_in_cr4(unsigned long mask);
18025 +extern void clear_in_cr4(unsigned long mask);
18026
18027 typedef struct {
18028 unsigned long seg;
18029 @@ -827,11 +819,18 @@ static inline void spin_lock_prefetch(const void *x)
18030 */
18031 #define TASK_SIZE PAGE_OFFSET
18032 #define TASK_SIZE_MAX TASK_SIZE
18033 +
18034 +#ifdef CONFIG_PAX_SEGMEXEC
18035 +#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18036 +#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18037 +#else
18038 #define STACK_TOP TASK_SIZE
18039 -#define STACK_TOP_MAX STACK_TOP
18040 +#endif
18041 +
18042 +#define STACK_TOP_MAX TASK_SIZE
18043
18044 #define INIT_THREAD { \
18045 - .sp0 = sizeof(init_stack) + (long)&init_stack, \
18046 + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18047 .vm86_info = NULL, \
18048 .sysenter_cs = __KERNEL_CS, \
18049 .io_bitmap_ptr = NULL, \
18050 @@ -845,7 +844,7 @@ static inline void spin_lock_prefetch(const void *x)
18051 */
18052 #define INIT_TSS { \
18053 .x86_tss = { \
18054 - .sp0 = sizeof(init_stack) + (long)&init_stack, \
18055 + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18056 .ss0 = __KERNEL_DS, \
18057 .ss1 = __KERNEL_CS, \
18058 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
18059 @@ -856,11 +855,7 @@ static inline void spin_lock_prefetch(const void *x)
18060 extern unsigned long thread_saved_pc(struct task_struct *tsk);
18061
18062 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
18063 -#define KSTK_TOP(info) \
18064 -({ \
18065 - unsigned long *__ptr = (unsigned long *)(info); \
18066 - (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
18067 -})
18068 +#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
18069
18070 /*
18071 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
18072 @@ -875,7 +870,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18073 #define task_pt_regs(task) \
18074 ({ \
18075 struct pt_regs *__regs__; \
18076 - __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
18077 + __regs__ = (struct pt_regs *)((task)->thread.sp0); \
18078 __regs__ - 1; \
18079 })
18080
18081 @@ -885,13 +880,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18082 /*
18083 * User space process size. 47bits minus one guard page.
18084 */
18085 -#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18086 +#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18087
18088 /* This decides where the kernel will search for a free chunk of vm
18089 * space during mmap's.
18090 */
18091 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18092 - 0xc0000000 : 0xFFFFe000)
18093 + 0xc0000000 : 0xFFFFf000)
18094
18095 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18096 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18097 @@ -902,11 +897,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18098 #define STACK_TOP_MAX TASK_SIZE_MAX
18099
18100 #define INIT_THREAD { \
18101 - .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18102 + .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18103 }
18104
18105 #define INIT_TSS { \
18106 - .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18107 + .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18108 }
18109
18110 /*
18111 @@ -934,6 +929,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18112 */
18113 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18114
18115 +#ifdef CONFIG_PAX_SEGMEXEC
18116 +#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18117 +#endif
18118 +
18119 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18120
18121 /* Get/set a process' ability to use the timestamp counter instruction */
18122 @@ -960,7 +959,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18123 return 0;
18124 }
18125
18126 -extern unsigned long arch_align_stack(unsigned long sp);
18127 +#define arch_align_stack(x) ((x) & ~0xfUL)
18128 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18129
18130 void default_idle(void);
18131 @@ -970,6 +969,6 @@ bool xen_set_default_idle(void);
18132 #define xen_set_default_idle 0
18133 #endif
18134
18135 -void stop_this_cpu(void *dummy);
18136 +void stop_this_cpu(void *dummy) __noreturn;
18137 void df_debug(struct pt_regs *regs, long error_code);
18138 #endif /* _ASM_X86_PROCESSOR_H */
18139 diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18140 index 14fd6fd..6740420 100644
18141 --- a/arch/x86/include/asm/ptrace.h
18142 +++ b/arch/x86/include/asm/ptrace.h
18143 @@ -84,28 +84,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
18144 }
18145
18146 /*
18147 - * user_mode_vm(regs) determines whether a register set came from user mode.
18148 + * user_mode(regs) determines whether a register set came from user mode.
18149 * This is true if V8086 mode was enabled OR if the register set was from
18150 * protected mode with RPL-3 CS value. This tricky test checks that with
18151 * one comparison. Many places in the kernel can bypass this full check
18152 - * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
18153 + * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
18154 + * be used.
18155 */
18156 -static inline int user_mode(struct pt_regs *regs)
18157 +static inline int user_mode_novm(struct pt_regs *regs)
18158 {
18159 #ifdef CONFIG_X86_32
18160 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
18161 #else
18162 - return !!(regs->cs & 3);
18163 + return !!(regs->cs & SEGMENT_RPL_MASK);
18164 #endif
18165 }
18166
18167 -static inline int user_mode_vm(struct pt_regs *regs)
18168 +static inline int user_mode(struct pt_regs *regs)
18169 {
18170 #ifdef CONFIG_X86_32
18171 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
18172 USER_RPL;
18173 #else
18174 - return user_mode(regs);
18175 + return user_mode_novm(regs);
18176 #endif
18177 }
18178
18179 @@ -121,15 +122,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18180 #ifdef CONFIG_X86_64
18181 static inline bool user_64bit_mode(struct pt_regs *regs)
18182 {
18183 + unsigned long cs = regs->cs & 0xffff;
18184 #ifndef CONFIG_PARAVIRT
18185 /*
18186 * On non-paravirt systems, this is the only long mode CPL 3
18187 * selector. We do not allow long mode selectors in the LDT.
18188 */
18189 - return regs->cs == __USER_CS;
18190 + return cs == __USER_CS;
18191 #else
18192 /* Headers are too twisted for this to go in paravirt.h. */
18193 - return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18194 + return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18195 #endif
18196 }
18197
18198 @@ -180,9 +182,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18199 * Traps from the kernel do not save sp and ss.
18200 * Use the helper function to retrieve sp.
18201 */
18202 - if (offset == offsetof(struct pt_regs, sp) &&
18203 - regs->cs == __KERNEL_CS)
18204 - return kernel_stack_pointer(regs);
18205 + if (offset == offsetof(struct pt_regs, sp)) {
18206 + unsigned long cs = regs->cs & 0xffff;
18207 + if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18208 + return kernel_stack_pointer(regs);
18209 + }
18210 #endif
18211 return *(unsigned long *)((unsigned long)regs + offset);
18212 }
18213 diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18214 index 9c6b890..5305f53 100644
18215 --- a/arch/x86/include/asm/realmode.h
18216 +++ b/arch/x86/include/asm/realmode.h
18217 @@ -22,16 +22,14 @@ struct real_mode_header {
18218 #endif
18219 /* APM/BIOS reboot */
18220 u32 machine_real_restart_asm;
18221 -#ifdef CONFIG_X86_64
18222 u32 machine_real_restart_seg;
18223 -#endif
18224 };
18225
18226 /* This must match data at trampoline_32/64.S */
18227 struct trampoline_header {
18228 #ifdef CONFIG_X86_32
18229 u32 start;
18230 - u16 gdt_pad;
18231 + u16 boot_cs;
18232 u16 gdt_limit;
18233 u32 gdt_base;
18234 #else
18235 diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18236 index a82c4f1..ac45053 100644
18237 --- a/arch/x86/include/asm/reboot.h
18238 +++ b/arch/x86/include/asm/reboot.h
18239 @@ -6,13 +6,13 @@
18240 struct pt_regs;
18241
18242 struct machine_ops {
18243 - void (*restart)(char *cmd);
18244 - void (*halt)(void);
18245 - void (*power_off)(void);
18246 + void (* __noreturn restart)(char *cmd);
18247 + void (* __noreturn halt)(void);
18248 + void (* __noreturn power_off)(void);
18249 void (*shutdown)(void);
18250 void (*crash_shutdown)(struct pt_regs *);
18251 - void (*emergency_restart)(void);
18252 -};
18253 + void (* __noreturn emergency_restart)(void);
18254 +} __no_const;
18255
18256 extern struct machine_ops machine_ops;
18257
18258 diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18259 index 8f7866a..e442f20 100644
18260 --- a/arch/x86/include/asm/rmwcc.h
18261 +++ b/arch/x86/include/asm/rmwcc.h
18262 @@ -3,7 +3,34 @@
18263
18264 #ifdef CC_HAVE_ASM_GOTO
18265
18266 -#define __GEN_RMWcc(fullop, var, cc, ...) \
18267 +#ifdef CONFIG_PAX_REFCOUNT
18268 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18269 +do { \
18270 + asm_volatile_goto (fullop \
18271 + ";jno 0f\n" \
18272 + fullantiop \
18273 + ";int $4\n0:\n" \
18274 + _ASM_EXTABLE(0b, 0b) \
18275 + ";j" cc " %l[cc_label]" \
18276 + : : "m" (var), ## __VA_ARGS__ \
18277 + : "memory" : cc_label); \
18278 + return 0; \
18279 +cc_label: \
18280 + return 1; \
18281 +} while (0)
18282 +#else
18283 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18284 +do { \
18285 + asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18286 + : : "m" (var), ## __VA_ARGS__ \
18287 + : "memory" : cc_label); \
18288 + return 0; \
18289 +cc_label: \
18290 + return 1; \
18291 +} while (0)
18292 +#endif
18293 +
18294 +#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18295 do { \
18296 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18297 : : "m" (var), ## __VA_ARGS__ \
18298 @@ -13,15 +40,46 @@ cc_label: \
18299 return 1; \
18300 } while (0)
18301
18302 -#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18303 - __GEN_RMWcc(op " " arg0, var, cc)
18304 +#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18305 + __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18306
18307 -#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18308 - __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18309 +#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18310 + __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18311 +
18312 +#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18313 + __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18314 +
18315 +#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18316 + __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18317
18318 #else /* !CC_HAVE_ASM_GOTO */
18319
18320 -#define __GEN_RMWcc(fullop, var, cc, ...) \
18321 +#ifdef CONFIG_PAX_REFCOUNT
18322 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18323 +do { \
18324 + char c; \
18325 + asm volatile (fullop \
18326 + ";jno 0f\n" \
18327 + fullantiop \
18328 + ";int $4\n0:\n" \
18329 + _ASM_EXTABLE(0b, 0b) \
18330 + "; set" cc " %1" \
18331 + : "+m" (var), "=qm" (c) \
18332 + : __VA_ARGS__ : "memory"); \
18333 + return c != 0; \
18334 +} while (0)
18335 +#else
18336 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18337 +do { \
18338 + char c; \
18339 + asm volatile (fullop "; set" cc " %1" \
18340 + : "+m" (var), "=qm" (c) \
18341 + : __VA_ARGS__ : "memory"); \
18342 + return c != 0; \
18343 +} while (0)
18344 +#endif
18345 +
18346 +#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18347 do { \
18348 char c; \
18349 asm volatile (fullop "; set" cc " %1" \
18350 @@ -30,11 +88,17 @@ do { \
18351 return c != 0; \
18352 } while (0)
18353
18354 -#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18355 - __GEN_RMWcc(op " " arg0, var, cc)
18356 +#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18357 + __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18358 +
18359 +#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18360 + __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18361 +
18362 +#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18363 + __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18364
18365 -#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18366 - __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18367 +#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18368 + __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18369
18370 #endif /* CC_HAVE_ASM_GOTO */
18371
18372 diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18373 index cad82c9..2e5c5c1 100644
18374 --- a/arch/x86/include/asm/rwsem.h
18375 +++ b/arch/x86/include/asm/rwsem.h
18376 @@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18377 {
18378 asm volatile("# beginning down_read\n\t"
18379 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18380 +
18381 +#ifdef CONFIG_PAX_REFCOUNT
18382 + "jno 0f\n"
18383 + LOCK_PREFIX _ASM_DEC "(%1)\n"
18384 + "int $4\n0:\n"
18385 + _ASM_EXTABLE(0b, 0b)
18386 +#endif
18387 +
18388 /* adds 0x00000001 */
18389 " jns 1f\n"
18390 " call call_rwsem_down_read_failed\n"
18391 @@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18392 "1:\n\t"
18393 " mov %1,%2\n\t"
18394 " add %3,%2\n\t"
18395 +
18396 +#ifdef CONFIG_PAX_REFCOUNT
18397 + "jno 0f\n"
18398 + "sub %3,%2\n"
18399 + "int $4\n0:\n"
18400 + _ASM_EXTABLE(0b, 0b)
18401 +#endif
18402 +
18403 " jle 2f\n\t"
18404 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18405 " jnz 1b\n\t"
18406 @@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18407 long tmp;
18408 asm volatile("# beginning down_write\n\t"
18409 LOCK_PREFIX " xadd %1,(%2)\n\t"
18410 +
18411 +#ifdef CONFIG_PAX_REFCOUNT
18412 + "jno 0f\n"
18413 + "mov %1,(%2)\n"
18414 + "int $4\n0:\n"
18415 + _ASM_EXTABLE(0b, 0b)
18416 +#endif
18417 +
18418 /* adds 0xffff0001, returns the old value */
18419 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18420 /* was the active mask 0 before? */
18421 @@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18422 long tmp;
18423 asm volatile("# beginning __up_read\n\t"
18424 LOCK_PREFIX " xadd %1,(%2)\n\t"
18425 +
18426 +#ifdef CONFIG_PAX_REFCOUNT
18427 + "jno 0f\n"
18428 + "mov %1,(%2)\n"
18429 + "int $4\n0:\n"
18430 + _ASM_EXTABLE(0b, 0b)
18431 +#endif
18432 +
18433 /* subtracts 1, returns the old value */
18434 " jns 1f\n\t"
18435 " call call_rwsem_wake\n" /* expects old value in %edx */
18436 @@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18437 long tmp;
18438 asm volatile("# beginning __up_write\n\t"
18439 LOCK_PREFIX " xadd %1,(%2)\n\t"
18440 +
18441 +#ifdef CONFIG_PAX_REFCOUNT
18442 + "jno 0f\n"
18443 + "mov %1,(%2)\n"
18444 + "int $4\n0:\n"
18445 + _ASM_EXTABLE(0b, 0b)
18446 +#endif
18447 +
18448 /* subtracts 0xffff0001, returns the old value */
18449 " jns 1f\n\t"
18450 " call call_rwsem_wake\n" /* expects old value in %edx */
18451 @@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18452 {
18453 asm volatile("# beginning __downgrade_write\n\t"
18454 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18455 +
18456 +#ifdef CONFIG_PAX_REFCOUNT
18457 + "jno 0f\n"
18458 + LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18459 + "int $4\n0:\n"
18460 + _ASM_EXTABLE(0b, 0b)
18461 +#endif
18462 +
18463 /*
18464 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
18465 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
18466 @@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18467 */
18468 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18469 {
18470 - asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
18471 + asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
18472 +
18473 +#ifdef CONFIG_PAX_REFCOUNT
18474 + "jno 0f\n"
18475 + LOCK_PREFIX _ASM_SUB "%1,%0\n"
18476 + "int $4\n0:\n"
18477 + _ASM_EXTABLE(0b, 0b)
18478 +#endif
18479 +
18480 : "+m" (sem->count)
18481 : "er" (delta));
18482 }
18483 @@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18484 */
18485 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
18486 {
18487 - return delta + xadd(&sem->count, delta);
18488 + return delta + xadd_check_overflow(&sem->count, delta);
18489 }
18490
18491 #endif /* __KERNEL__ */
18492 diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
18493 index 6f1c3a8..7744f19 100644
18494 --- a/arch/x86/include/asm/segment.h
18495 +++ b/arch/x86/include/asm/segment.h
18496 @@ -64,10 +64,15 @@
18497 * 26 - ESPFIX small SS
18498 * 27 - per-cpu [ offset to per-cpu data area ]
18499 * 28 - stack_canary-20 [ for stack protector ]
18500 - * 29 - unused
18501 - * 30 - unused
18502 + * 29 - PCI BIOS CS
18503 + * 30 - PCI BIOS DS
18504 * 31 - TSS for double fault handler
18505 */
18506 +#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
18507 +#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
18508 +#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
18509 +#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
18510 +
18511 #define GDT_ENTRY_TLS_MIN 6
18512 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
18513
18514 @@ -79,6 +84,8 @@
18515
18516 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
18517
18518 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
18519 +
18520 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
18521
18522 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
18523 @@ -104,6 +111,12 @@
18524 #define __KERNEL_STACK_CANARY 0
18525 #endif
18526
18527 +#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
18528 +#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
18529 +
18530 +#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
18531 +#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
18532 +
18533 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
18534
18535 /*
18536 @@ -141,7 +154,7 @@
18537 */
18538
18539 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
18540 -#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
18541 +#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
18542
18543
18544 #else
18545 @@ -165,6 +178,8 @@
18546 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
18547 #define __USER32_DS __USER_DS
18548
18549 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
18550 +
18551 #define GDT_ENTRY_TSS 8 /* needs two entries */
18552 #define GDT_ENTRY_LDT 10 /* needs two entries */
18553 #define GDT_ENTRY_TLS_MIN 12
18554 @@ -173,6 +188,8 @@
18555 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
18556 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
18557
18558 +#define GDT_ENTRY_UDEREF_KERNEL_DS 16
18559 +
18560 /* TLS indexes for 64bit - hardcoded in arch_prctl */
18561 #define FS_TLS 0
18562 #define GS_TLS 1
18563 @@ -180,12 +197,14 @@
18564 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
18565 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
18566
18567 -#define GDT_ENTRIES 16
18568 +#define GDT_ENTRIES 17
18569
18570 #endif
18571
18572 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
18573 +#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
18574 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
18575 +#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
18576 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
18577 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
18578 #ifndef CONFIG_PARAVIRT
18579 @@ -268,7 +287,7 @@ static inline unsigned long get_limit(unsigned long segment)
18580 {
18581 unsigned long __limit;
18582 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
18583 - return __limit + 1;
18584 + return __limit;
18585 }
18586
18587 #endif /* !__ASSEMBLY__ */
18588 diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
18589 index 8d3120f..352b440 100644
18590 --- a/arch/x86/include/asm/smap.h
18591 +++ b/arch/x86/include/asm/smap.h
18592 @@ -25,11 +25,40 @@
18593
18594 #include <asm/alternative-asm.h>
18595
18596 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18597 +#define ASM_PAX_OPEN_USERLAND \
18598 + 661: jmp 663f; \
18599 + .pushsection .altinstr_replacement, "a" ; \
18600 + 662: pushq %rax; nop; \
18601 + .popsection ; \
18602 + .pushsection .altinstructions, "a" ; \
18603 + altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
18604 + .popsection ; \
18605 + call __pax_open_userland; \
18606 + popq %rax; \
18607 + 663:
18608 +
18609 +#define ASM_PAX_CLOSE_USERLAND \
18610 + 661: jmp 663f; \
18611 + .pushsection .altinstr_replacement, "a" ; \
18612 + 662: pushq %rax; nop; \
18613 + .popsection; \
18614 + .pushsection .altinstructions, "a" ; \
18615 + altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
18616 + .popsection; \
18617 + call __pax_close_userland; \
18618 + popq %rax; \
18619 + 663:
18620 +#else
18621 +#define ASM_PAX_OPEN_USERLAND
18622 +#define ASM_PAX_CLOSE_USERLAND
18623 +#endif
18624 +
18625 #ifdef CONFIG_X86_SMAP
18626
18627 #define ASM_CLAC \
18628 661: ASM_NOP3 ; \
18629 - .pushsection .altinstr_replacement, "ax" ; \
18630 + .pushsection .altinstr_replacement, "a" ; \
18631 662: __ASM_CLAC ; \
18632 .popsection ; \
18633 .pushsection .altinstructions, "a" ; \
18634 @@ -38,7 +67,7 @@
18635
18636 #define ASM_STAC \
18637 661: ASM_NOP3 ; \
18638 - .pushsection .altinstr_replacement, "ax" ; \
18639 + .pushsection .altinstr_replacement, "a" ; \
18640 662: __ASM_STAC ; \
18641 .popsection ; \
18642 .pushsection .altinstructions, "a" ; \
18643 @@ -56,6 +85,37 @@
18644
18645 #include <asm/alternative.h>
18646
18647 +#define __HAVE_ARCH_PAX_OPEN_USERLAND
18648 +#define __HAVE_ARCH_PAX_CLOSE_USERLAND
18649 +
18650 +extern void __pax_open_userland(void);
18651 +static __always_inline unsigned long pax_open_userland(void)
18652 +{
18653 +
18654 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18655 + asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
18656 + :
18657 + : [open] "i" (__pax_open_userland)
18658 + : "memory", "rax");
18659 +#endif
18660 +
18661 + return 0;
18662 +}
18663 +
18664 +extern void __pax_close_userland(void);
18665 +static __always_inline unsigned long pax_close_userland(void)
18666 +{
18667 +
18668 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18669 + asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
18670 + :
18671 + : [close] "i" (__pax_close_userland)
18672 + : "memory", "rax");
18673 +#endif
18674 +
18675 + return 0;
18676 +}
18677 +
18678 #ifdef CONFIG_X86_SMAP
18679
18680 static __always_inline void clac(void)
18681 diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
18682 index 8cd27e0..7f05ec8 100644
18683 --- a/arch/x86/include/asm/smp.h
18684 +++ b/arch/x86/include/asm/smp.h
18685 @@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
18686 /* cpus sharing the last level cache: */
18687 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
18688 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
18689 -DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
18690 +DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
18691
18692 static inline struct cpumask *cpu_sibling_mask(int cpu)
18693 {
18694 @@ -78,7 +78,7 @@ struct smp_ops {
18695
18696 void (*send_call_func_ipi)(const struct cpumask *mask);
18697 void (*send_call_func_single_ipi)(int cpu);
18698 -};
18699 +} __no_const;
18700
18701 /* Globals due to paravirt */
18702 extern void set_cpu_sibling_map(int cpu);
18703 @@ -190,14 +190,8 @@ extern unsigned disabled_cpus;
18704 extern int safe_smp_processor_id(void);
18705
18706 #elif defined(CONFIG_X86_64_SMP)
18707 -#define raw_smp_processor_id() (this_cpu_read(cpu_number))
18708 -
18709 -#define stack_smp_processor_id() \
18710 -({ \
18711 - struct thread_info *ti; \
18712 - __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
18713 - ti->cpu; \
18714 -})
18715 +#define raw_smp_processor_id() (this_cpu_read(cpu_number))
18716 +#define stack_smp_processor_id() raw_smp_processor_id()
18717 #define safe_smp_processor_id() smp_processor_id()
18718
18719 #endif
18720 diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
18721 index 0f62f54..cb5d0dd 100644
18722 --- a/arch/x86/include/asm/spinlock.h
18723 +++ b/arch/x86/include/asm/spinlock.h
18724 @@ -222,6 +222,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
18725 static inline void arch_read_lock(arch_rwlock_t *rw)
18726 {
18727 asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
18728 +
18729 +#ifdef CONFIG_PAX_REFCOUNT
18730 + "jno 0f\n"
18731 + LOCK_PREFIX READ_LOCK_SIZE(inc) " (%0)\n"
18732 + "int $4\n0:\n"
18733 + _ASM_EXTABLE(0b, 0b)
18734 +#endif
18735 +
18736 "jns 1f\n"
18737 "call __read_lock_failed\n\t"
18738 "1:\n"
18739 @@ -231,6 +239,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
18740 static inline void arch_write_lock(arch_rwlock_t *rw)
18741 {
18742 asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
18743 +
18744 +#ifdef CONFIG_PAX_REFCOUNT
18745 + "jno 0f\n"
18746 + LOCK_PREFIX WRITE_LOCK_ADD(%1) "(%0)\n"
18747 + "int $4\n0:\n"
18748 + _ASM_EXTABLE(0b, 0b)
18749 +#endif
18750 +
18751 "jz 1f\n"
18752 "call __write_lock_failed\n\t"
18753 "1:\n"
18754 @@ -260,13 +276,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
18755
18756 static inline void arch_read_unlock(arch_rwlock_t *rw)
18757 {
18758 - asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0"
18759 + asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0\n"
18760 +
18761 +#ifdef CONFIG_PAX_REFCOUNT
18762 + "jno 0f\n"
18763 + LOCK_PREFIX READ_LOCK_SIZE(dec) " %0\n"
18764 + "int $4\n0:\n"
18765 + _ASM_EXTABLE(0b, 0b)
18766 +#endif
18767 +
18768 :"+m" (rw->lock) : : "memory");
18769 }
18770
18771 static inline void arch_write_unlock(arch_rwlock_t *rw)
18772 {
18773 - asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0"
18774 + asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0\n"
18775 +
18776 +#ifdef CONFIG_PAX_REFCOUNT
18777 + "jno 0f\n"
18778 + LOCK_PREFIX WRITE_LOCK_SUB(%1) "%0\n"
18779 + "int $4\n0:\n"
18780 + _ASM_EXTABLE(0b, 0b)
18781 +#endif
18782 +
18783 : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
18784 }
18785
18786 diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
18787 index 6a99859..03cb807 100644
18788 --- a/arch/x86/include/asm/stackprotector.h
18789 +++ b/arch/x86/include/asm/stackprotector.h
18790 @@ -47,7 +47,7 @@
18791 * head_32 for boot CPU and setup_per_cpu_areas() for others.
18792 */
18793 #define GDT_STACK_CANARY_INIT \
18794 - [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
18795 + [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
18796
18797 /*
18798 * Initialize the stackprotector canary value.
18799 @@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
18800
18801 static inline void load_stack_canary_segment(void)
18802 {
18803 -#ifdef CONFIG_X86_32
18804 +#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
18805 asm volatile ("mov %0, %%gs" : : "r" (0));
18806 #endif
18807 }
18808 diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
18809 index 70bbe39..4ae2bd4 100644
18810 --- a/arch/x86/include/asm/stacktrace.h
18811 +++ b/arch/x86/include/asm/stacktrace.h
18812 @@ -11,28 +11,20 @@
18813
18814 extern int kstack_depth_to_print;
18815
18816 -struct thread_info;
18817 +struct task_struct;
18818 struct stacktrace_ops;
18819
18820 -typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
18821 - unsigned long *stack,
18822 - unsigned long bp,
18823 - const struct stacktrace_ops *ops,
18824 - void *data,
18825 - unsigned long *end,
18826 - int *graph);
18827 +typedef unsigned long walk_stack_t(struct task_struct *task,
18828 + void *stack_start,
18829 + unsigned long *stack,
18830 + unsigned long bp,
18831 + const struct stacktrace_ops *ops,
18832 + void *data,
18833 + unsigned long *end,
18834 + int *graph);
18835
18836 -extern unsigned long
18837 -print_context_stack(struct thread_info *tinfo,
18838 - unsigned long *stack, unsigned long bp,
18839 - const struct stacktrace_ops *ops, void *data,
18840 - unsigned long *end, int *graph);
18841 -
18842 -extern unsigned long
18843 -print_context_stack_bp(struct thread_info *tinfo,
18844 - unsigned long *stack, unsigned long bp,
18845 - const struct stacktrace_ops *ops, void *data,
18846 - unsigned long *end, int *graph);
18847 +extern walk_stack_t print_context_stack;
18848 +extern walk_stack_t print_context_stack_bp;
18849
18850 /* Generic stack tracer with callbacks */
18851
18852 @@ -40,7 +32,7 @@ struct stacktrace_ops {
18853 void (*address)(void *data, unsigned long address, int reliable);
18854 /* On negative return stop dumping */
18855 int (*stack)(void *data, char *name);
18856 - walk_stack_t walk_stack;
18857 + walk_stack_t *walk_stack;
18858 };
18859
18860 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
18861 diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
18862 index d7f3b3b..3cc39f1 100644
18863 --- a/arch/x86/include/asm/switch_to.h
18864 +++ b/arch/x86/include/asm/switch_to.h
18865 @@ -108,7 +108,7 @@ do { \
18866 "call __switch_to\n\t" \
18867 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
18868 __switch_canary \
18869 - "movq %P[thread_info](%%rsi),%%r8\n\t" \
18870 + "movq "__percpu_arg([thread_info])",%%r8\n\t" \
18871 "movq %%rax,%%rdi\n\t" \
18872 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
18873 "jnz ret_from_fork\n\t" \
18874 @@ -119,7 +119,7 @@ do { \
18875 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
18876 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
18877 [_tif_fork] "i" (_TIF_FORK), \
18878 - [thread_info] "i" (offsetof(struct task_struct, stack)), \
18879 + [thread_info] "m" (current_tinfo), \
18880 [current_task] "m" (current_task) \
18881 __switch_canary_iparam \
18882 : "memory", "cc" __EXTRA_CLOBBER)
18883 diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
18884 index e1940c0..ac50dd8 100644
18885 --- a/arch/x86/include/asm/thread_info.h
18886 +++ b/arch/x86/include/asm/thread_info.h
18887 @@ -10,6 +10,7 @@
18888 #include <linux/compiler.h>
18889 #include <asm/page.h>
18890 #include <asm/types.h>
18891 +#include <asm/percpu.h>
18892
18893 /*
18894 * low level task data that entry.S needs immediate access to
18895 @@ -23,7 +24,6 @@ struct exec_domain;
18896 #include <linux/atomic.h>
18897
18898 struct thread_info {
18899 - struct task_struct *task; /* main task structure */
18900 struct exec_domain *exec_domain; /* execution domain */
18901 __u32 flags; /* low level flags */
18902 __u32 status; /* thread synchronous flags */
18903 @@ -32,19 +32,13 @@ struct thread_info {
18904 mm_segment_t addr_limit;
18905 struct restart_block restart_block;
18906 void __user *sysenter_return;
18907 -#ifdef CONFIG_X86_32
18908 - unsigned long previous_esp; /* ESP of the previous stack in
18909 - case of nested (IRQ) stacks
18910 - */
18911 - __u8 supervisor_stack[0];
18912 -#endif
18913 + unsigned long lowest_stack;
18914 unsigned int sig_on_uaccess_error:1;
18915 unsigned int uaccess_err:1; /* uaccess failed */
18916 };
18917
18918 -#define INIT_THREAD_INFO(tsk) \
18919 +#define INIT_THREAD_INFO \
18920 { \
18921 - .task = &tsk, \
18922 .exec_domain = &default_exec_domain, \
18923 .flags = 0, \
18924 .cpu = 0, \
18925 @@ -55,7 +49,7 @@ struct thread_info {
18926 }, \
18927 }
18928
18929 -#define init_thread_info (init_thread_union.thread_info)
18930 +#define init_thread_info (init_thread_union.stack)
18931 #define init_stack (init_thread_union.stack)
18932
18933 #else /* !__ASSEMBLY__ */
18934 @@ -95,6 +89,7 @@ struct thread_info {
18935 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
18936 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
18937 #define TIF_X32 30 /* 32-bit native x86-64 binary */
18938 +#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
18939
18940 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
18941 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
18942 @@ -118,17 +113,18 @@ struct thread_info {
18943 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
18944 #define _TIF_ADDR32 (1 << TIF_ADDR32)
18945 #define _TIF_X32 (1 << TIF_X32)
18946 +#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
18947
18948 /* work to do in syscall_trace_enter() */
18949 #define _TIF_WORK_SYSCALL_ENTRY \
18950 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
18951 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
18952 - _TIF_NOHZ)
18953 + _TIF_NOHZ | _TIF_GRSEC_SETXID)
18954
18955 /* work to do in syscall_trace_leave() */
18956 #define _TIF_WORK_SYSCALL_EXIT \
18957 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
18958 - _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
18959 + _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
18960
18961 /* work to do on interrupt/exception return */
18962 #define _TIF_WORK_MASK \
18963 @@ -139,7 +135,7 @@ struct thread_info {
18964 /* work to do on any return to user space */
18965 #define _TIF_ALLWORK_MASK \
18966 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
18967 - _TIF_NOHZ)
18968 + _TIF_NOHZ | _TIF_GRSEC_SETXID)
18969
18970 /* Only used for 64 bit */
18971 #define _TIF_DO_NOTIFY_MASK \
18972 @@ -153,6 +149,23 @@ struct thread_info {
18973 #define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY)
18974 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
18975
18976 +#ifdef __ASSEMBLY__
18977 +/* how to get the thread information struct from ASM */
18978 +#define GET_THREAD_INFO(reg) \
18979 + mov PER_CPU_VAR(current_tinfo), reg
18980 +
18981 +/* use this one if reg already contains %esp */
18982 +#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg)
18983 +#else
18984 +/* how to get the thread information struct from C */
18985 +DECLARE_PER_CPU(struct thread_info *, current_tinfo);
18986 +
18987 +static __always_inline struct thread_info *current_thread_info(void)
18988 +{
18989 + return this_cpu_read_stable(current_tinfo);
18990 +}
18991 +#endif
18992 +
18993 #ifdef CONFIG_X86_32
18994
18995 #define STACK_WARN (THREAD_SIZE/8)
18996 @@ -169,31 +182,10 @@ struct thread_info {
18997 sp; \
18998 })
18999
19000 -/* how to get the thread information struct from C */
19001 -static inline struct thread_info *current_thread_info(void)
19002 -{
19003 - return (struct thread_info *)
19004 - (current_stack_pointer & ~(THREAD_SIZE - 1));
19005 -}
19006 -
19007 -#else /* !__ASSEMBLY__ */
19008 -
19009 -/* how to get the thread information struct from ASM */
19010 -#define GET_THREAD_INFO(reg) \
19011 - movl $-THREAD_SIZE, reg; \
19012 - andl %esp, reg
19013 -
19014 -/* use this one if reg already contains %esp */
19015 -#define GET_THREAD_INFO_WITH_ESP(reg) \
19016 - andl $-THREAD_SIZE, reg
19017 -
19018 #endif
19019
19020 #else /* X86_32 */
19021
19022 -#include <asm/percpu.h>
19023 -#define KERNEL_STACK_OFFSET (5*8)
19024 -
19025 /*
19026 * macros/functions for gaining access to the thread information structure
19027 * preempt_count needs to be 1 initially, until the scheduler is functional.
19028 @@ -201,27 +193,8 @@ static inline struct thread_info *current_thread_info(void)
19029 #ifndef __ASSEMBLY__
19030 DECLARE_PER_CPU(unsigned long, kernel_stack);
19031
19032 -static inline struct thread_info *current_thread_info(void)
19033 -{
19034 - struct thread_info *ti;
19035 - ti = (void *)(this_cpu_read_stable(kernel_stack) +
19036 - KERNEL_STACK_OFFSET - THREAD_SIZE);
19037 - return ti;
19038 -}
19039 -
19040 -#else /* !__ASSEMBLY__ */
19041 -
19042 -/* how to get the thread information struct from ASM */
19043 -#define GET_THREAD_INFO(reg) \
19044 - movq PER_CPU_VAR(kernel_stack),reg ; \
19045 - subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg
19046 -
19047 -/*
19048 - * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
19049 - * a certain register (to be used in assembler memory operands).
19050 - */
19051 -#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
19052 -
19053 +/* how to get the current stack pointer from C */
19054 +register unsigned long current_stack_pointer asm("rsp") __used;
19055 #endif
19056
19057 #endif /* !X86_32 */
19058 @@ -280,5 +253,12 @@ static inline bool is_ia32_task(void)
19059 extern void arch_task_cache_init(void);
19060 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19061 extern void arch_release_task_struct(struct task_struct *tsk);
19062 +
19063 +#define __HAVE_THREAD_FUNCTIONS
19064 +#define task_thread_info(task) (&(task)->tinfo)
19065 +#define task_stack_page(task) ((task)->stack)
19066 +#define setup_thread_stack(p, org) do {} while (0)
19067 +#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19068 +
19069 #endif
19070 #endif /* _ASM_X86_THREAD_INFO_H */
19071 diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19072 index 04905bf..49203ca 100644
19073 --- a/arch/x86/include/asm/tlbflush.h
19074 +++ b/arch/x86/include/asm/tlbflush.h
19075 @@ -17,18 +17,44 @@
19076
19077 static inline void __native_flush_tlb(void)
19078 {
19079 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
19080 + u64 descriptor[2];
19081 +
19082 + descriptor[0] = PCID_KERNEL;
19083 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_MONGLOBAL) : "memory");
19084 + return;
19085 + }
19086 +
19087 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19088 + if (static_cpu_has(X86_FEATURE_PCID)) {
19089 + unsigned int cpu = raw_get_cpu();
19090 +
19091 + native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19092 + native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19093 + raw_put_cpu_no_resched();
19094 + return;
19095 + }
19096 +#endif
19097 +
19098 native_write_cr3(native_read_cr3());
19099 }
19100
19101 static inline void __native_flush_tlb_global_irq_disabled(void)
19102 {
19103 - unsigned long cr4;
19104 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
19105 + u64 descriptor[2];
19106
19107 - cr4 = native_read_cr4();
19108 - /* clear PGE */
19109 - native_write_cr4(cr4 & ~X86_CR4_PGE);
19110 - /* write old PGE again and flush TLBs */
19111 - native_write_cr4(cr4);
19112 + descriptor[0] = PCID_KERNEL;
19113 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19114 + } else {
19115 + unsigned long cr4;
19116 +
19117 + cr4 = native_read_cr4();
19118 + /* clear PGE */
19119 + native_write_cr4(cr4 & ~X86_CR4_PGE);
19120 + /* write old PGE again and flush TLBs */
19121 + native_write_cr4(cr4);
19122 + }
19123 }
19124
19125 static inline void __native_flush_tlb_global(void)
19126 @@ -49,6 +75,41 @@ static inline void __native_flush_tlb_global(void)
19127
19128 static inline void __native_flush_tlb_single(unsigned long addr)
19129 {
19130 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
19131 + u64 descriptor[2];
19132 +
19133 + descriptor[0] = PCID_KERNEL;
19134 + descriptor[1] = addr;
19135 +
19136 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19137 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19138 + if (addr < TASK_SIZE_MAX)
19139 + descriptor[1] += pax_user_shadow_base;
19140 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19141 + }
19142 +
19143 + descriptor[0] = PCID_USER;
19144 + descriptor[1] = addr;
19145 +#endif
19146 +
19147 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19148 + return;
19149 + }
19150 +
19151 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19152 + if (static_cpu_has(X86_FEATURE_PCID)) {
19153 + unsigned int cpu = raw_get_cpu();
19154 +
19155 + native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19156 + asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19157 + native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19158 + raw_put_cpu_no_resched();
19159 +
19160 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19161 + addr += pax_user_shadow_base;
19162 + }
19163 +#endif
19164 +
19165 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19166 }
19167
19168 diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19169 index 0d592e0..f58a222 100644
19170 --- a/arch/x86/include/asm/uaccess.h
19171 +++ b/arch/x86/include/asm/uaccess.h
19172 @@ -7,6 +7,7 @@
19173 #include <linux/compiler.h>
19174 #include <linux/thread_info.h>
19175 #include <linux/string.h>
19176 +#include <linux/spinlock.h>
19177 #include <asm/asm.h>
19178 #include <asm/page.h>
19179 #include <asm/smap.h>
19180 @@ -29,7 +30,12 @@
19181
19182 #define get_ds() (KERNEL_DS)
19183 #define get_fs() (current_thread_info()->addr_limit)
19184 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19185 +void __set_fs(mm_segment_t x);
19186 +void set_fs(mm_segment_t x);
19187 +#else
19188 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19189 +#endif
19190
19191 #define segment_eq(a, b) ((a).seg == (b).seg)
19192
19193 @@ -85,8 +91,34 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19194 * checks that the pointer is in the user space range - after calling
19195 * this function, memory access functions may still return -EFAULT.
19196 */
19197 -#define access_ok(type, addr, size) \
19198 - likely(!__range_not_ok(addr, size, user_addr_max()))
19199 +extern int _cond_resched(void);
19200 +#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19201 +#define access_ok(type, addr, size) \
19202 +({ \
19203 + long __size = size; \
19204 + unsigned long __addr = (unsigned long)addr; \
19205 + unsigned long __addr_ao = __addr & PAGE_MASK; \
19206 + unsigned long __end_ao = __addr + __size - 1; \
19207 + bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19208 + if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19209 + while(__addr_ao <= __end_ao) { \
19210 + char __c_ao; \
19211 + __addr_ao += PAGE_SIZE; \
19212 + if (__size > PAGE_SIZE) \
19213 + _cond_resched(); \
19214 + if (__get_user(__c_ao, (char __user *)__addr)) \
19215 + break; \
19216 + if (type != VERIFY_WRITE) { \
19217 + __addr = __addr_ao; \
19218 + continue; \
19219 + } \
19220 + if (__put_user(__c_ao, (char __user *)__addr)) \
19221 + break; \
19222 + __addr = __addr_ao; \
19223 + } \
19224 + } \
19225 + __ret_ao; \
19226 +})
19227
19228 /*
19229 * The exception table consists of pairs of addresses relative to the
19230 @@ -176,10 +208,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19231 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19232 __chk_user_ptr(ptr); \
19233 might_fault(); \
19234 + pax_open_userland(); \
19235 asm volatile("call __get_user_%P3" \
19236 : "=a" (__ret_gu), "=r" (__val_gu) \
19237 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19238 (x) = (__typeof__(*(ptr))) __val_gu; \
19239 + pax_close_userland(); \
19240 __ret_gu; \
19241 })
19242
19243 @@ -187,13 +221,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19244 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19245 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19246
19247 -
19248 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19249 +#define __copyuser_seg "gs;"
19250 +#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19251 +#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19252 +#else
19253 +#define __copyuser_seg
19254 +#define __COPYUSER_SET_ES
19255 +#define __COPYUSER_RESTORE_ES
19256 +#endif
19257
19258 #ifdef CONFIG_X86_32
19259 #define __put_user_asm_u64(x, addr, err, errret) \
19260 asm volatile(ASM_STAC "\n" \
19261 - "1: movl %%eax,0(%2)\n" \
19262 - "2: movl %%edx,4(%2)\n" \
19263 + "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19264 + "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19265 "3: " ASM_CLAC "\n" \
19266 ".section .fixup,\"ax\"\n" \
19267 "4: movl %3,%0\n" \
19268 @@ -206,8 +248,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19269
19270 #define __put_user_asm_ex_u64(x, addr) \
19271 asm volatile(ASM_STAC "\n" \
19272 - "1: movl %%eax,0(%1)\n" \
19273 - "2: movl %%edx,4(%1)\n" \
19274 + "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19275 + "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19276 "3: " ASM_CLAC "\n" \
19277 _ASM_EXTABLE_EX(1b, 2b) \
19278 _ASM_EXTABLE_EX(2b, 3b) \
19279 @@ -257,7 +299,8 @@ extern void __put_user_8(void);
19280 __typeof__(*(ptr)) __pu_val; \
19281 __chk_user_ptr(ptr); \
19282 might_fault(); \
19283 - __pu_val = x; \
19284 + __pu_val = (x); \
19285 + pax_open_userland(); \
19286 switch (sizeof(*(ptr))) { \
19287 case 1: \
19288 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19289 @@ -275,6 +318,7 @@ extern void __put_user_8(void);
19290 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19291 break; \
19292 } \
19293 + pax_close_userland(); \
19294 __ret_pu; \
19295 })
19296
19297 @@ -355,8 +399,10 @@ do { \
19298 } while (0)
19299
19300 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19301 +do { \
19302 + pax_open_userland(); \
19303 asm volatile(ASM_STAC "\n" \
19304 - "1: mov"itype" %2,%"rtype"1\n" \
19305 + "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19306 "2: " ASM_CLAC "\n" \
19307 ".section .fixup,\"ax\"\n" \
19308 "3: mov %3,%0\n" \
19309 @@ -364,8 +410,10 @@ do { \
19310 " jmp 2b\n" \
19311 ".previous\n" \
19312 _ASM_EXTABLE(1b, 3b) \
19313 - : "=r" (err), ltype(x) \
19314 - : "m" (__m(addr)), "i" (errret), "0" (err))
19315 + : "=r" (err), ltype (x) \
19316 + : "m" (__m(addr)), "i" (errret), "0" (err)); \
19317 + pax_close_userland(); \
19318 +} while (0)
19319
19320 #define __get_user_size_ex(x, ptr, size) \
19321 do { \
19322 @@ -389,7 +437,7 @@ do { \
19323 } while (0)
19324
19325 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19326 - asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19327 + asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19328 "2:\n" \
19329 _ASM_EXTABLE_EX(1b, 2b) \
19330 : ltype(x) : "m" (__m(addr)))
19331 @@ -406,13 +454,24 @@ do { \
19332 int __gu_err; \
19333 unsigned long __gu_val; \
19334 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19335 - (x) = (__force __typeof__(*(ptr)))__gu_val; \
19336 + (x) = (__typeof__(*(ptr)))__gu_val; \
19337 __gu_err; \
19338 })
19339
19340 /* FIXME: this hack is definitely wrong -AK */
19341 struct __large_struct { unsigned long buf[100]; };
19342 -#define __m(x) (*(struct __large_struct __user *)(x))
19343 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19344 +#define ____m(x) \
19345 +({ \
19346 + unsigned long ____x = (unsigned long)(x); \
19347 + if (____x < pax_user_shadow_base) \
19348 + ____x += pax_user_shadow_base; \
19349 + (typeof(x))____x; \
19350 +})
19351 +#else
19352 +#define ____m(x) (x)
19353 +#endif
19354 +#define __m(x) (*(struct __large_struct __user *)____m(x))
19355
19356 /*
19357 * Tell gcc we read from memory instead of writing: this is because
19358 @@ -420,8 +479,10 @@ struct __large_struct { unsigned long buf[100]; };
19359 * aliasing issues.
19360 */
19361 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19362 +do { \
19363 + pax_open_userland(); \
19364 asm volatile(ASM_STAC "\n" \
19365 - "1: mov"itype" %"rtype"1,%2\n" \
19366 + "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19367 "2: " ASM_CLAC "\n" \
19368 ".section .fixup,\"ax\"\n" \
19369 "3: mov %3,%0\n" \
19370 @@ -429,10 +490,12 @@ struct __large_struct { unsigned long buf[100]; };
19371 ".previous\n" \
19372 _ASM_EXTABLE(1b, 3b) \
19373 : "=r"(err) \
19374 - : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19375 + : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19376 + pax_close_userland(); \
19377 +} while (0)
19378
19379 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19380 - asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19381 + asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19382 "2:\n" \
19383 _ASM_EXTABLE_EX(1b, 2b) \
19384 : : ltype(x), "m" (__m(addr)))
19385 @@ -442,11 +505,13 @@ struct __large_struct { unsigned long buf[100]; };
19386 */
19387 #define uaccess_try do { \
19388 current_thread_info()->uaccess_err = 0; \
19389 + pax_open_userland(); \
19390 stac(); \
19391 barrier();
19392
19393 #define uaccess_catch(err) \
19394 clac(); \
19395 + pax_close_userland(); \
19396 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19397 } while (0)
19398
19399 @@ -471,8 +536,12 @@ struct __large_struct { unsigned long buf[100]; };
19400 * On error, the variable @x is set to zero.
19401 */
19402
19403 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19404 +#define __get_user(x, ptr) get_user((x), (ptr))
19405 +#else
19406 #define __get_user(x, ptr) \
19407 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19408 +#endif
19409
19410 /**
19411 * __put_user: - Write a simple value into user space, with less checking.
19412 @@ -494,8 +563,12 @@ struct __large_struct { unsigned long buf[100]; };
19413 * Returns zero on success, or -EFAULT on error.
19414 */
19415
19416 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19417 +#define __put_user(x, ptr) put_user((x), (ptr))
19418 +#else
19419 #define __put_user(x, ptr) \
19420 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19421 +#endif
19422
19423 #define __get_user_unaligned __get_user
19424 #define __put_user_unaligned __put_user
19425 @@ -513,7 +586,7 @@ struct __large_struct { unsigned long buf[100]; };
19426 #define get_user_ex(x, ptr) do { \
19427 unsigned long __gue_val; \
19428 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19429 - (x) = (__force __typeof__(*(ptr)))__gue_val; \
19430 + (x) = (__typeof__(*(ptr)))__gue_val; \
19431 } while (0)
19432
19433 #define put_user_try uaccess_try
19434 @@ -542,18 +615,19 @@ extern void __cmpxchg_wrong_size(void)
19435 __typeof__(ptr) __uval = (uval); \
19436 __typeof__(*(ptr)) __old = (old); \
19437 __typeof__(*(ptr)) __new = (new); \
19438 + pax_open_userland(); \
19439 switch (size) { \
19440 case 1: \
19441 { \
19442 asm volatile("\t" ASM_STAC "\n" \
19443 - "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19444 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19445 "2:\t" ASM_CLAC "\n" \
19446 "\t.section .fixup, \"ax\"\n" \
19447 "3:\tmov %3, %0\n" \
19448 "\tjmp 2b\n" \
19449 "\t.previous\n" \
19450 _ASM_EXTABLE(1b, 3b) \
19451 - : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19452 + : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19453 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19454 : "memory" \
19455 ); \
19456 @@ -562,14 +636,14 @@ extern void __cmpxchg_wrong_size(void)
19457 case 2: \
19458 { \
19459 asm volatile("\t" ASM_STAC "\n" \
19460 - "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19461 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19462 "2:\t" ASM_CLAC "\n" \
19463 "\t.section .fixup, \"ax\"\n" \
19464 "3:\tmov %3, %0\n" \
19465 "\tjmp 2b\n" \
19466 "\t.previous\n" \
19467 _ASM_EXTABLE(1b, 3b) \
19468 - : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19469 + : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19470 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19471 : "memory" \
19472 ); \
19473 @@ -578,14 +652,14 @@ extern void __cmpxchg_wrong_size(void)
19474 case 4: \
19475 { \
19476 asm volatile("\t" ASM_STAC "\n" \
19477 - "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19478 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19479 "2:\t" ASM_CLAC "\n" \
19480 "\t.section .fixup, \"ax\"\n" \
19481 "3:\tmov %3, %0\n" \
19482 "\tjmp 2b\n" \
19483 "\t.previous\n" \
19484 _ASM_EXTABLE(1b, 3b) \
19485 - : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19486 + : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19487 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19488 : "memory" \
19489 ); \
19490 @@ -597,14 +671,14 @@ extern void __cmpxchg_wrong_size(void)
19491 __cmpxchg_wrong_size(); \
19492 \
19493 asm volatile("\t" ASM_STAC "\n" \
19494 - "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19495 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19496 "2:\t" ASM_CLAC "\n" \
19497 "\t.section .fixup, \"ax\"\n" \
19498 "3:\tmov %3, %0\n" \
19499 "\tjmp 2b\n" \
19500 "\t.previous\n" \
19501 _ASM_EXTABLE(1b, 3b) \
19502 - : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19503 + : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19504 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19505 : "memory" \
19506 ); \
19507 @@ -613,6 +687,7 @@ extern void __cmpxchg_wrong_size(void)
19508 default: \
19509 __cmpxchg_wrong_size(); \
19510 } \
19511 + pax_close_userland(); \
19512 *__uval = __old; \
19513 __ret; \
19514 })
19515 @@ -636,17 +711,6 @@ extern struct movsl_mask {
19516
19517 #define ARCH_HAS_NOCACHE_UACCESS 1
19518
19519 -#ifdef CONFIG_X86_32
19520 -# include <asm/uaccess_32.h>
19521 -#else
19522 -# include <asm/uaccess_64.h>
19523 -#endif
19524 -
19525 -unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19526 - unsigned n);
19527 -unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19528 - unsigned n);
19529 -
19530 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19531 # define copy_user_diag __compiletime_error
19532 #else
19533 @@ -656,7 +720,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19534 extern void copy_user_diag("copy_from_user() buffer size is too small")
19535 copy_from_user_overflow(void);
19536 extern void copy_user_diag("copy_to_user() buffer size is too small")
19537 -copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19538 +copy_to_user_overflow(void);
19539
19540 #undef copy_user_diag
19541
19542 @@ -669,7 +733,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19543
19544 extern void
19545 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19546 -__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19547 +__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19548 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19549
19550 #else
19551 @@ -684,10 +748,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19552
19553 #endif
19554
19555 +#ifdef CONFIG_X86_32
19556 +# include <asm/uaccess_32.h>
19557 +#else
19558 +# include <asm/uaccess_64.h>
19559 +#endif
19560 +
19561 static inline unsigned long __must_check
19562 copy_from_user(void *to, const void __user *from, unsigned long n)
19563 {
19564 - int sz = __compiletime_object_size(to);
19565 + size_t sz = __compiletime_object_size(to);
19566
19567 might_fault();
19568
19569 @@ -709,12 +779,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19570 * case, and do only runtime checking for non-constant sizes.
19571 */
19572
19573 - if (likely(sz < 0 || sz >= n))
19574 - n = _copy_from_user(to, from, n);
19575 - else if(__builtin_constant_p(n))
19576 - copy_from_user_overflow();
19577 - else
19578 - __copy_from_user_overflow(sz, n);
19579 + if (likely(sz != (size_t)-1 && sz < n)) {
19580 + if(__builtin_constant_p(n))
19581 + copy_from_user_overflow();
19582 + else
19583 + __copy_from_user_overflow(sz, n);
19584 + } if (access_ok(VERIFY_READ, from, n))
19585 + n = __copy_from_user(to, from, n);
19586 + else if ((long)n > 0)
19587 + memset(to, 0, n);
19588
19589 return n;
19590 }
19591 @@ -722,17 +795,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19592 static inline unsigned long __must_check
19593 copy_to_user(void __user *to, const void *from, unsigned long n)
19594 {
19595 - int sz = __compiletime_object_size(from);
19596 + size_t sz = __compiletime_object_size(from);
19597
19598 might_fault();
19599
19600 /* See the comment in copy_from_user() above. */
19601 - if (likely(sz < 0 || sz >= n))
19602 - n = _copy_to_user(to, from, n);
19603 - else if(__builtin_constant_p(n))
19604 - copy_to_user_overflow();
19605 - else
19606 - __copy_to_user_overflow(sz, n);
19607 + if (likely(sz != (size_t)-1 && sz < n)) {
19608 + if(__builtin_constant_p(n))
19609 + copy_to_user_overflow();
19610 + else
19611 + __copy_to_user_overflow(sz, n);
19612 + } else if (access_ok(VERIFY_WRITE, to, n))
19613 + n = __copy_to_user(to, from, n);
19614
19615 return n;
19616 }
19617 diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
19618 index 3c03a5d..1071638 100644
19619 --- a/arch/x86/include/asm/uaccess_32.h
19620 +++ b/arch/x86/include/asm/uaccess_32.h
19621 @@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
19622 static __always_inline unsigned long __must_check
19623 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
19624 {
19625 + if ((long)n < 0)
19626 + return n;
19627 +
19628 + check_object_size(from, n, true);
19629 +
19630 if (__builtin_constant_p(n)) {
19631 unsigned long ret;
19632
19633 @@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
19634 __copy_to_user(void __user *to, const void *from, unsigned long n)
19635 {
19636 might_fault();
19637 +
19638 return __copy_to_user_inatomic(to, from, n);
19639 }
19640
19641 static __always_inline unsigned long
19642 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
19643 {
19644 + if ((long)n < 0)
19645 + return n;
19646 +
19647 /* Avoid zeroing the tail if the copy fails..
19648 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
19649 * but as the zeroing behaviour is only significant when n is not
19650 @@ -137,6 +146,12 @@ static __always_inline unsigned long
19651 __copy_from_user(void *to, const void __user *from, unsigned long n)
19652 {
19653 might_fault();
19654 +
19655 + if ((long)n < 0)
19656 + return n;
19657 +
19658 + check_object_size(to, n, false);
19659 +
19660 if (__builtin_constant_p(n)) {
19661 unsigned long ret;
19662
19663 @@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
19664 const void __user *from, unsigned long n)
19665 {
19666 might_fault();
19667 +
19668 + if ((long)n < 0)
19669 + return n;
19670 +
19671 if (__builtin_constant_p(n)) {
19672 unsigned long ret;
19673
19674 @@ -181,7 +200,10 @@ static __always_inline unsigned long
19675 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
19676 unsigned long n)
19677 {
19678 - return __copy_from_user_ll_nocache_nozero(to, from, n);
19679 + if ((long)n < 0)
19680 + return n;
19681 +
19682 + return __copy_from_user_ll_nocache_nozero(to, from, n);
19683 }
19684
19685 #endif /* _ASM_X86_UACCESS_32_H */
19686 diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
19687 index 12a26b9..206c200 100644
19688 --- a/arch/x86/include/asm/uaccess_64.h
19689 +++ b/arch/x86/include/asm/uaccess_64.h
19690 @@ -10,6 +10,9 @@
19691 #include <asm/alternative.h>
19692 #include <asm/cpufeature.h>
19693 #include <asm/page.h>
19694 +#include <asm/pgtable.h>
19695 +
19696 +#define set_fs(x) (current_thread_info()->addr_limit = (x))
19697
19698 /*
19699 * Copy To/From Userspace
19700 @@ -17,14 +20,14 @@
19701
19702 /* Handles exceptions in both to and from, but doesn't do access_ok */
19703 __must_check unsigned long
19704 -copy_user_enhanced_fast_string(void *to, const void *from, unsigned len);
19705 +copy_user_enhanced_fast_string(void *to, const void *from, unsigned len) __size_overflow(3);
19706 __must_check unsigned long
19707 -copy_user_generic_string(void *to, const void *from, unsigned len);
19708 +copy_user_generic_string(void *to, const void *from, unsigned len) __size_overflow(3);
19709 __must_check unsigned long
19710 -copy_user_generic_unrolled(void *to, const void *from, unsigned len);
19711 +copy_user_generic_unrolled(void *to, const void *from, unsigned len) __size_overflow(3);
19712
19713 static __always_inline __must_check unsigned long
19714 -copy_user_generic(void *to, const void *from, unsigned len)
19715 +copy_user_generic(void *to, const void *from, unsigned long len)
19716 {
19717 unsigned ret;
19718
19719 @@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
19720 }
19721
19722 __must_check unsigned long
19723 -copy_in_user(void __user *to, const void __user *from, unsigned len);
19724 +copy_in_user(void __user *to, const void __user *from, unsigned long len);
19725
19726 static __always_inline __must_check
19727 -int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
19728 +unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
19729 {
19730 - int ret = 0;
19731 + size_t sz = __compiletime_object_size(dst);
19732 + unsigned ret = 0;
19733 +
19734 + if (size > INT_MAX)
19735 + return size;
19736 +
19737 + check_object_size(dst, size, false);
19738 +
19739 +#ifdef CONFIG_PAX_MEMORY_UDEREF
19740 + if (!access_ok_noprefault(VERIFY_READ, src, size))
19741 + return size;
19742 +#endif
19743 +
19744 + if (unlikely(sz != (size_t)-1 && sz < size)) {
19745 + if(__builtin_constant_p(size))
19746 + copy_from_user_overflow();
19747 + else
19748 + __copy_from_user_overflow(sz, size);
19749 + return size;
19750 + }
19751
19752 if (!__builtin_constant_p(size))
19753 - return copy_user_generic(dst, (__force void *)src, size);
19754 + return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
19755 switch (size) {
19756 - case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
19757 + case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
19758 ret, "b", "b", "=q", 1);
19759 return ret;
19760 - case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
19761 + case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
19762 ret, "w", "w", "=r", 2);
19763 return ret;
19764 - case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
19765 + case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
19766 ret, "l", "k", "=r", 4);
19767 return ret;
19768 - case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
19769 + case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
19770 ret, "q", "", "=r", 8);
19771 return ret;
19772 case 10:
19773 - __get_user_asm(*(u64 *)dst, (u64 __user *)src,
19774 + __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
19775 ret, "q", "", "=r", 10);
19776 if (unlikely(ret))
19777 return ret;
19778 __get_user_asm(*(u16 *)(8 + (char *)dst),
19779 - (u16 __user *)(8 + (char __user *)src),
19780 + (const u16 __user *)(8 + (const char __user *)src),
19781 ret, "w", "w", "=r", 2);
19782 return ret;
19783 case 16:
19784 - __get_user_asm(*(u64 *)dst, (u64 __user *)src,
19785 + __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
19786 ret, "q", "", "=r", 16);
19787 if (unlikely(ret))
19788 return ret;
19789 __get_user_asm(*(u64 *)(8 + (char *)dst),
19790 - (u64 __user *)(8 + (char __user *)src),
19791 + (const u64 __user *)(8 + (const char __user *)src),
19792 ret, "q", "", "=r", 8);
19793 return ret;
19794 default:
19795 - return copy_user_generic(dst, (__force void *)src, size);
19796 + return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
19797 }
19798 }
19799
19800 static __always_inline __must_check
19801 -int __copy_from_user(void *dst, const void __user *src, unsigned size)
19802 +unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
19803 {
19804 might_fault();
19805 return __copy_from_user_nocheck(dst, src, size);
19806 }
19807
19808 static __always_inline __must_check
19809 -int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
19810 +unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
19811 {
19812 - int ret = 0;
19813 + size_t sz = __compiletime_object_size(src);
19814 + unsigned ret = 0;
19815 +
19816 + if (size > INT_MAX)
19817 + return size;
19818 +
19819 + check_object_size(src, size, true);
19820 +
19821 +#ifdef CONFIG_PAX_MEMORY_UDEREF
19822 + if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
19823 + return size;
19824 +#endif
19825 +
19826 + if (unlikely(sz != (size_t)-1 && sz < size)) {
19827 + if(__builtin_constant_p(size))
19828 + copy_to_user_overflow();
19829 + else
19830 + __copy_to_user_overflow(sz, size);
19831 + return size;
19832 + }
19833
19834 if (!__builtin_constant_p(size))
19835 - return copy_user_generic((__force void *)dst, src, size);
19836 + return copy_user_generic((__force_kernel void *)____m(dst), src, size);
19837 switch (size) {
19838 - case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
19839 + case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
19840 ret, "b", "b", "iq", 1);
19841 return ret;
19842 - case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
19843 + case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
19844 ret, "w", "w", "ir", 2);
19845 return ret;
19846 - case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
19847 + case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
19848 ret, "l", "k", "ir", 4);
19849 return ret;
19850 - case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
19851 + case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
19852 ret, "q", "", "er", 8);
19853 return ret;
19854 case 10:
19855 - __put_user_asm(*(u64 *)src, (u64 __user *)dst,
19856 + __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
19857 ret, "q", "", "er", 10);
19858 if (unlikely(ret))
19859 return ret;
19860 asm("":::"memory");
19861 - __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
19862 + __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
19863 ret, "w", "w", "ir", 2);
19864 return ret;
19865 case 16:
19866 - __put_user_asm(*(u64 *)src, (u64 __user *)dst,
19867 + __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
19868 ret, "q", "", "er", 16);
19869 if (unlikely(ret))
19870 return ret;
19871 asm("":::"memory");
19872 - __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
19873 + __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
19874 ret, "q", "", "er", 8);
19875 return ret;
19876 default:
19877 - return copy_user_generic((__force void *)dst, src, size);
19878 + return copy_user_generic((__force_kernel void *)____m(dst), src, size);
19879 }
19880 }
19881
19882 static __always_inline __must_check
19883 -int __copy_to_user(void __user *dst, const void *src, unsigned size)
19884 +unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
19885 {
19886 might_fault();
19887 return __copy_to_user_nocheck(dst, src, size);
19888 }
19889
19890 static __always_inline __must_check
19891 -int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
19892 +unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
19893 {
19894 - int ret = 0;
19895 + unsigned ret = 0;
19896
19897 might_fault();
19898 +
19899 + if (size > INT_MAX)
19900 + return size;
19901 +
19902 +#ifdef CONFIG_PAX_MEMORY_UDEREF
19903 + if (!access_ok_noprefault(VERIFY_READ, src, size))
19904 + return size;
19905 + if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
19906 + return size;
19907 +#endif
19908 +
19909 if (!__builtin_constant_p(size))
19910 - return copy_user_generic((__force void *)dst,
19911 - (__force void *)src, size);
19912 + return copy_user_generic((__force_kernel void *)____m(dst),
19913 + (__force_kernel const void *)____m(src), size);
19914 switch (size) {
19915 case 1: {
19916 u8 tmp;
19917 - __get_user_asm(tmp, (u8 __user *)src,
19918 + __get_user_asm(tmp, (const u8 __user *)src,
19919 ret, "b", "b", "=q", 1);
19920 if (likely(!ret))
19921 __put_user_asm(tmp, (u8 __user *)dst,
19922 @@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
19923 }
19924 case 2: {
19925 u16 tmp;
19926 - __get_user_asm(tmp, (u16 __user *)src,
19927 + __get_user_asm(tmp, (const u16 __user *)src,
19928 ret, "w", "w", "=r", 2);
19929 if (likely(!ret))
19930 __put_user_asm(tmp, (u16 __user *)dst,
19931 @@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
19932
19933 case 4: {
19934 u32 tmp;
19935 - __get_user_asm(tmp, (u32 __user *)src,
19936 + __get_user_asm(tmp, (const u32 __user *)src,
19937 ret, "l", "k", "=r", 4);
19938 if (likely(!ret))
19939 __put_user_asm(tmp, (u32 __user *)dst,
19940 @@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
19941 }
19942 case 8: {
19943 u64 tmp;
19944 - __get_user_asm(tmp, (u64 __user *)src,
19945 + __get_user_asm(tmp, (const u64 __user *)src,
19946 ret, "q", "", "=r", 8);
19947 if (likely(!ret))
19948 __put_user_asm(tmp, (u64 __user *)dst,
19949 @@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
19950 return ret;
19951 }
19952 default:
19953 - return copy_user_generic((__force void *)dst,
19954 - (__force void *)src, size);
19955 + return copy_user_generic((__force_kernel void *)____m(dst),
19956 + (__force_kernel const void *)____m(src), size);
19957 }
19958 }
19959
19960 -static __must_check __always_inline int
19961 -__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
19962 +static __must_check __always_inline unsigned long
19963 +__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
19964 {
19965 return __copy_from_user_nocheck(dst, src, size);
19966 }
19967
19968 -static __must_check __always_inline int
19969 -__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
19970 +static __must_check __always_inline unsigned long
19971 +__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
19972 {
19973 return __copy_to_user_nocheck(dst, src, size);
19974 }
19975
19976 -extern long __copy_user_nocache(void *dst, const void __user *src,
19977 - unsigned size, int zerorest);
19978 +extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
19979 + unsigned long size, int zerorest);
19980
19981 -static inline int
19982 -__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
19983 +static inline unsigned long
19984 +__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
19985 {
19986 might_fault();
19987 +
19988 + if (size > INT_MAX)
19989 + return size;
19990 +
19991 +#ifdef CONFIG_PAX_MEMORY_UDEREF
19992 + if (!access_ok_noprefault(VERIFY_READ, src, size))
19993 + return size;
19994 +#endif
19995 +
19996 return __copy_user_nocache(dst, src, size, 1);
19997 }
19998
19999 -static inline int
20000 +static inline unsigned long
20001 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20002 - unsigned size)
20003 + unsigned long size)
20004 {
20005 + if (size > INT_MAX)
20006 + return size;
20007 +
20008 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20009 + if (!access_ok_noprefault(VERIFY_READ, src, size))
20010 + return size;
20011 +#endif
20012 +
20013 return __copy_user_nocache(dst, src, size, 0);
20014 }
20015
20016 unsigned long
20017 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
20018 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
20019
20020 #endif /* _ASM_X86_UACCESS_64_H */
20021 diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20022 index 5b238981..77fdd78 100644
20023 --- a/arch/x86/include/asm/word-at-a-time.h
20024 +++ b/arch/x86/include/asm/word-at-a-time.h
20025 @@ -11,7 +11,7 @@
20026 * and shift, for example.
20027 */
20028 struct word_at_a_time {
20029 - const unsigned long one_bits, high_bits;
20030 + unsigned long one_bits, high_bits;
20031 };
20032
20033 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20034 diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20035 index e45e4da..44e8572 100644
20036 --- a/arch/x86/include/asm/x86_init.h
20037 +++ b/arch/x86/include/asm/x86_init.h
20038 @@ -129,7 +129,7 @@ struct x86_init_ops {
20039 struct x86_init_timers timers;
20040 struct x86_init_iommu iommu;
20041 struct x86_init_pci pci;
20042 -};
20043 +} __no_const;
20044
20045 /**
20046 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20047 @@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20048 void (*setup_percpu_clockev)(void);
20049 void (*early_percpu_clock_init)(void);
20050 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20051 -};
20052 +} __no_const;
20053
20054 struct timespec;
20055
20056 @@ -168,7 +168,7 @@ struct x86_platform_ops {
20057 void (*save_sched_clock_state)(void);
20058 void (*restore_sched_clock_state)(void);
20059 void (*apic_post_init)(void);
20060 -};
20061 +} __no_const;
20062
20063 struct pci_dev;
20064 struct msi_msg;
20065 @@ -185,7 +185,7 @@ struct x86_msi_ops {
20066 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20067 u32 (*msi_mask_irq)(struct msi_desc *desc, u32 mask, u32 flag);
20068 u32 (*msix_mask_irq)(struct msi_desc *desc, u32 flag);
20069 -};
20070 +} __no_const;
20071
20072 struct IO_APIC_route_entry;
20073 struct io_apic_irq_attr;
20074 @@ -206,7 +206,7 @@ struct x86_io_apic_ops {
20075 unsigned int destination, int vector,
20076 struct io_apic_irq_attr *attr);
20077 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20078 -};
20079 +} __no_const;
20080
20081 extern struct x86_init_ops x86_init;
20082 extern struct x86_cpuinit_ops x86_cpuinit;
20083 diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20084 index 3e276eb..2eb3c30 100644
20085 --- a/arch/x86/include/asm/xen/page.h
20086 +++ b/arch/x86/include/asm/xen/page.h
20087 @@ -56,7 +56,7 @@ extern int m2p_remove_override(struct page *page,
20088 extern struct page *m2p_find_override(unsigned long mfn);
20089 extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn);
20090
20091 -static inline unsigned long pfn_to_mfn(unsigned long pfn)
20092 +static inline unsigned long __intentional_overflow(-1) pfn_to_mfn(unsigned long pfn)
20093 {
20094 unsigned long mfn;
20095
20096 diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20097 index 5547389..da68716 100644
20098 --- a/arch/x86/include/asm/xsave.h
20099 +++ b/arch/x86/include/asm/xsave.h
20100 @@ -76,8 +76,11 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20101 if (unlikely(err))
20102 return -EFAULT;
20103
20104 + pax_open_userland();
20105 __asm__ __volatile__(ASM_STAC "\n"
20106 - "1: .byte " REX_PREFIX "0x0f,0xae,0x27\n"
20107 + "1:"
20108 + __copyuser_seg
20109 + ".byte " REX_PREFIX "0x0f,0xae,0x27\n"
20110 "2: " ASM_CLAC "\n"
20111 ".section .fixup,\"ax\"\n"
20112 "3: movl $-1,%[err]\n"
20113 @@ -87,18 +90,22 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20114 : [err] "=r" (err)
20115 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20116 : "memory");
20117 + pax_close_userland();
20118 return err;
20119 }
20120
20121 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20122 {
20123 int err;
20124 - struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20125 + struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20126 u32 lmask = mask;
20127 u32 hmask = mask >> 32;
20128
20129 + pax_open_userland();
20130 __asm__ __volatile__(ASM_STAC "\n"
20131 - "1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
20132 + "1:"
20133 + __copyuser_seg
20134 + ".byte " REX_PREFIX "0x0f,0xae,0x2f\n"
20135 "2: " ASM_CLAC "\n"
20136 ".section .fixup,\"ax\"\n"
20137 "3: movl $-1,%[err]\n"
20138 @@ -108,6 +115,7 @@ static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20139 : [err] "=r" (err)
20140 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20141 : "memory"); /* memory required? */
20142 + pax_close_userland();
20143 return err;
20144 }
20145
20146 diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20147 index bbae024..e1528f9 100644
20148 --- a/arch/x86/include/uapi/asm/e820.h
20149 +++ b/arch/x86/include/uapi/asm/e820.h
20150 @@ -63,7 +63,7 @@ struct e820map {
20151 #define ISA_START_ADDRESS 0xa0000
20152 #define ISA_END_ADDRESS 0x100000
20153
20154 -#define BIOS_BEGIN 0x000a0000
20155 +#define BIOS_BEGIN 0x000c0000
20156 #define BIOS_END 0x00100000
20157
20158 #define BIOS_ROM_BASE 0xffe00000
20159 diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
20160 index 7b0a55a..ad115bf 100644
20161 --- a/arch/x86/include/uapi/asm/ptrace-abi.h
20162 +++ b/arch/x86/include/uapi/asm/ptrace-abi.h
20163 @@ -49,7 +49,6 @@
20164 #define EFLAGS 144
20165 #define RSP 152
20166 #define SS 160
20167 -#define ARGOFFSET R11
20168 #endif /* __ASSEMBLY__ */
20169
20170 /* top of stack page */
20171 diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20172 index cb648c8..91cb07e 100644
20173 --- a/arch/x86/kernel/Makefile
20174 +++ b/arch/x86/kernel/Makefile
20175 @@ -24,7 +24,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20176 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20177 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20178 obj-y += probe_roms.o
20179 -obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20180 +obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20181 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20182 obj-y += syscall_$(BITS).o
20183 obj-$(CONFIG_X86_64) += vsyscall_64.o
20184 diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20185 index 1dac942..19c8b0c 100644
20186 --- a/arch/x86/kernel/acpi/boot.c
20187 +++ b/arch/x86/kernel/acpi/boot.c
20188 @@ -1312,7 +1312,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
20189 * If your system is blacklisted here, but you find that acpi=force
20190 * works for you, please contact linux-acpi@vger.kernel.org
20191 */
20192 -static struct dmi_system_id __initdata acpi_dmi_table[] = {
20193 +static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20194 /*
20195 * Boxes that need ACPI disabled
20196 */
20197 @@ -1387,7 +1387,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20198 };
20199
20200 /* second table for DMI checks that should run after early-quirks */
20201 -static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20202 +static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20203 /*
20204 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20205 * which includes some code which overrides all temperature
20206 diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20207 index 3a2ae4c..9db31d6 100644
20208 --- a/arch/x86/kernel/acpi/sleep.c
20209 +++ b/arch/x86/kernel/acpi/sleep.c
20210 @@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20211 #else /* CONFIG_64BIT */
20212 #ifdef CONFIG_SMP
20213 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20214 +
20215 + pax_open_kernel();
20216 early_gdt_descr.address =
20217 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20218 + pax_close_kernel();
20219 +
20220 initial_gs = per_cpu_offset(smp_processor_id());
20221 #endif
20222 initial_code = (unsigned long)wakeup_long64;
20223 diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20224 index 665c6b7..eae4d56 100644
20225 --- a/arch/x86/kernel/acpi/wakeup_32.S
20226 +++ b/arch/x86/kernel/acpi/wakeup_32.S
20227 @@ -29,13 +29,11 @@ wakeup_pmode_return:
20228 # and restore the stack ... but you need gdt for this to work
20229 movl saved_context_esp, %esp
20230
20231 - movl %cs:saved_magic, %eax
20232 - cmpl $0x12345678, %eax
20233 + cmpl $0x12345678, saved_magic
20234 jne bogus_magic
20235
20236 # jump to place where we left off
20237 - movl saved_eip, %eax
20238 - jmp *%eax
20239 + jmp *(saved_eip)
20240
20241 bogus_magic:
20242 jmp bogus_magic
20243 diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20244 index df94598..f3b29bf 100644
20245 --- a/arch/x86/kernel/alternative.c
20246 +++ b/arch/x86/kernel/alternative.c
20247 @@ -269,6 +269,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20248 */
20249 for (a = start; a < end; a++) {
20250 instr = (u8 *)&a->instr_offset + a->instr_offset;
20251 +
20252 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20253 + instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20254 + if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20255 + instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20256 +#endif
20257 +
20258 replacement = (u8 *)&a->repl_offset + a->repl_offset;
20259 BUG_ON(a->replacementlen > a->instrlen);
20260 BUG_ON(a->instrlen > sizeof(insnbuf));
20261 @@ -300,10 +307,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20262 for (poff = start; poff < end; poff++) {
20263 u8 *ptr = (u8 *)poff + *poff;
20264
20265 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20266 + ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20267 + if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20268 + ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20269 +#endif
20270 +
20271 if (!*poff || ptr < text || ptr >= text_end)
20272 continue;
20273 /* turn DS segment override prefix into lock prefix */
20274 - if (*ptr == 0x3e)
20275 + if (*ktla_ktva(ptr) == 0x3e)
20276 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20277 }
20278 mutex_unlock(&text_mutex);
20279 @@ -318,10 +331,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20280 for (poff = start; poff < end; poff++) {
20281 u8 *ptr = (u8 *)poff + *poff;
20282
20283 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20284 + ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20285 + if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20286 + ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20287 +#endif
20288 +
20289 if (!*poff || ptr < text || ptr >= text_end)
20290 continue;
20291 /* turn lock prefix into DS segment override prefix */
20292 - if (*ptr == 0xf0)
20293 + if (*ktla_ktva(ptr) == 0xf0)
20294 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20295 }
20296 mutex_unlock(&text_mutex);
20297 @@ -458,7 +477,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20298
20299 BUG_ON(p->len > MAX_PATCH_LEN);
20300 /* prep the buffer with the original instructions */
20301 - memcpy(insnbuf, p->instr, p->len);
20302 + memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20303 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20304 (unsigned long)p->instr, p->len);
20305
20306 @@ -505,7 +524,7 @@ void __init alternative_instructions(void)
20307 if (!uniproc_patched || num_possible_cpus() == 1)
20308 free_init_pages("SMP alternatives",
20309 (unsigned long)__smp_locks,
20310 - (unsigned long)__smp_locks_end);
20311 + PAGE_ALIGN((unsigned long)__smp_locks_end));
20312 #endif
20313
20314 apply_paravirt(__parainstructions, __parainstructions_end);
20315 @@ -525,13 +544,17 @@ void __init alternative_instructions(void)
20316 * instructions. And on the local CPU you need to be protected again NMI or MCE
20317 * handlers seeing an inconsistent instruction while you patch.
20318 */
20319 -void *__init_or_module text_poke_early(void *addr, const void *opcode,
20320 +void *__kprobes text_poke_early(void *addr, const void *opcode,
20321 size_t len)
20322 {
20323 unsigned long flags;
20324 local_irq_save(flags);
20325 - memcpy(addr, opcode, len);
20326 +
20327 + pax_open_kernel();
20328 + memcpy(ktla_ktva(addr), opcode, len);
20329 sync_core();
20330 + pax_close_kernel();
20331 +
20332 local_irq_restore(flags);
20333 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20334 that causes hangs on some VIA CPUs. */
20335 @@ -553,36 +576,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20336 */
20337 void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
20338 {
20339 - unsigned long flags;
20340 - char *vaddr;
20341 + unsigned char *vaddr = ktla_ktva(addr);
20342 struct page *pages[2];
20343 - int i;
20344 + size_t i;
20345
20346 if (!core_kernel_text((unsigned long)addr)) {
20347 - pages[0] = vmalloc_to_page(addr);
20348 - pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20349 + pages[0] = vmalloc_to_page(vaddr);
20350 + pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20351 } else {
20352 - pages[0] = virt_to_page(addr);
20353 + pages[0] = virt_to_page(vaddr);
20354 WARN_ON(!PageReserved(pages[0]));
20355 - pages[1] = virt_to_page(addr + PAGE_SIZE);
20356 + pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20357 }
20358 BUG_ON(!pages[0]);
20359 - local_irq_save(flags);
20360 - set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20361 - if (pages[1])
20362 - set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20363 - vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20364 - memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20365 - clear_fixmap(FIX_TEXT_POKE0);
20366 - if (pages[1])
20367 - clear_fixmap(FIX_TEXT_POKE1);
20368 - local_flush_tlb();
20369 - sync_core();
20370 - /* Could also do a CLFLUSH here to speed up CPU recovery; but
20371 - that causes hangs on some VIA CPUs. */
20372 + text_poke_early(addr, opcode, len);
20373 for (i = 0; i < len; i++)
20374 - BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20375 - local_irq_restore(flags);
20376 + BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20377 return addr;
20378 }
20379
20380 @@ -602,7 +611,7 @@ int poke_int3_handler(struct pt_regs *regs)
20381 if (likely(!bp_patching_in_progress))
20382 return 0;
20383
20384 - if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
20385 + if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
20386 return 0;
20387
20388 /* set up the specified breakpoint handler */
20389 @@ -636,7 +645,7 @@ int poke_int3_handler(struct pt_regs *regs)
20390 */
20391 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20392 {
20393 - unsigned char int3 = 0xcc;
20394 + const unsigned char int3 = 0xcc;
20395
20396 bp_int3_handler = handler;
20397 bp_int3_addr = (u8 *)addr + sizeof(int3);
20398 diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20399 index 7f26c9a..694544e 100644
20400 --- a/arch/x86/kernel/apic/apic.c
20401 +++ b/arch/x86/kernel/apic/apic.c
20402 @@ -198,7 +198,7 @@ int first_system_vector = 0xfe;
20403 /*
20404 * Debug level, exported for io_apic.c
20405 */
20406 -unsigned int apic_verbosity;
20407 +int apic_verbosity;
20408
20409 int pic_mode;
20410
20411 @@ -1992,7 +1992,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20412 apic_write(APIC_ESR, 0);
20413 v = apic_read(APIC_ESR);
20414 ack_APIC_irq();
20415 - atomic_inc(&irq_err_count);
20416 + atomic_inc_unchecked(&irq_err_count);
20417
20418 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20419 smp_processor_id(), v);
20420 diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20421 index 2c621a6..fa2b1ae 100644
20422 --- a/arch/x86/kernel/apic/apic_flat_64.c
20423 +++ b/arch/x86/kernel/apic/apic_flat_64.c
20424 @@ -154,7 +154,7 @@ static int flat_probe(void)
20425 return 1;
20426 }
20427
20428 -static struct apic apic_flat = {
20429 +static struct apic apic_flat __read_only = {
20430 .name = "flat",
20431 .probe = flat_probe,
20432 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20433 @@ -268,7 +268,7 @@ static int physflat_probe(void)
20434 return 0;
20435 }
20436
20437 -static struct apic apic_physflat = {
20438 +static struct apic apic_physflat __read_only = {
20439
20440 .name = "physical flat",
20441 .probe = physflat_probe,
20442 diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20443 index 191ce75..2db6d63 100644
20444 --- a/arch/x86/kernel/apic/apic_noop.c
20445 +++ b/arch/x86/kernel/apic/apic_noop.c
20446 @@ -118,7 +118,7 @@ static void noop_apic_write(u32 reg, u32 v)
20447 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20448 }
20449
20450 -struct apic apic_noop = {
20451 +struct apic apic_noop __read_only = {
20452 .name = "noop",
20453 .probe = noop_probe,
20454 .acpi_madt_oem_check = NULL,
20455 diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20456 index d50e364..543bee3 100644
20457 --- a/arch/x86/kernel/apic/bigsmp_32.c
20458 +++ b/arch/x86/kernel/apic/bigsmp_32.c
20459 @@ -152,7 +152,7 @@ static int probe_bigsmp(void)
20460 return dmi_bigsmp;
20461 }
20462
20463 -static struct apic apic_bigsmp = {
20464 +static struct apic apic_bigsmp __read_only = {
20465
20466 .name = "bigsmp",
20467 .probe = probe_bigsmp,
20468 diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
20469 index c552247..587a316 100644
20470 --- a/arch/x86/kernel/apic/es7000_32.c
20471 +++ b/arch/x86/kernel/apic/es7000_32.c
20472 @@ -608,8 +608,7 @@ static int es7000_mps_oem_check_cluster(struct mpc_table *mpc, char *oem,
20473 return ret && es7000_apic_is_cluster();
20474 }
20475
20476 -/* We've been warned by a false positive warning.Use __refdata to keep calm. */
20477 -static struct apic __refdata apic_es7000_cluster = {
20478 +static struct apic apic_es7000_cluster __read_only = {
20479
20480 .name = "es7000",
20481 .probe = probe_es7000,
20482 @@ -675,7 +674,7 @@ static struct apic __refdata apic_es7000_cluster = {
20483 .x86_32_early_logical_apicid = es7000_early_logical_apicid,
20484 };
20485
20486 -static struct apic __refdata apic_es7000 = {
20487 +static struct apic apic_es7000 __read_only = {
20488
20489 .name = "es7000",
20490 .probe = probe_es7000,
20491 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20492 index 6ad4658..38a7b5c 100644
20493 --- a/arch/x86/kernel/apic/io_apic.c
20494 +++ b/arch/x86/kernel/apic/io_apic.c
20495 @@ -1057,7 +1057,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
20496 }
20497 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
20498
20499 -void lock_vector_lock(void)
20500 +void lock_vector_lock(void) __acquires(vector_lock)
20501 {
20502 /* Used to the online set of cpus does not change
20503 * during assign_irq_vector.
20504 @@ -1065,7 +1065,7 @@ void lock_vector_lock(void)
20505 raw_spin_lock(&vector_lock);
20506 }
20507
20508 -void unlock_vector_lock(void)
20509 +void unlock_vector_lock(void) __releases(vector_lock)
20510 {
20511 raw_spin_unlock(&vector_lock);
20512 }
20513 @@ -2364,7 +2364,7 @@ static void ack_apic_edge(struct irq_data *data)
20514 ack_APIC_irq();
20515 }
20516
20517 -atomic_t irq_mis_count;
20518 +atomic_unchecked_t irq_mis_count;
20519
20520 #ifdef CONFIG_GENERIC_PENDING_IRQ
20521 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20522 @@ -2505,7 +2505,7 @@ static void ack_apic_level(struct irq_data *data)
20523 * at the cpu.
20524 */
20525 if (!(v & (1 << (i & 0x1f)))) {
20526 - atomic_inc(&irq_mis_count);
20527 + atomic_inc_unchecked(&irq_mis_count);
20528
20529 eoi_ioapic_irq(irq, cfg);
20530 }
20531 diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
20532 index 1e42e8f..daacf44 100644
20533 --- a/arch/x86/kernel/apic/numaq_32.c
20534 +++ b/arch/x86/kernel/apic/numaq_32.c
20535 @@ -455,8 +455,7 @@ static void numaq_setup_portio_remap(void)
20536 (u_long) xquad_portio, (u_long) num_quads*XQUAD_PORTIO_QUAD);
20537 }
20538
20539 -/* Use __refdata to keep false positive warning calm. */
20540 -static struct apic __refdata apic_numaq = {
20541 +static struct apic apic_numaq __read_only = {
20542
20543 .name = "NUMAQ",
20544 .probe = probe_numaq,
20545 diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20546 index eb35ef9..f184a21 100644
20547 --- a/arch/x86/kernel/apic/probe_32.c
20548 +++ b/arch/x86/kernel/apic/probe_32.c
20549 @@ -72,7 +72,7 @@ static int probe_default(void)
20550 return 1;
20551 }
20552
20553 -static struct apic apic_default = {
20554 +static struct apic apic_default __read_only = {
20555
20556 .name = "default",
20557 .probe = probe_default,
20558 diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
20559 index 00146f9..5e299b8 100644
20560 --- a/arch/x86/kernel/apic/summit_32.c
20561 +++ b/arch/x86/kernel/apic/summit_32.c
20562 @@ -485,7 +485,7 @@ void setup_summit(void)
20563 }
20564 #endif
20565
20566 -static struct apic apic_summit = {
20567 +static struct apic apic_summit __read_only = {
20568
20569 .name = "summit",
20570 .probe = probe_summit,
20571 diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20572 index cac85ee..01fa741 100644
20573 --- a/arch/x86/kernel/apic/x2apic_cluster.c
20574 +++ b/arch/x86/kernel/apic/x2apic_cluster.c
20575 @@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20576 return notifier_from_errno(err);
20577 }
20578
20579 -static struct notifier_block __refdata x2apic_cpu_notifier = {
20580 +static struct notifier_block x2apic_cpu_notifier = {
20581 .notifier_call = update_clusterinfo,
20582 };
20583
20584 @@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20585 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20586 }
20587
20588 -static struct apic apic_x2apic_cluster = {
20589 +static struct apic apic_x2apic_cluster __read_only = {
20590
20591 .name = "cluster x2apic",
20592 .probe = x2apic_cluster_probe,
20593 diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20594 index de231e3..1d1b2ee 100644
20595 --- a/arch/x86/kernel/apic/x2apic_phys.c
20596 +++ b/arch/x86/kernel/apic/x2apic_phys.c
20597 @@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
20598 return apic == &apic_x2apic_phys;
20599 }
20600
20601 -static struct apic apic_x2apic_phys = {
20602 +static struct apic apic_x2apic_phys __read_only = {
20603
20604 .name = "physical x2apic",
20605 .probe = x2apic_phys_probe,
20606 diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
20607 index d263b13..963258b 100644
20608 --- a/arch/x86/kernel/apic/x2apic_uv_x.c
20609 +++ b/arch/x86/kernel/apic/x2apic_uv_x.c
20610 @@ -350,7 +350,7 @@ static int uv_probe(void)
20611 return apic == &apic_x2apic_uv_x;
20612 }
20613
20614 -static struct apic __refdata apic_x2apic_uv_x = {
20615 +static struct apic apic_x2apic_uv_x __read_only = {
20616
20617 .name = "UV large system",
20618 .probe = uv_probe,
20619 diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20620 index 3ab0343..814c4787 100644
20621 --- a/arch/x86/kernel/apm_32.c
20622 +++ b/arch/x86/kernel/apm_32.c
20623 @@ -433,7 +433,7 @@ static DEFINE_MUTEX(apm_mutex);
20624 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20625 * even though they are called in protected mode.
20626 */
20627 -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
20628 +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
20629 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
20630
20631 static const char driver_version[] = "1.16ac"; /* no spaces */
20632 @@ -611,7 +611,10 @@ static long __apm_bios_call(void *_call)
20633 BUG_ON(cpu != 0);
20634 gdt = get_cpu_gdt_table(cpu);
20635 save_desc_40 = gdt[0x40 / 8];
20636 +
20637 + pax_open_kernel();
20638 gdt[0x40 / 8] = bad_bios_desc;
20639 + pax_close_kernel();
20640
20641 apm_irq_save(flags);
20642 APM_DO_SAVE_SEGS;
20643 @@ -620,7 +623,11 @@ static long __apm_bios_call(void *_call)
20644 &call->esi);
20645 APM_DO_RESTORE_SEGS;
20646 apm_irq_restore(flags);
20647 +
20648 + pax_open_kernel();
20649 gdt[0x40 / 8] = save_desc_40;
20650 + pax_close_kernel();
20651 +
20652 put_cpu();
20653
20654 return call->eax & 0xff;
20655 @@ -687,7 +694,10 @@ static long __apm_bios_call_simple(void *_call)
20656 BUG_ON(cpu != 0);
20657 gdt = get_cpu_gdt_table(cpu);
20658 save_desc_40 = gdt[0x40 / 8];
20659 +
20660 + pax_open_kernel();
20661 gdt[0x40 / 8] = bad_bios_desc;
20662 + pax_close_kernel();
20663
20664 apm_irq_save(flags);
20665 APM_DO_SAVE_SEGS;
20666 @@ -695,7 +705,11 @@ static long __apm_bios_call_simple(void *_call)
20667 &call->eax);
20668 APM_DO_RESTORE_SEGS;
20669 apm_irq_restore(flags);
20670 +
20671 + pax_open_kernel();
20672 gdt[0x40 / 8] = save_desc_40;
20673 + pax_close_kernel();
20674 +
20675 put_cpu();
20676 return error;
20677 }
20678 @@ -2362,12 +2376,15 @@ static int __init apm_init(void)
20679 * code to that CPU.
20680 */
20681 gdt = get_cpu_gdt_table(0);
20682 +
20683 + pax_open_kernel();
20684 set_desc_base(&gdt[APM_CS >> 3],
20685 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
20686 set_desc_base(&gdt[APM_CS_16 >> 3],
20687 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
20688 set_desc_base(&gdt[APM_DS >> 3],
20689 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
20690 + pax_close_kernel();
20691
20692 proc_create("apm", 0, NULL, &apm_file_ops);
20693
20694 diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
20695 index 9f6b934..cf5ffb3 100644
20696 --- a/arch/x86/kernel/asm-offsets.c
20697 +++ b/arch/x86/kernel/asm-offsets.c
20698 @@ -32,6 +32,8 @@ void common(void) {
20699 OFFSET(TI_flags, thread_info, flags);
20700 OFFSET(TI_status, thread_info, status);
20701 OFFSET(TI_addr_limit, thread_info, addr_limit);
20702 + OFFSET(TI_lowest_stack, thread_info, lowest_stack);
20703 + DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
20704
20705 BLANK();
20706 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
20707 @@ -52,8 +54,26 @@ void common(void) {
20708 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
20709 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
20710 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
20711 +
20712 +#ifdef CONFIG_PAX_KERNEXEC
20713 + OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
20714 #endif
20715
20716 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20717 + OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
20718 + OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
20719 +#ifdef CONFIG_X86_64
20720 + OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
20721 +#endif
20722 +#endif
20723 +
20724 +#endif
20725 +
20726 + BLANK();
20727 + DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
20728 + DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
20729 + DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
20730 +
20731 #ifdef CONFIG_XEN
20732 BLANK();
20733 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
20734 diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
20735 index e7c798b..2b2019b 100644
20736 --- a/arch/x86/kernel/asm-offsets_64.c
20737 +++ b/arch/x86/kernel/asm-offsets_64.c
20738 @@ -77,6 +77,7 @@ int main(void)
20739 BLANK();
20740 #undef ENTRY
20741
20742 + DEFINE(TSS_size, sizeof(struct tss_struct));
20743 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
20744 BLANK();
20745
20746 diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
20747 index 7fd54f0..0691410 100644
20748 --- a/arch/x86/kernel/cpu/Makefile
20749 +++ b/arch/x86/kernel/cpu/Makefile
20750 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
20751 CFLAGS_REMOVE_perf_event.o = -pg
20752 endif
20753
20754 -# Make sure load_percpu_segment has no stackprotector
20755 -nostackp := $(call cc-option, -fno-stack-protector)
20756 -CFLAGS_common.o := $(nostackp)
20757 -
20758 obj-y := intel_cacheinfo.o scattered.o topology.o
20759 obj-y += proc.o capflags.o powerflags.o common.o
20760 obj-y += rdrand.o
20761 diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
20762 index c67ffa6..f41fbbf 100644
20763 --- a/arch/x86/kernel/cpu/amd.c
20764 +++ b/arch/x86/kernel/cpu/amd.c
20765 @@ -752,7 +752,7 @@ static void init_amd(struct cpuinfo_x86 *c)
20766 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
20767 {
20768 /* AMD errata T13 (order #21922) */
20769 - if ((c->x86 == 6)) {
20770 + if (c->x86 == 6) {
20771 /* Duron Rev A0 */
20772 if (c->x86_model == 3 && c->x86_mask == 0)
20773 size = 64;
20774 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
20775 index 8e28bf2..bf5c0d2 100644
20776 --- a/arch/x86/kernel/cpu/common.c
20777 +++ b/arch/x86/kernel/cpu/common.c
20778 @@ -88,60 +88,6 @@ static const struct cpu_dev default_cpu = {
20779
20780 static const struct cpu_dev *this_cpu = &default_cpu;
20781
20782 -DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
20783 -#ifdef CONFIG_X86_64
20784 - /*
20785 - * We need valid kernel segments for data and code in long mode too
20786 - * IRET will check the segment types kkeil 2000/10/28
20787 - * Also sysret mandates a special GDT layout
20788 - *
20789 - * TLS descriptors are currently at a different place compared to i386.
20790 - * Hopefully nobody expects them at a fixed place (Wine?)
20791 - */
20792 - [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
20793 - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
20794 - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
20795 - [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
20796 - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
20797 - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
20798 -#else
20799 - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
20800 - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
20801 - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
20802 - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
20803 - /*
20804 - * Segments used for calling PnP BIOS have byte granularity.
20805 - * They code segments and data segments have fixed 64k limits,
20806 - * the transfer segment sizes are set at run time.
20807 - */
20808 - /* 32-bit code */
20809 - [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
20810 - /* 16-bit code */
20811 - [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
20812 - /* 16-bit data */
20813 - [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
20814 - /* 16-bit data */
20815 - [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
20816 - /* 16-bit data */
20817 - [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
20818 - /*
20819 - * The APM segments have byte granularity and their bases
20820 - * are set at run time. All have 64k limits.
20821 - */
20822 - /* 32-bit code */
20823 - [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
20824 - /* 16-bit code */
20825 - [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
20826 - /* data */
20827 - [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
20828 -
20829 - [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
20830 - [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
20831 - GDT_STACK_CANARY_INIT
20832 -#endif
20833 -} };
20834 -EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
20835 -
20836 static int __init x86_xsave_setup(char *s)
20837 {
20838 setup_clear_cpu_cap(X86_FEATURE_XSAVE);
20839 @@ -293,6 +239,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
20840 }
20841 }
20842
20843 +#ifdef CONFIG_X86_64
20844 +static __init int setup_disable_pcid(char *arg)
20845 +{
20846 + setup_clear_cpu_cap(X86_FEATURE_PCID);
20847 + setup_clear_cpu_cap(X86_FEATURE_INVPCID);
20848 +
20849 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20850 + if (clone_pgd_mask != ~(pgdval_t)0UL)
20851 + pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
20852 +#endif
20853 +
20854 + return 1;
20855 +}
20856 +__setup("nopcid", setup_disable_pcid);
20857 +
20858 +static void setup_pcid(struct cpuinfo_x86 *c)
20859 +{
20860 + if (!cpu_has(c, X86_FEATURE_PCID)) {
20861 + clear_cpu_cap(c, X86_FEATURE_INVPCID);
20862 +
20863 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20864 + if (clone_pgd_mask != ~(pgdval_t)0UL) {
20865 + pax_open_kernel();
20866 + pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
20867 + pax_close_kernel();
20868 + printk("PAX: slow and weak UDEREF enabled\n");
20869 + } else
20870 + printk("PAX: UDEREF disabled\n");
20871 +#endif
20872 +
20873 + return;
20874 + }
20875 +
20876 + printk("PAX: PCID detected\n");
20877 + set_in_cr4(X86_CR4_PCIDE);
20878 +
20879 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20880 + pax_open_kernel();
20881 + clone_pgd_mask = ~(pgdval_t)0UL;
20882 + pax_close_kernel();
20883 + if (pax_user_shadow_base)
20884 + printk("PAX: weak UDEREF enabled\n");
20885 + else {
20886 + set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
20887 + printk("PAX: strong UDEREF enabled\n");
20888 + }
20889 +#endif
20890 +
20891 + if (cpu_has(c, X86_FEATURE_INVPCID))
20892 + printk("PAX: INVPCID detected\n");
20893 +}
20894 +#endif
20895 +
20896 /*
20897 * Some CPU features depend on higher CPUID levels, which may not always
20898 * be available due to CPUID level capping or broken virtualization
20899 @@ -393,7 +392,7 @@ void switch_to_new_gdt(int cpu)
20900 {
20901 struct desc_ptr gdt_descr;
20902
20903 - gdt_descr.address = (long)get_cpu_gdt_table(cpu);
20904 + gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
20905 gdt_descr.size = GDT_SIZE - 1;
20906 load_gdt(&gdt_descr);
20907 /* Reload the per-cpu base */
20908 @@ -883,6 +882,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
20909 setup_smep(c);
20910 setup_smap(c);
20911
20912 +#ifdef CONFIG_X86_64
20913 + setup_pcid(c);
20914 +#endif
20915 +
20916 /*
20917 * The vendor-specific functions might have changed features.
20918 * Now we do "generic changes."
20919 @@ -891,6 +894,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
20920 /* Filter out anything that depends on CPUID levels we don't have */
20921 filter_cpuid_features(c, true);
20922
20923 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
20924 + setup_clear_cpu_cap(X86_FEATURE_SEP);
20925 +#endif
20926 +
20927 /* If the model name is still unset, do table lookup. */
20928 if (!c->x86_model_id[0]) {
20929 const char *p;
20930 @@ -1078,10 +1085,12 @@ static __init int setup_disablecpuid(char *arg)
20931 }
20932 __setup("clearcpuid=", setup_disablecpuid);
20933
20934 +DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
20935 +EXPORT_PER_CPU_SYMBOL(current_tinfo);
20936 +
20937 #ifdef CONFIG_X86_64
20938 -struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
20939 -struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
20940 - (unsigned long) debug_idt_table };
20941 +struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
20942 +const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
20943
20944 DEFINE_PER_CPU_FIRST(union irq_stack_union,
20945 irq_stack_union) __aligned(PAGE_SIZE) __visible;
20946 @@ -1095,7 +1104,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
20947 EXPORT_PER_CPU_SYMBOL(current_task);
20948
20949 DEFINE_PER_CPU(unsigned long, kernel_stack) =
20950 - (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
20951 + (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
20952 EXPORT_PER_CPU_SYMBOL(kernel_stack);
20953
20954 DEFINE_PER_CPU(char *, irq_stack_ptr) =
20955 @@ -1245,7 +1254,7 @@ void cpu_init(void)
20956 load_ucode_ap();
20957
20958 cpu = stack_smp_processor_id();
20959 - t = &per_cpu(init_tss, cpu);
20960 + t = init_tss + cpu;
20961 oist = &per_cpu(orig_ist, cpu);
20962
20963 #ifdef CONFIG_NUMA
20964 @@ -1280,7 +1289,6 @@ void cpu_init(void)
20965 wrmsrl(MSR_KERNEL_GS_BASE, 0);
20966 barrier();
20967
20968 - x86_configure_nx();
20969 enable_x2apic();
20970
20971 /*
20972 @@ -1332,7 +1340,7 @@ void cpu_init(void)
20973 {
20974 int cpu = smp_processor_id();
20975 struct task_struct *curr = current;
20976 - struct tss_struct *t = &per_cpu(init_tss, cpu);
20977 + struct tss_struct *t = init_tss + cpu;
20978 struct thread_struct *thread = &curr->thread;
20979
20980 show_ucode_info_early();
20981 diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
20982 index 0641113..06f5ba4 100644
20983 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c
20984 +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
20985 @@ -1014,6 +1014,22 @@ static struct attribute *default_attrs[] = {
20986 };
20987
20988 #ifdef CONFIG_AMD_NB
20989 +static struct attribute *default_attrs_amd_nb[] = {
20990 + &type.attr,
20991 + &level.attr,
20992 + &coherency_line_size.attr,
20993 + &physical_line_partition.attr,
20994 + &ways_of_associativity.attr,
20995 + &number_of_sets.attr,
20996 + &size.attr,
20997 + &shared_cpu_map.attr,
20998 + &shared_cpu_list.attr,
20999 + NULL,
21000 + NULL,
21001 + NULL,
21002 + NULL
21003 +};
21004 +
21005 static struct attribute **amd_l3_attrs(void)
21006 {
21007 static struct attribute **attrs;
21008 @@ -1024,18 +1040,7 @@ static struct attribute **amd_l3_attrs(void)
21009
21010 n = ARRAY_SIZE(default_attrs);
21011
21012 - if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21013 - n += 2;
21014 -
21015 - if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21016 - n += 1;
21017 -
21018 - attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
21019 - if (attrs == NULL)
21020 - return attrs = default_attrs;
21021 -
21022 - for (n = 0; default_attrs[n]; n++)
21023 - attrs[n] = default_attrs[n];
21024 + attrs = default_attrs_amd_nb;
21025
21026 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
21027 attrs[n++] = &cache_disable_0.attr;
21028 @@ -1086,6 +1091,13 @@ static struct kobj_type ktype_cache = {
21029 .default_attrs = default_attrs,
21030 };
21031
21032 +#ifdef CONFIG_AMD_NB
21033 +static struct kobj_type ktype_cache_amd_nb = {
21034 + .sysfs_ops = &sysfs_ops,
21035 + .default_attrs = default_attrs_amd_nb,
21036 +};
21037 +#endif
21038 +
21039 static struct kobj_type ktype_percpu_entry = {
21040 .sysfs_ops = &sysfs_ops,
21041 };
21042 @@ -1151,20 +1163,26 @@ static int cache_add_dev(struct device *dev)
21043 return retval;
21044 }
21045
21046 +#ifdef CONFIG_AMD_NB
21047 + amd_l3_attrs();
21048 +#endif
21049 +
21050 for (i = 0; i < num_cache_leaves; i++) {
21051 + struct kobj_type *ktype;
21052 +
21053 this_object = INDEX_KOBJECT_PTR(cpu, i);
21054 this_object->cpu = cpu;
21055 this_object->index = i;
21056
21057 this_leaf = CPUID4_INFO_IDX(cpu, i);
21058
21059 - ktype_cache.default_attrs = default_attrs;
21060 + ktype = &ktype_cache;
21061 #ifdef CONFIG_AMD_NB
21062 if (this_leaf->base.nb)
21063 - ktype_cache.default_attrs = amd_l3_attrs();
21064 + ktype = &ktype_cache_amd_nb;
21065 #endif
21066 retval = kobject_init_and_add(&(this_object->kobj),
21067 - &ktype_cache,
21068 + ktype,
21069 per_cpu(ici_cache_kobject, cpu),
21070 "index%1lu", i);
21071 if (unlikely(retval)) {
21072 diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21073 index 4d5419b..95f11bb 100644
21074 --- a/arch/x86/kernel/cpu/mcheck/mce.c
21075 +++ b/arch/x86/kernel/cpu/mcheck/mce.c
21076 @@ -45,6 +45,7 @@
21077 #include <asm/processor.h>
21078 #include <asm/mce.h>
21079 #include <asm/msr.h>
21080 +#include <asm/local.h>
21081
21082 #include "mce-internal.h"
21083
21084 @@ -258,7 +259,7 @@ static void print_mce(struct mce *m)
21085 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21086 m->cs, m->ip);
21087
21088 - if (m->cs == __KERNEL_CS)
21089 + if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21090 print_symbol("{%s}", m->ip);
21091 pr_cont("\n");
21092 }
21093 @@ -291,10 +292,10 @@ static void print_mce(struct mce *m)
21094
21095 #define PANIC_TIMEOUT 5 /* 5 seconds */
21096
21097 -static atomic_t mce_paniced;
21098 +static atomic_unchecked_t mce_paniced;
21099
21100 static int fake_panic;
21101 -static atomic_t mce_fake_paniced;
21102 +static atomic_unchecked_t mce_fake_paniced;
21103
21104 /* Panic in progress. Enable interrupts and wait for final IPI */
21105 static void wait_for_panic(void)
21106 @@ -318,7 +319,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21107 /*
21108 * Make sure only one CPU runs in machine check panic
21109 */
21110 - if (atomic_inc_return(&mce_paniced) > 1)
21111 + if (atomic_inc_return_unchecked(&mce_paniced) > 1)
21112 wait_for_panic();
21113 barrier();
21114
21115 @@ -326,7 +327,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21116 console_verbose();
21117 } else {
21118 /* Don't log too much for fake panic */
21119 - if (atomic_inc_return(&mce_fake_paniced) > 1)
21120 + if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
21121 return;
21122 }
21123 /* First print corrected ones that are still unlogged */
21124 @@ -365,7 +366,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21125 if (!fake_panic) {
21126 if (panic_timeout == 0)
21127 panic_timeout = mca_cfg.panic_timeout;
21128 - panic(msg);
21129 + panic("%s", msg);
21130 } else
21131 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21132 }
21133 @@ -695,7 +696,7 @@ static int mce_timed_out(u64 *t)
21134 * might have been modified by someone else.
21135 */
21136 rmb();
21137 - if (atomic_read(&mce_paniced))
21138 + if (atomic_read_unchecked(&mce_paniced))
21139 wait_for_panic();
21140 if (!mca_cfg.monarch_timeout)
21141 goto out;
21142 @@ -1666,7 +1667,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21143 }
21144
21145 /* Call the installed machine check handler for this CPU setup. */
21146 -void (*machine_check_vector)(struct pt_regs *, long error_code) =
21147 +void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21148 unexpected_machine_check;
21149
21150 /*
21151 @@ -1689,7 +1690,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21152 return;
21153 }
21154
21155 + pax_open_kernel();
21156 machine_check_vector = do_machine_check;
21157 + pax_close_kernel();
21158
21159 __mcheck_cpu_init_generic();
21160 __mcheck_cpu_init_vendor(c);
21161 @@ -1703,7 +1706,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21162 */
21163
21164 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21165 -static int mce_chrdev_open_count; /* #times opened */
21166 +static local_t mce_chrdev_open_count; /* #times opened */
21167 static int mce_chrdev_open_exclu; /* already open exclusive? */
21168
21169 static int mce_chrdev_open(struct inode *inode, struct file *file)
21170 @@ -1711,7 +1714,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21171 spin_lock(&mce_chrdev_state_lock);
21172
21173 if (mce_chrdev_open_exclu ||
21174 - (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21175 + (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21176 spin_unlock(&mce_chrdev_state_lock);
21177
21178 return -EBUSY;
21179 @@ -1719,7 +1722,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21180
21181 if (file->f_flags & O_EXCL)
21182 mce_chrdev_open_exclu = 1;
21183 - mce_chrdev_open_count++;
21184 + local_inc(&mce_chrdev_open_count);
21185
21186 spin_unlock(&mce_chrdev_state_lock);
21187
21188 @@ -1730,7 +1733,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21189 {
21190 spin_lock(&mce_chrdev_state_lock);
21191
21192 - mce_chrdev_open_count--;
21193 + local_dec(&mce_chrdev_open_count);
21194 mce_chrdev_open_exclu = 0;
21195
21196 spin_unlock(&mce_chrdev_state_lock);
21197 @@ -2406,7 +2409,7 @@ static __init void mce_init_banks(void)
21198
21199 for (i = 0; i < mca_cfg.banks; i++) {
21200 struct mce_bank *b = &mce_banks[i];
21201 - struct device_attribute *a = &b->attr;
21202 + device_attribute_no_const *a = &b->attr;
21203
21204 sysfs_attr_init(&a->attr);
21205 a->attr.name = b->attrname;
21206 @@ -2474,7 +2477,7 @@ struct dentry *mce_get_debugfs_dir(void)
21207 static void mce_reset(void)
21208 {
21209 cpu_missing = 0;
21210 - atomic_set(&mce_fake_paniced, 0);
21211 + atomic_set_unchecked(&mce_fake_paniced, 0);
21212 atomic_set(&mce_executing, 0);
21213 atomic_set(&mce_callin, 0);
21214 atomic_set(&global_nwo, 0);
21215 diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21216 index a304298..49b6d06 100644
21217 --- a/arch/x86/kernel/cpu/mcheck/p5.c
21218 +++ b/arch/x86/kernel/cpu/mcheck/p5.c
21219 @@ -10,6 +10,7 @@
21220 #include <asm/processor.h>
21221 #include <asm/mce.h>
21222 #include <asm/msr.h>
21223 +#include <asm/pgtable.h>
21224
21225 /* By default disabled */
21226 int mce_p5_enabled __read_mostly;
21227 @@ -48,7 +49,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21228 if (!cpu_has(c, X86_FEATURE_MCE))
21229 return;
21230
21231 + pax_open_kernel();
21232 machine_check_vector = pentium_machine_check;
21233 + pax_close_kernel();
21234 /* Make sure the vector pointer is visible before we enable MCEs: */
21235 wmb();
21236
21237 diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21238 index 7dc5564..1273569 100644
21239 --- a/arch/x86/kernel/cpu/mcheck/winchip.c
21240 +++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21241 @@ -9,6 +9,7 @@
21242 #include <asm/processor.h>
21243 #include <asm/mce.h>
21244 #include <asm/msr.h>
21245 +#include <asm/pgtable.h>
21246
21247 /* Machine check handler for WinChip C6: */
21248 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21249 @@ -22,7 +23,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21250 {
21251 u32 lo, hi;
21252
21253 + pax_open_kernel();
21254 machine_check_vector = winchip_machine_check;
21255 + pax_close_kernel();
21256 /* Make sure the vector pointer is visible before we enable MCEs: */
21257 wmb();
21258
21259 diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21260 index 15c9876..0a43909 100644
21261 --- a/arch/x86/kernel/cpu/microcode/core.c
21262 +++ b/arch/x86/kernel/cpu/microcode/core.c
21263 @@ -513,7 +513,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21264 return NOTIFY_OK;
21265 }
21266
21267 -static struct notifier_block __refdata mc_cpu_notifier = {
21268 +static struct notifier_block mc_cpu_notifier = {
21269 .notifier_call = mc_cpu_callback,
21270 };
21271
21272 diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21273 index a276fa7..e66810f 100644
21274 --- a/arch/x86/kernel/cpu/microcode/intel.c
21275 +++ b/arch/x86/kernel/cpu/microcode/intel.c
21276 @@ -293,13 +293,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21277
21278 static int get_ucode_user(void *to, const void *from, size_t n)
21279 {
21280 - return copy_from_user(to, from, n);
21281 + return copy_from_user(to, (const void __force_user *)from, n);
21282 }
21283
21284 static enum ucode_state
21285 request_microcode_user(int cpu, const void __user *buf, size_t size)
21286 {
21287 - return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21288 + return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21289 }
21290
21291 static void microcode_fini_cpu(int cpu)
21292 diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21293 index f961de9..8a9d332 100644
21294 --- a/arch/x86/kernel/cpu/mtrr/main.c
21295 +++ b/arch/x86/kernel/cpu/mtrr/main.c
21296 @@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21297 u64 size_or_mask, size_and_mask;
21298 static bool mtrr_aps_delayed_init;
21299
21300 -static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21301 +static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21302
21303 const struct mtrr_ops *mtrr_if;
21304
21305 diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21306 index df5e41f..816c719 100644
21307 --- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21308 +++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21309 @@ -25,7 +25,7 @@ struct mtrr_ops {
21310 int (*validate_add_page)(unsigned long base, unsigned long size,
21311 unsigned int type);
21312 int (*have_wrcomb)(void);
21313 -};
21314 +} __do_const;
21315
21316 extern int generic_get_free_region(unsigned long base, unsigned long size,
21317 int replace_reg);
21318 diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21319 index 79f9f84..38ace52 100644
21320 --- a/arch/x86/kernel/cpu/perf_event.c
21321 +++ b/arch/x86/kernel/cpu/perf_event.c
21322 @@ -1351,7 +1351,7 @@ static void __init pmu_check_apic(void)
21323 pr_info("no hardware sampling interrupt available.\n");
21324 }
21325
21326 -static struct attribute_group x86_pmu_format_group = {
21327 +static attribute_group_no_const x86_pmu_format_group = {
21328 .name = "format",
21329 .attrs = NULL,
21330 };
21331 @@ -1450,7 +1450,7 @@ static struct attribute *events_attr[] = {
21332 NULL,
21333 };
21334
21335 -static struct attribute_group x86_pmu_events_group = {
21336 +static attribute_group_no_const x86_pmu_events_group = {
21337 .name = "events",
21338 .attrs = events_attr,
21339 };
21340 @@ -1971,7 +1971,7 @@ static unsigned long get_segment_base(unsigned int segment)
21341 if (idx > GDT_ENTRIES)
21342 return 0;
21343
21344 - desc = __this_cpu_ptr(&gdt_page.gdt[0]);
21345 + desc = get_cpu_gdt_table(smp_processor_id());
21346 }
21347
21348 return get_desc_base(desc + idx);
21349 @@ -2061,7 +2061,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21350 break;
21351
21352 perf_callchain_store(entry, frame.return_address);
21353 - fp = frame.next_frame;
21354 + fp = (const void __force_user *)frame.next_frame;
21355 }
21356 }
21357
21358 diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21359 index 639d128..e92d7e5 100644
21360 --- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21361 +++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21362 @@ -405,7 +405,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21363 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21364 {
21365 struct attribute **attrs;
21366 - struct attribute_group *attr_group;
21367 + attribute_group_no_const *attr_group;
21368 int i = 0, j;
21369
21370 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21371 diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21372 index aa333d9..f9db700 100644
21373 --- a/arch/x86/kernel/cpu/perf_event_intel.c
21374 +++ b/arch/x86/kernel/cpu/perf_event_intel.c
21375 @@ -2309,10 +2309,10 @@ __init int intel_pmu_init(void)
21376 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21377
21378 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21379 - u64 capabilities;
21380 + u64 capabilities = x86_pmu.intel_cap.capabilities;
21381
21382 - rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21383 - x86_pmu.intel_cap.capabilities = capabilities;
21384 + if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21385 + x86_pmu.intel_cap.capabilities = capabilities;
21386 }
21387
21388 intel_ds_init();
21389 diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21390 index 5ad35ad..e0a3960 100644
21391 --- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21392 +++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21393 @@ -425,7 +425,7 @@ static struct attribute *rapl_events_cln_attr[] = {
21394 NULL,
21395 };
21396
21397 -static struct attribute_group rapl_pmu_events_group = {
21398 +static attribute_group_no_const rapl_pmu_events_group __read_only = {
21399 .name = "events",
21400 .attrs = NULL, /* patched at runtime */
21401 };
21402 diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21403 index 047f540..afdeba0 100644
21404 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21405 +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21406 @@ -3326,7 +3326,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21407 static int __init uncore_type_init(struct intel_uncore_type *type)
21408 {
21409 struct intel_uncore_pmu *pmus;
21410 - struct attribute_group *attr_group;
21411 + attribute_group_no_const *attr_group;
21412 struct attribute **attrs;
21413 int i, j;
21414
21415 diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21416 index a80ab71..4089da5 100644
21417 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21418 +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21419 @@ -498,7 +498,7 @@ struct intel_uncore_box {
21420 struct uncore_event_desc {
21421 struct kobj_attribute attr;
21422 const char *config;
21423 -};
21424 +} __do_const;
21425
21426 #define INTEL_UNCORE_EVENT_DESC(_name, _config) \
21427 { \
21428 diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21429 index 7d9481c..99c7e4b 100644
21430 --- a/arch/x86/kernel/cpuid.c
21431 +++ b/arch/x86/kernel/cpuid.c
21432 @@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21433 return notifier_from_errno(err);
21434 }
21435
21436 -static struct notifier_block __refdata cpuid_class_cpu_notifier =
21437 +static struct notifier_block cpuid_class_cpu_notifier =
21438 {
21439 .notifier_call = cpuid_class_cpu_callback,
21440 };
21441 diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
21442 index a57902e..ebaae2a 100644
21443 --- a/arch/x86/kernel/crash.c
21444 +++ b/arch/x86/kernel/crash.c
21445 @@ -57,10 +57,8 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
21446 {
21447 #ifdef CONFIG_X86_32
21448 struct pt_regs fixed_regs;
21449 -#endif
21450
21451 -#ifdef CONFIG_X86_32
21452 - if (!user_mode_vm(regs)) {
21453 + if (!user_mode(regs)) {
21454 crash_fixup_ss_esp(&fixed_regs, regs);
21455 regs = &fixed_regs;
21456 }
21457 diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21458 index afa64ad..dce67dd 100644
21459 --- a/arch/x86/kernel/crash_dump_64.c
21460 +++ b/arch/x86/kernel/crash_dump_64.c
21461 @@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
21462 return -ENOMEM;
21463
21464 if (userbuf) {
21465 - if (copy_to_user(buf, vaddr + offset, csize)) {
21466 + if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
21467 iounmap(vaddr);
21468 return -EFAULT;
21469 }
21470 diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
21471 index f6dfd93..892ade4 100644
21472 --- a/arch/x86/kernel/doublefault.c
21473 +++ b/arch/x86/kernel/doublefault.c
21474 @@ -12,7 +12,7 @@
21475
21476 #define DOUBLEFAULT_STACKSIZE (1024)
21477 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
21478 -#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
21479 +#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
21480
21481 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
21482
21483 @@ -22,7 +22,7 @@ static void doublefault_fn(void)
21484 unsigned long gdt, tss;
21485
21486 native_store_gdt(&gdt_desc);
21487 - gdt = gdt_desc.address;
21488 + gdt = (unsigned long)gdt_desc.address;
21489
21490 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
21491
21492 @@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
21493 /* 0x2 bit is always set */
21494 .flags = X86_EFLAGS_SF | 0x2,
21495 .sp = STACK_START,
21496 - .es = __USER_DS,
21497 + .es = __KERNEL_DS,
21498 .cs = __KERNEL_CS,
21499 .ss = __KERNEL_DS,
21500 - .ds = __USER_DS,
21501 + .ds = __KERNEL_DS,
21502 .fs = __KERNEL_PERCPU,
21503
21504 .__cr3 = __pa_nodebug(swapper_pg_dir),
21505 diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
21506 index d9c12d3..7858b62 100644
21507 --- a/arch/x86/kernel/dumpstack.c
21508 +++ b/arch/x86/kernel/dumpstack.c
21509 @@ -2,6 +2,9 @@
21510 * Copyright (C) 1991, 1992 Linus Torvalds
21511 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
21512 */
21513 +#ifdef CONFIG_GRKERNSEC_HIDESYM
21514 +#define __INCLUDED_BY_HIDESYM 1
21515 +#endif
21516 #include <linux/kallsyms.h>
21517 #include <linux/kprobes.h>
21518 #include <linux/uaccess.h>
21519 @@ -40,16 +43,14 @@ void printk_address(unsigned long address)
21520 static void
21521 print_ftrace_graph_addr(unsigned long addr, void *data,
21522 const struct stacktrace_ops *ops,
21523 - struct thread_info *tinfo, int *graph)
21524 + struct task_struct *task, int *graph)
21525 {
21526 - struct task_struct *task;
21527 unsigned long ret_addr;
21528 int index;
21529
21530 if (addr != (unsigned long)return_to_handler)
21531 return;
21532
21533 - task = tinfo->task;
21534 index = task->curr_ret_stack;
21535
21536 if (!task->ret_stack || index < *graph)
21537 @@ -66,7 +67,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21538 static inline void
21539 print_ftrace_graph_addr(unsigned long addr, void *data,
21540 const struct stacktrace_ops *ops,
21541 - struct thread_info *tinfo, int *graph)
21542 + struct task_struct *task, int *graph)
21543 { }
21544 #endif
21545
21546 @@ -77,10 +78,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21547 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
21548 */
21549
21550 -static inline int valid_stack_ptr(struct thread_info *tinfo,
21551 - void *p, unsigned int size, void *end)
21552 +static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
21553 {
21554 - void *t = tinfo;
21555 if (end) {
21556 if (p < end && p >= (end-THREAD_SIZE))
21557 return 1;
21558 @@ -91,14 +90,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
21559 }
21560
21561 unsigned long
21562 -print_context_stack(struct thread_info *tinfo,
21563 +print_context_stack(struct task_struct *task, void *stack_start,
21564 unsigned long *stack, unsigned long bp,
21565 const struct stacktrace_ops *ops, void *data,
21566 unsigned long *end, int *graph)
21567 {
21568 struct stack_frame *frame = (struct stack_frame *)bp;
21569
21570 - while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
21571 + while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
21572 unsigned long addr;
21573
21574 addr = *stack;
21575 @@ -110,7 +109,7 @@ print_context_stack(struct thread_info *tinfo,
21576 } else {
21577 ops->address(data, addr, 0);
21578 }
21579 - print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21580 + print_ftrace_graph_addr(addr, data, ops, task, graph);
21581 }
21582 stack++;
21583 }
21584 @@ -119,7 +118,7 @@ print_context_stack(struct thread_info *tinfo,
21585 EXPORT_SYMBOL_GPL(print_context_stack);
21586
21587 unsigned long
21588 -print_context_stack_bp(struct thread_info *tinfo,
21589 +print_context_stack_bp(struct task_struct *task, void *stack_start,
21590 unsigned long *stack, unsigned long bp,
21591 const struct stacktrace_ops *ops, void *data,
21592 unsigned long *end, int *graph)
21593 @@ -127,7 +126,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21594 struct stack_frame *frame = (struct stack_frame *)bp;
21595 unsigned long *ret_addr = &frame->return_address;
21596
21597 - while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
21598 + while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
21599 unsigned long addr = *ret_addr;
21600
21601 if (!__kernel_text_address(addr))
21602 @@ -136,7 +135,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21603 ops->address(data, addr, 1);
21604 frame = frame->next_frame;
21605 ret_addr = &frame->return_address;
21606 - print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21607 + print_ftrace_graph_addr(addr, data, ops, task, graph);
21608 }
21609
21610 return (unsigned long)frame;
21611 @@ -155,7 +154,7 @@ static int print_trace_stack(void *data, char *name)
21612 static void print_trace_address(void *data, unsigned long addr, int reliable)
21613 {
21614 touch_nmi_watchdog();
21615 - printk(data);
21616 + printk("%s", (char *)data);
21617 printk_stack_address(addr, reliable);
21618 }
21619
21620 @@ -224,6 +223,8 @@ unsigned __kprobes long oops_begin(void)
21621 }
21622 EXPORT_SYMBOL_GPL(oops_begin);
21623
21624 +extern void gr_handle_kernel_exploit(void);
21625 +
21626 void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
21627 {
21628 if (regs && kexec_should_crash(current))
21629 @@ -245,7 +246,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
21630 panic("Fatal exception in interrupt");
21631 if (panic_on_oops)
21632 panic("Fatal exception");
21633 - do_exit(signr);
21634 +
21635 + gr_handle_kernel_exploit();
21636 +
21637 + do_group_exit(signr);
21638 }
21639
21640 int __kprobes __die(const char *str, struct pt_regs *regs, long err)
21641 @@ -273,7 +277,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
21642 print_modules();
21643 show_regs(regs);
21644 #ifdef CONFIG_X86_32
21645 - if (user_mode_vm(regs)) {
21646 + if (user_mode(regs)) {
21647 sp = regs->sp;
21648 ss = regs->ss & 0xffff;
21649 } else {
21650 @@ -301,7 +305,7 @@ void die(const char *str, struct pt_regs *regs, long err)
21651 unsigned long flags = oops_begin();
21652 int sig = SIGSEGV;
21653
21654 - if (!user_mode_vm(regs))
21655 + if (!user_mode(regs))
21656 report_bug(regs->ip, regs);
21657
21658 if (__die(str, regs, err))
21659 diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
21660 index f2a1770..540657f 100644
21661 --- a/arch/x86/kernel/dumpstack_32.c
21662 +++ b/arch/x86/kernel/dumpstack_32.c
21663 @@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21664 bp = stack_frame(task, regs);
21665
21666 for (;;) {
21667 - struct thread_info *context;
21668 + void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
21669
21670 - context = (struct thread_info *)
21671 - ((unsigned long)stack & (~(THREAD_SIZE - 1)));
21672 - bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph);
21673 + bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
21674
21675 - stack = (unsigned long *)context->previous_esp;
21676 - if (!stack)
21677 + if (stack_start == task_stack_page(task))
21678 break;
21679 + stack = *(unsigned long **)stack_start;
21680 if (ops->stack(data, "IRQ") < 0)
21681 break;
21682 touch_nmi_watchdog();
21683 @@ -87,27 +85,28 @@ void show_regs(struct pt_regs *regs)
21684 int i;
21685
21686 show_regs_print_info(KERN_EMERG);
21687 - __show_regs(regs, !user_mode_vm(regs));
21688 + __show_regs(regs, !user_mode(regs));
21689
21690 /*
21691 * When in-kernel, we also print out the stack and code at the
21692 * time of the fault..
21693 */
21694 - if (!user_mode_vm(regs)) {
21695 + if (!user_mode(regs)) {
21696 unsigned int code_prologue = code_bytes * 43 / 64;
21697 unsigned int code_len = code_bytes;
21698 unsigned char c;
21699 u8 *ip;
21700 + unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
21701
21702 pr_emerg("Stack:\n");
21703 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
21704
21705 pr_emerg("Code:");
21706
21707 - ip = (u8 *)regs->ip - code_prologue;
21708 + ip = (u8 *)regs->ip - code_prologue + cs_base;
21709 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
21710 /* try starting at IP */
21711 - ip = (u8 *)regs->ip;
21712 + ip = (u8 *)regs->ip + cs_base;
21713 code_len = code_len - code_prologue + 1;
21714 }
21715 for (i = 0; i < code_len; i++, ip++) {
21716 @@ -116,7 +115,7 @@ void show_regs(struct pt_regs *regs)
21717 pr_cont(" Bad EIP value.");
21718 break;
21719 }
21720 - if (ip == (u8 *)regs->ip)
21721 + if (ip == (u8 *)regs->ip + cs_base)
21722 pr_cont(" <%02x>", c);
21723 else
21724 pr_cont(" %02x", c);
21725 @@ -129,6 +128,7 @@ int is_valid_bugaddr(unsigned long ip)
21726 {
21727 unsigned short ud2;
21728
21729 + ip = ktla_ktva(ip);
21730 if (ip < PAGE_OFFSET)
21731 return 0;
21732 if (probe_kernel_address((unsigned short *)ip, ud2))
21733 @@ -136,3 +136,15 @@ int is_valid_bugaddr(unsigned long ip)
21734
21735 return ud2 == 0x0b0f;
21736 }
21737 +
21738 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
21739 +void pax_check_alloca(unsigned long size)
21740 +{
21741 + unsigned long sp = (unsigned long)&sp, stack_left;
21742 +
21743 + /* all kernel stacks are of the same size */
21744 + stack_left = sp & (THREAD_SIZE - 1);
21745 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
21746 +}
21747 +EXPORT_SYMBOL(pax_check_alloca);
21748 +#endif
21749 diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
21750 index addb207..99635fa 100644
21751 --- a/arch/x86/kernel/dumpstack_64.c
21752 +++ b/arch/x86/kernel/dumpstack_64.c
21753 @@ -119,9 +119,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21754 unsigned long *irq_stack_end =
21755 (unsigned long *)per_cpu(irq_stack_ptr, cpu);
21756 unsigned used = 0;
21757 - struct thread_info *tinfo;
21758 int graph = 0;
21759 unsigned long dummy;
21760 + void *stack_start;
21761
21762 if (!task)
21763 task = current;
21764 @@ -142,10 +142,10 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21765 * current stack address. If the stacks consist of nested
21766 * exceptions
21767 */
21768 - tinfo = task_thread_info(task);
21769 for (;;) {
21770 char *id;
21771 unsigned long *estack_end;
21772 +
21773 estack_end = in_exception_stack(cpu, (unsigned long)stack,
21774 &used, &id);
21775
21776 @@ -153,7 +153,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21777 if (ops->stack(data, id) < 0)
21778 break;
21779
21780 - bp = ops->walk_stack(tinfo, stack, bp, ops,
21781 + bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
21782 data, estack_end, &graph);
21783 ops->stack(data, "<EOE>");
21784 /*
21785 @@ -161,6 +161,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21786 * second-to-last pointer (index -2 to end) in the
21787 * exception stack:
21788 */
21789 + if ((u16)estack_end[-1] != __KERNEL_DS)
21790 + goto out;
21791 stack = (unsigned long *) estack_end[-2];
21792 continue;
21793 }
21794 @@ -172,7 +174,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21795 if (in_irq_stack(stack, irq_stack, irq_stack_end)) {
21796 if (ops->stack(data, "IRQ") < 0)
21797 break;
21798 - bp = ops->walk_stack(tinfo, stack, bp,
21799 + bp = ops->walk_stack(task, irq_stack, stack, bp,
21800 ops, data, irq_stack_end, &graph);
21801 /*
21802 * We link to the next stack (which would be
21803 @@ -191,7 +193,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21804 /*
21805 * This handles the process stack:
21806 */
21807 - bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
21808 + stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
21809 + bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
21810 +out:
21811 put_cpu();
21812 }
21813 EXPORT_SYMBOL(dump_trace);
21814 @@ -300,3 +304,50 @@ int is_valid_bugaddr(unsigned long ip)
21815
21816 return ud2 == 0x0b0f;
21817 }
21818 +
21819 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
21820 +void pax_check_alloca(unsigned long size)
21821 +{
21822 + unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
21823 + unsigned cpu, used;
21824 + char *id;
21825 +
21826 + /* check the process stack first */
21827 + stack_start = (unsigned long)task_stack_page(current);
21828 + stack_end = stack_start + THREAD_SIZE;
21829 + if (likely(stack_start <= sp && sp < stack_end)) {
21830 + unsigned long stack_left = sp & (THREAD_SIZE - 1);
21831 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
21832 + return;
21833 + }
21834 +
21835 + cpu = get_cpu();
21836 +
21837 + /* check the irq stacks */
21838 + stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
21839 + stack_start = stack_end - IRQ_STACK_SIZE;
21840 + if (stack_start <= sp && sp < stack_end) {
21841 + unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
21842 + put_cpu();
21843 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
21844 + return;
21845 + }
21846 +
21847 + /* check the exception stacks */
21848 + used = 0;
21849 + stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
21850 + stack_start = stack_end - EXCEPTION_STKSZ;
21851 + if (stack_end && stack_start <= sp && sp < stack_end) {
21852 + unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
21853 + put_cpu();
21854 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
21855 + return;
21856 + }
21857 +
21858 + put_cpu();
21859 +
21860 + /* unknown stack */
21861 + BUG();
21862 +}
21863 +EXPORT_SYMBOL(pax_check_alloca);
21864 +#endif
21865 diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
21866 index 988c00a..4f673b6 100644
21867 --- a/arch/x86/kernel/e820.c
21868 +++ b/arch/x86/kernel/e820.c
21869 @@ -803,8 +803,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
21870
21871 static void early_panic(char *msg)
21872 {
21873 - early_printk(msg);
21874 - panic(msg);
21875 + early_printk("%s", msg);
21876 + panic("%s", msg);
21877 }
21878
21879 static int userdef __initdata;
21880 diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
21881 index 01d1c18..8073693 100644
21882 --- a/arch/x86/kernel/early_printk.c
21883 +++ b/arch/x86/kernel/early_printk.c
21884 @@ -7,6 +7,7 @@
21885 #include <linux/pci_regs.h>
21886 #include <linux/pci_ids.h>
21887 #include <linux/errno.h>
21888 +#include <linux/sched.h>
21889 #include <asm/io.h>
21890 #include <asm/processor.h>
21891 #include <asm/fcntl.h>
21892 diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
21893 index a2a4f46..6cab058 100644
21894 --- a/arch/x86/kernel/entry_32.S
21895 +++ b/arch/x86/kernel/entry_32.S
21896 @@ -177,13 +177,153 @@
21897 /*CFI_REL_OFFSET gs, PT_GS*/
21898 .endm
21899 .macro SET_KERNEL_GS reg
21900 +
21901 +#ifdef CONFIG_CC_STACKPROTECTOR
21902 movl $(__KERNEL_STACK_CANARY), \reg
21903 +#elif defined(CONFIG_PAX_MEMORY_UDEREF)
21904 + movl $(__USER_DS), \reg
21905 +#else
21906 + xorl \reg, \reg
21907 +#endif
21908 +
21909 movl \reg, %gs
21910 .endm
21911
21912 #endif /* CONFIG_X86_32_LAZY_GS */
21913
21914 -.macro SAVE_ALL
21915 +.macro pax_enter_kernel
21916 +#ifdef CONFIG_PAX_KERNEXEC
21917 + call pax_enter_kernel
21918 +#endif
21919 +.endm
21920 +
21921 +.macro pax_exit_kernel
21922 +#ifdef CONFIG_PAX_KERNEXEC
21923 + call pax_exit_kernel
21924 +#endif
21925 +.endm
21926 +
21927 +#ifdef CONFIG_PAX_KERNEXEC
21928 +ENTRY(pax_enter_kernel)
21929 +#ifdef CONFIG_PARAVIRT
21930 + pushl %eax
21931 + pushl %ecx
21932 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
21933 + mov %eax, %esi
21934 +#else
21935 + mov %cr0, %esi
21936 +#endif
21937 + bts $16, %esi
21938 + jnc 1f
21939 + mov %cs, %esi
21940 + cmp $__KERNEL_CS, %esi
21941 + jz 3f
21942 + ljmp $__KERNEL_CS, $3f
21943 +1: ljmp $__KERNEXEC_KERNEL_CS, $2f
21944 +2:
21945 +#ifdef CONFIG_PARAVIRT
21946 + mov %esi, %eax
21947 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
21948 +#else
21949 + mov %esi, %cr0
21950 +#endif
21951 +3:
21952 +#ifdef CONFIG_PARAVIRT
21953 + popl %ecx
21954 + popl %eax
21955 +#endif
21956 + ret
21957 +ENDPROC(pax_enter_kernel)
21958 +
21959 +ENTRY(pax_exit_kernel)
21960 +#ifdef CONFIG_PARAVIRT
21961 + pushl %eax
21962 + pushl %ecx
21963 +#endif
21964 + mov %cs, %esi
21965 + cmp $__KERNEXEC_KERNEL_CS, %esi
21966 + jnz 2f
21967 +#ifdef CONFIG_PARAVIRT
21968 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
21969 + mov %eax, %esi
21970 +#else
21971 + mov %cr0, %esi
21972 +#endif
21973 + btr $16, %esi
21974 + ljmp $__KERNEL_CS, $1f
21975 +1:
21976 +#ifdef CONFIG_PARAVIRT
21977 + mov %esi, %eax
21978 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
21979 +#else
21980 + mov %esi, %cr0
21981 +#endif
21982 +2:
21983 +#ifdef CONFIG_PARAVIRT
21984 + popl %ecx
21985 + popl %eax
21986 +#endif
21987 + ret
21988 +ENDPROC(pax_exit_kernel)
21989 +#endif
21990 +
21991 + .macro pax_erase_kstack
21992 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
21993 + call pax_erase_kstack
21994 +#endif
21995 + .endm
21996 +
21997 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
21998 +/*
21999 + * ebp: thread_info
22000 + */
22001 +ENTRY(pax_erase_kstack)
22002 + pushl %edi
22003 + pushl %ecx
22004 + pushl %eax
22005 +
22006 + mov TI_lowest_stack(%ebp), %edi
22007 + mov $-0xBEEF, %eax
22008 + std
22009 +
22010 +1: mov %edi, %ecx
22011 + and $THREAD_SIZE_asm - 1, %ecx
22012 + shr $2, %ecx
22013 + repne scasl
22014 + jecxz 2f
22015 +
22016 + cmp $2*16, %ecx
22017 + jc 2f
22018 +
22019 + mov $2*16, %ecx
22020 + repe scasl
22021 + jecxz 2f
22022 + jne 1b
22023 +
22024 +2: cld
22025 + mov %esp, %ecx
22026 + sub %edi, %ecx
22027 +
22028 + cmp $THREAD_SIZE_asm, %ecx
22029 + jb 3f
22030 + ud2
22031 +3:
22032 +
22033 + shr $2, %ecx
22034 + rep stosl
22035 +
22036 + mov TI_task_thread_sp0(%ebp), %edi
22037 + sub $128, %edi
22038 + mov %edi, TI_lowest_stack(%ebp)
22039 +
22040 + popl %eax
22041 + popl %ecx
22042 + popl %edi
22043 + ret
22044 +ENDPROC(pax_erase_kstack)
22045 +#endif
22046 +
22047 +.macro __SAVE_ALL _DS
22048 cld
22049 PUSH_GS
22050 pushl_cfi %fs
22051 @@ -206,7 +346,7 @@
22052 CFI_REL_OFFSET ecx, 0
22053 pushl_cfi %ebx
22054 CFI_REL_OFFSET ebx, 0
22055 - movl $(__USER_DS), %edx
22056 + movl $\_DS, %edx
22057 movl %edx, %ds
22058 movl %edx, %es
22059 movl $(__KERNEL_PERCPU), %edx
22060 @@ -214,6 +354,15 @@
22061 SET_KERNEL_GS %edx
22062 .endm
22063
22064 +.macro SAVE_ALL
22065 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22066 + __SAVE_ALL __KERNEL_DS
22067 + pax_enter_kernel
22068 +#else
22069 + __SAVE_ALL __USER_DS
22070 +#endif
22071 +.endm
22072 +
22073 .macro RESTORE_INT_REGS
22074 popl_cfi %ebx
22075 CFI_RESTORE ebx
22076 @@ -297,7 +446,7 @@ ENTRY(ret_from_fork)
22077 popfl_cfi
22078 jmp syscall_exit
22079 CFI_ENDPROC
22080 -END(ret_from_fork)
22081 +ENDPROC(ret_from_fork)
22082
22083 ENTRY(ret_from_kernel_thread)
22084 CFI_STARTPROC
22085 @@ -344,7 +493,15 @@ ret_from_intr:
22086 andl $SEGMENT_RPL_MASK, %eax
22087 #endif
22088 cmpl $USER_RPL, %eax
22089 +
22090 +#ifdef CONFIG_PAX_KERNEXEC
22091 + jae resume_userspace
22092 +
22093 + pax_exit_kernel
22094 + jmp resume_kernel
22095 +#else
22096 jb resume_kernel # not returning to v8086 or userspace
22097 +#endif
22098
22099 ENTRY(resume_userspace)
22100 LOCKDEP_SYS_EXIT
22101 @@ -356,8 +513,8 @@ ENTRY(resume_userspace)
22102 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22103 # int/exception return?
22104 jne work_pending
22105 - jmp restore_all
22106 -END(ret_from_exception)
22107 + jmp restore_all_pax
22108 +ENDPROC(ret_from_exception)
22109
22110 #ifdef CONFIG_PREEMPT
22111 ENTRY(resume_kernel)
22112 @@ -369,7 +526,7 @@ need_resched:
22113 jz restore_all
22114 call preempt_schedule_irq
22115 jmp need_resched
22116 -END(resume_kernel)
22117 +ENDPROC(resume_kernel)
22118 #endif
22119 CFI_ENDPROC
22120 /*
22121 @@ -403,30 +560,45 @@ sysenter_past_esp:
22122 /*CFI_REL_OFFSET cs, 0*/
22123 /*
22124 * Push current_thread_info()->sysenter_return to the stack.
22125 - * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
22126 - * pushed above; +8 corresponds to copy_thread's esp0 setting.
22127 */
22128 - pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
22129 + pushl_cfi $0
22130 CFI_REL_OFFSET eip, 0
22131
22132 pushl_cfi %eax
22133 SAVE_ALL
22134 + GET_THREAD_INFO(%ebp)
22135 + movl TI_sysenter_return(%ebp),%ebp
22136 + movl %ebp,PT_EIP(%esp)
22137 ENABLE_INTERRUPTS(CLBR_NONE)
22138
22139 /*
22140 * Load the potential sixth argument from user stack.
22141 * Careful about security.
22142 */
22143 + movl PT_OLDESP(%esp),%ebp
22144 +
22145 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22146 + mov PT_OLDSS(%esp),%ds
22147 +1: movl %ds:(%ebp),%ebp
22148 + push %ss
22149 + pop %ds
22150 +#else
22151 cmpl $__PAGE_OFFSET-3,%ebp
22152 jae syscall_fault
22153 ASM_STAC
22154 1: movl (%ebp),%ebp
22155 ASM_CLAC
22156 +#endif
22157 +
22158 movl %ebp,PT_EBP(%esp)
22159 _ASM_EXTABLE(1b,syscall_fault)
22160
22161 GET_THREAD_INFO(%ebp)
22162
22163 +#ifdef CONFIG_PAX_RANDKSTACK
22164 + pax_erase_kstack
22165 +#endif
22166 +
22167 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22168 jnz sysenter_audit
22169 sysenter_do_call:
22170 @@ -441,12 +613,24 @@ sysenter_do_call:
22171 testl $_TIF_ALLWORK_MASK, %ecx
22172 jne sysexit_audit
22173 sysenter_exit:
22174 +
22175 +#ifdef CONFIG_PAX_RANDKSTACK
22176 + pushl_cfi %eax
22177 + movl %esp, %eax
22178 + call pax_randomize_kstack
22179 + popl_cfi %eax
22180 +#endif
22181 +
22182 + pax_erase_kstack
22183 +
22184 /* if something modifies registers it must also disable sysexit */
22185 movl PT_EIP(%esp), %edx
22186 movl PT_OLDESP(%esp), %ecx
22187 xorl %ebp,%ebp
22188 TRACE_IRQS_ON
22189 1: mov PT_FS(%esp), %fs
22190 +2: mov PT_DS(%esp), %ds
22191 +3: mov PT_ES(%esp), %es
22192 PTGS_TO_GS
22193 ENABLE_INTERRUPTS_SYSEXIT
22194
22195 @@ -463,6 +647,9 @@ sysenter_audit:
22196 movl %eax,%edx /* 2nd arg: syscall number */
22197 movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
22198 call __audit_syscall_entry
22199 +
22200 + pax_erase_kstack
22201 +
22202 pushl_cfi %ebx
22203 movl PT_EAX(%esp),%eax /* reload syscall number */
22204 jmp sysenter_do_call
22205 @@ -488,10 +675,16 @@ sysexit_audit:
22206
22207 CFI_ENDPROC
22208 .pushsection .fixup,"ax"
22209 -2: movl $0,PT_FS(%esp)
22210 +4: movl $0,PT_FS(%esp)
22211 + jmp 1b
22212 +5: movl $0,PT_DS(%esp)
22213 + jmp 1b
22214 +6: movl $0,PT_ES(%esp)
22215 jmp 1b
22216 .popsection
22217 - _ASM_EXTABLE(1b,2b)
22218 + _ASM_EXTABLE(1b,4b)
22219 + _ASM_EXTABLE(2b,5b)
22220 + _ASM_EXTABLE(3b,6b)
22221 PTGS_TO_GS_EX
22222 ENDPROC(ia32_sysenter_target)
22223
22224 @@ -506,6 +699,11 @@ ENTRY(system_call)
22225 pushl_cfi %eax # save orig_eax
22226 SAVE_ALL
22227 GET_THREAD_INFO(%ebp)
22228 +
22229 +#ifdef CONFIG_PAX_RANDKSTACK
22230 + pax_erase_kstack
22231 +#endif
22232 +
22233 # system call tracing in operation / emulation
22234 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22235 jnz syscall_trace_entry
22236 @@ -524,6 +722,15 @@ syscall_exit:
22237 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22238 jne syscall_exit_work
22239
22240 +restore_all_pax:
22241 +
22242 +#ifdef CONFIG_PAX_RANDKSTACK
22243 + movl %esp, %eax
22244 + call pax_randomize_kstack
22245 +#endif
22246 +
22247 + pax_erase_kstack
22248 +
22249 restore_all:
22250 TRACE_IRQS_IRET
22251 restore_all_notrace:
22252 @@ -580,14 +787,34 @@ ldt_ss:
22253 * compensating for the offset by changing to the ESPFIX segment with
22254 * a base address that matches for the difference.
22255 */
22256 -#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22257 +#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22258 mov %esp, %edx /* load kernel esp */
22259 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22260 mov %dx, %ax /* eax: new kernel esp */
22261 sub %eax, %edx /* offset (low word is 0) */
22262 +#ifdef CONFIG_SMP
22263 + movl PER_CPU_VAR(cpu_number), %ebx
22264 + shll $PAGE_SHIFT_asm, %ebx
22265 + addl $cpu_gdt_table, %ebx
22266 +#else
22267 + movl $cpu_gdt_table, %ebx
22268 +#endif
22269 shr $16, %edx
22270 - mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22271 - mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22272 +
22273 +#ifdef CONFIG_PAX_KERNEXEC
22274 + mov %cr0, %esi
22275 + btr $16, %esi
22276 + mov %esi, %cr0
22277 +#endif
22278 +
22279 + mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22280 + mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22281 +
22282 +#ifdef CONFIG_PAX_KERNEXEC
22283 + bts $16, %esi
22284 + mov %esi, %cr0
22285 +#endif
22286 +
22287 pushl_cfi $__ESPFIX_SS
22288 pushl_cfi %eax /* new kernel esp */
22289 /* Disable interrupts, but do not irqtrace this section: we
22290 @@ -616,20 +843,18 @@ work_resched:
22291 movl TI_flags(%ebp), %ecx
22292 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22293 # than syscall tracing?
22294 - jz restore_all
22295 + jz restore_all_pax
22296 testb $_TIF_NEED_RESCHED, %cl
22297 jnz work_resched
22298
22299 work_notifysig: # deal with pending signals and
22300 # notify-resume requests
22301 + movl %esp, %eax
22302 #ifdef CONFIG_VM86
22303 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22304 - movl %esp, %eax
22305 jne work_notifysig_v86 # returning to kernel-space or
22306 # vm86-space
22307 1:
22308 -#else
22309 - movl %esp, %eax
22310 #endif
22311 TRACE_IRQS_ON
22312 ENABLE_INTERRUPTS(CLBR_NONE)
22313 @@ -650,7 +875,7 @@ work_notifysig_v86:
22314 movl %eax, %esp
22315 jmp 1b
22316 #endif
22317 -END(work_pending)
22318 +ENDPROC(work_pending)
22319
22320 # perform syscall exit tracing
22321 ALIGN
22322 @@ -658,11 +883,14 @@ syscall_trace_entry:
22323 movl $-ENOSYS,PT_EAX(%esp)
22324 movl %esp, %eax
22325 call syscall_trace_enter
22326 +
22327 + pax_erase_kstack
22328 +
22329 /* What it returned is what we'll actually use. */
22330 cmpl $(NR_syscalls), %eax
22331 jnae syscall_call
22332 jmp syscall_exit
22333 -END(syscall_trace_entry)
22334 +ENDPROC(syscall_trace_entry)
22335
22336 # perform syscall exit tracing
22337 ALIGN
22338 @@ -675,21 +903,25 @@ syscall_exit_work:
22339 movl %esp, %eax
22340 call syscall_trace_leave
22341 jmp resume_userspace
22342 -END(syscall_exit_work)
22343 +ENDPROC(syscall_exit_work)
22344 CFI_ENDPROC
22345
22346 RING0_INT_FRAME # can't unwind into user space anyway
22347 syscall_fault:
22348 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22349 + push %ss
22350 + pop %ds
22351 +#endif
22352 ASM_CLAC
22353 GET_THREAD_INFO(%ebp)
22354 movl $-EFAULT,PT_EAX(%esp)
22355 jmp resume_userspace
22356 -END(syscall_fault)
22357 +ENDPROC(syscall_fault)
22358
22359 syscall_badsys:
22360 movl $-ENOSYS,PT_EAX(%esp)
22361 jmp resume_userspace
22362 -END(syscall_badsys)
22363 +ENDPROC(syscall_badsys)
22364 CFI_ENDPROC
22365 /*
22366 * End of kprobes section
22367 @@ -705,8 +937,15 @@ END(syscall_badsys)
22368 * normal stack and adjusts ESP with the matching offset.
22369 */
22370 /* fixup the stack */
22371 - mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22372 - mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22373 +#ifdef CONFIG_SMP
22374 + movl PER_CPU_VAR(cpu_number), %ebx
22375 + shll $PAGE_SHIFT_asm, %ebx
22376 + addl $cpu_gdt_table, %ebx
22377 +#else
22378 + movl $cpu_gdt_table, %ebx
22379 +#endif
22380 + mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22381 + mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22382 shl $16, %eax
22383 addl %esp, %eax /* the adjusted stack pointer */
22384 pushl_cfi $__KERNEL_DS
22385 @@ -759,7 +998,7 @@ vector=vector+1
22386 .endr
22387 2: jmp common_interrupt
22388 .endr
22389 -END(irq_entries_start)
22390 +ENDPROC(irq_entries_start)
22391
22392 .previous
22393 END(interrupt)
22394 @@ -820,7 +1059,7 @@ ENTRY(coprocessor_error)
22395 pushl_cfi $do_coprocessor_error
22396 jmp error_code
22397 CFI_ENDPROC
22398 -END(coprocessor_error)
22399 +ENDPROC(coprocessor_error)
22400
22401 ENTRY(simd_coprocessor_error)
22402 RING0_INT_FRAME
22403 @@ -833,7 +1072,7 @@ ENTRY(simd_coprocessor_error)
22404 .section .altinstructions,"a"
22405 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
22406 .previous
22407 -.section .altinstr_replacement,"ax"
22408 +.section .altinstr_replacement,"a"
22409 663: pushl $do_simd_coprocessor_error
22410 664:
22411 .previous
22412 @@ -842,7 +1081,7 @@ ENTRY(simd_coprocessor_error)
22413 #endif
22414 jmp error_code
22415 CFI_ENDPROC
22416 -END(simd_coprocessor_error)
22417 +ENDPROC(simd_coprocessor_error)
22418
22419 ENTRY(device_not_available)
22420 RING0_INT_FRAME
22421 @@ -851,18 +1090,18 @@ ENTRY(device_not_available)
22422 pushl_cfi $do_device_not_available
22423 jmp error_code
22424 CFI_ENDPROC
22425 -END(device_not_available)
22426 +ENDPROC(device_not_available)
22427
22428 #ifdef CONFIG_PARAVIRT
22429 ENTRY(native_iret)
22430 iret
22431 _ASM_EXTABLE(native_iret, iret_exc)
22432 -END(native_iret)
22433 +ENDPROC(native_iret)
22434
22435 ENTRY(native_irq_enable_sysexit)
22436 sti
22437 sysexit
22438 -END(native_irq_enable_sysexit)
22439 +ENDPROC(native_irq_enable_sysexit)
22440 #endif
22441
22442 ENTRY(overflow)
22443 @@ -872,7 +1111,7 @@ ENTRY(overflow)
22444 pushl_cfi $do_overflow
22445 jmp error_code
22446 CFI_ENDPROC
22447 -END(overflow)
22448 +ENDPROC(overflow)
22449
22450 ENTRY(bounds)
22451 RING0_INT_FRAME
22452 @@ -881,7 +1120,7 @@ ENTRY(bounds)
22453 pushl_cfi $do_bounds
22454 jmp error_code
22455 CFI_ENDPROC
22456 -END(bounds)
22457 +ENDPROC(bounds)
22458
22459 ENTRY(invalid_op)
22460 RING0_INT_FRAME
22461 @@ -890,7 +1129,7 @@ ENTRY(invalid_op)
22462 pushl_cfi $do_invalid_op
22463 jmp error_code
22464 CFI_ENDPROC
22465 -END(invalid_op)
22466 +ENDPROC(invalid_op)
22467
22468 ENTRY(coprocessor_segment_overrun)
22469 RING0_INT_FRAME
22470 @@ -899,7 +1138,7 @@ ENTRY(coprocessor_segment_overrun)
22471 pushl_cfi $do_coprocessor_segment_overrun
22472 jmp error_code
22473 CFI_ENDPROC
22474 -END(coprocessor_segment_overrun)
22475 +ENDPROC(coprocessor_segment_overrun)
22476
22477 ENTRY(invalid_TSS)
22478 RING0_EC_FRAME
22479 @@ -907,7 +1146,7 @@ ENTRY(invalid_TSS)
22480 pushl_cfi $do_invalid_TSS
22481 jmp error_code
22482 CFI_ENDPROC
22483 -END(invalid_TSS)
22484 +ENDPROC(invalid_TSS)
22485
22486 ENTRY(segment_not_present)
22487 RING0_EC_FRAME
22488 @@ -915,7 +1154,7 @@ ENTRY(segment_not_present)
22489 pushl_cfi $do_segment_not_present
22490 jmp error_code
22491 CFI_ENDPROC
22492 -END(segment_not_present)
22493 +ENDPROC(segment_not_present)
22494
22495 ENTRY(stack_segment)
22496 RING0_EC_FRAME
22497 @@ -923,7 +1162,7 @@ ENTRY(stack_segment)
22498 pushl_cfi $do_stack_segment
22499 jmp error_code
22500 CFI_ENDPROC
22501 -END(stack_segment)
22502 +ENDPROC(stack_segment)
22503
22504 ENTRY(alignment_check)
22505 RING0_EC_FRAME
22506 @@ -931,7 +1170,7 @@ ENTRY(alignment_check)
22507 pushl_cfi $do_alignment_check
22508 jmp error_code
22509 CFI_ENDPROC
22510 -END(alignment_check)
22511 +ENDPROC(alignment_check)
22512
22513 ENTRY(divide_error)
22514 RING0_INT_FRAME
22515 @@ -940,7 +1179,7 @@ ENTRY(divide_error)
22516 pushl_cfi $do_divide_error
22517 jmp error_code
22518 CFI_ENDPROC
22519 -END(divide_error)
22520 +ENDPROC(divide_error)
22521
22522 #ifdef CONFIG_X86_MCE
22523 ENTRY(machine_check)
22524 @@ -950,7 +1189,7 @@ ENTRY(machine_check)
22525 pushl_cfi machine_check_vector
22526 jmp error_code
22527 CFI_ENDPROC
22528 -END(machine_check)
22529 +ENDPROC(machine_check)
22530 #endif
22531
22532 ENTRY(spurious_interrupt_bug)
22533 @@ -960,7 +1199,7 @@ ENTRY(spurious_interrupt_bug)
22534 pushl_cfi $do_spurious_interrupt_bug
22535 jmp error_code
22536 CFI_ENDPROC
22537 -END(spurious_interrupt_bug)
22538 +ENDPROC(spurious_interrupt_bug)
22539 /*
22540 * End of kprobes section
22541 */
22542 @@ -1070,7 +1309,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
22543
22544 ENTRY(mcount)
22545 ret
22546 -END(mcount)
22547 +ENDPROC(mcount)
22548
22549 ENTRY(ftrace_caller)
22550 cmpl $0, function_trace_stop
22551 @@ -1103,7 +1342,7 @@ ftrace_graph_call:
22552 .globl ftrace_stub
22553 ftrace_stub:
22554 ret
22555 -END(ftrace_caller)
22556 +ENDPROC(ftrace_caller)
22557
22558 ENTRY(ftrace_regs_caller)
22559 pushf /* push flags before compare (in cs location) */
22560 @@ -1207,7 +1446,7 @@ trace:
22561 popl %ecx
22562 popl %eax
22563 jmp ftrace_stub
22564 -END(mcount)
22565 +ENDPROC(mcount)
22566 #endif /* CONFIG_DYNAMIC_FTRACE */
22567 #endif /* CONFIG_FUNCTION_TRACER */
22568
22569 @@ -1225,7 +1464,7 @@ ENTRY(ftrace_graph_caller)
22570 popl %ecx
22571 popl %eax
22572 ret
22573 -END(ftrace_graph_caller)
22574 +ENDPROC(ftrace_graph_caller)
22575
22576 .globl return_to_handler
22577 return_to_handler:
22578 @@ -1291,15 +1530,18 @@ error_code:
22579 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
22580 REG_TO_PTGS %ecx
22581 SET_KERNEL_GS %ecx
22582 - movl $(__USER_DS), %ecx
22583 + movl $(__KERNEL_DS), %ecx
22584 movl %ecx, %ds
22585 movl %ecx, %es
22586 +
22587 + pax_enter_kernel
22588 +
22589 TRACE_IRQS_OFF
22590 movl %esp,%eax # pt_regs pointer
22591 call *%edi
22592 jmp ret_from_exception
22593 CFI_ENDPROC
22594 -END(page_fault)
22595 +ENDPROC(page_fault)
22596
22597 /*
22598 * Debug traps and NMI can happen at the one SYSENTER instruction
22599 @@ -1342,7 +1584,7 @@ debug_stack_correct:
22600 call do_debug
22601 jmp ret_from_exception
22602 CFI_ENDPROC
22603 -END(debug)
22604 +ENDPROC(debug)
22605
22606 /*
22607 * NMI is doubly nasty. It can happen _while_ we're handling
22608 @@ -1380,6 +1622,9 @@ nmi_stack_correct:
22609 xorl %edx,%edx # zero error code
22610 movl %esp,%eax # pt_regs pointer
22611 call do_nmi
22612 +
22613 + pax_exit_kernel
22614 +
22615 jmp restore_all_notrace
22616 CFI_ENDPROC
22617
22618 @@ -1416,12 +1661,15 @@ nmi_espfix_stack:
22619 FIXUP_ESPFIX_STACK # %eax == %esp
22620 xorl %edx,%edx # zero error code
22621 call do_nmi
22622 +
22623 + pax_exit_kernel
22624 +
22625 RESTORE_REGS
22626 lss 12+4(%esp), %esp # back to espfix stack
22627 CFI_ADJUST_CFA_OFFSET -24
22628 jmp irq_return
22629 CFI_ENDPROC
22630 -END(nmi)
22631 +ENDPROC(nmi)
22632
22633 ENTRY(int3)
22634 RING0_INT_FRAME
22635 @@ -1434,14 +1682,14 @@ ENTRY(int3)
22636 call do_int3
22637 jmp ret_from_exception
22638 CFI_ENDPROC
22639 -END(int3)
22640 +ENDPROC(int3)
22641
22642 ENTRY(general_protection)
22643 RING0_EC_FRAME
22644 pushl_cfi $do_general_protection
22645 jmp error_code
22646 CFI_ENDPROC
22647 -END(general_protection)
22648 +ENDPROC(general_protection)
22649
22650 #ifdef CONFIG_KVM_GUEST
22651 ENTRY(async_page_fault)
22652 @@ -1450,7 +1698,7 @@ ENTRY(async_page_fault)
22653 pushl_cfi $do_async_page_fault
22654 jmp error_code
22655 CFI_ENDPROC
22656 -END(async_page_fault)
22657 +ENDPROC(async_page_fault)
22658 #endif
22659
22660 /*
22661 diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
22662 index 1e96c36..3ff710a 100644
22663 --- a/arch/x86/kernel/entry_64.S
22664 +++ b/arch/x86/kernel/entry_64.S
22665 @@ -59,6 +59,8 @@
22666 #include <asm/context_tracking.h>
22667 #include <asm/smap.h>
22668 #include <linux/err.h>
22669 +#include <asm/pgtable.h>
22670 +#include <asm/alternative-asm.h>
22671
22672 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
22673 #include <linux/elf-em.h>
22674 @@ -80,8 +82,9 @@
22675 #ifdef CONFIG_DYNAMIC_FTRACE
22676
22677 ENTRY(function_hook)
22678 + pax_force_retaddr
22679 retq
22680 -END(function_hook)
22681 +ENDPROC(function_hook)
22682
22683 /* skip is set if stack has been adjusted */
22684 .macro ftrace_caller_setup skip=0
22685 @@ -122,8 +125,9 @@ GLOBAL(ftrace_graph_call)
22686 #endif
22687
22688 GLOBAL(ftrace_stub)
22689 + pax_force_retaddr
22690 retq
22691 -END(ftrace_caller)
22692 +ENDPROC(ftrace_caller)
22693
22694 ENTRY(ftrace_regs_caller)
22695 /* Save the current flags before compare (in SS location)*/
22696 @@ -191,7 +195,7 @@ ftrace_restore_flags:
22697 popfq
22698 jmp ftrace_stub
22699
22700 -END(ftrace_regs_caller)
22701 +ENDPROC(ftrace_regs_caller)
22702
22703
22704 #else /* ! CONFIG_DYNAMIC_FTRACE */
22705 @@ -212,6 +216,7 @@ ENTRY(function_hook)
22706 #endif
22707
22708 GLOBAL(ftrace_stub)
22709 + pax_force_retaddr
22710 retq
22711
22712 trace:
22713 @@ -225,12 +230,13 @@ trace:
22714 #endif
22715 subq $MCOUNT_INSN_SIZE, %rdi
22716
22717 + pax_force_fptr ftrace_trace_function
22718 call *ftrace_trace_function
22719
22720 MCOUNT_RESTORE_FRAME
22721
22722 jmp ftrace_stub
22723 -END(function_hook)
22724 +ENDPROC(function_hook)
22725 #endif /* CONFIG_DYNAMIC_FTRACE */
22726 #endif /* CONFIG_FUNCTION_TRACER */
22727
22728 @@ -252,8 +258,9 @@ ENTRY(ftrace_graph_caller)
22729
22730 MCOUNT_RESTORE_FRAME
22731
22732 + pax_force_retaddr
22733 retq
22734 -END(ftrace_graph_caller)
22735 +ENDPROC(ftrace_graph_caller)
22736
22737 GLOBAL(return_to_handler)
22738 subq $24, %rsp
22739 @@ -269,7 +276,9 @@ GLOBAL(return_to_handler)
22740 movq 8(%rsp), %rdx
22741 movq (%rsp), %rax
22742 addq $24, %rsp
22743 + pax_force_fptr %rdi
22744 jmp *%rdi
22745 +ENDPROC(return_to_handler)
22746 #endif
22747
22748
22749 @@ -284,6 +293,430 @@ ENTRY(native_usergs_sysret64)
22750 ENDPROC(native_usergs_sysret64)
22751 #endif /* CONFIG_PARAVIRT */
22752
22753 + .macro ljmpq sel, off
22754 +#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
22755 + .byte 0x48; ljmp *1234f(%rip)
22756 + .pushsection .rodata
22757 + .align 16
22758 + 1234: .quad \off; .word \sel
22759 + .popsection
22760 +#else
22761 + pushq $\sel
22762 + pushq $\off
22763 + lretq
22764 +#endif
22765 + .endm
22766 +
22767 + .macro pax_enter_kernel
22768 + pax_set_fptr_mask
22769 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22770 + call pax_enter_kernel
22771 +#endif
22772 + .endm
22773 +
22774 + .macro pax_exit_kernel
22775 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22776 + call pax_exit_kernel
22777 +#endif
22778 +
22779 + .endm
22780 +
22781 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22782 +ENTRY(pax_enter_kernel)
22783 + pushq %rdi
22784 +
22785 +#ifdef CONFIG_PARAVIRT
22786 + PV_SAVE_REGS(CLBR_RDI)
22787 +#endif
22788 +
22789 +#ifdef CONFIG_PAX_KERNEXEC
22790 + GET_CR0_INTO_RDI
22791 + bts $16,%rdi
22792 + jnc 3f
22793 + mov %cs,%edi
22794 + cmp $__KERNEL_CS,%edi
22795 + jnz 2f
22796 +1:
22797 +#endif
22798 +
22799 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22800 + 661: jmp 111f
22801 + .pushsection .altinstr_replacement, "a"
22802 + 662: ASM_NOP2
22803 + .popsection
22804 + .pushsection .altinstructions, "a"
22805 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
22806 + .popsection
22807 + GET_CR3_INTO_RDI
22808 + cmp $0,%dil
22809 + jnz 112f
22810 + mov $__KERNEL_DS,%edi
22811 + mov %edi,%ss
22812 + jmp 111f
22813 +112: cmp $1,%dil
22814 + jz 113f
22815 + ud2
22816 +113: sub $4097,%rdi
22817 + bts $63,%rdi
22818 + SET_RDI_INTO_CR3
22819 + mov $__UDEREF_KERNEL_DS,%edi
22820 + mov %edi,%ss
22821 +111:
22822 +#endif
22823 +
22824 +#ifdef CONFIG_PARAVIRT
22825 + PV_RESTORE_REGS(CLBR_RDI)
22826 +#endif
22827 +
22828 + popq %rdi
22829 + pax_force_retaddr
22830 + retq
22831 +
22832 +#ifdef CONFIG_PAX_KERNEXEC
22833 +2: ljmpq __KERNEL_CS,1b
22834 +3: ljmpq __KERNEXEC_KERNEL_CS,4f
22835 +4: SET_RDI_INTO_CR0
22836 + jmp 1b
22837 +#endif
22838 +ENDPROC(pax_enter_kernel)
22839 +
22840 +ENTRY(pax_exit_kernel)
22841 + pushq %rdi
22842 +
22843 +#ifdef CONFIG_PARAVIRT
22844 + PV_SAVE_REGS(CLBR_RDI)
22845 +#endif
22846 +
22847 +#ifdef CONFIG_PAX_KERNEXEC
22848 + mov %cs,%rdi
22849 + cmp $__KERNEXEC_KERNEL_CS,%edi
22850 + jz 2f
22851 + GET_CR0_INTO_RDI
22852 + bts $16,%rdi
22853 + jnc 4f
22854 +1:
22855 +#endif
22856 +
22857 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22858 + 661: jmp 111f
22859 + .pushsection .altinstr_replacement, "a"
22860 + 662: ASM_NOP2
22861 + .popsection
22862 + .pushsection .altinstructions, "a"
22863 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
22864 + .popsection
22865 + mov %ss,%edi
22866 + cmp $__UDEREF_KERNEL_DS,%edi
22867 + jnz 111f
22868 + GET_CR3_INTO_RDI
22869 + cmp $0,%dil
22870 + jz 112f
22871 + ud2
22872 +112: add $4097,%rdi
22873 + bts $63,%rdi
22874 + SET_RDI_INTO_CR3
22875 + mov $__KERNEL_DS,%edi
22876 + mov %edi,%ss
22877 +111:
22878 +#endif
22879 +
22880 +#ifdef CONFIG_PARAVIRT
22881 + PV_RESTORE_REGS(CLBR_RDI);
22882 +#endif
22883 +
22884 + popq %rdi
22885 + pax_force_retaddr
22886 + retq
22887 +
22888 +#ifdef CONFIG_PAX_KERNEXEC
22889 +2: GET_CR0_INTO_RDI
22890 + btr $16,%rdi
22891 + jnc 4f
22892 + ljmpq __KERNEL_CS,3f
22893 +3: SET_RDI_INTO_CR0
22894 + jmp 1b
22895 +4: ud2
22896 + jmp 4b
22897 +#endif
22898 +ENDPROC(pax_exit_kernel)
22899 +#endif
22900 +
22901 + .macro pax_enter_kernel_user
22902 + pax_set_fptr_mask
22903 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22904 + call pax_enter_kernel_user
22905 +#endif
22906 + .endm
22907 +
22908 + .macro pax_exit_kernel_user
22909 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22910 + call pax_exit_kernel_user
22911 +#endif
22912 +#ifdef CONFIG_PAX_RANDKSTACK
22913 + pushq %rax
22914 + pushq %r11
22915 + call pax_randomize_kstack
22916 + popq %r11
22917 + popq %rax
22918 +#endif
22919 + .endm
22920 +
22921 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22922 +ENTRY(pax_enter_kernel_user)
22923 + pushq %rdi
22924 + pushq %rbx
22925 +
22926 +#ifdef CONFIG_PARAVIRT
22927 + PV_SAVE_REGS(CLBR_RDI)
22928 +#endif
22929 +
22930 + 661: jmp 111f
22931 + .pushsection .altinstr_replacement, "a"
22932 + 662: ASM_NOP2
22933 + .popsection
22934 + .pushsection .altinstructions, "a"
22935 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
22936 + .popsection
22937 + GET_CR3_INTO_RDI
22938 + cmp $1,%dil
22939 + jnz 4f
22940 + sub $4097,%rdi
22941 + bts $63,%rdi
22942 + SET_RDI_INTO_CR3
22943 + jmp 3f
22944 +111:
22945 +
22946 + GET_CR3_INTO_RDI
22947 + mov %rdi,%rbx
22948 + add $__START_KERNEL_map,%rbx
22949 + sub phys_base(%rip),%rbx
22950 +
22951 +#ifdef CONFIG_PARAVIRT
22952 + cmpl $0, pv_info+PARAVIRT_enabled
22953 + jz 1f
22954 + pushq %rdi
22955 + i = 0
22956 + .rept USER_PGD_PTRS
22957 + mov i*8(%rbx),%rsi
22958 + mov $0,%sil
22959 + lea i*8(%rbx),%rdi
22960 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
22961 + i = i + 1
22962 + .endr
22963 + popq %rdi
22964 + jmp 2f
22965 +1:
22966 +#endif
22967 +
22968 + i = 0
22969 + .rept USER_PGD_PTRS
22970 + movb $0,i*8(%rbx)
22971 + i = i + 1
22972 + .endr
22973 +
22974 +2: SET_RDI_INTO_CR3
22975 +
22976 +#ifdef CONFIG_PAX_KERNEXEC
22977 + GET_CR0_INTO_RDI
22978 + bts $16,%rdi
22979 + SET_RDI_INTO_CR0
22980 +#endif
22981 +
22982 +3:
22983 +
22984 +#ifdef CONFIG_PARAVIRT
22985 + PV_RESTORE_REGS(CLBR_RDI)
22986 +#endif
22987 +
22988 + popq %rbx
22989 + popq %rdi
22990 + pax_force_retaddr
22991 + retq
22992 +4: ud2
22993 +ENDPROC(pax_enter_kernel_user)
22994 +
22995 +ENTRY(pax_exit_kernel_user)
22996 + pushq %rdi
22997 + pushq %rbx
22998 +
22999 +#ifdef CONFIG_PARAVIRT
23000 + PV_SAVE_REGS(CLBR_RDI)
23001 +#endif
23002 +
23003 + GET_CR3_INTO_RDI
23004 + 661: jmp 1f
23005 + .pushsection .altinstr_replacement, "a"
23006 + 662: ASM_NOP2
23007 + .popsection
23008 + .pushsection .altinstructions, "a"
23009 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23010 + .popsection
23011 + cmp $0,%dil
23012 + jnz 3f
23013 + add $4097,%rdi
23014 + bts $63,%rdi
23015 + SET_RDI_INTO_CR3
23016 + jmp 2f
23017 +1:
23018 +
23019 + mov %rdi,%rbx
23020 +
23021 +#ifdef CONFIG_PAX_KERNEXEC
23022 + GET_CR0_INTO_RDI
23023 + btr $16,%rdi
23024 + jnc 3f
23025 + SET_RDI_INTO_CR0
23026 +#endif
23027 +
23028 + add $__START_KERNEL_map,%rbx
23029 + sub phys_base(%rip),%rbx
23030 +
23031 +#ifdef CONFIG_PARAVIRT
23032 + cmpl $0, pv_info+PARAVIRT_enabled
23033 + jz 1f
23034 + i = 0
23035 + .rept USER_PGD_PTRS
23036 + mov i*8(%rbx),%rsi
23037 + mov $0x67,%sil
23038 + lea i*8(%rbx),%rdi
23039 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23040 + i = i + 1
23041 + .endr
23042 + jmp 2f
23043 +1:
23044 +#endif
23045 +
23046 + i = 0
23047 + .rept USER_PGD_PTRS
23048 + movb $0x67,i*8(%rbx)
23049 + i = i + 1
23050 + .endr
23051 +2:
23052 +
23053 +#ifdef CONFIG_PARAVIRT
23054 + PV_RESTORE_REGS(CLBR_RDI)
23055 +#endif
23056 +
23057 + popq %rbx
23058 + popq %rdi
23059 + pax_force_retaddr
23060 + retq
23061 +3: ud2
23062 +ENDPROC(pax_exit_kernel_user)
23063 +#endif
23064 +
23065 + .macro pax_enter_kernel_nmi
23066 + pax_set_fptr_mask
23067 +
23068 +#ifdef CONFIG_PAX_KERNEXEC
23069 + GET_CR0_INTO_RDI
23070 + bts $16,%rdi
23071 + jc 110f
23072 + SET_RDI_INTO_CR0
23073 + or $2,%ebx
23074 +110:
23075 +#endif
23076 +
23077 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23078 + 661: jmp 111f
23079 + .pushsection .altinstr_replacement, "a"
23080 + 662: ASM_NOP2
23081 + .popsection
23082 + .pushsection .altinstructions, "a"
23083 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23084 + .popsection
23085 + GET_CR3_INTO_RDI
23086 + cmp $0,%dil
23087 + jz 111f
23088 + sub $4097,%rdi
23089 + or $4,%ebx
23090 + bts $63,%rdi
23091 + SET_RDI_INTO_CR3
23092 + mov $__UDEREF_KERNEL_DS,%edi
23093 + mov %edi,%ss
23094 +111:
23095 +#endif
23096 + .endm
23097 +
23098 + .macro pax_exit_kernel_nmi
23099 +#ifdef CONFIG_PAX_KERNEXEC
23100 + btr $1,%ebx
23101 + jnc 110f
23102 + GET_CR0_INTO_RDI
23103 + btr $16,%rdi
23104 + SET_RDI_INTO_CR0
23105 +110:
23106 +#endif
23107 +
23108 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23109 + btr $2,%ebx
23110 + jnc 111f
23111 + GET_CR3_INTO_RDI
23112 + add $4097,%rdi
23113 + bts $63,%rdi
23114 + SET_RDI_INTO_CR3
23115 + mov $__KERNEL_DS,%edi
23116 + mov %edi,%ss
23117 +111:
23118 +#endif
23119 + .endm
23120 +
23121 + .macro pax_erase_kstack
23122 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23123 + call pax_erase_kstack
23124 +#endif
23125 + .endm
23126 +
23127 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23128 +ENTRY(pax_erase_kstack)
23129 + pushq %rdi
23130 + pushq %rcx
23131 + pushq %rax
23132 + pushq %r11
23133 +
23134 + GET_THREAD_INFO(%r11)
23135 + mov TI_lowest_stack(%r11), %rdi
23136 + mov $-0xBEEF, %rax
23137 + std
23138 +
23139 +1: mov %edi, %ecx
23140 + and $THREAD_SIZE_asm - 1, %ecx
23141 + shr $3, %ecx
23142 + repne scasq
23143 + jecxz 2f
23144 +
23145 + cmp $2*8, %ecx
23146 + jc 2f
23147 +
23148 + mov $2*8, %ecx
23149 + repe scasq
23150 + jecxz 2f
23151 + jne 1b
23152 +
23153 +2: cld
23154 + mov %esp, %ecx
23155 + sub %edi, %ecx
23156 +
23157 + cmp $THREAD_SIZE_asm, %rcx
23158 + jb 3f
23159 + ud2
23160 +3:
23161 +
23162 + shr $3, %ecx
23163 + rep stosq
23164 +
23165 + mov TI_task_thread_sp0(%r11), %rdi
23166 + sub $256, %rdi
23167 + mov %rdi, TI_lowest_stack(%r11)
23168 +
23169 + popq %r11
23170 + popq %rax
23171 + popq %rcx
23172 + popq %rdi
23173 + pax_force_retaddr
23174 + ret
23175 +ENDPROC(pax_erase_kstack)
23176 +#endif
23177
23178 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
23179 #ifdef CONFIG_TRACE_IRQFLAGS
23180 @@ -320,7 +753,7 @@ ENDPROC(native_usergs_sysret64)
23181 .endm
23182
23183 .macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
23184 - bt $9,EFLAGS-\offset(%rsp) /* interrupts off? */
23185 + bt $X86_EFLAGS_IF_BIT,EFLAGS-\offset(%rsp) /* interrupts off? */
23186 jnc 1f
23187 TRACE_IRQS_ON_DEBUG
23188 1:
23189 @@ -358,27 +791,6 @@ ENDPROC(native_usergs_sysret64)
23190 movq \tmp,R11+\offset(%rsp)
23191 .endm
23192
23193 - .macro FAKE_STACK_FRAME child_rip
23194 - /* push in order ss, rsp, eflags, cs, rip */
23195 - xorl %eax, %eax
23196 - pushq_cfi $__KERNEL_DS /* ss */
23197 - /*CFI_REL_OFFSET ss,0*/
23198 - pushq_cfi %rax /* rsp */
23199 - CFI_REL_OFFSET rsp,0
23200 - pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_FIXED) /* eflags - interrupts on */
23201 - /*CFI_REL_OFFSET rflags,0*/
23202 - pushq_cfi $__KERNEL_CS /* cs */
23203 - /*CFI_REL_OFFSET cs,0*/
23204 - pushq_cfi \child_rip /* rip */
23205 - CFI_REL_OFFSET rip,0
23206 - pushq_cfi %rax /* orig rax */
23207 - .endm
23208 -
23209 - .macro UNFAKE_STACK_FRAME
23210 - addq $8*6, %rsp
23211 - CFI_ADJUST_CFA_OFFSET -(6*8)
23212 - .endm
23213 -
23214 /*
23215 * initial frame state for interrupts (and exceptions without error code)
23216 */
23217 @@ -445,25 +857,26 @@ ENDPROC(native_usergs_sysret64)
23218 /* save partial stack frame */
23219 .macro SAVE_ARGS_IRQ
23220 cld
23221 - /* start from rbp in pt_regs and jump over */
23222 - movq_cfi rdi, (RDI-RBP)
23223 - movq_cfi rsi, (RSI-RBP)
23224 - movq_cfi rdx, (RDX-RBP)
23225 - movq_cfi rcx, (RCX-RBP)
23226 - movq_cfi rax, (RAX-RBP)
23227 - movq_cfi r8, (R8-RBP)
23228 - movq_cfi r9, (R9-RBP)
23229 - movq_cfi r10, (R10-RBP)
23230 - movq_cfi r11, (R11-RBP)
23231 + /* start from r15 in pt_regs and jump over */
23232 + movq_cfi rdi, RDI
23233 + movq_cfi rsi, RSI
23234 + movq_cfi rdx, RDX
23235 + movq_cfi rcx, RCX
23236 + movq_cfi rax, RAX
23237 + movq_cfi r8, R8
23238 + movq_cfi r9, R9
23239 + movq_cfi r10, R10
23240 + movq_cfi r11, R11
23241 + movq_cfi r12, R12
23242
23243 /* Save rbp so that we can unwind from get_irq_regs() */
23244 - movq_cfi rbp, 0
23245 + movq_cfi rbp, RBP
23246
23247 /* Save previous stack value */
23248 movq %rsp, %rsi
23249
23250 - leaq -RBP(%rsp),%rdi /* arg1 for handler */
23251 - testl $3, CS-RBP(%rsi)
23252 + movq %rsp,%rdi /* arg1 for handler */
23253 + testb $3, CS(%rsi)
23254 je 1f
23255 SWAPGS
23256 /*
23257 @@ -483,6 +896,18 @@ ENDPROC(native_usergs_sysret64)
23258 0x06 /* DW_OP_deref */, \
23259 0x08 /* DW_OP_const1u */, SS+8-RBP, \
23260 0x22 /* DW_OP_plus */
23261 +
23262 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23263 + testb $3, CS(%rdi)
23264 + jnz 1f
23265 + pax_enter_kernel
23266 + jmp 2f
23267 +1: pax_enter_kernel_user
23268 +2:
23269 +#else
23270 + pax_enter_kernel
23271 +#endif
23272 +
23273 /* We entered an interrupt context - irqs are off: */
23274 TRACE_IRQS_OFF
23275 .endm
23276 @@ -514,9 +939,52 @@ ENTRY(save_paranoid)
23277 js 1f /* negative -> in kernel */
23278 SWAPGS
23279 xorl %ebx,%ebx
23280 -1: ret
23281 +1:
23282 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23283 + testb $3, CS+8(%rsp)
23284 + jnz 1f
23285 + pax_enter_kernel
23286 + jmp 2f
23287 +1: pax_enter_kernel_user
23288 +2:
23289 +#else
23290 + pax_enter_kernel
23291 +#endif
23292 + pax_force_retaddr
23293 + ret
23294 CFI_ENDPROC
23295 -END(save_paranoid)
23296 +ENDPROC(save_paranoid)
23297 +
23298 +ENTRY(save_paranoid_nmi)
23299 + XCPT_FRAME 1 RDI+8
23300 + cld
23301 + movq_cfi rdi, RDI+8
23302 + movq_cfi rsi, RSI+8
23303 + movq_cfi rdx, RDX+8
23304 + movq_cfi rcx, RCX+8
23305 + movq_cfi rax, RAX+8
23306 + movq_cfi r8, R8+8
23307 + movq_cfi r9, R9+8
23308 + movq_cfi r10, R10+8
23309 + movq_cfi r11, R11+8
23310 + movq_cfi rbx, RBX+8
23311 + movq_cfi rbp, RBP+8
23312 + movq_cfi r12, R12+8
23313 + movq_cfi r13, R13+8
23314 + movq_cfi r14, R14+8
23315 + movq_cfi r15, R15+8
23316 + movl $1,%ebx
23317 + movl $MSR_GS_BASE,%ecx
23318 + rdmsr
23319 + testl %edx,%edx
23320 + js 1f /* negative -> in kernel */
23321 + SWAPGS
23322 + xorl %ebx,%ebx
23323 +1: pax_enter_kernel_nmi
23324 + pax_force_retaddr
23325 + ret
23326 + CFI_ENDPROC
23327 +ENDPROC(save_paranoid_nmi)
23328 .popsection
23329
23330 /*
23331 @@ -538,7 +1006,7 @@ ENTRY(ret_from_fork)
23332
23333 RESTORE_REST
23334
23335 - testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23336 + testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23337 jz 1f
23338
23339 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
23340 @@ -548,15 +1016,13 @@ ENTRY(ret_from_fork)
23341 jmp ret_from_sys_call # go to the SYSRET fastpath
23342
23343 1:
23344 - subq $REST_SKIP, %rsp # leave space for volatiles
23345 - CFI_ADJUST_CFA_OFFSET REST_SKIP
23346 movq %rbp, %rdi
23347 call *%rbx
23348 movl $0, RAX(%rsp)
23349 RESTORE_REST
23350 jmp int_ret_from_sys_call
23351 CFI_ENDPROC
23352 -END(ret_from_fork)
23353 +ENDPROC(ret_from_fork)
23354
23355 /*
23356 * System call entry. Up to 6 arguments in registers are supported.
23357 @@ -593,7 +1059,7 @@ END(ret_from_fork)
23358 ENTRY(system_call)
23359 CFI_STARTPROC simple
23360 CFI_SIGNAL_FRAME
23361 - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
23362 + CFI_DEF_CFA rsp,0
23363 CFI_REGISTER rip,rcx
23364 /*CFI_REGISTER rflags,r11*/
23365 SWAPGS_UNSAFE_STACK
23366 @@ -606,16 +1072,23 @@ GLOBAL(system_call_after_swapgs)
23367
23368 movq %rsp,PER_CPU_VAR(old_rsp)
23369 movq PER_CPU_VAR(kernel_stack),%rsp
23370 + SAVE_ARGS 8*6,0
23371 + pax_enter_kernel_user
23372 +
23373 +#ifdef CONFIG_PAX_RANDKSTACK
23374 + pax_erase_kstack
23375 +#endif
23376 +
23377 /*
23378 * No need to follow this irqs off/on section - it's straight
23379 * and short:
23380 */
23381 ENABLE_INTERRUPTS(CLBR_NONE)
23382 - SAVE_ARGS 8,0
23383 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
23384 movq %rcx,RIP-ARGOFFSET(%rsp)
23385 CFI_REL_OFFSET rip,RIP-ARGOFFSET
23386 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23387 + GET_THREAD_INFO(%rcx)
23388 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23389 jnz tracesys
23390 system_call_fastpath:
23391 #if __SYSCALL_MASK == ~0
23392 @@ -639,10 +1112,13 @@ sysret_check:
23393 LOCKDEP_SYS_EXIT
23394 DISABLE_INTERRUPTS(CLBR_NONE)
23395 TRACE_IRQS_OFF
23396 - movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
23397 + GET_THREAD_INFO(%rcx)
23398 + movl TI_flags(%rcx),%edx
23399 andl %edi,%edx
23400 jnz sysret_careful
23401 CFI_REMEMBER_STATE
23402 + pax_exit_kernel_user
23403 + pax_erase_kstack
23404 /*
23405 * sysretq will re-enable interrupts:
23406 */
23407 @@ -701,6 +1177,9 @@ auditsys:
23408 movq %rax,%rsi /* 2nd arg: syscall number */
23409 movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
23410 call __audit_syscall_entry
23411 +
23412 + pax_erase_kstack
23413 +
23414 LOAD_ARGS 0 /* reload call-clobbered registers */
23415 jmp system_call_fastpath
23416
23417 @@ -722,7 +1201,7 @@ sysret_audit:
23418 /* Do syscall tracing */
23419 tracesys:
23420 #ifdef CONFIG_AUDITSYSCALL
23421 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23422 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%rcx)
23423 jz auditsys
23424 #endif
23425 SAVE_REST
23426 @@ -730,12 +1209,15 @@ tracesys:
23427 FIXUP_TOP_OF_STACK %rdi
23428 movq %rsp,%rdi
23429 call syscall_trace_enter
23430 +
23431 + pax_erase_kstack
23432 +
23433 /*
23434 * Reload arg registers from stack in case ptrace changed them.
23435 * We don't reload %rax because syscall_trace_enter() returned
23436 * the value it wants us to use in the table lookup.
23437 */
23438 - LOAD_ARGS ARGOFFSET, 1
23439 + LOAD_ARGS 1
23440 RESTORE_REST
23441 #if __SYSCALL_MASK == ~0
23442 cmpq $__NR_syscall_max,%rax
23443 @@ -765,7 +1247,9 @@ GLOBAL(int_with_check)
23444 andl %edi,%edx
23445 jnz int_careful
23446 andl $~TS_COMPAT,TI_status(%rcx)
23447 - jmp retint_swapgs
23448 + pax_exit_kernel_user
23449 + pax_erase_kstack
23450 + jmp retint_swapgs_pax
23451
23452 /* Either reschedule or signal or syscall exit tracking needed. */
23453 /* First do a reschedule test. */
23454 @@ -811,7 +1295,7 @@ int_restore_rest:
23455 TRACE_IRQS_OFF
23456 jmp int_with_check
23457 CFI_ENDPROC
23458 -END(system_call)
23459 +ENDPROC(system_call)
23460
23461 .macro FORK_LIKE func
23462 ENTRY(stub_\func)
23463 @@ -824,9 +1308,10 @@ ENTRY(stub_\func)
23464 DEFAULT_FRAME 0 8 /* offset 8: return address */
23465 call sys_\func
23466 RESTORE_TOP_OF_STACK %r11, 8
23467 - ret $REST_SKIP /* pop extended registers */
23468 + pax_force_retaddr
23469 + ret
23470 CFI_ENDPROC
23471 -END(stub_\func)
23472 +ENDPROC(stub_\func)
23473 .endm
23474
23475 .macro FIXED_FRAME label,func
23476 @@ -836,9 +1321,10 @@ ENTRY(\label)
23477 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
23478 call \func
23479 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
23480 + pax_force_retaddr
23481 ret
23482 CFI_ENDPROC
23483 -END(\label)
23484 +ENDPROC(\label)
23485 .endm
23486
23487 FORK_LIKE clone
23488 @@ -846,19 +1332,6 @@ END(\label)
23489 FORK_LIKE vfork
23490 FIXED_FRAME stub_iopl, sys_iopl
23491
23492 -ENTRY(ptregscall_common)
23493 - DEFAULT_FRAME 1 8 /* offset 8: return address */
23494 - RESTORE_TOP_OF_STACK %r11, 8
23495 - movq_cfi_restore R15+8, r15
23496 - movq_cfi_restore R14+8, r14
23497 - movq_cfi_restore R13+8, r13
23498 - movq_cfi_restore R12+8, r12
23499 - movq_cfi_restore RBP+8, rbp
23500 - movq_cfi_restore RBX+8, rbx
23501 - ret $REST_SKIP /* pop extended registers */
23502 - CFI_ENDPROC
23503 -END(ptregscall_common)
23504 -
23505 ENTRY(stub_execve)
23506 CFI_STARTPROC
23507 addq $8, %rsp
23508 @@ -870,7 +1343,7 @@ ENTRY(stub_execve)
23509 RESTORE_REST
23510 jmp int_ret_from_sys_call
23511 CFI_ENDPROC
23512 -END(stub_execve)
23513 +ENDPROC(stub_execve)
23514
23515 /*
23516 * sigreturn is special because it needs to restore all registers on return.
23517 @@ -887,7 +1360,7 @@ ENTRY(stub_rt_sigreturn)
23518 RESTORE_REST
23519 jmp int_ret_from_sys_call
23520 CFI_ENDPROC
23521 -END(stub_rt_sigreturn)
23522 +ENDPROC(stub_rt_sigreturn)
23523
23524 #ifdef CONFIG_X86_X32_ABI
23525 ENTRY(stub_x32_rt_sigreturn)
23526 @@ -901,7 +1374,7 @@ ENTRY(stub_x32_rt_sigreturn)
23527 RESTORE_REST
23528 jmp int_ret_from_sys_call
23529 CFI_ENDPROC
23530 -END(stub_x32_rt_sigreturn)
23531 +ENDPROC(stub_x32_rt_sigreturn)
23532
23533 ENTRY(stub_x32_execve)
23534 CFI_STARTPROC
23535 @@ -915,7 +1388,7 @@ ENTRY(stub_x32_execve)
23536 RESTORE_REST
23537 jmp int_ret_from_sys_call
23538 CFI_ENDPROC
23539 -END(stub_x32_execve)
23540 +ENDPROC(stub_x32_execve)
23541
23542 #endif
23543
23544 @@ -952,7 +1425,7 @@ vector=vector+1
23545 2: jmp common_interrupt
23546 .endr
23547 CFI_ENDPROC
23548 -END(irq_entries_start)
23549 +ENDPROC(irq_entries_start)
23550
23551 .previous
23552 END(interrupt)
23553 @@ -969,8 +1442,8 @@ END(interrupt)
23554 /* 0(%rsp): ~(interrupt number) */
23555 .macro interrupt func
23556 /* reserve pt_regs for scratch regs and rbp */
23557 - subq $ORIG_RAX-RBP, %rsp
23558 - CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
23559 + subq $ORIG_RAX, %rsp
23560 + CFI_ADJUST_CFA_OFFSET ORIG_RAX
23561 SAVE_ARGS_IRQ
23562 call \func
23563 .endm
23564 @@ -997,14 +1470,14 @@ ret_from_intr:
23565
23566 /* Restore saved previous stack */
23567 popq %rsi
23568 - CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */
23569 - leaq ARGOFFSET-RBP(%rsi), %rsp
23570 + CFI_DEF_CFA rsi,SS+8 /* reg/off reset after def_cfa_expr */
23571 + movq %rsi, %rsp
23572 CFI_DEF_CFA_REGISTER rsp
23573 - CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET
23574 + CFI_ADJUST_CFA_OFFSET -ARGOFFSET
23575
23576 exit_intr:
23577 GET_THREAD_INFO(%rcx)
23578 - testl $3,CS-ARGOFFSET(%rsp)
23579 + testb $3,CS-ARGOFFSET(%rsp)
23580 je retint_kernel
23581
23582 /* Interrupt came from user space */
23583 @@ -1026,12 +1499,16 @@ retint_swapgs: /* return to user-space */
23584 * The iretq could re-enable interrupts:
23585 */
23586 DISABLE_INTERRUPTS(CLBR_ANY)
23587 + pax_exit_kernel_user
23588 +retint_swapgs_pax:
23589 TRACE_IRQS_IRETQ
23590 SWAPGS
23591 jmp restore_args
23592
23593 retint_restore_args: /* return to kernel space */
23594 DISABLE_INTERRUPTS(CLBR_ANY)
23595 + pax_exit_kernel
23596 + pax_force_retaddr (RIP-ARGOFFSET)
23597 /*
23598 * The iretq could re-enable interrupts:
23599 */
23600 @@ -1112,7 +1589,7 @@ ENTRY(retint_kernel)
23601 #endif
23602
23603 CFI_ENDPROC
23604 -END(common_interrupt)
23605 +ENDPROC(common_interrupt)
23606 /*
23607 * End of kprobes section
23608 */
23609 @@ -1130,7 +1607,7 @@ ENTRY(\sym)
23610 interrupt \do_sym
23611 jmp ret_from_intr
23612 CFI_ENDPROC
23613 -END(\sym)
23614 +ENDPROC(\sym)
23615 .endm
23616
23617 #ifdef CONFIG_TRACING
23618 @@ -1218,7 +1695,7 @@ ENTRY(\sym)
23619 call \do_sym
23620 jmp error_exit /* %ebx: no swapgs flag */
23621 CFI_ENDPROC
23622 -END(\sym)
23623 +ENDPROC(\sym)
23624 .endm
23625
23626 .macro paranoidzeroentry sym do_sym
23627 @@ -1236,10 +1713,10 @@ ENTRY(\sym)
23628 call \do_sym
23629 jmp paranoid_exit /* %ebx: no swapgs flag */
23630 CFI_ENDPROC
23631 -END(\sym)
23632 +ENDPROC(\sym)
23633 .endm
23634
23635 -#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
23636 +#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23637 .macro paranoidzeroentry_ist sym do_sym ist
23638 ENTRY(\sym)
23639 INTR_FRAME
23640 @@ -1252,12 +1729,18 @@ ENTRY(\sym)
23641 TRACE_IRQS_OFF_DEBUG
23642 movq %rsp,%rdi /* pt_regs pointer */
23643 xorl %esi,%esi /* no error code */
23644 +#ifdef CONFIG_SMP
23645 + imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23646 + lea init_tss(%r13), %r13
23647 +#else
23648 + lea init_tss(%rip), %r13
23649 +#endif
23650 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
23651 call \do_sym
23652 addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
23653 jmp paranoid_exit /* %ebx: no swapgs flag */
23654 CFI_ENDPROC
23655 -END(\sym)
23656 +ENDPROC(\sym)
23657 .endm
23658
23659 .macro errorentry sym do_sym
23660 @@ -1275,7 +1758,7 @@ ENTRY(\sym)
23661 call \do_sym
23662 jmp error_exit /* %ebx: no swapgs flag */
23663 CFI_ENDPROC
23664 -END(\sym)
23665 +ENDPROC(\sym)
23666 .endm
23667
23668 #ifdef CONFIG_TRACING
23669 @@ -1306,7 +1789,7 @@ ENTRY(\sym)
23670 call \do_sym
23671 jmp paranoid_exit /* %ebx: no swapgs flag */
23672 CFI_ENDPROC
23673 -END(\sym)
23674 +ENDPROC(\sym)
23675 .endm
23676
23677 zeroentry divide_error do_divide_error
23678 @@ -1336,9 +1819,10 @@ gs_change:
23679 2: mfence /* workaround */
23680 SWAPGS
23681 popfq_cfi
23682 + pax_force_retaddr
23683 ret
23684 CFI_ENDPROC
23685 -END(native_load_gs_index)
23686 +ENDPROC(native_load_gs_index)
23687
23688 _ASM_EXTABLE(gs_change,bad_gs)
23689 .section .fixup,"ax"
23690 @@ -1366,9 +1850,10 @@ ENTRY(do_softirq_own_stack)
23691 CFI_DEF_CFA_REGISTER rsp
23692 CFI_ADJUST_CFA_OFFSET -8
23693 decl PER_CPU_VAR(irq_count)
23694 + pax_force_retaddr
23695 ret
23696 CFI_ENDPROC
23697 -END(do_softirq_own_stack)
23698 +ENDPROC(do_softirq_own_stack)
23699
23700 #ifdef CONFIG_XEN
23701 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
23702 @@ -1406,7 +1891,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
23703 decl PER_CPU_VAR(irq_count)
23704 jmp error_exit
23705 CFI_ENDPROC
23706 -END(xen_do_hypervisor_callback)
23707 +ENDPROC(xen_do_hypervisor_callback)
23708
23709 /*
23710 * Hypervisor uses this for application faults while it executes.
23711 @@ -1465,7 +1950,7 @@ ENTRY(xen_failsafe_callback)
23712 SAVE_ALL
23713 jmp error_exit
23714 CFI_ENDPROC
23715 -END(xen_failsafe_callback)
23716 +ENDPROC(xen_failsafe_callback)
23717
23718 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
23719 xen_hvm_callback_vector xen_evtchn_do_upcall
23720 @@ -1517,18 +2002,33 @@ ENTRY(paranoid_exit)
23721 DEFAULT_FRAME
23722 DISABLE_INTERRUPTS(CLBR_NONE)
23723 TRACE_IRQS_OFF_DEBUG
23724 - testl %ebx,%ebx /* swapgs needed? */
23725 + testl $1,%ebx /* swapgs needed? */
23726 jnz paranoid_restore
23727 - testl $3,CS(%rsp)
23728 + testb $3,CS(%rsp)
23729 jnz paranoid_userspace
23730 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23731 + pax_exit_kernel
23732 + TRACE_IRQS_IRETQ 0
23733 + SWAPGS_UNSAFE_STACK
23734 + RESTORE_ALL 8
23735 + pax_force_retaddr_bts
23736 + jmp irq_return
23737 +#endif
23738 paranoid_swapgs:
23739 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23740 + pax_exit_kernel_user
23741 +#else
23742 + pax_exit_kernel
23743 +#endif
23744 TRACE_IRQS_IRETQ 0
23745 SWAPGS_UNSAFE_STACK
23746 RESTORE_ALL 8
23747 jmp irq_return
23748 paranoid_restore:
23749 + pax_exit_kernel
23750 TRACE_IRQS_IRETQ_DEBUG 0
23751 RESTORE_ALL 8
23752 + pax_force_retaddr_bts
23753 jmp irq_return
23754 paranoid_userspace:
23755 GET_THREAD_INFO(%rcx)
23756 @@ -1557,7 +2057,7 @@ paranoid_schedule:
23757 TRACE_IRQS_OFF
23758 jmp paranoid_userspace
23759 CFI_ENDPROC
23760 -END(paranoid_exit)
23761 +ENDPROC(paranoid_exit)
23762
23763 /*
23764 * Exception entry point. This expects an error code/orig_rax on the stack.
23765 @@ -1584,12 +2084,23 @@ ENTRY(error_entry)
23766 movq_cfi r14, R14+8
23767 movq_cfi r15, R15+8
23768 xorl %ebx,%ebx
23769 - testl $3,CS+8(%rsp)
23770 + testb $3,CS+8(%rsp)
23771 je error_kernelspace
23772 error_swapgs:
23773 SWAPGS
23774 error_sti:
23775 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23776 + testb $3, CS+8(%rsp)
23777 + jnz 1f
23778 + pax_enter_kernel
23779 + jmp 2f
23780 +1: pax_enter_kernel_user
23781 +2:
23782 +#else
23783 + pax_enter_kernel
23784 +#endif
23785 TRACE_IRQS_OFF
23786 + pax_force_retaddr
23787 ret
23788
23789 /*
23790 @@ -1616,7 +2127,7 @@ bstep_iret:
23791 movq %rcx,RIP+8(%rsp)
23792 jmp error_swapgs
23793 CFI_ENDPROC
23794 -END(error_entry)
23795 +ENDPROC(error_entry)
23796
23797
23798 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
23799 @@ -1627,7 +2138,7 @@ ENTRY(error_exit)
23800 DISABLE_INTERRUPTS(CLBR_NONE)
23801 TRACE_IRQS_OFF
23802 GET_THREAD_INFO(%rcx)
23803 - testl %eax,%eax
23804 + testl $1,%eax
23805 jne retint_kernel
23806 LOCKDEP_SYS_EXIT_IRQ
23807 movl TI_flags(%rcx),%edx
23808 @@ -1636,7 +2147,7 @@ ENTRY(error_exit)
23809 jnz retint_careful
23810 jmp retint_swapgs
23811 CFI_ENDPROC
23812 -END(error_exit)
23813 +ENDPROC(error_exit)
23814
23815 /*
23816 * Test if a given stack is an NMI stack or not.
23817 @@ -1694,9 +2205,11 @@ ENTRY(nmi)
23818 * If %cs was not the kernel segment, then the NMI triggered in user
23819 * space, which means it is definitely not nested.
23820 */
23821 + cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
23822 + je 1f
23823 cmpl $__KERNEL_CS, 16(%rsp)
23824 jne first_nmi
23825 -
23826 +1:
23827 /*
23828 * Check the special variable on the stack to see if NMIs are
23829 * executing.
23830 @@ -1730,8 +2243,7 @@ nested_nmi:
23831
23832 1:
23833 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
23834 - leaq -1*8(%rsp), %rdx
23835 - movq %rdx, %rsp
23836 + subq $8, %rsp
23837 CFI_ADJUST_CFA_OFFSET 1*8
23838 leaq -10*8(%rsp), %rdx
23839 pushq_cfi $__KERNEL_DS
23840 @@ -1749,6 +2261,7 @@ nested_nmi_out:
23841 CFI_RESTORE rdx
23842
23843 /* No need to check faults here */
23844 +# pax_force_retaddr_bts
23845 INTERRUPT_RETURN
23846
23847 CFI_RESTORE_STATE
23848 @@ -1845,13 +2358,13 @@ end_repeat_nmi:
23849 subq $ORIG_RAX-R15, %rsp
23850 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
23851 /*
23852 - * Use save_paranoid to handle SWAPGS, but no need to use paranoid_exit
23853 + * Use save_paranoid_nmi to handle SWAPGS, but no need to use paranoid_exit
23854 * as we should not be calling schedule in NMI context.
23855 * Even with normal interrupts enabled. An NMI should not be
23856 * setting NEED_RESCHED or anything that normal interrupts and
23857 * exceptions might do.
23858 */
23859 - call save_paranoid
23860 + call save_paranoid_nmi
23861 DEFAULT_FRAME 0
23862
23863 /*
23864 @@ -1861,9 +2374,9 @@ end_repeat_nmi:
23865 * NMI itself takes a page fault, the page fault that was preempted
23866 * will read the information from the NMI page fault and not the
23867 * origin fault. Save it off and restore it if it changes.
23868 - * Use the r12 callee-saved register.
23869 + * Use the r13 callee-saved register.
23870 */
23871 - movq %cr2, %r12
23872 + movq %cr2, %r13
23873
23874 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
23875 movq %rsp,%rdi
23876 @@ -1872,31 +2385,36 @@ end_repeat_nmi:
23877
23878 /* Did the NMI take a page fault? Restore cr2 if it did */
23879 movq %cr2, %rcx
23880 - cmpq %rcx, %r12
23881 + cmpq %rcx, %r13
23882 je 1f
23883 - movq %r12, %cr2
23884 + movq %r13, %cr2
23885 1:
23886
23887 - testl %ebx,%ebx /* swapgs needed? */
23888 + testl $1,%ebx /* swapgs needed? */
23889 jnz nmi_restore
23890 nmi_swapgs:
23891 SWAPGS_UNSAFE_STACK
23892 nmi_restore:
23893 + pax_exit_kernel_nmi
23894 /* Pop the extra iret frame at once */
23895 RESTORE_ALL 6*8
23896 + testb $3, 8(%rsp)
23897 + jnz 1f
23898 + pax_force_retaddr_bts
23899 +1:
23900
23901 /* Clear the NMI executing stack variable */
23902 movq $0, 5*8(%rsp)
23903 jmp irq_return
23904 CFI_ENDPROC
23905 -END(nmi)
23906 +ENDPROC(nmi)
23907
23908 ENTRY(ignore_sysret)
23909 CFI_STARTPROC
23910 mov $-ENOSYS,%eax
23911 sysret
23912 CFI_ENDPROC
23913 -END(ignore_sysret)
23914 +ENDPROC(ignore_sysret)
23915
23916 /*
23917 * End of kprobes section
23918 diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
23919 index e625319..b9abb9d 100644
23920 --- a/arch/x86/kernel/ftrace.c
23921 +++ b/arch/x86/kernel/ftrace.c
23922 @@ -104,6 +104,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
23923 {
23924 unsigned char replaced[MCOUNT_INSN_SIZE];
23925
23926 + ip = ktla_ktva(ip);
23927 +
23928 /*
23929 * Note: Due to modules and __init, code can
23930 * disappear and change, we need to protect against faulting
23931 @@ -229,7 +231,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
23932 unsigned char old[MCOUNT_INSN_SIZE];
23933 int ret;
23934
23935 - memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
23936 + memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
23937
23938 ftrace_update_func = ip;
23939 /* Make sure the breakpoints see the ftrace_update_func update */
23940 @@ -306,7 +308,7 @@ static int ftrace_write(unsigned long ip, const char *val, int size)
23941 * kernel identity mapping to modify code.
23942 */
23943 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
23944 - ip = (unsigned long)__va(__pa_symbol(ip));
23945 + ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
23946
23947 return probe_kernel_write((void *)ip, val, size);
23948 }
23949 @@ -316,7 +318,7 @@ static int add_break(unsigned long ip, const char *old)
23950 unsigned char replaced[MCOUNT_INSN_SIZE];
23951 unsigned char brk = BREAKPOINT_INSTRUCTION;
23952
23953 - if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
23954 + if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
23955 return -EFAULT;
23956
23957 /* Make sure it is what we expect it to be */
23958 @@ -664,7 +666,7 @@ ftrace_modify_code(unsigned long ip, unsigned const char *old_code,
23959 return ret;
23960
23961 fail_update:
23962 - probe_kernel_write((void *)ip, &old_code[0], 1);
23963 + probe_kernel_write((void *)ktla_ktva(ip), &old_code[0], 1);
23964 goto out;
23965 }
23966
23967 diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
23968 index 85126cc..1bbce17 100644
23969 --- a/arch/x86/kernel/head64.c
23970 +++ b/arch/x86/kernel/head64.c
23971 @@ -67,12 +67,12 @@ again:
23972 pgd = *pgd_p;
23973
23974 /*
23975 - * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
23976 - * critical -- __PAGE_OFFSET would point us back into the dynamic
23977 + * The use of __early_va rather than __va here is critical:
23978 + * __va would point us back into the dynamic
23979 * range and we might end up looping forever...
23980 */
23981 if (pgd)
23982 - pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
23983 + pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
23984 else {
23985 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
23986 reset_early_page_tables();
23987 @@ -82,13 +82,13 @@ again:
23988 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
23989 for (i = 0; i < PTRS_PER_PUD; i++)
23990 pud_p[i] = 0;
23991 - *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
23992 + *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
23993 }
23994 pud_p += pud_index(address);
23995 pud = *pud_p;
23996
23997 if (pud)
23998 - pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
23999 + pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24000 else {
24001 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24002 reset_early_page_tables();
24003 @@ -98,7 +98,7 @@ again:
24004 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24005 for (i = 0; i < PTRS_PER_PMD; i++)
24006 pmd_p[i] = 0;
24007 - *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24008 + *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24009 }
24010 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24011 pmd_p[pmd_index(address)] = pmd;
24012 @@ -175,7 +175,6 @@ asmlinkage void __init x86_64_start_kernel(char * real_mode_data)
24013 if (console_loglevel == 10)
24014 early_printk("Kernel alive\n");
24015
24016 - clear_page(init_level4_pgt);
24017 /* set init_level4_pgt kernel high mapping*/
24018 init_level4_pgt[511] = early_level4_pgt[511];
24019
24020 diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24021 index f36bd42..56ee1534 100644
24022 --- a/arch/x86/kernel/head_32.S
24023 +++ b/arch/x86/kernel/head_32.S
24024 @@ -26,6 +26,12 @@
24025 /* Physical address */
24026 #define pa(X) ((X) - __PAGE_OFFSET)
24027
24028 +#ifdef CONFIG_PAX_KERNEXEC
24029 +#define ta(X) (X)
24030 +#else
24031 +#define ta(X) ((X) - __PAGE_OFFSET)
24032 +#endif
24033 +
24034 /*
24035 * References to members of the new_cpu_data structure.
24036 */
24037 @@ -55,11 +61,7 @@
24038 * and small than max_low_pfn, otherwise will waste some page table entries
24039 */
24040
24041 -#if PTRS_PER_PMD > 1
24042 -#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24043 -#else
24044 -#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24045 -#endif
24046 +#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24047
24048 /* Number of possible pages in the lowmem region */
24049 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
24050 @@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24051 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24052
24053 /*
24054 + * Real beginning of normal "text" segment
24055 + */
24056 +ENTRY(stext)
24057 +ENTRY(_stext)
24058 +
24059 +/*
24060 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24061 * %esi points to the real-mode code as a 32-bit pointer.
24062 * CS and DS must be 4 GB flat segments, but we don't depend on
24063 @@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24064 * can.
24065 */
24066 __HEAD
24067 +
24068 +#ifdef CONFIG_PAX_KERNEXEC
24069 + jmp startup_32
24070 +/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24071 +.fill PAGE_SIZE-5,1,0xcc
24072 +#endif
24073 +
24074 ENTRY(startup_32)
24075 movl pa(stack_start),%ecx
24076
24077 @@ -106,6 +121,59 @@ ENTRY(startup_32)
24078 2:
24079 leal -__PAGE_OFFSET(%ecx),%esp
24080
24081 +#ifdef CONFIG_SMP
24082 + movl $pa(cpu_gdt_table),%edi
24083 + movl $__per_cpu_load,%eax
24084 + movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24085 + rorl $16,%eax
24086 + movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24087 + movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24088 + movl $__per_cpu_end - 1,%eax
24089 + subl $__per_cpu_start,%eax
24090 + movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24091 +#endif
24092 +
24093 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24094 + movl $NR_CPUS,%ecx
24095 + movl $pa(cpu_gdt_table),%edi
24096 +1:
24097 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24098 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24099 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24100 + addl $PAGE_SIZE_asm,%edi
24101 + loop 1b
24102 +#endif
24103 +
24104 +#ifdef CONFIG_PAX_KERNEXEC
24105 + movl $pa(boot_gdt),%edi
24106 + movl $__LOAD_PHYSICAL_ADDR,%eax
24107 + movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24108 + rorl $16,%eax
24109 + movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24110 + movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24111 + rorl $16,%eax
24112 +
24113 + ljmp $(__BOOT_CS),$1f
24114 +1:
24115 +
24116 + movl $NR_CPUS,%ecx
24117 + movl $pa(cpu_gdt_table),%edi
24118 + addl $__PAGE_OFFSET,%eax
24119 +1:
24120 + movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24121 + movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24122 + movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24123 + movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24124 + rorl $16,%eax
24125 + movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24126 + movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24127 + movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24128 + movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24129 + rorl $16,%eax
24130 + addl $PAGE_SIZE_asm,%edi
24131 + loop 1b
24132 +#endif
24133 +
24134 /*
24135 * Clear BSS first so that there are no surprises...
24136 */
24137 @@ -201,8 +269,11 @@ ENTRY(startup_32)
24138 movl %eax, pa(max_pfn_mapped)
24139
24140 /* Do early initialization of the fixmap area */
24141 - movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24142 - movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24143 +#ifdef CONFIG_COMPAT_VDSO
24144 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24145 +#else
24146 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24147 +#endif
24148 #else /* Not PAE */
24149
24150 page_pde_offset = (__PAGE_OFFSET >> 20);
24151 @@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24152 movl %eax, pa(max_pfn_mapped)
24153
24154 /* Do early initialization of the fixmap area */
24155 - movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24156 - movl %eax,pa(initial_page_table+0xffc)
24157 +#ifdef CONFIG_COMPAT_VDSO
24158 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24159 +#else
24160 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24161 +#endif
24162 #endif
24163
24164 #ifdef CONFIG_PARAVIRT
24165 @@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24166 cmpl $num_subarch_entries, %eax
24167 jae bad_subarch
24168
24169 - movl pa(subarch_entries)(,%eax,4), %eax
24170 - subl $__PAGE_OFFSET, %eax
24171 - jmp *%eax
24172 + jmp *pa(subarch_entries)(,%eax,4)
24173
24174 bad_subarch:
24175 WEAK(lguest_entry)
24176 @@ -261,10 +333,10 @@ WEAK(xen_entry)
24177 __INITDATA
24178
24179 subarch_entries:
24180 - .long default_entry /* normal x86/PC */
24181 - .long lguest_entry /* lguest hypervisor */
24182 - .long xen_entry /* Xen hypervisor */
24183 - .long default_entry /* Moorestown MID */
24184 + .long ta(default_entry) /* normal x86/PC */
24185 + .long ta(lguest_entry) /* lguest hypervisor */
24186 + .long ta(xen_entry) /* Xen hypervisor */
24187 + .long ta(default_entry) /* Moorestown MID */
24188 num_subarch_entries = (. - subarch_entries) / 4
24189 .previous
24190 #else
24191 @@ -354,6 +426,7 @@ default_entry:
24192 movl pa(mmu_cr4_features),%eax
24193 movl %eax,%cr4
24194
24195 +#ifdef CONFIG_X86_PAE
24196 testb $X86_CR4_PAE, %al # check if PAE is enabled
24197 jz enable_paging
24198
24199 @@ -382,6 +455,9 @@ default_entry:
24200 /* Make changes effective */
24201 wrmsr
24202
24203 + btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24204 +#endif
24205 +
24206 enable_paging:
24207
24208 /*
24209 @@ -449,14 +525,20 @@ is486:
24210 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24211 movl %eax,%ss # after changing gdt.
24212
24213 - movl $(__USER_DS),%eax # DS/ES contains default USER segment
24214 +# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24215 movl %eax,%ds
24216 movl %eax,%es
24217
24218 movl $(__KERNEL_PERCPU), %eax
24219 movl %eax,%fs # set this cpu's percpu
24220
24221 +#ifdef CONFIG_CC_STACKPROTECTOR
24222 movl $(__KERNEL_STACK_CANARY),%eax
24223 +#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24224 + movl $(__USER_DS),%eax
24225 +#else
24226 + xorl %eax,%eax
24227 +#endif
24228 movl %eax,%gs
24229
24230 xorl %eax,%eax # Clear LDT
24231 @@ -512,8 +594,11 @@ setup_once:
24232 * relocation. Manually set base address in stack canary
24233 * segment descriptor.
24234 */
24235 - movl $gdt_page,%eax
24236 + movl $cpu_gdt_table,%eax
24237 movl $stack_canary,%ecx
24238 +#ifdef CONFIG_SMP
24239 + addl $__per_cpu_load,%ecx
24240 +#endif
24241 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24242 shrl $16, %ecx
24243 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24244 @@ -548,7 +633,7 @@ ENTRY(early_idt_handler)
24245 cmpl $2,(%esp) # X86_TRAP_NMI
24246 je is_nmi # Ignore NMI
24247
24248 - cmpl $2,%ss:early_recursion_flag
24249 + cmpl $1,%ss:early_recursion_flag
24250 je hlt_loop
24251 incl %ss:early_recursion_flag
24252
24253 @@ -586,8 +671,8 @@ ENTRY(early_idt_handler)
24254 pushl (20+6*4)(%esp) /* trapno */
24255 pushl $fault_msg
24256 call printk
24257 -#endif
24258 call dump_stack
24259 +#endif
24260 hlt_loop:
24261 hlt
24262 jmp hlt_loop
24263 @@ -607,8 +692,11 @@ ENDPROC(early_idt_handler)
24264 /* This is the default interrupt "handler" :-) */
24265 ALIGN
24266 ignore_int:
24267 - cld
24268 #ifdef CONFIG_PRINTK
24269 + cmpl $2,%ss:early_recursion_flag
24270 + je hlt_loop
24271 + incl %ss:early_recursion_flag
24272 + cld
24273 pushl %eax
24274 pushl %ecx
24275 pushl %edx
24276 @@ -617,9 +705,6 @@ ignore_int:
24277 movl $(__KERNEL_DS),%eax
24278 movl %eax,%ds
24279 movl %eax,%es
24280 - cmpl $2,early_recursion_flag
24281 - je hlt_loop
24282 - incl early_recursion_flag
24283 pushl 16(%esp)
24284 pushl 24(%esp)
24285 pushl 32(%esp)
24286 @@ -653,29 +738,34 @@ ENTRY(setup_once_ref)
24287 /*
24288 * BSS section
24289 */
24290 -__PAGE_ALIGNED_BSS
24291 - .align PAGE_SIZE
24292 #ifdef CONFIG_X86_PAE
24293 +.section .initial_pg_pmd,"a",@progbits
24294 initial_pg_pmd:
24295 .fill 1024*KPMDS,4,0
24296 #else
24297 +.section .initial_page_table,"a",@progbits
24298 ENTRY(initial_page_table)
24299 .fill 1024,4,0
24300 #endif
24301 +.section .initial_pg_fixmap,"a",@progbits
24302 initial_pg_fixmap:
24303 .fill 1024,4,0
24304 +.section .empty_zero_page,"a",@progbits
24305 ENTRY(empty_zero_page)
24306 .fill 4096,1,0
24307 +.section .swapper_pg_dir,"a",@progbits
24308 ENTRY(swapper_pg_dir)
24309 +#ifdef CONFIG_X86_PAE
24310 + .fill 4,8,0
24311 +#else
24312 .fill 1024,4,0
24313 +#endif
24314
24315 /*
24316 * This starts the data section.
24317 */
24318 #ifdef CONFIG_X86_PAE
24319 -__PAGE_ALIGNED_DATA
24320 - /* Page-aligned for the benefit of paravirt? */
24321 - .align PAGE_SIZE
24322 +.section .initial_page_table,"a",@progbits
24323 ENTRY(initial_page_table)
24324 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24325 # if KPMDS == 3
24326 @@ -694,12 +784,20 @@ ENTRY(initial_page_table)
24327 # error "Kernel PMDs should be 1, 2 or 3"
24328 # endif
24329 .align PAGE_SIZE /* needs to be page-sized too */
24330 +
24331 +#ifdef CONFIG_PAX_PER_CPU_PGD
24332 +ENTRY(cpu_pgd)
24333 + .rept 2*NR_CPUS
24334 + .fill 4,8,0
24335 + .endr
24336 +#endif
24337 +
24338 #endif
24339
24340 .data
24341 .balign 4
24342 ENTRY(stack_start)
24343 - .long init_thread_union+THREAD_SIZE
24344 + .long init_thread_union+THREAD_SIZE-8
24345
24346 __INITRODATA
24347 int_msg:
24348 @@ -727,7 +825,7 @@ fault_msg:
24349 * segment size, and 32-bit linear address value:
24350 */
24351
24352 - .data
24353 +.section .rodata,"a",@progbits
24354 .globl boot_gdt_descr
24355 .globl idt_descr
24356
24357 @@ -736,7 +834,7 @@ fault_msg:
24358 .word 0 # 32 bit align gdt_desc.address
24359 boot_gdt_descr:
24360 .word __BOOT_DS+7
24361 - .long boot_gdt - __PAGE_OFFSET
24362 + .long pa(boot_gdt)
24363
24364 .word 0 # 32-bit align idt_desc.address
24365 idt_descr:
24366 @@ -747,7 +845,7 @@ idt_descr:
24367 .word 0 # 32 bit align gdt_desc.address
24368 ENTRY(early_gdt_descr)
24369 .word GDT_ENTRIES*8-1
24370 - .long gdt_page /* Overwritten for secondary CPUs */
24371 + .long cpu_gdt_table /* Overwritten for secondary CPUs */
24372
24373 /*
24374 * The boot_gdt must mirror the equivalent in setup.S and is
24375 @@ -756,5 +854,65 @@ ENTRY(early_gdt_descr)
24376 .align L1_CACHE_BYTES
24377 ENTRY(boot_gdt)
24378 .fill GDT_ENTRY_BOOT_CS,8,0
24379 - .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24380 - .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24381 + .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24382 + .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24383 +
24384 + .align PAGE_SIZE_asm
24385 +ENTRY(cpu_gdt_table)
24386 + .rept NR_CPUS
24387 + .quad 0x0000000000000000 /* NULL descriptor */
24388 + .quad 0x0000000000000000 /* 0x0b reserved */
24389 + .quad 0x0000000000000000 /* 0x13 reserved */
24390 + .quad 0x0000000000000000 /* 0x1b reserved */
24391 +
24392 +#ifdef CONFIG_PAX_KERNEXEC
24393 + .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24394 +#else
24395 + .quad 0x0000000000000000 /* 0x20 unused */
24396 +#endif
24397 +
24398 + .quad 0x0000000000000000 /* 0x28 unused */
24399 + .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24400 + .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24401 + .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24402 + .quad 0x0000000000000000 /* 0x4b reserved */
24403 + .quad 0x0000000000000000 /* 0x53 reserved */
24404 + .quad 0x0000000000000000 /* 0x5b reserved */
24405 +
24406 + .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24407 + .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24408 + .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24409 + .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24410 +
24411 + .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24412 + .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24413 +
24414 + /*
24415 + * Segments used for calling PnP BIOS have byte granularity.
24416 + * The code segments and data segments have fixed 64k limits,
24417 + * the transfer segment sizes are set at run time.
24418 + */
24419 + .quad 0x00409b000000ffff /* 0x90 32-bit code */
24420 + .quad 0x00009b000000ffff /* 0x98 16-bit code */
24421 + .quad 0x000093000000ffff /* 0xa0 16-bit data */
24422 + .quad 0x0000930000000000 /* 0xa8 16-bit data */
24423 + .quad 0x0000930000000000 /* 0xb0 16-bit data */
24424 +
24425 + /*
24426 + * The APM segments have byte granularity and their bases
24427 + * are set at run time. All have 64k limits.
24428 + */
24429 + .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24430 + .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24431 + .quad 0x004093000000ffff /* 0xc8 APM DS data */
24432 +
24433 + .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */
24434 + .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24435 + .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24436 + .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24437 + .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24438 + .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24439 +
24440 + /* Be sure this is zeroed to avoid false validations in Xen */
24441 + .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24442 + .endr
24443 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24444 index a468c0a..c7dec74 100644
24445 --- a/arch/x86/kernel/head_64.S
24446 +++ b/arch/x86/kernel/head_64.S
24447 @@ -20,6 +20,8 @@
24448 #include <asm/processor-flags.h>
24449 #include <asm/percpu.h>
24450 #include <asm/nops.h>
24451 +#include <asm/cpufeature.h>
24452 +#include <asm/alternative-asm.h>
24453
24454 #ifdef CONFIG_PARAVIRT
24455 #include <asm/asm-offsets.h>
24456 @@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24457 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24458 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24459 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24460 +L4_VMALLOC_START = pgd_index(VMALLOC_START)
24461 +L3_VMALLOC_START = pud_index(VMALLOC_START)
24462 +L4_VMALLOC_END = pgd_index(VMALLOC_END)
24463 +L3_VMALLOC_END = pud_index(VMALLOC_END)
24464 +L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24465 +L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24466
24467 .text
24468 __HEAD
24469 @@ -89,11 +97,24 @@ startup_64:
24470 * Fixup the physical addresses in the page table
24471 */
24472 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24473 + addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24474 + addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24475 + addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24476 + addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24477 + addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24478
24479 - addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24480 - addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24481 + addq %rbp, level3_ident_pgt + (0*8)(%rip)
24482 +#ifndef CONFIG_XEN
24483 + addq %rbp, level3_ident_pgt + (1*8)(%rip)
24484 +#endif
24485 +
24486 + addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24487 +
24488 + addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24489 + addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24490
24491 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24492 + addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24493
24494 /*
24495 * Set up the identity mapping for the switchover. These
24496 @@ -177,8 +198,8 @@ ENTRY(secondary_startup_64)
24497 movq $(init_level4_pgt - __START_KERNEL_map), %rax
24498 1:
24499
24500 - /* Enable PAE mode and PGE */
24501 - movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
24502 + /* Enable PAE mode and PSE/PGE */
24503 + movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
24504 movq %rcx, %cr4
24505
24506 /* Setup early boot stage 4 level pagetables. */
24507 @@ -199,10 +220,19 @@ ENTRY(secondary_startup_64)
24508 movl $MSR_EFER, %ecx
24509 rdmsr
24510 btsl $_EFER_SCE, %eax /* Enable System Call */
24511 - btl $20,%edi /* No Execute supported? */
24512 + btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
24513 jnc 1f
24514 btsl $_EFER_NX, %eax
24515 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
24516 +#ifndef CONFIG_EFI
24517 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
24518 +#endif
24519 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
24520 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
24521 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
24522 + btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
24523 + btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
24524 + btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
24525 1: wrmsr /* Make changes effective */
24526
24527 /* Setup cr0 */
24528 @@ -282,6 +312,7 @@ ENTRY(secondary_startup_64)
24529 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
24530 * address given in m16:64.
24531 */
24532 + pax_set_fptr_mask
24533 movq initial_code(%rip),%rax
24534 pushq $0 # fake return address to stop unwinder
24535 pushq $__KERNEL_CS # set correct cs
24536 @@ -313,7 +344,7 @@ ENDPROC(start_cpu0)
24537 .quad INIT_PER_CPU_VAR(irq_stack_union)
24538
24539 GLOBAL(stack_start)
24540 - .quad init_thread_union+THREAD_SIZE-8
24541 + .quad init_thread_union+THREAD_SIZE-16
24542 .word 0
24543 __FINITDATA
24544
24545 @@ -391,7 +422,7 @@ ENTRY(early_idt_handler)
24546 call dump_stack
24547 #ifdef CONFIG_KALLSYMS
24548 leaq early_idt_ripmsg(%rip),%rdi
24549 - movq 40(%rsp),%rsi # %rip again
24550 + movq 88(%rsp),%rsi # %rip again
24551 call __print_symbol
24552 #endif
24553 #endif /* EARLY_PRINTK */
24554 @@ -420,6 +451,7 @@ ENDPROC(early_idt_handler)
24555 early_recursion_flag:
24556 .long 0
24557
24558 + .section .rodata,"a",@progbits
24559 #ifdef CONFIG_EARLY_PRINTK
24560 early_idt_msg:
24561 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
24562 @@ -447,29 +479,52 @@ NEXT_PAGE(early_level4_pgt)
24563 NEXT_PAGE(early_dynamic_pgts)
24564 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
24565
24566 - .data
24567 + .section .rodata,"a",@progbits
24568
24569 -#ifndef CONFIG_XEN
24570 NEXT_PAGE(init_level4_pgt)
24571 - .fill 512,8,0
24572 -#else
24573 -NEXT_PAGE(init_level4_pgt)
24574 - .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24575 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
24576 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24577 + .org init_level4_pgt + L4_VMALLOC_START*8, 0
24578 + .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
24579 + .org init_level4_pgt + L4_VMALLOC_END*8, 0
24580 + .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
24581 + .org init_level4_pgt + L4_VMEMMAP_START*8, 0
24582 + .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24583 .org init_level4_pgt + L4_START_KERNEL*8, 0
24584 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
24585 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
24586
24587 +#ifdef CONFIG_PAX_PER_CPU_PGD
24588 +NEXT_PAGE(cpu_pgd)
24589 + .rept 2*NR_CPUS
24590 + .fill 512,8,0
24591 + .endr
24592 +#endif
24593 +
24594 NEXT_PAGE(level3_ident_pgt)
24595 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24596 +#ifdef CONFIG_XEN
24597 .fill 511, 8, 0
24598 +#else
24599 + .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
24600 + .fill 510,8,0
24601 +#endif
24602 +
24603 +NEXT_PAGE(level3_vmalloc_start_pgt)
24604 + .fill 512,8,0
24605 +
24606 +NEXT_PAGE(level3_vmalloc_end_pgt)
24607 + .fill 512,8,0
24608 +
24609 +NEXT_PAGE(level3_vmemmap_pgt)
24610 + .fill L3_VMEMMAP_START,8,0
24611 + .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24612 +
24613 NEXT_PAGE(level2_ident_pgt)
24614 - /* Since I easily can, map the first 1G.
24615 + /* Since I easily can, map the first 2G.
24616 * Don't set NX because code runs from these pages.
24617 */
24618 - PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
24619 -#endif
24620 + PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
24621
24622 NEXT_PAGE(level3_kernel_pgt)
24623 .fill L3_START_KERNEL,8,0
24624 @@ -477,6 +532,9 @@ NEXT_PAGE(level3_kernel_pgt)
24625 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
24626 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24627
24628 +NEXT_PAGE(level2_vmemmap_pgt)
24629 + .fill 512,8,0
24630 +
24631 NEXT_PAGE(level2_kernel_pgt)
24632 /*
24633 * 512 MB kernel mapping. We spend a full page on this pagetable
24634 @@ -494,28 +552,64 @@ NEXT_PAGE(level2_kernel_pgt)
24635 NEXT_PAGE(level2_fixmap_pgt)
24636 .fill 506,8,0
24637 .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24638 - /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
24639 - .fill 5,8,0
24640 + .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
24641 + /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
24642 + .fill 4,8,0
24643
24644 NEXT_PAGE(level1_fixmap_pgt)
24645 .fill 512,8,0
24646
24647 +NEXT_PAGE(level1_vsyscall_pgt)
24648 + .fill 512,8,0
24649 +
24650 #undef PMDS
24651
24652 - .data
24653 + .align PAGE_SIZE
24654 +ENTRY(cpu_gdt_table)
24655 + .rept NR_CPUS
24656 + .quad 0x0000000000000000 /* NULL descriptor */
24657 + .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
24658 + .quad 0x00af9b000000ffff /* __KERNEL_CS */
24659 + .quad 0x00cf93000000ffff /* __KERNEL_DS */
24660 + .quad 0x00cffb000000ffff /* __USER32_CS */
24661 + .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
24662 + .quad 0x00affb000000ffff /* __USER_CS */
24663 +
24664 +#ifdef CONFIG_PAX_KERNEXEC
24665 + .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
24666 +#else
24667 + .quad 0x0 /* unused */
24668 +#endif
24669 +
24670 + .quad 0,0 /* TSS */
24671 + .quad 0,0 /* LDT */
24672 + .quad 0,0,0 /* three TLS descriptors */
24673 + .quad 0x0000f40000000000 /* node/CPU stored in limit */
24674 + /* asm/segment.h:GDT_ENTRIES must match this */
24675 +
24676 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24677 + .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
24678 +#else
24679 + .quad 0x0 /* unused */
24680 +#endif
24681 +
24682 + /* zero the remaining page */
24683 + .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
24684 + .endr
24685 +
24686 .align 16
24687 .globl early_gdt_descr
24688 early_gdt_descr:
24689 .word GDT_ENTRIES*8-1
24690 early_gdt_descr_base:
24691 - .quad INIT_PER_CPU_VAR(gdt_page)
24692 + .quad cpu_gdt_table
24693
24694 ENTRY(phys_base)
24695 /* This must match the first entry in level2_kernel_pgt */
24696 .quad 0x0000000000000000
24697
24698 #include "../../x86/xen/xen-head.S"
24699 -
24700 - __PAGE_ALIGNED_BSS
24701 +
24702 + .section .rodata,"a",@progbits
24703 NEXT_PAGE(empty_zero_page)
24704 .skip PAGE_SIZE
24705 diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
24706 index 05fd74f..c3548b1 100644
24707 --- a/arch/x86/kernel/i386_ksyms_32.c
24708 +++ b/arch/x86/kernel/i386_ksyms_32.c
24709 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
24710 EXPORT_SYMBOL(cmpxchg8b_emu);
24711 #endif
24712
24713 +EXPORT_SYMBOL_GPL(cpu_gdt_table);
24714 +
24715 /* Networking helper routines. */
24716 EXPORT_SYMBOL(csum_partial_copy_generic);
24717 +EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
24718 +EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
24719
24720 EXPORT_SYMBOL(__get_user_1);
24721 EXPORT_SYMBOL(__get_user_2);
24722 @@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
24723 EXPORT_SYMBOL(___preempt_schedule_context);
24724 #endif
24725 #endif
24726 +
24727 +#ifdef CONFIG_PAX_KERNEXEC
24728 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
24729 +#endif
24730 +
24731 +#ifdef CONFIG_PAX_PER_CPU_PGD
24732 +EXPORT_SYMBOL(cpu_pgd);
24733 +#endif
24734 diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
24735 index d5dd808..b6432cf 100644
24736 --- a/arch/x86/kernel/i387.c
24737 +++ b/arch/x86/kernel/i387.c
24738 @@ -51,7 +51,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
24739 static inline bool interrupted_user_mode(void)
24740 {
24741 struct pt_regs *regs = get_irq_regs();
24742 - return regs && user_mode_vm(regs);
24743 + return regs && user_mode(regs);
24744 }
24745
24746 /*
24747 diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
24748 index 2e977b5..5f2c273 100644
24749 --- a/arch/x86/kernel/i8259.c
24750 +++ b/arch/x86/kernel/i8259.c
24751 @@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
24752 static void make_8259A_irq(unsigned int irq)
24753 {
24754 disable_irq_nosync(irq);
24755 - io_apic_irqs &= ~(1<<irq);
24756 + io_apic_irqs &= ~(1UL<<irq);
24757 irq_set_chip_and_handler_name(irq, &i8259A_chip, handle_level_irq,
24758 i8259A_chip.name);
24759 enable_irq(irq);
24760 @@ -209,7 +209,7 @@ spurious_8259A_irq:
24761 "spurious 8259A interrupt: IRQ%d.\n", irq);
24762 spurious_irq_mask |= irqmask;
24763 }
24764 - atomic_inc(&irq_err_count);
24765 + atomic_inc_unchecked(&irq_err_count);
24766 /*
24767 * Theoretically we do not have to handle this IRQ,
24768 * but in Linux this does not cause problems and is
24769 @@ -332,14 +332,16 @@ static void init_8259A(int auto_eoi)
24770 /* (slave's support for AEOI in flat mode is to be investigated) */
24771 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
24772
24773 + pax_open_kernel();
24774 if (auto_eoi)
24775 /*
24776 * In AEOI mode we just have to mask the interrupt
24777 * when acking.
24778 */
24779 - i8259A_chip.irq_mask_ack = disable_8259A_irq;
24780 + *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
24781 else
24782 - i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
24783 + *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
24784 + pax_close_kernel();
24785
24786 udelay(100); /* wait for 8259A to initialize */
24787
24788 diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
24789 index a979b5b..1d6db75 100644
24790 --- a/arch/x86/kernel/io_delay.c
24791 +++ b/arch/x86/kernel/io_delay.c
24792 @@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
24793 * Quirk table for systems that misbehave (lock up, etc.) if port
24794 * 0x80 is used:
24795 */
24796 -static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
24797 +static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
24798 {
24799 .callback = dmi_io_delay_0xed_port,
24800 .ident = "Compaq Presario V6000",
24801 diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
24802 index 4ddaf66..49d5c18 100644
24803 --- a/arch/x86/kernel/ioport.c
24804 +++ b/arch/x86/kernel/ioport.c
24805 @@ -6,6 +6,7 @@
24806 #include <linux/sched.h>
24807 #include <linux/kernel.h>
24808 #include <linux/capability.h>
24809 +#include <linux/security.h>
24810 #include <linux/errno.h>
24811 #include <linux/types.h>
24812 #include <linux/ioport.h>
24813 @@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
24814 return -EINVAL;
24815 if (turn_on && !capable(CAP_SYS_RAWIO))
24816 return -EPERM;
24817 +#ifdef CONFIG_GRKERNSEC_IO
24818 + if (turn_on && grsec_disable_privio) {
24819 + gr_handle_ioperm();
24820 + return -ENODEV;
24821 + }
24822 +#endif
24823
24824 /*
24825 * If it's the first ioperm() call in this thread's lifetime, set the
24826 @@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
24827 * because the ->io_bitmap_max value must match the bitmap
24828 * contents:
24829 */
24830 - tss = &per_cpu(init_tss, get_cpu());
24831 + tss = init_tss + get_cpu();
24832
24833 if (turn_on)
24834 bitmap_clear(t->io_bitmap_ptr, from, num);
24835 @@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
24836 if (level > old) {
24837 if (!capable(CAP_SYS_RAWIO))
24838 return -EPERM;
24839 +#ifdef CONFIG_GRKERNSEC_IO
24840 + if (grsec_disable_privio) {
24841 + gr_handle_iopl();
24842 + return -ENODEV;
24843 + }
24844 +#endif
24845 }
24846 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
24847 t->iopl = level << 12;
24848 diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
24849 index d99f31d..1c0f466 100644
24850 --- a/arch/x86/kernel/irq.c
24851 +++ b/arch/x86/kernel/irq.c
24852 @@ -21,7 +21,7 @@
24853 #define CREATE_TRACE_POINTS
24854 #include <asm/trace/irq_vectors.h>
24855
24856 -atomic_t irq_err_count;
24857 +atomic_unchecked_t irq_err_count;
24858
24859 /* Function pointer for generic interrupt vector handling */
24860 void (*x86_platform_ipi_callback)(void) = NULL;
24861 @@ -125,9 +125,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
24862 seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
24863 seq_printf(p, " Machine check polls\n");
24864 #endif
24865 - seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
24866 + seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
24867 #if defined(CONFIG_X86_IO_APIC)
24868 - seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
24869 + seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
24870 #endif
24871 return 0;
24872 }
24873 @@ -167,7 +167,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
24874
24875 u64 arch_irq_stat(void)
24876 {
24877 - u64 sum = atomic_read(&irq_err_count);
24878 + u64 sum = atomic_read_unchecked(&irq_err_count);
24879 return sum;
24880 }
24881
24882 diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
24883 index d7fcbed..1f747f7 100644
24884 --- a/arch/x86/kernel/irq_32.c
24885 +++ b/arch/x86/kernel/irq_32.c
24886 @@ -39,7 +39,7 @@ static int check_stack_overflow(void)
24887 __asm__ __volatile__("andl %%esp,%0" :
24888 "=r" (sp) : "0" (THREAD_SIZE - 1));
24889
24890 - return sp < (sizeof(struct thread_info) + STACK_WARN);
24891 + return sp < STACK_WARN;
24892 }
24893
24894 static void print_stack_overflow(void)
24895 @@ -59,8 +59,8 @@ static inline void print_stack_overflow(void) { }
24896 * per-CPU IRQ handling contexts (thread information and stack)
24897 */
24898 union irq_ctx {
24899 - struct thread_info tinfo;
24900 - u32 stack[THREAD_SIZE/sizeof(u32)];
24901 + unsigned long previous_esp;
24902 + u32 stack[THREAD_SIZE/sizeof(u32)];
24903 } __attribute__((aligned(THREAD_SIZE)));
24904
24905 static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
24906 @@ -80,10 +80,9 @@ static void call_on_stack(void *func, void *stack)
24907 static inline int
24908 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
24909 {
24910 - union irq_ctx *curctx, *irqctx;
24911 + union irq_ctx *irqctx;
24912 u32 *isp, arg1, arg2;
24913
24914 - curctx = (union irq_ctx *) current_thread_info();
24915 irqctx = __this_cpu_read(hardirq_ctx);
24916
24917 /*
24918 @@ -92,13 +91,16 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
24919 * handler) we can't do that and just have to keep using the
24920 * current stack (which is the irq stack already after all)
24921 */
24922 - if (unlikely(curctx == irqctx))
24923 + if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_SIZE))
24924 return 0;
24925
24926 /* build the stack frame on the IRQ stack */
24927 - isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
24928 - irqctx->tinfo.task = curctx->tinfo.task;
24929 - irqctx->tinfo.previous_esp = current_stack_pointer;
24930 + isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
24931 + irqctx->previous_esp = current_stack_pointer;
24932 +
24933 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24934 + __set_fs(MAKE_MM_SEG(0));
24935 +#endif
24936
24937 if (unlikely(overflow))
24938 call_on_stack(print_stack_overflow, isp);
24939 @@ -110,6 +112,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
24940 : "0" (irq), "1" (desc), "2" (isp),
24941 "D" (desc->handle_irq)
24942 : "memory", "cc", "ecx");
24943 +
24944 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24945 + __set_fs(current_thread_info()->addr_limit);
24946 +#endif
24947 +
24948 return 1;
24949 }
24950
24951 @@ -118,48 +125,34 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
24952 */
24953 void irq_ctx_init(int cpu)
24954 {
24955 - union irq_ctx *irqctx;
24956 -
24957 if (per_cpu(hardirq_ctx, cpu))
24958 return;
24959
24960 - irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
24961 - THREADINFO_GFP,
24962 - THREAD_SIZE_ORDER));
24963 - memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
24964 - irqctx->tinfo.cpu = cpu;
24965 - irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
24966 -
24967 - per_cpu(hardirq_ctx, cpu) = irqctx;
24968 -
24969 - irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
24970 - THREADINFO_GFP,
24971 - THREAD_SIZE_ORDER));
24972 - memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
24973 - irqctx->tinfo.cpu = cpu;
24974 - irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
24975 -
24976 - per_cpu(softirq_ctx, cpu) = irqctx;
24977 -
24978 - printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
24979 - cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
24980 + per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
24981 + per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
24982 }
24983
24984 void do_softirq_own_stack(void)
24985 {
24986 - struct thread_info *curctx;
24987 union irq_ctx *irqctx;
24988 u32 *isp;
24989
24990 - curctx = current_thread_info();
24991 irqctx = __this_cpu_read(softirq_ctx);
24992 - irqctx->tinfo.task = curctx->task;
24993 - irqctx->tinfo.previous_esp = current_stack_pointer;
24994 + irqctx->previous_esp = current_stack_pointer;
24995
24996 /* build the stack frame on the softirq stack */
24997 - isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
24998 + isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
24999 +
25000 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25001 + __set_fs(MAKE_MM_SEG(0));
25002 +#endif
25003
25004 call_on_stack(__do_softirq, isp);
25005 +
25006 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25007 + __set_fs(current_thread_info()->addr_limit);
25008 +#endif
25009 +
25010 }
25011
25012 bool handle_irq(unsigned irq, struct pt_regs *regs)
25013 @@ -173,7 +166,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
25014 if (unlikely(!desc))
25015 return false;
25016
25017 - if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25018 + if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25019 if (unlikely(overflow))
25020 print_stack_overflow();
25021 desc->handle_irq(irq, desc);
25022 diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25023 index 4d1c746..232961d 100644
25024 --- a/arch/x86/kernel/irq_64.c
25025 +++ b/arch/x86/kernel/irq_64.c
25026 @@ -44,7 +44,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25027 u64 estack_top, estack_bottom;
25028 u64 curbase = (u64)task_stack_page(current);
25029
25030 - if (user_mode_vm(regs))
25031 + if (user_mode(regs))
25032 return;
25033
25034 if (regs->sp >= curbase + sizeof(struct thread_info) +
25035 diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25036 index 26d5a55..a01160a 100644
25037 --- a/arch/x86/kernel/jump_label.c
25038 +++ b/arch/x86/kernel/jump_label.c
25039 @@ -51,7 +51,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25040 * Jump label is enabled for the first time.
25041 * So we expect a default_nop...
25042 */
25043 - if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25044 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25045 != 0))
25046 bug_at((void *)entry->code, __LINE__);
25047 } else {
25048 @@ -59,7 +59,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25049 * ...otherwise expect an ideal_nop. Otherwise
25050 * something went horribly wrong.
25051 */
25052 - if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25053 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25054 != 0))
25055 bug_at((void *)entry->code, __LINE__);
25056 }
25057 @@ -75,13 +75,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25058 * are converting the default nop to the ideal nop.
25059 */
25060 if (init) {
25061 - if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25062 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25063 bug_at((void *)entry->code, __LINE__);
25064 } else {
25065 code.jump = 0xe9;
25066 code.offset = entry->target -
25067 (entry->code + JUMP_LABEL_NOP_SIZE);
25068 - if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25069 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25070 bug_at((void *)entry->code, __LINE__);
25071 }
25072 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25073 diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25074 index 7ec1d5f..5a7d130 100644
25075 --- a/arch/x86/kernel/kgdb.c
25076 +++ b/arch/x86/kernel/kgdb.c
25077 @@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
25078 #ifdef CONFIG_X86_32
25079 switch (regno) {
25080 case GDB_SS:
25081 - if (!user_mode_vm(regs))
25082 + if (!user_mode(regs))
25083 *(unsigned long *)mem = __KERNEL_DS;
25084 break;
25085 case GDB_SP:
25086 - if (!user_mode_vm(regs))
25087 + if (!user_mode(regs))
25088 *(unsigned long *)mem = kernel_stack_pointer(regs);
25089 break;
25090 case GDB_GS:
25091 @@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25092 bp->attr.bp_addr = breakinfo[breakno].addr;
25093 bp->attr.bp_len = breakinfo[breakno].len;
25094 bp->attr.bp_type = breakinfo[breakno].type;
25095 - info->address = breakinfo[breakno].addr;
25096 + if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25097 + info->address = ktla_ktva(breakinfo[breakno].addr);
25098 + else
25099 + info->address = breakinfo[breakno].addr;
25100 info->len = breakinfo[breakno].len;
25101 info->type = breakinfo[breakno].type;
25102 val = arch_install_hw_breakpoint(bp);
25103 @@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25104 case 'k':
25105 /* clear the trace bit */
25106 linux_regs->flags &= ~X86_EFLAGS_TF;
25107 - atomic_set(&kgdb_cpu_doing_single_step, -1);
25108 + atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25109
25110 /* set the trace bit if we're stepping */
25111 if (remcomInBuffer[0] == 's') {
25112 linux_regs->flags |= X86_EFLAGS_TF;
25113 - atomic_set(&kgdb_cpu_doing_single_step,
25114 + atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25115 raw_smp_processor_id());
25116 }
25117
25118 @@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25119
25120 switch (cmd) {
25121 case DIE_DEBUG:
25122 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25123 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25124 if (user_mode(regs))
25125 return single_step_cont(regs, args);
25126 break;
25127 @@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25128 #endif /* CONFIG_DEBUG_RODATA */
25129
25130 bpt->type = BP_BREAKPOINT;
25131 - err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25132 + err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25133 BREAK_INSTR_SIZE);
25134 if (err)
25135 return err;
25136 - err = probe_kernel_write((char *)bpt->bpt_addr,
25137 + err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25138 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25139 #ifdef CONFIG_DEBUG_RODATA
25140 if (!err)
25141 @@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25142 return -EBUSY;
25143 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25144 BREAK_INSTR_SIZE);
25145 - err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25146 + err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25147 if (err)
25148 return err;
25149 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25150 @@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25151 if (mutex_is_locked(&text_mutex))
25152 goto knl_write;
25153 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25154 - err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25155 + err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25156 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25157 goto knl_write;
25158 return err;
25159 knl_write:
25160 #endif /* CONFIG_DEBUG_RODATA */
25161 - return probe_kernel_write((char *)bpt->bpt_addr,
25162 + return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25163 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25164 }
25165
25166 diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25167 index 79a3f96..6ba030a 100644
25168 --- a/arch/x86/kernel/kprobes/core.c
25169 +++ b/arch/x86/kernel/kprobes/core.c
25170 @@ -119,9 +119,12 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
25171 s32 raddr;
25172 } __packed *insn;
25173
25174 - insn = (struct __arch_relative_insn *)from;
25175 + insn = (struct __arch_relative_insn *)ktla_ktva(from);
25176 +
25177 + pax_open_kernel();
25178 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25179 insn->op = op;
25180 + pax_close_kernel();
25181 }
25182
25183 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25184 @@ -164,7 +167,7 @@ int __kprobes can_boost(kprobe_opcode_t *opcodes)
25185 kprobe_opcode_t opcode;
25186 kprobe_opcode_t *orig_opcodes = opcodes;
25187
25188 - if (search_exception_tables((unsigned long)opcodes))
25189 + if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25190 return 0; /* Page fault may occur on this address. */
25191
25192 retry:
25193 @@ -238,9 +241,9 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25194 * for the first byte, we can recover the original instruction
25195 * from it and kp->opcode.
25196 */
25197 - memcpy(buf, kp->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25198 + memcpy(buf, ktla_ktva(kp->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25199 buf[0] = kp->opcode;
25200 - return (unsigned long)buf;
25201 + return ktva_ktla((unsigned long)buf);
25202 }
25203
25204 /*
25205 @@ -332,7 +335,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
25206 /* Another subsystem puts a breakpoint, failed to recover */
25207 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25208 return 0;
25209 + pax_open_kernel();
25210 memcpy(dest, insn.kaddr, insn.length);
25211 + pax_close_kernel();
25212
25213 #ifdef CONFIG_X86_64
25214 if (insn_rip_relative(&insn)) {
25215 @@ -359,7 +364,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
25216 return 0;
25217 }
25218 disp = (u8 *) dest + insn_offset_displacement(&insn);
25219 + pax_open_kernel();
25220 *(s32 *) disp = (s32) newdisp;
25221 + pax_close_kernel();
25222 }
25223 #endif
25224 return insn.length;
25225 @@ -498,7 +505,7 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
25226 * nor set current_kprobe, because it doesn't use single
25227 * stepping.
25228 */
25229 - regs->ip = (unsigned long)p->ainsn.insn;
25230 + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25231 preempt_enable_no_resched();
25232 return;
25233 }
25234 @@ -515,9 +522,9 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
25235 regs->flags &= ~X86_EFLAGS_IF;
25236 /* single step inline if the instruction is an int3 */
25237 if (p->opcode == BREAKPOINT_INSTRUCTION)
25238 - regs->ip = (unsigned long)p->addr;
25239 + regs->ip = ktla_ktva((unsigned long)p->addr);
25240 else
25241 - regs->ip = (unsigned long)p->ainsn.insn;
25242 + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25243 }
25244
25245 /*
25246 @@ -596,7 +603,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
25247 setup_singlestep(p, regs, kcb, 0);
25248 return 1;
25249 }
25250 - } else if (*addr != BREAKPOINT_INSTRUCTION) {
25251 + } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25252 /*
25253 * The breakpoint instruction was removed right
25254 * after we hit it. Another cpu has removed
25255 @@ -642,6 +649,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
25256 " movq %rax, 152(%rsp)\n"
25257 RESTORE_REGS_STRING
25258 " popfq\n"
25259 +#ifdef KERNEXEC_PLUGIN
25260 + " btsq $63,(%rsp)\n"
25261 +#endif
25262 #else
25263 " pushf\n"
25264 SAVE_REGS_STRING
25265 @@ -779,7 +789,7 @@ static void __kprobes
25266 resume_execution(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)
25267 {
25268 unsigned long *tos = stack_addr(regs);
25269 - unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25270 + unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25271 unsigned long orig_ip = (unsigned long)p->addr;
25272 kprobe_opcode_t *insn = p->ainsn.insn;
25273
25274 @@ -961,7 +971,7 @@ kprobe_exceptions_notify(struct notifier_block *self, unsigned long val, void *d
25275 struct die_args *args = data;
25276 int ret = NOTIFY_DONE;
25277
25278 - if (args->regs && user_mode_vm(args->regs))
25279 + if (args->regs && user_mode(args->regs))
25280 return ret;
25281
25282 switch (val) {
25283 diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25284 index 898160b..758cde8 100644
25285 --- a/arch/x86/kernel/kprobes/opt.c
25286 +++ b/arch/x86/kernel/kprobes/opt.c
25287 @@ -79,6 +79,7 @@ found:
25288 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25289 static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25290 {
25291 + pax_open_kernel();
25292 #ifdef CONFIG_X86_64
25293 *addr++ = 0x48;
25294 *addr++ = 0xbf;
25295 @@ -86,6 +87,7 @@ static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long v
25296 *addr++ = 0xb8;
25297 #endif
25298 *(unsigned long *)addr = val;
25299 + pax_close_kernel();
25300 }
25301
25302 asm (
25303 @@ -335,7 +337,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25304 * Verify if the address gap is in 2GB range, because this uses
25305 * a relative jump.
25306 */
25307 - rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25308 + rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25309 if (abs(rel) > 0x7fffffff)
25310 return -ERANGE;
25311
25312 @@ -350,16 +352,18 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25313 op->optinsn.size = ret;
25314
25315 /* Copy arch-dep-instance from template */
25316 - memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25317 + pax_open_kernel();
25318 + memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25319 + pax_close_kernel();
25320
25321 /* Set probe information */
25322 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25323
25324 /* Set probe function call */
25325 - synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25326 + synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25327
25328 /* Set returning jmp instruction at the tail of out-of-line buffer */
25329 - synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25330 + synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25331 (u8 *)op->kp.addr + op->optinsn.size);
25332
25333 flush_icache_range((unsigned long) buf,
25334 @@ -384,7 +388,7 @@ void __kprobes arch_optimize_kprobes(struct list_head *oplist)
25335 WARN_ON(kprobe_disabled(&op->kp));
25336
25337 /* Backup instructions which will be replaced by jump address */
25338 - memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25339 + memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25340 RELATIVE_ADDR_SIZE);
25341
25342 insn_buf[0] = RELATIVEJUMP_OPCODE;
25343 @@ -433,7 +437,7 @@ setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25344 /* This kprobe is really able to run optimized path. */
25345 op = container_of(p, struct optimized_kprobe, kp);
25346 /* Detour through copied instructions */
25347 - regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25348 + regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25349 if (!reenter)
25350 reset_current_kprobe();
25351 preempt_enable_no_resched();
25352 diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25353 index c2bedae..25e7ab6 100644
25354 --- a/arch/x86/kernel/ksysfs.c
25355 +++ b/arch/x86/kernel/ksysfs.c
25356 @@ -184,7 +184,7 @@ out:
25357
25358 static struct kobj_attribute type_attr = __ATTR_RO(type);
25359
25360 -static struct bin_attribute data_attr = {
25361 +static bin_attribute_no_const data_attr __read_only = {
25362 .attr = {
25363 .name = "data",
25364 .mode = S_IRUGO,
25365 diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25366 index ebc9873..37b8776 100644
25367 --- a/arch/x86/kernel/ldt.c
25368 +++ b/arch/x86/kernel/ldt.c
25369 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25370 if (reload) {
25371 #ifdef CONFIG_SMP
25372 preempt_disable();
25373 - load_LDT(pc);
25374 + load_LDT_nolock(pc);
25375 if (!cpumask_equal(mm_cpumask(current->mm),
25376 cpumask_of(smp_processor_id())))
25377 smp_call_function(flush_ldt, current->mm, 1);
25378 preempt_enable();
25379 #else
25380 - load_LDT(pc);
25381 + load_LDT_nolock(pc);
25382 #endif
25383 }
25384 if (oldsize) {
25385 @@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25386 return err;
25387
25388 for (i = 0; i < old->size; i++)
25389 - write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25390 + write_ldt_entry(new->ldt, i, old->ldt + i);
25391 return 0;
25392 }
25393
25394 @@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25395 retval = copy_ldt(&mm->context, &old_mm->context);
25396 mutex_unlock(&old_mm->context.lock);
25397 }
25398 +
25399 + if (tsk == current) {
25400 + mm->context.vdso = 0;
25401 +
25402 +#ifdef CONFIG_X86_32
25403 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25404 + mm->context.user_cs_base = 0UL;
25405 + mm->context.user_cs_limit = ~0UL;
25406 +
25407 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25408 + cpus_clear(mm->context.cpu_user_cs_mask);
25409 +#endif
25410 +
25411 +#endif
25412 +#endif
25413 +
25414 + }
25415 +
25416 return retval;
25417 }
25418
25419 @@ -229,6 +247,24 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25420 }
25421 }
25422
25423 +#ifdef CONFIG_PAX_SEGMEXEC
25424 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25425 + error = -EINVAL;
25426 + goto out_unlock;
25427 + }
25428 +#endif
25429 +
25430 + /*
25431 + * On x86-64 we do not support 16-bit segments due to
25432 + * IRET leaking the high bits of the kernel stack address.
25433 + */
25434 +#ifdef CONFIG_X86_64
25435 + if (!ldt_info.seg_32bit) {
25436 + error = -EINVAL;
25437 + goto out_unlock;
25438 + }
25439 +#endif
25440 +
25441 fill_ldt(&ldt, &ldt_info);
25442 if (oldmode)
25443 ldt.avl = 0;
25444 diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25445 index 1667b1d..16492c5 100644
25446 --- a/arch/x86/kernel/machine_kexec_32.c
25447 +++ b/arch/x86/kernel/machine_kexec_32.c
25448 @@ -25,7 +25,7 @@
25449 #include <asm/cacheflush.h>
25450 #include <asm/debugreg.h>
25451
25452 -static void set_idt(void *newidt, __u16 limit)
25453 +static void set_idt(struct desc_struct *newidt, __u16 limit)
25454 {
25455 struct desc_ptr curidt;
25456
25457 @@ -37,7 +37,7 @@ static void set_idt(void *newidt, __u16 limit)
25458 }
25459
25460
25461 -static void set_gdt(void *newgdt, __u16 limit)
25462 +static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25463 {
25464 struct desc_ptr curgdt;
25465
25466 @@ -215,7 +215,7 @@ void machine_kexec(struct kimage *image)
25467 }
25468
25469 control_page = page_address(image->control_code_page);
25470 - memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25471 + memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25472
25473 relocate_kernel_ptr = control_page;
25474 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25475 diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
25476 index 18be189..4a9fe40 100644
25477 --- a/arch/x86/kernel/module.c
25478 +++ b/arch/x86/kernel/module.c
25479 @@ -43,15 +43,60 @@ do { \
25480 } while (0)
25481 #endif
25482
25483 -void *module_alloc(unsigned long size)
25484 +static inline void *__module_alloc(unsigned long size, pgprot_t prot)
25485 {
25486 - if (PAGE_ALIGN(size) > MODULES_LEN)
25487 + if (!size || PAGE_ALIGN(size) > MODULES_LEN)
25488 return NULL;
25489 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
25490 - GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
25491 + GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot,
25492 NUMA_NO_NODE, __builtin_return_address(0));
25493 }
25494
25495 +void *module_alloc(unsigned long size)
25496 +{
25497 +
25498 +#ifdef CONFIG_PAX_KERNEXEC
25499 + return __module_alloc(size, PAGE_KERNEL);
25500 +#else
25501 + return __module_alloc(size, PAGE_KERNEL_EXEC);
25502 +#endif
25503 +
25504 +}
25505 +
25506 +#ifdef CONFIG_PAX_KERNEXEC
25507 +#ifdef CONFIG_X86_32
25508 +void *module_alloc_exec(unsigned long size)
25509 +{
25510 + struct vm_struct *area;
25511 +
25512 + if (size == 0)
25513 + return NULL;
25514 +
25515 + area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
25516 + return area ? area->addr : NULL;
25517 +}
25518 +EXPORT_SYMBOL(module_alloc_exec);
25519 +
25520 +void module_free_exec(struct module *mod, void *module_region)
25521 +{
25522 + vunmap(module_region);
25523 +}
25524 +EXPORT_SYMBOL(module_free_exec);
25525 +#else
25526 +void module_free_exec(struct module *mod, void *module_region)
25527 +{
25528 + module_free(mod, module_region);
25529 +}
25530 +EXPORT_SYMBOL(module_free_exec);
25531 +
25532 +void *module_alloc_exec(unsigned long size)
25533 +{
25534 + return __module_alloc(size, PAGE_KERNEL_RX);
25535 +}
25536 +EXPORT_SYMBOL(module_alloc_exec);
25537 +#endif
25538 +#endif
25539 +
25540 #ifdef CONFIG_X86_32
25541 int apply_relocate(Elf32_Shdr *sechdrs,
25542 const char *strtab,
25543 @@ -62,14 +107,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
25544 unsigned int i;
25545 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
25546 Elf32_Sym *sym;
25547 - uint32_t *location;
25548 + uint32_t *plocation, location;
25549
25550 DEBUGP("Applying relocate section %u to %u\n",
25551 relsec, sechdrs[relsec].sh_info);
25552 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
25553 /* This is where to make the change */
25554 - location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
25555 - + rel[i].r_offset;
25556 + plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
25557 + location = (uint32_t)plocation;
25558 + if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
25559 + plocation = ktla_ktva((void *)plocation);
25560 /* This is the symbol it is referring to. Note that all
25561 undefined symbols have been resolved. */
25562 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
25563 @@ -78,11 +125,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
25564 switch (ELF32_R_TYPE(rel[i].r_info)) {
25565 case R_386_32:
25566 /* We add the value into the location given */
25567 - *location += sym->st_value;
25568 + pax_open_kernel();
25569 + *plocation += sym->st_value;
25570 + pax_close_kernel();
25571 break;
25572 case R_386_PC32:
25573 /* Add the value, subtract its position */
25574 - *location += sym->st_value - (uint32_t)location;
25575 + pax_open_kernel();
25576 + *plocation += sym->st_value - location;
25577 + pax_close_kernel();
25578 break;
25579 default:
25580 pr_err("%s: Unknown relocation: %u\n",
25581 @@ -127,21 +178,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
25582 case R_X86_64_NONE:
25583 break;
25584 case R_X86_64_64:
25585 + pax_open_kernel();
25586 *(u64 *)loc = val;
25587 + pax_close_kernel();
25588 break;
25589 case R_X86_64_32:
25590 + pax_open_kernel();
25591 *(u32 *)loc = val;
25592 + pax_close_kernel();
25593 if (val != *(u32 *)loc)
25594 goto overflow;
25595 break;
25596 case R_X86_64_32S:
25597 + pax_open_kernel();
25598 *(s32 *)loc = val;
25599 + pax_close_kernel();
25600 if ((s64)val != *(s32 *)loc)
25601 goto overflow;
25602 break;
25603 case R_X86_64_PC32:
25604 val -= (u64)loc;
25605 + pax_open_kernel();
25606 *(u32 *)loc = val;
25607 + pax_close_kernel();
25608 +
25609 #if 0
25610 if ((s64)val != *(s32 *)loc)
25611 goto overflow;
25612 diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
25613 index 05266b5..3432443 100644
25614 --- a/arch/x86/kernel/msr.c
25615 +++ b/arch/x86/kernel/msr.c
25616 @@ -37,6 +37,7 @@
25617 #include <linux/notifier.h>
25618 #include <linux/uaccess.h>
25619 #include <linux/gfp.h>
25620 +#include <linux/grsecurity.h>
25621
25622 #include <asm/processor.h>
25623 #include <asm/msr.h>
25624 @@ -103,6 +104,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
25625 int err = 0;
25626 ssize_t bytes = 0;
25627
25628 +#ifdef CONFIG_GRKERNSEC_KMEM
25629 + gr_handle_msr_write();
25630 + return -EPERM;
25631 +#endif
25632 +
25633 if (count % 8)
25634 return -EINVAL; /* Invalid chunk size */
25635
25636 @@ -150,6 +156,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
25637 err = -EBADF;
25638 break;
25639 }
25640 +#ifdef CONFIG_GRKERNSEC_KMEM
25641 + gr_handle_msr_write();
25642 + return -EPERM;
25643 +#endif
25644 if (copy_from_user(&regs, uregs, sizeof regs)) {
25645 err = -EFAULT;
25646 break;
25647 @@ -233,7 +243,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
25648 return notifier_from_errno(err);
25649 }
25650
25651 -static struct notifier_block __refdata msr_class_cpu_notifier = {
25652 +static struct notifier_block msr_class_cpu_notifier = {
25653 .notifier_call = msr_class_cpu_callback,
25654 };
25655
25656 diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
25657 index 6fcb49c..5b3f4ff 100644
25658 --- a/arch/x86/kernel/nmi.c
25659 +++ b/arch/x86/kernel/nmi.c
25660 @@ -138,7 +138,7 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2
25661 return handled;
25662 }
25663
25664 -int __register_nmi_handler(unsigned int type, struct nmiaction *action)
25665 +int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
25666 {
25667 struct nmi_desc *desc = nmi_to_desc(type);
25668 unsigned long flags;
25669 @@ -162,9 +162,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
25670 * event confuses some handlers (kdump uses this flag)
25671 */
25672 if (action->flags & NMI_FLAG_FIRST)
25673 - list_add_rcu(&action->list, &desc->head);
25674 + pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
25675 else
25676 - list_add_tail_rcu(&action->list, &desc->head);
25677 + pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
25678
25679 spin_unlock_irqrestore(&desc->lock, flags);
25680 return 0;
25681 @@ -187,7 +187,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
25682 if (!strcmp(n->name, name)) {
25683 WARN(in_nmi(),
25684 "Trying to free NMI (%s) from NMI context!\n", n->name);
25685 - list_del_rcu(&n->list);
25686 + pax_list_del_rcu((struct list_head *)&n->list);
25687 break;
25688 }
25689 }
25690 @@ -512,6 +512,17 @@ static inline void nmi_nesting_postprocess(void)
25691 dotraplinkage notrace __kprobes void
25692 do_nmi(struct pt_regs *regs, long error_code)
25693 {
25694 +
25695 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
25696 + if (!user_mode(regs)) {
25697 + unsigned long cs = regs->cs & 0xFFFF;
25698 + unsigned long ip = ktva_ktla(regs->ip);
25699 +
25700 + if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
25701 + regs->ip = ip;
25702 + }
25703 +#endif
25704 +
25705 nmi_nesting_preprocess(regs);
25706
25707 nmi_enter();
25708 diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
25709 index 6d9582e..f746287 100644
25710 --- a/arch/x86/kernel/nmi_selftest.c
25711 +++ b/arch/x86/kernel/nmi_selftest.c
25712 @@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
25713 {
25714 /* trap all the unknown NMIs we may generate */
25715 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
25716 - __initdata);
25717 + __initconst);
25718 }
25719
25720 static void __init cleanup_nmi_testsuite(void)
25721 @@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
25722 unsigned long timeout;
25723
25724 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
25725 - NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
25726 + NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
25727 nmi_fail = FAILURE;
25728 return;
25729 }
25730 diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
25731 index bbb6c73..24a58ef 100644
25732 --- a/arch/x86/kernel/paravirt-spinlocks.c
25733 +++ b/arch/x86/kernel/paravirt-spinlocks.c
25734 @@ -8,7 +8,7 @@
25735
25736 #include <asm/paravirt.h>
25737
25738 -struct pv_lock_ops pv_lock_ops = {
25739 +struct pv_lock_ops pv_lock_ops __read_only = {
25740 #ifdef CONFIG_SMP
25741 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
25742 .unlock_kick = paravirt_nop,
25743 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
25744 index 1b10af8..0b58cbc 100644
25745 --- a/arch/x86/kernel/paravirt.c
25746 +++ b/arch/x86/kernel/paravirt.c
25747 @@ -55,6 +55,9 @@ u64 _paravirt_ident_64(u64 x)
25748 {
25749 return x;
25750 }
25751 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25752 +PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
25753 +#endif
25754
25755 void __init default_banner(void)
25756 {
25757 @@ -142,15 +145,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
25758 if (opfunc == NULL)
25759 /* If there's no function, patch it with a ud2a (BUG) */
25760 ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
25761 - else if (opfunc == _paravirt_nop)
25762 + else if (opfunc == (void *)_paravirt_nop)
25763 /* If the operation is a nop, then nop the callsite */
25764 ret = paravirt_patch_nop();
25765
25766 /* identity functions just return their single argument */
25767 - else if (opfunc == _paravirt_ident_32)
25768 + else if (opfunc == (void *)_paravirt_ident_32)
25769 ret = paravirt_patch_ident_32(insnbuf, len);
25770 - else if (opfunc == _paravirt_ident_64)
25771 + else if (opfunc == (void *)_paravirt_ident_64)
25772 ret = paravirt_patch_ident_64(insnbuf, len);
25773 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25774 + else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
25775 + ret = paravirt_patch_ident_64(insnbuf, len);
25776 +#endif
25777
25778 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
25779 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
25780 @@ -175,7 +182,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
25781 if (insn_len > len || start == NULL)
25782 insn_len = len;
25783 else
25784 - memcpy(insnbuf, start, insn_len);
25785 + memcpy(insnbuf, ktla_ktva(start), insn_len);
25786
25787 return insn_len;
25788 }
25789 @@ -299,7 +306,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
25790 return this_cpu_read(paravirt_lazy_mode);
25791 }
25792
25793 -struct pv_info pv_info = {
25794 +struct pv_info pv_info __read_only = {
25795 .name = "bare hardware",
25796 .paravirt_enabled = 0,
25797 .kernel_rpl = 0,
25798 @@ -310,16 +317,16 @@ struct pv_info pv_info = {
25799 #endif
25800 };
25801
25802 -struct pv_init_ops pv_init_ops = {
25803 +struct pv_init_ops pv_init_ops __read_only = {
25804 .patch = native_patch,
25805 };
25806
25807 -struct pv_time_ops pv_time_ops = {
25808 +struct pv_time_ops pv_time_ops __read_only = {
25809 .sched_clock = native_sched_clock,
25810 .steal_clock = native_steal_clock,
25811 };
25812
25813 -__visible struct pv_irq_ops pv_irq_ops = {
25814 +__visible struct pv_irq_ops pv_irq_ops __read_only = {
25815 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
25816 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
25817 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
25818 @@ -331,7 +338,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
25819 #endif
25820 };
25821
25822 -__visible struct pv_cpu_ops pv_cpu_ops = {
25823 +__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
25824 .cpuid = native_cpuid,
25825 .get_debugreg = native_get_debugreg,
25826 .set_debugreg = native_set_debugreg,
25827 @@ -389,21 +396,26 @@ __visible struct pv_cpu_ops pv_cpu_ops = {
25828 .end_context_switch = paravirt_nop,
25829 };
25830
25831 -struct pv_apic_ops pv_apic_ops = {
25832 +struct pv_apic_ops pv_apic_ops __read_only= {
25833 #ifdef CONFIG_X86_LOCAL_APIC
25834 .startup_ipi_hook = paravirt_nop,
25835 #endif
25836 };
25837
25838 -#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
25839 +#ifdef CONFIG_X86_32
25840 +#ifdef CONFIG_X86_PAE
25841 +/* 64-bit pagetable entries */
25842 +#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
25843 +#else
25844 /* 32-bit pagetable entries */
25845 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
25846 +#endif
25847 #else
25848 /* 64-bit pagetable entries */
25849 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
25850 #endif
25851
25852 -struct pv_mmu_ops pv_mmu_ops = {
25853 +struct pv_mmu_ops pv_mmu_ops __read_only = {
25854
25855 .read_cr2 = native_read_cr2,
25856 .write_cr2 = native_write_cr2,
25857 @@ -453,6 +465,7 @@ struct pv_mmu_ops pv_mmu_ops = {
25858 .make_pud = PTE_IDENT,
25859
25860 .set_pgd = native_set_pgd,
25861 + .set_pgd_batched = native_set_pgd_batched,
25862 #endif
25863 #endif /* PAGETABLE_LEVELS >= 3 */
25864
25865 @@ -473,6 +486,12 @@ struct pv_mmu_ops pv_mmu_ops = {
25866 },
25867
25868 .set_fixmap = native_set_fixmap,
25869 +
25870 +#ifdef CONFIG_PAX_KERNEXEC
25871 + .pax_open_kernel = native_pax_open_kernel,
25872 + .pax_close_kernel = native_pax_close_kernel,
25873 +#endif
25874 +
25875 };
25876
25877 EXPORT_SYMBOL_GPL(pv_time_ops);
25878 diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
25879 index 299d493..2ccb0ee 100644
25880 --- a/arch/x86/kernel/pci-calgary_64.c
25881 +++ b/arch/x86/kernel/pci-calgary_64.c
25882 @@ -1339,7 +1339,7 @@ static void __init get_tce_space_from_tar(void)
25883 tce_space = be64_to_cpu(readq(target));
25884 tce_space = tce_space & TAR_SW_BITS;
25885
25886 - tce_space = tce_space & (~specified_table_size);
25887 + tce_space = tce_space & (~(unsigned long)specified_table_size);
25888 info->tce_space = (u64 *)__va(tce_space);
25889 }
25890 }
25891 diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
25892 index 35ccf75..7a15747 100644
25893 --- a/arch/x86/kernel/pci-iommu_table.c
25894 +++ b/arch/x86/kernel/pci-iommu_table.c
25895 @@ -2,7 +2,7 @@
25896 #include <asm/iommu_table.h>
25897 #include <linux/string.h>
25898 #include <linux/kallsyms.h>
25899 -
25900 +#include <linux/sched.h>
25901
25902 #define DEBUG 1
25903
25904 diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
25905 index 6c483ba..d10ce2f 100644
25906 --- a/arch/x86/kernel/pci-swiotlb.c
25907 +++ b/arch/x86/kernel/pci-swiotlb.c
25908 @@ -32,7 +32,7 @@ static void x86_swiotlb_free_coherent(struct device *dev, size_t size,
25909 void *vaddr, dma_addr_t dma_addr,
25910 struct dma_attrs *attrs)
25911 {
25912 - swiotlb_free_coherent(dev, size, vaddr, dma_addr);
25913 + swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
25914 }
25915
25916 static struct dma_map_ops swiotlb_dma_ops = {
25917 diff --git a/arch/x86/kernel/preempt.S b/arch/x86/kernel/preempt.S
25918 index ca7f0d5..8996469 100644
25919 --- a/arch/x86/kernel/preempt.S
25920 +++ b/arch/x86/kernel/preempt.S
25921 @@ -3,12 +3,14 @@
25922 #include <asm/dwarf2.h>
25923 #include <asm/asm.h>
25924 #include <asm/calling.h>
25925 +#include <asm/alternative-asm.h>
25926
25927 ENTRY(___preempt_schedule)
25928 CFI_STARTPROC
25929 SAVE_ALL
25930 call preempt_schedule
25931 RESTORE_ALL
25932 + pax_force_retaddr
25933 ret
25934 CFI_ENDPROC
25935
25936 @@ -19,6 +21,7 @@ ENTRY(___preempt_schedule_context)
25937 SAVE_ALL
25938 call preempt_schedule_context
25939 RESTORE_ALL
25940 + pax_force_retaddr
25941 ret
25942 CFI_ENDPROC
25943
25944 diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
25945 index 3fb8d95..254dc51 100644
25946 --- a/arch/x86/kernel/process.c
25947 +++ b/arch/x86/kernel/process.c
25948 @@ -36,7 +36,8 @@
25949 * section. Since TSS's are completely CPU-local, we want them
25950 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
25951 */
25952 -__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
25953 +struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
25954 +EXPORT_SYMBOL(init_tss);
25955
25956 #ifdef CONFIG_X86_64
25957 static DEFINE_PER_CPU(unsigned char, is_idle);
25958 @@ -92,7 +93,7 @@ void arch_task_cache_init(void)
25959 task_xstate_cachep =
25960 kmem_cache_create("task_xstate", xstate_size,
25961 __alignof__(union thread_xstate),
25962 - SLAB_PANIC | SLAB_NOTRACK, NULL);
25963 + SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
25964 }
25965
25966 /*
25967 @@ -105,7 +106,7 @@ void exit_thread(void)
25968 unsigned long *bp = t->io_bitmap_ptr;
25969
25970 if (bp) {
25971 - struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
25972 + struct tss_struct *tss = init_tss + get_cpu();
25973
25974 t->io_bitmap_ptr = NULL;
25975 clear_thread_flag(TIF_IO_BITMAP);
25976 @@ -125,6 +126,9 @@ void flush_thread(void)
25977 {
25978 struct task_struct *tsk = current;
25979
25980 +#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
25981 + loadsegment(gs, 0);
25982 +#endif
25983 flush_ptrace_hw_breakpoint(tsk);
25984 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
25985 drop_init_fpu(tsk);
25986 @@ -271,7 +275,7 @@ static void __exit_idle(void)
25987 void exit_idle(void)
25988 {
25989 /* idle loop has pid 0 */
25990 - if (current->pid)
25991 + if (task_pid_nr(current))
25992 return;
25993 __exit_idle();
25994 }
25995 @@ -327,7 +331,7 @@ bool xen_set_default_idle(void)
25996 return ret;
25997 }
25998 #endif
25999 -void stop_this_cpu(void *dummy)
26000 +__noreturn void stop_this_cpu(void *dummy)
26001 {
26002 local_irq_disable();
26003 /*
26004 @@ -456,16 +460,37 @@ static int __init idle_setup(char *str)
26005 }
26006 early_param("idle", idle_setup);
26007
26008 -unsigned long arch_align_stack(unsigned long sp)
26009 +#ifdef CONFIG_PAX_RANDKSTACK
26010 +void pax_randomize_kstack(struct pt_regs *regs)
26011 {
26012 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26013 - sp -= get_random_int() % 8192;
26014 - return sp & ~0xf;
26015 -}
26016 + struct thread_struct *thread = &current->thread;
26017 + unsigned long time;
26018
26019 -unsigned long arch_randomize_brk(struct mm_struct *mm)
26020 -{
26021 - unsigned long range_end = mm->brk + 0x02000000;
26022 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26023 -}
26024 + if (!randomize_va_space)
26025 + return;
26026 +
26027 + if (v8086_mode(regs))
26028 + return;
26029
26030 + rdtscl(time);
26031 +
26032 + /* P4 seems to return a 0 LSB, ignore it */
26033 +#ifdef CONFIG_MPENTIUM4
26034 + time &= 0x3EUL;
26035 + time <<= 2;
26036 +#elif defined(CONFIG_X86_64)
26037 + time &= 0xFUL;
26038 + time <<= 4;
26039 +#else
26040 + time &= 0x1FUL;
26041 + time <<= 3;
26042 +#endif
26043 +
26044 + thread->sp0 ^= time;
26045 + load_sp0(init_tss + smp_processor_id(), thread);
26046 +
26047 +#ifdef CONFIG_X86_64
26048 + this_cpu_write(kernel_stack, thread->sp0);
26049 +#endif
26050 +}
26051 +#endif
26052 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26053 index 0de43e9..056b840 100644
26054 --- a/arch/x86/kernel/process_32.c
26055 +++ b/arch/x86/kernel/process_32.c
26056 @@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26057 unsigned long thread_saved_pc(struct task_struct *tsk)
26058 {
26059 return ((unsigned long *)tsk->thread.sp)[3];
26060 +//XXX return tsk->thread.eip;
26061 }
26062
26063 void __show_regs(struct pt_regs *regs, int all)
26064 @@ -73,19 +74,18 @@ void __show_regs(struct pt_regs *regs, int all)
26065 unsigned long sp;
26066 unsigned short ss, gs;
26067
26068 - if (user_mode_vm(regs)) {
26069 + if (user_mode(regs)) {
26070 sp = regs->sp;
26071 ss = regs->ss & 0xffff;
26072 - gs = get_user_gs(regs);
26073 } else {
26074 sp = kernel_stack_pointer(regs);
26075 savesegment(ss, ss);
26076 - savesegment(gs, gs);
26077 }
26078 + gs = get_user_gs(regs);
26079
26080 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26081 (u16)regs->cs, regs->ip, regs->flags,
26082 - smp_processor_id());
26083 + raw_smp_processor_id());
26084 print_symbol("EIP is at %s\n", regs->ip);
26085
26086 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26087 @@ -132,20 +132,21 @@ void release_thread(struct task_struct *dead_task)
26088 int copy_thread(unsigned long clone_flags, unsigned long sp,
26089 unsigned long arg, struct task_struct *p)
26090 {
26091 - struct pt_regs *childregs = task_pt_regs(p);
26092 + struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26093 struct task_struct *tsk;
26094 int err;
26095
26096 p->thread.sp = (unsigned long) childregs;
26097 p->thread.sp0 = (unsigned long) (childregs+1);
26098 + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
26099
26100 if (unlikely(p->flags & PF_KTHREAD)) {
26101 /* kernel thread */
26102 memset(childregs, 0, sizeof(struct pt_regs));
26103 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26104 - task_user_gs(p) = __KERNEL_STACK_CANARY;
26105 - childregs->ds = __USER_DS;
26106 - childregs->es = __USER_DS;
26107 + savesegment(gs, childregs->gs);
26108 + childregs->ds = __KERNEL_DS;
26109 + childregs->es = __KERNEL_DS;
26110 childregs->fs = __KERNEL_PERCPU;
26111 childregs->bx = sp; /* function */
26112 childregs->bp = arg;
26113 @@ -252,7 +253,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26114 struct thread_struct *prev = &prev_p->thread,
26115 *next = &next_p->thread;
26116 int cpu = smp_processor_id();
26117 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
26118 + struct tss_struct *tss = init_tss + cpu;
26119 fpu_switch_t fpu;
26120
26121 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26122 @@ -276,6 +277,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26123 */
26124 lazy_save_gs(prev->gs);
26125
26126 +#ifdef CONFIG_PAX_MEMORY_UDEREF
26127 + __set_fs(task_thread_info(next_p)->addr_limit);
26128 +#endif
26129 +
26130 /*
26131 * Load the per-thread Thread-Local Storage descriptor.
26132 */
26133 @@ -314,6 +319,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26134 */
26135 arch_end_context_switch(next_p);
26136
26137 + this_cpu_write(current_task, next_p);
26138 + this_cpu_write(current_tinfo, &next_p->tinfo);
26139 +
26140 /*
26141 * Restore %gs if needed (which is common)
26142 */
26143 @@ -322,8 +330,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26144
26145 switch_fpu_finish(next_p, fpu);
26146
26147 - this_cpu_write(current_task, next_p);
26148 -
26149 return prev_p;
26150 }
26151
26152 @@ -353,4 +359,3 @@ unsigned long get_wchan(struct task_struct *p)
26153 } while (count++ < 16);
26154 return 0;
26155 }
26156 -
26157 diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26158 index 9c0280f..5bbb1c0 100644
26159 --- a/arch/x86/kernel/process_64.c
26160 +++ b/arch/x86/kernel/process_64.c
26161 @@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26162 struct pt_regs *childregs;
26163 struct task_struct *me = current;
26164
26165 - p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26166 + p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26167 childregs = task_pt_regs(p);
26168 p->thread.sp = (unsigned long) childregs;
26169 p->thread.usersp = me->thread.usersp;
26170 + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
26171 set_tsk_thread_flag(p, TIF_FORK);
26172 p->thread.fpu_counter = 0;
26173 p->thread.io_bitmap_ptr = NULL;
26174 @@ -172,6 +173,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26175 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26176 savesegment(es, p->thread.es);
26177 savesegment(ds, p->thread.ds);
26178 + savesegment(ss, p->thread.ss);
26179 + BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26180 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26181
26182 if (unlikely(p->flags & PF_KTHREAD)) {
26183 @@ -280,7 +283,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26184 struct thread_struct *prev = &prev_p->thread;
26185 struct thread_struct *next = &next_p->thread;
26186 int cpu = smp_processor_id();
26187 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
26188 + struct tss_struct *tss = init_tss + cpu;
26189 unsigned fsindex, gsindex;
26190 fpu_switch_t fpu;
26191
26192 @@ -303,6 +306,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26193 if (unlikely(next->ds | prev->ds))
26194 loadsegment(ds, next->ds);
26195
26196 + savesegment(ss, prev->ss);
26197 + if (unlikely(next->ss != prev->ss))
26198 + loadsegment(ss, next->ss);
26199
26200 /* We must save %fs and %gs before load_TLS() because
26201 * %fs and %gs may be cleared by load_TLS().
26202 @@ -362,6 +368,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26203 prev->usersp = this_cpu_read(old_rsp);
26204 this_cpu_write(old_rsp, next->usersp);
26205 this_cpu_write(current_task, next_p);
26206 + this_cpu_write(current_tinfo, &next_p->tinfo);
26207
26208 /*
26209 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26210 @@ -371,9 +378,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26211 task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
26212 this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
26213
26214 - this_cpu_write(kernel_stack,
26215 - (unsigned long)task_stack_page(next_p) +
26216 - THREAD_SIZE - KERNEL_STACK_OFFSET);
26217 + this_cpu_write(kernel_stack, next->sp0);
26218
26219 /*
26220 * Now maybe reload the debug registers and handle I/O bitmaps
26221 @@ -442,12 +447,11 @@ unsigned long get_wchan(struct task_struct *p)
26222 if (!p || p == current || p->state == TASK_RUNNING)
26223 return 0;
26224 stack = (unsigned long)task_stack_page(p);
26225 - if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26226 + if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26227 return 0;
26228 fp = *(u64 *)(p->thread.sp);
26229 do {
26230 - if (fp < (unsigned long)stack ||
26231 - fp >= (unsigned long)stack+THREAD_SIZE)
26232 + if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26233 return 0;
26234 ip = *(u64 *)(fp+8);
26235 if (!in_sched_functions(ip))
26236 diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26237 index 7461f50..1334029 100644
26238 --- a/arch/x86/kernel/ptrace.c
26239 +++ b/arch/x86/kernel/ptrace.c
26240 @@ -184,14 +184,13 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26241 {
26242 unsigned long context = (unsigned long)regs & ~(THREAD_SIZE - 1);
26243 unsigned long sp = (unsigned long)&regs->sp;
26244 - struct thread_info *tinfo;
26245
26246 - if (context == (sp & ~(THREAD_SIZE - 1)))
26247 + if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26248 return sp;
26249
26250 - tinfo = (struct thread_info *)context;
26251 - if (tinfo->previous_esp)
26252 - return tinfo->previous_esp;
26253 + sp = *(unsigned long *)context;
26254 + if (sp)
26255 + return sp;
26256
26257 return (unsigned long)regs;
26258 }
26259 @@ -588,7 +587,7 @@ static void ptrace_triggered(struct perf_event *bp,
26260 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26261 {
26262 int i;
26263 - int dr7 = 0;
26264 + unsigned long dr7 = 0;
26265 struct arch_hw_breakpoint *info;
26266
26267 for (i = 0; i < HBP_NUM; i++) {
26268 @@ -822,7 +821,7 @@ long arch_ptrace(struct task_struct *child, long request,
26269 unsigned long addr, unsigned long data)
26270 {
26271 int ret;
26272 - unsigned long __user *datap = (unsigned long __user *)data;
26273 + unsigned long __user *datap = (__force unsigned long __user *)data;
26274
26275 switch (request) {
26276 /* read the word at location addr in the USER area. */
26277 @@ -907,14 +906,14 @@ long arch_ptrace(struct task_struct *child, long request,
26278 if ((int) addr < 0)
26279 return -EIO;
26280 ret = do_get_thread_area(child, addr,
26281 - (struct user_desc __user *)data);
26282 + (__force struct user_desc __user *) data);
26283 break;
26284
26285 case PTRACE_SET_THREAD_AREA:
26286 if ((int) addr < 0)
26287 return -EIO;
26288 ret = do_set_thread_area(child, addr,
26289 - (struct user_desc __user *)data, 0);
26290 + (__force struct user_desc __user *) data, 0);
26291 break;
26292 #endif
26293
26294 @@ -1292,7 +1291,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26295
26296 #ifdef CONFIG_X86_64
26297
26298 -static struct user_regset x86_64_regsets[] __read_mostly = {
26299 +static user_regset_no_const x86_64_regsets[] __read_only = {
26300 [REGSET_GENERAL] = {
26301 .core_note_type = NT_PRSTATUS,
26302 .n = sizeof(struct user_regs_struct) / sizeof(long),
26303 @@ -1333,7 +1332,7 @@ static const struct user_regset_view user_x86_64_view = {
26304 #endif /* CONFIG_X86_64 */
26305
26306 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26307 -static struct user_regset x86_32_regsets[] __read_mostly = {
26308 +static user_regset_no_const x86_32_regsets[] __read_only = {
26309 [REGSET_GENERAL] = {
26310 .core_note_type = NT_PRSTATUS,
26311 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26312 @@ -1386,7 +1385,7 @@ static const struct user_regset_view user_x86_32_view = {
26313 */
26314 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26315
26316 -void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26317 +void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26318 {
26319 #ifdef CONFIG_X86_64
26320 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26321 @@ -1421,7 +1420,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26322 memset(info, 0, sizeof(*info));
26323 info->si_signo = SIGTRAP;
26324 info->si_code = si_code;
26325 - info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
26326 + info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
26327 }
26328
26329 void user_single_step_siginfo(struct task_struct *tsk,
26330 @@ -1450,6 +1449,10 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
26331 # define IS_IA32 0
26332 #endif
26333
26334 +#ifdef CONFIG_GRKERNSEC_SETXID
26335 +extern void gr_delayed_cred_worker(void);
26336 +#endif
26337 +
26338 /*
26339 * We must return the syscall number to actually look up in the table.
26340 * This can be -1L to skip running any syscall at all.
26341 @@ -1460,6 +1463,11 @@ long syscall_trace_enter(struct pt_regs *regs)
26342
26343 user_exit();
26344
26345 +#ifdef CONFIG_GRKERNSEC_SETXID
26346 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26347 + gr_delayed_cred_worker();
26348 +#endif
26349 +
26350 /*
26351 * If we stepped into a sysenter/syscall insn, it trapped in
26352 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
26353 @@ -1515,6 +1523,11 @@ void syscall_trace_leave(struct pt_regs *regs)
26354 */
26355 user_exit();
26356
26357 +#ifdef CONFIG_GRKERNSEC_SETXID
26358 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26359 + gr_delayed_cred_worker();
26360 +#endif
26361 +
26362 audit_syscall_exit(regs);
26363
26364 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
26365 diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
26366 index 2f355d2..e75ed0a 100644
26367 --- a/arch/x86/kernel/pvclock.c
26368 +++ b/arch/x86/kernel/pvclock.c
26369 @@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
26370 reset_hung_task_detector();
26371 }
26372
26373 -static atomic64_t last_value = ATOMIC64_INIT(0);
26374 +static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
26375
26376 void pvclock_resume(void)
26377 {
26378 - atomic64_set(&last_value, 0);
26379 + atomic64_set_unchecked(&last_value, 0);
26380 }
26381
26382 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
26383 @@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
26384 * updating at the same time, and one of them could be slightly behind,
26385 * making the assumption that last_value always go forward fail to hold.
26386 */
26387 - last = atomic64_read(&last_value);
26388 + last = atomic64_read_unchecked(&last_value);
26389 do {
26390 if (ret < last)
26391 return last;
26392 - last = atomic64_cmpxchg(&last_value, last, ret);
26393 + last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
26394 } while (unlikely(last != ret));
26395
26396 return ret;
26397 diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
26398 index c752cb4..866c432 100644
26399 --- a/arch/x86/kernel/reboot.c
26400 +++ b/arch/x86/kernel/reboot.c
26401 @@ -68,6 +68,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
26402
26403 void __noreturn machine_real_restart(unsigned int type)
26404 {
26405 +
26406 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
26407 + struct desc_struct *gdt;
26408 +#endif
26409 +
26410 local_irq_disable();
26411
26412 /*
26413 @@ -95,7 +100,29 @@ void __noreturn machine_real_restart(unsigned int type)
26414
26415 /* Jump to the identity-mapped low memory code */
26416 #ifdef CONFIG_X86_32
26417 - asm volatile("jmpl *%0" : :
26418 +
26419 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
26420 + gdt = get_cpu_gdt_table(smp_processor_id());
26421 + pax_open_kernel();
26422 +#ifdef CONFIG_PAX_MEMORY_UDEREF
26423 + gdt[GDT_ENTRY_KERNEL_DS].type = 3;
26424 + gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
26425 + loadsegment(ds, __KERNEL_DS);
26426 + loadsegment(es, __KERNEL_DS);
26427 + loadsegment(ss, __KERNEL_DS);
26428 +#endif
26429 +#ifdef CONFIG_PAX_KERNEXEC
26430 + gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
26431 + gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
26432 + gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
26433 + gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
26434 + gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
26435 + gdt[GDT_ENTRY_KERNEL_CS].g = 1;
26436 +#endif
26437 + pax_close_kernel();
26438 +#endif
26439 +
26440 + asm volatile("ljmpl *%0" : :
26441 "rm" (real_mode_header->machine_real_restart_asm),
26442 "a" (type));
26443 #else
26444 @@ -470,7 +497,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
26445 * try to force a triple fault and then cycle between hitting the keyboard
26446 * controller and doing that
26447 */
26448 -static void native_machine_emergency_restart(void)
26449 +static void __noreturn native_machine_emergency_restart(void)
26450 {
26451 int i;
26452 int attempt = 0;
26453 @@ -593,13 +620,13 @@ void native_machine_shutdown(void)
26454 #endif
26455 }
26456
26457 -static void __machine_emergency_restart(int emergency)
26458 +static void __noreturn __machine_emergency_restart(int emergency)
26459 {
26460 reboot_emergency = emergency;
26461 machine_ops.emergency_restart();
26462 }
26463
26464 -static void native_machine_restart(char *__unused)
26465 +static void __noreturn native_machine_restart(char *__unused)
26466 {
26467 pr_notice("machine restart\n");
26468
26469 @@ -608,7 +635,7 @@ static void native_machine_restart(char *__unused)
26470 __machine_emergency_restart(0);
26471 }
26472
26473 -static void native_machine_halt(void)
26474 +static void __noreturn native_machine_halt(void)
26475 {
26476 /* Stop other cpus and apics */
26477 machine_shutdown();
26478 @@ -618,7 +645,7 @@ static void native_machine_halt(void)
26479 stop_this_cpu(NULL);
26480 }
26481
26482 -static void native_machine_power_off(void)
26483 +static void __noreturn native_machine_power_off(void)
26484 {
26485 if (pm_power_off) {
26486 if (!reboot_force)
26487 @@ -627,9 +654,10 @@ static void native_machine_power_off(void)
26488 }
26489 /* A fallback in case there is no PM info available */
26490 tboot_shutdown(TB_SHUTDOWN_HALT);
26491 + unreachable();
26492 }
26493
26494 -struct machine_ops machine_ops = {
26495 +struct machine_ops machine_ops __read_only = {
26496 .power_off = native_machine_power_off,
26497 .shutdown = native_machine_shutdown,
26498 .emergency_restart = native_machine_emergency_restart,
26499 diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
26500 index c8e41e9..64049ef 100644
26501 --- a/arch/x86/kernel/reboot_fixups_32.c
26502 +++ b/arch/x86/kernel/reboot_fixups_32.c
26503 @@ -57,7 +57,7 @@ struct device_fixup {
26504 unsigned int vendor;
26505 unsigned int device;
26506 void (*reboot_fixup)(struct pci_dev *);
26507 -};
26508 +} __do_const;
26509
26510 /*
26511 * PCI ids solely used for fixups_table go here
26512 diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
26513 index 3fd2c69..a444264 100644
26514 --- a/arch/x86/kernel/relocate_kernel_64.S
26515 +++ b/arch/x86/kernel/relocate_kernel_64.S
26516 @@ -96,8 +96,7 @@ relocate_kernel:
26517
26518 /* jump to identity mapped page */
26519 addq $(identity_mapped - relocate_kernel), %r8
26520 - pushq %r8
26521 - ret
26522 + jmp *%r8
26523
26524 identity_mapped:
26525 /* set return address to 0 if not preserving context */
26526 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
26527 index ce72964..be8aea7 100644
26528 --- a/arch/x86/kernel/setup.c
26529 +++ b/arch/x86/kernel/setup.c
26530 @@ -110,6 +110,7 @@
26531 #include <asm/mce.h>
26532 #include <asm/alternative.h>
26533 #include <asm/prom.h>
26534 +#include <asm/boot.h>
26535
26536 /*
26537 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
26538 @@ -205,12 +206,50 @@ EXPORT_SYMBOL(boot_cpu_data);
26539 #endif
26540
26541
26542 -#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
26543 -__visible unsigned long mmu_cr4_features;
26544 +#ifdef CONFIG_X86_64
26545 +__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
26546 +#elif defined(CONFIG_X86_PAE)
26547 +__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
26548 #else
26549 -__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
26550 +__visible unsigned long mmu_cr4_features __read_only;
26551 #endif
26552
26553 +void set_in_cr4(unsigned long mask)
26554 +{
26555 + unsigned long cr4 = read_cr4();
26556 +
26557 + if ((cr4 & mask) == mask && cr4 == mmu_cr4_features)
26558 + return;
26559 +
26560 + pax_open_kernel();
26561 + mmu_cr4_features |= mask;
26562 + pax_close_kernel();
26563 +
26564 + if (trampoline_cr4_features)
26565 + *trampoline_cr4_features = mmu_cr4_features;
26566 + cr4 |= mask;
26567 + write_cr4(cr4);
26568 +}
26569 +EXPORT_SYMBOL(set_in_cr4);
26570 +
26571 +void clear_in_cr4(unsigned long mask)
26572 +{
26573 + unsigned long cr4 = read_cr4();
26574 +
26575 + if (!(cr4 & mask) && cr4 == mmu_cr4_features)
26576 + return;
26577 +
26578 + pax_open_kernel();
26579 + mmu_cr4_features &= ~mask;
26580 + pax_close_kernel();
26581 +
26582 + if (trampoline_cr4_features)
26583 + *trampoline_cr4_features = mmu_cr4_features;
26584 + cr4 &= ~mask;
26585 + write_cr4(cr4);
26586 +}
26587 +EXPORT_SYMBOL(clear_in_cr4);
26588 +
26589 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
26590 int bootloader_type, bootloader_version;
26591
26592 @@ -772,7 +811,7 @@ static void __init trim_bios_range(void)
26593 * area (640->1Mb) as ram even though it is not.
26594 * take them out.
26595 */
26596 - e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
26597 + e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
26598
26599 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
26600 }
26601 @@ -780,7 +819,7 @@ static void __init trim_bios_range(void)
26602 /* called before trim_bios_range() to spare extra sanitize */
26603 static void __init e820_add_kernel_range(void)
26604 {
26605 - u64 start = __pa_symbol(_text);
26606 + u64 start = __pa_symbol(ktla_ktva(_text));
26607 u64 size = __pa_symbol(_end) - start;
26608
26609 /*
26610 @@ -856,8 +895,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
26611
26612 void __init setup_arch(char **cmdline_p)
26613 {
26614 +#ifdef CONFIG_X86_32
26615 + memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
26616 +#else
26617 memblock_reserve(__pa_symbol(_text),
26618 (unsigned long)__bss_stop - (unsigned long)_text);
26619 +#endif
26620
26621 early_reserve_initrd();
26622
26623 @@ -947,14 +990,14 @@ void __init setup_arch(char **cmdline_p)
26624
26625 if (!boot_params.hdr.root_flags)
26626 root_mountflags &= ~MS_RDONLY;
26627 - init_mm.start_code = (unsigned long) _text;
26628 - init_mm.end_code = (unsigned long) _etext;
26629 + init_mm.start_code = ktla_ktva((unsigned long) _text);
26630 + init_mm.end_code = ktla_ktva((unsigned long) _etext);
26631 init_mm.end_data = (unsigned long) _edata;
26632 init_mm.brk = _brk_end;
26633
26634 - code_resource.start = __pa_symbol(_text);
26635 - code_resource.end = __pa_symbol(_etext)-1;
26636 - data_resource.start = __pa_symbol(_etext);
26637 + code_resource.start = __pa_symbol(ktla_ktva(_text));
26638 + code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
26639 + data_resource.start = __pa_symbol(_sdata);
26640 data_resource.end = __pa_symbol(_edata)-1;
26641 bss_resource.start = __pa_symbol(__bss_start);
26642 bss_resource.end = __pa_symbol(__bss_stop)-1;
26643 diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
26644 index 5cdff03..80fa283 100644
26645 --- a/arch/x86/kernel/setup_percpu.c
26646 +++ b/arch/x86/kernel/setup_percpu.c
26647 @@ -21,19 +21,17 @@
26648 #include <asm/cpu.h>
26649 #include <asm/stackprotector.h>
26650
26651 -DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
26652 +#ifdef CONFIG_SMP
26653 +DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
26654 EXPORT_PER_CPU_SYMBOL(cpu_number);
26655 +#endif
26656
26657 -#ifdef CONFIG_X86_64
26658 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
26659 -#else
26660 -#define BOOT_PERCPU_OFFSET 0
26661 -#endif
26662
26663 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
26664 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
26665
26666 -unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
26667 +unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
26668 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
26669 };
26670 EXPORT_SYMBOL(__per_cpu_offset);
26671 @@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
26672 {
26673 #ifdef CONFIG_NEED_MULTIPLE_NODES
26674 pg_data_t *last = NULL;
26675 - unsigned int cpu;
26676 + int cpu;
26677
26678 for_each_possible_cpu(cpu) {
26679 int node = early_cpu_to_node(cpu);
26680 @@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
26681 {
26682 #ifdef CONFIG_X86_32
26683 struct desc_struct gdt;
26684 + unsigned long base = per_cpu_offset(cpu);
26685
26686 - pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
26687 - 0x2 | DESCTYPE_S, 0x8);
26688 - gdt.s = 1;
26689 + pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
26690 + 0x83 | DESCTYPE_S, 0xC);
26691 write_gdt_entry(get_cpu_gdt_table(cpu),
26692 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
26693 #endif
26694 @@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
26695 /* alrighty, percpu areas up and running */
26696 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
26697 for_each_possible_cpu(cpu) {
26698 +#ifdef CONFIG_CC_STACKPROTECTOR
26699 +#ifdef CONFIG_X86_32
26700 + unsigned long canary = per_cpu(stack_canary.canary, cpu);
26701 +#endif
26702 +#endif
26703 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
26704 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
26705 per_cpu(cpu_number, cpu) = cpu;
26706 @@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
26707 */
26708 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
26709 #endif
26710 +#ifdef CONFIG_CC_STACKPROTECTOR
26711 +#ifdef CONFIG_X86_32
26712 + if (!cpu)
26713 + per_cpu(stack_canary.canary, cpu) = canary;
26714 +#endif
26715 +#endif
26716 /*
26717 * Up to this point, the boot CPU has been using .init.data
26718 * area. Reload any changed state for the boot CPU.
26719 diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
26720 index 9e5de68..16c53cb 100644
26721 --- a/arch/x86/kernel/signal.c
26722 +++ b/arch/x86/kernel/signal.c
26723 @@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
26724 * Align the stack pointer according to the i386 ABI,
26725 * i.e. so that on function entry ((sp + 4) & 15) == 0.
26726 */
26727 - sp = ((sp + 4) & -16ul) - 4;
26728 + sp = ((sp - 12) & -16ul) - 4;
26729 #else /* !CONFIG_X86_32 */
26730 sp = round_down(sp, 16) - 8;
26731 #endif
26732 @@ -298,9 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
26733 }
26734
26735 if (current->mm->context.vdso)
26736 - restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
26737 + restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
26738 else
26739 - restorer = &frame->retcode;
26740 + restorer = (void __user *)&frame->retcode;
26741 if (ksig->ka.sa.sa_flags & SA_RESTORER)
26742 restorer = ksig->ka.sa.sa_restorer;
26743
26744 @@ -314,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
26745 * reasons and because gdb uses it as a signature to notice
26746 * signal handler stack frames.
26747 */
26748 - err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
26749 + err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
26750
26751 if (err)
26752 return -EFAULT;
26753 @@ -361,7 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
26754 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
26755
26756 /* Set up to return from userspace. */
26757 - restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
26758 + if (current->mm->context.vdso)
26759 + restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
26760 + else
26761 + restorer = (void __user *)&frame->retcode;
26762 if (ksig->ka.sa.sa_flags & SA_RESTORER)
26763 restorer = ksig->ka.sa.sa_restorer;
26764 put_user_ex(restorer, &frame->pretcode);
26765 @@ -373,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
26766 * reasons and because gdb uses it as a signature to notice
26767 * signal handler stack frames.
26768 */
26769 - put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
26770 + put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
26771 } put_user_catch(err);
26772
26773 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
26774 @@ -609,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
26775 {
26776 int usig = signr_convert(ksig->sig);
26777 sigset_t *set = sigmask_to_save();
26778 - compat_sigset_t *cset = (compat_sigset_t *) set;
26779 + sigset_t sigcopy;
26780 + compat_sigset_t *cset;
26781 +
26782 + sigcopy = *set;
26783 +
26784 + cset = (compat_sigset_t *) &sigcopy;
26785
26786 /* Set up the stack frame */
26787 if (is_ia32_frame()) {
26788 @@ -620,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
26789 } else if (is_x32_frame()) {
26790 return x32_setup_rt_frame(ksig, cset, regs);
26791 } else {
26792 - return __setup_rt_frame(ksig->sig, ksig, set, regs);
26793 + return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
26794 }
26795 }
26796
26797 diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
26798 index 7c3a5a6..f0a8961 100644
26799 --- a/arch/x86/kernel/smp.c
26800 +++ b/arch/x86/kernel/smp.c
26801 @@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
26802
26803 __setup("nonmi_ipi", nonmi_ipi_setup);
26804
26805 -struct smp_ops smp_ops = {
26806 +struct smp_ops smp_ops __read_only = {
26807 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
26808 .smp_prepare_cpus = native_smp_prepare_cpus,
26809 .smp_cpus_done = native_smp_cpus_done,
26810 diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
26811 index a32da80..30c97f1 100644
26812 --- a/arch/x86/kernel/smpboot.c
26813 +++ b/arch/x86/kernel/smpboot.c
26814 @@ -229,14 +229,18 @@ static void notrace start_secondary(void *unused)
26815
26816 enable_start_cpu0 = 0;
26817
26818 -#ifdef CONFIG_X86_32
26819 - /* switch away from the initial page table */
26820 - load_cr3(swapper_pg_dir);
26821 - __flush_tlb_all();
26822 -#endif
26823 -
26824 /* otherwise gcc will move up smp_processor_id before the cpu_init */
26825 barrier();
26826 +
26827 + /* switch away from the initial page table */
26828 +#ifdef CONFIG_PAX_PER_CPU_PGD
26829 + load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
26830 + __flush_tlb_all();
26831 +#elif defined(CONFIG_X86_32)
26832 + load_cr3(swapper_pg_dir);
26833 + __flush_tlb_all();
26834 +#endif
26835 +
26836 /*
26837 * Check TSC synchronization with the BP:
26838 */
26839 @@ -749,8 +753,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
26840 alternatives_enable_smp();
26841
26842 idle->thread.sp = (unsigned long) (((struct pt_regs *)
26843 - (THREAD_SIZE + task_stack_page(idle))) - 1);
26844 + (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
26845 per_cpu(current_task, cpu) = idle;
26846 + per_cpu(current_tinfo, cpu) = &idle->tinfo;
26847
26848 #ifdef CONFIG_X86_32
26849 /* Stack for startup_32 can be just as for start_secondary onwards */
26850 @@ -758,11 +763,13 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
26851 #else
26852 clear_tsk_thread_flag(idle, TIF_FORK);
26853 initial_gs = per_cpu_offset(cpu);
26854 - per_cpu(kernel_stack, cpu) =
26855 - (unsigned long)task_stack_page(idle) -
26856 - KERNEL_STACK_OFFSET + THREAD_SIZE;
26857 + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
26858 #endif
26859 +
26860 + pax_open_kernel();
26861 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
26862 + pax_close_kernel();
26863 +
26864 initial_code = (unsigned long)start_secondary;
26865 stack_start = idle->thread.sp;
26866
26867 @@ -911,6 +918,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
26868 /* the FPU context is blank, nobody can own it */
26869 __cpu_disable_lazy_restore(cpu);
26870
26871 +#ifdef CONFIG_PAX_PER_CPU_PGD
26872 + clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
26873 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
26874 + KERNEL_PGD_PTRS);
26875 + clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
26876 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
26877 + KERNEL_PGD_PTRS);
26878 +#endif
26879 +
26880 err = do_boot_cpu(apicid, cpu, tidle);
26881 if (err) {
26882 pr_debug("do_boot_cpu failed %d\n", err);
26883 diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
26884 index 9b4d51d..5d28b58 100644
26885 --- a/arch/x86/kernel/step.c
26886 +++ b/arch/x86/kernel/step.c
26887 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
26888 struct desc_struct *desc;
26889 unsigned long base;
26890
26891 - seg &= ~7UL;
26892 + seg >>= 3;
26893
26894 mutex_lock(&child->mm->context.lock);
26895 - if (unlikely((seg >> 3) >= child->mm->context.size))
26896 + if (unlikely(seg >= child->mm->context.size))
26897 addr = -1L; /* bogus selector, access would fault */
26898 else {
26899 desc = child->mm->context.ldt + seg;
26900 @@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
26901 addr += base;
26902 }
26903 mutex_unlock(&child->mm->context.lock);
26904 - }
26905 + } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
26906 + addr = ktla_ktva(addr);
26907
26908 return addr;
26909 }
26910 @@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
26911 unsigned char opcode[15];
26912 unsigned long addr = convert_ip_to_linear(child, regs);
26913
26914 + if (addr == -EINVAL)
26915 + return 0;
26916 +
26917 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
26918 for (i = 0; i < copied; i++) {
26919 switch (opcode[i]) {
26920 diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
26921 new file mode 100644
26922 index 0000000..5877189
26923 --- /dev/null
26924 +++ b/arch/x86/kernel/sys_i386_32.c
26925 @@ -0,0 +1,189 @@
26926 +/*
26927 + * This file contains various random system calls that
26928 + * have a non-standard calling sequence on the Linux/i386
26929 + * platform.
26930 + */
26931 +
26932 +#include <linux/errno.h>
26933 +#include <linux/sched.h>
26934 +#include <linux/mm.h>
26935 +#include <linux/fs.h>
26936 +#include <linux/smp.h>
26937 +#include <linux/sem.h>
26938 +#include <linux/msg.h>
26939 +#include <linux/shm.h>
26940 +#include <linux/stat.h>
26941 +#include <linux/syscalls.h>
26942 +#include <linux/mman.h>
26943 +#include <linux/file.h>
26944 +#include <linux/utsname.h>
26945 +#include <linux/ipc.h>
26946 +#include <linux/elf.h>
26947 +
26948 +#include <linux/uaccess.h>
26949 +#include <linux/unistd.h>
26950 +
26951 +#include <asm/syscalls.h>
26952 +
26953 +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
26954 +{
26955 + unsigned long pax_task_size = TASK_SIZE;
26956 +
26957 +#ifdef CONFIG_PAX_SEGMEXEC
26958 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
26959 + pax_task_size = SEGMEXEC_TASK_SIZE;
26960 +#endif
26961 +
26962 + if (flags & MAP_FIXED)
26963 + if (len > pax_task_size || addr > pax_task_size - len)
26964 + return -EINVAL;
26965 +
26966 + return 0;
26967 +}
26968 +
26969 +/*
26970 + * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
26971 + */
26972 +static unsigned long get_align_mask(void)
26973 +{
26974 + if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
26975 + return 0;
26976 +
26977 + if (!(current->flags & PF_RANDOMIZE))
26978 + return 0;
26979 +
26980 + return va_align.mask;
26981 +}
26982 +
26983 +unsigned long
26984 +arch_get_unmapped_area(struct file *filp, unsigned long addr,
26985 + unsigned long len, unsigned long pgoff, unsigned long flags)
26986 +{
26987 + struct mm_struct *mm = current->mm;
26988 + struct vm_area_struct *vma;
26989 + unsigned long pax_task_size = TASK_SIZE;
26990 + struct vm_unmapped_area_info info;
26991 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
26992 +
26993 +#ifdef CONFIG_PAX_SEGMEXEC
26994 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
26995 + pax_task_size = SEGMEXEC_TASK_SIZE;
26996 +#endif
26997 +
26998 + pax_task_size -= PAGE_SIZE;
26999 +
27000 + if (len > pax_task_size)
27001 + return -ENOMEM;
27002 +
27003 + if (flags & MAP_FIXED)
27004 + return addr;
27005 +
27006 +#ifdef CONFIG_PAX_RANDMMAP
27007 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27008 +#endif
27009 +
27010 + if (addr) {
27011 + addr = PAGE_ALIGN(addr);
27012 + if (pax_task_size - len >= addr) {
27013 + vma = find_vma(mm, addr);
27014 + if (check_heap_stack_gap(vma, addr, len, offset))
27015 + return addr;
27016 + }
27017 + }
27018 +
27019 + info.flags = 0;
27020 + info.length = len;
27021 + info.align_mask = filp ? get_align_mask() : 0;
27022 + info.align_offset = pgoff << PAGE_SHIFT;
27023 + info.threadstack_offset = offset;
27024 +
27025 +#ifdef CONFIG_PAX_PAGEEXEC
27026 + if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27027 + info.low_limit = 0x00110000UL;
27028 + info.high_limit = mm->start_code;
27029 +
27030 +#ifdef CONFIG_PAX_RANDMMAP
27031 + if (mm->pax_flags & MF_PAX_RANDMMAP)
27032 + info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27033 +#endif
27034 +
27035 + if (info.low_limit < info.high_limit) {
27036 + addr = vm_unmapped_area(&info);
27037 + if (!IS_ERR_VALUE(addr))
27038 + return addr;
27039 + }
27040 + } else
27041 +#endif
27042 +
27043 + info.low_limit = mm->mmap_base;
27044 + info.high_limit = pax_task_size;
27045 +
27046 + return vm_unmapped_area(&info);
27047 +}
27048 +
27049 +unsigned long
27050 +arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27051 + const unsigned long len, const unsigned long pgoff,
27052 + const unsigned long flags)
27053 +{
27054 + struct vm_area_struct *vma;
27055 + struct mm_struct *mm = current->mm;
27056 + unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27057 + struct vm_unmapped_area_info info;
27058 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27059 +
27060 +#ifdef CONFIG_PAX_SEGMEXEC
27061 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
27062 + pax_task_size = SEGMEXEC_TASK_SIZE;
27063 +#endif
27064 +
27065 + pax_task_size -= PAGE_SIZE;
27066 +
27067 + /* requested length too big for entire address space */
27068 + if (len > pax_task_size)
27069 + return -ENOMEM;
27070 +
27071 + if (flags & MAP_FIXED)
27072 + return addr;
27073 +
27074 +#ifdef CONFIG_PAX_PAGEEXEC
27075 + if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27076 + goto bottomup;
27077 +#endif
27078 +
27079 +#ifdef CONFIG_PAX_RANDMMAP
27080 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27081 +#endif
27082 +
27083 + /* requesting a specific address */
27084 + if (addr) {
27085 + addr = PAGE_ALIGN(addr);
27086 + if (pax_task_size - len >= addr) {
27087 + vma = find_vma(mm, addr);
27088 + if (check_heap_stack_gap(vma, addr, len, offset))
27089 + return addr;
27090 + }
27091 + }
27092 +
27093 + info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27094 + info.length = len;
27095 + info.low_limit = PAGE_SIZE;
27096 + info.high_limit = mm->mmap_base;
27097 + info.align_mask = filp ? get_align_mask() : 0;
27098 + info.align_offset = pgoff << PAGE_SHIFT;
27099 + info.threadstack_offset = offset;
27100 +
27101 + addr = vm_unmapped_area(&info);
27102 + if (!(addr & ~PAGE_MASK))
27103 + return addr;
27104 + VM_BUG_ON(addr != -ENOMEM);
27105 +
27106 +bottomup:
27107 + /*
27108 + * A failed mmap() very likely causes application failure,
27109 + * so fall back to the bottom-up function here. This scenario
27110 + * can happen with large stack limits and large mmap()
27111 + * allocations.
27112 + */
27113 + return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27114 +}
27115 diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27116 index 30277e2..5664a29 100644
27117 --- a/arch/x86/kernel/sys_x86_64.c
27118 +++ b/arch/x86/kernel/sys_x86_64.c
27119 @@ -81,8 +81,8 @@ out:
27120 return error;
27121 }
27122
27123 -static void find_start_end(unsigned long flags, unsigned long *begin,
27124 - unsigned long *end)
27125 +static void find_start_end(struct mm_struct *mm, unsigned long flags,
27126 + unsigned long *begin, unsigned long *end)
27127 {
27128 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27129 unsigned long new_begin;
27130 @@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27131 *begin = new_begin;
27132 }
27133 } else {
27134 - *begin = current->mm->mmap_legacy_base;
27135 + *begin = mm->mmap_legacy_base;
27136 *end = TASK_SIZE;
27137 }
27138 }
27139 @@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27140 struct vm_area_struct *vma;
27141 struct vm_unmapped_area_info info;
27142 unsigned long begin, end;
27143 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27144
27145 if (flags & MAP_FIXED)
27146 return addr;
27147
27148 - find_start_end(flags, &begin, &end);
27149 + find_start_end(mm, flags, &begin, &end);
27150
27151 if (len > end)
27152 return -ENOMEM;
27153
27154 +#ifdef CONFIG_PAX_RANDMMAP
27155 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27156 +#endif
27157 +
27158 if (addr) {
27159 addr = PAGE_ALIGN(addr);
27160 vma = find_vma(mm, addr);
27161 - if (end - len >= addr &&
27162 - (!vma || addr + len <= vma->vm_start))
27163 + if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27164 return addr;
27165 }
27166
27167 @@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27168 info.high_limit = end;
27169 info.align_mask = filp ? get_align_mask() : 0;
27170 info.align_offset = pgoff << PAGE_SHIFT;
27171 + info.threadstack_offset = offset;
27172 return vm_unmapped_area(&info);
27173 }
27174
27175 @@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27176 struct mm_struct *mm = current->mm;
27177 unsigned long addr = addr0;
27178 struct vm_unmapped_area_info info;
27179 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27180
27181 /* requested length too big for entire address space */
27182 if (len > TASK_SIZE)
27183 @@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27184 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27185 goto bottomup;
27186
27187 +#ifdef CONFIG_PAX_RANDMMAP
27188 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27189 +#endif
27190 +
27191 /* requesting a specific address */
27192 if (addr) {
27193 addr = PAGE_ALIGN(addr);
27194 vma = find_vma(mm, addr);
27195 - if (TASK_SIZE - len >= addr &&
27196 - (!vma || addr + len <= vma->vm_start))
27197 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27198 return addr;
27199 }
27200
27201 @@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27202 info.high_limit = mm->mmap_base;
27203 info.align_mask = filp ? get_align_mask() : 0;
27204 info.align_offset = pgoff << PAGE_SHIFT;
27205 + info.threadstack_offset = offset;
27206 addr = vm_unmapped_area(&info);
27207 if (!(addr & ~PAGE_MASK))
27208 return addr;
27209 diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27210 index 91a4496..bb87552 100644
27211 --- a/arch/x86/kernel/tboot.c
27212 +++ b/arch/x86/kernel/tboot.c
27213 @@ -221,7 +221,7 @@ static int tboot_setup_sleep(void)
27214
27215 void tboot_shutdown(u32 shutdown_type)
27216 {
27217 - void (*shutdown)(void);
27218 + void (* __noreturn shutdown)(void);
27219
27220 if (!tboot_enabled())
27221 return;
27222 @@ -243,7 +243,7 @@ void tboot_shutdown(u32 shutdown_type)
27223
27224 switch_to_tboot_pt();
27225
27226 - shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27227 + shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27228 shutdown();
27229
27230 /* should not reach here */
27231 @@ -310,7 +310,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27232 return -ENODEV;
27233 }
27234
27235 -static atomic_t ap_wfs_count;
27236 +static atomic_unchecked_t ap_wfs_count;
27237
27238 static int tboot_wait_for_aps(int num_aps)
27239 {
27240 @@ -334,9 +334,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27241 {
27242 switch (action) {
27243 case CPU_DYING:
27244 - atomic_inc(&ap_wfs_count);
27245 + atomic_inc_unchecked(&ap_wfs_count);
27246 if (num_online_cpus() == 1)
27247 - if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27248 + if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27249 return NOTIFY_BAD;
27250 break;
27251 }
27252 @@ -422,7 +422,7 @@ static __init int tboot_late_init(void)
27253
27254 tboot_create_trampoline();
27255
27256 - atomic_set(&ap_wfs_count, 0);
27257 + atomic_set_unchecked(&ap_wfs_count, 0);
27258 register_hotcpu_notifier(&tboot_cpu_notifier);
27259
27260 #ifdef CONFIG_DEBUG_FS
27261 diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27262 index 24d3c91..d06b473 100644
27263 --- a/arch/x86/kernel/time.c
27264 +++ b/arch/x86/kernel/time.c
27265 @@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
27266 {
27267 unsigned long pc = instruction_pointer(regs);
27268
27269 - if (!user_mode_vm(regs) && in_lock_functions(pc)) {
27270 + if (!user_mode(regs) && in_lock_functions(pc)) {
27271 #ifdef CONFIG_FRAME_POINTER
27272 - return *(unsigned long *)(regs->bp + sizeof(long));
27273 + return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27274 #else
27275 unsigned long *sp =
27276 (unsigned long *)kernel_stack_pointer(regs);
27277 @@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27278 * or above a saved flags. Eflags has bits 22-31 zero,
27279 * kernel addresses don't.
27280 */
27281 +
27282 +#ifdef CONFIG_PAX_KERNEXEC
27283 + return ktla_ktva(sp[0]);
27284 +#else
27285 if (sp[0] >> 22)
27286 return sp[0];
27287 if (sp[1] >> 22)
27288 return sp[1];
27289 #endif
27290 +
27291 +#endif
27292 }
27293 return pc;
27294 }
27295 diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27296 index f7fec09..9991981 100644
27297 --- a/arch/x86/kernel/tls.c
27298 +++ b/arch/x86/kernel/tls.c
27299 @@ -84,6 +84,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27300 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27301 return -EINVAL;
27302
27303 +#ifdef CONFIG_PAX_SEGMEXEC
27304 + if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27305 + return -EINVAL;
27306 +#endif
27307 +
27308 set_tls_desc(p, idx, &info, 1);
27309
27310 return 0;
27311 @@ -200,7 +205,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27312
27313 if (kbuf)
27314 info = kbuf;
27315 - else if (__copy_from_user(infobuf, ubuf, count))
27316 + else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
27317 return -EFAULT;
27318 else
27319 info = infobuf;
27320 diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
27321 index 1c113db..287b42e 100644
27322 --- a/arch/x86/kernel/tracepoint.c
27323 +++ b/arch/x86/kernel/tracepoint.c
27324 @@ -9,11 +9,11 @@
27325 #include <linux/atomic.h>
27326
27327 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
27328 -struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27329 +const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27330 (unsigned long) trace_idt_table };
27331
27332 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27333 -gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
27334 +gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
27335
27336 static int trace_irq_vector_refcount;
27337 static DEFINE_MUTEX(irq_vector_mutex);
27338 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
27339 index 57409f6..e2c17e1 100644
27340 --- a/arch/x86/kernel/traps.c
27341 +++ b/arch/x86/kernel/traps.c
27342 @@ -66,7 +66,7 @@
27343 #include <asm/proto.h>
27344
27345 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27346 -gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
27347 +gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
27348 #else
27349 #include <asm/processor-flags.h>
27350 #include <asm/setup.h>
27351 @@ -75,7 +75,7 @@ asmlinkage int system_call(void);
27352 #endif
27353
27354 /* Must be page-aligned because the real IDT is used in a fixmap. */
27355 -gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
27356 +gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
27357
27358 DECLARE_BITMAP(used_vectors, NR_VECTORS);
27359 EXPORT_SYMBOL_GPL(used_vectors);
27360 @@ -107,11 +107,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
27361 }
27362
27363 static int __kprobes
27364 -do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27365 +do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
27366 struct pt_regs *regs, long error_code)
27367 {
27368 #ifdef CONFIG_X86_32
27369 - if (regs->flags & X86_VM_MASK) {
27370 + if (v8086_mode(regs)) {
27371 /*
27372 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
27373 * On nmi (interrupt 2), do_trap should not be called.
27374 @@ -124,12 +124,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27375 return -1;
27376 }
27377 #endif
27378 - if (!user_mode(regs)) {
27379 + if (!user_mode_novm(regs)) {
27380 if (!fixup_exception(regs)) {
27381 tsk->thread.error_code = error_code;
27382 tsk->thread.trap_nr = trapnr;
27383 +
27384 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27385 + if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
27386 + str = "PAX: suspicious stack segment fault";
27387 +#endif
27388 +
27389 die(str, regs, error_code);
27390 }
27391 +
27392 +#ifdef CONFIG_PAX_REFCOUNT
27393 + if (trapnr == X86_TRAP_OF)
27394 + pax_report_refcount_overflow(regs);
27395 +#endif
27396 +
27397 return 0;
27398 }
27399
27400 @@ -137,7 +149,7 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27401 }
27402
27403 static void __kprobes
27404 -do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27405 +do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
27406 long error_code, siginfo_t *info)
27407 {
27408 struct task_struct *tsk = current;
27409 @@ -161,7 +173,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27410 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
27411 printk_ratelimit()) {
27412 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
27413 - tsk->comm, tsk->pid, str,
27414 + tsk->comm, task_pid_nr(tsk), str,
27415 regs->ip, regs->sp, error_code);
27416 print_vma_addr(" in ", regs->ip);
27417 pr_cont("\n");
27418 @@ -273,7 +285,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
27419 conditional_sti(regs);
27420
27421 #ifdef CONFIG_X86_32
27422 - if (regs->flags & X86_VM_MASK) {
27423 + if (v8086_mode(regs)) {
27424 local_irq_enable();
27425 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
27426 goto exit;
27427 @@ -281,18 +293,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
27428 #endif
27429
27430 tsk = current;
27431 - if (!user_mode(regs)) {
27432 + if (!user_mode_novm(regs)) {
27433 if (fixup_exception(regs))
27434 goto exit;
27435
27436 tsk->thread.error_code = error_code;
27437 tsk->thread.trap_nr = X86_TRAP_GP;
27438 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
27439 - X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
27440 + X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
27441 +
27442 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27443 + if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
27444 + die("PAX: suspicious general protection fault", regs, error_code);
27445 + else
27446 +#endif
27447 +
27448 die("general protection fault", regs, error_code);
27449 + }
27450 goto exit;
27451 }
27452
27453 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
27454 + if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
27455 + struct mm_struct *mm = tsk->mm;
27456 + unsigned long limit;
27457 +
27458 + down_write(&mm->mmap_sem);
27459 + limit = mm->context.user_cs_limit;
27460 + if (limit < TASK_SIZE) {
27461 + track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
27462 + up_write(&mm->mmap_sem);
27463 + return;
27464 + }
27465 + up_write(&mm->mmap_sem);
27466 + }
27467 +#endif
27468 +
27469 tsk->thread.error_code = error_code;
27470 tsk->thread.trap_nr = X86_TRAP_GP;
27471
27472 @@ -453,7 +489,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
27473 /* It's safe to allow irq's after DR6 has been saved */
27474 preempt_conditional_sti(regs);
27475
27476 - if (regs->flags & X86_VM_MASK) {
27477 + if (v8086_mode(regs)) {
27478 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
27479 X86_TRAP_DB);
27480 preempt_conditional_cli(regs);
27481 @@ -468,7 +504,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
27482 * We already checked v86 mode above, so we can check for kernel mode
27483 * by just checking the CPL of CS.
27484 */
27485 - if ((dr6 & DR_STEP) && !user_mode(regs)) {
27486 + if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
27487 tsk->thread.debugreg6 &= ~DR_STEP;
27488 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
27489 regs->flags &= ~X86_EFLAGS_TF;
27490 @@ -500,7 +536,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
27491 return;
27492 conditional_sti(regs);
27493
27494 - if (!user_mode_vm(regs))
27495 + if (!user_mode(regs))
27496 {
27497 if (!fixup_exception(regs)) {
27498 task->thread.error_code = error_code;
27499 diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
27500 index cfbe99f..a6e8fa7 100644
27501 --- a/arch/x86/kernel/tsc.c
27502 +++ b/arch/x86/kernel/tsc.c
27503 @@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
27504 */
27505 smp_wmb();
27506
27507 - ACCESS_ONCE(c2n->head) = data;
27508 + ACCESS_ONCE_RW(c2n->head) = data;
27509 }
27510
27511 /*
27512 diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
27513 index 2ed8459..7cf329f 100644
27514 --- a/arch/x86/kernel/uprobes.c
27515 +++ b/arch/x86/kernel/uprobes.c
27516 @@ -629,7 +629,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
27517 int ret = NOTIFY_DONE;
27518
27519 /* We are only interested in userspace traps */
27520 - if (regs && !user_mode_vm(regs))
27521 + if (regs && !user_mode(regs))
27522 return NOTIFY_DONE;
27523
27524 switch (val) {
27525 @@ -719,7 +719,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
27526
27527 if (ncopied != rasize) {
27528 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
27529 - "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
27530 + "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
27531
27532 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
27533 }
27534 diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
27535 index b9242ba..50c5edd 100644
27536 --- a/arch/x86/kernel/verify_cpu.S
27537 +++ b/arch/x86/kernel/verify_cpu.S
27538 @@ -20,6 +20,7 @@
27539 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
27540 * arch/x86/kernel/trampoline_64.S: secondary processor verification
27541 * arch/x86/kernel/head_32.S: processor startup
27542 + * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
27543 *
27544 * verify_cpu, returns the status of longmode and SSE in register %eax.
27545 * 0: Success 1: Failure
27546 diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
27547 index e8edcf5..27f9344 100644
27548 --- a/arch/x86/kernel/vm86_32.c
27549 +++ b/arch/x86/kernel/vm86_32.c
27550 @@ -44,6 +44,7 @@
27551 #include <linux/ptrace.h>
27552 #include <linux/audit.h>
27553 #include <linux/stddef.h>
27554 +#include <linux/grsecurity.h>
27555
27556 #include <asm/uaccess.h>
27557 #include <asm/io.h>
27558 @@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
27559 do_exit(SIGSEGV);
27560 }
27561
27562 - tss = &per_cpu(init_tss, get_cpu());
27563 + tss = init_tss + get_cpu();
27564 current->thread.sp0 = current->thread.saved_sp0;
27565 current->thread.sysenter_cs = __KERNEL_CS;
27566 load_sp0(tss, &current->thread);
27567 @@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
27568
27569 if (tsk->thread.saved_sp0)
27570 return -EPERM;
27571 +
27572 +#ifdef CONFIG_GRKERNSEC_VM86
27573 + if (!capable(CAP_SYS_RAWIO)) {
27574 + gr_handle_vm86();
27575 + return -EPERM;
27576 + }
27577 +#endif
27578 +
27579 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
27580 offsetof(struct kernel_vm86_struct, vm86plus) -
27581 sizeof(info.regs));
27582 @@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
27583 int tmp;
27584 struct vm86plus_struct __user *v86;
27585
27586 +#ifdef CONFIG_GRKERNSEC_VM86
27587 + if (!capable(CAP_SYS_RAWIO)) {
27588 + gr_handle_vm86();
27589 + return -EPERM;
27590 + }
27591 +#endif
27592 +
27593 tsk = current;
27594 switch (cmd) {
27595 case VM86_REQUEST_IRQ:
27596 @@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
27597 tsk->thread.saved_fs = info->regs32->fs;
27598 tsk->thread.saved_gs = get_user_gs(info->regs32);
27599
27600 - tss = &per_cpu(init_tss, get_cpu());
27601 + tss = init_tss + get_cpu();
27602 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
27603 if (cpu_has_sep)
27604 tsk->thread.sysenter_cs = 0;
27605 @@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
27606 goto cannot_handle;
27607 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
27608 goto cannot_handle;
27609 - intr_ptr = (unsigned long __user *) (i << 2);
27610 + intr_ptr = (__force unsigned long __user *) (i << 2);
27611 if (get_user(segoffs, intr_ptr))
27612 goto cannot_handle;
27613 if ((segoffs >> 16) == BIOSSEG)
27614 diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
27615 index da6b35a..977e9cf 100644
27616 --- a/arch/x86/kernel/vmlinux.lds.S
27617 +++ b/arch/x86/kernel/vmlinux.lds.S
27618 @@ -26,6 +26,13 @@
27619 #include <asm/page_types.h>
27620 #include <asm/cache.h>
27621 #include <asm/boot.h>
27622 +#include <asm/segment.h>
27623 +
27624 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27625 +#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
27626 +#else
27627 +#define __KERNEL_TEXT_OFFSET 0
27628 +#endif
27629
27630 #undef i386 /* in case the preprocessor is a 32bit one */
27631
27632 @@ -69,30 +76,43 @@ jiffies_64 = jiffies;
27633
27634 PHDRS {
27635 text PT_LOAD FLAGS(5); /* R_E */
27636 +#ifdef CONFIG_X86_32
27637 + module PT_LOAD FLAGS(5); /* R_E */
27638 +#endif
27639 +#ifdef CONFIG_XEN
27640 + rodata PT_LOAD FLAGS(5); /* R_E */
27641 +#else
27642 + rodata PT_LOAD FLAGS(4); /* R__ */
27643 +#endif
27644 data PT_LOAD FLAGS(6); /* RW_ */
27645 -#ifdef CONFIG_X86_64
27646 + init.begin PT_LOAD FLAGS(6); /* RW_ */
27647 #ifdef CONFIG_SMP
27648 percpu PT_LOAD FLAGS(6); /* RW_ */
27649 #endif
27650 + text.init PT_LOAD FLAGS(5); /* R_E */
27651 + text.exit PT_LOAD FLAGS(5); /* R_E */
27652 init PT_LOAD FLAGS(7); /* RWE */
27653 -#endif
27654 note PT_NOTE FLAGS(0); /* ___ */
27655 }
27656
27657 SECTIONS
27658 {
27659 #ifdef CONFIG_X86_32
27660 - . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
27661 - phys_startup_32 = startup_32 - LOAD_OFFSET;
27662 + . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
27663 #else
27664 - . = __START_KERNEL;
27665 - phys_startup_64 = startup_64 - LOAD_OFFSET;
27666 + . = __START_KERNEL;
27667 #endif
27668
27669 /* Text and read-only data */
27670 - .text : AT(ADDR(.text) - LOAD_OFFSET) {
27671 - _text = .;
27672 + .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
27673 /* bootstrapping code */
27674 +#ifdef CONFIG_X86_32
27675 + phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
27676 +#else
27677 + phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
27678 +#endif
27679 + __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
27680 + _text = .;
27681 HEAD_TEXT
27682 . = ALIGN(8);
27683 _stext = .;
27684 @@ -104,13 +124,47 @@ SECTIONS
27685 IRQENTRY_TEXT
27686 *(.fixup)
27687 *(.gnu.warning)
27688 - /* End of text section */
27689 - _etext = .;
27690 } :text = 0x9090
27691
27692 - NOTES :text :note
27693 + . += __KERNEL_TEXT_OFFSET;
27694
27695 - EXCEPTION_TABLE(16) :text = 0x9090
27696 +#ifdef CONFIG_X86_32
27697 + . = ALIGN(PAGE_SIZE);
27698 + .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
27699 +
27700 +#ifdef CONFIG_PAX_KERNEXEC
27701 + MODULES_EXEC_VADDR = .;
27702 + BYTE(0)
27703 + . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
27704 + . = ALIGN(HPAGE_SIZE) - 1;
27705 + MODULES_EXEC_END = .;
27706 +#endif
27707 +
27708 + } :module
27709 +#endif
27710 +
27711 + .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
27712 + /* End of text section */
27713 + BYTE(0)
27714 + _etext = . - __KERNEL_TEXT_OFFSET;
27715 + }
27716 +
27717 +#ifdef CONFIG_X86_32
27718 + . = ALIGN(PAGE_SIZE);
27719 + .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
27720 + . = ALIGN(PAGE_SIZE);
27721 + *(.empty_zero_page)
27722 + *(.initial_pg_fixmap)
27723 + *(.initial_pg_pmd)
27724 + *(.initial_page_table)
27725 + *(.swapper_pg_dir)
27726 + } :rodata
27727 +#endif
27728 +
27729 + . = ALIGN(PAGE_SIZE);
27730 + NOTES :rodata :note
27731 +
27732 + EXCEPTION_TABLE(16) :rodata
27733
27734 #if defined(CONFIG_DEBUG_RODATA)
27735 /* .text should occupy whole number of pages */
27736 @@ -122,16 +176,20 @@ SECTIONS
27737
27738 /* Data */
27739 .data : AT(ADDR(.data) - LOAD_OFFSET) {
27740 +
27741 +#ifdef CONFIG_PAX_KERNEXEC
27742 + . = ALIGN(HPAGE_SIZE);
27743 +#else
27744 + . = ALIGN(PAGE_SIZE);
27745 +#endif
27746 +
27747 /* Start of data section */
27748 _sdata = .;
27749
27750 /* init_task */
27751 INIT_TASK_DATA(THREAD_SIZE)
27752
27753 -#ifdef CONFIG_X86_32
27754 - /* 32 bit has nosave before _edata */
27755 NOSAVE_DATA
27756 -#endif
27757
27758 PAGE_ALIGNED_DATA(PAGE_SIZE)
27759
27760 @@ -172,12 +230,19 @@ SECTIONS
27761 #endif /* CONFIG_X86_64 */
27762
27763 /* Init code and data - will be freed after init */
27764 - . = ALIGN(PAGE_SIZE);
27765 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
27766 + BYTE(0)
27767 +
27768 +#ifdef CONFIG_PAX_KERNEXEC
27769 + . = ALIGN(HPAGE_SIZE);
27770 +#else
27771 + . = ALIGN(PAGE_SIZE);
27772 +#endif
27773 +
27774 __init_begin = .; /* paired with __init_end */
27775 - }
27776 + } :init.begin
27777
27778 -#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
27779 +#ifdef CONFIG_SMP
27780 /*
27781 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
27782 * output PHDR, so the next output section - .init.text - should
27783 @@ -186,12 +251,27 @@ SECTIONS
27784 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
27785 #endif
27786
27787 - INIT_TEXT_SECTION(PAGE_SIZE)
27788 -#ifdef CONFIG_X86_64
27789 - :init
27790 -#endif
27791 + . = ALIGN(PAGE_SIZE);
27792 + init_begin = .;
27793 + .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
27794 + VMLINUX_SYMBOL(_sinittext) = .;
27795 + INIT_TEXT
27796 + VMLINUX_SYMBOL(_einittext) = .;
27797 + . = ALIGN(PAGE_SIZE);
27798 + } :text.init
27799
27800 - INIT_DATA_SECTION(16)
27801 + /*
27802 + * .exit.text is discard at runtime, not link time, to deal with
27803 + * references from .altinstructions and .eh_frame
27804 + */
27805 + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
27806 + EXIT_TEXT
27807 + . = ALIGN(16);
27808 + } :text.exit
27809 + . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
27810 +
27811 + . = ALIGN(PAGE_SIZE);
27812 + INIT_DATA_SECTION(16) :init
27813
27814 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
27815 __x86_cpu_dev_start = .;
27816 @@ -262,19 +342,12 @@ SECTIONS
27817 }
27818
27819 . = ALIGN(8);
27820 - /*
27821 - * .exit.text is discard at runtime, not link time, to deal with
27822 - * references from .altinstructions and .eh_frame
27823 - */
27824 - .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
27825 - EXIT_TEXT
27826 - }
27827
27828 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
27829 EXIT_DATA
27830 }
27831
27832 -#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
27833 +#ifndef CONFIG_SMP
27834 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
27835 #endif
27836
27837 @@ -293,16 +366,10 @@ SECTIONS
27838 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
27839 __smp_locks = .;
27840 *(.smp_locks)
27841 - . = ALIGN(PAGE_SIZE);
27842 __smp_locks_end = .;
27843 + . = ALIGN(PAGE_SIZE);
27844 }
27845
27846 -#ifdef CONFIG_X86_64
27847 - .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
27848 - NOSAVE_DATA
27849 - }
27850 -#endif
27851 -
27852 /* BSS */
27853 . = ALIGN(PAGE_SIZE);
27854 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
27855 @@ -318,6 +385,7 @@ SECTIONS
27856 __brk_base = .;
27857 . += 64 * 1024; /* 64k alignment slop space */
27858 *(.brk_reservation) /* areas brk users have reserved */
27859 + . = ALIGN(HPAGE_SIZE);
27860 __brk_limit = .;
27861 }
27862
27863 @@ -344,13 +412,12 @@ SECTIONS
27864 * for the boot processor.
27865 */
27866 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
27867 -INIT_PER_CPU(gdt_page);
27868 INIT_PER_CPU(irq_stack_union);
27869
27870 /*
27871 * Build-time check on the image size:
27872 */
27873 -. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
27874 +. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
27875 "kernel image bigger than KERNEL_IMAGE_SIZE");
27876
27877 #ifdef CONFIG_SMP
27878 diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
27879 index 1f96f93..d5c8f7a 100644
27880 --- a/arch/x86/kernel/vsyscall_64.c
27881 +++ b/arch/x86/kernel/vsyscall_64.c
27882 @@ -56,15 +56,13 @@
27883 DEFINE_VVAR(int, vgetcpu_mode);
27884 DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data);
27885
27886 -static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
27887 +static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
27888
27889 static int __init vsyscall_setup(char *str)
27890 {
27891 if (str) {
27892 if (!strcmp("emulate", str))
27893 vsyscall_mode = EMULATE;
27894 - else if (!strcmp("native", str))
27895 - vsyscall_mode = NATIVE;
27896 else if (!strcmp("none", str))
27897 vsyscall_mode = NONE;
27898 else
27899 @@ -323,8 +321,7 @@ do_ret:
27900 return true;
27901
27902 sigsegv:
27903 - force_sig(SIGSEGV, current);
27904 - return true;
27905 + do_group_exit(SIGKILL);
27906 }
27907
27908 /*
27909 @@ -377,10 +374,7 @@ void __init map_vsyscall(void)
27910 extern char __vvar_page;
27911 unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
27912
27913 - __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall,
27914 - vsyscall_mode == NATIVE
27915 - ? PAGE_KERNEL_VSYSCALL
27916 - : PAGE_KERNEL_VVAR);
27917 + __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
27918 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
27919 (unsigned long)VSYSCALL_START);
27920
27921 diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
27922 index 04068192..4d75aa6 100644
27923 --- a/arch/x86/kernel/x8664_ksyms_64.c
27924 +++ b/arch/x86/kernel/x8664_ksyms_64.c
27925 @@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
27926 EXPORT_SYMBOL(copy_user_generic_unrolled);
27927 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
27928 EXPORT_SYMBOL(__copy_user_nocache);
27929 -EXPORT_SYMBOL(_copy_from_user);
27930 -EXPORT_SYMBOL(_copy_to_user);
27931
27932 EXPORT_SYMBOL(copy_page);
27933 EXPORT_SYMBOL(clear_page);
27934 @@ -73,3 +71,7 @@ EXPORT_SYMBOL(___preempt_schedule);
27935 EXPORT_SYMBOL(___preempt_schedule_context);
27936 #endif
27937 #endif
27938 +
27939 +#ifdef CONFIG_PAX_PER_CPU_PGD
27940 +EXPORT_SYMBOL(cpu_pgd);
27941 +#endif
27942 diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
27943 index e48b674..a451dd9 100644
27944 --- a/arch/x86/kernel/x86_init.c
27945 +++ b/arch/x86/kernel/x86_init.c
27946 @@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
27947 static void default_nmi_init(void) { };
27948 static int default_i8042_detect(void) { return 1; };
27949
27950 -struct x86_platform_ops x86_platform = {
27951 +struct x86_platform_ops x86_platform __read_only = {
27952 .calibrate_tsc = native_calibrate_tsc,
27953 .get_wallclock = mach_get_cmos_time,
27954 .set_wallclock = mach_set_rtc_mmss,
27955 @@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
27956 EXPORT_SYMBOL_GPL(x86_platform);
27957
27958 #if defined(CONFIG_PCI_MSI)
27959 -struct x86_msi_ops x86_msi = {
27960 +struct x86_msi_ops x86_msi __read_only = {
27961 .setup_msi_irqs = native_setup_msi_irqs,
27962 .compose_msi_msg = native_compose_msi_msg,
27963 .teardown_msi_irq = native_teardown_msi_irq,
27964 @@ -150,7 +150,7 @@ u32 arch_msix_mask_irq(struct msi_desc *desc, u32 flag)
27965 }
27966 #endif
27967
27968 -struct x86_io_apic_ops x86_io_apic_ops = {
27969 +struct x86_io_apic_ops x86_io_apic_ops __read_only = {
27970 .init = native_io_apic_init_mappings,
27971 .read = native_io_apic_read,
27972 .write = native_io_apic_write,
27973 diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
27974 index a4b451c..8dfe1ad 100644
27975 --- a/arch/x86/kernel/xsave.c
27976 +++ b/arch/x86/kernel/xsave.c
27977 @@ -164,18 +164,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
27978
27979 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
27980 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
27981 - err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
27982 + err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
27983
27984 if (!use_xsave())
27985 return err;
27986
27987 - err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
27988 + err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
27989
27990 /*
27991 * Read the xstate_bv which we copied (directly from the cpu or
27992 * from the state in task struct) to the user buffers.
27993 */
27994 - err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
27995 + err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
27996
27997 /*
27998 * For legacy compatible, we always set FP/SSE bits in the bit
27999 @@ -190,7 +190,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28000 */
28001 xstate_bv |= XSTATE_FPSSE;
28002
28003 - err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28004 + err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28005
28006 return err;
28007 }
28008 @@ -199,6 +199,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28009 {
28010 int err;
28011
28012 + buf = (struct xsave_struct __user *)____m(buf);
28013 if (use_xsave())
28014 err = xsave_user(buf);
28015 else if (use_fxsr())
28016 @@ -311,6 +312,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28017 */
28018 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28019 {
28020 + buf = (void __user *)____m(buf);
28021 if (use_xsave()) {
28022 if ((unsigned long)buf % 64 || fx_only) {
28023 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28024 diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28025 index c697625..a032162 100644
28026 --- a/arch/x86/kvm/cpuid.c
28027 +++ b/arch/x86/kvm/cpuid.c
28028 @@ -156,15 +156,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28029 struct kvm_cpuid2 *cpuid,
28030 struct kvm_cpuid_entry2 __user *entries)
28031 {
28032 - int r;
28033 + int r, i;
28034
28035 r = -E2BIG;
28036 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28037 goto out;
28038 r = -EFAULT;
28039 - if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28040 - cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28041 + if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28042 goto out;
28043 + for (i = 0; i < cpuid->nent; ++i) {
28044 + struct kvm_cpuid_entry2 cpuid_entry;
28045 + if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28046 + goto out;
28047 + vcpu->arch.cpuid_entries[i] = cpuid_entry;
28048 + }
28049 vcpu->arch.cpuid_nent = cpuid->nent;
28050 kvm_apic_set_version(vcpu);
28051 kvm_x86_ops->cpuid_update(vcpu);
28052 @@ -179,15 +184,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28053 struct kvm_cpuid2 *cpuid,
28054 struct kvm_cpuid_entry2 __user *entries)
28055 {
28056 - int r;
28057 + int r, i;
28058
28059 r = -E2BIG;
28060 if (cpuid->nent < vcpu->arch.cpuid_nent)
28061 goto out;
28062 r = -EFAULT;
28063 - if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28064 - vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28065 + if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28066 goto out;
28067 + for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28068 + struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28069 + if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28070 + goto out;
28071 + }
28072 return 0;
28073
28074 out:
28075 diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28076 index 9736529..ab4f54c 100644
28077 --- a/arch/x86/kvm/lapic.c
28078 +++ b/arch/x86/kvm/lapic.c
28079 @@ -55,7 +55,7 @@
28080 #define APIC_BUS_CYCLE_NS 1
28081
28082 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28083 -#define apic_debug(fmt, arg...)
28084 +#define apic_debug(fmt, arg...) do {} while (0)
28085
28086 #define APIC_LVT_NUM 6
28087 /* 14 is the version for Xeon and Pentium 8.4.8*/
28088 diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28089 index cba218a..1cc1bed 100644
28090 --- a/arch/x86/kvm/paging_tmpl.h
28091 +++ b/arch/x86/kvm/paging_tmpl.h
28092 @@ -331,7 +331,7 @@ retry_walk:
28093 if (unlikely(kvm_is_error_hva(host_addr)))
28094 goto error;
28095
28096 - ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28097 + ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28098 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28099 goto error;
28100 walker->ptep_user[walker->level - 1] = ptep_user;
28101 diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28102 index 2de1bc0..22251ee 100644
28103 --- a/arch/x86/kvm/svm.c
28104 +++ b/arch/x86/kvm/svm.c
28105 @@ -3508,7 +3508,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28106 int cpu = raw_smp_processor_id();
28107
28108 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28109 +
28110 + pax_open_kernel();
28111 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28112 + pax_close_kernel();
28113 +
28114 load_TR_desc();
28115 }
28116
28117 @@ -3911,6 +3915,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28118 #endif
28119 #endif
28120
28121 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28122 + __set_fs(current_thread_info()->addr_limit);
28123 +#endif
28124 +
28125 reload_tss(vcpu);
28126
28127 local_irq_disable();
28128 diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28129 index 3927528..fc19971 100644
28130 --- a/arch/x86/kvm/vmx.c
28131 +++ b/arch/x86/kvm/vmx.c
28132 @@ -1320,12 +1320,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28133 #endif
28134 }
28135
28136 -static void vmcs_clear_bits(unsigned long field, u32 mask)
28137 +static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28138 {
28139 vmcs_writel(field, vmcs_readl(field) & ~mask);
28140 }
28141
28142 -static void vmcs_set_bits(unsigned long field, u32 mask)
28143 +static void vmcs_set_bits(unsigned long field, unsigned long mask)
28144 {
28145 vmcs_writel(field, vmcs_readl(field) | mask);
28146 }
28147 @@ -1585,7 +1585,11 @@ static void reload_tss(void)
28148 struct desc_struct *descs;
28149
28150 descs = (void *)gdt->address;
28151 +
28152 + pax_open_kernel();
28153 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28154 + pax_close_kernel();
28155 +
28156 load_TR_desc();
28157 }
28158
28159 @@ -1809,6 +1813,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28160 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28161 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28162
28163 +#ifdef CONFIG_PAX_PER_CPU_PGD
28164 + vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28165 +#endif
28166 +
28167 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28168 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28169 vmx->loaded_vmcs->cpu = cpu;
28170 @@ -2098,7 +2106,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28171 * reads and returns guest's timestamp counter "register"
28172 * guest_tsc = host_tsc + tsc_offset -- 21.3
28173 */
28174 -static u64 guest_read_tsc(void)
28175 +static u64 __intentional_overflow(-1) guest_read_tsc(void)
28176 {
28177 u64 host_tsc, tsc_offset;
28178
28179 @@ -3024,8 +3032,11 @@ static __init int hardware_setup(void)
28180 if (!cpu_has_vmx_flexpriority())
28181 flexpriority_enabled = 0;
28182
28183 - if (!cpu_has_vmx_tpr_shadow())
28184 - kvm_x86_ops->update_cr8_intercept = NULL;
28185 + if (!cpu_has_vmx_tpr_shadow()) {
28186 + pax_open_kernel();
28187 + *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28188 + pax_close_kernel();
28189 + }
28190
28191 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28192 kvm_disable_largepages();
28193 @@ -3036,13 +3047,15 @@ static __init int hardware_setup(void)
28194 if (!cpu_has_vmx_apicv())
28195 enable_apicv = 0;
28196
28197 + pax_open_kernel();
28198 if (enable_apicv)
28199 - kvm_x86_ops->update_cr8_intercept = NULL;
28200 + *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28201 else {
28202 - kvm_x86_ops->hwapic_irr_update = NULL;
28203 - kvm_x86_ops->deliver_posted_interrupt = NULL;
28204 - kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28205 + *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
28206 + *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
28207 + *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28208 }
28209 + pax_close_kernel();
28210
28211 if (nested)
28212 nested_vmx_setup_ctls_msrs();
28213 @@ -4165,7 +4178,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28214
28215 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28216 vmcs_writel(HOST_CR4, read_cr4()); /* 22.2.3, 22.2.5 */
28217 +
28218 +#ifndef CONFIG_PAX_PER_CPU_PGD
28219 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28220 +#endif
28221
28222 vmcs_write16(HOST_CS_SELECTOR, __KERNEL_CS); /* 22.2.4 */
28223 #ifdef CONFIG_X86_64
28224 @@ -4187,7 +4203,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28225 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28226 vmx->host_idt_base = dt.address;
28227
28228 - vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28229 + vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28230
28231 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28232 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28233 @@ -7265,6 +7281,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28234 "jmp 2f \n\t"
28235 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
28236 "2: "
28237 +
28238 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28239 + "ljmp %[cs],$3f\n\t"
28240 + "3: "
28241 +#endif
28242 +
28243 /* Save guest registers, load host registers, keep flags */
28244 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
28245 "pop %0 \n\t"
28246 @@ -7317,6 +7339,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28247 #endif
28248 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
28249 [wordsize]"i"(sizeof(ulong))
28250 +
28251 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28252 + ,[cs]"i"(__KERNEL_CS)
28253 +#endif
28254 +
28255 : "cc", "memory"
28256 #ifdef CONFIG_X86_64
28257 , "rax", "rbx", "rdi", "rsi"
28258 @@ -7330,7 +7357,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28259 if (debugctlmsr)
28260 update_debugctlmsr(debugctlmsr);
28261
28262 -#ifndef CONFIG_X86_64
28263 +#ifdef CONFIG_X86_32
28264 /*
28265 * The sysexit path does not restore ds/es, so we must set them to
28266 * a reasonable value ourselves.
28267 @@ -7339,8 +7366,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28268 * may be executed in interrupt context, which saves and restore segments
28269 * around it, nullifying its effect.
28270 */
28271 - loadsegment(ds, __USER_DS);
28272 - loadsegment(es, __USER_DS);
28273 + loadsegment(ds, __KERNEL_DS);
28274 + loadsegment(es, __KERNEL_DS);
28275 + loadsegment(ss, __KERNEL_DS);
28276 +
28277 +#ifdef CONFIG_PAX_KERNEXEC
28278 + loadsegment(fs, __KERNEL_PERCPU);
28279 +#endif
28280 +
28281 +#ifdef CONFIG_PAX_MEMORY_UDEREF
28282 + __set_fs(current_thread_info()->addr_limit);
28283 +#endif
28284 +
28285 #endif
28286
28287 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
28288 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
28289 index 2b85784..ad70e19 100644
28290 --- a/arch/x86/kvm/x86.c
28291 +++ b/arch/x86/kvm/x86.c
28292 @@ -1777,8 +1777,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
28293 {
28294 struct kvm *kvm = vcpu->kvm;
28295 int lm = is_long_mode(vcpu);
28296 - u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28297 - : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28298 + u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28299 + : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28300 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
28301 : kvm->arch.xen_hvm_config.blob_size_32;
28302 u32 page_num = data & ~PAGE_MASK;
28303 @@ -2689,6 +2689,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
28304 if (n < msr_list.nmsrs)
28305 goto out;
28306 r = -EFAULT;
28307 + if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
28308 + goto out;
28309 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
28310 num_msrs_to_save * sizeof(u32)))
28311 goto out;
28312 @@ -5503,7 +5505,7 @@ static struct notifier_block pvclock_gtod_notifier = {
28313 };
28314 #endif
28315
28316 -int kvm_arch_init(void *opaque)
28317 +int kvm_arch_init(const void *opaque)
28318 {
28319 int r;
28320 struct kvm_x86_ops *ops = opaque;
28321 diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
28322 index ad1fb5f..fe30b66 100644
28323 --- a/arch/x86/lguest/boot.c
28324 +++ b/arch/x86/lguest/boot.c
28325 @@ -1206,9 +1206,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
28326 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
28327 * Launcher to reboot us.
28328 */
28329 -static void lguest_restart(char *reason)
28330 +static __noreturn void lguest_restart(char *reason)
28331 {
28332 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
28333 + BUG();
28334 }
28335
28336 /*G:050
28337 diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
28338 index 00933d5..3a64af9 100644
28339 --- a/arch/x86/lib/atomic64_386_32.S
28340 +++ b/arch/x86/lib/atomic64_386_32.S
28341 @@ -48,6 +48,10 @@ BEGIN(read)
28342 movl (v), %eax
28343 movl 4(v), %edx
28344 RET_ENDP
28345 +BEGIN(read_unchecked)
28346 + movl (v), %eax
28347 + movl 4(v), %edx
28348 +RET_ENDP
28349 #undef v
28350
28351 #define v %esi
28352 @@ -55,6 +59,10 @@ BEGIN(set)
28353 movl %ebx, (v)
28354 movl %ecx, 4(v)
28355 RET_ENDP
28356 +BEGIN(set_unchecked)
28357 + movl %ebx, (v)
28358 + movl %ecx, 4(v)
28359 +RET_ENDP
28360 #undef v
28361
28362 #define v %esi
28363 @@ -70,6 +78,20 @@ RET_ENDP
28364 BEGIN(add)
28365 addl %eax, (v)
28366 adcl %edx, 4(v)
28367 +
28368 +#ifdef CONFIG_PAX_REFCOUNT
28369 + jno 0f
28370 + subl %eax, (v)
28371 + sbbl %edx, 4(v)
28372 + int $4
28373 +0:
28374 + _ASM_EXTABLE(0b, 0b)
28375 +#endif
28376 +
28377 +RET_ENDP
28378 +BEGIN(add_unchecked)
28379 + addl %eax, (v)
28380 + adcl %edx, 4(v)
28381 RET_ENDP
28382 #undef v
28383
28384 @@ -77,6 +99,24 @@ RET_ENDP
28385 BEGIN(add_return)
28386 addl (v), %eax
28387 adcl 4(v), %edx
28388 +
28389 +#ifdef CONFIG_PAX_REFCOUNT
28390 + into
28391 +1234:
28392 + _ASM_EXTABLE(1234b, 2f)
28393 +#endif
28394 +
28395 + movl %eax, (v)
28396 + movl %edx, 4(v)
28397 +
28398 +#ifdef CONFIG_PAX_REFCOUNT
28399 +2:
28400 +#endif
28401 +
28402 +RET_ENDP
28403 +BEGIN(add_return_unchecked)
28404 + addl (v), %eax
28405 + adcl 4(v), %edx
28406 movl %eax, (v)
28407 movl %edx, 4(v)
28408 RET_ENDP
28409 @@ -86,6 +126,20 @@ RET_ENDP
28410 BEGIN(sub)
28411 subl %eax, (v)
28412 sbbl %edx, 4(v)
28413 +
28414 +#ifdef CONFIG_PAX_REFCOUNT
28415 + jno 0f
28416 + addl %eax, (v)
28417 + adcl %edx, 4(v)
28418 + int $4
28419 +0:
28420 + _ASM_EXTABLE(0b, 0b)
28421 +#endif
28422 +
28423 +RET_ENDP
28424 +BEGIN(sub_unchecked)
28425 + subl %eax, (v)
28426 + sbbl %edx, 4(v)
28427 RET_ENDP
28428 #undef v
28429
28430 @@ -96,6 +150,27 @@ BEGIN(sub_return)
28431 sbbl $0, %edx
28432 addl (v), %eax
28433 adcl 4(v), %edx
28434 +
28435 +#ifdef CONFIG_PAX_REFCOUNT
28436 + into
28437 +1234:
28438 + _ASM_EXTABLE(1234b, 2f)
28439 +#endif
28440 +
28441 + movl %eax, (v)
28442 + movl %edx, 4(v)
28443 +
28444 +#ifdef CONFIG_PAX_REFCOUNT
28445 +2:
28446 +#endif
28447 +
28448 +RET_ENDP
28449 +BEGIN(sub_return_unchecked)
28450 + negl %edx
28451 + negl %eax
28452 + sbbl $0, %edx
28453 + addl (v), %eax
28454 + adcl 4(v), %edx
28455 movl %eax, (v)
28456 movl %edx, 4(v)
28457 RET_ENDP
28458 @@ -105,6 +180,20 @@ RET_ENDP
28459 BEGIN(inc)
28460 addl $1, (v)
28461 adcl $0, 4(v)
28462 +
28463 +#ifdef CONFIG_PAX_REFCOUNT
28464 + jno 0f
28465 + subl $1, (v)
28466 + sbbl $0, 4(v)
28467 + int $4
28468 +0:
28469 + _ASM_EXTABLE(0b, 0b)
28470 +#endif
28471 +
28472 +RET_ENDP
28473 +BEGIN(inc_unchecked)
28474 + addl $1, (v)
28475 + adcl $0, 4(v)
28476 RET_ENDP
28477 #undef v
28478
28479 @@ -114,6 +203,26 @@ BEGIN(inc_return)
28480 movl 4(v), %edx
28481 addl $1, %eax
28482 adcl $0, %edx
28483 +
28484 +#ifdef CONFIG_PAX_REFCOUNT
28485 + into
28486 +1234:
28487 + _ASM_EXTABLE(1234b, 2f)
28488 +#endif
28489 +
28490 + movl %eax, (v)
28491 + movl %edx, 4(v)
28492 +
28493 +#ifdef CONFIG_PAX_REFCOUNT
28494 +2:
28495 +#endif
28496 +
28497 +RET_ENDP
28498 +BEGIN(inc_return_unchecked)
28499 + movl (v), %eax
28500 + movl 4(v), %edx
28501 + addl $1, %eax
28502 + adcl $0, %edx
28503 movl %eax, (v)
28504 movl %edx, 4(v)
28505 RET_ENDP
28506 @@ -123,6 +232,20 @@ RET_ENDP
28507 BEGIN(dec)
28508 subl $1, (v)
28509 sbbl $0, 4(v)
28510 +
28511 +#ifdef CONFIG_PAX_REFCOUNT
28512 + jno 0f
28513 + addl $1, (v)
28514 + adcl $0, 4(v)
28515 + int $4
28516 +0:
28517 + _ASM_EXTABLE(0b, 0b)
28518 +#endif
28519 +
28520 +RET_ENDP
28521 +BEGIN(dec_unchecked)
28522 + subl $1, (v)
28523 + sbbl $0, 4(v)
28524 RET_ENDP
28525 #undef v
28526
28527 @@ -132,6 +255,26 @@ BEGIN(dec_return)
28528 movl 4(v), %edx
28529 subl $1, %eax
28530 sbbl $0, %edx
28531 +
28532 +#ifdef CONFIG_PAX_REFCOUNT
28533 + into
28534 +1234:
28535 + _ASM_EXTABLE(1234b, 2f)
28536 +#endif
28537 +
28538 + movl %eax, (v)
28539 + movl %edx, 4(v)
28540 +
28541 +#ifdef CONFIG_PAX_REFCOUNT
28542 +2:
28543 +#endif
28544 +
28545 +RET_ENDP
28546 +BEGIN(dec_return_unchecked)
28547 + movl (v), %eax
28548 + movl 4(v), %edx
28549 + subl $1, %eax
28550 + sbbl $0, %edx
28551 movl %eax, (v)
28552 movl %edx, 4(v)
28553 RET_ENDP
28554 @@ -143,6 +286,13 @@ BEGIN(add_unless)
28555 adcl %edx, %edi
28556 addl (v), %eax
28557 adcl 4(v), %edx
28558 +
28559 +#ifdef CONFIG_PAX_REFCOUNT
28560 + into
28561 +1234:
28562 + _ASM_EXTABLE(1234b, 2f)
28563 +#endif
28564 +
28565 cmpl %eax, %ecx
28566 je 3f
28567 1:
28568 @@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
28569 1:
28570 addl $1, %eax
28571 adcl $0, %edx
28572 +
28573 +#ifdef CONFIG_PAX_REFCOUNT
28574 + into
28575 +1234:
28576 + _ASM_EXTABLE(1234b, 2f)
28577 +#endif
28578 +
28579 movl %eax, (v)
28580 movl %edx, 4(v)
28581 movl $1, %eax
28582 @@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
28583 movl 4(v), %edx
28584 subl $1, %eax
28585 sbbl $0, %edx
28586 +
28587 +#ifdef CONFIG_PAX_REFCOUNT
28588 + into
28589 +1234:
28590 + _ASM_EXTABLE(1234b, 1f)
28591 +#endif
28592 +
28593 js 1f
28594 movl %eax, (v)
28595 movl %edx, 4(v)
28596 diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
28597 index f5cc9eb..51fa319 100644
28598 --- a/arch/x86/lib/atomic64_cx8_32.S
28599 +++ b/arch/x86/lib/atomic64_cx8_32.S
28600 @@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
28601 CFI_STARTPROC
28602
28603 read64 %ecx
28604 + pax_force_retaddr
28605 ret
28606 CFI_ENDPROC
28607 ENDPROC(atomic64_read_cx8)
28608
28609 +ENTRY(atomic64_read_unchecked_cx8)
28610 + CFI_STARTPROC
28611 +
28612 + read64 %ecx
28613 + pax_force_retaddr
28614 + ret
28615 + CFI_ENDPROC
28616 +ENDPROC(atomic64_read_unchecked_cx8)
28617 +
28618 ENTRY(atomic64_set_cx8)
28619 CFI_STARTPROC
28620
28621 @@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
28622 cmpxchg8b (%esi)
28623 jne 1b
28624
28625 + pax_force_retaddr
28626 ret
28627 CFI_ENDPROC
28628 ENDPROC(atomic64_set_cx8)
28629
28630 +ENTRY(atomic64_set_unchecked_cx8)
28631 + CFI_STARTPROC
28632 +
28633 +1:
28634 +/* we don't need LOCK_PREFIX since aligned 64-bit writes
28635 + * are atomic on 586 and newer */
28636 + cmpxchg8b (%esi)
28637 + jne 1b
28638 +
28639 + pax_force_retaddr
28640 + ret
28641 + CFI_ENDPROC
28642 +ENDPROC(atomic64_set_unchecked_cx8)
28643 +
28644 ENTRY(atomic64_xchg_cx8)
28645 CFI_STARTPROC
28646
28647 @@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
28648 cmpxchg8b (%esi)
28649 jne 1b
28650
28651 + pax_force_retaddr
28652 ret
28653 CFI_ENDPROC
28654 ENDPROC(atomic64_xchg_cx8)
28655
28656 -.macro addsub_return func ins insc
28657 -ENTRY(atomic64_\func\()_return_cx8)
28658 +.macro addsub_return func ins insc unchecked=""
28659 +ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
28660 CFI_STARTPROC
28661 SAVE ebp
28662 SAVE ebx
28663 @@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
28664 movl %edx, %ecx
28665 \ins\()l %esi, %ebx
28666 \insc\()l %edi, %ecx
28667 +
28668 +.ifb \unchecked
28669 +#ifdef CONFIG_PAX_REFCOUNT
28670 + into
28671 +2:
28672 + _ASM_EXTABLE(2b, 3f)
28673 +#endif
28674 +.endif
28675 +
28676 LOCK_PREFIX
28677 cmpxchg8b (%ebp)
28678 jne 1b
28679 -
28680 -10:
28681 movl %ebx, %eax
28682 movl %ecx, %edx
28683 +
28684 +.ifb \unchecked
28685 +#ifdef CONFIG_PAX_REFCOUNT
28686 +3:
28687 +#endif
28688 +.endif
28689 +
28690 RESTORE edi
28691 RESTORE esi
28692 RESTORE ebx
28693 RESTORE ebp
28694 + pax_force_retaddr
28695 ret
28696 CFI_ENDPROC
28697 -ENDPROC(atomic64_\func\()_return_cx8)
28698 +ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
28699 .endm
28700
28701 addsub_return add add adc
28702 addsub_return sub sub sbb
28703 +addsub_return add add adc _unchecked
28704 +addsub_return sub sub sbb _unchecked
28705
28706 -.macro incdec_return func ins insc
28707 -ENTRY(atomic64_\func\()_return_cx8)
28708 +.macro incdec_return func ins insc unchecked=""
28709 +ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
28710 CFI_STARTPROC
28711 SAVE ebx
28712
28713 @@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
28714 movl %edx, %ecx
28715 \ins\()l $1, %ebx
28716 \insc\()l $0, %ecx
28717 +
28718 +.ifb \unchecked
28719 +#ifdef CONFIG_PAX_REFCOUNT
28720 + into
28721 +2:
28722 + _ASM_EXTABLE(2b, 3f)
28723 +#endif
28724 +.endif
28725 +
28726 LOCK_PREFIX
28727 cmpxchg8b (%esi)
28728 jne 1b
28729
28730 -10:
28731 movl %ebx, %eax
28732 movl %ecx, %edx
28733 +
28734 +.ifb \unchecked
28735 +#ifdef CONFIG_PAX_REFCOUNT
28736 +3:
28737 +#endif
28738 +.endif
28739 +
28740 RESTORE ebx
28741 + pax_force_retaddr
28742 ret
28743 CFI_ENDPROC
28744 -ENDPROC(atomic64_\func\()_return_cx8)
28745 +ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
28746 .endm
28747
28748 incdec_return inc add adc
28749 incdec_return dec sub sbb
28750 +incdec_return inc add adc _unchecked
28751 +incdec_return dec sub sbb _unchecked
28752
28753 ENTRY(atomic64_dec_if_positive_cx8)
28754 CFI_STARTPROC
28755 @@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
28756 movl %edx, %ecx
28757 subl $1, %ebx
28758 sbb $0, %ecx
28759 +
28760 +#ifdef CONFIG_PAX_REFCOUNT
28761 + into
28762 +1234:
28763 + _ASM_EXTABLE(1234b, 2f)
28764 +#endif
28765 +
28766 js 2f
28767 LOCK_PREFIX
28768 cmpxchg8b (%esi)
28769 @@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
28770 movl %ebx, %eax
28771 movl %ecx, %edx
28772 RESTORE ebx
28773 + pax_force_retaddr
28774 ret
28775 CFI_ENDPROC
28776 ENDPROC(atomic64_dec_if_positive_cx8)
28777 @@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
28778 movl %edx, %ecx
28779 addl %ebp, %ebx
28780 adcl %edi, %ecx
28781 +
28782 +#ifdef CONFIG_PAX_REFCOUNT
28783 + into
28784 +1234:
28785 + _ASM_EXTABLE(1234b, 3f)
28786 +#endif
28787 +
28788 LOCK_PREFIX
28789 cmpxchg8b (%esi)
28790 jne 1b
28791 @@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
28792 CFI_ADJUST_CFA_OFFSET -8
28793 RESTORE ebx
28794 RESTORE ebp
28795 + pax_force_retaddr
28796 ret
28797 4:
28798 cmpl %edx, 4(%esp)
28799 @@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
28800 xorl %ecx, %ecx
28801 addl $1, %ebx
28802 adcl %edx, %ecx
28803 +
28804 +#ifdef CONFIG_PAX_REFCOUNT
28805 + into
28806 +1234:
28807 + _ASM_EXTABLE(1234b, 3f)
28808 +#endif
28809 +
28810 LOCK_PREFIX
28811 cmpxchg8b (%esi)
28812 jne 1b
28813 @@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
28814 movl $1, %eax
28815 3:
28816 RESTORE ebx
28817 + pax_force_retaddr
28818 ret
28819 CFI_ENDPROC
28820 ENDPROC(atomic64_inc_not_zero_cx8)
28821 diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
28822 index e78b8ee..7e173a8 100644
28823 --- a/arch/x86/lib/checksum_32.S
28824 +++ b/arch/x86/lib/checksum_32.S
28825 @@ -29,7 +29,8 @@
28826 #include <asm/dwarf2.h>
28827 #include <asm/errno.h>
28828 #include <asm/asm.h>
28829 -
28830 +#include <asm/segment.h>
28831 +
28832 /*
28833 * computes a partial checksum, e.g. for TCP/UDP fragments
28834 */
28835 @@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
28836
28837 #define ARGBASE 16
28838 #define FP 12
28839 -
28840 -ENTRY(csum_partial_copy_generic)
28841 +
28842 +ENTRY(csum_partial_copy_generic_to_user)
28843 CFI_STARTPROC
28844 +
28845 +#ifdef CONFIG_PAX_MEMORY_UDEREF
28846 + pushl_cfi %gs
28847 + popl_cfi %es
28848 + jmp csum_partial_copy_generic
28849 +#endif
28850 +
28851 +ENTRY(csum_partial_copy_generic_from_user)
28852 +
28853 +#ifdef CONFIG_PAX_MEMORY_UDEREF
28854 + pushl_cfi %gs
28855 + popl_cfi %ds
28856 +#endif
28857 +
28858 +ENTRY(csum_partial_copy_generic)
28859 subl $4,%esp
28860 CFI_ADJUST_CFA_OFFSET 4
28861 pushl_cfi %edi
28862 @@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
28863 jmp 4f
28864 SRC(1: movw (%esi), %bx )
28865 addl $2, %esi
28866 -DST( movw %bx, (%edi) )
28867 +DST( movw %bx, %es:(%edi) )
28868 addl $2, %edi
28869 addw %bx, %ax
28870 adcl $0, %eax
28871 @@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
28872 SRC(1: movl (%esi), %ebx )
28873 SRC( movl 4(%esi), %edx )
28874 adcl %ebx, %eax
28875 -DST( movl %ebx, (%edi) )
28876 +DST( movl %ebx, %es:(%edi) )
28877 adcl %edx, %eax
28878 -DST( movl %edx, 4(%edi) )
28879 +DST( movl %edx, %es:4(%edi) )
28880
28881 SRC( movl 8(%esi), %ebx )
28882 SRC( movl 12(%esi), %edx )
28883 adcl %ebx, %eax
28884 -DST( movl %ebx, 8(%edi) )
28885 +DST( movl %ebx, %es:8(%edi) )
28886 adcl %edx, %eax
28887 -DST( movl %edx, 12(%edi) )
28888 +DST( movl %edx, %es:12(%edi) )
28889
28890 SRC( movl 16(%esi), %ebx )
28891 SRC( movl 20(%esi), %edx )
28892 adcl %ebx, %eax
28893 -DST( movl %ebx, 16(%edi) )
28894 +DST( movl %ebx, %es:16(%edi) )
28895 adcl %edx, %eax
28896 -DST( movl %edx, 20(%edi) )
28897 +DST( movl %edx, %es:20(%edi) )
28898
28899 SRC( movl 24(%esi), %ebx )
28900 SRC( movl 28(%esi), %edx )
28901 adcl %ebx, %eax
28902 -DST( movl %ebx, 24(%edi) )
28903 +DST( movl %ebx, %es:24(%edi) )
28904 adcl %edx, %eax
28905 -DST( movl %edx, 28(%edi) )
28906 +DST( movl %edx, %es:28(%edi) )
28907
28908 lea 32(%esi), %esi
28909 lea 32(%edi), %edi
28910 @@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
28911 shrl $2, %edx # This clears CF
28912 SRC(3: movl (%esi), %ebx )
28913 adcl %ebx, %eax
28914 -DST( movl %ebx, (%edi) )
28915 +DST( movl %ebx, %es:(%edi) )
28916 lea 4(%esi), %esi
28917 lea 4(%edi), %edi
28918 dec %edx
28919 @@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
28920 jb 5f
28921 SRC( movw (%esi), %cx )
28922 leal 2(%esi), %esi
28923 -DST( movw %cx, (%edi) )
28924 +DST( movw %cx, %es:(%edi) )
28925 leal 2(%edi), %edi
28926 je 6f
28927 shll $16,%ecx
28928 SRC(5: movb (%esi), %cl )
28929 -DST( movb %cl, (%edi) )
28930 +DST( movb %cl, %es:(%edi) )
28931 6: addl %ecx, %eax
28932 adcl $0, %eax
28933 7:
28934 @@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
28935
28936 6001:
28937 movl ARGBASE+20(%esp), %ebx # src_err_ptr
28938 - movl $-EFAULT, (%ebx)
28939 + movl $-EFAULT, %ss:(%ebx)
28940
28941 # zero the complete destination - computing the rest
28942 # is too much work
28943 @@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
28944
28945 6002:
28946 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
28947 - movl $-EFAULT,(%ebx)
28948 + movl $-EFAULT,%ss:(%ebx)
28949 jmp 5000b
28950
28951 .previous
28952
28953 + pushl_cfi %ss
28954 + popl_cfi %ds
28955 + pushl_cfi %ss
28956 + popl_cfi %es
28957 popl_cfi %ebx
28958 CFI_RESTORE ebx
28959 popl_cfi %esi
28960 @@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
28961 popl_cfi %ecx # equivalent to addl $4,%esp
28962 ret
28963 CFI_ENDPROC
28964 -ENDPROC(csum_partial_copy_generic)
28965 +ENDPROC(csum_partial_copy_generic_to_user)
28966
28967 #else
28968
28969 /* Version for PentiumII/PPro */
28970
28971 #define ROUND1(x) \
28972 + nop; nop; nop; \
28973 SRC(movl x(%esi), %ebx ) ; \
28974 addl %ebx, %eax ; \
28975 - DST(movl %ebx, x(%edi) ) ;
28976 + DST(movl %ebx, %es:x(%edi)) ;
28977
28978 #define ROUND(x) \
28979 + nop; nop; nop; \
28980 SRC(movl x(%esi), %ebx ) ; \
28981 adcl %ebx, %eax ; \
28982 - DST(movl %ebx, x(%edi) ) ;
28983 + DST(movl %ebx, %es:x(%edi)) ;
28984
28985 #define ARGBASE 12
28986 -
28987 -ENTRY(csum_partial_copy_generic)
28988 +
28989 +ENTRY(csum_partial_copy_generic_to_user)
28990 CFI_STARTPROC
28991 +
28992 +#ifdef CONFIG_PAX_MEMORY_UDEREF
28993 + pushl_cfi %gs
28994 + popl_cfi %es
28995 + jmp csum_partial_copy_generic
28996 +#endif
28997 +
28998 +ENTRY(csum_partial_copy_generic_from_user)
28999 +
29000 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29001 + pushl_cfi %gs
29002 + popl_cfi %ds
29003 +#endif
29004 +
29005 +ENTRY(csum_partial_copy_generic)
29006 pushl_cfi %ebx
29007 CFI_REL_OFFSET ebx, 0
29008 pushl_cfi %edi
29009 @@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
29010 subl %ebx, %edi
29011 lea -1(%esi),%edx
29012 andl $-32,%edx
29013 - lea 3f(%ebx,%ebx), %ebx
29014 + lea 3f(%ebx,%ebx,2), %ebx
29015 testl %esi, %esi
29016 jmp *%ebx
29017 1: addl $64,%esi
29018 @@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
29019 jb 5f
29020 SRC( movw (%esi), %dx )
29021 leal 2(%esi), %esi
29022 -DST( movw %dx, (%edi) )
29023 +DST( movw %dx, %es:(%edi) )
29024 leal 2(%edi), %edi
29025 je 6f
29026 shll $16,%edx
29027 5:
29028 SRC( movb (%esi), %dl )
29029 -DST( movb %dl, (%edi) )
29030 +DST( movb %dl, %es:(%edi) )
29031 6: addl %edx, %eax
29032 adcl $0, %eax
29033 7:
29034 .section .fixup, "ax"
29035 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29036 - movl $-EFAULT, (%ebx)
29037 + movl $-EFAULT, %ss:(%ebx)
29038 # zero the complete destination (computing the rest is too much work)
29039 movl ARGBASE+8(%esp),%edi # dst
29040 movl ARGBASE+12(%esp),%ecx # len
29041 @@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
29042 rep; stosb
29043 jmp 7b
29044 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29045 - movl $-EFAULT, (%ebx)
29046 + movl $-EFAULT, %ss:(%ebx)
29047 jmp 7b
29048 .previous
29049
29050 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29051 + pushl_cfi %ss
29052 + popl_cfi %ds
29053 + pushl_cfi %ss
29054 + popl_cfi %es
29055 +#endif
29056 +
29057 popl_cfi %esi
29058 CFI_RESTORE esi
29059 popl_cfi %edi
29060 @@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
29061 CFI_RESTORE ebx
29062 ret
29063 CFI_ENDPROC
29064 -ENDPROC(csum_partial_copy_generic)
29065 +ENDPROC(csum_partial_copy_generic_to_user)
29066
29067 #undef ROUND
29068 #undef ROUND1
29069 diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29070 index f2145cf..cea889d 100644
29071 --- a/arch/x86/lib/clear_page_64.S
29072 +++ b/arch/x86/lib/clear_page_64.S
29073 @@ -11,6 +11,7 @@ ENTRY(clear_page_c)
29074 movl $4096/8,%ecx
29075 xorl %eax,%eax
29076 rep stosq
29077 + pax_force_retaddr
29078 ret
29079 CFI_ENDPROC
29080 ENDPROC(clear_page_c)
29081 @@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
29082 movl $4096,%ecx
29083 xorl %eax,%eax
29084 rep stosb
29085 + pax_force_retaddr
29086 ret
29087 CFI_ENDPROC
29088 ENDPROC(clear_page_c_e)
29089 @@ -43,6 +45,7 @@ ENTRY(clear_page)
29090 leaq 64(%rdi),%rdi
29091 jnz .Lloop
29092 nop
29093 + pax_force_retaddr
29094 ret
29095 CFI_ENDPROC
29096 .Lclear_page_end:
29097 @@ -58,7 +61,7 @@ ENDPROC(clear_page)
29098
29099 #include <asm/cpufeature.h>
29100
29101 - .section .altinstr_replacement,"ax"
29102 + .section .altinstr_replacement,"a"
29103 1: .byte 0xeb /* jmp <disp8> */
29104 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
29105 2: .byte 0xeb /* jmp <disp8> */
29106 diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29107 index 1e572c5..2a162cd 100644
29108 --- a/arch/x86/lib/cmpxchg16b_emu.S
29109 +++ b/arch/x86/lib/cmpxchg16b_emu.S
29110 @@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
29111
29112 popf
29113 mov $1, %al
29114 + pax_force_retaddr
29115 ret
29116
29117 not_same:
29118 popf
29119 xor %al,%al
29120 + pax_force_retaddr
29121 ret
29122
29123 CFI_ENDPROC
29124 diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29125 index 176cca6..e0d658e 100644
29126 --- a/arch/x86/lib/copy_page_64.S
29127 +++ b/arch/x86/lib/copy_page_64.S
29128 @@ -9,6 +9,7 @@ copy_page_rep:
29129 CFI_STARTPROC
29130 movl $4096/8, %ecx
29131 rep movsq
29132 + pax_force_retaddr
29133 ret
29134 CFI_ENDPROC
29135 ENDPROC(copy_page_rep)
29136 @@ -24,8 +25,8 @@ ENTRY(copy_page)
29137 CFI_ADJUST_CFA_OFFSET 2*8
29138 movq %rbx, (%rsp)
29139 CFI_REL_OFFSET rbx, 0
29140 - movq %r12, 1*8(%rsp)
29141 - CFI_REL_OFFSET r12, 1*8
29142 + movq %r13, 1*8(%rsp)
29143 + CFI_REL_OFFSET r13, 1*8
29144
29145 movl $(4096/64)-5, %ecx
29146 .p2align 4
29147 @@ -38,7 +39,7 @@ ENTRY(copy_page)
29148 movq 0x8*4(%rsi), %r9
29149 movq 0x8*5(%rsi), %r10
29150 movq 0x8*6(%rsi), %r11
29151 - movq 0x8*7(%rsi), %r12
29152 + movq 0x8*7(%rsi), %r13
29153
29154 prefetcht0 5*64(%rsi)
29155
29156 @@ -49,7 +50,7 @@ ENTRY(copy_page)
29157 movq %r9, 0x8*4(%rdi)
29158 movq %r10, 0x8*5(%rdi)
29159 movq %r11, 0x8*6(%rdi)
29160 - movq %r12, 0x8*7(%rdi)
29161 + movq %r13, 0x8*7(%rdi)
29162
29163 leaq 64 (%rsi), %rsi
29164 leaq 64 (%rdi), %rdi
29165 @@ -68,7 +69,7 @@ ENTRY(copy_page)
29166 movq 0x8*4(%rsi), %r9
29167 movq 0x8*5(%rsi), %r10
29168 movq 0x8*6(%rsi), %r11
29169 - movq 0x8*7(%rsi), %r12
29170 + movq 0x8*7(%rsi), %r13
29171
29172 movq %rax, 0x8*0(%rdi)
29173 movq %rbx, 0x8*1(%rdi)
29174 @@ -77,7 +78,7 @@ ENTRY(copy_page)
29175 movq %r9, 0x8*4(%rdi)
29176 movq %r10, 0x8*5(%rdi)
29177 movq %r11, 0x8*6(%rdi)
29178 - movq %r12, 0x8*7(%rdi)
29179 + movq %r13, 0x8*7(%rdi)
29180
29181 leaq 64(%rdi), %rdi
29182 leaq 64(%rsi), %rsi
29183 @@ -85,10 +86,11 @@ ENTRY(copy_page)
29184
29185 movq (%rsp), %rbx
29186 CFI_RESTORE rbx
29187 - movq 1*8(%rsp), %r12
29188 - CFI_RESTORE r12
29189 + movq 1*8(%rsp), %r13
29190 + CFI_RESTORE r13
29191 addq $2*8, %rsp
29192 CFI_ADJUST_CFA_OFFSET -2*8
29193 + pax_force_retaddr
29194 ret
29195 .Lcopy_page_end:
29196 CFI_ENDPROC
29197 @@ -99,7 +101,7 @@ ENDPROC(copy_page)
29198
29199 #include <asm/cpufeature.h>
29200
29201 - .section .altinstr_replacement,"ax"
29202 + .section .altinstr_replacement,"a"
29203 1: .byte 0xeb /* jmp <disp8> */
29204 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
29205 2:
29206 diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
29207 index dee945d..a84067b 100644
29208 --- a/arch/x86/lib/copy_user_64.S
29209 +++ b/arch/x86/lib/copy_user_64.S
29210 @@ -18,31 +18,7 @@
29211 #include <asm/alternative-asm.h>
29212 #include <asm/asm.h>
29213 #include <asm/smap.h>
29214 -
29215 -/*
29216 - * By placing feature2 after feature1 in altinstructions section, we logically
29217 - * implement:
29218 - * If CPU has feature2, jmp to alt2 is used
29219 - * else if CPU has feature1, jmp to alt1 is used
29220 - * else jmp to orig is used.
29221 - */
29222 - .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
29223 -0:
29224 - .byte 0xe9 /* 32bit jump */
29225 - .long \orig-1f /* by default jump to orig */
29226 -1:
29227 - .section .altinstr_replacement,"ax"
29228 -2: .byte 0xe9 /* near jump with 32bit immediate */
29229 - .long \alt1-1b /* offset */ /* or alternatively to alt1 */
29230 -3: .byte 0xe9 /* near jump with 32bit immediate */
29231 - .long \alt2-1b /* offset */ /* or alternatively to alt2 */
29232 - .previous
29233 -
29234 - .section .altinstructions,"a"
29235 - altinstruction_entry 0b,2b,\feature1,5,5
29236 - altinstruction_entry 0b,3b,\feature2,5,5
29237 - .previous
29238 - .endm
29239 +#include <asm/pgtable.h>
29240
29241 .macro ALIGN_DESTINATION
29242 #ifdef FIX_ALIGNMENT
29243 @@ -70,52 +46,6 @@
29244 #endif
29245 .endm
29246
29247 -/* Standard copy_to_user with segment limit checking */
29248 -ENTRY(_copy_to_user)
29249 - CFI_STARTPROC
29250 - GET_THREAD_INFO(%rax)
29251 - movq %rdi,%rcx
29252 - addq %rdx,%rcx
29253 - jc bad_to_user
29254 - cmpq TI_addr_limit(%rax),%rcx
29255 - ja bad_to_user
29256 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29257 - copy_user_generic_unrolled,copy_user_generic_string, \
29258 - copy_user_enhanced_fast_string
29259 - CFI_ENDPROC
29260 -ENDPROC(_copy_to_user)
29261 -
29262 -/* Standard copy_from_user with segment limit checking */
29263 -ENTRY(_copy_from_user)
29264 - CFI_STARTPROC
29265 - GET_THREAD_INFO(%rax)
29266 - movq %rsi,%rcx
29267 - addq %rdx,%rcx
29268 - jc bad_from_user
29269 - cmpq TI_addr_limit(%rax),%rcx
29270 - ja bad_from_user
29271 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29272 - copy_user_generic_unrolled,copy_user_generic_string, \
29273 - copy_user_enhanced_fast_string
29274 - CFI_ENDPROC
29275 -ENDPROC(_copy_from_user)
29276 -
29277 - .section .fixup,"ax"
29278 - /* must zero dest */
29279 -ENTRY(bad_from_user)
29280 -bad_from_user:
29281 - CFI_STARTPROC
29282 - movl %edx,%ecx
29283 - xorl %eax,%eax
29284 - rep
29285 - stosb
29286 -bad_to_user:
29287 - movl %edx,%eax
29288 - ret
29289 - CFI_ENDPROC
29290 -ENDPROC(bad_from_user)
29291 - .previous
29292 -
29293 /*
29294 * copy_user_generic_unrolled - memory copy with exception handling.
29295 * This version is for CPUs like P4 that don't have efficient micro
29296 @@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
29297 */
29298 ENTRY(copy_user_generic_unrolled)
29299 CFI_STARTPROC
29300 + ASM_PAX_OPEN_USERLAND
29301 ASM_STAC
29302 cmpl $8,%edx
29303 jb 20f /* less then 8 bytes, go to byte copy loop */
29304 @@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
29305 jnz 21b
29306 23: xor %eax,%eax
29307 ASM_CLAC
29308 + ASM_PAX_CLOSE_USERLAND
29309 + pax_force_retaddr
29310 ret
29311
29312 .section .fixup,"ax"
29313 @@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
29314 */
29315 ENTRY(copy_user_generic_string)
29316 CFI_STARTPROC
29317 + ASM_PAX_OPEN_USERLAND
29318 ASM_STAC
29319 cmpl $8,%edx
29320 jb 2f /* less than 8 bytes, go to byte copy loop */
29321 @@ -249,6 +183,8 @@ ENTRY(copy_user_generic_string)
29322 movsb
29323 xorl %eax,%eax
29324 ASM_CLAC
29325 + ASM_PAX_CLOSE_USERLAND
29326 + pax_force_retaddr
29327 ret
29328
29329 .section .fixup,"ax"
29330 @@ -276,12 +212,15 @@ ENDPROC(copy_user_generic_string)
29331 */
29332 ENTRY(copy_user_enhanced_fast_string)
29333 CFI_STARTPROC
29334 + ASM_PAX_OPEN_USERLAND
29335 ASM_STAC
29336 movl %edx,%ecx
29337 1: rep
29338 movsb
29339 xorl %eax,%eax
29340 ASM_CLAC
29341 + ASM_PAX_CLOSE_USERLAND
29342 + pax_force_retaddr
29343 ret
29344
29345 .section .fixup,"ax"
29346 diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
29347 index 6a4f43c..c70fb52 100644
29348 --- a/arch/x86/lib/copy_user_nocache_64.S
29349 +++ b/arch/x86/lib/copy_user_nocache_64.S
29350 @@ -8,6 +8,7 @@
29351
29352 #include <linux/linkage.h>
29353 #include <asm/dwarf2.h>
29354 +#include <asm/alternative-asm.h>
29355
29356 #define FIX_ALIGNMENT 1
29357
29358 @@ -16,6 +17,7 @@
29359 #include <asm/thread_info.h>
29360 #include <asm/asm.h>
29361 #include <asm/smap.h>
29362 +#include <asm/pgtable.h>
29363
29364 .macro ALIGN_DESTINATION
29365 #ifdef FIX_ALIGNMENT
29366 @@ -49,6 +51,16 @@
29367 */
29368 ENTRY(__copy_user_nocache)
29369 CFI_STARTPROC
29370 +
29371 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29372 + mov pax_user_shadow_base,%rcx
29373 + cmp %rcx,%rsi
29374 + jae 1f
29375 + add %rcx,%rsi
29376 +1:
29377 +#endif
29378 +
29379 + ASM_PAX_OPEN_USERLAND
29380 ASM_STAC
29381 cmpl $8,%edx
29382 jb 20f /* less then 8 bytes, go to byte copy loop */
29383 @@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
29384 jnz 21b
29385 23: xorl %eax,%eax
29386 ASM_CLAC
29387 + ASM_PAX_CLOSE_USERLAND
29388 sfence
29389 + pax_force_retaddr
29390 ret
29391
29392 .section .fixup,"ax"
29393 diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
29394 index 2419d5f..fe52d0e 100644
29395 --- a/arch/x86/lib/csum-copy_64.S
29396 +++ b/arch/x86/lib/csum-copy_64.S
29397 @@ -9,6 +9,7 @@
29398 #include <asm/dwarf2.h>
29399 #include <asm/errno.h>
29400 #include <asm/asm.h>
29401 +#include <asm/alternative-asm.h>
29402
29403 /*
29404 * Checksum copy with exception handling.
29405 @@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
29406 CFI_ADJUST_CFA_OFFSET 7*8
29407 movq %rbx, 2*8(%rsp)
29408 CFI_REL_OFFSET rbx, 2*8
29409 - movq %r12, 3*8(%rsp)
29410 - CFI_REL_OFFSET r12, 3*8
29411 + movq %r15, 3*8(%rsp)
29412 + CFI_REL_OFFSET r15, 3*8
29413 movq %r14, 4*8(%rsp)
29414 CFI_REL_OFFSET r14, 4*8
29415 movq %r13, 5*8(%rsp)
29416 @@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
29417 movl %edx, %ecx
29418
29419 xorl %r9d, %r9d
29420 - movq %rcx, %r12
29421 + movq %rcx, %r15
29422
29423 - shrq $6, %r12
29424 + shrq $6, %r15
29425 jz .Lhandle_tail /* < 64 */
29426
29427 clc
29428
29429 /* main loop. clear in 64 byte blocks */
29430 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
29431 - /* r11: temp3, rdx: temp4, r12 loopcnt */
29432 + /* r11: temp3, rdx: temp4, r15 loopcnt */
29433 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
29434 .p2align 4
29435 .Lloop:
29436 @@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
29437 adcq %r14, %rax
29438 adcq %r13, %rax
29439
29440 - decl %r12d
29441 + decl %r15d
29442
29443 dest
29444 movq %rbx, (%rsi)
29445 @@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
29446 .Lende:
29447 movq 2*8(%rsp), %rbx
29448 CFI_RESTORE rbx
29449 - movq 3*8(%rsp), %r12
29450 - CFI_RESTORE r12
29451 + movq 3*8(%rsp), %r15
29452 + CFI_RESTORE r15
29453 movq 4*8(%rsp), %r14
29454 CFI_RESTORE r14
29455 movq 5*8(%rsp), %r13
29456 @@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
29457 CFI_RESTORE rbp
29458 addq $7*8, %rsp
29459 CFI_ADJUST_CFA_OFFSET -7*8
29460 + pax_force_retaddr
29461 ret
29462 CFI_RESTORE_STATE
29463
29464 diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
29465 index 7609e0e..b449b98 100644
29466 --- a/arch/x86/lib/csum-wrappers_64.c
29467 +++ b/arch/x86/lib/csum-wrappers_64.c
29468 @@ -53,10 +53,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
29469 len -= 2;
29470 }
29471 }
29472 + pax_open_userland();
29473 stac();
29474 - isum = csum_partial_copy_generic((__force const void *)src,
29475 + isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
29476 dst, len, isum, errp, NULL);
29477 clac();
29478 + pax_close_userland();
29479 if (unlikely(*errp))
29480 goto out_err;
29481
29482 @@ -110,10 +112,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
29483 }
29484
29485 *errp = 0;
29486 + pax_open_userland();
29487 stac();
29488 - ret = csum_partial_copy_generic(src, (void __force *)dst,
29489 + ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
29490 len, isum, NULL, errp);
29491 clac();
29492 + pax_close_userland();
29493 return ret;
29494 }
29495 EXPORT_SYMBOL(csum_partial_copy_to_user);
29496 diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
29497 index a451235..1daa956 100644
29498 --- a/arch/x86/lib/getuser.S
29499 +++ b/arch/x86/lib/getuser.S
29500 @@ -33,17 +33,40 @@
29501 #include <asm/thread_info.h>
29502 #include <asm/asm.h>
29503 #include <asm/smap.h>
29504 +#include <asm/segment.h>
29505 +#include <asm/pgtable.h>
29506 +#include <asm/alternative-asm.h>
29507 +
29508 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
29509 +#define __copyuser_seg gs;
29510 +#else
29511 +#define __copyuser_seg
29512 +#endif
29513
29514 .text
29515 ENTRY(__get_user_1)
29516 CFI_STARTPROC
29517 +
29518 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
29519 GET_THREAD_INFO(%_ASM_DX)
29520 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
29521 jae bad_get_user
29522 ASM_STAC
29523 -1: movzbl (%_ASM_AX),%edx
29524 +
29525 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29526 + mov pax_user_shadow_base,%_ASM_DX
29527 + cmp %_ASM_DX,%_ASM_AX
29528 + jae 1234f
29529 + add %_ASM_DX,%_ASM_AX
29530 +1234:
29531 +#endif
29532 +
29533 +#endif
29534 +
29535 +1: __copyuser_seg movzbl (%_ASM_AX),%edx
29536 xor %eax,%eax
29537 ASM_CLAC
29538 + pax_force_retaddr
29539 ret
29540 CFI_ENDPROC
29541 ENDPROC(__get_user_1)
29542 @@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
29543 ENTRY(__get_user_2)
29544 CFI_STARTPROC
29545 add $1,%_ASM_AX
29546 +
29547 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
29548 jc bad_get_user
29549 GET_THREAD_INFO(%_ASM_DX)
29550 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
29551 jae bad_get_user
29552 ASM_STAC
29553 -2: movzwl -1(%_ASM_AX),%edx
29554 +
29555 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29556 + mov pax_user_shadow_base,%_ASM_DX
29557 + cmp %_ASM_DX,%_ASM_AX
29558 + jae 1234f
29559 + add %_ASM_DX,%_ASM_AX
29560 +1234:
29561 +#endif
29562 +
29563 +#endif
29564 +
29565 +2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
29566 xor %eax,%eax
29567 ASM_CLAC
29568 + pax_force_retaddr
29569 ret
29570 CFI_ENDPROC
29571 ENDPROC(__get_user_2)
29572 @@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
29573 ENTRY(__get_user_4)
29574 CFI_STARTPROC
29575 add $3,%_ASM_AX
29576 +
29577 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
29578 jc bad_get_user
29579 GET_THREAD_INFO(%_ASM_DX)
29580 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
29581 jae bad_get_user
29582 ASM_STAC
29583 -3: movl -3(%_ASM_AX),%edx
29584 +
29585 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29586 + mov pax_user_shadow_base,%_ASM_DX
29587 + cmp %_ASM_DX,%_ASM_AX
29588 + jae 1234f
29589 + add %_ASM_DX,%_ASM_AX
29590 +1234:
29591 +#endif
29592 +
29593 +#endif
29594 +
29595 +3: __copyuser_seg movl -3(%_ASM_AX),%edx
29596 xor %eax,%eax
29597 ASM_CLAC
29598 + pax_force_retaddr
29599 ret
29600 CFI_ENDPROC
29601 ENDPROC(__get_user_4)
29602 @@ -86,10 +137,20 @@ ENTRY(__get_user_8)
29603 GET_THREAD_INFO(%_ASM_DX)
29604 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
29605 jae bad_get_user
29606 +
29607 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29608 + mov pax_user_shadow_base,%_ASM_DX
29609 + cmp %_ASM_DX,%_ASM_AX
29610 + jae 1234f
29611 + add %_ASM_DX,%_ASM_AX
29612 +1234:
29613 +#endif
29614 +
29615 ASM_STAC
29616 4: movq -7(%_ASM_AX),%rdx
29617 xor %eax,%eax
29618 ASM_CLAC
29619 + pax_force_retaddr
29620 ret
29621 #else
29622 add $7,%_ASM_AX
29623 @@ -98,10 +159,11 @@ ENTRY(__get_user_8)
29624 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
29625 jae bad_get_user_8
29626 ASM_STAC
29627 -4: movl -7(%_ASM_AX),%edx
29628 -5: movl -3(%_ASM_AX),%ecx
29629 +4: __copyuser_seg movl -7(%_ASM_AX),%edx
29630 +5: __copyuser_seg movl -3(%_ASM_AX),%ecx
29631 xor %eax,%eax
29632 ASM_CLAC
29633 + pax_force_retaddr
29634 ret
29635 #endif
29636 CFI_ENDPROC
29637 @@ -113,6 +175,7 @@ bad_get_user:
29638 xor %edx,%edx
29639 mov $(-EFAULT),%_ASM_AX
29640 ASM_CLAC
29641 + pax_force_retaddr
29642 ret
29643 CFI_ENDPROC
29644 END(bad_get_user)
29645 @@ -124,6 +187,7 @@ bad_get_user_8:
29646 xor %ecx,%ecx
29647 mov $(-EFAULT),%_ASM_AX
29648 ASM_CLAC
29649 + pax_force_retaddr
29650 ret
29651 CFI_ENDPROC
29652 END(bad_get_user_8)
29653 diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
29654 index 54fcffe..7be149e 100644
29655 --- a/arch/x86/lib/insn.c
29656 +++ b/arch/x86/lib/insn.c
29657 @@ -20,8 +20,10 @@
29658
29659 #ifdef __KERNEL__
29660 #include <linux/string.h>
29661 +#include <asm/pgtable_types.h>
29662 #else
29663 #include <string.h>
29664 +#define ktla_ktva(addr) addr
29665 #endif
29666 #include <asm/inat.h>
29667 #include <asm/insn.h>
29668 @@ -53,8 +55,8 @@
29669 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
29670 {
29671 memset(insn, 0, sizeof(*insn));
29672 - insn->kaddr = kaddr;
29673 - insn->next_byte = kaddr;
29674 + insn->kaddr = ktla_ktva(kaddr);
29675 + insn->next_byte = ktla_ktva(kaddr);
29676 insn->x86_64 = x86_64 ? 1 : 0;
29677 insn->opnd_bytes = 4;
29678 if (x86_64)
29679 diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
29680 index 05a95e7..326f2fa 100644
29681 --- a/arch/x86/lib/iomap_copy_64.S
29682 +++ b/arch/x86/lib/iomap_copy_64.S
29683 @@ -17,6 +17,7 @@
29684
29685 #include <linux/linkage.h>
29686 #include <asm/dwarf2.h>
29687 +#include <asm/alternative-asm.h>
29688
29689 /*
29690 * override generic version in lib/iomap_copy.c
29691 @@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
29692 CFI_STARTPROC
29693 movl %edx,%ecx
29694 rep movsd
29695 + pax_force_retaddr
29696 ret
29697 CFI_ENDPROC
29698 ENDPROC(__iowrite32_copy)
29699 diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
29700 index 56313a3..0db417e 100644
29701 --- a/arch/x86/lib/memcpy_64.S
29702 +++ b/arch/x86/lib/memcpy_64.S
29703 @@ -24,7 +24,7 @@
29704 * This gets patched over the unrolled variant (below) via the
29705 * alternative instructions framework:
29706 */
29707 - .section .altinstr_replacement, "ax", @progbits
29708 + .section .altinstr_replacement, "a", @progbits
29709 .Lmemcpy_c:
29710 movq %rdi, %rax
29711 movq %rdx, %rcx
29712 @@ -33,6 +33,7 @@
29713 rep movsq
29714 movl %edx, %ecx
29715 rep movsb
29716 + pax_force_retaddr
29717 ret
29718 .Lmemcpy_e:
29719 .previous
29720 @@ -44,11 +45,12 @@
29721 * This gets patched over the unrolled variant (below) via the
29722 * alternative instructions framework:
29723 */
29724 - .section .altinstr_replacement, "ax", @progbits
29725 + .section .altinstr_replacement, "a", @progbits
29726 .Lmemcpy_c_e:
29727 movq %rdi, %rax
29728 movq %rdx, %rcx
29729 rep movsb
29730 + pax_force_retaddr
29731 ret
29732 .Lmemcpy_e_e:
29733 .previous
29734 @@ -136,6 +138,7 @@ ENTRY(memcpy)
29735 movq %r9, 1*8(%rdi)
29736 movq %r10, -2*8(%rdi, %rdx)
29737 movq %r11, -1*8(%rdi, %rdx)
29738 + pax_force_retaddr
29739 retq
29740 .p2align 4
29741 .Lless_16bytes:
29742 @@ -148,6 +151,7 @@ ENTRY(memcpy)
29743 movq -1*8(%rsi, %rdx), %r9
29744 movq %r8, 0*8(%rdi)
29745 movq %r9, -1*8(%rdi, %rdx)
29746 + pax_force_retaddr
29747 retq
29748 .p2align 4
29749 .Lless_8bytes:
29750 @@ -161,6 +165,7 @@ ENTRY(memcpy)
29751 movl -4(%rsi, %rdx), %r8d
29752 movl %ecx, (%rdi)
29753 movl %r8d, -4(%rdi, %rdx)
29754 + pax_force_retaddr
29755 retq
29756 .p2align 4
29757 .Lless_3bytes:
29758 @@ -179,6 +184,7 @@ ENTRY(memcpy)
29759 movb %cl, (%rdi)
29760
29761 .Lend:
29762 + pax_force_retaddr
29763 retq
29764 CFI_ENDPROC
29765 ENDPROC(memcpy)
29766 diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
29767 index 65268a6..dd1de11 100644
29768 --- a/arch/x86/lib/memmove_64.S
29769 +++ b/arch/x86/lib/memmove_64.S
29770 @@ -202,14 +202,16 @@ ENTRY(memmove)
29771 movb (%rsi), %r11b
29772 movb %r11b, (%rdi)
29773 13:
29774 + pax_force_retaddr
29775 retq
29776 CFI_ENDPROC
29777
29778 - .section .altinstr_replacement,"ax"
29779 + .section .altinstr_replacement,"a"
29780 .Lmemmove_begin_forward_efs:
29781 /* Forward moving data. */
29782 movq %rdx, %rcx
29783 rep movsb
29784 + pax_force_retaddr
29785 retq
29786 .Lmemmove_end_forward_efs:
29787 .previous
29788 diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
29789 index 2dcb380..2eb79fe 100644
29790 --- a/arch/x86/lib/memset_64.S
29791 +++ b/arch/x86/lib/memset_64.S
29792 @@ -16,7 +16,7 @@
29793 *
29794 * rax original destination
29795 */
29796 - .section .altinstr_replacement, "ax", @progbits
29797 + .section .altinstr_replacement, "a", @progbits
29798 .Lmemset_c:
29799 movq %rdi,%r9
29800 movq %rdx,%rcx
29801 @@ -30,6 +30,7 @@
29802 movl %edx,%ecx
29803 rep stosb
29804 movq %r9,%rax
29805 + pax_force_retaddr
29806 ret
29807 .Lmemset_e:
29808 .previous
29809 @@ -45,13 +46,14 @@
29810 *
29811 * rax original destination
29812 */
29813 - .section .altinstr_replacement, "ax", @progbits
29814 + .section .altinstr_replacement, "a", @progbits
29815 .Lmemset_c_e:
29816 movq %rdi,%r9
29817 movb %sil,%al
29818 movq %rdx,%rcx
29819 rep stosb
29820 movq %r9,%rax
29821 + pax_force_retaddr
29822 ret
29823 .Lmemset_e_e:
29824 .previous
29825 @@ -118,6 +120,7 @@ ENTRY(__memset)
29826
29827 .Lende:
29828 movq %r10,%rax
29829 + pax_force_retaddr
29830 ret
29831
29832 CFI_RESTORE_STATE
29833 diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
29834 index c9f2d9b..e7fd2c0 100644
29835 --- a/arch/x86/lib/mmx_32.c
29836 +++ b/arch/x86/lib/mmx_32.c
29837 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
29838 {
29839 void *p;
29840 int i;
29841 + unsigned long cr0;
29842
29843 if (unlikely(in_interrupt()))
29844 return __memcpy(to, from, len);
29845 @@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
29846 kernel_fpu_begin();
29847
29848 __asm__ __volatile__ (
29849 - "1: prefetch (%0)\n" /* This set is 28 bytes */
29850 - " prefetch 64(%0)\n"
29851 - " prefetch 128(%0)\n"
29852 - " prefetch 192(%0)\n"
29853 - " prefetch 256(%0)\n"
29854 + "1: prefetch (%1)\n" /* This set is 28 bytes */
29855 + " prefetch 64(%1)\n"
29856 + " prefetch 128(%1)\n"
29857 + " prefetch 192(%1)\n"
29858 + " prefetch 256(%1)\n"
29859 "2: \n"
29860 ".section .fixup, \"ax\"\n"
29861 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
29862 + "3: \n"
29863 +
29864 +#ifdef CONFIG_PAX_KERNEXEC
29865 + " movl %%cr0, %0\n"
29866 + " movl %0, %%eax\n"
29867 + " andl $0xFFFEFFFF, %%eax\n"
29868 + " movl %%eax, %%cr0\n"
29869 +#endif
29870 +
29871 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
29872 +
29873 +#ifdef CONFIG_PAX_KERNEXEC
29874 + " movl %0, %%cr0\n"
29875 +#endif
29876 +
29877 " jmp 2b\n"
29878 ".previous\n"
29879 _ASM_EXTABLE(1b, 3b)
29880 - : : "r" (from));
29881 + : "=&r" (cr0) : "r" (from) : "ax");
29882
29883 for ( ; i > 5; i--) {
29884 __asm__ __volatile__ (
29885 - "1: prefetch 320(%0)\n"
29886 - "2: movq (%0), %%mm0\n"
29887 - " movq 8(%0), %%mm1\n"
29888 - " movq 16(%0), %%mm2\n"
29889 - " movq 24(%0), %%mm3\n"
29890 - " movq %%mm0, (%1)\n"
29891 - " movq %%mm1, 8(%1)\n"
29892 - " movq %%mm2, 16(%1)\n"
29893 - " movq %%mm3, 24(%1)\n"
29894 - " movq 32(%0), %%mm0\n"
29895 - " movq 40(%0), %%mm1\n"
29896 - " movq 48(%0), %%mm2\n"
29897 - " movq 56(%0), %%mm3\n"
29898 - " movq %%mm0, 32(%1)\n"
29899 - " movq %%mm1, 40(%1)\n"
29900 - " movq %%mm2, 48(%1)\n"
29901 - " movq %%mm3, 56(%1)\n"
29902 + "1: prefetch 320(%1)\n"
29903 + "2: movq (%1), %%mm0\n"
29904 + " movq 8(%1), %%mm1\n"
29905 + " movq 16(%1), %%mm2\n"
29906 + " movq 24(%1), %%mm3\n"
29907 + " movq %%mm0, (%2)\n"
29908 + " movq %%mm1, 8(%2)\n"
29909 + " movq %%mm2, 16(%2)\n"
29910 + " movq %%mm3, 24(%2)\n"
29911 + " movq 32(%1), %%mm0\n"
29912 + " movq 40(%1), %%mm1\n"
29913 + " movq 48(%1), %%mm2\n"
29914 + " movq 56(%1), %%mm3\n"
29915 + " movq %%mm0, 32(%2)\n"
29916 + " movq %%mm1, 40(%2)\n"
29917 + " movq %%mm2, 48(%2)\n"
29918 + " movq %%mm3, 56(%2)\n"
29919 ".section .fixup, \"ax\"\n"
29920 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
29921 + "3:\n"
29922 +
29923 +#ifdef CONFIG_PAX_KERNEXEC
29924 + " movl %%cr0, %0\n"
29925 + " movl %0, %%eax\n"
29926 + " andl $0xFFFEFFFF, %%eax\n"
29927 + " movl %%eax, %%cr0\n"
29928 +#endif
29929 +
29930 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
29931 +
29932 +#ifdef CONFIG_PAX_KERNEXEC
29933 + " movl %0, %%cr0\n"
29934 +#endif
29935 +
29936 " jmp 2b\n"
29937 ".previous\n"
29938 _ASM_EXTABLE(1b, 3b)
29939 - : : "r" (from), "r" (to) : "memory");
29940 + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
29941
29942 from += 64;
29943 to += 64;
29944 @@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
29945 static void fast_copy_page(void *to, void *from)
29946 {
29947 int i;
29948 + unsigned long cr0;
29949
29950 kernel_fpu_begin();
29951
29952 @@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
29953 * but that is for later. -AV
29954 */
29955 __asm__ __volatile__(
29956 - "1: prefetch (%0)\n"
29957 - " prefetch 64(%0)\n"
29958 - " prefetch 128(%0)\n"
29959 - " prefetch 192(%0)\n"
29960 - " prefetch 256(%0)\n"
29961 + "1: prefetch (%1)\n"
29962 + " prefetch 64(%1)\n"
29963 + " prefetch 128(%1)\n"
29964 + " prefetch 192(%1)\n"
29965 + " prefetch 256(%1)\n"
29966 "2: \n"
29967 ".section .fixup, \"ax\"\n"
29968 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
29969 + "3: \n"
29970 +
29971 +#ifdef CONFIG_PAX_KERNEXEC
29972 + " movl %%cr0, %0\n"
29973 + " movl %0, %%eax\n"
29974 + " andl $0xFFFEFFFF, %%eax\n"
29975 + " movl %%eax, %%cr0\n"
29976 +#endif
29977 +
29978 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
29979 +
29980 +#ifdef CONFIG_PAX_KERNEXEC
29981 + " movl %0, %%cr0\n"
29982 +#endif
29983 +
29984 " jmp 2b\n"
29985 ".previous\n"
29986 - _ASM_EXTABLE(1b, 3b) : : "r" (from));
29987 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
29988
29989 for (i = 0; i < (4096-320)/64; i++) {
29990 __asm__ __volatile__ (
29991 - "1: prefetch 320(%0)\n"
29992 - "2: movq (%0), %%mm0\n"
29993 - " movntq %%mm0, (%1)\n"
29994 - " movq 8(%0), %%mm1\n"
29995 - " movntq %%mm1, 8(%1)\n"
29996 - " movq 16(%0), %%mm2\n"
29997 - " movntq %%mm2, 16(%1)\n"
29998 - " movq 24(%0), %%mm3\n"
29999 - " movntq %%mm3, 24(%1)\n"
30000 - " movq 32(%0), %%mm4\n"
30001 - " movntq %%mm4, 32(%1)\n"
30002 - " movq 40(%0), %%mm5\n"
30003 - " movntq %%mm5, 40(%1)\n"
30004 - " movq 48(%0), %%mm6\n"
30005 - " movntq %%mm6, 48(%1)\n"
30006 - " movq 56(%0), %%mm7\n"
30007 - " movntq %%mm7, 56(%1)\n"
30008 + "1: prefetch 320(%1)\n"
30009 + "2: movq (%1), %%mm0\n"
30010 + " movntq %%mm0, (%2)\n"
30011 + " movq 8(%1), %%mm1\n"
30012 + " movntq %%mm1, 8(%2)\n"
30013 + " movq 16(%1), %%mm2\n"
30014 + " movntq %%mm2, 16(%2)\n"
30015 + " movq 24(%1), %%mm3\n"
30016 + " movntq %%mm3, 24(%2)\n"
30017 + " movq 32(%1), %%mm4\n"
30018 + " movntq %%mm4, 32(%2)\n"
30019 + " movq 40(%1), %%mm5\n"
30020 + " movntq %%mm5, 40(%2)\n"
30021 + " movq 48(%1), %%mm6\n"
30022 + " movntq %%mm6, 48(%2)\n"
30023 + " movq 56(%1), %%mm7\n"
30024 + " movntq %%mm7, 56(%2)\n"
30025 ".section .fixup, \"ax\"\n"
30026 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30027 + "3:\n"
30028 +
30029 +#ifdef CONFIG_PAX_KERNEXEC
30030 + " movl %%cr0, %0\n"
30031 + " movl %0, %%eax\n"
30032 + " andl $0xFFFEFFFF, %%eax\n"
30033 + " movl %%eax, %%cr0\n"
30034 +#endif
30035 +
30036 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30037 +
30038 +#ifdef CONFIG_PAX_KERNEXEC
30039 + " movl %0, %%cr0\n"
30040 +#endif
30041 +
30042 " jmp 2b\n"
30043 ".previous\n"
30044 - _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30045 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30046
30047 from += 64;
30048 to += 64;
30049 @@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30050 static void fast_copy_page(void *to, void *from)
30051 {
30052 int i;
30053 + unsigned long cr0;
30054
30055 kernel_fpu_begin();
30056
30057 __asm__ __volatile__ (
30058 - "1: prefetch (%0)\n"
30059 - " prefetch 64(%0)\n"
30060 - " prefetch 128(%0)\n"
30061 - " prefetch 192(%0)\n"
30062 - " prefetch 256(%0)\n"
30063 + "1: prefetch (%1)\n"
30064 + " prefetch 64(%1)\n"
30065 + " prefetch 128(%1)\n"
30066 + " prefetch 192(%1)\n"
30067 + " prefetch 256(%1)\n"
30068 "2: \n"
30069 ".section .fixup, \"ax\"\n"
30070 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30071 + "3: \n"
30072 +
30073 +#ifdef CONFIG_PAX_KERNEXEC
30074 + " movl %%cr0, %0\n"
30075 + " movl %0, %%eax\n"
30076 + " andl $0xFFFEFFFF, %%eax\n"
30077 + " movl %%eax, %%cr0\n"
30078 +#endif
30079 +
30080 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30081 +
30082 +#ifdef CONFIG_PAX_KERNEXEC
30083 + " movl %0, %%cr0\n"
30084 +#endif
30085 +
30086 " jmp 2b\n"
30087 ".previous\n"
30088 - _ASM_EXTABLE(1b, 3b) : : "r" (from));
30089 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30090
30091 for (i = 0; i < 4096/64; i++) {
30092 __asm__ __volatile__ (
30093 - "1: prefetch 320(%0)\n"
30094 - "2: movq (%0), %%mm0\n"
30095 - " movq 8(%0), %%mm1\n"
30096 - " movq 16(%0), %%mm2\n"
30097 - " movq 24(%0), %%mm3\n"
30098 - " movq %%mm0, (%1)\n"
30099 - " movq %%mm1, 8(%1)\n"
30100 - " movq %%mm2, 16(%1)\n"
30101 - " movq %%mm3, 24(%1)\n"
30102 - " movq 32(%0), %%mm0\n"
30103 - " movq 40(%0), %%mm1\n"
30104 - " movq 48(%0), %%mm2\n"
30105 - " movq 56(%0), %%mm3\n"
30106 - " movq %%mm0, 32(%1)\n"
30107 - " movq %%mm1, 40(%1)\n"
30108 - " movq %%mm2, 48(%1)\n"
30109 - " movq %%mm3, 56(%1)\n"
30110 + "1: prefetch 320(%1)\n"
30111 + "2: movq (%1), %%mm0\n"
30112 + " movq 8(%1), %%mm1\n"
30113 + " movq 16(%1), %%mm2\n"
30114 + " movq 24(%1), %%mm3\n"
30115 + " movq %%mm0, (%2)\n"
30116 + " movq %%mm1, 8(%2)\n"
30117 + " movq %%mm2, 16(%2)\n"
30118 + " movq %%mm3, 24(%2)\n"
30119 + " movq 32(%1), %%mm0\n"
30120 + " movq 40(%1), %%mm1\n"
30121 + " movq 48(%1), %%mm2\n"
30122 + " movq 56(%1), %%mm3\n"
30123 + " movq %%mm0, 32(%2)\n"
30124 + " movq %%mm1, 40(%2)\n"
30125 + " movq %%mm2, 48(%2)\n"
30126 + " movq %%mm3, 56(%2)\n"
30127 ".section .fixup, \"ax\"\n"
30128 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30129 + "3:\n"
30130 +
30131 +#ifdef CONFIG_PAX_KERNEXEC
30132 + " movl %%cr0, %0\n"
30133 + " movl %0, %%eax\n"
30134 + " andl $0xFFFEFFFF, %%eax\n"
30135 + " movl %%eax, %%cr0\n"
30136 +#endif
30137 +
30138 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30139 +
30140 +#ifdef CONFIG_PAX_KERNEXEC
30141 + " movl %0, %%cr0\n"
30142 +#endif
30143 +
30144 " jmp 2b\n"
30145 ".previous\n"
30146 _ASM_EXTABLE(1b, 3b)
30147 - : : "r" (from), "r" (to) : "memory");
30148 + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30149
30150 from += 64;
30151 to += 64;
30152 diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30153 index f6d13ee..d789440 100644
30154 --- a/arch/x86/lib/msr-reg.S
30155 +++ b/arch/x86/lib/msr-reg.S
30156 @@ -3,6 +3,7 @@
30157 #include <asm/dwarf2.h>
30158 #include <asm/asm.h>
30159 #include <asm/msr.h>
30160 +#include <asm/alternative-asm.h>
30161
30162 #ifdef CONFIG_X86_64
30163 /*
30164 @@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30165 movl %edi, 28(%r10)
30166 popq_cfi %rbp
30167 popq_cfi %rbx
30168 + pax_force_retaddr
30169 ret
30170 3:
30171 CFI_RESTORE_STATE
30172 diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30173 index fc6ba17..d4d989d 100644
30174 --- a/arch/x86/lib/putuser.S
30175 +++ b/arch/x86/lib/putuser.S
30176 @@ -16,7 +16,9 @@
30177 #include <asm/errno.h>
30178 #include <asm/asm.h>
30179 #include <asm/smap.h>
30180 -
30181 +#include <asm/segment.h>
30182 +#include <asm/pgtable.h>
30183 +#include <asm/alternative-asm.h>
30184
30185 /*
30186 * __put_user_X
30187 @@ -30,57 +32,125 @@
30188 * as they get called from within inline assembly.
30189 */
30190
30191 -#define ENTER CFI_STARTPROC ; \
30192 - GET_THREAD_INFO(%_ASM_BX)
30193 -#define EXIT ASM_CLAC ; \
30194 - ret ; \
30195 +#define ENTER CFI_STARTPROC
30196 +#define EXIT ASM_CLAC ; \
30197 + pax_force_retaddr ; \
30198 + ret ; \
30199 CFI_ENDPROC
30200
30201 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30202 +#define _DEST %_ASM_CX,%_ASM_BX
30203 +#else
30204 +#define _DEST %_ASM_CX
30205 +#endif
30206 +
30207 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30208 +#define __copyuser_seg gs;
30209 +#else
30210 +#define __copyuser_seg
30211 +#endif
30212 +
30213 .text
30214 ENTRY(__put_user_1)
30215 ENTER
30216 +
30217 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30218 + GET_THREAD_INFO(%_ASM_BX)
30219 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
30220 jae bad_put_user
30221 ASM_STAC
30222 -1: movb %al,(%_ASM_CX)
30223 +
30224 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30225 + mov pax_user_shadow_base,%_ASM_BX
30226 + cmp %_ASM_BX,%_ASM_CX
30227 + jb 1234f
30228 + xor %ebx,%ebx
30229 +1234:
30230 +#endif
30231 +
30232 +#endif
30233 +
30234 +1: __copyuser_seg movb %al,(_DEST)
30235 xor %eax,%eax
30236 EXIT
30237 ENDPROC(__put_user_1)
30238
30239 ENTRY(__put_user_2)
30240 ENTER
30241 +
30242 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30243 + GET_THREAD_INFO(%_ASM_BX)
30244 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30245 sub $1,%_ASM_BX
30246 cmp %_ASM_BX,%_ASM_CX
30247 jae bad_put_user
30248 ASM_STAC
30249 -2: movw %ax,(%_ASM_CX)
30250 +
30251 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30252 + mov pax_user_shadow_base,%_ASM_BX
30253 + cmp %_ASM_BX,%_ASM_CX
30254 + jb 1234f
30255 + xor %ebx,%ebx
30256 +1234:
30257 +#endif
30258 +
30259 +#endif
30260 +
30261 +2: __copyuser_seg movw %ax,(_DEST)
30262 xor %eax,%eax
30263 EXIT
30264 ENDPROC(__put_user_2)
30265
30266 ENTRY(__put_user_4)
30267 ENTER
30268 +
30269 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30270 + GET_THREAD_INFO(%_ASM_BX)
30271 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30272 sub $3,%_ASM_BX
30273 cmp %_ASM_BX,%_ASM_CX
30274 jae bad_put_user
30275 ASM_STAC
30276 -3: movl %eax,(%_ASM_CX)
30277 +
30278 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30279 + mov pax_user_shadow_base,%_ASM_BX
30280 + cmp %_ASM_BX,%_ASM_CX
30281 + jb 1234f
30282 + xor %ebx,%ebx
30283 +1234:
30284 +#endif
30285 +
30286 +#endif
30287 +
30288 +3: __copyuser_seg movl %eax,(_DEST)
30289 xor %eax,%eax
30290 EXIT
30291 ENDPROC(__put_user_4)
30292
30293 ENTRY(__put_user_8)
30294 ENTER
30295 +
30296 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30297 + GET_THREAD_INFO(%_ASM_BX)
30298 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30299 sub $7,%_ASM_BX
30300 cmp %_ASM_BX,%_ASM_CX
30301 jae bad_put_user
30302 ASM_STAC
30303 -4: mov %_ASM_AX,(%_ASM_CX)
30304 +
30305 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30306 + mov pax_user_shadow_base,%_ASM_BX
30307 + cmp %_ASM_BX,%_ASM_CX
30308 + jb 1234f
30309 + xor %ebx,%ebx
30310 +1234:
30311 +#endif
30312 +
30313 +#endif
30314 +
30315 +4: __copyuser_seg mov %_ASM_AX,(_DEST)
30316 #ifdef CONFIG_X86_32
30317 -5: movl %edx,4(%_ASM_CX)
30318 +5: __copyuser_seg movl %edx,4(_DEST)
30319 #endif
30320 xor %eax,%eax
30321 EXIT
30322 diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
30323 index 1cad221..de671ee 100644
30324 --- a/arch/x86/lib/rwlock.S
30325 +++ b/arch/x86/lib/rwlock.S
30326 @@ -16,13 +16,34 @@ ENTRY(__write_lock_failed)
30327 FRAME
30328 0: LOCK_PREFIX
30329 WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
30330 +
30331 +#ifdef CONFIG_PAX_REFCOUNT
30332 + jno 1234f
30333 + LOCK_PREFIX
30334 + WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
30335 + int $4
30336 +1234:
30337 + _ASM_EXTABLE(1234b, 1234b)
30338 +#endif
30339 +
30340 1: rep; nop
30341 cmpl $WRITE_LOCK_CMP, (%__lock_ptr)
30342 jne 1b
30343 LOCK_PREFIX
30344 WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
30345 +
30346 +#ifdef CONFIG_PAX_REFCOUNT
30347 + jno 1234f
30348 + LOCK_PREFIX
30349 + WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
30350 + int $4
30351 +1234:
30352 + _ASM_EXTABLE(1234b, 1234b)
30353 +#endif
30354 +
30355 jnz 0b
30356 ENDFRAME
30357 + pax_force_retaddr
30358 ret
30359 CFI_ENDPROC
30360 END(__write_lock_failed)
30361 @@ -32,13 +53,34 @@ ENTRY(__read_lock_failed)
30362 FRAME
30363 0: LOCK_PREFIX
30364 READ_LOCK_SIZE(inc) (%__lock_ptr)
30365 +
30366 +#ifdef CONFIG_PAX_REFCOUNT
30367 + jno 1234f
30368 + LOCK_PREFIX
30369 + READ_LOCK_SIZE(dec) (%__lock_ptr)
30370 + int $4
30371 +1234:
30372 + _ASM_EXTABLE(1234b, 1234b)
30373 +#endif
30374 +
30375 1: rep; nop
30376 READ_LOCK_SIZE(cmp) $1, (%__lock_ptr)
30377 js 1b
30378 LOCK_PREFIX
30379 READ_LOCK_SIZE(dec) (%__lock_ptr)
30380 +
30381 +#ifdef CONFIG_PAX_REFCOUNT
30382 + jno 1234f
30383 + LOCK_PREFIX
30384 + READ_LOCK_SIZE(inc) (%__lock_ptr)
30385 + int $4
30386 +1234:
30387 + _ASM_EXTABLE(1234b, 1234b)
30388 +#endif
30389 +
30390 js 0b
30391 ENDFRAME
30392 + pax_force_retaddr
30393 ret
30394 CFI_ENDPROC
30395 END(__read_lock_failed)
30396 diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
30397 index 5dff5f0..cadebf4 100644
30398 --- a/arch/x86/lib/rwsem.S
30399 +++ b/arch/x86/lib/rwsem.S
30400 @@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
30401 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
30402 CFI_RESTORE __ASM_REG(dx)
30403 restore_common_regs
30404 + pax_force_retaddr
30405 ret
30406 CFI_ENDPROC
30407 ENDPROC(call_rwsem_down_read_failed)
30408 @@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
30409 movq %rax,%rdi
30410 call rwsem_down_write_failed
30411 restore_common_regs
30412 + pax_force_retaddr
30413 ret
30414 CFI_ENDPROC
30415 ENDPROC(call_rwsem_down_write_failed)
30416 @@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
30417 movq %rax,%rdi
30418 call rwsem_wake
30419 restore_common_regs
30420 -1: ret
30421 +1: pax_force_retaddr
30422 + ret
30423 CFI_ENDPROC
30424 ENDPROC(call_rwsem_wake)
30425
30426 @@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
30427 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
30428 CFI_RESTORE __ASM_REG(dx)
30429 restore_common_regs
30430 + pax_force_retaddr
30431 ret
30432 CFI_ENDPROC
30433 ENDPROC(call_rwsem_downgrade_wake)
30434 diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
30435 index a63efd6..8149fbe 100644
30436 --- a/arch/x86/lib/thunk_64.S
30437 +++ b/arch/x86/lib/thunk_64.S
30438 @@ -8,6 +8,7 @@
30439 #include <linux/linkage.h>
30440 #include <asm/dwarf2.h>
30441 #include <asm/calling.h>
30442 +#include <asm/alternative-asm.h>
30443
30444 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
30445 .macro THUNK name, func, put_ret_addr_in_rdi=0
30446 @@ -15,11 +16,11 @@
30447 \name:
30448 CFI_STARTPROC
30449
30450 - /* this one pushes 9 elems, the next one would be %rIP */
30451 - SAVE_ARGS
30452 + /* this one pushes 15+1 elems, the next one would be %rIP */
30453 + SAVE_ARGS 8
30454
30455 .if \put_ret_addr_in_rdi
30456 - movq_cfi_restore 9*8, rdi
30457 + movq_cfi_restore RIP, rdi
30458 .endif
30459
30460 call \func
30461 @@ -38,8 +39,9 @@
30462
30463 /* SAVE_ARGS below is used only for the .cfi directives it contains. */
30464 CFI_STARTPROC
30465 - SAVE_ARGS
30466 + SAVE_ARGS 8
30467 restore:
30468 - RESTORE_ARGS
30469 + RESTORE_ARGS 1,8
30470 + pax_force_retaddr
30471 ret
30472 CFI_ENDPROC
30473 diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
30474 index e2f5e21..4b22130 100644
30475 --- a/arch/x86/lib/usercopy_32.c
30476 +++ b/arch/x86/lib/usercopy_32.c
30477 @@ -42,11 +42,13 @@ do { \
30478 int __d0; \
30479 might_fault(); \
30480 __asm__ __volatile__( \
30481 + __COPYUSER_SET_ES \
30482 ASM_STAC "\n" \
30483 "0: rep; stosl\n" \
30484 " movl %2,%0\n" \
30485 "1: rep; stosb\n" \
30486 "2: " ASM_CLAC "\n" \
30487 + __COPYUSER_RESTORE_ES \
30488 ".section .fixup,\"ax\"\n" \
30489 "3: lea 0(%2,%0,4),%0\n" \
30490 " jmp 2b\n" \
30491 @@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
30492
30493 #ifdef CONFIG_X86_INTEL_USERCOPY
30494 static unsigned long
30495 -__copy_user_intel(void __user *to, const void *from, unsigned long size)
30496 +__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
30497 {
30498 int d0, d1;
30499 __asm__ __volatile__(
30500 @@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
30501 " .align 2,0x90\n"
30502 "3: movl 0(%4), %%eax\n"
30503 "4: movl 4(%4), %%edx\n"
30504 - "5: movl %%eax, 0(%3)\n"
30505 - "6: movl %%edx, 4(%3)\n"
30506 + "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
30507 + "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
30508 "7: movl 8(%4), %%eax\n"
30509 "8: movl 12(%4),%%edx\n"
30510 - "9: movl %%eax, 8(%3)\n"
30511 - "10: movl %%edx, 12(%3)\n"
30512 + "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
30513 + "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
30514 "11: movl 16(%4), %%eax\n"
30515 "12: movl 20(%4), %%edx\n"
30516 - "13: movl %%eax, 16(%3)\n"
30517 - "14: movl %%edx, 20(%3)\n"
30518 + "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
30519 + "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
30520 "15: movl 24(%4), %%eax\n"
30521 "16: movl 28(%4), %%edx\n"
30522 - "17: movl %%eax, 24(%3)\n"
30523 - "18: movl %%edx, 28(%3)\n"
30524 + "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
30525 + "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
30526 "19: movl 32(%4), %%eax\n"
30527 "20: movl 36(%4), %%edx\n"
30528 - "21: movl %%eax, 32(%3)\n"
30529 - "22: movl %%edx, 36(%3)\n"
30530 + "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
30531 + "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
30532 "23: movl 40(%4), %%eax\n"
30533 "24: movl 44(%4), %%edx\n"
30534 - "25: movl %%eax, 40(%3)\n"
30535 - "26: movl %%edx, 44(%3)\n"
30536 + "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
30537 + "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
30538 "27: movl 48(%4), %%eax\n"
30539 "28: movl 52(%4), %%edx\n"
30540 - "29: movl %%eax, 48(%3)\n"
30541 - "30: movl %%edx, 52(%3)\n"
30542 + "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
30543 + "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
30544 "31: movl 56(%4), %%eax\n"
30545 "32: movl 60(%4), %%edx\n"
30546 - "33: movl %%eax, 56(%3)\n"
30547 - "34: movl %%edx, 60(%3)\n"
30548 + "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
30549 + "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
30550 " addl $-64, %0\n"
30551 " addl $64, %4\n"
30552 " addl $64, %3\n"
30553 @@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
30554 " shrl $2, %0\n"
30555 " andl $3, %%eax\n"
30556 " cld\n"
30557 + __COPYUSER_SET_ES
30558 "99: rep; movsl\n"
30559 "36: movl %%eax, %0\n"
30560 "37: rep; movsb\n"
30561 "100:\n"
30562 + __COPYUSER_RESTORE_ES
30563 + ".section .fixup,\"ax\"\n"
30564 + "101: lea 0(%%eax,%0,4),%0\n"
30565 + " jmp 100b\n"
30566 + ".previous\n"
30567 + _ASM_EXTABLE(1b,100b)
30568 + _ASM_EXTABLE(2b,100b)
30569 + _ASM_EXTABLE(3b,100b)
30570 + _ASM_EXTABLE(4b,100b)
30571 + _ASM_EXTABLE(5b,100b)
30572 + _ASM_EXTABLE(6b,100b)
30573 + _ASM_EXTABLE(7b,100b)
30574 + _ASM_EXTABLE(8b,100b)
30575 + _ASM_EXTABLE(9b,100b)
30576 + _ASM_EXTABLE(10b,100b)
30577 + _ASM_EXTABLE(11b,100b)
30578 + _ASM_EXTABLE(12b,100b)
30579 + _ASM_EXTABLE(13b,100b)
30580 + _ASM_EXTABLE(14b,100b)
30581 + _ASM_EXTABLE(15b,100b)
30582 + _ASM_EXTABLE(16b,100b)
30583 + _ASM_EXTABLE(17b,100b)
30584 + _ASM_EXTABLE(18b,100b)
30585 + _ASM_EXTABLE(19b,100b)
30586 + _ASM_EXTABLE(20b,100b)
30587 + _ASM_EXTABLE(21b,100b)
30588 + _ASM_EXTABLE(22b,100b)
30589 + _ASM_EXTABLE(23b,100b)
30590 + _ASM_EXTABLE(24b,100b)
30591 + _ASM_EXTABLE(25b,100b)
30592 + _ASM_EXTABLE(26b,100b)
30593 + _ASM_EXTABLE(27b,100b)
30594 + _ASM_EXTABLE(28b,100b)
30595 + _ASM_EXTABLE(29b,100b)
30596 + _ASM_EXTABLE(30b,100b)
30597 + _ASM_EXTABLE(31b,100b)
30598 + _ASM_EXTABLE(32b,100b)
30599 + _ASM_EXTABLE(33b,100b)
30600 + _ASM_EXTABLE(34b,100b)
30601 + _ASM_EXTABLE(35b,100b)
30602 + _ASM_EXTABLE(36b,100b)
30603 + _ASM_EXTABLE(37b,100b)
30604 + _ASM_EXTABLE(99b,101b)
30605 + : "=&c"(size), "=&D" (d0), "=&S" (d1)
30606 + : "1"(to), "2"(from), "0"(size)
30607 + : "eax", "edx", "memory");
30608 + return size;
30609 +}
30610 +
30611 +static unsigned long
30612 +__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
30613 +{
30614 + int d0, d1;
30615 + __asm__ __volatile__(
30616 + " .align 2,0x90\n"
30617 + "1: "__copyuser_seg" movl 32(%4), %%eax\n"
30618 + " cmpl $67, %0\n"
30619 + " jbe 3f\n"
30620 + "2: "__copyuser_seg" movl 64(%4), %%eax\n"
30621 + " .align 2,0x90\n"
30622 + "3: "__copyuser_seg" movl 0(%4), %%eax\n"
30623 + "4: "__copyuser_seg" movl 4(%4), %%edx\n"
30624 + "5: movl %%eax, 0(%3)\n"
30625 + "6: movl %%edx, 4(%3)\n"
30626 + "7: "__copyuser_seg" movl 8(%4), %%eax\n"
30627 + "8: "__copyuser_seg" movl 12(%4),%%edx\n"
30628 + "9: movl %%eax, 8(%3)\n"
30629 + "10: movl %%edx, 12(%3)\n"
30630 + "11: "__copyuser_seg" movl 16(%4), %%eax\n"
30631 + "12: "__copyuser_seg" movl 20(%4), %%edx\n"
30632 + "13: movl %%eax, 16(%3)\n"
30633 + "14: movl %%edx, 20(%3)\n"
30634 + "15: "__copyuser_seg" movl 24(%4), %%eax\n"
30635 + "16: "__copyuser_seg" movl 28(%4), %%edx\n"
30636 + "17: movl %%eax, 24(%3)\n"
30637 + "18: movl %%edx, 28(%3)\n"
30638 + "19: "__copyuser_seg" movl 32(%4), %%eax\n"
30639 + "20: "__copyuser_seg" movl 36(%4), %%edx\n"
30640 + "21: movl %%eax, 32(%3)\n"
30641 + "22: movl %%edx, 36(%3)\n"
30642 + "23: "__copyuser_seg" movl 40(%4), %%eax\n"
30643 + "24: "__copyuser_seg" movl 44(%4), %%edx\n"
30644 + "25: movl %%eax, 40(%3)\n"
30645 + "26: movl %%edx, 44(%3)\n"
30646 + "27: "__copyuser_seg" movl 48(%4), %%eax\n"
30647 + "28: "__copyuser_seg" movl 52(%4), %%edx\n"
30648 + "29: movl %%eax, 48(%3)\n"
30649 + "30: movl %%edx, 52(%3)\n"
30650 + "31: "__copyuser_seg" movl 56(%4), %%eax\n"
30651 + "32: "__copyuser_seg" movl 60(%4), %%edx\n"
30652 + "33: movl %%eax, 56(%3)\n"
30653 + "34: movl %%edx, 60(%3)\n"
30654 + " addl $-64, %0\n"
30655 + " addl $64, %4\n"
30656 + " addl $64, %3\n"
30657 + " cmpl $63, %0\n"
30658 + " ja 1b\n"
30659 + "35: movl %0, %%eax\n"
30660 + " shrl $2, %0\n"
30661 + " andl $3, %%eax\n"
30662 + " cld\n"
30663 + "99: rep; "__copyuser_seg" movsl\n"
30664 + "36: movl %%eax, %0\n"
30665 + "37: rep; "__copyuser_seg" movsb\n"
30666 + "100:\n"
30667 ".section .fixup,\"ax\"\n"
30668 "101: lea 0(%%eax,%0,4),%0\n"
30669 " jmp 100b\n"
30670 @@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
30671 int d0, d1;
30672 __asm__ __volatile__(
30673 " .align 2,0x90\n"
30674 - "0: movl 32(%4), %%eax\n"
30675 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
30676 " cmpl $67, %0\n"
30677 " jbe 2f\n"
30678 - "1: movl 64(%4), %%eax\n"
30679 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
30680 " .align 2,0x90\n"
30681 - "2: movl 0(%4), %%eax\n"
30682 - "21: movl 4(%4), %%edx\n"
30683 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
30684 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
30685 " movl %%eax, 0(%3)\n"
30686 " movl %%edx, 4(%3)\n"
30687 - "3: movl 8(%4), %%eax\n"
30688 - "31: movl 12(%4),%%edx\n"
30689 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
30690 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
30691 " movl %%eax, 8(%3)\n"
30692 " movl %%edx, 12(%3)\n"
30693 - "4: movl 16(%4), %%eax\n"
30694 - "41: movl 20(%4), %%edx\n"
30695 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
30696 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
30697 " movl %%eax, 16(%3)\n"
30698 " movl %%edx, 20(%3)\n"
30699 - "10: movl 24(%4), %%eax\n"
30700 - "51: movl 28(%4), %%edx\n"
30701 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
30702 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
30703 " movl %%eax, 24(%3)\n"
30704 " movl %%edx, 28(%3)\n"
30705 - "11: movl 32(%4), %%eax\n"
30706 - "61: movl 36(%4), %%edx\n"
30707 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
30708 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
30709 " movl %%eax, 32(%3)\n"
30710 " movl %%edx, 36(%3)\n"
30711 - "12: movl 40(%4), %%eax\n"
30712 - "71: movl 44(%4), %%edx\n"
30713 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
30714 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
30715 " movl %%eax, 40(%3)\n"
30716 " movl %%edx, 44(%3)\n"
30717 - "13: movl 48(%4), %%eax\n"
30718 - "81: movl 52(%4), %%edx\n"
30719 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
30720 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
30721 " movl %%eax, 48(%3)\n"
30722 " movl %%edx, 52(%3)\n"
30723 - "14: movl 56(%4), %%eax\n"
30724 - "91: movl 60(%4), %%edx\n"
30725 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
30726 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
30727 " movl %%eax, 56(%3)\n"
30728 " movl %%edx, 60(%3)\n"
30729 " addl $-64, %0\n"
30730 @@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
30731 " shrl $2, %0\n"
30732 " andl $3, %%eax\n"
30733 " cld\n"
30734 - "6: rep; movsl\n"
30735 + "6: rep; "__copyuser_seg" movsl\n"
30736 " movl %%eax,%0\n"
30737 - "7: rep; movsb\n"
30738 + "7: rep; "__copyuser_seg" movsb\n"
30739 "8:\n"
30740 ".section .fixup,\"ax\"\n"
30741 "9: lea 0(%%eax,%0,4),%0\n"
30742 @@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
30743
30744 __asm__ __volatile__(
30745 " .align 2,0x90\n"
30746 - "0: movl 32(%4), %%eax\n"
30747 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
30748 " cmpl $67, %0\n"
30749 " jbe 2f\n"
30750 - "1: movl 64(%4), %%eax\n"
30751 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
30752 " .align 2,0x90\n"
30753 - "2: movl 0(%4), %%eax\n"
30754 - "21: movl 4(%4), %%edx\n"
30755 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
30756 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
30757 " movnti %%eax, 0(%3)\n"
30758 " movnti %%edx, 4(%3)\n"
30759 - "3: movl 8(%4), %%eax\n"
30760 - "31: movl 12(%4),%%edx\n"
30761 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
30762 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
30763 " movnti %%eax, 8(%3)\n"
30764 " movnti %%edx, 12(%3)\n"
30765 - "4: movl 16(%4), %%eax\n"
30766 - "41: movl 20(%4), %%edx\n"
30767 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
30768 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
30769 " movnti %%eax, 16(%3)\n"
30770 " movnti %%edx, 20(%3)\n"
30771 - "10: movl 24(%4), %%eax\n"
30772 - "51: movl 28(%4), %%edx\n"
30773 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
30774 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
30775 " movnti %%eax, 24(%3)\n"
30776 " movnti %%edx, 28(%3)\n"
30777 - "11: movl 32(%4), %%eax\n"
30778 - "61: movl 36(%4), %%edx\n"
30779 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
30780 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
30781 " movnti %%eax, 32(%3)\n"
30782 " movnti %%edx, 36(%3)\n"
30783 - "12: movl 40(%4), %%eax\n"
30784 - "71: movl 44(%4), %%edx\n"
30785 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
30786 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
30787 " movnti %%eax, 40(%3)\n"
30788 " movnti %%edx, 44(%3)\n"
30789 - "13: movl 48(%4), %%eax\n"
30790 - "81: movl 52(%4), %%edx\n"
30791 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
30792 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
30793 " movnti %%eax, 48(%3)\n"
30794 " movnti %%edx, 52(%3)\n"
30795 - "14: movl 56(%4), %%eax\n"
30796 - "91: movl 60(%4), %%edx\n"
30797 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
30798 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
30799 " movnti %%eax, 56(%3)\n"
30800 " movnti %%edx, 60(%3)\n"
30801 " addl $-64, %0\n"
30802 @@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
30803 " shrl $2, %0\n"
30804 " andl $3, %%eax\n"
30805 " cld\n"
30806 - "6: rep; movsl\n"
30807 + "6: rep; "__copyuser_seg" movsl\n"
30808 " movl %%eax,%0\n"
30809 - "7: rep; movsb\n"
30810 + "7: rep; "__copyuser_seg" movsb\n"
30811 "8:\n"
30812 ".section .fixup,\"ax\"\n"
30813 "9: lea 0(%%eax,%0,4),%0\n"
30814 @@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
30815
30816 __asm__ __volatile__(
30817 " .align 2,0x90\n"
30818 - "0: movl 32(%4), %%eax\n"
30819 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
30820 " cmpl $67, %0\n"
30821 " jbe 2f\n"
30822 - "1: movl 64(%4), %%eax\n"
30823 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
30824 " .align 2,0x90\n"
30825 - "2: movl 0(%4), %%eax\n"
30826 - "21: movl 4(%4), %%edx\n"
30827 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
30828 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
30829 " movnti %%eax, 0(%3)\n"
30830 " movnti %%edx, 4(%3)\n"
30831 - "3: movl 8(%4), %%eax\n"
30832 - "31: movl 12(%4),%%edx\n"
30833 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
30834 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
30835 " movnti %%eax, 8(%3)\n"
30836 " movnti %%edx, 12(%3)\n"
30837 - "4: movl 16(%4), %%eax\n"
30838 - "41: movl 20(%4), %%edx\n"
30839 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
30840 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
30841 " movnti %%eax, 16(%3)\n"
30842 " movnti %%edx, 20(%3)\n"
30843 - "10: movl 24(%4), %%eax\n"
30844 - "51: movl 28(%4), %%edx\n"
30845 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
30846 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
30847 " movnti %%eax, 24(%3)\n"
30848 " movnti %%edx, 28(%3)\n"
30849 - "11: movl 32(%4), %%eax\n"
30850 - "61: movl 36(%4), %%edx\n"
30851 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
30852 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
30853 " movnti %%eax, 32(%3)\n"
30854 " movnti %%edx, 36(%3)\n"
30855 - "12: movl 40(%4), %%eax\n"
30856 - "71: movl 44(%4), %%edx\n"
30857 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
30858 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
30859 " movnti %%eax, 40(%3)\n"
30860 " movnti %%edx, 44(%3)\n"
30861 - "13: movl 48(%4), %%eax\n"
30862 - "81: movl 52(%4), %%edx\n"
30863 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
30864 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
30865 " movnti %%eax, 48(%3)\n"
30866 " movnti %%edx, 52(%3)\n"
30867 - "14: movl 56(%4), %%eax\n"
30868 - "91: movl 60(%4), %%edx\n"
30869 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
30870 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
30871 " movnti %%eax, 56(%3)\n"
30872 " movnti %%edx, 60(%3)\n"
30873 " addl $-64, %0\n"
30874 @@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
30875 " shrl $2, %0\n"
30876 " andl $3, %%eax\n"
30877 " cld\n"
30878 - "6: rep; movsl\n"
30879 + "6: rep; "__copyuser_seg" movsl\n"
30880 " movl %%eax,%0\n"
30881 - "7: rep; movsb\n"
30882 + "7: rep; "__copyuser_seg" movsb\n"
30883 "8:\n"
30884 ".section .fixup,\"ax\"\n"
30885 "9: lea 0(%%eax,%0,4),%0\n"
30886 @@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
30887 */
30888 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
30889 unsigned long size);
30890 -unsigned long __copy_user_intel(void __user *to, const void *from,
30891 +unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
30892 + unsigned long size);
30893 +unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
30894 unsigned long size);
30895 unsigned long __copy_user_zeroing_intel_nocache(void *to,
30896 const void __user *from, unsigned long size);
30897 #endif /* CONFIG_X86_INTEL_USERCOPY */
30898
30899 /* Generic arbitrary sized copy. */
30900 -#define __copy_user(to, from, size) \
30901 +#define __copy_user(to, from, size, prefix, set, restore) \
30902 do { \
30903 int __d0, __d1, __d2; \
30904 __asm__ __volatile__( \
30905 + set \
30906 " cmp $7,%0\n" \
30907 " jbe 1f\n" \
30908 " movl %1,%0\n" \
30909 " negl %0\n" \
30910 " andl $7,%0\n" \
30911 " subl %0,%3\n" \
30912 - "4: rep; movsb\n" \
30913 + "4: rep; "prefix"movsb\n" \
30914 " movl %3,%0\n" \
30915 " shrl $2,%0\n" \
30916 " andl $3,%3\n" \
30917 " .align 2,0x90\n" \
30918 - "0: rep; movsl\n" \
30919 + "0: rep; "prefix"movsl\n" \
30920 " movl %3,%0\n" \
30921 - "1: rep; movsb\n" \
30922 + "1: rep; "prefix"movsb\n" \
30923 "2:\n" \
30924 + restore \
30925 ".section .fixup,\"ax\"\n" \
30926 "5: addl %3,%0\n" \
30927 " jmp 2b\n" \
30928 @@ -538,14 +650,14 @@ do { \
30929 " negl %0\n" \
30930 " andl $7,%0\n" \
30931 " subl %0,%3\n" \
30932 - "4: rep; movsb\n" \
30933 + "4: rep; "__copyuser_seg"movsb\n" \
30934 " movl %3,%0\n" \
30935 " shrl $2,%0\n" \
30936 " andl $3,%3\n" \
30937 " .align 2,0x90\n" \
30938 - "0: rep; movsl\n" \
30939 + "0: rep; "__copyuser_seg"movsl\n" \
30940 " movl %3,%0\n" \
30941 - "1: rep; movsb\n" \
30942 + "1: rep; "__copyuser_seg"movsb\n" \
30943 "2:\n" \
30944 ".section .fixup,\"ax\"\n" \
30945 "5: addl %3,%0\n" \
30946 @@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
30947 {
30948 stac();
30949 if (movsl_is_ok(to, from, n))
30950 - __copy_user(to, from, n);
30951 + __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
30952 else
30953 - n = __copy_user_intel(to, from, n);
30954 + n = __generic_copy_to_user_intel(to, from, n);
30955 clac();
30956 return n;
30957 }
30958 @@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
30959 {
30960 stac();
30961 if (movsl_is_ok(to, from, n))
30962 - __copy_user(to, from, n);
30963 + __copy_user(to, from, n, __copyuser_seg, "", "");
30964 else
30965 - n = __copy_user_intel((void __user *)to,
30966 - (const void *)from, n);
30967 + n = __generic_copy_from_user_intel(to, from, n);
30968 clac();
30969 return n;
30970 }
30971 @@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
30972 if (n > 64 && cpu_has_xmm2)
30973 n = __copy_user_intel_nocache(to, from, n);
30974 else
30975 - __copy_user(to, from, n);
30976 + __copy_user(to, from, n, __copyuser_seg, "", "");
30977 #else
30978 - __copy_user(to, from, n);
30979 + __copy_user(to, from, n, __copyuser_seg, "", "");
30980 #endif
30981 clac();
30982 return n;
30983 }
30984 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
30985
30986 -/**
30987 - * copy_to_user: - Copy a block of data into user space.
30988 - * @to: Destination address, in user space.
30989 - * @from: Source address, in kernel space.
30990 - * @n: Number of bytes to copy.
30991 - *
30992 - * Context: User context only. This function may sleep.
30993 - *
30994 - * Copy data from kernel space to user space.
30995 - *
30996 - * Returns number of bytes that could not be copied.
30997 - * On success, this will be zero.
30998 - */
30999 -unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31000 +#ifdef CONFIG_PAX_MEMORY_UDEREF
31001 +void __set_fs(mm_segment_t x)
31002 {
31003 - if (access_ok(VERIFY_WRITE, to, n))
31004 - n = __copy_to_user(to, from, n);
31005 - return n;
31006 + switch (x.seg) {
31007 + case 0:
31008 + loadsegment(gs, 0);
31009 + break;
31010 + case TASK_SIZE_MAX:
31011 + loadsegment(gs, __USER_DS);
31012 + break;
31013 + case -1UL:
31014 + loadsegment(gs, __KERNEL_DS);
31015 + break;
31016 + default:
31017 + BUG();
31018 + }
31019 }
31020 -EXPORT_SYMBOL(_copy_to_user);
31021 +EXPORT_SYMBOL(__set_fs);
31022
31023 -/**
31024 - * copy_from_user: - Copy a block of data from user space.
31025 - * @to: Destination address, in kernel space.
31026 - * @from: Source address, in user space.
31027 - * @n: Number of bytes to copy.
31028 - *
31029 - * Context: User context only. This function may sleep.
31030 - *
31031 - * Copy data from user space to kernel space.
31032 - *
31033 - * Returns number of bytes that could not be copied.
31034 - * On success, this will be zero.
31035 - *
31036 - * If some data could not be copied, this function will pad the copied
31037 - * data to the requested size using zero bytes.
31038 - */
31039 -unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31040 +void set_fs(mm_segment_t x)
31041 {
31042 - if (access_ok(VERIFY_READ, from, n))
31043 - n = __copy_from_user(to, from, n);
31044 - else
31045 - memset(to, 0, n);
31046 - return n;
31047 + current_thread_info()->addr_limit = x;
31048 + __set_fs(x);
31049 }
31050 -EXPORT_SYMBOL(_copy_from_user);
31051 +EXPORT_SYMBOL(set_fs);
31052 +#endif
31053 diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31054 index c905e89..01ab928 100644
31055 --- a/arch/x86/lib/usercopy_64.c
31056 +++ b/arch/x86/lib/usercopy_64.c
31057 @@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31058 might_fault();
31059 /* no memory constraint because it doesn't change any memory gcc knows
31060 about */
31061 + pax_open_userland();
31062 stac();
31063 asm volatile(
31064 " testq %[size8],%[size8]\n"
31065 @@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31066 _ASM_EXTABLE(0b,3b)
31067 _ASM_EXTABLE(1b,2b)
31068 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31069 - : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31070 + : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31071 [zero] "r" (0UL), [eight] "r" (8UL));
31072 clac();
31073 + pax_close_userland();
31074 return size;
31075 }
31076 EXPORT_SYMBOL(__clear_user);
31077 @@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31078 }
31079 EXPORT_SYMBOL(clear_user);
31080
31081 -unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31082 +unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31083 {
31084 - if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31085 - return copy_user_generic((__force void *)to, (__force void *)from, len);
31086 - }
31087 - return len;
31088 + if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31089 + return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31090 + return len;
31091 }
31092 EXPORT_SYMBOL(copy_in_user);
31093
31094 @@ -69,11 +70,13 @@ EXPORT_SYMBOL(copy_in_user);
31095 * it is not necessary to optimize tail handling.
31096 */
31097 __visible unsigned long
31098 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31099 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
31100 {
31101 char c;
31102 unsigned zero_len;
31103
31104 + clac();
31105 + pax_close_userland();
31106 for (; len; --len, to++) {
31107 if (__get_user_nocheck(c, from++, sizeof(char)))
31108 break;
31109 @@ -84,6 +87,5 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31110 for (c = 0, zero_len = len; zerorest && zero_len; --zero_len)
31111 if (__put_user_nocheck(c, to++, sizeof(char)))
31112 break;
31113 - clac();
31114 return len;
31115 }
31116 diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31117 index 6a19ad9..1c48f9a 100644
31118 --- a/arch/x86/mm/Makefile
31119 +++ b/arch/x86/mm/Makefile
31120 @@ -30,3 +30,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
31121 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31122
31123 obj-$(CONFIG_MEMTEST) += memtest.o
31124 +
31125 +quote:="
31126 +obj-$(CONFIG_X86_64) += uderef_64.o
31127 +CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
31128 diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31129 index 903ec1e..c4166b2 100644
31130 --- a/arch/x86/mm/extable.c
31131 +++ b/arch/x86/mm/extable.c
31132 @@ -6,12 +6,24 @@
31133 static inline unsigned long
31134 ex_insn_addr(const struct exception_table_entry *x)
31135 {
31136 - return (unsigned long)&x->insn + x->insn;
31137 + unsigned long reloc = 0;
31138 +
31139 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31140 + reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31141 +#endif
31142 +
31143 + return (unsigned long)&x->insn + x->insn + reloc;
31144 }
31145 static inline unsigned long
31146 ex_fixup_addr(const struct exception_table_entry *x)
31147 {
31148 - return (unsigned long)&x->fixup + x->fixup;
31149 + unsigned long reloc = 0;
31150 +
31151 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31152 + reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31153 +#endif
31154 +
31155 + return (unsigned long)&x->fixup + x->fixup + reloc;
31156 }
31157
31158 int fixup_exception(struct pt_regs *regs)
31159 @@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31160 unsigned long new_ip;
31161
31162 #ifdef CONFIG_PNPBIOS
31163 - if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31164 + if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31165 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31166 extern u32 pnp_bios_is_utter_crap;
31167 pnp_bios_is_utter_crap = 1;
31168 @@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31169 i += 4;
31170 p->fixup -= i;
31171 i += 4;
31172 +
31173 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31174 + BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31175 + p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31176 + p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31177 +#endif
31178 +
31179 }
31180 }
31181
31182 diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31183 index a10c8c7..35a5abb 100644
31184 --- a/arch/x86/mm/fault.c
31185 +++ b/arch/x86/mm/fault.c
31186 @@ -14,11 +14,18 @@
31187 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31188 #include <linux/prefetch.h> /* prefetchw */
31189 #include <linux/context_tracking.h> /* exception_enter(), ... */
31190 +#include <linux/unistd.h>
31191 +#include <linux/compiler.h>
31192
31193 #include <asm/traps.h> /* dotraplinkage, ... */
31194 #include <asm/pgalloc.h> /* pgd_*(), ... */
31195 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31196 #include <asm/fixmap.h> /* VSYSCALL_START */
31197 +#include <asm/tlbflush.h>
31198 +
31199 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31200 +#include <asm/stacktrace.h>
31201 +#endif
31202
31203 #define CREATE_TRACE_POINTS
31204 #include <asm/trace/exceptions.h>
31205 @@ -59,7 +66,7 @@ static inline int __kprobes kprobes_fault(struct pt_regs *regs)
31206 int ret = 0;
31207
31208 /* kprobe_running() needs smp_processor_id() */
31209 - if (kprobes_built_in() && !user_mode_vm(regs)) {
31210 + if (kprobes_built_in() && !user_mode(regs)) {
31211 preempt_disable();
31212 if (kprobe_running() && kprobe_fault_handler(regs, 14))
31213 ret = 1;
31214 @@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31215 return !instr_lo || (instr_lo>>1) == 1;
31216 case 0x00:
31217 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31218 - if (probe_kernel_address(instr, opcode))
31219 + if (user_mode(regs)) {
31220 + if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31221 + return 0;
31222 + } else if (probe_kernel_address(instr, opcode))
31223 return 0;
31224
31225 *prefetch = (instr_lo == 0xF) &&
31226 @@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31227 while (instr < max_instr) {
31228 unsigned char opcode;
31229
31230 - if (probe_kernel_address(instr, opcode))
31231 + if (user_mode(regs)) {
31232 + if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31233 + break;
31234 + } else if (probe_kernel_address(instr, opcode))
31235 break;
31236
31237 instr++;
31238 @@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31239 force_sig_info(si_signo, &info, tsk);
31240 }
31241
31242 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31243 +static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31244 +#endif
31245 +
31246 +#ifdef CONFIG_PAX_EMUTRAMP
31247 +static int pax_handle_fetch_fault(struct pt_regs *regs);
31248 +#endif
31249 +
31250 +#ifdef CONFIG_PAX_PAGEEXEC
31251 +static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31252 +{
31253 + pgd_t *pgd;
31254 + pud_t *pud;
31255 + pmd_t *pmd;
31256 +
31257 + pgd = pgd_offset(mm, address);
31258 + if (!pgd_present(*pgd))
31259 + return NULL;
31260 + pud = pud_offset(pgd, address);
31261 + if (!pud_present(*pud))
31262 + return NULL;
31263 + pmd = pmd_offset(pud, address);
31264 + if (!pmd_present(*pmd))
31265 + return NULL;
31266 + return pmd;
31267 +}
31268 +#endif
31269 +
31270 DEFINE_SPINLOCK(pgd_lock);
31271 LIST_HEAD(pgd_list);
31272
31273 @@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
31274 for (address = VMALLOC_START & PMD_MASK;
31275 address >= TASK_SIZE && address < FIXADDR_TOP;
31276 address += PMD_SIZE) {
31277 +
31278 +#ifdef CONFIG_PAX_PER_CPU_PGD
31279 + unsigned long cpu;
31280 +#else
31281 struct page *page;
31282 +#endif
31283
31284 spin_lock(&pgd_lock);
31285 +
31286 +#ifdef CONFIG_PAX_PER_CPU_PGD
31287 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31288 + pgd_t *pgd = get_cpu_pgd(cpu, user);
31289 + pmd_t *ret;
31290 +
31291 + ret = vmalloc_sync_one(pgd, address);
31292 + if (!ret)
31293 + break;
31294 + pgd = get_cpu_pgd(cpu, kernel);
31295 +#else
31296 list_for_each_entry(page, &pgd_list, lru) {
31297 + pgd_t *pgd;
31298 spinlock_t *pgt_lock;
31299 pmd_t *ret;
31300
31301 @@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
31302 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31303
31304 spin_lock(pgt_lock);
31305 - ret = vmalloc_sync_one(page_address(page), address);
31306 + pgd = page_address(page);
31307 +#endif
31308 +
31309 + ret = vmalloc_sync_one(pgd, address);
31310 +
31311 +#ifndef CONFIG_PAX_PER_CPU_PGD
31312 spin_unlock(pgt_lock);
31313 +#endif
31314
31315 if (!ret)
31316 break;
31317 @@ -281,6 +345,12 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
31318 * an interrupt in the middle of a task switch..
31319 */
31320 pgd_paddr = read_cr3();
31321 +
31322 +#ifdef CONFIG_PAX_PER_CPU_PGD
31323 + BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
31324 + vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
31325 +#endif
31326 +
31327 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
31328 if (!pmd_k)
31329 return -1;
31330 @@ -376,11 +446,25 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
31331 * happen within a race in page table update. In the later
31332 * case just flush:
31333 */
31334 - pgd = pgd_offset(current->active_mm, address);
31335 +
31336 pgd_ref = pgd_offset_k(address);
31337 if (pgd_none(*pgd_ref))
31338 return -1;
31339
31340 +#ifdef CONFIG_PAX_PER_CPU_PGD
31341 + BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
31342 + pgd = pgd_offset_cpu(smp_processor_id(), user, address);
31343 + if (pgd_none(*pgd)) {
31344 + set_pgd(pgd, *pgd_ref);
31345 + arch_flush_lazy_mmu_mode();
31346 + } else {
31347 + BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
31348 + }
31349 + pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
31350 +#else
31351 + pgd = pgd_offset(current->active_mm, address);
31352 +#endif
31353 +
31354 if (pgd_none(*pgd)) {
31355 set_pgd(pgd, *pgd_ref);
31356 arch_flush_lazy_mmu_mode();
31357 @@ -546,7 +630,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
31358 static int is_errata100(struct pt_regs *regs, unsigned long address)
31359 {
31360 #ifdef CONFIG_X86_64
31361 - if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
31362 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
31363 return 1;
31364 #endif
31365 return 0;
31366 @@ -573,7 +657,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
31367 }
31368
31369 static const char nx_warning[] = KERN_CRIT
31370 -"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
31371 +"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
31372
31373 static void
31374 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31375 @@ -582,15 +666,27 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31376 if (!oops_may_print())
31377 return;
31378
31379 - if (error_code & PF_INSTR) {
31380 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
31381 unsigned int level;
31382
31383 pte_t *pte = lookup_address(address, &level);
31384
31385 if (pte && pte_present(*pte) && !pte_exec(*pte))
31386 - printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
31387 + printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31388 }
31389
31390 +#ifdef CONFIG_PAX_KERNEXEC
31391 + if (init_mm.start_code <= address && address < init_mm.end_code) {
31392 + if (current->signal->curr_ip)
31393 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
31394 + &current->signal->curr_ip, current->comm, task_pid_nr(current),
31395 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31396 + else
31397 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
31398 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31399 + }
31400 +#endif
31401 +
31402 printk(KERN_ALERT "BUG: unable to handle kernel ");
31403 if (address < PAGE_SIZE)
31404 printk(KERN_CONT "NULL pointer dereference");
31405 @@ -771,6 +867,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
31406 return;
31407 }
31408 #endif
31409 +
31410 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31411 + if (pax_is_fetch_fault(regs, error_code, address)) {
31412 +
31413 +#ifdef CONFIG_PAX_EMUTRAMP
31414 + switch (pax_handle_fetch_fault(regs)) {
31415 + case 2:
31416 + return;
31417 + }
31418 +#endif
31419 +
31420 + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
31421 + do_group_exit(SIGKILL);
31422 + }
31423 +#endif
31424 +
31425 /* Kernel addresses are always protection faults: */
31426 if (address >= TASK_SIZE)
31427 error_code |= PF_PROT;
31428 @@ -856,7 +968,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
31429 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
31430 printk(KERN_ERR
31431 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
31432 - tsk->comm, tsk->pid, address);
31433 + tsk->comm, task_pid_nr(tsk), address);
31434 code = BUS_MCEERR_AR;
31435 }
31436 #endif
31437 @@ -910,6 +1022,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
31438 return 1;
31439 }
31440
31441 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
31442 +static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
31443 +{
31444 + pte_t *pte;
31445 + pmd_t *pmd;
31446 + spinlock_t *ptl;
31447 + unsigned char pte_mask;
31448 +
31449 + if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
31450 + !(mm->pax_flags & MF_PAX_PAGEEXEC))
31451 + return 0;
31452 +
31453 + /* PaX: it's our fault, let's handle it if we can */
31454 +
31455 + /* PaX: take a look at read faults before acquiring any locks */
31456 + if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
31457 + /* instruction fetch attempt from a protected page in user mode */
31458 + up_read(&mm->mmap_sem);
31459 +
31460 +#ifdef CONFIG_PAX_EMUTRAMP
31461 + switch (pax_handle_fetch_fault(regs)) {
31462 + case 2:
31463 + return 1;
31464 + }
31465 +#endif
31466 +
31467 + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
31468 + do_group_exit(SIGKILL);
31469 + }
31470 +
31471 + pmd = pax_get_pmd(mm, address);
31472 + if (unlikely(!pmd))
31473 + return 0;
31474 +
31475 + pte = pte_offset_map_lock(mm, pmd, address, &ptl);
31476 + if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
31477 + pte_unmap_unlock(pte, ptl);
31478 + return 0;
31479 + }
31480 +
31481 + if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
31482 + /* write attempt to a protected page in user mode */
31483 + pte_unmap_unlock(pte, ptl);
31484 + return 0;
31485 + }
31486 +
31487 +#ifdef CONFIG_SMP
31488 + if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
31489 +#else
31490 + if (likely(address > get_limit(regs->cs)))
31491 +#endif
31492 + {
31493 + set_pte(pte, pte_mkread(*pte));
31494 + __flush_tlb_one(address);
31495 + pte_unmap_unlock(pte, ptl);
31496 + up_read(&mm->mmap_sem);
31497 + return 1;
31498 + }
31499 +
31500 + pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
31501 +
31502 + /*
31503 + * PaX: fill DTLB with user rights and retry
31504 + */
31505 + __asm__ __volatile__ (
31506 + "orb %2,(%1)\n"
31507 +#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
31508 +/*
31509 + * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
31510 + * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
31511 + * page fault when examined during a TLB load attempt. this is true not only
31512 + * for PTEs holding a non-present entry but also present entries that will
31513 + * raise a page fault (such as those set up by PaX, or the copy-on-write
31514 + * mechanism). in effect it means that we do *not* need to flush the TLBs
31515 + * for our target pages since their PTEs are simply not in the TLBs at all.
31516 +
31517 + * the best thing in omitting it is that we gain around 15-20% speed in the
31518 + * fast path of the page fault handler and can get rid of tracing since we
31519 + * can no longer flush unintended entries.
31520 + */
31521 + "invlpg (%0)\n"
31522 +#endif
31523 + __copyuser_seg"testb $0,(%0)\n"
31524 + "xorb %3,(%1)\n"
31525 + :
31526 + : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
31527 + : "memory", "cc");
31528 + pte_unmap_unlock(pte, ptl);
31529 + up_read(&mm->mmap_sem);
31530 + return 1;
31531 +}
31532 +#endif
31533 +
31534 /*
31535 * Handle a spurious fault caused by a stale TLB entry.
31536 *
31537 @@ -976,6 +1181,9 @@ int show_unhandled_signals = 1;
31538 static inline int
31539 access_error(unsigned long error_code, struct vm_area_struct *vma)
31540 {
31541 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
31542 + return 1;
31543 +
31544 if (error_code & PF_WRITE) {
31545 /* write, present and write, not present: */
31546 if (unlikely(!(vma->vm_flags & VM_WRITE)))
31547 @@ -1010,7 +1218,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
31548 if (error_code & PF_USER)
31549 return false;
31550
31551 - if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
31552 + if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
31553 return false;
31554
31555 return true;
31556 @@ -1038,6 +1246,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
31557 tsk = current;
31558 mm = tsk->mm;
31559
31560 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31561 + if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
31562 + if (!search_exception_tables(regs->ip)) {
31563 + printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
31564 + bad_area_nosemaphore(regs, error_code, address);
31565 + return;
31566 + }
31567 + if (address < pax_user_shadow_base) {
31568 + printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
31569 + printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
31570 + show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
31571 + } else
31572 + address -= pax_user_shadow_base;
31573 + }
31574 +#endif
31575 +
31576 /*
31577 * Detect and handle instructions that would cause a page fault for
31578 * both a tracked kernel page and a userspace page.
31579 @@ -1115,7 +1339,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
31580 * User-mode registers count as a user access even for any
31581 * potential system fault or CPU buglet:
31582 */
31583 - if (user_mode_vm(regs)) {
31584 + if (user_mode(regs)) {
31585 local_irq_enable();
31586 error_code |= PF_USER;
31587 flags |= FAULT_FLAG_USER;
31588 @@ -1162,6 +1386,11 @@ retry:
31589 might_sleep();
31590 }
31591
31592 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
31593 + if (pax_handle_pageexec_fault(regs, mm, address, error_code))
31594 + return;
31595 +#endif
31596 +
31597 vma = find_vma(mm, address);
31598 if (unlikely(!vma)) {
31599 bad_area(regs, error_code, address);
31600 @@ -1173,18 +1402,24 @@ retry:
31601 bad_area(regs, error_code, address);
31602 return;
31603 }
31604 - if (error_code & PF_USER) {
31605 - /*
31606 - * Accessing the stack below %sp is always a bug.
31607 - * The large cushion allows instructions like enter
31608 - * and pusha to work. ("enter $65535, $31" pushes
31609 - * 32 pointers and then decrements %sp by 65535.)
31610 - */
31611 - if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
31612 - bad_area(regs, error_code, address);
31613 - return;
31614 - }
31615 + /*
31616 + * Accessing the stack below %sp is always a bug.
31617 + * The large cushion allows instructions like enter
31618 + * and pusha to work. ("enter $65535, $31" pushes
31619 + * 32 pointers and then decrements %sp by 65535.)
31620 + */
31621 + if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
31622 + bad_area(regs, error_code, address);
31623 + return;
31624 }
31625 +
31626 +#ifdef CONFIG_PAX_SEGMEXEC
31627 + if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
31628 + bad_area(regs, error_code, address);
31629 + return;
31630 + }
31631 +#endif
31632 +
31633 if (unlikely(expand_stack(vma, address))) {
31634 bad_area(regs, error_code, address);
31635 return;
31636 @@ -1296,3 +1531,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
31637 exception_exit(prev_state);
31638 }
31639 #endif /* CONFIG_TRACING */
31640 +
31641 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31642 +static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
31643 +{
31644 + struct mm_struct *mm = current->mm;
31645 + unsigned long ip = regs->ip;
31646 +
31647 + if (v8086_mode(regs))
31648 + ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
31649 +
31650 +#ifdef CONFIG_PAX_PAGEEXEC
31651 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
31652 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
31653 + return true;
31654 + if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
31655 + return true;
31656 + return false;
31657 + }
31658 +#endif
31659 +
31660 +#ifdef CONFIG_PAX_SEGMEXEC
31661 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
31662 + if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
31663 + return true;
31664 + return false;
31665 + }
31666 +#endif
31667 +
31668 + return false;
31669 +}
31670 +#endif
31671 +
31672 +#ifdef CONFIG_PAX_EMUTRAMP
31673 +static int pax_handle_fetch_fault_32(struct pt_regs *regs)
31674 +{
31675 + int err;
31676 +
31677 + do { /* PaX: libffi trampoline emulation */
31678 + unsigned char mov, jmp;
31679 + unsigned int addr1, addr2;
31680 +
31681 +#ifdef CONFIG_X86_64
31682 + if ((regs->ip + 9) >> 32)
31683 + break;
31684 +#endif
31685 +
31686 + err = get_user(mov, (unsigned char __user *)regs->ip);
31687 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
31688 + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
31689 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
31690 +
31691 + if (err)
31692 + break;
31693 +
31694 + if (mov == 0xB8 && jmp == 0xE9) {
31695 + regs->ax = addr1;
31696 + regs->ip = (unsigned int)(regs->ip + addr2 + 10);
31697 + return 2;
31698 + }
31699 + } while (0);
31700 +
31701 + do { /* PaX: gcc trampoline emulation #1 */
31702 + unsigned char mov1, mov2;
31703 + unsigned short jmp;
31704 + unsigned int addr1, addr2;
31705 +
31706 +#ifdef CONFIG_X86_64
31707 + if ((regs->ip + 11) >> 32)
31708 + break;
31709 +#endif
31710 +
31711 + err = get_user(mov1, (unsigned char __user *)regs->ip);
31712 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
31713 + err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
31714 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
31715 + err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
31716 +
31717 + if (err)
31718 + break;
31719 +
31720 + if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
31721 + regs->cx = addr1;
31722 + regs->ax = addr2;
31723 + regs->ip = addr2;
31724 + return 2;
31725 + }
31726 + } while (0);
31727 +
31728 + do { /* PaX: gcc trampoline emulation #2 */
31729 + unsigned char mov, jmp;
31730 + unsigned int addr1, addr2;
31731 +
31732 +#ifdef CONFIG_X86_64
31733 + if ((regs->ip + 9) >> 32)
31734 + break;
31735 +#endif
31736 +
31737 + err = get_user(mov, (unsigned char __user *)regs->ip);
31738 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
31739 + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
31740 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
31741 +
31742 + if (err)
31743 + break;
31744 +
31745 + if (mov == 0xB9 && jmp == 0xE9) {
31746 + regs->cx = addr1;
31747 + regs->ip = (unsigned int)(regs->ip + addr2 + 10);
31748 + return 2;
31749 + }
31750 + } while (0);
31751 +
31752 + return 1; /* PaX in action */
31753 +}
31754 +
31755 +#ifdef CONFIG_X86_64
31756 +static int pax_handle_fetch_fault_64(struct pt_regs *regs)
31757 +{
31758 + int err;
31759 +
31760 + do { /* PaX: libffi trampoline emulation */
31761 + unsigned short mov1, mov2, jmp1;
31762 + unsigned char stcclc, jmp2;
31763 + unsigned long addr1, addr2;
31764 +
31765 + err = get_user(mov1, (unsigned short __user *)regs->ip);
31766 + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
31767 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
31768 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
31769 + err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
31770 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
31771 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
31772 +
31773 + if (err)
31774 + break;
31775 +
31776 + if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
31777 + regs->r11 = addr1;
31778 + regs->r10 = addr2;
31779 + if (stcclc == 0xF8)
31780 + regs->flags &= ~X86_EFLAGS_CF;
31781 + else
31782 + regs->flags |= X86_EFLAGS_CF;
31783 + regs->ip = addr1;
31784 + return 2;
31785 + }
31786 + } while (0);
31787 +
31788 + do { /* PaX: gcc trampoline emulation #1 */
31789 + unsigned short mov1, mov2, jmp1;
31790 + unsigned char jmp2;
31791 + unsigned int addr1;
31792 + unsigned long addr2;
31793 +
31794 + err = get_user(mov1, (unsigned short __user *)regs->ip);
31795 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
31796 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
31797 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
31798 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
31799 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
31800 +
31801 + if (err)
31802 + break;
31803 +
31804 + if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
31805 + regs->r11 = addr1;
31806 + regs->r10 = addr2;
31807 + regs->ip = addr1;
31808 + return 2;
31809 + }
31810 + } while (0);
31811 +
31812 + do { /* PaX: gcc trampoline emulation #2 */
31813 + unsigned short mov1, mov2, jmp1;
31814 + unsigned char jmp2;
31815 + unsigned long addr1, addr2;
31816 +
31817 + err = get_user(mov1, (unsigned short __user *)regs->ip);
31818 + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
31819 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
31820 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
31821 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
31822 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
31823 +
31824 + if (err)
31825 + break;
31826 +
31827 + if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
31828 + regs->r11 = addr1;
31829 + regs->r10 = addr2;
31830 + regs->ip = addr1;
31831 + return 2;
31832 + }
31833 + } while (0);
31834 +
31835 + return 1; /* PaX in action */
31836 +}
31837 +#endif
31838 +
31839 +/*
31840 + * PaX: decide what to do with offenders (regs->ip = fault address)
31841 + *
31842 + * returns 1 when task should be killed
31843 + * 2 when gcc trampoline was detected
31844 + */
31845 +static int pax_handle_fetch_fault(struct pt_regs *regs)
31846 +{
31847 + if (v8086_mode(regs))
31848 + return 1;
31849 +
31850 + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
31851 + return 1;
31852 +
31853 +#ifdef CONFIG_X86_32
31854 + return pax_handle_fetch_fault_32(regs);
31855 +#else
31856 + if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
31857 + return pax_handle_fetch_fault_32(regs);
31858 + else
31859 + return pax_handle_fetch_fault_64(regs);
31860 +#endif
31861 +}
31862 +#endif
31863 +
31864 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31865 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
31866 +{
31867 + long i;
31868 +
31869 + printk(KERN_ERR "PAX: bytes at PC: ");
31870 + for (i = 0; i < 20; i++) {
31871 + unsigned char c;
31872 + if (get_user(c, (unsigned char __force_user *)pc+i))
31873 + printk(KERN_CONT "?? ");
31874 + else
31875 + printk(KERN_CONT "%02x ", c);
31876 + }
31877 + printk("\n");
31878 +
31879 + printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
31880 + for (i = -1; i < 80 / (long)sizeof(long); i++) {
31881 + unsigned long c;
31882 + if (get_user(c, (unsigned long __force_user *)sp+i)) {
31883 +#ifdef CONFIG_X86_32
31884 + printk(KERN_CONT "???????? ");
31885 +#else
31886 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
31887 + printk(KERN_CONT "???????? ???????? ");
31888 + else
31889 + printk(KERN_CONT "???????????????? ");
31890 +#endif
31891 + } else {
31892 +#ifdef CONFIG_X86_64
31893 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
31894 + printk(KERN_CONT "%08x ", (unsigned int)c);
31895 + printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
31896 + } else
31897 +#endif
31898 + printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
31899 + }
31900 + }
31901 + printk("\n");
31902 +}
31903 +#endif
31904 +
31905 +/**
31906 + * probe_kernel_write(): safely attempt to write to a location
31907 + * @dst: address to write to
31908 + * @src: pointer to the data that shall be written
31909 + * @size: size of the data chunk
31910 + *
31911 + * Safely write to address @dst from the buffer at @src. If a kernel fault
31912 + * happens, handle that and return -EFAULT.
31913 + */
31914 +long notrace probe_kernel_write(void *dst, const void *src, size_t size)
31915 +{
31916 + long ret;
31917 + mm_segment_t old_fs = get_fs();
31918 +
31919 + set_fs(KERNEL_DS);
31920 + pagefault_disable();
31921 + pax_open_kernel();
31922 + ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
31923 + pax_close_kernel();
31924 + pagefault_enable();
31925 + set_fs(old_fs);
31926 +
31927 + return ret ? -EFAULT : 0;
31928 +}
31929 diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
31930 index 207d9aef..69030980 100644
31931 --- a/arch/x86/mm/gup.c
31932 +++ b/arch/x86/mm/gup.c
31933 @@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
31934 addr = start;
31935 len = (unsigned long) nr_pages << PAGE_SHIFT;
31936 end = start + len;
31937 - if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
31938 + if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
31939 (void __user *)start, len)))
31940 return 0;
31941
31942 @@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
31943 goto slow_irqon;
31944 #endif
31945
31946 + if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
31947 + (void __user *)start, len)))
31948 + return 0;
31949 +
31950 /*
31951 * XXX: batch / limit 'nr', to avoid large irq off latency
31952 * needs some instrumenting to determine the common sizes used by
31953 diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
31954 index 4500142..53a363c 100644
31955 --- a/arch/x86/mm/highmem_32.c
31956 +++ b/arch/x86/mm/highmem_32.c
31957 @@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
31958 idx = type + KM_TYPE_NR*smp_processor_id();
31959 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
31960 BUG_ON(!pte_none(*(kmap_pte-idx)));
31961 +
31962 + pax_open_kernel();
31963 set_pte(kmap_pte-idx, mk_pte(page, prot));
31964 + pax_close_kernel();
31965 +
31966 arch_flush_lazy_mmu_mode();
31967
31968 return (void *)vaddr;
31969 diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
31970 index 8c9f647..57cb402 100644
31971 --- a/arch/x86/mm/hugetlbpage.c
31972 +++ b/arch/x86/mm/hugetlbpage.c
31973 @@ -90,23 +90,24 @@ int pmd_huge_support(void)
31974 #ifdef CONFIG_HUGETLB_PAGE
31975 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
31976 unsigned long addr, unsigned long len,
31977 - unsigned long pgoff, unsigned long flags)
31978 + unsigned long pgoff, unsigned long flags, unsigned long offset)
31979 {
31980 struct hstate *h = hstate_file(file);
31981 struct vm_unmapped_area_info info;
31982 -
31983 +
31984 info.flags = 0;
31985 info.length = len;
31986 info.low_limit = current->mm->mmap_legacy_base;
31987 info.high_limit = TASK_SIZE;
31988 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
31989 info.align_offset = 0;
31990 + info.threadstack_offset = offset;
31991 return vm_unmapped_area(&info);
31992 }
31993
31994 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
31995 unsigned long addr0, unsigned long len,
31996 - unsigned long pgoff, unsigned long flags)
31997 + unsigned long pgoff, unsigned long flags, unsigned long offset)
31998 {
31999 struct hstate *h = hstate_file(file);
32000 struct vm_unmapped_area_info info;
32001 @@ -118,6 +119,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32002 info.high_limit = current->mm->mmap_base;
32003 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32004 info.align_offset = 0;
32005 + info.threadstack_offset = offset;
32006 addr = vm_unmapped_area(&info);
32007
32008 /*
32009 @@ -130,6 +132,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32010 VM_BUG_ON(addr != -ENOMEM);
32011 info.flags = 0;
32012 info.low_limit = TASK_UNMAPPED_BASE;
32013 +
32014 +#ifdef CONFIG_PAX_RANDMMAP
32015 + if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32016 + info.low_limit += current->mm->delta_mmap;
32017 +#endif
32018 +
32019 info.high_limit = TASK_SIZE;
32020 addr = vm_unmapped_area(&info);
32021 }
32022 @@ -144,10 +152,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32023 struct hstate *h = hstate_file(file);
32024 struct mm_struct *mm = current->mm;
32025 struct vm_area_struct *vma;
32026 + unsigned long pax_task_size = TASK_SIZE;
32027 + unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32028
32029 if (len & ~huge_page_mask(h))
32030 return -EINVAL;
32031 - if (len > TASK_SIZE)
32032 +
32033 +#ifdef CONFIG_PAX_SEGMEXEC
32034 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
32035 + pax_task_size = SEGMEXEC_TASK_SIZE;
32036 +#endif
32037 +
32038 + pax_task_size -= PAGE_SIZE;
32039 +
32040 + if (len > pax_task_size)
32041 return -ENOMEM;
32042
32043 if (flags & MAP_FIXED) {
32044 @@ -156,19 +174,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32045 return addr;
32046 }
32047
32048 +#ifdef CONFIG_PAX_RANDMMAP
32049 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32050 +#endif
32051 +
32052 if (addr) {
32053 addr = ALIGN(addr, huge_page_size(h));
32054 vma = find_vma(mm, addr);
32055 - if (TASK_SIZE - len >= addr &&
32056 - (!vma || addr + len <= vma->vm_start))
32057 + if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32058 return addr;
32059 }
32060 if (mm->get_unmapped_area == arch_get_unmapped_area)
32061 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32062 - pgoff, flags);
32063 + pgoff, flags, offset);
32064 else
32065 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32066 - pgoff, flags);
32067 + pgoff, flags, offset);
32068 }
32069 #endif /* CONFIG_HUGETLB_PAGE */
32070
32071 diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32072 index f971306..e83e0f6 100644
32073 --- a/arch/x86/mm/init.c
32074 +++ b/arch/x86/mm/init.c
32075 @@ -4,6 +4,7 @@
32076 #include <linux/swap.h>
32077 #include <linux/memblock.h>
32078 #include <linux/bootmem.h> /* for max_low_pfn */
32079 +#include <linux/tboot.h>
32080
32081 #include <asm/cacheflush.h>
32082 #include <asm/e820.h>
32083 @@ -17,6 +18,8 @@
32084 #include <asm/proto.h>
32085 #include <asm/dma.h> /* for MAX_DMA_PFN */
32086 #include <asm/microcode.h>
32087 +#include <asm/desc.h>
32088 +#include <asm/bios_ebda.h>
32089
32090 #include "mm_internal.h"
32091
32092 @@ -563,7 +566,18 @@ void __init init_mem_mapping(void)
32093 early_ioremap_page_table_range_init();
32094 #endif
32095
32096 +#ifdef CONFIG_PAX_PER_CPU_PGD
32097 + clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32098 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32099 + KERNEL_PGD_PTRS);
32100 + clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32101 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32102 + KERNEL_PGD_PTRS);
32103 + load_cr3(get_cpu_pgd(0, kernel));
32104 +#else
32105 load_cr3(swapper_pg_dir);
32106 +#endif
32107 +
32108 __flush_tlb_all();
32109
32110 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32111 @@ -579,10 +593,40 @@ void __init init_mem_mapping(void)
32112 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32113 * mmio resources as well as potential bios/acpi data regions.
32114 */
32115 +
32116 +#ifdef CONFIG_GRKERNSEC_KMEM
32117 +static unsigned int ebda_start __read_only;
32118 +static unsigned int ebda_end __read_only;
32119 +#endif
32120 +
32121 int devmem_is_allowed(unsigned long pagenr)
32122 {
32123 - if (pagenr < 256)
32124 +#ifdef CONFIG_GRKERNSEC_KMEM
32125 + /* allow BDA */
32126 + if (!pagenr)
32127 return 1;
32128 + /* allow EBDA */
32129 + if (pagenr >= ebda_start && pagenr < ebda_end)
32130 + return 1;
32131 + /* if tboot is in use, allow access to its hardcoded serial log range */
32132 + if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32133 + return 1;
32134 +#else
32135 + if (!pagenr)
32136 + return 1;
32137 +#ifdef CONFIG_VM86
32138 + if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32139 + return 1;
32140 +#endif
32141 +#endif
32142 +
32143 + if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32144 + return 1;
32145 +#ifdef CONFIG_GRKERNSEC_KMEM
32146 + /* throw out everything else below 1MB */
32147 + if (pagenr <= 256)
32148 + return 0;
32149 +#endif
32150 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32151 return 0;
32152 if (!page_is_ram(pagenr))
32153 @@ -628,8 +672,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32154 #endif
32155 }
32156
32157 +#ifdef CONFIG_GRKERNSEC_KMEM
32158 +static inline void gr_init_ebda(void)
32159 +{
32160 + unsigned int ebda_addr;
32161 + unsigned int ebda_size = 0;
32162 +
32163 + ebda_addr = get_bios_ebda();
32164 + if (ebda_addr) {
32165 + ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32166 + ebda_size <<= 10;
32167 + }
32168 + if (ebda_addr && ebda_size) {
32169 + ebda_start = ebda_addr >> PAGE_SHIFT;
32170 + ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32171 + } else {
32172 + ebda_start = 0x9f000 >> PAGE_SHIFT;
32173 + ebda_end = 0xa0000 >> PAGE_SHIFT;
32174 + }
32175 +}
32176 +#else
32177 +static inline void gr_init_ebda(void) { }
32178 +#endif
32179 +
32180 void free_initmem(void)
32181 {
32182 +#ifdef CONFIG_PAX_KERNEXEC
32183 +#ifdef CONFIG_X86_32
32184 + /* PaX: limit KERNEL_CS to actual size */
32185 + unsigned long addr, limit;
32186 + struct desc_struct d;
32187 + int cpu;
32188 +#else
32189 + pgd_t *pgd;
32190 + pud_t *pud;
32191 + pmd_t *pmd;
32192 + unsigned long addr, end;
32193 +#endif
32194 +#endif
32195 +
32196 + gr_init_ebda();
32197 +
32198 +#ifdef CONFIG_PAX_KERNEXEC
32199 +#ifdef CONFIG_X86_32
32200 + limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32201 + limit = (limit - 1UL) >> PAGE_SHIFT;
32202 +
32203 + memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32204 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32205 + pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32206 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32207 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32208 + }
32209 +
32210 + /* PaX: make KERNEL_CS read-only */
32211 + addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32212 + if (!paravirt_enabled())
32213 + set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32214 +/*
32215 + for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32216 + pgd = pgd_offset_k(addr);
32217 + pud = pud_offset(pgd, addr);
32218 + pmd = pmd_offset(pud, addr);
32219 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32220 + }
32221 +*/
32222 +#ifdef CONFIG_X86_PAE
32223 + set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32224 +/*
32225 + for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32226 + pgd = pgd_offset_k(addr);
32227 + pud = pud_offset(pgd, addr);
32228 + pmd = pmd_offset(pud, addr);
32229 + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32230 + }
32231 +*/
32232 +#endif
32233 +
32234 +#ifdef CONFIG_MODULES
32235 + set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32236 +#endif
32237 +
32238 +#else
32239 + /* PaX: make kernel code/rodata read-only, rest non-executable */
32240 + for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32241 + pgd = pgd_offset_k(addr);
32242 + pud = pud_offset(pgd, addr);
32243 + pmd = pmd_offset(pud, addr);
32244 + if (!pmd_present(*pmd))
32245 + continue;
32246 + if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
32247 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32248 + else
32249 + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32250 + }
32251 +
32252 + addr = (unsigned long)__va(__pa(__START_KERNEL_map));
32253 + end = addr + KERNEL_IMAGE_SIZE;
32254 + for (; addr < end; addr += PMD_SIZE) {
32255 + pgd = pgd_offset_k(addr);
32256 + pud = pud_offset(pgd, addr);
32257 + pmd = pmd_offset(pud, addr);
32258 + if (!pmd_present(*pmd))
32259 + continue;
32260 + if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
32261 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32262 + }
32263 +#endif
32264 +
32265 + flush_tlb_all();
32266 +#endif
32267 +
32268 free_init_pages("unused kernel",
32269 (unsigned long)(&__init_begin),
32270 (unsigned long)(&__init_end));
32271 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
32272 index e395048..cd38278 100644
32273 --- a/arch/x86/mm/init_32.c
32274 +++ b/arch/x86/mm/init_32.c
32275 @@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
32276 bool __read_mostly __vmalloc_start_set = false;
32277
32278 /*
32279 - * Creates a middle page table and puts a pointer to it in the
32280 - * given global directory entry. This only returns the gd entry
32281 - * in non-PAE compilation mode, since the middle layer is folded.
32282 - */
32283 -static pmd_t * __init one_md_table_init(pgd_t *pgd)
32284 -{
32285 - pud_t *pud;
32286 - pmd_t *pmd_table;
32287 -
32288 -#ifdef CONFIG_X86_PAE
32289 - if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
32290 - pmd_table = (pmd_t *)alloc_low_page();
32291 - paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
32292 - set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
32293 - pud = pud_offset(pgd, 0);
32294 - BUG_ON(pmd_table != pmd_offset(pud, 0));
32295 -
32296 - return pmd_table;
32297 - }
32298 -#endif
32299 - pud = pud_offset(pgd, 0);
32300 - pmd_table = pmd_offset(pud, 0);
32301 -
32302 - return pmd_table;
32303 -}
32304 -
32305 -/*
32306 * Create a page table and place a pointer to it in a middle page
32307 * directory entry:
32308 */
32309 @@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
32310 pte_t *page_table = (pte_t *)alloc_low_page();
32311
32312 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
32313 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32314 + set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
32315 +#else
32316 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
32317 +#endif
32318 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
32319 }
32320
32321 return pte_offset_kernel(pmd, 0);
32322 }
32323
32324 +static pmd_t * __init one_md_table_init(pgd_t *pgd)
32325 +{
32326 + pud_t *pud;
32327 + pmd_t *pmd_table;
32328 +
32329 + pud = pud_offset(pgd, 0);
32330 + pmd_table = pmd_offset(pud, 0);
32331 +
32332 + return pmd_table;
32333 +}
32334 +
32335 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
32336 {
32337 int pgd_idx = pgd_index(vaddr);
32338 @@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32339 int pgd_idx, pmd_idx;
32340 unsigned long vaddr;
32341 pgd_t *pgd;
32342 + pud_t *pud;
32343 pmd_t *pmd;
32344 pte_t *pte = NULL;
32345 unsigned long count = page_table_range_init_count(start, end);
32346 @@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32347 pgd = pgd_base + pgd_idx;
32348
32349 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
32350 - pmd = one_md_table_init(pgd);
32351 - pmd = pmd + pmd_index(vaddr);
32352 + pud = pud_offset(pgd, vaddr);
32353 + pmd = pmd_offset(pud, vaddr);
32354 +
32355 +#ifdef CONFIG_X86_PAE
32356 + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32357 +#endif
32358 +
32359 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
32360 pmd++, pmd_idx++) {
32361 pte = page_table_kmap_check(one_page_table_init(pmd),
32362 @@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32363 }
32364 }
32365
32366 -static inline int is_kernel_text(unsigned long addr)
32367 +static inline int is_kernel_text(unsigned long start, unsigned long end)
32368 {
32369 - if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
32370 - return 1;
32371 - return 0;
32372 + if ((start >= ktla_ktva((unsigned long)_etext) ||
32373 + end <= ktla_ktva((unsigned long)_stext)) &&
32374 + (start >= ktla_ktva((unsigned long)_einittext) ||
32375 + end <= ktla_ktva((unsigned long)_sinittext)) &&
32376 +
32377 +#ifdef CONFIG_ACPI_SLEEP
32378 + (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
32379 +#endif
32380 +
32381 + (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
32382 + return 0;
32383 + return 1;
32384 }
32385
32386 /*
32387 @@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
32388 unsigned long last_map_addr = end;
32389 unsigned long start_pfn, end_pfn;
32390 pgd_t *pgd_base = swapper_pg_dir;
32391 - int pgd_idx, pmd_idx, pte_ofs;
32392 + unsigned int pgd_idx, pmd_idx, pte_ofs;
32393 unsigned long pfn;
32394 pgd_t *pgd;
32395 + pud_t *pud;
32396 pmd_t *pmd;
32397 pte_t *pte;
32398 unsigned pages_2m, pages_4k;
32399 @@ -291,8 +295,13 @@ repeat:
32400 pfn = start_pfn;
32401 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32402 pgd = pgd_base + pgd_idx;
32403 - for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
32404 - pmd = one_md_table_init(pgd);
32405 + for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
32406 + pud = pud_offset(pgd, 0);
32407 + pmd = pmd_offset(pud, 0);
32408 +
32409 +#ifdef CONFIG_X86_PAE
32410 + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32411 +#endif
32412
32413 if (pfn >= end_pfn)
32414 continue;
32415 @@ -304,14 +313,13 @@ repeat:
32416 #endif
32417 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
32418 pmd++, pmd_idx++) {
32419 - unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
32420 + unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
32421
32422 /*
32423 * Map with big pages if possible, otherwise
32424 * create normal page tables:
32425 */
32426 if (use_pse) {
32427 - unsigned int addr2;
32428 pgprot_t prot = PAGE_KERNEL_LARGE;
32429 /*
32430 * first pass will use the same initial
32431 @@ -322,11 +330,7 @@ repeat:
32432 _PAGE_PSE);
32433
32434 pfn &= PMD_MASK >> PAGE_SHIFT;
32435 - addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
32436 - PAGE_OFFSET + PAGE_SIZE-1;
32437 -
32438 - if (is_kernel_text(addr) ||
32439 - is_kernel_text(addr2))
32440 + if (is_kernel_text(address, address + PMD_SIZE))
32441 prot = PAGE_KERNEL_LARGE_EXEC;
32442
32443 pages_2m++;
32444 @@ -343,7 +347,7 @@ repeat:
32445 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32446 pte += pte_ofs;
32447 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
32448 - pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
32449 + pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
32450 pgprot_t prot = PAGE_KERNEL;
32451 /*
32452 * first pass will use the same initial
32453 @@ -351,7 +355,7 @@ repeat:
32454 */
32455 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
32456
32457 - if (is_kernel_text(addr))
32458 + if (is_kernel_text(address, address + PAGE_SIZE))
32459 prot = PAGE_KERNEL_EXEC;
32460
32461 pages_4k++;
32462 @@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
32463
32464 pud = pud_offset(pgd, va);
32465 pmd = pmd_offset(pud, va);
32466 - if (!pmd_present(*pmd))
32467 + if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
32468 break;
32469
32470 /* should not be large page here */
32471 @@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
32472
32473 static void __init pagetable_init(void)
32474 {
32475 - pgd_t *pgd_base = swapper_pg_dir;
32476 -
32477 - permanent_kmaps_init(pgd_base);
32478 + permanent_kmaps_init(swapper_pg_dir);
32479 }
32480
32481 -pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
32482 +pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
32483 EXPORT_SYMBOL_GPL(__supported_pte_mask);
32484
32485 /* user-defined highmem size */
32486 @@ -787,10 +789,10 @@ void __init mem_init(void)
32487 ((unsigned long)&__init_end -
32488 (unsigned long)&__init_begin) >> 10,
32489
32490 - (unsigned long)&_etext, (unsigned long)&_edata,
32491 - ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
32492 + (unsigned long)&_sdata, (unsigned long)&_edata,
32493 + ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
32494
32495 - (unsigned long)&_text, (unsigned long)&_etext,
32496 + ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
32497 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
32498
32499 /*
32500 @@ -883,6 +885,7 @@ void set_kernel_text_rw(void)
32501 if (!kernel_set_to_readonly)
32502 return;
32503
32504 + start = ktla_ktva(start);
32505 pr_debug("Set kernel text: %lx - %lx for read write\n",
32506 start, start+size);
32507
32508 @@ -897,6 +900,7 @@ void set_kernel_text_ro(void)
32509 if (!kernel_set_to_readonly)
32510 return;
32511
32512 + start = ktla_ktva(start);
32513 pr_debug("Set kernel text: %lx - %lx for read only\n",
32514 start, start+size);
32515
32516 @@ -925,6 +929,7 @@ void mark_rodata_ro(void)
32517 unsigned long start = PFN_ALIGN(_text);
32518 unsigned long size = PFN_ALIGN(_etext) - start;
32519
32520 + start = ktla_ktva(start);
32521 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
32522 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
32523 size >> 10);
32524 diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
32525 index f35c66c..84b95ef 100644
32526 --- a/arch/x86/mm/init_64.c
32527 +++ b/arch/x86/mm/init_64.c
32528 @@ -151,7 +151,7 @@ early_param("gbpages", parse_direct_gbpages_on);
32529 * around without checking the pgd every time.
32530 */
32531
32532 -pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
32533 +pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_IOMAP);
32534 EXPORT_SYMBOL_GPL(__supported_pte_mask);
32535
32536 int force_personality32;
32537 @@ -184,12 +184,29 @@ void sync_global_pgds(unsigned long start, unsigned long end)
32538
32539 for (address = start; address <= end; address += PGDIR_SIZE) {
32540 const pgd_t *pgd_ref = pgd_offset_k(address);
32541 +
32542 +#ifdef CONFIG_PAX_PER_CPU_PGD
32543 + unsigned long cpu;
32544 +#else
32545 struct page *page;
32546 +#endif
32547
32548 if (pgd_none(*pgd_ref))
32549 continue;
32550
32551 spin_lock(&pgd_lock);
32552 +
32553 +#ifdef CONFIG_PAX_PER_CPU_PGD
32554 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
32555 + pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
32556 +
32557 + if (pgd_none(*pgd))
32558 + set_pgd(pgd, *pgd_ref);
32559 + else
32560 + BUG_ON(pgd_page_vaddr(*pgd)
32561 + != pgd_page_vaddr(*pgd_ref));
32562 + pgd = pgd_offset_cpu(cpu, kernel, address);
32563 +#else
32564 list_for_each_entry(page, &pgd_list, lru) {
32565 pgd_t *pgd;
32566 spinlock_t *pgt_lock;
32567 @@ -198,6 +215,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
32568 /* the pgt_lock only for Xen */
32569 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
32570 spin_lock(pgt_lock);
32571 +#endif
32572
32573 if (pgd_none(*pgd))
32574 set_pgd(pgd, *pgd_ref);
32575 @@ -205,7 +223,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
32576 BUG_ON(pgd_page_vaddr(*pgd)
32577 != pgd_page_vaddr(*pgd_ref));
32578
32579 +#ifndef CONFIG_PAX_PER_CPU_PGD
32580 spin_unlock(pgt_lock);
32581 +#endif
32582 +
32583 }
32584 spin_unlock(&pgd_lock);
32585 }
32586 @@ -238,7 +259,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
32587 {
32588 if (pgd_none(*pgd)) {
32589 pud_t *pud = (pud_t *)spp_getpage();
32590 - pgd_populate(&init_mm, pgd, pud);
32591 + pgd_populate_kernel(&init_mm, pgd, pud);
32592 if (pud != pud_offset(pgd, 0))
32593 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
32594 pud, pud_offset(pgd, 0));
32595 @@ -250,7 +271,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
32596 {
32597 if (pud_none(*pud)) {
32598 pmd_t *pmd = (pmd_t *) spp_getpage();
32599 - pud_populate(&init_mm, pud, pmd);
32600 + pud_populate_kernel(&init_mm, pud, pmd);
32601 if (pmd != pmd_offset(pud, 0))
32602 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
32603 pmd, pmd_offset(pud, 0));
32604 @@ -279,7 +300,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
32605 pmd = fill_pmd(pud, vaddr);
32606 pte = fill_pte(pmd, vaddr);
32607
32608 + pax_open_kernel();
32609 set_pte(pte, new_pte);
32610 + pax_close_kernel();
32611
32612 /*
32613 * It's enough to flush this one mapping.
32614 @@ -338,14 +361,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
32615 pgd = pgd_offset_k((unsigned long)__va(phys));
32616 if (pgd_none(*pgd)) {
32617 pud = (pud_t *) spp_getpage();
32618 - set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
32619 - _PAGE_USER));
32620 + set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
32621 }
32622 pud = pud_offset(pgd, (unsigned long)__va(phys));
32623 if (pud_none(*pud)) {
32624 pmd = (pmd_t *) spp_getpage();
32625 - set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
32626 - _PAGE_USER));
32627 + set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
32628 }
32629 pmd = pmd_offset(pud, phys);
32630 BUG_ON(!pmd_none(*pmd));
32631 @@ -586,7 +607,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
32632 prot);
32633
32634 spin_lock(&init_mm.page_table_lock);
32635 - pud_populate(&init_mm, pud, pmd);
32636 + pud_populate_kernel(&init_mm, pud, pmd);
32637 spin_unlock(&init_mm.page_table_lock);
32638 }
32639 __flush_tlb_all();
32640 @@ -627,7 +648,7 @@ kernel_physical_mapping_init(unsigned long start,
32641 page_size_mask);
32642
32643 spin_lock(&init_mm.page_table_lock);
32644 - pgd_populate(&init_mm, pgd, pud);
32645 + pgd_populate_kernel(&init_mm, pgd, pud);
32646 spin_unlock(&init_mm.page_table_lock);
32647 pgd_changed = true;
32648 }
32649 @@ -1188,8 +1209,8 @@ int kern_addr_valid(unsigned long addr)
32650 static struct vm_area_struct gate_vma = {
32651 .vm_start = VSYSCALL_START,
32652 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
32653 - .vm_page_prot = PAGE_READONLY_EXEC,
32654 - .vm_flags = VM_READ | VM_EXEC
32655 + .vm_page_prot = PAGE_READONLY,
32656 + .vm_flags = VM_READ
32657 };
32658
32659 struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
32660 @@ -1223,7 +1244,7 @@ int in_gate_area_no_mm(unsigned long addr)
32661
32662 const char *arch_vma_name(struct vm_area_struct *vma)
32663 {
32664 - if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
32665 + if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
32666 return "[vdso]";
32667 if (vma == &gate_vma)
32668 return "[vsyscall]";
32669 diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
32670 index 7b179b4..6bd17777 100644
32671 --- a/arch/x86/mm/iomap_32.c
32672 +++ b/arch/x86/mm/iomap_32.c
32673 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
32674 type = kmap_atomic_idx_push();
32675 idx = type + KM_TYPE_NR * smp_processor_id();
32676 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32677 +
32678 + pax_open_kernel();
32679 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
32680 + pax_close_kernel();
32681 +
32682 arch_flush_lazy_mmu_mode();
32683
32684 return (void *)vaddr;
32685 diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
32686 index 799580c..72f9fe0 100644
32687 --- a/arch/x86/mm/ioremap.c
32688 +++ b/arch/x86/mm/ioremap.c
32689 @@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
32690 for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
32691 int is_ram = page_is_ram(pfn);
32692
32693 - if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
32694 + if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
32695 return NULL;
32696 WARN_ON_ONCE(is_ram);
32697 }
32698 @@ -256,7 +256,7 @@ EXPORT_SYMBOL(ioremap_prot);
32699 *
32700 * Caller must ensure there is only one unmapping for the same pointer.
32701 */
32702 -void iounmap(volatile void __iomem *addr)
32703 +void iounmap(const volatile void __iomem *addr)
32704 {
32705 struct vm_struct *p, *o;
32706
32707 @@ -310,6 +310,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
32708
32709 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
32710 if (page_is_ram(start >> PAGE_SHIFT))
32711 +#ifdef CONFIG_HIGHMEM
32712 + if ((start >> PAGE_SHIFT) < max_low_pfn)
32713 +#endif
32714 return __va(phys);
32715
32716 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
32717 @@ -322,6 +325,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
32718 void unxlate_dev_mem_ptr(unsigned long phys, void *addr)
32719 {
32720 if (page_is_ram(phys >> PAGE_SHIFT))
32721 +#ifdef CONFIG_HIGHMEM
32722 + if ((phys >> PAGE_SHIFT) < max_low_pfn)
32723 +#endif
32724 return;
32725
32726 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
32727 @@ -339,7 +345,7 @@ static int __init early_ioremap_debug_setup(char *str)
32728 early_param("early_ioremap_debug", early_ioremap_debug_setup);
32729
32730 static __initdata int after_paging_init;
32731 -static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
32732 +static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
32733
32734 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
32735 {
32736 @@ -376,8 +382,7 @@ void __init early_ioremap_init(void)
32737 slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
32738
32739 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
32740 - memset(bm_pte, 0, sizeof(bm_pte));
32741 - pmd_populate_kernel(&init_mm, pmd, bm_pte);
32742 + pmd_populate_user(&init_mm, pmd, bm_pte);
32743
32744 /*
32745 * The boot-ioremap range spans multiple pmds, for which
32746 diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
32747 index d87dd6d..bf3fa66 100644
32748 --- a/arch/x86/mm/kmemcheck/kmemcheck.c
32749 +++ b/arch/x86/mm/kmemcheck/kmemcheck.c
32750 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
32751 * memory (e.g. tracked pages)? For now, we need this to avoid
32752 * invoking kmemcheck for PnP BIOS calls.
32753 */
32754 - if (regs->flags & X86_VM_MASK)
32755 + if (v8086_mode(regs))
32756 return false;
32757 - if (regs->cs != __KERNEL_CS)
32758 + if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
32759 return false;
32760
32761 pte = kmemcheck_pte_lookup(address);
32762 diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
32763 index 25e7e13..1964579 100644
32764 --- a/arch/x86/mm/mmap.c
32765 +++ b/arch/x86/mm/mmap.c
32766 @@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
32767 * Leave an at least ~128 MB hole with possible stack randomization.
32768 */
32769 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
32770 -#define MAX_GAP (TASK_SIZE/6*5)
32771 +#define MAX_GAP (pax_task_size/6*5)
32772
32773 static int mmap_is_legacy(void)
32774 {
32775 @@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
32776 return rnd << PAGE_SHIFT;
32777 }
32778
32779 -static unsigned long mmap_base(void)
32780 +static unsigned long mmap_base(struct mm_struct *mm)
32781 {
32782 unsigned long gap = rlimit(RLIMIT_STACK);
32783 + unsigned long pax_task_size = TASK_SIZE;
32784 +
32785 +#ifdef CONFIG_PAX_SEGMEXEC
32786 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
32787 + pax_task_size = SEGMEXEC_TASK_SIZE;
32788 +#endif
32789
32790 if (gap < MIN_GAP)
32791 gap = MIN_GAP;
32792 else if (gap > MAX_GAP)
32793 gap = MAX_GAP;
32794
32795 - return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
32796 + return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
32797 }
32798
32799 /*
32800 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
32801 * does, but not when emulating X86_32
32802 */
32803 -static unsigned long mmap_legacy_base(void)
32804 +static unsigned long mmap_legacy_base(struct mm_struct *mm)
32805 {
32806 - if (mmap_is_ia32())
32807 + if (mmap_is_ia32()) {
32808 +
32809 +#ifdef CONFIG_PAX_SEGMEXEC
32810 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
32811 + return SEGMEXEC_TASK_UNMAPPED_BASE;
32812 + else
32813 +#endif
32814 +
32815 return TASK_UNMAPPED_BASE;
32816 - else
32817 + } else
32818 return TASK_UNMAPPED_BASE + mmap_rnd();
32819 }
32820
32821 @@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
32822 */
32823 void arch_pick_mmap_layout(struct mm_struct *mm)
32824 {
32825 - mm->mmap_legacy_base = mmap_legacy_base();
32826 - mm->mmap_base = mmap_base();
32827 + mm->mmap_legacy_base = mmap_legacy_base(mm);
32828 + mm->mmap_base = mmap_base(mm);
32829 +
32830 +#ifdef CONFIG_PAX_RANDMMAP
32831 + if (mm->pax_flags & MF_PAX_RANDMMAP) {
32832 + mm->mmap_legacy_base += mm->delta_mmap;
32833 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
32834 + }
32835 +#endif
32836
32837 if (mmap_is_legacy()) {
32838 mm->mmap_base = mm->mmap_legacy_base;
32839 diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
32840 index 0057a7a..95c7edd 100644
32841 --- a/arch/x86/mm/mmio-mod.c
32842 +++ b/arch/x86/mm/mmio-mod.c
32843 @@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
32844 break;
32845 default:
32846 {
32847 - unsigned char *ip = (unsigned char *)instptr;
32848 + unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
32849 my_trace->opcode = MMIO_UNKNOWN_OP;
32850 my_trace->width = 0;
32851 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
32852 @@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
32853 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
32854 void __iomem *addr)
32855 {
32856 - static atomic_t next_id;
32857 + static atomic_unchecked_t next_id;
32858 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
32859 /* These are page-unaligned. */
32860 struct mmiotrace_map map = {
32861 @@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
32862 .private = trace
32863 },
32864 .phys = offset,
32865 - .id = atomic_inc_return(&next_id)
32866 + .id = atomic_inc_return_unchecked(&next_id)
32867 };
32868 map.map_id = trace->id;
32869
32870 @@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
32871 ioremap_trace_core(offset, size, addr);
32872 }
32873
32874 -static void iounmap_trace_core(volatile void __iomem *addr)
32875 +static void iounmap_trace_core(const volatile void __iomem *addr)
32876 {
32877 struct mmiotrace_map map = {
32878 .phys = 0,
32879 @@ -328,7 +328,7 @@ not_enabled:
32880 }
32881 }
32882
32883 -void mmiotrace_iounmap(volatile void __iomem *addr)
32884 +void mmiotrace_iounmap(const volatile void __iomem *addr)
32885 {
32886 might_sleep();
32887 if (is_enabled()) /* recheck and proper locking in *_core() */
32888 diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
32889 index 27aa0455..0eb1406 100644
32890 --- a/arch/x86/mm/numa.c
32891 +++ b/arch/x86/mm/numa.c
32892 @@ -478,7 +478,7 @@ static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi)
32893 return true;
32894 }
32895
32896 -static int __init numa_register_memblks(struct numa_meminfo *mi)
32897 +static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
32898 {
32899 unsigned long uninitialized_var(pfn_align);
32900 int i, nid;
32901 diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
32902 index 461bc82..4e091a3 100644
32903 --- a/arch/x86/mm/pageattr-test.c
32904 +++ b/arch/x86/mm/pageattr-test.c
32905 @@ -35,7 +35,7 @@ enum {
32906
32907 static int pte_testbit(pte_t pte)
32908 {
32909 - return pte_flags(pte) & _PAGE_UNUSED1;
32910 + return pte_flags(pte) & _PAGE_CPA_TEST;
32911 }
32912
32913 struct split_state {
32914 diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
32915 index a348868..3c64310 100644
32916 --- a/arch/x86/mm/pageattr.c
32917 +++ b/arch/x86/mm/pageattr.c
32918 @@ -262,7 +262,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
32919 */
32920 #ifdef CONFIG_PCI_BIOS
32921 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
32922 - pgprot_val(forbidden) |= _PAGE_NX;
32923 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
32924 #endif
32925
32926 /*
32927 @@ -270,9 +270,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
32928 * Does not cover __inittext since that is gone later on. On
32929 * 64bit we do not enforce !NX on the low mapping
32930 */
32931 - if (within(address, (unsigned long)_text, (unsigned long)_etext))
32932 - pgprot_val(forbidden) |= _PAGE_NX;
32933 + if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
32934 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
32935
32936 +#ifdef CONFIG_DEBUG_RODATA
32937 /*
32938 * The .rodata section needs to be read-only. Using the pfn
32939 * catches all aliases.
32940 @@ -280,6 +281,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
32941 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
32942 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
32943 pgprot_val(forbidden) |= _PAGE_RW;
32944 +#endif
32945
32946 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
32947 /*
32948 @@ -318,6 +320,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
32949 }
32950 #endif
32951
32952 +#ifdef CONFIG_PAX_KERNEXEC
32953 + if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
32954 + pgprot_val(forbidden) |= _PAGE_RW;
32955 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
32956 + }
32957 +#endif
32958 +
32959 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
32960
32961 return prot;
32962 @@ -416,23 +425,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
32963 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
32964 {
32965 /* change init_mm */
32966 + pax_open_kernel();
32967 set_pte_atomic(kpte, pte);
32968 +
32969 #ifdef CONFIG_X86_32
32970 if (!SHARED_KERNEL_PMD) {
32971 +
32972 +#ifdef CONFIG_PAX_PER_CPU_PGD
32973 + unsigned long cpu;
32974 +#else
32975 struct page *page;
32976 +#endif
32977
32978 +#ifdef CONFIG_PAX_PER_CPU_PGD
32979 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
32980 + pgd_t *pgd = get_cpu_pgd(cpu, kernel);
32981 +#else
32982 list_for_each_entry(page, &pgd_list, lru) {
32983 - pgd_t *pgd;
32984 + pgd_t *pgd = (pgd_t *)page_address(page);
32985 +#endif
32986 +
32987 pud_t *pud;
32988 pmd_t *pmd;
32989
32990 - pgd = (pgd_t *)page_address(page) + pgd_index(address);
32991 + pgd += pgd_index(address);
32992 pud = pud_offset(pgd, address);
32993 pmd = pmd_offset(pud, address);
32994 set_pte_atomic((pte_t *)pmd, pte);
32995 }
32996 }
32997 #endif
32998 + pax_close_kernel();
32999 }
33000
33001 static int
33002 diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33003 index 6574388..87e9bef 100644
33004 --- a/arch/x86/mm/pat.c
33005 +++ b/arch/x86/mm/pat.c
33006 @@ -376,7 +376,7 @@ int free_memtype(u64 start, u64 end)
33007
33008 if (!entry) {
33009 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33010 - current->comm, current->pid, start, end - 1);
33011 + current->comm, task_pid_nr(current), start, end - 1);
33012 return -EINVAL;
33013 }
33014
33015 @@ -506,8 +506,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33016
33017 while (cursor < to) {
33018 if (!devmem_is_allowed(pfn)) {
33019 - printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
33020 - current->comm, from, to - 1);
33021 + printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
33022 + current->comm, from, to - 1, cursor);
33023 return 0;
33024 }
33025 cursor += PAGE_SIZE;
33026 @@ -577,7 +577,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
33027 if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) {
33028 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33029 "for [mem %#010Lx-%#010Lx]\n",
33030 - current->comm, current->pid,
33031 + current->comm, task_pid_nr(current),
33032 cattr_name(flags),
33033 base, (unsigned long long)(base + size-1));
33034 return -EINVAL;
33035 @@ -612,7 +612,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33036 flags = lookup_memtype(paddr);
33037 if (want_flags != flags) {
33038 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33039 - current->comm, current->pid,
33040 + current->comm, task_pid_nr(current),
33041 cattr_name(want_flags),
33042 (unsigned long long)paddr,
33043 (unsigned long long)(paddr + size - 1),
33044 @@ -634,7 +634,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33045 free_memtype(paddr, paddr + size);
33046 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33047 " for [mem %#010Lx-%#010Lx], got %s\n",
33048 - current->comm, current->pid,
33049 + current->comm, task_pid_nr(current),
33050 cattr_name(want_flags),
33051 (unsigned long long)paddr,
33052 (unsigned long long)(paddr + size - 1),
33053 diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33054 index 415f6c4..d319983 100644
33055 --- a/arch/x86/mm/pat_rbtree.c
33056 +++ b/arch/x86/mm/pat_rbtree.c
33057 @@ -160,7 +160,7 @@ success:
33058
33059 failure:
33060 printk(KERN_INFO "%s:%d conflicting memory types "
33061 - "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33062 + "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33063 end, cattr_name(found_type), cattr_name(match->type));
33064 return -EBUSY;
33065 }
33066 diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33067 index 9f0614d..92ae64a 100644
33068 --- a/arch/x86/mm/pf_in.c
33069 +++ b/arch/x86/mm/pf_in.c
33070 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33071 int i;
33072 enum reason_type rv = OTHERS;
33073
33074 - p = (unsigned char *)ins_addr;
33075 + p = (unsigned char *)ktla_ktva(ins_addr);
33076 p += skip_prefix(p, &prf);
33077 p += get_opcode(p, &opcode);
33078
33079 @@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33080 struct prefix_bits prf;
33081 int i;
33082
33083 - p = (unsigned char *)ins_addr;
33084 + p = (unsigned char *)ktla_ktva(ins_addr);
33085 p += skip_prefix(p, &prf);
33086 p += get_opcode(p, &opcode);
33087
33088 @@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33089 struct prefix_bits prf;
33090 int i;
33091
33092 - p = (unsigned char *)ins_addr;
33093 + p = (unsigned char *)ktla_ktva(ins_addr);
33094 p += skip_prefix(p, &prf);
33095 p += get_opcode(p, &opcode);
33096
33097 @@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33098 struct prefix_bits prf;
33099 int i;
33100
33101 - p = (unsigned char *)ins_addr;
33102 + p = (unsigned char *)ktla_ktva(ins_addr);
33103 p += skip_prefix(p, &prf);
33104 p += get_opcode(p, &opcode);
33105 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33106 @@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33107 struct prefix_bits prf;
33108 int i;
33109
33110 - p = (unsigned char *)ins_addr;
33111 + p = (unsigned char *)ktla_ktva(ins_addr);
33112 p += skip_prefix(p, &prf);
33113 p += get_opcode(p, &opcode);
33114 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33115 diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33116 index c96314a..433b127 100644
33117 --- a/arch/x86/mm/pgtable.c
33118 +++ b/arch/x86/mm/pgtable.c
33119 @@ -97,10 +97,71 @@ static inline void pgd_list_del(pgd_t *pgd)
33120 list_del(&page->lru);
33121 }
33122
33123 -#define UNSHARED_PTRS_PER_PGD \
33124 - (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33125 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33126 +pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33127
33128 +void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33129 +{
33130 + unsigned int count = USER_PGD_PTRS;
33131
33132 + if (!pax_user_shadow_base)
33133 + return;
33134 +
33135 + while (count--)
33136 + *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33137 +}
33138 +#endif
33139 +
33140 +#ifdef CONFIG_PAX_PER_CPU_PGD
33141 +void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33142 +{
33143 + unsigned int count = USER_PGD_PTRS;
33144 +
33145 + while (count--) {
33146 + pgd_t pgd;
33147 +
33148 +#ifdef CONFIG_X86_64
33149 + pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33150 +#else
33151 + pgd = *src++;
33152 +#endif
33153 +
33154 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33155 + pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33156 +#endif
33157 +
33158 + *dst++ = pgd;
33159 + }
33160 +
33161 +}
33162 +#endif
33163 +
33164 +#ifdef CONFIG_X86_64
33165 +#define pxd_t pud_t
33166 +#define pyd_t pgd_t
33167 +#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33168 +#define pgtable_pxd_page_ctor(page) true
33169 +#define pgtable_pxd_page_dtor(page)
33170 +#define pxd_free(mm, pud) pud_free((mm), (pud))
33171 +#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33172 +#define pyd_offset(mm, address) pgd_offset((mm), (address))
33173 +#define PYD_SIZE PGDIR_SIZE
33174 +#else
33175 +#define pxd_t pmd_t
33176 +#define pyd_t pud_t
33177 +#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33178 +#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33179 +#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33180 +#define pxd_free(mm, pud) pmd_free((mm), (pud))
33181 +#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33182 +#define pyd_offset(mm, address) pud_offset((mm), (address))
33183 +#define PYD_SIZE PUD_SIZE
33184 +#endif
33185 +
33186 +#ifdef CONFIG_PAX_PER_CPU_PGD
33187 +static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33188 +static inline void pgd_dtor(pgd_t *pgd) {}
33189 +#else
33190 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33191 {
33192 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33193 @@ -141,6 +202,7 @@ static void pgd_dtor(pgd_t *pgd)
33194 pgd_list_del(pgd);
33195 spin_unlock(&pgd_lock);
33196 }
33197 +#endif
33198
33199 /*
33200 * List of all pgd's needed for non-PAE so it can invalidate entries
33201 @@ -153,7 +215,7 @@ static void pgd_dtor(pgd_t *pgd)
33202 * -- nyc
33203 */
33204
33205 -#ifdef CONFIG_X86_PAE
33206 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33207 /*
33208 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33209 * updating the top-level pagetable entries to guarantee the
33210 @@ -165,7 +227,7 @@ static void pgd_dtor(pgd_t *pgd)
33211 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33212 * and initialize the kernel pmds here.
33213 */
33214 -#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33215 +#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33216
33217 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33218 {
33219 @@ -183,43 +245,45 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33220 */
33221 flush_tlb_mm(mm);
33222 }
33223 +#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
33224 +#define PREALLOCATED_PXDS USER_PGD_PTRS
33225 #else /* !CONFIG_X86_PAE */
33226
33227 /* No need to prepopulate any pagetable entries in non-PAE modes. */
33228 -#define PREALLOCATED_PMDS 0
33229 +#define PREALLOCATED_PXDS 0
33230
33231 #endif /* CONFIG_X86_PAE */
33232
33233 -static void free_pmds(pmd_t *pmds[])
33234 +static void free_pxds(pxd_t *pxds[])
33235 {
33236 int i;
33237
33238 - for(i = 0; i < PREALLOCATED_PMDS; i++)
33239 - if (pmds[i]) {
33240 - pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
33241 - free_page((unsigned long)pmds[i]);
33242 + for(i = 0; i < PREALLOCATED_PXDS; i++)
33243 + if (pxds[i]) {
33244 + pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
33245 + free_page((unsigned long)pxds[i]);
33246 }
33247 }
33248
33249 -static int preallocate_pmds(pmd_t *pmds[])
33250 +static int preallocate_pxds(pxd_t *pxds[])
33251 {
33252 int i;
33253 bool failed = false;
33254
33255 - for(i = 0; i < PREALLOCATED_PMDS; i++) {
33256 - pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
33257 - if (!pmd)
33258 + for(i = 0; i < PREALLOCATED_PXDS; i++) {
33259 + pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
33260 + if (!pxd)
33261 failed = true;
33262 - if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
33263 - free_page((unsigned long)pmd);
33264 - pmd = NULL;
33265 + if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
33266 + free_page((unsigned long)pxd);
33267 + pxd = NULL;
33268 failed = true;
33269 }
33270 - pmds[i] = pmd;
33271 + pxds[i] = pxd;
33272 }
33273
33274 if (failed) {
33275 - free_pmds(pmds);
33276 + free_pxds(pxds);
33277 return -ENOMEM;
33278 }
33279
33280 @@ -232,49 +296,52 @@ static int preallocate_pmds(pmd_t *pmds[])
33281 * preallocate which never got a corresponding vma will need to be
33282 * freed manually.
33283 */
33284 -static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
33285 +static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
33286 {
33287 int i;
33288
33289 - for(i = 0; i < PREALLOCATED_PMDS; i++) {
33290 + for(i = 0; i < PREALLOCATED_PXDS; i++) {
33291 pgd_t pgd = pgdp[i];
33292
33293 if (pgd_val(pgd) != 0) {
33294 - pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
33295 + pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
33296
33297 - pgdp[i] = native_make_pgd(0);
33298 + set_pgd(pgdp + i, native_make_pgd(0));
33299
33300 - paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
33301 - pmd_free(mm, pmd);
33302 + paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
33303 + pxd_free(mm, pxd);
33304 }
33305 }
33306 }
33307
33308 -static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
33309 +static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
33310 {
33311 - pud_t *pud;
33312 + pyd_t *pyd;
33313 int i;
33314
33315 - if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
33316 + if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
33317 return;
33318
33319 - pud = pud_offset(pgd, 0);
33320 -
33321 - for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
33322 - pmd_t *pmd = pmds[i];
33323 +#ifdef CONFIG_X86_64
33324 + pyd = pyd_offset(mm, 0L);
33325 +#else
33326 + pyd = pyd_offset(pgd, 0L);
33327 +#endif
33328
33329 + for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
33330 + pxd_t *pxd = pxds[i];
33331 if (i >= KERNEL_PGD_BOUNDARY)
33332 - memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33333 - sizeof(pmd_t) * PTRS_PER_PMD);
33334 + memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33335 + sizeof(pxd_t) * PTRS_PER_PMD);
33336
33337 - pud_populate(mm, pud, pmd);
33338 + pyd_populate(mm, pyd, pxd);
33339 }
33340 }
33341
33342 pgd_t *pgd_alloc(struct mm_struct *mm)
33343 {
33344 pgd_t *pgd;
33345 - pmd_t *pmds[PREALLOCATED_PMDS];
33346 + pxd_t *pxds[PREALLOCATED_PXDS];
33347
33348 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
33349
33350 @@ -283,11 +350,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33351
33352 mm->pgd = pgd;
33353
33354 - if (preallocate_pmds(pmds) != 0)
33355 + if (preallocate_pxds(pxds) != 0)
33356 goto out_free_pgd;
33357
33358 if (paravirt_pgd_alloc(mm) != 0)
33359 - goto out_free_pmds;
33360 + goto out_free_pxds;
33361
33362 /*
33363 * Make sure that pre-populating the pmds is atomic with
33364 @@ -297,14 +364,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33365 spin_lock(&pgd_lock);
33366
33367 pgd_ctor(mm, pgd);
33368 - pgd_prepopulate_pmd(mm, pgd, pmds);
33369 + pgd_prepopulate_pxd(mm, pgd, pxds);
33370
33371 spin_unlock(&pgd_lock);
33372
33373 return pgd;
33374
33375 -out_free_pmds:
33376 - free_pmds(pmds);
33377 +out_free_pxds:
33378 + free_pxds(pxds);
33379 out_free_pgd:
33380 free_page((unsigned long)pgd);
33381 out:
33382 @@ -313,7 +380,7 @@ out:
33383
33384 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
33385 {
33386 - pgd_mop_up_pmds(mm, pgd);
33387 + pgd_mop_up_pxds(mm, pgd);
33388 pgd_dtor(pgd);
33389 paravirt_pgd_free(mm, pgd);
33390 free_page((unsigned long)pgd);
33391 diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
33392 index a69bcb8..19068ab 100644
33393 --- a/arch/x86/mm/pgtable_32.c
33394 +++ b/arch/x86/mm/pgtable_32.c
33395 @@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
33396 return;
33397 }
33398 pte = pte_offset_kernel(pmd, vaddr);
33399 +
33400 + pax_open_kernel();
33401 if (pte_val(pteval))
33402 set_pte_at(&init_mm, vaddr, pte, pteval);
33403 else
33404 pte_clear(&init_mm, vaddr, pte);
33405 + pax_close_kernel();
33406
33407 /*
33408 * It's enough to flush this one mapping.
33409 diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
33410 index e666cbb..61788c45 100644
33411 --- a/arch/x86/mm/physaddr.c
33412 +++ b/arch/x86/mm/physaddr.c
33413 @@ -10,7 +10,7 @@
33414 #ifdef CONFIG_X86_64
33415
33416 #ifdef CONFIG_DEBUG_VIRTUAL
33417 -unsigned long __phys_addr(unsigned long x)
33418 +unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
33419 {
33420 unsigned long y = x - __START_KERNEL_map;
33421
33422 @@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
33423 #else
33424
33425 #ifdef CONFIG_DEBUG_VIRTUAL
33426 -unsigned long __phys_addr(unsigned long x)
33427 +unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
33428 {
33429 unsigned long phys_addr = x - PAGE_OFFSET;
33430 /* VMALLOC_* aren't constants */
33431 diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
33432 index 90555bf..f5f1828 100644
33433 --- a/arch/x86/mm/setup_nx.c
33434 +++ b/arch/x86/mm/setup_nx.c
33435 @@ -5,8 +5,10 @@
33436 #include <asm/pgtable.h>
33437 #include <asm/proto.h>
33438
33439 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
33440 static int disable_nx;
33441
33442 +#ifndef CONFIG_PAX_PAGEEXEC
33443 /*
33444 * noexec = on|off
33445 *
33446 @@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
33447 return 0;
33448 }
33449 early_param("noexec", noexec_setup);
33450 +#endif
33451 +
33452 +#endif
33453
33454 void x86_configure_nx(void)
33455 {
33456 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
33457 if (cpu_has_nx && !disable_nx)
33458 __supported_pte_mask |= _PAGE_NX;
33459 else
33460 +#endif
33461 __supported_pte_mask &= ~_PAGE_NX;
33462 }
33463
33464 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
33465 index dd8dda1..9e9b0f6 100644
33466 --- a/arch/x86/mm/tlb.c
33467 +++ b/arch/x86/mm/tlb.c
33468 @@ -48,7 +48,11 @@ void leave_mm(int cpu)
33469 BUG();
33470 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
33471 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
33472 +
33473 +#ifndef CONFIG_PAX_PER_CPU_PGD
33474 load_cr3(swapper_pg_dir);
33475 +#endif
33476 +
33477 }
33478 }
33479 EXPORT_SYMBOL_GPL(leave_mm);
33480 diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
33481 new file mode 100644
33482 index 0000000..dace51c
33483 --- /dev/null
33484 +++ b/arch/x86/mm/uderef_64.c
33485 @@ -0,0 +1,37 @@
33486 +#include <linux/mm.h>
33487 +#include <asm/pgtable.h>
33488 +#include <asm/uaccess.h>
33489 +
33490 +#ifdef CONFIG_PAX_MEMORY_UDEREF
33491 +/* PaX: due to the special call convention these functions must
33492 + * - remain leaf functions under all configurations,
33493 + * - never be called directly, only dereferenced from the wrappers.
33494 + */
33495 +void __pax_open_userland(void)
33496 +{
33497 + unsigned int cpu;
33498 +
33499 + if (unlikely(!segment_eq(get_fs(), USER_DS)))
33500 + return;
33501 +
33502 + cpu = raw_get_cpu();
33503 + BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
33504 + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
33505 + raw_put_cpu_no_resched();
33506 +}
33507 +EXPORT_SYMBOL(__pax_open_userland);
33508 +
33509 +void __pax_close_userland(void)
33510 +{
33511 + unsigned int cpu;
33512 +
33513 + if (unlikely(!segment_eq(get_fs(), USER_DS)))
33514 + return;
33515 +
33516 + cpu = raw_get_cpu();
33517 + BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
33518 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
33519 + raw_put_cpu_no_resched();
33520 +}
33521 +EXPORT_SYMBOL(__pax_close_userland);
33522 +#endif
33523 diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
33524 index 0149575..f746de8 100644
33525 --- a/arch/x86/net/bpf_jit.S
33526 +++ b/arch/x86/net/bpf_jit.S
33527 @@ -9,6 +9,7 @@
33528 */
33529 #include <linux/linkage.h>
33530 #include <asm/dwarf2.h>
33531 +#include <asm/alternative-asm.h>
33532
33533 /*
33534 * Calling convention :
33535 @@ -35,6 +36,7 @@ sk_load_word_positive_offset:
33536 jle bpf_slow_path_word
33537 mov (SKBDATA,%rsi),%eax
33538 bswap %eax /* ntohl() */
33539 + pax_force_retaddr
33540 ret
33541
33542 sk_load_half:
33543 @@ -52,6 +54,7 @@ sk_load_half_positive_offset:
33544 jle bpf_slow_path_half
33545 movzwl (SKBDATA,%rsi),%eax
33546 rol $8,%ax # ntohs()
33547 + pax_force_retaddr
33548 ret
33549
33550 sk_load_byte:
33551 @@ -66,6 +69,7 @@ sk_load_byte_positive_offset:
33552 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
33553 jle bpf_slow_path_byte
33554 movzbl (SKBDATA,%rsi),%eax
33555 + pax_force_retaddr
33556 ret
33557
33558 /**
33559 @@ -87,6 +91,7 @@ sk_load_byte_msh_positive_offset:
33560 movzbl (SKBDATA,%rsi),%ebx
33561 and $15,%bl
33562 shl $2,%bl
33563 + pax_force_retaddr
33564 ret
33565
33566 /* rsi contains offset and can be scratched */
33567 @@ -109,6 +114,7 @@ bpf_slow_path_word:
33568 js bpf_error
33569 mov -12(%rbp),%eax
33570 bswap %eax
33571 + pax_force_retaddr
33572 ret
33573
33574 bpf_slow_path_half:
33575 @@ -117,12 +123,14 @@ bpf_slow_path_half:
33576 mov -12(%rbp),%ax
33577 rol $8,%ax
33578 movzwl %ax,%eax
33579 + pax_force_retaddr
33580 ret
33581
33582 bpf_slow_path_byte:
33583 bpf_slow_path_common(1)
33584 js bpf_error
33585 movzbl -12(%rbp),%eax
33586 + pax_force_retaddr
33587 ret
33588
33589 bpf_slow_path_byte_msh:
33590 @@ -133,6 +141,7 @@ bpf_slow_path_byte_msh:
33591 and $15,%al
33592 shl $2,%al
33593 xchg %eax,%ebx
33594 + pax_force_retaddr
33595 ret
33596
33597 #define sk_negative_common(SIZE) \
33598 @@ -157,6 +166,7 @@ sk_load_word_negative_offset:
33599 sk_negative_common(4)
33600 mov (%rax), %eax
33601 bswap %eax
33602 + pax_force_retaddr
33603 ret
33604
33605 bpf_slow_path_half_neg:
33606 @@ -168,6 +178,7 @@ sk_load_half_negative_offset:
33607 mov (%rax),%ax
33608 rol $8,%ax
33609 movzwl %ax,%eax
33610 + pax_force_retaddr
33611 ret
33612
33613 bpf_slow_path_byte_neg:
33614 @@ -177,6 +188,7 @@ sk_load_byte_negative_offset:
33615 .globl sk_load_byte_negative_offset
33616 sk_negative_common(1)
33617 movzbl (%rax), %eax
33618 + pax_force_retaddr
33619 ret
33620
33621 bpf_slow_path_byte_msh_neg:
33622 @@ -190,6 +202,7 @@ sk_load_byte_msh_negative_offset:
33623 and $15,%al
33624 shl $2,%al
33625 xchg %eax,%ebx
33626 + pax_force_retaddr
33627 ret
33628
33629 bpf_error:
33630 @@ -197,4 +210,5 @@ bpf_error:
33631 xor %eax,%eax
33632 mov -8(%rbp),%rbx
33633 leaveq
33634 + pax_force_retaddr
33635 ret
33636 diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
33637 index 4ed75dd..3cf24f0b 100644
33638 --- a/arch/x86/net/bpf_jit_comp.c
33639 +++ b/arch/x86/net/bpf_jit_comp.c
33640 @@ -50,13 +50,90 @@ static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)
33641 return ptr + len;
33642 }
33643
33644 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33645 +#define MAX_INSTR_CODE_SIZE 96
33646 +#else
33647 +#define MAX_INSTR_CODE_SIZE 64
33648 +#endif
33649 +
33650 #define EMIT(bytes, len) do { prog = emit_code(prog, bytes, len); } while (0)
33651
33652 #define EMIT1(b1) EMIT(b1, 1)
33653 #define EMIT2(b1, b2) EMIT((b1) + ((b2) << 8), 2)
33654 #define EMIT3(b1, b2, b3) EMIT((b1) + ((b2) << 8) + ((b3) << 16), 3)
33655 #define EMIT4(b1, b2, b3, b4) EMIT((b1) + ((b2) << 8) + ((b3) << 16) + ((b4) << 24), 4)
33656 +
33657 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33658 +/* original constant will appear in ecx */
33659 +#define DILUTE_CONST_SEQUENCE(_off, _key) \
33660 +do { \
33661 + /* mov ecx, randkey */ \
33662 + EMIT1(0xb9); \
33663 + EMIT(_key, 4); \
33664 + /* xor ecx, randkey ^ off */ \
33665 + EMIT2(0x81, 0xf1); \
33666 + EMIT((_key) ^ (_off), 4); \
33667 +} while (0)
33668 +
33669 +#define EMIT1_off32(b1, _off) \
33670 +do { \
33671 + switch (b1) { \
33672 + case 0x05: /* add eax, imm32 */ \
33673 + case 0x2d: /* sub eax, imm32 */ \
33674 + case 0x25: /* and eax, imm32 */ \
33675 + case 0x0d: /* or eax, imm32 */ \
33676 + case 0xb8: /* mov eax, imm32 */ \
33677 + case 0x35: /* xor eax, imm32 */ \
33678 + case 0x3d: /* cmp eax, imm32 */ \
33679 + case 0xa9: /* test eax, imm32 */ \
33680 + DILUTE_CONST_SEQUENCE(_off, randkey); \
33681 + EMIT2((b1) - 4, 0xc8); /* convert imm instruction to eax, ecx */\
33682 + break; \
33683 + case 0xbb: /* mov ebx, imm32 */ \
33684 + DILUTE_CONST_SEQUENCE(_off, randkey); \
33685 + /* mov ebx, ecx */ \
33686 + EMIT2(0x89, 0xcb); \
33687 + break; \
33688 + case 0xbe: /* mov esi, imm32 */ \
33689 + DILUTE_CONST_SEQUENCE(_off, randkey); \
33690 + /* mov esi, ecx */ \
33691 + EMIT2(0x89, 0xce); \
33692 + break; \
33693 + case 0xe8: /* call rel imm32, always to known funcs */ \
33694 + EMIT1(b1); \
33695 + EMIT(_off, 4); \
33696 + break; \
33697 + case 0xe9: /* jmp rel imm32 */ \
33698 + EMIT1(b1); \
33699 + EMIT(_off, 4); \
33700 + /* prevent fall-through, we're not called if off = 0 */ \
33701 + EMIT(0xcccccccc, 4); \
33702 + EMIT(0xcccccccc, 4); \
33703 + break; \
33704 + default: \
33705 + BUILD_BUG(); \
33706 + } \
33707 +} while (0)
33708 +
33709 +#define EMIT2_off32(b1, b2, _off) \
33710 +do { \
33711 + if ((b1) == 0x8d && (b2) == 0xb3) { /* lea esi, [rbx+imm32] */ \
33712 + EMIT2(0x8d, 0xb3); /* lea esi, [rbx+randkey] */ \
33713 + EMIT(randkey, 4); \
33714 + EMIT2(0x8d, 0xb6); /* lea esi, [esi+off-randkey] */ \
33715 + EMIT((_off) - randkey, 4); \
33716 + } else if ((b1) == 0x69 && (b2) == 0xc0) { /* imul eax, imm32 */\
33717 + DILUTE_CONST_SEQUENCE(_off, randkey); \
33718 + /* imul eax, ecx */ \
33719 + EMIT3(0x0f, 0xaf, 0xc1); \
33720 + } else { \
33721 + BUILD_BUG(); \
33722 + } \
33723 +} while (0)
33724 +#else
33725 #define EMIT1_off32(b1, off) do { EMIT1(b1); EMIT(off, 4);} while (0)
33726 +#define EMIT2_off32(b1, b2, off) do { EMIT2(b1, b2); EMIT(off, 4);} while (0)
33727 +#endif
33728
33729 #define CLEAR_A() EMIT2(0x31, 0xc0) /* xor %eax,%eax */
33730 #define CLEAR_X() EMIT2(0x31, 0xdb) /* xor %ebx,%ebx */
33731 @@ -91,6 +168,24 @@ do { \
33732 #define X86_JBE 0x76
33733 #define X86_JA 0x77
33734
33735 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33736 +#define APPEND_FLOW_VERIFY() \
33737 +do { \
33738 + /* mov ecx, randkey */ \
33739 + EMIT1(0xb9); \
33740 + EMIT(randkey, 4); \
33741 + /* cmp ecx, randkey */ \
33742 + EMIT2(0x81, 0xf9); \
33743 + EMIT(randkey, 4); \
33744 + /* jz after 8 int 3s */ \
33745 + EMIT2(0x74, 0x08); \
33746 + EMIT(0xcccccccc, 4); \
33747 + EMIT(0xcccccccc, 4); \
33748 +} while (0)
33749 +#else
33750 +#define APPEND_FLOW_VERIFY() do { } while (0)
33751 +#endif
33752 +
33753 #define EMIT_COND_JMP(op, offset) \
33754 do { \
33755 if (is_near(offset)) \
33756 @@ -98,6 +193,7 @@ do { \
33757 else { \
33758 EMIT2(0x0f, op + 0x10); \
33759 EMIT(offset, 4); /* jxx .+off32 */ \
33760 + APPEND_FLOW_VERIFY(); \
33761 } \
33762 } while (0)
33763
33764 @@ -145,55 +241,54 @@ static int pkt_type_offset(void)
33765 return -1;
33766 }
33767
33768 -struct bpf_binary_header {
33769 - unsigned int pages;
33770 - /* Note : for security reasons, bpf code will follow a randomly
33771 - * sized amount of int3 instructions
33772 - */
33773 - u8 image[];
33774 -};
33775 -
33776 -static struct bpf_binary_header *bpf_alloc_binary(unsigned int proglen,
33777 +/* Note : for security reasons, bpf code will follow a randomly
33778 + * sized amount of int3 instructions
33779 + */
33780 +static u8 *bpf_alloc_binary(unsigned int proglen,
33781 u8 **image_ptr)
33782 {
33783 unsigned int sz, hole;
33784 - struct bpf_binary_header *header;
33785 + u8 *header;
33786
33787 /* Most of BPF filters are really small,
33788 * but if some of them fill a page, allow at least
33789 * 128 extra bytes to insert a random section of int3
33790 */
33791 - sz = round_up(proglen + sizeof(*header) + 128, PAGE_SIZE);
33792 - header = module_alloc(sz);
33793 + sz = round_up(proglen + 128, PAGE_SIZE);
33794 + header = module_alloc_exec(sz);
33795 if (!header)
33796 return NULL;
33797
33798 + pax_open_kernel();
33799 memset(header, 0xcc, sz); /* fill whole space with int3 instructions */
33800 + pax_close_kernel();
33801
33802 - header->pages = sz / PAGE_SIZE;
33803 - hole = sz - (proglen + sizeof(*header));
33804 + hole = PAGE_SIZE - (proglen & ~PAGE_MASK);
33805
33806 /* insert a random number of int3 instructions before BPF code */
33807 - *image_ptr = &header->image[prandom_u32() % hole];
33808 + *image_ptr = &header[prandom_u32() % hole];
33809 return header;
33810 }
33811
33812 void bpf_jit_compile(struct sk_filter *fp)
33813 {
33814 - u8 temp[64];
33815 + u8 temp[MAX_INSTR_CODE_SIZE];
33816 u8 *prog;
33817 unsigned int proglen, oldproglen = 0;
33818 int ilen, i;
33819 int t_offset, f_offset;
33820 u8 t_op, f_op, seen = 0, pass;
33821 u8 *image = NULL;
33822 - struct bpf_binary_header *header = NULL;
33823 + u8 *header = NULL;
33824 u8 *func;
33825 int pc_ret0 = -1; /* bpf index of first RET #0 instruction (if any) */
33826 unsigned int cleanup_addr; /* epilogue code offset */
33827 unsigned int *addrs;
33828 const struct sock_filter *filter = fp->insns;
33829 int flen = fp->len;
33830 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33831 + unsigned int randkey;
33832 +#endif
33833
33834 if (!bpf_jit_enable)
33835 return;
33836 @@ -203,10 +298,10 @@ void bpf_jit_compile(struct sk_filter *fp)
33837 return;
33838
33839 /* Before first pass, make a rough estimation of addrs[]
33840 - * each bpf instruction is translated to less than 64 bytes
33841 + * each bpf instruction is translated to less than MAX_INSTR_CODE_SIZE bytes
33842 */
33843 for (proglen = 0, i = 0; i < flen; i++) {
33844 - proglen += 64;
33845 + proglen += MAX_INSTR_CODE_SIZE;
33846 addrs[i] = proglen;
33847 }
33848 cleanup_addr = proglen; /* epilogue address */
33849 @@ -285,6 +380,10 @@ void bpf_jit_compile(struct sk_filter *fp)
33850 for (i = 0; i < flen; i++) {
33851 unsigned int K = filter[i].k;
33852
33853 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33854 + randkey = prandom_u32();
33855 +#endif
33856 +
33857 switch (filter[i].code) {
33858 case BPF_S_ALU_ADD_X: /* A += X; */
33859 seen |= SEEN_XREG;
33860 @@ -317,10 +416,8 @@ void bpf_jit_compile(struct sk_filter *fp)
33861 case BPF_S_ALU_MUL_K: /* A *= K */
33862 if (is_imm8(K))
33863 EMIT3(0x6b, 0xc0, K); /* imul imm8,%eax,%eax */
33864 - else {
33865 - EMIT2(0x69, 0xc0); /* imul imm32,%eax */
33866 - EMIT(K, 4);
33867 - }
33868 + else
33869 + EMIT2_off32(0x69, 0xc0, K); /* imul imm32,%eax */
33870 break;
33871 case BPF_S_ALU_DIV_X: /* A /= X; */
33872 seen |= SEEN_XREG;
33873 @@ -364,7 +461,11 @@ void bpf_jit_compile(struct sk_filter *fp)
33874 break;
33875 }
33876 EMIT2(0x31, 0xd2); /* xor %edx,%edx */
33877 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33878 + DILUTE_CONST_SEQUENCE(K, randkey);
33879 +#else
33880 EMIT1(0xb9);EMIT(K, 4); /* mov imm32,%ecx */
33881 +#endif
33882 EMIT2(0xf7, 0xf1); /* div %ecx */
33883 EMIT2(0x89, 0xd0); /* mov %edx,%eax */
33884 break;
33885 @@ -372,7 +473,11 @@ void bpf_jit_compile(struct sk_filter *fp)
33886 if (K == 1)
33887 break;
33888 EMIT2(0x31, 0xd2); /* xor %edx,%edx */
33889 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33890 + DILUTE_CONST_SEQUENCE(K, randkey);
33891 +#else
33892 EMIT1(0xb9);EMIT(K, 4); /* mov imm32,%ecx */
33893 +#endif
33894 EMIT2(0xf7, 0xf1); /* div %ecx */
33895 break;
33896 case BPF_S_ALU_AND_X:
33897 @@ -643,8 +748,7 @@ common_load_ind: seen |= SEEN_DATAREF | SEEN_XREG;
33898 if (is_imm8(K)) {
33899 EMIT3(0x8d, 0x73, K); /* lea imm8(%rbx), %esi */
33900 } else {
33901 - EMIT2(0x8d, 0xb3); /* lea imm32(%rbx),%esi */
33902 - EMIT(K, 4);
33903 + EMIT2_off32(0x8d, 0xb3, K); /* lea imm32(%rbx),%esi */
33904 }
33905 } else {
33906 EMIT2(0x89,0xde); /* mov %ebx,%esi */
33907 @@ -734,10 +838,12 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
33908 if (unlikely(proglen + ilen > oldproglen)) {
33909 pr_err("bpb_jit_compile fatal error\n");
33910 kfree(addrs);
33911 - module_free(NULL, header);
33912 + module_free_exec(NULL, image);
33913 return;
33914 }
33915 + pax_open_kernel();
33916 memcpy(image + proglen, temp, ilen);
33917 + pax_close_kernel();
33918 }
33919 proglen += ilen;
33920 addrs[i] = proglen;
33921 @@ -770,7 +876,6 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
33922
33923 if (image) {
33924 bpf_flush_icache(header, image + proglen);
33925 - set_memory_ro((unsigned long)header, header->pages);
33926 fp->bpf_func = (void *)image;
33927 }
33928 out:
33929 @@ -782,10 +887,9 @@ static void bpf_jit_free_deferred(struct work_struct *work)
33930 {
33931 struct sk_filter *fp = container_of(work, struct sk_filter, work);
33932 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
33933 - struct bpf_binary_header *header = (void *)addr;
33934
33935 - set_memory_rw(addr, header->pages);
33936 - module_free(NULL, header);
33937 + set_memory_rw(addr, 1);
33938 + module_free_exec(NULL, (void *)addr);
33939 kfree(fp);
33940 }
33941
33942 diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
33943 index 5d04be5..2beeaa2 100644
33944 --- a/arch/x86/oprofile/backtrace.c
33945 +++ b/arch/x86/oprofile/backtrace.c
33946 @@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
33947 struct stack_frame_ia32 *fp;
33948 unsigned long bytes;
33949
33950 - bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
33951 + bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
33952 if (bytes != 0)
33953 return NULL;
33954
33955 - fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
33956 + fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
33957
33958 oprofile_add_trace(bufhead[0].return_address);
33959
33960 @@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
33961 struct stack_frame bufhead[2];
33962 unsigned long bytes;
33963
33964 - bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
33965 + bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
33966 if (bytes != 0)
33967 return NULL;
33968
33969 @@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
33970 {
33971 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
33972
33973 - if (!user_mode_vm(regs)) {
33974 + if (!user_mode(regs)) {
33975 unsigned long stack = kernel_stack_pointer(regs);
33976 if (depth)
33977 dump_trace(NULL, regs, (unsigned long *)stack, 0,
33978 diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
33979 index 6890d84..1dad1f1 100644
33980 --- a/arch/x86/oprofile/nmi_int.c
33981 +++ b/arch/x86/oprofile/nmi_int.c
33982 @@ -23,6 +23,7 @@
33983 #include <asm/nmi.h>
33984 #include <asm/msr.h>
33985 #include <asm/apic.h>
33986 +#include <asm/pgtable.h>
33987
33988 #include "op_counter.h"
33989 #include "op_x86_model.h"
33990 @@ -774,8 +775,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
33991 if (ret)
33992 return ret;
33993
33994 - if (!model->num_virt_counters)
33995 - model->num_virt_counters = model->num_counters;
33996 + if (!model->num_virt_counters) {
33997 + pax_open_kernel();
33998 + *(unsigned int *)&model->num_virt_counters = model->num_counters;
33999 + pax_close_kernel();
34000 + }
34001
34002 mux_init(ops);
34003
34004 diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34005 index 50d86c0..7985318 100644
34006 --- a/arch/x86/oprofile/op_model_amd.c
34007 +++ b/arch/x86/oprofile/op_model_amd.c
34008 @@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34009 num_counters = AMD64_NUM_COUNTERS;
34010 }
34011
34012 - op_amd_spec.num_counters = num_counters;
34013 - op_amd_spec.num_controls = num_counters;
34014 - op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34015 + pax_open_kernel();
34016 + *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34017 + *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34018 + *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34019 + pax_close_kernel();
34020
34021 return 0;
34022 }
34023 diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34024 index d90528e..0127e2b 100644
34025 --- a/arch/x86/oprofile/op_model_ppro.c
34026 +++ b/arch/x86/oprofile/op_model_ppro.c
34027 @@ -19,6 +19,7 @@
34028 #include <asm/msr.h>
34029 #include <asm/apic.h>
34030 #include <asm/nmi.h>
34031 +#include <asm/pgtable.h>
34032
34033 #include "op_x86_model.h"
34034 #include "op_counter.h"
34035 @@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34036
34037 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34038
34039 - op_arch_perfmon_spec.num_counters = num_counters;
34040 - op_arch_perfmon_spec.num_controls = num_counters;
34041 + pax_open_kernel();
34042 + *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34043 + *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34044 + pax_close_kernel();
34045 }
34046
34047 static int arch_perfmon_init(struct oprofile_operations *ignore)
34048 diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34049 index 71e8a67..6a313bb 100644
34050 --- a/arch/x86/oprofile/op_x86_model.h
34051 +++ b/arch/x86/oprofile/op_x86_model.h
34052 @@ -52,7 +52,7 @@ struct op_x86_model_spec {
34053 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34054 struct op_msrs const * const msrs);
34055 #endif
34056 -};
34057 +} __do_const;
34058
34059 struct op_counter_config;
34060
34061 diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34062 index 84b9d67..260e5ff 100644
34063 --- a/arch/x86/pci/intel_mid_pci.c
34064 +++ b/arch/x86/pci/intel_mid_pci.c
34065 @@ -245,7 +245,7 @@ int __init intel_mid_pci_init(void)
34066 pr_info("Intel MID platform detected, using MID PCI ops\n");
34067 pci_mmcfg_late_init();
34068 pcibios_enable_irq = intel_mid_pci_irq_enable;
34069 - pci_root_ops = intel_mid_pci_ops;
34070 + memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34071 pci_soc_mode = 1;
34072 /* Continue with standard init */
34073 return 1;
34074 diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34075 index 372e9b8..e775a6c 100644
34076 --- a/arch/x86/pci/irq.c
34077 +++ b/arch/x86/pci/irq.c
34078 @@ -50,7 +50,7 @@ struct irq_router {
34079 struct irq_router_handler {
34080 u16 vendor;
34081 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34082 -};
34083 +} __do_const;
34084
34085 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34086 void (*pcibios_disable_irq)(struct pci_dev *dev) = NULL;
34087 @@ -794,7 +794,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34088 return 0;
34089 }
34090
34091 -static __initdata struct irq_router_handler pirq_routers[] = {
34092 +static __initconst const struct irq_router_handler pirq_routers[] = {
34093 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34094 { PCI_VENDOR_ID_AL, ali_router_probe },
34095 { PCI_VENDOR_ID_ITE, ite_router_probe },
34096 @@ -821,7 +821,7 @@ static struct pci_dev *pirq_router_dev;
34097 static void __init pirq_find_router(struct irq_router *r)
34098 {
34099 struct irq_routing_table *rt = pirq_table;
34100 - struct irq_router_handler *h;
34101 + const struct irq_router_handler *h;
34102
34103 #ifdef CONFIG_PCI_BIOS
34104 if (!rt->signature) {
34105 @@ -1094,7 +1094,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34106 return 0;
34107 }
34108
34109 -static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34110 +static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34111 {
34112 .callback = fix_broken_hp_bios_irq9,
34113 .ident = "HP Pavilion N5400 Series Laptop",
34114 diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34115 index c77b24a..c979855 100644
34116 --- a/arch/x86/pci/pcbios.c
34117 +++ b/arch/x86/pci/pcbios.c
34118 @@ -79,7 +79,7 @@ union bios32 {
34119 static struct {
34120 unsigned long address;
34121 unsigned short segment;
34122 -} bios32_indirect = { 0, __KERNEL_CS };
34123 +} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
34124
34125 /*
34126 * Returns the entry point for the given service, NULL on error
34127 @@ -92,37 +92,80 @@ static unsigned long bios32_service(unsigned long service)
34128 unsigned long length; /* %ecx */
34129 unsigned long entry; /* %edx */
34130 unsigned long flags;
34131 + struct desc_struct d, *gdt;
34132
34133 local_irq_save(flags);
34134 - __asm__("lcall *(%%edi); cld"
34135 +
34136 + gdt = get_cpu_gdt_table(smp_processor_id());
34137 +
34138 + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34139 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34140 + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34141 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34142 +
34143 + __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34144 : "=a" (return_code),
34145 "=b" (address),
34146 "=c" (length),
34147 "=d" (entry)
34148 : "0" (service),
34149 "1" (0),
34150 - "D" (&bios32_indirect));
34151 + "D" (&bios32_indirect),
34152 + "r"(__PCIBIOS_DS)
34153 + : "memory");
34154 +
34155 + pax_open_kernel();
34156 + gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34157 + gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34158 + gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34159 + gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34160 + pax_close_kernel();
34161 +
34162 local_irq_restore(flags);
34163
34164 switch (return_code) {
34165 - case 0:
34166 - return address + entry;
34167 - case 0x80: /* Not present */
34168 - printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34169 - return 0;
34170 - default: /* Shouldn't happen */
34171 - printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34172 - service, return_code);
34173 + case 0: {
34174 + int cpu;
34175 + unsigned char flags;
34176 +
34177 + printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34178 + if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34179 + printk(KERN_WARNING "bios32_service: not valid\n");
34180 return 0;
34181 + }
34182 + address = address + PAGE_OFFSET;
34183 + length += 16UL; /* some BIOSs underreport this... */
34184 + flags = 4;
34185 + if (length >= 64*1024*1024) {
34186 + length >>= PAGE_SHIFT;
34187 + flags |= 8;
34188 + }
34189 +
34190 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34191 + gdt = get_cpu_gdt_table(cpu);
34192 + pack_descriptor(&d, address, length, 0x9b, flags);
34193 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34194 + pack_descriptor(&d, address, length, 0x93, flags);
34195 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34196 + }
34197 + return entry;
34198 + }
34199 + case 0x80: /* Not present */
34200 + printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34201 + return 0;
34202 + default: /* Shouldn't happen */
34203 + printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34204 + service, return_code);
34205 + return 0;
34206 }
34207 }
34208
34209 static struct {
34210 unsigned long address;
34211 unsigned short segment;
34212 -} pci_indirect = { 0, __KERNEL_CS };
34213 +} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34214
34215 -static int pci_bios_present;
34216 +static int pci_bios_present __read_only;
34217
34218 static int check_pcibios(void)
34219 {
34220 @@ -131,11 +174,13 @@ static int check_pcibios(void)
34221 unsigned long flags, pcibios_entry;
34222
34223 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34224 - pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34225 + pci_indirect.address = pcibios_entry;
34226
34227 local_irq_save(flags);
34228 - __asm__(
34229 - "lcall *(%%edi); cld\n\t"
34230 + __asm__("movw %w6, %%ds\n\t"
34231 + "lcall *%%ss:(%%edi); cld\n\t"
34232 + "push %%ss\n\t"
34233 + "pop %%ds\n\t"
34234 "jc 1f\n\t"
34235 "xor %%ah, %%ah\n"
34236 "1:"
34237 @@ -144,7 +189,8 @@ static int check_pcibios(void)
34238 "=b" (ebx),
34239 "=c" (ecx)
34240 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34241 - "D" (&pci_indirect)
34242 + "D" (&pci_indirect),
34243 + "r" (__PCIBIOS_DS)
34244 : "memory");
34245 local_irq_restore(flags);
34246
34247 @@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34248
34249 switch (len) {
34250 case 1:
34251 - __asm__("lcall *(%%esi); cld\n\t"
34252 + __asm__("movw %w6, %%ds\n\t"
34253 + "lcall *%%ss:(%%esi); cld\n\t"
34254 + "push %%ss\n\t"
34255 + "pop %%ds\n\t"
34256 "jc 1f\n\t"
34257 "xor %%ah, %%ah\n"
34258 "1:"
34259 @@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34260 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34261 "b" (bx),
34262 "D" ((long)reg),
34263 - "S" (&pci_indirect));
34264 + "S" (&pci_indirect),
34265 + "r" (__PCIBIOS_DS));
34266 /*
34267 * Zero-extend the result beyond 8 bits, do not trust the
34268 * BIOS having done it:
34269 @@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34270 *value &= 0xff;
34271 break;
34272 case 2:
34273 - __asm__("lcall *(%%esi); cld\n\t"
34274 + __asm__("movw %w6, %%ds\n\t"
34275 + "lcall *%%ss:(%%esi); cld\n\t"
34276 + "push %%ss\n\t"
34277 + "pop %%ds\n\t"
34278 "jc 1f\n\t"
34279 "xor %%ah, %%ah\n"
34280 "1:"
34281 @@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34282 : "1" (PCIBIOS_READ_CONFIG_WORD),
34283 "b" (bx),
34284 "D" ((long)reg),
34285 - "S" (&pci_indirect));
34286 + "S" (&pci_indirect),
34287 + "r" (__PCIBIOS_DS));
34288 /*
34289 * Zero-extend the result beyond 16 bits, do not trust the
34290 * BIOS having done it:
34291 @@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34292 *value &= 0xffff;
34293 break;
34294 case 4:
34295 - __asm__("lcall *(%%esi); cld\n\t"
34296 + __asm__("movw %w6, %%ds\n\t"
34297 + "lcall *%%ss:(%%esi); cld\n\t"
34298 + "push %%ss\n\t"
34299 + "pop %%ds\n\t"
34300 "jc 1f\n\t"
34301 "xor %%ah, %%ah\n"
34302 "1:"
34303 @@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34304 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34305 "b" (bx),
34306 "D" ((long)reg),
34307 - "S" (&pci_indirect));
34308 + "S" (&pci_indirect),
34309 + "r" (__PCIBIOS_DS));
34310 break;
34311 }
34312
34313 @@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34314
34315 switch (len) {
34316 case 1:
34317 - __asm__("lcall *(%%esi); cld\n\t"
34318 + __asm__("movw %w6, %%ds\n\t"
34319 + "lcall *%%ss:(%%esi); cld\n\t"
34320 + "push %%ss\n\t"
34321 + "pop %%ds\n\t"
34322 "jc 1f\n\t"
34323 "xor %%ah, %%ah\n"
34324 "1:"
34325 @@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34326 "c" (value),
34327 "b" (bx),
34328 "D" ((long)reg),
34329 - "S" (&pci_indirect));
34330 + "S" (&pci_indirect),
34331 + "r" (__PCIBIOS_DS));
34332 break;
34333 case 2:
34334 - __asm__("lcall *(%%esi); cld\n\t"
34335 + __asm__("movw %w6, %%ds\n\t"
34336 + "lcall *%%ss:(%%esi); cld\n\t"
34337 + "push %%ss\n\t"
34338 + "pop %%ds\n\t"
34339 "jc 1f\n\t"
34340 "xor %%ah, %%ah\n"
34341 "1:"
34342 @@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34343 "c" (value),
34344 "b" (bx),
34345 "D" ((long)reg),
34346 - "S" (&pci_indirect));
34347 + "S" (&pci_indirect),
34348 + "r" (__PCIBIOS_DS));
34349 break;
34350 case 4:
34351 - __asm__("lcall *(%%esi); cld\n\t"
34352 + __asm__("movw %w6, %%ds\n\t"
34353 + "lcall *%%ss:(%%esi); cld\n\t"
34354 + "push %%ss\n\t"
34355 + "pop %%ds\n\t"
34356 "jc 1f\n\t"
34357 "xor %%ah, %%ah\n"
34358 "1:"
34359 @@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34360 "c" (value),
34361 "b" (bx),
34362 "D" ((long)reg),
34363 - "S" (&pci_indirect));
34364 + "S" (&pci_indirect),
34365 + "r" (__PCIBIOS_DS));
34366 break;
34367 }
34368
34369 @@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34370
34371 DBG("PCI: Fetching IRQ routing table... ");
34372 __asm__("push %%es\n\t"
34373 + "movw %w8, %%ds\n\t"
34374 "push %%ds\n\t"
34375 "pop %%es\n\t"
34376 - "lcall *(%%esi); cld\n\t"
34377 + "lcall *%%ss:(%%esi); cld\n\t"
34378 "pop %%es\n\t"
34379 + "push %%ss\n\t"
34380 + "pop %%ds\n"
34381 "jc 1f\n\t"
34382 "xor %%ah, %%ah\n"
34383 "1:"
34384 @@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34385 "1" (0),
34386 "D" ((long) &opt),
34387 "S" (&pci_indirect),
34388 - "m" (opt)
34389 + "m" (opt),
34390 + "r" (__PCIBIOS_DS)
34391 : "memory");
34392 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34393 if (ret & 0xff00)
34394 @@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34395 {
34396 int ret;
34397
34398 - __asm__("lcall *(%%esi); cld\n\t"
34399 + __asm__("movw %w5, %%ds\n\t"
34400 + "lcall *%%ss:(%%esi); cld\n\t"
34401 + "push %%ss\n\t"
34402 + "pop %%ds\n"
34403 "jc 1f\n\t"
34404 "xor %%ah, %%ah\n"
34405 "1:"
34406 @@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34407 : "0" (PCIBIOS_SET_PCI_HW_INT),
34408 "b" ((dev->bus->number << 8) | dev->devfn),
34409 "c" ((irq << 8) | (pin + 10)),
34410 - "S" (&pci_indirect));
34411 + "S" (&pci_indirect),
34412 + "r" (__PCIBIOS_DS));
34413 return !(ret & 0xff00);
34414 }
34415 EXPORT_SYMBOL(pcibios_set_irq_routing);
34416 diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34417 index 9ee3491..872192f 100644
34418 --- a/arch/x86/platform/efi/efi_32.c
34419 +++ b/arch/x86/platform/efi/efi_32.c
34420 @@ -59,11 +59,22 @@ void efi_call_phys_prelog(void)
34421 {
34422 struct desc_ptr gdt_descr;
34423
34424 +#ifdef CONFIG_PAX_KERNEXEC
34425 + struct desc_struct d;
34426 +#endif
34427 +
34428 local_irq_save(efi_rt_eflags);
34429
34430 load_cr3(initial_page_table);
34431 __flush_tlb_all();
34432
34433 +#ifdef CONFIG_PAX_KERNEXEC
34434 + pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34435 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34436 + pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34437 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34438 +#endif
34439 +
34440 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34441 gdt_descr.size = GDT_SIZE - 1;
34442 load_gdt(&gdt_descr);
34443 @@ -73,11 +84,24 @@ void efi_call_phys_epilog(void)
34444 {
34445 struct desc_ptr gdt_descr;
34446
34447 +#ifdef CONFIG_PAX_KERNEXEC
34448 + struct desc_struct d;
34449 +
34450 + memset(&d, 0, sizeof d);
34451 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34452 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34453 +#endif
34454 +
34455 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34456 gdt_descr.size = GDT_SIZE - 1;
34457 load_gdt(&gdt_descr);
34458
34459 +#ifdef CONFIG_PAX_PER_CPU_PGD
34460 + load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34461 +#else
34462 load_cr3(swapper_pg_dir);
34463 +#endif
34464 +
34465 __flush_tlb_all();
34466
34467 local_irq_restore(efi_rt_eflags);
34468 diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34469 index 666b74a..673d88f 100644
34470 --- a/arch/x86/platform/efi/efi_64.c
34471 +++ b/arch/x86/platform/efi/efi_64.c
34472 @@ -97,6 +97,11 @@ void __init efi_call_phys_prelog(void)
34473 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34474 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34475 }
34476 +
34477 +#ifdef CONFIG_PAX_PER_CPU_PGD
34478 + load_cr3(swapper_pg_dir);
34479 +#endif
34480 +
34481 __flush_tlb_all();
34482 }
34483
34484 @@ -114,6 +119,11 @@ void __init efi_call_phys_epilog(void)
34485 for (pgd = 0; pgd < n_pgds; pgd++)
34486 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
34487 kfree(save_pgd);
34488 +
34489 +#ifdef CONFIG_PAX_PER_CPU_PGD
34490 + load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34491 +#endif
34492 +
34493 __flush_tlb_all();
34494 local_irq_restore(efi_flags);
34495 early_code_mapping_set_exec(0);
34496 diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
34497 index fbe66e6..eae5e38 100644
34498 --- a/arch/x86/platform/efi/efi_stub_32.S
34499 +++ b/arch/x86/platform/efi/efi_stub_32.S
34500 @@ -6,7 +6,9 @@
34501 */
34502
34503 #include <linux/linkage.h>
34504 +#include <linux/init.h>
34505 #include <asm/page_types.h>
34506 +#include <asm/segment.h>
34507
34508 /*
34509 * efi_call_phys(void *, ...) is a function with variable parameters.
34510 @@ -20,7 +22,7 @@
34511 * service functions will comply with gcc calling convention, too.
34512 */
34513
34514 -.text
34515 +__INIT
34516 ENTRY(efi_call_phys)
34517 /*
34518 * 0. The function can only be called in Linux kernel. So CS has been
34519 @@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
34520 * The mapping of lower virtual memory has been created in prelog and
34521 * epilog.
34522 */
34523 - movl $1f, %edx
34524 - subl $__PAGE_OFFSET, %edx
34525 - jmp *%edx
34526 +#ifdef CONFIG_PAX_KERNEXEC
34527 + movl $(__KERNEXEC_EFI_DS), %edx
34528 + mov %edx, %ds
34529 + mov %edx, %es
34530 + mov %edx, %ss
34531 + addl $2f,(1f)
34532 + ljmp *(1f)
34533 +
34534 +__INITDATA
34535 +1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
34536 +.previous
34537 +
34538 +2:
34539 + subl $2b,(1b)
34540 +#else
34541 + jmp 1f-__PAGE_OFFSET
34542 1:
34543 +#endif
34544
34545 /*
34546 * 2. Now on the top of stack is the return
34547 @@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
34548 * parameter 2, ..., param n. To make things easy, we save the return
34549 * address of efi_call_phys in a global variable.
34550 */
34551 - popl %edx
34552 - movl %edx, saved_return_addr
34553 - /* get the function pointer into ECX*/
34554 - popl %ecx
34555 - movl %ecx, efi_rt_function_ptr
34556 - movl $2f, %edx
34557 - subl $__PAGE_OFFSET, %edx
34558 - pushl %edx
34559 + popl (saved_return_addr)
34560 + popl (efi_rt_function_ptr)
34561
34562 /*
34563 * 3. Clear PG bit in %CR0.
34564 @@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
34565 /*
34566 * 5. Call the physical function.
34567 */
34568 - jmp *%ecx
34569 + call *(efi_rt_function_ptr-__PAGE_OFFSET)
34570
34571 -2:
34572 /*
34573 * 6. After EFI runtime service returns, control will return to
34574 * following instruction. We'd better readjust stack pointer first.
34575 @@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
34576 movl %cr0, %edx
34577 orl $0x80000000, %edx
34578 movl %edx, %cr0
34579 - jmp 1f
34580 -1:
34581 +
34582 /*
34583 * 8. Now restore the virtual mode from flat mode by
34584 * adding EIP with PAGE_OFFSET.
34585 */
34586 - movl $1f, %edx
34587 - jmp *%edx
34588 +#ifdef CONFIG_PAX_KERNEXEC
34589 + movl $(__KERNEL_DS), %edx
34590 + mov %edx, %ds
34591 + mov %edx, %es
34592 + mov %edx, %ss
34593 + ljmp $(__KERNEL_CS),$1f
34594 +#else
34595 + jmp 1f+__PAGE_OFFSET
34596 +#endif
34597 1:
34598
34599 /*
34600 * 9. Balance the stack. And because EAX contain the return value,
34601 * we'd better not clobber it.
34602 */
34603 - leal efi_rt_function_ptr, %edx
34604 - movl (%edx), %ecx
34605 - pushl %ecx
34606 + pushl (efi_rt_function_ptr)
34607
34608 /*
34609 - * 10. Push the saved return address onto the stack and return.
34610 + * 10. Return to the saved return address.
34611 */
34612 - leal saved_return_addr, %edx
34613 - movl (%edx), %ecx
34614 - pushl %ecx
34615 - ret
34616 + jmpl *(saved_return_addr)
34617 ENDPROC(efi_call_phys)
34618 .previous
34619
34620 -.data
34621 +__INITDATA
34622 saved_return_addr:
34623 .long 0
34624 efi_rt_function_ptr:
34625 diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
34626 index 88073b1..1cc2f53 100644
34627 --- a/arch/x86/platform/efi/efi_stub_64.S
34628 +++ b/arch/x86/platform/efi/efi_stub_64.S
34629 @@ -7,6 +7,7 @@
34630 */
34631
34632 #include <linux/linkage.h>
34633 +#include <asm/alternative-asm.h>
34634
34635 #define SAVE_XMM \
34636 mov %rsp, %rax; \
34637 @@ -77,6 +78,7 @@ ENTRY(efi_call0)
34638 RESTORE_PGT
34639 addq $32, %rsp
34640 RESTORE_XMM
34641 + pax_force_retaddr 0, 1
34642 ret
34643 ENDPROC(efi_call0)
34644
34645 @@ -89,6 +91,7 @@ ENTRY(efi_call1)
34646 RESTORE_PGT
34647 addq $32, %rsp
34648 RESTORE_XMM
34649 + pax_force_retaddr 0, 1
34650 ret
34651 ENDPROC(efi_call1)
34652
34653 @@ -101,6 +104,7 @@ ENTRY(efi_call2)
34654 RESTORE_PGT
34655 addq $32, %rsp
34656 RESTORE_XMM
34657 + pax_force_retaddr 0, 1
34658 ret
34659 ENDPROC(efi_call2)
34660
34661 @@ -114,6 +118,7 @@ ENTRY(efi_call3)
34662 RESTORE_PGT
34663 addq $32, %rsp
34664 RESTORE_XMM
34665 + pax_force_retaddr 0, 1
34666 ret
34667 ENDPROC(efi_call3)
34668
34669 @@ -128,6 +133,7 @@ ENTRY(efi_call4)
34670 RESTORE_PGT
34671 addq $32, %rsp
34672 RESTORE_XMM
34673 + pax_force_retaddr 0, 1
34674 ret
34675 ENDPROC(efi_call4)
34676
34677 @@ -143,6 +149,7 @@ ENTRY(efi_call5)
34678 RESTORE_PGT
34679 addq $48, %rsp
34680 RESTORE_XMM
34681 + pax_force_retaddr 0, 1
34682 ret
34683 ENDPROC(efi_call5)
34684
34685 @@ -161,6 +168,7 @@ ENTRY(efi_call6)
34686 RESTORE_PGT
34687 addq $48, %rsp
34688 RESTORE_XMM
34689 + pax_force_retaddr 0, 1
34690 ret
34691 ENDPROC(efi_call6)
34692
34693 diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
34694 index 1bbedc4..eb795b5 100644
34695 --- a/arch/x86/platform/intel-mid/intel-mid.c
34696 +++ b/arch/x86/platform/intel-mid/intel-mid.c
34697 @@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
34698 {
34699 };
34700
34701 -static void intel_mid_reboot(void)
34702 +static void __noreturn intel_mid_reboot(void)
34703 {
34704 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
34705 + BUG();
34706 }
34707
34708 static unsigned long __init intel_mid_calibrate_tsc(void)
34709 diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
34710 index d6ee929..3637cb5 100644
34711 --- a/arch/x86/platform/olpc/olpc_dt.c
34712 +++ b/arch/x86/platform/olpc/olpc_dt.c
34713 @@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
34714 return res;
34715 }
34716
34717 -static struct of_pdt_ops prom_olpc_ops __initdata = {
34718 +static struct of_pdt_ops prom_olpc_ops __initconst = {
34719 .nextprop = olpc_dt_nextprop,
34720 .getproplen = olpc_dt_getproplen,
34721 .getproperty = olpc_dt_getproperty,
34722 diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
34723 index 424f4c9..f2a2988 100644
34724 --- a/arch/x86/power/cpu.c
34725 +++ b/arch/x86/power/cpu.c
34726 @@ -137,11 +137,8 @@ static void do_fpu_end(void)
34727 static void fix_processor_context(void)
34728 {
34729 int cpu = smp_processor_id();
34730 - struct tss_struct *t = &per_cpu(init_tss, cpu);
34731 -#ifdef CONFIG_X86_64
34732 - struct desc_struct *desc = get_cpu_gdt_table(cpu);
34733 - tss_desc tss;
34734 -#endif
34735 + struct tss_struct *t = init_tss + cpu;
34736 +
34737 set_tss_desc(cpu, t); /*
34738 * This just modifies memory; should not be
34739 * necessary. But... This is necessary, because
34740 @@ -150,10 +147,6 @@ static void fix_processor_context(void)
34741 */
34742
34743 #ifdef CONFIG_X86_64
34744 - memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
34745 - tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
34746 - write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
34747 -
34748 syscall_init(); /* This sets MSR_*STAR and related */
34749 #endif
34750 load_TR_desc(); /* This does ltr */
34751 diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
34752 index bad628a..a102610 100644
34753 --- a/arch/x86/realmode/init.c
34754 +++ b/arch/x86/realmode/init.c
34755 @@ -68,7 +68,13 @@ void __init setup_real_mode(void)
34756 __va(real_mode_header->trampoline_header);
34757
34758 #ifdef CONFIG_X86_32
34759 - trampoline_header->start = __pa_symbol(startup_32_smp);
34760 + trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
34761 +
34762 +#ifdef CONFIG_PAX_KERNEXEC
34763 + trampoline_header->start -= LOAD_PHYSICAL_ADDR;
34764 +#endif
34765 +
34766 + trampoline_header->boot_cs = __BOOT_CS;
34767 trampoline_header->gdt_limit = __BOOT_DS + 7;
34768 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
34769 #else
34770 @@ -84,7 +90,7 @@ void __init setup_real_mode(void)
34771 *trampoline_cr4_features = read_cr4();
34772
34773 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
34774 - trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
34775 + trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
34776 trampoline_pgd[511] = init_level4_pgt[511].pgd;
34777 #endif
34778 }
34779 diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
34780 index 3497f14..cc73b92 100644
34781 --- a/arch/x86/realmode/rm/Makefile
34782 +++ b/arch/x86/realmode/rm/Makefile
34783 @@ -66,5 +66,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
34784
34785 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
34786 -I$(srctree)/arch/x86/boot
34787 +ifdef CONSTIFY_PLUGIN
34788 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
34789 +endif
34790 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
34791 GCOV_PROFILE := n
34792 diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
34793 index a28221d..93c40f1 100644
34794 --- a/arch/x86/realmode/rm/header.S
34795 +++ b/arch/x86/realmode/rm/header.S
34796 @@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
34797 #endif
34798 /* APM/BIOS reboot */
34799 .long pa_machine_real_restart_asm
34800 -#ifdef CONFIG_X86_64
34801 +#ifdef CONFIG_X86_32
34802 + .long __KERNEL_CS
34803 +#else
34804 .long __KERNEL32_CS
34805 #endif
34806 END(real_mode_header)
34807 diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
34808 index 48ddd76..c26749f 100644
34809 --- a/arch/x86/realmode/rm/trampoline_32.S
34810 +++ b/arch/x86/realmode/rm/trampoline_32.S
34811 @@ -24,6 +24,12 @@
34812 #include <asm/page_types.h>
34813 #include "realmode.h"
34814
34815 +#ifdef CONFIG_PAX_KERNEXEC
34816 +#define ta(X) (X)
34817 +#else
34818 +#define ta(X) (pa_ ## X)
34819 +#endif
34820 +
34821 .text
34822 .code16
34823
34824 @@ -38,8 +44,6 @@ ENTRY(trampoline_start)
34825
34826 cli # We should be safe anyway
34827
34828 - movl tr_start, %eax # where we need to go
34829 -
34830 movl $0xA5A5A5A5, trampoline_status
34831 # write marker for master knows we're running
34832
34833 @@ -55,7 +59,7 @@ ENTRY(trampoline_start)
34834 movw $1, %dx # protected mode (PE) bit
34835 lmsw %dx # into protected mode
34836
34837 - ljmpl $__BOOT_CS, $pa_startup_32
34838 + ljmpl *(trampoline_header)
34839
34840 .section ".text32","ax"
34841 .code32
34842 @@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
34843 .balign 8
34844 GLOBAL(trampoline_header)
34845 tr_start: .space 4
34846 - tr_gdt_pad: .space 2
34847 + tr_boot_cs: .space 2
34848 tr_gdt: .space 6
34849 END(trampoline_header)
34850
34851 diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
34852 index dac7b20..72dbaca 100644
34853 --- a/arch/x86/realmode/rm/trampoline_64.S
34854 +++ b/arch/x86/realmode/rm/trampoline_64.S
34855 @@ -93,6 +93,7 @@ ENTRY(startup_32)
34856 movl %edx, %gs
34857
34858 movl pa_tr_cr4, %eax
34859 + andl $~X86_CR4_PCIDE, %eax
34860 movl %eax, %cr4 # Enable PAE mode
34861
34862 # Setup trampoline 4 level pagetables
34863 @@ -106,7 +107,7 @@ ENTRY(startup_32)
34864 wrmsr
34865
34866 # Enable paging and in turn activate Long Mode
34867 - movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
34868 + movl $(X86_CR0_PG | X86_CR0_PE), %eax
34869 movl %eax, %cr0
34870
34871 /*
34872 diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
34873 index e812034..c747134 100644
34874 --- a/arch/x86/tools/Makefile
34875 +++ b/arch/x86/tools/Makefile
34876 @@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
34877
34878 $(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
34879
34880 -HOST_EXTRACFLAGS += -I$(srctree)/tools/include
34881 +HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
34882 hostprogs-y += relocs
34883 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
34884 relocs: $(obj)/relocs
34885 diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
34886 index cfbdbdb..1aa763c 100644
34887 --- a/arch/x86/tools/relocs.c
34888 +++ b/arch/x86/tools/relocs.c
34889 @@ -1,5 +1,7 @@
34890 /* This is included from relocs_32/64.c */
34891
34892 +#include "../../../include/generated/autoconf.h"
34893 +
34894 #define ElfW(type) _ElfW(ELF_BITS, type)
34895 #define _ElfW(bits, type) __ElfW(bits, type)
34896 #define __ElfW(bits, type) Elf##bits##_##type
34897 @@ -11,6 +13,7 @@
34898 #define Elf_Sym ElfW(Sym)
34899
34900 static Elf_Ehdr ehdr;
34901 +static Elf_Phdr *phdr;
34902
34903 struct relocs {
34904 uint32_t *offset;
34905 @@ -383,9 +386,39 @@ static void read_ehdr(FILE *fp)
34906 }
34907 }
34908
34909 +static void read_phdrs(FILE *fp)
34910 +{
34911 + unsigned int i;
34912 +
34913 + phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
34914 + if (!phdr) {
34915 + die("Unable to allocate %d program headers\n",
34916 + ehdr.e_phnum);
34917 + }
34918 + if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
34919 + die("Seek to %d failed: %s\n",
34920 + ehdr.e_phoff, strerror(errno));
34921 + }
34922 + if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
34923 + die("Cannot read ELF program headers: %s\n",
34924 + strerror(errno));
34925 + }
34926 + for(i = 0; i < ehdr.e_phnum; i++) {
34927 + phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
34928 + phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
34929 + phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
34930 + phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
34931 + phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
34932 + phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
34933 + phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
34934 + phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
34935 + }
34936 +
34937 +}
34938 +
34939 static void read_shdrs(FILE *fp)
34940 {
34941 - int i;
34942 + unsigned int i;
34943 Elf_Shdr shdr;
34944
34945 secs = calloc(ehdr.e_shnum, sizeof(struct section));
34946 @@ -420,7 +453,7 @@ static void read_shdrs(FILE *fp)
34947
34948 static void read_strtabs(FILE *fp)
34949 {
34950 - int i;
34951 + unsigned int i;
34952 for (i = 0; i < ehdr.e_shnum; i++) {
34953 struct section *sec = &secs[i];
34954 if (sec->shdr.sh_type != SHT_STRTAB) {
34955 @@ -445,7 +478,7 @@ static void read_strtabs(FILE *fp)
34956
34957 static void read_symtabs(FILE *fp)
34958 {
34959 - int i,j;
34960 + unsigned int i,j;
34961 for (i = 0; i < ehdr.e_shnum; i++) {
34962 struct section *sec = &secs[i];
34963 if (sec->shdr.sh_type != SHT_SYMTAB) {
34964 @@ -476,9 +509,11 @@ static void read_symtabs(FILE *fp)
34965 }
34966
34967
34968 -static void read_relocs(FILE *fp)
34969 +static void read_relocs(FILE *fp, int use_real_mode)
34970 {
34971 - int i,j;
34972 + unsigned int i,j;
34973 + uint32_t base;
34974 +
34975 for (i = 0; i < ehdr.e_shnum; i++) {
34976 struct section *sec = &secs[i];
34977 if (sec->shdr.sh_type != SHT_REL_TYPE) {
34978 @@ -498,9 +533,22 @@ static void read_relocs(FILE *fp)
34979 die("Cannot read symbol table: %s\n",
34980 strerror(errno));
34981 }
34982 + base = 0;
34983 +
34984 +#ifdef CONFIG_X86_32
34985 + for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
34986 + if (phdr[j].p_type != PT_LOAD )
34987 + continue;
34988 + 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)
34989 + continue;
34990 + base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
34991 + break;
34992 + }
34993 +#endif
34994 +
34995 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
34996 Elf_Rel *rel = &sec->reltab[j];
34997 - rel->r_offset = elf_addr_to_cpu(rel->r_offset);
34998 + rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
34999 rel->r_info = elf_xword_to_cpu(rel->r_info);
35000 #if (SHT_REL_TYPE == SHT_RELA)
35001 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35002 @@ -512,7 +560,7 @@ static void read_relocs(FILE *fp)
35003
35004 static void print_absolute_symbols(void)
35005 {
35006 - int i;
35007 + unsigned int i;
35008 const char *format;
35009
35010 if (ELF_BITS == 64)
35011 @@ -525,7 +573,7 @@ static void print_absolute_symbols(void)
35012 for (i = 0; i < ehdr.e_shnum; i++) {
35013 struct section *sec = &secs[i];
35014 char *sym_strtab;
35015 - int j;
35016 + unsigned int j;
35017
35018 if (sec->shdr.sh_type != SHT_SYMTAB) {
35019 continue;
35020 @@ -552,7 +600,7 @@ static void print_absolute_symbols(void)
35021
35022 static void print_absolute_relocs(void)
35023 {
35024 - int i, printed = 0;
35025 + unsigned int i, printed = 0;
35026 const char *format;
35027
35028 if (ELF_BITS == 64)
35029 @@ -565,7 +613,7 @@ static void print_absolute_relocs(void)
35030 struct section *sec_applies, *sec_symtab;
35031 char *sym_strtab;
35032 Elf_Sym *sh_symtab;
35033 - int j;
35034 + unsigned int j;
35035 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35036 continue;
35037 }
35038 @@ -642,13 +690,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35039 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35040 Elf_Sym *sym, const char *symname))
35041 {
35042 - int i;
35043 + unsigned int i;
35044 /* Walk through the relocations */
35045 for (i = 0; i < ehdr.e_shnum; i++) {
35046 char *sym_strtab;
35047 Elf_Sym *sh_symtab;
35048 struct section *sec_applies, *sec_symtab;
35049 - int j;
35050 + unsigned int j;
35051 struct section *sec = &secs[i];
35052
35053 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35054 @@ -822,6 +870,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35055 {
35056 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35057 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35058 + char *sym_strtab = sec->link->link->strtab;
35059 +
35060 + /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35061 + if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35062 + return 0;
35063 +
35064 +#ifdef CONFIG_PAX_KERNEXEC
35065 + /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35066 + if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35067 + return 0;
35068 + if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35069 + return 0;
35070 + if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35071 + return 0;
35072 + if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35073 + return 0;
35074 +#endif
35075
35076 switch (r_type) {
35077 case R_386_NONE:
35078 @@ -960,7 +1025,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35079
35080 static void emit_relocs(int as_text, int use_real_mode)
35081 {
35082 - int i;
35083 + unsigned int i;
35084 int (*write_reloc)(uint32_t, FILE *) = write32;
35085 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35086 const char *symname);
35087 @@ -1060,10 +1125,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35088 {
35089 regex_init(use_real_mode);
35090 read_ehdr(fp);
35091 + read_phdrs(fp);
35092 read_shdrs(fp);
35093 read_strtabs(fp);
35094 read_symtabs(fp);
35095 - read_relocs(fp);
35096 + read_relocs(fp, use_real_mode);
35097 if (ELF_BITS == 64)
35098 percpu_init();
35099 if (show_absolute_syms) {
35100 diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35101 index 80ffa5b..a33bd15 100644
35102 --- a/arch/x86/um/tls_32.c
35103 +++ b/arch/x86/um/tls_32.c
35104 @@ -260,7 +260,7 @@ out:
35105 if (unlikely(task == current &&
35106 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35107 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35108 - "without flushed TLS.", current->pid);
35109 + "without flushed TLS.", task_pid_nr(current));
35110 }
35111
35112 return 0;
35113 diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35114 index fd14be1..e3c79c0 100644
35115 --- a/arch/x86/vdso/Makefile
35116 +++ b/arch/x86/vdso/Makefile
35117 @@ -181,7 +181,7 @@ quiet_cmd_vdso = VDSO $@
35118 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35119 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35120
35121 -VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
35122 +VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
35123 GCOV_PROFILE := n
35124
35125 #
35126 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35127 index d6bfb87..876ee18 100644
35128 --- a/arch/x86/vdso/vdso32-setup.c
35129 +++ b/arch/x86/vdso/vdso32-setup.c
35130 @@ -25,6 +25,7 @@
35131 #include <asm/tlbflush.h>
35132 #include <asm/vdso.h>
35133 #include <asm/proto.h>
35134 +#include <asm/mman.h>
35135
35136 enum {
35137 VDSO_DISABLED = 0,
35138 @@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map)
35139 void enable_sep_cpu(void)
35140 {
35141 int cpu = get_cpu();
35142 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
35143 + struct tss_struct *tss = init_tss + cpu;
35144
35145 if (!boot_cpu_has(X86_FEATURE_SEP)) {
35146 put_cpu();
35147 @@ -249,7 +250,7 @@ static int __init gate_vma_init(void)
35148 gate_vma.vm_start = FIXADDR_USER_START;
35149 gate_vma.vm_end = FIXADDR_USER_END;
35150 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35151 - gate_vma.vm_page_prot = __P101;
35152 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35153
35154 return 0;
35155 }
35156 @@ -330,14 +331,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35157 if (compat)
35158 addr = VDSO_HIGH_BASE;
35159 else {
35160 - addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
35161 + addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE);
35162 if (IS_ERR_VALUE(addr)) {
35163 ret = addr;
35164 goto up_fail;
35165 }
35166 }
35167
35168 - current->mm->context.vdso = (void *)addr;
35169 + current->mm->context.vdso = addr;
35170
35171 if (compat_uses_vma || !compat) {
35172 /*
35173 @@ -353,11 +354,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35174 }
35175
35176 current_thread_info()->sysenter_return =
35177 - VDSO32_SYMBOL(addr, SYSENTER_RETURN);
35178 + (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
35179
35180 up_fail:
35181 if (ret)
35182 - current->mm->context.vdso = NULL;
35183 + current->mm->context.vdso = 0;
35184
35185 up_write(&mm->mmap_sem);
35186
35187 @@ -404,8 +405,14 @@ __initcall(ia32_binfmt_init);
35188
35189 const char *arch_vma_name(struct vm_area_struct *vma)
35190 {
35191 - if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
35192 + if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
35193 return "[vdso]";
35194 +
35195 +#ifdef CONFIG_PAX_SEGMEXEC
35196 + if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
35197 + return "[vdso]";
35198 +#endif
35199 +
35200 return NULL;
35201 }
35202
35203 @@ -415,7 +422,7 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
35204 * Check to see if the corresponding task was created in compat vdso
35205 * mode.
35206 */
35207 - if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
35208 + if (mm && mm->context.vdso == VDSO_HIGH_BASE)
35209 return &gate_vma;
35210 return NULL;
35211 }
35212 diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35213 index 431e875..cbb23f3 100644
35214 --- a/arch/x86/vdso/vma.c
35215 +++ b/arch/x86/vdso/vma.c
35216 @@ -16,8 +16,6 @@
35217 #include <asm/vdso.h>
35218 #include <asm/page.h>
35219
35220 -unsigned int __read_mostly vdso_enabled = 1;
35221 -
35222 extern char vdso_start[], vdso_end[];
35223 extern unsigned short vdso_sync_cpuid;
35224
35225 @@ -141,7 +139,6 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
35226 * unaligned here as a result of stack start randomization.
35227 */
35228 addr = PAGE_ALIGN(addr);
35229 - addr = align_vdso_addr(addr);
35230
35231 return addr;
35232 }
35233 @@ -154,30 +151,31 @@ static int setup_additional_pages(struct linux_binprm *bprm,
35234 unsigned size)
35235 {
35236 struct mm_struct *mm = current->mm;
35237 - unsigned long addr;
35238 + unsigned long addr = 0;
35239 int ret;
35240
35241 - if (!vdso_enabled)
35242 - return 0;
35243 -
35244 down_write(&mm->mmap_sem);
35245 +
35246 +#ifdef CONFIG_PAX_RANDMMAP
35247 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
35248 +#endif
35249 +
35250 addr = vdso_addr(mm->start_stack, size);
35251 + addr = align_vdso_addr(addr);
35252 addr = get_unmapped_area(NULL, addr, size, 0, 0);
35253 if (IS_ERR_VALUE(addr)) {
35254 ret = addr;
35255 goto up_fail;
35256 }
35257
35258 - current->mm->context.vdso = (void *)addr;
35259 + mm->context.vdso = addr;
35260
35261 ret = install_special_mapping(mm, addr, size,
35262 VM_READ|VM_EXEC|
35263 VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,
35264 pages);
35265 - if (ret) {
35266 - current->mm->context.vdso = NULL;
35267 - goto up_fail;
35268 - }
35269 + if (ret)
35270 + mm->context.vdso = 0;
35271
35272 up_fail:
35273 up_write(&mm->mmap_sem);
35274 @@ -197,10 +195,3 @@ int x32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35275 vdsox32_size);
35276 }
35277 #endif
35278 -
35279 -static __init int vdso_setup(char *s)
35280 -{
35281 - vdso_enabled = simple_strtoul(s, NULL, 0);
35282 - return 0;
35283 -}
35284 -__setup("vdso=", vdso_setup);
35285 diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35286 index 01b9026..1e476df 100644
35287 --- a/arch/x86/xen/Kconfig
35288 +++ b/arch/x86/xen/Kconfig
35289 @@ -9,6 +9,7 @@ config XEN
35290 select XEN_HAVE_PVMMU
35291 depends on X86_64 || (X86_32 && X86_PAE && !X86_VISWS)
35292 depends on X86_TSC
35293 + depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35294 help
35295 This is the Linux Xen port. Enabling this will allow the
35296 kernel to boot in a paravirtualized environment under the
35297 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35298 index 201d09a..e4723e5 100644
35299 --- a/arch/x86/xen/enlighten.c
35300 +++ b/arch/x86/xen/enlighten.c
35301 @@ -123,8 +123,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35302
35303 struct shared_info xen_dummy_shared_info;
35304
35305 -void *xen_initial_gdt;
35306 -
35307 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35308 __read_mostly int xen_have_vector_callback;
35309 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35310 @@ -542,8 +540,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35311 {
35312 unsigned long va = dtr->address;
35313 unsigned int size = dtr->size + 1;
35314 - unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35315 - unsigned long frames[pages];
35316 + unsigned long frames[65536 / PAGE_SIZE];
35317 int f;
35318
35319 /*
35320 @@ -591,8 +588,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35321 {
35322 unsigned long va = dtr->address;
35323 unsigned int size = dtr->size + 1;
35324 - unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35325 - unsigned long frames[pages];
35326 + unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35327 int f;
35328
35329 /*
35330 @@ -600,7 +596,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35331 * 8-byte entries, or 16 4k pages..
35332 */
35333
35334 - BUG_ON(size > 65536);
35335 + BUG_ON(size > GDT_SIZE);
35336 BUG_ON(va & ~PAGE_MASK);
35337
35338 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35339 @@ -989,7 +985,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
35340 return 0;
35341 }
35342
35343 -static void set_xen_basic_apic_ops(void)
35344 +static void __init set_xen_basic_apic_ops(void)
35345 {
35346 apic->read = xen_apic_read;
35347 apic->write = xen_apic_write;
35348 @@ -1295,30 +1291,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35349 #endif
35350 };
35351
35352 -static void xen_reboot(int reason)
35353 +static __noreturn void xen_reboot(int reason)
35354 {
35355 struct sched_shutdown r = { .reason = reason };
35356
35357 - if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35358 - BUG();
35359 + HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35360 + BUG();
35361 }
35362
35363 -static void xen_restart(char *msg)
35364 +static __noreturn void xen_restart(char *msg)
35365 {
35366 xen_reboot(SHUTDOWN_reboot);
35367 }
35368
35369 -static void xen_emergency_restart(void)
35370 +static __noreturn void xen_emergency_restart(void)
35371 {
35372 xen_reboot(SHUTDOWN_reboot);
35373 }
35374
35375 -static void xen_machine_halt(void)
35376 +static __noreturn void xen_machine_halt(void)
35377 {
35378 xen_reboot(SHUTDOWN_poweroff);
35379 }
35380
35381 -static void xen_machine_power_off(void)
35382 +static __noreturn void xen_machine_power_off(void)
35383 {
35384 if (pm_power_off)
35385 pm_power_off();
35386 @@ -1564,7 +1560,17 @@ asmlinkage void __init xen_start_kernel(void)
35387 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
35388
35389 /* Work out if we support NX */
35390 - x86_configure_nx();
35391 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
35392 + if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
35393 + (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
35394 + unsigned l, h;
35395 +
35396 + __supported_pte_mask |= _PAGE_NX;
35397 + rdmsr(MSR_EFER, l, h);
35398 + l |= EFER_NX;
35399 + wrmsr(MSR_EFER, l, h);
35400 + }
35401 +#endif
35402
35403 /* Get mfn list */
35404 xen_build_dynamic_phys_to_machine();
35405 @@ -1592,13 +1598,6 @@ asmlinkage void __init xen_start_kernel(void)
35406
35407 machine_ops = xen_machine_ops;
35408
35409 - /*
35410 - * The only reliable way to retain the initial address of the
35411 - * percpu gdt_page is to remember it here, so we can go and
35412 - * mark it RW later, when the initial percpu area is freed.
35413 - */
35414 - xen_initial_gdt = &per_cpu(gdt_page, 0);
35415 -
35416 xen_smp_init();
35417
35418 #ifdef CONFIG_ACPI_NUMA
35419 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
35420 index 2423ef0..4f6fb5b 100644
35421 --- a/arch/x86/xen/mmu.c
35422 +++ b/arch/x86/xen/mmu.c
35423 @@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
35424 return val;
35425 }
35426
35427 -static pteval_t pte_pfn_to_mfn(pteval_t val)
35428 +static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
35429 {
35430 if (val & _PAGE_PRESENT) {
35431 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
35432 @@ -1904,6 +1904,9 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35433 /* L3_k[510] -> level2_kernel_pgt
35434 * L3_i[511] -> level2_fixmap_pgt */
35435 convert_pfn_mfn(level3_kernel_pgt);
35436 + convert_pfn_mfn(level3_vmalloc_start_pgt);
35437 + convert_pfn_mfn(level3_vmalloc_end_pgt);
35438 + convert_pfn_mfn(level3_vmemmap_pgt);
35439 }
35440 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
35441 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
35442 @@ -1933,8 +1936,12 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35443 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
35444 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
35445 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
35446 + set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
35447 + set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
35448 + set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
35449 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
35450 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
35451 + set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
35452 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
35453 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
35454
35455 @@ -2123,6 +2130,7 @@ static void __init xen_post_allocator_init(void)
35456 pv_mmu_ops.set_pud = xen_set_pud;
35457 #if PAGETABLE_LEVELS == 4
35458 pv_mmu_ops.set_pgd = xen_set_pgd;
35459 + pv_mmu_ops.set_pgd_batched = xen_set_pgd;
35460 #endif
35461
35462 /* This will work as long as patching hasn't happened yet
35463 @@ -2201,6 +2209,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
35464 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
35465 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
35466 .set_pgd = xen_set_pgd_hyper,
35467 + .set_pgd_batched = xen_set_pgd_hyper,
35468
35469 .alloc_pud = xen_alloc_pmd_init,
35470 .release_pud = xen_release_pmd_init,
35471 diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
35472 index a18eadd..2e2f10e 100644
35473 --- a/arch/x86/xen/smp.c
35474 +++ b/arch/x86/xen/smp.c
35475 @@ -283,17 +283,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
35476
35477 if (xen_pv_domain()) {
35478 if (!xen_feature(XENFEAT_writable_page_tables))
35479 - /* We've switched to the "real" per-cpu gdt, so make
35480 - * sure the old memory can be recycled. */
35481 - make_lowmem_page_readwrite(xen_initial_gdt);
35482 -
35483 #ifdef CONFIG_X86_32
35484 /*
35485 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
35486 * expects __USER_DS
35487 */
35488 - loadsegment(ds, __USER_DS);
35489 - loadsegment(es, __USER_DS);
35490 + loadsegment(ds, __KERNEL_DS);
35491 + loadsegment(es, __KERNEL_DS);
35492 #endif
35493
35494 xen_filter_cpu_maps();
35495 @@ -372,7 +368,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35496 #ifdef CONFIG_X86_32
35497 /* Note: PVH is not yet supported on x86_32. */
35498 ctxt->user_regs.fs = __KERNEL_PERCPU;
35499 - ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
35500 + savesegment(gs, ctxt->user_regs.gs);
35501 #endif
35502 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
35503
35504 @@ -381,8 +377,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35505 if (!xen_feature(XENFEAT_auto_translated_physmap)) {
35506 ctxt->flags = VGCF_IN_KERNEL;
35507 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
35508 - ctxt->user_regs.ds = __USER_DS;
35509 - ctxt->user_regs.es = __USER_DS;
35510 + ctxt->user_regs.ds = __KERNEL_DS;
35511 + ctxt->user_regs.es = __KERNEL_DS;
35512 ctxt->user_regs.ss = __KERNEL_DS;
35513
35514 xen_copy_trap_info(ctxt->trap_ctxt);
35515 @@ -437,13 +433,12 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
35516 int rc;
35517
35518 per_cpu(current_task, cpu) = idle;
35519 + per_cpu(current_tinfo, cpu) = &idle->tinfo;
35520 #ifdef CONFIG_X86_32
35521 irq_ctx_init(cpu);
35522 #else
35523 clear_tsk_thread_flag(idle, TIF_FORK);
35524 - per_cpu(kernel_stack, cpu) =
35525 - (unsigned long)task_stack_page(idle) -
35526 - KERNEL_STACK_OFFSET + THREAD_SIZE;
35527 + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
35528 #endif
35529 xen_setup_runstate_info(cpu);
35530 xen_setup_timer(cpu);
35531 @@ -719,7 +714,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
35532
35533 void __init xen_smp_init(void)
35534 {
35535 - smp_ops = xen_smp_ops;
35536 + memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
35537 xen_fill_possible_map();
35538 }
35539
35540 diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
35541 index 33ca6e4..0ded929 100644
35542 --- a/arch/x86/xen/xen-asm_32.S
35543 +++ b/arch/x86/xen/xen-asm_32.S
35544 @@ -84,14 +84,14 @@ ENTRY(xen_iret)
35545 ESP_OFFSET=4 # bytes pushed onto stack
35546
35547 /*
35548 - * Store vcpu_info pointer for easy access. Do it this way to
35549 - * avoid having to reload %fs
35550 + * Store vcpu_info pointer for easy access.
35551 */
35552 #ifdef CONFIG_SMP
35553 - GET_THREAD_INFO(%eax)
35554 - movl %ss:TI_cpu(%eax), %eax
35555 - movl %ss:__per_cpu_offset(,%eax,4), %eax
35556 - mov %ss:xen_vcpu(%eax), %eax
35557 + push %fs
35558 + mov $(__KERNEL_PERCPU), %eax
35559 + mov %eax, %fs
35560 + mov PER_CPU_VAR(xen_vcpu), %eax
35561 + pop %fs
35562 #else
35563 movl %ss:xen_vcpu, %eax
35564 #endif
35565 diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
35566 index 485b695..fda3e7c 100644
35567 --- a/arch/x86/xen/xen-head.S
35568 +++ b/arch/x86/xen/xen-head.S
35569 @@ -39,6 +39,17 @@ ENTRY(startup_xen)
35570 #ifdef CONFIG_X86_32
35571 mov %esi,xen_start_info
35572 mov $init_thread_union+THREAD_SIZE,%esp
35573 +#ifdef CONFIG_SMP
35574 + movl $cpu_gdt_table,%edi
35575 + movl $__per_cpu_load,%eax
35576 + movw %ax,__KERNEL_PERCPU + 2(%edi)
35577 + rorl $16,%eax
35578 + movb %al,__KERNEL_PERCPU + 4(%edi)
35579 + movb %ah,__KERNEL_PERCPU + 7(%edi)
35580 + movl $__per_cpu_end - 1,%eax
35581 + subl $__per_cpu_start,%eax
35582 + movw %ax,__KERNEL_PERCPU + 0(%edi)
35583 +#endif
35584 #else
35585 mov %rsi,xen_start_info
35586 mov $init_thread_union+THREAD_SIZE,%rsp
35587 diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
35588 index 1cb6f4c..9981524 100644
35589 --- a/arch/x86/xen/xen-ops.h
35590 +++ b/arch/x86/xen/xen-ops.h
35591 @@ -10,8 +10,6 @@
35592 extern const char xen_hypervisor_callback[];
35593 extern const char xen_failsafe_callback[];
35594
35595 -extern void *xen_initial_gdt;
35596 -
35597 struct trap_info;
35598 void xen_copy_trap_info(struct trap_info *traps);
35599
35600 diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
35601 index 525bd3d..ef888b1 100644
35602 --- a/arch/xtensa/variants/dc232b/include/variant/core.h
35603 +++ b/arch/xtensa/variants/dc232b/include/variant/core.h
35604 @@ -119,9 +119,9 @@
35605 ----------------------------------------------------------------------*/
35606
35607 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
35608 -#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
35609 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
35610 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
35611 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35612
35613 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
35614 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
35615 diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
35616 index 2f33760..835e50a 100644
35617 --- a/arch/xtensa/variants/fsf/include/variant/core.h
35618 +++ b/arch/xtensa/variants/fsf/include/variant/core.h
35619 @@ -11,6 +11,7 @@
35620 #ifndef _XTENSA_CORE_H
35621 #define _XTENSA_CORE_H
35622
35623 +#include <linux/const.h>
35624
35625 /****************************************************************************
35626 Parameters Useful for Any Code, USER or PRIVILEGED
35627 @@ -112,9 +113,9 @@
35628 ----------------------------------------------------------------------*/
35629
35630 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
35631 -#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
35632 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
35633 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
35634 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35635
35636 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
35637 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
35638 diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
35639 index af00795..2bb8105 100644
35640 --- a/arch/xtensa/variants/s6000/include/variant/core.h
35641 +++ b/arch/xtensa/variants/s6000/include/variant/core.h
35642 @@ -11,6 +11,7 @@
35643 #ifndef _XTENSA_CORE_CONFIGURATION_H
35644 #define _XTENSA_CORE_CONFIGURATION_H
35645
35646 +#include <linux/const.h>
35647
35648 /****************************************************************************
35649 Parameters Useful for Any Code, USER or PRIVILEGED
35650 @@ -118,9 +119,9 @@
35651 ----------------------------------------------------------------------*/
35652
35653 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
35654 -#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
35655 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
35656 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
35657 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35658
35659 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
35660 #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
35661 diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
35662 index 4e491d9..c8e18e4 100644
35663 --- a/block/blk-cgroup.c
35664 +++ b/block/blk-cgroup.c
35665 @@ -812,7 +812,7 @@ static void blkcg_css_free(struct cgroup_subsys_state *css)
35666 static struct cgroup_subsys_state *
35667 blkcg_css_alloc(struct cgroup_subsys_state *parent_css)
35668 {
35669 - static atomic64_t id_seq = ATOMIC64_INIT(0);
35670 + static atomic64_unchecked_t id_seq = ATOMIC64_INIT(0);
35671 struct blkcg *blkcg;
35672
35673 if (!parent_css) {
35674 @@ -826,7 +826,7 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css)
35675
35676 blkcg->cfq_weight = CFQ_WEIGHT_DEFAULT;
35677 blkcg->cfq_leaf_weight = CFQ_WEIGHT_DEFAULT;
35678 - blkcg->id = atomic64_inc_return(&id_seq); /* root is 0, start from 1 */
35679 + blkcg->id = atomic64_inc_return_unchecked(&id_seq); /* root is 0, start from 1 */
35680 done:
35681 spin_lock_init(&blkcg->lock);
35682 INIT_RADIX_TREE(&blkcg->blkg_tree, GFP_ATOMIC);
35683 diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
35684 index 1855bf5..af12b06 100644
35685 --- a/block/blk-iopoll.c
35686 +++ b/block/blk-iopoll.c
35687 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
35688 }
35689 EXPORT_SYMBOL(blk_iopoll_complete);
35690
35691 -static void blk_iopoll_softirq(struct softirq_action *h)
35692 +static __latent_entropy void blk_iopoll_softirq(void)
35693 {
35694 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
35695 int rearm = 0, budget = blk_iopoll_budget;
35696 diff --git a/block/blk-map.c b/block/blk-map.c
35697 index ae4ae10..c470b8d 100644
35698 --- a/block/blk-map.c
35699 +++ b/block/blk-map.c
35700 @@ -302,7 +302,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
35701 if (!len || !kbuf)
35702 return -EINVAL;
35703
35704 - do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
35705 + do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
35706 if (do_copy)
35707 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
35708 else
35709 diff --git a/block/blk-softirq.c b/block/blk-softirq.c
35710 index 57790c1..5e988dd 100644
35711 --- a/block/blk-softirq.c
35712 +++ b/block/blk-softirq.c
35713 @@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
35714 * Softirq action handler - move entries to local list and loop over them
35715 * while passing them to the queue registered handler.
35716 */
35717 -static void blk_done_softirq(struct softirq_action *h)
35718 +static __latent_entropy void blk_done_softirq(void)
35719 {
35720 struct list_head *cpu_list, local_list;
35721
35722 diff --git a/block/bsg.c b/block/bsg.c
35723 index 420a5a9..23834aa 100644
35724 --- a/block/bsg.c
35725 +++ b/block/bsg.c
35726 @@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
35727 struct sg_io_v4 *hdr, struct bsg_device *bd,
35728 fmode_t has_write_perm)
35729 {
35730 + unsigned char tmpcmd[sizeof(rq->__cmd)];
35731 + unsigned char *cmdptr;
35732 +
35733 if (hdr->request_len > BLK_MAX_CDB) {
35734 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
35735 if (!rq->cmd)
35736 return -ENOMEM;
35737 - }
35738 + cmdptr = rq->cmd;
35739 + } else
35740 + cmdptr = tmpcmd;
35741
35742 - if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
35743 + if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
35744 hdr->request_len))
35745 return -EFAULT;
35746
35747 + if (cmdptr != rq->cmd)
35748 + memcpy(rq->cmd, cmdptr, hdr->request_len);
35749 +
35750 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
35751 if (blk_verify_command(rq->cmd, has_write_perm))
35752 return -EPERM;
35753 diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
35754 index fbd5a67..f24fd95 100644
35755 --- a/block/compat_ioctl.c
35756 +++ b/block/compat_ioctl.c
35757 @@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
35758 cgc = compat_alloc_user_space(sizeof(*cgc));
35759 cgc32 = compat_ptr(arg);
35760
35761 - if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
35762 + if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
35763 get_user(data, &cgc32->buffer) ||
35764 put_user(compat_ptr(data), &cgc->buffer) ||
35765 copy_in_user(&cgc->buflen, &cgc32->buflen,
35766 @@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
35767 err |= __get_user(f->spec1, &uf->spec1);
35768 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
35769 err |= __get_user(name, &uf->name);
35770 - f->name = compat_ptr(name);
35771 + f->name = (void __force_kernel *)compat_ptr(name);
35772 if (err) {
35773 err = -EFAULT;
35774 goto out;
35775 diff --git a/block/genhd.c b/block/genhd.c
35776 index 791f419..89f21c4 100644
35777 --- a/block/genhd.c
35778 +++ b/block/genhd.c
35779 @@ -467,21 +467,24 @@ static char *bdevt_str(dev_t devt, char *buf)
35780
35781 /*
35782 * Register device numbers dev..(dev+range-1)
35783 - * range must be nonzero
35784 + * Noop if @range is zero.
35785 * The hash chain is sorted on range, so that subranges can override.
35786 */
35787 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
35788 struct kobject *(*probe)(dev_t, int *, void *),
35789 int (*lock)(dev_t, void *), void *data)
35790 {
35791 - kobj_map(bdev_map, devt, range, module, probe, lock, data);
35792 + if (range)
35793 + kobj_map(bdev_map, devt, range, module, probe, lock, data);
35794 }
35795
35796 EXPORT_SYMBOL(blk_register_region);
35797
35798 +/* undo blk_register_region(), noop if @range is zero */
35799 void blk_unregister_region(dev_t devt, unsigned long range)
35800 {
35801 - kobj_unmap(bdev_map, devt, range);
35802 + if (range)
35803 + kobj_unmap(bdev_map, devt, range);
35804 }
35805
35806 EXPORT_SYMBOL(blk_unregister_region);
35807 diff --git a/block/partitions/efi.c b/block/partitions/efi.c
35808 index dc51f46..d5446a8 100644
35809 --- a/block/partitions/efi.c
35810 +++ b/block/partitions/efi.c
35811 @@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
35812 if (!gpt)
35813 return NULL;
35814
35815 + if (!le32_to_cpu(gpt->num_partition_entries))
35816 + return NULL;
35817 + pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
35818 + if (!pte)
35819 + return NULL;
35820 +
35821 count = le32_to_cpu(gpt->num_partition_entries) *
35822 le32_to_cpu(gpt->sizeof_partition_entry);
35823 - if (!count)
35824 - return NULL;
35825 - pte = kmalloc(count, GFP_KERNEL);
35826 - if (!pte)
35827 - return NULL;
35828 -
35829 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
35830 (u8 *) pte, count) < count) {
35831 kfree(pte);
35832 diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
35833 index 2648797..92ed21f 100644
35834 --- a/block/scsi_ioctl.c
35835 +++ b/block/scsi_ioctl.c
35836 @@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
35837 return put_user(0, p);
35838 }
35839
35840 -static int sg_get_timeout(struct request_queue *q)
35841 +static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
35842 {
35843 return jiffies_to_clock_t(q->sg_timeout);
35844 }
35845 @@ -224,8 +224,20 @@ EXPORT_SYMBOL(blk_verify_command);
35846 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
35847 struct sg_io_hdr *hdr, fmode_t mode)
35848 {
35849 - if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
35850 + unsigned char tmpcmd[sizeof(rq->__cmd)];
35851 + unsigned char *cmdptr;
35852 +
35853 + if (rq->cmd != rq->__cmd)
35854 + cmdptr = rq->cmd;
35855 + else
35856 + cmdptr = tmpcmd;
35857 +
35858 + if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
35859 return -EFAULT;
35860 +
35861 + if (cmdptr != rq->cmd)
35862 + memcpy(rq->cmd, cmdptr, hdr->cmd_len);
35863 +
35864 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
35865 return -EPERM;
35866
35867 @@ -417,6 +429,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
35868 int err;
35869 unsigned int in_len, out_len, bytes, opcode, cmdlen;
35870 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
35871 + unsigned char tmpcmd[sizeof(rq->__cmd)];
35872 + unsigned char *cmdptr;
35873
35874 if (!sic)
35875 return -EINVAL;
35876 @@ -450,9 +464,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
35877 */
35878 err = -EFAULT;
35879 rq->cmd_len = cmdlen;
35880 - if (copy_from_user(rq->cmd, sic->data, cmdlen))
35881 +
35882 + if (rq->cmd != rq->__cmd)
35883 + cmdptr = rq->cmd;
35884 + else
35885 + cmdptr = tmpcmd;
35886 +
35887 + if (copy_from_user(cmdptr, sic->data, cmdlen))
35888 goto error;
35889
35890 + if (rq->cmd != cmdptr)
35891 + memcpy(rq->cmd, cmdptr, cmdlen);
35892 +
35893 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
35894 goto error;
35895
35896 diff --git a/crypto/cryptd.c b/crypto/cryptd.c
35897 index 7bdd61b..afec999 100644
35898 --- a/crypto/cryptd.c
35899 +++ b/crypto/cryptd.c
35900 @@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
35901
35902 struct cryptd_blkcipher_request_ctx {
35903 crypto_completion_t complete;
35904 -};
35905 +} __no_const;
35906
35907 struct cryptd_hash_ctx {
35908 struct crypto_shash *child;
35909 @@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
35910
35911 struct cryptd_aead_request_ctx {
35912 crypto_completion_t complete;
35913 -};
35914 +} __no_const;
35915
35916 static void cryptd_queue_worker(struct work_struct *work);
35917
35918 diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
35919 index 309d345..1632720 100644
35920 --- a/crypto/pcrypt.c
35921 +++ b/crypto/pcrypt.c
35922 @@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
35923 int ret;
35924
35925 pinst->kobj.kset = pcrypt_kset;
35926 - ret = kobject_add(&pinst->kobj, NULL, name);
35927 + ret = kobject_add(&pinst->kobj, NULL, "%s", name);
35928 if (!ret)
35929 kobject_uevent(&pinst->kobj, KOBJ_ADD);
35930
35931 diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
35932 index 15dddc1..b61cf0c 100644
35933 --- a/drivers/acpi/acpica/hwxfsleep.c
35934 +++ b/drivers/acpi/acpica/hwxfsleep.c
35935 @@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
35936 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
35937
35938 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
35939 - {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
35940 - acpi_hw_extended_sleep},
35941 - {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
35942 - acpi_hw_extended_wake_prep},
35943 - {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
35944 + {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
35945 + .extended_function = acpi_hw_extended_sleep},
35946 + {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
35947 + .extended_function = acpi_hw_extended_wake_prep},
35948 + {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
35949 + .extended_function = acpi_hw_extended_wake}
35950 };
35951
35952 /*
35953 diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
35954 index e5bcd91..74f050d 100644
35955 --- a/drivers/acpi/apei/apei-internal.h
35956 +++ b/drivers/acpi/apei/apei-internal.h
35957 @@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
35958 struct apei_exec_ins_type {
35959 u32 flags;
35960 apei_exec_ins_func_t run;
35961 -};
35962 +} __do_const;
35963
35964 struct apei_exec_context {
35965 u32 ip;
35966 diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
35967 index dab7cb7..f0d2994 100644
35968 --- a/drivers/acpi/apei/ghes.c
35969 +++ b/drivers/acpi/apei/ghes.c
35970 @@ -500,7 +500,7 @@ static void __ghes_print_estatus(const char *pfx,
35971 const struct acpi_hest_generic *generic,
35972 const struct acpi_generic_status *estatus)
35973 {
35974 - static atomic_t seqno;
35975 + static atomic_unchecked_t seqno;
35976 unsigned int curr_seqno;
35977 char pfx_seq[64];
35978
35979 @@ -511,7 +511,7 @@ static void __ghes_print_estatus(const char *pfx,
35980 else
35981 pfx = KERN_ERR;
35982 }
35983 - curr_seqno = atomic_inc_return(&seqno);
35984 + curr_seqno = atomic_inc_return_unchecked(&seqno);
35985 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
35986 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
35987 pfx_seq, generic->header.source_id);
35988 diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
35989 index a83e3c6..c3d617f 100644
35990 --- a/drivers/acpi/bgrt.c
35991 +++ b/drivers/acpi/bgrt.c
35992 @@ -86,8 +86,10 @@ static int __init bgrt_init(void)
35993 if (!bgrt_image)
35994 return -ENODEV;
35995
35996 - bin_attr_image.private = bgrt_image;
35997 - bin_attr_image.size = bgrt_image_size;
35998 + pax_open_kernel();
35999 + *(void **)&bin_attr_image.private = bgrt_image;
36000 + *(size_t *)&bin_attr_image.size = bgrt_image_size;
36001 + pax_close_kernel();
36002
36003 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36004 if (!bgrt_kobj)
36005 diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36006 index afec452..c5d8b96 100644
36007 --- a/drivers/acpi/blacklist.c
36008 +++ b/drivers/acpi/blacklist.c
36009 @@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36010 u32 is_critical_error;
36011 };
36012
36013 -static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36014 +static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36015
36016 /*
36017 * POLICY: If *anything* doesn't work, put it on the blacklist.
36018 @@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36019 return 0;
36020 }
36021
36022 -static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36023 +static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36024 {
36025 .callback = dmi_disable_osi_vista,
36026 .ident = "Fujitsu Siemens",
36027 diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36028 index c68e724..e863008 100644
36029 --- a/drivers/acpi/custom_method.c
36030 +++ b/drivers/acpi/custom_method.c
36031 @@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36032 struct acpi_table_header table;
36033 acpi_status status;
36034
36035 +#ifdef CONFIG_GRKERNSEC_KMEM
36036 + return -EPERM;
36037 +#endif
36038 +
36039 if (!(*ppos)) {
36040 /* parse the table header to get the table length */
36041 if (count <= sizeof(struct acpi_table_header))
36042 diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36043 index 3dca36d..abaf070 100644
36044 --- a/drivers/acpi/processor_idle.c
36045 +++ b/drivers/acpi/processor_idle.c
36046 @@ -952,7 +952,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36047 {
36048 int i, count = CPUIDLE_DRIVER_STATE_START;
36049 struct acpi_processor_cx *cx;
36050 - struct cpuidle_state *state;
36051 + cpuidle_state_no_const *state;
36052 struct cpuidle_driver *drv = &acpi_idle_driver;
36053
36054 if (!pr->flags.power_setup_done)
36055 diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36056 index 91a32ce..d77fcaf 100644
36057 --- a/drivers/acpi/sysfs.c
36058 +++ b/drivers/acpi/sysfs.c
36059 @@ -425,11 +425,11 @@ static u32 num_counters;
36060 static struct attribute **all_attrs;
36061 static u32 acpi_gpe_count;
36062
36063 -static struct attribute_group interrupt_stats_attr_group = {
36064 +static attribute_group_no_const interrupt_stats_attr_group = {
36065 .name = "interrupts",
36066 };
36067
36068 -static struct kobj_attribute *counter_attrs;
36069 +static kobj_attribute_no_const *counter_attrs;
36070
36071 static void delete_gpe_attr_array(void)
36072 {
36073 diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36074 index 36605ab..6ef6d4b 100644
36075 --- a/drivers/ata/libahci.c
36076 +++ b/drivers/ata/libahci.c
36077 @@ -1239,7 +1239,7 @@ int ahci_kick_engine(struct ata_port *ap)
36078 }
36079 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36080
36081 -static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36082 +static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36083 struct ata_taskfile *tf, int is_cmd, u16 flags,
36084 unsigned long timeout_msec)
36085 {
36086 diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36087 index 8cb2522..a815e54 100644
36088 --- a/drivers/ata/libata-core.c
36089 +++ b/drivers/ata/libata-core.c
36090 @@ -98,7 +98,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36091 static void ata_dev_xfermask(struct ata_device *dev);
36092 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36093
36094 -atomic_t ata_print_id = ATOMIC_INIT(0);
36095 +atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36096
36097 struct ata_force_param {
36098 const char *name;
36099 @@ -4851,7 +4851,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36100 struct ata_port *ap;
36101 unsigned int tag;
36102
36103 - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36104 + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36105 ap = qc->ap;
36106
36107 qc->flags = 0;
36108 @@ -4867,7 +4867,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36109 struct ata_port *ap;
36110 struct ata_link *link;
36111
36112 - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36113 + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36114 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36115 ap = qc->ap;
36116 link = qc->dev->link;
36117 @@ -5986,6 +5986,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36118 return;
36119
36120 spin_lock(&lock);
36121 + pax_open_kernel();
36122
36123 for (cur = ops->inherits; cur; cur = cur->inherits) {
36124 void **inherit = (void **)cur;
36125 @@ -5999,8 +6000,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36126 if (IS_ERR(*pp))
36127 *pp = NULL;
36128
36129 - ops->inherits = NULL;
36130 + *(struct ata_port_operations **)&ops->inherits = NULL;
36131
36132 + pax_close_kernel();
36133 spin_unlock(&lock);
36134 }
36135
36136 @@ -6193,7 +6195,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36137
36138 /* give ports names and add SCSI hosts */
36139 for (i = 0; i < host->n_ports; i++) {
36140 - host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36141 + host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36142 host->ports[i]->local_port_no = i + 1;
36143 }
36144
36145 diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36146 index ef8567d..8bdbd03 100644
36147 --- a/drivers/ata/libata-scsi.c
36148 +++ b/drivers/ata/libata-scsi.c
36149 @@ -4147,7 +4147,7 @@ int ata_sas_port_init(struct ata_port *ap)
36150
36151 if (rc)
36152 return rc;
36153 - ap->print_id = atomic_inc_return(&ata_print_id);
36154 + ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36155 return 0;
36156 }
36157 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36158 diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36159 index 45b5ab3..98446b8 100644
36160 --- a/drivers/ata/libata.h
36161 +++ b/drivers/ata/libata.h
36162 @@ -53,7 +53,7 @@ enum {
36163 ATA_DNXFER_QUIET = (1 << 31),
36164 };
36165
36166 -extern atomic_t ata_print_id;
36167 +extern atomic_unchecked_t ata_print_id;
36168 extern int atapi_passthru16;
36169 extern int libata_fua;
36170 extern int libata_noacpi;
36171 diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
36172 index 73492dd..ca2bff5 100644
36173 --- a/drivers/ata/pata_arasan_cf.c
36174 +++ b/drivers/ata/pata_arasan_cf.c
36175 @@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
36176 /* Handle platform specific quirks */
36177 if (quirk) {
36178 if (quirk & CF_BROKEN_PIO) {
36179 - ap->ops->set_piomode = NULL;
36180 + pax_open_kernel();
36181 + *(void **)&ap->ops->set_piomode = NULL;
36182 + pax_close_kernel();
36183 ap->pio_mask = 0;
36184 }
36185 if (quirk & CF_BROKEN_MWDMA)
36186 diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
36187 index f9b983a..887b9d8 100644
36188 --- a/drivers/atm/adummy.c
36189 +++ b/drivers/atm/adummy.c
36190 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
36191 vcc->pop(vcc, skb);
36192 else
36193 dev_kfree_skb_any(skb);
36194 - atomic_inc(&vcc->stats->tx);
36195 + atomic_inc_unchecked(&vcc->stats->tx);
36196
36197 return 0;
36198 }
36199 diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
36200 index 62a7607..cc4be104 100644
36201 --- a/drivers/atm/ambassador.c
36202 +++ b/drivers/atm/ambassador.c
36203 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
36204 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
36205
36206 // VC layer stats
36207 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36208 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36209
36210 // free the descriptor
36211 kfree (tx_descr);
36212 @@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36213 dump_skb ("<<<", vc, skb);
36214
36215 // VC layer stats
36216 - atomic_inc(&atm_vcc->stats->rx);
36217 + atomic_inc_unchecked(&atm_vcc->stats->rx);
36218 __net_timestamp(skb);
36219 // end of our responsibility
36220 atm_vcc->push (atm_vcc, skb);
36221 @@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36222 } else {
36223 PRINTK (KERN_INFO, "dropped over-size frame");
36224 // should we count this?
36225 - atomic_inc(&atm_vcc->stats->rx_drop);
36226 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36227 }
36228
36229 } else {
36230 @@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
36231 }
36232
36233 if (check_area (skb->data, skb->len)) {
36234 - atomic_inc(&atm_vcc->stats->tx_err);
36235 + atomic_inc_unchecked(&atm_vcc->stats->tx_err);
36236 return -ENOMEM; // ?
36237 }
36238
36239 diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
36240 index 0e3f8f9..765a7a5 100644
36241 --- a/drivers/atm/atmtcp.c
36242 +++ b/drivers/atm/atmtcp.c
36243 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36244 if (vcc->pop) vcc->pop(vcc,skb);
36245 else dev_kfree_skb(skb);
36246 if (dev_data) return 0;
36247 - atomic_inc(&vcc->stats->tx_err);
36248 + atomic_inc_unchecked(&vcc->stats->tx_err);
36249 return -ENOLINK;
36250 }
36251 size = skb->len+sizeof(struct atmtcp_hdr);
36252 @@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36253 if (!new_skb) {
36254 if (vcc->pop) vcc->pop(vcc,skb);
36255 else dev_kfree_skb(skb);
36256 - atomic_inc(&vcc->stats->tx_err);
36257 + atomic_inc_unchecked(&vcc->stats->tx_err);
36258 return -ENOBUFS;
36259 }
36260 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
36261 @@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36262 if (vcc->pop) vcc->pop(vcc,skb);
36263 else dev_kfree_skb(skb);
36264 out_vcc->push(out_vcc,new_skb);
36265 - atomic_inc(&vcc->stats->tx);
36266 - atomic_inc(&out_vcc->stats->rx);
36267 + atomic_inc_unchecked(&vcc->stats->tx);
36268 + atomic_inc_unchecked(&out_vcc->stats->rx);
36269 return 0;
36270 }
36271
36272 @@ -299,7 +299,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36273 out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
36274 read_unlock(&vcc_sklist_lock);
36275 if (!out_vcc) {
36276 - atomic_inc(&vcc->stats->tx_err);
36277 + atomic_inc_unchecked(&vcc->stats->tx_err);
36278 goto done;
36279 }
36280 skb_pull(skb,sizeof(struct atmtcp_hdr));
36281 @@ -311,8 +311,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36282 __net_timestamp(new_skb);
36283 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
36284 out_vcc->push(out_vcc,new_skb);
36285 - atomic_inc(&vcc->stats->tx);
36286 - atomic_inc(&out_vcc->stats->rx);
36287 + atomic_inc_unchecked(&vcc->stats->tx);
36288 + atomic_inc_unchecked(&out_vcc->stats->rx);
36289 done:
36290 if (vcc->pop) vcc->pop(vcc,skb);
36291 else dev_kfree_skb(skb);
36292 diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
36293 index b1955ba..b179940 100644
36294 --- a/drivers/atm/eni.c
36295 +++ b/drivers/atm/eni.c
36296 @@ -522,7 +522,7 @@ static int rx_aal0(struct atm_vcc *vcc)
36297 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
36298 vcc->dev->number);
36299 length = 0;
36300 - atomic_inc(&vcc->stats->rx_err);
36301 + atomic_inc_unchecked(&vcc->stats->rx_err);
36302 }
36303 else {
36304 length = ATM_CELL_SIZE-1; /* no HEC */
36305 @@ -577,7 +577,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36306 size);
36307 }
36308 eff = length = 0;
36309 - atomic_inc(&vcc->stats->rx_err);
36310 + atomic_inc_unchecked(&vcc->stats->rx_err);
36311 }
36312 else {
36313 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
36314 @@ -594,7 +594,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36315 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
36316 vcc->dev->number,vcc->vci,length,size << 2,descr);
36317 length = eff = 0;
36318 - atomic_inc(&vcc->stats->rx_err);
36319 + atomic_inc_unchecked(&vcc->stats->rx_err);
36320 }
36321 }
36322 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
36323 @@ -767,7 +767,7 @@ rx_dequeued++;
36324 vcc->push(vcc,skb);
36325 pushed++;
36326 }
36327 - atomic_inc(&vcc->stats->rx);
36328 + atomic_inc_unchecked(&vcc->stats->rx);
36329 }
36330 wake_up(&eni_dev->rx_wait);
36331 }
36332 @@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *dev)
36333 PCI_DMA_TODEVICE);
36334 if (vcc->pop) vcc->pop(vcc,skb);
36335 else dev_kfree_skb_irq(skb);
36336 - atomic_inc(&vcc->stats->tx);
36337 + atomic_inc_unchecked(&vcc->stats->tx);
36338 wake_up(&eni_dev->tx_wait);
36339 dma_complete++;
36340 }
36341 diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
36342 index b41c948..a002b17 100644
36343 --- a/drivers/atm/firestream.c
36344 +++ b/drivers/atm/firestream.c
36345 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
36346 }
36347 }
36348
36349 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36350 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36351
36352 fs_dprintk (FS_DEBUG_TXMEM, "i");
36353 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
36354 @@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36355 #endif
36356 skb_put (skb, qe->p1 & 0xffff);
36357 ATM_SKB(skb)->vcc = atm_vcc;
36358 - atomic_inc(&atm_vcc->stats->rx);
36359 + atomic_inc_unchecked(&atm_vcc->stats->rx);
36360 __net_timestamp(skb);
36361 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
36362 atm_vcc->push (atm_vcc, skb);
36363 @@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36364 kfree (pe);
36365 }
36366 if (atm_vcc)
36367 - atomic_inc(&atm_vcc->stats->rx_drop);
36368 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36369 break;
36370 case 0x1f: /* Reassembly abort: no buffers. */
36371 /* Silently increment error counter. */
36372 if (atm_vcc)
36373 - atomic_inc(&atm_vcc->stats->rx_drop);
36374 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36375 break;
36376 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
36377 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
36378 diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
36379 index 204814e..cede831 100644
36380 --- a/drivers/atm/fore200e.c
36381 +++ b/drivers/atm/fore200e.c
36382 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
36383 #endif
36384 /* check error condition */
36385 if (*entry->status & STATUS_ERROR)
36386 - atomic_inc(&vcc->stats->tx_err);
36387 + atomic_inc_unchecked(&vcc->stats->tx_err);
36388 else
36389 - atomic_inc(&vcc->stats->tx);
36390 + atomic_inc_unchecked(&vcc->stats->tx);
36391 }
36392 }
36393
36394 @@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36395 if (skb == NULL) {
36396 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
36397
36398 - atomic_inc(&vcc->stats->rx_drop);
36399 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36400 return -ENOMEM;
36401 }
36402
36403 @@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36404
36405 dev_kfree_skb_any(skb);
36406
36407 - atomic_inc(&vcc->stats->rx_drop);
36408 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36409 return -ENOMEM;
36410 }
36411
36412 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36413
36414 vcc->push(vcc, skb);
36415 - atomic_inc(&vcc->stats->rx);
36416 + atomic_inc_unchecked(&vcc->stats->rx);
36417
36418 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36419
36420 @@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
36421 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
36422 fore200e->atm_dev->number,
36423 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
36424 - atomic_inc(&vcc->stats->rx_err);
36425 + atomic_inc_unchecked(&vcc->stats->rx_err);
36426 }
36427 }
36428
36429 @@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
36430 goto retry_here;
36431 }
36432
36433 - atomic_inc(&vcc->stats->tx_err);
36434 + atomic_inc_unchecked(&vcc->stats->tx_err);
36435
36436 fore200e->tx_sat++;
36437 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
36438 diff --git a/drivers/atm/he.c b/drivers/atm/he.c
36439 index aa6be26..f70a785 100644
36440 --- a/drivers/atm/he.c
36441 +++ b/drivers/atm/he.c
36442 @@ -1690,7 +1690,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36443
36444 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
36445 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
36446 - atomic_inc(&vcc->stats->rx_drop);
36447 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36448 goto return_host_buffers;
36449 }
36450
36451 @@ -1717,7 +1717,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36452 RBRQ_LEN_ERR(he_dev->rbrq_head)
36453 ? "LEN_ERR" : "",
36454 vcc->vpi, vcc->vci);
36455 - atomic_inc(&vcc->stats->rx_err);
36456 + atomic_inc_unchecked(&vcc->stats->rx_err);
36457 goto return_host_buffers;
36458 }
36459
36460 @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36461 vcc->push(vcc, skb);
36462 spin_lock(&he_dev->global_lock);
36463
36464 - atomic_inc(&vcc->stats->rx);
36465 + atomic_inc_unchecked(&vcc->stats->rx);
36466
36467 return_host_buffers:
36468 ++pdus_assembled;
36469 @@ -2095,7 +2095,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
36470 tpd->vcc->pop(tpd->vcc, tpd->skb);
36471 else
36472 dev_kfree_skb_any(tpd->skb);
36473 - atomic_inc(&tpd->vcc->stats->tx_err);
36474 + atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
36475 }
36476 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
36477 return;
36478 @@ -2507,7 +2507,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36479 vcc->pop(vcc, skb);
36480 else
36481 dev_kfree_skb_any(skb);
36482 - atomic_inc(&vcc->stats->tx_err);
36483 + atomic_inc_unchecked(&vcc->stats->tx_err);
36484 return -EINVAL;
36485 }
36486
36487 @@ -2518,7 +2518,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36488 vcc->pop(vcc, skb);
36489 else
36490 dev_kfree_skb_any(skb);
36491 - atomic_inc(&vcc->stats->tx_err);
36492 + atomic_inc_unchecked(&vcc->stats->tx_err);
36493 return -EINVAL;
36494 }
36495 #endif
36496 @@ -2530,7 +2530,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36497 vcc->pop(vcc, skb);
36498 else
36499 dev_kfree_skb_any(skb);
36500 - atomic_inc(&vcc->stats->tx_err);
36501 + atomic_inc_unchecked(&vcc->stats->tx_err);
36502 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36503 return -ENOMEM;
36504 }
36505 @@ -2572,7 +2572,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36506 vcc->pop(vcc, skb);
36507 else
36508 dev_kfree_skb_any(skb);
36509 - atomic_inc(&vcc->stats->tx_err);
36510 + atomic_inc_unchecked(&vcc->stats->tx_err);
36511 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36512 return -ENOMEM;
36513 }
36514 @@ -2603,7 +2603,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36515 __enqueue_tpd(he_dev, tpd, cid);
36516 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36517
36518 - atomic_inc(&vcc->stats->tx);
36519 + atomic_inc_unchecked(&vcc->stats->tx);
36520
36521 return 0;
36522 }
36523 diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
36524 index 1dc0519..1aadaf7 100644
36525 --- a/drivers/atm/horizon.c
36526 +++ b/drivers/atm/horizon.c
36527 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
36528 {
36529 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
36530 // VC layer stats
36531 - atomic_inc(&vcc->stats->rx);
36532 + atomic_inc_unchecked(&vcc->stats->rx);
36533 __net_timestamp(skb);
36534 // end of our responsibility
36535 vcc->push (vcc, skb);
36536 @@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
36537 dev->tx_iovec = NULL;
36538
36539 // VC layer stats
36540 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36541 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36542
36543 // free the skb
36544 hrz_kfree_skb (skb);
36545 diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
36546 index 1bdf104..9dc44b1 100644
36547 --- a/drivers/atm/idt77252.c
36548 +++ b/drivers/atm/idt77252.c
36549 @@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
36550 else
36551 dev_kfree_skb(skb);
36552
36553 - atomic_inc(&vcc->stats->tx);
36554 + atomic_inc_unchecked(&vcc->stats->tx);
36555 }
36556
36557 atomic_dec(&scq->used);
36558 @@ -1075,13 +1075,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36559 if ((sb = dev_alloc_skb(64)) == NULL) {
36560 printk("%s: Can't allocate buffers for aal0.\n",
36561 card->name);
36562 - atomic_add(i, &vcc->stats->rx_drop);
36563 + atomic_add_unchecked(i, &vcc->stats->rx_drop);
36564 break;
36565 }
36566 if (!atm_charge(vcc, sb->truesize)) {
36567 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
36568 card->name);
36569 - atomic_add(i - 1, &vcc->stats->rx_drop);
36570 + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
36571 dev_kfree_skb(sb);
36572 break;
36573 }
36574 @@ -1098,7 +1098,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36575 ATM_SKB(sb)->vcc = vcc;
36576 __net_timestamp(sb);
36577 vcc->push(vcc, sb);
36578 - atomic_inc(&vcc->stats->rx);
36579 + atomic_inc_unchecked(&vcc->stats->rx);
36580
36581 cell += ATM_CELL_PAYLOAD;
36582 }
36583 @@ -1135,13 +1135,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36584 "(CDC: %08x)\n",
36585 card->name, len, rpp->len, readl(SAR_REG_CDC));
36586 recycle_rx_pool_skb(card, rpp);
36587 - atomic_inc(&vcc->stats->rx_err);
36588 + atomic_inc_unchecked(&vcc->stats->rx_err);
36589 return;
36590 }
36591 if (stat & SAR_RSQE_CRC) {
36592 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
36593 recycle_rx_pool_skb(card, rpp);
36594 - atomic_inc(&vcc->stats->rx_err);
36595 + atomic_inc_unchecked(&vcc->stats->rx_err);
36596 return;
36597 }
36598 if (skb_queue_len(&rpp->queue) > 1) {
36599 @@ -1152,7 +1152,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36600 RXPRINTK("%s: Can't alloc RX skb.\n",
36601 card->name);
36602 recycle_rx_pool_skb(card, rpp);
36603 - atomic_inc(&vcc->stats->rx_err);
36604 + atomic_inc_unchecked(&vcc->stats->rx_err);
36605 return;
36606 }
36607 if (!atm_charge(vcc, skb->truesize)) {
36608 @@ -1171,7 +1171,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36609 __net_timestamp(skb);
36610
36611 vcc->push(vcc, skb);
36612 - atomic_inc(&vcc->stats->rx);
36613 + atomic_inc_unchecked(&vcc->stats->rx);
36614
36615 return;
36616 }
36617 @@ -1193,7 +1193,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36618 __net_timestamp(skb);
36619
36620 vcc->push(vcc, skb);
36621 - atomic_inc(&vcc->stats->rx);
36622 + atomic_inc_unchecked(&vcc->stats->rx);
36623
36624 if (skb->truesize > SAR_FB_SIZE_3)
36625 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
36626 @@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
36627 if (vcc->qos.aal != ATM_AAL0) {
36628 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
36629 card->name, vpi, vci);
36630 - atomic_inc(&vcc->stats->rx_drop);
36631 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36632 goto drop;
36633 }
36634
36635 if ((sb = dev_alloc_skb(64)) == NULL) {
36636 printk("%s: Can't allocate buffers for AAL0.\n",
36637 card->name);
36638 - atomic_inc(&vcc->stats->rx_err);
36639 + atomic_inc_unchecked(&vcc->stats->rx_err);
36640 goto drop;
36641 }
36642
36643 @@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
36644 ATM_SKB(sb)->vcc = vcc;
36645 __net_timestamp(sb);
36646 vcc->push(vcc, sb);
36647 - atomic_inc(&vcc->stats->rx);
36648 + atomic_inc_unchecked(&vcc->stats->rx);
36649
36650 drop:
36651 skb_pull(queue, 64);
36652 @@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
36653
36654 if (vc == NULL) {
36655 printk("%s: NULL connection in send().\n", card->name);
36656 - atomic_inc(&vcc->stats->tx_err);
36657 + atomic_inc_unchecked(&vcc->stats->tx_err);
36658 dev_kfree_skb(skb);
36659 return -EINVAL;
36660 }
36661 if (!test_bit(VCF_TX, &vc->flags)) {
36662 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
36663 - atomic_inc(&vcc->stats->tx_err);
36664 + atomic_inc_unchecked(&vcc->stats->tx_err);
36665 dev_kfree_skb(skb);
36666 return -EINVAL;
36667 }
36668 @@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
36669 break;
36670 default:
36671 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
36672 - atomic_inc(&vcc->stats->tx_err);
36673 + atomic_inc_unchecked(&vcc->stats->tx_err);
36674 dev_kfree_skb(skb);
36675 return -EINVAL;
36676 }
36677
36678 if (skb_shinfo(skb)->nr_frags != 0) {
36679 printk("%s: No scatter-gather yet.\n", card->name);
36680 - atomic_inc(&vcc->stats->tx_err);
36681 + atomic_inc_unchecked(&vcc->stats->tx_err);
36682 dev_kfree_skb(skb);
36683 return -EINVAL;
36684 }
36685 @@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
36686
36687 err = queue_skb(card, vc, skb, oam);
36688 if (err) {
36689 - atomic_inc(&vcc->stats->tx_err);
36690 + atomic_inc_unchecked(&vcc->stats->tx_err);
36691 dev_kfree_skb(skb);
36692 return err;
36693 }
36694 @@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
36695 skb = dev_alloc_skb(64);
36696 if (!skb) {
36697 printk("%s: Out of memory in send_oam().\n", card->name);
36698 - atomic_inc(&vcc->stats->tx_err);
36699 + atomic_inc_unchecked(&vcc->stats->tx_err);
36700 return -ENOMEM;
36701 }
36702 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
36703 diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
36704 index 4217f29..88f547a 100644
36705 --- a/drivers/atm/iphase.c
36706 +++ b/drivers/atm/iphase.c
36707 @@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
36708 status = (u_short) (buf_desc_ptr->desc_mode);
36709 if (status & (RX_CER | RX_PTE | RX_OFL))
36710 {
36711 - atomic_inc(&vcc->stats->rx_err);
36712 + atomic_inc_unchecked(&vcc->stats->rx_err);
36713 IF_ERR(printk("IA: bad packet, dropping it");)
36714 if (status & RX_CER) {
36715 IF_ERR(printk(" cause: packet CRC error\n");)
36716 @@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
36717 len = dma_addr - buf_addr;
36718 if (len > iadev->rx_buf_sz) {
36719 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
36720 - atomic_inc(&vcc->stats->rx_err);
36721 + atomic_inc_unchecked(&vcc->stats->rx_err);
36722 goto out_free_desc;
36723 }
36724
36725 @@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
36726 ia_vcc = INPH_IA_VCC(vcc);
36727 if (ia_vcc == NULL)
36728 {
36729 - atomic_inc(&vcc->stats->rx_err);
36730 + atomic_inc_unchecked(&vcc->stats->rx_err);
36731 atm_return(vcc, skb->truesize);
36732 dev_kfree_skb_any(skb);
36733 goto INCR_DLE;
36734 @@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
36735 if ((length > iadev->rx_buf_sz) || (length >
36736 (skb->len - sizeof(struct cpcs_trailer))))
36737 {
36738 - atomic_inc(&vcc->stats->rx_err);
36739 + atomic_inc_unchecked(&vcc->stats->rx_err);
36740 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
36741 length, skb->len);)
36742 atm_return(vcc, skb->truesize);
36743 @@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
36744
36745 IF_RX(printk("rx_dle_intr: skb push");)
36746 vcc->push(vcc,skb);
36747 - atomic_inc(&vcc->stats->rx);
36748 + atomic_inc_unchecked(&vcc->stats->rx);
36749 iadev->rx_pkt_cnt++;
36750 }
36751 INCR_DLE:
36752 @@ -2826,15 +2826,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
36753 {
36754 struct k_sonet_stats *stats;
36755 stats = &PRIV(_ia_dev[board])->sonet_stats;
36756 - printk("section_bip: %d\n", atomic_read(&stats->section_bip));
36757 - printk("line_bip : %d\n", atomic_read(&stats->line_bip));
36758 - printk("path_bip : %d\n", atomic_read(&stats->path_bip));
36759 - printk("line_febe : %d\n", atomic_read(&stats->line_febe));
36760 - printk("path_febe : %d\n", atomic_read(&stats->path_febe));
36761 - printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
36762 - printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
36763 - printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
36764 - printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
36765 + printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
36766 + printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
36767 + printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
36768 + printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
36769 + printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
36770 + printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
36771 + printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
36772 + printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
36773 + printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
36774 }
36775 ia_cmds.status = 0;
36776 break;
36777 @@ -2939,7 +2939,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
36778 if ((desc == 0) || (desc > iadev->num_tx_desc))
36779 {
36780 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
36781 - atomic_inc(&vcc->stats->tx);
36782 + atomic_inc_unchecked(&vcc->stats->tx);
36783 if (vcc->pop)
36784 vcc->pop(vcc, skb);
36785 else
36786 @@ -3044,14 +3044,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
36787 ATM_DESC(skb) = vcc->vci;
36788 skb_queue_tail(&iadev->tx_dma_q, skb);
36789
36790 - atomic_inc(&vcc->stats->tx);
36791 + atomic_inc_unchecked(&vcc->stats->tx);
36792 iadev->tx_pkt_cnt++;
36793 /* Increment transaction counter */
36794 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
36795
36796 #if 0
36797 /* add flow control logic */
36798 - if (atomic_read(&vcc->stats->tx) % 20 == 0) {
36799 + if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
36800 if (iavcc->vc_desc_cnt > 10) {
36801 vcc->tx_quota = vcc->tx_quota * 3 / 4;
36802 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
36803 diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
36804 index fa7d701..1e404c7 100644
36805 --- a/drivers/atm/lanai.c
36806 +++ b/drivers/atm/lanai.c
36807 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
36808 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
36809 lanai_endtx(lanai, lvcc);
36810 lanai_free_skb(lvcc->tx.atmvcc, skb);
36811 - atomic_inc(&lvcc->tx.atmvcc->stats->tx);
36812 + atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
36813 }
36814
36815 /* Try to fill the buffer - don't call unless there is backlog */
36816 @@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
36817 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
36818 __net_timestamp(skb);
36819 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
36820 - atomic_inc(&lvcc->rx.atmvcc->stats->rx);
36821 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
36822 out:
36823 lvcc->rx.buf.ptr = end;
36824 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
36825 @@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
36826 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
36827 "vcc %d\n", lanai->number, (unsigned int) s, vci);
36828 lanai->stats.service_rxnotaal5++;
36829 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
36830 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
36831 return 0;
36832 }
36833 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
36834 @@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
36835 int bytes;
36836 read_unlock(&vcc_sklist_lock);
36837 DPRINTK("got trashed rx pdu on vci %d\n", vci);
36838 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
36839 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
36840 lvcc->stats.x.aal5.service_trash++;
36841 bytes = (SERVICE_GET_END(s) * 16) -
36842 (((unsigned long) lvcc->rx.buf.ptr) -
36843 @@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
36844 }
36845 if (s & SERVICE_STREAM) {
36846 read_unlock(&vcc_sklist_lock);
36847 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
36848 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
36849 lvcc->stats.x.aal5.service_stream++;
36850 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
36851 "PDU on VCI %d!\n", lanai->number, vci);
36852 @@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
36853 return 0;
36854 }
36855 DPRINTK("got rx crc error on vci %d\n", vci);
36856 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
36857 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
36858 lvcc->stats.x.aal5.service_rxcrc++;
36859 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
36860 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
36861 diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
36862 index 9587e95..b45c5cb 100644
36863 --- a/drivers/atm/nicstar.c
36864 +++ b/drivers/atm/nicstar.c
36865 @@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
36866 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
36867 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
36868 card->index);
36869 - atomic_inc(&vcc->stats->tx_err);
36870 + atomic_inc_unchecked(&vcc->stats->tx_err);
36871 dev_kfree_skb_any(skb);
36872 return -EINVAL;
36873 }
36874 @@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
36875 if (!vc->tx) {
36876 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
36877 card->index);
36878 - atomic_inc(&vcc->stats->tx_err);
36879 + atomic_inc_unchecked(&vcc->stats->tx_err);
36880 dev_kfree_skb_any(skb);
36881 return -EINVAL;
36882 }
36883 @@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
36884 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
36885 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
36886 card->index);
36887 - atomic_inc(&vcc->stats->tx_err);
36888 + atomic_inc_unchecked(&vcc->stats->tx_err);
36889 dev_kfree_skb_any(skb);
36890 return -EINVAL;
36891 }
36892
36893 if (skb_shinfo(skb)->nr_frags != 0) {
36894 printk("nicstar%d: No scatter-gather yet.\n", card->index);
36895 - atomic_inc(&vcc->stats->tx_err);
36896 + atomic_inc_unchecked(&vcc->stats->tx_err);
36897 dev_kfree_skb_any(skb);
36898 return -EINVAL;
36899 }
36900 @@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
36901 }
36902
36903 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
36904 - atomic_inc(&vcc->stats->tx_err);
36905 + atomic_inc_unchecked(&vcc->stats->tx_err);
36906 dev_kfree_skb_any(skb);
36907 return -EIO;
36908 }
36909 - atomic_inc(&vcc->stats->tx);
36910 + atomic_inc_unchecked(&vcc->stats->tx);
36911
36912 return 0;
36913 }
36914 @@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36915 printk
36916 ("nicstar%d: Can't allocate buffers for aal0.\n",
36917 card->index);
36918 - atomic_add(i, &vcc->stats->rx_drop);
36919 + atomic_add_unchecked(i, &vcc->stats->rx_drop);
36920 break;
36921 }
36922 if (!atm_charge(vcc, sb->truesize)) {
36923 RXPRINTK
36924 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
36925 card->index);
36926 - atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
36927 + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
36928 dev_kfree_skb_any(sb);
36929 break;
36930 }
36931 @@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36932 ATM_SKB(sb)->vcc = vcc;
36933 __net_timestamp(sb);
36934 vcc->push(vcc, sb);
36935 - atomic_inc(&vcc->stats->rx);
36936 + atomic_inc_unchecked(&vcc->stats->rx);
36937 cell += ATM_CELL_PAYLOAD;
36938 }
36939
36940 @@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36941 if (iovb == NULL) {
36942 printk("nicstar%d: Out of iovec buffers.\n",
36943 card->index);
36944 - atomic_inc(&vcc->stats->rx_drop);
36945 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36946 recycle_rx_buf(card, skb);
36947 return;
36948 }
36949 @@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36950 small or large buffer itself. */
36951 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
36952 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
36953 - atomic_inc(&vcc->stats->rx_err);
36954 + atomic_inc_unchecked(&vcc->stats->rx_err);
36955 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
36956 NS_MAX_IOVECS);
36957 NS_PRV_IOVCNT(iovb) = 0;
36958 @@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36959 ("nicstar%d: Expected a small buffer, and this is not one.\n",
36960 card->index);
36961 which_list(card, skb);
36962 - atomic_inc(&vcc->stats->rx_err);
36963 + atomic_inc_unchecked(&vcc->stats->rx_err);
36964 recycle_rx_buf(card, skb);
36965 vc->rx_iov = NULL;
36966 recycle_iov_buf(card, iovb);
36967 @@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36968 ("nicstar%d: Expected a large buffer, and this is not one.\n",
36969 card->index);
36970 which_list(card, skb);
36971 - atomic_inc(&vcc->stats->rx_err);
36972 + atomic_inc_unchecked(&vcc->stats->rx_err);
36973 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
36974 NS_PRV_IOVCNT(iovb));
36975 vc->rx_iov = NULL;
36976 @@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36977 printk(" - PDU size mismatch.\n");
36978 else
36979 printk(".\n");
36980 - atomic_inc(&vcc->stats->rx_err);
36981 + atomic_inc_unchecked(&vcc->stats->rx_err);
36982 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
36983 NS_PRV_IOVCNT(iovb));
36984 vc->rx_iov = NULL;
36985 @@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36986 /* skb points to a small buffer */
36987 if (!atm_charge(vcc, skb->truesize)) {
36988 push_rxbufs(card, skb);
36989 - atomic_inc(&vcc->stats->rx_drop);
36990 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36991 } else {
36992 skb_put(skb, len);
36993 dequeue_sm_buf(card, skb);
36994 @@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36995 ATM_SKB(skb)->vcc = vcc;
36996 __net_timestamp(skb);
36997 vcc->push(vcc, skb);
36998 - atomic_inc(&vcc->stats->rx);
36999 + atomic_inc_unchecked(&vcc->stats->rx);
37000 }
37001 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37002 struct sk_buff *sb;
37003 @@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37004 if (len <= NS_SMBUFSIZE) {
37005 if (!atm_charge(vcc, sb->truesize)) {
37006 push_rxbufs(card, sb);
37007 - atomic_inc(&vcc->stats->rx_drop);
37008 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37009 } else {
37010 skb_put(sb, len);
37011 dequeue_sm_buf(card, sb);
37012 @@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37013 ATM_SKB(sb)->vcc = vcc;
37014 __net_timestamp(sb);
37015 vcc->push(vcc, sb);
37016 - atomic_inc(&vcc->stats->rx);
37017 + atomic_inc_unchecked(&vcc->stats->rx);
37018 }
37019
37020 push_rxbufs(card, skb);
37021 @@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37022
37023 if (!atm_charge(vcc, skb->truesize)) {
37024 push_rxbufs(card, skb);
37025 - atomic_inc(&vcc->stats->rx_drop);
37026 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37027 } else {
37028 dequeue_lg_buf(card, skb);
37029 #ifdef NS_USE_DESTRUCTORS
37030 @@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37031 ATM_SKB(skb)->vcc = vcc;
37032 __net_timestamp(skb);
37033 vcc->push(vcc, skb);
37034 - atomic_inc(&vcc->stats->rx);
37035 + atomic_inc_unchecked(&vcc->stats->rx);
37036 }
37037
37038 push_rxbufs(card, sb);
37039 @@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37040 printk
37041 ("nicstar%d: Out of huge buffers.\n",
37042 card->index);
37043 - atomic_inc(&vcc->stats->rx_drop);
37044 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37045 recycle_iovec_rx_bufs(card,
37046 (struct iovec *)
37047 iovb->data,
37048 @@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37049 card->hbpool.count++;
37050 } else
37051 dev_kfree_skb_any(hb);
37052 - atomic_inc(&vcc->stats->rx_drop);
37053 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37054 } else {
37055 /* Copy the small buffer to the huge buffer */
37056 sb = (struct sk_buff *)iov->iov_base;
37057 @@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37058 #endif /* NS_USE_DESTRUCTORS */
37059 __net_timestamp(hb);
37060 vcc->push(vcc, hb);
37061 - atomic_inc(&vcc->stats->rx);
37062 + atomic_inc_unchecked(&vcc->stats->rx);
37063 }
37064 }
37065
37066 diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37067 index e3fb496..d9646bf 100644
37068 --- a/drivers/atm/solos-pci.c
37069 +++ b/drivers/atm/solos-pci.c
37070 @@ -838,7 +838,7 @@ void solos_bh(unsigned long card_arg)
37071 }
37072 atm_charge(vcc, skb->truesize);
37073 vcc->push(vcc, skb);
37074 - atomic_inc(&vcc->stats->rx);
37075 + atomic_inc_unchecked(&vcc->stats->rx);
37076 break;
37077
37078 case PKT_STATUS:
37079 @@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37080 vcc = SKB_CB(oldskb)->vcc;
37081
37082 if (vcc) {
37083 - atomic_inc(&vcc->stats->tx);
37084 + atomic_inc_unchecked(&vcc->stats->tx);
37085 solos_pop(vcc, oldskb);
37086 } else {
37087 dev_kfree_skb_irq(oldskb);
37088 diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37089 index 0215934..ce9f5b1 100644
37090 --- a/drivers/atm/suni.c
37091 +++ b/drivers/atm/suni.c
37092 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37093
37094
37095 #define ADD_LIMITED(s,v) \
37096 - atomic_add((v),&stats->s); \
37097 - if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37098 + atomic_add_unchecked((v),&stats->s); \
37099 + if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37100
37101
37102 static void suni_hz(unsigned long from_timer)
37103 diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37104 index 5120a96..e2572bd 100644
37105 --- a/drivers/atm/uPD98402.c
37106 +++ b/drivers/atm/uPD98402.c
37107 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37108 struct sonet_stats tmp;
37109 int error = 0;
37110
37111 - atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37112 + atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37113 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37114 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37115 if (zero && !error) {
37116 @@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37117
37118
37119 #define ADD_LIMITED(s,v) \
37120 - { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37121 - if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37122 - atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37123 + { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37124 + if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37125 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37126
37127
37128 static void stat_event(struct atm_dev *dev)
37129 @@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37130 if (reason & uPD98402_INT_PFM) stat_event(dev);
37131 if (reason & uPD98402_INT_PCO) {
37132 (void) GET(PCOCR); /* clear interrupt cause */
37133 - atomic_add(GET(HECCT),
37134 + atomic_add_unchecked(GET(HECCT),
37135 &PRIV(dev)->sonet_stats.uncorr_hcs);
37136 }
37137 if ((reason & uPD98402_INT_RFO) &&
37138 @@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37139 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37140 uPD98402_INT_LOS),PIMR); /* enable them */
37141 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37142 - atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37143 - atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37144 - atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37145 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37146 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37147 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37148 return 0;
37149 }
37150
37151 diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37152 index 969c3c2..9b72956 100644
37153 --- a/drivers/atm/zatm.c
37154 +++ b/drivers/atm/zatm.c
37155 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37156 }
37157 if (!size) {
37158 dev_kfree_skb_irq(skb);
37159 - if (vcc) atomic_inc(&vcc->stats->rx_err);
37160 + if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37161 continue;
37162 }
37163 if (!atm_charge(vcc,skb->truesize)) {
37164 @@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37165 skb->len = size;
37166 ATM_SKB(skb)->vcc = vcc;
37167 vcc->push(vcc,skb);
37168 - atomic_inc(&vcc->stats->rx);
37169 + atomic_inc_unchecked(&vcc->stats->rx);
37170 }
37171 zout(pos & 0xffff,MTA(mbx));
37172 #if 0 /* probably a stupid idea */
37173 @@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
37174 skb_queue_head(&zatm_vcc->backlog,skb);
37175 break;
37176 }
37177 - atomic_inc(&vcc->stats->tx);
37178 + atomic_inc_unchecked(&vcc->stats->tx);
37179 wake_up(&zatm_vcc->tx_wait);
37180 }
37181
37182 diff --git a/drivers/base/bus.c b/drivers/base/bus.c
37183 index 59dc808..f10c74e 100644
37184 --- a/drivers/base/bus.c
37185 +++ b/drivers/base/bus.c
37186 @@ -1124,7 +1124,7 @@ int subsys_interface_register(struct subsys_interface *sif)
37187 return -EINVAL;
37188
37189 mutex_lock(&subsys->p->mutex);
37190 - list_add_tail(&sif->node, &subsys->p->interfaces);
37191 + pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
37192 if (sif->add_dev) {
37193 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37194 while ((dev = subsys_dev_iter_next(&iter)))
37195 @@ -1149,7 +1149,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
37196 subsys = sif->subsys;
37197
37198 mutex_lock(&subsys->p->mutex);
37199 - list_del_init(&sif->node);
37200 + pax_list_del_init((struct list_head *)&sif->node);
37201 if (sif->remove_dev) {
37202 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37203 while ((dev = subsys_dev_iter_next(&iter)))
37204 diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
37205 index 25798db..15f130e 100644
37206 --- a/drivers/base/devtmpfs.c
37207 +++ b/drivers/base/devtmpfs.c
37208 @@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
37209 if (!thread)
37210 return 0;
37211
37212 - err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
37213 + err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
37214 if (err)
37215 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
37216 else
37217 @@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
37218 *err = sys_unshare(CLONE_NEWNS);
37219 if (*err)
37220 goto out;
37221 - *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
37222 + *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
37223 if (*err)
37224 goto out;
37225 - sys_chdir("/.."); /* will traverse into overmounted root */
37226 - sys_chroot(".");
37227 + sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
37228 + sys_chroot((char __force_user *)".");
37229 complete(&setup_done);
37230 while (1) {
37231 spin_lock(&req_lock);
37232 diff --git a/drivers/base/node.c b/drivers/base/node.c
37233 index bc9f43b..29703b8 100644
37234 --- a/drivers/base/node.c
37235 +++ b/drivers/base/node.c
37236 @@ -620,7 +620,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
37237 struct node_attr {
37238 struct device_attribute attr;
37239 enum node_states state;
37240 -};
37241 +} __do_const;
37242
37243 static ssize_t show_node_state(struct device *dev,
37244 struct device_attribute *attr, char *buf)
37245 diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
37246 index bfb8955..4ebff34 100644
37247 --- a/drivers/base/power/domain.c
37248 +++ b/drivers/base/power/domain.c
37249 @@ -1809,9 +1809,9 @@ int __pm_genpd_remove_callbacks(struct device *dev, bool clear_td)
37250
37251 if (dev->power.subsys_data->domain_data) {
37252 gpd_data = to_gpd_data(dev->power.subsys_data->domain_data);
37253 - gpd_data->ops = (struct gpd_dev_ops){ NULL };
37254 + memset(&gpd_data->ops, 0, sizeof(gpd_data->ops));
37255 if (clear_td)
37256 - gpd_data->td = (struct gpd_timing_data){ 0 };
37257 + memset(&gpd_data->td, 0, sizeof(gpd_data->td));
37258
37259 if (--gpd_data->refcount == 0) {
37260 dev->power.subsys_data->domain_data = NULL;
37261 @@ -1850,7 +1850,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
37262 {
37263 struct cpuidle_driver *cpuidle_drv;
37264 struct gpd_cpu_data *cpu_data;
37265 - struct cpuidle_state *idle_state;
37266 + cpuidle_state_no_const *idle_state;
37267 int ret = 0;
37268
37269 if (IS_ERR_OR_NULL(genpd) || state < 0)
37270 @@ -1918,7 +1918,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
37271 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
37272 {
37273 struct gpd_cpu_data *cpu_data;
37274 - struct cpuidle_state *idle_state;
37275 + cpuidle_state_no_const *idle_state;
37276 int ret = 0;
37277
37278 if (IS_ERR_OR_NULL(genpd))
37279 diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
37280 index 03e089a..0e9560c 100644
37281 --- a/drivers/base/power/sysfs.c
37282 +++ b/drivers/base/power/sysfs.c
37283 @@ -185,7 +185,7 @@ static ssize_t rtpm_status_show(struct device *dev,
37284 return -EIO;
37285 }
37286 }
37287 - return sprintf(buf, p);
37288 + return sprintf(buf, "%s", p);
37289 }
37290
37291 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
37292 diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
37293 index 2d56f41..8830f19 100644
37294 --- a/drivers/base/power/wakeup.c
37295 +++ b/drivers/base/power/wakeup.c
37296 @@ -29,14 +29,14 @@ bool events_check_enabled __read_mostly;
37297 * They need to be modified together atomically, so it's better to use one
37298 * atomic variable to hold them both.
37299 */
37300 -static atomic_t combined_event_count = ATOMIC_INIT(0);
37301 +static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
37302
37303 #define IN_PROGRESS_BITS (sizeof(int) * 4)
37304 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
37305
37306 static void split_counters(unsigned int *cnt, unsigned int *inpr)
37307 {
37308 - unsigned int comb = atomic_read(&combined_event_count);
37309 + unsigned int comb = atomic_read_unchecked(&combined_event_count);
37310
37311 *cnt = (comb >> IN_PROGRESS_BITS);
37312 *inpr = comb & MAX_IN_PROGRESS;
37313 @@ -395,7 +395,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
37314 ws->start_prevent_time = ws->last_time;
37315
37316 /* Increment the counter of events in progress. */
37317 - cec = atomic_inc_return(&combined_event_count);
37318 + cec = atomic_inc_return_unchecked(&combined_event_count);
37319
37320 trace_wakeup_source_activate(ws->name, cec);
37321 }
37322 @@ -521,7 +521,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
37323 * Increment the counter of registered wakeup events and decrement the
37324 * couter of wakeup events in progress simultaneously.
37325 */
37326 - cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
37327 + cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
37328 trace_wakeup_source_deactivate(ws->name, cec);
37329
37330 split_counters(&cnt, &inpr);
37331 diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
37332 index e8d11b6..7b1b36f 100644
37333 --- a/drivers/base/syscore.c
37334 +++ b/drivers/base/syscore.c
37335 @@ -21,7 +21,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
37336 void register_syscore_ops(struct syscore_ops *ops)
37337 {
37338 mutex_lock(&syscore_ops_lock);
37339 - list_add_tail(&ops->node, &syscore_ops_list);
37340 + pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
37341 mutex_unlock(&syscore_ops_lock);
37342 }
37343 EXPORT_SYMBOL_GPL(register_syscore_ops);
37344 @@ -33,7 +33,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
37345 void unregister_syscore_ops(struct syscore_ops *ops)
37346 {
37347 mutex_lock(&syscore_ops_lock);
37348 - list_del(&ops->node);
37349 + pax_list_del((struct list_head *)&ops->node);
37350 mutex_unlock(&syscore_ops_lock);
37351 }
37352 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
37353 diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
37354 index 036e8ab..6221dec 100644
37355 --- a/drivers/block/cciss.c
37356 +++ b/drivers/block/cciss.c
37357 @@ -3011,7 +3011,7 @@ static void start_io(ctlr_info_t *h)
37358 while (!list_empty(&h->reqQ)) {
37359 c = list_entry(h->reqQ.next, CommandList_struct, list);
37360 /* can't do anything if fifo is full */
37361 - if ((h->access.fifo_full(h))) {
37362 + if ((h->access->fifo_full(h))) {
37363 dev_warn(&h->pdev->dev, "fifo full\n");
37364 break;
37365 }
37366 @@ -3021,7 +3021,7 @@ static void start_io(ctlr_info_t *h)
37367 h->Qdepth--;
37368
37369 /* Tell the controller execute command */
37370 - h->access.submit_command(h, c);
37371 + h->access->submit_command(h, c);
37372
37373 /* Put job onto the completed Q */
37374 addQ(&h->cmpQ, c);
37375 @@ -3447,17 +3447,17 @@ startio:
37376
37377 static inline unsigned long get_next_completion(ctlr_info_t *h)
37378 {
37379 - return h->access.command_completed(h);
37380 + return h->access->command_completed(h);
37381 }
37382
37383 static inline int interrupt_pending(ctlr_info_t *h)
37384 {
37385 - return h->access.intr_pending(h);
37386 + return h->access->intr_pending(h);
37387 }
37388
37389 static inline long interrupt_not_for_us(ctlr_info_t *h)
37390 {
37391 - return ((h->access.intr_pending(h) == 0) ||
37392 + return ((h->access->intr_pending(h) == 0) ||
37393 (h->interrupts_enabled == 0));
37394 }
37395
37396 @@ -3490,7 +3490,7 @@ static inline u32 next_command(ctlr_info_t *h)
37397 u32 a;
37398
37399 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
37400 - return h->access.command_completed(h);
37401 + return h->access->command_completed(h);
37402
37403 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
37404 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
37405 @@ -4047,7 +4047,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
37406 trans_support & CFGTBL_Trans_use_short_tags);
37407
37408 /* Change the access methods to the performant access methods */
37409 - h->access = SA5_performant_access;
37410 + h->access = &SA5_performant_access;
37411 h->transMethod = CFGTBL_Trans_Performant;
37412
37413 return;
37414 @@ -4327,7 +4327,7 @@ static int cciss_pci_init(ctlr_info_t *h)
37415 if (prod_index < 0)
37416 return -ENODEV;
37417 h->product_name = products[prod_index].product_name;
37418 - h->access = *(products[prod_index].access);
37419 + h->access = products[prod_index].access;
37420
37421 if (cciss_board_disabled(h)) {
37422 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
37423 @@ -5059,7 +5059,7 @@ reinit_after_soft_reset:
37424 }
37425
37426 /* make sure the board interrupts are off */
37427 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37428 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37429 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
37430 if (rc)
37431 goto clean2;
37432 @@ -5109,7 +5109,7 @@ reinit_after_soft_reset:
37433 * fake ones to scoop up any residual completions.
37434 */
37435 spin_lock_irqsave(&h->lock, flags);
37436 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37437 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37438 spin_unlock_irqrestore(&h->lock, flags);
37439 free_irq(h->intr[h->intr_mode], h);
37440 rc = cciss_request_irq(h, cciss_msix_discard_completions,
37441 @@ -5129,9 +5129,9 @@ reinit_after_soft_reset:
37442 dev_info(&h->pdev->dev, "Board READY.\n");
37443 dev_info(&h->pdev->dev,
37444 "Waiting for stale completions to drain.\n");
37445 - h->access.set_intr_mask(h, CCISS_INTR_ON);
37446 + h->access->set_intr_mask(h, CCISS_INTR_ON);
37447 msleep(10000);
37448 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37449 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37450
37451 rc = controller_reset_failed(h->cfgtable);
37452 if (rc)
37453 @@ -5154,7 +5154,7 @@ reinit_after_soft_reset:
37454 cciss_scsi_setup(h);
37455
37456 /* Turn the interrupts on so we can service requests */
37457 - h->access.set_intr_mask(h, CCISS_INTR_ON);
37458 + h->access->set_intr_mask(h, CCISS_INTR_ON);
37459
37460 /* Get the firmware version */
37461 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
37462 @@ -5226,7 +5226,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
37463 kfree(flush_buf);
37464 if (return_code != IO_OK)
37465 dev_warn(&h->pdev->dev, "Error flushing cache\n");
37466 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37467 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37468 free_irq(h->intr[h->intr_mode], h);
37469 }
37470
37471 diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
37472 index 7fda30e..2f27946 100644
37473 --- a/drivers/block/cciss.h
37474 +++ b/drivers/block/cciss.h
37475 @@ -101,7 +101,7 @@ struct ctlr_info
37476 /* information about each logical volume */
37477 drive_info_struct *drv[CISS_MAX_LUN];
37478
37479 - struct access_method access;
37480 + struct access_method *access;
37481
37482 /* queue and queue Info */
37483 struct list_head reqQ;
37484 @@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
37485 }
37486
37487 static struct access_method SA5_access = {
37488 - SA5_submit_command,
37489 - SA5_intr_mask,
37490 - SA5_fifo_full,
37491 - SA5_intr_pending,
37492 - SA5_completed,
37493 + .submit_command = SA5_submit_command,
37494 + .set_intr_mask = SA5_intr_mask,
37495 + .fifo_full = SA5_fifo_full,
37496 + .intr_pending = SA5_intr_pending,
37497 + .command_completed = SA5_completed,
37498 };
37499
37500 static struct access_method SA5B_access = {
37501 - SA5_submit_command,
37502 - SA5B_intr_mask,
37503 - SA5_fifo_full,
37504 - SA5B_intr_pending,
37505 - SA5_completed,
37506 + .submit_command = SA5_submit_command,
37507 + .set_intr_mask = SA5B_intr_mask,
37508 + .fifo_full = SA5_fifo_full,
37509 + .intr_pending = SA5B_intr_pending,
37510 + .command_completed = SA5_completed,
37511 };
37512
37513 static struct access_method SA5_performant_access = {
37514 - SA5_submit_command,
37515 - SA5_performant_intr_mask,
37516 - SA5_fifo_full,
37517 - SA5_performant_intr_pending,
37518 - SA5_performant_completed,
37519 + .submit_command = SA5_submit_command,
37520 + .set_intr_mask = SA5_performant_intr_mask,
37521 + .fifo_full = SA5_fifo_full,
37522 + .intr_pending = SA5_performant_intr_pending,
37523 + .command_completed = SA5_performant_completed,
37524 };
37525
37526 struct board_type {
37527 diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
37528 index 2b94403..fd6ad1f 100644
37529 --- a/drivers/block/cpqarray.c
37530 +++ b/drivers/block/cpqarray.c
37531 @@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37532 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
37533 goto Enomem4;
37534 }
37535 - hba[i]->access.set_intr_mask(hba[i], 0);
37536 + hba[i]->access->set_intr_mask(hba[i], 0);
37537 if (request_irq(hba[i]->intr, do_ida_intr,
37538 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
37539 {
37540 @@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37541 add_timer(&hba[i]->timer);
37542
37543 /* Enable IRQ now that spinlock and rate limit timer are set up */
37544 - hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
37545 + hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
37546
37547 for(j=0; j<NWD; j++) {
37548 struct gendisk *disk = ida_gendisk[i][j];
37549 @@ -694,7 +694,7 @@ DBGINFO(
37550 for(i=0; i<NR_PRODUCTS; i++) {
37551 if (board_id == products[i].board_id) {
37552 c->product_name = products[i].product_name;
37553 - c->access = *(products[i].access);
37554 + c->access = products[i].access;
37555 break;
37556 }
37557 }
37558 @@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
37559 hba[ctlr]->intr = intr;
37560 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
37561 hba[ctlr]->product_name = products[j].product_name;
37562 - hba[ctlr]->access = *(products[j].access);
37563 + hba[ctlr]->access = products[j].access;
37564 hba[ctlr]->ctlr = ctlr;
37565 hba[ctlr]->board_id = board_id;
37566 hba[ctlr]->pci_dev = NULL; /* not PCI */
37567 @@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
37568
37569 while((c = h->reqQ) != NULL) {
37570 /* Can't do anything if we're busy */
37571 - if (h->access.fifo_full(h) == 0)
37572 + if (h->access->fifo_full(h) == 0)
37573 return;
37574
37575 /* Get the first entry from the request Q */
37576 @@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
37577 h->Qdepth--;
37578
37579 /* Tell the controller to do our bidding */
37580 - h->access.submit_command(h, c);
37581 + h->access->submit_command(h, c);
37582
37583 /* Get onto the completion Q */
37584 addQ(&h->cmpQ, c);
37585 @@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
37586 unsigned long flags;
37587 __u32 a,a1;
37588
37589 - istat = h->access.intr_pending(h);
37590 + istat = h->access->intr_pending(h);
37591 /* Is this interrupt for us? */
37592 if (istat == 0)
37593 return IRQ_NONE;
37594 @@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
37595 */
37596 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
37597 if (istat & FIFO_NOT_EMPTY) {
37598 - while((a = h->access.command_completed(h))) {
37599 + while((a = h->access->command_completed(h))) {
37600 a1 = a; a &= ~3;
37601 if ((c = h->cmpQ) == NULL)
37602 {
37603 @@ -1448,11 +1448,11 @@ static int sendcmd(
37604 /*
37605 * Disable interrupt
37606 */
37607 - info_p->access.set_intr_mask(info_p, 0);
37608 + info_p->access->set_intr_mask(info_p, 0);
37609 /* Make sure there is room in the command FIFO */
37610 /* Actually it should be completely empty at this time. */
37611 for (i = 200000; i > 0; i--) {
37612 - temp = info_p->access.fifo_full(info_p);
37613 + temp = info_p->access->fifo_full(info_p);
37614 if (temp != 0) {
37615 break;
37616 }
37617 @@ -1465,7 +1465,7 @@ DBG(
37618 /*
37619 * Send the cmd
37620 */
37621 - info_p->access.submit_command(info_p, c);
37622 + info_p->access->submit_command(info_p, c);
37623 complete = pollcomplete(ctlr);
37624
37625 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
37626 @@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
37627 * we check the new geometry. Then turn interrupts back on when
37628 * we're done.
37629 */
37630 - host->access.set_intr_mask(host, 0);
37631 + host->access->set_intr_mask(host, 0);
37632 getgeometry(ctlr);
37633 - host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
37634 + host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
37635
37636 for(i=0; i<NWD; i++) {
37637 struct gendisk *disk = ida_gendisk[ctlr][i];
37638 @@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
37639 /* Wait (up to 2 seconds) for a command to complete */
37640
37641 for (i = 200000; i > 0; i--) {
37642 - done = hba[ctlr]->access.command_completed(hba[ctlr]);
37643 + done = hba[ctlr]->access->command_completed(hba[ctlr]);
37644 if (done == 0) {
37645 udelay(10); /* a short fixed delay */
37646 } else
37647 diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
37648 index be73e9d..7fbf140 100644
37649 --- a/drivers/block/cpqarray.h
37650 +++ b/drivers/block/cpqarray.h
37651 @@ -99,7 +99,7 @@ struct ctlr_info {
37652 drv_info_t drv[NWD];
37653 struct proc_dir_entry *proc;
37654
37655 - struct access_method access;
37656 + struct access_method *access;
37657
37658 cmdlist_t *reqQ;
37659 cmdlist_t *cmpQ;
37660 diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
37661 index 0e06f0c..c47b81d 100644
37662 --- a/drivers/block/drbd/drbd_int.h
37663 +++ b/drivers/block/drbd/drbd_int.h
37664 @@ -582,7 +582,7 @@ struct drbd_epoch {
37665 struct drbd_tconn *tconn;
37666 struct list_head list;
37667 unsigned int barrier_nr;
37668 - atomic_t epoch_size; /* increased on every request added. */
37669 + atomic_unchecked_t epoch_size; /* increased on every request added. */
37670 atomic_t active; /* increased on every req. added, and dec on every finished. */
37671 unsigned long flags;
37672 };
37673 @@ -1022,7 +1022,7 @@ struct drbd_conf {
37674 unsigned int al_tr_number;
37675 int al_tr_cycle;
37676 wait_queue_head_t seq_wait;
37677 - atomic_t packet_seq;
37678 + atomic_unchecked_t packet_seq;
37679 unsigned int peer_seq;
37680 spinlock_t peer_seq_lock;
37681 unsigned int minor;
37682 @@ -1573,7 +1573,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
37683 char __user *uoptval;
37684 int err;
37685
37686 - uoptval = (char __user __force *)optval;
37687 + uoptval = (char __force_user *)optval;
37688
37689 set_fs(KERNEL_DS);
37690 if (level == SOL_SOCKET)
37691 diff --git a/drivers/block/drbd/drbd_interval.c b/drivers/block/drbd/drbd_interval.c
37692 index 89c497c..9c736ae 100644
37693 --- a/drivers/block/drbd/drbd_interval.c
37694 +++ b/drivers/block/drbd/drbd_interval.c
37695 @@ -67,9 +67,9 @@ static void augment_rotate(struct rb_node *rb_old, struct rb_node *rb_new)
37696 }
37697
37698 static const struct rb_augment_callbacks augment_callbacks = {
37699 - augment_propagate,
37700 - augment_copy,
37701 - augment_rotate,
37702 + .propagate = augment_propagate,
37703 + .copy = augment_copy,
37704 + .rotate = augment_rotate,
37705 };
37706
37707 /**
37708 diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
37709 index 929468e..7d934eb 100644
37710 --- a/drivers/block/drbd/drbd_main.c
37711 +++ b/drivers/block/drbd/drbd_main.c
37712 @@ -1317,7 +1317,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packet cmd,
37713 p->sector = sector;
37714 p->block_id = block_id;
37715 p->blksize = blksize;
37716 - p->seq_num = cpu_to_be32(atomic_inc_return(&mdev->packet_seq));
37717 + p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&mdev->packet_seq));
37718 return drbd_send_command(mdev, sock, cmd, sizeof(*p), NULL, 0);
37719 }
37720
37721 @@ -1622,7 +1622,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
37722 return -EIO;
37723 p->sector = cpu_to_be64(req->i.sector);
37724 p->block_id = (unsigned long)req;
37725 - p->seq_num = cpu_to_be32(atomic_inc_return(&mdev->packet_seq));
37726 + p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&mdev->packet_seq));
37727 dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
37728 if (mdev->state.conn >= C_SYNC_SOURCE &&
37729 mdev->state.conn <= C_PAUSED_SYNC_T)
37730 @@ -2577,8 +2577,8 @@ void conn_destroy(struct kref *kref)
37731 {
37732 struct drbd_tconn *tconn = container_of(kref, struct drbd_tconn, kref);
37733
37734 - if (atomic_read(&tconn->current_epoch->epoch_size) != 0)
37735 - conn_err(tconn, "epoch_size:%d\n", atomic_read(&tconn->current_epoch->epoch_size));
37736 + if (atomic_read_unchecked(&tconn->current_epoch->epoch_size) != 0)
37737 + conn_err(tconn, "epoch_size:%d\n", atomic_read_unchecked(&tconn->current_epoch->epoch_size));
37738 kfree(tconn->current_epoch);
37739
37740 idr_destroy(&tconn->volumes);
37741 diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
37742 index c706d50..5e1b472 100644
37743 --- a/drivers/block/drbd/drbd_nl.c
37744 +++ b/drivers/block/drbd/drbd_nl.c
37745 @@ -3440,7 +3440,7 @@ out:
37746
37747 void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib)
37748 {
37749 - static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
37750 + static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
37751 struct sk_buff *msg;
37752 struct drbd_genlmsghdr *d_out;
37753 unsigned seq;
37754 @@ -3453,7 +3453,7 @@ void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib)
37755 return;
37756 }
37757
37758 - seq = atomic_inc_return(&drbd_genl_seq);
37759 + seq = atomic_inc_return_unchecked(&drbd_genl_seq);
37760 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
37761 if (!msg)
37762 goto failed;
37763 diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
37764 index d073305..4998fea 100644
37765 --- a/drivers/block/drbd/drbd_receiver.c
37766 +++ b/drivers/block/drbd/drbd_receiver.c
37767 @@ -834,7 +834,7 @@ int drbd_connected(struct drbd_conf *mdev)
37768 {
37769 int err;
37770
37771 - atomic_set(&mdev->packet_seq, 0);
37772 + atomic_set_unchecked(&mdev->packet_seq, 0);
37773 mdev->peer_seq = 0;
37774
37775 mdev->state_mutex = mdev->tconn->agreed_pro_version < 100 ?
37776 @@ -1193,7 +1193,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_tconn *tconn,
37777 do {
37778 next_epoch = NULL;
37779
37780 - epoch_size = atomic_read(&epoch->epoch_size);
37781 + epoch_size = atomic_read_unchecked(&epoch->epoch_size);
37782
37783 switch (ev & ~EV_CLEANUP) {
37784 case EV_PUT:
37785 @@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_tconn *tconn,
37786 rv = FE_DESTROYED;
37787 } else {
37788 epoch->flags = 0;
37789 - atomic_set(&epoch->epoch_size, 0);
37790 + atomic_set_unchecked(&epoch->epoch_size, 0);
37791 /* atomic_set(&epoch->active, 0); is already zero */
37792 if (rv == FE_STILL_LIVE)
37793 rv = FE_RECYCLED;
37794 @@ -1451,7 +1451,7 @@ static int receive_Barrier(struct drbd_tconn *tconn, struct packet_info *pi)
37795 conn_wait_active_ee_empty(tconn);
37796 drbd_flush(tconn);
37797
37798 - if (atomic_read(&tconn->current_epoch->epoch_size)) {
37799 + if (atomic_read_unchecked(&tconn->current_epoch->epoch_size)) {
37800 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
37801 if (epoch)
37802 break;
37803 @@ -1464,11 +1464,11 @@ static int receive_Barrier(struct drbd_tconn *tconn, struct packet_info *pi)
37804 }
37805
37806 epoch->flags = 0;
37807 - atomic_set(&epoch->epoch_size, 0);
37808 + atomic_set_unchecked(&epoch->epoch_size, 0);
37809 atomic_set(&epoch->active, 0);
37810
37811 spin_lock(&tconn->epoch_lock);
37812 - if (atomic_read(&tconn->current_epoch->epoch_size)) {
37813 + if (atomic_read_unchecked(&tconn->current_epoch->epoch_size)) {
37814 list_add(&epoch->list, &tconn->current_epoch->list);
37815 tconn->current_epoch = epoch;
37816 tconn->epochs++;
37817 @@ -2164,7 +2164,7 @@ static int receive_Data(struct drbd_tconn *tconn, struct packet_info *pi)
37818
37819 err = wait_for_and_update_peer_seq(mdev, peer_seq);
37820 drbd_send_ack_dp(mdev, P_NEG_ACK, p, pi->size);
37821 - atomic_inc(&tconn->current_epoch->epoch_size);
37822 + atomic_inc_unchecked(&tconn->current_epoch->epoch_size);
37823 err2 = drbd_drain_block(mdev, pi->size);
37824 if (!err)
37825 err = err2;
37826 @@ -2198,7 +2198,7 @@ static int receive_Data(struct drbd_tconn *tconn, struct packet_info *pi)
37827
37828 spin_lock(&tconn->epoch_lock);
37829 peer_req->epoch = tconn->current_epoch;
37830 - atomic_inc(&peer_req->epoch->epoch_size);
37831 + atomic_inc_unchecked(&peer_req->epoch->epoch_size);
37832 atomic_inc(&peer_req->epoch->active);
37833 spin_unlock(&tconn->epoch_lock);
37834
37835 @@ -4345,7 +4345,7 @@ struct data_cmd {
37836 int expect_payload;
37837 size_t pkt_size;
37838 int (*fn)(struct drbd_tconn *, struct packet_info *);
37839 -};
37840 +} __do_const;
37841
37842 static struct data_cmd drbd_cmd_handler[] = {
37843 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
37844 @@ -4465,7 +4465,7 @@ static void conn_disconnect(struct drbd_tconn *tconn)
37845 if (!list_empty(&tconn->current_epoch->list))
37846 conn_err(tconn, "ASSERTION FAILED: tconn->current_epoch->list not empty\n");
37847 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
37848 - atomic_set(&tconn->current_epoch->epoch_size, 0);
37849 + atomic_set_unchecked(&tconn->current_epoch->epoch_size, 0);
37850 tconn->send.seen_any_write_yet = false;
37851
37852 conn_info(tconn, "Connection closed\n");
37853 @@ -5221,7 +5221,7 @@ static int tconn_finish_peer_reqs(struct drbd_tconn *tconn)
37854 struct asender_cmd {
37855 size_t pkt_size;
37856 int (*fn)(struct drbd_tconn *tconn, struct packet_info *);
37857 -};
37858 +} __do_const;
37859
37860 static struct asender_cmd asender_tbl[] = {
37861 [P_PING] = { 0, got_Ping },
37862 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
37863 index 66e8c3b..9b68dd9 100644
37864 --- a/drivers/block/loop.c
37865 +++ b/drivers/block/loop.c
37866 @@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file,
37867
37868 file_start_write(file);
37869 set_fs(get_ds());
37870 - bw = file->f_op->write(file, buf, len, &pos);
37871 + bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
37872 set_fs(old_fs);
37873 file_end_write(file);
37874 if (likely(bw == len))
37875 diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
37876 index 091b9ea..f5428f8 100644
37877 --- a/drivers/block/null_blk.c
37878 +++ b/drivers/block/null_blk.c
37879 @@ -382,15 +382,25 @@ static int null_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
37880 return 0;
37881 }
37882
37883 -static struct blk_mq_ops null_mq_ops = {
37884 - .queue_rq = null_queue_rq,
37885 - .map_queue = blk_mq_map_queue,
37886 +static struct blk_mq_ops null_mq_single_ops = {
37887 + .queue_rq = null_queue_rq,
37888 + .map_queue = blk_mq_map_queue,
37889 .init_hctx = null_init_hctx,
37890 .complete = null_softirq_done_fn,
37891 + .alloc_hctx = blk_mq_alloc_single_hw_queue,
37892 + .free_hctx = blk_mq_free_single_hw_queue,
37893 +};
37894 +
37895 +static struct blk_mq_ops null_mq_per_node_ops = {
37896 + .queue_rq = null_queue_rq,
37897 + .map_queue = blk_mq_map_queue,
37898 + .init_hctx = null_init_hctx,
37899 + .alloc_hctx = null_alloc_hctx,
37900 + .free_hctx = null_free_hctx,
37901 };
37902
37903 static struct blk_mq_reg null_mq_reg = {
37904 - .ops = &null_mq_ops,
37905 + .ops = &null_mq_single_ops,
37906 .queue_depth = 64,
37907 .cmd_size = sizeof(struct nullb_cmd),
37908 .flags = BLK_MQ_F_SHOULD_MERGE,
37909 @@ -521,13 +531,8 @@ static int null_add_dev(void)
37910 null_mq_reg.queue_depth = hw_queue_depth;
37911 null_mq_reg.nr_hw_queues = submit_queues;
37912
37913 - if (use_per_node_hctx) {
37914 - null_mq_reg.ops->alloc_hctx = null_alloc_hctx;
37915 - null_mq_reg.ops->free_hctx = null_free_hctx;
37916 - } else {
37917 - null_mq_reg.ops->alloc_hctx = blk_mq_alloc_single_hw_queue;
37918 - null_mq_reg.ops->free_hctx = blk_mq_free_single_hw_queue;
37919 - }
37920 + if (use_per_node_hctx)
37921 + null_mq_reg.ops = &null_mq_per_node_ops;
37922
37923 nullb->q = blk_mq_init_queue(&null_mq_reg, nullb);
37924 } else if (queue_mode == NULL_Q_BIO) {
37925 diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
37926 index a2af73d..c0b8f61 100644
37927 --- a/drivers/block/pktcdvd.c
37928 +++ b/drivers/block/pktcdvd.c
37929 @@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
37930
37931 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
37932 {
37933 - return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
37934 + return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
37935 }
37936
37937 /*
37938 @@ -1888,7 +1888,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
37939 return -EROFS;
37940 }
37941 pd->settings.fp = ti.fp;
37942 - pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
37943 + pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
37944
37945 if (ti.nwa_v) {
37946 pd->nwa = be32_to_cpu(ti.next_writable);
37947 diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
37948 index e5565fb..71be10b4 100644
37949 --- a/drivers/block/smart1,2.h
37950 +++ b/drivers/block/smart1,2.h
37951 @@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
37952 }
37953
37954 static struct access_method smart4_access = {
37955 - smart4_submit_command,
37956 - smart4_intr_mask,
37957 - smart4_fifo_full,
37958 - smart4_intr_pending,
37959 - smart4_completed,
37960 + .submit_command = smart4_submit_command,
37961 + .set_intr_mask = smart4_intr_mask,
37962 + .fifo_full = smart4_fifo_full,
37963 + .intr_pending = smart4_intr_pending,
37964 + .command_completed = smart4_completed,
37965 };
37966
37967 /*
37968 @@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
37969 }
37970
37971 static struct access_method smart2_access = {
37972 - smart2_submit_command,
37973 - smart2_intr_mask,
37974 - smart2_fifo_full,
37975 - smart2_intr_pending,
37976 - smart2_completed,
37977 + .submit_command = smart2_submit_command,
37978 + .set_intr_mask = smart2_intr_mask,
37979 + .fifo_full = smart2_fifo_full,
37980 + .intr_pending = smart2_intr_pending,
37981 + .command_completed = smart2_completed,
37982 };
37983
37984 /*
37985 @@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
37986 }
37987
37988 static struct access_method smart2e_access = {
37989 - smart2e_submit_command,
37990 - smart2e_intr_mask,
37991 - smart2e_fifo_full,
37992 - smart2e_intr_pending,
37993 - smart2e_completed,
37994 + .submit_command = smart2e_submit_command,
37995 + .set_intr_mask = smart2e_intr_mask,
37996 + .fifo_full = smart2e_fifo_full,
37997 + .intr_pending = smart2e_intr_pending,
37998 + .command_completed = smart2e_completed,
37999 };
38000
38001 /*
38002 @@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38003 }
38004
38005 static struct access_method smart1_access = {
38006 - smart1_submit_command,
38007 - smart1_intr_mask,
38008 - smart1_fifo_full,
38009 - smart1_intr_pending,
38010 - smart1_completed,
38011 + .submit_command = smart1_submit_command,
38012 + .set_intr_mask = smart1_intr_mask,
38013 + .fifo_full = smart1_fifo_full,
38014 + .intr_pending = smart1_intr_pending,
38015 + .command_completed = smart1_completed,
38016 };
38017 diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38018 index f038dba..bb74c08 100644
38019 --- a/drivers/bluetooth/btwilink.c
38020 +++ b/drivers/bluetooth/btwilink.c
38021 @@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38022
38023 static int bt_ti_probe(struct platform_device *pdev)
38024 {
38025 - static struct ti_st *hst;
38026 + struct ti_st *hst;
38027 struct hci_dev *hdev;
38028 int err;
38029
38030 diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38031 index 8a3aff7..d7538c2 100644
38032 --- a/drivers/cdrom/cdrom.c
38033 +++ b/drivers/cdrom/cdrom.c
38034 @@ -416,7 +416,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38035 ENSURE(reset, CDC_RESET);
38036 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38037 cdi->mc_flags = 0;
38038 - cdo->n_minors = 0;
38039 cdi->options = CDO_USE_FFLAGS;
38040
38041 if (autoclose==1 && CDROM_CAN(CDC_CLOSE_TRAY))
38042 @@ -436,8 +435,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38043 else
38044 cdi->cdda_method = CDDA_OLD;
38045
38046 - if (!cdo->generic_packet)
38047 - cdo->generic_packet = cdrom_dummy_generic_packet;
38048 + if (!cdo->generic_packet) {
38049 + pax_open_kernel();
38050 + *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38051 + pax_close_kernel();
38052 + }
38053
38054 cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38055 mutex_lock(&cdrom_mutex);
38056 @@ -458,7 +460,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38057 if (cdi->exit)
38058 cdi->exit(cdi);
38059
38060 - cdi->ops->n_minors--;
38061 cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38062 }
38063
38064 @@ -2107,7 +2108,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38065 */
38066 nr = nframes;
38067 do {
38068 - cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38069 + cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38070 if (cgc.buffer)
38071 break;
38072
38073 @@ -3429,7 +3430,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38074 struct cdrom_device_info *cdi;
38075 int ret;
38076
38077 - ret = scnprintf(info + *pos, max_size - *pos, header);
38078 + ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38079 if (!ret)
38080 return 1;
38081
38082 diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38083 index 51e75ad..39c4c76 100644
38084 --- a/drivers/cdrom/gdrom.c
38085 +++ b/drivers/cdrom/gdrom.c
38086 @@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38087 .audio_ioctl = gdrom_audio_ioctl,
38088 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38089 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38090 - .n_minors = 1,
38091 };
38092
38093 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38094 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38095 index 1386749..5430258 100644
38096 --- a/drivers/char/Kconfig
38097 +++ b/drivers/char/Kconfig
38098 @@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
38099
38100 config DEVKMEM
38101 bool "/dev/kmem virtual device support"
38102 - default y
38103 + default n
38104 + depends on !GRKERNSEC_KMEM
38105 help
38106 Say Y here if you want to support the /dev/kmem device. The
38107 /dev/kmem device is rarely used, but can be used for certain
38108 @@ -577,6 +578,7 @@ config DEVPORT
38109 bool
38110 depends on !M68K
38111 depends on ISA || PCI
38112 + depends on !GRKERNSEC_KMEM
38113 default y
38114
38115 source "drivers/s390/char/Kconfig"
38116 diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38117 index a48e05b..6bac831 100644
38118 --- a/drivers/char/agp/compat_ioctl.c
38119 +++ b/drivers/char/agp/compat_ioctl.c
38120 @@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38121 return -ENOMEM;
38122 }
38123
38124 - if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38125 + if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38126 sizeof(*usegment) * ureserve.seg_count)) {
38127 kfree(usegment);
38128 kfree(ksegment);
38129 diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38130 index 1b19239..b87b143 100644
38131 --- a/drivers/char/agp/frontend.c
38132 +++ b/drivers/char/agp/frontend.c
38133 @@ -819,7 +819,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38134 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38135 return -EFAULT;
38136
38137 - if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38138 + if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38139 return -EFAULT;
38140
38141 client = agp_find_client_by_pid(reserve.pid);
38142 @@ -849,7 +849,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38143 if (segment == NULL)
38144 return -ENOMEM;
38145
38146 - if (copy_from_user(segment, (void __user *) reserve.seg_list,
38147 + if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38148 sizeof(struct agp_segment) * reserve.seg_count)) {
38149 kfree(segment);
38150 return -EFAULT;
38151 diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38152 index 4f94375..413694e 100644
38153 --- a/drivers/char/genrtc.c
38154 +++ b/drivers/char/genrtc.c
38155 @@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38156 switch (cmd) {
38157
38158 case RTC_PLL_GET:
38159 + memset(&pll, 0, sizeof(pll));
38160 if (get_rtc_pll(&pll))
38161 return -EINVAL;
38162 else
38163 diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38164 index d5d4cd8..22d561d 100644
38165 --- a/drivers/char/hpet.c
38166 +++ b/drivers/char/hpet.c
38167 @@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38168 }
38169
38170 static int
38171 -hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38172 +hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38173 struct hpet_info *info)
38174 {
38175 struct hpet_timer __iomem *timer;
38176 diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c
38177 index 86fe45c..c0ea948 100644
38178 --- a/drivers/char/hw_random/intel-rng.c
38179 +++ b/drivers/char/hw_random/intel-rng.c
38180 @@ -314,7 +314,7 @@ PFX "RNG, try using the 'no_fwh_detect' option.\n";
38181
38182 if (no_fwh_detect)
38183 return -ENODEV;
38184 - printk(warning);
38185 + printk("%s", warning);
38186 return -EBUSY;
38187 }
38188
38189 diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38190 index ec4e10f..f2a763b 100644
38191 --- a/drivers/char/ipmi/ipmi_msghandler.c
38192 +++ b/drivers/char/ipmi/ipmi_msghandler.c
38193 @@ -420,7 +420,7 @@ struct ipmi_smi {
38194 struct proc_dir_entry *proc_dir;
38195 char proc_dir_name[10];
38196
38197 - atomic_t stats[IPMI_NUM_STATS];
38198 + atomic_unchecked_t stats[IPMI_NUM_STATS];
38199
38200 /*
38201 * run_to_completion duplicate of smb_info, smi_info
38202 @@ -453,9 +453,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
38203
38204
38205 #define ipmi_inc_stat(intf, stat) \
38206 - atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38207 + atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38208 #define ipmi_get_stat(intf, stat) \
38209 - ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
38210 + ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
38211
38212 static int is_lan_addr(struct ipmi_addr *addr)
38213 {
38214 @@ -2883,7 +2883,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
38215 INIT_LIST_HEAD(&intf->cmd_rcvrs);
38216 init_waitqueue_head(&intf->waitq);
38217 for (i = 0; i < IPMI_NUM_STATS; i++)
38218 - atomic_set(&intf->stats[i], 0);
38219 + atomic_set_unchecked(&intf->stats[i], 0);
38220
38221 intf->proc_dir = NULL;
38222
38223 diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
38224 index 03f4189..e79f5e0 100644
38225 --- a/drivers/char/ipmi/ipmi_si_intf.c
38226 +++ b/drivers/char/ipmi/ipmi_si_intf.c
38227 @@ -280,7 +280,7 @@ struct smi_info {
38228 unsigned char slave_addr;
38229
38230 /* Counters and things for the proc filesystem. */
38231 - atomic_t stats[SI_NUM_STATS];
38232 + atomic_unchecked_t stats[SI_NUM_STATS];
38233
38234 struct task_struct *thread;
38235
38236 @@ -289,9 +289,9 @@ struct smi_info {
38237 };
38238
38239 #define smi_inc_stat(smi, stat) \
38240 - atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
38241 + atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
38242 #define smi_get_stat(smi, stat) \
38243 - ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
38244 + ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
38245
38246 #define SI_MAX_PARMS 4
38247
38248 @@ -3339,7 +3339,7 @@ static int try_smi_init(struct smi_info *new_smi)
38249 atomic_set(&new_smi->req_events, 0);
38250 new_smi->run_to_completion = 0;
38251 for (i = 0; i < SI_NUM_STATS; i++)
38252 - atomic_set(&new_smi->stats[i], 0);
38253 + atomic_set_unchecked(&new_smi->stats[i], 0);
38254
38255 new_smi->interrupt_disabled = 1;
38256 atomic_set(&new_smi->stop_operation, 0);
38257 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
38258 index 92c5937..1be4e4d 100644
38259 --- a/drivers/char/mem.c
38260 +++ b/drivers/char/mem.c
38261 @@ -18,6 +18,7 @@
38262 #include <linux/raw.h>
38263 #include <linux/tty.h>
38264 #include <linux/capability.h>
38265 +#include <linux/security.h>
38266 #include <linux/ptrace.h>
38267 #include <linux/device.h>
38268 #include <linux/highmem.h>
38269 @@ -36,6 +37,10 @@
38270
38271 #define DEVPORT_MINOR 4
38272
38273 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38274 +extern const struct file_operations grsec_fops;
38275 +#endif
38276 +
38277 static inline unsigned long size_inside_page(unsigned long start,
38278 unsigned long size)
38279 {
38280 @@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38281
38282 while (cursor < to) {
38283 if (!devmem_is_allowed(pfn)) {
38284 +#ifdef CONFIG_GRKERNSEC_KMEM
38285 + gr_handle_mem_readwrite(from, to);
38286 +#else
38287 printk(KERN_INFO
38288 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
38289 current->comm, from, to);
38290 +#endif
38291 return 0;
38292 }
38293 cursor += PAGE_SIZE;
38294 @@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38295 }
38296 return 1;
38297 }
38298 +#elif defined(CONFIG_GRKERNSEC_KMEM)
38299 +static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38300 +{
38301 + return 0;
38302 +}
38303 #else
38304 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38305 {
38306 @@ -119,6 +133,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38307
38308 while (count > 0) {
38309 unsigned long remaining;
38310 + char *temp;
38311
38312 sz = size_inside_page(p, count);
38313
38314 @@ -134,7 +149,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38315 if (!ptr)
38316 return -EFAULT;
38317
38318 - remaining = copy_to_user(buf, ptr, sz);
38319 +#ifdef CONFIG_PAX_USERCOPY
38320 + temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38321 + if (!temp) {
38322 + unxlate_dev_mem_ptr(p, ptr);
38323 + return -ENOMEM;
38324 + }
38325 + memcpy(temp, ptr, sz);
38326 +#else
38327 + temp = ptr;
38328 +#endif
38329 +
38330 + remaining = copy_to_user(buf, temp, sz);
38331 +
38332 +#ifdef CONFIG_PAX_USERCOPY
38333 + kfree(temp);
38334 +#endif
38335 +
38336 unxlate_dev_mem_ptr(p, ptr);
38337 if (remaining)
38338 return -EFAULT;
38339 @@ -363,9 +394,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38340 size_t count, loff_t *ppos)
38341 {
38342 unsigned long p = *ppos;
38343 - ssize_t low_count, read, sz;
38344 + ssize_t low_count, read, sz, err = 0;
38345 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
38346 - int err = 0;
38347
38348 read = 0;
38349 if (p < (unsigned long) high_memory) {
38350 @@ -387,6 +417,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38351 }
38352 #endif
38353 while (low_count > 0) {
38354 + char *temp;
38355 +
38356 sz = size_inside_page(p, low_count);
38357
38358 /*
38359 @@ -396,7 +428,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38360 */
38361 kbuf = xlate_dev_kmem_ptr((char *)p);
38362
38363 - if (copy_to_user(buf, kbuf, sz))
38364 +#ifdef CONFIG_PAX_USERCOPY
38365 + temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38366 + if (!temp)
38367 + return -ENOMEM;
38368 + memcpy(temp, kbuf, sz);
38369 +#else
38370 + temp = kbuf;
38371 +#endif
38372 +
38373 + err = copy_to_user(buf, temp, sz);
38374 +
38375 +#ifdef CONFIG_PAX_USERCOPY
38376 + kfree(temp);
38377 +#endif
38378 +
38379 + if (err)
38380 return -EFAULT;
38381 buf += sz;
38382 p += sz;
38383 @@ -821,6 +868,9 @@ static const struct memdev {
38384 #ifdef CONFIG_PRINTK
38385 [11] = { "kmsg", 0644, &kmsg_fops, NULL },
38386 #endif
38387 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38388 + [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
38389 +#endif
38390 };
38391
38392 static int memory_open(struct inode *inode, struct file *filp)
38393 @@ -892,7 +942,7 @@ static int __init chr_dev_init(void)
38394 continue;
38395
38396 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
38397 - NULL, devlist[minor].name);
38398 + NULL, "%s", devlist[minor].name);
38399 }
38400
38401 return tty_init();
38402 diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
38403 index 9df78e2..01ba9ae 100644
38404 --- a/drivers/char/nvram.c
38405 +++ b/drivers/char/nvram.c
38406 @@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
38407
38408 spin_unlock_irq(&rtc_lock);
38409
38410 - if (copy_to_user(buf, contents, tmp - contents))
38411 + if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
38412 return -EFAULT;
38413
38414 *ppos = i;
38415 diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
38416 index 8320abd..ec48108 100644
38417 --- a/drivers/char/pcmcia/synclink_cs.c
38418 +++ b/drivers/char/pcmcia/synclink_cs.c
38419 @@ -2345,9 +2345,9 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38420
38421 if (debug_level >= DEBUG_LEVEL_INFO)
38422 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
38423 - __FILE__, __LINE__, info->device_name, port->count);
38424 + __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
38425
38426 - WARN_ON(!port->count);
38427 + WARN_ON(!atomic_read(&port->count));
38428
38429 if (tty_port_close_start(port, tty, filp) == 0)
38430 goto cleanup;
38431 @@ -2365,7 +2365,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38432 cleanup:
38433 if (debug_level >= DEBUG_LEVEL_INFO)
38434 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
38435 - tty->driver->name, port->count);
38436 + tty->driver->name, atomic_read(&port->count));
38437 }
38438
38439 /* Wait until the transmitter is empty.
38440 @@ -2507,7 +2507,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38441
38442 if (debug_level >= DEBUG_LEVEL_INFO)
38443 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
38444 - __FILE__, __LINE__, tty->driver->name, port->count);
38445 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
38446
38447 /* If port is closing, signal caller to try again */
38448 if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING){
38449 @@ -2527,11 +2527,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38450 goto cleanup;
38451 }
38452 spin_lock(&port->lock);
38453 - port->count++;
38454 + atomic_inc(&port->count);
38455 spin_unlock(&port->lock);
38456 spin_unlock_irqrestore(&info->netlock, flags);
38457
38458 - if (port->count == 1) {
38459 + if (atomic_read(&port->count) == 1) {
38460 /* 1st open on this device, init hardware */
38461 retval = startup(info, tty);
38462 if (retval < 0)
38463 @@ -3920,7 +3920,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
38464 unsigned short new_crctype;
38465
38466 /* return error if TTY interface open */
38467 - if (info->port.count)
38468 + if (atomic_read(&info->port.count))
38469 return -EBUSY;
38470
38471 switch (encoding)
38472 @@ -4024,7 +4024,7 @@ static int hdlcdev_open(struct net_device *dev)
38473
38474 /* arbitrate between network and tty opens */
38475 spin_lock_irqsave(&info->netlock, flags);
38476 - if (info->port.count != 0 || info->netcount != 0) {
38477 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
38478 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
38479 spin_unlock_irqrestore(&info->netlock, flags);
38480 return -EBUSY;
38481 @@ -4114,7 +4114,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
38482 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
38483
38484 /* return error if TTY interface open */
38485 - if (info->port.count)
38486 + if (atomic_read(&info->port.count))
38487 return -EBUSY;
38488
38489 if (cmd != SIOCWANDEV)
38490 diff --git a/drivers/char/random.c b/drivers/char/random.c
38491 index 429b75b..a7f4145 100644
38492 --- a/drivers/char/random.c
38493 +++ b/drivers/char/random.c
38494 @@ -270,10 +270,17 @@
38495 /*
38496 * Configuration information
38497 */
38498 +#ifdef CONFIG_GRKERNSEC_RANDNET
38499 +#define INPUT_POOL_SHIFT 14
38500 +#define INPUT_POOL_WORDS (1 << (INPUT_POOL_SHIFT-5))
38501 +#define OUTPUT_POOL_SHIFT 12
38502 +#define OUTPUT_POOL_WORDS (1 << (OUTPUT_POOL_SHIFT-5))
38503 +#else
38504 #define INPUT_POOL_SHIFT 12
38505 #define INPUT_POOL_WORDS (1 << (INPUT_POOL_SHIFT-5))
38506 #define OUTPUT_POOL_SHIFT 10
38507 #define OUTPUT_POOL_WORDS (1 << (OUTPUT_POOL_SHIFT-5))
38508 +#endif
38509 #define SEC_XFER_SIZE 512
38510 #define EXTRACT_SIZE 10
38511
38512 @@ -284,9 +291,6 @@
38513 /*
38514 * To allow fractional bits to be tracked, the entropy_count field is
38515 * denominated in units of 1/8th bits.
38516 - *
38517 - * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
38518 - * credit_entropy_bits() needs to be 64 bits wide.
38519 */
38520 #define ENTROPY_SHIFT 3
38521 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
38522 @@ -361,12 +365,19 @@ static struct poolinfo {
38523 #define S(x) ilog2(x)+5, (x), (x)*4, (x)*32, (x) << (ENTROPY_SHIFT+5)
38524 int tap1, tap2, tap3, tap4, tap5;
38525 } poolinfo_table[] = {
38526 +#ifdef CONFIG_GRKERNSEC_RANDNET
38527 + /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */
38528 + { S(512), 411, 308, 208, 104, 1 },
38529 + /* x^128 + x^104 + x^76 + x^51 + x^25 + x + 1 -- 105 */
38530 + { S(128), 104, 76, 51, 25, 1 },
38531 +#else
38532 /* was: x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 */
38533 /* x^128 + x^104 + x^76 + x^51 +x^25 + x + 1 */
38534 { S(128), 104, 76, 51, 25, 1 },
38535 /* was: x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 */
38536 /* x^32 + x^26 + x^19 + x^14 + x^7 + x + 1 */
38537 { S(32), 26, 19, 14, 7, 1 },
38538 +#endif
38539 #if 0
38540 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
38541 { S(2048), 1638, 1231, 819, 411, 1 },
38542 @@ -433,9 +444,9 @@ struct entropy_store {
38543 };
38544
38545 static void push_to_pool(struct work_struct *work);
38546 -static __u32 input_pool_data[INPUT_POOL_WORDS];
38547 -static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
38548 -static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
38549 +static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
38550 +static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
38551 +static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
38552
38553 static struct entropy_store input_pool = {
38554 .poolinfo = &poolinfo_table[0],
38555 @@ -524,8 +535,8 @@ static void _mix_pool_bytes(struct entropy_store *r, const void *in,
38556 input_rotate = (input_rotate + (i ? 7 : 14)) & 31;
38557 }
38558
38559 - ACCESS_ONCE(r->input_rotate) = input_rotate;
38560 - ACCESS_ONCE(r->add_ptr) = i;
38561 + ACCESS_ONCE_RW(r->input_rotate) = input_rotate;
38562 + ACCESS_ONCE_RW(r->add_ptr) = i;
38563 smp_wmb();
38564
38565 if (out)
38566 @@ -632,7 +643,7 @@ retry:
38567 /* The +2 corresponds to the /4 in the denominator */
38568
38569 do {
38570 - unsigned int anfrac = min(pnfrac, pool_size/2);
38571 + u64 anfrac = min(pnfrac, pool_size/2);
38572 unsigned int add =
38573 ((pool_size - entropy_count)*anfrac*3) >> s;
38574
38575 @@ -1151,7 +1162,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
38576
38577 extract_buf(r, tmp);
38578 i = min_t(int, nbytes, EXTRACT_SIZE);
38579 - if (copy_to_user(buf, tmp, i)) {
38580 + if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
38581 ret = -EFAULT;
38582 break;
38583 }
38584 @@ -1507,7 +1518,7 @@ EXPORT_SYMBOL(generate_random_uuid);
38585 #include <linux/sysctl.h>
38586
38587 static int min_read_thresh = 8, min_write_thresh;
38588 -static int max_read_thresh = INPUT_POOL_WORDS * 32;
38589 +static int max_read_thresh = OUTPUT_POOL_WORDS * 32;
38590 static int max_write_thresh = INPUT_POOL_WORDS * 32;
38591 static char sysctl_bootid[16];
38592
38593 @@ -1523,7 +1534,7 @@ static char sysctl_bootid[16];
38594 static int proc_do_uuid(struct ctl_table *table, int write,
38595 void __user *buffer, size_t *lenp, loff_t *ppos)
38596 {
38597 - struct ctl_table fake_table;
38598 + ctl_table_no_const fake_table;
38599 unsigned char buf[64], tmp_uuid[16], *uuid;
38600
38601 uuid = table->data;
38602 @@ -1553,7 +1564,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
38603 static int proc_do_entropy(ctl_table *table, int write,
38604 void __user *buffer, size_t *lenp, loff_t *ppos)
38605 {
38606 - ctl_table fake_table;
38607 + ctl_table_no_const fake_table;
38608 int entropy_count;
38609
38610 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
38611 diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
38612 index 7cc1fe22..b602d6b 100644
38613 --- a/drivers/char/sonypi.c
38614 +++ b/drivers/char/sonypi.c
38615 @@ -54,6 +54,7 @@
38616
38617 #include <asm/uaccess.h>
38618 #include <asm/io.h>
38619 +#include <asm/local.h>
38620
38621 #include <linux/sonypi.h>
38622
38623 @@ -490,7 +491,7 @@ static struct sonypi_device {
38624 spinlock_t fifo_lock;
38625 wait_queue_head_t fifo_proc_list;
38626 struct fasync_struct *fifo_async;
38627 - int open_count;
38628 + local_t open_count;
38629 int model;
38630 struct input_dev *input_jog_dev;
38631 struct input_dev *input_key_dev;
38632 @@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
38633 static int sonypi_misc_release(struct inode *inode, struct file *file)
38634 {
38635 mutex_lock(&sonypi_device.lock);
38636 - sonypi_device.open_count--;
38637 + local_dec(&sonypi_device.open_count);
38638 mutex_unlock(&sonypi_device.lock);
38639 return 0;
38640 }
38641 @@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
38642 {
38643 mutex_lock(&sonypi_device.lock);
38644 /* Flush input queue on first open */
38645 - if (!sonypi_device.open_count)
38646 + if (!local_read(&sonypi_device.open_count))
38647 kfifo_reset(&sonypi_device.fifo);
38648 - sonypi_device.open_count++;
38649 + local_inc(&sonypi_device.open_count);
38650 mutex_unlock(&sonypi_device.lock);
38651
38652 return 0;
38653 diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
38654 index b9a57fa..5bb9e38 100644
38655 --- a/drivers/char/tpm/tpm_acpi.c
38656 +++ b/drivers/char/tpm/tpm_acpi.c
38657 @@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
38658 virt = acpi_os_map_memory(start, len);
38659 if (!virt) {
38660 kfree(log->bios_event_log);
38661 + log->bios_event_log = NULL;
38662 printk("%s: ERROR - Unable to map memory\n", __func__);
38663 return -EIO;
38664 }
38665
38666 - memcpy_fromio(log->bios_event_log, virt, len);
38667 + memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
38668
38669 acpi_os_unmap_memory(virt, len);
38670 return 0;
38671 diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
38672 index 59f7cb2..bac8b6d 100644
38673 --- a/drivers/char/tpm/tpm_eventlog.c
38674 +++ b/drivers/char/tpm/tpm_eventlog.c
38675 @@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
38676 event = addr;
38677
38678 if ((event->event_type == 0 && event->event_size == 0) ||
38679 - ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
38680 + (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
38681 return NULL;
38682
38683 return addr;
38684 @@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
38685 return NULL;
38686
38687 if ((event->event_type == 0 && event->event_size == 0) ||
38688 - ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
38689 + (event->event_size >= limit - v - sizeof(struct tcpa_event)))
38690 return NULL;
38691
38692 (*pos)++;
38693 @@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
38694 int i;
38695
38696 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
38697 - seq_putc(m, data[i]);
38698 + if (!seq_putc(m, data[i]))
38699 + return -EFAULT;
38700
38701 return 0;
38702 }
38703 diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
38704 index 6928d09..ff6abe8 100644
38705 --- a/drivers/char/virtio_console.c
38706 +++ b/drivers/char/virtio_console.c
38707 @@ -684,7 +684,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
38708 if (to_user) {
38709 ssize_t ret;
38710
38711 - ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
38712 + ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
38713 if (ret)
38714 return -EFAULT;
38715 } else {
38716 @@ -787,7 +787,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
38717 if (!port_has_data(port) && !port->host_connected)
38718 return 0;
38719
38720 - return fill_readbuf(port, ubuf, count, true);
38721 + return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
38722 }
38723
38724 static int wait_port_writable(struct port *port, bool nonblock)
38725 diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
38726 index 57a078e..c17cde8 100644
38727 --- a/drivers/clk/clk-composite.c
38728 +++ b/drivers/clk/clk-composite.c
38729 @@ -146,7 +146,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
38730 struct clk *clk;
38731 struct clk_init_data init;
38732 struct clk_composite *composite;
38733 - struct clk_ops *clk_composite_ops;
38734 + clk_ops_no_const *clk_composite_ops;
38735
38736 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
38737 if (!composite) {
38738 diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c
38739 index 5983a26..65d5f46 100644
38740 --- a/drivers/clk/socfpga/clk.c
38741 +++ b/drivers/clk/socfpga/clk.c
38742 @@ -22,6 +22,7 @@
38743 #include <linux/clk-provider.h>
38744 #include <linux/io.h>
38745 #include <linux/of.h>
38746 +#include <asm/pgtable.h>
38747
38748 /* Clock Manager offsets */
38749 #define CLKMGR_CTRL 0x0
38750 @@ -150,8 +151,10 @@ static __init struct clk *socfpga_clk_init(struct device_node *node,
38751 streq(clk_name, "periph_pll") ||
38752 streq(clk_name, "sdram_pll")) {
38753 socfpga_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
38754 - clk_pll_ops.enable = clk_gate_ops.enable;
38755 - clk_pll_ops.disable = clk_gate_ops.disable;
38756 + pax_open_kernel();
38757 + *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
38758 + *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
38759 + pax_close_kernel();
38760 }
38761
38762 clk = clk_register(NULL, &socfpga_clk->hw.hw);
38763 @@ -242,7 +245,7 @@ static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk,
38764 return parent_rate / div;
38765 }
38766
38767 -static struct clk_ops gateclk_ops = {
38768 +static clk_ops_no_const gateclk_ops __read_only = {
38769 .recalc_rate = socfpga_clk_recalc_rate,
38770 .get_parent = socfpga_clk_get_parent,
38771 .set_parent = socfpga_clk_set_parent,
38772 diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
38773 index 18448a7..d5fad43 100644
38774 --- a/drivers/cpufreq/acpi-cpufreq.c
38775 +++ b/drivers/cpufreq/acpi-cpufreq.c
38776 @@ -676,8 +676,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
38777 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
38778 per_cpu(acfreq_data, cpu) = data;
38779
38780 - if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
38781 - acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
38782 + if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
38783 + pax_open_kernel();
38784 + *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
38785 + pax_close_kernel();
38786 + }
38787
38788 result = acpi_processor_register_performance(data->acpi_data, cpu);
38789 if (result)
38790 @@ -810,7 +813,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
38791 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
38792 break;
38793 case ACPI_ADR_SPACE_FIXED_HARDWARE:
38794 - acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
38795 + pax_open_kernel();
38796 + *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
38797 + pax_close_kernel();
38798 break;
38799 default:
38800 break;
38801 @@ -905,8 +910,10 @@ static void __init acpi_cpufreq_boost_init(void)
38802 if (!msrs)
38803 return;
38804
38805 - acpi_cpufreq_driver.boost_supported = true;
38806 - acpi_cpufreq_driver.boost_enabled = boost_state(0);
38807 + pax_open_kernel();
38808 + *(bool *)&acpi_cpufreq_driver.boost_supported = true;
38809 + *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
38810 + pax_close_kernel();
38811 get_online_cpus();
38812
38813 /* Force all MSRs to the same value */
38814 diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
38815 index 199b52b..e3503bb 100644
38816 --- a/drivers/cpufreq/cpufreq.c
38817 +++ b/drivers/cpufreq/cpufreq.c
38818 @@ -1970,7 +1970,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
38819 #endif
38820
38821 mutex_lock(&cpufreq_governor_mutex);
38822 - list_del(&governor->governor_list);
38823 + pax_list_del(&governor->governor_list);
38824 mutex_unlock(&cpufreq_governor_mutex);
38825 return;
38826 }
38827 @@ -2200,7 +2200,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
38828 return NOTIFY_OK;
38829 }
38830
38831 -static struct notifier_block __refdata cpufreq_cpu_notifier = {
38832 +static struct notifier_block cpufreq_cpu_notifier = {
38833 .notifier_call = cpufreq_cpu_callback,
38834 };
38835
38836 @@ -2240,13 +2240,17 @@ int cpufreq_boost_trigger_state(int state)
38837 return 0;
38838
38839 write_lock_irqsave(&cpufreq_driver_lock, flags);
38840 - cpufreq_driver->boost_enabled = state;
38841 + pax_open_kernel();
38842 + *(bool *)&cpufreq_driver->boost_enabled = state;
38843 + pax_close_kernel();
38844 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
38845
38846 ret = cpufreq_driver->set_boost(state);
38847 if (ret) {
38848 write_lock_irqsave(&cpufreq_driver_lock, flags);
38849 - cpufreq_driver->boost_enabled = !state;
38850 + pax_open_kernel();
38851 + *(bool *)&cpufreq_driver->boost_enabled = !state;
38852 + pax_close_kernel();
38853 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
38854
38855 pr_err("%s: Cannot %s BOOST\n", __func__,
38856 @@ -2300,8 +2304,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
38857
38858 pr_debug("trying to register driver %s\n", driver_data->name);
38859
38860 - if (driver_data->setpolicy)
38861 - driver_data->flags |= CPUFREQ_CONST_LOOPS;
38862 + if (driver_data->setpolicy) {
38863 + pax_open_kernel();
38864 + *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
38865 + pax_close_kernel();
38866 + }
38867
38868 write_lock_irqsave(&cpufreq_driver_lock, flags);
38869 if (cpufreq_driver) {
38870 @@ -2316,8 +2323,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
38871 * Check if driver provides function to enable boost -
38872 * if not, use cpufreq_boost_set_sw as default
38873 */
38874 - if (!cpufreq_driver->set_boost)
38875 - cpufreq_driver->set_boost = cpufreq_boost_set_sw;
38876 + if (!cpufreq_driver->set_boost) {
38877 + pax_open_kernel();
38878 + *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
38879 + pax_close_kernel();
38880 + }
38881
38882 ret = cpufreq_sysfs_create_file(&boost.attr);
38883 if (ret) {
38884 diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
38885 index ba43991..23858ffb 100644
38886 --- a/drivers/cpufreq/cpufreq_governor.c
38887 +++ b/drivers/cpufreq/cpufreq_governor.c
38888 @@ -191,7 +191,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
38889 struct dbs_data *dbs_data;
38890 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
38891 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
38892 - struct od_ops *od_ops = NULL;
38893 + const struct od_ops *od_ops = NULL;
38894 struct od_dbs_tuners *od_tuners = NULL;
38895 struct cs_dbs_tuners *cs_tuners = NULL;
38896 struct cpu_dbs_common_info *cpu_cdbs;
38897 @@ -257,7 +257,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
38898
38899 if ((cdata->governor == GOV_CONSERVATIVE) &&
38900 (!policy->governor->initialized)) {
38901 - struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
38902 + const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
38903
38904 cpufreq_register_notifier(cs_ops->notifier_block,
38905 CPUFREQ_TRANSITION_NOTIFIER);
38906 @@ -277,7 +277,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
38907
38908 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
38909 (policy->governor->initialized == 1)) {
38910 - struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
38911 + const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
38912
38913 cpufreq_unregister_notifier(cs_ops->notifier_block,
38914 CPUFREQ_TRANSITION_NOTIFIER);
38915 diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
38916 index bfb9ae1..e1d3a7e 100644
38917 --- a/drivers/cpufreq/cpufreq_governor.h
38918 +++ b/drivers/cpufreq/cpufreq_governor.h
38919 @@ -205,7 +205,7 @@ struct common_dbs_data {
38920 void (*exit)(struct dbs_data *dbs_data);
38921
38922 /* Governor specific ops, see below */
38923 - void *gov_ops;
38924 + const void *gov_ops;
38925 };
38926
38927 /* Governor Per policy data */
38928 @@ -225,7 +225,7 @@ struct od_ops {
38929 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
38930 unsigned int freq_next, unsigned int relation);
38931 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
38932 -};
38933 +} __no_const;
38934
38935 struct cs_ops {
38936 struct notifier_block *notifier_block;
38937 diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
38938 index 18d4091..434be15 100644
38939 --- a/drivers/cpufreq/cpufreq_ondemand.c
38940 +++ b/drivers/cpufreq/cpufreq_ondemand.c
38941 @@ -521,7 +521,7 @@ static void od_exit(struct dbs_data *dbs_data)
38942
38943 define_get_cpu_dbs_routines(od_cpu_dbs_info);
38944
38945 -static struct od_ops od_ops = {
38946 +static struct od_ops od_ops __read_only = {
38947 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
38948 .powersave_bias_target = generic_powersave_bias_target,
38949 .freq_increase = dbs_freq_increase,
38950 @@ -576,14 +576,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
38951 (struct cpufreq_policy *, unsigned int, unsigned int),
38952 unsigned int powersave_bias)
38953 {
38954 - od_ops.powersave_bias_target = f;
38955 + pax_open_kernel();
38956 + *(void **)&od_ops.powersave_bias_target = f;
38957 + pax_close_kernel();
38958 od_set_powersave_bias(powersave_bias);
38959 }
38960 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
38961
38962 void od_unregister_powersave_bias_handler(void)
38963 {
38964 - od_ops.powersave_bias_target = generic_powersave_bias_target;
38965 + pax_open_kernel();
38966 + *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
38967 + pax_close_kernel();
38968 od_set_powersave_bias(0);
38969 }
38970 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
38971 diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
38972 index 2cd36b9..8f07fae 100644
38973 --- a/drivers/cpufreq/intel_pstate.c
38974 +++ b/drivers/cpufreq/intel_pstate.c
38975 @@ -124,10 +124,10 @@ struct pstate_funcs {
38976 struct cpu_defaults {
38977 struct pstate_adjust_policy pid_policy;
38978 struct pstate_funcs funcs;
38979 -};
38980 +} __do_const;
38981
38982 static struct pstate_adjust_policy pid_params;
38983 -static struct pstate_funcs pstate_funcs;
38984 +static struct pstate_funcs *pstate_funcs;
38985
38986 struct perf_limits {
38987 int no_turbo;
38988 @@ -518,7 +518,7 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
38989
38990 cpu->pstate.current_pstate = pstate;
38991
38992 - pstate_funcs.set(cpu, pstate);
38993 + pstate_funcs->set(cpu, pstate);
38994 }
38995
38996 static inline void intel_pstate_pstate_increase(struct cpudata *cpu, int steps)
38997 @@ -540,12 +540,12 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
38998 {
38999 sprintf(cpu->name, "Intel 2nd generation core");
39000
39001 - cpu->pstate.min_pstate = pstate_funcs.get_min();
39002 - cpu->pstate.max_pstate = pstate_funcs.get_max();
39003 - cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39004 + cpu->pstate.min_pstate = pstate_funcs->get_min();
39005 + cpu->pstate.max_pstate = pstate_funcs->get_max();
39006 + cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39007
39008 - if (pstate_funcs.get_vid)
39009 - pstate_funcs.get_vid(cpu);
39010 + if (pstate_funcs->get_vid)
39011 + pstate_funcs->get_vid(cpu);
39012
39013 /*
39014 * goto max pstate so we don't slow up boot if we are built-in if we are
39015 @@ -832,9 +832,9 @@ static int intel_pstate_msrs_not_valid(void)
39016 rdmsrl(MSR_IA32_APERF, aperf);
39017 rdmsrl(MSR_IA32_MPERF, mperf);
39018
39019 - if (!pstate_funcs.get_max() ||
39020 - !pstate_funcs.get_min() ||
39021 - !pstate_funcs.get_turbo())
39022 + if (!pstate_funcs->get_max() ||
39023 + !pstate_funcs->get_min() ||
39024 + !pstate_funcs->get_turbo())
39025 return -ENODEV;
39026
39027 rdmsrl(MSR_IA32_APERF, tmp);
39028 @@ -848,7 +848,7 @@ static int intel_pstate_msrs_not_valid(void)
39029 return 0;
39030 }
39031
39032 -static void copy_pid_params(struct pstate_adjust_policy *policy)
39033 +static void copy_pid_params(const struct pstate_adjust_policy *policy)
39034 {
39035 pid_params.sample_rate_ms = policy->sample_rate_ms;
39036 pid_params.p_gain_pct = policy->p_gain_pct;
39037 @@ -860,11 +860,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39038
39039 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39040 {
39041 - pstate_funcs.get_max = funcs->get_max;
39042 - pstate_funcs.get_min = funcs->get_min;
39043 - pstate_funcs.get_turbo = funcs->get_turbo;
39044 - pstate_funcs.set = funcs->set;
39045 - pstate_funcs.get_vid = funcs->get_vid;
39046 + pstate_funcs = funcs;
39047 }
39048
39049 #if IS_ENABLED(CONFIG_ACPI)
39050 diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
39051 index 3d1cba9..0ab21d2 100644
39052 --- a/drivers/cpufreq/p4-clockmod.c
39053 +++ b/drivers/cpufreq/p4-clockmod.c
39054 @@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39055 case 0x0F: /* Core Duo */
39056 case 0x16: /* Celeron Core */
39057 case 0x1C: /* Atom */
39058 - p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39059 + pax_open_kernel();
39060 + *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39061 + pax_close_kernel();
39062 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
39063 case 0x0D: /* Pentium M (Dothan) */
39064 - p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39065 + pax_open_kernel();
39066 + *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39067 + pax_close_kernel();
39068 /* fall through */
39069 case 0x09: /* Pentium M (Banias) */
39070 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
39071 @@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39072
39073 /* on P-4s, the TSC runs with constant frequency independent whether
39074 * throttling is active or not. */
39075 - p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39076 + pax_open_kernel();
39077 + *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39078 + pax_close_kernel();
39079
39080 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
39081 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
39082 diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
39083 index 724ffbd..ad83692 100644
39084 --- a/drivers/cpufreq/sparc-us3-cpufreq.c
39085 +++ b/drivers/cpufreq/sparc-us3-cpufreq.c
39086 @@ -18,14 +18,12 @@
39087 #include <asm/head.h>
39088 #include <asm/timer.h>
39089
39090 -static struct cpufreq_driver *cpufreq_us3_driver;
39091 -
39092 struct us3_freq_percpu_info {
39093 struct cpufreq_frequency_table table[4];
39094 };
39095
39096 /* Indexed by cpu number. */
39097 -static struct us3_freq_percpu_info *us3_freq_table;
39098 +static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
39099
39100 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
39101 * in the Safari config register.
39102 @@ -156,14 +154,26 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
39103
39104 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
39105 {
39106 - if (cpufreq_us3_driver) {
39107 - cpufreq_frequency_table_put_attr(policy->cpu);
39108 - us3_freq_target(policy, 0);
39109 - }
39110 + cpufreq_frequency_table_put_attr(policy->cpu);
39111 + us3_freq_target(policy, 0);
39112
39113 return 0;
39114 }
39115
39116 +static int __init us3_freq_init(void);
39117 +static void __exit us3_freq_exit(void);
39118 +
39119 +static struct cpufreq_driver cpufreq_us3_driver = {
39120 + .init = us3_freq_cpu_init,
39121 + .verify = cpufreq_generic_frequency_table_verify,
39122 + .target_index = us3_freq_target,
39123 + .get = us3_freq_get,
39124 + .exit = us3_freq_cpu_exit,
39125 + .owner = THIS_MODULE,
39126 + .name = "UltraSPARC-III",
39127 +
39128 +};
39129 +
39130 static int __init us3_freq_init(void)
39131 {
39132 unsigned long manuf, impl, ver;
39133 @@ -180,55 +190,15 @@ static int __init us3_freq_init(void)
39134 (impl == CHEETAH_IMPL ||
39135 impl == CHEETAH_PLUS_IMPL ||
39136 impl == JAGUAR_IMPL ||
39137 - impl == PANTHER_IMPL)) {
39138 - struct cpufreq_driver *driver;
39139 -
39140 - ret = -ENOMEM;
39141 - driver = kzalloc(sizeof(*driver), GFP_KERNEL);
39142 - if (!driver)
39143 - goto err_out;
39144 -
39145 - us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
39146 - GFP_KERNEL);
39147 - if (!us3_freq_table)
39148 - goto err_out;
39149 -
39150 - driver->init = us3_freq_cpu_init;
39151 - driver->verify = cpufreq_generic_frequency_table_verify;
39152 - driver->target_index = us3_freq_target;
39153 - driver->get = us3_freq_get;
39154 - driver->exit = us3_freq_cpu_exit;
39155 - strcpy(driver->name, "UltraSPARC-III");
39156 -
39157 - cpufreq_us3_driver = driver;
39158 - ret = cpufreq_register_driver(driver);
39159 - if (ret)
39160 - goto err_out;
39161 -
39162 - return 0;
39163 -
39164 -err_out:
39165 - if (driver) {
39166 - kfree(driver);
39167 - cpufreq_us3_driver = NULL;
39168 - }
39169 - kfree(us3_freq_table);
39170 - us3_freq_table = NULL;
39171 - return ret;
39172 - }
39173 + impl == PANTHER_IMPL))
39174 + return cpufreq_register_driver(&cpufreq_us3_driver);
39175
39176 return -ENODEV;
39177 }
39178
39179 static void __exit us3_freq_exit(void)
39180 {
39181 - if (cpufreq_us3_driver) {
39182 - cpufreq_unregister_driver(cpufreq_us3_driver);
39183 - kfree(cpufreq_us3_driver);
39184 - cpufreq_us3_driver = NULL;
39185 - kfree(us3_freq_table);
39186 - us3_freq_table = NULL;
39187 - }
39188 + cpufreq_unregister_driver(&cpufreq_us3_driver);
39189 }
39190
39191 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
39192 diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
39193 index 4e1daca..e707b61 100644
39194 --- a/drivers/cpufreq/speedstep-centrino.c
39195 +++ b/drivers/cpufreq/speedstep-centrino.c
39196 @@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
39197 !cpu_has(cpu, X86_FEATURE_EST))
39198 return -ENODEV;
39199
39200 - if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
39201 - centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39202 + if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
39203 + pax_open_kernel();
39204 + *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39205 + pax_close_kernel();
39206 + }
39207
39208 if (policy->cpu != 0)
39209 return -ENODEV;
39210 diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
39211 index 06dbe7c..c2c8671 100644
39212 --- a/drivers/cpuidle/driver.c
39213 +++ b/drivers/cpuidle/driver.c
39214 @@ -202,7 +202,7 @@ static int poll_idle(struct cpuidle_device *dev,
39215
39216 static void poll_idle_init(struct cpuidle_driver *drv)
39217 {
39218 - struct cpuidle_state *state = &drv->states[0];
39219 + cpuidle_state_no_const *state = &drv->states[0];
39220
39221 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
39222 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
39223 diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
39224 index ca89412..a7b9c49 100644
39225 --- a/drivers/cpuidle/governor.c
39226 +++ b/drivers/cpuidle/governor.c
39227 @@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
39228 mutex_lock(&cpuidle_lock);
39229 if (__cpuidle_find_governor(gov->name) == NULL) {
39230 ret = 0;
39231 - list_add_tail(&gov->governor_list, &cpuidle_governors);
39232 + pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
39233 if (!cpuidle_curr_governor ||
39234 cpuidle_curr_governor->rating < gov->rating)
39235 cpuidle_switch_governor(gov);
39236 diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
39237 index e918b6d..f87ea80 100644
39238 --- a/drivers/cpuidle/sysfs.c
39239 +++ b/drivers/cpuidle/sysfs.c
39240 @@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
39241 NULL
39242 };
39243
39244 -static struct attribute_group cpuidle_attr_group = {
39245 +static attribute_group_no_const cpuidle_attr_group = {
39246 .attrs = cpuidle_default_attrs,
39247 .name = "cpuidle",
39248 };
39249 diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
39250 index 12fea3e..1e28f47 100644
39251 --- a/drivers/crypto/hifn_795x.c
39252 +++ b/drivers/crypto/hifn_795x.c
39253 @@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
39254 MODULE_PARM_DESC(hifn_pll_ref,
39255 "PLL reference clock (pci[freq] or ext[freq], default ext)");
39256
39257 -static atomic_t hifn_dev_number;
39258 +static atomic_unchecked_t hifn_dev_number;
39259
39260 #define ACRYPTO_OP_DECRYPT 0
39261 #define ACRYPTO_OP_ENCRYPT 1
39262 @@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
39263 goto err_out_disable_pci_device;
39264
39265 snprintf(name, sizeof(name), "hifn%d",
39266 - atomic_inc_return(&hifn_dev_number)-1);
39267 + atomic_inc_return_unchecked(&hifn_dev_number)-1);
39268
39269 err = pci_request_regions(pdev, name);
39270 if (err)
39271 diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
39272 index a0b2f7e..1b6f028 100644
39273 --- a/drivers/devfreq/devfreq.c
39274 +++ b/drivers/devfreq/devfreq.c
39275 @@ -607,7 +607,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
39276 goto err_out;
39277 }
39278
39279 - list_add(&governor->node, &devfreq_governor_list);
39280 + pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
39281
39282 list_for_each_entry(devfreq, &devfreq_list, node) {
39283 int ret = 0;
39284 @@ -695,7 +695,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
39285 }
39286 }
39287
39288 - list_del(&governor->node);
39289 + pax_list_del((struct list_head *)&governor->node);
39290 err_out:
39291 mutex_unlock(&devfreq_list_lock);
39292
39293 diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
39294 index 2e7b394..1371a64 100644
39295 --- a/drivers/dma/sh/shdma-base.c
39296 +++ b/drivers/dma/sh/shdma-base.c
39297 @@ -267,8 +267,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
39298 schan->slave_id = -EINVAL;
39299 }
39300
39301 - schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
39302 - sdev->desc_size, GFP_KERNEL);
39303 + schan->desc = kcalloc(sdev->desc_size,
39304 + NR_DESCS_PER_CHANNEL, GFP_KERNEL);
39305 if (!schan->desc) {
39306 ret = -ENOMEM;
39307 goto edescalloc;
39308 diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
39309 index 0d765c0..60b7480 100644
39310 --- a/drivers/dma/sh/shdmac.c
39311 +++ b/drivers/dma/sh/shdmac.c
39312 @@ -511,7 +511,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
39313 return ret;
39314 }
39315
39316 -static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
39317 +static struct notifier_block sh_dmae_nmi_notifier = {
39318 .notifier_call = sh_dmae_nmi_handler,
39319
39320 /* Run before NMI debug handler and KGDB */
39321 diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
39322 index 592af5f..bb1d583 100644
39323 --- a/drivers/edac/edac_device.c
39324 +++ b/drivers/edac/edac_device.c
39325 @@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
39326 */
39327 int edac_device_alloc_index(void)
39328 {
39329 - static atomic_t device_indexes = ATOMIC_INIT(0);
39330 + static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
39331
39332 - return atomic_inc_return(&device_indexes) - 1;
39333 + return atomic_inc_return_unchecked(&device_indexes) - 1;
39334 }
39335 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
39336
39337 diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
39338 index b335c6a..db65b44 100644
39339 --- a/drivers/edac/edac_mc_sysfs.c
39340 +++ b/drivers/edac/edac_mc_sysfs.c
39341 @@ -152,7 +152,7 @@ static const char * const edac_caps[] = {
39342 struct dev_ch_attribute {
39343 struct device_attribute attr;
39344 int channel;
39345 -};
39346 +} __do_const;
39347
39348 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
39349 struct dev_ch_attribute dev_attr_legacy_##_name = \
39350 @@ -1009,14 +1009,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
39351 }
39352
39353 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
39354 + pax_open_kernel();
39355 if (mci->get_sdram_scrub_rate) {
39356 - dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39357 - dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39358 + *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39359 + *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39360 }
39361 if (mci->set_sdram_scrub_rate) {
39362 - dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39363 - dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39364 + *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39365 + *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39366 }
39367 + pax_close_kernel();
39368 err = device_create_file(&mci->dev,
39369 &dev_attr_sdram_scrub_rate);
39370 if (err) {
39371 diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
39372 index 2cf44b4d..6dd2dc7 100644
39373 --- a/drivers/edac/edac_pci.c
39374 +++ b/drivers/edac/edac_pci.c
39375 @@ -29,7 +29,7 @@
39376
39377 static DEFINE_MUTEX(edac_pci_ctls_mutex);
39378 static LIST_HEAD(edac_pci_list);
39379 -static atomic_t pci_indexes = ATOMIC_INIT(0);
39380 +static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
39381
39382 /*
39383 * edac_pci_alloc_ctl_info
39384 @@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
39385 */
39386 int edac_pci_alloc_index(void)
39387 {
39388 - return atomic_inc_return(&pci_indexes) - 1;
39389 + return atomic_inc_return_unchecked(&pci_indexes) - 1;
39390 }
39391 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
39392
39393 diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
39394 index e8658e4..22746d6 100644
39395 --- a/drivers/edac/edac_pci_sysfs.c
39396 +++ b/drivers/edac/edac_pci_sysfs.c
39397 @@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
39398 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
39399 static int edac_pci_poll_msec = 1000; /* one second workq period */
39400
39401 -static atomic_t pci_parity_count = ATOMIC_INIT(0);
39402 -static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
39403 +static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
39404 +static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
39405
39406 static struct kobject *edac_pci_top_main_kobj;
39407 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
39408 @@ -235,7 +235,7 @@ struct edac_pci_dev_attribute {
39409 void *value;
39410 ssize_t(*show) (void *, char *);
39411 ssize_t(*store) (void *, const char *, size_t);
39412 -};
39413 +} __do_const;
39414
39415 /* Set of show/store abstract level functions for PCI Parity object */
39416 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
39417 @@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39418 edac_printk(KERN_CRIT, EDAC_PCI,
39419 "Signaled System Error on %s\n",
39420 pci_name(dev));
39421 - atomic_inc(&pci_nonparity_count);
39422 + atomic_inc_unchecked(&pci_nonparity_count);
39423 }
39424
39425 if (status & (PCI_STATUS_PARITY)) {
39426 @@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39427 "Master Data Parity Error on %s\n",
39428 pci_name(dev));
39429
39430 - atomic_inc(&pci_parity_count);
39431 + atomic_inc_unchecked(&pci_parity_count);
39432 }
39433
39434 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39435 @@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39436 "Detected Parity Error on %s\n",
39437 pci_name(dev));
39438
39439 - atomic_inc(&pci_parity_count);
39440 + atomic_inc_unchecked(&pci_parity_count);
39441 }
39442 }
39443
39444 @@ -618,7 +618,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39445 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
39446 "Signaled System Error on %s\n",
39447 pci_name(dev));
39448 - atomic_inc(&pci_nonparity_count);
39449 + atomic_inc_unchecked(&pci_nonparity_count);
39450 }
39451
39452 if (status & (PCI_STATUS_PARITY)) {
39453 @@ -626,7 +626,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39454 "Master Data Parity Error on "
39455 "%s\n", pci_name(dev));
39456
39457 - atomic_inc(&pci_parity_count);
39458 + atomic_inc_unchecked(&pci_parity_count);
39459 }
39460
39461 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39462 @@ -634,7 +634,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39463 "Detected Parity Error on %s\n",
39464 pci_name(dev));
39465
39466 - atomic_inc(&pci_parity_count);
39467 + atomic_inc_unchecked(&pci_parity_count);
39468 }
39469 }
39470 }
39471 @@ -672,7 +672,7 @@ void edac_pci_do_parity_check(void)
39472 if (!check_pci_errors)
39473 return;
39474
39475 - before_count = atomic_read(&pci_parity_count);
39476 + before_count = atomic_read_unchecked(&pci_parity_count);
39477
39478 /* scan all PCI devices looking for a Parity Error on devices and
39479 * bridges.
39480 @@ -684,7 +684,7 @@ void edac_pci_do_parity_check(void)
39481 /* Only if operator has selected panic on PCI Error */
39482 if (edac_pci_get_panic_on_pe()) {
39483 /* If the count is different 'after' from 'before' */
39484 - if (before_count != atomic_read(&pci_parity_count))
39485 + if (before_count != atomic_read_unchecked(&pci_parity_count))
39486 panic("EDAC: PCI Parity Error");
39487 }
39488 }
39489 diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
39490 index 51b7e3a..aa8a3e8 100644
39491 --- a/drivers/edac/mce_amd.h
39492 +++ b/drivers/edac/mce_amd.h
39493 @@ -77,7 +77,7 @@ struct amd_decoder_ops {
39494 bool (*mc0_mce)(u16, u8);
39495 bool (*mc1_mce)(u16, u8);
39496 bool (*mc2_mce)(u16, u8);
39497 -};
39498 +} __no_const;
39499
39500 void amd_report_gart_errors(bool);
39501 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
39502 diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
39503 index 57ea7f4..af06b76 100644
39504 --- a/drivers/firewire/core-card.c
39505 +++ b/drivers/firewire/core-card.c
39506 @@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
39507 const struct fw_card_driver *driver,
39508 struct device *device)
39509 {
39510 - static atomic_t index = ATOMIC_INIT(-1);
39511 + static atomic_unchecked_t index = ATOMIC_INIT(-1);
39512
39513 - card->index = atomic_inc_return(&index);
39514 + card->index = atomic_inc_return_unchecked(&index);
39515 card->driver = driver;
39516 card->device = device;
39517 card->current_tlabel = 0;
39518 @@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
39519
39520 void fw_core_remove_card(struct fw_card *card)
39521 {
39522 - struct fw_card_driver dummy_driver = dummy_driver_template;
39523 + fw_card_driver_no_const dummy_driver = dummy_driver_template;
39524
39525 card->driver->update_phy_reg(card, 4,
39526 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
39527 diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
39528 index 2c6d5e1..a2cca6b 100644
39529 --- a/drivers/firewire/core-device.c
39530 +++ b/drivers/firewire/core-device.c
39531 @@ -253,7 +253,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
39532 struct config_rom_attribute {
39533 struct device_attribute attr;
39534 u32 key;
39535 -};
39536 +} __do_const;
39537
39538 static ssize_t show_immediate(struct device *dev,
39539 struct device_attribute *dattr, char *buf)
39540 diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
39541 index eb6935c..3cc2bfa 100644
39542 --- a/drivers/firewire/core-transaction.c
39543 +++ b/drivers/firewire/core-transaction.c
39544 @@ -38,6 +38,7 @@
39545 #include <linux/timer.h>
39546 #include <linux/types.h>
39547 #include <linux/workqueue.h>
39548 +#include <linux/sched.h>
39549
39550 #include <asm/byteorder.h>
39551
39552 diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
39553 index c98764a..551b520 100644
39554 --- a/drivers/firewire/core.h
39555 +++ b/drivers/firewire/core.h
39556 @@ -111,6 +111,7 @@ struct fw_card_driver {
39557
39558 int (*stop_iso)(struct fw_iso_context *ctx);
39559 };
39560 +typedef struct fw_card_driver __no_const fw_card_driver_no_const;
39561
39562 void fw_card_initialize(struct fw_card *card,
39563 const struct fw_card_driver *driver, struct device *device);
39564 diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
39565 index 8db6632..9bbc8ca 100644
39566 --- a/drivers/firewire/ohci.c
39567 +++ b/drivers/firewire/ohci.c
39568 @@ -2049,10 +2049,12 @@ static void bus_reset_work(struct work_struct *work)
39569 be32_to_cpu(ohci->next_header));
39570 }
39571
39572 +#ifndef CONFIG_GRKERNSEC
39573 if (param_remote_dma) {
39574 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
39575 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
39576 }
39577 +#endif
39578
39579 spin_unlock_irq(&ohci->lock);
39580
39581 @@ -2584,8 +2586,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
39582 unsigned long flags;
39583 int n, ret = 0;
39584
39585 +#ifndef CONFIG_GRKERNSEC
39586 if (param_remote_dma)
39587 return 0;
39588 +#endif
39589
39590 /*
39591 * FIXME: Make sure this bitmask is cleared when we clear the busReset
39592 diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
39593 index 94a58a0..f5eba42 100644
39594 --- a/drivers/firmware/dmi-id.c
39595 +++ b/drivers/firmware/dmi-id.c
39596 @@ -16,7 +16,7 @@
39597 struct dmi_device_attribute{
39598 struct device_attribute dev_attr;
39599 int field;
39600 -};
39601 +} __do_const;
39602 #define to_dmi_dev_attr(_dev_attr) \
39603 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
39604
39605 diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
39606 index 17afc51..0ef90cd 100644
39607 --- a/drivers/firmware/dmi_scan.c
39608 +++ b/drivers/firmware/dmi_scan.c
39609 @@ -835,7 +835,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
39610 if (buf == NULL)
39611 return -1;
39612
39613 - dmi_table(buf, dmi_len, dmi_num, decode, private_data);
39614 + dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
39615
39616 dmi_unmap(buf);
39617 return 0;
39618 diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
39619 index 1491dd4..aa910db 100644
39620 --- a/drivers/firmware/efi/cper.c
39621 +++ b/drivers/firmware/efi/cper.c
39622 @@ -41,12 +41,12 @@
39623 */
39624 u64 cper_next_record_id(void)
39625 {
39626 - static atomic64_t seq;
39627 + static atomic64_unchecked_t seq;
39628
39629 - if (!atomic64_read(&seq))
39630 - atomic64_set(&seq, ((u64)get_seconds()) << 32);
39631 + if (!atomic64_read_unchecked(&seq))
39632 + atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
39633
39634 - return atomic64_inc_return(&seq);
39635 + return atomic64_inc_return_unchecked(&seq);
39636 }
39637 EXPORT_SYMBOL_GPL(cper_next_record_id);
39638
39639 diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
39640 index 4753bac..02861a2 100644
39641 --- a/drivers/firmware/efi/efi.c
39642 +++ b/drivers/firmware/efi/efi.c
39643 @@ -120,14 +120,16 @@ static struct attribute_group efi_subsys_attr_group = {
39644 };
39645
39646 static struct efivars generic_efivars;
39647 -static struct efivar_operations generic_ops;
39648 +static efivar_operations_no_const generic_ops __read_only;
39649
39650 static int generic_ops_register(void)
39651 {
39652 - generic_ops.get_variable = efi.get_variable;
39653 - generic_ops.set_variable = efi.set_variable;
39654 - generic_ops.get_next_variable = efi.get_next_variable;
39655 - generic_ops.query_variable_store = efi_query_variable_store;
39656 + pax_open_kernel();
39657 + *(void **)&generic_ops.get_variable = efi.get_variable;
39658 + *(void **)&generic_ops.set_variable = efi.set_variable;
39659 + *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
39660 + *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
39661 + pax_close_kernel();
39662
39663 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
39664 }
39665 diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
39666 index 3dc2482..7bd2f61 100644
39667 --- a/drivers/firmware/efi/efivars.c
39668 +++ b/drivers/firmware/efi/efivars.c
39669 @@ -456,7 +456,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
39670 static int
39671 create_efivars_bin_attributes(void)
39672 {
39673 - struct bin_attribute *attr;
39674 + bin_attribute_no_const *attr;
39675 int error;
39676
39677 /* new_var */
39678 diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
39679 index 2a90ba6..07f3733 100644
39680 --- a/drivers/firmware/google/memconsole.c
39681 +++ b/drivers/firmware/google/memconsole.c
39682 @@ -147,7 +147,9 @@ static int __init memconsole_init(void)
39683 if (!found_memconsole())
39684 return -ENODEV;
39685
39686 - memconsole_bin_attr.size = memconsole_length;
39687 + pax_open_kernel();
39688 + *(size_t *)&memconsole_bin_attr.size = memconsole_length;
39689 + pax_close_kernel();
39690
39691 ret = sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
39692
39693 diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
39694 index 1e98a98..b444372 100644
39695 --- a/drivers/gpio/gpio-em.c
39696 +++ b/drivers/gpio/gpio-em.c
39697 @@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
39698 struct em_gio_priv *p;
39699 struct resource *io[2], *irq[2];
39700 struct gpio_chip *gpio_chip;
39701 - struct irq_chip *irq_chip;
39702 + irq_chip_no_const *irq_chip;
39703 const char *name = dev_name(&pdev->dev);
39704 int ret;
39705
39706 diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
39707 index f5bf3c3..7baaa59 100644
39708 --- a/drivers/gpio/gpio-ich.c
39709 +++ b/drivers/gpio/gpio-ich.c
39710 @@ -71,7 +71,7 @@ struct ichx_desc {
39711 /* Some chipsets have quirks, let these use their own request/get */
39712 int (*request)(struct gpio_chip *chip, unsigned offset);
39713 int (*get)(struct gpio_chip *chip, unsigned offset);
39714 -};
39715 +} __do_const;
39716
39717 static struct {
39718 spinlock_t lock;
39719 diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
39720 index ca76ce7..68b384b 100644
39721 --- a/drivers/gpio/gpio-rcar.c
39722 +++ b/drivers/gpio/gpio-rcar.c
39723 @@ -355,7 +355,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
39724 struct gpio_rcar_priv *p;
39725 struct resource *io, *irq;
39726 struct gpio_chip *gpio_chip;
39727 - struct irq_chip *irq_chip;
39728 + irq_chip_no_const *irq_chip;
39729 const char *name = dev_name(&pdev->dev);
39730 int ret;
39731
39732 diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
39733 index 9902732..64b62dd 100644
39734 --- a/drivers/gpio/gpio-vr41xx.c
39735 +++ b/drivers/gpio/gpio-vr41xx.c
39736 @@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
39737 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
39738 maskl, pendl, maskh, pendh);
39739
39740 - atomic_inc(&irq_err_count);
39741 + atomic_inc_unchecked(&irq_err_count);
39742
39743 return -EINVAL;
39744 }
39745 diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
39746 index 3b7d32d..05c2f74 100644
39747 --- a/drivers/gpu/drm/drm_crtc.c
39748 +++ b/drivers/gpu/drm/drm_crtc.c
39749 @@ -3123,7 +3123,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
39750 goto done;
39751 }
39752
39753 - if (copy_to_user(&enum_ptr[copied].name,
39754 + if (copy_to_user(enum_ptr[copied].name,
39755 &prop_enum->name, DRM_PROP_NAME_LEN)) {
39756 ret = -EFAULT;
39757 goto done;
39758 diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
39759 index 345be03..158368d 100644
39760 --- a/drivers/gpu/drm/drm_drv.c
39761 +++ b/drivers/gpu/drm/drm_drv.c
39762 @@ -233,7 +233,7 @@ module_exit(drm_core_exit);
39763 /**
39764 * Copy and IOCTL return string to user space
39765 */
39766 -static int drm_copy_field(char *buf, size_t *buf_len, const char *value)
39767 +static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
39768 {
39769 int len;
39770
39771 @@ -303,7 +303,7 @@ long drm_ioctl(struct file *filp,
39772 struct drm_file *file_priv = filp->private_data;
39773 struct drm_device *dev;
39774 const struct drm_ioctl_desc *ioctl = NULL;
39775 - drm_ioctl_t *func;
39776 + drm_ioctl_no_const_t func;
39777 unsigned int nr = DRM_IOCTL_NR(cmd);
39778 int retcode = -EINVAL;
39779 char stack_kdata[128];
39780 diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
39781 index 7f2af9a..1561914 100644
39782 --- a/drivers/gpu/drm/drm_fops.c
39783 +++ b/drivers/gpu/drm/drm_fops.c
39784 @@ -97,7 +97,7 @@ int drm_open(struct inode *inode, struct file *filp)
39785 if (drm_device_is_unplugged(dev))
39786 return -ENODEV;
39787
39788 - if (!dev->open_count++)
39789 + if (local_inc_return(&dev->open_count) == 1)
39790 need_setup = 1;
39791 mutex_lock(&dev->struct_mutex);
39792 old_imapping = inode->i_mapping;
39793 @@ -127,7 +127,7 @@ err_undo:
39794 iput(container_of(dev->dev_mapping, struct inode, i_data));
39795 dev->dev_mapping = old_mapping;
39796 mutex_unlock(&dev->struct_mutex);
39797 - dev->open_count--;
39798 + local_dec(&dev->open_count);
39799 return retcode;
39800 }
39801 EXPORT_SYMBOL(drm_open);
39802 @@ -463,7 +463,7 @@ int drm_release(struct inode *inode, struct file *filp)
39803
39804 mutex_lock(&drm_global_mutex);
39805
39806 - DRM_DEBUG("open_count = %d\n", dev->open_count);
39807 + DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
39808
39809 if (dev->driver->preclose)
39810 dev->driver->preclose(dev, file_priv);
39811 @@ -472,10 +472,10 @@ int drm_release(struct inode *inode, struct file *filp)
39812 * Begin inline drm_release
39813 */
39814
39815 - DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
39816 + DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
39817 task_pid_nr(current),
39818 (long)old_encode_dev(file_priv->minor->device),
39819 - dev->open_count);
39820 + local_read(&dev->open_count));
39821
39822 /* Release any auth tokens that might point to this file_priv,
39823 (do that under the drm_global_mutex) */
39824 @@ -573,7 +573,7 @@ int drm_release(struct inode *inode, struct file *filp)
39825 * End inline drm_release
39826 */
39827
39828 - if (!--dev->open_count) {
39829 + if (local_dec_and_test(&dev->open_count)) {
39830 retcode = drm_lastclose(dev);
39831 if (drm_device_is_unplugged(dev))
39832 drm_put_dev(dev);
39833 diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
39834 index 3d2e91c..d31c4c9 100644
39835 --- a/drivers/gpu/drm/drm_global.c
39836 +++ b/drivers/gpu/drm/drm_global.c
39837 @@ -36,7 +36,7 @@
39838 struct drm_global_item {
39839 struct mutex mutex;
39840 void *object;
39841 - int refcount;
39842 + atomic_t refcount;
39843 };
39844
39845 static struct drm_global_item glob[DRM_GLOBAL_NUM];
39846 @@ -49,7 +49,7 @@ void drm_global_init(void)
39847 struct drm_global_item *item = &glob[i];
39848 mutex_init(&item->mutex);
39849 item->object = NULL;
39850 - item->refcount = 0;
39851 + atomic_set(&item->refcount, 0);
39852 }
39853 }
39854
39855 @@ -59,7 +59,7 @@ void drm_global_release(void)
39856 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
39857 struct drm_global_item *item = &glob[i];
39858 BUG_ON(item->object != NULL);
39859 - BUG_ON(item->refcount != 0);
39860 + BUG_ON(atomic_read(&item->refcount) != 0);
39861 }
39862 }
39863
39864 @@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
39865 struct drm_global_item *item = &glob[ref->global_type];
39866
39867 mutex_lock(&item->mutex);
39868 - if (item->refcount == 0) {
39869 + if (atomic_read(&item->refcount) == 0) {
39870 item->object = kzalloc(ref->size, GFP_KERNEL);
39871 if (unlikely(item->object == NULL)) {
39872 ret = -ENOMEM;
39873 @@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
39874 goto out_err;
39875
39876 }
39877 - ++item->refcount;
39878 + atomic_inc(&item->refcount);
39879 ref->object = item->object;
39880 mutex_unlock(&item->mutex);
39881 return 0;
39882 @@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
39883 struct drm_global_item *item = &glob[ref->global_type];
39884
39885 mutex_lock(&item->mutex);
39886 - BUG_ON(item->refcount == 0);
39887 + BUG_ON(atomic_read(&item->refcount) == 0);
39888 BUG_ON(ref->object != item->object);
39889 - if (--item->refcount == 0) {
39890 + if (atomic_dec_and_test(&item->refcount)) {
39891 ref->release(ref);
39892 item->object = NULL;
39893 }
39894 diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
39895 index 7473035..a48b9c5 100644
39896 --- a/drivers/gpu/drm/drm_info.c
39897 +++ b/drivers/gpu/drm/drm_info.c
39898 @@ -75,10 +75,13 @@ int drm_vm_info(struct seq_file *m, void *data)
39899 struct drm_local_map *map;
39900 struct drm_map_list *r_list;
39901
39902 - /* Hardcoded from _DRM_FRAME_BUFFER,
39903 - _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
39904 - _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
39905 - const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
39906 + static const char * const types[] = {
39907 + [_DRM_FRAME_BUFFER] = "FB",
39908 + [_DRM_REGISTERS] = "REG",
39909 + [_DRM_SHM] = "SHM",
39910 + [_DRM_AGP] = "AGP",
39911 + [_DRM_SCATTER_GATHER] = "SG",
39912 + [_DRM_CONSISTENT] = "PCI"};
39913 const char *type;
39914 int i;
39915
39916 @@ -89,7 +92,7 @@ int drm_vm_info(struct seq_file *m, void *data)
39917 map = r_list->map;
39918 if (!map)
39919 continue;
39920 - if (map->type < 0 || map->type > 5)
39921 + if (map->type >= ARRAY_SIZE(types))
39922 type = "??";
39923 else
39924 type = types[map->type];
39925 @@ -261,7 +264,11 @@ int drm_vma_info(struct seq_file *m, void *data)
39926 vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
39927 vma->vm_flags & VM_LOCKED ? 'l' : '-',
39928 vma->vm_flags & VM_IO ? 'i' : '-',
39929 +#ifdef CONFIG_GRKERNSEC_HIDESYM
39930 + 0);
39931 +#else
39932 vma->vm_pgoff);
39933 +#endif
39934
39935 #if defined(__i386__)
39936 pgprot = pgprot_val(vma->vm_page_prot);
39937 diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
39938 index 2f4c4343..dd12cd2 100644
39939 --- a/drivers/gpu/drm/drm_ioc32.c
39940 +++ b/drivers/gpu/drm/drm_ioc32.c
39941 @@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
39942 request = compat_alloc_user_space(nbytes);
39943 if (!access_ok(VERIFY_WRITE, request, nbytes))
39944 return -EFAULT;
39945 - list = (struct drm_buf_desc *) (request + 1);
39946 + list = (struct drm_buf_desc __user *) (request + 1);
39947
39948 if (__put_user(count, &request->count)
39949 || __put_user(list, &request->list))
39950 @@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
39951 request = compat_alloc_user_space(nbytes);
39952 if (!access_ok(VERIFY_WRITE, request, nbytes))
39953 return -EFAULT;
39954 - list = (struct drm_buf_pub *) (request + 1);
39955 + list = (struct drm_buf_pub __user *) (request + 1);
39956
39957 if (__put_user(count, &request->count)
39958 || __put_user(list, &request->list))
39959 @@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
39960 return 0;
39961 }
39962
39963 -drm_ioctl_compat_t *drm_compat_ioctls[] = {
39964 +drm_ioctl_compat_t drm_compat_ioctls[] = {
39965 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
39966 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
39967 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
39968 @@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
39969 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
39970 {
39971 unsigned int nr = DRM_IOCTL_NR(cmd);
39972 - drm_ioctl_compat_t *fn;
39973 int ret;
39974
39975 /* Assume that ioctls without an explicit compat routine will just
39976 @@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
39977 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
39978 return drm_ioctl(filp, cmd, arg);
39979
39980 - fn = drm_compat_ioctls[nr];
39981 -
39982 - if (fn != NULL)
39983 - ret = (*fn) (filp, cmd, arg);
39984 + if (drm_compat_ioctls[nr] != NULL)
39985 + ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
39986 else
39987 ret = drm_ioctl(filp, cmd, arg);
39988
39989 diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
39990 index 98a33c580..8fd1c2b 100644
39991 --- a/drivers/gpu/drm/drm_stub.c
39992 +++ b/drivers/gpu/drm/drm_stub.c
39993 @@ -409,7 +409,7 @@ void drm_unplug_dev(struct drm_device *dev)
39994
39995 drm_device_set_unplugged(dev);
39996
39997 - if (dev->open_count == 0) {
39998 + if (local_read(&dev->open_count) == 0) {
39999 drm_put_dev(dev);
40000 }
40001 mutex_unlock(&drm_global_mutex);
40002 diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
40003 index c22c309..ae758c3 100644
40004 --- a/drivers/gpu/drm/drm_sysfs.c
40005 +++ b/drivers/gpu/drm/drm_sysfs.c
40006 @@ -505,7 +505,7 @@ static void drm_sysfs_release(struct device *dev)
40007 */
40008 int drm_sysfs_device_add(struct drm_minor *minor)
40009 {
40010 - char *minor_str;
40011 + const char *minor_str;
40012 int r;
40013
40014 if (minor->type == DRM_MINOR_CONTROL)
40015 diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
40016 index d4d16ed..8fb0b51 100644
40017 --- a/drivers/gpu/drm/i810/i810_drv.h
40018 +++ b/drivers/gpu/drm/i810/i810_drv.h
40019 @@ -108,8 +108,8 @@ typedef struct drm_i810_private {
40020 int page_flipping;
40021
40022 wait_queue_head_t irq_queue;
40023 - atomic_t irq_received;
40024 - atomic_t irq_emitted;
40025 + atomic_unchecked_t irq_received;
40026 + atomic_unchecked_t irq_emitted;
40027
40028 int front_offset;
40029 } drm_i810_private_t;
40030 diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
40031 index b2b46c5..feb9fe7 100644
40032 --- a/drivers/gpu/drm/i915/i915_debugfs.c
40033 +++ b/drivers/gpu/drm/i915/i915_debugfs.c
40034 @@ -713,7 +713,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
40035 I915_READ(GTIMR));
40036 }
40037 seq_printf(m, "Interrupts received: %d\n",
40038 - atomic_read(&dev_priv->irq_received));
40039 + atomic_read_unchecked(&dev_priv->irq_received));
40040 for_each_ring(ring, dev_priv, i) {
40041 if (INTEL_INFO(dev)->gen >= 6) {
40042 seq_printf(m,
40043 diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
40044 index 15a74f9..4278889 100644
40045 --- a/drivers/gpu/drm/i915/i915_dma.c
40046 +++ b/drivers/gpu/drm/i915/i915_dma.c
40047 @@ -1273,7 +1273,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
40048 bool can_switch;
40049
40050 spin_lock(&dev->count_lock);
40051 - can_switch = (dev->open_count == 0);
40052 + can_switch = (local_read(&dev->open_count) == 0);
40053 spin_unlock(&dev->count_lock);
40054 return can_switch;
40055 }
40056 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
40057 index df77e20..d3fda9f 100644
40058 --- a/drivers/gpu/drm/i915/i915_drv.h
40059 +++ b/drivers/gpu/drm/i915/i915_drv.h
40060 @@ -1361,7 +1361,7 @@ typedef struct drm_i915_private {
40061 drm_dma_handle_t *status_page_dmah;
40062 struct resource mch_res;
40063
40064 - atomic_t irq_received;
40065 + atomic_unchecked_t irq_received;
40066
40067 /* protects the irq masks */
40068 spinlock_t irq_lock;
40069 diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40070 index d269ecf..6d857bc 100644
40071 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40072 +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40073 @@ -860,9 +860,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
40074
40075 static int
40076 validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
40077 - int count)
40078 + unsigned int count)
40079 {
40080 - int i;
40081 + unsigned int i;
40082 unsigned relocs_total = 0;
40083 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
40084
40085 diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
40086 index 3c59584..500f2e9 100644
40087 --- a/drivers/gpu/drm/i915/i915_ioc32.c
40088 +++ b/drivers/gpu/drm/i915/i915_ioc32.c
40089 @@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
40090 (unsigned long)request);
40091 }
40092
40093 -static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40094 +static drm_ioctl_compat_t i915_compat_ioctls[] = {
40095 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
40096 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
40097 [DRM_I915_GETPARAM] = compat_i915_getparam,
40098 @@ -202,18 +202,15 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40099 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40100 {
40101 unsigned int nr = DRM_IOCTL_NR(cmd);
40102 - drm_ioctl_compat_t *fn = NULL;
40103 int ret;
40104
40105 if (nr < DRM_COMMAND_BASE)
40106 return drm_compat_ioctl(filp, cmd, arg);
40107
40108 - if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls))
40109 - fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40110 -
40111 - if (fn != NULL)
40112 + if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls)) {
40113 + drm_ioctl_compat_t fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40114 ret = (*fn) (filp, cmd, arg);
40115 - else
40116 + } else
40117 ret = drm_ioctl(filp, cmd, arg);
40118
40119 return ret;
40120 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
40121 index d554169..f4426bb 100644
40122 --- a/drivers/gpu/drm/i915/i915_irq.c
40123 +++ b/drivers/gpu/drm/i915/i915_irq.c
40124 @@ -1438,7 +1438,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
40125 int pipe;
40126 u32 pipe_stats[I915_MAX_PIPES];
40127
40128 - atomic_inc(&dev_priv->irq_received);
40129 + atomic_inc_unchecked(&dev_priv->irq_received);
40130
40131 while (true) {
40132 iir = I915_READ(VLV_IIR);
40133 @@ -1751,7 +1751,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg)
40134 u32 de_iir, gt_iir, de_ier, sde_ier = 0;
40135 irqreturn_t ret = IRQ_NONE;
40136
40137 - atomic_inc(&dev_priv->irq_received);
40138 + atomic_inc_unchecked(&dev_priv->irq_received);
40139
40140 /* We get interrupts on unclaimed registers, so check for this before we
40141 * do any I915_{READ,WRITE}. */
40142 @@ -1821,7 +1821,7 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
40143 uint32_t tmp = 0;
40144 enum pipe pipe;
40145
40146 - atomic_inc(&dev_priv->irq_received);
40147 + atomic_inc_unchecked(&dev_priv->irq_received);
40148
40149 master_ctl = I915_READ(GEN8_MASTER_IRQ);
40150 master_ctl &= ~GEN8_MASTER_IRQ_CONTROL;
40151 @@ -2645,7 +2645,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
40152 {
40153 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
40154
40155 - atomic_set(&dev_priv->irq_received, 0);
40156 + atomic_set_unchecked(&dev_priv->irq_received, 0);
40157
40158 I915_WRITE(HWSTAM, 0xeffe);
40159
40160 @@ -2663,7 +2663,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev)
40161 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
40162 int pipe;
40163
40164 - atomic_set(&dev_priv->irq_received, 0);
40165 + atomic_set_unchecked(&dev_priv->irq_received, 0);
40166
40167 /* VLV magic */
40168 I915_WRITE(VLV_IMR, 0);
40169 @@ -2694,7 +2694,7 @@ static void gen8_irq_preinstall(struct drm_device *dev)
40170 struct drm_i915_private *dev_priv = dev->dev_private;
40171 int pipe;
40172
40173 - atomic_set(&dev_priv->irq_received, 0);
40174 + atomic_set_unchecked(&dev_priv->irq_received, 0);
40175
40176 I915_WRITE(GEN8_MASTER_IRQ, 0);
40177 POSTING_READ(GEN8_MASTER_IRQ);
40178 @@ -3018,7 +3018,7 @@ static void gen8_irq_uninstall(struct drm_device *dev)
40179 if (!dev_priv)
40180 return;
40181
40182 - atomic_set(&dev_priv->irq_received, 0);
40183 + atomic_set_unchecked(&dev_priv->irq_received, 0);
40184
40185 I915_WRITE(GEN8_MASTER_IRQ, 0);
40186
40187 @@ -3112,7 +3112,7 @@ static void i8xx_irq_preinstall(struct drm_device * dev)
40188 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
40189 int pipe;
40190
40191 - atomic_set(&dev_priv->irq_received, 0);
40192 + atomic_set_unchecked(&dev_priv->irq_received, 0);
40193
40194 for_each_pipe(pipe)
40195 I915_WRITE(PIPESTAT(pipe), 0);
40196 @@ -3198,7 +3198,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg)
40197 I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
40198 I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
40199
40200 - atomic_inc(&dev_priv->irq_received);
40201 + atomic_inc_unchecked(&dev_priv->irq_received);
40202
40203 iir = I915_READ16(IIR);
40204 if (iir == 0)
40205 @@ -3277,7 +3277,7 @@ static void i915_irq_preinstall(struct drm_device * dev)
40206 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
40207 int pipe;
40208
40209 - atomic_set(&dev_priv->irq_received, 0);
40210 + atomic_set_unchecked(&dev_priv->irq_received, 0);
40211
40212 if (I915_HAS_HOTPLUG(dev)) {
40213 I915_WRITE(PORT_HOTPLUG_EN, 0);
40214 @@ -3384,7 +3384,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
40215 I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
40216 int pipe, ret = IRQ_NONE;
40217
40218 - atomic_inc(&dev_priv->irq_received);
40219 + atomic_inc_unchecked(&dev_priv->irq_received);
40220
40221 iir = I915_READ(IIR);
40222 do {
40223 @@ -3511,7 +3511,7 @@ static void i965_irq_preinstall(struct drm_device * dev)
40224 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
40225 int pipe;
40226
40227 - atomic_set(&dev_priv->irq_received, 0);
40228 + atomic_set_unchecked(&dev_priv->irq_received, 0);
40229
40230 I915_WRITE(PORT_HOTPLUG_EN, 0);
40231 I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
40232 @@ -3627,7 +3627,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
40233 I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
40234 I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
40235
40236 - atomic_inc(&dev_priv->irq_received);
40237 + atomic_inc_unchecked(&dev_priv->irq_received);
40238
40239 iir = I915_READ(IIR);
40240
40241 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
40242 index 9b8a7c7..60f6003 100644
40243 --- a/drivers/gpu/drm/i915/intel_display.c
40244 +++ b/drivers/gpu/drm/i915/intel_display.c
40245 @@ -10776,13 +10776,13 @@ struct intel_quirk {
40246 int subsystem_vendor;
40247 int subsystem_device;
40248 void (*hook)(struct drm_device *dev);
40249 -};
40250 +} __do_const;
40251
40252 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
40253 struct intel_dmi_quirk {
40254 void (*hook)(struct drm_device *dev);
40255 const struct dmi_system_id (*dmi_id_list)[];
40256 -};
40257 +} __do_const;
40258
40259 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40260 {
40261 @@ -10790,18 +10790,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40262 return 1;
40263 }
40264
40265 -static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40266 +static const struct dmi_system_id intel_dmi_quirks_table[] = {
40267 {
40268 - .dmi_id_list = &(const struct dmi_system_id[]) {
40269 - {
40270 - .callback = intel_dmi_reverse_brightness,
40271 - .ident = "NCR Corporation",
40272 - .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40273 - DMI_MATCH(DMI_PRODUCT_NAME, ""),
40274 - },
40275 - },
40276 - { } /* terminating entry */
40277 + .callback = intel_dmi_reverse_brightness,
40278 + .ident = "NCR Corporation",
40279 + .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40280 + DMI_MATCH(DMI_PRODUCT_NAME, ""),
40281 },
40282 + },
40283 + { } /* terminating entry */
40284 +};
40285 +
40286 +static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40287 + {
40288 + .dmi_id_list = &intel_dmi_quirks_table,
40289 .hook = quirk_invert_brightness,
40290 },
40291 };
40292 diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
40293 index fe45321..836fdca 100644
40294 --- a/drivers/gpu/drm/mga/mga_drv.h
40295 +++ b/drivers/gpu/drm/mga/mga_drv.h
40296 @@ -120,9 +120,9 @@ typedef struct drm_mga_private {
40297 u32 clear_cmd;
40298 u32 maccess;
40299
40300 - atomic_t vbl_received; /**< Number of vblanks received. */
40301 + atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
40302 wait_queue_head_t fence_queue;
40303 - atomic_t last_fence_retired;
40304 + atomic_unchecked_t last_fence_retired;
40305 u32 next_fence_to_post;
40306
40307 unsigned int fb_cpp;
40308 diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
40309 index 86b4bb8..ae237ad 100644
40310 --- a/drivers/gpu/drm/mga/mga_ioc32.c
40311 +++ b/drivers/gpu/drm/mga/mga_ioc32.c
40312 @@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
40313 return 0;
40314 }
40315
40316 -drm_ioctl_compat_t *mga_compat_ioctls[] = {
40317 +drm_ioctl_compat_t mga_compat_ioctls[] = {
40318 [DRM_MGA_INIT] = compat_mga_init,
40319 [DRM_MGA_GETPARAM] = compat_mga_getparam,
40320 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
40321 @@ -208,18 +208,15 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
40322 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40323 {
40324 unsigned int nr = DRM_IOCTL_NR(cmd);
40325 - drm_ioctl_compat_t *fn = NULL;
40326 int ret;
40327
40328 if (nr < DRM_COMMAND_BASE)
40329 return drm_compat_ioctl(filp, cmd, arg);
40330
40331 - if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(mga_compat_ioctls))
40332 - fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40333 -
40334 - if (fn != NULL)
40335 + if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(mga_compat_ioctls)) {
40336 + drm_ioctl_compat_t fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40337 ret = (*fn) (filp, cmd, arg);
40338 - else
40339 + } else
40340 ret = drm_ioctl(filp, cmd, arg);
40341
40342 return ret;
40343 diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
40344 index 1b071b8..de8601a 100644
40345 --- a/drivers/gpu/drm/mga/mga_irq.c
40346 +++ b/drivers/gpu/drm/mga/mga_irq.c
40347 @@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
40348 if (crtc != 0)
40349 return 0;
40350
40351 - return atomic_read(&dev_priv->vbl_received);
40352 + return atomic_read_unchecked(&dev_priv->vbl_received);
40353 }
40354
40355
40356 @@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40357 /* VBLANK interrupt */
40358 if (status & MGA_VLINEPEN) {
40359 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
40360 - atomic_inc(&dev_priv->vbl_received);
40361 + atomic_inc_unchecked(&dev_priv->vbl_received);
40362 drm_handle_vblank(dev, 0);
40363 handled = 1;
40364 }
40365 @@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40366 if ((prim_start & ~0x03) != (prim_end & ~0x03))
40367 MGA_WRITE(MGA_PRIMEND, prim_end);
40368
40369 - atomic_inc(&dev_priv->last_fence_retired);
40370 + atomic_inc_unchecked(&dev_priv->last_fence_retired);
40371 wake_up(&dev_priv->fence_queue);
40372 handled = 1;
40373 }
40374 @@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
40375 * using fences.
40376 */
40377 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
40378 - (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
40379 + (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
40380 - *sequence) <= (1 << 23)));
40381
40382 *sequence = cur_fence;
40383 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
40384 index 4c3feaa..26391ce 100644
40385 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c
40386 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
40387 @@ -965,7 +965,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
40388 struct bit_table {
40389 const char id;
40390 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
40391 -};
40392 +} __no_const;
40393
40394 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
40395
40396 diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
40397 index 23ca7a5..b6c955d 100644
40398 --- a/drivers/gpu/drm/nouveau/nouveau_drm.h
40399 +++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
40400 @@ -97,7 +97,6 @@ struct nouveau_drm {
40401 struct drm_global_reference mem_global_ref;
40402 struct ttm_bo_global_ref bo_global_ref;
40403 struct ttm_bo_device bdev;
40404 - atomic_t validate_sequence;
40405 int (*move)(struct nouveau_channel *,
40406 struct ttm_buffer_object *,
40407 struct ttm_mem_reg *, struct ttm_mem_reg *);
40408 diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40409 index c1a7e5a..38b8539 100644
40410 --- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40411 +++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40412 @@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
40413 unsigned long arg)
40414 {
40415 unsigned int nr = DRM_IOCTL_NR(cmd);
40416 - drm_ioctl_compat_t *fn = NULL;
40417 + drm_ioctl_compat_t fn = NULL;
40418 int ret;
40419
40420 if (nr < DRM_COMMAND_BASE)
40421 diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
40422 index d45d50d..72a5dd2 100644
40423 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
40424 +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
40425 @@ -130,11 +130,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40426 }
40427
40428 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
40429 - nouveau_vram_manager_init,
40430 - nouveau_vram_manager_fini,
40431 - nouveau_vram_manager_new,
40432 - nouveau_vram_manager_del,
40433 - nouveau_vram_manager_debug
40434 + .init = nouveau_vram_manager_init,
40435 + .takedown = nouveau_vram_manager_fini,
40436 + .get_node = nouveau_vram_manager_new,
40437 + .put_node = nouveau_vram_manager_del,
40438 + .debug = nouveau_vram_manager_debug
40439 };
40440
40441 static int
40442 @@ -199,11 +199,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40443 }
40444
40445 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
40446 - nouveau_gart_manager_init,
40447 - nouveau_gart_manager_fini,
40448 - nouveau_gart_manager_new,
40449 - nouveau_gart_manager_del,
40450 - nouveau_gart_manager_debug
40451 + .init = nouveau_gart_manager_init,
40452 + .takedown = nouveau_gart_manager_fini,
40453 + .get_node = nouveau_gart_manager_new,
40454 + .put_node = nouveau_gart_manager_del,
40455 + .debug = nouveau_gart_manager_debug
40456 };
40457
40458 #include <core/subdev/vm/nv04.h>
40459 @@ -271,11 +271,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40460 }
40461
40462 const struct ttm_mem_type_manager_func nv04_gart_manager = {
40463 - nv04_gart_manager_init,
40464 - nv04_gart_manager_fini,
40465 - nv04_gart_manager_new,
40466 - nv04_gart_manager_del,
40467 - nv04_gart_manager_debug
40468 + .init = nv04_gart_manager_init,
40469 + .takedown = nv04_gart_manager_fini,
40470 + .get_node = nv04_gart_manager_new,
40471 + .put_node = nv04_gart_manager_del,
40472 + .debug = nv04_gart_manager_debug
40473 };
40474
40475 int
40476 diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
40477 index 471347e..5adc6b9 100644
40478 --- a/drivers/gpu/drm/nouveau/nouveau_vga.c
40479 +++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
40480 @@ -67,7 +67,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
40481 bool can_switch;
40482
40483 spin_lock(&dev->count_lock);
40484 - can_switch = (dev->open_count == 0);
40485 + can_switch = (local_read(&dev->open_count) == 0);
40486 spin_unlock(&dev->count_lock);
40487 return can_switch;
40488 }
40489 diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
40490 index eb89653..613cf71 100644
40491 --- a/drivers/gpu/drm/qxl/qxl_cmd.c
40492 +++ b/drivers/gpu/drm/qxl/qxl_cmd.c
40493 @@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
40494 int ret;
40495
40496 mutex_lock(&qdev->async_io_mutex);
40497 - irq_num = atomic_read(&qdev->irq_received_io_cmd);
40498 + irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
40499 if (qdev->last_sent_io_cmd > irq_num) {
40500 if (intr)
40501 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
40502 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40503 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40504 else
40505 ret = wait_event_timeout(qdev->io_cmd_event,
40506 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40507 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40508 /* 0 is timeout, just bail the "hw" has gone away */
40509 if (ret <= 0)
40510 goto out;
40511 - irq_num = atomic_read(&qdev->irq_received_io_cmd);
40512 + irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
40513 }
40514 outb(val, addr);
40515 qdev->last_sent_io_cmd = irq_num + 1;
40516 if (intr)
40517 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
40518 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40519 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40520 else
40521 ret = wait_event_timeout(qdev->io_cmd_event,
40522 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40523 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40524 out:
40525 if (ret > 0)
40526 ret = 0;
40527 diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
40528 index c3c2bbd..bc3c0fb 100644
40529 --- a/drivers/gpu/drm/qxl/qxl_debugfs.c
40530 +++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
40531 @@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
40532 struct drm_info_node *node = (struct drm_info_node *) m->private;
40533 struct qxl_device *qdev = node->minor->dev->dev_private;
40534
40535 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
40536 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
40537 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
40538 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
40539 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
40540 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
40541 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
40542 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
40543 seq_printf(m, "%d\n", qdev->irq_received_error);
40544 return 0;
40545 }
40546 diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
40547 index 36ed40b..0397633 100644
40548 --- a/drivers/gpu/drm/qxl/qxl_drv.h
40549 +++ b/drivers/gpu/drm/qxl/qxl_drv.h
40550 @@ -290,10 +290,10 @@ struct qxl_device {
40551 unsigned int last_sent_io_cmd;
40552
40553 /* interrupt handling */
40554 - atomic_t irq_received;
40555 - atomic_t irq_received_display;
40556 - atomic_t irq_received_cursor;
40557 - atomic_t irq_received_io_cmd;
40558 + atomic_unchecked_t irq_received;
40559 + atomic_unchecked_t irq_received_display;
40560 + atomic_unchecked_t irq_received_cursor;
40561 + atomic_unchecked_t irq_received_io_cmd;
40562 unsigned irq_received_error;
40563 wait_queue_head_t display_event;
40564 wait_queue_head_t cursor_event;
40565 diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
40566 index 0bb86e6..d41416d 100644
40567 --- a/drivers/gpu/drm/qxl/qxl_ioctl.c
40568 +++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
40569 @@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
40570
40571 /* TODO copy slow path code from i915 */
40572 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
40573 - 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);
40574 + 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);
40575
40576 {
40577 struct qxl_drawable *draw = fb_cmd;
40578 @@ -201,7 +201,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
40579 struct drm_qxl_reloc reloc;
40580
40581 if (copy_from_user(&reloc,
40582 - &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
40583 + &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
40584 sizeof(reloc))) {
40585 ret = -EFAULT;
40586 goto out_free_bos;
40587 @@ -294,10 +294,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
40588
40589 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
40590
40591 - struct drm_qxl_command *commands =
40592 - (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
40593 + struct drm_qxl_command __user *commands =
40594 + (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
40595
40596 - if (copy_from_user(&user_cmd, &commands[cmd_num],
40597 + if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
40598 sizeof(user_cmd)))
40599 return -EFAULT;
40600
40601 diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
40602 index 28f84b4..fb3e224 100644
40603 --- a/drivers/gpu/drm/qxl/qxl_irq.c
40604 +++ b/drivers/gpu/drm/qxl/qxl_irq.c
40605 @@ -33,19 +33,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
40606
40607 pending = xchg(&qdev->ram_header->int_pending, 0);
40608
40609 - atomic_inc(&qdev->irq_received);
40610 + atomic_inc_unchecked(&qdev->irq_received);
40611
40612 if (pending & QXL_INTERRUPT_DISPLAY) {
40613 - atomic_inc(&qdev->irq_received_display);
40614 + atomic_inc_unchecked(&qdev->irq_received_display);
40615 wake_up_all(&qdev->display_event);
40616 qxl_queue_garbage_collect(qdev, false);
40617 }
40618 if (pending & QXL_INTERRUPT_CURSOR) {
40619 - atomic_inc(&qdev->irq_received_cursor);
40620 + atomic_inc_unchecked(&qdev->irq_received_cursor);
40621 wake_up_all(&qdev->cursor_event);
40622 }
40623 if (pending & QXL_INTERRUPT_IO_CMD) {
40624 - atomic_inc(&qdev->irq_received_io_cmd);
40625 + atomic_inc_unchecked(&qdev->irq_received_io_cmd);
40626 wake_up_all(&qdev->io_cmd_event);
40627 }
40628 if (pending & QXL_INTERRUPT_ERROR) {
40629 @@ -82,10 +82,10 @@ int qxl_irq_init(struct qxl_device *qdev)
40630 init_waitqueue_head(&qdev->io_cmd_event);
40631 INIT_WORK(&qdev->client_monitors_config_work,
40632 qxl_client_monitors_config_work_func);
40633 - atomic_set(&qdev->irq_received, 0);
40634 - atomic_set(&qdev->irq_received_display, 0);
40635 - atomic_set(&qdev->irq_received_cursor, 0);
40636 - atomic_set(&qdev->irq_received_io_cmd, 0);
40637 + atomic_set_unchecked(&qdev->irq_received, 0);
40638 + atomic_set_unchecked(&qdev->irq_received_display, 0);
40639 + atomic_set_unchecked(&qdev->irq_received_cursor, 0);
40640 + atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
40641 qdev->irq_received_error = 0;
40642 ret = drm_irq_install(qdev->ddev);
40643 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
40644 diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
40645 index c7e7e65..7dddd4d 100644
40646 --- a/drivers/gpu/drm/qxl/qxl_ttm.c
40647 +++ b/drivers/gpu/drm/qxl/qxl_ttm.c
40648 @@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
40649 }
40650 }
40651
40652 -static struct vm_operations_struct qxl_ttm_vm_ops;
40653 +static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
40654 static const struct vm_operations_struct *ttm_vm_ops;
40655
40656 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
40657 @@ -147,8 +147,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
40658 return r;
40659 if (unlikely(ttm_vm_ops == NULL)) {
40660 ttm_vm_ops = vma->vm_ops;
40661 + pax_open_kernel();
40662 qxl_ttm_vm_ops = *ttm_vm_ops;
40663 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
40664 + pax_close_kernel();
40665 }
40666 vma->vm_ops = &qxl_ttm_vm_ops;
40667 return 0;
40668 @@ -560,25 +562,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
40669 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
40670 {
40671 #if defined(CONFIG_DEBUG_FS)
40672 - static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
40673 - static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
40674 - unsigned i;
40675 + static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
40676 + {
40677 + .name = "qxl_mem_mm",
40678 + .show = &qxl_mm_dump_table,
40679 + },
40680 + {
40681 + .name = "qxl_surf_mm",
40682 + .show = &qxl_mm_dump_table,
40683 + }
40684 + };
40685
40686 - for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
40687 - if (i == 0)
40688 - sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
40689 - else
40690 - sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
40691 - qxl_mem_types_list[i].name = qxl_mem_types_names[i];
40692 - qxl_mem_types_list[i].show = &qxl_mm_dump_table;
40693 - qxl_mem_types_list[i].driver_features = 0;
40694 - if (i == 0)
40695 - qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
40696 - else
40697 - qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
40698 + pax_open_kernel();
40699 + *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
40700 + *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
40701 + pax_close_kernel();
40702
40703 - }
40704 - return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
40705 + return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
40706 #else
40707 return 0;
40708 #endif
40709 diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
40710 index 59459fe..be26b31 100644
40711 --- a/drivers/gpu/drm/r128/r128_cce.c
40712 +++ b/drivers/gpu/drm/r128/r128_cce.c
40713 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
40714
40715 /* GH: Simple idle check.
40716 */
40717 - atomic_set(&dev_priv->idle_count, 0);
40718 + atomic_set_unchecked(&dev_priv->idle_count, 0);
40719
40720 /* We don't support anything other than bus-mastering ring mode,
40721 * but the ring can be in either AGP or PCI space for the ring
40722 diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
40723 index 5bf3f5f..7000661 100644
40724 --- a/drivers/gpu/drm/r128/r128_drv.h
40725 +++ b/drivers/gpu/drm/r128/r128_drv.h
40726 @@ -90,14 +90,14 @@ typedef struct drm_r128_private {
40727 int is_pci;
40728 unsigned long cce_buffers_offset;
40729
40730 - atomic_t idle_count;
40731 + atomic_unchecked_t idle_count;
40732
40733 int page_flipping;
40734 int current_page;
40735 u32 crtc_offset;
40736 u32 crtc_offset_cntl;
40737
40738 - atomic_t vbl_received;
40739 + atomic_unchecked_t vbl_received;
40740
40741 u32 color_fmt;
40742 unsigned int front_offset;
40743 diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
40744 index b0d0fd3..a6fbbe4 100644
40745 --- a/drivers/gpu/drm/r128/r128_ioc32.c
40746 +++ b/drivers/gpu/drm/r128/r128_ioc32.c
40747 @@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
40748 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
40749 }
40750
40751 -drm_ioctl_compat_t *r128_compat_ioctls[] = {
40752 +drm_ioctl_compat_t r128_compat_ioctls[] = {
40753 [DRM_R128_INIT] = compat_r128_init,
40754 [DRM_R128_DEPTH] = compat_r128_depth,
40755 [DRM_R128_STIPPLE] = compat_r128_stipple,
40756 @@ -197,18 +197,15 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
40757 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40758 {
40759 unsigned int nr = DRM_IOCTL_NR(cmd);
40760 - drm_ioctl_compat_t *fn = NULL;
40761 int ret;
40762
40763 if (nr < DRM_COMMAND_BASE)
40764 return drm_compat_ioctl(filp, cmd, arg);
40765
40766 - if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(r128_compat_ioctls))
40767 - fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
40768 -
40769 - if (fn != NULL)
40770 + if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(r128_compat_ioctls)) {
40771 + drm_ioctl_compat_t fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
40772 ret = (*fn) (filp, cmd, arg);
40773 - else
40774 + } else
40775 ret = drm_ioctl(filp, cmd, arg);
40776
40777 return ret;
40778 diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
40779 index c2ae496..30b5993 100644
40780 --- a/drivers/gpu/drm/r128/r128_irq.c
40781 +++ b/drivers/gpu/drm/r128/r128_irq.c
40782 @@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
40783 if (crtc != 0)
40784 return 0;
40785
40786 - return atomic_read(&dev_priv->vbl_received);
40787 + return atomic_read_unchecked(&dev_priv->vbl_received);
40788 }
40789
40790 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
40791 @@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
40792 /* VBLANK interrupt */
40793 if (status & R128_CRTC_VBLANK_INT) {
40794 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
40795 - atomic_inc(&dev_priv->vbl_received);
40796 + atomic_inc_unchecked(&dev_priv->vbl_received);
40797 drm_handle_vblank(dev, 0);
40798 return IRQ_HANDLED;
40799 }
40800 diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
40801 index e806dac..f81d32f 100644
40802 --- a/drivers/gpu/drm/r128/r128_state.c
40803 +++ b/drivers/gpu/drm/r128/r128_state.c
40804 @@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
40805
40806 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
40807 {
40808 - if (atomic_read(&dev_priv->idle_count) == 0)
40809 + if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
40810 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
40811 else
40812 - atomic_set(&dev_priv->idle_count, 0);
40813 + atomic_set_unchecked(&dev_priv->idle_count, 0);
40814 }
40815
40816 #endif
40817 diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
40818 index 4a85bb6..aaea819 100644
40819 --- a/drivers/gpu/drm/radeon/mkregtable.c
40820 +++ b/drivers/gpu/drm/radeon/mkregtable.c
40821 @@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
40822 regex_t mask_rex;
40823 regmatch_t match[4];
40824 char buf[1024];
40825 - size_t end;
40826 + long end;
40827 int len;
40828 int done = 0;
40829 int r;
40830 unsigned o;
40831 struct offset *offset;
40832 char last_reg_s[10];
40833 - int last_reg;
40834 + unsigned long last_reg;
40835
40836 if (regcomp
40837 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
40838 diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
40839 index 044bc98..50ced9b 100644
40840 --- a/drivers/gpu/drm/radeon/radeon_device.c
40841 +++ b/drivers/gpu/drm/radeon/radeon_device.c
40842 @@ -1125,7 +1125,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
40843 bool can_switch;
40844
40845 spin_lock(&dev->count_lock);
40846 - can_switch = (dev->open_count == 0);
40847 + can_switch = (local_read(&dev->open_count) == 0);
40848 spin_unlock(&dev->count_lock);
40849 return can_switch;
40850 }
40851 diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
40852 index dafd812..1bf20c7 100644
40853 --- a/drivers/gpu/drm/radeon/radeon_drv.h
40854 +++ b/drivers/gpu/drm/radeon/radeon_drv.h
40855 @@ -262,7 +262,7 @@ typedef struct drm_radeon_private {
40856
40857 /* SW interrupt */
40858 wait_queue_head_t swi_queue;
40859 - atomic_t swi_emitted;
40860 + atomic_unchecked_t swi_emitted;
40861 int vblank_crtc;
40862 uint32_t irq_enable_reg;
40863 uint32_t r500_disp_irq_reg;
40864 diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
40865 index bdb0f93..5ff558f 100644
40866 --- a/drivers/gpu/drm/radeon/radeon_ioc32.c
40867 +++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
40868 @@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
40869 request = compat_alloc_user_space(sizeof(*request));
40870 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
40871 || __put_user(req32.param, &request->param)
40872 - || __put_user((void __user *)(unsigned long)req32.value,
40873 + || __put_user((unsigned long)req32.value,
40874 &request->value))
40875 return -EFAULT;
40876
40877 @@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
40878 #define compat_radeon_cp_setparam NULL
40879 #endif /* X86_64 || IA64 */
40880
40881 -static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
40882 +static drm_ioctl_compat_t radeon_compat_ioctls[] = {
40883 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
40884 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
40885 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
40886 @@ -393,18 +393,15 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
40887 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40888 {
40889 unsigned int nr = DRM_IOCTL_NR(cmd);
40890 - drm_ioctl_compat_t *fn = NULL;
40891 int ret;
40892
40893 if (nr < DRM_COMMAND_BASE)
40894 return drm_compat_ioctl(filp, cmd, arg);
40895
40896 - if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls))
40897 - fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
40898 -
40899 - if (fn != NULL)
40900 + if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls)) {
40901 + drm_ioctl_compat_t fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
40902 ret = (*fn) (filp, cmd, arg);
40903 - else
40904 + } else
40905 ret = drm_ioctl(filp, cmd, arg);
40906
40907 return ret;
40908 diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
40909 index 244b19b..c19226d 100644
40910 --- a/drivers/gpu/drm/radeon/radeon_irq.c
40911 +++ b/drivers/gpu/drm/radeon/radeon_irq.c
40912 @@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
40913 unsigned int ret;
40914 RING_LOCALS;
40915
40916 - atomic_inc(&dev_priv->swi_emitted);
40917 - ret = atomic_read(&dev_priv->swi_emitted);
40918 + atomic_inc_unchecked(&dev_priv->swi_emitted);
40919 + ret = atomic_read_unchecked(&dev_priv->swi_emitted);
40920
40921 BEGIN_RING(4);
40922 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
40923 @@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
40924 drm_radeon_private_t *dev_priv =
40925 (drm_radeon_private_t *) dev->dev_private;
40926
40927 - atomic_set(&dev_priv->swi_emitted, 0);
40928 + atomic_set_unchecked(&dev_priv->swi_emitted, 0);
40929 init_waitqueue_head(&dev_priv->swi_queue);
40930
40931 dev->max_vblank_count = 0x001fffff;
40932 diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
40933 index 956ab7f..fbd36d8 100644
40934 --- a/drivers/gpu/drm/radeon/radeon_state.c
40935 +++ b/drivers/gpu/drm/radeon/radeon_state.c
40936 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
40937 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
40938 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
40939
40940 - if (copy_from_user(&depth_boxes, clear->depth_boxes,
40941 + if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
40942 sarea_priv->nbox * sizeof(depth_boxes[0])))
40943 return -EFAULT;
40944
40945 @@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
40946 {
40947 drm_radeon_private_t *dev_priv = dev->dev_private;
40948 drm_radeon_getparam_t *param = data;
40949 - int value;
40950 + int value = 0;
40951
40952 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
40953
40954 diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
40955 index 040a2a1..eae4e54 100644
40956 --- a/drivers/gpu/drm/radeon/radeon_ttm.c
40957 +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
40958 @@ -790,7 +790,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
40959 man->size = size >> PAGE_SHIFT;
40960 }
40961
40962 -static struct vm_operations_struct radeon_ttm_vm_ops;
40963 +static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
40964 static const struct vm_operations_struct *ttm_vm_ops = NULL;
40965
40966 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
40967 @@ -831,8 +831,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
40968 }
40969 if (unlikely(ttm_vm_ops == NULL)) {
40970 ttm_vm_ops = vma->vm_ops;
40971 + pax_open_kernel();
40972 radeon_ttm_vm_ops = *ttm_vm_ops;
40973 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
40974 + pax_close_kernel();
40975 }
40976 vma->vm_ops = &radeon_ttm_vm_ops;
40977 return 0;
40978 diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
40979 index 9336006..ce78aa7 100644
40980 --- a/drivers/gpu/drm/tegra/dc.c
40981 +++ b/drivers/gpu/drm/tegra/dc.c
40982 @@ -1057,7 +1057,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
40983 }
40984
40985 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
40986 - dc->debugfs_files[i].data = dc;
40987 + *(void **)&dc->debugfs_files[i].data = dc;
40988
40989 err = drm_debugfs_create_files(dc->debugfs_files,
40990 ARRAY_SIZE(debugfs_files),
40991 diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
40992 index d452faab..f8cbc6a 100644
40993 --- a/drivers/gpu/drm/tegra/dsi.c
40994 +++ b/drivers/gpu/drm/tegra/dsi.c
40995 @@ -53,7 +53,7 @@ struct tegra_dsi {
40996 struct clk *clk_lp;
40997 struct clk *clk;
40998
40999 - struct drm_info_list *debugfs_files;
41000 + drm_info_list_no_const *debugfs_files;
41001 struct drm_minor *minor;
41002 struct dentry *debugfs;
41003
41004 diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
41005 index 6928015..c9853e7 100644
41006 --- a/drivers/gpu/drm/tegra/hdmi.c
41007 +++ b/drivers/gpu/drm/tegra/hdmi.c
41008 @@ -59,7 +59,7 @@ struct tegra_hdmi {
41009 bool stereo;
41010 bool dvi;
41011
41012 - struct drm_info_list *debugfs_files;
41013 + drm_info_list_no_const *debugfs_files;
41014 struct drm_minor *minor;
41015 struct dentry *debugfs;
41016 };
41017 diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41018 index c58eba33..83c2728 100644
41019 --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
41020 +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41021 @@ -141,10 +141,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
41022 }
41023
41024 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
41025 - ttm_bo_man_init,
41026 - ttm_bo_man_takedown,
41027 - ttm_bo_man_get_node,
41028 - ttm_bo_man_put_node,
41029 - ttm_bo_man_debug
41030 + .init = ttm_bo_man_init,
41031 + .takedown = ttm_bo_man_takedown,
41032 + .get_node = ttm_bo_man_get_node,
41033 + .put_node = ttm_bo_man_put_node,
41034 + .debug = ttm_bo_man_debug
41035 };
41036 EXPORT_SYMBOL(ttm_bo_manager_func);
41037 diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
41038 index dbc2def..0a9f710 100644
41039 --- a/drivers/gpu/drm/ttm/ttm_memory.c
41040 +++ b/drivers/gpu/drm/ttm/ttm_memory.c
41041 @@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
41042 zone->glob = glob;
41043 glob->zone_kernel = zone;
41044 ret = kobject_init_and_add(
41045 - &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41046 + &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41047 if (unlikely(ret != 0)) {
41048 kobject_put(&zone->kobj);
41049 return ret;
41050 @@ -347,7 +347,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
41051 zone->glob = glob;
41052 glob->zone_dma32 = zone;
41053 ret = kobject_init_and_add(
41054 - &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41055 + &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41056 if (unlikely(ret != 0)) {
41057 kobject_put(&zone->kobj);
41058 return ret;
41059 diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41060 index 863bef9..cba15cf 100644
41061 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
41062 +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41063 @@ -391,9 +391,9 @@ out:
41064 static unsigned long
41065 ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41066 {
41067 - static atomic_t start_pool = ATOMIC_INIT(0);
41068 + static atomic_unchecked_t start_pool = ATOMIC_INIT(0);
41069 unsigned i;
41070 - unsigned pool_offset = atomic_add_return(1, &start_pool);
41071 + unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool);
41072 struct ttm_page_pool *pool;
41073 int shrink_pages = sc->nr_to_scan;
41074 unsigned long freed = 0;
41075 diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
41076 index dbadd49..1b7457b 100644
41077 --- a/drivers/gpu/drm/udl/udl_fb.c
41078 +++ b/drivers/gpu/drm/udl/udl_fb.c
41079 @@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
41080 fb_deferred_io_cleanup(info);
41081 kfree(info->fbdefio);
41082 info->fbdefio = NULL;
41083 - info->fbops->fb_mmap = udl_fb_mmap;
41084 }
41085
41086 pr_warn("released /dev/fb%d user=%d count=%d\n",
41087 diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
41088 index ad02732..144f5ed 100644
41089 --- a/drivers/gpu/drm/via/via_drv.h
41090 +++ b/drivers/gpu/drm/via/via_drv.h
41091 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
41092 typedef uint32_t maskarray_t[5];
41093
41094 typedef struct drm_via_irq {
41095 - atomic_t irq_received;
41096 + atomic_unchecked_t irq_received;
41097 uint32_t pending_mask;
41098 uint32_t enable_mask;
41099 wait_queue_head_t irq_queue;
41100 @@ -75,7 +75,7 @@ typedef struct drm_via_private {
41101 struct timeval last_vblank;
41102 int last_vblank_valid;
41103 unsigned usec_per_vblank;
41104 - atomic_t vbl_received;
41105 + atomic_unchecked_t vbl_received;
41106 drm_via_state_t hc_state;
41107 char pci_buf[VIA_PCI_BUF_SIZE];
41108 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
41109 diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
41110 index 1319433..a993b0c 100644
41111 --- a/drivers/gpu/drm/via/via_irq.c
41112 +++ b/drivers/gpu/drm/via/via_irq.c
41113 @@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
41114 if (crtc != 0)
41115 return 0;
41116
41117 - return atomic_read(&dev_priv->vbl_received);
41118 + return atomic_read_unchecked(&dev_priv->vbl_received);
41119 }
41120
41121 irqreturn_t via_driver_irq_handler(int irq, void *arg)
41122 @@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41123
41124 status = VIA_READ(VIA_REG_INTERRUPT);
41125 if (status & VIA_IRQ_VBLANK_PENDING) {
41126 - atomic_inc(&dev_priv->vbl_received);
41127 - if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
41128 + atomic_inc_unchecked(&dev_priv->vbl_received);
41129 + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
41130 do_gettimeofday(&cur_vblank);
41131 if (dev_priv->last_vblank_valid) {
41132 dev_priv->usec_per_vblank =
41133 @@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41134 dev_priv->last_vblank = cur_vblank;
41135 dev_priv->last_vblank_valid = 1;
41136 }
41137 - if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
41138 + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
41139 DRM_DEBUG("US per vblank is: %u\n",
41140 dev_priv->usec_per_vblank);
41141 }
41142 @@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41143
41144 for (i = 0; i < dev_priv->num_irqs; ++i) {
41145 if (status & cur_irq->pending_mask) {
41146 - atomic_inc(&cur_irq->irq_received);
41147 + atomic_inc_unchecked(&cur_irq->irq_received);
41148 wake_up(&cur_irq->irq_queue);
41149 handled = 1;
41150 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
41151 @@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
41152 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41153 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
41154 masks[irq][4]));
41155 - cur_irq_sequence = atomic_read(&cur_irq->irq_received);
41156 + cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
41157 } else {
41158 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41159 (((cur_irq_sequence =
41160 - atomic_read(&cur_irq->irq_received)) -
41161 + atomic_read_unchecked(&cur_irq->irq_received)) -
41162 *sequence) <= (1 << 23)));
41163 }
41164 *sequence = cur_irq_sequence;
41165 @@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
41166 }
41167
41168 for (i = 0; i < dev_priv->num_irqs; ++i) {
41169 - atomic_set(&cur_irq->irq_received, 0);
41170 + atomic_set_unchecked(&cur_irq->irq_received, 0);
41171 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
41172 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
41173 init_waitqueue_head(&cur_irq->irq_queue);
41174 @@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
41175 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
41176 case VIA_IRQ_RELATIVE:
41177 irqwait->request.sequence +=
41178 - atomic_read(&cur_irq->irq_received);
41179 + atomic_read_unchecked(&cur_irq->irq_received);
41180 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
41181 case VIA_IRQ_ABSOLUTE:
41182 break;
41183 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41184 index 0783155..b29e18e 100644
41185 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41186 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41187 @@ -437,7 +437,7 @@ struct vmw_private {
41188 * Fencing and IRQs.
41189 */
41190
41191 - atomic_t marker_seq;
41192 + atomic_unchecked_t marker_seq;
41193 wait_queue_head_t fence_queue;
41194 wait_queue_head_t fifo_queue;
41195 int fence_queue_waiters; /* Protected by hw_mutex */
41196 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41197 index 6ccd993..618d592 100644
41198 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41199 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41200 @@ -154,7 +154,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
41201 (unsigned int) min,
41202 (unsigned int) fifo->capabilities);
41203
41204 - atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41205 + atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41206 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
41207 vmw_marker_queue_init(&fifo->marker_queue);
41208 return vmw_fifo_send_fence(dev_priv, &dummy);
41209 @@ -372,7 +372,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
41210 if (reserveable)
41211 iowrite32(bytes, fifo_mem +
41212 SVGA_FIFO_RESERVED);
41213 - return fifo_mem + (next_cmd >> 2);
41214 + return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
41215 } else {
41216 need_bounce = true;
41217 }
41218 @@ -492,7 +492,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41219
41220 fm = vmw_fifo_reserve(dev_priv, bytes);
41221 if (unlikely(fm == NULL)) {
41222 - *seqno = atomic_read(&dev_priv->marker_seq);
41223 + *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41224 ret = -ENOMEM;
41225 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
41226 false, 3*HZ);
41227 @@ -500,7 +500,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41228 }
41229
41230 do {
41231 - *seqno = atomic_add_return(1, &dev_priv->marker_seq);
41232 + *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
41233 } while (*seqno == 0);
41234
41235 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
41236 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41237 index b1273e8..9c274fd 100644
41238 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41239 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41240 @@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
41241 }
41242
41243 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
41244 - vmw_gmrid_man_init,
41245 - vmw_gmrid_man_takedown,
41246 - vmw_gmrid_man_get_node,
41247 - vmw_gmrid_man_put_node,
41248 - vmw_gmrid_man_debug
41249 + .init = vmw_gmrid_man_init,
41250 + .takedown = vmw_gmrid_man_takedown,
41251 + .get_node = vmw_gmrid_man_get_node,
41252 + .put_node = vmw_gmrid_man_put_node,
41253 + .debug = vmw_gmrid_man_debug
41254 };
41255 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41256 index 47b7094..698ba09 100644
41257 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41258 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41259 @@ -236,7 +236,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
41260 int ret;
41261
41262 num_clips = arg->num_clips;
41263 - clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
41264 + clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
41265
41266 if (unlikely(num_clips == 0))
41267 return 0;
41268 @@ -320,7 +320,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
41269 int ret;
41270
41271 num_clips = arg->num_clips;
41272 - clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
41273 + clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
41274
41275 if (unlikely(num_clips == 0))
41276 return 0;
41277 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41278 index 0c42376..6febe77 100644
41279 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41280 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41281 @@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
41282 * emitted. Then the fence is stale and signaled.
41283 */
41284
41285 - ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
41286 + ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
41287 > VMW_FENCE_WRAP);
41288
41289 return ret;
41290 @@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
41291
41292 if (fifo_idle)
41293 down_read(&fifo_state->rwsem);
41294 - signal_seq = atomic_read(&dev_priv->marker_seq);
41295 + signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
41296 ret = 0;
41297
41298 for (;;) {
41299 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41300 index 8a8725c2..afed796 100644
41301 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41302 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41303 @@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
41304 while (!vmw_lag_lt(queue, us)) {
41305 spin_lock(&queue->lock);
41306 if (list_empty(&queue->head))
41307 - seqno = atomic_read(&dev_priv->marker_seq);
41308 + seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41309 else {
41310 marker = list_first_entry(&queue->head,
41311 struct vmw_marker, head);
41312 diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
41313 index ec0ae2d..dc0780b 100644
41314 --- a/drivers/gpu/vga/vga_switcheroo.c
41315 +++ b/drivers/gpu/vga/vga_switcheroo.c
41316 @@ -643,7 +643,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
41317
41318 /* this version is for the case where the power switch is separate
41319 to the device being powered down. */
41320 -int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
41321 +int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
41322 {
41323 /* copy over all the bus versions */
41324 if (dev->bus && dev->bus->pm) {
41325 @@ -688,7 +688,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
41326 return ret;
41327 }
41328
41329 -int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
41330 +int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
41331 {
41332 /* copy over all the bus versions */
41333 if (dev->bus && dev->bus->pm) {
41334 diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
41335 index cc32a6f..02a4b1c 100644
41336 --- a/drivers/hid/hid-core.c
41337 +++ b/drivers/hid/hid-core.c
41338 @@ -2421,7 +2421,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
41339
41340 int hid_add_device(struct hid_device *hdev)
41341 {
41342 - static atomic_t id = ATOMIC_INIT(0);
41343 + static atomic_unchecked_t id = ATOMIC_INIT(0);
41344 int ret;
41345
41346 if (WARN_ON(hdev->status & HID_STAT_ADDED))
41347 @@ -2455,7 +2455,7 @@ int hid_add_device(struct hid_device *hdev)
41348 /* XXX hack, any other cleaner solution after the driver core
41349 * is converted to allow more than 20 bytes as the device name? */
41350 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
41351 - hdev->vendor, hdev->product, atomic_inc_return(&id));
41352 + hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
41353
41354 hid_debug_register(hdev, dev_name(&hdev->dev));
41355 ret = device_add(&hdev->dev);
41356 diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
41357 index c13fb5b..55a3802 100644
41358 --- a/drivers/hid/hid-wiimote-debug.c
41359 +++ b/drivers/hid/hid-wiimote-debug.c
41360 @@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
41361 else if (size == 0)
41362 return -EIO;
41363
41364 - if (copy_to_user(u, buf, size))
41365 + if (size > sizeof(buf) || copy_to_user(u, buf, size))
41366 return -EFAULT;
41367
41368 *off += size;
41369 diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
41370 index cedc6da..2c3da2a 100644
41371 --- a/drivers/hid/uhid.c
41372 +++ b/drivers/hid/uhid.c
41373 @@ -47,7 +47,7 @@ struct uhid_device {
41374 struct mutex report_lock;
41375 wait_queue_head_t report_wait;
41376 atomic_t report_done;
41377 - atomic_t report_id;
41378 + atomic_unchecked_t report_id;
41379 struct uhid_event report_buf;
41380 };
41381
41382 @@ -163,7 +163,7 @@ static int uhid_hid_get_raw(struct hid_device *hid, unsigned char rnum,
41383
41384 spin_lock_irqsave(&uhid->qlock, flags);
41385 ev->type = UHID_FEATURE;
41386 - ev->u.feature.id = atomic_inc_return(&uhid->report_id);
41387 + ev->u.feature.id = atomic_inc_return_unchecked(&uhid->report_id);
41388 ev->u.feature.rnum = rnum;
41389 ev->u.feature.rtype = report_type;
41390
41391 @@ -446,7 +446,7 @@ static int uhid_dev_feature_answer(struct uhid_device *uhid,
41392 spin_lock_irqsave(&uhid->qlock, flags);
41393
41394 /* id for old report; drop it silently */
41395 - if (atomic_read(&uhid->report_id) != ev->u.feature_answer.id)
41396 + if (atomic_read_unchecked(&uhid->report_id) != ev->u.feature_answer.id)
41397 goto unlock;
41398 if (atomic_read(&uhid->report_done))
41399 goto unlock;
41400 diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
41401 index 69ea36f..8dbf4bb 100644
41402 --- a/drivers/hv/channel.c
41403 +++ b/drivers/hv/channel.c
41404 @@ -364,8 +364,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
41405 int ret = 0;
41406 int t;
41407
41408 - next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
41409 - atomic_inc(&vmbus_connection.next_gpadl_handle);
41410 + next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
41411 + atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
41412
41413 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
41414 if (ret)
41415 diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
41416 index bcb4950..61dba6c 100644
41417 --- a/drivers/hv/hv.c
41418 +++ b/drivers/hv/hv.c
41419 @@ -112,7 +112,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
41420 u64 output_address = (output) ? virt_to_phys(output) : 0;
41421 u32 output_address_hi = output_address >> 32;
41422 u32 output_address_lo = output_address & 0xFFFFFFFF;
41423 - void *hypercall_page = hv_context.hypercall_page;
41424 + void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
41425
41426 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
41427 "=a"(hv_status_lo) : "d" (control_hi),
41428 @@ -154,7 +154,7 @@ int hv_init(void)
41429 /* See if the hypercall page is already set */
41430 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
41431
41432 - virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
41433 + virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
41434
41435 if (!virtaddr)
41436 goto cleanup;
41437 diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
41438 index 7e17a54..a50a33d 100644
41439 --- a/drivers/hv/hv_balloon.c
41440 +++ b/drivers/hv/hv_balloon.c
41441 @@ -464,7 +464,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
41442
41443 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
41444 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
41445 -static atomic_t trans_id = ATOMIC_INIT(0);
41446 +static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
41447
41448 static int dm_ring_size = (5 * PAGE_SIZE);
41449
41450 @@ -886,7 +886,7 @@ static void hot_add_req(struct work_struct *dummy)
41451 pr_info("Memory hot add failed\n");
41452
41453 dm->state = DM_INITIALIZED;
41454 - resp.hdr.trans_id = atomic_inc_return(&trans_id);
41455 + resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41456 vmbus_sendpacket(dm->dev->channel, &resp,
41457 sizeof(struct dm_hot_add_response),
41458 (unsigned long)NULL,
41459 @@ -960,7 +960,7 @@ static void post_status(struct hv_dynmem_device *dm)
41460 memset(&status, 0, sizeof(struct dm_status));
41461 status.hdr.type = DM_STATUS_REPORT;
41462 status.hdr.size = sizeof(struct dm_status);
41463 - status.hdr.trans_id = atomic_inc_return(&trans_id);
41464 + status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41465
41466 /*
41467 * The host expects the guest to report free memory.
41468 @@ -980,7 +980,7 @@ static void post_status(struct hv_dynmem_device *dm)
41469 * send the status. This can happen if we were interrupted
41470 * after we picked our transaction ID.
41471 */
41472 - if (status.hdr.trans_id != atomic_read(&trans_id))
41473 + if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
41474 return;
41475
41476 vmbus_sendpacket(dm->dev->channel, &status,
41477 @@ -1108,7 +1108,7 @@ static void balloon_up(struct work_struct *dummy)
41478 */
41479
41480 do {
41481 - bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
41482 + bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41483 ret = vmbus_sendpacket(dm_device.dev->channel,
41484 bl_resp,
41485 bl_resp->hdr.size,
41486 @@ -1152,7 +1152,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
41487
41488 memset(&resp, 0, sizeof(struct dm_unballoon_response));
41489 resp.hdr.type = DM_UNBALLOON_RESPONSE;
41490 - resp.hdr.trans_id = atomic_inc_return(&trans_id);
41491 + resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41492 resp.hdr.size = sizeof(struct dm_unballoon_response);
41493
41494 vmbus_sendpacket(dm_device.dev->channel, &resp,
41495 @@ -1215,7 +1215,7 @@ static void version_resp(struct hv_dynmem_device *dm,
41496 memset(&version_req, 0, sizeof(struct dm_version_request));
41497 version_req.hdr.type = DM_VERSION_REQUEST;
41498 version_req.hdr.size = sizeof(struct dm_version_request);
41499 - version_req.hdr.trans_id = atomic_inc_return(&trans_id);
41500 + version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41501 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
41502 version_req.is_last_attempt = 1;
41503
41504 @@ -1385,7 +1385,7 @@ static int balloon_probe(struct hv_device *dev,
41505 memset(&version_req, 0, sizeof(struct dm_version_request));
41506 version_req.hdr.type = DM_VERSION_REQUEST;
41507 version_req.hdr.size = sizeof(struct dm_version_request);
41508 - version_req.hdr.trans_id = atomic_inc_return(&trans_id);
41509 + version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41510 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
41511 version_req.is_last_attempt = 0;
41512
41513 @@ -1416,7 +1416,7 @@ static int balloon_probe(struct hv_device *dev,
41514 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
41515 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
41516 cap_msg.hdr.size = sizeof(struct dm_capabilities);
41517 - cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
41518 + cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41519
41520 cap_msg.caps.cap_bits.balloon = 1;
41521 cap_msg.caps.cap_bits.hot_add = 1;
41522 diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
41523 index e055176..c22ff1f 100644
41524 --- a/drivers/hv/hyperv_vmbus.h
41525 +++ b/drivers/hv/hyperv_vmbus.h
41526 @@ -602,7 +602,7 @@ enum vmbus_connect_state {
41527 struct vmbus_connection {
41528 enum vmbus_connect_state conn_state;
41529
41530 - atomic_t next_gpadl_handle;
41531 + atomic_unchecked_t next_gpadl_handle;
41532
41533 /*
41534 * Represents channel interrupts. Each bit position represents a
41535 diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
41536 index 077bb1b..d433d74 100644
41537 --- a/drivers/hv/vmbus_drv.c
41538 +++ b/drivers/hv/vmbus_drv.c
41539 @@ -844,10 +844,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
41540 {
41541 int ret = 0;
41542
41543 - static atomic_t device_num = ATOMIC_INIT(0);
41544 + static atomic_unchecked_t device_num = ATOMIC_INIT(0);
41545
41546 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
41547 - atomic_inc_return(&device_num));
41548 + atomic_inc_return_unchecked(&device_num));
41549
41550 child_device_obj->device.bus = &hv_bus;
41551 child_device_obj->device.parent = &hv_acpi_dev->dev;
41552 diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
41553 index 579bdf9..75118b5 100644
41554 --- a/drivers/hwmon/acpi_power_meter.c
41555 +++ b/drivers/hwmon/acpi_power_meter.c
41556 @@ -116,7 +116,7 @@ struct sensor_template {
41557 struct device_attribute *devattr,
41558 const char *buf, size_t count);
41559 int index;
41560 -};
41561 +} __do_const;
41562
41563 /* Averaging interval */
41564 static int update_avg_interval(struct acpi_power_meter_resource *resource)
41565 @@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
41566 struct sensor_template *attrs)
41567 {
41568 struct device *dev = &resource->acpi_dev->dev;
41569 - struct sensor_device_attribute *sensors =
41570 + sensor_device_attribute_no_const *sensors =
41571 &resource->sensors[resource->num_sensors];
41572 int res = 0;
41573
41574 diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
41575 index 3288f13..71cfb4e 100644
41576 --- a/drivers/hwmon/applesmc.c
41577 +++ b/drivers/hwmon/applesmc.c
41578 @@ -1106,7 +1106,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
41579 {
41580 struct applesmc_node_group *grp;
41581 struct applesmc_dev_attr *node;
41582 - struct attribute *attr;
41583 + attribute_no_const *attr;
41584 int ret, i;
41585
41586 for (grp = groups; grp->format; grp++) {
41587 diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
41588 index ae208f6..48b6c5b 100644
41589 --- a/drivers/hwmon/asus_atk0110.c
41590 +++ b/drivers/hwmon/asus_atk0110.c
41591 @@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
41592 struct atk_sensor_data {
41593 struct list_head list;
41594 struct atk_data *data;
41595 - struct device_attribute label_attr;
41596 - struct device_attribute input_attr;
41597 - struct device_attribute limit1_attr;
41598 - struct device_attribute limit2_attr;
41599 + device_attribute_no_const label_attr;
41600 + device_attribute_no_const input_attr;
41601 + device_attribute_no_const limit1_attr;
41602 + device_attribute_no_const limit2_attr;
41603 char label_attr_name[ATTR_NAME_SIZE];
41604 char input_attr_name[ATTR_NAME_SIZE];
41605 char limit1_attr_name[ATTR_NAME_SIZE];
41606 @@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
41607 static struct device_attribute atk_name_attr =
41608 __ATTR(name, 0444, atk_name_show, NULL);
41609
41610 -static void atk_init_attribute(struct device_attribute *attr, char *name,
41611 +static void atk_init_attribute(device_attribute_no_const *attr, char *name,
41612 sysfs_show_func show)
41613 {
41614 sysfs_attr_init(&attr->attr);
41615 diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
41616 index bbb0b0d..9fe1332 100644
41617 --- a/drivers/hwmon/coretemp.c
41618 +++ b/drivers/hwmon/coretemp.c
41619 @@ -823,7 +823,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
41620 return NOTIFY_OK;
41621 }
41622
41623 -static struct notifier_block coretemp_cpu_notifier __refdata = {
41624 +static struct notifier_block coretemp_cpu_notifier = {
41625 .notifier_call = coretemp_cpu_callback,
41626 };
41627
41628 diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
41629 index 632f1dc..57e6a58 100644
41630 --- a/drivers/hwmon/ibmaem.c
41631 +++ b/drivers/hwmon/ibmaem.c
41632 @@ -926,7 +926,7 @@ static int aem_register_sensors(struct aem_data *data,
41633 struct aem_rw_sensor_template *rw)
41634 {
41635 struct device *dev = &data->pdev->dev;
41636 - struct sensor_device_attribute *sensors = data->sensors;
41637 + sensor_device_attribute_no_const *sensors = data->sensors;
41638 int err;
41639
41640 /* Set up read-only sensors */
41641 diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
41642 index 708081b..fe2d4ab 100644
41643 --- a/drivers/hwmon/iio_hwmon.c
41644 +++ b/drivers/hwmon/iio_hwmon.c
41645 @@ -73,7 +73,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
41646 {
41647 struct device *dev = &pdev->dev;
41648 struct iio_hwmon_state *st;
41649 - struct sensor_device_attribute *a;
41650 + sensor_device_attribute_no_const *a;
41651 int ret, i;
41652 int in_i = 1, temp_i = 1, curr_i = 1;
41653 enum iio_chan_type type;
41654 diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
41655 index 38d5a63..cf2c2ea 100644
41656 --- a/drivers/hwmon/nct6775.c
41657 +++ b/drivers/hwmon/nct6775.c
41658 @@ -944,10 +944,10 @@ static struct attribute_group *
41659 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
41660 int repeat)
41661 {
41662 - struct attribute_group *group;
41663 + attribute_group_no_const *group;
41664 struct sensor_device_attr_u *su;
41665 - struct sensor_device_attribute *a;
41666 - struct sensor_device_attribute_2 *a2;
41667 + sensor_device_attribute_no_const *a;
41668 + sensor_device_attribute_2_no_const *a2;
41669 struct attribute **attrs;
41670 struct sensor_device_template **t;
41671 int i, count;
41672 diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
41673 index 291d11f..3f0dbbd 100644
41674 --- a/drivers/hwmon/pmbus/pmbus_core.c
41675 +++ b/drivers/hwmon/pmbus/pmbus_core.c
41676 @@ -783,7 +783,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
41677 return 0;
41678 }
41679
41680 -static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
41681 +static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
41682 const char *name,
41683 umode_t mode,
41684 ssize_t (*show)(struct device *dev,
41685 @@ -800,7 +800,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
41686 dev_attr->store = store;
41687 }
41688
41689 -static void pmbus_attr_init(struct sensor_device_attribute *a,
41690 +static void pmbus_attr_init(sensor_device_attribute_no_const *a,
41691 const char *name,
41692 umode_t mode,
41693 ssize_t (*show)(struct device *dev,
41694 @@ -822,7 +822,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
41695 u16 reg, u8 mask)
41696 {
41697 struct pmbus_boolean *boolean;
41698 - struct sensor_device_attribute *a;
41699 + sensor_device_attribute_no_const *a;
41700
41701 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
41702 if (!boolean)
41703 @@ -847,7 +847,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
41704 bool update, bool readonly)
41705 {
41706 struct pmbus_sensor *sensor;
41707 - struct device_attribute *a;
41708 + device_attribute_no_const *a;
41709
41710 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
41711 if (!sensor)
41712 @@ -878,7 +878,7 @@ static int pmbus_add_label(struct pmbus_data *data,
41713 const char *lstring, int index)
41714 {
41715 struct pmbus_label *label;
41716 - struct device_attribute *a;
41717 + device_attribute_no_const *a;
41718
41719 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
41720 if (!label)
41721 diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
41722 index 97cd45a..ac54d8b 100644
41723 --- a/drivers/hwmon/sht15.c
41724 +++ b/drivers/hwmon/sht15.c
41725 @@ -169,7 +169,7 @@ struct sht15_data {
41726 int supply_uv;
41727 bool supply_uv_valid;
41728 struct work_struct update_supply_work;
41729 - atomic_t interrupt_handled;
41730 + atomic_unchecked_t interrupt_handled;
41731 };
41732
41733 /**
41734 @@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
41735 ret = gpio_direction_input(data->pdata->gpio_data);
41736 if (ret)
41737 return ret;
41738 - atomic_set(&data->interrupt_handled, 0);
41739 + atomic_set_unchecked(&data->interrupt_handled, 0);
41740
41741 enable_irq(gpio_to_irq(data->pdata->gpio_data));
41742 if (gpio_get_value(data->pdata->gpio_data) == 0) {
41743 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
41744 /* Only relevant if the interrupt hasn't occurred. */
41745 - if (!atomic_read(&data->interrupt_handled))
41746 + if (!atomic_read_unchecked(&data->interrupt_handled))
41747 schedule_work(&data->read_work);
41748 }
41749 ret = wait_event_timeout(data->wait_queue,
41750 @@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
41751
41752 /* First disable the interrupt */
41753 disable_irq_nosync(irq);
41754 - atomic_inc(&data->interrupt_handled);
41755 + atomic_inc_unchecked(&data->interrupt_handled);
41756 /* Then schedule a reading work struct */
41757 if (data->state != SHT15_READING_NOTHING)
41758 schedule_work(&data->read_work);
41759 @@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
41760 * If not, then start the interrupt again - care here as could
41761 * have gone low in meantime so verify it hasn't!
41762 */
41763 - atomic_set(&data->interrupt_handled, 0);
41764 + atomic_set_unchecked(&data->interrupt_handled, 0);
41765 enable_irq(gpio_to_irq(data->pdata->gpio_data));
41766 /* If still not occurred or another handler was scheduled */
41767 if (gpio_get_value(data->pdata->gpio_data)
41768 - || atomic_read(&data->interrupt_handled))
41769 + || atomic_read_unchecked(&data->interrupt_handled))
41770 return;
41771 }
41772
41773 diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
41774 index 38944e9..ae9e5ed 100644
41775 --- a/drivers/hwmon/via-cputemp.c
41776 +++ b/drivers/hwmon/via-cputemp.c
41777 @@ -296,7 +296,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
41778 return NOTIFY_OK;
41779 }
41780
41781 -static struct notifier_block via_cputemp_cpu_notifier __refdata = {
41782 +static struct notifier_block via_cputemp_cpu_notifier = {
41783 .notifier_call = via_cputemp_cpu_callback,
41784 };
41785
41786 diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
41787 index 41fc683..a39cfea 100644
41788 --- a/drivers/i2c/busses/i2c-amd756-s4882.c
41789 +++ b/drivers/i2c/busses/i2c-amd756-s4882.c
41790 @@ -43,7 +43,7 @@
41791 extern struct i2c_adapter amd756_smbus;
41792
41793 static struct i2c_adapter *s4882_adapter;
41794 -static struct i2c_algorithm *s4882_algo;
41795 +static i2c_algorithm_no_const *s4882_algo;
41796
41797 /* Wrapper access functions for multiplexed SMBus */
41798 static DEFINE_MUTEX(amd756_lock);
41799 diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
41800 index 721f7eb..0fd2a09 100644
41801 --- a/drivers/i2c/busses/i2c-diolan-u2c.c
41802 +++ b/drivers/i2c/busses/i2c-diolan-u2c.c
41803 @@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
41804 /* usb layer */
41805
41806 /* Send command to device, and get response. */
41807 -static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
41808 +static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
41809 {
41810 int ret = 0;
41811 int actual;
41812 diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
41813 index b170bdf..3c76427 100644
41814 --- a/drivers/i2c/busses/i2c-nforce2-s4985.c
41815 +++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
41816 @@ -41,7 +41,7 @@
41817 extern struct i2c_adapter *nforce2_smbus;
41818
41819 static struct i2c_adapter *s4985_adapter;
41820 -static struct i2c_algorithm *s4985_algo;
41821 +static i2c_algorithm_no_const *s4985_algo;
41822
41823 /* Wrapper access functions for multiplexed SMBus */
41824 static DEFINE_MUTEX(nforce2_lock);
41825 diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
41826 index 80b47e8..1a6040d9 100644
41827 --- a/drivers/i2c/i2c-dev.c
41828 +++ b/drivers/i2c/i2c-dev.c
41829 @@ -277,7 +277,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
41830 break;
41831 }
41832
41833 - data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
41834 + data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
41835 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
41836 if (IS_ERR(rdwr_pa[i].buf)) {
41837 res = PTR_ERR(rdwr_pa[i].buf);
41838 diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
41839 index 0b510ba..4fbb5085 100644
41840 --- a/drivers/ide/ide-cd.c
41841 +++ b/drivers/ide/ide-cd.c
41842 @@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
41843 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
41844 if ((unsigned long)buf & alignment
41845 || blk_rq_bytes(rq) & q->dma_pad_mask
41846 - || object_is_on_stack(buf))
41847 + || object_starts_on_stack(buf))
41848 drive->dma = 0;
41849 }
41850 }
41851 diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
41852 index acc911a..8700c3c 100644
41853 --- a/drivers/iio/industrialio-core.c
41854 +++ b/drivers/iio/industrialio-core.c
41855 @@ -527,7 +527,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
41856 }
41857
41858 static
41859 -int __iio_device_attr_init(struct device_attribute *dev_attr,
41860 +int __iio_device_attr_init(device_attribute_no_const *dev_attr,
41861 const char *postfix,
41862 struct iio_chan_spec const *chan,
41863 ssize_t (*readfunc)(struct device *dev,
41864 diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
41865 index 0601b9d..e9dc455 100644
41866 --- a/drivers/infiniband/core/cm.c
41867 +++ b/drivers/infiniband/core/cm.c
41868 @@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
41869
41870 struct cm_counter_group {
41871 struct kobject obj;
41872 - atomic_long_t counter[CM_ATTR_COUNT];
41873 + atomic_long_unchecked_t counter[CM_ATTR_COUNT];
41874 };
41875
41876 struct cm_counter_attribute {
41877 @@ -1415,7 +1415,7 @@ static void cm_dup_req_handler(struct cm_work *work,
41878 struct ib_mad_send_buf *msg = NULL;
41879 int ret;
41880
41881 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
41882 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
41883 counter[CM_REQ_COUNTER]);
41884
41885 /* Quick state check to discard duplicate REQs. */
41886 @@ -1802,7 +1802,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
41887 if (!cm_id_priv)
41888 return;
41889
41890 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
41891 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
41892 counter[CM_REP_COUNTER]);
41893 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
41894 if (ret)
41895 @@ -1969,7 +1969,7 @@ static int cm_rtu_handler(struct cm_work *work)
41896 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
41897 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
41898 spin_unlock_irq(&cm_id_priv->lock);
41899 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
41900 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
41901 counter[CM_RTU_COUNTER]);
41902 goto out;
41903 }
41904 @@ -2152,7 +2152,7 @@ static int cm_dreq_handler(struct cm_work *work)
41905 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
41906 dreq_msg->local_comm_id);
41907 if (!cm_id_priv) {
41908 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
41909 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
41910 counter[CM_DREQ_COUNTER]);
41911 cm_issue_drep(work->port, work->mad_recv_wc);
41912 return -EINVAL;
41913 @@ -2177,7 +2177,7 @@ static int cm_dreq_handler(struct cm_work *work)
41914 case IB_CM_MRA_REP_RCVD:
41915 break;
41916 case IB_CM_TIMEWAIT:
41917 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
41918 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
41919 counter[CM_DREQ_COUNTER]);
41920 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
41921 goto unlock;
41922 @@ -2191,7 +2191,7 @@ static int cm_dreq_handler(struct cm_work *work)
41923 cm_free_msg(msg);
41924 goto deref;
41925 case IB_CM_DREQ_RCVD:
41926 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
41927 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
41928 counter[CM_DREQ_COUNTER]);
41929 goto unlock;
41930 default:
41931 @@ -2558,7 +2558,7 @@ static int cm_mra_handler(struct cm_work *work)
41932 ib_modify_mad(cm_id_priv->av.port->mad_agent,
41933 cm_id_priv->msg, timeout)) {
41934 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
41935 - atomic_long_inc(&work->port->
41936 + atomic_long_inc_unchecked(&work->port->
41937 counter_group[CM_RECV_DUPLICATES].
41938 counter[CM_MRA_COUNTER]);
41939 goto out;
41940 @@ -2567,7 +2567,7 @@ static int cm_mra_handler(struct cm_work *work)
41941 break;
41942 case IB_CM_MRA_REQ_RCVD:
41943 case IB_CM_MRA_REP_RCVD:
41944 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
41945 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
41946 counter[CM_MRA_COUNTER]);
41947 /* fall through */
41948 default:
41949 @@ -2729,7 +2729,7 @@ static int cm_lap_handler(struct cm_work *work)
41950 case IB_CM_LAP_IDLE:
41951 break;
41952 case IB_CM_MRA_LAP_SENT:
41953 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
41954 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
41955 counter[CM_LAP_COUNTER]);
41956 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
41957 goto unlock;
41958 @@ -2745,7 +2745,7 @@ static int cm_lap_handler(struct cm_work *work)
41959 cm_free_msg(msg);
41960 goto deref;
41961 case IB_CM_LAP_RCVD:
41962 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
41963 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
41964 counter[CM_LAP_COUNTER]);
41965 goto unlock;
41966 default:
41967 @@ -3029,7 +3029,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
41968 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
41969 if (cur_cm_id_priv) {
41970 spin_unlock_irq(&cm.lock);
41971 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
41972 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
41973 counter[CM_SIDR_REQ_COUNTER]);
41974 goto out; /* Duplicate message. */
41975 }
41976 @@ -3241,10 +3241,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
41977 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
41978 msg->retries = 1;
41979
41980 - atomic_long_add(1 + msg->retries,
41981 + atomic_long_add_unchecked(1 + msg->retries,
41982 &port->counter_group[CM_XMIT].counter[attr_index]);
41983 if (msg->retries)
41984 - atomic_long_add(msg->retries,
41985 + atomic_long_add_unchecked(msg->retries,
41986 &port->counter_group[CM_XMIT_RETRIES].
41987 counter[attr_index]);
41988
41989 @@ -3454,7 +3454,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
41990 }
41991
41992 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
41993 - atomic_long_inc(&port->counter_group[CM_RECV].
41994 + atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
41995 counter[attr_id - CM_ATTR_ID_OFFSET]);
41996
41997 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
41998 @@ -3685,7 +3685,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
41999 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
42000
42001 return sprintf(buf, "%ld\n",
42002 - atomic_long_read(&group->counter[cm_attr->index]));
42003 + atomic_long_read_unchecked(&group->counter[cm_attr->index]));
42004 }
42005
42006 static const struct sysfs_ops cm_counter_ops = {
42007 diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
42008 index 9f5ad7c..588cd84 100644
42009 --- a/drivers/infiniband/core/fmr_pool.c
42010 +++ b/drivers/infiniband/core/fmr_pool.c
42011 @@ -98,8 +98,8 @@ struct ib_fmr_pool {
42012
42013 struct task_struct *thread;
42014
42015 - atomic_t req_ser;
42016 - atomic_t flush_ser;
42017 + atomic_unchecked_t req_ser;
42018 + atomic_unchecked_t flush_ser;
42019
42020 wait_queue_head_t force_wait;
42021 };
42022 @@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42023 struct ib_fmr_pool *pool = pool_ptr;
42024
42025 do {
42026 - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
42027 + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
42028 ib_fmr_batch_release(pool);
42029
42030 - atomic_inc(&pool->flush_ser);
42031 + atomic_inc_unchecked(&pool->flush_ser);
42032 wake_up_interruptible(&pool->force_wait);
42033
42034 if (pool->flush_function)
42035 @@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42036 }
42037
42038 set_current_state(TASK_INTERRUPTIBLE);
42039 - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
42040 + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
42041 !kthread_should_stop())
42042 schedule();
42043 __set_current_state(TASK_RUNNING);
42044 @@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
42045 pool->dirty_watermark = params->dirty_watermark;
42046 pool->dirty_len = 0;
42047 spin_lock_init(&pool->pool_lock);
42048 - atomic_set(&pool->req_ser, 0);
42049 - atomic_set(&pool->flush_ser, 0);
42050 + atomic_set_unchecked(&pool->req_ser, 0);
42051 + atomic_set_unchecked(&pool->flush_ser, 0);
42052 init_waitqueue_head(&pool->force_wait);
42053
42054 pool->thread = kthread_run(ib_fmr_cleanup_thread,
42055 @@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
42056 }
42057 spin_unlock_irq(&pool->pool_lock);
42058
42059 - serial = atomic_inc_return(&pool->req_ser);
42060 + serial = atomic_inc_return_unchecked(&pool->req_ser);
42061 wake_up_process(pool->thread);
42062
42063 if (wait_event_interruptible(pool->force_wait,
42064 - atomic_read(&pool->flush_ser) - serial >= 0))
42065 + atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
42066 return -EINTR;
42067
42068 return 0;
42069 @@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
42070 } else {
42071 list_add_tail(&fmr->list, &pool->dirty_list);
42072 if (++pool->dirty_len >= pool->dirty_watermark) {
42073 - atomic_inc(&pool->req_ser);
42074 + atomic_inc_unchecked(&pool->req_ser);
42075 wake_up_process(pool->thread);
42076 }
42077 }
42078 diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
42079 index 41b1195..27971a0 100644
42080 --- a/drivers/infiniband/hw/cxgb4/mem.c
42081 +++ b/drivers/infiniband/hw/cxgb4/mem.c
42082 @@ -249,7 +249,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42083 int err;
42084 struct fw_ri_tpte tpt;
42085 u32 stag_idx;
42086 - static atomic_t key;
42087 + static atomic_unchecked_t key;
42088
42089 if (c4iw_fatal_error(rdev))
42090 return -EIO;
42091 @@ -266,7 +266,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42092 if (rdev->stats.stag.cur > rdev->stats.stag.max)
42093 rdev->stats.stag.max = rdev->stats.stag.cur;
42094 mutex_unlock(&rdev->stats.lock);
42095 - *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
42096 + *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
42097 }
42098 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
42099 __func__, stag_state, type, pdid, stag_idx);
42100 diff --git a/drivers/infiniband/hw/ipath/ipath_dma.c b/drivers/infiniband/hw/ipath/ipath_dma.c
42101 index 644c2c7..ecf0879 100644
42102 --- a/drivers/infiniband/hw/ipath/ipath_dma.c
42103 +++ b/drivers/infiniband/hw/ipath/ipath_dma.c
42104 @@ -176,17 +176,17 @@ static void ipath_dma_free_coherent(struct ib_device *dev, size_t size,
42105 }
42106
42107 struct ib_dma_mapping_ops ipath_dma_mapping_ops = {
42108 - ipath_mapping_error,
42109 - ipath_dma_map_single,
42110 - ipath_dma_unmap_single,
42111 - ipath_dma_map_page,
42112 - ipath_dma_unmap_page,
42113 - ipath_map_sg,
42114 - ipath_unmap_sg,
42115 - ipath_sg_dma_address,
42116 - ipath_sg_dma_len,
42117 - ipath_sync_single_for_cpu,
42118 - ipath_sync_single_for_device,
42119 - ipath_dma_alloc_coherent,
42120 - ipath_dma_free_coherent
42121 + .mapping_error = ipath_mapping_error,
42122 + .map_single = ipath_dma_map_single,
42123 + .unmap_single = ipath_dma_unmap_single,
42124 + .map_page = ipath_dma_map_page,
42125 + .unmap_page = ipath_dma_unmap_page,
42126 + .map_sg = ipath_map_sg,
42127 + .unmap_sg = ipath_unmap_sg,
42128 + .dma_address = ipath_sg_dma_address,
42129 + .dma_len = ipath_sg_dma_len,
42130 + .sync_single_for_cpu = ipath_sync_single_for_cpu,
42131 + .sync_single_for_device = ipath_sync_single_for_device,
42132 + .alloc_coherent = ipath_dma_alloc_coherent,
42133 + .free_coherent = ipath_dma_free_coherent
42134 };
42135 diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
42136 index 79b3dbc..96e5fcc 100644
42137 --- a/drivers/infiniband/hw/ipath/ipath_rc.c
42138 +++ b/drivers/infiniband/hw/ipath/ipath_rc.c
42139 @@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42140 struct ib_atomic_eth *ateth;
42141 struct ipath_ack_entry *e;
42142 u64 vaddr;
42143 - atomic64_t *maddr;
42144 + atomic64_unchecked_t *maddr;
42145 u64 sdata;
42146 u32 rkey;
42147 u8 next;
42148 @@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42149 IB_ACCESS_REMOTE_ATOMIC)))
42150 goto nack_acc_unlck;
42151 /* Perform atomic OP and save result. */
42152 - maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42153 + maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42154 sdata = be64_to_cpu(ateth->swap_data);
42155 e = &qp->s_ack_queue[qp->r_head_ack_queue];
42156 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
42157 - (u64) atomic64_add_return(sdata, maddr) - sdata :
42158 + (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42159 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42160 be64_to_cpu(ateth->compare_data),
42161 sdata);
42162 diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
42163 index 1f95bba..9530f87 100644
42164 --- a/drivers/infiniband/hw/ipath/ipath_ruc.c
42165 +++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
42166 @@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
42167 unsigned long flags;
42168 struct ib_wc wc;
42169 u64 sdata;
42170 - atomic64_t *maddr;
42171 + atomic64_unchecked_t *maddr;
42172 enum ib_wc_status send_status;
42173
42174 /*
42175 @@ -382,11 +382,11 @@ again:
42176 IB_ACCESS_REMOTE_ATOMIC)))
42177 goto acc_err;
42178 /* Perform atomic OP and save result. */
42179 - maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42180 + maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42181 sdata = wqe->wr.wr.atomic.compare_add;
42182 *(u64 *) sqp->s_sge.sge.vaddr =
42183 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
42184 - (u64) atomic64_add_return(sdata, maddr) - sdata :
42185 + (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42186 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42187 sdata, wqe->wr.wr.atomic.swap);
42188 goto send_comp;
42189 diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
42190 index f2a3f48..673ec79 100644
42191 --- a/drivers/infiniband/hw/mlx4/mad.c
42192 +++ b/drivers/infiniband/hw/mlx4/mad.c
42193 @@ -98,7 +98,7 @@ __be64 mlx4_ib_gen_node_guid(void)
42194
42195 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
42196 {
42197 - return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
42198 + return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
42199 cpu_to_be64(0xff00000000000000LL);
42200 }
42201
42202 diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
42203 index 25b2cdf..099ff97 100644
42204 --- a/drivers/infiniband/hw/mlx4/mcg.c
42205 +++ b/drivers/infiniband/hw/mlx4/mcg.c
42206 @@ -1040,7 +1040,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
42207 {
42208 char name[20];
42209
42210 - atomic_set(&ctx->tid, 0);
42211 + atomic_set_unchecked(&ctx->tid, 0);
42212 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
42213 ctx->mcg_wq = create_singlethread_workqueue(name);
42214 if (!ctx->mcg_wq)
42215 diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42216 index a230683..3723f2d 100644
42217 --- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
42218 +++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42219 @@ -408,7 +408,7 @@ struct mlx4_ib_demux_ctx {
42220 struct list_head mcg_mgid0_list;
42221 struct workqueue_struct *mcg_wq;
42222 struct mlx4_ib_demux_pv_ctx **tun;
42223 - atomic_t tid;
42224 + atomic_unchecked_t tid;
42225 int flushing; /* flushing the work queue */
42226 };
42227
42228 diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
42229 index 9d3e5c1..6f166df 100644
42230 --- a/drivers/infiniband/hw/mthca/mthca_cmd.c
42231 +++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
42232 @@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
42233 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
42234 }
42235
42236 -int mthca_QUERY_FW(struct mthca_dev *dev)
42237 +int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
42238 {
42239 struct mthca_mailbox *mailbox;
42240 u32 *outbox;
42241 @@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42242 CMD_TIME_CLASS_B);
42243 }
42244
42245 -int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42246 +int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42247 int num_mtt)
42248 {
42249 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
42250 @@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
42251 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
42252 }
42253
42254 -int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42255 +int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42256 int eq_num)
42257 {
42258 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
42259 @@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
42260 CMD_TIME_CLASS_B);
42261 }
42262
42263 -int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
42264 +int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
42265 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
42266 void *in_mad, void *response_mad)
42267 {
42268 diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
42269 index 87897b9..7e79542 100644
42270 --- a/drivers/infiniband/hw/mthca/mthca_main.c
42271 +++ b/drivers/infiniband/hw/mthca/mthca_main.c
42272 @@ -692,7 +692,7 @@ err_close:
42273 return err;
42274 }
42275
42276 -static int mthca_setup_hca(struct mthca_dev *dev)
42277 +static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
42278 {
42279 int err;
42280
42281 diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
42282 index ed9a989..6aa5dc2 100644
42283 --- a/drivers/infiniband/hw/mthca/mthca_mr.c
42284 +++ b/drivers/infiniband/hw/mthca/mthca_mr.c
42285 @@ -81,7 +81,7 @@ struct mthca_mpt_entry {
42286 * through the bitmaps)
42287 */
42288
42289 -static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
42290 +static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
42291 {
42292 int o;
42293 int m;
42294 @@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
42295 return key;
42296 }
42297
42298 -int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
42299 +int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
42300 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
42301 {
42302 struct mthca_mailbox *mailbox;
42303 @@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
42304 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
42305 }
42306
42307 -int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
42308 +int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
42309 u64 *buffer_list, int buffer_size_shift,
42310 int list_len, u64 iova, u64 total_size,
42311 u32 access, struct mthca_mr *mr)
42312 diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
42313 index 5b71d43..35a9e14 100644
42314 --- a/drivers/infiniband/hw/mthca/mthca_provider.c
42315 +++ b/drivers/infiniband/hw/mthca/mthca_provider.c
42316 @@ -763,7 +763,7 @@ unlock:
42317 return 0;
42318 }
42319
42320 -static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
42321 +static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
42322 {
42323 struct mthca_dev *dev = to_mdev(ibcq->device);
42324 struct mthca_cq *cq = to_mcq(ibcq);
42325 diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
42326 index 353c7b0..c6ce921 100644
42327 --- a/drivers/infiniband/hw/nes/nes.c
42328 +++ b/drivers/infiniband/hw/nes/nes.c
42329 @@ -98,7 +98,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
42330 LIST_HEAD(nes_adapter_list);
42331 static LIST_HEAD(nes_dev_list);
42332
42333 -atomic_t qps_destroyed;
42334 +atomic_unchecked_t qps_destroyed;
42335
42336 static unsigned int ee_flsh_adapter;
42337 static unsigned int sysfs_nonidx_addr;
42338 @@ -269,7 +269,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
42339 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
42340 struct nes_adapter *nesadapter = nesdev->nesadapter;
42341
42342 - atomic_inc(&qps_destroyed);
42343 + atomic_inc_unchecked(&qps_destroyed);
42344
42345 /* Free the control structures */
42346
42347 diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
42348 index 33cc589..3bd6538 100644
42349 --- a/drivers/infiniband/hw/nes/nes.h
42350 +++ b/drivers/infiniband/hw/nes/nes.h
42351 @@ -177,17 +177,17 @@ extern unsigned int nes_debug_level;
42352 extern unsigned int wqm_quanta;
42353 extern struct list_head nes_adapter_list;
42354
42355 -extern atomic_t cm_connects;
42356 -extern atomic_t cm_accepts;
42357 -extern atomic_t cm_disconnects;
42358 -extern atomic_t cm_closes;
42359 -extern atomic_t cm_connecteds;
42360 -extern atomic_t cm_connect_reqs;
42361 -extern atomic_t cm_rejects;
42362 -extern atomic_t mod_qp_timouts;
42363 -extern atomic_t qps_created;
42364 -extern atomic_t qps_destroyed;
42365 -extern atomic_t sw_qps_destroyed;
42366 +extern atomic_unchecked_t cm_connects;
42367 +extern atomic_unchecked_t cm_accepts;
42368 +extern atomic_unchecked_t cm_disconnects;
42369 +extern atomic_unchecked_t cm_closes;
42370 +extern atomic_unchecked_t cm_connecteds;
42371 +extern atomic_unchecked_t cm_connect_reqs;
42372 +extern atomic_unchecked_t cm_rejects;
42373 +extern atomic_unchecked_t mod_qp_timouts;
42374 +extern atomic_unchecked_t qps_created;
42375 +extern atomic_unchecked_t qps_destroyed;
42376 +extern atomic_unchecked_t sw_qps_destroyed;
42377 extern u32 mh_detected;
42378 extern u32 mh_pauses_sent;
42379 extern u32 cm_packets_sent;
42380 @@ -196,16 +196,16 @@ extern u32 cm_packets_created;
42381 extern u32 cm_packets_received;
42382 extern u32 cm_packets_dropped;
42383 extern u32 cm_packets_retrans;
42384 -extern atomic_t cm_listens_created;
42385 -extern atomic_t cm_listens_destroyed;
42386 +extern atomic_unchecked_t cm_listens_created;
42387 +extern atomic_unchecked_t cm_listens_destroyed;
42388 extern u32 cm_backlog_drops;
42389 -extern atomic_t cm_loopbacks;
42390 -extern atomic_t cm_nodes_created;
42391 -extern atomic_t cm_nodes_destroyed;
42392 -extern atomic_t cm_accel_dropped_pkts;
42393 -extern atomic_t cm_resets_recvd;
42394 -extern atomic_t pau_qps_created;
42395 -extern atomic_t pau_qps_destroyed;
42396 +extern atomic_unchecked_t cm_loopbacks;
42397 +extern atomic_unchecked_t cm_nodes_created;
42398 +extern atomic_unchecked_t cm_nodes_destroyed;
42399 +extern atomic_unchecked_t cm_accel_dropped_pkts;
42400 +extern atomic_unchecked_t cm_resets_recvd;
42401 +extern atomic_unchecked_t pau_qps_created;
42402 +extern atomic_unchecked_t pau_qps_destroyed;
42403
42404 extern u32 int_mod_timer_init;
42405 extern u32 int_mod_cq_depth_256;
42406 diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
42407 index 9c9f2f5..2559190 100644
42408 --- a/drivers/infiniband/hw/nes/nes_cm.c
42409 +++ b/drivers/infiniband/hw/nes/nes_cm.c
42410 @@ -68,14 +68,14 @@ u32 cm_packets_dropped;
42411 u32 cm_packets_retrans;
42412 u32 cm_packets_created;
42413 u32 cm_packets_received;
42414 -atomic_t cm_listens_created;
42415 -atomic_t cm_listens_destroyed;
42416 +atomic_unchecked_t cm_listens_created;
42417 +atomic_unchecked_t cm_listens_destroyed;
42418 u32 cm_backlog_drops;
42419 -atomic_t cm_loopbacks;
42420 -atomic_t cm_nodes_created;
42421 -atomic_t cm_nodes_destroyed;
42422 -atomic_t cm_accel_dropped_pkts;
42423 -atomic_t cm_resets_recvd;
42424 +atomic_unchecked_t cm_loopbacks;
42425 +atomic_unchecked_t cm_nodes_created;
42426 +atomic_unchecked_t cm_nodes_destroyed;
42427 +atomic_unchecked_t cm_accel_dropped_pkts;
42428 +atomic_unchecked_t cm_resets_recvd;
42429
42430 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
42431 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
42432 @@ -133,28 +133,28 @@ static void print_core(struct nes_cm_core *core);
42433 /* instance of function pointers for client API */
42434 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
42435 static struct nes_cm_ops nes_cm_api = {
42436 - mini_cm_accelerated,
42437 - mini_cm_listen,
42438 - mini_cm_del_listen,
42439 - mini_cm_connect,
42440 - mini_cm_close,
42441 - mini_cm_accept,
42442 - mini_cm_reject,
42443 - mini_cm_recv_pkt,
42444 - mini_cm_dealloc_core,
42445 - mini_cm_get,
42446 - mini_cm_set
42447 + .accelerated = mini_cm_accelerated,
42448 + .listen = mini_cm_listen,
42449 + .stop_listener = mini_cm_del_listen,
42450 + .connect = mini_cm_connect,
42451 + .close = mini_cm_close,
42452 + .accept = mini_cm_accept,
42453 + .reject = mini_cm_reject,
42454 + .recv_pkt = mini_cm_recv_pkt,
42455 + .destroy_cm_core = mini_cm_dealloc_core,
42456 + .get = mini_cm_get,
42457 + .set = mini_cm_set
42458 };
42459
42460 static struct nes_cm_core *g_cm_core;
42461
42462 -atomic_t cm_connects;
42463 -atomic_t cm_accepts;
42464 -atomic_t cm_disconnects;
42465 -atomic_t cm_closes;
42466 -atomic_t cm_connecteds;
42467 -atomic_t cm_connect_reqs;
42468 -atomic_t cm_rejects;
42469 +atomic_unchecked_t cm_connects;
42470 +atomic_unchecked_t cm_accepts;
42471 +atomic_unchecked_t cm_disconnects;
42472 +atomic_unchecked_t cm_closes;
42473 +atomic_unchecked_t cm_connecteds;
42474 +atomic_unchecked_t cm_connect_reqs;
42475 +atomic_unchecked_t cm_rejects;
42476
42477 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
42478 {
42479 @@ -1272,7 +1272,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
42480 kfree(listener);
42481 listener = NULL;
42482 ret = 0;
42483 - atomic_inc(&cm_listens_destroyed);
42484 + atomic_inc_unchecked(&cm_listens_destroyed);
42485 } else {
42486 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
42487 }
42488 @@ -1465,7 +1465,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
42489 cm_node->rem_mac);
42490
42491 add_hte_node(cm_core, cm_node);
42492 - atomic_inc(&cm_nodes_created);
42493 + atomic_inc_unchecked(&cm_nodes_created);
42494
42495 return cm_node;
42496 }
42497 @@ -1523,7 +1523,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
42498 }
42499
42500 atomic_dec(&cm_core->node_cnt);
42501 - atomic_inc(&cm_nodes_destroyed);
42502 + atomic_inc_unchecked(&cm_nodes_destroyed);
42503 nesqp = cm_node->nesqp;
42504 if (nesqp) {
42505 nesqp->cm_node = NULL;
42506 @@ -1587,7 +1587,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
42507
42508 static void drop_packet(struct sk_buff *skb)
42509 {
42510 - atomic_inc(&cm_accel_dropped_pkts);
42511 + atomic_inc_unchecked(&cm_accel_dropped_pkts);
42512 dev_kfree_skb_any(skb);
42513 }
42514
42515 @@ -1650,7 +1650,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
42516 {
42517
42518 int reset = 0; /* whether to send reset in case of err.. */
42519 - atomic_inc(&cm_resets_recvd);
42520 + atomic_inc_unchecked(&cm_resets_recvd);
42521 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
42522 " refcnt=%d\n", cm_node, cm_node->state,
42523 atomic_read(&cm_node->ref_count));
42524 @@ -2291,7 +2291,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
42525 rem_ref_cm_node(cm_node->cm_core, cm_node);
42526 return NULL;
42527 }
42528 - atomic_inc(&cm_loopbacks);
42529 + atomic_inc_unchecked(&cm_loopbacks);
42530 loopbackremotenode->loopbackpartner = cm_node;
42531 loopbackremotenode->tcp_cntxt.rcv_wscale =
42532 NES_CM_DEFAULT_RCV_WND_SCALE;
42533 @@ -2566,7 +2566,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
42534 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
42535 else {
42536 rem_ref_cm_node(cm_core, cm_node);
42537 - atomic_inc(&cm_accel_dropped_pkts);
42538 + atomic_inc_unchecked(&cm_accel_dropped_pkts);
42539 dev_kfree_skb_any(skb);
42540 }
42541 break;
42542 @@ -2874,7 +2874,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
42543
42544 if ((cm_id) && (cm_id->event_handler)) {
42545 if (issue_disconn) {
42546 - atomic_inc(&cm_disconnects);
42547 + atomic_inc_unchecked(&cm_disconnects);
42548 cm_event.event = IW_CM_EVENT_DISCONNECT;
42549 cm_event.status = disconn_status;
42550 cm_event.local_addr = cm_id->local_addr;
42551 @@ -2896,7 +2896,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
42552 }
42553
42554 if (issue_close) {
42555 - atomic_inc(&cm_closes);
42556 + atomic_inc_unchecked(&cm_closes);
42557 nes_disconnect(nesqp, 1);
42558
42559 cm_id->provider_data = nesqp;
42560 @@ -3034,7 +3034,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
42561
42562 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
42563 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
42564 - atomic_inc(&cm_accepts);
42565 + atomic_inc_unchecked(&cm_accepts);
42566
42567 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
42568 netdev_refcnt_read(nesvnic->netdev));
42569 @@ -3223,7 +3223,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
42570 struct nes_cm_core *cm_core;
42571 u8 *start_buff;
42572
42573 - atomic_inc(&cm_rejects);
42574 + atomic_inc_unchecked(&cm_rejects);
42575 cm_node = (struct nes_cm_node *)cm_id->provider_data;
42576 loopback = cm_node->loopbackpartner;
42577 cm_core = cm_node->cm_core;
42578 @@ -3285,7 +3285,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
42579 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
42580 ntohs(laddr->sin_port));
42581
42582 - atomic_inc(&cm_connects);
42583 + atomic_inc_unchecked(&cm_connects);
42584 nesqp->active_conn = 1;
42585
42586 /* cache the cm_id in the qp */
42587 @@ -3397,7 +3397,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
42588 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
42589 return err;
42590 }
42591 - atomic_inc(&cm_listens_created);
42592 + atomic_inc_unchecked(&cm_listens_created);
42593 }
42594
42595 cm_id->add_ref(cm_id);
42596 @@ -3504,7 +3504,7 @@ static void cm_event_connected(struct nes_cm_event *event)
42597
42598 if (nesqp->destroyed)
42599 return;
42600 - atomic_inc(&cm_connecteds);
42601 + atomic_inc_unchecked(&cm_connecteds);
42602 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
42603 " local port 0x%04X. jiffies = %lu.\n",
42604 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
42605 @@ -3685,7 +3685,7 @@ static void cm_event_reset(struct nes_cm_event *event)
42606
42607 cm_id->add_ref(cm_id);
42608 ret = cm_id->event_handler(cm_id, &cm_event);
42609 - atomic_inc(&cm_closes);
42610 + atomic_inc_unchecked(&cm_closes);
42611 cm_event.event = IW_CM_EVENT_CLOSE;
42612 cm_event.status = 0;
42613 cm_event.provider_data = cm_id->provider_data;
42614 @@ -3725,7 +3725,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
42615 return;
42616 cm_id = cm_node->cm_id;
42617
42618 - atomic_inc(&cm_connect_reqs);
42619 + atomic_inc_unchecked(&cm_connect_reqs);
42620 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
42621 cm_node, cm_id, jiffies);
42622
42623 @@ -3769,7 +3769,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
42624 return;
42625 cm_id = cm_node->cm_id;
42626
42627 - atomic_inc(&cm_connect_reqs);
42628 + atomic_inc_unchecked(&cm_connect_reqs);
42629 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
42630 cm_node, cm_id, jiffies);
42631
42632 diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
42633 index 4166452..fc952c3 100644
42634 --- a/drivers/infiniband/hw/nes/nes_mgt.c
42635 +++ b/drivers/infiniband/hw/nes/nes_mgt.c
42636 @@ -40,8 +40,8 @@
42637 #include "nes.h"
42638 #include "nes_mgt.h"
42639
42640 -atomic_t pau_qps_created;
42641 -atomic_t pau_qps_destroyed;
42642 +atomic_unchecked_t pau_qps_created;
42643 +atomic_unchecked_t pau_qps_destroyed;
42644
42645 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
42646 {
42647 @@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
42648 {
42649 struct sk_buff *skb;
42650 unsigned long flags;
42651 - atomic_inc(&pau_qps_destroyed);
42652 + atomic_inc_unchecked(&pau_qps_destroyed);
42653
42654 /* Free packets that have not yet been forwarded */
42655 /* Lock is acquired by skb_dequeue when removing the skb */
42656 @@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
42657 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
42658 skb_queue_head_init(&nesqp->pau_list);
42659 spin_lock_init(&nesqp->pau_lock);
42660 - atomic_inc(&pau_qps_created);
42661 + atomic_inc_unchecked(&pau_qps_created);
42662 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
42663 }
42664
42665 diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
42666 index 49eb511..a774366 100644
42667 --- a/drivers/infiniband/hw/nes/nes_nic.c
42668 +++ b/drivers/infiniband/hw/nes/nes_nic.c
42669 @@ -1273,39 +1273,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
42670 target_stat_values[++index] = mh_detected;
42671 target_stat_values[++index] = mh_pauses_sent;
42672 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
42673 - target_stat_values[++index] = atomic_read(&cm_connects);
42674 - target_stat_values[++index] = atomic_read(&cm_accepts);
42675 - target_stat_values[++index] = atomic_read(&cm_disconnects);
42676 - target_stat_values[++index] = atomic_read(&cm_connecteds);
42677 - target_stat_values[++index] = atomic_read(&cm_connect_reqs);
42678 - target_stat_values[++index] = atomic_read(&cm_rejects);
42679 - target_stat_values[++index] = atomic_read(&mod_qp_timouts);
42680 - target_stat_values[++index] = atomic_read(&qps_created);
42681 - target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
42682 - target_stat_values[++index] = atomic_read(&qps_destroyed);
42683 - target_stat_values[++index] = atomic_read(&cm_closes);
42684 + target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
42685 + target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
42686 + target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
42687 + target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
42688 + target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
42689 + target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
42690 + target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
42691 + target_stat_values[++index] = atomic_read_unchecked(&qps_created);
42692 + target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
42693 + target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
42694 + target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
42695 target_stat_values[++index] = cm_packets_sent;
42696 target_stat_values[++index] = cm_packets_bounced;
42697 target_stat_values[++index] = cm_packets_created;
42698 target_stat_values[++index] = cm_packets_received;
42699 target_stat_values[++index] = cm_packets_dropped;
42700 target_stat_values[++index] = cm_packets_retrans;
42701 - target_stat_values[++index] = atomic_read(&cm_listens_created);
42702 - target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
42703 + target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
42704 + target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
42705 target_stat_values[++index] = cm_backlog_drops;
42706 - target_stat_values[++index] = atomic_read(&cm_loopbacks);
42707 - target_stat_values[++index] = atomic_read(&cm_nodes_created);
42708 - target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
42709 - target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
42710 - target_stat_values[++index] = atomic_read(&cm_resets_recvd);
42711 + target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
42712 + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
42713 + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
42714 + target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
42715 + target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
42716 target_stat_values[++index] = nesadapter->free_4kpbl;
42717 target_stat_values[++index] = nesadapter->free_256pbl;
42718 target_stat_values[++index] = int_mod_timer_init;
42719 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
42720 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
42721 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
42722 - target_stat_values[++index] = atomic_read(&pau_qps_created);
42723 - target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
42724 + target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
42725 + target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
42726 }
42727
42728 /**
42729 diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
42730 index 8308e36..ae0d3b5 100644
42731 --- a/drivers/infiniband/hw/nes/nes_verbs.c
42732 +++ b/drivers/infiniband/hw/nes/nes_verbs.c
42733 @@ -46,9 +46,9 @@
42734
42735 #include <rdma/ib_umem.h>
42736
42737 -atomic_t mod_qp_timouts;
42738 -atomic_t qps_created;
42739 -atomic_t sw_qps_destroyed;
42740 +atomic_unchecked_t mod_qp_timouts;
42741 +atomic_unchecked_t qps_created;
42742 +atomic_unchecked_t sw_qps_destroyed;
42743
42744 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
42745
42746 @@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
42747 if (init_attr->create_flags)
42748 return ERR_PTR(-EINVAL);
42749
42750 - atomic_inc(&qps_created);
42751 + atomic_inc_unchecked(&qps_created);
42752 switch (init_attr->qp_type) {
42753 case IB_QPT_RC:
42754 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
42755 @@ -1466,7 +1466,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
42756 struct iw_cm_event cm_event;
42757 int ret = 0;
42758
42759 - atomic_inc(&sw_qps_destroyed);
42760 + atomic_inc_unchecked(&sw_qps_destroyed);
42761 nesqp->destroyed = 1;
42762
42763 /* Blow away the connection if it exists. */
42764 diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
42765 index 1946101..09766d2 100644
42766 --- a/drivers/infiniband/hw/qib/qib.h
42767 +++ b/drivers/infiniband/hw/qib/qib.h
42768 @@ -52,6 +52,7 @@
42769 #include <linux/kref.h>
42770 #include <linux/sched.h>
42771 #include <linux/kthread.h>
42772 +#include <linux/slab.h>
42773
42774 #include "qib_common.h"
42775 #include "qib_verbs.h"
42776 diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
42777 index 24c41ba..102d71f 100644
42778 --- a/drivers/input/gameport/gameport.c
42779 +++ b/drivers/input/gameport/gameport.c
42780 @@ -490,14 +490,14 @@ EXPORT_SYMBOL(gameport_set_phys);
42781 */
42782 static void gameport_init_port(struct gameport *gameport)
42783 {
42784 - static atomic_t gameport_no = ATOMIC_INIT(0);
42785 + static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
42786
42787 __module_get(THIS_MODULE);
42788
42789 mutex_init(&gameport->drv_mutex);
42790 device_initialize(&gameport->dev);
42791 dev_set_name(&gameport->dev, "gameport%lu",
42792 - (unsigned long)atomic_inc_return(&gameport_no) - 1);
42793 + (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
42794 gameport->dev.bus = &gameport_bus;
42795 gameport->dev.release = gameport_release_port;
42796 if (gameport->parent)
42797 diff --git a/drivers/input/input.c b/drivers/input/input.c
42798 index 1c4c0db..6f7abe3 100644
42799 --- a/drivers/input/input.c
42800 +++ b/drivers/input/input.c
42801 @@ -1772,7 +1772,7 @@ EXPORT_SYMBOL_GPL(input_class);
42802 */
42803 struct input_dev *input_allocate_device(void)
42804 {
42805 - static atomic_t input_no = ATOMIC_INIT(0);
42806 + static atomic_unchecked_t input_no = ATOMIC_INIT(0);
42807 struct input_dev *dev;
42808
42809 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
42810 @@ -1787,7 +1787,7 @@ struct input_dev *input_allocate_device(void)
42811 INIT_LIST_HEAD(&dev->node);
42812
42813 dev_set_name(&dev->dev, "input%ld",
42814 - (unsigned long) atomic_inc_return(&input_no) - 1);
42815 + (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
42816
42817 __module_get(THIS_MODULE);
42818 }
42819 diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
42820 index 4a95b22..874c182 100644
42821 --- a/drivers/input/joystick/sidewinder.c
42822 +++ b/drivers/input/joystick/sidewinder.c
42823 @@ -30,6 +30,7 @@
42824 #include <linux/kernel.h>
42825 #include <linux/module.h>
42826 #include <linux/slab.h>
42827 +#include <linux/sched.h>
42828 #include <linux/input.h>
42829 #include <linux/gameport.h>
42830 #include <linux/jiffies.h>
42831 diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
42832 index 603fe0d..f63decc 100644
42833 --- a/drivers/input/joystick/xpad.c
42834 +++ b/drivers/input/joystick/xpad.c
42835 @@ -737,7 +737,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
42836
42837 static int xpad_led_probe(struct usb_xpad *xpad)
42838 {
42839 - static atomic_t led_seq = ATOMIC_INIT(0);
42840 + static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
42841 long led_no;
42842 struct xpad_led *led;
42843 struct led_classdev *led_cdev;
42844 @@ -750,7 +750,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
42845 if (!led)
42846 return -ENOMEM;
42847
42848 - led_no = (long)atomic_inc_return(&led_seq) - 1;
42849 + led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
42850
42851 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
42852 led->xpad = xpad;
42853 diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
42854 index e204f26..8459f15 100644
42855 --- a/drivers/input/misc/ims-pcu.c
42856 +++ b/drivers/input/misc/ims-pcu.c
42857 @@ -1621,7 +1621,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
42858
42859 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
42860 {
42861 - static atomic_t device_no = ATOMIC_INIT(0);
42862 + static atomic_unchecked_t device_no = ATOMIC_INIT(0);
42863
42864 const struct ims_pcu_device_info *info;
42865 u8 device_id;
42866 @@ -1653,7 +1653,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
42867 }
42868
42869 /* Device appears to be operable, complete initialization */
42870 - pcu->device_no = atomic_inc_return(&device_no) - 1;
42871 + pcu->device_no = atomic_inc_return_unchecked(&device_no) - 1;
42872
42873 error = ims_pcu_setup_backlight(pcu);
42874 if (error)
42875 diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
42876 index 2f0b39d..7370f13 100644
42877 --- a/drivers/input/mouse/psmouse.h
42878 +++ b/drivers/input/mouse/psmouse.h
42879 @@ -116,7 +116,7 @@ struct psmouse_attribute {
42880 ssize_t (*set)(struct psmouse *psmouse, void *data,
42881 const char *buf, size_t count);
42882 bool protect;
42883 -};
42884 +} __do_const;
42885 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
42886
42887 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
42888 diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
42889 index b604564..3f14ae4 100644
42890 --- a/drivers/input/mousedev.c
42891 +++ b/drivers/input/mousedev.c
42892 @@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
42893
42894 spin_unlock_irq(&client->packet_lock);
42895
42896 - if (copy_to_user(buffer, data, count))
42897 + if (count > sizeof(data) || copy_to_user(buffer, data, count))
42898 return -EFAULT;
42899
42900 return count;
42901 diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
42902 index 8f4c4ab..5fc8a45 100644
42903 --- a/drivers/input/serio/serio.c
42904 +++ b/drivers/input/serio/serio.c
42905 @@ -505,7 +505,7 @@ static void serio_release_port(struct device *dev)
42906 */
42907 static void serio_init_port(struct serio *serio)
42908 {
42909 - static atomic_t serio_no = ATOMIC_INIT(0);
42910 + static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
42911
42912 __module_get(THIS_MODULE);
42913
42914 @@ -516,7 +516,7 @@ static void serio_init_port(struct serio *serio)
42915 mutex_init(&serio->drv_mutex);
42916 device_initialize(&serio->dev);
42917 dev_set_name(&serio->dev, "serio%ld",
42918 - (long)atomic_inc_return(&serio_no) - 1);
42919 + (long)atomic_inc_return_unchecked(&serio_no) - 1);
42920 serio->dev.bus = &serio_bus;
42921 serio->dev.release = serio_release_port;
42922 serio->dev.groups = serio_device_attr_groups;
42923 diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
42924 index c9a02fe..0debc75 100644
42925 --- a/drivers/input/serio/serio_raw.c
42926 +++ b/drivers/input/serio/serio_raw.c
42927 @@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
42928
42929 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
42930 {
42931 - static atomic_t serio_raw_no = ATOMIC_INIT(0);
42932 + static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(0);
42933 struct serio_raw *serio_raw;
42934 int err;
42935
42936 @@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
42937 }
42938
42939 snprintf(serio_raw->name, sizeof(serio_raw->name),
42940 - "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no) - 1);
42941 + "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no) - 1);
42942 kref_init(&serio_raw->kref);
42943 INIT_LIST_HEAD(&serio_raw->client_list);
42944 init_waitqueue_head(&serio_raw->wait);
42945 diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
42946 index e5555fc..937986d 100644
42947 --- a/drivers/iommu/iommu.c
42948 +++ b/drivers/iommu/iommu.c
42949 @@ -588,7 +588,7 @@ static struct notifier_block iommu_bus_nb = {
42950 static void iommu_bus_init(struct bus_type *bus, struct iommu_ops *ops)
42951 {
42952 bus_register_notifier(bus, &iommu_bus_nb);
42953 - bus_for_each_dev(bus, NULL, ops, add_iommu_group);
42954 + bus_for_each_dev(bus, NULL, (void *)ops, add_iommu_group);
42955 }
42956
42957 /**
42958 diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
42959 index 228632c9..edfe331 100644
42960 --- a/drivers/iommu/irq_remapping.c
42961 +++ b/drivers/iommu/irq_remapping.c
42962 @@ -356,7 +356,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
42963 void panic_if_irq_remap(const char *msg)
42964 {
42965 if (irq_remapping_enabled)
42966 - panic(msg);
42967 + panic("%s", msg);
42968 }
42969
42970 static void ir_ack_apic_edge(struct irq_data *data)
42971 @@ -377,10 +377,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
42972
42973 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
42974 {
42975 - chip->irq_print_chip = ir_print_prefix;
42976 - chip->irq_ack = ir_ack_apic_edge;
42977 - chip->irq_eoi = ir_ack_apic_level;
42978 - chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
42979 + pax_open_kernel();
42980 + *(void **)&chip->irq_print_chip = ir_print_prefix;
42981 + *(void **)&chip->irq_ack = ir_ack_apic_edge;
42982 + *(void **)&chip->irq_eoi = ir_ack_apic_level;
42983 + *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
42984 + pax_close_kernel();
42985 }
42986
42987 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
42988 diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
42989 index 341c601..e5f407e 100644
42990 --- a/drivers/irqchip/irq-gic.c
42991 +++ b/drivers/irqchip/irq-gic.c
42992 @@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
42993 * Supported arch specific GIC irq extension.
42994 * Default make them NULL.
42995 */
42996 -struct irq_chip gic_arch_extn = {
42997 +irq_chip_no_const gic_arch_extn = {
42998 .irq_eoi = NULL,
42999 .irq_mask = NULL,
43000 .irq_unmask = NULL,
43001 @@ -332,7 +332,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
43002 chained_irq_exit(chip, desc);
43003 }
43004
43005 -static struct irq_chip gic_chip = {
43006 +static irq_chip_no_const gic_chip __read_only = {
43007 .name = "GIC",
43008 .irq_mask = gic_mask_irq,
43009 .irq_unmask = gic_unmask_irq,
43010 diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
43011 index 8777065..a4a9967 100644
43012 --- a/drivers/irqchip/irq-renesas-irqc.c
43013 +++ b/drivers/irqchip/irq-renesas-irqc.c
43014 @@ -151,7 +151,7 @@ static int irqc_probe(struct platform_device *pdev)
43015 struct irqc_priv *p;
43016 struct resource *io;
43017 struct resource *irq;
43018 - struct irq_chip *irq_chip;
43019 + irq_chip_no_const *irq_chip;
43020 const char *name = dev_name(&pdev->dev);
43021 int ret;
43022 int k;
43023 diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
43024 index ac6f72b..81150f2 100644
43025 --- a/drivers/isdn/capi/capi.c
43026 +++ b/drivers/isdn/capi/capi.c
43027 @@ -81,8 +81,8 @@ struct capiminor {
43028
43029 struct capi20_appl *ap;
43030 u32 ncci;
43031 - atomic_t datahandle;
43032 - atomic_t msgid;
43033 + atomic_unchecked_t datahandle;
43034 + atomic_unchecked_t msgid;
43035
43036 struct tty_port port;
43037 int ttyinstop;
43038 @@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
43039 capimsg_setu16(s, 2, mp->ap->applid);
43040 capimsg_setu8 (s, 4, CAPI_DATA_B3);
43041 capimsg_setu8 (s, 5, CAPI_RESP);
43042 - capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
43043 + capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
43044 capimsg_setu32(s, 8, mp->ncci);
43045 capimsg_setu16(s, 12, datahandle);
43046 }
43047 @@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
43048 mp->outbytes -= len;
43049 spin_unlock_bh(&mp->outlock);
43050
43051 - datahandle = atomic_inc_return(&mp->datahandle);
43052 + datahandle = atomic_inc_return_unchecked(&mp->datahandle);
43053 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
43054 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43055 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43056 capimsg_setu16(skb->data, 2, mp->ap->applid);
43057 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
43058 capimsg_setu8 (skb->data, 5, CAPI_REQ);
43059 - capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
43060 + capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
43061 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
43062 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
43063 capimsg_setu16(skb->data, 16, len); /* Data length */
43064 diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
43065 index c44950d..10ac276 100644
43066 --- a/drivers/isdn/gigaset/bas-gigaset.c
43067 +++ b/drivers/isdn/gigaset/bas-gigaset.c
43068 @@ -2564,22 +2564,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
43069
43070
43071 static const struct gigaset_ops gigops = {
43072 - gigaset_write_cmd,
43073 - gigaset_write_room,
43074 - gigaset_chars_in_buffer,
43075 - gigaset_brkchars,
43076 - gigaset_init_bchannel,
43077 - gigaset_close_bchannel,
43078 - gigaset_initbcshw,
43079 - gigaset_freebcshw,
43080 - gigaset_reinitbcshw,
43081 - gigaset_initcshw,
43082 - gigaset_freecshw,
43083 - gigaset_set_modem_ctrl,
43084 - gigaset_baud_rate,
43085 - gigaset_set_line_ctrl,
43086 - gigaset_isoc_send_skb,
43087 - gigaset_isoc_input,
43088 + .write_cmd = gigaset_write_cmd,
43089 + .write_room = gigaset_write_room,
43090 + .chars_in_buffer = gigaset_chars_in_buffer,
43091 + .brkchars = gigaset_brkchars,
43092 + .init_bchannel = gigaset_init_bchannel,
43093 + .close_bchannel = gigaset_close_bchannel,
43094 + .initbcshw = gigaset_initbcshw,
43095 + .freebcshw = gigaset_freebcshw,
43096 + .reinitbcshw = gigaset_reinitbcshw,
43097 + .initcshw = gigaset_initcshw,
43098 + .freecshw = gigaset_freecshw,
43099 + .set_modem_ctrl = gigaset_set_modem_ctrl,
43100 + .baud_rate = gigaset_baud_rate,
43101 + .set_line_ctrl = gigaset_set_line_ctrl,
43102 + .send_skb = gigaset_isoc_send_skb,
43103 + .handle_input = gigaset_isoc_input,
43104 };
43105
43106 /* bas_gigaset_init
43107 diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
43108 index 600c79b..3752bab 100644
43109 --- a/drivers/isdn/gigaset/interface.c
43110 +++ b/drivers/isdn/gigaset/interface.c
43111 @@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
43112 }
43113 tty->driver_data = cs;
43114
43115 - ++cs->port.count;
43116 + atomic_inc(&cs->port.count);
43117
43118 - if (cs->port.count == 1) {
43119 + if (atomic_read(&cs->port.count) == 1) {
43120 tty_port_tty_set(&cs->port, tty);
43121 cs->port.low_latency = 1;
43122 }
43123 @@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
43124
43125 if (!cs->connected)
43126 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
43127 - else if (!cs->port.count)
43128 + else if (!atomic_read(&cs->port.count))
43129 dev_warn(cs->dev, "%s: device not opened\n", __func__);
43130 - else if (!--cs->port.count)
43131 + else if (!atomic_dec_return(&cs->port.count))
43132 tty_port_tty_set(&cs->port, NULL);
43133
43134 mutex_unlock(&cs->mutex);
43135 diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
43136 index 8c91fd5..14f13ce 100644
43137 --- a/drivers/isdn/gigaset/ser-gigaset.c
43138 +++ b/drivers/isdn/gigaset/ser-gigaset.c
43139 @@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
43140 }
43141
43142 static const struct gigaset_ops ops = {
43143 - gigaset_write_cmd,
43144 - gigaset_write_room,
43145 - gigaset_chars_in_buffer,
43146 - gigaset_brkchars,
43147 - gigaset_init_bchannel,
43148 - gigaset_close_bchannel,
43149 - gigaset_initbcshw,
43150 - gigaset_freebcshw,
43151 - gigaset_reinitbcshw,
43152 - gigaset_initcshw,
43153 - gigaset_freecshw,
43154 - gigaset_set_modem_ctrl,
43155 - gigaset_baud_rate,
43156 - gigaset_set_line_ctrl,
43157 - gigaset_m10x_send_skb, /* asyncdata.c */
43158 - gigaset_m10x_input, /* asyncdata.c */
43159 + .write_cmd = gigaset_write_cmd,
43160 + .write_room = gigaset_write_room,
43161 + .chars_in_buffer = gigaset_chars_in_buffer,
43162 + .brkchars = gigaset_brkchars,
43163 + .init_bchannel = gigaset_init_bchannel,
43164 + .close_bchannel = gigaset_close_bchannel,
43165 + .initbcshw = gigaset_initbcshw,
43166 + .freebcshw = gigaset_freebcshw,
43167 + .reinitbcshw = gigaset_reinitbcshw,
43168 + .initcshw = gigaset_initcshw,
43169 + .freecshw = gigaset_freecshw,
43170 + .set_modem_ctrl = gigaset_set_modem_ctrl,
43171 + .baud_rate = gigaset_baud_rate,
43172 + .set_line_ctrl = gigaset_set_line_ctrl,
43173 + .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
43174 + .handle_input = gigaset_m10x_input, /* asyncdata.c */
43175 };
43176
43177
43178 diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
43179 index d0a41cb..b953e50 100644
43180 --- a/drivers/isdn/gigaset/usb-gigaset.c
43181 +++ b/drivers/isdn/gigaset/usb-gigaset.c
43182 @@ -547,7 +547,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
43183 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
43184 memcpy(cs->hw.usb->bchars, buf, 6);
43185 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
43186 - 0, 0, &buf, 6, 2000);
43187 + 0, 0, buf, 6, 2000);
43188 }
43189
43190 static void gigaset_freebcshw(struct bc_state *bcs)
43191 @@ -869,22 +869,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
43192 }
43193
43194 static const struct gigaset_ops ops = {
43195 - gigaset_write_cmd,
43196 - gigaset_write_room,
43197 - gigaset_chars_in_buffer,
43198 - gigaset_brkchars,
43199 - gigaset_init_bchannel,
43200 - gigaset_close_bchannel,
43201 - gigaset_initbcshw,
43202 - gigaset_freebcshw,
43203 - gigaset_reinitbcshw,
43204 - gigaset_initcshw,
43205 - gigaset_freecshw,
43206 - gigaset_set_modem_ctrl,
43207 - gigaset_baud_rate,
43208 - gigaset_set_line_ctrl,
43209 - gigaset_m10x_send_skb,
43210 - gigaset_m10x_input,
43211 + .write_cmd = gigaset_write_cmd,
43212 + .write_room = gigaset_write_room,
43213 + .chars_in_buffer = gigaset_chars_in_buffer,
43214 + .brkchars = gigaset_brkchars,
43215 + .init_bchannel = gigaset_init_bchannel,
43216 + .close_bchannel = gigaset_close_bchannel,
43217 + .initbcshw = gigaset_initbcshw,
43218 + .freebcshw = gigaset_freebcshw,
43219 + .reinitbcshw = gigaset_reinitbcshw,
43220 + .initcshw = gigaset_initcshw,
43221 + .freecshw = gigaset_freecshw,
43222 + .set_modem_ctrl = gigaset_set_modem_ctrl,
43223 + .baud_rate = gigaset_baud_rate,
43224 + .set_line_ctrl = gigaset_set_line_ctrl,
43225 + .send_skb = gigaset_m10x_send_skb,
43226 + .handle_input = gigaset_m10x_input,
43227 };
43228
43229 /*
43230 diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
43231 index 4d9b195..455075c 100644
43232 --- a/drivers/isdn/hardware/avm/b1.c
43233 +++ b/drivers/isdn/hardware/avm/b1.c
43234 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
43235 }
43236 if (left) {
43237 if (t4file->user) {
43238 - if (copy_from_user(buf, dp, left))
43239 + if (left > sizeof buf || copy_from_user(buf, dp, left))
43240 return -EFAULT;
43241 } else {
43242 memcpy(buf, dp, left);
43243 @@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
43244 }
43245 if (left) {
43246 if (config->user) {
43247 - if (copy_from_user(buf, dp, left))
43248 + if (left > sizeof buf || copy_from_user(buf, dp, left))
43249 return -EFAULT;
43250 } else {
43251 memcpy(buf, dp, left);
43252 diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
43253 index 9bb12ba..d4262f7 100644
43254 --- a/drivers/isdn/i4l/isdn_common.c
43255 +++ b/drivers/isdn/i4l/isdn_common.c
43256 @@ -1651,6 +1651,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
43257 } else
43258 return -EINVAL;
43259 case IIOCDBGVAR:
43260 + if (!capable(CAP_SYS_RAWIO))
43261 + return -EPERM;
43262 if (arg) {
43263 if (copy_to_user(argp, &dev, sizeof(ulong)))
43264 return -EFAULT;
43265 diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
43266 index 91d5730..336523e 100644
43267 --- a/drivers/isdn/i4l/isdn_concap.c
43268 +++ b/drivers/isdn/i4l/isdn_concap.c
43269 @@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
43270 }
43271
43272 struct concap_device_ops isdn_concap_reliable_dl_dops = {
43273 - &isdn_concap_dl_data_req,
43274 - &isdn_concap_dl_connect_req,
43275 - &isdn_concap_dl_disconn_req
43276 + .data_req = &isdn_concap_dl_data_req,
43277 + .connect_req = &isdn_concap_dl_connect_req,
43278 + .disconn_req = &isdn_concap_dl_disconn_req
43279 };
43280
43281 /* The following should better go into a dedicated source file such that
43282 diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
43283 index 3c5f249..5fac4d0 100644
43284 --- a/drivers/isdn/i4l/isdn_tty.c
43285 +++ b/drivers/isdn/i4l/isdn_tty.c
43286 @@ -1508,9 +1508,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
43287
43288 #ifdef ISDN_DEBUG_MODEM_OPEN
43289 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
43290 - port->count);
43291 + atomic_read(&port->count));
43292 #endif
43293 - port->count++;
43294 + atomic_inc(&port->count);
43295 port->tty = tty;
43296 /*
43297 * Start up serial port
43298 @@ -1554,7 +1554,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
43299 #endif
43300 return;
43301 }
43302 - if ((tty->count == 1) && (port->count != 1)) {
43303 + if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
43304 /*
43305 * Uh, oh. tty->count is 1, which means that the tty
43306 * structure will be freed. Info->count should always
43307 @@ -1563,15 +1563,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
43308 * serial port won't be shutdown.
43309 */
43310 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
43311 - "info->count is %d\n", port->count);
43312 - port->count = 1;
43313 + "info->count is %d\n", atomic_read(&port->count));
43314 + atomic_set(&port->count, 1);
43315 }
43316 - if (--port->count < 0) {
43317 + if (atomic_dec_return(&port->count) < 0) {
43318 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
43319 - info->line, port->count);
43320 - port->count = 0;
43321 + info->line, atomic_read(&port->count));
43322 + atomic_set(&port->count, 0);
43323 }
43324 - if (port->count) {
43325 + if (atomic_read(&port->count)) {
43326 #ifdef ISDN_DEBUG_MODEM_OPEN
43327 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
43328 #endif
43329 @@ -1625,7 +1625,7 @@ isdn_tty_hangup(struct tty_struct *tty)
43330 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
43331 return;
43332 isdn_tty_shutdown(info);
43333 - port->count = 0;
43334 + atomic_set(&port->count, 0);
43335 port->flags &= ~ASYNC_NORMAL_ACTIVE;
43336 port->tty = NULL;
43337 wake_up_interruptible(&port->open_wait);
43338 @@ -1970,7 +1970,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
43339 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
43340 modem_info *info = &dev->mdm.info[i];
43341
43342 - if (info->port.count == 0)
43343 + if (atomic_read(&info->port.count) == 0)
43344 continue;
43345 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
43346 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
43347 diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
43348 index e2d4e58..40cd045 100644
43349 --- a/drivers/isdn/i4l/isdn_x25iface.c
43350 +++ b/drivers/isdn/i4l/isdn_x25iface.c
43351 @@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
43352
43353
43354 static struct concap_proto_ops ix25_pops = {
43355 - &isdn_x25iface_proto_new,
43356 - &isdn_x25iface_proto_del,
43357 - &isdn_x25iface_proto_restart,
43358 - &isdn_x25iface_proto_close,
43359 - &isdn_x25iface_xmit,
43360 - &isdn_x25iface_receive,
43361 - &isdn_x25iface_connect_ind,
43362 - &isdn_x25iface_disconn_ind
43363 + .proto_new = &isdn_x25iface_proto_new,
43364 + .proto_del = &isdn_x25iface_proto_del,
43365 + .restart = &isdn_x25iface_proto_restart,
43366 + .close = &isdn_x25iface_proto_close,
43367 + .encap_and_xmit = &isdn_x25iface_xmit,
43368 + .data_ind = &isdn_x25iface_receive,
43369 + .connect_ind = &isdn_x25iface_connect_ind,
43370 + .disconn_ind = &isdn_x25iface_disconn_ind
43371 };
43372
43373 /* error message helper function */
43374 diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
43375 index 53d487f..cae33fe 100644
43376 --- a/drivers/isdn/icn/icn.c
43377 +++ b/drivers/isdn/icn/icn.c
43378 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
43379 if (count > len)
43380 count = len;
43381 if (user) {
43382 - if (copy_from_user(msg, buf, count))
43383 + if (count > sizeof msg || copy_from_user(msg, buf, count))
43384 return -EFAULT;
43385 } else
43386 memcpy(msg, buf, count);
43387 @@ -1155,7 +1155,7 @@ icn_command(isdn_ctrl *c, icn_card *card)
43388 ulong a;
43389 ulong flags;
43390 int i;
43391 - char cbuf[60];
43392 + char cbuf[80];
43393 isdn_ctrl cmd;
43394 icn_cdef cdef;
43395 char __user *arg;
43396 @@ -1309,7 +1309,6 @@ icn_command(isdn_ctrl *c, icn_card *card)
43397 break;
43398 if ((c->arg & 255) < ICN_BCH) {
43399 char *p;
43400 - char dial[50];
43401 char dcode[4];
43402
43403 a = c->arg;
43404 @@ -1321,10 +1320,10 @@ icn_command(isdn_ctrl *c, icn_card *card)
43405 } else
43406 /* Normal Dial */
43407 strcpy(dcode, "CAL");
43408 - strcpy(dial, p);
43409 - sprintf(cbuf, "%02d;D%s_R%s,%02d,%02d,%s\n", (int) (a + 1),
43410 - dcode, dial, c->parm.setup.si1,
43411 - c->parm.setup.si2, c->parm.setup.eazmsn);
43412 + snprintf(cbuf, sizeof(cbuf),
43413 + "%02d;D%s_R%s,%02d,%02d,%s\n", (int) (a + 1),
43414 + dcode, p, c->parm.setup.si1,
43415 + c->parm.setup.si2, c->parm.setup.eazmsn);
43416 i = icn_writecmd(cbuf, strlen(cbuf), 0, card);
43417 }
43418 break;
43419 diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
43420 index a4f05c5..1433bc5 100644
43421 --- a/drivers/isdn/mISDN/dsp_cmx.c
43422 +++ b/drivers/isdn/mISDN/dsp_cmx.c
43423 @@ -1628,7 +1628,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
43424 static u16 dsp_count; /* last sample count */
43425 static int dsp_count_valid; /* if we have last sample count */
43426
43427 -void
43428 +void __intentional_overflow(-1)
43429 dsp_cmx_send(void *arg)
43430 {
43431 struct dsp_conf *conf;
43432 diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
43433 index d93e245..e7ece6b 100644
43434 --- a/drivers/leds/leds-clevo-mail.c
43435 +++ b/drivers/leds/leds-clevo-mail.c
43436 @@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
43437 * detected as working, but in reality it is not) as low as
43438 * possible.
43439 */
43440 -static struct dmi_system_id clevo_mail_led_dmi_table[] __initdata = {
43441 +static struct dmi_system_id clevo_mail_led_dmi_table[] __initconst = {
43442 {
43443 .callback = clevo_mail_led_dmi_callback,
43444 .ident = "Clevo D410J",
43445 diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
43446 index 5b8f938..b73d657 100644
43447 --- a/drivers/leds/leds-ss4200.c
43448 +++ b/drivers/leds/leds-ss4200.c
43449 @@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
43450 * detected as working, but in reality it is not) as low as
43451 * possible.
43452 */
43453 -static struct dmi_system_id nas_led_whitelist[] __initdata = {
43454 +static struct dmi_system_id nas_led_whitelist[] __initconst = {
43455 {
43456 .callback = ss4200_led_dmi_callback,
43457 .ident = "Intel SS4200-E",
43458 diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
43459 index 0bf1e4e..b4bf44e 100644
43460 --- a/drivers/lguest/core.c
43461 +++ b/drivers/lguest/core.c
43462 @@ -97,9 +97,17 @@ static __init int map_switcher(void)
43463 * The end address needs +1 because __get_vm_area allocates an
43464 * extra guard page, so we need space for that.
43465 */
43466 +
43467 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
43468 + switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
43469 + VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
43470 + + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
43471 +#else
43472 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
43473 VM_ALLOC, switcher_addr, switcher_addr
43474 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
43475 +#endif
43476 +
43477 if (!switcher_vma) {
43478 err = -ENOMEM;
43479 printk("lguest: could not map switcher pages high\n");
43480 @@ -124,7 +132,7 @@ static __init int map_switcher(void)
43481 * Now the Switcher is mapped at the right address, we can't fail!
43482 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
43483 */
43484 - memcpy(switcher_vma->addr, start_switcher_text,
43485 + memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
43486 end_switcher_text - start_switcher_text);
43487
43488 printk(KERN_INFO "lguest: mapped switcher at %p\n",
43489 diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
43490 index bfb39bb..08a603b 100644
43491 --- a/drivers/lguest/page_tables.c
43492 +++ b/drivers/lguest/page_tables.c
43493 @@ -559,7 +559,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
43494 /*:*/
43495
43496 #ifdef CONFIG_X86_PAE
43497 -static void release_pmd(pmd_t *spmd)
43498 +static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
43499 {
43500 /* If the entry's not present, there's nothing to release. */
43501 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
43502 diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
43503 index 922a1ac..9dd0c2a 100644
43504 --- a/drivers/lguest/x86/core.c
43505 +++ b/drivers/lguest/x86/core.c
43506 @@ -59,7 +59,7 @@ static struct {
43507 /* Offset from where switcher.S was compiled to where we've copied it */
43508 static unsigned long switcher_offset(void)
43509 {
43510 - return switcher_addr - (unsigned long)start_switcher_text;
43511 + return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
43512 }
43513
43514 /* This cpu's struct lguest_pages (after the Switcher text page) */
43515 @@ -99,7 +99,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
43516 * These copies are pretty cheap, so we do them unconditionally: */
43517 /* Save the current Host top-level page directory.
43518 */
43519 +
43520 +#ifdef CONFIG_PAX_PER_CPU_PGD
43521 + pages->state.host_cr3 = read_cr3();
43522 +#else
43523 pages->state.host_cr3 = __pa(current->mm->pgd);
43524 +#endif
43525 +
43526 /*
43527 * Set up the Guest's page tables to see this CPU's pages (and no
43528 * other CPU's pages).
43529 @@ -477,7 +483,7 @@ void __init lguest_arch_host_init(void)
43530 * compiled-in switcher code and the high-mapped copy we just made.
43531 */
43532 for (i = 0; i < IDT_ENTRIES; i++)
43533 - default_idt_entries[i] += switcher_offset();
43534 + default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
43535
43536 /*
43537 * Set up the Switcher's per-cpu areas.
43538 @@ -560,7 +566,7 @@ void __init lguest_arch_host_init(void)
43539 * it will be undisturbed when we switch. To change %cs and jump we
43540 * need this structure to feed to Intel's "lcall" instruction.
43541 */
43542 - lguest_entry.offset = (long)switch_to_guest + switcher_offset();
43543 + lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
43544 lguest_entry.segment = LGUEST_CS;
43545
43546 /*
43547 diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
43548 index 40634b0..4f5855e 100644
43549 --- a/drivers/lguest/x86/switcher_32.S
43550 +++ b/drivers/lguest/x86/switcher_32.S
43551 @@ -87,6 +87,7 @@
43552 #include <asm/page.h>
43553 #include <asm/segment.h>
43554 #include <asm/lguest.h>
43555 +#include <asm/processor-flags.h>
43556
43557 // We mark the start of the code to copy
43558 // It's placed in .text tho it's never run here
43559 @@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
43560 // Changes type when we load it: damn Intel!
43561 // For after we switch over our page tables
43562 // That entry will be read-only: we'd crash.
43563 +
43564 +#ifdef CONFIG_PAX_KERNEXEC
43565 + mov %cr0, %edx
43566 + xor $X86_CR0_WP, %edx
43567 + mov %edx, %cr0
43568 +#endif
43569 +
43570 movl $(GDT_ENTRY_TSS*8), %edx
43571 ltr %dx
43572
43573 @@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
43574 // Let's clear it again for our return.
43575 // The GDT descriptor of the Host
43576 // Points to the table after two "size" bytes
43577 - movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
43578 + movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
43579 // Clear "used" from type field (byte 5, bit 2)
43580 - andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
43581 + andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
43582 +
43583 +#ifdef CONFIG_PAX_KERNEXEC
43584 + mov %cr0, %eax
43585 + xor $X86_CR0_WP, %eax
43586 + mov %eax, %cr0
43587 +#endif
43588
43589 // Once our page table's switched, the Guest is live!
43590 // The Host fades as we run this final step.
43591 @@ -295,13 +309,12 @@ deliver_to_host:
43592 // I consulted gcc, and it gave
43593 // These instructions, which I gladly credit:
43594 leal (%edx,%ebx,8), %eax
43595 - movzwl (%eax),%edx
43596 - movl 4(%eax), %eax
43597 - xorw %ax, %ax
43598 - orl %eax, %edx
43599 + movl 4(%eax), %edx
43600 + movw (%eax), %dx
43601 // Now the address of the handler's in %edx
43602 // We call it now: its "iret" drops us home.
43603 - jmp *%edx
43604 + ljmp $__KERNEL_CS, $1f
43605 +1: jmp *%edx
43606
43607 // Every interrupt can come to us here
43608 // But we must truly tell each apart.
43609 diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
43610 index 7ef7461..5a09dac 100644
43611 --- a/drivers/md/bcache/closure.h
43612 +++ b/drivers/md/bcache/closure.h
43613 @@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
43614 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
43615 struct workqueue_struct *wq)
43616 {
43617 - BUG_ON(object_is_on_stack(cl));
43618 + BUG_ON(object_starts_on_stack(cl));
43619 closure_set_ip(cl);
43620 cl->fn = fn;
43621 cl->wq = wq;
43622 diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
43623 index 4195a01..42527ac 100644
43624 --- a/drivers/md/bitmap.c
43625 +++ b/drivers/md/bitmap.c
43626 @@ -1779,7 +1779,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
43627 chunk_kb ? "KB" : "B");
43628 if (bitmap->storage.file) {
43629 seq_printf(seq, ", file: ");
43630 - seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
43631 + seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
43632 }
43633
43634 seq_printf(seq, "\n");
43635 diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
43636 index 5152142..623d141 100644
43637 --- a/drivers/md/dm-ioctl.c
43638 +++ b/drivers/md/dm-ioctl.c
43639 @@ -1769,7 +1769,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
43640 cmd == DM_LIST_VERSIONS_CMD)
43641 return 0;
43642
43643 - if ((cmd == DM_DEV_CREATE_CMD)) {
43644 + if (cmd == DM_DEV_CREATE_CMD) {
43645 if (!*param->name) {
43646 DMWARN("name not supplied when creating device");
43647 return -EINVAL;
43648 diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
43649 index 7dfdb5c..4caada6 100644
43650 --- a/drivers/md/dm-raid1.c
43651 +++ b/drivers/md/dm-raid1.c
43652 @@ -40,7 +40,7 @@ enum dm_raid1_error {
43653
43654 struct mirror {
43655 struct mirror_set *ms;
43656 - atomic_t error_count;
43657 + atomic_unchecked_t error_count;
43658 unsigned long error_type;
43659 struct dm_dev *dev;
43660 sector_t offset;
43661 @@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
43662 struct mirror *m;
43663
43664 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
43665 - if (!atomic_read(&m->error_count))
43666 + if (!atomic_read_unchecked(&m->error_count))
43667 return m;
43668
43669 return NULL;
43670 @@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
43671 * simple way to tell if a device has encountered
43672 * errors.
43673 */
43674 - atomic_inc(&m->error_count);
43675 + atomic_inc_unchecked(&m->error_count);
43676
43677 if (test_and_set_bit(error_type, &m->error_type))
43678 return;
43679 @@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
43680 struct mirror *m = get_default_mirror(ms);
43681
43682 do {
43683 - if (likely(!atomic_read(&m->error_count)))
43684 + if (likely(!atomic_read_unchecked(&m->error_count)))
43685 return m;
43686
43687 if (m-- == ms->mirror)
43688 @@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
43689 {
43690 struct mirror *default_mirror = get_default_mirror(m->ms);
43691
43692 - return !atomic_read(&default_mirror->error_count);
43693 + return !atomic_read_unchecked(&default_mirror->error_count);
43694 }
43695
43696 static int mirror_available(struct mirror_set *ms, struct bio *bio)
43697 @@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
43698 */
43699 if (likely(region_in_sync(ms, region, 1)))
43700 m = choose_mirror(ms, bio->bi_iter.bi_sector);
43701 - else if (m && atomic_read(&m->error_count))
43702 + else if (m && atomic_read_unchecked(&m->error_count))
43703 m = NULL;
43704
43705 if (likely(m))
43706 @@ -927,7 +927,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
43707 }
43708
43709 ms->mirror[mirror].ms = ms;
43710 - atomic_set(&(ms->mirror[mirror].error_count), 0);
43711 + atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
43712 ms->mirror[mirror].error_type = 0;
43713 ms->mirror[mirror].offset = offset;
43714
43715 @@ -1342,7 +1342,7 @@ static void mirror_resume(struct dm_target *ti)
43716 */
43717 static char device_status_char(struct mirror *m)
43718 {
43719 - if (!atomic_read(&(m->error_count)))
43720 + if (!atomic_read_unchecked(&(m->error_count)))
43721 return 'A';
43722
43723 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
43724 diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
43725 index 28a9012..9c0f6a5 100644
43726 --- a/drivers/md/dm-stats.c
43727 +++ b/drivers/md/dm-stats.c
43728 @@ -382,7 +382,7 @@ do_sync_free:
43729 synchronize_rcu_expedited();
43730 dm_stat_free(&s->rcu_head);
43731 } else {
43732 - ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
43733 + ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
43734 call_rcu(&s->rcu_head, dm_stat_free);
43735 }
43736 return 0;
43737 @@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
43738 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
43739 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
43740 ));
43741 - ACCESS_ONCE(last->last_sector) = end_sector;
43742 - ACCESS_ONCE(last->last_rw) = bi_rw;
43743 + ACCESS_ONCE_RW(last->last_sector) = end_sector;
43744 + ACCESS_ONCE_RW(last->last_rw) = bi_rw;
43745 }
43746
43747 rcu_read_lock();
43748 diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
43749 index d1600d2..4c3af3a 100644
43750 --- a/drivers/md/dm-stripe.c
43751 +++ b/drivers/md/dm-stripe.c
43752 @@ -21,7 +21,7 @@ struct stripe {
43753 struct dm_dev *dev;
43754 sector_t physical_start;
43755
43756 - atomic_t error_count;
43757 + atomic_unchecked_t error_count;
43758 };
43759
43760 struct stripe_c {
43761 @@ -186,7 +186,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
43762 kfree(sc);
43763 return r;
43764 }
43765 - atomic_set(&(sc->stripe[i].error_count), 0);
43766 + atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
43767 }
43768
43769 ti->private = sc;
43770 @@ -330,7 +330,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
43771 DMEMIT("%d ", sc->stripes);
43772 for (i = 0; i < sc->stripes; i++) {
43773 DMEMIT("%s ", sc->stripe[i].dev->name);
43774 - buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
43775 + buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
43776 'D' : 'A';
43777 }
43778 buffer[i] = '\0';
43779 @@ -375,8 +375,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
43780 */
43781 for (i = 0; i < sc->stripes; i++)
43782 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
43783 - atomic_inc(&(sc->stripe[i].error_count));
43784 - if (atomic_read(&(sc->stripe[i].error_count)) <
43785 + atomic_inc_unchecked(&(sc->stripe[i].error_count));
43786 + if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
43787 DM_IO_ERROR_THRESHOLD)
43788 schedule_work(&sc->trigger_event);
43789 }
43790 diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
43791 index 6a7f2b8..fea0bde 100644
43792 --- a/drivers/md/dm-table.c
43793 +++ b/drivers/md/dm-table.c
43794 @@ -274,7 +274,7 @@ static struct dm_dev_internal *find_device(struct list_head *l, dev_t dev)
43795 static int open_dev(struct dm_dev_internal *d, dev_t dev,
43796 struct mapped_device *md)
43797 {
43798 - static char *_claim_ptr = "I belong to device-mapper";
43799 + static char _claim_ptr[] = "I belong to device-mapper";
43800 struct block_device *bdev;
43801
43802 int r;
43803 @@ -342,7 +342,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
43804 if (!dev_size)
43805 return 0;
43806
43807 - if ((start >= dev_size) || (start + len > dev_size)) {
43808 + if ((start >= dev_size) || (len > dev_size - start)) {
43809 DMWARN("%s: %s too small for target: "
43810 "start=%llu, len=%llu, dev_size=%llu",
43811 dm_device_name(ti->table->md), bdevname(bdev, b),
43812 diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
43813 index fb9efc8..81e8986 100644
43814 --- a/drivers/md/dm-thin-metadata.c
43815 +++ b/drivers/md/dm-thin-metadata.c
43816 @@ -397,7 +397,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
43817 {
43818 pmd->info.tm = pmd->tm;
43819 pmd->info.levels = 2;
43820 - pmd->info.value_type.context = pmd->data_sm;
43821 + pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
43822 pmd->info.value_type.size = sizeof(__le64);
43823 pmd->info.value_type.inc = data_block_inc;
43824 pmd->info.value_type.dec = data_block_dec;
43825 @@ -416,7 +416,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
43826
43827 pmd->bl_info.tm = pmd->tm;
43828 pmd->bl_info.levels = 1;
43829 - pmd->bl_info.value_type.context = pmd->data_sm;
43830 + pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
43831 pmd->bl_info.value_type.size = sizeof(__le64);
43832 pmd->bl_info.value_type.inc = data_block_inc;
43833 pmd->bl_info.value_type.dec = data_block_dec;
43834 diff --git a/drivers/md/dm.c b/drivers/md/dm.c
43835 index 8c53b09..f1fb2b0 100644
43836 --- a/drivers/md/dm.c
43837 +++ b/drivers/md/dm.c
43838 @@ -185,9 +185,9 @@ struct mapped_device {
43839 /*
43840 * Event handling.
43841 */
43842 - atomic_t event_nr;
43843 + atomic_unchecked_t event_nr;
43844 wait_queue_head_t eventq;
43845 - atomic_t uevent_seq;
43846 + atomic_unchecked_t uevent_seq;
43847 struct list_head uevent_list;
43848 spinlock_t uevent_lock; /* Protect access to uevent_list */
43849
43850 @@ -1888,8 +1888,8 @@ static struct mapped_device *alloc_dev(int minor)
43851 spin_lock_init(&md->deferred_lock);
43852 atomic_set(&md->holders, 1);
43853 atomic_set(&md->open_count, 0);
43854 - atomic_set(&md->event_nr, 0);
43855 - atomic_set(&md->uevent_seq, 0);
43856 + atomic_set_unchecked(&md->event_nr, 0);
43857 + atomic_set_unchecked(&md->uevent_seq, 0);
43858 INIT_LIST_HEAD(&md->uevent_list);
43859 spin_lock_init(&md->uevent_lock);
43860
43861 @@ -2043,7 +2043,7 @@ static void event_callback(void *context)
43862
43863 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
43864
43865 - atomic_inc(&md->event_nr);
43866 + atomic_inc_unchecked(&md->event_nr);
43867 wake_up(&md->eventq);
43868 }
43869
43870 @@ -2736,18 +2736,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
43871
43872 uint32_t dm_next_uevent_seq(struct mapped_device *md)
43873 {
43874 - return atomic_add_return(1, &md->uevent_seq);
43875 + return atomic_add_return_unchecked(1, &md->uevent_seq);
43876 }
43877
43878 uint32_t dm_get_event_nr(struct mapped_device *md)
43879 {
43880 - return atomic_read(&md->event_nr);
43881 + return atomic_read_unchecked(&md->event_nr);
43882 }
43883
43884 int dm_wait_event(struct mapped_device *md, int event_nr)
43885 {
43886 return wait_event_interruptible(md->eventq,
43887 - (event_nr != atomic_read(&md->event_nr)));
43888 + (event_nr != atomic_read_unchecked(&md->event_nr)));
43889 }
43890
43891 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
43892 diff --git a/drivers/md/md.c b/drivers/md/md.c
43893 index 4ad5cc4..0f19664 100644
43894 --- a/drivers/md/md.c
43895 +++ b/drivers/md/md.c
43896 @@ -194,10 +194,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
43897 * start build, activate spare
43898 */
43899 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
43900 -static atomic_t md_event_count;
43901 +static atomic_unchecked_t md_event_count;
43902 void md_new_event(struct mddev *mddev)
43903 {
43904 - atomic_inc(&md_event_count);
43905 + atomic_inc_unchecked(&md_event_count);
43906 wake_up(&md_event_waiters);
43907 }
43908 EXPORT_SYMBOL_GPL(md_new_event);
43909 @@ -207,7 +207,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
43910 */
43911 static void md_new_event_inintr(struct mddev *mddev)
43912 {
43913 - atomic_inc(&md_event_count);
43914 + atomic_inc_unchecked(&md_event_count);
43915 wake_up(&md_event_waiters);
43916 }
43917
43918 @@ -1462,7 +1462,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
43919 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
43920 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
43921 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
43922 - atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
43923 + atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
43924
43925 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
43926 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
43927 @@ -1713,7 +1713,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
43928 else
43929 sb->resync_offset = cpu_to_le64(0);
43930
43931 - sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
43932 + sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
43933
43934 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
43935 sb->size = cpu_to_le64(mddev->dev_sectors);
43936 @@ -2725,7 +2725,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
43937 static ssize_t
43938 errors_show(struct md_rdev *rdev, char *page)
43939 {
43940 - return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
43941 + return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
43942 }
43943
43944 static ssize_t
43945 @@ -2734,7 +2734,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
43946 char *e;
43947 unsigned long n = simple_strtoul(buf, &e, 10);
43948 if (*buf && (*e == 0 || *e == '\n')) {
43949 - atomic_set(&rdev->corrected_errors, n);
43950 + atomic_set_unchecked(&rdev->corrected_errors, n);
43951 return len;
43952 }
43953 return -EINVAL;
43954 @@ -3183,8 +3183,8 @@ int md_rdev_init(struct md_rdev *rdev)
43955 rdev->sb_loaded = 0;
43956 rdev->bb_page = NULL;
43957 atomic_set(&rdev->nr_pending, 0);
43958 - atomic_set(&rdev->read_errors, 0);
43959 - atomic_set(&rdev->corrected_errors, 0);
43960 + atomic_set_unchecked(&rdev->read_errors, 0);
43961 + atomic_set_unchecked(&rdev->corrected_errors, 0);
43962
43963 INIT_LIST_HEAD(&rdev->same_set);
43964 init_waitqueue_head(&rdev->blocked_wait);
43965 @@ -7075,7 +7075,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
43966
43967 spin_unlock(&pers_lock);
43968 seq_printf(seq, "\n");
43969 - seq->poll_event = atomic_read(&md_event_count);
43970 + seq->poll_event = atomic_read_unchecked(&md_event_count);
43971 return 0;
43972 }
43973 if (v == (void*)2) {
43974 @@ -7178,7 +7178,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
43975 return error;
43976
43977 seq = file->private_data;
43978 - seq->poll_event = atomic_read(&md_event_count);
43979 + seq->poll_event = atomic_read_unchecked(&md_event_count);
43980 return error;
43981 }
43982
43983 @@ -7192,7 +7192,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
43984 /* always allow read */
43985 mask = POLLIN | POLLRDNORM;
43986
43987 - if (seq->poll_event != atomic_read(&md_event_count))
43988 + if (seq->poll_event != atomic_read_unchecked(&md_event_count))
43989 mask |= POLLERR | POLLPRI;
43990 return mask;
43991 }
43992 @@ -7236,7 +7236,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
43993 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
43994 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
43995 (int)part_stat_read(&disk->part0, sectors[1]) -
43996 - atomic_read(&disk->sync_io);
43997 + atomic_read_unchecked(&disk->sync_io);
43998 /* sync IO will cause sync_io to increase before the disk_stats
43999 * as sync_io is counted when a request starts, and
44000 * disk_stats is counted when it completes.
44001 diff --git a/drivers/md/md.h b/drivers/md/md.h
44002 index 07bba96..2d6788c 100644
44003 --- a/drivers/md/md.h
44004 +++ b/drivers/md/md.h
44005 @@ -94,13 +94,13 @@ struct md_rdev {
44006 * only maintained for arrays that
44007 * support hot removal
44008 */
44009 - atomic_t read_errors; /* number of consecutive read errors that
44010 + atomic_unchecked_t read_errors; /* number of consecutive read errors that
44011 * we have tried to ignore.
44012 */
44013 struct timespec last_read_error; /* monotonic time since our
44014 * last read error
44015 */
44016 - atomic_t corrected_errors; /* number of corrected read errors,
44017 + atomic_unchecked_t corrected_errors; /* number of corrected read errors,
44018 * for reporting to userspace and storing
44019 * in superblock.
44020 */
44021 @@ -449,7 +449,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
44022
44023 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
44024 {
44025 - atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44026 + atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44027 }
44028
44029 struct md_personality
44030 diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
44031 index 786b689..ea8c956 100644
44032 --- a/drivers/md/persistent-data/dm-space-map-metadata.c
44033 +++ b/drivers/md/persistent-data/dm-space-map-metadata.c
44034 @@ -679,7 +679,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
44035 * Flick into a mode where all blocks get allocated in the new area.
44036 */
44037 smm->begin = old_len;
44038 - memcpy(sm, &bootstrap_ops, sizeof(*sm));
44039 + memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
44040
44041 /*
44042 * Extend.
44043 @@ -710,7 +710,7 @@ out:
44044 /*
44045 * Switch back to normal behaviour.
44046 */
44047 - memcpy(sm, &ops, sizeof(*sm));
44048 + memcpy((void *)sm, &ops, sizeof(*sm));
44049 return r;
44050 }
44051
44052 diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
44053 index 3e6d115..ffecdeb 100644
44054 --- a/drivers/md/persistent-data/dm-space-map.h
44055 +++ b/drivers/md/persistent-data/dm-space-map.h
44056 @@ -71,6 +71,7 @@ struct dm_space_map {
44057 dm_sm_threshold_fn fn,
44058 void *context);
44059 };
44060 +typedef struct dm_space_map __no_const dm_space_map_no_const;
44061
44062 /*----------------------------------------------------------------*/
44063
44064 diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
44065 index 4a6ca1c..e952750 100644
44066 --- a/drivers/md/raid1.c
44067 +++ b/drivers/md/raid1.c
44068 @@ -1922,7 +1922,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
44069 if (r1_sync_page_io(rdev, sect, s,
44070 bio->bi_io_vec[idx].bv_page,
44071 READ) != 0)
44072 - atomic_add(s, &rdev->corrected_errors);
44073 + atomic_add_unchecked(s, &rdev->corrected_errors);
44074 }
44075 sectors -= s;
44076 sect += s;
44077 @@ -2156,7 +2156,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
44078 test_bit(In_sync, &rdev->flags)) {
44079 if (r1_sync_page_io(rdev, sect, s,
44080 conf->tmppage, READ)) {
44081 - atomic_add(s, &rdev->corrected_errors);
44082 + atomic_add_unchecked(s, &rdev->corrected_errors);
44083 printk(KERN_INFO
44084 "md/raid1:%s: read error corrected "
44085 "(%d sectors at %llu on %s)\n",
44086 diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
44087 index 33fc408..fc61709 100644
44088 --- a/drivers/md/raid10.c
44089 +++ b/drivers/md/raid10.c
44090 @@ -1948,7 +1948,7 @@ static void end_sync_read(struct bio *bio, int error)
44091 /* The write handler will notice the lack of
44092 * R10BIO_Uptodate and record any errors etc
44093 */
44094 - atomic_add(r10_bio->sectors,
44095 + atomic_add_unchecked(r10_bio->sectors,
44096 &conf->mirrors[d].rdev->corrected_errors);
44097
44098 /* for reconstruct, we always reschedule after a read.
44099 @@ -2306,7 +2306,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44100 {
44101 struct timespec cur_time_mon;
44102 unsigned long hours_since_last;
44103 - unsigned int read_errors = atomic_read(&rdev->read_errors);
44104 + unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
44105
44106 ktime_get_ts(&cur_time_mon);
44107
44108 @@ -2328,9 +2328,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44109 * overflowing the shift of read_errors by hours_since_last.
44110 */
44111 if (hours_since_last >= 8 * sizeof(read_errors))
44112 - atomic_set(&rdev->read_errors, 0);
44113 + atomic_set_unchecked(&rdev->read_errors, 0);
44114 else
44115 - atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
44116 + atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
44117 }
44118
44119 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
44120 @@ -2384,8 +2384,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44121 return;
44122
44123 check_decay_read_errors(mddev, rdev);
44124 - atomic_inc(&rdev->read_errors);
44125 - if (atomic_read(&rdev->read_errors) > max_read_errors) {
44126 + atomic_inc_unchecked(&rdev->read_errors);
44127 + if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
44128 char b[BDEVNAME_SIZE];
44129 bdevname(rdev->bdev, b);
44130
44131 @@ -2393,7 +2393,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44132 "md/raid10:%s: %s: Raid device exceeded "
44133 "read_error threshold [cur %d:max %d]\n",
44134 mdname(mddev), b,
44135 - atomic_read(&rdev->read_errors), max_read_errors);
44136 + atomic_read_unchecked(&rdev->read_errors), max_read_errors);
44137 printk(KERN_NOTICE
44138 "md/raid10:%s: %s: Failing raid device\n",
44139 mdname(mddev), b);
44140 @@ -2548,7 +2548,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44141 sect +
44142 choose_data_offset(r10_bio, rdev)),
44143 bdevname(rdev->bdev, b));
44144 - atomic_add(s, &rdev->corrected_errors);
44145 + atomic_add_unchecked(s, &rdev->corrected_errors);
44146 }
44147
44148 rdev_dec_pending(rdev, mddev);
44149 diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
44150 index 16f5c21..4df20dc 100644
44151 --- a/drivers/md/raid5.c
44152 +++ b/drivers/md/raid5.c
44153 @@ -1991,21 +1991,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
44154 mdname(conf->mddev), STRIPE_SECTORS,
44155 (unsigned long long)s,
44156 bdevname(rdev->bdev, b));
44157 - atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
44158 + atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
44159 clear_bit(R5_ReadError, &sh->dev[i].flags);
44160 clear_bit(R5_ReWrite, &sh->dev[i].flags);
44161 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
44162 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
44163
44164 - if (atomic_read(&rdev->read_errors))
44165 - atomic_set(&rdev->read_errors, 0);
44166 + if (atomic_read_unchecked(&rdev->read_errors))
44167 + atomic_set_unchecked(&rdev->read_errors, 0);
44168 } else {
44169 const char *bdn = bdevname(rdev->bdev, b);
44170 int retry = 0;
44171 int set_bad = 0;
44172
44173 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
44174 - atomic_inc(&rdev->read_errors);
44175 + atomic_inc_unchecked(&rdev->read_errors);
44176 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
44177 printk_ratelimited(
44178 KERN_WARNING
44179 @@ -2033,7 +2033,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
44180 mdname(conf->mddev),
44181 (unsigned long long)s,
44182 bdn);
44183 - } else if (atomic_read(&rdev->read_errors)
44184 + } else if (atomic_read_unchecked(&rdev->read_errors)
44185 > conf->max_nr_stripes)
44186 printk(KERN_WARNING
44187 "md/raid:%s: Too many read errors, failing device %s.\n",
44188 diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
44189 index 983db75..ef9248c 100644
44190 --- a/drivers/media/dvb-core/dvbdev.c
44191 +++ b/drivers/media/dvb-core/dvbdev.c
44192 @@ -185,7 +185,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
44193 const struct dvb_device *template, void *priv, int type)
44194 {
44195 struct dvb_device *dvbdev;
44196 - struct file_operations *dvbdevfops;
44197 + file_operations_no_const *dvbdevfops;
44198 struct device *clsdev;
44199 int minor;
44200 int id;
44201 diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
44202 index 9b6c3bb..baeb5c7 100644
44203 --- a/drivers/media/dvb-frontends/dib3000.h
44204 +++ b/drivers/media/dvb-frontends/dib3000.h
44205 @@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
44206 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
44207 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
44208 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
44209 -};
44210 +} __no_const;
44211
44212 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
44213 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
44214 diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
44215 index d5a7a13..703560f 100644
44216 --- a/drivers/media/media-device.c
44217 +++ b/drivers/media/media-device.c
44218 @@ -93,6 +93,7 @@ static long media_device_enum_entities(struct media_device *mdev,
44219 struct media_entity *ent;
44220 struct media_entity_desc u_ent;
44221
44222 + memset(&u_ent, 0, sizeof(u_ent));
44223 if (copy_from_user(&u_ent.id, &uent->id, sizeof(u_ent.id)))
44224 return -EFAULT;
44225
44226 diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
44227 index ed8cb90..5ef7f79 100644
44228 --- a/drivers/media/pci/cx88/cx88-video.c
44229 +++ b/drivers/media/pci/cx88/cx88-video.c
44230 @@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
44231
44232 /* ------------------------------------------------------------------ */
44233
44234 -static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44235 -static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44236 -static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44237 +static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44238 +static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44239 +static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44240
44241 module_param_array(video_nr, int, NULL, 0444);
44242 module_param_array(vbi_nr, int, NULL, 0444);
44243 diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
44244 index 802642d..5534900 100644
44245 --- a/drivers/media/pci/ivtv/ivtv-driver.c
44246 +++ b/drivers/media/pci/ivtv/ivtv-driver.c
44247 @@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
44248 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
44249
44250 /* ivtv instance counter */
44251 -static atomic_t ivtv_instance = ATOMIC_INIT(0);
44252 +static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
44253
44254 /* Parameter declarations */
44255 static int cardtype[IVTV_MAX_CARDS];
44256 diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
44257 index dfd0a21..6bbb465 100644
44258 --- a/drivers/media/platform/omap/omap_vout.c
44259 +++ b/drivers/media/platform/omap/omap_vout.c
44260 @@ -63,7 +63,6 @@ enum omap_vout_channels {
44261 OMAP_VIDEO2,
44262 };
44263
44264 -static struct videobuf_queue_ops video_vbq_ops;
44265 /* Variables configurable through module params*/
44266 static u32 video1_numbuffers = 3;
44267 static u32 video2_numbuffers = 3;
44268 @@ -1014,6 +1013,12 @@ static int omap_vout_open(struct file *file)
44269 {
44270 struct videobuf_queue *q;
44271 struct omap_vout_device *vout = NULL;
44272 + static struct videobuf_queue_ops video_vbq_ops = {
44273 + .buf_setup = omap_vout_buffer_setup,
44274 + .buf_prepare = omap_vout_buffer_prepare,
44275 + .buf_release = omap_vout_buffer_release,
44276 + .buf_queue = omap_vout_buffer_queue,
44277 + };
44278
44279 vout = video_drvdata(file);
44280 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
44281 @@ -1031,10 +1036,6 @@ static int omap_vout_open(struct file *file)
44282 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
44283
44284 q = &vout->vbq;
44285 - video_vbq_ops.buf_setup = omap_vout_buffer_setup;
44286 - video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
44287 - video_vbq_ops.buf_release = omap_vout_buffer_release;
44288 - video_vbq_ops.buf_queue = omap_vout_buffer_queue;
44289 spin_lock_init(&vout->vbq_lock);
44290
44291 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
44292 diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
44293 index fb2acc5..a2fcbdc4 100644
44294 --- a/drivers/media/platform/s5p-tv/mixer.h
44295 +++ b/drivers/media/platform/s5p-tv/mixer.h
44296 @@ -156,7 +156,7 @@ struct mxr_layer {
44297 /** layer index (unique identifier) */
44298 int idx;
44299 /** callbacks for layer methods */
44300 - struct mxr_layer_ops ops;
44301 + struct mxr_layer_ops *ops;
44302 /** format array */
44303 const struct mxr_format **fmt_array;
44304 /** size of format array */
44305 diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
44306 index 74344c7..a39e70e 100644
44307 --- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
44308 +++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
44309 @@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
44310 {
44311 struct mxr_layer *layer;
44312 int ret;
44313 - struct mxr_layer_ops ops = {
44314 + static struct mxr_layer_ops ops = {
44315 .release = mxr_graph_layer_release,
44316 .buffer_set = mxr_graph_buffer_set,
44317 .stream_set = mxr_graph_stream_set,
44318 diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
44319 index b713403..53cb5ad 100644
44320 --- a/drivers/media/platform/s5p-tv/mixer_reg.c
44321 +++ b/drivers/media/platform/s5p-tv/mixer_reg.c
44322 @@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
44323 layer->update_buf = next;
44324 }
44325
44326 - layer->ops.buffer_set(layer, layer->update_buf);
44327 + layer->ops->buffer_set(layer, layer->update_buf);
44328
44329 if (done && done != layer->shadow_buf)
44330 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
44331 diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
44332 index c5059ba..2649f28 100644
44333 --- a/drivers/media/platform/s5p-tv/mixer_video.c
44334 +++ b/drivers/media/platform/s5p-tv/mixer_video.c
44335 @@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
44336 layer->geo.src.height = layer->geo.src.full_height;
44337
44338 mxr_geometry_dump(mdev, &layer->geo);
44339 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
44340 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
44341 mxr_geometry_dump(mdev, &layer->geo);
44342 }
44343
44344 @@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
44345 layer->geo.dst.full_width = mbus_fmt.width;
44346 layer->geo.dst.full_height = mbus_fmt.height;
44347 layer->geo.dst.field = mbus_fmt.field;
44348 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
44349 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
44350
44351 mxr_geometry_dump(mdev, &layer->geo);
44352 }
44353 @@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
44354 /* set source size to highest accepted value */
44355 geo->src.full_width = max(geo->dst.full_width, pix->width);
44356 geo->src.full_height = max(geo->dst.full_height, pix->height);
44357 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
44358 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
44359 mxr_geometry_dump(mdev, &layer->geo);
44360 /* set cropping to total visible screen */
44361 geo->src.width = pix->width;
44362 @@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
44363 geo->src.x_offset = 0;
44364 geo->src.y_offset = 0;
44365 /* assure consistency of geometry */
44366 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
44367 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
44368 mxr_geometry_dump(mdev, &layer->geo);
44369 /* set full size to lowest possible value */
44370 geo->src.full_width = 0;
44371 geo->src.full_height = 0;
44372 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
44373 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
44374 mxr_geometry_dump(mdev, &layer->geo);
44375
44376 /* returning results */
44377 @@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
44378 target->width = s->r.width;
44379 target->height = s->r.height;
44380
44381 - layer->ops.fix_geometry(layer, stage, s->flags);
44382 + layer->ops->fix_geometry(layer, stage, s->flags);
44383
44384 /* retrieve update selection rectangle */
44385 res.left = target->x_offset;
44386 @@ -955,13 +955,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
44387 mxr_output_get(mdev);
44388
44389 mxr_layer_update_output(layer);
44390 - layer->ops.format_set(layer);
44391 + layer->ops->format_set(layer);
44392 /* enabling layer in hardware */
44393 spin_lock_irqsave(&layer->enq_slock, flags);
44394 layer->state = MXR_LAYER_STREAMING;
44395 spin_unlock_irqrestore(&layer->enq_slock, flags);
44396
44397 - layer->ops.stream_set(layer, MXR_ENABLE);
44398 + layer->ops->stream_set(layer, MXR_ENABLE);
44399 mxr_streamer_get(mdev);
44400
44401 return 0;
44402 @@ -1031,7 +1031,7 @@ static int stop_streaming(struct vb2_queue *vq)
44403 spin_unlock_irqrestore(&layer->enq_slock, flags);
44404
44405 /* disabling layer in hardware */
44406 - layer->ops.stream_set(layer, MXR_DISABLE);
44407 + layer->ops->stream_set(layer, MXR_DISABLE);
44408 /* remove one streamer */
44409 mxr_streamer_put(mdev);
44410 /* allow changes in output configuration */
44411 @@ -1070,8 +1070,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
44412
44413 void mxr_layer_release(struct mxr_layer *layer)
44414 {
44415 - if (layer->ops.release)
44416 - layer->ops.release(layer);
44417 + if (layer->ops->release)
44418 + layer->ops->release(layer);
44419 }
44420
44421 void mxr_base_layer_release(struct mxr_layer *layer)
44422 @@ -1097,7 +1097,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
44423
44424 layer->mdev = mdev;
44425 layer->idx = idx;
44426 - layer->ops = *ops;
44427 + layer->ops = ops;
44428
44429 spin_lock_init(&layer->enq_slock);
44430 INIT_LIST_HEAD(&layer->enq_list);
44431 diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
44432 index c9388c4..ce71ece 100644
44433 --- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
44434 +++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
44435 @@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
44436 {
44437 struct mxr_layer *layer;
44438 int ret;
44439 - struct mxr_layer_ops ops = {
44440 + static struct mxr_layer_ops ops = {
44441 .release = mxr_vp_layer_release,
44442 .buffer_set = mxr_vp_buffer_set,
44443 .stream_set = mxr_vp_stream_set,
44444 diff --git a/drivers/media/platform/vivi.c b/drivers/media/platform/vivi.c
44445 index 2d4e73b..8b4d5b6 100644
44446 --- a/drivers/media/platform/vivi.c
44447 +++ b/drivers/media/platform/vivi.c
44448 @@ -58,8 +58,8 @@ MODULE_AUTHOR("Mauro Carvalho Chehab, Ted Walther and John Sokol");
44449 MODULE_LICENSE("Dual BSD/GPL");
44450 MODULE_VERSION(VIVI_VERSION);
44451
44452 -static unsigned video_nr = -1;
44453 -module_param(video_nr, uint, 0644);
44454 +static int video_nr = -1;
44455 +module_param(video_nr, int, 0644);
44456 MODULE_PARM_DESC(video_nr, "videoX start number, -1 is autodetect");
44457
44458 static unsigned n_devs = 1;
44459 diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
44460 index 545c04c..a14bded 100644
44461 --- a/drivers/media/radio/radio-cadet.c
44462 +++ b/drivers/media/radio/radio-cadet.c
44463 @@ -324,6 +324,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
44464 unsigned char readbuf[RDS_BUFFER];
44465 int i = 0;
44466
44467 + if (count > RDS_BUFFER)
44468 + return -EFAULT;
44469 mutex_lock(&dev->lock);
44470 if (dev->rdsstat == 0)
44471 cadet_start_rds(dev);
44472 @@ -339,7 +341,7 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
44473 while (i < count && dev->rdsin != dev->rdsout)
44474 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
44475
44476 - if (i && copy_to_user(data, readbuf, i))
44477 + if (i > sizeof(readbuf) || copy_to_user(data, readbuf, i))
44478 i = -EFAULT;
44479 unlock:
44480 mutex_unlock(&dev->lock);
44481 diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
44482 index 5236035..c622c74 100644
44483 --- a/drivers/media/radio/radio-maxiradio.c
44484 +++ b/drivers/media/radio/radio-maxiradio.c
44485 @@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
44486 /* TEA5757 pin mappings */
44487 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
44488
44489 -static atomic_t maxiradio_instance = ATOMIC_INIT(0);
44490 +static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
44491
44492 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
44493 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
44494 diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
44495 index 050b3bb..79f62b9 100644
44496 --- a/drivers/media/radio/radio-shark.c
44497 +++ b/drivers/media/radio/radio-shark.c
44498 @@ -79,7 +79,7 @@ struct shark_device {
44499 u32 last_val;
44500 };
44501
44502 -static atomic_t shark_instance = ATOMIC_INIT(0);
44503 +static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
44504
44505 static void shark_write_val(struct snd_tea575x *tea, u32 val)
44506 {
44507 diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
44508 index 8654e0d..0608a64 100644
44509 --- a/drivers/media/radio/radio-shark2.c
44510 +++ b/drivers/media/radio/radio-shark2.c
44511 @@ -74,7 +74,7 @@ struct shark_device {
44512 u8 *transfer_buffer;
44513 };
44514
44515 -static atomic_t shark_instance = ATOMIC_INIT(0);
44516 +static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
44517
44518 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
44519 {
44520 diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
44521 index 2fd9009..278cc1e 100644
44522 --- a/drivers/media/radio/radio-si476x.c
44523 +++ b/drivers/media/radio/radio-si476x.c
44524 @@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
44525 struct si476x_radio *radio;
44526 struct v4l2_ctrl *ctrl;
44527
44528 - static atomic_t instance = ATOMIC_INIT(0);
44529 + static atomic_unchecked_t instance = ATOMIC_INIT(0);
44530
44531 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
44532 if (!radio)
44533 diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
44534 index a1c641e..3007da9 100644
44535 --- a/drivers/media/usb/dvb-usb/cxusb.c
44536 +++ b/drivers/media/usb/dvb-usb/cxusb.c
44537 @@ -1112,7 +1112,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
44538
44539 struct dib0700_adapter_state {
44540 int (*set_param_save) (struct dvb_frontend *);
44541 -};
44542 +} __no_const;
44543
44544 static int dib7070_set_param_override(struct dvb_frontend *fe)
44545 {
44546 diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
44547 index ae0f56a..ec71784 100644
44548 --- a/drivers/media/usb/dvb-usb/dw2102.c
44549 +++ b/drivers/media/usb/dvb-usb/dw2102.c
44550 @@ -118,7 +118,7 @@ struct su3000_state {
44551
44552 struct s6x0_state {
44553 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
44554 -};
44555 +} __no_const;
44556
44557 /* debug */
44558 static int dvb_usb_dw2102_debug;
44559 diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
44560 index 8f7a6a4..eb0e1d4 100644
44561 --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
44562 +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
44563 @@ -326,7 +326,7 @@ struct v4l2_buffer32 {
44564 __u32 reserved;
44565 };
44566
44567 -static int get_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
44568 +static int get_v4l2_plane32(struct v4l2_plane __user *up, struct v4l2_plane32 __user *up32,
44569 enum v4l2_memory memory)
44570 {
44571 void __user *up_pln;
44572 @@ -355,7 +355,7 @@ static int get_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
44573 return 0;
44574 }
44575
44576 -static int put_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
44577 +static int put_v4l2_plane32(struct v4l2_plane __user *up, struct v4l2_plane32 __user *up32,
44578 enum v4l2_memory memory)
44579 {
44580 if (copy_in_user(up32, up, 2 * sizeof(__u32)) ||
44581 @@ -425,7 +425,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
44582 * by passing a very big num_planes value */
44583 uplane = compat_alloc_user_space(num_planes *
44584 sizeof(struct v4l2_plane));
44585 - kp->m.planes = uplane;
44586 + kp->m.planes = (struct v4l2_plane __force_kernel *)uplane;
44587
44588 while (--num_planes >= 0) {
44589 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
44590 @@ -496,7 +496,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
44591 if (num_planes == 0)
44592 return 0;
44593
44594 - uplane = kp->m.planes;
44595 + uplane = (struct v4l2_plane __force_user *)kp->m.planes;
44596 if (get_user(p, &up->m.planes))
44597 return -EFAULT;
44598 uplane32 = compat_ptr(p);
44599 @@ -550,7 +550,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
44600 get_user(kp->capability, &up->capability) ||
44601 get_user(kp->flags, &up->flags))
44602 return -EFAULT;
44603 - kp->base = compat_ptr(tmp);
44604 + kp->base = (void __force_kernel *)compat_ptr(tmp);
44605 get_v4l2_pix_format(&kp->fmt, &up->fmt);
44606 return 0;
44607 }
44608 @@ -656,7 +656,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
44609 n * sizeof(struct v4l2_ext_control32)))
44610 return -EFAULT;
44611 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
44612 - kp->controls = kcontrols;
44613 + kp->controls = (struct v4l2_ext_control __force_kernel *)kcontrols;
44614 while (--n >= 0) {
44615 if (copy_in_user(kcontrols, ucontrols, sizeof(*ucontrols)))
44616 return -EFAULT;
44617 @@ -678,7 +678,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
44618 static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext_controls32 __user *up)
44619 {
44620 struct v4l2_ext_control32 __user *ucontrols;
44621 - struct v4l2_ext_control __user *kcontrols = kp->controls;
44622 + struct v4l2_ext_control __user *kcontrols = (struct v4l2_ext_control __force_user *)kp->controls;
44623 int n = kp->count;
44624 compat_caddr_t p;
44625
44626 @@ -772,7 +772,7 @@ static int put_v4l2_subdev_edid32(struct v4l2_subdev_edid *kp, struct v4l2_subde
44627 put_user(kp->start_block, &up->start_block) ||
44628 put_user(kp->blocks, &up->blocks) ||
44629 put_user(tmp, &up->edid) ||
44630 - copy_to_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
44631 + copy_to_user(up->reserved, kp->reserved, sizeof(kp->reserved)))
44632 return -EFAULT;
44633 return 0;
44634 }
44635 diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
44636 index 6ff002b..6b9316b 100644
44637 --- a/drivers/media/v4l2-core/v4l2-ctrls.c
44638 +++ b/drivers/media/v4l2-core/v4l2-ctrls.c
44639 @@ -1401,8 +1401,8 @@ static int validate_new(const struct v4l2_ctrl *ctrl,
44640 return 0;
44641
44642 case V4L2_CTRL_TYPE_STRING:
44643 - len = strlen(c->string);
44644 - if (len < ctrl->minimum)
44645 + len = strlen_user(c->string);
44646 + if (!len || len < ctrl->minimum)
44647 return -ERANGE;
44648 if ((len - ctrl->minimum) % ctrl->step)
44649 return -ERANGE;
44650 diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
44651 index 02d1b63..5fd6b16 100644
44652 --- a/drivers/media/v4l2-core/v4l2-device.c
44653 +++ b/drivers/media/v4l2-core/v4l2-device.c
44654 @@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
44655 EXPORT_SYMBOL_GPL(v4l2_device_put);
44656
44657 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
44658 - atomic_t *instance)
44659 + atomic_unchecked_t *instance)
44660 {
44661 - int num = atomic_inc_return(instance) - 1;
44662 + int num = atomic_inc_return_unchecked(instance) - 1;
44663 int len = strlen(basename);
44664
44665 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
44666 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
44667 index 707aef7..93b8ac0 100644
44668 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
44669 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
44670 @@ -1942,7 +1942,8 @@ struct v4l2_ioctl_info {
44671 struct file *file, void *fh, void *p);
44672 } u;
44673 void (*debug)(const void *arg, bool write_only);
44674 -};
44675 +} __do_const;
44676 +typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
44677
44678 /* This control needs a priority check */
44679 #define INFO_FL_PRIO (1 << 0)
44680 @@ -2123,7 +2124,7 @@ static long __video_do_ioctl(struct file *file,
44681 struct video_device *vfd = video_devdata(file);
44682 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
44683 bool write_only = false;
44684 - struct v4l2_ioctl_info default_info;
44685 + v4l2_ioctl_info_no_const default_info;
44686 const struct v4l2_ioctl_info *info;
44687 void *fh = file->private_data;
44688 struct v4l2_fh *vfh = NULL;
44689 @@ -2197,7 +2198,7 @@ done:
44690 }
44691
44692 static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
44693 - void * __user *user_ptr, void ***kernel_ptr)
44694 + void __user **user_ptr, void ***kernel_ptr)
44695 {
44696 int ret = 0;
44697
44698 @@ -2213,7 +2214,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
44699 ret = -EINVAL;
44700 break;
44701 }
44702 - *user_ptr = (void __user *)buf->m.planes;
44703 + *user_ptr = (void __force_user *)buf->m.planes;
44704 *kernel_ptr = (void *)&buf->m.planes;
44705 *array_size = sizeof(struct v4l2_plane) * buf->length;
44706 ret = 1;
44707 @@ -2248,7 +2249,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
44708 ret = -EINVAL;
44709 break;
44710 }
44711 - *user_ptr = (void __user *)ctrls->controls;
44712 + *user_ptr = (void __force_user *)ctrls->controls;
44713 *kernel_ptr = (void *)&ctrls->controls;
44714 *array_size = sizeof(struct v4l2_ext_control)
44715 * ctrls->count;
44716 @@ -2349,7 +2350,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
44717 }
44718
44719 if (has_array_args) {
44720 - *kernel_ptr = user_ptr;
44721 + *kernel_ptr = (void __force_kernel *)user_ptr;
44722 if (copy_to_user(user_ptr, mbuf, array_size))
44723 err = -EFAULT;
44724 goto out_array_args;
44725 diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
44726 index 570b18a..f880314 100644
44727 --- a/drivers/message/fusion/mptbase.c
44728 +++ b/drivers/message/fusion/mptbase.c
44729 @@ -6755,8 +6755,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
44730 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
44731 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
44732
44733 +#ifdef CONFIG_GRKERNSEC_HIDESYM
44734 + seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
44735 +#else
44736 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
44737 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
44738 +#endif
44739 +
44740 /*
44741 * Rounding UP to nearest 4-kB boundary here...
44742 */
44743 @@ -6769,7 +6774,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
44744 ioc->facts.GlobalCredits);
44745
44746 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
44747 +#ifdef CONFIG_GRKERNSEC_HIDESYM
44748 + NULL, NULL);
44749 +#else
44750 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
44751 +#endif
44752 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
44753 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
44754 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
44755 diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
44756 index 00d339c..2ea899d 100644
44757 --- a/drivers/message/fusion/mptsas.c
44758 +++ b/drivers/message/fusion/mptsas.c
44759 @@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
44760 return 0;
44761 }
44762
44763 +static inline void
44764 +mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
44765 +{
44766 + if (phy_info->port_details) {
44767 + phy_info->port_details->rphy = rphy;
44768 + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
44769 + ioc->name, rphy));
44770 + }
44771 +
44772 + if (rphy) {
44773 + dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
44774 + &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
44775 + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
44776 + ioc->name, rphy, rphy->dev.release));
44777 + }
44778 +}
44779 +
44780 /* no mutex */
44781 static void
44782 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
44783 @@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
44784 return NULL;
44785 }
44786
44787 -static inline void
44788 -mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
44789 -{
44790 - if (phy_info->port_details) {
44791 - phy_info->port_details->rphy = rphy;
44792 - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
44793 - ioc->name, rphy));
44794 - }
44795 -
44796 - if (rphy) {
44797 - dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
44798 - &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
44799 - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
44800 - ioc->name, rphy, rphy->dev.release));
44801 - }
44802 -}
44803 -
44804 static inline struct sas_port *
44805 mptsas_get_port(struct mptsas_phyinfo *phy_info)
44806 {
44807 diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
44808 index 727819c..ad74694 100644
44809 --- a/drivers/message/fusion/mptscsih.c
44810 +++ b/drivers/message/fusion/mptscsih.c
44811 @@ -1271,15 +1271,16 @@ mptscsih_info(struct Scsi_Host *SChost)
44812
44813 h = shost_priv(SChost);
44814
44815 - if (h) {
44816 - if (h->info_kbuf == NULL)
44817 - if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
44818 - return h->info_kbuf;
44819 - h->info_kbuf[0] = '\0';
44820 + if (!h)
44821 + return NULL;
44822
44823 - mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
44824 - h->info_kbuf[size-1] = '\0';
44825 - }
44826 + if (h->info_kbuf == NULL)
44827 + if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
44828 + return h->info_kbuf;
44829 + h->info_kbuf[0] = '\0';
44830 +
44831 + mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
44832 + h->info_kbuf[size-1] = '\0';
44833
44834 return h->info_kbuf;
44835 }
44836 diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
44837 index b7d87cd..3fb36da 100644
44838 --- a/drivers/message/i2o/i2o_proc.c
44839 +++ b/drivers/message/i2o/i2o_proc.c
44840 @@ -255,12 +255,6 @@ static char *scsi_devices[] = {
44841 "Array Controller Device"
44842 };
44843
44844 -static char *chtostr(char *tmp, u8 *chars, int n)
44845 -{
44846 - tmp[0] = 0;
44847 - return strncat(tmp, (char *)chars, n);
44848 -}
44849 -
44850 static int i2o_report_query_status(struct seq_file *seq, int block_status,
44851 char *group)
44852 {
44853 @@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
44854 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
44855 {
44856 struct i2o_controller *c = (struct i2o_controller *)seq->private;
44857 - static u32 work32[5];
44858 - static u8 *work8 = (u8 *) work32;
44859 - static u16 *work16 = (u16 *) work32;
44860 + u32 work32[5];
44861 + u8 *work8 = (u8 *) work32;
44862 + u16 *work16 = (u16 *) work32;
44863 int token;
44864 u32 hwcap;
44865
44866 @@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
44867 } *result;
44868
44869 i2o_exec_execute_ddm_table ddm_table;
44870 - char tmp[28 + 1];
44871
44872 result = kmalloc(sizeof(*result), GFP_KERNEL);
44873 if (!result)
44874 @@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
44875
44876 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
44877 seq_printf(seq, "%-#8x", ddm_table.module_id);
44878 - seq_printf(seq, "%-29s",
44879 - chtostr(tmp, ddm_table.module_name_version, 28));
44880 + seq_printf(seq, "%-.28s", ddm_table.module_name_version);
44881 seq_printf(seq, "%9d ", ddm_table.data_size);
44882 seq_printf(seq, "%8d", ddm_table.code_size);
44883
44884 @@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
44885
44886 i2o_driver_result_table *result;
44887 i2o_driver_store_table *dst;
44888 - char tmp[28 + 1];
44889
44890 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
44891 if (result == NULL)
44892 @@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
44893
44894 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
44895 seq_printf(seq, "%-#8x", dst->module_id);
44896 - seq_printf(seq, "%-29s",
44897 - chtostr(tmp, dst->module_name_version, 28));
44898 - seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
44899 + seq_printf(seq, "%-.28s", dst->module_name_version);
44900 + seq_printf(seq, "%-.8s", dst->date);
44901 seq_printf(seq, "%8d ", dst->module_size);
44902 seq_printf(seq, "%8d ", dst->mpb_size);
44903 seq_printf(seq, "0x%04x", dst->module_flags);
44904 @@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
44905 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
44906 {
44907 struct i2o_device *d = (struct i2o_device *)seq->private;
44908 - static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
44909 + u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
44910 // == (allow) 512d bytes (max)
44911 - static u16 *work16 = (u16 *) work32;
44912 + u16 *work16 = (u16 *) work32;
44913 int token;
44914 - char tmp[16 + 1];
44915
44916 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
44917
44918 @@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
44919 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
44920 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
44921 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
44922 - seq_printf(seq, "Vendor info : %s\n",
44923 - chtostr(tmp, (u8 *) (work32 + 2), 16));
44924 - seq_printf(seq, "Product info : %s\n",
44925 - chtostr(tmp, (u8 *) (work32 + 6), 16));
44926 - seq_printf(seq, "Description : %s\n",
44927 - chtostr(tmp, (u8 *) (work32 + 10), 16));
44928 - seq_printf(seq, "Product rev. : %s\n",
44929 - chtostr(tmp, (u8 *) (work32 + 14), 8));
44930 + seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
44931 + seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
44932 + seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
44933 + seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
44934
44935 seq_printf(seq, "Serial number : ");
44936 print_serial_number(seq, (u8 *) (work32 + 16),
44937 @@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
44938 u8 pad[256]; // allow up to 256 byte (max) serial number
44939 } result;
44940
44941 - char tmp[24 + 1];
44942 -
44943 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
44944
44945 if (token < 0) {
44946 @@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
44947 }
44948
44949 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
44950 - seq_printf(seq, "Module name : %s\n",
44951 - chtostr(tmp, result.module_name, 24));
44952 - seq_printf(seq, "Module revision : %s\n",
44953 - chtostr(tmp, result.module_rev, 8));
44954 + seq_printf(seq, "Module name : %.24s\n", result.module_name);
44955 + seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
44956
44957 seq_printf(seq, "Serial number : ");
44958 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
44959 @@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
44960 u8 instance_number[4];
44961 } result;
44962
44963 - char tmp[64 + 1];
44964 -
44965 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
44966
44967 if (token < 0) {
44968 @@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
44969 return 0;
44970 }
44971
44972 - seq_printf(seq, "Device name : %s\n",
44973 - chtostr(tmp, result.device_name, 64));
44974 - seq_printf(seq, "Service name : %s\n",
44975 - chtostr(tmp, result.service_name, 64));
44976 - seq_printf(seq, "Physical name : %s\n",
44977 - chtostr(tmp, result.physical_location, 64));
44978 - seq_printf(seq, "Instance number : %s\n",
44979 - chtostr(tmp, result.instance_number, 4));
44980 + seq_printf(seq, "Device name : %.64s\n", result.device_name);
44981 + seq_printf(seq, "Service name : %.64s\n", result.service_name);
44982 + seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
44983 + seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
44984
44985 return 0;
44986 }
44987 @@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
44988 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
44989 {
44990 struct i2o_device *d = (struct i2o_device *)seq->private;
44991 - static u32 work32[12];
44992 - static u16 *work16 = (u16 *) work32;
44993 - static u8 *work8 = (u8 *) work32;
44994 + u32 work32[12];
44995 + u16 *work16 = (u16 *) work32;
44996 + u8 *work8 = (u8 *) work32;
44997 int token;
44998
44999 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
45000 diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
45001 index a8c08f3..155fe3d 100644
45002 --- a/drivers/message/i2o/iop.c
45003 +++ b/drivers/message/i2o/iop.c
45004 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
45005
45006 spin_lock_irqsave(&c->context_list_lock, flags);
45007
45008 - if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
45009 - atomic_inc(&c->context_list_counter);
45010 + if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
45011 + atomic_inc_unchecked(&c->context_list_counter);
45012
45013 - entry->context = atomic_read(&c->context_list_counter);
45014 + entry->context = atomic_read_unchecked(&c->context_list_counter);
45015
45016 list_add(&entry->list, &c->context_list);
45017
45018 @@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(void)
45019
45020 #if BITS_PER_LONG == 64
45021 spin_lock_init(&c->context_list_lock);
45022 - atomic_set(&c->context_list_counter, 0);
45023 + atomic_set_unchecked(&c->context_list_counter, 0);
45024 INIT_LIST_HEAD(&c->context_list);
45025 #endif
45026
45027 diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
45028 index d1a22aa..d0f7bf7 100644
45029 --- a/drivers/mfd/ab8500-debugfs.c
45030 +++ b/drivers/mfd/ab8500-debugfs.c
45031 @@ -100,7 +100,7 @@ static int irq_last;
45032 static u32 *irq_count;
45033 static int num_irqs;
45034
45035 -static struct device_attribute **dev_attr;
45036 +static device_attribute_no_const **dev_attr;
45037 static char **event_name;
45038
45039 static u8 avg_sample = SAMPLE_16;
45040 diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
45041 index 81b7d88..95ae998 100644
45042 --- a/drivers/mfd/janz-cmodio.c
45043 +++ b/drivers/mfd/janz-cmodio.c
45044 @@ -13,6 +13,7 @@
45045
45046 #include <linux/kernel.h>
45047 #include <linux/module.h>
45048 +#include <linux/slab.h>
45049 #include <linux/init.h>
45050 #include <linux/pci.h>
45051 #include <linux/interrupt.h>
45052 diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
45053 index 176aa26..27811b2 100644
45054 --- a/drivers/mfd/max8925-i2c.c
45055 +++ b/drivers/mfd/max8925-i2c.c
45056 @@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
45057 const struct i2c_device_id *id)
45058 {
45059 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
45060 - static struct max8925_chip *chip;
45061 + struct max8925_chip *chip;
45062 struct device_node *node = client->dev.of_node;
45063
45064 if (node && !pdata) {
45065 diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
45066 index 1f142d7..cc52c2a 100644
45067 --- a/drivers/mfd/tps65910.c
45068 +++ b/drivers/mfd/tps65910.c
45069 @@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
45070 struct tps65910_platform_data *pdata)
45071 {
45072 int ret = 0;
45073 - static struct regmap_irq_chip *tps6591x_irqs_chip;
45074 + struct regmap_irq_chip *tps6591x_irqs_chip;
45075
45076 if (!irq) {
45077 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
45078 diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
45079 index 9aa6d1e..1631bfc 100644
45080 --- a/drivers/mfd/twl4030-irq.c
45081 +++ b/drivers/mfd/twl4030-irq.c
45082 @@ -35,6 +35,7 @@
45083 #include <linux/of.h>
45084 #include <linux/irqdomain.h>
45085 #include <linux/i2c/twl.h>
45086 +#include <asm/pgtable.h>
45087
45088 #include "twl-core.h"
45089
45090 @@ -726,10 +727,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
45091 * Install an irq handler for each of the SIH modules;
45092 * clone dummy irq_chip since PIH can't *do* anything
45093 */
45094 - twl4030_irq_chip = dummy_irq_chip;
45095 - twl4030_irq_chip.name = "twl4030";
45096 + pax_open_kernel();
45097 + memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
45098 + *(const char **)&twl4030_irq_chip.name = "twl4030";
45099
45100 - twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
45101 + *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
45102 + pax_close_kernel();
45103
45104 for (i = irq_base; i < irq_end; i++) {
45105 irq_set_chip_and_handler(i, &twl4030_irq_chip,
45106 diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
45107 index 464419b..64bae8d 100644
45108 --- a/drivers/misc/c2port/core.c
45109 +++ b/drivers/misc/c2port/core.c
45110 @@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
45111 goto error_idr_alloc;
45112 c2dev->id = ret;
45113
45114 - bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
45115 + pax_open_kernel();
45116 + *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
45117 + pax_close_kernel();
45118
45119 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
45120 "c2port%d", c2dev->id);
45121 diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
45122 index 9c34e57..b981cda 100644
45123 --- a/drivers/misc/eeprom/sunxi_sid.c
45124 +++ b/drivers/misc/eeprom/sunxi_sid.c
45125 @@ -127,7 +127,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
45126
45127 platform_set_drvdata(pdev, sid_data);
45128
45129 - sid_bin_attr.size = sid_data->keysize;
45130 + pax_open_kernel();
45131 + *(size_t *)&sid_bin_attr.size = sid_data->keysize;
45132 + pax_close_kernel();
45133 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
45134 return -ENODEV;
45135
45136 diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
45137 index 36f5d52..32311c3 100644
45138 --- a/drivers/misc/kgdbts.c
45139 +++ b/drivers/misc/kgdbts.c
45140 @@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
45141 char before[BREAK_INSTR_SIZE];
45142 char after[BREAK_INSTR_SIZE];
45143
45144 - probe_kernel_read(before, (char *)kgdbts_break_test,
45145 + probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
45146 BREAK_INSTR_SIZE);
45147 init_simple_test();
45148 ts.tst = plant_and_detach_test;
45149 @@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
45150 /* Activate test with initial breakpoint */
45151 if (!is_early)
45152 kgdb_breakpoint();
45153 - probe_kernel_read(after, (char *)kgdbts_break_test,
45154 + probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
45155 BREAK_INSTR_SIZE);
45156 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
45157 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
45158 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
45159 index 036effe..b3a6336 100644
45160 --- a/drivers/misc/lis3lv02d/lis3lv02d.c
45161 +++ b/drivers/misc/lis3lv02d/lis3lv02d.c
45162 @@ -498,7 +498,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
45163 * the lid is closed. This leads to interrupts as soon as a little move
45164 * is done.
45165 */
45166 - atomic_inc(&lis3->count);
45167 + atomic_inc_unchecked(&lis3->count);
45168
45169 wake_up_interruptible(&lis3->misc_wait);
45170 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
45171 @@ -584,7 +584,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
45172 if (lis3->pm_dev)
45173 pm_runtime_get_sync(lis3->pm_dev);
45174
45175 - atomic_set(&lis3->count, 0);
45176 + atomic_set_unchecked(&lis3->count, 0);
45177 return 0;
45178 }
45179
45180 @@ -616,7 +616,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
45181 add_wait_queue(&lis3->misc_wait, &wait);
45182 while (true) {
45183 set_current_state(TASK_INTERRUPTIBLE);
45184 - data = atomic_xchg(&lis3->count, 0);
45185 + data = atomic_xchg_unchecked(&lis3->count, 0);
45186 if (data)
45187 break;
45188
45189 @@ -657,7 +657,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
45190 struct lis3lv02d, miscdev);
45191
45192 poll_wait(file, &lis3->misc_wait, wait);
45193 - if (atomic_read(&lis3->count))
45194 + if (atomic_read_unchecked(&lis3->count))
45195 return POLLIN | POLLRDNORM;
45196 return 0;
45197 }
45198 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
45199 index c439c82..1f20f57 100644
45200 --- a/drivers/misc/lis3lv02d/lis3lv02d.h
45201 +++ b/drivers/misc/lis3lv02d/lis3lv02d.h
45202 @@ -297,7 +297,7 @@ struct lis3lv02d {
45203 struct input_polled_dev *idev; /* input device */
45204 struct platform_device *pdev; /* platform device */
45205 struct regulator_bulk_data regulators[2];
45206 - atomic_t count; /* interrupt count after last read */
45207 + atomic_unchecked_t count; /* interrupt count after last read */
45208 union axis_conversion ac; /* hw -> logical axis */
45209 int mapped_btns[3];
45210
45211 diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
45212 index 2f30bad..c4c13d0 100644
45213 --- a/drivers/misc/sgi-gru/gruhandles.c
45214 +++ b/drivers/misc/sgi-gru/gruhandles.c
45215 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
45216 unsigned long nsec;
45217
45218 nsec = CLKS2NSEC(clks);
45219 - atomic_long_inc(&mcs_op_statistics[op].count);
45220 - atomic_long_add(nsec, &mcs_op_statistics[op].total);
45221 + atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
45222 + atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
45223 if (mcs_op_statistics[op].max < nsec)
45224 mcs_op_statistics[op].max = nsec;
45225 }
45226 diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
45227 index 4f76359..cdfcb2e 100644
45228 --- a/drivers/misc/sgi-gru/gruprocfs.c
45229 +++ b/drivers/misc/sgi-gru/gruprocfs.c
45230 @@ -32,9 +32,9 @@
45231
45232 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
45233
45234 -static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
45235 +static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
45236 {
45237 - unsigned long val = atomic_long_read(v);
45238 + unsigned long val = atomic_long_read_unchecked(v);
45239
45240 seq_printf(s, "%16lu %s\n", val, id);
45241 }
45242 @@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
45243
45244 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
45245 for (op = 0; op < mcsop_last; op++) {
45246 - count = atomic_long_read(&mcs_op_statistics[op].count);
45247 - total = atomic_long_read(&mcs_op_statistics[op].total);
45248 + count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
45249 + total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
45250 max = mcs_op_statistics[op].max;
45251 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
45252 count ? total / count : 0, max);
45253 diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
45254 index 5c3ce24..4915ccb 100644
45255 --- a/drivers/misc/sgi-gru/grutables.h
45256 +++ b/drivers/misc/sgi-gru/grutables.h
45257 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
45258 * GRU statistics.
45259 */
45260 struct gru_stats_s {
45261 - atomic_long_t vdata_alloc;
45262 - atomic_long_t vdata_free;
45263 - atomic_long_t gts_alloc;
45264 - atomic_long_t gts_free;
45265 - atomic_long_t gms_alloc;
45266 - atomic_long_t gms_free;
45267 - atomic_long_t gts_double_allocate;
45268 - atomic_long_t assign_context;
45269 - atomic_long_t assign_context_failed;
45270 - atomic_long_t free_context;
45271 - atomic_long_t load_user_context;
45272 - atomic_long_t load_kernel_context;
45273 - atomic_long_t lock_kernel_context;
45274 - atomic_long_t unlock_kernel_context;
45275 - atomic_long_t steal_user_context;
45276 - atomic_long_t steal_kernel_context;
45277 - atomic_long_t steal_context_failed;
45278 - atomic_long_t nopfn;
45279 - atomic_long_t asid_new;
45280 - atomic_long_t asid_next;
45281 - atomic_long_t asid_wrap;
45282 - atomic_long_t asid_reuse;
45283 - atomic_long_t intr;
45284 - atomic_long_t intr_cbr;
45285 - atomic_long_t intr_tfh;
45286 - atomic_long_t intr_spurious;
45287 - atomic_long_t intr_mm_lock_failed;
45288 - atomic_long_t call_os;
45289 - atomic_long_t call_os_wait_queue;
45290 - atomic_long_t user_flush_tlb;
45291 - atomic_long_t user_unload_context;
45292 - atomic_long_t user_exception;
45293 - atomic_long_t set_context_option;
45294 - atomic_long_t check_context_retarget_intr;
45295 - atomic_long_t check_context_unload;
45296 - atomic_long_t tlb_dropin;
45297 - atomic_long_t tlb_preload_page;
45298 - atomic_long_t tlb_dropin_fail_no_asid;
45299 - atomic_long_t tlb_dropin_fail_upm;
45300 - atomic_long_t tlb_dropin_fail_invalid;
45301 - atomic_long_t tlb_dropin_fail_range_active;
45302 - atomic_long_t tlb_dropin_fail_idle;
45303 - atomic_long_t tlb_dropin_fail_fmm;
45304 - atomic_long_t tlb_dropin_fail_no_exception;
45305 - atomic_long_t tfh_stale_on_fault;
45306 - atomic_long_t mmu_invalidate_range;
45307 - atomic_long_t mmu_invalidate_page;
45308 - atomic_long_t flush_tlb;
45309 - atomic_long_t flush_tlb_gru;
45310 - atomic_long_t flush_tlb_gru_tgh;
45311 - atomic_long_t flush_tlb_gru_zero_asid;
45312 + atomic_long_unchecked_t vdata_alloc;
45313 + atomic_long_unchecked_t vdata_free;
45314 + atomic_long_unchecked_t gts_alloc;
45315 + atomic_long_unchecked_t gts_free;
45316 + atomic_long_unchecked_t gms_alloc;
45317 + atomic_long_unchecked_t gms_free;
45318 + atomic_long_unchecked_t gts_double_allocate;
45319 + atomic_long_unchecked_t assign_context;
45320 + atomic_long_unchecked_t assign_context_failed;
45321 + atomic_long_unchecked_t free_context;
45322 + atomic_long_unchecked_t load_user_context;
45323 + atomic_long_unchecked_t load_kernel_context;
45324 + atomic_long_unchecked_t lock_kernel_context;
45325 + atomic_long_unchecked_t unlock_kernel_context;
45326 + atomic_long_unchecked_t steal_user_context;
45327 + atomic_long_unchecked_t steal_kernel_context;
45328 + atomic_long_unchecked_t steal_context_failed;
45329 + atomic_long_unchecked_t nopfn;
45330 + atomic_long_unchecked_t asid_new;
45331 + atomic_long_unchecked_t asid_next;
45332 + atomic_long_unchecked_t asid_wrap;
45333 + atomic_long_unchecked_t asid_reuse;
45334 + atomic_long_unchecked_t intr;
45335 + atomic_long_unchecked_t intr_cbr;
45336 + atomic_long_unchecked_t intr_tfh;
45337 + atomic_long_unchecked_t intr_spurious;
45338 + atomic_long_unchecked_t intr_mm_lock_failed;
45339 + atomic_long_unchecked_t call_os;
45340 + atomic_long_unchecked_t call_os_wait_queue;
45341 + atomic_long_unchecked_t user_flush_tlb;
45342 + atomic_long_unchecked_t user_unload_context;
45343 + atomic_long_unchecked_t user_exception;
45344 + atomic_long_unchecked_t set_context_option;
45345 + atomic_long_unchecked_t check_context_retarget_intr;
45346 + atomic_long_unchecked_t check_context_unload;
45347 + atomic_long_unchecked_t tlb_dropin;
45348 + atomic_long_unchecked_t tlb_preload_page;
45349 + atomic_long_unchecked_t tlb_dropin_fail_no_asid;
45350 + atomic_long_unchecked_t tlb_dropin_fail_upm;
45351 + atomic_long_unchecked_t tlb_dropin_fail_invalid;
45352 + atomic_long_unchecked_t tlb_dropin_fail_range_active;
45353 + atomic_long_unchecked_t tlb_dropin_fail_idle;
45354 + atomic_long_unchecked_t tlb_dropin_fail_fmm;
45355 + atomic_long_unchecked_t tlb_dropin_fail_no_exception;
45356 + atomic_long_unchecked_t tfh_stale_on_fault;
45357 + atomic_long_unchecked_t mmu_invalidate_range;
45358 + atomic_long_unchecked_t mmu_invalidate_page;
45359 + atomic_long_unchecked_t flush_tlb;
45360 + atomic_long_unchecked_t flush_tlb_gru;
45361 + atomic_long_unchecked_t flush_tlb_gru_tgh;
45362 + atomic_long_unchecked_t flush_tlb_gru_zero_asid;
45363
45364 - atomic_long_t copy_gpa;
45365 - atomic_long_t read_gpa;
45366 + atomic_long_unchecked_t copy_gpa;
45367 + atomic_long_unchecked_t read_gpa;
45368
45369 - atomic_long_t mesq_receive;
45370 - atomic_long_t mesq_receive_none;
45371 - atomic_long_t mesq_send;
45372 - atomic_long_t mesq_send_failed;
45373 - atomic_long_t mesq_noop;
45374 - atomic_long_t mesq_send_unexpected_error;
45375 - atomic_long_t mesq_send_lb_overflow;
45376 - atomic_long_t mesq_send_qlimit_reached;
45377 - atomic_long_t mesq_send_amo_nacked;
45378 - atomic_long_t mesq_send_put_nacked;
45379 - atomic_long_t mesq_page_overflow;
45380 - atomic_long_t mesq_qf_locked;
45381 - atomic_long_t mesq_qf_noop_not_full;
45382 - atomic_long_t mesq_qf_switch_head_failed;
45383 - atomic_long_t mesq_qf_unexpected_error;
45384 - atomic_long_t mesq_noop_unexpected_error;
45385 - atomic_long_t mesq_noop_lb_overflow;
45386 - atomic_long_t mesq_noop_qlimit_reached;
45387 - atomic_long_t mesq_noop_amo_nacked;
45388 - atomic_long_t mesq_noop_put_nacked;
45389 - atomic_long_t mesq_noop_page_overflow;
45390 + atomic_long_unchecked_t mesq_receive;
45391 + atomic_long_unchecked_t mesq_receive_none;
45392 + atomic_long_unchecked_t mesq_send;
45393 + atomic_long_unchecked_t mesq_send_failed;
45394 + atomic_long_unchecked_t mesq_noop;
45395 + atomic_long_unchecked_t mesq_send_unexpected_error;
45396 + atomic_long_unchecked_t mesq_send_lb_overflow;
45397 + atomic_long_unchecked_t mesq_send_qlimit_reached;
45398 + atomic_long_unchecked_t mesq_send_amo_nacked;
45399 + atomic_long_unchecked_t mesq_send_put_nacked;
45400 + atomic_long_unchecked_t mesq_page_overflow;
45401 + atomic_long_unchecked_t mesq_qf_locked;
45402 + atomic_long_unchecked_t mesq_qf_noop_not_full;
45403 + atomic_long_unchecked_t mesq_qf_switch_head_failed;
45404 + atomic_long_unchecked_t mesq_qf_unexpected_error;
45405 + atomic_long_unchecked_t mesq_noop_unexpected_error;
45406 + atomic_long_unchecked_t mesq_noop_lb_overflow;
45407 + atomic_long_unchecked_t mesq_noop_qlimit_reached;
45408 + atomic_long_unchecked_t mesq_noop_amo_nacked;
45409 + atomic_long_unchecked_t mesq_noop_put_nacked;
45410 + atomic_long_unchecked_t mesq_noop_page_overflow;
45411
45412 };
45413
45414 @@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
45415 tghop_invalidate, mcsop_last};
45416
45417 struct mcs_op_statistic {
45418 - atomic_long_t count;
45419 - atomic_long_t total;
45420 + atomic_long_unchecked_t count;
45421 + atomic_long_unchecked_t total;
45422 unsigned long max;
45423 };
45424
45425 @@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
45426
45427 #define STAT(id) do { \
45428 if (gru_options & OPT_STATS) \
45429 - atomic_long_inc(&gru_stats.id); \
45430 + atomic_long_inc_unchecked(&gru_stats.id); \
45431 } while (0)
45432
45433 #ifdef CONFIG_SGI_GRU_DEBUG
45434 diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
45435 index c862cd4..0d176fe 100644
45436 --- a/drivers/misc/sgi-xp/xp.h
45437 +++ b/drivers/misc/sgi-xp/xp.h
45438 @@ -288,7 +288,7 @@ struct xpc_interface {
45439 xpc_notify_func, void *);
45440 void (*received) (short, int, void *);
45441 enum xp_retval (*partid_to_nasids) (short, void *);
45442 -};
45443 +} __no_const;
45444
45445 extern struct xpc_interface xpc_interface;
45446
45447 diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
45448 index 01be66d..e3a0c7e 100644
45449 --- a/drivers/misc/sgi-xp/xp_main.c
45450 +++ b/drivers/misc/sgi-xp/xp_main.c
45451 @@ -78,13 +78,13 @@ xpc_notloaded(void)
45452 }
45453
45454 struct xpc_interface xpc_interface = {
45455 - (void (*)(int))xpc_notloaded,
45456 - (void (*)(int))xpc_notloaded,
45457 - (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
45458 - (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
45459 + .connect = (void (*)(int))xpc_notloaded,
45460 + .disconnect = (void (*)(int))xpc_notloaded,
45461 + .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
45462 + .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
45463 void *))xpc_notloaded,
45464 - (void (*)(short, int, void *))xpc_notloaded,
45465 - (enum xp_retval(*)(short, void *))xpc_notloaded
45466 + .received = (void (*)(short, int, void *))xpc_notloaded,
45467 + .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
45468 };
45469 EXPORT_SYMBOL_GPL(xpc_interface);
45470
45471 diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
45472 index b94d5f7..7f494c5 100644
45473 --- a/drivers/misc/sgi-xp/xpc.h
45474 +++ b/drivers/misc/sgi-xp/xpc.h
45475 @@ -835,6 +835,7 @@ struct xpc_arch_operations {
45476 void (*received_payload) (struct xpc_channel *, void *);
45477 void (*notify_senders_of_disconnect) (struct xpc_channel *);
45478 };
45479 +typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
45480
45481 /* struct xpc_partition act_state values (for XPC HB) */
45482
45483 @@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
45484 /* found in xpc_main.c */
45485 extern struct device *xpc_part;
45486 extern struct device *xpc_chan;
45487 -extern struct xpc_arch_operations xpc_arch_ops;
45488 +extern xpc_arch_operations_no_const xpc_arch_ops;
45489 extern int xpc_disengage_timelimit;
45490 extern int xpc_disengage_timedout;
45491 extern int xpc_activate_IRQ_rcvd;
45492 diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
45493 index 82dc574..8539ab2 100644
45494 --- a/drivers/misc/sgi-xp/xpc_main.c
45495 +++ b/drivers/misc/sgi-xp/xpc_main.c
45496 @@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
45497 .notifier_call = xpc_system_die,
45498 };
45499
45500 -struct xpc_arch_operations xpc_arch_ops;
45501 +xpc_arch_operations_no_const xpc_arch_ops;
45502
45503 /*
45504 * Timer function to enforce the timelimit on the partition disengage.
45505 @@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
45506
45507 if (((die_args->trapnr == X86_TRAP_MF) ||
45508 (die_args->trapnr == X86_TRAP_XF)) &&
45509 - !user_mode_vm(die_args->regs))
45510 + !user_mode(die_args->regs))
45511 xpc_die_deactivate();
45512
45513 break;
45514 diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
45515 index 7b5424f..ed1d6ac 100644
45516 --- a/drivers/mmc/card/block.c
45517 +++ b/drivers/mmc/card/block.c
45518 @@ -575,7 +575,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
45519 if (idata->ic.postsleep_min_us)
45520 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
45521
45522 - if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
45523 + if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
45524 err = -EFAULT;
45525 goto cmd_rel_host;
45526 }
45527 diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
45528 index e5b5eeb..7bf2212 100644
45529 --- a/drivers/mmc/core/mmc_ops.c
45530 +++ b/drivers/mmc/core/mmc_ops.c
45531 @@ -247,7 +247,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
45532 void *data_buf;
45533 int is_on_stack;
45534
45535 - is_on_stack = object_is_on_stack(buf);
45536 + is_on_stack = object_starts_on_stack(buf);
45537 if (is_on_stack) {
45538 /*
45539 * dma onto stack is unsafe/nonportable, but callers to this
45540 diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
45541 index 6bf24ab..13d0293b 100644
45542 --- a/drivers/mmc/host/dw_mmc.h
45543 +++ b/drivers/mmc/host/dw_mmc.h
45544 @@ -258,5 +258,5 @@ struct dw_mci_drv_data {
45545 int (*parse_dt)(struct dw_mci *host);
45546 int (*execute_tuning)(struct dw_mci_slot *slot, u32 opcode,
45547 struct dw_mci_tuning_data *tuning_data);
45548 -};
45549 +} __do_const;
45550 #endif /* _DW_MMC_H_ */
45551 diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
45552 index b931226..df6a085 100644
45553 --- a/drivers/mmc/host/mmci.c
45554 +++ b/drivers/mmc/host/mmci.c
45555 @@ -1504,7 +1504,9 @@ static int mmci_probe(struct amba_device *dev,
45556 }
45557
45558 if (variant->busy_detect) {
45559 - mmci_ops.card_busy = mmci_card_busy;
45560 + pax_open_kernel();
45561 + *(void **)&mmci_ops.card_busy = mmci_card_busy;
45562 + pax_close_kernel();
45563 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
45564 }
45565
45566 diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
45567 index b841bb7..d82712f5 100644
45568 --- a/drivers/mmc/host/sdhci-esdhc-imx.c
45569 +++ b/drivers/mmc/host/sdhci-esdhc-imx.c
45570 @@ -1031,9 +1031,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
45571 host->mmc->caps |= MMC_CAP_1_8V_DDR;
45572 }
45573
45574 - if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
45575 - sdhci_esdhc_ops.platform_execute_tuning =
45576 + if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
45577 + pax_open_kernel();
45578 + *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
45579 esdhc_executing_tuning;
45580 + pax_close_kernel();
45581 + }
45582
45583 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
45584 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
45585 diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
45586 index 6debda9..2ba7427 100644
45587 --- a/drivers/mmc/host/sdhci-s3c.c
45588 +++ b/drivers/mmc/host/sdhci-s3c.c
45589 @@ -668,9 +668,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
45590 * we can use overriding functions instead of default.
45591 */
45592 if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK) {
45593 - sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
45594 - sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
45595 - sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
45596 + pax_open_kernel();
45597 + *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
45598 + *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
45599 + *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
45600 + pax_close_kernel();
45601 }
45602
45603 /* It supports additional host capabilities if needed */
45604 diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
45605 index 096993f..f02c23b 100644
45606 --- a/drivers/mtd/chips/cfi_cmdset_0020.c
45607 +++ b/drivers/mtd/chips/cfi_cmdset_0020.c
45608 @@ -669,7 +669,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
45609 size_t totlen = 0, thislen;
45610 int ret = 0;
45611 size_t buflen = 0;
45612 - static char *buffer;
45613 + char *buffer;
45614
45615 if (!ECCBUF_SIZE) {
45616 /* We should fall back to a general writev implementation.
45617 diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
45618 index c07cd57..61c4fbd 100644
45619 --- a/drivers/mtd/nand/denali.c
45620 +++ b/drivers/mtd/nand/denali.c
45621 @@ -24,6 +24,7 @@
45622 #include <linux/slab.h>
45623 #include <linux/mtd/mtd.h>
45624 #include <linux/module.h>
45625 +#include <linux/slab.h>
45626
45627 #include "denali.h"
45628
45629 diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
45630 index ca6369f..0ce9fed 100644
45631 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
45632 +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
45633 @@ -369,7 +369,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
45634
45635 /* first try to map the upper buffer directly */
45636 if (virt_addr_valid(this->upper_buf) &&
45637 - !object_is_on_stack(this->upper_buf)) {
45638 + !object_starts_on_stack(this->upper_buf)) {
45639 sg_init_one(sgl, this->upper_buf, this->upper_len);
45640 ret = dma_map_sg(this->dev, sgl, 1, dr);
45641 if (ret == 0)
45642 diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
45643 index 51b9d6a..52af9a7 100644
45644 --- a/drivers/mtd/nftlmount.c
45645 +++ b/drivers/mtd/nftlmount.c
45646 @@ -24,6 +24,7 @@
45647 #include <asm/errno.h>
45648 #include <linux/delay.h>
45649 #include <linux/slab.h>
45650 +#include <linux/sched.h>
45651 #include <linux/mtd/mtd.h>
45652 #include <linux/mtd/nand.h>
45653 #include <linux/mtd/nftl.h>
45654 diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
45655 index 4b8e895..6b3c498 100644
45656 --- a/drivers/mtd/sm_ftl.c
45657 +++ b/drivers/mtd/sm_ftl.c
45658 @@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
45659 #define SM_CIS_VENDOR_OFFSET 0x59
45660 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
45661 {
45662 - struct attribute_group *attr_group;
45663 + attribute_group_no_const *attr_group;
45664 struct attribute **attributes;
45665 struct sm_sysfs_attribute *vendor_attribute;
45666
45667 diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
45668 index e5628fc..ffe54d1 100644
45669 --- a/drivers/net/bonding/bond_main.c
45670 +++ b/drivers/net/bonding/bond_main.c
45671 @@ -4551,6 +4551,7 @@ static void __exit bonding_exit(void)
45672
45673 bond_netlink_fini();
45674 unregister_pernet_subsys(&bond_net_ops);
45675 + rtnl_link_unregister(&bond_link_ops);
45676
45677 #ifdef CONFIG_NET_POLL_CONTROLLER
45678 /*
45679 diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
45680 index 70651f8..7eb1bdf 100644
45681 --- a/drivers/net/bonding/bond_netlink.c
45682 +++ b/drivers/net/bonding/bond_netlink.c
45683 @@ -542,7 +542,7 @@ nla_put_failure:
45684 return -EMSGSIZE;
45685 }
45686
45687 -struct rtnl_link_ops bond_link_ops __read_mostly = {
45688 +struct rtnl_link_ops bond_link_ops = {
45689 .kind = "bond",
45690 .priv_size = sizeof(struct bonding),
45691 .setup = bond_setup,
45692 diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
45693 index 9e7d95d..d447b88 100644
45694 --- a/drivers/net/can/Kconfig
45695 +++ b/drivers/net/can/Kconfig
45696 @@ -104,7 +104,7 @@ config CAN_JANZ_ICAN3
45697
45698 config CAN_FLEXCAN
45699 tristate "Support for Freescale FLEXCAN based chips"
45700 - depends on ARM || PPC
45701 + depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
45702 ---help---
45703 Say Y here if you want to support for Freescale FlexCAN.
45704
45705 diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
45706 index 455d4c3..3353ee7 100644
45707 --- a/drivers/net/ethernet/8390/ax88796.c
45708 +++ b/drivers/net/ethernet/8390/ax88796.c
45709 @@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
45710 if (ax->plat->reg_offsets)
45711 ei_local->reg_offset = ax->plat->reg_offsets;
45712 else {
45713 + resource_size_t _mem_size = mem_size;
45714 + do_div(_mem_size, 0x18);
45715 ei_local->reg_offset = ax->reg_offsets;
45716 for (ret = 0; ret < 0x18; ret++)
45717 - ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
45718 + ax->reg_offsets[ret] = _mem_size * ret;
45719 }
45720
45721 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
45722 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
45723 index a89a40f..5a8a2ac 100644
45724 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
45725 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
45726 @@ -1062,7 +1062,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
45727 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
45728 {
45729 /* RX_MODE controlling object */
45730 - bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
45731 + bnx2x_init_rx_mode_obj(bp);
45732
45733 /* multicast configuration controlling object */
45734 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
45735 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
45736 index 0fb6ff2..78fd55c 100644
45737 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
45738 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
45739 @@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
45740 return rc;
45741 }
45742
45743 -void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
45744 - struct bnx2x_rx_mode_obj *o)
45745 +void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
45746 {
45747 if (CHIP_IS_E1x(bp)) {
45748 - o->wait_comp = bnx2x_empty_rx_mode_wait;
45749 - o->config_rx_mode = bnx2x_set_rx_mode_e1x;
45750 + bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
45751 + bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
45752 } else {
45753 - o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
45754 - o->config_rx_mode = bnx2x_set_rx_mode_e2;
45755 + bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
45756 + bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
45757 }
45758 }
45759
45760 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
45761 index 00d7f21..2cddec4 100644
45762 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
45763 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
45764 @@ -1321,8 +1321,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
45765
45766 /********************* RX MODE ****************/
45767
45768 -void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
45769 - struct bnx2x_rx_mode_obj *o);
45770 +void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
45771
45772 /**
45773 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
45774 diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
45775 index 04321e5..b51cdc4 100644
45776 --- a/drivers/net/ethernet/broadcom/tg3.h
45777 +++ b/drivers/net/ethernet/broadcom/tg3.h
45778 @@ -150,6 +150,7 @@
45779 #define CHIPREV_ID_5750_A0 0x4000
45780 #define CHIPREV_ID_5750_A1 0x4001
45781 #define CHIPREV_ID_5750_A3 0x4003
45782 +#define CHIPREV_ID_5750_C1 0x4201
45783 #define CHIPREV_ID_5750_C2 0x4202
45784 #define CHIPREV_ID_5752_A0_HW 0x5000
45785 #define CHIPREV_ID_5752_A0 0x6000
45786 diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
45787 index 13f9636..228040f 100644
45788 --- a/drivers/net/ethernet/brocade/bna/bna_enet.c
45789 +++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
45790 @@ -1690,10 +1690,10 @@ bna_cb_ioceth_reset(void *arg)
45791 }
45792
45793 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
45794 - bna_cb_ioceth_enable,
45795 - bna_cb_ioceth_disable,
45796 - bna_cb_ioceth_hbfail,
45797 - bna_cb_ioceth_reset
45798 + .enable_cbfn = bna_cb_ioceth_enable,
45799 + .disable_cbfn = bna_cb_ioceth_disable,
45800 + .hbfail_cbfn = bna_cb_ioceth_hbfail,
45801 + .reset_cbfn = bna_cb_ioceth_reset
45802 };
45803
45804 static void bna_attr_init(struct bna_ioceth *ioceth)
45805 diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
45806 index 8cffcdf..aadf043 100644
45807 --- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
45808 +++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
45809 @@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
45810 */
45811 struct l2t_skb_cb {
45812 arp_failure_handler_func arp_failure_handler;
45813 -};
45814 +} __no_const;
45815
45816 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
45817
45818 diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
45819 index 34e2488..07e2079 100644
45820 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
45821 +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
45822 @@ -2120,7 +2120,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
45823
45824 int i;
45825 struct adapter *ap = netdev2adap(dev);
45826 - static const unsigned int *reg_ranges;
45827 + const unsigned int *reg_ranges;
45828 int arr_size = 0, buf_size = 0;
45829
45830 if (is_t4(ap->params.chip)) {
45831 diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
45832 index c05b66d..ed69872 100644
45833 --- a/drivers/net/ethernet/dec/tulip/de4x5.c
45834 +++ b/drivers/net/ethernet/dec/tulip/de4x5.c
45835 @@ -5388,7 +5388,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
45836 for (i=0; i<ETH_ALEN; i++) {
45837 tmp.addr[i] = dev->dev_addr[i];
45838 }
45839 - if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
45840 + if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
45841 break;
45842
45843 case DE4X5_SET_HWADDR: /* Set the hardware address */
45844 @@ -5428,7 +5428,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
45845 spin_lock_irqsave(&lp->lock, flags);
45846 memcpy(&statbuf, &lp->pktStats, ioc->len);
45847 spin_unlock_irqrestore(&lp->lock, flags);
45848 - if (copy_to_user(ioc->data, &statbuf, ioc->len))
45849 + if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
45850 return -EFAULT;
45851 break;
45852 }
45853 diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
45854 index 36c8061..ca5e1e0 100644
45855 --- a/drivers/net/ethernet/emulex/benet/be_main.c
45856 +++ b/drivers/net/ethernet/emulex/benet/be_main.c
45857 @@ -534,7 +534,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
45858
45859 if (wrapped)
45860 newacc += 65536;
45861 - ACCESS_ONCE(*acc) = newacc;
45862 + ACCESS_ONCE_RW(*acc) = newacc;
45863 }
45864
45865 static void populate_erx_stats(struct be_adapter *adapter,
45866 diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
45867 index c11ecbc..13bb299 100644
45868 --- a/drivers/net/ethernet/faraday/ftgmac100.c
45869 +++ b/drivers/net/ethernet/faraday/ftgmac100.c
45870 @@ -30,6 +30,8 @@
45871 #include <linux/netdevice.h>
45872 #include <linux/phy.h>
45873 #include <linux/platform_device.h>
45874 +#include <linux/interrupt.h>
45875 +#include <linux/irqreturn.h>
45876 #include <net/ip.h>
45877
45878 #include "ftgmac100.h"
45879 diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
45880 index 8be5b40..081bc1b 100644
45881 --- a/drivers/net/ethernet/faraday/ftmac100.c
45882 +++ b/drivers/net/ethernet/faraday/ftmac100.c
45883 @@ -31,6 +31,8 @@
45884 #include <linux/module.h>
45885 #include <linux/netdevice.h>
45886 #include <linux/platform_device.h>
45887 +#include <linux/interrupt.h>
45888 +#include <linux/irqreturn.h>
45889
45890 #include "ftmac100.h"
45891
45892 diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
45893 index e33ec6c..f54cfe7 100644
45894 --- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
45895 +++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
45896 @@ -436,7 +436,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
45897 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
45898
45899 /* Update the base adjustement value. */
45900 - ACCESS_ONCE(pf->ptp_base_adj) = incval;
45901 + ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
45902 smp_mb(); /* Force the above update. */
45903 }
45904
45905 diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
45906 index 5184e2a..acb28c3 100644
45907 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
45908 +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
45909 @@ -776,7 +776,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
45910 }
45911
45912 /* update the base incval used to calculate frequency adjustment */
45913 - ACCESS_ONCE(adapter->base_incval) = incval;
45914 + ACCESS_ONCE_RW(adapter->base_incval) = incval;
45915 smp_mb();
45916
45917 /* need lock to prevent incorrect read while modifying cyclecounter */
45918 diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
45919 index 089b713..28d87ae 100644
45920 --- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
45921 +++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
45922 @@ -3461,7 +3461,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
45923 struct __vxge_hw_fifo *fifo;
45924 struct vxge_hw_fifo_config *config;
45925 u32 txdl_size, txdl_per_memblock;
45926 - struct vxge_hw_mempool_cbs fifo_mp_callback;
45927 + static struct vxge_hw_mempool_cbs fifo_mp_callback = {
45928 + .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
45929 + };
45930 +
45931 struct __vxge_hw_virtualpath *vpath;
45932
45933 if ((vp == NULL) || (attr == NULL)) {
45934 @@ -3544,8 +3547,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
45935 goto exit;
45936 }
45937
45938 - fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
45939 -
45940 fifo->mempool =
45941 __vxge_hw_mempool_create(vpath->hldev,
45942 fifo->config->memblock_size,
45943 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
45944 index 90a2dda..47e620e 100644
45945 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
45946 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
45947 @@ -2088,7 +2088,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
45948 adapter->max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
45949 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
45950 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
45951 - adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
45952 + pax_open_kernel();
45953 + *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
45954 + pax_close_kernel();
45955 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
45956 adapter->max_sds_rings = QLCNIC_MAX_SDS_RINGS;
45957 adapter->max_tx_rings = QLCNIC_MAX_TX_RINGS;
45958 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
45959 index be7d7a6..a8983f8 100644
45960 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
45961 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
45962 @@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
45963 case QLCNIC_NON_PRIV_FUNC:
45964 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
45965 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
45966 - nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
45967 + pax_open_kernel();
45968 + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
45969 + pax_close_kernel();
45970 break;
45971 case QLCNIC_PRIV_FUNC:
45972 ahw->op_mode = QLCNIC_PRIV_FUNC;
45973 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
45974 - nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
45975 + pax_open_kernel();
45976 + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
45977 + pax_close_kernel();
45978 break;
45979 case QLCNIC_MGMT_FUNC:
45980 ahw->op_mode = QLCNIC_MGMT_FUNC;
45981 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
45982 - nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
45983 + pax_open_kernel();
45984 + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
45985 + pax_close_kernel();
45986 break;
45987 default:
45988 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
45989 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
45990 index 7763962..c3499a7 100644
45991 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
45992 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
45993 @@ -1108,7 +1108,7 @@ int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
45994 struct qlcnic_dump_entry *entry;
45995 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
45996 struct qlcnic_dump_template_hdr *tmpl_hdr = fw_dump->tmpl_hdr;
45997 - static const struct qlcnic_dump_operations *fw_dump_ops;
45998 + const struct qlcnic_dump_operations *fw_dump_ops;
45999 struct device *dev = &adapter->pdev->dev;
46000 struct qlcnic_hardware_context *ahw;
46001 void *temp_buffer;
46002 diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
46003 index 3ff7bc3..366091b 100644
46004 --- a/drivers/net/ethernet/realtek/r8169.c
46005 +++ b/drivers/net/ethernet/realtek/r8169.c
46006 @@ -758,22 +758,22 @@ struct rtl8169_private {
46007 struct mdio_ops {
46008 void (*write)(struct rtl8169_private *, int, int);
46009 int (*read)(struct rtl8169_private *, int);
46010 - } mdio_ops;
46011 + } __no_const mdio_ops;
46012
46013 struct pll_power_ops {
46014 void (*down)(struct rtl8169_private *);
46015 void (*up)(struct rtl8169_private *);
46016 - } pll_power_ops;
46017 + } __no_const pll_power_ops;
46018
46019 struct jumbo_ops {
46020 void (*enable)(struct rtl8169_private *);
46021 void (*disable)(struct rtl8169_private *);
46022 - } jumbo_ops;
46023 + } __no_const jumbo_ops;
46024
46025 struct csi_ops {
46026 void (*write)(struct rtl8169_private *, int, int);
46027 u32 (*read)(struct rtl8169_private *, int);
46028 - } csi_ops;
46029 + } __no_const csi_ops;
46030
46031 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
46032 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
46033 diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
46034 index d7a3682..9ce272a 100644
46035 --- a/drivers/net/ethernet/sfc/ptp.c
46036 +++ b/drivers/net/ethernet/sfc/ptp.c
46037 @@ -825,7 +825,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
46038 ptp->start.dma_addr);
46039
46040 /* Clear flag that signals MC ready */
46041 - ACCESS_ONCE(*start) = 0;
46042 + ACCESS_ONCE_RW(*start) = 0;
46043 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
46044 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
46045 EFX_BUG_ON_PARANOID(rc);
46046 diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
46047 index 50617c5..b13724c 100644
46048 --- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
46049 +++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
46050 @@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
46051
46052 writel(value, ioaddr + MMC_CNTRL);
46053
46054 - pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
46055 - MMC_CNTRL, value);
46056 +// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
46057 +// MMC_CNTRL, value);
46058 }
46059
46060 /* To mask all all interrupts.*/
46061 diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
46062 index 7b594ce..1f6c5708 100644
46063 --- a/drivers/net/hyperv/hyperv_net.h
46064 +++ b/drivers/net/hyperv/hyperv_net.h
46065 @@ -100,7 +100,7 @@ struct rndis_device {
46066
46067 enum rndis_device_state state;
46068 bool link_state;
46069 - atomic_t new_req_id;
46070 + atomic_unchecked_t new_req_id;
46071
46072 spinlock_t request_lock;
46073 struct list_head req_list;
46074 diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
46075 index b54fd25..9bd2bae 100644
46076 --- a/drivers/net/hyperv/rndis_filter.c
46077 +++ b/drivers/net/hyperv/rndis_filter.c
46078 @@ -103,7 +103,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
46079 * template
46080 */
46081 set = &rndis_msg->msg.set_req;
46082 - set->req_id = atomic_inc_return(&dev->new_req_id);
46083 + set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
46084
46085 /* Add to the request list */
46086 spin_lock_irqsave(&dev->request_lock, flags);
46087 @@ -770,7 +770,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
46088
46089 /* Setup the rndis set */
46090 halt = &request->request_msg.msg.halt_req;
46091 - halt->req_id = atomic_inc_return(&dev->new_req_id);
46092 + halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
46093
46094 /* Ignore return since this msg is optional. */
46095 rndis_filter_send_request(dev, request);
46096 diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
46097 index bf0d55e..82bcfbd1 100644
46098 --- a/drivers/net/ieee802154/fakehard.c
46099 +++ b/drivers/net/ieee802154/fakehard.c
46100 @@ -364,7 +364,7 @@ static int ieee802154fake_probe(struct platform_device *pdev)
46101 phy->transmit_power = 0xbf;
46102
46103 dev->netdev_ops = &fake_ops;
46104 - dev->ml_priv = &fake_mlme;
46105 + dev->ml_priv = (void *)&fake_mlme;
46106
46107 priv = netdev_priv(dev);
46108 priv->phy = phy;
46109 diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
46110 index 1831fb7..9c24bca 100644
46111 --- a/drivers/net/macvlan.c
46112 +++ b/drivers/net/macvlan.c
46113 @@ -984,13 +984,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
46114 int macvlan_link_register(struct rtnl_link_ops *ops)
46115 {
46116 /* common fields */
46117 - ops->priv_size = sizeof(struct macvlan_dev);
46118 - ops->validate = macvlan_validate;
46119 - ops->maxtype = IFLA_MACVLAN_MAX;
46120 - ops->policy = macvlan_policy;
46121 - ops->changelink = macvlan_changelink;
46122 - ops->get_size = macvlan_get_size;
46123 - ops->fill_info = macvlan_fill_info;
46124 + pax_open_kernel();
46125 + *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
46126 + *(void **)&ops->validate = macvlan_validate;
46127 + *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
46128 + *(const void **)&ops->policy = macvlan_policy;
46129 + *(void **)&ops->changelink = macvlan_changelink;
46130 + *(void **)&ops->get_size = macvlan_get_size;
46131 + *(void **)&ops->fill_info = macvlan_fill_info;
46132 + pax_close_kernel();
46133
46134 return rtnl_link_register(ops);
46135 };
46136 @@ -1045,7 +1047,7 @@ static int macvlan_device_event(struct notifier_block *unused,
46137 return NOTIFY_DONE;
46138 }
46139
46140 -static struct notifier_block macvlan_notifier_block __read_mostly = {
46141 +static struct notifier_block macvlan_notifier_block = {
46142 .notifier_call = macvlan_device_event,
46143 };
46144
46145 diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
46146 index ff111a8..c4c3ac4 100644
46147 --- a/drivers/net/macvtap.c
46148 +++ b/drivers/net/macvtap.c
46149 @@ -1011,7 +1011,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
46150 }
46151
46152 ret = 0;
46153 - if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
46154 + if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
46155 put_user(q->flags, &ifr->ifr_flags))
46156 ret = -EFAULT;
46157 macvtap_put_vlan(vlan);
46158 @@ -1181,7 +1181,7 @@ static int macvtap_device_event(struct notifier_block *unused,
46159 return NOTIFY_DONE;
46160 }
46161
46162 -static struct notifier_block macvtap_notifier_block __read_mostly = {
46163 +static struct notifier_block macvtap_notifier_block = {
46164 .notifier_call = macvtap_device_event,
46165 };
46166
46167 diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c
46168 index daec9b0..6428fcb 100644
46169 --- a/drivers/net/phy/mdio-bitbang.c
46170 +++ b/drivers/net/phy/mdio-bitbang.c
46171 @@ -234,6 +234,7 @@ void free_mdio_bitbang(struct mii_bus *bus)
46172 struct mdiobb_ctrl *ctrl = bus->priv;
46173
46174 module_put(ctrl->ops->owner);
46175 + mdiobus_unregister(bus);
46176 mdiobus_free(bus);
46177 }
46178 EXPORT_SYMBOL(free_mdio_bitbang);
46179 diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
46180 index 72ff14b..11d442d 100644
46181 --- a/drivers/net/ppp/ppp_generic.c
46182 +++ b/drivers/net/ppp/ppp_generic.c
46183 @@ -999,7 +999,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
46184 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
46185 struct ppp_stats stats;
46186 struct ppp_comp_stats cstats;
46187 - char *vers;
46188
46189 switch (cmd) {
46190 case SIOCGPPPSTATS:
46191 @@ -1021,8 +1020,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
46192 break;
46193
46194 case SIOCGPPPVER:
46195 - vers = PPP_VERSION;
46196 - if (copy_to_user(addr, vers, strlen(vers) + 1))
46197 + if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
46198 break;
46199 err = 0;
46200 break;
46201 diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
46202 index 1252d9c..80e660b 100644
46203 --- a/drivers/net/slip/slhc.c
46204 +++ b/drivers/net/slip/slhc.c
46205 @@ -488,7 +488,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
46206 register struct tcphdr *thp;
46207 register struct iphdr *ip;
46208 register struct cstate *cs;
46209 - int len, hdrlen;
46210 + long len, hdrlen;
46211 unsigned char *cp = icp;
46212
46213 /* We've got a compressed packet; read the change byte */
46214 diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
46215 index c8624a8..f0a4f6a 100644
46216 --- a/drivers/net/team/team.c
46217 +++ b/drivers/net/team/team.c
46218 @@ -2869,7 +2869,7 @@ static int team_device_event(struct notifier_block *unused,
46219 return NOTIFY_DONE;
46220 }
46221
46222 -static struct notifier_block team_notifier_block __read_mostly = {
46223 +static struct notifier_block team_notifier_block = {
46224 .notifier_call = team_device_event,
46225 };
46226
46227 diff --git a/drivers/net/tun.c b/drivers/net/tun.c
46228 index 26f8635..c237839 100644
46229 --- a/drivers/net/tun.c
46230 +++ b/drivers/net/tun.c
46231 @@ -1876,7 +1876,7 @@ unlock:
46232 }
46233
46234 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
46235 - unsigned long arg, int ifreq_len)
46236 + unsigned long arg, size_t ifreq_len)
46237 {
46238 struct tun_file *tfile = file->private_data;
46239 struct tun_struct *tun;
46240 @@ -1889,6 +1889,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
46241 unsigned int ifindex;
46242 int ret;
46243
46244 + if (ifreq_len > sizeof ifr)
46245 + return -EFAULT;
46246 +
46247 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
46248 if (copy_from_user(&ifr, argp, ifreq_len))
46249 return -EFAULT;
46250 diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
46251 index 660bd5e..ac59452 100644
46252 --- a/drivers/net/usb/hso.c
46253 +++ b/drivers/net/usb/hso.c
46254 @@ -71,7 +71,7 @@
46255 #include <asm/byteorder.h>
46256 #include <linux/serial_core.h>
46257 #include <linux/serial.h>
46258 -
46259 +#include <asm/local.h>
46260
46261 #define MOD_AUTHOR "Option Wireless"
46262 #define MOD_DESCRIPTION "USB High Speed Option driver"
46263 @@ -1179,7 +1179,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
46264 struct urb *urb;
46265
46266 urb = serial->rx_urb[0];
46267 - if (serial->port.count > 0) {
46268 + if (atomic_read(&serial->port.count) > 0) {
46269 count = put_rxbuf_data(urb, serial);
46270 if (count == -1)
46271 return;
46272 @@ -1217,7 +1217,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
46273 DUMP1(urb->transfer_buffer, urb->actual_length);
46274
46275 /* Anyone listening? */
46276 - if (serial->port.count == 0)
46277 + if (atomic_read(&serial->port.count) == 0)
46278 return;
46279
46280 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
46281 @@ -1287,8 +1287,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
46282 tty_port_tty_set(&serial->port, tty);
46283
46284 /* check for port already opened, if not set the termios */
46285 - serial->port.count++;
46286 - if (serial->port.count == 1) {
46287 + if (atomic_inc_return(&serial->port.count) == 1) {
46288 serial->rx_state = RX_IDLE;
46289 /* Force default termio settings */
46290 _hso_serial_set_termios(tty, NULL);
46291 @@ -1300,7 +1299,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
46292 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
46293 if (result) {
46294 hso_stop_serial_device(serial->parent);
46295 - serial->port.count--;
46296 + atomic_dec(&serial->port.count);
46297 kref_put(&serial->parent->ref, hso_serial_ref_free);
46298 }
46299 } else {
46300 @@ -1337,10 +1336,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
46301
46302 /* reset the rts and dtr */
46303 /* do the actual close */
46304 - serial->port.count--;
46305 + atomic_dec(&serial->port.count);
46306
46307 - if (serial->port.count <= 0) {
46308 - serial->port.count = 0;
46309 + if (atomic_read(&serial->port.count) <= 0) {
46310 + atomic_set(&serial->port.count, 0);
46311 tty_port_tty_set(&serial->port, NULL);
46312 if (!usb_gone)
46313 hso_stop_serial_device(serial->parent);
46314 @@ -1416,7 +1415,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
46315
46316 /* the actual setup */
46317 spin_lock_irqsave(&serial->serial_lock, flags);
46318 - if (serial->port.count)
46319 + if (atomic_read(&serial->port.count))
46320 _hso_serial_set_termios(tty, old);
46321 else
46322 tty->termios = *old;
46323 @@ -1885,7 +1884,7 @@ static void intr_callback(struct urb *urb)
46324 D1("Pending read interrupt on port %d\n", i);
46325 spin_lock(&serial->serial_lock);
46326 if (serial->rx_state == RX_IDLE &&
46327 - serial->port.count > 0) {
46328 + atomic_read(&serial->port.count) > 0) {
46329 /* Setup and send a ctrl req read on
46330 * port i */
46331 if (!serial->rx_urb_filled[0]) {
46332 @@ -3061,7 +3060,7 @@ static int hso_resume(struct usb_interface *iface)
46333 /* Start all serial ports */
46334 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
46335 if (serial_table[i] && (serial_table[i]->interface == iface)) {
46336 - if (dev2ser(serial_table[i])->port.count) {
46337 + if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
46338 result =
46339 hso_start_serial_device(serial_table[i], GFP_NOIO);
46340 hso_kick_transmit(dev2ser(serial_table[i]));
46341 diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
46342 index adb12f3..48005ab 100644
46343 --- a/drivers/net/usb/r8152.c
46344 +++ b/drivers/net/usb/r8152.c
46345 @@ -513,7 +513,7 @@ struct r8152 {
46346 void (*disable)(struct r8152 *);
46347 void (*down)(struct r8152 *);
46348 void (*unload)(struct r8152 *);
46349 - } rtl_ops;
46350 + } __no_const rtl_ops;
46351
46352 int intr_interval;
46353 u32 msg_enable;
46354 diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
46355 index a2515887..6d13233 100644
46356 --- a/drivers/net/usb/sierra_net.c
46357 +++ b/drivers/net/usb/sierra_net.c
46358 @@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
46359 /* atomic counter partially included in MAC address to make sure 2 devices
46360 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
46361 */
46362 -static atomic_t iface_counter = ATOMIC_INIT(0);
46363 +static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
46364
46365 /*
46366 * SYNC Timer Delay definition used to set the expiry time
46367 @@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
46368 dev->net->netdev_ops = &sierra_net_device_ops;
46369
46370 /* change MAC addr to include, ifacenum, and to be unique */
46371 - dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
46372 + dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
46373 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
46374
46375 /* we will have to manufacture ethernet headers, prepare template */
46376 diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
46377 index d091e52..568bb179 100644
46378 --- a/drivers/net/vxlan.c
46379 +++ b/drivers/net/vxlan.c
46380 @@ -2847,7 +2847,7 @@ nla_put_failure:
46381 return -EMSGSIZE;
46382 }
46383
46384 -static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
46385 +static struct rtnl_link_ops vxlan_link_ops = {
46386 .kind = "vxlan",
46387 .maxtype = IFLA_VXLAN_MAX,
46388 .policy = vxlan_policy,
46389 @@ -2894,7 +2894,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
46390 return NOTIFY_DONE;
46391 }
46392
46393 -static struct notifier_block vxlan_notifier_block __read_mostly = {
46394 +static struct notifier_block vxlan_notifier_block = {
46395 .notifier_call = vxlan_lowerdev_event,
46396 };
46397
46398 diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
46399 index 5920c99..ff2e4a5 100644
46400 --- a/drivers/net/wan/lmc/lmc_media.c
46401 +++ b/drivers/net/wan/lmc/lmc_media.c
46402 @@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
46403 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
46404
46405 lmc_media_t lmc_ds3_media = {
46406 - lmc_ds3_init, /* special media init stuff */
46407 - lmc_ds3_default, /* reset to default state */
46408 - lmc_ds3_set_status, /* reset status to state provided */
46409 - lmc_dummy_set_1, /* set clock source */
46410 - lmc_dummy_set2_1, /* set line speed */
46411 - lmc_ds3_set_100ft, /* set cable length */
46412 - lmc_ds3_set_scram, /* set scrambler */
46413 - lmc_ds3_get_link_status, /* get link status */
46414 - lmc_dummy_set_1, /* set link status */
46415 - lmc_ds3_set_crc_length, /* set CRC length */
46416 - lmc_dummy_set_1, /* set T1 or E1 circuit type */
46417 - lmc_ds3_watchdog
46418 + .init = lmc_ds3_init, /* special media init stuff */
46419 + .defaults = lmc_ds3_default, /* reset to default state */
46420 + .set_status = lmc_ds3_set_status, /* reset status to state provided */
46421 + .set_clock_source = lmc_dummy_set_1, /* set clock source */
46422 + .set_speed = lmc_dummy_set2_1, /* set line speed */
46423 + .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
46424 + .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
46425 + .get_link_status = lmc_ds3_get_link_status, /* get link status */
46426 + .set_link_status = lmc_dummy_set_1, /* set link status */
46427 + .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
46428 + .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
46429 + .watchdog = lmc_ds3_watchdog
46430 };
46431
46432 lmc_media_t lmc_hssi_media = {
46433 - lmc_hssi_init, /* special media init stuff */
46434 - lmc_hssi_default, /* reset to default state */
46435 - lmc_hssi_set_status, /* reset status to state provided */
46436 - lmc_hssi_set_clock, /* set clock source */
46437 - lmc_dummy_set2_1, /* set line speed */
46438 - lmc_dummy_set_1, /* set cable length */
46439 - lmc_dummy_set_1, /* set scrambler */
46440 - lmc_hssi_get_link_status, /* get link status */
46441 - lmc_hssi_set_link_status, /* set link status */
46442 - lmc_hssi_set_crc_length, /* set CRC length */
46443 - lmc_dummy_set_1, /* set T1 or E1 circuit type */
46444 - lmc_hssi_watchdog
46445 + .init = lmc_hssi_init, /* special media init stuff */
46446 + .defaults = lmc_hssi_default, /* reset to default state */
46447 + .set_status = lmc_hssi_set_status, /* reset status to state provided */
46448 + .set_clock_source = lmc_hssi_set_clock, /* set clock source */
46449 + .set_speed = lmc_dummy_set2_1, /* set line speed */
46450 + .set_cable_length = lmc_dummy_set_1, /* set cable length */
46451 + .set_scrambler = lmc_dummy_set_1, /* set scrambler */
46452 + .get_link_status = lmc_hssi_get_link_status, /* get link status */
46453 + .set_link_status = lmc_hssi_set_link_status, /* set link status */
46454 + .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
46455 + .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
46456 + .watchdog = lmc_hssi_watchdog
46457 };
46458
46459 -lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
46460 - lmc_ssi_default, /* reset to default state */
46461 - lmc_ssi_set_status, /* reset status to state provided */
46462 - lmc_ssi_set_clock, /* set clock source */
46463 - lmc_ssi_set_speed, /* set line speed */
46464 - lmc_dummy_set_1, /* set cable length */
46465 - lmc_dummy_set_1, /* set scrambler */
46466 - lmc_ssi_get_link_status, /* get link status */
46467 - lmc_ssi_set_link_status, /* set link status */
46468 - lmc_ssi_set_crc_length, /* set CRC length */
46469 - lmc_dummy_set_1, /* set T1 or E1 circuit type */
46470 - lmc_ssi_watchdog
46471 +lmc_media_t lmc_ssi_media = {
46472 + .init = lmc_ssi_init, /* special media init stuff */
46473 + .defaults = lmc_ssi_default, /* reset to default state */
46474 + .set_status = lmc_ssi_set_status, /* reset status to state provided */
46475 + .set_clock_source = lmc_ssi_set_clock, /* set clock source */
46476 + .set_speed = lmc_ssi_set_speed, /* set line speed */
46477 + .set_cable_length = lmc_dummy_set_1, /* set cable length */
46478 + .set_scrambler = lmc_dummy_set_1, /* set scrambler */
46479 + .get_link_status = lmc_ssi_get_link_status, /* get link status */
46480 + .set_link_status = lmc_ssi_set_link_status, /* set link status */
46481 + .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
46482 + .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
46483 + .watchdog = lmc_ssi_watchdog
46484 };
46485
46486 lmc_media_t lmc_t1_media = {
46487 - lmc_t1_init, /* special media init stuff */
46488 - lmc_t1_default, /* reset to default state */
46489 - lmc_t1_set_status, /* reset status to state provided */
46490 - lmc_t1_set_clock, /* set clock source */
46491 - lmc_dummy_set2_1, /* set line speed */
46492 - lmc_dummy_set_1, /* set cable length */
46493 - lmc_dummy_set_1, /* set scrambler */
46494 - lmc_t1_get_link_status, /* get link status */
46495 - lmc_dummy_set_1, /* set link status */
46496 - lmc_t1_set_crc_length, /* set CRC length */
46497 - lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
46498 - lmc_t1_watchdog
46499 + .init = lmc_t1_init, /* special media init stuff */
46500 + .defaults = lmc_t1_default, /* reset to default state */
46501 + .set_status = lmc_t1_set_status, /* reset status to state provided */
46502 + .set_clock_source = lmc_t1_set_clock, /* set clock source */
46503 + .set_speed = lmc_dummy_set2_1, /* set line speed */
46504 + .set_cable_length = lmc_dummy_set_1, /* set cable length */
46505 + .set_scrambler = lmc_dummy_set_1, /* set scrambler */
46506 + .get_link_status = lmc_t1_get_link_status, /* get link status */
46507 + .set_link_status = lmc_dummy_set_1, /* set link status */
46508 + .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
46509 + .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
46510 + .watchdog = lmc_t1_watchdog
46511 };
46512
46513 static void
46514 diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
46515 index feacc3b..5bac0de 100644
46516 --- a/drivers/net/wan/z85230.c
46517 +++ b/drivers/net/wan/z85230.c
46518 @@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
46519
46520 struct z8530_irqhandler z8530_sync =
46521 {
46522 - z8530_rx,
46523 - z8530_tx,
46524 - z8530_status
46525 + .rx = z8530_rx,
46526 + .tx = z8530_tx,
46527 + .status = z8530_status
46528 };
46529
46530 EXPORT_SYMBOL(z8530_sync);
46531 @@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
46532 }
46533
46534 static struct z8530_irqhandler z8530_dma_sync = {
46535 - z8530_dma_rx,
46536 - z8530_dma_tx,
46537 - z8530_dma_status
46538 + .rx = z8530_dma_rx,
46539 + .tx = z8530_dma_tx,
46540 + .status = z8530_dma_status
46541 };
46542
46543 static struct z8530_irqhandler z8530_txdma_sync = {
46544 - z8530_rx,
46545 - z8530_dma_tx,
46546 - z8530_dma_status
46547 + .rx = z8530_rx,
46548 + .tx = z8530_dma_tx,
46549 + .status = z8530_dma_status
46550 };
46551
46552 /**
46553 @@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
46554
46555 struct z8530_irqhandler z8530_nop=
46556 {
46557 - z8530_rx_clear,
46558 - z8530_tx_clear,
46559 - z8530_status_clear
46560 + .rx = z8530_rx_clear,
46561 + .tx = z8530_tx_clear,
46562 + .status = z8530_status_clear
46563 };
46564
46565
46566 diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
46567 index 0b60295..b8bfa5b 100644
46568 --- a/drivers/net/wimax/i2400m/rx.c
46569 +++ b/drivers/net/wimax/i2400m/rx.c
46570 @@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
46571 if (i2400m->rx_roq == NULL)
46572 goto error_roq_alloc;
46573
46574 - rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
46575 + rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
46576 GFP_KERNEL);
46577 if (rd == NULL) {
46578 result = -ENOMEM;
46579 diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
46580 index edf4b57..68b51c0 100644
46581 --- a/drivers/net/wireless/airo.c
46582 +++ b/drivers/net/wireless/airo.c
46583 @@ -7843,7 +7843,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
46584 struct airo_info *ai = dev->ml_priv;
46585 int ridcode;
46586 int enabled;
46587 - static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
46588 + int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
46589 unsigned char *iobuf;
46590
46591 /* Only super-user can write RIDs */
46592 diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
46593 index 99b3bfa..9559372 100644
46594 --- a/drivers/net/wireless/at76c50x-usb.c
46595 +++ b/drivers/net/wireless/at76c50x-usb.c
46596 @@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
46597 }
46598
46599 /* Convert timeout from the DFU status to jiffies */
46600 -static inline unsigned long at76_get_timeout(struct dfu_status *s)
46601 +static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
46602 {
46603 return msecs_to_jiffies((s->poll_timeout[2] << 16)
46604 | (s->poll_timeout[1] << 8)
46605 diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
46606 index edc57ab..ff49e0a 100644
46607 --- a/drivers/net/wireless/ath/ath10k/htc.c
46608 +++ b/drivers/net/wireless/ath/ath10k/htc.c
46609 @@ -831,7 +831,10 @@ void ath10k_htc_stop(struct ath10k_htc *htc)
46610 /* registered target arrival callback from the HIF layer */
46611 int ath10k_htc_init(struct ath10k *ar)
46612 {
46613 - struct ath10k_hif_cb htc_callbacks;
46614 + static struct ath10k_hif_cb htc_callbacks = {
46615 + .rx_completion = ath10k_htc_rx_completion_handler,
46616 + .tx_completion = ath10k_htc_tx_completion_handler,
46617 + };
46618 struct ath10k_htc_ep *ep = NULL;
46619 struct ath10k_htc *htc = &ar->htc;
46620
46621 @@ -841,8 +844,6 @@ int ath10k_htc_init(struct ath10k *ar)
46622 ath10k_htc_reset_endpoint_states(htc);
46623
46624 /* setup HIF layer callbacks */
46625 - htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
46626 - htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
46627 htc->ar = ar;
46628
46629 /* Get HIF default pipe for HTC message exchange */
46630 diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
46631 index 4716d33..a688310 100644
46632 --- a/drivers/net/wireless/ath/ath10k/htc.h
46633 +++ b/drivers/net/wireless/ath/ath10k/htc.h
46634 @@ -271,13 +271,13 @@ enum ath10k_htc_ep_id {
46635
46636 struct ath10k_htc_ops {
46637 void (*target_send_suspend_complete)(struct ath10k *ar);
46638 -};
46639 +} __no_const;
46640
46641 struct ath10k_htc_ep_ops {
46642 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
46643 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
46644 void (*ep_tx_credits)(struct ath10k *);
46645 -};
46646 +} __no_const;
46647
46648 /* service connection information */
46649 struct ath10k_htc_svc_conn_req {
46650 diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
46651 index 741b38d..b7ae41b 100644
46652 --- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
46653 +++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
46654 @@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46655 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
46656 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
46657
46658 - ACCESS_ONCE(ads->ds_link) = i->link;
46659 - ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
46660 + ACCESS_ONCE_RW(ads->ds_link) = i->link;
46661 + ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
46662
46663 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
46664 ctl6 = SM(i->keytype, AR_EncrType);
46665 @@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46666
46667 if ((i->is_first || i->is_last) &&
46668 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
46669 - ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
46670 + ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
46671 | set11nTries(i->rates, 1)
46672 | set11nTries(i->rates, 2)
46673 | set11nTries(i->rates, 3)
46674 | (i->dur_update ? AR_DurUpdateEna : 0)
46675 | SM(0, AR_BurstDur);
46676
46677 - ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
46678 + ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
46679 | set11nRate(i->rates, 1)
46680 | set11nRate(i->rates, 2)
46681 | set11nRate(i->rates, 3);
46682 } else {
46683 - ACCESS_ONCE(ads->ds_ctl2) = 0;
46684 - ACCESS_ONCE(ads->ds_ctl3) = 0;
46685 + ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
46686 + ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
46687 }
46688
46689 if (!i->is_first) {
46690 - ACCESS_ONCE(ads->ds_ctl0) = 0;
46691 - ACCESS_ONCE(ads->ds_ctl1) = ctl1;
46692 - ACCESS_ONCE(ads->ds_ctl6) = ctl6;
46693 + ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
46694 + ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
46695 + ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
46696 return;
46697 }
46698
46699 @@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46700 break;
46701 }
46702
46703 - ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
46704 + ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
46705 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
46706 | SM(i->txpower, AR_XmitPower)
46707 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
46708 @@ -289,19 +289,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46709 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
46710 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
46711
46712 - ACCESS_ONCE(ads->ds_ctl1) = ctl1;
46713 - ACCESS_ONCE(ads->ds_ctl6) = ctl6;
46714 + ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
46715 + ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
46716
46717 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
46718 return;
46719
46720 - ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
46721 + ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
46722 | set11nPktDurRTSCTS(i->rates, 1);
46723
46724 - ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
46725 + ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
46726 | set11nPktDurRTSCTS(i->rates, 3);
46727
46728 - ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
46729 + ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
46730 | set11nRateFlags(i->rates, 1)
46731 | set11nRateFlags(i->rates, 2)
46732 | set11nRateFlags(i->rates, 3)
46733 diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
46734 index 729ffbf..49f50e3 100644
46735 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
46736 +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
46737 @@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46738 (i->qcu << AR_TxQcuNum_S) | desc_len;
46739
46740 checksum += val;
46741 - ACCESS_ONCE(ads->info) = val;
46742 + ACCESS_ONCE_RW(ads->info) = val;
46743
46744 checksum += i->link;
46745 - ACCESS_ONCE(ads->link) = i->link;
46746 + ACCESS_ONCE_RW(ads->link) = i->link;
46747
46748 checksum += i->buf_addr[0];
46749 - ACCESS_ONCE(ads->data0) = i->buf_addr[0];
46750 + ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
46751 checksum += i->buf_addr[1];
46752 - ACCESS_ONCE(ads->data1) = i->buf_addr[1];
46753 + ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
46754 checksum += i->buf_addr[2];
46755 - ACCESS_ONCE(ads->data2) = i->buf_addr[2];
46756 + ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
46757 checksum += i->buf_addr[3];
46758 - ACCESS_ONCE(ads->data3) = i->buf_addr[3];
46759 + ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
46760
46761 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
46762 - ACCESS_ONCE(ads->ctl3) = val;
46763 + ACCESS_ONCE_RW(ads->ctl3) = val;
46764 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
46765 - ACCESS_ONCE(ads->ctl5) = val;
46766 + ACCESS_ONCE_RW(ads->ctl5) = val;
46767 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
46768 - ACCESS_ONCE(ads->ctl7) = val;
46769 + ACCESS_ONCE_RW(ads->ctl7) = val;
46770 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
46771 - ACCESS_ONCE(ads->ctl9) = val;
46772 + ACCESS_ONCE_RW(ads->ctl9) = val;
46773
46774 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
46775 - ACCESS_ONCE(ads->ctl10) = checksum;
46776 + ACCESS_ONCE_RW(ads->ctl10) = checksum;
46777
46778 if (i->is_first || i->is_last) {
46779 - ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
46780 + ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
46781 | set11nTries(i->rates, 1)
46782 | set11nTries(i->rates, 2)
46783 | set11nTries(i->rates, 3)
46784 | (i->dur_update ? AR_DurUpdateEna : 0)
46785 | SM(0, AR_BurstDur);
46786
46787 - ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
46788 + ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
46789 | set11nRate(i->rates, 1)
46790 | set11nRate(i->rates, 2)
46791 | set11nRate(i->rates, 3);
46792 } else {
46793 - ACCESS_ONCE(ads->ctl13) = 0;
46794 - ACCESS_ONCE(ads->ctl14) = 0;
46795 + ACCESS_ONCE_RW(ads->ctl13) = 0;
46796 + ACCESS_ONCE_RW(ads->ctl14) = 0;
46797 }
46798
46799 ads->ctl20 = 0;
46800 @@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46801
46802 ctl17 = SM(i->keytype, AR_EncrType);
46803 if (!i->is_first) {
46804 - ACCESS_ONCE(ads->ctl11) = 0;
46805 - ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
46806 - ACCESS_ONCE(ads->ctl15) = 0;
46807 - ACCESS_ONCE(ads->ctl16) = 0;
46808 - ACCESS_ONCE(ads->ctl17) = ctl17;
46809 - ACCESS_ONCE(ads->ctl18) = 0;
46810 - ACCESS_ONCE(ads->ctl19) = 0;
46811 + ACCESS_ONCE_RW(ads->ctl11) = 0;
46812 + ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
46813 + ACCESS_ONCE_RW(ads->ctl15) = 0;
46814 + ACCESS_ONCE_RW(ads->ctl16) = 0;
46815 + ACCESS_ONCE_RW(ads->ctl17) = ctl17;
46816 + ACCESS_ONCE_RW(ads->ctl18) = 0;
46817 + ACCESS_ONCE_RW(ads->ctl19) = 0;
46818 return;
46819 }
46820
46821 - ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
46822 + ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
46823 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
46824 | SM(i->txpower, AR_XmitPower)
46825 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
46826 @@ -135,22 +135,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46827 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
46828 ctl12 |= SM(val, AR_PAPRDChainMask);
46829
46830 - ACCESS_ONCE(ads->ctl12) = ctl12;
46831 - ACCESS_ONCE(ads->ctl17) = ctl17;
46832 + ACCESS_ONCE_RW(ads->ctl12) = ctl12;
46833 + ACCESS_ONCE_RW(ads->ctl17) = ctl17;
46834
46835 - ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
46836 + ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
46837 | set11nPktDurRTSCTS(i->rates, 1);
46838
46839 - ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
46840 + ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
46841 | set11nPktDurRTSCTS(i->rates, 3);
46842
46843 - ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
46844 + ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
46845 | set11nRateFlags(i->rates, 1)
46846 | set11nRateFlags(i->rates, 2)
46847 | set11nRateFlags(i->rates, 3)
46848 | SM(i->rtscts_rate, AR_RTSCTSRate);
46849
46850 - ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
46851 + ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
46852 }
46853
46854 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
46855 diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
46856 index 0acd4b5..0591c91 100644
46857 --- a/drivers/net/wireless/ath/ath9k/hw.h
46858 +++ b/drivers/net/wireless/ath/ath9k/hw.h
46859 @@ -629,7 +629,7 @@ struct ath_hw_private_ops {
46860
46861 /* ANI */
46862 void (*ani_cache_ini_regs)(struct ath_hw *ah);
46863 -};
46864 +} __no_const;
46865
46866 /**
46867 * struct ath_spec_scan - parameters for Atheros spectral scan
46868 @@ -706,7 +706,7 @@ struct ath_hw_ops {
46869 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
46870 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
46871 #endif
46872 -};
46873 +} __no_const;
46874
46875 struct ath_nf_limits {
46876 s16 max;
46877 diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
46878 index 92190da..f3a4c4c 100644
46879 --- a/drivers/net/wireless/b43/phy_lp.c
46880 +++ b/drivers/net/wireless/b43/phy_lp.c
46881 @@ -2514,7 +2514,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
46882 {
46883 struct ssb_bus *bus = dev->dev->sdev->bus;
46884
46885 - static const struct b206x_channel *chandata = NULL;
46886 + const struct b206x_channel *chandata = NULL;
46887 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
46888 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
46889 u16 old_comm15, scale;
46890 diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
46891 index 0487461..fd9e84a 100644
46892 --- a/drivers/net/wireless/iwlegacy/3945-mac.c
46893 +++ b/drivers/net/wireless/iwlegacy/3945-mac.c
46894 @@ -3638,7 +3638,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
46895 */
46896 if (il3945_mod_params.disable_hw_scan) {
46897 D_INFO("Disabling hw_scan\n");
46898 - il3945_mac_ops.hw_scan = NULL;
46899 + pax_open_kernel();
46900 + *(void **)&il3945_mac_ops.hw_scan = NULL;
46901 + pax_close_kernel();
46902 }
46903
46904 D_INFO("*** LOAD DRIVER ***\n");
46905 diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
46906 index d2fe259..0c4c682 100644
46907 --- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
46908 +++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
46909 @@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
46910 {
46911 struct iwl_priv *priv = file->private_data;
46912 char buf[64];
46913 - int buf_size;
46914 + size_t buf_size;
46915 u32 offset, len;
46916
46917 memset(buf, 0, sizeof(buf));
46918 @@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
46919 struct iwl_priv *priv = file->private_data;
46920
46921 char buf[8];
46922 - int buf_size;
46923 + size_t buf_size;
46924 u32 reset_flag;
46925
46926 memset(buf, 0, sizeof(buf));
46927 @@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
46928 {
46929 struct iwl_priv *priv = file->private_data;
46930 char buf[8];
46931 - int buf_size;
46932 + size_t buf_size;
46933 int ht40;
46934
46935 memset(buf, 0, sizeof(buf));
46936 @@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
46937 {
46938 struct iwl_priv *priv = file->private_data;
46939 char buf[8];
46940 - int buf_size;
46941 + size_t buf_size;
46942 int value;
46943
46944 memset(buf, 0, sizeof(buf));
46945 @@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
46946 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
46947 DEBUGFS_READ_FILE_OPS(current_sleep_command);
46948
46949 -static const char *fmt_value = " %-30s %10u\n";
46950 -static const char *fmt_hex = " %-30s 0x%02X\n";
46951 -static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
46952 -static const char *fmt_header =
46953 +static const char fmt_value[] = " %-30s %10u\n";
46954 +static const char fmt_hex[] = " %-30s 0x%02X\n";
46955 +static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
46956 +static const char fmt_header[] =
46957 "%-32s current cumulative delta max\n";
46958
46959 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
46960 @@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
46961 {
46962 struct iwl_priv *priv = file->private_data;
46963 char buf[8];
46964 - int buf_size;
46965 + size_t buf_size;
46966 int clear;
46967
46968 memset(buf, 0, sizeof(buf));
46969 @@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
46970 {
46971 struct iwl_priv *priv = file->private_data;
46972 char buf[8];
46973 - int buf_size;
46974 + size_t buf_size;
46975 int trace;
46976
46977 memset(buf, 0, sizeof(buf));
46978 @@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
46979 {
46980 struct iwl_priv *priv = file->private_data;
46981 char buf[8];
46982 - int buf_size;
46983 + size_t buf_size;
46984 int missed;
46985
46986 memset(buf, 0, sizeof(buf));
46987 @@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
46988
46989 struct iwl_priv *priv = file->private_data;
46990 char buf[8];
46991 - int buf_size;
46992 + size_t buf_size;
46993 int plcp;
46994
46995 memset(buf, 0, sizeof(buf));
46996 @@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
46997
46998 struct iwl_priv *priv = file->private_data;
46999 char buf[8];
47000 - int buf_size;
47001 + size_t buf_size;
47002 int flush;
47003
47004 memset(buf, 0, sizeof(buf));
47005 @@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
47006
47007 struct iwl_priv *priv = file->private_data;
47008 char buf[8];
47009 - int buf_size;
47010 + size_t buf_size;
47011 int rts;
47012
47013 if (!priv->cfg->ht_params)
47014 @@ -2205,7 +2205,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
47015 {
47016 struct iwl_priv *priv = file->private_data;
47017 char buf[8];
47018 - int buf_size;
47019 + size_t buf_size;
47020
47021 memset(buf, 0, sizeof(buf));
47022 buf_size = min(count, sizeof(buf) - 1);
47023 @@ -2239,7 +2239,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
47024 struct iwl_priv *priv = file->private_data;
47025 u32 event_log_flag;
47026 char buf[8];
47027 - int buf_size;
47028 + size_t buf_size;
47029
47030 /* check that the interface is up */
47031 if (!iwl_is_ready(priv))
47032 @@ -2293,7 +2293,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
47033 struct iwl_priv *priv = file->private_data;
47034 char buf[8];
47035 u32 calib_disabled;
47036 - int buf_size;
47037 + size_t buf_size;
47038
47039 memset(buf, 0, sizeof(buf));
47040 buf_size = min(count, sizeof(buf) - 1);
47041 diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
47042 index ba1b1ea..0ff7e98 100644
47043 --- a/drivers/net/wireless/iwlwifi/dvm/main.c
47044 +++ b/drivers/net/wireless/iwlwifi/dvm/main.c
47045 @@ -1123,7 +1123,7 @@ static void iwl_option_config(struct iwl_priv *priv)
47046 static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
47047 {
47048 struct iwl_nvm_data *data = priv->nvm_data;
47049 - char *debug_msg;
47050 + static const char debug_msg[] = "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n";
47051
47052 if (data->sku_cap_11n_enable &&
47053 !priv->cfg->ht_params) {
47054 @@ -1137,7 +1137,6 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
47055 return -EINVAL;
47056 }
47057
47058 - debug_msg = "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n";
47059 IWL_DEBUG_INFO(priv, debug_msg,
47060 data->sku_cap_band_24GHz_enable ? "" : "NOT", "enabled",
47061 data->sku_cap_band_52GHz_enable ? "" : "NOT", "enabled",
47062 diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
47063 index f950780..be9df93 100644
47064 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c
47065 +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
47066 @@ -1365,7 +1365,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
47067 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
47068
47069 char buf[8];
47070 - int buf_size;
47071 + size_t buf_size;
47072 u32 reset_flag;
47073
47074 memset(buf, 0, sizeof(buf));
47075 @@ -1386,7 +1386,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
47076 {
47077 struct iwl_trans *trans = file->private_data;
47078 char buf[8];
47079 - int buf_size;
47080 + size_t buf_size;
47081 int csr;
47082
47083 memset(buf, 0, sizeof(buf));
47084 diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
47085 index 69d4c31..bd0b316 100644
47086 --- a/drivers/net/wireless/mac80211_hwsim.c
47087 +++ b/drivers/net/wireless/mac80211_hwsim.c
47088 @@ -2541,20 +2541,20 @@ static int __init init_mac80211_hwsim(void)
47089 if (channels < 1)
47090 return -EINVAL;
47091
47092 - mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
47093 - mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
47094 - mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
47095 - mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
47096 - mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
47097 - mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
47098 - mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
47099 - mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
47100 - mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
47101 - mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
47102 - mac80211_hwsim_mchan_ops.assign_vif_chanctx =
47103 - mac80211_hwsim_assign_vif_chanctx;
47104 - mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
47105 - mac80211_hwsim_unassign_vif_chanctx;
47106 + pax_open_kernel();
47107 + memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
47108 + *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
47109 + *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
47110 + *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
47111 + *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
47112 + *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
47113 + *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
47114 + *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
47115 + *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
47116 + *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
47117 + *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
47118 + *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
47119 + pax_close_kernel();
47120
47121 spin_lock_init(&hwsim_radio_lock);
47122 INIT_LIST_HEAD(&hwsim_radios);
47123 diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
47124 index 5028557..91cf394 100644
47125 --- a/drivers/net/wireless/rndis_wlan.c
47126 +++ b/drivers/net/wireless/rndis_wlan.c
47127 @@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
47128
47129 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
47130
47131 - if (rts_threshold < 0 || rts_threshold > 2347)
47132 + if (rts_threshold > 2347)
47133 rts_threshold = 2347;
47134
47135 tmp = cpu_to_le32(rts_threshold);
47136 diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
47137 index e3b885d..7a7de2f 100644
47138 --- a/drivers/net/wireless/rt2x00/rt2x00.h
47139 +++ b/drivers/net/wireless/rt2x00/rt2x00.h
47140 @@ -375,7 +375,7 @@ struct rt2x00_intf {
47141 * for hardware which doesn't support hardware
47142 * sequence counting.
47143 */
47144 - atomic_t seqno;
47145 + atomic_unchecked_t seqno;
47146 };
47147
47148 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
47149 diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
47150 index 5642ccc..01f03eb 100644
47151 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c
47152 +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
47153 @@ -250,9 +250,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
47154 * sequence counter given by mac80211.
47155 */
47156 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
47157 - seqno = atomic_add_return(0x10, &intf->seqno);
47158 + seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
47159 else
47160 - seqno = atomic_read(&intf->seqno);
47161 + seqno = atomic_read_unchecked(&intf->seqno);
47162
47163 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
47164 hdr->seq_ctrl |= cpu_to_le16(seqno);
47165 diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
47166 index e2b3d9c..67a5184 100644
47167 --- a/drivers/net/wireless/ti/wl1251/sdio.c
47168 +++ b/drivers/net/wireless/ti/wl1251/sdio.c
47169 @@ -271,13 +271,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
47170
47171 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
47172
47173 - wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
47174 - wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
47175 + pax_open_kernel();
47176 + *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
47177 + *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
47178 + pax_close_kernel();
47179
47180 wl1251_info("using dedicated interrupt line");
47181 } else {
47182 - wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
47183 - wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
47184 + pax_open_kernel();
47185 + *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
47186 + *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
47187 + pax_close_kernel();
47188
47189 wl1251_info("using SDIO interrupt");
47190 }
47191 diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
47192 index be7129b..4161356 100644
47193 --- a/drivers/net/wireless/ti/wl12xx/main.c
47194 +++ b/drivers/net/wireless/ti/wl12xx/main.c
47195 @@ -656,7 +656,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
47196 sizeof(wl->conf.mem));
47197
47198 /* read data preparation is only needed by wl127x */
47199 - wl->ops->prepare_read = wl127x_prepare_read;
47200 + pax_open_kernel();
47201 + *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
47202 + pax_close_kernel();
47203
47204 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
47205 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
47206 @@ -681,7 +683,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
47207 sizeof(wl->conf.mem));
47208
47209 /* read data preparation is only needed by wl127x */
47210 - wl->ops->prepare_read = wl127x_prepare_read;
47211 + pax_open_kernel();
47212 + *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
47213 + pax_close_kernel();
47214
47215 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
47216 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
47217 diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
47218 index ec37b16..7e34d66 100644
47219 --- a/drivers/net/wireless/ti/wl18xx/main.c
47220 +++ b/drivers/net/wireless/ti/wl18xx/main.c
47221 @@ -1823,8 +1823,10 @@ static int wl18xx_setup(struct wl1271 *wl)
47222 }
47223
47224 if (!checksum_param) {
47225 - wl18xx_ops.set_rx_csum = NULL;
47226 - wl18xx_ops.init_vif = NULL;
47227 + pax_open_kernel();
47228 + *(void **)&wl18xx_ops.set_rx_csum = NULL;
47229 + *(void **)&wl18xx_ops.init_vif = NULL;
47230 + pax_close_kernel();
47231 }
47232
47233 /* Enable 11a Band only if we have 5G antennas */
47234 diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
47235 index a912dc0..a8225ba 100644
47236 --- a/drivers/net/wireless/zd1211rw/zd_usb.c
47237 +++ b/drivers/net/wireless/zd1211rw/zd_usb.c
47238 @@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
47239 {
47240 struct zd_usb *usb = urb->context;
47241 struct zd_usb_interrupt *intr = &usb->intr;
47242 - int len;
47243 + unsigned int len;
47244 u16 int_num;
47245
47246 ZD_ASSERT(in_interrupt());
47247 diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
47248 index 683671a..4519fc2 100644
47249 --- a/drivers/nfc/nfcwilink.c
47250 +++ b/drivers/nfc/nfcwilink.c
47251 @@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
47252
47253 static int nfcwilink_probe(struct platform_device *pdev)
47254 {
47255 - static struct nfcwilink *drv;
47256 + struct nfcwilink *drv;
47257 int rc;
47258 __u32 protocols;
47259
47260 diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
47261 index d93b2b6..ae50401 100644
47262 --- a/drivers/oprofile/buffer_sync.c
47263 +++ b/drivers/oprofile/buffer_sync.c
47264 @@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
47265 if (cookie == NO_COOKIE)
47266 offset = pc;
47267 if (cookie == INVALID_COOKIE) {
47268 - atomic_inc(&oprofile_stats.sample_lost_no_mapping);
47269 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
47270 offset = pc;
47271 }
47272 if (cookie != last_cookie) {
47273 @@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
47274 /* add userspace sample */
47275
47276 if (!mm) {
47277 - atomic_inc(&oprofile_stats.sample_lost_no_mm);
47278 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
47279 return 0;
47280 }
47281
47282 cookie = lookup_dcookie(mm, s->eip, &offset);
47283
47284 if (cookie == INVALID_COOKIE) {
47285 - atomic_inc(&oprofile_stats.sample_lost_no_mapping);
47286 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
47287 return 0;
47288 }
47289
47290 @@ -552,7 +552,7 @@ void sync_buffer(int cpu)
47291 /* ignore backtraces if failed to add a sample */
47292 if (state == sb_bt_start) {
47293 state = sb_bt_ignore;
47294 - atomic_inc(&oprofile_stats.bt_lost_no_mapping);
47295 + atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
47296 }
47297 }
47298 release_mm(mm);
47299 diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
47300 index c0cc4e7..44d4e54 100644
47301 --- a/drivers/oprofile/event_buffer.c
47302 +++ b/drivers/oprofile/event_buffer.c
47303 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
47304 }
47305
47306 if (buffer_pos == buffer_size) {
47307 - atomic_inc(&oprofile_stats.event_lost_overflow);
47308 + atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
47309 return;
47310 }
47311
47312 diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
47313 index ed2c3ec..deda85a 100644
47314 --- a/drivers/oprofile/oprof.c
47315 +++ b/drivers/oprofile/oprof.c
47316 @@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
47317 if (oprofile_ops.switch_events())
47318 return;
47319
47320 - atomic_inc(&oprofile_stats.multiplex_counter);
47321 + atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
47322 start_switch_worker();
47323 }
47324
47325 diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
47326 index ee2cfce..7f8f699 100644
47327 --- a/drivers/oprofile/oprofile_files.c
47328 +++ b/drivers/oprofile/oprofile_files.c
47329 @@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
47330
47331 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
47332
47333 -static ssize_t timeout_read(struct file *file, char __user *buf,
47334 +static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
47335 size_t count, loff_t *offset)
47336 {
47337 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
47338 diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
47339 index 59659ce..6c860a0 100644
47340 --- a/drivers/oprofile/oprofile_stats.c
47341 +++ b/drivers/oprofile/oprofile_stats.c
47342 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
47343 cpu_buf->sample_invalid_eip = 0;
47344 }
47345
47346 - atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
47347 - atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
47348 - atomic_set(&oprofile_stats.event_lost_overflow, 0);
47349 - atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
47350 - atomic_set(&oprofile_stats.multiplex_counter, 0);
47351 + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
47352 + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
47353 + atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
47354 + atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
47355 + atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
47356 }
47357
47358
47359 diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
47360 index 1fc622b..8c48fc3 100644
47361 --- a/drivers/oprofile/oprofile_stats.h
47362 +++ b/drivers/oprofile/oprofile_stats.h
47363 @@ -13,11 +13,11 @@
47364 #include <linux/atomic.h>
47365
47366 struct oprofile_stat_struct {
47367 - atomic_t sample_lost_no_mm;
47368 - atomic_t sample_lost_no_mapping;
47369 - atomic_t bt_lost_no_mapping;
47370 - atomic_t event_lost_overflow;
47371 - atomic_t multiplex_counter;
47372 + atomic_unchecked_t sample_lost_no_mm;
47373 + atomic_unchecked_t sample_lost_no_mapping;
47374 + atomic_unchecked_t bt_lost_no_mapping;
47375 + atomic_unchecked_t event_lost_overflow;
47376 + atomic_unchecked_t multiplex_counter;
47377 };
47378
47379 extern struct oprofile_stat_struct oprofile_stats;
47380 diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
47381 index 3f49345..c750d0b 100644
47382 --- a/drivers/oprofile/oprofilefs.c
47383 +++ b/drivers/oprofile/oprofilefs.c
47384 @@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
47385
47386 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
47387 {
47388 - atomic_t *val = file->private_data;
47389 - return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
47390 + atomic_unchecked_t *val = file->private_data;
47391 + return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
47392 }
47393
47394
47395 @@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
47396
47397
47398 int oprofilefs_create_ro_atomic(struct dentry *root,
47399 - char const *name, atomic_t *val)
47400 + char const *name, atomic_unchecked_t *val)
47401 {
47402 return __oprofilefs_create_file(root, name,
47403 &atomic_ro_fops, 0444, val);
47404 diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
47405 index 61be1d9..dec05d7 100644
47406 --- a/drivers/oprofile/timer_int.c
47407 +++ b/drivers/oprofile/timer_int.c
47408 @@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
47409 return NOTIFY_OK;
47410 }
47411
47412 -static struct notifier_block __refdata oprofile_cpu_notifier = {
47413 +static struct notifier_block oprofile_cpu_notifier = {
47414 .notifier_call = oprofile_cpu_notify,
47415 };
47416
47417 diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
47418 index 92ed045..62d39bd7 100644
47419 --- a/drivers/parport/procfs.c
47420 +++ b/drivers/parport/procfs.c
47421 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
47422
47423 *ppos += len;
47424
47425 - return copy_to_user(result, buffer, len) ? -EFAULT : 0;
47426 + return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
47427 }
47428
47429 #ifdef CONFIG_PARPORT_1284
47430 @@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
47431
47432 *ppos += len;
47433
47434 - return copy_to_user (result, buffer, len) ? -EFAULT : 0;
47435 + return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
47436 }
47437 #endif /* IEEE1284.3 support. */
47438
47439 diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
47440 index 8dcccff..35d701d 100644
47441 --- a/drivers/pci/hotplug/acpiphp_ibm.c
47442 +++ b/drivers/pci/hotplug/acpiphp_ibm.c
47443 @@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
47444 goto init_cleanup;
47445 }
47446
47447 - ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
47448 + pax_open_kernel();
47449 + *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
47450 + pax_close_kernel();
47451 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
47452
47453 return retval;
47454 diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
47455 index 7536eef..52dc8fa 100644
47456 --- a/drivers/pci/hotplug/cpcihp_generic.c
47457 +++ b/drivers/pci/hotplug/cpcihp_generic.c
47458 @@ -73,7 +73,6 @@ static u16 port;
47459 static unsigned int enum_bit;
47460 static u8 enum_mask;
47461
47462 -static struct cpci_hp_controller_ops generic_hpc_ops;
47463 static struct cpci_hp_controller generic_hpc;
47464
47465 static int __init validate_parameters(void)
47466 @@ -139,6 +138,10 @@ static int query_enum(void)
47467 return ((value & enum_mask) == enum_mask);
47468 }
47469
47470 +static struct cpci_hp_controller_ops generic_hpc_ops = {
47471 + .query_enum = query_enum,
47472 +};
47473 +
47474 static int __init cpcihp_generic_init(void)
47475 {
47476 int status;
47477 @@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
47478 pci_dev_put(dev);
47479
47480 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
47481 - generic_hpc_ops.query_enum = query_enum;
47482 generic_hpc.ops = &generic_hpc_ops;
47483
47484 status = cpci_hp_register_controller(&generic_hpc);
47485 diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
47486 index e8c4a7c..7046f5c 100644
47487 --- a/drivers/pci/hotplug/cpcihp_zt5550.c
47488 +++ b/drivers/pci/hotplug/cpcihp_zt5550.c
47489 @@ -59,7 +59,6 @@
47490 /* local variables */
47491 static bool debug;
47492 static bool poll;
47493 -static struct cpci_hp_controller_ops zt5550_hpc_ops;
47494 static struct cpci_hp_controller zt5550_hpc;
47495
47496 /* Primary cPCI bus bridge device */
47497 @@ -205,6 +204,10 @@ static int zt5550_hc_disable_irq(void)
47498 return 0;
47499 }
47500
47501 +static struct cpci_hp_controller_ops zt5550_hpc_ops = {
47502 + .query_enum = zt5550_hc_query_enum,
47503 +};
47504 +
47505 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
47506 {
47507 int status;
47508 @@ -216,16 +219,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
47509 dbg("returned from zt5550_hc_config");
47510
47511 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
47512 - zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
47513 zt5550_hpc.ops = &zt5550_hpc_ops;
47514 if(!poll) {
47515 zt5550_hpc.irq = hc_dev->irq;
47516 zt5550_hpc.irq_flags = IRQF_SHARED;
47517 zt5550_hpc.dev_id = hc_dev;
47518
47519 - zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
47520 - zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
47521 - zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
47522 + pax_open_kernel();
47523 + *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
47524 + *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
47525 + *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
47526 + pax_open_kernel();
47527 } else {
47528 info("using ENUM# polling mode");
47529 }
47530 diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
47531 index 76ba8a1..20ca857 100644
47532 --- a/drivers/pci/hotplug/cpqphp_nvram.c
47533 +++ b/drivers/pci/hotplug/cpqphp_nvram.c
47534 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
47535
47536 void compaq_nvram_init (void __iomem *rom_start)
47537 {
47538 +
47539 +#ifndef CONFIG_PAX_KERNEXEC
47540 if (rom_start) {
47541 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
47542 }
47543 +#endif
47544 +
47545 dbg("int15 entry = %p\n", compaq_int15_entry_point);
47546
47547 /* initialize our int15 lock */
47548 diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
47549 index cfa92a9..29539c5 100644
47550 --- a/drivers/pci/hotplug/pci_hotplug_core.c
47551 +++ b/drivers/pci/hotplug/pci_hotplug_core.c
47552 @@ -441,8 +441,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
47553 return -EINVAL;
47554 }
47555
47556 - slot->ops->owner = owner;
47557 - slot->ops->mod_name = mod_name;
47558 + pax_open_kernel();
47559 + *(struct module **)&slot->ops->owner = owner;
47560 + *(const char **)&slot->ops->mod_name = mod_name;
47561 + pax_close_kernel();
47562
47563 mutex_lock(&pci_hp_mutex);
47564 /*
47565 diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
47566 index 53b58de..4479896 100644
47567 --- a/drivers/pci/hotplug/pciehp_core.c
47568 +++ b/drivers/pci/hotplug/pciehp_core.c
47569 @@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
47570 struct slot *slot = ctrl->slot;
47571 struct hotplug_slot *hotplug = NULL;
47572 struct hotplug_slot_info *info = NULL;
47573 - struct hotplug_slot_ops *ops = NULL;
47574 + hotplug_slot_ops_no_const *ops = NULL;
47575 char name[SLOT_NAME_SIZE];
47576 int retval = -ENOMEM;
47577
47578 diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
47579 index 955ab79..d1df9c7 100644
47580 --- a/drivers/pci/msi.c
47581 +++ b/drivers/pci/msi.c
47582 @@ -524,8 +524,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
47583 {
47584 struct attribute **msi_attrs;
47585 struct attribute *msi_attr;
47586 - struct device_attribute *msi_dev_attr;
47587 - struct attribute_group *msi_irq_group;
47588 + device_attribute_no_const *msi_dev_attr;
47589 + attribute_group_no_const *msi_irq_group;
47590 const struct attribute_group **msi_irq_groups;
47591 struct msi_desc *entry;
47592 int ret = -ENOMEM;
47593 @@ -589,7 +589,7 @@ error_attrs:
47594 count = 0;
47595 msi_attr = msi_attrs[count];
47596 while (msi_attr) {
47597 - msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
47598 + msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
47599 kfree(msi_attr->name);
47600 kfree(msi_dev_attr);
47601 ++count;
47602 diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
47603 index 276ef9c..1d33a36 100644
47604 --- a/drivers/pci/pci-sysfs.c
47605 +++ b/drivers/pci/pci-sysfs.c
47606 @@ -1112,7 +1112,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
47607 {
47608 /* allocate attribute structure, piggyback attribute name */
47609 int name_len = write_combine ? 13 : 10;
47610 - struct bin_attribute *res_attr;
47611 + bin_attribute_no_const *res_attr;
47612 int retval;
47613
47614 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
47615 @@ -1297,7 +1297,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
47616 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
47617 {
47618 int retval;
47619 - struct bin_attribute *attr;
47620 + bin_attribute_no_const *attr;
47621
47622 /* If the device has VPD, try to expose it in sysfs. */
47623 if (dev->vpd) {
47624 @@ -1344,7 +1344,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
47625 {
47626 int retval;
47627 int rom_size = 0;
47628 - struct bin_attribute *attr;
47629 + bin_attribute_no_const *attr;
47630
47631 if (!sysfs_initialized)
47632 return -EACCES;
47633 diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
47634 index 4df38df..b6bb7fe 100644
47635 --- a/drivers/pci/pci.h
47636 +++ b/drivers/pci/pci.h
47637 @@ -93,7 +93,7 @@ struct pci_vpd_ops {
47638 struct pci_vpd {
47639 unsigned int len;
47640 const struct pci_vpd_ops *ops;
47641 - struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
47642 + bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
47643 };
47644
47645 int pci_vpd_pci22_init(struct pci_dev *dev);
47646 diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
47647 index e1e7026..d28dd33 100644
47648 --- a/drivers/pci/pcie/aspm.c
47649 +++ b/drivers/pci/pcie/aspm.c
47650 @@ -27,9 +27,9 @@
47651 #define MODULE_PARAM_PREFIX "pcie_aspm."
47652
47653 /* Note: those are not register definitions */
47654 -#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
47655 -#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
47656 -#define ASPM_STATE_L1 (4) /* L1 state */
47657 +#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
47658 +#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
47659 +#define ASPM_STATE_L1 (4U) /* L1 state */
47660 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
47661 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
47662
47663 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
47664 index 6e34498..9911975 100644
47665 --- a/drivers/pci/probe.c
47666 +++ b/drivers/pci/probe.c
47667 @@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
47668 struct pci_bus_region region, inverted_region;
47669 bool bar_too_big = false, bar_disabled = false;
47670
47671 - mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
47672 + mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
47673
47674 /* No printks while decoding is disabled! */
47675 if (!dev->mmio_always_on) {
47676 diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
47677 index 46d1378..30e452b 100644
47678 --- a/drivers/pci/proc.c
47679 +++ b/drivers/pci/proc.c
47680 @@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
47681 static int __init pci_proc_init(void)
47682 {
47683 struct pci_dev *dev = NULL;
47684 +
47685 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
47686 +#ifdef CONFIG_GRKERNSEC_PROC_USER
47687 + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
47688 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
47689 + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
47690 +#endif
47691 +#else
47692 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
47693 +#endif
47694 proc_create("devices", 0, proc_bus_pci_dir,
47695 &proc_bus_pci_dev_operations);
47696 proc_initialized = 1;
47697 diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
47698 index 7f3aad0..7d604bb 100644
47699 --- a/drivers/platform/chrome/chromeos_laptop.c
47700 +++ b/drivers/platform/chrome/chromeos_laptop.c
47701 @@ -406,7 +406,7 @@ static struct chromeos_laptop cr48 = {
47702 .callback = chromeos_laptop_dmi_matched, \
47703 .driver_data = (void *)&board_
47704
47705 -static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = {
47706 +static struct dmi_system_id chromeos_laptop_dmi_table[] __initconst = {
47707 {
47708 .ident = "Samsung Series 5 550",
47709 .matches = {
47710 diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
47711 index c5e082f..d6307a0 100644
47712 --- a/drivers/platform/x86/asus-wmi.c
47713 +++ b/drivers/platform/x86/asus-wmi.c
47714 @@ -1595,6 +1595,10 @@ static int show_dsts(struct seq_file *m, void *data)
47715 int err;
47716 u32 retval = -1;
47717
47718 +#ifdef CONFIG_GRKERNSEC_KMEM
47719 + return -EPERM;
47720 +#endif
47721 +
47722 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
47723
47724 if (err < 0)
47725 @@ -1611,6 +1615,10 @@ static int show_devs(struct seq_file *m, void *data)
47726 int err;
47727 u32 retval = -1;
47728
47729 +#ifdef CONFIG_GRKERNSEC_KMEM
47730 + return -EPERM;
47731 +#endif
47732 +
47733 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
47734 &retval);
47735
47736 @@ -1635,6 +1643,10 @@ static int show_call(struct seq_file *m, void *data)
47737 union acpi_object *obj;
47738 acpi_status status;
47739
47740 +#ifdef CONFIG_GRKERNSEC_KMEM
47741 + return -EPERM;
47742 +#endif
47743 +
47744 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
47745 1, asus->debug.method_id,
47746 &input, &output);
47747 diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
47748 index 62f8030..c7f2a45 100644
47749 --- a/drivers/platform/x86/msi-laptop.c
47750 +++ b/drivers/platform/x86/msi-laptop.c
47751 @@ -1000,12 +1000,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
47752
47753 if (!quirks->ec_read_only) {
47754 /* allow userland write sysfs file */
47755 - dev_attr_bluetooth.store = store_bluetooth;
47756 - dev_attr_wlan.store = store_wlan;
47757 - dev_attr_threeg.store = store_threeg;
47758 - dev_attr_bluetooth.attr.mode |= S_IWUSR;
47759 - dev_attr_wlan.attr.mode |= S_IWUSR;
47760 - dev_attr_threeg.attr.mode |= S_IWUSR;
47761 + pax_open_kernel();
47762 + *(void **)&dev_attr_bluetooth.store = store_bluetooth;
47763 + *(void **)&dev_attr_wlan.store = store_wlan;
47764 + *(void **)&dev_attr_threeg.store = store_threeg;
47765 + *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
47766 + *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
47767 + *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
47768 + pax_close_kernel();
47769 }
47770
47771 /* disable hardware control by fn key */
47772 diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
47773 index 70222f2..8c8ce66 100644
47774 --- a/drivers/platform/x86/msi-wmi.c
47775 +++ b/drivers/platform/x86/msi-wmi.c
47776 @@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
47777 static void msi_wmi_notify(u32 value, void *context)
47778 {
47779 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
47780 - static struct key_entry *key;
47781 + struct key_entry *key;
47782 union acpi_object *obj;
47783 acpi_status status;
47784
47785 diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
47786 index 8f8551a..3ace3ca 100644
47787 --- a/drivers/platform/x86/sony-laptop.c
47788 +++ b/drivers/platform/x86/sony-laptop.c
47789 @@ -2451,7 +2451,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
47790 }
47791
47792 /* High speed charging function */
47793 -static struct device_attribute *hsc_handle;
47794 +static device_attribute_no_const *hsc_handle;
47795
47796 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
47797 struct device_attribute *attr,
47798 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
47799 index defb6af..7a5d3d1 100644
47800 --- a/drivers/platform/x86/thinkpad_acpi.c
47801 +++ b/drivers/platform/x86/thinkpad_acpi.c
47802 @@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
47803 return 0;
47804 }
47805
47806 -void static hotkey_mask_warn_incomplete_mask(void)
47807 +static void hotkey_mask_warn_incomplete_mask(void)
47808 {
47809 /* log only what the user can fix... */
47810 const u32 wantedmask = hotkey_driver_mask &
47811 @@ -2321,11 +2321,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
47812 }
47813 }
47814
47815 -static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
47816 - struct tp_nvram_state *newn,
47817 - const u32 event_mask)
47818 -{
47819 -
47820 #define TPACPI_COMPARE_KEY(__scancode, __member) \
47821 do { \
47822 if ((event_mask & (1 << __scancode)) && \
47823 @@ -2339,36 +2334,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
47824 tpacpi_hotkey_send_key(__scancode); \
47825 } while (0)
47826
47827 - void issue_volchange(const unsigned int oldvol,
47828 - const unsigned int newvol)
47829 - {
47830 - unsigned int i = oldvol;
47831 +static void issue_volchange(const unsigned int oldvol,
47832 + const unsigned int newvol,
47833 + const u32 event_mask)
47834 +{
47835 + unsigned int i = oldvol;
47836
47837 - while (i > newvol) {
47838 - TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
47839 - i--;
47840 - }
47841 - while (i < newvol) {
47842 - TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
47843 - i++;
47844 - }
47845 + while (i > newvol) {
47846 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
47847 + i--;
47848 }
47849 + while (i < newvol) {
47850 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
47851 + i++;
47852 + }
47853 +}
47854
47855 - void issue_brightnesschange(const unsigned int oldbrt,
47856 - const unsigned int newbrt)
47857 - {
47858 - unsigned int i = oldbrt;
47859 +static void issue_brightnesschange(const unsigned int oldbrt,
47860 + const unsigned int newbrt,
47861 + const u32 event_mask)
47862 +{
47863 + unsigned int i = oldbrt;
47864
47865 - while (i > newbrt) {
47866 - TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
47867 - i--;
47868 - }
47869 - while (i < newbrt) {
47870 - TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
47871 - i++;
47872 - }
47873 + while (i > newbrt) {
47874 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
47875 + i--;
47876 + }
47877 + while (i < newbrt) {
47878 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
47879 + i++;
47880 }
47881 +}
47882
47883 +static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
47884 + struct tp_nvram_state *newn,
47885 + const u32 event_mask)
47886 +{
47887 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
47888 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
47889 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
47890 @@ -2402,7 +2403,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
47891 oldn->volume_level != newn->volume_level) {
47892 /* recently muted, or repeated mute keypress, or
47893 * multiple presses ending in mute */
47894 - issue_volchange(oldn->volume_level, newn->volume_level);
47895 + issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
47896 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
47897 }
47898 } else {
47899 @@ -2412,7 +2413,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
47900 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
47901 }
47902 if (oldn->volume_level != newn->volume_level) {
47903 - issue_volchange(oldn->volume_level, newn->volume_level);
47904 + issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
47905 } else if (oldn->volume_toggle != newn->volume_toggle) {
47906 /* repeated vol up/down keypress at end of scale ? */
47907 if (newn->volume_level == 0)
47908 @@ -2425,7 +2426,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
47909 /* handle brightness */
47910 if (oldn->brightness_level != newn->brightness_level) {
47911 issue_brightnesschange(oldn->brightness_level,
47912 - newn->brightness_level);
47913 + newn->brightness_level,
47914 + event_mask);
47915 } else if (oldn->brightness_toggle != newn->brightness_toggle) {
47916 /* repeated key presses that didn't change state */
47917 if (newn->brightness_level == 0)
47918 @@ -2434,10 +2436,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
47919 && !tp_features.bright_unkfw)
47920 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
47921 }
47922 +}
47923
47924 #undef TPACPI_COMPARE_KEY
47925 #undef TPACPI_MAY_SEND_KEY
47926 -}
47927
47928 /*
47929 * Polling driver
47930 diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
47931 index 769d265..a3a05ca 100644
47932 --- a/drivers/pnp/pnpbios/bioscalls.c
47933 +++ b/drivers/pnp/pnpbios/bioscalls.c
47934 @@ -58,7 +58,7 @@ do { \
47935 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
47936 } while(0)
47937
47938 -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
47939 +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
47940 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
47941
47942 /*
47943 @@ -95,7 +95,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
47944
47945 cpu = get_cpu();
47946 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
47947 +
47948 + pax_open_kernel();
47949 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
47950 + pax_close_kernel();
47951
47952 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
47953 spin_lock_irqsave(&pnp_bios_lock, flags);
47954 @@ -133,7 +136,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
47955 :"memory");
47956 spin_unlock_irqrestore(&pnp_bios_lock, flags);
47957
47958 + pax_open_kernel();
47959 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
47960 + pax_close_kernel();
47961 +
47962 put_cpu();
47963
47964 /* If we get here and this is set then the PnP BIOS faulted on us. */
47965 @@ -467,7 +473,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
47966 return status;
47967 }
47968
47969 -void pnpbios_calls_init(union pnp_bios_install_struct *header)
47970 +void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
47971 {
47972 int i;
47973
47974 @@ -475,6 +481,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
47975 pnp_bios_callpoint.offset = header->fields.pm16offset;
47976 pnp_bios_callpoint.segment = PNP_CS16;
47977
47978 + pax_open_kernel();
47979 +
47980 for_each_possible_cpu(i) {
47981 struct desc_struct *gdt = get_cpu_gdt_table(i);
47982 if (!gdt)
47983 @@ -486,4 +494,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
47984 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
47985 (unsigned long)__va(header->fields.pm16dseg));
47986 }
47987 +
47988 + pax_close_kernel();
47989 }
47990 diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
47991 index bacddd1..65ea100 100644
47992 --- a/drivers/pnp/resource.c
47993 +++ b/drivers/pnp/resource.c
47994 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
47995 return 1;
47996
47997 /* check if the resource is valid */
47998 - if (*irq < 0 || *irq > 15)
47999 + if (*irq > 15)
48000 return 0;
48001
48002 /* check if the resource is reserved */
48003 @@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
48004 return 1;
48005
48006 /* check if the resource is valid */
48007 - if (*dma < 0 || *dma == 4 || *dma > 7)
48008 + if (*dma == 4 || *dma > 7)
48009 return 0;
48010
48011 /* check if the resource is reserved */
48012 diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
48013 index 0c52e2a..3421ab7 100644
48014 --- a/drivers/power/pda_power.c
48015 +++ b/drivers/power/pda_power.c
48016 @@ -37,7 +37,11 @@ static int polling;
48017
48018 #if IS_ENABLED(CONFIG_USB_PHY)
48019 static struct usb_phy *transceiver;
48020 -static struct notifier_block otg_nb;
48021 +static int otg_handle_notification(struct notifier_block *nb,
48022 + unsigned long event, void *unused);
48023 +static struct notifier_block otg_nb = {
48024 + .notifier_call = otg_handle_notification
48025 +};
48026 #endif
48027
48028 static struct regulator *ac_draw;
48029 @@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
48030
48031 #if IS_ENABLED(CONFIG_USB_PHY)
48032 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
48033 - otg_nb.notifier_call = otg_handle_notification;
48034 ret = usb_register_notifier(transceiver, &otg_nb);
48035 if (ret) {
48036 dev_err(dev, "failure to register otg notifier\n");
48037 diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
48038 index cc439fd..8fa30df 100644
48039 --- a/drivers/power/power_supply.h
48040 +++ b/drivers/power/power_supply.h
48041 @@ -16,12 +16,12 @@ struct power_supply;
48042
48043 #ifdef CONFIG_SYSFS
48044
48045 -extern void power_supply_init_attrs(struct device_type *dev_type);
48046 +extern void power_supply_init_attrs(void);
48047 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
48048
48049 #else
48050
48051 -static inline void power_supply_init_attrs(struct device_type *dev_type) {}
48052 +static inline void power_supply_init_attrs(void) {}
48053 #define power_supply_uevent NULL
48054
48055 #endif /* CONFIG_SYSFS */
48056 diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
48057 index 2660664..75fcb04 100644
48058 --- a/drivers/power/power_supply_core.c
48059 +++ b/drivers/power/power_supply_core.c
48060 @@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
48061 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
48062 EXPORT_SYMBOL_GPL(power_supply_notifier);
48063
48064 -static struct device_type power_supply_dev_type;
48065 +extern const struct attribute_group *power_supply_attr_groups[];
48066 +static struct device_type power_supply_dev_type = {
48067 + .groups = power_supply_attr_groups,
48068 +};
48069
48070 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
48071 struct power_supply *supply)
48072 @@ -628,7 +631,7 @@ static int __init power_supply_class_init(void)
48073 return PTR_ERR(power_supply_class);
48074
48075 power_supply_class->dev_uevent = power_supply_uevent;
48076 - power_supply_init_attrs(&power_supply_dev_type);
48077 + power_supply_init_attrs();
48078
48079 return 0;
48080 }
48081 diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
48082 index 44420d1..967126e 100644
48083 --- a/drivers/power/power_supply_sysfs.c
48084 +++ b/drivers/power/power_supply_sysfs.c
48085 @@ -230,17 +230,15 @@ static struct attribute_group power_supply_attr_group = {
48086 .is_visible = power_supply_attr_is_visible,
48087 };
48088
48089 -static const struct attribute_group *power_supply_attr_groups[] = {
48090 +const struct attribute_group *power_supply_attr_groups[] = {
48091 &power_supply_attr_group,
48092 NULL,
48093 };
48094
48095 -void power_supply_init_attrs(struct device_type *dev_type)
48096 +void power_supply_init_attrs(void)
48097 {
48098 int i;
48099
48100 - dev_type->groups = power_supply_attr_groups;
48101 -
48102 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
48103 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
48104 }
48105 diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
48106 index 84419af..268ede8 100644
48107 --- a/drivers/powercap/powercap_sys.c
48108 +++ b/drivers/powercap/powercap_sys.c
48109 @@ -154,8 +154,77 @@ struct powercap_constraint_attr {
48110 struct device_attribute name_attr;
48111 };
48112
48113 +static ssize_t show_constraint_name(struct device *dev,
48114 + struct device_attribute *dev_attr,
48115 + char *buf);
48116 +
48117 static struct powercap_constraint_attr
48118 - constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
48119 + constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
48120 + [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
48121 + .power_limit_attr = {
48122 + .attr = {
48123 + .name = NULL,
48124 + .mode = S_IWUSR | S_IRUGO
48125 + },
48126 + .show = show_constraint_power_limit_uw,
48127 + .store = store_constraint_power_limit_uw
48128 + },
48129 +
48130 + .time_window_attr = {
48131 + .attr = {
48132 + .name = NULL,
48133 + .mode = S_IWUSR | S_IRUGO
48134 + },
48135 + .show = show_constraint_time_window_us,
48136 + .store = store_constraint_time_window_us
48137 + },
48138 +
48139 + .max_power_attr = {
48140 + .attr = {
48141 + .name = NULL,
48142 + .mode = S_IRUGO
48143 + },
48144 + .show = show_constraint_max_power_uw,
48145 + .store = NULL
48146 + },
48147 +
48148 + .min_power_attr = {
48149 + .attr = {
48150 + .name = NULL,
48151 + .mode = S_IRUGO
48152 + },
48153 + .show = show_constraint_min_power_uw,
48154 + .store = NULL
48155 + },
48156 +
48157 + .max_time_window_attr = {
48158 + .attr = {
48159 + .name = NULL,
48160 + .mode = S_IRUGO
48161 + },
48162 + .show = show_constraint_max_time_window_us,
48163 + .store = NULL
48164 + },
48165 +
48166 + .min_time_window_attr = {
48167 + .attr = {
48168 + .name = NULL,
48169 + .mode = S_IRUGO
48170 + },
48171 + .show = show_constraint_min_time_window_us,
48172 + .store = NULL
48173 + },
48174 +
48175 + .name_attr = {
48176 + .attr = {
48177 + .name = NULL,
48178 + .mode = S_IRUGO
48179 + },
48180 + .show = show_constraint_name,
48181 + .store = NULL
48182 + }
48183 + }
48184 +};
48185
48186 /* A list of powercap control_types */
48187 static LIST_HEAD(powercap_cntrl_list);
48188 @@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
48189 }
48190
48191 static int create_constraint_attribute(int id, const char *name,
48192 - int mode,
48193 - struct device_attribute *dev_attr,
48194 - ssize_t (*show)(struct device *,
48195 - struct device_attribute *, char *),
48196 - ssize_t (*store)(struct device *,
48197 - struct device_attribute *,
48198 - const char *, size_t)
48199 - )
48200 + struct device_attribute *dev_attr)
48201 {
48202 + name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
48203
48204 - dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
48205 - id, name);
48206 - if (!dev_attr->attr.name)
48207 + if (!name)
48208 return -ENOMEM;
48209 - dev_attr->attr.mode = mode;
48210 - dev_attr->show = show;
48211 - dev_attr->store = store;
48212 +
48213 + pax_open_kernel();
48214 + *(const char **)&dev_attr->attr.name = name;
48215 + pax_close_kernel();
48216
48217 return 0;
48218 }
48219 @@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
48220
48221 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
48222 ret = create_constraint_attribute(i, "power_limit_uw",
48223 - S_IWUSR | S_IRUGO,
48224 - &constraint_attrs[i].power_limit_attr,
48225 - show_constraint_power_limit_uw,
48226 - store_constraint_power_limit_uw);
48227 + &constraint_attrs[i].power_limit_attr);
48228 if (ret)
48229 goto err_alloc;
48230 ret = create_constraint_attribute(i, "time_window_us",
48231 - S_IWUSR | S_IRUGO,
48232 - &constraint_attrs[i].time_window_attr,
48233 - show_constraint_time_window_us,
48234 - store_constraint_time_window_us);
48235 + &constraint_attrs[i].time_window_attr);
48236 if (ret)
48237 goto err_alloc;
48238 - ret = create_constraint_attribute(i, "name", S_IRUGO,
48239 - &constraint_attrs[i].name_attr,
48240 - show_constraint_name,
48241 - NULL);
48242 + ret = create_constraint_attribute(i, "name",
48243 + &constraint_attrs[i].name_attr);
48244 if (ret)
48245 goto err_alloc;
48246 - ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
48247 - &constraint_attrs[i].max_power_attr,
48248 - show_constraint_max_power_uw,
48249 - NULL);
48250 + ret = create_constraint_attribute(i, "max_power_uw",
48251 + &constraint_attrs[i].max_power_attr);
48252 if (ret)
48253 goto err_alloc;
48254 - ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
48255 - &constraint_attrs[i].min_power_attr,
48256 - show_constraint_min_power_uw,
48257 - NULL);
48258 + ret = create_constraint_attribute(i, "min_power_uw",
48259 + &constraint_attrs[i].min_power_attr);
48260 if (ret)
48261 goto err_alloc;
48262 ret = create_constraint_attribute(i, "max_time_window_us",
48263 - S_IRUGO,
48264 - &constraint_attrs[i].max_time_window_attr,
48265 - show_constraint_max_time_window_us,
48266 - NULL);
48267 + &constraint_attrs[i].max_time_window_attr);
48268 if (ret)
48269 goto err_alloc;
48270 ret = create_constraint_attribute(i, "min_time_window_us",
48271 - S_IRUGO,
48272 - &constraint_attrs[i].min_time_window_attr,
48273 - show_constraint_min_time_window_us,
48274 - NULL);
48275 + &constraint_attrs[i].min_time_window_attr);
48276 if (ret)
48277 goto err_alloc;
48278
48279 @@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
48280 power_zone->zone_dev_attrs[count++] =
48281 &dev_attr_max_energy_range_uj.attr;
48282 if (power_zone->ops->get_energy_uj) {
48283 + pax_open_kernel();
48284 if (power_zone->ops->reset_energy_uj)
48285 - dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
48286 + *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
48287 else
48288 - dev_attr_energy_uj.attr.mode = S_IRUGO;
48289 + *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
48290 + pax_close_kernel();
48291 power_zone->zone_dev_attrs[count++] =
48292 &dev_attr_energy_uj.attr;
48293 }
48294 diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
48295 index afca1bc..86840b8 100644
48296 --- a/drivers/regulator/core.c
48297 +++ b/drivers/regulator/core.c
48298 @@ -3366,7 +3366,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
48299 {
48300 const struct regulation_constraints *constraints = NULL;
48301 const struct regulator_init_data *init_data;
48302 - static atomic_t regulator_no = ATOMIC_INIT(0);
48303 + static atomic_unchecked_t regulator_no = ATOMIC_INIT(0);
48304 struct regulator_dev *rdev;
48305 struct device *dev;
48306 int ret, i;
48307 @@ -3436,7 +3436,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
48308 rdev->dev.of_node = config->of_node;
48309 rdev->dev.parent = dev;
48310 dev_set_name(&rdev->dev, "regulator.%d",
48311 - atomic_inc_return(&regulator_no) - 1);
48312 + atomic_inc_return_unchecked(&regulator_no) - 1);
48313 ret = device_register(&rdev->dev);
48314 if (ret != 0) {
48315 put_device(&rdev->dev);
48316 diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
48317 index 8d94d3d..653b623 100644
48318 --- a/drivers/regulator/max8660.c
48319 +++ b/drivers/regulator/max8660.c
48320 @@ -420,8 +420,10 @@ static int max8660_probe(struct i2c_client *client,
48321 max8660->shadow_regs[MAX8660_OVER1] = 5;
48322 } else {
48323 /* Otherwise devices can be toggled via software */
48324 - max8660_dcdc_ops.enable = max8660_dcdc_enable;
48325 - max8660_dcdc_ops.disable = max8660_dcdc_disable;
48326 + pax_open_kernel();
48327 + *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
48328 + *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
48329 + pax_close_kernel();
48330 }
48331
48332 /*
48333 diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
48334 index 892aa1e..ebd1b9c 100644
48335 --- a/drivers/regulator/max8973-regulator.c
48336 +++ b/drivers/regulator/max8973-regulator.c
48337 @@ -406,9 +406,11 @@ static int max8973_probe(struct i2c_client *client,
48338 if (!pdata || !pdata->enable_ext_control) {
48339 max->desc.enable_reg = MAX8973_VOUT;
48340 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
48341 - max->ops.enable = regulator_enable_regmap;
48342 - max->ops.disable = regulator_disable_regmap;
48343 - max->ops.is_enabled = regulator_is_enabled_regmap;
48344 + pax_open_kernel();
48345 + *(void **)&max->ops.enable = regulator_enable_regmap;
48346 + *(void **)&max->ops.disable = regulator_disable_regmap;
48347 + *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
48348 + pax_close_kernel();
48349 }
48350
48351 if (pdata) {
48352 diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
48353 index f374fa5..26f0683 100644
48354 --- a/drivers/regulator/mc13892-regulator.c
48355 +++ b/drivers/regulator/mc13892-regulator.c
48356 @@ -582,10 +582,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
48357 }
48358 mc13xxx_unlock(mc13892);
48359
48360 - mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
48361 + pax_open_kernel();
48362 + *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
48363 = mc13892_vcam_set_mode;
48364 - mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
48365 + *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
48366 = mc13892_vcam_get_mode;
48367 + pax_close_kernel();
48368
48369 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
48370 ARRAY_SIZE(mc13892_regulators));
48371 diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
48372 index cae212f..58a3980 100644
48373 --- a/drivers/rtc/rtc-cmos.c
48374 +++ b/drivers/rtc/rtc-cmos.c
48375 @@ -777,7 +777,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
48376 hpet_rtc_timer_init();
48377
48378 /* export at least the first block of NVRAM */
48379 - nvram.size = address_space - NVRAM_OFFSET;
48380 + pax_open_kernel();
48381 + *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
48382 + pax_close_kernel();
48383 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
48384 if (retval < 0) {
48385 dev_dbg(dev, "can't create nvram file? %d\n", retval);
48386 diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
48387 index d049393..bb20be0 100644
48388 --- a/drivers/rtc/rtc-dev.c
48389 +++ b/drivers/rtc/rtc-dev.c
48390 @@ -16,6 +16,7 @@
48391 #include <linux/module.h>
48392 #include <linux/rtc.h>
48393 #include <linux/sched.h>
48394 +#include <linux/grsecurity.h>
48395 #include "rtc-core.h"
48396
48397 static dev_t rtc_devt;
48398 @@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
48399 if (copy_from_user(&tm, uarg, sizeof(tm)))
48400 return -EFAULT;
48401
48402 + gr_log_timechange();
48403 +
48404 return rtc_set_time(rtc, &tm);
48405
48406 case RTC_PIE_ON:
48407 diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
48408 index 4e75345..09f8663 100644
48409 --- a/drivers/rtc/rtc-ds1307.c
48410 +++ b/drivers/rtc/rtc-ds1307.c
48411 @@ -107,7 +107,7 @@ struct ds1307 {
48412 u8 offset; /* register's offset */
48413 u8 regs[11];
48414 u16 nvram_offset;
48415 - struct bin_attribute *nvram;
48416 + bin_attribute_no_const *nvram;
48417 enum ds_type type;
48418 unsigned long flags;
48419 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
48420 diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
48421 index 11880c1..b823aa4 100644
48422 --- a/drivers/rtc/rtc-m48t59.c
48423 +++ b/drivers/rtc/rtc-m48t59.c
48424 @@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
48425 if (IS_ERR(m48t59->rtc))
48426 return PTR_ERR(m48t59->rtc);
48427
48428 - m48t59_nvram_attr.size = pdata->offset;
48429 + pax_open_kernel();
48430 + *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
48431 + pax_close_kernel();
48432
48433 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
48434 if (ret)
48435 diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
48436 index 14b5f8d..cc9bd26 100644
48437 --- a/drivers/scsi/aic7xxx/aic79xx_pci.c
48438 +++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
48439 @@ -827,7 +827,7 @@ ahd_pci_intr(struct ahd_softc *ahd)
48440 for (bit = 0; bit < 8; bit++) {
48441
48442 if ((pci_status[i] & (0x1 << bit)) != 0) {
48443 - static const char *s;
48444 + const char *s;
48445
48446 s = pci_status_strings[bit];
48447 if (i == 7/*TARG*/ && bit == 3)
48448 @@ -887,23 +887,15 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat)
48449
48450 for (bit = 0; bit < 8; bit++) {
48451
48452 - if ((split_status[i] & (0x1 << bit)) != 0) {
48453 - static const char *s;
48454 -
48455 - s = split_status_strings[bit];
48456 - printk(s, ahd_name(ahd),
48457 + if ((split_status[i] & (0x1 << bit)) != 0)
48458 + printk(split_status_strings[bit], ahd_name(ahd),
48459 split_status_source[i]);
48460 - }
48461
48462 if (i > 1)
48463 continue;
48464
48465 - if ((sg_split_status[i] & (0x1 << bit)) != 0) {
48466 - static const char *s;
48467 -
48468 - s = split_status_strings[bit];
48469 - printk(s, ahd_name(ahd), "SG");
48470 - }
48471 + if ((sg_split_status[i] & (0x1 << bit)) != 0)
48472 + printk(split_status_strings[bit], ahd_name(ahd), "SG");
48473 }
48474 }
48475 /*
48476 diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
48477 index e693af6..2e525b6 100644
48478 --- a/drivers/scsi/bfa/bfa_fcpim.h
48479 +++ b/drivers/scsi/bfa/bfa_fcpim.h
48480 @@ -36,7 +36,7 @@ struct bfa_iotag_s {
48481
48482 struct bfa_itn_s {
48483 bfa_isr_func_t isr;
48484 -};
48485 +} __no_const;
48486
48487 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
48488 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
48489 diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
48490 index a3ab5cc..8143622 100644
48491 --- a/drivers/scsi/bfa/bfa_fcs.c
48492 +++ b/drivers/scsi/bfa/bfa_fcs.c
48493 @@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
48494 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
48495
48496 static struct bfa_fcs_mod_s fcs_modules[] = {
48497 - { bfa_fcs_port_attach, NULL, NULL },
48498 - { bfa_fcs_uf_attach, NULL, NULL },
48499 - { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
48500 - bfa_fcs_fabric_modexit },
48501 + {
48502 + .attach = bfa_fcs_port_attach,
48503 + .modinit = NULL,
48504 + .modexit = NULL
48505 + },
48506 + {
48507 + .attach = bfa_fcs_uf_attach,
48508 + .modinit = NULL,
48509 + .modexit = NULL
48510 + },
48511 + {
48512 + .attach = bfa_fcs_fabric_attach,
48513 + .modinit = bfa_fcs_fabric_modinit,
48514 + .modexit = bfa_fcs_fabric_modexit
48515 + },
48516 };
48517
48518 /*
48519 diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
48520 index ff75ef8..2dfe00a 100644
48521 --- a/drivers/scsi/bfa/bfa_fcs_lport.c
48522 +++ b/drivers/scsi/bfa/bfa_fcs_lport.c
48523 @@ -89,15 +89,26 @@ static struct {
48524 void (*offline) (struct bfa_fcs_lport_s *port);
48525 } __port_action[] = {
48526 {
48527 - bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
48528 - bfa_fcs_lport_unknown_offline}, {
48529 - bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
48530 - bfa_fcs_lport_fab_offline}, {
48531 - bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
48532 - bfa_fcs_lport_n2n_offline}, {
48533 - bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
48534 - bfa_fcs_lport_loop_offline},
48535 - };
48536 + .init = bfa_fcs_lport_unknown_init,
48537 + .online = bfa_fcs_lport_unknown_online,
48538 + .offline = bfa_fcs_lport_unknown_offline
48539 + },
48540 + {
48541 + .init = bfa_fcs_lport_fab_init,
48542 + .online = bfa_fcs_lport_fab_online,
48543 + .offline = bfa_fcs_lport_fab_offline
48544 + },
48545 + {
48546 + .init = bfa_fcs_lport_n2n_init,
48547 + .online = bfa_fcs_lport_n2n_online,
48548 + .offline = bfa_fcs_lport_n2n_offline
48549 + },
48550 + {
48551 + .init = bfa_fcs_lport_loop_init,
48552 + .online = bfa_fcs_lport_loop_online,
48553 + .offline = bfa_fcs_lport_loop_offline
48554 + },
48555 +};
48556
48557 /*
48558 * fcs_port_sm FCS logical port state machine
48559 diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
48560 index 2e28392..9d865b6 100644
48561 --- a/drivers/scsi/bfa/bfa_ioc.h
48562 +++ b/drivers/scsi/bfa/bfa_ioc.h
48563 @@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
48564 bfa_ioc_disable_cbfn_t disable_cbfn;
48565 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
48566 bfa_ioc_reset_cbfn_t reset_cbfn;
48567 -};
48568 +} __no_const;
48569
48570 /*
48571 * IOC event notification mechanism.
48572 @@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
48573 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
48574 enum bfi_ioc_state fwstate);
48575 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
48576 -};
48577 +} __no_const;
48578
48579 /*
48580 * Queue element to wait for room in request queue. FIFO order is
48581 diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
48582 index a14c784..6de6790 100644
48583 --- a/drivers/scsi/bfa/bfa_modules.h
48584 +++ b/drivers/scsi/bfa/bfa_modules.h
48585 @@ -78,12 +78,12 @@ enum {
48586 \
48587 extern struct bfa_module_s hal_mod_ ## __mod; \
48588 struct bfa_module_s hal_mod_ ## __mod = { \
48589 - bfa_ ## __mod ## _meminfo, \
48590 - bfa_ ## __mod ## _attach, \
48591 - bfa_ ## __mod ## _detach, \
48592 - bfa_ ## __mod ## _start, \
48593 - bfa_ ## __mod ## _stop, \
48594 - bfa_ ## __mod ## _iocdisable, \
48595 + .meminfo = bfa_ ## __mod ## _meminfo, \
48596 + .attach = bfa_ ## __mod ## _attach, \
48597 + .detach = bfa_ ## __mod ## _detach, \
48598 + .start = bfa_ ## __mod ## _start, \
48599 + .stop = bfa_ ## __mod ## _stop, \
48600 + .iocdisable = bfa_ ## __mod ## _iocdisable, \
48601 }
48602
48603 #define BFA_CACHELINE_SZ (256)
48604 diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
48605 index 045c4e1..13de803 100644
48606 --- a/drivers/scsi/fcoe/fcoe_sysfs.c
48607 +++ b/drivers/scsi/fcoe/fcoe_sysfs.c
48608 @@ -33,8 +33,8 @@
48609 */
48610 #include "libfcoe.h"
48611
48612 -static atomic_t ctlr_num;
48613 -static atomic_t fcf_num;
48614 +static atomic_unchecked_t ctlr_num;
48615 +static atomic_unchecked_t fcf_num;
48616
48617 /*
48618 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
48619 @@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
48620 if (!ctlr)
48621 goto out;
48622
48623 - ctlr->id = atomic_inc_return(&ctlr_num) - 1;
48624 + ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
48625 ctlr->f = f;
48626 ctlr->mode = FIP_CONN_TYPE_FABRIC;
48627 INIT_LIST_HEAD(&ctlr->fcfs);
48628 @@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
48629 fcf->dev.parent = &ctlr->dev;
48630 fcf->dev.bus = &fcoe_bus_type;
48631 fcf->dev.type = &fcoe_fcf_device_type;
48632 - fcf->id = atomic_inc_return(&fcf_num) - 1;
48633 + fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
48634 fcf->state = FCOE_FCF_STATE_UNKNOWN;
48635
48636 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
48637 @@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
48638 {
48639 int error;
48640
48641 - atomic_set(&ctlr_num, 0);
48642 - atomic_set(&fcf_num, 0);
48643 + atomic_set_unchecked(&ctlr_num, 0);
48644 + atomic_set_unchecked(&fcf_num, 0);
48645
48646 error = bus_register(&fcoe_bus_type);
48647 if (error)
48648 diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
48649 index f28ea07..34b16d3 100644
48650 --- a/drivers/scsi/hosts.c
48651 +++ b/drivers/scsi/hosts.c
48652 @@ -42,7 +42,7 @@
48653 #include "scsi_logging.h"
48654
48655
48656 -static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
48657 +static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
48658
48659
48660 static void scsi_host_cls_release(struct device *dev)
48661 @@ -369,7 +369,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
48662 * subtract one because we increment first then return, but we need to
48663 * know what the next host number was before increment
48664 */
48665 - shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
48666 + shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
48667 shost->dma_channel = 0xff;
48668
48669 /* These three are default values which can be overridden */
48670 diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
48671 index 868318a..e07ef3b 100644
48672 --- a/drivers/scsi/hpsa.c
48673 +++ b/drivers/scsi/hpsa.c
48674 @@ -571,7 +571,7 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
48675 unsigned long flags;
48676
48677 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
48678 - return h->access.command_completed(h, q);
48679 + return h->access->command_completed(h, q);
48680
48681 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
48682 a = rq->head[rq->current_entry];
48683 @@ -3474,7 +3474,7 @@ static void start_io(struct ctlr_info *h)
48684 while (!list_empty(&h->reqQ)) {
48685 c = list_entry(h->reqQ.next, struct CommandList, list);
48686 /* can't do anything if fifo is full */
48687 - if ((h->access.fifo_full(h))) {
48688 + if ((h->access->fifo_full(h))) {
48689 h->fifo_recently_full = 1;
48690 dev_warn(&h->pdev->dev, "fifo full\n");
48691 break;
48692 @@ -3498,7 +3498,7 @@ static void start_io(struct ctlr_info *h)
48693
48694 /* Tell the controller execute command */
48695 spin_unlock_irqrestore(&h->lock, flags);
48696 - h->access.submit_command(h, c);
48697 + h->access->submit_command(h, c);
48698 spin_lock_irqsave(&h->lock, flags);
48699 }
48700 spin_unlock_irqrestore(&h->lock, flags);
48701 @@ -3506,17 +3506,17 @@ static void start_io(struct ctlr_info *h)
48702
48703 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
48704 {
48705 - return h->access.command_completed(h, q);
48706 + return h->access->command_completed(h, q);
48707 }
48708
48709 static inline bool interrupt_pending(struct ctlr_info *h)
48710 {
48711 - return h->access.intr_pending(h);
48712 + return h->access->intr_pending(h);
48713 }
48714
48715 static inline long interrupt_not_for_us(struct ctlr_info *h)
48716 {
48717 - return (h->access.intr_pending(h) == 0) ||
48718 + return (h->access->intr_pending(h) == 0) ||
48719 (h->interrupts_enabled == 0);
48720 }
48721
48722 @@ -4442,7 +4442,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
48723 if (prod_index < 0)
48724 return -ENODEV;
48725 h->product_name = products[prod_index].product_name;
48726 - h->access = *(products[prod_index].access);
48727 + h->access = products[prod_index].access;
48728
48729 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
48730 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
48731 @@ -4712,7 +4712,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
48732 {
48733 unsigned long flags;
48734
48735 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
48736 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
48737 spin_lock_irqsave(&h->lock, flags);
48738 h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
48739 spin_unlock_irqrestore(&h->lock, flags);
48740 @@ -4843,7 +4843,7 @@ reinit_after_soft_reset:
48741 }
48742
48743 /* make sure the board interrupts are off */
48744 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
48745 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
48746
48747 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
48748 goto clean2;
48749 @@ -4877,7 +4877,7 @@ reinit_after_soft_reset:
48750 * fake ones to scoop up any residual completions.
48751 */
48752 spin_lock_irqsave(&h->lock, flags);
48753 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
48754 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
48755 spin_unlock_irqrestore(&h->lock, flags);
48756 free_irqs(h);
48757 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
48758 @@ -4896,9 +4896,9 @@ reinit_after_soft_reset:
48759 dev_info(&h->pdev->dev, "Board READY.\n");
48760 dev_info(&h->pdev->dev,
48761 "Waiting for stale completions to drain.\n");
48762 - h->access.set_intr_mask(h, HPSA_INTR_ON);
48763 + h->access->set_intr_mask(h, HPSA_INTR_ON);
48764 msleep(10000);
48765 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
48766 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
48767
48768 rc = controller_reset_failed(h->cfgtable);
48769 if (rc)
48770 @@ -4919,7 +4919,7 @@ reinit_after_soft_reset:
48771 }
48772
48773 /* Turn the interrupts on so we can service requests */
48774 - h->access.set_intr_mask(h, HPSA_INTR_ON);
48775 + h->access->set_intr_mask(h, HPSA_INTR_ON);
48776
48777 hpsa_hba_inquiry(h);
48778 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
48779 @@ -4988,7 +4988,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
48780 * To write all data in the battery backed cache to disks
48781 */
48782 hpsa_flush_cache(h);
48783 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
48784 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
48785 hpsa_free_irqs_and_disable_msix(h);
48786 }
48787
48788 @@ -5162,7 +5162,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 use_short_tags)
48789 return;
48790 }
48791 /* Change the access methods to the performant access methods */
48792 - h->access = SA5_performant_access;
48793 + h->access = &SA5_performant_access;
48794 h->transMethod = CFGTBL_Trans_Performant;
48795 }
48796
48797 diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
48798 index 01c3283..4655219 100644
48799 --- a/drivers/scsi/hpsa.h
48800 +++ b/drivers/scsi/hpsa.h
48801 @@ -79,7 +79,7 @@ struct ctlr_info {
48802 unsigned int msix_vector;
48803 unsigned int msi_vector;
48804 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
48805 - struct access_method access;
48806 + struct access_method *access;
48807
48808 /* queue and queue Info */
48809 struct list_head reqQ;
48810 @@ -388,19 +388,19 @@ static bool SA5_performant_intr_pending(struct ctlr_info *h)
48811 }
48812
48813 static struct access_method SA5_access = {
48814 - SA5_submit_command,
48815 - SA5_intr_mask,
48816 - SA5_fifo_full,
48817 - SA5_intr_pending,
48818 - SA5_completed,
48819 + .submit_command = SA5_submit_command,
48820 + .set_intr_mask = SA5_intr_mask,
48821 + .fifo_full = SA5_fifo_full,
48822 + .intr_pending = SA5_intr_pending,
48823 + .command_completed = SA5_completed,
48824 };
48825
48826 static struct access_method SA5_performant_access = {
48827 - SA5_submit_command,
48828 - SA5_performant_intr_mask,
48829 - SA5_fifo_full,
48830 - SA5_performant_intr_pending,
48831 - SA5_performant_completed,
48832 + .submit_command = SA5_submit_command,
48833 + .set_intr_mask = SA5_performant_intr_mask,
48834 + .fifo_full = SA5_fifo_full,
48835 + .intr_pending = SA5_performant_intr_pending,
48836 + .command_completed = SA5_performant_completed,
48837 };
48838
48839 struct board_type {
48840 diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
48841 index 1b3a094..068e683 100644
48842 --- a/drivers/scsi/libfc/fc_exch.c
48843 +++ b/drivers/scsi/libfc/fc_exch.c
48844 @@ -101,12 +101,12 @@ struct fc_exch_mgr {
48845 u16 pool_max_index;
48846
48847 struct {
48848 - atomic_t no_free_exch;
48849 - atomic_t no_free_exch_xid;
48850 - atomic_t xid_not_found;
48851 - atomic_t xid_busy;
48852 - atomic_t seq_not_found;
48853 - atomic_t non_bls_resp;
48854 + atomic_unchecked_t no_free_exch;
48855 + atomic_unchecked_t no_free_exch_xid;
48856 + atomic_unchecked_t xid_not_found;
48857 + atomic_unchecked_t xid_busy;
48858 + atomic_unchecked_t seq_not_found;
48859 + atomic_unchecked_t non_bls_resp;
48860 } stats;
48861 };
48862
48863 @@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
48864 /* allocate memory for exchange */
48865 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
48866 if (!ep) {
48867 - atomic_inc(&mp->stats.no_free_exch);
48868 + atomic_inc_unchecked(&mp->stats.no_free_exch);
48869 goto out;
48870 }
48871 memset(ep, 0, sizeof(*ep));
48872 @@ -874,7 +874,7 @@ out:
48873 return ep;
48874 err:
48875 spin_unlock_bh(&pool->lock);
48876 - atomic_inc(&mp->stats.no_free_exch_xid);
48877 + atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
48878 mempool_free(ep, mp->ep_pool);
48879 return NULL;
48880 }
48881 @@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
48882 xid = ntohs(fh->fh_ox_id); /* we originated exch */
48883 ep = fc_exch_find(mp, xid);
48884 if (!ep) {
48885 - atomic_inc(&mp->stats.xid_not_found);
48886 + atomic_inc_unchecked(&mp->stats.xid_not_found);
48887 reject = FC_RJT_OX_ID;
48888 goto out;
48889 }
48890 @@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
48891 ep = fc_exch_find(mp, xid);
48892 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
48893 if (ep) {
48894 - atomic_inc(&mp->stats.xid_busy);
48895 + atomic_inc_unchecked(&mp->stats.xid_busy);
48896 reject = FC_RJT_RX_ID;
48897 goto rel;
48898 }
48899 @@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
48900 }
48901 xid = ep->xid; /* get our XID */
48902 } else if (!ep) {
48903 - atomic_inc(&mp->stats.xid_not_found);
48904 + atomic_inc_unchecked(&mp->stats.xid_not_found);
48905 reject = FC_RJT_RX_ID; /* XID not found */
48906 goto out;
48907 }
48908 @@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
48909 } else {
48910 sp = &ep->seq;
48911 if (sp->id != fh->fh_seq_id) {
48912 - atomic_inc(&mp->stats.seq_not_found);
48913 + atomic_inc_unchecked(&mp->stats.seq_not_found);
48914 if (f_ctl & FC_FC_END_SEQ) {
48915 /*
48916 * Update sequence_id based on incoming last
48917 @@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
48918
48919 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
48920 if (!ep) {
48921 - atomic_inc(&mp->stats.xid_not_found);
48922 + atomic_inc_unchecked(&mp->stats.xid_not_found);
48923 goto out;
48924 }
48925 if (ep->esb_stat & ESB_ST_COMPLETE) {
48926 - atomic_inc(&mp->stats.xid_not_found);
48927 + atomic_inc_unchecked(&mp->stats.xid_not_found);
48928 goto rel;
48929 }
48930 if (ep->rxid == FC_XID_UNKNOWN)
48931 ep->rxid = ntohs(fh->fh_rx_id);
48932 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
48933 - atomic_inc(&mp->stats.xid_not_found);
48934 + atomic_inc_unchecked(&mp->stats.xid_not_found);
48935 goto rel;
48936 }
48937 if (ep->did != ntoh24(fh->fh_s_id) &&
48938 ep->did != FC_FID_FLOGI) {
48939 - atomic_inc(&mp->stats.xid_not_found);
48940 + atomic_inc_unchecked(&mp->stats.xid_not_found);
48941 goto rel;
48942 }
48943 sof = fr_sof(fp);
48944 @@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
48945 sp->ssb_stat |= SSB_ST_RESP;
48946 sp->id = fh->fh_seq_id;
48947 } else if (sp->id != fh->fh_seq_id) {
48948 - atomic_inc(&mp->stats.seq_not_found);
48949 + atomic_inc_unchecked(&mp->stats.seq_not_found);
48950 goto rel;
48951 }
48952
48953 @@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
48954 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
48955
48956 if (!sp)
48957 - atomic_inc(&mp->stats.xid_not_found);
48958 + atomic_inc_unchecked(&mp->stats.xid_not_found);
48959 else
48960 - atomic_inc(&mp->stats.non_bls_resp);
48961 + atomic_inc_unchecked(&mp->stats.non_bls_resp);
48962
48963 fc_frame_free(fp);
48964 }
48965 @@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
48966
48967 list_for_each_entry(ema, &lport->ema_list, ema_list) {
48968 mp = ema->mp;
48969 - st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
48970 + st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
48971 st->fc_no_free_exch_xid +=
48972 - atomic_read(&mp->stats.no_free_exch_xid);
48973 - st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
48974 - st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
48975 - st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
48976 - st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
48977 + atomic_read_unchecked(&mp->stats.no_free_exch_xid);
48978 + st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
48979 + st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
48980 + st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
48981 + st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
48982 }
48983 }
48984 EXPORT_SYMBOL(fc_exch_update_stats);
48985 diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
48986 index d289583..b745eec 100644
48987 --- a/drivers/scsi/libsas/sas_ata.c
48988 +++ b/drivers/scsi/libsas/sas_ata.c
48989 @@ -554,7 +554,7 @@ static struct ata_port_operations sas_sata_ops = {
48990 .postreset = ata_std_postreset,
48991 .error_handler = ata_std_error_handler,
48992 .post_internal_cmd = sas_ata_post_internal,
48993 - .qc_defer = ata_std_qc_defer,
48994 + .qc_defer = ata_std_qc_defer,
48995 .qc_prep = ata_noop_qc_prep,
48996 .qc_issue = sas_ata_qc_issue,
48997 .qc_fill_rtf = sas_ata_qc_fill_rtf,
48998 diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
48999 index 4e1b75c..0bbdfa9 100644
49000 --- a/drivers/scsi/lpfc/lpfc.h
49001 +++ b/drivers/scsi/lpfc/lpfc.h
49002 @@ -432,7 +432,7 @@ struct lpfc_vport {
49003 struct dentry *debug_nodelist;
49004 struct dentry *vport_debugfs_root;
49005 struct lpfc_debugfs_trc *disc_trc;
49006 - atomic_t disc_trc_cnt;
49007 + atomic_unchecked_t disc_trc_cnt;
49008 #endif
49009 uint8_t stat_data_enabled;
49010 uint8_t stat_data_blocked;
49011 @@ -865,8 +865,8 @@ struct lpfc_hba {
49012 struct timer_list fabric_block_timer;
49013 unsigned long bit_flags;
49014 #define FABRIC_COMANDS_BLOCKED 0
49015 - atomic_t num_rsrc_err;
49016 - atomic_t num_cmd_success;
49017 + atomic_unchecked_t num_rsrc_err;
49018 + atomic_unchecked_t num_cmd_success;
49019 unsigned long last_rsrc_error_time;
49020 unsigned long last_ramp_down_time;
49021 unsigned long last_ramp_up_time;
49022 @@ -902,7 +902,7 @@ struct lpfc_hba {
49023
49024 struct dentry *debug_slow_ring_trc;
49025 struct lpfc_debugfs_trc *slow_ring_trc;
49026 - atomic_t slow_ring_trc_cnt;
49027 + atomic_unchecked_t slow_ring_trc_cnt;
49028 /* iDiag debugfs sub-directory */
49029 struct dentry *idiag_root;
49030 struct dentry *idiag_pci_cfg;
49031 diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
49032 index b800cc9..16b6a91 100644
49033 --- a/drivers/scsi/lpfc/lpfc_debugfs.c
49034 +++ b/drivers/scsi/lpfc/lpfc_debugfs.c
49035 @@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
49036
49037 #include <linux/debugfs.h>
49038
49039 -static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
49040 +static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
49041 static unsigned long lpfc_debugfs_start_time = 0L;
49042
49043 /* iDiag */
49044 @@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
49045 lpfc_debugfs_enable = 0;
49046
49047 len = 0;
49048 - index = (atomic_read(&vport->disc_trc_cnt) + 1) &
49049 + index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
49050 (lpfc_debugfs_max_disc_trc - 1);
49051 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
49052 dtp = vport->disc_trc + i;
49053 @@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
49054 lpfc_debugfs_enable = 0;
49055
49056 len = 0;
49057 - index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
49058 + index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
49059 (lpfc_debugfs_max_slow_ring_trc - 1);
49060 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
49061 dtp = phba->slow_ring_trc + i;
49062 @@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
49063 !vport || !vport->disc_trc)
49064 return;
49065
49066 - index = atomic_inc_return(&vport->disc_trc_cnt) &
49067 + index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
49068 (lpfc_debugfs_max_disc_trc - 1);
49069 dtp = vport->disc_trc + index;
49070 dtp->fmt = fmt;
49071 dtp->data1 = data1;
49072 dtp->data2 = data2;
49073 dtp->data3 = data3;
49074 - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
49075 + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
49076 dtp->jif = jiffies;
49077 #endif
49078 return;
49079 @@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
49080 !phba || !phba->slow_ring_trc)
49081 return;
49082
49083 - index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
49084 + index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
49085 (lpfc_debugfs_max_slow_ring_trc - 1);
49086 dtp = phba->slow_ring_trc + index;
49087 dtp->fmt = fmt;
49088 dtp->data1 = data1;
49089 dtp->data2 = data2;
49090 dtp->data3 = data3;
49091 - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
49092 + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
49093 dtp->jif = jiffies;
49094 #endif
49095 return;
49096 @@ -4168,7 +4168,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
49097 "slow_ring buffer\n");
49098 goto debug_failed;
49099 }
49100 - atomic_set(&phba->slow_ring_trc_cnt, 0);
49101 + atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
49102 memset(phba->slow_ring_trc, 0,
49103 (sizeof(struct lpfc_debugfs_trc) *
49104 lpfc_debugfs_max_slow_ring_trc));
49105 @@ -4214,7 +4214,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
49106 "buffer\n");
49107 goto debug_failed;
49108 }
49109 - atomic_set(&vport->disc_trc_cnt, 0);
49110 + atomic_set_unchecked(&vport->disc_trc_cnt, 0);
49111
49112 snprintf(name, sizeof(name), "discovery_trace");
49113 vport->debug_disc_trc =
49114 diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
49115 index 68c94cc..8c27be5 100644
49116 --- a/drivers/scsi/lpfc/lpfc_init.c
49117 +++ b/drivers/scsi/lpfc/lpfc_init.c
49118 @@ -10949,8 +10949,10 @@ lpfc_init(void)
49119 "misc_register returned with status %d", error);
49120
49121 if (lpfc_enable_npiv) {
49122 - lpfc_transport_functions.vport_create = lpfc_vport_create;
49123 - lpfc_transport_functions.vport_delete = lpfc_vport_delete;
49124 + pax_open_kernel();
49125 + *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
49126 + *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
49127 + pax_close_kernel();
49128 }
49129 lpfc_transport_template =
49130 fc_attach_transport(&lpfc_transport_functions);
49131 diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
49132 index b2ede05..aaf482ca 100644
49133 --- a/drivers/scsi/lpfc/lpfc_scsi.c
49134 +++ b/drivers/scsi/lpfc/lpfc_scsi.c
49135 @@ -353,7 +353,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
49136 uint32_t evt_posted;
49137
49138 spin_lock_irqsave(&phba->hbalock, flags);
49139 - atomic_inc(&phba->num_rsrc_err);
49140 + atomic_inc_unchecked(&phba->num_rsrc_err);
49141 phba->last_rsrc_error_time = jiffies;
49142
49143 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
49144 @@ -394,7 +394,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
49145 unsigned long flags;
49146 struct lpfc_hba *phba = vport->phba;
49147 uint32_t evt_posted;
49148 - atomic_inc(&phba->num_cmd_success);
49149 + atomic_inc_unchecked(&phba->num_cmd_success);
49150
49151 if (vport->cfg_lun_queue_depth <= queue_depth)
49152 return;
49153 @@ -438,8 +438,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
49154 unsigned long num_rsrc_err, num_cmd_success;
49155 int i;
49156
49157 - num_rsrc_err = atomic_read(&phba->num_rsrc_err);
49158 - num_cmd_success = atomic_read(&phba->num_cmd_success);
49159 + num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
49160 + num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
49161
49162 /*
49163 * The error and success command counters are global per
49164 @@ -467,8 +467,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
49165 }
49166 }
49167 lpfc_destroy_vport_work_array(phba, vports);
49168 - atomic_set(&phba->num_rsrc_err, 0);
49169 - atomic_set(&phba->num_cmd_success, 0);
49170 + atomic_set_unchecked(&phba->num_rsrc_err, 0);
49171 + atomic_set_unchecked(&phba->num_cmd_success, 0);
49172 }
49173
49174 /**
49175 @@ -502,8 +502,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
49176 }
49177 }
49178 lpfc_destroy_vport_work_array(phba, vports);
49179 - atomic_set(&phba->num_rsrc_err, 0);
49180 - atomic_set(&phba->num_cmd_success, 0);
49181 + atomic_set_unchecked(&phba->num_rsrc_err, 0);
49182 + atomic_set_unchecked(&phba->num_cmd_success, 0);
49183 }
49184
49185 /**
49186 diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
49187 index 7f0af4f..193ac3e 100644
49188 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
49189 +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
49190 @@ -1557,7 +1557,7 @@ _scsih_get_resync(struct device *dev)
49191 {
49192 struct scsi_device *sdev = to_scsi_device(dev);
49193 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
49194 - static struct _raid_device *raid_device;
49195 + struct _raid_device *raid_device;
49196 unsigned long flags;
49197 Mpi2RaidVolPage0_t vol_pg0;
49198 Mpi2ConfigReply_t mpi_reply;
49199 @@ -1609,7 +1609,7 @@ _scsih_get_state(struct device *dev)
49200 {
49201 struct scsi_device *sdev = to_scsi_device(dev);
49202 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
49203 - static struct _raid_device *raid_device;
49204 + struct _raid_device *raid_device;
49205 unsigned long flags;
49206 Mpi2RaidVolPage0_t vol_pg0;
49207 Mpi2ConfigReply_t mpi_reply;
49208 @@ -6637,7 +6637,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
49209 struct fw_event_work *fw_event)
49210 {
49211 Mpi2EventDataIrOperationStatus_t *event_data = fw_event->event_data;
49212 - static struct _raid_device *raid_device;
49213 + struct _raid_device *raid_device;
49214 unsigned long flags;
49215 u16 handle;
49216
49217 @@ -7108,7 +7108,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
49218 u64 sas_address;
49219 struct _sas_device *sas_device;
49220 struct _sas_node *expander_device;
49221 - static struct _raid_device *raid_device;
49222 + struct _raid_device *raid_device;
49223 u8 retry_count;
49224 unsigned long flags;
49225
49226 diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
49227 index be8ce54..94ed33a 100644
49228 --- a/drivers/scsi/pmcraid.c
49229 +++ b/drivers/scsi/pmcraid.c
49230 @@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
49231 res->scsi_dev = scsi_dev;
49232 scsi_dev->hostdata = res;
49233 res->change_detected = 0;
49234 - atomic_set(&res->read_failures, 0);
49235 - atomic_set(&res->write_failures, 0);
49236 + atomic_set_unchecked(&res->read_failures, 0);
49237 + atomic_set_unchecked(&res->write_failures, 0);
49238 rc = 0;
49239 }
49240 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
49241 @@ -2687,9 +2687,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
49242
49243 /* If this was a SCSI read/write command keep count of errors */
49244 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
49245 - atomic_inc(&res->read_failures);
49246 + atomic_inc_unchecked(&res->read_failures);
49247 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
49248 - atomic_inc(&res->write_failures);
49249 + atomic_inc_unchecked(&res->write_failures);
49250
49251 if (!RES_IS_GSCSI(res->cfg_entry) &&
49252 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
49253 @@ -3545,7 +3545,7 @@ static int pmcraid_queuecommand_lck(
49254 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
49255 * hrrq_id assigned here in queuecommand
49256 */
49257 - ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
49258 + ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
49259 pinstance->num_hrrq;
49260 cmd->cmd_done = pmcraid_io_done;
49261
49262 @@ -3857,7 +3857,7 @@ static long pmcraid_ioctl_passthrough(
49263 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
49264 * hrrq_id assigned here in queuecommand
49265 */
49266 - ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
49267 + ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
49268 pinstance->num_hrrq;
49269
49270 if (request_size) {
49271 @@ -4495,7 +4495,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
49272
49273 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
49274 /* add resources only after host is added into system */
49275 - if (!atomic_read(&pinstance->expose_resources))
49276 + if (!atomic_read_unchecked(&pinstance->expose_resources))
49277 return;
49278
49279 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
49280 @@ -5322,8 +5322,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
49281 init_waitqueue_head(&pinstance->reset_wait_q);
49282
49283 atomic_set(&pinstance->outstanding_cmds, 0);
49284 - atomic_set(&pinstance->last_message_id, 0);
49285 - atomic_set(&pinstance->expose_resources, 0);
49286 + atomic_set_unchecked(&pinstance->last_message_id, 0);
49287 + atomic_set_unchecked(&pinstance->expose_resources, 0);
49288
49289 INIT_LIST_HEAD(&pinstance->free_res_q);
49290 INIT_LIST_HEAD(&pinstance->used_res_q);
49291 @@ -6036,7 +6036,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
49292 /* Schedule worker thread to handle CCN and take care of adding and
49293 * removing devices to OS
49294 */
49295 - atomic_set(&pinstance->expose_resources, 1);
49296 + atomic_set_unchecked(&pinstance->expose_resources, 1);
49297 schedule_work(&pinstance->worker_q);
49298 return rc;
49299
49300 diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
49301 index e1d150f..6c6df44 100644
49302 --- a/drivers/scsi/pmcraid.h
49303 +++ b/drivers/scsi/pmcraid.h
49304 @@ -748,7 +748,7 @@ struct pmcraid_instance {
49305 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
49306
49307 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
49308 - atomic_t last_message_id;
49309 + atomic_unchecked_t last_message_id;
49310
49311 /* configuration table */
49312 struct pmcraid_config_table *cfg_table;
49313 @@ -777,7 +777,7 @@ struct pmcraid_instance {
49314 atomic_t outstanding_cmds;
49315
49316 /* should add/delete resources to mid-layer now ?*/
49317 - atomic_t expose_resources;
49318 + atomic_unchecked_t expose_resources;
49319
49320
49321
49322 @@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
49323 struct pmcraid_config_table_entry_ext cfg_entry_ext;
49324 };
49325 struct scsi_device *scsi_dev; /* Link scsi_device structure */
49326 - atomic_t read_failures; /* count of failed READ commands */
49327 - atomic_t write_failures; /* count of failed WRITE commands */
49328 + atomic_unchecked_t read_failures; /* count of failed READ commands */
49329 + atomic_unchecked_t write_failures; /* count of failed WRITE commands */
49330
49331 /* To indicate add/delete/modify during CCN */
49332 u8 change_detected;
49333 diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
49334 index 4a0d7c9..3d658d7 100644
49335 --- a/drivers/scsi/qla2xxx/qla_attr.c
49336 +++ b/drivers/scsi/qla2xxx/qla_attr.c
49337 @@ -2038,7 +2038,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
49338 return 0;
49339 }
49340
49341 -struct fc_function_template qla2xxx_transport_functions = {
49342 +fc_function_template_no_const qla2xxx_transport_functions = {
49343
49344 .show_host_node_name = 1,
49345 .show_host_port_name = 1,
49346 @@ -2086,7 +2086,7 @@ struct fc_function_template qla2xxx_transport_functions = {
49347 .bsg_timeout = qla24xx_bsg_timeout,
49348 };
49349
49350 -struct fc_function_template qla2xxx_transport_vport_functions = {
49351 +fc_function_template_no_const qla2xxx_transport_vport_functions = {
49352
49353 .show_host_node_name = 1,
49354 .show_host_port_name = 1,
49355 diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
49356 index 1f42662..bf9836c 100644
49357 --- a/drivers/scsi/qla2xxx/qla_gbl.h
49358 +++ b/drivers/scsi/qla2xxx/qla_gbl.h
49359 @@ -546,8 +546,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *);
49360 struct device_attribute;
49361 extern struct device_attribute *qla2x00_host_attrs[];
49362 struct fc_function_template;
49363 -extern struct fc_function_template qla2xxx_transport_functions;
49364 -extern struct fc_function_template qla2xxx_transport_vport_functions;
49365 +extern fc_function_template_no_const qla2xxx_transport_functions;
49366 +extern fc_function_template_no_const qla2xxx_transport_vport_functions;
49367 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
49368 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
49369 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
49370 diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
49371 index 89a5300..2a459ab 100644
49372 --- a/drivers/scsi/qla2xxx/qla_os.c
49373 +++ b/drivers/scsi/qla2xxx/qla_os.c
49374 @@ -1491,8 +1491,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
49375 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
49376 /* Ok, a 64bit DMA mask is applicable. */
49377 ha->flags.enable_64bit_addressing = 1;
49378 - ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
49379 - ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
49380 + pax_open_kernel();
49381 + *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
49382 + *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
49383 + pax_close_kernel();
49384 return;
49385 }
49386 }
49387 diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
49388 index aa67bb9..06d0e2a 100644
49389 --- a/drivers/scsi/qla4xxx/ql4_def.h
49390 +++ b/drivers/scsi/qla4xxx/ql4_def.h
49391 @@ -303,7 +303,7 @@ struct ddb_entry {
49392 * (4000 only) */
49393 atomic_t relogin_timer; /* Max Time to wait for
49394 * relogin to complete */
49395 - atomic_t relogin_retry_count; /* Num of times relogin has been
49396 + atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
49397 * retried */
49398 uint32_t default_time2wait; /* Default Min time between
49399 * relogins (+aens) */
49400 diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
49401 index c21adc3..1b4155f 100644
49402 --- a/drivers/scsi/qla4xxx/ql4_os.c
49403 +++ b/drivers/scsi/qla4xxx/ql4_os.c
49404 @@ -4463,12 +4463,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
49405 */
49406 if (!iscsi_is_session_online(cls_sess)) {
49407 /* Reset retry relogin timer */
49408 - atomic_inc(&ddb_entry->relogin_retry_count);
49409 + atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
49410 DEBUG2(ql4_printk(KERN_INFO, ha,
49411 "%s: index[%d] relogin timed out-retrying"
49412 " relogin (%d), retry (%d)\n", __func__,
49413 ddb_entry->fw_ddb_index,
49414 - atomic_read(&ddb_entry->relogin_retry_count),
49415 + atomic_read_unchecked(&ddb_entry->relogin_retry_count),
49416 ddb_entry->default_time2wait + 4));
49417 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
49418 atomic_set(&ddb_entry->retry_relogin_timer,
49419 @@ -6552,7 +6552,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
49420
49421 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
49422 atomic_set(&ddb_entry->relogin_timer, 0);
49423 - atomic_set(&ddb_entry->relogin_retry_count, 0);
49424 + atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
49425 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
49426 ddb_entry->default_relogin_timeout =
49427 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
49428 diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
49429 index d8afec8..3ec7152 100644
49430 --- a/drivers/scsi/scsi.c
49431 +++ b/drivers/scsi/scsi.c
49432 @@ -658,7 +658,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
49433 struct Scsi_Host *host = cmd->device->host;
49434 int rtn = 0;
49435
49436 - atomic_inc(&cmd->device->iorequest_cnt);
49437 + atomic_inc_unchecked(&cmd->device->iorequest_cnt);
49438
49439 /* check if the device is still usable */
49440 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
49441 diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
49442 index 62ec84b..93159d8 100644
49443 --- a/drivers/scsi/scsi_lib.c
49444 +++ b/drivers/scsi/scsi_lib.c
49445 @@ -1474,7 +1474,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
49446 shost = sdev->host;
49447 scsi_init_cmd_errh(cmd);
49448 cmd->result = DID_NO_CONNECT << 16;
49449 - atomic_inc(&cmd->device->iorequest_cnt);
49450 + atomic_inc_unchecked(&cmd->device->iorequest_cnt);
49451
49452 /*
49453 * SCSI request completion path will do scsi_device_unbusy(),
49454 @@ -1500,9 +1500,9 @@ static void scsi_softirq_done(struct request *rq)
49455
49456 INIT_LIST_HEAD(&cmd->eh_entry);
49457
49458 - atomic_inc(&cmd->device->iodone_cnt);
49459 + atomic_inc_unchecked(&cmd->device->iodone_cnt);
49460 if (cmd->result)
49461 - atomic_inc(&cmd->device->ioerr_cnt);
49462 + atomic_inc_unchecked(&cmd->device->ioerr_cnt);
49463
49464 disposition = scsi_decide_disposition(cmd);
49465 if (disposition != SUCCESS &&
49466 diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
49467 index 9117d0b..d289a7a 100644
49468 --- a/drivers/scsi/scsi_sysfs.c
49469 +++ b/drivers/scsi/scsi_sysfs.c
49470 @@ -739,7 +739,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
49471 char *buf) \
49472 { \
49473 struct scsi_device *sdev = to_scsi_device(dev); \
49474 - unsigned long long count = atomic_read(&sdev->field); \
49475 + unsigned long long count = atomic_read_unchecked(&sdev->field); \
49476 return snprintf(buf, 20, "0x%llx\n", count); \
49477 } \
49478 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
49479 diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
49480 index 84a1fdf..693b0d6 100644
49481 --- a/drivers/scsi/scsi_tgt_lib.c
49482 +++ b/drivers/scsi/scsi_tgt_lib.c
49483 @@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
49484 int err;
49485
49486 dprintk("%lx %u\n", uaddr, len);
49487 - err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
49488 + err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
49489 if (err) {
49490 /*
49491 * TODO: need to fixup sg_tablesize, max_segment_size,
49492 diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
49493 index 4628fd5..a94a1c2 100644
49494 --- a/drivers/scsi/scsi_transport_fc.c
49495 +++ b/drivers/scsi/scsi_transport_fc.c
49496 @@ -497,7 +497,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
49497 * Netlink Infrastructure
49498 */
49499
49500 -static atomic_t fc_event_seq;
49501 +static atomic_unchecked_t fc_event_seq;
49502
49503 /**
49504 * fc_get_event_number - Obtain the next sequential FC event number
49505 @@ -510,7 +510,7 @@ static atomic_t fc_event_seq;
49506 u32
49507 fc_get_event_number(void)
49508 {
49509 - return atomic_add_return(1, &fc_event_seq);
49510 + return atomic_add_return_unchecked(1, &fc_event_seq);
49511 }
49512 EXPORT_SYMBOL(fc_get_event_number);
49513
49514 @@ -654,7 +654,7 @@ static __init int fc_transport_init(void)
49515 {
49516 int error;
49517
49518 - atomic_set(&fc_event_seq, 0);
49519 + atomic_set_unchecked(&fc_event_seq, 0);
49520
49521 error = transport_class_register(&fc_host_class);
49522 if (error)
49523 @@ -844,7 +844,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
49524 char *cp;
49525
49526 *val = simple_strtoul(buf, &cp, 0);
49527 - if ((*cp && (*cp != '\n')) || (*val < 0))
49528 + if (*cp && (*cp != '\n'))
49529 return -EINVAL;
49530 /*
49531 * Check for overflow; dev_loss_tmo is u32
49532 diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
49533 index fd8ffe6..fd0bebf 100644
49534 --- a/drivers/scsi/scsi_transport_iscsi.c
49535 +++ b/drivers/scsi/scsi_transport_iscsi.c
49536 @@ -79,7 +79,7 @@ struct iscsi_internal {
49537 struct transport_container session_cont;
49538 };
49539
49540 -static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
49541 +static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
49542 static struct workqueue_struct *iscsi_eh_timer_workq;
49543
49544 static DEFINE_IDA(iscsi_sess_ida);
49545 @@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
49546 int err;
49547
49548 ihost = shost->shost_data;
49549 - session->sid = atomic_add_return(1, &iscsi_session_nr);
49550 + session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
49551
49552 if (target_id == ISCSI_MAX_TARGET) {
49553 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
49554 @@ -4511,7 +4511,7 @@ static __init int iscsi_transport_init(void)
49555 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
49556 ISCSI_TRANSPORT_VERSION);
49557
49558 - atomic_set(&iscsi_session_nr, 0);
49559 + atomic_set_unchecked(&iscsi_session_nr, 0);
49560
49561 err = class_register(&iscsi_transport_class);
49562 if (err)
49563 diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
49564 index d47ffc8..30f46a9 100644
49565 --- a/drivers/scsi/scsi_transport_srp.c
49566 +++ b/drivers/scsi/scsi_transport_srp.c
49567 @@ -36,7 +36,7 @@
49568 #include "scsi_transport_srp_internal.h"
49569
49570 struct srp_host_attrs {
49571 - atomic_t next_port_id;
49572 + atomic_unchecked_t next_port_id;
49573 };
49574 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
49575
49576 @@ -101,7 +101,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
49577 struct Scsi_Host *shost = dev_to_shost(dev);
49578 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
49579
49580 - atomic_set(&srp_host->next_port_id, 0);
49581 + atomic_set_unchecked(&srp_host->next_port_id, 0);
49582 return 0;
49583 }
49584
49585 @@ -734,7 +734,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
49586 rport_fast_io_fail_timedout);
49587 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
49588
49589 - id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
49590 + id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
49591 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
49592
49593 transport_setup_device(&rport->dev);
49594 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
49595 index 36d1a23..3f33303 100644
49596 --- a/drivers/scsi/sd.c
49597 +++ b/drivers/scsi/sd.c
49598 @@ -2962,7 +2962,7 @@ static int sd_probe(struct device *dev)
49599 sdkp->disk = gd;
49600 sdkp->index = index;
49601 atomic_set(&sdkp->openers, 0);
49602 - atomic_set(&sdkp->device->ioerr_cnt, 0);
49603 + atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
49604
49605 if (!sdp->request_queue->rq_timeout) {
49606 if (sdp->type != TYPE_MOD)
49607 diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
49608 index df5e961..df6b97f 100644
49609 --- a/drivers/scsi/sg.c
49610 +++ b/drivers/scsi/sg.c
49611 @@ -1102,7 +1102,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
49612 sdp->disk->disk_name,
49613 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
49614 NULL,
49615 - (char *)arg);
49616 + (char __user *)arg);
49617 case BLKTRACESTART:
49618 return blk_trace_startstop(sdp->device->request_queue, 1);
49619 case BLKTRACESTOP:
49620 diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
49621 index d0b28bb..a263613 100644
49622 --- a/drivers/spi/spi.c
49623 +++ b/drivers/spi/spi.c
49624 @@ -1971,7 +1971,7 @@ int spi_bus_unlock(struct spi_master *master)
49625 EXPORT_SYMBOL_GPL(spi_bus_unlock);
49626
49627 /* portable code must never pass more than 32 bytes */
49628 -#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
49629 +#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
49630
49631 static u8 *buf;
49632
49633 diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
49634 index 2c61783..4d49e4e 100644
49635 --- a/drivers/staging/android/timed_output.c
49636 +++ b/drivers/staging/android/timed_output.c
49637 @@ -25,7 +25,7 @@
49638 #include "timed_output.h"
49639
49640 static struct class *timed_output_class;
49641 -static atomic_t device_count;
49642 +static atomic_unchecked_t device_count;
49643
49644 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
49645 char *buf)
49646 @@ -63,7 +63,7 @@ static int create_timed_output_class(void)
49647 timed_output_class = class_create(THIS_MODULE, "timed_output");
49648 if (IS_ERR(timed_output_class))
49649 return PTR_ERR(timed_output_class);
49650 - atomic_set(&device_count, 0);
49651 + atomic_set_unchecked(&device_count, 0);
49652 timed_output_class->dev_groups = timed_output_groups;
49653 }
49654
49655 @@ -81,7 +81,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
49656 if (ret < 0)
49657 return ret;
49658
49659 - tdev->index = atomic_inc_return(&device_count);
49660 + tdev->index = atomic_inc_return_unchecked(&device_count);
49661 tdev->dev = device_create(timed_output_class, NULL,
49662 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
49663 if (IS_ERR(tdev->dev))
49664 diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
49665 index fe47cd3..19a1bd1 100644
49666 --- a/drivers/staging/gdm724x/gdm_tty.c
49667 +++ b/drivers/staging/gdm724x/gdm_tty.c
49668 @@ -44,7 +44,7 @@
49669 #define gdm_tty_send_control(n, r, v, d, l) (\
49670 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
49671
49672 -#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
49673 +#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
49674
49675 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
49676 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
49677 diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
49678 index 236ed66..dd9cd74 100644
49679 --- a/drivers/staging/imx-drm/imx-drm-core.c
49680 +++ b/drivers/staging/imx-drm/imx-drm-core.c
49681 @@ -488,7 +488,7 @@ int imx_drm_add_crtc(struct drm_crtc *crtc,
49682 goto err_busy;
49683 }
49684
49685 - if (imxdrm->drm->open_count) {
49686 + if (local_read(&imxdrm->drm->open_count)) {
49687 ret = -EBUSY;
49688 goto err_busy;
49689 }
49690 @@ -576,7 +576,7 @@ int imx_drm_add_encoder(struct drm_encoder *encoder,
49691
49692 mutex_lock(&imxdrm->mutex);
49693
49694 - if (imxdrm->drm->open_count) {
49695 + if (local_read(&imxdrm->drm->open_count)) {
49696 ret = -EBUSY;
49697 goto err_busy;
49698 }
49699 @@ -715,7 +715,7 @@ int imx_drm_add_connector(struct drm_connector *connector,
49700
49701 mutex_lock(&imxdrm->mutex);
49702
49703 - if (imxdrm->drm->open_count) {
49704 + if (local_read(&imxdrm->drm->open_count)) {
49705 ret = -EBUSY;
49706 goto err_busy;
49707 }
49708 diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
49709 index 3f8020c..649fded 100644
49710 --- a/drivers/staging/lustre/lnet/selftest/brw_test.c
49711 +++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
49712 @@ -488,13 +488,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
49713 return 0;
49714 }
49715
49716 -sfw_test_client_ops_t brw_test_client;
49717 -void brw_init_test_client(void)
49718 -{
49719 - brw_test_client.tso_init = brw_client_init;
49720 - brw_test_client.tso_fini = brw_client_fini;
49721 - brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
49722 - brw_test_client.tso_done_rpc = brw_client_done_rpc;
49723 +sfw_test_client_ops_t brw_test_client = {
49724 + .tso_init = brw_client_init,
49725 + .tso_fini = brw_client_fini,
49726 + .tso_prep_rpc = brw_client_prep_rpc,
49727 + .tso_done_rpc = brw_client_done_rpc,
49728 };
49729
49730 srpc_service_t brw_test_service;
49731 diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
49732 index 050723a..fa6fdf1 100644
49733 --- a/drivers/staging/lustre/lnet/selftest/framework.c
49734 +++ b/drivers/staging/lustre/lnet/selftest/framework.c
49735 @@ -1635,12 +1635,10 @@ static srpc_service_t sfw_services[] =
49736
49737 extern sfw_test_client_ops_t ping_test_client;
49738 extern srpc_service_t ping_test_service;
49739 -extern void ping_init_test_client(void);
49740 extern void ping_init_test_service(void);
49741
49742 extern sfw_test_client_ops_t brw_test_client;
49743 extern srpc_service_t brw_test_service;
49744 -extern void brw_init_test_client(void);
49745 extern void brw_init_test_service(void);
49746
49747
49748 @@ -1684,12 +1682,10 @@ sfw_startup (void)
49749 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
49750 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
49751
49752 - brw_init_test_client();
49753 brw_init_test_service();
49754 rc = sfw_register_test(&brw_test_service, &brw_test_client);
49755 LASSERT (rc == 0);
49756
49757 - ping_init_test_client();
49758 ping_init_test_service();
49759 rc = sfw_register_test(&ping_test_service, &ping_test_client);
49760 LASSERT (rc == 0);
49761 diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
49762 index 750cac4..e4d751f 100644
49763 --- a/drivers/staging/lustre/lnet/selftest/ping_test.c
49764 +++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
49765 @@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
49766 return 0;
49767 }
49768
49769 -sfw_test_client_ops_t ping_test_client;
49770 -void ping_init_test_client(void)
49771 -{
49772 - ping_test_client.tso_init = ping_client_init;
49773 - ping_test_client.tso_fini = ping_client_fini;
49774 - ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
49775 - ping_test_client.tso_done_rpc = ping_client_done_rpc;
49776 -}
49777 +sfw_test_client_ops_t ping_test_client = {
49778 + .tso_init = ping_client_init,
49779 + .tso_fini = ping_client_fini,
49780 + .tso_prep_rpc = ping_client_prep_rpc,
49781 + .tso_done_rpc = ping_client_done_rpc,
49782 +};
49783
49784 srpc_service_t ping_test_service;
49785 void ping_init_test_service(void)
49786 diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
49787 index ec4bb5e..740c6dd 100644
49788 --- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
49789 +++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
49790 @@ -1141,7 +1141,7 @@ struct ldlm_callback_suite {
49791 ldlm_completion_callback lcs_completion;
49792 ldlm_blocking_callback lcs_blocking;
49793 ldlm_glimpse_callback lcs_glimpse;
49794 -};
49795 +} __no_const;
49796
49797 /* ldlm_lockd.c */
49798 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
49799 diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
49800 index c3470ce..2bef527 100644
49801 --- a/drivers/staging/lustre/lustre/include/obd.h
49802 +++ b/drivers/staging/lustre/lustre/include/obd.h
49803 @@ -1426,7 +1426,7 @@ struct md_ops {
49804 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
49805 * wrapper function in include/linux/obd_class.h.
49806 */
49807 -};
49808 +} __no_const;
49809
49810 struct lsm_operations {
49811 void (*lsm_free)(struct lov_stripe_md *);
49812 diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
49813 index c9aae13..60ea292 100644
49814 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
49815 +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
49816 @@ -239,7 +239,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
49817 int added = (mode == LCK_NL);
49818 int overlaps = 0;
49819 int splitted = 0;
49820 - const struct ldlm_callback_suite null_cbs = { NULL };
49821 + const struct ldlm_callback_suite null_cbs = { };
49822
49823 CDEBUG(D_DLMTRACE, "flags %#llx owner "LPU64" pid %u mode %u start "
49824 LPU64" end "LPU64"\n", *flags,
49825 diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
49826 index e947b91..f408990 100644
49827 --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
49828 +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
49829 @@ -217,7 +217,7 @@ DECLARE_PROC_HANDLER(proc_debug_mb)
49830 int LL_PROC_PROTO(proc_console_max_delay_cs)
49831 {
49832 int rc, max_delay_cs;
49833 - ctl_table_t dummy = *table;
49834 + ctl_table_no_const dummy = *table;
49835 cfs_duration_t d;
49836
49837 dummy.data = &max_delay_cs;
49838 @@ -248,7 +248,7 @@ int LL_PROC_PROTO(proc_console_max_delay_cs)
49839 int LL_PROC_PROTO(proc_console_min_delay_cs)
49840 {
49841 int rc, min_delay_cs;
49842 - ctl_table_t dummy = *table;
49843 + ctl_table_no_const dummy = *table;
49844 cfs_duration_t d;
49845
49846 dummy.data = &min_delay_cs;
49847 @@ -279,7 +279,7 @@ int LL_PROC_PROTO(proc_console_min_delay_cs)
49848 int LL_PROC_PROTO(proc_console_backoff)
49849 {
49850 int rc, backoff;
49851 - ctl_table_t dummy = *table;
49852 + ctl_table_no_const dummy = *table;
49853
49854 dummy.data = &backoff;
49855 dummy.proc_handler = &proc_dointvec;
49856 diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
49857 index 24ae26d..9d09cab 100644
49858 --- a/drivers/staging/lustre/lustre/libcfs/module.c
49859 +++ b/drivers/staging/lustre/lustre/libcfs/module.c
49860 @@ -313,11 +313,11 @@ out:
49861
49862
49863 struct cfs_psdev_ops libcfs_psdev_ops = {
49864 - libcfs_psdev_open,
49865 - libcfs_psdev_release,
49866 - NULL,
49867 - NULL,
49868 - libcfs_ioctl
49869 + .p_open = libcfs_psdev_open,
49870 + .p_close = libcfs_psdev_release,
49871 + .p_read = NULL,
49872 + .p_write = NULL,
49873 + .p_ioctl = libcfs_ioctl
49874 };
49875
49876 extern int insert_proc(void);
49877 diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
49878 index 52b7731..d604da0 100644
49879 --- a/drivers/staging/lustre/lustre/llite/dir.c
49880 +++ b/drivers/staging/lustre/lustre/llite/dir.c
49881 @@ -660,7 +660,7 @@ int ll_dir_setdirstripe(struct inode *dir, struct lmv_user_md *lump,
49882 int mode;
49883 int err;
49884
49885 - mode = (0755 & (S_IRWXUGO|S_ISVTX) & ~current->fs->umask) | S_IFDIR;
49886 + mode = (0755 & (S_IRWXUGO|S_ISVTX) & ~current_umask()) | S_IFDIR;
49887 op_data = ll_prep_md_op_data(NULL, dir, NULL, filename,
49888 strlen(filename), mode, LUSTRE_OPC_MKDIR,
49889 lump);
49890 diff --git a/drivers/staging/media/solo6x10/solo6x10-core.c b/drivers/staging/media/solo6x10/solo6x10-core.c
49891 index 480b7c4..6846324 100644
49892 --- a/drivers/staging/media/solo6x10/solo6x10-core.c
49893 +++ b/drivers/staging/media/solo6x10/solo6x10-core.c
49894 @@ -434,7 +434,7 @@ static void solo_device_release(struct device *dev)
49895
49896 static int solo_sysfs_init(struct solo_dev *solo_dev)
49897 {
49898 - struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
49899 + bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
49900 struct device *dev = &solo_dev->dev;
49901 const char *driver;
49902 int i;
49903 diff --git a/drivers/staging/media/solo6x10/solo6x10-g723.c b/drivers/staging/media/solo6x10/solo6x10-g723.c
49904 index 1db18c7..35e6afc 100644
49905 --- a/drivers/staging/media/solo6x10/solo6x10-g723.c
49906 +++ b/drivers/staging/media/solo6x10/solo6x10-g723.c
49907 @@ -355,7 +355,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
49908
49909 int solo_g723_init(struct solo_dev *solo_dev)
49910 {
49911 - static struct snd_device_ops ops = { NULL };
49912 + static struct snd_device_ops ops = { };
49913 struct snd_card *card;
49914 struct snd_kcontrol_new kctl;
49915 char name[32];
49916 diff --git a/drivers/staging/media/solo6x10/solo6x10-p2m.c b/drivers/staging/media/solo6x10/solo6x10-p2m.c
49917 index 7f2f247..d999137 100644
49918 --- a/drivers/staging/media/solo6x10/solo6x10-p2m.c
49919 +++ b/drivers/staging/media/solo6x10/solo6x10-p2m.c
49920 @@ -77,7 +77,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
49921
49922 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
49923 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
49924 - p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
49925 + p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
49926 if (p2m_id < 0)
49927 p2m_id = -p2m_id;
49928 }
49929 diff --git a/drivers/staging/media/solo6x10/solo6x10.h b/drivers/staging/media/solo6x10/solo6x10.h
49930 index 8964f8b..36eb087 100644
49931 --- a/drivers/staging/media/solo6x10/solo6x10.h
49932 +++ b/drivers/staging/media/solo6x10/solo6x10.h
49933 @@ -237,7 +237,7 @@ struct solo_dev {
49934
49935 /* P2M DMA Engine */
49936 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
49937 - atomic_t p2m_count;
49938 + atomic_unchecked_t p2m_count;
49939 int p2m_jiffies;
49940 unsigned int p2m_timeouts;
49941
49942 diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
49943 index a0f4868..139f1fb 100644
49944 --- a/drivers/staging/octeon/ethernet-rx.c
49945 +++ b/drivers/staging/octeon/ethernet-rx.c
49946 @@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
49947 /* Increment RX stats for virtual ports */
49948 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
49949 #ifdef CONFIG_64BIT
49950 - atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
49951 - atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
49952 + atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
49953 + atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
49954 #else
49955 - atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
49956 - atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
49957 + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
49958 + atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
49959 #endif
49960 }
49961 netif_receive_skb(skb);
49962 @@ -432,9 +432,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
49963 dev->name);
49964 */
49965 #ifdef CONFIG_64BIT
49966 - atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
49967 + atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
49968 #else
49969 - atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
49970 + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
49971 #endif
49972 dev_kfree_skb_irq(skb);
49973 }
49974 diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
49975 index 089dc4b..c9a687e 100644
49976 --- a/drivers/staging/octeon/ethernet.c
49977 +++ b/drivers/staging/octeon/ethernet.c
49978 @@ -253,11 +253,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
49979 * since the RX tasklet also increments it.
49980 */
49981 #ifdef CONFIG_64BIT
49982 - atomic64_add(rx_status.dropped_packets,
49983 - (atomic64_t *)&priv->stats.rx_dropped);
49984 + atomic64_add_unchecked(rx_status.dropped_packets,
49985 + (atomic64_unchecked_t *)&priv->stats.rx_dropped);
49986 #else
49987 - atomic_add(rx_status.dropped_packets,
49988 - (atomic_t *)&priv->stats.rx_dropped);
49989 + atomic_add_unchecked(rx_status.dropped_packets,
49990 + (atomic_unchecked_t *)&priv->stats.rx_dropped);
49991 #endif
49992 }
49993
49994 diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
49995 index c274b34..f84de76 100644
49996 --- a/drivers/staging/rtl8188eu/include/hal_intf.h
49997 +++ b/drivers/staging/rtl8188eu/include/hal_intf.h
49998 @@ -271,7 +271,7 @@ struct hal_ops {
49999 s32 (*c2h_handler)(struct adapter *padapter,
50000 struct c2h_evt_hdr *c2h_evt);
50001 c2h_id_filter c2h_id_filter_ccx;
50002 -};
50003 +} __no_const;
50004
50005 enum rt_eeprom_type {
50006 EEPROM_93C46,
50007 diff --git a/drivers/staging/rtl8188eu/include/rtw_io.h b/drivers/staging/rtl8188eu/include/rtw_io.h
50008 index 3d1dfcc..ff5620a 100644
50009 --- a/drivers/staging/rtl8188eu/include/rtw_io.h
50010 +++ b/drivers/staging/rtl8188eu/include/rtw_io.h
50011 @@ -126,7 +126,7 @@ struct _io_ops {
50012 u32 (*_write_scsi)(struct intf_hdl *pintfhdl, u32 cnt, u8 *pmem);
50013 void (*_read_port_cancel)(struct intf_hdl *pintfhdl);
50014 void (*_write_port_cancel)(struct intf_hdl *pintfhdl);
50015 -};
50016 +} __no_const;
50017
50018 struct io_req {
50019 struct list_head list;
50020 diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
50021 index dc23395..cf7e9b1 100644
50022 --- a/drivers/staging/rtl8712/rtl871x_io.h
50023 +++ b/drivers/staging/rtl8712/rtl871x_io.h
50024 @@ -108,7 +108,7 @@ struct _io_ops {
50025 u8 *pmem);
50026 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
50027 u8 *pmem);
50028 -};
50029 +} __no_const;
50030
50031 struct io_req {
50032 struct list_head list;
50033 diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
50034 index 1f5088b..0e59820 100644
50035 --- a/drivers/staging/sbe-2t3e3/netdev.c
50036 +++ b/drivers/staging/sbe-2t3e3/netdev.c
50037 @@ -51,7 +51,7 @@ static int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
50038 t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
50039
50040 if (rlen)
50041 - if (copy_to_user(data, &resp, rlen))
50042 + if (rlen > sizeof resp || copy_to_user(data, &resp, rlen))
50043 return -EFAULT;
50044
50045 return 0;
50046 diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
50047 index a863a98..d272795 100644
50048 --- a/drivers/staging/usbip/vhci.h
50049 +++ b/drivers/staging/usbip/vhci.h
50050 @@ -83,7 +83,7 @@ struct vhci_hcd {
50051 unsigned resuming:1;
50052 unsigned long re_timeout;
50053
50054 - atomic_t seqnum;
50055 + atomic_unchecked_t seqnum;
50056
50057 /*
50058 * NOTE:
50059 diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
50060 index 72391ef..7c6717a 100644
50061 --- a/drivers/staging/usbip/vhci_hcd.c
50062 +++ b/drivers/staging/usbip/vhci_hcd.c
50063 @@ -440,7 +440,7 @@ static void vhci_tx_urb(struct urb *urb)
50064
50065 spin_lock(&vdev->priv_lock);
50066
50067 - priv->seqnum = atomic_inc_return(&the_controller->seqnum);
50068 + priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
50069 if (priv->seqnum == 0xffff)
50070 dev_info(&urb->dev->dev, "seqnum max\n");
50071
50072 @@ -686,7 +686,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
50073 return -ENOMEM;
50074 }
50075
50076 - unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
50077 + unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
50078 if (unlink->seqnum == 0xffff)
50079 pr_info("seqnum max\n");
50080
50081 @@ -890,7 +890,7 @@ static int vhci_start(struct usb_hcd *hcd)
50082 vdev->rhport = rhport;
50083 }
50084
50085 - atomic_set(&vhci->seqnum, 0);
50086 + atomic_set_unchecked(&vhci->seqnum, 0);
50087 spin_lock_init(&vhci->lock);
50088
50089 hcd->power_budget = 0; /* no limit */
50090 diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
50091 index d07fcb5..358e1e1 100644
50092 --- a/drivers/staging/usbip/vhci_rx.c
50093 +++ b/drivers/staging/usbip/vhci_rx.c
50094 @@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
50095 if (!urb) {
50096 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
50097 pr_info("max seqnum %d\n",
50098 - atomic_read(&the_controller->seqnum));
50099 + atomic_read_unchecked(&the_controller->seqnum));
50100 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
50101 return;
50102 }
50103 diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
50104 index 6eecd53..29317c6 100644
50105 --- a/drivers/staging/vt6655/hostap.c
50106 +++ b/drivers/staging/vt6655/hostap.c
50107 @@ -69,14 +69,13 @@ static int msglevel = MSG_LEVEL_INFO;
50108 *
50109 */
50110
50111 +static net_device_ops_no_const apdev_netdev_ops;
50112 +
50113 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
50114 {
50115 PSDevice apdev_priv;
50116 struct net_device *dev = pDevice->dev;
50117 int ret;
50118 - const struct net_device_ops apdev_netdev_ops = {
50119 - .ndo_start_xmit = pDevice->tx_80211,
50120 - };
50121
50122 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
50123
50124 @@ -88,6 +87,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
50125 *apdev_priv = *pDevice;
50126 eth_hw_addr_inherit(pDevice->apdev, dev);
50127
50128 + /* only half broken now */
50129 + apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
50130 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
50131
50132 pDevice->apdev->type = ARPHRD_IEEE80211;
50133 diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
50134 index 67ba48b..24e602f 100644
50135 --- a/drivers/staging/vt6656/hostap.c
50136 +++ b/drivers/staging/vt6656/hostap.c
50137 @@ -60,14 +60,13 @@ static int msglevel =MSG_LEVEL_INFO;
50138 *
50139 */
50140
50141 +static net_device_ops_no_const apdev_netdev_ops;
50142 +
50143 static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
50144 {
50145 struct vnt_private *apdev_priv;
50146 struct net_device *dev = pDevice->dev;
50147 int ret;
50148 - const struct net_device_ops apdev_netdev_ops = {
50149 - .ndo_start_xmit = pDevice->tx_80211,
50150 - };
50151
50152 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
50153
50154 @@ -79,6 +78,8 @@ static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
50155 *apdev_priv = *pDevice;
50156 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
50157
50158 + /* only half broken now */
50159 + apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
50160 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
50161
50162 pDevice->apdev->type = ARPHRD_IEEE80211;
50163 diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
50164 index 24884ca..26c8220 100644
50165 --- a/drivers/target/sbp/sbp_target.c
50166 +++ b/drivers/target/sbp/sbp_target.c
50167 @@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
50168
50169 #define SESSION_MAINTENANCE_INTERVAL HZ
50170
50171 -static atomic_t login_id = ATOMIC_INIT(0);
50172 +static atomic_unchecked_t login_id = ATOMIC_INIT(0);
50173
50174 static void session_maintenance_work(struct work_struct *);
50175 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
50176 @@ -444,7 +444,7 @@ static void sbp_management_request_login(
50177 login->lun = se_lun;
50178 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
50179 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
50180 - login->login_id = atomic_inc_return(&login_id);
50181 + login->login_id = atomic_inc_return_unchecked(&login_id);
50182
50183 login->tgt_agt = sbp_target_agent_register(login);
50184 if (IS_ERR(login->tgt_agt)) {
50185 diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
50186 index 65001e1..2ebfbb9 100644
50187 --- a/drivers/target/target_core_device.c
50188 +++ b/drivers/target/target_core_device.c
50189 @@ -1520,7 +1520,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
50190 spin_lock_init(&dev->se_tmr_lock);
50191 spin_lock_init(&dev->qf_cmd_lock);
50192 sema_init(&dev->caw_sem, 1);
50193 - atomic_set(&dev->dev_ordered_id, 0);
50194 + atomic_set_unchecked(&dev->dev_ordered_id, 0);
50195 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
50196 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
50197 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
50198 diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
50199 index 2956250..b10f722 100644
50200 --- a/drivers/target/target_core_transport.c
50201 +++ b/drivers/target/target_core_transport.c
50202 @@ -1136,7 +1136,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
50203 * Used to determine when ORDERED commands should go from
50204 * Dormant to Active status.
50205 */
50206 - cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
50207 + cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
50208 smp_mb__after_atomic_inc();
50209 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
50210 cmd->se_ordered_id, cmd->sam_task_attr,
50211 diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
50212 index 04b1be7..5eff86d 100644
50213 --- a/drivers/thermal/of-thermal.c
50214 +++ b/drivers/thermal/of-thermal.c
50215 @@ -30,6 +30,7 @@
50216 #include <linux/err.h>
50217 #include <linux/export.h>
50218 #include <linux/string.h>
50219 +#include <linux/mm.h>
50220
50221 #include "thermal_core.h"
50222
50223 @@ -341,8 +342,10 @@ thermal_zone_of_add_sensor(struct device_node *zone,
50224 tz->get_trend = get_trend;
50225 tz->sensor_data = data;
50226
50227 - tzd->ops->get_temp = of_thermal_get_temp;
50228 - tzd->ops->get_trend = of_thermal_get_trend;
50229 + pax_open_kernel();
50230 + *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
50231 + *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
50232 + pax_close_kernel();
50233 mutex_unlock(&tzd->lock);
50234
50235 return tzd;
50236 @@ -461,8 +464,10 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
50237 return;
50238
50239 mutex_lock(&tzd->lock);
50240 - tzd->ops->get_temp = NULL;
50241 - tzd->ops->get_trend = NULL;
50242 + pax_open_kernel();
50243 + *(void **)&tzd->ops->get_temp = NULL;
50244 + *(void **)&tzd->ops->get_trend = NULL;
50245 + pax_close_kernel();
50246
50247 tz->get_temp = NULL;
50248 tz->get_trend = NULL;
50249 diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
50250 index a57bb5a..1f727d33 100644
50251 --- a/drivers/tty/cyclades.c
50252 +++ b/drivers/tty/cyclades.c
50253 @@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
50254 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
50255 info->port.count);
50256 #endif
50257 - info->port.count++;
50258 + atomic_inc(&info->port.count);
50259 #ifdef CY_DEBUG_COUNT
50260 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
50261 - current->pid, info->port.count);
50262 + current->pid, atomic_read(&info->port.count));
50263 #endif
50264
50265 /*
50266 @@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
50267 for (j = 0; j < cy_card[i].nports; j++) {
50268 info = &cy_card[i].ports[j];
50269
50270 - if (info->port.count) {
50271 + if (atomic_read(&info->port.count)) {
50272 /* XXX is the ldisc num worth this? */
50273 struct tty_struct *tty;
50274 struct tty_ldisc *ld;
50275 diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
50276 index 50b4688..e1e8125 100644
50277 --- a/drivers/tty/hvc/hvc_console.c
50278 +++ b/drivers/tty/hvc/hvc_console.c
50279 @@ -338,7 +338,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
50280
50281 spin_lock_irqsave(&hp->port.lock, flags);
50282 /* Check and then increment for fast path open. */
50283 - if (hp->port.count++ > 0) {
50284 + if (atomic_inc_return(&hp->port.count) > 1) {
50285 spin_unlock_irqrestore(&hp->port.lock, flags);
50286 hvc_kick();
50287 return 0;
50288 @@ -393,7 +393,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
50289
50290 spin_lock_irqsave(&hp->port.lock, flags);
50291
50292 - if (--hp->port.count == 0) {
50293 + if (atomic_dec_return(&hp->port.count) == 0) {
50294 spin_unlock_irqrestore(&hp->port.lock, flags);
50295 /* We are done with the tty pointer now. */
50296 tty_port_tty_set(&hp->port, NULL);
50297 @@ -415,9 +415,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
50298 */
50299 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
50300 } else {
50301 - if (hp->port.count < 0)
50302 + if (atomic_read(&hp->port.count) < 0)
50303 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
50304 - hp->vtermno, hp->port.count);
50305 + hp->vtermno, atomic_read(&hp->port.count));
50306 spin_unlock_irqrestore(&hp->port.lock, flags);
50307 }
50308 }
50309 @@ -447,12 +447,12 @@ static void hvc_hangup(struct tty_struct *tty)
50310 * open->hangup case this can be called after the final close so prevent
50311 * that from happening for now.
50312 */
50313 - if (hp->port.count <= 0) {
50314 + if (atomic_read(&hp->port.count) <= 0) {
50315 spin_unlock_irqrestore(&hp->port.lock, flags);
50316 return;
50317 }
50318
50319 - hp->port.count = 0;
50320 + atomic_set(&hp->port.count, 0);
50321 spin_unlock_irqrestore(&hp->port.lock, flags);
50322 tty_port_tty_set(&hp->port, NULL);
50323
50324 @@ -500,7 +500,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
50325 return -EPIPE;
50326
50327 /* FIXME what's this (unprotected) check for? */
50328 - if (hp->port.count <= 0)
50329 + if (atomic_read(&hp->port.count) <= 0)
50330 return -EIO;
50331
50332 spin_lock_irqsave(&hp->lock, flags);
50333 diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
50334 index 81e939e..95ead10 100644
50335 --- a/drivers/tty/hvc/hvcs.c
50336 +++ b/drivers/tty/hvc/hvcs.c
50337 @@ -83,6 +83,7 @@
50338 #include <asm/hvcserver.h>
50339 #include <asm/uaccess.h>
50340 #include <asm/vio.h>
50341 +#include <asm/local.h>
50342
50343 /*
50344 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
50345 @@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
50346
50347 spin_lock_irqsave(&hvcsd->lock, flags);
50348
50349 - if (hvcsd->port.count > 0) {
50350 + if (atomic_read(&hvcsd->port.count) > 0) {
50351 spin_unlock_irqrestore(&hvcsd->lock, flags);
50352 printk(KERN_INFO "HVCS: vterm state unchanged. "
50353 "The hvcs device node is still in use.\n");
50354 @@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
50355 }
50356 }
50357
50358 - hvcsd->port.count = 0;
50359 + atomic_set(&hvcsd->port.count, 0);
50360 hvcsd->port.tty = tty;
50361 tty->driver_data = hvcsd;
50362
50363 @@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
50364 unsigned long flags;
50365
50366 spin_lock_irqsave(&hvcsd->lock, flags);
50367 - hvcsd->port.count++;
50368 + atomic_inc(&hvcsd->port.count);
50369 hvcsd->todo_mask |= HVCS_SCHED_READ;
50370 spin_unlock_irqrestore(&hvcsd->lock, flags);
50371
50372 @@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
50373 hvcsd = tty->driver_data;
50374
50375 spin_lock_irqsave(&hvcsd->lock, flags);
50376 - if (--hvcsd->port.count == 0) {
50377 + if (atomic_dec_and_test(&hvcsd->port.count)) {
50378
50379 vio_disable_interrupts(hvcsd->vdev);
50380
50381 @@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
50382
50383 free_irq(irq, hvcsd);
50384 return;
50385 - } else if (hvcsd->port.count < 0) {
50386 + } else if (atomic_read(&hvcsd->port.count) < 0) {
50387 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
50388 " is missmanaged.\n",
50389 - hvcsd->vdev->unit_address, hvcsd->port.count);
50390 + hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
50391 }
50392
50393 spin_unlock_irqrestore(&hvcsd->lock, flags);
50394 @@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
50395
50396 spin_lock_irqsave(&hvcsd->lock, flags);
50397 /* Preserve this so that we know how many kref refs to put */
50398 - temp_open_count = hvcsd->port.count;
50399 + temp_open_count = atomic_read(&hvcsd->port.count);
50400
50401 /*
50402 * Don't kref put inside the spinlock because the destruction
50403 @@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
50404 tty->driver_data = NULL;
50405 hvcsd->port.tty = NULL;
50406
50407 - hvcsd->port.count = 0;
50408 + atomic_set(&hvcsd->port.count, 0);
50409
50410 /* This will drop any buffered data on the floor which is OK in a hangup
50411 * scenario. */
50412 @@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
50413 * the middle of a write operation? This is a crummy place to do this
50414 * but we want to keep it all in the spinlock.
50415 */
50416 - if (hvcsd->port.count <= 0) {
50417 + if (atomic_read(&hvcsd->port.count) <= 0) {
50418 spin_unlock_irqrestore(&hvcsd->lock, flags);
50419 return -ENODEV;
50420 }
50421 @@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
50422 {
50423 struct hvcs_struct *hvcsd = tty->driver_data;
50424
50425 - if (!hvcsd || hvcsd->port.count <= 0)
50426 + if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
50427 return 0;
50428
50429 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
50430 diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
50431 index 4190199..06d5bfa 100644
50432 --- a/drivers/tty/hvc/hvsi.c
50433 +++ b/drivers/tty/hvc/hvsi.c
50434 @@ -85,7 +85,7 @@ struct hvsi_struct {
50435 int n_outbuf;
50436 uint32_t vtermno;
50437 uint32_t virq;
50438 - atomic_t seqno; /* HVSI packet sequence number */
50439 + atomic_unchecked_t seqno; /* HVSI packet sequence number */
50440 uint16_t mctrl;
50441 uint8_t state; /* HVSI protocol state */
50442 uint8_t flags;
50443 @@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
50444
50445 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
50446 packet.hdr.len = sizeof(struct hvsi_query_response);
50447 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
50448 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
50449 packet.verb = VSV_SEND_VERSION_NUMBER;
50450 packet.u.version = HVSI_VERSION;
50451 packet.query_seqno = query_seqno+1;
50452 @@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
50453
50454 packet.hdr.type = VS_QUERY_PACKET_HEADER;
50455 packet.hdr.len = sizeof(struct hvsi_query);
50456 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
50457 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
50458 packet.verb = verb;
50459
50460 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
50461 @@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
50462 int wrote;
50463
50464 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
50465 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
50466 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
50467 packet.hdr.len = sizeof(struct hvsi_control);
50468 packet.verb = VSV_SET_MODEM_CTL;
50469 packet.mask = HVSI_TSDTR;
50470 @@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
50471 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
50472
50473 packet.hdr.type = VS_DATA_PACKET_HEADER;
50474 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
50475 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
50476 packet.hdr.len = count + sizeof(struct hvsi_header);
50477 memcpy(&packet.data, buf, count);
50478
50479 @@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
50480 struct hvsi_control packet __ALIGNED__;
50481
50482 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
50483 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
50484 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
50485 packet.hdr.len = 6;
50486 packet.verb = VSV_CLOSE_PROTOCOL;
50487
50488 @@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
50489
50490 tty_port_tty_set(&hp->port, tty);
50491 spin_lock_irqsave(&hp->lock, flags);
50492 - hp->port.count++;
50493 + atomic_inc(&hp->port.count);
50494 atomic_set(&hp->seqno, 0);
50495 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
50496 spin_unlock_irqrestore(&hp->lock, flags);
50497 @@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
50498
50499 spin_lock_irqsave(&hp->lock, flags);
50500
50501 - if (--hp->port.count == 0) {
50502 + if (atomic_dec_return(&hp->port.count) == 0) {
50503 tty_port_tty_set(&hp->port, NULL);
50504 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
50505
50506 @@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
50507
50508 spin_lock_irqsave(&hp->lock, flags);
50509 }
50510 - } else if (hp->port.count < 0)
50511 + } else if (atomic_read(&hp->port.count) < 0)
50512 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
50513 - hp - hvsi_ports, hp->port.count);
50514 + hp - hvsi_ports, atomic_read(&hp->port.count));
50515
50516 spin_unlock_irqrestore(&hp->lock, flags);
50517 }
50518 @@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
50519 tty_port_tty_set(&hp->port, NULL);
50520
50521 spin_lock_irqsave(&hp->lock, flags);
50522 - hp->port.count = 0;
50523 + atomic_set(&hp->port.count, 0);
50524 hp->n_outbuf = 0;
50525 spin_unlock_irqrestore(&hp->lock, flags);
50526 }
50527 diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
50528 index 7ae6c29..05c6dba 100644
50529 --- a/drivers/tty/hvc/hvsi_lib.c
50530 +++ b/drivers/tty/hvc/hvsi_lib.c
50531 @@ -8,7 +8,7 @@
50532
50533 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
50534 {
50535 - packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
50536 + packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
50537
50538 /* Assumes that always succeeds, works in practice */
50539 return pv->put_chars(pv->termno, (char *)packet, packet->len);
50540 @@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
50541
50542 /* Reset state */
50543 pv->established = 0;
50544 - atomic_set(&pv->seqno, 0);
50545 + atomic_set_unchecked(&pv->seqno, 0);
50546
50547 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
50548
50549 diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
50550 index 17ee3bf..8d2520d 100644
50551 --- a/drivers/tty/ipwireless/tty.c
50552 +++ b/drivers/tty/ipwireless/tty.c
50553 @@ -28,6 +28,7 @@
50554 #include <linux/tty_driver.h>
50555 #include <linux/tty_flip.h>
50556 #include <linux/uaccess.h>
50557 +#include <asm/local.h>
50558
50559 #include "tty.h"
50560 #include "network.h"
50561 @@ -98,10 +99,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
50562 mutex_unlock(&tty->ipw_tty_mutex);
50563 return -ENODEV;
50564 }
50565 - if (tty->port.count == 0)
50566 + if (atomic_read(&tty->port.count) == 0)
50567 tty->tx_bytes_queued = 0;
50568
50569 - tty->port.count++;
50570 + atomic_inc(&tty->port.count);
50571
50572 tty->port.tty = linux_tty;
50573 linux_tty->driver_data = tty;
50574 @@ -117,9 +118,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
50575
50576 static void do_ipw_close(struct ipw_tty *tty)
50577 {
50578 - tty->port.count--;
50579 -
50580 - if (tty->port.count == 0) {
50581 + if (atomic_dec_return(&tty->port.count) == 0) {
50582 struct tty_struct *linux_tty = tty->port.tty;
50583
50584 if (linux_tty != NULL) {
50585 @@ -140,7 +139,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
50586 return;
50587
50588 mutex_lock(&tty->ipw_tty_mutex);
50589 - if (tty->port.count == 0) {
50590 + if (atomic_read(&tty->port.count) == 0) {
50591 mutex_unlock(&tty->ipw_tty_mutex);
50592 return;
50593 }
50594 @@ -163,7 +162,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
50595
50596 mutex_lock(&tty->ipw_tty_mutex);
50597
50598 - if (!tty->port.count) {
50599 + if (!atomic_read(&tty->port.count)) {
50600 mutex_unlock(&tty->ipw_tty_mutex);
50601 return;
50602 }
50603 @@ -202,7 +201,7 @@ static int ipw_write(struct tty_struct *linux_tty,
50604 return -ENODEV;
50605
50606 mutex_lock(&tty->ipw_tty_mutex);
50607 - if (!tty->port.count) {
50608 + if (!atomic_read(&tty->port.count)) {
50609 mutex_unlock(&tty->ipw_tty_mutex);
50610 return -EINVAL;
50611 }
50612 @@ -242,7 +241,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
50613 if (!tty)
50614 return -ENODEV;
50615
50616 - if (!tty->port.count)
50617 + if (!atomic_read(&tty->port.count))
50618 return -EINVAL;
50619
50620 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
50621 @@ -284,7 +283,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
50622 if (!tty)
50623 return 0;
50624
50625 - if (!tty->port.count)
50626 + if (!atomic_read(&tty->port.count))
50627 return 0;
50628
50629 return tty->tx_bytes_queued;
50630 @@ -365,7 +364,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
50631 if (!tty)
50632 return -ENODEV;
50633
50634 - if (!tty->port.count)
50635 + if (!atomic_read(&tty->port.count))
50636 return -EINVAL;
50637
50638 return get_control_lines(tty);
50639 @@ -381,7 +380,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
50640 if (!tty)
50641 return -ENODEV;
50642
50643 - if (!tty->port.count)
50644 + if (!atomic_read(&tty->port.count))
50645 return -EINVAL;
50646
50647 return set_control_lines(tty, set, clear);
50648 @@ -395,7 +394,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
50649 if (!tty)
50650 return -ENODEV;
50651
50652 - if (!tty->port.count)
50653 + if (!atomic_read(&tty->port.count))
50654 return -EINVAL;
50655
50656 /* FIXME: Exactly how is the tty object locked here .. */
50657 @@ -551,7 +550,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
50658 * are gone */
50659 mutex_lock(&ttyj->ipw_tty_mutex);
50660 }
50661 - while (ttyj->port.count)
50662 + while (atomic_read(&ttyj->port.count))
50663 do_ipw_close(ttyj);
50664 ipwireless_disassociate_network_ttys(network,
50665 ttyj->channel_idx);
50666 diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
50667 index 1deaca4..c8582d4 100644
50668 --- a/drivers/tty/moxa.c
50669 +++ b/drivers/tty/moxa.c
50670 @@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
50671 }
50672
50673 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
50674 - ch->port.count++;
50675 + atomic_inc(&ch->port.count);
50676 tty->driver_data = ch;
50677 tty_port_tty_set(&ch->port, tty);
50678 mutex_lock(&ch->port.mutex);
50679 diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
50680 index 2ebe47b..3205833 100644
50681 --- a/drivers/tty/n_gsm.c
50682 +++ b/drivers/tty/n_gsm.c
50683 @@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
50684 spin_lock_init(&dlci->lock);
50685 mutex_init(&dlci->mutex);
50686 dlci->fifo = &dlci->_fifo;
50687 - if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
50688 + if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
50689 kfree(dlci);
50690 return NULL;
50691 }
50692 @@ -2954,7 +2954,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
50693 struct gsm_dlci *dlci = tty->driver_data;
50694 struct tty_port *port = &dlci->port;
50695
50696 - port->count++;
50697 + atomic_inc(&port->count);
50698 tty_port_tty_set(port, tty);
50699
50700 dlci->modem_rx = 0;
50701 diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
50702 index d15624c..e512bdb 100644
50703 --- a/drivers/tty/n_tty.c
50704 +++ b/drivers/tty/n_tty.c
50705 @@ -115,7 +115,7 @@ struct n_tty_data {
50706 int minimum_to_wake;
50707
50708 /* consumer-published */
50709 - size_t read_tail;
50710 + size_t read_tail __intentional_overflow(-1);
50711 size_t line_start;
50712
50713 /* protected by output lock */
50714 @@ -2515,6 +2515,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
50715 {
50716 *ops = tty_ldisc_N_TTY;
50717 ops->owner = NULL;
50718 - ops->refcount = ops->flags = 0;
50719 + atomic_set(&ops->refcount, 0);
50720 + ops->flags = 0;
50721 }
50722 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
50723 diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
50724 index 25c9bc7..24077b7 100644
50725 --- a/drivers/tty/pty.c
50726 +++ b/drivers/tty/pty.c
50727 @@ -790,8 +790,10 @@ static void __init unix98_pty_init(void)
50728 panic("Couldn't register Unix98 pts driver");
50729
50730 /* Now create the /dev/ptmx special device */
50731 + pax_open_kernel();
50732 tty_default_fops(&ptmx_fops);
50733 - ptmx_fops.open = ptmx_open;
50734 + *(void **)&ptmx_fops.open = ptmx_open;
50735 + pax_close_kernel();
50736
50737 cdev_init(&ptmx_cdev, &ptmx_fops);
50738 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
50739 diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
50740 index 383c4c7..d408e21 100644
50741 --- a/drivers/tty/rocket.c
50742 +++ b/drivers/tty/rocket.c
50743 @@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
50744 tty->driver_data = info;
50745 tty_port_tty_set(port, tty);
50746
50747 - if (port->count++ == 0) {
50748 + if (atomic_inc_return(&port->count) == 1) {
50749 atomic_inc(&rp_num_ports_open);
50750
50751 #ifdef ROCKET_DEBUG_OPEN
50752 @@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
50753 #endif
50754 }
50755 #ifdef ROCKET_DEBUG_OPEN
50756 - printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
50757 + printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
50758 #endif
50759
50760 /*
50761 @@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
50762 spin_unlock_irqrestore(&info->port.lock, flags);
50763 return;
50764 }
50765 - if (info->port.count)
50766 + if (atomic_read(&info->port.count))
50767 atomic_dec(&rp_num_ports_open);
50768 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
50769 spin_unlock_irqrestore(&info->port.lock, flags);
50770 diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
50771 index 1274499..f541382 100644
50772 --- a/drivers/tty/serial/ioc4_serial.c
50773 +++ b/drivers/tty/serial/ioc4_serial.c
50774 @@ -437,7 +437,7 @@ struct ioc4_soft {
50775 } is_intr_info[MAX_IOC4_INTR_ENTS];
50776
50777 /* Number of entries active in the above array */
50778 - atomic_t is_num_intrs;
50779 + atomic_unchecked_t is_num_intrs;
50780 } is_intr_type[IOC4_NUM_INTR_TYPES];
50781
50782 /* is_ir_lock must be held while
50783 @@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
50784 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
50785 || (type == IOC4_OTHER_INTR_TYPE)));
50786
50787 - i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
50788 + i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
50789 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
50790
50791 /* Save off the lower level interrupt handler */
50792 @@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
50793
50794 soft = arg;
50795 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
50796 - num_intrs = (int)atomic_read(
50797 + num_intrs = (int)atomic_read_unchecked(
50798 &soft->is_intr_type[intr_type].is_num_intrs);
50799
50800 this_mir = this_ir = pending_intrs(soft, intr_type);
50801 diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
50802 index a260cde..6b2b5ce 100644
50803 --- a/drivers/tty/serial/kgdboc.c
50804 +++ b/drivers/tty/serial/kgdboc.c
50805 @@ -24,8 +24,9 @@
50806 #define MAX_CONFIG_LEN 40
50807
50808 static struct kgdb_io kgdboc_io_ops;
50809 +static struct kgdb_io kgdboc_io_ops_console;
50810
50811 -/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
50812 +/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
50813 static int configured = -1;
50814
50815 static char config[MAX_CONFIG_LEN];
50816 @@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
50817 kgdboc_unregister_kbd();
50818 if (configured == 1)
50819 kgdb_unregister_io_module(&kgdboc_io_ops);
50820 + else if (configured == 2)
50821 + kgdb_unregister_io_module(&kgdboc_io_ops_console);
50822 }
50823
50824 static int configure_kgdboc(void)
50825 @@ -160,13 +163,13 @@ static int configure_kgdboc(void)
50826 int err;
50827 char *cptr = config;
50828 struct console *cons;
50829 + int is_console = 0;
50830
50831 err = kgdboc_option_setup(config);
50832 if (err || !strlen(config) || isspace(config[0]))
50833 goto noconfig;
50834
50835 err = -ENODEV;
50836 - kgdboc_io_ops.is_console = 0;
50837 kgdb_tty_driver = NULL;
50838
50839 kgdboc_use_kms = 0;
50840 @@ -187,7 +190,7 @@ static int configure_kgdboc(void)
50841 int idx;
50842 if (cons->device && cons->device(cons, &idx) == p &&
50843 idx == tty_line) {
50844 - kgdboc_io_ops.is_console = 1;
50845 + is_console = 1;
50846 break;
50847 }
50848 cons = cons->next;
50849 @@ -197,7 +200,13 @@ static int configure_kgdboc(void)
50850 kgdb_tty_line = tty_line;
50851
50852 do_register:
50853 - err = kgdb_register_io_module(&kgdboc_io_ops);
50854 + if (is_console) {
50855 + err = kgdb_register_io_module(&kgdboc_io_ops_console);
50856 + configured = 2;
50857 + } else {
50858 + err = kgdb_register_io_module(&kgdboc_io_ops);
50859 + configured = 1;
50860 + }
50861 if (err)
50862 goto noconfig;
50863
50864 @@ -205,8 +214,6 @@ do_register:
50865 if (err)
50866 goto nmi_con_failed;
50867
50868 - configured = 1;
50869 -
50870 return 0;
50871
50872 nmi_con_failed:
50873 @@ -223,7 +230,7 @@ noconfig:
50874 static int __init init_kgdboc(void)
50875 {
50876 /* Already configured? */
50877 - if (configured == 1)
50878 + if (configured >= 1)
50879 return 0;
50880
50881 return configure_kgdboc();
50882 @@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
50883 if (config[len - 1] == '\n')
50884 config[len - 1] = '\0';
50885
50886 - if (configured == 1)
50887 + if (configured >= 1)
50888 cleanup_kgdboc();
50889
50890 /* Go and configure with the new params. */
50891 @@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
50892 .post_exception = kgdboc_post_exp_handler,
50893 };
50894
50895 +static struct kgdb_io kgdboc_io_ops_console = {
50896 + .name = "kgdboc",
50897 + .read_char = kgdboc_get_char,
50898 + .write_char = kgdboc_put_char,
50899 + .pre_exception = kgdboc_pre_exp_handler,
50900 + .post_exception = kgdboc_post_exp_handler,
50901 + .is_console = 1
50902 +};
50903 +
50904 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
50905 /* This is only available if kgdboc is a built in for early debugging */
50906 static int __init kgdboc_early_init(char *opt)
50907 diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
50908 index b5d779c..3622cfe 100644
50909 --- a/drivers/tty/serial/msm_serial.c
50910 +++ b/drivers/tty/serial/msm_serial.c
50911 @@ -897,7 +897,7 @@ static struct uart_driver msm_uart_driver = {
50912 .cons = MSM_CONSOLE,
50913 };
50914
50915 -static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
50916 +static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
50917
50918 static const struct of_device_id msm_uartdm_table[] = {
50919 { .compatible = "qcom,msm-uartdm" },
50920 @@ -912,7 +912,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
50921 int irq;
50922
50923 if (pdev->id == -1)
50924 - pdev->id = atomic_inc_return(&msm_uart_next_id) - 1;
50925 + pdev->id = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
50926
50927 if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))
50928 return -ENXIO;
50929 diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
50930 index 9cd706d..6ff2de7 100644
50931 --- a/drivers/tty/serial/samsung.c
50932 +++ b/drivers/tty/serial/samsung.c
50933 @@ -463,11 +463,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
50934 }
50935 }
50936
50937 +static int s3c64xx_serial_startup(struct uart_port *port);
50938 static int s3c24xx_serial_startup(struct uart_port *port)
50939 {
50940 struct s3c24xx_uart_port *ourport = to_ourport(port);
50941 int ret;
50942
50943 + /* Startup sequence is different for s3c64xx and higher SoC's */
50944 + if (s3c24xx_serial_has_interrupt_mask(port))
50945 + return s3c64xx_serial_startup(port);
50946 +
50947 dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n",
50948 port->mapbase, port->membase);
50949
50950 @@ -1141,10 +1146,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
50951 /* setup info for port */
50952 port->dev = &platdev->dev;
50953
50954 - /* Startup sequence is different for s3c64xx and higher SoC's */
50955 - if (s3c24xx_serial_has_interrupt_mask(port))
50956 - s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
50957 -
50958 port->uartclk = 1;
50959
50960 if (cfg->uart_flags & UPF_CONS_FLOW) {
50961 diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
50962 index ece2049..fba2524 100644
50963 --- a/drivers/tty/serial/serial_core.c
50964 +++ b/drivers/tty/serial/serial_core.c
50965 @@ -1448,7 +1448,7 @@ static void uart_hangup(struct tty_struct *tty)
50966 uart_flush_buffer(tty);
50967 uart_shutdown(tty, state);
50968 spin_lock_irqsave(&port->lock, flags);
50969 - port->count = 0;
50970 + atomic_set(&port->count, 0);
50971 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
50972 spin_unlock_irqrestore(&port->lock, flags);
50973 tty_port_tty_set(port, NULL);
50974 @@ -1544,7 +1544,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
50975 goto end;
50976 }
50977
50978 - port->count++;
50979 + atomic_inc(&port->count);
50980 if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
50981 retval = -ENXIO;
50982 goto err_dec_count;
50983 @@ -1572,7 +1572,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
50984 /*
50985 * Make sure the device is in D0 state.
50986 */
50987 - if (port->count == 1)
50988 + if (atomic_read(&port->count) == 1)
50989 uart_change_pm(state, UART_PM_STATE_ON);
50990
50991 /*
50992 @@ -1590,7 +1590,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
50993 end:
50994 return retval;
50995 err_dec_count:
50996 - port->count--;
50997 + atomic_inc(&port->count);
50998 mutex_unlock(&port->mutex);
50999 goto end;
51000 }
51001 diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
51002 index 5ae14b4..2c1288f 100644
51003 --- a/drivers/tty/synclink.c
51004 +++ b/drivers/tty/synclink.c
51005 @@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
51006
51007 if (debug_level >= DEBUG_LEVEL_INFO)
51008 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
51009 - __FILE__,__LINE__, info->device_name, info->port.count);
51010 + __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
51011
51012 if (tty_port_close_start(&info->port, tty, filp) == 0)
51013 goto cleanup;
51014 @@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
51015 cleanup:
51016 if (debug_level >= DEBUG_LEVEL_INFO)
51017 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
51018 - tty->driver->name, info->port.count);
51019 + tty->driver->name, atomic_read(&info->port.count));
51020
51021 } /* end of mgsl_close() */
51022
51023 @@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
51024
51025 mgsl_flush_buffer(tty);
51026 shutdown(info);
51027 -
51028 - info->port.count = 0;
51029 +
51030 + atomic_set(&info->port.count, 0);
51031 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
51032 info->port.tty = NULL;
51033
51034 @@ -3297,12 +3297,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
51035
51036 if (debug_level >= DEBUG_LEVEL_INFO)
51037 printk("%s(%d):block_til_ready before block on %s count=%d\n",
51038 - __FILE__,__LINE__, tty->driver->name, port->count );
51039 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
51040
51041 spin_lock_irqsave(&info->irq_spinlock, flags);
51042 if (!tty_hung_up_p(filp)) {
51043 extra_count = true;
51044 - port->count--;
51045 + atomic_dec(&port->count);
51046 }
51047 spin_unlock_irqrestore(&info->irq_spinlock, flags);
51048 port->blocked_open++;
51049 @@ -3331,7 +3331,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
51050
51051 if (debug_level >= DEBUG_LEVEL_INFO)
51052 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
51053 - __FILE__,__LINE__, tty->driver->name, port->count );
51054 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
51055
51056 tty_unlock(tty);
51057 schedule();
51058 @@ -3343,12 +3343,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
51059
51060 /* FIXME: Racy on hangup during close wait */
51061 if (extra_count)
51062 - port->count++;
51063 + atomic_inc(&port->count);
51064 port->blocked_open--;
51065
51066 if (debug_level >= DEBUG_LEVEL_INFO)
51067 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
51068 - __FILE__,__LINE__, tty->driver->name, port->count );
51069 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
51070
51071 if (!retval)
51072 port->flags |= ASYNC_NORMAL_ACTIVE;
51073 @@ -3400,7 +3400,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
51074
51075 if (debug_level >= DEBUG_LEVEL_INFO)
51076 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
51077 - __FILE__,__LINE__,tty->driver->name, info->port.count);
51078 + __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
51079
51080 /* If port is closing, signal caller to try again */
51081 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
51082 @@ -3419,10 +3419,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
51083 spin_unlock_irqrestore(&info->netlock, flags);
51084 goto cleanup;
51085 }
51086 - info->port.count++;
51087 + atomic_inc(&info->port.count);
51088 spin_unlock_irqrestore(&info->netlock, flags);
51089
51090 - if (info->port.count == 1) {
51091 + if (atomic_read(&info->port.count) == 1) {
51092 /* 1st open on this device, init hardware */
51093 retval = startup(info);
51094 if (retval < 0)
51095 @@ -3446,8 +3446,8 @@ cleanup:
51096 if (retval) {
51097 if (tty->count == 1)
51098 info->port.tty = NULL; /* tty layer will release tty struct */
51099 - if(info->port.count)
51100 - info->port.count--;
51101 + if (atomic_read(&info->port.count))
51102 + atomic_dec(&info->port.count);
51103 }
51104
51105 return retval;
51106 @@ -7665,7 +7665,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
51107 unsigned short new_crctype;
51108
51109 /* return error if TTY interface open */
51110 - if (info->port.count)
51111 + if (atomic_read(&info->port.count))
51112 return -EBUSY;
51113
51114 switch (encoding)
51115 @@ -7760,7 +7760,7 @@ static int hdlcdev_open(struct net_device *dev)
51116
51117 /* arbitrate between network and tty opens */
51118 spin_lock_irqsave(&info->netlock, flags);
51119 - if (info->port.count != 0 || info->netcount != 0) {
51120 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
51121 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
51122 spin_unlock_irqrestore(&info->netlock, flags);
51123 return -EBUSY;
51124 @@ -7846,7 +7846,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
51125 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
51126
51127 /* return error if TTY interface open */
51128 - if (info->port.count)
51129 + if (atomic_read(&info->port.count))
51130 return -EBUSY;
51131
51132 if (cmd != SIOCWANDEV)
51133 diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
51134 index c359a91..959fc26 100644
51135 --- a/drivers/tty/synclink_gt.c
51136 +++ b/drivers/tty/synclink_gt.c
51137 @@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
51138 tty->driver_data = info;
51139 info->port.tty = tty;
51140
51141 - DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
51142 + DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
51143
51144 /* If port is closing, signal caller to try again */
51145 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
51146 @@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
51147 mutex_unlock(&info->port.mutex);
51148 goto cleanup;
51149 }
51150 - info->port.count++;
51151 + atomic_inc(&info->port.count);
51152 spin_unlock_irqrestore(&info->netlock, flags);
51153
51154 - if (info->port.count == 1) {
51155 + if (atomic_read(&info->port.count) == 1) {
51156 /* 1st open on this device, init hardware */
51157 retval = startup(info);
51158 if (retval < 0) {
51159 @@ -715,8 +715,8 @@ cleanup:
51160 if (retval) {
51161 if (tty->count == 1)
51162 info->port.tty = NULL; /* tty layer will release tty struct */
51163 - if(info->port.count)
51164 - info->port.count--;
51165 + if(atomic_read(&info->port.count))
51166 + atomic_dec(&info->port.count);
51167 }
51168
51169 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
51170 @@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
51171
51172 if (sanity_check(info, tty->name, "close"))
51173 return;
51174 - DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
51175 + DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
51176
51177 if (tty_port_close_start(&info->port, tty, filp) == 0)
51178 goto cleanup;
51179 @@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
51180 tty_port_close_end(&info->port, tty);
51181 info->port.tty = NULL;
51182 cleanup:
51183 - DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
51184 + DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
51185 }
51186
51187 static void hangup(struct tty_struct *tty)
51188 @@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
51189 shutdown(info);
51190
51191 spin_lock_irqsave(&info->port.lock, flags);
51192 - info->port.count = 0;
51193 + atomic_set(&info->port.count, 0);
51194 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
51195 info->port.tty = NULL;
51196 spin_unlock_irqrestore(&info->port.lock, flags);
51197 @@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
51198 unsigned short new_crctype;
51199
51200 /* return error if TTY interface open */
51201 - if (info->port.count)
51202 + if (atomic_read(&info->port.count))
51203 return -EBUSY;
51204
51205 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
51206 @@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
51207
51208 /* arbitrate between network and tty opens */
51209 spin_lock_irqsave(&info->netlock, flags);
51210 - if (info->port.count != 0 || info->netcount != 0) {
51211 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
51212 DBGINFO(("%s hdlc_open busy\n", dev->name));
51213 spin_unlock_irqrestore(&info->netlock, flags);
51214 return -EBUSY;
51215 @@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
51216 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
51217
51218 /* return error if TTY interface open */
51219 - if (info->port.count)
51220 + if (atomic_read(&info->port.count))
51221 return -EBUSY;
51222
51223 if (cmd != SIOCWANDEV)
51224 @@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
51225 if (port == NULL)
51226 continue;
51227 spin_lock(&port->lock);
51228 - if ((port->port.count || port->netcount) &&
51229 + if ((atomic_read(&port->port.count) || port->netcount) &&
51230 port->pending_bh && !port->bh_running &&
51231 !port->bh_requested) {
51232 DBGISR(("%s bh queued\n", port->device_name));
51233 @@ -3302,7 +3302,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
51234 spin_lock_irqsave(&info->lock, flags);
51235 if (!tty_hung_up_p(filp)) {
51236 extra_count = true;
51237 - port->count--;
51238 + atomic_dec(&port->count);
51239 }
51240 spin_unlock_irqrestore(&info->lock, flags);
51241 port->blocked_open++;
51242 @@ -3339,7 +3339,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
51243 remove_wait_queue(&port->open_wait, &wait);
51244
51245 if (extra_count)
51246 - port->count++;
51247 + atomic_inc(&port->count);
51248 port->blocked_open--;
51249
51250 if (!retval)
51251 diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
51252 index 144202e..4ccb07d 100644
51253 --- a/drivers/tty/synclinkmp.c
51254 +++ b/drivers/tty/synclinkmp.c
51255 @@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
51256
51257 if (debug_level >= DEBUG_LEVEL_INFO)
51258 printk("%s(%d):%s open(), old ref count = %d\n",
51259 - __FILE__,__LINE__,tty->driver->name, info->port.count);
51260 + __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
51261
51262 /* If port is closing, signal caller to try again */
51263 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
51264 @@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
51265 spin_unlock_irqrestore(&info->netlock, flags);
51266 goto cleanup;
51267 }
51268 - info->port.count++;
51269 + atomic_inc(&info->port.count);
51270 spin_unlock_irqrestore(&info->netlock, flags);
51271
51272 - if (info->port.count == 1) {
51273 + if (atomic_read(&info->port.count) == 1) {
51274 /* 1st open on this device, init hardware */
51275 retval = startup(info);
51276 if (retval < 0)
51277 @@ -796,8 +796,8 @@ cleanup:
51278 if (retval) {
51279 if (tty->count == 1)
51280 info->port.tty = NULL; /* tty layer will release tty struct */
51281 - if(info->port.count)
51282 - info->port.count--;
51283 + if(atomic_read(&info->port.count))
51284 + atomic_dec(&info->port.count);
51285 }
51286
51287 return retval;
51288 @@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
51289
51290 if (debug_level >= DEBUG_LEVEL_INFO)
51291 printk("%s(%d):%s close() entry, count=%d\n",
51292 - __FILE__,__LINE__, info->device_name, info->port.count);
51293 + __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
51294
51295 if (tty_port_close_start(&info->port, tty, filp) == 0)
51296 goto cleanup;
51297 @@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
51298 cleanup:
51299 if (debug_level >= DEBUG_LEVEL_INFO)
51300 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
51301 - tty->driver->name, info->port.count);
51302 + tty->driver->name, atomic_read(&info->port.count));
51303 }
51304
51305 /* Called by tty_hangup() when a hangup is signaled.
51306 @@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
51307 shutdown(info);
51308
51309 spin_lock_irqsave(&info->port.lock, flags);
51310 - info->port.count = 0;
51311 + atomic_set(&info->port.count, 0);
51312 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
51313 info->port.tty = NULL;
51314 spin_unlock_irqrestore(&info->port.lock, flags);
51315 @@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
51316 unsigned short new_crctype;
51317
51318 /* return error if TTY interface open */
51319 - if (info->port.count)
51320 + if (atomic_read(&info->port.count))
51321 return -EBUSY;
51322
51323 switch (encoding)
51324 @@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
51325
51326 /* arbitrate between network and tty opens */
51327 spin_lock_irqsave(&info->netlock, flags);
51328 - if (info->port.count != 0 || info->netcount != 0) {
51329 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
51330 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
51331 spin_unlock_irqrestore(&info->netlock, flags);
51332 return -EBUSY;
51333 @@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
51334 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
51335
51336 /* return error if TTY interface open */
51337 - if (info->port.count)
51338 + if (atomic_read(&info->port.count))
51339 return -EBUSY;
51340
51341 if (cmd != SIOCWANDEV)
51342 @@ -2620,7 +2620,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
51343 * do not request bottom half processing if the
51344 * device is not open in a normal mode.
51345 */
51346 - if ( port && (port->port.count || port->netcount) &&
51347 + if ( port && (atomic_read(&port->port.count) || port->netcount) &&
51348 port->pending_bh && !port->bh_running &&
51349 !port->bh_requested ) {
51350 if ( debug_level >= DEBUG_LEVEL_ISR )
51351 @@ -3318,12 +3318,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
51352
51353 if (debug_level >= DEBUG_LEVEL_INFO)
51354 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
51355 - __FILE__,__LINE__, tty->driver->name, port->count );
51356 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
51357
51358 spin_lock_irqsave(&info->lock, flags);
51359 if (!tty_hung_up_p(filp)) {
51360 extra_count = true;
51361 - port->count--;
51362 + atomic_dec(&port->count);
51363 }
51364 spin_unlock_irqrestore(&info->lock, flags);
51365 port->blocked_open++;
51366 @@ -3352,7 +3352,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
51367
51368 if (debug_level >= DEBUG_LEVEL_INFO)
51369 printk("%s(%d):%s block_til_ready() count=%d\n",
51370 - __FILE__,__LINE__, tty->driver->name, port->count );
51371 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
51372
51373 tty_unlock(tty);
51374 schedule();
51375 @@ -3363,12 +3363,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
51376 remove_wait_queue(&port->open_wait, &wait);
51377
51378 if (extra_count)
51379 - port->count++;
51380 + atomic_inc(&port->count);
51381 port->blocked_open--;
51382
51383 if (debug_level >= DEBUG_LEVEL_INFO)
51384 printk("%s(%d):%s block_til_ready() after, count=%d\n",
51385 - __FILE__,__LINE__, tty->driver->name, port->count );
51386 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
51387
51388 if (!retval)
51389 port->flags |= ASYNC_NORMAL_ACTIVE;
51390 diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
51391 index ce396ec..04a37be 100644
51392 --- a/drivers/tty/sysrq.c
51393 +++ b/drivers/tty/sysrq.c
51394 @@ -1075,7 +1075,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
51395 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
51396 size_t count, loff_t *ppos)
51397 {
51398 - if (count) {
51399 + if (count && capable(CAP_SYS_ADMIN)) {
51400 char c;
51401
51402 if (get_user(c, buf))
51403 diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
51404 index d3448a9..28e8db0 100644
51405 --- a/drivers/tty/tty_io.c
51406 +++ b/drivers/tty/tty_io.c
51407 @@ -3475,7 +3475,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
51408
51409 void tty_default_fops(struct file_operations *fops)
51410 {
51411 - *fops = tty_fops;
51412 + memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
51413 }
51414
51415 /*
51416 diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
51417 index 2d822aa..a566234 100644
51418 --- a/drivers/tty/tty_ldisc.c
51419 +++ b/drivers/tty/tty_ldisc.c
51420 @@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
51421 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
51422 tty_ldiscs[disc] = new_ldisc;
51423 new_ldisc->num = disc;
51424 - new_ldisc->refcount = 0;
51425 + atomic_set(&new_ldisc->refcount, 0);
51426 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
51427
51428 return ret;
51429 @@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
51430 return -EINVAL;
51431
51432 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
51433 - if (tty_ldiscs[disc]->refcount)
51434 + if (atomic_read(&tty_ldiscs[disc]->refcount))
51435 ret = -EBUSY;
51436 else
51437 tty_ldiscs[disc] = NULL;
51438 @@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
51439 if (ldops) {
51440 ret = ERR_PTR(-EAGAIN);
51441 if (try_module_get(ldops->owner)) {
51442 - ldops->refcount++;
51443 + atomic_inc(&ldops->refcount);
51444 ret = ldops;
51445 }
51446 }
51447 @@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
51448 unsigned long flags;
51449
51450 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
51451 - ldops->refcount--;
51452 + atomic_dec(&ldops->refcount);
51453 module_put(ldops->owner);
51454 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
51455 }
51456 diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
51457 index 3f746c8..2f2fcaa 100644
51458 --- a/drivers/tty/tty_port.c
51459 +++ b/drivers/tty/tty_port.c
51460 @@ -235,7 +235,7 @@ void tty_port_hangup(struct tty_port *port)
51461 unsigned long flags;
51462
51463 spin_lock_irqsave(&port->lock, flags);
51464 - port->count = 0;
51465 + atomic_set(&port->count, 0);
51466 port->flags &= ~ASYNC_NORMAL_ACTIVE;
51467 tty = port->tty;
51468 if (tty)
51469 @@ -393,7 +393,7 @@ int tty_port_block_til_ready(struct tty_port *port,
51470 /* The port lock protects the port counts */
51471 spin_lock_irqsave(&port->lock, flags);
51472 if (!tty_hung_up_p(filp))
51473 - port->count--;
51474 + atomic_dec(&port->count);
51475 port->blocked_open++;
51476 spin_unlock_irqrestore(&port->lock, flags);
51477
51478 @@ -435,7 +435,7 @@ int tty_port_block_til_ready(struct tty_port *port,
51479 we must not mess that up further */
51480 spin_lock_irqsave(&port->lock, flags);
51481 if (!tty_hung_up_p(filp))
51482 - port->count++;
51483 + atomic_inc(&port->count);
51484 port->blocked_open--;
51485 if (retval == 0)
51486 port->flags |= ASYNC_NORMAL_ACTIVE;
51487 @@ -469,19 +469,19 @@ int tty_port_close_start(struct tty_port *port,
51488 return 0;
51489 }
51490
51491 - if (tty->count == 1 && port->count != 1) {
51492 + if (tty->count == 1 && atomic_read(&port->count) != 1) {
51493 printk(KERN_WARNING
51494 "tty_port_close_start: tty->count = 1 port count = %d.\n",
51495 - port->count);
51496 - port->count = 1;
51497 + atomic_read(&port->count));
51498 + atomic_set(&port->count, 1);
51499 }
51500 - if (--port->count < 0) {
51501 + if (atomic_dec_return(&port->count) < 0) {
51502 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
51503 - port->count);
51504 - port->count = 0;
51505 + atomic_read(&port->count));
51506 + atomic_set(&port->count, 0);
51507 }
51508
51509 - if (port->count) {
51510 + if (atomic_read(&port->count)) {
51511 spin_unlock_irqrestore(&port->lock, flags);
51512 return 0;
51513 }
51514 @@ -563,7 +563,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
51515 {
51516 spin_lock_irq(&port->lock);
51517 if (!tty_hung_up_p(filp))
51518 - ++port->count;
51519 + atomic_inc(&port->count);
51520 spin_unlock_irq(&port->lock);
51521 tty_port_tty_set(port, tty);
51522
51523 diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
51524 index d0e3a44..5f8b754 100644
51525 --- a/drivers/tty/vt/keyboard.c
51526 +++ b/drivers/tty/vt/keyboard.c
51527 @@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
51528 kbd->kbdmode == VC_OFF) &&
51529 value != KVAL(K_SAK))
51530 return; /* SAK is allowed even in raw mode */
51531 +
51532 +#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
51533 + {
51534 + void *func = fn_handler[value];
51535 + if (func == fn_show_state || func == fn_show_ptregs ||
51536 + func == fn_show_mem)
51537 + return;
51538 + }
51539 +#endif
51540 +
51541 fn_handler[value](vc);
51542 }
51543
51544 @@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
51545 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
51546 return -EFAULT;
51547
51548 - if (!capable(CAP_SYS_TTY_CONFIG))
51549 - perm = 0;
51550 -
51551 switch (cmd) {
51552 case KDGKBENT:
51553 /* Ensure another thread doesn't free it under us */
51554 @@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
51555 spin_unlock_irqrestore(&kbd_event_lock, flags);
51556 return put_user(val, &user_kbe->kb_value);
51557 case KDSKBENT:
51558 + if (!capable(CAP_SYS_TTY_CONFIG))
51559 + perm = 0;
51560 +
51561 if (!perm)
51562 return -EPERM;
51563 if (!i && v == K_NOSUCHMAP) {
51564 @@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
51565 int i, j, k;
51566 int ret;
51567
51568 - if (!capable(CAP_SYS_TTY_CONFIG))
51569 - perm = 0;
51570 -
51571 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
51572 if (!kbs) {
51573 ret = -ENOMEM;
51574 @@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
51575 kfree(kbs);
51576 return ((p && *p) ? -EOVERFLOW : 0);
51577 case KDSKBSENT:
51578 + if (!capable(CAP_SYS_TTY_CONFIG))
51579 + perm = 0;
51580 +
51581 if (!perm) {
51582 ret = -EPERM;
51583 goto reterr;
51584 diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
51585 index a673e5b..36e5d32 100644
51586 --- a/drivers/uio/uio.c
51587 +++ b/drivers/uio/uio.c
51588 @@ -25,6 +25,7 @@
51589 #include <linux/kobject.h>
51590 #include <linux/cdev.h>
51591 #include <linux/uio_driver.h>
51592 +#include <asm/local.h>
51593
51594 #define UIO_MAX_DEVICES (1U << MINORBITS)
51595
51596 @@ -32,7 +33,7 @@ struct uio_device {
51597 struct module *owner;
51598 struct device *dev;
51599 int minor;
51600 - atomic_t event;
51601 + atomic_unchecked_t event;
51602 struct fasync_struct *async_queue;
51603 wait_queue_head_t wait;
51604 struct uio_info *info;
51605 @@ -243,7 +244,7 @@ static ssize_t event_show(struct device *dev,
51606 struct device_attribute *attr, char *buf)
51607 {
51608 struct uio_device *idev = dev_get_drvdata(dev);
51609 - return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
51610 + return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
51611 }
51612 static DEVICE_ATTR_RO(event);
51613
51614 @@ -405,7 +406,7 @@ void uio_event_notify(struct uio_info *info)
51615 {
51616 struct uio_device *idev = info->uio_dev;
51617
51618 - atomic_inc(&idev->event);
51619 + atomic_inc_unchecked(&idev->event);
51620 wake_up_interruptible(&idev->wait);
51621 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
51622 }
51623 @@ -458,7 +459,7 @@ static int uio_open(struct inode *inode, struct file *filep)
51624 }
51625
51626 listener->dev = idev;
51627 - listener->event_count = atomic_read(&idev->event);
51628 + listener->event_count = atomic_read_unchecked(&idev->event);
51629 filep->private_data = listener;
51630
51631 if (idev->info->open) {
51632 @@ -509,7 +510,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
51633 return -EIO;
51634
51635 poll_wait(filep, &idev->wait, wait);
51636 - if (listener->event_count != atomic_read(&idev->event))
51637 + if (listener->event_count != atomic_read_unchecked(&idev->event))
51638 return POLLIN | POLLRDNORM;
51639 return 0;
51640 }
51641 @@ -534,7 +535,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
51642 do {
51643 set_current_state(TASK_INTERRUPTIBLE);
51644
51645 - event_count = atomic_read(&idev->event);
51646 + event_count = atomic_read_unchecked(&idev->event);
51647 if (event_count != listener->event_count) {
51648 if (copy_to_user(buf, &event_count, count))
51649 retval = -EFAULT;
51650 @@ -591,9 +592,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
51651 static int uio_find_mem_index(struct vm_area_struct *vma)
51652 {
51653 struct uio_device *idev = vma->vm_private_data;
51654 + unsigned long size;
51655
51656 if (vma->vm_pgoff < MAX_UIO_MAPS) {
51657 - if (idev->info->mem[vma->vm_pgoff].size == 0)
51658 + size = idev->info->mem[vma->vm_pgoff].size;
51659 + if (size == 0)
51660 + return -1;
51661 + if (vma->vm_end - vma->vm_start > size)
51662 return -1;
51663 return (int)vma->vm_pgoff;
51664 }
51665 @@ -825,7 +830,7 @@ int __uio_register_device(struct module *owner,
51666 idev->owner = owner;
51667 idev->info = info;
51668 init_waitqueue_head(&idev->wait);
51669 - atomic_set(&idev->event, 0);
51670 + atomic_set_unchecked(&idev->event, 0);
51671
51672 ret = uio_get_minor(idev);
51673 if (ret)
51674 diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
51675 index 813d4d3..a71934f 100644
51676 --- a/drivers/usb/atm/cxacru.c
51677 +++ b/drivers/usb/atm/cxacru.c
51678 @@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
51679 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
51680 if (ret < 2)
51681 return -EINVAL;
51682 - if (index < 0 || index > 0x7f)
51683 + if (index > 0x7f)
51684 return -EINVAL;
51685 pos += tmp;
51686
51687 diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
51688 index dada014..1d0d517 100644
51689 --- a/drivers/usb/atm/usbatm.c
51690 +++ b/drivers/usb/atm/usbatm.c
51691 @@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
51692 if (printk_ratelimit())
51693 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
51694 __func__, vpi, vci);
51695 - atomic_inc(&vcc->stats->rx_err);
51696 + atomic_inc_unchecked(&vcc->stats->rx_err);
51697 return;
51698 }
51699
51700 @@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
51701 if (length > ATM_MAX_AAL5_PDU) {
51702 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
51703 __func__, length, vcc);
51704 - atomic_inc(&vcc->stats->rx_err);
51705 + atomic_inc_unchecked(&vcc->stats->rx_err);
51706 goto out;
51707 }
51708
51709 @@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
51710 if (sarb->len < pdu_length) {
51711 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
51712 __func__, pdu_length, sarb->len, vcc);
51713 - atomic_inc(&vcc->stats->rx_err);
51714 + atomic_inc_unchecked(&vcc->stats->rx_err);
51715 goto out;
51716 }
51717
51718 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
51719 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
51720 __func__, vcc);
51721 - atomic_inc(&vcc->stats->rx_err);
51722 + atomic_inc_unchecked(&vcc->stats->rx_err);
51723 goto out;
51724 }
51725
51726 @@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
51727 if (printk_ratelimit())
51728 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
51729 __func__, length);
51730 - atomic_inc(&vcc->stats->rx_drop);
51731 + atomic_inc_unchecked(&vcc->stats->rx_drop);
51732 goto out;
51733 }
51734
51735 @@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
51736
51737 vcc->push(vcc, skb);
51738
51739 - atomic_inc(&vcc->stats->rx);
51740 + atomic_inc_unchecked(&vcc->stats->rx);
51741 out:
51742 skb_trim(sarb, 0);
51743 }
51744 @@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
51745 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
51746
51747 usbatm_pop(vcc, skb);
51748 - atomic_inc(&vcc->stats->tx);
51749 + atomic_inc_unchecked(&vcc->stats->tx);
51750
51751 skb = skb_dequeue(&instance->sndqueue);
51752 }
51753 @@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
51754 if (!left--)
51755 return sprintf(page,
51756 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
51757 - atomic_read(&atm_dev->stats.aal5.tx),
51758 - atomic_read(&atm_dev->stats.aal5.tx_err),
51759 - atomic_read(&atm_dev->stats.aal5.rx),
51760 - atomic_read(&atm_dev->stats.aal5.rx_err),
51761 - atomic_read(&atm_dev->stats.aal5.rx_drop));
51762 + atomic_read_unchecked(&atm_dev->stats.aal5.tx),
51763 + atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
51764 + atomic_read_unchecked(&atm_dev->stats.aal5.rx),
51765 + atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
51766 + atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
51767
51768 if (!left--) {
51769 if (instance->disconnected)
51770 diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
51771 index 2a3bbdf..91d72cf 100644
51772 --- a/drivers/usb/core/devices.c
51773 +++ b/drivers/usb/core/devices.c
51774 @@ -126,7 +126,7 @@ static const char format_endpt[] =
51775 * time it gets called.
51776 */
51777 static struct device_connect_event {
51778 - atomic_t count;
51779 + atomic_unchecked_t count;
51780 wait_queue_head_t wait;
51781 } device_event = {
51782 .count = ATOMIC_INIT(1),
51783 @@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
51784
51785 void usbfs_conn_disc_event(void)
51786 {
51787 - atomic_add(2, &device_event.count);
51788 + atomic_add_unchecked(2, &device_event.count);
51789 wake_up(&device_event.wait);
51790 }
51791
51792 @@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
51793
51794 poll_wait(file, &device_event.wait, wait);
51795
51796 - event_count = atomic_read(&device_event.count);
51797 + event_count = atomic_read_unchecked(&device_event.count);
51798 if (file->f_version != event_count) {
51799 file->f_version = event_count;
51800 return POLLIN | POLLRDNORM;
51801 diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
51802 index 90e18f6..5eeda46 100644
51803 --- a/drivers/usb/core/devio.c
51804 +++ b/drivers/usb/core/devio.c
51805 @@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
51806 struct dev_state *ps = file->private_data;
51807 struct usb_device *dev = ps->dev;
51808 ssize_t ret = 0;
51809 - unsigned len;
51810 + size_t len;
51811 loff_t pos;
51812 int i;
51813
51814 @@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
51815 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
51816 struct usb_config_descriptor *config =
51817 (struct usb_config_descriptor *)dev->rawdescriptors[i];
51818 - unsigned int length = le16_to_cpu(config->wTotalLength);
51819 + size_t length = le16_to_cpu(config->wTotalLength);
51820
51821 if (*ppos < pos + length) {
51822
51823 /* The descriptor may claim to be longer than it
51824 * really is. Here is the actual allocated length. */
51825 - unsigned alloclen =
51826 + size_t alloclen =
51827 le16_to_cpu(dev->config[i].desc.wTotalLength);
51828
51829 - len = length - (*ppos - pos);
51830 + len = length + pos - *ppos;
51831 if (len > nbytes)
51832 len = nbytes;
51833
51834 /* Simply don't write (skip over) unallocated parts */
51835 if (alloclen > (*ppos - pos)) {
51836 - alloclen -= (*ppos - pos);
51837 + alloclen = alloclen + pos - *ppos;
51838 if (copy_to_user(buf,
51839 dev->rawdescriptors[i] + (*ppos - pos),
51840 min(len, alloclen))) {
51841 diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
51842 index 2518c32..1c201bb 100644
51843 --- a/drivers/usb/core/hcd.c
51844 +++ b/drivers/usb/core/hcd.c
51845 @@ -1550,7 +1550,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
51846 */
51847 usb_get_urb(urb);
51848 atomic_inc(&urb->use_count);
51849 - atomic_inc(&urb->dev->urbnum);
51850 + atomic_inc_unchecked(&urb->dev->urbnum);
51851 usbmon_urb_submit(&hcd->self, urb);
51852
51853 /* NOTE requirements on root-hub callers (usbfs and the hub
51854 @@ -1577,7 +1577,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
51855 urb->hcpriv = NULL;
51856 INIT_LIST_HEAD(&urb->urb_list);
51857 atomic_dec(&urb->use_count);
51858 - atomic_dec(&urb->dev->urbnum);
51859 + atomic_dec_unchecked(&urb->dev->urbnum);
51860 if (atomic_read(&urb->reject))
51861 wake_up(&usb_kill_urb_queue);
51862 usb_put_urb(urb);
51863 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
51864 index 64ea219..dbc1780 100644
51865 --- a/drivers/usb/core/hub.c
51866 +++ b/drivers/usb/core/hub.c
51867 @@ -27,6 +27,7 @@
51868 #include <linux/freezer.h>
51869 #include <linux/random.h>
51870 #include <linux/pm_qos.h>
51871 +#include <linux/grsecurity.h>
51872
51873 #include <asm/uaccess.h>
51874 #include <asm/byteorder.h>
51875 @@ -4472,6 +4473,10 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
51876 goto done;
51877 return;
51878 }
51879 +
51880 + if (gr_handle_new_usb())
51881 + goto done;
51882 +
51883 if (hub_is_superspeed(hub->hdev))
51884 unit_load = 150;
51885 else
51886 diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
51887 index f829a1a..e6c334a 100644
51888 --- a/drivers/usb/core/message.c
51889 +++ b/drivers/usb/core/message.c
51890 @@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
51891 * Return: If successful, the number of bytes transferred. Otherwise, a negative
51892 * error number.
51893 */
51894 -int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
51895 +int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
51896 __u8 requesttype, __u16 value, __u16 index, void *data,
51897 __u16 size, int timeout)
51898 {
51899 @@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
51900 * If successful, 0. Otherwise a negative error number. The number of actual
51901 * bytes transferred will be stored in the @actual_length paramater.
51902 */
51903 -int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
51904 +int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
51905 void *data, int len, int *actual_length, int timeout)
51906 {
51907 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
51908 @@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
51909 * bytes transferred will be stored in the @actual_length parameter.
51910 *
51911 */
51912 -int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
51913 +int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
51914 void *data, int len, int *actual_length, int timeout)
51915 {
51916 struct urb *urb;
51917 diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
51918 index 1236c60..d47a51c 100644
51919 --- a/drivers/usb/core/sysfs.c
51920 +++ b/drivers/usb/core/sysfs.c
51921 @@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
51922 struct usb_device *udev;
51923
51924 udev = to_usb_device(dev);
51925 - return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
51926 + return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
51927 }
51928 static DEVICE_ATTR_RO(urbnum);
51929
51930 diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
51931 index 4d11449..f4ccabf 100644
51932 --- a/drivers/usb/core/usb.c
51933 +++ b/drivers/usb/core/usb.c
51934 @@ -433,7 +433,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
51935 set_dev_node(&dev->dev, dev_to_node(bus->controller));
51936 dev->state = USB_STATE_ATTACHED;
51937 dev->lpm_disable_count = 1;
51938 - atomic_set(&dev->urbnum, 0);
51939 + atomic_set_unchecked(&dev->urbnum, 0);
51940
51941 INIT_LIST_HEAD(&dev->ep0.urb_list);
51942 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
51943 diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
51944 index 2da0a5a..4870e09 100644
51945 --- a/drivers/usb/dwc3/gadget.c
51946 +++ b/drivers/usb/dwc3/gadget.c
51947 @@ -532,8 +532,6 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
51948 if (!usb_endpoint_xfer_isoc(desc))
51949 return 0;
51950
51951 - memset(&trb_link, 0, sizeof(trb_link));
51952 -
51953 /* Link TRB for ISOC. The HWO bit is never reset */
51954 trb_st_hw = &dep->trb_pool[0];
51955
51956 diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
51957 index 8cfc319..4868255 100644
51958 --- a/drivers/usb/early/ehci-dbgp.c
51959 +++ b/drivers/usb/early/ehci-dbgp.c
51960 @@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
51961
51962 #ifdef CONFIG_KGDB
51963 static struct kgdb_io kgdbdbgp_io_ops;
51964 -#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
51965 +static struct kgdb_io kgdbdbgp_io_ops_console;
51966 +#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
51967 #else
51968 #define dbgp_kgdb_mode (0)
51969 #endif
51970 @@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
51971 .write_char = kgdbdbgp_write_char,
51972 };
51973
51974 +static struct kgdb_io kgdbdbgp_io_ops_console = {
51975 + .name = "kgdbdbgp",
51976 + .read_char = kgdbdbgp_read_char,
51977 + .write_char = kgdbdbgp_write_char,
51978 + .is_console = 1
51979 +};
51980 +
51981 static int kgdbdbgp_wait_time;
51982
51983 static int __init kgdbdbgp_parse_config(char *str)
51984 @@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
51985 ptr++;
51986 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
51987 }
51988 - kgdb_register_io_module(&kgdbdbgp_io_ops);
51989 - kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
51990 + if (early_dbgp_console.index != -1)
51991 + kgdb_register_io_module(&kgdbdbgp_io_ops_console);
51992 + else
51993 + kgdb_register_io_module(&kgdbdbgp_io_ops);
51994
51995 return 0;
51996 }
51997 diff --git a/drivers/usb/gadget/f_uac1.c b/drivers/usb/gadget/f_uac1.c
51998 index 2b4c82d..06a8ee6 100644
51999 --- a/drivers/usb/gadget/f_uac1.c
52000 +++ b/drivers/usb/gadget/f_uac1.c
52001 @@ -13,6 +13,7 @@
52002 #include <linux/kernel.h>
52003 #include <linux/device.h>
52004 #include <linux/atomic.h>
52005 +#include <linux/module.h>
52006
52007 #include "u_uac1.h"
52008
52009 diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
52010 index ad0aca8..8ff84865 100644
52011 --- a/drivers/usb/gadget/u_serial.c
52012 +++ b/drivers/usb/gadget/u_serial.c
52013 @@ -733,9 +733,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
52014 spin_lock_irq(&port->port_lock);
52015
52016 /* already open? Great. */
52017 - if (port->port.count) {
52018 + if (atomic_read(&port->port.count)) {
52019 status = 0;
52020 - port->port.count++;
52021 + atomic_inc(&port->port.count);
52022
52023 /* currently opening/closing? wait ... */
52024 } else if (port->openclose) {
52025 @@ -794,7 +794,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
52026 tty->driver_data = port;
52027 port->port.tty = tty;
52028
52029 - port->port.count = 1;
52030 + atomic_set(&port->port.count, 1);
52031 port->openclose = false;
52032
52033 /* if connected, start the I/O stream */
52034 @@ -836,11 +836,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
52035
52036 spin_lock_irq(&port->port_lock);
52037
52038 - if (port->port.count != 1) {
52039 - if (port->port.count == 0)
52040 + if (atomic_read(&port->port.count) != 1) {
52041 + if (atomic_read(&port->port.count) == 0)
52042 WARN_ON(1);
52043 else
52044 - --port->port.count;
52045 + atomic_dec(&port->port.count);
52046 goto exit;
52047 }
52048
52049 @@ -850,7 +850,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
52050 * and sleep if necessary
52051 */
52052 port->openclose = true;
52053 - port->port.count = 0;
52054 + atomic_set(&port->port.count, 0);
52055
52056 gser = port->port_usb;
52057 if (gser && gser->disconnect)
52058 @@ -1066,7 +1066,7 @@ static int gs_closed(struct gs_port *port)
52059 int cond;
52060
52061 spin_lock_irq(&port->port_lock);
52062 - cond = (port->port.count == 0) && !port->openclose;
52063 + cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
52064 spin_unlock_irq(&port->port_lock);
52065 return cond;
52066 }
52067 @@ -1209,7 +1209,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
52068 /* if it's already open, start I/O ... and notify the serial
52069 * protocol about open/close status (connect/disconnect).
52070 */
52071 - if (port->port.count) {
52072 + if (atomic_read(&port->port.count)) {
52073 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
52074 gs_start_io(port);
52075 if (gser->connect)
52076 @@ -1256,7 +1256,7 @@ void gserial_disconnect(struct gserial *gser)
52077
52078 port->port_usb = NULL;
52079 gser->ioport = NULL;
52080 - if (port->port.count > 0 || port->openclose) {
52081 + if (atomic_read(&port->port.count) > 0 || port->openclose) {
52082 wake_up_interruptible(&port->drain_wait);
52083 if (port->port.tty)
52084 tty_hangup(port->port.tty);
52085 @@ -1272,7 +1272,7 @@ void gserial_disconnect(struct gserial *gser)
52086
52087 /* finally, free any unused/unusable I/O buffers */
52088 spin_lock_irqsave(&port->port_lock, flags);
52089 - if (port->port.count == 0 && !port->openclose)
52090 + if (atomic_read(&port->port.count) == 0 && !port->openclose)
52091 gs_buf_free(&port->port_write_buf);
52092 gs_free_requests(gser->out, &port->read_pool, NULL);
52093 gs_free_requests(gser->out, &port->read_queue, NULL);
52094 diff --git a/drivers/usb/gadget/u_uac1.c b/drivers/usb/gadget/u_uac1.c
52095 index 7a55fea..cc0ed4f 100644
52096 --- a/drivers/usb/gadget/u_uac1.c
52097 +++ b/drivers/usb/gadget/u_uac1.c
52098 @@ -16,6 +16,7 @@
52099 #include <linux/ctype.h>
52100 #include <linux/random.h>
52101 #include <linux/syscalls.h>
52102 +#include <linux/module.h>
52103
52104 #include "u_uac1.h"
52105
52106 diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
52107 index 7ae0c4d..35521b7 100644
52108 --- a/drivers/usb/host/ehci-hub.c
52109 +++ b/drivers/usb/host/ehci-hub.c
52110 @@ -780,7 +780,7 @@ static struct urb *request_single_step_set_feature_urb(
52111 urb->transfer_flags = URB_DIR_IN;
52112 usb_get_urb(urb);
52113 atomic_inc(&urb->use_count);
52114 - atomic_inc(&urb->dev->urbnum);
52115 + atomic_inc_unchecked(&urb->dev->urbnum);
52116 urb->setup_dma = dma_map_single(
52117 hcd->self.controller,
52118 urb->setup_packet,
52119 @@ -847,7 +847,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
52120 urb->status = -EINPROGRESS;
52121 usb_get_urb(urb);
52122 atomic_inc(&urb->use_count);
52123 - atomic_inc(&urb->dev->urbnum);
52124 + atomic_inc_unchecked(&urb->dev->urbnum);
52125 retval = submit_single_step_set_feature(hcd, urb, 0);
52126 if (!retval && !wait_for_completion_timeout(&done,
52127 msecs_to_jiffies(2000))) {
52128 diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
52129 index ba6a5d6..f88f7f3 100644
52130 --- a/drivers/usb/misc/appledisplay.c
52131 +++ b/drivers/usb/misc/appledisplay.c
52132 @@ -83,7 +83,7 @@ struct appledisplay {
52133 spinlock_t lock;
52134 };
52135
52136 -static atomic_t count_displays = ATOMIC_INIT(0);
52137 +static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
52138 static struct workqueue_struct *wq;
52139
52140 static void appledisplay_complete(struct urb *urb)
52141 @@ -281,7 +281,7 @@ static int appledisplay_probe(struct usb_interface *iface,
52142
52143 /* Register backlight device */
52144 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
52145 - atomic_inc_return(&count_displays) - 1);
52146 + atomic_inc_return_unchecked(&count_displays) - 1);
52147 memset(&props, 0, sizeof(struct backlight_properties));
52148 props.type = BACKLIGHT_RAW;
52149 props.max_brightness = 0xff;
52150 diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
52151 index 8d7fc48..01c4986 100644
52152 --- a/drivers/usb/serial/console.c
52153 +++ b/drivers/usb/serial/console.c
52154 @@ -123,7 +123,7 @@ static int usb_console_setup(struct console *co, char *options)
52155
52156 info->port = port;
52157
52158 - ++port->port.count;
52159 + atomic_inc(&port->port.count);
52160 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
52161 if (serial->type->set_termios) {
52162 /*
52163 @@ -167,7 +167,7 @@ static int usb_console_setup(struct console *co, char *options)
52164 }
52165 /* Now that any required fake tty operations are completed restore
52166 * the tty port count */
52167 - --port->port.count;
52168 + atomic_dec(&port->port.count);
52169 /* The console is special in terms of closing the device so
52170 * indicate this port is now acting as a system console. */
52171 port->port.console = 1;
52172 @@ -180,7 +180,7 @@ static int usb_console_setup(struct console *co, char *options)
52173 free_tty:
52174 kfree(tty);
52175 reset_open_count:
52176 - port->port.count = 0;
52177 + atomic_set(&port->port.count, 0);
52178 usb_autopm_put_interface(serial->interface);
52179 error_get_interface:
52180 usb_serial_put(serial);
52181 @@ -191,7 +191,7 @@ static int usb_console_setup(struct console *co, char *options)
52182 static void usb_console_write(struct console *co,
52183 const char *buf, unsigned count)
52184 {
52185 - static struct usbcons_info *info = &usbcons_info;
52186 + struct usbcons_info *info = &usbcons_info;
52187 struct usb_serial_port *port = info->port;
52188 struct usb_serial *serial;
52189 int retval = -ENODEV;
52190 diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
52191 index 75f70f0..d467e1a 100644
52192 --- a/drivers/usb/storage/usb.h
52193 +++ b/drivers/usb/storage/usb.h
52194 @@ -63,7 +63,7 @@ struct us_unusual_dev {
52195 __u8 useProtocol;
52196 __u8 useTransport;
52197 int (*initFunction)(struct us_data *);
52198 -};
52199 +} __do_const;
52200
52201
52202 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
52203 diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
52204 index a2ef84b..aa7c2b8 100644
52205 --- a/drivers/usb/wusbcore/wa-hc.h
52206 +++ b/drivers/usb/wusbcore/wa-hc.h
52207 @@ -225,7 +225,7 @@ struct wahc {
52208 spinlock_t xfer_list_lock;
52209 struct work_struct xfer_enqueue_work;
52210 struct work_struct xfer_error_work;
52211 - atomic_t xfer_id_count;
52212 + atomic_unchecked_t xfer_id_count;
52213
52214 kernel_ulong_t quirks;
52215 };
52216 @@ -287,7 +287,7 @@ static inline void wa_init(struct wahc *wa)
52217 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
52218 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
52219 wa->dto_in_use = 0;
52220 - atomic_set(&wa->xfer_id_count, 1);
52221 + atomic_set_unchecked(&wa->xfer_id_count, 1);
52222 }
52223
52224 /**
52225 diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
52226 index 3cd96e9..bd7c58d 100644
52227 --- a/drivers/usb/wusbcore/wa-xfer.c
52228 +++ b/drivers/usb/wusbcore/wa-xfer.c
52229 @@ -312,7 +312,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
52230 */
52231 static void wa_xfer_id_init(struct wa_xfer *xfer)
52232 {
52233 - xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
52234 + xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
52235 }
52236
52237 /* Return the xfer's ID. */
52238 diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
52239 index 21271d8..45b55a0 100644
52240 --- a/drivers/vfio/vfio.c
52241 +++ b/drivers/vfio/vfio.c
52242 @@ -487,7 +487,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
52243 return 0;
52244
52245 /* TODO Prevent device auto probing */
52246 - WARN("Device %s added to live group %d!\n", dev_name(dev),
52247 + WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
52248 iommu_group_id(group->iommu_group));
52249
52250 return 0;
52251 diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
52252 index 5174eba..451e6bc 100644
52253 --- a/drivers/vhost/vringh.c
52254 +++ b/drivers/vhost/vringh.c
52255 @@ -530,17 +530,17 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
52256 /* Userspace access helpers: in this case, addresses are really userspace. */
52257 static inline int getu16_user(u16 *val, const u16 *p)
52258 {
52259 - return get_user(*val, (__force u16 __user *)p);
52260 + return get_user(*val, (u16 __force_user *)p);
52261 }
52262
52263 static inline int putu16_user(u16 *p, u16 val)
52264 {
52265 - return put_user(val, (__force u16 __user *)p);
52266 + return put_user(val, (u16 __force_user *)p);
52267 }
52268
52269 static inline int copydesc_user(void *dst, const void *src, size_t len)
52270 {
52271 - return copy_from_user(dst, (__force void __user *)src, len) ?
52272 + return copy_from_user(dst, (void __force_user *)src, len) ?
52273 -EFAULT : 0;
52274 }
52275
52276 @@ -548,19 +548,19 @@ static inline int putused_user(struct vring_used_elem *dst,
52277 const struct vring_used_elem *src,
52278 unsigned int num)
52279 {
52280 - return copy_to_user((__force void __user *)dst, src,
52281 + return copy_to_user((void __force_user *)dst, src,
52282 sizeof(*dst) * num) ? -EFAULT : 0;
52283 }
52284
52285 static inline int xfer_from_user(void *src, void *dst, size_t len)
52286 {
52287 - return copy_from_user(dst, (__force void __user *)src, len) ?
52288 + return copy_from_user(dst, (void __force_user *)src, len) ?
52289 -EFAULT : 0;
52290 }
52291
52292 static inline int xfer_to_user(void *dst, void *src, size_t len)
52293 {
52294 - return copy_to_user((__force void __user *)dst, src, len) ?
52295 + return copy_to_user((void __force_user *)dst, src, len) ?
52296 -EFAULT : 0;
52297 }
52298
52299 @@ -596,9 +596,9 @@ int vringh_init_user(struct vringh *vrh, u32 features,
52300 vrh->last_used_idx = 0;
52301 vrh->vring.num = num;
52302 /* vring expects kernel addresses, but only used via accessors. */
52303 - vrh->vring.desc = (__force struct vring_desc *)desc;
52304 - vrh->vring.avail = (__force struct vring_avail *)avail;
52305 - vrh->vring.used = (__force struct vring_used *)used;
52306 + vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
52307 + vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
52308 + vrh->vring.used = (__force_kernel struct vring_used *)used;
52309 return 0;
52310 }
52311 EXPORT_SYMBOL(vringh_init_user);
52312 @@ -800,7 +800,7 @@ static inline int getu16_kern(u16 *val, const u16 *p)
52313
52314 static inline int putu16_kern(u16 *p, u16 val)
52315 {
52316 - ACCESS_ONCE(*p) = val;
52317 + ACCESS_ONCE_RW(*p) = val;
52318 return 0;
52319 }
52320
52321 diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
52322 index 1b0b233..6f34c2c 100644
52323 --- a/drivers/video/arcfb.c
52324 +++ b/drivers/video/arcfb.c
52325 @@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
52326 return -ENOSPC;
52327
52328 err = 0;
52329 - if ((count + p) > fbmemlength) {
52330 + if (count > (fbmemlength - p)) {
52331 count = fbmemlength - p;
52332 err = -ENOSPC;
52333 }
52334 diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
52335 index 52108be..c7c110d 100644
52336 --- a/drivers/video/aty/aty128fb.c
52337 +++ b/drivers/video/aty/aty128fb.c
52338 @@ -149,7 +149,7 @@ enum {
52339 };
52340
52341 /* Must match above enum */
52342 -static char * const r128_family[] = {
52343 +static const char * const r128_family[] = {
52344 "AGP",
52345 "PCI",
52346 "PRO AGP",
52347 diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
52348 index 28fafbf..ae91651 100644
52349 --- a/drivers/video/aty/atyfb_base.c
52350 +++ b/drivers/video/aty/atyfb_base.c
52351 @@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
52352 par->accel_flags = var->accel_flags; /* hack */
52353
52354 if (var->accel_flags) {
52355 - info->fbops->fb_sync = atyfb_sync;
52356 + pax_open_kernel();
52357 + *(void **)&info->fbops->fb_sync = atyfb_sync;
52358 + pax_close_kernel();
52359 info->flags &= ~FBINFO_HWACCEL_DISABLED;
52360 } else {
52361 - info->fbops->fb_sync = NULL;
52362 + pax_open_kernel();
52363 + *(void **)&info->fbops->fb_sync = NULL;
52364 + pax_close_kernel();
52365 info->flags |= FBINFO_HWACCEL_DISABLED;
52366 }
52367
52368 diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c
52369 index 95ec042..e6affdd 100644
52370 --- a/drivers/video/aty/mach64_cursor.c
52371 +++ b/drivers/video/aty/mach64_cursor.c
52372 @@ -7,6 +7,7 @@
52373 #include <linux/string.h>
52374
52375 #include <asm/io.h>
52376 +#include <asm/pgtable.h>
52377
52378 #ifdef __sparc__
52379 #include <asm/fbio.h>
52380 @@ -208,7 +209,9 @@ int aty_init_cursor(struct fb_info *info)
52381 info->sprite.buf_align = 16; /* and 64 lines tall. */
52382 info->sprite.flags = FB_PIXMAP_IO;
52383
52384 - info->fbops->fb_cursor = atyfb_cursor;
52385 + pax_open_kernel();
52386 + *(void **)&info->fbops->fb_cursor = atyfb_cursor;
52387 + pax_close_kernel();
52388
52389 return 0;
52390 }
52391 diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
52392 index 84a110a..96312c3 100644
52393 --- a/drivers/video/backlight/kb3886_bl.c
52394 +++ b/drivers/video/backlight/kb3886_bl.c
52395 @@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
52396 static unsigned long kb3886bl_flags;
52397 #define KB3886BL_SUSPENDED 0x01
52398
52399 -static struct dmi_system_id kb3886bl_device_table[] __initdata = {
52400 +static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
52401 {
52402 .ident = "Sahara Touch-iT",
52403 .matches = {
52404 diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
52405 index 900aa4e..6d49418 100644
52406 --- a/drivers/video/fb_defio.c
52407 +++ b/drivers/video/fb_defio.c
52408 @@ -206,7 +206,9 @@ void fb_deferred_io_init(struct fb_info *info)
52409
52410 BUG_ON(!fbdefio);
52411 mutex_init(&fbdefio->lock);
52412 - info->fbops->fb_mmap = fb_deferred_io_mmap;
52413 + pax_open_kernel();
52414 + *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
52415 + pax_close_kernel();
52416 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
52417 INIT_LIST_HEAD(&fbdefio->pagelist);
52418 if (fbdefio->delay == 0) /* set a default of 1 s */
52419 @@ -237,7 +239,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
52420 page->mapping = NULL;
52421 }
52422
52423 - info->fbops->fb_mmap = NULL;
52424 + *(void **)&info->fbops->fb_mmap = NULL;
52425 mutex_destroy(&fbdefio->lock);
52426 }
52427 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
52428 diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
52429 index 7309ac7..be3c49c 100644
52430 --- a/drivers/video/fbmem.c
52431 +++ b/drivers/video/fbmem.c
52432 @@ -433,7 +433,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
52433 image->dx += image->width + 8;
52434 }
52435 } else if (rotate == FB_ROTATE_UD) {
52436 - for (x = 0; x < num && image->dx >= 0; x++) {
52437 + for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
52438 info->fbops->fb_imageblit(info, image);
52439 image->dx -= image->width + 8;
52440 }
52441 @@ -445,7 +445,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
52442 image->dy += image->height + 8;
52443 }
52444 } else if (rotate == FB_ROTATE_CCW) {
52445 - for (x = 0; x < num && image->dy >= 0; x++) {
52446 + for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
52447 info->fbops->fb_imageblit(info, image);
52448 image->dy -= image->height + 8;
52449 }
52450 @@ -1179,7 +1179,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
52451 return -EFAULT;
52452 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
52453 return -EINVAL;
52454 - if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
52455 + if (con2fb.framebuffer >= FB_MAX)
52456 return -EINVAL;
52457 if (!registered_fb[con2fb.framebuffer])
52458 request_module("fb%d", con2fb.framebuffer);
52459 @@ -1300,7 +1300,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
52460 __u32 data;
52461 int err;
52462
52463 - err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
52464 + err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
52465
52466 data = (__u32) (unsigned long) fix->smem_start;
52467 err |= put_user(data, &fix32->smem_start);
52468 diff --git a/drivers/video/hyperv_fb.c b/drivers/video/hyperv_fb.c
52469 index 130708f..cdac1a9 100644
52470 --- a/drivers/video/hyperv_fb.c
52471 +++ b/drivers/video/hyperv_fb.c
52472 @@ -233,7 +233,7 @@ static uint screen_fb_size;
52473 static inline int synthvid_send(struct hv_device *hdev,
52474 struct synthvid_msg *msg)
52475 {
52476 - static atomic64_t request_id = ATOMIC64_INIT(0);
52477 + static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
52478 int ret;
52479
52480 msg->pipe_hdr.type = PIPE_MSG_DATA;
52481 @@ -241,7 +241,7 @@ static inline int synthvid_send(struct hv_device *hdev,
52482
52483 ret = vmbus_sendpacket(hdev->channel, msg,
52484 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
52485 - atomic64_inc_return(&request_id),
52486 + atomic64_inc_return_unchecked(&request_id),
52487 VM_PKT_DATA_INBAND, 0);
52488
52489 if (ret)
52490 diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
52491 index 7672d2e..b56437f 100644
52492 --- a/drivers/video/i810/i810_accel.c
52493 +++ b/drivers/video/i810/i810_accel.c
52494 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
52495 }
52496 }
52497 printk("ringbuffer lockup!!!\n");
52498 + printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
52499 i810_report_error(mmio);
52500 par->dev_flags |= LOCKUP;
52501 info->pixmap.scan_align = 1;
52502 diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
52503 index 3c14e43..2630570 100644
52504 --- a/drivers/video/logo/logo_linux_clut224.ppm
52505 +++ b/drivers/video/logo/logo_linux_clut224.ppm
52506 @@ -2,1603 +2,1123 @@ P3
52507 # Standard 224-color Linux logo
52508 80 80
52509 255
52510 - 0 0 0 0 0 0 0 0 0 0 0 0
52511 - 0 0 0 0 0 0 0 0 0 0 0 0
52512 - 0 0 0 0 0 0 0 0 0 0 0 0
52513 - 0 0 0 0 0 0 0 0 0 0 0 0
52514 - 0 0 0 0 0 0 0 0 0 0 0 0
52515 - 0 0 0 0 0 0 0 0 0 0 0 0
52516 - 0 0 0 0 0 0 0 0 0 0 0 0
52517 - 0 0 0 0 0 0 0 0 0 0 0 0
52518 - 0 0 0 0 0 0 0 0 0 0 0 0
52519 - 6 6 6 6 6 6 10 10 10 10 10 10
52520 - 10 10 10 6 6 6 6 6 6 6 6 6
52521 - 0 0 0 0 0 0 0 0 0 0 0 0
52522 - 0 0 0 0 0 0 0 0 0 0 0 0
52523 - 0 0 0 0 0 0 0 0 0 0 0 0
52524 - 0 0 0 0 0 0 0 0 0 0 0 0
52525 - 0 0 0 0 0 0 0 0 0 0 0 0
52526 - 0 0 0 0 0 0 0 0 0 0 0 0
52527 - 0 0 0 0 0 0 0 0 0 0 0 0
52528 - 0 0 0 0 0 0 0 0 0 0 0 0
52529 - 0 0 0 0 0 0 0 0 0 0 0 0
52530 - 0 0 0 0 0 0 0 0 0 0 0 0
52531 - 0 0 0 0 0 0 0 0 0 0 0 0
52532 - 0 0 0 0 0 0 0 0 0 0 0 0
52533 - 0 0 0 0 0 0 0 0 0 0 0 0
52534 - 0 0 0 0 0 0 0 0 0 0 0 0
52535 - 0 0 0 0 0 0 0 0 0 0 0 0
52536 - 0 0 0 0 0 0 0 0 0 0 0 0
52537 - 0 0 0 0 0 0 0 0 0 0 0 0
52538 - 0 0 0 6 6 6 10 10 10 14 14 14
52539 - 22 22 22 26 26 26 30 30 30 34 34 34
52540 - 30 30 30 30 30 30 26 26 26 18 18 18
52541 - 14 14 14 10 10 10 6 6 6 0 0 0
52542 - 0 0 0 0 0 0 0 0 0 0 0 0
52543 - 0 0 0 0 0 0 0 0 0 0 0 0
52544 - 0 0 0 0 0 0 0 0 0 0 0 0
52545 - 0 0 0 0 0 0 0 0 0 0 0 0
52546 - 0 0 0 0 0 0 0 0 0 0 0 0
52547 - 0 0 0 0 0 0 0 0 0 0 0 0
52548 - 0 0 0 0 0 0 0 0 0 0 0 0
52549 - 0 0 0 0 0 0 0 0 0 0 0 0
52550 - 0 0 0 0 0 0 0 0 0 0 0 0
52551 - 0 0 0 0 0 1 0 0 1 0 0 0
52552 - 0 0 0 0 0 0 0 0 0 0 0 0
52553 - 0 0 0 0 0 0 0 0 0 0 0 0
52554 - 0 0 0 0 0 0 0 0 0 0 0 0
52555 - 0 0 0 0 0 0 0 0 0 0 0 0
52556 - 0 0 0 0 0 0 0 0 0 0 0 0
52557 - 0 0 0 0 0 0 0 0 0 0 0 0
52558 - 6 6 6 14 14 14 26 26 26 42 42 42
52559 - 54 54 54 66 66 66 78 78 78 78 78 78
52560 - 78 78 78 74 74 74 66 66 66 54 54 54
52561 - 42 42 42 26 26 26 18 18 18 10 10 10
52562 - 6 6 6 0 0 0 0 0 0 0 0 0
52563 - 0 0 0 0 0 0 0 0 0 0 0 0
52564 - 0 0 0 0 0 0 0 0 0 0 0 0
52565 - 0 0 0 0 0 0 0 0 0 0 0 0
52566 - 0 0 0 0 0 0 0 0 0 0 0 0
52567 - 0 0 0 0 0 0 0 0 0 0 0 0
52568 - 0 0 0 0 0 0 0 0 0 0 0 0
52569 - 0 0 0 0 0 0 0 0 0 0 0 0
52570 - 0 0 0 0 0 0 0 0 0 0 0 0
52571 - 0 0 1 0 0 0 0 0 0 0 0 0
52572 - 0 0 0 0 0 0 0 0 0 0 0 0
52573 - 0 0 0 0 0 0 0 0 0 0 0 0
52574 - 0 0 0 0 0 0 0 0 0 0 0 0
52575 - 0 0 0 0 0 0 0 0 0 0 0 0
52576 - 0 0 0 0 0 0 0 0 0 0 0 0
52577 - 0 0 0 0 0 0 0 0 0 10 10 10
52578 - 22 22 22 42 42 42 66 66 66 86 86 86
52579 - 66 66 66 38 38 38 38 38 38 22 22 22
52580 - 26 26 26 34 34 34 54 54 54 66 66 66
52581 - 86 86 86 70 70 70 46 46 46 26 26 26
52582 - 14 14 14 6 6 6 0 0 0 0 0 0
52583 - 0 0 0 0 0 0 0 0 0 0 0 0
52584 - 0 0 0 0 0 0 0 0 0 0 0 0
52585 - 0 0 0 0 0 0 0 0 0 0 0 0
52586 - 0 0 0 0 0 0 0 0 0 0 0 0
52587 - 0 0 0 0 0 0 0 0 0 0 0 0
52588 - 0 0 0 0 0 0 0 0 0 0 0 0
52589 - 0 0 0 0 0 0 0 0 0 0 0 0
52590 - 0 0 0 0 0 0 0 0 0 0 0 0
52591 - 0 0 1 0 0 1 0 0 1 0 0 0
52592 - 0 0 0 0 0 0 0 0 0 0 0 0
52593 - 0 0 0 0 0 0 0 0 0 0 0 0
52594 - 0 0 0 0 0 0 0 0 0 0 0 0
52595 - 0 0 0 0 0 0 0 0 0 0 0 0
52596 - 0 0 0 0 0 0 0 0 0 0 0 0
52597 - 0 0 0 0 0 0 10 10 10 26 26 26
52598 - 50 50 50 82 82 82 58 58 58 6 6 6
52599 - 2 2 6 2 2 6 2 2 6 2 2 6
52600 - 2 2 6 2 2 6 2 2 6 2 2 6
52601 - 6 6 6 54 54 54 86 86 86 66 66 66
52602 - 38 38 38 18 18 18 6 6 6 0 0 0
52603 - 0 0 0 0 0 0 0 0 0 0 0 0
52604 - 0 0 0 0 0 0 0 0 0 0 0 0
52605 - 0 0 0 0 0 0 0 0 0 0 0 0
52606 - 0 0 0 0 0 0 0 0 0 0 0 0
52607 - 0 0 0 0 0 0 0 0 0 0 0 0
52608 - 0 0 0 0 0 0 0 0 0 0 0 0
52609 - 0 0 0 0 0 0 0 0 0 0 0 0
52610 - 0 0 0 0 0 0 0 0 0 0 0 0
52611 - 0 0 0 0 0 0 0 0 0 0 0 0
52612 - 0 0 0 0 0 0 0 0 0 0 0 0
52613 - 0 0 0 0 0 0 0 0 0 0 0 0
52614 - 0 0 0 0 0 0 0 0 0 0 0 0
52615 - 0 0 0 0 0 0 0 0 0 0 0 0
52616 - 0 0 0 0 0 0 0 0 0 0 0 0
52617 - 0 0 0 6 6 6 22 22 22 50 50 50
52618 - 78 78 78 34 34 34 2 2 6 2 2 6
52619 - 2 2 6 2 2 6 2 2 6 2 2 6
52620 - 2 2 6 2 2 6 2 2 6 2 2 6
52621 - 2 2 6 2 2 6 6 6 6 70 70 70
52622 - 78 78 78 46 46 46 22 22 22 6 6 6
52623 - 0 0 0 0 0 0 0 0 0 0 0 0
52624 - 0 0 0 0 0 0 0 0 0 0 0 0
52625 - 0 0 0 0 0 0 0 0 0 0 0 0
52626 - 0 0 0 0 0 0 0 0 0 0 0 0
52627 - 0 0 0 0 0 0 0 0 0 0 0 0
52628 - 0 0 0 0 0 0 0 0 0 0 0 0
52629 - 0 0 0 0 0 0 0 0 0 0 0 0
52630 - 0 0 0 0 0 0 0 0 0 0 0 0
52631 - 0 0 1 0 0 1 0 0 1 0 0 0
52632 - 0 0 0 0 0 0 0 0 0 0 0 0
52633 - 0 0 0 0 0 0 0 0 0 0 0 0
52634 - 0 0 0 0 0 0 0 0 0 0 0 0
52635 - 0 0 0 0 0 0 0 0 0 0 0 0
52636 - 0 0 0 0 0 0 0 0 0 0 0 0
52637 - 6 6 6 18 18 18 42 42 42 82 82 82
52638 - 26 26 26 2 2 6 2 2 6 2 2 6
52639 - 2 2 6 2 2 6 2 2 6 2 2 6
52640 - 2 2 6 2 2 6 2 2 6 14 14 14
52641 - 46 46 46 34 34 34 6 6 6 2 2 6
52642 - 42 42 42 78 78 78 42 42 42 18 18 18
52643 - 6 6 6 0 0 0 0 0 0 0 0 0
52644 - 0 0 0 0 0 0 0 0 0 0 0 0
52645 - 0 0 0 0 0 0 0 0 0 0 0 0
52646 - 0 0 0 0 0 0 0 0 0 0 0 0
52647 - 0 0 0 0 0 0 0 0 0 0 0 0
52648 - 0 0 0 0 0 0 0 0 0 0 0 0
52649 - 0 0 0 0 0 0 0 0 0 0 0 0
52650 - 0 0 0 0 0 0 0 0 0 0 0 0
52651 - 0 0 1 0 0 0 0 0 1 0 0 0
52652 - 0 0 0 0 0 0 0 0 0 0 0 0
52653 - 0 0 0 0 0 0 0 0 0 0 0 0
52654 - 0 0 0 0 0 0 0 0 0 0 0 0
52655 - 0 0 0 0 0 0 0 0 0 0 0 0
52656 - 0 0 0 0 0 0 0 0 0 0 0 0
52657 - 10 10 10 30 30 30 66 66 66 58 58 58
52658 - 2 2 6 2 2 6 2 2 6 2 2 6
52659 - 2 2 6 2 2 6 2 2 6 2 2 6
52660 - 2 2 6 2 2 6 2 2 6 26 26 26
52661 - 86 86 86 101 101 101 46 46 46 10 10 10
52662 - 2 2 6 58 58 58 70 70 70 34 34 34
52663 - 10 10 10 0 0 0 0 0 0 0 0 0
52664 - 0 0 0 0 0 0 0 0 0 0 0 0
52665 - 0 0 0 0 0 0 0 0 0 0 0 0
52666 - 0 0 0 0 0 0 0 0 0 0 0 0
52667 - 0 0 0 0 0 0 0 0 0 0 0 0
52668 - 0 0 0 0 0 0 0 0 0 0 0 0
52669 - 0 0 0 0 0 0 0 0 0 0 0 0
52670 - 0 0 0 0 0 0 0 0 0 0 0 0
52671 - 0 0 1 0 0 1 0 0 1 0 0 0
52672 - 0 0 0 0 0 0 0 0 0 0 0 0
52673 - 0 0 0 0 0 0 0 0 0 0 0 0
52674 - 0 0 0 0 0 0 0 0 0 0 0 0
52675 - 0 0 0 0 0 0 0 0 0 0 0 0
52676 - 0 0 0 0 0 0 0 0 0 0 0 0
52677 - 14 14 14 42 42 42 86 86 86 10 10 10
52678 - 2 2 6 2 2 6 2 2 6 2 2 6
52679 - 2 2 6 2 2 6 2 2 6 2 2 6
52680 - 2 2 6 2 2 6 2 2 6 30 30 30
52681 - 94 94 94 94 94 94 58 58 58 26 26 26
52682 - 2 2 6 6 6 6 78 78 78 54 54 54
52683 - 22 22 22 6 6 6 0 0 0 0 0 0
52684 - 0 0 0 0 0 0 0 0 0 0 0 0
52685 - 0 0 0 0 0 0 0 0 0 0 0 0
52686 - 0 0 0 0 0 0 0 0 0 0 0 0
52687 - 0 0 0 0 0 0 0 0 0 0 0 0
52688 - 0 0 0 0 0 0 0 0 0 0 0 0
52689 - 0 0 0 0 0 0 0 0 0 0 0 0
52690 - 0 0 0 0 0 0 0 0 0 0 0 0
52691 - 0 0 0 0 0 0 0 0 0 0 0 0
52692 - 0 0 0 0 0 0 0 0 0 0 0 0
52693 - 0 0 0 0 0 0 0 0 0 0 0 0
52694 - 0 0 0 0 0 0 0 0 0 0 0 0
52695 - 0 0 0 0 0 0 0 0 0 0 0 0
52696 - 0 0 0 0 0 0 0 0 0 6 6 6
52697 - 22 22 22 62 62 62 62 62 62 2 2 6
52698 - 2 2 6 2 2 6 2 2 6 2 2 6
52699 - 2 2 6 2 2 6 2 2 6 2 2 6
52700 - 2 2 6 2 2 6 2 2 6 26 26 26
52701 - 54 54 54 38 38 38 18 18 18 10 10 10
52702 - 2 2 6 2 2 6 34 34 34 82 82 82
52703 - 38 38 38 14 14 14 0 0 0 0 0 0
52704 - 0 0 0 0 0 0 0 0 0 0 0 0
52705 - 0 0 0 0 0 0 0 0 0 0 0 0
52706 - 0 0 0 0 0 0 0 0 0 0 0 0
52707 - 0 0 0 0 0 0 0 0 0 0 0 0
52708 - 0 0 0 0 0 0 0 0 0 0 0 0
52709 - 0 0 0 0 0 0 0 0 0 0 0 0
52710 - 0 0 0 0 0 0 0 0 0 0 0 0
52711 - 0 0 0 0 0 1 0 0 1 0 0 0
52712 - 0 0 0 0 0 0 0 0 0 0 0 0
52713 - 0 0 0 0 0 0 0 0 0 0 0 0
52714 - 0 0 0 0 0 0 0 0 0 0 0 0
52715 - 0 0 0 0 0 0 0 0 0 0 0 0
52716 - 0 0 0 0 0 0 0 0 0 6 6 6
52717 - 30 30 30 78 78 78 30 30 30 2 2 6
52718 - 2 2 6 2 2 6 2 2 6 2 2 6
52719 - 2 2 6 2 2 6 2 2 6 2 2 6
52720 - 2 2 6 2 2 6 2 2 6 10 10 10
52721 - 10 10 10 2 2 6 2 2 6 2 2 6
52722 - 2 2 6 2 2 6 2 2 6 78 78 78
52723 - 50 50 50 18 18 18 6 6 6 0 0 0
52724 - 0 0 0 0 0 0 0 0 0 0 0 0
52725 - 0 0 0 0 0 0 0 0 0 0 0 0
52726 - 0 0 0 0 0 0 0 0 0 0 0 0
52727 - 0 0 0 0 0 0 0 0 0 0 0 0
52728 - 0 0 0 0 0 0 0 0 0 0 0 0
52729 - 0 0 0 0 0 0 0 0 0 0 0 0
52730 - 0 0 0 0 0 0 0 0 0 0 0 0
52731 - 0 0 1 0 0 0 0 0 0 0 0 0
52732 - 0 0 0 0 0 0 0 0 0 0 0 0
52733 - 0 0 0 0 0 0 0 0 0 0 0 0
52734 - 0 0 0 0 0 0 0 0 0 0 0 0
52735 - 0 0 0 0 0 0 0 0 0 0 0 0
52736 - 0 0 0 0 0 0 0 0 0 10 10 10
52737 - 38 38 38 86 86 86 14 14 14 2 2 6
52738 - 2 2 6 2 2 6 2 2 6 2 2 6
52739 - 2 2 6 2 2 6 2 2 6 2 2 6
52740 - 2 2 6 2 2 6 2 2 6 2 2 6
52741 - 2 2 6 2 2 6 2 2 6 2 2 6
52742 - 2 2 6 2 2 6 2 2 6 54 54 54
52743 - 66 66 66 26 26 26 6 6 6 0 0 0
52744 - 0 0 0 0 0 0 0 0 0 0 0 0
52745 - 0 0 0 0 0 0 0 0 0 0 0 0
52746 - 0 0 0 0 0 0 0 0 0 0 0 0
52747 - 0 0 0 0 0 0 0 0 0 0 0 0
52748 - 0 0 0 0 0 0 0 0 0 0 0 0
52749 - 0 0 0 0 0 0 0 0 0 0 0 0
52750 - 0 0 0 0 0 0 0 0 0 0 0 0
52751 - 0 0 0 0 0 1 0 0 1 0 0 0
52752 - 0 0 0 0 0 0 0 0 0 0 0 0
52753 - 0 0 0 0 0 0 0 0 0 0 0 0
52754 - 0 0 0 0 0 0 0 0 0 0 0 0
52755 - 0 0 0 0 0 0 0 0 0 0 0 0
52756 - 0 0 0 0 0 0 0 0 0 14 14 14
52757 - 42 42 42 82 82 82 2 2 6 2 2 6
52758 - 2 2 6 6 6 6 10 10 10 2 2 6
52759 - 2 2 6 2 2 6 2 2 6 2 2 6
52760 - 2 2 6 2 2 6 2 2 6 6 6 6
52761 - 14 14 14 10 10 10 2 2 6 2 2 6
52762 - 2 2 6 2 2 6 2 2 6 18 18 18
52763 - 82 82 82 34 34 34 10 10 10 0 0 0
52764 - 0 0 0 0 0 0 0 0 0 0 0 0
52765 - 0 0 0 0 0 0 0 0 0 0 0 0
52766 - 0 0 0 0 0 0 0 0 0 0 0 0
52767 - 0 0 0 0 0 0 0 0 0 0 0 0
52768 - 0 0 0 0 0 0 0 0 0 0 0 0
52769 - 0 0 0 0 0 0 0 0 0 0 0 0
52770 - 0 0 0 0 0 0 0 0 0 0 0 0
52771 - 0 0 1 0 0 0 0 0 0 0 0 0
52772 - 0 0 0 0 0 0 0 0 0 0 0 0
52773 - 0 0 0 0 0 0 0 0 0 0 0 0
52774 - 0 0 0 0 0 0 0 0 0 0 0 0
52775 - 0 0 0 0 0 0 0 0 0 0 0 0
52776 - 0 0 0 0 0 0 0 0 0 14 14 14
52777 - 46 46 46 86 86 86 2 2 6 2 2 6
52778 - 6 6 6 6 6 6 22 22 22 34 34 34
52779 - 6 6 6 2 2 6 2 2 6 2 2 6
52780 - 2 2 6 2 2 6 18 18 18 34 34 34
52781 - 10 10 10 50 50 50 22 22 22 2 2 6
52782 - 2 2 6 2 2 6 2 2 6 10 10 10
52783 - 86 86 86 42 42 42 14 14 14 0 0 0
52784 - 0 0 0 0 0 0 0 0 0 0 0 0
52785 - 0 0 0 0 0 0 0 0 0 0 0 0
52786 - 0 0 0 0 0 0 0 0 0 0 0 0
52787 - 0 0 0 0 0 0 0 0 0 0 0 0
52788 - 0 0 0 0 0 0 0 0 0 0 0 0
52789 - 0 0 0 0 0 0 0 0 0 0 0 0
52790 - 0 0 0 0 0 0 0 0 0 0 0 0
52791 - 0 0 1 0 0 1 0 0 1 0 0 0
52792 - 0 0 0 0 0 0 0 0 0 0 0 0
52793 - 0 0 0 0 0 0 0 0 0 0 0 0
52794 - 0 0 0 0 0 0 0 0 0 0 0 0
52795 - 0 0 0 0 0 0 0 0 0 0 0 0
52796 - 0 0 0 0 0 0 0 0 0 14 14 14
52797 - 46 46 46 86 86 86 2 2 6 2 2 6
52798 - 38 38 38 116 116 116 94 94 94 22 22 22
52799 - 22 22 22 2 2 6 2 2 6 2 2 6
52800 - 14 14 14 86 86 86 138 138 138 162 162 162
52801 -154 154 154 38 38 38 26 26 26 6 6 6
52802 - 2 2 6 2 2 6 2 2 6 2 2 6
52803 - 86 86 86 46 46 46 14 14 14 0 0 0
52804 - 0 0 0 0 0 0 0 0 0 0 0 0
52805 - 0 0 0 0 0 0 0 0 0 0 0 0
52806 - 0 0 0 0 0 0 0 0 0 0 0 0
52807 - 0 0 0 0 0 0 0 0 0 0 0 0
52808 - 0 0 0 0 0 0 0 0 0 0 0 0
52809 - 0 0 0 0 0 0 0 0 0 0 0 0
52810 - 0 0 0 0 0 0 0 0 0 0 0 0
52811 - 0 0 0 0 0 0 0 0 0 0 0 0
52812 - 0 0 0 0 0 0 0 0 0 0 0 0
52813 - 0 0 0 0 0 0 0 0 0 0 0 0
52814 - 0 0 0 0 0 0 0 0 0 0 0 0
52815 - 0 0 0 0 0 0 0 0 0 0 0 0
52816 - 0 0 0 0 0 0 0 0 0 14 14 14
52817 - 46 46 46 86 86 86 2 2 6 14 14 14
52818 -134 134 134 198 198 198 195 195 195 116 116 116
52819 - 10 10 10 2 2 6 2 2 6 6 6 6
52820 -101 98 89 187 187 187 210 210 210 218 218 218
52821 -214 214 214 134 134 134 14 14 14 6 6 6
52822 - 2 2 6 2 2 6 2 2 6 2 2 6
52823 - 86 86 86 50 50 50 18 18 18 6 6 6
52824 - 0 0 0 0 0 0 0 0 0 0 0 0
52825 - 0 0 0 0 0 0 0 0 0 0 0 0
52826 - 0 0 0 0 0 0 0 0 0 0 0 0
52827 - 0 0 0 0 0 0 0 0 0 0 0 0
52828 - 0 0 0 0 0 0 0 0 0 0 0 0
52829 - 0 0 0 0 0 0 0 0 0 0 0 0
52830 - 0 0 0 0 0 0 0 0 1 0 0 0
52831 - 0 0 1 0 0 1 0 0 1 0 0 0
52832 - 0 0 0 0 0 0 0 0 0 0 0 0
52833 - 0 0 0 0 0 0 0 0 0 0 0 0
52834 - 0 0 0 0 0 0 0 0 0 0 0 0
52835 - 0 0 0 0 0 0 0 0 0 0 0 0
52836 - 0 0 0 0 0 0 0 0 0 14 14 14
52837 - 46 46 46 86 86 86 2 2 6 54 54 54
52838 -218 218 218 195 195 195 226 226 226 246 246 246
52839 - 58 58 58 2 2 6 2 2 6 30 30 30
52840 -210 210 210 253 253 253 174 174 174 123 123 123
52841 -221 221 221 234 234 234 74 74 74 2 2 6
52842 - 2 2 6 2 2 6 2 2 6 2 2 6
52843 - 70 70 70 58 58 58 22 22 22 6 6 6
52844 - 0 0 0 0 0 0 0 0 0 0 0 0
52845 - 0 0 0 0 0 0 0 0 0 0 0 0
52846 - 0 0 0 0 0 0 0 0 0 0 0 0
52847 - 0 0 0 0 0 0 0 0 0 0 0 0
52848 - 0 0 0 0 0 0 0 0 0 0 0 0
52849 - 0 0 0 0 0 0 0 0 0 0 0 0
52850 - 0 0 0 0 0 0 0 0 0 0 0 0
52851 - 0 0 0 0 0 0 0 0 0 0 0 0
52852 - 0 0 0 0 0 0 0 0 0 0 0 0
52853 - 0 0 0 0 0 0 0 0 0 0 0 0
52854 - 0 0 0 0 0 0 0 0 0 0 0 0
52855 - 0 0 0 0 0 0 0 0 0 0 0 0
52856 - 0 0 0 0 0 0 0 0 0 14 14 14
52857 - 46 46 46 82 82 82 2 2 6 106 106 106
52858 -170 170 170 26 26 26 86 86 86 226 226 226
52859 -123 123 123 10 10 10 14 14 14 46 46 46
52860 -231 231 231 190 190 190 6 6 6 70 70 70
52861 - 90 90 90 238 238 238 158 158 158 2 2 6
52862 - 2 2 6 2 2 6 2 2 6 2 2 6
52863 - 70 70 70 58 58 58 22 22 22 6 6 6
52864 - 0 0 0 0 0 0 0 0 0 0 0 0
52865 - 0 0 0 0 0 0 0 0 0 0 0 0
52866 - 0 0 0 0 0 0 0 0 0 0 0 0
52867 - 0 0 0 0 0 0 0 0 0 0 0 0
52868 - 0 0 0 0 0 0 0 0 0 0 0 0
52869 - 0 0 0 0 0 0 0 0 0 0 0 0
52870 - 0 0 0 0 0 0 0 0 1 0 0 0
52871 - 0 0 1 0 0 1 0 0 1 0 0 0
52872 - 0 0 0 0 0 0 0 0 0 0 0 0
52873 - 0 0 0 0 0 0 0 0 0 0 0 0
52874 - 0 0 0 0 0 0 0 0 0 0 0 0
52875 - 0 0 0 0 0 0 0 0 0 0 0 0
52876 - 0 0 0 0 0 0 0 0 0 14 14 14
52877 - 42 42 42 86 86 86 6 6 6 116 116 116
52878 -106 106 106 6 6 6 70 70 70 149 149 149
52879 -128 128 128 18 18 18 38 38 38 54 54 54
52880 -221 221 221 106 106 106 2 2 6 14 14 14
52881 - 46 46 46 190 190 190 198 198 198 2 2 6
52882 - 2 2 6 2 2 6 2 2 6 2 2 6
52883 - 74 74 74 62 62 62 22 22 22 6 6 6
52884 - 0 0 0 0 0 0 0 0 0 0 0 0
52885 - 0 0 0 0 0 0 0 0 0 0 0 0
52886 - 0 0 0 0 0 0 0 0 0 0 0 0
52887 - 0 0 0 0 0 0 0 0 0 0 0 0
52888 - 0 0 0 0 0 0 0 0 0 0 0 0
52889 - 0 0 0 0 0 0 0 0 0 0 0 0
52890 - 0 0 0 0 0 0 0 0 1 0 0 0
52891 - 0 0 1 0 0 0 0 0 1 0 0 0
52892 - 0 0 0 0 0 0 0 0 0 0 0 0
52893 - 0 0 0 0 0 0 0 0 0 0 0 0
52894 - 0 0 0 0 0 0 0 0 0 0 0 0
52895 - 0 0 0 0 0 0 0 0 0 0 0 0
52896 - 0 0 0 0 0 0 0 0 0 14 14 14
52897 - 42 42 42 94 94 94 14 14 14 101 101 101
52898 -128 128 128 2 2 6 18 18 18 116 116 116
52899 -118 98 46 121 92 8 121 92 8 98 78 10
52900 -162 162 162 106 106 106 2 2 6 2 2 6
52901 - 2 2 6 195 195 195 195 195 195 6 6 6
52902 - 2 2 6 2 2 6 2 2 6 2 2 6
52903 - 74 74 74 62 62 62 22 22 22 6 6 6
52904 - 0 0 0 0 0 0 0 0 0 0 0 0
52905 - 0 0 0 0 0 0 0 0 0 0 0 0
52906 - 0 0 0 0 0 0 0 0 0 0 0 0
52907 - 0 0 0 0 0 0 0 0 0 0 0 0
52908 - 0 0 0 0 0 0 0 0 0 0 0 0
52909 - 0 0 0 0 0 0 0 0 0 0 0 0
52910 - 0 0 0 0 0 0 0 0 1 0 0 1
52911 - 0 0 1 0 0 0 0 0 1 0 0 0
52912 - 0 0 0 0 0 0 0 0 0 0 0 0
52913 - 0 0 0 0 0 0 0 0 0 0 0 0
52914 - 0 0 0 0 0 0 0 0 0 0 0 0
52915 - 0 0 0 0 0 0 0 0 0 0 0 0
52916 - 0 0 0 0 0 0 0 0 0 10 10 10
52917 - 38 38 38 90 90 90 14 14 14 58 58 58
52918 -210 210 210 26 26 26 54 38 6 154 114 10
52919 -226 170 11 236 186 11 225 175 15 184 144 12
52920 -215 174 15 175 146 61 37 26 9 2 2 6
52921 - 70 70 70 246 246 246 138 138 138 2 2 6
52922 - 2 2 6 2 2 6 2 2 6 2 2 6
52923 - 70 70 70 66 66 66 26 26 26 6 6 6
52924 - 0 0 0 0 0 0 0 0 0 0 0 0
52925 - 0 0 0 0 0 0 0 0 0 0 0 0
52926 - 0 0 0 0 0 0 0 0 0 0 0 0
52927 - 0 0 0 0 0 0 0 0 0 0 0 0
52928 - 0 0 0 0 0 0 0 0 0 0 0 0
52929 - 0 0 0 0 0 0 0 0 0 0 0 0
52930 - 0 0 0 0 0 0 0 0 0 0 0 0
52931 - 0 0 0 0 0 0 0 0 0 0 0 0
52932 - 0 0 0 0 0 0 0 0 0 0 0 0
52933 - 0 0 0 0 0 0 0 0 0 0 0 0
52934 - 0 0 0 0 0 0 0 0 0 0 0 0
52935 - 0 0 0 0 0 0 0 0 0 0 0 0
52936 - 0 0 0 0 0 0 0 0 0 10 10 10
52937 - 38 38 38 86 86 86 14 14 14 10 10 10
52938 -195 195 195 188 164 115 192 133 9 225 175 15
52939 -239 182 13 234 190 10 232 195 16 232 200 30
52940 -245 207 45 241 208 19 232 195 16 184 144 12
52941 -218 194 134 211 206 186 42 42 42 2 2 6
52942 - 2 2 6 2 2 6 2 2 6 2 2 6
52943 - 50 50 50 74 74 74 30 30 30 6 6 6
52944 - 0 0 0 0 0 0 0 0 0 0 0 0
52945 - 0 0 0 0 0 0 0 0 0 0 0 0
52946 - 0 0 0 0 0 0 0 0 0 0 0 0
52947 - 0 0 0 0 0 0 0 0 0 0 0 0
52948 - 0 0 0 0 0 0 0 0 0 0 0 0
52949 - 0 0 0 0 0 0 0 0 0 0 0 0
52950 - 0 0 0 0 0 0 0 0 0 0 0 0
52951 - 0 0 0 0 0 0 0 0 0 0 0 0
52952 - 0 0 0 0 0 0 0 0 0 0 0 0
52953 - 0 0 0 0 0 0 0 0 0 0 0 0
52954 - 0 0 0 0 0 0 0 0 0 0 0 0
52955 - 0 0 0 0 0 0 0 0 0 0 0 0
52956 - 0 0 0 0 0 0 0 0 0 10 10 10
52957 - 34 34 34 86 86 86 14 14 14 2 2 6
52958 -121 87 25 192 133 9 219 162 10 239 182 13
52959 -236 186 11 232 195 16 241 208 19 244 214 54
52960 -246 218 60 246 218 38 246 215 20 241 208 19
52961 -241 208 19 226 184 13 121 87 25 2 2 6
52962 - 2 2 6 2 2 6 2 2 6 2 2 6
52963 - 50 50 50 82 82 82 34 34 34 10 10 10
52964 - 0 0 0 0 0 0 0 0 0 0 0 0
52965 - 0 0 0 0 0 0 0 0 0 0 0 0
52966 - 0 0 0 0 0 0 0 0 0 0 0 0
52967 - 0 0 0 0 0 0 0 0 0 0 0 0
52968 - 0 0 0 0 0 0 0 0 0 0 0 0
52969 - 0 0 0 0 0 0 0 0 0 0 0 0
52970 - 0 0 0 0 0 0 0 0 0 0 0 0
52971 - 0 0 0 0 0 0 0 0 0 0 0 0
52972 - 0 0 0 0 0 0 0 0 0 0 0 0
52973 - 0 0 0 0 0 0 0 0 0 0 0 0
52974 - 0 0 0 0 0 0 0 0 0 0 0 0
52975 - 0 0 0 0 0 0 0 0 0 0 0 0
52976 - 0 0 0 0 0 0 0 0 0 10 10 10
52977 - 34 34 34 82 82 82 30 30 30 61 42 6
52978 -180 123 7 206 145 10 230 174 11 239 182 13
52979 -234 190 10 238 202 15 241 208 19 246 218 74
52980 -246 218 38 246 215 20 246 215 20 246 215 20
52981 -226 184 13 215 174 15 184 144 12 6 6 6
52982 - 2 2 6 2 2 6 2 2 6 2 2 6
52983 - 26 26 26 94 94 94 42 42 42 14 14 14
52984 - 0 0 0 0 0 0 0 0 0 0 0 0
52985 - 0 0 0 0 0 0 0 0 0 0 0 0
52986 - 0 0 0 0 0 0 0 0 0 0 0 0
52987 - 0 0 0 0 0 0 0 0 0 0 0 0
52988 - 0 0 0 0 0 0 0 0 0 0 0 0
52989 - 0 0 0 0 0 0 0 0 0 0 0 0
52990 - 0 0 0 0 0 0 0 0 0 0 0 0
52991 - 0 0 0 0 0 0 0 0 0 0 0 0
52992 - 0 0 0 0 0 0 0 0 0 0 0 0
52993 - 0 0 0 0 0 0 0 0 0 0 0 0
52994 - 0 0 0 0 0 0 0 0 0 0 0 0
52995 - 0 0 0 0 0 0 0 0 0 0 0 0
52996 - 0 0 0 0 0 0 0 0 0 10 10 10
52997 - 30 30 30 78 78 78 50 50 50 104 69 6
52998 -192 133 9 216 158 10 236 178 12 236 186 11
52999 -232 195 16 241 208 19 244 214 54 245 215 43
53000 -246 215 20 246 215 20 241 208 19 198 155 10
53001 -200 144 11 216 158 10 156 118 10 2 2 6
53002 - 2 2 6 2 2 6 2 2 6 2 2 6
53003 - 6 6 6 90 90 90 54 54 54 18 18 18
53004 - 6 6 6 0 0 0 0 0 0 0 0 0
53005 - 0 0 0 0 0 0 0 0 0 0 0 0
53006 - 0 0 0 0 0 0 0 0 0 0 0 0
53007 - 0 0 0 0 0 0 0 0 0 0 0 0
53008 - 0 0 0 0 0 0 0 0 0 0 0 0
53009 - 0 0 0 0 0 0 0 0 0 0 0 0
53010 - 0 0 0 0 0 0 0 0 0 0 0 0
53011 - 0 0 0 0 0 0 0 0 0 0 0 0
53012 - 0 0 0 0 0 0 0 0 0 0 0 0
53013 - 0 0 0 0 0 0 0 0 0 0 0 0
53014 - 0 0 0 0 0 0 0 0 0 0 0 0
53015 - 0 0 0 0 0 0 0 0 0 0 0 0
53016 - 0 0 0 0 0 0 0 0 0 10 10 10
53017 - 30 30 30 78 78 78 46 46 46 22 22 22
53018 -137 92 6 210 162 10 239 182 13 238 190 10
53019 -238 202 15 241 208 19 246 215 20 246 215 20
53020 -241 208 19 203 166 17 185 133 11 210 150 10
53021 -216 158 10 210 150 10 102 78 10 2 2 6
53022 - 6 6 6 54 54 54 14 14 14 2 2 6
53023 - 2 2 6 62 62 62 74 74 74 30 30 30
53024 - 10 10 10 0 0 0 0 0 0 0 0 0
53025 - 0 0 0 0 0 0 0 0 0 0 0 0
53026 - 0 0 0 0 0 0 0 0 0 0 0 0
53027 - 0 0 0 0 0 0 0 0 0 0 0 0
53028 - 0 0 0 0 0 0 0 0 0 0 0 0
53029 - 0 0 0 0 0 0 0 0 0 0 0 0
53030 - 0 0 0 0 0 0 0 0 0 0 0 0
53031 - 0 0 0 0 0 0 0 0 0 0 0 0
53032 - 0 0 0 0 0 0 0 0 0 0 0 0
53033 - 0 0 0 0 0 0 0 0 0 0 0 0
53034 - 0 0 0 0 0 0 0 0 0 0 0 0
53035 - 0 0 0 0 0 0 0 0 0 0 0 0
53036 - 0 0 0 0 0 0 0 0 0 10 10 10
53037 - 34 34 34 78 78 78 50 50 50 6 6 6
53038 - 94 70 30 139 102 15 190 146 13 226 184 13
53039 -232 200 30 232 195 16 215 174 15 190 146 13
53040 -168 122 10 192 133 9 210 150 10 213 154 11
53041 -202 150 34 182 157 106 101 98 89 2 2 6
53042 - 2 2 6 78 78 78 116 116 116 58 58 58
53043 - 2 2 6 22 22 22 90 90 90 46 46 46
53044 - 18 18 18 6 6 6 0 0 0 0 0 0
53045 - 0 0 0 0 0 0 0 0 0 0 0 0
53046 - 0 0 0 0 0 0 0 0 0 0 0 0
53047 - 0 0 0 0 0 0 0 0 0 0 0 0
53048 - 0 0 0 0 0 0 0 0 0 0 0 0
53049 - 0 0 0 0 0 0 0 0 0 0 0 0
53050 - 0 0 0 0 0 0 0 0 0 0 0 0
53051 - 0 0 0 0 0 0 0 0 0 0 0 0
53052 - 0 0 0 0 0 0 0 0 0 0 0 0
53053 - 0 0 0 0 0 0 0 0 0 0 0 0
53054 - 0 0 0 0 0 0 0 0 0 0 0 0
53055 - 0 0 0 0 0 0 0 0 0 0 0 0
53056 - 0 0 0 0 0 0 0 0 0 10 10 10
53057 - 38 38 38 86 86 86 50 50 50 6 6 6
53058 -128 128 128 174 154 114 156 107 11 168 122 10
53059 -198 155 10 184 144 12 197 138 11 200 144 11
53060 -206 145 10 206 145 10 197 138 11 188 164 115
53061 -195 195 195 198 198 198 174 174 174 14 14 14
53062 - 2 2 6 22 22 22 116 116 116 116 116 116
53063 - 22 22 22 2 2 6 74 74 74 70 70 70
53064 - 30 30 30 10 10 10 0 0 0 0 0 0
53065 - 0 0 0 0 0 0 0 0 0 0 0 0
53066 - 0 0 0 0 0 0 0 0 0 0 0 0
53067 - 0 0 0 0 0 0 0 0 0 0 0 0
53068 - 0 0 0 0 0 0 0 0 0 0 0 0
53069 - 0 0 0 0 0 0 0 0 0 0 0 0
53070 - 0 0 0 0 0 0 0 0 0 0 0 0
53071 - 0 0 0 0 0 0 0 0 0 0 0 0
53072 - 0 0 0 0 0 0 0 0 0 0 0 0
53073 - 0 0 0 0 0 0 0 0 0 0 0 0
53074 - 0 0 0 0 0 0 0 0 0 0 0 0
53075 - 0 0 0 0 0 0 0 0 0 0 0 0
53076 - 0 0 0 0 0 0 6 6 6 18 18 18
53077 - 50 50 50 101 101 101 26 26 26 10 10 10
53078 -138 138 138 190 190 190 174 154 114 156 107 11
53079 -197 138 11 200 144 11 197 138 11 192 133 9
53080 -180 123 7 190 142 34 190 178 144 187 187 187
53081 -202 202 202 221 221 221 214 214 214 66 66 66
53082 - 2 2 6 2 2 6 50 50 50 62 62 62
53083 - 6 6 6 2 2 6 10 10 10 90 90 90
53084 - 50 50 50 18 18 18 6 6 6 0 0 0
53085 - 0 0 0 0 0 0 0 0 0 0 0 0
53086 - 0 0 0 0 0 0 0 0 0 0 0 0
53087 - 0 0 0 0 0 0 0 0 0 0 0 0
53088 - 0 0 0 0 0 0 0 0 0 0 0 0
53089 - 0 0 0 0 0 0 0 0 0 0 0 0
53090 - 0 0 0 0 0 0 0 0 0 0 0 0
53091 - 0 0 0 0 0 0 0 0 0 0 0 0
53092 - 0 0 0 0 0 0 0 0 0 0 0 0
53093 - 0 0 0 0 0 0 0 0 0 0 0 0
53094 - 0 0 0 0 0 0 0 0 0 0 0 0
53095 - 0 0 0 0 0 0 0 0 0 0 0 0
53096 - 0 0 0 0 0 0 10 10 10 34 34 34
53097 - 74 74 74 74 74 74 2 2 6 6 6 6
53098 -144 144 144 198 198 198 190 190 190 178 166 146
53099 -154 121 60 156 107 11 156 107 11 168 124 44
53100 -174 154 114 187 187 187 190 190 190 210 210 210
53101 -246 246 246 253 253 253 253 253 253 182 182 182
53102 - 6 6 6 2 2 6 2 2 6 2 2 6
53103 - 2 2 6 2 2 6 2 2 6 62 62 62
53104 - 74 74 74 34 34 34 14 14 14 0 0 0
53105 - 0 0 0 0 0 0 0 0 0 0 0 0
53106 - 0 0 0 0 0 0 0 0 0 0 0 0
53107 - 0 0 0 0 0 0 0 0 0 0 0 0
53108 - 0 0 0 0 0 0 0 0 0 0 0 0
53109 - 0 0 0 0 0 0 0 0 0 0 0 0
53110 - 0 0 0 0 0 0 0 0 0 0 0 0
53111 - 0 0 0 0 0 0 0 0 0 0 0 0
53112 - 0 0 0 0 0 0 0 0 0 0 0 0
53113 - 0 0 0 0 0 0 0 0 0 0 0 0
53114 - 0 0 0 0 0 0 0 0 0 0 0 0
53115 - 0 0 0 0 0 0 0 0 0 0 0 0
53116 - 0 0 0 10 10 10 22 22 22 54 54 54
53117 - 94 94 94 18 18 18 2 2 6 46 46 46
53118 -234 234 234 221 221 221 190 190 190 190 190 190
53119 -190 190 190 187 187 187 187 187 187 190 190 190
53120 -190 190 190 195 195 195 214 214 214 242 242 242
53121 -253 253 253 253 253 253 253 253 253 253 253 253
53122 - 82 82 82 2 2 6 2 2 6 2 2 6
53123 - 2 2 6 2 2 6 2 2 6 14 14 14
53124 - 86 86 86 54 54 54 22 22 22 6 6 6
53125 - 0 0 0 0 0 0 0 0 0 0 0 0
53126 - 0 0 0 0 0 0 0 0 0 0 0 0
53127 - 0 0 0 0 0 0 0 0 0 0 0 0
53128 - 0 0 0 0 0 0 0 0 0 0 0 0
53129 - 0 0 0 0 0 0 0 0 0 0 0 0
53130 - 0 0 0 0 0 0 0 0 0 0 0 0
53131 - 0 0 0 0 0 0 0 0 0 0 0 0
53132 - 0 0 0 0 0 0 0 0 0 0 0 0
53133 - 0 0 0 0 0 0 0 0 0 0 0 0
53134 - 0 0 0 0 0 0 0 0 0 0 0 0
53135 - 0 0 0 0 0 0 0 0 0 0 0 0
53136 - 6 6 6 18 18 18 46 46 46 90 90 90
53137 - 46 46 46 18 18 18 6 6 6 182 182 182
53138 -253 253 253 246 246 246 206 206 206 190 190 190
53139 -190 190 190 190 190 190 190 190 190 190 190 190
53140 -206 206 206 231 231 231 250 250 250 253 253 253
53141 -253 253 253 253 253 253 253 253 253 253 253 253
53142 -202 202 202 14 14 14 2 2 6 2 2 6
53143 - 2 2 6 2 2 6 2 2 6 2 2 6
53144 - 42 42 42 86 86 86 42 42 42 18 18 18
53145 - 6 6 6 0 0 0 0 0 0 0 0 0
53146 - 0 0 0 0 0 0 0 0 0 0 0 0
53147 - 0 0 0 0 0 0 0 0 0 0 0 0
53148 - 0 0 0 0 0 0 0 0 0 0 0 0
53149 - 0 0 0 0 0 0 0 0 0 0 0 0
53150 - 0 0 0 0 0 0 0 0 0 0 0 0
53151 - 0 0 0 0 0 0 0 0 0 0 0 0
53152 - 0 0 0 0 0 0 0 0 0 0 0 0
53153 - 0 0 0 0 0 0 0 0 0 0 0 0
53154 - 0 0 0 0 0 0 0 0 0 0 0 0
53155 - 0 0 0 0 0 0 0 0 0 6 6 6
53156 - 14 14 14 38 38 38 74 74 74 66 66 66
53157 - 2 2 6 6 6 6 90 90 90 250 250 250
53158 -253 253 253 253 253 253 238 238 238 198 198 198
53159 -190 190 190 190 190 190 195 195 195 221 221 221
53160 -246 246 246 253 253 253 253 253 253 253 253 253
53161 -253 253 253 253 253 253 253 253 253 253 253 253
53162 -253 253 253 82 82 82 2 2 6 2 2 6
53163 - 2 2 6 2 2 6 2 2 6 2 2 6
53164 - 2 2 6 78 78 78 70 70 70 34 34 34
53165 - 14 14 14 6 6 6 0 0 0 0 0 0
53166 - 0 0 0 0 0 0 0 0 0 0 0 0
53167 - 0 0 0 0 0 0 0 0 0 0 0 0
53168 - 0 0 0 0 0 0 0 0 0 0 0 0
53169 - 0 0 0 0 0 0 0 0 0 0 0 0
53170 - 0 0 0 0 0 0 0 0 0 0 0 0
53171 - 0 0 0 0 0 0 0 0 0 0 0 0
53172 - 0 0 0 0 0 0 0 0 0 0 0 0
53173 - 0 0 0 0 0 0 0 0 0 0 0 0
53174 - 0 0 0 0 0 0 0 0 0 0 0 0
53175 - 0 0 0 0 0 0 0 0 0 14 14 14
53176 - 34 34 34 66 66 66 78 78 78 6 6 6
53177 - 2 2 6 18 18 18 218 218 218 253 253 253
53178 -253 253 253 253 253 253 253 253 253 246 246 246
53179 -226 226 226 231 231 231 246 246 246 253 253 253
53180 -253 253 253 253 253 253 253 253 253 253 253 253
53181 -253 253 253 253 253 253 253 253 253 253 253 253
53182 -253 253 253 178 178 178 2 2 6 2 2 6
53183 - 2 2 6 2 2 6 2 2 6 2 2 6
53184 - 2 2 6 18 18 18 90 90 90 62 62 62
53185 - 30 30 30 10 10 10 0 0 0 0 0 0
53186 - 0 0 0 0 0 0 0 0 0 0 0 0
53187 - 0 0 0 0 0 0 0 0 0 0 0 0
53188 - 0 0 0 0 0 0 0 0 0 0 0 0
53189 - 0 0 0 0 0 0 0 0 0 0 0 0
53190 - 0 0 0 0 0 0 0 0 0 0 0 0
53191 - 0 0 0 0 0 0 0 0 0 0 0 0
53192 - 0 0 0 0 0 0 0 0 0 0 0 0
53193 - 0 0 0 0 0 0 0 0 0 0 0 0
53194 - 0 0 0 0 0 0 0 0 0 0 0 0
53195 - 0 0 0 0 0 0 10 10 10 26 26 26
53196 - 58 58 58 90 90 90 18 18 18 2 2 6
53197 - 2 2 6 110 110 110 253 253 253 253 253 253
53198 -253 253 253 253 253 253 253 253 253 253 253 253
53199 -250 250 250 253 253 253 253 253 253 253 253 253
53200 -253 253 253 253 253 253 253 253 253 253 253 253
53201 -253 253 253 253 253 253 253 253 253 253 253 253
53202 -253 253 253 231 231 231 18 18 18 2 2 6
53203 - 2 2 6 2 2 6 2 2 6 2 2 6
53204 - 2 2 6 2 2 6 18 18 18 94 94 94
53205 - 54 54 54 26 26 26 10 10 10 0 0 0
53206 - 0 0 0 0 0 0 0 0 0 0 0 0
53207 - 0 0 0 0 0 0 0 0 0 0 0 0
53208 - 0 0 0 0 0 0 0 0 0 0 0 0
53209 - 0 0 0 0 0 0 0 0 0 0 0 0
53210 - 0 0 0 0 0 0 0 0 0 0 0 0
53211 - 0 0 0 0 0 0 0 0 0 0 0 0
53212 - 0 0 0 0 0 0 0 0 0 0 0 0
53213 - 0 0 0 0 0 0 0 0 0 0 0 0
53214 - 0 0 0 0 0 0 0 0 0 0 0 0
53215 - 0 0 0 6 6 6 22 22 22 50 50 50
53216 - 90 90 90 26 26 26 2 2 6 2 2 6
53217 - 14 14 14 195 195 195 250 250 250 253 253 253
53218 -253 253 253 253 253 253 253 253 253 253 253 253
53219 -253 253 253 253 253 253 253 253 253 253 253 253
53220 -253 253 253 253 253 253 253 253 253 253 253 253
53221 -253 253 253 253 253 253 253 253 253 253 253 253
53222 -250 250 250 242 242 242 54 54 54 2 2 6
53223 - 2 2 6 2 2 6 2 2 6 2 2 6
53224 - 2 2 6 2 2 6 2 2 6 38 38 38
53225 - 86 86 86 50 50 50 22 22 22 6 6 6
53226 - 0 0 0 0 0 0 0 0 0 0 0 0
53227 - 0 0 0 0 0 0 0 0 0 0 0 0
53228 - 0 0 0 0 0 0 0 0 0 0 0 0
53229 - 0 0 0 0 0 0 0 0 0 0 0 0
53230 - 0 0 0 0 0 0 0 0 0 0 0 0
53231 - 0 0 0 0 0 0 0 0 0 0 0 0
53232 - 0 0 0 0 0 0 0 0 0 0 0 0
53233 - 0 0 0 0 0 0 0 0 0 0 0 0
53234 - 0 0 0 0 0 0 0 0 0 0 0 0
53235 - 6 6 6 14 14 14 38 38 38 82 82 82
53236 - 34 34 34 2 2 6 2 2 6 2 2 6
53237 - 42 42 42 195 195 195 246 246 246 253 253 253
53238 -253 253 253 253 253 253 253 253 253 250 250 250
53239 -242 242 242 242 242 242 250 250 250 253 253 253
53240 -253 253 253 253 253 253 253 253 253 253 253 253
53241 -253 253 253 250 250 250 246 246 246 238 238 238
53242 -226 226 226 231 231 231 101 101 101 6 6 6
53243 - 2 2 6 2 2 6 2 2 6 2 2 6
53244 - 2 2 6 2 2 6 2 2 6 2 2 6
53245 - 38 38 38 82 82 82 42 42 42 14 14 14
53246 - 6 6 6 0 0 0 0 0 0 0 0 0
53247 - 0 0 0 0 0 0 0 0 0 0 0 0
53248 - 0 0 0 0 0 0 0 0 0 0 0 0
53249 - 0 0 0 0 0 0 0 0 0 0 0 0
53250 - 0 0 0 0 0 0 0 0 0 0 0 0
53251 - 0 0 0 0 0 0 0 0 0 0 0 0
53252 - 0 0 0 0 0 0 0 0 0 0 0 0
53253 - 0 0 0 0 0 0 0 0 0 0 0 0
53254 - 0 0 0 0 0 0 0 0 0 0 0 0
53255 - 10 10 10 26 26 26 62 62 62 66 66 66
53256 - 2 2 6 2 2 6 2 2 6 6 6 6
53257 - 70 70 70 170 170 170 206 206 206 234 234 234
53258 -246 246 246 250 250 250 250 250 250 238 238 238
53259 -226 226 226 231 231 231 238 238 238 250 250 250
53260 -250 250 250 250 250 250 246 246 246 231 231 231
53261 -214 214 214 206 206 206 202 202 202 202 202 202
53262 -198 198 198 202 202 202 182 182 182 18 18 18
53263 - 2 2 6 2 2 6 2 2 6 2 2 6
53264 - 2 2 6 2 2 6 2 2 6 2 2 6
53265 - 2 2 6 62 62 62 66 66 66 30 30 30
53266 - 10 10 10 0 0 0 0 0 0 0 0 0
53267 - 0 0 0 0 0 0 0 0 0 0 0 0
53268 - 0 0 0 0 0 0 0 0 0 0 0 0
53269 - 0 0 0 0 0 0 0 0 0 0 0 0
53270 - 0 0 0 0 0 0 0 0 0 0 0 0
53271 - 0 0 0 0 0 0 0 0 0 0 0 0
53272 - 0 0 0 0 0 0 0 0 0 0 0 0
53273 - 0 0 0 0 0 0 0 0 0 0 0 0
53274 - 0 0 0 0 0 0 0 0 0 0 0 0
53275 - 14 14 14 42 42 42 82 82 82 18 18 18
53276 - 2 2 6 2 2 6 2 2 6 10 10 10
53277 - 94 94 94 182 182 182 218 218 218 242 242 242
53278 -250 250 250 253 253 253 253 253 253 250 250 250
53279 -234 234 234 253 253 253 253 253 253 253 253 253
53280 -253 253 253 253 253 253 253 253 253 246 246 246
53281 -238 238 238 226 226 226 210 210 210 202 202 202
53282 -195 195 195 195 195 195 210 210 210 158 158 158
53283 - 6 6 6 14 14 14 50 50 50 14 14 14
53284 - 2 2 6 2 2 6 2 2 6 2 2 6
53285 - 2 2 6 6 6 6 86 86 86 46 46 46
53286 - 18 18 18 6 6 6 0 0 0 0 0 0
53287 - 0 0 0 0 0 0 0 0 0 0 0 0
53288 - 0 0 0 0 0 0 0 0 0 0 0 0
53289 - 0 0 0 0 0 0 0 0 0 0 0 0
53290 - 0 0 0 0 0 0 0 0 0 0 0 0
53291 - 0 0 0 0 0 0 0 0 0 0 0 0
53292 - 0 0 0 0 0 0 0 0 0 0 0 0
53293 - 0 0 0 0 0 0 0 0 0 0 0 0
53294 - 0 0 0 0 0 0 0 0 0 6 6 6
53295 - 22 22 22 54 54 54 70 70 70 2 2 6
53296 - 2 2 6 10 10 10 2 2 6 22 22 22
53297 -166 166 166 231 231 231 250 250 250 253 253 253
53298 -253 253 253 253 253 253 253 253 253 250 250 250
53299 -242 242 242 253 253 253 253 253 253 253 253 253
53300 -253 253 253 253 253 253 253 253 253 253 253 253
53301 -253 253 253 253 253 253 253 253 253 246 246 246
53302 -231 231 231 206 206 206 198 198 198 226 226 226
53303 - 94 94 94 2 2 6 6 6 6 38 38 38
53304 - 30 30 30 2 2 6 2 2 6 2 2 6
53305 - 2 2 6 2 2 6 62 62 62 66 66 66
53306 - 26 26 26 10 10 10 0 0 0 0 0 0
53307 - 0 0 0 0 0 0 0 0 0 0 0 0
53308 - 0 0 0 0 0 0 0 0 0 0 0 0
53309 - 0 0 0 0 0 0 0 0 0 0 0 0
53310 - 0 0 0 0 0 0 0 0 0 0 0 0
53311 - 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
53315 - 30 30 30 74 74 74 50 50 50 2 2 6
53316 - 26 26 26 26 26 26 2 2 6 106 106 106
53317 -238 238 238 253 253 253 253 253 253 253 253 253
53318 -253 253 253 253 253 253 253 253 253 253 253 253
53319 -253 253 253 253 253 253 253 253 253 253 253 253
53320 -253 253 253 253 253 253 253 253 253 253 253 253
53321 -253 253 253 253 253 253 253 253 253 253 253 253
53322 -253 253 253 246 246 246 218 218 218 202 202 202
53323 -210 210 210 14 14 14 2 2 6 2 2 6
53324 - 30 30 30 22 22 22 2 2 6 2 2 6
53325 - 2 2 6 2 2 6 18 18 18 86 86 86
53326 - 42 42 42 14 14 14 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 14 14 14
53335 - 42 42 42 90 90 90 22 22 22 2 2 6
53336 - 42 42 42 2 2 6 18 18 18 218 218 218
53337 -253 253 253 253 253 253 253 253 253 253 253 253
53338 -253 253 253 253 253 253 253 253 253 253 253 253
53339 -253 253 253 253 253 253 253 253 253 253 253 253
53340 -253 253 253 253 253 253 253 253 253 253 253 253
53341 -253 253 253 253 253 253 253 253 253 253 253 253
53342 -253 253 253 253 253 253 250 250 250 221 221 221
53343 -218 218 218 101 101 101 2 2 6 14 14 14
53344 - 18 18 18 38 38 38 10 10 10 2 2 6
53345 - 2 2 6 2 2 6 2 2 6 78 78 78
53346 - 58 58 58 22 22 22 6 6 6 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 0 0 0 0 0 0 0
53354 - 0 0 0 0 0 0 6 6 6 18 18 18
53355 - 54 54 54 82 82 82 2 2 6 26 26 26
53356 - 22 22 22 2 2 6 123 123 123 253 253 253
53357 -253 253 253 253 253 253 253 253 253 253 253 253
53358 -253 253 253 253 253 253 253 253 253 253 253 253
53359 -253 253 253 253 253 253 253 253 253 253 253 253
53360 -253 253 253 253 253 253 253 253 253 253 253 253
53361 -253 253 253 253 253 253 253 253 253 253 253 253
53362 -253 253 253 253 253 253 253 253 253 250 250 250
53363 -238 238 238 198 198 198 6 6 6 38 38 38
53364 - 58 58 58 26 26 26 38 38 38 2 2 6
53365 - 2 2 6 2 2 6 2 2 6 46 46 46
53366 - 78 78 78 30 30 30 10 10 10 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 0 0 0 0 0 0 0 0 0 0
53374 - 0 0 0 0 0 0 10 10 10 30 30 30
53375 - 74 74 74 58 58 58 2 2 6 42 42 42
53376 - 2 2 6 22 22 22 231 231 231 253 253 253
53377 -253 253 253 253 253 253 253 253 253 253 253 253
53378 -253 253 253 253 253 253 253 253 253 250 250 250
53379 -253 253 253 253 253 253 253 253 253 253 253 253
53380 -253 253 253 253 253 253 253 253 253 253 253 253
53381 -253 253 253 253 253 253 253 253 253 253 253 253
53382 -253 253 253 253 253 253 253 253 253 253 253 253
53383 -253 253 253 246 246 246 46 46 46 38 38 38
53384 - 42 42 42 14 14 14 38 38 38 14 14 14
53385 - 2 2 6 2 2 6 2 2 6 6 6 6
53386 - 86 86 86 46 46 46 14 14 14 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 0 0 0 0 0 0 0 0 0 0
53394 - 0 0 0 6 6 6 14 14 14 42 42 42
53395 - 90 90 90 18 18 18 18 18 18 26 26 26
53396 - 2 2 6 116 116 116 253 253 253 253 253 253
53397 -253 253 253 253 253 253 253 253 253 253 253 253
53398 -253 253 253 253 253 253 250 250 250 238 238 238
53399 -253 253 253 253 253 253 253 253 253 253 253 253
53400 -253 253 253 253 253 253 253 253 253 253 253 253
53401 -253 253 253 253 253 253 253 253 253 253 253 253
53402 -253 253 253 253 253 253 253 253 253 253 253 253
53403 -253 253 253 253 253 253 94 94 94 6 6 6
53404 - 2 2 6 2 2 6 10 10 10 34 34 34
53405 - 2 2 6 2 2 6 2 2 6 2 2 6
53406 - 74 74 74 58 58 58 22 22 22 6 6 6
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 10 10 10 26 26 26 66 66 66
53415 - 82 82 82 2 2 6 38 38 38 6 6 6
53416 - 14 14 14 210 210 210 253 253 253 253 253 253
53417 -253 253 253 253 253 253 253 253 253 253 253 253
53418 -253 253 253 253 253 253 246 246 246 242 242 242
53419 -253 253 253 253 253 253 253 253 253 253 253 253
53420 -253 253 253 253 253 253 253 253 253 253 253 253
53421 -253 253 253 253 253 253 253 253 253 253 253 253
53422 -253 253 253 253 253 253 253 253 253 253 253 253
53423 -253 253 253 253 253 253 144 144 144 2 2 6
53424 - 2 2 6 2 2 6 2 2 6 46 46 46
53425 - 2 2 6 2 2 6 2 2 6 2 2 6
53426 - 42 42 42 74 74 74 30 30 30 10 10 10
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 0 0 0 0 0 0 0 0 0 0
53434 - 6 6 6 14 14 14 42 42 42 90 90 90
53435 - 26 26 26 6 6 6 42 42 42 2 2 6
53436 - 74 74 74 250 250 250 253 253 253 253 253 253
53437 -253 253 253 253 253 253 253 253 253 253 253 253
53438 -253 253 253 253 253 253 242 242 242 242 242 242
53439 -253 253 253 253 253 253 253 253 253 253 253 253
53440 -253 253 253 253 253 253 253 253 253 253 253 253
53441 -253 253 253 253 253 253 253 253 253 253 253 253
53442 -253 253 253 253 253 253 253 253 253 253 253 253
53443 -253 253 253 253 253 253 182 182 182 2 2 6
53444 - 2 2 6 2 2 6 2 2 6 46 46 46
53445 - 2 2 6 2 2 6 2 2 6 2 2 6
53446 - 10 10 10 86 86 86 38 38 38 10 10 10
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 0 0 0 0 0 0 0 0 0 0
53454 - 10 10 10 26 26 26 66 66 66 82 82 82
53455 - 2 2 6 22 22 22 18 18 18 2 2 6
53456 -149 149 149 253 253 253 253 253 253 253 253 253
53457 -253 253 253 253 253 253 253 253 253 253 253 253
53458 -253 253 253 253 253 253 234 234 234 242 242 242
53459 -253 253 253 253 253 253 253 253 253 253 253 253
53460 -253 253 253 253 253 253 253 253 253 253 253 253
53461 -253 253 253 253 253 253 253 253 253 253 253 253
53462 -253 253 253 253 253 253 253 253 253 253 253 253
53463 -253 253 253 253 253 253 206 206 206 2 2 6
53464 - 2 2 6 2 2 6 2 2 6 38 38 38
53465 - 2 2 6 2 2 6 2 2 6 2 2 6
53466 - 6 6 6 86 86 86 46 46 46 14 14 14
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 0 0 0 0 0 0 0 6 6 6
53474 - 18 18 18 46 46 46 86 86 86 18 18 18
53475 - 2 2 6 34 34 34 10 10 10 6 6 6
53476 -210 210 210 253 253 253 253 253 253 253 253 253
53477 -253 253 253 253 253 253 253 253 253 253 253 253
53478 -253 253 253 253 253 253 234 234 234 242 242 242
53479 -253 253 253 253 253 253 253 253 253 253 253 253
53480 -253 253 253 253 253 253 253 253 253 253 253 253
53481 -253 253 253 253 253 253 253 253 253 253 253 253
53482 -253 253 253 253 253 253 253 253 253 253 253 253
53483 -253 253 253 253 253 253 221 221 221 6 6 6
53484 - 2 2 6 2 2 6 6 6 6 30 30 30
53485 - 2 2 6 2 2 6 2 2 6 2 2 6
53486 - 2 2 6 82 82 82 54 54 54 18 18 18
53487 - 6 6 6 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 10 10 10
53494 - 26 26 26 66 66 66 62 62 62 2 2 6
53495 - 2 2 6 38 38 38 10 10 10 26 26 26
53496 -238 238 238 253 253 253 253 253 253 253 253 253
53497 -253 253 253 253 253 253 253 253 253 253 253 253
53498 -253 253 253 253 253 253 231 231 231 238 238 238
53499 -253 253 253 253 253 253 253 253 253 253 253 253
53500 -253 253 253 253 253 253 253 253 253 253 253 253
53501 -253 253 253 253 253 253 253 253 253 253 253 253
53502 -253 253 253 253 253 253 253 253 253 253 253 253
53503 -253 253 253 253 253 253 231 231 231 6 6 6
53504 - 2 2 6 2 2 6 10 10 10 30 30 30
53505 - 2 2 6 2 2 6 2 2 6 2 2 6
53506 - 2 2 6 66 66 66 58 58 58 22 22 22
53507 - 6 6 6 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 0 0 0 0 10 10 10
53514 - 38 38 38 78 78 78 6 6 6 2 2 6
53515 - 2 2 6 46 46 46 14 14 14 42 42 42
53516 -246 246 246 253 253 253 253 253 253 253 253 253
53517 -253 253 253 253 253 253 253 253 253 253 253 253
53518 -253 253 253 253 253 253 231 231 231 242 242 242
53519 -253 253 253 253 253 253 253 253 253 253 253 253
53520 -253 253 253 253 253 253 253 253 253 253 253 253
53521 -253 253 253 253 253 253 253 253 253 253 253 253
53522 -253 253 253 253 253 253 253 253 253 253 253 253
53523 -253 253 253 253 253 253 234 234 234 10 10 10
53524 - 2 2 6 2 2 6 22 22 22 14 14 14
53525 - 2 2 6 2 2 6 2 2 6 2 2 6
53526 - 2 2 6 66 66 66 62 62 62 22 22 22
53527 - 6 6 6 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 0 0 0 0 6 6 6 18 18 18
53534 - 50 50 50 74 74 74 2 2 6 2 2 6
53535 - 14 14 14 70 70 70 34 34 34 62 62 62
53536 -250 250 250 253 253 253 253 253 253 253 253 253
53537 -253 253 253 253 253 253 253 253 253 253 253 253
53538 -253 253 253 253 253 253 231 231 231 246 246 246
53539 -253 253 253 253 253 253 253 253 253 253 253 253
53540 -253 253 253 253 253 253 253 253 253 253 253 253
53541 -253 253 253 253 253 253 253 253 253 253 253 253
53542 -253 253 253 253 253 253 253 253 253 253 253 253
53543 -253 253 253 253 253 253 234 234 234 14 14 14
53544 - 2 2 6 2 2 6 30 30 30 2 2 6
53545 - 2 2 6 2 2 6 2 2 6 2 2 6
53546 - 2 2 6 66 66 66 62 62 62 22 22 22
53547 - 6 6 6 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 0 6 6 6 18 18 18
53554 - 54 54 54 62 62 62 2 2 6 2 2 6
53555 - 2 2 6 30 30 30 46 46 46 70 70 70
53556 -250 250 250 253 253 253 253 253 253 253 253 253
53557 -253 253 253 253 253 253 253 253 253 253 253 253
53558 -253 253 253 253 253 253 231 231 231 246 246 246
53559 -253 253 253 253 253 253 253 253 253 253 253 253
53560 -253 253 253 253 253 253 253 253 253 253 253 253
53561 -253 253 253 253 253 253 253 253 253 253 253 253
53562 -253 253 253 253 253 253 253 253 253 253 253 253
53563 -253 253 253 253 253 253 226 226 226 10 10 10
53564 - 2 2 6 6 6 6 30 30 30 2 2 6
53565 - 2 2 6 2 2 6 2 2 6 2 2 6
53566 - 2 2 6 66 66 66 58 58 58 22 22 22
53567 - 6 6 6 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 0 0 0 0 6 6 6 22 22 22
53574 - 58 58 58 62 62 62 2 2 6 2 2 6
53575 - 2 2 6 2 2 6 30 30 30 78 78 78
53576 -250 250 250 253 253 253 253 253 253 253 253 253
53577 -253 253 253 253 253 253 253 253 253 253 253 253
53578 -253 253 253 253 253 253 231 231 231 246 246 246
53579 -253 253 253 253 253 253 253 253 253 253 253 253
53580 -253 253 253 253 253 253 253 253 253 253 253 253
53581 -253 253 253 253 253 253 253 253 253 253 253 253
53582 -253 253 253 253 253 253 253 253 253 253 253 253
53583 -253 253 253 253 253 253 206 206 206 2 2 6
53584 - 22 22 22 34 34 34 18 14 6 22 22 22
53585 - 26 26 26 18 18 18 6 6 6 2 2 6
53586 - 2 2 6 82 82 82 54 54 54 18 18 18
53587 - 6 6 6 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 0 0 0 0 6 6 6 26 26 26
53594 - 62 62 62 106 106 106 74 54 14 185 133 11
53595 -210 162 10 121 92 8 6 6 6 62 62 62
53596 -238 238 238 253 253 253 253 253 253 253 253 253
53597 -253 253 253 253 253 253 253 253 253 253 253 253
53598 -253 253 253 253 253 253 231 231 231 246 246 246
53599 -253 253 253 253 253 253 253 253 253 253 253 253
53600 -253 253 253 253 253 253 253 253 253 253 253 253
53601 -253 253 253 253 253 253 253 253 253 253 253 253
53602 -253 253 253 253 253 253 253 253 253 253 253 253
53603 -253 253 253 253 253 253 158 158 158 18 18 18
53604 - 14 14 14 2 2 6 2 2 6 2 2 6
53605 - 6 6 6 18 18 18 66 66 66 38 38 38
53606 - 6 6 6 94 94 94 50 50 50 18 18 18
53607 - 6 6 6 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 6 6 6
53613 - 10 10 10 10 10 10 18 18 18 38 38 38
53614 - 78 78 78 142 134 106 216 158 10 242 186 14
53615 -246 190 14 246 190 14 156 118 10 10 10 10
53616 - 90 90 90 238 238 238 253 253 253 253 253 253
53617 -253 253 253 253 253 253 253 253 253 253 253 253
53618 -253 253 253 253 253 253 231 231 231 250 250 250
53619 -253 253 253 253 253 253 253 253 253 253 253 253
53620 -253 253 253 253 253 253 253 253 253 253 253 253
53621 -253 253 253 253 253 253 253 253 253 253 253 253
53622 -253 253 253 253 253 253 253 253 253 246 230 190
53623 -238 204 91 238 204 91 181 142 44 37 26 9
53624 - 2 2 6 2 2 6 2 2 6 2 2 6
53625 - 2 2 6 2 2 6 38 38 38 46 46 46
53626 - 26 26 26 106 106 106 54 54 54 18 18 18
53627 - 6 6 6 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 6 6 6 14 14 14 22 22 22
53633 - 30 30 30 38 38 38 50 50 50 70 70 70
53634 -106 106 106 190 142 34 226 170 11 242 186 14
53635 -246 190 14 246 190 14 246 190 14 154 114 10
53636 - 6 6 6 74 74 74 226 226 226 253 253 253
53637 -253 253 253 253 253 253 253 253 253 253 253 253
53638 -253 253 253 253 253 253 231 231 231 250 250 250
53639 -253 253 253 253 253 253 253 253 253 253 253 253
53640 -253 253 253 253 253 253 253 253 253 253 253 253
53641 -253 253 253 253 253 253 253 253 253 253 253 253
53642 -253 253 253 253 253 253 253 253 253 228 184 62
53643 -241 196 14 241 208 19 232 195 16 38 30 10
53644 - 2 2 6 2 2 6 2 2 6 2 2 6
53645 - 2 2 6 6 6 6 30 30 30 26 26 26
53646 -203 166 17 154 142 90 66 66 66 26 26 26
53647 - 6 6 6 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 - 6 6 6 18 18 18 38 38 38 58 58 58
53653 - 78 78 78 86 86 86 101 101 101 123 123 123
53654 -175 146 61 210 150 10 234 174 13 246 186 14
53655 -246 190 14 246 190 14 246 190 14 238 190 10
53656 -102 78 10 2 2 6 46 46 46 198 198 198
53657 -253 253 253 253 253 253 253 253 253 253 253 253
53658 -253 253 253 253 253 253 234 234 234 242 242 242
53659 -253 253 253 253 253 253 253 253 253 253 253 253
53660 -253 253 253 253 253 253 253 253 253 253 253 253
53661 -253 253 253 253 253 253 253 253 253 253 253 253
53662 -253 253 253 253 253 253 253 253 253 224 178 62
53663 -242 186 14 241 196 14 210 166 10 22 18 6
53664 - 2 2 6 2 2 6 2 2 6 2 2 6
53665 - 2 2 6 2 2 6 6 6 6 121 92 8
53666 -238 202 15 232 195 16 82 82 82 34 34 34
53667 - 10 10 10 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 - 14 14 14 38 38 38 70 70 70 154 122 46
53673 -190 142 34 200 144 11 197 138 11 197 138 11
53674 -213 154 11 226 170 11 242 186 14 246 190 14
53675 -246 190 14 246 190 14 246 190 14 246 190 14
53676 -225 175 15 46 32 6 2 2 6 22 22 22
53677 -158 158 158 250 250 250 253 253 253 253 253 253
53678 -253 253 253 253 253 253 253 253 253 253 253 253
53679 -253 253 253 253 253 253 253 253 253 253 253 253
53680 -253 253 253 253 253 253 253 253 253 253 253 253
53681 -253 253 253 253 253 253 253 253 253 253 253 253
53682 -253 253 253 250 250 250 242 242 242 224 178 62
53683 -239 182 13 236 186 11 213 154 11 46 32 6
53684 - 2 2 6 2 2 6 2 2 6 2 2 6
53685 - 2 2 6 2 2 6 61 42 6 225 175 15
53686 -238 190 10 236 186 11 112 100 78 42 42 42
53687 - 14 14 14 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 6 6 6
53692 - 22 22 22 54 54 54 154 122 46 213 154 11
53693 -226 170 11 230 174 11 226 170 11 226 170 11
53694 -236 178 12 242 186 14 246 190 14 246 190 14
53695 -246 190 14 246 190 14 246 190 14 246 190 14
53696 -241 196 14 184 144 12 10 10 10 2 2 6
53697 - 6 6 6 116 116 116 242 242 242 253 253 253
53698 -253 253 253 253 253 253 253 253 253 253 253 253
53699 -253 253 253 253 253 253 253 253 253 253 253 253
53700 -253 253 253 253 253 253 253 253 253 253 253 253
53701 -253 253 253 253 253 253 253 253 253 253 253 253
53702 -253 253 253 231 231 231 198 198 198 214 170 54
53703 -236 178 12 236 178 12 210 150 10 137 92 6
53704 - 18 14 6 2 2 6 2 2 6 2 2 6
53705 - 6 6 6 70 47 6 200 144 11 236 178 12
53706 -239 182 13 239 182 13 124 112 88 58 58 58
53707 - 22 22 22 6 6 6 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 10 10 10
53712 - 30 30 30 70 70 70 180 133 36 226 170 11
53713 -239 182 13 242 186 14 242 186 14 246 186 14
53714 -246 190 14 246 190 14 246 190 14 246 190 14
53715 -246 190 14 246 190 14 246 190 14 246 190 14
53716 -246 190 14 232 195 16 98 70 6 2 2 6
53717 - 2 2 6 2 2 6 66 66 66 221 221 221
53718 -253 253 253 253 253 253 253 253 253 253 253 253
53719 -253 253 253 253 253 253 253 253 253 253 253 253
53720 -253 253 253 253 253 253 253 253 253 253 253 253
53721 -253 253 253 253 253 253 253 253 253 253 253 253
53722 -253 253 253 206 206 206 198 198 198 214 166 58
53723 -230 174 11 230 174 11 216 158 10 192 133 9
53724 -163 110 8 116 81 8 102 78 10 116 81 8
53725 -167 114 7 197 138 11 226 170 11 239 182 13
53726 -242 186 14 242 186 14 162 146 94 78 78 78
53727 - 34 34 34 14 14 14 6 6 6 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 6 6 6
53732 - 30 30 30 78 78 78 190 142 34 226 170 11
53733 -239 182 13 246 190 14 246 190 14 246 190 14
53734 -246 190 14 246 190 14 246 190 14 246 190 14
53735 -246 190 14 246 190 14 246 190 14 246 190 14
53736 -246 190 14 241 196 14 203 166 17 22 18 6
53737 - 2 2 6 2 2 6 2 2 6 38 38 38
53738 -218 218 218 253 253 253 253 253 253 253 253 253
53739 -253 253 253 253 253 253 253 253 253 253 253 253
53740 -253 253 253 253 253 253 253 253 253 253 253 253
53741 -253 253 253 253 253 253 253 253 253 253 253 253
53742 -250 250 250 206 206 206 198 198 198 202 162 69
53743 -226 170 11 236 178 12 224 166 10 210 150 10
53744 -200 144 11 197 138 11 192 133 9 197 138 11
53745 -210 150 10 226 170 11 242 186 14 246 190 14
53746 -246 190 14 246 186 14 225 175 15 124 112 88
53747 - 62 62 62 30 30 30 14 14 14 6 6 6
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 10 10 10
53752 - 30 30 30 78 78 78 174 135 50 224 166 10
53753 -239 182 13 246 190 14 246 190 14 246 190 14
53754 -246 190 14 246 190 14 246 190 14 246 190 14
53755 -246 190 14 246 190 14 246 190 14 246 190 14
53756 -246 190 14 246 190 14 241 196 14 139 102 15
53757 - 2 2 6 2 2 6 2 2 6 2 2 6
53758 - 78 78 78 250 250 250 253 253 253 253 253 253
53759 -253 253 253 253 253 253 253 253 253 253 253 253
53760 -253 253 253 253 253 253 253 253 253 253 253 253
53761 -253 253 253 253 253 253 253 253 253 253 253 253
53762 -250 250 250 214 214 214 198 198 198 190 150 46
53763 -219 162 10 236 178 12 234 174 13 224 166 10
53764 -216 158 10 213 154 11 213 154 11 216 158 10
53765 -226 170 11 239 182 13 246 190 14 246 190 14
53766 -246 190 14 246 190 14 242 186 14 206 162 42
53767 -101 101 101 58 58 58 30 30 30 14 14 14
53768 - 6 6 6 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 10 10 10
53772 - 30 30 30 74 74 74 174 135 50 216 158 10
53773 -236 178 12 246 190 14 246 190 14 246 190 14
53774 -246 190 14 246 190 14 246 190 14 246 190 14
53775 -246 190 14 246 190 14 246 190 14 246 190 14
53776 -246 190 14 246 190 14 241 196 14 226 184 13
53777 - 61 42 6 2 2 6 2 2 6 2 2 6
53778 - 22 22 22 238 238 238 253 253 253 253 253 253
53779 -253 253 253 253 253 253 253 253 253 253 253 253
53780 -253 253 253 253 253 253 253 253 253 253 253 253
53781 -253 253 253 253 253 253 253 253 253 253 253 253
53782 -253 253 253 226 226 226 187 187 187 180 133 36
53783 -216 158 10 236 178 12 239 182 13 236 178 12
53784 -230 174 11 226 170 11 226 170 11 230 174 11
53785 -236 178 12 242 186 14 246 190 14 246 190 14
53786 -246 190 14 246 190 14 246 186 14 239 182 13
53787 -206 162 42 106 106 106 66 66 66 34 34 34
53788 - 14 14 14 6 6 6 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 6 6 6
53792 - 26 26 26 70 70 70 163 133 67 213 154 11
53793 -236 178 12 246 190 14 246 190 14 246 190 14
53794 -246 190 14 246 190 14 246 190 14 246 190 14
53795 -246 190 14 246 190 14 246 190 14 246 190 14
53796 -246 190 14 246 190 14 246 190 14 241 196 14
53797 -190 146 13 18 14 6 2 2 6 2 2 6
53798 - 46 46 46 246 246 246 253 253 253 253 253 253
53799 -253 253 253 253 253 253 253 253 253 253 253 253
53800 -253 253 253 253 253 253 253 253 253 253 253 253
53801 -253 253 253 253 253 253 253 253 253 253 253 253
53802 -253 253 253 221 221 221 86 86 86 156 107 11
53803 -216 158 10 236 178 12 242 186 14 246 186 14
53804 -242 186 14 239 182 13 239 182 13 242 186 14
53805 -242 186 14 246 186 14 246 190 14 246 190 14
53806 -246 190 14 246 190 14 246 190 14 246 190 14
53807 -242 186 14 225 175 15 142 122 72 66 66 66
53808 - 30 30 30 10 10 10 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 6 6 6
53812 - 26 26 26 70 70 70 163 133 67 210 150 10
53813 -236 178 12 246 190 14 246 190 14 246 190 14
53814 -246 190 14 246 190 14 246 190 14 246 190 14
53815 -246 190 14 246 190 14 246 190 14 246 190 14
53816 -246 190 14 246 190 14 246 190 14 246 190 14
53817 -232 195 16 121 92 8 34 34 34 106 106 106
53818 -221 221 221 253 253 253 253 253 253 253 253 253
53819 -253 253 253 253 253 253 253 253 253 253 253 253
53820 -253 253 253 253 253 253 253 253 253 253 253 253
53821 -253 253 253 253 253 253 253 253 253 253 253 253
53822 -242 242 242 82 82 82 18 14 6 163 110 8
53823 -216 158 10 236 178 12 242 186 14 246 190 14
53824 -246 190 14 246 190 14 246 190 14 246 190 14
53825 -246 190 14 246 190 14 246 190 14 246 190 14
53826 -246 190 14 246 190 14 246 190 14 246 190 14
53827 -246 190 14 246 190 14 242 186 14 163 133 67
53828 - 46 46 46 18 18 18 6 6 6 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 10 10 10
53832 - 30 30 30 78 78 78 163 133 67 210 150 10
53833 -236 178 12 246 186 14 246 190 14 246 190 14
53834 -246 190 14 246 190 14 246 190 14 246 190 14
53835 -246 190 14 246 190 14 246 190 14 246 190 14
53836 -246 190 14 246 190 14 246 190 14 246 190 14
53837 -241 196 14 215 174 15 190 178 144 253 253 253
53838 -253 253 253 253 253 253 253 253 253 253 253 253
53839 -253 253 253 253 253 253 253 253 253 253 253 253
53840 -253 253 253 253 253 253 253 253 253 253 253 253
53841 -253 253 253 253 253 253 253 253 253 218 218 218
53842 - 58 58 58 2 2 6 22 18 6 167 114 7
53843 -216 158 10 236 178 12 246 186 14 246 190 14
53844 -246 190 14 246 190 14 246 190 14 246 190 14
53845 -246 190 14 246 190 14 246 190 14 246 190 14
53846 -246 190 14 246 190 14 246 190 14 246 190 14
53847 -246 190 14 246 186 14 242 186 14 190 150 46
53848 - 54 54 54 22 22 22 6 6 6 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 14 14 14
53852 - 38 38 38 86 86 86 180 133 36 213 154 11
53853 -236 178 12 246 186 14 246 190 14 246 190 14
53854 -246 190 14 246 190 14 246 190 14 246 190 14
53855 -246 190 14 246 190 14 246 190 14 246 190 14
53856 -246 190 14 246 190 14 246 190 14 246 190 14
53857 -246 190 14 232 195 16 190 146 13 214 214 214
53858 -253 253 253 253 253 253 253 253 253 253 253 253
53859 -253 253 253 253 253 253 253 253 253 253 253 253
53860 -253 253 253 253 253 253 253 253 253 253 253 253
53861 -253 253 253 250 250 250 170 170 170 26 26 26
53862 - 2 2 6 2 2 6 37 26 9 163 110 8
53863 -219 162 10 239 182 13 246 186 14 246 190 14
53864 -246 190 14 246 190 14 246 190 14 246 190 14
53865 -246 190 14 246 190 14 246 190 14 246 190 14
53866 -246 190 14 246 190 14 246 190 14 246 190 14
53867 -246 186 14 236 178 12 224 166 10 142 122 72
53868 - 46 46 46 18 18 18 6 6 6 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 6 6 6 18 18 18
53872 - 50 50 50 109 106 95 192 133 9 224 166 10
53873 -242 186 14 246 190 14 246 190 14 246 190 14
53874 -246 190 14 246 190 14 246 190 14 246 190 14
53875 -246 190 14 246 190 14 246 190 14 246 190 14
53876 -246 190 14 246 190 14 246 190 14 246 190 14
53877 -242 186 14 226 184 13 210 162 10 142 110 46
53878 -226 226 226 253 253 253 253 253 253 253 253 253
53879 -253 253 253 253 253 253 253 253 253 253 253 253
53880 -253 253 253 253 253 253 253 253 253 253 253 253
53881 -198 198 198 66 66 66 2 2 6 2 2 6
53882 - 2 2 6 2 2 6 50 34 6 156 107 11
53883 -219 162 10 239 182 13 246 186 14 246 190 14
53884 -246 190 14 246 190 14 246 190 14 246 190 14
53885 -246 190 14 246 190 14 246 190 14 246 190 14
53886 -246 190 14 246 190 14 246 190 14 242 186 14
53887 -234 174 13 213 154 11 154 122 46 66 66 66
53888 - 30 30 30 10 10 10 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 6 6 6 22 22 22
53892 - 58 58 58 154 121 60 206 145 10 234 174 13
53893 -242 186 14 246 186 14 246 190 14 246 190 14
53894 -246 190 14 246 190 14 246 190 14 246 190 14
53895 -246 190 14 246 190 14 246 190 14 246 190 14
53896 -246 190 14 246 190 14 246 190 14 246 190 14
53897 -246 186 14 236 178 12 210 162 10 163 110 8
53898 - 61 42 6 138 138 138 218 218 218 250 250 250
53899 -253 253 253 253 253 253 253 253 253 250 250 250
53900 -242 242 242 210 210 210 144 144 144 66 66 66
53901 - 6 6 6 2 2 6 2 2 6 2 2 6
53902 - 2 2 6 2 2 6 61 42 6 163 110 8
53903 -216 158 10 236 178 12 246 190 14 246 190 14
53904 -246 190 14 246 190 14 246 190 14 246 190 14
53905 -246 190 14 246 190 14 246 190 14 246 190 14
53906 -246 190 14 239 182 13 230 174 11 216 158 10
53907 -190 142 34 124 112 88 70 70 70 38 38 38
53908 - 18 18 18 6 6 6 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 6 6 6 22 22 22
53912 - 62 62 62 168 124 44 206 145 10 224 166 10
53913 -236 178 12 239 182 13 242 186 14 242 186 14
53914 -246 186 14 246 190 14 246 190 14 246 190 14
53915 -246 190 14 246 190 14 246 190 14 246 190 14
53916 -246 190 14 246 190 14 246 190 14 246 190 14
53917 -246 190 14 236 178 12 216 158 10 175 118 6
53918 - 80 54 7 2 2 6 6 6 6 30 30 30
53919 - 54 54 54 62 62 62 50 50 50 38 38 38
53920 - 14 14 14 2 2 6 2 2 6 2 2 6
53921 - 2 2 6 2 2 6 2 2 6 2 2 6
53922 - 2 2 6 6 6 6 80 54 7 167 114 7
53923 -213 154 11 236 178 12 246 190 14 246 190 14
53924 -246 190 14 246 190 14 246 190 14 246 190 14
53925 -246 190 14 242 186 14 239 182 13 239 182 13
53926 -230 174 11 210 150 10 174 135 50 124 112 88
53927 - 82 82 82 54 54 54 34 34 34 18 18 18
53928 - 6 6 6 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 6 6 6 18 18 18
53932 - 50 50 50 158 118 36 192 133 9 200 144 11
53933 -216 158 10 219 162 10 224 166 10 226 170 11
53934 -230 174 11 236 178 12 239 182 13 239 182 13
53935 -242 186 14 246 186 14 246 190 14 246 190 14
53936 -246 190 14 246 190 14 246 190 14 246 190 14
53937 -246 186 14 230 174 11 210 150 10 163 110 8
53938 -104 69 6 10 10 10 2 2 6 2 2 6
53939 - 2 2 6 2 2 6 2 2 6 2 2 6
53940 - 2 2 6 2 2 6 2 2 6 2 2 6
53941 - 2 2 6 2 2 6 2 2 6 2 2 6
53942 - 2 2 6 6 6 6 91 60 6 167 114 7
53943 -206 145 10 230 174 11 242 186 14 246 190 14
53944 -246 190 14 246 190 14 246 186 14 242 186 14
53945 -239 182 13 230 174 11 224 166 10 213 154 11
53946 -180 133 36 124 112 88 86 86 86 58 58 58
53947 - 38 38 38 22 22 22 10 10 10 6 6 6
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 14 14 14
53952 - 34 34 34 70 70 70 138 110 50 158 118 36
53953 -167 114 7 180 123 7 192 133 9 197 138 11
53954 -200 144 11 206 145 10 213 154 11 219 162 10
53955 -224 166 10 230 174 11 239 182 13 242 186 14
53956 -246 186 14 246 186 14 246 186 14 246 186 14
53957 -239 182 13 216 158 10 185 133 11 152 99 6
53958 -104 69 6 18 14 6 2 2 6 2 2 6
53959 - 2 2 6 2 2 6 2 2 6 2 2 6
53960 - 2 2 6 2 2 6 2 2 6 2 2 6
53961 - 2 2 6 2 2 6 2 2 6 2 2 6
53962 - 2 2 6 6 6 6 80 54 7 152 99 6
53963 -192 133 9 219 162 10 236 178 12 239 182 13
53964 -246 186 14 242 186 14 239 182 13 236 178 12
53965 -224 166 10 206 145 10 192 133 9 154 121 60
53966 - 94 94 94 62 62 62 42 42 42 22 22 22
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 6 6 6
53972 - 18 18 18 34 34 34 58 58 58 78 78 78
53973 -101 98 89 124 112 88 142 110 46 156 107 11
53974 -163 110 8 167 114 7 175 118 6 180 123 7
53975 -185 133 11 197 138 11 210 150 10 219 162 10
53976 -226 170 11 236 178 12 236 178 12 234 174 13
53977 -219 162 10 197 138 11 163 110 8 130 83 6
53978 - 91 60 6 10 10 10 2 2 6 2 2 6
53979 - 18 18 18 38 38 38 38 38 38 38 38 38
53980 - 38 38 38 38 38 38 38 38 38 38 38 38
53981 - 38 38 38 38 38 38 26 26 26 2 2 6
53982 - 2 2 6 6 6 6 70 47 6 137 92 6
53983 -175 118 6 200 144 11 219 162 10 230 174 11
53984 -234 174 13 230 174 11 219 162 10 210 150 10
53985 -192 133 9 163 110 8 124 112 88 82 82 82
53986 - 50 50 50 30 30 30 14 14 14 6 6 6
53987 - 0 0 0 0 0 0 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 - 6 6 6 14 14 14 22 22 22 34 34 34
53993 - 42 42 42 58 58 58 74 74 74 86 86 86
53994 -101 98 89 122 102 70 130 98 46 121 87 25
53995 -137 92 6 152 99 6 163 110 8 180 123 7
53996 -185 133 11 197 138 11 206 145 10 200 144 11
53997 -180 123 7 156 107 11 130 83 6 104 69 6
53998 - 50 34 6 54 54 54 110 110 110 101 98 89
53999 - 86 86 86 82 82 82 78 78 78 78 78 78
54000 - 78 78 78 78 78 78 78 78 78 78 78 78
54001 - 78 78 78 82 82 82 86 86 86 94 94 94
54002 -106 106 106 101 101 101 86 66 34 124 80 6
54003 -156 107 11 180 123 7 192 133 9 200 144 11
54004 -206 145 10 200 144 11 192 133 9 175 118 6
54005 -139 102 15 109 106 95 70 70 70 42 42 42
54006 - 22 22 22 10 10 10 0 0 0 0 0 0
54007 - 0 0 0 0 0 0 0 0 0 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 6 6 6 10 10 10
54013 - 14 14 14 22 22 22 30 30 30 38 38 38
54014 - 50 50 50 62 62 62 74 74 74 90 90 90
54015 -101 98 89 112 100 78 121 87 25 124 80 6
54016 -137 92 6 152 99 6 152 99 6 152 99 6
54017 -138 86 6 124 80 6 98 70 6 86 66 30
54018 -101 98 89 82 82 82 58 58 58 46 46 46
54019 - 38 38 38 34 34 34 34 34 34 34 34 34
54020 - 34 34 34 34 34 34 34 34 34 34 34 34
54021 - 34 34 34 34 34 34 38 38 38 42 42 42
54022 - 54 54 54 82 82 82 94 86 76 91 60 6
54023 -134 86 6 156 107 11 167 114 7 175 118 6
54024 -175 118 6 167 114 7 152 99 6 121 87 25
54025 -101 98 89 62 62 62 34 34 34 18 18 18
54026 - 6 6 6 0 0 0 0 0 0 0 0 0
54027 - 0 0 0 0 0 0 0 0 0 0 0 0
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 6 6 6 6 6 6 10 10 10
54034 - 18 18 18 22 22 22 30 30 30 42 42 42
54035 - 50 50 50 66 66 66 86 86 86 101 98 89
54036 -106 86 58 98 70 6 104 69 6 104 69 6
54037 -104 69 6 91 60 6 82 62 34 90 90 90
54038 - 62 62 62 38 38 38 22 22 22 14 14 14
54039 - 10 10 10 10 10 10 10 10 10 10 10 10
54040 - 10 10 10 10 10 10 6 6 6 10 10 10
54041 - 10 10 10 10 10 10 10 10 10 14 14 14
54042 - 22 22 22 42 42 42 70 70 70 89 81 66
54043 - 80 54 7 104 69 6 124 80 6 137 92 6
54044 -134 86 6 116 81 8 100 82 52 86 86 86
54045 - 58 58 58 30 30 30 14 14 14 6 6 6
54046 - 0 0 0 0 0 0 0 0 0 0 0 0
54047 - 0 0 0 0 0 0 0 0 0 0 0 0
54048 - 0 0 0 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 6 6 6 10 10 10 14 14 14
54055 - 18 18 18 26 26 26 38 38 38 54 54 54
54056 - 70 70 70 86 86 86 94 86 76 89 81 66
54057 - 89 81 66 86 86 86 74 74 74 50 50 50
54058 - 30 30 30 14 14 14 6 6 6 0 0 0
54059 - 0 0 0 0 0 0 0 0 0 0 0 0
54060 - 0 0 0 0 0 0 0 0 0 0 0 0
54061 - 0 0 0 0 0 0 0 0 0 0 0 0
54062 - 6 6 6 18 18 18 34 34 34 58 58 58
54063 - 82 82 82 89 81 66 89 81 66 89 81 66
54064 - 94 86 66 94 86 76 74 74 74 50 50 50
54065 - 26 26 26 14 14 14 6 6 6 0 0 0
54066 - 0 0 0 0 0 0 0 0 0 0 0 0
54067 - 0 0 0 0 0 0 0 0 0 0 0 0
54068 - 0 0 0 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 - 6 6 6 6 6 6 14 14 14 18 18 18
54076 - 30 30 30 38 38 38 46 46 46 54 54 54
54077 - 50 50 50 42 42 42 30 30 30 18 18 18
54078 - 10 10 10 0 0 0 0 0 0 0 0 0
54079 - 0 0 0 0 0 0 0 0 0 0 0 0
54080 - 0 0 0 0 0 0 0 0 0 0 0 0
54081 - 0 0 0 0 0 0 0 0 0 0 0 0
54082 - 0 0 0 6 6 6 14 14 14 26 26 26
54083 - 38 38 38 50 50 50 58 58 58 58 58 58
54084 - 54 54 54 42 42 42 30 30 30 18 18 18
54085 - 10 10 10 0 0 0 0 0 0 0 0 0
54086 - 0 0 0 0 0 0 0 0 0 0 0 0
54087 - 0 0 0 0 0 0 0 0 0 0 0 0
54088 - 0 0 0 0 0 0 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 6 6 6
54096 - 6 6 6 10 10 10 14 14 14 18 18 18
54097 - 18 18 18 14 14 14 10 10 10 6 6 6
54098 - 0 0 0 0 0 0 0 0 0 0 0 0
54099 - 0 0 0 0 0 0 0 0 0 0 0 0
54100 - 0 0 0 0 0 0 0 0 0 0 0 0
54101 - 0 0 0 0 0 0 0 0 0 0 0 0
54102 - 0 0 0 0 0 0 0 0 0 6 6 6
54103 - 14 14 14 18 18 18 22 22 22 22 22 22
54104 - 18 18 18 14 14 14 10 10 10 6 6 6
54105 - 0 0 0 0 0 0 0 0 0 0 0 0
54106 - 0 0 0 0 0 0 0 0 0 0 0 0
54107 - 0 0 0 0 0 0 0 0 0 0 0 0
54108 - 0 0 0 0 0 0 0 0 0 0 0 0
54109 - 0 0 0 0 0 0 0 0 0 0 0 0
54110 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54111 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54112 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54113 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54114 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54115 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54116 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54117 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54118 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54119 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54120 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54121 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54122 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54123 +4 4 4 4 4 4
54124 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54125 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54126 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54127 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54128 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54129 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54130 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54131 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54132 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54133 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54134 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54135 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54136 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54137 +4 4 4 4 4 4
54138 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54139 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54140 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54141 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54142 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54143 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54144 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54145 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54146 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54147 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54148 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54149 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54150 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54151 +4 4 4 4 4 4
54152 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54153 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54154 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54155 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54156 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54157 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54158 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54159 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54160 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54161 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54162 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54163 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54164 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54165 +4 4 4 4 4 4
54166 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54167 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54168 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54169 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54170 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54171 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54172 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54173 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54174 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54175 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54176 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54177 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54178 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54179 +4 4 4 4 4 4
54180 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54181 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54182 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54183 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54184 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54185 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54186 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54187 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54188 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54189 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54190 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54191 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54192 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54193 +4 4 4 4 4 4
54194 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54195 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54196 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54197 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54198 +4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
54199 +0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
54200 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54201 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54202 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54203 +4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
54204 +0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
54205 +4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
54206 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54207 +4 4 4 4 4 4
54208 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54209 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54210 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54211 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54212 +4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
54213 +37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
54214 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54215 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54216 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54217 +4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
54218 +2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
54219 +4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
54220 +1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54221 +4 4 4 4 4 4
54222 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54223 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54224 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54225 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54226 +2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
54227 +153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
54228 +0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
54229 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54230 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54231 +4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
54232 +60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
54233 +4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
54234 +2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
54235 +4 4 4 4 4 4
54236 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54237 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54238 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54239 +4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
54240 +4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
54241 +165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
54242 +1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
54243 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54244 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
54245 +3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
54246 +163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
54247 +0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
54248 +37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
54249 +4 4 4 4 4 4
54250 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54251 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54252 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54253 +4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
54254 +37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
54255 +156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
54256 +125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
54257 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
54258 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
54259 +0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
54260 +174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
54261 +0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
54262 +64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
54263 +4 4 4 4 4 4
54264 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54265 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54266 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
54267 +5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
54268 +156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
54269 +156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
54270 +174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
54271 +1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
54272 +4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
54273 +13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
54274 +174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
54275 +22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
54276 +90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
54277 +4 4 4 4 4 4
54278 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54279 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54280 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
54281 +0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
54282 +174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
54283 +156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
54284 +163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
54285 +4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
54286 +5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
54287 +131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
54288 +190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
54289 +90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
54290 +31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
54291 +4 4 4 4 4 4
54292 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54293 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54294 +4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
54295 +4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
54296 +155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
54297 +167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
54298 +153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
54299 +41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
54300 +1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
54301 +177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
54302 +125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
54303 +136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
54304 +7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
54305 +4 4 4 4 4 4
54306 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54307 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54308 +4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
54309 +125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
54310 +156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
54311 +137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
54312 +156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
54313 +167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
54314 +0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
54315 +166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
54316 +6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
54317 +90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
54318 +1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
54319 +4 4 4 4 4 4
54320 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54321 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54322 +1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
54323 +167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
54324 +157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
54325 +26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
54326 +158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
54327 +165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
54328 +60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
54329 +137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
54330 +52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
54331 +13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
54332 +4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
54333 +4 4 4 4 4 4
54334 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54335 +4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
54336 +0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
54337 +158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
54338 +167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
54339 +4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
54340 +174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
54341 +155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
54342 +137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
54343 +16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
54344 +136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
54345 +2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
54346 +4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
54347 +4 4 4 4 4 4
54348 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54349 +4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
54350 +37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
54351 +157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
54352 +153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
54353 +4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
54354 +125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
54355 +156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
54356 +174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
54357 +4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
54358 +136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
54359 +1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
54360 +2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
54361 +0 0 0 4 4 4
54362 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
54363 +4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
54364 +158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
54365 +153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
54366 +37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
54367 +4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
54368 +4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
54369 +154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
54370 +174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
54371 +32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
54372 +28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
54373 +50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
54374 +0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
54375 +2 0 0 0 0 0
54376 +4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
54377 +0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
54378 +174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
54379 +165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
54380 +4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
54381 +4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
54382 +4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
54383 +174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
54384 +60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
54385 +136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
54386 +22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
54387 +136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
54388 +26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
54389 +37 38 37 0 0 0
54390 +4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
54391 +13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
54392 +153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
54393 +177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
54394 +4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
54395 +5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
54396 +6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
54397 +166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
54398 +4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
54399 +146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
54400 +71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
54401 +90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
54402 +125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
54403 +85 115 134 4 0 0
54404 +4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
54405 +125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
54406 +155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
54407 +125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
54408 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
54409 +0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
54410 +5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
54411 +37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
54412 +4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
54413 +90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
54414 +2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
54415 +13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
54416 +166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
54417 +60 73 81 4 0 0
54418 +4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
54419 +174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
54420 +156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
54421 +4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
54422 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
54423 +10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
54424 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
54425 +4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
54426 +80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
54427 +28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
54428 +50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
54429 +1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
54430 +167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
54431 +16 19 21 4 0 0
54432 +4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
54433 +158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
54434 +167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
54435 +4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
54436 +4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
54437 +80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
54438 +4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
54439 +3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
54440 +146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
54441 +68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
54442 +136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
54443 +24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
54444 +163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
54445 +4 0 0 4 3 3
54446 +3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
54447 +156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
54448 +155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
54449 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
54450 +2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
54451 +136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
54452 +0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
54453 +0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
54454 +136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
54455 +28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
54456 +22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
54457 +137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
54458 +60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
54459 +3 2 2 4 4 4
54460 +3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
54461 +157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
54462 +37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
54463 +4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
54464 +0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
54465 +101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
54466 +14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
54467 +22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
54468 +136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
54469 +17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
54470 +2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
54471 +166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
54472 +13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
54473 +4 4 4 4 4 4
54474 +1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
54475 +163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
54476 +4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
54477 +4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
54478 +40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
54479 +101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
54480 +101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
54481 +136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
54482 +136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
54483 +136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
54484 +3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
54485 +174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
54486 +4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
54487 +4 4 4 4 4 4
54488 +4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
54489 +155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
54490 +4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
54491 +4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
54492 +101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
54493 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
54494 +136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
54495 +136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
54496 +136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
54497 +90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
54498 +85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
54499 +167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
54500 +6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
54501 +5 5 5 5 5 5
54502 +1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
54503 +131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
54504 +6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
54505 +0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
54506 +101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
54507 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
54508 +101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
54509 +136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
54510 +101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
54511 +7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
54512 +174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
54513 +24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
54514 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
54515 +5 5 5 4 4 4
54516 +4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
54517 +131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
54518 +6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
54519 +13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
54520 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
54521 +101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
54522 +101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
54523 +136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
54524 +136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
54525 +2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
54526 +174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
54527 +4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
54528 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54529 +4 4 4 4 4 4
54530 +1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
54531 +137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
54532 +4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
54533 +64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
54534 +90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
54535 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
54536 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
54537 +136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
54538 +101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
54539 +37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
54540 +167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
54541 +3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
54542 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54543 +4 4 4 4 4 4
54544 +4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
54545 +153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
54546 +4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
54547 +90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
54548 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
54549 +90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
54550 +101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
54551 +101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
54552 +35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
54553 +154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
54554 +60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
54555 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54556 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54557 +4 4 4 4 4 4
54558 +1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
54559 +153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
54560 +4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
54561 +64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
54562 +64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
54563 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
54564 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
54565 +136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
54566 +13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
54567 +174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
54568 +6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
54569 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54570 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54571 +4 4 4 4 4 4
54572 +4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
54573 +156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
54574 +4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
54575 +90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
54576 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
54577 +90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
54578 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
54579 +101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
54580 +2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
54581 +174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
54582 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54583 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54584 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54585 +4 4 4 4 4 4
54586 +3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
54587 +158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
54588 +4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
54589 +37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
54590 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
54591 +90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
54592 +101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
54593 +90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
54594 +5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
54595 +167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
54596 +6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
54597 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54598 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54599 +4 4 4 4 4 4
54600 +4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
54601 +163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
54602 +4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
54603 +18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
54604 +64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
54605 +90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
54606 +101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
54607 +13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
54608 +3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
54609 +174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
54610 +4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
54611 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54612 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54613 +4 4 4 4 4 4
54614 +1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
54615 +167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
54616 +4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
54617 +18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
54618 +26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
54619 +90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
54620 +101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
54621 +7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
54622 +4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
54623 +174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
54624 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54625 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54626 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54627 +4 4 4 4 4 4
54628 +4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
54629 +174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
54630 +5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
54631 +18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
54632 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
54633 +90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
54634 +101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
54635 +2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
54636 +3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
54637 +153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
54638 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54639 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54640 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54641 +4 4 4 4 4 4
54642 +1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
54643 +174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
54644 +5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
54645 +18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
54646 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
54647 +26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
54648 +35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
54649 +2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
54650 +3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
54651 +131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
54652 +4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54653 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54654 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54655 +4 4 4 4 4 4
54656 +3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
54657 +174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
54658 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
54659 +18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
54660 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
54661 +26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
54662 +7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
54663 +4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
54664 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
54665 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
54666 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54667 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54668 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54669 +4 4 4 4 4 4
54670 +1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
54671 +174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
54672 +5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
54673 +18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
54674 +18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
54675 +26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
54676 +28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
54677 +3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
54678 +4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
54679 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
54680 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54681 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54682 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54683 +4 4 4 4 4 4
54684 +4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
54685 +174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
54686 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
54687 +10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
54688 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
54689 +18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
54690 +90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
54691 +3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
54692 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
54693 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
54694 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54695 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54696 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54697 +4 4 4 4 4 4
54698 +1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
54699 +177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
54700 +5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
54701 +10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
54702 +26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
54703 +6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
54704 +10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
54705 +2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
54706 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
54707 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
54708 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54709 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54710 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54711 +4 4 4 4 4 4
54712 +4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
54713 +177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
54714 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
54715 +10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
54716 +26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
54717 +7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
54718 +3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
54719 +21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
54720 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
54721 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
54722 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54723 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54724 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54725 +4 4 4 4 4 4
54726 +3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
54727 +190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
54728 +5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
54729 +10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
54730 +24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
54731 +18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
54732 +28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
54733 +26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
54734 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
54735 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
54736 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54737 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54738 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54739 +4 4 4 4 4 4
54740 +4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
54741 +190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
54742 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
54743 +10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
54744 +0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
54745 +26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
54746 +37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
54747 +90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
54748 +4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
54749 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
54750 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54751 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54752 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54753 +4 4 4 4 4 4
54754 +4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
54755 +193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
54756 +5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
54757 +10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
54758 +1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
54759 +26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
54760 +22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
54761 +26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
54762 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
54763 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
54764 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54765 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54766 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54767 +4 4 4 4 4 4
54768 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
54769 +190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
54770 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
54771 +10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
54772 +2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
54773 +26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
54774 +10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
54775 +26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
54776 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
54777 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
54778 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54779 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54780 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54781 +4 4 4 4 4 4
54782 +4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
54783 +193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
54784 +5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
54785 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
54786 +13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
54787 +10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
54788 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
54789 +26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
54790 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
54791 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
54792 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54793 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54794 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54795 +4 4 4 4 4 4
54796 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
54797 +190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
54798 +5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
54799 +28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
54800 +10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
54801 +28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
54802 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
54803 +26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
54804 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
54805 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
54806 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54807 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54808 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54809 +4 4 4 4 4 4
54810 +4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
54811 +193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
54812 +5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
54813 +4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
54814 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
54815 +10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
54816 +18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
54817 +22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
54818 +4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
54819 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
54820 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54821 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54822 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54823 +4 4 4 4 4 4
54824 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
54825 +190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
54826 +6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
54827 +1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
54828 +18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
54829 +10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
54830 +26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
54831 +1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
54832 +5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
54833 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
54834 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54835 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54836 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54837 +4 4 4 4 4 4
54838 +4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
54839 +193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
54840 +2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
54841 +4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
54842 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
54843 +10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
54844 +26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
54845 +2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
54846 +3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
54847 +131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
54848 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54849 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54850 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54851 +4 4 4 4 4 4
54852 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
54853 +193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
54854 +0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
54855 +4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
54856 +13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
54857 +10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
54858 +28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
54859 +4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
54860 +0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
54861 +125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
54862 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54863 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54864 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54865 +4 4 4 4 4 4
54866 +4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
54867 +193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
54868 +120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
54869 +4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
54870 +4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
54871 +10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
54872 +4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
54873 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
54874 +24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
54875 +125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
54876 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
54877 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54878 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54879 +4 4 4 4 4 4
54880 +4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
54881 +174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
54882 +220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
54883 +3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
54884 +4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
54885 +10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
54886 +1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
54887 +5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
54888 +137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
54889 +125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
54890 +0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54891 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54892 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54893 +4 4 4 4 4 4
54894 +5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
54895 +193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
54896 +220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
54897 +4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
54898 +4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
54899 +22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
54900 +4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54901 +1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
54902 +166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
54903 +125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
54904 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
54905 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54906 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54907 +4 4 4 4 4 4
54908 +4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
54909 +220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
54910 +205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
54911 +24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
54912 +4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
54913 +4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
54914 +4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
54915 +2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
54916 +156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
54917 +137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
54918 +5 5 5 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
54922 +5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
54923 +125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
54924 +205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
54925 +193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
54926 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
54927 +1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
54928 +5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
54929 +60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
54930 +153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
54931 +125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
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
54936 +4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
54937 +6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
54938 +193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
54939 +244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
54940 +0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
54941 +4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
54942 +3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
54943 +220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
54944 +153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
54945 +13 16 17 4 0 0 4 0 0 4 3 3 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
54950 +5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
54951 +6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
54952 +244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
54953 +220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
54954 +3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
54955 +4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
54956 +0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
54957 +177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
54958 +158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
54959 +4 0 0 4 0 0 5 5 5 5 5 5 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
54964 +5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
54965 +6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
54966 +177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
54967 +220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
54968 +125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
54969 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
54970 +37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
54971 +174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
54972 +158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
54973 +4 3 3 5 5 5 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
54978 +4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
54979 +4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
54980 +26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
54981 +205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
54982 +244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
54983 +0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
54984 +177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
54985 +174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
54986 +60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
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
54992 +5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
54993 +6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
54994 +6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
54995 +220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
54996 +220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
54997 +0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
54998 +220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
54999 +174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
55000 +4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
55001 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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
55006 +4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
55007 +6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
55008 +4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
55009 +220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
55010 +205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
55011 +60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
55012 +177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
55013 +190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
55014 +4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55015 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55016 +4 4 4 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
55020 +4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
55021 +4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
55022 +6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
55023 +125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
55024 +205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
55025 +193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
55026 +190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
55027 +153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
55028 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55029 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55030 +4 4 4 4 4 4 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
55034 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
55035 +6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
55036 +4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
55037 +4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
55038 +205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
55039 +220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
55040 +174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
55041 +6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
55042 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55043 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55044 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4
55047 +4 4 4 4 4 4
55048 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
55049 +5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
55050 +6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
55051 +4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
55052 +220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
55053 +190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
55054 +193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
55055 +4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
55056 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55057 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55058 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55059 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55060 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55061 +4 4 4 4 4 4
55062 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55063 +4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
55064 +4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
55065 +6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
55066 +174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
55067 +193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
55068 +193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
55069 +6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
55070 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55071 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55072 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55073 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55074 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55075 +4 4 4 4 4 4
55076 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55077 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
55078 +5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
55079 +5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
55080 +6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
55081 +193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
55082 +60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
55083 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
55084 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55085 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55086 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55087 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55088 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55089 +4 4 4 4 4 4
55090 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55091 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55092 +4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
55093 +5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
55094 +4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
55095 +193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
55096 +6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
55097 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
55098 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55099 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55100 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55101 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55102 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55103 +4 4 4 4 4 4
55104 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55105 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55106 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
55107 +4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
55108 +6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
55109 +153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
55110 +6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
55111 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55112 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55113 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55114 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55115 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55116 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55117 +4 4 4 4 4 4
55118 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55119 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55120 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55121 +4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
55122 +6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
55123 +24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
55124 +6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
55125 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55126 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55127 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55128 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55129 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55130 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55131 +4 4 4 4 4 4
55132 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55133 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55134 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55135 +4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
55136 +4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
55137 +6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
55138 +4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
55139 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55140 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55141 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55142 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55143 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55144 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55145 +4 4 4 4 4 4
55146 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55147 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55148 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55149 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
55150 +5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
55151 +6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
55152 +6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
55153 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55154 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55155 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55156 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55157 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55158 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55159 +4 4 4 4 4 4
55160 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55161 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55162 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55163 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
55164 +4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
55165 +4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
55166 +6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55167 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55168 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55169 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55170 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55171 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55172 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55173 +4 4 4 4 4 4
55174 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55175 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55176 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55177 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55178 +4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
55179 +6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
55180 +4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
55181 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55182 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55183 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55184 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55185 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55186 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55187 +4 4 4 4 4 4
55188 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55189 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55190 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55191 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55192 +4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
55193 +4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
55194 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55195 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55196 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55197 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55198 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55199 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55200 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55201 +4 4 4 4 4 4
55202 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55203 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55204 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55205 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55206 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
55207 +5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
55208 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55209 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55210 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55211 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55212 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55213 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55214 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55215 +4 4 4 4 4 4
55216 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55217 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55218 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55219 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55220 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
55221 +5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
55222 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55223 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55224 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55225 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55226 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55227 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55228 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55229 +4 4 4 4 4 4
55230 diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c
55231 index a01147f..5d896f8 100644
55232 --- a/drivers/video/matrox/matroxfb_DAC1064.c
55233 +++ b/drivers/video/matrox/matroxfb_DAC1064.c
55234 @@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
55235
55236 #ifdef CONFIG_FB_MATROX_MYSTIQUE
55237 struct matrox_switch matrox_mystique = {
55238 - MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
55239 + .preinit = MGA1064_preinit,
55240 + .reset = MGA1064_reset,
55241 + .init = MGA1064_init,
55242 + .restore = MGA1064_restore,
55243 };
55244 EXPORT_SYMBOL(matrox_mystique);
55245 #endif
55246
55247 #ifdef CONFIG_FB_MATROX_G
55248 struct matrox_switch matrox_G100 = {
55249 - MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
55250 + .preinit = MGAG100_preinit,
55251 + .reset = MGAG100_reset,
55252 + .init = MGAG100_init,
55253 + .restore = MGAG100_restore,
55254 };
55255 EXPORT_SYMBOL(matrox_G100);
55256 #endif
55257 diff --git a/drivers/video/matrox/matroxfb_Ti3026.c b/drivers/video/matrox/matroxfb_Ti3026.c
55258 index 195ad7c..09743fc 100644
55259 --- a/drivers/video/matrox/matroxfb_Ti3026.c
55260 +++ b/drivers/video/matrox/matroxfb_Ti3026.c
55261 @@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
55262 }
55263
55264 struct matrox_switch matrox_millennium = {
55265 - Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
55266 + .preinit = Ti3026_preinit,
55267 + .reset = Ti3026_reset,
55268 + .init = Ti3026_init,
55269 + .restore = Ti3026_restore
55270 };
55271 EXPORT_SYMBOL(matrox_millennium);
55272 #endif
55273 diff --git a/drivers/video/mb862xx/mb862xxfb_accel.c b/drivers/video/mb862xx/mb862xxfb_accel.c
55274 index fe92eed..106e085 100644
55275 --- a/drivers/video/mb862xx/mb862xxfb_accel.c
55276 +++ b/drivers/video/mb862xx/mb862xxfb_accel.c
55277 @@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
55278 struct mb862xxfb_par *par = info->par;
55279
55280 if (info->var.bits_per_pixel == 32) {
55281 - info->fbops->fb_fillrect = cfb_fillrect;
55282 - info->fbops->fb_copyarea = cfb_copyarea;
55283 - info->fbops->fb_imageblit = cfb_imageblit;
55284 + pax_open_kernel();
55285 + *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
55286 + *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
55287 + *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
55288 + pax_close_kernel();
55289 } else {
55290 outreg(disp, GC_L0EM, 3);
55291 - info->fbops->fb_fillrect = mb86290fb_fillrect;
55292 - info->fbops->fb_copyarea = mb86290fb_copyarea;
55293 - info->fbops->fb_imageblit = mb86290fb_imageblit;
55294 + pax_open_kernel();
55295 + *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
55296 + *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
55297 + *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
55298 + pax_close_kernel();
55299 }
55300 outreg(draw, GDC_REG_DRAW_BASE, 0);
55301 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
55302 diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
55303 index def0412..fed6529 100644
55304 --- a/drivers/video/nvidia/nvidia.c
55305 +++ b/drivers/video/nvidia/nvidia.c
55306 @@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
55307 info->fix.line_length = (info->var.xres_virtual *
55308 info->var.bits_per_pixel) >> 3;
55309 if (info->var.accel_flags) {
55310 - info->fbops->fb_imageblit = nvidiafb_imageblit;
55311 - info->fbops->fb_fillrect = nvidiafb_fillrect;
55312 - info->fbops->fb_copyarea = nvidiafb_copyarea;
55313 - info->fbops->fb_sync = nvidiafb_sync;
55314 + pax_open_kernel();
55315 + *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
55316 + *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
55317 + *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
55318 + *(void **)&info->fbops->fb_sync = nvidiafb_sync;
55319 + pax_close_kernel();
55320 info->pixmap.scan_align = 4;
55321 info->flags &= ~FBINFO_HWACCEL_DISABLED;
55322 info->flags |= FBINFO_READS_FAST;
55323 NVResetGraphics(info);
55324 } else {
55325 - info->fbops->fb_imageblit = cfb_imageblit;
55326 - info->fbops->fb_fillrect = cfb_fillrect;
55327 - info->fbops->fb_copyarea = cfb_copyarea;
55328 - info->fbops->fb_sync = NULL;
55329 + pax_open_kernel();
55330 + *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
55331 + *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
55332 + *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
55333 + *(void **)&info->fbops->fb_sync = NULL;
55334 + pax_close_kernel();
55335 info->pixmap.scan_align = 1;
55336 info->flags |= FBINFO_HWACCEL_DISABLED;
55337 info->flags &= ~FBINFO_READS_FAST;
55338 @@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
55339 info->pixmap.size = 8 * 1024;
55340 info->pixmap.flags = FB_PIXMAP_SYSTEM;
55341
55342 - if (!hwcur)
55343 - info->fbops->fb_cursor = NULL;
55344 + if (!hwcur) {
55345 + pax_open_kernel();
55346 + *(void **)&info->fbops->fb_cursor = NULL;
55347 + pax_close_kernel();
55348 + }
55349
55350 info->var.accel_flags = (!noaccel);
55351
55352 diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
55353 index 669a81f..e216d76 100644
55354 --- a/drivers/video/omap2/dss/display.c
55355 +++ b/drivers/video/omap2/dss/display.c
55356 @@ -137,12 +137,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
55357 snprintf(dssdev->alias, sizeof(dssdev->alias),
55358 "display%d", disp_num_counter++);
55359
55360 + pax_open_kernel();
55361 if (drv && drv->get_resolution == NULL)
55362 - drv->get_resolution = omapdss_default_get_resolution;
55363 + *(void **)&drv->get_resolution = omapdss_default_get_resolution;
55364 if (drv && drv->get_recommended_bpp == NULL)
55365 - drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
55366 + *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
55367 if (drv && drv->get_timings == NULL)
55368 - drv->get_timings = omapdss_default_get_timings;
55369 + *(void **)&drv->get_timings = omapdss_default_get_timings;
55370 + pax_close_kernel();
55371
55372 mutex_lock(&panel_list_mutex);
55373 list_add_tail(&dssdev->panel_list, &panel_list);
55374 diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
55375 index 83433cb..71e9b98 100644
55376 --- a/drivers/video/s1d13xxxfb.c
55377 +++ b/drivers/video/s1d13xxxfb.c
55378 @@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
55379
55380 switch(prod_id) {
55381 case S1D13506_PROD_ID: /* activate acceleration */
55382 - s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
55383 - s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
55384 + pax_open_kernel();
55385 + *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
55386 + *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
55387 + pax_close_kernel();
55388 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
55389 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
55390 break;
55391 diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
55392 index 2bcc84a..29dd1ea 100644
55393 --- a/drivers/video/sh_mobile_lcdcfb.c
55394 +++ b/drivers/video/sh_mobile_lcdcfb.c
55395 @@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
55396 }
55397
55398 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
55399 - lcdc_sys_write_index,
55400 - lcdc_sys_write_data,
55401 - lcdc_sys_read_data,
55402 + .write_index = lcdc_sys_write_index,
55403 + .write_data = lcdc_sys_write_data,
55404 + .read_data = lcdc_sys_read_data,
55405 };
55406
55407 static int sh_mobile_lcdc_sginit(struct fb_info *info,
55408 diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c
55409 index d513ed6..90b0de9 100644
55410 --- a/drivers/video/smscufx.c
55411 +++ b/drivers/video/smscufx.c
55412 @@ -1175,7 +1175,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
55413 fb_deferred_io_cleanup(info);
55414 kfree(info->fbdefio);
55415 info->fbdefio = NULL;
55416 - info->fbops->fb_mmap = ufx_ops_mmap;
55417 + pax_open_kernel();
55418 + *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
55419 + pax_close_kernel();
55420 }
55421
55422 pr_debug("released /dev/fb%d user=%d count=%d",
55423 diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
55424 index 77b890e..458e666 100644
55425 --- a/drivers/video/udlfb.c
55426 +++ b/drivers/video/udlfb.c
55427 @@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
55428 dlfb_urb_completion(urb);
55429
55430 error:
55431 - atomic_add(bytes_sent, &dev->bytes_sent);
55432 - atomic_add(bytes_identical, &dev->bytes_identical);
55433 - atomic_add(width*height*2, &dev->bytes_rendered);
55434 + atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
55435 + atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
55436 + atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
55437 end_cycles = get_cycles();
55438 - atomic_add(((unsigned int) ((end_cycles - start_cycles)
55439 + atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
55440 >> 10)), /* Kcycles */
55441 &dev->cpu_kcycles_used);
55442
55443 @@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
55444 dlfb_urb_completion(urb);
55445
55446 error:
55447 - atomic_add(bytes_sent, &dev->bytes_sent);
55448 - atomic_add(bytes_identical, &dev->bytes_identical);
55449 - atomic_add(bytes_rendered, &dev->bytes_rendered);
55450 + atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
55451 + atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
55452 + atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
55453 end_cycles = get_cycles();
55454 - atomic_add(((unsigned int) ((end_cycles - start_cycles)
55455 + atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
55456 >> 10)), /* Kcycles */
55457 &dev->cpu_kcycles_used);
55458 }
55459 @@ -993,7 +993,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
55460 fb_deferred_io_cleanup(info);
55461 kfree(info->fbdefio);
55462 info->fbdefio = NULL;
55463 - info->fbops->fb_mmap = dlfb_ops_mmap;
55464 + pax_open_kernel();
55465 + *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
55466 + pax_close_kernel();
55467 }
55468
55469 pr_warn("released /dev/fb%d user=%d count=%d\n",
55470 @@ -1376,7 +1378,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
55471 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55472 struct dlfb_data *dev = fb_info->par;
55473 return snprintf(buf, PAGE_SIZE, "%u\n",
55474 - atomic_read(&dev->bytes_rendered));
55475 + atomic_read_unchecked(&dev->bytes_rendered));
55476 }
55477
55478 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
55479 @@ -1384,7 +1386,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
55480 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55481 struct dlfb_data *dev = fb_info->par;
55482 return snprintf(buf, PAGE_SIZE, "%u\n",
55483 - atomic_read(&dev->bytes_identical));
55484 + atomic_read_unchecked(&dev->bytes_identical));
55485 }
55486
55487 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
55488 @@ -1392,7 +1394,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
55489 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55490 struct dlfb_data *dev = fb_info->par;
55491 return snprintf(buf, PAGE_SIZE, "%u\n",
55492 - atomic_read(&dev->bytes_sent));
55493 + atomic_read_unchecked(&dev->bytes_sent));
55494 }
55495
55496 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
55497 @@ -1400,7 +1402,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
55498 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55499 struct dlfb_data *dev = fb_info->par;
55500 return snprintf(buf, PAGE_SIZE, "%u\n",
55501 - atomic_read(&dev->cpu_kcycles_used));
55502 + atomic_read_unchecked(&dev->cpu_kcycles_used));
55503 }
55504
55505 static ssize_t edid_show(
55506 @@ -1460,10 +1462,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
55507 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55508 struct dlfb_data *dev = fb_info->par;
55509
55510 - atomic_set(&dev->bytes_rendered, 0);
55511 - atomic_set(&dev->bytes_identical, 0);
55512 - atomic_set(&dev->bytes_sent, 0);
55513 - atomic_set(&dev->cpu_kcycles_used, 0);
55514 + atomic_set_unchecked(&dev->bytes_rendered, 0);
55515 + atomic_set_unchecked(&dev->bytes_identical, 0);
55516 + atomic_set_unchecked(&dev->bytes_sent, 0);
55517 + atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
55518
55519 return count;
55520 }
55521 diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
55522 index 256fba7..6e75516 100644
55523 --- a/drivers/video/uvesafb.c
55524 +++ b/drivers/video/uvesafb.c
55525 @@ -19,6 +19,7 @@
55526 #include <linux/io.h>
55527 #include <linux/mutex.h>
55528 #include <linux/slab.h>
55529 +#include <linux/moduleloader.h>
55530 #include <video/edid.h>
55531 #include <video/uvesafb.h>
55532 #ifdef CONFIG_X86
55533 @@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
55534 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
55535 par->pmi_setpal = par->ypan = 0;
55536 } else {
55537 +
55538 +#ifdef CONFIG_PAX_KERNEXEC
55539 +#ifdef CONFIG_MODULES
55540 + par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
55541 +#endif
55542 + if (!par->pmi_code) {
55543 + par->pmi_setpal = par->ypan = 0;
55544 + return 0;
55545 + }
55546 +#endif
55547 +
55548 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
55549 + task->t.regs.edi);
55550 +
55551 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55552 + pax_open_kernel();
55553 + memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
55554 + pax_close_kernel();
55555 +
55556 + par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
55557 + par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
55558 +#else
55559 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
55560 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
55561 +#endif
55562 +
55563 printk(KERN_INFO "uvesafb: protected mode interface info at "
55564 "%04x:%04x\n",
55565 (u16)task->t.regs.es, (u16)task->t.regs.edi);
55566 @@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
55567 par->ypan = ypan;
55568
55569 if (par->pmi_setpal || par->ypan) {
55570 +#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
55571 if (__supported_pte_mask & _PAGE_NX) {
55572 par->pmi_setpal = par->ypan = 0;
55573 printk(KERN_WARNING "uvesafb: NX protection is active, "
55574 "better not use the PMI.\n");
55575 - } else {
55576 + } else
55577 +#endif
55578 uvesafb_vbe_getpmi(task, par);
55579 - }
55580 }
55581 #else
55582 /* The protected mode interface is not available on non-x86. */
55583 @@ -1453,8 +1477,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55584 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
55585
55586 /* Disable blanking if the user requested so. */
55587 - if (!blank)
55588 - info->fbops->fb_blank = NULL;
55589 + if (!blank) {
55590 + pax_open_kernel();
55591 + *(void **)&info->fbops->fb_blank = NULL;
55592 + pax_close_kernel();
55593 + }
55594
55595 /*
55596 * Find out how much IO memory is required for the mode with
55597 @@ -1530,8 +1557,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55598 info->flags = FBINFO_FLAG_DEFAULT |
55599 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
55600
55601 - if (!par->ypan)
55602 - info->fbops->fb_pan_display = NULL;
55603 + if (!par->ypan) {
55604 + pax_open_kernel();
55605 + *(void **)&info->fbops->fb_pan_display = NULL;
55606 + pax_close_kernel();
55607 + }
55608 }
55609
55610 static void uvesafb_init_mtrr(struct fb_info *info)
55611 @@ -1792,6 +1822,11 @@ out_mode:
55612 out:
55613 kfree(par->vbe_modes);
55614
55615 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55616 + if (par->pmi_code)
55617 + module_free_exec(NULL, par->pmi_code);
55618 +#endif
55619 +
55620 framebuffer_release(info);
55621 return err;
55622 }
55623 @@ -1816,6 +1851,12 @@ static int uvesafb_remove(struct platform_device *dev)
55624 kfree(par->vbe_modes);
55625 kfree(par->vbe_state_orig);
55626 kfree(par->vbe_state_saved);
55627 +
55628 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55629 + if (par->pmi_code)
55630 + module_free_exec(NULL, par->pmi_code);
55631 +#endif
55632 +
55633 }
55634
55635 framebuffer_release(info);
55636 diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
55637 index 1c7da3b..56ea0bd 100644
55638 --- a/drivers/video/vesafb.c
55639 +++ b/drivers/video/vesafb.c
55640 @@ -9,6 +9,7 @@
55641 */
55642
55643 #include <linux/module.h>
55644 +#include <linux/moduleloader.h>
55645 #include <linux/kernel.h>
55646 #include <linux/errno.h>
55647 #include <linux/string.h>
55648 @@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
55649 static int vram_total; /* Set total amount of memory */
55650 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
55651 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
55652 -static void (*pmi_start)(void) __read_mostly;
55653 -static void (*pmi_pal) (void) __read_mostly;
55654 +static void (*pmi_start)(void) __read_only;
55655 +static void (*pmi_pal) (void) __read_only;
55656 static int depth __read_mostly;
55657 static int vga_compat __read_mostly;
55658 /* --------------------------------------------------------------------- */
55659 @@ -234,6 +235,7 @@ static int vesafb_probe(struct platform_device *dev)
55660 unsigned int size_remap;
55661 unsigned int size_total;
55662 char *option = NULL;
55663 + void *pmi_code = NULL;
55664
55665 /* ignore error return of fb_get_options */
55666 fb_get_options("vesafb", &option);
55667 @@ -280,10 +282,6 @@ static int vesafb_probe(struct platform_device *dev)
55668 size_remap = size_total;
55669 vesafb_fix.smem_len = size_remap;
55670
55671 -#ifndef __i386__
55672 - screen_info.vesapm_seg = 0;
55673 -#endif
55674 -
55675 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
55676 printk(KERN_WARNING
55677 "vesafb: cannot reserve video memory at 0x%lx\n",
55678 @@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
55679 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
55680 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
55681
55682 +#ifdef __i386__
55683 +
55684 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55685 + pmi_code = module_alloc_exec(screen_info.vesapm_size);
55686 + if (!pmi_code)
55687 +#elif !defined(CONFIG_PAX_KERNEXEC)
55688 + if (0)
55689 +#endif
55690 +
55691 +#endif
55692 + screen_info.vesapm_seg = 0;
55693 +
55694 if (screen_info.vesapm_seg) {
55695 - printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
55696 - screen_info.vesapm_seg,screen_info.vesapm_off);
55697 + printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
55698 + screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
55699 }
55700
55701 if (screen_info.vesapm_seg < 0xc000)
55702 @@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
55703
55704 if (ypan || pmi_setpal) {
55705 unsigned short *pmi_base;
55706 +
55707 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
55708 - pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
55709 - pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
55710 +
55711 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55712 + pax_open_kernel();
55713 + memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
55714 +#else
55715 + pmi_code = pmi_base;
55716 +#endif
55717 +
55718 + pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
55719 + pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
55720 +
55721 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55722 + pmi_start = ktva_ktla(pmi_start);
55723 + pmi_pal = ktva_ktla(pmi_pal);
55724 + pax_close_kernel();
55725 +#endif
55726 +
55727 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
55728 if (pmi_base[3]) {
55729 printk(KERN_INFO "vesafb: pmi: ports = ");
55730 @@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
55731 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
55732 (ypan ? FBINFO_HWACCEL_YPAN : 0);
55733
55734 - if (!ypan)
55735 - info->fbops->fb_pan_display = NULL;
55736 + if (!ypan) {
55737 + pax_open_kernel();
55738 + *(void **)&info->fbops->fb_pan_display = NULL;
55739 + pax_close_kernel();
55740 + }
55741
55742 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
55743 err = -ENOMEM;
55744 @@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
55745 fb_info(info, "%s frame buffer device\n", info->fix.id);
55746 return 0;
55747 err:
55748 +
55749 +#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55750 + module_free_exec(NULL, pmi_code);
55751 +#endif
55752 +
55753 if (info->screen_base)
55754 iounmap(info->screen_base);
55755 framebuffer_release(info);
55756 diff --git a/drivers/video/via/via_clock.h b/drivers/video/via/via_clock.h
55757 index 88714ae..16c2e11 100644
55758 --- a/drivers/video/via/via_clock.h
55759 +++ b/drivers/video/via/via_clock.h
55760 @@ -56,7 +56,7 @@ struct via_clock {
55761
55762 void (*set_engine_pll_state)(u8 state);
55763 void (*set_engine_pll)(struct via_pll_config config);
55764 -};
55765 +} __no_const;
55766
55767
55768 static inline u32 get_pll_internal_frequency(u32 ref_freq,
55769 diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
55770 index fef20db..d28b1ab 100644
55771 --- a/drivers/xen/xenfs/xenstored.c
55772 +++ b/drivers/xen/xenfs/xenstored.c
55773 @@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
55774 static int xsd_kva_open(struct inode *inode, struct file *file)
55775 {
55776 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
55777 +#ifdef CONFIG_GRKERNSEC_HIDESYM
55778 + NULL);
55779 +#else
55780 xen_store_interface);
55781 +#endif
55782 +
55783 if (!file->private_data)
55784 return -ENOMEM;
55785 return 0;
55786 diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
55787 index c71e886..61d3d44b 100644
55788 --- a/fs/9p/vfs_addr.c
55789 +++ b/fs/9p/vfs_addr.c
55790 @@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
55791
55792 retval = v9fs_file_write_internal(inode,
55793 v9inode->writeback_fid,
55794 - (__force const char __user *)buffer,
55795 + (const char __force_user *)buffer,
55796 len, &offset, 0);
55797 if (retval > 0)
55798 retval = 0;
55799 diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
55800 index bb7991c..481e21a 100644
55801 --- a/fs/9p/vfs_inode.c
55802 +++ b/fs/9p/vfs_inode.c
55803 @@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
55804 void
55805 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
55806 {
55807 - char *s = nd_get_link(nd);
55808 + const char *s = nd_get_link(nd);
55809
55810 p9_debug(P9_DEBUG_VFS, " %s %s\n",
55811 dentry->d_name.name, IS_ERR(s) ? "<error>" : s);
55812 diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
55813 index 370b24c..ff0be7b 100644
55814 --- a/fs/Kconfig.binfmt
55815 +++ b/fs/Kconfig.binfmt
55816 @@ -103,7 +103,7 @@ config HAVE_AOUT
55817
55818 config BINFMT_AOUT
55819 tristate "Kernel support for a.out and ECOFF binaries"
55820 - depends on HAVE_AOUT
55821 + depends on HAVE_AOUT && BROKEN
55822 ---help---
55823 A.out (Assembler.OUTput) is a set of formats for libraries and
55824 executables used in the earliest versions of UNIX. Linux used
55825 diff --git a/fs/afs/inode.c b/fs/afs/inode.c
55826 index ce25d75..dc09eeb 100644
55827 --- a/fs/afs/inode.c
55828 +++ b/fs/afs/inode.c
55829 @@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
55830 struct afs_vnode *vnode;
55831 struct super_block *sb;
55832 struct inode *inode;
55833 - static atomic_t afs_autocell_ino;
55834 + static atomic_unchecked_t afs_autocell_ino;
55835
55836 _enter("{%x:%u},%*.*s,",
55837 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
55838 @@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
55839 data.fid.unique = 0;
55840 data.fid.vnode = 0;
55841
55842 - inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
55843 + inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
55844 afs_iget5_autocell_test, afs_iget5_set,
55845 &data);
55846 if (!inode) {
55847 diff --git a/fs/aio.c b/fs/aio.c
55848 index 062a5f6..e5618e0 100644
55849 --- a/fs/aio.c
55850 +++ b/fs/aio.c
55851 @@ -374,7 +374,7 @@ static int aio_setup_ring(struct kioctx *ctx)
55852 size += sizeof(struct io_event) * nr_events;
55853
55854 nr_pages = PFN_UP(size);
55855 - if (nr_pages < 0)
55856 + if (nr_pages <= 0)
55857 return -EINVAL;
55858
55859 file = aio_private_file(ctx, nr_pages);
55860 diff --git a/fs/attr.c b/fs/attr.c
55861 index 5d4e59d..fd02418 100644
55862 --- a/fs/attr.c
55863 +++ b/fs/attr.c
55864 @@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
55865 unsigned long limit;
55866
55867 limit = rlimit(RLIMIT_FSIZE);
55868 + gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
55869 if (limit != RLIM_INFINITY && offset > limit)
55870 goto out_sig;
55871 if (offset > inode->i_sb->s_maxbytes)
55872 diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
55873 index 116fd38..c04182da 100644
55874 --- a/fs/autofs4/waitq.c
55875 +++ b/fs/autofs4/waitq.c
55876 @@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
55877 {
55878 unsigned long sigpipe, flags;
55879 mm_segment_t fs;
55880 - const char *data = (const char *)addr;
55881 + const char __user *data = (const char __force_user *)addr;
55882 ssize_t wr = 0;
55883
55884 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
55885 @@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
55886 return 1;
55887 }
55888
55889 +#ifdef CONFIG_GRKERNSEC_HIDESYM
55890 +static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
55891 +#endif
55892 +
55893 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
55894 enum autofs_notify notify)
55895 {
55896 @@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
55897
55898 /* If this is a direct mount request create a dummy name */
55899 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
55900 +#ifdef CONFIG_GRKERNSEC_HIDESYM
55901 + /* this name does get written to userland via autofs4_write() */
55902 + qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
55903 +#else
55904 qstr.len = sprintf(name, "%p", dentry);
55905 +#endif
55906 else {
55907 qstr.len = autofs4_getpath(sbi, dentry, &name);
55908 if (!qstr.len) {
55909 diff --git a/fs/befs/endian.h b/fs/befs/endian.h
55910 index 2722387..56059b5 100644
55911 --- a/fs/befs/endian.h
55912 +++ b/fs/befs/endian.h
55913 @@ -11,7 +11,7 @@
55914
55915 #include <asm/byteorder.h>
55916
55917 -static inline u64
55918 +static inline u64 __intentional_overflow(-1)
55919 fs64_to_cpu(const struct super_block *sb, fs64 n)
55920 {
55921 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
55922 @@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
55923 return (__force fs64)cpu_to_be64(n);
55924 }
55925
55926 -static inline u32
55927 +static inline u32 __intentional_overflow(-1)
55928 fs32_to_cpu(const struct super_block *sb, fs32 n)
55929 {
55930 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
55931 @@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
55932 return (__force fs32)cpu_to_be32(n);
55933 }
55934
55935 -static inline u16
55936 +static inline u16 __intentional_overflow(-1)
55937 fs16_to_cpu(const struct super_block *sb, fs16 n)
55938 {
55939 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
55940 diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
55941 index ca0ba15..0fa3257 100644
55942 --- a/fs/binfmt_aout.c
55943 +++ b/fs/binfmt_aout.c
55944 @@ -16,6 +16,7 @@
55945 #include <linux/string.h>
55946 #include <linux/fs.h>
55947 #include <linux/file.h>
55948 +#include <linux/security.h>
55949 #include <linux/stat.h>
55950 #include <linux/fcntl.h>
55951 #include <linux/ptrace.h>
55952 @@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
55953 #endif
55954 # define START_STACK(u) ((void __user *)u.start_stack)
55955
55956 + memset(&dump, 0, sizeof(dump));
55957 +
55958 fs = get_fs();
55959 set_fs(KERNEL_DS);
55960 has_dumped = 1;
55961 @@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
55962
55963 /* If the size of the dump file exceeds the rlimit, then see what would happen
55964 if we wrote the stack, but not the data area. */
55965 + gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
55966 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
55967 dump.u_dsize = 0;
55968
55969 /* Make sure we have enough room to write the stack and data areas. */
55970 + gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
55971 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
55972 dump.u_ssize = 0;
55973
55974 @@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
55975 rlim = rlimit(RLIMIT_DATA);
55976 if (rlim >= RLIM_INFINITY)
55977 rlim = ~0;
55978 +
55979 + gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
55980 if (ex.a_data + ex.a_bss > rlim)
55981 return -ENOMEM;
55982
55983 @@ -264,6 +271,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
55984
55985 install_exec_creds(bprm);
55986
55987 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
55988 + current->mm->pax_flags = 0UL;
55989 +#endif
55990 +
55991 +#ifdef CONFIG_PAX_PAGEEXEC
55992 + if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
55993 + current->mm->pax_flags |= MF_PAX_PAGEEXEC;
55994 +
55995 +#ifdef CONFIG_PAX_EMUTRAMP
55996 + if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
55997 + current->mm->pax_flags |= MF_PAX_EMUTRAMP;
55998 +#endif
55999 +
56000 +#ifdef CONFIG_PAX_MPROTECT
56001 + if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
56002 + current->mm->pax_flags |= MF_PAX_MPROTECT;
56003 +#endif
56004 +
56005 + }
56006 +#endif
56007 +
56008 if (N_MAGIC(ex) == OMAGIC) {
56009 unsigned long text_addr, map_size;
56010 loff_t pos;
56011 @@ -321,7 +349,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
56012 }
56013
56014 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
56015 - PROT_READ | PROT_WRITE | PROT_EXEC,
56016 + PROT_READ | PROT_WRITE,
56017 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
56018 fd_offset + ex.a_text);
56019 if (error != N_DATADDR(ex)) {
56020 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
56021 index 67be295..83e2f86 100644
56022 --- a/fs/binfmt_elf.c
56023 +++ b/fs/binfmt_elf.c
56024 @@ -34,6 +34,7 @@
56025 #include <linux/utsname.h>
56026 #include <linux/coredump.h>
56027 #include <linux/sched.h>
56028 +#include <linux/xattr.h>
56029 #include <asm/uaccess.h>
56030 #include <asm/param.h>
56031 #include <asm/page.h>
56032 @@ -48,7 +49,7 @@
56033 static int load_elf_binary(struct linux_binprm *bprm);
56034 static int load_elf_library(struct file *);
56035 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
56036 - int, int, unsigned long);
56037 + int, int, unsigned long) __intentional_overflow(-1);
56038
56039 /*
56040 * If we don't support core dumping, then supply a NULL so we
56041 @@ -60,6 +61,14 @@ static int elf_core_dump(struct coredump_params *cprm);
56042 #define elf_core_dump NULL
56043 #endif
56044
56045 +#ifdef CONFIG_PAX_MPROTECT
56046 +static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
56047 +#endif
56048 +
56049 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
56050 +static void elf_handle_mmap(struct file *file);
56051 +#endif
56052 +
56053 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
56054 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
56055 #else
56056 @@ -79,6 +88,15 @@ static struct linux_binfmt elf_format = {
56057 .load_binary = load_elf_binary,
56058 .load_shlib = load_elf_library,
56059 .core_dump = elf_core_dump,
56060 +
56061 +#ifdef CONFIG_PAX_MPROTECT
56062 + .handle_mprotect= elf_handle_mprotect,
56063 +#endif
56064 +
56065 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
56066 + .handle_mmap = elf_handle_mmap,
56067 +#endif
56068 +
56069 .min_coredump = ELF_EXEC_PAGESIZE,
56070 };
56071
56072 @@ -86,6 +104,8 @@ static struct linux_binfmt elf_format = {
56073
56074 static int set_brk(unsigned long start, unsigned long end)
56075 {
56076 + unsigned long e = end;
56077 +
56078 start = ELF_PAGEALIGN(start);
56079 end = ELF_PAGEALIGN(end);
56080 if (end > start) {
56081 @@ -94,7 +114,7 @@ static int set_brk(unsigned long start, unsigned long end)
56082 if (BAD_ADDR(addr))
56083 return addr;
56084 }
56085 - current->mm->start_brk = current->mm->brk = end;
56086 + current->mm->start_brk = current->mm->brk = e;
56087 return 0;
56088 }
56089
56090 @@ -155,12 +175,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
56091 elf_addr_t __user *u_rand_bytes;
56092 const char *k_platform = ELF_PLATFORM;
56093 const char *k_base_platform = ELF_BASE_PLATFORM;
56094 - unsigned char k_rand_bytes[16];
56095 + u32 k_rand_bytes[4];
56096 int items;
56097 elf_addr_t *elf_info;
56098 int ei_index = 0;
56099 const struct cred *cred = current_cred();
56100 struct vm_area_struct *vma;
56101 + unsigned long saved_auxv[AT_VECTOR_SIZE];
56102
56103 /*
56104 * In some cases (e.g. Hyper-Threading), we want to avoid L1
56105 @@ -202,8 +223,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
56106 * Generate 16 random bytes for userspace PRNG seeding.
56107 */
56108 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
56109 - u_rand_bytes = (elf_addr_t __user *)
56110 - STACK_ALLOC(p, sizeof(k_rand_bytes));
56111 + prandom_seed(k_rand_bytes[0] ^ prandom_u32());
56112 + prandom_seed(k_rand_bytes[1] ^ prandom_u32());
56113 + prandom_seed(k_rand_bytes[2] ^ prandom_u32());
56114 + prandom_seed(k_rand_bytes[3] ^ prandom_u32());
56115 + p = STACK_ROUND(p, sizeof(k_rand_bytes));
56116 + u_rand_bytes = (elf_addr_t __user *) p;
56117 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
56118 return -EFAULT;
56119
56120 @@ -318,9 +343,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
56121 return -EFAULT;
56122 current->mm->env_end = p;
56123
56124 + memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
56125 +
56126 /* Put the elf_info on the stack in the right place. */
56127 sp = (elf_addr_t __user *)envp + 1;
56128 - if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
56129 + if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
56130 return -EFAULT;
56131 return 0;
56132 }
56133 @@ -388,15 +415,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
56134 an ELF header */
56135
56136 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
56137 - struct file *interpreter, unsigned long *interp_map_addr,
56138 - unsigned long no_base)
56139 + struct file *interpreter, unsigned long no_base)
56140 {
56141 struct elf_phdr *elf_phdata;
56142 struct elf_phdr *eppnt;
56143 - unsigned long load_addr = 0;
56144 + unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
56145 int load_addr_set = 0;
56146 unsigned long last_bss = 0, elf_bss = 0;
56147 - unsigned long error = ~0UL;
56148 + unsigned long error = -EINVAL;
56149 unsigned long total_size;
56150 int retval, i, size;
56151
56152 @@ -442,6 +468,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
56153 goto out_close;
56154 }
56155
56156 +#ifdef CONFIG_PAX_SEGMEXEC
56157 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
56158 + pax_task_size = SEGMEXEC_TASK_SIZE;
56159 +#endif
56160 +
56161 eppnt = elf_phdata;
56162 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
56163 if (eppnt->p_type == PT_LOAD) {
56164 @@ -465,8 +496,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
56165 map_addr = elf_map(interpreter, load_addr + vaddr,
56166 eppnt, elf_prot, elf_type, total_size);
56167 total_size = 0;
56168 - if (!*interp_map_addr)
56169 - *interp_map_addr = map_addr;
56170 error = map_addr;
56171 if (BAD_ADDR(map_addr))
56172 goto out_close;
56173 @@ -485,8 +514,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
56174 k = load_addr + eppnt->p_vaddr;
56175 if (BAD_ADDR(k) ||
56176 eppnt->p_filesz > eppnt->p_memsz ||
56177 - eppnt->p_memsz > TASK_SIZE ||
56178 - TASK_SIZE - eppnt->p_memsz < k) {
56179 + eppnt->p_memsz > pax_task_size ||
56180 + pax_task_size - eppnt->p_memsz < k) {
56181 error = -ENOMEM;
56182 goto out_close;
56183 }
56184 @@ -525,9 +554,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
56185 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
56186
56187 /* Map the last of the bss segment */
56188 - error = vm_brk(elf_bss, last_bss - elf_bss);
56189 - if (BAD_ADDR(error))
56190 - goto out_close;
56191 + if (last_bss > elf_bss) {
56192 + error = vm_brk(elf_bss, last_bss - elf_bss);
56193 + if (BAD_ADDR(error))
56194 + goto out_close;
56195 + }
56196 }
56197
56198 error = load_addr;
56199 @@ -538,6 +569,336 @@ out:
56200 return error;
56201 }
56202
56203 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
56204 +#ifdef CONFIG_PAX_SOFTMODE
56205 +static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
56206 +{
56207 + unsigned long pax_flags = 0UL;
56208 +
56209 +#ifdef CONFIG_PAX_PAGEEXEC
56210 + if (elf_phdata->p_flags & PF_PAGEEXEC)
56211 + pax_flags |= MF_PAX_PAGEEXEC;
56212 +#endif
56213 +
56214 +#ifdef CONFIG_PAX_SEGMEXEC
56215 + if (elf_phdata->p_flags & PF_SEGMEXEC)
56216 + pax_flags |= MF_PAX_SEGMEXEC;
56217 +#endif
56218 +
56219 +#ifdef CONFIG_PAX_EMUTRAMP
56220 + if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
56221 + pax_flags |= MF_PAX_EMUTRAMP;
56222 +#endif
56223 +
56224 +#ifdef CONFIG_PAX_MPROTECT
56225 + if (elf_phdata->p_flags & PF_MPROTECT)
56226 + pax_flags |= MF_PAX_MPROTECT;
56227 +#endif
56228 +
56229 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
56230 + if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
56231 + pax_flags |= MF_PAX_RANDMMAP;
56232 +#endif
56233 +
56234 + return pax_flags;
56235 +}
56236 +#endif
56237 +
56238 +static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
56239 +{
56240 + unsigned long pax_flags = 0UL;
56241 +
56242 +#ifdef CONFIG_PAX_PAGEEXEC
56243 + if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
56244 + pax_flags |= MF_PAX_PAGEEXEC;
56245 +#endif
56246 +
56247 +#ifdef CONFIG_PAX_SEGMEXEC
56248 + if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
56249 + pax_flags |= MF_PAX_SEGMEXEC;
56250 +#endif
56251 +
56252 +#ifdef CONFIG_PAX_EMUTRAMP
56253 + if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
56254 + pax_flags |= MF_PAX_EMUTRAMP;
56255 +#endif
56256 +
56257 +#ifdef CONFIG_PAX_MPROTECT
56258 + if (!(elf_phdata->p_flags & PF_NOMPROTECT))
56259 + pax_flags |= MF_PAX_MPROTECT;
56260 +#endif
56261 +
56262 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
56263 + if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
56264 + pax_flags |= MF_PAX_RANDMMAP;
56265 +#endif
56266 +
56267 + return pax_flags;
56268 +}
56269 +#endif
56270 +
56271 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
56272 +#ifdef CONFIG_PAX_SOFTMODE
56273 +static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
56274 +{
56275 + unsigned long pax_flags = 0UL;
56276 +
56277 +#ifdef CONFIG_PAX_PAGEEXEC
56278 + if (pax_flags_softmode & MF_PAX_PAGEEXEC)
56279 + pax_flags |= MF_PAX_PAGEEXEC;
56280 +#endif
56281 +
56282 +#ifdef CONFIG_PAX_SEGMEXEC
56283 + if (pax_flags_softmode & MF_PAX_SEGMEXEC)
56284 + pax_flags |= MF_PAX_SEGMEXEC;
56285 +#endif
56286 +
56287 +#ifdef CONFIG_PAX_EMUTRAMP
56288 + if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
56289 + pax_flags |= MF_PAX_EMUTRAMP;
56290 +#endif
56291 +
56292 +#ifdef CONFIG_PAX_MPROTECT
56293 + if (pax_flags_softmode & MF_PAX_MPROTECT)
56294 + pax_flags |= MF_PAX_MPROTECT;
56295 +#endif
56296 +
56297 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
56298 + if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
56299 + pax_flags |= MF_PAX_RANDMMAP;
56300 +#endif
56301 +
56302 + return pax_flags;
56303 +}
56304 +#endif
56305 +
56306 +static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
56307 +{
56308 + unsigned long pax_flags = 0UL;
56309 +
56310 +#ifdef CONFIG_PAX_PAGEEXEC
56311 + if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
56312 + pax_flags |= MF_PAX_PAGEEXEC;
56313 +#endif
56314 +
56315 +#ifdef CONFIG_PAX_SEGMEXEC
56316 + if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
56317 + pax_flags |= MF_PAX_SEGMEXEC;
56318 +#endif
56319 +
56320 +#ifdef CONFIG_PAX_EMUTRAMP
56321 + if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
56322 + pax_flags |= MF_PAX_EMUTRAMP;
56323 +#endif
56324 +
56325 +#ifdef CONFIG_PAX_MPROTECT
56326 + if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
56327 + pax_flags |= MF_PAX_MPROTECT;
56328 +#endif
56329 +
56330 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
56331 + if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
56332 + pax_flags |= MF_PAX_RANDMMAP;
56333 +#endif
56334 +
56335 + return pax_flags;
56336 +}
56337 +#endif
56338 +
56339 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
56340 +static unsigned long pax_parse_defaults(void)
56341 +{
56342 + unsigned long pax_flags = 0UL;
56343 +
56344 +#ifdef CONFIG_PAX_SOFTMODE
56345 + if (pax_softmode)
56346 + return pax_flags;
56347 +#endif
56348 +
56349 +#ifdef CONFIG_PAX_PAGEEXEC
56350 + pax_flags |= MF_PAX_PAGEEXEC;
56351 +#endif
56352 +
56353 +#ifdef CONFIG_PAX_SEGMEXEC
56354 + pax_flags |= MF_PAX_SEGMEXEC;
56355 +#endif
56356 +
56357 +#ifdef CONFIG_PAX_MPROTECT
56358 + pax_flags |= MF_PAX_MPROTECT;
56359 +#endif
56360 +
56361 +#ifdef CONFIG_PAX_RANDMMAP
56362 + if (randomize_va_space)
56363 + pax_flags |= MF_PAX_RANDMMAP;
56364 +#endif
56365 +
56366 + return pax_flags;
56367 +}
56368 +
56369 +static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
56370 +{
56371 + unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
56372 +
56373 +#ifdef CONFIG_PAX_EI_PAX
56374 +
56375 +#ifdef CONFIG_PAX_SOFTMODE
56376 + if (pax_softmode)
56377 + return pax_flags;
56378 +#endif
56379 +
56380 + pax_flags = 0UL;
56381 +
56382 +#ifdef CONFIG_PAX_PAGEEXEC
56383 + if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
56384 + pax_flags |= MF_PAX_PAGEEXEC;
56385 +#endif
56386 +
56387 +#ifdef CONFIG_PAX_SEGMEXEC
56388 + if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
56389 + pax_flags |= MF_PAX_SEGMEXEC;
56390 +#endif
56391 +
56392 +#ifdef CONFIG_PAX_EMUTRAMP
56393 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
56394 + pax_flags |= MF_PAX_EMUTRAMP;
56395 +#endif
56396 +
56397 +#ifdef CONFIG_PAX_MPROTECT
56398 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
56399 + pax_flags |= MF_PAX_MPROTECT;
56400 +#endif
56401 +
56402 +#ifdef CONFIG_PAX_ASLR
56403 + if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
56404 + pax_flags |= MF_PAX_RANDMMAP;
56405 +#endif
56406 +
56407 +#endif
56408 +
56409 + return pax_flags;
56410 +
56411 +}
56412 +
56413 +static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
56414 +{
56415 +
56416 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
56417 + unsigned long i;
56418 +
56419 + for (i = 0UL; i < elf_ex->e_phnum; i++)
56420 + if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
56421 + if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
56422 + ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
56423 + ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
56424 + ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
56425 + ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
56426 + return PAX_PARSE_FLAGS_FALLBACK;
56427 +
56428 +#ifdef CONFIG_PAX_SOFTMODE
56429 + if (pax_softmode)
56430 + return pax_parse_pt_pax_softmode(&elf_phdata[i]);
56431 + else
56432 +#endif
56433 +
56434 + return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
56435 + break;
56436 + }
56437 +#endif
56438 +
56439 + return PAX_PARSE_FLAGS_FALLBACK;
56440 +}
56441 +
56442 +static unsigned long pax_parse_xattr_pax(struct file * const file)
56443 +{
56444 +
56445 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
56446 + ssize_t xattr_size, i;
56447 + unsigned char xattr_value[sizeof("pemrs") - 1];
56448 + unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
56449 +
56450 + xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
56451 + if (xattr_size < 0 || xattr_size > sizeof xattr_value)
56452 + return PAX_PARSE_FLAGS_FALLBACK;
56453 +
56454 + for (i = 0; i < xattr_size; i++)
56455 + switch (xattr_value[i]) {
56456 + default:
56457 + return PAX_PARSE_FLAGS_FALLBACK;
56458 +
56459 +#define parse_flag(option1, option2, flag) \
56460 + case option1: \
56461 + if (pax_flags_hardmode & MF_PAX_##flag) \
56462 + return PAX_PARSE_FLAGS_FALLBACK;\
56463 + pax_flags_hardmode |= MF_PAX_##flag; \
56464 + break; \
56465 + case option2: \
56466 + if (pax_flags_softmode & MF_PAX_##flag) \
56467 + return PAX_PARSE_FLAGS_FALLBACK;\
56468 + pax_flags_softmode |= MF_PAX_##flag; \
56469 + break;
56470 +
56471 + parse_flag('p', 'P', PAGEEXEC);
56472 + parse_flag('e', 'E', EMUTRAMP);
56473 + parse_flag('m', 'M', MPROTECT);
56474 + parse_flag('r', 'R', RANDMMAP);
56475 + parse_flag('s', 'S', SEGMEXEC);
56476 +
56477 +#undef parse_flag
56478 + }
56479 +
56480 + if (pax_flags_hardmode & pax_flags_softmode)
56481 + return PAX_PARSE_FLAGS_FALLBACK;
56482 +
56483 +#ifdef CONFIG_PAX_SOFTMODE
56484 + if (pax_softmode)
56485 + return pax_parse_xattr_pax_softmode(pax_flags_softmode);
56486 + else
56487 +#endif
56488 +
56489 + return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
56490 +#else
56491 + return PAX_PARSE_FLAGS_FALLBACK;
56492 +#endif
56493 +
56494 +}
56495 +
56496 +static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
56497 +{
56498 + unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
56499 +
56500 + pax_flags = pax_parse_defaults();
56501 + ei_pax_flags = pax_parse_ei_pax(elf_ex);
56502 + pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
56503 + xattr_pax_flags = pax_parse_xattr_pax(file);
56504 +
56505 + if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
56506 + xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
56507 + pt_pax_flags != xattr_pax_flags)
56508 + return -EINVAL;
56509 + if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
56510 + pax_flags = xattr_pax_flags;
56511 + else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
56512 + pax_flags = pt_pax_flags;
56513 + else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
56514 + pax_flags = ei_pax_flags;
56515 +
56516 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
56517 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
56518 + if ((__supported_pte_mask & _PAGE_NX))
56519 + pax_flags &= ~MF_PAX_SEGMEXEC;
56520 + else
56521 + pax_flags &= ~MF_PAX_PAGEEXEC;
56522 + }
56523 +#endif
56524 +
56525 + if (0 > pax_check_flags(&pax_flags))
56526 + return -EINVAL;
56527 +
56528 + current->mm->pax_flags = pax_flags;
56529 + return 0;
56530 +}
56531 +#endif
56532 +
56533 /*
56534 * These are the functions used to load ELF style executables and shared
56535 * libraries. There is no binary dependent code anywhere else.
56536 @@ -551,6 +912,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
56537 {
56538 unsigned int random_variable = 0;
56539
56540 +#ifdef CONFIG_PAX_RANDUSTACK
56541 + if (current->mm->pax_flags & MF_PAX_RANDMMAP)
56542 + return stack_top - current->mm->delta_stack;
56543 +#endif
56544 +
56545 if ((current->flags & PF_RANDOMIZE) &&
56546 !(current->personality & ADDR_NO_RANDOMIZE)) {
56547 random_variable = get_random_int() & STACK_RND_MASK;
56548 @@ -569,7 +935,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
56549 unsigned long load_addr = 0, load_bias = 0;
56550 int load_addr_set = 0;
56551 char * elf_interpreter = NULL;
56552 - unsigned long error;
56553 + unsigned long error = 0;
56554 struct elf_phdr *elf_ppnt, *elf_phdata;
56555 unsigned long elf_bss, elf_brk;
56556 int retval, i;
56557 @@ -579,12 +945,12 @@ static int load_elf_binary(struct linux_binprm *bprm)
56558 unsigned long start_code, end_code, start_data, end_data;
56559 unsigned long reloc_func_desc __maybe_unused = 0;
56560 int executable_stack = EXSTACK_DEFAULT;
56561 - unsigned long def_flags = 0;
56562 struct pt_regs *regs = current_pt_regs();
56563 struct {
56564 struct elfhdr elf_ex;
56565 struct elfhdr interp_elf_ex;
56566 } *loc;
56567 + unsigned long pax_task_size;
56568
56569 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
56570 if (!loc) {
56571 @@ -720,11 +1086,82 @@ static int load_elf_binary(struct linux_binprm *bprm)
56572 goto out_free_dentry;
56573
56574 /* OK, This is the point of no return */
56575 - current->mm->def_flags = def_flags;
56576 + current->mm->def_flags = 0;
56577
56578 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
56579 may depend on the personality. */
56580 SET_PERSONALITY(loc->elf_ex);
56581 +
56582 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
56583 + current->mm->pax_flags = 0UL;
56584 +#endif
56585 +
56586 +#ifdef CONFIG_PAX_DLRESOLVE
56587 + current->mm->call_dl_resolve = 0UL;
56588 +#endif
56589 +
56590 +#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
56591 + current->mm->call_syscall = 0UL;
56592 +#endif
56593 +
56594 +#ifdef CONFIG_PAX_ASLR
56595 + current->mm->delta_mmap = 0UL;
56596 + current->mm->delta_stack = 0UL;
56597 +#endif
56598 +
56599 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
56600 + if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
56601 + send_sig(SIGKILL, current, 0);
56602 + goto out_free_dentry;
56603 + }
56604 +#endif
56605 +
56606 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
56607 + pax_set_initial_flags(bprm);
56608 +#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
56609 + if (pax_set_initial_flags_func)
56610 + (pax_set_initial_flags_func)(bprm);
56611 +#endif
56612 +
56613 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
56614 + if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
56615 + current->mm->context.user_cs_limit = PAGE_SIZE;
56616 + current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
56617 + }
56618 +#endif
56619 +
56620 +#ifdef CONFIG_PAX_SEGMEXEC
56621 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
56622 + current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
56623 + current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
56624 + pax_task_size = SEGMEXEC_TASK_SIZE;
56625 + current->mm->def_flags |= VM_NOHUGEPAGE;
56626 + } else
56627 +#endif
56628 +
56629 + pax_task_size = TASK_SIZE;
56630 +
56631 +#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
56632 + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
56633 + set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
56634 + put_cpu();
56635 + }
56636 +#endif
56637 +
56638 +#ifdef CONFIG_PAX_ASLR
56639 + if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
56640 + current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
56641 + current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
56642 + }
56643 +#endif
56644 +
56645 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
56646 + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
56647 + executable_stack = EXSTACK_DISABLE_X;
56648 + current->personality &= ~READ_IMPLIES_EXEC;
56649 + } else
56650 +#endif
56651 +
56652 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
56653 current->personality |= READ_IMPLIES_EXEC;
56654
56655 @@ -814,6 +1251,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
56656 #else
56657 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
56658 #endif
56659 +
56660 +#ifdef CONFIG_PAX_RANDMMAP
56661 + /* PaX: randomize base address at the default exe base if requested */
56662 + if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
56663 +#ifdef CONFIG_SPARC64
56664 + load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
56665 +#else
56666 + load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
56667 +#endif
56668 + load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
56669 + elf_flags |= MAP_FIXED;
56670 + }
56671 +#endif
56672 +
56673 }
56674
56675 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
56676 @@ -846,9 +1297,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
56677 * allowed task size. Note that p_filesz must always be
56678 * <= p_memsz so it is only necessary to check p_memsz.
56679 */
56680 - if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
56681 - elf_ppnt->p_memsz > TASK_SIZE ||
56682 - TASK_SIZE - elf_ppnt->p_memsz < k) {
56683 + if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
56684 + elf_ppnt->p_memsz > pax_task_size ||
56685 + pax_task_size - elf_ppnt->p_memsz < k) {
56686 /* set_brk can never work. Avoid overflows. */
56687 send_sig(SIGKILL, current, 0);
56688 retval = -EINVAL;
56689 @@ -887,17 +1338,45 @@ static int load_elf_binary(struct linux_binprm *bprm)
56690 goto out_free_dentry;
56691 }
56692 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
56693 - send_sig(SIGSEGV, current, 0);
56694 - retval = -EFAULT; /* Nobody gets to see this, but.. */
56695 - goto out_free_dentry;
56696 + /*
56697 + * This bss-zeroing can fail if the ELF
56698 + * file specifies odd protections. So
56699 + * we don't check the return value
56700 + */
56701 }
56702
56703 +#ifdef CONFIG_PAX_RANDMMAP
56704 + if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
56705 + unsigned long start, size, flags;
56706 + vm_flags_t vm_flags;
56707 +
56708 + start = ELF_PAGEALIGN(elf_brk);
56709 + size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
56710 + flags = MAP_FIXED | MAP_PRIVATE;
56711 + vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
56712 +
56713 + down_write(&current->mm->mmap_sem);
56714 + start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
56715 + retval = -ENOMEM;
56716 + if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
56717 +// if (current->personality & ADDR_NO_RANDOMIZE)
56718 +// vm_flags |= VM_READ | VM_MAYREAD;
56719 + start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
56720 + retval = IS_ERR_VALUE(start) ? start : 0;
56721 + }
56722 + up_write(&current->mm->mmap_sem);
56723 + if (retval == 0)
56724 + retval = set_brk(start + size, start + size + PAGE_SIZE);
56725 + if (retval < 0) {
56726 + send_sig(SIGKILL, current, 0);
56727 + goto out_free_dentry;
56728 + }
56729 + }
56730 +#endif
56731 +
56732 if (elf_interpreter) {
56733 - unsigned long interp_map_addr = 0;
56734 -
56735 elf_entry = load_elf_interp(&loc->interp_elf_ex,
56736 interpreter,
56737 - &interp_map_addr,
56738 load_bias);
56739 if (!IS_ERR((void *)elf_entry)) {
56740 /*
56741 @@ -1119,7 +1598,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
56742 * Decide what to dump of a segment, part, all or none.
56743 */
56744 static unsigned long vma_dump_size(struct vm_area_struct *vma,
56745 - unsigned long mm_flags)
56746 + unsigned long mm_flags, long signr)
56747 {
56748 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
56749
56750 @@ -1157,7 +1636,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
56751 if (vma->vm_file == NULL)
56752 return 0;
56753
56754 - if (FILTER(MAPPED_PRIVATE))
56755 + if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
56756 goto whole;
56757
56758 /*
56759 @@ -1364,9 +1843,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
56760 {
56761 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
56762 int i = 0;
56763 - do
56764 + do {
56765 i += 2;
56766 - while (auxv[i - 2] != AT_NULL);
56767 + } while (auxv[i - 2] != AT_NULL);
56768 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
56769 }
56770
56771 @@ -1375,7 +1854,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
56772 {
56773 mm_segment_t old_fs = get_fs();
56774 set_fs(KERNEL_DS);
56775 - copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
56776 + copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
56777 set_fs(old_fs);
56778 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
56779 }
56780 @@ -1999,14 +2478,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
56781 }
56782
56783 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
56784 - unsigned long mm_flags)
56785 + struct coredump_params *cprm)
56786 {
56787 struct vm_area_struct *vma;
56788 size_t size = 0;
56789
56790 for (vma = first_vma(current, gate_vma); vma != NULL;
56791 vma = next_vma(vma, gate_vma))
56792 - size += vma_dump_size(vma, mm_flags);
56793 + size += vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
56794 return size;
56795 }
56796
56797 @@ -2097,7 +2576,7 @@ static int elf_core_dump(struct coredump_params *cprm)
56798
56799 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
56800
56801 - offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
56802 + offset += elf_core_vma_data_size(gate_vma, cprm);
56803 offset += elf_core_extra_data_size();
56804 e_shoff = offset;
56805
56806 @@ -2125,7 +2604,7 @@ static int elf_core_dump(struct coredump_params *cprm)
56807 phdr.p_offset = offset;
56808 phdr.p_vaddr = vma->vm_start;
56809 phdr.p_paddr = 0;
56810 - phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
56811 + phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
56812 phdr.p_memsz = vma->vm_end - vma->vm_start;
56813 offset += phdr.p_filesz;
56814 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
56815 @@ -2158,7 +2637,7 @@ static int elf_core_dump(struct coredump_params *cprm)
56816 unsigned long addr;
56817 unsigned long end;
56818
56819 - end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
56820 + end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
56821
56822 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
56823 struct page *page;
56824 @@ -2199,6 +2678,167 @@ out:
56825
56826 #endif /* CONFIG_ELF_CORE */
56827
56828 +#ifdef CONFIG_PAX_MPROTECT
56829 +/* PaX: non-PIC ELF libraries need relocations on their executable segments
56830 + * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
56831 + * we'll remove VM_MAYWRITE for good on RELRO segments.
56832 + *
56833 + * The checks favour ld-linux.so behaviour which operates on a per ELF segment
56834 + * basis because we want to allow the common case and not the special ones.
56835 + */
56836 +static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
56837 +{
56838 + struct elfhdr elf_h;
56839 + struct elf_phdr elf_p;
56840 + unsigned long i;
56841 + unsigned long oldflags;
56842 + bool is_textrel_rw, is_textrel_rx, is_relro;
56843 +
56844 + if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
56845 + return;
56846 +
56847 + oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
56848 + newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
56849 +
56850 +#ifdef CONFIG_PAX_ELFRELOCS
56851 + /* possible TEXTREL */
56852 + is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
56853 + is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
56854 +#else
56855 + is_textrel_rw = false;
56856 + is_textrel_rx = false;
56857 +#endif
56858 +
56859 + /* possible RELRO */
56860 + is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
56861 +
56862 + if (!is_textrel_rw && !is_textrel_rx && !is_relro)
56863 + return;
56864 +
56865 + if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
56866 + memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
56867 +
56868 +#ifdef CONFIG_PAX_ETEXECRELOCS
56869 + ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
56870 +#else
56871 + ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
56872 +#endif
56873 +
56874 + (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
56875 + !elf_check_arch(&elf_h) ||
56876 + elf_h.e_phentsize != sizeof(struct elf_phdr) ||
56877 + elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
56878 + return;
56879 +
56880 + for (i = 0UL; i < elf_h.e_phnum; i++) {
56881 + if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
56882 + return;
56883 + switch (elf_p.p_type) {
56884 + case PT_DYNAMIC:
56885 + if (!is_textrel_rw && !is_textrel_rx)
56886 + continue;
56887 + i = 0UL;
56888 + while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
56889 + elf_dyn dyn;
56890 +
56891 + if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
56892 + break;
56893 + if (dyn.d_tag == DT_NULL)
56894 + break;
56895 + if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
56896 + gr_log_textrel(vma);
56897 + if (is_textrel_rw)
56898 + vma->vm_flags |= VM_MAYWRITE;
56899 + else
56900 + /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
56901 + vma->vm_flags &= ~VM_MAYWRITE;
56902 + break;
56903 + }
56904 + i++;
56905 + }
56906 + is_textrel_rw = false;
56907 + is_textrel_rx = false;
56908 + continue;
56909 +
56910 + case PT_GNU_RELRO:
56911 + if (!is_relro)
56912 + continue;
56913 + if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
56914 + vma->vm_flags &= ~VM_MAYWRITE;
56915 + is_relro = false;
56916 + continue;
56917 +
56918 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
56919 + case PT_PAX_FLAGS: {
56920 + const char *msg_mprotect = "", *msg_emutramp = "";
56921 + char *buffer_lib, *buffer_exe;
56922 +
56923 + if (elf_p.p_flags & PF_NOMPROTECT)
56924 + msg_mprotect = "MPROTECT disabled";
56925 +
56926 +#ifdef CONFIG_PAX_EMUTRAMP
56927 + if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
56928 + msg_emutramp = "EMUTRAMP enabled";
56929 +#endif
56930 +
56931 + if (!msg_mprotect[0] && !msg_emutramp[0])
56932 + continue;
56933 +
56934 + if (!printk_ratelimit())
56935 + continue;
56936 +
56937 + buffer_lib = (char *)__get_free_page(GFP_KERNEL);
56938 + buffer_exe = (char *)__get_free_page(GFP_KERNEL);
56939 + if (buffer_lib && buffer_exe) {
56940 + char *path_lib, *path_exe;
56941 +
56942 + path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
56943 + path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
56944 +
56945 + pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
56946 + (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
56947 +
56948 + }
56949 + free_page((unsigned long)buffer_exe);
56950 + free_page((unsigned long)buffer_lib);
56951 + continue;
56952 + }
56953 +#endif
56954 +
56955 + }
56956 + }
56957 +}
56958 +#endif
56959 +
56960 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
56961 +
56962 +extern int grsec_enable_log_rwxmaps;
56963 +
56964 +static void elf_handle_mmap(struct file *file)
56965 +{
56966 + struct elfhdr elf_h;
56967 + struct elf_phdr elf_p;
56968 + unsigned long i;
56969 +
56970 + if (!grsec_enable_log_rwxmaps)
56971 + return;
56972 +
56973 + if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
56974 + memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
56975 + (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
56976 + elf_h.e_phentsize != sizeof(struct elf_phdr) ||
56977 + elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
56978 + return;
56979 +
56980 + for (i = 0UL; i < elf_h.e_phnum; i++) {
56981 + if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
56982 + return;
56983 + if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
56984 + gr_log_ptgnustack(file);
56985 + }
56986 +}
56987 +#endif
56988 +
56989 static int __init init_elf_binfmt(void)
56990 {
56991 register_binfmt(&elf_format);
56992 diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
56993 index d50bbe5..af3b649 100644
56994 --- a/fs/binfmt_flat.c
56995 +++ b/fs/binfmt_flat.c
56996 @@ -566,7 +566,9 @@ static int load_flat_file(struct linux_binprm * bprm,
56997 realdatastart = (unsigned long) -ENOMEM;
56998 printk("Unable to allocate RAM for process data, errno %d\n",
56999 (int)-realdatastart);
57000 + down_write(&current->mm->mmap_sem);
57001 vm_munmap(textpos, text_len);
57002 + up_write(&current->mm->mmap_sem);
57003 ret = realdatastart;
57004 goto err;
57005 }
57006 @@ -590,8 +592,10 @@ static int load_flat_file(struct linux_binprm * bprm,
57007 }
57008 if (IS_ERR_VALUE(result)) {
57009 printk("Unable to read data+bss, errno %d\n", (int)-result);
57010 + down_write(&current->mm->mmap_sem);
57011 vm_munmap(textpos, text_len);
57012 vm_munmap(realdatastart, len);
57013 + up_write(&current->mm->mmap_sem);
57014 ret = result;
57015 goto err;
57016 }
57017 @@ -653,8 +657,10 @@ static int load_flat_file(struct linux_binprm * bprm,
57018 }
57019 if (IS_ERR_VALUE(result)) {
57020 printk("Unable to read code+data+bss, errno %d\n",(int)-result);
57021 + down_write(&current->mm->mmap_sem);
57022 vm_munmap(textpos, text_len + data_len + extra +
57023 MAX_SHARED_LIBS * sizeof(unsigned long));
57024 + up_write(&current->mm->mmap_sem);
57025 ret = result;
57026 goto err;
57027 }
57028 diff --git a/fs/bio.c b/fs/bio.c
57029 index 8754e7b..0669094 100644
57030 --- a/fs/bio.c
57031 +++ b/fs/bio.c
57032 @@ -1145,7 +1145,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
57033 /*
57034 * Overflow, abort
57035 */
57036 - if (end < start)
57037 + if (end < start || end - start > INT_MAX - nr_pages)
57038 return ERR_PTR(-EINVAL);
57039
57040 nr_pages += end - start;
57041 @@ -1279,7 +1279,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
57042 /*
57043 * Overflow, abort
57044 */
57045 - if (end < start)
57046 + if (end < start || end - start > INT_MAX - nr_pages)
57047 return ERR_PTR(-EINVAL);
57048
57049 nr_pages += end - start;
57050 @@ -1541,7 +1541,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
57051 const int read = bio_data_dir(bio) == READ;
57052 struct bio_map_data *bmd = bio->bi_private;
57053 int i;
57054 - char *p = bmd->sgvecs[0].iov_base;
57055 + char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
57056
57057 bio_for_each_segment_all(bvec, bio, i) {
57058 char *addr = page_address(bvec->bv_page);
57059 diff --git a/fs/block_dev.c b/fs/block_dev.c
57060 index 1e86823..8e34695 100644
57061 --- a/fs/block_dev.c
57062 +++ b/fs/block_dev.c
57063 @@ -637,7 +637,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
57064 else if (bdev->bd_contains == bdev)
57065 return true; /* is a whole device which isn't held */
57066
57067 - else if (whole->bd_holder == bd_may_claim)
57068 + else if (whole->bd_holder == (void *)bd_may_claim)
57069 return true; /* is a partition of a device that is being partitioned */
57070 else if (whole->bd_holder != NULL)
57071 return false; /* is a partition of a held device */
57072 diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
57073 index cbd3a7d..c6a2881 100644
57074 --- a/fs/btrfs/ctree.c
57075 +++ b/fs/btrfs/ctree.c
57076 @@ -1216,9 +1216,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
57077 free_extent_buffer(buf);
57078 add_root_to_dirty_list(root);
57079 } else {
57080 - if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
57081 - parent_start = parent->start;
57082 - else
57083 + if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
57084 + if (parent)
57085 + parent_start = parent->start;
57086 + else
57087 + parent_start = 0;
57088 + } else
57089 parent_start = 0;
57090
57091 WARN_ON(trans->transid != btrfs_header_generation(parent));
57092 diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
57093 index 451b00c..a2cccee 100644
57094 --- a/fs/btrfs/delayed-inode.c
57095 +++ b/fs/btrfs/delayed-inode.c
57096 @@ -459,7 +459,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
57097
57098 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
57099 {
57100 - int seq = atomic_inc_return(&delayed_root->items_seq);
57101 + int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
57102 if ((atomic_dec_return(&delayed_root->items) <
57103 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
57104 waitqueue_active(&delayed_root->wait))
57105 @@ -1409,7 +1409,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
57106
57107 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
57108 {
57109 - int val = atomic_read(&delayed_root->items_seq);
57110 + int val = atomic_read_unchecked(&delayed_root->items_seq);
57111
57112 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
57113 return 1;
57114 @@ -1433,7 +1433,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
57115 int seq;
57116 int ret;
57117
57118 - seq = atomic_read(&delayed_root->items_seq);
57119 + seq = atomic_read_unchecked(&delayed_root->items_seq);
57120
57121 ret = btrfs_wq_run_delayed_node(delayed_root, root, 0);
57122 if (ret)
57123 diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
57124 index f70119f..ab5894d 100644
57125 --- a/fs/btrfs/delayed-inode.h
57126 +++ b/fs/btrfs/delayed-inode.h
57127 @@ -43,7 +43,7 @@ struct btrfs_delayed_root {
57128 */
57129 struct list_head prepare_list;
57130 atomic_t items; /* for delayed items */
57131 - atomic_t items_seq; /* for delayed items */
57132 + atomic_unchecked_t items_seq; /* for delayed items */
57133 int nodes; /* for delayed nodes */
57134 wait_queue_head_t wait;
57135 };
57136 @@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
57137 struct btrfs_delayed_root *delayed_root)
57138 {
57139 atomic_set(&delayed_root->items, 0);
57140 - atomic_set(&delayed_root->items_seq, 0);
57141 + atomic_set_unchecked(&delayed_root->items_seq, 0);
57142 delayed_root->nodes = 0;
57143 spin_lock_init(&delayed_root->lock);
57144 init_waitqueue_head(&delayed_root->wait);
57145 diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
57146 index a6d8efa..2f062cf 100644
57147 --- a/fs/btrfs/ioctl.c
57148 +++ b/fs/btrfs/ioctl.c
57149 @@ -3491,9 +3491,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
57150 for (i = 0; i < num_types; i++) {
57151 struct btrfs_space_info *tmp;
57152
57153 + /* Don't copy in more than we allocated */
57154 if (!slot_count)
57155 break;
57156
57157 + slot_count--;
57158 +
57159 info = NULL;
57160 rcu_read_lock();
57161 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
57162 @@ -3515,10 +3518,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
57163 memcpy(dest, &space, sizeof(space));
57164 dest++;
57165 space_args.total_spaces++;
57166 - slot_count--;
57167 }
57168 - if (!slot_count)
57169 - break;
57170 }
57171 up_read(&info->groups_sem);
57172 }
57173 diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
57174 index d04db81..96e54f1 100644
57175 --- a/fs/btrfs/super.c
57176 +++ b/fs/btrfs/super.c
57177 @@ -268,7 +268,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
57178 function, line, errstr);
57179 return;
57180 }
57181 - ACCESS_ONCE(trans->transaction->aborted) = errno;
57182 + ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
57183 /* Wake up anybody who may be waiting on this transaction */
57184 wake_up(&root->fs_info->transaction_wait);
57185 wake_up(&root->fs_info->transaction_blocked_wait);
57186 diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
57187 index 865f4cf..f321e86 100644
57188 --- a/fs/btrfs/sysfs.c
57189 +++ b/fs/btrfs/sysfs.c
57190 @@ -436,7 +436,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
57191 for (set = 0; set < FEAT_MAX; set++) {
57192 int i;
57193 struct attribute *attrs[2];
57194 - struct attribute_group agroup = {
57195 + attribute_group_no_const agroup = {
57196 .name = "features",
57197 .attrs = attrs,
57198 };
57199 diff --git a/fs/buffer.c b/fs/buffer.c
57200 index 27265a8..289f488 100644
57201 --- a/fs/buffer.c
57202 +++ b/fs/buffer.c
57203 @@ -3428,7 +3428,7 @@ void __init buffer_init(void)
57204 bh_cachep = kmem_cache_create("buffer_head",
57205 sizeof(struct buffer_head), 0,
57206 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
57207 - SLAB_MEM_SPREAD),
57208 + SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
57209 NULL);
57210
57211 /*
57212 diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
57213 index 622f469..e8d2d55 100644
57214 --- a/fs/cachefiles/bind.c
57215 +++ b/fs/cachefiles/bind.c
57216 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
57217 args);
57218
57219 /* start by checking things over */
57220 - ASSERT(cache->fstop_percent >= 0 &&
57221 - cache->fstop_percent < cache->fcull_percent &&
57222 + ASSERT(cache->fstop_percent < cache->fcull_percent &&
57223 cache->fcull_percent < cache->frun_percent &&
57224 cache->frun_percent < 100);
57225
57226 - ASSERT(cache->bstop_percent >= 0 &&
57227 - cache->bstop_percent < cache->bcull_percent &&
57228 + ASSERT(cache->bstop_percent < cache->bcull_percent &&
57229 cache->bcull_percent < cache->brun_percent &&
57230 cache->brun_percent < 100);
57231
57232 diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
57233 index 0a1467b..6a53245 100644
57234 --- a/fs/cachefiles/daemon.c
57235 +++ b/fs/cachefiles/daemon.c
57236 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
57237 if (n > buflen)
57238 return -EMSGSIZE;
57239
57240 - if (copy_to_user(_buffer, buffer, n) != 0)
57241 + if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
57242 return -EFAULT;
57243
57244 return n;
57245 @@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
57246 if (test_bit(CACHEFILES_DEAD, &cache->flags))
57247 return -EIO;
57248
57249 - if (datalen < 0 || datalen > PAGE_SIZE - 1)
57250 + if (datalen > PAGE_SIZE - 1)
57251 return -EOPNOTSUPP;
57252
57253 /* drag the command string into the kernel so we can parse it */
57254 @@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
57255 if (args[0] != '%' || args[1] != '\0')
57256 return -EINVAL;
57257
57258 - if (fstop < 0 || fstop >= cache->fcull_percent)
57259 + if (fstop >= cache->fcull_percent)
57260 return cachefiles_daemon_range_error(cache, args);
57261
57262 cache->fstop_percent = fstop;
57263 @@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
57264 if (args[0] != '%' || args[1] != '\0')
57265 return -EINVAL;
57266
57267 - if (bstop < 0 || bstop >= cache->bcull_percent)
57268 + if (bstop >= cache->bcull_percent)
57269 return cachefiles_daemon_range_error(cache, args);
57270
57271 cache->bstop_percent = bstop;
57272 diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
57273 index 5349473..d6c0b93 100644
57274 --- a/fs/cachefiles/internal.h
57275 +++ b/fs/cachefiles/internal.h
57276 @@ -59,7 +59,7 @@ struct cachefiles_cache {
57277 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
57278 struct rb_root active_nodes; /* active nodes (can't be culled) */
57279 rwlock_t active_lock; /* lock for active_nodes */
57280 - atomic_t gravecounter; /* graveyard uniquifier */
57281 + atomic_unchecked_t gravecounter; /* graveyard uniquifier */
57282 unsigned frun_percent; /* when to stop culling (% files) */
57283 unsigned fcull_percent; /* when to start culling (% files) */
57284 unsigned fstop_percent; /* when to stop allocating (% files) */
57285 @@ -171,19 +171,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
57286 * proc.c
57287 */
57288 #ifdef CONFIG_CACHEFILES_HISTOGRAM
57289 -extern atomic_t cachefiles_lookup_histogram[HZ];
57290 -extern atomic_t cachefiles_mkdir_histogram[HZ];
57291 -extern atomic_t cachefiles_create_histogram[HZ];
57292 +extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
57293 +extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
57294 +extern atomic_unchecked_t cachefiles_create_histogram[HZ];
57295
57296 extern int __init cachefiles_proc_init(void);
57297 extern void cachefiles_proc_cleanup(void);
57298 static inline
57299 -void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
57300 +void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
57301 {
57302 unsigned long jif = jiffies - start_jif;
57303 if (jif >= HZ)
57304 jif = HZ - 1;
57305 - atomic_inc(&histogram[jif]);
57306 + atomic_inc_unchecked(&histogram[jif]);
57307 }
57308
57309 #else
57310 diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
57311 index ca65f39..48921e3 100644
57312 --- a/fs/cachefiles/namei.c
57313 +++ b/fs/cachefiles/namei.c
57314 @@ -317,7 +317,7 @@ try_again:
57315 /* first step is to make up a grave dentry in the graveyard */
57316 sprintf(nbuffer, "%08x%08x",
57317 (uint32_t) get_seconds(),
57318 - (uint32_t) atomic_inc_return(&cache->gravecounter));
57319 + (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
57320
57321 /* do the multiway lock magic */
57322 trap = lock_rename(cache->graveyard, dir);
57323 diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
57324 index eccd339..4c1d995 100644
57325 --- a/fs/cachefiles/proc.c
57326 +++ b/fs/cachefiles/proc.c
57327 @@ -14,9 +14,9 @@
57328 #include <linux/seq_file.h>
57329 #include "internal.h"
57330
57331 -atomic_t cachefiles_lookup_histogram[HZ];
57332 -atomic_t cachefiles_mkdir_histogram[HZ];
57333 -atomic_t cachefiles_create_histogram[HZ];
57334 +atomic_unchecked_t cachefiles_lookup_histogram[HZ];
57335 +atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
57336 +atomic_unchecked_t cachefiles_create_histogram[HZ];
57337
57338 /*
57339 * display the latency histogram
57340 @@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
57341 return 0;
57342 default:
57343 index = (unsigned long) v - 3;
57344 - x = atomic_read(&cachefiles_lookup_histogram[index]);
57345 - y = atomic_read(&cachefiles_mkdir_histogram[index]);
57346 - z = atomic_read(&cachefiles_create_histogram[index]);
57347 + x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
57348 + y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
57349 + z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
57350 if (x == 0 && y == 0 && z == 0)
57351 return 0;
57352
57353 diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
57354 index ebaff36..7e3ea26 100644
57355 --- a/fs/cachefiles/rdwr.c
57356 +++ b/fs/cachefiles/rdwr.c
57357 @@ -950,7 +950,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
57358 old_fs = get_fs();
57359 set_fs(KERNEL_DS);
57360 ret = file->f_op->write(
57361 - file, (const void __user *) data, len, &pos);
57362 + file, (const void __force_user *) data, len, &pos);
57363 set_fs(old_fs);
57364 kunmap(page);
57365 file_end_write(file);
57366 diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
57367 index 45eda6d..9126f7f 100644
57368 --- a/fs/ceph/dir.c
57369 +++ b/fs/ceph/dir.c
57370 @@ -248,7 +248,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
57371 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
57372 struct ceph_mds_client *mdsc = fsc->mdsc;
57373 unsigned frag = fpos_frag(ctx->pos);
57374 - int off = fpos_off(ctx->pos);
57375 + unsigned int off = fpos_off(ctx->pos);
57376 int err;
57377 u32 ftype;
57378 struct ceph_mds_reply_info_parsed *rinfo;
57379 diff --git a/fs/ceph/super.c b/fs/ceph/super.c
57380 index 10a4ccb..92dbc5e 100644
57381 --- a/fs/ceph/super.c
57382 +++ b/fs/ceph/super.c
57383 @@ -895,7 +895,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
57384 /*
57385 * construct our own bdi so we can control readahead, etc.
57386 */
57387 -static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
57388 +static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
57389
57390 static int ceph_register_bdi(struct super_block *sb,
57391 struct ceph_fs_client *fsc)
57392 @@ -912,7 +912,7 @@ static int ceph_register_bdi(struct super_block *sb,
57393 default_backing_dev_info.ra_pages;
57394
57395 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
57396 - atomic_long_inc_return(&bdi_seq));
57397 + atomic_long_inc_return_unchecked(&bdi_seq));
57398 if (!err)
57399 sb->s_bdi = &fsc->backing_dev_info;
57400 return err;
57401 diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
57402 index f3ac415..3d2420c 100644
57403 --- a/fs/cifs/cifs_debug.c
57404 +++ b/fs/cifs/cifs_debug.c
57405 @@ -286,8 +286,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
57406
57407 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
57408 #ifdef CONFIG_CIFS_STATS2
57409 - atomic_set(&totBufAllocCount, 0);
57410 - atomic_set(&totSmBufAllocCount, 0);
57411 + atomic_set_unchecked(&totBufAllocCount, 0);
57412 + atomic_set_unchecked(&totSmBufAllocCount, 0);
57413 #endif /* CONFIG_CIFS_STATS2 */
57414 spin_lock(&cifs_tcp_ses_lock);
57415 list_for_each(tmp1, &cifs_tcp_ses_list) {
57416 @@ -300,7 +300,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
57417 tcon = list_entry(tmp3,
57418 struct cifs_tcon,
57419 tcon_list);
57420 - atomic_set(&tcon->num_smbs_sent, 0);
57421 + atomic_set_unchecked(&tcon->num_smbs_sent, 0);
57422 if (server->ops->clear_stats)
57423 server->ops->clear_stats(tcon);
57424 }
57425 @@ -332,8 +332,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
57426 smBufAllocCount.counter, cifs_min_small);
57427 #ifdef CONFIG_CIFS_STATS2
57428 seq_printf(m, "Total Large %d Small %d Allocations\n",
57429 - atomic_read(&totBufAllocCount),
57430 - atomic_read(&totSmBufAllocCount));
57431 + atomic_read_unchecked(&totBufAllocCount),
57432 + atomic_read_unchecked(&totSmBufAllocCount));
57433 #endif /* CONFIG_CIFS_STATS2 */
57434
57435 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
57436 @@ -362,7 +362,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
57437 if (tcon->need_reconnect)
57438 seq_puts(m, "\tDISCONNECTED ");
57439 seq_printf(m, "\nSMBs: %d",
57440 - atomic_read(&tcon->num_smbs_sent));
57441 + atomic_read_unchecked(&tcon->num_smbs_sent));
57442 if (server->ops->print_stats)
57443 server->ops->print_stats(m, tcon);
57444 }
57445 diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
57446 index 849f613..eae6dec 100644
57447 --- a/fs/cifs/cifsfs.c
57448 +++ b/fs/cifs/cifsfs.c
57449 @@ -1056,7 +1056,7 @@ cifs_init_request_bufs(void)
57450 */
57451 cifs_req_cachep = kmem_cache_create("cifs_request",
57452 CIFSMaxBufSize + max_hdr_size, 0,
57453 - SLAB_HWCACHE_ALIGN, NULL);
57454 + SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
57455 if (cifs_req_cachep == NULL)
57456 return -ENOMEM;
57457
57458 @@ -1083,7 +1083,7 @@ cifs_init_request_bufs(void)
57459 efficient to alloc 1 per page off the slab compared to 17K (5page)
57460 alloc of large cifs buffers even when page debugging is on */
57461 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
57462 - MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
57463 + MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
57464 NULL);
57465 if (cifs_sm_req_cachep == NULL) {
57466 mempool_destroy(cifs_req_poolp);
57467 @@ -1168,8 +1168,8 @@ init_cifs(void)
57468 atomic_set(&bufAllocCount, 0);
57469 atomic_set(&smBufAllocCount, 0);
57470 #ifdef CONFIG_CIFS_STATS2
57471 - atomic_set(&totBufAllocCount, 0);
57472 - atomic_set(&totSmBufAllocCount, 0);
57473 + atomic_set_unchecked(&totBufAllocCount, 0);
57474 + atomic_set_unchecked(&totSmBufAllocCount, 0);
57475 #endif /* CONFIG_CIFS_STATS2 */
57476
57477 atomic_set(&midCount, 0);
57478 diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
57479 index c0f3718..6afed7d 100644
57480 --- a/fs/cifs/cifsglob.h
57481 +++ b/fs/cifs/cifsglob.h
57482 @@ -804,35 +804,35 @@ struct cifs_tcon {
57483 __u16 Flags; /* optional support bits */
57484 enum statusEnum tidStatus;
57485 #ifdef CONFIG_CIFS_STATS
57486 - atomic_t num_smbs_sent;
57487 + atomic_unchecked_t num_smbs_sent;
57488 union {
57489 struct {
57490 - atomic_t num_writes;
57491 - atomic_t num_reads;
57492 - atomic_t num_flushes;
57493 - atomic_t num_oplock_brks;
57494 - atomic_t num_opens;
57495 - atomic_t num_closes;
57496 - atomic_t num_deletes;
57497 - atomic_t num_mkdirs;
57498 - atomic_t num_posixopens;
57499 - atomic_t num_posixmkdirs;
57500 - atomic_t num_rmdirs;
57501 - atomic_t num_renames;
57502 - atomic_t num_t2renames;
57503 - atomic_t num_ffirst;
57504 - atomic_t num_fnext;
57505 - atomic_t num_fclose;
57506 - atomic_t num_hardlinks;
57507 - atomic_t num_symlinks;
57508 - atomic_t num_locks;
57509 - atomic_t num_acl_get;
57510 - atomic_t num_acl_set;
57511 + atomic_unchecked_t num_writes;
57512 + atomic_unchecked_t num_reads;
57513 + atomic_unchecked_t num_flushes;
57514 + atomic_unchecked_t num_oplock_brks;
57515 + atomic_unchecked_t num_opens;
57516 + atomic_unchecked_t num_closes;
57517 + atomic_unchecked_t num_deletes;
57518 + atomic_unchecked_t num_mkdirs;
57519 + atomic_unchecked_t num_posixopens;
57520 + atomic_unchecked_t num_posixmkdirs;
57521 + atomic_unchecked_t num_rmdirs;
57522 + atomic_unchecked_t num_renames;
57523 + atomic_unchecked_t num_t2renames;
57524 + atomic_unchecked_t num_ffirst;
57525 + atomic_unchecked_t num_fnext;
57526 + atomic_unchecked_t num_fclose;
57527 + atomic_unchecked_t num_hardlinks;
57528 + atomic_unchecked_t num_symlinks;
57529 + atomic_unchecked_t num_locks;
57530 + atomic_unchecked_t num_acl_get;
57531 + atomic_unchecked_t num_acl_set;
57532 } cifs_stats;
57533 #ifdef CONFIG_CIFS_SMB2
57534 struct {
57535 - atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
57536 - atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
57537 + atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
57538 + atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
57539 } smb2_stats;
57540 #endif /* CONFIG_CIFS_SMB2 */
57541 } stats;
57542 @@ -1162,7 +1162,7 @@ convert_delimiter(char *path, char delim)
57543 }
57544
57545 #ifdef CONFIG_CIFS_STATS
57546 -#define cifs_stats_inc atomic_inc
57547 +#define cifs_stats_inc atomic_inc_unchecked
57548
57549 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
57550 unsigned int bytes)
57551 @@ -1528,8 +1528,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
57552 /* Various Debug counters */
57553 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
57554 #ifdef CONFIG_CIFS_STATS2
57555 -GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
57556 -GLOBAL_EXTERN atomic_t totSmBufAllocCount;
57557 +GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
57558 +GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
57559 #endif
57560 GLOBAL_EXTERN atomic_t smBufAllocCount;
57561 GLOBAL_EXTERN atomic_t midCount;
57562 diff --git a/fs/cifs/file.c b/fs/cifs/file.c
57563 index 834fce7..8a314b5 100644
57564 --- a/fs/cifs/file.c
57565 +++ b/fs/cifs/file.c
57566 @@ -1900,10 +1900,14 @@ static int cifs_writepages(struct address_space *mapping,
57567 index = mapping->writeback_index; /* Start from prev offset */
57568 end = -1;
57569 } else {
57570 - index = wbc->range_start >> PAGE_CACHE_SHIFT;
57571 - end = wbc->range_end >> PAGE_CACHE_SHIFT;
57572 - if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
57573 + if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
57574 range_whole = true;
57575 + index = 0;
57576 + end = ULONG_MAX;
57577 + } else {
57578 + index = wbc->range_start >> PAGE_CACHE_SHIFT;
57579 + end = wbc->range_end >> PAGE_CACHE_SHIFT;
57580 + }
57581 scanned = true;
57582 }
57583 retry:
57584 diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
57585 index 2f9f379..43f8025 100644
57586 --- a/fs/cifs/misc.c
57587 +++ b/fs/cifs/misc.c
57588 @@ -170,7 +170,7 @@ cifs_buf_get(void)
57589 memset(ret_buf, 0, buf_size + 3);
57590 atomic_inc(&bufAllocCount);
57591 #ifdef CONFIG_CIFS_STATS2
57592 - atomic_inc(&totBufAllocCount);
57593 + atomic_inc_unchecked(&totBufAllocCount);
57594 #endif /* CONFIG_CIFS_STATS2 */
57595 }
57596
57597 @@ -205,7 +205,7 @@ cifs_small_buf_get(void)
57598 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
57599 atomic_inc(&smBufAllocCount);
57600 #ifdef CONFIG_CIFS_STATS2
57601 - atomic_inc(&totSmBufAllocCount);
57602 + atomic_inc_unchecked(&totSmBufAllocCount);
57603 #endif /* CONFIG_CIFS_STATS2 */
57604
57605 }
57606 diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
57607 index 526fb89..ecdbf5a 100644
57608 --- a/fs/cifs/smb1ops.c
57609 +++ b/fs/cifs/smb1ops.c
57610 @@ -616,27 +616,27 @@ static void
57611 cifs_clear_stats(struct cifs_tcon *tcon)
57612 {
57613 #ifdef CONFIG_CIFS_STATS
57614 - atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
57615 - atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
57616 - atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
57617 - atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
57618 - atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
57619 - atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
57620 - atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
57621 - atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
57622 - atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
57623 - atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
57624 - atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
57625 - atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
57626 - atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
57627 - atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
57628 - atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
57629 - atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
57630 - atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
57631 - atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
57632 - atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
57633 - atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
57634 - atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
57635 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
57636 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
57637 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
57638 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
57639 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
57640 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
57641 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
57642 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
57643 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
57644 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
57645 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
57646 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
57647 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
57648 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
57649 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
57650 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
57651 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
57652 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
57653 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
57654 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
57655 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
57656 #endif
57657 }
57658
57659 @@ -645,36 +645,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
57660 {
57661 #ifdef CONFIG_CIFS_STATS
57662 seq_printf(m, " Oplocks breaks: %d",
57663 - atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
57664 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
57665 seq_printf(m, "\nReads: %d Bytes: %llu",
57666 - atomic_read(&tcon->stats.cifs_stats.num_reads),
57667 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
57668 (long long)(tcon->bytes_read));
57669 seq_printf(m, "\nWrites: %d Bytes: %llu",
57670 - atomic_read(&tcon->stats.cifs_stats.num_writes),
57671 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
57672 (long long)(tcon->bytes_written));
57673 seq_printf(m, "\nFlushes: %d",
57674 - atomic_read(&tcon->stats.cifs_stats.num_flushes));
57675 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
57676 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
57677 - atomic_read(&tcon->stats.cifs_stats.num_locks),
57678 - atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
57679 - atomic_read(&tcon->stats.cifs_stats.num_symlinks));
57680 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
57681 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
57682 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
57683 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
57684 - atomic_read(&tcon->stats.cifs_stats.num_opens),
57685 - atomic_read(&tcon->stats.cifs_stats.num_closes),
57686 - atomic_read(&tcon->stats.cifs_stats.num_deletes));
57687 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
57688 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
57689 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
57690 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
57691 - atomic_read(&tcon->stats.cifs_stats.num_posixopens),
57692 - atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
57693 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
57694 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
57695 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
57696 - atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
57697 - atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
57698 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
57699 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
57700 seq_printf(m, "\nRenames: %d T2 Renames %d",
57701 - atomic_read(&tcon->stats.cifs_stats.num_renames),
57702 - atomic_read(&tcon->stats.cifs_stats.num_t2renames));
57703 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
57704 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
57705 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
57706 - atomic_read(&tcon->stats.cifs_stats.num_ffirst),
57707 - atomic_read(&tcon->stats.cifs_stats.num_fnext),
57708 - atomic_read(&tcon->stats.cifs_stats.num_fclose));
57709 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
57710 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
57711 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
57712 #endif
57713 }
57714
57715 diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
57716 index 192f51a..539307e 100644
57717 --- a/fs/cifs/smb2ops.c
57718 +++ b/fs/cifs/smb2ops.c
57719 @@ -364,8 +364,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
57720 #ifdef CONFIG_CIFS_STATS
57721 int i;
57722 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
57723 - atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
57724 - atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
57725 + atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
57726 + atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
57727 }
57728 #endif
57729 }
57730 @@ -405,65 +405,65 @@ static void
57731 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
57732 {
57733 #ifdef CONFIG_CIFS_STATS
57734 - atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
57735 - atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
57736 + atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
57737 + atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
57738 seq_printf(m, "\nNegotiates: %d sent %d failed",
57739 - atomic_read(&sent[SMB2_NEGOTIATE_HE]),
57740 - atomic_read(&failed[SMB2_NEGOTIATE_HE]));
57741 + atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
57742 + atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
57743 seq_printf(m, "\nSessionSetups: %d sent %d failed",
57744 - atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
57745 - atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
57746 + atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
57747 + atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
57748 seq_printf(m, "\nLogoffs: %d sent %d failed",
57749 - atomic_read(&sent[SMB2_LOGOFF_HE]),
57750 - atomic_read(&failed[SMB2_LOGOFF_HE]));
57751 + atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
57752 + atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
57753 seq_printf(m, "\nTreeConnects: %d sent %d failed",
57754 - atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
57755 - atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
57756 + atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
57757 + atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
57758 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
57759 - atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
57760 - atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
57761 + atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
57762 + atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
57763 seq_printf(m, "\nCreates: %d sent %d failed",
57764 - atomic_read(&sent[SMB2_CREATE_HE]),
57765 - atomic_read(&failed[SMB2_CREATE_HE]));
57766 + atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
57767 + atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
57768 seq_printf(m, "\nCloses: %d sent %d failed",
57769 - atomic_read(&sent[SMB2_CLOSE_HE]),
57770 - atomic_read(&failed[SMB2_CLOSE_HE]));
57771 + atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
57772 + atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
57773 seq_printf(m, "\nFlushes: %d sent %d failed",
57774 - atomic_read(&sent[SMB2_FLUSH_HE]),
57775 - atomic_read(&failed[SMB2_FLUSH_HE]));
57776 + atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
57777 + atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
57778 seq_printf(m, "\nReads: %d sent %d failed",
57779 - atomic_read(&sent[SMB2_READ_HE]),
57780 - atomic_read(&failed[SMB2_READ_HE]));
57781 + atomic_read_unchecked(&sent[SMB2_READ_HE]),
57782 + atomic_read_unchecked(&failed[SMB2_READ_HE]));
57783 seq_printf(m, "\nWrites: %d sent %d failed",
57784 - atomic_read(&sent[SMB2_WRITE_HE]),
57785 - atomic_read(&failed[SMB2_WRITE_HE]));
57786 + atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
57787 + atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
57788 seq_printf(m, "\nLocks: %d sent %d failed",
57789 - atomic_read(&sent[SMB2_LOCK_HE]),
57790 - atomic_read(&failed[SMB2_LOCK_HE]));
57791 + atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
57792 + atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
57793 seq_printf(m, "\nIOCTLs: %d sent %d failed",
57794 - atomic_read(&sent[SMB2_IOCTL_HE]),
57795 - atomic_read(&failed[SMB2_IOCTL_HE]));
57796 + atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
57797 + atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
57798 seq_printf(m, "\nCancels: %d sent %d failed",
57799 - atomic_read(&sent[SMB2_CANCEL_HE]),
57800 - atomic_read(&failed[SMB2_CANCEL_HE]));
57801 + atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
57802 + atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
57803 seq_printf(m, "\nEchos: %d sent %d failed",
57804 - atomic_read(&sent[SMB2_ECHO_HE]),
57805 - atomic_read(&failed[SMB2_ECHO_HE]));
57806 + atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
57807 + atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
57808 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
57809 - atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
57810 - atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
57811 + atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
57812 + atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
57813 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
57814 - atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
57815 - atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
57816 + atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
57817 + atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
57818 seq_printf(m, "\nQueryInfos: %d sent %d failed",
57819 - atomic_read(&sent[SMB2_QUERY_INFO_HE]),
57820 - atomic_read(&failed[SMB2_QUERY_INFO_HE]));
57821 + atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
57822 + atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
57823 seq_printf(m, "\nSetInfos: %d sent %d failed",
57824 - atomic_read(&sent[SMB2_SET_INFO_HE]),
57825 - atomic_read(&failed[SMB2_SET_INFO_HE]));
57826 + atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
57827 + atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
57828 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
57829 - atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
57830 - atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
57831 + atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
57832 + atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
57833 #endif
57834 }
57835
57836 diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
57837 index 8603447..f9caeee 100644
57838 --- a/fs/cifs/smb2pdu.c
57839 +++ b/fs/cifs/smb2pdu.c
57840 @@ -2094,8 +2094,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
57841 default:
57842 cifs_dbg(VFS, "info level %u isn't supported\n",
57843 srch_inf->info_level);
57844 - rc = -EINVAL;
57845 - goto qdir_exit;
57846 + return -EINVAL;
57847 }
57848
57849 req->FileIndex = cpu_to_le32(index);
57850 diff --git a/fs/coda/cache.c b/fs/coda/cache.c
57851 index 1da168c..8bc7ff6 100644
57852 --- a/fs/coda/cache.c
57853 +++ b/fs/coda/cache.c
57854 @@ -24,7 +24,7 @@
57855 #include "coda_linux.h"
57856 #include "coda_cache.h"
57857
57858 -static atomic_t permission_epoch = ATOMIC_INIT(0);
57859 +static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
57860
57861 /* replace or extend an acl cache hit */
57862 void coda_cache_enter(struct inode *inode, int mask)
57863 @@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
57864 struct coda_inode_info *cii = ITOC(inode);
57865
57866 spin_lock(&cii->c_lock);
57867 - cii->c_cached_epoch = atomic_read(&permission_epoch);
57868 + cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
57869 if (!uid_eq(cii->c_uid, current_fsuid())) {
57870 cii->c_uid = current_fsuid();
57871 cii->c_cached_perm = mask;
57872 @@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
57873 {
57874 struct coda_inode_info *cii = ITOC(inode);
57875 spin_lock(&cii->c_lock);
57876 - cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
57877 + cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
57878 spin_unlock(&cii->c_lock);
57879 }
57880
57881 /* remove all acl caches */
57882 void coda_cache_clear_all(struct super_block *sb)
57883 {
57884 - atomic_inc(&permission_epoch);
57885 + atomic_inc_unchecked(&permission_epoch);
57886 }
57887
57888
57889 @@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
57890 spin_lock(&cii->c_lock);
57891 hit = (mask & cii->c_cached_perm) == mask &&
57892 uid_eq(cii->c_uid, current_fsuid()) &&
57893 - cii->c_cached_epoch == atomic_read(&permission_epoch);
57894 + cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
57895 spin_unlock(&cii->c_lock);
57896
57897 return hit;
57898 diff --git a/fs/compat.c b/fs/compat.c
57899 index 6af20de..fec3fbb 100644
57900 --- a/fs/compat.c
57901 +++ b/fs/compat.c
57902 @@ -54,7 +54,7 @@
57903 #include <asm/ioctls.h>
57904 #include "internal.h"
57905
57906 -int compat_log = 1;
57907 +int compat_log = 0;
57908
57909 int compat_printk(const char *fmt, ...)
57910 {
57911 @@ -488,7 +488,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
57912
57913 set_fs(KERNEL_DS);
57914 /* The __user pointer cast is valid because of the set_fs() */
57915 - ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
57916 + ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
57917 set_fs(oldfs);
57918 /* truncating is ok because it's a user address */
57919 if (!ret)
57920 @@ -546,7 +546,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
57921 goto out;
57922
57923 ret = -EINVAL;
57924 - if (nr_segs > UIO_MAXIOV || nr_segs < 0)
57925 + if (nr_segs > UIO_MAXIOV)
57926 goto out;
57927 if (nr_segs > fast_segs) {
57928 ret = -ENOMEM;
57929 @@ -834,6 +834,7 @@ struct compat_old_linux_dirent {
57930 struct compat_readdir_callback {
57931 struct dir_context ctx;
57932 struct compat_old_linux_dirent __user *dirent;
57933 + struct file * file;
57934 int result;
57935 };
57936
57937 @@ -851,6 +852,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
57938 buf->result = -EOVERFLOW;
57939 return -EOVERFLOW;
57940 }
57941 +
57942 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
57943 + return 0;
57944 +
57945 buf->result++;
57946 dirent = buf->dirent;
57947 if (!access_ok(VERIFY_WRITE, dirent,
57948 @@ -882,6 +887,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
57949 if (!f.file)
57950 return -EBADF;
57951
57952 + buf.file = f.file;
57953 error = iterate_dir(f.file, &buf.ctx);
57954 if (buf.result)
57955 error = buf.result;
57956 @@ -901,6 +907,7 @@ struct compat_getdents_callback {
57957 struct dir_context ctx;
57958 struct compat_linux_dirent __user *current_dir;
57959 struct compat_linux_dirent __user *previous;
57960 + struct file * file;
57961 int count;
57962 int error;
57963 };
57964 @@ -922,6 +929,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
57965 buf->error = -EOVERFLOW;
57966 return -EOVERFLOW;
57967 }
57968 +
57969 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
57970 + return 0;
57971 +
57972 dirent = buf->previous;
57973 if (dirent) {
57974 if (__put_user(offset, &dirent->d_off))
57975 @@ -967,6 +978,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
57976 if (!f.file)
57977 return -EBADF;
57978
57979 + buf.file = f.file;
57980 error = iterate_dir(f.file, &buf.ctx);
57981 if (error >= 0)
57982 error = buf.error;
57983 @@ -987,6 +999,7 @@ struct compat_getdents_callback64 {
57984 struct dir_context ctx;
57985 struct linux_dirent64 __user *current_dir;
57986 struct linux_dirent64 __user *previous;
57987 + struct file * file;
57988 int count;
57989 int error;
57990 };
57991 @@ -1003,6 +1016,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
57992 buf->error = -EINVAL; /* only used if we fail.. */
57993 if (reclen > buf->count)
57994 return -EINVAL;
57995 +
57996 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
57997 + return 0;
57998 +
57999 dirent = buf->previous;
58000
58001 if (dirent) {
58002 @@ -1052,6 +1069,7 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
58003 if (!f.file)
58004 return -EBADF;
58005
58006 + buf.file = f.file;
58007 error = iterate_dir(f.file, &buf.ctx);
58008 if (error >= 0)
58009 error = buf.error;
58010 diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
58011 index a81147e..20bf2b5 100644
58012 --- a/fs/compat_binfmt_elf.c
58013 +++ b/fs/compat_binfmt_elf.c
58014 @@ -30,11 +30,13 @@
58015 #undef elf_phdr
58016 #undef elf_shdr
58017 #undef elf_note
58018 +#undef elf_dyn
58019 #undef elf_addr_t
58020 #define elfhdr elf32_hdr
58021 #define elf_phdr elf32_phdr
58022 #define elf_shdr elf32_shdr
58023 #define elf_note elf32_note
58024 +#define elf_dyn Elf32_Dyn
58025 #define elf_addr_t Elf32_Addr
58026
58027 /*
58028 diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
58029 index 3881610..ab3df0b 100644
58030 --- a/fs/compat_ioctl.c
58031 +++ b/fs/compat_ioctl.c
58032 @@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
58033 return -EFAULT;
58034 if (__get_user(udata, &ss32->iomem_base))
58035 return -EFAULT;
58036 - ss.iomem_base = compat_ptr(udata);
58037 + ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
58038 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
58039 __get_user(ss.port_high, &ss32->port_high))
58040 return -EFAULT;
58041 @@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
58042 for (i = 0; i < nmsgs; i++) {
58043 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
58044 return -EFAULT;
58045 - if (get_user(datap, &umsgs[i].buf) ||
58046 - put_user(compat_ptr(datap), &tmsgs[i].buf))
58047 + if (get_user(datap, (u8 __user * __user *)&umsgs[i].buf) ||
58048 + put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
58049 return -EFAULT;
58050 }
58051 return sys_ioctl(fd, cmd, (unsigned long)tdata);
58052 @@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
58053 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
58054 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
58055 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
58056 - copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
58057 + copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
58058 return -EFAULT;
58059
58060 return ioctl_preallocate(file, p);
58061 @@ -1617,8 +1617,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
58062 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
58063 {
58064 unsigned int a, b;
58065 - a = *(unsigned int *)p;
58066 - b = *(unsigned int *)q;
58067 + a = *(const unsigned int *)p;
58068 + b = *(const unsigned int *)q;
58069 if (a > b)
58070 return 1;
58071 if (a < b)
58072 diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
58073 index e081acb..911df21 100644
58074 --- a/fs/configfs/dir.c
58075 +++ b/fs/configfs/dir.c
58076 @@ -1548,7 +1548,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
58077 }
58078 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
58079 struct configfs_dirent *next;
58080 - const char *name;
58081 + const unsigned char * name;
58082 + char d_name[sizeof(next->s_dentry->d_iname)];
58083 int len;
58084 struct inode *inode = NULL;
58085
58086 @@ -1557,7 +1558,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
58087 continue;
58088
58089 name = configfs_get_name(next);
58090 - len = strlen(name);
58091 + if (next->s_dentry && name == next->s_dentry->d_iname) {
58092 + len = next->s_dentry->d_name.len;
58093 + memcpy(d_name, name, len);
58094 + name = d_name;
58095 + } else
58096 + len = strlen(name);
58097
58098 /*
58099 * We'll have a dentry and an inode for
58100 diff --git a/fs/coredump.c b/fs/coredump.c
58101 index e3ad709..836c55f 100644
58102 --- a/fs/coredump.c
58103 +++ b/fs/coredump.c
58104 @@ -73,10 +73,15 @@ static int expand_corename(struct core_name *cn, int size)
58105 static int cn_vprintf(struct core_name *cn, const char *fmt, va_list arg)
58106 {
58107 int free, need;
58108 + va_list arg_copy;
58109
58110 again:
58111 free = cn->size - cn->used;
58112 - need = vsnprintf(cn->corename + cn->used, free, fmt, arg);
58113 +
58114 + va_copy(arg_copy, arg);
58115 + need = vsnprintf(cn->corename + cn->used, free, fmt, arg_copy);
58116 + va_end(arg_copy);
58117 +
58118 if (need < free) {
58119 cn->used += need;
58120 return 0;
58121 @@ -437,8 +442,8 @@ static void wait_for_dump_helpers(struct file *file)
58122 struct pipe_inode_info *pipe = file->private_data;
58123
58124 pipe_lock(pipe);
58125 - pipe->readers++;
58126 - pipe->writers--;
58127 + atomic_inc(&pipe->readers);
58128 + atomic_dec(&pipe->writers);
58129 wake_up_interruptible_sync(&pipe->wait);
58130 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
58131 pipe_unlock(pipe);
58132 @@ -447,11 +452,11 @@ static void wait_for_dump_helpers(struct file *file)
58133 * We actually want wait_event_freezable() but then we need
58134 * to clear TIF_SIGPENDING and improve dump_interrupted().
58135 */
58136 - wait_event_interruptible(pipe->wait, pipe->readers == 1);
58137 + wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
58138
58139 pipe_lock(pipe);
58140 - pipe->readers--;
58141 - pipe->writers++;
58142 + atomic_dec(&pipe->readers);
58143 + atomic_inc(&pipe->writers);
58144 pipe_unlock(pipe);
58145 }
58146
58147 @@ -498,7 +503,9 @@ void do_coredump(const siginfo_t *siginfo)
58148 struct files_struct *displaced;
58149 bool need_nonrelative = false;
58150 bool core_dumped = false;
58151 - static atomic_t core_dump_count = ATOMIC_INIT(0);
58152 + static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
58153 + long signr = siginfo->si_signo;
58154 + int dumpable;
58155 struct coredump_params cprm = {
58156 .siginfo = siginfo,
58157 .regs = signal_pt_regs(),
58158 @@ -511,12 +518,17 @@ void do_coredump(const siginfo_t *siginfo)
58159 .mm_flags = mm->flags,
58160 };
58161
58162 - audit_core_dumps(siginfo->si_signo);
58163 + audit_core_dumps(signr);
58164 +
58165 + dumpable = __get_dumpable(cprm.mm_flags);
58166 +
58167 + if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
58168 + gr_handle_brute_attach(dumpable);
58169
58170 binfmt = mm->binfmt;
58171 if (!binfmt || !binfmt->core_dump)
58172 goto fail;
58173 - if (!__get_dumpable(cprm.mm_flags))
58174 + if (!dumpable)
58175 goto fail;
58176
58177 cred = prepare_creds();
58178 @@ -535,7 +547,7 @@ void do_coredump(const siginfo_t *siginfo)
58179 need_nonrelative = true;
58180 }
58181
58182 - retval = coredump_wait(siginfo->si_signo, &core_state);
58183 + retval = coredump_wait(signr, &core_state);
58184 if (retval < 0)
58185 goto fail_creds;
58186
58187 @@ -578,7 +590,7 @@ void do_coredump(const siginfo_t *siginfo)
58188 }
58189 cprm.limit = RLIM_INFINITY;
58190
58191 - dump_count = atomic_inc_return(&core_dump_count);
58192 + dump_count = atomic_inc_return_unchecked(&core_dump_count);
58193 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
58194 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
58195 task_tgid_vnr(current), current->comm);
58196 @@ -610,6 +622,8 @@ void do_coredump(const siginfo_t *siginfo)
58197 } else {
58198 struct inode *inode;
58199
58200 + gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
58201 +
58202 if (cprm.limit < binfmt->min_coredump)
58203 goto fail_unlock;
58204
58205 @@ -668,7 +682,7 @@ close_fail:
58206 filp_close(cprm.file, NULL);
58207 fail_dropcount:
58208 if (ispipe)
58209 - atomic_dec(&core_dump_count);
58210 + atomic_dec_unchecked(&core_dump_count);
58211 fail_unlock:
58212 kfree(cn.corename);
58213 coredump_finish(mm, core_dumped);
58214 @@ -689,6 +703,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
58215 struct file *file = cprm->file;
58216 loff_t pos = file->f_pos;
58217 ssize_t n;
58218 +
58219 + gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
58220 if (cprm->written + nr > cprm->limit)
58221 return 0;
58222 while (nr) {
58223 diff --git a/fs/dcache.c b/fs/dcache.c
58224 index ca02c13..7e2b581 100644
58225 --- a/fs/dcache.c
58226 +++ b/fs/dcache.c
58227 @@ -1495,7 +1495,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
58228 */
58229 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
58230 if (name->len > DNAME_INLINE_LEN-1) {
58231 - dname = kmalloc(name->len + 1, GFP_KERNEL);
58232 + dname = kmalloc(round_up(name->len + 1, sizeof(unsigned long)), GFP_KERNEL);
58233 if (!dname) {
58234 kmem_cache_free(dentry_cache, dentry);
58235 return NULL;
58236 @@ -3431,7 +3431,8 @@ void __init vfs_caches_init(unsigned long mempages)
58237 mempages -= reserve;
58238
58239 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
58240 - SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
58241 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
58242 + SLAB_NO_SANITIZE, NULL);
58243
58244 dcache_init();
58245 inode_init();
58246 diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
58247 index 9c0444c..628490c 100644
58248 --- a/fs/debugfs/inode.c
58249 +++ b/fs/debugfs/inode.c
58250 @@ -415,7 +415,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
58251 */
58252 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
58253 {
58254 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
58255 + return __create_file(name, S_IFDIR | S_IRWXU,
58256 +#else
58257 return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
58258 +#endif
58259 parent, NULL, NULL);
58260 }
58261 EXPORT_SYMBOL_GPL(debugfs_create_dir);
58262 diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
58263 index b167ca4..a224e19 100644
58264 --- a/fs/ecryptfs/inode.c
58265 +++ b/fs/ecryptfs/inode.c
58266 @@ -673,7 +673,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
58267 old_fs = get_fs();
58268 set_fs(get_ds());
58269 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
58270 - (char __user *)lower_buf,
58271 + (char __force_user *)lower_buf,
58272 PATH_MAX);
58273 set_fs(old_fs);
58274 if (rc < 0)
58275 diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
58276 index e4141f2..d8263e8 100644
58277 --- a/fs/ecryptfs/miscdev.c
58278 +++ b/fs/ecryptfs/miscdev.c
58279 @@ -304,7 +304,7 @@ check_list:
58280 goto out_unlock_msg_ctx;
58281 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
58282 if (msg_ctx->msg) {
58283 - if (copy_to_user(&buf[i], packet_length, packet_length_size))
58284 + if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
58285 goto out_unlock_msg_ctx;
58286 i += packet_length_size;
58287 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
58288 diff --git a/fs/exec.c b/fs/exec.c
58289 index 3d78fcc..5a38b6b 100644
58290 --- a/fs/exec.c
58291 +++ b/fs/exec.c
58292 @@ -55,8 +55,20 @@
58293 #include <linux/pipe_fs_i.h>
58294 #include <linux/oom.h>
58295 #include <linux/compat.h>
58296 +#include <linux/random.h>
58297 +#include <linux/seq_file.h>
58298 +#include <linux/coredump.h>
58299 +#include <linux/mman.h>
58300 +
58301 +#ifdef CONFIG_PAX_REFCOUNT
58302 +#include <linux/kallsyms.h>
58303 +#include <linux/kdebug.h>
58304 +#endif
58305 +
58306 +#include <trace/events/fs.h>
58307
58308 #include <asm/uaccess.h>
58309 +#include <asm/sections.h>
58310 #include <asm/mmu_context.h>
58311 #include <asm/tlb.h>
58312
58313 @@ -65,19 +77,34 @@
58314
58315 #include <trace/events/sched.h>
58316
58317 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
58318 +void __weak pax_set_initial_flags(struct linux_binprm *bprm)
58319 +{
58320 + 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");
58321 +}
58322 +#endif
58323 +
58324 +#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
58325 +void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
58326 +EXPORT_SYMBOL(pax_set_initial_flags_func);
58327 +#endif
58328 +
58329 int suid_dumpable = 0;
58330
58331 static LIST_HEAD(formats);
58332 static DEFINE_RWLOCK(binfmt_lock);
58333
58334 +extern int gr_process_kernel_exec_ban(void);
58335 +extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
58336 +
58337 void __register_binfmt(struct linux_binfmt * fmt, int insert)
58338 {
58339 BUG_ON(!fmt);
58340 if (WARN_ON(!fmt->load_binary))
58341 return;
58342 write_lock(&binfmt_lock);
58343 - insert ? list_add(&fmt->lh, &formats) :
58344 - list_add_tail(&fmt->lh, &formats);
58345 + insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
58346 + pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
58347 write_unlock(&binfmt_lock);
58348 }
58349
58350 @@ -86,7 +113,7 @@ EXPORT_SYMBOL(__register_binfmt);
58351 void unregister_binfmt(struct linux_binfmt * fmt)
58352 {
58353 write_lock(&binfmt_lock);
58354 - list_del(&fmt->lh);
58355 + pax_list_del((struct list_head *)&fmt->lh);
58356 write_unlock(&binfmt_lock);
58357 }
58358
58359 @@ -180,18 +207,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
58360 int write)
58361 {
58362 struct page *page;
58363 - int ret;
58364
58365 -#ifdef CONFIG_STACK_GROWSUP
58366 - if (write) {
58367 - ret = expand_downwards(bprm->vma, pos);
58368 - if (ret < 0)
58369 - return NULL;
58370 - }
58371 -#endif
58372 - ret = get_user_pages(current, bprm->mm, pos,
58373 - 1, write, 1, &page, NULL);
58374 - if (ret <= 0)
58375 + if (0 > expand_downwards(bprm->vma, pos))
58376 + return NULL;
58377 + if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
58378 return NULL;
58379
58380 if (write) {
58381 @@ -207,6 +226,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
58382 if (size <= ARG_MAX)
58383 return page;
58384
58385 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58386 + // only allow 512KB for argv+env on suid/sgid binaries
58387 + // to prevent easy ASLR exhaustion
58388 + if (((!uid_eq(bprm->cred->euid, current_euid())) ||
58389 + (!gid_eq(bprm->cred->egid, current_egid()))) &&
58390 + (size > (512 * 1024))) {
58391 + put_page(page);
58392 + return NULL;
58393 + }
58394 +#endif
58395 +
58396 /*
58397 * Limit to 1/4-th the stack size for the argv+env strings.
58398 * This ensures that:
58399 @@ -266,6 +296,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
58400 vma->vm_end = STACK_TOP_MAX;
58401 vma->vm_start = vma->vm_end - PAGE_SIZE;
58402 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
58403 +
58404 +#ifdef CONFIG_PAX_SEGMEXEC
58405 + vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
58406 +#endif
58407 +
58408 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
58409 INIT_LIST_HEAD(&vma->anon_vma_chain);
58410
58411 @@ -276,6 +311,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
58412 mm->stack_vm = mm->total_vm = 1;
58413 up_write(&mm->mmap_sem);
58414 bprm->p = vma->vm_end - sizeof(void *);
58415 +
58416 +#ifdef CONFIG_PAX_RANDUSTACK
58417 + if (randomize_va_space)
58418 + bprm->p ^= prandom_u32() & ~PAGE_MASK;
58419 +#endif
58420 +
58421 return 0;
58422 err:
58423 up_write(&mm->mmap_sem);
58424 @@ -396,7 +437,7 @@ struct user_arg_ptr {
58425 } ptr;
58426 };
58427
58428 -static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
58429 +const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
58430 {
58431 const char __user *native;
58432
58433 @@ -405,14 +446,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
58434 compat_uptr_t compat;
58435
58436 if (get_user(compat, argv.ptr.compat + nr))
58437 - return ERR_PTR(-EFAULT);
58438 + return (const char __force_user *)ERR_PTR(-EFAULT);
58439
58440 return compat_ptr(compat);
58441 }
58442 #endif
58443
58444 if (get_user(native, argv.ptr.native + nr))
58445 - return ERR_PTR(-EFAULT);
58446 + return (const char __force_user *)ERR_PTR(-EFAULT);
58447
58448 return native;
58449 }
58450 @@ -431,7 +472,7 @@ static int count(struct user_arg_ptr argv, int max)
58451 if (!p)
58452 break;
58453
58454 - if (IS_ERR(p))
58455 + if (IS_ERR((const char __force_kernel *)p))
58456 return -EFAULT;
58457
58458 if (i >= max)
58459 @@ -466,7 +507,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
58460
58461 ret = -EFAULT;
58462 str = get_user_arg_ptr(argv, argc);
58463 - if (IS_ERR(str))
58464 + if (IS_ERR((const char __force_kernel *)str))
58465 goto out;
58466
58467 len = strnlen_user(str, MAX_ARG_STRLEN);
58468 @@ -548,7 +589,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
58469 int r;
58470 mm_segment_t oldfs = get_fs();
58471 struct user_arg_ptr argv = {
58472 - .ptr.native = (const char __user *const __user *)__argv,
58473 + .ptr.native = (const char __user * const __force_user *)__argv,
58474 };
58475
58476 set_fs(KERNEL_DS);
58477 @@ -583,7 +624,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
58478 unsigned long new_end = old_end - shift;
58479 struct mmu_gather tlb;
58480
58481 - BUG_ON(new_start > new_end);
58482 + if (new_start >= new_end || new_start < mmap_min_addr)
58483 + return -ENOMEM;
58484
58485 /*
58486 * ensure there are no vmas between where we want to go
58487 @@ -592,6 +634,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
58488 if (vma != find_vma(mm, new_start))
58489 return -EFAULT;
58490
58491 +#ifdef CONFIG_PAX_SEGMEXEC
58492 + BUG_ON(pax_find_mirror_vma(vma));
58493 +#endif
58494 +
58495 /*
58496 * cover the whole range: [new_start, old_end)
58497 */
58498 @@ -672,10 +718,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
58499 stack_top = arch_align_stack(stack_top);
58500 stack_top = PAGE_ALIGN(stack_top);
58501
58502 - if (unlikely(stack_top < mmap_min_addr) ||
58503 - unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
58504 - return -ENOMEM;
58505 -
58506 stack_shift = vma->vm_end - stack_top;
58507
58508 bprm->p -= stack_shift;
58509 @@ -687,8 +729,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
58510 bprm->exec -= stack_shift;
58511
58512 down_write(&mm->mmap_sem);
58513 +
58514 + /* Move stack pages down in memory. */
58515 + if (stack_shift) {
58516 + ret = shift_arg_pages(vma, stack_shift);
58517 + if (ret)
58518 + goto out_unlock;
58519 + }
58520 +
58521 vm_flags = VM_STACK_FLAGS;
58522
58523 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
58524 + if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58525 + vm_flags &= ~VM_EXEC;
58526 +
58527 +#ifdef CONFIG_PAX_MPROTECT
58528 + if (mm->pax_flags & MF_PAX_MPROTECT)
58529 + vm_flags &= ~VM_MAYEXEC;
58530 +#endif
58531 +
58532 + }
58533 +#endif
58534 +
58535 /*
58536 * Adjust stack execute permissions; explicitly enable for
58537 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
58538 @@ -707,13 +769,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
58539 goto out_unlock;
58540 BUG_ON(prev != vma);
58541
58542 - /* Move stack pages down in memory. */
58543 - if (stack_shift) {
58544 - ret = shift_arg_pages(vma, stack_shift);
58545 - if (ret)
58546 - goto out_unlock;
58547 - }
58548 -
58549 /* mprotect_fixup is overkill to remove the temporary stack flags */
58550 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
58551
58552 @@ -737,6 +792,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
58553 #endif
58554 current->mm->start_stack = bprm->p;
58555 ret = expand_stack(vma, stack_base);
58556 +
58557 +#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
58558 + if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
58559 + unsigned long size;
58560 + vm_flags_t vm_flags;
58561 +
58562 + size = STACK_TOP - vma->vm_end;
58563 + vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
58564 +
58565 + ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
58566 +
58567 +#ifdef CONFIG_X86
58568 + if (!ret) {
58569 + size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
58570 + ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
58571 + }
58572 +#endif
58573 +
58574 + }
58575 +#endif
58576 +
58577 if (ret)
58578 ret = -EFAULT;
58579
58580 @@ -772,6 +848,8 @@ static struct file *do_open_exec(struct filename *name)
58581
58582 fsnotify_open(file);
58583
58584 + trace_open_exec(name->name);
58585 +
58586 err = deny_write_access(file);
58587 if (err)
58588 goto exit;
58589 @@ -801,7 +879,7 @@ int kernel_read(struct file *file, loff_t offset,
58590 old_fs = get_fs();
58591 set_fs(get_ds());
58592 /* The cast to a user pointer is valid due to the set_fs() */
58593 - result = vfs_read(file, (void __user *)addr, count, &pos);
58594 + result = vfs_read(file, (void __force_user *)addr, count, &pos);
58595 set_fs(old_fs);
58596 return result;
58597 }
58598 @@ -1258,7 +1336,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
58599 }
58600 rcu_read_unlock();
58601
58602 - if (p->fs->users > n_fs)
58603 + if (atomic_read(&p->fs->users) > n_fs)
58604 bprm->unsafe |= LSM_UNSAFE_SHARE;
58605 else
58606 p->fs->in_exec = 1;
58607 @@ -1434,6 +1512,31 @@ static int exec_binprm(struct linux_binprm *bprm)
58608 return ret;
58609 }
58610
58611 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58612 +static DEFINE_PER_CPU(u64, exec_counter);
58613 +static int __init init_exec_counters(void)
58614 +{
58615 + unsigned int cpu;
58616 +
58617 + for_each_possible_cpu(cpu) {
58618 + per_cpu(exec_counter, cpu) = (u64)cpu;
58619 + }
58620 +
58621 + return 0;
58622 +}
58623 +early_initcall(init_exec_counters);
58624 +static inline void increment_exec_counter(void)
58625 +{
58626 + BUILD_BUG_ON(NR_CPUS > (1 << 16));
58627 + current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
58628 +}
58629 +#else
58630 +static inline void increment_exec_counter(void) {}
58631 +#endif
58632 +
58633 +extern void gr_handle_exec_args(struct linux_binprm *bprm,
58634 + struct user_arg_ptr argv);
58635 +
58636 /*
58637 * sys_execve() executes a new program.
58638 */
58639 @@ -1441,6 +1544,11 @@ static int do_execve_common(struct filename *filename,
58640 struct user_arg_ptr argv,
58641 struct user_arg_ptr envp)
58642 {
58643 +#ifdef CONFIG_GRKERNSEC
58644 + struct file *old_exec_file;
58645 + struct acl_subject_label *old_acl;
58646 + struct rlimit old_rlim[RLIM_NLIMITS];
58647 +#endif
58648 struct linux_binprm *bprm;
58649 struct file *file;
58650 struct files_struct *displaced;
58651 @@ -1449,6 +1557,8 @@ static int do_execve_common(struct filename *filename,
58652 if (IS_ERR(filename))
58653 return PTR_ERR(filename);
58654
58655 + gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
58656 +
58657 /*
58658 * We move the actual failure in case of RLIMIT_NPROC excess from
58659 * set*uid() to execve() because too many poorly written programs
58660 @@ -1486,11 +1596,21 @@ static int do_execve_common(struct filename *filename,
58661 if (IS_ERR(file))
58662 goto out_unmark;
58663
58664 + if (gr_ptrace_readexec(file, bprm->unsafe)) {
58665 + retval = -EPERM;
58666 + goto out_unmark;
58667 + }
58668 +
58669 sched_exec();
58670
58671 bprm->file = file;
58672 bprm->filename = bprm->interp = filename->name;
58673
58674 + if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
58675 + retval = -EACCES;
58676 + goto out_unmark;
58677 + }
58678 +
58679 retval = bprm_mm_init(bprm);
58680 if (retval)
58681 goto out_unmark;
58682 @@ -1507,24 +1627,70 @@ static int do_execve_common(struct filename *filename,
58683 if (retval < 0)
58684 goto out;
58685
58686 +#ifdef CONFIG_GRKERNSEC
58687 + old_acl = current->acl;
58688 + memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
58689 + old_exec_file = current->exec_file;
58690 + get_file(file);
58691 + current->exec_file = file;
58692 +#endif
58693 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58694 + /* limit suid stack to 8MB
58695 + * we saved the old limits above and will restore them if this exec fails
58696 + */
58697 + if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
58698 + (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
58699 + current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
58700 +#endif
58701 +
58702 + if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
58703 + retval = -EPERM;
58704 + goto out_fail;
58705 + }
58706 +
58707 + if (!gr_tpe_allow(file)) {
58708 + retval = -EACCES;
58709 + goto out_fail;
58710 + }
58711 +
58712 + if (gr_check_crash_exec(file)) {
58713 + retval = -EACCES;
58714 + goto out_fail;
58715 + }
58716 +
58717 + retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
58718 + bprm->unsafe);
58719 + if (retval < 0)
58720 + goto out_fail;
58721 +
58722 retval = copy_strings_kernel(1, &bprm->filename, bprm);
58723 if (retval < 0)
58724 - goto out;
58725 + goto out_fail;
58726
58727 bprm->exec = bprm->p;
58728 retval = copy_strings(bprm->envc, envp, bprm);
58729 if (retval < 0)
58730 - goto out;
58731 + goto out_fail;
58732
58733 retval = copy_strings(bprm->argc, argv, bprm);
58734 if (retval < 0)
58735 - goto out;
58736 + goto out_fail;
58737 +
58738 + gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
58739 +
58740 + gr_handle_exec_args(bprm, argv);
58741
58742 retval = exec_binprm(bprm);
58743 if (retval < 0)
58744 - goto out;
58745 + goto out_fail;
58746 +#ifdef CONFIG_GRKERNSEC
58747 + if (old_exec_file)
58748 + fput(old_exec_file);
58749 +#endif
58750
58751 /* execve succeeded */
58752 +
58753 + increment_exec_counter();
58754 current->fs->in_exec = 0;
58755 current->in_execve = 0;
58756 acct_update_integrals(current);
58757 @@ -1535,6 +1701,14 @@ static int do_execve_common(struct filename *filename,
58758 put_files_struct(displaced);
58759 return retval;
58760
58761 +out_fail:
58762 +#ifdef CONFIG_GRKERNSEC
58763 + current->acl = old_acl;
58764 + memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
58765 + fput(current->exec_file);
58766 + current->exec_file = old_exec_file;
58767 +#endif
58768 +
58769 out:
58770 if (bprm->mm) {
58771 acct_arg_size(bprm, 0);
58772 @@ -1626,3 +1800,295 @@ asmlinkage long compat_sys_execve(const char __user * filename,
58773 return compat_do_execve(getname(filename), argv, envp);
58774 }
58775 #endif
58776 +
58777 +int pax_check_flags(unsigned long *flags)
58778 +{
58779 + int retval = 0;
58780 +
58781 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
58782 + if (*flags & MF_PAX_SEGMEXEC)
58783 + {
58784 + *flags &= ~MF_PAX_SEGMEXEC;
58785 + retval = -EINVAL;
58786 + }
58787 +#endif
58788 +
58789 + if ((*flags & MF_PAX_PAGEEXEC)
58790 +
58791 +#ifdef CONFIG_PAX_PAGEEXEC
58792 + && (*flags & MF_PAX_SEGMEXEC)
58793 +#endif
58794 +
58795 + )
58796 + {
58797 + *flags &= ~MF_PAX_PAGEEXEC;
58798 + retval = -EINVAL;
58799 + }
58800 +
58801 + if ((*flags & MF_PAX_MPROTECT)
58802 +
58803 +#ifdef CONFIG_PAX_MPROTECT
58804 + && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
58805 +#endif
58806 +
58807 + )
58808 + {
58809 + *flags &= ~MF_PAX_MPROTECT;
58810 + retval = -EINVAL;
58811 + }
58812 +
58813 + if ((*flags & MF_PAX_EMUTRAMP)
58814 +
58815 +#ifdef CONFIG_PAX_EMUTRAMP
58816 + && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
58817 +#endif
58818 +
58819 + )
58820 + {
58821 + *flags &= ~MF_PAX_EMUTRAMP;
58822 + retval = -EINVAL;
58823 + }
58824 +
58825 + return retval;
58826 +}
58827 +
58828 +EXPORT_SYMBOL(pax_check_flags);
58829 +
58830 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
58831 +char *pax_get_path(const struct path *path, char *buf, int buflen)
58832 +{
58833 + char *pathname = d_path(path, buf, buflen);
58834 +
58835 + if (IS_ERR(pathname))
58836 + goto toolong;
58837 +
58838 + pathname = mangle_path(buf, pathname, "\t\n\\");
58839 + if (!pathname)
58840 + goto toolong;
58841 +
58842 + *pathname = 0;
58843 + return buf;
58844 +
58845 +toolong:
58846 + return "<path too long>";
58847 +}
58848 +EXPORT_SYMBOL(pax_get_path);
58849 +
58850 +void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
58851 +{
58852 + struct task_struct *tsk = current;
58853 + struct mm_struct *mm = current->mm;
58854 + char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
58855 + char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
58856 + char *path_exec = NULL;
58857 + char *path_fault = NULL;
58858 + unsigned long start = 0UL, end = 0UL, offset = 0UL;
58859 + siginfo_t info = { };
58860 +
58861 + if (buffer_exec && buffer_fault) {
58862 + struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
58863 +
58864 + down_read(&mm->mmap_sem);
58865 + vma = mm->mmap;
58866 + while (vma && (!vma_exec || !vma_fault)) {
58867 + if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
58868 + vma_exec = vma;
58869 + if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
58870 + vma_fault = vma;
58871 + vma = vma->vm_next;
58872 + }
58873 + if (vma_exec)
58874 + path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
58875 + if (vma_fault) {
58876 + start = vma_fault->vm_start;
58877 + end = vma_fault->vm_end;
58878 + offset = vma_fault->vm_pgoff << PAGE_SHIFT;
58879 + if (vma_fault->vm_file)
58880 + path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
58881 + else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
58882 + path_fault = "<heap>";
58883 + else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
58884 + path_fault = "<stack>";
58885 + else
58886 + path_fault = "<anonymous mapping>";
58887 + }
58888 + up_read(&mm->mmap_sem);
58889 + }
58890 + if (tsk->signal->curr_ip)
58891 + printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
58892 + else
58893 + printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
58894 + 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),
58895 + from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
58896 + free_page((unsigned long)buffer_exec);
58897 + free_page((unsigned long)buffer_fault);
58898 + pax_report_insns(regs, pc, sp);
58899 + info.si_signo = SIGKILL;
58900 + info.si_errno = 0;
58901 + info.si_code = SI_KERNEL;
58902 + info.si_pid = 0;
58903 + info.si_uid = 0;
58904 + do_coredump(&info);
58905 +}
58906 +#endif
58907 +
58908 +#ifdef CONFIG_PAX_REFCOUNT
58909 +void pax_report_refcount_overflow(struct pt_regs *regs)
58910 +{
58911 + if (current->signal->curr_ip)
58912 + printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
58913 + &current->signal->curr_ip, current->comm, task_pid_nr(current),
58914 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
58915 + else
58916 + printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
58917 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
58918 + print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
58919 + preempt_disable();
58920 + show_regs(regs);
58921 + preempt_enable();
58922 + force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
58923 +}
58924 +#endif
58925 +
58926 +#ifdef CONFIG_PAX_USERCOPY
58927 +/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
58928 +static noinline int check_stack_object(const void *obj, unsigned long len)
58929 +{
58930 + const void * const stack = task_stack_page(current);
58931 + const void * const stackend = stack + THREAD_SIZE;
58932 +
58933 +#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
58934 + const void *frame = NULL;
58935 + const void *oldframe;
58936 +#endif
58937 +
58938 + if (obj + len < obj)
58939 + return -1;
58940 +
58941 + if (obj + len <= stack || stackend <= obj)
58942 + return 0;
58943 +
58944 + if (obj < stack || stackend < obj + len)
58945 + return -1;
58946 +
58947 +#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
58948 + oldframe = __builtin_frame_address(1);
58949 + if (oldframe)
58950 + frame = __builtin_frame_address(2);
58951 + /*
58952 + low ----------------------------------------------> high
58953 + [saved bp][saved ip][args][local vars][saved bp][saved ip]
58954 + ^----------------^
58955 + allow copies only within here
58956 + */
58957 + while (stack <= frame && frame < stackend) {
58958 + /* if obj + len extends past the last frame, this
58959 + check won't pass and the next frame will be 0,
58960 + causing us to bail out and correctly report
58961 + the copy as invalid
58962 + */
58963 + if (obj + len <= frame)
58964 + return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
58965 + oldframe = frame;
58966 + frame = *(const void * const *)frame;
58967 + }
58968 + return -1;
58969 +#else
58970 + return 1;
58971 +#endif
58972 +}
58973 +
58974 +static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
58975 +{
58976 + if (current->signal->curr_ip)
58977 + printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
58978 + &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
58979 + else
58980 + printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
58981 + to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
58982 + dump_stack();
58983 + gr_handle_kernel_exploit();
58984 + do_group_exit(SIGKILL);
58985 +}
58986 +#endif
58987 +
58988 +#ifdef CONFIG_PAX_USERCOPY
58989 +static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
58990 +{
58991 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
58992 + unsigned long textlow = ktla_ktva((unsigned long)_stext);
58993 +#ifdef CONFIG_MODULES
58994 + unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
58995 +#else
58996 + unsigned long texthigh = ktla_ktva((unsigned long)_etext);
58997 +#endif
58998 +
58999 +#else
59000 + unsigned long textlow = (unsigned long)_stext;
59001 + unsigned long texthigh = (unsigned long)_etext;
59002 +
59003 +#ifdef CONFIG_X86_64
59004 + /* check against linear mapping as well */
59005 + if (high > (unsigned long)__va(__pa(textlow)) &&
59006 + low < (unsigned long)__va(__pa(texthigh)))
59007 + return true;
59008 +#endif
59009 +
59010 +#endif
59011 +
59012 + if (high <= textlow || low >= texthigh)
59013 + return false;
59014 + else
59015 + return true;
59016 +}
59017 +#endif
59018 +
59019 +void __check_object_size(const void *ptr, unsigned long n, bool to_user)
59020 +{
59021 +
59022 +#ifdef CONFIG_PAX_USERCOPY
59023 + const char *type;
59024 +
59025 + if (!n)
59026 + return;
59027 +
59028 + type = check_heap_object(ptr, n);
59029 + if (!type) {
59030 + int ret = check_stack_object(ptr, n);
59031 + if (ret == 1 || ret == 2)
59032 + return;
59033 + if (ret == 0) {
59034 + if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
59035 + type = "<kernel text>";
59036 + else
59037 + return;
59038 + } else
59039 + type = "<process stack>";
59040 + }
59041 +
59042 + pax_report_usercopy(ptr, n, to_user, type);
59043 +#endif
59044 +
59045 +}
59046 +EXPORT_SYMBOL(__check_object_size);
59047 +
59048 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
59049 +void pax_track_stack(void)
59050 +{
59051 + unsigned long sp = (unsigned long)&sp;
59052 + if (sp < current_thread_info()->lowest_stack &&
59053 + sp > (unsigned long)task_stack_page(current))
59054 + current_thread_info()->lowest_stack = sp;
59055 +}
59056 +EXPORT_SYMBOL(pax_track_stack);
59057 +#endif
59058 +
59059 +#ifdef CONFIG_PAX_SIZE_OVERFLOW
59060 +void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
59061 +{
59062 + printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
59063 + dump_stack();
59064 + do_group_exit(SIGKILL);
59065 +}
59066 +EXPORT_SYMBOL(report_size_overflow);
59067 +#endif
59068 diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
59069 index 9f9992b..8b59411 100644
59070 --- a/fs/ext2/balloc.c
59071 +++ b/fs/ext2/balloc.c
59072 @@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
59073
59074 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
59075 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
59076 - if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
59077 + if (free_blocks < root_blocks + 1 &&
59078 !uid_eq(sbi->s_resuid, current_fsuid()) &&
59079 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
59080 - !in_group_p (sbi->s_resgid))) {
59081 + !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
59082 return 0;
59083 }
59084 return 1;
59085 diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
59086 index 9142614..97484fa 100644
59087 --- a/fs/ext2/xattr.c
59088 +++ b/fs/ext2/xattr.c
59089 @@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
59090 struct buffer_head *bh = NULL;
59091 struct ext2_xattr_entry *entry;
59092 char *end;
59093 - size_t rest = buffer_size;
59094 + size_t rest = buffer_size, total_size = 0;
59095 int error;
59096
59097 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
59098 @@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
59099 buffer += size;
59100 }
59101 rest -= size;
59102 + total_size += size;
59103 }
59104 }
59105 - error = buffer_size - rest; /* total size */
59106 + error = total_size;
59107
59108 cleanup:
59109 brelse(bh);
59110 diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
59111 index 22548f5..41521d8 100644
59112 --- a/fs/ext3/balloc.c
59113 +++ b/fs/ext3/balloc.c
59114 @@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
59115
59116 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
59117 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
59118 - if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
59119 + if (free_blocks < root_blocks + 1 &&
59120 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
59121 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
59122 - !in_group_p (sbi->s_resgid))) {
59123 + !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
59124 return 0;
59125 }
59126 return 1;
59127 diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
59128 index c6874be..f8a6ae8 100644
59129 --- a/fs/ext3/xattr.c
59130 +++ b/fs/ext3/xattr.c
59131 @@ -330,7 +330,7 @@ static int
59132 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
59133 char *buffer, size_t buffer_size)
59134 {
59135 - size_t rest = buffer_size;
59136 + size_t rest = buffer_size, total_size = 0;
59137
59138 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
59139 const struct xattr_handler *handler =
59140 @@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
59141 buffer += size;
59142 }
59143 rest -= size;
59144 + total_size += size;
59145 }
59146 }
59147 - return buffer_size - rest;
59148 + return total_size;
59149 }
59150
59151 static int
59152 diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
59153 index 6ea7b14..8fa16d9 100644
59154 --- a/fs/ext4/balloc.c
59155 +++ b/fs/ext4/balloc.c
59156 @@ -534,8 +534,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
59157 /* Hm, nope. Are (enough) root reserved clusters available? */
59158 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
59159 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
59160 - capable(CAP_SYS_RESOURCE) ||
59161 - (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
59162 + (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
59163 + capable_nolog(CAP_SYS_RESOURCE)) {
59164
59165 if (free_clusters >= (nclusters + dirty_clusters +
59166 resv_clusters))
59167 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
59168 index d3a534f..242c50a 100644
59169 --- a/fs/ext4/ext4.h
59170 +++ b/fs/ext4/ext4.h
59171 @@ -1269,19 +1269,19 @@ struct ext4_sb_info {
59172 unsigned long s_mb_last_start;
59173
59174 /* stats for buddy allocator */
59175 - atomic_t s_bal_reqs; /* number of reqs with len > 1 */
59176 - atomic_t s_bal_success; /* we found long enough chunks */
59177 - atomic_t s_bal_allocated; /* in blocks */
59178 - atomic_t s_bal_ex_scanned; /* total extents scanned */
59179 - atomic_t s_bal_goals; /* goal hits */
59180 - atomic_t s_bal_breaks; /* too long searches */
59181 - atomic_t s_bal_2orders; /* 2^order hits */
59182 + atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
59183 + atomic_unchecked_t s_bal_success; /* we found long enough chunks */
59184 + atomic_unchecked_t s_bal_allocated; /* in blocks */
59185 + atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
59186 + atomic_unchecked_t s_bal_goals; /* goal hits */
59187 + atomic_unchecked_t s_bal_breaks; /* too long searches */
59188 + atomic_unchecked_t s_bal_2orders; /* 2^order hits */
59189 spinlock_t s_bal_lock;
59190 unsigned long s_mb_buddies_generated;
59191 unsigned long long s_mb_generation_time;
59192 - atomic_t s_mb_lost_chunks;
59193 - atomic_t s_mb_preallocated;
59194 - atomic_t s_mb_discarded;
59195 + atomic_unchecked_t s_mb_lost_chunks;
59196 + atomic_unchecked_t s_mb_preallocated;
59197 + atomic_unchecked_t s_mb_discarded;
59198 atomic_t s_lock_busy;
59199
59200 /* locality groups */
59201 diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
59202 index 04a5c75..09894fa 100644
59203 --- a/fs/ext4/mballoc.c
59204 +++ b/fs/ext4/mballoc.c
59205 @@ -1880,7 +1880,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
59206 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
59207
59208 if (EXT4_SB(sb)->s_mb_stats)
59209 - atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
59210 + atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
59211
59212 break;
59213 }
59214 @@ -2189,7 +2189,7 @@ repeat:
59215 ac->ac_status = AC_STATUS_CONTINUE;
59216 ac->ac_flags |= EXT4_MB_HINT_FIRST;
59217 cr = 3;
59218 - atomic_inc(&sbi->s_mb_lost_chunks);
59219 + atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
59220 goto repeat;
59221 }
59222 }
59223 @@ -2697,25 +2697,25 @@ int ext4_mb_release(struct super_block *sb)
59224 if (sbi->s_mb_stats) {
59225 ext4_msg(sb, KERN_INFO,
59226 "mballoc: %u blocks %u reqs (%u success)",
59227 - atomic_read(&sbi->s_bal_allocated),
59228 - atomic_read(&sbi->s_bal_reqs),
59229 - atomic_read(&sbi->s_bal_success));
59230 + atomic_read_unchecked(&sbi->s_bal_allocated),
59231 + atomic_read_unchecked(&sbi->s_bal_reqs),
59232 + atomic_read_unchecked(&sbi->s_bal_success));
59233 ext4_msg(sb, KERN_INFO,
59234 "mballoc: %u extents scanned, %u goal hits, "
59235 "%u 2^N hits, %u breaks, %u lost",
59236 - atomic_read(&sbi->s_bal_ex_scanned),
59237 - atomic_read(&sbi->s_bal_goals),
59238 - atomic_read(&sbi->s_bal_2orders),
59239 - atomic_read(&sbi->s_bal_breaks),
59240 - atomic_read(&sbi->s_mb_lost_chunks));
59241 + atomic_read_unchecked(&sbi->s_bal_ex_scanned),
59242 + atomic_read_unchecked(&sbi->s_bal_goals),
59243 + atomic_read_unchecked(&sbi->s_bal_2orders),
59244 + atomic_read_unchecked(&sbi->s_bal_breaks),
59245 + atomic_read_unchecked(&sbi->s_mb_lost_chunks));
59246 ext4_msg(sb, KERN_INFO,
59247 "mballoc: %lu generated and it took %Lu",
59248 sbi->s_mb_buddies_generated,
59249 sbi->s_mb_generation_time);
59250 ext4_msg(sb, KERN_INFO,
59251 "mballoc: %u preallocated, %u discarded",
59252 - atomic_read(&sbi->s_mb_preallocated),
59253 - atomic_read(&sbi->s_mb_discarded));
59254 + atomic_read_unchecked(&sbi->s_mb_preallocated),
59255 + atomic_read_unchecked(&sbi->s_mb_discarded));
59256 }
59257
59258 free_percpu(sbi->s_locality_groups);
59259 @@ -3169,16 +3169,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
59260 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
59261
59262 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
59263 - atomic_inc(&sbi->s_bal_reqs);
59264 - atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
59265 + atomic_inc_unchecked(&sbi->s_bal_reqs);
59266 + atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
59267 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
59268 - atomic_inc(&sbi->s_bal_success);
59269 - atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
59270 + atomic_inc_unchecked(&sbi->s_bal_success);
59271 + atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
59272 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
59273 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
59274 - atomic_inc(&sbi->s_bal_goals);
59275 + atomic_inc_unchecked(&sbi->s_bal_goals);
59276 if (ac->ac_found > sbi->s_mb_max_to_scan)
59277 - atomic_inc(&sbi->s_bal_breaks);
59278 + atomic_inc_unchecked(&sbi->s_bal_breaks);
59279 }
59280
59281 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
59282 @@ -3583,7 +3583,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
59283 trace_ext4_mb_new_inode_pa(ac, pa);
59284
59285 ext4_mb_use_inode_pa(ac, pa);
59286 - atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
59287 + atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
59288
59289 ei = EXT4_I(ac->ac_inode);
59290 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
59291 @@ -3643,7 +3643,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
59292 trace_ext4_mb_new_group_pa(ac, pa);
59293
59294 ext4_mb_use_group_pa(ac, pa);
59295 - atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
59296 + atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
59297
59298 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
59299 lg = ac->ac_lg;
59300 @@ -3732,7 +3732,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
59301 * from the bitmap and continue.
59302 */
59303 }
59304 - atomic_add(free, &sbi->s_mb_discarded);
59305 + atomic_add_unchecked(free, &sbi->s_mb_discarded);
59306
59307 return err;
59308 }
59309 @@ -3750,7 +3750,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
59310 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
59311 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
59312 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
59313 - atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
59314 + atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
59315 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
59316
59317 return 0;
59318 diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
59319 index 04434ad..6404663 100644
59320 --- a/fs/ext4/mmp.c
59321 +++ b/fs/ext4/mmp.c
59322 @@ -113,7 +113,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
59323 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
59324 const char *function, unsigned int line, const char *msg)
59325 {
59326 - __ext4_warning(sb, function, line, msg);
59327 + __ext4_warning(sb, function, line, "%s", msg);
59328 __ext4_warning(sb, function, line,
59329 "MMP failure info: last update time: %llu, last update "
59330 "node: %s, last update device: %s\n",
59331 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
59332 index 710fed2..a82e4e8 100644
59333 --- a/fs/ext4/super.c
59334 +++ b/fs/ext4/super.c
59335 @@ -1270,7 +1270,7 @@ static ext4_fsblk_t get_sb_block(void **data)
59336 }
59337
59338 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
59339 -static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
59340 +static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
59341 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
59342
59343 #ifdef CONFIG_QUOTA
59344 @@ -2450,7 +2450,7 @@ struct ext4_attr {
59345 int offset;
59346 int deprecated_val;
59347 } u;
59348 -};
59349 +} __do_const;
59350
59351 static int parse_strtoull(const char *buf,
59352 unsigned long long max, unsigned long long *value)
59353 diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
59354 index e175e94..3ea69bf 100644
59355 --- a/fs/ext4/xattr.c
59356 +++ b/fs/ext4/xattr.c
59357 @@ -381,7 +381,7 @@ static int
59358 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
59359 char *buffer, size_t buffer_size)
59360 {
59361 - size_t rest = buffer_size;
59362 + size_t rest = buffer_size, total_size = 0;
59363
59364 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
59365 const struct xattr_handler *handler =
59366 @@ -398,9 +398,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
59367 buffer += size;
59368 }
59369 rest -= size;
59370 + total_size += size;
59371 }
59372 }
59373 - return buffer_size - rest;
59374 + return total_size;
59375 }
59376
59377 static int
59378 diff --git a/fs/fcntl.c b/fs/fcntl.c
59379 index ef68665..5deacdc 100644
59380 --- a/fs/fcntl.c
59381 +++ b/fs/fcntl.c
59382 @@ -106,6 +106,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
59383 if (err)
59384 return err;
59385
59386 + if (gr_handle_chroot_fowner(pid, type))
59387 + return -ENOENT;
59388 + if (gr_check_protected_task_fowner(pid, type))
59389 + return -EACCES;
59390 +
59391 f_modown(filp, pid, type, force);
59392 return 0;
59393 }
59394 diff --git a/fs/fhandle.c b/fs/fhandle.c
59395 index 999ff5c..41f4109 100644
59396 --- a/fs/fhandle.c
59397 +++ b/fs/fhandle.c
59398 @@ -67,8 +67,7 @@ static long do_sys_name_to_handle(struct path *path,
59399 } else
59400 retval = 0;
59401 /* copy the mount id */
59402 - if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
59403 - sizeof(*mnt_id)) ||
59404 + if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
59405 copy_to_user(ufh, handle,
59406 sizeof(struct file_handle) + handle_bytes))
59407 retval = -EFAULT;
59408 diff --git a/fs/file.c b/fs/file.c
59409 index eb56a13..ccee850 100644
59410 --- a/fs/file.c
59411 +++ b/fs/file.c
59412 @@ -16,6 +16,7 @@
59413 #include <linux/slab.h>
59414 #include <linux/vmalloc.h>
59415 #include <linux/file.h>
59416 +#include <linux/security.h>
59417 #include <linux/fdtable.h>
59418 #include <linux/bitops.h>
59419 #include <linux/interrupt.h>
59420 @@ -141,7 +142,7 @@ out:
59421 * Return <0 error code on error; 1 on successful completion.
59422 * The files->file_lock should be held on entry, and will be held on exit.
59423 */
59424 -static int expand_fdtable(struct files_struct *files, int nr)
59425 +static int expand_fdtable(struct files_struct *files, unsigned int nr)
59426 __releases(files->file_lock)
59427 __acquires(files->file_lock)
59428 {
59429 @@ -186,7 +187,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
59430 * expanded and execution may have blocked.
59431 * The files->file_lock should be held on entry, and will be held on exit.
59432 */
59433 -static int expand_files(struct files_struct *files, int nr)
59434 +static int expand_files(struct files_struct *files, unsigned int nr)
59435 {
59436 struct fdtable *fdt;
59437
59438 @@ -807,6 +808,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
59439 if (!file)
59440 return __close_fd(files, fd);
59441
59442 + gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
59443 if (fd >= rlimit(RLIMIT_NOFILE))
59444 return -EBADF;
59445
59446 @@ -833,6 +835,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
59447 if (unlikely(oldfd == newfd))
59448 return -EINVAL;
59449
59450 + gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
59451 if (newfd >= rlimit(RLIMIT_NOFILE))
59452 return -EBADF;
59453
59454 @@ -888,6 +891,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
59455 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
59456 {
59457 int err;
59458 + gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
59459 if (from >= rlimit(RLIMIT_NOFILE))
59460 return -EINVAL;
59461 err = alloc_fd(from, flags);
59462 diff --git a/fs/filesystems.c b/fs/filesystems.c
59463 index 92567d9..fcd8cbf 100644
59464 --- a/fs/filesystems.c
59465 +++ b/fs/filesystems.c
59466 @@ -273,7 +273,11 @@ struct file_system_type *get_fs_type(const char *name)
59467 int len = dot ? dot - name : strlen(name);
59468
59469 fs = __get_fs_type(name, len);
59470 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
59471 + if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
59472 +#else
59473 if (!fs && (request_module("fs-%.*s", len, name) == 0))
59474 +#endif
59475 fs = __get_fs_type(name, len);
59476
59477 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
59478 diff --git a/fs/fs_struct.c b/fs/fs_struct.c
59479 index 7dca743..543d620 100644
59480 --- a/fs/fs_struct.c
59481 +++ b/fs/fs_struct.c
59482 @@ -4,6 +4,7 @@
59483 #include <linux/path.h>
59484 #include <linux/slab.h>
59485 #include <linux/fs_struct.h>
59486 +#include <linux/grsecurity.h>
59487 #include "internal.h"
59488
59489 /*
59490 @@ -19,6 +20,7 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
59491 write_seqcount_begin(&fs->seq);
59492 old_root = fs->root;
59493 fs->root = *path;
59494 + gr_set_chroot_entries(current, path);
59495 write_seqcount_end(&fs->seq);
59496 spin_unlock(&fs->lock);
59497 if (old_root.dentry)
59498 @@ -67,6 +69,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
59499 int hits = 0;
59500 spin_lock(&fs->lock);
59501 write_seqcount_begin(&fs->seq);
59502 + /* this root replacement is only done by pivot_root,
59503 + leave grsec's chroot tagging alone for this task
59504 + so that a pivoted root isn't treated as a chroot
59505 + */
59506 hits += replace_path(&fs->root, old_root, new_root);
59507 hits += replace_path(&fs->pwd, old_root, new_root);
59508 write_seqcount_end(&fs->seq);
59509 @@ -99,7 +105,8 @@ void exit_fs(struct task_struct *tsk)
59510 task_lock(tsk);
59511 spin_lock(&fs->lock);
59512 tsk->fs = NULL;
59513 - kill = !--fs->users;
59514 + gr_clear_chroot_entries(tsk);
59515 + kill = !atomic_dec_return(&fs->users);
59516 spin_unlock(&fs->lock);
59517 task_unlock(tsk);
59518 if (kill)
59519 @@ -112,7 +119,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
59520 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
59521 /* We don't need to lock fs - think why ;-) */
59522 if (fs) {
59523 - fs->users = 1;
59524 + atomic_set(&fs->users, 1);
59525 fs->in_exec = 0;
59526 spin_lock_init(&fs->lock);
59527 seqcount_init(&fs->seq);
59528 @@ -121,6 +128,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
59529 spin_lock(&old->lock);
59530 fs->root = old->root;
59531 path_get(&fs->root);
59532 + /* instead of calling gr_set_chroot_entries here,
59533 + we call it from every caller of this function
59534 + */
59535 fs->pwd = old->pwd;
59536 path_get(&fs->pwd);
59537 spin_unlock(&old->lock);
59538 @@ -139,8 +149,9 @@ int unshare_fs_struct(void)
59539
59540 task_lock(current);
59541 spin_lock(&fs->lock);
59542 - kill = !--fs->users;
59543 + kill = !atomic_dec_return(&fs->users);
59544 current->fs = new_fs;
59545 + gr_set_chroot_entries(current, &new_fs->root);
59546 spin_unlock(&fs->lock);
59547 task_unlock(current);
59548
59549 @@ -153,13 +164,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
59550
59551 int current_umask(void)
59552 {
59553 - return current->fs->umask;
59554 + return current->fs->umask | gr_acl_umask();
59555 }
59556 EXPORT_SYMBOL(current_umask);
59557
59558 /* to be mentioned only in INIT_TASK */
59559 struct fs_struct init_fs = {
59560 - .users = 1,
59561 + .users = ATOMIC_INIT(1),
59562 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
59563 .seq = SEQCNT_ZERO(init_fs.seq),
59564 .umask = 0022,
59565 diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
59566 index 29d7feb..303644d 100644
59567 --- a/fs/fscache/cookie.c
59568 +++ b/fs/fscache/cookie.c
59569 @@ -19,7 +19,7 @@
59570
59571 struct kmem_cache *fscache_cookie_jar;
59572
59573 -static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
59574 +static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
59575
59576 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
59577 static int fscache_alloc_object(struct fscache_cache *cache,
59578 @@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
59579 parent ? (char *) parent->def->name : "<no-parent>",
59580 def->name, netfs_data, enable);
59581
59582 - fscache_stat(&fscache_n_acquires);
59583 + fscache_stat_unchecked(&fscache_n_acquires);
59584
59585 /* if there's no parent cookie, then we don't create one here either */
59586 if (!parent) {
59587 - fscache_stat(&fscache_n_acquires_null);
59588 + fscache_stat_unchecked(&fscache_n_acquires_null);
59589 _leave(" [no parent]");
59590 return NULL;
59591 }
59592 @@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
59593 /* allocate and initialise a cookie */
59594 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
59595 if (!cookie) {
59596 - fscache_stat(&fscache_n_acquires_oom);
59597 + fscache_stat_unchecked(&fscache_n_acquires_oom);
59598 _leave(" [ENOMEM]");
59599 return NULL;
59600 }
59601 @@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
59602
59603 switch (cookie->def->type) {
59604 case FSCACHE_COOKIE_TYPE_INDEX:
59605 - fscache_stat(&fscache_n_cookie_index);
59606 + fscache_stat_unchecked(&fscache_n_cookie_index);
59607 break;
59608 case FSCACHE_COOKIE_TYPE_DATAFILE:
59609 - fscache_stat(&fscache_n_cookie_data);
59610 + fscache_stat_unchecked(&fscache_n_cookie_data);
59611 break;
59612 default:
59613 - fscache_stat(&fscache_n_cookie_special);
59614 + fscache_stat_unchecked(&fscache_n_cookie_special);
59615 break;
59616 }
59617
59618 @@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
59619 } else {
59620 atomic_dec(&parent->n_children);
59621 __fscache_cookie_put(cookie);
59622 - fscache_stat(&fscache_n_acquires_nobufs);
59623 + fscache_stat_unchecked(&fscache_n_acquires_nobufs);
59624 _leave(" = NULL");
59625 return NULL;
59626 }
59627 @@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
59628 }
59629 }
59630
59631 - fscache_stat(&fscache_n_acquires_ok);
59632 + fscache_stat_unchecked(&fscache_n_acquires_ok);
59633 _leave(" = %p", cookie);
59634 return cookie;
59635 }
59636 @@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
59637 cache = fscache_select_cache_for_object(cookie->parent);
59638 if (!cache) {
59639 up_read(&fscache_addremove_sem);
59640 - fscache_stat(&fscache_n_acquires_no_cache);
59641 + fscache_stat_unchecked(&fscache_n_acquires_no_cache);
59642 _leave(" = -ENOMEDIUM [no cache]");
59643 return -ENOMEDIUM;
59644 }
59645 @@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
59646 object = cache->ops->alloc_object(cache, cookie);
59647 fscache_stat_d(&fscache_n_cop_alloc_object);
59648 if (IS_ERR(object)) {
59649 - fscache_stat(&fscache_n_object_no_alloc);
59650 + fscache_stat_unchecked(&fscache_n_object_no_alloc);
59651 ret = PTR_ERR(object);
59652 goto error;
59653 }
59654
59655 - fscache_stat(&fscache_n_object_alloc);
59656 + fscache_stat_unchecked(&fscache_n_object_alloc);
59657
59658 - object->debug_id = atomic_inc_return(&fscache_object_debug_id);
59659 + object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
59660
59661 _debug("ALLOC OBJ%x: %s {%lx}",
59662 object->debug_id, cookie->def->name, object->events);
59663 @@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
59664
59665 _enter("{%s}", cookie->def->name);
59666
59667 - fscache_stat(&fscache_n_invalidates);
59668 + fscache_stat_unchecked(&fscache_n_invalidates);
59669
59670 /* Only permit invalidation of data files. Invalidating an index will
59671 * require the caller to release all its attachments to the tree rooted
59672 @@ -477,10 +477,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
59673 {
59674 struct fscache_object *object;
59675
59676 - fscache_stat(&fscache_n_updates);
59677 + fscache_stat_unchecked(&fscache_n_updates);
59678
59679 if (!cookie) {
59680 - fscache_stat(&fscache_n_updates_null);
59681 + fscache_stat_unchecked(&fscache_n_updates_null);
59682 _leave(" [no cookie]");
59683 return;
59684 }
59685 @@ -581,12 +581,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
59686 */
59687 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
59688 {
59689 - fscache_stat(&fscache_n_relinquishes);
59690 + fscache_stat_unchecked(&fscache_n_relinquishes);
59691 if (retire)
59692 - fscache_stat(&fscache_n_relinquishes_retire);
59693 + fscache_stat_unchecked(&fscache_n_relinquishes_retire);
59694
59695 if (!cookie) {
59696 - fscache_stat(&fscache_n_relinquishes_null);
59697 + fscache_stat_unchecked(&fscache_n_relinquishes_null);
59698 _leave(" [no cookie]");
59699 return;
59700 }
59701 @@ -687,7 +687,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
59702 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
59703 goto inconsistent;
59704
59705 - op->debug_id = atomic_inc_return(&fscache_op_debug_id);
59706 + op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
59707
59708 __fscache_use_cookie(cookie);
59709 if (fscache_submit_op(object, op) < 0)
59710 diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
59711 index 4226f66..0fb3f45 100644
59712 --- a/fs/fscache/internal.h
59713 +++ b/fs/fscache/internal.h
59714 @@ -133,8 +133,8 @@ extern void fscache_operation_gc(struct work_struct *);
59715 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
59716 extern int fscache_wait_for_operation_activation(struct fscache_object *,
59717 struct fscache_operation *,
59718 - atomic_t *,
59719 - atomic_t *,
59720 + atomic_unchecked_t *,
59721 + atomic_unchecked_t *,
59722 void (*)(struct fscache_operation *));
59723 extern void fscache_invalidate_writes(struct fscache_cookie *);
59724
59725 @@ -153,101 +153,101 @@ extern void fscache_proc_cleanup(void);
59726 * stats.c
59727 */
59728 #ifdef CONFIG_FSCACHE_STATS
59729 -extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
59730 -extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
59731 +extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
59732 +extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
59733
59734 -extern atomic_t fscache_n_op_pend;
59735 -extern atomic_t fscache_n_op_run;
59736 -extern atomic_t fscache_n_op_enqueue;
59737 -extern atomic_t fscache_n_op_deferred_release;
59738 -extern atomic_t fscache_n_op_release;
59739 -extern atomic_t fscache_n_op_gc;
59740 -extern atomic_t fscache_n_op_cancelled;
59741 -extern atomic_t fscache_n_op_rejected;
59742 +extern atomic_unchecked_t fscache_n_op_pend;
59743 +extern atomic_unchecked_t fscache_n_op_run;
59744 +extern atomic_unchecked_t fscache_n_op_enqueue;
59745 +extern atomic_unchecked_t fscache_n_op_deferred_release;
59746 +extern atomic_unchecked_t fscache_n_op_release;
59747 +extern atomic_unchecked_t fscache_n_op_gc;
59748 +extern atomic_unchecked_t fscache_n_op_cancelled;
59749 +extern atomic_unchecked_t fscache_n_op_rejected;
59750
59751 -extern atomic_t fscache_n_attr_changed;
59752 -extern atomic_t fscache_n_attr_changed_ok;
59753 -extern atomic_t fscache_n_attr_changed_nobufs;
59754 -extern atomic_t fscache_n_attr_changed_nomem;
59755 -extern atomic_t fscache_n_attr_changed_calls;
59756 +extern atomic_unchecked_t fscache_n_attr_changed;
59757 +extern atomic_unchecked_t fscache_n_attr_changed_ok;
59758 +extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
59759 +extern atomic_unchecked_t fscache_n_attr_changed_nomem;
59760 +extern atomic_unchecked_t fscache_n_attr_changed_calls;
59761
59762 -extern atomic_t fscache_n_allocs;
59763 -extern atomic_t fscache_n_allocs_ok;
59764 -extern atomic_t fscache_n_allocs_wait;
59765 -extern atomic_t fscache_n_allocs_nobufs;
59766 -extern atomic_t fscache_n_allocs_intr;
59767 -extern atomic_t fscache_n_allocs_object_dead;
59768 -extern atomic_t fscache_n_alloc_ops;
59769 -extern atomic_t fscache_n_alloc_op_waits;
59770 +extern atomic_unchecked_t fscache_n_allocs;
59771 +extern atomic_unchecked_t fscache_n_allocs_ok;
59772 +extern atomic_unchecked_t fscache_n_allocs_wait;
59773 +extern atomic_unchecked_t fscache_n_allocs_nobufs;
59774 +extern atomic_unchecked_t fscache_n_allocs_intr;
59775 +extern atomic_unchecked_t fscache_n_allocs_object_dead;
59776 +extern atomic_unchecked_t fscache_n_alloc_ops;
59777 +extern atomic_unchecked_t fscache_n_alloc_op_waits;
59778
59779 -extern atomic_t fscache_n_retrievals;
59780 -extern atomic_t fscache_n_retrievals_ok;
59781 -extern atomic_t fscache_n_retrievals_wait;
59782 -extern atomic_t fscache_n_retrievals_nodata;
59783 -extern atomic_t fscache_n_retrievals_nobufs;
59784 -extern atomic_t fscache_n_retrievals_intr;
59785 -extern atomic_t fscache_n_retrievals_nomem;
59786 -extern atomic_t fscache_n_retrievals_object_dead;
59787 -extern atomic_t fscache_n_retrieval_ops;
59788 -extern atomic_t fscache_n_retrieval_op_waits;
59789 +extern atomic_unchecked_t fscache_n_retrievals;
59790 +extern atomic_unchecked_t fscache_n_retrievals_ok;
59791 +extern atomic_unchecked_t fscache_n_retrievals_wait;
59792 +extern atomic_unchecked_t fscache_n_retrievals_nodata;
59793 +extern atomic_unchecked_t fscache_n_retrievals_nobufs;
59794 +extern atomic_unchecked_t fscache_n_retrievals_intr;
59795 +extern atomic_unchecked_t fscache_n_retrievals_nomem;
59796 +extern atomic_unchecked_t fscache_n_retrievals_object_dead;
59797 +extern atomic_unchecked_t fscache_n_retrieval_ops;
59798 +extern atomic_unchecked_t fscache_n_retrieval_op_waits;
59799
59800 -extern atomic_t fscache_n_stores;
59801 -extern atomic_t fscache_n_stores_ok;
59802 -extern atomic_t fscache_n_stores_again;
59803 -extern atomic_t fscache_n_stores_nobufs;
59804 -extern atomic_t fscache_n_stores_oom;
59805 -extern atomic_t fscache_n_store_ops;
59806 -extern atomic_t fscache_n_store_calls;
59807 -extern atomic_t fscache_n_store_pages;
59808 -extern atomic_t fscache_n_store_radix_deletes;
59809 -extern atomic_t fscache_n_store_pages_over_limit;
59810 +extern atomic_unchecked_t fscache_n_stores;
59811 +extern atomic_unchecked_t fscache_n_stores_ok;
59812 +extern atomic_unchecked_t fscache_n_stores_again;
59813 +extern atomic_unchecked_t fscache_n_stores_nobufs;
59814 +extern atomic_unchecked_t fscache_n_stores_oom;
59815 +extern atomic_unchecked_t fscache_n_store_ops;
59816 +extern atomic_unchecked_t fscache_n_store_calls;
59817 +extern atomic_unchecked_t fscache_n_store_pages;
59818 +extern atomic_unchecked_t fscache_n_store_radix_deletes;
59819 +extern atomic_unchecked_t fscache_n_store_pages_over_limit;
59820
59821 -extern atomic_t fscache_n_store_vmscan_not_storing;
59822 -extern atomic_t fscache_n_store_vmscan_gone;
59823 -extern atomic_t fscache_n_store_vmscan_busy;
59824 -extern atomic_t fscache_n_store_vmscan_cancelled;
59825 -extern atomic_t fscache_n_store_vmscan_wait;
59826 +extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
59827 +extern atomic_unchecked_t fscache_n_store_vmscan_gone;
59828 +extern atomic_unchecked_t fscache_n_store_vmscan_busy;
59829 +extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
59830 +extern atomic_unchecked_t fscache_n_store_vmscan_wait;
59831
59832 -extern atomic_t fscache_n_marks;
59833 -extern atomic_t fscache_n_uncaches;
59834 +extern atomic_unchecked_t fscache_n_marks;
59835 +extern atomic_unchecked_t fscache_n_uncaches;
59836
59837 -extern atomic_t fscache_n_acquires;
59838 -extern atomic_t fscache_n_acquires_null;
59839 -extern atomic_t fscache_n_acquires_no_cache;
59840 -extern atomic_t fscache_n_acquires_ok;
59841 -extern atomic_t fscache_n_acquires_nobufs;
59842 -extern atomic_t fscache_n_acquires_oom;
59843 +extern atomic_unchecked_t fscache_n_acquires;
59844 +extern atomic_unchecked_t fscache_n_acquires_null;
59845 +extern atomic_unchecked_t fscache_n_acquires_no_cache;
59846 +extern atomic_unchecked_t fscache_n_acquires_ok;
59847 +extern atomic_unchecked_t fscache_n_acquires_nobufs;
59848 +extern atomic_unchecked_t fscache_n_acquires_oom;
59849
59850 -extern atomic_t fscache_n_invalidates;
59851 -extern atomic_t fscache_n_invalidates_run;
59852 +extern atomic_unchecked_t fscache_n_invalidates;
59853 +extern atomic_unchecked_t fscache_n_invalidates_run;
59854
59855 -extern atomic_t fscache_n_updates;
59856 -extern atomic_t fscache_n_updates_null;
59857 -extern atomic_t fscache_n_updates_run;
59858 +extern atomic_unchecked_t fscache_n_updates;
59859 +extern atomic_unchecked_t fscache_n_updates_null;
59860 +extern atomic_unchecked_t fscache_n_updates_run;
59861
59862 -extern atomic_t fscache_n_relinquishes;
59863 -extern atomic_t fscache_n_relinquishes_null;
59864 -extern atomic_t fscache_n_relinquishes_waitcrt;
59865 -extern atomic_t fscache_n_relinquishes_retire;
59866 +extern atomic_unchecked_t fscache_n_relinquishes;
59867 +extern atomic_unchecked_t fscache_n_relinquishes_null;
59868 +extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
59869 +extern atomic_unchecked_t fscache_n_relinquishes_retire;
59870
59871 -extern atomic_t fscache_n_cookie_index;
59872 -extern atomic_t fscache_n_cookie_data;
59873 -extern atomic_t fscache_n_cookie_special;
59874 +extern atomic_unchecked_t fscache_n_cookie_index;
59875 +extern atomic_unchecked_t fscache_n_cookie_data;
59876 +extern atomic_unchecked_t fscache_n_cookie_special;
59877
59878 -extern atomic_t fscache_n_object_alloc;
59879 -extern atomic_t fscache_n_object_no_alloc;
59880 -extern atomic_t fscache_n_object_lookups;
59881 -extern atomic_t fscache_n_object_lookups_negative;
59882 -extern atomic_t fscache_n_object_lookups_positive;
59883 -extern atomic_t fscache_n_object_lookups_timed_out;
59884 -extern atomic_t fscache_n_object_created;
59885 -extern atomic_t fscache_n_object_avail;
59886 -extern atomic_t fscache_n_object_dead;
59887 +extern atomic_unchecked_t fscache_n_object_alloc;
59888 +extern atomic_unchecked_t fscache_n_object_no_alloc;
59889 +extern atomic_unchecked_t fscache_n_object_lookups;
59890 +extern atomic_unchecked_t fscache_n_object_lookups_negative;
59891 +extern atomic_unchecked_t fscache_n_object_lookups_positive;
59892 +extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
59893 +extern atomic_unchecked_t fscache_n_object_created;
59894 +extern atomic_unchecked_t fscache_n_object_avail;
59895 +extern atomic_unchecked_t fscache_n_object_dead;
59896
59897 -extern atomic_t fscache_n_checkaux_none;
59898 -extern atomic_t fscache_n_checkaux_okay;
59899 -extern atomic_t fscache_n_checkaux_update;
59900 -extern atomic_t fscache_n_checkaux_obsolete;
59901 +extern atomic_unchecked_t fscache_n_checkaux_none;
59902 +extern atomic_unchecked_t fscache_n_checkaux_okay;
59903 +extern atomic_unchecked_t fscache_n_checkaux_update;
59904 +extern atomic_unchecked_t fscache_n_checkaux_obsolete;
59905
59906 extern atomic_t fscache_n_cop_alloc_object;
59907 extern atomic_t fscache_n_cop_lookup_object;
59908 @@ -272,6 +272,11 @@ static inline void fscache_stat(atomic_t *stat)
59909 atomic_inc(stat);
59910 }
59911
59912 +static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
59913 +{
59914 + atomic_inc_unchecked(stat);
59915 +}
59916 +
59917 static inline void fscache_stat_d(atomic_t *stat)
59918 {
59919 atomic_dec(stat);
59920 @@ -284,6 +289,7 @@ extern const struct file_operations fscache_stats_fops;
59921
59922 #define __fscache_stat(stat) (NULL)
59923 #define fscache_stat(stat) do {} while (0)
59924 +#define fscache_stat_unchecked(stat) do {} while (0)
59925 #define fscache_stat_d(stat) do {} while (0)
59926 #endif
59927
59928 diff --git a/fs/fscache/object.c b/fs/fscache/object.c
59929 index d3b4539..ed0c659 100644
59930 --- a/fs/fscache/object.c
59931 +++ b/fs/fscache/object.c
59932 @@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
59933 _debug("LOOKUP \"%s\" in \"%s\"",
59934 cookie->def->name, object->cache->tag->name);
59935
59936 - fscache_stat(&fscache_n_object_lookups);
59937 + fscache_stat_unchecked(&fscache_n_object_lookups);
59938 fscache_stat(&fscache_n_cop_lookup_object);
59939 ret = object->cache->ops->lookup_object(object);
59940 fscache_stat_d(&fscache_n_cop_lookup_object);
59941 @@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
59942 if (ret == -ETIMEDOUT) {
59943 /* probably stuck behind another object, so move this one to
59944 * the back of the queue */
59945 - fscache_stat(&fscache_n_object_lookups_timed_out);
59946 + fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
59947 _leave(" [timeout]");
59948 return NO_TRANSIT;
59949 }
59950 @@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
59951 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
59952
59953 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
59954 - fscache_stat(&fscache_n_object_lookups_negative);
59955 + fscache_stat_unchecked(&fscache_n_object_lookups_negative);
59956
59957 /* Allow write requests to begin stacking up and read requests to begin
59958 * returning ENODATA.
59959 @@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
59960 /* if we were still looking up, then we must have a positive lookup
59961 * result, in which case there may be data available */
59962 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
59963 - fscache_stat(&fscache_n_object_lookups_positive);
59964 + fscache_stat_unchecked(&fscache_n_object_lookups_positive);
59965
59966 /* We do (presumably) have data */
59967 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
59968 @@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
59969 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
59970 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
59971 } else {
59972 - fscache_stat(&fscache_n_object_created);
59973 + fscache_stat_unchecked(&fscache_n_object_created);
59974 }
59975
59976 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
59977 @@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
59978 fscache_stat_d(&fscache_n_cop_lookup_complete);
59979
59980 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
59981 - fscache_stat(&fscache_n_object_avail);
59982 + fscache_stat_unchecked(&fscache_n_object_avail);
59983
59984 _leave("");
59985 return transit_to(JUMPSTART_DEPS);
59986 @@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
59987
59988 /* this just shifts the object release to the work processor */
59989 fscache_put_object(object);
59990 - fscache_stat(&fscache_n_object_dead);
59991 + fscache_stat_unchecked(&fscache_n_object_dead);
59992
59993 _leave("");
59994 return transit_to(OBJECT_DEAD);
59995 @@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
59996 enum fscache_checkaux result;
59997
59998 if (!object->cookie->def->check_aux) {
59999 - fscache_stat(&fscache_n_checkaux_none);
60000 + fscache_stat_unchecked(&fscache_n_checkaux_none);
60001 return FSCACHE_CHECKAUX_OKAY;
60002 }
60003
60004 @@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
60005 switch (result) {
60006 /* entry okay as is */
60007 case FSCACHE_CHECKAUX_OKAY:
60008 - fscache_stat(&fscache_n_checkaux_okay);
60009 + fscache_stat_unchecked(&fscache_n_checkaux_okay);
60010 break;
60011
60012 /* entry requires update */
60013 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
60014 - fscache_stat(&fscache_n_checkaux_update);
60015 + fscache_stat_unchecked(&fscache_n_checkaux_update);
60016 break;
60017
60018 /* entry requires deletion */
60019 case FSCACHE_CHECKAUX_OBSOLETE:
60020 - fscache_stat(&fscache_n_checkaux_obsolete);
60021 + fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
60022 break;
60023
60024 default:
60025 @@ -992,7 +992,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
60026 {
60027 const struct fscache_state *s;
60028
60029 - fscache_stat(&fscache_n_invalidates_run);
60030 + fscache_stat_unchecked(&fscache_n_invalidates_run);
60031 fscache_stat(&fscache_n_cop_invalidate_object);
60032 s = _fscache_invalidate_object(object, event);
60033 fscache_stat_d(&fscache_n_cop_invalidate_object);
60034 @@ -1007,7 +1007,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
60035 {
60036 _enter("{OBJ%x},%d", object->debug_id, event);
60037
60038 - fscache_stat(&fscache_n_updates_run);
60039 + fscache_stat_unchecked(&fscache_n_updates_run);
60040 fscache_stat(&fscache_n_cop_update_object);
60041 object->cache->ops->update_object(object);
60042 fscache_stat_d(&fscache_n_cop_update_object);
60043 diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
60044 index 318071a..379938b 100644
60045 --- a/fs/fscache/operation.c
60046 +++ b/fs/fscache/operation.c
60047 @@ -17,7 +17,7 @@
60048 #include <linux/slab.h>
60049 #include "internal.h"
60050
60051 -atomic_t fscache_op_debug_id;
60052 +atomic_unchecked_t fscache_op_debug_id;
60053 EXPORT_SYMBOL(fscache_op_debug_id);
60054
60055 /**
60056 @@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
60057 ASSERTCMP(atomic_read(&op->usage), >, 0);
60058 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
60059
60060 - fscache_stat(&fscache_n_op_enqueue);
60061 + fscache_stat_unchecked(&fscache_n_op_enqueue);
60062 switch (op->flags & FSCACHE_OP_TYPE) {
60063 case FSCACHE_OP_ASYNC:
60064 _debug("queue async");
60065 @@ -73,7 +73,7 @@ static void fscache_run_op(struct fscache_object *object,
60066 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
60067 if (op->processor)
60068 fscache_enqueue_operation(op);
60069 - fscache_stat(&fscache_n_op_run);
60070 + fscache_stat_unchecked(&fscache_n_op_run);
60071 }
60072
60073 /*
60074 @@ -105,11 +105,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
60075 if (object->n_in_progress > 0) {
60076 atomic_inc(&op->usage);
60077 list_add_tail(&op->pend_link, &object->pending_ops);
60078 - fscache_stat(&fscache_n_op_pend);
60079 + fscache_stat_unchecked(&fscache_n_op_pend);
60080 } else if (!list_empty(&object->pending_ops)) {
60081 atomic_inc(&op->usage);
60082 list_add_tail(&op->pend_link, &object->pending_ops);
60083 - fscache_stat(&fscache_n_op_pend);
60084 + fscache_stat_unchecked(&fscache_n_op_pend);
60085 fscache_start_operations(object);
60086 } else {
60087 ASSERTCMP(object->n_in_progress, ==, 0);
60088 @@ -125,7 +125,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
60089 object->n_exclusive++; /* reads and writes must wait */
60090 atomic_inc(&op->usage);
60091 list_add_tail(&op->pend_link, &object->pending_ops);
60092 - fscache_stat(&fscache_n_op_pend);
60093 + fscache_stat_unchecked(&fscache_n_op_pend);
60094 ret = 0;
60095 } else {
60096 /* If we're in any other state, there must have been an I/O
60097 @@ -212,11 +212,11 @@ int fscache_submit_op(struct fscache_object *object,
60098 if (object->n_exclusive > 0) {
60099 atomic_inc(&op->usage);
60100 list_add_tail(&op->pend_link, &object->pending_ops);
60101 - fscache_stat(&fscache_n_op_pend);
60102 + fscache_stat_unchecked(&fscache_n_op_pend);
60103 } else if (!list_empty(&object->pending_ops)) {
60104 atomic_inc(&op->usage);
60105 list_add_tail(&op->pend_link, &object->pending_ops);
60106 - fscache_stat(&fscache_n_op_pend);
60107 + fscache_stat_unchecked(&fscache_n_op_pend);
60108 fscache_start_operations(object);
60109 } else {
60110 ASSERTCMP(object->n_exclusive, ==, 0);
60111 @@ -228,10 +228,10 @@ int fscache_submit_op(struct fscache_object *object,
60112 object->n_ops++;
60113 atomic_inc(&op->usage);
60114 list_add_tail(&op->pend_link, &object->pending_ops);
60115 - fscache_stat(&fscache_n_op_pend);
60116 + fscache_stat_unchecked(&fscache_n_op_pend);
60117 ret = 0;
60118 } else if (fscache_object_is_dying(object)) {
60119 - fscache_stat(&fscache_n_op_rejected);
60120 + fscache_stat_unchecked(&fscache_n_op_rejected);
60121 op->state = FSCACHE_OP_ST_CANCELLED;
60122 ret = -ENOBUFS;
60123 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
60124 @@ -310,7 +310,7 @@ int fscache_cancel_op(struct fscache_operation *op,
60125 ret = -EBUSY;
60126 if (op->state == FSCACHE_OP_ST_PENDING) {
60127 ASSERT(!list_empty(&op->pend_link));
60128 - fscache_stat(&fscache_n_op_cancelled);
60129 + fscache_stat_unchecked(&fscache_n_op_cancelled);
60130 list_del_init(&op->pend_link);
60131 if (do_cancel)
60132 do_cancel(op);
60133 @@ -342,7 +342,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
60134 while (!list_empty(&object->pending_ops)) {
60135 op = list_entry(object->pending_ops.next,
60136 struct fscache_operation, pend_link);
60137 - fscache_stat(&fscache_n_op_cancelled);
60138 + fscache_stat_unchecked(&fscache_n_op_cancelled);
60139 list_del_init(&op->pend_link);
60140
60141 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
60142 @@ -414,7 +414,7 @@ void fscache_put_operation(struct fscache_operation *op)
60143 op->state, ==, FSCACHE_OP_ST_CANCELLED);
60144 op->state = FSCACHE_OP_ST_DEAD;
60145
60146 - fscache_stat(&fscache_n_op_release);
60147 + fscache_stat_unchecked(&fscache_n_op_release);
60148
60149 if (op->release) {
60150 op->release(op);
60151 @@ -433,7 +433,7 @@ void fscache_put_operation(struct fscache_operation *op)
60152 * lock, and defer it otherwise */
60153 if (!spin_trylock(&object->lock)) {
60154 _debug("defer put");
60155 - fscache_stat(&fscache_n_op_deferred_release);
60156 + fscache_stat_unchecked(&fscache_n_op_deferred_release);
60157
60158 cache = object->cache;
60159 spin_lock(&cache->op_gc_list_lock);
60160 @@ -486,7 +486,7 @@ void fscache_operation_gc(struct work_struct *work)
60161
60162 _debug("GC DEFERRED REL OBJ%x OP%x",
60163 object->debug_id, op->debug_id);
60164 - fscache_stat(&fscache_n_op_gc);
60165 + fscache_stat_unchecked(&fscache_n_op_gc);
60166
60167 ASSERTCMP(atomic_read(&op->usage), ==, 0);
60168 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
60169 diff --git a/fs/fscache/page.c b/fs/fscache/page.c
60170 index 7f5c658..6c1e164 100644
60171 --- a/fs/fscache/page.c
60172 +++ b/fs/fscache/page.c
60173 @@ -61,7 +61,7 @@ try_again:
60174 val = radix_tree_lookup(&cookie->stores, page->index);
60175 if (!val) {
60176 rcu_read_unlock();
60177 - fscache_stat(&fscache_n_store_vmscan_not_storing);
60178 + fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
60179 __fscache_uncache_page(cookie, page);
60180 return true;
60181 }
60182 @@ -91,11 +91,11 @@ try_again:
60183 spin_unlock(&cookie->stores_lock);
60184
60185 if (xpage) {
60186 - fscache_stat(&fscache_n_store_vmscan_cancelled);
60187 - fscache_stat(&fscache_n_store_radix_deletes);
60188 + fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
60189 + fscache_stat_unchecked(&fscache_n_store_radix_deletes);
60190 ASSERTCMP(xpage, ==, page);
60191 } else {
60192 - fscache_stat(&fscache_n_store_vmscan_gone);
60193 + fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
60194 }
60195
60196 wake_up_bit(&cookie->flags, 0);
60197 @@ -110,11 +110,11 @@ page_busy:
60198 * sleeping on memory allocation, so we may need to impose a timeout
60199 * too. */
60200 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
60201 - fscache_stat(&fscache_n_store_vmscan_busy);
60202 + fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
60203 return false;
60204 }
60205
60206 - fscache_stat(&fscache_n_store_vmscan_wait);
60207 + fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
60208 __fscache_wait_on_page_write(cookie, page);
60209 gfp &= ~__GFP_WAIT;
60210 goto try_again;
60211 @@ -140,7 +140,7 @@ static void fscache_end_page_write(struct fscache_object *object,
60212 FSCACHE_COOKIE_STORING_TAG);
60213 if (!radix_tree_tag_get(&cookie->stores, page->index,
60214 FSCACHE_COOKIE_PENDING_TAG)) {
60215 - fscache_stat(&fscache_n_store_radix_deletes);
60216 + fscache_stat_unchecked(&fscache_n_store_radix_deletes);
60217 xpage = radix_tree_delete(&cookie->stores, page->index);
60218 }
60219 spin_unlock(&cookie->stores_lock);
60220 @@ -161,7 +161,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
60221
60222 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
60223
60224 - fscache_stat(&fscache_n_attr_changed_calls);
60225 + fscache_stat_unchecked(&fscache_n_attr_changed_calls);
60226
60227 if (fscache_object_is_active(object)) {
60228 fscache_stat(&fscache_n_cop_attr_changed);
60229 @@ -188,11 +188,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
60230
60231 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
60232
60233 - fscache_stat(&fscache_n_attr_changed);
60234 + fscache_stat_unchecked(&fscache_n_attr_changed);
60235
60236 op = kzalloc(sizeof(*op), GFP_KERNEL);
60237 if (!op) {
60238 - fscache_stat(&fscache_n_attr_changed_nomem);
60239 + fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
60240 _leave(" = -ENOMEM");
60241 return -ENOMEM;
60242 }
60243 @@ -214,7 +214,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
60244 if (fscache_submit_exclusive_op(object, op) < 0)
60245 goto nobufs;
60246 spin_unlock(&cookie->lock);
60247 - fscache_stat(&fscache_n_attr_changed_ok);
60248 + fscache_stat_unchecked(&fscache_n_attr_changed_ok);
60249 fscache_put_operation(op);
60250 _leave(" = 0");
60251 return 0;
60252 @@ -225,7 +225,7 @@ nobufs:
60253 kfree(op);
60254 if (wake_cookie)
60255 __fscache_wake_unused_cookie(cookie);
60256 - fscache_stat(&fscache_n_attr_changed_nobufs);
60257 + fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
60258 _leave(" = %d", -ENOBUFS);
60259 return -ENOBUFS;
60260 }
60261 @@ -264,7 +264,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
60262 /* allocate a retrieval operation and attempt to submit it */
60263 op = kzalloc(sizeof(*op), GFP_NOIO);
60264 if (!op) {
60265 - fscache_stat(&fscache_n_retrievals_nomem);
60266 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
60267 return NULL;
60268 }
60269
60270 @@ -294,13 +294,13 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
60271 return 0;
60272 }
60273
60274 - fscache_stat(&fscache_n_retrievals_wait);
60275 + fscache_stat_unchecked(&fscache_n_retrievals_wait);
60276
60277 jif = jiffies;
60278 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
60279 fscache_wait_bit_interruptible,
60280 TASK_INTERRUPTIBLE) != 0) {
60281 - fscache_stat(&fscache_n_retrievals_intr);
60282 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
60283 _leave(" = -ERESTARTSYS");
60284 return -ERESTARTSYS;
60285 }
60286 @@ -329,8 +329,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
60287 */
60288 int fscache_wait_for_operation_activation(struct fscache_object *object,
60289 struct fscache_operation *op,
60290 - atomic_t *stat_op_waits,
60291 - atomic_t *stat_object_dead,
60292 + atomic_unchecked_t *stat_op_waits,
60293 + atomic_unchecked_t *stat_object_dead,
60294 void (*do_cancel)(struct fscache_operation *))
60295 {
60296 int ret;
60297 @@ -340,7 +340,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
60298
60299 _debug(">>> WT");
60300 if (stat_op_waits)
60301 - fscache_stat(stat_op_waits);
60302 + fscache_stat_unchecked(stat_op_waits);
60303 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
60304 fscache_wait_bit_interruptible,
60305 TASK_INTERRUPTIBLE) != 0) {
60306 @@ -358,7 +358,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
60307 check_if_dead:
60308 if (op->state == FSCACHE_OP_ST_CANCELLED) {
60309 if (stat_object_dead)
60310 - fscache_stat(stat_object_dead);
60311 + fscache_stat_unchecked(stat_object_dead);
60312 _leave(" = -ENOBUFS [cancelled]");
60313 return -ENOBUFS;
60314 }
60315 @@ -366,7 +366,7 @@ check_if_dead:
60316 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
60317 fscache_cancel_op(op, do_cancel);
60318 if (stat_object_dead)
60319 - fscache_stat(stat_object_dead);
60320 + fscache_stat_unchecked(stat_object_dead);
60321 return -ENOBUFS;
60322 }
60323 return 0;
60324 @@ -394,7 +394,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
60325
60326 _enter("%p,%p,,,", cookie, page);
60327
60328 - fscache_stat(&fscache_n_retrievals);
60329 + fscache_stat_unchecked(&fscache_n_retrievals);
60330
60331 if (hlist_empty(&cookie->backing_objects))
60332 goto nobufs;
60333 @@ -436,7 +436,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
60334 goto nobufs_unlock_dec;
60335 spin_unlock(&cookie->lock);
60336
60337 - fscache_stat(&fscache_n_retrieval_ops);
60338 + fscache_stat_unchecked(&fscache_n_retrieval_ops);
60339
60340 /* pin the netfs read context in case we need to do the actual netfs
60341 * read because we've encountered a cache read failure */
60342 @@ -467,15 +467,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
60343
60344 error:
60345 if (ret == -ENOMEM)
60346 - fscache_stat(&fscache_n_retrievals_nomem);
60347 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
60348 else if (ret == -ERESTARTSYS)
60349 - fscache_stat(&fscache_n_retrievals_intr);
60350 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
60351 else if (ret == -ENODATA)
60352 - fscache_stat(&fscache_n_retrievals_nodata);
60353 + fscache_stat_unchecked(&fscache_n_retrievals_nodata);
60354 else if (ret < 0)
60355 - fscache_stat(&fscache_n_retrievals_nobufs);
60356 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
60357 else
60358 - fscache_stat(&fscache_n_retrievals_ok);
60359 + fscache_stat_unchecked(&fscache_n_retrievals_ok);
60360
60361 fscache_put_retrieval(op);
60362 _leave(" = %d", ret);
60363 @@ -490,7 +490,7 @@ nobufs_unlock:
60364 __fscache_wake_unused_cookie(cookie);
60365 kfree(op);
60366 nobufs:
60367 - fscache_stat(&fscache_n_retrievals_nobufs);
60368 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
60369 _leave(" = -ENOBUFS");
60370 return -ENOBUFS;
60371 }
60372 @@ -529,7 +529,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
60373
60374 _enter("%p,,%d,,,", cookie, *nr_pages);
60375
60376 - fscache_stat(&fscache_n_retrievals);
60377 + fscache_stat_unchecked(&fscache_n_retrievals);
60378
60379 if (hlist_empty(&cookie->backing_objects))
60380 goto nobufs;
60381 @@ -567,7 +567,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
60382 goto nobufs_unlock_dec;
60383 spin_unlock(&cookie->lock);
60384
60385 - fscache_stat(&fscache_n_retrieval_ops);
60386 + fscache_stat_unchecked(&fscache_n_retrieval_ops);
60387
60388 /* pin the netfs read context in case we need to do the actual netfs
60389 * read because we've encountered a cache read failure */
60390 @@ -598,15 +598,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
60391
60392 error:
60393 if (ret == -ENOMEM)
60394 - fscache_stat(&fscache_n_retrievals_nomem);
60395 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
60396 else if (ret == -ERESTARTSYS)
60397 - fscache_stat(&fscache_n_retrievals_intr);
60398 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
60399 else if (ret == -ENODATA)
60400 - fscache_stat(&fscache_n_retrievals_nodata);
60401 + fscache_stat_unchecked(&fscache_n_retrievals_nodata);
60402 else if (ret < 0)
60403 - fscache_stat(&fscache_n_retrievals_nobufs);
60404 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
60405 else
60406 - fscache_stat(&fscache_n_retrievals_ok);
60407 + fscache_stat_unchecked(&fscache_n_retrievals_ok);
60408
60409 fscache_put_retrieval(op);
60410 _leave(" = %d", ret);
60411 @@ -621,7 +621,7 @@ nobufs_unlock:
60412 if (wake_cookie)
60413 __fscache_wake_unused_cookie(cookie);
60414 nobufs:
60415 - fscache_stat(&fscache_n_retrievals_nobufs);
60416 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
60417 _leave(" = -ENOBUFS");
60418 return -ENOBUFS;
60419 }
60420 @@ -646,7 +646,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
60421
60422 _enter("%p,%p,,,", cookie, page);
60423
60424 - fscache_stat(&fscache_n_allocs);
60425 + fscache_stat_unchecked(&fscache_n_allocs);
60426
60427 if (hlist_empty(&cookie->backing_objects))
60428 goto nobufs;
60429 @@ -680,7 +680,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
60430 goto nobufs_unlock_dec;
60431 spin_unlock(&cookie->lock);
60432
60433 - fscache_stat(&fscache_n_alloc_ops);
60434 + fscache_stat_unchecked(&fscache_n_alloc_ops);
60435
60436 ret = fscache_wait_for_operation_activation(
60437 object, &op->op,
60438 @@ -697,11 +697,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
60439
60440 error:
60441 if (ret == -ERESTARTSYS)
60442 - fscache_stat(&fscache_n_allocs_intr);
60443 + fscache_stat_unchecked(&fscache_n_allocs_intr);
60444 else if (ret < 0)
60445 - fscache_stat(&fscache_n_allocs_nobufs);
60446 + fscache_stat_unchecked(&fscache_n_allocs_nobufs);
60447 else
60448 - fscache_stat(&fscache_n_allocs_ok);
60449 + fscache_stat_unchecked(&fscache_n_allocs_ok);
60450
60451 fscache_put_retrieval(op);
60452 _leave(" = %d", ret);
60453 @@ -715,7 +715,7 @@ nobufs_unlock:
60454 if (wake_cookie)
60455 __fscache_wake_unused_cookie(cookie);
60456 nobufs:
60457 - fscache_stat(&fscache_n_allocs_nobufs);
60458 + fscache_stat_unchecked(&fscache_n_allocs_nobufs);
60459 _leave(" = -ENOBUFS");
60460 return -ENOBUFS;
60461 }
60462 @@ -791,7 +791,7 @@ static void fscache_write_op(struct fscache_operation *_op)
60463
60464 spin_lock(&cookie->stores_lock);
60465
60466 - fscache_stat(&fscache_n_store_calls);
60467 + fscache_stat_unchecked(&fscache_n_store_calls);
60468
60469 /* find a page to store */
60470 page = NULL;
60471 @@ -802,7 +802,7 @@ static void fscache_write_op(struct fscache_operation *_op)
60472 page = results[0];
60473 _debug("gang %d [%lx]", n, page->index);
60474 if (page->index > op->store_limit) {
60475 - fscache_stat(&fscache_n_store_pages_over_limit);
60476 + fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
60477 goto superseded;
60478 }
60479
60480 @@ -814,7 +814,7 @@ static void fscache_write_op(struct fscache_operation *_op)
60481 spin_unlock(&cookie->stores_lock);
60482 spin_unlock(&object->lock);
60483
60484 - fscache_stat(&fscache_n_store_pages);
60485 + fscache_stat_unchecked(&fscache_n_store_pages);
60486 fscache_stat(&fscache_n_cop_write_page);
60487 ret = object->cache->ops->write_page(op, page);
60488 fscache_stat_d(&fscache_n_cop_write_page);
60489 @@ -918,7 +918,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
60490 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
60491 ASSERT(PageFsCache(page));
60492
60493 - fscache_stat(&fscache_n_stores);
60494 + fscache_stat_unchecked(&fscache_n_stores);
60495
60496 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
60497 _leave(" = -ENOBUFS [invalidating]");
60498 @@ -977,7 +977,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
60499 spin_unlock(&cookie->stores_lock);
60500 spin_unlock(&object->lock);
60501
60502 - op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
60503 + op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
60504 op->store_limit = object->store_limit;
60505
60506 __fscache_use_cookie(cookie);
60507 @@ -986,8 +986,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
60508
60509 spin_unlock(&cookie->lock);
60510 radix_tree_preload_end();
60511 - fscache_stat(&fscache_n_store_ops);
60512 - fscache_stat(&fscache_n_stores_ok);
60513 + fscache_stat_unchecked(&fscache_n_store_ops);
60514 + fscache_stat_unchecked(&fscache_n_stores_ok);
60515
60516 /* the work queue now carries its own ref on the object */
60517 fscache_put_operation(&op->op);
60518 @@ -995,14 +995,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
60519 return 0;
60520
60521 already_queued:
60522 - fscache_stat(&fscache_n_stores_again);
60523 + fscache_stat_unchecked(&fscache_n_stores_again);
60524 already_pending:
60525 spin_unlock(&cookie->stores_lock);
60526 spin_unlock(&object->lock);
60527 spin_unlock(&cookie->lock);
60528 radix_tree_preload_end();
60529 kfree(op);
60530 - fscache_stat(&fscache_n_stores_ok);
60531 + fscache_stat_unchecked(&fscache_n_stores_ok);
60532 _leave(" = 0");
60533 return 0;
60534
60535 @@ -1024,14 +1024,14 @@ nobufs:
60536 kfree(op);
60537 if (wake_cookie)
60538 __fscache_wake_unused_cookie(cookie);
60539 - fscache_stat(&fscache_n_stores_nobufs);
60540 + fscache_stat_unchecked(&fscache_n_stores_nobufs);
60541 _leave(" = -ENOBUFS");
60542 return -ENOBUFS;
60543
60544 nomem_free:
60545 kfree(op);
60546 nomem:
60547 - fscache_stat(&fscache_n_stores_oom);
60548 + fscache_stat_unchecked(&fscache_n_stores_oom);
60549 _leave(" = -ENOMEM");
60550 return -ENOMEM;
60551 }
60552 @@ -1049,7 +1049,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
60553 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
60554 ASSERTCMP(page, !=, NULL);
60555
60556 - fscache_stat(&fscache_n_uncaches);
60557 + fscache_stat_unchecked(&fscache_n_uncaches);
60558
60559 /* cache withdrawal may beat us to it */
60560 if (!PageFsCache(page))
60561 @@ -1100,7 +1100,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
60562 struct fscache_cookie *cookie = op->op.object->cookie;
60563
60564 #ifdef CONFIG_FSCACHE_STATS
60565 - atomic_inc(&fscache_n_marks);
60566 + atomic_inc_unchecked(&fscache_n_marks);
60567 #endif
60568
60569 _debug("- mark %p{%lx}", page, page->index);
60570 diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
60571 index 40d13c7..ddf52b9 100644
60572 --- a/fs/fscache/stats.c
60573 +++ b/fs/fscache/stats.c
60574 @@ -18,99 +18,99 @@
60575 /*
60576 * operation counters
60577 */
60578 -atomic_t fscache_n_op_pend;
60579 -atomic_t fscache_n_op_run;
60580 -atomic_t fscache_n_op_enqueue;
60581 -atomic_t fscache_n_op_requeue;
60582 -atomic_t fscache_n_op_deferred_release;
60583 -atomic_t fscache_n_op_release;
60584 -atomic_t fscache_n_op_gc;
60585 -atomic_t fscache_n_op_cancelled;
60586 -atomic_t fscache_n_op_rejected;
60587 +atomic_unchecked_t fscache_n_op_pend;
60588 +atomic_unchecked_t fscache_n_op_run;
60589 +atomic_unchecked_t fscache_n_op_enqueue;
60590 +atomic_unchecked_t fscache_n_op_requeue;
60591 +atomic_unchecked_t fscache_n_op_deferred_release;
60592 +atomic_unchecked_t fscache_n_op_release;
60593 +atomic_unchecked_t fscache_n_op_gc;
60594 +atomic_unchecked_t fscache_n_op_cancelled;
60595 +atomic_unchecked_t fscache_n_op_rejected;
60596
60597 -atomic_t fscache_n_attr_changed;
60598 -atomic_t fscache_n_attr_changed_ok;
60599 -atomic_t fscache_n_attr_changed_nobufs;
60600 -atomic_t fscache_n_attr_changed_nomem;
60601 -atomic_t fscache_n_attr_changed_calls;
60602 +atomic_unchecked_t fscache_n_attr_changed;
60603 +atomic_unchecked_t fscache_n_attr_changed_ok;
60604 +atomic_unchecked_t fscache_n_attr_changed_nobufs;
60605 +atomic_unchecked_t fscache_n_attr_changed_nomem;
60606 +atomic_unchecked_t fscache_n_attr_changed_calls;
60607
60608 -atomic_t fscache_n_allocs;
60609 -atomic_t fscache_n_allocs_ok;
60610 -atomic_t fscache_n_allocs_wait;
60611 -atomic_t fscache_n_allocs_nobufs;
60612 -atomic_t fscache_n_allocs_intr;
60613 -atomic_t fscache_n_allocs_object_dead;
60614 -atomic_t fscache_n_alloc_ops;
60615 -atomic_t fscache_n_alloc_op_waits;
60616 +atomic_unchecked_t fscache_n_allocs;
60617 +atomic_unchecked_t fscache_n_allocs_ok;
60618 +atomic_unchecked_t fscache_n_allocs_wait;
60619 +atomic_unchecked_t fscache_n_allocs_nobufs;
60620 +atomic_unchecked_t fscache_n_allocs_intr;
60621 +atomic_unchecked_t fscache_n_allocs_object_dead;
60622 +atomic_unchecked_t fscache_n_alloc_ops;
60623 +atomic_unchecked_t fscache_n_alloc_op_waits;
60624
60625 -atomic_t fscache_n_retrievals;
60626 -atomic_t fscache_n_retrievals_ok;
60627 -atomic_t fscache_n_retrievals_wait;
60628 -atomic_t fscache_n_retrievals_nodata;
60629 -atomic_t fscache_n_retrievals_nobufs;
60630 -atomic_t fscache_n_retrievals_intr;
60631 -atomic_t fscache_n_retrievals_nomem;
60632 -atomic_t fscache_n_retrievals_object_dead;
60633 -atomic_t fscache_n_retrieval_ops;
60634 -atomic_t fscache_n_retrieval_op_waits;
60635 +atomic_unchecked_t fscache_n_retrievals;
60636 +atomic_unchecked_t fscache_n_retrievals_ok;
60637 +atomic_unchecked_t fscache_n_retrievals_wait;
60638 +atomic_unchecked_t fscache_n_retrievals_nodata;
60639 +atomic_unchecked_t fscache_n_retrievals_nobufs;
60640 +atomic_unchecked_t fscache_n_retrievals_intr;
60641 +atomic_unchecked_t fscache_n_retrievals_nomem;
60642 +atomic_unchecked_t fscache_n_retrievals_object_dead;
60643 +atomic_unchecked_t fscache_n_retrieval_ops;
60644 +atomic_unchecked_t fscache_n_retrieval_op_waits;
60645
60646 -atomic_t fscache_n_stores;
60647 -atomic_t fscache_n_stores_ok;
60648 -atomic_t fscache_n_stores_again;
60649 -atomic_t fscache_n_stores_nobufs;
60650 -atomic_t fscache_n_stores_oom;
60651 -atomic_t fscache_n_store_ops;
60652 -atomic_t fscache_n_store_calls;
60653 -atomic_t fscache_n_store_pages;
60654 -atomic_t fscache_n_store_radix_deletes;
60655 -atomic_t fscache_n_store_pages_over_limit;
60656 +atomic_unchecked_t fscache_n_stores;
60657 +atomic_unchecked_t fscache_n_stores_ok;
60658 +atomic_unchecked_t fscache_n_stores_again;
60659 +atomic_unchecked_t fscache_n_stores_nobufs;
60660 +atomic_unchecked_t fscache_n_stores_oom;
60661 +atomic_unchecked_t fscache_n_store_ops;
60662 +atomic_unchecked_t fscache_n_store_calls;
60663 +atomic_unchecked_t fscache_n_store_pages;
60664 +atomic_unchecked_t fscache_n_store_radix_deletes;
60665 +atomic_unchecked_t fscache_n_store_pages_over_limit;
60666
60667 -atomic_t fscache_n_store_vmscan_not_storing;
60668 -atomic_t fscache_n_store_vmscan_gone;
60669 -atomic_t fscache_n_store_vmscan_busy;
60670 -atomic_t fscache_n_store_vmscan_cancelled;
60671 -atomic_t fscache_n_store_vmscan_wait;
60672 +atomic_unchecked_t fscache_n_store_vmscan_not_storing;
60673 +atomic_unchecked_t fscache_n_store_vmscan_gone;
60674 +atomic_unchecked_t fscache_n_store_vmscan_busy;
60675 +atomic_unchecked_t fscache_n_store_vmscan_cancelled;
60676 +atomic_unchecked_t fscache_n_store_vmscan_wait;
60677
60678 -atomic_t fscache_n_marks;
60679 -atomic_t fscache_n_uncaches;
60680 +atomic_unchecked_t fscache_n_marks;
60681 +atomic_unchecked_t fscache_n_uncaches;
60682
60683 -atomic_t fscache_n_acquires;
60684 -atomic_t fscache_n_acquires_null;
60685 -atomic_t fscache_n_acquires_no_cache;
60686 -atomic_t fscache_n_acquires_ok;
60687 -atomic_t fscache_n_acquires_nobufs;
60688 -atomic_t fscache_n_acquires_oom;
60689 +atomic_unchecked_t fscache_n_acquires;
60690 +atomic_unchecked_t fscache_n_acquires_null;
60691 +atomic_unchecked_t fscache_n_acquires_no_cache;
60692 +atomic_unchecked_t fscache_n_acquires_ok;
60693 +atomic_unchecked_t fscache_n_acquires_nobufs;
60694 +atomic_unchecked_t fscache_n_acquires_oom;
60695
60696 -atomic_t fscache_n_invalidates;
60697 -atomic_t fscache_n_invalidates_run;
60698 +atomic_unchecked_t fscache_n_invalidates;
60699 +atomic_unchecked_t fscache_n_invalidates_run;
60700
60701 -atomic_t fscache_n_updates;
60702 -atomic_t fscache_n_updates_null;
60703 -atomic_t fscache_n_updates_run;
60704 +atomic_unchecked_t fscache_n_updates;
60705 +atomic_unchecked_t fscache_n_updates_null;
60706 +atomic_unchecked_t fscache_n_updates_run;
60707
60708 -atomic_t fscache_n_relinquishes;
60709 -atomic_t fscache_n_relinquishes_null;
60710 -atomic_t fscache_n_relinquishes_waitcrt;
60711 -atomic_t fscache_n_relinquishes_retire;
60712 +atomic_unchecked_t fscache_n_relinquishes;
60713 +atomic_unchecked_t fscache_n_relinquishes_null;
60714 +atomic_unchecked_t fscache_n_relinquishes_waitcrt;
60715 +atomic_unchecked_t fscache_n_relinquishes_retire;
60716
60717 -atomic_t fscache_n_cookie_index;
60718 -atomic_t fscache_n_cookie_data;
60719 -atomic_t fscache_n_cookie_special;
60720 +atomic_unchecked_t fscache_n_cookie_index;
60721 +atomic_unchecked_t fscache_n_cookie_data;
60722 +atomic_unchecked_t fscache_n_cookie_special;
60723
60724 -atomic_t fscache_n_object_alloc;
60725 -atomic_t fscache_n_object_no_alloc;
60726 -atomic_t fscache_n_object_lookups;
60727 -atomic_t fscache_n_object_lookups_negative;
60728 -atomic_t fscache_n_object_lookups_positive;
60729 -atomic_t fscache_n_object_lookups_timed_out;
60730 -atomic_t fscache_n_object_created;
60731 -atomic_t fscache_n_object_avail;
60732 -atomic_t fscache_n_object_dead;
60733 +atomic_unchecked_t fscache_n_object_alloc;
60734 +atomic_unchecked_t fscache_n_object_no_alloc;
60735 +atomic_unchecked_t fscache_n_object_lookups;
60736 +atomic_unchecked_t fscache_n_object_lookups_negative;
60737 +atomic_unchecked_t fscache_n_object_lookups_positive;
60738 +atomic_unchecked_t fscache_n_object_lookups_timed_out;
60739 +atomic_unchecked_t fscache_n_object_created;
60740 +atomic_unchecked_t fscache_n_object_avail;
60741 +atomic_unchecked_t fscache_n_object_dead;
60742
60743 -atomic_t fscache_n_checkaux_none;
60744 -atomic_t fscache_n_checkaux_okay;
60745 -atomic_t fscache_n_checkaux_update;
60746 -atomic_t fscache_n_checkaux_obsolete;
60747 +atomic_unchecked_t fscache_n_checkaux_none;
60748 +atomic_unchecked_t fscache_n_checkaux_okay;
60749 +atomic_unchecked_t fscache_n_checkaux_update;
60750 +atomic_unchecked_t fscache_n_checkaux_obsolete;
60751
60752 atomic_t fscache_n_cop_alloc_object;
60753 atomic_t fscache_n_cop_lookup_object;
60754 @@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
60755 seq_puts(m, "FS-Cache statistics\n");
60756
60757 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
60758 - atomic_read(&fscache_n_cookie_index),
60759 - atomic_read(&fscache_n_cookie_data),
60760 - atomic_read(&fscache_n_cookie_special));
60761 + atomic_read_unchecked(&fscache_n_cookie_index),
60762 + atomic_read_unchecked(&fscache_n_cookie_data),
60763 + atomic_read_unchecked(&fscache_n_cookie_special));
60764
60765 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
60766 - atomic_read(&fscache_n_object_alloc),
60767 - atomic_read(&fscache_n_object_no_alloc),
60768 - atomic_read(&fscache_n_object_avail),
60769 - atomic_read(&fscache_n_object_dead));
60770 + atomic_read_unchecked(&fscache_n_object_alloc),
60771 + atomic_read_unchecked(&fscache_n_object_no_alloc),
60772 + atomic_read_unchecked(&fscache_n_object_avail),
60773 + atomic_read_unchecked(&fscache_n_object_dead));
60774 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
60775 - atomic_read(&fscache_n_checkaux_none),
60776 - atomic_read(&fscache_n_checkaux_okay),
60777 - atomic_read(&fscache_n_checkaux_update),
60778 - atomic_read(&fscache_n_checkaux_obsolete));
60779 + atomic_read_unchecked(&fscache_n_checkaux_none),
60780 + atomic_read_unchecked(&fscache_n_checkaux_okay),
60781 + atomic_read_unchecked(&fscache_n_checkaux_update),
60782 + atomic_read_unchecked(&fscache_n_checkaux_obsolete));
60783
60784 seq_printf(m, "Pages : mrk=%u unc=%u\n",
60785 - atomic_read(&fscache_n_marks),
60786 - atomic_read(&fscache_n_uncaches));
60787 + atomic_read_unchecked(&fscache_n_marks),
60788 + atomic_read_unchecked(&fscache_n_uncaches));
60789
60790 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
60791 " oom=%u\n",
60792 - atomic_read(&fscache_n_acquires),
60793 - atomic_read(&fscache_n_acquires_null),
60794 - atomic_read(&fscache_n_acquires_no_cache),
60795 - atomic_read(&fscache_n_acquires_ok),
60796 - atomic_read(&fscache_n_acquires_nobufs),
60797 - atomic_read(&fscache_n_acquires_oom));
60798 + atomic_read_unchecked(&fscache_n_acquires),
60799 + atomic_read_unchecked(&fscache_n_acquires_null),
60800 + atomic_read_unchecked(&fscache_n_acquires_no_cache),
60801 + atomic_read_unchecked(&fscache_n_acquires_ok),
60802 + atomic_read_unchecked(&fscache_n_acquires_nobufs),
60803 + atomic_read_unchecked(&fscache_n_acquires_oom));
60804
60805 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
60806 - atomic_read(&fscache_n_object_lookups),
60807 - atomic_read(&fscache_n_object_lookups_negative),
60808 - atomic_read(&fscache_n_object_lookups_positive),
60809 - atomic_read(&fscache_n_object_created),
60810 - atomic_read(&fscache_n_object_lookups_timed_out));
60811 + atomic_read_unchecked(&fscache_n_object_lookups),
60812 + atomic_read_unchecked(&fscache_n_object_lookups_negative),
60813 + atomic_read_unchecked(&fscache_n_object_lookups_positive),
60814 + atomic_read_unchecked(&fscache_n_object_created),
60815 + atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
60816
60817 seq_printf(m, "Invals : n=%u run=%u\n",
60818 - atomic_read(&fscache_n_invalidates),
60819 - atomic_read(&fscache_n_invalidates_run));
60820 + atomic_read_unchecked(&fscache_n_invalidates),
60821 + atomic_read_unchecked(&fscache_n_invalidates_run));
60822
60823 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
60824 - atomic_read(&fscache_n_updates),
60825 - atomic_read(&fscache_n_updates_null),
60826 - atomic_read(&fscache_n_updates_run));
60827 + atomic_read_unchecked(&fscache_n_updates),
60828 + atomic_read_unchecked(&fscache_n_updates_null),
60829 + atomic_read_unchecked(&fscache_n_updates_run));
60830
60831 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
60832 - atomic_read(&fscache_n_relinquishes),
60833 - atomic_read(&fscache_n_relinquishes_null),
60834 - atomic_read(&fscache_n_relinquishes_waitcrt),
60835 - atomic_read(&fscache_n_relinquishes_retire));
60836 + atomic_read_unchecked(&fscache_n_relinquishes),
60837 + atomic_read_unchecked(&fscache_n_relinquishes_null),
60838 + atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
60839 + atomic_read_unchecked(&fscache_n_relinquishes_retire));
60840
60841 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
60842 - atomic_read(&fscache_n_attr_changed),
60843 - atomic_read(&fscache_n_attr_changed_ok),
60844 - atomic_read(&fscache_n_attr_changed_nobufs),
60845 - atomic_read(&fscache_n_attr_changed_nomem),
60846 - atomic_read(&fscache_n_attr_changed_calls));
60847 + atomic_read_unchecked(&fscache_n_attr_changed),
60848 + atomic_read_unchecked(&fscache_n_attr_changed_ok),
60849 + atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
60850 + atomic_read_unchecked(&fscache_n_attr_changed_nomem),
60851 + atomic_read_unchecked(&fscache_n_attr_changed_calls));
60852
60853 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
60854 - atomic_read(&fscache_n_allocs),
60855 - atomic_read(&fscache_n_allocs_ok),
60856 - atomic_read(&fscache_n_allocs_wait),
60857 - atomic_read(&fscache_n_allocs_nobufs),
60858 - atomic_read(&fscache_n_allocs_intr));
60859 + atomic_read_unchecked(&fscache_n_allocs),
60860 + atomic_read_unchecked(&fscache_n_allocs_ok),
60861 + atomic_read_unchecked(&fscache_n_allocs_wait),
60862 + atomic_read_unchecked(&fscache_n_allocs_nobufs),
60863 + atomic_read_unchecked(&fscache_n_allocs_intr));
60864 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
60865 - atomic_read(&fscache_n_alloc_ops),
60866 - atomic_read(&fscache_n_alloc_op_waits),
60867 - atomic_read(&fscache_n_allocs_object_dead));
60868 + atomic_read_unchecked(&fscache_n_alloc_ops),
60869 + atomic_read_unchecked(&fscache_n_alloc_op_waits),
60870 + atomic_read_unchecked(&fscache_n_allocs_object_dead));
60871
60872 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
60873 " int=%u oom=%u\n",
60874 - atomic_read(&fscache_n_retrievals),
60875 - atomic_read(&fscache_n_retrievals_ok),
60876 - atomic_read(&fscache_n_retrievals_wait),
60877 - atomic_read(&fscache_n_retrievals_nodata),
60878 - atomic_read(&fscache_n_retrievals_nobufs),
60879 - atomic_read(&fscache_n_retrievals_intr),
60880 - atomic_read(&fscache_n_retrievals_nomem));
60881 + atomic_read_unchecked(&fscache_n_retrievals),
60882 + atomic_read_unchecked(&fscache_n_retrievals_ok),
60883 + atomic_read_unchecked(&fscache_n_retrievals_wait),
60884 + atomic_read_unchecked(&fscache_n_retrievals_nodata),
60885 + atomic_read_unchecked(&fscache_n_retrievals_nobufs),
60886 + atomic_read_unchecked(&fscache_n_retrievals_intr),
60887 + atomic_read_unchecked(&fscache_n_retrievals_nomem));
60888 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
60889 - atomic_read(&fscache_n_retrieval_ops),
60890 - atomic_read(&fscache_n_retrieval_op_waits),
60891 - atomic_read(&fscache_n_retrievals_object_dead));
60892 + atomic_read_unchecked(&fscache_n_retrieval_ops),
60893 + atomic_read_unchecked(&fscache_n_retrieval_op_waits),
60894 + atomic_read_unchecked(&fscache_n_retrievals_object_dead));
60895
60896 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
60897 - atomic_read(&fscache_n_stores),
60898 - atomic_read(&fscache_n_stores_ok),
60899 - atomic_read(&fscache_n_stores_again),
60900 - atomic_read(&fscache_n_stores_nobufs),
60901 - atomic_read(&fscache_n_stores_oom));
60902 + atomic_read_unchecked(&fscache_n_stores),
60903 + atomic_read_unchecked(&fscache_n_stores_ok),
60904 + atomic_read_unchecked(&fscache_n_stores_again),
60905 + atomic_read_unchecked(&fscache_n_stores_nobufs),
60906 + atomic_read_unchecked(&fscache_n_stores_oom));
60907 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
60908 - atomic_read(&fscache_n_store_ops),
60909 - atomic_read(&fscache_n_store_calls),
60910 - atomic_read(&fscache_n_store_pages),
60911 - atomic_read(&fscache_n_store_radix_deletes),
60912 - atomic_read(&fscache_n_store_pages_over_limit));
60913 + atomic_read_unchecked(&fscache_n_store_ops),
60914 + atomic_read_unchecked(&fscache_n_store_calls),
60915 + atomic_read_unchecked(&fscache_n_store_pages),
60916 + atomic_read_unchecked(&fscache_n_store_radix_deletes),
60917 + atomic_read_unchecked(&fscache_n_store_pages_over_limit));
60918
60919 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
60920 - atomic_read(&fscache_n_store_vmscan_not_storing),
60921 - atomic_read(&fscache_n_store_vmscan_gone),
60922 - atomic_read(&fscache_n_store_vmscan_busy),
60923 - atomic_read(&fscache_n_store_vmscan_cancelled),
60924 - atomic_read(&fscache_n_store_vmscan_wait));
60925 + atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
60926 + atomic_read_unchecked(&fscache_n_store_vmscan_gone),
60927 + atomic_read_unchecked(&fscache_n_store_vmscan_busy),
60928 + atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
60929 + atomic_read_unchecked(&fscache_n_store_vmscan_wait));
60930
60931 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
60932 - atomic_read(&fscache_n_op_pend),
60933 - atomic_read(&fscache_n_op_run),
60934 - atomic_read(&fscache_n_op_enqueue),
60935 - atomic_read(&fscache_n_op_cancelled),
60936 - atomic_read(&fscache_n_op_rejected));
60937 + atomic_read_unchecked(&fscache_n_op_pend),
60938 + atomic_read_unchecked(&fscache_n_op_run),
60939 + atomic_read_unchecked(&fscache_n_op_enqueue),
60940 + atomic_read_unchecked(&fscache_n_op_cancelled),
60941 + atomic_read_unchecked(&fscache_n_op_rejected));
60942 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
60943 - atomic_read(&fscache_n_op_deferred_release),
60944 - atomic_read(&fscache_n_op_release),
60945 - atomic_read(&fscache_n_op_gc));
60946 + atomic_read_unchecked(&fscache_n_op_deferred_release),
60947 + atomic_read_unchecked(&fscache_n_op_release),
60948 + atomic_read_unchecked(&fscache_n_op_gc));
60949
60950 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
60951 atomic_read(&fscache_n_cop_alloc_object),
60952 diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
60953 index b96a49b..9bfdc47 100644
60954 --- a/fs/fuse/cuse.c
60955 +++ b/fs/fuse/cuse.c
60956 @@ -606,10 +606,12 @@ static int __init cuse_init(void)
60957 INIT_LIST_HEAD(&cuse_conntbl[i]);
60958
60959 /* inherit and extend fuse_dev_operations */
60960 - cuse_channel_fops = fuse_dev_operations;
60961 - cuse_channel_fops.owner = THIS_MODULE;
60962 - cuse_channel_fops.open = cuse_channel_open;
60963 - cuse_channel_fops.release = cuse_channel_release;
60964 + pax_open_kernel();
60965 + memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
60966 + *(void **)&cuse_channel_fops.owner = THIS_MODULE;
60967 + *(void **)&cuse_channel_fops.open = cuse_channel_open;
60968 + *(void **)&cuse_channel_fops.release = cuse_channel_release;
60969 + pax_close_kernel();
60970
60971 cuse_class = class_create(THIS_MODULE, "cuse");
60972 if (IS_ERR(cuse_class))
60973 diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
60974 index 0a648bb..8d463f1 100644
60975 --- a/fs/fuse/dev.c
60976 +++ b/fs/fuse/dev.c
60977 @@ -1323,7 +1323,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
60978 ret = 0;
60979 pipe_lock(pipe);
60980
60981 - if (!pipe->readers) {
60982 + if (!atomic_read(&pipe->readers)) {
60983 send_sig(SIGPIPE, current, 0);
60984 if (!ret)
60985 ret = -EPIPE;
60986 @@ -1352,7 +1352,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
60987 page_nr++;
60988 ret += buf->len;
60989
60990 - if (pipe->files)
60991 + if (atomic_read(&pipe->files))
60992 do_wakeup = 1;
60993 }
60994
60995 diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
60996 index 1d1292c..bba17ea 100644
60997 --- a/fs/fuse/dir.c
60998 +++ b/fs/fuse/dir.c
60999 @@ -1418,7 +1418,7 @@ static char *read_link(struct dentry *dentry)
61000 return link;
61001 }
61002
61003 -static void free_link(char *link)
61004 +static void free_link(const char *link)
61005 {
61006 if (!IS_ERR(link))
61007 free_page((unsigned long) link);
61008 diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
61009 index fe649d3..c679164 100644
61010 --- a/fs/hostfs/hostfs_kern.c
61011 +++ b/fs/hostfs/hostfs_kern.c
61012 @@ -898,7 +898,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
61013
61014 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
61015 {
61016 - char *s = nd_get_link(nd);
61017 + const char *s = nd_get_link(nd);
61018 if (!IS_ERR(s))
61019 __putname(s);
61020 }
61021 diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
61022 index d19b30a..ef89c36 100644
61023 --- a/fs/hugetlbfs/inode.c
61024 +++ b/fs/hugetlbfs/inode.c
61025 @@ -152,6 +152,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
61026 struct mm_struct *mm = current->mm;
61027 struct vm_area_struct *vma;
61028 struct hstate *h = hstate_file(file);
61029 + unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
61030 struct vm_unmapped_area_info info;
61031
61032 if (len & ~huge_page_mask(h))
61033 @@ -165,17 +166,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
61034 return addr;
61035 }
61036
61037 +#ifdef CONFIG_PAX_RANDMMAP
61038 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
61039 +#endif
61040 +
61041 if (addr) {
61042 addr = ALIGN(addr, huge_page_size(h));
61043 vma = find_vma(mm, addr);
61044 - if (TASK_SIZE - len >= addr &&
61045 - (!vma || addr + len <= vma->vm_start))
61046 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
61047 return addr;
61048 }
61049
61050 info.flags = 0;
61051 info.length = len;
61052 info.low_limit = TASK_UNMAPPED_BASE;
61053 +
61054 +#ifdef CONFIG_PAX_RANDMMAP
61055 + if (mm->pax_flags & MF_PAX_RANDMMAP)
61056 + info.low_limit += mm->delta_mmap;
61057 +#endif
61058 +
61059 info.high_limit = TASK_SIZE;
61060 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
61061 info.align_offset = 0;
61062 @@ -908,7 +918,7 @@ static struct file_system_type hugetlbfs_fs_type = {
61063 };
61064 MODULE_ALIAS_FS("hugetlbfs");
61065
61066 -static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
61067 +struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
61068
61069 static int can_do_hugetlb_shm(void)
61070 {
61071 diff --git a/fs/inode.c b/fs/inode.c
61072 index 4bcdad3..1883822 100644
61073 --- a/fs/inode.c
61074 +++ b/fs/inode.c
61075 @@ -841,8 +841,8 @@ unsigned int get_next_ino(void)
61076
61077 #ifdef CONFIG_SMP
61078 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
61079 - static atomic_t shared_last_ino;
61080 - int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
61081 + static atomic_unchecked_t shared_last_ino;
61082 + int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
61083
61084 res = next - LAST_INO_BATCH;
61085 }
61086 diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
61087 index 4a6cf28..d3a29d3 100644
61088 --- a/fs/jffs2/erase.c
61089 +++ b/fs/jffs2/erase.c
61090 @@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
61091 struct jffs2_unknown_node marker = {
61092 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
61093 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
61094 - .totlen = cpu_to_je32(c->cleanmarker_size)
61095 + .totlen = cpu_to_je32(c->cleanmarker_size),
61096 + .hdr_crc = cpu_to_je32(0)
61097 };
61098
61099 jffs2_prealloc_raw_node_refs(c, jeb, 1);
61100 diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
61101 index a6597d6..41b30ec 100644
61102 --- a/fs/jffs2/wbuf.c
61103 +++ b/fs/jffs2/wbuf.c
61104 @@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
61105 {
61106 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
61107 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
61108 - .totlen = constant_cpu_to_je32(8)
61109 + .totlen = constant_cpu_to_je32(8),
61110 + .hdr_crc = constant_cpu_to_je32(0)
61111 };
61112
61113 /*
61114 diff --git a/fs/jfs/super.c b/fs/jfs/super.c
61115 index e2b7483..855bca3 100644
61116 --- a/fs/jfs/super.c
61117 +++ b/fs/jfs/super.c
61118 @@ -884,7 +884,7 @@ static int __init init_jfs_fs(void)
61119
61120 jfs_inode_cachep =
61121 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
61122 - SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
61123 + SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
61124 init_once);
61125 if (jfs_inode_cachep == NULL)
61126 return -ENOMEM;
61127 diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
61128 index 39c0143..d54fad4 100644
61129 --- a/fs/kernfs/dir.c
61130 +++ b/fs/kernfs/dir.c
61131 @@ -28,7 +28,7 @@ DEFINE_MUTEX(kernfs_mutex);
61132 *
61133 * Returns 31 bit hash of ns + name (so it fits in an off_t )
61134 */
61135 -static unsigned int kernfs_name_hash(const char *name, const void *ns)
61136 +static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
61137 {
61138 unsigned long hash = init_name_hash();
61139 unsigned int len = strlen(name);
61140 diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
61141 index dbf397b..d624b48 100644
61142 --- a/fs/kernfs/file.c
61143 +++ b/fs/kernfs/file.c
61144 @@ -33,7 +33,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
61145
61146 struct kernfs_open_node {
61147 atomic_t refcnt;
61148 - atomic_t event;
61149 + atomic_unchecked_t event;
61150 wait_queue_head_t poll;
61151 struct list_head files; /* goes through kernfs_open_file.list */
61152 };
61153 @@ -149,7 +149,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
61154 {
61155 struct kernfs_open_file *of = sf->private;
61156
61157 - of->event = atomic_read(&of->kn->attr.open->event);
61158 + of->event = atomic_read_unchecked(&of->kn->attr.open->event);
61159
61160 return of->kn->attr.ops->seq_show(sf, v);
61161 }
61162 @@ -353,12 +353,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
61163 return ret;
61164 }
61165
61166 -static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
61167 - void *buf, int len, int write)
61168 +static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
61169 + void *buf, size_t len, int write)
61170 {
61171 struct file *file = vma->vm_file;
61172 struct kernfs_open_file *of = kernfs_of(file);
61173 - int ret;
61174 + ssize_t ret;
61175
61176 if (!of->vm_ops)
61177 return -EINVAL;
61178 @@ -557,7 +557,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
61179 return -ENOMEM;
61180
61181 atomic_set(&new_on->refcnt, 0);
61182 - atomic_set(&new_on->event, 1);
61183 + atomic_set_unchecked(&new_on->event, 1);
61184 init_waitqueue_head(&new_on->poll);
61185 INIT_LIST_HEAD(&new_on->files);
61186 goto retry;
61187 @@ -754,7 +754,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
61188
61189 kernfs_put_active(kn);
61190
61191 - if (of->event != atomic_read(&on->event))
61192 + if (of->event != atomic_read_unchecked(&on->event))
61193 goto trigger;
61194
61195 return DEFAULT_POLLMASK;
61196 @@ -779,7 +779,7 @@ void kernfs_notify(struct kernfs_node *kn)
61197 if (!WARN_ON(kernfs_type(kn) != KERNFS_FILE)) {
61198 on = kn->attr.open;
61199 if (on) {
61200 - atomic_inc(&on->event);
61201 + atomic_inc_unchecked(&on->event);
61202 wake_up_interruptible(&on->poll);
61203 }
61204 }
61205 diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
61206 index 4d45705..b35e0bd 100644
61207 --- a/fs/kernfs/symlink.c
61208 +++ b/fs/kernfs/symlink.c
61209 @@ -132,7 +132,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
61210 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
61211 void *cookie)
61212 {
61213 - char *page = nd_get_link(nd);
61214 + const char *page = nd_get_link(nd);
61215 if (!IS_ERR(page))
61216 free_page((unsigned long)page);
61217 }
61218 diff --git a/fs/libfs.c b/fs/libfs.c
61219 index a184424..944ddce 100644
61220 --- a/fs/libfs.c
61221 +++ b/fs/libfs.c
61222 @@ -159,6 +159,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
61223
61224 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
61225 struct dentry *next = list_entry(p, struct dentry, d_u.d_child);
61226 + char d_name[sizeof(next->d_iname)];
61227 + const unsigned char *name;
61228 +
61229 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
61230 if (!simple_positive(next)) {
61231 spin_unlock(&next->d_lock);
61232 @@ -167,7 +170,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
61233
61234 spin_unlock(&next->d_lock);
61235 spin_unlock(&dentry->d_lock);
61236 - if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
61237 + name = next->d_name.name;
61238 + if (name == next->d_iname) {
61239 + memcpy(d_name, name, next->d_name.len);
61240 + name = d_name;
61241 + }
61242 + if (!dir_emit(ctx, name, next->d_name.len,
61243 next->d_inode->i_ino, dt_type(next->d_inode)))
61244 return 0;
61245 spin_lock(&dentry->d_lock);
61246 @@ -999,7 +1007,7 @@ EXPORT_SYMBOL(noop_fsync);
61247 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
61248 void *cookie)
61249 {
61250 - char *s = nd_get_link(nd);
61251 + const char *s = nd_get_link(nd);
61252 if (!IS_ERR(s))
61253 kfree(s);
61254 }
61255 diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
61256 index acd3947..1f896e2 100644
61257 --- a/fs/lockd/clntproc.c
61258 +++ b/fs/lockd/clntproc.c
61259 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
61260 /*
61261 * Cookie counter for NLM requests
61262 */
61263 -static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
61264 +static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
61265
61266 void nlmclnt_next_cookie(struct nlm_cookie *c)
61267 {
61268 - u32 cookie = atomic_inc_return(&nlm_cookie);
61269 + u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
61270
61271 memcpy(c->data, &cookie, 4);
61272 c->len=4;
61273 diff --git a/fs/locks.c b/fs/locks.c
61274 index 92a0f0a..45a48f0 100644
61275 --- a/fs/locks.c
61276 +++ b/fs/locks.c
61277 @@ -2219,16 +2219,16 @@ void locks_remove_flock(struct file *filp)
61278 return;
61279
61280 if (filp->f_op->flock) {
61281 - struct file_lock fl = {
61282 + struct file_lock flock = {
61283 .fl_pid = current->tgid,
61284 .fl_file = filp,
61285 .fl_flags = FL_FLOCK,
61286 .fl_type = F_UNLCK,
61287 .fl_end = OFFSET_MAX,
61288 };
61289 - filp->f_op->flock(filp, F_SETLKW, &fl);
61290 - if (fl.fl_ops && fl.fl_ops->fl_release_private)
61291 - fl.fl_ops->fl_release_private(&fl);
61292 + filp->f_op->flock(filp, F_SETLKW, &flock);
61293 + if (flock.fl_ops && flock.fl_ops->fl_release_private)
61294 + flock.fl_ops->fl_release_private(&flock);
61295 }
61296
61297 spin_lock(&inode->i_lock);
61298 diff --git a/fs/mount.h b/fs/mount.h
61299 index b29e42f..5ea7fdf 100644
61300 --- a/fs/mount.h
61301 +++ b/fs/mount.h
61302 @@ -11,7 +11,7 @@ struct mnt_namespace {
61303 u64 seq; /* Sequence number to prevent loops */
61304 wait_queue_head_t poll;
61305 int event;
61306 -};
61307 +} __randomize_layout;
61308
61309 struct mnt_pcp {
61310 int mnt_count;
61311 @@ -57,7 +57,7 @@ struct mount {
61312 int mnt_expiry_mark; /* true if marked for expiry */
61313 int mnt_pinned;
61314 struct path mnt_ex_mountpoint;
61315 -};
61316 +} __randomize_layout;
61317
61318 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
61319
61320 diff --git a/fs/namei.c b/fs/namei.c
61321 index 4b491b4..a0166f9 100644
61322 --- a/fs/namei.c
61323 +++ b/fs/namei.c
61324 @@ -330,16 +330,32 @@ int generic_permission(struct inode *inode, int mask)
61325 if (ret != -EACCES)
61326 return ret;
61327
61328 +#ifdef CONFIG_GRKERNSEC
61329 + /* we'll block if we have to log due to a denied capability use */
61330 + if (mask & MAY_NOT_BLOCK)
61331 + return -ECHILD;
61332 +#endif
61333 +
61334 if (S_ISDIR(inode->i_mode)) {
61335 /* DACs are overridable for directories */
61336 - if (inode_capable(inode, CAP_DAC_OVERRIDE))
61337 - return 0;
61338 if (!(mask & MAY_WRITE))
61339 - if (inode_capable(inode, CAP_DAC_READ_SEARCH))
61340 + if (inode_capable_nolog(inode, CAP_DAC_OVERRIDE) ||
61341 + inode_capable(inode, CAP_DAC_READ_SEARCH))
61342 return 0;
61343 + if (inode_capable(inode, CAP_DAC_OVERRIDE))
61344 + return 0;
61345 return -EACCES;
61346 }
61347 /*
61348 + * Searching includes executable on directories, else just read.
61349 + */
61350 + mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
61351 + if (mask == MAY_READ)
61352 + if (inode_capable_nolog(inode, CAP_DAC_OVERRIDE) ||
61353 + inode_capable(inode, CAP_DAC_READ_SEARCH))
61354 + return 0;
61355 +
61356 + /*
61357 * Read/write DACs are always overridable.
61358 * Executable DACs are overridable when there is
61359 * at least one exec bit set.
61360 @@ -348,14 +364,6 @@ int generic_permission(struct inode *inode, int mask)
61361 if (inode_capable(inode, CAP_DAC_OVERRIDE))
61362 return 0;
61363
61364 - /*
61365 - * Searching includes executable on directories, else just read.
61366 - */
61367 - mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
61368 - if (mask == MAY_READ)
61369 - if (inode_capable(inode, CAP_DAC_READ_SEARCH))
61370 - return 0;
61371 -
61372 return -EACCES;
61373 }
61374
61375 @@ -821,7 +829,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
61376 {
61377 struct dentry *dentry = link->dentry;
61378 int error;
61379 - char *s;
61380 + const char *s;
61381
61382 BUG_ON(nd->flags & LOOKUP_RCU);
61383
61384 @@ -842,6 +850,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
61385 if (error)
61386 goto out_put_nd_path;
61387
61388 + if (gr_handle_follow_link(dentry->d_parent->d_inode,
61389 + dentry->d_inode, dentry, nd->path.mnt)) {
61390 + error = -EACCES;
61391 + goto out_put_nd_path;
61392 + }
61393 +
61394 nd->last_type = LAST_BIND;
61395 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
61396 error = PTR_ERR(*p);
61397 @@ -1590,6 +1604,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
61398 if (res)
61399 break;
61400 res = walk_component(nd, path, LOOKUP_FOLLOW);
61401 + if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
61402 + res = -EACCES;
61403 put_link(nd, &link, cookie);
61404 } while (res > 0);
61405
61406 @@ -1663,7 +1679,7 @@ EXPORT_SYMBOL(full_name_hash);
61407 static inline unsigned long hash_name(const char *name, unsigned int *hashp)
61408 {
61409 unsigned long a, b, adata, bdata, mask, hash, len;
61410 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
61411 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
61412
61413 hash = a = 0;
61414 len = -sizeof(unsigned long);
61415 @@ -1947,6 +1963,8 @@ static int path_lookupat(int dfd, const char *name,
61416 if (err)
61417 break;
61418 err = lookup_last(nd, &path);
61419 + if (!err && gr_handle_symlink_owner(&link, nd->inode))
61420 + err = -EACCES;
61421 put_link(nd, &link, cookie);
61422 }
61423 }
61424 @@ -1954,6 +1972,13 @@ static int path_lookupat(int dfd, const char *name,
61425 if (!err)
61426 err = complete_walk(nd);
61427
61428 + if (!err && !(nd->flags & LOOKUP_PARENT)) {
61429 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
61430 + path_put(&nd->path);
61431 + err = -ENOENT;
61432 + }
61433 + }
61434 +
61435 if (!err && nd->flags & LOOKUP_DIRECTORY) {
61436 if (!d_is_directory(nd->path.dentry)) {
61437 path_put(&nd->path);
61438 @@ -1981,8 +2006,15 @@ static int filename_lookup(int dfd, struct filename *name,
61439 retval = path_lookupat(dfd, name->name,
61440 flags | LOOKUP_REVAL, nd);
61441
61442 - if (likely(!retval))
61443 + if (likely(!retval)) {
61444 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
61445 + if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
61446 + if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
61447 + path_put(&nd->path);
61448 + return -ENOENT;
61449 + }
61450 + }
61451 + }
61452 return retval;
61453 }
61454
61455 @@ -2556,6 +2588,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
61456 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
61457 return -EPERM;
61458
61459 + if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
61460 + return -EPERM;
61461 + if (gr_handle_rawio(inode))
61462 + return -EPERM;
61463 + if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
61464 + return -EACCES;
61465 +
61466 return 0;
61467 }
61468
61469 @@ -2787,7 +2826,7 @@ looked_up:
61470 * cleared otherwise prior to returning.
61471 */
61472 static int lookup_open(struct nameidata *nd, struct path *path,
61473 - struct file *file,
61474 + struct path *link, struct file *file,
61475 const struct open_flags *op,
61476 bool got_write, int *opened)
61477 {
61478 @@ -2822,6 +2861,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
61479 /* Negative dentry, just create the file */
61480 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
61481 umode_t mode = op->mode;
61482 +
61483 + if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
61484 + error = -EACCES;
61485 + goto out_dput;
61486 + }
61487 +
61488 + if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
61489 + error = -EACCES;
61490 + goto out_dput;
61491 + }
61492 +
61493 if (!IS_POSIXACL(dir->d_inode))
61494 mode &= ~current_umask();
61495 /*
61496 @@ -2843,6 +2893,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
61497 nd->flags & LOOKUP_EXCL);
61498 if (error)
61499 goto out_dput;
61500 + else
61501 + gr_handle_create(dentry, nd->path.mnt);
61502 }
61503 out_no_open:
61504 path->dentry = dentry;
61505 @@ -2857,7 +2909,7 @@ out_dput:
61506 /*
61507 * Handle the last step of open()
61508 */
61509 -static int do_last(struct nameidata *nd, struct path *path,
61510 +static int do_last(struct nameidata *nd, struct path *path, struct path *link,
61511 struct file *file, const struct open_flags *op,
61512 int *opened, struct filename *name)
61513 {
61514 @@ -2907,6 +2959,15 @@ static int do_last(struct nameidata *nd, struct path *path,
61515 if (error)
61516 return error;
61517
61518 + if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
61519 + error = -ENOENT;
61520 + goto out;
61521 + }
61522 + if (link && gr_handle_symlink_owner(link, nd->inode)) {
61523 + error = -EACCES;
61524 + goto out;
61525 + }
61526 +
61527 audit_inode(name, dir, LOOKUP_PARENT);
61528 error = -EISDIR;
61529 /* trailing slashes? */
61530 @@ -2926,7 +2987,7 @@ retry_lookup:
61531 */
61532 }
61533 mutex_lock(&dir->d_inode->i_mutex);
61534 - error = lookup_open(nd, path, file, op, got_write, opened);
61535 + error = lookup_open(nd, path, link, file, op, got_write, opened);
61536 mutex_unlock(&dir->d_inode->i_mutex);
61537
61538 if (error <= 0) {
61539 @@ -2950,11 +3011,28 @@ retry_lookup:
61540 goto finish_open_created;
61541 }
61542
61543 + if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
61544 + error = -ENOENT;
61545 + goto exit_dput;
61546 + }
61547 + if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
61548 + error = -EACCES;
61549 + goto exit_dput;
61550 + }
61551 +
61552 /*
61553 * create/update audit record if it already exists.
61554 */
61555 - if (d_is_positive(path->dentry))
61556 + if (d_is_positive(path->dentry)) {
61557 + /* only check if O_CREAT is specified, all other checks need to go
61558 + into may_open */
61559 + if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
61560 + error = -EACCES;
61561 + goto exit_dput;
61562 + }
61563 +
61564 audit_inode(name, path->dentry, 0);
61565 + }
61566
61567 /*
61568 * If atomic_open() acquired write access it is dropped now due to
61569 @@ -2995,6 +3073,11 @@ finish_lookup:
61570 }
61571 }
61572 BUG_ON(inode != path->dentry->d_inode);
61573 + /* if we're resolving a symlink to another symlink */
61574 + if (link && gr_handle_symlink_owner(link, inode)) {
61575 + error = -EACCES;
61576 + goto out;
61577 + }
61578 return 1;
61579 }
61580
61581 @@ -3004,7 +3087,6 @@ finish_lookup:
61582 save_parent.dentry = nd->path.dentry;
61583 save_parent.mnt = mntget(path->mnt);
61584 nd->path.dentry = path->dentry;
61585 -
61586 }
61587 nd->inode = inode;
61588 /* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */
61589 @@ -3014,7 +3096,18 @@ finish_open:
61590 path_put(&save_parent);
61591 return error;
61592 }
61593 +
61594 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
61595 + error = -ENOENT;
61596 + goto out;
61597 + }
61598 + if (link && gr_handle_symlink_owner(link, nd->inode)) {
61599 + error = -EACCES;
61600 + goto out;
61601 + }
61602 +
61603 audit_inode(name, nd->path.dentry, 0);
61604 +
61605 error = -EISDIR;
61606 if ((open_flag & O_CREAT) &&
61607 (d_is_directory(nd->path.dentry) || d_is_autodir(nd->path.dentry)))
61608 @@ -3178,7 +3271,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
61609 if (unlikely(error))
61610 goto out;
61611
61612 - error = do_last(nd, &path, file, op, &opened, pathname);
61613 + error = do_last(nd, &path, NULL, file, op, &opened, pathname);
61614 while (unlikely(error > 0)) { /* trailing symlink */
61615 struct path link = path;
61616 void *cookie;
61617 @@ -3196,7 +3289,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
61618 error = follow_link(&link, nd, &cookie);
61619 if (unlikely(error))
61620 break;
61621 - error = do_last(nd, &path, file, op, &opened, pathname);
61622 + error = do_last(nd, &path, &link, file, op, &opened, pathname);
61623 put_link(nd, &link, cookie);
61624 }
61625 out:
61626 @@ -3296,9 +3389,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
61627 goto unlock;
61628
61629 error = -EEXIST;
61630 - if (d_is_positive(dentry))
61631 + if (d_is_positive(dentry)) {
61632 + if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
61633 + error = -ENOENT;
61634 goto fail;
61635 -
61636 + }
61637 /*
61638 * Special case - lookup gave negative, but... we had foo/bar/
61639 * From the vfs_mknod() POV we just have a negative dentry -
61640 @@ -3350,6 +3445,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
61641 }
61642 EXPORT_SYMBOL(user_path_create);
61643
61644 +static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
61645 +{
61646 + struct filename *tmp = getname(pathname);
61647 + struct dentry *res;
61648 + if (IS_ERR(tmp))
61649 + return ERR_CAST(tmp);
61650 + res = kern_path_create(dfd, tmp->name, path, lookup_flags);
61651 + if (IS_ERR(res))
61652 + putname(tmp);
61653 + else
61654 + *to = tmp;
61655 + return res;
61656 +}
61657 +
61658 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
61659 {
61660 int error = may_create(dir, dentry);
61661 @@ -3412,6 +3521,17 @@ retry:
61662
61663 if (!IS_POSIXACL(path.dentry->d_inode))
61664 mode &= ~current_umask();
61665 +
61666 + if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
61667 + error = -EPERM;
61668 + goto out;
61669 + }
61670 +
61671 + if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
61672 + error = -EACCES;
61673 + goto out;
61674 + }
61675 +
61676 error = security_path_mknod(&path, dentry, mode, dev);
61677 if (error)
61678 goto out;
61679 @@ -3428,6 +3548,8 @@ retry:
61680 break;
61681 }
61682 out:
61683 + if (!error)
61684 + gr_handle_create(dentry, path.mnt);
61685 done_path_create(&path, dentry);
61686 if (retry_estale(error, lookup_flags)) {
61687 lookup_flags |= LOOKUP_REVAL;
61688 @@ -3480,9 +3602,16 @@ retry:
61689
61690 if (!IS_POSIXACL(path.dentry->d_inode))
61691 mode &= ~current_umask();
61692 + if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
61693 + error = -EACCES;
61694 + goto out;
61695 + }
61696 error = security_path_mkdir(&path, dentry, mode);
61697 if (!error)
61698 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
61699 + if (!error)
61700 + gr_handle_create(dentry, path.mnt);
61701 +out:
61702 done_path_create(&path, dentry);
61703 if (retry_estale(error, lookup_flags)) {
61704 lookup_flags |= LOOKUP_REVAL;
61705 @@ -3563,6 +3692,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
61706 struct filename *name;
61707 struct dentry *dentry;
61708 struct nameidata nd;
61709 + ino_t saved_ino = 0;
61710 + dev_t saved_dev = 0;
61711 unsigned int lookup_flags = 0;
61712 retry:
61713 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
61714 @@ -3595,10 +3726,21 @@ retry:
61715 error = -ENOENT;
61716 goto exit3;
61717 }
61718 +
61719 + saved_ino = dentry->d_inode->i_ino;
61720 + saved_dev = gr_get_dev_from_dentry(dentry);
61721 +
61722 + if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
61723 + error = -EACCES;
61724 + goto exit3;
61725 + }
61726 +
61727 error = security_path_rmdir(&nd.path, dentry);
61728 if (error)
61729 goto exit3;
61730 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
61731 + if (!error && (saved_dev || saved_ino))
61732 + gr_handle_delete(saved_ino, saved_dev);
61733 exit3:
61734 dput(dentry);
61735 exit2:
61736 @@ -3688,6 +3830,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
61737 struct nameidata nd;
61738 struct inode *inode = NULL;
61739 struct inode *delegated_inode = NULL;
61740 + ino_t saved_ino = 0;
61741 + dev_t saved_dev = 0;
61742 unsigned int lookup_flags = 0;
61743 retry:
61744 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
61745 @@ -3714,10 +3858,22 @@ retry_deleg:
61746 if (d_is_negative(dentry))
61747 goto slashes;
61748 ihold(inode);
61749 +
61750 + if (inode->i_nlink <= 1) {
61751 + saved_ino = inode->i_ino;
61752 + saved_dev = gr_get_dev_from_dentry(dentry);
61753 + }
61754 + if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
61755 + error = -EACCES;
61756 + goto exit2;
61757 + }
61758 +
61759 error = security_path_unlink(&nd.path, dentry);
61760 if (error)
61761 goto exit2;
61762 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
61763 + if (!error && (saved_ino || saved_dev))
61764 + gr_handle_delete(saved_ino, saved_dev);
61765 exit2:
61766 dput(dentry);
61767 }
61768 @@ -3805,9 +3961,17 @@ retry:
61769 if (IS_ERR(dentry))
61770 goto out_putname;
61771
61772 + if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
61773 + error = -EACCES;
61774 + goto out;
61775 + }
61776 +
61777 error = security_path_symlink(&path, dentry, from->name);
61778 if (!error)
61779 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
61780 + if (!error)
61781 + gr_handle_create(dentry, path.mnt);
61782 +out:
61783 done_path_create(&path, dentry);
61784 if (retry_estale(error, lookup_flags)) {
61785 lookup_flags |= LOOKUP_REVAL;
61786 @@ -3910,6 +4074,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
61787 struct dentry *new_dentry;
61788 struct path old_path, new_path;
61789 struct inode *delegated_inode = NULL;
61790 + struct filename *to = NULL;
61791 int how = 0;
61792 int error;
61793
61794 @@ -3933,7 +4098,7 @@ retry:
61795 if (error)
61796 return error;
61797
61798 - new_dentry = user_path_create(newdfd, newname, &new_path,
61799 + new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
61800 (how & LOOKUP_REVAL));
61801 error = PTR_ERR(new_dentry);
61802 if (IS_ERR(new_dentry))
61803 @@ -3945,11 +4110,28 @@ retry:
61804 error = may_linkat(&old_path);
61805 if (unlikely(error))
61806 goto out_dput;
61807 +
61808 + if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
61809 + old_path.dentry->d_inode,
61810 + old_path.dentry->d_inode->i_mode, to)) {
61811 + error = -EACCES;
61812 + goto out_dput;
61813 + }
61814 +
61815 + if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
61816 + old_path.dentry, old_path.mnt, to)) {
61817 + error = -EACCES;
61818 + goto out_dput;
61819 + }
61820 +
61821 error = security_path_link(old_path.dentry, &new_path, new_dentry);
61822 if (error)
61823 goto out_dput;
61824 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
61825 + if (!error)
61826 + gr_handle_create(new_dentry, new_path.mnt);
61827 out_dput:
61828 + putname(to);
61829 done_path_create(&new_path, new_dentry);
61830 if (delegated_inode) {
61831 error = break_deleg_wait(&delegated_inode);
61832 @@ -4236,6 +4418,12 @@ retry_deleg:
61833 if (new_dentry == trap)
61834 goto exit5;
61835
61836 + error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
61837 + old_dentry, old_dir->d_inode, oldnd.path.mnt,
61838 + to);
61839 + if (error)
61840 + goto exit5;
61841 +
61842 error = security_path_rename(&oldnd.path, old_dentry,
61843 &newnd.path, new_dentry);
61844 if (error)
61845 @@ -4243,6 +4431,9 @@ retry_deleg:
61846 error = vfs_rename(old_dir->d_inode, old_dentry,
61847 new_dir->d_inode, new_dentry,
61848 &delegated_inode);
61849 + if (!error)
61850 + gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
61851 + new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
61852 exit5:
61853 dput(new_dentry);
61854 exit4:
61855 @@ -4279,6 +4470,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
61856
61857 int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
61858 {
61859 + char tmpbuf[64];
61860 + const char *newlink;
61861 int len;
61862
61863 len = PTR_ERR(link);
61864 @@ -4288,7 +4481,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
61865 len = strlen(link);
61866 if (len > (unsigned) buflen)
61867 len = buflen;
61868 - if (copy_to_user(buffer, link, len))
61869 +
61870 + if (len < sizeof(tmpbuf)) {
61871 + memcpy(tmpbuf, link, len);
61872 + newlink = tmpbuf;
61873 + } else
61874 + newlink = link;
61875 +
61876 + if (copy_to_user(buffer, newlink, len))
61877 len = -EFAULT;
61878 out:
61879 return len;
61880 diff --git a/fs/namespace.c b/fs/namespace.c
61881 index 2ffc5a2..6737083 100644
61882 --- a/fs/namespace.c
61883 +++ b/fs/namespace.c
61884 @@ -1339,6 +1339,9 @@ static int do_umount(struct mount *mnt, int flags)
61885 if (!(sb->s_flags & MS_RDONLY))
61886 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
61887 up_write(&sb->s_umount);
61888 +
61889 + gr_log_remount(mnt->mnt_devname, retval);
61890 +
61891 return retval;
61892 }
61893
61894 @@ -1361,6 +1364,9 @@ static int do_umount(struct mount *mnt, int flags)
61895 }
61896 unlock_mount_hash();
61897 namespace_unlock();
61898 +
61899 + gr_log_unmount(mnt->mnt_devname, retval);
61900 +
61901 return retval;
61902 }
61903
61904 @@ -1380,7 +1386,7 @@ static inline bool may_mount(void)
61905 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
61906 */
61907
61908 -SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
61909 +SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
61910 {
61911 struct path path;
61912 struct mount *mnt;
61913 @@ -1422,7 +1428,7 @@ out:
61914 /*
61915 * The 2.0 compatible umount. No flags.
61916 */
61917 -SYSCALL_DEFINE1(oldumount, char __user *, name)
61918 +SYSCALL_DEFINE1(oldumount, const char __user *, name)
61919 {
61920 return sys_umount(name, 0);
61921 }
61922 @@ -2426,6 +2432,16 @@ long do_mount(const char *dev_name, const char *dir_name,
61923 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
61924 MS_STRICTATIME);
61925
61926 + if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
61927 + retval = -EPERM;
61928 + goto dput_out;
61929 + }
61930 +
61931 + if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
61932 + retval = -EPERM;
61933 + goto dput_out;
61934 + }
61935 +
61936 if (flags & MS_REMOUNT)
61937 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
61938 data_page);
61939 @@ -2440,6 +2456,9 @@ long do_mount(const char *dev_name, const char *dir_name,
61940 dev_name, data_page);
61941 dput_out:
61942 path_put(&path);
61943 +
61944 + gr_log_mount(dev_name, dir_name, retval);
61945 +
61946 return retval;
61947 }
61948
61949 @@ -2457,7 +2476,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
61950 * number incrementing at 10Ghz will take 12,427 years to wrap which
61951 * is effectively never, so we can ignore the possibility.
61952 */
61953 -static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
61954 +static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
61955
61956 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
61957 {
61958 @@ -2472,7 +2491,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
61959 kfree(new_ns);
61960 return ERR_PTR(ret);
61961 }
61962 - new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
61963 + new_ns->seq = atomic64_inc_return_unchecked(&mnt_ns_seq);
61964 atomic_set(&new_ns->count, 1);
61965 new_ns->root = NULL;
61966 INIT_LIST_HEAD(&new_ns->list);
61967 @@ -2482,7 +2501,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
61968 return new_ns;
61969 }
61970
61971 -struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
61972 +__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
61973 struct user_namespace *user_ns, struct fs_struct *new_fs)
61974 {
61975 struct mnt_namespace *new_ns;
61976 @@ -2603,8 +2622,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
61977 }
61978 EXPORT_SYMBOL(mount_subtree);
61979
61980 -SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
61981 - char __user *, type, unsigned long, flags, void __user *, data)
61982 +SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
61983 + const char __user *, type, unsigned long, flags, void __user *, data)
61984 {
61985 int ret;
61986 char *kernel_type;
61987 @@ -2717,6 +2736,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
61988 if (error)
61989 goto out2;
61990
61991 + if (gr_handle_chroot_pivot()) {
61992 + error = -EPERM;
61993 + goto out2;
61994 + }
61995 +
61996 get_fs_root(current->fs, &root);
61997 old_mp = lock_mount(&old);
61998 error = PTR_ERR(old_mp);
61999 @@ -2985,7 +3009,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
62000 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
62001 return -EPERM;
62002
62003 - if (fs->users != 1)
62004 + if (atomic_read(&fs->users) != 1)
62005 return -EINVAL;
62006
62007 get_mnt_ns(mnt_ns);
62008 diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
62009 index f4ccfe6..a5cf064 100644
62010 --- a/fs/nfs/callback_xdr.c
62011 +++ b/fs/nfs/callback_xdr.c
62012 @@ -51,7 +51,7 @@ struct callback_op {
62013 callback_decode_arg_t decode_args;
62014 callback_encode_res_t encode_res;
62015 long res_maxsize;
62016 -};
62017 +} __do_const;
62018
62019 static struct callback_op callback_ops[];
62020
62021 diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
62022 index 360114a..ac6e265 100644
62023 --- a/fs/nfs/inode.c
62024 +++ b/fs/nfs/inode.c
62025 @@ -1189,16 +1189,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
62026 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
62027 }
62028
62029 -static atomic_long_t nfs_attr_generation_counter;
62030 +static atomic_long_unchecked_t nfs_attr_generation_counter;
62031
62032 static unsigned long nfs_read_attr_generation_counter(void)
62033 {
62034 - return atomic_long_read(&nfs_attr_generation_counter);
62035 + return atomic_long_read_unchecked(&nfs_attr_generation_counter);
62036 }
62037
62038 unsigned long nfs_inc_attr_generation_counter(void)
62039 {
62040 - return atomic_long_inc_return(&nfs_attr_generation_counter);
62041 + return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
62042 }
62043
62044 void nfs_fattr_init(struct nfs_fattr *fattr)
62045 diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
62046 index 450bfed..d5d06e8 100644
62047 --- a/fs/nfs/nfs4proc.c
62048 +++ b/fs/nfs/nfs4proc.c
62049 @@ -1068,6 +1068,7 @@ static void nfs4_opendata_free(struct kref *kref)
62050 dput(p->dentry);
62051 nfs_sb_deactive(sb);
62052 nfs_fattr_free_names(&p->f_attr);
62053 + kfree(p->f_attr.mdsthreshold);
62054 kfree(p);
62055 }
62056
62057 @@ -2244,10 +2245,12 @@ static int _nfs4_do_open(struct inode *dir,
62058 }
62059 }
62060
62061 - if (ctx_th && server->attr_bitmask[2] & FATTR4_WORD2_MDSTHRESHOLD) {
62062 - opendata->f_attr.mdsthreshold = pnfs_mdsthreshold_alloc();
62063 - if (!opendata->f_attr.mdsthreshold)
62064 - goto err_free_label;
62065 + if (server->attr_bitmask[2] & FATTR4_WORD2_MDSTHRESHOLD) {
62066 + if (!opendata->f_attr.mdsthreshold) {
62067 + opendata->f_attr.mdsthreshold = pnfs_mdsthreshold_alloc();
62068 + if (!opendata->f_attr.mdsthreshold)
62069 + goto err_free_label;
62070 + }
62071 opendata->o_arg.open_bitmap = &nfs4_pnfs_open_bitmap[0];
62072 }
62073 if (dentry->d_inode != NULL)
62074 @@ -2275,11 +2278,10 @@ static int _nfs4_do_open(struct inode *dir,
62075 if (opendata->file_created)
62076 *opened |= FILE_CREATED;
62077
62078 - if (pnfs_use_threshold(ctx_th, opendata->f_attr.mdsthreshold, server))
62079 + if (pnfs_use_threshold(ctx_th, opendata->f_attr.mdsthreshold, server)) {
62080 *ctx_th = opendata->f_attr.mdsthreshold;
62081 - else
62082 - kfree(opendata->f_attr.mdsthreshold);
62083 - opendata->f_attr.mdsthreshold = NULL;
62084 + opendata->f_attr.mdsthreshold = NULL;
62085 + }
62086
62087 nfs4_label_free(olabel);
62088
62089 @@ -2289,7 +2291,6 @@ static int _nfs4_do_open(struct inode *dir,
62090 err_free_label:
62091 nfs4_label_free(olabel);
62092 err_opendata_put:
62093 - kfree(opendata->f_attr.mdsthreshold);
62094 nfs4_opendata_put(opendata);
62095 err_put_state_owner:
62096 nfs4_put_state_owner(sp);
62097 diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
62098 index 82189b2..e43a39f 100644
62099 --- a/fs/nfsd/nfs4proc.c
62100 +++ b/fs/nfsd/nfs4proc.c
62101 @@ -1178,7 +1178,7 @@ struct nfsd4_operation {
62102 nfsd4op_rsize op_rsize_bop;
62103 stateid_getter op_get_currentstateid;
62104 stateid_setter op_set_currentstateid;
62105 -};
62106 +} __do_const;
62107
62108 static struct nfsd4_operation nfsd4_ops[];
62109
62110 diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
62111 index 63f2395..7c47f4d 100644
62112 --- a/fs/nfsd/nfs4xdr.c
62113 +++ b/fs/nfsd/nfs4xdr.c
62114 @@ -1531,7 +1531,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
62115
62116 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
62117
62118 -static nfsd4_dec nfsd4_dec_ops[] = {
62119 +static const nfsd4_dec nfsd4_dec_ops[] = {
62120 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
62121 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
62122 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
62123 diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
62124 index f8f060f..c4ba09a 100644
62125 --- a/fs/nfsd/nfscache.c
62126 +++ b/fs/nfsd/nfscache.c
62127 @@ -519,14 +519,17 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
62128 {
62129 struct svc_cacherep *rp = rqstp->rq_cacherep;
62130 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
62131 - int len;
62132 + long len;
62133 size_t bufsize = 0;
62134
62135 if (!rp)
62136 return;
62137
62138 - len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
62139 - len >>= 2;
62140 + if (statp) {
62141 + len = (char*)statp - (char*)resv->iov_base;
62142 + len = resv->iov_len - len;
62143 + len >>= 2;
62144 + }
62145
62146 /* Don't cache excessive amounts of data and XDR failures */
62147 if (!statp || len > (256 >> 2)) {
62148 diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
62149 index 6d7be3f..ef02c86 100644
62150 --- a/fs/nfsd/vfs.c
62151 +++ b/fs/nfsd/vfs.c
62152 @@ -834,7 +834,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
62153 } else {
62154 oldfs = get_fs();
62155 set_fs(KERNEL_DS);
62156 - host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
62157 + host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
62158 set_fs(oldfs);
62159 }
62160
62161 @@ -925,7 +925,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
62162
62163 /* Write the data. */
62164 oldfs = get_fs(); set_fs(KERNEL_DS);
62165 - host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
62166 + host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
62167 set_fs(oldfs);
62168 if (host_err < 0)
62169 goto out_nfserr;
62170 @@ -1470,7 +1470,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
62171 */
62172
62173 oldfs = get_fs(); set_fs(KERNEL_DS);
62174 - host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
62175 + host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
62176 set_fs(oldfs);
62177
62178 if (host_err < 0)
62179 diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
62180 index 52ccd34..43a53b1 100644
62181 --- a/fs/nls/nls_base.c
62182 +++ b/fs/nls/nls_base.c
62183 @@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
62184
62185 int __register_nls(struct nls_table *nls, struct module *owner)
62186 {
62187 - struct nls_table ** tmp = &tables;
62188 + struct nls_table *tmp = tables;
62189
62190 if (nls->next)
62191 return -EBUSY;
62192
62193 - nls->owner = owner;
62194 + pax_open_kernel();
62195 + *(void **)&nls->owner = owner;
62196 + pax_close_kernel();
62197 spin_lock(&nls_lock);
62198 - while (*tmp) {
62199 - if (nls == *tmp) {
62200 + while (tmp) {
62201 + if (nls == tmp) {
62202 spin_unlock(&nls_lock);
62203 return -EBUSY;
62204 }
62205 - tmp = &(*tmp)->next;
62206 + tmp = tmp->next;
62207 }
62208 - nls->next = tables;
62209 + pax_open_kernel();
62210 + *(struct nls_table **)&nls->next = tables;
62211 + pax_close_kernel();
62212 tables = nls;
62213 spin_unlock(&nls_lock);
62214 return 0;
62215 @@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
62216
62217 int unregister_nls(struct nls_table * nls)
62218 {
62219 - struct nls_table ** tmp = &tables;
62220 + struct nls_table * const * tmp = &tables;
62221
62222 spin_lock(&nls_lock);
62223 while (*tmp) {
62224 if (nls == *tmp) {
62225 - *tmp = nls->next;
62226 + pax_open_kernel();
62227 + *(struct nls_table **)tmp = nls->next;
62228 + pax_close_kernel();
62229 spin_unlock(&nls_lock);
62230 return 0;
62231 }
62232 diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
62233 index 162b3f1..6076a7c 100644
62234 --- a/fs/nls/nls_euc-jp.c
62235 +++ b/fs/nls/nls_euc-jp.c
62236 @@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
62237 p_nls = load_nls("cp932");
62238
62239 if (p_nls) {
62240 - table.charset2upper = p_nls->charset2upper;
62241 - table.charset2lower = p_nls->charset2lower;
62242 + pax_open_kernel();
62243 + *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
62244 + *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
62245 + pax_close_kernel();
62246 return register_nls(&table);
62247 }
62248
62249 diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
62250 index a80a741..7b96e1b 100644
62251 --- a/fs/nls/nls_koi8-ru.c
62252 +++ b/fs/nls/nls_koi8-ru.c
62253 @@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
62254 p_nls = load_nls("koi8-u");
62255
62256 if (p_nls) {
62257 - table.charset2upper = p_nls->charset2upper;
62258 - table.charset2lower = p_nls->charset2lower;
62259 + pax_open_kernel();
62260 + *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
62261 + *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
62262 + pax_close_kernel();
62263 return register_nls(&table);
62264 }
62265
62266 diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
62267 index 287a22c..a2a043a 100644
62268 --- a/fs/notify/fanotify/fanotify_user.c
62269 +++ b/fs/notify/fanotify/fanotify_user.c
62270 @@ -251,8 +251,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
62271
62272 fd = fanotify_event_metadata.fd;
62273 ret = -EFAULT;
62274 - if (copy_to_user(buf, &fanotify_event_metadata,
62275 - fanotify_event_metadata.event_len))
62276 + if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
62277 + copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
62278 goto out_close_fd;
62279
62280 ret = prepare_for_access_response(group, event, fd);
62281 diff --git a/fs/notify/notification.c b/fs/notify/notification.c
62282 index 1e58402..bb2d6f4 100644
62283 --- a/fs/notify/notification.c
62284 +++ b/fs/notify/notification.c
62285 @@ -48,7 +48,7 @@
62286 #include <linux/fsnotify_backend.h>
62287 #include "fsnotify.h"
62288
62289 -static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
62290 +static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
62291
62292 /**
62293 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
62294 @@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
62295 */
62296 u32 fsnotify_get_cookie(void)
62297 {
62298 - return atomic_inc_return(&fsnotify_sync_cookie);
62299 + return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
62300 }
62301 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
62302
62303 diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
62304 index 9e38daf..5727cae 100644
62305 --- a/fs/ntfs/dir.c
62306 +++ b/fs/ntfs/dir.c
62307 @@ -1310,7 +1310,7 @@ find_next_index_buffer:
62308 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
62309 ~(s64)(ndir->itype.index.block_size - 1)));
62310 /* Bounds checks. */
62311 - if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
62312 + if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
62313 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
62314 "inode 0x%lx or driver bug.", vdir->i_ino);
62315 goto err_out;
62316 diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
62317 index db9bd8a..8338fb6 100644
62318 --- a/fs/ntfs/file.c
62319 +++ b/fs/ntfs/file.c
62320 @@ -1282,7 +1282,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
62321 char *addr;
62322 size_t total = 0;
62323 unsigned len;
62324 - int left;
62325 + unsigned left;
62326
62327 do {
62328 len = PAGE_CACHE_SIZE - ofs;
62329 diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
62330 index 82650d5..db37dcf 100644
62331 --- a/fs/ntfs/super.c
62332 +++ b/fs/ntfs/super.c
62333 @@ -685,7 +685,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
62334 if (!silent)
62335 ntfs_error(sb, "Primary boot sector is invalid.");
62336 } else if (!silent)
62337 - ntfs_error(sb, read_err_str, "primary");
62338 + ntfs_error(sb, read_err_str, "%s", "primary");
62339 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
62340 if (bh_primary)
62341 brelse(bh_primary);
62342 @@ -701,7 +701,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
62343 goto hotfix_primary_boot_sector;
62344 brelse(bh_backup);
62345 } else if (!silent)
62346 - ntfs_error(sb, read_err_str, "backup");
62347 + ntfs_error(sb, read_err_str, "%s", "backup");
62348 /* Try to read NT3.51- backup boot sector. */
62349 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
62350 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
62351 @@ -712,7 +712,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
62352 "sector.");
62353 brelse(bh_backup);
62354 } else if (!silent)
62355 - ntfs_error(sb, read_err_str, "backup");
62356 + ntfs_error(sb, read_err_str, "%s", "backup");
62357 /* We failed. Cleanup and return. */
62358 if (bh_primary)
62359 brelse(bh_primary);
62360 diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
62361 index 0440134..d52c93a 100644
62362 --- a/fs/ocfs2/localalloc.c
62363 +++ b/fs/ocfs2/localalloc.c
62364 @@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
62365 goto bail;
62366 }
62367
62368 - atomic_inc(&osb->alloc_stats.moves);
62369 + atomic_inc_unchecked(&osb->alloc_stats.moves);
62370
62371 bail:
62372 if (handle)
62373 diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
62374 index 553f53c..aaf5133 100644
62375 --- a/fs/ocfs2/ocfs2.h
62376 +++ b/fs/ocfs2/ocfs2.h
62377 @@ -235,11 +235,11 @@ enum ocfs2_vol_state
62378
62379 struct ocfs2_alloc_stats
62380 {
62381 - atomic_t moves;
62382 - atomic_t local_data;
62383 - atomic_t bitmap_data;
62384 - atomic_t bg_allocs;
62385 - atomic_t bg_extends;
62386 + atomic_unchecked_t moves;
62387 + atomic_unchecked_t local_data;
62388 + atomic_unchecked_t bitmap_data;
62389 + atomic_unchecked_t bg_allocs;
62390 + atomic_unchecked_t bg_extends;
62391 };
62392
62393 enum ocfs2_local_alloc_state
62394 diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
62395 index 47ae266..6e8b793 100644
62396 --- a/fs/ocfs2/suballoc.c
62397 +++ b/fs/ocfs2/suballoc.c
62398 @@ -866,7 +866,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
62399 mlog_errno(status);
62400 goto bail;
62401 }
62402 - atomic_inc(&osb->alloc_stats.bg_extends);
62403 + atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
62404
62405 /* You should never ask for this much metadata */
62406 BUG_ON(bits_wanted >
62407 @@ -1992,7 +1992,7 @@ int ocfs2_claim_metadata(handle_t *handle,
62408 mlog_errno(status);
62409 goto bail;
62410 }
62411 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
62412 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
62413
62414 *suballoc_loc = res.sr_bg_blkno;
62415 *suballoc_bit_start = res.sr_bit_offset;
62416 @@ -2156,7 +2156,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
62417 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
62418 res->sr_bits);
62419
62420 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
62421 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
62422
62423 BUG_ON(res->sr_bits != 1);
62424
62425 @@ -2198,7 +2198,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
62426 mlog_errno(status);
62427 goto bail;
62428 }
62429 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
62430 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
62431
62432 BUG_ON(res.sr_bits != 1);
62433
62434 @@ -2302,7 +2302,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
62435 cluster_start,
62436 num_clusters);
62437 if (!status)
62438 - atomic_inc(&osb->alloc_stats.local_data);
62439 + atomic_inc_unchecked(&osb->alloc_stats.local_data);
62440 } else {
62441 if (min_clusters > (osb->bitmap_cpg - 1)) {
62442 /* The only paths asking for contiguousness
62443 @@ -2328,7 +2328,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
62444 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
62445 res.sr_bg_blkno,
62446 res.sr_bit_offset);
62447 - atomic_inc(&osb->alloc_stats.bitmap_data);
62448 + atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
62449 *num_clusters = res.sr_bits;
62450 }
62451 }
62452 diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
62453 index 49d84f8..4807e0b 100644
62454 --- a/fs/ocfs2/super.c
62455 +++ b/fs/ocfs2/super.c
62456 @@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
62457 "%10s => GlobalAllocs: %d LocalAllocs: %d "
62458 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
62459 "Stats",
62460 - atomic_read(&osb->alloc_stats.bitmap_data),
62461 - atomic_read(&osb->alloc_stats.local_data),
62462 - atomic_read(&osb->alloc_stats.bg_allocs),
62463 - atomic_read(&osb->alloc_stats.moves),
62464 - atomic_read(&osb->alloc_stats.bg_extends));
62465 + atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
62466 + atomic_read_unchecked(&osb->alloc_stats.local_data),
62467 + atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
62468 + atomic_read_unchecked(&osb->alloc_stats.moves),
62469 + atomic_read_unchecked(&osb->alloc_stats.bg_extends));
62470
62471 out += snprintf(buf + out, len - out,
62472 "%10s => State: %u Descriptor: %llu Size: %u bits "
62473 @@ -2123,11 +2123,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
62474 spin_lock_init(&osb->osb_xattr_lock);
62475 ocfs2_init_steal_slots(osb);
62476
62477 - atomic_set(&osb->alloc_stats.moves, 0);
62478 - atomic_set(&osb->alloc_stats.local_data, 0);
62479 - atomic_set(&osb->alloc_stats.bitmap_data, 0);
62480 - atomic_set(&osb->alloc_stats.bg_allocs, 0);
62481 - atomic_set(&osb->alloc_stats.bg_extends, 0);
62482 + atomic_set_unchecked(&osb->alloc_stats.moves, 0);
62483 + atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
62484 + atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
62485 + atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
62486 + atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
62487
62488 /* Copy the blockcheck stats from the superblock probe */
62489 osb->osb_ecc_stats = *stats;
62490 diff --git a/fs/open.c b/fs/open.c
62491 index b9ed8b2..0d5c7a0 100644
62492 --- a/fs/open.c
62493 +++ b/fs/open.c
62494 @@ -32,6 +32,8 @@
62495 #include <linux/dnotify.h>
62496 #include <linux/compat.h>
62497
62498 +#define CREATE_TRACE_POINTS
62499 +#include <trace/events/fs.h>
62500 #include "internal.h"
62501
62502 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
62503 @@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
62504 error = locks_verify_truncate(inode, NULL, length);
62505 if (!error)
62506 error = security_path_truncate(path);
62507 + if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
62508 + error = -EACCES;
62509 if (!error)
62510 error = do_truncate(path->dentry, length, 0, NULL);
62511
62512 @@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
62513 error = locks_verify_truncate(inode, f.file, length);
62514 if (!error)
62515 error = security_path_truncate(&f.file->f_path);
62516 + if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
62517 + error = -EACCES;
62518 if (!error)
62519 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
62520 sb_end_write(inode->i_sb);
62521 @@ -361,6 +367,9 @@ retry:
62522 if (__mnt_is_readonly(path.mnt))
62523 res = -EROFS;
62524
62525 + if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
62526 + res = -EACCES;
62527 +
62528 out_path_release:
62529 path_put(&path);
62530 if (retry_estale(res, lookup_flags)) {
62531 @@ -392,6 +401,8 @@ retry:
62532 if (error)
62533 goto dput_and_out;
62534
62535 + gr_log_chdir(path.dentry, path.mnt);
62536 +
62537 set_fs_pwd(current->fs, &path);
62538
62539 dput_and_out:
62540 @@ -421,6 +432,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
62541 goto out_putf;
62542
62543 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
62544 +
62545 + if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
62546 + error = -EPERM;
62547 +
62548 + if (!error)
62549 + gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
62550 +
62551 if (!error)
62552 set_fs_pwd(current->fs, &f.file->f_path);
62553 out_putf:
62554 @@ -450,7 +468,13 @@ retry:
62555 if (error)
62556 goto dput_and_out;
62557
62558 + if (gr_handle_chroot_chroot(path.dentry, path.mnt))
62559 + goto dput_and_out;
62560 +
62561 set_fs_root(current->fs, &path);
62562 +
62563 + gr_handle_chroot_chdir(&path);
62564 +
62565 error = 0;
62566 dput_and_out:
62567 path_put(&path);
62568 @@ -474,6 +498,16 @@ static int chmod_common(struct path *path, umode_t mode)
62569 return error;
62570 retry_deleg:
62571 mutex_lock(&inode->i_mutex);
62572 +
62573 + if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
62574 + error = -EACCES;
62575 + goto out_unlock;
62576 + }
62577 + if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
62578 + error = -EACCES;
62579 + goto out_unlock;
62580 + }
62581 +
62582 error = security_path_chmod(path, mode);
62583 if (error)
62584 goto out_unlock;
62585 @@ -539,6 +573,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
62586 uid = make_kuid(current_user_ns(), user);
62587 gid = make_kgid(current_user_ns(), group);
62588
62589 + if (!gr_acl_handle_chown(path->dentry, path->mnt))
62590 + return -EACCES;
62591 +
62592 newattrs.ia_valid = ATTR_CTIME;
62593 if (user != (uid_t) -1) {
62594 if (!uid_valid(uid))
62595 @@ -994,6 +1031,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
62596 } else {
62597 fsnotify_open(f);
62598 fd_install(fd, f);
62599 + trace_do_sys_open(tmp->name, flags, mode);
62600 }
62601 }
62602 putname(tmp);
62603 diff --git a/fs/pipe.c b/fs/pipe.c
62604 index 78fd0d0..f71fc09 100644
62605 --- a/fs/pipe.c
62606 +++ b/fs/pipe.c
62607 @@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
62608
62609 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
62610 {
62611 - if (pipe->files)
62612 + if (atomic_read(&pipe->files))
62613 mutex_lock_nested(&pipe->mutex, subclass);
62614 }
62615
62616 @@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
62617
62618 void pipe_unlock(struct pipe_inode_info *pipe)
62619 {
62620 - if (pipe->files)
62621 + if (atomic_read(&pipe->files))
62622 mutex_unlock(&pipe->mutex);
62623 }
62624 EXPORT_SYMBOL(pipe_unlock);
62625 @@ -449,9 +449,9 @@ redo:
62626 }
62627 if (bufs) /* More to do? */
62628 continue;
62629 - if (!pipe->writers)
62630 + if (!atomic_read(&pipe->writers))
62631 break;
62632 - if (!pipe->waiting_writers) {
62633 + if (!atomic_read(&pipe->waiting_writers)) {
62634 /* syscall merging: Usually we must not sleep
62635 * if O_NONBLOCK is set, or if we got some data.
62636 * But if a writer sleeps in kernel space, then
62637 @@ -513,7 +513,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
62638 ret = 0;
62639 __pipe_lock(pipe);
62640
62641 - if (!pipe->readers) {
62642 + if (!atomic_read(&pipe->readers)) {
62643 send_sig(SIGPIPE, current, 0);
62644 ret = -EPIPE;
62645 goto out;
62646 @@ -562,7 +562,7 @@ redo1:
62647 for (;;) {
62648 int bufs;
62649
62650 - if (!pipe->readers) {
62651 + if (!atomic_read(&pipe->readers)) {
62652 send_sig(SIGPIPE, current, 0);
62653 if (!ret)
62654 ret = -EPIPE;
62655 @@ -653,9 +653,9 @@ redo2:
62656 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
62657 do_wakeup = 0;
62658 }
62659 - pipe->waiting_writers++;
62660 + atomic_inc(&pipe->waiting_writers);
62661 pipe_wait(pipe);
62662 - pipe->waiting_writers--;
62663 + atomic_dec(&pipe->waiting_writers);
62664 }
62665 out:
62666 __pipe_unlock(pipe);
62667 @@ -710,7 +710,7 @@ pipe_poll(struct file *filp, poll_table *wait)
62668 mask = 0;
62669 if (filp->f_mode & FMODE_READ) {
62670 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
62671 - if (!pipe->writers && filp->f_version != pipe->w_counter)
62672 + if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
62673 mask |= POLLHUP;
62674 }
62675
62676 @@ -720,7 +720,7 @@ pipe_poll(struct file *filp, poll_table *wait)
62677 * Most Unices do not set POLLERR for FIFOs but on Linux they
62678 * behave exactly like pipes for poll().
62679 */
62680 - if (!pipe->readers)
62681 + if (!atomic_read(&pipe->readers))
62682 mask |= POLLERR;
62683 }
62684
62685 @@ -732,7 +732,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
62686 int kill = 0;
62687
62688 spin_lock(&inode->i_lock);
62689 - if (!--pipe->files) {
62690 + if (atomic_dec_and_test(&pipe->files)) {
62691 inode->i_pipe = NULL;
62692 kill = 1;
62693 }
62694 @@ -749,11 +749,11 @@ pipe_release(struct inode *inode, struct file *file)
62695
62696 __pipe_lock(pipe);
62697 if (file->f_mode & FMODE_READ)
62698 - pipe->readers--;
62699 + atomic_dec(&pipe->readers);
62700 if (file->f_mode & FMODE_WRITE)
62701 - pipe->writers--;
62702 + atomic_dec(&pipe->writers);
62703
62704 - if (pipe->readers || pipe->writers) {
62705 + if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
62706 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
62707 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
62708 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
62709 @@ -818,7 +818,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
62710 kfree(pipe);
62711 }
62712
62713 -static struct vfsmount *pipe_mnt __read_mostly;
62714 +struct vfsmount *pipe_mnt __read_mostly;
62715
62716 /*
62717 * pipefs_dname() is called from d_path().
62718 @@ -848,8 +848,9 @@ static struct inode * get_pipe_inode(void)
62719 goto fail_iput;
62720
62721 inode->i_pipe = pipe;
62722 - pipe->files = 2;
62723 - pipe->readers = pipe->writers = 1;
62724 + atomic_set(&pipe->files, 2);
62725 + atomic_set(&pipe->readers, 1);
62726 + atomic_set(&pipe->writers, 1);
62727 inode->i_fop = &pipefifo_fops;
62728
62729 /*
62730 @@ -1028,17 +1029,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
62731 spin_lock(&inode->i_lock);
62732 if (inode->i_pipe) {
62733 pipe = inode->i_pipe;
62734 - pipe->files++;
62735 + atomic_inc(&pipe->files);
62736 spin_unlock(&inode->i_lock);
62737 } else {
62738 spin_unlock(&inode->i_lock);
62739 pipe = alloc_pipe_info();
62740 if (!pipe)
62741 return -ENOMEM;
62742 - pipe->files = 1;
62743 + atomic_set(&pipe->files, 1);
62744 spin_lock(&inode->i_lock);
62745 if (unlikely(inode->i_pipe)) {
62746 - inode->i_pipe->files++;
62747 + atomic_inc(&inode->i_pipe->files);
62748 spin_unlock(&inode->i_lock);
62749 free_pipe_info(pipe);
62750 pipe = inode->i_pipe;
62751 @@ -1063,10 +1064,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
62752 * opened, even when there is no process writing the FIFO.
62753 */
62754 pipe->r_counter++;
62755 - if (pipe->readers++ == 0)
62756 + if (atomic_inc_return(&pipe->readers) == 1)
62757 wake_up_partner(pipe);
62758
62759 - if (!is_pipe && !pipe->writers) {
62760 + if (!is_pipe && !atomic_read(&pipe->writers)) {
62761 if ((filp->f_flags & O_NONBLOCK)) {
62762 /* suppress POLLHUP until we have
62763 * seen a writer */
62764 @@ -1085,14 +1086,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
62765 * errno=ENXIO when there is no process reading the FIFO.
62766 */
62767 ret = -ENXIO;
62768 - if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
62769 + if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
62770 goto err;
62771
62772 pipe->w_counter++;
62773 - if (!pipe->writers++)
62774 + if (atomic_inc_return(&pipe->writers) == 1)
62775 wake_up_partner(pipe);
62776
62777 - if (!is_pipe && !pipe->readers) {
62778 + if (!is_pipe && !atomic_read(&pipe->readers)) {
62779 if (wait_for_partner(pipe, &pipe->r_counter))
62780 goto err_wr;
62781 }
62782 @@ -1106,11 +1107,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
62783 * the process can at least talk to itself.
62784 */
62785
62786 - pipe->readers++;
62787 - pipe->writers++;
62788 + atomic_inc(&pipe->readers);
62789 + atomic_inc(&pipe->writers);
62790 pipe->r_counter++;
62791 pipe->w_counter++;
62792 - if (pipe->readers == 1 || pipe->writers == 1)
62793 + if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
62794 wake_up_partner(pipe);
62795 break;
62796
62797 @@ -1124,13 +1125,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
62798 return 0;
62799
62800 err_rd:
62801 - if (!--pipe->readers)
62802 + if (atomic_dec_and_test(&pipe->readers))
62803 wake_up_interruptible(&pipe->wait);
62804 ret = -ERESTARTSYS;
62805 goto err;
62806
62807 err_wr:
62808 - if (!--pipe->writers)
62809 + if (atomic_dec_and_test(&pipe->writers))
62810 wake_up_interruptible(&pipe->wait);
62811 ret = -ERESTARTSYS;
62812 goto err;
62813 diff --git a/fs/posix_acl.c b/fs/posix_acl.c
62814 index 9e363e4..d936d15 100644
62815 --- a/fs/posix_acl.c
62816 +++ b/fs/posix_acl.c
62817 @@ -20,6 +20,7 @@
62818 #include <linux/xattr.h>
62819 #include <linux/export.h>
62820 #include <linux/user_namespace.h>
62821 +#include <linux/grsecurity.h>
62822
62823 struct posix_acl **acl_by_type(struct inode *inode, int type)
62824 {
62825 @@ -271,7 +272,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
62826 }
62827 }
62828 if (mode_p)
62829 - *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
62830 + *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
62831 return not_equiv;
62832 }
62833 EXPORT_SYMBOL(posix_acl_equiv_mode);
62834 @@ -421,7 +422,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
62835 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
62836 }
62837
62838 - *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
62839 + *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
62840 return not_equiv;
62841 }
62842
62843 @@ -479,6 +480,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
62844 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
62845 int err = -ENOMEM;
62846 if (clone) {
62847 + *mode_p &= ~gr_acl_umask();
62848 +
62849 err = posix_acl_create_masq(clone, mode_p);
62850 if (err < 0) {
62851 posix_acl_release(clone);
62852 @@ -653,11 +656,12 @@ struct posix_acl *
62853 posix_acl_from_xattr(struct user_namespace *user_ns,
62854 const void *value, size_t size)
62855 {
62856 - posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
62857 - posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
62858 + const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
62859 + const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
62860 int count;
62861 struct posix_acl *acl;
62862 struct posix_acl_entry *acl_e;
62863 + umode_t umask = gr_acl_umask();
62864
62865 if (!value)
62866 return NULL;
62867 @@ -683,12 +687,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
62868
62869 switch(acl_e->e_tag) {
62870 case ACL_USER_OBJ:
62871 + acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
62872 + break;
62873 case ACL_GROUP_OBJ:
62874 case ACL_MASK:
62875 + acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
62876 + break;
62877 case ACL_OTHER:
62878 + acl_e->e_perm &= ~(umask & S_IRWXO);
62879 break;
62880
62881 case ACL_USER:
62882 + acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
62883 acl_e->e_uid =
62884 make_kuid(user_ns,
62885 le32_to_cpu(entry->e_id));
62886 @@ -696,6 +706,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
62887 goto fail;
62888 break;
62889 case ACL_GROUP:
62890 + acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
62891 acl_e->e_gid =
62892 make_kgid(user_ns,
62893 le32_to_cpu(entry->e_id));
62894 diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
62895 index 2183fcf..3c32a98 100644
62896 --- a/fs/proc/Kconfig
62897 +++ b/fs/proc/Kconfig
62898 @@ -30,7 +30,7 @@ config PROC_FS
62899
62900 config PROC_KCORE
62901 bool "/proc/kcore support" if !ARM
62902 - depends on PROC_FS && MMU
62903 + depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
62904 help
62905 Provides a virtual ELF core file of the live kernel. This can
62906 be read with gdb and other ELF tools. No modifications can be
62907 @@ -38,8 +38,8 @@ config PROC_KCORE
62908
62909 config PROC_VMCORE
62910 bool "/proc/vmcore support"
62911 - depends on PROC_FS && CRASH_DUMP
62912 - default y
62913 + depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
62914 + default n
62915 help
62916 Exports the dump image of crashed kernel in ELF format.
62917
62918 @@ -63,8 +63,8 @@ config PROC_SYSCTL
62919 limited in memory.
62920
62921 config PROC_PAGE_MONITOR
62922 - default y
62923 - depends on PROC_FS && MMU
62924 + default n
62925 + depends on PROC_FS && MMU && !GRKERNSEC
62926 bool "Enable /proc page monitoring" if EXPERT
62927 help
62928 Various /proc files exist to monitor process memory utilization:
62929 diff --git a/fs/proc/array.c b/fs/proc/array.c
62930 index 656e401..b5b86b9 100644
62931 --- a/fs/proc/array.c
62932 +++ b/fs/proc/array.c
62933 @@ -60,6 +60,7 @@
62934 #include <linux/tty.h>
62935 #include <linux/string.h>
62936 #include <linux/mman.h>
62937 +#include <linux/grsecurity.h>
62938 #include <linux/proc_fs.h>
62939 #include <linux/ioport.h>
62940 #include <linux/uaccess.h>
62941 @@ -356,6 +357,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
62942 seq_putc(m, '\n');
62943 }
62944
62945 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
62946 +static inline void task_pax(struct seq_file *m, struct task_struct *p)
62947 +{
62948 + if (p->mm)
62949 + seq_printf(m, "PaX:\t%c%c%c%c%c\n",
62950 + p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
62951 + p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
62952 + p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
62953 + p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
62954 + p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
62955 + else
62956 + seq_printf(m, "PaX:\t-----\n");
62957 +}
62958 +#endif
62959 +
62960 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
62961 struct pid *pid, struct task_struct *task)
62962 {
62963 @@ -374,9 +390,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
62964 task_cpus_allowed(m, task);
62965 cpuset_task_status_allowed(m, task);
62966 task_context_switch_counts(m, task);
62967 +
62968 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
62969 + task_pax(m, task);
62970 +#endif
62971 +
62972 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
62973 + task_grsec_rbac(m, task);
62974 +#endif
62975 +
62976 return 0;
62977 }
62978
62979 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
62980 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
62981 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
62982 + _mm->pax_flags & MF_PAX_SEGMEXEC))
62983 +#endif
62984 +
62985 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
62986 struct pid *pid, struct task_struct *task, int whole)
62987 {
62988 @@ -398,6 +429,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
62989 char tcomm[sizeof(task->comm)];
62990 unsigned long flags;
62991
62992 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
62993 + if (current->exec_id != m->exec_id) {
62994 + gr_log_badprocpid("stat");
62995 + return 0;
62996 + }
62997 +#endif
62998 +
62999 state = *get_task_state(task);
63000 vsize = eip = esp = 0;
63001 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
63002 @@ -468,6 +506,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
63003 gtime = task_gtime(task);
63004 }
63005
63006 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63007 + if (PAX_RAND_FLAGS(mm)) {
63008 + eip = 0;
63009 + esp = 0;
63010 + wchan = 0;
63011 + }
63012 +#endif
63013 +#ifdef CONFIG_GRKERNSEC_HIDESYM
63014 + wchan = 0;
63015 + eip =0;
63016 + esp =0;
63017 +#endif
63018 +
63019 /* scale priority and nice values from timeslices to -20..20 */
63020 /* to make it look like a "normal" Unix priority/nice value */
63021 priority = task_prio(task);
63022 @@ -504,9 +555,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
63023 seq_put_decimal_ull(m, ' ', vsize);
63024 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
63025 seq_put_decimal_ull(m, ' ', rsslim);
63026 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63027 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
63028 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
63029 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
63030 +#else
63031 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
63032 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
63033 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
63034 +#endif
63035 seq_put_decimal_ull(m, ' ', esp);
63036 seq_put_decimal_ull(m, ' ', eip);
63037 /* The signal information here is obsolete.
63038 @@ -528,7 +585,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
63039 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
63040 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
63041
63042 - if (mm && permitted) {
63043 + if (mm && permitted
63044 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63045 + && !PAX_RAND_FLAGS(mm)
63046 +#endif
63047 + ) {
63048 seq_put_decimal_ull(m, ' ', mm->start_data);
63049 seq_put_decimal_ull(m, ' ', mm->end_data);
63050 seq_put_decimal_ull(m, ' ', mm->start_brk);
63051 @@ -566,8 +627,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
63052 struct pid *pid, struct task_struct *task)
63053 {
63054 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
63055 - struct mm_struct *mm = get_task_mm(task);
63056 + struct mm_struct *mm;
63057
63058 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63059 + if (current->exec_id != m->exec_id) {
63060 + gr_log_badprocpid("statm");
63061 + return 0;
63062 + }
63063 +#endif
63064 + mm = get_task_mm(task);
63065 if (mm) {
63066 size = task_statm(mm, &shared, &text, &data, &resident);
63067 mmput(mm);
63068 @@ -590,6 +658,13 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
63069 return 0;
63070 }
63071
63072 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
63073 +int proc_pid_ipaddr(struct task_struct *task, char *buffer)
63074 +{
63075 + return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
63076 +}
63077 +#endif
63078 +
63079 #ifdef CONFIG_CHECKPOINT_RESTORE
63080 static struct pid *
63081 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
63082 diff --git a/fs/proc/base.c b/fs/proc/base.c
63083 index b976062..584d0bc 100644
63084 --- a/fs/proc/base.c
63085 +++ b/fs/proc/base.c
63086 @@ -113,6 +113,14 @@ struct pid_entry {
63087 union proc_op op;
63088 };
63089
63090 +struct getdents_callback {
63091 + struct linux_dirent __user * current_dir;
63092 + struct linux_dirent __user * previous;
63093 + struct file * file;
63094 + int count;
63095 + int error;
63096 +};
63097 +
63098 #define NOD(NAME, MODE, IOP, FOP, OP) { \
63099 .name = (NAME), \
63100 .len = sizeof(NAME) - 1, \
63101 @@ -210,6 +218,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
63102 if (!mm->arg_end)
63103 goto out_mm; /* Shh! No looking before we're done */
63104
63105 + if (gr_acl_handle_procpidmem(task))
63106 + goto out_mm;
63107 +
63108 len = mm->arg_end - mm->arg_start;
63109
63110 if (len > PAGE_SIZE)
63111 @@ -237,12 +248,28 @@ out:
63112 return res;
63113 }
63114
63115 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63116 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
63117 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
63118 + _mm->pax_flags & MF_PAX_SEGMEXEC))
63119 +#endif
63120 +
63121 static int proc_pid_auxv(struct task_struct *task, char *buffer)
63122 {
63123 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
63124 int res = PTR_ERR(mm);
63125 if (mm && !IS_ERR(mm)) {
63126 unsigned int nwords = 0;
63127 +
63128 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63129 + /* allow if we're currently ptracing this task */
63130 + if (PAX_RAND_FLAGS(mm) &&
63131 + (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
63132 + mmput(mm);
63133 + return 0;
63134 + }
63135 +#endif
63136 +
63137 do {
63138 nwords += 2;
63139 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
63140 @@ -256,7 +283,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
63141 }
63142
63143
63144 -#ifdef CONFIG_KALLSYMS
63145 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63146 /*
63147 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
63148 * Returns the resolved symbol. If that fails, simply return the address.
63149 @@ -295,7 +322,7 @@ static void unlock_trace(struct task_struct *task)
63150 mutex_unlock(&task->signal->cred_guard_mutex);
63151 }
63152
63153 -#ifdef CONFIG_STACKTRACE
63154 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63155
63156 #define MAX_STACK_TRACE_DEPTH 64
63157
63158 @@ -518,7 +545,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
63159 return count;
63160 }
63161
63162 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
63163 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
63164 static int proc_pid_syscall(struct task_struct *task, char *buffer)
63165 {
63166 long nr;
63167 @@ -547,7 +574,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
63168 /************************************************************************/
63169
63170 /* permission checks */
63171 -static int proc_fd_access_allowed(struct inode *inode)
63172 +static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
63173 {
63174 struct task_struct *task;
63175 int allowed = 0;
63176 @@ -557,7 +584,10 @@ static int proc_fd_access_allowed(struct inode *inode)
63177 */
63178 task = get_proc_task(inode);
63179 if (task) {
63180 - allowed = ptrace_may_access(task, PTRACE_MODE_READ);
63181 + if (log)
63182 + allowed = ptrace_may_access(task, PTRACE_MODE_READ);
63183 + else
63184 + allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
63185 put_task_struct(task);
63186 }
63187 return allowed;
63188 @@ -588,10 +618,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
63189 struct task_struct *task,
63190 int hide_pid_min)
63191 {
63192 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
63193 + return false;
63194 +
63195 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63196 + rcu_read_lock();
63197 + {
63198 + const struct cred *tmpcred = current_cred();
63199 + const struct cred *cred = __task_cred(task);
63200 +
63201 + if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
63202 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
63203 + || in_group_p(grsec_proc_gid)
63204 +#endif
63205 + ) {
63206 + rcu_read_unlock();
63207 + return true;
63208 + }
63209 + }
63210 + rcu_read_unlock();
63211 +
63212 + if (!pid->hide_pid)
63213 + return false;
63214 +#endif
63215 +
63216 if (pid->hide_pid < hide_pid_min)
63217 return true;
63218 if (in_group_p(pid->pid_gid))
63219 return true;
63220 +
63221 return ptrace_may_access(task, PTRACE_MODE_READ);
63222 }
63223
63224 @@ -609,7 +664,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
63225 put_task_struct(task);
63226
63227 if (!has_perms) {
63228 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63229 + {
63230 +#else
63231 if (pid->hide_pid == 2) {
63232 +#endif
63233 /*
63234 * Let's make getdents(), stat(), and open()
63235 * consistent with each other. If a process
63236 @@ -707,6 +766,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
63237 if (!task)
63238 return -ESRCH;
63239
63240 + if (gr_acl_handle_procpidmem(task)) {
63241 + put_task_struct(task);
63242 + return -EPERM;
63243 + }
63244 +
63245 mm = mm_access(task, mode);
63246 put_task_struct(task);
63247
63248 @@ -722,6 +786,10 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
63249
63250 file->private_data = mm;
63251
63252 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63253 + file->f_version = current->exec_id;
63254 +#endif
63255 +
63256 return 0;
63257 }
63258
63259 @@ -743,6 +811,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
63260 ssize_t copied;
63261 char *page;
63262
63263 +#ifdef CONFIG_GRKERNSEC
63264 + if (write)
63265 + return -EPERM;
63266 +#endif
63267 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63268 + if (file->f_version != current->exec_id) {
63269 + gr_log_badprocpid("mem");
63270 + return 0;
63271 + }
63272 +#endif
63273 +
63274 if (!mm)
63275 return 0;
63276
63277 @@ -755,7 +834,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
63278 goto free;
63279
63280 while (count > 0) {
63281 - int this_len = min_t(int, count, PAGE_SIZE);
63282 + ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
63283
63284 if (write && copy_from_user(page, buf, this_len)) {
63285 copied = -EFAULT;
63286 @@ -847,6 +926,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
63287 if (!mm)
63288 return 0;
63289
63290 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63291 + if (file->f_version != current->exec_id) {
63292 + gr_log_badprocpid("environ");
63293 + return 0;
63294 + }
63295 +#endif
63296 +
63297 page = (char *)__get_free_page(GFP_TEMPORARY);
63298 if (!page)
63299 return -ENOMEM;
63300 @@ -856,7 +942,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
63301 goto free;
63302 while (count > 0) {
63303 size_t this_len, max_len;
63304 - int retval;
63305 + ssize_t retval;
63306
63307 if (src >= (mm->env_end - mm->env_start))
63308 break;
63309 @@ -1467,7 +1553,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
63310 int error = -EACCES;
63311
63312 /* Are we allowed to snoop on the tasks file descriptors? */
63313 - if (!proc_fd_access_allowed(inode))
63314 + if (!proc_fd_access_allowed(inode, 0))
63315 goto out;
63316
63317 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
63318 @@ -1511,8 +1597,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
63319 struct path path;
63320
63321 /* Are we allowed to snoop on the tasks file descriptors? */
63322 - if (!proc_fd_access_allowed(inode))
63323 - goto out;
63324 + /* logging this is needed for learning on chromium to work properly,
63325 + but we don't want to flood the logs from 'ps' which does a readlink
63326 + on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
63327 + CAP_SYS_PTRACE as it's not necessary for its basic functionality
63328 + */
63329 + if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
63330 + if (!proc_fd_access_allowed(inode,0))
63331 + goto out;
63332 + } else {
63333 + if (!proc_fd_access_allowed(inode,1))
63334 + goto out;
63335 + }
63336
63337 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
63338 if (error)
63339 @@ -1562,7 +1658,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
63340 rcu_read_lock();
63341 cred = __task_cred(task);
63342 inode->i_uid = cred->euid;
63343 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
63344 + inode->i_gid = grsec_proc_gid;
63345 +#else
63346 inode->i_gid = cred->egid;
63347 +#endif
63348 rcu_read_unlock();
63349 }
63350 security_task_to_inode(task, inode);
63351 @@ -1598,10 +1698,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
63352 return -ENOENT;
63353 }
63354 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
63355 +#ifdef CONFIG_GRKERNSEC_PROC_USER
63356 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
63357 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63358 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
63359 +#endif
63360 task_dumpable(task)) {
63361 cred = __task_cred(task);
63362 stat->uid = cred->euid;
63363 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
63364 + stat->gid = grsec_proc_gid;
63365 +#else
63366 stat->gid = cred->egid;
63367 +#endif
63368 }
63369 }
63370 rcu_read_unlock();
63371 @@ -1639,11 +1748,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
63372
63373 if (task) {
63374 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
63375 +#ifdef CONFIG_GRKERNSEC_PROC_USER
63376 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
63377 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63378 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
63379 +#endif
63380 task_dumpable(task)) {
63381 rcu_read_lock();
63382 cred = __task_cred(task);
63383 inode->i_uid = cred->euid;
63384 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
63385 + inode->i_gid = grsec_proc_gid;
63386 +#else
63387 inode->i_gid = cred->egid;
63388 +#endif
63389 rcu_read_unlock();
63390 } else {
63391 inode->i_uid = GLOBAL_ROOT_UID;
63392 @@ -2178,6 +2296,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
63393 if (!task)
63394 goto out_no_task;
63395
63396 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
63397 + goto out;
63398 +
63399 /*
63400 * Yes, it does not scale. And it should not. Don't add
63401 * new entries into /proc/<tgid>/ without very good reasons.
63402 @@ -2208,6 +2329,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
63403 if (!task)
63404 return -ENOENT;
63405
63406 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
63407 + goto out;
63408 +
63409 if (!dir_emit_dots(file, ctx))
63410 goto out;
63411
63412 @@ -2597,7 +2721,7 @@ static const struct pid_entry tgid_base_stuff[] = {
63413 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
63414 #endif
63415 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
63416 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
63417 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
63418 INF("syscall", S_IRUGO, proc_pid_syscall),
63419 #endif
63420 INF("cmdline", S_IRUGO, proc_pid_cmdline),
63421 @@ -2622,10 +2746,10 @@ static const struct pid_entry tgid_base_stuff[] = {
63422 #ifdef CONFIG_SECURITY
63423 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
63424 #endif
63425 -#ifdef CONFIG_KALLSYMS
63426 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63427 INF("wchan", S_IRUGO, proc_pid_wchan),
63428 #endif
63429 -#ifdef CONFIG_STACKTRACE
63430 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63431 ONE("stack", S_IRUGO, proc_pid_stack),
63432 #endif
63433 #ifdef CONFIG_SCHEDSTATS
63434 @@ -2659,6 +2783,9 @@ static const struct pid_entry tgid_base_stuff[] = {
63435 #ifdef CONFIG_HARDWALL
63436 INF("hardwall", S_IRUGO, proc_pid_hardwall),
63437 #endif
63438 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
63439 + INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
63440 +#endif
63441 #ifdef CONFIG_USER_NS
63442 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
63443 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
63444 @@ -2789,7 +2916,14 @@ static int proc_pid_instantiate(struct inode *dir,
63445 if (!inode)
63446 goto out;
63447
63448 +#ifdef CONFIG_GRKERNSEC_PROC_USER
63449 + inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
63450 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63451 + inode->i_gid = grsec_proc_gid;
63452 + inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
63453 +#else
63454 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
63455 +#endif
63456 inode->i_op = &proc_tgid_base_inode_operations;
63457 inode->i_fop = &proc_tgid_base_operations;
63458 inode->i_flags|=S_IMMUTABLE;
63459 @@ -2827,7 +2961,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
63460 if (!task)
63461 goto out;
63462
63463 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
63464 + goto out_put_task;
63465 +
63466 result = proc_pid_instantiate(dir, dentry, task, NULL);
63467 +out_put_task:
63468 put_task_struct(task);
63469 out:
63470 return ERR_PTR(result);
63471 @@ -2933,7 +3071,7 @@ static const struct pid_entry tid_base_stuff[] = {
63472 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
63473 #endif
63474 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
63475 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
63476 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
63477 INF("syscall", S_IRUGO, proc_pid_syscall),
63478 #endif
63479 INF("cmdline", S_IRUGO, proc_pid_cmdline),
63480 @@ -2960,10 +3098,10 @@ static const struct pid_entry tid_base_stuff[] = {
63481 #ifdef CONFIG_SECURITY
63482 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
63483 #endif
63484 -#ifdef CONFIG_KALLSYMS
63485 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63486 INF("wchan", S_IRUGO, proc_pid_wchan),
63487 #endif
63488 -#ifdef CONFIG_STACKTRACE
63489 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63490 ONE("stack", S_IRUGO, proc_pid_stack),
63491 #endif
63492 #ifdef CONFIG_SCHEDSTATS
63493 diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
63494 index cbd82df..c0407d2 100644
63495 --- a/fs/proc/cmdline.c
63496 +++ b/fs/proc/cmdline.c
63497 @@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
63498
63499 static int __init proc_cmdline_init(void)
63500 {
63501 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
63502 + proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
63503 +#else
63504 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
63505 +#endif
63506 return 0;
63507 }
63508 fs_initcall(proc_cmdline_init);
63509 diff --git a/fs/proc/devices.c b/fs/proc/devices.c
63510 index 50493ed..248166b 100644
63511 --- a/fs/proc/devices.c
63512 +++ b/fs/proc/devices.c
63513 @@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
63514
63515 static int __init proc_devices_init(void)
63516 {
63517 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
63518 + proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
63519 +#else
63520 proc_create("devices", 0, NULL, &proc_devinfo_operations);
63521 +#endif
63522 return 0;
63523 }
63524 fs_initcall(proc_devices_init);
63525 diff --git a/fs/proc/fd.c b/fs/proc/fd.c
63526 index 985ea88..d118a0a 100644
63527 --- a/fs/proc/fd.c
63528 +++ b/fs/proc/fd.c
63529 @@ -25,7 +25,8 @@ static int seq_show(struct seq_file *m, void *v)
63530 if (!task)
63531 return -ENOENT;
63532
63533 - files = get_files_struct(task);
63534 + if (!gr_acl_handle_procpidmem(task))
63535 + files = get_files_struct(task);
63536 put_task_struct(task);
63537
63538 if (files) {
63539 @@ -283,11 +284,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
63540 */
63541 int proc_fd_permission(struct inode *inode, int mask)
63542 {
63543 + struct task_struct *task;
63544 int rv = generic_permission(inode, mask);
63545 - if (rv == 0)
63546 - return 0;
63547 +
63548 if (task_tgid(current) == proc_pid(inode))
63549 rv = 0;
63550 +
63551 + task = get_proc_task(inode);
63552 + if (task == NULL)
63553 + return rv;
63554 +
63555 + if (gr_acl_handle_procpidmem(task))
63556 + rv = -EACCES;
63557 +
63558 + put_task_struct(task);
63559 +
63560 return rv;
63561 }
63562
63563 diff --git a/fs/proc/generic.c b/fs/proc/generic.c
63564 index b7f268e..3bea6b7 100644
63565 --- a/fs/proc/generic.c
63566 +++ b/fs/proc/generic.c
63567 @@ -23,6 +23,7 @@
63568 #include <linux/bitops.h>
63569 #include <linux/spinlock.h>
63570 #include <linux/completion.h>
63571 +#include <linux/grsecurity.h>
63572 #include <asm/uaccess.h>
63573
63574 #include "internal.h"
63575 @@ -207,6 +208,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
63576 return proc_lookup_de(PDE(dir), dir, dentry);
63577 }
63578
63579 +struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
63580 + unsigned int flags)
63581 +{
63582 + if (gr_proc_is_restricted())
63583 + return ERR_PTR(-EACCES);
63584 +
63585 + return proc_lookup_de(PDE(dir), dir, dentry);
63586 +}
63587 +
63588 /*
63589 * This returns non-zero if at EOF, so that the /proc
63590 * root directory can use this and check if it should
63591 @@ -264,6 +274,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
63592 return proc_readdir_de(PDE(inode), file, ctx);
63593 }
63594
63595 +int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
63596 +{
63597 + struct inode *inode = file_inode(file);
63598 +
63599 + if (gr_proc_is_restricted())
63600 + return -EACCES;
63601 +
63602 + return proc_readdir_de(PDE(inode), file, ctx);
63603 +}
63604 +
63605 /*
63606 * These are the generic /proc directory operations. They
63607 * use the in-memory "struct proc_dir_entry" tree to parse
63608 @@ -275,6 +295,12 @@ static const struct file_operations proc_dir_operations = {
63609 .iterate = proc_readdir,
63610 };
63611
63612 +static const struct file_operations proc_dir_restricted_operations = {
63613 + .llseek = generic_file_llseek,
63614 + .read = generic_read_dir,
63615 + .iterate = proc_readdir_restrict,
63616 +};
63617 +
63618 /*
63619 * proc directories can do almost nothing..
63620 */
63621 @@ -284,6 +310,12 @@ static const struct inode_operations proc_dir_inode_operations = {
63622 .setattr = proc_notify_change,
63623 };
63624
63625 +static const struct inode_operations proc_dir_restricted_inode_operations = {
63626 + .lookup = proc_lookup_restrict,
63627 + .getattr = proc_getattr,
63628 + .setattr = proc_notify_change,
63629 +};
63630 +
63631 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
63632 {
63633 struct proc_dir_entry *tmp;
63634 @@ -294,8 +326,13 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
63635 return ret;
63636
63637 if (S_ISDIR(dp->mode)) {
63638 - dp->proc_fops = &proc_dir_operations;
63639 - dp->proc_iops = &proc_dir_inode_operations;
63640 + if (dp->restricted) {
63641 + dp->proc_fops = &proc_dir_restricted_operations;
63642 + dp->proc_iops = &proc_dir_restricted_inode_operations;
63643 + } else {
63644 + dp->proc_fops = &proc_dir_operations;
63645 + dp->proc_iops = &proc_dir_inode_operations;
63646 + }
63647 dir->nlink++;
63648 } else if (S_ISLNK(dp->mode)) {
63649 dp->proc_iops = &proc_link_inode_operations;
63650 @@ -407,6 +444,27 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
63651 }
63652 EXPORT_SYMBOL_GPL(proc_mkdir_data);
63653
63654 +struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
63655 + struct proc_dir_entry *parent, void *data)
63656 +{
63657 + struct proc_dir_entry *ent;
63658 +
63659 + if (mode == 0)
63660 + mode = S_IRUGO | S_IXUGO;
63661 +
63662 + ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
63663 + if (ent) {
63664 + ent->data = data;
63665 + ent->restricted = 1;
63666 + if (proc_register(parent, ent) < 0) {
63667 + kfree(ent);
63668 + ent = NULL;
63669 + }
63670 + }
63671 + return ent;
63672 +}
63673 +EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
63674 +
63675 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
63676 struct proc_dir_entry *parent)
63677 {
63678 @@ -421,6 +479,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
63679 }
63680 EXPORT_SYMBOL(proc_mkdir);
63681
63682 +struct proc_dir_entry *proc_mkdir_restrict(const char *name,
63683 + struct proc_dir_entry *parent)
63684 +{
63685 + return proc_mkdir_data_restrict(name, 0, parent, NULL);
63686 +}
63687 +EXPORT_SYMBOL(proc_mkdir_restrict);
63688 +
63689 struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
63690 struct proc_dir_entry *parent,
63691 const struct file_operations *proc_fops,
63692 diff --git a/fs/proc/inode.c b/fs/proc/inode.c
63693 index 124fc43..8afbb02 100644
63694 --- a/fs/proc/inode.c
63695 +++ b/fs/proc/inode.c
63696 @@ -23,11 +23,17 @@
63697 #include <linux/slab.h>
63698 #include <linux/mount.h>
63699 #include <linux/magic.h>
63700 +#include <linux/grsecurity.h>
63701
63702 #include <asm/uaccess.h>
63703
63704 #include "internal.h"
63705
63706 +#ifdef CONFIG_PROC_SYSCTL
63707 +extern const struct inode_operations proc_sys_inode_operations;
63708 +extern const struct inode_operations proc_sys_dir_operations;
63709 +#endif
63710 +
63711 static void proc_evict_inode(struct inode *inode)
63712 {
63713 struct proc_dir_entry *de;
63714 @@ -55,6 +61,13 @@ static void proc_evict_inode(struct inode *inode)
63715 ns = PROC_I(inode)->ns.ns;
63716 if (ns_ops && ns)
63717 ns_ops->put(ns);
63718 +
63719 +#ifdef CONFIG_PROC_SYSCTL
63720 + if (inode->i_op == &proc_sys_inode_operations ||
63721 + inode->i_op == &proc_sys_dir_operations)
63722 + gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
63723 +#endif
63724 +
63725 }
63726
63727 static struct kmem_cache * proc_inode_cachep;
63728 @@ -413,7 +426,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
63729 if (de->mode) {
63730 inode->i_mode = de->mode;
63731 inode->i_uid = de->uid;
63732 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
63733 + inode->i_gid = grsec_proc_gid;
63734 +#else
63735 inode->i_gid = de->gid;
63736 +#endif
63737 }
63738 if (de->size)
63739 inode->i_size = de->size;
63740 diff --git a/fs/proc/internal.h b/fs/proc/internal.h
63741 index 651d09a..6a4b495 100644
63742 --- a/fs/proc/internal.h
63743 +++ b/fs/proc/internal.h
63744 @@ -46,9 +46,10 @@ struct proc_dir_entry {
63745 struct completion *pde_unload_completion;
63746 struct list_head pde_openers; /* who did ->open, but not ->release */
63747 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
63748 + u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
63749 u8 namelen;
63750 char name[];
63751 -};
63752 +} __randomize_layout;
63753
63754 union proc_op {
63755 int (*proc_get_link)(struct dentry *, struct path *);
63756 @@ -67,7 +68,7 @@ struct proc_inode {
63757 struct ctl_table *sysctl_entry;
63758 struct proc_ns ns;
63759 struct inode vfs_inode;
63760 -};
63761 +} __randomize_layout;
63762
63763 /*
63764 * General functions
63765 @@ -155,6 +156,9 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
63766 struct pid *, struct task_struct *);
63767 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
63768 struct pid *, struct task_struct *);
63769 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
63770 +extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
63771 +#endif
63772
63773 /*
63774 * base.c
63775 @@ -181,9 +185,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
63776 extern spinlock_t proc_subdir_lock;
63777
63778 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
63779 +extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
63780 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
63781 struct dentry *);
63782 extern int proc_readdir(struct file *, struct dir_context *);
63783 +extern int proc_readdir_restrict(struct file *, struct dir_context *);
63784 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
63785
63786 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
63787 diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
63788 index a352d57..cb94a5c 100644
63789 --- a/fs/proc/interrupts.c
63790 +++ b/fs/proc/interrupts.c
63791 @@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
63792
63793 static int __init proc_interrupts_init(void)
63794 {
63795 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
63796 + proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
63797 +#else
63798 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
63799 +#endif
63800 return 0;
63801 }
63802 fs_initcall(proc_interrupts_init);
63803 diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
63804 index 39e6ef3..2f9cb5e 100644
63805 --- a/fs/proc/kcore.c
63806 +++ b/fs/proc/kcore.c
63807 @@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
63808 * the addresses in the elf_phdr on our list.
63809 */
63810 start = kc_offset_to_vaddr(*fpos - elf_buflen);
63811 - if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
63812 + tsz = PAGE_SIZE - (start & ~PAGE_MASK);
63813 + if (tsz > buflen)
63814 tsz = buflen;
63815 -
63816 +
63817 while (buflen) {
63818 struct kcore_list *m;
63819
63820 @@ -514,20 +515,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
63821 kfree(elf_buf);
63822 } else {
63823 if (kern_addr_valid(start)) {
63824 - unsigned long n;
63825 + char *elf_buf;
63826 + mm_segment_t oldfs;
63827
63828 - n = copy_to_user(buffer, (char *)start, tsz);
63829 - /*
63830 - * We cannot distinguish between fault on source
63831 - * and fault on destination. When this happens
63832 - * we clear too and hope it will trigger the
63833 - * EFAULT again.
63834 - */
63835 - if (n) {
63836 - if (clear_user(buffer + tsz - n,
63837 - n))
63838 + elf_buf = kmalloc(tsz, GFP_KERNEL);
63839 + if (!elf_buf)
63840 + return -ENOMEM;
63841 + oldfs = get_fs();
63842 + set_fs(KERNEL_DS);
63843 + if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
63844 + set_fs(oldfs);
63845 + if (copy_to_user(buffer, elf_buf, tsz)) {
63846 + kfree(elf_buf);
63847 return -EFAULT;
63848 + }
63849 }
63850 + set_fs(oldfs);
63851 + kfree(elf_buf);
63852 } else {
63853 if (clear_user(buffer, tsz))
63854 return -EFAULT;
63855 @@ -547,6 +551,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
63856
63857 static int open_kcore(struct inode *inode, struct file *filp)
63858 {
63859 +#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
63860 + return -EPERM;
63861 +#endif
63862 if (!capable(CAP_SYS_RAWIO))
63863 return -EPERM;
63864 if (kcore_need_update)
63865 diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
63866 index 136e548..1f88922 100644
63867 --- a/fs/proc/meminfo.c
63868 +++ b/fs/proc/meminfo.c
63869 @@ -187,7 +187,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
63870 vmi.used >> 10,
63871 vmi.largest_chunk >> 10
63872 #ifdef CONFIG_MEMORY_FAILURE
63873 - ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
63874 + ,atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
63875 #endif
63876 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
63877 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
63878 diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
63879 index d4a3574..b421ce9 100644
63880 --- a/fs/proc/nommu.c
63881 +++ b/fs/proc/nommu.c
63882 @@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
63883
63884 if (file) {
63885 seq_pad(m, ' ');
63886 - seq_path(m, &file->f_path, "");
63887 + seq_path(m, &file->f_path, "\n\\");
63888 }
63889
63890 seq_putc(m, '\n');
63891 diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
63892 index 4677bb7..94067cd 100644
63893 --- a/fs/proc/proc_net.c
63894 +++ b/fs/proc/proc_net.c
63895 @@ -23,6 +23,7 @@
63896 #include <linux/nsproxy.h>
63897 #include <net/net_namespace.h>
63898 #include <linux/seq_file.h>
63899 +#include <linux/grsecurity.h>
63900
63901 #include "internal.h"
63902
63903 @@ -36,6 +37,8 @@ static struct net *get_proc_net(const struct inode *inode)
63904 return maybe_get_net(PDE_NET(PDE(inode)));
63905 }
63906
63907 +extern const struct seq_operations dev_seq_ops;
63908 +
63909 int seq_open_net(struct inode *ino, struct file *f,
63910 const struct seq_operations *ops, int size)
63911 {
63912 @@ -44,6 +47,10 @@ int seq_open_net(struct inode *ino, struct file *f,
63913
63914 BUG_ON(size < sizeof(*p));
63915
63916 + /* only permit access to /proc/net/dev */
63917 + if (ops != &dev_seq_ops && gr_proc_is_restricted())
63918 + return -EACCES;
63919 +
63920 net = get_proc_net(ino);
63921 if (net == NULL)
63922 return -ENXIO;
63923 @@ -66,6 +73,9 @@ int single_open_net(struct inode *inode, struct file *file,
63924 int err;
63925 struct net *net;
63926
63927 + if (gr_proc_is_restricted())
63928 + return -EACCES;
63929 +
63930 err = -ENXIO;
63931 net = get_proc_net(inode);
63932 if (net == NULL)
63933 diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
63934 index 7129046..6914844 100644
63935 --- a/fs/proc/proc_sysctl.c
63936 +++ b/fs/proc/proc_sysctl.c
63937 @@ -11,13 +11,21 @@
63938 #include <linux/namei.h>
63939 #include <linux/mm.h>
63940 #include <linux/module.h>
63941 +#include <linux/nsproxy.h>
63942 +#ifdef CONFIG_GRKERNSEC
63943 +#include <net/net_namespace.h>
63944 +#endif
63945 #include "internal.h"
63946
63947 +extern int gr_handle_chroot_sysctl(const int op);
63948 +extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
63949 + const int op);
63950 +
63951 static const struct dentry_operations proc_sys_dentry_operations;
63952 static const struct file_operations proc_sys_file_operations;
63953 -static const struct inode_operations proc_sys_inode_operations;
63954 +const struct inode_operations proc_sys_inode_operations;
63955 static const struct file_operations proc_sys_dir_file_operations;
63956 -static const struct inode_operations proc_sys_dir_operations;
63957 +const struct inode_operations proc_sys_dir_operations;
63958
63959 void proc_sys_poll_notify(struct ctl_table_poll *poll)
63960 {
63961 @@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
63962
63963 err = NULL;
63964 d_set_d_op(dentry, &proc_sys_dentry_operations);
63965 +
63966 + gr_handle_proc_create(dentry, inode);
63967 +
63968 d_add(dentry, inode);
63969
63970 out:
63971 @@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
63972 struct inode *inode = file_inode(filp);
63973 struct ctl_table_header *head = grab_header(inode);
63974 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
63975 + int op = write ? MAY_WRITE : MAY_READ;
63976 ssize_t error;
63977 size_t res;
63978
63979 @@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
63980 * and won't be until we finish.
63981 */
63982 error = -EPERM;
63983 - if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
63984 + if (sysctl_perm(head, table, op))
63985 goto out;
63986
63987 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
63988 @@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
63989 if (!table->proc_handler)
63990 goto out;
63991
63992 +#ifdef CONFIG_GRKERNSEC
63993 + error = -EPERM;
63994 + if (gr_handle_chroot_sysctl(op))
63995 + goto out;
63996 + dget(filp->f_path.dentry);
63997 + if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
63998 + dput(filp->f_path.dentry);
63999 + goto out;
64000 + }
64001 + dput(filp->f_path.dentry);
64002 + if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
64003 + goto out;
64004 + if (write) {
64005 + if (current->nsproxy->net_ns != table->extra2) {
64006 + if (!capable(CAP_SYS_ADMIN))
64007 + goto out;
64008 + } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
64009 + goto out;
64010 + }
64011 +#endif
64012 +
64013 /* careful: calling conventions are nasty here */
64014 res = count;
64015 error = table->proc_handler(table, write, buf, &res, ppos);
64016 @@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
64017 return false;
64018 } else {
64019 d_set_d_op(child, &proc_sys_dentry_operations);
64020 +
64021 + gr_handle_proc_create(child, inode);
64022 +
64023 d_add(child, inode);
64024 }
64025 } else {
64026 @@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
64027 if ((*pos)++ < ctx->pos)
64028 return true;
64029
64030 + if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
64031 + return 0;
64032 +
64033 if (unlikely(S_ISLNK(table->mode)))
64034 res = proc_sys_link_fill_cache(file, ctx, head, table);
64035 else
64036 @@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
64037 if (IS_ERR(head))
64038 return PTR_ERR(head);
64039
64040 + if (table && !gr_acl_handle_hidden_file(dentry, mnt))
64041 + return -ENOENT;
64042 +
64043 generic_fillattr(inode, stat);
64044 if (table)
64045 stat->mode = (stat->mode & S_IFMT) | table->mode;
64046 @@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
64047 .llseek = generic_file_llseek,
64048 };
64049
64050 -static const struct inode_operations proc_sys_inode_operations = {
64051 +const struct inode_operations proc_sys_inode_operations = {
64052 .permission = proc_sys_permission,
64053 .setattr = proc_sys_setattr,
64054 .getattr = proc_sys_getattr,
64055 };
64056
64057 -static const struct inode_operations proc_sys_dir_operations = {
64058 +const struct inode_operations proc_sys_dir_operations = {
64059 .lookup = proc_sys_lookup,
64060 .permission = proc_sys_permission,
64061 .setattr = proc_sys_setattr,
64062 @@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
64063 static struct ctl_dir *new_dir(struct ctl_table_set *set,
64064 const char *name, int namelen)
64065 {
64066 - struct ctl_table *table;
64067 + ctl_table_no_const *table;
64068 struct ctl_dir *new;
64069 struct ctl_node *node;
64070 char *new_name;
64071 @@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
64072 return NULL;
64073
64074 node = (struct ctl_node *)(new + 1);
64075 - table = (struct ctl_table *)(node + 1);
64076 + table = (ctl_table_no_const *)(node + 1);
64077 new_name = (char *)(table + 2);
64078 memcpy(new_name, name, namelen);
64079 new_name[namelen] = '\0';
64080 @@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
64081 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
64082 struct ctl_table_root *link_root)
64083 {
64084 - struct ctl_table *link_table, *entry, *link;
64085 + ctl_table_no_const *link_table, *link;
64086 + struct ctl_table *entry;
64087 struct ctl_table_header *links;
64088 struct ctl_node *node;
64089 char *link_name;
64090 @@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
64091 return NULL;
64092
64093 node = (struct ctl_node *)(links + 1);
64094 - link_table = (struct ctl_table *)(node + nr_entries);
64095 + link_table = (ctl_table_no_const *)(node + nr_entries);
64096 link_name = (char *)&link_table[nr_entries + 1];
64097
64098 for (link = link_table, entry = table; entry->procname; link++, entry++) {
64099 @@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
64100 struct ctl_table_header ***subheader, struct ctl_table_set *set,
64101 struct ctl_table *table)
64102 {
64103 - struct ctl_table *ctl_table_arg = NULL;
64104 - struct ctl_table *entry, *files;
64105 + ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
64106 + struct ctl_table *entry;
64107 int nr_files = 0;
64108 int nr_dirs = 0;
64109 int err = -ENOMEM;
64110 @@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
64111 nr_files++;
64112 }
64113
64114 - files = table;
64115 /* If there are mixed files and directories we need a new table */
64116 if (nr_dirs && nr_files) {
64117 - struct ctl_table *new;
64118 + ctl_table_no_const *new;
64119 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
64120 GFP_KERNEL);
64121 if (!files)
64122 @@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
64123 /* Register everything except a directory full of subdirectories */
64124 if (nr_files || !nr_dirs) {
64125 struct ctl_table_header *header;
64126 - header = __register_sysctl_table(set, path, files);
64127 + header = __register_sysctl_table(set, path, files ? files : table);
64128 if (!header) {
64129 kfree(ctl_table_arg);
64130 goto out;
64131 diff --git a/fs/proc/root.c b/fs/proc/root.c
64132 index 87dbcbe..55e1b4d 100644
64133 --- a/fs/proc/root.c
64134 +++ b/fs/proc/root.c
64135 @@ -186,7 +186,15 @@ void __init proc_root_init(void)
64136 #ifdef CONFIG_PROC_DEVICETREE
64137 proc_device_tree_init();
64138 #endif
64139 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
64140 +#ifdef CONFIG_GRKERNSEC_PROC_USER
64141 + proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
64142 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
64143 + proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
64144 +#endif
64145 +#else
64146 proc_mkdir("bus", NULL);
64147 +#endif
64148 proc_sys_init();
64149 }
64150
64151 diff --git a/fs/proc/stat.c b/fs/proc/stat.c
64152 index 6f599c6..8f4644f 100644
64153 --- a/fs/proc/stat.c
64154 +++ b/fs/proc/stat.c
64155 @@ -11,6 +11,7 @@
64156 #include <linux/irqnr.h>
64157 #include <asm/cputime.h>
64158 #include <linux/tick.h>
64159 +#include <linux/grsecurity.h>
64160
64161 #ifndef arch_irq_stat_cpu
64162 #define arch_irq_stat_cpu(cpu) 0
64163 @@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
64164 u64 sum_softirq = 0;
64165 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
64166 struct timespec boottime;
64167 + int unrestricted = 1;
64168 +
64169 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
64170 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
64171 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
64172 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
64173 + && !in_group_p(grsec_proc_gid)
64174 +#endif
64175 + )
64176 + unrestricted = 0;
64177 +#endif
64178 +#endif
64179
64180 user = nice = system = idle = iowait =
64181 irq = softirq = steal = 0;
64182 @@ -94,6 +107,7 @@ static int show_stat(struct seq_file *p, void *v)
64183 getboottime(&boottime);
64184 jif = boottime.tv_sec;
64185
64186 + if (unrestricted) {
64187 for_each_possible_cpu(i) {
64188 user += kcpustat_cpu(i).cpustat[CPUTIME_USER];
64189 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
64190 @@ -116,6 +130,7 @@ static int show_stat(struct seq_file *p, void *v)
64191 }
64192 }
64193 sum += arch_irq_stat();
64194 + }
64195
64196 seq_puts(p, "cpu ");
64197 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
64198 @@ -131,6 +146,7 @@ static int show_stat(struct seq_file *p, void *v)
64199 seq_putc(p, '\n');
64200
64201 for_each_online_cpu(i) {
64202 + if (unrestricted) {
64203 /* Copy values here to work around gcc-2.95.3, gcc-2.96 */
64204 user = kcpustat_cpu(i).cpustat[CPUTIME_USER];
64205 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
64206 @@ -142,6 +158,7 @@ static int show_stat(struct seq_file *p, void *v)
64207 steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
64208 guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
64209 guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
64210 + }
64211 seq_printf(p, "cpu%d", i);
64212 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
64213 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
64214 @@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
64215
64216 /* sum again ? it could be updated? */
64217 for_each_irq_nr(j)
64218 - seq_put_decimal_ull(p, ' ', kstat_irqs(j));
64219 + seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs(j) : 0ULL);
64220
64221 seq_printf(p,
64222 "\nctxt %llu\n"
64223 @@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
64224 "processes %lu\n"
64225 "procs_running %lu\n"
64226 "procs_blocked %lu\n",
64227 - nr_context_switches(),
64228 + unrestricted ? nr_context_switches() : 0ULL,
64229 (unsigned long)jif,
64230 - total_forks,
64231 - nr_running(),
64232 - nr_iowait());
64233 + unrestricted ? total_forks : 0UL,
64234 + unrestricted ? nr_running() : 0UL,
64235 + unrestricted ? nr_iowait() : 0UL);
64236
64237 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
64238
64239 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
64240 index fb52b54..5fc7c14 100644
64241 --- a/fs/proc/task_mmu.c
64242 +++ b/fs/proc/task_mmu.c
64243 @@ -12,12 +12,19 @@
64244 #include <linux/swap.h>
64245 #include <linux/swapops.h>
64246 #include <linux/mmu_notifier.h>
64247 +#include <linux/grsecurity.h>
64248
64249 #include <asm/elf.h>
64250 #include <asm/uaccess.h>
64251 #include <asm/tlbflush.h>
64252 #include "internal.h"
64253
64254 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64255 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
64256 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
64257 + _mm->pax_flags & MF_PAX_SEGMEXEC))
64258 +#endif
64259 +
64260 void task_mem(struct seq_file *m, struct mm_struct *mm)
64261 {
64262 unsigned long data, text, lib, swap;
64263 @@ -53,8 +60,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
64264 "VmExe:\t%8lu kB\n"
64265 "VmLib:\t%8lu kB\n"
64266 "VmPTE:\t%8lu kB\n"
64267 - "VmSwap:\t%8lu kB\n",
64268 - hiwater_vm << (PAGE_SHIFT-10),
64269 + "VmSwap:\t%8lu kB\n"
64270 +
64271 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
64272 + "CsBase:\t%8lx\nCsLim:\t%8lx\n"
64273 +#endif
64274 +
64275 + ,hiwater_vm << (PAGE_SHIFT-10),
64276 total_vm << (PAGE_SHIFT-10),
64277 mm->locked_vm << (PAGE_SHIFT-10),
64278 mm->pinned_vm << (PAGE_SHIFT-10),
64279 @@ -64,7 +76,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
64280 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
64281 (PTRS_PER_PTE * sizeof(pte_t) *
64282 atomic_long_read(&mm->nr_ptes)) >> 10,
64283 - swap << (PAGE_SHIFT-10));
64284 + swap << (PAGE_SHIFT-10)
64285 +
64286 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
64287 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64288 + , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
64289 + , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
64290 +#else
64291 + , mm->context.user_cs_base
64292 + , mm->context.user_cs_limit
64293 +#endif
64294 +#endif
64295 +
64296 + );
64297 }
64298
64299 unsigned long task_vsize(struct mm_struct *mm)
64300 @@ -270,13 +294,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
64301 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
64302 }
64303
64304 - /* We don't show the stack guard page in /proc/maps */
64305 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64306 + start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
64307 + end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
64308 +#else
64309 start = vma->vm_start;
64310 - if (stack_guard_page_start(vma, start))
64311 - start += PAGE_SIZE;
64312 end = vma->vm_end;
64313 - if (stack_guard_page_end(vma, end))
64314 - end -= PAGE_SIZE;
64315 +#endif
64316
64317 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
64318 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
64319 @@ -286,7 +310,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
64320 flags & VM_WRITE ? 'w' : '-',
64321 flags & VM_EXEC ? 'x' : '-',
64322 flags & VM_MAYSHARE ? 's' : 'p',
64323 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64324 + PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
64325 +#else
64326 pgoff,
64327 +#endif
64328 MAJOR(dev), MINOR(dev), ino);
64329
64330 /*
64331 @@ -295,7 +323,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
64332 */
64333 if (file) {
64334 seq_pad(m, ' ');
64335 - seq_path(m, &file->f_path, "\n");
64336 + seq_path(m, &file->f_path, "\n\\");
64337 goto done;
64338 }
64339
64340 @@ -321,8 +349,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
64341 * Thread stack in /proc/PID/task/TID/maps or
64342 * the main process stack.
64343 */
64344 - if (!is_pid || (vma->vm_start <= mm->start_stack &&
64345 - vma->vm_end >= mm->start_stack)) {
64346 + if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
64347 + (vma->vm_start <= mm->start_stack &&
64348 + vma->vm_end >= mm->start_stack)) {
64349 name = "[stack]";
64350 } else {
64351 /* Thread stack in /proc/PID/maps */
64352 @@ -346,6 +375,13 @@ static int show_map(struct seq_file *m, void *v, int is_pid)
64353 struct proc_maps_private *priv = m->private;
64354 struct task_struct *task = priv->task;
64355
64356 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64357 + if (current->exec_id != m->exec_id) {
64358 + gr_log_badprocpid("maps");
64359 + return 0;
64360 + }
64361 +#endif
64362 +
64363 show_map_vma(m, vma, is_pid);
64364
64365 if (m->count < m->size) /* vma is copied successfully */
64366 @@ -586,12 +622,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
64367 .private = &mss,
64368 };
64369
64370 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64371 + if (current->exec_id != m->exec_id) {
64372 + gr_log_badprocpid("smaps");
64373 + return 0;
64374 + }
64375 +#endif
64376 memset(&mss, 0, sizeof mss);
64377 - mss.vma = vma;
64378 - /* mmap_sem is held in m_start */
64379 - if (vma->vm_mm && !is_vm_hugetlb_page(vma))
64380 - walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
64381 -
64382 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64383 + if (!PAX_RAND_FLAGS(vma->vm_mm)) {
64384 +#endif
64385 + mss.vma = vma;
64386 + /* mmap_sem is held in m_start */
64387 + if (vma->vm_mm && !is_vm_hugetlb_page(vma))
64388 + walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
64389 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64390 + }
64391 +#endif
64392 show_map_vma(m, vma, is_pid);
64393
64394 seq_printf(m,
64395 @@ -609,7 +656,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
64396 "KernelPageSize: %8lu kB\n"
64397 "MMUPageSize: %8lu kB\n"
64398 "Locked: %8lu kB\n",
64399 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64400 + PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
64401 +#else
64402 (vma->vm_end - vma->vm_start) >> 10,
64403 +#endif
64404 mss.resident >> 10,
64405 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
64406 mss.shared_clean >> 10,
64407 @@ -1387,6 +1438,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
64408 char buffer[64];
64409 int nid;
64410
64411 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64412 + if (current->exec_id != m->exec_id) {
64413 + gr_log_badprocpid("numa_maps");
64414 + return 0;
64415 + }
64416 +#endif
64417 +
64418 if (!mm)
64419 return 0;
64420
64421 @@ -1404,11 +1462,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
64422 mpol_to_str(buffer, sizeof(buffer), pol);
64423 mpol_cond_put(pol);
64424
64425 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64426 + seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
64427 +#else
64428 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
64429 +#endif
64430
64431 if (file) {
64432 seq_printf(m, " file=");
64433 - seq_path(m, &file->f_path, "\n\t= ");
64434 + seq_path(m, &file->f_path, "\n\t\\= ");
64435 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
64436 seq_printf(m, " heap");
64437 } else {
64438 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
64439 index 678455d..ebd3245 100644
64440 --- a/fs/proc/task_nommu.c
64441 +++ b/fs/proc/task_nommu.c
64442 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
64443 else
64444 bytes += kobjsize(mm);
64445
64446 - if (current->fs && current->fs->users > 1)
64447 + if (current->fs && atomic_read(&current->fs->users) > 1)
64448 sbytes += kobjsize(current->fs);
64449 else
64450 bytes += kobjsize(current->fs);
64451 @@ -161,7 +161,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
64452
64453 if (file) {
64454 seq_pad(m, ' ');
64455 - seq_path(m, &file->f_path, "");
64456 + seq_path(m, &file->f_path, "\n\\");
64457 } else if (mm) {
64458 pid_t tid = vm_is_stack(priv->task, vma, is_pid);
64459
64460 diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
64461 index 88d4585..c10bfeb 100644
64462 --- a/fs/proc/vmcore.c
64463 +++ b/fs/proc/vmcore.c
64464 @@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
64465 nr_bytes = count;
64466
64467 /* If pfn is not ram, return zeros for sparse dump files */
64468 - if (pfn_is_ram(pfn) == 0)
64469 - memset(buf, 0, nr_bytes);
64470 - else {
64471 + if (pfn_is_ram(pfn) == 0) {
64472 + if (userbuf) {
64473 + if (clear_user((char __force_user *)buf, nr_bytes))
64474 + return -EFAULT;
64475 + } else
64476 + memset(buf, 0, nr_bytes);
64477 + } else {
64478 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
64479 offset, userbuf);
64480 if (tmp < 0)
64481 @@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
64482 static int copy_to(void *target, void *src, size_t size, int userbuf)
64483 {
64484 if (userbuf) {
64485 - if (copy_to_user((char __user *) target, src, size))
64486 + if (copy_to_user((char __force_user *) target, src, size))
64487 return -EFAULT;
64488 } else {
64489 memcpy(target, src, size);
64490 @@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
64491 if (*fpos < m->offset + m->size) {
64492 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
64493 start = m->paddr + *fpos - m->offset;
64494 - tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
64495 + tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
64496 if (tmp < 0)
64497 return tmp;
64498 buflen -= tsz;
64499 @@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
64500 static ssize_t read_vmcore(struct file *file, char __user *buffer,
64501 size_t buflen, loff_t *fpos)
64502 {
64503 - return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
64504 + return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
64505 }
64506
64507 /*
64508 diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
64509 index b00fcc9..e0c6381 100644
64510 --- a/fs/qnx6/qnx6.h
64511 +++ b/fs/qnx6/qnx6.h
64512 @@ -74,7 +74,7 @@ enum {
64513 BYTESEX_BE,
64514 };
64515
64516 -static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
64517 +static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
64518 {
64519 if (sbi->s_bytesex == BYTESEX_LE)
64520 return le64_to_cpu((__force __le64)n);
64521 @@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
64522 return (__force __fs64)cpu_to_be64(n);
64523 }
64524
64525 -static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
64526 +static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
64527 {
64528 if (sbi->s_bytesex == BYTESEX_LE)
64529 return le32_to_cpu((__force __le32)n);
64530 diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
64531 index 72d2917..c917c12 100644
64532 --- a/fs/quota/netlink.c
64533 +++ b/fs/quota/netlink.c
64534 @@ -45,7 +45,7 @@ static struct genl_family quota_genl_family = {
64535 void quota_send_warning(struct kqid qid, dev_t dev,
64536 const char warntype)
64537 {
64538 - static atomic_t seq;
64539 + static atomic_unchecked_t seq;
64540 struct sk_buff *skb;
64541 void *msg_head;
64542 int ret;
64543 @@ -61,7 +61,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
64544 "VFS: Not enough memory to send quota warning.\n");
64545 return;
64546 }
64547 - msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
64548 + msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
64549 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
64550 if (!msg_head) {
64551 printk(KERN_ERR
64552 diff --git a/fs/read_write.c b/fs/read_write.c
64553 index 28cc9c8..208e4fb 100644
64554 --- a/fs/read_write.c
64555 +++ b/fs/read_write.c
64556 @@ -450,7 +450,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
64557
64558 old_fs = get_fs();
64559 set_fs(get_ds());
64560 - p = (__force const char __user *)buf;
64561 + p = (const char __force_user *)buf;
64562 if (count > MAX_RW_COUNT)
64563 count = MAX_RW_COUNT;
64564 if (file->f_op->write)
64565 diff --git a/fs/readdir.c b/fs/readdir.c
64566 index 5b53d99..a6c3049 100644
64567 --- a/fs/readdir.c
64568 +++ b/fs/readdir.c
64569 @@ -17,6 +17,7 @@
64570 #include <linux/security.h>
64571 #include <linux/syscalls.h>
64572 #include <linux/unistd.h>
64573 +#include <linux/namei.h>
64574
64575 #include <asm/uaccess.h>
64576
64577 @@ -69,6 +70,7 @@ struct old_linux_dirent {
64578 struct readdir_callback {
64579 struct dir_context ctx;
64580 struct old_linux_dirent __user * dirent;
64581 + struct file * file;
64582 int result;
64583 };
64584
64585 @@ -86,6 +88,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
64586 buf->result = -EOVERFLOW;
64587 return -EOVERFLOW;
64588 }
64589 +
64590 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
64591 + return 0;
64592 +
64593 buf->result++;
64594 dirent = buf->dirent;
64595 if (!access_ok(VERIFY_WRITE, dirent,
64596 @@ -117,6 +123,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
64597 if (!f.file)
64598 return -EBADF;
64599
64600 + buf.file = f.file;
64601 error = iterate_dir(f.file, &buf.ctx);
64602 if (buf.result)
64603 error = buf.result;
64604 @@ -142,6 +149,7 @@ struct getdents_callback {
64605 struct dir_context ctx;
64606 struct linux_dirent __user * current_dir;
64607 struct linux_dirent __user * previous;
64608 + struct file * file;
64609 int count;
64610 int error;
64611 };
64612 @@ -163,6 +171,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
64613 buf->error = -EOVERFLOW;
64614 return -EOVERFLOW;
64615 }
64616 +
64617 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
64618 + return 0;
64619 +
64620 dirent = buf->previous;
64621 if (dirent) {
64622 if (__put_user(offset, &dirent->d_off))
64623 @@ -208,6 +220,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
64624 if (!f.file)
64625 return -EBADF;
64626
64627 + buf.file = f.file;
64628 error = iterate_dir(f.file, &buf.ctx);
64629 if (error >= 0)
64630 error = buf.error;
64631 @@ -226,6 +239,7 @@ struct getdents_callback64 {
64632 struct dir_context ctx;
64633 struct linux_dirent64 __user * current_dir;
64634 struct linux_dirent64 __user * previous;
64635 + struct file *file;
64636 int count;
64637 int error;
64638 };
64639 @@ -241,6 +255,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
64640 buf->error = -EINVAL; /* only used if we fail.. */
64641 if (reclen > buf->count)
64642 return -EINVAL;
64643 +
64644 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
64645 + return 0;
64646 +
64647 dirent = buf->previous;
64648 if (dirent) {
64649 if (__put_user(offset, &dirent->d_off))
64650 @@ -288,6 +306,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
64651 if (!f.file)
64652 return -EBADF;
64653
64654 + buf.file = f.file;
64655 error = iterate_dir(f.file, &buf.ctx);
64656 if (error >= 0)
64657 error = buf.error;
64658 diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
64659 index 9a3c68c..767933e 100644
64660 --- a/fs/reiserfs/do_balan.c
64661 +++ b/fs/reiserfs/do_balan.c
64662 @@ -1546,7 +1546,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
64663 return;
64664 }
64665
64666 - atomic_inc(&(fs_generation(tb->tb_sb)));
64667 + atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
64668 do_balance_starts(tb);
64669
64670 /* balance leaf returns 0 except if combining L R and S into
64671 diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
64672 index ee382ef..f4eb6eb5 100644
64673 --- a/fs/reiserfs/item_ops.c
64674 +++ b/fs/reiserfs/item_ops.c
64675 @@ -725,18 +725,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
64676 }
64677
64678 static struct item_operations errcatch_ops = {
64679 - errcatch_bytes_number,
64680 - errcatch_decrement_key,
64681 - errcatch_is_left_mergeable,
64682 - errcatch_print_item,
64683 - errcatch_check_item,
64684 + .bytes_number = errcatch_bytes_number,
64685 + .decrement_key = errcatch_decrement_key,
64686 + .is_left_mergeable = errcatch_is_left_mergeable,
64687 + .print_item = errcatch_print_item,
64688 + .check_item = errcatch_check_item,
64689
64690 - errcatch_create_vi,
64691 - errcatch_check_left,
64692 - errcatch_check_right,
64693 - errcatch_part_size,
64694 - errcatch_unit_num,
64695 - errcatch_print_vi
64696 + .create_vi = errcatch_create_vi,
64697 + .check_left = errcatch_check_left,
64698 + .check_right = errcatch_check_right,
64699 + .part_size = errcatch_part_size,
64700 + .unit_num = errcatch_unit_num,
64701 + .print_vi = errcatch_print_vi
64702 };
64703
64704 //////////////////////////////////////////////////////////////////////////////
64705 diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
64706 index 02b0b7d..c85018b 100644
64707 --- a/fs/reiserfs/procfs.c
64708 +++ b/fs/reiserfs/procfs.c
64709 @@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
64710 "SMALL_TAILS " : "NO_TAILS ",
64711 replay_only(sb) ? "REPLAY_ONLY " : "",
64712 convert_reiserfs(sb) ? "CONV " : "",
64713 - atomic_read(&r->s_generation_counter),
64714 + atomic_read_unchecked(&r->s_generation_counter),
64715 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
64716 SF(s_do_balance), SF(s_unneeded_left_neighbor),
64717 SF(s_good_search_by_key_reada), SF(s_bmaps),
64718 diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
64719 index 8d06adf..7e1c9f8 100644
64720 --- a/fs/reiserfs/reiserfs.h
64721 +++ b/fs/reiserfs/reiserfs.h
64722 @@ -453,7 +453,7 @@ struct reiserfs_sb_info {
64723 /* Comment? -Hans */
64724 wait_queue_head_t s_wait;
64725 /* To be obsoleted soon by per buffer seals.. -Hans */
64726 - atomic_t s_generation_counter; // increased by one every time the
64727 + atomic_unchecked_t s_generation_counter; // increased by one every time the
64728 // tree gets re-balanced
64729 unsigned long s_properties; /* File system properties. Currently holds
64730 on-disk FS format */
64731 @@ -1972,7 +1972,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
64732 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
64733
64734 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
64735 -#define get_generation(s) atomic_read (&fs_generation(s))
64736 +#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
64737 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
64738 #define __fs_changed(gen,s) (gen != get_generation (s))
64739 #define fs_changed(gen,s) \
64740 diff --git a/fs/select.c b/fs/select.c
64741 index 467bb1c..cf9d65a 100644
64742 --- a/fs/select.c
64743 +++ b/fs/select.c
64744 @@ -20,6 +20,7 @@
64745 #include <linux/export.h>
64746 #include <linux/slab.h>
64747 #include <linux/poll.h>
64748 +#include <linux/security.h>
64749 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
64750 #include <linux/file.h>
64751 #include <linux/fdtable.h>
64752 @@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
64753 struct poll_list *walk = head;
64754 unsigned long todo = nfds;
64755
64756 + gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
64757 if (nfds > rlimit(RLIMIT_NOFILE))
64758 return -EINVAL;
64759
64760 diff --git a/fs/seq_file.c b/fs/seq_file.c
64761 index 1d641bb..c2f4743 100644
64762 --- a/fs/seq_file.c
64763 +++ b/fs/seq_file.c
64764 @@ -10,6 +10,8 @@
64765 #include <linux/seq_file.h>
64766 #include <linux/slab.h>
64767 #include <linux/cred.h>
64768 +#include <linux/sched.h>
64769 +#include <linux/grsecurity.h>
64770
64771 #include <asm/uaccess.h>
64772 #include <asm/page.h>
64773 @@ -60,6 +62,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
64774 #ifdef CONFIG_USER_NS
64775 p->user_ns = file->f_cred->user_ns;
64776 #endif
64777 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64778 + p->exec_id = current->exec_id;
64779 +#endif
64780
64781 /*
64782 * Wrappers around seq_open(e.g. swaps_open) need to be
64783 @@ -82,6 +87,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
64784 }
64785 EXPORT_SYMBOL(seq_open);
64786
64787 +
64788 +int seq_open_restrict(struct file *file, const struct seq_operations *op)
64789 +{
64790 + if (gr_proc_is_restricted())
64791 + return -EACCES;
64792 +
64793 + return seq_open(file, op);
64794 +}
64795 +EXPORT_SYMBOL(seq_open_restrict);
64796 +
64797 static int traverse(struct seq_file *m, loff_t offset)
64798 {
64799 loff_t pos = 0, index;
64800 @@ -96,7 +111,7 @@ static int traverse(struct seq_file *m, loff_t offset)
64801 return 0;
64802 }
64803 if (!m->buf) {
64804 - m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
64805 + m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
64806 if (!m->buf)
64807 return -ENOMEM;
64808 }
64809 @@ -137,7 +152,7 @@ Eoverflow:
64810 m->op->stop(m, p);
64811 kfree(m->buf);
64812 m->count = 0;
64813 - m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
64814 + m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
64815 return !m->buf ? -ENOMEM : -EAGAIN;
64816 }
64817
64818 @@ -153,7 +168,7 @@ Eoverflow:
64819 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
64820 {
64821 struct seq_file *m = file->private_data;
64822 - size_t copied = 0;
64823 + ssize_t copied = 0;
64824 loff_t pos;
64825 size_t n;
64826 void *p;
64827 @@ -192,7 +207,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
64828
64829 /* grab buffer if we didn't have one */
64830 if (!m->buf) {
64831 - m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
64832 + m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
64833 if (!m->buf)
64834 goto Enomem;
64835 }
64836 @@ -234,7 +249,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
64837 m->op->stop(m, p);
64838 kfree(m->buf);
64839 m->count = 0;
64840 - m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
64841 + m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
64842 if (!m->buf)
64843 goto Enomem;
64844 m->version = 0;
64845 @@ -584,7 +599,7 @@ static void single_stop(struct seq_file *p, void *v)
64846 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
64847 void *data)
64848 {
64849 - struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
64850 + seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
64851 int res = -ENOMEM;
64852
64853 if (op) {
64854 @@ -620,6 +635,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
64855 }
64856 EXPORT_SYMBOL(single_open_size);
64857
64858 +int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
64859 + void *data)
64860 +{
64861 + if (gr_proc_is_restricted())
64862 + return -EACCES;
64863 +
64864 + return single_open(file, show, data);
64865 +}
64866 +EXPORT_SYMBOL(single_open_restrict);
64867 +
64868 +
64869 int single_release(struct inode *inode, struct file *file)
64870 {
64871 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
64872 diff --git a/fs/splice.c b/fs/splice.c
64873 index 12028fa..a6f2619 100644
64874 --- a/fs/splice.c
64875 +++ b/fs/splice.c
64876 @@ -196,7 +196,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
64877 pipe_lock(pipe);
64878
64879 for (;;) {
64880 - if (!pipe->readers) {
64881 + if (!atomic_read(&pipe->readers)) {
64882 send_sig(SIGPIPE, current, 0);
64883 if (!ret)
64884 ret = -EPIPE;
64885 @@ -219,7 +219,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
64886 page_nr++;
64887 ret += buf->len;
64888
64889 - if (pipe->files)
64890 + if (atomic_read(&pipe->files))
64891 do_wakeup = 1;
64892
64893 if (!--spd->nr_pages)
64894 @@ -250,9 +250,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
64895 do_wakeup = 0;
64896 }
64897
64898 - pipe->waiting_writers++;
64899 + atomic_inc(&pipe->waiting_writers);
64900 pipe_wait(pipe);
64901 - pipe->waiting_writers--;
64902 + atomic_dec(&pipe->waiting_writers);
64903 }
64904
64905 pipe_unlock(pipe);
64906 @@ -583,7 +583,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
64907 old_fs = get_fs();
64908 set_fs(get_ds());
64909 /* The cast to a user pointer is valid due to the set_fs() */
64910 - res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
64911 + res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
64912 set_fs(old_fs);
64913
64914 return res;
64915 @@ -598,7 +598,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
64916 old_fs = get_fs();
64917 set_fs(get_ds());
64918 /* The cast to a user pointer is valid due to the set_fs() */
64919 - res = vfs_write(file, (__force const char __user *)buf, count, &pos);
64920 + res = vfs_write(file, (const char __force_user *)buf, count, &pos);
64921 set_fs(old_fs);
64922
64923 return res;
64924 @@ -651,7 +651,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
64925 goto err;
64926
64927 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
64928 - vec[i].iov_base = (void __user *) page_address(page);
64929 + vec[i].iov_base = (void __force_user *) page_address(page);
64930 vec[i].iov_len = this_len;
64931 spd.pages[i] = page;
64932 spd.nr_pages++;
64933 @@ -847,7 +847,7 @@ int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_desc *sd,
64934 ops->release(pipe, buf);
64935 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
64936 pipe->nrbufs--;
64937 - if (pipe->files)
64938 + if (atomic_read(&pipe->files))
64939 sd->need_wakeup = true;
64940 }
64941
64942 @@ -872,10 +872,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
64943 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
64944 {
64945 while (!pipe->nrbufs) {
64946 - if (!pipe->writers)
64947 + if (!atomic_read(&pipe->writers))
64948 return 0;
64949
64950 - if (!pipe->waiting_writers && sd->num_spliced)
64951 + if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
64952 return 0;
64953
64954 if (sd->flags & SPLICE_F_NONBLOCK)
64955 @@ -1197,7 +1197,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
64956 * out of the pipe right after the splice_to_pipe(). So set
64957 * PIPE_READERS appropriately.
64958 */
64959 - pipe->readers = 1;
64960 + atomic_set(&pipe->readers, 1);
64961
64962 current->splice_pipe = pipe;
64963 }
64964 @@ -1493,6 +1493,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
64965
64966 partial[buffers].offset = off;
64967 partial[buffers].len = plen;
64968 + partial[buffers].private = 0;
64969
64970 off = 0;
64971 len -= plen;
64972 @@ -1795,9 +1796,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
64973 ret = -ERESTARTSYS;
64974 break;
64975 }
64976 - if (!pipe->writers)
64977 + if (!atomic_read(&pipe->writers))
64978 break;
64979 - if (!pipe->waiting_writers) {
64980 + if (!atomic_read(&pipe->waiting_writers)) {
64981 if (flags & SPLICE_F_NONBLOCK) {
64982 ret = -EAGAIN;
64983 break;
64984 @@ -1829,7 +1830,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
64985 pipe_lock(pipe);
64986
64987 while (pipe->nrbufs >= pipe->buffers) {
64988 - if (!pipe->readers) {
64989 + if (!atomic_read(&pipe->readers)) {
64990 send_sig(SIGPIPE, current, 0);
64991 ret = -EPIPE;
64992 break;
64993 @@ -1842,9 +1843,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
64994 ret = -ERESTARTSYS;
64995 break;
64996 }
64997 - pipe->waiting_writers++;
64998 + atomic_inc(&pipe->waiting_writers);
64999 pipe_wait(pipe);
65000 - pipe->waiting_writers--;
65001 + atomic_dec(&pipe->waiting_writers);
65002 }
65003
65004 pipe_unlock(pipe);
65005 @@ -1880,14 +1881,14 @@ retry:
65006 pipe_double_lock(ipipe, opipe);
65007
65008 do {
65009 - if (!opipe->readers) {
65010 + if (!atomic_read(&opipe->readers)) {
65011 send_sig(SIGPIPE, current, 0);
65012 if (!ret)
65013 ret = -EPIPE;
65014 break;
65015 }
65016
65017 - if (!ipipe->nrbufs && !ipipe->writers)
65018 + if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
65019 break;
65020
65021 /*
65022 @@ -1984,7 +1985,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
65023 pipe_double_lock(ipipe, opipe);
65024
65025 do {
65026 - if (!opipe->readers) {
65027 + if (!atomic_read(&opipe->readers)) {
65028 send_sig(SIGPIPE, current, 0);
65029 if (!ret)
65030 ret = -EPIPE;
65031 @@ -2029,7 +2030,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
65032 * return EAGAIN if we have the potential of some data in the
65033 * future, otherwise just return 0
65034 */
65035 - if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
65036 + if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
65037 ret = -EAGAIN;
65038
65039 pipe_unlock(ipipe);
65040 diff --git a/fs/stat.c b/fs/stat.c
65041 index ae0c3ce..9ee641c 100644
65042 --- a/fs/stat.c
65043 +++ b/fs/stat.c
65044 @@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
65045 stat->gid = inode->i_gid;
65046 stat->rdev = inode->i_rdev;
65047 stat->size = i_size_read(inode);
65048 - stat->atime = inode->i_atime;
65049 - stat->mtime = inode->i_mtime;
65050 + if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
65051 + stat->atime = inode->i_ctime;
65052 + stat->mtime = inode->i_ctime;
65053 + } else {
65054 + stat->atime = inode->i_atime;
65055 + stat->mtime = inode->i_mtime;
65056 + }
65057 stat->ctime = inode->i_ctime;
65058 stat->blksize = (1 << inode->i_blkbits);
65059 stat->blocks = inode->i_blocks;
65060 @@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
65061 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
65062 {
65063 struct inode *inode = path->dentry->d_inode;
65064 + int retval;
65065
65066 - if (inode->i_op->getattr)
65067 - return inode->i_op->getattr(path->mnt, path->dentry, stat);
65068 + if (inode->i_op->getattr) {
65069 + retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
65070 + if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
65071 + stat->atime = stat->ctime;
65072 + stat->mtime = stat->ctime;
65073 + }
65074 + return retval;
65075 + }
65076
65077 generic_fillattr(inode, stat);
65078 return 0;
65079 diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
65080 index ee0d761..b346c58 100644
65081 --- a/fs/sysfs/dir.c
65082 +++ b/fs/sysfs/dir.c
65083 @@ -62,9 +62,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
65084 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
65085 {
65086 struct kernfs_node *parent, *kn;
65087 + const char *name;
65088 + umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
65089 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
65090 + const char *parent_name;
65091 +#endif
65092
65093 BUG_ON(!kobj);
65094
65095 + name = kobject_name(kobj);
65096 +
65097 if (kobj->parent)
65098 parent = kobj->parent->sd;
65099 else
65100 @@ -73,11 +80,22 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
65101 if (!parent)
65102 return -ENOENT;
65103
65104 - kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
65105 - S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
65106 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
65107 + parent_name = parent->name;
65108 + mode = S_IRWXU;
65109 +
65110 + if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
65111 + (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
65112 + (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
65113 + (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
65114 + mode = S_IRWXU | S_IRUGO | S_IXUGO;
65115 +#endif
65116 +
65117 + kn = kernfs_create_dir_ns(parent, name,
65118 + mode, kobj, ns);
65119 if (IS_ERR(kn)) {
65120 if (PTR_ERR(kn) == -EEXIST)
65121 - sysfs_warn_dup(parent, kobject_name(kobj));
65122 + sysfs_warn_dup(parent, name);
65123 return PTR_ERR(kn);
65124 }
65125
65126 diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
65127 index 69d4889..a810bd4 100644
65128 --- a/fs/sysv/sysv.h
65129 +++ b/fs/sysv/sysv.h
65130 @@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
65131 #endif
65132 }
65133
65134 -static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
65135 +static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
65136 {
65137 if (sbi->s_bytesex == BYTESEX_PDP)
65138 return PDP_swab((__force __u32)n);
65139 diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
65140 index e18b988..f1d4ad0f 100644
65141 --- a/fs/ubifs/io.c
65142 +++ b/fs/ubifs/io.c
65143 @@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
65144 return err;
65145 }
65146
65147 -int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
65148 +int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
65149 {
65150 int err;
65151
65152 diff --git a/fs/udf/misc.c b/fs/udf/misc.c
65153 index c175b4d..8f36a16 100644
65154 --- a/fs/udf/misc.c
65155 +++ b/fs/udf/misc.c
65156 @@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
65157
65158 u8 udf_tag_checksum(const struct tag *t)
65159 {
65160 - u8 *data = (u8 *)t;
65161 + const u8 *data = (const u8 *)t;
65162 u8 checksum = 0;
65163 int i;
65164 for (i = 0; i < sizeof(struct tag); ++i)
65165 diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
65166 index 8d974c4..b82f6ec 100644
65167 --- a/fs/ufs/swab.h
65168 +++ b/fs/ufs/swab.h
65169 @@ -22,7 +22,7 @@ enum {
65170 BYTESEX_BE
65171 };
65172
65173 -static inline u64
65174 +static inline u64 __intentional_overflow(-1)
65175 fs64_to_cpu(struct super_block *sbp, __fs64 n)
65176 {
65177 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
65178 @@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
65179 return (__force __fs64)cpu_to_be64(n);
65180 }
65181
65182 -static inline u32
65183 +static inline u32 __intentional_overflow(-1)
65184 fs32_to_cpu(struct super_block *sbp, __fs32 n)
65185 {
65186 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
65187 diff --git a/fs/utimes.c b/fs/utimes.c
65188 index aa138d6..5f3a811 100644
65189 --- a/fs/utimes.c
65190 +++ b/fs/utimes.c
65191 @@ -1,6 +1,7 @@
65192 #include <linux/compiler.h>
65193 #include <linux/file.h>
65194 #include <linux/fs.h>
65195 +#include <linux/security.h>
65196 #include <linux/linkage.h>
65197 #include <linux/mount.h>
65198 #include <linux/namei.h>
65199 @@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
65200 }
65201 }
65202 retry_deleg:
65203 +
65204 + if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
65205 + error = -EACCES;
65206 + goto mnt_drop_write_and_out;
65207 + }
65208 +
65209 mutex_lock(&inode->i_mutex);
65210 error = notify_change(path->dentry, &newattrs, &delegated_inode);
65211 mutex_unlock(&inode->i_mutex);
65212 diff --git a/fs/xattr.c b/fs/xattr.c
65213 index 3377dff..f394815 100644
65214 --- a/fs/xattr.c
65215 +++ b/fs/xattr.c
65216 @@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
65217 return rc;
65218 }
65219
65220 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
65221 +ssize_t
65222 +pax_getxattr(struct dentry *dentry, void *value, size_t size)
65223 +{
65224 + struct inode *inode = dentry->d_inode;
65225 + ssize_t error;
65226 +
65227 + error = inode_permission(inode, MAY_EXEC);
65228 + if (error)
65229 + return error;
65230 +
65231 + if (inode->i_op->getxattr)
65232 + error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
65233 + else
65234 + error = -EOPNOTSUPP;
65235 +
65236 + return error;
65237 +}
65238 +EXPORT_SYMBOL(pax_getxattr);
65239 +#endif
65240 +
65241 ssize_t
65242 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
65243 {
65244 @@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
65245 * Extended attribute SET operations
65246 */
65247 static long
65248 -setxattr(struct dentry *d, const char __user *name, const void __user *value,
65249 +setxattr(struct path *path, const char __user *name, const void __user *value,
65250 size_t size, int flags)
65251 {
65252 int error;
65253 @@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
65254 posix_acl_fix_xattr_from_user(kvalue, size);
65255 }
65256
65257 - error = vfs_setxattr(d, kname, kvalue, size, flags);
65258 + if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
65259 + error = -EACCES;
65260 + goto out;
65261 + }
65262 +
65263 + error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
65264 out:
65265 if (vvalue)
65266 vfree(vvalue);
65267 @@ -377,7 +403,7 @@ retry:
65268 return error;
65269 error = mnt_want_write(path.mnt);
65270 if (!error) {
65271 - error = setxattr(path.dentry, name, value, size, flags);
65272 + error = setxattr(&path, name, value, size, flags);
65273 mnt_drop_write(path.mnt);
65274 }
65275 path_put(&path);
65276 @@ -401,7 +427,7 @@ retry:
65277 return error;
65278 error = mnt_want_write(path.mnt);
65279 if (!error) {
65280 - error = setxattr(path.dentry, name, value, size, flags);
65281 + error = setxattr(&path, name, value, size, flags);
65282 mnt_drop_write(path.mnt);
65283 }
65284 path_put(&path);
65285 @@ -416,16 +442,14 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
65286 const void __user *,value, size_t, size, int, flags)
65287 {
65288 struct fd f = fdget(fd);
65289 - struct dentry *dentry;
65290 int error = -EBADF;
65291
65292 if (!f.file)
65293 return error;
65294 - dentry = f.file->f_path.dentry;
65295 - audit_inode(NULL, dentry, 0);
65296 + audit_inode(NULL, f.file->f_path.dentry, 0);
65297 error = mnt_want_write_file(f.file);
65298 if (!error) {
65299 - error = setxattr(dentry, name, value, size, flags);
65300 + error = setxattr(&f.file->f_path, name, value, size, flags);
65301 mnt_drop_write_file(f.file);
65302 }
65303 fdput(f);
65304 @@ -626,7 +650,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
65305 * Extended attribute REMOVE operations
65306 */
65307 static long
65308 -removexattr(struct dentry *d, const char __user *name)
65309 +removexattr(struct path *path, const char __user *name)
65310 {
65311 int error;
65312 char kname[XATTR_NAME_MAX + 1];
65313 @@ -637,7 +661,10 @@ removexattr(struct dentry *d, const char __user *name)
65314 if (error < 0)
65315 return error;
65316
65317 - return vfs_removexattr(d, kname);
65318 + if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
65319 + return -EACCES;
65320 +
65321 + return vfs_removexattr(path->dentry, kname);
65322 }
65323
65324 SYSCALL_DEFINE2(removexattr, const char __user *, pathname,
65325 @@ -652,7 +679,7 @@ retry:
65326 return error;
65327 error = mnt_want_write(path.mnt);
65328 if (!error) {
65329 - error = removexattr(path.dentry, name);
65330 + error = removexattr(&path, name);
65331 mnt_drop_write(path.mnt);
65332 }
65333 path_put(&path);
65334 @@ -675,7 +702,7 @@ retry:
65335 return error;
65336 error = mnt_want_write(path.mnt);
65337 if (!error) {
65338 - error = removexattr(path.dentry, name);
65339 + error = removexattr(&path, name);
65340 mnt_drop_write(path.mnt);
65341 }
65342 path_put(&path);
65343 @@ -689,16 +716,16 @@ retry:
65344 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
65345 {
65346 struct fd f = fdget(fd);
65347 - struct dentry *dentry;
65348 + struct path *path;
65349 int error = -EBADF;
65350
65351 if (!f.file)
65352 return error;
65353 - dentry = f.file->f_path.dentry;
65354 - audit_inode(NULL, dentry, 0);
65355 + path = &f.file->f_path;
65356 + audit_inode(NULL, path->dentry, 0);
65357 error = mnt_want_write_file(f.file);
65358 if (!error) {
65359 - error = removexattr(dentry, name);
65360 + error = removexattr(path, name);
65361 mnt_drop_write_file(f.file);
65362 }
65363 fdput(f);
65364 diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
65365 index 152543c..d80c361 100644
65366 --- a/fs/xfs/xfs_bmap.c
65367 +++ b/fs/xfs/xfs_bmap.c
65368 @@ -584,7 +584,7 @@ xfs_bmap_validate_ret(
65369
65370 #else
65371 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
65372 -#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
65373 +#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
65374 #endif /* DEBUG */
65375
65376 /*
65377 diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
65378 index aead369..0dfecfd 100644
65379 --- a/fs/xfs/xfs_dir2_readdir.c
65380 +++ b/fs/xfs/xfs_dir2_readdir.c
65381 @@ -160,7 +160,12 @@ xfs_dir2_sf_getdents(
65382 ino = dp->d_ops->sf_get_ino(sfp, sfep);
65383 filetype = dp->d_ops->sf_get_ftype(sfep);
65384 ctx->pos = off & 0x7fffffff;
65385 - if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
65386 + if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
65387 + char name[sfep->namelen];
65388 + memcpy(name, sfep->name, sfep->namelen);
65389 + if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(mp, filetype)))
65390 + return 0;
65391 + } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
65392 xfs_dir3_get_dtype(mp, filetype)))
65393 return 0;
65394 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
65395 diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
65396 index bcfe612..aa399c0 100644
65397 --- a/fs/xfs/xfs_ioctl.c
65398 +++ b/fs/xfs/xfs_ioctl.c
65399 @@ -122,7 +122,7 @@ xfs_find_handle(
65400 }
65401
65402 error = -EFAULT;
65403 - if (copy_to_user(hreq->ohandle, &handle, hsize) ||
65404 + if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
65405 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
65406 goto out_put;
65407
65408 diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
65409 new file mode 100644
65410 index 0000000..3abaf02
65411 --- /dev/null
65412 +++ b/grsecurity/Kconfig
65413 @@ -0,0 +1,1161 @@
65414 +#
65415 +# grecurity configuration
65416 +#
65417 +menu "Memory Protections"
65418 +depends on GRKERNSEC
65419 +
65420 +config GRKERNSEC_KMEM
65421 + bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
65422 + default y if GRKERNSEC_CONFIG_AUTO
65423 + select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
65424 + help
65425 + If you say Y here, /dev/kmem and /dev/mem won't be allowed to
65426 + be written to or read from to modify or leak the contents of the running
65427 + kernel. /dev/port will also not be allowed to be opened, writing to
65428 + /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
65429 + If you have module support disabled, enabling this will close up several
65430 + ways that are currently used to insert malicious code into the running
65431 + kernel.
65432 +
65433 + Even with this feature enabled, we still highly recommend that
65434 + you use the RBAC system, as it is still possible for an attacker to
65435 + modify the running kernel through other more obscure methods.
65436 +
65437 + It is highly recommended that you say Y here if you meet all the
65438 + conditions above.
65439 +
65440 +config GRKERNSEC_VM86
65441 + bool "Restrict VM86 mode"
65442 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
65443 + depends on X86_32
65444 +
65445 + help
65446 + If you say Y here, only processes with CAP_SYS_RAWIO will be able to
65447 + make use of a special execution mode on 32bit x86 processors called
65448 + Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
65449 + video cards and will still work with this option enabled. The purpose
65450 + of the option is to prevent exploitation of emulation errors in
65451 + virtualization of vm86 mode like the one discovered in VMWare in 2009.
65452 + Nearly all users should be able to enable this option.
65453 +
65454 +config GRKERNSEC_IO
65455 + bool "Disable privileged I/O"
65456 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
65457 + depends on X86
65458 + select RTC_CLASS
65459 + select RTC_INTF_DEV
65460 + select RTC_DRV_CMOS
65461 +
65462 + help
65463 + If you say Y here, all ioperm and iopl calls will return an error.
65464 + Ioperm and iopl can be used to modify the running kernel.
65465 + Unfortunately, some programs need this access to operate properly,
65466 + the most notable of which are XFree86 and hwclock. hwclock can be
65467 + remedied by having RTC support in the kernel, so real-time
65468 + clock support is enabled if this option is enabled, to ensure
65469 + that hwclock operates correctly. If hwclock still does not work,
65470 + either update udev or symlink /dev/rtc to /dev/rtc0.
65471 +
65472 + If you're using XFree86 or a version of Xorg from 2012 or earlier,
65473 + you may not be able to boot into a graphical environment with this
65474 + option enabled. In this case, you should use the RBAC system instead.
65475 +
65476 +config GRKERNSEC_JIT_HARDEN
65477 + bool "Harden BPF JIT against spray attacks"
65478 + default y if GRKERNSEC_CONFIG_AUTO
65479 + depends on BPF_JIT && X86
65480 + help
65481 + If you say Y here, the native code generated by the kernel's Berkeley
65482 + Packet Filter (BPF) JIT engine will be hardened against JIT-spraying
65483 + attacks that attempt to fit attacker-beneficial instructions in
65484 + 32bit immediate fields of JIT-generated native instructions. The
65485 + attacker will generally aim to cause an unintended instruction sequence
65486 + of JIT-generated native code to execute by jumping into the middle of
65487 + a generated instruction. This feature effectively randomizes the 32bit
65488 + immediate constants present in the generated code to thwart such attacks.
65489 +
65490 + If you're using KERNEXEC, it's recommended that you enable this option
65491 + to supplement the hardening of the kernel.
65492 +
65493 +config GRKERNSEC_PERF_HARDEN
65494 + bool "Disable unprivileged PERF_EVENTS usage by default"
65495 + default y if GRKERNSEC_CONFIG_AUTO
65496 + depends on PERF_EVENTS
65497 + help
65498 + If you say Y here, the range of acceptable values for the
65499 + /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
65500 + default to a new value: 3. When the sysctl is set to this value, no
65501 + unprivileged use of the PERF_EVENTS syscall interface will be permitted.
65502 +
65503 + Though PERF_EVENTS can be used legitimately for performance monitoring
65504 + and low-level application profiling, it is forced on regardless of
65505 + configuration, has been at fault for several vulnerabilities, and
65506 + creates new opportunities for side channels and other information leaks.
65507 +
65508 + This feature puts PERF_EVENTS into a secure default state and permits
65509 + the administrator to change out of it temporarily if unprivileged
65510 + application profiling is needed.
65511 +
65512 +config GRKERNSEC_RAND_THREADSTACK
65513 + bool "Insert random gaps between thread stacks"
65514 + default y if GRKERNSEC_CONFIG_AUTO
65515 + depends on PAX_RANDMMAP && !PPC
65516 + help
65517 + If you say Y here, a random-sized gap will be enforced between allocated
65518 + thread stacks. Glibc's NPTL and other threading libraries that
65519 + pass MAP_STACK to the kernel for thread stack allocation are supported.
65520 + The implementation currently provides 8 bits of entropy for the gap.
65521 +
65522 + Many distributions do not compile threaded remote services with the
65523 + -fstack-check argument to GCC, causing the variable-sized stack-based
65524 + allocator, alloca(), to not probe the stack on allocation. This
65525 + permits an unbounded alloca() to skip over any guard page and potentially
65526 + modify another thread's stack reliably. An enforced random gap
65527 + reduces the reliability of such an attack and increases the chance
65528 + that such a read/write to another thread's stack instead lands in
65529 + an unmapped area, causing a crash and triggering grsecurity's
65530 + anti-bruteforcing logic.
65531 +
65532 +config GRKERNSEC_PROC_MEMMAP
65533 + bool "Harden ASLR against information leaks and entropy reduction"
65534 + default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
65535 + depends on PAX_NOEXEC || PAX_ASLR
65536 + help
65537 + If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
65538 + give no information about the addresses of its mappings if
65539 + PaX features that rely on random addresses are enabled on the task.
65540 + In addition to sanitizing this information and disabling other
65541 + dangerous sources of information, this option causes reads of sensitive
65542 + /proc/<pid> entries where the file descriptor was opened in a different
65543 + task than the one performing the read. Such attempts are logged.
65544 + This option also limits argv/env strings for suid/sgid binaries
65545 + to 512KB to prevent a complete exhaustion of the stack entropy provided
65546 + by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
65547 + binaries to prevent alternative mmap layouts from being abused.
65548 +
65549 + If you use PaX it is essential that you say Y here as it closes up
65550 + several holes that make full ASLR useless locally.
65551 +
65552 +config GRKERNSEC_BRUTE
65553 + bool "Deter exploit bruteforcing"
65554 + default y if GRKERNSEC_CONFIG_AUTO
65555 + help
65556 + If you say Y here, attempts to bruteforce exploits against forking
65557 + daemons such as apache or sshd, as well as against suid/sgid binaries
65558 + will be deterred. When a child of a forking daemon is killed by PaX
65559 + or crashes due to an illegal instruction or other suspicious signal,
65560 + the parent process will be delayed 30 seconds upon every subsequent
65561 + fork until the administrator is able to assess the situation and
65562 + restart the daemon.
65563 + In the suid/sgid case, the attempt is logged, the user has all their
65564 + existing instances of the suid/sgid binary terminated and will
65565 + be unable to execute any suid/sgid binaries for 15 minutes.
65566 +
65567 + It is recommended that you also enable signal logging in the auditing
65568 + section so that logs are generated when a process triggers a suspicious
65569 + signal.
65570 + If the sysctl option is enabled, a sysctl option with name
65571 + "deter_bruteforce" is created.
65572 +
65573 +config GRKERNSEC_MODHARDEN
65574 + bool "Harden module auto-loading"
65575 + default y if GRKERNSEC_CONFIG_AUTO
65576 + depends on MODULES
65577 + help
65578 + If you say Y here, module auto-loading in response to use of some
65579 + feature implemented by an unloaded module will be restricted to
65580 + root users. Enabling this option helps defend against attacks
65581 + by unprivileged users who abuse the auto-loading behavior to
65582 + cause a vulnerable module to load that is then exploited.
65583 +
65584 + If this option prevents a legitimate use of auto-loading for a
65585 + non-root user, the administrator can execute modprobe manually
65586 + with the exact name of the module mentioned in the alert log.
65587 + Alternatively, the administrator can add the module to the list
65588 + of modules loaded at boot by modifying init scripts.
65589 +
65590 + Modification of init scripts will most likely be needed on
65591 + Ubuntu servers with encrypted home directory support enabled,
65592 + as the first non-root user logging in will cause the ecb(aes),
65593 + ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
65594 +
65595 +config GRKERNSEC_HIDESYM
65596 + bool "Hide kernel symbols"
65597 + default y if GRKERNSEC_CONFIG_AUTO
65598 + select PAX_USERCOPY_SLABS
65599 + help
65600 + If you say Y here, getting information on loaded modules, and
65601 + displaying all kernel symbols through a syscall will be restricted
65602 + to users with CAP_SYS_MODULE. For software compatibility reasons,
65603 + /proc/kallsyms will be restricted to the root user. The RBAC
65604 + system can hide that entry even from root.
65605 +
65606 + This option also prevents leaking of kernel addresses through
65607 + several /proc entries.
65608 +
65609 + Note that this option is only effective provided the following
65610 + conditions are met:
65611 + 1) The kernel using grsecurity is not precompiled by some distribution
65612 + 2) You have also enabled GRKERNSEC_DMESG
65613 + 3) You are using the RBAC system and hiding other files such as your
65614 + kernel image and System.map. Alternatively, enabling this option
65615 + causes the permissions on /boot, /lib/modules, and the kernel
65616 + source directory to change at compile time to prevent
65617 + reading by non-root users.
65618 + If the above conditions are met, this option will aid in providing a
65619 + useful protection against local kernel exploitation of overflows
65620 + and arbitrary read/write vulnerabilities.
65621 +
65622 + It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
65623 + in addition to this feature.
65624 +
65625 +config GRKERNSEC_RANDSTRUCT
65626 + bool "Randomize layout of sensitive kernel structures"
65627 + default y if GRKERNSEC_CONFIG_AUTO
65628 + select GRKERNSEC_HIDESYM
65629 + select MODVERSIONS if MODULES
65630 + help
65631 + If you say Y here, the layouts of a number of sensitive kernel
65632 + structures (task, fs, cred, etc) and all structures composed entirely
65633 + of function pointers (aka "ops" structs) will be randomized at compile-time.
65634 + This can introduce the requirement of an additional infoleak
65635 + vulnerability for exploits targeting these structure types.
65636 +
65637 + Enabling this feature will introduce some performance impact, slightly
65638 + increase memory usage, and prevent the use of forensic tools like
65639 + Volatility against the system (unless the kernel source tree isn't
65640 + cleaned after kernel installation).
65641 +
65642 + The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
65643 + It remains after a make clean to allow for external modules to be compiled
65644 + with the existing seed and will be removed by a make mrproper or
65645 + make distclean.
65646 +
65647 + Note that the implementation requires gcc 4.6.4. or newer. You may need
65648 + to install the supporting headers explicitly in addition to the normal
65649 + gcc package.
65650 +
65651 +config GRKERNSEC_RANDSTRUCT_PERFORMANCE
65652 + bool "Use cacheline-aware structure randomization"
65653 + depends on GRKERNSEC_RANDSTRUCT
65654 + default y if GRKERNSEC_CONFIG_PRIORITY_PERF
65655 + help
65656 + If you say Y here, the RANDSTRUCT randomization will make a best effort
65657 + at restricting randomization to cacheline-sized groups of elements. It
65658 + will further not randomize bitfields in structures. This reduces the
65659 + performance hit of RANDSTRUCT at the cost of weakened randomization.
65660 +
65661 +config GRKERNSEC_KERN_LOCKOUT
65662 + bool "Active kernel exploit response"
65663 + default y if GRKERNSEC_CONFIG_AUTO
65664 + depends on X86 || ARM || PPC || SPARC
65665 + help
65666 + If you say Y here, when a PaX alert is triggered due to suspicious
65667 + activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
65668 + or an OOPS occurs due to bad memory accesses, instead of just
65669 + terminating the offending process (and potentially allowing
65670 + a subsequent exploit from the same user), we will take one of two
65671 + actions:
65672 + If the user was root, we will panic the system
65673 + If the user was non-root, we will log the attempt, terminate
65674 + all processes owned by the user, then prevent them from creating
65675 + any new processes until the system is restarted
65676 + This deters repeated kernel exploitation/bruteforcing attempts
65677 + and is useful for later forensics.
65678 +
65679 +config GRKERNSEC_OLD_ARM_USERLAND
65680 + bool "Old ARM userland compatibility"
65681 + depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
65682 + help
65683 + If you say Y here, stubs of executable code to perform such operations
65684 + as "compare-exchange" will be placed at fixed locations in the ARM vector
65685 + table. This is unfortunately needed for old ARM userland meant to run
65686 + across a wide range of processors. Without this option enabled,
65687 + the get_tls and data memory barrier stubs will be emulated by the kernel,
65688 + which is enough for Linaro userlands or other userlands designed for v6
65689 + and newer ARM CPUs. It's recommended that you try without this option enabled
65690 + first, and only enable it if your userland does not boot (it will likely fail
65691 + at init time).
65692 +
65693 +endmenu
65694 +menu "Role Based Access Control Options"
65695 +depends on GRKERNSEC
65696 +
65697 +config GRKERNSEC_RBAC_DEBUG
65698 + bool
65699 +
65700 +config GRKERNSEC_NO_RBAC
65701 + bool "Disable RBAC system"
65702 + help
65703 + If you say Y here, the /dev/grsec device will be removed from the kernel,
65704 + preventing the RBAC system from being enabled. You should only say Y
65705 + here if you have no intention of using the RBAC system, so as to prevent
65706 + an attacker with root access from misusing the RBAC system to hide files
65707 + and processes when loadable module support and /dev/[k]mem have been
65708 + locked down.
65709 +
65710 +config GRKERNSEC_ACL_HIDEKERN
65711 + bool "Hide kernel processes"
65712 + help
65713 + If you say Y here, all kernel threads will be hidden to all
65714 + processes but those whose subject has the "view hidden processes"
65715 + flag.
65716 +
65717 +config GRKERNSEC_ACL_MAXTRIES
65718 + int "Maximum tries before password lockout"
65719 + default 3
65720 + help
65721 + This option enforces the maximum number of times a user can attempt
65722 + to authorize themselves with the grsecurity RBAC system before being
65723 + denied the ability to attempt authorization again for a specified time.
65724 + The lower the number, the harder it will be to brute-force a password.
65725 +
65726 +config GRKERNSEC_ACL_TIMEOUT
65727 + int "Time to wait after max password tries, in seconds"
65728 + default 30
65729 + help
65730 + This option specifies the time the user must wait after attempting to
65731 + authorize to the RBAC system with the maximum number of invalid
65732 + passwords. The higher the number, the harder it will be to brute-force
65733 + a password.
65734 +
65735 +endmenu
65736 +menu "Filesystem Protections"
65737 +depends on GRKERNSEC
65738 +
65739 +config GRKERNSEC_PROC
65740 + bool "Proc restrictions"
65741 + default y if GRKERNSEC_CONFIG_AUTO
65742 + help
65743 + If you say Y here, the permissions of the /proc filesystem
65744 + will be altered to enhance system security and privacy. You MUST
65745 + choose either a user only restriction or a user and group restriction.
65746 + Depending upon the option you choose, you can either restrict users to
65747 + see only the processes they themselves run, or choose a group that can
65748 + view all processes and files normally restricted to root if you choose
65749 + the "restrict to user only" option. NOTE: If you're running identd or
65750 + ntpd as a non-root user, you will have to run it as the group you
65751 + specify here.
65752 +
65753 +config GRKERNSEC_PROC_USER
65754 + bool "Restrict /proc to user only"
65755 + depends on GRKERNSEC_PROC
65756 + help
65757 + If you say Y here, non-root users will only be able to view their own
65758 + processes, and restricts them from viewing network-related information,
65759 + and viewing kernel symbol and module information.
65760 +
65761 +config GRKERNSEC_PROC_USERGROUP
65762 + bool "Allow special group"
65763 + default y if GRKERNSEC_CONFIG_AUTO
65764 + depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
65765 + help
65766 + If you say Y here, you will be able to select a group that will be
65767 + able to view all processes and network-related information. If you've
65768 + enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
65769 + remain hidden. This option is useful if you want to run identd as
65770 + a non-root user. The group you select may also be chosen at boot time
65771 + via "grsec_proc_gid=" on the kernel commandline.
65772 +
65773 +config GRKERNSEC_PROC_GID
65774 + int "GID for special group"
65775 + depends on GRKERNSEC_PROC_USERGROUP
65776 + default 1001
65777 +
65778 +config GRKERNSEC_PROC_ADD
65779 + bool "Additional restrictions"
65780 + default y if GRKERNSEC_CONFIG_AUTO
65781 + depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
65782 + help
65783 + If you say Y here, additional restrictions will be placed on
65784 + /proc that keep normal users from viewing device information and
65785 + slabinfo information that could be useful for exploits.
65786 +
65787 +config GRKERNSEC_LINK
65788 + bool "Linking restrictions"
65789 + default y if GRKERNSEC_CONFIG_AUTO
65790 + help
65791 + If you say Y here, /tmp race exploits will be prevented, since users
65792 + will no longer be able to follow symlinks owned by other users in
65793 + world-writable +t directories (e.g. /tmp), unless the owner of the
65794 + symlink is the owner of the directory. users will also not be
65795 + able to hardlink to files they do not own. If the sysctl option is
65796 + enabled, a sysctl option with name "linking_restrictions" is created.
65797 +
65798 +config GRKERNSEC_SYMLINKOWN
65799 + bool "Kernel-enforced SymlinksIfOwnerMatch"
65800 + default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
65801 + help
65802 + Apache's SymlinksIfOwnerMatch option has an inherent race condition
65803 + that prevents it from being used as a security feature. As Apache
65804 + verifies the symlink by performing a stat() against the target of
65805 + the symlink before it is followed, an attacker can setup a symlink
65806 + to point to a same-owned file, then replace the symlink with one
65807 + that targets another user's file just after Apache "validates" the
65808 + symlink -- a classic TOCTOU race. If you say Y here, a complete,
65809 + race-free replacement for Apache's "SymlinksIfOwnerMatch" option
65810 + will be in place for the group you specify. If the sysctl option
65811 + is enabled, a sysctl option with name "enforce_symlinksifowner" is
65812 + created.
65813 +
65814 +config GRKERNSEC_SYMLINKOWN_GID
65815 + int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
65816 + depends on GRKERNSEC_SYMLINKOWN
65817 + default 1006
65818 + help
65819 + Setting this GID determines what group kernel-enforced
65820 + SymlinksIfOwnerMatch will be enabled for. If the sysctl option
65821 + is enabled, a sysctl option with name "symlinkown_gid" is created.
65822 +
65823 +config GRKERNSEC_FIFO
65824 + bool "FIFO restrictions"
65825 + default y if GRKERNSEC_CONFIG_AUTO
65826 + help
65827 + If you say Y here, users will not be able to write to FIFOs they don't
65828 + own in world-writable +t directories (e.g. /tmp), unless the owner of
65829 + the FIFO is the same owner of the directory it's held in. If the sysctl
65830 + option is enabled, a sysctl option with name "fifo_restrictions" is
65831 + created.
65832 +
65833 +config GRKERNSEC_SYSFS_RESTRICT
65834 + bool "Sysfs/debugfs restriction"
65835 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
65836 + depends on SYSFS
65837 + help
65838 + If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
65839 + any filesystem normally mounted under it (e.g. debugfs) will be
65840 + mostly accessible only by root. These filesystems generally provide access
65841 + to hardware and debug information that isn't appropriate for unprivileged
65842 + users of the system. Sysfs and debugfs have also become a large source
65843 + of new vulnerabilities, ranging from infoleaks to local compromise.
65844 + There has been very little oversight with an eye toward security involved
65845 + in adding new exporters of information to these filesystems, so their
65846 + use is discouraged.
65847 + For reasons of compatibility, a few directories have been whitelisted
65848 + for access by non-root users:
65849 + /sys/fs/selinux
65850 + /sys/fs/fuse
65851 + /sys/devices/system/cpu
65852 +
65853 +config GRKERNSEC_ROFS
65854 + bool "Runtime read-only mount protection"
65855 + depends on SYSCTL
65856 + help
65857 + If you say Y here, a sysctl option with name "romount_protect" will
65858 + be created. By setting this option to 1 at runtime, filesystems
65859 + will be protected in the following ways:
65860 + * No new writable mounts will be allowed
65861 + * Existing read-only mounts won't be able to be remounted read/write
65862 + * Write operations will be denied on all block devices
65863 + This option acts independently of grsec_lock: once it is set to 1,
65864 + it cannot be turned off. Therefore, please be mindful of the resulting
65865 + behavior if this option is enabled in an init script on a read-only
65866 + filesystem.
65867 + Also be aware that as with other root-focused features, GRKERNSEC_KMEM
65868 + and GRKERNSEC_IO should be enabled and module loading disabled via
65869 + config or at runtime.
65870 + This feature is mainly intended for secure embedded systems.
65871 +
65872 +
65873 +config GRKERNSEC_DEVICE_SIDECHANNEL
65874 + bool "Eliminate stat/notify-based device sidechannels"
65875 + default y if GRKERNSEC_CONFIG_AUTO
65876 + help
65877 + If you say Y here, timing analyses on block or character
65878 + devices like /dev/ptmx using stat or inotify/dnotify/fanotify
65879 + will be thwarted for unprivileged users. If a process without
65880 + CAP_MKNOD stats such a device, the last access and last modify times
65881 + will match the device's create time. No access or modify events
65882 + will be triggered through inotify/dnotify/fanotify for such devices.
65883 + This feature will prevent attacks that may at a minimum
65884 + allow an attacker to determine the administrator's password length.
65885 +
65886 +config GRKERNSEC_CHROOT
65887 + bool "Chroot jail restrictions"
65888 + default y if GRKERNSEC_CONFIG_AUTO
65889 + help
65890 + If you say Y here, you will be able to choose several options that will
65891 + make breaking out of a chrooted jail much more difficult. If you
65892 + encounter no software incompatibilities with the following options, it
65893 + is recommended that you enable each one.
65894 +
65895 + Note that the chroot restrictions are not intended to apply to "chroots"
65896 + to directories that are simple bind mounts of the global root filesystem.
65897 + For several other reasons, a user shouldn't expect any significant
65898 + security by performing such a chroot.
65899 +
65900 +config GRKERNSEC_CHROOT_MOUNT
65901 + bool "Deny mounts"
65902 + default y if GRKERNSEC_CONFIG_AUTO
65903 + depends on GRKERNSEC_CHROOT
65904 + help
65905 + If you say Y here, processes inside a chroot will not be able to
65906 + mount or remount filesystems. If the sysctl option is enabled, a
65907 + sysctl option with name "chroot_deny_mount" is created.
65908 +
65909 +config GRKERNSEC_CHROOT_DOUBLE
65910 + bool "Deny double-chroots"
65911 + default y if GRKERNSEC_CONFIG_AUTO
65912 + depends on GRKERNSEC_CHROOT
65913 + help
65914 + If you say Y here, processes inside a chroot will not be able to chroot
65915 + again outside the chroot. This is a widely used method of breaking
65916 + out of a chroot jail and should not be allowed. If the sysctl
65917 + option is enabled, a sysctl option with name
65918 + "chroot_deny_chroot" is created.
65919 +
65920 +config GRKERNSEC_CHROOT_PIVOT
65921 + bool "Deny pivot_root in chroot"
65922 + default y if GRKERNSEC_CONFIG_AUTO
65923 + depends on GRKERNSEC_CHROOT
65924 + help
65925 + If you say Y here, processes inside a chroot will not be able to use
65926 + a function called pivot_root() that was introduced in Linux 2.3.41. It
65927 + works similar to chroot in that it changes the root filesystem. This
65928 + function could be misused in a chrooted process to attempt to break out
65929 + of the chroot, and therefore should not be allowed. If the sysctl
65930 + option is enabled, a sysctl option with name "chroot_deny_pivot" is
65931 + created.
65932 +
65933 +config GRKERNSEC_CHROOT_CHDIR
65934 + bool "Enforce chdir(\"/\") on all chroots"
65935 + default y if GRKERNSEC_CONFIG_AUTO
65936 + depends on GRKERNSEC_CHROOT
65937 + help
65938 + If you say Y here, the current working directory of all newly-chrooted
65939 + applications will be set to the the root directory of the chroot.
65940 + The man page on chroot(2) states:
65941 + Note that this call does not change the current working
65942 + directory, so that `.' can be outside the tree rooted at
65943 + `/'. In particular, the super-user can escape from a
65944 + `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
65945 +
65946 + It is recommended that you say Y here, since it's not known to break
65947 + any software. If the sysctl option is enabled, a sysctl option with
65948 + name "chroot_enforce_chdir" is created.
65949 +
65950 +config GRKERNSEC_CHROOT_CHMOD
65951 + bool "Deny (f)chmod +s"
65952 + default y if GRKERNSEC_CONFIG_AUTO
65953 + depends on GRKERNSEC_CHROOT
65954 + help
65955 + If you say Y here, processes inside a chroot will not be able to chmod
65956 + or fchmod files to make them have suid or sgid bits. This protects
65957 + against another published method of breaking a chroot. If the sysctl
65958 + option is enabled, a sysctl option with name "chroot_deny_chmod" is
65959 + created.
65960 +
65961 +config GRKERNSEC_CHROOT_FCHDIR
65962 + bool "Deny fchdir out of chroot"
65963 + default y if GRKERNSEC_CONFIG_AUTO
65964 + depends on GRKERNSEC_CHROOT
65965 + help
65966 + If you say Y here, a well-known method of breaking chroots by fchdir'ing
65967 + to a file descriptor of the chrooting process that points to a directory
65968 + outside the filesystem will be stopped. If the sysctl option
65969 + is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
65970 +
65971 +config GRKERNSEC_CHROOT_MKNOD
65972 + bool "Deny mknod"
65973 + default y if GRKERNSEC_CONFIG_AUTO
65974 + depends on GRKERNSEC_CHROOT
65975 + help
65976 + If you say Y here, processes inside a chroot will not be allowed to
65977 + mknod. The problem with using mknod inside a chroot is that it
65978 + would allow an attacker to create a device entry that is the same
65979 + as one on the physical root of your system, which could range from
65980 + anything from the console device to a device for your harddrive (which
65981 + they could then use to wipe the drive or steal data). It is recommended
65982 + that you say Y here, unless you run into software incompatibilities.
65983 + If the sysctl option is enabled, a sysctl option with name
65984 + "chroot_deny_mknod" is created.
65985 +
65986 +config GRKERNSEC_CHROOT_SHMAT
65987 + bool "Deny shmat() out of chroot"
65988 + default y if GRKERNSEC_CONFIG_AUTO
65989 + depends on GRKERNSEC_CHROOT
65990 + help
65991 + If you say Y here, processes inside a chroot will not be able to attach
65992 + to shared memory segments that were created outside of the chroot jail.
65993 + It is recommended that you say Y here. If the sysctl option is enabled,
65994 + a sysctl option with name "chroot_deny_shmat" is created.
65995 +
65996 +config GRKERNSEC_CHROOT_UNIX
65997 + bool "Deny access to abstract AF_UNIX sockets out of chroot"
65998 + default y if GRKERNSEC_CONFIG_AUTO
65999 + depends on GRKERNSEC_CHROOT
66000 + help
66001 + If you say Y here, processes inside a chroot will not be able to
66002 + connect to abstract (meaning not belonging to a filesystem) Unix
66003 + domain sockets that were bound outside of a chroot. It is recommended
66004 + that you say Y here. If the sysctl option is enabled, a sysctl option
66005 + with name "chroot_deny_unix" is created.
66006 +
66007 +config GRKERNSEC_CHROOT_FINDTASK
66008 + bool "Protect outside processes"
66009 + default y if GRKERNSEC_CONFIG_AUTO
66010 + depends on GRKERNSEC_CHROOT
66011 + help
66012 + If you say Y here, processes inside a chroot will not be able to
66013 + kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
66014 + getsid, or view any process outside of the chroot. If the sysctl
66015 + option is enabled, a sysctl option with name "chroot_findtask" is
66016 + created.
66017 +
66018 +config GRKERNSEC_CHROOT_NICE
66019 + bool "Restrict priority changes"
66020 + default y if GRKERNSEC_CONFIG_AUTO
66021 + depends on GRKERNSEC_CHROOT
66022 + help
66023 + If you say Y here, processes inside a chroot will not be able to raise
66024 + the priority of processes in the chroot, or alter the priority of
66025 + processes outside the chroot. This provides more security than simply
66026 + removing CAP_SYS_NICE from the process' capability set. If the
66027 + sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
66028 + is created.
66029 +
66030 +config GRKERNSEC_CHROOT_SYSCTL
66031 + bool "Deny sysctl writes"
66032 + default y if GRKERNSEC_CONFIG_AUTO
66033 + depends on GRKERNSEC_CHROOT
66034 + help
66035 + If you say Y here, an attacker in a chroot will not be able to
66036 + write to sysctl entries, either by sysctl(2) or through a /proc
66037 + interface. It is strongly recommended that you say Y here. If the
66038 + sysctl option is enabled, a sysctl option with name
66039 + "chroot_deny_sysctl" is created.
66040 +
66041 +config GRKERNSEC_CHROOT_CAPS
66042 + bool "Capability restrictions"
66043 + default y if GRKERNSEC_CONFIG_AUTO
66044 + depends on GRKERNSEC_CHROOT
66045 + help
66046 + If you say Y here, the capabilities on all processes within a
66047 + chroot jail will be lowered to stop module insertion, raw i/o,
66048 + system and net admin tasks, rebooting the system, modifying immutable
66049 + files, modifying IPC owned by another, and changing the system time.
66050 + This is left an option because it can break some apps. Disable this
66051 + if your chrooted apps are having problems performing those kinds of
66052 + tasks. If the sysctl option is enabled, a sysctl option with
66053 + name "chroot_caps" is created.
66054 +
66055 +config GRKERNSEC_CHROOT_INITRD
66056 + bool "Exempt initrd tasks from restrictions"
66057 + default y if GRKERNSEC_CONFIG_AUTO
66058 + depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
66059 + help
66060 + If you say Y here, tasks started prior to init will be exempted from
66061 + grsecurity's chroot restrictions. This option is mainly meant to
66062 + resolve Plymouth's performing privileged operations unnecessarily
66063 + in a chroot.
66064 +
66065 +endmenu
66066 +menu "Kernel Auditing"
66067 +depends on GRKERNSEC
66068 +
66069 +config GRKERNSEC_AUDIT_GROUP
66070 + bool "Single group for auditing"
66071 + help
66072 + If you say Y here, the exec and chdir logging features will only operate
66073 + on a group you specify. This option is recommended if you only want to
66074 + watch certain users instead of having a large amount of logs from the
66075 + entire system. If the sysctl option is enabled, a sysctl option with
66076 + name "audit_group" is created.
66077 +
66078 +config GRKERNSEC_AUDIT_GID
66079 + int "GID for auditing"
66080 + depends on GRKERNSEC_AUDIT_GROUP
66081 + default 1007
66082 +
66083 +config GRKERNSEC_EXECLOG
66084 + bool "Exec logging"
66085 + help
66086 + If you say Y here, all execve() calls will be logged (since the
66087 + other exec*() calls are frontends to execve(), all execution
66088 + will be logged). Useful for shell-servers that like to keep track
66089 + of their users. If the sysctl option is enabled, a sysctl option with
66090 + name "exec_logging" is created.
66091 + WARNING: This option when enabled will produce a LOT of logs, especially
66092 + on an active system.
66093 +
66094 +config GRKERNSEC_RESLOG
66095 + bool "Resource logging"
66096 + default y if GRKERNSEC_CONFIG_AUTO
66097 + help
66098 + If you say Y here, all attempts to overstep resource limits will
66099 + be logged with the resource name, the requested size, and the current
66100 + limit. It is highly recommended that you say Y here. If the sysctl
66101 + option is enabled, a sysctl option with name "resource_logging" is
66102 + created. If the RBAC system is enabled, the sysctl value is ignored.
66103 +
66104 +config GRKERNSEC_CHROOT_EXECLOG
66105 + bool "Log execs within chroot"
66106 + help
66107 + If you say Y here, all executions inside a chroot jail will be logged
66108 + to syslog. This can cause a large amount of logs if certain
66109 + applications (eg. djb's daemontools) are installed on the system, and
66110 + is therefore left as an option. If the sysctl option is enabled, a
66111 + sysctl option with name "chroot_execlog" is created.
66112 +
66113 +config GRKERNSEC_AUDIT_PTRACE
66114 + bool "Ptrace logging"
66115 + help
66116 + If you say Y here, all attempts to attach to a process via ptrace
66117 + will be logged. If the sysctl option is enabled, a sysctl option
66118 + with name "audit_ptrace" is created.
66119 +
66120 +config GRKERNSEC_AUDIT_CHDIR
66121 + bool "Chdir logging"
66122 + help
66123 + If you say Y here, all chdir() calls will be logged. If the sysctl
66124 + option is enabled, a sysctl option with name "audit_chdir" is created.
66125 +
66126 +config GRKERNSEC_AUDIT_MOUNT
66127 + bool "(Un)Mount logging"
66128 + help
66129 + If you say Y here, all mounts and unmounts will be logged. If the
66130 + sysctl option is enabled, a sysctl option with name "audit_mount" is
66131 + created.
66132 +
66133 +config GRKERNSEC_SIGNAL
66134 + bool "Signal logging"
66135 + default y if GRKERNSEC_CONFIG_AUTO
66136 + help
66137 + If you say Y here, certain important signals will be logged, such as
66138 + SIGSEGV, which will as a result inform you of when a error in a program
66139 + occurred, which in some cases could mean a possible exploit attempt.
66140 + If the sysctl option is enabled, a sysctl option with name
66141 + "signal_logging" is created.
66142 +
66143 +config GRKERNSEC_FORKFAIL
66144 + bool "Fork failure logging"
66145 + help
66146 + If you say Y here, all failed fork() attempts will be logged.
66147 + This could suggest a fork bomb, or someone attempting to overstep
66148 + their process limit. If the sysctl option is enabled, a sysctl option
66149 + with name "forkfail_logging" is created.
66150 +
66151 +config GRKERNSEC_TIME
66152 + bool "Time change logging"
66153 + default y if GRKERNSEC_CONFIG_AUTO
66154 + help
66155 + If you say Y here, any changes of the system clock will be logged.
66156 + If the sysctl option is enabled, a sysctl option with name
66157 + "timechange_logging" is created.
66158 +
66159 +config GRKERNSEC_PROC_IPADDR
66160 + bool "/proc/<pid>/ipaddr support"
66161 + default y if GRKERNSEC_CONFIG_AUTO
66162 + help
66163 + If you say Y here, a new entry will be added to each /proc/<pid>
66164 + directory that contains the IP address of the person using the task.
66165 + The IP is carried across local TCP and AF_UNIX stream sockets.
66166 + This information can be useful for IDS/IPSes to perform remote response
66167 + to a local attack. The entry is readable by only the owner of the
66168 + process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
66169 + the RBAC system), and thus does not create privacy concerns.
66170 +
66171 +config GRKERNSEC_RWXMAP_LOG
66172 + bool 'Denied RWX mmap/mprotect logging'
66173 + default y if GRKERNSEC_CONFIG_AUTO
66174 + depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
66175 + help
66176 + If you say Y here, calls to mmap() and mprotect() with explicit
66177 + usage of PROT_WRITE and PROT_EXEC together will be logged when
66178 + denied by the PAX_MPROTECT feature. This feature will also
66179 + log other problematic scenarios that can occur when PAX_MPROTECT
66180 + is enabled on a binary, like textrels and PT_GNU_STACK. If the
66181 + sysctl option is enabled, a sysctl option with name "rwxmap_logging"
66182 + is created.
66183 +
66184 +endmenu
66185 +
66186 +menu "Executable Protections"
66187 +depends on GRKERNSEC
66188 +
66189 +config GRKERNSEC_DMESG
66190 + bool "Dmesg(8) restriction"
66191 + default y if GRKERNSEC_CONFIG_AUTO
66192 + help
66193 + If you say Y here, non-root users will not be able to use dmesg(8)
66194 + to view the contents of the kernel's circular log buffer.
66195 + The kernel's log buffer often contains kernel addresses and other
66196 + identifying information useful to an attacker in fingerprinting a
66197 + system for a targeted exploit.
66198 + If the sysctl option is enabled, a sysctl option with name "dmesg" is
66199 + created.
66200 +
66201 +config GRKERNSEC_HARDEN_PTRACE
66202 + bool "Deter ptrace-based process snooping"
66203 + default y if GRKERNSEC_CONFIG_AUTO
66204 + help
66205 + If you say Y here, TTY sniffers and other malicious monitoring
66206 + programs implemented through ptrace will be defeated. If you
66207 + have been using the RBAC system, this option has already been
66208 + enabled for several years for all users, with the ability to make
66209 + fine-grained exceptions.
66210 +
66211 + This option only affects the ability of non-root users to ptrace
66212 + processes that are not a descendent of the ptracing process.
66213 + This means that strace ./binary and gdb ./binary will still work,
66214 + but attaching to arbitrary processes will not. If the sysctl
66215 + option is enabled, a sysctl option with name "harden_ptrace" is
66216 + created.
66217 +
66218 +config GRKERNSEC_PTRACE_READEXEC
66219 + bool "Require read access to ptrace sensitive binaries"
66220 + default y if GRKERNSEC_CONFIG_AUTO
66221 + help
66222 + If you say Y here, unprivileged users will not be able to ptrace unreadable
66223 + binaries. This option is useful in environments that
66224 + remove the read bits (e.g. file mode 4711) from suid binaries to
66225 + prevent infoleaking of their contents. This option adds
66226 + consistency to the use of that file mode, as the binary could normally
66227 + be read out when run without privileges while ptracing.
66228 +
66229 + If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
66230 + is created.
66231 +
66232 +config GRKERNSEC_SETXID
66233 + bool "Enforce consistent multithreaded privileges"
66234 + default y if GRKERNSEC_CONFIG_AUTO
66235 + depends on (X86 || SPARC64 || PPC || ARM || MIPS)
66236 + help
66237 + If you say Y here, a change from a root uid to a non-root uid
66238 + in a multithreaded application will cause the resulting uids,
66239 + gids, supplementary groups, and capabilities in that thread
66240 + to be propagated to the other threads of the process. In most
66241 + cases this is unnecessary, as glibc will emulate this behavior
66242 + on behalf of the application. Other libcs do not act in the
66243 + same way, allowing the other threads of the process to continue
66244 + running with root privileges. If the sysctl option is enabled,
66245 + a sysctl option with name "consistent_setxid" is created.
66246 +
66247 +config GRKERNSEC_HARDEN_IPC
66248 + bool "Disallow access to overly-permissive IPC objects"
66249 + default y if GRKERNSEC_CONFIG_AUTO
66250 + depends on SYSVIPC
66251 + help
66252 + If you say Y here, access to overly-permissive IPC objects (shared
66253 + memory, message queues, and semaphores) will be denied for processes
66254 + given the following criteria beyond normal permission checks:
66255 + 1) If the IPC object is world-accessible and the euid doesn't match
66256 + that of the creator or current uid for the IPC object
66257 + 2) If the IPC object is group-accessible and the egid doesn't
66258 + match that of the creator or current gid for the IPC object
66259 + It's a common error to grant too much permission to these objects,
66260 + with impact ranging from denial of service and information leaking to
66261 + privilege escalation. This feature was developed in response to
66262 + research by Tim Brown:
66263 + http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
66264 + who found hundreds of such insecure usages. Processes with
66265 + CAP_IPC_OWNER are still permitted to access these IPC objects.
66266 + If the sysctl option is enabled, a sysctl option with name
66267 + "harden_ipc" is created.
66268 +
66269 +config GRKERNSEC_TPE
66270 + bool "Trusted Path Execution (TPE)"
66271 + default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
66272 + help
66273 + If you say Y here, you will be able to choose a gid to add to the
66274 + supplementary groups of users you want to mark as "untrusted."
66275 + These users will not be able to execute any files that are not in
66276 + root-owned directories writable only by root. If the sysctl option
66277 + is enabled, a sysctl option with name "tpe" is created.
66278 +
66279 +config GRKERNSEC_TPE_ALL
66280 + bool "Partially restrict all non-root users"
66281 + depends on GRKERNSEC_TPE
66282 + help
66283 + If you say Y here, all non-root users will be covered under
66284 + a weaker TPE restriction. This is separate from, and in addition to,
66285 + the main TPE options that you have selected elsewhere. Thus, if a
66286 + "trusted" GID is chosen, this restriction applies to even that GID.
66287 + Under this restriction, all non-root users will only be allowed to
66288 + execute files in directories they own that are not group or
66289 + world-writable, or in directories owned by root and writable only by
66290 + root. If the sysctl option is enabled, a sysctl option with name
66291 + "tpe_restrict_all" is created.
66292 +
66293 +config GRKERNSEC_TPE_INVERT
66294 + bool "Invert GID option"
66295 + depends on GRKERNSEC_TPE
66296 + help
66297 + If you say Y here, the group you specify in the TPE configuration will
66298 + decide what group TPE restrictions will be *disabled* for. This
66299 + option is useful if you want TPE restrictions to be applied to most
66300 + users on the system. If the sysctl option is enabled, a sysctl option
66301 + with name "tpe_invert" is created. Unlike other sysctl options, this
66302 + entry will default to on for backward-compatibility.
66303 +
66304 +config GRKERNSEC_TPE_GID
66305 + int
66306 + default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
66307 + default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
66308 +
66309 +config GRKERNSEC_TPE_UNTRUSTED_GID
66310 + int "GID for TPE-untrusted users"
66311 + depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
66312 + default 1005
66313 + help
66314 + Setting this GID determines what group TPE restrictions will be
66315 + *enabled* for. If the sysctl option is enabled, a sysctl option
66316 + with name "tpe_gid" is created.
66317 +
66318 +config GRKERNSEC_TPE_TRUSTED_GID
66319 + int "GID for TPE-trusted users"
66320 + depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
66321 + default 1005
66322 + help
66323 + Setting this GID determines what group TPE restrictions will be
66324 + *disabled* for. If the sysctl option is enabled, a sysctl option
66325 + with name "tpe_gid" is created.
66326 +
66327 +endmenu
66328 +menu "Network Protections"
66329 +depends on GRKERNSEC
66330 +
66331 +config GRKERNSEC_RANDNET
66332 + bool "Larger entropy pools"
66333 + default y if GRKERNSEC_CONFIG_AUTO
66334 + help
66335 + If you say Y here, the entropy pools used for many features of Linux
66336 + and grsecurity will be doubled in size. Since several grsecurity
66337 + features use additional randomness, it is recommended that you say Y
66338 + here. Saying Y here has a similar effect as modifying
66339 + /proc/sys/kernel/random/poolsize.
66340 +
66341 +config GRKERNSEC_BLACKHOLE
66342 + bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
66343 + default y if GRKERNSEC_CONFIG_AUTO
66344 + depends on NET
66345 + help
66346 + If you say Y here, neither TCP resets nor ICMP
66347 + destination-unreachable packets will be sent in response to packets
66348 + sent to ports for which no associated listening process exists.
66349 + This feature supports both IPV4 and IPV6 and exempts the
66350 + loopback interface from blackholing. Enabling this feature
66351 + makes a host more resilient to DoS attacks and reduces network
66352 + visibility against scanners.
66353 +
66354 + The blackhole feature as-implemented is equivalent to the FreeBSD
66355 + blackhole feature, as it prevents RST responses to all packets, not
66356 + just SYNs. Under most application behavior this causes no
66357 + problems, but applications (like haproxy) may not close certain
66358 + connections in a way that cleanly terminates them on the remote
66359 + end, leaving the remote host in LAST_ACK state. Because of this
66360 + side-effect and to prevent intentional LAST_ACK DoSes, this
66361 + feature also adds automatic mitigation against such attacks.
66362 + The mitigation drastically reduces the amount of time a socket
66363 + can spend in LAST_ACK state. If you're using haproxy and not
66364 + all servers it connects to have this option enabled, consider
66365 + disabling this feature on the haproxy host.
66366 +
66367 + If the sysctl option is enabled, two sysctl options with names
66368 + "ip_blackhole" and "lastack_retries" will be created.
66369 + While "ip_blackhole" takes the standard zero/non-zero on/off
66370 + toggle, "lastack_retries" uses the same kinds of values as
66371 + "tcp_retries1" and "tcp_retries2". The default value of 4
66372 + prevents a socket from lasting more than 45 seconds in LAST_ACK
66373 + state.
66374 +
66375 +config GRKERNSEC_NO_SIMULT_CONNECT
66376 + bool "Disable TCP Simultaneous Connect"
66377 + default y if GRKERNSEC_CONFIG_AUTO
66378 + depends on NET
66379 + help
66380 + If you say Y here, a feature by Willy Tarreau will be enabled that
66381 + removes a weakness in Linux's strict implementation of TCP that
66382 + allows two clients to connect to each other without either entering
66383 + a listening state. The weakness allows an attacker to easily prevent
66384 + a client from connecting to a known server provided the source port
66385 + for the connection is guessed correctly.
66386 +
66387 + As the weakness could be used to prevent an antivirus or IPS from
66388 + fetching updates, or prevent an SSL gateway from fetching a CRL,
66389 + it should be eliminated by enabling this option. Though Linux is
66390 + one of few operating systems supporting simultaneous connect, it
66391 + has no legitimate use in practice and is rarely supported by firewalls.
66392 +
66393 +config GRKERNSEC_SOCKET
66394 + bool "Socket restrictions"
66395 + depends on NET
66396 + help
66397 + If you say Y here, you will be able to choose from several options.
66398 + If you assign a GID on your system and add it to the supplementary
66399 + groups of users you want to restrict socket access to, this patch
66400 + will perform up to three things, based on the option(s) you choose.
66401 +
66402 +config GRKERNSEC_SOCKET_ALL
66403 + bool "Deny any sockets to group"
66404 + depends on GRKERNSEC_SOCKET
66405 + help
66406 + If you say Y here, you will be able to choose a GID of whose users will
66407 + be unable to connect to other hosts from your machine or run server
66408 + applications from your machine. If the sysctl option is enabled, a
66409 + sysctl option with name "socket_all" is created.
66410 +
66411 +config GRKERNSEC_SOCKET_ALL_GID
66412 + int "GID to deny all sockets for"
66413 + depends on GRKERNSEC_SOCKET_ALL
66414 + default 1004
66415 + help
66416 + Here you can choose the GID to disable socket access for. Remember to
66417 + add the users you want socket access disabled for to the GID
66418 + specified here. If the sysctl option is enabled, a sysctl option
66419 + with name "socket_all_gid" is created.
66420 +
66421 +config GRKERNSEC_SOCKET_CLIENT
66422 + bool "Deny client sockets to group"
66423 + depends on GRKERNSEC_SOCKET
66424 + help
66425 + If you say Y here, you will be able to choose a GID of whose users will
66426 + be unable to connect to other hosts from your machine, but will be
66427 + able to run servers. If this option is enabled, all users in the group
66428 + you specify will have to use passive mode when initiating ftp transfers
66429 + from the shell on your machine. If the sysctl option is enabled, a
66430 + sysctl option with name "socket_client" is created.
66431 +
66432 +config GRKERNSEC_SOCKET_CLIENT_GID
66433 + int "GID to deny client sockets for"
66434 + depends on GRKERNSEC_SOCKET_CLIENT
66435 + default 1003
66436 + help
66437 + Here you can choose the GID to disable client socket access for.
66438 + Remember to add the users you want client socket access disabled for to
66439 + the GID specified here. If the sysctl option is enabled, a sysctl
66440 + option with name "socket_client_gid" is created.
66441 +
66442 +config GRKERNSEC_SOCKET_SERVER
66443 + bool "Deny server sockets to group"
66444 + depends on GRKERNSEC_SOCKET
66445 + help
66446 + If you say Y here, you will be able to choose a GID of whose users will
66447 + be unable to run server applications from your machine. If the sysctl
66448 + option is enabled, a sysctl option with name "socket_server" is created.
66449 +
66450 +config GRKERNSEC_SOCKET_SERVER_GID
66451 + int "GID to deny server sockets for"
66452 + depends on GRKERNSEC_SOCKET_SERVER
66453 + default 1002
66454 + help
66455 + Here you can choose the GID to disable server socket access for.
66456 + Remember to add the users you want server socket access disabled for to
66457 + the GID specified here. If the sysctl option is enabled, a sysctl
66458 + option with name "socket_server_gid" is created.
66459 +
66460 +endmenu
66461 +
66462 +menu "Physical Protections"
66463 +depends on GRKERNSEC
66464 +
66465 +config GRKERNSEC_DENYUSB
66466 + bool "Deny new USB connections after toggle"
66467 + default y if GRKERNSEC_CONFIG_AUTO
66468 + depends on SYSCTL && USB_SUPPORT
66469 + help
66470 + If you say Y here, a new sysctl option with name "deny_new_usb"
66471 + will be created. Setting its value to 1 will prevent any new
66472 + USB devices from being recognized by the OS. Any attempted USB
66473 + device insertion will be logged. This option is intended to be
66474 + used against custom USB devices designed to exploit vulnerabilities
66475 + in various USB device drivers.
66476 +
66477 + For greatest effectiveness, this sysctl should be set after any
66478 + relevant init scripts. This option is safe to enable in distros
66479 + as each user can choose whether or not to toggle the sysctl.
66480 +
66481 +config GRKERNSEC_DENYUSB_FORCE
66482 + bool "Reject all USB devices not connected at boot"
66483 + select USB
66484 + depends on GRKERNSEC_DENYUSB
66485 + help
66486 + If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
66487 + that doesn't involve a sysctl entry. This option should only be
66488 + enabled if you're sure you want to deny all new USB connections
66489 + at runtime and don't want to modify init scripts. This should not
66490 + be enabled by distros. It forces the core USB code to be built
66491 + into the kernel image so that all devices connected at boot time
66492 + can be recognized and new USB device connections can be prevented
66493 + prior to init running.
66494 +
66495 +endmenu
66496 +
66497 +menu "Sysctl Support"
66498 +depends on GRKERNSEC && SYSCTL
66499 +
66500 +config GRKERNSEC_SYSCTL
66501 + bool "Sysctl support"
66502 + default y if GRKERNSEC_CONFIG_AUTO
66503 + help
66504 + If you say Y here, you will be able to change the options that
66505 + grsecurity runs with at bootup, without having to recompile your
66506 + kernel. You can echo values to files in /proc/sys/kernel/grsecurity
66507 + to enable (1) or disable (0) various features. All the sysctl entries
66508 + are mutable until the "grsec_lock" entry is set to a non-zero value.
66509 + All features enabled in the kernel configuration are disabled at boot
66510 + if you do not say Y to the "Turn on features by default" option.
66511 + All options should be set at startup, and the grsec_lock entry should
66512 + be set to a non-zero value after all the options are set.
66513 + *THIS IS EXTREMELY IMPORTANT*
66514 +
66515 +config GRKERNSEC_SYSCTL_DISTRO
66516 + bool "Extra sysctl support for distro makers (READ HELP)"
66517 + depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
66518 + help
66519 + If you say Y here, additional sysctl options will be created
66520 + for features that affect processes running as root. Therefore,
66521 + it is critical when using this option that the grsec_lock entry be
66522 + enabled after boot. Only distros with prebuilt kernel packages
66523 + with this option enabled that can ensure grsec_lock is enabled
66524 + after boot should use this option.
66525 + *Failure to set grsec_lock after boot makes all grsec features
66526 + this option covers useless*
66527 +
66528 + Currently this option creates the following sysctl entries:
66529 + "Disable Privileged I/O": "disable_priv_io"
66530 +
66531 +config GRKERNSEC_SYSCTL_ON
66532 + bool "Turn on features by default"
66533 + default y if GRKERNSEC_CONFIG_AUTO
66534 + depends on GRKERNSEC_SYSCTL
66535 + help
66536 + If you say Y here, instead of having all features enabled in the
66537 + kernel configuration disabled at boot time, the features will be
66538 + enabled at boot time. It is recommended you say Y here unless
66539 + there is some reason you would want all sysctl-tunable features to
66540 + be disabled by default. As mentioned elsewhere, it is important
66541 + to enable the grsec_lock entry once you have finished modifying
66542 + the sysctl entries.
66543 +
66544 +endmenu
66545 +menu "Logging Options"
66546 +depends on GRKERNSEC
66547 +
66548 +config GRKERNSEC_FLOODTIME
66549 + int "Seconds in between log messages (minimum)"
66550 + default 10
66551 + help
66552 + This option allows you to enforce the number of seconds between
66553 + grsecurity log messages. The default should be suitable for most
66554 + people, however, if you choose to change it, choose a value small enough
66555 + to allow informative logs to be produced, but large enough to
66556 + prevent flooding.
66557 +
66558 + Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
66559 + any rate limiting on grsecurity log messages.
66560 +
66561 +config GRKERNSEC_FLOODBURST
66562 + int "Number of messages in a burst (maximum)"
66563 + default 6
66564 + help
66565 + This option allows you to choose the maximum number of messages allowed
66566 + within the flood time interval you chose in a separate option. The
66567 + default should be suitable for most people, however if you find that
66568 + many of your logs are being interpreted as flooding, you may want to
66569 + raise this value.
66570 +
66571 + Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
66572 + any rate limiting on grsecurity log messages.
66573 +
66574 +endmenu
66575 diff --git a/grsecurity/Makefile b/grsecurity/Makefile
66576 new file mode 100644
66577 index 0000000..30ababb
66578 --- /dev/null
66579 +++ b/grsecurity/Makefile
66580 @@ -0,0 +1,54 @@
66581 +# grsecurity – access control and security hardening for Linux
66582 +# All code in this directory and various hooks located throughout the Linux kernel are
66583 +# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
66584 +# http://www.grsecurity.net spender@grsecurity.net
66585 +#
66586 +# This program is free software; you can redistribute it and/or
66587 +# modify it under the terms of the GNU General Public License version 2
66588 +# as published by the Free Software Foundation.
66589 +#
66590 +# This program is distributed in the hope that it will be useful,
66591 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
66592 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
66593 +# GNU General Public License for more details.
66594 +#
66595 +# You should have received a copy of the GNU General Public License
66596 +# along with this program; if not, write to the Free Software
66597 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
66598 +
66599 +KBUILD_CFLAGS += -Werror
66600 +
66601 +obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
66602 + grsec_mount.o grsec_sig.o grsec_sysctl.o \
66603 + grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
66604 + grsec_usb.o grsec_ipc.o grsec_proc.o
66605 +
66606 +obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
66607 + gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
66608 + gracl_learn.o grsec_log.o gracl_policy.o
66609 +ifdef CONFIG_COMPAT
66610 +obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
66611 +endif
66612 +
66613 +obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
66614 +
66615 +ifdef CONFIG_NET
66616 +obj-y += grsec_sock.o
66617 +obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
66618 +endif
66619 +
66620 +ifndef CONFIG_GRKERNSEC
66621 +obj-y += grsec_disabled.o
66622 +endif
66623 +
66624 +ifdef CONFIG_GRKERNSEC_HIDESYM
66625 +extra-y := grsec_hidesym.o
66626 +$(obj)/grsec_hidesym.o:
66627 + @-chmod -f 500 /boot
66628 + @-chmod -f 500 /lib/modules
66629 + @-chmod -f 500 /lib64/modules
66630 + @-chmod -f 500 /lib32/modules
66631 + @-chmod -f 700 .
66632 + @-chmod -f 700 $(objtree)
66633 + @echo ' grsec: protected kernel image paths'
66634 +endif
66635 diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
66636 new file mode 100644
66637 index 0000000..e56396f
66638 --- /dev/null
66639 +++ b/grsecurity/gracl.c
66640 @@ -0,0 +1,2679 @@
66641 +#include <linux/kernel.h>
66642 +#include <linux/module.h>
66643 +#include <linux/sched.h>
66644 +#include <linux/mm.h>
66645 +#include <linux/file.h>
66646 +#include <linux/fs.h>
66647 +#include <linux/namei.h>
66648 +#include <linux/mount.h>
66649 +#include <linux/tty.h>
66650 +#include <linux/proc_fs.h>
66651 +#include <linux/lglock.h>
66652 +#include <linux/slab.h>
66653 +#include <linux/vmalloc.h>
66654 +#include <linux/types.h>
66655 +#include <linux/sysctl.h>
66656 +#include <linux/netdevice.h>
66657 +#include <linux/ptrace.h>
66658 +#include <linux/gracl.h>
66659 +#include <linux/gralloc.h>
66660 +#include <linux/security.h>
66661 +#include <linux/grinternal.h>
66662 +#include <linux/pid_namespace.h>
66663 +#include <linux/stop_machine.h>
66664 +#include <linux/fdtable.h>
66665 +#include <linux/percpu.h>
66666 +#include <linux/lglock.h>
66667 +#include <linux/hugetlb.h>
66668 +#include <linux/posix-timers.h>
66669 +#include <linux/prefetch.h>
66670 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
66671 +#include <linux/magic.h>
66672 +#include <linux/pagemap.h>
66673 +#include "../fs/btrfs/async-thread.h"
66674 +#include "../fs/btrfs/ctree.h"
66675 +#include "../fs/btrfs/btrfs_inode.h"
66676 +#endif
66677 +#include "../fs/mount.h"
66678 +
66679 +#include <asm/uaccess.h>
66680 +#include <asm/errno.h>
66681 +#include <asm/mman.h>
66682 +
66683 +#define FOR_EACH_ROLE_START(role) \
66684 + role = running_polstate.role_list; \
66685 + while (role) {
66686 +
66687 +#define FOR_EACH_ROLE_END(role) \
66688 + role = role->prev; \
66689 + }
66690 +
66691 +extern struct path gr_real_root;
66692 +
66693 +static struct gr_policy_state running_polstate;
66694 +struct gr_policy_state *polstate = &running_polstate;
66695 +extern struct gr_alloc_state *current_alloc_state;
66696 +
66697 +extern char *gr_shared_page[4];
66698 +DEFINE_RWLOCK(gr_inode_lock);
66699 +
66700 +static unsigned int gr_status __read_only = GR_STATUS_INIT;
66701 +
66702 +#ifdef CONFIG_NET
66703 +extern struct vfsmount *sock_mnt;
66704 +#endif
66705 +
66706 +extern struct vfsmount *pipe_mnt;
66707 +extern struct vfsmount *shm_mnt;
66708 +
66709 +#ifdef CONFIG_HUGETLBFS
66710 +extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
66711 +#endif
66712 +
66713 +extern u16 acl_sp_role_value;
66714 +extern struct acl_object_label *fakefs_obj_rw;
66715 +extern struct acl_object_label *fakefs_obj_rwx;
66716 +
66717 +int gr_acl_is_enabled(void)
66718 +{
66719 + return (gr_status & GR_READY);
66720 +}
66721 +
66722 +void gr_enable_rbac_system(void)
66723 +{
66724 + pax_open_kernel();
66725 + gr_status |= GR_READY;
66726 + pax_close_kernel();
66727 +}
66728 +
66729 +int gr_rbac_disable(void *unused)
66730 +{
66731 + pax_open_kernel();
66732 + gr_status &= ~GR_READY;
66733 + pax_close_kernel();
66734 +
66735 + return 0;
66736 +}
66737 +
66738 +static inline dev_t __get_dev(const struct dentry *dentry)
66739 +{
66740 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
66741 + if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
66742 + return BTRFS_I(dentry->d_inode)->root->anon_dev;
66743 + else
66744 +#endif
66745 + return dentry->d_sb->s_dev;
66746 +}
66747 +
66748 +dev_t gr_get_dev_from_dentry(struct dentry *dentry)
66749 +{
66750 + return __get_dev(dentry);
66751 +}
66752 +
66753 +static char gr_task_roletype_to_char(struct task_struct *task)
66754 +{
66755 + switch (task->role->roletype &
66756 + (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
66757 + GR_ROLE_SPECIAL)) {
66758 + case GR_ROLE_DEFAULT:
66759 + return 'D';
66760 + case GR_ROLE_USER:
66761 + return 'U';
66762 + case GR_ROLE_GROUP:
66763 + return 'G';
66764 + case GR_ROLE_SPECIAL:
66765 + return 'S';
66766 + }
66767 +
66768 + return 'X';
66769 +}
66770 +
66771 +char gr_roletype_to_char(void)
66772 +{
66773 + return gr_task_roletype_to_char(current);
66774 +}
66775 +
66776 +__inline__ int
66777 +gr_acl_tpe_check(void)
66778 +{
66779 + if (unlikely(!(gr_status & GR_READY)))
66780 + return 0;
66781 + if (current->role->roletype & GR_ROLE_TPE)
66782 + return 1;
66783 + else
66784 + return 0;
66785 +}
66786 +
66787 +int
66788 +gr_handle_rawio(const struct inode *inode)
66789 +{
66790 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
66791 + if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
66792 + grsec_enable_chroot_caps && proc_is_chrooted(current) &&
66793 + !capable(CAP_SYS_RAWIO))
66794 + return 1;
66795 +#endif
66796 + return 0;
66797 +}
66798 +
66799 +int
66800 +gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
66801 +{
66802 + if (likely(lena != lenb))
66803 + return 0;
66804 +
66805 + return !memcmp(a, b, lena);
66806 +}
66807 +
66808 +static int prepend(char **buffer, int *buflen, const char *str, int namelen)
66809 +{
66810 + *buflen -= namelen;
66811 + if (*buflen < 0)
66812 + return -ENAMETOOLONG;
66813 + *buffer -= namelen;
66814 + memcpy(*buffer, str, namelen);
66815 + return 0;
66816 +}
66817 +
66818 +static int prepend_name(char **buffer, int *buflen, struct qstr *name)
66819 +{
66820 + return prepend(buffer, buflen, name->name, name->len);
66821 +}
66822 +
66823 +static int prepend_path(const struct path *path, struct path *root,
66824 + char **buffer, int *buflen)
66825 +{
66826 + struct dentry *dentry = path->dentry;
66827 + struct vfsmount *vfsmnt = path->mnt;
66828 + struct mount *mnt = real_mount(vfsmnt);
66829 + bool slash = false;
66830 + int error = 0;
66831 +
66832 + while (dentry != root->dentry || vfsmnt != root->mnt) {
66833 + struct dentry * parent;
66834 +
66835 + if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
66836 + /* Global root? */
66837 + if (!mnt_has_parent(mnt)) {
66838 + goto out;
66839 + }
66840 + dentry = mnt->mnt_mountpoint;
66841 + mnt = mnt->mnt_parent;
66842 + vfsmnt = &mnt->mnt;
66843 + continue;
66844 + }
66845 + parent = dentry->d_parent;
66846 + prefetch(parent);
66847 + spin_lock(&dentry->d_lock);
66848 + error = prepend_name(buffer, buflen, &dentry->d_name);
66849 + spin_unlock(&dentry->d_lock);
66850 + if (!error)
66851 + error = prepend(buffer, buflen, "/", 1);
66852 + if (error)
66853 + break;
66854 +
66855 + slash = true;
66856 + dentry = parent;
66857 + }
66858 +
66859 +out:
66860 + if (!error && !slash)
66861 + error = prepend(buffer, buflen, "/", 1);
66862 +
66863 + return error;
66864 +}
66865 +
66866 +/* this must be called with mount_lock and rename_lock held */
66867 +
66868 +static char *__our_d_path(const struct path *path, struct path *root,
66869 + char *buf, int buflen)
66870 +{
66871 + char *res = buf + buflen;
66872 + int error;
66873 +
66874 + prepend(&res, &buflen, "\0", 1);
66875 + error = prepend_path(path, root, &res, &buflen);
66876 + if (error)
66877 + return ERR_PTR(error);
66878 +
66879 + return res;
66880 +}
66881 +
66882 +static char *
66883 +gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
66884 +{
66885 + char *retval;
66886 +
66887 + retval = __our_d_path(path, root, buf, buflen);
66888 + if (unlikely(IS_ERR(retval)))
66889 + retval = strcpy(buf, "<path too long>");
66890 + else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
66891 + retval[1] = '\0';
66892 +
66893 + return retval;
66894 +}
66895 +
66896 +static char *
66897 +__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
66898 + char *buf, int buflen)
66899 +{
66900 + struct path path;
66901 + char *res;
66902 +
66903 + path.dentry = (struct dentry *)dentry;
66904 + path.mnt = (struct vfsmount *)vfsmnt;
66905 +
66906 + /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
66907 + by the RBAC system */
66908 + res = gen_full_path(&path, &gr_real_root, buf, buflen);
66909 +
66910 + return res;
66911 +}
66912 +
66913 +static char *
66914 +d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
66915 + char *buf, int buflen)
66916 +{
66917 + char *res;
66918 + struct path path;
66919 + struct path root;
66920 + struct task_struct *reaper = init_pid_ns.child_reaper;
66921 +
66922 + path.dentry = (struct dentry *)dentry;
66923 + path.mnt = (struct vfsmount *)vfsmnt;
66924 +
66925 + /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
66926 + get_fs_root(reaper->fs, &root);
66927 +
66928 + read_seqlock_excl(&mount_lock);
66929 + write_seqlock(&rename_lock);
66930 + res = gen_full_path(&path, &root, buf, buflen);
66931 + write_sequnlock(&rename_lock);
66932 + read_sequnlock_excl(&mount_lock);
66933 +
66934 + path_put(&root);
66935 + return res;
66936 +}
66937 +
66938 +char *
66939 +gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
66940 +{
66941 + char *ret;
66942 + read_seqlock_excl(&mount_lock);
66943 + write_seqlock(&rename_lock);
66944 + ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
66945 + PAGE_SIZE);
66946 + write_sequnlock(&rename_lock);
66947 + read_sequnlock_excl(&mount_lock);
66948 + return ret;
66949 +}
66950 +
66951 +static char *
66952 +gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
66953 +{
66954 + char *ret;
66955 + char *buf;
66956 + int buflen;
66957 +
66958 + read_seqlock_excl(&mount_lock);
66959 + write_seqlock(&rename_lock);
66960 + buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
66961 + ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
66962 + buflen = (int)(ret - buf);
66963 + if (buflen >= 5)
66964 + prepend(&ret, &buflen, "/proc", 5);
66965 + else
66966 + ret = strcpy(buf, "<path too long>");
66967 + write_sequnlock(&rename_lock);
66968 + read_sequnlock_excl(&mount_lock);
66969 + return ret;
66970 +}
66971 +
66972 +char *
66973 +gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
66974 +{
66975 + return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
66976 + PAGE_SIZE);
66977 +}
66978 +
66979 +char *
66980 +gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
66981 +{
66982 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
66983 + PAGE_SIZE);
66984 +}
66985 +
66986 +char *
66987 +gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
66988 +{
66989 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
66990 + PAGE_SIZE);
66991 +}
66992 +
66993 +char *
66994 +gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
66995 +{
66996 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
66997 + PAGE_SIZE);
66998 +}
66999 +
67000 +char *
67001 +gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
67002 +{
67003 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
67004 + PAGE_SIZE);
67005 +}
67006 +
67007 +__inline__ __u32
67008 +to_gr_audit(const __u32 reqmode)
67009 +{
67010 + /* masks off auditable permission flags, then shifts them to create
67011 + auditing flags, and adds the special case of append auditing if
67012 + we're requesting write */
67013 + return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
67014 +}
67015 +
67016 +struct acl_role_label *
67017 +__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
67018 + const gid_t gid)
67019 +{
67020 + unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
67021 + struct acl_role_label *match;
67022 + struct role_allowed_ip *ipp;
67023 + unsigned int x;
67024 + u32 curr_ip = task->signal->saved_ip;
67025 +
67026 + match = state->acl_role_set.r_hash[index];
67027 +
67028 + while (match) {
67029 + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
67030 + for (x = 0; x < match->domain_child_num; x++) {
67031 + if (match->domain_children[x] == uid)
67032 + goto found;
67033 + }
67034 + } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
67035 + break;
67036 + match = match->next;
67037 + }
67038 +found:
67039 + if (match == NULL) {
67040 + try_group:
67041 + index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
67042 + match = state->acl_role_set.r_hash[index];
67043 +
67044 + while (match) {
67045 + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
67046 + for (x = 0; x < match->domain_child_num; x++) {
67047 + if (match->domain_children[x] == gid)
67048 + goto found2;
67049 + }
67050 + } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
67051 + break;
67052 + match = match->next;
67053 + }
67054 +found2:
67055 + if (match == NULL)
67056 + match = state->default_role;
67057 + if (match->allowed_ips == NULL)
67058 + return match;
67059 + else {
67060 + for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
67061 + if (likely
67062 + ((ntohl(curr_ip) & ipp->netmask) ==
67063 + (ntohl(ipp->addr) & ipp->netmask)))
67064 + return match;
67065 + }
67066 + match = state->default_role;
67067 + }
67068 + } else if (match->allowed_ips == NULL) {
67069 + return match;
67070 + } else {
67071 + for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
67072 + if (likely
67073 + ((ntohl(curr_ip) & ipp->netmask) ==
67074 + (ntohl(ipp->addr) & ipp->netmask)))
67075 + return match;
67076 + }
67077 + goto try_group;
67078 + }
67079 +
67080 + return match;
67081 +}
67082 +
67083 +static struct acl_role_label *
67084 +lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
67085 + const gid_t gid)
67086 +{
67087 + return __lookup_acl_role_label(&running_polstate, task, uid, gid);
67088 +}
67089 +
67090 +struct acl_subject_label *
67091 +lookup_acl_subj_label(const ino_t ino, const dev_t dev,
67092 + const struct acl_role_label *role)
67093 +{
67094 + unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
67095 + struct acl_subject_label *match;
67096 +
67097 + match = role->subj_hash[index];
67098 +
67099 + while (match && (match->inode != ino || match->device != dev ||
67100 + (match->mode & GR_DELETED))) {
67101 + match = match->next;
67102 + }
67103 +
67104 + if (match && !(match->mode & GR_DELETED))
67105 + return match;
67106 + else
67107 + return NULL;
67108 +}
67109 +
67110 +struct acl_subject_label *
67111 +lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
67112 + const struct acl_role_label *role)
67113 +{
67114 + unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
67115 + struct acl_subject_label *match;
67116 +
67117 + match = role->subj_hash[index];
67118 +
67119 + while (match && (match->inode != ino || match->device != dev ||
67120 + !(match->mode & GR_DELETED))) {
67121 + match = match->next;
67122 + }
67123 +
67124 + if (match && (match->mode & GR_DELETED))
67125 + return match;
67126 + else
67127 + return NULL;
67128 +}
67129 +
67130 +static struct acl_object_label *
67131 +lookup_acl_obj_label(const ino_t ino, const dev_t dev,
67132 + const struct acl_subject_label *subj)
67133 +{
67134 + unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
67135 + struct acl_object_label *match;
67136 +
67137 + match = subj->obj_hash[index];
67138 +
67139 + while (match && (match->inode != ino || match->device != dev ||
67140 + (match->mode & GR_DELETED))) {
67141 + match = match->next;
67142 + }
67143 +
67144 + if (match && !(match->mode & GR_DELETED))
67145 + return match;
67146 + else
67147 + return NULL;
67148 +}
67149 +
67150 +static struct acl_object_label *
67151 +lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
67152 + const struct acl_subject_label *subj)
67153 +{
67154 + unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
67155 + struct acl_object_label *match;
67156 +
67157 + match = subj->obj_hash[index];
67158 +
67159 + while (match && (match->inode != ino || match->device != dev ||
67160 + !(match->mode & GR_DELETED))) {
67161 + match = match->next;
67162 + }
67163 +
67164 + if (match && (match->mode & GR_DELETED))
67165 + return match;
67166 +
67167 + match = subj->obj_hash[index];
67168 +
67169 + while (match && (match->inode != ino || match->device != dev ||
67170 + (match->mode & GR_DELETED))) {
67171 + match = match->next;
67172 + }
67173 +
67174 + if (match && !(match->mode & GR_DELETED))
67175 + return match;
67176 + else
67177 + return NULL;
67178 +}
67179 +
67180 +struct name_entry *
67181 +__lookup_name_entry(const struct gr_policy_state *state, const char *name)
67182 +{
67183 + unsigned int len = strlen(name);
67184 + unsigned int key = full_name_hash(name, len);
67185 + unsigned int index = key % state->name_set.n_size;
67186 + struct name_entry *match;
67187 +
67188 + match = state->name_set.n_hash[index];
67189 +
67190 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
67191 + match = match->next;
67192 +
67193 + return match;
67194 +}
67195 +
67196 +static struct name_entry *
67197 +lookup_name_entry(const char *name)
67198 +{
67199 + return __lookup_name_entry(&running_polstate, name);
67200 +}
67201 +
67202 +static struct name_entry *
67203 +lookup_name_entry_create(const char *name)
67204 +{
67205 + unsigned int len = strlen(name);
67206 + unsigned int key = full_name_hash(name, len);
67207 + unsigned int index = key % running_polstate.name_set.n_size;
67208 + struct name_entry *match;
67209 +
67210 + match = running_polstate.name_set.n_hash[index];
67211 +
67212 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
67213 + !match->deleted))
67214 + match = match->next;
67215 +
67216 + if (match && match->deleted)
67217 + return match;
67218 +
67219 + match = running_polstate.name_set.n_hash[index];
67220 +
67221 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
67222 + match->deleted))
67223 + match = match->next;
67224 +
67225 + if (match && !match->deleted)
67226 + return match;
67227 + else
67228 + return NULL;
67229 +}
67230 +
67231 +static struct inodev_entry *
67232 +lookup_inodev_entry(const ino_t ino, const dev_t dev)
67233 +{
67234 + unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
67235 + struct inodev_entry *match;
67236 +
67237 + match = running_polstate.inodev_set.i_hash[index];
67238 +
67239 + while (match && (match->nentry->inode != ino || match->nentry->device != dev))
67240 + match = match->next;
67241 +
67242 + return match;
67243 +}
67244 +
67245 +void
67246 +__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
67247 +{
67248 + unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
67249 + state->inodev_set.i_size);
67250 + struct inodev_entry **curr;
67251 +
67252 + entry->prev = NULL;
67253 +
67254 + curr = &state->inodev_set.i_hash[index];
67255 + if (*curr != NULL)
67256 + (*curr)->prev = entry;
67257 +
67258 + entry->next = *curr;
67259 + *curr = entry;
67260 +
67261 + return;
67262 +}
67263 +
67264 +static void
67265 +insert_inodev_entry(struct inodev_entry *entry)
67266 +{
67267 + __insert_inodev_entry(&running_polstate, entry);
67268 +}
67269 +
67270 +void
67271 +insert_acl_obj_label(struct acl_object_label *obj,
67272 + struct acl_subject_label *subj)
67273 +{
67274 + unsigned int index =
67275 + gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
67276 + struct acl_object_label **curr;
67277 +
67278 + obj->prev = NULL;
67279 +
67280 + curr = &subj->obj_hash[index];
67281 + if (*curr != NULL)
67282 + (*curr)->prev = obj;
67283 +
67284 + obj->next = *curr;
67285 + *curr = obj;
67286 +
67287 + return;
67288 +}
67289 +
67290 +void
67291 +insert_acl_subj_label(struct acl_subject_label *obj,
67292 + struct acl_role_label *role)
67293 +{
67294 + unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
67295 + struct acl_subject_label **curr;
67296 +
67297 + obj->prev = NULL;
67298 +
67299 + curr = &role->subj_hash[index];
67300 + if (*curr != NULL)
67301 + (*curr)->prev = obj;
67302 +
67303 + obj->next = *curr;
67304 + *curr = obj;
67305 +
67306 + return;
67307 +}
67308 +
67309 +/* derived from glibc fnmatch() 0: match, 1: no match*/
67310 +
67311 +static int
67312 +glob_match(const char *p, const char *n)
67313 +{
67314 + char c;
67315 +
67316 + while ((c = *p++) != '\0') {
67317 + switch (c) {
67318 + case '?':
67319 + if (*n == '\0')
67320 + return 1;
67321 + else if (*n == '/')
67322 + return 1;
67323 + break;
67324 + case '\\':
67325 + if (*n != c)
67326 + return 1;
67327 + break;
67328 + case '*':
67329 + for (c = *p++; c == '?' || c == '*'; c = *p++) {
67330 + if (*n == '/')
67331 + return 1;
67332 + else if (c == '?') {
67333 + if (*n == '\0')
67334 + return 1;
67335 + else
67336 + ++n;
67337 + }
67338 + }
67339 + if (c == '\0') {
67340 + return 0;
67341 + } else {
67342 + const char *endp;
67343 +
67344 + if ((endp = strchr(n, '/')) == NULL)
67345 + endp = n + strlen(n);
67346 +
67347 + if (c == '[') {
67348 + for (--p; n < endp; ++n)
67349 + if (!glob_match(p, n))
67350 + return 0;
67351 + } else if (c == '/') {
67352 + while (*n != '\0' && *n != '/')
67353 + ++n;
67354 + if (*n == '/' && !glob_match(p, n + 1))
67355 + return 0;
67356 + } else {
67357 + for (--p; n < endp; ++n)
67358 + if (*n == c && !glob_match(p, n))
67359 + return 0;
67360 + }
67361 +
67362 + return 1;
67363 + }
67364 + case '[':
67365 + {
67366 + int not;
67367 + char cold;
67368 +
67369 + if (*n == '\0' || *n == '/')
67370 + return 1;
67371 +
67372 + not = (*p == '!' || *p == '^');
67373 + if (not)
67374 + ++p;
67375 +
67376 + c = *p++;
67377 + for (;;) {
67378 + unsigned char fn = (unsigned char)*n;
67379 +
67380 + if (c == '\0')
67381 + return 1;
67382 + else {
67383 + if (c == fn)
67384 + goto matched;
67385 + cold = c;
67386 + c = *p++;
67387 +
67388 + if (c == '-' && *p != ']') {
67389 + unsigned char cend = *p++;
67390 +
67391 + if (cend == '\0')
67392 + return 1;
67393 +
67394 + if (cold <= fn && fn <= cend)
67395 + goto matched;
67396 +
67397 + c = *p++;
67398 + }
67399 + }
67400 +
67401 + if (c == ']')
67402 + break;
67403 + }
67404 + if (!not)
67405 + return 1;
67406 + break;
67407 + matched:
67408 + while (c != ']') {
67409 + if (c == '\0')
67410 + return 1;
67411 +
67412 + c = *p++;
67413 + }
67414 + if (not)
67415 + return 1;
67416 + }
67417 + break;
67418 + default:
67419 + if (c != *n)
67420 + return 1;
67421 + }
67422 +
67423 + ++n;
67424 + }
67425 +
67426 + if (*n == '\0')
67427 + return 0;
67428 +
67429 + if (*n == '/')
67430 + return 0;
67431 +
67432 + return 1;
67433 +}
67434 +
67435 +static struct acl_object_label *
67436 +chk_glob_label(struct acl_object_label *globbed,
67437 + const struct dentry *dentry, const struct vfsmount *mnt, char **path)
67438 +{
67439 + struct acl_object_label *tmp;
67440 +
67441 + if (*path == NULL)
67442 + *path = gr_to_filename_nolock(dentry, mnt);
67443 +
67444 + tmp = globbed;
67445 +
67446 + while (tmp) {
67447 + if (!glob_match(tmp->filename, *path))
67448 + return tmp;
67449 + tmp = tmp->next;
67450 + }
67451 +
67452 + return NULL;
67453 +}
67454 +
67455 +static struct acl_object_label *
67456 +__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
67457 + const ino_t curr_ino, const dev_t curr_dev,
67458 + const struct acl_subject_label *subj, char **path, const int checkglob)
67459 +{
67460 + struct acl_subject_label *tmpsubj;
67461 + struct acl_object_label *retval;
67462 + struct acl_object_label *retval2;
67463 +
67464 + tmpsubj = (struct acl_subject_label *) subj;
67465 + read_lock(&gr_inode_lock);
67466 + do {
67467 + retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
67468 + if (retval) {
67469 + if (checkglob && retval->globbed) {
67470 + retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
67471 + if (retval2)
67472 + retval = retval2;
67473 + }
67474 + break;
67475 + }
67476 + } while ((tmpsubj = tmpsubj->parent_subject));
67477 + read_unlock(&gr_inode_lock);
67478 +
67479 + return retval;
67480 +}
67481 +
67482 +static __inline__ struct acl_object_label *
67483 +full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
67484 + struct dentry *curr_dentry,
67485 + const struct acl_subject_label *subj, char **path, const int checkglob)
67486 +{
67487 + int newglob = checkglob;
67488 + ino_t inode;
67489 + dev_t device;
67490 +
67491 + /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
67492 + as we don't want a / * rule to match instead of the / object
67493 + don't do this for create lookups that call this function though, since they're looking up
67494 + on the parent and thus need globbing checks on all paths
67495 + */
67496 + if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
67497 + newglob = GR_NO_GLOB;
67498 +
67499 + spin_lock(&curr_dentry->d_lock);
67500 + inode = curr_dentry->d_inode->i_ino;
67501 + device = __get_dev(curr_dentry);
67502 + spin_unlock(&curr_dentry->d_lock);
67503 +
67504 + return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
67505 +}
67506 +
67507 +#ifdef CONFIG_HUGETLBFS
67508 +static inline bool
67509 +is_hugetlbfs_mnt(const struct vfsmount *mnt)
67510 +{
67511 + int i;
67512 + for (i = 0; i < HUGE_MAX_HSTATE; i++) {
67513 + if (unlikely(hugetlbfs_vfsmount[i] == mnt))
67514 + return true;
67515 + }
67516 +
67517 + return false;
67518 +}
67519 +#endif
67520 +
67521 +static struct acl_object_label *
67522 +__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
67523 + const struct acl_subject_label *subj, char *path, const int checkglob)
67524 +{
67525 + struct dentry *dentry = (struct dentry *) l_dentry;
67526 + struct vfsmount *mnt = (struct vfsmount *) l_mnt;
67527 + struct mount *real_mnt = real_mount(mnt);
67528 + struct acl_object_label *retval;
67529 + struct dentry *parent;
67530 +
67531 + read_seqlock_excl(&mount_lock);
67532 + write_seqlock(&rename_lock);
67533 +
67534 + if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
67535 +#ifdef CONFIG_NET
67536 + mnt == sock_mnt ||
67537 +#endif
67538 +#ifdef CONFIG_HUGETLBFS
67539 + (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
67540 +#endif
67541 + /* ignore Eric Biederman */
67542 + IS_PRIVATE(l_dentry->d_inode))) {
67543 + retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
67544 + goto out;
67545 + }
67546 +
67547 + for (;;) {
67548 + if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
67549 + break;
67550 +
67551 + if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
67552 + if (!mnt_has_parent(real_mnt))
67553 + break;
67554 +
67555 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
67556 + if (retval != NULL)
67557 + goto out;
67558 +
67559 + dentry = real_mnt->mnt_mountpoint;
67560 + real_mnt = real_mnt->mnt_parent;
67561 + mnt = &real_mnt->mnt;
67562 + continue;
67563 + }
67564 +
67565 + parent = dentry->d_parent;
67566 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
67567 + if (retval != NULL)
67568 + goto out;
67569 +
67570 + dentry = parent;
67571 + }
67572 +
67573 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
67574 +
67575 + /* gr_real_root is pinned so we don't have to hold a reference */
67576 + if (retval == NULL)
67577 + retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
67578 +out:
67579 + write_sequnlock(&rename_lock);
67580 + read_sequnlock_excl(&mount_lock);
67581 +
67582 + BUG_ON(retval == NULL);
67583 +
67584 + return retval;
67585 +}
67586 +
67587 +static __inline__ struct acl_object_label *
67588 +chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
67589 + const struct acl_subject_label *subj)
67590 +{
67591 + char *path = NULL;
67592 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
67593 +}
67594 +
67595 +static __inline__ struct acl_object_label *
67596 +chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
67597 + const struct acl_subject_label *subj)
67598 +{
67599 + char *path = NULL;
67600 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
67601 +}
67602 +
67603 +static __inline__ struct acl_object_label *
67604 +chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
67605 + const struct acl_subject_label *subj, char *path)
67606 +{
67607 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
67608 +}
67609 +
67610 +struct acl_subject_label *
67611 +chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
67612 + const struct acl_role_label *role)
67613 +{
67614 + struct dentry *dentry = (struct dentry *) l_dentry;
67615 + struct vfsmount *mnt = (struct vfsmount *) l_mnt;
67616 + struct mount *real_mnt = real_mount(mnt);
67617 + struct acl_subject_label *retval;
67618 + struct dentry *parent;
67619 +
67620 + read_seqlock_excl(&mount_lock);
67621 + write_seqlock(&rename_lock);
67622 +
67623 + for (;;) {
67624 + if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
67625 + break;
67626 + if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
67627 + if (!mnt_has_parent(real_mnt))
67628 + break;
67629 +
67630 + spin_lock(&dentry->d_lock);
67631 + read_lock(&gr_inode_lock);
67632 + retval =
67633 + lookup_acl_subj_label(dentry->d_inode->i_ino,
67634 + __get_dev(dentry), role);
67635 + read_unlock(&gr_inode_lock);
67636 + spin_unlock(&dentry->d_lock);
67637 + if (retval != NULL)
67638 + goto out;
67639 +
67640 + dentry = real_mnt->mnt_mountpoint;
67641 + real_mnt = real_mnt->mnt_parent;
67642 + mnt = &real_mnt->mnt;
67643 + continue;
67644 + }
67645 +
67646 + spin_lock(&dentry->d_lock);
67647 + read_lock(&gr_inode_lock);
67648 + retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
67649 + __get_dev(dentry), role);
67650 + read_unlock(&gr_inode_lock);
67651 + parent = dentry->d_parent;
67652 + spin_unlock(&dentry->d_lock);
67653 +
67654 + if (retval != NULL)
67655 + goto out;
67656 +
67657 + dentry = parent;
67658 + }
67659 +
67660 + spin_lock(&dentry->d_lock);
67661 + read_lock(&gr_inode_lock);
67662 + retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
67663 + __get_dev(dentry), role);
67664 + read_unlock(&gr_inode_lock);
67665 + spin_unlock(&dentry->d_lock);
67666 +
67667 + if (unlikely(retval == NULL)) {
67668 + /* gr_real_root is pinned, we don't need to hold a reference */
67669 + read_lock(&gr_inode_lock);
67670 + retval = lookup_acl_subj_label(gr_real_root.dentry->d_inode->i_ino,
67671 + __get_dev(gr_real_root.dentry), role);
67672 + read_unlock(&gr_inode_lock);
67673 + }
67674 +out:
67675 + write_sequnlock(&rename_lock);
67676 + read_sequnlock_excl(&mount_lock);
67677 +
67678 + BUG_ON(retval == NULL);
67679 +
67680 + return retval;
67681 +}
67682 +
67683 +void
67684 +assign_special_role(const char *rolename)
67685 +{
67686 + struct acl_object_label *obj;
67687 + struct acl_role_label *r;
67688 + struct acl_role_label *assigned = NULL;
67689 + struct task_struct *tsk;
67690 + struct file *filp;
67691 +
67692 + FOR_EACH_ROLE_START(r)
67693 + if (!strcmp(rolename, r->rolename) &&
67694 + (r->roletype & GR_ROLE_SPECIAL)) {
67695 + assigned = r;
67696 + break;
67697 + }
67698 + FOR_EACH_ROLE_END(r)
67699 +
67700 + if (!assigned)
67701 + return;
67702 +
67703 + read_lock(&tasklist_lock);
67704 + read_lock(&grsec_exec_file_lock);
67705 +
67706 + tsk = current->real_parent;
67707 + if (tsk == NULL)
67708 + goto out_unlock;
67709 +
67710 + filp = tsk->exec_file;
67711 + if (filp == NULL)
67712 + goto out_unlock;
67713 +
67714 + tsk->is_writable = 0;
67715 + tsk->inherited = 0;
67716 +
67717 + tsk->acl_sp_role = 1;
67718 + tsk->acl_role_id = ++acl_sp_role_value;
67719 + tsk->role = assigned;
67720 + tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
67721 +
67722 + /* ignore additional mmap checks for processes that are writable
67723 + by the default ACL */
67724 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
67725 + if (unlikely(obj->mode & GR_WRITE))
67726 + tsk->is_writable = 1;
67727 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
67728 + if (unlikely(obj->mode & GR_WRITE))
67729 + tsk->is_writable = 1;
67730 +
67731 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
67732 + printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
67733 + tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
67734 +#endif
67735 +
67736 +out_unlock:
67737 + read_unlock(&grsec_exec_file_lock);
67738 + read_unlock(&tasklist_lock);
67739 + return;
67740 +}
67741 +
67742 +
67743 +static void
67744 +gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
67745 +{
67746 + struct task_struct *task = current;
67747 + const struct cred *cred = current_cred();
67748 +
67749 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
67750 + GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
67751 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
67752 + 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
67753 +
67754 + return;
67755 +}
67756 +
67757 +static void
67758 +gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
67759 +{
67760 + struct task_struct *task = current;
67761 + const struct cred *cred = current_cred();
67762 +
67763 + security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
67764 + GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
67765 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
67766 + 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
67767 +
67768 + return;
67769 +}
67770 +
67771 +static void
67772 +gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
67773 +{
67774 + struct task_struct *task = current;
67775 + const struct cred *cred = current_cred();
67776 +
67777 + security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
67778 + GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
67779 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
67780 + 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
67781 +
67782 + return;
67783 +}
67784 +
67785 +static void
67786 +gr_set_proc_res(struct task_struct *task)
67787 +{
67788 + struct acl_subject_label *proc;
67789 + unsigned short i;
67790 +
67791 + proc = task->acl;
67792 +
67793 + if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
67794 + return;
67795 +
67796 + for (i = 0; i < RLIM_NLIMITS; i++) {
67797 + if (!(proc->resmask & (1U << i)))
67798 + continue;
67799 +
67800 + task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
67801 + task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
67802 +
67803 + if (i == RLIMIT_CPU)
67804 + update_rlimit_cpu(task, proc->res[i].rlim_cur);
67805 + }
67806 +
67807 + return;
67808 +}
67809 +
67810 +/* both of the below must be called with
67811 + rcu_read_lock();
67812 + read_lock(&tasklist_lock);
67813 + read_lock(&grsec_exec_file_lock);
67814 +*/
67815 +
67816 +struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename)
67817 +{
67818 + char *tmpname;
67819 + struct acl_subject_label *tmpsubj;
67820 + struct file *filp;
67821 + struct name_entry *nmatch;
67822 +
67823 + filp = task->exec_file;
67824 + if (filp == NULL)
67825 + return NULL;
67826 +
67827 + /* the following is to apply the correct subject
67828 + on binaries running when the RBAC system
67829 + is enabled, when the binaries have been
67830 + replaced or deleted since their execution
67831 + -----
67832 + when the RBAC system starts, the inode/dev
67833 + from exec_file will be one the RBAC system
67834 + is unaware of. It only knows the inode/dev
67835 + of the present file on disk, or the absence
67836 + of it.
67837 + */
67838 +
67839 + if (filename)
67840 + nmatch = __lookup_name_entry(state, filename);
67841 + else {
67842 + preempt_disable();
67843 + tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
67844 +
67845 + nmatch = __lookup_name_entry(state, tmpname);
67846 + preempt_enable();
67847 + }
67848 + tmpsubj = NULL;
67849 + if (nmatch) {
67850 + if (nmatch->deleted)
67851 + tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
67852 + else
67853 + tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
67854 + }
67855 + /* this also works for the reload case -- if we don't match a potentially inherited subject
67856 + then we fall back to a normal lookup based on the binary's ino/dev
67857 + */
67858 + if (tmpsubj == NULL)
67859 + tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
67860 +
67861 + return tmpsubj;
67862 +}
67863 +
67864 +static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename)
67865 +{
67866 + return __gr_get_subject_for_task(&running_polstate, task, filename);
67867 +}
67868 +
67869 +void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
67870 +{
67871 + struct acl_object_label *obj;
67872 + struct file *filp;
67873 +
67874 + filp = task->exec_file;
67875 +
67876 + task->acl = subj;
67877 + task->is_writable = 0;
67878 + /* ignore additional mmap checks for processes that are writable
67879 + by the default ACL */
67880 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
67881 + if (unlikely(obj->mode & GR_WRITE))
67882 + task->is_writable = 1;
67883 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
67884 + if (unlikely(obj->mode & GR_WRITE))
67885 + task->is_writable = 1;
67886 +
67887 + gr_set_proc_res(task);
67888 +
67889 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
67890 + 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);
67891 +#endif
67892 +}
67893 +
67894 +static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
67895 +{
67896 + __gr_apply_subject_to_task(&running_polstate, task, subj);
67897 +}
67898 +
67899 +__u32
67900 +gr_search_file(const struct dentry * dentry, const __u32 mode,
67901 + const struct vfsmount * mnt)
67902 +{
67903 + __u32 retval = mode;
67904 + struct acl_subject_label *curracl;
67905 + struct acl_object_label *currobj;
67906 +
67907 + if (unlikely(!(gr_status & GR_READY)))
67908 + return (mode & ~GR_AUDITS);
67909 +
67910 + curracl = current->acl;
67911 +
67912 + currobj = chk_obj_label(dentry, mnt, curracl);
67913 + retval = currobj->mode & mode;
67914 +
67915 + /* if we're opening a specified transfer file for writing
67916 + (e.g. /dev/initctl), then transfer our role to init
67917 + */
67918 + if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
67919 + current->role->roletype & GR_ROLE_PERSIST)) {
67920 + struct task_struct *task = init_pid_ns.child_reaper;
67921 +
67922 + if (task->role != current->role) {
67923 + struct acl_subject_label *subj;
67924 +
67925 + task->acl_sp_role = 0;
67926 + task->acl_role_id = current->acl_role_id;
67927 + task->role = current->role;
67928 + rcu_read_lock();
67929 + read_lock(&grsec_exec_file_lock);
67930 + subj = gr_get_subject_for_task(task, NULL);
67931 + gr_apply_subject_to_task(task, subj);
67932 + read_unlock(&grsec_exec_file_lock);
67933 + rcu_read_unlock();
67934 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
67935 + }
67936 + }
67937 +
67938 + if (unlikely
67939 + ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
67940 + && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
67941 + __u32 new_mode = mode;
67942 +
67943 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
67944 +
67945 + retval = new_mode;
67946 +
67947 + if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
67948 + new_mode |= GR_INHERIT;
67949 +
67950 + if (!(mode & GR_NOLEARN))
67951 + gr_log_learn(dentry, mnt, new_mode);
67952 + }
67953 +
67954 + return retval;
67955 +}
67956 +
67957 +struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
67958 + const struct dentry *parent,
67959 + const struct vfsmount *mnt)
67960 +{
67961 + struct name_entry *match;
67962 + struct acl_object_label *matchpo;
67963 + struct acl_subject_label *curracl;
67964 + char *path;
67965 +
67966 + if (unlikely(!(gr_status & GR_READY)))
67967 + return NULL;
67968 +
67969 + preempt_disable();
67970 + path = gr_to_filename_rbac(new_dentry, mnt);
67971 + match = lookup_name_entry_create(path);
67972 +
67973 + curracl = current->acl;
67974 +
67975 + if (match) {
67976 + read_lock(&gr_inode_lock);
67977 + matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
67978 + read_unlock(&gr_inode_lock);
67979 +
67980 + if (matchpo) {
67981 + preempt_enable();
67982 + return matchpo;
67983 + }
67984 + }
67985 +
67986 + // lookup parent
67987 +
67988 + matchpo = chk_obj_create_label(parent, mnt, curracl, path);
67989 +
67990 + preempt_enable();
67991 + return matchpo;
67992 +}
67993 +
67994 +__u32
67995 +gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
67996 + const struct vfsmount * mnt, const __u32 mode)
67997 +{
67998 + struct acl_object_label *matchpo;
67999 + __u32 retval;
68000 +
68001 + if (unlikely(!(gr_status & GR_READY)))
68002 + return (mode & ~GR_AUDITS);
68003 +
68004 + matchpo = gr_get_create_object(new_dentry, parent, mnt);
68005 +
68006 + retval = matchpo->mode & mode;
68007 +
68008 + if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
68009 + && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
68010 + __u32 new_mode = mode;
68011 +
68012 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
68013 +
68014 + gr_log_learn(new_dentry, mnt, new_mode);
68015 + return new_mode;
68016 + }
68017 +
68018 + return retval;
68019 +}
68020 +
68021 +__u32
68022 +gr_check_link(const struct dentry * new_dentry,
68023 + const struct dentry * parent_dentry,
68024 + const struct vfsmount * parent_mnt,
68025 + const struct dentry * old_dentry, const struct vfsmount * old_mnt)
68026 +{
68027 + struct acl_object_label *obj;
68028 + __u32 oldmode, newmode;
68029 + __u32 needmode;
68030 + __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
68031 + GR_DELETE | GR_INHERIT;
68032 +
68033 + if (unlikely(!(gr_status & GR_READY)))
68034 + return (GR_CREATE | GR_LINK);
68035 +
68036 + obj = chk_obj_label(old_dentry, old_mnt, current->acl);
68037 + oldmode = obj->mode;
68038 +
68039 + obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
68040 + newmode = obj->mode;
68041 +
68042 + needmode = newmode & checkmodes;
68043 +
68044 + // old name for hardlink must have at least the permissions of the new name
68045 + if ((oldmode & needmode) != needmode)
68046 + goto bad;
68047 +
68048 + // if old name had restrictions/auditing, make sure the new name does as well
68049 + needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
68050 +
68051 + // don't allow hardlinking of suid/sgid/fcapped files without permission
68052 + if (is_privileged_binary(old_dentry))
68053 + needmode |= GR_SETID;
68054 +
68055 + if ((newmode & needmode) != needmode)
68056 + goto bad;
68057 +
68058 + // enforce minimum permissions
68059 + if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
68060 + return newmode;
68061 +bad:
68062 + needmode = oldmode;
68063 + if (is_privileged_binary(old_dentry))
68064 + needmode |= GR_SETID;
68065 +
68066 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
68067 + gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
68068 + return (GR_CREATE | GR_LINK);
68069 + } else if (newmode & GR_SUPPRESS)
68070 + return GR_SUPPRESS;
68071 + else
68072 + return 0;
68073 +}
68074 +
68075 +int
68076 +gr_check_hidden_task(const struct task_struct *task)
68077 +{
68078 + if (unlikely(!(gr_status & GR_READY)))
68079 + return 0;
68080 +
68081 + if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
68082 + return 1;
68083 +
68084 + return 0;
68085 +}
68086 +
68087 +int
68088 +gr_check_protected_task(const struct task_struct *task)
68089 +{
68090 + if (unlikely(!(gr_status & GR_READY) || !task))
68091 + return 0;
68092 +
68093 + if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
68094 + task->acl != current->acl)
68095 + return 1;
68096 +
68097 + return 0;
68098 +}
68099 +
68100 +int
68101 +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
68102 +{
68103 + struct task_struct *p;
68104 + int ret = 0;
68105 +
68106 + if (unlikely(!(gr_status & GR_READY) || !pid))
68107 + return ret;
68108 +
68109 + read_lock(&tasklist_lock);
68110 + do_each_pid_task(pid, type, p) {
68111 + if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
68112 + p->acl != current->acl) {
68113 + ret = 1;
68114 + goto out;
68115 + }
68116 + } while_each_pid_task(pid, type, p);
68117 +out:
68118 + read_unlock(&tasklist_lock);
68119 +
68120 + return ret;
68121 +}
68122 +
68123 +void
68124 +gr_copy_label(struct task_struct *tsk)
68125 +{
68126 + struct task_struct *p = current;
68127 +
68128 + tsk->inherited = p->inherited;
68129 + tsk->acl_sp_role = 0;
68130 + tsk->acl_role_id = p->acl_role_id;
68131 + tsk->acl = p->acl;
68132 + tsk->role = p->role;
68133 + tsk->signal->used_accept = 0;
68134 + tsk->signal->curr_ip = p->signal->curr_ip;
68135 + tsk->signal->saved_ip = p->signal->saved_ip;
68136 + if (p->exec_file)
68137 + get_file(p->exec_file);
68138 + tsk->exec_file = p->exec_file;
68139 + tsk->is_writable = p->is_writable;
68140 + if (unlikely(p->signal->used_accept)) {
68141 + p->signal->curr_ip = 0;
68142 + p->signal->saved_ip = 0;
68143 + }
68144 +
68145 + return;
68146 +}
68147 +
68148 +extern int gr_process_kernel_setuid_ban(struct user_struct *user);
68149 +
68150 +int
68151 +gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
68152 +{
68153 + unsigned int i;
68154 + __u16 num;
68155 + uid_t *uidlist;
68156 + uid_t curuid;
68157 + int realok = 0;
68158 + int effectiveok = 0;
68159 + int fsok = 0;
68160 + uid_t globalreal, globaleffective, globalfs;
68161 +
68162 +#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
68163 + struct user_struct *user;
68164 +
68165 + if (!uid_valid(real))
68166 + goto skipit;
68167 +
68168 + /* find user based on global namespace */
68169 +
68170 + globalreal = GR_GLOBAL_UID(real);
68171 +
68172 + user = find_user(make_kuid(&init_user_ns, globalreal));
68173 + if (user == NULL)
68174 + goto skipit;
68175 +
68176 + if (gr_process_kernel_setuid_ban(user)) {
68177 + /* for find_user */
68178 + free_uid(user);
68179 + return 1;
68180 + }
68181 +
68182 + /* for find_user */
68183 + free_uid(user);
68184 +
68185 +skipit:
68186 +#endif
68187 +
68188 + if (unlikely(!(gr_status & GR_READY)))
68189 + return 0;
68190 +
68191 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
68192 + gr_log_learn_uid_change(real, effective, fs);
68193 +
68194 + num = current->acl->user_trans_num;
68195 + uidlist = current->acl->user_transitions;
68196 +
68197 + if (uidlist == NULL)
68198 + return 0;
68199 +
68200 + if (!uid_valid(real)) {
68201 + realok = 1;
68202 + globalreal = (uid_t)-1;
68203 + } else {
68204 + globalreal = GR_GLOBAL_UID(real);
68205 + }
68206 + if (!uid_valid(effective)) {
68207 + effectiveok = 1;
68208 + globaleffective = (uid_t)-1;
68209 + } else {
68210 + globaleffective = GR_GLOBAL_UID(effective);
68211 + }
68212 + if (!uid_valid(fs)) {
68213 + fsok = 1;
68214 + globalfs = (uid_t)-1;
68215 + } else {
68216 + globalfs = GR_GLOBAL_UID(fs);
68217 + }
68218 +
68219 + if (current->acl->user_trans_type & GR_ID_ALLOW) {
68220 + for (i = 0; i < num; i++) {
68221 + curuid = uidlist[i];
68222 + if (globalreal == curuid)
68223 + realok = 1;
68224 + if (globaleffective == curuid)
68225 + effectiveok = 1;
68226 + if (globalfs == curuid)
68227 + fsok = 1;
68228 + }
68229 + } else if (current->acl->user_trans_type & GR_ID_DENY) {
68230 + for (i = 0; i < num; i++) {
68231 + curuid = uidlist[i];
68232 + if (globalreal == curuid)
68233 + break;
68234 + if (globaleffective == curuid)
68235 + break;
68236 + if (globalfs == curuid)
68237 + break;
68238 + }
68239 + /* not in deny list */
68240 + if (i == num) {
68241 + realok = 1;
68242 + effectiveok = 1;
68243 + fsok = 1;
68244 + }
68245 + }
68246 +
68247 + if (realok && effectiveok && fsok)
68248 + return 0;
68249 + else {
68250 + gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
68251 + return 1;
68252 + }
68253 +}
68254 +
68255 +int
68256 +gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
68257 +{
68258 + unsigned int i;
68259 + __u16 num;
68260 + gid_t *gidlist;
68261 + gid_t curgid;
68262 + int realok = 0;
68263 + int effectiveok = 0;
68264 + int fsok = 0;
68265 + gid_t globalreal, globaleffective, globalfs;
68266 +
68267 + if (unlikely(!(gr_status & GR_READY)))
68268 + return 0;
68269 +
68270 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
68271 + gr_log_learn_gid_change(real, effective, fs);
68272 +
68273 + num = current->acl->group_trans_num;
68274 + gidlist = current->acl->group_transitions;
68275 +
68276 + if (gidlist == NULL)
68277 + return 0;
68278 +
68279 + if (!gid_valid(real)) {
68280 + realok = 1;
68281 + globalreal = (gid_t)-1;
68282 + } else {
68283 + globalreal = GR_GLOBAL_GID(real);
68284 + }
68285 + if (!gid_valid(effective)) {
68286 + effectiveok = 1;
68287 + globaleffective = (gid_t)-1;
68288 + } else {
68289 + globaleffective = GR_GLOBAL_GID(effective);
68290 + }
68291 + if (!gid_valid(fs)) {
68292 + fsok = 1;
68293 + globalfs = (gid_t)-1;
68294 + } else {
68295 + globalfs = GR_GLOBAL_GID(fs);
68296 + }
68297 +
68298 + if (current->acl->group_trans_type & GR_ID_ALLOW) {
68299 + for (i = 0; i < num; i++) {
68300 + curgid = gidlist[i];
68301 + if (globalreal == curgid)
68302 + realok = 1;
68303 + if (globaleffective == curgid)
68304 + effectiveok = 1;
68305 + if (globalfs == curgid)
68306 + fsok = 1;
68307 + }
68308 + } else if (current->acl->group_trans_type & GR_ID_DENY) {
68309 + for (i = 0; i < num; i++) {
68310 + curgid = gidlist[i];
68311 + if (globalreal == curgid)
68312 + break;
68313 + if (globaleffective == curgid)
68314 + break;
68315 + if (globalfs == curgid)
68316 + break;
68317 + }
68318 + /* not in deny list */
68319 + if (i == num) {
68320 + realok = 1;
68321 + effectiveok = 1;
68322 + fsok = 1;
68323 + }
68324 + }
68325 +
68326 + if (realok && effectiveok && fsok)
68327 + return 0;
68328 + else {
68329 + gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
68330 + return 1;
68331 + }
68332 +}
68333 +
68334 +extern int gr_acl_is_capable(const int cap);
68335 +
68336 +void
68337 +gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
68338 +{
68339 + struct acl_role_label *role = task->role;
68340 + struct acl_subject_label *subj = NULL;
68341 + struct acl_object_label *obj;
68342 + struct file *filp;
68343 + uid_t uid;
68344 + gid_t gid;
68345 +
68346 + if (unlikely(!(gr_status & GR_READY)))
68347 + return;
68348 +
68349 + uid = GR_GLOBAL_UID(kuid);
68350 + gid = GR_GLOBAL_GID(kgid);
68351 +
68352 + filp = task->exec_file;
68353 +
68354 + /* kernel process, we'll give them the kernel role */
68355 + if (unlikely(!filp)) {
68356 + task->role = running_polstate.kernel_role;
68357 + task->acl = running_polstate.kernel_role->root_label;
68358 + return;
68359 + } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
68360 + /* save the current ip at time of role lookup so that the proper
68361 + IP will be learned for role_allowed_ip */
68362 + task->signal->saved_ip = task->signal->curr_ip;
68363 + role = lookup_acl_role_label(task, uid, gid);
68364 + }
68365 +
68366 + /* don't change the role if we're not a privileged process */
68367 + if (role && task->role != role &&
68368 + (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
68369 + ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
68370 + return;
68371 +
68372 + /* perform subject lookup in possibly new role
68373 + we can use this result below in the case where role == task->role
68374 + */
68375 + subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
68376 +
68377 + /* if we changed uid/gid, but result in the same role
68378 + and are using inheritance, don't lose the inherited subject
68379 + if current subject is other than what normal lookup
68380 + would result in, we arrived via inheritance, don't
68381 + lose subject
68382 + */
68383 + if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
68384 + (subj == task->acl)))
68385 + task->acl = subj;
68386 +
68387 + /* leave task->inherited unaffected */
68388 +
68389 + task->role = role;
68390 +
68391 + task->is_writable = 0;
68392 +
68393 + /* ignore additional mmap checks for processes that are writable
68394 + by the default ACL */
68395 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
68396 + if (unlikely(obj->mode & GR_WRITE))
68397 + task->is_writable = 1;
68398 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
68399 + if (unlikely(obj->mode & GR_WRITE))
68400 + task->is_writable = 1;
68401 +
68402 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
68403 + 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);
68404 +#endif
68405 +
68406 + gr_set_proc_res(task);
68407 +
68408 + return;
68409 +}
68410 +
68411 +int
68412 +gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
68413 + const int unsafe_flags)
68414 +{
68415 + struct task_struct *task = current;
68416 + struct acl_subject_label *newacl;
68417 + struct acl_object_label *obj;
68418 + __u32 retmode;
68419 +
68420 + if (unlikely(!(gr_status & GR_READY)))
68421 + return 0;
68422 +
68423 + newacl = chk_subj_label(dentry, mnt, task->role);
68424 +
68425 + /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
68426 + did an exec
68427 + */
68428 + rcu_read_lock();
68429 + read_lock(&tasklist_lock);
68430 + if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
68431 + (task->parent->acl->mode & GR_POVERRIDE))) {
68432 + read_unlock(&tasklist_lock);
68433 + rcu_read_unlock();
68434 + goto skip_check;
68435 + }
68436 + read_unlock(&tasklist_lock);
68437 + rcu_read_unlock();
68438 +
68439 + if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
68440 + !(task->role->roletype & GR_ROLE_GOD) &&
68441 + !gr_search_file(dentry, GR_PTRACERD, mnt) &&
68442 + !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
68443 + if (unsafe_flags & LSM_UNSAFE_SHARE)
68444 + gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
68445 + else
68446 + gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
68447 + return -EACCES;
68448 + }
68449 +
68450 +skip_check:
68451 +
68452 + obj = chk_obj_label(dentry, mnt, task->acl);
68453 + retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
68454 +
68455 + if (!(task->acl->mode & GR_INHERITLEARN) &&
68456 + ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
68457 + if (obj->nested)
68458 + task->acl = obj->nested;
68459 + else
68460 + task->acl = newacl;
68461 + task->inherited = 0;
68462 + } else {
68463 + task->inherited = 1;
68464 + if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
68465 + gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
68466 + }
68467 +
68468 + task->is_writable = 0;
68469 +
68470 + /* ignore additional mmap checks for processes that are writable
68471 + by the default ACL */
68472 + obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
68473 + if (unlikely(obj->mode & GR_WRITE))
68474 + task->is_writable = 1;
68475 + obj = chk_obj_label(dentry, mnt, task->role->root_label);
68476 + if (unlikely(obj->mode & GR_WRITE))
68477 + task->is_writable = 1;
68478 +
68479 + gr_set_proc_res(task);
68480 +
68481 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
68482 + 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);
68483 +#endif
68484 + return 0;
68485 +}
68486 +
68487 +/* always called with valid inodev ptr */
68488 +static void
68489 +do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
68490 +{
68491 + struct acl_object_label *matchpo;
68492 + struct acl_subject_label *matchps;
68493 + struct acl_subject_label *subj;
68494 + struct acl_role_label *role;
68495 + unsigned int x;
68496 +
68497 + FOR_EACH_ROLE_START(role)
68498 + FOR_EACH_SUBJECT_START(role, subj, x)
68499 + if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
68500 + matchpo->mode |= GR_DELETED;
68501 + FOR_EACH_SUBJECT_END(subj,x)
68502 + FOR_EACH_NESTED_SUBJECT_START(role, subj)
68503 + /* nested subjects aren't in the role's subj_hash table */
68504 + if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
68505 + matchpo->mode |= GR_DELETED;
68506 + FOR_EACH_NESTED_SUBJECT_END(subj)
68507 + if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
68508 + matchps->mode |= GR_DELETED;
68509 + FOR_EACH_ROLE_END(role)
68510 +
68511 + inodev->nentry->deleted = 1;
68512 +
68513 + return;
68514 +}
68515 +
68516 +void
68517 +gr_handle_delete(const ino_t ino, const dev_t dev)
68518 +{
68519 + struct inodev_entry *inodev;
68520 +
68521 + if (unlikely(!(gr_status & GR_READY)))
68522 + return;
68523 +
68524 + write_lock(&gr_inode_lock);
68525 + inodev = lookup_inodev_entry(ino, dev);
68526 + if (inodev != NULL)
68527 + do_handle_delete(inodev, ino, dev);
68528 + write_unlock(&gr_inode_lock);
68529 +
68530 + return;
68531 +}
68532 +
68533 +static void
68534 +update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
68535 + const ino_t newinode, const dev_t newdevice,
68536 + struct acl_subject_label *subj)
68537 +{
68538 + unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
68539 + struct acl_object_label *match;
68540 +
68541 + match = subj->obj_hash[index];
68542 +
68543 + while (match && (match->inode != oldinode ||
68544 + match->device != olddevice ||
68545 + !(match->mode & GR_DELETED)))
68546 + match = match->next;
68547 +
68548 + if (match && (match->inode == oldinode)
68549 + && (match->device == olddevice)
68550 + && (match->mode & GR_DELETED)) {
68551 + if (match->prev == NULL) {
68552 + subj->obj_hash[index] = match->next;
68553 + if (match->next != NULL)
68554 + match->next->prev = NULL;
68555 + } else {
68556 + match->prev->next = match->next;
68557 + if (match->next != NULL)
68558 + match->next->prev = match->prev;
68559 + }
68560 + match->prev = NULL;
68561 + match->next = NULL;
68562 + match->inode = newinode;
68563 + match->device = newdevice;
68564 + match->mode &= ~GR_DELETED;
68565 +
68566 + insert_acl_obj_label(match, subj);
68567 + }
68568 +
68569 + return;
68570 +}
68571 +
68572 +static void
68573 +update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
68574 + const ino_t newinode, const dev_t newdevice,
68575 + struct acl_role_label *role)
68576 +{
68577 + unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
68578 + struct acl_subject_label *match;
68579 +
68580 + match = role->subj_hash[index];
68581 +
68582 + while (match && (match->inode != oldinode ||
68583 + match->device != olddevice ||
68584 + !(match->mode & GR_DELETED)))
68585 + match = match->next;
68586 +
68587 + if (match && (match->inode == oldinode)
68588 + && (match->device == olddevice)
68589 + && (match->mode & GR_DELETED)) {
68590 + if (match->prev == NULL) {
68591 + role->subj_hash[index] = match->next;
68592 + if (match->next != NULL)
68593 + match->next->prev = NULL;
68594 + } else {
68595 + match->prev->next = match->next;
68596 + if (match->next != NULL)
68597 + match->next->prev = match->prev;
68598 + }
68599 + match->prev = NULL;
68600 + match->next = NULL;
68601 + match->inode = newinode;
68602 + match->device = newdevice;
68603 + match->mode &= ~GR_DELETED;
68604 +
68605 + insert_acl_subj_label(match, role);
68606 + }
68607 +
68608 + return;
68609 +}
68610 +
68611 +static void
68612 +update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
68613 + const ino_t newinode, const dev_t newdevice)
68614 +{
68615 + unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
68616 + struct inodev_entry *match;
68617 +
68618 + match = running_polstate.inodev_set.i_hash[index];
68619 +
68620 + while (match && (match->nentry->inode != oldinode ||
68621 + match->nentry->device != olddevice || !match->nentry->deleted))
68622 + match = match->next;
68623 +
68624 + if (match && (match->nentry->inode == oldinode)
68625 + && (match->nentry->device == olddevice) &&
68626 + match->nentry->deleted) {
68627 + if (match->prev == NULL) {
68628 + running_polstate.inodev_set.i_hash[index] = match->next;
68629 + if (match->next != NULL)
68630 + match->next->prev = NULL;
68631 + } else {
68632 + match->prev->next = match->next;
68633 + if (match->next != NULL)
68634 + match->next->prev = match->prev;
68635 + }
68636 + match->prev = NULL;
68637 + match->next = NULL;
68638 + match->nentry->inode = newinode;
68639 + match->nentry->device = newdevice;
68640 + match->nentry->deleted = 0;
68641 +
68642 + insert_inodev_entry(match);
68643 + }
68644 +
68645 + return;
68646 +}
68647 +
68648 +static void
68649 +__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
68650 +{
68651 + struct acl_subject_label *subj;
68652 + struct acl_role_label *role;
68653 + unsigned int x;
68654 +
68655 + FOR_EACH_ROLE_START(role)
68656 + update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
68657 +
68658 + FOR_EACH_NESTED_SUBJECT_START(role, subj)
68659 + if ((subj->inode == ino) && (subj->device == dev)) {
68660 + subj->inode = ino;
68661 + subj->device = dev;
68662 + }
68663 + /* nested subjects aren't in the role's subj_hash table */
68664 + update_acl_obj_label(matchn->inode, matchn->device,
68665 + ino, dev, subj);
68666 + FOR_EACH_NESTED_SUBJECT_END(subj)
68667 + FOR_EACH_SUBJECT_START(role, subj, x)
68668 + update_acl_obj_label(matchn->inode, matchn->device,
68669 + ino, dev, subj);
68670 + FOR_EACH_SUBJECT_END(subj,x)
68671 + FOR_EACH_ROLE_END(role)
68672 +
68673 + update_inodev_entry(matchn->inode, matchn->device, ino, dev);
68674 +
68675 + return;
68676 +}
68677 +
68678 +static void
68679 +do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
68680 + const struct vfsmount *mnt)
68681 +{
68682 + ino_t ino = dentry->d_inode->i_ino;
68683 + dev_t dev = __get_dev(dentry);
68684 +
68685 + __do_handle_create(matchn, ino, dev);
68686 +
68687 + return;
68688 +}
68689 +
68690 +void
68691 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
68692 +{
68693 + struct name_entry *matchn;
68694 +
68695 + if (unlikely(!(gr_status & GR_READY)))
68696 + return;
68697 +
68698 + preempt_disable();
68699 + matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
68700 +
68701 + if (unlikely((unsigned long)matchn)) {
68702 + write_lock(&gr_inode_lock);
68703 + do_handle_create(matchn, dentry, mnt);
68704 + write_unlock(&gr_inode_lock);
68705 + }
68706 + preempt_enable();
68707 +
68708 + return;
68709 +}
68710 +
68711 +void
68712 +gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
68713 +{
68714 + struct name_entry *matchn;
68715 +
68716 + if (unlikely(!(gr_status & GR_READY)))
68717 + return;
68718 +
68719 + preempt_disable();
68720 + matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
68721 +
68722 + if (unlikely((unsigned long)matchn)) {
68723 + write_lock(&gr_inode_lock);
68724 + __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
68725 + write_unlock(&gr_inode_lock);
68726 + }
68727 + preempt_enable();
68728 +
68729 + return;
68730 +}
68731 +
68732 +void
68733 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
68734 + struct dentry *old_dentry,
68735 + struct dentry *new_dentry,
68736 + struct vfsmount *mnt, const __u8 replace)
68737 +{
68738 + struct name_entry *matchn;
68739 + struct inodev_entry *inodev;
68740 + struct inode *inode = new_dentry->d_inode;
68741 + ino_t old_ino = old_dentry->d_inode->i_ino;
68742 + dev_t old_dev = __get_dev(old_dentry);
68743 +
68744 + /* vfs_rename swaps the name and parent link for old_dentry and
68745 + new_dentry
68746 + at this point, old_dentry has the new name, parent link, and inode
68747 + for the renamed file
68748 + if a file is being replaced by a rename, new_dentry has the inode
68749 + and name for the replaced file
68750 + */
68751 +
68752 + if (unlikely(!(gr_status & GR_READY)))
68753 + return;
68754 +
68755 + preempt_disable();
68756 + matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
68757 +
68758 + /* we wouldn't have to check d_inode if it weren't for
68759 + NFS silly-renaming
68760 + */
68761 +
68762 + write_lock(&gr_inode_lock);
68763 + if (unlikely(replace && inode)) {
68764 + ino_t new_ino = inode->i_ino;
68765 + dev_t new_dev = __get_dev(new_dentry);
68766 +
68767 + inodev = lookup_inodev_entry(new_ino, new_dev);
68768 + if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
68769 + do_handle_delete(inodev, new_ino, new_dev);
68770 + }
68771 +
68772 + inodev = lookup_inodev_entry(old_ino, old_dev);
68773 + if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
68774 + do_handle_delete(inodev, old_ino, old_dev);
68775 +
68776 + if (unlikely((unsigned long)matchn))
68777 + do_handle_create(matchn, old_dentry, mnt);
68778 +
68779 + write_unlock(&gr_inode_lock);
68780 + preempt_enable();
68781 +
68782 + return;
68783 +}
68784 +
68785 +#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
68786 +static const unsigned long res_learn_bumps[GR_NLIMITS] = {
68787 + [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
68788 + [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
68789 + [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
68790 + [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
68791 + [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
68792 + [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
68793 + [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
68794 + [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
68795 + [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
68796 + [RLIMIT_AS] = GR_RLIM_AS_BUMP,
68797 + [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
68798 + [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
68799 + [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
68800 + [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
68801 + [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
68802 + [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
68803 +};
68804 +
68805 +void
68806 +gr_learn_resource(const struct task_struct *task,
68807 + const int res, const unsigned long wanted, const int gt)
68808 +{
68809 + struct acl_subject_label *acl;
68810 + const struct cred *cred;
68811 +
68812 + if (unlikely((gr_status & GR_READY) &&
68813 + task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
68814 + goto skip_reslog;
68815 +
68816 + gr_log_resource(task, res, wanted, gt);
68817 +skip_reslog:
68818 +
68819 + if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
68820 + return;
68821 +
68822 + acl = task->acl;
68823 +
68824 + if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
68825 + !(acl->resmask & (1U << (unsigned short) res))))
68826 + return;
68827 +
68828 + if (wanted >= acl->res[res].rlim_cur) {
68829 + unsigned long res_add;
68830 +
68831 + res_add = wanted + res_learn_bumps[res];
68832 +
68833 + acl->res[res].rlim_cur = res_add;
68834 +
68835 + if (wanted > acl->res[res].rlim_max)
68836 + acl->res[res].rlim_max = res_add;
68837 +
68838 + /* only log the subject filename, since resource logging is supported for
68839 + single-subject learning only */
68840 + rcu_read_lock();
68841 + cred = __task_cred(task);
68842 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
68843 + task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
68844 + acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
68845 + "", (unsigned long) res, &task->signal->saved_ip);
68846 + rcu_read_unlock();
68847 + }
68848 +
68849 + return;
68850 +}
68851 +EXPORT_SYMBOL_GPL(gr_learn_resource);
68852 +#endif
68853 +
68854 +#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
68855 +void
68856 +pax_set_initial_flags(struct linux_binprm *bprm)
68857 +{
68858 + struct task_struct *task = current;
68859 + struct acl_subject_label *proc;
68860 + unsigned long flags;
68861 +
68862 + if (unlikely(!(gr_status & GR_READY)))
68863 + return;
68864 +
68865 + flags = pax_get_flags(task);
68866 +
68867 + proc = task->acl;
68868 +
68869 + if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
68870 + flags &= ~MF_PAX_PAGEEXEC;
68871 + if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
68872 + flags &= ~MF_PAX_SEGMEXEC;
68873 + if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
68874 + flags &= ~MF_PAX_RANDMMAP;
68875 + if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
68876 + flags &= ~MF_PAX_EMUTRAMP;
68877 + if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
68878 + flags &= ~MF_PAX_MPROTECT;
68879 +
68880 + if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
68881 + flags |= MF_PAX_PAGEEXEC;
68882 + if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
68883 + flags |= MF_PAX_SEGMEXEC;
68884 + if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
68885 + flags |= MF_PAX_RANDMMAP;
68886 + if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
68887 + flags |= MF_PAX_EMUTRAMP;
68888 + if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
68889 + flags |= MF_PAX_MPROTECT;
68890 +
68891 + pax_set_flags(task, flags);
68892 +
68893 + return;
68894 +}
68895 +#endif
68896 +
68897 +int
68898 +gr_handle_proc_ptrace(struct task_struct *task)
68899 +{
68900 + struct file *filp;
68901 + struct task_struct *tmp = task;
68902 + struct task_struct *curtemp = current;
68903 + __u32 retmode;
68904 +
68905 +#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
68906 + if (unlikely(!(gr_status & GR_READY)))
68907 + return 0;
68908 +#endif
68909 +
68910 + read_lock(&tasklist_lock);
68911 + read_lock(&grsec_exec_file_lock);
68912 + filp = task->exec_file;
68913 +
68914 + while (task_pid_nr(tmp) > 0) {
68915 + if (tmp == curtemp)
68916 + break;
68917 + tmp = tmp->real_parent;
68918 + }
68919 +
68920 + if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
68921 + ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
68922 + read_unlock(&grsec_exec_file_lock);
68923 + read_unlock(&tasklist_lock);
68924 + return 1;
68925 + }
68926 +
68927 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
68928 + if (!(gr_status & GR_READY)) {
68929 + read_unlock(&grsec_exec_file_lock);
68930 + read_unlock(&tasklist_lock);
68931 + return 0;
68932 + }
68933 +#endif
68934 +
68935 + retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
68936 + read_unlock(&grsec_exec_file_lock);
68937 + read_unlock(&tasklist_lock);
68938 +
68939 + if (retmode & GR_NOPTRACE)
68940 + return 1;
68941 +
68942 + if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
68943 + && (current->acl != task->acl || (current->acl != current->role->root_label
68944 + && task_pid_nr(current) != task_pid_nr(task))))
68945 + return 1;
68946 +
68947 + return 0;
68948 +}
68949 +
68950 +void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
68951 +{
68952 + if (unlikely(!(gr_status & GR_READY)))
68953 + return;
68954 +
68955 + if (!(current->role->roletype & GR_ROLE_GOD))
68956 + return;
68957 +
68958 + seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
68959 + p->role->rolename, gr_task_roletype_to_char(p),
68960 + p->acl->filename);
68961 +}
68962 +
68963 +int
68964 +gr_handle_ptrace(struct task_struct *task, const long request)
68965 +{
68966 + struct task_struct *tmp = task;
68967 + struct task_struct *curtemp = current;
68968 + __u32 retmode;
68969 +
68970 +#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
68971 + if (unlikely(!(gr_status & GR_READY)))
68972 + return 0;
68973 +#endif
68974 + if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
68975 + read_lock(&tasklist_lock);
68976 + while (task_pid_nr(tmp) > 0) {
68977 + if (tmp == curtemp)
68978 + break;
68979 + tmp = tmp->real_parent;
68980 + }
68981 +
68982 + if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
68983 + ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
68984 + read_unlock(&tasklist_lock);
68985 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
68986 + return 1;
68987 + }
68988 + read_unlock(&tasklist_lock);
68989 + }
68990 +
68991 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
68992 + if (!(gr_status & GR_READY))
68993 + return 0;
68994 +#endif
68995 +
68996 + read_lock(&grsec_exec_file_lock);
68997 + if (unlikely(!task->exec_file)) {
68998 + read_unlock(&grsec_exec_file_lock);
68999 + return 0;
69000 + }
69001 +
69002 + retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
69003 + read_unlock(&grsec_exec_file_lock);
69004 +
69005 + if (retmode & GR_NOPTRACE) {
69006 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
69007 + return 1;
69008 + }
69009 +
69010 + if (retmode & GR_PTRACERD) {
69011 + switch (request) {
69012 + case PTRACE_SEIZE:
69013 + case PTRACE_POKETEXT:
69014 + case PTRACE_POKEDATA:
69015 + case PTRACE_POKEUSR:
69016 +#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
69017 + case PTRACE_SETREGS:
69018 + case PTRACE_SETFPREGS:
69019 +#endif
69020 +#ifdef CONFIG_X86
69021 + case PTRACE_SETFPXREGS:
69022 +#endif
69023 +#ifdef CONFIG_ALTIVEC
69024 + case PTRACE_SETVRREGS:
69025 +#endif
69026 + return 1;
69027 + default:
69028 + return 0;
69029 + }
69030 + } else if (!(current->acl->mode & GR_POVERRIDE) &&
69031 + !(current->role->roletype & GR_ROLE_GOD) &&
69032 + (current->acl != task->acl)) {
69033 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
69034 + return 1;
69035 + }
69036 +
69037 + return 0;
69038 +}
69039 +
69040 +static int is_writable_mmap(const struct file *filp)
69041 +{
69042 + struct task_struct *task = current;
69043 + struct acl_object_label *obj, *obj2;
69044 +
69045 + if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
69046 + !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))) {
69047 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
69048 + obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
69049 + task->role->root_label);
69050 + if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
69051 + gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
69052 + return 1;
69053 + }
69054 + }
69055 + return 0;
69056 +}
69057 +
69058 +int
69059 +gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
69060 +{
69061 + __u32 mode;
69062 +
69063 + if (unlikely(!file || !(prot & PROT_EXEC)))
69064 + return 1;
69065 +
69066 + if (is_writable_mmap(file))
69067 + return 0;
69068 +
69069 + mode =
69070 + gr_search_file(file->f_path.dentry,
69071 + GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
69072 + file->f_path.mnt);
69073 +
69074 + if (!gr_tpe_allow(file))
69075 + return 0;
69076 +
69077 + if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
69078 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
69079 + return 0;
69080 + } else if (unlikely(!(mode & GR_EXEC))) {
69081 + return 0;
69082 + } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
69083 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
69084 + return 1;
69085 + }
69086 +
69087 + return 1;
69088 +}
69089 +
69090 +int
69091 +gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
69092 +{
69093 + __u32 mode;
69094 +
69095 + if (unlikely(!file || !(prot & PROT_EXEC)))
69096 + return 1;
69097 +
69098 + if (is_writable_mmap(file))
69099 + return 0;
69100 +
69101 + mode =
69102 + gr_search_file(file->f_path.dentry,
69103 + GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
69104 + file->f_path.mnt);
69105 +
69106 + if (!gr_tpe_allow(file))
69107 + return 0;
69108 +
69109 + if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
69110 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
69111 + return 0;
69112 + } else if (unlikely(!(mode & GR_EXEC))) {
69113 + return 0;
69114 + } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
69115 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
69116 + return 1;
69117 + }
69118 +
69119 + return 1;
69120 +}
69121 +
69122 +void
69123 +gr_acl_handle_psacct(struct task_struct *task, const long code)
69124 +{
69125 + unsigned long runtime, cputime;
69126 + cputime_t utime, stime;
69127 + unsigned int wday, cday;
69128 + __u8 whr, chr;
69129 + __u8 wmin, cmin;
69130 + __u8 wsec, csec;
69131 + struct timespec timeval;
69132 +
69133 + if (unlikely(!(gr_status & GR_READY) || !task->acl ||
69134 + !(task->acl->mode & GR_PROCACCT)))
69135 + return;
69136 +
69137 + do_posix_clock_monotonic_gettime(&timeval);
69138 + runtime = timeval.tv_sec - task->start_time.tv_sec;
69139 + wday = runtime / (60 * 60 * 24);
69140 + runtime -= wday * (60 * 60 * 24);
69141 + whr = runtime / (60 * 60);
69142 + runtime -= whr * (60 * 60);
69143 + wmin = runtime / 60;
69144 + runtime -= wmin * 60;
69145 + wsec = runtime;
69146 +
69147 + task_cputime(task, &utime, &stime);
69148 + cputime = cputime_to_secs(utime + stime);
69149 + cday = cputime / (60 * 60 * 24);
69150 + cputime -= cday * (60 * 60 * 24);
69151 + chr = cputime / (60 * 60);
69152 + cputime -= chr * (60 * 60);
69153 + cmin = cputime / 60;
69154 + cputime -= cmin * 60;
69155 + csec = cputime;
69156 +
69157 + gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
69158 +
69159 + return;
69160 +}
69161 +
69162 +#ifdef CONFIG_TASKSTATS
69163 +int gr_is_taskstats_denied(int pid)
69164 +{
69165 + struct task_struct *task;
69166 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
69167 + const struct cred *cred;
69168 +#endif
69169 + int ret = 0;
69170 +
69171 + /* restrict taskstats viewing to un-chrooted root users
69172 + who have the 'view' subject flag if the RBAC system is enabled
69173 + */
69174 +
69175 + rcu_read_lock();
69176 + read_lock(&tasklist_lock);
69177 + task = find_task_by_vpid(pid);
69178 + if (task) {
69179 +#ifdef CONFIG_GRKERNSEC_CHROOT
69180 + if (proc_is_chrooted(task))
69181 + ret = -EACCES;
69182 +#endif
69183 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
69184 + cred = __task_cred(task);
69185 +#ifdef CONFIG_GRKERNSEC_PROC_USER
69186 + if (gr_is_global_nonroot(cred->uid))
69187 + ret = -EACCES;
69188 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
69189 + if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
69190 + ret = -EACCES;
69191 +#endif
69192 +#endif
69193 + if (gr_status & GR_READY) {
69194 + if (!(task->acl->mode & GR_VIEW))
69195 + ret = -EACCES;
69196 + }
69197 + } else
69198 + ret = -ENOENT;
69199 +
69200 + read_unlock(&tasklist_lock);
69201 + rcu_read_unlock();
69202 +
69203 + return ret;
69204 +}
69205 +#endif
69206 +
69207 +/* AUXV entries are filled via a descendant of search_binary_handler
69208 + after we've already applied the subject for the target
69209 +*/
69210 +int gr_acl_enable_at_secure(void)
69211 +{
69212 + if (unlikely(!(gr_status & GR_READY)))
69213 + return 0;
69214 +
69215 + if (current->acl->mode & GR_ATSECURE)
69216 + return 1;
69217 +
69218 + return 0;
69219 +}
69220 +
69221 +int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
69222 +{
69223 + struct task_struct *task = current;
69224 + struct dentry *dentry = file->f_path.dentry;
69225 + struct vfsmount *mnt = file->f_path.mnt;
69226 + struct acl_object_label *obj, *tmp;
69227 + struct acl_subject_label *subj;
69228 + unsigned int bufsize;
69229 + int is_not_root;
69230 + char *path;
69231 + dev_t dev = __get_dev(dentry);
69232 +
69233 + if (unlikely(!(gr_status & GR_READY)))
69234 + return 1;
69235 +
69236 + if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
69237 + return 1;
69238 +
69239 + /* ignore Eric Biederman */
69240 + if (IS_PRIVATE(dentry->d_inode))
69241 + return 1;
69242 +
69243 + subj = task->acl;
69244 + read_lock(&gr_inode_lock);
69245 + do {
69246 + obj = lookup_acl_obj_label(ino, dev, subj);
69247 + if (obj != NULL) {
69248 + read_unlock(&gr_inode_lock);
69249 + return (obj->mode & GR_FIND) ? 1 : 0;
69250 + }
69251 + } while ((subj = subj->parent_subject));
69252 + read_unlock(&gr_inode_lock);
69253 +
69254 + /* this is purely an optimization since we're looking for an object
69255 + for the directory we're doing a readdir on
69256 + if it's possible for any globbed object to match the entry we're
69257 + filling into the directory, then the object we find here will be
69258 + an anchor point with attached globbed objects
69259 + */
69260 + obj = chk_obj_label_noglob(dentry, mnt, task->acl);
69261 + if (obj->globbed == NULL)
69262 + return (obj->mode & GR_FIND) ? 1 : 0;
69263 +
69264 + is_not_root = ((obj->filename[0] == '/') &&
69265 + (obj->filename[1] == '\0')) ? 0 : 1;
69266 + bufsize = PAGE_SIZE - namelen - is_not_root;
69267 +
69268 + /* check bufsize > PAGE_SIZE || bufsize == 0 */
69269 + if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
69270 + return 1;
69271 +
69272 + preempt_disable();
69273 + path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
69274 + bufsize);
69275 +
69276 + bufsize = strlen(path);
69277 +
69278 + /* if base is "/", don't append an additional slash */
69279 + if (is_not_root)
69280 + *(path + bufsize) = '/';
69281 + memcpy(path + bufsize + is_not_root, name, namelen);
69282 + *(path + bufsize + namelen + is_not_root) = '\0';
69283 +
69284 + tmp = obj->globbed;
69285 + while (tmp) {
69286 + if (!glob_match(tmp->filename, path)) {
69287 + preempt_enable();
69288 + return (tmp->mode & GR_FIND) ? 1 : 0;
69289 + }
69290 + tmp = tmp->next;
69291 + }
69292 + preempt_enable();
69293 + return (obj->mode & GR_FIND) ? 1 : 0;
69294 +}
69295 +
69296 +void gr_put_exec_file(struct task_struct *task)
69297 +{
69298 + struct file *filp;
69299 +
69300 + write_lock(&grsec_exec_file_lock);
69301 + filp = task->exec_file;
69302 + task->exec_file = NULL;
69303 + write_unlock(&grsec_exec_file_lock);
69304 +
69305 + if (filp)
69306 + fput(filp);
69307 +
69308 + return;
69309 +}
69310 +
69311 +
69312 +#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
69313 +EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
69314 +#endif
69315 +#ifdef CONFIG_SECURITY
69316 +EXPORT_SYMBOL_GPL(gr_check_user_change);
69317 +EXPORT_SYMBOL_GPL(gr_check_group_change);
69318 +#endif
69319 +
69320 diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
69321 new file mode 100644
69322 index 0000000..18ffbbd
69323 --- /dev/null
69324 +++ b/grsecurity/gracl_alloc.c
69325 @@ -0,0 +1,105 @@
69326 +#include <linux/kernel.h>
69327 +#include <linux/mm.h>
69328 +#include <linux/slab.h>
69329 +#include <linux/vmalloc.h>
69330 +#include <linux/gracl.h>
69331 +#include <linux/grsecurity.h>
69332 +
69333 +static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
69334 +struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
69335 +
69336 +static __inline__ int
69337 +alloc_pop(void)
69338 +{
69339 + if (current_alloc_state->alloc_stack_next == 1)
69340 + return 0;
69341 +
69342 + kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
69343 +
69344 + current_alloc_state->alloc_stack_next--;
69345 +
69346 + return 1;
69347 +}
69348 +
69349 +static __inline__ int
69350 +alloc_push(void *buf)
69351 +{
69352 + if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
69353 + return 1;
69354 +
69355 + current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
69356 +
69357 + current_alloc_state->alloc_stack_next++;
69358 +
69359 + return 0;
69360 +}
69361 +
69362 +void *
69363 +acl_alloc(unsigned long len)
69364 +{
69365 + void *ret = NULL;
69366 +
69367 + if (!len || len > PAGE_SIZE)
69368 + goto out;
69369 +
69370 + ret = kmalloc(len, GFP_KERNEL);
69371 +
69372 + if (ret) {
69373 + if (alloc_push(ret)) {
69374 + kfree(ret);
69375 + ret = NULL;
69376 + }
69377 + }
69378 +
69379 +out:
69380 + return ret;
69381 +}
69382 +
69383 +void *
69384 +acl_alloc_num(unsigned long num, unsigned long len)
69385 +{
69386 + if (!len || (num > (PAGE_SIZE / len)))
69387 + return NULL;
69388 +
69389 + return acl_alloc(num * len);
69390 +}
69391 +
69392 +void
69393 +acl_free_all(void)
69394 +{
69395 + if (!current_alloc_state->alloc_stack)
69396 + return;
69397 +
69398 + while (alloc_pop()) ;
69399 +
69400 + if (current_alloc_state->alloc_stack) {
69401 + if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
69402 + kfree(current_alloc_state->alloc_stack);
69403 + else
69404 + vfree(current_alloc_state->alloc_stack);
69405 + }
69406 +
69407 + current_alloc_state->alloc_stack = NULL;
69408 + current_alloc_state->alloc_stack_size = 1;
69409 + current_alloc_state->alloc_stack_next = 1;
69410 +
69411 + return;
69412 +}
69413 +
69414 +int
69415 +acl_alloc_stack_init(unsigned long size)
69416 +{
69417 + if ((size * sizeof (void *)) <= PAGE_SIZE)
69418 + current_alloc_state->alloc_stack =
69419 + (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
69420 + else
69421 + current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
69422 +
69423 + current_alloc_state->alloc_stack_size = size;
69424 + current_alloc_state->alloc_stack_next = 1;
69425 +
69426 + if (!current_alloc_state->alloc_stack)
69427 + return 0;
69428 + else
69429 + return 1;
69430 +}
69431 diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
69432 new file mode 100644
69433 index 0000000..bdd51ea
69434 --- /dev/null
69435 +++ b/grsecurity/gracl_cap.c
69436 @@ -0,0 +1,110 @@
69437 +#include <linux/kernel.h>
69438 +#include <linux/module.h>
69439 +#include <linux/sched.h>
69440 +#include <linux/gracl.h>
69441 +#include <linux/grsecurity.h>
69442 +#include <linux/grinternal.h>
69443 +
69444 +extern const char *captab_log[];
69445 +extern int captab_log_entries;
69446 +
69447 +int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
69448 +{
69449 + struct acl_subject_label *curracl;
69450 + kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
69451 + kernel_cap_t cap_audit = __cap_empty_set;
69452 +
69453 + if (!gr_acl_is_enabled())
69454 + return 1;
69455 +
69456 + curracl = task->acl;
69457 +
69458 + cap_drop = curracl->cap_lower;
69459 + cap_mask = curracl->cap_mask;
69460 + cap_audit = curracl->cap_invert_audit;
69461 +
69462 + while ((curracl = curracl->parent_subject)) {
69463 + /* if the cap isn't specified in the current computed mask but is specified in the
69464 + current level subject, and is lowered in the current level subject, then add
69465 + it to the set of dropped capabilities
69466 + otherwise, add the current level subject's mask to the current computed mask
69467 + */
69468 + if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
69469 + cap_raise(cap_mask, cap);
69470 + if (cap_raised(curracl->cap_lower, cap))
69471 + cap_raise(cap_drop, cap);
69472 + if (cap_raised(curracl->cap_invert_audit, cap))
69473 + cap_raise(cap_audit, cap);
69474 + }
69475 + }
69476 +
69477 + if (!cap_raised(cap_drop, cap)) {
69478 + if (cap_raised(cap_audit, cap))
69479 + gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
69480 + return 1;
69481 + }
69482 +
69483 + curracl = task->acl;
69484 +
69485 + if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
69486 + && cap_raised(cred->cap_effective, cap)) {
69487 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
69488 + task->role->roletype, GR_GLOBAL_UID(cred->uid),
69489 + GR_GLOBAL_GID(cred->gid), task->exec_file ?
69490 + gr_to_filename(task->exec_file->f_path.dentry,
69491 + task->exec_file->f_path.mnt) : curracl->filename,
69492 + curracl->filename, 0UL,
69493 + 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
69494 + return 1;
69495 + }
69496 +
69497 + if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
69498 + gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
69499 +
69500 + return 0;
69501 +}
69502 +
69503 +int
69504 +gr_acl_is_capable(const int cap)
69505 +{
69506 + return gr_task_acl_is_capable(current, current_cred(), cap);
69507 +}
69508 +
69509 +int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
69510 +{
69511 + struct acl_subject_label *curracl;
69512 + kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
69513 +
69514 + if (!gr_acl_is_enabled())
69515 + return 1;
69516 +
69517 + curracl = task->acl;
69518 +
69519 + cap_drop = curracl->cap_lower;
69520 + cap_mask = curracl->cap_mask;
69521 +
69522 + while ((curracl = curracl->parent_subject)) {
69523 + /* if the cap isn't specified in the current computed mask but is specified in the
69524 + current level subject, and is lowered in the current level subject, then add
69525 + it to the set of dropped capabilities
69526 + otherwise, add the current level subject's mask to the current computed mask
69527 + */
69528 + if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
69529 + cap_raise(cap_mask, cap);
69530 + if (cap_raised(curracl->cap_lower, cap))
69531 + cap_raise(cap_drop, cap);
69532 + }
69533 + }
69534 +
69535 + if (!cap_raised(cap_drop, cap))
69536 + return 1;
69537 +
69538 + return 0;
69539 +}
69540 +
69541 +int
69542 +gr_acl_is_capable_nolog(const int cap)
69543 +{
69544 + return gr_task_acl_is_capable_nolog(current, cap);
69545 +}
69546 +
69547 diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
69548 new file mode 100644
69549 index 0000000..ca25605
69550 --- /dev/null
69551 +++ b/grsecurity/gracl_compat.c
69552 @@ -0,0 +1,270 @@
69553 +#include <linux/kernel.h>
69554 +#include <linux/gracl.h>
69555 +#include <linux/compat.h>
69556 +#include <linux/gracl_compat.h>
69557 +
69558 +#include <asm/uaccess.h>
69559 +
69560 +int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
69561 +{
69562 + struct gr_arg_wrapper_compat uwrapcompat;
69563 +
69564 + if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
69565 + return -EFAULT;
69566 +
69567 + if (((uwrapcompat.version != GRSECURITY_VERSION) &&
69568 + (uwrapcompat.version != 0x2901)) ||
69569 + (uwrapcompat.size != sizeof(struct gr_arg_compat)))
69570 + return -EINVAL;
69571 +
69572 + uwrap->arg = compat_ptr(uwrapcompat.arg);
69573 + uwrap->version = uwrapcompat.version;
69574 + uwrap->size = sizeof(struct gr_arg);
69575 +
69576 + return 0;
69577 +}
69578 +
69579 +int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
69580 +{
69581 + struct gr_arg_compat argcompat;
69582 +
69583 + if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
69584 + return -EFAULT;
69585 +
69586 + arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
69587 + arg->role_db.num_pointers = argcompat.role_db.num_pointers;
69588 + arg->role_db.num_roles = argcompat.role_db.num_roles;
69589 + arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
69590 + arg->role_db.num_subjects = argcompat.role_db.num_subjects;
69591 + arg->role_db.num_objects = argcompat.role_db.num_objects;
69592 +
69593 + memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
69594 + memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
69595 + memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
69596 + memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
69597 + arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
69598 + arg->segv_device = argcompat.segv_device;
69599 + arg->segv_inode = argcompat.segv_inode;
69600 + arg->segv_uid = argcompat.segv_uid;
69601 + arg->num_sprole_pws = argcompat.num_sprole_pws;
69602 + arg->mode = argcompat.mode;
69603 +
69604 + return 0;
69605 +}
69606 +
69607 +int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
69608 +{
69609 + struct acl_object_label_compat objcompat;
69610 +
69611 + if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
69612 + return -EFAULT;
69613 +
69614 + obj->filename = compat_ptr(objcompat.filename);
69615 + obj->inode = objcompat.inode;
69616 + obj->device = objcompat.device;
69617 + obj->mode = objcompat.mode;
69618 +
69619 + obj->nested = compat_ptr(objcompat.nested);
69620 + obj->globbed = compat_ptr(objcompat.globbed);
69621 +
69622 + obj->prev = compat_ptr(objcompat.prev);
69623 + obj->next = compat_ptr(objcompat.next);
69624 +
69625 + return 0;
69626 +}
69627 +
69628 +int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
69629 +{
69630 + unsigned int i;
69631 + struct acl_subject_label_compat subjcompat;
69632 +
69633 + if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
69634 + return -EFAULT;
69635 +
69636 + subj->filename = compat_ptr(subjcompat.filename);
69637 + subj->inode = subjcompat.inode;
69638 + subj->device = subjcompat.device;
69639 + subj->mode = subjcompat.mode;
69640 + subj->cap_mask = subjcompat.cap_mask;
69641 + subj->cap_lower = subjcompat.cap_lower;
69642 + subj->cap_invert_audit = subjcompat.cap_invert_audit;
69643 +
69644 + for (i = 0; i < GR_NLIMITS; i++) {
69645 + if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
69646 + subj->res[i].rlim_cur = RLIM_INFINITY;
69647 + else
69648 + subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
69649 + if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
69650 + subj->res[i].rlim_max = RLIM_INFINITY;
69651 + else
69652 + subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
69653 + }
69654 + subj->resmask = subjcompat.resmask;
69655 +
69656 + subj->user_trans_type = subjcompat.user_trans_type;
69657 + subj->group_trans_type = subjcompat.group_trans_type;
69658 + subj->user_transitions = compat_ptr(subjcompat.user_transitions);
69659 + subj->group_transitions = compat_ptr(subjcompat.group_transitions);
69660 + subj->user_trans_num = subjcompat.user_trans_num;
69661 + subj->group_trans_num = subjcompat.group_trans_num;
69662 +
69663 + memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
69664 + memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
69665 + subj->ip_type = subjcompat.ip_type;
69666 + subj->ips = compat_ptr(subjcompat.ips);
69667 + subj->ip_num = subjcompat.ip_num;
69668 + subj->inaddr_any_override = subjcompat.inaddr_any_override;
69669 +
69670 + subj->crashes = subjcompat.crashes;
69671 + subj->expires = subjcompat.expires;
69672 +
69673 + subj->parent_subject = compat_ptr(subjcompat.parent_subject);
69674 + subj->hash = compat_ptr(subjcompat.hash);
69675 + subj->prev = compat_ptr(subjcompat.prev);
69676 + subj->next = compat_ptr(subjcompat.next);
69677 +
69678 + subj->obj_hash = compat_ptr(subjcompat.obj_hash);
69679 + subj->obj_hash_size = subjcompat.obj_hash_size;
69680 + subj->pax_flags = subjcompat.pax_flags;
69681 +
69682 + return 0;
69683 +}
69684 +
69685 +int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
69686 +{
69687 + struct acl_role_label_compat rolecompat;
69688 +
69689 + if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
69690 + return -EFAULT;
69691 +
69692 + role->rolename = compat_ptr(rolecompat.rolename);
69693 + role->uidgid = rolecompat.uidgid;
69694 + role->roletype = rolecompat.roletype;
69695 +
69696 + role->auth_attempts = rolecompat.auth_attempts;
69697 + role->expires = rolecompat.expires;
69698 +
69699 + role->root_label = compat_ptr(rolecompat.root_label);
69700 + role->hash = compat_ptr(rolecompat.hash);
69701 +
69702 + role->prev = compat_ptr(rolecompat.prev);
69703 + role->next = compat_ptr(rolecompat.next);
69704 +
69705 + role->transitions = compat_ptr(rolecompat.transitions);
69706 + role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
69707 + role->domain_children = compat_ptr(rolecompat.domain_children);
69708 + role->domain_child_num = rolecompat.domain_child_num;
69709 +
69710 + role->umask = rolecompat.umask;
69711 +
69712 + role->subj_hash = compat_ptr(rolecompat.subj_hash);
69713 + role->subj_hash_size = rolecompat.subj_hash_size;
69714 +
69715 + return 0;
69716 +}
69717 +
69718 +int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
69719 +{
69720 + struct role_allowed_ip_compat roleip_compat;
69721 +
69722 + if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
69723 + return -EFAULT;
69724 +
69725 + roleip->addr = roleip_compat.addr;
69726 + roleip->netmask = roleip_compat.netmask;
69727 +
69728 + roleip->prev = compat_ptr(roleip_compat.prev);
69729 + roleip->next = compat_ptr(roleip_compat.next);
69730 +
69731 + return 0;
69732 +}
69733 +
69734 +int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
69735 +{
69736 + struct role_transition_compat trans_compat;
69737 +
69738 + if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
69739 + return -EFAULT;
69740 +
69741 + trans->rolename = compat_ptr(trans_compat.rolename);
69742 +
69743 + trans->prev = compat_ptr(trans_compat.prev);
69744 + trans->next = compat_ptr(trans_compat.next);
69745 +
69746 + return 0;
69747 +
69748 +}
69749 +
69750 +int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
69751 +{
69752 + struct gr_hash_struct_compat hash_compat;
69753 +
69754 + if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
69755 + return -EFAULT;
69756 +
69757 + hash->table = compat_ptr(hash_compat.table);
69758 + hash->nametable = compat_ptr(hash_compat.nametable);
69759 + hash->first = compat_ptr(hash_compat.first);
69760 +
69761 + hash->table_size = hash_compat.table_size;
69762 + hash->used_size = hash_compat.used_size;
69763 +
69764 + hash->type = hash_compat.type;
69765 +
69766 + return 0;
69767 +}
69768 +
69769 +int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
69770 +{
69771 + compat_uptr_t ptrcompat;
69772 +
69773 + if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
69774 + return -EFAULT;
69775 +
69776 + *(void **)ptr = compat_ptr(ptrcompat);
69777 +
69778 + return 0;
69779 +}
69780 +
69781 +int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
69782 +{
69783 + struct acl_ip_label_compat ip_compat;
69784 +
69785 + if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
69786 + return -EFAULT;
69787 +
69788 + ip->iface = compat_ptr(ip_compat.iface);
69789 + ip->addr = ip_compat.addr;
69790 + ip->netmask = ip_compat.netmask;
69791 + ip->low = ip_compat.low;
69792 + ip->high = ip_compat.high;
69793 + ip->mode = ip_compat.mode;
69794 + ip->type = ip_compat.type;
69795 +
69796 + memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
69797 +
69798 + ip->prev = compat_ptr(ip_compat.prev);
69799 + ip->next = compat_ptr(ip_compat.next);
69800 +
69801 + return 0;
69802 +}
69803 +
69804 +int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
69805 +{
69806 + struct sprole_pw_compat pw_compat;
69807 +
69808 + if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
69809 + return -EFAULT;
69810 +
69811 + pw->rolename = compat_ptr(pw_compat.rolename);
69812 + memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
69813 + memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
69814 +
69815 + return 0;
69816 +}
69817 +
69818 +size_t get_gr_arg_wrapper_size_compat(void)
69819 +{
69820 + return sizeof(struct gr_arg_wrapper_compat);
69821 +}
69822 +
69823 diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
69824 new file mode 100644
69825 index 0000000..a89b1f4
69826 --- /dev/null
69827 +++ b/grsecurity/gracl_fs.c
69828 @@ -0,0 +1,437 @@
69829 +#include <linux/kernel.h>
69830 +#include <linux/sched.h>
69831 +#include <linux/types.h>
69832 +#include <linux/fs.h>
69833 +#include <linux/file.h>
69834 +#include <linux/stat.h>
69835 +#include <linux/grsecurity.h>
69836 +#include <linux/grinternal.h>
69837 +#include <linux/gracl.h>
69838 +
69839 +umode_t
69840 +gr_acl_umask(void)
69841 +{
69842 + if (unlikely(!gr_acl_is_enabled()))
69843 + return 0;
69844 +
69845 + return current->role->umask;
69846 +}
69847 +
69848 +__u32
69849 +gr_acl_handle_hidden_file(const struct dentry * dentry,
69850 + const struct vfsmount * mnt)
69851 +{
69852 + __u32 mode;
69853 +
69854 + if (unlikely(d_is_negative(dentry)))
69855 + return GR_FIND;
69856 +
69857 + mode =
69858 + gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
69859 +
69860 + if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
69861 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
69862 + return mode;
69863 + } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
69864 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
69865 + return 0;
69866 + } else if (unlikely(!(mode & GR_FIND)))
69867 + return 0;
69868 +
69869 + return GR_FIND;
69870 +}
69871 +
69872 +__u32
69873 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
69874 + int acc_mode)
69875 +{
69876 + __u32 reqmode = GR_FIND;
69877 + __u32 mode;
69878 +
69879 + if (unlikely(d_is_negative(dentry)))
69880 + return reqmode;
69881 +
69882 + if (acc_mode & MAY_APPEND)
69883 + reqmode |= GR_APPEND;
69884 + else if (acc_mode & MAY_WRITE)
69885 + reqmode |= GR_WRITE;
69886 + if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
69887 + reqmode |= GR_READ;
69888 +
69889 + mode =
69890 + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
69891 + mnt);
69892 +
69893 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
69894 + gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
69895 + reqmode & GR_READ ? " reading" : "",
69896 + reqmode & GR_WRITE ? " writing" : reqmode &
69897 + GR_APPEND ? " appending" : "");
69898 + return reqmode;
69899 + } else
69900 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
69901 + {
69902 + gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
69903 + reqmode & GR_READ ? " reading" : "",
69904 + reqmode & GR_WRITE ? " writing" : reqmode &
69905 + GR_APPEND ? " appending" : "");
69906 + return 0;
69907 + } else if (unlikely((mode & reqmode) != reqmode))
69908 + return 0;
69909 +
69910 + return reqmode;
69911 +}
69912 +
69913 +__u32
69914 +gr_acl_handle_creat(const struct dentry * dentry,
69915 + const struct dentry * p_dentry,
69916 + const struct vfsmount * p_mnt, int open_flags, int acc_mode,
69917 + const int imode)
69918 +{
69919 + __u32 reqmode = GR_WRITE | GR_CREATE;
69920 + __u32 mode;
69921 +
69922 + if (acc_mode & MAY_APPEND)
69923 + reqmode |= GR_APPEND;
69924 + // if a directory was required or the directory already exists, then
69925 + // don't count this open as a read
69926 + if ((acc_mode & MAY_READ) &&
69927 + !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
69928 + reqmode |= GR_READ;
69929 + if ((open_flags & O_CREAT) &&
69930 + ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
69931 + reqmode |= GR_SETID;
69932 +
69933 + mode =
69934 + gr_check_create(dentry, p_dentry, p_mnt,
69935 + reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
69936 +
69937 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
69938 + gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
69939 + reqmode & GR_READ ? " reading" : "",
69940 + reqmode & GR_WRITE ? " writing" : reqmode &
69941 + GR_APPEND ? " appending" : "");
69942 + return reqmode;
69943 + } else
69944 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
69945 + {
69946 + gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
69947 + reqmode & GR_READ ? " reading" : "",
69948 + reqmode & GR_WRITE ? " writing" : reqmode &
69949 + GR_APPEND ? " appending" : "");
69950 + return 0;
69951 + } else if (unlikely((mode & reqmode) != reqmode))
69952 + return 0;
69953 +
69954 + return reqmode;
69955 +}
69956 +
69957 +__u32
69958 +gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
69959 + const int fmode)
69960 +{
69961 + __u32 mode, reqmode = GR_FIND;
69962 +
69963 + if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
69964 + reqmode |= GR_EXEC;
69965 + if (fmode & S_IWOTH)
69966 + reqmode |= GR_WRITE;
69967 + if (fmode & S_IROTH)
69968 + reqmode |= GR_READ;
69969 +
69970 + mode =
69971 + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
69972 + mnt);
69973 +
69974 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
69975 + gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
69976 + reqmode & GR_READ ? " reading" : "",
69977 + reqmode & GR_WRITE ? " writing" : "",
69978 + reqmode & GR_EXEC ? " executing" : "");
69979 + return reqmode;
69980 + } else
69981 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
69982 + {
69983 + gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
69984 + reqmode & GR_READ ? " reading" : "",
69985 + reqmode & GR_WRITE ? " writing" : "",
69986 + reqmode & GR_EXEC ? " executing" : "");
69987 + return 0;
69988 + } else if (unlikely((mode & reqmode) != reqmode))
69989 + return 0;
69990 +
69991 + return reqmode;
69992 +}
69993 +
69994 +static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
69995 +{
69996 + __u32 mode;
69997 +
69998 + mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
69999 +
70000 + if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
70001 + gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
70002 + return mode;
70003 + } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
70004 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
70005 + return 0;
70006 + } else if (unlikely((mode & (reqmode)) != (reqmode)))
70007 + return 0;
70008 +
70009 + return (reqmode);
70010 +}
70011 +
70012 +__u32
70013 +gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
70014 +{
70015 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
70016 +}
70017 +
70018 +__u32
70019 +gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
70020 +{
70021 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
70022 +}
70023 +
70024 +__u32
70025 +gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
70026 +{
70027 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
70028 +}
70029 +
70030 +__u32
70031 +gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
70032 +{
70033 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
70034 +}
70035 +
70036 +__u32
70037 +gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
70038 + umode_t *modeptr)
70039 +{
70040 + umode_t mode;
70041 +
70042 + *modeptr &= ~gr_acl_umask();
70043 + mode = *modeptr;
70044 +
70045 + if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
70046 + return 1;
70047 +
70048 + if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
70049 + ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
70050 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
70051 + GR_CHMOD_ACL_MSG);
70052 + } else {
70053 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
70054 + }
70055 +}
70056 +
70057 +__u32
70058 +gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
70059 +{
70060 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
70061 +}
70062 +
70063 +__u32
70064 +gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
70065 +{
70066 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
70067 +}
70068 +
70069 +__u32
70070 +gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
70071 +{
70072 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
70073 +}
70074 +
70075 +__u32
70076 +gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
70077 +{
70078 + return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
70079 +}
70080 +
70081 +__u32
70082 +gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
70083 +{
70084 + return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
70085 + GR_UNIXCONNECT_ACL_MSG);
70086 +}
70087 +
70088 +/* hardlinks require at minimum create and link permission,
70089 + any additional privilege required is based on the
70090 + privilege of the file being linked to
70091 +*/
70092 +__u32
70093 +gr_acl_handle_link(const struct dentry * new_dentry,
70094 + const struct dentry * parent_dentry,
70095 + const struct vfsmount * parent_mnt,
70096 + const struct dentry * old_dentry,
70097 + const struct vfsmount * old_mnt, const struct filename *to)
70098 +{
70099 + __u32 mode;
70100 + __u32 needmode = GR_CREATE | GR_LINK;
70101 + __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
70102 +
70103 + mode =
70104 + gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
70105 + old_mnt);
70106 +
70107 + if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
70108 + gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
70109 + return mode;
70110 + } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
70111 + gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
70112 + return 0;
70113 + } else if (unlikely((mode & needmode) != needmode))
70114 + return 0;
70115 +
70116 + return 1;
70117 +}
70118 +
70119 +__u32
70120 +gr_acl_handle_symlink(const struct dentry * new_dentry,
70121 + const struct dentry * parent_dentry,
70122 + const struct vfsmount * parent_mnt, const struct filename *from)
70123 +{
70124 + __u32 needmode = GR_WRITE | GR_CREATE;
70125 + __u32 mode;
70126 +
70127 + mode =
70128 + gr_check_create(new_dentry, parent_dentry, parent_mnt,
70129 + GR_CREATE | GR_AUDIT_CREATE |
70130 + GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
70131 +
70132 + if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
70133 + gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
70134 + return mode;
70135 + } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
70136 + gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
70137 + return 0;
70138 + } else if (unlikely((mode & needmode) != needmode))
70139 + return 0;
70140 +
70141 + return (GR_WRITE | GR_CREATE);
70142 +}
70143 +
70144 +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)
70145 +{
70146 + __u32 mode;
70147 +
70148 + mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
70149 +
70150 + if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
70151 + gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
70152 + return mode;
70153 + } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
70154 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
70155 + return 0;
70156 + } else if (unlikely((mode & (reqmode)) != (reqmode)))
70157 + return 0;
70158 +
70159 + return (reqmode);
70160 +}
70161 +
70162 +__u32
70163 +gr_acl_handle_mknod(const struct dentry * new_dentry,
70164 + const struct dentry * parent_dentry,
70165 + const struct vfsmount * parent_mnt,
70166 + const int mode)
70167 +{
70168 + __u32 reqmode = GR_WRITE | GR_CREATE;
70169 + if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
70170 + reqmode |= GR_SETID;
70171 +
70172 + return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
70173 + reqmode, GR_MKNOD_ACL_MSG);
70174 +}
70175 +
70176 +__u32
70177 +gr_acl_handle_mkdir(const struct dentry *new_dentry,
70178 + const struct dentry *parent_dentry,
70179 + const struct vfsmount *parent_mnt)
70180 +{
70181 + return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
70182 + GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
70183 +}
70184 +
70185 +#define RENAME_CHECK_SUCCESS(old, new) \
70186 + (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
70187 + ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
70188 +
70189 +int
70190 +gr_acl_handle_rename(struct dentry *new_dentry,
70191 + struct dentry *parent_dentry,
70192 + const struct vfsmount *parent_mnt,
70193 + struct dentry *old_dentry,
70194 + struct inode *old_parent_inode,
70195 + struct vfsmount *old_mnt, const struct filename *newname)
70196 +{
70197 + __u32 comp1, comp2;
70198 + int error = 0;
70199 +
70200 + if (unlikely(!gr_acl_is_enabled()))
70201 + return 0;
70202 +
70203 + if (d_is_negative(new_dentry)) {
70204 + comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
70205 + GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
70206 + GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
70207 + comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
70208 + GR_DELETE | GR_AUDIT_DELETE |
70209 + GR_AUDIT_READ | GR_AUDIT_WRITE |
70210 + GR_SUPPRESS, old_mnt);
70211 + } else {
70212 + comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
70213 + GR_CREATE | GR_DELETE |
70214 + GR_AUDIT_CREATE | GR_AUDIT_DELETE |
70215 + GR_AUDIT_READ | GR_AUDIT_WRITE |
70216 + GR_SUPPRESS, parent_mnt);
70217 + comp2 =
70218 + gr_search_file(old_dentry,
70219 + GR_READ | GR_WRITE | GR_AUDIT_READ |
70220 + GR_DELETE | GR_AUDIT_DELETE |
70221 + GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
70222 + }
70223 +
70224 + if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
70225 + ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
70226 + gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
70227 + else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
70228 + && !(comp2 & GR_SUPPRESS)) {
70229 + gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
70230 + error = -EACCES;
70231 + } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
70232 + error = -EACCES;
70233 +
70234 + return error;
70235 +}
70236 +
70237 +void
70238 +gr_acl_handle_exit(void)
70239 +{
70240 + u16 id;
70241 + char *rolename;
70242 +
70243 + if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
70244 + !(current->role->roletype & GR_ROLE_PERSIST))) {
70245 + id = current->acl_role_id;
70246 + rolename = current->role->rolename;
70247 + gr_set_acls(1);
70248 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
70249 + }
70250 +
70251 + gr_put_exec_file(current);
70252 + return;
70253 +}
70254 +
70255 +int
70256 +gr_acl_handle_procpidmem(const struct task_struct *task)
70257 +{
70258 + if (unlikely(!gr_acl_is_enabled()))
70259 + return 0;
70260 +
70261 + if (task != current && task->acl->mode & GR_PROTPROCFD)
70262 + return -EACCES;
70263 +
70264 + return 0;
70265 +}
70266 diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
70267 new file mode 100644
70268 index 0000000..f056b81
70269 --- /dev/null
70270 +++ b/grsecurity/gracl_ip.c
70271 @@ -0,0 +1,386 @@
70272 +#include <linux/kernel.h>
70273 +#include <asm/uaccess.h>
70274 +#include <asm/errno.h>
70275 +#include <net/sock.h>
70276 +#include <linux/file.h>
70277 +#include <linux/fs.h>
70278 +#include <linux/net.h>
70279 +#include <linux/in.h>
70280 +#include <linux/skbuff.h>
70281 +#include <linux/ip.h>
70282 +#include <linux/udp.h>
70283 +#include <linux/types.h>
70284 +#include <linux/sched.h>
70285 +#include <linux/netdevice.h>
70286 +#include <linux/inetdevice.h>
70287 +#include <linux/gracl.h>
70288 +#include <linux/grsecurity.h>
70289 +#include <linux/grinternal.h>
70290 +
70291 +#define GR_BIND 0x01
70292 +#define GR_CONNECT 0x02
70293 +#define GR_INVERT 0x04
70294 +#define GR_BINDOVERRIDE 0x08
70295 +#define GR_CONNECTOVERRIDE 0x10
70296 +#define GR_SOCK_FAMILY 0x20
70297 +
70298 +static const char * gr_protocols[IPPROTO_MAX] = {
70299 + "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
70300 + "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
70301 + "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
70302 + "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
70303 + "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
70304 + "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
70305 + "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
70306 + "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
70307 + "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
70308 + "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
70309 + "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
70310 + "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
70311 + "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
70312 + "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
70313 + "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
70314 + "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
70315 + "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
70316 + "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
70317 + "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
70318 + "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
70319 + "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
70320 + "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
70321 + "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
70322 + "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
70323 + "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
70324 + "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
70325 + "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
70326 + "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
70327 + "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
70328 + "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
70329 + "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
70330 + "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
70331 + };
70332 +
70333 +static const char * gr_socktypes[SOCK_MAX] = {
70334 + "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
70335 + "unknown:7", "unknown:8", "unknown:9", "packet"
70336 + };
70337 +
70338 +static const char * gr_sockfamilies[AF_MAX+1] = {
70339 + "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
70340 + "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
70341 + "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
70342 + "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
70343 + };
70344 +
70345 +const char *
70346 +gr_proto_to_name(unsigned char proto)
70347 +{
70348 + return gr_protocols[proto];
70349 +}
70350 +
70351 +const char *
70352 +gr_socktype_to_name(unsigned char type)
70353 +{
70354 + return gr_socktypes[type];
70355 +}
70356 +
70357 +const char *
70358 +gr_sockfamily_to_name(unsigned char family)
70359 +{
70360 + return gr_sockfamilies[family];
70361 +}
70362 +
70363 +extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
70364 +
70365 +int
70366 +gr_search_socket(const int domain, const int type, const int protocol)
70367 +{
70368 + struct acl_subject_label *curr;
70369 + const struct cred *cred = current_cred();
70370 +
70371 + if (unlikely(!gr_acl_is_enabled()))
70372 + goto exit;
70373 +
70374 + if ((domain < 0) || (type < 0) || (protocol < 0) ||
70375 + (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
70376 + goto exit; // let the kernel handle it
70377 +
70378 + curr = current->acl;
70379 +
70380 + if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
70381 + /* the family is allowed, if this is PF_INET allow it only if
70382 + the extra sock type/protocol checks pass */
70383 + if (domain == PF_INET)
70384 + goto inet_check;
70385 + goto exit;
70386 + } else {
70387 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
70388 + __u32 fakeip = 0;
70389 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
70390 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
70391 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
70392 + gr_to_filename(current->exec_file->f_path.dentry,
70393 + current->exec_file->f_path.mnt) :
70394 + curr->filename, curr->filename,
70395 + &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
70396 + &current->signal->saved_ip);
70397 + goto exit;
70398 + }
70399 + goto exit_fail;
70400 + }
70401 +
70402 +inet_check:
70403 + /* the rest of this checking is for IPv4 only */
70404 + if (!curr->ips)
70405 + goto exit;
70406 +
70407 + if ((curr->ip_type & (1U << type)) &&
70408 + (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
70409 + goto exit;
70410 +
70411 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
70412 + /* we don't place acls on raw sockets , and sometimes
70413 + dgram/ip sockets are opened for ioctl and not
70414 + bind/connect, so we'll fake a bind learn log */
70415 + if (type == SOCK_RAW || type == SOCK_PACKET) {
70416 + __u32 fakeip = 0;
70417 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
70418 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
70419 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
70420 + gr_to_filename(current->exec_file->f_path.dentry,
70421 + current->exec_file->f_path.mnt) :
70422 + curr->filename, curr->filename,
70423 + &fakeip, 0, type,
70424 + protocol, GR_CONNECT, &current->signal->saved_ip);
70425 + } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
70426 + __u32 fakeip = 0;
70427 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
70428 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
70429 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
70430 + gr_to_filename(current->exec_file->f_path.dentry,
70431 + current->exec_file->f_path.mnt) :
70432 + curr->filename, curr->filename,
70433 + &fakeip, 0, type,
70434 + protocol, GR_BIND, &current->signal->saved_ip);
70435 + }
70436 + /* we'll log when they use connect or bind */
70437 + goto exit;
70438 + }
70439 +
70440 +exit_fail:
70441 + if (domain == PF_INET)
70442 + gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
70443 + gr_socktype_to_name(type), gr_proto_to_name(protocol));
70444 + else if (rcu_access_pointer(net_families[domain]) != NULL)
70445 + gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
70446 + gr_socktype_to_name(type), protocol);
70447 +
70448 + return 0;
70449 +exit:
70450 + return 1;
70451 +}
70452 +
70453 +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)
70454 +{
70455 + if ((ip->mode & mode) &&
70456 + (ip_port >= ip->low) &&
70457 + (ip_port <= ip->high) &&
70458 + ((ntohl(ip_addr) & our_netmask) ==
70459 + (ntohl(our_addr) & our_netmask))
70460 + && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
70461 + && (ip->type & (1U << type))) {
70462 + if (ip->mode & GR_INVERT)
70463 + return 2; // specifically denied
70464 + else
70465 + return 1; // allowed
70466 + }
70467 +
70468 + return 0; // not specifically allowed, may continue parsing
70469 +}
70470 +
70471 +static int
70472 +gr_search_connectbind(const int full_mode, struct sock *sk,
70473 + struct sockaddr_in *addr, const int type)
70474 +{
70475 + char iface[IFNAMSIZ] = {0};
70476 + struct acl_subject_label *curr;
70477 + struct acl_ip_label *ip;
70478 + struct inet_sock *isk;
70479 + struct net_device *dev;
70480 + struct in_device *idev;
70481 + unsigned long i;
70482 + int ret;
70483 + int mode = full_mode & (GR_BIND | GR_CONNECT);
70484 + __u32 ip_addr = 0;
70485 + __u32 our_addr;
70486 + __u32 our_netmask;
70487 + char *p;
70488 + __u16 ip_port = 0;
70489 + const struct cred *cred = current_cred();
70490 +
70491 + if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
70492 + return 0;
70493 +
70494 + curr = current->acl;
70495 + isk = inet_sk(sk);
70496 +
70497 + /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
70498 + if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
70499 + addr->sin_addr.s_addr = curr->inaddr_any_override;
70500 + if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
70501 + struct sockaddr_in saddr;
70502 + int err;
70503 +
70504 + saddr.sin_family = AF_INET;
70505 + saddr.sin_addr.s_addr = curr->inaddr_any_override;
70506 + saddr.sin_port = isk->inet_sport;
70507 +
70508 + err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
70509 + if (err)
70510 + return err;
70511 +
70512 + err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
70513 + if (err)
70514 + return err;
70515 + }
70516 +
70517 + if (!curr->ips)
70518 + return 0;
70519 +
70520 + ip_addr = addr->sin_addr.s_addr;
70521 + ip_port = ntohs(addr->sin_port);
70522 +
70523 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
70524 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
70525 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
70526 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
70527 + gr_to_filename(current->exec_file->f_path.dentry,
70528 + current->exec_file->f_path.mnt) :
70529 + curr->filename, curr->filename,
70530 + &ip_addr, ip_port, type,
70531 + sk->sk_protocol, mode, &current->signal->saved_ip);
70532 + return 0;
70533 + }
70534 +
70535 + for (i = 0; i < curr->ip_num; i++) {
70536 + ip = *(curr->ips + i);
70537 + if (ip->iface != NULL) {
70538 + strncpy(iface, ip->iface, IFNAMSIZ - 1);
70539 + p = strchr(iface, ':');
70540 + if (p != NULL)
70541 + *p = '\0';
70542 + dev = dev_get_by_name(sock_net(sk), iface);
70543 + if (dev == NULL)
70544 + continue;
70545 + idev = in_dev_get(dev);
70546 + if (idev == NULL) {
70547 + dev_put(dev);
70548 + continue;
70549 + }
70550 + rcu_read_lock();
70551 + for_ifa(idev) {
70552 + if (!strcmp(ip->iface, ifa->ifa_label)) {
70553 + our_addr = ifa->ifa_address;
70554 + our_netmask = 0xffffffff;
70555 + ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
70556 + if (ret == 1) {
70557 + rcu_read_unlock();
70558 + in_dev_put(idev);
70559 + dev_put(dev);
70560 + return 0;
70561 + } else if (ret == 2) {
70562 + rcu_read_unlock();
70563 + in_dev_put(idev);
70564 + dev_put(dev);
70565 + goto denied;
70566 + }
70567 + }
70568 + } endfor_ifa(idev);
70569 + rcu_read_unlock();
70570 + in_dev_put(idev);
70571 + dev_put(dev);
70572 + } else {
70573 + our_addr = ip->addr;
70574 + our_netmask = ip->netmask;
70575 + ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
70576 + if (ret == 1)
70577 + return 0;
70578 + else if (ret == 2)
70579 + goto denied;
70580 + }
70581 + }
70582 +
70583 +denied:
70584 + if (mode == GR_BIND)
70585 + 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));
70586 + else if (mode == GR_CONNECT)
70587 + 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));
70588 +
70589 + return -EACCES;
70590 +}
70591 +
70592 +int
70593 +gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
70594 +{
70595 + /* always allow disconnection of dgram sockets with connect */
70596 + if (addr->sin_family == AF_UNSPEC)
70597 + return 0;
70598 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
70599 +}
70600 +
70601 +int
70602 +gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
70603 +{
70604 + return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
70605 +}
70606 +
70607 +int gr_search_listen(struct socket *sock)
70608 +{
70609 + struct sock *sk = sock->sk;
70610 + struct sockaddr_in addr;
70611 +
70612 + addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
70613 + addr.sin_port = inet_sk(sk)->inet_sport;
70614 +
70615 + return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
70616 +}
70617 +
70618 +int gr_search_accept(struct socket *sock)
70619 +{
70620 + struct sock *sk = sock->sk;
70621 + struct sockaddr_in addr;
70622 +
70623 + addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
70624 + addr.sin_port = inet_sk(sk)->inet_sport;
70625 +
70626 + return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
70627 +}
70628 +
70629 +int
70630 +gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
70631 +{
70632 + if (addr)
70633 + return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
70634 + else {
70635 + struct sockaddr_in sin;
70636 + const struct inet_sock *inet = inet_sk(sk);
70637 +
70638 + sin.sin_addr.s_addr = inet->inet_daddr;
70639 + sin.sin_port = inet->inet_dport;
70640 +
70641 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
70642 + }
70643 +}
70644 +
70645 +int
70646 +gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
70647 +{
70648 + struct sockaddr_in sin;
70649 +
70650 + if (unlikely(skb->len < sizeof (struct udphdr)))
70651 + return 0; // skip this packet
70652 +
70653 + sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
70654 + sin.sin_port = udp_hdr(skb)->source;
70655 +
70656 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
70657 +}
70658 diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
70659 new file mode 100644
70660 index 0000000..25f54ef
70661 --- /dev/null
70662 +++ b/grsecurity/gracl_learn.c
70663 @@ -0,0 +1,207 @@
70664 +#include <linux/kernel.h>
70665 +#include <linux/mm.h>
70666 +#include <linux/sched.h>
70667 +#include <linux/poll.h>
70668 +#include <linux/string.h>
70669 +#include <linux/file.h>
70670 +#include <linux/types.h>
70671 +#include <linux/vmalloc.h>
70672 +#include <linux/grinternal.h>
70673 +
70674 +extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
70675 + size_t count, loff_t *ppos);
70676 +extern int gr_acl_is_enabled(void);
70677 +
70678 +static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
70679 +static int gr_learn_attached;
70680 +
70681 +/* use a 512k buffer */
70682 +#define LEARN_BUFFER_SIZE (512 * 1024)
70683 +
70684 +static DEFINE_SPINLOCK(gr_learn_lock);
70685 +static DEFINE_MUTEX(gr_learn_user_mutex);
70686 +
70687 +/* we need to maintain two buffers, so that the kernel context of grlearn
70688 + uses a semaphore around the userspace copying, and the other kernel contexts
70689 + use a spinlock when copying into the buffer, since they cannot sleep
70690 +*/
70691 +static char *learn_buffer;
70692 +static char *learn_buffer_user;
70693 +static int learn_buffer_len;
70694 +static int learn_buffer_user_len;
70695 +
70696 +static ssize_t
70697 +read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
70698 +{
70699 + DECLARE_WAITQUEUE(wait, current);
70700 + ssize_t retval = 0;
70701 +
70702 + add_wait_queue(&learn_wait, &wait);
70703 + set_current_state(TASK_INTERRUPTIBLE);
70704 + do {
70705 + mutex_lock(&gr_learn_user_mutex);
70706 + spin_lock(&gr_learn_lock);
70707 + if (learn_buffer_len)
70708 + break;
70709 + spin_unlock(&gr_learn_lock);
70710 + mutex_unlock(&gr_learn_user_mutex);
70711 + if (file->f_flags & O_NONBLOCK) {
70712 + retval = -EAGAIN;
70713 + goto out;
70714 + }
70715 + if (signal_pending(current)) {
70716 + retval = -ERESTARTSYS;
70717 + goto out;
70718 + }
70719 +
70720 + schedule();
70721 + } while (1);
70722 +
70723 + memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
70724 + learn_buffer_user_len = learn_buffer_len;
70725 + retval = learn_buffer_len;
70726 + learn_buffer_len = 0;
70727 +
70728 + spin_unlock(&gr_learn_lock);
70729 +
70730 + if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
70731 + retval = -EFAULT;
70732 +
70733 + mutex_unlock(&gr_learn_user_mutex);
70734 +out:
70735 + set_current_state(TASK_RUNNING);
70736 + remove_wait_queue(&learn_wait, &wait);
70737 + return retval;
70738 +}
70739 +
70740 +static unsigned int
70741 +poll_learn(struct file * file, poll_table * wait)
70742 +{
70743 + poll_wait(file, &learn_wait, wait);
70744 +
70745 + if (learn_buffer_len)
70746 + return (POLLIN | POLLRDNORM);
70747 +
70748 + return 0;
70749 +}
70750 +
70751 +void
70752 +gr_clear_learn_entries(void)
70753 +{
70754 + char *tmp;
70755 +
70756 + mutex_lock(&gr_learn_user_mutex);
70757 + spin_lock(&gr_learn_lock);
70758 + tmp = learn_buffer;
70759 + learn_buffer = NULL;
70760 + spin_unlock(&gr_learn_lock);
70761 + if (tmp)
70762 + vfree(tmp);
70763 + if (learn_buffer_user != NULL) {
70764 + vfree(learn_buffer_user);
70765 + learn_buffer_user = NULL;
70766 + }
70767 + learn_buffer_len = 0;
70768 + mutex_unlock(&gr_learn_user_mutex);
70769 +
70770 + return;
70771 +}
70772 +
70773 +void
70774 +gr_add_learn_entry(const char *fmt, ...)
70775 +{
70776 + va_list args;
70777 + unsigned int len;
70778 +
70779 + if (!gr_learn_attached)
70780 + return;
70781 +
70782 + spin_lock(&gr_learn_lock);
70783 +
70784 + /* leave a gap at the end so we know when it's "full" but don't have to
70785 + compute the exact length of the string we're trying to append
70786 + */
70787 + if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
70788 + spin_unlock(&gr_learn_lock);
70789 + wake_up_interruptible(&learn_wait);
70790 + return;
70791 + }
70792 + if (learn_buffer == NULL) {
70793 + spin_unlock(&gr_learn_lock);
70794 + return;
70795 + }
70796 +
70797 + va_start(args, fmt);
70798 + len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
70799 + va_end(args);
70800 +
70801 + learn_buffer_len += len + 1;
70802 +
70803 + spin_unlock(&gr_learn_lock);
70804 + wake_up_interruptible(&learn_wait);
70805 +
70806 + return;
70807 +}
70808 +
70809 +static int
70810 +open_learn(struct inode *inode, struct file *file)
70811 +{
70812 + if (file->f_mode & FMODE_READ && gr_learn_attached)
70813 + return -EBUSY;
70814 + if (file->f_mode & FMODE_READ) {
70815 + int retval = 0;
70816 + mutex_lock(&gr_learn_user_mutex);
70817 + if (learn_buffer == NULL)
70818 + learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
70819 + if (learn_buffer_user == NULL)
70820 + learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
70821 + if (learn_buffer == NULL) {
70822 + retval = -ENOMEM;
70823 + goto out_error;
70824 + }
70825 + if (learn_buffer_user == NULL) {
70826 + retval = -ENOMEM;
70827 + goto out_error;
70828 + }
70829 + learn_buffer_len = 0;
70830 + learn_buffer_user_len = 0;
70831 + gr_learn_attached = 1;
70832 +out_error:
70833 + mutex_unlock(&gr_learn_user_mutex);
70834 + return retval;
70835 + }
70836 + return 0;
70837 +}
70838 +
70839 +static int
70840 +close_learn(struct inode *inode, struct file *file)
70841 +{
70842 + if (file->f_mode & FMODE_READ) {
70843 + char *tmp = NULL;
70844 + mutex_lock(&gr_learn_user_mutex);
70845 + spin_lock(&gr_learn_lock);
70846 + tmp = learn_buffer;
70847 + learn_buffer = NULL;
70848 + spin_unlock(&gr_learn_lock);
70849 + if (tmp)
70850 + vfree(tmp);
70851 + if (learn_buffer_user != NULL) {
70852 + vfree(learn_buffer_user);
70853 + learn_buffer_user = NULL;
70854 + }
70855 + learn_buffer_len = 0;
70856 + learn_buffer_user_len = 0;
70857 + gr_learn_attached = 0;
70858 + mutex_unlock(&gr_learn_user_mutex);
70859 + }
70860 +
70861 + return 0;
70862 +}
70863 +
70864 +const struct file_operations grsec_fops = {
70865 + .read = read_learn,
70866 + .write = write_grsec_handler,
70867 + .open = open_learn,
70868 + .release = close_learn,
70869 + .poll = poll_learn,
70870 +};
70871 diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
70872 new file mode 100644
70873 index 0000000..361a099
70874 --- /dev/null
70875 +++ b/grsecurity/gracl_policy.c
70876 @@ -0,0 +1,1782 @@
70877 +#include <linux/kernel.h>
70878 +#include <linux/module.h>
70879 +#include <linux/sched.h>
70880 +#include <linux/mm.h>
70881 +#include <linux/file.h>
70882 +#include <linux/fs.h>
70883 +#include <linux/namei.h>
70884 +#include <linux/mount.h>
70885 +#include <linux/tty.h>
70886 +#include <linux/proc_fs.h>
70887 +#include <linux/lglock.h>
70888 +#include <linux/slab.h>
70889 +#include <linux/vmalloc.h>
70890 +#include <linux/types.h>
70891 +#include <linux/sysctl.h>
70892 +#include <linux/netdevice.h>
70893 +#include <linux/ptrace.h>
70894 +#include <linux/gracl.h>
70895 +#include <linux/gralloc.h>
70896 +#include <linux/security.h>
70897 +#include <linux/grinternal.h>
70898 +#include <linux/pid_namespace.h>
70899 +#include <linux/stop_machine.h>
70900 +#include <linux/fdtable.h>
70901 +#include <linux/percpu.h>
70902 +#include <linux/lglock.h>
70903 +#include <linux/hugetlb.h>
70904 +#include <linux/posix-timers.h>
70905 +#include "../fs/mount.h"
70906 +
70907 +#include <asm/uaccess.h>
70908 +#include <asm/errno.h>
70909 +#include <asm/mman.h>
70910 +
70911 +extern struct gr_policy_state *polstate;
70912 +
70913 +#define FOR_EACH_ROLE_START(role) \
70914 + role = polstate->role_list; \
70915 + while (role) {
70916 +
70917 +#define FOR_EACH_ROLE_END(role) \
70918 + role = role->prev; \
70919 + }
70920 +
70921 +struct path gr_real_root;
70922 +
70923 +extern struct gr_alloc_state *current_alloc_state;
70924 +
70925 +u16 acl_sp_role_value;
70926 +
70927 +static DEFINE_MUTEX(gr_dev_mutex);
70928 +
70929 +extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
70930 +extern void gr_clear_learn_entries(void);
70931 +
70932 +static struct gr_arg gr_usermode;
70933 +static unsigned char gr_system_salt[GR_SALT_LEN];
70934 +static unsigned char gr_system_sum[GR_SHA_LEN];
70935 +
70936 +static unsigned int gr_auth_attempts = 0;
70937 +static unsigned long gr_auth_expires = 0UL;
70938 +
70939 +struct acl_object_label *fakefs_obj_rw;
70940 +struct acl_object_label *fakefs_obj_rwx;
70941 +
70942 +extern int gr_init_uidset(void);
70943 +extern void gr_free_uidset(void);
70944 +extern void gr_remove_uid(uid_t uid);
70945 +extern int gr_find_uid(uid_t uid);
70946 +
70947 +extern struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename);
70948 +extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
70949 +extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
70950 +extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
70951 +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);
70952 +extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
70953 +extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
70954 +extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
70955 +extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
70956 +extern struct acl_subject_label *lookup_acl_subj_label(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
70957 +extern struct acl_subject_label *lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
70958 +extern void assign_special_role(const char *rolename);
70959 +extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
70960 +extern int gr_rbac_disable(void *unused);
70961 +extern void gr_enable_rbac_system(void);
70962 +
70963 +static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
70964 +{
70965 + if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
70966 + return -EFAULT;
70967 +
70968 + return 0;
70969 +}
70970 +
70971 +static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
70972 +{
70973 + if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
70974 + return -EFAULT;
70975 +
70976 + return 0;
70977 +}
70978 +
70979 +static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
70980 +{
70981 + if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
70982 + return -EFAULT;
70983 +
70984 + return 0;
70985 +}
70986 +
70987 +static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
70988 +{
70989 + if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
70990 + return -EFAULT;
70991 +
70992 + return 0;
70993 +}
70994 +
70995 +static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
70996 +{
70997 + if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
70998 + return -EFAULT;
70999 +
71000 + return 0;
71001 +}
71002 +
71003 +static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
71004 +{
71005 + if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
71006 + return -EFAULT;
71007 +
71008 + return 0;
71009 +}
71010 +
71011 +static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
71012 +{
71013 + if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
71014 + return -EFAULT;
71015 +
71016 + return 0;
71017 +}
71018 +
71019 +static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
71020 +{
71021 + if (copy_from_user(trans, userp, sizeof(struct role_transition)))
71022 + return -EFAULT;
71023 +
71024 + return 0;
71025 +}
71026 +
71027 +int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
71028 +{
71029 + if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
71030 + return -EFAULT;
71031 +
71032 + return 0;
71033 +}
71034 +
71035 +static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
71036 +{
71037 + if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
71038 + return -EFAULT;
71039 +
71040 + if (((uwrap->version != GRSECURITY_VERSION) &&
71041 + (uwrap->version != 0x2901)) ||
71042 + (uwrap->size != sizeof(struct gr_arg)))
71043 + return -EINVAL;
71044 +
71045 + return 0;
71046 +}
71047 +
71048 +static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
71049 +{
71050 + if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
71051 + return -EFAULT;
71052 +
71053 + return 0;
71054 +}
71055 +
71056 +static size_t get_gr_arg_wrapper_size_normal(void)
71057 +{
71058 + return sizeof(struct gr_arg_wrapper);
71059 +}
71060 +
71061 +#ifdef CONFIG_COMPAT
71062 +extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
71063 +extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
71064 +extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
71065 +extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
71066 +extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
71067 +extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
71068 +extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
71069 +extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
71070 +extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
71071 +extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
71072 +extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
71073 +extern size_t get_gr_arg_wrapper_size_compat(void);
71074 +
71075 +int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
71076 +int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
71077 +int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
71078 +int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
71079 +int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
71080 +int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
71081 +int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
71082 +int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
71083 +int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
71084 +int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
71085 +int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
71086 +size_t (* get_gr_arg_wrapper_size)(void) __read_only;
71087 +
71088 +#else
71089 +#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
71090 +#define copy_gr_arg copy_gr_arg_normal
71091 +#define copy_gr_hash_struct copy_gr_hash_struct_normal
71092 +#define copy_acl_object_label copy_acl_object_label_normal
71093 +#define copy_acl_subject_label copy_acl_subject_label_normal
71094 +#define copy_acl_role_label copy_acl_role_label_normal
71095 +#define copy_acl_ip_label copy_acl_ip_label_normal
71096 +#define copy_pointer_from_array copy_pointer_from_array_normal
71097 +#define copy_sprole_pw copy_sprole_pw_normal
71098 +#define copy_role_transition copy_role_transition_normal
71099 +#define copy_role_allowed_ip copy_role_allowed_ip_normal
71100 +#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
71101 +#endif
71102 +
71103 +static struct acl_subject_label *
71104 +lookup_subject_map(const struct acl_subject_label *userp)
71105 +{
71106 + unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
71107 + struct subject_map *match;
71108 +
71109 + match = polstate->subj_map_set.s_hash[index];
71110 +
71111 + while (match && match->user != userp)
71112 + match = match->next;
71113 +
71114 + if (match != NULL)
71115 + return match->kernel;
71116 + else
71117 + return NULL;
71118 +}
71119 +
71120 +static void
71121 +insert_subj_map_entry(struct subject_map *subjmap)
71122 +{
71123 + unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
71124 + struct subject_map **curr;
71125 +
71126 + subjmap->prev = NULL;
71127 +
71128 + curr = &polstate->subj_map_set.s_hash[index];
71129 + if (*curr != NULL)
71130 + (*curr)->prev = subjmap;
71131 +
71132 + subjmap->next = *curr;
71133 + *curr = subjmap;
71134 +
71135 + return;
71136 +}
71137 +
71138 +static void
71139 +__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
71140 +{
71141 + unsigned int index =
71142 + gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
71143 + struct acl_role_label **curr;
71144 + struct acl_role_label *tmp, *tmp2;
71145 +
71146 + curr = &polstate->acl_role_set.r_hash[index];
71147 +
71148 + /* simple case, slot is empty, just set it to our role */
71149 + if (*curr == NULL) {
71150 + *curr = role;
71151 + } else {
71152 + /* example:
71153 + 1 -> 2 -> 3 (adding 2 -> 3 to here)
71154 + 2 -> 3
71155 + */
71156 + /* first check to see if we can already be reached via this slot */
71157 + tmp = *curr;
71158 + while (tmp && tmp != role)
71159 + tmp = tmp->next;
71160 + if (tmp == role) {
71161 + /* we don't need to add ourselves to this slot's chain */
71162 + return;
71163 + }
71164 + /* we need to add ourselves to this chain, two cases */
71165 + if (role->next == NULL) {
71166 + /* simple case, append the current chain to our role */
71167 + role->next = *curr;
71168 + *curr = role;
71169 + } else {
71170 + /* 1 -> 2 -> 3 -> 4
71171 + 2 -> 3 -> 4
71172 + 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
71173 + */
71174 + /* trickier case: walk our role's chain until we find
71175 + the role for the start of the current slot's chain */
71176 + tmp = role;
71177 + tmp2 = *curr;
71178 + while (tmp->next && tmp->next != tmp2)
71179 + tmp = tmp->next;
71180 + if (tmp->next == tmp2) {
71181 + /* from example above, we found 3, so just
71182 + replace this slot's chain with ours */
71183 + *curr = role;
71184 + } else {
71185 + /* we didn't find a subset of our role's chain
71186 + in the current slot's chain, so append their
71187 + chain to ours, and set us as the first role in
71188 + the slot's chain
71189 +
71190 + we could fold this case with the case above,
71191 + but making it explicit for clarity
71192 + */
71193 + tmp->next = tmp2;
71194 + *curr = role;
71195 + }
71196 + }
71197 + }
71198 +
71199 + return;
71200 +}
71201 +
71202 +static void
71203 +insert_acl_role_label(struct acl_role_label *role)
71204 +{
71205 + int i;
71206 +
71207 + if (polstate->role_list == NULL) {
71208 + polstate->role_list = role;
71209 + role->prev = NULL;
71210 + } else {
71211 + role->prev = polstate->role_list;
71212 + polstate->role_list = role;
71213 + }
71214 +
71215 + /* used for hash chains */
71216 + role->next = NULL;
71217 +
71218 + if (role->roletype & GR_ROLE_DOMAIN) {
71219 + for (i = 0; i < role->domain_child_num; i++)
71220 + __insert_acl_role_label(role, role->domain_children[i]);
71221 + } else
71222 + __insert_acl_role_label(role, role->uidgid);
71223 +}
71224 +
71225 +static int
71226 +insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
71227 +{
71228 + struct name_entry **curr, *nentry;
71229 + struct inodev_entry *ientry;
71230 + unsigned int len = strlen(name);
71231 + unsigned int key = full_name_hash(name, len);
71232 + unsigned int index = key % polstate->name_set.n_size;
71233 +
71234 + curr = &polstate->name_set.n_hash[index];
71235 +
71236 + while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
71237 + curr = &((*curr)->next);
71238 +
71239 + if (*curr != NULL)
71240 + return 1;
71241 +
71242 + nentry = acl_alloc(sizeof (struct name_entry));
71243 + if (nentry == NULL)
71244 + return 0;
71245 + ientry = acl_alloc(sizeof (struct inodev_entry));
71246 + if (ientry == NULL)
71247 + return 0;
71248 + ientry->nentry = nentry;
71249 +
71250 + nentry->key = key;
71251 + nentry->name = name;
71252 + nentry->inode = inode;
71253 + nentry->device = device;
71254 + nentry->len = len;
71255 + nentry->deleted = deleted;
71256 +
71257 + nentry->prev = NULL;
71258 + curr = &polstate->name_set.n_hash[index];
71259 + if (*curr != NULL)
71260 + (*curr)->prev = nentry;
71261 + nentry->next = *curr;
71262 + *curr = nentry;
71263 +
71264 + /* insert us into the table searchable by inode/dev */
71265 + __insert_inodev_entry(polstate, ientry);
71266 +
71267 + return 1;
71268 +}
71269 +
71270 +/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
71271 +
71272 +static void *
71273 +create_table(__u32 * len, int elementsize)
71274 +{
71275 + unsigned int table_sizes[] = {
71276 + 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
71277 + 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
71278 + 4194301, 8388593, 16777213, 33554393, 67108859
71279 + };
71280 + void *newtable = NULL;
71281 + unsigned int pwr = 0;
71282 +
71283 + while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
71284 + table_sizes[pwr] <= *len)
71285 + pwr++;
71286 +
71287 + if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
71288 + return newtable;
71289 +
71290 + if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
71291 + newtable =
71292 + kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
71293 + else
71294 + newtable = vmalloc(table_sizes[pwr] * elementsize);
71295 +
71296 + *len = table_sizes[pwr];
71297 +
71298 + return newtable;
71299 +}
71300 +
71301 +static int
71302 +init_variables(const struct gr_arg *arg, bool reload)
71303 +{
71304 + struct task_struct *reaper = init_pid_ns.child_reaper;
71305 + unsigned int stacksize;
71306 +
71307 + polstate->subj_map_set.s_size = arg->role_db.num_subjects;
71308 + polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
71309 + polstate->name_set.n_size = arg->role_db.num_objects;
71310 + polstate->inodev_set.i_size = arg->role_db.num_objects;
71311 +
71312 + if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
71313 + !polstate->name_set.n_size || !polstate->inodev_set.i_size)
71314 + return 1;
71315 +
71316 + if (!reload) {
71317 + if (!gr_init_uidset())
71318 + return 1;
71319 + }
71320 +
71321 + /* set up the stack that holds allocation info */
71322 +
71323 + stacksize = arg->role_db.num_pointers + 5;
71324 +
71325 + if (!acl_alloc_stack_init(stacksize))
71326 + return 1;
71327 +
71328 + if (!reload) {
71329 + /* grab reference for the real root dentry and vfsmount */
71330 + get_fs_root(reaper->fs, &gr_real_root);
71331 +
71332 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
71333 + 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);
71334 +#endif
71335 +
71336 + fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
71337 + if (fakefs_obj_rw == NULL)
71338 + return 1;
71339 + fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
71340 +
71341 + fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
71342 + if (fakefs_obj_rwx == NULL)
71343 + return 1;
71344 + fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
71345 + }
71346 +
71347 + polstate->subj_map_set.s_hash =
71348 + (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
71349 + polstate->acl_role_set.r_hash =
71350 + (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
71351 + polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
71352 + polstate->inodev_set.i_hash =
71353 + (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
71354 +
71355 + if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
71356 + !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
71357 + return 1;
71358 +
71359 + memset(polstate->subj_map_set.s_hash, 0,
71360 + sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
71361 + memset(polstate->acl_role_set.r_hash, 0,
71362 + sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
71363 + memset(polstate->name_set.n_hash, 0,
71364 + sizeof (struct name_entry *) * polstate->name_set.n_size);
71365 + memset(polstate->inodev_set.i_hash, 0,
71366 + sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
71367 +
71368 + return 0;
71369 +}
71370 +
71371 +/* free information not needed after startup
71372 + currently contains user->kernel pointer mappings for subjects
71373 +*/
71374 +
71375 +static void
71376 +free_init_variables(void)
71377 +{
71378 + __u32 i;
71379 +
71380 + if (polstate->subj_map_set.s_hash) {
71381 + for (i = 0; i < polstate->subj_map_set.s_size; i++) {
71382 + if (polstate->subj_map_set.s_hash[i]) {
71383 + kfree(polstate->subj_map_set.s_hash[i]);
71384 + polstate->subj_map_set.s_hash[i] = NULL;
71385 + }
71386 + }
71387 +
71388 + if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
71389 + PAGE_SIZE)
71390 + kfree(polstate->subj_map_set.s_hash);
71391 + else
71392 + vfree(polstate->subj_map_set.s_hash);
71393 + }
71394 +
71395 + return;
71396 +}
71397 +
71398 +static void
71399 +free_variables(bool reload)
71400 +{
71401 + struct acl_subject_label *s;
71402 + struct acl_role_label *r;
71403 + struct task_struct *task, *task2;
71404 + unsigned int x;
71405 +
71406 + if (!reload) {
71407 + gr_clear_learn_entries();
71408 +
71409 + read_lock(&tasklist_lock);
71410 + do_each_thread(task2, task) {
71411 + task->acl_sp_role = 0;
71412 + task->acl_role_id = 0;
71413 + task->inherited = 0;
71414 + task->acl = NULL;
71415 + task->role = NULL;
71416 + } while_each_thread(task2, task);
71417 + read_unlock(&tasklist_lock);
71418 +
71419 + kfree(fakefs_obj_rw);
71420 + fakefs_obj_rw = NULL;
71421 + kfree(fakefs_obj_rwx);
71422 + fakefs_obj_rwx = NULL;
71423 +
71424 + /* release the reference to the real root dentry and vfsmount */
71425 + path_put(&gr_real_root);
71426 + memset(&gr_real_root, 0, sizeof(gr_real_root));
71427 + }
71428 +
71429 + /* free all object hash tables */
71430 +
71431 + FOR_EACH_ROLE_START(r)
71432 + if (r->subj_hash == NULL)
71433 + goto next_role;
71434 + FOR_EACH_SUBJECT_START(r, s, x)
71435 + if (s->obj_hash == NULL)
71436 + break;
71437 + if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
71438 + kfree(s->obj_hash);
71439 + else
71440 + vfree(s->obj_hash);
71441 + FOR_EACH_SUBJECT_END(s, x)
71442 + FOR_EACH_NESTED_SUBJECT_START(r, s)
71443 + if (s->obj_hash == NULL)
71444 + break;
71445 + if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
71446 + kfree(s->obj_hash);
71447 + else
71448 + vfree(s->obj_hash);
71449 + FOR_EACH_NESTED_SUBJECT_END(s)
71450 + if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
71451 + kfree(r->subj_hash);
71452 + else
71453 + vfree(r->subj_hash);
71454 + r->subj_hash = NULL;
71455 +next_role:
71456 + FOR_EACH_ROLE_END(r)
71457 +
71458 + acl_free_all();
71459 +
71460 + if (polstate->acl_role_set.r_hash) {
71461 + if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
71462 + PAGE_SIZE)
71463 + kfree(polstate->acl_role_set.r_hash);
71464 + else
71465 + vfree(polstate->acl_role_set.r_hash);
71466 + }
71467 + if (polstate->name_set.n_hash) {
71468 + if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
71469 + PAGE_SIZE)
71470 + kfree(polstate->name_set.n_hash);
71471 + else
71472 + vfree(polstate->name_set.n_hash);
71473 + }
71474 +
71475 + if (polstate->inodev_set.i_hash) {
71476 + if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
71477 + PAGE_SIZE)
71478 + kfree(polstate->inodev_set.i_hash);
71479 + else
71480 + vfree(polstate->inodev_set.i_hash);
71481 + }
71482 +
71483 + if (!reload)
71484 + gr_free_uidset();
71485 +
71486 + memset(&polstate->name_set, 0, sizeof (struct name_db));
71487 + memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
71488 + memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
71489 + memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
71490 +
71491 + polstate->default_role = NULL;
71492 + polstate->kernel_role = NULL;
71493 + polstate->role_list = NULL;
71494 +
71495 + return;
71496 +}
71497 +
71498 +static struct acl_subject_label *
71499 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
71500 +
71501 +static int alloc_and_copy_string(char **name, unsigned int maxlen)
71502 +{
71503 + unsigned int len = strnlen_user(*name, maxlen);
71504 + char *tmp;
71505 +
71506 + if (!len || len >= maxlen)
71507 + return -EINVAL;
71508 +
71509 + if ((tmp = (char *) acl_alloc(len)) == NULL)
71510 + return -ENOMEM;
71511 +
71512 + if (copy_from_user(tmp, *name, len))
71513 + return -EFAULT;
71514 +
71515 + tmp[len-1] = '\0';
71516 + *name = tmp;
71517 +
71518 + return 0;
71519 +}
71520 +
71521 +static int
71522 +copy_user_glob(struct acl_object_label *obj)
71523 +{
71524 + struct acl_object_label *g_tmp, **guser;
71525 + int error;
71526 +
71527 + if (obj->globbed == NULL)
71528 + return 0;
71529 +
71530 + guser = &obj->globbed;
71531 + while (*guser) {
71532 + g_tmp = (struct acl_object_label *)
71533 + acl_alloc(sizeof (struct acl_object_label));
71534 + if (g_tmp == NULL)
71535 + return -ENOMEM;
71536 +
71537 + if (copy_acl_object_label(g_tmp, *guser))
71538 + return -EFAULT;
71539 +
71540 + error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
71541 + if (error)
71542 + return error;
71543 +
71544 + *guser = g_tmp;
71545 + guser = &(g_tmp->next);
71546 + }
71547 +
71548 + return 0;
71549 +}
71550 +
71551 +static int
71552 +copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
71553 + struct acl_role_label *role)
71554 +{
71555 + struct acl_object_label *o_tmp;
71556 + int ret;
71557 +
71558 + while (userp) {
71559 + if ((o_tmp = (struct acl_object_label *)
71560 + acl_alloc(sizeof (struct acl_object_label))) == NULL)
71561 + return -ENOMEM;
71562 +
71563 + if (copy_acl_object_label(o_tmp, userp))
71564 + return -EFAULT;
71565 +
71566 + userp = o_tmp->prev;
71567 +
71568 + ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
71569 + if (ret)
71570 + return ret;
71571 +
71572 + insert_acl_obj_label(o_tmp, subj);
71573 + if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
71574 + o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
71575 + return -ENOMEM;
71576 +
71577 + ret = copy_user_glob(o_tmp);
71578 + if (ret)
71579 + return ret;
71580 +
71581 + if (o_tmp->nested) {
71582 + int already_copied;
71583 +
71584 + o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
71585 + if (IS_ERR(o_tmp->nested))
71586 + return PTR_ERR(o_tmp->nested);
71587 +
71588 + /* insert into nested subject list if we haven't copied this one yet
71589 + to prevent duplicate entries */
71590 + if (!already_copied) {
71591 + o_tmp->nested->next = role->hash->first;
71592 + role->hash->first = o_tmp->nested;
71593 + }
71594 + }
71595 + }
71596 +
71597 + return 0;
71598 +}
71599 +
71600 +static __u32
71601 +count_user_subjs(struct acl_subject_label *userp)
71602 +{
71603 + struct acl_subject_label s_tmp;
71604 + __u32 num = 0;
71605 +
71606 + while (userp) {
71607 + if (copy_acl_subject_label(&s_tmp, userp))
71608 + break;
71609 +
71610 + userp = s_tmp.prev;
71611 + }
71612 +
71613 + return num;
71614 +}
71615 +
71616 +static int
71617 +copy_user_allowedips(struct acl_role_label *rolep)
71618 +{
71619 + struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
71620 +
71621 + ruserip = rolep->allowed_ips;
71622 +
71623 + while (ruserip) {
71624 + rlast = rtmp;
71625 +
71626 + if ((rtmp = (struct role_allowed_ip *)
71627 + acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
71628 + return -ENOMEM;
71629 +
71630 + if (copy_role_allowed_ip(rtmp, ruserip))
71631 + return -EFAULT;
71632 +
71633 + ruserip = rtmp->prev;
71634 +
71635 + if (!rlast) {
71636 + rtmp->prev = NULL;
71637 + rolep->allowed_ips = rtmp;
71638 + } else {
71639 + rlast->next = rtmp;
71640 + rtmp->prev = rlast;
71641 + }
71642 +
71643 + if (!ruserip)
71644 + rtmp->next = NULL;
71645 + }
71646 +
71647 + return 0;
71648 +}
71649 +
71650 +static int
71651 +copy_user_transitions(struct acl_role_label *rolep)
71652 +{
71653 + struct role_transition *rusertp, *rtmp = NULL, *rlast;
71654 + int error;
71655 +
71656 + rusertp = rolep->transitions;
71657 +
71658 + while (rusertp) {
71659 + rlast = rtmp;
71660 +
71661 + if ((rtmp = (struct role_transition *)
71662 + acl_alloc(sizeof (struct role_transition))) == NULL)
71663 + return -ENOMEM;
71664 +
71665 + if (copy_role_transition(rtmp, rusertp))
71666 + return -EFAULT;
71667 +
71668 + rusertp = rtmp->prev;
71669 +
71670 + error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
71671 + if (error)
71672 + return error;
71673 +
71674 + if (!rlast) {
71675 + rtmp->prev = NULL;
71676 + rolep->transitions = rtmp;
71677 + } else {
71678 + rlast->next = rtmp;
71679 + rtmp->prev = rlast;
71680 + }
71681 +
71682 + if (!rusertp)
71683 + rtmp->next = NULL;
71684 + }
71685 +
71686 + return 0;
71687 +}
71688 +
71689 +static __u32 count_user_objs(const struct acl_object_label __user *userp)
71690 +{
71691 + struct acl_object_label o_tmp;
71692 + __u32 num = 0;
71693 +
71694 + while (userp) {
71695 + if (copy_acl_object_label(&o_tmp, userp))
71696 + break;
71697 +
71698 + userp = o_tmp.prev;
71699 + num++;
71700 + }
71701 +
71702 + return num;
71703 +}
71704 +
71705 +static struct acl_subject_label *
71706 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
71707 +{
71708 + struct acl_subject_label *s_tmp = NULL, *s_tmp2;
71709 + __u32 num_objs;
71710 + struct acl_ip_label **i_tmp, *i_utmp2;
71711 + struct gr_hash_struct ghash;
71712 + struct subject_map *subjmap;
71713 + unsigned int i_num;
71714 + int err;
71715 +
71716 + if (already_copied != NULL)
71717 + *already_copied = 0;
71718 +
71719 + s_tmp = lookup_subject_map(userp);
71720 +
71721 + /* we've already copied this subject into the kernel, just return
71722 + the reference to it, and don't copy it over again
71723 + */
71724 + if (s_tmp) {
71725 + if (already_copied != NULL)
71726 + *already_copied = 1;
71727 + return(s_tmp);
71728 + }
71729 +
71730 + if ((s_tmp = (struct acl_subject_label *)
71731 + acl_alloc(sizeof (struct acl_subject_label))) == NULL)
71732 + return ERR_PTR(-ENOMEM);
71733 +
71734 + subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
71735 + if (subjmap == NULL)
71736 + return ERR_PTR(-ENOMEM);
71737 +
71738 + subjmap->user = userp;
71739 + subjmap->kernel = s_tmp;
71740 + insert_subj_map_entry(subjmap);
71741 +
71742 + if (copy_acl_subject_label(s_tmp, userp))
71743 + return ERR_PTR(-EFAULT);
71744 +
71745 + err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
71746 + if (err)
71747 + return ERR_PTR(err);
71748 +
71749 + if (!strcmp(s_tmp->filename, "/"))
71750 + role->root_label = s_tmp;
71751 +
71752 + if (copy_gr_hash_struct(&ghash, s_tmp->hash))
71753 + return ERR_PTR(-EFAULT);
71754 +
71755 + /* copy user and group transition tables */
71756 +
71757 + if (s_tmp->user_trans_num) {
71758 + uid_t *uidlist;
71759 +
71760 + uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
71761 + if (uidlist == NULL)
71762 + return ERR_PTR(-ENOMEM);
71763 + if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
71764 + return ERR_PTR(-EFAULT);
71765 +
71766 + s_tmp->user_transitions = uidlist;
71767 + }
71768 +
71769 + if (s_tmp->group_trans_num) {
71770 + gid_t *gidlist;
71771 +
71772 + gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
71773 + if (gidlist == NULL)
71774 + return ERR_PTR(-ENOMEM);
71775 + if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
71776 + return ERR_PTR(-EFAULT);
71777 +
71778 + s_tmp->group_transitions = gidlist;
71779 + }
71780 +
71781 + /* set up object hash table */
71782 + num_objs = count_user_objs(ghash.first);
71783 +
71784 + s_tmp->obj_hash_size = num_objs;
71785 + s_tmp->obj_hash =
71786 + (struct acl_object_label **)
71787 + create_table(&(s_tmp->obj_hash_size), sizeof(void *));
71788 +
71789 + if (!s_tmp->obj_hash)
71790 + return ERR_PTR(-ENOMEM);
71791 +
71792 + memset(s_tmp->obj_hash, 0,
71793 + s_tmp->obj_hash_size *
71794 + sizeof (struct acl_object_label *));
71795 +
71796 + /* add in objects */
71797 + err = copy_user_objs(ghash.first, s_tmp, role);
71798 +
71799 + if (err)
71800 + return ERR_PTR(err);
71801 +
71802 + /* set pointer for parent subject */
71803 + if (s_tmp->parent_subject) {
71804 + s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
71805 +
71806 + if (IS_ERR(s_tmp2))
71807 + return s_tmp2;
71808 +
71809 + s_tmp->parent_subject = s_tmp2;
71810 + }
71811 +
71812 + /* add in ip acls */
71813 +
71814 + if (!s_tmp->ip_num) {
71815 + s_tmp->ips = NULL;
71816 + goto insert;
71817 + }
71818 +
71819 + i_tmp =
71820 + (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
71821 + sizeof (struct acl_ip_label *));
71822 +
71823 + if (!i_tmp)
71824 + return ERR_PTR(-ENOMEM);
71825 +
71826 + for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
71827 + *(i_tmp + i_num) =
71828 + (struct acl_ip_label *)
71829 + acl_alloc(sizeof (struct acl_ip_label));
71830 + if (!*(i_tmp + i_num))
71831 + return ERR_PTR(-ENOMEM);
71832 +
71833 + if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
71834 + return ERR_PTR(-EFAULT);
71835 +
71836 + if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
71837 + return ERR_PTR(-EFAULT);
71838 +
71839 + if ((*(i_tmp + i_num))->iface == NULL)
71840 + continue;
71841 +
71842 + err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
71843 + if (err)
71844 + return ERR_PTR(err);
71845 + }
71846 +
71847 + s_tmp->ips = i_tmp;
71848 +
71849 +insert:
71850 + if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
71851 + s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
71852 + return ERR_PTR(-ENOMEM);
71853 +
71854 + return s_tmp;
71855 +}
71856 +
71857 +static int
71858 +copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
71859 +{
71860 + struct acl_subject_label s_pre;
71861 + struct acl_subject_label * ret;
71862 + int err;
71863 +
71864 + while (userp) {
71865 + if (copy_acl_subject_label(&s_pre, userp))
71866 + return -EFAULT;
71867 +
71868 + ret = do_copy_user_subj(userp, role, NULL);
71869 +
71870 + err = PTR_ERR(ret);
71871 + if (IS_ERR(ret))
71872 + return err;
71873 +
71874 + insert_acl_subj_label(ret, role);
71875 +
71876 + userp = s_pre.prev;
71877 + }
71878 +
71879 + return 0;
71880 +}
71881 +
71882 +static int
71883 +copy_user_acl(struct gr_arg *arg)
71884 +{
71885 + struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
71886 + struct acl_subject_label *subj_list;
71887 + struct sprole_pw *sptmp;
71888 + struct gr_hash_struct *ghash;
71889 + uid_t *domainlist;
71890 + unsigned int r_num;
71891 + int err = 0;
71892 + __u16 i;
71893 + __u32 num_subjs;
71894 +
71895 + /* we need a default and kernel role */
71896 + if (arg->role_db.num_roles < 2)
71897 + return -EINVAL;
71898 +
71899 + /* copy special role authentication info from userspace */
71900 +
71901 + polstate->num_sprole_pws = arg->num_sprole_pws;
71902 + polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
71903 +
71904 + if (!polstate->acl_special_roles && polstate->num_sprole_pws)
71905 + return -ENOMEM;
71906 +
71907 + for (i = 0; i < polstate->num_sprole_pws; i++) {
71908 + sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
71909 + if (!sptmp)
71910 + return -ENOMEM;
71911 + if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
71912 + return -EFAULT;
71913 +
71914 + err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
71915 + if (err)
71916 + return err;
71917 +
71918 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
71919 + printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
71920 +#endif
71921 +
71922 + polstate->acl_special_roles[i] = sptmp;
71923 + }
71924 +
71925 + r_utmp = (struct acl_role_label **) arg->role_db.r_table;
71926 +
71927 + for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
71928 + r_tmp = acl_alloc(sizeof (struct acl_role_label));
71929 +
71930 + if (!r_tmp)
71931 + return -ENOMEM;
71932 +
71933 + if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
71934 + return -EFAULT;
71935 +
71936 + if (copy_acl_role_label(r_tmp, r_utmp2))
71937 + return -EFAULT;
71938 +
71939 + err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
71940 + if (err)
71941 + return err;
71942 +
71943 + if (!strcmp(r_tmp->rolename, "default")
71944 + && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
71945 + polstate->default_role = r_tmp;
71946 + } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
71947 + polstate->kernel_role = r_tmp;
71948 + }
71949 +
71950 + if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
71951 + return -ENOMEM;
71952 +
71953 + if (copy_gr_hash_struct(ghash, r_tmp->hash))
71954 + return -EFAULT;
71955 +
71956 + r_tmp->hash = ghash;
71957 +
71958 + num_subjs = count_user_subjs(r_tmp->hash->first);
71959 +
71960 + r_tmp->subj_hash_size = num_subjs;
71961 + r_tmp->subj_hash =
71962 + (struct acl_subject_label **)
71963 + create_table(&(r_tmp->subj_hash_size), sizeof(void *));
71964 +
71965 + if (!r_tmp->subj_hash)
71966 + return -ENOMEM;
71967 +
71968 + err = copy_user_allowedips(r_tmp);
71969 + if (err)
71970 + return err;
71971 +
71972 + /* copy domain info */
71973 + if (r_tmp->domain_children != NULL) {
71974 + domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
71975 + if (domainlist == NULL)
71976 + return -ENOMEM;
71977 +
71978 + if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
71979 + return -EFAULT;
71980 +
71981 + r_tmp->domain_children = domainlist;
71982 + }
71983 +
71984 + err = copy_user_transitions(r_tmp);
71985 + if (err)
71986 + return err;
71987 +
71988 + memset(r_tmp->subj_hash, 0,
71989 + r_tmp->subj_hash_size *
71990 + sizeof (struct acl_subject_label *));
71991 +
71992 + /* acquire the list of subjects, then NULL out
71993 + the list prior to parsing the subjects for this role,
71994 + as during this parsing the list is replaced with a list
71995 + of *nested* subjects for the role
71996 + */
71997 + subj_list = r_tmp->hash->first;
71998 +
71999 + /* set nested subject list to null */
72000 + r_tmp->hash->first = NULL;
72001 +
72002 + err = copy_user_subjs(subj_list, r_tmp);
72003 +
72004 + if (err)
72005 + return err;
72006 +
72007 + insert_acl_role_label(r_tmp);
72008 + }
72009 +
72010 + if (polstate->default_role == NULL || polstate->kernel_role == NULL)
72011 + return -EINVAL;
72012 +
72013 + return err;
72014 +}
72015 +
72016 +static int gracl_reload_apply_policies(void *reload)
72017 +{
72018 + struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
72019 + struct task_struct *task, *task2;
72020 + struct acl_role_label *role, *rtmp;
72021 + struct acl_subject_label *subj;
72022 + const struct cred *cred;
72023 + int role_applied;
72024 + int ret = 0;
72025 +
72026 + memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
72027 + memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
72028 +
72029 + /* first make sure we'll be able to apply the new policy cleanly */
72030 + do_each_thread(task2, task) {
72031 + if (task->exec_file == NULL)
72032 + continue;
72033 + role_applied = 0;
72034 + if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
72035 + /* preserve special roles */
72036 + FOR_EACH_ROLE_START(role)
72037 + if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
72038 + rtmp = task->role;
72039 + task->role = role;
72040 + role_applied = 1;
72041 + break;
72042 + }
72043 + FOR_EACH_ROLE_END(role)
72044 + }
72045 + if (!role_applied) {
72046 + cred = __task_cred(task);
72047 + rtmp = task->role;
72048 + task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
72049 + }
72050 + /* this handles non-nested inherited subjects, nested subjects will still
72051 + be dropped currently */
72052 + subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
72053 + task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL);
72054 + /* change the role back so that we've made no modifications to the policy */
72055 + task->role = rtmp;
72056 +
72057 + if (subj == NULL || task->tmpacl == NULL) {
72058 + ret = -EINVAL;
72059 + goto out;
72060 + }
72061 + } while_each_thread(task2, task);
72062 +
72063 + /* now actually apply the policy */
72064 +
72065 + do_each_thread(task2, task) {
72066 + if (task->exec_file) {
72067 + role_applied = 0;
72068 + if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
72069 + /* preserve special roles */
72070 + FOR_EACH_ROLE_START(role)
72071 + if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
72072 + task->role = role;
72073 + role_applied = 1;
72074 + break;
72075 + }
72076 + FOR_EACH_ROLE_END(role)
72077 + }
72078 + if (!role_applied) {
72079 + cred = __task_cred(task);
72080 + task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
72081 + }
72082 + /* this handles non-nested inherited subjects, nested subjects will still
72083 + be dropped currently */
72084 + if (!reload_state->oldmode && task->inherited)
72085 + subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
72086 + else {
72087 + /* looked up and tagged to the task previously */
72088 + subj = task->tmpacl;
72089 + }
72090 + /* subj will be non-null */
72091 + __gr_apply_subject_to_task(polstate, task, subj);
72092 + if (reload_state->oldmode) {
72093 + task->acl_role_id = 0;
72094 + task->acl_sp_role = 0;
72095 + task->inherited = 0;
72096 + }
72097 + } else {
72098 + // it's a kernel process
72099 + task->role = polstate->kernel_role;
72100 + task->acl = polstate->kernel_role->root_label;
72101 +#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
72102 + task->acl->mode &= ~GR_PROCFIND;
72103 +#endif
72104 + }
72105 + } while_each_thread(task2, task);
72106 +
72107 + memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
72108 + memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
72109 +
72110 +out:
72111 +
72112 + return ret;
72113 +}
72114 +
72115 +static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
72116 +{
72117 + struct gr_reload_state new_reload_state = { };
72118 + int err;
72119 +
72120 + new_reload_state.oldpolicy_ptr = polstate;
72121 + new_reload_state.oldalloc_ptr = current_alloc_state;
72122 + new_reload_state.oldmode = oldmode;
72123 +
72124 + current_alloc_state = &new_reload_state.newalloc;
72125 + polstate = &new_reload_state.newpolicy;
72126 +
72127 + /* everything relevant is now saved off, copy in the new policy */
72128 + if (init_variables(args, true)) {
72129 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
72130 + err = -ENOMEM;
72131 + goto error;
72132 + }
72133 +
72134 + err = copy_user_acl(args);
72135 + free_init_variables();
72136 + if (err)
72137 + goto error;
72138 + /* the new policy is copied in, with the old policy available via saved_state
72139 + first go through applying roles, making sure to preserve special roles
72140 + then apply new subjects, making sure to preserve inherited and nested subjects,
72141 + though currently only inherited subjects will be preserved
72142 + */
72143 + err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
72144 + if (err)
72145 + goto error;
72146 +
72147 + /* we've now applied the new policy, so restore the old policy state to free it */
72148 + polstate = &new_reload_state.oldpolicy;
72149 + current_alloc_state = &new_reload_state.oldalloc;
72150 + free_variables(true);
72151 +
72152 + /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
72153 + to running_polstate/current_alloc_state inside stop_machine
72154 + */
72155 + err = 0;
72156 + goto out;
72157 +error:
72158 + /* on error of loading the new policy, we'll just keep the previous
72159 + policy set around
72160 + */
72161 + free_variables(true);
72162 +
72163 + /* doesn't affect runtime, but maintains consistent state */
72164 +out:
72165 + polstate = new_reload_state.oldpolicy_ptr;
72166 + current_alloc_state = new_reload_state.oldalloc_ptr;
72167 +
72168 + return err;
72169 +}
72170 +
72171 +static int
72172 +gracl_init(struct gr_arg *args)
72173 +{
72174 + int error = 0;
72175 +
72176 + memcpy(&gr_system_salt, args->salt, sizeof(gr_system_salt));
72177 + memcpy(&gr_system_sum, args->sum, sizeof(gr_system_sum));
72178 +
72179 + if (init_variables(args, false)) {
72180 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
72181 + error = -ENOMEM;
72182 + goto out;
72183 + }
72184 +
72185 + error = copy_user_acl(args);
72186 + free_init_variables();
72187 + if (error)
72188 + goto out;
72189 +
72190 + error = gr_set_acls(0);
72191 + if (error)
72192 + goto out;
72193 +
72194 + gr_enable_rbac_system();
72195 +
72196 + return 0;
72197 +
72198 +out:
72199 + free_variables(false);
72200 + return error;
72201 +}
72202 +
72203 +static int
72204 +lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
72205 + unsigned char **sum)
72206 +{
72207 + struct acl_role_label *r;
72208 + struct role_allowed_ip *ipp;
72209 + struct role_transition *trans;
72210 + unsigned int i;
72211 + int found = 0;
72212 + u32 curr_ip = current->signal->curr_ip;
72213 +
72214 + current->signal->saved_ip = curr_ip;
72215 +
72216 + /* check transition table */
72217 +
72218 + for (trans = current->role->transitions; trans; trans = trans->next) {
72219 + if (!strcmp(rolename, trans->rolename)) {
72220 + found = 1;
72221 + break;
72222 + }
72223 + }
72224 +
72225 + if (!found)
72226 + return 0;
72227 +
72228 + /* handle special roles that do not require authentication
72229 + and check ip */
72230 +
72231 + FOR_EACH_ROLE_START(r)
72232 + if (!strcmp(rolename, r->rolename) &&
72233 + (r->roletype & GR_ROLE_SPECIAL)) {
72234 + found = 0;
72235 + if (r->allowed_ips != NULL) {
72236 + for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
72237 + if ((ntohl(curr_ip) & ipp->netmask) ==
72238 + (ntohl(ipp->addr) & ipp->netmask))
72239 + found = 1;
72240 + }
72241 + } else
72242 + found = 2;
72243 + if (!found)
72244 + return 0;
72245 +
72246 + if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
72247 + ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
72248 + *salt = NULL;
72249 + *sum = NULL;
72250 + return 1;
72251 + }
72252 + }
72253 + FOR_EACH_ROLE_END(r)
72254 +
72255 + for (i = 0; i < polstate->num_sprole_pws; i++) {
72256 + if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
72257 + *salt = polstate->acl_special_roles[i]->salt;
72258 + *sum = polstate->acl_special_roles[i]->sum;
72259 + return 1;
72260 + }
72261 + }
72262 +
72263 + return 0;
72264 +}
72265 +
72266 +int gr_check_secure_terminal(struct task_struct *task)
72267 +{
72268 + struct task_struct *p, *p2, *p3;
72269 + struct files_struct *files;
72270 + struct fdtable *fdt;
72271 + struct file *our_file = NULL, *file;
72272 + int i;
72273 +
72274 + if (task->signal->tty == NULL)
72275 + return 1;
72276 +
72277 + files = get_files_struct(task);
72278 + if (files != NULL) {
72279 + rcu_read_lock();
72280 + fdt = files_fdtable(files);
72281 + for (i=0; i < fdt->max_fds; i++) {
72282 + file = fcheck_files(files, i);
72283 + if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
72284 + get_file(file);
72285 + our_file = file;
72286 + }
72287 + }
72288 + rcu_read_unlock();
72289 + put_files_struct(files);
72290 + }
72291 +
72292 + if (our_file == NULL)
72293 + return 1;
72294 +
72295 + read_lock(&tasklist_lock);
72296 + do_each_thread(p2, p) {
72297 + files = get_files_struct(p);
72298 + if (files == NULL ||
72299 + (p->signal && p->signal->tty == task->signal->tty)) {
72300 + if (files != NULL)
72301 + put_files_struct(files);
72302 + continue;
72303 + }
72304 + rcu_read_lock();
72305 + fdt = files_fdtable(files);
72306 + for (i=0; i < fdt->max_fds; i++) {
72307 + file = fcheck_files(files, i);
72308 + if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
72309 + file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
72310 + p3 = task;
72311 + while (task_pid_nr(p3) > 0) {
72312 + if (p3 == p)
72313 + break;
72314 + p3 = p3->real_parent;
72315 + }
72316 + if (p3 == p)
72317 + break;
72318 + gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
72319 + gr_handle_alertkill(p);
72320 + rcu_read_unlock();
72321 + put_files_struct(files);
72322 + read_unlock(&tasklist_lock);
72323 + fput(our_file);
72324 + return 0;
72325 + }
72326 + }
72327 + rcu_read_unlock();
72328 + put_files_struct(files);
72329 + } while_each_thread(p2, p);
72330 + read_unlock(&tasklist_lock);
72331 +
72332 + fput(our_file);
72333 + return 1;
72334 +}
72335 +
72336 +ssize_t
72337 +write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
72338 +{
72339 + struct gr_arg_wrapper uwrap;
72340 + unsigned char *sprole_salt = NULL;
72341 + unsigned char *sprole_sum = NULL;
72342 + int error = 0;
72343 + int error2 = 0;
72344 + size_t req_count = 0;
72345 + unsigned char oldmode = 0;
72346 +
72347 + mutex_lock(&gr_dev_mutex);
72348 +
72349 + if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
72350 + error = -EPERM;
72351 + goto out;
72352 + }
72353 +
72354 +#ifdef CONFIG_COMPAT
72355 + pax_open_kernel();
72356 + if (is_compat_task()) {
72357 + copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
72358 + copy_gr_arg = &copy_gr_arg_compat;
72359 + copy_acl_object_label = &copy_acl_object_label_compat;
72360 + copy_acl_subject_label = &copy_acl_subject_label_compat;
72361 + copy_acl_role_label = &copy_acl_role_label_compat;
72362 + copy_acl_ip_label = &copy_acl_ip_label_compat;
72363 + copy_role_allowed_ip = &copy_role_allowed_ip_compat;
72364 + copy_role_transition = &copy_role_transition_compat;
72365 + copy_sprole_pw = &copy_sprole_pw_compat;
72366 + copy_gr_hash_struct = &copy_gr_hash_struct_compat;
72367 + copy_pointer_from_array = &copy_pointer_from_array_compat;
72368 + get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
72369 + } else {
72370 + copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
72371 + copy_gr_arg = &copy_gr_arg_normal;
72372 + copy_acl_object_label = &copy_acl_object_label_normal;
72373 + copy_acl_subject_label = &copy_acl_subject_label_normal;
72374 + copy_acl_role_label = &copy_acl_role_label_normal;
72375 + copy_acl_ip_label = &copy_acl_ip_label_normal;
72376 + copy_role_allowed_ip = &copy_role_allowed_ip_normal;
72377 + copy_role_transition = &copy_role_transition_normal;
72378 + copy_sprole_pw = &copy_sprole_pw_normal;
72379 + copy_gr_hash_struct = &copy_gr_hash_struct_normal;
72380 + copy_pointer_from_array = &copy_pointer_from_array_normal;
72381 + get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
72382 + }
72383 + pax_close_kernel();
72384 +#endif
72385 +
72386 + req_count = get_gr_arg_wrapper_size();
72387 +
72388 + if (count != req_count) {
72389 + gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
72390 + error = -EINVAL;
72391 + goto out;
72392 + }
72393 +
72394 +
72395 + if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
72396 + gr_auth_expires = 0;
72397 + gr_auth_attempts = 0;
72398 + }
72399 +
72400 + error = copy_gr_arg_wrapper(buf, &uwrap);
72401 + if (error)
72402 + goto out;
72403 +
72404 + error = copy_gr_arg(uwrap.arg, &gr_usermode);
72405 + if (error)
72406 + goto out;
72407 +
72408 + if (gr_usermode.mode != GR_SPROLE && gr_usermode.mode != GR_SPROLEPAM &&
72409 + gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
72410 + time_after(gr_auth_expires, get_seconds())) {
72411 + error = -EBUSY;
72412 + goto out;
72413 + }
72414 +
72415 + /* if non-root trying to do anything other than use a special role,
72416 + do not attempt authentication, do not count towards authentication
72417 + locking
72418 + */
72419 +
72420 + if (gr_usermode.mode != GR_SPROLE && gr_usermode.mode != GR_STATUS &&
72421 + gr_usermode.mode != GR_UNSPROLE && gr_usermode.mode != GR_SPROLEPAM &&
72422 + gr_is_global_nonroot(current_uid())) {
72423 + error = -EPERM;
72424 + goto out;
72425 + }
72426 +
72427 + /* ensure pw and special role name are null terminated */
72428 +
72429 + gr_usermode.pw[GR_PW_LEN - 1] = '\0';
72430 + gr_usermode.sp_role[GR_SPROLE_LEN - 1] = '\0';
72431 +
72432 + /* Okay.
72433 + * We have our enough of the argument structure..(we have yet
72434 + * to copy_from_user the tables themselves) . Copy the tables
72435 + * only if we need them, i.e. for loading operations. */
72436 +
72437 + switch (gr_usermode.mode) {
72438 + case GR_STATUS:
72439 + if (gr_acl_is_enabled()) {
72440 + error = 1;
72441 + if (!gr_check_secure_terminal(current))
72442 + error = 3;
72443 + } else
72444 + error = 2;
72445 + goto out;
72446 + case GR_SHUTDOWN:
72447 + if (gr_acl_is_enabled() && !(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
72448 + stop_machine(gr_rbac_disable, NULL, NULL);
72449 + free_variables(false);
72450 + memset(&gr_usermode, 0, sizeof(gr_usermode));
72451 + memset(&gr_system_salt, 0, sizeof(gr_system_salt));
72452 + memset(&gr_system_sum, 0, sizeof(gr_system_sum));
72453 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
72454 + } else if (gr_acl_is_enabled()) {
72455 + gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
72456 + error = -EPERM;
72457 + } else {
72458 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
72459 + error = -EAGAIN;
72460 + }
72461 + break;
72462 + case GR_ENABLE:
72463 + if (!gr_acl_is_enabled() && !(error2 = gracl_init(&gr_usermode)))
72464 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
72465 + else {
72466 + if (gr_acl_is_enabled())
72467 + error = -EAGAIN;
72468 + else
72469 + error = error2;
72470 + gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
72471 + }
72472 + break;
72473 + case GR_OLDRELOAD:
72474 + oldmode = 1;
72475 + case GR_RELOAD:
72476 + if (!gr_acl_is_enabled()) {
72477 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
72478 + error = -EAGAIN;
72479 + } else if (!(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
72480 + error2 = gracl_reload(&gr_usermode, oldmode);
72481 + if (!error2)
72482 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
72483 + else {
72484 + gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
72485 + error = error2;
72486 + }
72487 + } else {
72488 + gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
72489 + error = -EPERM;
72490 + }
72491 + break;
72492 + case GR_SEGVMOD:
72493 + if (unlikely(!gr_acl_is_enabled())) {
72494 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
72495 + error = -EAGAIN;
72496 + break;
72497 + }
72498 +
72499 + if (!(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
72500 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
72501 + if (gr_usermode.segv_device && gr_usermode.segv_inode) {
72502 + struct acl_subject_label *segvacl;
72503 + segvacl =
72504 + lookup_acl_subj_label(gr_usermode.segv_inode,
72505 + gr_usermode.segv_device,
72506 + current->role);
72507 + if (segvacl) {
72508 + segvacl->crashes = 0;
72509 + segvacl->expires = 0;
72510 + }
72511 + } else if (gr_find_uid(gr_usermode.segv_uid) >= 0) {
72512 + gr_remove_uid(gr_usermode.segv_uid);
72513 + }
72514 + } else {
72515 + gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
72516 + error = -EPERM;
72517 + }
72518 + break;
72519 + case GR_SPROLE:
72520 + case GR_SPROLEPAM:
72521 + if (unlikely(!gr_acl_is_enabled())) {
72522 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
72523 + error = -EAGAIN;
72524 + break;
72525 + }
72526 +
72527 + if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
72528 + current->role->expires = 0;
72529 + current->role->auth_attempts = 0;
72530 + }
72531 +
72532 + if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
72533 + time_after(current->role->expires, get_seconds())) {
72534 + error = -EBUSY;
72535 + goto out;
72536 + }
72537 +
72538 + if (lookup_special_role_auth
72539 + (gr_usermode.mode, gr_usermode.sp_role, &sprole_salt, &sprole_sum)
72540 + && ((!sprole_salt && !sprole_sum)
72541 + || !(chkpw(&gr_usermode, sprole_salt, sprole_sum)))) {
72542 + char *p = "";
72543 + assign_special_role(gr_usermode.sp_role);
72544 + read_lock(&tasklist_lock);
72545 + if (current->real_parent)
72546 + p = current->real_parent->role->rolename;
72547 + read_unlock(&tasklist_lock);
72548 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
72549 + p, acl_sp_role_value);
72550 + } else {
72551 + gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode.sp_role);
72552 + error = -EPERM;
72553 + if(!(current->role->auth_attempts++))
72554 + current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
72555 +
72556 + goto out;
72557 + }
72558 + break;
72559 + case GR_UNSPROLE:
72560 + if (unlikely(!gr_acl_is_enabled())) {
72561 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
72562 + error = -EAGAIN;
72563 + break;
72564 + }
72565 +
72566 + if (current->role->roletype & GR_ROLE_SPECIAL) {
72567 + char *p = "";
72568 + int i = 0;
72569 +
72570 + read_lock(&tasklist_lock);
72571 + if (current->real_parent) {
72572 + p = current->real_parent->role->rolename;
72573 + i = current->real_parent->acl_role_id;
72574 + }
72575 + read_unlock(&tasklist_lock);
72576 +
72577 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
72578 + gr_set_acls(1);
72579 + } else {
72580 + error = -EPERM;
72581 + goto out;
72582 + }
72583 + break;
72584 + default:
72585 + gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode.mode);
72586 + error = -EINVAL;
72587 + break;
72588 + }
72589 +
72590 + if (error != -EPERM)
72591 + goto out;
72592 +
72593 + if(!(gr_auth_attempts++))
72594 + gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
72595 +
72596 + out:
72597 + mutex_unlock(&gr_dev_mutex);
72598 +
72599 + if (!error)
72600 + error = req_count;
72601 +
72602 + return error;
72603 +}
72604 +
72605 +int
72606 +gr_set_acls(const int type)
72607 +{
72608 + struct task_struct *task, *task2;
72609 + struct acl_role_label *role = current->role;
72610 + struct acl_subject_label *subj;
72611 + __u16 acl_role_id = current->acl_role_id;
72612 + const struct cred *cred;
72613 + int ret;
72614 +
72615 + rcu_read_lock();
72616 + read_lock(&tasklist_lock);
72617 + read_lock(&grsec_exec_file_lock);
72618 + do_each_thread(task2, task) {
72619 + /* check to see if we're called from the exit handler,
72620 + if so, only replace ACLs that have inherited the admin
72621 + ACL */
72622 +
72623 + if (type && (task->role != role ||
72624 + task->acl_role_id != acl_role_id))
72625 + continue;
72626 +
72627 + task->acl_role_id = 0;
72628 + task->acl_sp_role = 0;
72629 + task->inherited = 0;
72630 +
72631 + if (task->exec_file) {
72632 + cred = __task_cred(task);
72633 + task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
72634 + subj = __gr_get_subject_for_task(polstate, task, NULL);
72635 + if (subj == NULL) {
72636 + ret = -EINVAL;
72637 + read_unlock(&grsec_exec_file_lock);
72638 + read_unlock(&tasklist_lock);
72639 + rcu_read_unlock();
72640 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
72641 + return ret;
72642 + }
72643 + __gr_apply_subject_to_task(polstate, task, subj);
72644 + } else {
72645 + // it's a kernel process
72646 + task->role = polstate->kernel_role;
72647 + task->acl = polstate->kernel_role->root_label;
72648 +#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
72649 + task->acl->mode &= ~GR_PROCFIND;
72650 +#endif
72651 + }
72652 + } while_each_thread(task2, task);
72653 + read_unlock(&grsec_exec_file_lock);
72654 + read_unlock(&tasklist_lock);
72655 + rcu_read_unlock();
72656 +
72657 + return 0;
72658 +}
72659 diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
72660 new file mode 100644
72661 index 0000000..39645c9
72662 --- /dev/null
72663 +++ b/grsecurity/gracl_res.c
72664 @@ -0,0 +1,68 @@
72665 +#include <linux/kernel.h>
72666 +#include <linux/sched.h>
72667 +#include <linux/gracl.h>
72668 +#include <linux/grinternal.h>
72669 +
72670 +static const char *restab_log[] = {
72671 + [RLIMIT_CPU] = "RLIMIT_CPU",
72672 + [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
72673 + [RLIMIT_DATA] = "RLIMIT_DATA",
72674 + [RLIMIT_STACK] = "RLIMIT_STACK",
72675 + [RLIMIT_CORE] = "RLIMIT_CORE",
72676 + [RLIMIT_RSS] = "RLIMIT_RSS",
72677 + [RLIMIT_NPROC] = "RLIMIT_NPROC",
72678 + [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
72679 + [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
72680 + [RLIMIT_AS] = "RLIMIT_AS",
72681 + [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
72682 + [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
72683 + [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
72684 + [RLIMIT_NICE] = "RLIMIT_NICE",
72685 + [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
72686 + [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
72687 + [GR_CRASH_RES] = "RLIMIT_CRASH"
72688 +};
72689 +
72690 +void
72691 +gr_log_resource(const struct task_struct *task,
72692 + const int res, const unsigned long wanted, const int gt)
72693 +{
72694 + const struct cred *cred;
72695 + unsigned long rlim;
72696 +
72697 + if (!gr_acl_is_enabled() && !grsec_resource_logging)
72698 + return;
72699 +
72700 + // not yet supported resource
72701 + if (unlikely(!restab_log[res]))
72702 + return;
72703 +
72704 + if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
72705 + rlim = task_rlimit_max(task, res);
72706 + else
72707 + rlim = task_rlimit(task, res);
72708 +
72709 + if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
72710 + return;
72711 +
72712 + rcu_read_lock();
72713 + cred = __task_cred(task);
72714 +
72715 + if (res == RLIMIT_NPROC &&
72716 + (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
72717 + cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
72718 + goto out_rcu_unlock;
72719 + else if (res == RLIMIT_MEMLOCK &&
72720 + cap_raised(cred->cap_effective, CAP_IPC_LOCK))
72721 + goto out_rcu_unlock;
72722 + else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
72723 + goto out_rcu_unlock;
72724 + rcu_read_unlock();
72725 +
72726 + gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
72727 +
72728 + return;
72729 +out_rcu_unlock:
72730 + rcu_read_unlock();
72731 + return;
72732 +}
72733 diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
72734 new file mode 100644
72735 index 0000000..2040e61
72736 --- /dev/null
72737 +++ b/grsecurity/gracl_segv.c
72738 @@ -0,0 +1,313 @@
72739 +#include <linux/kernel.h>
72740 +#include <linux/mm.h>
72741 +#include <asm/uaccess.h>
72742 +#include <asm/errno.h>
72743 +#include <asm/mman.h>
72744 +#include <net/sock.h>
72745 +#include <linux/file.h>
72746 +#include <linux/fs.h>
72747 +#include <linux/net.h>
72748 +#include <linux/in.h>
72749 +#include <linux/slab.h>
72750 +#include <linux/types.h>
72751 +#include <linux/sched.h>
72752 +#include <linux/timer.h>
72753 +#include <linux/gracl.h>
72754 +#include <linux/grsecurity.h>
72755 +#include <linux/grinternal.h>
72756 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
72757 +#include <linux/magic.h>
72758 +#include <linux/pagemap.h>
72759 +#include "../fs/btrfs/async-thread.h"
72760 +#include "../fs/btrfs/ctree.h"
72761 +#include "../fs/btrfs/btrfs_inode.h"
72762 +#endif
72763 +
72764 +static struct crash_uid *uid_set;
72765 +static unsigned short uid_used;
72766 +static DEFINE_SPINLOCK(gr_uid_lock);
72767 +extern rwlock_t gr_inode_lock;
72768 +extern struct acl_subject_label *
72769 + lookup_acl_subj_label(const ino_t inode, const dev_t dev,
72770 + struct acl_role_label *role);
72771 +
72772 +static inline dev_t __get_dev(const struct dentry *dentry)
72773 +{
72774 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
72775 + if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
72776 + return BTRFS_I(dentry->d_inode)->root->anon_dev;
72777 + else
72778 +#endif
72779 + return dentry->d_sb->s_dev;
72780 +}
72781 +
72782 +int
72783 +gr_init_uidset(void)
72784 +{
72785 + uid_set =
72786 + kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
72787 + uid_used = 0;
72788 +
72789 + return uid_set ? 1 : 0;
72790 +}
72791 +
72792 +void
72793 +gr_free_uidset(void)
72794 +{
72795 + if (uid_set) {
72796 + struct crash_uid *tmpset;
72797 + spin_lock(&gr_uid_lock);
72798 + tmpset = uid_set;
72799 + uid_set = NULL;
72800 + uid_used = 0;
72801 + spin_unlock(&gr_uid_lock);
72802 + if (tmpset)
72803 + kfree(tmpset);
72804 + }
72805 +
72806 + return;
72807 +}
72808 +
72809 +int
72810 +gr_find_uid(const uid_t uid)
72811 +{
72812 + struct crash_uid *tmp = uid_set;
72813 + uid_t buid;
72814 + int low = 0, high = uid_used - 1, mid;
72815 +
72816 + while (high >= low) {
72817 + mid = (low + high) >> 1;
72818 + buid = tmp[mid].uid;
72819 + if (buid == uid)
72820 + return mid;
72821 + if (buid > uid)
72822 + high = mid - 1;
72823 + if (buid < uid)
72824 + low = mid + 1;
72825 + }
72826 +
72827 + return -1;
72828 +}
72829 +
72830 +static __inline__ void
72831 +gr_insertsort(void)
72832 +{
72833 + unsigned short i, j;
72834 + struct crash_uid index;
72835 +
72836 + for (i = 1; i < uid_used; i++) {
72837 + index = uid_set[i];
72838 + j = i;
72839 + while ((j > 0) && uid_set[j - 1].uid > index.uid) {
72840 + uid_set[j] = uid_set[j - 1];
72841 + j--;
72842 + }
72843 + uid_set[j] = index;
72844 + }
72845 +
72846 + return;
72847 +}
72848 +
72849 +static __inline__ void
72850 +gr_insert_uid(const kuid_t kuid, const unsigned long expires)
72851 +{
72852 + int loc;
72853 + uid_t uid = GR_GLOBAL_UID(kuid);
72854 +
72855 + if (uid_used == GR_UIDTABLE_MAX)
72856 + return;
72857 +
72858 + loc = gr_find_uid(uid);
72859 +
72860 + if (loc >= 0) {
72861 + uid_set[loc].expires = expires;
72862 + return;
72863 + }
72864 +
72865 + uid_set[uid_used].uid = uid;
72866 + uid_set[uid_used].expires = expires;
72867 + uid_used++;
72868 +
72869 + gr_insertsort();
72870 +
72871 + return;
72872 +}
72873 +
72874 +void
72875 +gr_remove_uid(const unsigned short loc)
72876 +{
72877 + unsigned short i;
72878 +
72879 + for (i = loc + 1; i < uid_used; i++)
72880 + uid_set[i - 1] = uid_set[i];
72881 +
72882 + uid_used--;
72883 +
72884 + return;
72885 +}
72886 +
72887 +int
72888 +gr_check_crash_uid(const kuid_t kuid)
72889 +{
72890 + int loc;
72891 + int ret = 0;
72892 + uid_t uid;
72893 +
72894 + if (unlikely(!gr_acl_is_enabled()))
72895 + return 0;
72896 +
72897 + uid = GR_GLOBAL_UID(kuid);
72898 +
72899 + spin_lock(&gr_uid_lock);
72900 + loc = gr_find_uid(uid);
72901 +
72902 + if (loc < 0)
72903 + goto out_unlock;
72904 +
72905 + if (time_before_eq(uid_set[loc].expires, get_seconds()))
72906 + gr_remove_uid(loc);
72907 + else
72908 + ret = 1;
72909 +
72910 +out_unlock:
72911 + spin_unlock(&gr_uid_lock);
72912 + return ret;
72913 +}
72914 +
72915 +static __inline__ int
72916 +proc_is_setxid(const struct cred *cred)
72917 +{
72918 + if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
72919 + !uid_eq(cred->uid, cred->fsuid))
72920 + return 1;
72921 + if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
72922 + !gid_eq(cred->gid, cred->fsgid))
72923 + return 1;
72924 +
72925 + return 0;
72926 +}
72927 +
72928 +extern int gr_fake_force_sig(int sig, struct task_struct *t);
72929 +
72930 +void
72931 +gr_handle_crash(struct task_struct *task, const int sig)
72932 +{
72933 + struct acl_subject_label *curr;
72934 + struct task_struct *tsk, *tsk2;
72935 + const struct cred *cred;
72936 + const struct cred *cred2;
72937 +
72938 + if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
72939 + return;
72940 +
72941 + if (unlikely(!gr_acl_is_enabled()))
72942 + return;
72943 +
72944 + curr = task->acl;
72945 +
72946 + if (!(curr->resmask & (1U << GR_CRASH_RES)))
72947 + return;
72948 +
72949 + if (time_before_eq(curr->expires, get_seconds())) {
72950 + curr->expires = 0;
72951 + curr->crashes = 0;
72952 + }
72953 +
72954 + curr->crashes++;
72955 +
72956 + if (!curr->expires)
72957 + curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
72958 +
72959 + if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
72960 + time_after(curr->expires, get_seconds())) {
72961 + rcu_read_lock();
72962 + cred = __task_cred(task);
72963 + if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
72964 + gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
72965 + spin_lock(&gr_uid_lock);
72966 + gr_insert_uid(cred->uid, curr->expires);
72967 + spin_unlock(&gr_uid_lock);
72968 + curr->expires = 0;
72969 + curr->crashes = 0;
72970 + read_lock(&tasklist_lock);
72971 + do_each_thread(tsk2, tsk) {
72972 + cred2 = __task_cred(tsk);
72973 + if (tsk != task && uid_eq(cred2->uid, cred->uid))
72974 + gr_fake_force_sig(SIGKILL, tsk);
72975 + } while_each_thread(tsk2, tsk);
72976 + read_unlock(&tasklist_lock);
72977 + } else {
72978 + gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
72979 + read_lock(&tasklist_lock);
72980 + read_lock(&grsec_exec_file_lock);
72981 + do_each_thread(tsk2, tsk) {
72982 + if (likely(tsk != task)) {
72983 + // if this thread has the same subject as the one that triggered
72984 + // RES_CRASH and it's the same binary, kill it
72985 + if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
72986 + gr_fake_force_sig(SIGKILL, tsk);
72987 + }
72988 + } while_each_thread(tsk2, tsk);
72989 + read_unlock(&grsec_exec_file_lock);
72990 + read_unlock(&tasklist_lock);
72991 + }
72992 + rcu_read_unlock();
72993 + }
72994 +
72995 + return;
72996 +}
72997 +
72998 +int
72999 +gr_check_crash_exec(const struct file *filp)
73000 +{
73001 + struct acl_subject_label *curr;
73002 +
73003 + if (unlikely(!gr_acl_is_enabled()))
73004 + return 0;
73005 +
73006 + read_lock(&gr_inode_lock);
73007 + curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
73008 + __get_dev(filp->f_path.dentry),
73009 + current->role);
73010 + read_unlock(&gr_inode_lock);
73011 +
73012 + if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
73013 + (!curr->crashes && !curr->expires))
73014 + return 0;
73015 +
73016 + if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
73017 + time_after(curr->expires, get_seconds()))
73018 + return 1;
73019 + else if (time_before_eq(curr->expires, get_seconds())) {
73020 + curr->crashes = 0;
73021 + curr->expires = 0;
73022 + }
73023 +
73024 + return 0;
73025 +}
73026 +
73027 +void
73028 +gr_handle_alertkill(struct task_struct *task)
73029 +{
73030 + struct acl_subject_label *curracl;
73031 + __u32 curr_ip;
73032 + struct task_struct *p, *p2;
73033 +
73034 + if (unlikely(!gr_acl_is_enabled()))
73035 + return;
73036 +
73037 + curracl = task->acl;
73038 + curr_ip = task->signal->curr_ip;
73039 +
73040 + if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
73041 + read_lock(&tasklist_lock);
73042 + do_each_thread(p2, p) {
73043 + if (p->signal->curr_ip == curr_ip)
73044 + gr_fake_force_sig(SIGKILL, p);
73045 + } while_each_thread(p2, p);
73046 + read_unlock(&tasklist_lock);
73047 + } else if (curracl->mode & GR_KILLPROC)
73048 + gr_fake_force_sig(SIGKILL, task);
73049 +
73050 + return;
73051 +}
73052 diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
73053 new file mode 100644
73054 index 0000000..98011b0
73055 --- /dev/null
73056 +++ b/grsecurity/gracl_shm.c
73057 @@ -0,0 +1,40 @@
73058 +#include <linux/kernel.h>
73059 +#include <linux/mm.h>
73060 +#include <linux/sched.h>
73061 +#include <linux/file.h>
73062 +#include <linux/ipc.h>
73063 +#include <linux/gracl.h>
73064 +#include <linux/grsecurity.h>
73065 +#include <linux/grinternal.h>
73066 +
73067 +int
73068 +gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
73069 + const time_t shm_createtime, const kuid_t cuid, const int shmid)
73070 +{
73071 + struct task_struct *task;
73072 +
73073 + if (!gr_acl_is_enabled())
73074 + return 1;
73075 +
73076 + rcu_read_lock();
73077 + read_lock(&tasklist_lock);
73078 +
73079 + task = find_task_by_vpid(shm_cprid);
73080 +
73081 + if (unlikely(!task))
73082 + task = find_task_by_vpid(shm_lapid);
73083 +
73084 + if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
73085 + (task_pid_nr(task) == shm_lapid)) &&
73086 + (task->acl->mode & GR_PROTSHM) &&
73087 + (task->acl != current->acl))) {
73088 + read_unlock(&tasklist_lock);
73089 + rcu_read_unlock();
73090 + gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
73091 + return 0;
73092 + }
73093 + read_unlock(&tasklist_lock);
73094 + rcu_read_unlock();
73095 +
73096 + return 1;
73097 +}
73098 diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
73099 new file mode 100644
73100 index 0000000..bc0be01
73101 --- /dev/null
73102 +++ b/grsecurity/grsec_chdir.c
73103 @@ -0,0 +1,19 @@
73104 +#include <linux/kernel.h>
73105 +#include <linux/sched.h>
73106 +#include <linux/fs.h>
73107 +#include <linux/file.h>
73108 +#include <linux/grsecurity.h>
73109 +#include <linux/grinternal.h>
73110 +
73111 +void
73112 +gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
73113 +{
73114 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
73115 + if ((grsec_enable_chdir && grsec_enable_group &&
73116 + in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
73117 + !grsec_enable_group)) {
73118 + gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
73119 + }
73120 +#endif
73121 + return;
73122 +}
73123 diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
73124 new file mode 100644
73125 index 0000000..651d6c2
73126 --- /dev/null
73127 +++ b/grsecurity/grsec_chroot.c
73128 @@ -0,0 +1,370 @@
73129 +#include <linux/kernel.h>
73130 +#include <linux/module.h>
73131 +#include <linux/sched.h>
73132 +#include <linux/file.h>
73133 +#include <linux/fs.h>
73134 +#include <linux/mount.h>
73135 +#include <linux/types.h>
73136 +#include "../fs/mount.h"
73137 +#include <linux/grsecurity.h>
73138 +#include <linux/grinternal.h>
73139 +
73140 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
73141 +int gr_init_ran;
73142 +#endif
73143 +
73144 +void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
73145 +{
73146 +#ifdef CONFIG_GRKERNSEC
73147 + if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
73148 + path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
73149 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
73150 + && gr_init_ran
73151 +#endif
73152 + )
73153 + task->gr_is_chrooted = 1;
73154 + else {
73155 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
73156 + if (task_pid_nr(task) == 1 && !gr_init_ran)
73157 + gr_init_ran = 1;
73158 +#endif
73159 + task->gr_is_chrooted = 0;
73160 + }
73161 +
73162 + task->gr_chroot_dentry = path->dentry;
73163 +#endif
73164 + return;
73165 +}
73166 +
73167 +void gr_clear_chroot_entries(struct task_struct *task)
73168 +{
73169 +#ifdef CONFIG_GRKERNSEC
73170 + task->gr_is_chrooted = 0;
73171 + task->gr_chroot_dentry = NULL;
73172 +#endif
73173 + return;
73174 +}
73175 +
73176 +int
73177 +gr_handle_chroot_unix(const pid_t pid)
73178 +{
73179 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
73180 + struct task_struct *p;
73181 +
73182 + if (unlikely(!grsec_enable_chroot_unix))
73183 + return 1;
73184 +
73185 + if (likely(!proc_is_chrooted(current)))
73186 + return 1;
73187 +
73188 + rcu_read_lock();
73189 + read_lock(&tasklist_lock);
73190 + p = find_task_by_vpid_unrestricted(pid);
73191 + if (unlikely(p && !have_same_root(current, p))) {
73192 + read_unlock(&tasklist_lock);
73193 + rcu_read_unlock();
73194 + gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
73195 + return 0;
73196 + }
73197 + read_unlock(&tasklist_lock);
73198 + rcu_read_unlock();
73199 +#endif
73200 + return 1;
73201 +}
73202 +
73203 +int
73204 +gr_handle_chroot_nice(void)
73205 +{
73206 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
73207 + if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
73208 + gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
73209 + return -EPERM;
73210 + }
73211 +#endif
73212 + return 0;
73213 +}
73214 +
73215 +int
73216 +gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
73217 +{
73218 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
73219 + if (grsec_enable_chroot_nice && (niceval < task_nice(p))
73220 + && proc_is_chrooted(current)) {
73221 + gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
73222 + return -EACCES;
73223 + }
73224 +#endif
73225 + return 0;
73226 +}
73227 +
73228 +int
73229 +gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
73230 +{
73231 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
73232 + struct task_struct *p;
73233 + int ret = 0;
73234 + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
73235 + return ret;
73236 +
73237 + read_lock(&tasklist_lock);
73238 + do_each_pid_task(pid, type, p) {
73239 + if (!have_same_root(current, p)) {
73240 + ret = 1;
73241 + goto out;
73242 + }
73243 + } while_each_pid_task(pid, type, p);
73244 +out:
73245 + read_unlock(&tasklist_lock);
73246 + return ret;
73247 +#endif
73248 + return 0;
73249 +}
73250 +
73251 +int
73252 +gr_pid_is_chrooted(struct task_struct *p)
73253 +{
73254 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
73255 + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
73256 + return 0;
73257 +
73258 + if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
73259 + !have_same_root(current, p)) {
73260 + return 1;
73261 + }
73262 +#endif
73263 + return 0;
73264 +}
73265 +
73266 +EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
73267 +
73268 +#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
73269 +int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
73270 +{
73271 + struct path path, currentroot;
73272 + int ret = 0;
73273 +
73274 + path.dentry = (struct dentry *)u_dentry;
73275 + path.mnt = (struct vfsmount *)u_mnt;
73276 + get_fs_root(current->fs, &currentroot);
73277 + if (path_is_under(&path, &currentroot))
73278 + ret = 1;
73279 + path_put(&currentroot);
73280 +
73281 + return ret;
73282 +}
73283 +#endif
73284 +
73285 +int
73286 +gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
73287 +{
73288 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
73289 + if (!grsec_enable_chroot_fchdir)
73290 + return 1;
73291 +
73292 + if (!proc_is_chrooted(current))
73293 + return 1;
73294 + else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
73295 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
73296 + return 0;
73297 + }
73298 +#endif
73299 + return 1;
73300 +}
73301 +
73302 +int
73303 +gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
73304 + const time_t shm_createtime)
73305 +{
73306 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
73307 + struct task_struct *p;
73308 + time_t starttime;
73309 +
73310 + if (unlikely(!grsec_enable_chroot_shmat))
73311 + return 1;
73312 +
73313 + if (likely(!proc_is_chrooted(current)))
73314 + return 1;
73315 +
73316 + rcu_read_lock();
73317 + read_lock(&tasklist_lock);
73318 +
73319 + if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
73320 + starttime = p->start_time.tv_sec;
73321 + if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
73322 + if (have_same_root(current, p)) {
73323 + goto allow;
73324 + } else {
73325 + read_unlock(&tasklist_lock);
73326 + rcu_read_unlock();
73327 + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
73328 + return 0;
73329 + }
73330 + }
73331 + /* creator exited, pid reuse, fall through to next check */
73332 + }
73333 + if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
73334 + if (unlikely(!have_same_root(current, p))) {
73335 + read_unlock(&tasklist_lock);
73336 + rcu_read_unlock();
73337 + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
73338 + return 0;
73339 + }
73340 + }
73341 +
73342 +allow:
73343 + read_unlock(&tasklist_lock);
73344 + rcu_read_unlock();
73345 +#endif
73346 + return 1;
73347 +}
73348 +
73349 +void
73350 +gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
73351 +{
73352 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
73353 + if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
73354 + gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
73355 +#endif
73356 + return;
73357 +}
73358 +
73359 +int
73360 +gr_handle_chroot_mknod(const struct dentry *dentry,
73361 + const struct vfsmount *mnt, const int mode)
73362 +{
73363 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
73364 + if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
73365 + proc_is_chrooted(current)) {
73366 + gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
73367 + return -EPERM;
73368 + }
73369 +#endif
73370 + return 0;
73371 +}
73372 +
73373 +int
73374 +gr_handle_chroot_mount(const struct dentry *dentry,
73375 + const struct vfsmount *mnt, const char *dev_name)
73376 +{
73377 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
73378 + if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
73379 + gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
73380 + return -EPERM;
73381 + }
73382 +#endif
73383 + return 0;
73384 +}
73385 +
73386 +int
73387 +gr_handle_chroot_pivot(void)
73388 +{
73389 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
73390 + if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
73391 + gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
73392 + return -EPERM;
73393 + }
73394 +#endif
73395 + return 0;
73396 +}
73397 +
73398 +int
73399 +gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
73400 +{
73401 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
73402 + if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
73403 + !gr_is_outside_chroot(dentry, mnt)) {
73404 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
73405 + return -EPERM;
73406 + }
73407 +#endif
73408 + return 0;
73409 +}
73410 +
73411 +extern const char *captab_log[];
73412 +extern int captab_log_entries;
73413 +
73414 +int
73415 +gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
73416 +{
73417 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
73418 + if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
73419 + kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
73420 + if (cap_raised(chroot_caps, cap)) {
73421 + if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
73422 + gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
73423 + }
73424 + return 0;
73425 + }
73426 + }
73427 +#endif
73428 + return 1;
73429 +}
73430 +
73431 +int
73432 +gr_chroot_is_capable(const int cap)
73433 +{
73434 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
73435 + return gr_task_chroot_is_capable(current, current_cred(), cap);
73436 +#endif
73437 + return 1;
73438 +}
73439 +
73440 +int
73441 +gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
73442 +{
73443 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
73444 + if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
73445 + kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
73446 + if (cap_raised(chroot_caps, cap)) {
73447 + return 0;
73448 + }
73449 + }
73450 +#endif
73451 + return 1;
73452 +}
73453 +
73454 +int
73455 +gr_chroot_is_capable_nolog(const int cap)
73456 +{
73457 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
73458 + return gr_task_chroot_is_capable_nolog(current, cap);
73459 +#endif
73460 + return 1;
73461 +}
73462 +
73463 +int
73464 +gr_handle_chroot_sysctl(const int op)
73465 +{
73466 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
73467 + if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
73468 + proc_is_chrooted(current))
73469 + return -EACCES;
73470 +#endif
73471 + return 0;
73472 +}
73473 +
73474 +void
73475 +gr_handle_chroot_chdir(const struct path *path)
73476 +{
73477 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
73478 + if (grsec_enable_chroot_chdir)
73479 + set_fs_pwd(current->fs, path);
73480 +#endif
73481 + return;
73482 +}
73483 +
73484 +int
73485 +gr_handle_chroot_chmod(const struct dentry *dentry,
73486 + const struct vfsmount *mnt, const int mode)
73487 +{
73488 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
73489 + /* allow chmod +s on directories, but not files */
73490 + if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
73491 + ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
73492 + proc_is_chrooted(current)) {
73493 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
73494 + return -EPERM;
73495 + }
73496 +#endif
73497 + return 0;
73498 +}
73499 diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
73500 new file mode 100644
73501 index 0000000..4d6fce8
73502 --- /dev/null
73503 +++ b/grsecurity/grsec_disabled.c
73504 @@ -0,0 +1,433 @@
73505 +#include <linux/kernel.h>
73506 +#include <linux/module.h>
73507 +#include <linux/sched.h>
73508 +#include <linux/file.h>
73509 +#include <linux/fs.h>
73510 +#include <linux/kdev_t.h>
73511 +#include <linux/net.h>
73512 +#include <linux/in.h>
73513 +#include <linux/ip.h>
73514 +#include <linux/skbuff.h>
73515 +#include <linux/sysctl.h>
73516 +
73517 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
73518 +void
73519 +pax_set_initial_flags(struct linux_binprm *bprm)
73520 +{
73521 + return;
73522 +}
73523 +#endif
73524 +
73525 +#ifdef CONFIG_SYSCTL
73526 +__u32
73527 +gr_handle_sysctl(const struct ctl_table * table, const int op)
73528 +{
73529 + return 0;
73530 +}
73531 +#endif
73532 +
73533 +#ifdef CONFIG_TASKSTATS
73534 +int gr_is_taskstats_denied(int pid)
73535 +{
73536 + return 0;
73537 +}
73538 +#endif
73539 +
73540 +int
73541 +gr_acl_is_enabled(void)
73542 +{
73543 + return 0;
73544 +}
73545 +
73546 +void
73547 +gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
73548 +{
73549 + return;
73550 +}
73551 +
73552 +int
73553 +gr_handle_rawio(const struct inode *inode)
73554 +{
73555 + return 0;
73556 +}
73557 +
73558 +void
73559 +gr_acl_handle_psacct(struct task_struct *task, const long code)
73560 +{
73561 + return;
73562 +}
73563 +
73564 +int
73565 +gr_handle_ptrace(struct task_struct *task, const long request)
73566 +{
73567 + return 0;
73568 +}
73569 +
73570 +int
73571 +gr_handle_proc_ptrace(struct task_struct *task)
73572 +{
73573 + return 0;
73574 +}
73575 +
73576 +int
73577 +gr_set_acls(const int type)
73578 +{
73579 + return 0;
73580 +}
73581 +
73582 +int
73583 +gr_check_hidden_task(const struct task_struct *tsk)
73584 +{
73585 + return 0;
73586 +}
73587 +
73588 +int
73589 +gr_check_protected_task(const struct task_struct *task)
73590 +{
73591 + return 0;
73592 +}
73593 +
73594 +int
73595 +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
73596 +{
73597 + return 0;
73598 +}
73599 +
73600 +void
73601 +gr_copy_label(struct task_struct *tsk)
73602 +{
73603 + return;
73604 +}
73605 +
73606 +void
73607 +gr_set_pax_flags(struct task_struct *task)
73608 +{
73609 + return;
73610 +}
73611 +
73612 +int
73613 +gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
73614 + const int unsafe_share)
73615 +{
73616 + return 0;
73617 +}
73618 +
73619 +void
73620 +gr_handle_delete(const ino_t ino, const dev_t dev)
73621 +{
73622 + return;
73623 +}
73624 +
73625 +void
73626 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
73627 +{
73628 + return;
73629 +}
73630 +
73631 +void
73632 +gr_handle_crash(struct task_struct *task, const int sig)
73633 +{
73634 + return;
73635 +}
73636 +
73637 +int
73638 +gr_check_crash_exec(const struct file *filp)
73639 +{
73640 + return 0;
73641 +}
73642 +
73643 +int
73644 +gr_check_crash_uid(const kuid_t uid)
73645 +{
73646 + return 0;
73647 +}
73648 +
73649 +void
73650 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
73651 + struct dentry *old_dentry,
73652 + struct dentry *new_dentry,
73653 + struct vfsmount *mnt, const __u8 replace)
73654 +{
73655 + return;
73656 +}
73657 +
73658 +int
73659 +gr_search_socket(const int family, const int type, const int protocol)
73660 +{
73661 + return 1;
73662 +}
73663 +
73664 +int
73665 +gr_search_connectbind(const int mode, const struct socket *sock,
73666 + const struct sockaddr_in *addr)
73667 +{
73668 + return 0;
73669 +}
73670 +
73671 +void
73672 +gr_handle_alertkill(struct task_struct *task)
73673 +{
73674 + return;
73675 +}
73676 +
73677 +__u32
73678 +gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
73679 +{
73680 + return 1;
73681 +}
73682 +
73683 +__u32
73684 +gr_acl_handle_hidden_file(const struct dentry * dentry,
73685 + const struct vfsmount * mnt)
73686 +{
73687 + return 1;
73688 +}
73689 +
73690 +__u32
73691 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
73692 + int acc_mode)
73693 +{
73694 + return 1;
73695 +}
73696 +
73697 +__u32
73698 +gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
73699 +{
73700 + return 1;
73701 +}
73702 +
73703 +__u32
73704 +gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
73705 +{
73706 + return 1;
73707 +}
73708 +
73709 +int
73710 +gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
73711 + unsigned int *vm_flags)
73712 +{
73713 + return 1;
73714 +}
73715 +
73716 +__u32
73717 +gr_acl_handle_truncate(const struct dentry * dentry,
73718 + const struct vfsmount * mnt)
73719 +{
73720 + return 1;
73721 +}
73722 +
73723 +__u32
73724 +gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
73725 +{
73726 + return 1;
73727 +}
73728 +
73729 +__u32
73730 +gr_acl_handle_access(const struct dentry * dentry,
73731 + const struct vfsmount * mnt, const int fmode)
73732 +{
73733 + return 1;
73734 +}
73735 +
73736 +__u32
73737 +gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
73738 + umode_t *mode)
73739 +{
73740 + return 1;
73741 +}
73742 +
73743 +__u32
73744 +gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
73745 +{
73746 + return 1;
73747 +}
73748 +
73749 +__u32
73750 +gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
73751 +{
73752 + return 1;
73753 +}
73754 +
73755 +__u32
73756 +gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
73757 +{
73758 + return 1;
73759 +}
73760 +
73761 +void
73762 +grsecurity_init(void)
73763 +{
73764 + return;
73765 +}
73766 +
73767 +umode_t gr_acl_umask(void)
73768 +{
73769 + return 0;
73770 +}
73771 +
73772 +__u32
73773 +gr_acl_handle_mknod(const struct dentry * new_dentry,
73774 + const struct dentry * parent_dentry,
73775 + const struct vfsmount * parent_mnt,
73776 + const int mode)
73777 +{
73778 + return 1;
73779 +}
73780 +
73781 +__u32
73782 +gr_acl_handle_mkdir(const struct dentry * new_dentry,
73783 + const struct dentry * parent_dentry,
73784 + const struct vfsmount * parent_mnt)
73785 +{
73786 + return 1;
73787 +}
73788 +
73789 +__u32
73790 +gr_acl_handle_symlink(const struct dentry * new_dentry,
73791 + const struct dentry * parent_dentry,
73792 + const struct vfsmount * parent_mnt, const struct filename *from)
73793 +{
73794 + return 1;
73795 +}
73796 +
73797 +__u32
73798 +gr_acl_handle_link(const struct dentry * new_dentry,
73799 + const struct dentry * parent_dentry,
73800 + const struct vfsmount * parent_mnt,
73801 + const struct dentry * old_dentry,
73802 + const struct vfsmount * old_mnt, const struct filename *to)
73803 +{
73804 + return 1;
73805 +}
73806 +
73807 +int
73808 +gr_acl_handle_rename(const struct dentry *new_dentry,
73809 + const struct dentry *parent_dentry,
73810 + const struct vfsmount *parent_mnt,
73811 + const struct dentry *old_dentry,
73812 + const struct inode *old_parent_inode,
73813 + const struct vfsmount *old_mnt, const struct filename *newname)
73814 +{
73815 + return 0;
73816 +}
73817 +
73818 +int
73819 +gr_acl_handle_filldir(const struct file *file, const char *name,
73820 + const int namelen, const ino_t ino)
73821 +{
73822 + return 1;
73823 +}
73824 +
73825 +int
73826 +gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
73827 + const time_t shm_createtime, const kuid_t cuid, const int shmid)
73828 +{
73829 + return 1;
73830 +}
73831 +
73832 +int
73833 +gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
73834 +{
73835 + return 0;
73836 +}
73837 +
73838 +int
73839 +gr_search_accept(const struct socket *sock)
73840 +{
73841 + return 0;
73842 +}
73843 +
73844 +int
73845 +gr_search_listen(const struct socket *sock)
73846 +{
73847 + return 0;
73848 +}
73849 +
73850 +int
73851 +gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
73852 +{
73853 + return 0;
73854 +}
73855 +
73856 +__u32
73857 +gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
73858 +{
73859 + return 1;
73860 +}
73861 +
73862 +__u32
73863 +gr_acl_handle_creat(const struct dentry * dentry,
73864 + const struct dentry * p_dentry,
73865 + const struct vfsmount * p_mnt, int open_flags, int acc_mode,
73866 + const int imode)
73867 +{
73868 + return 1;
73869 +}
73870 +
73871 +void
73872 +gr_acl_handle_exit(void)
73873 +{
73874 + return;
73875 +}
73876 +
73877 +int
73878 +gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
73879 +{
73880 + return 1;
73881 +}
73882 +
73883 +void
73884 +gr_set_role_label(const kuid_t uid, const kgid_t gid)
73885 +{
73886 + return;
73887 +}
73888 +
73889 +int
73890 +gr_acl_handle_procpidmem(const struct task_struct *task)
73891 +{
73892 + return 0;
73893 +}
73894 +
73895 +int
73896 +gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
73897 +{
73898 + return 0;
73899 +}
73900 +
73901 +int
73902 +gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
73903 +{
73904 + return 0;
73905 +}
73906 +
73907 +int
73908 +gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
73909 +{
73910 + return 0;
73911 +}
73912 +
73913 +int
73914 +gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
73915 +{
73916 + return 0;
73917 +}
73918 +
73919 +int gr_acl_enable_at_secure(void)
73920 +{
73921 + return 0;
73922 +}
73923 +
73924 +dev_t gr_get_dev_from_dentry(struct dentry *dentry)
73925 +{
73926 + return dentry->d_sb->s_dev;
73927 +}
73928 +
73929 +void gr_put_exec_file(struct task_struct *task)
73930 +{
73931 + return;
73932 +}
73933 +
73934 +#ifdef CONFIG_SECURITY
73935 +EXPORT_SYMBOL_GPL(gr_check_user_change);
73936 +EXPORT_SYMBOL_GPL(gr_check_group_change);
73937 +#endif
73938 diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
73939 new file mode 100644
73940 index 0000000..f35f454
73941 --- /dev/null
73942 +++ b/grsecurity/grsec_exec.c
73943 @@ -0,0 +1,187 @@
73944 +#include <linux/kernel.h>
73945 +#include <linux/sched.h>
73946 +#include <linux/file.h>
73947 +#include <linux/binfmts.h>
73948 +#include <linux/fs.h>
73949 +#include <linux/types.h>
73950 +#include <linux/grdefs.h>
73951 +#include <linux/grsecurity.h>
73952 +#include <linux/grinternal.h>
73953 +#include <linux/capability.h>
73954 +#include <linux/module.h>
73955 +#include <linux/compat.h>
73956 +
73957 +#include <asm/uaccess.h>
73958 +
73959 +#ifdef CONFIG_GRKERNSEC_EXECLOG
73960 +static char gr_exec_arg_buf[132];
73961 +static DEFINE_MUTEX(gr_exec_arg_mutex);
73962 +#endif
73963 +
73964 +struct user_arg_ptr {
73965 +#ifdef CONFIG_COMPAT
73966 + bool is_compat;
73967 +#endif
73968 + union {
73969 + const char __user *const __user *native;
73970 +#ifdef CONFIG_COMPAT
73971 + const compat_uptr_t __user *compat;
73972 +#endif
73973 + } ptr;
73974 +};
73975 +
73976 +extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
73977 +
73978 +void
73979 +gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
73980 +{
73981 +#ifdef CONFIG_GRKERNSEC_EXECLOG
73982 + char *grarg = gr_exec_arg_buf;
73983 + unsigned int i, x, execlen = 0;
73984 + char c;
73985 +
73986 + if (!((grsec_enable_execlog && grsec_enable_group &&
73987 + in_group_p(grsec_audit_gid))
73988 + || (grsec_enable_execlog && !grsec_enable_group)))
73989 + return;
73990 +
73991 + mutex_lock(&gr_exec_arg_mutex);
73992 + memset(grarg, 0, sizeof(gr_exec_arg_buf));
73993 +
73994 + for (i = 0; i < bprm->argc && execlen < 128; i++) {
73995 + const char __user *p;
73996 + unsigned int len;
73997 +
73998 + p = get_user_arg_ptr(argv, i);
73999 + if (IS_ERR(p))
74000 + goto log;
74001 +
74002 + len = strnlen_user(p, 128 - execlen);
74003 + if (len > 128 - execlen)
74004 + len = 128 - execlen;
74005 + else if (len > 0)
74006 + len--;
74007 + if (copy_from_user(grarg + execlen, p, len))
74008 + goto log;
74009 +
74010 + /* rewrite unprintable characters */
74011 + for (x = 0; x < len; x++) {
74012 + c = *(grarg + execlen + x);
74013 + if (c < 32 || c > 126)
74014 + *(grarg + execlen + x) = ' ';
74015 + }
74016 +
74017 + execlen += len;
74018 + *(grarg + execlen) = ' ';
74019 + *(grarg + execlen + 1) = '\0';
74020 + execlen++;
74021 + }
74022 +
74023 + log:
74024 + gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
74025 + bprm->file->f_path.mnt, grarg);
74026 + mutex_unlock(&gr_exec_arg_mutex);
74027 +#endif
74028 + return;
74029 +}
74030 +
74031 +#ifdef CONFIG_GRKERNSEC
74032 +extern int gr_acl_is_capable(const int cap);
74033 +extern int gr_acl_is_capable_nolog(const int cap);
74034 +extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
74035 +extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
74036 +extern int gr_chroot_is_capable(const int cap);
74037 +extern int gr_chroot_is_capable_nolog(const int cap);
74038 +extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
74039 +extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
74040 +#endif
74041 +
74042 +const char *captab_log[] = {
74043 + "CAP_CHOWN",
74044 + "CAP_DAC_OVERRIDE",
74045 + "CAP_DAC_READ_SEARCH",
74046 + "CAP_FOWNER",
74047 + "CAP_FSETID",
74048 + "CAP_KILL",
74049 + "CAP_SETGID",
74050 + "CAP_SETUID",
74051 + "CAP_SETPCAP",
74052 + "CAP_LINUX_IMMUTABLE",
74053 + "CAP_NET_BIND_SERVICE",
74054 + "CAP_NET_BROADCAST",
74055 + "CAP_NET_ADMIN",
74056 + "CAP_NET_RAW",
74057 + "CAP_IPC_LOCK",
74058 + "CAP_IPC_OWNER",
74059 + "CAP_SYS_MODULE",
74060 + "CAP_SYS_RAWIO",
74061 + "CAP_SYS_CHROOT",
74062 + "CAP_SYS_PTRACE",
74063 + "CAP_SYS_PACCT",
74064 + "CAP_SYS_ADMIN",
74065 + "CAP_SYS_BOOT",
74066 + "CAP_SYS_NICE",
74067 + "CAP_SYS_RESOURCE",
74068 + "CAP_SYS_TIME",
74069 + "CAP_SYS_TTY_CONFIG",
74070 + "CAP_MKNOD",
74071 + "CAP_LEASE",
74072 + "CAP_AUDIT_WRITE",
74073 + "CAP_AUDIT_CONTROL",
74074 + "CAP_SETFCAP",
74075 + "CAP_MAC_OVERRIDE",
74076 + "CAP_MAC_ADMIN",
74077 + "CAP_SYSLOG",
74078 + "CAP_WAKE_ALARM"
74079 +};
74080 +
74081 +int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
74082 +
74083 +int gr_is_capable(const int cap)
74084 +{
74085 +#ifdef CONFIG_GRKERNSEC
74086 + if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
74087 + return 1;
74088 + return 0;
74089 +#else
74090 + return 1;
74091 +#endif
74092 +}
74093 +
74094 +int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
74095 +{
74096 +#ifdef CONFIG_GRKERNSEC
74097 + if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
74098 + return 1;
74099 + return 0;
74100 +#else
74101 + return 1;
74102 +#endif
74103 +}
74104 +
74105 +int gr_is_capable_nolog(const int cap)
74106 +{
74107 +#ifdef CONFIG_GRKERNSEC
74108 + if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
74109 + return 1;
74110 + return 0;
74111 +#else
74112 + return 1;
74113 +#endif
74114 +}
74115 +
74116 +int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
74117 +{
74118 +#ifdef CONFIG_GRKERNSEC
74119 + if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
74120 + return 1;
74121 + return 0;
74122 +#else
74123 + return 1;
74124 +#endif
74125 +}
74126 +
74127 +EXPORT_SYMBOL_GPL(gr_is_capable);
74128 +EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
74129 +EXPORT_SYMBOL_GPL(gr_task_is_capable);
74130 +EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
74131 diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
74132 new file mode 100644
74133 index 0000000..06cc6ea
74134 --- /dev/null
74135 +++ b/grsecurity/grsec_fifo.c
74136 @@ -0,0 +1,24 @@
74137 +#include <linux/kernel.h>
74138 +#include <linux/sched.h>
74139 +#include <linux/fs.h>
74140 +#include <linux/file.h>
74141 +#include <linux/grinternal.h>
74142 +
74143 +int
74144 +gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
74145 + const struct dentry *dir, const int flag, const int acc_mode)
74146 +{
74147 +#ifdef CONFIG_GRKERNSEC_FIFO
74148 + const struct cred *cred = current_cred();
74149 +
74150 + if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
74151 + !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
74152 + !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
74153 + !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
74154 + if (!inode_permission(dentry->d_inode, acc_mode))
74155 + 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));
74156 + return -EACCES;
74157 + }
74158 +#endif
74159 + return 0;
74160 +}
74161 diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
74162 new file mode 100644
74163 index 0000000..8ca18bf
74164 --- /dev/null
74165 +++ b/grsecurity/grsec_fork.c
74166 @@ -0,0 +1,23 @@
74167 +#include <linux/kernel.h>
74168 +#include <linux/sched.h>
74169 +#include <linux/grsecurity.h>
74170 +#include <linux/grinternal.h>
74171 +#include <linux/errno.h>
74172 +
74173 +void
74174 +gr_log_forkfail(const int retval)
74175 +{
74176 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
74177 + if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
74178 + switch (retval) {
74179 + case -EAGAIN:
74180 + gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
74181 + break;
74182 + case -ENOMEM:
74183 + gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
74184 + break;
74185 + }
74186 + }
74187 +#endif
74188 + return;
74189 +}
74190 diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
74191 new file mode 100644
74192 index 0000000..ae6c028
74193 --- /dev/null
74194 +++ b/grsecurity/grsec_init.c
74195 @@ -0,0 +1,272 @@
74196 +#include <linux/kernel.h>
74197 +#include <linux/sched.h>
74198 +#include <linux/mm.h>
74199 +#include <linux/gracl.h>
74200 +#include <linux/slab.h>
74201 +#include <linux/vmalloc.h>
74202 +#include <linux/percpu.h>
74203 +#include <linux/module.h>
74204 +
74205 +int grsec_enable_ptrace_readexec;
74206 +int grsec_enable_setxid;
74207 +int grsec_enable_symlinkown;
74208 +kgid_t grsec_symlinkown_gid;
74209 +int grsec_enable_brute;
74210 +int grsec_enable_link;
74211 +int grsec_enable_dmesg;
74212 +int grsec_enable_harden_ptrace;
74213 +int grsec_enable_harden_ipc;
74214 +int grsec_enable_fifo;
74215 +int grsec_enable_execlog;
74216 +int grsec_enable_signal;
74217 +int grsec_enable_forkfail;
74218 +int grsec_enable_audit_ptrace;
74219 +int grsec_enable_time;
74220 +int grsec_enable_group;
74221 +kgid_t grsec_audit_gid;
74222 +int grsec_enable_chdir;
74223 +int grsec_enable_mount;
74224 +int grsec_enable_rofs;
74225 +int grsec_deny_new_usb;
74226 +int grsec_enable_chroot_findtask;
74227 +int grsec_enable_chroot_mount;
74228 +int grsec_enable_chroot_shmat;
74229 +int grsec_enable_chroot_fchdir;
74230 +int grsec_enable_chroot_double;
74231 +int grsec_enable_chroot_pivot;
74232 +int grsec_enable_chroot_chdir;
74233 +int grsec_enable_chroot_chmod;
74234 +int grsec_enable_chroot_mknod;
74235 +int grsec_enable_chroot_nice;
74236 +int grsec_enable_chroot_execlog;
74237 +int grsec_enable_chroot_caps;
74238 +int grsec_enable_chroot_sysctl;
74239 +int grsec_enable_chroot_unix;
74240 +int grsec_enable_tpe;
74241 +kgid_t grsec_tpe_gid;
74242 +int grsec_enable_blackhole;
74243 +#ifdef CONFIG_IPV6_MODULE
74244 +EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
74245 +#endif
74246 +int grsec_lastack_retries;
74247 +int grsec_enable_tpe_all;
74248 +int grsec_enable_tpe_invert;
74249 +int grsec_enable_socket_all;
74250 +kgid_t grsec_socket_all_gid;
74251 +int grsec_enable_socket_client;
74252 +kgid_t grsec_socket_client_gid;
74253 +int grsec_enable_socket_server;
74254 +kgid_t grsec_socket_server_gid;
74255 +int grsec_resource_logging;
74256 +int grsec_disable_privio;
74257 +int grsec_enable_log_rwxmaps;
74258 +int grsec_lock;
74259 +
74260 +DEFINE_SPINLOCK(grsec_alert_lock);
74261 +unsigned long grsec_alert_wtime = 0;
74262 +unsigned long grsec_alert_fyet = 0;
74263 +
74264 +DEFINE_SPINLOCK(grsec_audit_lock);
74265 +
74266 +DEFINE_RWLOCK(grsec_exec_file_lock);
74267 +
74268 +char *gr_shared_page[4];
74269 +
74270 +char *gr_alert_log_fmt;
74271 +char *gr_audit_log_fmt;
74272 +char *gr_alert_log_buf;
74273 +char *gr_audit_log_buf;
74274 +
74275 +void __init
74276 +grsecurity_init(void)
74277 +{
74278 + int j;
74279 + /* create the per-cpu shared pages */
74280 +
74281 +#ifdef CONFIG_X86
74282 + memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
74283 +#endif
74284 +
74285 + for (j = 0; j < 4; j++) {
74286 + gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
74287 + if (gr_shared_page[j] == NULL) {
74288 + panic("Unable to allocate grsecurity shared page");
74289 + return;
74290 + }
74291 + }
74292 +
74293 + /* allocate log buffers */
74294 + gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
74295 + if (!gr_alert_log_fmt) {
74296 + panic("Unable to allocate grsecurity alert log format buffer");
74297 + return;
74298 + }
74299 + gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
74300 + if (!gr_audit_log_fmt) {
74301 + panic("Unable to allocate grsecurity audit log format buffer");
74302 + return;
74303 + }
74304 + gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
74305 + if (!gr_alert_log_buf) {
74306 + panic("Unable to allocate grsecurity alert log buffer");
74307 + return;
74308 + }
74309 + gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
74310 + if (!gr_audit_log_buf) {
74311 + panic("Unable to allocate grsecurity audit log buffer");
74312 + return;
74313 + }
74314 +
74315 +#ifdef CONFIG_GRKERNSEC_IO
74316 +#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
74317 + grsec_disable_privio = 1;
74318 +#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
74319 + grsec_disable_privio = 1;
74320 +#else
74321 + grsec_disable_privio = 0;
74322 +#endif
74323 +#endif
74324 +
74325 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
74326 + /* for backward compatibility, tpe_invert always defaults to on if
74327 + enabled in the kernel
74328 + */
74329 + grsec_enable_tpe_invert = 1;
74330 +#endif
74331 +
74332 +#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
74333 +#ifndef CONFIG_GRKERNSEC_SYSCTL
74334 + grsec_lock = 1;
74335 +#endif
74336 +
74337 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
74338 + grsec_enable_log_rwxmaps = 1;
74339 +#endif
74340 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
74341 + grsec_enable_group = 1;
74342 + grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
74343 +#endif
74344 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
74345 + grsec_enable_ptrace_readexec = 1;
74346 +#endif
74347 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
74348 + grsec_enable_chdir = 1;
74349 +#endif
74350 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
74351 + grsec_enable_harden_ptrace = 1;
74352 +#endif
74353 +#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
74354 + grsec_enable_harden_ipc = 1;
74355 +#endif
74356 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
74357 + grsec_enable_mount = 1;
74358 +#endif
74359 +#ifdef CONFIG_GRKERNSEC_LINK
74360 + grsec_enable_link = 1;
74361 +#endif
74362 +#ifdef CONFIG_GRKERNSEC_BRUTE
74363 + grsec_enable_brute = 1;
74364 +#endif
74365 +#ifdef CONFIG_GRKERNSEC_DMESG
74366 + grsec_enable_dmesg = 1;
74367 +#endif
74368 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
74369 + grsec_enable_blackhole = 1;
74370 + grsec_lastack_retries = 4;
74371 +#endif
74372 +#ifdef CONFIG_GRKERNSEC_FIFO
74373 + grsec_enable_fifo = 1;
74374 +#endif
74375 +#ifdef CONFIG_GRKERNSEC_EXECLOG
74376 + grsec_enable_execlog = 1;
74377 +#endif
74378 +#ifdef CONFIG_GRKERNSEC_SETXID
74379 + grsec_enable_setxid = 1;
74380 +#endif
74381 +#ifdef CONFIG_GRKERNSEC_SIGNAL
74382 + grsec_enable_signal = 1;
74383 +#endif
74384 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
74385 + grsec_enable_forkfail = 1;
74386 +#endif
74387 +#ifdef CONFIG_GRKERNSEC_TIME
74388 + grsec_enable_time = 1;
74389 +#endif
74390 +#ifdef CONFIG_GRKERNSEC_RESLOG
74391 + grsec_resource_logging = 1;
74392 +#endif
74393 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
74394 + grsec_enable_chroot_findtask = 1;
74395 +#endif
74396 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
74397 + grsec_enable_chroot_unix = 1;
74398 +#endif
74399 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
74400 + grsec_enable_chroot_mount = 1;
74401 +#endif
74402 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
74403 + grsec_enable_chroot_fchdir = 1;
74404 +#endif
74405 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
74406 + grsec_enable_chroot_shmat = 1;
74407 +#endif
74408 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
74409 + grsec_enable_audit_ptrace = 1;
74410 +#endif
74411 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
74412 + grsec_enable_chroot_double = 1;
74413 +#endif
74414 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
74415 + grsec_enable_chroot_pivot = 1;
74416 +#endif
74417 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
74418 + grsec_enable_chroot_chdir = 1;
74419 +#endif
74420 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
74421 + grsec_enable_chroot_chmod = 1;
74422 +#endif
74423 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
74424 + grsec_enable_chroot_mknod = 1;
74425 +#endif
74426 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
74427 + grsec_enable_chroot_nice = 1;
74428 +#endif
74429 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
74430 + grsec_enable_chroot_execlog = 1;
74431 +#endif
74432 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
74433 + grsec_enable_chroot_caps = 1;
74434 +#endif
74435 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
74436 + grsec_enable_chroot_sysctl = 1;
74437 +#endif
74438 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
74439 + grsec_enable_symlinkown = 1;
74440 + grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
74441 +#endif
74442 +#ifdef CONFIG_GRKERNSEC_TPE
74443 + grsec_enable_tpe = 1;
74444 + grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
74445 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
74446 + grsec_enable_tpe_all = 1;
74447 +#endif
74448 +#endif
74449 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
74450 + grsec_enable_socket_all = 1;
74451 + grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
74452 +#endif
74453 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
74454 + grsec_enable_socket_client = 1;
74455 + grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
74456 +#endif
74457 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
74458 + grsec_enable_socket_server = 1;
74459 + grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
74460 +#endif
74461 +#endif
74462 +#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
74463 + grsec_deny_new_usb = 1;
74464 +#endif
74465 +
74466 + return;
74467 +}
74468 diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
74469 new file mode 100644
74470 index 0000000..1773300
74471 --- /dev/null
74472 +++ b/grsecurity/grsec_ipc.c
74473 @@ -0,0 +1,48 @@
74474 +#include <linux/kernel.h>
74475 +#include <linux/mm.h>
74476 +#include <linux/sched.h>
74477 +#include <linux/file.h>
74478 +#include <linux/ipc.h>
74479 +#include <linux/ipc_namespace.h>
74480 +#include <linux/grsecurity.h>
74481 +#include <linux/grinternal.h>
74482 +
74483 +int
74484 +gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
74485 +{
74486 +#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
74487 + int write;
74488 + int orig_granted_mode;
74489 + kuid_t euid;
74490 + kgid_t egid;
74491 +
74492 + if (!grsec_enable_harden_ipc)
74493 + return 1;
74494 +
74495 + euid = current_euid();
74496 + egid = current_egid();
74497 +
74498 + write = requested_mode & 00002;
74499 + orig_granted_mode = ipcp->mode;
74500 +
74501 + if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
74502 + orig_granted_mode >>= 6;
74503 + else {
74504 + /* if likely wrong permissions, lock to user */
74505 + if (orig_granted_mode & 0007)
74506 + orig_granted_mode = 0;
74507 + /* otherwise do a egid-only check */
74508 + else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
74509 + orig_granted_mode >>= 3;
74510 + /* otherwise, no access */
74511 + else
74512 + orig_granted_mode = 0;
74513 + }
74514 + if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
74515 + !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
74516 + gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
74517 + return 0;
74518 + }
74519 +#endif
74520 + return 1;
74521 +}
74522 diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
74523 new file mode 100644
74524 index 0000000..5e05e20
74525 --- /dev/null
74526 +++ b/grsecurity/grsec_link.c
74527 @@ -0,0 +1,58 @@
74528 +#include <linux/kernel.h>
74529 +#include <linux/sched.h>
74530 +#include <linux/fs.h>
74531 +#include <linux/file.h>
74532 +#include <linux/grinternal.h>
74533 +
74534 +int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
74535 +{
74536 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
74537 + const struct inode *link_inode = link->dentry->d_inode;
74538 +
74539 + if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
74540 + /* ignore root-owned links, e.g. /proc/self */
74541 + gr_is_global_nonroot(link_inode->i_uid) && target &&
74542 + !uid_eq(link_inode->i_uid, target->i_uid)) {
74543 + gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
74544 + return 1;
74545 + }
74546 +#endif
74547 + return 0;
74548 +}
74549 +
74550 +int
74551 +gr_handle_follow_link(const struct inode *parent,
74552 + const struct inode *inode,
74553 + const struct dentry *dentry, const struct vfsmount *mnt)
74554 +{
74555 +#ifdef CONFIG_GRKERNSEC_LINK
74556 + const struct cred *cred = current_cred();
74557 +
74558 + if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
74559 + (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
74560 + (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
74561 + gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
74562 + return -EACCES;
74563 + }
74564 +#endif
74565 + return 0;
74566 +}
74567 +
74568 +int
74569 +gr_handle_hardlink(const struct dentry *dentry,
74570 + const struct vfsmount *mnt,
74571 + struct inode *inode, const int mode, const struct filename *to)
74572 +{
74573 +#ifdef CONFIG_GRKERNSEC_LINK
74574 + const struct cred *cred = current_cred();
74575 +
74576 + if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
74577 + (!S_ISREG(mode) || is_privileged_binary(dentry) ||
74578 + (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
74579 + !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
74580 + gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
74581 + return -EPERM;
74582 + }
74583 +#endif
74584 + return 0;
74585 +}
74586 diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
74587 new file mode 100644
74588 index 0000000..dbe0a6b
74589 --- /dev/null
74590 +++ b/grsecurity/grsec_log.c
74591 @@ -0,0 +1,341 @@
74592 +#include <linux/kernel.h>
74593 +#include <linux/sched.h>
74594 +#include <linux/file.h>
74595 +#include <linux/tty.h>
74596 +#include <linux/fs.h>
74597 +#include <linux/mm.h>
74598 +#include <linux/grinternal.h>
74599 +
74600 +#ifdef CONFIG_TREE_PREEMPT_RCU
74601 +#define DISABLE_PREEMPT() preempt_disable()
74602 +#define ENABLE_PREEMPT() preempt_enable()
74603 +#else
74604 +#define DISABLE_PREEMPT()
74605 +#define ENABLE_PREEMPT()
74606 +#endif
74607 +
74608 +#define BEGIN_LOCKS(x) \
74609 + DISABLE_PREEMPT(); \
74610 + rcu_read_lock(); \
74611 + read_lock(&tasklist_lock); \
74612 + read_lock(&grsec_exec_file_lock); \
74613 + if (x != GR_DO_AUDIT) \
74614 + spin_lock(&grsec_alert_lock); \
74615 + else \
74616 + spin_lock(&grsec_audit_lock)
74617 +
74618 +#define END_LOCKS(x) \
74619 + if (x != GR_DO_AUDIT) \
74620 + spin_unlock(&grsec_alert_lock); \
74621 + else \
74622 + spin_unlock(&grsec_audit_lock); \
74623 + read_unlock(&grsec_exec_file_lock); \
74624 + read_unlock(&tasklist_lock); \
74625 + rcu_read_unlock(); \
74626 + ENABLE_PREEMPT(); \
74627 + if (x == GR_DONT_AUDIT) \
74628 + gr_handle_alertkill(current)
74629 +
74630 +enum {
74631 + FLOODING,
74632 + NO_FLOODING
74633 +};
74634 +
74635 +extern char *gr_alert_log_fmt;
74636 +extern char *gr_audit_log_fmt;
74637 +extern char *gr_alert_log_buf;
74638 +extern char *gr_audit_log_buf;
74639 +
74640 +static int gr_log_start(int audit)
74641 +{
74642 + char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
74643 + char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
74644 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
74645 +#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
74646 + unsigned long curr_secs = get_seconds();
74647 +
74648 + if (audit == GR_DO_AUDIT)
74649 + goto set_fmt;
74650 +
74651 + if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
74652 + grsec_alert_wtime = curr_secs;
74653 + grsec_alert_fyet = 0;
74654 + } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
74655 + && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
74656 + grsec_alert_fyet++;
74657 + } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
74658 + grsec_alert_wtime = curr_secs;
74659 + grsec_alert_fyet++;
74660 + printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
74661 + return FLOODING;
74662 + }
74663 + else return FLOODING;
74664 +
74665 +set_fmt:
74666 +#endif
74667 + memset(buf, 0, PAGE_SIZE);
74668 + if (current->signal->curr_ip && gr_acl_is_enabled()) {
74669 + sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
74670 + snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
74671 + } else if (current->signal->curr_ip) {
74672 + sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
74673 + snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
74674 + } else if (gr_acl_is_enabled()) {
74675 + sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
74676 + snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
74677 + } else {
74678 + sprintf(fmt, "%s%s", loglevel, "grsec: ");
74679 + strcpy(buf, fmt);
74680 + }
74681 +
74682 + return NO_FLOODING;
74683 +}
74684 +
74685 +static void gr_log_middle(int audit, const char *msg, va_list ap)
74686 + __attribute__ ((format (printf, 2, 0)));
74687 +
74688 +static void gr_log_middle(int audit, const char *msg, va_list ap)
74689 +{
74690 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
74691 + unsigned int len = strlen(buf);
74692 +
74693 + vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
74694 +
74695 + return;
74696 +}
74697 +
74698 +static void gr_log_middle_varargs(int audit, const char *msg, ...)
74699 + __attribute__ ((format (printf, 2, 3)));
74700 +
74701 +static void gr_log_middle_varargs(int audit, const char *msg, ...)
74702 +{
74703 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
74704 + unsigned int len = strlen(buf);
74705 + va_list ap;
74706 +
74707 + va_start(ap, msg);
74708 + vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
74709 + va_end(ap);
74710 +
74711 + return;
74712 +}
74713 +
74714 +static void gr_log_end(int audit, int append_default)
74715 +{
74716 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
74717 + if (append_default) {
74718 + struct task_struct *task = current;
74719 + struct task_struct *parent = task->real_parent;
74720 + const struct cred *cred = __task_cred(task);
74721 + const struct cred *pcred = __task_cred(parent);
74722 + unsigned int len = strlen(buf);
74723 +
74724 + 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));
74725 + }
74726 +
74727 + printk("%s\n", buf);
74728 +
74729 + return;
74730 +}
74731 +
74732 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
74733 +{
74734 + int logtype;
74735 + char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
74736 + char *str1 = NULL, *str2 = NULL, *str3 = NULL;
74737 + void *voidptr = NULL;
74738 + int num1 = 0, num2 = 0;
74739 + unsigned long ulong1 = 0, ulong2 = 0;
74740 + struct dentry *dentry = NULL;
74741 + struct vfsmount *mnt = NULL;
74742 + struct file *file = NULL;
74743 + struct task_struct *task = NULL;
74744 + struct vm_area_struct *vma = NULL;
74745 + const struct cred *cred, *pcred;
74746 + va_list ap;
74747 +
74748 + BEGIN_LOCKS(audit);
74749 + logtype = gr_log_start(audit);
74750 + if (logtype == FLOODING) {
74751 + END_LOCKS(audit);
74752 + return;
74753 + }
74754 + va_start(ap, argtypes);
74755 + switch (argtypes) {
74756 + case GR_TTYSNIFF:
74757 + task = va_arg(ap, struct task_struct *);
74758 + 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));
74759 + break;
74760 + case GR_SYSCTL_HIDDEN:
74761 + str1 = va_arg(ap, char *);
74762 + gr_log_middle_varargs(audit, msg, result, str1);
74763 + break;
74764 + case GR_RBAC:
74765 + dentry = va_arg(ap, struct dentry *);
74766 + mnt = va_arg(ap, struct vfsmount *);
74767 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
74768 + break;
74769 + case GR_RBAC_STR:
74770 + dentry = va_arg(ap, struct dentry *);
74771 + mnt = va_arg(ap, struct vfsmount *);
74772 + str1 = va_arg(ap, char *);
74773 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
74774 + break;
74775 + case GR_STR_RBAC:
74776 + str1 = va_arg(ap, char *);
74777 + dentry = va_arg(ap, struct dentry *);
74778 + mnt = va_arg(ap, struct vfsmount *);
74779 + gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
74780 + break;
74781 + case GR_RBAC_MODE2:
74782 + dentry = va_arg(ap, struct dentry *);
74783 + mnt = va_arg(ap, struct vfsmount *);
74784 + str1 = va_arg(ap, char *);
74785 + str2 = va_arg(ap, char *);
74786 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
74787 + break;
74788 + case GR_RBAC_MODE3:
74789 + dentry = va_arg(ap, struct dentry *);
74790 + mnt = va_arg(ap, struct vfsmount *);
74791 + str1 = va_arg(ap, char *);
74792 + str2 = va_arg(ap, char *);
74793 + str3 = va_arg(ap, char *);
74794 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
74795 + break;
74796 + case GR_FILENAME:
74797 + dentry = va_arg(ap, struct dentry *);
74798 + mnt = va_arg(ap, struct vfsmount *);
74799 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
74800 + break;
74801 + case GR_STR_FILENAME:
74802 + str1 = va_arg(ap, char *);
74803 + dentry = va_arg(ap, struct dentry *);
74804 + mnt = va_arg(ap, struct vfsmount *);
74805 + gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
74806 + break;
74807 + case GR_FILENAME_STR:
74808 + dentry = va_arg(ap, struct dentry *);
74809 + mnt = va_arg(ap, struct vfsmount *);
74810 + str1 = va_arg(ap, char *);
74811 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
74812 + break;
74813 + case GR_FILENAME_TWO_INT:
74814 + dentry = va_arg(ap, struct dentry *);
74815 + mnt = va_arg(ap, struct vfsmount *);
74816 + num1 = va_arg(ap, int);
74817 + num2 = va_arg(ap, int);
74818 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
74819 + break;
74820 + case GR_FILENAME_TWO_INT_STR:
74821 + dentry = va_arg(ap, struct dentry *);
74822 + mnt = va_arg(ap, struct vfsmount *);
74823 + num1 = va_arg(ap, int);
74824 + num2 = va_arg(ap, int);
74825 + str1 = va_arg(ap, char *);
74826 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
74827 + break;
74828 + case GR_TEXTREL:
74829 + file = va_arg(ap, struct file *);
74830 + ulong1 = va_arg(ap, unsigned long);
74831 + ulong2 = va_arg(ap, unsigned long);
74832 + gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
74833 + break;
74834 + case GR_PTRACE:
74835 + task = va_arg(ap, struct task_struct *);
74836 + 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));
74837 + break;
74838 + case GR_RESOURCE:
74839 + task = va_arg(ap, struct task_struct *);
74840 + cred = __task_cred(task);
74841 + pcred = __task_cred(task->real_parent);
74842 + ulong1 = va_arg(ap, unsigned long);
74843 + str1 = va_arg(ap, char *);
74844 + ulong2 = va_arg(ap, unsigned long);
74845 + 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));
74846 + break;
74847 + case GR_CAP:
74848 + task = va_arg(ap, struct task_struct *);
74849 + cred = __task_cred(task);
74850 + pcred = __task_cred(task->real_parent);
74851 + str1 = va_arg(ap, char *);
74852 + 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));
74853 + break;
74854 + case GR_SIG:
74855 + str1 = va_arg(ap, char *);
74856 + voidptr = va_arg(ap, void *);
74857 + gr_log_middle_varargs(audit, msg, str1, voidptr);
74858 + break;
74859 + case GR_SIG2:
74860 + task = va_arg(ap, struct task_struct *);
74861 + cred = __task_cred(task);
74862 + pcred = __task_cred(task->real_parent);
74863 + num1 = va_arg(ap, int);
74864 + 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));
74865 + break;
74866 + case GR_CRASH1:
74867 + task = va_arg(ap, struct task_struct *);
74868 + cred = __task_cred(task);
74869 + pcred = __task_cred(task->real_parent);
74870 + ulong1 = va_arg(ap, unsigned long);
74871 + 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);
74872 + break;
74873 + case GR_CRASH2:
74874 + task = va_arg(ap, struct task_struct *);
74875 + cred = __task_cred(task);
74876 + pcred = __task_cred(task->real_parent);
74877 + ulong1 = va_arg(ap, unsigned long);
74878 + 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);
74879 + break;
74880 + case GR_RWXMAP:
74881 + file = va_arg(ap, struct file *);
74882 + gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
74883 + break;
74884 + case GR_RWXMAPVMA:
74885 + vma = va_arg(ap, struct vm_area_struct *);
74886 + if (vma->vm_file)
74887 + str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
74888 + else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
74889 + str1 = "<stack>";
74890 + else if (vma->vm_start <= current->mm->brk &&
74891 + vma->vm_end >= current->mm->start_brk)
74892 + str1 = "<heap>";
74893 + else
74894 + str1 = "<anonymous mapping>";
74895 + gr_log_middle_varargs(audit, msg, str1);
74896 + break;
74897 + case GR_PSACCT:
74898 + {
74899 + unsigned int wday, cday;
74900 + __u8 whr, chr;
74901 + __u8 wmin, cmin;
74902 + __u8 wsec, csec;
74903 + char cur_tty[64] = { 0 };
74904 + char parent_tty[64] = { 0 };
74905 +
74906 + task = va_arg(ap, struct task_struct *);
74907 + wday = va_arg(ap, unsigned int);
74908 + cday = va_arg(ap, unsigned int);
74909 + whr = va_arg(ap, int);
74910 + chr = va_arg(ap, int);
74911 + wmin = va_arg(ap, int);
74912 + cmin = va_arg(ap, int);
74913 + wsec = va_arg(ap, int);
74914 + csec = va_arg(ap, int);
74915 + ulong1 = va_arg(ap, unsigned long);
74916 + cred = __task_cred(task);
74917 + pcred = __task_cred(task->real_parent);
74918 +
74919 + 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));
74920 + }
74921 + break;
74922 + default:
74923 + gr_log_middle(audit, msg, ap);
74924 + }
74925 + va_end(ap);
74926 + // these don't need DEFAULTSECARGS printed on the end
74927 + if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
74928 + gr_log_end(audit, 0);
74929 + else
74930 + gr_log_end(audit, 1);
74931 + END_LOCKS(audit);
74932 +}
74933 diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
74934 new file mode 100644
74935 index 0000000..0e39d8c
74936 --- /dev/null
74937 +++ b/grsecurity/grsec_mem.c
74938 @@ -0,0 +1,48 @@
74939 +#include <linux/kernel.h>
74940 +#include <linux/sched.h>
74941 +#include <linux/mm.h>
74942 +#include <linux/mman.h>
74943 +#include <linux/module.h>
74944 +#include <linux/grinternal.h>
74945 +
74946 +void gr_handle_msr_write(void)
74947 +{
74948 + gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
74949 + return;
74950 +}
74951 +EXPORT_SYMBOL_GPL(gr_handle_msr_write);
74952 +
74953 +void
74954 +gr_handle_ioperm(void)
74955 +{
74956 + gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
74957 + return;
74958 +}
74959 +
74960 +void
74961 +gr_handle_iopl(void)
74962 +{
74963 + gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
74964 + return;
74965 +}
74966 +
74967 +void
74968 +gr_handle_mem_readwrite(u64 from, u64 to)
74969 +{
74970 + gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
74971 + return;
74972 +}
74973 +
74974 +void
74975 +gr_handle_vm86(void)
74976 +{
74977 + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
74978 + return;
74979 +}
74980 +
74981 +void
74982 +gr_log_badprocpid(const char *entry)
74983 +{
74984 + gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
74985 + return;
74986 +}
74987 diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
74988 new file mode 100644
74989 index 0000000..cd9e124
74990 --- /dev/null
74991 +++ b/grsecurity/grsec_mount.c
74992 @@ -0,0 +1,65 @@
74993 +#include <linux/kernel.h>
74994 +#include <linux/sched.h>
74995 +#include <linux/mount.h>
74996 +#include <linux/major.h>
74997 +#include <linux/grsecurity.h>
74998 +#include <linux/grinternal.h>
74999 +
75000 +void
75001 +gr_log_remount(const char *devname, const int retval)
75002 +{
75003 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
75004 + if (grsec_enable_mount && (retval >= 0))
75005 + gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
75006 +#endif
75007 + return;
75008 +}
75009 +
75010 +void
75011 +gr_log_unmount(const char *devname, const int retval)
75012 +{
75013 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
75014 + if (grsec_enable_mount && (retval >= 0))
75015 + gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
75016 +#endif
75017 + return;
75018 +}
75019 +
75020 +void
75021 +gr_log_mount(const char *from, const char *to, const int retval)
75022 +{
75023 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
75024 + if (grsec_enable_mount && (retval >= 0))
75025 + gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
75026 +#endif
75027 + return;
75028 +}
75029 +
75030 +int
75031 +gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
75032 +{
75033 +#ifdef CONFIG_GRKERNSEC_ROFS
75034 + if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
75035 + gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
75036 + return -EPERM;
75037 + } else
75038 + return 0;
75039 +#endif
75040 + return 0;
75041 +}
75042 +
75043 +int
75044 +gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
75045 +{
75046 +#ifdef CONFIG_GRKERNSEC_ROFS
75047 + struct inode *inode = dentry->d_inode;
75048 +
75049 + if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
75050 + inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
75051 + gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
75052 + return -EPERM;
75053 + } else
75054 + return 0;
75055 +#endif
75056 + return 0;
75057 +}
75058 diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
75059 new file mode 100644
75060 index 0000000..6ee9d50
75061 --- /dev/null
75062 +++ b/grsecurity/grsec_pax.c
75063 @@ -0,0 +1,45 @@
75064 +#include <linux/kernel.h>
75065 +#include <linux/sched.h>
75066 +#include <linux/mm.h>
75067 +#include <linux/file.h>
75068 +#include <linux/grinternal.h>
75069 +#include <linux/grsecurity.h>
75070 +
75071 +void
75072 +gr_log_textrel(struct vm_area_struct * vma)
75073 +{
75074 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
75075 + if (grsec_enable_log_rwxmaps)
75076 + gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
75077 +#endif
75078 + return;
75079 +}
75080 +
75081 +void gr_log_ptgnustack(struct file *file)
75082 +{
75083 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
75084 + if (grsec_enable_log_rwxmaps)
75085 + gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
75086 +#endif
75087 + return;
75088 +}
75089 +
75090 +void
75091 +gr_log_rwxmmap(struct file *file)
75092 +{
75093 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
75094 + if (grsec_enable_log_rwxmaps)
75095 + gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
75096 +#endif
75097 + return;
75098 +}
75099 +
75100 +void
75101 +gr_log_rwxmprotect(struct vm_area_struct *vma)
75102 +{
75103 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
75104 + if (grsec_enable_log_rwxmaps)
75105 + gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
75106 +#endif
75107 + return;
75108 +}
75109 diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
75110 new file mode 100644
75111 index 0000000..2005a3a
75112 --- /dev/null
75113 +++ b/grsecurity/grsec_proc.c
75114 @@ -0,0 +1,20 @@
75115 +#include <linux/kernel.h>
75116 +#include <linux/sched.h>
75117 +#include <linux/grsecurity.h>
75118 +#include <linux/grinternal.h>
75119 +
75120 +int gr_proc_is_restricted(void)
75121 +{
75122 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
75123 + const struct cred *cred = current_cred();
75124 +#endif
75125 +
75126 +#ifdef CONFIG_GRKERNSEC_PROC_USER
75127 + if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
75128 + return -EACCES;
75129 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
75130 + if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
75131 + return -EACCES;
75132 +#endif
75133 + return 0;
75134 +}
75135 diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
75136 new file mode 100644
75137 index 0000000..f7f29aa
75138 --- /dev/null
75139 +++ b/grsecurity/grsec_ptrace.c
75140 @@ -0,0 +1,30 @@
75141 +#include <linux/kernel.h>
75142 +#include <linux/sched.h>
75143 +#include <linux/grinternal.h>
75144 +#include <linux/security.h>
75145 +
75146 +void
75147 +gr_audit_ptrace(struct task_struct *task)
75148 +{
75149 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
75150 + if (grsec_enable_audit_ptrace)
75151 + gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
75152 +#endif
75153 + return;
75154 +}
75155 +
75156 +int
75157 +gr_ptrace_readexec(struct file *file, int unsafe_flags)
75158 +{
75159 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
75160 + const struct dentry *dentry = file->f_path.dentry;
75161 + const struct vfsmount *mnt = file->f_path.mnt;
75162 +
75163 + if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
75164 + (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
75165 + gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
75166 + return -EACCES;
75167 + }
75168 +#endif
75169 + return 0;
75170 +}
75171 diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
75172 new file mode 100644
75173 index 0000000..3860c7e
75174 --- /dev/null
75175 +++ b/grsecurity/grsec_sig.c
75176 @@ -0,0 +1,236 @@
75177 +#include <linux/kernel.h>
75178 +#include <linux/sched.h>
75179 +#include <linux/fs.h>
75180 +#include <linux/delay.h>
75181 +#include <linux/grsecurity.h>
75182 +#include <linux/grinternal.h>
75183 +#include <linux/hardirq.h>
75184 +
75185 +char *signames[] = {
75186 + [SIGSEGV] = "Segmentation fault",
75187 + [SIGILL] = "Illegal instruction",
75188 + [SIGABRT] = "Abort",
75189 + [SIGBUS] = "Invalid alignment/Bus error"
75190 +};
75191 +
75192 +void
75193 +gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
75194 +{
75195 +#ifdef CONFIG_GRKERNSEC_SIGNAL
75196 + if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
75197 + (sig == SIGABRT) || (sig == SIGBUS))) {
75198 + if (task_pid_nr(t) == task_pid_nr(current)) {
75199 + gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
75200 + } else {
75201 + gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
75202 + }
75203 + }
75204 +#endif
75205 + return;
75206 +}
75207 +
75208 +int
75209 +gr_handle_signal(const struct task_struct *p, const int sig)
75210 +{
75211 +#ifdef CONFIG_GRKERNSEC
75212 + /* ignore the 0 signal for protected task checks */
75213 + if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
75214 + gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
75215 + return -EPERM;
75216 + } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
75217 + return -EPERM;
75218 + }
75219 +#endif
75220 + return 0;
75221 +}
75222 +
75223 +#ifdef CONFIG_GRKERNSEC
75224 +extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
75225 +
75226 +int gr_fake_force_sig(int sig, struct task_struct *t)
75227 +{
75228 + unsigned long int flags;
75229 + int ret, blocked, ignored;
75230 + struct k_sigaction *action;
75231 +
75232 + spin_lock_irqsave(&t->sighand->siglock, flags);
75233 + action = &t->sighand->action[sig-1];
75234 + ignored = action->sa.sa_handler == SIG_IGN;
75235 + blocked = sigismember(&t->blocked, sig);
75236 + if (blocked || ignored) {
75237 + action->sa.sa_handler = SIG_DFL;
75238 + if (blocked) {
75239 + sigdelset(&t->blocked, sig);
75240 + recalc_sigpending_and_wake(t);
75241 + }
75242 + }
75243 + if (action->sa.sa_handler == SIG_DFL)
75244 + t->signal->flags &= ~SIGNAL_UNKILLABLE;
75245 + ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
75246 +
75247 + spin_unlock_irqrestore(&t->sighand->siglock, flags);
75248 +
75249 + return ret;
75250 +}
75251 +#endif
75252 +
75253 +#define GR_USER_BAN_TIME (15 * 60)
75254 +#define GR_DAEMON_BRUTE_TIME (30 * 60)
75255 +
75256 +void gr_handle_brute_attach(int dumpable)
75257 +{
75258 +#ifdef CONFIG_GRKERNSEC_BRUTE
75259 + struct task_struct *p = current;
75260 + kuid_t uid = GLOBAL_ROOT_UID;
75261 + int daemon = 0;
75262 +
75263 + if (!grsec_enable_brute)
75264 + return;
75265 +
75266 + rcu_read_lock();
75267 + read_lock(&tasklist_lock);
75268 + read_lock(&grsec_exec_file_lock);
75269 + if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
75270 + p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
75271 + p->real_parent->brute = 1;
75272 + daemon = 1;
75273 + } else {
75274 + const struct cred *cred = __task_cred(p), *cred2;
75275 + struct task_struct *tsk, *tsk2;
75276 +
75277 + if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
75278 + struct user_struct *user;
75279 +
75280 + uid = cred->uid;
75281 +
75282 + /* this is put upon execution past expiration */
75283 + user = find_user(uid);
75284 + if (user == NULL)
75285 + goto unlock;
75286 + user->suid_banned = 1;
75287 + user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
75288 + if (user->suid_ban_expires == ~0UL)
75289 + user->suid_ban_expires--;
75290 +
75291 + /* only kill other threads of the same binary, from the same user */
75292 + do_each_thread(tsk2, tsk) {
75293 + cred2 = __task_cred(tsk);
75294 + if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
75295 + gr_fake_force_sig(SIGKILL, tsk);
75296 + } while_each_thread(tsk2, tsk);
75297 + }
75298 + }
75299 +unlock:
75300 + read_unlock(&grsec_exec_file_lock);
75301 + read_unlock(&tasklist_lock);
75302 + rcu_read_unlock();
75303 +
75304 + if (gr_is_global_nonroot(uid))
75305 + 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);
75306 + else if (daemon)
75307 + gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
75308 +
75309 +#endif
75310 + return;
75311 +}
75312 +
75313 +void gr_handle_brute_check(void)
75314 +{
75315 +#ifdef CONFIG_GRKERNSEC_BRUTE
75316 + struct task_struct *p = current;
75317 +
75318 + if (unlikely(p->brute)) {
75319 + if (!grsec_enable_brute)
75320 + p->brute = 0;
75321 + else if (time_before(get_seconds(), p->brute_expires))
75322 + msleep(30 * 1000);
75323 + }
75324 +#endif
75325 + return;
75326 +}
75327 +
75328 +void gr_handle_kernel_exploit(void)
75329 +{
75330 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
75331 + const struct cred *cred;
75332 + struct task_struct *tsk, *tsk2;
75333 + struct user_struct *user;
75334 + kuid_t uid;
75335 +
75336 + if (in_irq() || in_serving_softirq() || in_nmi())
75337 + panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
75338 +
75339 + uid = current_uid();
75340 +
75341 + if (gr_is_global_root(uid))
75342 + panic("grsec: halting the system due to suspicious kernel crash caused by root");
75343 + else {
75344 + /* kill all the processes of this user, hold a reference
75345 + to their creds struct, and prevent them from creating
75346 + another process until system reset
75347 + */
75348 + printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
75349 + GR_GLOBAL_UID(uid));
75350 + /* we intentionally leak this ref */
75351 + user = get_uid(current->cred->user);
75352 + if (user)
75353 + user->kernel_banned = 1;
75354 +
75355 + /* kill all processes of this user */
75356 + read_lock(&tasklist_lock);
75357 + do_each_thread(tsk2, tsk) {
75358 + cred = __task_cred(tsk);
75359 + if (uid_eq(cred->uid, uid))
75360 + gr_fake_force_sig(SIGKILL, tsk);
75361 + } while_each_thread(tsk2, tsk);
75362 + read_unlock(&tasklist_lock);
75363 + }
75364 +#endif
75365 +}
75366 +
75367 +#ifdef CONFIG_GRKERNSEC_BRUTE
75368 +static bool suid_ban_expired(struct user_struct *user)
75369 +{
75370 + if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
75371 + user->suid_banned = 0;
75372 + user->suid_ban_expires = 0;
75373 + free_uid(user);
75374 + return true;
75375 + }
75376 +
75377 + return false;
75378 +}
75379 +#endif
75380 +
75381 +int gr_process_kernel_exec_ban(void)
75382 +{
75383 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
75384 + if (unlikely(current->cred->user->kernel_banned))
75385 + return -EPERM;
75386 +#endif
75387 + return 0;
75388 +}
75389 +
75390 +int gr_process_kernel_setuid_ban(struct user_struct *user)
75391 +{
75392 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
75393 + if (unlikely(user->kernel_banned))
75394 + gr_fake_force_sig(SIGKILL, current);
75395 +#endif
75396 + return 0;
75397 +}
75398 +
75399 +int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
75400 +{
75401 +#ifdef CONFIG_GRKERNSEC_BRUTE
75402 + struct user_struct *user = current->cred->user;
75403 + if (unlikely(user->suid_banned)) {
75404 + if (suid_ban_expired(user))
75405 + return 0;
75406 + /* disallow execution of suid binaries only */
75407 + else if (!uid_eq(bprm->cred->euid, current->cred->uid))
75408 + return -EPERM;
75409 + }
75410 +#endif
75411 + return 0;
75412 +}
75413 diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
75414 new file mode 100644
75415 index 0000000..c0aef3a
75416 --- /dev/null
75417 +++ b/grsecurity/grsec_sock.c
75418 @@ -0,0 +1,244 @@
75419 +#include <linux/kernel.h>
75420 +#include <linux/module.h>
75421 +#include <linux/sched.h>
75422 +#include <linux/file.h>
75423 +#include <linux/net.h>
75424 +#include <linux/in.h>
75425 +#include <linux/ip.h>
75426 +#include <net/sock.h>
75427 +#include <net/inet_sock.h>
75428 +#include <linux/grsecurity.h>
75429 +#include <linux/grinternal.h>
75430 +#include <linux/gracl.h>
75431 +
75432 +extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
75433 +extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
75434 +
75435 +EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
75436 +EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
75437 +
75438 +#ifdef CONFIG_UNIX_MODULE
75439 +EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
75440 +EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
75441 +EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
75442 +EXPORT_SYMBOL_GPL(gr_handle_create);
75443 +#endif
75444 +
75445 +#ifdef CONFIG_GRKERNSEC
75446 +#define gr_conn_table_size 32749
75447 +struct conn_table_entry {
75448 + struct conn_table_entry *next;
75449 + struct signal_struct *sig;
75450 +};
75451 +
75452 +struct conn_table_entry *gr_conn_table[gr_conn_table_size];
75453 +DEFINE_SPINLOCK(gr_conn_table_lock);
75454 +
75455 +extern const char * gr_socktype_to_name(unsigned char type);
75456 +extern const char * gr_proto_to_name(unsigned char proto);
75457 +extern const char * gr_sockfamily_to_name(unsigned char family);
75458 +
75459 +static __inline__ int
75460 +conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
75461 +{
75462 + return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
75463 +}
75464 +
75465 +static __inline__ int
75466 +conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
75467 + __u16 sport, __u16 dport)
75468 +{
75469 + if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
75470 + sig->gr_sport == sport && sig->gr_dport == dport))
75471 + return 1;
75472 + else
75473 + return 0;
75474 +}
75475 +
75476 +static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
75477 +{
75478 + struct conn_table_entry **match;
75479 + unsigned int index;
75480 +
75481 + index = conn_hash(sig->gr_saddr, sig->gr_daddr,
75482 + sig->gr_sport, sig->gr_dport,
75483 + gr_conn_table_size);
75484 +
75485 + newent->sig = sig;
75486 +
75487 + match = &gr_conn_table[index];
75488 + newent->next = *match;
75489 + *match = newent;
75490 +
75491 + return;
75492 +}
75493 +
75494 +static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
75495 +{
75496 + struct conn_table_entry *match, *last = NULL;
75497 + unsigned int index;
75498 +
75499 + index = conn_hash(sig->gr_saddr, sig->gr_daddr,
75500 + sig->gr_sport, sig->gr_dport,
75501 + gr_conn_table_size);
75502 +
75503 + match = gr_conn_table[index];
75504 + while (match && !conn_match(match->sig,
75505 + sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
75506 + sig->gr_dport)) {
75507 + last = match;
75508 + match = match->next;
75509 + }
75510 +
75511 + if (match) {
75512 + if (last)
75513 + last->next = match->next;
75514 + else
75515 + gr_conn_table[index] = NULL;
75516 + kfree(match);
75517 + }
75518 +
75519 + return;
75520 +}
75521 +
75522 +static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
75523 + __u16 sport, __u16 dport)
75524 +{
75525 + struct conn_table_entry *match;
75526 + unsigned int index;
75527 +
75528 + index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
75529 +
75530 + match = gr_conn_table[index];
75531 + while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
75532 + match = match->next;
75533 +
75534 + if (match)
75535 + return match->sig;
75536 + else
75537 + return NULL;
75538 +}
75539 +
75540 +#endif
75541 +
75542 +void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
75543 +{
75544 +#ifdef CONFIG_GRKERNSEC
75545 + struct signal_struct *sig = task->signal;
75546 + struct conn_table_entry *newent;
75547 +
75548 + newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
75549 + if (newent == NULL)
75550 + return;
75551 + /* no bh lock needed since we are called with bh disabled */
75552 + spin_lock(&gr_conn_table_lock);
75553 + gr_del_task_from_ip_table_nolock(sig);
75554 + sig->gr_saddr = inet->inet_rcv_saddr;
75555 + sig->gr_daddr = inet->inet_daddr;
75556 + sig->gr_sport = inet->inet_sport;
75557 + sig->gr_dport = inet->inet_dport;
75558 + gr_add_to_task_ip_table_nolock(sig, newent);
75559 + spin_unlock(&gr_conn_table_lock);
75560 +#endif
75561 + return;
75562 +}
75563 +
75564 +void gr_del_task_from_ip_table(struct task_struct *task)
75565 +{
75566 +#ifdef CONFIG_GRKERNSEC
75567 + spin_lock_bh(&gr_conn_table_lock);
75568 + gr_del_task_from_ip_table_nolock(task->signal);
75569 + spin_unlock_bh(&gr_conn_table_lock);
75570 +#endif
75571 + return;
75572 +}
75573 +
75574 +void
75575 +gr_attach_curr_ip(const struct sock *sk)
75576 +{
75577 +#ifdef CONFIG_GRKERNSEC
75578 + struct signal_struct *p, *set;
75579 + const struct inet_sock *inet = inet_sk(sk);
75580 +
75581 + if (unlikely(sk->sk_protocol != IPPROTO_TCP))
75582 + return;
75583 +
75584 + set = current->signal;
75585 +
75586 + spin_lock_bh(&gr_conn_table_lock);
75587 + p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
75588 + inet->inet_dport, inet->inet_sport);
75589 + if (unlikely(p != NULL)) {
75590 + set->curr_ip = p->curr_ip;
75591 + set->used_accept = 1;
75592 + gr_del_task_from_ip_table_nolock(p);
75593 + spin_unlock_bh(&gr_conn_table_lock);
75594 + return;
75595 + }
75596 + spin_unlock_bh(&gr_conn_table_lock);
75597 +
75598 + set->curr_ip = inet->inet_daddr;
75599 + set->used_accept = 1;
75600 +#endif
75601 + return;
75602 +}
75603 +
75604 +int
75605 +gr_handle_sock_all(const int family, const int type, const int protocol)
75606 +{
75607 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
75608 + if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
75609 + (family != AF_UNIX)) {
75610 + if (family == AF_INET)
75611 + gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
75612 + else
75613 + gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
75614 + return -EACCES;
75615 + }
75616 +#endif
75617 + return 0;
75618 +}
75619 +
75620 +int
75621 +gr_handle_sock_server(const struct sockaddr *sck)
75622 +{
75623 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
75624 + if (grsec_enable_socket_server &&
75625 + in_group_p(grsec_socket_server_gid) &&
75626 + sck && (sck->sa_family != AF_UNIX) &&
75627 + (sck->sa_family != AF_LOCAL)) {
75628 + gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
75629 + return -EACCES;
75630 + }
75631 +#endif
75632 + return 0;
75633 +}
75634 +
75635 +int
75636 +gr_handle_sock_server_other(const struct sock *sck)
75637 +{
75638 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
75639 + if (grsec_enable_socket_server &&
75640 + in_group_p(grsec_socket_server_gid) &&
75641 + sck && (sck->sk_family != AF_UNIX) &&
75642 + (sck->sk_family != AF_LOCAL)) {
75643 + gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
75644 + return -EACCES;
75645 + }
75646 +#endif
75647 + return 0;
75648 +}
75649 +
75650 +int
75651 +gr_handle_sock_client(const struct sockaddr *sck)
75652 +{
75653 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
75654 + if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
75655 + sck && (sck->sa_family != AF_UNIX) &&
75656 + (sck->sa_family != AF_LOCAL)) {
75657 + gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
75658 + return -EACCES;
75659 + }
75660 +#endif
75661 + return 0;
75662 +}
75663 diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
75664 new file mode 100644
75665 index 0000000..8159888
75666 --- /dev/null
75667 +++ b/grsecurity/grsec_sysctl.c
75668 @@ -0,0 +1,479 @@
75669 +#include <linux/kernel.h>
75670 +#include <linux/sched.h>
75671 +#include <linux/sysctl.h>
75672 +#include <linux/grsecurity.h>
75673 +#include <linux/grinternal.h>
75674 +
75675 +int
75676 +gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
75677 +{
75678 +#ifdef CONFIG_GRKERNSEC_SYSCTL
75679 + if (dirname == NULL || name == NULL)
75680 + return 0;
75681 + if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
75682 + gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
75683 + return -EACCES;
75684 + }
75685 +#endif
75686 + return 0;
75687 +}
75688 +
75689 +#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
75690 +static int __maybe_unused __read_only one = 1;
75691 +#endif
75692 +
75693 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
75694 + defined(CONFIG_GRKERNSEC_DENYUSB)
75695 +struct ctl_table grsecurity_table[] = {
75696 +#ifdef CONFIG_GRKERNSEC_SYSCTL
75697 +#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
75698 +#ifdef CONFIG_GRKERNSEC_IO
75699 + {
75700 + .procname = "disable_priv_io",
75701 + .data = &grsec_disable_privio,
75702 + .maxlen = sizeof(int),
75703 + .mode = 0600,
75704 + .proc_handler = &proc_dointvec,
75705 + },
75706 +#endif
75707 +#endif
75708 +#ifdef CONFIG_GRKERNSEC_LINK
75709 + {
75710 + .procname = "linking_restrictions",
75711 + .data = &grsec_enable_link,
75712 + .maxlen = sizeof(int),
75713 + .mode = 0600,
75714 + .proc_handler = &proc_dointvec,
75715 + },
75716 +#endif
75717 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
75718 + {
75719 + .procname = "enforce_symlinksifowner",
75720 + .data = &grsec_enable_symlinkown,
75721 + .maxlen = sizeof(int),
75722 + .mode = 0600,
75723 + .proc_handler = &proc_dointvec,
75724 + },
75725 + {
75726 + .procname = "symlinkown_gid",
75727 + .data = &grsec_symlinkown_gid,
75728 + .maxlen = sizeof(int),
75729 + .mode = 0600,
75730 + .proc_handler = &proc_dointvec,
75731 + },
75732 +#endif
75733 +#ifdef CONFIG_GRKERNSEC_BRUTE
75734 + {
75735 + .procname = "deter_bruteforce",
75736 + .data = &grsec_enable_brute,
75737 + .maxlen = sizeof(int),
75738 + .mode = 0600,
75739 + .proc_handler = &proc_dointvec,
75740 + },
75741 +#endif
75742 +#ifdef CONFIG_GRKERNSEC_FIFO
75743 + {
75744 + .procname = "fifo_restrictions",
75745 + .data = &grsec_enable_fifo,
75746 + .maxlen = sizeof(int),
75747 + .mode = 0600,
75748 + .proc_handler = &proc_dointvec,
75749 + },
75750 +#endif
75751 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
75752 + {
75753 + .procname = "ptrace_readexec",
75754 + .data = &grsec_enable_ptrace_readexec,
75755 + .maxlen = sizeof(int),
75756 + .mode = 0600,
75757 + .proc_handler = &proc_dointvec,
75758 + },
75759 +#endif
75760 +#ifdef CONFIG_GRKERNSEC_SETXID
75761 + {
75762 + .procname = "consistent_setxid",
75763 + .data = &grsec_enable_setxid,
75764 + .maxlen = sizeof(int),
75765 + .mode = 0600,
75766 + .proc_handler = &proc_dointvec,
75767 + },
75768 +#endif
75769 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
75770 + {
75771 + .procname = "ip_blackhole",
75772 + .data = &grsec_enable_blackhole,
75773 + .maxlen = sizeof(int),
75774 + .mode = 0600,
75775 + .proc_handler = &proc_dointvec,
75776 + },
75777 + {
75778 + .procname = "lastack_retries",
75779 + .data = &grsec_lastack_retries,
75780 + .maxlen = sizeof(int),
75781 + .mode = 0600,
75782 + .proc_handler = &proc_dointvec,
75783 + },
75784 +#endif
75785 +#ifdef CONFIG_GRKERNSEC_EXECLOG
75786 + {
75787 + .procname = "exec_logging",
75788 + .data = &grsec_enable_execlog,
75789 + .maxlen = sizeof(int),
75790 + .mode = 0600,
75791 + .proc_handler = &proc_dointvec,
75792 + },
75793 +#endif
75794 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
75795 + {
75796 + .procname = "rwxmap_logging",
75797 + .data = &grsec_enable_log_rwxmaps,
75798 + .maxlen = sizeof(int),
75799 + .mode = 0600,
75800 + .proc_handler = &proc_dointvec,
75801 + },
75802 +#endif
75803 +#ifdef CONFIG_GRKERNSEC_SIGNAL
75804 + {
75805 + .procname = "signal_logging",
75806 + .data = &grsec_enable_signal,
75807 + .maxlen = sizeof(int),
75808 + .mode = 0600,
75809 + .proc_handler = &proc_dointvec,
75810 + },
75811 +#endif
75812 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
75813 + {
75814 + .procname = "forkfail_logging",
75815 + .data = &grsec_enable_forkfail,
75816 + .maxlen = sizeof(int),
75817 + .mode = 0600,
75818 + .proc_handler = &proc_dointvec,
75819 + },
75820 +#endif
75821 +#ifdef CONFIG_GRKERNSEC_TIME
75822 + {
75823 + .procname = "timechange_logging",
75824 + .data = &grsec_enable_time,
75825 + .maxlen = sizeof(int),
75826 + .mode = 0600,
75827 + .proc_handler = &proc_dointvec,
75828 + },
75829 +#endif
75830 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
75831 + {
75832 + .procname = "chroot_deny_shmat",
75833 + .data = &grsec_enable_chroot_shmat,
75834 + .maxlen = sizeof(int),
75835 + .mode = 0600,
75836 + .proc_handler = &proc_dointvec,
75837 + },
75838 +#endif
75839 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
75840 + {
75841 + .procname = "chroot_deny_unix",
75842 + .data = &grsec_enable_chroot_unix,
75843 + .maxlen = sizeof(int),
75844 + .mode = 0600,
75845 + .proc_handler = &proc_dointvec,
75846 + },
75847 +#endif
75848 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
75849 + {
75850 + .procname = "chroot_deny_mount",
75851 + .data = &grsec_enable_chroot_mount,
75852 + .maxlen = sizeof(int),
75853 + .mode = 0600,
75854 + .proc_handler = &proc_dointvec,
75855 + },
75856 +#endif
75857 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
75858 + {
75859 + .procname = "chroot_deny_fchdir",
75860 + .data = &grsec_enable_chroot_fchdir,
75861 + .maxlen = sizeof(int),
75862 + .mode = 0600,
75863 + .proc_handler = &proc_dointvec,
75864 + },
75865 +#endif
75866 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
75867 + {
75868 + .procname = "chroot_deny_chroot",
75869 + .data = &grsec_enable_chroot_double,
75870 + .maxlen = sizeof(int),
75871 + .mode = 0600,
75872 + .proc_handler = &proc_dointvec,
75873 + },
75874 +#endif
75875 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
75876 + {
75877 + .procname = "chroot_deny_pivot",
75878 + .data = &grsec_enable_chroot_pivot,
75879 + .maxlen = sizeof(int),
75880 + .mode = 0600,
75881 + .proc_handler = &proc_dointvec,
75882 + },
75883 +#endif
75884 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
75885 + {
75886 + .procname = "chroot_enforce_chdir",
75887 + .data = &grsec_enable_chroot_chdir,
75888 + .maxlen = sizeof(int),
75889 + .mode = 0600,
75890 + .proc_handler = &proc_dointvec,
75891 + },
75892 +#endif
75893 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
75894 + {
75895 + .procname = "chroot_deny_chmod",
75896 + .data = &grsec_enable_chroot_chmod,
75897 + .maxlen = sizeof(int),
75898 + .mode = 0600,
75899 + .proc_handler = &proc_dointvec,
75900 + },
75901 +#endif
75902 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
75903 + {
75904 + .procname = "chroot_deny_mknod",
75905 + .data = &grsec_enable_chroot_mknod,
75906 + .maxlen = sizeof(int),
75907 + .mode = 0600,
75908 + .proc_handler = &proc_dointvec,
75909 + },
75910 +#endif
75911 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
75912 + {
75913 + .procname = "chroot_restrict_nice",
75914 + .data = &grsec_enable_chroot_nice,
75915 + .maxlen = sizeof(int),
75916 + .mode = 0600,
75917 + .proc_handler = &proc_dointvec,
75918 + },
75919 +#endif
75920 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
75921 + {
75922 + .procname = "chroot_execlog",
75923 + .data = &grsec_enable_chroot_execlog,
75924 + .maxlen = sizeof(int),
75925 + .mode = 0600,
75926 + .proc_handler = &proc_dointvec,
75927 + },
75928 +#endif
75929 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
75930 + {
75931 + .procname = "chroot_caps",
75932 + .data = &grsec_enable_chroot_caps,
75933 + .maxlen = sizeof(int),
75934 + .mode = 0600,
75935 + .proc_handler = &proc_dointvec,
75936 + },
75937 +#endif
75938 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
75939 + {
75940 + .procname = "chroot_deny_sysctl",
75941 + .data = &grsec_enable_chroot_sysctl,
75942 + .maxlen = sizeof(int),
75943 + .mode = 0600,
75944 + .proc_handler = &proc_dointvec,
75945 + },
75946 +#endif
75947 +#ifdef CONFIG_GRKERNSEC_TPE
75948 + {
75949 + .procname = "tpe",
75950 + .data = &grsec_enable_tpe,
75951 + .maxlen = sizeof(int),
75952 + .mode = 0600,
75953 + .proc_handler = &proc_dointvec,
75954 + },
75955 + {
75956 + .procname = "tpe_gid",
75957 + .data = &grsec_tpe_gid,
75958 + .maxlen = sizeof(int),
75959 + .mode = 0600,
75960 + .proc_handler = &proc_dointvec,
75961 + },
75962 +#endif
75963 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
75964 + {
75965 + .procname = "tpe_invert",
75966 + .data = &grsec_enable_tpe_invert,
75967 + .maxlen = sizeof(int),
75968 + .mode = 0600,
75969 + .proc_handler = &proc_dointvec,
75970 + },
75971 +#endif
75972 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
75973 + {
75974 + .procname = "tpe_restrict_all",
75975 + .data = &grsec_enable_tpe_all,
75976 + .maxlen = sizeof(int),
75977 + .mode = 0600,
75978 + .proc_handler = &proc_dointvec,
75979 + },
75980 +#endif
75981 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
75982 + {
75983 + .procname = "socket_all",
75984 + .data = &grsec_enable_socket_all,
75985 + .maxlen = sizeof(int),
75986 + .mode = 0600,
75987 + .proc_handler = &proc_dointvec,
75988 + },
75989 + {
75990 + .procname = "socket_all_gid",
75991 + .data = &grsec_socket_all_gid,
75992 + .maxlen = sizeof(int),
75993 + .mode = 0600,
75994 + .proc_handler = &proc_dointvec,
75995 + },
75996 +#endif
75997 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
75998 + {
75999 + .procname = "socket_client",
76000 + .data = &grsec_enable_socket_client,
76001 + .maxlen = sizeof(int),
76002 + .mode = 0600,
76003 + .proc_handler = &proc_dointvec,
76004 + },
76005 + {
76006 + .procname = "socket_client_gid",
76007 + .data = &grsec_socket_client_gid,
76008 + .maxlen = sizeof(int),
76009 + .mode = 0600,
76010 + .proc_handler = &proc_dointvec,
76011 + },
76012 +#endif
76013 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
76014 + {
76015 + .procname = "socket_server",
76016 + .data = &grsec_enable_socket_server,
76017 + .maxlen = sizeof(int),
76018 + .mode = 0600,
76019 + .proc_handler = &proc_dointvec,
76020 + },
76021 + {
76022 + .procname = "socket_server_gid",
76023 + .data = &grsec_socket_server_gid,
76024 + .maxlen = sizeof(int),
76025 + .mode = 0600,
76026 + .proc_handler = &proc_dointvec,
76027 + },
76028 +#endif
76029 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
76030 + {
76031 + .procname = "audit_group",
76032 + .data = &grsec_enable_group,
76033 + .maxlen = sizeof(int),
76034 + .mode = 0600,
76035 + .proc_handler = &proc_dointvec,
76036 + },
76037 + {
76038 + .procname = "audit_gid",
76039 + .data = &grsec_audit_gid,
76040 + .maxlen = sizeof(int),
76041 + .mode = 0600,
76042 + .proc_handler = &proc_dointvec,
76043 + },
76044 +#endif
76045 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
76046 + {
76047 + .procname = "audit_chdir",
76048 + .data = &grsec_enable_chdir,
76049 + .maxlen = sizeof(int),
76050 + .mode = 0600,
76051 + .proc_handler = &proc_dointvec,
76052 + },
76053 +#endif
76054 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
76055 + {
76056 + .procname = "audit_mount",
76057 + .data = &grsec_enable_mount,
76058 + .maxlen = sizeof(int),
76059 + .mode = 0600,
76060 + .proc_handler = &proc_dointvec,
76061 + },
76062 +#endif
76063 +#ifdef CONFIG_GRKERNSEC_DMESG
76064 + {
76065 + .procname = "dmesg",
76066 + .data = &grsec_enable_dmesg,
76067 + .maxlen = sizeof(int),
76068 + .mode = 0600,
76069 + .proc_handler = &proc_dointvec,
76070 + },
76071 +#endif
76072 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
76073 + {
76074 + .procname = "chroot_findtask",
76075 + .data = &grsec_enable_chroot_findtask,
76076 + .maxlen = sizeof(int),
76077 + .mode = 0600,
76078 + .proc_handler = &proc_dointvec,
76079 + },
76080 +#endif
76081 +#ifdef CONFIG_GRKERNSEC_RESLOG
76082 + {
76083 + .procname = "resource_logging",
76084 + .data = &grsec_resource_logging,
76085 + .maxlen = sizeof(int),
76086 + .mode = 0600,
76087 + .proc_handler = &proc_dointvec,
76088 + },
76089 +#endif
76090 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
76091 + {
76092 + .procname = "audit_ptrace",
76093 + .data = &grsec_enable_audit_ptrace,
76094 + .maxlen = sizeof(int),
76095 + .mode = 0600,
76096 + .proc_handler = &proc_dointvec,
76097 + },
76098 +#endif
76099 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
76100 + {
76101 + .procname = "harden_ptrace",
76102 + .data = &grsec_enable_harden_ptrace,
76103 + .maxlen = sizeof(int),
76104 + .mode = 0600,
76105 + .proc_handler = &proc_dointvec,
76106 + },
76107 +#endif
76108 +#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
76109 + {
76110 + .procname = "harden_ipc",
76111 + .data = &grsec_enable_harden_ipc,
76112 + .maxlen = sizeof(int),
76113 + .mode = 0600,
76114 + .proc_handler = &proc_dointvec,
76115 + },
76116 +#endif
76117 + {
76118 + .procname = "grsec_lock",
76119 + .data = &grsec_lock,
76120 + .maxlen = sizeof(int),
76121 + .mode = 0600,
76122 + .proc_handler = &proc_dointvec,
76123 + },
76124 +#endif
76125 +#ifdef CONFIG_GRKERNSEC_ROFS
76126 + {
76127 + .procname = "romount_protect",
76128 + .data = &grsec_enable_rofs,
76129 + .maxlen = sizeof(int),
76130 + .mode = 0600,
76131 + .proc_handler = &proc_dointvec_minmax,
76132 + .extra1 = &one,
76133 + .extra2 = &one,
76134 + },
76135 +#endif
76136 +#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
76137 + {
76138 + .procname = "deny_new_usb",
76139 + .data = &grsec_deny_new_usb,
76140 + .maxlen = sizeof(int),
76141 + .mode = 0600,
76142 + .proc_handler = &proc_dointvec,
76143 + },
76144 +#endif
76145 + { }
76146 +};
76147 +#endif
76148 diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
76149 new file mode 100644
76150 index 0000000..61b514e
76151 --- /dev/null
76152 +++ b/grsecurity/grsec_time.c
76153 @@ -0,0 +1,16 @@
76154 +#include <linux/kernel.h>
76155 +#include <linux/sched.h>
76156 +#include <linux/grinternal.h>
76157 +#include <linux/module.h>
76158 +
76159 +void
76160 +gr_log_timechange(void)
76161 +{
76162 +#ifdef CONFIG_GRKERNSEC_TIME
76163 + if (grsec_enable_time)
76164 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
76165 +#endif
76166 + return;
76167 +}
76168 +
76169 +EXPORT_SYMBOL_GPL(gr_log_timechange);
76170 diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
76171 new file mode 100644
76172 index 0000000..ee57dcf
76173 --- /dev/null
76174 +++ b/grsecurity/grsec_tpe.c
76175 @@ -0,0 +1,73 @@
76176 +#include <linux/kernel.h>
76177 +#include <linux/sched.h>
76178 +#include <linux/file.h>
76179 +#include <linux/fs.h>
76180 +#include <linux/grinternal.h>
76181 +
76182 +extern int gr_acl_tpe_check(void);
76183 +
76184 +int
76185 +gr_tpe_allow(const struct file *file)
76186 +{
76187 +#ifdef CONFIG_GRKERNSEC
76188 + struct inode *inode = file->f_path.dentry->d_parent->d_inode;
76189 + const struct cred *cred = current_cred();
76190 + char *msg = NULL;
76191 + char *msg2 = NULL;
76192 +
76193 + // never restrict root
76194 + if (gr_is_global_root(cred->uid))
76195 + return 1;
76196 +
76197 + if (grsec_enable_tpe) {
76198 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
76199 + if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
76200 + msg = "not being in trusted group";
76201 + else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
76202 + msg = "being in untrusted group";
76203 +#else
76204 + if (in_group_p(grsec_tpe_gid))
76205 + msg = "being in untrusted group";
76206 +#endif
76207 + }
76208 + if (!msg && gr_acl_tpe_check())
76209 + msg = "being in untrusted role";
76210 +
76211 + // not in any affected group/role
76212 + if (!msg)
76213 + goto next_check;
76214 +
76215 + if (gr_is_global_nonroot(inode->i_uid))
76216 + msg2 = "file in non-root-owned directory";
76217 + else if (inode->i_mode & S_IWOTH)
76218 + msg2 = "file in world-writable directory";
76219 + else if (inode->i_mode & S_IWGRP)
76220 + msg2 = "file in group-writable directory";
76221 +
76222 + if (msg && msg2) {
76223 + char fullmsg[70] = {0};
76224 + snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
76225 + gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
76226 + return 0;
76227 + }
76228 + msg = NULL;
76229 +next_check:
76230 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
76231 + if (!grsec_enable_tpe || !grsec_enable_tpe_all)
76232 + return 1;
76233 +
76234 + if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
76235 + msg = "directory not owned by user";
76236 + else if (inode->i_mode & S_IWOTH)
76237 + msg = "file in world-writable directory";
76238 + else if (inode->i_mode & S_IWGRP)
76239 + msg = "file in group-writable directory";
76240 +
76241 + if (msg) {
76242 + gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
76243 + return 0;
76244 + }
76245 +#endif
76246 +#endif
76247 + return 1;
76248 +}
76249 diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
76250 new file mode 100644
76251 index 0000000..ae02d8e
76252 --- /dev/null
76253 +++ b/grsecurity/grsec_usb.c
76254 @@ -0,0 +1,15 @@
76255 +#include <linux/kernel.h>
76256 +#include <linux/grinternal.h>
76257 +#include <linux/module.h>
76258 +
76259 +int gr_handle_new_usb(void)
76260 +{
76261 +#ifdef CONFIG_GRKERNSEC_DENYUSB
76262 + if (grsec_deny_new_usb) {
76263 + printk(KERN_ALERT "grsec: denied insert of new USB device\n");
76264 + return 1;
76265 + }
76266 +#endif
76267 + return 0;
76268 +}
76269 +EXPORT_SYMBOL_GPL(gr_handle_new_usb);
76270 diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
76271 new file mode 100644
76272 index 0000000..9f7b1ac
76273 --- /dev/null
76274 +++ b/grsecurity/grsum.c
76275 @@ -0,0 +1,61 @@
76276 +#include <linux/err.h>
76277 +#include <linux/kernel.h>
76278 +#include <linux/sched.h>
76279 +#include <linux/mm.h>
76280 +#include <linux/scatterlist.h>
76281 +#include <linux/crypto.h>
76282 +#include <linux/gracl.h>
76283 +
76284 +
76285 +#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
76286 +#error "crypto and sha256 must be built into the kernel"
76287 +#endif
76288 +
76289 +int
76290 +chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
76291 +{
76292 + char *p;
76293 + struct crypto_hash *tfm;
76294 + struct hash_desc desc;
76295 + struct scatterlist sg;
76296 + unsigned char temp_sum[GR_SHA_LEN];
76297 + volatile int retval = 0;
76298 + volatile int dummy = 0;
76299 + unsigned int i;
76300 +
76301 + sg_init_table(&sg, 1);
76302 +
76303 + tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
76304 + if (IS_ERR(tfm)) {
76305 + /* should never happen, since sha256 should be built in */
76306 + return 1;
76307 + }
76308 +
76309 + desc.tfm = tfm;
76310 + desc.flags = 0;
76311 +
76312 + crypto_hash_init(&desc);
76313 +
76314 + p = salt;
76315 + sg_set_buf(&sg, p, GR_SALT_LEN);
76316 + crypto_hash_update(&desc, &sg, sg.length);
76317 +
76318 + p = entry->pw;
76319 + sg_set_buf(&sg, p, strlen(p));
76320 +
76321 + crypto_hash_update(&desc, &sg, sg.length);
76322 +
76323 + crypto_hash_final(&desc, temp_sum);
76324 +
76325 + memset(entry->pw, 0, GR_PW_LEN);
76326 +
76327 + for (i = 0; i < GR_SHA_LEN; i++)
76328 + if (sum[i] != temp_sum[i])
76329 + retval = 1;
76330 + else
76331 + dummy = 1; // waste a cycle
76332 +
76333 + crypto_free_hash(tfm);
76334 +
76335 + return retval;
76336 +}
76337 diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
76338 index 77ff547..181834f 100644
76339 --- a/include/asm-generic/4level-fixup.h
76340 +++ b/include/asm-generic/4level-fixup.h
76341 @@ -13,8 +13,10 @@
76342 #define pmd_alloc(mm, pud, address) \
76343 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
76344 NULL: pmd_offset(pud, address))
76345 +#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
76346
76347 #define pud_alloc(mm, pgd, address) (pgd)
76348 +#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
76349 #define pud_offset(pgd, start) (pgd)
76350 #define pud_none(pud) 0
76351 #define pud_bad(pud) 0
76352 diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
76353 index b7babf0..97f4c4f 100644
76354 --- a/include/asm-generic/atomic-long.h
76355 +++ b/include/asm-generic/atomic-long.h
76356 @@ -22,6 +22,12 @@
76357
76358 typedef atomic64_t atomic_long_t;
76359
76360 +#ifdef CONFIG_PAX_REFCOUNT
76361 +typedef atomic64_unchecked_t atomic_long_unchecked_t;
76362 +#else
76363 +typedef atomic64_t atomic_long_unchecked_t;
76364 +#endif
76365 +
76366 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
76367
76368 static inline long atomic_long_read(atomic_long_t *l)
76369 @@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
76370 return (long)atomic64_read(v);
76371 }
76372
76373 +#ifdef CONFIG_PAX_REFCOUNT
76374 +static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
76375 +{
76376 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76377 +
76378 + return (long)atomic64_read_unchecked(v);
76379 +}
76380 +#endif
76381 +
76382 static inline void atomic_long_set(atomic_long_t *l, long i)
76383 {
76384 atomic64_t *v = (atomic64_t *)l;
76385 @@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
76386 atomic64_set(v, i);
76387 }
76388
76389 +#ifdef CONFIG_PAX_REFCOUNT
76390 +static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
76391 +{
76392 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76393 +
76394 + atomic64_set_unchecked(v, i);
76395 +}
76396 +#endif
76397 +
76398 static inline void atomic_long_inc(atomic_long_t *l)
76399 {
76400 atomic64_t *v = (atomic64_t *)l;
76401 @@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
76402 atomic64_inc(v);
76403 }
76404
76405 +#ifdef CONFIG_PAX_REFCOUNT
76406 +static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
76407 +{
76408 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76409 +
76410 + atomic64_inc_unchecked(v);
76411 +}
76412 +#endif
76413 +
76414 static inline void atomic_long_dec(atomic_long_t *l)
76415 {
76416 atomic64_t *v = (atomic64_t *)l;
76417 @@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
76418 atomic64_dec(v);
76419 }
76420
76421 +#ifdef CONFIG_PAX_REFCOUNT
76422 +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
76423 +{
76424 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76425 +
76426 + atomic64_dec_unchecked(v);
76427 +}
76428 +#endif
76429 +
76430 static inline void atomic_long_add(long i, atomic_long_t *l)
76431 {
76432 atomic64_t *v = (atomic64_t *)l;
76433 @@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
76434 atomic64_add(i, v);
76435 }
76436
76437 +#ifdef CONFIG_PAX_REFCOUNT
76438 +static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
76439 +{
76440 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76441 +
76442 + atomic64_add_unchecked(i, v);
76443 +}
76444 +#endif
76445 +
76446 static inline void atomic_long_sub(long i, atomic_long_t *l)
76447 {
76448 atomic64_t *v = (atomic64_t *)l;
76449 @@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
76450 atomic64_sub(i, v);
76451 }
76452
76453 +#ifdef CONFIG_PAX_REFCOUNT
76454 +static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
76455 +{
76456 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76457 +
76458 + atomic64_sub_unchecked(i, v);
76459 +}
76460 +#endif
76461 +
76462 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
76463 {
76464 atomic64_t *v = (atomic64_t *)l;
76465 @@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
76466 return atomic64_add_negative(i, v);
76467 }
76468
76469 -static inline long atomic_long_add_return(long i, atomic_long_t *l)
76470 +static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
76471 {
76472 atomic64_t *v = (atomic64_t *)l;
76473
76474 return (long)atomic64_add_return(i, v);
76475 }
76476
76477 +#ifdef CONFIG_PAX_REFCOUNT
76478 +static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
76479 +{
76480 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76481 +
76482 + return (long)atomic64_add_return_unchecked(i, v);
76483 +}
76484 +#endif
76485 +
76486 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
76487 {
76488 atomic64_t *v = (atomic64_t *)l;
76489 @@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
76490 return (long)atomic64_inc_return(v);
76491 }
76492
76493 +#ifdef CONFIG_PAX_REFCOUNT
76494 +static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
76495 +{
76496 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76497 +
76498 + return (long)atomic64_inc_return_unchecked(v);
76499 +}
76500 +#endif
76501 +
76502 static inline long atomic_long_dec_return(atomic_long_t *l)
76503 {
76504 atomic64_t *v = (atomic64_t *)l;
76505 @@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
76506
76507 typedef atomic_t atomic_long_t;
76508
76509 +#ifdef CONFIG_PAX_REFCOUNT
76510 +typedef atomic_unchecked_t atomic_long_unchecked_t;
76511 +#else
76512 +typedef atomic_t atomic_long_unchecked_t;
76513 +#endif
76514 +
76515 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
76516 static inline long atomic_long_read(atomic_long_t *l)
76517 {
76518 @@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
76519 return (long)atomic_read(v);
76520 }
76521
76522 +#ifdef CONFIG_PAX_REFCOUNT
76523 +static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
76524 +{
76525 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
76526 +
76527 + return (long)atomic_read_unchecked(v);
76528 +}
76529 +#endif
76530 +
76531 static inline void atomic_long_set(atomic_long_t *l, long i)
76532 {
76533 atomic_t *v = (atomic_t *)l;
76534 @@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
76535 atomic_set(v, i);
76536 }
76537
76538 +#ifdef CONFIG_PAX_REFCOUNT
76539 +static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
76540 +{
76541 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
76542 +
76543 + atomic_set_unchecked(v, i);
76544 +}
76545 +#endif
76546 +
76547 static inline void atomic_long_inc(atomic_long_t *l)
76548 {
76549 atomic_t *v = (atomic_t *)l;
76550 @@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
76551 atomic_inc(v);
76552 }
76553
76554 +#ifdef CONFIG_PAX_REFCOUNT
76555 +static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
76556 +{
76557 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
76558 +
76559 + atomic_inc_unchecked(v);
76560 +}
76561 +#endif
76562 +
76563 static inline void atomic_long_dec(atomic_long_t *l)
76564 {
76565 atomic_t *v = (atomic_t *)l;
76566 @@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
76567 atomic_dec(v);
76568 }
76569
76570 +#ifdef CONFIG_PAX_REFCOUNT
76571 +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
76572 +{
76573 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
76574 +
76575 + atomic_dec_unchecked(v);
76576 +}
76577 +#endif
76578 +
76579 static inline void atomic_long_add(long i, atomic_long_t *l)
76580 {
76581 atomic_t *v = (atomic_t *)l;
76582 @@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
76583 atomic_add(i, v);
76584 }
76585
76586 +#ifdef CONFIG_PAX_REFCOUNT
76587 +static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
76588 +{
76589 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
76590 +
76591 + atomic_add_unchecked(i, v);
76592 +}
76593 +#endif
76594 +
76595 static inline void atomic_long_sub(long i, atomic_long_t *l)
76596 {
76597 atomic_t *v = (atomic_t *)l;
76598 @@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
76599 atomic_sub(i, v);
76600 }
76601
76602 +#ifdef CONFIG_PAX_REFCOUNT
76603 +static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
76604 +{
76605 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
76606 +
76607 + atomic_sub_unchecked(i, v);
76608 +}
76609 +#endif
76610 +
76611 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
76612 {
76613 atomic_t *v = (atomic_t *)l;
76614 @@ -218,6 +356,16 @@ static inline long atomic_long_add_return(long i, atomic_long_t *l)
76615 return (long)atomic_add_return(i, v);
76616 }
76617
76618 +#ifdef CONFIG_PAX_REFCOUNT
76619 +static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
76620 +{
76621 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
76622 +
76623 + return (long)atomic_add_return_unchecked(i, v);
76624 +}
76625 +
76626 +#endif
76627 +
76628 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
76629 {
76630 atomic_t *v = (atomic_t *)l;
76631 @@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
76632 return (long)atomic_inc_return(v);
76633 }
76634
76635 +#ifdef CONFIG_PAX_REFCOUNT
76636 +static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
76637 +{
76638 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
76639 +
76640 + return (long)atomic_inc_return_unchecked(v);
76641 +}
76642 +#endif
76643 +
76644 static inline long atomic_long_dec_return(atomic_long_t *l)
76645 {
76646 atomic_t *v = (atomic_t *)l;
76647 @@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
76648
76649 #endif /* BITS_PER_LONG == 64 */
76650
76651 +#ifdef CONFIG_PAX_REFCOUNT
76652 +static inline void pax_refcount_needs_these_functions(void)
76653 +{
76654 + atomic_read_unchecked((atomic_unchecked_t *)NULL);
76655 + atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
76656 + atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
76657 + atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
76658 + atomic_inc_unchecked((atomic_unchecked_t *)NULL);
76659 + (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
76660 + atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
76661 + atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
76662 + atomic_dec_unchecked((atomic_unchecked_t *)NULL);
76663 + atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
76664 + (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
76665 +#ifdef CONFIG_X86
76666 + atomic_clear_mask_unchecked(0, NULL);
76667 + atomic_set_mask_unchecked(0, NULL);
76668 +#endif
76669 +
76670 + atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
76671 + atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
76672 + atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
76673 + atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
76674 + atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
76675 + atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
76676 + atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
76677 + atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
76678 +}
76679 +#else
76680 +#define atomic_read_unchecked(v) atomic_read(v)
76681 +#define atomic_set_unchecked(v, i) atomic_set((v), (i))
76682 +#define atomic_add_unchecked(i, v) atomic_add((i), (v))
76683 +#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
76684 +#define atomic_inc_unchecked(v) atomic_inc(v)
76685 +#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
76686 +#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
76687 +#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
76688 +#define atomic_dec_unchecked(v) atomic_dec(v)
76689 +#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
76690 +#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
76691 +#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
76692 +#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
76693 +
76694 +#define atomic_long_read_unchecked(v) atomic_long_read(v)
76695 +#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
76696 +#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
76697 +#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
76698 +#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
76699 +#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
76700 +#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
76701 +#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
76702 +#endif
76703 +
76704 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
76705 diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
76706 index 33bd2de..f31bff97 100644
76707 --- a/include/asm-generic/atomic.h
76708 +++ b/include/asm-generic/atomic.h
76709 @@ -153,7 +153,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
76710 * Atomically clears the bits set in @mask from @v
76711 */
76712 #ifndef atomic_clear_mask
76713 -static inline void atomic_clear_mask(unsigned long mask, atomic_t *v)
76714 +static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
76715 {
76716 unsigned long flags;
76717
76718 diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
76719 index b18ce4f..2ee2843 100644
76720 --- a/include/asm-generic/atomic64.h
76721 +++ b/include/asm-generic/atomic64.h
76722 @@ -16,6 +16,8 @@ typedef struct {
76723 long long counter;
76724 } atomic64_t;
76725
76726 +typedef atomic64_t atomic64_unchecked_t;
76727 +
76728 #define ATOMIC64_INIT(i) { (i) }
76729
76730 extern long long atomic64_read(const atomic64_t *v);
76731 @@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
76732 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
76733 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
76734
76735 +#define atomic64_read_unchecked(v) atomic64_read(v)
76736 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
76737 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
76738 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
76739 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
76740 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
76741 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
76742 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
76743 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
76744 +
76745 #endif /* _ASM_GENERIC_ATOMIC64_H */
76746 diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
76747 index a60a7cc..0fe12f2 100644
76748 --- a/include/asm-generic/bitops/__fls.h
76749 +++ b/include/asm-generic/bitops/__fls.h
76750 @@ -9,7 +9,7 @@
76751 *
76752 * Undefined if no set bit exists, so code should check against 0 first.
76753 */
76754 -static __always_inline unsigned long __fls(unsigned long word)
76755 +static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
76756 {
76757 int num = BITS_PER_LONG - 1;
76758
76759 diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
76760 index 0576d1f..dad6c71 100644
76761 --- a/include/asm-generic/bitops/fls.h
76762 +++ b/include/asm-generic/bitops/fls.h
76763 @@ -9,7 +9,7 @@
76764 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
76765 */
76766
76767 -static __always_inline int fls(int x)
76768 +static __always_inline int __intentional_overflow(-1) fls(int x)
76769 {
76770 int r = 32;
76771
76772 diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
76773 index b097cf8..3d40e14 100644
76774 --- a/include/asm-generic/bitops/fls64.h
76775 +++ b/include/asm-generic/bitops/fls64.h
76776 @@ -15,7 +15,7 @@
76777 * at position 64.
76778 */
76779 #if BITS_PER_LONG == 32
76780 -static __always_inline int fls64(__u64 x)
76781 +static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
76782 {
76783 __u32 h = x >> 32;
76784 if (h)
76785 @@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
76786 return fls(x);
76787 }
76788 #elif BITS_PER_LONG == 64
76789 -static __always_inline int fls64(__u64 x)
76790 +static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
76791 {
76792 if (x == 0)
76793 return 0;
76794 diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
76795 index 1bfcfe5..e04c5c9 100644
76796 --- a/include/asm-generic/cache.h
76797 +++ b/include/asm-generic/cache.h
76798 @@ -6,7 +6,7 @@
76799 * cache lines need to provide their own cache.h.
76800 */
76801
76802 -#define L1_CACHE_SHIFT 5
76803 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
76804 +#define L1_CACHE_SHIFT 5UL
76805 +#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
76806
76807 #endif /* __ASM_GENERIC_CACHE_H */
76808 diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
76809 index 0d68a1e..b74a761 100644
76810 --- a/include/asm-generic/emergency-restart.h
76811 +++ b/include/asm-generic/emergency-restart.h
76812 @@ -1,7 +1,7 @@
76813 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
76814 #define _ASM_GENERIC_EMERGENCY_RESTART_H
76815
76816 -static inline void machine_emergency_restart(void)
76817 +static inline __noreturn void machine_emergency_restart(void)
76818 {
76819 machine_restart(NULL);
76820 }
76821 diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
76822 index 90f99c7..00ce236 100644
76823 --- a/include/asm-generic/kmap_types.h
76824 +++ b/include/asm-generic/kmap_types.h
76825 @@ -2,9 +2,9 @@
76826 #define _ASM_GENERIC_KMAP_TYPES_H
76827
76828 #ifdef __WITH_KM_FENCE
76829 -# define KM_TYPE_NR 41
76830 +# define KM_TYPE_NR 42
76831 #else
76832 -# define KM_TYPE_NR 20
76833 +# define KM_TYPE_NR 21
76834 #endif
76835
76836 #endif
76837 diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
76838 index 9ceb03b..62b0b8f 100644
76839 --- a/include/asm-generic/local.h
76840 +++ b/include/asm-generic/local.h
76841 @@ -23,24 +23,37 @@ typedef struct
76842 atomic_long_t a;
76843 } local_t;
76844
76845 +typedef struct {
76846 + atomic_long_unchecked_t a;
76847 +} local_unchecked_t;
76848 +
76849 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
76850
76851 #define local_read(l) atomic_long_read(&(l)->a)
76852 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
76853 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
76854 +#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
76855 #define local_inc(l) atomic_long_inc(&(l)->a)
76856 +#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
76857 #define local_dec(l) atomic_long_dec(&(l)->a)
76858 +#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
76859 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
76860 +#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
76861 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
76862 +#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
76863
76864 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
76865 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
76866 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
76867 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
76868 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
76869 +#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
76870 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
76871 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
76872 +#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
76873
76874 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
76875 +#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
76876 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
76877 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
76878 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
76879 diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
76880 index 725612b..9cc513a 100644
76881 --- a/include/asm-generic/pgtable-nopmd.h
76882 +++ b/include/asm-generic/pgtable-nopmd.h
76883 @@ -1,14 +1,19 @@
76884 #ifndef _PGTABLE_NOPMD_H
76885 #define _PGTABLE_NOPMD_H
76886
76887 -#ifndef __ASSEMBLY__
76888 -
76889 #include <asm-generic/pgtable-nopud.h>
76890
76891 -struct mm_struct;
76892 -
76893 #define __PAGETABLE_PMD_FOLDED
76894
76895 +#define PMD_SHIFT PUD_SHIFT
76896 +#define PTRS_PER_PMD 1
76897 +#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
76898 +#define PMD_MASK (~(PMD_SIZE-1))
76899 +
76900 +#ifndef __ASSEMBLY__
76901 +
76902 +struct mm_struct;
76903 +
76904 /*
76905 * Having the pmd type consist of a pud gets the size right, and allows
76906 * us to conceptually access the pud entry that this pmd is folded into
76907 @@ -16,11 +21,6 @@ struct mm_struct;
76908 */
76909 typedef struct { pud_t pud; } pmd_t;
76910
76911 -#define PMD_SHIFT PUD_SHIFT
76912 -#define PTRS_PER_PMD 1
76913 -#define PMD_SIZE (1UL << PMD_SHIFT)
76914 -#define PMD_MASK (~(PMD_SIZE-1))
76915 -
76916 /*
76917 * The "pud_xxx()" functions here are trivial for a folded two-level
76918 * setup: the pmd is never bad, and a pmd always exists (as it's folded
76919 diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
76920 index 810431d..0ec4804f 100644
76921 --- a/include/asm-generic/pgtable-nopud.h
76922 +++ b/include/asm-generic/pgtable-nopud.h
76923 @@ -1,10 +1,15 @@
76924 #ifndef _PGTABLE_NOPUD_H
76925 #define _PGTABLE_NOPUD_H
76926
76927 -#ifndef __ASSEMBLY__
76928 -
76929 #define __PAGETABLE_PUD_FOLDED
76930
76931 +#define PUD_SHIFT PGDIR_SHIFT
76932 +#define PTRS_PER_PUD 1
76933 +#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
76934 +#define PUD_MASK (~(PUD_SIZE-1))
76935 +
76936 +#ifndef __ASSEMBLY__
76937 +
76938 /*
76939 * Having the pud type consist of a pgd gets the size right, and allows
76940 * us to conceptually access the pgd entry that this pud is folded into
76941 @@ -12,11 +17,6 @@
76942 */
76943 typedef struct { pgd_t pgd; } pud_t;
76944
76945 -#define PUD_SHIFT PGDIR_SHIFT
76946 -#define PTRS_PER_PUD 1
76947 -#define PUD_SIZE (1UL << PUD_SHIFT)
76948 -#define PUD_MASK (~(PUD_SIZE-1))
76949 -
76950 /*
76951 * The "pgd_xxx()" functions here are trivial for a folded two-level
76952 * setup: the pud is never bad, and a pud always exists (as it's folded
76953 @@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
76954 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
76955
76956 #define pgd_populate(mm, pgd, pud) do { } while (0)
76957 +#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
76958 /*
76959 * (puds are folded into pgds so this doesn't get actually called,
76960 * but the define is needed for a generic inline function.)
76961 diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
76962 index 34c7bdc..38d4f3b 100644
76963 --- a/include/asm-generic/pgtable.h
76964 +++ b/include/asm-generic/pgtable.h
76965 @@ -787,6 +787,22 @@ static inline void pmdp_set_numa(struct mm_struct *mm, unsigned long addr,
76966 }
76967 #endif /* CONFIG_NUMA_BALANCING */
76968
76969 +#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
76970 +#ifdef CONFIG_PAX_KERNEXEC
76971 +#error KERNEXEC requires pax_open_kernel
76972 +#else
76973 +static inline unsigned long pax_open_kernel(void) { return 0; }
76974 +#endif
76975 +#endif
76976 +
76977 +#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
76978 +#ifdef CONFIG_PAX_KERNEXEC
76979 +#error KERNEXEC requires pax_close_kernel
76980 +#else
76981 +static inline unsigned long pax_close_kernel(void) { return 0; }
76982 +#endif
76983 +#endif
76984 +
76985 #endif /* CONFIG_MMU */
76986
76987 #endif /* !__ASSEMBLY__ */
76988 diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
76989 index 72d8803..cb9749c 100644
76990 --- a/include/asm-generic/uaccess.h
76991 +++ b/include/asm-generic/uaccess.h
76992 @@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
76993 return __clear_user(to, n);
76994 }
76995
76996 +#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
76997 +#ifdef CONFIG_PAX_MEMORY_UDEREF
76998 +#error UDEREF requires pax_open_userland
76999 +#else
77000 +static inline unsigned long pax_open_userland(void) { return 0; }
77001 +#endif
77002 +#endif
77003 +
77004 +#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
77005 +#ifdef CONFIG_PAX_MEMORY_UDEREF
77006 +#error UDEREF requires pax_close_userland
77007 +#else
77008 +static inline unsigned long pax_close_userland(void) { return 0; }
77009 +#endif
77010 +#endif
77011 +
77012 #endif /* __ASM_GENERIC_UACCESS_H */
77013 diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
77014 index bc2121f..2f41f9a 100644
77015 --- a/include/asm-generic/vmlinux.lds.h
77016 +++ b/include/asm-generic/vmlinux.lds.h
77017 @@ -232,6 +232,7 @@
77018 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
77019 VMLINUX_SYMBOL(__start_rodata) = .; \
77020 *(.rodata) *(.rodata.*) \
77021 + *(.data..read_only) \
77022 *(__vermagic) /* Kernel version magic */ \
77023 . = ALIGN(8); \
77024 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
77025 @@ -716,17 +717,18 @@
77026 * section in the linker script will go there too. @phdr should have
77027 * a leading colon.
77028 *
77029 - * Note that this macros defines __per_cpu_load as an absolute symbol.
77030 + * Note that this macros defines per_cpu_load as an absolute symbol.
77031 * If there is no need to put the percpu section at a predetermined
77032 * address, use PERCPU_SECTION.
77033 */
77034 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
77035 - VMLINUX_SYMBOL(__per_cpu_load) = .; \
77036 - .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
77037 + per_cpu_load = .; \
77038 + .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
77039 - LOAD_OFFSET) { \
77040 + VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
77041 PERCPU_INPUT(cacheline) \
77042 } phdr \
77043 - . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
77044 + . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
77045
77046 /**
77047 * PERCPU_SECTION - define output section for percpu area, simple version
77048 diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
77049 index e73c19e..5b89e00 100644
77050 --- a/include/crypto/algapi.h
77051 +++ b/include/crypto/algapi.h
77052 @@ -34,7 +34,7 @@ struct crypto_type {
77053 unsigned int maskclear;
77054 unsigned int maskset;
77055 unsigned int tfmsize;
77056 -};
77057 +} __do_const;
77058
77059 struct crypto_instance {
77060 struct crypto_alg alg;
77061 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
77062 index 04a7f31..668d424 100644
77063 --- a/include/drm/drmP.h
77064 +++ b/include/drm/drmP.h
77065 @@ -67,6 +67,7 @@
77066 #include <linux/workqueue.h>
77067 #include <linux/poll.h>
77068 #include <asm/pgalloc.h>
77069 +#include <asm/local.h>
77070 #include <drm/drm.h>
77071 #include <drm/drm_sarea.h>
77072 #include <drm/drm_vma_manager.h>
77073 @@ -297,10 +298,12 @@ do { \
77074 * \param cmd command.
77075 * \param arg argument.
77076 */
77077 -typedef int drm_ioctl_t(struct drm_device *dev, void *data,
77078 +typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
77079 + struct drm_file *file_priv);
77080 +typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
77081 struct drm_file *file_priv);
77082
77083 -typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
77084 +typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
77085 unsigned long arg);
77086
77087 #define DRM_IOCTL_NR(n) _IOC_NR(n)
77088 @@ -316,10 +319,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
77089 struct drm_ioctl_desc {
77090 unsigned int cmd;
77091 int flags;
77092 - drm_ioctl_t *func;
77093 + drm_ioctl_t func;
77094 unsigned int cmd_drv;
77095 const char *name;
77096 -};
77097 +} __do_const;
77098
77099 /**
77100 * Creates a driver or general drm_ioctl_desc array entry for the given
77101 @@ -1022,7 +1025,8 @@ struct drm_info_list {
77102 int (*show)(struct seq_file*, void*); /** show callback */
77103 u32 driver_features; /**< Required driver features for this entry */
77104 void *data;
77105 -};
77106 +} __do_const;
77107 +typedef struct drm_info_list __no_const drm_info_list_no_const;
77108
77109 /**
77110 * debugfs node structure. This structure represents a debugfs file.
77111 @@ -1106,7 +1110,7 @@ struct drm_device {
77112
77113 /** \name Usage Counters */
77114 /*@{ */
77115 - int open_count; /**< Outstanding files open */
77116 + local_t open_count; /**< Outstanding files open */
77117 int buf_use; /**< Buffers in use -- cannot alloc */
77118 atomic_t buf_alloc; /**< Buffer allocation in progress */
77119 /*@} */
77120 diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
77121 index b1388b5..e1d1163 100644
77122 --- a/include/drm/drm_crtc_helper.h
77123 +++ b/include/drm/drm_crtc_helper.h
77124 @@ -109,7 +109,7 @@ struct drm_encoder_helper_funcs {
77125 struct drm_connector *connector);
77126 /* disable encoder when not in use - more explicit than dpms off */
77127 void (*disable)(struct drm_encoder *encoder);
77128 -};
77129 +} __no_const;
77130
77131 /**
77132 * drm_connector_helper_funcs - helper operations for connectors
77133 diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
77134 index 940ece4..8cb727f 100644
77135 --- a/include/drm/i915_pciids.h
77136 +++ b/include/drm/i915_pciids.h
77137 @@ -37,7 +37,7 @@
77138 */
77139 #define INTEL_VGA_DEVICE(id, info) { \
77140 0x8086, id, \
77141 - ~0, ~0, \
77142 + PCI_ANY_ID, PCI_ANY_ID, \
77143 0x030000, 0xff0000, \
77144 (unsigned long) info }
77145
77146 diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
77147 index 72dcbe8..8db58d7 100644
77148 --- a/include/drm/ttm/ttm_memory.h
77149 +++ b/include/drm/ttm/ttm_memory.h
77150 @@ -48,7 +48,7 @@
77151
77152 struct ttm_mem_shrink {
77153 int (*do_shrink) (struct ttm_mem_shrink *);
77154 -};
77155 +} __no_const;
77156
77157 /**
77158 * struct ttm_mem_global - Global memory accounting structure.
77159 diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
77160 index 49a8284..9643967 100644
77161 --- a/include/drm/ttm/ttm_page_alloc.h
77162 +++ b/include/drm/ttm/ttm_page_alloc.h
77163 @@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
77164 */
77165 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
77166
77167 +struct device;
77168 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
77169 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
77170
77171 diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
77172 index 4b840e8..155d235 100644
77173 --- a/include/keys/asymmetric-subtype.h
77174 +++ b/include/keys/asymmetric-subtype.h
77175 @@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
77176 /* Verify the signature on a key of this subtype (optional) */
77177 int (*verify_signature)(const struct key *key,
77178 const struct public_key_signature *sig);
77179 -};
77180 +} __do_const;
77181
77182 /**
77183 * asymmetric_key_subtype - Get the subtype from an asymmetric key
77184 diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
77185 index c1da539..1dcec55 100644
77186 --- a/include/linux/atmdev.h
77187 +++ b/include/linux/atmdev.h
77188 @@ -28,7 +28,7 @@ struct compat_atm_iobuf {
77189 #endif
77190
77191 struct k_atm_aal_stats {
77192 -#define __HANDLE_ITEM(i) atomic_t i
77193 +#define __HANDLE_ITEM(i) atomic_unchecked_t i
77194 __AAL_STAT_ITEMS
77195 #undef __HANDLE_ITEM
77196 };
77197 @@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
77198 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
77199 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
77200 struct module *owner;
77201 -};
77202 +} __do_const ;
77203
77204 struct atmphy_ops {
77205 int (*start)(struct atm_dev *dev);
77206 diff --git a/include/linux/audit.h b/include/linux/audit.h
77207 index ec1464d..833274b 100644
77208 --- a/include/linux/audit.h
77209 +++ b/include/linux/audit.h
77210 @@ -196,7 +196,7 @@ static inline void audit_ptrace(struct task_struct *t)
77211 extern unsigned int audit_serial(void);
77212 extern int auditsc_get_stamp(struct audit_context *ctx,
77213 struct timespec *t, unsigned int *serial);
77214 -extern int audit_set_loginuid(kuid_t loginuid);
77215 +extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
77216
77217 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
77218 {
77219 diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
77220 index b4a745d..e3c0942 100644
77221 --- a/include/linux/binfmts.h
77222 +++ b/include/linux/binfmts.h
77223 @@ -45,7 +45,7 @@ struct linux_binprm {
77224 unsigned interp_data;
77225 unsigned long loader, exec;
77226 char tcomm[TASK_COMM_LEN];
77227 -};
77228 +} __randomize_layout;
77229
77230 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
77231 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
77232 @@ -74,8 +74,10 @@ struct linux_binfmt {
77233 int (*load_binary)(struct linux_binprm *);
77234 int (*load_shlib)(struct file *);
77235 int (*core_dump)(struct coredump_params *cprm);
77236 + void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
77237 + void (*handle_mmap)(struct file *);
77238 unsigned long min_coredump; /* minimal dump size */
77239 -};
77240 +} __do_const __randomize_layout;
77241
77242 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
77243
77244 diff --git a/include/linux/bitops.h b/include/linux/bitops.h
77245 index be5fd38..d71192a 100644
77246 --- a/include/linux/bitops.h
77247 +++ b/include/linux/bitops.h
77248 @@ -102,7 +102,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
77249 * @word: value to rotate
77250 * @shift: bits to roll
77251 */
77252 -static inline __u32 rol32(__u32 word, unsigned int shift)
77253 +static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
77254 {
77255 return (word << shift) | (word >> (32 - shift));
77256 }
77257 @@ -112,7 +112,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
77258 * @word: value to rotate
77259 * @shift: bits to roll
77260 */
77261 -static inline __u32 ror32(__u32 word, unsigned int shift)
77262 +static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
77263 {
77264 return (word >> shift) | (word << (32 - shift));
77265 }
77266 @@ -168,7 +168,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
77267 return (__s32)(value << shift) >> shift;
77268 }
77269
77270 -static inline unsigned fls_long(unsigned long l)
77271 +static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
77272 {
77273 if (sizeof(l) == 4)
77274 return fls(l);
77275 diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
77276 index 4afa4f8..1ed7824 100644
77277 --- a/include/linux/blkdev.h
77278 +++ b/include/linux/blkdev.h
77279 @@ -1572,7 +1572,7 @@ struct block_device_operations {
77280 /* this callback is with swap_lock and sometimes page table lock held */
77281 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
77282 struct module *owner;
77283 -};
77284 +} __do_const;
77285
77286 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
77287 unsigned long);
77288 diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
77289 index afc1343..9735539 100644
77290 --- a/include/linux/blktrace_api.h
77291 +++ b/include/linux/blktrace_api.h
77292 @@ -25,7 +25,7 @@ struct blk_trace {
77293 struct dentry *dropped_file;
77294 struct dentry *msg_file;
77295 struct list_head running_list;
77296 - atomic_t dropped;
77297 + atomic_unchecked_t dropped;
77298 };
77299
77300 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
77301 diff --git a/include/linux/cache.h b/include/linux/cache.h
77302 index 17e7e82..1d7da26 100644
77303 --- a/include/linux/cache.h
77304 +++ b/include/linux/cache.h
77305 @@ -16,6 +16,14 @@
77306 #define __read_mostly
77307 #endif
77308
77309 +#ifndef __read_only
77310 +#ifdef CONFIG_PAX_KERNEXEC
77311 +#error KERNEXEC requires __read_only
77312 +#else
77313 +#define __read_only __read_mostly
77314 +#endif
77315 +#endif
77316 +
77317 #ifndef ____cacheline_aligned
77318 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
77319 #endif
77320 diff --git a/include/linux/capability.h b/include/linux/capability.h
77321 index a6ee1f9..e1ca49d 100644
77322 --- a/include/linux/capability.h
77323 +++ b/include/linux/capability.h
77324 @@ -212,8 +212,13 @@ extern bool capable(int cap);
77325 extern bool ns_capable(struct user_namespace *ns, int cap);
77326 extern bool inode_capable(const struct inode *inode, int cap);
77327 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
77328 +extern bool capable_nolog(int cap);
77329 +extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
77330 +extern bool inode_capable_nolog(const struct inode *inode, int cap);
77331
77332 /* audit system wants to get cap info from files as well */
77333 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
77334
77335 +extern int is_privileged_binary(const struct dentry *dentry);
77336 +
77337 #endif /* !_LINUX_CAPABILITY_H */
77338 diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
77339 index 8609d57..86e4d79 100644
77340 --- a/include/linux/cdrom.h
77341 +++ b/include/linux/cdrom.h
77342 @@ -87,7 +87,6 @@ struct cdrom_device_ops {
77343
77344 /* driver specifications */
77345 const int capability; /* capability flags */
77346 - int n_minors; /* number of active minor devices */
77347 /* handle uniform packets for scsi type devices (scsi,atapi) */
77348 int (*generic_packet) (struct cdrom_device_info *,
77349 struct packet_command *);
77350 diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
77351 index 4ce9056..86caac6 100644
77352 --- a/include/linux/cleancache.h
77353 +++ b/include/linux/cleancache.h
77354 @@ -31,7 +31,7 @@ struct cleancache_ops {
77355 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
77356 void (*invalidate_inode)(int, struct cleancache_filekey);
77357 void (*invalidate_fs)(int);
77358 -};
77359 +} __no_const;
77360
77361 extern struct cleancache_ops *
77362 cleancache_register_ops(struct cleancache_ops *ops);
77363 diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
77364 index 939533d..cf0a57c 100644
77365 --- a/include/linux/clk-provider.h
77366 +++ b/include/linux/clk-provider.h
77367 @@ -166,6 +166,7 @@ struct clk_ops {
77368 unsigned long parent_accuracy);
77369 void (*init)(struct clk_hw *hw);
77370 };
77371 +typedef struct clk_ops __no_const clk_ops_no_const;
77372
77373 /**
77374 * struct clk_init_data - holds init data that's common to all clocks and is
77375 diff --git a/include/linux/compat.h b/include/linux/compat.h
77376 index 3f448c6..df3ce1d 100644
77377 --- a/include/linux/compat.h
77378 +++ b/include/linux/compat.h
77379 @@ -313,7 +313,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
77380 compat_size_t __user *len_ptr);
77381
77382 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
77383 -asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
77384 +asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
77385 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
77386 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
77387 compat_ssize_t msgsz, int msgflg);
77388 @@ -420,7 +420,7 @@ extern int compat_ptrace_request(struct task_struct *child,
77389 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
77390 compat_ulong_t addr, compat_ulong_t data);
77391 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
77392 - compat_long_t addr, compat_long_t data);
77393 + compat_ulong_t addr, compat_ulong_t data);
77394
77395 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
77396 /*
77397 diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
77398 index 2507fd2..55203f8 100644
77399 --- a/include/linux/compiler-gcc4.h
77400 +++ b/include/linux/compiler-gcc4.h
77401 @@ -39,9 +39,34 @@
77402 # define __compiletime_warning(message) __attribute__((warning(message)))
77403 # define __compiletime_error(message) __attribute__((error(message)))
77404 #endif /* __CHECKER__ */
77405 +
77406 +#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
77407 +#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
77408 +#define __bos0(ptr) __bos((ptr), 0)
77409 +#define __bos1(ptr) __bos((ptr), 1)
77410 #endif /* GCC_VERSION >= 40300 */
77411
77412 #if GCC_VERSION >= 40500
77413 +
77414 +#ifdef RANDSTRUCT_PLUGIN
77415 +#define __randomize_layout __attribute__((randomize_layout))
77416 +#define __no_randomize_layout __attribute__((no_randomize_layout))
77417 +#endif
77418 +
77419 +#ifdef CONSTIFY_PLUGIN
77420 +#define __no_const __attribute__((no_const))
77421 +#define __do_const __attribute__((do_const))
77422 +#endif
77423 +
77424 +#ifdef SIZE_OVERFLOW_PLUGIN
77425 +#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
77426 +#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
77427 +#endif
77428 +
77429 +#ifdef LATENT_ENTROPY_PLUGIN
77430 +#define __latent_entropy __attribute__((latent_entropy))
77431 +#endif
77432 +
77433 /*
77434 * Mark a position in code as unreachable. This can be used to
77435 * suppress control flow warnings after asm blocks that transfer
77436 diff --git a/include/linux/compiler.h b/include/linux/compiler.h
77437 index 2472740..4857634 100644
77438 --- a/include/linux/compiler.h
77439 +++ b/include/linux/compiler.h
77440 @@ -5,11 +5,14 @@
77441
77442 #ifdef __CHECKER__
77443 # define __user __attribute__((noderef, address_space(1)))
77444 +# define __force_user __force __user
77445 # define __kernel __attribute__((address_space(0)))
77446 +# define __force_kernel __force __kernel
77447 # define __safe __attribute__((safe))
77448 # define __force __attribute__((force))
77449 # define __nocast __attribute__((nocast))
77450 # define __iomem __attribute__((noderef, address_space(2)))
77451 +# define __force_iomem __force __iomem
77452 # define __must_hold(x) __attribute__((context(x,1,1)))
77453 # define __acquires(x) __attribute__((context(x,0,1)))
77454 # define __releases(x) __attribute__((context(x,1,0)))
77455 @@ -17,20 +20,37 @@
77456 # define __release(x) __context__(x,-1)
77457 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
77458 # define __percpu __attribute__((noderef, address_space(3)))
77459 +# define __force_percpu __force __percpu
77460 #ifdef CONFIG_SPARSE_RCU_POINTER
77461 # define __rcu __attribute__((noderef, address_space(4)))
77462 +# define __force_rcu __force __rcu
77463 #else
77464 # define __rcu
77465 +# define __force_rcu
77466 #endif
77467 extern void __chk_user_ptr(const volatile void __user *);
77468 extern void __chk_io_ptr(const volatile void __iomem *);
77469 #else
77470 -# define __user
77471 -# define __kernel
77472 +# ifdef CHECKER_PLUGIN
77473 +//# define __user
77474 +//# define __force_user
77475 +//# define __kernel
77476 +//# define __force_kernel
77477 +# else
77478 +# ifdef STRUCTLEAK_PLUGIN
77479 +# define __user __attribute__((user))
77480 +# else
77481 +# define __user
77482 +# endif
77483 +# define __force_user
77484 +# define __kernel
77485 +# define __force_kernel
77486 +# endif
77487 # define __safe
77488 # define __force
77489 # define __nocast
77490 # define __iomem
77491 +# define __force_iomem
77492 # define __chk_user_ptr(x) (void)0
77493 # define __chk_io_ptr(x) (void)0
77494 # define __builtin_warning(x, y...) (1)
77495 @@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
77496 # define __release(x) (void)0
77497 # define __cond_lock(x,c) (c)
77498 # define __percpu
77499 +# define __force_percpu
77500 # define __rcu
77501 +# define __force_rcu
77502 #endif
77503
77504 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
77505 @@ -279,6 +301,34 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
77506 # define __attribute_const__ /* unimplemented */
77507 #endif
77508
77509 +#ifndef __randomize_layout
77510 +# define __randomize_layout
77511 +#endif
77512 +
77513 +#ifndef __no_randomize_layout
77514 +# define __no_randomize_layout
77515 +#endif
77516 +
77517 +#ifndef __no_const
77518 +# define __no_const
77519 +#endif
77520 +
77521 +#ifndef __do_const
77522 +# define __do_const
77523 +#endif
77524 +
77525 +#ifndef __size_overflow
77526 +# define __size_overflow(...)
77527 +#endif
77528 +
77529 +#ifndef __intentional_overflow
77530 +# define __intentional_overflow(...)
77531 +#endif
77532 +
77533 +#ifndef __latent_entropy
77534 +# define __latent_entropy
77535 +#endif
77536 +
77537 /*
77538 * Tell gcc if a function is cold. The compiler will assume any path
77539 * directly leading to the call is unlikely.
77540 @@ -288,6 +338,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
77541 #define __cold
77542 #endif
77543
77544 +#ifndef __alloc_size
77545 +#define __alloc_size(...)
77546 +#endif
77547 +
77548 +#ifndef __bos
77549 +#define __bos(ptr, arg)
77550 +#endif
77551 +
77552 +#ifndef __bos0
77553 +#define __bos0(ptr)
77554 +#endif
77555 +
77556 +#ifndef __bos1
77557 +#define __bos1(ptr)
77558 +#endif
77559 +
77560 /* Simple shorthand for a section definition */
77561 #ifndef __section
77562 # define __section(S) __attribute__ ((__section__(#S)))
77563 @@ -362,7 +428,8 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
77564 * use is to mediate communication between process-level code and irq/NMI
77565 * handlers, all running on the same CPU.
77566 */
77567 -#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
77568 +#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
77569 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
77570
77571 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
77572 #ifdef CONFIG_KPROBES
77573 diff --git a/include/linux/completion.h b/include/linux/completion.h
77574 index 5d5aaae..0ea9b84 100644
77575 --- a/include/linux/completion.h
77576 +++ b/include/linux/completion.h
77577 @@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
77578
77579 extern void wait_for_completion(struct completion *);
77580 extern void wait_for_completion_io(struct completion *);
77581 -extern int wait_for_completion_interruptible(struct completion *x);
77582 -extern int wait_for_completion_killable(struct completion *x);
77583 +extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
77584 +extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
77585 extern unsigned long wait_for_completion_timeout(struct completion *x,
77586 - unsigned long timeout);
77587 + unsigned long timeout) __intentional_overflow(-1);
77588 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
77589 - unsigned long timeout);
77590 + unsigned long timeout) __intentional_overflow(-1);
77591 extern long wait_for_completion_interruptible_timeout(
77592 - struct completion *x, unsigned long timeout);
77593 + struct completion *x, unsigned long timeout) __intentional_overflow(-1);
77594 extern long wait_for_completion_killable_timeout(
77595 - struct completion *x, unsigned long timeout);
77596 + struct completion *x, unsigned long timeout) __intentional_overflow(-1);
77597 extern bool try_wait_for_completion(struct completion *x);
77598 extern bool completion_done(struct completion *x);
77599
77600 diff --git a/include/linux/configfs.h b/include/linux/configfs.h
77601 index 34025df..d94bbbc 100644
77602 --- a/include/linux/configfs.h
77603 +++ b/include/linux/configfs.h
77604 @@ -125,7 +125,7 @@ struct configfs_attribute {
77605 const char *ca_name;
77606 struct module *ca_owner;
77607 umode_t ca_mode;
77608 -};
77609 +} __do_const;
77610
77611 /*
77612 * Users often need to create attribute structures for their configurable
77613 diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
77614 index 4d89e0e..5281847 100644
77615 --- a/include/linux/cpufreq.h
77616 +++ b/include/linux/cpufreq.h
77617 @@ -191,6 +191,7 @@ struct global_attr {
77618 ssize_t (*store)(struct kobject *a, struct attribute *b,
77619 const char *c, size_t count);
77620 };
77621 +typedef struct global_attr __no_const global_attr_no_const;
77622
77623 #define define_one_global_ro(_name) \
77624 static struct global_attr _name = \
77625 @@ -232,7 +233,7 @@ struct cpufreq_driver {
77626 bool boost_supported;
77627 bool boost_enabled;
77628 int (*set_boost) (int state);
77629 -};
77630 +} __do_const;
77631
77632 /* flags */
77633 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
77634 diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
77635 index 50fcbb0..9d2dbd9 100644
77636 --- a/include/linux/cpuidle.h
77637 +++ b/include/linux/cpuidle.h
77638 @@ -50,7 +50,8 @@ struct cpuidle_state {
77639 int index);
77640
77641 int (*enter_dead) (struct cpuidle_device *dev, int index);
77642 -};
77643 +} __do_const;
77644 +typedef struct cpuidle_state __no_const cpuidle_state_no_const;
77645
77646 /* Idle State Flags */
77647 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
77648 @@ -192,7 +193,7 @@ struct cpuidle_governor {
77649 void (*reflect) (struct cpuidle_device *dev, int index);
77650
77651 struct module *owner;
77652 -};
77653 +} __do_const;
77654
77655 #ifdef CONFIG_CPU_IDLE
77656 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
77657 diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
77658 index d08e4d2..95fad61 100644
77659 --- a/include/linux/cpumask.h
77660 +++ b/include/linux/cpumask.h
77661 @@ -118,17 +118,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
77662 }
77663
77664 /* Valid inputs for n are -1 and 0. */
77665 -static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
77666 +static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
77667 {
77668 return n+1;
77669 }
77670
77671 -static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
77672 +static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
77673 {
77674 return n+1;
77675 }
77676
77677 -static inline unsigned int cpumask_next_and(int n,
77678 +static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
77679 const struct cpumask *srcp,
77680 const struct cpumask *andp)
77681 {
77682 @@ -167,7 +167,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
77683 *
77684 * Returns >= nr_cpu_ids if no further cpus set.
77685 */
77686 -static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
77687 +static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
77688 {
77689 /* -1 is a legal arg here. */
77690 if (n != -1)
77691 @@ -182,7 +182,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
77692 *
77693 * Returns >= nr_cpu_ids if no further cpus unset.
77694 */
77695 -static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
77696 +static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
77697 {
77698 /* -1 is a legal arg here. */
77699 if (n != -1)
77700 @@ -190,7 +190,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
77701 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
77702 }
77703
77704 -int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
77705 +int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
77706 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
77707
77708 /**
77709 diff --git a/include/linux/cred.h b/include/linux/cred.h
77710 index 04421e8..117e17a 100644
77711 --- a/include/linux/cred.h
77712 +++ b/include/linux/cred.h
77713 @@ -35,7 +35,7 @@ struct group_info {
77714 int nblocks;
77715 kgid_t small_block[NGROUPS_SMALL];
77716 kgid_t *blocks[0];
77717 -};
77718 +} __randomize_layout;
77719
77720 /**
77721 * get_group_info - Get a reference to a group info structure
77722 @@ -136,7 +136,7 @@ struct cred {
77723 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
77724 struct group_info *group_info; /* supplementary groups for euid/fsgid */
77725 struct rcu_head rcu; /* RCU deletion hook */
77726 -};
77727 +} __randomize_layout;
77728
77729 extern void __put_cred(struct cred *);
77730 extern void exit_creds(struct task_struct *);
77731 @@ -194,6 +194,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
77732 static inline void validate_process_creds(void)
77733 {
77734 }
77735 +static inline void validate_task_creds(struct task_struct *task)
77736 +{
77737 +}
77738 #endif
77739
77740 /**
77741 diff --git a/include/linux/crypto.h b/include/linux/crypto.h
77742 index b92eadf..b4ecdc1 100644
77743 --- a/include/linux/crypto.h
77744 +++ b/include/linux/crypto.h
77745 @@ -373,7 +373,7 @@ struct cipher_tfm {
77746 const u8 *key, unsigned int keylen);
77747 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
77748 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
77749 -};
77750 +} __no_const;
77751
77752 struct hash_tfm {
77753 int (*init)(struct hash_desc *desc);
77754 @@ -394,13 +394,13 @@ struct compress_tfm {
77755 int (*cot_decompress)(struct crypto_tfm *tfm,
77756 const u8 *src, unsigned int slen,
77757 u8 *dst, unsigned int *dlen);
77758 -};
77759 +} __no_const;
77760
77761 struct rng_tfm {
77762 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
77763 unsigned int dlen);
77764 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
77765 -};
77766 +} __no_const;
77767
77768 #define crt_ablkcipher crt_u.ablkcipher
77769 #define crt_aead crt_u.aead
77770 diff --git a/include/linux/ctype.h b/include/linux/ctype.h
77771 index 653589e..4ef254a 100644
77772 --- a/include/linux/ctype.h
77773 +++ b/include/linux/ctype.h
77774 @@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
77775 * Fast implementation of tolower() for internal usage. Do not use in your
77776 * code.
77777 */
77778 -static inline char _tolower(const char c)
77779 +static inline unsigned char _tolower(const unsigned char c)
77780 {
77781 return c | 0x20;
77782 }
77783 diff --git a/include/linux/dcache.h b/include/linux/dcache.h
77784 index bf72e9a..4ca7927 100644
77785 --- a/include/linux/dcache.h
77786 +++ b/include/linux/dcache.h
77787 @@ -133,7 +133,7 @@ struct dentry {
77788 } d_u;
77789 struct list_head d_subdirs; /* our children */
77790 struct hlist_node d_alias; /* inode alias list */
77791 -};
77792 +} __randomize_layout;
77793
77794 /*
77795 * dentry->d_lock spinlock nesting subclasses:
77796 diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
77797 index 7925bf0..d5143d2 100644
77798 --- a/include/linux/decompress/mm.h
77799 +++ b/include/linux/decompress/mm.h
77800 @@ -77,7 +77,7 @@ static void free(void *where)
77801 * warnings when not needed (indeed large_malloc / large_free are not
77802 * needed by inflate */
77803
77804 -#define malloc(a) kmalloc(a, GFP_KERNEL)
77805 +#define malloc(a) kmalloc((a), GFP_KERNEL)
77806 #define free(a) kfree(a)
77807
77808 #define large_malloc(a) vmalloc(a)
77809 diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
77810 index d48dc00..211ee54 100644
77811 --- a/include/linux/devfreq.h
77812 +++ b/include/linux/devfreq.h
77813 @@ -114,7 +114,7 @@ struct devfreq_governor {
77814 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
77815 int (*event_handler)(struct devfreq *devfreq,
77816 unsigned int event, void *data);
77817 -};
77818 +} __do_const;
77819
77820 /**
77821 * struct devfreq - Device devfreq structure
77822 diff --git a/include/linux/device.h b/include/linux/device.h
77823 index 952b010..d5b7691 100644
77824 --- a/include/linux/device.h
77825 +++ b/include/linux/device.h
77826 @@ -310,7 +310,7 @@ struct subsys_interface {
77827 struct list_head node;
77828 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
77829 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
77830 -};
77831 +} __do_const;
77832
77833 int subsys_interface_register(struct subsys_interface *sif);
77834 void subsys_interface_unregister(struct subsys_interface *sif);
77835 @@ -506,7 +506,7 @@ struct device_type {
77836 void (*release)(struct device *dev);
77837
77838 const struct dev_pm_ops *pm;
77839 -};
77840 +} __do_const;
77841
77842 /* interface for exporting device attributes */
77843 struct device_attribute {
77844 @@ -516,11 +516,12 @@ struct device_attribute {
77845 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
77846 const char *buf, size_t count);
77847 };
77848 +typedef struct device_attribute __no_const device_attribute_no_const;
77849
77850 struct dev_ext_attribute {
77851 struct device_attribute attr;
77852 void *var;
77853 -};
77854 +} __do_const;
77855
77856 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
77857 char *buf);
77858 diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
77859 index fd4aee2..1f28db9 100644
77860 --- a/include/linux/dma-mapping.h
77861 +++ b/include/linux/dma-mapping.h
77862 @@ -54,7 +54,7 @@ struct dma_map_ops {
77863 u64 (*get_required_mask)(struct device *dev);
77864 #endif
77865 int is_phys;
77866 -};
77867 +} __do_const;
77868
77869 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
77870
77871 diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
77872 index c5c92d5..6a5c2b2 100644
77873 --- a/include/linux/dmaengine.h
77874 +++ b/include/linux/dmaengine.h
77875 @@ -1150,9 +1150,9 @@ struct dma_pinned_list {
77876 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
77877 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
77878
77879 -dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
77880 +dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
77881 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
77882 -dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
77883 +dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
77884 struct dma_pinned_list *pinned_list, struct page *page,
77885 unsigned int offset, size_t len);
77886
77887 diff --git a/include/linux/efi.h b/include/linux/efi.h
77888 index 0a819e7..8ed47f1 100644
77889 --- a/include/linux/efi.h
77890 +++ b/include/linux/efi.h
77891 @@ -768,6 +768,7 @@ struct efivar_operations {
77892 efi_set_variable_t *set_variable;
77893 efi_query_variable_store_t *query_variable_store;
77894 };
77895 +typedef struct efivar_operations __no_const efivar_operations_no_const;
77896
77897 struct efivars {
77898 /*
77899 diff --git a/include/linux/elf.h b/include/linux/elf.h
77900 index 67a5fa7..b817372 100644
77901 --- a/include/linux/elf.h
77902 +++ b/include/linux/elf.h
77903 @@ -24,6 +24,7 @@ extern Elf32_Dyn _DYNAMIC [];
77904 #define elf_note elf32_note
77905 #define elf_addr_t Elf32_Off
77906 #define Elf_Half Elf32_Half
77907 +#define elf_dyn Elf32_Dyn
77908
77909 #else
77910
77911 @@ -34,6 +35,7 @@ extern Elf64_Dyn _DYNAMIC [];
77912 #define elf_note elf64_note
77913 #define elf_addr_t Elf64_Off
77914 #define Elf_Half Elf64_Half
77915 +#define elf_dyn Elf64_Dyn
77916
77917 #endif
77918
77919 diff --git a/include/linux/err.h b/include/linux/err.h
77920 index 15f92e0..e825a8e 100644
77921 --- a/include/linux/err.h
77922 +++ b/include/linux/err.h
77923 @@ -19,12 +19,12 @@
77924
77925 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
77926
77927 -static inline void * __must_check ERR_PTR(long error)
77928 +static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
77929 {
77930 return (void *) error;
77931 }
77932
77933 -static inline long __must_check PTR_ERR(__force const void *ptr)
77934 +static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
77935 {
77936 return (long) ptr;
77937 }
77938 diff --git a/include/linux/extcon.h b/include/linux/extcon.h
77939 index 21c59af..6057a03 100644
77940 --- a/include/linux/extcon.h
77941 +++ b/include/linux/extcon.h
77942 @@ -135,7 +135,7 @@ struct extcon_dev {
77943 /* /sys/class/extcon/.../mutually_exclusive/... */
77944 struct attribute_group attr_g_muex;
77945 struct attribute **attrs_muex;
77946 - struct device_attribute *d_attrs_muex;
77947 + device_attribute_no_const *d_attrs_muex;
77948 };
77949
77950 /**
77951 diff --git a/include/linux/fb.h b/include/linux/fb.h
77952 index fe6ac95..898d41d 100644
77953 --- a/include/linux/fb.h
77954 +++ b/include/linux/fb.h
77955 @@ -304,7 +304,7 @@ struct fb_ops {
77956 /* called at KDB enter and leave time to prepare the console */
77957 int (*fb_debug_enter)(struct fb_info *info);
77958 int (*fb_debug_leave)(struct fb_info *info);
77959 -};
77960 +} __do_const;
77961
77962 #ifdef CONFIG_FB_TILEBLITTING
77963 #define FB_TILE_CURSOR_NONE 0
77964 diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
77965 index 70e8e21..1939916 100644
77966 --- a/include/linux/fdtable.h
77967 +++ b/include/linux/fdtable.h
77968 @@ -102,7 +102,7 @@ struct files_struct *get_files_struct(struct task_struct *);
77969 void put_files_struct(struct files_struct *fs);
77970 void reset_files_struct(struct files_struct *);
77971 int unshare_files(struct files_struct **);
77972 -struct files_struct *dup_fd(struct files_struct *, int *);
77973 +struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
77974 void do_close_on_exec(struct files_struct *);
77975 int iterate_fd(struct files_struct *, unsigned,
77976 int (*)(const void *, struct file *, unsigned),
77977 diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
77978 index 8293262..2b3b8bd 100644
77979 --- a/include/linux/frontswap.h
77980 +++ b/include/linux/frontswap.h
77981 @@ -11,7 +11,7 @@ struct frontswap_ops {
77982 int (*load)(unsigned, pgoff_t, struct page *);
77983 void (*invalidate_page)(unsigned, pgoff_t);
77984 void (*invalidate_area)(unsigned);
77985 -};
77986 +} __no_const;
77987
77988 extern bool frontswap_enabled;
77989 extern struct frontswap_ops *
77990 diff --git a/include/linux/fs.h b/include/linux/fs.h
77991 index 23b2a35..8764ab7 100644
77992 --- a/include/linux/fs.h
77993 +++ b/include/linux/fs.h
77994 @@ -426,7 +426,7 @@ struct address_space {
77995 spinlock_t private_lock; /* for use by the address_space */
77996 struct list_head private_list; /* ditto */
77997 void *private_data; /* ditto */
77998 -} __attribute__((aligned(sizeof(long))));
77999 +} __attribute__((aligned(sizeof(long)))) __randomize_layout;
78000 /*
78001 * On most architectures that alignment is already the case; but
78002 * must be enforced here for CRIS, to let the least significant bit
78003 @@ -469,7 +469,7 @@ struct block_device {
78004 int bd_fsfreeze_count;
78005 /* Mutex for freeze */
78006 struct mutex bd_fsfreeze_mutex;
78007 -};
78008 +} __randomize_layout;
78009
78010 /*
78011 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
78012 @@ -613,7 +613,7 @@ struct inode {
78013 atomic_t i_readcount; /* struct files open RO */
78014 #endif
78015 void *i_private; /* fs or device private pointer */
78016 -};
78017 +} __randomize_layout;
78018
78019 static inline int inode_unhashed(struct inode *inode)
78020 {
78021 @@ -812,7 +812,7 @@ struct file {
78022 #ifdef CONFIG_DEBUG_WRITECOUNT
78023 unsigned long f_mnt_write_state;
78024 #endif
78025 -} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
78026 +} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
78027
78028 struct file_handle {
78029 __u32 handle_bytes;
78030 @@ -982,7 +982,7 @@ struct file_lock {
78031 int state; /* state of grant or error if -ve */
78032 } afs;
78033 } fl_u;
78034 -};
78035 +} __randomize_layout;
78036
78037 /* The following constant reflects the upper bound of the file/locking space */
78038 #ifndef OFFSET_MAX
78039 @@ -1329,7 +1329,7 @@ struct super_block {
78040 struct list_lru s_dentry_lru ____cacheline_aligned_in_smp;
78041 struct list_lru s_inode_lru ____cacheline_aligned_in_smp;
78042 struct rcu_head rcu;
78043 -};
78044 +} __randomize_layout;
78045
78046 extern struct timespec current_fs_time(struct super_block *sb);
78047
78048 @@ -1551,7 +1551,8 @@ struct file_operations {
78049 long (*fallocate)(struct file *file, int mode, loff_t offset,
78050 loff_t len);
78051 int (*show_fdinfo)(struct seq_file *m, struct file *f);
78052 -};
78053 +} __do_const __randomize_layout;
78054 +typedef struct file_operations __no_const file_operations_no_const;
78055
78056 struct inode_operations {
78057 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
78058 @@ -2820,4 +2821,14 @@ static inline bool dir_relax(struct inode *inode)
78059 return !IS_DEADDIR(inode);
78060 }
78061
78062 +static inline bool is_sidechannel_device(const struct inode *inode)
78063 +{
78064 +#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
78065 + umode_t mode = inode->i_mode;
78066 + return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
78067 +#else
78068 + return false;
78069 +#endif
78070 +}
78071 +
78072 #endif /* _LINUX_FS_H */
78073 diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
78074 index 0efc3e6..fd23610 100644
78075 --- a/include/linux/fs_struct.h
78076 +++ b/include/linux/fs_struct.h
78077 @@ -6,13 +6,13 @@
78078 #include <linux/seqlock.h>
78079
78080 struct fs_struct {
78081 - int users;
78082 + atomic_t users;
78083 spinlock_t lock;
78084 seqcount_t seq;
78085 int umask;
78086 int in_exec;
78087 struct path root, pwd;
78088 -};
78089 +} __randomize_layout;
78090
78091 extern struct kmem_cache *fs_cachep;
78092
78093 diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
78094 index 7714849..a4a5c7a 100644
78095 --- a/include/linux/fscache-cache.h
78096 +++ b/include/linux/fscache-cache.h
78097 @@ -113,7 +113,7 @@ struct fscache_operation {
78098 fscache_operation_release_t release;
78099 };
78100
78101 -extern atomic_t fscache_op_debug_id;
78102 +extern atomic_unchecked_t fscache_op_debug_id;
78103 extern void fscache_op_work_func(struct work_struct *work);
78104
78105 extern void fscache_enqueue_operation(struct fscache_operation *);
78106 @@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
78107 INIT_WORK(&op->work, fscache_op_work_func);
78108 atomic_set(&op->usage, 1);
78109 op->state = FSCACHE_OP_ST_INITIALISED;
78110 - op->debug_id = atomic_inc_return(&fscache_op_debug_id);
78111 + op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
78112 op->processor = processor;
78113 op->release = release;
78114 INIT_LIST_HEAD(&op->pend_link);
78115 diff --git a/include/linux/fscache.h b/include/linux/fscache.h
78116 index 115bb81..e7b812b 100644
78117 --- a/include/linux/fscache.h
78118 +++ b/include/linux/fscache.h
78119 @@ -152,7 +152,7 @@ struct fscache_cookie_def {
78120 * - this is mandatory for any object that may have data
78121 */
78122 void (*now_uncached)(void *cookie_netfs_data);
78123 -};
78124 +} __do_const;
78125
78126 /*
78127 * fscache cached network filesystem type
78128 diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
78129 index 1c804b0..1432c2b 100644
78130 --- a/include/linux/fsnotify.h
78131 +++ b/include/linux/fsnotify.h
78132 @@ -195,6 +195,9 @@ static inline void fsnotify_access(struct file *file)
78133 struct inode *inode = file_inode(file);
78134 __u32 mask = FS_ACCESS;
78135
78136 + if (is_sidechannel_device(inode))
78137 + return;
78138 +
78139 if (S_ISDIR(inode->i_mode))
78140 mask |= FS_ISDIR;
78141
78142 @@ -213,6 +216,9 @@ static inline void fsnotify_modify(struct file *file)
78143 struct inode *inode = file_inode(file);
78144 __u32 mask = FS_MODIFY;
78145
78146 + if (is_sidechannel_device(inode))
78147 + return;
78148 +
78149 if (S_ISDIR(inode->i_mode))
78150 mask |= FS_ISDIR;
78151
78152 @@ -315,7 +321,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
78153 */
78154 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
78155 {
78156 - return kstrdup(name, GFP_KERNEL);
78157 + return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
78158 }
78159
78160 /*
78161 diff --git a/include/linux/genhd.h b/include/linux/genhd.h
78162 index 9f3c275..8bdff5d 100644
78163 --- a/include/linux/genhd.h
78164 +++ b/include/linux/genhd.h
78165 @@ -194,7 +194,7 @@ struct gendisk {
78166 struct kobject *slave_dir;
78167
78168 struct timer_rand_state *random;
78169 - atomic_t sync_io; /* RAID */
78170 + atomic_unchecked_t sync_io; /* RAID */
78171 struct disk_events *ev;
78172 #ifdef CONFIG_BLK_DEV_INTEGRITY
78173 struct blk_integrity *integrity;
78174 @@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
78175 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
78176
78177 /* drivers/char/random.c */
78178 -extern void add_disk_randomness(struct gendisk *disk);
78179 +extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
78180 extern void rand_initialize_disk(struct gendisk *disk);
78181
78182 static inline sector_t get_start_sect(struct block_device *bdev)
78183 diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
78184 index c0894dd..2fbf10c 100644
78185 --- a/include/linux/genl_magic_func.h
78186 +++ b/include/linux/genl_magic_func.h
78187 @@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
78188 },
78189
78190 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
78191 -static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
78192 +static struct genl_ops ZZZ_genl_ops[] = {
78193 #include GENL_MAGIC_INCLUDE_FILE
78194 };
78195
78196 diff --git a/include/linux/gfp.h b/include/linux/gfp.h
78197 index 39b81dc..819dc51 100644
78198 --- a/include/linux/gfp.h
78199 +++ b/include/linux/gfp.h
78200 @@ -36,6 +36,13 @@ struct vm_area_struct;
78201 #define ___GFP_NO_KSWAPD 0x400000u
78202 #define ___GFP_OTHER_NODE 0x800000u
78203 #define ___GFP_WRITE 0x1000000u
78204 +
78205 +#ifdef CONFIG_PAX_USERCOPY_SLABS
78206 +#define ___GFP_USERCOPY 0x2000000u
78207 +#else
78208 +#define ___GFP_USERCOPY 0
78209 +#endif
78210 +
78211 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
78212
78213 /*
78214 @@ -93,6 +100,7 @@ struct vm_area_struct;
78215 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
78216 #define __GFP_KMEMCG ((__force gfp_t)___GFP_KMEMCG) /* Allocation comes from a memcg-accounted resource */
78217 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
78218 +#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
78219
78220 /*
78221 * This may seem redundant, but it's a way of annotating false positives vs.
78222 @@ -100,7 +108,7 @@ struct vm_area_struct;
78223 */
78224 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
78225
78226 -#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
78227 +#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
78228 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
78229
78230 /* This equals 0, but use constants in case they ever change */
78231 @@ -158,6 +166,8 @@ struct vm_area_struct;
78232 /* 4GB DMA on some platforms */
78233 #define GFP_DMA32 __GFP_DMA32
78234
78235 +#define GFP_USERCOPY __GFP_USERCOPY
78236 +
78237 /* Convert GFP flags to their corresponding migrate type */
78238 static inline int allocflags_to_migratetype(gfp_t gfp_flags)
78239 {
78240 diff --git a/include/linux/gracl.h b/include/linux/gracl.h
78241 new file mode 100644
78242 index 0000000..edb2cb6
78243 --- /dev/null
78244 +++ b/include/linux/gracl.h
78245 @@ -0,0 +1,340 @@
78246 +#ifndef GR_ACL_H
78247 +#define GR_ACL_H
78248 +
78249 +#include <linux/grdefs.h>
78250 +#include <linux/resource.h>
78251 +#include <linux/capability.h>
78252 +#include <linux/dcache.h>
78253 +#include <asm/resource.h>
78254 +
78255 +/* Major status information */
78256 +
78257 +#define GR_VERSION "grsecurity 3.0"
78258 +#define GRSECURITY_VERSION 0x3000
78259 +
78260 +enum {
78261 + GR_SHUTDOWN = 0,
78262 + GR_ENABLE = 1,
78263 + GR_SPROLE = 2,
78264 + GR_OLDRELOAD = 3,
78265 + GR_SEGVMOD = 4,
78266 + GR_STATUS = 5,
78267 + GR_UNSPROLE = 6,
78268 + GR_PASSSET = 7,
78269 + GR_SPROLEPAM = 8,
78270 + GR_RELOAD = 9,
78271 +};
78272 +
78273 +/* Password setup definitions
78274 + * kernel/grhash.c */
78275 +enum {
78276 + GR_PW_LEN = 128,
78277 + GR_SALT_LEN = 16,
78278 + GR_SHA_LEN = 32,
78279 +};
78280 +
78281 +enum {
78282 + GR_SPROLE_LEN = 64,
78283 +};
78284 +
78285 +enum {
78286 + GR_NO_GLOB = 0,
78287 + GR_REG_GLOB,
78288 + GR_CREATE_GLOB
78289 +};
78290 +
78291 +#define GR_NLIMITS 32
78292 +
78293 +/* Begin Data Structures */
78294 +
78295 +struct sprole_pw {
78296 + unsigned char *rolename;
78297 + unsigned char salt[GR_SALT_LEN];
78298 + unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
78299 +};
78300 +
78301 +struct name_entry {
78302 + __u32 key;
78303 + ino_t inode;
78304 + dev_t device;
78305 + char *name;
78306 + __u16 len;
78307 + __u8 deleted;
78308 + struct name_entry *prev;
78309 + struct name_entry *next;
78310 +};
78311 +
78312 +struct inodev_entry {
78313 + struct name_entry *nentry;
78314 + struct inodev_entry *prev;
78315 + struct inodev_entry *next;
78316 +};
78317 +
78318 +struct acl_role_db {
78319 + struct acl_role_label **r_hash;
78320 + __u32 r_size;
78321 +};
78322 +
78323 +struct inodev_db {
78324 + struct inodev_entry **i_hash;
78325 + __u32 i_size;
78326 +};
78327 +
78328 +struct name_db {
78329 + struct name_entry **n_hash;
78330 + __u32 n_size;
78331 +};
78332 +
78333 +struct crash_uid {
78334 + uid_t uid;
78335 + unsigned long expires;
78336 +};
78337 +
78338 +struct gr_hash_struct {
78339 + void **table;
78340 + void **nametable;
78341 + void *first;
78342 + __u32 table_size;
78343 + __u32 used_size;
78344 + int type;
78345 +};
78346 +
78347 +/* Userspace Grsecurity ACL data structures */
78348 +
78349 +struct acl_subject_label {
78350 + char *filename;
78351 + ino_t inode;
78352 + dev_t device;
78353 + __u32 mode;
78354 + kernel_cap_t cap_mask;
78355 + kernel_cap_t cap_lower;
78356 + kernel_cap_t cap_invert_audit;
78357 +
78358 + struct rlimit res[GR_NLIMITS];
78359 + __u32 resmask;
78360 +
78361 + __u8 user_trans_type;
78362 + __u8 group_trans_type;
78363 + uid_t *user_transitions;
78364 + gid_t *group_transitions;
78365 + __u16 user_trans_num;
78366 + __u16 group_trans_num;
78367 +
78368 + __u32 sock_families[2];
78369 + __u32 ip_proto[8];
78370 + __u32 ip_type;
78371 + struct acl_ip_label **ips;
78372 + __u32 ip_num;
78373 + __u32 inaddr_any_override;
78374 +
78375 + __u32 crashes;
78376 + unsigned long expires;
78377 +
78378 + struct acl_subject_label *parent_subject;
78379 + struct gr_hash_struct *hash;
78380 + struct acl_subject_label *prev;
78381 + struct acl_subject_label *next;
78382 +
78383 + struct acl_object_label **obj_hash;
78384 + __u32 obj_hash_size;
78385 + __u16 pax_flags;
78386 +};
78387 +
78388 +struct role_allowed_ip {
78389 + __u32 addr;
78390 + __u32 netmask;
78391 +
78392 + struct role_allowed_ip *prev;
78393 + struct role_allowed_ip *next;
78394 +};
78395 +
78396 +struct role_transition {
78397 + char *rolename;
78398 +
78399 + struct role_transition *prev;
78400 + struct role_transition *next;
78401 +};
78402 +
78403 +struct acl_role_label {
78404 + char *rolename;
78405 + uid_t uidgid;
78406 + __u16 roletype;
78407 +
78408 + __u16 auth_attempts;
78409 + unsigned long expires;
78410 +
78411 + struct acl_subject_label *root_label;
78412 + struct gr_hash_struct *hash;
78413 +
78414 + struct acl_role_label *prev;
78415 + struct acl_role_label *next;
78416 +
78417 + struct role_transition *transitions;
78418 + struct role_allowed_ip *allowed_ips;
78419 + uid_t *domain_children;
78420 + __u16 domain_child_num;
78421 +
78422 + umode_t umask;
78423 +
78424 + struct acl_subject_label **subj_hash;
78425 + __u32 subj_hash_size;
78426 +};
78427 +
78428 +struct user_acl_role_db {
78429 + struct acl_role_label **r_table;
78430 + __u32 num_pointers; /* Number of allocations to track */
78431 + __u32 num_roles; /* Number of roles */
78432 + __u32 num_domain_children; /* Number of domain children */
78433 + __u32 num_subjects; /* Number of subjects */
78434 + __u32 num_objects; /* Number of objects */
78435 +};
78436 +
78437 +struct acl_object_label {
78438 + char *filename;
78439 + ino_t inode;
78440 + dev_t device;
78441 + __u32 mode;
78442 +
78443 + struct acl_subject_label *nested;
78444 + struct acl_object_label *globbed;
78445 +
78446 + /* next two structures not used */
78447 +
78448 + struct acl_object_label *prev;
78449 + struct acl_object_label *next;
78450 +};
78451 +
78452 +struct acl_ip_label {
78453 + char *iface;
78454 + __u32 addr;
78455 + __u32 netmask;
78456 + __u16 low, high;
78457 + __u8 mode;
78458 + __u32 type;
78459 + __u32 proto[8];
78460 +
78461 + /* next two structures not used */
78462 +
78463 + struct acl_ip_label *prev;
78464 + struct acl_ip_label *next;
78465 +};
78466 +
78467 +struct gr_arg {
78468 + struct user_acl_role_db role_db;
78469 + unsigned char pw[GR_PW_LEN];
78470 + unsigned char salt[GR_SALT_LEN];
78471 + unsigned char sum[GR_SHA_LEN];
78472 + unsigned char sp_role[GR_SPROLE_LEN];
78473 + struct sprole_pw *sprole_pws;
78474 + dev_t segv_device;
78475 + ino_t segv_inode;
78476 + uid_t segv_uid;
78477 + __u16 num_sprole_pws;
78478 + __u16 mode;
78479 +};
78480 +
78481 +struct gr_arg_wrapper {
78482 + struct gr_arg *arg;
78483 + __u32 version;
78484 + __u32 size;
78485 +};
78486 +
78487 +struct subject_map {
78488 + struct acl_subject_label *user;
78489 + struct acl_subject_label *kernel;
78490 + struct subject_map *prev;
78491 + struct subject_map *next;
78492 +};
78493 +
78494 +struct acl_subj_map_db {
78495 + struct subject_map **s_hash;
78496 + __u32 s_size;
78497 +};
78498 +
78499 +struct gr_policy_state {
78500 + struct sprole_pw **acl_special_roles;
78501 + __u16 num_sprole_pws;
78502 + struct acl_role_label *kernel_role;
78503 + struct acl_role_label *role_list;
78504 + struct acl_role_label *default_role;
78505 + struct acl_role_db acl_role_set;
78506 + struct acl_subj_map_db subj_map_set;
78507 + struct name_db name_set;
78508 + struct inodev_db inodev_set;
78509 +};
78510 +
78511 +struct gr_alloc_state {
78512 + unsigned long alloc_stack_next;
78513 + unsigned long alloc_stack_size;
78514 + void **alloc_stack;
78515 +};
78516 +
78517 +struct gr_reload_state {
78518 + struct gr_policy_state oldpolicy;
78519 + struct gr_alloc_state oldalloc;
78520 + struct gr_policy_state newpolicy;
78521 + struct gr_alloc_state newalloc;
78522 + struct gr_policy_state *oldpolicy_ptr;
78523 + struct gr_alloc_state *oldalloc_ptr;
78524 + unsigned char oldmode;
78525 +};
78526 +
78527 +/* End Data Structures Section */
78528 +
78529 +/* Hash functions generated by empirical testing by Brad Spengler
78530 + Makes good use of the low bits of the inode. Generally 0-1 times
78531 + in loop for successful match. 0-3 for unsuccessful match.
78532 + Shift/add algorithm with modulus of table size and an XOR*/
78533 +
78534 +static __inline__ unsigned int
78535 +gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
78536 +{
78537 + return ((((uid + type) << (16 + type)) ^ uid) % sz);
78538 +}
78539 +
78540 + static __inline__ unsigned int
78541 +gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
78542 +{
78543 + return ((const unsigned long)userp % sz);
78544 +}
78545 +
78546 +static __inline__ unsigned int
78547 +gr_fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
78548 +{
78549 + return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
78550 +}
78551 +
78552 +static __inline__ unsigned int
78553 +gr_nhash(const char *name, const __u16 len, const unsigned int sz)
78554 +{
78555 + return full_name_hash((const unsigned char *)name, len) % sz;
78556 +}
78557 +
78558 +#define FOR_EACH_SUBJECT_START(role,subj,iter) \
78559 + subj = NULL; \
78560 + iter = 0; \
78561 + while (iter < role->subj_hash_size) { \
78562 + if (subj == NULL) \
78563 + subj = role->subj_hash[iter]; \
78564 + if (subj == NULL) { \
78565 + iter++; \
78566 + continue; \
78567 + }
78568 +
78569 +#define FOR_EACH_SUBJECT_END(subj,iter) \
78570 + subj = subj->next; \
78571 + if (subj == NULL) \
78572 + iter++; \
78573 + }
78574 +
78575 +
78576 +#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
78577 + subj = role->hash->first; \
78578 + while (subj != NULL) {
78579 +
78580 +#define FOR_EACH_NESTED_SUBJECT_END(subj) \
78581 + subj = subj->next; \
78582 + }
78583 +
78584 +#endif
78585 +
78586 diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
78587 new file mode 100644
78588 index 0000000..33ebd1f
78589 --- /dev/null
78590 +++ b/include/linux/gracl_compat.h
78591 @@ -0,0 +1,156 @@
78592 +#ifndef GR_ACL_COMPAT_H
78593 +#define GR_ACL_COMPAT_H
78594 +
78595 +#include <linux/resource.h>
78596 +#include <asm/resource.h>
78597 +
78598 +struct sprole_pw_compat {
78599 + compat_uptr_t rolename;
78600 + unsigned char salt[GR_SALT_LEN];
78601 + unsigned char sum[GR_SHA_LEN];
78602 +};
78603 +
78604 +struct gr_hash_struct_compat {
78605 + compat_uptr_t table;
78606 + compat_uptr_t nametable;
78607 + compat_uptr_t first;
78608 + __u32 table_size;
78609 + __u32 used_size;
78610 + int type;
78611 +};
78612 +
78613 +struct acl_subject_label_compat {
78614 + compat_uptr_t filename;
78615 + compat_ino_t inode;
78616 + __u32 device;
78617 + __u32 mode;
78618 + kernel_cap_t cap_mask;
78619 + kernel_cap_t cap_lower;
78620 + kernel_cap_t cap_invert_audit;
78621 +
78622 + struct compat_rlimit res[GR_NLIMITS];
78623 + __u32 resmask;
78624 +
78625 + __u8 user_trans_type;
78626 + __u8 group_trans_type;
78627 + compat_uptr_t user_transitions;
78628 + compat_uptr_t group_transitions;
78629 + __u16 user_trans_num;
78630 + __u16 group_trans_num;
78631 +
78632 + __u32 sock_families[2];
78633 + __u32 ip_proto[8];
78634 + __u32 ip_type;
78635 + compat_uptr_t ips;
78636 + __u32 ip_num;
78637 + __u32 inaddr_any_override;
78638 +
78639 + __u32 crashes;
78640 + compat_ulong_t expires;
78641 +
78642 + compat_uptr_t parent_subject;
78643 + compat_uptr_t hash;
78644 + compat_uptr_t prev;
78645 + compat_uptr_t next;
78646 +
78647 + compat_uptr_t obj_hash;
78648 + __u32 obj_hash_size;
78649 + __u16 pax_flags;
78650 +};
78651 +
78652 +struct role_allowed_ip_compat {
78653 + __u32 addr;
78654 + __u32 netmask;
78655 +
78656 + compat_uptr_t prev;
78657 + compat_uptr_t next;
78658 +};
78659 +
78660 +struct role_transition_compat {
78661 + compat_uptr_t rolename;
78662 +
78663 + compat_uptr_t prev;
78664 + compat_uptr_t next;
78665 +};
78666 +
78667 +struct acl_role_label_compat {
78668 + compat_uptr_t rolename;
78669 + uid_t uidgid;
78670 + __u16 roletype;
78671 +
78672 + __u16 auth_attempts;
78673 + compat_ulong_t expires;
78674 +
78675 + compat_uptr_t root_label;
78676 + compat_uptr_t hash;
78677 +
78678 + compat_uptr_t prev;
78679 + compat_uptr_t next;
78680 +
78681 + compat_uptr_t transitions;
78682 + compat_uptr_t allowed_ips;
78683 + compat_uptr_t domain_children;
78684 + __u16 domain_child_num;
78685 +
78686 + umode_t umask;
78687 +
78688 + compat_uptr_t subj_hash;
78689 + __u32 subj_hash_size;
78690 +};
78691 +
78692 +struct user_acl_role_db_compat {
78693 + compat_uptr_t r_table;
78694 + __u32 num_pointers;
78695 + __u32 num_roles;
78696 + __u32 num_domain_children;
78697 + __u32 num_subjects;
78698 + __u32 num_objects;
78699 +};
78700 +
78701 +struct acl_object_label_compat {
78702 + compat_uptr_t filename;
78703 + compat_ino_t inode;
78704 + __u32 device;
78705 + __u32 mode;
78706 +
78707 + compat_uptr_t nested;
78708 + compat_uptr_t globbed;
78709 +
78710 + compat_uptr_t prev;
78711 + compat_uptr_t next;
78712 +};
78713 +
78714 +struct acl_ip_label_compat {
78715 + compat_uptr_t iface;
78716 + __u32 addr;
78717 + __u32 netmask;
78718 + __u16 low, high;
78719 + __u8 mode;
78720 + __u32 type;
78721 + __u32 proto[8];
78722 +
78723 + compat_uptr_t prev;
78724 + compat_uptr_t next;
78725 +};
78726 +
78727 +struct gr_arg_compat {
78728 + struct user_acl_role_db_compat role_db;
78729 + unsigned char pw[GR_PW_LEN];
78730 + unsigned char salt[GR_SALT_LEN];
78731 + unsigned char sum[GR_SHA_LEN];
78732 + unsigned char sp_role[GR_SPROLE_LEN];
78733 + compat_uptr_t sprole_pws;
78734 + __u32 segv_device;
78735 + compat_ino_t segv_inode;
78736 + uid_t segv_uid;
78737 + __u16 num_sprole_pws;
78738 + __u16 mode;
78739 +};
78740 +
78741 +struct gr_arg_wrapper_compat {
78742 + compat_uptr_t arg;
78743 + __u32 version;
78744 + __u32 size;
78745 +};
78746 +
78747 +#endif
78748 diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
78749 new file mode 100644
78750 index 0000000..323ecf2
78751 --- /dev/null
78752 +++ b/include/linux/gralloc.h
78753 @@ -0,0 +1,9 @@
78754 +#ifndef __GRALLOC_H
78755 +#define __GRALLOC_H
78756 +
78757 +void acl_free_all(void);
78758 +int acl_alloc_stack_init(unsigned long size);
78759 +void *acl_alloc(unsigned long len);
78760 +void *acl_alloc_num(unsigned long num, unsigned long len);
78761 +
78762 +#endif
78763 diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
78764 new file mode 100644
78765 index 0000000..be66033
78766 --- /dev/null
78767 +++ b/include/linux/grdefs.h
78768 @@ -0,0 +1,140 @@
78769 +#ifndef GRDEFS_H
78770 +#define GRDEFS_H
78771 +
78772 +/* Begin grsecurity status declarations */
78773 +
78774 +enum {
78775 + GR_READY = 0x01,
78776 + GR_STATUS_INIT = 0x00 // disabled state
78777 +};
78778 +
78779 +/* Begin ACL declarations */
78780 +
78781 +/* Role flags */
78782 +
78783 +enum {
78784 + GR_ROLE_USER = 0x0001,
78785 + GR_ROLE_GROUP = 0x0002,
78786 + GR_ROLE_DEFAULT = 0x0004,
78787 + GR_ROLE_SPECIAL = 0x0008,
78788 + GR_ROLE_AUTH = 0x0010,
78789 + GR_ROLE_NOPW = 0x0020,
78790 + GR_ROLE_GOD = 0x0040,
78791 + GR_ROLE_LEARN = 0x0080,
78792 + GR_ROLE_TPE = 0x0100,
78793 + GR_ROLE_DOMAIN = 0x0200,
78794 + GR_ROLE_PAM = 0x0400,
78795 + GR_ROLE_PERSIST = 0x0800
78796 +};
78797 +
78798 +/* ACL Subject and Object mode flags */
78799 +enum {
78800 + GR_DELETED = 0x80000000
78801 +};
78802 +
78803 +/* ACL Object-only mode flags */
78804 +enum {
78805 + GR_READ = 0x00000001,
78806 + GR_APPEND = 0x00000002,
78807 + GR_WRITE = 0x00000004,
78808 + GR_EXEC = 0x00000008,
78809 + GR_FIND = 0x00000010,
78810 + GR_INHERIT = 0x00000020,
78811 + GR_SETID = 0x00000040,
78812 + GR_CREATE = 0x00000080,
78813 + GR_DELETE = 0x00000100,
78814 + GR_LINK = 0x00000200,
78815 + GR_AUDIT_READ = 0x00000400,
78816 + GR_AUDIT_APPEND = 0x00000800,
78817 + GR_AUDIT_WRITE = 0x00001000,
78818 + GR_AUDIT_EXEC = 0x00002000,
78819 + GR_AUDIT_FIND = 0x00004000,
78820 + GR_AUDIT_INHERIT= 0x00008000,
78821 + GR_AUDIT_SETID = 0x00010000,
78822 + GR_AUDIT_CREATE = 0x00020000,
78823 + GR_AUDIT_DELETE = 0x00040000,
78824 + GR_AUDIT_LINK = 0x00080000,
78825 + GR_PTRACERD = 0x00100000,
78826 + GR_NOPTRACE = 0x00200000,
78827 + GR_SUPPRESS = 0x00400000,
78828 + GR_NOLEARN = 0x00800000,
78829 + GR_INIT_TRANSFER= 0x01000000
78830 +};
78831 +
78832 +#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
78833 + GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
78834 + GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
78835 +
78836 +/* ACL subject-only mode flags */
78837 +enum {
78838 + GR_KILL = 0x00000001,
78839 + GR_VIEW = 0x00000002,
78840 + GR_PROTECTED = 0x00000004,
78841 + GR_LEARN = 0x00000008,
78842 + GR_OVERRIDE = 0x00000010,
78843 + /* just a placeholder, this mode is only used in userspace */
78844 + GR_DUMMY = 0x00000020,
78845 + GR_PROTSHM = 0x00000040,
78846 + GR_KILLPROC = 0x00000080,
78847 + GR_KILLIPPROC = 0x00000100,
78848 + /* just a placeholder, this mode is only used in userspace */
78849 + GR_NOTROJAN = 0x00000200,
78850 + GR_PROTPROCFD = 0x00000400,
78851 + GR_PROCACCT = 0x00000800,
78852 + GR_RELAXPTRACE = 0x00001000,
78853 + //GR_NESTED = 0x00002000,
78854 + GR_INHERITLEARN = 0x00004000,
78855 + GR_PROCFIND = 0x00008000,
78856 + GR_POVERRIDE = 0x00010000,
78857 + GR_KERNELAUTH = 0x00020000,
78858 + GR_ATSECURE = 0x00040000,
78859 + GR_SHMEXEC = 0x00080000
78860 +};
78861 +
78862 +enum {
78863 + GR_PAX_ENABLE_SEGMEXEC = 0x0001,
78864 + GR_PAX_ENABLE_PAGEEXEC = 0x0002,
78865 + GR_PAX_ENABLE_MPROTECT = 0x0004,
78866 + GR_PAX_ENABLE_RANDMMAP = 0x0008,
78867 + GR_PAX_ENABLE_EMUTRAMP = 0x0010,
78868 + GR_PAX_DISABLE_SEGMEXEC = 0x0100,
78869 + GR_PAX_DISABLE_PAGEEXEC = 0x0200,
78870 + GR_PAX_DISABLE_MPROTECT = 0x0400,
78871 + GR_PAX_DISABLE_RANDMMAP = 0x0800,
78872 + GR_PAX_DISABLE_EMUTRAMP = 0x1000,
78873 +};
78874 +
78875 +enum {
78876 + GR_ID_USER = 0x01,
78877 + GR_ID_GROUP = 0x02,
78878 +};
78879 +
78880 +enum {
78881 + GR_ID_ALLOW = 0x01,
78882 + GR_ID_DENY = 0x02,
78883 +};
78884 +
78885 +#define GR_CRASH_RES 31
78886 +#define GR_UIDTABLE_MAX 500
78887 +
78888 +/* begin resource learning section */
78889 +enum {
78890 + GR_RLIM_CPU_BUMP = 60,
78891 + GR_RLIM_FSIZE_BUMP = 50000,
78892 + GR_RLIM_DATA_BUMP = 10000,
78893 + GR_RLIM_STACK_BUMP = 1000,
78894 + GR_RLIM_CORE_BUMP = 10000,
78895 + GR_RLIM_RSS_BUMP = 500000,
78896 + GR_RLIM_NPROC_BUMP = 1,
78897 + GR_RLIM_NOFILE_BUMP = 5,
78898 + GR_RLIM_MEMLOCK_BUMP = 50000,
78899 + GR_RLIM_AS_BUMP = 500000,
78900 + GR_RLIM_LOCKS_BUMP = 2,
78901 + GR_RLIM_SIGPENDING_BUMP = 5,
78902 + GR_RLIM_MSGQUEUE_BUMP = 10000,
78903 + GR_RLIM_NICE_BUMP = 1,
78904 + GR_RLIM_RTPRIO_BUMP = 1,
78905 + GR_RLIM_RTTIME_BUMP = 1000000
78906 +};
78907 +
78908 +#endif
78909 diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
78910 new file mode 100644
78911 index 0000000..d25522e
78912 --- /dev/null
78913 +++ b/include/linux/grinternal.h
78914 @@ -0,0 +1,229 @@
78915 +#ifndef __GRINTERNAL_H
78916 +#define __GRINTERNAL_H
78917 +
78918 +#ifdef CONFIG_GRKERNSEC
78919 +
78920 +#include <linux/fs.h>
78921 +#include <linux/mnt_namespace.h>
78922 +#include <linux/nsproxy.h>
78923 +#include <linux/gracl.h>
78924 +#include <linux/grdefs.h>
78925 +#include <linux/grmsg.h>
78926 +
78927 +void gr_add_learn_entry(const char *fmt, ...)
78928 + __attribute__ ((format (printf, 1, 2)));
78929 +__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
78930 + const struct vfsmount *mnt);
78931 +__u32 gr_check_create(const struct dentry *new_dentry,
78932 + const struct dentry *parent,
78933 + const struct vfsmount *mnt, const __u32 mode);
78934 +int gr_check_protected_task(const struct task_struct *task);
78935 +__u32 to_gr_audit(const __u32 reqmode);
78936 +int gr_set_acls(const int type);
78937 +int gr_acl_is_enabled(void);
78938 +char gr_roletype_to_char(void);
78939 +
78940 +void gr_handle_alertkill(struct task_struct *task);
78941 +char *gr_to_filename(const struct dentry *dentry,
78942 + const struct vfsmount *mnt);
78943 +char *gr_to_filename1(const struct dentry *dentry,
78944 + const struct vfsmount *mnt);
78945 +char *gr_to_filename2(const struct dentry *dentry,
78946 + const struct vfsmount *mnt);
78947 +char *gr_to_filename3(const struct dentry *dentry,
78948 + const struct vfsmount *mnt);
78949 +
78950 +extern int grsec_enable_ptrace_readexec;
78951 +extern int grsec_enable_harden_ptrace;
78952 +extern int grsec_enable_link;
78953 +extern int grsec_enable_fifo;
78954 +extern int grsec_enable_execve;
78955 +extern int grsec_enable_shm;
78956 +extern int grsec_enable_execlog;
78957 +extern int grsec_enable_signal;
78958 +extern int grsec_enable_audit_ptrace;
78959 +extern int grsec_enable_forkfail;
78960 +extern int grsec_enable_time;
78961 +extern int grsec_enable_rofs;
78962 +extern int grsec_deny_new_usb;
78963 +extern int grsec_enable_chroot_shmat;
78964 +extern int grsec_enable_chroot_mount;
78965 +extern int grsec_enable_chroot_double;
78966 +extern int grsec_enable_chroot_pivot;
78967 +extern int grsec_enable_chroot_chdir;
78968 +extern int grsec_enable_chroot_chmod;
78969 +extern int grsec_enable_chroot_mknod;
78970 +extern int grsec_enable_chroot_fchdir;
78971 +extern int grsec_enable_chroot_nice;
78972 +extern int grsec_enable_chroot_execlog;
78973 +extern int grsec_enable_chroot_caps;
78974 +extern int grsec_enable_chroot_sysctl;
78975 +extern int grsec_enable_chroot_unix;
78976 +extern int grsec_enable_symlinkown;
78977 +extern kgid_t grsec_symlinkown_gid;
78978 +extern int grsec_enable_tpe;
78979 +extern kgid_t grsec_tpe_gid;
78980 +extern int grsec_enable_tpe_all;
78981 +extern int grsec_enable_tpe_invert;
78982 +extern int grsec_enable_socket_all;
78983 +extern kgid_t grsec_socket_all_gid;
78984 +extern int grsec_enable_socket_client;
78985 +extern kgid_t grsec_socket_client_gid;
78986 +extern int grsec_enable_socket_server;
78987 +extern kgid_t grsec_socket_server_gid;
78988 +extern kgid_t grsec_audit_gid;
78989 +extern int grsec_enable_group;
78990 +extern int grsec_enable_log_rwxmaps;
78991 +extern int grsec_enable_mount;
78992 +extern int grsec_enable_chdir;
78993 +extern int grsec_resource_logging;
78994 +extern int grsec_enable_blackhole;
78995 +extern int grsec_lastack_retries;
78996 +extern int grsec_enable_brute;
78997 +extern int grsec_enable_harden_ipc;
78998 +extern int grsec_lock;
78999 +
79000 +extern spinlock_t grsec_alert_lock;
79001 +extern unsigned long grsec_alert_wtime;
79002 +extern unsigned long grsec_alert_fyet;
79003 +
79004 +extern spinlock_t grsec_audit_lock;
79005 +
79006 +extern rwlock_t grsec_exec_file_lock;
79007 +
79008 +#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
79009 + gr_to_filename2((tsk)->exec_file->f_path.dentry, \
79010 + (tsk)->exec_file->f_path.mnt) : "/")
79011 +
79012 +#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
79013 + gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
79014 + (tsk)->real_parent->exec_file->f_path.mnt) : "/")
79015 +
79016 +#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
79017 + gr_to_filename((tsk)->exec_file->f_path.dentry, \
79018 + (tsk)->exec_file->f_path.mnt) : "/")
79019 +
79020 +#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
79021 + gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
79022 + (tsk)->real_parent->exec_file->f_path.mnt) : "/")
79023 +
79024 +#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
79025 +
79026 +#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
79027 +
79028 +static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
79029 +{
79030 + if (file1 && file2) {
79031 + const struct inode *inode1 = file1->f_path.dentry->d_inode;
79032 + const struct inode *inode2 = file2->f_path.dentry->d_inode;
79033 + if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
79034 + return true;
79035 + }
79036 +
79037 + return false;
79038 +}
79039 +
79040 +#define GR_CHROOT_CAPS {{ \
79041 + CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
79042 + CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
79043 + CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
79044 + CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
79045 + CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
79046 + CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
79047 + CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
79048 +
79049 +#define security_learn(normal_msg,args...) \
79050 +({ \
79051 + read_lock(&grsec_exec_file_lock); \
79052 + gr_add_learn_entry(normal_msg "\n", ## args); \
79053 + read_unlock(&grsec_exec_file_lock); \
79054 +})
79055 +
79056 +enum {
79057 + GR_DO_AUDIT,
79058 + GR_DONT_AUDIT,
79059 + /* used for non-audit messages that we shouldn't kill the task on */
79060 + GR_DONT_AUDIT_GOOD
79061 +};
79062 +
79063 +enum {
79064 + GR_TTYSNIFF,
79065 + GR_RBAC,
79066 + GR_RBAC_STR,
79067 + GR_STR_RBAC,
79068 + GR_RBAC_MODE2,
79069 + GR_RBAC_MODE3,
79070 + GR_FILENAME,
79071 + GR_SYSCTL_HIDDEN,
79072 + GR_NOARGS,
79073 + GR_ONE_INT,
79074 + GR_ONE_INT_TWO_STR,
79075 + GR_ONE_STR,
79076 + GR_STR_INT,
79077 + GR_TWO_STR_INT,
79078 + GR_TWO_INT,
79079 + GR_TWO_U64,
79080 + GR_THREE_INT,
79081 + GR_FIVE_INT_TWO_STR,
79082 + GR_TWO_STR,
79083 + GR_THREE_STR,
79084 + GR_FOUR_STR,
79085 + GR_STR_FILENAME,
79086 + GR_FILENAME_STR,
79087 + GR_FILENAME_TWO_INT,
79088 + GR_FILENAME_TWO_INT_STR,
79089 + GR_TEXTREL,
79090 + GR_PTRACE,
79091 + GR_RESOURCE,
79092 + GR_CAP,
79093 + GR_SIG,
79094 + GR_SIG2,
79095 + GR_CRASH1,
79096 + GR_CRASH2,
79097 + GR_PSACCT,
79098 + GR_RWXMAP,
79099 + GR_RWXMAPVMA
79100 +};
79101 +
79102 +#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
79103 +#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
79104 +#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
79105 +#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
79106 +#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
79107 +#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
79108 +#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)
79109 +#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
79110 +#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
79111 +#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
79112 +#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
79113 +#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
79114 +#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
79115 +#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
79116 +#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
79117 +#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
79118 +#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)
79119 +#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
79120 +#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
79121 +#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
79122 +#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
79123 +#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
79124 +#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
79125 +#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
79126 +#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)
79127 +#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
79128 +#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
79129 +#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
79130 +#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
79131 +#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
79132 +#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
79133 +#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
79134 +#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
79135 +#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)
79136 +#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
79137 +#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
79138 +
79139 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
79140 +
79141 +#endif
79142 +
79143 +#endif
79144 diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
79145 new file mode 100644
79146 index 0000000..ba93581
79147 --- /dev/null
79148 +++ b/include/linux/grmsg.h
79149 @@ -0,0 +1,116 @@
79150 +#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"
79151 +#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"
79152 +#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
79153 +#define GR_STOPMOD_MSG "denied modification of module state by "
79154 +#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
79155 +#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
79156 +#define GR_IOPERM_MSG "denied use of ioperm() by "
79157 +#define GR_IOPL_MSG "denied use of iopl() by "
79158 +#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
79159 +#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
79160 +#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
79161 +#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
79162 +#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
79163 +#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"
79164 +#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"
79165 +#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
79166 +#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
79167 +#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
79168 +#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
79169 +#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
79170 +#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
79171 +#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
79172 +#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
79173 +#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
79174 +#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
79175 +#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
79176 +#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
79177 +#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
79178 +#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
79179 +#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
79180 +#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
79181 +#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
79182 +#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
79183 +#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
79184 +#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
79185 +#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
79186 +#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
79187 +#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
79188 +#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
79189 +#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
79190 +#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
79191 +#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
79192 +#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
79193 +#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
79194 +#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
79195 +#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
79196 +#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
79197 +#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
79198 +#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
79199 +#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
79200 +#define GR_INITF_ACL_MSG "init_variables() failed %s by "
79201 +#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"
79202 +#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
79203 +#define GR_SHUTS_ACL_MSG "shutdown auth success for "
79204 +#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
79205 +#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
79206 +#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
79207 +#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
79208 +#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
79209 +#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
79210 +#define GR_ENABLEF_ACL_MSG "unable to load %s for "
79211 +#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
79212 +#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
79213 +#define GR_RELOADF_ACL_MSG "failed reload of %s for "
79214 +#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
79215 +#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
79216 +#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
79217 +#define GR_SPROLEF_ACL_MSG "special role %s failure for "
79218 +#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
79219 +#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
79220 +#define GR_INVMODE_ACL_MSG "invalid mode %d by "
79221 +#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
79222 +#define GR_FAILFORK_MSG "failed fork with errno %s by "
79223 +#define GR_NICE_CHROOT_MSG "denied priority change by "
79224 +#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
79225 +#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
79226 +#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
79227 +#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
79228 +#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
79229 +#define GR_TIME_MSG "time set by "
79230 +#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
79231 +#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
79232 +#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
79233 +#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
79234 +#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
79235 +#define GR_BIND_MSG "denied bind() by "
79236 +#define GR_CONNECT_MSG "denied connect() by "
79237 +#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
79238 +#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
79239 +#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"
79240 +#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
79241 +#define GR_CAP_ACL_MSG "use of %s denied for "
79242 +#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
79243 +#define GR_CAP_ACL_MSG2 "use of %s permitted for "
79244 +#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
79245 +#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
79246 +#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
79247 +#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
79248 +#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
79249 +#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
79250 +#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
79251 +#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
79252 +#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
79253 +#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
79254 +#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
79255 +#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
79256 +#define GR_VM86_MSG "denied use of vm86 by "
79257 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
79258 +#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
79259 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
79260 +#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
79261 +#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
79262 +#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 "
79263 +#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 "
79264 +#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
79265 +#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
79266 diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
79267 new file mode 100644
79268 index 0000000..f2d8c6c
79269 --- /dev/null
79270 +++ b/include/linux/grsecurity.h
79271 @@ -0,0 +1,248 @@
79272 +#ifndef GR_SECURITY_H
79273 +#define GR_SECURITY_H
79274 +#include <linux/fs.h>
79275 +#include <linux/fs_struct.h>
79276 +#include <linux/binfmts.h>
79277 +#include <linux/gracl.h>
79278 +
79279 +/* notify of brain-dead configs */
79280 +#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
79281 +#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
79282 +#endif
79283 +#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
79284 +#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
79285 +#endif
79286 +#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
79287 +#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
79288 +#endif
79289 +#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
79290 +#error "CONFIG_PAX enabled, but no PaX options are enabled."
79291 +#endif
79292 +
79293 +int gr_handle_new_usb(void);
79294 +
79295 +void gr_handle_brute_attach(int dumpable);
79296 +void gr_handle_brute_check(void);
79297 +void gr_handle_kernel_exploit(void);
79298 +
79299 +char gr_roletype_to_char(void);
79300 +
79301 +int gr_proc_is_restricted(void);
79302 +
79303 +int gr_acl_enable_at_secure(void);
79304 +
79305 +int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
79306 +int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
79307 +
79308 +void gr_del_task_from_ip_table(struct task_struct *p);
79309 +
79310 +int gr_pid_is_chrooted(struct task_struct *p);
79311 +int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
79312 +int gr_handle_chroot_nice(void);
79313 +int gr_handle_chroot_sysctl(const int op);
79314 +int gr_handle_chroot_setpriority(struct task_struct *p,
79315 + const int niceval);
79316 +int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
79317 +int gr_handle_chroot_chroot(const struct dentry *dentry,
79318 + const struct vfsmount *mnt);
79319 +void gr_handle_chroot_chdir(const struct path *path);
79320 +int gr_handle_chroot_chmod(const struct dentry *dentry,
79321 + const struct vfsmount *mnt, const int mode);
79322 +int gr_handle_chroot_mknod(const struct dentry *dentry,
79323 + const struct vfsmount *mnt, const int mode);
79324 +int gr_handle_chroot_mount(const struct dentry *dentry,
79325 + const struct vfsmount *mnt,
79326 + const char *dev_name);
79327 +int gr_handle_chroot_pivot(void);
79328 +int gr_handle_chroot_unix(const pid_t pid);
79329 +
79330 +int gr_handle_rawio(const struct inode *inode);
79331 +
79332 +void gr_handle_ioperm(void);
79333 +void gr_handle_iopl(void);
79334 +void gr_handle_msr_write(void);
79335 +
79336 +umode_t gr_acl_umask(void);
79337 +
79338 +int gr_tpe_allow(const struct file *file);
79339 +
79340 +void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
79341 +void gr_clear_chroot_entries(struct task_struct *task);
79342 +
79343 +void gr_log_forkfail(const int retval);
79344 +void gr_log_timechange(void);
79345 +void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
79346 +void gr_log_chdir(const struct dentry *dentry,
79347 + const struct vfsmount *mnt);
79348 +void gr_log_chroot_exec(const struct dentry *dentry,
79349 + const struct vfsmount *mnt);
79350 +void gr_log_remount(const char *devname, const int retval);
79351 +void gr_log_unmount(const char *devname, const int retval);
79352 +void gr_log_mount(const char *from, const char *to, const int retval);
79353 +void gr_log_textrel(struct vm_area_struct *vma);
79354 +void gr_log_ptgnustack(struct file *file);
79355 +void gr_log_rwxmmap(struct file *file);
79356 +void gr_log_rwxmprotect(struct vm_area_struct *vma);
79357 +
79358 +int gr_handle_follow_link(const struct inode *parent,
79359 + const struct inode *inode,
79360 + const struct dentry *dentry,
79361 + const struct vfsmount *mnt);
79362 +int gr_handle_fifo(const struct dentry *dentry,
79363 + const struct vfsmount *mnt,
79364 + const struct dentry *dir, const int flag,
79365 + const int acc_mode);
79366 +int gr_handle_hardlink(const struct dentry *dentry,
79367 + const struct vfsmount *mnt,
79368 + struct inode *inode,
79369 + const int mode, const struct filename *to);
79370 +
79371 +int gr_is_capable(const int cap);
79372 +int gr_is_capable_nolog(const int cap);
79373 +int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
79374 +int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
79375 +
79376 +void gr_copy_label(struct task_struct *tsk);
79377 +void gr_handle_crash(struct task_struct *task, const int sig);
79378 +int gr_handle_signal(const struct task_struct *p, const int sig);
79379 +int gr_check_crash_uid(const kuid_t uid);
79380 +int gr_check_protected_task(const struct task_struct *task);
79381 +int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
79382 +int gr_acl_handle_mmap(const struct file *file,
79383 + const unsigned long prot);
79384 +int gr_acl_handle_mprotect(const struct file *file,
79385 + const unsigned long prot);
79386 +int gr_check_hidden_task(const struct task_struct *tsk);
79387 +__u32 gr_acl_handle_truncate(const struct dentry *dentry,
79388 + const struct vfsmount *mnt);
79389 +__u32 gr_acl_handle_utime(const struct dentry *dentry,
79390 + const struct vfsmount *mnt);
79391 +__u32 gr_acl_handle_access(const struct dentry *dentry,
79392 + const struct vfsmount *mnt, const int fmode);
79393 +__u32 gr_acl_handle_chmod(const struct dentry *dentry,
79394 + const struct vfsmount *mnt, umode_t *mode);
79395 +__u32 gr_acl_handle_chown(const struct dentry *dentry,
79396 + const struct vfsmount *mnt);
79397 +__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
79398 + const struct vfsmount *mnt);
79399 +__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
79400 + const struct vfsmount *mnt);
79401 +int gr_handle_ptrace(struct task_struct *task, const long request);
79402 +int gr_handle_proc_ptrace(struct task_struct *task);
79403 +__u32 gr_acl_handle_execve(const struct dentry *dentry,
79404 + const struct vfsmount *mnt);
79405 +int gr_check_crash_exec(const struct file *filp);
79406 +int gr_acl_is_enabled(void);
79407 +void gr_set_role_label(struct task_struct *task, const kuid_t uid,
79408 + const kgid_t gid);
79409 +int gr_set_proc_label(const struct dentry *dentry,
79410 + const struct vfsmount *mnt,
79411 + const int unsafe_flags);
79412 +__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
79413 + const struct vfsmount *mnt);
79414 +__u32 gr_acl_handle_open(const struct dentry *dentry,
79415 + const struct vfsmount *mnt, int acc_mode);
79416 +__u32 gr_acl_handle_creat(const struct dentry *dentry,
79417 + const struct dentry *p_dentry,
79418 + const struct vfsmount *p_mnt,
79419 + int open_flags, int acc_mode, const int imode);
79420 +void gr_handle_create(const struct dentry *dentry,
79421 + const struct vfsmount *mnt);
79422 +void gr_handle_proc_create(const struct dentry *dentry,
79423 + const struct inode *inode);
79424 +__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
79425 + const struct dentry *parent_dentry,
79426 + const struct vfsmount *parent_mnt,
79427 + const int mode);
79428 +__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
79429 + const struct dentry *parent_dentry,
79430 + const struct vfsmount *parent_mnt);
79431 +__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
79432 + const struct vfsmount *mnt);
79433 +void gr_handle_delete(const ino_t ino, const dev_t dev);
79434 +__u32 gr_acl_handle_unlink(const struct dentry *dentry,
79435 + const struct vfsmount *mnt);
79436 +__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
79437 + const struct dentry *parent_dentry,
79438 + const struct vfsmount *parent_mnt,
79439 + const struct filename *from);
79440 +__u32 gr_acl_handle_link(const struct dentry *new_dentry,
79441 + const struct dentry *parent_dentry,
79442 + const struct vfsmount *parent_mnt,
79443 + const struct dentry *old_dentry,
79444 + const struct vfsmount *old_mnt, const struct filename *to);
79445 +int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
79446 +int gr_acl_handle_rename(struct dentry *new_dentry,
79447 + struct dentry *parent_dentry,
79448 + const struct vfsmount *parent_mnt,
79449 + struct dentry *old_dentry,
79450 + struct inode *old_parent_inode,
79451 + struct vfsmount *old_mnt, const struct filename *newname);
79452 +void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
79453 + struct dentry *old_dentry,
79454 + struct dentry *new_dentry,
79455 + struct vfsmount *mnt, const __u8 replace);
79456 +__u32 gr_check_link(const struct dentry *new_dentry,
79457 + const struct dentry *parent_dentry,
79458 + const struct vfsmount *parent_mnt,
79459 + const struct dentry *old_dentry,
79460 + const struct vfsmount *old_mnt);
79461 +int gr_acl_handle_filldir(const struct file *file, const char *name,
79462 + const unsigned int namelen, const ino_t ino);
79463 +
79464 +__u32 gr_acl_handle_unix(const struct dentry *dentry,
79465 + const struct vfsmount *mnt);
79466 +void gr_acl_handle_exit(void);
79467 +void gr_acl_handle_psacct(struct task_struct *task, const long code);
79468 +int gr_acl_handle_procpidmem(const struct task_struct *task);
79469 +int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
79470 +int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
79471 +void gr_audit_ptrace(struct task_struct *task);
79472 +dev_t gr_get_dev_from_dentry(struct dentry *dentry);
79473 +void gr_put_exec_file(struct task_struct *task);
79474 +
79475 +int gr_ptrace_readexec(struct file *file, int unsafe_flags);
79476 +
79477 +#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
79478 +extern void gr_learn_resource(const struct task_struct *task, const int res,
79479 + const unsigned long wanted, const int gt);
79480 +#else
79481 +static inline void gr_learn_resource(const struct task_struct *task, const int res,
79482 + const unsigned long wanted, const int gt)
79483 +{
79484 +}
79485 +#endif
79486 +
79487 +#ifdef CONFIG_GRKERNSEC_RESLOG
79488 +extern void gr_log_resource(const struct task_struct *task, const int res,
79489 + const unsigned long wanted, const int gt);
79490 +#else
79491 +static inline void gr_log_resource(const struct task_struct *task, const int res,
79492 + const unsigned long wanted, const int gt)
79493 +{
79494 +}
79495 +#endif
79496 +
79497 +#ifdef CONFIG_GRKERNSEC
79498 +void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
79499 +void gr_handle_vm86(void);
79500 +void gr_handle_mem_readwrite(u64 from, u64 to);
79501 +
79502 +void gr_log_badprocpid(const char *entry);
79503 +
79504 +extern int grsec_enable_dmesg;
79505 +extern int grsec_disable_privio;
79506 +
79507 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
79508 +extern kgid_t grsec_proc_gid;
79509 +#endif
79510 +
79511 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
79512 +extern int grsec_enable_chroot_findtask;
79513 +#endif
79514 +#ifdef CONFIG_GRKERNSEC_SETXID
79515 +extern int grsec_enable_setxid;
79516 +#endif
79517 +#endif
79518 +
79519 +#endif
79520 diff --git a/include/linux/grsock.h b/include/linux/grsock.h
79521 new file mode 100644
79522 index 0000000..e7ffaaf
79523 --- /dev/null
79524 +++ b/include/linux/grsock.h
79525 @@ -0,0 +1,19 @@
79526 +#ifndef __GRSOCK_H
79527 +#define __GRSOCK_H
79528 +
79529 +extern void gr_attach_curr_ip(const struct sock *sk);
79530 +extern int gr_handle_sock_all(const int family, const int type,
79531 + const int protocol);
79532 +extern int gr_handle_sock_server(const struct sockaddr *sck);
79533 +extern int gr_handle_sock_server_other(const struct sock *sck);
79534 +extern int gr_handle_sock_client(const struct sockaddr *sck);
79535 +extern int gr_search_connect(struct socket * sock,
79536 + struct sockaddr_in * addr);
79537 +extern int gr_search_bind(struct socket * sock,
79538 + struct sockaddr_in * addr);
79539 +extern int gr_search_listen(struct socket * sock);
79540 +extern int gr_search_accept(struct socket * sock);
79541 +extern int gr_search_socket(const int domain, const int type,
79542 + const int protocol);
79543 +
79544 +#endif
79545 diff --git a/include/linux/hash.h b/include/linux/hash.h
79546 index bd1754c..8240892 100644
79547 --- a/include/linux/hash.h
79548 +++ b/include/linux/hash.h
79549 @@ -83,7 +83,7 @@ static inline u32 hash32_ptr(const void *ptr)
79550 struct fast_hash_ops {
79551 u32 (*hash)(const void *data, u32 len, u32 seed);
79552 u32 (*hash2)(const u32 *data, u32 len, u32 seed);
79553 -};
79554 +} __no_const;
79555
79556 /**
79557 * arch_fast_hash - Caclulates a hash over a given buffer that can have
79558 diff --git a/include/linux/highmem.h b/include/linux/highmem.h
79559 index 7fb31da..08b5114 100644
79560 --- a/include/linux/highmem.h
79561 +++ b/include/linux/highmem.h
79562 @@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
79563 kunmap_atomic(kaddr);
79564 }
79565
79566 +static inline void sanitize_highpage(struct page *page)
79567 +{
79568 + void *kaddr;
79569 + unsigned long flags;
79570 +
79571 + local_irq_save(flags);
79572 + kaddr = kmap_atomic(page);
79573 + clear_page(kaddr);
79574 + kunmap_atomic(kaddr);
79575 + local_irq_restore(flags);
79576 +}
79577 +
79578 static inline void zero_user_segments(struct page *page,
79579 unsigned start1, unsigned end1,
79580 unsigned start2, unsigned end2)
79581 diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
79582 index 1c7b89a..7dda400 100644
79583 --- a/include/linux/hwmon-sysfs.h
79584 +++ b/include/linux/hwmon-sysfs.h
79585 @@ -25,7 +25,8 @@
79586 struct sensor_device_attribute{
79587 struct device_attribute dev_attr;
79588 int index;
79589 -};
79590 +} __do_const;
79591 +typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
79592 #define to_sensor_dev_attr(_dev_attr) \
79593 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
79594
79595 @@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
79596 struct device_attribute dev_attr;
79597 u8 index;
79598 u8 nr;
79599 -};
79600 +} __do_const;
79601 +typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
79602 #define to_sensor_dev_attr_2(_dev_attr) \
79603 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
79604
79605 diff --git a/include/linux/i2c.h b/include/linux/i2c.h
79606 index deddeb8..bcaf62d 100644
79607 --- a/include/linux/i2c.h
79608 +++ b/include/linux/i2c.h
79609 @@ -378,6 +378,7 @@ struct i2c_algorithm {
79610 /* To determine what the adapter supports */
79611 u32 (*functionality) (struct i2c_adapter *);
79612 };
79613 +typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
79614
79615 /**
79616 * struct i2c_bus_recovery_info - I2C bus recovery information
79617 diff --git a/include/linux/i2o.h b/include/linux/i2o.h
79618 index d23c3c2..eb63c81 100644
79619 --- a/include/linux/i2o.h
79620 +++ b/include/linux/i2o.h
79621 @@ -565,7 +565,7 @@ struct i2o_controller {
79622 struct i2o_device *exec; /* Executive */
79623 #if BITS_PER_LONG == 64
79624 spinlock_t context_list_lock; /* lock for context_list */
79625 - atomic_t context_list_counter; /* needed for unique contexts */
79626 + atomic_unchecked_t context_list_counter; /* needed for unique contexts */
79627 struct list_head context_list; /* list of context id's
79628 and pointers */
79629 #endif
79630 diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
79631 index aff7ad8..3942bbd 100644
79632 --- a/include/linux/if_pppox.h
79633 +++ b/include/linux/if_pppox.h
79634 @@ -76,7 +76,7 @@ struct pppox_proto {
79635 int (*ioctl)(struct socket *sock, unsigned int cmd,
79636 unsigned long arg);
79637 struct module *owner;
79638 -};
79639 +} __do_const;
79640
79641 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
79642 extern void unregister_pppox_proto(int proto_num);
79643 diff --git a/include/linux/init.h b/include/linux/init.h
79644 index e168880..d9b489d 100644
79645 --- a/include/linux/init.h
79646 +++ b/include/linux/init.h
79647 @@ -37,9 +37,17 @@
79648 * section.
79649 */
79650
79651 +#define add_init_latent_entropy __latent_entropy
79652 +
79653 +#ifdef CONFIG_MEMORY_HOTPLUG
79654 +#define add_meminit_latent_entropy
79655 +#else
79656 +#define add_meminit_latent_entropy __latent_entropy
79657 +#endif
79658 +
79659 /* These are for everybody (although not all archs will actually
79660 discard it in modules) */
79661 -#define __init __section(.init.text) __cold notrace
79662 +#define __init __section(.init.text) __cold notrace add_init_latent_entropy
79663 #define __initdata __section(.init.data)
79664 #define __initconst __constsection(.init.rodata)
79665 #define __exitdata __section(.exit.data)
79666 @@ -100,7 +108,7 @@
79667 #define __cpuexitconst
79668
79669 /* Used for MEMORY_HOTPLUG */
79670 -#define __meminit __section(.meminit.text) __cold notrace
79671 +#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
79672 #define __meminitdata __section(.meminit.data)
79673 #define __meminitconst __constsection(.meminit.rodata)
79674 #define __memexit __section(.memexit.text) __exitused __cold notrace
79675 diff --git a/include/linux/init_task.h b/include/linux/init_task.h
79676 index 6df7f9f..d0bf699 100644
79677 --- a/include/linux/init_task.h
79678 +++ b/include/linux/init_task.h
79679 @@ -156,6 +156,12 @@ extern struct task_group root_task_group;
79680
79681 #define INIT_TASK_COMM "swapper"
79682
79683 +#ifdef CONFIG_X86
79684 +#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
79685 +#else
79686 +#define INIT_TASK_THREAD_INFO
79687 +#endif
79688 +
79689 #ifdef CONFIG_RT_MUTEXES
79690 # define INIT_RT_MUTEXES(tsk) \
79691 .pi_waiters = RB_ROOT, \
79692 @@ -203,6 +209,7 @@ extern struct task_group root_task_group;
79693 RCU_POINTER_INITIALIZER(cred, &init_cred), \
79694 .comm = INIT_TASK_COMM, \
79695 .thread = INIT_THREAD, \
79696 + INIT_TASK_THREAD_INFO \
79697 .fs = &init_fs, \
79698 .files = &init_files, \
79699 .signal = &init_signals, \
79700 diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
79701 index a2678d3..e411b1b 100644
79702 --- a/include/linux/interrupt.h
79703 +++ b/include/linux/interrupt.h
79704 @@ -373,8 +373,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
79705
79706 struct softirq_action
79707 {
79708 - void (*action)(struct softirq_action *);
79709 -};
79710 + void (*action)(void);
79711 +} __no_const;
79712
79713 asmlinkage void do_softirq(void);
79714 asmlinkage void __do_softirq(void);
79715 @@ -388,7 +388,7 @@ static inline void do_softirq_own_stack(void)
79716 }
79717 #endif
79718
79719 -extern void open_softirq(int nr, void (*action)(struct softirq_action *));
79720 +extern void open_softirq(int nr, void (*action)(void));
79721 extern void softirq_init(void);
79722 extern void __raise_softirq_irqoff(unsigned int nr);
79723
79724 diff --git a/include/linux/iommu.h b/include/linux/iommu.h
79725 index b96a5b2..2732d1c 100644
79726 --- a/include/linux/iommu.h
79727 +++ b/include/linux/iommu.h
79728 @@ -131,7 +131,7 @@ struct iommu_ops {
79729 u32 (*domain_get_windows)(struct iommu_domain *domain);
79730
79731 unsigned long pgsize_bitmap;
79732 -};
79733 +} __do_const;
79734
79735 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
79736 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
79737 diff --git a/include/linux/ioport.h b/include/linux/ioport.h
79738 index 89b7c24..382af74 100644
79739 --- a/include/linux/ioport.h
79740 +++ b/include/linux/ioport.h
79741 @@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
79742 int adjust_resource(struct resource *res, resource_size_t start,
79743 resource_size_t size);
79744 resource_size_t resource_alignment(struct resource *res);
79745 -static inline resource_size_t resource_size(const struct resource *res)
79746 +static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
79747 {
79748 return res->end - res->start + 1;
79749 }
79750 diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
79751 index 35e7eca..6afb7ad 100644
79752 --- a/include/linux/ipc_namespace.h
79753 +++ b/include/linux/ipc_namespace.h
79754 @@ -69,7 +69,7 @@ struct ipc_namespace {
79755 struct user_namespace *user_ns;
79756
79757 unsigned int proc_inum;
79758 -};
79759 +} __randomize_layout;
79760
79761 extern struct ipc_namespace init_ipc_ns;
79762 extern atomic_t nr_ipc_ns;
79763 diff --git a/include/linux/irq.h b/include/linux/irq.h
79764 index 7dc1003..407327b 100644
79765 --- a/include/linux/irq.h
79766 +++ b/include/linux/irq.h
79767 @@ -338,7 +338,8 @@ struct irq_chip {
79768 void (*irq_print_chip)(struct irq_data *data, struct seq_file *p);
79769
79770 unsigned long flags;
79771 -};
79772 +} __do_const;
79773 +typedef struct irq_chip __no_const irq_chip_no_const;
79774
79775 /*
79776 * irq_chip specific flags
79777 diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
79778 index 0ceb389..eed3fb8 100644
79779 --- a/include/linux/irqchip/arm-gic.h
79780 +++ b/include/linux/irqchip/arm-gic.h
79781 @@ -73,9 +73,11 @@
79782
79783 #ifndef __ASSEMBLY__
79784
79785 +#include <linux/irq.h>
79786 +
79787 struct device_node;
79788
79789 -extern struct irq_chip gic_arch_extn;
79790 +extern irq_chip_no_const gic_arch_extn;
79791
79792 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
79793 u32 offset, struct device_node *);
79794 diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
79795 index 1f44466..b481806 100644
79796 --- a/include/linux/jiffies.h
79797 +++ b/include/linux/jiffies.h
79798 @@ -292,20 +292,20 @@ extern unsigned long preset_lpj;
79799 /*
79800 * Convert various time units to each other:
79801 */
79802 -extern unsigned int jiffies_to_msecs(const unsigned long j);
79803 -extern unsigned int jiffies_to_usecs(const unsigned long j);
79804 +extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
79805 +extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
79806
79807 -static inline u64 jiffies_to_nsecs(const unsigned long j)
79808 +static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
79809 {
79810 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
79811 }
79812
79813 -extern unsigned long msecs_to_jiffies(const unsigned int m);
79814 -extern unsigned long usecs_to_jiffies(const unsigned int u);
79815 +extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
79816 +extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
79817 extern unsigned long timespec_to_jiffies(const struct timespec *value);
79818 extern void jiffies_to_timespec(const unsigned long jiffies,
79819 - struct timespec *value);
79820 -extern unsigned long timeval_to_jiffies(const struct timeval *value);
79821 + struct timespec *value) __intentional_overflow(-1);
79822 +extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
79823 extern void jiffies_to_timeval(const unsigned long jiffies,
79824 struct timeval *value);
79825
79826 diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
79827 index 6883e19..e854fcb 100644
79828 --- a/include/linux/kallsyms.h
79829 +++ b/include/linux/kallsyms.h
79830 @@ -15,7 +15,8 @@
79831
79832 struct module;
79833
79834 -#ifdef CONFIG_KALLSYMS
79835 +#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
79836 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
79837 /* Lookup the address for a symbol. Returns 0 if not found. */
79838 unsigned long kallsyms_lookup_name(const char *name);
79839
79840 @@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
79841 /* Stupid that this does nothing, but I didn't create this mess. */
79842 #define __print_symbol(fmt, addr)
79843 #endif /*CONFIG_KALLSYMS*/
79844 +#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
79845 + arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
79846 +extern unsigned long kallsyms_lookup_name(const char *name);
79847 +extern void __print_symbol(const char *fmt, unsigned long address);
79848 +extern int sprint_backtrace(char *buffer, unsigned long address);
79849 +extern int sprint_symbol(char *buffer, unsigned long address);
79850 +extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
79851 +const char *kallsyms_lookup(unsigned long addr,
79852 + unsigned long *symbolsize,
79853 + unsigned long *offset,
79854 + char **modname, char *namebuf);
79855 +extern int kallsyms_lookup_size_offset(unsigned long addr,
79856 + unsigned long *symbolsize,
79857 + unsigned long *offset);
79858 +#endif
79859
79860 /* This macro allows us to keep printk typechecking */
79861 static __printf(1, 2)
79862 diff --git a/include/linux/key-type.h b/include/linux/key-type.h
79863 index a74c3a8..28d3f21 100644
79864 --- a/include/linux/key-type.h
79865 +++ b/include/linux/key-type.h
79866 @@ -131,7 +131,7 @@ struct key_type {
79867 /* internal fields */
79868 struct list_head link; /* link in types list */
79869 struct lock_class_key lock_class; /* key->sem lock class */
79870 -};
79871 +} __do_const;
79872
79873 extern struct key_type key_type_keyring;
79874
79875 diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
79876 index 6b06d37..c134867 100644
79877 --- a/include/linux/kgdb.h
79878 +++ b/include/linux/kgdb.h
79879 @@ -52,7 +52,7 @@ extern int kgdb_connected;
79880 extern int kgdb_io_module_registered;
79881
79882 extern atomic_t kgdb_setting_breakpoint;
79883 -extern atomic_t kgdb_cpu_doing_single_step;
79884 +extern atomic_unchecked_t kgdb_cpu_doing_single_step;
79885
79886 extern struct task_struct *kgdb_usethread;
79887 extern struct task_struct *kgdb_contthread;
79888 @@ -254,7 +254,7 @@ struct kgdb_arch {
79889 void (*correct_hw_break)(void);
79890
79891 void (*enable_nmi)(bool on);
79892 -};
79893 +} __do_const;
79894
79895 /**
79896 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
79897 @@ -279,7 +279,7 @@ struct kgdb_io {
79898 void (*pre_exception) (void);
79899 void (*post_exception) (void);
79900 int is_console;
79901 -};
79902 +} __do_const;
79903
79904 extern struct kgdb_arch arch_kgdb_ops;
79905
79906 diff --git a/include/linux/kmod.h b/include/linux/kmod.h
79907 index 0555cc6..40116ce 100644
79908 --- a/include/linux/kmod.h
79909 +++ b/include/linux/kmod.h
79910 @@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
79911 * usually useless though. */
79912 extern __printf(2, 3)
79913 int __request_module(bool wait, const char *name, ...);
79914 +extern __printf(3, 4)
79915 +int ___request_module(bool wait, char *param_name, const char *name, ...);
79916 #define request_module(mod...) __request_module(true, mod)
79917 #define request_module_nowait(mod...) __request_module(false, mod)
79918 #define try_then_request_module(x, mod...) \
79919 @@ -57,6 +59,9 @@ struct subprocess_info {
79920 struct work_struct work;
79921 struct completion *complete;
79922 char *path;
79923 +#ifdef CONFIG_GRKERNSEC
79924 + char *origpath;
79925 +#endif
79926 char **argv;
79927 char **envp;
79928 int wait;
79929 diff --git a/include/linux/kobject.h b/include/linux/kobject.h
79930 index 926afb6..58dd6e5 100644
79931 --- a/include/linux/kobject.h
79932 +++ b/include/linux/kobject.h
79933 @@ -116,7 +116,7 @@ struct kobj_type {
79934 struct attribute **default_attrs;
79935 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
79936 const void *(*namespace)(struct kobject *kobj);
79937 -};
79938 +} __do_const;
79939
79940 struct kobj_uevent_env {
79941 char *envp[UEVENT_NUM_ENVP];
79942 @@ -139,6 +139,7 @@ struct kobj_attribute {
79943 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
79944 const char *buf, size_t count);
79945 };
79946 +typedef struct kobj_attribute __no_const kobj_attribute_no_const;
79947
79948 extern const struct sysfs_ops kobj_sysfs_ops;
79949
79950 @@ -166,7 +167,7 @@ struct kset {
79951 spinlock_t list_lock;
79952 struct kobject kobj;
79953 const struct kset_uevent_ops *uevent_ops;
79954 -};
79955 +} __randomize_layout;
79956
79957 extern void kset_init(struct kset *kset);
79958 extern int __must_check kset_register(struct kset *kset);
79959 diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
79960 index df32d25..fb52e27 100644
79961 --- a/include/linux/kobject_ns.h
79962 +++ b/include/linux/kobject_ns.h
79963 @@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
79964 const void *(*netlink_ns)(struct sock *sk);
79965 const void *(*initial_ns)(void);
79966 void (*drop_ns)(void *);
79967 -};
79968 +} __do_const;
79969
79970 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
79971 int kobj_ns_type_registered(enum kobj_ns_type type);
79972 diff --git a/include/linux/kref.h b/include/linux/kref.h
79973 index 484604d..0f6c5b6 100644
79974 --- a/include/linux/kref.h
79975 +++ b/include/linux/kref.h
79976 @@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
79977 static inline int kref_sub(struct kref *kref, unsigned int count,
79978 void (*release)(struct kref *kref))
79979 {
79980 - WARN_ON(release == NULL);
79981 + BUG_ON(release == NULL);
79982
79983 if (atomic_sub_and_test((int) count, &kref->refcount)) {
79984 release(kref);
79985 diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
79986 index b8e9a43..632678d 100644
79987 --- a/include/linux/kvm_host.h
79988 +++ b/include/linux/kvm_host.h
79989 @@ -455,7 +455,7 @@ static inline void kvm_irqfd_exit(void)
79990 {
79991 }
79992 #endif
79993 -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
79994 +int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
79995 struct module *module);
79996 void kvm_exit(void);
79997
79998 @@ -621,7 +621,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
79999 struct kvm_guest_debug *dbg);
80000 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
80001
80002 -int kvm_arch_init(void *opaque);
80003 +int kvm_arch_init(const void *opaque);
80004 void kvm_arch_exit(void);
80005
80006 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
80007 diff --git a/include/linux/libata.h b/include/linux/libata.h
80008 index bec6dbe..2873d64 100644
80009 --- a/include/linux/libata.h
80010 +++ b/include/linux/libata.h
80011 @@ -975,7 +975,7 @@ struct ata_port_operations {
80012 * fields must be pointers.
80013 */
80014 const struct ata_port_operations *inherits;
80015 -};
80016 +} __do_const;
80017
80018 struct ata_port_info {
80019 unsigned long flags;
80020 diff --git a/include/linux/linkage.h b/include/linux/linkage.h
80021 index a6a42dd..6c5ebce 100644
80022 --- a/include/linux/linkage.h
80023 +++ b/include/linux/linkage.h
80024 @@ -36,6 +36,7 @@
80025 #endif
80026
80027 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
80028 +#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
80029 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
80030
80031 /*
80032 diff --git a/include/linux/list.h b/include/linux/list.h
80033 index ef95941..82db65a 100644
80034 --- a/include/linux/list.h
80035 +++ b/include/linux/list.h
80036 @@ -112,6 +112,19 @@ extern void __list_del_entry(struct list_head *entry);
80037 extern void list_del(struct list_head *entry);
80038 #endif
80039
80040 +extern void __pax_list_add(struct list_head *new,
80041 + struct list_head *prev,
80042 + struct list_head *next);
80043 +static inline void pax_list_add(struct list_head *new, struct list_head *head)
80044 +{
80045 + __pax_list_add(new, head, head->next);
80046 +}
80047 +static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
80048 +{
80049 + __pax_list_add(new, head->prev, head);
80050 +}
80051 +extern void pax_list_del(struct list_head *entry);
80052 +
80053 /**
80054 * list_replace - replace old entry by new one
80055 * @old : the element to be replaced
80056 @@ -145,6 +158,8 @@ static inline void list_del_init(struct list_head *entry)
80057 INIT_LIST_HEAD(entry);
80058 }
80059
80060 +extern void pax_list_del_init(struct list_head *entry);
80061 +
80062 /**
80063 * list_move - delete from one list and add as another's head
80064 * @list: the entry to move
80065 diff --git a/include/linux/math64.h b/include/linux/math64.h
80066 index c45c089..298841c 100644
80067 --- a/include/linux/math64.h
80068 +++ b/include/linux/math64.h
80069 @@ -15,7 +15,7 @@
80070 * This is commonly provided by 32bit archs to provide an optimized 64bit
80071 * divide.
80072 */
80073 -static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
80074 +static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
80075 {
80076 *remainder = dividend % divisor;
80077 return dividend / divisor;
80078 @@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
80079 /**
80080 * div64_u64 - unsigned 64bit divide with 64bit divisor
80081 */
80082 -static inline u64 div64_u64(u64 dividend, u64 divisor)
80083 +static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
80084 {
80085 return dividend / divisor;
80086 }
80087 @@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
80088 #define div64_ul(x, y) div_u64((x), (y))
80089
80090 #ifndef div_u64_rem
80091 -static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
80092 +static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
80093 {
80094 *remainder = do_div(dividend, divisor);
80095 return dividend;
80096 @@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
80097 #endif
80098
80099 #ifndef div64_u64
80100 -extern u64 div64_u64(u64 dividend, u64 divisor);
80101 +extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
80102 #endif
80103
80104 #ifndef div64_s64
80105 @@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
80106 * divide.
80107 */
80108 #ifndef div_u64
80109 -static inline u64 div_u64(u64 dividend, u32 divisor)
80110 +static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
80111 {
80112 u32 remainder;
80113 return div_u64_rem(dividend, divisor, &remainder);
80114 diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
80115 index 5f1ea75..5125ac5 100644
80116 --- a/include/linux/mempolicy.h
80117 +++ b/include/linux/mempolicy.h
80118 @@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
80119 }
80120
80121 #define vma_policy(vma) ((vma)->vm_policy)
80122 +static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
80123 +{
80124 + vma->vm_policy = pol;
80125 +}
80126
80127 static inline void mpol_get(struct mempolicy *pol)
80128 {
80129 @@ -223,6 +227,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
80130 }
80131
80132 #define vma_policy(vma) NULL
80133 +static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
80134 +{
80135 +}
80136
80137 static inline int
80138 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
80139 diff --git a/include/linux/mm.h b/include/linux/mm.h
80140 index c1b7414..5ea2ad8 100644
80141 --- a/include/linux/mm.h
80142 +++ b/include/linux/mm.h
80143 @@ -127,6 +127,11 @@ extern unsigned int kobjsize(const void *objp);
80144 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
80145 #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */
80146 #define VM_ARCH_1 0x01000000 /* Architecture-specific flag */
80147 +
80148 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
80149 +#define VM_PAGEEXEC 0x02000000 /* vma->vm_page_prot needs special handling */
80150 +#endif
80151 +
80152 #define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */
80153
80154 #ifdef CONFIG_MEM_SOFT_DIRTY
80155 @@ -229,8 +234,8 @@ struct vm_operations_struct {
80156 /* called by access_process_vm when get_user_pages() fails, typically
80157 * for use by special VMAs that can switch between memory and hardware
80158 */
80159 - int (*access)(struct vm_area_struct *vma, unsigned long addr,
80160 - void *buf, int len, int write);
80161 + ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
80162 + void *buf, size_t len, int write);
80163 #ifdef CONFIG_NUMA
80164 /*
80165 * set_policy() op must add a reference to any non-NULL @new mempolicy
80166 @@ -260,6 +265,7 @@ struct vm_operations_struct {
80167 int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
80168 unsigned long size, pgoff_t pgoff);
80169 };
80170 +typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
80171
80172 struct mmu_gather;
80173 struct inode;
80174 @@ -1112,8 +1118,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
80175 unsigned long *pfn);
80176 int follow_phys(struct vm_area_struct *vma, unsigned long address,
80177 unsigned int flags, unsigned long *prot, resource_size_t *phys);
80178 -int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
80179 - void *buf, int len, int write);
80180 +ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
80181 + void *buf, size_t len, int write);
80182
80183 static inline void unmap_shared_mapping_range(struct address_space *mapping,
80184 loff_t const holebegin, loff_t const holelen)
80185 @@ -1152,9 +1158,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
80186 }
80187 #endif
80188
80189 -extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
80190 -extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
80191 - void *buf, int len, int write);
80192 +extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
80193 +extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
80194 + void *buf, size_t len, int write);
80195
80196 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
80197 unsigned long start, unsigned long nr_pages,
80198 @@ -1186,34 +1192,6 @@ int set_page_dirty(struct page *page);
80199 int set_page_dirty_lock(struct page *page);
80200 int clear_page_dirty_for_io(struct page *page);
80201
80202 -/* Is the vma a continuation of the stack vma above it? */
80203 -static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
80204 -{
80205 - return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
80206 -}
80207 -
80208 -static inline int stack_guard_page_start(struct vm_area_struct *vma,
80209 - unsigned long addr)
80210 -{
80211 - return (vma->vm_flags & VM_GROWSDOWN) &&
80212 - (vma->vm_start == addr) &&
80213 - !vma_growsdown(vma->vm_prev, addr);
80214 -}
80215 -
80216 -/* Is the vma a continuation of the stack vma below it? */
80217 -static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
80218 -{
80219 - return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
80220 -}
80221 -
80222 -static inline int stack_guard_page_end(struct vm_area_struct *vma,
80223 - unsigned long addr)
80224 -{
80225 - return (vma->vm_flags & VM_GROWSUP) &&
80226 - (vma->vm_end == addr) &&
80227 - !vma_growsup(vma->vm_next, addr);
80228 -}
80229 -
80230 extern pid_t
80231 vm_is_stack(struct task_struct *task, struct vm_area_struct *vma, int in_group);
80232
80233 @@ -1313,6 +1291,15 @@ static inline void sync_mm_rss(struct mm_struct *mm)
80234 }
80235 #endif
80236
80237 +#ifdef CONFIG_MMU
80238 +pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
80239 +#else
80240 +static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
80241 +{
80242 + return __pgprot(0);
80243 +}
80244 +#endif
80245 +
80246 int vma_wants_writenotify(struct vm_area_struct *vma);
80247
80248 extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
80249 @@ -1331,8 +1318,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
80250 {
80251 return 0;
80252 }
80253 +
80254 +static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
80255 + unsigned long address)
80256 +{
80257 + return 0;
80258 +}
80259 #else
80260 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
80261 +int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
80262 #endif
80263
80264 #ifdef __PAGETABLE_PMD_FOLDED
80265 @@ -1341,8 +1335,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
80266 {
80267 return 0;
80268 }
80269 +
80270 +static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
80271 + unsigned long address)
80272 +{
80273 + return 0;
80274 +}
80275 #else
80276 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
80277 +int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
80278 #endif
80279
80280 int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
80281 @@ -1360,11 +1361,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
80282 NULL: pud_offset(pgd, address);
80283 }
80284
80285 +static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
80286 +{
80287 + return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
80288 + NULL: pud_offset(pgd, address);
80289 +}
80290 +
80291 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
80292 {
80293 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
80294 NULL: pmd_offset(pud, address);
80295 }
80296 +
80297 +static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
80298 +{
80299 + return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
80300 + NULL: pmd_offset(pud, address);
80301 +}
80302 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
80303
80304 #if USE_SPLIT_PTE_PTLOCKS
80305 @@ -1754,7 +1767,7 @@ extern int install_special_mapping(struct mm_struct *mm,
80306 unsigned long addr, unsigned long len,
80307 unsigned long flags, struct page **pages);
80308
80309 -extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
80310 +extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
80311
80312 extern unsigned long mmap_region(struct file *file, unsigned long addr,
80313 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
80314 @@ -1762,6 +1775,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
80315 unsigned long len, unsigned long prot, unsigned long flags,
80316 unsigned long pgoff, unsigned long *populate);
80317 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
80318 +extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
80319
80320 #ifdef CONFIG_MMU
80321 extern int __mm_populate(unsigned long addr, unsigned long len,
80322 @@ -1790,10 +1804,11 @@ struct vm_unmapped_area_info {
80323 unsigned long high_limit;
80324 unsigned long align_mask;
80325 unsigned long align_offset;
80326 + unsigned long threadstack_offset;
80327 };
80328
80329 -extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
80330 -extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
80331 +extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
80332 +extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
80333
80334 /*
80335 * Search for an unmapped address range.
80336 @@ -1805,7 +1820,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
80337 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
80338 */
80339 static inline unsigned long
80340 -vm_unmapped_area(struct vm_unmapped_area_info *info)
80341 +vm_unmapped_area(const struct vm_unmapped_area_info *info)
80342 {
80343 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
80344 return unmapped_area(info);
80345 @@ -1868,6 +1883,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
80346 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
80347 struct vm_area_struct **pprev);
80348
80349 +extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
80350 +extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
80351 +extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
80352 +
80353 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
80354 NULL if none. Assume start_addr < end_addr. */
80355 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
80356 @@ -1896,15 +1915,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
80357 return vma;
80358 }
80359
80360 -#ifdef CONFIG_MMU
80361 -pgprot_t vm_get_page_prot(unsigned long vm_flags);
80362 -#else
80363 -static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
80364 -{
80365 - return __pgprot(0);
80366 -}
80367 -#endif
80368 -
80369 #ifdef CONFIG_NUMA_BALANCING
80370 unsigned long change_prot_numa(struct vm_area_struct *vma,
80371 unsigned long start, unsigned long end);
80372 @@ -1956,6 +1966,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
80373 static inline void vm_stat_account(struct mm_struct *mm,
80374 unsigned long flags, struct file *file, long pages)
80375 {
80376 +
80377 +#ifdef CONFIG_PAX_RANDMMAP
80378 + if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
80379 +#endif
80380 +
80381 mm->total_vm += pages;
80382 }
80383 #endif /* CONFIG_PROC_FS */
80384 @@ -2037,7 +2052,7 @@ extern int unpoison_memory(unsigned long pfn);
80385 extern int sysctl_memory_failure_early_kill;
80386 extern int sysctl_memory_failure_recovery;
80387 extern void shake_page(struct page *p, int access);
80388 -extern atomic_long_t num_poisoned_pages;
80389 +extern atomic_long_unchecked_t num_poisoned_pages;
80390 extern int soft_offline_page(struct page *page, int flags);
80391
80392 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
80393 @@ -2072,5 +2087,11 @@ void __init setup_nr_node_ids(void);
80394 static inline void setup_nr_node_ids(void) {}
80395 #endif
80396
80397 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
80398 +extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
80399 +#else
80400 +static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
80401 +#endif
80402 +
80403 #endif /* __KERNEL__ */
80404 #endif /* _LINUX_MM_H */
80405 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
80406 index 290901a..e99b01c 100644
80407 --- a/include/linux/mm_types.h
80408 +++ b/include/linux/mm_types.h
80409 @@ -307,7 +307,9 @@ struct vm_area_struct {
80410 #ifdef CONFIG_NUMA
80411 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
80412 #endif
80413 -};
80414 +
80415 + struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
80416 +} __randomize_layout;
80417
80418 struct core_thread {
80419 struct task_struct *task;
80420 @@ -453,7 +455,25 @@ struct mm_struct {
80421 bool tlb_flush_pending;
80422 #endif
80423 struct uprobes_state uprobes_state;
80424 -};
80425 +
80426 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
80427 + unsigned long pax_flags;
80428 +#endif
80429 +
80430 +#ifdef CONFIG_PAX_DLRESOLVE
80431 + unsigned long call_dl_resolve;
80432 +#endif
80433 +
80434 +#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
80435 + unsigned long call_syscall;
80436 +#endif
80437 +
80438 +#ifdef CONFIG_PAX_ASLR
80439 + unsigned long delta_mmap; /* randomized offset */
80440 + unsigned long delta_stack; /* randomized offset */
80441 +#endif
80442 +
80443 +} __randomize_layout;
80444
80445 static inline void mm_init_cpumask(struct mm_struct *mm)
80446 {
80447 diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
80448 index c5d5278..f0b68c8 100644
80449 --- a/include/linux/mmiotrace.h
80450 +++ b/include/linux/mmiotrace.h
80451 @@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
80452 /* Called from ioremap.c */
80453 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
80454 void __iomem *addr);
80455 -extern void mmiotrace_iounmap(volatile void __iomem *addr);
80456 +extern void mmiotrace_iounmap(const volatile void __iomem *addr);
80457
80458 /* For anyone to insert markers. Remember trailing newline. */
80459 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
80460 @@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
80461 {
80462 }
80463
80464 -static inline void mmiotrace_iounmap(volatile void __iomem *addr)
80465 +static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
80466 {
80467 }
80468
80469 diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
80470 index 9b61b9b..52147d6b 100644
80471 --- a/include/linux/mmzone.h
80472 +++ b/include/linux/mmzone.h
80473 @@ -396,7 +396,7 @@ struct zone {
80474 unsigned long flags; /* zone flags, see below */
80475
80476 /* Zone statistics */
80477 - atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
80478 + atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
80479
80480 /*
80481 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
80482 diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
80483 index 45e9214..a7227d6 100644
80484 --- a/include/linux/mod_devicetable.h
80485 +++ b/include/linux/mod_devicetable.h
80486 @@ -13,7 +13,7 @@
80487 typedef unsigned long kernel_ulong_t;
80488 #endif
80489
80490 -#define PCI_ANY_ID (~0)
80491 +#define PCI_ANY_ID ((__u16)~0)
80492
80493 struct pci_device_id {
80494 __u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/
80495 @@ -139,7 +139,7 @@ struct usb_device_id {
80496 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
80497 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
80498
80499 -#define HID_ANY_ID (~0)
80500 +#define HID_ANY_ID (~0U)
80501 #define HID_BUS_ANY 0xffff
80502 #define HID_GROUP_ANY 0x0000
80503
80504 @@ -467,7 +467,7 @@ struct dmi_system_id {
80505 const char *ident;
80506 struct dmi_strmatch matches[4];
80507 void *driver_data;
80508 -};
80509 +} __do_const;
80510 /*
80511 * struct dmi_device_id appears during expansion of
80512 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
80513 diff --git a/include/linux/module.h b/include/linux/module.h
80514 index eaf60ff..641979a 100644
80515 --- a/include/linux/module.h
80516 +++ b/include/linux/module.h
80517 @@ -17,9 +17,11 @@
80518 #include <linux/moduleparam.h>
80519 #include <linux/tracepoint.h>
80520 #include <linux/export.h>
80521 +#include <linux/fs.h>
80522
80523 #include <linux/percpu.h>
80524 #include <asm/module.h>
80525 +#include <asm/pgtable.h>
80526
80527 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
80528 #define MODULE_SIG_STRING "~Module signature appended~\n"
80529 @@ -42,7 +44,7 @@ struct module_kobject {
80530 struct kobject *drivers_dir;
80531 struct module_param_attrs *mp;
80532 struct completion *kobj_completion;
80533 -};
80534 +} __randomize_layout;
80535
80536 struct module_attribute {
80537 struct attribute attr;
80538 @@ -54,12 +56,13 @@ struct module_attribute {
80539 int (*test)(struct module *);
80540 void (*free)(struct module *);
80541 };
80542 +typedef struct module_attribute __no_const module_attribute_no_const;
80543
80544 struct module_version_attribute {
80545 struct module_attribute mattr;
80546 const char *module_name;
80547 const char *version;
80548 -} __attribute__ ((__aligned__(sizeof(void *))));
80549 +} __do_const __attribute__ ((__aligned__(sizeof(void *))));
80550
80551 extern ssize_t __modver_version_show(struct module_attribute *,
80552 struct module_kobject *, char *);
80553 @@ -238,7 +241,7 @@ struct module {
80554
80555 /* Sysfs stuff. */
80556 struct module_kobject mkobj;
80557 - struct module_attribute *modinfo_attrs;
80558 + module_attribute_no_const *modinfo_attrs;
80559 const char *version;
80560 const char *srcversion;
80561 struct kobject *holders_dir;
80562 @@ -287,19 +290,16 @@ struct module {
80563 int (*init)(void);
80564
80565 /* If this is non-NULL, vfree after init() returns */
80566 - void *module_init;
80567 + void *module_init_rx, *module_init_rw;
80568
80569 /* Here is the actual code + data, vfree'd on unload. */
80570 - void *module_core;
80571 + void *module_core_rx, *module_core_rw;
80572
80573 /* Here are the sizes of the init and core sections */
80574 - unsigned int init_size, core_size;
80575 + unsigned int init_size_rw, core_size_rw;
80576
80577 /* The size of the executable code in each section. */
80578 - unsigned int init_text_size, core_text_size;
80579 -
80580 - /* Size of RO sections of the module (text+rodata) */
80581 - unsigned int init_ro_size, core_ro_size;
80582 + unsigned int init_size_rx, core_size_rx;
80583
80584 /* Arch-specific module values */
80585 struct mod_arch_specific arch;
80586 @@ -355,6 +355,10 @@ struct module {
80587 #ifdef CONFIG_EVENT_TRACING
80588 struct ftrace_event_call **trace_events;
80589 unsigned int num_trace_events;
80590 + struct file_operations trace_id;
80591 + struct file_operations trace_enable;
80592 + struct file_operations trace_format;
80593 + struct file_operations trace_filter;
80594 #endif
80595 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
80596 unsigned int num_ftrace_callsites;
80597 @@ -378,7 +382,7 @@ struct module {
80598 ctor_fn_t *ctors;
80599 unsigned int num_ctors;
80600 #endif
80601 -};
80602 +} __randomize_layout;
80603 #ifndef MODULE_ARCH_INIT
80604 #define MODULE_ARCH_INIT {}
80605 #endif
80606 @@ -399,16 +403,46 @@ bool is_module_address(unsigned long addr);
80607 bool is_module_percpu_address(unsigned long addr);
80608 bool is_module_text_address(unsigned long addr);
80609
80610 +static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
80611 +{
80612 +
80613 +#ifdef CONFIG_PAX_KERNEXEC
80614 + if (ktla_ktva(addr) >= (unsigned long)start &&
80615 + ktla_ktva(addr) < (unsigned long)start + size)
80616 + return 1;
80617 +#endif
80618 +
80619 + return ((void *)addr >= start && (void *)addr < start + size);
80620 +}
80621 +
80622 +static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
80623 +{
80624 + return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
80625 +}
80626 +
80627 +static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
80628 +{
80629 + return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
80630 +}
80631 +
80632 +static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
80633 +{
80634 + return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
80635 +}
80636 +
80637 +static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
80638 +{
80639 + return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
80640 +}
80641 +
80642 static inline int within_module_core(unsigned long addr, const struct module *mod)
80643 {
80644 - return (unsigned long)mod->module_core <= addr &&
80645 - addr < (unsigned long)mod->module_core + mod->core_size;
80646 + return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
80647 }
80648
80649 static inline int within_module_init(unsigned long addr, const struct module *mod)
80650 {
80651 - return (unsigned long)mod->module_init <= addr &&
80652 - addr < (unsigned long)mod->module_init + mod->init_size;
80653 + return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
80654 }
80655
80656 /* Search for module by name: must hold module_mutex. */
80657 diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
80658 index 560ca53..ef621ef 100644
80659 --- a/include/linux/moduleloader.h
80660 +++ b/include/linux/moduleloader.h
80661 @@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
80662 sections. Returns NULL on failure. */
80663 void *module_alloc(unsigned long size);
80664
80665 +#ifdef CONFIG_PAX_KERNEXEC
80666 +void *module_alloc_exec(unsigned long size);
80667 +#else
80668 +#define module_alloc_exec(x) module_alloc(x)
80669 +#endif
80670 +
80671 /* Free memory returned from module_alloc. */
80672 void module_free(struct module *mod, void *module_region);
80673
80674 +#ifdef CONFIG_PAX_KERNEXEC
80675 +void module_free_exec(struct module *mod, void *module_region);
80676 +#else
80677 +#define module_free_exec(x, y) module_free((x), (y))
80678 +#endif
80679 +
80680 /*
80681 * Apply the given relocation to the (simplified) ELF. Return -error
80682 * or 0.
80683 @@ -45,7 +57,9 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
80684 unsigned int relsec,
80685 struct module *me)
80686 {
80687 +#ifdef CONFIG_MODULES
80688 printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
80689 +#endif
80690 return -ENOEXEC;
80691 }
80692 #endif
80693 @@ -67,7 +81,9 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
80694 unsigned int relsec,
80695 struct module *me)
80696 {
80697 +#ifdef CONFIG_MODULES
80698 printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
80699 +#endif
80700 return -ENOEXEC;
80701 }
80702 #endif
80703 diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
80704 index c3eb102..073c4a6 100644
80705 --- a/include/linux/moduleparam.h
80706 +++ b/include/linux/moduleparam.h
80707 @@ -295,7 +295,7 @@ static inline void __kernel_param_unlock(void)
80708 * @len is usually just sizeof(string).
80709 */
80710 #define module_param_string(name, string, len, perm) \
80711 - static const struct kparam_string __param_string_##name \
80712 + static const struct kparam_string __param_string_##name __used \
80713 = { len, string }; \
80714 __module_param_call(MODULE_PARAM_PREFIX, name, \
80715 &param_ops_string, \
80716 @@ -434,7 +434,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
80717 */
80718 #define module_param_array_named(name, array, type, nump, perm) \
80719 param_check_##type(name, &(array)[0]); \
80720 - static const struct kparam_array __param_arr_##name \
80721 + static const struct kparam_array __param_arr_##name __used \
80722 = { .max = ARRAY_SIZE(array), .num = nump, \
80723 .ops = &param_ops_##type, \
80724 .elemsize = sizeof(array[0]), .elem = array }; \
80725 diff --git a/include/linux/mount.h b/include/linux/mount.h
80726 index 371d346..fba2819 100644
80727 --- a/include/linux/mount.h
80728 +++ b/include/linux/mount.h
80729 @@ -56,7 +56,7 @@ struct vfsmount {
80730 struct dentry *mnt_root; /* root of the mounted tree */
80731 struct super_block *mnt_sb; /* pointer to superblock */
80732 int mnt_flags;
80733 -};
80734 +} __randomize_layout;
80735
80736 struct file; /* forward dec */
80737
80738 diff --git a/include/linux/namei.h b/include/linux/namei.h
80739 index 492de72..1bddcd4 100644
80740 --- a/include/linux/namei.h
80741 +++ b/include/linux/namei.h
80742 @@ -19,7 +19,7 @@ struct nameidata {
80743 unsigned seq, m_seq;
80744 int last_type;
80745 unsigned depth;
80746 - char *saved_names[MAX_NESTED_LINKS + 1];
80747 + const char *saved_names[MAX_NESTED_LINKS + 1];
80748 };
80749
80750 /*
80751 @@ -83,12 +83,12 @@ extern void unlock_rename(struct dentry *, struct dentry *);
80752
80753 extern void nd_jump_link(struct nameidata *nd, struct path *path);
80754
80755 -static inline void nd_set_link(struct nameidata *nd, char *path)
80756 +static inline void nd_set_link(struct nameidata *nd, const char *path)
80757 {
80758 nd->saved_names[nd->depth] = path;
80759 }
80760
80761 -static inline char *nd_get_link(struct nameidata *nd)
80762 +static inline const char *nd_get_link(const struct nameidata *nd)
80763 {
80764 return nd->saved_names[nd->depth];
80765 }
80766 diff --git a/include/linux/net.h b/include/linux/net.h
80767 index 94734a6..d8d6931 100644
80768 --- a/include/linux/net.h
80769 +++ b/include/linux/net.h
80770 @@ -192,7 +192,7 @@ struct net_proto_family {
80771 int (*create)(struct net *net, struct socket *sock,
80772 int protocol, int kern);
80773 struct module *owner;
80774 -};
80775 +} __do_const;
80776
80777 struct iovec;
80778 struct kvec;
80779 diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
80780 index daafd95..74c5d1e 100644
80781 --- a/include/linux/netdevice.h
80782 +++ b/include/linux/netdevice.h
80783 @@ -1146,6 +1146,7 @@ struct net_device_ops {
80784 struct net_device *dev,
80785 void *priv);
80786 };
80787 +typedef struct net_device_ops __no_const net_device_ops_no_const;
80788
80789 /*
80790 * The DEVICE structure.
80791 @@ -1228,7 +1229,7 @@ struct net_device {
80792 int iflink;
80793
80794 struct net_device_stats stats;
80795 - atomic_long_t rx_dropped; /* dropped packets by core network
80796 + atomic_long_unchecked_t rx_dropped; /* dropped packets by core network
80797 * Do not use this in drivers.
80798 */
80799
80800 diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
80801 index 2077489..a15e561 100644
80802 --- a/include/linux/netfilter.h
80803 +++ b/include/linux/netfilter.h
80804 @@ -84,7 +84,7 @@ struct nf_sockopt_ops {
80805 #endif
80806 /* Use the module struct to lock set/get code in place */
80807 struct module *owner;
80808 -};
80809 +} __do_const;
80810
80811 /* Function to register/unregister hook points. */
80812 int nf_register_hook(struct nf_hook_ops *reg);
80813 diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
80814 index 28c7436..2d6156a 100644
80815 --- a/include/linux/netfilter/nfnetlink.h
80816 +++ b/include/linux/netfilter/nfnetlink.h
80817 @@ -19,7 +19,7 @@ struct nfnl_callback {
80818 const struct nlattr * const cda[]);
80819 const struct nla_policy *policy; /* netlink attribute policy */
80820 const u_int16_t attr_count; /* number of nlattr's */
80821 -};
80822 +} __do_const;
80823
80824 struct nfnetlink_subsystem {
80825 const char *name;
80826 diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
80827 new file mode 100644
80828 index 0000000..33f4af8
80829 --- /dev/null
80830 +++ b/include/linux/netfilter/xt_gradm.h
80831 @@ -0,0 +1,9 @@
80832 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
80833 +#define _LINUX_NETFILTER_XT_GRADM_H 1
80834 +
80835 +struct xt_gradm_mtinfo {
80836 + __u16 flags;
80837 + __u16 invflags;
80838 +};
80839 +
80840 +#endif
80841 diff --git a/include/linux/nls.h b/include/linux/nls.h
80842 index 520681b..1d67ed2 100644
80843 --- a/include/linux/nls.h
80844 +++ b/include/linux/nls.h
80845 @@ -31,7 +31,7 @@ struct nls_table {
80846 const unsigned char *charset2upper;
80847 struct module *owner;
80848 struct nls_table *next;
80849 -};
80850 +} __do_const;
80851
80852 /* this value hold the maximum octet of charset */
80853 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
80854 diff --git a/include/linux/notifier.h b/include/linux/notifier.h
80855 index d14a4c3..a078786 100644
80856 --- a/include/linux/notifier.h
80857 +++ b/include/linux/notifier.h
80858 @@ -54,7 +54,8 @@ struct notifier_block {
80859 notifier_fn_t notifier_call;
80860 struct notifier_block __rcu *next;
80861 int priority;
80862 -};
80863 +} __do_const;
80864 +typedef struct notifier_block __no_const notifier_block_no_const;
80865
80866 struct atomic_notifier_head {
80867 spinlock_t lock;
80868 diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
80869 index b2a0f15..4d7da32 100644
80870 --- a/include/linux/oprofile.h
80871 +++ b/include/linux/oprofile.h
80872 @@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
80873 int oprofilefs_create_ro_ulong(struct dentry * root,
80874 char const * name, ulong * val);
80875
80876 -/** Create a file for read-only access to an atomic_t. */
80877 +/** Create a file for read-only access to an atomic_unchecked_t. */
80878 int oprofilefs_create_ro_atomic(struct dentry * root,
80879 - char const * name, atomic_t * val);
80880 + char const * name, atomic_unchecked_t * val);
80881
80882 /** create a directory */
80883 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
80884 diff --git a/include/linux/padata.h b/include/linux/padata.h
80885 index 4386946..f50c615 100644
80886 --- a/include/linux/padata.h
80887 +++ b/include/linux/padata.h
80888 @@ -129,7 +129,7 @@ struct parallel_data {
80889 struct padata_serial_queue __percpu *squeue;
80890 atomic_t reorder_objects;
80891 atomic_t refcnt;
80892 - atomic_t seq_nr;
80893 + atomic_unchecked_t seq_nr;
80894 struct padata_cpumask cpumask;
80895 spinlock_t lock ____cacheline_aligned;
80896 unsigned int processed;
80897 diff --git a/include/linux/path.h b/include/linux/path.h
80898 index d137218..be0c176 100644
80899 --- a/include/linux/path.h
80900 +++ b/include/linux/path.h
80901 @@ -1,13 +1,15 @@
80902 #ifndef _LINUX_PATH_H
80903 #define _LINUX_PATH_H
80904
80905 +#include <linux/compiler.h>
80906 +
80907 struct dentry;
80908 struct vfsmount;
80909
80910 struct path {
80911 struct vfsmount *mnt;
80912 struct dentry *dentry;
80913 -};
80914 +} __randomize_layout;
80915
80916 extern void path_get(const struct path *);
80917 extern void path_put(const struct path *);
80918 diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
80919 index 5f2e559..7d59314 100644
80920 --- a/include/linux/pci_hotplug.h
80921 +++ b/include/linux/pci_hotplug.h
80922 @@ -71,7 +71,8 @@ struct hotplug_slot_ops {
80923 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
80924 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
80925 int (*reset_slot) (struct hotplug_slot *slot, int probe);
80926 -};
80927 +} __do_const;
80928 +typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
80929
80930 /**
80931 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
80932 diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
80933 index e56b07f..aef789b 100644
80934 --- a/include/linux/perf_event.h
80935 +++ b/include/linux/perf_event.h
80936 @@ -328,8 +328,8 @@ struct perf_event {
80937
80938 enum perf_event_active_state state;
80939 unsigned int attach_state;
80940 - local64_t count;
80941 - atomic64_t child_count;
80942 + local64_t count; /* PaX: fix it one day */
80943 + atomic64_unchecked_t child_count;
80944
80945 /*
80946 * These are the total time in nanoseconds that the event
80947 @@ -380,8 +380,8 @@ struct perf_event {
80948 * These accumulate total time (in nanoseconds) that children
80949 * events have been enabled and running, respectively.
80950 */
80951 - atomic64_t child_total_time_enabled;
80952 - atomic64_t child_total_time_running;
80953 + atomic64_unchecked_t child_total_time_enabled;
80954 + atomic64_unchecked_t child_total_time_running;
80955
80956 /*
80957 * Protect attach/detach and child_list:
80958 @@ -708,7 +708,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
80959 entry->ip[entry->nr++] = ip;
80960 }
80961
80962 -extern int sysctl_perf_event_paranoid;
80963 +extern int sysctl_perf_event_legitimately_concerned;
80964 extern int sysctl_perf_event_mlock;
80965 extern int sysctl_perf_event_sample_rate;
80966 extern int sysctl_perf_cpu_time_max_percent;
80967 @@ -723,19 +723,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
80968 loff_t *ppos);
80969
80970
80971 +static inline bool perf_paranoid_any(void)
80972 +{
80973 + return sysctl_perf_event_legitimately_concerned > 2;
80974 +}
80975 +
80976 static inline bool perf_paranoid_tracepoint_raw(void)
80977 {
80978 - return sysctl_perf_event_paranoid > -1;
80979 + return sysctl_perf_event_legitimately_concerned > -1;
80980 }
80981
80982 static inline bool perf_paranoid_cpu(void)
80983 {
80984 - return sysctl_perf_event_paranoid > 0;
80985 + return sysctl_perf_event_legitimately_concerned > 0;
80986 }
80987
80988 static inline bool perf_paranoid_kernel(void)
80989 {
80990 - return sysctl_perf_event_paranoid > 1;
80991 + return sysctl_perf_event_legitimately_concerned > 1;
80992 }
80993
80994 extern void perf_event_init(void);
80995 @@ -851,7 +856,7 @@ struct perf_pmu_events_attr {
80996 struct device_attribute attr;
80997 u64 id;
80998 const char *event_str;
80999 -};
81000 +} __do_const;
81001
81002 #define PMU_EVENT_ATTR(_name, _var, _id, _show) \
81003 static struct perf_pmu_events_attr _var = { \
81004 diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
81005 index 7246ef3..1539ea4 100644
81006 --- a/include/linux/pid_namespace.h
81007 +++ b/include/linux/pid_namespace.h
81008 @@ -43,7 +43,7 @@ struct pid_namespace {
81009 int hide_pid;
81010 int reboot; /* group exit code if this pidns was rebooted */
81011 unsigned int proc_inum;
81012 -};
81013 +} __randomize_layout;
81014
81015 extern struct pid_namespace init_pid_ns;
81016
81017 diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
81018 index ab57526..94598804 100644
81019 --- a/include/linux/pipe_fs_i.h
81020 +++ b/include/linux/pipe_fs_i.h
81021 @@ -47,10 +47,10 @@ struct pipe_inode_info {
81022 struct mutex mutex;
81023 wait_queue_head_t wait;
81024 unsigned int nrbufs, curbuf, buffers;
81025 - unsigned int readers;
81026 - unsigned int writers;
81027 - unsigned int files;
81028 - unsigned int waiting_writers;
81029 + atomic_t readers;
81030 + atomic_t writers;
81031 + atomic_t files;
81032 + atomic_t waiting_writers;
81033 unsigned int r_counter;
81034 unsigned int w_counter;
81035 struct page *tmp_page;
81036 diff --git a/include/linux/pm.h b/include/linux/pm.h
81037 index 8c6583a..febb84c 100644
81038 --- a/include/linux/pm.h
81039 +++ b/include/linux/pm.h
81040 @@ -597,6 +597,7 @@ extern int dev_pm_put_subsys_data(struct device *dev);
81041 struct dev_pm_domain {
81042 struct dev_pm_ops ops;
81043 };
81044 +typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
81045
81046 /*
81047 * The PM_EVENT_ messages are also used by drivers implementing the legacy
81048 diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
81049 index 7c1d252..0e7061d 100644
81050 --- a/include/linux/pm_domain.h
81051 +++ b/include/linux/pm_domain.h
81052 @@ -44,11 +44,11 @@ struct gpd_dev_ops {
81053 int (*thaw_early)(struct device *dev);
81054 int (*thaw)(struct device *dev);
81055 bool (*active_wakeup)(struct device *dev);
81056 -};
81057 +} __no_const;
81058
81059 struct gpd_cpu_data {
81060 unsigned int saved_exit_latency;
81061 - struct cpuidle_state *idle_state;
81062 + cpuidle_state_no_const *idle_state;
81063 };
81064
81065 struct generic_pm_domain {
81066 diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
81067 index 16c9a62..f9f0838 100644
81068 --- a/include/linux/pm_runtime.h
81069 +++ b/include/linux/pm_runtime.h
81070 @@ -109,7 +109,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
81071
81072 static inline void pm_runtime_mark_last_busy(struct device *dev)
81073 {
81074 - ACCESS_ONCE(dev->power.last_busy) = jiffies;
81075 + ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
81076 }
81077
81078 #else /* !CONFIG_PM_RUNTIME */
81079 diff --git a/include/linux/pnp.h b/include/linux/pnp.h
81080 index 195aafc..49a7bc2 100644
81081 --- a/include/linux/pnp.h
81082 +++ b/include/linux/pnp.h
81083 @@ -297,7 +297,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
81084 struct pnp_fixup {
81085 char id[7];
81086 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
81087 -};
81088 +} __do_const;
81089
81090 /* config parameters */
81091 #define PNP_CONFIG_NORMAL 0x0001
81092 diff --git a/include/linux/poison.h b/include/linux/poison.h
81093 index 2110a81..13a11bb 100644
81094 --- a/include/linux/poison.h
81095 +++ b/include/linux/poison.h
81096 @@ -19,8 +19,8 @@
81097 * under normal circumstances, used to verify that nobody uses
81098 * non-initialized list entries.
81099 */
81100 -#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
81101 -#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
81102 +#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
81103 +#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
81104
81105 /********** include/linux/timer.h **********/
81106 /*
81107 diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
81108 index d8b187c3..9a9257a 100644
81109 --- a/include/linux/power/smartreflex.h
81110 +++ b/include/linux/power/smartreflex.h
81111 @@ -238,7 +238,7 @@ struct omap_sr_class_data {
81112 int (*notify)(struct omap_sr *sr, u32 status);
81113 u8 notify_flags;
81114 u8 class_type;
81115 -};
81116 +} __do_const;
81117
81118 /**
81119 * struct omap_sr_nvalue_table - Smartreflex n-target value info
81120 diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
81121 index 4ea1d37..80f4b33 100644
81122 --- a/include/linux/ppp-comp.h
81123 +++ b/include/linux/ppp-comp.h
81124 @@ -84,7 +84,7 @@ struct compressor {
81125 struct module *owner;
81126 /* Extra skb space needed by the compressor algorithm */
81127 unsigned int comp_extra;
81128 -};
81129 +} __do_const;
81130
81131 /*
81132 * The return value from decompress routine is the length of the
81133 diff --git a/include/linux/preempt.h b/include/linux/preempt.h
81134 index de83b4e..c4b997d 100644
81135 --- a/include/linux/preempt.h
81136 +++ b/include/linux/preempt.h
81137 @@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
81138 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
81139 #endif
81140
81141 +#define raw_preempt_count_add(val) __preempt_count_add(val)
81142 +#define raw_preempt_count_sub(val) __preempt_count_sub(val)
81143 +
81144 #define __preempt_count_inc() __preempt_count_add(1)
81145 #define __preempt_count_dec() __preempt_count_sub(1)
81146
81147 #define preempt_count_inc() preempt_count_add(1)
81148 +#define raw_preempt_count_inc() raw_preempt_count_add(1)
81149 #define preempt_count_dec() preempt_count_sub(1)
81150 +#define raw_preempt_count_dec() raw_preempt_count_sub(1)
81151
81152 #ifdef CONFIG_PREEMPT_COUNT
81153
81154 @@ -41,6 +46,12 @@ do { \
81155 barrier(); \
81156 } while (0)
81157
81158 +#define raw_preempt_disable() \
81159 +do { \
81160 + raw_preempt_count_inc(); \
81161 + barrier(); \
81162 +} while (0)
81163 +
81164 #define sched_preempt_enable_no_resched() \
81165 do { \
81166 barrier(); \
81167 @@ -49,6 +60,12 @@ do { \
81168
81169 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
81170
81171 +#define raw_preempt_enable_no_resched() \
81172 +do { \
81173 + barrier(); \
81174 + raw_preempt_count_dec(); \
81175 +} while (0)
81176 +
81177 #ifdef CONFIG_PREEMPT
81178 #define preempt_enable() \
81179 do { \
81180 @@ -113,8 +130,10 @@ do { \
81181 * region.
81182 */
81183 #define preempt_disable() barrier()
81184 +#define raw_preempt_disable() barrier()
81185 #define sched_preempt_enable_no_resched() barrier()
81186 #define preempt_enable_no_resched() barrier()
81187 +#define raw_preempt_enable_no_resched() barrier()
81188 #define preempt_enable() barrier()
81189 #define preempt_check_resched() do { } while (0)
81190
81191 @@ -128,11 +147,13 @@ do { \
81192 /*
81193 * Modules have no business playing preemption tricks.
81194 */
81195 +#ifndef CONFIG_PAX_KERNEXEC
81196 #undef sched_preempt_enable_no_resched
81197 #undef preempt_enable_no_resched
81198 #undef preempt_enable_no_resched_notrace
81199 #undef preempt_check_resched
81200 #endif
81201 +#endif
81202
81203 #define preempt_set_need_resched() \
81204 do { \
81205 diff --git a/include/linux/printk.h b/include/linux/printk.h
81206 index fa47e27..c08e034 100644
81207 --- a/include/linux/printk.h
81208 +++ b/include/linux/printk.h
81209 @@ -114,6 +114,8 @@ static inline __printf(1, 2) __cold
81210 void early_printk(const char *s, ...) { }
81211 #endif
81212
81213 +extern int kptr_restrict;
81214 +
81215 #ifdef CONFIG_PRINTK
81216 asmlinkage __printf(5, 0)
81217 int vprintk_emit(int facility, int level,
81218 @@ -148,7 +150,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
81219
81220 extern int printk_delay_msec;
81221 extern int dmesg_restrict;
81222 -extern int kptr_restrict;
81223
81224 extern void wake_up_klogd(void);
81225
81226 diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
81227 index 608e60a..bbcb1a0 100644
81228 --- a/include/linux/proc_fs.h
81229 +++ b/include/linux/proc_fs.h
81230 @@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
81231 extern struct proc_dir_entry *proc_symlink(const char *,
81232 struct proc_dir_entry *, const char *);
81233 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
81234 +extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
81235 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
81236 struct proc_dir_entry *, void *);
81237 +extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
81238 + struct proc_dir_entry *, void *);
81239 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
81240 struct proc_dir_entry *);
81241
81242 @@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
81243 return proc_create_data(name, mode, parent, proc_fops, NULL);
81244 }
81245
81246 +static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
81247 + struct proc_dir_entry *parent, const struct file_operations *proc_fops)
81248 +{
81249 +#ifdef CONFIG_GRKERNSEC_PROC_USER
81250 + return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
81251 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81252 + return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
81253 +#else
81254 + return proc_create_data(name, mode, parent, proc_fops, NULL);
81255 +#endif
81256 +}
81257 +
81258 +
81259 extern void proc_set_size(struct proc_dir_entry *, loff_t);
81260 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
81261 extern void *PDE_DATA(const struct inode *);
81262 @@ -73,7 +89,7 @@ static inline int remove_proc_subtree(const char *name, struct proc_dir_entry *p
81263 static inline struct proc_dir_entry *proc_net_mkdir(
81264 struct net *net, const char *name, struct proc_dir_entry *parent)
81265 {
81266 - return proc_mkdir_data(name, 0, parent, net);
81267 + return proc_mkdir_data_restrict(name, 0, parent, net);
81268 }
81269
81270 #endif /* _LINUX_PROC_FS_H */
81271 diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
81272 index 34a1e10..70f6bde 100644
81273 --- a/include/linux/proc_ns.h
81274 +++ b/include/linux/proc_ns.h
81275 @@ -14,7 +14,7 @@ struct proc_ns_operations {
81276 void (*put)(void *ns);
81277 int (*install)(struct nsproxy *nsproxy, void *ns);
81278 unsigned int (*inum)(void *ns);
81279 -};
81280 +} __do_const __randomize_layout;
81281
81282 struct proc_ns {
81283 void *ns;
81284 diff --git a/include/linux/quota.h b/include/linux/quota.h
81285 index cc7494a..1e27036 100644
81286 --- a/include/linux/quota.h
81287 +++ b/include/linux/quota.h
81288 @@ -70,7 +70,7 @@ struct kqid { /* Type in which we store the quota identifier */
81289
81290 extern bool qid_eq(struct kqid left, struct kqid right);
81291 extern bool qid_lt(struct kqid left, struct kqid right);
81292 -extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
81293 +extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
81294 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
81295 extern bool qid_valid(struct kqid qid);
81296
81297 diff --git a/include/linux/random.h b/include/linux/random.h
81298 index 1cfce0e..b0b9235 100644
81299 --- a/include/linux/random.h
81300 +++ b/include/linux/random.h
81301 @@ -9,9 +9,19 @@
81302 #include <uapi/linux/random.h>
81303
81304 extern void add_device_randomness(const void *, unsigned int);
81305 +
81306 +static inline void add_latent_entropy(void)
81307 +{
81308 +
81309 +#ifdef LATENT_ENTROPY_PLUGIN
81310 + add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
81311 +#endif
81312 +
81313 +}
81314 +
81315 extern void add_input_randomness(unsigned int type, unsigned int code,
81316 - unsigned int value);
81317 -extern void add_interrupt_randomness(int irq, int irq_flags);
81318 + unsigned int value) __latent_entropy;
81319 +extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
81320
81321 extern void get_random_bytes(void *buf, int nbytes);
81322 extern void get_random_bytes_arch(void *buf, int nbytes);
81323 @@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
81324 extern const struct file_operations random_fops, urandom_fops;
81325 #endif
81326
81327 -unsigned int get_random_int(void);
81328 +unsigned int __intentional_overflow(-1) get_random_int(void);
81329 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
81330
81331 -u32 prandom_u32(void);
81332 +u32 prandom_u32(void) __intentional_overflow(-1);
81333 void prandom_bytes(void *buf, int nbytes);
81334 void prandom_seed(u32 seed);
81335 void prandom_reseed_late(void);
81336 @@ -37,6 +47,11 @@ struct rnd_state {
81337 u32 prandom_u32_state(struct rnd_state *state);
81338 void prandom_bytes_state(struct rnd_state *state, void *buf, int nbytes);
81339
81340 +static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
81341 +{
81342 + return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
81343 +}
81344 +
81345 /**
81346 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
81347 * @ep_ro: right open interval endpoint
81348 diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
81349 index fea49b5..2ac22bb 100644
81350 --- a/include/linux/rbtree_augmented.h
81351 +++ b/include/linux/rbtree_augmented.h
81352 @@ -80,7 +80,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
81353 old->rbaugmented = rbcompute(old); \
81354 } \
81355 rbstatic const struct rb_augment_callbacks rbname = { \
81356 - rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
81357 + .propagate = rbname ## _propagate, \
81358 + .copy = rbname ## _copy, \
81359 + .rotate = rbname ## _rotate \
81360 };
81361
81362
81363 diff --git a/include/linux/rculist.h b/include/linux/rculist.h
81364 index dbaf990..52e07b8 100644
81365 --- a/include/linux/rculist.h
81366 +++ b/include/linux/rculist.h
81367 @@ -29,8 +29,8 @@
81368 */
81369 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
81370 {
81371 - ACCESS_ONCE(list->next) = list;
81372 - ACCESS_ONCE(list->prev) = list;
81373 + ACCESS_ONCE_RW(list->next) = list;
81374 + ACCESS_ONCE_RW(list->prev) = list;
81375 }
81376
81377 /*
81378 @@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
81379 struct list_head *prev, struct list_head *next);
81380 #endif
81381
81382 +void __pax_list_add_rcu(struct list_head *new,
81383 + struct list_head *prev, struct list_head *next);
81384 +
81385 /**
81386 * list_add_rcu - add a new entry to rcu-protected list
81387 * @new: new entry to be added
81388 @@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
81389 __list_add_rcu(new, head, head->next);
81390 }
81391
81392 +static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
81393 +{
81394 + __pax_list_add_rcu(new, head, head->next);
81395 +}
81396 +
81397 /**
81398 * list_add_tail_rcu - add a new entry to rcu-protected list
81399 * @new: new entry to be added
81400 @@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
81401 __list_add_rcu(new, head->prev, head);
81402 }
81403
81404 +static inline void pax_list_add_tail_rcu(struct list_head *new,
81405 + struct list_head *head)
81406 +{
81407 + __pax_list_add_rcu(new, head->prev, head);
81408 +}
81409 +
81410 /**
81411 * list_del_rcu - deletes entry from list without re-initialization
81412 * @entry: the element to delete from the list.
81413 @@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
81414 entry->prev = LIST_POISON2;
81415 }
81416
81417 +extern void pax_list_del_rcu(struct list_head *entry);
81418 +
81419 /**
81420 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
81421 * @n: the element to delete from the hash list.
81422 diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
81423 index 72bf3a0..853347f 100644
81424 --- a/include/linux/rcupdate.h
81425 +++ b/include/linux/rcupdate.h
81426 @@ -588,7 +588,7 @@ static inline void rcu_preempt_sleep_check(void)
81427 #define rcu_assign_pointer(p, v) \
81428 do { \
81429 smp_wmb(); \
81430 - ACCESS_ONCE(p) = RCU_INITIALIZER(v); \
81431 + ACCESS_ONCE_RW(p) = RCU_INITIALIZER(v); \
81432 } while (0)
81433
81434
81435 diff --git a/include/linux/reboot.h b/include/linux/reboot.h
81436 index 9e7db9e..7d4fd72 100644
81437 --- a/include/linux/reboot.h
81438 +++ b/include/linux/reboot.h
81439 @@ -44,9 +44,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
81440 */
81441
81442 extern void migrate_to_reboot_cpu(void);
81443 -extern void machine_restart(char *cmd);
81444 -extern void machine_halt(void);
81445 -extern void machine_power_off(void);
81446 +extern void machine_restart(char *cmd) __noreturn;
81447 +extern void machine_halt(void) __noreturn;
81448 +extern void machine_power_off(void) __noreturn;
81449
81450 extern void machine_shutdown(void);
81451 struct pt_regs;
81452 @@ -57,9 +57,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
81453 */
81454
81455 extern void kernel_restart_prepare(char *cmd);
81456 -extern void kernel_restart(char *cmd);
81457 -extern void kernel_halt(void);
81458 -extern void kernel_power_off(void);
81459 +extern void kernel_restart(char *cmd) __noreturn;
81460 +extern void kernel_halt(void) __noreturn;
81461 +extern void kernel_power_off(void) __noreturn;
81462
81463 extern int C_A_D; /* for sysctl */
81464 void ctrl_alt_del(void);
81465 @@ -73,7 +73,7 @@ extern int orderly_poweroff(bool force);
81466 * Emergency restart, callable from an interrupt handler.
81467 */
81468
81469 -extern void emergency_restart(void);
81470 +extern void emergency_restart(void) __noreturn;
81471 #include <asm/emergency-restart.h>
81472
81473 #endif /* _LINUX_REBOOT_H */
81474 diff --git a/include/linux/regset.h b/include/linux/regset.h
81475 index 8e0c9fe..ac4d221 100644
81476 --- a/include/linux/regset.h
81477 +++ b/include/linux/regset.h
81478 @@ -161,7 +161,8 @@ struct user_regset {
81479 unsigned int align;
81480 unsigned int bias;
81481 unsigned int core_note_type;
81482 -};
81483 +} __do_const;
81484 +typedef struct user_regset __no_const user_regset_no_const;
81485
81486 /**
81487 * struct user_regset_view - available regsets
81488 diff --git a/include/linux/relay.h b/include/linux/relay.h
81489 index d7c8359..818daf5 100644
81490 --- a/include/linux/relay.h
81491 +++ b/include/linux/relay.h
81492 @@ -157,7 +157,7 @@ struct rchan_callbacks
81493 * The callback should return 0 if successful, negative if not.
81494 */
81495 int (*remove_buf_file)(struct dentry *dentry);
81496 -};
81497 +} __no_const;
81498
81499 /*
81500 * CONFIG_RELAY kernel API, kernel/relay.c
81501 diff --git a/include/linux/rio.h b/include/linux/rio.h
81502 index b71d573..2f940bd 100644
81503 --- a/include/linux/rio.h
81504 +++ b/include/linux/rio.h
81505 @@ -355,7 +355,7 @@ struct rio_ops {
81506 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
81507 u64 rstart, u32 size, u32 flags);
81508 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
81509 -};
81510 +} __no_const;
81511
81512 #define RIO_RESOURCE_MEM 0x00000100
81513 #define RIO_RESOURCE_DOORBELL 0x00000200
81514 diff --git a/include/linux/rmap.h b/include/linux/rmap.h
81515 index b66c211..13d2915 100644
81516 --- a/include/linux/rmap.h
81517 +++ b/include/linux/rmap.h
81518 @@ -145,8 +145,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
81519 void anon_vma_init(void); /* create anon_vma_cachep */
81520 int anon_vma_prepare(struct vm_area_struct *);
81521 void unlink_anon_vmas(struct vm_area_struct *);
81522 -int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
81523 -int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
81524 +int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
81525 +int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
81526
81527 static inline void anon_vma_merge(struct vm_area_struct *vma,
81528 struct vm_area_struct *next)
81529 diff --git a/include/linux/sched.h b/include/linux/sched.h
81530 index a781dec..be1d2a3 100644
81531 --- a/include/linux/sched.h
81532 +++ b/include/linux/sched.h
81533 @@ -129,6 +129,7 @@ struct fs_struct;
81534 struct perf_event_context;
81535 struct blk_plug;
81536 struct filename;
81537 +struct linux_binprm;
81538
81539 /*
81540 * List of flags we want to share for kernel threads,
81541 @@ -369,7 +370,7 @@ extern char __sched_text_start[], __sched_text_end[];
81542 extern int in_sched_functions(unsigned long addr);
81543
81544 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
81545 -extern signed long schedule_timeout(signed long timeout);
81546 +extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
81547 extern signed long schedule_timeout_interruptible(signed long timeout);
81548 extern signed long schedule_timeout_killable(signed long timeout);
81549 extern signed long schedule_timeout_uninterruptible(signed long timeout);
81550 @@ -380,6 +381,19 @@ struct nsproxy;
81551 struct user_namespace;
81552
81553 #ifdef CONFIG_MMU
81554 +
81555 +#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
81556 +extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
81557 +#else
81558 +static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
81559 +{
81560 + return 0;
81561 +}
81562 +#endif
81563 +
81564 +extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
81565 +extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
81566 +
81567 extern void arch_pick_mmap_layout(struct mm_struct *mm);
81568 extern unsigned long
81569 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
81570 @@ -677,6 +691,17 @@ struct signal_struct {
81571 #ifdef CONFIG_TASKSTATS
81572 struct taskstats *stats;
81573 #endif
81574 +
81575 +#ifdef CONFIG_GRKERNSEC
81576 + u32 curr_ip;
81577 + u32 saved_ip;
81578 + u32 gr_saddr;
81579 + u32 gr_daddr;
81580 + u16 gr_sport;
81581 + u16 gr_dport;
81582 + u8 used_accept:1;
81583 +#endif
81584 +
81585 #ifdef CONFIG_AUDIT
81586 unsigned audit_tty;
81587 unsigned audit_tty_log_passwd;
81588 @@ -703,7 +728,7 @@ struct signal_struct {
81589 struct mutex cred_guard_mutex; /* guard against foreign influences on
81590 * credential calculations
81591 * (notably. ptrace) */
81592 -};
81593 +} __randomize_layout;
81594
81595 /*
81596 * Bits in flags field of signal_struct.
81597 @@ -757,6 +782,14 @@ struct user_struct {
81598 struct key *session_keyring; /* UID's default session keyring */
81599 #endif
81600
81601 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
81602 + unsigned char kernel_banned;
81603 +#endif
81604 +#ifdef CONFIG_GRKERNSEC_BRUTE
81605 + unsigned char suid_banned;
81606 + unsigned long suid_ban_expires;
81607 +#endif
81608 +
81609 /* Hash table maintenance information */
81610 struct hlist_node uidhash_node;
81611 kuid_t uid;
81612 @@ -764,7 +797,7 @@ struct user_struct {
81613 #ifdef CONFIG_PERF_EVENTS
81614 atomic_long_t locked_vm;
81615 #endif
81616 -};
81617 +} __randomize_layout;
81618
81619 extern int uids_sysfs_init(void);
81620
81621 @@ -1286,8 +1319,8 @@ struct task_struct {
81622 struct list_head thread_node;
81623
81624 struct completion *vfork_done; /* for vfork() */
81625 - int __user *set_child_tid; /* CLONE_CHILD_SETTID */
81626 - int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
81627 + pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
81628 + pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
81629
81630 cputime_t utime, stime, utimescaled, stimescaled;
81631 cputime_t gtime;
81632 @@ -1312,11 +1345,6 @@ struct task_struct {
81633 struct task_cputime cputime_expires;
81634 struct list_head cpu_timers[3];
81635
81636 -/* process credentials */
81637 - const struct cred __rcu *real_cred; /* objective and real subjective task
81638 - * credentials (COW) */
81639 - const struct cred __rcu *cred; /* effective (overridable) subjective task
81640 - * credentials (COW) */
81641 char comm[TASK_COMM_LEN]; /* executable name excluding path
81642 - access with [gs]et_task_comm (which lock
81643 it with task_lock())
81644 @@ -1333,6 +1361,10 @@ struct task_struct {
81645 #endif
81646 /* CPU-specific state of this task */
81647 struct thread_struct thread;
81648 +/* thread_info moved to task_struct */
81649 +#ifdef CONFIG_X86
81650 + struct thread_info tinfo;
81651 +#endif
81652 /* filesystem information */
81653 struct fs_struct *fs;
81654 /* open file information */
81655 @@ -1409,6 +1441,10 @@ struct task_struct {
81656 gfp_t lockdep_reclaim_gfp;
81657 #endif
81658
81659 +/* process credentials */
81660 + const struct cred __rcu *real_cred; /* objective and real subjective task
81661 + * credentials (COW) */
81662 +
81663 /* journalling filesystem info */
81664 void *journal_info;
81665
81666 @@ -1447,6 +1483,10 @@ struct task_struct {
81667 /* cg_list protected by css_set_lock and tsk->alloc_lock */
81668 struct list_head cg_list;
81669 #endif
81670 +
81671 + const struct cred __rcu *cred; /* effective (overridable) subjective task
81672 + * credentials (COW) */
81673 +
81674 #ifdef CONFIG_FUTEX
81675 struct robust_list_head __user *robust_list;
81676 #ifdef CONFIG_COMPAT
81677 @@ -1581,7 +1621,78 @@ struct task_struct {
81678 unsigned int sequential_io;
81679 unsigned int sequential_io_avg;
81680 #endif
81681 -};
81682 +
81683 +#ifdef CONFIG_GRKERNSEC
81684 + /* grsecurity */
81685 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81686 + u64 exec_id;
81687 +#endif
81688 +#ifdef CONFIG_GRKERNSEC_SETXID
81689 + const struct cred *delayed_cred;
81690 +#endif
81691 + struct dentry *gr_chroot_dentry;
81692 + struct acl_subject_label *acl;
81693 + struct acl_subject_label *tmpacl;
81694 + struct acl_role_label *role;
81695 + struct file *exec_file;
81696 + unsigned long brute_expires;
81697 + u16 acl_role_id;
81698 + u8 inherited;
81699 + /* is this the task that authenticated to the special role */
81700 + u8 acl_sp_role;
81701 + u8 is_writable;
81702 + u8 brute;
81703 + u8 gr_is_chrooted;
81704 +#endif
81705 +
81706 +} __randomize_layout;
81707 +
81708 +#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
81709 +#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
81710 +#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
81711 +#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
81712 +/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
81713 +#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
81714 +
81715 +#ifdef CONFIG_PAX_SOFTMODE
81716 +extern int pax_softmode;
81717 +#endif
81718 +
81719 +extern int pax_check_flags(unsigned long *);
81720 +#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
81721 +
81722 +/* if tsk != current then task_lock must be held on it */
81723 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
81724 +static inline unsigned long pax_get_flags(struct task_struct *tsk)
81725 +{
81726 + if (likely(tsk->mm))
81727 + return tsk->mm->pax_flags;
81728 + else
81729 + return 0UL;
81730 +}
81731 +
81732 +/* if tsk != current then task_lock must be held on it */
81733 +static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
81734 +{
81735 + if (likely(tsk->mm)) {
81736 + tsk->mm->pax_flags = flags;
81737 + return 0;
81738 + }
81739 + return -EINVAL;
81740 +}
81741 +#endif
81742 +
81743 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
81744 +extern void pax_set_initial_flags(struct linux_binprm *bprm);
81745 +#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
81746 +extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
81747 +#endif
81748 +
81749 +struct path;
81750 +extern char *pax_get_path(const struct path *path, char *buf, int buflen);
81751 +extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
81752 +extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
81753 +extern void pax_report_refcount_overflow(struct pt_regs *regs);
81754
81755 /* Future-safe accessor for struct task_struct's cpus_allowed. */
81756 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
81757 @@ -1658,7 +1769,7 @@ struct pid_namespace;
81758 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
81759 struct pid_namespace *ns);
81760
81761 -static inline pid_t task_pid_nr(struct task_struct *tsk)
81762 +static inline pid_t task_pid_nr(const struct task_struct *tsk)
81763 {
81764 return tsk->pid;
81765 }
81766 @@ -2112,7 +2223,9 @@ void yield(void);
81767 extern struct exec_domain default_exec_domain;
81768
81769 union thread_union {
81770 +#ifndef CONFIG_X86
81771 struct thread_info thread_info;
81772 +#endif
81773 unsigned long stack[THREAD_SIZE/sizeof(long)];
81774 };
81775
81776 @@ -2145,6 +2258,7 @@ extern struct pid_namespace init_pid_ns;
81777 */
81778
81779 extern struct task_struct *find_task_by_vpid(pid_t nr);
81780 +extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
81781 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
81782 struct pid_namespace *ns);
81783
81784 @@ -2307,7 +2421,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
81785 extern void exit_itimers(struct signal_struct *);
81786 extern void flush_itimer_signals(void);
81787
81788 -extern void do_group_exit(int);
81789 +extern __noreturn void do_group_exit(int);
81790
81791 extern int allow_signal(int);
81792 extern int disallow_signal(int);
81793 @@ -2508,9 +2622,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
81794
81795 #endif
81796
81797 -static inline int object_is_on_stack(void *obj)
81798 +static inline int object_starts_on_stack(void *obj)
81799 {
81800 - void *stack = task_stack_page(current);
81801 + const void *stack = task_stack_page(current);
81802
81803 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
81804 }
81805 diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
81806 index 8045a55..c959cd5 100644
81807 --- a/include/linux/sched/sysctl.h
81808 +++ b/include/linux/sched/sysctl.h
81809 @@ -30,6 +30,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
81810 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
81811
81812 extern int sysctl_max_map_count;
81813 +extern unsigned long sysctl_heap_stack_gap;
81814
81815 extern unsigned int sysctl_sched_latency;
81816 extern unsigned int sysctl_sched_min_granularity;
81817 diff --git a/include/linux/security.h b/include/linux/security.h
81818 index 2fc42d1..4d802f2 100644
81819 --- a/include/linux/security.h
81820 +++ b/include/linux/security.h
81821 @@ -27,6 +27,7 @@
81822 #include <linux/slab.h>
81823 #include <linux/err.h>
81824 #include <linux/string.h>
81825 +#include <linux/grsecurity.h>
81826
81827 struct linux_binprm;
81828 struct cred;
81829 @@ -116,8 +117,6 @@ struct seq_file;
81830
81831 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
81832
81833 -void reset_security_ops(void);
81834 -
81835 #ifdef CONFIG_MMU
81836 extern unsigned long mmap_min_addr;
81837 extern unsigned long dac_mmap_min_addr;
81838 @@ -1719,7 +1718,7 @@ struct security_operations {
81839 struct audit_context *actx);
81840 void (*audit_rule_free) (void *lsmrule);
81841 #endif /* CONFIG_AUDIT */
81842 -};
81843 +} __randomize_layout;
81844
81845 /* prototypes */
81846 extern int security_init(void);
81847 diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
81848 index dc368b8..e895209 100644
81849 --- a/include/linux/semaphore.h
81850 +++ b/include/linux/semaphore.h
81851 @@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
81852 }
81853
81854 extern void down(struct semaphore *sem);
81855 -extern int __must_check down_interruptible(struct semaphore *sem);
81856 +extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
81857 extern int __must_check down_killable(struct semaphore *sem);
81858 extern int __must_check down_trylock(struct semaphore *sem);
81859 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
81860 diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
81861 index 52e0097..383f21d 100644
81862 --- a/include/linux/seq_file.h
81863 +++ b/include/linux/seq_file.h
81864 @@ -27,6 +27,9 @@ struct seq_file {
81865 struct mutex lock;
81866 const struct seq_operations *op;
81867 int poll_event;
81868 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81869 + u64 exec_id;
81870 +#endif
81871 #ifdef CONFIG_USER_NS
81872 struct user_namespace *user_ns;
81873 #endif
81874 @@ -39,6 +42,7 @@ struct seq_operations {
81875 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
81876 int (*show) (struct seq_file *m, void *v);
81877 };
81878 +typedef struct seq_operations __no_const seq_operations_no_const;
81879
81880 #define SEQ_SKIP 1
81881
81882 @@ -96,6 +100,7 @@ void seq_pad(struct seq_file *m, char c);
81883
81884 char *mangle_path(char *s, const char *p, const char *esc);
81885 int seq_open(struct file *, const struct seq_operations *);
81886 +int seq_open_restrict(struct file *, const struct seq_operations *);
81887 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
81888 loff_t seq_lseek(struct file *, loff_t, int);
81889 int seq_release(struct inode *, struct file *);
81890 @@ -138,6 +143,7 @@ static inline int seq_nodemask_list(struct seq_file *m, nodemask_t *mask)
81891 }
81892
81893 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
81894 +int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
81895 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
81896 int single_release(struct inode *, struct file *);
81897 void *__seq_open_private(struct file *, const struct seq_operations *, int);
81898 diff --git a/include/linux/shm.h b/include/linux/shm.h
81899 index 1e2cd2e..0288750 100644
81900 --- a/include/linux/shm.h
81901 +++ b/include/linux/shm.h
81902 @@ -21,6 +21,10 @@ struct shmid_kernel /* private to the kernel */
81903
81904 /* The task created the shm object. NULL if the task is dead. */
81905 struct task_struct *shm_creator;
81906 +#ifdef CONFIG_GRKERNSEC
81907 + time_t shm_createtime;
81908 + pid_t shm_lapid;
81909 +#endif
81910 };
81911
81912 /* shm_mode upper byte flags */
81913 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
81914 index 15ede6a..80161c3 100644
81915 --- a/include/linux/skbuff.h
81916 +++ b/include/linux/skbuff.h
81917 @@ -662,7 +662,7 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
81918 struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
81919 int node);
81920 struct sk_buff *build_skb(void *data, unsigned int frag_size);
81921 -static inline struct sk_buff *alloc_skb(unsigned int size,
81922 +static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
81923 gfp_t priority)
81924 {
81925 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
81926 @@ -1768,7 +1768,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
81927 return skb->inner_transport_header - skb->inner_network_header;
81928 }
81929
81930 -static inline int skb_network_offset(const struct sk_buff *skb)
81931 +static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
81932 {
81933 return skb_network_header(skb) - skb->data;
81934 }
81935 @@ -1828,7 +1828,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
81936 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
81937 */
81938 #ifndef NET_SKB_PAD
81939 -#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
81940 +#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
81941 #endif
81942
81943 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
81944 @@ -2427,7 +2427,7 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
81945 int *err);
81946 unsigned int datagram_poll(struct file *file, struct socket *sock,
81947 struct poll_table_struct *wait);
81948 -int skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
81949 +int __intentional_overflow(0) skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
81950 struct iovec *to, int size);
81951 int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, int hlen,
81952 struct iovec *iov);
81953 @@ -2721,6 +2721,9 @@ static inline void nf_reset(struct sk_buff *skb)
81954 nf_bridge_put(skb->nf_bridge);
81955 skb->nf_bridge = NULL;
81956 #endif
81957 +#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
81958 + skb->nf_trace = 0;
81959 +#endif
81960 }
81961
81962 static inline void nf_reset_trace(struct sk_buff *skb)
81963 diff --git a/include/linux/slab.h b/include/linux/slab.h
81964 index b5b2df6..69f5734 100644
81965 --- a/include/linux/slab.h
81966 +++ b/include/linux/slab.h
81967 @@ -14,15 +14,29 @@
81968 #include <linux/gfp.h>
81969 #include <linux/types.h>
81970 #include <linux/workqueue.h>
81971 -
81972 +#include <linux/err.h>
81973
81974 /*
81975 * Flags to pass to kmem_cache_create().
81976 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
81977 */
81978 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
81979 +
81980 +#ifdef CONFIG_PAX_USERCOPY_SLABS
81981 +#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
81982 +#else
81983 +#define SLAB_USERCOPY 0x00000000UL
81984 +#endif
81985 +
81986 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
81987 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
81988 +
81989 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
81990 +#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
81991 +#else
81992 +#define SLAB_NO_SANITIZE 0x00000000UL
81993 +#endif
81994 +
81995 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
81996 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
81997 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
81998 @@ -98,10 +112,13 @@
81999 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
82000 * Both make kfree a no-op.
82001 */
82002 -#define ZERO_SIZE_PTR ((void *)16)
82003 +#define ZERO_SIZE_PTR \
82004 +({ \
82005 + BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
82006 + (void *)(-MAX_ERRNO-1L); \
82007 +})
82008
82009 -#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
82010 - (unsigned long)ZERO_SIZE_PTR)
82011 +#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
82012
82013 #include <linux/kmemleak.h>
82014
82015 @@ -142,6 +159,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
82016 void kfree(const void *);
82017 void kzfree(const void *);
82018 size_t ksize(const void *);
82019 +const char *check_heap_object(const void *ptr, unsigned long n);
82020 +bool is_usercopy_object(const void *ptr);
82021
82022 /*
82023 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
82024 @@ -174,7 +193,7 @@ struct kmem_cache {
82025 unsigned int align; /* Alignment as calculated */
82026 unsigned long flags; /* Active flags on the slab */
82027 const char *name; /* Slab name for sysfs */
82028 - int refcount; /* Use counter */
82029 + atomic_t refcount; /* Use counter */
82030 void (*ctor)(void *); /* Called on object slot creation */
82031 struct list_head list; /* List of all slab caches on the system */
82032 };
82033 @@ -248,6 +267,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
82034 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
82035 #endif
82036
82037 +#ifdef CONFIG_PAX_USERCOPY_SLABS
82038 +extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
82039 +#endif
82040 +
82041 /*
82042 * Figure out which kmalloc slab an allocation of a certain size
82043 * belongs to.
82044 @@ -256,7 +279,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
82045 * 2 = 120 .. 192 bytes
82046 * n = 2^(n-1) .. 2^n -1
82047 */
82048 -static __always_inline int kmalloc_index(size_t size)
82049 +static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
82050 {
82051 if (!size)
82052 return 0;
82053 @@ -299,11 +322,11 @@ static __always_inline int kmalloc_index(size_t size)
82054 }
82055 #endif /* !CONFIG_SLOB */
82056
82057 -void *__kmalloc(size_t size, gfp_t flags);
82058 +void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
82059 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
82060
82061 #ifdef CONFIG_NUMA
82062 -void *__kmalloc_node(size_t size, gfp_t flags, int node);
82063 +void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1);
82064 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
82065 #else
82066 static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
82067 diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
82068 index 8235dfb..47ce586 100644
82069 --- a/include/linux/slab_def.h
82070 +++ b/include/linux/slab_def.h
82071 @@ -38,7 +38,7 @@ struct kmem_cache {
82072 /* 4) cache creation/removal */
82073 const char *name;
82074 struct list_head list;
82075 - int refcount;
82076 + atomic_t refcount;
82077 int object_size;
82078 int align;
82079
82080 @@ -54,10 +54,14 @@ struct kmem_cache {
82081 unsigned long node_allocs;
82082 unsigned long node_frees;
82083 unsigned long node_overflow;
82084 - atomic_t allochit;
82085 - atomic_t allocmiss;
82086 - atomic_t freehit;
82087 - atomic_t freemiss;
82088 + atomic_unchecked_t allochit;
82089 + atomic_unchecked_t allocmiss;
82090 + atomic_unchecked_t freehit;
82091 + atomic_unchecked_t freemiss;
82092 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
82093 + atomic_unchecked_t sanitized;
82094 + atomic_unchecked_t not_sanitized;
82095 +#endif
82096
82097 /*
82098 * If debugging is enabled, then the allocator can add additional
82099 diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
82100 index f56bfa9..8378a26 100644
82101 --- a/include/linux/slub_def.h
82102 +++ b/include/linux/slub_def.h
82103 @@ -74,7 +74,7 @@ struct kmem_cache {
82104 struct kmem_cache_order_objects max;
82105 struct kmem_cache_order_objects min;
82106 gfp_t allocflags; /* gfp flags to use on each alloc */
82107 - int refcount; /* Refcount for slab cache destroy */
82108 + atomic_t refcount; /* Refcount for slab cache destroy */
82109 void (*ctor)(void *);
82110 int inuse; /* Offset to metadata */
82111 int align; /* Alignment */
82112 diff --git a/include/linux/smp.h b/include/linux/smp.h
82113 index 6ae004e..2743532 100644
82114 --- a/include/linux/smp.h
82115 +++ b/include/linux/smp.h
82116 @@ -180,7 +180,9 @@ static inline void kick_all_cpus_sync(void) { }
82117 #endif
82118
82119 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
82120 +#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
82121 #define put_cpu() preempt_enable()
82122 +#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
82123
82124 /*
82125 * Callback to arch code if there's nosmp or maxcpus=0 on the
82126 diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
82127 index 54f91d3..be2c379 100644
82128 --- a/include/linux/sock_diag.h
82129 +++ b/include/linux/sock_diag.h
82130 @@ -11,7 +11,7 @@ struct sock;
82131 struct sock_diag_handler {
82132 __u8 family;
82133 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
82134 -};
82135 +} __do_const;
82136
82137 int sock_diag_register(const struct sock_diag_handler *h);
82138 void sock_diag_unregister(const struct sock_diag_handler *h);
82139 diff --git a/include/linux/sonet.h b/include/linux/sonet.h
82140 index 680f9a3..f13aeb0 100644
82141 --- a/include/linux/sonet.h
82142 +++ b/include/linux/sonet.h
82143 @@ -7,7 +7,7 @@
82144 #include <uapi/linux/sonet.h>
82145
82146 struct k_sonet_stats {
82147 -#define __HANDLE_ITEM(i) atomic_t i
82148 +#define __HANDLE_ITEM(i) atomic_unchecked_t i
82149 __SONET_ITEMS
82150 #undef __HANDLE_ITEM
82151 };
82152 diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
82153 index 07d8e53..dc934c9 100644
82154 --- a/include/linux/sunrpc/addr.h
82155 +++ b/include/linux/sunrpc/addr.h
82156 @@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
82157 {
82158 switch (sap->sa_family) {
82159 case AF_INET:
82160 - return ntohs(((struct sockaddr_in *)sap)->sin_port);
82161 + return ntohs(((const struct sockaddr_in *)sap)->sin_port);
82162 case AF_INET6:
82163 - return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
82164 + return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
82165 }
82166 return 0;
82167 }
82168 @@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
82169 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
82170 const struct sockaddr *src)
82171 {
82172 - const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
82173 + const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
82174 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
82175
82176 dsin->sin_family = ssin->sin_family;
82177 @@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
82178 if (sa->sa_family != AF_INET6)
82179 return 0;
82180
82181 - return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
82182 + return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
82183 }
82184
82185 #endif /* _LINUX_SUNRPC_ADDR_H */
82186 diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
82187 index 8af2804..c7414ef 100644
82188 --- a/include/linux/sunrpc/clnt.h
82189 +++ b/include/linux/sunrpc/clnt.h
82190 @@ -97,7 +97,7 @@ struct rpc_procinfo {
82191 unsigned int p_timer; /* Which RTT timer to use */
82192 u32 p_statidx; /* Which procedure to account */
82193 const char * p_name; /* name of procedure */
82194 -};
82195 +} __do_const;
82196
82197 #ifdef __KERNEL__
82198
82199 diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
82200 index 04e7632..2e2a8a3 100644
82201 --- a/include/linux/sunrpc/svc.h
82202 +++ b/include/linux/sunrpc/svc.h
82203 @@ -412,7 +412,7 @@ struct svc_procedure {
82204 unsigned int pc_count; /* call count */
82205 unsigned int pc_cachetype; /* cache info (NFS) */
82206 unsigned int pc_xdrressize; /* maximum size of XDR reply */
82207 -};
82208 +} __do_const;
82209
82210 /*
82211 * Function prototypes.
82212 diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
82213 index 0b8e3e6..33e0a01 100644
82214 --- a/include/linux/sunrpc/svc_rdma.h
82215 +++ b/include/linux/sunrpc/svc_rdma.h
82216 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
82217 extern unsigned int svcrdma_max_requests;
82218 extern unsigned int svcrdma_max_req_size;
82219
82220 -extern atomic_t rdma_stat_recv;
82221 -extern atomic_t rdma_stat_read;
82222 -extern atomic_t rdma_stat_write;
82223 -extern atomic_t rdma_stat_sq_starve;
82224 -extern atomic_t rdma_stat_rq_starve;
82225 -extern atomic_t rdma_stat_rq_poll;
82226 -extern atomic_t rdma_stat_rq_prod;
82227 -extern atomic_t rdma_stat_sq_poll;
82228 -extern atomic_t rdma_stat_sq_prod;
82229 +extern atomic_unchecked_t rdma_stat_recv;
82230 +extern atomic_unchecked_t rdma_stat_read;
82231 +extern atomic_unchecked_t rdma_stat_write;
82232 +extern atomic_unchecked_t rdma_stat_sq_starve;
82233 +extern atomic_unchecked_t rdma_stat_rq_starve;
82234 +extern atomic_unchecked_t rdma_stat_rq_poll;
82235 +extern atomic_unchecked_t rdma_stat_rq_prod;
82236 +extern atomic_unchecked_t rdma_stat_sq_poll;
82237 +extern atomic_unchecked_t rdma_stat_sq_prod;
82238
82239 #define RPCRDMA_VERSION 1
82240
82241 diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
82242 index 8d71d65..f79586e 100644
82243 --- a/include/linux/sunrpc/svcauth.h
82244 +++ b/include/linux/sunrpc/svcauth.h
82245 @@ -120,7 +120,7 @@ struct auth_ops {
82246 int (*release)(struct svc_rqst *rq);
82247 void (*domain_release)(struct auth_domain *);
82248 int (*set_client)(struct svc_rqst *rq);
82249 -};
82250 +} __do_const;
82251
82252 #define SVC_GARBAGE 1
82253 #define SVC_SYSERR 2
82254 diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
82255 index a5ffd32..0935dea 100644
82256 --- a/include/linux/swiotlb.h
82257 +++ b/include/linux/swiotlb.h
82258 @@ -60,7 +60,8 @@ extern void
82259
82260 extern void
82261 swiotlb_free_coherent(struct device *hwdev, size_t size,
82262 - void *vaddr, dma_addr_t dma_handle);
82263 + void *vaddr, dma_addr_t dma_handle,
82264 + struct dma_attrs *attrs);
82265
82266 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
82267 unsigned long offset, size_t size,
82268 diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
82269 index a747a77..9e14df7 100644
82270 --- a/include/linux/syscalls.h
82271 +++ b/include/linux/syscalls.h
82272 @@ -98,8 +98,14 @@ struct sigaltstack;
82273 #define __MAP(n,...) __MAP##n(__VA_ARGS__)
82274
82275 #define __SC_DECL(t, a) t a
82276 +#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))
82277 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
82278 -#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
82279 +#define __SC_LONG(t, a) __typeof( \
82280 + __builtin_choose_expr( \
82281 + sizeof(t) > sizeof(int), \
82282 + (t) 0, \
82283 + __builtin_choose_expr(__TYPE_IS_U(t), 0UL, 0L) \
82284 + )) a
82285 #define __SC_CAST(t, a) (t) a
82286 #define __SC_ARGS(t, a) a
82287 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
82288 @@ -371,11 +377,11 @@ asmlinkage long sys_sync(void);
82289 asmlinkage long sys_fsync(unsigned int fd);
82290 asmlinkage long sys_fdatasync(unsigned int fd);
82291 asmlinkage long sys_bdflush(int func, long data);
82292 -asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
82293 - char __user *type, unsigned long flags,
82294 +asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
82295 + const char __user *type, unsigned long flags,
82296 void __user *data);
82297 -asmlinkage long sys_umount(char __user *name, int flags);
82298 -asmlinkage long sys_oldumount(char __user *name);
82299 +asmlinkage long sys_umount(const char __user *name, int flags);
82300 +asmlinkage long sys_oldumount(const char __user *name);
82301 asmlinkage long sys_truncate(const char __user *path, long length);
82302 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
82303 asmlinkage long sys_stat(const char __user *filename,
82304 @@ -587,7 +593,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
82305 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
82306 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
82307 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
82308 - struct sockaddr __user *, int);
82309 + struct sockaddr __user *, int) __intentional_overflow(0);
82310 asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);
82311 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
82312 unsigned int vlen, unsigned flags);
82313 diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
82314 index 27b3b0b..e093dd9 100644
82315 --- a/include/linux/syscore_ops.h
82316 +++ b/include/linux/syscore_ops.h
82317 @@ -16,7 +16,7 @@ struct syscore_ops {
82318 int (*suspend)(void);
82319 void (*resume)(void);
82320 void (*shutdown)(void);
82321 -};
82322 +} __do_const;
82323
82324 extern void register_syscore_ops(struct syscore_ops *ops);
82325 extern void unregister_syscore_ops(struct syscore_ops *ops);
82326 diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
82327 index 14a8ff2..fa95f3a 100644
82328 --- a/include/linux/sysctl.h
82329 +++ b/include/linux/sysctl.h
82330 @@ -34,13 +34,13 @@ struct ctl_table_root;
82331 struct ctl_table_header;
82332 struct ctl_dir;
82333
82334 -typedef struct ctl_table ctl_table;
82335 -
82336 typedef int proc_handler (struct ctl_table *ctl, int write,
82337 void __user *buffer, size_t *lenp, loff_t *ppos);
82338
82339 extern int proc_dostring(struct ctl_table *, int,
82340 void __user *, size_t *, loff_t *);
82341 +extern int proc_dostring_modpriv(struct ctl_table *, int,
82342 + void __user *, size_t *, loff_t *);
82343 extern int proc_dointvec(struct ctl_table *, int,
82344 void __user *, size_t *, loff_t *);
82345 extern int proc_dointvec_minmax(struct ctl_table *, int,
82346 @@ -115,7 +115,9 @@ struct ctl_table
82347 struct ctl_table_poll *poll;
82348 void *extra1;
82349 void *extra2;
82350 -};
82351 +} __do_const __randomize_layout;
82352 +typedef struct ctl_table __no_const ctl_table_no_const;
82353 +typedef struct ctl_table ctl_table;
82354
82355 struct ctl_node {
82356 struct rb_node node;
82357 diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
82358 index 30b2ebe..37412ef 100644
82359 --- a/include/linux/sysfs.h
82360 +++ b/include/linux/sysfs.h
82361 @@ -34,7 +34,8 @@ struct attribute {
82362 struct lock_class_key *key;
82363 struct lock_class_key skey;
82364 #endif
82365 -};
82366 +} __do_const;
82367 +typedef struct attribute __no_const attribute_no_const;
82368
82369 /**
82370 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
82371 @@ -63,7 +64,8 @@ struct attribute_group {
82372 struct attribute *, int);
82373 struct attribute **attrs;
82374 struct bin_attribute **bin_attrs;
82375 -};
82376 +} __do_const;
82377 +typedef struct attribute_group __no_const attribute_group_no_const;
82378
82379 /**
82380 * Use these macros to make defining attributes easier. See include/linux/device.h
82381 @@ -127,7 +129,8 @@ struct bin_attribute {
82382 char *, loff_t, size_t);
82383 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
82384 struct vm_area_struct *vma);
82385 -};
82386 +} __do_const;
82387 +typedef struct bin_attribute __no_const bin_attribute_no_const;
82388
82389 /**
82390 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
82391 diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
82392 index 387fa7d..3fcde6b 100644
82393 --- a/include/linux/sysrq.h
82394 +++ b/include/linux/sysrq.h
82395 @@ -16,6 +16,7 @@
82396
82397 #include <linux/errno.h>
82398 #include <linux/types.h>
82399 +#include <linux/compiler.h>
82400
82401 /* Possible values of bitmask for enabling sysrq functions */
82402 /* 0x0001 is reserved for enable everything */
82403 @@ -33,7 +34,7 @@ struct sysrq_key_op {
82404 char *help_msg;
82405 char *action_msg;
82406 int enable_mask;
82407 -};
82408 +} __do_const;
82409
82410 #ifdef CONFIG_MAGIC_SYSRQ
82411
82412 diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
82413 index fddbe20..0312de8 100644
82414 --- a/include/linux/thread_info.h
82415 +++ b/include/linux/thread_info.h
82416 @@ -161,6 +161,15 @@ static inline bool test_and_clear_restore_sigmask(void)
82417 #error "no set_restore_sigmask() provided and default one won't work"
82418 #endif
82419
82420 +extern void __check_object_size(const void *ptr, unsigned long n, bool to_user);
82421 +static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
82422 +{
82423 +#ifndef CONFIG_PAX_USERCOPY_DEBUG
82424 + if (!__builtin_constant_p(n))
82425 +#endif
82426 + __check_object_size(ptr, n, to_user);
82427 +}
82428 +
82429 #endif /* __KERNEL__ */
82430
82431 #endif /* _LINUX_THREAD_INFO_H */
82432 diff --git a/include/linux/tty.h b/include/linux/tty.h
82433 index b90b5c2..e23a512 100644
82434 --- a/include/linux/tty.h
82435 +++ b/include/linux/tty.h
82436 @@ -202,7 +202,7 @@ struct tty_port {
82437 const struct tty_port_operations *ops; /* Port operations */
82438 spinlock_t lock; /* Lock protecting tty field */
82439 int blocked_open; /* Waiting to open */
82440 - int count; /* Usage count */
82441 + atomic_t count; /* Usage count */
82442 wait_queue_head_t open_wait; /* Open waiters */
82443 wait_queue_head_t close_wait; /* Close waiters */
82444 wait_queue_head_t delta_msr_wait; /* Modem status change */
82445 @@ -284,7 +284,7 @@ struct tty_struct {
82446 /* If the tty has a pending do_SAK, queue it here - akpm */
82447 struct work_struct SAK_work;
82448 struct tty_port *port;
82449 -};
82450 +} __randomize_layout;
82451
82452 /* Each of a tty's open files has private_data pointing to tty_file_private */
82453 struct tty_file_private {
82454 @@ -550,7 +550,7 @@ extern int tty_port_open(struct tty_port *port,
82455 struct tty_struct *tty, struct file *filp);
82456 static inline int tty_port_users(struct tty_port *port)
82457 {
82458 - return port->count + port->blocked_open;
82459 + return atomic_read(&port->count) + port->blocked_open;
82460 }
82461
82462 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
82463 diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
82464 index 756a609..89db85e 100644
82465 --- a/include/linux/tty_driver.h
82466 +++ b/include/linux/tty_driver.h
82467 @@ -285,7 +285,7 @@ struct tty_operations {
82468 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
82469 #endif
82470 const struct file_operations *proc_fops;
82471 -};
82472 +} __do_const __randomize_layout;
82473
82474 struct tty_driver {
82475 int magic; /* magic number for this structure */
82476 @@ -319,7 +319,7 @@ struct tty_driver {
82477
82478 const struct tty_operations *ops;
82479 struct list_head tty_drivers;
82480 -};
82481 +} __randomize_layout;
82482
82483 extern struct list_head tty_drivers;
82484
82485 diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
82486 index b8347c2..85d8b0f 100644
82487 --- a/include/linux/tty_ldisc.h
82488 +++ b/include/linux/tty_ldisc.h
82489 @@ -213,7 +213,7 @@ struct tty_ldisc_ops {
82490
82491 struct module *owner;
82492
82493 - int refcount;
82494 + atomic_t refcount;
82495 };
82496
82497 struct tty_ldisc {
82498 diff --git a/include/linux/types.h b/include/linux/types.h
82499 index 4d118ba..c3ee9bf 100644
82500 --- a/include/linux/types.h
82501 +++ b/include/linux/types.h
82502 @@ -176,10 +176,26 @@ typedef struct {
82503 int counter;
82504 } atomic_t;
82505
82506 +#ifdef CONFIG_PAX_REFCOUNT
82507 +typedef struct {
82508 + int counter;
82509 +} atomic_unchecked_t;
82510 +#else
82511 +typedef atomic_t atomic_unchecked_t;
82512 +#endif
82513 +
82514 #ifdef CONFIG_64BIT
82515 typedef struct {
82516 long counter;
82517 } atomic64_t;
82518 +
82519 +#ifdef CONFIG_PAX_REFCOUNT
82520 +typedef struct {
82521 + long counter;
82522 +} atomic64_unchecked_t;
82523 +#else
82524 +typedef atomic64_t atomic64_unchecked_t;
82525 +#endif
82526 #endif
82527
82528 struct list_head {
82529 diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
82530 index ecd3319..8a36ded 100644
82531 --- a/include/linux/uaccess.h
82532 +++ b/include/linux/uaccess.h
82533 @@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
82534 long ret; \
82535 mm_segment_t old_fs = get_fs(); \
82536 \
82537 - set_fs(KERNEL_DS); \
82538 pagefault_disable(); \
82539 - ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
82540 - pagefault_enable(); \
82541 + set_fs(KERNEL_DS); \
82542 + ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
82543 set_fs(old_fs); \
82544 + pagefault_enable(); \
82545 ret; \
82546 })
82547
82548 diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
82549 index 2d1f9b6..d7a9fce 100644
82550 --- a/include/linux/uidgid.h
82551 +++ b/include/linux/uidgid.h
82552 @@ -175,4 +175,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
82553
82554 #endif /* CONFIG_USER_NS */
82555
82556 +#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
82557 +#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
82558 +#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
82559 +#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
82560 +
82561 #endif /* _LINUX_UIDGID_H */
82562 diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
82563 index 99c1b4d..562e6f3 100644
82564 --- a/include/linux/unaligned/access_ok.h
82565 +++ b/include/linux/unaligned/access_ok.h
82566 @@ -4,34 +4,34 @@
82567 #include <linux/kernel.h>
82568 #include <asm/byteorder.h>
82569
82570 -static inline u16 get_unaligned_le16(const void *p)
82571 +static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
82572 {
82573 - return le16_to_cpup((__le16 *)p);
82574 + return le16_to_cpup((const __le16 *)p);
82575 }
82576
82577 -static inline u32 get_unaligned_le32(const void *p)
82578 +static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
82579 {
82580 - return le32_to_cpup((__le32 *)p);
82581 + return le32_to_cpup((const __le32 *)p);
82582 }
82583
82584 -static inline u64 get_unaligned_le64(const void *p)
82585 +static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
82586 {
82587 - return le64_to_cpup((__le64 *)p);
82588 + return le64_to_cpup((const __le64 *)p);
82589 }
82590
82591 -static inline u16 get_unaligned_be16(const void *p)
82592 +static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
82593 {
82594 - return be16_to_cpup((__be16 *)p);
82595 + return be16_to_cpup((const __be16 *)p);
82596 }
82597
82598 -static inline u32 get_unaligned_be32(const void *p)
82599 +static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
82600 {
82601 - return be32_to_cpup((__be32 *)p);
82602 + return be32_to_cpup((const __be32 *)p);
82603 }
82604
82605 -static inline u64 get_unaligned_be64(const void *p)
82606 +static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
82607 {
82608 - return be64_to_cpup((__be64 *)p);
82609 + return be64_to_cpup((const __be64 *)p);
82610 }
82611
82612 static inline void put_unaligned_le16(u16 val, void *p)
82613 diff --git a/include/linux/usb.h b/include/linux/usb.h
82614 index 7f6eb85..656e806 100644
82615 --- a/include/linux/usb.h
82616 +++ b/include/linux/usb.h
82617 @@ -563,7 +563,7 @@ struct usb_device {
82618 int maxchild;
82619
82620 u32 quirks;
82621 - atomic_t urbnum;
82622 + atomic_unchecked_t urbnum;
82623
82624 unsigned long active_duration;
82625
82626 @@ -1642,7 +1642,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
82627
82628 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
82629 __u8 request, __u8 requesttype, __u16 value, __u16 index,
82630 - void *data, __u16 size, int timeout);
82631 + void *data, __u16 size, int timeout) __intentional_overflow(-1);
82632 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
82633 void *data, int len, int *actual_length, int timeout);
82634 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
82635 diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
82636 index e452ba6..78f8e80 100644
82637 --- a/include/linux/usb/renesas_usbhs.h
82638 +++ b/include/linux/usb/renesas_usbhs.h
82639 @@ -39,7 +39,7 @@ enum {
82640 */
82641 struct renesas_usbhs_driver_callback {
82642 int (*notify_hotplug)(struct platform_device *pdev);
82643 -};
82644 +} __no_const;
82645
82646 /*
82647 * callback functions for platform
82648 diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
82649 index 4836ba3..603f6ee 100644
82650 --- a/include/linux/user_namespace.h
82651 +++ b/include/linux/user_namespace.h
82652 @@ -33,7 +33,7 @@ struct user_namespace {
82653 struct key *persistent_keyring_register;
82654 struct rw_semaphore persistent_keyring_register_sem;
82655 #endif
82656 -};
82657 +} __randomize_layout;
82658
82659 extern struct user_namespace init_user_ns;
82660
82661 diff --git a/include/linux/utsname.h b/include/linux/utsname.h
82662 index 239e277..22a5cf5 100644
82663 --- a/include/linux/utsname.h
82664 +++ b/include/linux/utsname.h
82665 @@ -24,7 +24,7 @@ struct uts_namespace {
82666 struct new_utsname name;
82667 struct user_namespace *user_ns;
82668 unsigned int proc_inum;
82669 -};
82670 +} __randomize_layout;
82671 extern struct uts_namespace init_uts_ns;
82672
82673 #ifdef CONFIG_UTS_NS
82674 diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
82675 index 6f8fbcf..4efc177 100644
82676 --- a/include/linux/vermagic.h
82677 +++ b/include/linux/vermagic.h
82678 @@ -25,9 +25,42 @@
82679 #define MODULE_ARCH_VERMAGIC ""
82680 #endif
82681
82682 +#ifdef CONFIG_PAX_REFCOUNT
82683 +#define MODULE_PAX_REFCOUNT "REFCOUNT "
82684 +#else
82685 +#define MODULE_PAX_REFCOUNT ""
82686 +#endif
82687 +
82688 +#ifdef CONSTIFY_PLUGIN
82689 +#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
82690 +#else
82691 +#define MODULE_CONSTIFY_PLUGIN ""
82692 +#endif
82693 +
82694 +#ifdef STACKLEAK_PLUGIN
82695 +#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
82696 +#else
82697 +#define MODULE_STACKLEAK_PLUGIN ""
82698 +#endif
82699 +
82700 +#ifdef RANDSTRUCT_PLUGIN
82701 +#include <generated/randomize_layout_hash.h>
82702 +#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
82703 +#else
82704 +#define MODULE_RANDSTRUCT_PLUGIN
82705 +#endif
82706 +
82707 +#ifdef CONFIG_GRKERNSEC
82708 +#define MODULE_GRSEC "GRSEC "
82709 +#else
82710 +#define MODULE_GRSEC ""
82711 +#endif
82712 +
82713 #define VERMAGIC_STRING \
82714 UTS_RELEASE " " \
82715 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
82716 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
82717 - MODULE_ARCH_VERMAGIC
82718 + MODULE_ARCH_VERMAGIC \
82719 + MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
82720 + MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
82721
82722 diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
82723 index 502073a..a7de024 100644
82724 --- a/include/linux/vga_switcheroo.h
82725 +++ b/include/linux/vga_switcheroo.h
82726 @@ -63,8 +63,8 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
82727
82728 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
82729
82730 -int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
82731 -int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
82732 +int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
82733 +int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
82734 #else
82735
82736 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
82737 @@ -81,8 +81,8 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
82738
82739 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
82740
82741 -static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
82742 -static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
82743 +static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
82744 +static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
82745
82746 #endif
82747 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
82748 diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
82749 index 4b8a891..cb8df6e 100644
82750 --- a/include/linux/vmalloc.h
82751 +++ b/include/linux/vmalloc.h
82752 @@ -16,6 +16,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
82753 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
82754 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
82755 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
82756 +
82757 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
82758 +#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
82759 +#endif
82760 +
82761 /* bits [20..32] reserved for arch specific ioremap internals */
82762
82763 /*
82764 @@ -142,7 +147,7 @@ extern void free_vm_area(struct vm_struct *area);
82765
82766 /* for /dev/kmem */
82767 extern long vread(char *buf, char *addr, unsigned long count);
82768 -extern long vwrite(char *buf, char *addr, unsigned long count);
82769 +extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
82770
82771 /*
82772 * Internals. Dont't use..
82773 diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
82774 index 67ce70c..d540954 100644
82775 --- a/include/linux/vmstat.h
82776 +++ b/include/linux/vmstat.h
82777 @@ -98,18 +98,18 @@ static inline void vm_events_fold_cpu(int cpu)
82778 /*
82779 * Zone based page accounting with per cpu differentials.
82780 */
82781 -extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
82782 +extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
82783
82784 static inline void zone_page_state_add(long x, struct zone *zone,
82785 enum zone_stat_item item)
82786 {
82787 - atomic_long_add(x, &zone->vm_stat[item]);
82788 - atomic_long_add(x, &vm_stat[item]);
82789 + atomic_long_add_unchecked(x, &zone->vm_stat[item]);
82790 + atomic_long_add_unchecked(x, &vm_stat[item]);
82791 }
82792
82793 -static inline unsigned long global_page_state(enum zone_stat_item item)
82794 +static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
82795 {
82796 - long x = atomic_long_read(&vm_stat[item]);
82797 + long x = atomic_long_read_unchecked(&vm_stat[item]);
82798 #ifdef CONFIG_SMP
82799 if (x < 0)
82800 x = 0;
82801 @@ -117,10 +117,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
82802 return x;
82803 }
82804
82805 -static inline unsigned long zone_page_state(struct zone *zone,
82806 +static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
82807 enum zone_stat_item item)
82808 {
82809 - long x = atomic_long_read(&zone->vm_stat[item]);
82810 + long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
82811 #ifdef CONFIG_SMP
82812 if (x < 0)
82813 x = 0;
82814 @@ -137,7 +137,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
82815 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
82816 enum zone_stat_item item)
82817 {
82818 - long x = atomic_long_read(&zone->vm_stat[item]);
82819 + long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
82820
82821 #ifdef CONFIG_SMP
82822 int cpu;
82823 @@ -226,8 +226,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
82824
82825 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
82826 {
82827 - atomic_long_inc(&zone->vm_stat[item]);
82828 - atomic_long_inc(&vm_stat[item]);
82829 + atomic_long_inc_unchecked(&zone->vm_stat[item]);
82830 + atomic_long_inc_unchecked(&vm_stat[item]);
82831 }
82832
82833 static inline void __inc_zone_page_state(struct page *page,
82834 @@ -238,8 +238,8 @@ static inline void __inc_zone_page_state(struct page *page,
82835
82836 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
82837 {
82838 - atomic_long_dec(&zone->vm_stat[item]);
82839 - atomic_long_dec(&vm_stat[item]);
82840 + atomic_long_dec_unchecked(&zone->vm_stat[item]);
82841 + atomic_long_dec_unchecked(&vm_stat[item]);
82842 }
82843
82844 static inline void __dec_zone_page_state(struct page *page,
82845 diff --git a/include/linux/xattr.h b/include/linux/xattr.h
82846 index 91b0a68..0e9adf6 100644
82847 --- a/include/linux/xattr.h
82848 +++ b/include/linux/xattr.h
82849 @@ -28,7 +28,7 @@ struct xattr_handler {
82850 size_t size, int handler_flags);
82851 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
82852 size_t size, int flags, int handler_flags);
82853 -};
82854 +} __do_const;
82855
82856 struct xattr {
82857 const char *name;
82858 @@ -37,6 +37,9 @@ struct xattr {
82859 };
82860
82861 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
82862 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
82863 +ssize_t pax_getxattr(struct dentry *, void *, size_t);
82864 +#endif
82865 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
82866 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
82867 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
82868 diff --git a/include/linux/zlib.h b/include/linux/zlib.h
82869 index 9c5a6b4..09c9438 100644
82870 --- a/include/linux/zlib.h
82871 +++ b/include/linux/zlib.h
82872 @@ -31,6 +31,7 @@
82873 #define _ZLIB_H
82874
82875 #include <linux/zconf.h>
82876 +#include <linux/compiler.h>
82877
82878 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
82879 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
82880 @@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
82881
82882 /* basic functions */
82883
82884 -extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
82885 +extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
82886 /*
82887 Returns the number of bytes that needs to be allocated for a per-
82888 stream workspace with the specified parameters. A pointer to this
82889 diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
82890 index c768c9f..bdcaa5a 100644
82891 --- a/include/media/v4l2-dev.h
82892 +++ b/include/media/v4l2-dev.h
82893 @@ -76,7 +76,7 @@ struct v4l2_file_operations {
82894 int (*mmap) (struct file *, struct vm_area_struct *);
82895 int (*open) (struct file *);
82896 int (*release) (struct file *);
82897 -};
82898 +} __do_const;
82899
82900 /*
82901 * Newer version of video_device, handled by videodev2.c
82902 diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
82903 index c9b1593..a572459 100644
82904 --- a/include/media/v4l2-device.h
82905 +++ b/include/media/v4l2-device.h
82906 @@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
82907 this function returns 0. If the name ends with a digit (e.g. cx18),
82908 then the name will be set to cx18-0 since cx180 looks really odd. */
82909 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
82910 - atomic_t *instance);
82911 + atomic_unchecked_t *instance);
82912
82913 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
82914 Since the parent disappears this ensures that v4l2_dev doesn't have an
82915 diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
82916 index 9a36d92..0aafe2a 100644
82917 --- a/include/net/9p/transport.h
82918 +++ b/include/net/9p/transport.h
82919 @@ -60,7 +60,7 @@ struct p9_trans_module {
82920 int (*cancel) (struct p9_client *, struct p9_req_t *req);
82921 int (*zc_request)(struct p9_client *, struct p9_req_t *,
82922 char *, char *, int , int, int, int);
82923 -};
82924 +} __do_const;
82925
82926 void v9fs_register_trans(struct p9_trans_module *m);
82927 void v9fs_unregister_trans(struct p9_trans_module *m);
82928 diff --git a/include/net/af_unix.h b/include/net/af_unix.h
82929 index a175ba4..196eb82 100644
82930 --- a/include/net/af_unix.h
82931 +++ b/include/net/af_unix.h
82932 @@ -36,7 +36,7 @@ struct unix_skb_parms {
82933 u32 secid; /* Security ID */
82934 #endif
82935 u32 consumed;
82936 -};
82937 +} __randomize_layout;
82938
82939 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
82940 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
82941 diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
82942 index dbc4a89..4a59b5d 100644
82943 --- a/include/net/bluetooth/l2cap.h
82944 +++ b/include/net/bluetooth/l2cap.h
82945 @@ -600,7 +600,7 @@ struct l2cap_ops {
82946 long (*get_sndtimeo) (struct l2cap_chan *chan);
82947 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
82948 unsigned long len, int nb);
82949 -};
82950 +} __do_const;
82951
82952 struct l2cap_conn {
82953 struct hci_conn *hcon;
82954 diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
82955 index f2ae33d..c457cf0 100644
82956 --- a/include/net/caif/cfctrl.h
82957 +++ b/include/net/caif/cfctrl.h
82958 @@ -52,7 +52,7 @@ struct cfctrl_rsp {
82959 void (*radioset_rsp)(void);
82960 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
82961 struct cflayer *client_layer);
82962 -};
82963 +} __no_const;
82964
82965 /* Link Setup Parameters for CAIF-Links. */
82966 struct cfctrl_link_param {
82967 @@ -101,8 +101,8 @@ struct cfctrl_request_info {
82968 struct cfctrl {
82969 struct cfsrvl serv;
82970 struct cfctrl_rsp res;
82971 - atomic_t req_seq_no;
82972 - atomic_t rsp_seq_no;
82973 + atomic_unchecked_t req_seq_no;
82974 + atomic_unchecked_t rsp_seq_no;
82975 struct list_head list;
82976 /* Protects from simultaneous access to first_req list */
82977 spinlock_t info_list_lock;
82978 diff --git a/include/net/flow.h b/include/net/flow.h
82979 index d23e7fa..e188307 100644
82980 --- a/include/net/flow.h
82981 +++ b/include/net/flow.h
82982 @@ -221,6 +221,6 @@ struct flow_cache_object *flow_cache_lookup(struct net *net,
82983
82984 void flow_cache_flush(void);
82985 void flow_cache_flush_deferred(void);
82986 -extern atomic_t flow_cache_genid;
82987 +extern atomic_unchecked_t flow_cache_genid;
82988
82989 #endif
82990 diff --git a/include/net/genetlink.h b/include/net/genetlink.h
82991 index 93695f0..766d71c 100644
82992 --- a/include/net/genetlink.h
82993 +++ b/include/net/genetlink.h
82994 @@ -120,7 +120,7 @@ struct genl_ops {
82995 u8 cmd;
82996 u8 internal_flags;
82997 u8 flags;
82998 -};
82999 +} __do_const;
83000
83001 int __genl_register_family(struct genl_family *family);
83002
83003 diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
83004 index 734d9b5..48a9a4b 100644
83005 --- a/include/net/gro_cells.h
83006 +++ b/include/net/gro_cells.h
83007 @@ -29,7 +29,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
83008 cell += skb_get_rx_queue(skb) & gcells->gro_cells_mask;
83009
83010 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
83011 - atomic_long_inc(&dev->rx_dropped);
83012 + atomic_long_inc_unchecked(&dev->rx_dropped);
83013 kfree_skb(skb);
83014 return;
83015 }
83016 diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
83017 index c55aeed..b3393f4 100644
83018 --- a/include/net/inet_connection_sock.h
83019 +++ b/include/net/inet_connection_sock.h
83020 @@ -62,7 +62,7 @@ struct inet_connection_sock_af_ops {
83021 void (*addr2sockaddr)(struct sock *sk, struct sockaddr *);
83022 int (*bind_conflict)(const struct sock *sk,
83023 const struct inet_bind_bucket *tb, bool relax);
83024 -};
83025 +} __do_const;
83026
83027 /** inet_connection_sock - INET connection oriented sock
83028 *
83029 diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
83030 index 6efe73c..fa94270 100644
83031 --- a/include/net/inetpeer.h
83032 +++ b/include/net/inetpeer.h
83033 @@ -47,8 +47,8 @@ struct inet_peer {
83034 */
83035 union {
83036 struct {
83037 - atomic_t rid; /* Frag reception counter */
83038 - atomic_t ip_id_count; /* IP ID for the next packet */
83039 + atomic_unchecked_t rid; /* Frag reception counter */
83040 + atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
83041 };
83042 struct rcu_head rcu;
83043 struct inet_peer *gc_next;
83044 @@ -177,16 +177,13 @@ static inline void inet_peer_refcheck(const struct inet_peer *p)
83045 /* can be called with or without local BH being disabled */
83046 static inline int inet_getid(struct inet_peer *p, int more)
83047 {
83048 - int old, new;
83049 + int id;
83050 more++;
83051 inet_peer_refcheck(p);
83052 - do {
83053 - old = atomic_read(&p->ip_id_count);
83054 - new = old + more;
83055 - if (!new)
83056 - new = 1;
83057 - } while (atomic_cmpxchg(&p->ip_id_count, old, new) != old);
83058 - return new;
83059 + id = atomic_add_return_unchecked(more, &p->ip_id_count);
83060 + if (!id)
83061 + id = atomic_inc_return_unchecked(&p->ip_id_count);
83062 + return id;
83063 }
83064
83065 #endif /* _NET_INETPEER_H */
83066 diff --git a/include/net/ip.h b/include/net/ip.h
83067 index 23be0fd..0cb3e2c 100644
83068 --- a/include/net/ip.h
83069 +++ b/include/net/ip.h
83070 @@ -214,7 +214,7 @@ static inline void snmp_mib_free(void __percpu *ptr[SNMP_ARRAY_SZ])
83071
83072 void inet_get_local_port_range(struct net *net, int *low, int *high);
83073
83074 -extern unsigned long *sysctl_local_reserved_ports;
83075 +extern unsigned long sysctl_local_reserved_ports[65536 / 8 / sizeof(unsigned long)];
83076 static inline int inet_is_reserved_local_port(int port)
83077 {
83078 return test_bit(port, sysctl_local_reserved_ports);
83079 diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
83080 index 9922093..a1755d6 100644
83081 --- a/include/net/ip_fib.h
83082 +++ b/include/net/ip_fib.h
83083 @@ -169,7 +169,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
83084
83085 #define FIB_RES_SADDR(net, res) \
83086 ((FIB_RES_NH(res).nh_saddr_genid == \
83087 - atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
83088 + atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
83089 FIB_RES_NH(res).nh_saddr : \
83090 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
83091 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
83092 diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
83093 index 5679d92..2e7a690 100644
83094 --- a/include/net/ip_vs.h
83095 +++ b/include/net/ip_vs.h
83096 @@ -558,7 +558,7 @@ struct ip_vs_conn {
83097 struct ip_vs_conn *control; /* Master control connection */
83098 atomic_t n_control; /* Number of controlled ones */
83099 struct ip_vs_dest *dest; /* real server */
83100 - atomic_t in_pkts; /* incoming packet counter */
83101 + atomic_unchecked_t in_pkts; /* incoming packet counter */
83102
83103 /* packet transmitter for different forwarding methods. If it
83104 mangles the packet, it must return NF_DROP or better NF_STOLEN,
83105 @@ -705,7 +705,7 @@ struct ip_vs_dest {
83106 __be16 port; /* port number of the server */
83107 union nf_inet_addr addr; /* IP address of the server */
83108 volatile unsigned int flags; /* dest status flags */
83109 - atomic_t conn_flags; /* flags to copy to conn */
83110 + atomic_unchecked_t conn_flags; /* flags to copy to conn */
83111 atomic_t weight; /* server weight */
83112
83113 atomic_t refcnt; /* reference counter */
83114 @@ -960,11 +960,11 @@ struct netns_ipvs {
83115 /* ip_vs_lblc */
83116 int sysctl_lblc_expiration;
83117 struct ctl_table_header *lblc_ctl_header;
83118 - struct ctl_table *lblc_ctl_table;
83119 + ctl_table_no_const *lblc_ctl_table;
83120 /* ip_vs_lblcr */
83121 int sysctl_lblcr_expiration;
83122 struct ctl_table_header *lblcr_ctl_header;
83123 - struct ctl_table *lblcr_ctl_table;
83124 + ctl_table_no_const *lblcr_ctl_table;
83125 /* ip_vs_est */
83126 struct list_head est_list; /* estimator list */
83127 spinlock_t est_lock;
83128 diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
83129 index 8d4f588..2e37ad2 100644
83130 --- a/include/net/irda/ircomm_tty.h
83131 +++ b/include/net/irda/ircomm_tty.h
83132 @@ -33,6 +33,7 @@
83133 #include <linux/termios.h>
83134 #include <linux/timer.h>
83135 #include <linux/tty.h> /* struct tty_struct */
83136 +#include <asm/local.h>
83137
83138 #include <net/irda/irias_object.h>
83139 #include <net/irda/ircomm_core.h>
83140 diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
83141 index 714cc9a..ea05f3e 100644
83142 --- a/include/net/iucv/af_iucv.h
83143 +++ b/include/net/iucv/af_iucv.h
83144 @@ -149,7 +149,7 @@ struct iucv_skb_cb {
83145 struct iucv_sock_list {
83146 struct hlist_head head;
83147 rwlock_t lock;
83148 - atomic_t autobind_name;
83149 + atomic_unchecked_t autobind_name;
83150 };
83151
83152 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
83153 diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
83154 index f3be818..bf46196 100644
83155 --- a/include/net/llc_c_ac.h
83156 +++ b/include/net/llc_c_ac.h
83157 @@ -87,7 +87,7 @@
83158 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
83159 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
83160
83161 -typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
83162 +typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
83163
83164 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
83165 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
83166 diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
83167 index 3948cf1..83b28c4 100644
83168 --- a/include/net/llc_c_ev.h
83169 +++ b/include/net/llc_c_ev.h
83170 @@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
83171 return (struct llc_conn_state_ev *)skb->cb;
83172 }
83173
83174 -typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
83175 -typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
83176 +typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
83177 +typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
83178
83179 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
83180 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
83181 diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
83182 index 0e79cfb..f46db31 100644
83183 --- a/include/net/llc_c_st.h
83184 +++ b/include/net/llc_c_st.h
83185 @@ -37,7 +37,7 @@ struct llc_conn_state_trans {
83186 u8 next_state;
83187 llc_conn_ev_qfyr_t *ev_qualifiers;
83188 llc_conn_action_t *ev_actions;
83189 -};
83190 +} __do_const;
83191
83192 struct llc_conn_state {
83193 u8 current_state;
83194 diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
83195 index a61b98c..aade1eb 100644
83196 --- a/include/net/llc_s_ac.h
83197 +++ b/include/net/llc_s_ac.h
83198 @@ -23,7 +23,7 @@
83199 #define SAP_ACT_TEST_IND 9
83200
83201 /* All action functions must look like this */
83202 -typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
83203 +typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
83204
83205 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
83206 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
83207 diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
83208 index 567c681..cd73ac0 100644
83209 --- a/include/net/llc_s_st.h
83210 +++ b/include/net/llc_s_st.h
83211 @@ -20,7 +20,7 @@ struct llc_sap_state_trans {
83212 llc_sap_ev_t ev;
83213 u8 next_state;
83214 llc_sap_action_t *ev_actions;
83215 -};
83216 +} __do_const;
83217
83218 struct llc_sap_state {
83219 u8 curr_state;
83220 diff --git a/include/net/mac80211.h b/include/net/mac80211.h
83221 index f4ab2fb..71a85ba 100644
83222 --- a/include/net/mac80211.h
83223 +++ b/include/net/mac80211.h
83224 @@ -4476,7 +4476,7 @@ struct rate_control_ops {
83225 void (*add_sta_debugfs)(void *priv, void *priv_sta,
83226 struct dentry *dir);
83227 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
83228 -};
83229 +} __do_const;
83230
83231 static inline int rate_supported(struct ieee80211_sta *sta,
83232 enum ieee80211_band band,
83233 diff --git a/include/net/neighbour.h b/include/net/neighbour.h
83234 index 7277caf..fd095bc 100644
83235 --- a/include/net/neighbour.h
83236 +++ b/include/net/neighbour.h
83237 @@ -163,7 +163,7 @@ struct neigh_ops {
83238 void (*error_report)(struct neighbour *, struct sk_buff *);
83239 int (*output)(struct neighbour *, struct sk_buff *);
83240 int (*connected_output)(struct neighbour *, struct sk_buff *);
83241 -};
83242 +} __do_const;
83243
83244 struct pneigh_entry {
83245 struct pneigh_entry *next;
83246 @@ -203,7 +203,6 @@ struct neigh_table {
83247 void (*proxy_redo)(struct sk_buff *skb);
83248 char *id;
83249 struct neigh_parms parms;
83250 - /* HACK. gc_* should follow parms without a gap! */
83251 int gc_interval;
83252 int gc_thresh1;
83253 int gc_thresh2;
83254 @@ -218,7 +217,7 @@ struct neigh_table {
83255 struct neigh_statistics __percpu *stats;
83256 struct neigh_hash_table __rcu *nht;
83257 struct pneigh_entry **phash_buckets;
83258 -};
83259 +} __randomize_layout;
83260
83261 static inline int neigh_parms_family(struct neigh_parms *p)
83262 {
83263 diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
83264 index 991dcd9..ab58d00 100644
83265 --- a/include/net/net_namespace.h
83266 +++ b/include/net/net_namespace.h
83267 @@ -124,8 +124,8 @@ struct net {
83268 struct netns_ipvs *ipvs;
83269 #endif
83270 struct sock *diag_nlsk;
83271 - atomic_t fnhe_genid;
83272 -};
83273 + atomic_unchecked_t fnhe_genid;
83274 +} __randomize_layout;
83275
83276 /*
83277 * ifindex generation is per-net namespace, and loopback is
83278 @@ -289,7 +289,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
83279 #define __net_init __init
83280 #define __net_exit __exit_refok
83281 #define __net_initdata __initdata
83282 +#ifdef CONSTIFY_PLUGIN
83283 #define __net_initconst __initconst
83284 +#else
83285 +#define __net_initconst __initdata
83286 +#endif
83287 #endif
83288
83289 struct pernet_operations {
83290 @@ -299,7 +303,7 @@ struct pernet_operations {
83291 void (*exit_batch)(struct list_head *net_exit_list);
83292 int *id;
83293 size_t size;
83294 -};
83295 +} __do_const;
83296
83297 /*
83298 * Use these carefully. If you implement a network device and it
83299 @@ -347,23 +351,23 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
83300
83301 static inline int rt_genid_ipv4(struct net *net)
83302 {
83303 - return atomic_read(&net->ipv4.rt_genid);
83304 + return atomic_read_unchecked(&net->ipv4.rt_genid);
83305 }
83306
83307 static inline void rt_genid_bump_ipv4(struct net *net)
83308 {
83309 - atomic_inc(&net->ipv4.rt_genid);
83310 + atomic_inc_unchecked(&net->ipv4.rt_genid);
83311 }
83312
83313 #if IS_ENABLED(CONFIG_IPV6)
83314 static inline int rt_genid_ipv6(struct net *net)
83315 {
83316 - return atomic_read(&net->ipv6.rt_genid);
83317 + return atomic_read_unchecked(&net->ipv6.rt_genid);
83318 }
83319
83320 static inline void rt_genid_bump_ipv6(struct net *net)
83321 {
83322 - atomic_inc(&net->ipv6.rt_genid);
83323 + atomic_inc_unchecked(&net->ipv6.rt_genid);
83324 }
83325 #else
83326 static inline int rt_genid_ipv6(struct net *net)
83327 @@ -385,12 +389,12 @@ static inline void rt_genid_bump_all(struct net *net)
83328
83329 static inline int fnhe_genid(struct net *net)
83330 {
83331 - return atomic_read(&net->fnhe_genid);
83332 + return atomic_read_unchecked(&net->fnhe_genid);
83333 }
83334
83335 static inline void fnhe_genid_bump(struct net *net)
83336 {
83337 - atomic_inc(&net->fnhe_genid);
83338 + atomic_inc_unchecked(&net->fnhe_genid);
83339 }
83340
83341 #endif /* __NET_NET_NAMESPACE_H */
83342 diff --git a/include/net/netdma.h b/include/net/netdma.h
83343 index 8ba8ce2..99b7fff 100644
83344 --- a/include/net/netdma.h
83345 +++ b/include/net/netdma.h
83346 @@ -24,7 +24,7 @@
83347 #include <linux/dmaengine.h>
83348 #include <linux/skbuff.h>
83349
83350 -int dma_skb_copy_datagram_iovec(struct dma_chan* chan,
83351 +int __intentional_overflow(3,5) dma_skb_copy_datagram_iovec(struct dma_chan* chan,
83352 struct sk_buff *skb, int offset, struct iovec *to,
83353 size_t len, struct dma_pinned_list *pinned_list);
83354
83355 diff --git a/include/net/netfilter/nf_conntrack_extend.h b/include/net/netfilter/nf_conntrack_extend.h
83356 index 956b175..55d1504 100644
83357 --- a/include/net/netfilter/nf_conntrack_extend.h
83358 +++ b/include/net/netfilter/nf_conntrack_extend.h
83359 @@ -47,8 +47,8 @@ enum nf_ct_ext_id {
83360 /* Extensions: optional stuff which isn't permanently in struct. */
83361 struct nf_ct_ext {
83362 struct rcu_head rcu;
83363 - u8 offset[NF_CT_EXT_NUM];
83364 - u8 len;
83365 + u16 offset[NF_CT_EXT_NUM];
83366 + u16 len;
83367 char data[0];
83368 };
83369
83370 diff --git a/include/net/netlink.h b/include/net/netlink.h
83371 index 2b47eaa..6d5bcc2 100644
83372 --- a/include/net/netlink.h
83373 +++ b/include/net/netlink.h
83374 @@ -521,7 +521,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
83375 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
83376 {
83377 if (mark)
83378 - skb_trim(skb, (unsigned char *) mark - skb->data);
83379 + skb_trim(skb, (const unsigned char *) mark - skb->data);
83380 }
83381
83382 /**
83383 diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
83384 index fbcc7fa..03c7e51 100644
83385 --- a/include/net/netns/conntrack.h
83386 +++ b/include/net/netns/conntrack.h
83387 @@ -12,10 +12,10 @@ struct nf_conntrack_ecache;
83388 struct nf_proto_net {
83389 #ifdef CONFIG_SYSCTL
83390 struct ctl_table_header *ctl_table_header;
83391 - struct ctl_table *ctl_table;
83392 + ctl_table_no_const *ctl_table;
83393 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
83394 struct ctl_table_header *ctl_compat_header;
83395 - struct ctl_table *ctl_compat_table;
83396 + ctl_table_no_const *ctl_compat_table;
83397 #endif
83398 #endif
83399 unsigned int users;
83400 @@ -58,7 +58,7 @@ struct nf_ip_net {
83401 struct nf_icmp_net icmpv6;
83402 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
83403 struct ctl_table_header *ctl_table_header;
83404 - struct ctl_table *ctl_table;
83405 + ctl_table_no_const *ctl_table;
83406 #endif
83407 };
83408
83409 diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
83410 index 80f500a..f0c23c2 100644
83411 --- a/include/net/netns/ipv4.h
83412 +++ b/include/net/netns/ipv4.h
83413 @@ -74,7 +74,7 @@ struct netns_ipv4 {
83414
83415 kgid_t sysctl_ping_group_range[2];
83416
83417 - atomic_t dev_addr_genid;
83418 + atomic_unchecked_t dev_addr_genid;
83419
83420 #ifdef CONFIG_IP_MROUTE
83421 #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
83422 @@ -84,6 +84,6 @@ struct netns_ipv4 {
83423 struct fib_rules_ops *mr_rules_ops;
83424 #endif
83425 #endif
83426 - atomic_t rt_genid;
83427 + atomic_unchecked_t rt_genid;
83428 };
83429 #endif
83430 diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
83431 index 21edaf1..4c5faae 100644
83432 --- a/include/net/netns/ipv6.h
83433 +++ b/include/net/netns/ipv6.h
83434 @@ -73,8 +73,8 @@ struct netns_ipv6 {
83435 struct fib_rules_ops *mr6_rules_ops;
83436 #endif
83437 #endif
83438 - atomic_t dev_addr_genid;
83439 - atomic_t rt_genid;
83440 + atomic_unchecked_t dev_addr_genid;
83441 + atomic_unchecked_t rt_genid;
83442 };
83443
83444 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
83445 diff --git a/include/net/ping.h b/include/net/ping.h
83446 index 026479b..d9b2829 100644
83447 --- a/include/net/ping.h
83448 +++ b/include/net/ping.h
83449 @@ -54,7 +54,7 @@ struct ping_iter_state {
83450
83451 extern struct proto ping_prot;
83452 #if IS_ENABLED(CONFIG_IPV6)
83453 -extern struct pingv6_ops pingv6_ops;
83454 +extern struct pingv6_ops *pingv6_ops;
83455 #endif
83456
83457 struct pingfakehdr {
83458 diff --git a/include/net/protocol.h b/include/net/protocol.h
83459 index a7e986b..dc67bce 100644
83460 --- a/include/net/protocol.h
83461 +++ b/include/net/protocol.h
83462 @@ -49,7 +49,7 @@ struct net_protocol {
83463 * socket lookup?
83464 */
83465 icmp_strict_tag_validation:1;
83466 -};
83467 +} __do_const;
83468
83469 #if IS_ENABLED(CONFIG_IPV6)
83470 struct inet6_protocol {
83471 @@ -62,7 +62,7 @@ struct inet6_protocol {
83472 u8 type, u8 code, int offset,
83473 __be32 info);
83474 unsigned int flags; /* INET6_PROTO_xxx */
83475 -};
83476 +} __do_const;
83477
83478 #define INET6_PROTO_NOPOLICY 0x1
83479 #define INET6_PROTO_FINAL 0x2
83480 diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
83481 index 661e45d..54c39df 100644
83482 --- a/include/net/rtnetlink.h
83483 +++ b/include/net/rtnetlink.h
83484 @@ -93,7 +93,7 @@ struct rtnl_link_ops {
83485 int (*fill_slave_info)(struct sk_buff *skb,
83486 const struct net_device *dev,
83487 const struct net_device *slave_dev);
83488 -};
83489 +} __do_const;
83490
83491 int __rtnl_link_register(struct rtnl_link_ops *ops);
83492 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
83493 diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
83494 index 4a5b9a3..ca27d73 100644
83495 --- a/include/net/sctp/checksum.h
83496 +++ b/include/net/sctp/checksum.h
83497 @@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
83498 unsigned int offset)
83499 {
83500 struct sctphdr *sh = sctp_hdr(skb);
83501 - __le32 ret, old = sh->checksum;
83502 - const struct skb_checksum_ops ops = {
83503 + __le32 ret, old = sh->checksum;
83504 + static const struct skb_checksum_ops ops = {
83505 .update = sctp_csum_update,
83506 .combine = sctp_csum_combine,
83507 };
83508 diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
83509 index 7f4eeb3..37e8fe1 100644
83510 --- a/include/net/sctp/sm.h
83511 +++ b/include/net/sctp/sm.h
83512 @@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
83513 typedef struct {
83514 sctp_state_fn_t *fn;
83515 const char *name;
83516 -} sctp_sm_table_entry_t;
83517 +} __do_const sctp_sm_table_entry_t;
83518
83519 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
83520 * currently in use.
83521 @@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
83522 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
83523
83524 /* Extern declarations for major data structures. */
83525 -extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
83526 +extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
83527
83528
83529 /* Get the size of a DATA chunk payload. */
83530 diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
83531 index 6ee76c8..45f2609 100644
83532 --- a/include/net/sctp/structs.h
83533 +++ b/include/net/sctp/structs.h
83534 @@ -507,7 +507,7 @@ struct sctp_pf {
83535 struct sctp_association *asoc);
83536 void (*addr_v4map) (struct sctp_sock *, union sctp_addr *);
83537 struct sctp_af *af;
83538 -};
83539 +} __do_const;
83540
83541
83542 /* Structure to track chunk fragments that have been acked, but peer
83543 diff --git a/include/net/sock.h b/include/net/sock.h
83544 index b9586a1..b2948c0 100644
83545 --- a/include/net/sock.h
83546 +++ b/include/net/sock.h
83547 @@ -348,7 +348,7 @@ struct sock {
83548 unsigned int sk_napi_id;
83549 unsigned int sk_ll_usec;
83550 #endif
83551 - atomic_t sk_drops;
83552 + atomic_unchecked_t sk_drops;
83553 int sk_rcvbuf;
83554
83555 struct sk_filter __rcu *sk_filter;
83556 @@ -1036,7 +1036,7 @@ struct proto {
83557 void (*destroy_cgroup)(struct mem_cgroup *memcg);
83558 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
83559 #endif
83560 -};
83561 +} __randomize_layout;
83562
83563 /*
83564 * Bits in struct cg_proto.flags
83565 @@ -1223,7 +1223,7 @@ static inline u64 memcg_memory_allocated_read(struct cg_proto *prot)
83566 return ret >> PAGE_SHIFT;
83567 }
83568
83569 -static inline long
83570 +static inline long __intentional_overflow(-1)
83571 sk_memory_allocated(const struct sock *sk)
83572 {
83573 struct proto *prot = sk->sk_prot;
83574 @@ -1368,7 +1368,7 @@ struct sock_iocb {
83575 struct scm_cookie *scm;
83576 struct msghdr *msg, async_msg;
83577 struct kiocb *kiocb;
83578 -};
83579 +} __randomize_layout;
83580
83581 static inline struct sock_iocb *kiocb_to_siocb(struct kiocb *iocb)
83582 {
83583 @@ -1830,7 +1830,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
83584 }
83585
83586 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
83587 - char __user *from, char *to,
83588 + char __user *from, unsigned char *to,
83589 int copy, int offset)
83590 {
83591 if (skb->ip_summed == CHECKSUM_NONE) {
83592 @@ -2092,7 +2092,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
83593 }
83594 }
83595
83596 -struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
83597 +struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
83598
83599 /**
83600 * sk_page_frag - return an appropriate page_frag
83601 diff --git a/include/net/tcp.h b/include/net/tcp.h
83602 index 743acce..44a58b0 100644
83603 --- a/include/net/tcp.h
83604 +++ b/include/net/tcp.h
83605 @@ -541,7 +541,7 @@ void tcp_retransmit_timer(struct sock *sk);
83606 void tcp_xmit_retransmit_queue(struct sock *);
83607 void tcp_simple_retransmit(struct sock *);
83608 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
83609 -int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
83610 +int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
83611
83612 void tcp_send_probe0(struct sock *);
83613 void tcp_send_partial(struct sock *);
83614 @@ -710,8 +710,8 @@ struct tcp_skb_cb {
83615 struct inet6_skb_parm h6;
83616 #endif
83617 } header; /* For incoming frames */
83618 - __u32 seq; /* Starting sequence number */
83619 - __u32 end_seq; /* SEQ + FIN + SYN + datalen */
83620 + __u32 seq __intentional_overflow(0); /* Starting sequence number */
83621 + __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
83622 __u32 when; /* used to compute rtt's */
83623 __u8 tcp_flags; /* TCP header flags. (tcp[13]) */
83624
83625 @@ -725,7 +725,7 @@ struct tcp_skb_cb {
83626
83627 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
83628 /* 1 byte hole */
83629 - __u32 ack_seq; /* Sequence number ACK'd */
83630 + __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
83631 };
83632
83633 #define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0]))
83634 diff --git a/include/net/xfrm.h b/include/net/xfrm.h
83635 index fb5654a..4457522 100644
83636 --- a/include/net/xfrm.h
83637 +++ b/include/net/xfrm.h
83638 @@ -286,7 +286,6 @@ struct xfrm_dst;
83639 struct xfrm_policy_afinfo {
83640 unsigned short family;
83641 struct dst_ops *dst_ops;
83642 - void (*garbage_collect)(struct net *net);
83643 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
83644 const xfrm_address_t *saddr,
83645 const xfrm_address_t *daddr);
83646 @@ -304,7 +303,7 @@ struct xfrm_policy_afinfo {
83647 struct net_device *dev,
83648 const struct flowi *fl);
83649 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
83650 -};
83651 +} __do_const;
83652
83653 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
83654 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
83655 @@ -343,7 +342,7 @@ struct xfrm_state_afinfo {
83656 int (*transport_finish)(struct sk_buff *skb,
83657 int async);
83658 void (*local_error)(struct sk_buff *skb, u32 mtu);
83659 -};
83660 +} __do_const;
83661
83662 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
83663 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
83664 @@ -428,7 +427,7 @@ struct xfrm_mode {
83665 struct module *owner;
83666 unsigned int encap;
83667 int flags;
83668 -};
83669 +} __do_const;
83670
83671 /* Flags for xfrm_mode. */
83672 enum {
83673 @@ -525,7 +524,7 @@ struct xfrm_policy {
83674 struct timer_list timer;
83675
83676 struct flow_cache_object flo;
83677 - atomic_t genid;
83678 + atomic_unchecked_t genid;
83679 u32 priority;
83680 u32 index;
83681 struct xfrm_mark mark;
83682 @@ -1165,6 +1164,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
83683 }
83684
83685 void xfrm_garbage_collect(struct net *net);
83686 +void xfrm_garbage_collect_deferred(struct net *net);
83687
83688 #else
83689
83690 @@ -1203,6 +1203,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
83691 static inline void xfrm_garbage_collect(struct net *net)
83692 {
83693 }
83694 +static inline void xfrm_garbage_collect_deferred(struct net *net)
83695 +{
83696 +}
83697 #endif
83698
83699 static __inline__
83700 diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
83701 index 1017e0b..227aa4d 100644
83702 --- a/include/rdma/iw_cm.h
83703 +++ b/include/rdma/iw_cm.h
83704 @@ -122,7 +122,7 @@ struct iw_cm_verbs {
83705 int backlog);
83706
83707 int (*destroy_listen)(struct iw_cm_id *cm_id);
83708 -};
83709 +} __no_const;
83710
83711 /**
83712 * iw_create_cm_id - Create an IW CM identifier.
83713 diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
83714 index 52beadf..598734c 100644
83715 --- a/include/scsi/libfc.h
83716 +++ b/include/scsi/libfc.h
83717 @@ -771,6 +771,7 @@ struct libfc_function_template {
83718 */
83719 void (*disc_stop_final) (struct fc_lport *);
83720 };
83721 +typedef struct libfc_function_template __no_const libfc_function_template_no_const;
83722
83723 /**
83724 * struct fc_disc - Discovery context
83725 @@ -875,7 +876,7 @@ struct fc_lport {
83726 struct fc_vport *vport;
83727
83728 /* Operational Information */
83729 - struct libfc_function_template tt;
83730 + libfc_function_template_no_const tt;
83731 u8 link_up;
83732 u8 qfull;
83733 enum fc_lport_state state;
83734 diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
83735 index d65fbec..f80fef2 100644
83736 --- a/include/scsi/scsi_device.h
83737 +++ b/include/scsi/scsi_device.h
83738 @@ -180,9 +180,9 @@ struct scsi_device {
83739 unsigned int max_device_blocked; /* what device_blocked counts down from */
83740 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
83741
83742 - atomic_t iorequest_cnt;
83743 - atomic_t iodone_cnt;
83744 - atomic_t ioerr_cnt;
83745 + atomic_unchecked_t iorequest_cnt;
83746 + atomic_unchecked_t iodone_cnt;
83747 + atomic_unchecked_t ioerr_cnt;
83748
83749 struct device sdev_gendev,
83750 sdev_dev;
83751 diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
83752 index b797e8f..8e2c3aa 100644
83753 --- a/include/scsi/scsi_transport_fc.h
83754 +++ b/include/scsi/scsi_transport_fc.h
83755 @@ -751,7 +751,8 @@ struct fc_function_template {
83756 unsigned long show_host_system_hostname:1;
83757
83758 unsigned long disable_target_scan:1;
83759 -};
83760 +} __do_const;
83761 +typedef struct fc_function_template __no_const fc_function_template_no_const;
83762
83763
83764 /**
83765 diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
83766 index ae6c3b8..fd748ac 100644
83767 --- a/include/sound/compress_driver.h
83768 +++ b/include/sound/compress_driver.h
83769 @@ -128,7 +128,7 @@ struct snd_compr_ops {
83770 struct snd_compr_caps *caps);
83771 int (*get_codec_caps) (struct snd_compr_stream *stream,
83772 struct snd_compr_codec_caps *codec);
83773 -};
83774 +} __no_const;
83775
83776 /**
83777 * struct snd_compr: Compressed device
83778 diff --git a/include/sound/soc.h b/include/sound/soc.h
83779 index 9a00147..d814573 100644
83780 --- a/include/sound/soc.h
83781 +++ b/include/sound/soc.h
83782 @@ -770,7 +770,7 @@ struct snd_soc_codec_driver {
83783 /* probe ordering - for components with runtime dependencies */
83784 int probe_order;
83785 int remove_order;
83786 -};
83787 +} __do_const;
83788
83789 /* SoC platform interface */
83790 struct snd_soc_platform_driver {
83791 @@ -816,7 +816,7 @@ struct snd_soc_platform_driver {
83792 unsigned int (*read)(struct snd_soc_platform *, unsigned int);
83793 int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
83794 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
83795 -};
83796 +} __do_const;
83797
83798 struct snd_soc_platform {
83799 const char *name;
83800 diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
83801 index 1772fad..282e3e2 100644
83802 --- a/include/target/target_core_base.h
83803 +++ b/include/target/target_core_base.h
83804 @@ -754,7 +754,7 @@ struct se_device {
83805 atomic_long_t write_bytes;
83806 /* Active commands on this virtual SE device */
83807 atomic_t simple_cmds;
83808 - atomic_t dev_ordered_id;
83809 + atomic_unchecked_t dev_ordered_id;
83810 atomic_t dev_ordered_sync;
83811 atomic_t dev_qf_count;
83812 int export_count;
83813 diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
83814 new file mode 100644
83815 index 0000000..fb634b7
83816 --- /dev/null
83817 +++ b/include/trace/events/fs.h
83818 @@ -0,0 +1,53 @@
83819 +#undef TRACE_SYSTEM
83820 +#define TRACE_SYSTEM fs
83821 +
83822 +#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
83823 +#define _TRACE_FS_H
83824 +
83825 +#include <linux/fs.h>
83826 +#include <linux/tracepoint.h>
83827 +
83828 +TRACE_EVENT(do_sys_open,
83829 +
83830 + TP_PROTO(const char *filename, int flags, int mode),
83831 +
83832 + TP_ARGS(filename, flags, mode),
83833 +
83834 + TP_STRUCT__entry(
83835 + __string( filename, filename )
83836 + __field( int, flags )
83837 + __field( int, mode )
83838 + ),
83839 +
83840 + TP_fast_assign(
83841 + __assign_str(filename, filename);
83842 + __entry->flags = flags;
83843 + __entry->mode = mode;
83844 + ),
83845 +
83846 + TP_printk("\"%s\" %x %o",
83847 + __get_str(filename), __entry->flags, __entry->mode)
83848 +);
83849 +
83850 +TRACE_EVENT(open_exec,
83851 +
83852 + TP_PROTO(const char *filename),
83853 +
83854 + TP_ARGS(filename),
83855 +
83856 + TP_STRUCT__entry(
83857 + __string( filename, filename )
83858 + ),
83859 +
83860 + TP_fast_assign(
83861 + __assign_str(filename, filename);
83862 + ),
83863 +
83864 + TP_printk("\"%s\"",
83865 + __get_str(filename))
83866 +);
83867 +
83868 +#endif /* _TRACE_FS_H */
83869 +
83870 +/* This part must be outside protection */
83871 +#include <trace/define_trace.h>
83872 diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
83873 index 1c09820..7f5ec79 100644
83874 --- a/include/trace/events/irq.h
83875 +++ b/include/trace/events/irq.h
83876 @@ -36,7 +36,7 @@ struct softirq_action;
83877 */
83878 TRACE_EVENT(irq_handler_entry,
83879
83880 - TP_PROTO(int irq, struct irqaction *action),
83881 + TP_PROTO(int irq, const struct irqaction *action),
83882
83883 TP_ARGS(irq, action),
83884
83885 @@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
83886 */
83887 TRACE_EVENT(irq_handler_exit,
83888
83889 - TP_PROTO(int irq, struct irqaction *action, int ret),
83890 + TP_PROTO(int irq, const struct irqaction *action, int ret),
83891
83892 TP_ARGS(irq, action, ret),
83893
83894 diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
83895 index 7caf44c..23c6f27 100644
83896 --- a/include/uapi/linux/a.out.h
83897 +++ b/include/uapi/linux/a.out.h
83898 @@ -39,6 +39,14 @@ enum machine_type {
83899 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
83900 };
83901
83902 +/* Constants for the N_FLAGS field */
83903 +#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
83904 +#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
83905 +#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
83906 +#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
83907 +/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
83908 +#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
83909 +
83910 #if !defined (N_MAGIC)
83911 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
83912 #endif
83913 diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
83914 index 22b6ad3..aeba37e 100644
83915 --- a/include/uapi/linux/bcache.h
83916 +++ b/include/uapi/linux/bcache.h
83917 @@ -5,6 +5,7 @@
83918 * Bcache on disk data structures
83919 */
83920
83921 +#include <linux/compiler.h>
83922 #include <asm/types.h>
83923
83924 #define BITMASK(name, type, field, offset, size) \
83925 @@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
83926 /* Btree keys - all units are in sectors */
83927
83928 struct bkey {
83929 - __u64 high;
83930 - __u64 low;
83931 + __u64 high __intentional_overflow(-1);
83932 + __u64 low __intentional_overflow(-1);
83933 __u64 ptr[];
83934 };
83935
83936 diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
83937 index d876736..ccce5c0 100644
83938 --- a/include/uapi/linux/byteorder/little_endian.h
83939 +++ b/include/uapi/linux/byteorder/little_endian.h
83940 @@ -42,51 +42,51 @@
83941
83942 static inline __le64 __cpu_to_le64p(const __u64 *p)
83943 {
83944 - return (__force __le64)*p;
83945 + return (__force const __le64)*p;
83946 }
83947 -static inline __u64 __le64_to_cpup(const __le64 *p)
83948 +static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
83949 {
83950 - return (__force __u64)*p;
83951 + return (__force const __u64)*p;
83952 }
83953 static inline __le32 __cpu_to_le32p(const __u32 *p)
83954 {
83955 - return (__force __le32)*p;
83956 + return (__force const __le32)*p;
83957 }
83958 static inline __u32 __le32_to_cpup(const __le32 *p)
83959 {
83960 - return (__force __u32)*p;
83961 + return (__force const __u32)*p;
83962 }
83963 static inline __le16 __cpu_to_le16p(const __u16 *p)
83964 {
83965 - return (__force __le16)*p;
83966 + return (__force const __le16)*p;
83967 }
83968 static inline __u16 __le16_to_cpup(const __le16 *p)
83969 {
83970 - return (__force __u16)*p;
83971 + return (__force const __u16)*p;
83972 }
83973 static inline __be64 __cpu_to_be64p(const __u64 *p)
83974 {
83975 - return (__force __be64)__swab64p(p);
83976 + return (__force const __be64)__swab64p(p);
83977 }
83978 static inline __u64 __be64_to_cpup(const __be64 *p)
83979 {
83980 - return __swab64p((__u64 *)p);
83981 + return __swab64p((const __u64 *)p);
83982 }
83983 static inline __be32 __cpu_to_be32p(const __u32 *p)
83984 {
83985 - return (__force __be32)__swab32p(p);
83986 + return (__force const __be32)__swab32p(p);
83987 }
83988 -static inline __u32 __be32_to_cpup(const __be32 *p)
83989 +static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
83990 {
83991 - return __swab32p((__u32 *)p);
83992 + return __swab32p((const __u32 *)p);
83993 }
83994 static inline __be16 __cpu_to_be16p(const __u16 *p)
83995 {
83996 - return (__force __be16)__swab16p(p);
83997 + return (__force const __be16)__swab16p(p);
83998 }
83999 static inline __u16 __be16_to_cpup(const __be16 *p)
84000 {
84001 - return __swab16p((__u16 *)p);
84002 + return __swab16p((const __u16 *)p);
84003 }
84004 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
84005 #define __le64_to_cpus(x) do { (void)(x); } while (0)
84006 diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
84007 index ef6103b..d4e65dd 100644
84008 --- a/include/uapi/linux/elf.h
84009 +++ b/include/uapi/linux/elf.h
84010 @@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
84011 #define PT_GNU_EH_FRAME 0x6474e550
84012
84013 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
84014 +#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
84015 +
84016 +#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
84017 +
84018 +/* Constants for the e_flags field */
84019 +#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
84020 +#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
84021 +#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
84022 +#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
84023 +/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
84024 +#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
84025
84026 /*
84027 * Extended Numbering
84028 @@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
84029 #define DT_DEBUG 21
84030 #define DT_TEXTREL 22
84031 #define DT_JMPREL 23
84032 +#define DT_FLAGS 30
84033 + #define DF_TEXTREL 0x00000004
84034 #define DT_ENCODING 32
84035 #define OLD_DT_LOOS 0x60000000
84036 #define DT_LOOS 0x6000000d
84037 @@ -240,6 +253,19 @@ typedef struct elf64_hdr {
84038 #define PF_W 0x2
84039 #define PF_X 0x1
84040
84041 +#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
84042 +#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
84043 +#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
84044 +#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
84045 +#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
84046 +#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
84047 +/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
84048 +/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
84049 +#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
84050 +#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
84051 +#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
84052 +#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
84053 +
84054 typedef struct elf32_phdr{
84055 Elf32_Word p_type;
84056 Elf32_Off p_offset;
84057 @@ -332,6 +358,8 @@ typedef struct elf64_shdr {
84058 #define EI_OSABI 7
84059 #define EI_PAD 8
84060
84061 +#define EI_PAX 14
84062 +
84063 #define ELFMAG0 0x7f /* EI_MAG */
84064 #define ELFMAG1 'E'
84065 #define ELFMAG2 'L'
84066 diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
84067 index aa169c4..6a2771d 100644
84068 --- a/include/uapi/linux/personality.h
84069 +++ b/include/uapi/linux/personality.h
84070 @@ -30,6 +30,7 @@ enum {
84071 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
84072 ADDR_NO_RANDOMIZE | \
84073 ADDR_COMPAT_LAYOUT | \
84074 + ADDR_LIMIT_3GB | \
84075 MMAP_PAGE_ZERO)
84076
84077 /*
84078 diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
84079 index 7530e74..e714828 100644
84080 --- a/include/uapi/linux/screen_info.h
84081 +++ b/include/uapi/linux/screen_info.h
84082 @@ -43,7 +43,8 @@ struct screen_info {
84083 __u16 pages; /* 0x32 */
84084 __u16 vesa_attributes; /* 0x34 */
84085 __u32 capabilities; /* 0x36 */
84086 - __u8 _reserved[6]; /* 0x3a */
84087 + __u16 vesapm_size; /* 0x3a */
84088 + __u8 _reserved[4]; /* 0x3c */
84089 } __attribute__((packed));
84090
84091 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
84092 diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
84093 index 0e011eb..82681b1 100644
84094 --- a/include/uapi/linux/swab.h
84095 +++ b/include/uapi/linux/swab.h
84096 @@ -43,7 +43,7 @@
84097 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
84098 */
84099
84100 -static inline __attribute_const__ __u16 __fswab16(__u16 val)
84101 +static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
84102 {
84103 #ifdef __HAVE_BUILTIN_BSWAP16__
84104 return __builtin_bswap16(val);
84105 @@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
84106 #endif
84107 }
84108
84109 -static inline __attribute_const__ __u32 __fswab32(__u32 val)
84110 +static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
84111 {
84112 #ifdef __HAVE_BUILTIN_BSWAP32__
84113 return __builtin_bswap32(val);
84114 @@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
84115 #endif
84116 }
84117
84118 -static inline __attribute_const__ __u64 __fswab64(__u64 val)
84119 +static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
84120 {
84121 #ifdef __HAVE_BUILTIN_BSWAP64__
84122 return __builtin_bswap64(val);
84123 diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
84124 index 6d67213..552fdd9 100644
84125 --- a/include/uapi/linux/sysctl.h
84126 +++ b/include/uapi/linux/sysctl.h
84127 @@ -155,8 +155,6 @@ enum
84128 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
84129 };
84130
84131 -
84132 -
84133 /* CTL_VM names: */
84134 enum
84135 {
84136 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
84137 index 6ae7bbe..1e487fe 100644
84138 --- a/include/uapi/linux/videodev2.h
84139 +++ b/include/uapi/linux/videodev2.h
84140 @@ -1227,7 +1227,7 @@ struct v4l2_ext_control {
84141 union {
84142 __s32 value;
84143 __s64 value64;
84144 - char *string;
84145 + char __user *string;
84146 };
84147 } __attribute__ ((packed));
84148
84149 diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
84150 index 40bbc04..e30d9a2 100644
84151 --- a/include/uapi/linux/xattr.h
84152 +++ b/include/uapi/linux/xattr.h
84153 @@ -66,5 +66,9 @@
84154 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
84155 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
84156
84157 +/* User namespace */
84158 +#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
84159 +#define XATTR_PAX_FLAGS_SUFFIX "flags"
84160 +#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
84161
84162 #endif /* _UAPI_LINUX_XATTR_H */
84163 diff --git a/include/video/udlfb.h b/include/video/udlfb.h
84164 index f9466fa..f4e2b81 100644
84165 --- a/include/video/udlfb.h
84166 +++ b/include/video/udlfb.h
84167 @@ -53,10 +53,10 @@ struct dlfb_data {
84168 u32 pseudo_palette[256];
84169 int blank_mode; /*one of FB_BLANK_ */
84170 /* blit-only rendering path metrics, exposed through sysfs */
84171 - atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
84172 - atomic_t bytes_identical; /* saved effort with backbuffer comparison */
84173 - atomic_t bytes_sent; /* to usb, after compression including overhead */
84174 - atomic_t cpu_kcycles_used; /* transpired during pixel processing */
84175 + atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
84176 + atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
84177 + atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
84178 + atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
84179 };
84180
84181 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
84182 diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
84183 index 30f5362..8ed8ac9 100644
84184 --- a/include/video/uvesafb.h
84185 +++ b/include/video/uvesafb.h
84186 @@ -122,6 +122,7 @@ struct uvesafb_par {
84187 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
84188 u8 pmi_setpal; /* PMI for palette changes */
84189 u16 *pmi_base; /* protected mode interface location */
84190 + u8 *pmi_code; /* protected mode code location */
84191 void *pmi_start;
84192 void *pmi_pal;
84193 u8 *vbe_state_orig; /*
84194 diff --git a/init/Kconfig b/init/Kconfig
84195 index d56cb03..7e6d5dc 100644
84196 --- a/init/Kconfig
84197 +++ b/init/Kconfig
84198 @@ -1079,6 +1079,7 @@ endif # CGROUPS
84199
84200 config CHECKPOINT_RESTORE
84201 bool "Checkpoint/restore support" if EXPERT
84202 + depends on !GRKERNSEC
84203 default n
84204 help
84205 Enables additional kernel features in a sake of checkpoint/restore.
84206 @@ -1545,7 +1546,7 @@ config SLUB_DEBUG
84207
84208 config COMPAT_BRK
84209 bool "Disable heap randomization"
84210 - default y
84211 + default n
84212 help
84213 Randomizing heap placement makes heap exploits harder, but it
84214 also breaks ancient binaries (including anything libc5 based).
84215 @@ -1833,7 +1834,7 @@ config INIT_ALL_POSSIBLE
84216 config STOP_MACHINE
84217 bool
84218 default y
84219 - depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
84220 + depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
84221 help
84222 Need stop_machine() primitive.
84223
84224 diff --git a/init/Makefile b/init/Makefile
84225 index 7bc47ee..6da2dc7 100644
84226 --- a/init/Makefile
84227 +++ b/init/Makefile
84228 @@ -2,6 +2,9 @@
84229 # Makefile for the linux kernel.
84230 #
84231
84232 +ccflags-y := $(GCC_PLUGINS_CFLAGS)
84233 +asflags-y := $(GCC_PLUGINS_AFLAGS)
84234 +
84235 obj-y := main.o version.o mounts.o
84236 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
84237 obj-y += noinitramfs.o
84238 diff --git a/init/do_mounts.c b/init/do_mounts.c
84239 index 8e5addc..c96ea61 100644
84240 --- a/init/do_mounts.c
84241 +++ b/init/do_mounts.c
84242 @@ -359,11 +359,11 @@ static void __init get_fs_names(char *page)
84243 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
84244 {
84245 struct super_block *s;
84246 - int err = sys_mount(name, "/root", fs, flags, data);
84247 + int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
84248 if (err)
84249 return err;
84250
84251 - sys_chdir("/root");
84252 + sys_chdir((const char __force_user *)"/root");
84253 s = current->fs->pwd.dentry->d_sb;
84254 ROOT_DEV = s->s_dev;
84255 printk(KERN_INFO
84256 @@ -484,18 +484,18 @@ void __init change_floppy(char *fmt, ...)
84257 va_start(args, fmt);
84258 vsprintf(buf, fmt, args);
84259 va_end(args);
84260 - fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
84261 + fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
84262 if (fd >= 0) {
84263 sys_ioctl(fd, FDEJECT, 0);
84264 sys_close(fd);
84265 }
84266 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
84267 - fd = sys_open("/dev/console", O_RDWR, 0);
84268 + fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
84269 if (fd >= 0) {
84270 sys_ioctl(fd, TCGETS, (long)&termios);
84271 termios.c_lflag &= ~ICANON;
84272 sys_ioctl(fd, TCSETSF, (long)&termios);
84273 - sys_read(fd, &c, 1);
84274 + sys_read(fd, (char __user *)&c, 1);
84275 termios.c_lflag |= ICANON;
84276 sys_ioctl(fd, TCSETSF, (long)&termios);
84277 sys_close(fd);
84278 @@ -589,8 +589,8 @@ void __init prepare_namespace(void)
84279 mount_root();
84280 out:
84281 devtmpfs_mount("dev");
84282 - sys_mount(".", "/", NULL, MS_MOVE, NULL);
84283 - sys_chroot(".");
84284 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
84285 + sys_chroot((const char __force_user *)".");
84286 }
84287
84288 static bool is_tmpfs;
84289 diff --git a/init/do_mounts.h b/init/do_mounts.h
84290 index f5b978a..69dbfe8 100644
84291 --- a/init/do_mounts.h
84292 +++ b/init/do_mounts.h
84293 @@ -15,15 +15,15 @@ extern int root_mountflags;
84294
84295 static inline int create_dev(char *name, dev_t dev)
84296 {
84297 - sys_unlink(name);
84298 - return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
84299 + sys_unlink((char __force_user *)name);
84300 + return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
84301 }
84302
84303 #if BITS_PER_LONG == 32
84304 static inline u32 bstat(char *name)
84305 {
84306 struct stat64 stat;
84307 - if (sys_stat64(name, &stat) != 0)
84308 + if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
84309 return 0;
84310 if (!S_ISBLK(stat.st_mode))
84311 return 0;
84312 @@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
84313 static inline u32 bstat(char *name)
84314 {
84315 struct stat stat;
84316 - if (sys_newstat(name, &stat) != 0)
84317 + if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
84318 return 0;
84319 if (!S_ISBLK(stat.st_mode))
84320 return 0;
84321 diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
84322 index 3e0878e..8a9d7a0 100644
84323 --- a/init/do_mounts_initrd.c
84324 +++ b/init/do_mounts_initrd.c
84325 @@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
84326 {
84327 sys_unshare(CLONE_FS | CLONE_FILES);
84328 /* stdin/stdout/stderr for /linuxrc */
84329 - sys_open("/dev/console", O_RDWR, 0);
84330 + sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
84331 sys_dup(0);
84332 sys_dup(0);
84333 /* move initrd over / and chdir/chroot in initrd root */
84334 - sys_chdir("/root");
84335 - sys_mount(".", "/", NULL, MS_MOVE, NULL);
84336 - sys_chroot(".");
84337 + sys_chdir((const char __force_user *)"/root");
84338 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
84339 + sys_chroot((const char __force_user *)".");
84340 sys_setsid();
84341 return 0;
84342 }
84343 @@ -59,8 +59,8 @@ static void __init handle_initrd(void)
84344 create_dev("/dev/root.old", Root_RAM0);
84345 /* mount initrd on rootfs' /root */
84346 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
84347 - sys_mkdir("/old", 0700);
84348 - sys_chdir("/old");
84349 + sys_mkdir((const char __force_user *)"/old", 0700);
84350 + sys_chdir((const char __force_user *)"/old");
84351
84352 /* try loading default modules from initrd */
84353 load_default_modules();
84354 @@ -80,31 +80,31 @@ static void __init handle_initrd(void)
84355 current->flags &= ~PF_FREEZER_SKIP;
84356
84357 /* move initrd to rootfs' /old */
84358 - sys_mount("..", ".", NULL, MS_MOVE, NULL);
84359 + sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
84360 /* switch root and cwd back to / of rootfs */
84361 - sys_chroot("..");
84362 + sys_chroot((const char __force_user *)"..");
84363
84364 if (new_decode_dev(real_root_dev) == Root_RAM0) {
84365 - sys_chdir("/old");
84366 + sys_chdir((const char __force_user *)"/old");
84367 return;
84368 }
84369
84370 - sys_chdir("/");
84371 + sys_chdir((const char __force_user *)"/");
84372 ROOT_DEV = new_decode_dev(real_root_dev);
84373 mount_root();
84374
84375 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
84376 - error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
84377 + error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
84378 if (!error)
84379 printk("okay\n");
84380 else {
84381 - int fd = sys_open("/dev/root.old", O_RDWR, 0);
84382 + int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
84383 if (error == -ENOENT)
84384 printk("/initrd does not exist. Ignored.\n");
84385 else
84386 printk("failed\n");
84387 printk(KERN_NOTICE "Unmounting old root\n");
84388 - sys_umount("/old", MNT_DETACH);
84389 + sys_umount((char __force_user *)"/old", MNT_DETACH);
84390 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
84391 if (fd < 0) {
84392 error = fd;
84393 @@ -127,11 +127,11 @@ int __init initrd_load(void)
84394 * mounted in the normal path.
84395 */
84396 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
84397 - sys_unlink("/initrd.image");
84398 + sys_unlink((const char __force_user *)"/initrd.image");
84399 handle_initrd();
84400 return 1;
84401 }
84402 }
84403 - sys_unlink("/initrd.image");
84404 + sys_unlink((const char __force_user *)"/initrd.image");
84405 return 0;
84406 }
84407 diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
84408 index 8cb6db5..d729f50 100644
84409 --- a/init/do_mounts_md.c
84410 +++ b/init/do_mounts_md.c
84411 @@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
84412 partitioned ? "_d" : "", minor,
84413 md_setup_args[ent].device_names);
84414
84415 - fd = sys_open(name, 0, 0);
84416 + fd = sys_open((char __force_user *)name, 0, 0);
84417 if (fd < 0) {
84418 printk(KERN_ERR "md: open failed - cannot start "
84419 "array %s\n", name);
84420 @@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
84421 * array without it
84422 */
84423 sys_close(fd);
84424 - fd = sys_open(name, 0, 0);
84425 + fd = sys_open((char __force_user *)name, 0, 0);
84426 sys_ioctl(fd, BLKRRPART, 0);
84427 }
84428 sys_close(fd);
84429 @@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
84430
84431 wait_for_device_probe();
84432
84433 - fd = sys_open("/dev/md0", 0, 0);
84434 + fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
84435 if (fd >= 0) {
84436 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
84437 sys_close(fd);
84438 diff --git a/init/init_task.c b/init/init_task.c
84439 index ba0a7f36..2bcf1d5 100644
84440 --- a/init/init_task.c
84441 +++ b/init/init_task.c
84442 @@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
84443 * Initial thread structure. Alignment of this is handled by a special
84444 * linker map entry.
84445 */
84446 +#ifdef CONFIG_X86
84447 +union thread_union init_thread_union __init_task_data;
84448 +#else
84449 union thread_union init_thread_union __init_task_data =
84450 { INIT_THREAD_INFO(init_task) };
84451 +#endif
84452 diff --git a/init/initramfs.c b/init/initramfs.c
84453 index 93b6139..8d628b7 100644
84454 --- a/init/initramfs.c
84455 +++ b/init/initramfs.c
84456 @@ -84,7 +84,7 @@ static void __init free_hash(void)
84457 }
84458 }
84459
84460 -static long __init do_utime(char *filename, time_t mtime)
84461 +static long __init do_utime(char __force_user *filename, time_t mtime)
84462 {
84463 struct timespec t[2];
84464
84465 @@ -119,7 +119,7 @@ static void __init dir_utime(void)
84466 struct dir_entry *de, *tmp;
84467 list_for_each_entry_safe(de, tmp, &dir_list, list) {
84468 list_del(&de->list);
84469 - do_utime(de->name, de->mtime);
84470 + do_utime((char __force_user *)de->name, de->mtime);
84471 kfree(de->name);
84472 kfree(de);
84473 }
84474 @@ -281,7 +281,7 @@ static int __init maybe_link(void)
84475 if (nlink >= 2) {
84476 char *old = find_link(major, minor, ino, mode, collected);
84477 if (old)
84478 - return (sys_link(old, collected) < 0) ? -1 : 1;
84479 + return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
84480 }
84481 return 0;
84482 }
84483 @@ -290,11 +290,11 @@ static void __init clean_path(char *path, umode_t mode)
84484 {
84485 struct stat st;
84486
84487 - if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
84488 + if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
84489 if (S_ISDIR(st.st_mode))
84490 - sys_rmdir(path);
84491 + sys_rmdir((char __force_user *)path);
84492 else
84493 - sys_unlink(path);
84494 + sys_unlink((char __force_user *)path);
84495 }
84496 }
84497
84498 @@ -315,7 +315,7 @@ static int __init do_name(void)
84499 int openflags = O_WRONLY|O_CREAT;
84500 if (ml != 1)
84501 openflags |= O_TRUNC;
84502 - wfd = sys_open(collected, openflags, mode);
84503 + wfd = sys_open((char __force_user *)collected, openflags, mode);
84504
84505 if (wfd >= 0) {
84506 sys_fchown(wfd, uid, gid);
84507 @@ -327,17 +327,17 @@ static int __init do_name(void)
84508 }
84509 }
84510 } else if (S_ISDIR(mode)) {
84511 - sys_mkdir(collected, mode);
84512 - sys_chown(collected, uid, gid);
84513 - sys_chmod(collected, mode);
84514 + sys_mkdir((char __force_user *)collected, mode);
84515 + sys_chown((char __force_user *)collected, uid, gid);
84516 + sys_chmod((char __force_user *)collected, mode);
84517 dir_add(collected, mtime);
84518 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
84519 S_ISFIFO(mode) || S_ISSOCK(mode)) {
84520 if (maybe_link() == 0) {
84521 - sys_mknod(collected, mode, rdev);
84522 - sys_chown(collected, uid, gid);
84523 - sys_chmod(collected, mode);
84524 - do_utime(collected, mtime);
84525 + sys_mknod((char __force_user *)collected, mode, rdev);
84526 + sys_chown((char __force_user *)collected, uid, gid);
84527 + sys_chmod((char __force_user *)collected, mode);
84528 + do_utime((char __force_user *)collected, mtime);
84529 }
84530 }
84531 return 0;
84532 @@ -346,15 +346,15 @@ static int __init do_name(void)
84533 static int __init do_copy(void)
84534 {
84535 if (count >= body_len) {
84536 - sys_write(wfd, victim, body_len);
84537 + sys_write(wfd, (char __force_user *)victim, body_len);
84538 sys_close(wfd);
84539 - do_utime(vcollected, mtime);
84540 + do_utime((char __force_user *)vcollected, mtime);
84541 kfree(vcollected);
84542 eat(body_len);
84543 state = SkipIt;
84544 return 0;
84545 } else {
84546 - sys_write(wfd, victim, count);
84547 + sys_write(wfd, (char __force_user *)victim, count);
84548 body_len -= count;
84549 eat(count);
84550 return 1;
84551 @@ -365,9 +365,9 @@ static int __init do_symlink(void)
84552 {
84553 collected[N_ALIGN(name_len) + body_len] = '\0';
84554 clean_path(collected, 0);
84555 - sys_symlink(collected + N_ALIGN(name_len), collected);
84556 - sys_lchown(collected, uid, gid);
84557 - do_utime(collected, mtime);
84558 + sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
84559 + sys_lchown((char __force_user *)collected, uid, gid);
84560 + do_utime((char __force_user *)collected, mtime);
84561 state = SkipIt;
84562 next_state = Reset;
84563 return 0;
84564 diff --git a/init/main.c b/init/main.c
84565 index 9c7fd4c..650b4f1 100644
84566 --- a/init/main.c
84567 +++ b/init/main.c
84568 @@ -97,6 +97,8 @@ extern void radix_tree_init(void);
84569 static inline void mark_rodata_ro(void) { }
84570 #endif
84571
84572 +extern void grsecurity_init(void);
84573 +
84574 /*
84575 * Debug helper: via this flag we know that we are in 'early bootup code'
84576 * where only the boot processor is running with IRQ disabled. This means
84577 @@ -158,6 +160,75 @@ static int __init set_reset_devices(char *str)
84578
84579 __setup("reset_devices", set_reset_devices);
84580
84581 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
84582 +kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
84583 +static int __init setup_grsec_proc_gid(char *str)
84584 +{
84585 + grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
84586 + return 1;
84587 +}
84588 +__setup("grsec_proc_gid=", setup_grsec_proc_gid);
84589 +#endif
84590 +
84591 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
84592 +unsigned long pax_user_shadow_base __read_only;
84593 +EXPORT_SYMBOL(pax_user_shadow_base);
84594 +extern char pax_enter_kernel_user[];
84595 +extern char pax_exit_kernel_user[];
84596 +#endif
84597 +
84598 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
84599 +static int __init setup_pax_nouderef(char *str)
84600 +{
84601 +#ifdef CONFIG_X86_32
84602 + unsigned int cpu;
84603 + struct desc_struct *gdt;
84604 +
84605 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
84606 + gdt = get_cpu_gdt_table(cpu);
84607 + gdt[GDT_ENTRY_KERNEL_DS].type = 3;
84608 + gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
84609 + gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
84610 + gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
84611 + }
84612 + loadsegment(ds, __KERNEL_DS);
84613 + loadsegment(es, __KERNEL_DS);
84614 + loadsegment(ss, __KERNEL_DS);
84615 +#else
84616 + memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
84617 + memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
84618 + clone_pgd_mask = ~(pgdval_t)0UL;
84619 + pax_user_shadow_base = 0UL;
84620 + setup_clear_cpu_cap(X86_FEATURE_PCID);
84621 + setup_clear_cpu_cap(X86_FEATURE_INVPCID);
84622 +#endif
84623 +
84624 + return 0;
84625 +}
84626 +early_param("pax_nouderef", setup_pax_nouderef);
84627 +
84628 +#ifdef CONFIG_X86_64
84629 +static int __init setup_pax_weakuderef(char *str)
84630 +{
84631 + if (clone_pgd_mask != ~(pgdval_t)0UL)
84632 + pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
84633 + return 1;
84634 +}
84635 +__setup("pax_weakuderef", setup_pax_weakuderef);
84636 +#endif
84637 +#endif
84638 +
84639 +#ifdef CONFIG_PAX_SOFTMODE
84640 +int pax_softmode;
84641 +
84642 +static int __init setup_pax_softmode(char *str)
84643 +{
84644 + get_option(&str, &pax_softmode);
84645 + return 1;
84646 +}
84647 +__setup("pax_softmode=", setup_pax_softmode);
84648 +#endif
84649 +
84650 static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
84651 const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
84652 static const char *panic_later, *panic_param;
84653 @@ -688,25 +759,24 @@ int __init_or_module do_one_initcall(initcall_t fn)
84654 {
84655 int count = preempt_count();
84656 int ret;
84657 - char msgbuf[64];
84658 + const char *msg1 = "", *msg2 = "";
84659
84660 if (initcall_debug)
84661 ret = do_one_initcall_debug(fn);
84662 else
84663 ret = fn();
84664
84665 - msgbuf[0] = 0;
84666 -
84667 if (preempt_count() != count) {
84668 - sprintf(msgbuf, "preemption imbalance ");
84669 + msg1 = " preemption imbalance";
84670 preempt_count_set(count);
84671 }
84672 if (irqs_disabled()) {
84673 - strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
84674 + msg2 = " disabled interrupts";
84675 local_irq_enable();
84676 }
84677 - WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
84678 + WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
84679
84680 + add_latent_entropy();
84681 return ret;
84682 }
84683
84684 @@ -813,8 +883,8 @@ static int run_init_process(const char *init_filename)
84685 {
84686 argv_init[0] = init_filename;
84687 return do_execve(getname_kernel(init_filename),
84688 - (const char __user *const __user *)argv_init,
84689 - (const char __user *const __user *)envp_init);
84690 + (const char __user *const __force_user *)argv_init,
84691 + (const char __user *const __force_user *)envp_init);
84692 }
84693
84694 static int try_to_run_init_process(const char *init_filename)
84695 @@ -831,6 +901,10 @@ static int try_to_run_init_process(const char *init_filename)
84696 return ret;
84697 }
84698
84699 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
84700 +extern int gr_init_ran;
84701 +#endif
84702 +
84703 static noinline void __init kernel_init_freeable(void);
84704
84705 static int __ref kernel_init(void *unused)
84706 @@ -855,6 +929,11 @@ static int __ref kernel_init(void *unused)
84707 ramdisk_execute_command, ret);
84708 }
84709
84710 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
84711 + /* if no initrd was used, be extra sure we enforce chroot restrictions */
84712 + gr_init_ran = 1;
84713 +#endif
84714 +
84715 /*
84716 * We try each of these until one succeeds.
84717 *
84718 @@ -910,7 +989,7 @@ static noinline void __init kernel_init_freeable(void)
84719 do_basic_setup();
84720
84721 /* Open the /dev/console on the rootfs, this should never fail */
84722 - if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
84723 + if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
84724 pr_err("Warning: unable to open an initial console.\n");
84725
84726 (void) sys_dup(0);
84727 @@ -923,11 +1002,13 @@ static noinline void __init kernel_init_freeable(void)
84728 if (!ramdisk_execute_command)
84729 ramdisk_execute_command = "/init";
84730
84731 - if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
84732 + if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
84733 ramdisk_execute_command = NULL;
84734 prepare_namespace();
84735 }
84736
84737 + grsecurity_init();
84738 +
84739 /*
84740 * Ok, we have completed the initial bootup, and
84741 * we're essentially up and running. Get rid of the
84742 diff --git a/ipc/compat.c b/ipc/compat.c
84743 index f486b00..442867f 100644
84744 --- a/ipc/compat.c
84745 +++ b/ipc/compat.c
84746 @@ -399,7 +399,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
84747 COMPAT_SHMLBA);
84748 if (err < 0)
84749 return err;
84750 - return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
84751 + return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
84752 }
84753 case SHMDT:
84754 return sys_shmdt(compat_ptr(ptr));
84755 diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
84756 index 1702864..797fa84 100644
84757 --- a/ipc/ipc_sysctl.c
84758 +++ b/ipc/ipc_sysctl.c
84759 @@ -30,7 +30,7 @@ static void *get_ipc(ctl_table *table)
84760 static int proc_ipc_dointvec(ctl_table *table, int write,
84761 void __user *buffer, size_t *lenp, loff_t *ppos)
84762 {
84763 - struct ctl_table ipc_table;
84764 + ctl_table_no_const ipc_table;
84765
84766 memcpy(&ipc_table, table, sizeof(ipc_table));
84767 ipc_table.data = get_ipc(table);
84768 @@ -41,7 +41,7 @@ static int proc_ipc_dointvec(ctl_table *table, int write,
84769 static int proc_ipc_dointvec_minmax(ctl_table *table, int write,
84770 void __user *buffer, size_t *lenp, loff_t *ppos)
84771 {
84772 - struct ctl_table ipc_table;
84773 + ctl_table_no_const ipc_table;
84774
84775 memcpy(&ipc_table, table, sizeof(ipc_table));
84776 ipc_table.data = get_ipc(table);
84777 @@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(ctl_table *table, int write,
84778 static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write,
84779 void __user *buffer, size_t *lenp, loff_t *ppos)
84780 {
84781 - struct ctl_table ipc_table;
84782 + ctl_table_no_const ipc_table;
84783 size_t lenp_bef = *lenp;
84784 int rc;
84785
84786 @@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write,
84787 static int proc_ipc_doulongvec_minmax(ctl_table *table, int write,
84788 void __user *buffer, size_t *lenp, loff_t *ppos)
84789 {
84790 - struct ctl_table ipc_table;
84791 + ctl_table_no_const ipc_table;
84792 memcpy(&ipc_table, table, sizeof(ipc_table));
84793 ipc_table.data = get_ipc(table);
84794
84795 @@ -122,7 +122,7 @@ static void ipc_auto_callback(int val)
84796 static int proc_ipcauto_dointvec_minmax(ctl_table *table, int write,
84797 void __user *buffer, size_t *lenp, loff_t *ppos)
84798 {
84799 - struct ctl_table ipc_table;
84800 + ctl_table_no_const ipc_table;
84801 size_t lenp_bef = *lenp;
84802 int oldval;
84803 int rc;
84804 diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
84805 index 5bb8bfe..a38ec05 100644
84806 --- a/ipc/mq_sysctl.c
84807 +++ b/ipc/mq_sysctl.c
84808 @@ -25,7 +25,7 @@ static void *get_mq(ctl_table *table)
84809 static int proc_mq_dointvec(ctl_table *table, int write,
84810 void __user *buffer, size_t *lenp, loff_t *ppos)
84811 {
84812 - struct ctl_table mq_table;
84813 + ctl_table_no_const mq_table;
84814 memcpy(&mq_table, table, sizeof(mq_table));
84815 mq_table.data = get_mq(table);
84816
84817 @@ -35,7 +35,7 @@ static int proc_mq_dointvec(ctl_table *table, int write,
84818 static int proc_mq_dointvec_minmax(ctl_table *table, int write,
84819 void __user *buffer, size_t *lenp, loff_t *ppos)
84820 {
84821 - struct ctl_table mq_table;
84822 + ctl_table_no_const mq_table;
84823 memcpy(&mq_table, table, sizeof(mq_table));
84824 mq_table.data = get_mq(table);
84825
84826 diff --git a/ipc/mqueue.c b/ipc/mqueue.c
84827 index c3b3117..1efa933 100644
84828 --- a/ipc/mqueue.c
84829 +++ b/ipc/mqueue.c
84830 @@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
84831 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
84832 info->attr.mq_msgsize);
84833
84834 + gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
84835 spin_lock(&mq_lock);
84836 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
84837 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
84838 diff --git a/ipc/msg.c b/ipc/msg.c
84839 index 6498531..b0ff3c8 100644
84840 --- a/ipc/msg.c
84841 +++ b/ipc/msg.c
84842 @@ -303,18 +303,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
84843 return security_msg_queue_associate(msq, msgflg);
84844 }
84845
84846 +static struct ipc_ops msg_ops = {
84847 + .getnew = newque,
84848 + .associate = msg_security,
84849 + .more_checks = NULL
84850 +};
84851 +
84852 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
84853 {
84854 struct ipc_namespace *ns;
84855 - struct ipc_ops msg_ops;
84856 struct ipc_params msg_params;
84857
84858 ns = current->nsproxy->ipc_ns;
84859
84860 - msg_ops.getnew = newque;
84861 - msg_ops.associate = msg_security;
84862 - msg_ops.more_checks = NULL;
84863 -
84864 msg_params.key = key;
84865 msg_params.flg = msgflg;
84866
84867 diff --git a/ipc/sem.c b/ipc/sem.c
84868 index bee5554..e9af81dd 100644
84869 --- a/ipc/sem.c
84870 +++ b/ipc/sem.c
84871 @@ -561,10 +561,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
84872 return 0;
84873 }
84874
84875 +static struct ipc_ops sem_ops = {
84876 + .getnew = newary,
84877 + .associate = sem_security,
84878 + .more_checks = sem_more_checks
84879 +};
84880 +
84881 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
84882 {
84883 struct ipc_namespace *ns;
84884 - struct ipc_ops sem_ops;
84885 struct ipc_params sem_params;
84886
84887 ns = current->nsproxy->ipc_ns;
84888 @@ -572,10 +577,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
84889 if (nsems < 0 || nsems > ns->sc_semmsl)
84890 return -EINVAL;
84891
84892 - sem_ops.getnew = newary;
84893 - sem_ops.associate = sem_security;
84894 - sem_ops.more_checks = sem_more_checks;
84895 -
84896 sem_params.key = key;
84897 sem_params.flg = semflg;
84898 sem_params.u.nsems = nsems;
84899 diff --git a/ipc/shm.c b/ipc/shm.c
84900 index 7645961..afc7f02 100644
84901 --- a/ipc/shm.c
84902 +++ b/ipc/shm.c
84903 @@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
84904 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
84905 #endif
84906
84907 +#ifdef CONFIG_GRKERNSEC
84908 +extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
84909 + const time_t shm_createtime, const kuid_t cuid,
84910 + const int shmid);
84911 +extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
84912 + const time_t shm_createtime);
84913 +#endif
84914 +
84915 void shm_init_ns(struct ipc_namespace *ns)
84916 {
84917 ns->shm_ctlmax = SHMMAX;
84918 @@ -553,6 +561,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
84919 shp->shm_lprid = 0;
84920 shp->shm_atim = shp->shm_dtim = 0;
84921 shp->shm_ctim = get_seconds();
84922 +#ifdef CONFIG_GRKERNSEC
84923 + {
84924 + struct timespec timeval;
84925 + do_posix_clock_monotonic_gettime(&timeval);
84926 +
84927 + shp->shm_createtime = timeval.tv_sec;
84928 + }
84929 +#endif
84930 shp->shm_segsz = size;
84931 shp->shm_nattch = 0;
84932 shp->shm_file = file;
84933 @@ -606,18 +622,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
84934 return 0;
84935 }
84936
84937 +static struct ipc_ops shm_ops = {
84938 + .getnew = newseg,
84939 + .associate = shm_security,
84940 + .more_checks = shm_more_checks
84941 +};
84942 +
84943 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
84944 {
84945 struct ipc_namespace *ns;
84946 - struct ipc_ops shm_ops;
84947 struct ipc_params shm_params;
84948
84949 ns = current->nsproxy->ipc_ns;
84950
84951 - shm_ops.getnew = newseg;
84952 - shm_ops.associate = shm_security;
84953 - shm_ops.more_checks = shm_more_checks;
84954 -
84955 shm_params.key = key;
84956 shm_params.flg = shmflg;
84957 shm_params.u.size = size;
84958 @@ -1088,6 +1105,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
84959 f_mode = FMODE_READ | FMODE_WRITE;
84960 }
84961 if (shmflg & SHM_EXEC) {
84962 +
84963 +#ifdef CONFIG_PAX_MPROTECT
84964 + if (current->mm->pax_flags & MF_PAX_MPROTECT)
84965 + goto out;
84966 +#endif
84967 +
84968 prot |= PROT_EXEC;
84969 acc_mode |= S_IXUGO;
84970 }
84971 @@ -1112,6 +1135,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
84972 if (err)
84973 goto out_unlock;
84974
84975 +#ifdef CONFIG_GRKERNSEC
84976 + if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
84977 + shp->shm_perm.cuid, shmid) ||
84978 + !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
84979 + err = -EACCES;
84980 + goto out_unlock;
84981 + }
84982 +#endif
84983 +
84984 ipc_lock_object(&shp->shm_perm);
84985
84986 /* check if shm_destroy() is tearing down shp */
84987 @@ -1124,6 +1156,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
84988 path = shp->shm_file->f_path;
84989 path_get(&path);
84990 shp->shm_nattch++;
84991 +#ifdef CONFIG_GRKERNSEC
84992 + shp->shm_lapid = current->pid;
84993 +#endif
84994 size = i_size_read(path.dentry->d_inode);
84995 ipc_unlock_object(&shp->shm_perm);
84996 rcu_read_unlock();
84997 diff --git a/ipc/util.c b/ipc/util.c
84998 index e1b4c6d..8174204 100644
84999 --- a/ipc/util.c
85000 +++ b/ipc/util.c
85001 @@ -71,6 +71,8 @@ struct ipc_proc_iface {
85002 int (*show)(struct seq_file *, void *);
85003 };
85004
85005 +extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
85006 +
85007 static void ipc_memory_notifier(struct work_struct *work)
85008 {
85009 ipcns_notify(IPCNS_MEMCHANGED);
85010 @@ -537,6 +539,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
85011 granted_mode >>= 6;
85012 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
85013 granted_mode >>= 3;
85014 +
85015 + if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
85016 + return -1;
85017 +
85018 /* is there some bit set in requested_mode but not in granted_mode? */
85019 if ((requested_mode & ~granted_mode & 0007) &&
85020 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
85021 diff --git a/kernel/acct.c b/kernel/acct.c
85022 index 8d6e145..33e0b1e 100644
85023 --- a/kernel/acct.c
85024 +++ b/kernel/acct.c
85025 @@ -556,7 +556,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
85026 */
85027 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
85028 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
85029 - file->f_op->write(file, (char *)&ac,
85030 + file->f_op->write(file, (char __force_user *)&ac,
85031 sizeof(acct_t), &file->f_pos);
85032 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
85033 set_fs(fs);
85034 diff --git a/kernel/audit.c b/kernel/audit.c
85035 index 95a20f3..e1cb300 100644
85036 --- a/kernel/audit.c
85037 +++ b/kernel/audit.c
85038 @@ -122,7 +122,7 @@ u32 audit_sig_sid = 0;
85039 3) suppressed due to audit_rate_limit
85040 4) suppressed due to audit_backlog_limit
85041 */
85042 -static atomic_t audit_lost = ATOMIC_INIT(0);
85043 +static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
85044
85045 /* The netlink socket. */
85046 static struct sock *audit_sock;
85047 @@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
85048 unsigned long now;
85049 int print;
85050
85051 - atomic_inc(&audit_lost);
85052 + atomic_inc_unchecked(&audit_lost);
85053
85054 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
85055
85056 @@ -273,7 +273,7 @@ void audit_log_lost(const char *message)
85057 if (print) {
85058 if (printk_ratelimit())
85059 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
85060 - atomic_read(&audit_lost),
85061 + atomic_read_unchecked(&audit_lost),
85062 audit_rate_limit,
85063 audit_backlog_limit);
85064 audit_panic(message);
85065 @@ -803,7 +803,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
85066 s.pid = audit_pid;
85067 s.rate_limit = audit_rate_limit;
85068 s.backlog_limit = audit_backlog_limit;
85069 - s.lost = atomic_read(&audit_lost);
85070 + s.lost = atomic_read_unchecked(&audit_lost);
85071 s.backlog = skb_queue_len(&audit_skb_queue);
85072 s.version = AUDIT_VERSION_LATEST;
85073 s.backlog_wait_time = audit_backlog_wait_time;
85074 diff --git a/kernel/auditsc.c b/kernel/auditsc.c
85075 index 7aef2f4..db6ced2 100644
85076 --- a/kernel/auditsc.c
85077 +++ b/kernel/auditsc.c
85078 @@ -1945,7 +1945,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
85079 }
85080
85081 /* global counter which is incremented every time something logs in */
85082 -static atomic_t session_id = ATOMIC_INIT(0);
85083 +static atomic_unchecked_t session_id = ATOMIC_INIT(0);
85084
85085 static int audit_set_loginuid_perm(kuid_t loginuid)
85086 {
85087 @@ -2014,7 +2014,7 @@ int audit_set_loginuid(kuid_t loginuid)
85088
85089 /* are we setting or clearing? */
85090 if (uid_valid(loginuid))
85091 - sessionid = (unsigned int)atomic_inc_return(&session_id);
85092 + sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
85093
85094 task->sessionid = sessionid;
85095 task->loginuid = loginuid;
85096 diff --git a/kernel/capability.c b/kernel/capability.c
85097 index 34019c5..363f279 100644
85098 --- a/kernel/capability.c
85099 +++ b/kernel/capability.c
85100 @@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
85101 * before modification is attempted and the application
85102 * fails.
85103 */
85104 + if (tocopy > ARRAY_SIZE(kdata))
85105 + return -EFAULT;
85106 +
85107 if (copy_to_user(dataptr, kdata, tocopy
85108 * sizeof(struct __user_cap_data_struct))) {
85109 return -EFAULT;
85110 @@ -303,10 +306,11 @@ bool has_ns_capability(struct task_struct *t,
85111 int ret;
85112
85113 rcu_read_lock();
85114 - ret = security_capable(__task_cred(t), ns, cap);
85115 + ret = security_capable(__task_cred(t), ns, cap) == 0 &&
85116 + gr_task_is_capable(t, __task_cred(t), cap);
85117 rcu_read_unlock();
85118
85119 - return (ret == 0);
85120 + return ret;
85121 }
85122
85123 /**
85124 @@ -343,10 +347,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
85125 int ret;
85126
85127 rcu_read_lock();
85128 - ret = security_capable_noaudit(__task_cred(t), ns, cap);
85129 + ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
85130 rcu_read_unlock();
85131
85132 - return (ret == 0);
85133 + return ret;
85134 }
85135
85136 /**
85137 @@ -384,7 +388,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
85138 BUG();
85139 }
85140
85141 - if (security_capable(current_cred(), ns, cap) == 0) {
85142 + if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
85143 current->flags |= PF_SUPERPRIV;
85144 return true;
85145 }
85146 @@ -392,6 +396,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
85147 }
85148 EXPORT_SYMBOL(ns_capable);
85149
85150 +bool ns_capable_nolog(struct user_namespace *ns, int cap)
85151 +{
85152 + if (unlikely(!cap_valid(cap))) {
85153 + printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
85154 + BUG();
85155 + }
85156 +
85157 + if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
85158 + current->flags |= PF_SUPERPRIV;
85159 + return true;
85160 + }
85161 + return false;
85162 +}
85163 +EXPORT_SYMBOL(ns_capable_nolog);
85164 +
85165 /**
85166 * file_ns_capable - Determine if the file's opener had a capability in effect
85167 * @file: The file we want to check
85168 @@ -432,6 +451,12 @@ bool capable(int cap)
85169 }
85170 EXPORT_SYMBOL(capable);
85171
85172 +bool capable_nolog(int cap)
85173 +{
85174 + return ns_capable_nolog(&init_user_ns, cap);
85175 +}
85176 +EXPORT_SYMBOL(capable_nolog);
85177 +
85178 /**
85179 * inode_capable - Check superior capability over inode
85180 * @inode: The inode in question
85181 @@ -453,3 +478,11 @@ bool inode_capable(const struct inode *inode, int cap)
85182 return ns_capable(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
85183 }
85184 EXPORT_SYMBOL(inode_capable);
85185 +
85186 +bool inode_capable_nolog(const struct inode *inode, int cap)
85187 +{
85188 + struct user_namespace *ns = current_user_ns();
85189 +
85190 + return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
85191 +}
85192 +EXPORT_SYMBOL(inode_capable_nolog);
85193 diff --git a/kernel/cgroup.c b/kernel/cgroup.c
85194 index 0c753dd..dd7d3d6 100644
85195 --- a/kernel/cgroup.c
85196 +++ b/kernel/cgroup.c
85197 @@ -5372,7 +5372,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
85198 struct css_set *cset = link->cset;
85199 struct task_struct *task;
85200 int count = 0;
85201 - seq_printf(seq, "css_set %p\n", cset);
85202 + seq_printf(seq, "css_set %pK\n", cset);
85203 list_for_each_entry(task, &cset->tasks, cg_list) {
85204 if (count++ > MAX_TASKS_SHOWN_PER_CSS) {
85205 seq_puts(seq, " ...\n");
85206 diff --git a/kernel/compat.c b/kernel/compat.c
85207 index 0a09e48..b46b3d78 100644
85208 --- a/kernel/compat.c
85209 +++ b/kernel/compat.c
85210 @@ -13,6 +13,7 @@
85211
85212 #include <linux/linkage.h>
85213 #include <linux/compat.h>
85214 +#include <linux/module.h>
85215 #include <linux/errno.h>
85216 #include <linux/time.h>
85217 #include <linux/signal.h>
85218 @@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
85219 mm_segment_t oldfs;
85220 long ret;
85221
85222 - restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
85223 + restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
85224 oldfs = get_fs();
85225 set_fs(KERNEL_DS);
85226 ret = hrtimer_nanosleep_restart(restart);
85227 @@ -252,7 +253,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
85228 oldfs = get_fs();
85229 set_fs(KERNEL_DS);
85230 ret = hrtimer_nanosleep(&tu,
85231 - rmtp ? (struct timespec __user *)&rmt : NULL,
85232 + rmtp ? (struct timespec __force_user *)&rmt : NULL,
85233 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
85234 set_fs(oldfs);
85235
85236 @@ -361,7 +362,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
85237 mm_segment_t old_fs = get_fs();
85238
85239 set_fs(KERNEL_DS);
85240 - ret = sys_sigpending((old_sigset_t __user *) &s);
85241 + ret = sys_sigpending((old_sigset_t __force_user *) &s);
85242 set_fs(old_fs);
85243 if (ret == 0)
85244 ret = put_user(s, set);
85245 @@ -451,7 +452,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
85246 mm_segment_t old_fs = get_fs();
85247
85248 set_fs(KERNEL_DS);
85249 - ret = sys_old_getrlimit(resource, &r);
85250 + ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
85251 set_fs(old_fs);
85252
85253 if (!ret) {
85254 @@ -533,8 +534,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
85255 set_fs (KERNEL_DS);
85256 ret = sys_wait4(pid,
85257 (stat_addr ?
85258 - (unsigned int __user *) &status : NULL),
85259 - options, (struct rusage __user *) &r);
85260 + (unsigned int __force_user *) &status : NULL),
85261 + options, (struct rusage __force_user *) &r);
85262 set_fs (old_fs);
85263
85264 if (ret > 0) {
85265 @@ -560,8 +561,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
85266 memset(&info, 0, sizeof(info));
85267
85268 set_fs(KERNEL_DS);
85269 - ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
85270 - uru ? (struct rusage __user *)&ru : NULL);
85271 + ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
85272 + uru ? (struct rusage __force_user *)&ru : NULL);
85273 set_fs(old_fs);
85274
85275 if ((ret < 0) || (info.si_signo == 0))
85276 @@ -695,8 +696,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
85277 oldfs = get_fs();
85278 set_fs(KERNEL_DS);
85279 err = sys_timer_settime(timer_id, flags,
85280 - (struct itimerspec __user *) &newts,
85281 - (struct itimerspec __user *) &oldts);
85282 + (struct itimerspec __force_user *) &newts,
85283 + (struct itimerspec __force_user *) &oldts);
85284 set_fs(oldfs);
85285 if (!err && old && put_compat_itimerspec(old, &oldts))
85286 return -EFAULT;
85287 @@ -713,7 +714,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
85288 oldfs = get_fs();
85289 set_fs(KERNEL_DS);
85290 err = sys_timer_gettime(timer_id,
85291 - (struct itimerspec __user *) &ts);
85292 + (struct itimerspec __force_user *) &ts);
85293 set_fs(oldfs);
85294 if (!err && put_compat_itimerspec(setting, &ts))
85295 return -EFAULT;
85296 @@ -732,7 +733,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
85297 oldfs = get_fs();
85298 set_fs(KERNEL_DS);
85299 err = sys_clock_settime(which_clock,
85300 - (struct timespec __user *) &ts);
85301 + (struct timespec __force_user *) &ts);
85302 set_fs(oldfs);
85303 return err;
85304 }
85305 @@ -747,7 +748,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
85306 oldfs = get_fs();
85307 set_fs(KERNEL_DS);
85308 err = sys_clock_gettime(which_clock,
85309 - (struct timespec __user *) &ts);
85310 + (struct timespec __force_user *) &ts);
85311 set_fs(oldfs);
85312 if (!err && put_compat_timespec(&ts, tp))
85313 return -EFAULT;
85314 @@ -767,7 +768,7 @@ long compat_sys_clock_adjtime(clockid_t which_clock,
85315
85316 oldfs = get_fs();
85317 set_fs(KERNEL_DS);
85318 - ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
85319 + ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
85320 set_fs(oldfs);
85321
85322 err = compat_put_timex(utp, &txc);
85323 @@ -787,7 +788,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
85324 oldfs = get_fs();
85325 set_fs(KERNEL_DS);
85326 err = sys_clock_getres(which_clock,
85327 - (struct timespec __user *) &ts);
85328 + (struct timespec __force_user *) &ts);
85329 set_fs(oldfs);
85330 if (!err && tp && put_compat_timespec(&ts, tp))
85331 return -EFAULT;
85332 @@ -799,9 +800,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
85333 long err;
85334 mm_segment_t oldfs;
85335 struct timespec tu;
85336 - struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
85337 + struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
85338
85339 - restart->nanosleep.rmtp = (struct timespec __user *) &tu;
85340 + restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
85341 oldfs = get_fs();
85342 set_fs(KERNEL_DS);
85343 err = clock_nanosleep_restart(restart);
85344 @@ -833,8 +834,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
85345 oldfs = get_fs();
85346 set_fs(KERNEL_DS);
85347 err = sys_clock_nanosleep(which_clock, flags,
85348 - (struct timespec __user *) &in,
85349 - (struct timespec __user *) &out);
85350 + (struct timespec __force_user *) &in,
85351 + (struct timespec __force_user *) &out);
85352 set_fs(oldfs);
85353
85354 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
85355 @@ -1128,7 +1129,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
85356 mm_segment_t old_fs = get_fs();
85357
85358 set_fs(KERNEL_DS);
85359 - ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
85360 + ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
85361 set_fs(old_fs);
85362 if (put_compat_timespec(&t, interval))
85363 return -EFAULT;
85364 diff --git a/kernel/configs.c b/kernel/configs.c
85365 index c18b1f1..b9a0132 100644
85366 --- a/kernel/configs.c
85367 +++ b/kernel/configs.c
85368 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
85369 struct proc_dir_entry *entry;
85370
85371 /* create the current config file */
85372 +#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
85373 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
85374 + entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
85375 + &ikconfig_file_ops);
85376 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
85377 + entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
85378 + &ikconfig_file_ops);
85379 +#endif
85380 +#else
85381 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
85382 &ikconfig_file_ops);
85383 +#endif
85384 +
85385 if (!entry)
85386 return -ENOMEM;
85387
85388 diff --git a/kernel/cred.c b/kernel/cred.c
85389 index e0573a4..3874e41 100644
85390 --- a/kernel/cred.c
85391 +++ b/kernel/cred.c
85392 @@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
85393 validate_creds(cred);
85394 alter_cred_subscribers(cred, -1);
85395 put_cred(cred);
85396 +
85397 +#ifdef CONFIG_GRKERNSEC_SETXID
85398 + cred = (struct cred *) tsk->delayed_cred;
85399 + if (cred != NULL) {
85400 + tsk->delayed_cred = NULL;
85401 + validate_creds(cred);
85402 + alter_cred_subscribers(cred, -1);
85403 + put_cred(cred);
85404 + }
85405 +#endif
85406 }
85407
85408 /**
85409 @@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
85410 * Always returns 0 thus allowing this function to be tail-called at the end
85411 * of, say, sys_setgid().
85412 */
85413 -int commit_creds(struct cred *new)
85414 +static int __commit_creds(struct cred *new)
85415 {
85416 struct task_struct *task = current;
85417 const struct cred *old = task->real_cred;
85418 @@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
85419
85420 get_cred(new); /* we will require a ref for the subj creds too */
85421
85422 + gr_set_role_label(task, new->uid, new->gid);
85423 +
85424 /* dumpability changes */
85425 if (!uid_eq(old->euid, new->euid) ||
85426 !gid_eq(old->egid, new->egid) ||
85427 @@ -479,6 +491,102 @@ int commit_creds(struct cred *new)
85428 put_cred(old);
85429 return 0;
85430 }
85431 +#ifdef CONFIG_GRKERNSEC_SETXID
85432 +extern int set_user(struct cred *new);
85433 +
85434 +void gr_delayed_cred_worker(void)
85435 +{
85436 + const struct cred *new = current->delayed_cred;
85437 + struct cred *ncred;
85438 +
85439 + current->delayed_cred = NULL;
85440 +
85441 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
85442 + // from doing get_cred on it when queueing this
85443 + put_cred(new);
85444 + return;
85445 + } else if (new == NULL)
85446 + return;
85447 +
85448 + ncred = prepare_creds();
85449 + if (!ncred)
85450 + goto die;
85451 + // uids
85452 + ncred->uid = new->uid;
85453 + ncred->euid = new->euid;
85454 + ncred->suid = new->suid;
85455 + ncred->fsuid = new->fsuid;
85456 + // gids
85457 + ncred->gid = new->gid;
85458 + ncred->egid = new->egid;
85459 + ncred->sgid = new->sgid;
85460 + ncred->fsgid = new->fsgid;
85461 + // groups
85462 + if (set_groups(ncred, new->group_info) < 0) {
85463 + abort_creds(ncred);
85464 + goto die;
85465 + }
85466 + // caps
85467 + ncred->securebits = new->securebits;
85468 + ncred->cap_inheritable = new->cap_inheritable;
85469 + ncred->cap_permitted = new->cap_permitted;
85470 + ncred->cap_effective = new->cap_effective;
85471 + ncred->cap_bset = new->cap_bset;
85472 +
85473 + if (set_user(ncred)) {
85474 + abort_creds(ncred);
85475 + goto die;
85476 + }
85477 +
85478 + // from doing get_cred on it when queueing this
85479 + put_cred(new);
85480 +
85481 + __commit_creds(ncred);
85482 + return;
85483 +die:
85484 + // from doing get_cred on it when queueing this
85485 + put_cred(new);
85486 + do_group_exit(SIGKILL);
85487 +}
85488 +#endif
85489 +
85490 +int commit_creds(struct cred *new)
85491 +{
85492 +#ifdef CONFIG_GRKERNSEC_SETXID
85493 + int ret;
85494 + int schedule_it = 0;
85495 + struct task_struct *t;
85496 +
85497 + /* we won't get called with tasklist_lock held for writing
85498 + and interrupts disabled as the cred struct in that case is
85499 + init_cred
85500 + */
85501 + if (grsec_enable_setxid && !current_is_single_threaded() &&
85502 + uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
85503 + !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
85504 + schedule_it = 1;
85505 + }
85506 + ret = __commit_creds(new);
85507 + if (schedule_it) {
85508 + rcu_read_lock();
85509 + read_lock(&tasklist_lock);
85510 + for (t = next_thread(current); t != current;
85511 + t = next_thread(t)) {
85512 + if (t->delayed_cred == NULL) {
85513 + t->delayed_cred = get_cred(new);
85514 + set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
85515 + set_tsk_need_resched(t);
85516 + }
85517 + }
85518 + read_unlock(&tasklist_lock);
85519 + rcu_read_unlock();
85520 + }
85521 + return ret;
85522 +#else
85523 + return __commit_creds(new);
85524 +#endif
85525 +}
85526 +
85527 EXPORT_SYMBOL(commit_creds);
85528
85529 /**
85530 diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
85531 index 334b398..9145fb1 100644
85532 --- a/kernel/debug/debug_core.c
85533 +++ b/kernel/debug/debug_core.c
85534 @@ -123,7 +123,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
85535 */
85536 static atomic_t masters_in_kgdb;
85537 static atomic_t slaves_in_kgdb;
85538 -static atomic_t kgdb_break_tasklet_var;
85539 +static atomic_unchecked_t kgdb_break_tasklet_var;
85540 atomic_t kgdb_setting_breakpoint;
85541
85542 struct task_struct *kgdb_usethread;
85543 @@ -133,7 +133,7 @@ int kgdb_single_step;
85544 static pid_t kgdb_sstep_pid;
85545
85546 /* to keep track of the CPU which is doing the single stepping*/
85547 -atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
85548 +atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
85549
85550 /*
85551 * If you are debugging a problem where roundup (the collection of
85552 @@ -541,7 +541,7 @@ return_normal:
85553 * kernel will only try for the value of sstep_tries before
85554 * giving up and continuing on.
85555 */
85556 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
85557 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
85558 (kgdb_info[cpu].task &&
85559 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
85560 atomic_set(&kgdb_active, -1);
85561 @@ -639,8 +639,8 @@ cpu_master_loop:
85562 }
85563
85564 kgdb_restore:
85565 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
85566 - int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
85567 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
85568 + int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
85569 if (kgdb_info[sstep_cpu].task)
85570 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
85571 else
85572 @@ -917,18 +917,18 @@ static void kgdb_unregister_callbacks(void)
85573 static void kgdb_tasklet_bpt(unsigned long ing)
85574 {
85575 kgdb_breakpoint();
85576 - atomic_set(&kgdb_break_tasklet_var, 0);
85577 + atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
85578 }
85579
85580 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
85581
85582 void kgdb_schedule_breakpoint(void)
85583 {
85584 - if (atomic_read(&kgdb_break_tasklet_var) ||
85585 + if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
85586 atomic_read(&kgdb_active) != -1 ||
85587 atomic_read(&kgdb_setting_breakpoint))
85588 return;
85589 - atomic_inc(&kgdb_break_tasklet_var);
85590 + atomic_inc_unchecked(&kgdb_break_tasklet_var);
85591 tasklet_schedule(&kgdb_tasklet_breakpoint);
85592 }
85593 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
85594 diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
85595 index 0b097c8..11dd5c5 100644
85596 --- a/kernel/debug/kdb/kdb_main.c
85597 +++ b/kernel/debug/kdb/kdb_main.c
85598 @@ -1977,7 +1977,7 @@ static int kdb_lsmod(int argc, const char **argv)
85599 continue;
85600
85601 kdb_printf("%-20s%8u 0x%p ", mod->name,
85602 - mod->core_size, (void *)mod);
85603 + mod->core_size_rx + mod->core_size_rw, (void *)mod);
85604 #ifdef CONFIG_MODULE_UNLOAD
85605 kdb_printf("%4ld ", module_refcount(mod));
85606 #endif
85607 @@ -1987,7 +1987,7 @@ static int kdb_lsmod(int argc, const char **argv)
85608 kdb_printf(" (Loading)");
85609 else
85610 kdb_printf(" (Live)");
85611 - kdb_printf(" 0x%p", mod->module_core);
85612 + kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
85613
85614 #ifdef CONFIG_MODULE_UNLOAD
85615 {
85616 diff --git a/kernel/events/core.c b/kernel/events/core.c
85617 index fa0b2d4..67a1c7a 100644
85618 --- a/kernel/events/core.c
85619 +++ b/kernel/events/core.c
85620 @@ -158,8 +158,15 @@ static struct srcu_struct pmus_srcu;
85621 * 0 - disallow raw tracepoint access for unpriv
85622 * 1 - disallow cpu events for unpriv
85623 * 2 - disallow kernel profiling for unpriv
85624 + * 3 - disallow all unpriv perf event use
85625 */
85626 -int sysctl_perf_event_paranoid __read_mostly = 1;
85627 +#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
85628 +int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
85629 +#elif defined(CONFIG_GRKERNSEC_HIDESYM)
85630 +int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
85631 +#else
85632 +int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
85633 +#endif
85634
85635 /* Minimum for 512 kiB + 1 user control page */
85636 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
85637 @@ -185,7 +192,7 @@ void update_perf_cpu_limits(void)
85638
85639 tmp *= sysctl_perf_cpu_time_max_percent;
85640 do_div(tmp, 100);
85641 - ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
85642 + ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
85643 }
85644
85645 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
85646 @@ -272,7 +279,7 @@ void perf_sample_event_took(u64 sample_len_ns)
85647 update_perf_cpu_limits();
85648 }
85649
85650 -static atomic64_t perf_event_id;
85651 +static atomic64_unchecked_t perf_event_id;
85652
85653 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
85654 enum event_type_t event_type);
85655 @@ -2986,7 +2993,7 @@ static void __perf_event_read(void *info)
85656
85657 static inline u64 perf_event_count(struct perf_event *event)
85658 {
85659 - return local64_read(&event->count) + atomic64_read(&event->child_count);
85660 + return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
85661 }
85662
85663 static u64 perf_event_read(struct perf_event *event)
85664 @@ -3354,9 +3361,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
85665 mutex_lock(&event->child_mutex);
85666 total += perf_event_read(event);
85667 *enabled += event->total_time_enabled +
85668 - atomic64_read(&event->child_total_time_enabled);
85669 + atomic64_read_unchecked(&event->child_total_time_enabled);
85670 *running += event->total_time_running +
85671 - atomic64_read(&event->child_total_time_running);
85672 + atomic64_read_unchecked(&event->child_total_time_running);
85673
85674 list_for_each_entry(child, &event->child_list, child_list) {
85675 total += perf_event_read(child);
85676 @@ -3785,10 +3792,10 @@ void perf_event_update_userpage(struct perf_event *event)
85677 userpg->offset -= local64_read(&event->hw.prev_count);
85678
85679 userpg->time_enabled = enabled +
85680 - atomic64_read(&event->child_total_time_enabled);
85681 + atomic64_read_unchecked(&event->child_total_time_enabled);
85682
85683 userpg->time_running = running +
85684 - atomic64_read(&event->child_total_time_running);
85685 + atomic64_read_unchecked(&event->child_total_time_running);
85686
85687 arch_perf_update_userpage(userpg, now);
85688
85689 @@ -4339,7 +4346,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
85690
85691 /* Data. */
85692 sp = perf_user_stack_pointer(regs);
85693 - rem = __output_copy_user(handle, (void *) sp, dump_size);
85694 + rem = __output_copy_user(handle, (void __user *) sp, dump_size);
85695 dyn_size = dump_size - rem;
85696
85697 perf_output_skip(handle, rem);
85698 @@ -4430,11 +4437,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
85699 values[n++] = perf_event_count(event);
85700 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
85701 values[n++] = enabled +
85702 - atomic64_read(&event->child_total_time_enabled);
85703 + atomic64_read_unchecked(&event->child_total_time_enabled);
85704 }
85705 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
85706 values[n++] = running +
85707 - atomic64_read(&event->child_total_time_running);
85708 + atomic64_read_unchecked(&event->child_total_time_running);
85709 }
85710 if (read_format & PERF_FORMAT_ID)
85711 values[n++] = primary_event_id(event);
85712 @@ -6704,7 +6711,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
85713 event->parent = parent_event;
85714
85715 event->ns = get_pid_ns(task_active_pid_ns(current));
85716 - event->id = atomic64_inc_return(&perf_event_id);
85717 + event->id = atomic64_inc_return_unchecked(&perf_event_id);
85718
85719 event->state = PERF_EVENT_STATE_INACTIVE;
85720
85721 @@ -7004,6 +7011,11 @@ SYSCALL_DEFINE5(perf_event_open,
85722 if (flags & ~PERF_FLAG_ALL)
85723 return -EINVAL;
85724
85725 +#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
85726 + if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
85727 + return -EACCES;
85728 +#endif
85729 +
85730 err = perf_copy_attr(attr_uptr, &attr);
85731 if (err)
85732 return err;
85733 @@ -7339,10 +7351,10 @@ static void sync_child_event(struct perf_event *child_event,
85734 /*
85735 * Add back the child's count to the parent's count:
85736 */
85737 - atomic64_add(child_val, &parent_event->child_count);
85738 - atomic64_add(child_event->total_time_enabled,
85739 + atomic64_add_unchecked(child_val, &parent_event->child_count);
85740 + atomic64_add_unchecked(child_event->total_time_enabled,
85741 &parent_event->child_total_time_enabled);
85742 - atomic64_add(child_event->total_time_running,
85743 + atomic64_add_unchecked(child_event->total_time_running,
85744 &parent_event->child_total_time_running);
85745
85746 /*
85747 diff --git a/kernel/events/internal.h b/kernel/events/internal.h
85748 index 569b2187..19940d9 100644
85749 --- a/kernel/events/internal.h
85750 +++ b/kernel/events/internal.h
85751 @@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
85752 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
85753 }
85754
85755 -#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
85756 +#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
85757 static inline unsigned long \
85758 func_name(struct perf_output_handle *handle, \
85759 - const void *buf, unsigned long len) \
85760 + const void user *buf, unsigned long len) \
85761 { \
85762 unsigned long size, written; \
85763 \
85764 @@ -117,7 +117,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
85765 return 0;
85766 }
85767
85768 -DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
85769 +DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
85770
85771 static inline unsigned long
85772 memcpy_skip(void *dst, const void *src, unsigned long n)
85773 @@ -125,7 +125,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
85774 return 0;
85775 }
85776
85777 -DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
85778 +DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
85779
85780 #ifndef arch_perf_out_copy_user
85781 #define arch_perf_out_copy_user arch_perf_out_copy_user
85782 @@ -143,7 +143,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
85783 }
85784 #endif
85785
85786 -DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
85787 +DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
85788
85789 /* Callchain handling */
85790 extern struct perf_callchain_entry *
85791 diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
85792 index 307d87c..6466cbe 100644
85793 --- a/kernel/events/uprobes.c
85794 +++ b/kernel/events/uprobes.c
85795 @@ -1666,7 +1666,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
85796 {
85797 struct page *page;
85798 uprobe_opcode_t opcode;
85799 - int result;
85800 + long result;
85801
85802 pagefault_disable();
85803 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
85804 diff --git a/kernel/exit.c b/kernel/exit.c
85805 index 81b3d67..ef189a4 100644
85806 --- a/kernel/exit.c
85807 +++ b/kernel/exit.c
85808 @@ -173,6 +173,10 @@ void release_task(struct task_struct * p)
85809 struct task_struct *leader;
85810 int zap_leader;
85811 repeat:
85812 +#ifdef CONFIG_NET
85813 + gr_del_task_from_ip_table(p);
85814 +#endif
85815 +
85816 /* don't need to get the RCU readlock here - the process is dead and
85817 * can't be modifying its own credentials. But shut RCU-lockdep up */
85818 rcu_read_lock();
85819 @@ -330,7 +334,7 @@ int allow_signal(int sig)
85820 * know it'll be handled, so that they don't get converted to
85821 * SIGKILL or just silently dropped.
85822 */
85823 - current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
85824 + current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
85825 recalc_sigpending();
85826 spin_unlock_irq(&current->sighand->siglock);
85827 return 0;
85828 @@ -706,6 +710,8 @@ void do_exit(long code)
85829 struct task_struct *tsk = current;
85830 int group_dead;
85831
85832 + set_fs(USER_DS);
85833 +
85834 profile_task_exit(tsk);
85835
85836 WARN_ON(blk_needs_flush_plug(tsk));
85837 @@ -722,7 +728,6 @@ void do_exit(long code)
85838 * mm_release()->clear_child_tid() from writing to a user-controlled
85839 * kernel address.
85840 */
85841 - set_fs(USER_DS);
85842
85843 ptrace_event(PTRACE_EVENT_EXIT, code);
85844
85845 @@ -781,6 +786,9 @@ void do_exit(long code)
85846 tsk->exit_code = code;
85847 taskstats_exit(tsk, group_dead);
85848
85849 + gr_acl_handle_psacct(tsk, code);
85850 + gr_acl_handle_exit();
85851 +
85852 exit_mm(tsk);
85853
85854 if (group_dead)
85855 @@ -900,7 +908,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
85856 * Take down every thread in the group. This is called by fatal signals
85857 * as well as by sys_exit_group (below).
85858 */
85859 -void
85860 +__noreturn void
85861 do_group_exit(int exit_code)
85862 {
85863 struct signal_struct *sig = current->signal;
85864 diff --git a/kernel/fork.c b/kernel/fork.c
85865 index a17621c..b77fef8 100644
85866 --- a/kernel/fork.c
85867 +++ b/kernel/fork.c
85868 @@ -319,7 +319,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
85869 *stackend = STACK_END_MAGIC; /* for overflow detection */
85870
85871 #ifdef CONFIG_CC_STACKPROTECTOR
85872 - tsk->stack_canary = get_random_int();
85873 + tsk->stack_canary = pax_get_random_long();
85874 #endif
85875
85876 /*
85877 @@ -345,12 +345,80 @@ free_tsk:
85878 }
85879
85880 #ifdef CONFIG_MMU
85881 -static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
85882 +static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
85883 +{
85884 + struct vm_area_struct *tmp;
85885 + unsigned long charge;
85886 + struct file *file;
85887 + int retval;
85888 +
85889 + charge = 0;
85890 + if (mpnt->vm_flags & VM_ACCOUNT) {
85891 + unsigned long len = vma_pages(mpnt);
85892 +
85893 + if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
85894 + goto fail_nomem;
85895 + charge = len;
85896 + }
85897 + tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
85898 + if (!tmp)
85899 + goto fail_nomem;
85900 + *tmp = *mpnt;
85901 + tmp->vm_mm = mm;
85902 + INIT_LIST_HEAD(&tmp->anon_vma_chain);
85903 + retval = vma_dup_policy(mpnt, tmp);
85904 + if (retval)
85905 + goto fail_nomem_policy;
85906 + if (anon_vma_fork(tmp, mpnt))
85907 + goto fail_nomem_anon_vma_fork;
85908 + tmp->vm_flags &= ~VM_LOCKED;
85909 + tmp->vm_next = tmp->vm_prev = NULL;
85910 + tmp->vm_mirror = NULL;
85911 + file = tmp->vm_file;
85912 + if (file) {
85913 + struct inode *inode = file_inode(file);
85914 + struct address_space *mapping = file->f_mapping;
85915 +
85916 + get_file(file);
85917 + if (tmp->vm_flags & VM_DENYWRITE)
85918 + atomic_dec(&inode->i_writecount);
85919 + mutex_lock(&mapping->i_mmap_mutex);
85920 + if (tmp->vm_flags & VM_SHARED)
85921 + mapping->i_mmap_writable++;
85922 + flush_dcache_mmap_lock(mapping);
85923 + /* insert tmp into the share list, just after mpnt */
85924 + if (unlikely(tmp->vm_flags & VM_NONLINEAR))
85925 + vma_nonlinear_insert(tmp, &mapping->i_mmap_nonlinear);
85926 + else
85927 + vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
85928 + flush_dcache_mmap_unlock(mapping);
85929 + mutex_unlock(&mapping->i_mmap_mutex);
85930 + }
85931 +
85932 + /*
85933 + * Clear hugetlb-related page reserves for children. This only
85934 + * affects MAP_PRIVATE mappings. Faults generated by the child
85935 + * are not guaranteed to succeed, even if read-only
85936 + */
85937 + if (is_vm_hugetlb_page(tmp))
85938 + reset_vma_resv_huge_pages(tmp);
85939 +
85940 + return tmp;
85941 +
85942 +fail_nomem_anon_vma_fork:
85943 + mpol_put(vma_policy(tmp));
85944 +fail_nomem_policy:
85945 + kmem_cache_free(vm_area_cachep, tmp);
85946 +fail_nomem:
85947 + vm_unacct_memory(charge);
85948 + return NULL;
85949 +}
85950 +
85951 +static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
85952 {
85953 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
85954 struct rb_node **rb_link, *rb_parent;
85955 int retval;
85956 - unsigned long charge;
85957
85958 uprobe_start_dup_mmap();
85959 down_write(&oldmm->mmap_sem);
85960 @@ -379,55 +447,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
85961
85962 prev = NULL;
85963 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
85964 - struct file *file;
85965 -
85966 if (mpnt->vm_flags & VM_DONTCOPY) {
85967 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
85968 -vma_pages(mpnt));
85969 continue;
85970 }
85971 - charge = 0;
85972 - if (mpnt->vm_flags & VM_ACCOUNT) {
85973 - unsigned long len = vma_pages(mpnt);
85974 -
85975 - if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
85976 - goto fail_nomem;
85977 - charge = len;
85978 - }
85979 - tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
85980 - if (!tmp)
85981 - goto fail_nomem;
85982 - *tmp = *mpnt;
85983 - INIT_LIST_HEAD(&tmp->anon_vma_chain);
85984 - retval = vma_dup_policy(mpnt, tmp);
85985 - if (retval)
85986 - goto fail_nomem_policy;
85987 - tmp->vm_mm = mm;
85988 - if (anon_vma_fork(tmp, mpnt))
85989 - goto fail_nomem_anon_vma_fork;
85990 - tmp->vm_flags &= ~VM_LOCKED;
85991 - tmp->vm_next = tmp->vm_prev = NULL;
85992 - file = tmp->vm_file;
85993 - if (file) {
85994 - struct inode *inode = file_inode(file);
85995 - struct address_space *mapping = file->f_mapping;
85996 -
85997 - get_file(file);
85998 - if (tmp->vm_flags & VM_DENYWRITE)
85999 - atomic_dec(&inode->i_writecount);
86000 - mutex_lock(&mapping->i_mmap_mutex);
86001 - if (tmp->vm_flags & VM_SHARED)
86002 - mapping->i_mmap_writable++;
86003 - flush_dcache_mmap_lock(mapping);
86004 - /* insert tmp into the share list, just after mpnt */
86005 - if (unlikely(tmp->vm_flags & VM_NONLINEAR))
86006 - vma_nonlinear_insert(tmp,
86007 - &mapping->i_mmap_nonlinear);
86008 - else
86009 - vma_interval_tree_insert_after(tmp, mpnt,
86010 - &mapping->i_mmap);
86011 - flush_dcache_mmap_unlock(mapping);
86012 - mutex_unlock(&mapping->i_mmap_mutex);
86013 + tmp = dup_vma(mm, oldmm, mpnt);
86014 + if (!tmp) {
86015 + retval = -ENOMEM;
86016 + goto out;
86017 }
86018
86019 /*
86020 @@ -459,6 +487,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
86021 if (retval)
86022 goto out;
86023 }
86024 +
86025 +#ifdef CONFIG_PAX_SEGMEXEC
86026 + if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
86027 + struct vm_area_struct *mpnt_m;
86028 +
86029 + for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
86030 + BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
86031 +
86032 + if (!mpnt->vm_mirror)
86033 + continue;
86034 +
86035 + if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
86036 + BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
86037 + mpnt->vm_mirror = mpnt_m;
86038 + } else {
86039 + BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
86040 + mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
86041 + mpnt_m->vm_mirror->vm_mirror = mpnt_m;
86042 + mpnt->vm_mirror->vm_mirror = mpnt;
86043 + }
86044 + }
86045 + BUG_ON(mpnt_m);
86046 + }
86047 +#endif
86048 +
86049 /* a new mm has just been created */
86050 arch_dup_mmap(oldmm, mm);
86051 retval = 0;
86052 @@ -468,14 +521,6 @@ out:
86053 up_write(&oldmm->mmap_sem);
86054 uprobe_end_dup_mmap();
86055 return retval;
86056 -fail_nomem_anon_vma_fork:
86057 - mpol_put(vma_policy(tmp));
86058 -fail_nomem_policy:
86059 - kmem_cache_free(vm_area_cachep, tmp);
86060 -fail_nomem:
86061 - retval = -ENOMEM;
86062 - vm_unacct_memory(charge);
86063 - goto out;
86064 }
86065
86066 static inline int mm_alloc_pgd(struct mm_struct *mm)
86067 @@ -689,8 +734,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
86068 return ERR_PTR(err);
86069
86070 mm = get_task_mm(task);
86071 - if (mm && mm != current->mm &&
86072 - !ptrace_may_access(task, mode)) {
86073 + if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
86074 + (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
86075 mmput(mm);
86076 mm = ERR_PTR(-EACCES);
86077 }
86078 @@ -906,13 +951,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
86079 spin_unlock(&fs->lock);
86080 return -EAGAIN;
86081 }
86082 - fs->users++;
86083 + atomic_inc(&fs->users);
86084 spin_unlock(&fs->lock);
86085 return 0;
86086 }
86087 tsk->fs = copy_fs_struct(fs);
86088 if (!tsk->fs)
86089 return -ENOMEM;
86090 + /* Carry through gr_chroot_dentry and is_chrooted instead
86091 + of recomputing it here. Already copied when the task struct
86092 + is duplicated. This allows pivot_root to not be treated as
86093 + a chroot
86094 + */
86095 + //gr_set_chroot_entries(tsk, &tsk->fs->root);
86096 +
86097 return 0;
86098 }
86099
86100 @@ -1130,7 +1182,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
86101 * parts of the process environment (as per the clone
86102 * flags). The actual kick-off is left to the caller.
86103 */
86104 -static struct task_struct *copy_process(unsigned long clone_flags,
86105 +static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
86106 unsigned long stack_start,
86107 unsigned long stack_size,
86108 int __user *child_tidptr,
86109 @@ -1202,6 +1254,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
86110 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
86111 #endif
86112 retval = -EAGAIN;
86113 +
86114 + gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
86115 +
86116 if (atomic_read(&p->real_cred->user->processes) >=
86117 task_rlimit(p, RLIMIT_NPROC)) {
86118 if (p->real_cred->user != INIT_USER &&
86119 @@ -1449,6 +1504,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
86120 goto bad_fork_free_pid;
86121 }
86122
86123 + /* synchronizes with gr_set_acls()
86124 + we need to call this past the point of no return for fork()
86125 + */
86126 + gr_copy_label(p);
86127 +
86128 if (likely(p->pid)) {
86129 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
86130
86131 @@ -1537,6 +1597,8 @@ bad_fork_cleanup_count:
86132 bad_fork_free:
86133 free_task(p);
86134 fork_out:
86135 + gr_log_forkfail(retval);
86136 +
86137 return ERR_PTR(retval);
86138 }
86139
86140 @@ -1598,6 +1660,7 @@ long do_fork(unsigned long clone_flags,
86141
86142 p = copy_process(clone_flags, stack_start, stack_size,
86143 child_tidptr, NULL, trace);
86144 + add_latent_entropy();
86145 /*
86146 * Do this prior waking up the new thread - the thread pointer
86147 * might get invalid after that point, if the thread exits quickly.
86148 @@ -1612,6 +1675,8 @@ long do_fork(unsigned long clone_flags,
86149 if (clone_flags & CLONE_PARENT_SETTID)
86150 put_user(nr, parent_tidptr);
86151
86152 + gr_handle_brute_check();
86153 +
86154 if (clone_flags & CLONE_VFORK) {
86155 p->vfork_done = &vfork;
86156 init_completion(&vfork);
86157 @@ -1728,7 +1793,7 @@ void __init proc_caches_init(void)
86158 mm_cachep = kmem_cache_create("mm_struct",
86159 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
86160 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
86161 - vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
86162 + vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
86163 mmap_init();
86164 nsproxy_cache_init();
86165 }
86166 @@ -1768,7 +1833,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
86167 return 0;
86168
86169 /* don't need lock here; in the worst case we'll do useless copy */
86170 - if (fs->users == 1)
86171 + if (atomic_read(&fs->users) == 1)
86172 return 0;
86173
86174 *new_fsp = copy_fs_struct(fs);
86175 @@ -1875,7 +1940,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
86176 fs = current->fs;
86177 spin_lock(&fs->lock);
86178 current->fs = new_fs;
86179 - if (--fs->users)
86180 + gr_set_chroot_entries(current, &current->fs->root);
86181 + if (atomic_dec_return(&fs->users))
86182 new_fs = NULL;
86183 else
86184 new_fs = fs;
86185 diff --git a/kernel/futex.c b/kernel/futex.c
86186 index 6801b37..bb6becca 100644
86187 --- a/kernel/futex.c
86188 +++ b/kernel/futex.c
86189 @@ -54,6 +54,7 @@
86190 #include <linux/mount.h>
86191 #include <linux/pagemap.h>
86192 #include <linux/syscalls.h>
86193 +#include <linux/ptrace.h>
86194 #include <linux/signal.h>
86195 #include <linux/export.h>
86196 #include <linux/magic.h>
86197 @@ -380,6 +381,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
86198 struct page *page, *page_head;
86199 int err, ro = 0;
86200
86201 +#ifdef CONFIG_PAX_SEGMEXEC
86202 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
86203 + return -EFAULT;
86204 +#endif
86205 +
86206 /*
86207 * The futex address must be "naturally" aligned.
86208 */
86209 @@ -579,7 +585,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
86210
86211 static int get_futex_value_locked(u32 *dest, u32 __user *from)
86212 {
86213 - int ret;
86214 + unsigned long ret;
86215
86216 pagefault_disable();
86217 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
86218 @@ -2886,6 +2892,7 @@ static void __init futex_detect_cmpxchg(void)
86219 {
86220 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
86221 u32 curval;
86222 + mm_segment_t oldfs;
86223
86224 /*
86225 * This will fail and we want it. Some arch implementations do
86226 @@ -2897,8 +2904,11 @@ static void __init futex_detect_cmpxchg(void)
86227 * implementation, the non-functional ones will return
86228 * -ENOSYS.
86229 */
86230 + oldfs = get_fs();
86231 + set_fs(USER_DS);
86232 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
86233 futex_cmpxchg_enabled = 1;
86234 + set_fs(oldfs);
86235 #endif
86236 }
86237
86238 diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
86239 index f9f44fd..29885e4 100644
86240 --- a/kernel/futex_compat.c
86241 +++ b/kernel/futex_compat.c
86242 @@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
86243 return 0;
86244 }
86245
86246 -static void __user *futex_uaddr(struct robust_list __user *entry,
86247 +static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
86248 compat_long_t futex_offset)
86249 {
86250 compat_uptr_t base = ptr_to_compat(entry);
86251 diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
86252 index f45b75b..bfac6d5 100644
86253 --- a/kernel/gcov/base.c
86254 +++ b/kernel/gcov/base.c
86255 @@ -108,11 +108,6 @@ void gcov_enable_events(void)
86256 }
86257
86258 #ifdef CONFIG_MODULES
86259 -static inline int within(void *addr, void *start, unsigned long size)
86260 -{
86261 - return ((addr >= start) && (addr < start + size));
86262 -}
86263 -
86264 /* Update list and generate events when modules are unloaded. */
86265 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
86266 void *data)
86267 @@ -127,7 +122,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
86268
86269 /* Remove entries located in module from linked list. */
86270 while ((info = gcov_info_next(info))) {
86271 - if (within(info, mod->module_core, mod->core_size)) {
86272 + if (within_module_core_rw((unsigned long)info, mod)) {
86273 gcov_info_unlink(prev, info);
86274 if (gcov_events_enabled)
86275 gcov_event(GCOV_REMOVE, info);
86276 diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
86277 index 0909436..6037d22 100644
86278 --- a/kernel/hrtimer.c
86279 +++ b/kernel/hrtimer.c
86280 @@ -1439,7 +1439,7 @@ void hrtimer_peek_ahead_timers(void)
86281 local_irq_restore(flags);
86282 }
86283
86284 -static void run_hrtimer_softirq(struct softirq_action *h)
86285 +static __latent_entropy void run_hrtimer_softirq(void)
86286 {
86287 hrtimer_peek_ahead_timers();
86288 }
86289 diff --git a/kernel/irq_work.c b/kernel/irq_work.c
86290 index 55fcce6..0e4cf34 100644
86291 --- a/kernel/irq_work.c
86292 +++ b/kernel/irq_work.c
86293 @@ -189,12 +189,13 @@ static int irq_work_cpu_notify(struct notifier_block *self,
86294 return NOTIFY_OK;
86295 }
86296
86297 -static struct notifier_block cpu_notify;
86298 +static struct notifier_block cpu_notify = {
86299 + .notifier_call = irq_work_cpu_notify,
86300 + .priority = 0,
86301 +};
86302
86303 static __init int irq_work_init_cpu_notifier(void)
86304 {
86305 - cpu_notify.notifier_call = irq_work_cpu_notify;
86306 - cpu_notify.priority = 0;
86307 register_cpu_notifier(&cpu_notify);
86308 return 0;
86309 }
86310 diff --git a/kernel/jump_label.c b/kernel/jump_label.c
86311 index 9019f15..9a3c42e 100644
86312 --- a/kernel/jump_label.c
86313 +++ b/kernel/jump_label.c
86314 @@ -14,6 +14,7 @@
86315 #include <linux/err.h>
86316 #include <linux/static_key.h>
86317 #include <linux/jump_label_ratelimit.h>
86318 +#include <linux/mm.h>
86319
86320 #ifdef HAVE_JUMP_LABEL
86321
86322 @@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
86323
86324 size = (((unsigned long)stop - (unsigned long)start)
86325 / sizeof(struct jump_entry));
86326 + pax_open_kernel();
86327 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
86328 + pax_close_kernel();
86329 }
86330
86331 static void jump_label_update(struct static_key *key, int enable);
86332 @@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
86333 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
86334 struct jump_entry *iter;
86335
86336 + pax_open_kernel();
86337 for (iter = iter_start; iter < iter_stop; iter++) {
86338 if (within_module_init(iter->code, mod))
86339 iter->code = 0;
86340 }
86341 + pax_close_kernel();
86342 }
86343
86344 static int
86345 diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
86346 index 3127ad5..159d880 100644
86347 --- a/kernel/kallsyms.c
86348 +++ b/kernel/kallsyms.c
86349 @@ -11,6 +11,9 @@
86350 * Changed the compression method from stem compression to "table lookup"
86351 * compression (see scripts/kallsyms.c for a more complete description)
86352 */
86353 +#ifdef CONFIG_GRKERNSEC_HIDESYM
86354 +#define __INCLUDED_BY_HIDESYM 1
86355 +#endif
86356 #include <linux/kallsyms.h>
86357 #include <linux/module.h>
86358 #include <linux/init.h>
86359 @@ -53,12 +56,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
86360
86361 static inline int is_kernel_inittext(unsigned long addr)
86362 {
86363 + if (system_state != SYSTEM_BOOTING)
86364 + return 0;
86365 +
86366 if (addr >= (unsigned long)_sinittext
86367 && addr <= (unsigned long)_einittext)
86368 return 1;
86369 return 0;
86370 }
86371
86372 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
86373 +#ifdef CONFIG_MODULES
86374 +static inline int is_module_text(unsigned long addr)
86375 +{
86376 + if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
86377 + return 1;
86378 +
86379 + addr = ktla_ktva(addr);
86380 + return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
86381 +}
86382 +#else
86383 +static inline int is_module_text(unsigned long addr)
86384 +{
86385 + return 0;
86386 +}
86387 +#endif
86388 +#endif
86389 +
86390 static inline int is_kernel_text(unsigned long addr)
86391 {
86392 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
86393 @@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigned long addr)
86394
86395 static inline int is_kernel(unsigned long addr)
86396 {
86397 +
86398 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
86399 + if (is_kernel_text(addr) || is_kernel_inittext(addr))
86400 + return 1;
86401 +
86402 + if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
86403 +#else
86404 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
86405 +#endif
86406 +
86407 return 1;
86408 return in_gate_area_no_mm(addr);
86409 }
86410
86411 static int is_ksym_addr(unsigned long addr)
86412 {
86413 +
86414 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
86415 + if (is_module_text(addr))
86416 + return 0;
86417 +#endif
86418 +
86419 if (all_var)
86420 return is_kernel(addr);
86421
86422 @@ -480,7 +519,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
86423
86424 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
86425 {
86426 - iter->name[0] = '\0';
86427 iter->nameoff = get_symbol_offset(new_pos);
86428 iter->pos = new_pos;
86429 }
86430 @@ -528,6 +566,11 @@ static int s_show(struct seq_file *m, void *p)
86431 {
86432 struct kallsym_iter *iter = m->private;
86433
86434 +#ifdef CONFIG_GRKERNSEC_HIDESYM
86435 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
86436 + return 0;
86437 +#endif
86438 +
86439 /* Some debugging symbols have no name. Ignore them. */
86440 if (!iter->name[0])
86441 return 0;
86442 @@ -541,6 +584,7 @@ static int s_show(struct seq_file *m, void *p)
86443 */
86444 type = iter->exported ? toupper(iter->type) :
86445 tolower(iter->type);
86446 +
86447 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
86448 type, iter->name, iter->module_name);
86449 } else
86450 @@ -566,7 +610,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
86451 struct kallsym_iter *iter;
86452 int ret;
86453
86454 - iter = kmalloc(sizeof(*iter), GFP_KERNEL);
86455 + iter = kzalloc(sizeof(*iter), GFP_KERNEL);
86456 if (!iter)
86457 return -ENOMEM;
86458 reset_iter(iter, 0);
86459 diff --git a/kernel/kcmp.c b/kernel/kcmp.c
86460 index e30ac0f..3528cac 100644
86461 --- a/kernel/kcmp.c
86462 +++ b/kernel/kcmp.c
86463 @@ -99,6 +99,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
86464 struct task_struct *task1, *task2;
86465 int ret;
86466
86467 +#ifdef CONFIG_GRKERNSEC
86468 + return -ENOSYS;
86469 +#endif
86470 +
86471 rcu_read_lock();
86472
86473 /*
86474 diff --git a/kernel/kexec.c b/kernel/kexec.c
86475 index 60bafbe..a120f4f 100644
86476 --- a/kernel/kexec.c
86477 +++ b/kernel/kexec.c
86478 @@ -1045,7 +1045,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
86479 unsigned long flags)
86480 {
86481 struct compat_kexec_segment in;
86482 - struct kexec_segment out, __user *ksegments;
86483 + struct kexec_segment out;
86484 + struct kexec_segment __user *ksegments;
86485 unsigned long i, result;
86486
86487 /* Don't allow clients that don't understand the native
86488 diff --git a/kernel/kmod.c b/kernel/kmod.c
86489 index 6b375af..eaff670 100644
86490 --- a/kernel/kmod.c
86491 +++ b/kernel/kmod.c
86492 @@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
86493 kfree(info->argv);
86494 }
86495
86496 -static int call_modprobe(char *module_name, int wait)
86497 +static int call_modprobe(char *module_name, char *module_param, int wait)
86498 {
86499 struct subprocess_info *info;
86500 static char *envp[] = {
86501 @@ -85,7 +85,7 @@ static int call_modprobe(char *module_name, int wait)
86502 NULL
86503 };
86504
86505 - char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
86506 + char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
86507 if (!argv)
86508 goto out;
86509
86510 @@ -97,7 +97,8 @@ static int call_modprobe(char *module_name, int wait)
86511 argv[1] = "-q";
86512 argv[2] = "--";
86513 argv[3] = module_name; /* check free_modprobe_argv() */
86514 - argv[4] = NULL;
86515 + argv[4] = module_param;
86516 + argv[5] = NULL;
86517
86518 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
86519 NULL, free_modprobe_argv, NULL);
86520 @@ -129,9 +130,8 @@ out:
86521 * If module auto-loading support is disabled then this function
86522 * becomes a no-operation.
86523 */
86524 -int __request_module(bool wait, const char *fmt, ...)
86525 +static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
86526 {
86527 - va_list args;
86528 char module_name[MODULE_NAME_LEN];
86529 unsigned int max_modprobes;
86530 int ret;
86531 @@ -150,9 +150,7 @@ int __request_module(bool wait, const char *fmt, ...)
86532 if (!modprobe_path[0])
86533 return 0;
86534
86535 - va_start(args, fmt);
86536 - ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
86537 - va_end(args);
86538 + ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
86539 if (ret >= MODULE_NAME_LEN)
86540 return -ENAMETOOLONG;
86541
86542 @@ -160,6 +158,20 @@ int __request_module(bool wait, const char *fmt, ...)
86543 if (ret)
86544 return ret;
86545
86546 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
86547 + if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
86548 + /* hack to workaround consolekit/udisks stupidity */
86549 + read_lock(&tasklist_lock);
86550 + if (!strcmp(current->comm, "mount") &&
86551 + current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
86552 + read_unlock(&tasklist_lock);
86553 + printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
86554 + return -EPERM;
86555 + }
86556 + read_unlock(&tasklist_lock);
86557 + }
86558 +#endif
86559 +
86560 /* If modprobe needs a service that is in a module, we get a recursive
86561 * loop. Limit the number of running kmod threads to max_threads/2 or
86562 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
86563 @@ -188,11 +200,52 @@ int __request_module(bool wait, const char *fmt, ...)
86564
86565 trace_module_request(module_name, wait, _RET_IP_);
86566
86567 - ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
86568 + ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
86569
86570 atomic_dec(&kmod_concurrent);
86571 return ret;
86572 }
86573 +
86574 +int ___request_module(bool wait, char *module_param, const char *fmt, ...)
86575 +{
86576 + va_list args;
86577 + int ret;
86578 +
86579 + va_start(args, fmt);
86580 + ret = ____request_module(wait, module_param, fmt, args);
86581 + va_end(args);
86582 +
86583 + return ret;
86584 +}
86585 +
86586 +int __request_module(bool wait, const char *fmt, ...)
86587 +{
86588 + va_list args;
86589 + int ret;
86590 +
86591 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
86592 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
86593 + char module_param[MODULE_NAME_LEN];
86594 +
86595 + memset(module_param, 0, sizeof(module_param));
86596 +
86597 + snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
86598 +
86599 + va_start(args, fmt);
86600 + ret = ____request_module(wait, module_param, fmt, args);
86601 + va_end(args);
86602 +
86603 + return ret;
86604 + }
86605 +#endif
86606 +
86607 + va_start(args, fmt);
86608 + ret = ____request_module(wait, NULL, fmt, args);
86609 + va_end(args);
86610 +
86611 + return ret;
86612 +}
86613 +
86614 EXPORT_SYMBOL(__request_module);
86615 #endif /* CONFIG_MODULES */
86616
86617 @@ -218,6 +271,20 @@ static int ____call_usermodehelper(void *data)
86618 */
86619 set_user_nice(current, 0);
86620
86621 +#ifdef CONFIG_GRKERNSEC
86622 + /* this is race-free as far as userland is concerned as we copied
86623 + out the path to be used prior to this point and are now operating
86624 + on that copy
86625 + */
86626 + if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
86627 + strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
86628 + strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
86629 + printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path);
86630 + retval = -EPERM;
86631 + goto fail;
86632 + }
86633 +#endif
86634 +
86635 retval = -ENOMEM;
86636 new = prepare_kernel_cred(current);
86637 if (!new)
86638 @@ -240,8 +307,8 @@ static int ____call_usermodehelper(void *data)
86639 commit_creds(new);
86640
86641 retval = do_execve(getname_kernel(sub_info->path),
86642 - (const char __user *const __user *)sub_info->argv,
86643 - (const char __user *const __user *)sub_info->envp);
86644 + (const char __user *const __force_user *)sub_info->argv,
86645 + (const char __user *const __force_user *)sub_info->envp);
86646 if (!retval)
86647 return 0;
86648
86649 @@ -260,6 +327,10 @@ static int call_helper(void *data)
86650
86651 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
86652 {
86653 +#ifdef CONFIG_GRKERNSEC
86654 + kfree(info->path);
86655 + info->path = info->origpath;
86656 +#endif
86657 if (info->cleanup)
86658 (*info->cleanup)(info);
86659 kfree(info);
86660 @@ -303,7 +374,7 @@ static int wait_for_helper(void *data)
86661 *
86662 * Thus the __user pointer cast is valid here.
86663 */
86664 - sys_wait4(pid, (int __user *)&ret, 0, NULL);
86665 + sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
86666
86667 /*
86668 * If ret is 0, either ____call_usermodehelper failed and the
86669 @@ -542,7 +613,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
86670 goto out;
86671
86672 INIT_WORK(&sub_info->work, __call_usermodehelper);
86673 +#ifdef CONFIG_GRKERNSEC
86674 + sub_info->origpath = path;
86675 + sub_info->path = kstrdup(path, gfp_mask);
86676 +#else
86677 sub_info->path = path;
86678 +#endif
86679 sub_info->argv = argv;
86680 sub_info->envp = envp;
86681
86682 @@ -650,7 +726,7 @@ EXPORT_SYMBOL(call_usermodehelper);
86683 static int proc_cap_handler(struct ctl_table *table, int write,
86684 void __user *buffer, size_t *lenp, loff_t *ppos)
86685 {
86686 - struct ctl_table t;
86687 + ctl_table_no_const t;
86688 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
86689 kernel_cap_t new_cap;
86690 int err, i;
86691 diff --git a/kernel/kprobes.c b/kernel/kprobes.c
86692 index ceeadfc..11c18b6 100644
86693 --- a/kernel/kprobes.c
86694 +++ b/kernel/kprobes.c
86695 @@ -31,6 +31,9 @@
86696 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
86697 * <prasanna@in.ibm.com> added function-return probes.
86698 */
86699 +#ifdef CONFIG_GRKERNSEC_HIDESYM
86700 +#define __INCLUDED_BY_HIDESYM 1
86701 +#endif
86702 #include <linux/kprobes.h>
86703 #include <linux/hash.h>
86704 #include <linux/init.h>
86705 @@ -135,12 +138,12 @@ enum kprobe_slot_state {
86706
86707 static void *alloc_insn_page(void)
86708 {
86709 - return module_alloc(PAGE_SIZE);
86710 + return module_alloc_exec(PAGE_SIZE);
86711 }
86712
86713 static void free_insn_page(void *page)
86714 {
86715 - module_free(NULL, page);
86716 + module_free_exec(NULL, page);
86717 }
86718
86719 struct kprobe_insn_cache kprobe_insn_slots = {
86720 @@ -2151,11 +2154,11 @@ static void __kprobes report_probe(struct seq_file *pi, struct kprobe *p,
86721 kprobe_type = "k";
86722
86723 if (sym)
86724 - seq_printf(pi, "%p %s %s+0x%x %s ",
86725 + seq_printf(pi, "%pK %s %s+0x%x %s ",
86726 p->addr, kprobe_type, sym, offset,
86727 (modname ? modname : " "));
86728 else
86729 - seq_printf(pi, "%p %s %p ",
86730 + seq_printf(pi, "%pK %s %pK ",
86731 p->addr, kprobe_type, p->addr);
86732
86733 if (!pp)
86734 diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
86735 index d945a94..0b7f45f 100644
86736 --- a/kernel/ksysfs.c
86737 +++ b/kernel/ksysfs.c
86738 @@ -46,6 +46,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
86739 {
86740 if (count+1 > UEVENT_HELPER_PATH_LEN)
86741 return -ENOENT;
86742 + if (!capable(CAP_SYS_ADMIN))
86743 + return -EPERM;
86744 memcpy(uevent_helper, buf, count);
86745 uevent_helper[count] = '\0';
86746 if (count && uevent_helper[count-1] == '\n')
86747 @@ -172,7 +174,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
86748 return count;
86749 }
86750
86751 -static struct bin_attribute notes_attr = {
86752 +static bin_attribute_no_const notes_attr __read_only = {
86753 .attr = {
86754 .name = "notes",
86755 .mode = S_IRUGO,
86756 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
86757 index eb8a547..321d8e1 100644
86758 --- a/kernel/locking/lockdep.c
86759 +++ b/kernel/locking/lockdep.c
86760 @@ -597,6 +597,10 @@ static int static_obj(void *obj)
86761 end = (unsigned long) &_end,
86762 addr = (unsigned long) obj;
86763
86764 +#ifdef CONFIG_PAX_KERNEXEC
86765 + start = ktla_ktva(start);
86766 +#endif
86767 +
86768 /*
86769 * static variable?
86770 */
86771 @@ -738,6 +742,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
86772 if (!static_obj(lock->key)) {
86773 debug_locks_off();
86774 printk("INFO: trying to register non-static key.\n");
86775 + printk("lock:%pS key:%pS.\n", lock, lock->key);
86776 printk("the code is fine but needs lockdep annotation.\n");
86777 printk("turning off the locking correctness validator.\n");
86778 dump_stack();
86779 @@ -3082,7 +3087,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
86780 if (!class)
86781 return 0;
86782 }
86783 - atomic_inc((atomic_t *)&class->ops);
86784 + atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
86785 if (very_verbose(class)) {
86786 printk("\nacquire class [%p] %s", class->key, class->name);
86787 if (class->name_version > 1)
86788 diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
86789 index ef43ac4..2720dfa 100644
86790 --- a/kernel/locking/lockdep_proc.c
86791 +++ b/kernel/locking/lockdep_proc.c
86792 @@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
86793 return 0;
86794 }
86795
86796 - seq_printf(m, "%p", class->key);
86797 + seq_printf(m, "%pK", class->key);
86798 #ifdef CONFIG_DEBUG_LOCKDEP
86799 seq_printf(m, " OPS:%8ld", class->ops);
86800 #endif
86801 @@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
86802
86803 list_for_each_entry(entry, &class->locks_after, entry) {
86804 if (entry->distance == 1) {
86805 - seq_printf(m, " -> [%p] ", entry->class->key);
86806 + seq_printf(m, " -> [%pK] ", entry->class->key);
86807 print_name(m, entry->class);
86808 seq_puts(m, "\n");
86809 }
86810 @@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
86811 if (!class->key)
86812 continue;
86813
86814 - seq_printf(m, "[%p] ", class->key);
86815 + seq_printf(m, "[%pK] ", class->key);
86816 print_name(m, class);
86817 seq_puts(m, "\n");
86818 }
86819 @@ -496,7 +496,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
86820 if (!i)
86821 seq_line(m, '-', 40-namelen, namelen);
86822
86823 - snprintf(ip, sizeof(ip), "[<%p>]",
86824 + snprintf(ip, sizeof(ip), "[<%pK>]",
86825 (void *)class->contention_point[i]);
86826 seq_printf(m, "%40s %14lu %29s %pS\n",
86827 name, stats->contention_point[i],
86828 @@ -511,7 +511,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
86829 if (!i)
86830 seq_line(m, '-', 40-namelen, namelen);
86831
86832 - snprintf(ip, sizeof(ip), "[<%p>]",
86833 + snprintf(ip, sizeof(ip), "[<%pK>]",
86834 (void *)class->contending_point[i]);
86835 seq_printf(m, "%40s %14lu %29s %pS\n",
86836 name, stats->contending_point[i],
86837 diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
86838 index faf6f5b..dc9070a 100644
86839 --- a/kernel/locking/mutex-debug.c
86840 +++ b/kernel/locking/mutex-debug.c
86841 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
86842 }
86843
86844 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
86845 - struct thread_info *ti)
86846 + struct task_struct *task)
86847 {
86848 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
86849
86850 /* Mark the current thread as blocked on the lock: */
86851 - ti->task->blocked_on = waiter;
86852 + task->blocked_on = waiter;
86853 }
86854
86855 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
86856 - struct thread_info *ti)
86857 + struct task_struct *task)
86858 {
86859 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
86860 - DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
86861 - DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
86862 - ti->task->blocked_on = NULL;
86863 + DEBUG_LOCKS_WARN_ON(waiter->task != task);
86864 + DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
86865 + task->blocked_on = NULL;
86866
86867 list_del_init(&waiter->list);
86868 waiter->task = NULL;
86869 diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
86870 index 0799fd3..d06ae3b 100644
86871 --- a/kernel/locking/mutex-debug.h
86872 +++ b/kernel/locking/mutex-debug.h
86873 @@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
86874 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
86875 extern void debug_mutex_add_waiter(struct mutex *lock,
86876 struct mutex_waiter *waiter,
86877 - struct thread_info *ti);
86878 + struct task_struct *task);
86879 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
86880 - struct thread_info *ti);
86881 + struct task_struct *task);
86882 extern void debug_mutex_unlock(struct mutex *lock);
86883 extern void debug_mutex_init(struct mutex *lock, const char *name,
86884 struct lock_class_key *key);
86885 diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
86886 index 4dd6e4c..df52693 100644
86887 --- a/kernel/locking/mutex.c
86888 +++ b/kernel/locking/mutex.c
86889 @@ -135,7 +135,7 @@ void mspin_lock(struct mspin_node **lock, struct mspin_node *node)
86890 node->locked = 1;
86891 return;
86892 }
86893 - ACCESS_ONCE(prev->next) = node;
86894 + ACCESS_ONCE_RW(prev->next) = node;
86895 smp_wmb();
86896 /* Wait until the lock holder passes the lock down */
86897 while (!ACCESS_ONCE(node->locked))
86898 @@ -156,7 +156,7 @@ static void mspin_unlock(struct mspin_node **lock, struct mspin_node *node)
86899 while (!(next = ACCESS_ONCE(node->next)))
86900 arch_mutex_cpu_relax();
86901 }
86902 - ACCESS_ONCE(next->locked) = 1;
86903 + ACCESS_ONCE_RW(next->locked) = 1;
86904 smp_wmb();
86905 }
86906
86907 @@ -520,7 +520,7 @@ slowpath:
86908 goto skip_wait;
86909
86910 debug_mutex_lock_common(lock, &waiter);
86911 - debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
86912 + debug_mutex_add_waiter(lock, &waiter, task);
86913
86914 /* add waiting tasks to the end of the waitqueue (FIFO): */
86915 list_add_tail(&waiter.list, &lock->wait_list);
86916 @@ -564,7 +564,7 @@ slowpath:
86917 schedule_preempt_disabled();
86918 spin_lock_mutex(&lock->wait_lock, flags);
86919 }
86920 - mutex_remove_waiter(lock, &waiter, current_thread_info());
86921 + mutex_remove_waiter(lock, &waiter, task);
86922 /* set it to 0 if there are no waiters left: */
86923 if (likely(list_empty(&lock->wait_list)))
86924 atomic_set(&lock->count, 0);
86925 @@ -601,7 +601,7 @@ skip_wait:
86926 return 0;
86927
86928 err:
86929 - mutex_remove_waiter(lock, &waiter, task_thread_info(task));
86930 + mutex_remove_waiter(lock, &waiter, task);
86931 spin_unlock_mutex(&lock->wait_lock, flags);
86932 debug_mutex_free_waiter(&waiter);
86933 mutex_release(&lock->dep_map, 1, ip);
86934 diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
86935 index 1d96dd0..994ff19 100644
86936 --- a/kernel/locking/rtmutex-tester.c
86937 +++ b/kernel/locking/rtmutex-tester.c
86938 @@ -22,7 +22,7 @@
86939 #define MAX_RT_TEST_MUTEXES 8
86940
86941 static spinlock_t rttest_lock;
86942 -static atomic_t rttest_event;
86943 +static atomic_unchecked_t rttest_event;
86944
86945 struct test_thread_data {
86946 int opcode;
86947 @@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
86948
86949 case RTTEST_LOCKCONT:
86950 td->mutexes[td->opdata] = 1;
86951 - td->event = atomic_add_return(1, &rttest_event);
86952 + td->event = atomic_add_return_unchecked(1, &rttest_event);
86953 return 0;
86954
86955 case RTTEST_RESET:
86956 @@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
86957 return 0;
86958
86959 case RTTEST_RESETEVENT:
86960 - atomic_set(&rttest_event, 0);
86961 + atomic_set_unchecked(&rttest_event, 0);
86962 return 0;
86963
86964 default:
86965 @@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
86966 return ret;
86967
86968 td->mutexes[id] = 1;
86969 - td->event = atomic_add_return(1, &rttest_event);
86970 + td->event = atomic_add_return_unchecked(1, &rttest_event);
86971 rt_mutex_lock(&mutexes[id]);
86972 - td->event = atomic_add_return(1, &rttest_event);
86973 + td->event = atomic_add_return_unchecked(1, &rttest_event);
86974 td->mutexes[id] = 4;
86975 return 0;
86976
86977 @@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
86978 return ret;
86979
86980 td->mutexes[id] = 1;
86981 - td->event = atomic_add_return(1, &rttest_event);
86982 + td->event = atomic_add_return_unchecked(1, &rttest_event);
86983 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
86984 - td->event = atomic_add_return(1, &rttest_event);
86985 + td->event = atomic_add_return_unchecked(1, &rttest_event);
86986 td->mutexes[id] = ret ? 0 : 4;
86987 return ret ? -EINTR : 0;
86988
86989 @@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
86990 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
86991 return ret;
86992
86993 - td->event = atomic_add_return(1, &rttest_event);
86994 + td->event = atomic_add_return_unchecked(1, &rttest_event);
86995 rt_mutex_unlock(&mutexes[id]);
86996 - td->event = atomic_add_return(1, &rttest_event);
86997 + td->event = atomic_add_return_unchecked(1, &rttest_event);
86998 td->mutexes[id] = 0;
86999 return 0;
87000
87001 @@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
87002 break;
87003
87004 td->mutexes[dat] = 2;
87005 - td->event = atomic_add_return(1, &rttest_event);
87006 + td->event = atomic_add_return_unchecked(1, &rttest_event);
87007 break;
87008
87009 default:
87010 @@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
87011 return;
87012
87013 td->mutexes[dat] = 3;
87014 - td->event = atomic_add_return(1, &rttest_event);
87015 + td->event = atomic_add_return_unchecked(1, &rttest_event);
87016 break;
87017
87018 case RTTEST_LOCKNOWAIT:
87019 @@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
87020 return;
87021
87022 td->mutexes[dat] = 1;
87023 - td->event = atomic_add_return(1, &rttest_event);
87024 + td->event = atomic_add_return_unchecked(1, &rttest_event);
87025 return;
87026
87027 default:
87028 diff --git a/kernel/module.c b/kernel/module.c
87029 index d24fcf2..2af3fd9 100644
87030 --- a/kernel/module.c
87031 +++ b/kernel/module.c
87032 @@ -61,6 +61,7 @@
87033 #include <linux/pfn.h>
87034 #include <linux/bsearch.h>
87035 #include <linux/fips.h>
87036 +#include <linux/grsecurity.h>
87037 #include <uapi/linux/module.h>
87038 #include "module-internal.h"
87039
87040 @@ -157,7 +158,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
87041
87042 /* Bounds of module allocation, for speeding __module_address.
87043 * Protected by module_mutex. */
87044 -static unsigned long module_addr_min = -1UL, module_addr_max = 0;
87045 +static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
87046 +static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
87047
87048 int register_module_notifier(struct notifier_block * nb)
87049 {
87050 @@ -324,7 +326,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
87051 return true;
87052
87053 list_for_each_entry_rcu(mod, &modules, list) {
87054 - struct symsearch arr[] = {
87055 + struct symsearch modarr[] = {
87056 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
87057 NOT_GPL_ONLY, false },
87058 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
87059 @@ -349,7 +351,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
87060 if (mod->state == MODULE_STATE_UNFORMED)
87061 continue;
87062
87063 - if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
87064 + if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
87065 return true;
87066 }
87067 return false;
87068 @@ -489,7 +491,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
87069 if (!pcpusec->sh_size)
87070 return 0;
87071
87072 - if (align > PAGE_SIZE) {
87073 + if (align-1 >= PAGE_SIZE) {
87074 pr_warn("%s: per-cpu alignment %li > %li\n",
87075 mod->name, align, PAGE_SIZE);
87076 align = PAGE_SIZE;
87077 @@ -1062,7 +1064,7 @@ struct module_attribute module_uevent =
87078 static ssize_t show_coresize(struct module_attribute *mattr,
87079 struct module_kobject *mk, char *buffer)
87080 {
87081 - return sprintf(buffer, "%u\n", mk->mod->core_size);
87082 + return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
87083 }
87084
87085 static struct module_attribute modinfo_coresize =
87086 @@ -1071,7 +1073,7 @@ static struct module_attribute modinfo_coresize =
87087 static ssize_t show_initsize(struct module_attribute *mattr,
87088 struct module_kobject *mk, char *buffer)
87089 {
87090 - return sprintf(buffer, "%u\n", mk->mod->init_size);
87091 + return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
87092 }
87093
87094 static struct module_attribute modinfo_initsize =
87095 @@ -1163,12 +1165,29 @@ static int check_version(Elf_Shdr *sechdrs,
87096 goto bad_version;
87097 }
87098
87099 +#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
87100 + /*
87101 + * avoid potentially printing jibberish on attempted load
87102 + * of a module randomized with a different seed
87103 + */
87104 + pr_warn("no symbol version for %s\n", symname);
87105 +#else
87106 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
87107 +#endif
87108 return 0;
87109
87110 bad_version:
87111 +#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
87112 + /*
87113 + * avoid potentially printing jibberish on attempted load
87114 + * of a module randomized with a different seed
87115 + */
87116 + printk("attempted module disagrees about version of symbol %s\n",
87117 + symname);
87118 +#else
87119 printk("%s: disagrees about version of symbol %s\n",
87120 mod->name, symname);
87121 +#endif
87122 return 0;
87123 }
87124
87125 @@ -1284,7 +1303,7 @@ resolve_symbol_wait(struct module *mod,
87126 */
87127 #ifdef CONFIG_SYSFS
87128
87129 -#ifdef CONFIG_KALLSYMS
87130 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
87131 static inline bool sect_empty(const Elf_Shdr *sect)
87132 {
87133 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
87134 @@ -1424,7 +1443,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
87135 {
87136 unsigned int notes, loaded, i;
87137 struct module_notes_attrs *notes_attrs;
87138 - struct bin_attribute *nattr;
87139 + bin_attribute_no_const *nattr;
87140
87141 /* failed to create section attributes, so can't create notes */
87142 if (!mod->sect_attrs)
87143 @@ -1536,7 +1555,7 @@ static void del_usage_links(struct module *mod)
87144 static int module_add_modinfo_attrs(struct module *mod)
87145 {
87146 struct module_attribute *attr;
87147 - struct module_attribute *temp_attr;
87148 + module_attribute_no_const *temp_attr;
87149 int error = 0;
87150 int i;
87151
87152 @@ -1757,21 +1776,21 @@ static void set_section_ro_nx(void *base,
87153
87154 static void unset_module_core_ro_nx(struct module *mod)
87155 {
87156 - set_page_attributes(mod->module_core + mod->core_text_size,
87157 - mod->module_core + mod->core_size,
87158 + set_page_attributes(mod->module_core_rw,
87159 + mod->module_core_rw + mod->core_size_rw,
87160 set_memory_x);
87161 - set_page_attributes(mod->module_core,
87162 - mod->module_core + mod->core_ro_size,
87163 + set_page_attributes(mod->module_core_rx,
87164 + mod->module_core_rx + mod->core_size_rx,
87165 set_memory_rw);
87166 }
87167
87168 static void unset_module_init_ro_nx(struct module *mod)
87169 {
87170 - set_page_attributes(mod->module_init + mod->init_text_size,
87171 - mod->module_init + mod->init_size,
87172 + set_page_attributes(mod->module_init_rw,
87173 + mod->module_init_rw + mod->init_size_rw,
87174 set_memory_x);
87175 - set_page_attributes(mod->module_init,
87176 - mod->module_init + mod->init_ro_size,
87177 + set_page_attributes(mod->module_init_rx,
87178 + mod->module_init_rx + mod->init_size_rx,
87179 set_memory_rw);
87180 }
87181
87182 @@ -1784,14 +1803,14 @@ void set_all_modules_text_rw(void)
87183 list_for_each_entry_rcu(mod, &modules, list) {
87184 if (mod->state == MODULE_STATE_UNFORMED)
87185 continue;
87186 - if ((mod->module_core) && (mod->core_text_size)) {
87187 - set_page_attributes(mod->module_core,
87188 - mod->module_core + mod->core_text_size,
87189 + if ((mod->module_core_rx) && (mod->core_size_rx)) {
87190 + set_page_attributes(mod->module_core_rx,
87191 + mod->module_core_rx + mod->core_size_rx,
87192 set_memory_rw);
87193 }
87194 - if ((mod->module_init) && (mod->init_text_size)) {
87195 - set_page_attributes(mod->module_init,
87196 - mod->module_init + mod->init_text_size,
87197 + if ((mod->module_init_rx) && (mod->init_size_rx)) {
87198 + set_page_attributes(mod->module_init_rx,
87199 + mod->module_init_rx + mod->init_size_rx,
87200 set_memory_rw);
87201 }
87202 }
87203 @@ -1807,14 +1826,14 @@ void set_all_modules_text_ro(void)
87204 list_for_each_entry_rcu(mod, &modules, list) {
87205 if (mod->state == MODULE_STATE_UNFORMED)
87206 continue;
87207 - if ((mod->module_core) && (mod->core_text_size)) {
87208 - set_page_attributes(mod->module_core,
87209 - mod->module_core + mod->core_text_size,
87210 + if ((mod->module_core_rx) && (mod->core_size_rx)) {
87211 + set_page_attributes(mod->module_core_rx,
87212 + mod->module_core_rx + mod->core_size_rx,
87213 set_memory_ro);
87214 }
87215 - if ((mod->module_init) && (mod->init_text_size)) {
87216 - set_page_attributes(mod->module_init,
87217 - mod->module_init + mod->init_text_size,
87218 + if ((mod->module_init_rx) && (mod->init_size_rx)) {
87219 + set_page_attributes(mod->module_init_rx,
87220 + mod->module_init_rx + mod->init_size_rx,
87221 set_memory_ro);
87222 }
87223 }
87224 @@ -1865,16 +1884,19 @@ static void free_module(struct module *mod)
87225
87226 /* This may be NULL, but that's OK */
87227 unset_module_init_ro_nx(mod);
87228 - module_free(mod, mod->module_init);
87229 + module_free(mod, mod->module_init_rw);
87230 + module_free_exec(mod, mod->module_init_rx);
87231 kfree(mod->args);
87232 percpu_modfree(mod);
87233
87234 /* Free lock-classes: */
87235 - lockdep_free_key_range(mod->module_core, mod->core_size);
87236 + lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
87237 + lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
87238
87239 /* Finally, free the core (containing the module structure) */
87240 unset_module_core_ro_nx(mod);
87241 - module_free(mod, mod->module_core);
87242 + module_free_exec(mod, mod->module_core_rx);
87243 + module_free(mod, mod->module_core_rw);
87244
87245 #ifdef CONFIG_MPU
87246 update_protections(current->mm);
87247 @@ -1943,9 +1965,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
87248 int ret = 0;
87249 const struct kernel_symbol *ksym;
87250
87251 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
87252 + int is_fs_load = 0;
87253 + int register_filesystem_found = 0;
87254 + char *p;
87255 +
87256 + p = strstr(mod->args, "grsec_modharden_fs");
87257 + if (p) {
87258 + char *endptr = p + sizeof("grsec_modharden_fs") - 1;
87259 + /* copy \0 as well */
87260 + memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
87261 + is_fs_load = 1;
87262 + }
87263 +#endif
87264 +
87265 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
87266 const char *name = info->strtab + sym[i].st_name;
87267
87268 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
87269 + /* it's a real shame this will never get ripped and copied
87270 + upstream! ;(
87271 + */
87272 + if (is_fs_load && !strcmp(name, "register_filesystem"))
87273 + register_filesystem_found = 1;
87274 +#endif
87275 +
87276 switch (sym[i].st_shndx) {
87277 case SHN_COMMON:
87278 /* We compiled with -fno-common. These are not
87279 @@ -1966,7 +2010,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
87280 ksym = resolve_symbol_wait(mod, info, name);
87281 /* Ok if resolved. */
87282 if (ksym && !IS_ERR(ksym)) {
87283 + pax_open_kernel();
87284 sym[i].st_value = ksym->value;
87285 + pax_close_kernel();
87286 break;
87287 }
87288
87289 @@ -1985,11 +2031,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
87290 secbase = (unsigned long)mod_percpu(mod);
87291 else
87292 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
87293 + pax_open_kernel();
87294 sym[i].st_value += secbase;
87295 + pax_close_kernel();
87296 break;
87297 }
87298 }
87299
87300 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
87301 + if (is_fs_load && !register_filesystem_found) {
87302 + printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
87303 + ret = -EPERM;
87304 + }
87305 +#endif
87306 +
87307 return ret;
87308 }
87309
87310 @@ -2073,22 +2128,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
87311 || s->sh_entsize != ~0UL
87312 || strstarts(sname, ".init"))
87313 continue;
87314 - s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
87315 + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
87316 + s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
87317 + else
87318 + s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
87319 pr_debug("\t%s\n", sname);
87320 }
87321 - switch (m) {
87322 - case 0: /* executable */
87323 - mod->core_size = debug_align(mod->core_size);
87324 - mod->core_text_size = mod->core_size;
87325 - break;
87326 - case 1: /* RO: text and ro-data */
87327 - mod->core_size = debug_align(mod->core_size);
87328 - mod->core_ro_size = mod->core_size;
87329 - break;
87330 - case 3: /* whole core */
87331 - mod->core_size = debug_align(mod->core_size);
87332 - break;
87333 - }
87334 }
87335
87336 pr_debug("Init section allocation order:\n");
87337 @@ -2102,23 +2147,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
87338 || s->sh_entsize != ~0UL
87339 || !strstarts(sname, ".init"))
87340 continue;
87341 - s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
87342 - | INIT_OFFSET_MASK);
87343 + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
87344 + s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
87345 + else
87346 + s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
87347 + s->sh_entsize |= INIT_OFFSET_MASK;
87348 pr_debug("\t%s\n", sname);
87349 }
87350 - switch (m) {
87351 - case 0: /* executable */
87352 - mod->init_size = debug_align(mod->init_size);
87353 - mod->init_text_size = mod->init_size;
87354 - break;
87355 - case 1: /* RO: text and ro-data */
87356 - mod->init_size = debug_align(mod->init_size);
87357 - mod->init_ro_size = mod->init_size;
87358 - break;
87359 - case 3: /* whole init */
87360 - mod->init_size = debug_align(mod->init_size);
87361 - break;
87362 - }
87363 }
87364 }
87365
87366 @@ -2291,7 +2326,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
87367
87368 /* Put symbol section at end of init part of module. */
87369 symsect->sh_flags |= SHF_ALLOC;
87370 - symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
87371 + symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
87372 info->index.sym) | INIT_OFFSET_MASK;
87373 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
87374
87375 @@ -2308,13 +2343,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
87376 }
87377
87378 /* Append room for core symbols at end of core part. */
87379 - info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
87380 - info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
87381 - mod->core_size += strtab_size;
87382 + info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
87383 + info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
87384 + mod->core_size_rx += strtab_size;
87385
87386 /* Put string table section at end of init part of module. */
87387 strsect->sh_flags |= SHF_ALLOC;
87388 - strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
87389 + strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
87390 info->index.str) | INIT_OFFSET_MASK;
87391 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
87392 }
87393 @@ -2332,12 +2367,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
87394 /* Make sure we get permanent strtab: don't use info->strtab. */
87395 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
87396
87397 + pax_open_kernel();
87398 +
87399 /* Set types up while we still have access to sections. */
87400 for (i = 0; i < mod->num_symtab; i++)
87401 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
87402
87403 - mod->core_symtab = dst = mod->module_core + info->symoffs;
87404 - mod->core_strtab = s = mod->module_core + info->stroffs;
87405 + mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
87406 + mod->core_strtab = s = mod->module_core_rx + info->stroffs;
87407 src = mod->symtab;
87408 for (ndst = i = 0; i < mod->num_symtab; i++) {
87409 if (i == 0 ||
87410 @@ -2349,6 +2386,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
87411 }
87412 }
87413 mod->core_num_syms = ndst;
87414 +
87415 + pax_close_kernel();
87416 }
87417 #else
87418 static inline void layout_symtab(struct module *mod, struct load_info *info)
87419 @@ -2382,17 +2421,33 @@ void * __weak module_alloc(unsigned long size)
87420 return vmalloc_exec(size);
87421 }
87422
87423 -static void *module_alloc_update_bounds(unsigned long size)
87424 +static void *module_alloc_update_bounds_rw(unsigned long size)
87425 {
87426 void *ret = module_alloc(size);
87427
87428 if (ret) {
87429 mutex_lock(&module_mutex);
87430 /* Update module bounds. */
87431 - if ((unsigned long)ret < module_addr_min)
87432 - module_addr_min = (unsigned long)ret;
87433 - if ((unsigned long)ret + size > module_addr_max)
87434 - module_addr_max = (unsigned long)ret + size;
87435 + if ((unsigned long)ret < module_addr_min_rw)
87436 + module_addr_min_rw = (unsigned long)ret;
87437 + if ((unsigned long)ret + size > module_addr_max_rw)
87438 + module_addr_max_rw = (unsigned long)ret + size;
87439 + mutex_unlock(&module_mutex);
87440 + }
87441 + return ret;
87442 +}
87443 +
87444 +static void *module_alloc_update_bounds_rx(unsigned long size)
87445 +{
87446 + void *ret = module_alloc_exec(size);
87447 +
87448 + if (ret) {
87449 + mutex_lock(&module_mutex);
87450 + /* Update module bounds. */
87451 + if ((unsigned long)ret < module_addr_min_rx)
87452 + module_addr_min_rx = (unsigned long)ret;
87453 + if ((unsigned long)ret + size > module_addr_max_rx)
87454 + module_addr_max_rx = (unsigned long)ret + size;
87455 mutex_unlock(&module_mutex);
87456 }
87457 return ret;
87458 @@ -2649,7 +2704,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
87459 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
87460
87461 if (info->index.sym == 0) {
87462 +#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
87463 + /*
87464 + * avoid potentially printing jibberish on attempted load
87465 + * of a module randomized with a different seed
87466 + */
87467 + pr_warn("module has no symbols (stripped?)\n");
87468 +#else
87469 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
87470 +#endif
87471 return ERR_PTR(-ENOEXEC);
87472 }
87473
87474 @@ -2665,8 +2728,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
87475 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
87476 {
87477 const char *modmagic = get_modinfo(info, "vermagic");
87478 + const char *license = get_modinfo(info, "license");
87479 int err;
87480
87481 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
87482 + if (!license || !license_is_gpl_compatible(license))
87483 + return -ENOEXEC;
87484 +#endif
87485 +
87486 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
87487 modmagic = NULL;
87488
87489 @@ -2691,7 +2760,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
87490 }
87491
87492 /* Set up license info based on the info section */
87493 - set_license(mod, get_modinfo(info, "license"));
87494 + set_license(mod, license);
87495
87496 return 0;
87497 }
87498 @@ -2785,7 +2854,7 @@ static int move_module(struct module *mod, struct load_info *info)
87499 void *ptr;
87500
87501 /* Do the allocs. */
87502 - ptr = module_alloc_update_bounds(mod->core_size);
87503 + ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
87504 /*
87505 * The pointer to this block is stored in the module structure
87506 * which is inside the block. Just mark it as not being a
87507 @@ -2795,11 +2864,11 @@ static int move_module(struct module *mod, struct load_info *info)
87508 if (!ptr)
87509 return -ENOMEM;
87510
87511 - memset(ptr, 0, mod->core_size);
87512 - mod->module_core = ptr;
87513 + memset(ptr, 0, mod->core_size_rw);
87514 + mod->module_core_rw = ptr;
87515
87516 - if (mod->init_size) {
87517 - ptr = module_alloc_update_bounds(mod->init_size);
87518 + if (mod->init_size_rw) {
87519 + ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
87520 /*
87521 * The pointer to this block is stored in the module structure
87522 * which is inside the block. This block doesn't need to be
87523 @@ -2808,13 +2877,45 @@ static int move_module(struct module *mod, struct load_info *info)
87524 */
87525 kmemleak_ignore(ptr);
87526 if (!ptr) {
87527 - module_free(mod, mod->module_core);
87528 + module_free(mod, mod->module_core_rw);
87529 return -ENOMEM;
87530 }
87531 - memset(ptr, 0, mod->init_size);
87532 - mod->module_init = ptr;
87533 + memset(ptr, 0, mod->init_size_rw);
87534 + mod->module_init_rw = ptr;
87535 } else
87536 - mod->module_init = NULL;
87537 + mod->module_init_rw = NULL;
87538 +
87539 + ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
87540 + kmemleak_not_leak(ptr);
87541 + if (!ptr) {
87542 + if (mod->module_init_rw)
87543 + module_free(mod, mod->module_init_rw);
87544 + module_free(mod, mod->module_core_rw);
87545 + return -ENOMEM;
87546 + }
87547 +
87548 + pax_open_kernel();
87549 + memset(ptr, 0, mod->core_size_rx);
87550 + pax_close_kernel();
87551 + mod->module_core_rx = ptr;
87552 +
87553 + if (mod->init_size_rx) {
87554 + ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
87555 + kmemleak_ignore(ptr);
87556 + if (!ptr && mod->init_size_rx) {
87557 + module_free_exec(mod, mod->module_core_rx);
87558 + if (mod->module_init_rw)
87559 + module_free(mod, mod->module_init_rw);
87560 + module_free(mod, mod->module_core_rw);
87561 + return -ENOMEM;
87562 + }
87563 +
87564 + pax_open_kernel();
87565 + memset(ptr, 0, mod->init_size_rx);
87566 + pax_close_kernel();
87567 + mod->module_init_rx = ptr;
87568 + } else
87569 + mod->module_init_rx = NULL;
87570
87571 /* Transfer each section which specifies SHF_ALLOC */
87572 pr_debug("final section addresses:\n");
87573 @@ -2825,16 +2926,45 @@ static int move_module(struct module *mod, struct load_info *info)
87574 if (!(shdr->sh_flags & SHF_ALLOC))
87575 continue;
87576
87577 - if (shdr->sh_entsize & INIT_OFFSET_MASK)
87578 - dest = mod->module_init
87579 - + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
87580 - else
87581 - dest = mod->module_core + shdr->sh_entsize;
87582 + if (shdr->sh_entsize & INIT_OFFSET_MASK) {
87583 + if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
87584 + dest = mod->module_init_rw
87585 + + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
87586 + else
87587 + dest = mod->module_init_rx
87588 + + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
87589 + } else {
87590 + if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
87591 + dest = mod->module_core_rw + shdr->sh_entsize;
87592 + else
87593 + dest = mod->module_core_rx + shdr->sh_entsize;
87594 + }
87595 +
87596 + if (shdr->sh_type != SHT_NOBITS) {
87597 +
87598 +#ifdef CONFIG_PAX_KERNEXEC
87599 +#ifdef CONFIG_X86_64
87600 + if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
87601 + set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
87602 +#endif
87603 + if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
87604 + pax_open_kernel();
87605 + memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
87606 + pax_close_kernel();
87607 + } else
87608 +#endif
87609
87610 - if (shdr->sh_type != SHT_NOBITS)
87611 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
87612 + }
87613 /* Update sh_addr to point to copy in image. */
87614 - shdr->sh_addr = (unsigned long)dest;
87615 +
87616 +#ifdef CONFIG_PAX_KERNEXEC
87617 + if (shdr->sh_flags & SHF_EXECINSTR)
87618 + shdr->sh_addr = ktva_ktla((unsigned long)dest);
87619 + else
87620 +#endif
87621 +
87622 + shdr->sh_addr = (unsigned long)dest;
87623 pr_debug("\t0x%lx %s\n",
87624 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
87625 }
87626 @@ -2891,12 +3021,12 @@ static void flush_module_icache(const struct module *mod)
87627 * Do it before processing of module parameters, so the module
87628 * can provide parameter accessor functions of its own.
87629 */
87630 - if (mod->module_init)
87631 - flush_icache_range((unsigned long)mod->module_init,
87632 - (unsigned long)mod->module_init
87633 - + mod->init_size);
87634 - flush_icache_range((unsigned long)mod->module_core,
87635 - (unsigned long)mod->module_core + mod->core_size);
87636 + if (mod->module_init_rx)
87637 + flush_icache_range((unsigned long)mod->module_init_rx,
87638 + (unsigned long)mod->module_init_rx
87639 + + mod->init_size_rx);
87640 + flush_icache_range((unsigned long)mod->module_core_rx,
87641 + (unsigned long)mod->module_core_rx + mod->core_size_rx);
87642
87643 set_fs(old_fs);
87644 }
87645 @@ -2953,8 +3083,10 @@ static struct module *layout_and_allocate(struct load_info *info, int flags)
87646 static void module_deallocate(struct module *mod, struct load_info *info)
87647 {
87648 percpu_modfree(mod);
87649 - module_free(mod, mod->module_init);
87650 - module_free(mod, mod->module_core);
87651 + module_free_exec(mod, mod->module_init_rx);
87652 + module_free_exec(mod, mod->module_core_rx);
87653 + module_free(mod, mod->module_init_rw);
87654 + module_free(mod, mod->module_core_rw);
87655 }
87656
87657 int __weak module_finalize(const Elf_Ehdr *hdr,
87658 @@ -2967,7 +3099,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
87659 static int post_relocation(struct module *mod, const struct load_info *info)
87660 {
87661 /* Sort exception table now relocations are done. */
87662 + pax_open_kernel();
87663 sort_extable(mod->extable, mod->extable + mod->num_exentries);
87664 + pax_close_kernel();
87665
87666 /* Copy relocated percpu area over. */
87667 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
87668 @@ -3021,16 +3155,16 @@ static int do_init_module(struct module *mod)
87669 MODULE_STATE_COMING, mod);
87670
87671 /* Set RO and NX regions for core */
87672 - set_section_ro_nx(mod->module_core,
87673 - mod->core_text_size,
87674 - mod->core_ro_size,
87675 - mod->core_size);
87676 + set_section_ro_nx(mod->module_core_rx,
87677 + mod->core_size_rx,
87678 + mod->core_size_rx,
87679 + mod->core_size_rx);
87680
87681 /* Set RO and NX regions for init */
87682 - set_section_ro_nx(mod->module_init,
87683 - mod->init_text_size,
87684 - mod->init_ro_size,
87685 - mod->init_size);
87686 + set_section_ro_nx(mod->module_init_rx,
87687 + mod->init_size_rx,
87688 + mod->init_size_rx,
87689 + mod->init_size_rx);
87690
87691 do_mod_ctors(mod);
87692 /* Start the module */
87693 @@ -3091,11 +3225,12 @@ static int do_init_module(struct module *mod)
87694 mod->strtab = mod->core_strtab;
87695 #endif
87696 unset_module_init_ro_nx(mod);
87697 - module_free(mod, mod->module_init);
87698 - mod->module_init = NULL;
87699 - mod->init_size = 0;
87700 - mod->init_ro_size = 0;
87701 - mod->init_text_size = 0;
87702 + module_free(mod, mod->module_init_rw);
87703 + module_free_exec(mod, mod->module_init_rx);
87704 + mod->module_init_rw = NULL;
87705 + mod->module_init_rx = NULL;
87706 + mod->init_size_rw = 0;
87707 + mod->init_size_rx = 0;
87708 mutex_unlock(&module_mutex);
87709 wake_up_all(&module_wq);
87710
87711 @@ -3238,9 +3373,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
87712 if (err)
87713 goto free_unload;
87714
87715 + /* Now copy in args */
87716 + mod->args = strndup_user(uargs, ~0UL >> 1);
87717 + if (IS_ERR(mod->args)) {
87718 + err = PTR_ERR(mod->args);
87719 + goto free_unload;
87720 + }
87721 +
87722 /* Set up MODINFO_ATTR fields */
87723 setup_modinfo(mod, info);
87724
87725 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
87726 + {
87727 + char *p, *p2;
87728 +
87729 + if (strstr(mod->args, "grsec_modharden_netdev")) {
87730 + 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);
87731 + err = -EPERM;
87732 + goto free_modinfo;
87733 + } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
87734 + p += sizeof("grsec_modharden_normal") - 1;
87735 + p2 = strstr(p, "_");
87736 + if (p2) {
87737 + *p2 = '\0';
87738 + printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
87739 + *p2 = '_';
87740 + }
87741 + err = -EPERM;
87742 + goto free_modinfo;
87743 + }
87744 + }
87745 +#endif
87746 +
87747 /* Fix up syms, so that st_value is a pointer to location. */
87748 err = simplify_symbols(mod, info);
87749 if (err < 0)
87750 @@ -3256,13 +3420,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
87751
87752 flush_module_icache(mod);
87753
87754 - /* Now copy in args */
87755 - mod->args = strndup_user(uargs, ~0UL >> 1);
87756 - if (IS_ERR(mod->args)) {
87757 - err = PTR_ERR(mod->args);
87758 - goto free_arch_cleanup;
87759 - }
87760 -
87761 dynamic_debug_setup(info->debug, info->num_debug);
87762
87763 /* Finally it's fully formed, ready to start executing. */
87764 @@ -3297,11 +3454,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
87765 ddebug_cleanup:
87766 dynamic_debug_remove(info->debug);
87767 synchronize_sched();
87768 - kfree(mod->args);
87769 - free_arch_cleanup:
87770 module_arch_cleanup(mod);
87771 free_modinfo:
87772 free_modinfo(mod);
87773 + kfree(mod->args);
87774 free_unload:
87775 module_unload_free(mod);
87776 unlink_mod:
87777 @@ -3384,10 +3540,16 @@ static const char *get_ksymbol(struct module *mod,
87778 unsigned long nextval;
87779
87780 /* At worse, next value is at end of module */
87781 - if (within_module_init(addr, mod))
87782 - nextval = (unsigned long)mod->module_init+mod->init_text_size;
87783 + if (within_module_init_rx(addr, mod))
87784 + nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
87785 + else if (within_module_init_rw(addr, mod))
87786 + nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
87787 + else if (within_module_core_rx(addr, mod))
87788 + nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
87789 + else if (within_module_core_rw(addr, mod))
87790 + nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
87791 else
87792 - nextval = (unsigned long)mod->module_core+mod->core_text_size;
87793 + return NULL;
87794
87795 /* Scan for closest preceding symbol, and next symbol. (ELF
87796 starts real symbols at 1). */
87797 @@ -3638,7 +3800,7 @@ static int m_show(struct seq_file *m, void *p)
87798 return 0;
87799
87800 seq_printf(m, "%s %u",
87801 - mod->name, mod->init_size + mod->core_size);
87802 + mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
87803 print_unload_info(m, mod);
87804
87805 /* Informative for users. */
87806 @@ -3647,7 +3809,7 @@ static int m_show(struct seq_file *m, void *p)
87807 mod->state == MODULE_STATE_COMING ? "Loading":
87808 "Live");
87809 /* Used by oprofile and other similar tools. */
87810 - seq_printf(m, " 0x%pK", mod->module_core);
87811 + seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
87812
87813 /* Taints info */
87814 if (mod->taints)
87815 @@ -3683,7 +3845,17 @@ static const struct file_operations proc_modules_operations = {
87816
87817 static int __init proc_modules_init(void)
87818 {
87819 +#ifndef CONFIG_GRKERNSEC_HIDESYM
87820 +#ifdef CONFIG_GRKERNSEC_PROC_USER
87821 + proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
87822 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
87823 + proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
87824 +#else
87825 proc_create("modules", 0, NULL, &proc_modules_operations);
87826 +#endif
87827 +#else
87828 + proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
87829 +#endif
87830 return 0;
87831 }
87832 module_init(proc_modules_init);
87833 @@ -3744,14 +3916,14 @@ struct module *__module_address(unsigned long addr)
87834 {
87835 struct module *mod;
87836
87837 - if (addr < module_addr_min || addr > module_addr_max)
87838 + if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
87839 + (addr < module_addr_min_rw || addr > module_addr_max_rw))
87840 return NULL;
87841
87842 list_for_each_entry_rcu(mod, &modules, list) {
87843 if (mod->state == MODULE_STATE_UNFORMED)
87844 continue;
87845 - if (within_module_core(addr, mod)
87846 - || within_module_init(addr, mod))
87847 + if (within_module_init(addr, mod) || within_module_core(addr, mod))
87848 return mod;
87849 }
87850 return NULL;
87851 @@ -3786,11 +3958,20 @@ bool is_module_text_address(unsigned long addr)
87852 */
87853 struct module *__module_text_address(unsigned long addr)
87854 {
87855 - struct module *mod = __module_address(addr);
87856 + struct module *mod;
87857 +
87858 +#ifdef CONFIG_X86_32
87859 + addr = ktla_ktva(addr);
87860 +#endif
87861 +
87862 + if (addr < module_addr_min_rx || addr > module_addr_max_rx)
87863 + return NULL;
87864 +
87865 + mod = __module_address(addr);
87866 +
87867 if (mod) {
87868 /* Make sure it's within the text section. */
87869 - if (!within(addr, mod->module_init, mod->init_text_size)
87870 - && !within(addr, mod->module_core, mod->core_text_size))
87871 + if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
87872 mod = NULL;
87873 }
87874 return mod;
87875 diff --git a/kernel/notifier.c b/kernel/notifier.c
87876 index 2d5cc4c..d9ea600 100644
87877 --- a/kernel/notifier.c
87878 +++ b/kernel/notifier.c
87879 @@ -5,6 +5,7 @@
87880 #include <linux/rcupdate.h>
87881 #include <linux/vmalloc.h>
87882 #include <linux/reboot.h>
87883 +#include <linux/mm.h>
87884
87885 /*
87886 * Notifier list for kernel code which wants to be called
87887 @@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
87888 while ((*nl) != NULL) {
87889 if (n->priority > (*nl)->priority)
87890 break;
87891 - nl = &((*nl)->next);
87892 + nl = (struct notifier_block **)&((*nl)->next);
87893 }
87894 - n->next = *nl;
87895 + pax_open_kernel();
87896 + *(const void **)&n->next = *nl;
87897 rcu_assign_pointer(*nl, n);
87898 + pax_close_kernel();
87899 return 0;
87900 }
87901
87902 @@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
87903 return 0;
87904 if (n->priority > (*nl)->priority)
87905 break;
87906 - nl = &((*nl)->next);
87907 + nl = (struct notifier_block **)&((*nl)->next);
87908 }
87909 - n->next = *nl;
87910 + pax_open_kernel();
87911 + *(const void **)&n->next = *nl;
87912 rcu_assign_pointer(*nl, n);
87913 + pax_close_kernel();
87914 return 0;
87915 }
87916
87917 @@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
87918 {
87919 while ((*nl) != NULL) {
87920 if ((*nl) == n) {
87921 + pax_open_kernel();
87922 rcu_assign_pointer(*nl, n->next);
87923 + pax_close_kernel();
87924 return 0;
87925 }
87926 - nl = &((*nl)->next);
87927 + nl = (struct notifier_block **)&((*nl)->next);
87928 }
87929 return -ENOENT;
87930 }
87931 diff --git a/kernel/padata.c b/kernel/padata.c
87932 index 161402f..598814c 100644
87933 --- a/kernel/padata.c
87934 +++ b/kernel/padata.c
87935 @@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
87936 * seq_nr mod. number of cpus in use.
87937 */
87938
87939 - seq_nr = atomic_inc_return(&pd->seq_nr);
87940 + seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
87941 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
87942
87943 return padata_index_to_cpu(pd, cpu_index);
87944 @@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
87945 padata_init_pqueues(pd);
87946 padata_init_squeues(pd);
87947 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
87948 - atomic_set(&pd->seq_nr, -1);
87949 + atomic_set_unchecked(&pd->seq_nr, -1);
87950 atomic_set(&pd->reorder_objects, 0);
87951 atomic_set(&pd->refcnt, 0);
87952 pd->pinst = pinst;
87953 diff --git a/kernel/panic.c b/kernel/panic.c
87954 index 6d63003..486a109 100644
87955 --- a/kernel/panic.c
87956 +++ b/kernel/panic.c
87957 @@ -52,7 +52,7 @@ EXPORT_SYMBOL(panic_blink);
87958 /*
87959 * Stop ourself in panic -- architecture code may override this
87960 */
87961 -void __weak panic_smp_self_stop(void)
87962 +void __weak __noreturn panic_smp_self_stop(void)
87963 {
87964 while (1)
87965 cpu_relax();
87966 @@ -407,7 +407,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
87967 disable_trace_on_warning();
87968
87969 pr_warn("------------[ cut here ]------------\n");
87970 - pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
87971 + pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
87972 raw_smp_processor_id(), current->pid, file, line, caller);
87973
87974 if (args)
87975 @@ -461,7 +461,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
87976 */
87977 void __stack_chk_fail(void)
87978 {
87979 - panic("stack-protector: Kernel stack is corrupted in: %p\n",
87980 + dump_stack();
87981 + panic("stack-protector: Kernel stack is corrupted in: %pA\n",
87982 __builtin_return_address(0));
87983 }
87984 EXPORT_SYMBOL(__stack_chk_fail);
87985 diff --git a/kernel/pid.c b/kernel/pid.c
87986 index 9b9a266..c20ef80 100644
87987 --- a/kernel/pid.c
87988 +++ b/kernel/pid.c
87989 @@ -33,6 +33,7 @@
87990 #include <linux/rculist.h>
87991 #include <linux/bootmem.h>
87992 #include <linux/hash.h>
87993 +#include <linux/security.h>
87994 #include <linux/pid_namespace.h>
87995 #include <linux/init_task.h>
87996 #include <linux/syscalls.h>
87997 @@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
87998
87999 int pid_max = PID_MAX_DEFAULT;
88000
88001 -#define RESERVED_PIDS 300
88002 +#define RESERVED_PIDS 500
88003
88004 int pid_max_min = RESERVED_PIDS + 1;
88005 int pid_max_max = PID_MAX_LIMIT;
88006 @@ -445,10 +446,18 @@ EXPORT_SYMBOL(pid_task);
88007 */
88008 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
88009 {
88010 + struct task_struct *task;
88011 +
88012 rcu_lockdep_assert(rcu_read_lock_held(),
88013 "find_task_by_pid_ns() needs rcu_read_lock()"
88014 " protection");
88015 - return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
88016 +
88017 + task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
88018 +
88019 + if (gr_pid_is_chrooted(task))
88020 + return NULL;
88021 +
88022 + return task;
88023 }
88024
88025 struct task_struct *find_task_by_vpid(pid_t vnr)
88026 @@ -456,6 +465,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
88027 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
88028 }
88029
88030 +struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
88031 +{
88032 + rcu_lockdep_assert(rcu_read_lock_held(),
88033 + "find_task_by_pid_ns() needs rcu_read_lock()"
88034 + " protection");
88035 + return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
88036 +}
88037 +
88038 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
88039 {
88040 struct pid *pid;
88041 diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
88042 index db95d8e..a0ca23f 100644
88043 --- a/kernel/pid_namespace.c
88044 +++ b/kernel/pid_namespace.c
88045 @@ -253,7 +253,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
88046 void __user *buffer, size_t *lenp, loff_t *ppos)
88047 {
88048 struct pid_namespace *pid_ns = task_active_pid_ns(current);
88049 - struct ctl_table tmp = *table;
88050 + ctl_table_no_const tmp = *table;
88051
88052 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
88053 return -EPERM;
88054 diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
88055 index 3b89464..5e38379 100644
88056 --- a/kernel/posix-cpu-timers.c
88057 +++ b/kernel/posix-cpu-timers.c
88058 @@ -1464,14 +1464,14 @@ struct k_clock clock_posix_cpu = {
88059
88060 static __init int init_posix_cpu_timers(void)
88061 {
88062 - struct k_clock process = {
88063 + static struct k_clock process = {
88064 .clock_getres = process_cpu_clock_getres,
88065 .clock_get = process_cpu_clock_get,
88066 .timer_create = process_cpu_timer_create,
88067 .nsleep = process_cpu_nsleep,
88068 .nsleep_restart = process_cpu_nsleep_restart,
88069 };
88070 - struct k_clock thread = {
88071 + static struct k_clock thread = {
88072 .clock_getres = thread_cpu_clock_getres,
88073 .clock_get = thread_cpu_clock_get,
88074 .timer_create = thread_cpu_timer_create,
88075 diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
88076 index 424c2d4..679242f 100644
88077 --- a/kernel/posix-timers.c
88078 +++ b/kernel/posix-timers.c
88079 @@ -43,6 +43,7 @@
88080 #include <linux/hash.h>
88081 #include <linux/posix-clock.h>
88082 #include <linux/posix-timers.h>
88083 +#include <linux/grsecurity.h>
88084 #include <linux/syscalls.h>
88085 #include <linux/wait.h>
88086 #include <linux/workqueue.h>
88087 @@ -122,7 +123,7 @@ static DEFINE_SPINLOCK(hash_lock);
88088 * which we beg off on and pass to do_sys_settimeofday().
88089 */
88090
88091 -static struct k_clock posix_clocks[MAX_CLOCKS];
88092 +static struct k_clock *posix_clocks[MAX_CLOCKS];
88093
88094 /*
88095 * These ones are defined below.
88096 @@ -275,7 +276,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
88097 */
88098 static __init int init_posix_timers(void)
88099 {
88100 - struct k_clock clock_realtime = {
88101 + static struct k_clock clock_realtime = {
88102 .clock_getres = hrtimer_get_res,
88103 .clock_get = posix_clock_realtime_get,
88104 .clock_set = posix_clock_realtime_set,
88105 @@ -287,7 +288,7 @@ static __init int init_posix_timers(void)
88106 .timer_get = common_timer_get,
88107 .timer_del = common_timer_del,
88108 };
88109 - struct k_clock clock_monotonic = {
88110 + static struct k_clock clock_monotonic = {
88111 .clock_getres = hrtimer_get_res,
88112 .clock_get = posix_ktime_get_ts,
88113 .nsleep = common_nsleep,
88114 @@ -297,19 +298,19 @@ static __init int init_posix_timers(void)
88115 .timer_get = common_timer_get,
88116 .timer_del = common_timer_del,
88117 };
88118 - struct k_clock clock_monotonic_raw = {
88119 + static struct k_clock clock_monotonic_raw = {
88120 .clock_getres = hrtimer_get_res,
88121 .clock_get = posix_get_monotonic_raw,
88122 };
88123 - struct k_clock clock_realtime_coarse = {
88124 + static struct k_clock clock_realtime_coarse = {
88125 .clock_getres = posix_get_coarse_res,
88126 .clock_get = posix_get_realtime_coarse,
88127 };
88128 - struct k_clock clock_monotonic_coarse = {
88129 + static struct k_clock clock_monotonic_coarse = {
88130 .clock_getres = posix_get_coarse_res,
88131 .clock_get = posix_get_monotonic_coarse,
88132 };
88133 - struct k_clock clock_tai = {
88134 + static struct k_clock clock_tai = {
88135 .clock_getres = hrtimer_get_res,
88136 .clock_get = posix_get_tai,
88137 .nsleep = common_nsleep,
88138 @@ -319,7 +320,7 @@ static __init int init_posix_timers(void)
88139 .timer_get = common_timer_get,
88140 .timer_del = common_timer_del,
88141 };
88142 - struct k_clock clock_boottime = {
88143 + static struct k_clock clock_boottime = {
88144 .clock_getres = hrtimer_get_res,
88145 .clock_get = posix_get_boottime,
88146 .nsleep = common_nsleep,
88147 @@ -531,7 +532,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
88148 return;
88149 }
88150
88151 - posix_clocks[clock_id] = *new_clock;
88152 + posix_clocks[clock_id] = new_clock;
88153 }
88154 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
88155
88156 @@ -577,9 +578,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
88157 return (id & CLOCKFD_MASK) == CLOCKFD ?
88158 &clock_posix_dynamic : &clock_posix_cpu;
88159
88160 - if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
88161 + if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
88162 return NULL;
88163 - return &posix_clocks[id];
88164 + return posix_clocks[id];
88165 }
88166
88167 static int common_timer_create(struct k_itimer *new_timer)
88168 @@ -597,7 +598,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
88169 struct k_clock *kc = clockid_to_kclock(which_clock);
88170 struct k_itimer *new_timer;
88171 int error, new_timer_id;
88172 - sigevent_t event;
88173 + sigevent_t event = { };
88174 int it_id_set = IT_ID_NOT_SET;
88175
88176 if (!kc)
88177 @@ -1011,6 +1012,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
88178 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
88179 return -EFAULT;
88180
88181 + /* only the CLOCK_REALTIME clock can be set, all other clocks
88182 + have their clock_set fptr set to a nosettime dummy function
88183 + CLOCK_REALTIME has a NULL clock_set fptr which causes it to
88184 + call common_clock_set, which calls do_sys_settimeofday, which
88185 + we hook
88186 + */
88187 +
88188 return kc->clock_set(which_clock, &new_tp);
88189 }
88190
88191 diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
88192 index 2fac9cc..56fef29 100644
88193 --- a/kernel/power/Kconfig
88194 +++ b/kernel/power/Kconfig
88195 @@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
88196 config HIBERNATION
88197 bool "Hibernation (aka 'suspend to disk')"
88198 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
88199 + depends on !GRKERNSEC_KMEM
88200 + depends on !PAX_MEMORY_SANITIZE
88201 select HIBERNATE_CALLBACKS
88202 select LZO_COMPRESS
88203 select LZO_DECOMPRESS
88204 diff --git a/kernel/power/process.c b/kernel/power/process.c
88205 index 06ec886..9dba35e 100644
88206 --- a/kernel/power/process.c
88207 +++ b/kernel/power/process.c
88208 @@ -34,6 +34,7 @@ static int try_to_freeze_tasks(bool user_only)
88209 unsigned int elapsed_msecs;
88210 bool wakeup = false;
88211 int sleep_usecs = USEC_PER_MSEC;
88212 + bool timedout = false;
88213
88214 do_gettimeofday(&start);
88215
88216 @@ -44,13 +45,20 @@ static int try_to_freeze_tasks(bool user_only)
88217
88218 while (true) {
88219 todo = 0;
88220 + if (time_after(jiffies, end_time))
88221 + timedout = true;
88222 read_lock(&tasklist_lock);
88223 do_each_thread(g, p) {
88224 if (p == current || !freeze_task(p))
88225 continue;
88226
88227 - if (!freezer_should_skip(p))
88228 + if (!freezer_should_skip(p)) {
88229 todo++;
88230 + if (timedout) {
88231 + printk(KERN_ERR "Task refusing to freeze:\n");
88232 + sched_show_task(p);
88233 + }
88234 + }
88235 } while_each_thread(g, p);
88236 read_unlock(&tasklist_lock);
88237
88238 @@ -59,7 +67,7 @@ static int try_to_freeze_tasks(bool user_only)
88239 todo += wq_busy;
88240 }
88241
88242 - if (!todo || time_after(jiffies, end_time))
88243 + if (!todo || timedout)
88244 break;
88245
88246 if (pm_wakeup_pending()) {
88247 diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
88248 index 4dae9cb..039ffbb 100644
88249 --- a/kernel/printk/printk.c
88250 +++ b/kernel/printk/printk.c
88251 @@ -385,6 +385,11 @@ static int check_syslog_permissions(int type, bool from_file)
88252 if (from_file && type != SYSLOG_ACTION_OPEN)
88253 return 0;
88254
88255 +#ifdef CONFIG_GRKERNSEC_DMESG
88256 + if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
88257 + return -EPERM;
88258 +#endif
88259 +
88260 if (syslog_action_restricted(type)) {
88261 if (capable(CAP_SYSLOG))
88262 return 0;
88263 diff --git a/kernel/profile.c b/kernel/profile.c
88264 index ebdd9c1..612ee05 100644
88265 --- a/kernel/profile.c
88266 +++ b/kernel/profile.c
88267 @@ -37,7 +37,7 @@ struct profile_hit {
88268 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
88269 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
88270
88271 -static atomic_t *prof_buffer;
88272 +static atomic_unchecked_t *prof_buffer;
88273 static unsigned long prof_len, prof_shift;
88274
88275 int prof_on __read_mostly;
88276 @@ -260,7 +260,7 @@ static void profile_flip_buffers(void)
88277 hits[i].pc = 0;
88278 continue;
88279 }
88280 - atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
88281 + atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
88282 hits[i].hits = hits[i].pc = 0;
88283 }
88284 }
88285 @@ -321,9 +321,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
88286 * Add the current hit(s) and flush the write-queue out
88287 * to the global buffer:
88288 */
88289 - atomic_add(nr_hits, &prof_buffer[pc]);
88290 + atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
88291 for (i = 0; i < NR_PROFILE_HIT; ++i) {
88292 - atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
88293 + atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
88294 hits[i].pc = hits[i].hits = 0;
88295 }
88296 out:
88297 @@ -398,7 +398,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
88298 {
88299 unsigned long pc;
88300 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
88301 - atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
88302 + atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
88303 }
88304 #endif /* !CONFIG_SMP */
88305
88306 @@ -494,7 +494,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
88307 return -EFAULT;
88308 buf++; p++; count--; read++;
88309 }
88310 - pnt = (char *)prof_buffer + p - sizeof(atomic_t);
88311 + pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
88312 if (copy_to_user(buf, (void *)pnt, count))
88313 return -EFAULT;
88314 read += count;
88315 @@ -525,7 +525,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
88316 }
88317 #endif
88318 profile_discard_flip_buffers();
88319 - memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
88320 + memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
88321 return count;
88322 }
88323
88324 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
88325 index 1f4bcb3..99cf7ab 100644
88326 --- a/kernel/ptrace.c
88327 +++ b/kernel/ptrace.c
88328 @@ -327,7 +327,7 @@ static int ptrace_attach(struct task_struct *task, long request,
88329 if (seize)
88330 flags |= PT_SEIZED;
88331 rcu_read_lock();
88332 - if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
88333 + if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
88334 flags |= PT_PTRACE_CAP;
88335 rcu_read_unlock();
88336 task->ptrace = flags;
88337 @@ -538,7 +538,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
88338 break;
88339 return -EIO;
88340 }
88341 - if (copy_to_user(dst, buf, retval))
88342 + if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
88343 return -EFAULT;
88344 copied += retval;
88345 src += retval;
88346 @@ -806,7 +806,7 @@ int ptrace_request(struct task_struct *child, long request,
88347 bool seized = child->ptrace & PT_SEIZED;
88348 int ret = -EIO;
88349 siginfo_t siginfo, *si;
88350 - void __user *datavp = (void __user *) data;
88351 + void __user *datavp = (__force void __user *) data;
88352 unsigned long __user *datalp = datavp;
88353 unsigned long flags;
88354
88355 @@ -1052,14 +1052,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
88356 goto out;
88357 }
88358
88359 + if (gr_handle_ptrace(child, request)) {
88360 + ret = -EPERM;
88361 + goto out_put_task_struct;
88362 + }
88363 +
88364 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
88365 ret = ptrace_attach(child, request, addr, data);
88366 /*
88367 * Some architectures need to do book-keeping after
88368 * a ptrace attach.
88369 */
88370 - if (!ret)
88371 + if (!ret) {
88372 arch_ptrace_attach(child);
88373 + gr_audit_ptrace(child);
88374 + }
88375 goto out_put_task_struct;
88376 }
88377
88378 @@ -1087,7 +1094,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
88379 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
88380 if (copied != sizeof(tmp))
88381 return -EIO;
88382 - return put_user(tmp, (unsigned long __user *)data);
88383 + return put_user(tmp, (__force unsigned long __user *)data);
88384 }
88385
88386 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
88387 @@ -1181,7 +1188,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
88388 }
88389
88390 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
88391 - compat_long_t addr, compat_long_t data)
88392 + compat_ulong_t addr, compat_ulong_t data)
88393 {
88394 struct task_struct *child;
88395 long ret;
88396 @@ -1197,14 +1204,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
88397 goto out;
88398 }
88399
88400 + if (gr_handle_ptrace(child, request)) {
88401 + ret = -EPERM;
88402 + goto out_put_task_struct;
88403 + }
88404 +
88405 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
88406 ret = ptrace_attach(child, request, addr, data);
88407 /*
88408 * Some architectures need to do book-keeping after
88409 * a ptrace attach.
88410 */
88411 - if (!ret)
88412 + if (!ret) {
88413 arch_ptrace_attach(child);
88414 + gr_audit_ptrace(child);
88415 + }
88416 goto out_put_task_struct;
88417 }
88418
88419 diff --git a/kernel/rcu/srcu.c b/kernel/rcu/srcu.c
88420 index 3318d82..1a5b2d1 100644
88421 --- a/kernel/rcu/srcu.c
88422 +++ b/kernel/rcu/srcu.c
88423 @@ -300,9 +300,9 @@ int __srcu_read_lock(struct srcu_struct *sp)
88424
88425 idx = ACCESS_ONCE(sp->completed) & 0x1;
88426 preempt_disable();
88427 - ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
88428 + ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
88429 smp_mb(); /* B */ /* Avoid leaking the critical section. */
88430 - ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
88431 + ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
88432 preempt_enable();
88433 return idx;
88434 }
88435 diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
88436 index 1254f31..16258dc 100644
88437 --- a/kernel/rcu/tiny.c
88438 +++ b/kernel/rcu/tiny.c
88439 @@ -46,7 +46,7 @@
88440 /* Forward declarations for tiny_plugin.h. */
88441 struct rcu_ctrlblk;
88442 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
88443 -static void rcu_process_callbacks(struct softirq_action *unused);
88444 +static void rcu_process_callbacks(void);
88445 static void __call_rcu(struct rcu_head *head,
88446 void (*func)(struct rcu_head *rcu),
88447 struct rcu_ctrlblk *rcp);
88448 @@ -312,7 +312,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
88449 false));
88450 }
88451
88452 -static void rcu_process_callbacks(struct softirq_action *unused)
88453 +static __latent_entropy void rcu_process_callbacks(void)
88454 {
88455 __rcu_process_callbacks(&rcu_sched_ctrlblk);
88456 __rcu_process_callbacks(&rcu_bh_ctrlblk);
88457 diff --git a/kernel/rcu/torture.c b/kernel/rcu/torture.c
88458 index 732f8ae..42c1919 100644
88459 --- a/kernel/rcu/torture.c
88460 +++ b/kernel/rcu/torture.c
88461 @@ -174,12 +174,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
88462 { 0 };
88463 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
88464 { 0 };
88465 -static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
88466 -static atomic_t n_rcu_torture_alloc;
88467 -static atomic_t n_rcu_torture_alloc_fail;
88468 -static atomic_t n_rcu_torture_free;
88469 -static atomic_t n_rcu_torture_mberror;
88470 -static atomic_t n_rcu_torture_error;
88471 +static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
88472 +static atomic_unchecked_t n_rcu_torture_alloc;
88473 +static atomic_unchecked_t n_rcu_torture_alloc_fail;
88474 +static atomic_unchecked_t n_rcu_torture_free;
88475 +static atomic_unchecked_t n_rcu_torture_mberror;
88476 +static atomic_unchecked_t n_rcu_torture_error;
88477 static long n_rcu_torture_barrier_error;
88478 static long n_rcu_torture_boost_ktrerror;
88479 static long n_rcu_torture_boost_rterror;
88480 @@ -297,11 +297,11 @@ rcu_torture_alloc(void)
88481
88482 spin_lock_bh(&rcu_torture_lock);
88483 if (list_empty(&rcu_torture_freelist)) {
88484 - atomic_inc(&n_rcu_torture_alloc_fail);
88485 + atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
88486 spin_unlock_bh(&rcu_torture_lock);
88487 return NULL;
88488 }
88489 - atomic_inc(&n_rcu_torture_alloc);
88490 + atomic_inc_unchecked(&n_rcu_torture_alloc);
88491 p = rcu_torture_freelist.next;
88492 list_del_init(p);
88493 spin_unlock_bh(&rcu_torture_lock);
88494 @@ -314,7 +314,7 @@ rcu_torture_alloc(void)
88495 static void
88496 rcu_torture_free(struct rcu_torture *p)
88497 {
88498 - atomic_inc(&n_rcu_torture_free);
88499 + atomic_inc_unchecked(&n_rcu_torture_free);
88500 spin_lock_bh(&rcu_torture_lock);
88501 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
88502 spin_unlock_bh(&rcu_torture_lock);
88503 @@ -435,7 +435,7 @@ rcu_torture_cb(struct rcu_head *p)
88504 i = rp->rtort_pipe_count;
88505 if (i > RCU_TORTURE_PIPE_LEN)
88506 i = RCU_TORTURE_PIPE_LEN;
88507 - atomic_inc(&rcu_torture_wcount[i]);
88508 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
88509 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
88510 rp->rtort_mbtest = 0;
88511 rcu_torture_free(rp);
88512 @@ -823,7 +823,7 @@ rcu_torture_writer(void *arg)
88513 i = old_rp->rtort_pipe_count;
88514 if (i > RCU_TORTURE_PIPE_LEN)
88515 i = RCU_TORTURE_PIPE_LEN;
88516 - atomic_inc(&rcu_torture_wcount[i]);
88517 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
88518 old_rp->rtort_pipe_count++;
88519 if (gp_normal == gp_exp)
88520 exp = !!(rcu_random(&rand) & 0x80);
88521 @@ -841,7 +841,7 @@ rcu_torture_writer(void *arg)
88522 i = rp->rtort_pipe_count;
88523 if (i > RCU_TORTURE_PIPE_LEN)
88524 i = RCU_TORTURE_PIPE_LEN;
88525 - atomic_inc(&rcu_torture_wcount[i]);
88526 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
88527 if (++rp->rtort_pipe_count >=
88528 RCU_TORTURE_PIPE_LEN) {
88529 rp->rtort_mbtest = 0;
88530 @@ -940,7 +940,7 @@ static void rcu_torture_timer(unsigned long unused)
88531 return;
88532 }
88533 if (p->rtort_mbtest == 0)
88534 - atomic_inc(&n_rcu_torture_mberror);
88535 + atomic_inc_unchecked(&n_rcu_torture_mberror);
88536 spin_lock(&rand_lock);
88537 cur_ops->read_delay(&rand);
88538 n_rcu_torture_timers++;
88539 @@ -1010,7 +1010,7 @@ rcu_torture_reader(void *arg)
88540 continue;
88541 }
88542 if (p->rtort_mbtest == 0)
88543 - atomic_inc(&n_rcu_torture_mberror);
88544 + atomic_inc_unchecked(&n_rcu_torture_mberror);
88545 cur_ops->read_delay(&rand);
88546 preempt_disable();
88547 pipe_count = p->rtort_pipe_count;
88548 @@ -1068,15 +1068,15 @@ rcu_torture_printk(char *page)
88549 }
88550 page += sprintf(page, "%s%s ", torture_type, TORTURE_FLAG);
88551 page += sprintf(page,
88552 - "rtc: %p ver: %lu tfle: %d rta: %d rtaf: %d rtf: %d ",
88553 + "rtc: %pP ver: %lu tfle: %d rta: %d rtaf: %d rtf: %d ",
88554 rcu_torture_current,
88555 rcu_torture_current_version,
88556 list_empty(&rcu_torture_freelist),
88557 - atomic_read(&n_rcu_torture_alloc),
88558 - atomic_read(&n_rcu_torture_alloc_fail),
88559 - atomic_read(&n_rcu_torture_free));
88560 + atomic_read_unchecked(&n_rcu_torture_alloc),
88561 + atomic_read_unchecked(&n_rcu_torture_alloc_fail),
88562 + atomic_read_unchecked(&n_rcu_torture_free));
88563 page += sprintf(page, "rtmbe: %d rtbke: %ld rtbre: %ld ",
88564 - atomic_read(&n_rcu_torture_mberror),
88565 + atomic_read_unchecked(&n_rcu_torture_mberror),
88566 n_rcu_torture_boost_ktrerror,
88567 n_rcu_torture_boost_rterror);
88568 page += sprintf(page, "rtbf: %ld rtb: %ld nt: %ld ",
88569 @@ -1095,14 +1095,14 @@ rcu_torture_printk(char *page)
88570 n_barrier_attempts,
88571 n_rcu_torture_barrier_error);
88572 page += sprintf(page, "\n%s%s ", torture_type, TORTURE_FLAG);
88573 - if (atomic_read(&n_rcu_torture_mberror) != 0 ||
88574 + if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
88575 n_rcu_torture_barrier_error != 0 ||
88576 n_rcu_torture_boost_ktrerror != 0 ||
88577 n_rcu_torture_boost_rterror != 0 ||
88578 n_rcu_torture_boost_failure != 0 ||
88579 i > 1) {
88580 page += sprintf(page, "!!! ");
88581 - atomic_inc(&n_rcu_torture_error);
88582 + atomic_inc_unchecked(&n_rcu_torture_error);
88583 WARN_ON_ONCE(1);
88584 }
88585 page += sprintf(page, "Reader Pipe: ");
88586 @@ -1116,7 +1116,7 @@ rcu_torture_printk(char *page)
88587 page += sprintf(page, "Free-Block Circulation: ");
88588 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
88589 page += sprintf(page, " %d",
88590 - atomic_read(&rcu_torture_wcount[i]));
88591 + atomic_read_unchecked(&rcu_torture_wcount[i]));
88592 }
88593 page += sprintf(page, "\n");
88594 if (cur_ops->stats)
88595 @@ -1839,7 +1839,7 @@ rcu_torture_cleanup(void)
88596
88597 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
88598
88599 - if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
88600 + if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
88601 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
88602 else if (n_online_successes != n_online_attempts ||
88603 n_offline_successes != n_offline_attempts)
88604 @@ -1961,18 +1961,18 @@ rcu_torture_init(void)
88605
88606 rcu_torture_current = NULL;
88607 rcu_torture_current_version = 0;
88608 - atomic_set(&n_rcu_torture_alloc, 0);
88609 - atomic_set(&n_rcu_torture_alloc_fail, 0);
88610 - atomic_set(&n_rcu_torture_free, 0);
88611 - atomic_set(&n_rcu_torture_mberror, 0);
88612 - atomic_set(&n_rcu_torture_error, 0);
88613 + atomic_set_unchecked(&n_rcu_torture_alloc, 0);
88614 + atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
88615 + atomic_set_unchecked(&n_rcu_torture_free, 0);
88616 + atomic_set_unchecked(&n_rcu_torture_mberror, 0);
88617 + atomic_set_unchecked(&n_rcu_torture_error, 0);
88618 n_rcu_torture_barrier_error = 0;
88619 n_rcu_torture_boost_ktrerror = 0;
88620 n_rcu_torture_boost_rterror = 0;
88621 n_rcu_torture_boost_failure = 0;
88622 n_rcu_torture_boosts = 0;
88623 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
88624 - atomic_set(&rcu_torture_wcount[i], 0);
88625 + atomic_set_unchecked(&rcu_torture_wcount[i], 0);
88626 for_each_possible_cpu(cpu) {
88627 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
88628 per_cpu(rcu_torture_count, cpu)[i] = 0;
88629 diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
88630 index b3d116c..ebf6598 100644
88631 --- a/kernel/rcu/tree.c
88632 +++ b/kernel/rcu/tree.c
88633 @@ -390,9 +390,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
88634 rcu_prepare_for_idle(smp_processor_id());
88635 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
88636 smp_mb__before_atomic_inc(); /* See above. */
88637 - atomic_inc(&rdtp->dynticks);
88638 + atomic_inc_unchecked(&rdtp->dynticks);
88639 smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */
88640 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
88641 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
88642
88643 /*
88644 * It is illegal to enter an extended quiescent state while
88645 @@ -510,10 +510,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
88646 int user)
88647 {
88648 smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
88649 - atomic_inc(&rdtp->dynticks);
88650 + atomic_inc_unchecked(&rdtp->dynticks);
88651 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
88652 smp_mb__after_atomic_inc(); /* See above. */
88653 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
88654 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
88655 rcu_cleanup_after_idle(smp_processor_id());
88656 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
88657 if (!user && !is_idle_task(current)) {
88658 @@ -634,14 +634,14 @@ void rcu_nmi_enter(void)
88659 struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);
88660
88661 if (rdtp->dynticks_nmi_nesting == 0 &&
88662 - (atomic_read(&rdtp->dynticks) & 0x1))
88663 + (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
88664 return;
88665 rdtp->dynticks_nmi_nesting++;
88666 smp_mb__before_atomic_inc(); /* Force delay from prior write. */
88667 - atomic_inc(&rdtp->dynticks);
88668 + atomic_inc_unchecked(&rdtp->dynticks);
88669 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
88670 smp_mb__after_atomic_inc(); /* See above. */
88671 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
88672 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
88673 }
88674
88675 /**
88676 @@ -660,9 +660,9 @@ void rcu_nmi_exit(void)
88677 return;
88678 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
88679 smp_mb__before_atomic_inc(); /* See above. */
88680 - atomic_inc(&rdtp->dynticks);
88681 + atomic_inc_unchecked(&rdtp->dynticks);
88682 smp_mb__after_atomic_inc(); /* Force delay to next write. */
88683 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
88684 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
88685 }
88686
88687 /**
88688 @@ -675,7 +675,7 @@ void rcu_nmi_exit(void)
88689 */
88690 bool notrace __rcu_is_watching(void)
88691 {
88692 - return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
88693 + return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
88694 }
88695
88696 /**
88697 @@ -758,7 +758,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
88698 static int dyntick_save_progress_counter(struct rcu_data *rdp,
88699 bool *isidle, unsigned long *maxj)
88700 {
88701 - rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
88702 + rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
88703 rcu_sysidle_check_cpu(rdp, isidle, maxj);
88704 return (rdp->dynticks_snap & 0x1) == 0;
88705 }
88706 @@ -781,7 +781,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
88707 unsigned int curr;
88708 unsigned int snap;
88709
88710 - curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
88711 + curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
88712 snap = (unsigned int)rdp->dynticks_snap;
88713
88714 /*
88715 @@ -1450,9 +1450,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
88716 rdp = this_cpu_ptr(rsp->rda);
88717 rcu_preempt_check_blocked_tasks(rnp);
88718 rnp->qsmask = rnp->qsmaskinit;
88719 - ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
88720 + ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
88721 WARN_ON_ONCE(rnp->completed != rsp->completed);
88722 - ACCESS_ONCE(rnp->completed) = rsp->completed;
88723 + ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
88724 if (rnp == rdp->mynode)
88725 __note_gp_changes(rsp, rnp, rdp);
88726 rcu_preempt_boost_start_gp(rnp);
88727 @@ -1546,7 +1546,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
88728 rcu_for_each_node_breadth_first(rsp, rnp) {
88729 raw_spin_lock_irq(&rnp->lock);
88730 smp_mb__after_unlock_lock();
88731 - ACCESS_ONCE(rnp->completed) = rsp->gpnum;
88732 + ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
88733 rdp = this_cpu_ptr(rsp->rda);
88734 if (rnp == rdp->mynode)
88735 __note_gp_changes(rsp, rnp, rdp);
88736 @@ -1912,7 +1912,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
88737 rsp->qlen += rdp->qlen;
88738 rdp->n_cbs_orphaned += rdp->qlen;
88739 rdp->qlen_lazy = 0;
88740 - ACCESS_ONCE(rdp->qlen) = 0;
88741 + ACCESS_ONCE_RW(rdp->qlen) = 0;
88742 }
88743
88744 /*
88745 @@ -2159,7 +2159,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
88746 }
88747 smp_mb(); /* List handling before counting for rcu_barrier(). */
88748 rdp->qlen_lazy -= count_lazy;
88749 - ACCESS_ONCE(rdp->qlen) -= count;
88750 + ACCESS_ONCE_RW(rdp->qlen) -= count;
88751 rdp->n_cbs_invoked += count;
88752
88753 /* Reinstate batch limit if we have worked down the excess. */
88754 @@ -2362,7 +2362,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
88755 /*
88756 * Do RCU core processing for the current CPU.
88757 */
88758 -static void rcu_process_callbacks(struct softirq_action *unused)
88759 +static void rcu_process_callbacks(void)
88760 {
88761 struct rcu_state *rsp;
88762
88763 @@ -2470,7 +2470,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
88764 WARN_ON_ONCE((unsigned long)head & 0x3); /* Misaligned rcu_head! */
88765 if (debug_rcu_head_queue(head)) {
88766 /* Probable double call_rcu(), so leak the callback. */
88767 - ACCESS_ONCE(head->func) = rcu_leak_callback;
88768 + ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
88769 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
88770 return;
88771 }
88772 @@ -2498,7 +2498,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
88773 local_irq_restore(flags);
88774 return;
88775 }
88776 - ACCESS_ONCE(rdp->qlen)++;
88777 + ACCESS_ONCE_RW(rdp->qlen)++;
88778 if (lazy)
88779 rdp->qlen_lazy++;
88780 else
88781 @@ -2707,11 +2707,11 @@ void synchronize_sched_expedited(void)
88782 * counter wrap on a 32-bit system. Quite a few more CPUs would of
88783 * course be required on a 64-bit system.
88784 */
88785 - if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
88786 + if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
88787 (ulong)atomic_long_read(&rsp->expedited_done) +
88788 ULONG_MAX / 8)) {
88789 synchronize_sched();
88790 - atomic_long_inc(&rsp->expedited_wrap);
88791 + atomic_long_inc_unchecked(&rsp->expedited_wrap);
88792 return;
88793 }
88794
88795 @@ -2719,7 +2719,7 @@ void synchronize_sched_expedited(void)
88796 * Take a ticket. Note that atomic_inc_return() implies a
88797 * full memory barrier.
88798 */
88799 - snap = atomic_long_inc_return(&rsp->expedited_start);
88800 + snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
88801 firstsnap = snap;
88802 get_online_cpus();
88803 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
88804 @@ -2732,14 +2732,14 @@ void synchronize_sched_expedited(void)
88805 synchronize_sched_expedited_cpu_stop,
88806 NULL) == -EAGAIN) {
88807 put_online_cpus();
88808 - atomic_long_inc(&rsp->expedited_tryfail);
88809 + atomic_long_inc_unchecked(&rsp->expedited_tryfail);
88810
88811 /* Check to see if someone else did our work for us. */
88812 s = atomic_long_read(&rsp->expedited_done);
88813 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
88814 /* ensure test happens before caller kfree */
88815 smp_mb__before_atomic_inc(); /* ^^^ */
88816 - atomic_long_inc(&rsp->expedited_workdone1);
88817 + atomic_long_inc_unchecked(&rsp->expedited_workdone1);
88818 return;
88819 }
88820
88821 @@ -2748,7 +2748,7 @@ void synchronize_sched_expedited(void)
88822 udelay(trycount * num_online_cpus());
88823 } else {
88824 wait_rcu_gp(call_rcu_sched);
88825 - atomic_long_inc(&rsp->expedited_normal);
88826 + atomic_long_inc_unchecked(&rsp->expedited_normal);
88827 return;
88828 }
88829
88830 @@ -2757,7 +2757,7 @@ void synchronize_sched_expedited(void)
88831 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
88832 /* ensure test happens before caller kfree */
88833 smp_mb__before_atomic_inc(); /* ^^^ */
88834 - atomic_long_inc(&rsp->expedited_workdone2);
88835 + atomic_long_inc_unchecked(&rsp->expedited_workdone2);
88836 return;
88837 }
88838
88839 @@ -2769,10 +2769,10 @@ void synchronize_sched_expedited(void)
88840 * period works for us.
88841 */
88842 get_online_cpus();
88843 - snap = atomic_long_read(&rsp->expedited_start);
88844 + snap = atomic_long_read_unchecked(&rsp->expedited_start);
88845 smp_mb(); /* ensure read is before try_stop_cpus(). */
88846 }
88847 - atomic_long_inc(&rsp->expedited_stoppedcpus);
88848 + atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
88849
88850 /*
88851 * Everyone up to our most recent fetch is covered by our grace
88852 @@ -2781,16 +2781,16 @@ void synchronize_sched_expedited(void)
88853 * than we did already did their update.
88854 */
88855 do {
88856 - atomic_long_inc(&rsp->expedited_done_tries);
88857 + atomic_long_inc_unchecked(&rsp->expedited_done_tries);
88858 s = atomic_long_read(&rsp->expedited_done);
88859 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
88860 /* ensure test happens before caller kfree */
88861 smp_mb__before_atomic_inc(); /* ^^^ */
88862 - atomic_long_inc(&rsp->expedited_done_lost);
88863 + atomic_long_inc_unchecked(&rsp->expedited_done_lost);
88864 break;
88865 }
88866 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
88867 - atomic_long_inc(&rsp->expedited_done_exit);
88868 + atomic_long_inc_unchecked(&rsp->expedited_done_exit);
88869
88870 put_online_cpus();
88871 }
88872 @@ -2996,7 +2996,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
88873 * ACCESS_ONCE() to prevent the compiler from speculating
88874 * the increment to precede the early-exit check.
88875 */
88876 - ACCESS_ONCE(rsp->n_barrier_done)++;
88877 + ACCESS_ONCE_RW(rsp->n_barrier_done)++;
88878 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
88879 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
88880 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
88881 @@ -3046,7 +3046,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
88882
88883 /* Increment ->n_barrier_done to prevent duplicate work. */
88884 smp_mb(); /* Keep increment after above mechanism. */
88885 - ACCESS_ONCE(rsp->n_barrier_done)++;
88886 + ACCESS_ONCE_RW(rsp->n_barrier_done)++;
88887 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
88888 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
88889 smp_mb(); /* Keep increment before caller's subsequent code. */
88890 @@ -3091,10 +3091,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
88891 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
88892 init_callback_list(rdp);
88893 rdp->qlen_lazy = 0;
88894 - ACCESS_ONCE(rdp->qlen) = 0;
88895 + ACCESS_ONCE_RW(rdp->qlen) = 0;
88896 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
88897 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
88898 - WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
88899 + WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
88900 rdp->cpu = cpu;
88901 rdp->rsp = rsp;
88902 rcu_boot_init_nocb_percpu_data(rdp);
88903 @@ -3128,8 +3128,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
88904 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
88905 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
88906 rcu_sysidle_init_percpu_data(rdp->dynticks);
88907 - atomic_set(&rdp->dynticks->dynticks,
88908 - (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
88909 + atomic_set_unchecked(&rdp->dynticks->dynticks,
88910 + (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
88911 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
88912
88913 /* Add CPU to rcu_node bitmasks. */
88914 diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
88915 index 8c19873..bf83c57 100644
88916 --- a/kernel/rcu/tree.h
88917 +++ b/kernel/rcu/tree.h
88918 @@ -87,11 +87,11 @@ struct rcu_dynticks {
88919 long long dynticks_nesting; /* Track irq/process nesting level. */
88920 /* Process level is worth LLONG_MAX/2. */
88921 int dynticks_nmi_nesting; /* Track NMI nesting level. */
88922 - atomic_t dynticks; /* Even value for idle, else odd. */
88923 + atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
88924 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
88925 long long dynticks_idle_nesting;
88926 /* irq/process nesting level from idle. */
88927 - atomic_t dynticks_idle; /* Even value for idle, else odd. */
88928 + atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
88929 /* "Idle" excludes userspace execution. */
88930 unsigned long dynticks_idle_jiffies;
88931 /* End of last non-NMI non-idle period. */
88932 @@ -431,17 +431,17 @@ struct rcu_state {
88933 /* _rcu_barrier(). */
88934 /* End of fields guarded by barrier_mutex. */
88935
88936 - atomic_long_t expedited_start; /* Starting ticket. */
88937 - atomic_long_t expedited_done; /* Done ticket. */
88938 - atomic_long_t expedited_wrap; /* # near-wrap incidents. */
88939 - atomic_long_t expedited_tryfail; /* # acquisition failures. */
88940 - atomic_long_t expedited_workdone1; /* # done by others #1. */
88941 - atomic_long_t expedited_workdone2; /* # done by others #2. */
88942 - atomic_long_t expedited_normal; /* # fallbacks to normal. */
88943 - atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
88944 - atomic_long_t expedited_done_tries; /* # tries to update _done. */
88945 - atomic_long_t expedited_done_lost; /* # times beaten to _done. */
88946 - atomic_long_t expedited_done_exit; /* # times exited _done loop. */
88947 + atomic_long_unchecked_t expedited_start; /* Starting ticket. */
88948 + atomic_long_t expedited_done; /* Done ticket. */
88949 + atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
88950 + atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
88951 + atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
88952 + atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
88953 + atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
88954 + atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
88955 + atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
88956 + atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
88957 + atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
88958
88959 unsigned long jiffies_force_qs; /* Time at which to invoke */
88960 /* force_quiescent_state(). */
88961 diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
88962 index 6e2ef4b..c15df94 100644
88963 --- a/kernel/rcu/tree_plugin.h
88964 +++ b/kernel/rcu/tree_plugin.h
88965 @@ -758,7 +758,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
88966 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
88967 {
88968 return !rcu_preempted_readers_exp(rnp) &&
88969 - ACCESS_ONCE(rnp->expmask) == 0;
88970 + ACCESS_ONCE_RW(rnp->expmask) == 0;
88971 }
88972
88973 /*
88974 @@ -920,7 +920,7 @@ void synchronize_rcu_expedited(void)
88975
88976 /* Clean up and exit. */
88977 smp_mb(); /* ensure expedited GP seen before counter increment. */
88978 - ACCESS_ONCE(sync_rcu_preempt_exp_count)++;
88979 + ACCESS_ONCE_RW(sync_rcu_preempt_exp_count)++;
88980 unlock_mb_ret:
88981 mutex_unlock(&sync_rcu_preempt_exp_mutex);
88982 mb_ret:
88983 @@ -1496,7 +1496,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
88984 free_cpumask_var(cm);
88985 }
88986
88987 -static struct smp_hotplug_thread rcu_cpu_thread_spec = {
88988 +static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
88989 .store = &rcu_cpu_kthread_task,
88990 .thread_should_run = rcu_cpu_kthread_should_run,
88991 .thread_fn = rcu_cpu_kthread,
88992 @@ -1965,7 +1965,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
88993 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
88994 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n",
88995 cpu, ticks_value, ticks_title,
88996 - atomic_read(&rdtp->dynticks) & 0xfff,
88997 + atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
88998 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
88999 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
89000 fast_no_hz);
89001 @@ -2129,7 +2129,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
89002
89003 /* Enqueue the callback on the nocb list and update counts. */
89004 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
89005 - ACCESS_ONCE(*old_rhpp) = rhp;
89006 + ACCESS_ONCE_RW(*old_rhpp) = rhp;
89007 atomic_long_add(rhcount, &rdp->nocb_q_count);
89008 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
89009
89010 @@ -2302,12 +2302,12 @@ static int rcu_nocb_kthread(void *arg)
89011 * Extract queued callbacks, update counts, and wait
89012 * for a grace period to elapse.
89013 */
89014 - ACCESS_ONCE(rdp->nocb_head) = NULL;
89015 + ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
89016 tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
89017 c = atomic_long_xchg(&rdp->nocb_q_count, 0);
89018 cl = atomic_long_xchg(&rdp->nocb_q_count_lazy, 0);
89019 - ACCESS_ONCE(rdp->nocb_p_count) += c;
89020 - ACCESS_ONCE(rdp->nocb_p_count_lazy) += cl;
89021 + ACCESS_ONCE_RW(rdp->nocb_p_count) += c;
89022 + ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) += cl;
89023 rcu_nocb_wait_gp(rdp);
89024
89025 /* Each pass through the following loop invokes a callback. */
89026 @@ -2333,8 +2333,8 @@ static int rcu_nocb_kthread(void *arg)
89027 list = next;
89028 }
89029 trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
89030 - ACCESS_ONCE(rdp->nocb_p_count) -= c;
89031 - ACCESS_ONCE(rdp->nocb_p_count_lazy) -= cl;
89032 + ACCESS_ONCE_RW(rdp->nocb_p_count) -= c;
89033 + ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) -= cl;
89034 rdp->n_nocbs_invoked += c;
89035 }
89036 return 0;
89037 @@ -2351,7 +2351,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
89038 {
89039 if (!rcu_nocb_need_deferred_wakeup(rdp))
89040 return;
89041 - ACCESS_ONCE(rdp->nocb_defer_wakeup) = false;
89042 + ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = false;
89043 wake_up(&rdp->nocb_wq);
89044 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWakeEmpty"));
89045 }
89046 @@ -2377,7 +2377,7 @@ static void __init rcu_spawn_nocb_kthreads(struct rcu_state *rsp)
89047 t = kthread_run(rcu_nocb_kthread, rdp,
89048 "rcuo%c/%d", rsp->abbr, cpu);
89049 BUG_ON(IS_ERR(t));
89050 - ACCESS_ONCE(rdp->nocb_kthread) = t;
89051 + ACCESS_ONCE_RW(rdp->nocb_kthread) = t;
89052 }
89053 }
89054
89055 @@ -2513,11 +2513,11 @@ static void rcu_sysidle_enter(struct rcu_dynticks *rdtp, int irq)
89056
89057 /* Record start of fully idle period. */
89058 j = jiffies;
89059 - ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
89060 + ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
89061 smp_mb__before_atomic_inc();
89062 - atomic_inc(&rdtp->dynticks_idle);
89063 + atomic_inc_unchecked(&rdtp->dynticks_idle);
89064 smp_mb__after_atomic_inc();
89065 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
89066 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
89067 }
89068
89069 /*
89070 @@ -2582,9 +2582,9 @@ static void rcu_sysidle_exit(struct rcu_dynticks *rdtp, int irq)
89071
89072 /* Record end of idle period. */
89073 smp_mb__before_atomic_inc();
89074 - atomic_inc(&rdtp->dynticks_idle);
89075 + atomic_inc_unchecked(&rdtp->dynticks_idle);
89076 smp_mb__after_atomic_inc();
89077 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
89078 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
89079
89080 /*
89081 * If we are the timekeeping CPU, we are permitted to be non-idle
89082 @@ -2625,7 +2625,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
89083 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
89084
89085 /* Pick up current idle and NMI-nesting counter and check. */
89086 - cur = atomic_read(&rdtp->dynticks_idle);
89087 + cur = atomic_read_unchecked(&rdtp->dynticks_idle);
89088 if (cur & 0x1) {
89089 *isidle = false; /* We are not idle! */
89090 return;
89091 @@ -2688,7 +2688,7 @@ static void rcu_sysidle(unsigned long j)
89092 case RCU_SYSIDLE_NOT:
89093
89094 /* First time all are idle, so note a short idle period. */
89095 - ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
89096 + ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
89097 break;
89098
89099 case RCU_SYSIDLE_SHORT:
89100 @@ -2725,7 +2725,7 @@ static void rcu_sysidle(unsigned long j)
89101 static void rcu_sysidle_cancel(void)
89102 {
89103 smp_mb();
89104 - ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
89105 + ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
89106 }
89107
89108 /*
89109 @@ -2773,7 +2773,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
89110 smp_mb(); /* grace period precedes setting inuse. */
89111
89112 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
89113 - ACCESS_ONCE(rshp->inuse) = 0;
89114 + ACCESS_ONCE_RW(rshp->inuse) = 0;
89115 }
89116
89117 /*
89118 diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
89119 index 4def475..8ffddde 100644
89120 --- a/kernel/rcu/tree_trace.c
89121 +++ b/kernel/rcu/tree_trace.c
89122 @@ -121,7 +121,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
89123 ulong2long(rdp->completed), ulong2long(rdp->gpnum),
89124 rdp->passed_quiesce, rdp->qs_pending);
89125 seq_printf(m, " dt=%d/%llx/%d df=%lu",
89126 - atomic_read(&rdp->dynticks->dynticks),
89127 + atomic_read_unchecked(&rdp->dynticks->dynticks),
89128 rdp->dynticks->dynticks_nesting,
89129 rdp->dynticks->dynticks_nmi_nesting,
89130 rdp->dynticks_fqs);
89131 @@ -182,17 +182,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
89132 struct rcu_state *rsp = (struct rcu_state *)m->private;
89133
89134 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",
89135 - atomic_long_read(&rsp->expedited_start),
89136 + atomic_long_read_unchecked(&rsp->expedited_start),
89137 atomic_long_read(&rsp->expedited_done),
89138 - atomic_long_read(&rsp->expedited_wrap),
89139 - atomic_long_read(&rsp->expedited_tryfail),
89140 - atomic_long_read(&rsp->expedited_workdone1),
89141 - atomic_long_read(&rsp->expedited_workdone2),
89142 - atomic_long_read(&rsp->expedited_normal),
89143 - atomic_long_read(&rsp->expedited_stoppedcpus),
89144 - atomic_long_read(&rsp->expedited_done_tries),
89145 - atomic_long_read(&rsp->expedited_done_lost),
89146 - atomic_long_read(&rsp->expedited_done_exit));
89147 + atomic_long_read_unchecked(&rsp->expedited_wrap),
89148 + atomic_long_read_unchecked(&rsp->expedited_tryfail),
89149 + atomic_long_read_unchecked(&rsp->expedited_workdone1),
89150 + atomic_long_read_unchecked(&rsp->expedited_workdone2),
89151 + atomic_long_read_unchecked(&rsp->expedited_normal),
89152 + atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
89153 + atomic_long_read_unchecked(&rsp->expedited_done_tries),
89154 + atomic_long_read_unchecked(&rsp->expedited_done_lost),
89155 + atomic_long_read_unchecked(&rsp->expedited_done_exit));
89156 return 0;
89157 }
89158
89159 diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
89160 index c54609f..2e8829c 100644
89161 --- a/kernel/rcu/update.c
89162 +++ b/kernel/rcu/update.c
89163 @@ -312,10 +312,10 @@ int rcu_jiffies_till_stall_check(void)
89164 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
89165 */
89166 if (till_stall_check < 3) {
89167 - ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
89168 + ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
89169 till_stall_check = 3;
89170 } else if (till_stall_check > 300) {
89171 - ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
89172 + ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
89173 till_stall_check = 300;
89174 }
89175 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
89176 diff --git a/kernel/resource.c b/kernel/resource.c
89177 index 3f285dc..5755f62 100644
89178 --- a/kernel/resource.c
89179 +++ b/kernel/resource.c
89180 @@ -152,8 +152,18 @@ static const struct file_operations proc_iomem_operations = {
89181
89182 static int __init ioresources_init(void)
89183 {
89184 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
89185 +#ifdef CONFIG_GRKERNSEC_PROC_USER
89186 + proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
89187 + proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
89188 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
89189 + proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
89190 + proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
89191 +#endif
89192 +#else
89193 proc_create("ioports", 0, NULL, &proc_ioports_operations);
89194 proc_create("iomem", 0, NULL, &proc_iomem_operations);
89195 +#endif
89196 return 0;
89197 }
89198 __initcall(ioresources_init);
89199 diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
89200 index 4a07353..66b5291 100644
89201 --- a/kernel/sched/auto_group.c
89202 +++ b/kernel/sched/auto_group.c
89203 @@ -11,7 +11,7 @@
89204
89205 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
89206 static struct autogroup autogroup_default;
89207 -static atomic_t autogroup_seq_nr;
89208 +static atomic_unchecked_t autogroup_seq_nr;
89209
89210 void __init autogroup_init(struct task_struct *init_task)
89211 {
89212 @@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
89213
89214 kref_init(&ag->kref);
89215 init_rwsem(&ag->lock);
89216 - ag->id = atomic_inc_return(&autogroup_seq_nr);
89217 + ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
89218 ag->tg = tg;
89219 #ifdef CONFIG_RT_GROUP_SCHED
89220 /*
89221 diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
89222 index a63f4dc..349bbb0 100644
89223 --- a/kernel/sched/completion.c
89224 +++ b/kernel/sched/completion.c
89225 @@ -204,7 +204,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
89226 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
89227 * or number of jiffies left till timeout) if completed.
89228 */
89229 -long __sched
89230 +long __sched __intentional_overflow(-1)
89231 wait_for_completion_interruptible_timeout(struct completion *x,
89232 unsigned long timeout)
89233 {
89234 @@ -221,7 +221,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
89235 *
89236 * Return: -ERESTARTSYS if interrupted, 0 if completed.
89237 */
89238 -int __sched wait_for_completion_killable(struct completion *x)
89239 +int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
89240 {
89241 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
89242 if (t == -ERESTARTSYS)
89243 @@ -242,7 +242,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
89244 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
89245 * or number of jiffies left till timeout) if completed.
89246 */
89247 -long __sched
89248 +long __sched __intentional_overflow(-1)
89249 wait_for_completion_killable_timeout(struct completion *x,
89250 unsigned long timeout)
89251 {
89252 diff --git a/kernel/sched/core.c b/kernel/sched/core.c
89253 index f5c6635..ab9f223 100644
89254 --- a/kernel/sched/core.c
89255 +++ b/kernel/sched/core.c
89256 @@ -1775,7 +1775,7 @@ void set_numabalancing_state(bool enabled)
89257 int sysctl_numa_balancing(struct ctl_table *table, int write,
89258 void __user *buffer, size_t *lenp, loff_t *ppos)
89259 {
89260 - struct ctl_table t;
89261 + ctl_table_no_const t;
89262 int err;
89263 int state = numabalancing_enabled;
89264
89265 @@ -3049,6 +3049,8 @@ int can_nice(const struct task_struct *p, const int nice)
89266 /* convert nice value [19,-20] to rlimit style value [1,40] */
89267 int nice_rlim = 20 - nice;
89268
89269 + gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
89270 +
89271 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
89272 capable(CAP_SYS_NICE));
89273 }
89274 @@ -3082,7 +3084,8 @@ SYSCALL_DEFINE1(nice, int, increment)
89275 if (nice > 19)
89276 nice = 19;
89277
89278 - if (increment < 0 && !can_nice(current, nice))
89279 + if (increment < 0 && (!can_nice(current, nice) ||
89280 + gr_handle_chroot_nice()))
89281 return -EPERM;
89282
89283 retval = security_task_setnice(current, nice);
89284 @@ -3332,6 +3335,7 @@ recheck:
89285 if (policy != p->policy && !rlim_rtprio)
89286 return -EPERM;
89287
89288 + gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
89289 /* can't increase priority */
89290 if (attr->sched_priority > p->rt_priority &&
89291 attr->sched_priority > rlim_rtprio)
89292 @@ -4781,7 +4785,7 @@ static void migrate_tasks(unsigned int dead_cpu)
89293
89294 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
89295
89296 -static struct ctl_table sd_ctl_dir[] = {
89297 +static ctl_table_no_const sd_ctl_dir[] __read_only = {
89298 {
89299 .procname = "sched_domain",
89300 .mode = 0555,
89301 @@ -4798,17 +4802,17 @@ static struct ctl_table sd_ctl_root[] = {
89302 {}
89303 };
89304
89305 -static struct ctl_table *sd_alloc_ctl_entry(int n)
89306 +static ctl_table_no_const *sd_alloc_ctl_entry(int n)
89307 {
89308 - struct ctl_table *entry =
89309 + ctl_table_no_const *entry =
89310 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
89311
89312 return entry;
89313 }
89314
89315 -static void sd_free_ctl_entry(struct ctl_table **tablep)
89316 +static void sd_free_ctl_entry(ctl_table_no_const *tablep)
89317 {
89318 - struct ctl_table *entry;
89319 + ctl_table_no_const *entry;
89320
89321 /*
89322 * In the intermediate directories, both the child directory and
89323 @@ -4816,22 +4820,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
89324 * will always be set. In the lowest directory the names are
89325 * static strings and all have proc handlers.
89326 */
89327 - for (entry = *tablep; entry->mode; entry++) {
89328 - if (entry->child)
89329 - sd_free_ctl_entry(&entry->child);
89330 + for (entry = tablep; entry->mode; entry++) {
89331 + if (entry->child) {
89332 + sd_free_ctl_entry(entry->child);
89333 + pax_open_kernel();
89334 + entry->child = NULL;
89335 + pax_close_kernel();
89336 + }
89337 if (entry->proc_handler == NULL)
89338 kfree(entry->procname);
89339 }
89340
89341 - kfree(*tablep);
89342 - *tablep = NULL;
89343 + kfree(tablep);
89344 }
89345
89346 static int min_load_idx = 0;
89347 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
89348
89349 static void
89350 -set_table_entry(struct ctl_table *entry,
89351 +set_table_entry(ctl_table_no_const *entry,
89352 const char *procname, void *data, int maxlen,
89353 umode_t mode, proc_handler *proc_handler,
89354 bool load_idx)
89355 @@ -4851,7 +4858,7 @@ set_table_entry(struct ctl_table *entry,
89356 static struct ctl_table *
89357 sd_alloc_ctl_domain_table(struct sched_domain *sd)
89358 {
89359 - struct ctl_table *table = sd_alloc_ctl_entry(13);
89360 + ctl_table_no_const *table = sd_alloc_ctl_entry(13);
89361
89362 if (table == NULL)
89363 return NULL;
89364 @@ -4886,9 +4893,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
89365 return table;
89366 }
89367
89368 -static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
89369 +static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
89370 {
89371 - struct ctl_table *entry, *table;
89372 + ctl_table_no_const *entry, *table;
89373 struct sched_domain *sd;
89374 int domain_num = 0, i;
89375 char buf[32];
89376 @@ -4915,11 +4922,13 @@ static struct ctl_table_header *sd_sysctl_header;
89377 static void register_sched_domain_sysctl(void)
89378 {
89379 int i, cpu_num = num_possible_cpus();
89380 - struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
89381 + ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
89382 char buf[32];
89383
89384 WARN_ON(sd_ctl_dir[0].child);
89385 + pax_open_kernel();
89386 sd_ctl_dir[0].child = entry;
89387 + pax_close_kernel();
89388
89389 if (entry == NULL)
89390 return;
89391 @@ -4942,8 +4951,12 @@ static void unregister_sched_domain_sysctl(void)
89392 if (sd_sysctl_header)
89393 unregister_sysctl_table(sd_sysctl_header);
89394 sd_sysctl_header = NULL;
89395 - if (sd_ctl_dir[0].child)
89396 - sd_free_ctl_entry(&sd_ctl_dir[0].child);
89397 + if (sd_ctl_dir[0].child) {
89398 + sd_free_ctl_entry(sd_ctl_dir[0].child);
89399 + pax_open_kernel();
89400 + sd_ctl_dir[0].child = NULL;
89401 + pax_close_kernel();
89402 + }
89403 }
89404 #else
89405 static void register_sched_domain_sysctl(void)
89406 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
89407 index 9b4c4f3..665489b 100644
89408 --- a/kernel/sched/fair.c
89409 +++ b/kernel/sched/fair.c
89410 @@ -1647,7 +1647,7 @@ void task_numa_fault(int last_cpupid, int node, int pages, int flags)
89411
89412 static void reset_ptenuma_scan(struct task_struct *p)
89413 {
89414 - ACCESS_ONCE(p->mm->numa_scan_seq)++;
89415 + ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
89416 p->mm->numa_scan_offset = 0;
89417 }
89418
89419 @@ -6851,7 +6851,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
89420 * run_rebalance_domains is triggered when needed from the scheduler tick.
89421 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
89422 */
89423 -static void run_rebalance_domains(struct softirq_action *h)
89424 +static __latent_entropy void run_rebalance_domains(void)
89425 {
89426 struct rq *this_rq = this_rq();
89427 enum cpu_idle_type idle = this_rq->idle_balance ?
89428 diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
89429 index f964add..dcd823d 100644
89430 --- a/kernel/sched/sched.h
89431 +++ b/kernel/sched/sched.h
89432 @@ -1157,7 +1157,7 @@ struct sched_class {
89433 #ifdef CONFIG_FAIR_GROUP_SCHED
89434 void (*task_move_group) (struct task_struct *p, int on_rq);
89435 #endif
89436 -};
89437 +} __do_const;
89438
89439 #define sched_class_highest (&stop_sched_class)
89440 #define for_each_class(class) \
89441 diff --git a/kernel/signal.c b/kernel/signal.c
89442 index 52f881d..1e9f941 100644
89443 --- a/kernel/signal.c
89444 +++ b/kernel/signal.c
89445 @@ -51,12 +51,12 @@ static struct kmem_cache *sigqueue_cachep;
89446
89447 int print_fatal_signals __read_mostly;
89448
89449 -static void __user *sig_handler(struct task_struct *t, int sig)
89450 +static __sighandler_t sig_handler(struct task_struct *t, int sig)
89451 {
89452 return t->sighand->action[sig - 1].sa.sa_handler;
89453 }
89454
89455 -static int sig_handler_ignored(void __user *handler, int sig)
89456 +static int sig_handler_ignored(__sighandler_t handler, int sig)
89457 {
89458 /* Is it explicitly or implicitly ignored? */
89459 return handler == SIG_IGN ||
89460 @@ -65,7 +65,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
89461
89462 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
89463 {
89464 - void __user *handler;
89465 + __sighandler_t handler;
89466
89467 handler = sig_handler(t, sig);
89468
89469 @@ -369,6 +369,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
89470 atomic_inc(&user->sigpending);
89471 rcu_read_unlock();
89472
89473 + if (!override_rlimit)
89474 + gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
89475 +
89476 if (override_rlimit ||
89477 atomic_read(&user->sigpending) <=
89478 task_rlimit(t, RLIMIT_SIGPENDING)) {
89479 @@ -496,7 +499,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
89480
89481 int unhandled_signal(struct task_struct *tsk, int sig)
89482 {
89483 - void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
89484 + __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
89485 if (is_global_init(tsk))
89486 return 1;
89487 if (handler != SIG_IGN && handler != SIG_DFL)
89488 @@ -816,6 +819,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
89489 }
89490 }
89491
89492 + /* allow glibc communication via tgkill to other threads in our
89493 + thread group */
89494 + if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
89495 + sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
89496 + && gr_handle_signal(t, sig))
89497 + return -EPERM;
89498 +
89499 return security_task_kill(t, info, sig, 0);
89500 }
89501
89502 @@ -1199,7 +1209,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
89503 return send_signal(sig, info, p, 1);
89504 }
89505
89506 -static int
89507 +int
89508 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
89509 {
89510 return send_signal(sig, info, t, 0);
89511 @@ -1236,6 +1246,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
89512 unsigned long int flags;
89513 int ret, blocked, ignored;
89514 struct k_sigaction *action;
89515 + int is_unhandled = 0;
89516
89517 spin_lock_irqsave(&t->sighand->siglock, flags);
89518 action = &t->sighand->action[sig-1];
89519 @@ -1250,9 +1261,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
89520 }
89521 if (action->sa.sa_handler == SIG_DFL)
89522 t->signal->flags &= ~SIGNAL_UNKILLABLE;
89523 + if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
89524 + is_unhandled = 1;
89525 ret = specific_send_sig_info(sig, info, t);
89526 spin_unlock_irqrestore(&t->sighand->siglock, flags);
89527
89528 + /* only deal with unhandled signals, java etc trigger SIGSEGV during
89529 + normal operation */
89530 + if (is_unhandled) {
89531 + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
89532 + gr_handle_crash(t, sig);
89533 + }
89534 +
89535 return ret;
89536 }
89537
89538 @@ -1319,8 +1339,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
89539 ret = check_kill_permission(sig, info, p);
89540 rcu_read_unlock();
89541
89542 - if (!ret && sig)
89543 + if (!ret && sig) {
89544 ret = do_send_sig_info(sig, info, p, true);
89545 + if (!ret)
89546 + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
89547 + }
89548
89549 return ret;
89550 }
89551 @@ -2926,7 +2949,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
89552 int error = -ESRCH;
89553
89554 rcu_read_lock();
89555 - p = find_task_by_vpid(pid);
89556 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
89557 + /* allow glibc communication via tgkill to other threads in our
89558 + thread group */
89559 + if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
89560 + sig == (SIGRTMIN+1) && tgid == info->si_pid)
89561 + p = find_task_by_vpid_unrestricted(pid);
89562 + else
89563 +#endif
89564 + p = find_task_by_vpid(pid);
89565 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
89566 error = check_kill_permission(sig, info, p);
89567 /*
89568 @@ -3239,8 +3270,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
89569 }
89570 seg = get_fs();
89571 set_fs(KERNEL_DS);
89572 - ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
89573 - (stack_t __force __user *) &uoss,
89574 + ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
89575 + (stack_t __force_user *) &uoss,
89576 compat_user_stack_pointer());
89577 set_fs(seg);
89578 if (ret >= 0 && uoss_ptr) {
89579 diff --git a/kernel/smpboot.c b/kernel/smpboot.c
89580 index eb89e18..a4e6792 100644
89581 --- a/kernel/smpboot.c
89582 +++ b/kernel/smpboot.c
89583 @@ -288,7 +288,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
89584 }
89585 smpboot_unpark_thread(plug_thread, cpu);
89586 }
89587 - list_add(&plug_thread->list, &hotplug_threads);
89588 + pax_list_add(&plug_thread->list, &hotplug_threads);
89589 out:
89590 mutex_unlock(&smpboot_threads_lock);
89591 return ret;
89592 @@ -305,7 +305,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
89593 {
89594 get_online_cpus();
89595 mutex_lock(&smpboot_threads_lock);
89596 - list_del(&plug_thread->list);
89597 + pax_list_del(&plug_thread->list);
89598 smpboot_destroy_threads(plug_thread);
89599 mutex_unlock(&smpboot_threads_lock);
89600 put_online_cpus();
89601 diff --git a/kernel/softirq.c b/kernel/softirq.c
89602 index 490fcbb..1e502c6 100644
89603 --- a/kernel/softirq.c
89604 +++ b/kernel/softirq.c
89605 @@ -52,7 +52,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
89606 EXPORT_SYMBOL(irq_stat);
89607 #endif
89608
89609 -static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
89610 +static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
89611
89612 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
89613
89614 @@ -267,7 +267,7 @@ restart:
89615 kstat_incr_softirqs_this_cpu(vec_nr);
89616
89617 trace_softirq_entry(vec_nr);
89618 - h->action(h);
89619 + h->action();
89620 trace_softirq_exit(vec_nr);
89621 if (unlikely(prev_count != preempt_count())) {
89622 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
89623 @@ -427,7 +427,7 @@ void __raise_softirq_irqoff(unsigned int nr)
89624 or_softirq_pending(1UL << nr);
89625 }
89626
89627 -void open_softirq(int nr, void (*action)(struct softirq_action *))
89628 +void __init open_softirq(int nr, void (*action)(void))
89629 {
89630 softirq_vec[nr].action = action;
89631 }
89632 @@ -479,7 +479,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
89633 }
89634 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
89635
89636 -static void tasklet_action(struct softirq_action *a)
89637 +static void tasklet_action(void)
89638 {
89639 struct tasklet_struct *list;
89640
89641 @@ -515,7 +515,7 @@ static void tasklet_action(struct softirq_action *a)
89642 }
89643 }
89644
89645 -static void tasklet_hi_action(struct softirq_action *a)
89646 +static __latent_entropy void tasklet_hi_action(void)
89647 {
89648 struct tasklet_struct *list;
89649
89650 @@ -742,7 +742,7 @@ static struct notifier_block cpu_nfb = {
89651 .notifier_call = cpu_callback
89652 };
89653
89654 -static struct smp_hotplug_thread softirq_threads = {
89655 +static struct smp_hotplug_thread softirq_threads __read_only = {
89656 .store = &ksoftirqd,
89657 .thread_should_run = ksoftirqd_should_run,
89658 .thread_fn = run_ksoftirqd,
89659 diff --git a/kernel/sys.c b/kernel/sys.c
89660 index c0a58be..784c618 100644
89661 --- a/kernel/sys.c
89662 +++ b/kernel/sys.c
89663 @@ -148,6 +148,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
89664 error = -EACCES;
89665 goto out;
89666 }
89667 +
89668 + if (gr_handle_chroot_setpriority(p, niceval)) {
89669 + error = -EACCES;
89670 + goto out;
89671 + }
89672 +
89673 no_nice = security_task_setnice(p, niceval);
89674 if (no_nice) {
89675 error = no_nice;
89676 @@ -351,6 +357,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
89677 goto error;
89678 }
89679
89680 + if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
89681 + goto error;
89682 +
89683 if (rgid != (gid_t) -1 ||
89684 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
89685 new->sgid = new->egid;
89686 @@ -386,6 +395,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
89687 old = current_cred();
89688
89689 retval = -EPERM;
89690 +
89691 + if (gr_check_group_change(kgid, kgid, kgid))
89692 + goto error;
89693 +
89694 if (ns_capable(old->user_ns, CAP_SETGID))
89695 new->gid = new->egid = new->sgid = new->fsgid = kgid;
89696 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
89697 @@ -403,7 +416,7 @@ error:
89698 /*
89699 * change the user struct in a credentials set to match the new UID
89700 */
89701 -static int set_user(struct cred *new)
89702 +int set_user(struct cred *new)
89703 {
89704 struct user_struct *new_user;
89705
89706 @@ -483,6 +496,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
89707 goto error;
89708 }
89709
89710 + if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
89711 + goto error;
89712 +
89713 if (!uid_eq(new->uid, old->uid)) {
89714 retval = set_user(new);
89715 if (retval < 0)
89716 @@ -533,6 +549,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
89717 old = current_cred();
89718
89719 retval = -EPERM;
89720 +
89721 + if (gr_check_crash_uid(kuid))
89722 + goto error;
89723 + if (gr_check_user_change(kuid, kuid, kuid))
89724 + goto error;
89725 +
89726 if (ns_capable(old->user_ns, CAP_SETUID)) {
89727 new->suid = new->uid = kuid;
89728 if (!uid_eq(kuid, old->uid)) {
89729 @@ -602,6 +624,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
89730 goto error;
89731 }
89732
89733 + if (gr_check_user_change(kruid, keuid, INVALID_UID))
89734 + goto error;
89735 +
89736 if (ruid != (uid_t) -1) {
89737 new->uid = kruid;
89738 if (!uid_eq(kruid, old->uid)) {
89739 @@ -684,6 +709,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
89740 goto error;
89741 }
89742
89743 + if (gr_check_group_change(krgid, kegid, INVALID_GID))
89744 + goto error;
89745 +
89746 if (rgid != (gid_t) -1)
89747 new->gid = krgid;
89748 if (egid != (gid_t) -1)
89749 @@ -745,12 +773,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
89750 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
89751 ns_capable(old->user_ns, CAP_SETUID)) {
89752 if (!uid_eq(kuid, old->fsuid)) {
89753 + if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
89754 + goto error;
89755 +
89756 new->fsuid = kuid;
89757 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
89758 goto change_okay;
89759 }
89760 }
89761
89762 +error:
89763 abort_creds(new);
89764 return old_fsuid;
89765
89766 @@ -783,12 +815,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
89767 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
89768 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
89769 ns_capable(old->user_ns, CAP_SETGID)) {
89770 + if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
89771 + goto error;
89772 +
89773 if (!gid_eq(kgid, old->fsgid)) {
89774 new->fsgid = kgid;
89775 goto change_okay;
89776 }
89777 }
89778
89779 +error:
89780 abort_creds(new);
89781 return old_fsgid;
89782
89783 @@ -1167,19 +1203,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
89784 return -EFAULT;
89785
89786 down_read(&uts_sem);
89787 - error = __copy_to_user(&name->sysname, &utsname()->sysname,
89788 + error = __copy_to_user(name->sysname, &utsname()->sysname,
89789 __OLD_UTS_LEN);
89790 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
89791 - error |= __copy_to_user(&name->nodename, &utsname()->nodename,
89792 + error |= __copy_to_user(name->nodename, &utsname()->nodename,
89793 __OLD_UTS_LEN);
89794 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
89795 - error |= __copy_to_user(&name->release, &utsname()->release,
89796 + error |= __copy_to_user(name->release, &utsname()->release,
89797 __OLD_UTS_LEN);
89798 error |= __put_user(0, name->release + __OLD_UTS_LEN);
89799 - error |= __copy_to_user(&name->version, &utsname()->version,
89800 + error |= __copy_to_user(name->version, &utsname()->version,
89801 __OLD_UTS_LEN);
89802 error |= __put_user(0, name->version + __OLD_UTS_LEN);
89803 - error |= __copy_to_user(&name->machine, &utsname()->machine,
89804 + error |= __copy_to_user(name->machine, &utsname()->machine,
89805 __OLD_UTS_LEN);
89806 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
89807 up_read(&uts_sem);
89808 @@ -1381,6 +1417,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
89809 */
89810 new_rlim->rlim_cur = 1;
89811 }
89812 + /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
89813 + is changed to a lower value. Since tasks can be created by the same
89814 + user in between this limit change and an execve by this task, force
89815 + a recheck only for this task by setting PF_NPROC_EXCEEDED
89816 + */
89817 + if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
89818 + tsk->flags |= PF_NPROC_EXCEEDED;
89819 }
89820 if (!retval) {
89821 if (old_rlim)
89822 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
89823 index 49e13e1..8dbc052 100644
89824 --- a/kernel/sysctl.c
89825 +++ b/kernel/sysctl.c
89826 @@ -94,7 +94,6 @@
89827
89828
89829 #if defined(CONFIG_SYSCTL)
89830 -
89831 /* External variables not in a header file. */
89832 extern int max_threads;
89833 extern int suid_dumpable;
89834 @@ -118,19 +117,18 @@ extern int blk_iopoll_enabled;
89835
89836 /* Constants used for minimum and maximum */
89837 #ifdef CONFIG_LOCKUP_DETECTOR
89838 -static int sixty = 60;
89839 +static int sixty __read_only = 60;
89840 #endif
89841
89842 -static int __maybe_unused neg_one = -1;
89843 -
89844 -static int zero;
89845 -static int __maybe_unused one = 1;
89846 -static int __maybe_unused two = 2;
89847 -static int __maybe_unused three = 3;
89848 -static unsigned long one_ul = 1;
89849 -static int one_hundred = 100;
89850 +static int __maybe_unused neg_one __read_only = -1;
89851 +static int zero __read_only = 0;
89852 +static int __maybe_unused one __read_only = 1;
89853 +static int __maybe_unused two __read_only = 2;
89854 +static int __maybe_unused three __read_only = 3;
89855 +static unsigned long one_ul __read_only = 1;
89856 +static int one_hundred __read_only = 100;
89857 #ifdef CONFIG_PRINTK
89858 -static int ten_thousand = 10000;
89859 +static int ten_thousand __read_only = 10000;
89860 #endif
89861
89862 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
89863 @@ -177,10 +175,8 @@ static int proc_taint(struct ctl_table *table, int write,
89864 void __user *buffer, size_t *lenp, loff_t *ppos);
89865 #endif
89866
89867 -#ifdef CONFIG_PRINTK
89868 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
89869 void __user *buffer, size_t *lenp, loff_t *ppos);
89870 -#endif
89871
89872 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
89873 void __user *buffer, size_t *lenp, loff_t *ppos);
89874 @@ -211,6 +207,8 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
89875
89876 #endif
89877
89878 +extern struct ctl_table grsecurity_table[];
89879 +
89880 static struct ctl_table kern_table[];
89881 static struct ctl_table vm_table[];
89882 static struct ctl_table fs_table[];
89883 @@ -225,6 +223,20 @@ extern struct ctl_table epoll_table[];
89884 int sysctl_legacy_va_layout;
89885 #endif
89886
89887 +#ifdef CONFIG_PAX_SOFTMODE
89888 +static ctl_table pax_table[] = {
89889 + {
89890 + .procname = "softmode",
89891 + .data = &pax_softmode,
89892 + .maxlen = sizeof(unsigned int),
89893 + .mode = 0600,
89894 + .proc_handler = &proc_dointvec,
89895 + },
89896 +
89897 + { }
89898 +};
89899 +#endif
89900 +
89901 /* The default sysctl tables: */
89902
89903 static struct ctl_table sysctl_base_table[] = {
89904 @@ -273,6 +285,22 @@ static int max_extfrag_threshold = 1000;
89905 #endif
89906
89907 static struct ctl_table kern_table[] = {
89908 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
89909 + {
89910 + .procname = "grsecurity",
89911 + .mode = 0500,
89912 + .child = grsecurity_table,
89913 + },
89914 +#endif
89915 +
89916 +#ifdef CONFIG_PAX_SOFTMODE
89917 + {
89918 + .procname = "pax",
89919 + .mode = 0500,
89920 + .child = pax_table,
89921 + },
89922 +#endif
89923 +
89924 {
89925 .procname = "sched_child_runs_first",
89926 .data = &sysctl_sched_child_runs_first,
89927 @@ -635,7 +663,7 @@ static struct ctl_table kern_table[] = {
89928 .data = &modprobe_path,
89929 .maxlen = KMOD_PATH_LEN,
89930 .mode = 0644,
89931 - .proc_handler = proc_dostring,
89932 + .proc_handler = proc_dostring_modpriv,
89933 },
89934 {
89935 .procname = "modules_disabled",
89936 @@ -802,16 +830,20 @@ static struct ctl_table kern_table[] = {
89937 .extra1 = &zero,
89938 .extra2 = &one,
89939 },
89940 +#endif
89941 {
89942 .procname = "kptr_restrict",
89943 .data = &kptr_restrict,
89944 .maxlen = sizeof(int),
89945 .mode = 0644,
89946 .proc_handler = proc_dointvec_minmax_sysadmin,
89947 +#ifdef CONFIG_GRKERNSEC_HIDESYM
89948 + .extra1 = &two,
89949 +#else
89950 .extra1 = &zero,
89951 +#endif
89952 .extra2 = &two,
89953 },
89954 -#endif
89955 {
89956 .procname = "ngroups_max",
89957 .data = &ngroups_max,
89958 @@ -1055,10 +1087,17 @@ static struct ctl_table kern_table[] = {
89959 */
89960 {
89961 .procname = "perf_event_paranoid",
89962 - .data = &sysctl_perf_event_paranoid,
89963 - .maxlen = sizeof(sysctl_perf_event_paranoid),
89964 + .data = &sysctl_perf_event_legitimately_concerned,
89965 + .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
89966 .mode = 0644,
89967 - .proc_handler = proc_dointvec,
89968 + /* go ahead, be a hero */
89969 + .proc_handler = proc_dointvec_minmax_sysadmin,
89970 + .extra1 = &neg_one,
89971 +#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
89972 + .extra2 = &three,
89973 +#else
89974 + .extra2 = &two,
89975 +#endif
89976 },
89977 {
89978 .procname = "perf_event_mlock_kb",
89979 @@ -1329,6 +1368,13 @@ static struct ctl_table vm_table[] = {
89980 .proc_handler = proc_dointvec_minmax,
89981 .extra1 = &zero,
89982 },
89983 + {
89984 + .procname = "heap_stack_gap",
89985 + .data = &sysctl_heap_stack_gap,
89986 + .maxlen = sizeof(sysctl_heap_stack_gap),
89987 + .mode = 0644,
89988 + .proc_handler = proc_doulongvec_minmax,
89989 + },
89990 #else
89991 {
89992 .procname = "nr_trim_pages",
89993 @@ -1793,6 +1839,16 @@ int proc_dostring(struct ctl_table *table, int write,
89994 buffer, lenp, ppos);
89995 }
89996
89997 +int proc_dostring_modpriv(struct ctl_table *table, int write,
89998 + void __user *buffer, size_t *lenp, loff_t *ppos)
89999 +{
90000 + if (write && !capable(CAP_SYS_MODULE))
90001 + return -EPERM;
90002 +
90003 + return _proc_do_string(table->data, table->maxlen, write,
90004 + buffer, lenp, ppos);
90005 +}
90006 +
90007 static size_t proc_skip_spaces(char **buf)
90008 {
90009 size_t ret;
90010 @@ -1898,6 +1954,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
90011 len = strlen(tmp);
90012 if (len > *size)
90013 len = *size;
90014 + if (len > sizeof(tmp))
90015 + len = sizeof(tmp);
90016 if (copy_to_user(*buf, tmp, len))
90017 return -EFAULT;
90018 *size -= len;
90019 @@ -2062,7 +2120,7 @@ int proc_dointvec(struct ctl_table *table, int write,
90020 static int proc_taint(struct ctl_table *table, int write,
90021 void __user *buffer, size_t *lenp, loff_t *ppos)
90022 {
90023 - struct ctl_table t;
90024 + ctl_table_no_const t;
90025 unsigned long tmptaint = get_taint();
90026 int err;
90027
90028 @@ -2090,7 +2148,6 @@ static int proc_taint(struct ctl_table *table, int write,
90029 return err;
90030 }
90031
90032 -#ifdef CONFIG_PRINTK
90033 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
90034 void __user *buffer, size_t *lenp, loff_t *ppos)
90035 {
90036 @@ -2099,7 +2156,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
90037
90038 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
90039 }
90040 -#endif
90041
90042 struct do_proc_dointvec_minmax_conv_param {
90043 int *min;
90044 @@ -2646,6 +2702,12 @@ int proc_dostring(struct ctl_table *table, int write,
90045 return -ENOSYS;
90046 }
90047
90048 +int proc_dostring_modpriv(struct ctl_table *table, int write,
90049 + void __user *buffer, size_t *lenp, loff_t *ppos)
90050 +{
90051 + return -ENOSYS;
90052 +}
90053 +
90054 int proc_dointvec(struct ctl_table *table, int write,
90055 void __user *buffer, size_t *lenp, loff_t *ppos)
90056 {
90057 @@ -2702,5 +2764,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
90058 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
90059 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
90060 EXPORT_SYMBOL(proc_dostring);
90061 +EXPORT_SYMBOL(proc_dostring_modpriv);
90062 EXPORT_SYMBOL(proc_doulongvec_minmax);
90063 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
90064 diff --git a/kernel/taskstats.c b/kernel/taskstats.c
90065 index 13d2f7c..c93d0b0 100644
90066 --- a/kernel/taskstats.c
90067 +++ b/kernel/taskstats.c
90068 @@ -28,9 +28,12 @@
90069 #include <linux/fs.h>
90070 #include <linux/file.h>
90071 #include <linux/pid_namespace.h>
90072 +#include <linux/grsecurity.h>
90073 #include <net/genetlink.h>
90074 #include <linux/atomic.h>
90075
90076 +extern int gr_is_taskstats_denied(int pid);
90077 +
90078 /*
90079 * Maximum length of a cpumask that can be specified in
90080 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
90081 @@ -576,6 +579,9 @@ err:
90082
90083 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
90084 {
90085 + if (gr_is_taskstats_denied(current->pid))
90086 + return -EACCES;
90087 +
90088 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
90089 return cmd_attr_register_cpumask(info);
90090 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
90091 diff --git a/kernel/time.c b/kernel/time.c
90092 index 7c7964c..2a0d412 100644
90093 --- a/kernel/time.c
90094 +++ b/kernel/time.c
90095 @@ -172,6 +172,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
90096 return error;
90097
90098 if (tz) {
90099 + /* we log in do_settimeofday called below, so don't log twice
90100 + */
90101 + if (!tv)
90102 + gr_log_timechange();
90103 +
90104 sys_tz = *tz;
90105 update_vsyscall_tz();
90106 if (firsttime) {
90107 diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
90108 index 88c9c65..7497ebc 100644
90109 --- a/kernel/time/alarmtimer.c
90110 +++ b/kernel/time/alarmtimer.c
90111 @@ -795,7 +795,7 @@ static int __init alarmtimer_init(void)
90112 struct platform_device *pdev;
90113 int error = 0;
90114 int i;
90115 - struct k_clock alarm_clock = {
90116 + static struct k_clock alarm_clock = {
90117 .clock_getres = alarm_clock_getres,
90118 .clock_get = alarm_clock_get,
90119 .timer_create = alarm_timer_create,
90120 diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
90121 index 5b40279..81e58db 100644
90122 --- a/kernel/time/timekeeping.c
90123 +++ b/kernel/time/timekeeping.c
90124 @@ -15,6 +15,7 @@
90125 #include <linux/init.h>
90126 #include <linux/mm.h>
90127 #include <linux/sched.h>
90128 +#include <linux/grsecurity.h>
90129 #include <linux/syscore_ops.h>
90130 #include <linux/clocksource.h>
90131 #include <linux/jiffies.h>
90132 @@ -501,6 +502,8 @@ int do_settimeofday(const struct timespec *tv)
90133 if (!timespec_valid_strict(tv))
90134 return -EINVAL;
90135
90136 + gr_log_timechange();
90137 +
90138 raw_spin_lock_irqsave(&timekeeper_lock, flags);
90139 write_seqcount_begin(&timekeeper_seq);
90140
90141 diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
90142 index 61ed862..3b52c65 100644
90143 --- a/kernel/time/timer_list.c
90144 +++ b/kernel/time/timer_list.c
90145 @@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
90146
90147 static void print_name_offset(struct seq_file *m, void *sym)
90148 {
90149 +#ifdef CONFIG_GRKERNSEC_HIDESYM
90150 + SEQ_printf(m, "<%p>", NULL);
90151 +#else
90152 char symname[KSYM_NAME_LEN];
90153
90154 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
90155 SEQ_printf(m, "<%pK>", sym);
90156 else
90157 SEQ_printf(m, "%s", symname);
90158 +#endif
90159 }
90160
90161 static void
90162 @@ -119,7 +123,11 @@ next_one:
90163 static void
90164 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
90165 {
90166 +#ifdef CONFIG_GRKERNSEC_HIDESYM
90167 + SEQ_printf(m, " .base: %p\n", NULL);
90168 +#else
90169 SEQ_printf(m, " .base: %pK\n", base);
90170 +#endif
90171 SEQ_printf(m, " .index: %d\n",
90172 base->index);
90173 SEQ_printf(m, " .resolution: %Lu nsecs\n",
90174 @@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
90175 {
90176 struct proc_dir_entry *pe;
90177
90178 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
90179 + pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
90180 +#else
90181 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
90182 +#endif
90183 if (!pe)
90184 return -ENOMEM;
90185 return 0;
90186 diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
90187 index 1fb08f2..ca4bb1e 100644
90188 --- a/kernel/time/timer_stats.c
90189 +++ b/kernel/time/timer_stats.c
90190 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
90191 static unsigned long nr_entries;
90192 static struct entry entries[MAX_ENTRIES];
90193
90194 -static atomic_t overflow_count;
90195 +static atomic_unchecked_t overflow_count;
90196
90197 /*
90198 * The entries are in a hash-table, for fast lookup:
90199 @@ -140,7 +140,7 @@ static void reset_entries(void)
90200 nr_entries = 0;
90201 memset(entries, 0, sizeof(entries));
90202 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
90203 - atomic_set(&overflow_count, 0);
90204 + atomic_set_unchecked(&overflow_count, 0);
90205 }
90206
90207 static struct entry *alloc_entry(void)
90208 @@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
90209 if (likely(entry))
90210 entry->count++;
90211 else
90212 - atomic_inc(&overflow_count);
90213 + atomic_inc_unchecked(&overflow_count);
90214
90215 out_unlock:
90216 raw_spin_unlock_irqrestore(lock, flags);
90217 @@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
90218
90219 static void print_name_offset(struct seq_file *m, unsigned long addr)
90220 {
90221 +#ifdef CONFIG_GRKERNSEC_HIDESYM
90222 + seq_printf(m, "<%p>", NULL);
90223 +#else
90224 char symname[KSYM_NAME_LEN];
90225
90226 if (lookup_symbol_name(addr, symname) < 0)
90227 - seq_printf(m, "<%p>", (void *)addr);
90228 + seq_printf(m, "<%pK>", (void *)addr);
90229 else
90230 seq_printf(m, "%s", symname);
90231 +#endif
90232 }
90233
90234 static int tstats_show(struct seq_file *m, void *v)
90235 @@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
90236
90237 seq_puts(m, "Timer Stats Version: v0.3\n");
90238 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
90239 - if (atomic_read(&overflow_count))
90240 - seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
90241 + if (atomic_read_unchecked(&overflow_count))
90242 + seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
90243 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
90244
90245 for (i = 0; i < nr_entries; i++) {
90246 @@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
90247 {
90248 struct proc_dir_entry *pe;
90249
90250 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
90251 + pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
90252 +#else
90253 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
90254 +#endif
90255 if (!pe)
90256 return -ENOMEM;
90257 return 0;
90258 diff --git a/kernel/timer.c b/kernel/timer.c
90259 index accfd24..e00f0c0 100644
90260 --- a/kernel/timer.c
90261 +++ b/kernel/timer.c
90262 @@ -1366,7 +1366,7 @@ void update_process_times(int user_tick)
90263 /*
90264 * This function runs timers and the timer-tq in bottom half context.
90265 */
90266 -static void run_timer_softirq(struct softirq_action *h)
90267 +static __latent_entropy void run_timer_softirq(void)
90268 {
90269 struct tvec_base *base = __this_cpu_read(tvec_bases);
90270
90271 @@ -1429,7 +1429,7 @@ static void process_timeout(unsigned long __data)
90272 *
90273 * In all cases the return value is guaranteed to be non-negative.
90274 */
90275 -signed long __sched schedule_timeout(signed long timeout)
90276 +signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
90277 {
90278 struct timer_list timer;
90279 unsigned long expire;
90280 diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
90281 index b418cb0..f879a3d 100644
90282 --- a/kernel/trace/blktrace.c
90283 +++ b/kernel/trace/blktrace.c
90284 @@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
90285 struct blk_trace *bt = filp->private_data;
90286 char buf[16];
90287
90288 - snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
90289 + snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
90290
90291 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
90292 }
90293 @@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
90294 return 1;
90295
90296 bt = buf->chan->private_data;
90297 - atomic_inc(&bt->dropped);
90298 + atomic_inc_unchecked(&bt->dropped);
90299 return 0;
90300 }
90301
90302 @@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
90303
90304 bt->dir = dir;
90305 bt->dev = dev;
90306 - atomic_set(&bt->dropped, 0);
90307 + atomic_set_unchecked(&bt->dropped, 0);
90308 INIT_LIST_HEAD(&bt->running_list);
90309
90310 ret = -EIO;
90311 diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
90312 index cd7f76d..553c805 100644
90313 --- a/kernel/trace/ftrace.c
90314 +++ b/kernel/trace/ftrace.c
90315 @@ -1965,12 +1965,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
90316 if (unlikely(ftrace_disabled))
90317 return 0;
90318
90319 + ret = ftrace_arch_code_modify_prepare();
90320 + FTRACE_WARN_ON(ret);
90321 + if (ret)
90322 + return 0;
90323 +
90324 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
90325 + FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
90326 if (ret) {
90327 ftrace_bug(ret, ip);
90328 - return 0;
90329 }
90330 - return 1;
90331 + return ret ? 0 : 1;
90332 }
90333
90334 /*
90335 @@ -4177,8 +4182,10 @@ static int ftrace_process_locs(struct module *mod,
90336 if (!count)
90337 return 0;
90338
90339 + pax_open_kernel();
90340 sort(start, count, sizeof(*start),
90341 ftrace_cmp_ips, ftrace_swap_ips);
90342 + pax_close_kernel();
90343
90344 start_pg = ftrace_allocate_pages(count);
90345 if (!start_pg)
90346 @@ -4909,8 +4916,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
90347 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
90348
90349 static int ftrace_graph_active;
90350 -static struct notifier_block ftrace_suspend_notifier;
90351 -
90352 int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace)
90353 {
90354 return 0;
90355 @@ -5086,6 +5091,10 @@ static void update_function_graph_func(void)
90356 ftrace_graph_entry = ftrace_graph_entry_test;
90357 }
90358
90359 +static struct notifier_block ftrace_suspend_notifier = {
90360 + .notifier_call = ftrace_suspend_notifier_call
90361 +};
90362 +
90363 int register_ftrace_graph(trace_func_graph_ret_t retfunc,
90364 trace_func_graph_ent_t entryfunc)
90365 {
90366 @@ -5099,7 +5108,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
90367 goto out;
90368 }
90369
90370 - ftrace_suspend_notifier.notifier_call = ftrace_suspend_notifier_call;
90371 register_pm_notifier(&ftrace_suspend_notifier);
90372
90373 ftrace_graph_active++;
90374 diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
90375 index fc4da2d..f3e800b 100644
90376 --- a/kernel/trace/ring_buffer.c
90377 +++ b/kernel/trace/ring_buffer.c
90378 @@ -352,9 +352,9 @@ struct buffer_data_page {
90379 */
90380 struct buffer_page {
90381 struct list_head list; /* list of buffer pages */
90382 - local_t write; /* index for next write */
90383 + local_unchecked_t write; /* index for next write */
90384 unsigned read; /* index for next read */
90385 - local_t entries; /* entries on this page */
90386 + local_unchecked_t entries; /* entries on this page */
90387 unsigned long real_end; /* real end of data */
90388 struct buffer_data_page *page; /* Actual data page */
90389 };
90390 @@ -473,8 +473,8 @@ struct ring_buffer_per_cpu {
90391 unsigned long last_overrun;
90392 local_t entries_bytes;
90393 local_t entries;
90394 - local_t overrun;
90395 - local_t commit_overrun;
90396 + local_unchecked_t overrun;
90397 + local_unchecked_t commit_overrun;
90398 local_t dropped_events;
90399 local_t committing;
90400 local_t commits;
90401 @@ -992,8 +992,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
90402 *
90403 * We add a counter to the write field to denote this.
90404 */
90405 - old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
90406 - old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
90407 + old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
90408 + old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
90409
90410 /*
90411 * Just make sure we have seen our old_write and synchronize
90412 @@ -1021,8 +1021,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
90413 * cmpxchg to only update if an interrupt did not already
90414 * do it for us. If the cmpxchg fails, we don't care.
90415 */
90416 - (void)local_cmpxchg(&next_page->write, old_write, val);
90417 - (void)local_cmpxchg(&next_page->entries, old_entries, eval);
90418 + (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
90419 + (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
90420
90421 /*
90422 * No need to worry about races with clearing out the commit.
90423 @@ -1386,12 +1386,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
90424
90425 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
90426 {
90427 - return local_read(&bpage->entries) & RB_WRITE_MASK;
90428 + return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
90429 }
90430
90431 static inline unsigned long rb_page_write(struct buffer_page *bpage)
90432 {
90433 - return local_read(&bpage->write) & RB_WRITE_MASK;
90434 + return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
90435 }
90436
90437 static int
90438 @@ -1486,7 +1486,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
90439 * bytes consumed in ring buffer from here.
90440 * Increment overrun to account for the lost events.
90441 */
90442 - local_add(page_entries, &cpu_buffer->overrun);
90443 + local_add_unchecked(page_entries, &cpu_buffer->overrun);
90444 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
90445 }
90446
90447 @@ -2064,7 +2064,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
90448 * it is our responsibility to update
90449 * the counters.
90450 */
90451 - local_add(entries, &cpu_buffer->overrun);
90452 + local_add_unchecked(entries, &cpu_buffer->overrun);
90453 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
90454
90455 /*
90456 @@ -2214,7 +2214,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
90457 if (tail == BUF_PAGE_SIZE)
90458 tail_page->real_end = 0;
90459
90460 - local_sub(length, &tail_page->write);
90461 + local_sub_unchecked(length, &tail_page->write);
90462 return;
90463 }
90464
90465 @@ -2249,7 +2249,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
90466 rb_event_set_padding(event);
90467
90468 /* Set the write back to the previous setting */
90469 - local_sub(length, &tail_page->write);
90470 + local_sub_unchecked(length, &tail_page->write);
90471 return;
90472 }
90473
90474 @@ -2261,7 +2261,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
90475
90476 /* Set write to end of buffer */
90477 length = (tail + length) - BUF_PAGE_SIZE;
90478 - local_sub(length, &tail_page->write);
90479 + local_sub_unchecked(length, &tail_page->write);
90480 }
90481
90482 /*
90483 @@ -2287,7 +2287,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
90484 * about it.
90485 */
90486 if (unlikely(next_page == commit_page)) {
90487 - local_inc(&cpu_buffer->commit_overrun);
90488 + local_inc_unchecked(&cpu_buffer->commit_overrun);
90489 goto out_reset;
90490 }
90491
90492 @@ -2343,7 +2343,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
90493 cpu_buffer->tail_page) &&
90494 (cpu_buffer->commit_page ==
90495 cpu_buffer->reader_page))) {
90496 - local_inc(&cpu_buffer->commit_overrun);
90497 + local_inc_unchecked(&cpu_buffer->commit_overrun);
90498 goto out_reset;
90499 }
90500 }
90501 @@ -2391,7 +2391,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
90502 length += RB_LEN_TIME_EXTEND;
90503
90504 tail_page = cpu_buffer->tail_page;
90505 - write = local_add_return(length, &tail_page->write);
90506 + write = local_add_return_unchecked(length, &tail_page->write);
90507
90508 /* set write to only the index of the write */
90509 write &= RB_WRITE_MASK;
90510 @@ -2415,7 +2415,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
90511 kmemcheck_annotate_bitfield(event, bitfield);
90512 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
90513
90514 - local_inc(&tail_page->entries);
90515 + local_inc_unchecked(&tail_page->entries);
90516
90517 /*
90518 * If this is the first commit on the page, then update
90519 @@ -2448,7 +2448,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
90520
90521 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
90522 unsigned long write_mask =
90523 - local_read(&bpage->write) & ~RB_WRITE_MASK;
90524 + local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
90525 unsigned long event_length = rb_event_length(event);
90526 /*
90527 * This is on the tail page. It is possible that
90528 @@ -2458,7 +2458,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
90529 */
90530 old_index += write_mask;
90531 new_index += write_mask;
90532 - index = local_cmpxchg(&bpage->write, old_index, new_index);
90533 + index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
90534 if (index == old_index) {
90535 /* update counters */
90536 local_sub(event_length, &cpu_buffer->entries_bytes);
90537 @@ -2850,7 +2850,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
90538
90539 /* Do the likely case first */
90540 if (likely(bpage->page == (void *)addr)) {
90541 - local_dec(&bpage->entries);
90542 + local_dec_unchecked(&bpage->entries);
90543 return;
90544 }
90545
90546 @@ -2862,7 +2862,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
90547 start = bpage;
90548 do {
90549 if (bpage->page == (void *)addr) {
90550 - local_dec(&bpage->entries);
90551 + local_dec_unchecked(&bpage->entries);
90552 return;
90553 }
90554 rb_inc_page(cpu_buffer, &bpage);
90555 @@ -3146,7 +3146,7 @@ static inline unsigned long
90556 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
90557 {
90558 return local_read(&cpu_buffer->entries) -
90559 - (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
90560 + (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
90561 }
90562
90563 /**
90564 @@ -3235,7 +3235,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
90565 return 0;
90566
90567 cpu_buffer = buffer->buffers[cpu];
90568 - ret = local_read(&cpu_buffer->overrun);
90569 + ret = local_read_unchecked(&cpu_buffer->overrun);
90570
90571 return ret;
90572 }
90573 @@ -3258,7 +3258,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
90574 return 0;
90575
90576 cpu_buffer = buffer->buffers[cpu];
90577 - ret = local_read(&cpu_buffer->commit_overrun);
90578 + ret = local_read_unchecked(&cpu_buffer->commit_overrun);
90579
90580 return ret;
90581 }
90582 @@ -3343,7 +3343,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
90583 /* if you care about this being correct, lock the buffer */
90584 for_each_buffer_cpu(buffer, cpu) {
90585 cpu_buffer = buffer->buffers[cpu];
90586 - overruns += local_read(&cpu_buffer->overrun);
90587 + overruns += local_read_unchecked(&cpu_buffer->overrun);
90588 }
90589
90590 return overruns;
90591 @@ -3519,8 +3519,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
90592 /*
90593 * Reset the reader page to size zero.
90594 */
90595 - local_set(&cpu_buffer->reader_page->write, 0);
90596 - local_set(&cpu_buffer->reader_page->entries, 0);
90597 + local_set_unchecked(&cpu_buffer->reader_page->write, 0);
90598 + local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
90599 local_set(&cpu_buffer->reader_page->page->commit, 0);
90600 cpu_buffer->reader_page->real_end = 0;
90601
90602 @@ -3554,7 +3554,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
90603 * want to compare with the last_overrun.
90604 */
90605 smp_mb();
90606 - overwrite = local_read(&(cpu_buffer->overrun));
90607 + overwrite = local_read_unchecked(&(cpu_buffer->overrun));
90608
90609 /*
90610 * Here's the tricky part.
90611 @@ -4124,8 +4124,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
90612
90613 cpu_buffer->head_page
90614 = list_entry(cpu_buffer->pages, struct buffer_page, list);
90615 - local_set(&cpu_buffer->head_page->write, 0);
90616 - local_set(&cpu_buffer->head_page->entries, 0);
90617 + local_set_unchecked(&cpu_buffer->head_page->write, 0);
90618 + local_set_unchecked(&cpu_buffer->head_page->entries, 0);
90619 local_set(&cpu_buffer->head_page->page->commit, 0);
90620
90621 cpu_buffer->head_page->read = 0;
90622 @@ -4135,14 +4135,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
90623
90624 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
90625 INIT_LIST_HEAD(&cpu_buffer->new_pages);
90626 - local_set(&cpu_buffer->reader_page->write, 0);
90627 - local_set(&cpu_buffer->reader_page->entries, 0);
90628 + local_set_unchecked(&cpu_buffer->reader_page->write, 0);
90629 + local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
90630 local_set(&cpu_buffer->reader_page->page->commit, 0);
90631 cpu_buffer->reader_page->read = 0;
90632
90633 local_set(&cpu_buffer->entries_bytes, 0);
90634 - local_set(&cpu_buffer->overrun, 0);
90635 - local_set(&cpu_buffer->commit_overrun, 0);
90636 + local_set_unchecked(&cpu_buffer->overrun, 0);
90637 + local_set_unchecked(&cpu_buffer->commit_overrun, 0);
90638 local_set(&cpu_buffer->dropped_events, 0);
90639 local_set(&cpu_buffer->entries, 0);
90640 local_set(&cpu_buffer->committing, 0);
90641 @@ -4547,8 +4547,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
90642 rb_init_page(bpage);
90643 bpage = reader->page;
90644 reader->page = *data_page;
90645 - local_set(&reader->write, 0);
90646 - local_set(&reader->entries, 0);
90647 + local_set_unchecked(&reader->write, 0);
90648 + local_set_unchecked(&reader->entries, 0);
90649 reader->read = 0;
90650 *data_page = bpage;
90651
90652 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
90653 index 24c1f23..781fd73f 100644
90654 --- a/kernel/trace/trace.c
90655 +++ b/kernel/trace/trace.c
90656 @@ -3399,7 +3399,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
90657 return 0;
90658 }
90659
90660 -int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
90661 +int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
90662 {
90663 /* do nothing if flag is already set */
90664 if (!!(trace_flags & mask) == !!enabled)
90665 diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
90666 index 02b592f..f971546 100644
90667 --- a/kernel/trace/trace.h
90668 +++ b/kernel/trace/trace.h
90669 @@ -1233,7 +1233,7 @@ extern const char *__stop___tracepoint_str[];
90670 void trace_printk_init_buffers(void);
90671 void trace_printk_start_comm(void);
90672 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
90673 -int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
90674 +int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
90675
90676 /*
90677 * Normal trace_printk() and friends allocates special buffers
90678 diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
90679 index 26dc348..8708ca7 100644
90680 --- a/kernel/trace/trace_clock.c
90681 +++ b/kernel/trace/trace_clock.c
90682 @@ -123,7 +123,7 @@ u64 notrace trace_clock_global(void)
90683 return now;
90684 }
90685
90686 -static atomic64_t trace_counter;
90687 +static atomic64_unchecked_t trace_counter;
90688
90689 /*
90690 * trace_clock_counter(): simply an atomic counter.
90691 @@ -132,5 +132,5 @@ static atomic64_t trace_counter;
90692 */
90693 u64 notrace trace_clock_counter(void)
90694 {
90695 - return atomic64_add_return(1, &trace_counter);
90696 + return atomic64_inc_return_unchecked(&trace_counter);
90697 }
90698 diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
90699 index 7b16d40..1b2875d 100644
90700 --- a/kernel/trace/trace_events.c
90701 +++ b/kernel/trace/trace_events.c
90702 @@ -1681,7 +1681,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
90703 return 0;
90704 }
90705
90706 -struct ftrace_module_file_ops;
90707 static void __add_event_to_tracers(struct ftrace_event_call *call);
90708
90709 /* Add an additional event_call dynamically */
90710 diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
90711 index 0abd9b8..6a663a2 100644
90712 --- a/kernel/trace/trace_mmiotrace.c
90713 +++ b/kernel/trace/trace_mmiotrace.c
90714 @@ -24,7 +24,7 @@ struct header_iter {
90715 static struct trace_array *mmio_trace_array;
90716 static bool overrun_detected;
90717 static unsigned long prev_overruns;
90718 -static atomic_t dropped_count;
90719 +static atomic_unchecked_t dropped_count;
90720
90721 static void mmio_reset_data(struct trace_array *tr)
90722 {
90723 @@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
90724
90725 static unsigned long count_overruns(struct trace_iterator *iter)
90726 {
90727 - unsigned long cnt = atomic_xchg(&dropped_count, 0);
90728 + unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
90729 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
90730
90731 if (over > prev_overruns)
90732 @@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
90733 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
90734 sizeof(*entry), 0, pc);
90735 if (!event) {
90736 - atomic_inc(&dropped_count);
90737 + atomic_inc_unchecked(&dropped_count);
90738 return;
90739 }
90740 entry = ring_buffer_event_data(event);
90741 @@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
90742 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
90743 sizeof(*entry), 0, pc);
90744 if (!event) {
90745 - atomic_inc(&dropped_count);
90746 + atomic_inc_unchecked(&dropped_count);
90747 return;
90748 }
90749 entry = ring_buffer_event_data(event);
90750 diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
90751 index ed32284..884d6c3 100644
90752 --- a/kernel/trace/trace_output.c
90753 +++ b/kernel/trace/trace_output.c
90754 @@ -294,7 +294,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
90755
90756 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
90757 if (!IS_ERR(p)) {
90758 - p = mangle_path(s->buffer + s->len, p, "\n");
90759 + p = mangle_path(s->buffer + s->len, p, "\n\\");
90760 if (p) {
90761 s->len = p - s->buffer;
90762 return 1;
90763 @@ -908,14 +908,16 @@ int register_ftrace_event(struct trace_event *event)
90764 goto out;
90765 }
90766
90767 + pax_open_kernel();
90768 if (event->funcs->trace == NULL)
90769 - event->funcs->trace = trace_nop_print;
90770 + *(void **)&event->funcs->trace = trace_nop_print;
90771 if (event->funcs->raw == NULL)
90772 - event->funcs->raw = trace_nop_print;
90773 + *(void **)&event->funcs->raw = trace_nop_print;
90774 if (event->funcs->hex == NULL)
90775 - event->funcs->hex = trace_nop_print;
90776 + *(void **)&event->funcs->hex = trace_nop_print;
90777 if (event->funcs->binary == NULL)
90778 - event->funcs->binary = trace_nop_print;
90779 + *(void **)&event->funcs->binary = trace_nop_print;
90780 + pax_close_kernel();
90781
90782 key = event->type & (EVENT_HASHSIZE - 1);
90783
90784 diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
90785 index e6be585..d73ae5e 100644
90786 --- a/kernel/trace/trace_stack.c
90787 +++ b/kernel/trace/trace_stack.c
90788 @@ -68,7 +68,7 @@ check_stack(unsigned long ip, unsigned long *stack)
90789 return;
90790
90791 /* we do not handle interrupt stacks yet */
90792 - if (!object_is_on_stack(stack))
90793 + if (!object_starts_on_stack(stack))
90794 return;
90795
90796 local_irq_save(flags);
90797 diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
90798 index 80a57af..7f5a7ff 100644
90799 --- a/kernel/user_namespace.c
90800 +++ b/kernel/user_namespace.c
90801 @@ -82,6 +82,21 @@ int create_user_ns(struct cred *new)
90802 !kgid_has_mapping(parent_ns, group))
90803 return -EPERM;
90804
90805 +#ifdef CONFIG_GRKERNSEC
90806 + /*
90807 + * This doesn't really inspire confidence:
90808 + * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
90809 + * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
90810 + * Increases kernel attack surface in areas developers
90811 + * previously cared little about ("low importance due
90812 + * to requiring "root" capability")
90813 + * To be removed when this code receives *proper* review
90814 + */
90815 + if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
90816 + !capable(CAP_SETGID))
90817 + return -EPERM;
90818 +#endif
90819 +
90820 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
90821 if (!ns)
90822 return -ENOMEM;
90823 @@ -865,7 +880,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
90824 if (atomic_read(&current->mm->mm_users) > 1)
90825 return -EINVAL;
90826
90827 - if (current->fs->users != 1)
90828 + if (atomic_read(&current->fs->users) != 1)
90829 return -EINVAL;
90830
90831 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
90832 diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
90833 index 4f69f9a..7c6f8f8 100644
90834 --- a/kernel/utsname_sysctl.c
90835 +++ b/kernel/utsname_sysctl.c
90836 @@ -47,7 +47,7 @@ static void put_uts(ctl_table *table, int write, void *which)
90837 static int proc_do_uts_string(ctl_table *table, int write,
90838 void __user *buffer, size_t *lenp, loff_t *ppos)
90839 {
90840 - struct ctl_table uts_table;
90841 + ctl_table_no_const uts_table;
90842 int r;
90843 memcpy(&uts_table, table, sizeof(uts_table));
90844 uts_table.data = get_uts(table, write);
90845 diff --git a/kernel/watchdog.c b/kernel/watchdog.c
90846 index 4431610..4265616 100644
90847 --- a/kernel/watchdog.c
90848 +++ b/kernel/watchdog.c
90849 @@ -475,7 +475,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
90850 static void watchdog_nmi_disable(unsigned int cpu) { return; }
90851 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
90852
90853 -static struct smp_hotplug_thread watchdog_threads = {
90854 +static struct smp_hotplug_thread watchdog_threads __read_only = {
90855 .store = &softlockup_watchdog,
90856 .thread_should_run = watchdog_should_run,
90857 .thread_fn = watchdog,
90858 diff --git a/kernel/workqueue.c b/kernel/workqueue.c
90859 index 193e977..26dd63f 100644
90860 --- a/kernel/workqueue.c
90861 +++ b/kernel/workqueue.c
90862 @@ -4678,7 +4678,7 @@ static void rebind_workers(struct worker_pool *pool)
90863 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
90864 worker_flags |= WORKER_REBOUND;
90865 worker_flags &= ~WORKER_UNBOUND;
90866 - ACCESS_ONCE(worker->flags) = worker_flags;
90867 + ACCESS_ONCE_RW(worker->flags) = worker_flags;
90868 }
90869
90870 spin_unlock_irq(&pool->lock);
90871 diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
90872 index a48abea..e108def 100644
90873 --- a/lib/Kconfig.debug
90874 +++ b/lib/Kconfig.debug
90875 @@ -854,7 +854,7 @@ config DEBUG_MUTEXES
90876
90877 config DEBUG_WW_MUTEX_SLOWPATH
90878 bool "Wait/wound mutex debugging: Slowpath testing"
90879 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
90880 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
90881 select DEBUG_LOCK_ALLOC
90882 select DEBUG_SPINLOCK
90883 select DEBUG_MUTEXES
90884 @@ -867,7 +867,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
90885
90886 config DEBUG_LOCK_ALLOC
90887 bool "Lock debugging: detect incorrect freeing of live locks"
90888 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
90889 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
90890 select DEBUG_SPINLOCK
90891 select DEBUG_MUTEXES
90892 select LOCKDEP
90893 @@ -881,7 +881,7 @@ config DEBUG_LOCK_ALLOC
90894
90895 config PROVE_LOCKING
90896 bool "Lock debugging: prove locking correctness"
90897 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
90898 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
90899 select LOCKDEP
90900 select DEBUG_SPINLOCK
90901 select DEBUG_MUTEXES
90902 @@ -932,7 +932,7 @@ config LOCKDEP
90903
90904 config LOCK_STAT
90905 bool "Lock usage statistics"
90906 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
90907 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
90908 select LOCKDEP
90909 select DEBUG_SPINLOCK
90910 select DEBUG_MUTEXES
90911 @@ -1394,6 +1394,7 @@ config LATENCYTOP
90912 depends on DEBUG_KERNEL
90913 depends on STACKTRACE_SUPPORT
90914 depends on PROC_FS
90915 + depends on !GRKERNSEC_HIDESYM
90916 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
90917 select KALLSYMS
90918 select KALLSYMS_ALL
90919 @@ -1410,7 +1411,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
90920 config DEBUG_STRICT_USER_COPY_CHECKS
90921 bool "Strict user copy size checks"
90922 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
90923 - depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
90924 + depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
90925 help
90926 Enabling this option turns a certain set of sanity checks for user
90927 copy operations into compile time failures.
90928 @@ -1529,7 +1530,7 @@ endmenu # runtime tests
90929
90930 config PROVIDE_OHCI1394_DMA_INIT
90931 bool "Remote debugging over FireWire early on boot"
90932 - depends on PCI && X86
90933 + depends on PCI && X86 && !GRKERNSEC
90934 help
90935 If you want to debug problems which hang or crash the kernel early
90936 on boot and the crashing machine has a FireWire port, you can use
90937 diff --git a/lib/Makefile b/lib/Makefile
90938 index 48140e3..de854e5 100644
90939 --- a/lib/Makefile
90940 +++ b/lib/Makefile
90941 @@ -52,7 +52,7 @@ obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
90942 obj-$(CONFIG_BTREE) += btree.o
90943 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
90944 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
90945 -obj-$(CONFIG_DEBUG_LIST) += list_debug.o
90946 +obj-y += list_debug.o
90947 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
90948
90949 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
90950 diff --git a/lib/average.c b/lib/average.c
90951 index 114d1be..ab0350c 100644
90952 --- a/lib/average.c
90953 +++ b/lib/average.c
90954 @@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
90955 {
90956 unsigned long internal = ACCESS_ONCE(avg->internal);
90957
90958 - ACCESS_ONCE(avg->internal) = internal ?
90959 + ACCESS_ONCE_RW(avg->internal) = internal ?
90960 (((internal << avg->weight) - internal) +
90961 (val << avg->factor)) >> avg->weight :
90962 (val << avg->factor);
90963 diff --git a/lib/bitmap.c b/lib/bitmap.c
90964 index 06f7e4f..f3cf2b0 100644
90965 --- a/lib/bitmap.c
90966 +++ b/lib/bitmap.c
90967 @@ -422,7 +422,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
90968 {
90969 int c, old_c, totaldigits, ndigits, nchunks, nbits;
90970 u32 chunk;
90971 - const char __user __force *ubuf = (const char __user __force *)buf;
90972 + const char __user *ubuf = (const char __force_user *)buf;
90973
90974 bitmap_zero(maskp, nmaskbits);
90975
90976 @@ -507,7 +507,7 @@ int bitmap_parse_user(const char __user *ubuf,
90977 {
90978 if (!access_ok(VERIFY_READ, ubuf, ulen))
90979 return -EFAULT;
90980 - return __bitmap_parse((const char __force *)ubuf,
90981 + return __bitmap_parse((const char __force_kernel *)ubuf,
90982 ulen, 1, maskp, nmaskbits);
90983
90984 }
90985 @@ -598,7 +598,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
90986 {
90987 unsigned a, b;
90988 int c, old_c, totaldigits;
90989 - const char __user __force *ubuf = (const char __user __force *)buf;
90990 + const char __user *ubuf = (const char __force_user *)buf;
90991 int exp_digit, in_range;
90992
90993 totaldigits = c = 0;
90994 @@ -698,7 +698,7 @@ int bitmap_parselist_user(const char __user *ubuf,
90995 {
90996 if (!access_ok(VERIFY_READ, ubuf, ulen))
90997 return -EFAULT;
90998 - return __bitmap_parselist((const char __force *)ubuf,
90999 + return __bitmap_parselist((const char __force_kernel *)ubuf,
91000 ulen, 1, maskp, nmaskbits);
91001 }
91002 EXPORT_SYMBOL(bitmap_parselist_user);
91003 diff --git a/lib/bug.c b/lib/bug.c
91004 index 1686034..a9c00c8 100644
91005 --- a/lib/bug.c
91006 +++ b/lib/bug.c
91007 @@ -134,6 +134,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
91008 return BUG_TRAP_TYPE_NONE;
91009
91010 bug = find_bug(bugaddr);
91011 + if (!bug)
91012 + return BUG_TRAP_TYPE_NONE;
91013
91014 file = NULL;
91015 line = 0;
91016 diff --git a/lib/debugobjects.c b/lib/debugobjects.c
91017 index e0731c3..ad66444 100644
91018 --- a/lib/debugobjects.c
91019 +++ b/lib/debugobjects.c
91020 @@ -286,7 +286,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
91021 if (limit > 4)
91022 return;
91023
91024 - is_on_stack = object_is_on_stack(addr);
91025 + is_on_stack = object_starts_on_stack(addr);
91026 if (is_on_stack == onstack)
91027 return;
91028
91029 diff --git a/lib/devres.c b/lib/devres.c
91030 index 8235331..5881053 100644
91031 --- a/lib/devres.c
91032 +++ b/lib/devres.c
91033 @@ -81,7 +81,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
91034 void devm_iounmap(struct device *dev, void __iomem *addr)
91035 {
91036 WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
91037 - (void *)addr));
91038 + (void __force *)addr));
91039 iounmap(addr);
91040 }
91041 EXPORT_SYMBOL(devm_iounmap);
91042 @@ -224,7 +224,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
91043 {
91044 ioport_unmap(addr);
91045 WARN_ON(devres_destroy(dev, devm_ioport_map_release,
91046 - devm_ioport_map_match, (void *)addr));
91047 + devm_ioport_map_match, (void __force *)addr));
91048 }
91049 EXPORT_SYMBOL(devm_ioport_unmap);
91050 #endif /* CONFIG_HAS_IOPORT */
91051 diff --git a/lib/div64.c b/lib/div64.c
91052 index 4382ad7..08aa558 100644
91053 --- a/lib/div64.c
91054 +++ b/lib/div64.c
91055 @@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
91056 EXPORT_SYMBOL(__div64_32);
91057
91058 #ifndef div_s64_rem
91059 -s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
91060 +s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
91061 {
91062 u64 quotient;
91063
91064 @@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
91065 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
91066 */
91067 #ifndef div64_u64
91068 -u64 div64_u64(u64 dividend, u64 divisor)
91069 +u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
91070 {
91071 u32 high = divisor >> 32;
91072 u64 quot;
91073 diff --git a/lib/dma-debug.c b/lib/dma-debug.c
91074 index 98f2d7e..899da5c 100644
91075 --- a/lib/dma-debug.c
91076 +++ b/lib/dma-debug.c
91077 @@ -971,7 +971,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
91078
91079 void dma_debug_add_bus(struct bus_type *bus)
91080 {
91081 - struct notifier_block *nb;
91082 + notifier_block_no_const *nb;
91083
91084 if (global_disable)
91085 return;
91086 @@ -1148,7 +1148,7 @@ static void check_unmap(struct dma_debug_entry *ref)
91087
91088 static void check_for_stack(struct device *dev, void *addr)
91089 {
91090 - if (object_is_on_stack(addr))
91091 + if (object_starts_on_stack(addr))
91092 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
91093 "stack [addr=%p]\n", addr);
91094 }
91095 diff --git a/lib/hash.c b/lib/hash.c
91096 index fea973f..386626f 100644
91097 --- a/lib/hash.c
91098 +++ b/lib/hash.c
91099 @@ -14,7 +14,7 @@
91100 #include <linux/hash.h>
91101 #include <linux/cache.h>
91102
91103 -static struct fast_hash_ops arch_hash_ops __read_mostly = {
91104 +static struct fast_hash_ops arch_hash_ops __read_only = {
91105 .hash = jhash,
91106 .hash2 = jhash2,
91107 };
91108 diff --git a/lib/inflate.c b/lib/inflate.c
91109 index 013a761..c28f3fc 100644
91110 --- a/lib/inflate.c
91111 +++ b/lib/inflate.c
91112 @@ -269,7 +269,7 @@ static void free(void *where)
91113 malloc_ptr = free_mem_ptr;
91114 }
91115 #else
91116 -#define malloc(a) kmalloc(a, GFP_KERNEL)
91117 +#define malloc(a) kmalloc((a), GFP_KERNEL)
91118 #define free(a) kfree(a)
91119 #endif
91120
91121 diff --git a/lib/ioremap.c b/lib/ioremap.c
91122 index 0c9216c..863bd89 100644
91123 --- a/lib/ioremap.c
91124 +++ b/lib/ioremap.c
91125 @@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
91126 unsigned long next;
91127
91128 phys_addr -= addr;
91129 - pmd = pmd_alloc(&init_mm, pud, addr);
91130 + pmd = pmd_alloc_kernel(&init_mm, pud, addr);
91131 if (!pmd)
91132 return -ENOMEM;
91133 do {
91134 @@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
91135 unsigned long next;
91136
91137 phys_addr -= addr;
91138 - pud = pud_alloc(&init_mm, pgd, addr);
91139 + pud = pud_alloc_kernel(&init_mm, pgd, addr);
91140 if (!pud)
91141 return -ENOMEM;
91142 do {
91143 diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
91144 index bd2bea9..6b3c95e 100644
91145 --- a/lib/is_single_threaded.c
91146 +++ b/lib/is_single_threaded.c
91147 @@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
91148 struct task_struct *p, *t;
91149 bool ret;
91150
91151 + if (!mm)
91152 + return true;
91153 +
91154 if (atomic_read(&task->signal->live) != 1)
91155 return false;
91156
91157 diff --git a/lib/kobject.c b/lib/kobject.c
91158 index cb14aea..8c53cdb 100644
91159 --- a/lib/kobject.c
91160 +++ b/lib/kobject.c
91161 @@ -931,9 +931,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
91162
91163
91164 static DEFINE_SPINLOCK(kobj_ns_type_lock);
91165 -static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
91166 +static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
91167
91168 -int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
91169 +int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
91170 {
91171 enum kobj_ns_type type = ops->type;
91172 int error;
91173 diff --git a/lib/list_debug.c b/lib/list_debug.c
91174 index c24c2f7..f0296f4 100644
91175 --- a/lib/list_debug.c
91176 +++ b/lib/list_debug.c
91177 @@ -11,7 +11,9 @@
91178 #include <linux/bug.h>
91179 #include <linux/kernel.h>
91180 #include <linux/rculist.h>
91181 +#include <linux/mm.h>
91182
91183 +#ifdef CONFIG_DEBUG_LIST
91184 /*
91185 * Insert a new entry between two known consecutive entries.
91186 *
91187 @@ -19,21 +21,40 @@
91188 * the prev/next entries already!
91189 */
91190
91191 +static bool __list_add_debug(struct list_head *new,
91192 + struct list_head *prev,
91193 + struct list_head *next)
91194 +{
91195 + if (unlikely(next->prev != prev)) {
91196 + printk(KERN_ERR "list_add corruption. next->prev should be "
91197 + "prev (%p), but was %p. (next=%p).\n",
91198 + prev, next->prev, next);
91199 + BUG();
91200 + return false;
91201 + }
91202 + if (unlikely(prev->next != next)) {
91203 + printk(KERN_ERR "list_add corruption. prev->next should be "
91204 + "next (%p), but was %p. (prev=%p).\n",
91205 + next, prev->next, prev);
91206 + BUG();
91207 + return false;
91208 + }
91209 + if (unlikely(new == prev || new == next)) {
91210 + printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
91211 + new, prev, next);
91212 + BUG();
91213 + return false;
91214 + }
91215 + return true;
91216 +}
91217 +
91218 void __list_add(struct list_head *new,
91219 - struct list_head *prev,
91220 - struct list_head *next)
91221 + struct list_head *prev,
91222 + struct list_head *next)
91223 {
91224 - WARN(next->prev != prev,
91225 - "list_add corruption. next->prev should be "
91226 - "prev (%p), but was %p. (next=%p).\n",
91227 - prev, next->prev, next);
91228 - WARN(prev->next != next,
91229 - "list_add corruption. prev->next should be "
91230 - "next (%p), but was %p. (prev=%p).\n",
91231 - next, prev->next, prev);
91232 - WARN(new == prev || new == next,
91233 - "list_add double add: new=%p, prev=%p, next=%p.\n",
91234 - new, prev, next);
91235 + if (!__list_add_debug(new, prev, next))
91236 + return;
91237 +
91238 next->prev = new;
91239 new->next = next;
91240 new->prev = prev;
91241 @@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
91242 }
91243 EXPORT_SYMBOL(__list_add);
91244
91245 -void __list_del_entry(struct list_head *entry)
91246 +static bool __list_del_entry_debug(struct list_head *entry)
91247 {
91248 struct list_head *prev, *next;
91249
91250 prev = entry->prev;
91251 next = entry->next;
91252
91253 - if (WARN(next == LIST_POISON1,
91254 - "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
91255 - entry, LIST_POISON1) ||
91256 - WARN(prev == LIST_POISON2,
91257 - "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
91258 - entry, LIST_POISON2) ||
91259 - WARN(prev->next != entry,
91260 - "list_del corruption. prev->next should be %p, "
91261 - "but was %p\n", entry, prev->next) ||
91262 - WARN(next->prev != entry,
91263 - "list_del corruption. next->prev should be %p, "
91264 - "but was %p\n", entry, next->prev))
91265 + if (unlikely(next == LIST_POISON1)) {
91266 + printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
91267 + entry, LIST_POISON1);
91268 + BUG();
91269 + return false;
91270 + }
91271 + if (unlikely(prev == LIST_POISON2)) {
91272 + printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
91273 + entry, LIST_POISON2);
91274 + BUG();
91275 + return false;
91276 + }
91277 + if (unlikely(entry->prev->next != entry)) {
91278 + printk(KERN_ERR "list_del corruption. prev->next should be %p, "
91279 + "but was %p\n", entry, prev->next);
91280 + BUG();
91281 + return false;
91282 + }
91283 + if (unlikely(entry->next->prev != entry)) {
91284 + printk(KERN_ERR "list_del corruption. next->prev should be %p, "
91285 + "but was %p\n", entry, next->prev);
91286 + BUG();
91287 + return false;
91288 + }
91289 + return true;
91290 +}
91291 +
91292 +void __list_del_entry(struct list_head *entry)
91293 +{
91294 + if (!__list_del_entry_debug(entry))
91295 return;
91296
91297 - __list_del(prev, next);
91298 + __list_del(entry->prev, entry->next);
91299 }
91300 EXPORT_SYMBOL(__list_del_entry);
91301
91302 @@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
91303 void __list_add_rcu(struct list_head *new,
91304 struct list_head *prev, struct list_head *next)
91305 {
91306 - WARN(next->prev != prev,
91307 - "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
91308 - prev, next->prev, next);
91309 - WARN(prev->next != next,
91310 - "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
91311 - next, prev->next, prev);
91312 + if (!__list_add_debug(new, prev, next))
91313 + return;
91314 +
91315 new->next = next;
91316 new->prev = prev;
91317 rcu_assign_pointer(list_next_rcu(prev), new);
91318 next->prev = new;
91319 }
91320 EXPORT_SYMBOL(__list_add_rcu);
91321 +#endif
91322 +
91323 +void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
91324 +{
91325 +#ifdef CONFIG_DEBUG_LIST
91326 + if (!__list_add_debug(new, prev, next))
91327 + return;
91328 +#endif
91329 +
91330 + pax_open_kernel();
91331 + next->prev = new;
91332 + new->next = next;
91333 + new->prev = prev;
91334 + prev->next = new;
91335 + pax_close_kernel();
91336 +}
91337 +EXPORT_SYMBOL(__pax_list_add);
91338 +
91339 +void pax_list_del(struct list_head *entry)
91340 +{
91341 +#ifdef CONFIG_DEBUG_LIST
91342 + if (!__list_del_entry_debug(entry))
91343 + return;
91344 +#endif
91345 +
91346 + pax_open_kernel();
91347 + __list_del(entry->prev, entry->next);
91348 + entry->next = LIST_POISON1;
91349 + entry->prev = LIST_POISON2;
91350 + pax_close_kernel();
91351 +}
91352 +EXPORT_SYMBOL(pax_list_del);
91353 +
91354 +void pax_list_del_init(struct list_head *entry)
91355 +{
91356 + pax_open_kernel();
91357 + __list_del(entry->prev, entry->next);
91358 + INIT_LIST_HEAD(entry);
91359 + pax_close_kernel();
91360 +}
91361 +EXPORT_SYMBOL(pax_list_del_init);
91362 +
91363 +void __pax_list_add_rcu(struct list_head *new,
91364 + struct list_head *prev, struct list_head *next)
91365 +{
91366 +#ifdef CONFIG_DEBUG_LIST
91367 + if (!__list_add_debug(new, prev, next))
91368 + return;
91369 +#endif
91370 +
91371 + pax_open_kernel();
91372 + new->next = next;
91373 + new->prev = prev;
91374 + rcu_assign_pointer(list_next_rcu(prev), new);
91375 + next->prev = new;
91376 + pax_close_kernel();
91377 +}
91378 +EXPORT_SYMBOL(__pax_list_add_rcu);
91379 +
91380 +void pax_list_del_rcu(struct list_head *entry)
91381 +{
91382 +#ifdef CONFIG_DEBUG_LIST
91383 + if (!__list_del_entry_debug(entry))
91384 + return;
91385 +#endif
91386 +
91387 + pax_open_kernel();
91388 + __list_del(entry->prev, entry->next);
91389 + entry->next = LIST_POISON1;
91390 + entry->prev = LIST_POISON2;
91391 + pax_close_kernel();
91392 +}
91393 +EXPORT_SYMBOL(pax_list_del_rcu);
91394 diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
91395 index 963b703..438bc51 100644
91396 --- a/lib/percpu-refcount.c
91397 +++ b/lib/percpu-refcount.c
91398 @@ -29,7 +29,7 @@
91399 * can't hit 0 before we've added up all the percpu refs.
91400 */
91401
91402 -#define PCPU_COUNT_BIAS (1U << 31)
91403 +#define PCPU_COUNT_BIAS (1U << 30)
91404
91405 /**
91406 * percpu_ref_init - initialize a percpu refcount
91407 diff --git a/lib/radix-tree.c b/lib/radix-tree.c
91408 index bd4a8df..9e4804f 100644
91409 --- a/lib/radix-tree.c
91410 +++ b/lib/radix-tree.c
91411 @@ -93,7 +93,7 @@ struct radix_tree_preload {
91412 int nr;
91413 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
91414 };
91415 -static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
91416 +static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
91417
91418 static inline void *ptr_to_indirect(void *ptr)
91419 {
91420 diff --git a/lib/random32.c b/lib/random32.c
91421 index 6148967..009bfe8 100644
91422 --- a/lib/random32.c
91423 +++ b/lib/random32.c
91424 @@ -44,7 +44,7 @@
91425 static void __init prandom_state_selftest(void);
91426 #endif
91427
91428 -static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
91429 +static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
91430
91431 /**
91432 * prandom_u32_state - seeded pseudo-random number generator.
91433 diff --git a/lib/rbtree.c b/lib/rbtree.c
91434 index 65f4eff..2cfa167 100644
91435 --- a/lib/rbtree.c
91436 +++ b/lib/rbtree.c
91437 @@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
91438 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
91439
91440 static const struct rb_augment_callbacks dummy_callbacks = {
91441 - dummy_propagate, dummy_copy, dummy_rotate
91442 + .propagate = dummy_propagate,
91443 + .copy = dummy_copy,
91444 + .rotate = dummy_rotate
91445 };
91446
91447 void rb_insert_color(struct rb_node *node, struct rb_root *root)
91448 diff --git a/lib/show_mem.c b/lib/show_mem.c
91449 index 0922579..9d7adb9 100644
91450 --- a/lib/show_mem.c
91451 +++ b/lib/show_mem.c
91452 @@ -44,6 +44,6 @@ void show_mem(unsigned int filter)
91453 quicklist_total_size());
91454 #endif
91455 #ifdef CONFIG_MEMORY_FAILURE
91456 - printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
91457 + printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
91458 #endif
91459 }
91460 diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
91461 index bb2b201..46abaf9 100644
91462 --- a/lib/strncpy_from_user.c
91463 +++ b/lib/strncpy_from_user.c
91464 @@ -21,7 +21,7 @@
91465 */
91466 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
91467 {
91468 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
91469 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
91470 long res = 0;
91471
91472 /*
91473 diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
91474 index a28df52..3d55877 100644
91475 --- a/lib/strnlen_user.c
91476 +++ b/lib/strnlen_user.c
91477 @@ -26,7 +26,7 @@
91478 */
91479 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
91480 {
91481 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
91482 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
91483 long align, res = 0;
91484 unsigned long c;
91485
91486 diff --git a/lib/swiotlb.c b/lib/swiotlb.c
91487 index b604b83..c0547f6 100644
91488 --- a/lib/swiotlb.c
91489 +++ b/lib/swiotlb.c
91490 @@ -674,7 +674,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
91491
91492 void
91493 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
91494 - dma_addr_t dev_addr)
91495 + dma_addr_t dev_addr, struct dma_attrs *attrs)
91496 {
91497 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
91498
91499 diff --git a/lib/usercopy.c b/lib/usercopy.c
91500 index 4f5b1dd..7cab418 100644
91501 --- a/lib/usercopy.c
91502 +++ b/lib/usercopy.c
91503 @@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
91504 WARN(1, "Buffer overflow detected!\n");
91505 }
91506 EXPORT_SYMBOL(copy_from_user_overflow);
91507 +
91508 +void copy_to_user_overflow(void)
91509 +{
91510 + WARN(1, "Buffer overflow detected!\n");
91511 +}
91512 +EXPORT_SYMBOL(copy_to_user_overflow);
91513 diff --git a/lib/vsprintf.c b/lib/vsprintf.c
91514 index 185b6d3..823c48c 100644
91515 --- a/lib/vsprintf.c
91516 +++ b/lib/vsprintf.c
91517 @@ -16,6 +16,9 @@
91518 * - scnprintf and vscnprintf
91519 */
91520
91521 +#ifdef CONFIG_GRKERNSEC_HIDESYM
91522 +#define __INCLUDED_BY_HIDESYM 1
91523 +#endif
91524 #include <stdarg.h>
91525 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
91526 #include <linux/types.h>
91527 @@ -1179,7 +1182,11 @@ char *address_val(char *buf, char *end, const void *addr,
91528 return number(buf, end, num, spec);
91529 }
91530
91531 +#ifdef CONFIG_GRKERNSEC_HIDESYM
91532 +int kptr_restrict __read_mostly = 2;
91533 +#else
91534 int kptr_restrict __read_mostly;
91535 +#endif
91536
91537 /*
91538 * Show a '%p' thing. A kernel extension is that the '%p' is followed
91539 @@ -1192,6 +1199,7 @@ int kptr_restrict __read_mostly;
91540 * - 'f' For simple symbolic function names without offset
91541 * - 'S' For symbolic direct pointers with offset
91542 * - 's' For symbolic direct pointers without offset
91543 + * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
91544 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
91545 * - 'B' For backtraced symbolic direct pointers with offset
91546 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
91547 @@ -1259,12 +1267,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
91548
91549 if (!ptr && *fmt != 'K') {
91550 /*
91551 - * Print (null) with the same width as a pointer so it makes
91552 + * Print (nil) with the same width as a pointer so it makes
91553 * tabular output look nice.
91554 */
91555 if (spec.field_width == -1)
91556 spec.field_width = default_width;
91557 - return string(buf, end, "(null)", spec);
91558 + return string(buf, end, "(nil)", spec);
91559 }
91560
91561 switch (*fmt) {
91562 @@ -1274,6 +1282,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
91563 /* Fallthrough */
91564 case 'S':
91565 case 's':
91566 +#ifdef CONFIG_GRKERNSEC_HIDESYM
91567 + break;
91568 +#else
91569 + return symbol_string(buf, end, ptr, spec, fmt);
91570 +#endif
91571 + case 'A':
91572 case 'B':
91573 return symbol_string(buf, end, ptr, spec, fmt);
91574 case 'R':
91575 @@ -1329,6 +1343,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
91576 va_end(va);
91577 return buf;
91578 }
91579 + case 'P':
91580 + break;
91581 case 'K':
91582 /*
91583 * %pK cannot be used in IRQ context because its test
91584 @@ -1386,6 +1402,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
91585 ((const struct file *)ptr)->f_path.dentry,
91586 spec, fmt);
91587 }
91588 +
91589 +#ifdef CONFIG_GRKERNSEC_HIDESYM
91590 + /* 'P' = approved pointers to copy to userland,
91591 + as in the /proc/kallsyms case, as we make it display nothing
91592 + for non-root users, and the real contents for root users
91593 + Also ignore 'K' pointers, since we force their NULLing for non-root users
91594 + above
91595 + */
91596 + if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'K' && is_usercopy_object(buf)) {
91597 + printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
91598 + dump_stack();
91599 + ptr = NULL;
91600 + }
91601 +#endif
91602 +
91603 spec.flags |= SMALL;
91604 if (spec.field_width == -1) {
91605 spec.field_width = default_width;
91606 @@ -2107,11 +2138,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
91607 typeof(type) value; \
91608 if (sizeof(type) == 8) { \
91609 args = PTR_ALIGN(args, sizeof(u32)); \
91610 - *(u32 *)&value = *(u32 *)args; \
91611 - *((u32 *)&value + 1) = *(u32 *)(args + 4); \
91612 + *(u32 *)&value = *(const u32 *)args; \
91613 + *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
91614 } else { \
91615 args = PTR_ALIGN(args, sizeof(type)); \
91616 - value = *(typeof(type) *)args; \
91617 + value = *(const typeof(type) *)args; \
91618 } \
91619 args += sizeof(type); \
91620 value; \
91621 @@ -2174,7 +2205,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
91622 case FORMAT_TYPE_STR: {
91623 const char *str_arg = args;
91624 args += strlen(str_arg) + 1;
91625 - str = string(str, end, (char *)str_arg, spec);
91626 + str = string(str, end, str_arg, spec);
91627 break;
91628 }
91629
91630 diff --git a/localversion-grsec b/localversion-grsec
91631 new file mode 100644
91632 index 0000000..7cd6065
91633 --- /dev/null
91634 +++ b/localversion-grsec
91635 @@ -0,0 +1 @@
91636 +-grsec
91637 diff --git a/mm/Kconfig b/mm/Kconfig
91638 index 2888024..c15a810 100644
91639 --- a/mm/Kconfig
91640 +++ b/mm/Kconfig
91641 @@ -326,10 +326,11 @@ config KSM
91642 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
91643
91644 config DEFAULT_MMAP_MIN_ADDR
91645 - int "Low address space to protect from user allocation"
91646 + int "Low address space to protect from user allocation"
91647 depends on MMU
91648 - default 4096
91649 - help
91650 + default 32768 if ALPHA || ARM || PARISC || SPARC32
91651 + default 65536
91652 + help
91653 This is the portion of low virtual memory which should be protected
91654 from userspace allocation. Keeping a user from writing to low pages
91655 can help reduce the impact of kernel NULL pointer bugs.
91656 @@ -360,7 +361,7 @@ config MEMORY_FAILURE
91657
91658 config HWPOISON_INJECT
91659 tristate "HWPoison pages injector"
91660 - depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
91661 + depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
91662 select PROC_PAGE_MONITOR
91663
91664 config NOMMU_INITIAL_TRIM_EXCESS
91665 diff --git a/mm/backing-dev.c b/mm/backing-dev.c
91666 index 09d9591..165bb75 100644
91667 --- a/mm/backing-dev.c
91668 +++ b/mm/backing-dev.c
91669 @@ -12,7 +12,7 @@
91670 #include <linux/device.h>
91671 #include <trace/events/writeback.h>
91672
91673 -static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
91674 +static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
91675
91676 struct backing_dev_info default_backing_dev_info = {
91677 .name = "default",
91678 @@ -533,7 +533,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
91679 return err;
91680
91681 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
91682 - atomic_long_inc_return(&bdi_seq));
91683 + atomic_long_inc_return_unchecked(&bdi_seq));
91684 if (err) {
91685 bdi_destroy(bdi);
91686 return err;
91687 diff --git a/mm/filemap.c b/mm/filemap.c
91688 index 7a13f6a..e52e841 100644
91689 --- a/mm/filemap.c
91690 +++ b/mm/filemap.c
91691 @@ -1766,7 +1766,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
91692 struct address_space *mapping = file->f_mapping;
91693
91694 if (!mapping->a_ops->readpage)
91695 - return -ENOEXEC;
91696 + return -ENODEV;
91697 file_accessed(file);
91698 vma->vm_ops = &generic_file_vm_ops;
91699 return 0;
91700 @@ -1948,7 +1948,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
91701
91702 while (bytes) {
91703 char __user *buf = iov->iov_base + base;
91704 - int copy = min(bytes, iov->iov_len - base);
91705 + size_t copy = min(bytes, iov->iov_len - base);
91706
91707 base = 0;
91708 left = __copy_from_user_inatomic(vaddr, buf, copy);
91709 @@ -1977,7 +1977,7 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,
91710 BUG_ON(!in_atomic());
91711 kaddr = kmap_atomic(page);
91712 if (likely(i->nr_segs == 1)) {
91713 - int left;
91714 + size_t left;
91715 char __user *buf = i->iov->iov_base + i->iov_offset;
91716 left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
91717 copied = bytes - left;
91718 @@ -2005,7 +2005,7 @@ size_t iov_iter_copy_from_user(struct page *page,
91719
91720 kaddr = kmap(page);
91721 if (likely(i->nr_segs == 1)) {
91722 - int left;
91723 + size_t left;
91724 char __user *buf = i->iov->iov_base + i->iov_offset;
91725 left = __copy_from_user(kaddr + offset, buf, bytes);
91726 copied = bytes - left;
91727 @@ -2035,7 +2035,7 @@ void iov_iter_advance(struct iov_iter *i, size_t bytes)
91728 * zero-length segments (without overruning the iovec).
91729 */
91730 while (bytes || unlikely(i->count && !iov->iov_len)) {
91731 - int copy;
91732 + size_t copy;
91733
91734 copy = min(bytes, iov->iov_len - base);
91735 BUG_ON(!i->count || i->count < copy);
91736 @@ -2106,6 +2106,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
91737 *pos = i_size_read(inode);
91738
91739 if (limit != RLIM_INFINITY) {
91740 + gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
91741 if (*pos >= limit) {
91742 send_sig(SIGXFSZ, current, 0);
91743 return -EFBIG;
91744 diff --git a/mm/fremap.c b/mm/fremap.c
91745 index 34feba6..315fe78 100644
91746 --- a/mm/fremap.c
91747 +++ b/mm/fremap.c
91748 @@ -179,6 +179,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
91749 retry:
91750 vma = find_vma(mm, start);
91751
91752 +#ifdef CONFIG_PAX_SEGMEXEC
91753 + if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
91754 + goto out;
91755 +#endif
91756 +
91757 /*
91758 * Make sure the vma is shared, that it supports prefaulting,
91759 * and that the remapped range is valid and fully within
91760 diff --git a/mm/highmem.c b/mm/highmem.c
91761 index b32b70c..e512eb0 100644
91762 --- a/mm/highmem.c
91763 +++ b/mm/highmem.c
91764 @@ -138,8 +138,9 @@ static void flush_all_zero_pkmaps(void)
91765 * So no dangers, even with speculative execution.
91766 */
91767 page = pte_page(pkmap_page_table[i]);
91768 + pax_open_kernel();
91769 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
91770 -
91771 + pax_close_kernel();
91772 set_page_address(page, NULL);
91773 need_flush = 1;
91774 }
91775 @@ -198,9 +199,11 @@ start:
91776 }
91777 }
91778 vaddr = PKMAP_ADDR(last_pkmap_nr);
91779 +
91780 + pax_open_kernel();
91781 set_pte_at(&init_mm, vaddr,
91782 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
91783 -
91784 + pax_close_kernel();
91785 pkmap_count[last_pkmap_nr] = 1;
91786 set_page_address(page, (void *)vaddr);
91787
91788 diff --git a/mm/hugetlb.c b/mm/hugetlb.c
91789 index c01cb9f..ac0f58e 100644
91790 --- a/mm/hugetlb.c
91791 +++ b/mm/hugetlb.c
91792 @@ -2068,15 +2068,17 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
91793 struct hstate *h = &default_hstate;
91794 unsigned long tmp;
91795 int ret;
91796 + ctl_table_no_const hugetlb_table;
91797
91798 tmp = h->max_huge_pages;
91799
91800 if (write && h->order >= MAX_ORDER)
91801 return -EINVAL;
91802
91803 - table->data = &tmp;
91804 - table->maxlen = sizeof(unsigned long);
91805 - ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
91806 + hugetlb_table = *table;
91807 + hugetlb_table.data = &tmp;
91808 + hugetlb_table.maxlen = sizeof(unsigned long);
91809 + ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
91810 if (ret)
91811 goto out;
91812
91813 @@ -2121,15 +2123,17 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
91814 struct hstate *h = &default_hstate;
91815 unsigned long tmp;
91816 int ret;
91817 + ctl_table_no_const hugetlb_table;
91818
91819 tmp = h->nr_overcommit_huge_pages;
91820
91821 if (write && h->order >= MAX_ORDER)
91822 return -EINVAL;
91823
91824 - table->data = &tmp;
91825 - table->maxlen = sizeof(unsigned long);
91826 - ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
91827 + hugetlb_table = *table;
91828 + hugetlb_table.data = &tmp;
91829 + hugetlb_table.maxlen = sizeof(unsigned long);
91830 + ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
91831 if (ret)
91832 goto out;
91833
91834 @@ -2598,6 +2602,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
91835 return 1;
91836 }
91837
91838 +#ifdef CONFIG_PAX_SEGMEXEC
91839 +static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
91840 +{
91841 + struct mm_struct *mm = vma->vm_mm;
91842 + struct vm_area_struct *vma_m;
91843 + unsigned long address_m;
91844 + pte_t *ptep_m;
91845 +
91846 + vma_m = pax_find_mirror_vma(vma);
91847 + if (!vma_m)
91848 + return;
91849 +
91850 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
91851 + address_m = address + SEGMEXEC_TASK_SIZE;
91852 + ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
91853 + get_page(page_m);
91854 + hugepage_add_anon_rmap(page_m, vma_m, address_m);
91855 + set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
91856 +}
91857 +#endif
91858 +
91859 /*
91860 * Hugetlb_cow() should be called with page lock of the original hugepage held.
91861 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
91862 @@ -2714,6 +2739,11 @@ retry_avoidcopy:
91863 make_huge_pte(vma, new_page, 1));
91864 page_remove_rmap(old_page);
91865 hugepage_add_new_anon_rmap(new_page, vma, address);
91866 +
91867 +#ifdef CONFIG_PAX_SEGMEXEC
91868 + pax_mirror_huge_pte(vma, address, new_page);
91869 +#endif
91870 +
91871 /* Make the old page be freed below */
91872 new_page = old_page;
91873 }
91874 @@ -2878,6 +2908,10 @@ retry:
91875 && (vma->vm_flags & VM_SHARED)));
91876 set_huge_pte_at(mm, address, ptep, new_pte);
91877
91878 +#ifdef CONFIG_PAX_SEGMEXEC
91879 + pax_mirror_huge_pte(vma, address, page);
91880 +#endif
91881 +
91882 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
91883 /* Optimization, do the COW without a second fault */
91884 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
91885 @@ -2908,6 +2942,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
91886 static DEFINE_MUTEX(hugetlb_instantiation_mutex);
91887 struct hstate *h = hstate_vma(vma);
91888
91889 +#ifdef CONFIG_PAX_SEGMEXEC
91890 + struct vm_area_struct *vma_m;
91891 +#endif
91892 +
91893 address &= huge_page_mask(h);
91894
91895 ptep = huge_pte_offset(mm, address);
91896 @@ -2921,6 +2959,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
91897 VM_FAULT_SET_HINDEX(hstate_index(h));
91898 }
91899
91900 +#ifdef CONFIG_PAX_SEGMEXEC
91901 + vma_m = pax_find_mirror_vma(vma);
91902 + if (vma_m) {
91903 + unsigned long address_m;
91904 +
91905 + if (vma->vm_start > vma_m->vm_start) {
91906 + address_m = address;
91907 + address -= SEGMEXEC_TASK_SIZE;
91908 + vma = vma_m;
91909 + h = hstate_vma(vma);
91910 + } else
91911 + address_m = address + SEGMEXEC_TASK_SIZE;
91912 +
91913 + if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
91914 + return VM_FAULT_OOM;
91915 + address_m &= HPAGE_MASK;
91916 + unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
91917 + }
91918 +#endif
91919 +
91920 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
91921 if (!ptep)
91922 return VM_FAULT_OOM;
91923 diff --git a/mm/internal.h b/mm/internal.h
91924 index 29e1e76..fc3ff04 100644
91925 --- a/mm/internal.h
91926 +++ b/mm/internal.h
91927 @@ -94,6 +94,7 @@ extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address);
91928 * in mm/page_alloc.c
91929 */
91930 extern void __free_pages_bootmem(struct page *page, unsigned int order);
91931 +extern void free_compound_page(struct page *page);
91932 extern void prep_compound_page(struct page *page, unsigned long order);
91933 #ifdef CONFIG_MEMORY_FAILURE
91934 extern bool is_free_buddy_page(struct page *page);
91935 @@ -352,7 +353,7 @@ extern u32 hwpoison_filter_enable;
91936
91937 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
91938 unsigned long, unsigned long,
91939 - unsigned long, unsigned long);
91940 + unsigned long, unsigned long) __intentional_overflow(-1);
91941
91942 extern void set_pageblock_order(void);
91943 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
91944 diff --git a/mm/kmemleak.c b/mm/kmemleak.c
91945 index 31f01c5..7015178 100644
91946 --- a/mm/kmemleak.c
91947 +++ b/mm/kmemleak.c
91948 @@ -363,7 +363,7 @@ static void print_unreferenced(struct seq_file *seq,
91949
91950 for (i = 0; i < object->trace_len; i++) {
91951 void *ptr = (void *)object->trace[i];
91952 - seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
91953 + seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
91954 }
91955 }
91956
91957 @@ -1853,7 +1853,7 @@ static int __init kmemleak_late_init(void)
91958 return -ENOMEM;
91959 }
91960
91961 - dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
91962 + dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
91963 &kmemleak_fops);
91964 if (!dentry)
91965 pr_warning("Failed to create the debugfs kmemleak file\n");
91966 diff --git a/mm/maccess.c b/mm/maccess.c
91967 index d53adf9..03a24bf 100644
91968 --- a/mm/maccess.c
91969 +++ b/mm/maccess.c
91970 @@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
91971 set_fs(KERNEL_DS);
91972 pagefault_disable();
91973 ret = __copy_from_user_inatomic(dst,
91974 - (__force const void __user *)src, size);
91975 + (const void __force_user *)src, size);
91976 pagefault_enable();
91977 set_fs(old_fs);
91978
91979 @@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
91980
91981 set_fs(KERNEL_DS);
91982 pagefault_disable();
91983 - ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
91984 + ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
91985 pagefault_enable();
91986 set_fs(old_fs);
91987
91988 diff --git a/mm/madvise.c b/mm/madvise.c
91989 index 539eeb9..e24a987 100644
91990 --- a/mm/madvise.c
91991 +++ b/mm/madvise.c
91992 @@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
91993 pgoff_t pgoff;
91994 unsigned long new_flags = vma->vm_flags;
91995
91996 +#ifdef CONFIG_PAX_SEGMEXEC
91997 + struct vm_area_struct *vma_m;
91998 +#endif
91999 +
92000 switch (behavior) {
92001 case MADV_NORMAL:
92002 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
92003 @@ -126,6 +130,13 @@ success:
92004 /*
92005 * vm_flags is protected by the mmap_sem held in write mode.
92006 */
92007 +
92008 +#ifdef CONFIG_PAX_SEGMEXEC
92009 + vma_m = pax_find_mirror_vma(vma);
92010 + if (vma_m)
92011 + vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
92012 +#endif
92013 +
92014 vma->vm_flags = new_flags;
92015
92016 out:
92017 @@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct *vma,
92018 struct vm_area_struct **prev,
92019 unsigned long start, unsigned long end)
92020 {
92021 +
92022 +#ifdef CONFIG_PAX_SEGMEXEC
92023 + struct vm_area_struct *vma_m;
92024 +#endif
92025 +
92026 *prev = vma;
92027 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
92028 return -EINVAL;
92029 @@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct *vma,
92030 zap_page_range(vma, start, end - start, &details);
92031 } else
92032 zap_page_range(vma, start, end - start, NULL);
92033 +
92034 +#ifdef CONFIG_PAX_SEGMEXEC
92035 + vma_m = pax_find_mirror_vma(vma);
92036 + if (vma_m) {
92037 + if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
92038 + struct zap_details details = {
92039 + .nonlinear_vma = vma_m,
92040 + .last_index = ULONG_MAX,
92041 + };
92042 + zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
92043 + } else
92044 + zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
92045 + }
92046 +#endif
92047 +
92048 return 0;
92049 }
92050
92051 @@ -491,6 +522,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
92052 if (end < start)
92053 return error;
92054
92055 +#ifdef CONFIG_PAX_SEGMEXEC
92056 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
92057 + if (end > SEGMEXEC_TASK_SIZE)
92058 + return error;
92059 + } else
92060 +#endif
92061 +
92062 + if (end > TASK_SIZE)
92063 + return error;
92064 +
92065 error = 0;
92066 if (end == start)
92067 return error;
92068 diff --git a/mm/memory-failure.c b/mm/memory-failure.c
92069 index 90002ea..db1452d 100644
92070 --- a/mm/memory-failure.c
92071 +++ b/mm/memory-failure.c
92072 @@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
92073
92074 int sysctl_memory_failure_recovery __read_mostly = 1;
92075
92076 -atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
92077 +atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
92078
92079 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
92080
92081 @@ -202,7 +202,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
92082 pfn, t->comm, t->pid);
92083 si.si_signo = SIGBUS;
92084 si.si_errno = 0;
92085 - si.si_addr = (void *)addr;
92086 + si.si_addr = (void __user *)addr;
92087 #ifdef __ARCH_SI_TRAPNO
92088 si.si_trapno = trapno;
92089 #endif
92090 @@ -762,7 +762,7 @@ static struct page_state {
92091 unsigned long res;
92092 char *msg;
92093 int (*action)(struct page *p, unsigned long pfn);
92094 -} error_states[] = {
92095 +} __do_const error_states[] = {
92096 { reserved, reserved, "reserved kernel", me_kernel },
92097 /*
92098 * free pages are specially detected outside this table:
92099 @@ -1062,7 +1062,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
92100 nr_pages = 1 << compound_order(hpage);
92101 else /* normal page or thp */
92102 nr_pages = 1;
92103 - atomic_long_add(nr_pages, &num_poisoned_pages);
92104 + atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
92105
92106 /*
92107 * We need/can do nothing about count=0 pages.
92108 @@ -1092,7 +1092,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
92109 if (!PageHWPoison(hpage)
92110 || (hwpoison_filter(p) && TestClearPageHWPoison(p))
92111 || (p != hpage && TestSetPageHWPoison(hpage))) {
92112 - atomic_long_sub(nr_pages, &num_poisoned_pages);
92113 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
92114 return 0;
92115 }
92116 set_page_hwpoison_huge_page(hpage);
92117 @@ -1161,7 +1161,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
92118 }
92119 if (hwpoison_filter(p)) {
92120 if (TestClearPageHWPoison(p))
92121 - atomic_long_sub(nr_pages, &num_poisoned_pages);
92122 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
92123 unlock_page(hpage);
92124 put_page(hpage);
92125 return 0;
92126 @@ -1383,7 +1383,7 @@ int unpoison_memory(unsigned long pfn)
92127 return 0;
92128 }
92129 if (TestClearPageHWPoison(p))
92130 - atomic_long_dec(&num_poisoned_pages);
92131 + atomic_long_dec_unchecked(&num_poisoned_pages);
92132 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
92133 return 0;
92134 }
92135 @@ -1397,7 +1397,7 @@ int unpoison_memory(unsigned long pfn)
92136 */
92137 if (TestClearPageHWPoison(page)) {
92138 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
92139 - atomic_long_sub(nr_pages, &num_poisoned_pages);
92140 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
92141 freeit = 1;
92142 if (PageHuge(page))
92143 clear_page_hwpoison_huge_page(page);
92144 @@ -1522,11 +1522,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
92145 if (PageHuge(page)) {
92146 set_page_hwpoison_huge_page(hpage);
92147 dequeue_hwpoisoned_huge_page(hpage);
92148 - atomic_long_add(1 << compound_order(hpage),
92149 + atomic_long_add_unchecked(1 << compound_order(hpage),
92150 &num_poisoned_pages);
92151 } else {
92152 SetPageHWPoison(page);
92153 - atomic_long_inc(&num_poisoned_pages);
92154 + atomic_long_inc_unchecked(&num_poisoned_pages);
92155 }
92156 }
92157 return ret;
92158 @@ -1565,7 +1565,7 @@ static int __soft_offline_page(struct page *page, int flags)
92159 put_page(page);
92160 pr_info("soft_offline: %#lx: invalidated\n", pfn);
92161 SetPageHWPoison(page);
92162 - atomic_long_inc(&num_poisoned_pages);
92163 + atomic_long_inc_unchecked(&num_poisoned_pages);
92164 return 0;
92165 }
92166
92167 @@ -1616,7 +1616,7 @@ static int __soft_offline_page(struct page *page, int flags)
92168 if (!is_free_buddy_page(page))
92169 pr_info("soft offline: %#lx: page leaked\n",
92170 pfn);
92171 - atomic_long_inc(&num_poisoned_pages);
92172 + atomic_long_inc_unchecked(&num_poisoned_pages);
92173 }
92174 } else {
92175 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
92176 @@ -1690,11 +1690,11 @@ int soft_offline_page(struct page *page, int flags)
92177 if (PageHuge(page)) {
92178 set_page_hwpoison_huge_page(hpage);
92179 dequeue_hwpoisoned_huge_page(hpage);
92180 - atomic_long_add(1 << compound_order(hpage),
92181 + atomic_long_add_unchecked(1 << compound_order(hpage),
92182 &num_poisoned_pages);
92183 } else {
92184 SetPageHWPoison(page);
92185 - atomic_long_inc(&num_poisoned_pages);
92186 + atomic_long_inc_unchecked(&num_poisoned_pages);
92187 }
92188 }
92189 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
92190 diff --git a/mm/memory.c b/mm/memory.c
92191 index 22dfa61..90d7ec5 100644
92192 --- a/mm/memory.c
92193 +++ b/mm/memory.c
92194 @@ -403,6 +403,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
92195 free_pte_range(tlb, pmd, addr);
92196 } while (pmd++, addr = next, addr != end);
92197
92198 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
92199 start &= PUD_MASK;
92200 if (start < floor)
92201 return;
92202 @@ -417,6 +418,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
92203 pmd = pmd_offset(pud, start);
92204 pud_clear(pud);
92205 pmd_free_tlb(tlb, pmd, start);
92206 +#endif
92207 +
92208 }
92209
92210 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
92211 @@ -436,6 +439,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
92212 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
92213 } while (pud++, addr = next, addr != end);
92214
92215 +#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
92216 start &= PGDIR_MASK;
92217 if (start < floor)
92218 return;
92219 @@ -450,6 +454,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
92220 pud = pud_offset(pgd, start);
92221 pgd_clear(pgd);
92222 pud_free_tlb(tlb, pud, start);
92223 +#endif
92224 +
92225 }
92226
92227 /*
92228 @@ -1636,12 +1642,6 @@ no_page_table:
92229 return page;
92230 }
92231
92232 -static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
92233 -{
92234 - return stack_guard_page_start(vma, addr) ||
92235 - stack_guard_page_end(vma, addr+PAGE_SIZE);
92236 -}
92237 -
92238 /**
92239 * __get_user_pages() - pin user pages in memory
92240 * @tsk: task_struct of target task
92241 @@ -1728,10 +1728,10 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
92242
92243 i = 0;
92244
92245 - do {
92246 + while (nr_pages) {
92247 struct vm_area_struct *vma;
92248
92249 - vma = find_extend_vma(mm, start);
92250 + vma = find_vma(mm, start);
92251 if (!vma && in_gate_area(mm, start)) {
92252 unsigned long pg = start & PAGE_MASK;
92253 pgd_t *pgd;
92254 @@ -1780,7 +1780,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
92255 goto next_page;
92256 }
92257
92258 - if (!vma ||
92259 + if (!vma || start < vma->vm_start ||
92260 (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
92261 !(vm_flags & vma->vm_flags))
92262 return i ? : -EFAULT;
92263 @@ -1809,11 +1809,6 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
92264 int ret;
92265 unsigned int fault_flags = 0;
92266
92267 - /* For mlock, just skip the stack guard page. */
92268 - if (foll_flags & FOLL_MLOCK) {
92269 - if (stack_guard_page(vma, start))
92270 - goto next_page;
92271 - }
92272 if (foll_flags & FOLL_WRITE)
92273 fault_flags |= FAULT_FLAG_WRITE;
92274 if (nonblocking)
92275 @@ -1893,7 +1888,7 @@ next_page:
92276 start += page_increm * PAGE_SIZE;
92277 nr_pages -= page_increm;
92278 } while (nr_pages && start < vma->vm_end);
92279 - } while (nr_pages);
92280 + }
92281 return i;
92282 }
92283 EXPORT_SYMBOL(__get_user_pages);
92284 @@ -1929,12 +1924,17 @@ int fixup_user_fault(struct task_struct *tsk, struct mm_struct *mm,
92285 unsigned long address, unsigned int fault_flags)
92286 {
92287 struct vm_area_struct *vma;
92288 + vm_flags_t vm_flags;
92289 int ret;
92290
92291 vma = find_extend_vma(mm, address);
92292 if (!vma || address < vma->vm_start)
92293 return -EFAULT;
92294
92295 + vm_flags = (fault_flags & FAULT_FLAG_WRITE) ? VM_WRITE : VM_READ;
92296 + if (!(vm_flags & vma->vm_flags))
92297 + return -EFAULT;
92298 +
92299 ret = handle_mm_fault(mm, vma, address, fault_flags);
92300 if (ret & VM_FAULT_ERROR) {
92301 if (ret & VM_FAULT_OOM)
92302 @@ -2100,6 +2100,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
92303 page_add_file_rmap(page);
92304 set_pte_at(mm, addr, pte, mk_pte(page, prot));
92305
92306 +#ifdef CONFIG_PAX_SEGMEXEC
92307 + pax_mirror_file_pte(vma, addr, page, ptl);
92308 +#endif
92309 +
92310 retval = 0;
92311 pte_unmap_unlock(pte, ptl);
92312 return retval;
92313 @@ -2144,9 +2148,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
92314 if (!page_count(page))
92315 return -EINVAL;
92316 if (!(vma->vm_flags & VM_MIXEDMAP)) {
92317 +
92318 +#ifdef CONFIG_PAX_SEGMEXEC
92319 + struct vm_area_struct *vma_m;
92320 +#endif
92321 +
92322 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
92323 BUG_ON(vma->vm_flags & VM_PFNMAP);
92324 vma->vm_flags |= VM_MIXEDMAP;
92325 +
92326 +#ifdef CONFIG_PAX_SEGMEXEC
92327 + vma_m = pax_find_mirror_vma(vma);
92328 + if (vma_m)
92329 + vma_m->vm_flags |= VM_MIXEDMAP;
92330 +#endif
92331 +
92332 }
92333 return insert_page(vma, addr, page, vma->vm_page_prot);
92334 }
92335 @@ -2229,6 +2245,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
92336 unsigned long pfn)
92337 {
92338 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
92339 + BUG_ON(vma->vm_mirror);
92340
92341 if (addr < vma->vm_start || addr >= vma->vm_end)
92342 return -EFAULT;
92343 @@ -2476,7 +2493,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
92344
92345 BUG_ON(pud_huge(*pud));
92346
92347 - pmd = pmd_alloc(mm, pud, addr);
92348 + pmd = (mm == &init_mm) ?
92349 + pmd_alloc_kernel(mm, pud, addr) :
92350 + pmd_alloc(mm, pud, addr);
92351 if (!pmd)
92352 return -ENOMEM;
92353 do {
92354 @@ -2496,7 +2515,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
92355 unsigned long next;
92356 int err;
92357
92358 - pud = pud_alloc(mm, pgd, addr);
92359 + pud = (mm == &init_mm) ?
92360 + pud_alloc_kernel(mm, pgd, addr) :
92361 + pud_alloc(mm, pgd, addr);
92362 if (!pud)
92363 return -ENOMEM;
92364 do {
92365 @@ -2586,6 +2607,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
92366 copy_user_highpage(dst, src, va, vma);
92367 }
92368
92369 +#ifdef CONFIG_PAX_SEGMEXEC
92370 +static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
92371 +{
92372 + struct mm_struct *mm = vma->vm_mm;
92373 + spinlock_t *ptl;
92374 + pte_t *pte, entry;
92375 +
92376 + pte = pte_offset_map_lock(mm, pmd, address, &ptl);
92377 + entry = *pte;
92378 + if (!pte_present(entry)) {
92379 + if (!pte_none(entry)) {
92380 + BUG_ON(pte_file(entry));
92381 + free_swap_and_cache(pte_to_swp_entry(entry));
92382 + pte_clear_not_present_full(mm, address, pte, 0);
92383 + }
92384 + } else {
92385 + struct page *page;
92386 +
92387 + flush_cache_page(vma, address, pte_pfn(entry));
92388 + entry = ptep_clear_flush(vma, address, pte);
92389 + BUG_ON(pte_dirty(entry));
92390 + page = vm_normal_page(vma, address, entry);
92391 + if (page) {
92392 + update_hiwater_rss(mm);
92393 + if (PageAnon(page))
92394 + dec_mm_counter_fast(mm, MM_ANONPAGES);
92395 + else
92396 + dec_mm_counter_fast(mm, MM_FILEPAGES);
92397 + page_remove_rmap(page);
92398 + page_cache_release(page);
92399 + }
92400 + }
92401 + pte_unmap_unlock(pte, ptl);
92402 +}
92403 +
92404 +/* PaX: if vma is mirrored, synchronize the mirror's PTE
92405 + *
92406 + * the ptl of the lower mapped page is held on entry and is not released on exit
92407 + * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
92408 + */
92409 +static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
92410 +{
92411 + struct mm_struct *mm = vma->vm_mm;
92412 + unsigned long address_m;
92413 + spinlock_t *ptl_m;
92414 + struct vm_area_struct *vma_m;
92415 + pmd_t *pmd_m;
92416 + pte_t *pte_m, entry_m;
92417 +
92418 + BUG_ON(!page_m || !PageAnon(page_m));
92419 +
92420 + vma_m = pax_find_mirror_vma(vma);
92421 + if (!vma_m)
92422 + return;
92423 +
92424 + BUG_ON(!PageLocked(page_m));
92425 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
92426 + address_m = address + SEGMEXEC_TASK_SIZE;
92427 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
92428 + pte_m = pte_offset_map(pmd_m, address_m);
92429 + ptl_m = pte_lockptr(mm, pmd_m);
92430 + if (ptl != ptl_m) {
92431 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
92432 + if (!pte_none(*pte_m))
92433 + goto out;
92434 + }
92435 +
92436 + entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
92437 + page_cache_get(page_m);
92438 + page_add_anon_rmap(page_m, vma_m, address_m);
92439 + inc_mm_counter_fast(mm, MM_ANONPAGES);
92440 + set_pte_at(mm, address_m, pte_m, entry_m);
92441 + update_mmu_cache(vma_m, address_m, pte_m);
92442 +out:
92443 + if (ptl != ptl_m)
92444 + spin_unlock(ptl_m);
92445 + pte_unmap(pte_m);
92446 + unlock_page(page_m);
92447 +}
92448 +
92449 +void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
92450 +{
92451 + struct mm_struct *mm = vma->vm_mm;
92452 + unsigned long address_m;
92453 + spinlock_t *ptl_m;
92454 + struct vm_area_struct *vma_m;
92455 + pmd_t *pmd_m;
92456 + pte_t *pte_m, entry_m;
92457 +
92458 + BUG_ON(!page_m || PageAnon(page_m));
92459 +
92460 + vma_m = pax_find_mirror_vma(vma);
92461 + if (!vma_m)
92462 + return;
92463 +
92464 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
92465 + address_m = address + SEGMEXEC_TASK_SIZE;
92466 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
92467 + pte_m = pte_offset_map(pmd_m, address_m);
92468 + ptl_m = pte_lockptr(mm, pmd_m);
92469 + if (ptl != ptl_m) {
92470 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
92471 + if (!pte_none(*pte_m))
92472 + goto out;
92473 + }
92474 +
92475 + entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
92476 + page_cache_get(page_m);
92477 + page_add_file_rmap(page_m);
92478 + inc_mm_counter_fast(mm, MM_FILEPAGES);
92479 + set_pte_at(mm, address_m, pte_m, entry_m);
92480 + update_mmu_cache(vma_m, address_m, pte_m);
92481 +out:
92482 + if (ptl != ptl_m)
92483 + spin_unlock(ptl_m);
92484 + pte_unmap(pte_m);
92485 +}
92486 +
92487 +static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
92488 +{
92489 + struct mm_struct *mm = vma->vm_mm;
92490 + unsigned long address_m;
92491 + spinlock_t *ptl_m;
92492 + struct vm_area_struct *vma_m;
92493 + pmd_t *pmd_m;
92494 + pte_t *pte_m, entry_m;
92495 +
92496 + vma_m = pax_find_mirror_vma(vma);
92497 + if (!vma_m)
92498 + return;
92499 +
92500 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
92501 + address_m = address + SEGMEXEC_TASK_SIZE;
92502 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
92503 + pte_m = pte_offset_map(pmd_m, address_m);
92504 + ptl_m = pte_lockptr(mm, pmd_m);
92505 + if (ptl != ptl_m) {
92506 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
92507 + if (!pte_none(*pte_m))
92508 + goto out;
92509 + }
92510 +
92511 + entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
92512 + set_pte_at(mm, address_m, pte_m, entry_m);
92513 +out:
92514 + if (ptl != ptl_m)
92515 + spin_unlock(ptl_m);
92516 + pte_unmap(pte_m);
92517 +}
92518 +
92519 +static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
92520 +{
92521 + struct page *page_m;
92522 + pte_t entry;
92523 +
92524 + if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
92525 + goto out;
92526 +
92527 + entry = *pte;
92528 + page_m = vm_normal_page(vma, address, entry);
92529 + if (!page_m)
92530 + pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
92531 + else if (PageAnon(page_m)) {
92532 + if (pax_find_mirror_vma(vma)) {
92533 + pte_unmap_unlock(pte, ptl);
92534 + lock_page(page_m);
92535 + pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
92536 + if (pte_same(entry, *pte))
92537 + pax_mirror_anon_pte(vma, address, page_m, ptl);
92538 + else
92539 + unlock_page(page_m);
92540 + }
92541 + } else
92542 + pax_mirror_file_pte(vma, address, page_m, ptl);
92543 +
92544 +out:
92545 + pte_unmap_unlock(pte, ptl);
92546 +}
92547 +#endif
92548 +
92549 /*
92550 * This routine handles present pages, when users try to write
92551 * to a shared page. It is done by copying the page to a new address
92552 @@ -2810,6 +3011,12 @@ gotten:
92553 */
92554 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
92555 if (likely(pte_same(*page_table, orig_pte))) {
92556 +
92557 +#ifdef CONFIG_PAX_SEGMEXEC
92558 + if (pax_find_mirror_vma(vma))
92559 + BUG_ON(!trylock_page(new_page));
92560 +#endif
92561 +
92562 if (old_page) {
92563 if (!PageAnon(old_page)) {
92564 dec_mm_counter_fast(mm, MM_FILEPAGES);
92565 @@ -2861,6 +3068,10 @@ gotten:
92566 page_remove_rmap(old_page);
92567 }
92568
92569 +#ifdef CONFIG_PAX_SEGMEXEC
92570 + pax_mirror_anon_pte(vma, address, new_page, ptl);
92571 +#endif
92572 +
92573 /* Free the old page.. */
92574 new_page = old_page;
92575 ret |= VM_FAULT_WRITE;
92576 @@ -3138,6 +3349,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
92577 swap_free(entry);
92578 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
92579 try_to_free_swap(page);
92580 +
92581 +#ifdef CONFIG_PAX_SEGMEXEC
92582 + if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
92583 +#endif
92584 +
92585 unlock_page(page);
92586 if (page != swapcache) {
92587 /*
92588 @@ -3161,6 +3377,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
92589
92590 /* No need to invalidate - it was non-present before */
92591 update_mmu_cache(vma, address, page_table);
92592 +
92593 +#ifdef CONFIG_PAX_SEGMEXEC
92594 + pax_mirror_anon_pte(vma, address, page, ptl);
92595 +#endif
92596 +
92597 unlock:
92598 pte_unmap_unlock(page_table, ptl);
92599 out:
92600 @@ -3180,40 +3401,6 @@ out_release:
92601 }
92602
92603 /*
92604 - * This is like a special single-page "expand_{down|up}wards()",
92605 - * except we must first make sure that 'address{-|+}PAGE_SIZE'
92606 - * doesn't hit another vma.
92607 - */
92608 -static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
92609 -{
92610 - address &= PAGE_MASK;
92611 - if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
92612 - struct vm_area_struct *prev = vma->vm_prev;
92613 -
92614 - /*
92615 - * Is there a mapping abutting this one below?
92616 - *
92617 - * That's only ok if it's the same stack mapping
92618 - * that has gotten split..
92619 - */
92620 - if (prev && prev->vm_end == address)
92621 - return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
92622 -
92623 - expand_downwards(vma, address - PAGE_SIZE);
92624 - }
92625 - if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
92626 - struct vm_area_struct *next = vma->vm_next;
92627 -
92628 - /* As VM_GROWSDOWN but s/below/above/ */
92629 - if (next && next->vm_start == address + PAGE_SIZE)
92630 - return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
92631 -
92632 - expand_upwards(vma, address + PAGE_SIZE);
92633 - }
92634 - return 0;
92635 -}
92636 -
92637 -/*
92638 * We enter with non-exclusive mmap_sem (to exclude vma changes,
92639 * but allow concurrent faults), and pte mapped but not yet locked.
92640 * We return with mmap_sem still held, but pte unmapped and unlocked.
92641 @@ -3222,27 +3409,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
92642 unsigned long address, pte_t *page_table, pmd_t *pmd,
92643 unsigned int flags)
92644 {
92645 - struct page *page;
92646 + struct page *page = NULL;
92647 spinlock_t *ptl;
92648 pte_t entry;
92649
92650 - pte_unmap(page_table);
92651 -
92652 - /* Check if we need to add a guard page to the stack */
92653 - if (check_stack_guard_page(vma, address) < 0)
92654 - return VM_FAULT_SIGBUS;
92655 -
92656 - /* Use the zero-page for reads */
92657 if (!(flags & FAULT_FLAG_WRITE)) {
92658 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
92659 vma->vm_page_prot));
92660 - page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
92661 + ptl = pte_lockptr(mm, pmd);
92662 + spin_lock(ptl);
92663 if (!pte_none(*page_table))
92664 goto unlock;
92665 goto setpte;
92666 }
92667
92668 /* Allocate our own private page. */
92669 + pte_unmap(page_table);
92670 +
92671 if (unlikely(anon_vma_prepare(vma)))
92672 goto oom;
92673 page = alloc_zeroed_user_highpage_movable(vma, address);
92674 @@ -3266,6 +3449,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
92675 if (!pte_none(*page_table))
92676 goto release;
92677
92678 +#ifdef CONFIG_PAX_SEGMEXEC
92679 + if (pax_find_mirror_vma(vma))
92680 + BUG_ON(!trylock_page(page));
92681 +#endif
92682 +
92683 inc_mm_counter_fast(mm, MM_ANONPAGES);
92684 page_add_new_anon_rmap(page, vma, address);
92685 setpte:
92686 @@ -3273,6 +3461,12 @@ setpte:
92687
92688 /* No need to invalidate - it was non-present before */
92689 update_mmu_cache(vma, address, page_table);
92690 +
92691 +#ifdef CONFIG_PAX_SEGMEXEC
92692 + if (page)
92693 + pax_mirror_anon_pte(vma, address, page, ptl);
92694 +#endif
92695 +
92696 unlock:
92697 pte_unmap_unlock(page_table, ptl);
92698 return 0;
92699 @@ -3417,6 +3611,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
92700 */
92701 /* Only go through if we didn't race with anybody else... */
92702 if (likely(pte_same(*page_table, orig_pte))) {
92703 +
92704 +#ifdef CONFIG_PAX_SEGMEXEC
92705 + if (anon && pax_find_mirror_vma(vma))
92706 + BUG_ON(!trylock_page(page));
92707 +#endif
92708 +
92709 flush_icache_page(vma, page);
92710 entry = mk_pte(page, vma->vm_page_prot);
92711 if (flags & FAULT_FLAG_WRITE)
92712 @@ -3438,6 +3638,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
92713
92714 /* no need to invalidate: a not-present page won't be cached */
92715 update_mmu_cache(vma, address, page_table);
92716 +
92717 +#ifdef CONFIG_PAX_SEGMEXEC
92718 + if (anon)
92719 + pax_mirror_anon_pte(vma, address, page, ptl);
92720 + else
92721 + pax_mirror_file_pte(vma, address, page, ptl);
92722 +#endif
92723 +
92724 } else {
92725 if (cow_page)
92726 mem_cgroup_uncharge_page(cow_page);
92727 @@ -3685,6 +3893,12 @@ static int handle_pte_fault(struct mm_struct *mm,
92728 if (flags & FAULT_FLAG_WRITE)
92729 flush_tlb_fix_spurious_fault(vma, address);
92730 }
92731 +
92732 +#ifdef CONFIG_PAX_SEGMEXEC
92733 + pax_mirror_pte(vma, address, pte, pmd, ptl);
92734 + return 0;
92735 +#endif
92736 +
92737 unlock:
92738 pte_unmap_unlock(pte, ptl);
92739 return 0;
92740 @@ -3701,9 +3915,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
92741 pmd_t *pmd;
92742 pte_t *pte;
92743
92744 +#ifdef CONFIG_PAX_SEGMEXEC
92745 + struct vm_area_struct *vma_m;
92746 +#endif
92747 +
92748 if (unlikely(is_vm_hugetlb_page(vma)))
92749 return hugetlb_fault(mm, vma, address, flags);
92750
92751 +#ifdef CONFIG_PAX_SEGMEXEC
92752 + vma_m = pax_find_mirror_vma(vma);
92753 + if (vma_m) {
92754 + unsigned long address_m;
92755 + pgd_t *pgd_m;
92756 + pud_t *pud_m;
92757 + pmd_t *pmd_m;
92758 +
92759 + if (vma->vm_start > vma_m->vm_start) {
92760 + address_m = address;
92761 + address -= SEGMEXEC_TASK_SIZE;
92762 + vma = vma_m;
92763 + } else
92764 + address_m = address + SEGMEXEC_TASK_SIZE;
92765 +
92766 + pgd_m = pgd_offset(mm, address_m);
92767 + pud_m = pud_alloc(mm, pgd_m, address_m);
92768 + if (!pud_m)
92769 + return VM_FAULT_OOM;
92770 + pmd_m = pmd_alloc(mm, pud_m, address_m);
92771 + if (!pmd_m)
92772 + return VM_FAULT_OOM;
92773 + if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
92774 + return VM_FAULT_OOM;
92775 + pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
92776 + }
92777 +#endif
92778 +
92779 pgd = pgd_offset(mm, address);
92780 pud = pud_alloc(mm, pgd, address);
92781 if (!pud)
92782 @@ -3834,6 +4080,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
92783 spin_unlock(&mm->page_table_lock);
92784 return 0;
92785 }
92786 +
92787 +int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
92788 +{
92789 + pud_t *new = pud_alloc_one(mm, address);
92790 + if (!new)
92791 + return -ENOMEM;
92792 +
92793 + smp_wmb(); /* See comment in __pte_alloc */
92794 +
92795 + spin_lock(&mm->page_table_lock);
92796 + if (pgd_present(*pgd)) /* Another has populated it */
92797 + pud_free(mm, new);
92798 + else
92799 + pgd_populate_kernel(mm, pgd, new);
92800 + spin_unlock(&mm->page_table_lock);
92801 + return 0;
92802 +}
92803 #endif /* __PAGETABLE_PUD_FOLDED */
92804
92805 #ifndef __PAGETABLE_PMD_FOLDED
92806 @@ -3864,6 +4127,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
92807 spin_unlock(&mm->page_table_lock);
92808 return 0;
92809 }
92810 +
92811 +int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
92812 +{
92813 + pmd_t *new = pmd_alloc_one(mm, address);
92814 + if (!new)
92815 + return -ENOMEM;
92816 +
92817 + smp_wmb(); /* See comment in __pte_alloc */
92818 +
92819 + spin_lock(&mm->page_table_lock);
92820 +#ifndef __ARCH_HAS_4LEVEL_HACK
92821 + if (pud_present(*pud)) /* Another has populated it */
92822 + pmd_free(mm, new);
92823 + else
92824 + pud_populate_kernel(mm, pud, new);
92825 +#else
92826 + if (pgd_present(*pud)) /* Another has populated it */
92827 + pmd_free(mm, new);
92828 + else
92829 + pgd_populate_kernel(mm, pud, new);
92830 +#endif /* __ARCH_HAS_4LEVEL_HACK */
92831 + spin_unlock(&mm->page_table_lock);
92832 + return 0;
92833 +}
92834 #endif /* __PAGETABLE_PMD_FOLDED */
92835
92836 #if !defined(__HAVE_ARCH_GATE_AREA)
92837 @@ -3877,7 +4164,7 @@ static int __init gate_vma_init(void)
92838 gate_vma.vm_start = FIXADDR_USER_START;
92839 gate_vma.vm_end = FIXADDR_USER_END;
92840 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
92841 - gate_vma.vm_page_prot = __P101;
92842 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
92843
92844 return 0;
92845 }
92846 @@ -4011,8 +4298,8 @@ out:
92847 return ret;
92848 }
92849
92850 -int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
92851 - void *buf, int len, int write)
92852 +ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
92853 + void *buf, size_t len, int write)
92854 {
92855 resource_size_t phys_addr;
92856 unsigned long prot = 0;
92857 @@ -4038,8 +4325,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
92858 * Access another process' address space as given in mm. If non-NULL, use the
92859 * given task for page fault accounting.
92860 */
92861 -static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
92862 - unsigned long addr, void *buf, int len, int write)
92863 +static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
92864 + unsigned long addr, void *buf, size_t len, int write)
92865 {
92866 struct vm_area_struct *vma;
92867 void *old_buf = buf;
92868 @@ -4047,7 +4334,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
92869 down_read(&mm->mmap_sem);
92870 /* ignore errors, just check how much was successfully transferred */
92871 while (len) {
92872 - int bytes, ret, offset;
92873 + ssize_t bytes, ret, offset;
92874 void *maddr;
92875 struct page *page = NULL;
92876
92877 @@ -4106,8 +4393,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
92878 *
92879 * The caller must hold a reference on @mm.
92880 */
92881 -int access_remote_vm(struct mm_struct *mm, unsigned long addr,
92882 - void *buf, int len, int write)
92883 +ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
92884 + void *buf, size_t len, int write)
92885 {
92886 return __access_remote_vm(NULL, mm, addr, buf, len, write);
92887 }
92888 @@ -4117,11 +4404,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
92889 * Source/target buffer must be kernel space,
92890 * Do not walk the page table directly, use get_user_pages
92891 */
92892 -int access_process_vm(struct task_struct *tsk, unsigned long addr,
92893 - void *buf, int len, int write)
92894 +ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
92895 + void *buf, size_t len, int write)
92896 {
92897 struct mm_struct *mm;
92898 - int ret;
92899 + ssize_t ret;
92900
92901 mm = get_task_mm(tsk);
92902 if (!mm)
92903 diff --git a/mm/mempolicy.c b/mm/mempolicy.c
92904 index ae3c8f3..fa4ee8e 100644
92905 --- a/mm/mempolicy.c
92906 +++ b/mm/mempolicy.c
92907 @@ -746,6 +746,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
92908 unsigned long vmstart;
92909 unsigned long vmend;
92910
92911 +#ifdef CONFIG_PAX_SEGMEXEC
92912 + struct vm_area_struct *vma_m;
92913 +#endif
92914 +
92915 vma = find_vma(mm, start);
92916 if (!vma || vma->vm_start > start)
92917 return -EFAULT;
92918 @@ -789,6 +793,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
92919 err = vma_replace_policy(vma, new_pol);
92920 if (err)
92921 goto out;
92922 +
92923 +#ifdef CONFIG_PAX_SEGMEXEC
92924 + vma_m = pax_find_mirror_vma(vma);
92925 + if (vma_m) {
92926 + err = vma_replace_policy(vma_m, new_pol);
92927 + if (err)
92928 + goto out;
92929 + }
92930 +#endif
92931 +
92932 }
92933
92934 out:
92935 @@ -1252,6 +1266,17 @@ static long do_mbind(unsigned long start, unsigned long len,
92936
92937 if (end < start)
92938 return -EINVAL;
92939 +
92940 +#ifdef CONFIG_PAX_SEGMEXEC
92941 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
92942 + if (end > SEGMEXEC_TASK_SIZE)
92943 + return -EINVAL;
92944 + } else
92945 +#endif
92946 +
92947 + if (end > TASK_SIZE)
92948 + return -EINVAL;
92949 +
92950 if (end == start)
92951 return 0;
92952
92953 @@ -1480,8 +1505,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
92954 */
92955 tcred = __task_cred(task);
92956 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
92957 - !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
92958 - !capable(CAP_SYS_NICE)) {
92959 + !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
92960 rcu_read_unlock();
92961 err = -EPERM;
92962 goto out_put;
92963 @@ -1512,6 +1536,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
92964 goto out;
92965 }
92966
92967 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
92968 + if (mm != current->mm &&
92969 + (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
92970 + mmput(mm);
92971 + err = -EPERM;
92972 + goto out;
92973 + }
92974 +#endif
92975 +
92976 err = do_migrate_pages(mm, old, new,
92977 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
92978
92979 diff --git a/mm/migrate.c b/mm/migrate.c
92980 index bed4880..a493f67 100644
92981 --- a/mm/migrate.c
92982 +++ b/mm/migrate.c
92983 @@ -1485,8 +1485,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
92984 */
92985 tcred = __task_cred(task);
92986 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
92987 - !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
92988 - !capable(CAP_SYS_NICE)) {
92989 + !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
92990 rcu_read_unlock();
92991 err = -EPERM;
92992 goto out;
92993 diff --git a/mm/mlock.c b/mm/mlock.c
92994 index 4e1a6816..9683079 100644
92995 --- a/mm/mlock.c
92996 +++ b/mm/mlock.c
92997 @@ -14,6 +14,7 @@
92998 #include <linux/pagevec.h>
92999 #include <linux/mempolicy.h>
93000 #include <linux/syscalls.h>
93001 +#include <linux/security.h>
93002 #include <linux/sched.h>
93003 #include <linux/export.h>
93004 #include <linux/rmap.h>
93005 @@ -604,7 +605,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
93006 {
93007 unsigned long nstart, end, tmp;
93008 struct vm_area_struct * vma, * prev;
93009 - int error;
93010 + int error = 0;
93011
93012 VM_BUG_ON(start & ~PAGE_MASK);
93013 VM_BUG_ON(len != PAGE_ALIGN(len));
93014 @@ -613,6 +614,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
93015 return -EINVAL;
93016 if (end == start)
93017 return 0;
93018 + if (end > TASK_SIZE)
93019 + return -EINVAL;
93020 +
93021 vma = find_vma(current->mm, start);
93022 if (!vma || vma->vm_start > start)
93023 return -ENOMEM;
93024 @@ -624,6 +628,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
93025 for (nstart = start ; ; ) {
93026 vm_flags_t newflags;
93027
93028 +#ifdef CONFIG_PAX_SEGMEXEC
93029 + if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
93030 + break;
93031 +#endif
93032 +
93033 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
93034
93035 newflags = vma->vm_flags & ~VM_LOCKED;
93036 @@ -737,6 +746,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
93037 locked += current->mm->locked_vm;
93038
93039 /* check against resource limits */
93040 + gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
93041 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
93042 error = do_mlock(start, len, 1);
93043
93044 @@ -774,6 +784,11 @@ static int do_mlockall(int flags)
93045 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
93046 vm_flags_t newflags;
93047
93048 +#ifdef CONFIG_PAX_SEGMEXEC
93049 + if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
93050 + break;
93051 +#endif
93052 +
93053 newflags = vma->vm_flags & ~VM_LOCKED;
93054 if (flags & MCL_CURRENT)
93055 newflags |= VM_LOCKED;
93056 @@ -805,8 +820,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
93057 lock_limit >>= PAGE_SHIFT;
93058
93059 ret = -ENOMEM;
93060 +
93061 + gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
93062 +
93063 down_write(&current->mm->mmap_sem);
93064 -
93065 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
93066 capable(CAP_IPC_LOCK))
93067 ret = do_mlockall(flags);
93068 diff --git a/mm/mmap.c b/mm/mmap.c
93069 index 20ff0c3..a9eda98 100644
93070 --- a/mm/mmap.c
93071 +++ b/mm/mmap.c
93072 @@ -36,6 +36,7 @@
93073 #include <linux/sched/sysctl.h>
93074 #include <linux/notifier.h>
93075 #include <linux/memory.h>
93076 +#include <linux/random.h>
93077
93078 #include <asm/uaccess.h>
93079 #include <asm/cacheflush.h>
93080 @@ -52,6 +53,16 @@
93081 #define arch_rebalance_pgtables(addr, len) (addr)
93082 #endif
93083
93084 +static inline void verify_mm_writelocked(struct mm_struct *mm)
93085 +{
93086 +#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
93087 + if (unlikely(down_read_trylock(&mm->mmap_sem))) {
93088 + up_read(&mm->mmap_sem);
93089 + BUG();
93090 + }
93091 +#endif
93092 +}
93093 +
93094 static void unmap_region(struct mm_struct *mm,
93095 struct vm_area_struct *vma, struct vm_area_struct *prev,
93096 unsigned long start, unsigned long end);
93097 @@ -71,16 +82,25 @@ static void unmap_region(struct mm_struct *mm,
93098 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
93099 *
93100 */
93101 -pgprot_t protection_map[16] = {
93102 +pgprot_t protection_map[16] __read_only = {
93103 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
93104 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
93105 };
93106
93107 -pgprot_t vm_get_page_prot(unsigned long vm_flags)
93108 +pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
93109 {
93110 - return __pgprot(pgprot_val(protection_map[vm_flags &
93111 + pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
93112 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
93113 pgprot_val(arch_vm_get_page_prot(vm_flags)));
93114 +
93115 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
93116 + if (!(__supported_pte_mask & _PAGE_NX) &&
93117 + (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
93118 + (vm_flags & (VM_READ | VM_WRITE)))
93119 + prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
93120 +#endif
93121 +
93122 + return prot;
93123 }
93124 EXPORT_SYMBOL(vm_get_page_prot);
93125
93126 @@ -90,6 +110,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
93127 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
93128 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
93129 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
93130 +unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
93131 /*
93132 * Make sure vm_committed_as in one cacheline and not cacheline shared with
93133 * other variables. It can be updated by several CPUs frequently.
93134 @@ -246,6 +267,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
93135 struct vm_area_struct *next = vma->vm_next;
93136
93137 might_sleep();
93138 + BUG_ON(vma->vm_mirror);
93139 if (vma->vm_ops && vma->vm_ops->close)
93140 vma->vm_ops->close(vma);
93141 if (vma->vm_file)
93142 @@ -290,6 +312,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
93143 * not page aligned -Ram Gupta
93144 */
93145 rlim = rlimit(RLIMIT_DATA);
93146 + gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
93147 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
93148 (mm->end_data - mm->start_data) > rlim)
93149 goto out;
93150 @@ -940,6 +963,12 @@ static int
93151 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
93152 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
93153 {
93154 +
93155 +#ifdef CONFIG_PAX_SEGMEXEC
93156 + if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
93157 + return 0;
93158 +#endif
93159 +
93160 if (is_mergeable_vma(vma, file, vm_flags) &&
93161 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
93162 if (vma->vm_pgoff == vm_pgoff)
93163 @@ -959,6 +988,12 @@ static int
93164 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
93165 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
93166 {
93167 +
93168 +#ifdef CONFIG_PAX_SEGMEXEC
93169 + if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
93170 + return 0;
93171 +#endif
93172 +
93173 if (is_mergeable_vma(vma, file, vm_flags) &&
93174 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
93175 pgoff_t vm_pglen;
93176 @@ -1001,13 +1036,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
93177 struct vm_area_struct *vma_merge(struct mm_struct *mm,
93178 struct vm_area_struct *prev, unsigned long addr,
93179 unsigned long end, unsigned long vm_flags,
93180 - struct anon_vma *anon_vma, struct file *file,
93181 + struct anon_vma *anon_vma, struct file *file,
93182 pgoff_t pgoff, struct mempolicy *policy)
93183 {
93184 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
93185 struct vm_area_struct *area, *next;
93186 int err;
93187
93188 +#ifdef CONFIG_PAX_SEGMEXEC
93189 + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
93190 + struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
93191 +
93192 + BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
93193 +#endif
93194 +
93195 /*
93196 * We later require that vma->vm_flags == vm_flags,
93197 * so this tests vma->vm_flags & VM_SPECIAL, too.
93198 @@ -1023,6 +1065,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
93199 if (next && next->vm_end == end) /* cases 6, 7, 8 */
93200 next = next->vm_next;
93201
93202 +#ifdef CONFIG_PAX_SEGMEXEC
93203 + if (prev)
93204 + prev_m = pax_find_mirror_vma(prev);
93205 + if (area)
93206 + area_m = pax_find_mirror_vma(area);
93207 + if (next)
93208 + next_m = pax_find_mirror_vma(next);
93209 +#endif
93210 +
93211 /*
93212 * Can it merge with the predecessor?
93213 */
93214 @@ -1042,9 +1093,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
93215 /* cases 1, 6 */
93216 err = vma_adjust(prev, prev->vm_start,
93217 next->vm_end, prev->vm_pgoff, NULL);
93218 - } else /* cases 2, 5, 7 */
93219 +
93220 +#ifdef CONFIG_PAX_SEGMEXEC
93221 + if (!err && prev_m)
93222 + err = vma_adjust(prev_m, prev_m->vm_start,
93223 + next_m->vm_end, prev_m->vm_pgoff, NULL);
93224 +#endif
93225 +
93226 + } else { /* cases 2, 5, 7 */
93227 err = vma_adjust(prev, prev->vm_start,
93228 end, prev->vm_pgoff, NULL);
93229 +
93230 +#ifdef CONFIG_PAX_SEGMEXEC
93231 + if (!err && prev_m)
93232 + err = vma_adjust(prev_m, prev_m->vm_start,
93233 + end_m, prev_m->vm_pgoff, NULL);
93234 +#endif
93235 +
93236 + }
93237 if (err)
93238 return NULL;
93239 khugepaged_enter_vma_merge(prev);
93240 @@ -1058,12 +1124,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
93241 mpol_equal(policy, vma_policy(next)) &&
93242 can_vma_merge_before(next, vm_flags,
93243 anon_vma, file, pgoff+pglen)) {
93244 - if (prev && addr < prev->vm_end) /* case 4 */
93245 + if (prev && addr < prev->vm_end) { /* case 4 */
93246 err = vma_adjust(prev, prev->vm_start,
93247 addr, prev->vm_pgoff, NULL);
93248 - else /* cases 3, 8 */
93249 +
93250 +#ifdef CONFIG_PAX_SEGMEXEC
93251 + if (!err && prev_m)
93252 + err = vma_adjust(prev_m, prev_m->vm_start,
93253 + addr_m, prev_m->vm_pgoff, NULL);
93254 +#endif
93255 +
93256 + } else { /* cases 3, 8 */
93257 err = vma_adjust(area, addr, next->vm_end,
93258 next->vm_pgoff - pglen, NULL);
93259 +
93260 +#ifdef CONFIG_PAX_SEGMEXEC
93261 + if (!err && area_m)
93262 + err = vma_adjust(area_m, addr_m, next_m->vm_end,
93263 + next_m->vm_pgoff - pglen, NULL);
93264 +#endif
93265 +
93266 + }
93267 if (err)
93268 return NULL;
93269 khugepaged_enter_vma_merge(area);
93270 @@ -1172,8 +1253,10 @@ none:
93271 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
93272 struct file *file, long pages)
93273 {
93274 - const unsigned long stack_flags
93275 - = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
93276 +
93277 +#ifdef CONFIG_PAX_RANDMMAP
93278 + if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
93279 +#endif
93280
93281 mm->total_vm += pages;
93282
93283 @@ -1181,7 +1264,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
93284 mm->shared_vm += pages;
93285 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
93286 mm->exec_vm += pages;
93287 - } else if (flags & stack_flags)
93288 + } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
93289 mm->stack_vm += pages;
93290 }
93291 #endif /* CONFIG_PROC_FS */
93292 @@ -1211,6 +1294,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
93293 locked += mm->locked_vm;
93294 lock_limit = rlimit(RLIMIT_MEMLOCK);
93295 lock_limit >>= PAGE_SHIFT;
93296 + gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
93297 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
93298 return -EAGAIN;
93299 }
93300 @@ -1237,7 +1321,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
93301 * (the exception is when the underlying filesystem is noexec
93302 * mounted, in which case we dont add PROT_EXEC.)
93303 */
93304 - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
93305 + if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
93306 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
93307 prot |= PROT_EXEC;
93308
93309 @@ -1263,7 +1347,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
93310 /* Obtain the address to map to. we verify (or select) it and ensure
93311 * that it represents a valid section of the address space.
93312 */
93313 - addr = get_unmapped_area(file, addr, len, pgoff, flags);
93314 + addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
93315 if (addr & ~PAGE_MASK)
93316 return addr;
93317
93318 @@ -1274,6 +1358,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
93319 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
93320 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
93321
93322 +#ifdef CONFIG_PAX_MPROTECT
93323 + if (mm->pax_flags & MF_PAX_MPROTECT) {
93324 +
93325 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
93326 + if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
93327 + mm->binfmt->handle_mmap)
93328 + mm->binfmt->handle_mmap(file);
93329 +#endif
93330 +
93331 +#ifndef CONFIG_PAX_MPROTECT_COMPAT
93332 + if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
93333 + gr_log_rwxmmap(file);
93334 +
93335 +#ifdef CONFIG_PAX_EMUPLT
93336 + vm_flags &= ~VM_EXEC;
93337 +#else
93338 + return -EPERM;
93339 +#endif
93340 +
93341 + }
93342 +
93343 + if (!(vm_flags & VM_EXEC))
93344 + vm_flags &= ~VM_MAYEXEC;
93345 +#else
93346 + if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
93347 + vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
93348 +#endif
93349 + else
93350 + vm_flags &= ~VM_MAYWRITE;
93351 + }
93352 +#endif
93353 +
93354 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
93355 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
93356 + vm_flags &= ~VM_PAGEEXEC;
93357 +#endif
93358 +
93359 if (flags & MAP_LOCKED)
93360 if (!can_do_mlock())
93361 return -EPERM;
93362 @@ -1361,6 +1482,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
93363 vm_flags |= VM_NORESERVE;
93364 }
93365
93366 + if (!gr_acl_handle_mmap(file, prot))
93367 + return -EACCES;
93368 +
93369 addr = mmap_region(file, addr, len, vm_flags, pgoff);
93370 if (!IS_ERR_VALUE(addr) &&
93371 ((vm_flags & VM_LOCKED) ||
93372 @@ -1454,7 +1578,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
93373 vm_flags_t vm_flags = vma->vm_flags;
93374
93375 /* If it was private or non-writable, the write bit is already clear */
93376 - if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
93377 + if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
93378 return 0;
93379
93380 /* The backer wishes to know when pages are first written to? */
93381 @@ -1500,7 +1624,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
93382 struct rb_node **rb_link, *rb_parent;
93383 unsigned long charged = 0;
93384
93385 +#ifdef CONFIG_PAX_SEGMEXEC
93386 + struct vm_area_struct *vma_m = NULL;
93387 +#endif
93388 +
93389 + /*
93390 + * mm->mmap_sem is required to protect against another thread
93391 + * changing the mappings in case we sleep.
93392 + */
93393 + verify_mm_writelocked(mm);
93394 +
93395 /* Check against address space limit. */
93396 +
93397 +#ifdef CONFIG_PAX_RANDMMAP
93398 + if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
93399 +#endif
93400 +
93401 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
93402 unsigned long nr_pages;
93403
93404 @@ -1519,11 +1658,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
93405
93406 /* Clear old maps */
93407 error = -ENOMEM;
93408 -munmap_back:
93409 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
93410 if (do_munmap(mm, addr, len))
93411 return -ENOMEM;
93412 - goto munmap_back;
93413 + BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
93414 }
93415
93416 /*
93417 @@ -1554,6 +1692,16 @@ munmap_back:
93418 goto unacct_error;
93419 }
93420
93421 +#ifdef CONFIG_PAX_SEGMEXEC
93422 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
93423 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
93424 + if (!vma_m) {
93425 + error = -ENOMEM;
93426 + goto free_vma;
93427 + }
93428 + }
93429 +#endif
93430 +
93431 vma->vm_mm = mm;
93432 vma->vm_start = addr;
93433 vma->vm_end = addr + len;
93434 @@ -1573,6 +1721,13 @@ munmap_back:
93435 if (error)
93436 goto unmap_and_free_vma;
93437
93438 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
93439 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
93440 + vma->vm_flags |= VM_PAGEEXEC;
93441 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
93442 + }
93443 +#endif
93444 +
93445 /* Can addr have changed??
93446 *
93447 * Answer: Yes, several device drivers can do it in their
93448 @@ -1606,6 +1761,12 @@ munmap_back:
93449 }
93450
93451 vma_link(mm, vma, prev, rb_link, rb_parent);
93452 +
93453 +#ifdef CONFIG_PAX_SEGMEXEC
93454 + if (vma_m)
93455 + BUG_ON(pax_mirror_vma(vma_m, vma));
93456 +#endif
93457 +
93458 /* Once vma denies write, undo our temporary denial count */
93459 if (vm_flags & VM_DENYWRITE)
93460 allow_write_access(file);
93461 @@ -1614,6 +1775,7 @@ out:
93462 perf_event_mmap(vma);
93463
93464 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
93465 + track_exec_limit(mm, addr, addr + len, vm_flags);
93466 if (vm_flags & VM_LOCKED) {
93467 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
93468 vma == get_gate_vma(current->mm)))
93469 @@ -1646,6 +1808,12 @@ unmap_and_free_vma:
93470 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
93471 charged = 0;
93472 free_vma:
93473 +
93474 +#ifdef CONFIG_PAX_SEGMEXEC
93475 + if (vma_m)
93476 + kmem_cache_free(vm_area_cachep, vma_m);
93477 +#endif
93478 +
93479 kmem_cache_free(vm_area_cachep, vma);
93480 unacct_error:
93481 if (charged)
93482 @@ -1653,7 +1821,63 @@ unacct_error:
93483 return error;
93484 }
93485
93486 -unsigned long unmapped_area(struct vm_unmapped_area_info *info)
93487 +#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
93488 +unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
93489 +{
93490 + if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
93491 + return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
93492 +
93493 + return 0;
93494 +}
93495 +#endif
93496 +
93497 +bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
93498 +{
93499 + if (!vma) {
93500 +#ifdef CONFIG_STACK_GROWSUP
93501 + if (addr > sysctl_heap_stack_gap)
93502 + vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
93503 + else
93504 + vma = find_vma(current->mm, 0);
93505 + if (vma && (vma->vm_flags & VM_GROWSUP))
93506 + return false;
93507 +#endif
93508 + return true;
93509 + }
93510 +
93511 + if (addr + len > vma->vm_start)
93512 + return false;
93513 +
93514 + if (vma->vm_flags & VM_GROWSDOWN)
93515 + return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
93516 +#ifdef CONFIG_STACK_GROWSUP
93517 + else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
93518 + return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
93519 +#endif
93520 + else if (offset)
93521 + return offset <= vma->vm_start - addr - len;
93522 +
93523 + return true;
93524 +}
93525 +
93526 +unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
93527 +{
93528 + if (vma->vm_start < len)
93529 + return -ENOMEM;
93530 +
93531 + if (!(vma->vm_flags & VM_GROWSDOWN)) {
93532 + if (offset <= vma->vm_start - len)
93533 + return vma->vm_start - len - offset;
93534 + else
93535 + return -ENOMEM;
93536 + }
93537 +
93538 + if (sysctl_heap_stack_gap <= vma->vm_start - len)
93539 + return vma->vm_start - len - sysctl_heap_stack_gap;
93540 + return -ENOMEM;
93541 +}
93542 +
93543 +unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
93544 {
93545 /*
93546 * We implement the search by looking for an rbtree node that
93547 @@ -1701,11 +1925,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
93548 }
93549 }
93550
93551 - gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
93552 + gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
93553 check_current:
93554 /* Check if current node has a suitable gap */
93555 if (gap_start > high_limit)
93556 return -ENOMEM;
93557 +
93558 + if (gap_end - gap_start > info->threadstack_offset)
93559 + gap_start += info->threadstack_offset;
93560 + else
93561 + gap_start = gap_end;
93562 +
93563 + if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
93564 + if (gap_end - gap_start > sysctl_heap_stack_gap)
93565 + gap_start += sysctl_heap_stack_gap;
93566 + else
93567 + gap_start = gap_end;
93568 + }
93569 + if (vma->vm_flags & VM_GROWSDOWN) {
93570 + if (gap_end - gap_start > sysctl_heap_stack_gap)
93571 + gap_end -= sysctl_heap_stack_gap;
93572 + else
93573 + gap_end = gap_start;
93574 + }
93575 if (gap_end >= low_limit && gap_end - gap_start >= length)
93576 goto found;
93577
93578 @@ -1755,7 +1997,7 @@ found:
93579 return gap_start;
93580 }
93581
93582 -unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
93583 +unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
93584 {
93585 struct mm_struct *mm = current->mm;
93586 struct vm_area_struct *vma;
93587 @@ -1809,6 +2051,24 @@ check_current:
93588 gap_end = vma->vm_start;
93589 if (gap_end < low_limit)
93590 return -ENOMEM;
93591 +
93592 + if (gap_end - gap_start > info->threadstack_offset)
93593 + gap_end -= info->threadstack_offset;
93594 + else
93595 + gap_end = gap_start;
93596 +
93597 + if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
93598 + if (gap_end - gap_start > sysctl_heap_stack_gap)
93599 + gap_start += sysctl_heap_stack_gap;
93600 + else
93601 + gap_start = gap_end;
93602 + }
93603 + if (vma->vm_flags & VM_GROWSDOWN) {
93604 + if (gap_end - gap_start > sysctl_heap_stack_gap)
93605 + gap_end -= sysctl_heap_stack_gap;
93606 + else
93607 + gap_end = gap_start;
93608 + }
93609 if (gap_start <= high_limit && gap_end - gap_start >= length)
93610 goto found;
93611
93612 @@ -1872,6 +2132,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
93613 struct mm_struct *mm = current->mm;
93614 struct vm_area_struct *vma;
93615 struct vm_unmapped_area_info info;
93616 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
93617
93618 if (len > TASK_SIZE - mmap_min_addr)
93619 return -ENOMEM;
93620 @@ -1879,11 +2140,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
93621 if (flags & MAP_FIXED)
93622 return addr;
93623
93624 +#ifdef CONFIG_PAX_RANDMMAP
93625 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
93626 +#endif
93627 +
93628 if (addr) {
93629 addr = PAGE_ALIGN(addr);
93630 vma = find_vma(mm, addr);
93631 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
93632 - (!vma || addr + len <= vma->vm_start))
93633 + check_heap_stack_gap(vma, addr, len, offset))
93634 return addr;
93635 }
93636
93637 @@ -1892,6 +2157,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
93638 info.low_limit = mm->mmap_base;
93639 info.high_limit = TASK_SIZE;
93640 info.align_mask = 0;
93641 + info.threadstack_offset = offset;
93642 return vm_unmapped_area(&info);
93643 }
93644 #endif
93645 @@ -1910,6 +2176,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
93646 struct mm_struct *mm = current->mm;
93647 unsigned long addr = addr0;
93648 struct vm_unmapped_area_info info;
93649 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
93650
93651 /* requested length too big for entire address space */
93652 if (len > TASK_SIZE - mmap_min_addr)
93653 @@ -1918,12 +2185,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
93654 if (flags & MAP_FIXED)
93655 return addr;
93656
93657 +#ifdef CONFIG_PAX_RANDMMAP
93658 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
93659 +#endif
93660 +
93661 /* requesting a specific address */
93662 if (addr) {
93663 addr = PAGE_ALIGN(addr);
93664 vma = find_vma(mm, addr);
93665 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
93666 - (!vma || addr + len <= vma->vm_start))
93667 + check_heap_stack_gap(vma, addr, len, offset))
93668 return addr;
93669 }
93670
93671 @@ -1932,6 +2203,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
93672 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
93673 info.high_limit = mm->mmap_base;
93674 info.align_mask = 0;
93675 + info.threadstack_offset = offset;
93676 addr = vm_unmapped_area(&info);
93677
93678 /*
93679 @@ -1944,6 +2216,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
93680 VM_BUG_ON(addr != -ENOMEM);
93681 info.flags = 0;
93682 info.low_limit = TASK_UNMAPPED_BASE;
93683 +
93684 +#ifdef CONFIG_PAX_RANDMMAP
93685 + if (mm->pax_flags & MF_PAX_RANDMMAP)
93686 + info.low_limit += mm->delta_mmap;
93687 +#endif
93688 +
93689 info.high_limit = TASK_SIZE;
93690 addr = vm_unmapped_area(&info);
93691 }
93692 @@ -2045,6 +2323,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
93693 return vma;
93694 }
93695
93696 +#ifdef CONFIG_PAX_SEGMEXEC
93697 +struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
93698 +{
93699 + struct vm_area_struct *vma_m;
93700 +
93701 + BUG_ON(!vma || vma->vm_start >= vma->vm_end);
93702 + if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
93703 + BUG_ON(vma->vm_mirror);
93704 + return NULL;
93705 + }
93706 + BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
93707 + vma_m = vma->vm_mirror;
93708 + BUG_ON(!vma_m || vma_m->vm_mirror != vma);
93709 + BUG_ON(vma->vm_file != vma_m->vm_file);
93710 + BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
93711 + BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
93712 + BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
93713 + BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
93714 + return vma_m;
93715 +}
93716 +#endif
93717 +
93718 /*
93719 * Verify that the stack growth is acceptable and
93720 * update accounting. This is shared with both the
93721 @@ -2061,6 +2361,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
93722 return -ENOMEM;
93723
93724 /* Stack limit test */
93725 + gr_learn_resource(current, RLIMIT_STACK, size, 1);
93726 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
93727 return -ENOMEM;
93728
93729 @@ -2071,6 +2372,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
93730 locked = mm->locked_vm + grow;
93731 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
93732 limit >>= PAGE_SHIFT;
93733 + gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
93734 if (locked > limit && !capable(CAP_IPC_LOCK))
93735 return -ENOMEM;
93736 }
93737 @@ -2100,37 +2402,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
93738 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
93739 * vma is the last one with address > vma->vm_end. Have to extend vma.
93740 */
93741 +#ifndef CONFIG_IA64
93742 +static
93743 +#endif
93744 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
93745 {
93746 int error;
93747 + bool locknext;
93748
93749 if (!(vma->vm_flags & VM_GROWSUP))
93750 return -EFAULT;
93751
93752 + /* Also guard against wrapping around to address 0. */
93753 + if (address < PAGE_ALIGN(address+1))
93754 + address = PAGE_ALIGN(address+1);
93755 + else
93756 + return -ENOMEM;
93757 +
93758 /*
93759 * We must make sure the anon_vma is allocated
93760 * so that the anon_vma locking is not a noop.
93761 */
93762 if (unlikely(anon_vma_prepare(vma)))
93763 return -ENOMEM;
93764 + locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
93765 + if (locknext && anon_vma_prepare(vma->vm_next))
93766 + return -ENOMEM;
93767 vma_lock_anon_vma(vma);
93768 + if (locknext)
93769 + vma_lock_anon_vma(vma->vm_next);
93770
93771 /*
93772 * vma->vm_start/vm_end cannot change under us because the caller
93773 * is required to hold the mmap_sem in read mode. We need the
93774 - * anon_vma lock to serialize against concurrent expand_stacks.
93775 - * Also guard against wrapping around to address 0.
93776 + * anon_vma locks to serialize against concurrent expand_stacks
93777 + * and expand_upwards.
93778 */
93779 - if (address < PAGE_ALIGN(address+4))
93780 - address = PAGE_ALIGN(address+4);
93781 - else {
93782 - vma_unlock_anon_vma(vma);
93783 - return -ENOMEM;
93784 - }
93785 error = 0;
93786
93787 /* Somebody else might have raced and expanded it already */
93788 - if (address > vma->vm_end) {
93789 + 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)
93790 + error = -ENOMEM;
93791 + else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
93792 unsigned long size, grow;
93793
93794 size = address - vma->vm_start;
93795 @@ -2165,6 +2478,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
93796 }
93797 }
93798 }
93799 + if (locknext)
93800 + vma_unlock_anon_vma(vma->vm_next);
93801 vma_unlock_anon_vma(vma);
93802 khugepaged_enter_vma_merge(vma);
93803 validate_mm(vma->vm_mm);
93804 @@ -2179,6 +2494,8 @@ int expand_downwards(struct vm_area_struct *vma,
93805 unsigned long address)
93806 {
93807 int error;
93808 + bool lockprev = false;
93809 + struct vm_area_struct *prev;
93810
93811 /*
93812 * We must make sure the anon_vma is allocated
93813 @@ -2192,6 +2509,15 @@ int expand_downwards(struct vm_area_struct *vma,
93814 if (error)
93815 return error;
93816
93817 + prev = vma->vm_prev;
93818 +#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
93819 + lockprev = prev && (prev->vm_flags & VM_GROWSUP);
93820 +#endif
93821 + if (lockprev && anon_vma_prepare(prev))
93822 + return -ENOMEM;
93823 + if (lockprev)
93824 + vma_lock_anon_vma(prev);
93825 +
93826 vma_lock_anon_vma(vma);
93827
93828 /*
93829 @@ -2201,9 +2527,17 @@ int expand_downwards(struct vm_area_struct *vma,
93830 */
93831
93832 /* Somebody else might have raced and expanded it already */
93833 - if (address < vma->vm_start) {
93834 + if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
93835 + error = -ENOMEM;
93836 + else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
93837 unsigned long size, grow;
93838
93839 +#ifdef CONFIG_PAX_SEGMEXEC
93840 + struct vm_area_struct *vma_m;
93841 +
93842 + vma_m = pax_find_mirror_vma(vma);
93843 +#endif
93844 +
93845 size = vma->vm_end - address;
93846 grow = (vma->vm_start - address) >> PAGE_SHIFT;
93847
93848 @@ -2228,13 +2562,27 @@ int expand_downwards(struct vm_area_struct *vma,
93849 vma->vm_pgoff -= grow;
93850 anon_vma_interval_tree_post_update_vma(vma);
93851 vma_gap_update(vma);
93852 +
93853 +#ifdef CONFIG_PAX_SEGMEXEC
93854 + if (vma_m) {
93855 + anon_vma_interval_tree_pre_update_vma(vma_m);
93856 + vma_m->vm_start -= grow << PAGE_SHIFT;
93857 + vma_m->vm_pgoff -= grow;
93858 + anon_vma_interval_tree_post_update_vma(vma_m);
93859 + vma_gap_update(vma_m);
93860 + }
93861 +#endif
93862 +
93863 spin_unlock(&vma->vm_mm->page_table_lock);
93864
93865 + track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
93866 perf_event_mmap(vma);
93867 }
93868 }
93869 }
93870 vma_unlock_anon_vma(vma);
93871 + if (lockprev)
93872 + vma_unlock_anon_vma(prev);
93873 khugepaged_enter_vma_merge(vma);
93874 validate_mm(vma->vm_mm);
93875 return error;
93876 @@ -2332,6 +2680,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
93877 do {
93878 long nrpages = vma_pages(vma);
93879
93880 +#ifdef CONFIG_PAX_SEGMEXEC
93881 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
93882 + vma = remove_vma(vma);
93883 + continue;
93884 + }
93885 +#endif
93886 +
93887 if (vma->vm_flags & VM_ACCOUNT)
93888 nr_accounted += nrpages;
93889 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
93890 @@ -2376,6 +2731,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
93891 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
93892 vma->vm_prev = NULL;
93893 do {
93894 +
93895 +#ifdef CONFIG_PAX_SEGMEXEC
93896 + if (vma->vm_mirror) {
93897 + BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
93898 + vma->vm_mirror->vm_mirror = NULL;
93899 + vma->vm_mirror->vm_flags &= ~VM_EXEC;
93900 + vma->vm_mirror = NULL;
93901 + }
93902 +#endif
93903 +
93904 vma_rb_erase(vma, &mm->mm_rb);
93905 mm->map_count--;
93906 tail_vma = vma;
93907 @@ -2401,14 +2766,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
93908 struct vm_area_struct *new;
93909 int err = -ENOMEM;
93910
93911 +#ifdef CONFIG_PAX_SEGMEXEC
93912 + struct vm_area_struct *vma_m, *new_m = NULL;
93913 + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
93914 +#endif
93915 +
93916 if (is_vm_hugetlb_page(vma) && (addr &
93917 ~(huge_page_mask(hstate_vma(vma)))))
93918 return -EINVAL;
93919
93920 +#ifdef CONFIG_PAX_SEGMEXEC
93921 + vma_m = pax_find_mirror_vma(vma);
93922 +#endif
93923 +
93924 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
93925 if (!new)
93926 goto out_err;
93927
93928 +#ifdef CONFIG_PAX_SEGMEXEC
93929 + if (vma_m) {
93930 + new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
93931 + if (!new_m) {
93932 + kmem_cache_free(vm_area_cachep, new);
93933 + goto out_err;
93934 + }
93935 + }
93936 +#endif
93937 +
93938 /* most fields are the same, copy all, and then fixup */
93939 *new = *vma;
93940
93941 @@ -2421,6 +2805,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
93942 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
93943 }
93944
93945 +#ifdef CONFIG_PAX_SEGMEXEC
93946 + if (vma_m) {
93947 + *new_m = *vma_m;
93948 + INIT_LIST_HEAD(&new_m->anon_vma_chain);
93949 + new_m->vm_mirror = new;
93950 + new->vm_mirror = new_m;
93951 +
93952 + if (new_below)
93953 + new_m->vm_end = addr_m;
93954 + else {
93955 + new_m->vm_start = addr_m;
93956 + new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
93957 + }
93958 + }
93959 +#endif
93960 +
93961 err = vma_dup_policy(vma, new);
93962 if (err)
93963 goto out_free_vma;
93964 @@ -2440,6 +2840,38 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
93965 else
93966 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
93967
93968 +#ifdef CONFIG_PAX_SEGMEXEC
93969 + if (!err && vma_m) {
93970 + struct mempolicy *pol = vma_policy(new);
93971 +
93972 + if (anon_vma_clone(new_m, vma_m))
93973 + goto out_free_mpol;
93974 +
93975 + mpol_get(pol);
93976 + set_vma_policy(new_m, pol);
93977 +
93978 + if (new_m->vm_file)
93979 + get_file(new_m->vm_file);
93980 +
93981 + if (new_m->vm_ops && new_m->vm_ops->open)
93982 + new_m->vm_ops->open(new_m);
93983 +
93984 + if (new_below)
93985 + err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
93986 + ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
93987 + else
93988 + err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
93989 +
93990 + if (err) {
93991 + if (new_m->vm_ops && new_m->vm_ops->close)
93992 + new_m->vm_ops->close(new_m);
93993 + if (new_m->vm_file)
93994 + fput(new_m->vm_file);
93995 + mpol_put(pol);
93996 + }
93997 + }
93998 +#endif
93999 +
94000 /* Success. */
94001 if (!err)
94002 return 0;
94003 @@ -2449,10 +2881,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
94004 new->vm_ops->close(new);
94005 if (new->vm_file)
94006 fput(new->vm_file);
94007 - unlink_anon_vmas(new);
94008 out_free_mpol:
94009 mpol_put(vma_policy(new));
94010 out_free_vma:
94011 +
94012 +#ifdef CONFIG_PAX_SEGMEXEC
94013 + if (new_m) {
94014 + unlink_anon_vmas(new_m);
94015 + kmem_cache_free(vm_area_cachep, new_m);
94016 + }
94017 +#endif
94018 +
94019 + unlink_anon_vmas(new);
94020 kmem_cache_free(vm_area_cachep, new);
94021 out_err:
94022 return err;
94023 @@ -2465,6 +2905,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
94024 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
94025 unsigned long addr, int new_below)
94026 {
94027 +
94028 +#ifdef CONFIG_PAX_SEGMEXEC
94029 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
94030 + BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
94031 + if (mm->map_count >= sysctl_max_map_count-1)
94032 + return -ENOMEM;
94033 + } else
94034 +#endif
94035 +
94036 if (mm->map_count >= sysctl_max_map_count)
94037 return -ENOMEM;
94038
94039 @@ -2476,11 +2925,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
94040 * work. This now handles partial unmappings.
94041 * Jeremy Fitzhardinge <jeremy@goop.org>
94042 */
94043 +#ifdef CONFIG_PAX_SEGMEXEC
94044 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
94045 {
94046 + int ret = __do_munmap(mm, start, len);
94047 + if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
94048 + return ret;
94049 +
94050 + return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
94051 +}
94052 +
94053 +int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
94054 +#else
94055 +int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
94056 +#endif
94057 +{
94058 unsigned long end;
94059 struct vm_area_struct *vma, *prev, *last;
94060
94061 + /*
94062 + * mm->mmap_sem is required to protect against another thread
94063 + * changing the mappings in case we sleep.
94064 + */
94065 + verify_mm_writelocked(mm);
94066 +
94067 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
94068 return -EINVAL;
94069
94070 @@ -2555,6 +3023,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
94071 /* Fix up all other VM information */
94072 remove_vma_list(mm, vma);
94073
94074 + track_exec_limit(mm, start, end, 0UL);
94075 +
94076 return 0;
94077 }
94078
94079 @@ -2563,6 +3033,13 @@ int vm_munmap(unsigned long start, size_t len)
94080 int ret;
94081 struct mm_struct *mm = current->mm;
94082
94083 +
94084 +#ifdef CONFIG_PAX_SEGMEXEC
94085 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
94086 + (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
94087 + return -EINVAL;
94088 +#endif
94089 +
94090 down_write(&mm->mmap_sem);
94091 ret = do_munmap(mm, start, len);
94092 up_write(&mm->mmap_sem);
94093 @@ -2576,16 +3053,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
94094 return vm_munmap(addr, len);
94095 }
94096
94097 -static inline void verify_mm_writelocked(struct mm_struct *mm)
94098 -{
94099 -#ifdef CONFIG_DEBUG_VM
94100 - if (unlikely(down_read_trylock(&mm->mmap_sem))) {
94101 - WARN_ON(1);
94102 - up_read(&mm->mmap_sem);
94103 - }
94104 -#endif
94105 -}
94106 -
94107 /*
94108 * this is really a simplified "do_mmap". it only handles
94109 * anonymous maps. eventually we may be able to do some
94110 @@ -2599,6 +3066,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
94111 struct rb_node ** rb_link, * rb_parent;
94112 pgoff_t pgoff = addr >> PAGE_SHIFT;
94113 int error;
94114 + unsigned long charged;
94115
94116 len = PAGE_ALIGN(len);
94117 if (!len)
94118 @@ -2606,10 +3074,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
94119
94120 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
94121
94122 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
94123 + if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
94124 + flags &= ~VM_EXEC;
94125 +
94126 +#ifdef CONFIG_PAX_MPROTECT
94127 + if (mm->pax_flags & MF_PAX_MPROTECT)
94128 + flags &= ~VM_MAYEXEC;
94129 +#endif
94130 +
94131 + }
94132 +#endif
94133 +
94134 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
94135 if (error & ~PAGE_MASK)
94136 return error;
94137
94138 + charged = len >> PAGE_SHIFT;
94139 +
94140 error = mlock_future_check(mm, mm->def_flags, len);
94141 if (error)
94142 return error;
94143 @@ -2623,21 +3105,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
94144 /*
94145 * Clear old maps. this also does some error checking for us
94146 */
94147 - munmap_back:
94148 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
94149 if (do_munmap(mm, addr, len))
94150 return -ENOMEM;
94151 - goto munmap_back;
94152 + BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
94153 }
94154
94155 /* Check against address space limits *after* clearing old maps... */
94156 - if (!may_expand_vm(mm, len >> PAGE_SHIFT))
94157 + if (!may_expand_vm(mm, charged))
94158 return -ENOMEM;
94159
94160 if (mm->map_count > sysctl_max_map_count)
94161 return -ENOMEM;
94162
94163 - if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
94164 + if (security_vm_enough_memory_mm(mm, charged))
94165 return -ENOMEM;
94166
94167 /* Can we just expand an old private anonymous mapping? */
94168 @@ -2651,7 +3132,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
94169 */
94170 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
94171 if (!vma) {
94172 - vm_unacct_memory(len >> PAGE_SHIFT);
94173 + vm_unacct_memory(charged);
94174 return -ENOMEM;
94175 }
94176
94177 @@ -2665,10 +3146,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
94178 vma_link(mm, vma, prev, rb_link, rb_parent);
94179 out:
94180 perf_event_mmap(vma);
94181 - mm->total_vm += len >> PAGE_SHIFT;
94182 + mm->total_vm += charged;
94183 if (flags & VM_LOCKED)
94184 - mm->locked_vm += (len >> PAGE_SHIFT);
94185 + mm->locked_vm += charged;
94186 vma->vm_flags |= VM_SOFTDIRTY;
94187 + track_exec_limit(mm, addr, addr + len, flags);
94188 return addr;
94189 }
94190
94191 @@ -2730,6 +3212,7 @@ void exit_mmap(struct mm_struct *mm)
94192 while (vma) {
94193 if (vma->vm_flags & VM_ACCOUNT)
94194 nr_accounted += vma_pages(vma);
94195 + vma->vm_mirror = NULL;
94196 vma = remove_vma(vma);
94197 }
94198 vm_unacct_memory(nr_accounted);
94199 @@ -2747,6 +3230,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
94200 struct vm_area_struct *prev;
94201 struct rb_node **rb_link, *rb_parent;
94202
94203 +#ifdef CONFIG_PAX_SEGMEXEC
94204 + struct vm_area_struct *vma_m = NULL;
94205 +#endif
94206 +
94207 + if (security_mmap_addr(vma->vm_start))
94208 + return -EPERM;
94209 +
94210 /*
94211 * The vm_pgoff of a purely anonymous vma should be irrelevant
94212 * until its first write fault, when page's anon_vma and index
94213 @@ -2770,7 +3260,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
94214 security_vm_enough_memory_mm(mm, vma_pages(vma)))
94215 return -ENOMEM;
94216
94217 +#ifdef CONFIG_PAX_SEGMEXEC
94218 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
94219 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
94220 + if (!vma_m)
94221 + return -ENOMEM;
94222 + }
94223 +#endif
94224 +
94225 vma_link(mm, vma, prev, rb_link, rb_parent);
94226 +
94227 +#ifdef CONFIG_PAX_SEGMEXEC
94228 + if (vma_m)
94229 + BUG_ON(pax_mirror_vma(vma_m, vma));
94230 +#endif
94231 +
94232 return 0;
94233 }
94234
94235 @@ -2789,6 +3293,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
94236 struct rb_node **rb_link, *rb_parent;
94237 bool faulted_in_anon_vma = true;
94238
94239 + BUG_ON(vma->vm_mirror);
94240 +
94241 /*
94242 * If anonymous vma has not yet been faulted, update new pgoff
94243 * to match new location, to increase its chance of merging.
94244 @@ -2853,6 +3359,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
94245 return NULL;
94246 }
94247
94248 +#ifdef CONFIG_PAX_SEGMEXEC
94249 +long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
94250 +{
94251 + struct vm_area_struct *prev_m;
94252 + struct rb_node **rb_link_m, *rb_parent_m;
94253 + struct mempolicy *pol_m;
94254 +
94255 + BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
94256 + BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
94257 + BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
94258 + *vma_m = *vma;
94259 + INIT_LIST_HEAD(&vma_m->anon_vma_chain);
94260 + if (anon_vma_clone(vma_m, vma))
94261 + return -ENOMEM;
94262 + pol_m = vma_policy(vma_m);
94263 + mpol_get(pol_m);
94264 + set_vma_policy(vma_m, pol_m);
94265 + vma_m->vm_start += SEGMEXEC_TASK_SIZE;
94266 + vma_m->vm_end += SEGMEXEC_TASK_SIZE;
94267 + vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
94268 + vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
94269 + if (vma_m->vm_file)
94270 + get_file(vma_m->vm_file);
94271 + if (vma_m->vm_ops && vma_m->vm_ops->open)
94272 + vma_m->vm_ops->open(vma_m);
94273 + BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
94274 + vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
94275 + vma_m->vm_mirror = vma;
94276 + vma->vm_mirror = vma_m;
94277 + return 0;
94278 +}
94279 +#endif
94280 +
94281 /*
94282 * Return true if the calling process may expand its vm space by the passed
94283 * number of pages
94284 @@ -2864,6 +3403,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
94285
94286 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
94287
94288 + gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
94289 if (cur + npages > lim)
94290 return 0;
94291 return 1;
94292 @@ -2934,6 +3474,22 @@ int install_special_mapping(struct mm_struct *mm,
94293 vma->vm_start = addr;
94294 vma->vm_end = addr + len;
94295
94296 +#ifdef CONFIG_PAX_MPROTECT
94297 + if (mm->pax_flags & MF_PAX_MPROTECT) {
94298 +#ifndef CONFIG_PAX_MPROTECT_COMPAT
94299 + if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
94300 + return -EPERM;
94301 + if (!(vm_flags & VM_EXEC))
94302 + vm_flags &= ~VM_MAYEXEC;
94303 +#else
94304 + if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
94305 + vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
94306 +#endif
94307 + else
94308 + vm_flags &= ~VM_MAYWRITE;
94309 + }
94310 +#endif
94311 +
94312 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
94313 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
94314
94315 diff --git a/mm/mprotect.c b/mm/mprotect.c
94316 index 769a67a..414d24f 100644
94317 --- a/mm/mprotect.c
94318 +++ b/mm/mprotect.c
94319 @@ -24,10 +24,18 @@
94320 #include <linux/migrate.h>
94321 #include <linux/perf_event.h>
94322 #include <linux/ksm.h>
94323 +#include <linux/sched/sysctl.h>
94324 +
94325 +#ifdef CONFIG_PAX_MPROTECT
94326 +#include <linux/elf.h>
94327 +#include <linux/binfmts.h>
94328 +#endif
94329 +
94330 #include <asm/uaccess.h>
94331 #include <asm/pgtable.h>
94332 #include <asm/cacheflush.h>
94333 #include <asm/tlbflush.h>
94334 +#include <asm/mmu_context.h>
94335
94336 #ifndef pgprot_modify
94337 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
94338 @@ -214,6 +222,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
94339 return pages;
94340 }
94341
94342 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
94343 +/* called while holding the mmap semaphor for writing except stack expansion */
94344 +void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
94345 +{
94346 + unsigned long oldlimit, newlimit = 0UL;
94347 +
94348 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
94349 + return;
94350 +
94351 + spin_lock(&mm->page_table_lock);
94352 + oldlimit = mm->context.user_cs_limit;
94353 + if ((prot & VM_EXEC) && oldlimit < end)
94354 + /* USER_CS limit moved up */
94355 + newlimit = end;
94356 + else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
94357 + /* USER_CS limit moved down */
94358 + newlimit = start;
94359 +
94360 + if (newlimit) {
94361 + mm->context.user_cs_limit = newlimit;
94362 +
94363 +#ifdef CONFIG_SMP
94364 + wmb();
94365 + cpus_clear(mm->context.cpu_user_cs_mask);
94366 + cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
94367 +#endif
94368 +
94369 + set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
94370 + }
94371 + spin_unlock(&mm->page_table_lock);
94372 + if (newlimit == end) {
94373 + struct vm_area_struct *vma = find_vma(mm, oldlimit);
94374 +
94375 + for (; vma && vma->vm_start < end; vma = vma->vm_next)
94376 + if (is_vm_hugetlb_page(vma))
94377 + hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
94378 + else
94379 + change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
94380 + }
94381 +}
94382 +#endif
94383 +
94384 int
94385 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
94386 unsigned long start, unsigned long end, unsigned long newflags)
94387 @@ -226,11 +276,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
94388 int error;
94389 int dirty_accountable = 0;
94390
94391 +#ifdef CONFIG_PAX_SEGMEXEC
94392 + struct vm_area_struct *vma_m = NULL;
94393 + unsigned long start_m, end_m;
94394 +
94395 + start_m = start + SEGMEXEC_TASK_SIZE;
94396 + end_m = end + SEGMEXEC_TASK_SIZE;
94397 +#endif
94398 +
94399 if (newflags == oldflags) {
94400 *pprev = vma;
94401 return 0;
94402 }
94403
94404 + if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
94405 + struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
94406 +
94407 + if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
94408 + return -ENOMEM;
94409 +
94410 + if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
94411 + return -ENOMEM;
94412 + }
94413 +
94414 /*
94415 * If we make a private mapping writable we increase our commit;
94416 * but (without finer accounting) cannot reduce our commit if we
94417 @@ -247,6 +315,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
94418 }
94419 }
94420
94421 +#ifdef CONFIG_PAX_SEGMEXEC
94422 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
94423 + if (start != vma->vm_start) {
94424 + error = split_vma(mm, vma, start, 1);
94425 + if (error)
94426 + goto fail;
94427 + BUG_ON(!*pprev || (*pprev)->vm_next == vma);
94428 + *pprev = (*pprev)->vm_next;
94429 + }
94430 +
94431 + if (end != vma->vm_end) {
94432 + error = split_vma(mm, vma, end, 0);
94433 + if (error)
94434 + goto fail;
94435 + }
94436 +
94437 + if (pax_find_mirror_vma(vma)) {
94438 + error = __do_munmap(mm, start_m, end_m - start_m);
94439 + if (error)
94440 + goto fail;
94441 + } else {
94442 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
94443 + if (!vma_m) {
94444 + error = -ENOMEM;
94445 + goto fail;
94446 + }
94447 + vma->vm_flags = newflags;
94448 + error = pax_mirror_vma(vma_m, vma);
94449 + if (error) {
94450 + vma->vm_flags = oldflags;
94451 + goto fail;
94452 + }
94453 + }
94454 + }
94455 +#endif
94456 +
94457 /*
94458 * First try to merge with previous and/or next vma.
94459 */
94460 @@ -277,9 +381,21 @@ success:
94461 * vm_flags and vm_page_prot are protected by the mmap_sem
94462 * held in write mode.
94463 */
94464 +
94465 +#ifdef CONFIG_PAX_SEGMEXEC
94466 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
94467 + pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
94468 +#endif
94469 +
94470 vma->vm_flags = newflags;
94471 +
94472 +#ifdef CONFIG_PAX_MPROTECT
94473 + if (mm->binfmt && mm->binfmt->handle_mprotect)
94474 + mm->binfmt->handle_mprotect(vma, newflags);
94475 +#endif
94476 +
94477 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
94478 - vm_get_page_prot(newflags));
94479 + vm_get_page_prot(vma->vm_flags));
94480
94481 if (vma_wants_writenotify(vma)) {
94482 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
94483 @@ -318,6 +434,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
94484 end = start + len;
94485 if (end <= start)
94486 return -ENOMEM;
94487 +
94488 +#ifdef CONFIG_PAX_SEGMEXEC
94489 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
94490 + if (end > SEGMEXEC_TASK_SIZE)
94491 + return -EINVAL;
94492 + } else
94493 +#endif
94494 +
94495 + if (end > TASK_SIZE)
94496 + return -EINVAL;
94497 +
94498 if (!arch_validate_prot(prot))
94499 return -EINVAL;
94500
94501 @@ -325,7 +452,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
94502 /*
94503 * Does the application expect PROT_READ to imply PROT_EXEC:
94504 */
94505 - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
94506 + if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
94507 prot |= PROT_EXEC;
94508
94509 vm_flags = calc_vm_prot_bits(prot);
94510 @@ -357,6 +484,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
94511 if (start > vma->vm_start)
94512 prev = vma;
94513
94514 +#ifdef CONFIG_PAX_MPROTECT
94515 + if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
94516 + current->mm->binfmt->handle_mprotect(vma, vm_flags);
94517 +#endif
94518 +
94519 for (nstart = start ; ; ) {
94520 unsigned long newflags;
94521
94522 @@ -367,6 +499,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
94523
94524 /* newflags >> 4 shift VM_MAY% in place of VM_% */
94525 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
94526 + if (prot & (PROT_WRITE | PROT_EXEC))
94527 + gr_log_rwxmprotect(vma);
94528 +
94529 + error = -EACCES;
94530 + goto out;
94531 + }
94532 +
94533 + if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
94534 error = -EACCES;
94535 goto out;
94536 }
94537 @@ -381,6 +521,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
94538 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
94539 if (error)
94540 goto out;
94541 +
94542 + track_exec_limit(current->mm, nstart, tmp, vm_flags);
94543 +
94544 nstart = tmp;
94545
94546 if (nstart < prev->vm_end)
94547 diff --git a/mm/mremap.c b/mm/mremap.c
94548 index 0843feb..4f5b2e6 100644
94549 --- a/mm/mremap.c
94550 +++ b/mm/mremap.c
94551 @@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
94552 continue;
94553 pte = ptep_get_and_clear(mm, old_addr, old_pte);
94554 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
94555 +
94556 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
94557 + if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
94558 + pte = pte_exprotect(pte);
94559 +#endif
94560 +
94561 pte = move_soft_dirty_pte(pte);
94562 set_pte_at(mm, new_addr, new_pte, pte);
94563 }
94564 @@ -337,6 +343,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
94565 if (is_vm_hugetlb_page(vma))
94566 goto Einval;
94567
94568 +#ifdef CONFIG_PAX_SEGMEXEC
94569 + if (pax_find_mirror_vma(vma))
94570 + goto Einval;
94571 +#endif
94572 +
94573 /* We can't remap across vm area boundaries */
94574 if (old_len > vma->vm_end - addr)
94575 goto Efault;
94576 @@ -392,20 +403,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
94577 unsigned long ret = -EINVAL;
94578 unsigned long charged = 0;
94579 unsigned long map_flags;
94580 + unsigned long pax_task_size = TASK_SIZE;
94581
94582 if (new_addr & ~PAGE_MASK)
94583 goto out;
94584
94585 - if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
94586 +#ifdef CONFIG_PAX_SEGMEXEC
94587 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
94588 + pax_task_size = SEGMEXEC_TASK_SIZE;
94589 +#endif
94590 +
94591 + pax_task_size -= PAGE_SIZE;
94592 +
94593 + if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
94594 goto out;
94595
94596 /* Check if the location we're moving into overlaps the
94597 * old location at all, and fail if it does.
94598 */
94599 - if ((new_addr <= addr) && (new_addr+new_len) > addr)
94600 - goto out;
94601 -
94602 - if ((addr <= new_addr) && (addr+old_len) > new_addr)
94603 + if (addr + old_len > new_addr && new_addr + new_len > addr)
94604 goto out;
94605
94606 ret = do_munmap(mm, new_addr, new_len);
94607 @@ -474,6 +490,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
94608 unsigned long ret = -EINVAL;
94609 unsigned long charged = 0;
94610 bool locked = false;
94611 + unsigned long pax_task_size = TASK_SIZE;
94612
94613 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
94614 return ret;
94615 @@ -495,6 +512,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
94616 if (!new_len)
94617 return ret;
94618
94619 +#ifdef CONFIG_PAX_SEGMEXEC
94620 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
94621 + pax_task_size = SEGMEXEC_TASK_SIZE;
94622 +#endif
94623 +
94624 + pax_task_size -= PAGE_SIZE;
94625 +
94626 + if (new_len > pax_task_size || addr > pax_task_size-new_len ||
94627 + old_len > pax_task_size || addr > pax_task_size-old_len)
94628 + return ret;
94629 +
94630 down_write(&current->mm->mmap_sem);
94631
94632 if (flags & MREMAP_FIXED) {
94633 @@ -545,6 +573,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
94634 new_addr = addr;
94635 }
94636 ret = addr;
94637 + track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
94638 goto out;
94639 }
94640 }
94641 @@ -568,7 +597,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
94642 goto out;
94643 }
94644
94645 + map_flags = vma->vm_flags;
94646 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
94647 + if (!(ret & ~PAGE_MASK)) {
94648 + track_exec_limit(current->mm, addr, addr + old_len, 0UL);
94649 + track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
94650 + }
94651 }
94652 out:
94653 if (ret & ~PAGE_MASK)
94654 diff --git a/mm/nommu.c b/mm/nommu.c
94655 index 8740213..f87e25b 100644
94656 --- a/mm/nommu.c
94657 +++ b/mm/nommu.c
94658 @@ -65,7 +65,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
94659 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
94660 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
94661 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
94662 -int heap_stack_gap = 0;
94663
94664 atomic_long_t mmap_pages_allocated;
94665
94666 @@ -845,15 +844,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
94667 EXPORT_SYMBOL(find_vma);
94668
94669 /*
94670 - * find a VMA
94671 - * - we don't extend stack VMAs under NOMMU conditions
94672 - */
94673 -struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
94674 -{
94675 - return find_vma(mm, addr);
94676 -}
94677 -
94678 -/*
94679 * expand a stack to a given address
94680 * - not supported under NOMMU conditions
94681 */
94682 @@ -1564,6 +1554,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
94683
94684 /* most fields are the same, copy all, and then fixup */
94685 *new = *vma;
94686 + INIT_LIST_HEAD(&new->anon_vma_chain);
94687 *region = *vma->vm_region;
94688 new->vm_region = region;
94689
94690 @@ -1993,8 +1984,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
94691 }
94692 EXPORT_SYMBOL(generic_file_remap_pages);
94693
94694 -static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
94695 - unsigned long addr, void *buf, int len, int write)
94696 +static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
94697 + unsigned long addr, void *buf, size_t len, int write)
94698 {
94699 struct vm_area_struct *vma;
94700
94701 @@ -2035,8 +2026,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
94702 *
94703 * The caller must hold a reference on @mm.
94704 */
94705 -int access_remote_vm(struct mm_struct *mm, unsigned long addr,
94706 - void *buf, int len, int write)
94707 +ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
94708 + void *buf, size_t len, int write)
94709 {
94710 return __access_remote_vm(NULL, mm, addr, buf, len, write);
94711 }
94712 @@ -2045,7 +2036,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
94713 * Access another process' address space.
94714 * - source/target buffer must be kernel space
94715 */
94716 -int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
94717 +ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
94718 {
94719 struct mm_struct *mm;
94720
94721 diff --git a/mm/page-writeback.c b/mm/page-writeback.c
94722 index 7106cb1..0805f48 100644
94723 --- a/mm/page-writeback.c
94724 +++ b/mm/page-writeback.c
94725 @@ -685,7 +685,7 @@ static inline long long pos_ratio_polynom(unsigned long setpoint,
94726 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
94727 * - the bdi dirty thresh drops quickly due to change of JBOD workload
94728 */
94729 -static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
94730 +static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
94731 unsigned long thresh,
94732 unsigned long bg_thresh,
94733 unsigned long dirty,
94734 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
94735 index 3bac76a..bf9f9ae 100644
94736 --- a/mm/page_alloc.c
94737 +++ b/mm/page_alloc.c
94738 @@ -61,6 +61,7 @@
94739 #include <linux/page-debug-flags.h>
94740 #include <linux/hugetlb.h>
94741 #include <linux/sched/rt.h>
94742 +#include <linux/random.h>
94743
94744 #include <asm/sections.h>
94745 #include <asm/tlbflush.h>
94746 @@ -354,7 +355,7 @@ out:
94747 * This usage means that zero-order pages may not be compound.
94748 */
94749
94750 -static void free_compound_page(struct page *page)
94751 +void free_compound_page(struct page *page)
94752 {
94753 __free_pages_ok(page, compound_order(page));
94754 }
94755 @@ -728,6 +729,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
94756 int i;
94757 int bad = 0;
94758
94759 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
94760 + unsigned long index = 1UL << order;
94761 +#endif
94762 +
94763 trace_mm_page_free(page, order);
94764 kmemcheck_free_shadow(page, order);
94765
94766 @@ -744,6 +749,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
94767 debug_check_no_obj_freed(page_address(page),
94768 PAGE_SIZE << order);
94769 }
94770 +
94771 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
94772 + for (; index; --index)
94773 + sanitize_highpage(page + index - 1);
94774 +#endif
94775 +
94776 arch_free_page(page, order);
94777 kernel_map_pages(page, 1 << order, 0);
94778
94779 @@ -766,6 +777,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
94780 local_irq_restore(flags);
94781 }
94782
94783 +#ifdef CONFIG_PAX_LATENT_ENTROPY
94784 +bool __meminitdata extra_latent_entropy;
94785 +
94786 +static int __init setup_pax_extra_latent_entropy(char *str)
94787 +{
94788 + extra_latent_entropy = true;
94789 + return 0;
94790 +}
94791 +early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
94792 +
94793 +volatile u64 latent_entropy __latent_entropy;
94794 +EXPORT_SYMBOL(latent_entropy);
94795 +#endif
94796 +
94797 void __init __free_pages_bootmem(struct page *page, unsigned int order)
94798 {
94799 unsigned int nr_pages = 1 << order;
94800 @@ -781,6 +806,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
94801 __ClearPageReserved(p);
94802 set_page_count(p, 0);
94803
94804 +#ifdef CONFIG_PAX_LATENT_ENTROPY
94805 + if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
94806 + u64 hash = 0;
94807 + size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
94808 + const u64 *data = lowmem_page_address(page);
94809 +
94810 + for (index = 0; index < end; index++)
94811 + hash ^= hash + data[index];
94812 + latent_entropy ^= hash;
94813 + add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
94814 + }
94815 +#endif
94816 +
94817 page_zone(page)->managed_pages += nr_pages;
94818 set_page_refcounted(page);
94819 __free_pages(page, order);
94820 @@ -897,8 +935,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
94821 arch_alloc_page(page, order);
94822 kernel_map_pages(page, 1 << order, 1);
94823
94824 +#ifndef CONFIG_PAX_MEMORY_SANITIZE
94825 if (gfp_flags & __GFP_ZERO)
94826 prep_zero_page(page, order, gfp_flags);
94827 +#endif
94828
94829 if (order && (gfp_flags & __GFP_COMP))
94830 prep_compound_page(page, order);
94831 diff --git a/mm/page_io.c b/mm/page_io.c
94832 index 7c59ef6..1358905 100644
94833 --- a/mm/page_io.c
94834 +++ b/mm/page_io.c
94835 @@ -260,7 +260,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
94836 struct file *swap_file = sis->swap_file;
94837 struct address_space *mapping = swap_file->f_mapping;
94838 struct iovec iov = {
94839 - .iov_base = kmap(page),
94840 + .iov_base = (void __force_user *)kmap(page),
94841 .iov_len = PAGE_SIZE,
94842 };
94843
94844 diff --git a/mm/percpu.c b/mm/percpu.c
94845 index 036cfe0..980d0fa 100644
94846 --- a/mm/percpu.c
94847 +++ b/mm/percpu.c
94848 @@ -122,7 +122,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
94849 static unsigned int pcpu_high_unit_cpu __read_mostly;
94850
94851 /* the address of the first chunk which starts with the kernel static area */
94852 -void *pcpu_base_addr __read_mostly;
94853 +void *pcpu_base_addr __read_only;
94854 EXPORT_SYMBOL_GPL(pcpu_base_addr);
94855
94856 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
94857 diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
94858 index fd26d04..0cea1b0 100644
94859 --- a/mm/process_vm_access.c
94860 +++ b/mm/process_vm_access.c
94861 @@ -13,6 +13,7 @@
94862 #include <linux/uio.h>
94863 #include <linux/sched.h>
94864 #include <linux/highmem.h>
94865 +#include <linux/security.h>
94866 #include <linux/ptrace.h>
94867 #include <linux/slab.h>
94868 #include <linux/syscalls.h>
94869 @@ -258,19 +259,19 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
94870 size_t iov_l_curr_offset = 0;
94871 ssize_t iov_len;
94872
94873 + return -ENOSYS; // PaX: until properly audited
94874 +
94875 /*
94876 * Work out how many pages of struct pages we're going to need
94877 * when eventually calling get_user_pages
94878 */
94879 for (i = 0; i < riovcnt; i++) {
94880 iov_len = rvec[i].iov_len;
94881 - if (iov_len > 0) {
94882 - nr_pages_iov = ((unsigned long)rvec[i].iov_base
94883 - + iov_len)
94884 - / PAGE_SIZE - (unsigned long)rvec[i].iov_base
94885 - / PAGE_SIZE + 1;
94886 - nr_pages = max(nr_pages, nr_pages_iov);
94887 - }
94888 + if (iov_len <= 0)
94889 + continue;
94890 + nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
94891 + (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
94892 + nr_pages = max(nr_pages, nr_pages_iov);
94893 }
94894
94895 if (nr_pages == 0)
94896 @@ -298,6 +299,11 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
94897 goto free_proc_pages;
94898 }
94899
94900 + if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
94901 + rc = -EPERM;
94902 + goto put_task_struct;
94903 + }
94904 +
94905 mm = mm_access(task, PTRACE_MODE_ATTACH);
94906 if (!mm || IS_ERR(mm)) {
94907 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
94908 diff --git a/mm/rmap.c b/mm/rmap.c
94909 index 8fc049f..1b21e12 100644
94910 --- a/mm/rmap.c
94911 +++ b/mm/rmap.c
94912 @@ -163,6 +163,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
94913 struct anon_vma *anon_vma = vma->anon_vma;
94914 struct anon_vma_chain *avc;
94915
94916 +#ifdef CONFIG_PAX_SEGMEXEC
94917 + struct anon_vma_chain *avc_m = NULL;
94918 +#endif
94919 +
94920 might_sleep();
94921 if (unlikely(!anon_vma)) {
94922 struct mm_struct *mm = vma->vm_mm;
94923 @@ -172,6 +176,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
94924 if (!avc)
94925 goto out_enomem;
94926
94927 +#ifdef CONFIG_PAX_SEGMEXEC
94928 + avc_m = anon_vma_chain_alloc(GFP_KERNEL);
94929 + if (!avc_m)
94930 + goto out_enomem_free_avc;
94931 +#endif
94932 +
94933 anon_vma = find_mergeable_anon_vma(vma);
94934 allocated = NULL;
94935 if (!anon_vma) {
94936 @@ -185,6 +195,18 @@ int anon_vma_prepare(struct vm_area_struct *vma)
94937 /* page_table_lock to protect against threads */
94938 spin_lock(&mm->page_table_lock);
94939 if (likely(!vma->anon_vma)) {
94940 +
94941 +#ifdef CONFIG_PAX_SEGMEXEC
94942 + struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
94943 +
94944 + if (vma_m) {
94945 + BUG_ON(vma_m->anon_vma);
94946 + vma_m->anon_vma = anon_vma;
94947 + anon_vma_chain_link(vma_m, avc_m, anon_vma);
94948 + avc_m = NULL;
94949 + }
94950 +#endif
94951 +
94952 vma->anon_vma = anon_vma;
94953 anon_vma_chain_link(vma, avc, anon_vma);
94954 allocated = NULL;
94955 @@ -195,12 +217,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
94956
94957 if (unlikely(allocated))
94958 put_anon_vma(allocated);
94959 +
94960 +#ifdef CONFIG_PAX_SEGMEXEC
94961 + if (unlikely(avc_m))
94962 + anon_vma_chain_free(avc_m);
94963 +#endif
94964 +
94965 if (unlikely(avc))
94966 anon_vma_chain_free(avc);
94967 }
94968 return 0;
94969
94970 out_enomem_free_avc:
94971 +
94972 +#ifdef CONFIG_PAX_SEGMEXEC
94973 + if (avc_m)
94974 + anon_vma_chain_free(avc_m);
94975 +#endif
94976 +
94977 anon_vma_chain_free(avc);
94978 out_enomem:
94979 return -ENOMEM;
94980 @@ -236,7 +270,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
94981 * Attach the anon_vmas from src to dst.
94982 * Returns 0 on success, -ENOMEM on failure.
94983 */
94984 -int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
94985 +int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
94986 {
94987 struct anon_vma_chain *avc, *pavc;
94988 struct anon_vma *root = NULL;
94989 @@ -269,7 +303,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
94990 * the corresponding VMA in the parent process is attached to.
94991 * Returns 0 on success, non-zero on failure.
94992 */
94993 -int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
94994 +int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
94995 {
94996 struct anon_vma_chain *avc;
94997 struct anon_vma *anon_vma;
94998 @@ -373,8 +407,10 @@ static void anon_vma_ctor(void *data)
94999 void __init anon_vma_init(void)
95000 {
95001 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
95002 - 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
95003 - anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
95004 + 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
95005 + anon_vma_ctor);
95006 + anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
95007 + SLAB_PANIC|SLAB_NO_SANITIZE);
95008 }
95009
95010 /*
95011 diff --git a/mm/shmem.c b/mm/shmem.c
95012 index 1f18c9d..3e03d33 100644
95013 --- a/mm/shmem.c
95014 +++ b/mm/shmem.c
95015 @@ -33,7 +33,7 @@
95016 #include <linux/swap.h>
95017 #include <linux/aio.h>
95018
95019 -static struct vfsmount *shm_mnt;
95020 +struct vfsmount *shm_mnt;
95021
95022 #ifdef CONFIG_SHMEM
95023 /*
95024 @@ -77,7 +77,7 @@ static struct vfsmount *shm_mnt;
95025 #define BOGO_DIRENT_SIZE 20
95026
95027 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
95028 -#define SHORT_SYMLINK_LEN 128
95029 +#define SHORT_SYMLINK_LEN 64
95030
95031 /*
95032 * shmem_fallocate and shmem_writepage communicate via inode->i_private
95033 @@ -2218,6 +2218,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
95034 static int shmem_xattr_validate(const char *name)
95035 {
95036 struct { const char *prefix; size_t len; } arr[] = {
95037 +
95038 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
95039 + { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
95040 +#endif
95041 +
95042 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
95043 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
95044 };
95045 @@ -2273,6 +2278,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
95046 if (err)
95047 return err;
95048
95049 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
95050 + if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
95051 + if (strcmp(name, XATTR_NAME_PAX_FLAGS))
95052 + return -EOPNOTSUPP;
95053 + if (size > 8)
95054 + return -EINVAL;
95055 + }
95056 +#endif
95057 +
95058 return simple_xattr_set(&info->xattrs, name, value, size, flags);
95059 }
95060
95061 @@ -2585,8 +2599,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
95062 int err = -ENOMEM;
95063
95064 /* Round up to L1_CACHE_BYTES to resist false sharing */
95065 - sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
95066 - L1_CACHE_BYTES), GFP_KERNEL);
95067 + sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
95068 if (!sbinfo)
95069 return -ENOMEM;
95070
95071 diff --git a/mm/slab.c b/mm/slab.c
95072 index b264214..83872cd 100644
95073 --- a/mm/slab.c
95074 +++ b/mm/slab.c
95075 @@ -300,10 +300,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
95076 if ((x)->max_freeable < i) \
95077 (x)->max_freeable = i; \
95078 } while (0)
95079 -#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
95080 -#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
95081 -#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
95082 -#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
95083 +#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
95084 +#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
95085 +#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
95086 +#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
95087 +#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
95088 +#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
95089 #else
95090 #define STATS_INC_ACTIVE(x) do { } while (0)
95091 #define STATS_DEC_ACTIVE(x) do { } while (0)
95092 @@ -320,6 +322,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
95093 #define STATS_INC_ALLOCMISS(x) do { } while (0)
95094 #define STATS_INC_FREEHIT(x) do { } while (0)
95095 #define STATS_INC_FREEMISS(x) do { } while (0)
95096 +#define STATS_INC_SANITIZED(x) do { } while (0)
95097 +#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
95098 #endif
95099
95100 #if DEBUG
95101 @@ -403,7 +407,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
95102 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
95103 */
95104 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
95105 - const struct page *page, void *obj)
95106 + const struct page *page, const void *obj)
95107 {
95108 u32 offset = (obj - page->s_mem);
95109 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
95110 @@ -1489,12 +1493,12 @@ void __init kmem_cache_init(void)
95111 */
95112
95113 kmalloc_caches[INDEX_AC] = create_kmalloc_cache("kmalloc-ac",
95114 - kmalloc_size(INDEX_AC), ARCH_KMALLOC_FLAGS);
95115 + kmalloc_size(INDEX_AC), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
95116
95117 if (INDEX_AC != INDEX_NODE)
95118 kmalloc_caches[INDEX_NODE] =
95119 create_kmalloc_cache("kmalloc-node",
95120 - kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
95121 + kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
95122
95123 slab_early_init = 0;
95124
95125 @@ -3428,6 +3432,21 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
95126 struct array_cache *ac = cpu_cache_get(cachep);
95127
95128 check_irq_off();
95129 +
95130 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
95131 + if (pax_sanitize_slab) {
95132 + if (!(cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))) {
95133 + memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
95134 +
95135 + if (cachep->ctor)
95136 + cachep->ctor(objp);
95137 +
95138 + STATS_INC_SANITIZED(cachep);
95139 + } else
95140 + STATS_INC_NOT_SANITIZED(cachep);
95141 + }
95142 +#endif
95143 +
95144 kmemleak_free_recursive(objp, cachep->flags);
95145 objp = cache_free_debugcheck(cachep, objp, caller);
95146
95147 @@ -3656,6 +3675,7 @@ void kfree(const void *objp)
95148
95149 if (unlikely(ZERO_OR_NULL_PTR(objp)))
95150 return;
95151 + VM_BUG_ON(!virt_addr_valid(objp));
95152 local_irq_save(flags);
95153 kfree_debugcheck(objp);
95154 c = virt_to_cache(objp);
95155 @@ -4097,14 +4117,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
95156 }
95157 /* cpu stats */
95158 {
95159 - unsigned long allochit = atomic_read(&cachep->allochit);
95160 - unsigned long allocmiss = atomic_read(&cachep->allocmiss);
95161 - unsigned long freehit = atomic_read(&cachep->freehit);
95162 - unsigned long freemiss = atomic_read(&cachep->freemiss);
95163 + unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
95164 + unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
95165 + unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
95166 + unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
95167
95168 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
95169 allochit, allocmiss, freehit, freemiss);
95170 }
95171 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
95172 + {
95173 + unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
95174 + unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
95175 +
95176 + seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
95177 + }
95178 +#endif
95179 #endif
95180 }
95181
95182 @@ -4334,13 +4362,69 @@ static const struct file_operations proc_slabstats_operations = {
95183 static int __init slab_proc_init(void)
95184 {
95185 #ifdef CONFIG_DEBUG_SLAB_LEAK
95186 - proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
95187 + proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
95188 #endif
95189 return 0;
95190 }
95191 module_init(slab_proc_init);
95192 #endif
95193
95194 +bool is_usercopy_object(const void *ptr)
95195 +{
95196 + struct page *page;
95197 + struct kmem_cache *cachep;
95198 +
95199 + if (ZERO_OR_NULL_PTR(ptr))
95200 + return false;
95201 +
95202 + if (!slab_is_available())
95203 + return false;
95204 +
95205 + if (!virt_addr_valid(ptr))
95206 + return false;
95207 +
95208 + page = virt_to_head_page(ptr);
95209 +
95210 + if (!PageSlab(page))
95211 + return false;
95212 +
95213 + cachep = page->slab_cache;
95214 + return cachep->flags & SLAB_USERCOPY;
95215 +}
95216 +
95217 +#ifdef CONFIG_PAX_USERCOPY
95218 +const char *check_heap_object(const void *ptr, unsigned long n)
95219 +{
95220 + struct page *page;
95221 + struct kmem_cache *cachep;
95222 + unsigned int objnr;
95223 + unsigned long offset;
95224 +
95225 + if (ZERO_OR_NULL_PTR(ptr))
95226 + return "<null>";
95227 +
95228 + if (!virt_addr_valid(ptr))
95229 + return NULL;
95230 +
95231 + page = virt_to_head_page(ptr);
95232 +
95233 + if (!PageSlab(page))
95234 + return NULL;
95235 +
95236 + cachep = page->slab_cache;
95237 + if (!(cachep->flags & SLAB_USERCOPY))
95238 + return cachep->name;
95239 +
95240 + objnr = obj_to_index(cachep, page, ptr);
95241 + BUG_ON(objnr >= cachep->num);
95242 + offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
95243 + if (offset <= cachep->object_size && n <= cachep->object_size - offset)
95244 + return NULL;
95245 +
95246 + return cachep->name;
95247 +}
95248 +#endif
95249 +
95250 /**
95251 * ksize - get the actual amount of memory allocated for a given object
95252 * @objp: Pointer to the object
95253 diff --git a/mm/slab.h b/mm/slab.h
95254 index 8184a7c..ab27737 100644
95255 --- a/mm/slab.h
95256 +++ b/mm/slab.h
95257 @@ -32,6 +32,15 @@ extern struct list_head slab_caches;
95258 /* The slab cache that manages slab cache information */
95259 extern struct kmem_cache *kmem_cache;
95260
95261 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
95262 +#ifdef CONFIG_X86_64
95263 +#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
95264 +#else
95265 +#define PAX_MEMORY_SANITIZE_VALUE '\xff'
95266 +#endif
95267 +extern bool pax_sanitize_slab;
95268 +#endif
95269 +
95270 unsigned long calculate_alignment(unsigned long flags,
95271 unsigned long align, unsigned long size);
95272
95273 @@ -67,7 +76,8 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
95274
95275 /* Legal flag mask for kmem_cache_create(), for various configurations */
95276 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
95277 - SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
95278 + SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
95279 + SLAB_USERCOPY | SLAB_NO_SANITIZE)
95280
95281 #if defined(CONFIG_DEBUG_SLAB)
95282 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
95283 @@ -257,6 +267,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
95284 return s;
95285
95286 page = virt_to_head_page(x);
95287 +
95288 + BUG_ON(!PageSlab(page));
95289 +
95290 cachep = page->slab_cache;
95291 if (slab_equal_or_root(cachep, s))
95292 return cachep;
95293 diff --git a/mm/slab_common.c b/mm/slab_common.c
95294 index 1ec3c61..2067c11 100644
95295 --- a/mm/slab_common.c
95296 +++ b/mm/slab_common.c
95297 @@ -23,11 +23,22 @@
95298
95299 #include "slab.h"
95300
95301 -enum slab_state slab_state;
95302 +enum slab_state slab_state __read_only;
95303 LIST_HEAD(slab_caches);
95304 DEFINE_MUTEX(slab_mutex);
95305 struct kmem_cache *kmem_cache;
95306
95307 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
95308 +bool pax_sanitize_slab __read_only = true;
95309 +static int __init pax_sanitize_slab_setup(char *str)
95310 +{
95311 + pax_sanitize_slab = !!simple_strtol(str, NULL, 0);
95312 + printk("%sabled PaX slab sanitization\n", pax_sanitize_slab ? "En" : "Dis");
95313 + return 1;
95314 +}
95315 +__setup("pax_sanitize_slab=", pax_sanitize_slab_setup);
95316 +#endif
95317 +
95318 #ifdef CONFIG_DEBUG_VM
95319 static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name,
95320 size_t size)
95321 @@ -225,7 +236,7 @@ kmem_cache_create_memcg(struct mem_cgroup *memcg, const char *name, size_t size,
95322 if (err)
95323 goto out_free_cache;
95324
95325 - s->refcount = 1;
95326 + atomic_set(&s->refcount, 1);
95327 list_add(&s->list, &slab_caches);
95328 memcg_register_cache(s);
95329
95330 @@ -278,8 +289,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
95331
95332 get_online_cpus();
95333 mutex_lock(&slab_mutex);
95334 - s->refcount--;
95335 - if (!s->refcount) {
95336 + if (atomic_dec_and_test(&s->refcount)) {
95337 list_del(&s->list);
95338
95339 if (!__kmem_cache_shutdown(s)) {
95340 @@ -326,7 +336,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
95341 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
95342 name, size, err);
95343
95344 - s->refcount = -1; /* Exempt from merging for now */
95345 + atomic_set(&s->refcount, -1); /* Exempt from merging for now */
95346 }
95347
95348 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
95349 @@ -339,7 +349,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
95350
95351 create_boot_cache(s, name, size, flags);
95352 list_add(&s->list, &slab_caches);
95353 - s->refcount = 1;
95354 + atomic_set(&s->refcount, 1);
95355 return s;
95356 }
95357
95358 @@ -351,6 +361,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
95359 EXPORT_SYMBOL(kmalloc_dma_caches);
95360 #endif
95361
95362 +#ifdef CONFIG_PAX_USERCOPY_SLABS
95363 +struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
95364 +EXPORT_SYMBOL(kmalloc_usercopy_caches);
95365 +#endif
95366 +
95367 /*
95368 * Conversion table for small slabs sizes / 8 to the index in the
95369 * kmalloc array. This is necessary for slabs < 192 since we have non power
95370 @@ -415,6 +430,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
95371 return kmalloc_dma_caches[index];
95372
95373 #endif
95374 +
95375 +#ifdef CONFIG_PAX_USERCOPY_SLABS
95376 + if (unlikely((flags & GFP_USERCOPY)))
95377 + return kmalloc_usercopy_caches[index];
95378 +
95379 +#endif
95380 +
95381 return kmalloc_caches[index];
95382 }
95383
95384 @@ -471,7 +493,7 @@ void __init create_kmalloc_caches(unsigned long flags)
95385 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
95386 if (!kmalloc_caches[i]) {
95387 kmalloc_caches[i] = create_kmalloc_cache(NULL,
95388 - 1 << i, flags);
95389 + 1 << i, SLAB_USERCOPY | flags);
95390 }
95391
95392 /*
95393 @@ -480,10 +502,10 @@ void __init create_kmalloc_caches(unsigned long flags)
95394 * earlier power of two caches
95395 */
95396 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
95397 - kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
95398 + kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
95399
95400 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
95401 - kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
95402 + kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
95403 }
95404
95405 /* Kmalloc array is now usable */
95406 @@ -516,6 +538,23 @@ void __init create_kmalloc_caches(unsigned long flags)
95407 }
95408 }
95409 #endif
95410 +
95411 +#ifdef CONFIG_PAX_USERCOPY_SLABS
95412 + for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
95413 + struct kmem_cache *s = kmalloc_caches[i];
95414 +
95415 + if (s) {
95416 + int size = kmalloc_size(i);
95417 + char *n = kasprintf(GFP_NOWAIT,
95418 + "usercopy-kmalloc-%d", size);
95419 +
95420 + BUG_ON(!n);
95421 + kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
95422 + size, SLAB_USERCOPY | flags);
95423 + }
95424 + }
95425 +#endif
95426 +
95427 }
95428 #endif /* !CONFIG_SLOB */
95429
95430 @@ -556,6 +595,9 @@ void print_slabinfo_header(struct seq_file *m)
95431 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
95432 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
95433 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
95434 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
95435 + seq_puts(m, " : pax <sanitized> <not_sanitized>");
95436 +#endif
95437 #endif
95438 seq_putc(m, '\n');
95439 }
95440 diff --git a/mm/slob.c b/mm/slob.c
95441 index 4bf8809..98a6914 100644
95442 --- a/mm/slob.c
95443 +++ b/mm/slob.c
95444 @@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
95445 /*
95446 * Return the size of a slob block.
95447 */
95448 -static slobidx_t slob_units(slob_t *s)
95449 +static slobidx_t slob_units(const slob_t *s)
95450 {
95451 if (s->units > 0)
95452 return s->units;
95453 @@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
95454 /*
95455 * Return the next free slob block pointer after this one.
95456 */
95457 -static slob_t *slob_next(slob_t *s)
95458 +static slob_t *slob_next(const slob_t *s)
95459 {
95460 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
95461 slobidx_t next;
95462 @@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
95463 /*
95464 * Returns true if s is the last free block in its page.
95465 */
95466 -static int slob_last(slob_t *s)
95467 +static int slob_last(const slob_t *s)
95468 {
95469 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
95470 }
95471
95472 -static void *slob_new_pages(gfp_t gfp, int order, int node)
95473 +static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
95474 {
95475 - void *page;
95476 + struct page *page;
95477
95478 #ifdef CONFIG_NUMA
95479 if (node != NUMA_NO_NODE)
95480 @@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
95481 if (!page)
95482 return NULL;
95483
95484 - return page_address(page);
95485 + __SetPageSlab(page);
95486 + return page;
95487 }
95488
95489 -static void slob_free_pages(void *b, int order)
95490 +static void slob_free_pages(struct page *sp, int order)
95491 {
95492 if (current->reclaim_state)
95493 current->reclaim_state->reclaimed_slab += 1 << order;
95494 - free_pages((unsigned long)b, order);
95495 + __ClearPageSlab(sp);
95496 + page_mapcount_reset(sp);
95497 + sp->private = 0;
95498 + __free_pages(sp, order);
95499 }
95500
95501 /*
95502 @@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
95503
95504 /* Not enough space: must allocate a new page */
95505 if (!b) {
95506 - b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
95507 - if (!b)
95508 + sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
95509 + if (!sp)
95510 return NULL;
95511 - sp = virt_to_page(b);
95512 - __SetPageSlab(sp);
95513 + b = page_address(sp);
95514
95515 spin_lock_irqsave(&slob_lock, flags);
95516 sp->units = SLOB_UNITS(PAGE_SIZE);
95517 sp->freelist = b;
95518 + sp->private = 0;
95519 INIT_LIST_HEAD(&sp->list);
95520 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
95521 set_slob_page_free(sp, slob_list);
95522 @@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
95523 if (slob_page_free(sp))
95524 clear_slob_page_free(sp);
95525 spin_unlock_irqrestore(&slob_lock, flags);
95526 - __ClearPageSlab(sp);
95527 - page_mapcount_reset(sp);
95528 - slob_free_pages(b, 0);
95529 + slob_free_pages(sp, 0);
95530 return;
95531 }
95532
95533 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
95534 + if (pax_sanitize_slab)
95535 + memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
95536 +#endif
95537 +
95538 if (!slob_page_free(sp)) {
95539 /* This slob page is about to become partially free. Easy! */
95540 sp->units = units;
95541 @@ -424,11 +431,10 @@ out:
95542 */
95543
95544 static __always_inline void *
95545 -__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
95546 +__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
95547 {
95548 - unsigned int *m;
95549 - int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
95550 - void *ret;
95551 + slob_t *m;
95552 + void *ret = NULL;
95553
95554 gfp &= gfp_allowed_mask;
95555
95556 @@ -442,23 +448,41 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
95557
95558 if (!m)
95559 return NULL;
95560 - *m = size;
95561 + BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
95562 + BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
95563 + m[0].units = size;
95564 + m[1].units = align;
95565 ret = (void *)m + align;
95566
95567 trace_kmalloc_node(caller, ret,
95568 size, size + align, gfp, node);
95569 } else {
95570 unsigned int order = get_order(size);
95571 + struct page *page;
95572
95573 if (likely(order))
95574 gfp |= __GFP_COMP;
95575 - ret = slob_new_pages(gfp, order, node);
95576 + page = slob_new_pages(gfp, order, node);
95577 + if (page) {
95578 + ret = page_address(page);
95579 + page->private = size;
95580 + }
95581
95582 trace_kmalloc_node(caller, ret,
95583 size, PAGE_SIZE << order, gfp, node);
95584 }
95585
95586 - kmemleak_alloc(ret, size, 1, gfp);
95587 + return ret;
95588 +}
95589 +
95590 +static __always_inline void *
95591 +__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
95592 +{
95593 + int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
95594 + void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
95595 +
95596 + if (!ZERO_OR_NULL_PTR(ret))
95597 + kmemleak_alloc(ret, size, 1, gfp);
95598 return ret;
95599 }
95600
95601 @@ -493,34 +517,112 @@ void kfree(const void *block)
95602 return;
95603 kmemleak_free(block);
95604
95605 + VM_BUG_ON(!virt_addr_valid(block));
95606 sp = virt_to_page(block);
95607 - if (PageSlab(sp)) {
95608 + VM_BUG_ON(!PageSlab(sp));
95609 + if (!sp->private) {
95610 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
95611 - unsigned int *m = (unsigned int *)(block - align);
95612 - slob_free(m, *m + align);
95613 - } else
95614 + slob_t *m = (slob_t *)(block - align);
95615 + slob_free(m, m[0].units + align);
95616 + } else {
95617 + __ClearPageSlab(sp);
95618 + page_mapcount_reset(sp);
95619 + sp->private = 0;
95620 __free_pages(sp, compound_order(sp));
95621 + }
95622 }
95623 EXPORT_SYMBOL(kfree);
95624
95625 +bool is_usercopy_object(const void *ptr)
95626 +{
95627 + if (!slab_is_available())
95628 + return false;
95629 +
95630 + // PAX: TODO
95631 +
95632 + return false;
95633 +}
95634 +
95635 +#ifdef CONFIG_PAX_USERCOPY
95636 +const char *check_heap_object(const void *ptr, unsigned long n)
95637 +{
95638 + struct page *page;
95639 + const slob_t *free;
95640 + const void *base;
95641 + unsigned long flags;
95642 +
95643 + if (ZERO_OR_NULL_PTR(ptr))
95644 + return "<null>";
95645 +
95646 + if (!virt_addr_valid(ptr))
95647 + return NULL;
95648 +
95649 + page = virt_to_head_page(ptr);
95650 + if (!PageSlab(page))
95651 + return NULL;
95652 +
95653 + if (page->private) {
95654 + base = page;
95655 + if (base <= ptr && n <= page->private - (ptr - base))
95656 + return NULL;
95657 + return "<slob>";
95658 + }
95659 +
95660 + /* some tricky double walking to find the chunk */
95661 + spin_lock_irqsave(&slob_lock, flags);
95662 + base = (void *)((unsigned long)ptr & PAGE_MASK);
95663 + free = page->freelist;
95664 +
95665 + while (!slob_last(free) && (void *)free <= ptr) {
95666 + base = free + slob_units(free);
95667 + free = slob_next(free);
95668 + }
95669 +
95670 + while (base < (void *)free) {
95671 + slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
95672 + int size = SLOB_UNIT * SLOB_UNITS(m + align);
95673 + int offset;
95674 +
95675 + if (ptr < base + align)
95676 + break;
95677 +
95678 + offset = ptr - base - align;
95679 + if (offset >= m) {
95680 + base += size;
95681 + continue;
95682 + }
95683 +
95684 + if (n > m - offset)
95685 + break;
95686 +
95687 + spin_unlock_irqrestore(&slob_lock, flags);
95688 + return NULL;
95689 + }
95690 +
95691 + spin_unlock_irqrestore(&slob_lock, flags);
95692 + return "<slob>";
95693 +}
95694 +#endif
95695 +
95696 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
95697 size_t ksize(const void *block)
95698 {
95699 struct page *sp;
95700 int align;
95701 - unsigned int *m;
95702 + slob_t *m;
95703
95704 BUG_ON(!block);
95705 if (unlikely(block == ZERO_SIZE_PTR))
95706 return 0;
95707
95708 sp = virt_to_page(block);
95709 - if (unlikely(!PageSlab(sp)))
95710 - return PAGE_SIZE << compound_order(sp);
95711 + VM_BUG_ON(!PageSlab(sp));
95712 + if (sp->private)
95713 + return sp->private;
95714
95715 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
95716 - m = (unsigned int *)(block - align);
95717 - return SLOB_UNITS(*m) * SLOB_UNIT;
95718 + m = (slob_t *)(block - align);
95719 + return SLOB_UNITS(m[0].units) * SLOB_UNIT;
95720 }
95721 EXPORT_SYMBOL(ksize);
95722
95723 @@ -536,23 +638,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
95724
95725 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
95726 {
95727 - void *b;
95728 + void *b = NULL;
95729
95730 flags &= gfp_allowed_mask;
95731
95732 lockdep_trace_alloc(flags);
95733
95734 +#ifdef CONFIG_PAX_USERCOPY_SLABS
95735 + b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
95736 +#else
95737 if (c->size < PAGE_SIZE) {
95738 b = slob_alloc(c->size, flags, c->align, node);
95739 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
95740 SLOB_UNITS(c->size) * SLOB_UNIT,
95741 flags, node);
95742 } else {
95743 - b = slob_new_pages(flags, get_order(c->size), node);
95744 + struct page *sp;
95745 +
95746 + sp = slob_new_pages(flags, get_order(c->size), node);
95747 + if (sp) {
95748 + b = page_address(sp);
95749 + sp->private = c->size;
95750 + }
95751 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
95752 PAGE_SIZE << get_order(c->size),
95753 flags, node);
95754 }
95755 +#endif
95756
95757 if (b && c->ctor)
95758 c->ctor(b);
95759 @@ -584,10 +696,14 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
95760
95761 static void __kmem_cache_free(void *b, int size)
95762 {
95763 - if (size < PAGE_SIZE)
95764 + struct page *sp;
95765 +
95766 + sp = virt_to_page(b);
95767 + BUG_ON(!PageSlab(sp));
95768 + if (!sp->private)
95769 slob_free(b, size);
95770 else
95771 - slob_free_pages(b, get_order(size));
95772 + slob_free_pages(sp, get_order(size));
95773 }
95774
95775 static void kmem_rcu_free(struct rcu_head *head)
95776 @@ -600,17 +716,31 @@ static void kmem_rcu_free(struct rcu_head *head)
95777
95778 void kmem_cache_free(struct kmem_cache *c, void *b)
95779 {
95780 + int size = c->size;
95781 +
95782 +#ifdef CONFIG_PAX_USERCOPY_SLABS
95783 + if (size + c->align < PAGE_SIZE) {
95784 + size += c->align;
95785 + b -= c->align;
95786 + }
95787 +#endif
95788 +
95789 kmemleak_free_recursive(b, c->flags);
95790 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
95791 struct slob_rcu *slob_rcu;
95792 - slob_rcu = b + (c->size - sizeof(struct slob_rcu));
95793 - slob_rcu->size = c->size;
95794 + slob_rcu = b + (size - sizeof(struct slob_rcu));
95795 + slob_rcu->size = size;
95796 call_rcu(&slob_rcu->head, kmem_rcu_free);
95797 } else {
95798 - __kmem_cache_free(b, c->size);
95799 + __kmem_cache_free(b, size);
95800 }
95801
95802 +#ifdef CONFIG_PAX_USERCOPY_SLABS
95803 + trace_kfree(_RET_IP_, b);
95804 +#else
95805 trace_kmem_cache_free(_RET_IP_, b);
95806 +#endif
95807 +
95808 }
95809 EXPORT_SYMBOL(kmem_cache_free);
95810
95811 diff --git a/mm/slub.c b/mm/slub.c
95812 index 25f14ad..ff4d0b7 100644
95813 --- a/mm/slub.c
95814 +++ b/mm/slub.c
95815 @@ -207,7 +207,7 @@ struct track {
95816
95817 enum track_item { TRACK_ALLOC, TRACK_FREE };
95818
95819 -#ifdef CONFIG_SYSFS
95820 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
95821 static int sysfs_slab_add(struct kmem_cache *);
95822 static int sysfs_slab_alias(struct kmem_cache *, const char *);
95823 static void sysfs_slab_remove(struct kmem_cache *);
95824 @@ -545,7 +545,7 @@ static void print_track(const char *s, struct track *t)
95825 if (!t->addr)
95826 return;
95827
95828 - printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
95829 + printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
95830 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
95831 #ifdef CONFIG_STACKTRACE
95832 {
95833 @@ -2666,6 +2666,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
95834
95835 slab_free_hook(s, x);
95836
95837 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
95838 + if (pax_sanitize_slab && !(s->flags & SLAB_NO_SANITIZE)) {
95839 + memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
95840 + if (s->ctor)
95841 + s->ctor(x);
95842 + }
95843 +#endif
95844 +
95845 redo:
95846 /*
95847 * Determine the currently cpus per cpu slab.
95848 @@ -2733,7 +2741,7 @@ static int slub_min_objects;
95849 * Merge control. If this is set then no merging of slab caches will occur.
95850 * (Could be removed. This was introduced to pacify the merge skeptics.)
95851 */
95852 -static int slub_nomerge;
95853 +static int slub_nomerge = 1;
95854
95855 /*
95856 * Calculate the order of allocation given an slab object size.
95857 @@ -3014,6 +3022,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
95858 s->inuse = size;
95859
95860 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
95861 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
95862 + (pax_sanitize_slab && !(flags & SLAB_NO_SANITIZE)) ||
95863 +#endif
95864 s->ctor)) {
95865 /*
95866 * Relocate free pointer after the object if it is not
95867 @@ -3359,6 +3370,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
95868 EXPORT_SYMBOL(__kmalloc_node);
95869 #endif
95870
95871 +bool is_usercopy_object(const void *ptr)
95872 +{
95873 + struct page *page;
95874 + struct kmem_cache *s;
95875 +
95876 + if (ZERO_OR_NULL_PTR(ptr))
95877 + return false;
95878 +
95879 + if (!slab_is_available())
95880 + return false;
95881 +
95882 + if (!virt_addr_valid(ptr))
95883 + return false;
95884 +
95885 + page = virt_to_head_page(ptr);
95886 +
95887 + if (!PageSlab(page))
95888 + return false;
95889 +
95890 + s = page->slab_cache;
95891 + return s->flags & SLAB_USERCOPY;
95892 +}
95893 +
95894 +#ifdef CONFIG_PAX_USERCOPY
95895 +const char *check_heap_object(const void *ptr, unsigned long n)
95896 +{
95897 + struct page *page;
95898 + struct kmem_cache *s;
95899 + unsigned long offset;
95900 +
95901 + if (ZERO_OR_NULL_PTR(ptr))
95902 + return "<null>";
95903 +
95904 + if (!virt_addr_valid(ptr))
95905 + return NULL;
95906 +
95907 + page = virt_to_head_page(ptr);
95908 +
95909 + if (!PageSlab(page))
95910 + return NULL;
95911 +
95912 + s = page->slab_cache;
95913 + if (!(s->flags & SLAB_USERCOPY))
95914 + return s->name;
95915 +
95916 + offset = (ptr - page_address(page)) % s->size;
95917 + if (offset <= s->object_size && n <= s->object_size - offset)
95918 + return NULL;
95919 +
95920 + return s->name;
95921 +}
95922 +#endif
95923 +
95924 size_t ksize(const void *object)
95925 {
95926 struct page *page;
95927 @@ -3387,6 +3451,7 @@ void kfree(const void *x)
95928 if (unlikely(ZERO_OR_NULL_PTR(x)))
95929 return;
95930
95931 + VM_BUG_ON(!virt_addr_valid(x));
95932 page = virt_to_head_page(x);
95933 if (unlikely(!PageSlab(page))) {
95934 BUG_ON(!PageCompound(page));
95935 @@ -3692,7 +3757,7 @@ static int slab_unmergeable(struct kmem_cache *s)
95936 /*
95937 * We may have set a slab to be unmergeable during bootstrap.
95938 */
95939 - if (s->refcount < 0)
95940 + if (atomic_read(&s->refcount) < 0)
95941 return 1;
95942
95943 return 0;
95944 @@ -3750,7 +3815,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
95945
95946 s = find_mergeable(memcg, size, align, flags, name, ctor);
95947 if (s) {
95948 - s->refcount++;
95949 + atomic_inc(&s->refcount);
95950 /*
95951 * Adjust the object sizes so that we clear
95952 * the complete object on kzalloc.
95953 @@ -3759,7 +3824,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
95954 s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
95955
95956 if (sysfs_slab_alias(s, name)) {
95957 - s->refcount--;
95958 + atomic_dec(&s->refcount);
95959 s = NULL;
95960 }
95961 }
95962 @@ -3879,7 +3944,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
95963 }
95964 #endif
95965
95966 -#ifdef CONFIG_SYSFS
95967 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
95968 static int count_inuse(struct page *page)
95969 {
95970 return page->inuse;
95971 @@ -4268,12 +4333,12 @@ static void resiliency_test(void)
95972 validate_slab_cache(kmalloc_caches[9]);
95973 }
95974 #else
95975 -#ifdef CONFIG_SYSFS
95976 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
95977 static void resiliency_test(void) {};
95978 #endif
95979 #endif
95980
95981 -#ifdef CONFIG_SYSFS
95982 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
95983 enum slab_stat_type {
95984 SL_ALL, /* All slabs */
95985 SL_PARTIAL, /* Only partially allocated slabs */
95986 @@ -4519,7 +4584,7 @@ SLAB_ATTR_RO(ctor);
95987
95988 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
95989 {
95990 - return sprintf(buf, "%d\n", s->refcount - 1);
95991 + return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
95992 }
95993 SLAB_ATTR_RO(aliases);
95994
95995 @@ -4607,6 +4672,14 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
95996 SLAB_ATTR_RO(cache_dma);
95997 #endif
95998
95999 +#ifdef CONFIG_PAX_USERCOPY_SLABS
96000 +static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
96001 +{
96002 + return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
96003 +}
96004 +SLAB_ATTR_RO(usercopy);
96005 +#endif
96006 +
96007 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
96008 {
96009 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
96010 @@ -4941,6 +5014,9 @@ static struct attribute *slab_attrs[] = {
96011 #ifdef CONFIG_ZONE_DMA
96012 &cache_dma_attr.attr,
96013 #endif
96014 +#ifdef CONFIG_PAX_USERCOPY_SLABS
96015 + &usercopy_attr.attr,
96016 +#endif
96017 #ifdef CONFIG_NUMA
96018 &remote_node_defrag_ratio_attr.attr,
96019 #endif
96020 @@ -5173,6 +5249,7 @@ static char *create_unique_id(struct kmem_cache *s)
96021 return name;
96022 }
96023
96024 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
96025 static int sysfs_slab_add(struct kmem_cache *s)
96026 {
96027 int err;
96028 @@ -5230,6 +5307,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
96029 kobject_del(&s->kobj);
96030 kobject_put(&s->kobj);
96031 }
96032 +#endif
96033
96034 /*
96035 * Need to buffer aliases during bootup until sysfs becomes
96036 @@ -5243,6 +5321,7 @@ struct saved_alias {
96037
96038 static struct saved_alias *alias_list;
96039
96040 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
96041 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
96042 {
96043 struct saved_alias *al;
96044 @@ -5265,6 +5344,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
96045 alias_list = al;
96046 return 0;
96047 }
96048 +#endif
96049
96050 static int __init slab_sysfs_init(void)
96051 {
96052 diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
96053 index 4cba9c2..b4f9fcc 100644
96054 --- a/mm/sparse-vmemmap.c
96055 +++ b/mm/sparse-vmemmap.c
96056 @@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
96057 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
96058 if (!p)
96059 return NULL;
96060 - pud_populate(&init_mm, pud, p);
96061 + pud_populate_kernel(&init_mm, pud, p);
96062 }
96063 return pud;
96064 }
96065 @@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
96066 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
96067 if (!p)
96068 return NULL;
96069 - pgd_populate(&init_mm, pgd, p);
96070 + pgd_populate_kernel(&init_mm, pgd, p);
96071 }
96072 return pgd;
96073 }
96074 diff --git a/mm/sparse.c b/mm/sparse.c
96075 index 63c3ea5..95c0858 100644
96076 --- a/mm/sparse.c
96077 +++ b/mm/sparse.c
96078 @@ -748,7 +748,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
96079
96080 for (i = 0; i < PAGES_PER_SECTION; i++) {
96081 if (PageHWPoison(&memmap[i])) {
96082 - atomic_long_sub(1, &num_poisoned_pages);
96083 + atomic_long_sub_unchecked(1, &num_poisoned_pages);
96084 ClearPageHWPoison(&memmap[i]);
96085 }
96086 }
96087 diff --git a/mm/swap.c b/mm/swap.c
96088 index 0092097..33361ff 100644
96089 --- a/mm/swap.c
96090 +++ b/mm/swap.c
96091 @@ -31,6 +31,7 @@
96092 #include <linux/memcontrol.h>
96093 #include <linux/gfp.h>
96094 #include <linux/uio.h>
96095 +#include <linux/hugetlb.h>
96096
96097 #include "internal.h"
96098
96099 @@ -76,6 +77,8 @@ static void __put_compound_page(struct page *page)
96100
96101 __page_cache_release(page);
96102 dtor = get_compound_page_dtor(page);
96103 + if (!PageHuge(page))
96104 + BUG_ON(dtor != free_compound_page);
96105 (*dtor)(page);
96106 }
96107
96108 diff --git a/mm/swapfile.c b/mm/swapfile.c
96109 index 4a7f7e6..22cddf5 100644
96110 --- a/mm/swapfile.c
96111 +++ b/mm/swapfile.c
96112 @@ -66,7 +66,7 @@ static DEFINE_MUTEX(swapon_mutex);
96113
96114 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
96115 /* Activity counter to indicate that a swapon or swapoff has occurred */
96116 -static atomic_t proc_poll_event = ATOMIC_INIT(0);
96117 +static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
96118
96119 static inline unsigned char swap_count(unsigned char ent)
96120 {
96121 @@ -1959,7 +1959,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
96122 spin_unlock(&swap_lock);
96123
96124 err = 0;
96125 - atomic_inc(&proc_poll_event);
96126 + atomic_inc_unchecked(&proc_poll_event);
96127 wake_up_interruptible(&proc_poll_wait);
96128
96129 out_dput:
96130 @@ -1976,8 +1976,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
96131
96132 poll_wait(file, &proc_poll_wait, wait);
96133
96134 - if (seq->poll_event != atomic_read(&proc_poll_event)) {
96135 - seq->poll_event = atomic_read(&proc_poll_event);
96136 + if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
96137 + seq->poll_event = atomic_read_unchecked(&proc_poll_event);
96138 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
96139 }
96140
96141 @@ -2075,7 +2075,7 @@ static int swaps_open(struct inode *inode, struct file *file)
96142 return ret;
96143
96144 seq = file->private_data;
96145 - seq->poll_event = atomic_read(&proc_poll_event);
96146 + seq->poll_event = atomic_read_unchecked(&proc_poll_event);
96147 return 0;
96148 }
96149
96150 @@ -2534,7 +2534,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
96151 (frontswap_map) ? "FS" : "");
96152
96153 mutex_unlock(&swapon_mutex);
96154 - atomic_inc(&proc_poll_event);
96155 + atomic_inc_unchecked(&proc_poll_event);
96156 wake_up_interruptible(&proc_poll_wait);
96157
96158 if (S_ISREG(inode->i_mode))
96159 diff --git a/mm/util.c b/mm/util.c
96160 index a24aa22..a0d41ae 100644
96161 --- a/mm/util.c
96162 +++ b/mm/util.c
96163 @@ -297,6 +297,12 @@ done:
96164 void arch_pick_mmap_layout(struct mm_struct *mm)
96165 {
96166 mm->mmap_base = TASK_UNMAPPED_BASE;
96167 +
96168 +#ifdef CONFIG_PAX_RANDMMAP
96169 + if (mm->pax_flags & MF_PAX_RANDMMAP)
96170 + mm->mmap_base += mm->delta_mmap;
96171 +#endif
96172 +
96173 mm->get_unmapped_area = arch_get_unmapped_area;
96174 }
96175 #endif
96176 diff --git a/mm/vmalloc.c b/mm/vmalloc.c
96177 index 0fdf968..d6686e8 100644
96178 --- a/mm/vmalloc.c
96179 +++ b/mm/vmalloc.c
96180 @@ -59,8 +59,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
96181
96182 pte = pte_offset_kernel(pmd, addr);
96183 do {
96184 - pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
96185 - WARN_ON(!pte_none(ptent) && !pte_present(ptent));
96186 +
96187 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
96188 + if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
96189 + BUG_ON(!pte_exec(*pte));
96190 + set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
96191 + continue;
96192 + }
96193 +#endif
96194 +
96195 + {
96196 + pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
96197 + WARN_ON(!pte_none(ptent) && !pte_present(ptent));
96198 + }
96199 } while (pte++, addr += PAGE_SIZE, addr != end);
96200 }
96201
96202 @@ -120,16 +131,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
96203 pte = pte_alloc_kernel(pmd, addr);
96204 if (!pte)
96205 return -ENOMEM;
96206 +
96207 + pax_open_kernel();
96208 do {
96209 struct page *page = pages[*nr];
96210
96211 - if (WARN_ON(!pte_none(*pte)))
96212 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
96213 + if (pgprot_val(prot) & _PAGE_NX)
96214 +#endif
96215 +
96216 + if (!pte_none(*pte)) {
96217 + pax_close_kernel();
96218 + WARN_ON(1);
96219 return -EBUSY;
96220 - if (WARN_ON(!page))
96221 + }
96222 + if (!page) {
96223 + pax_close_kernel();
96224 + WARN_ON(1);
96225 return -ENOMEM;
96226 + }
96227 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
96228 (*nr)++;
96229 } while (pte++, addr += PAGE_SIZE, addr != end);
96230 + pax_close_kernel();
96231 return 0;
96232 }
96233
96234 @@ -139,7 +163,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
96235 pmd_t *pmd;
96236 unsigned long next;
96237
96238 - pmd = pmd_alloc(&init_mm, pud, addr);
96239 + pmd = pmd_alloc_kernel(&init_mm, pud, addr);
96240 if (!pmd)
96241 return -ENOMEM;
96242 do {
96243 @@ -156,7 +180,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
96244 pud_t *pud;
96245 unsigned long next;
96246
96247 - pud = pud_alloc(&init_mm, pgd, addr);
96248 + pud = pud_alloc_kernel(&init_mm, pgd, addr);
96249 if (!pud)
96250 return -ENOMEM;
96251 do {
96252 @@ -216,6 +240,12 @@ int is_vmalloc_or_module_addr(const void *x)
96253 if (addr >= MODULES_VADDR && addr < MODULES_END)
96254 return 1;
96255 #endif
96256 +
96257 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
96258 + if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
96259 + return 1;
96260 +#endif
96261 +
96262 return is_vmalloc_addr(x);
96263 }
96264
96265 @@ -236,8 +266,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
96266
96267 if (!pgd_none(*pgd)) {
96268 pud_t *pud = pud_offset(pgd, addr);
96269 +#ifdef CONFIG_X86
96270 + if (!pud_large(*pud))
96271 +#endif
96272 if (!pud_none(*pud)) {
96273 pmd_t *pmd = pmd_offset(pud, addr);
96274 +#ifdef CONFIG_X86
96275 + if (!pmd_large(*pmd))
96276 +#endif
96277 if (!pmd_none(*pmd)) {
96278 pte_t *ptep, pte;
96279
96280 @@ -1309,6 +1345,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
96281 struct vm_struct *area;
96282
96283 BUG_ON(in_interrupt());
96284 +
96285 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
96286 + if (flags & VM_KERNEXEC) {
96287 + if (start != VMALLOC_START || end != VMALLOC_END)
96288 + return NULL;
96289 + start = (unsigned long)MODULES_EXEC_VADDR;
96290 + end = (unsigned long)MODULES_EXEC_END;
96291 + }
96292 +#endif
96293 +
96294 if (flags & VM_IOREMAP)
96295 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
96296
96297 @@ -1534,6 +1580,11 @@ void *vmap(struct page **pages, unsigned int count,
96298 if (count > totalram_pages)
96299 return NULL;
96300
96301 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
96302 + if (!(pgprot_val(prot) & _PAGE_NX))
96303 + flags |= VM_KERNEXEC;
96304 +#endif
96305 +
96306 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
96307 __builtin_return_address(0));
96308 if (!area)
96309 @@ -1634,6 +1685,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
96310 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
96311 goto fail;
96312
96313 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
96314 + if (!(pgprot_val(prot) & _PAGE_NX))
96315 + area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | VM_KERNEXEC,
96316 + VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
96317 + else
96318 +#endif
96319 +
96320 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED,
96321 start, end, node, gfp_mask, caller);
96322 if (!area)
96323 @@ -1810,10 +1868,9 @@ EXPORT_SYMBOL(vzalloc_node);
96324 * For tight control over page level allocator and protection flags
96325 * use __vmalloc() instead.
96326 */
96327 -
96328 void *vmalloc_exec(unsigned long size)
96329 {
96330 - return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
96331 + return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
96332 NUMA_NO_NODE, __builtin_return_address(0));
96333 }
96334
96335 @@ -2120,6 +2177,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
96336 {
96337 struct vm_struct *area;
96338
96339 + BUG_ON(vma->vm_mirror);
96340 +
96341 size = PAGE_ALIGN(size);
96342
96343 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
96344 @@ -2602,7 +2661,11 @@ static int s_show(struct seq_file *m, void *p)
96345 v->addr, v->addr + v->size, v->size);
96346
96347 if (v->caller)
96348 +#ifdef CONFIG_GRKERNSEC_HIDESYM
96349 + seq_printf(m, " %pK", v->caller);
96350 +#else
96351 seq_printf(m, " %pS", v->caller);
96352 +#endif
96353
96354 if (v->nr_pages)
96355 seq_printf(m, " pages=%d", v->nr_pages);
96356 diff --git a/mm/vmstat.c b/mm/vmstat.c
96357 index def5dd2..4ce55cec 100644
96358 --- a/mm/vmstat.c
96359 +++ b/mm/vmstat.c
96360 @@ -20,6 +20,7 @@
96361 #include <linux/writeback.h>
96362 #include <linux/compaction.h>
96363 #include <linux/mm_inline.h>
96364 +#include <linux/grsecurity.h>
96365
96366 #include "internal.h"
96367
96368 @@ -79,7 +80,7 @@ void vm_events_fold_cpu(int cpu)
96369 *
96370 * vm_stat contains the global counters
96371 */
96372 -atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
96373 +atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
96374 EXPORT_SYMBOL(vm_stat);
96375
96376 #ifdef CONFIG_SMP
96377 @@ -423,7 +424,7 @@ static inline void fold_diff(int *diff)
96378
96379 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
96380 if (diff[i])
96381 - atomic_long_add(diff[i], &vm_stat[i]);
96382 + atomic_long_add_unchecked(diff[i], &vm_stat[i]);
96383 }
96384
96385 /*
96386 @@ -455,7 +456,7 @@ static void refresh_cpu_vm_stats(void)
96387 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
96388 if (v) {
96389
96390 - atomic_long_add(v, &zone->vm_stat[i]);
96391 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
96392 global_diff[i] += v;
96393 #ifdef CONFIG_NUMA
96394 /* 3 seconds idle till flush */
96395 @@ -517,7 +518,7 @@ void cpu_vm_stats_fold(int cpu)
96396
96397 v = p->vm_stat_diff[i];
96398 p->vm_stat_diff[i] = 0;
96399 - atomic_long_add(v, &zone->vm_stat[i]);
96400 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
96401 global_diff[i] += v;
96402 }
96403 }
96404 @@ -537,8 +538,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
96405 if (pset->vm_stat_diff[i]) {
96406 int v = pset->vm_stat_diff[i];
96407 pset->vm_stat_diff[i] = 0;
96408 - atomic_long_add(v, &zone->vm_stat[i]);
96409 - atomic_long_add(v, &vm_stat[i]);
96410 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
96411 + atomic_long_add_unchecked(v, &vm_stat[i]);
96412 }
96413 }
96414 #endif
96415 @@ -1150,10 +1151,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
96416 stat_items_size += sizeof(struct vm_event_state);
96417 #endif
96418
96419 - v = kmalloc(stat_items_size, GFP_KERNEL);
96420 + v = kzalloc(stat_items_size, GFP_KERNEL);
96421 m->private = v;
96422 if (!v)
96423 return ERR_PTR(-ENOMEM);
96424 +
96425 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
96426 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
96427 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
96428 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
96429 + && !in_group_p(grsec_proc_gid)
96430 +#endif
96431 + )
96432 + return (unsigned long *)m->private + *pos;
96433 +#endif
96434 +#endif
96435 +
96436 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
96437 v[i] = global_page_state(i);
96438 v += NR_VM_ZONE_STAT_ITEMS;
96439 @@ -1302,10 +1315,16 @@ static int __init setup_vmstat(void)
96440 put_online_cpus();
96441 #endif
96442 #ifdef CONFIG_PROC_FS
96443 - proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
96444 - proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
96445 - proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
96446 - proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
96447 + {
96448 + mode_t gr_mode = S_IRUGO;
96449 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
96450 + gr_mode = S_IRUSR;
96451 +#endif
96452 + proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
96453 + proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
96454 + proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
96455 + proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
96456 + }
96457 #endif
96458 return 0;
96459 }
96460 diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
96461 index 175273f..1c63e05 100644
96462 --- a/net/8021q/vlan.c
96463 +++ b/net/8021q/vlan.c
96464 @@ -474,7 +474,7 @@ out:
96465 return NOTIFY_DONE;
96466 }
96467
96468 -static struct notifier_block vlan_notifier_block __read_mostly = {
96469 +static struct notifier_block vlan_notifier_block = {
96470 .notifier_call = vlan_device_event,
96471 };
96472
96473 @@ -549,8 +549,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
96474 err = -EPERM;
96475 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
96476 break;
96477 - if ((args.u.name_type >= 0) &&
96478 - (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
96479 + if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
96480 struct vlan_net *vn;
96481
96482 vn = net_generic(net, vlan_net_id);
96483 diff --git a/net/9p/client.c b/net/9p/client.c
96484 index 9186550..e604a2f 100644
96485 --- a/net/9p/client.c
96486 +++ b/net/9p/client.c
96487 @@ -588,7 +588,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
96488 len - inline_len);
96489 } else {
96490 err = copy_from_user(ename + inline_len,
96491 - uidata, len - inline_len);
96492 + (char __force_user *)uidata, len - inline_len);
96493 if (err) {
96494 err = -EFAULT;
96495 goto out_err;
96496 @@ -1560,7 +1560,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
96497 kernel_buf = 1;
96498 indata = data;
96499 } else
96500 - indata = (__force char *)udata;
96501 + indata = (__force_kernel char *)udata;
96502 /*
96503 * response header len is 11
96504 * PDU Header(7) + IO Size (4)
96505 @@ -1635,7 +1635,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
96506 kernel_buf = 1;
96507 odata = data;
96508 } else
96509 - odata = (char *)udata;
96510 + odata = (char __force_kernel *)udata;
96511 req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, odata, 0, rsize,
96512 P9_ZC_HDR_SZ, kernel_buf, "dqd",
96513 fid->fid, offset, rsize);
96514 diff --git a/net/9p/mod.c b/net/9p/mod.c
96515 index 6ab36ae..6f1841b 100644
96516 --- a/net/9p/mod.c
96517 +++ b/net/9p/mod.c
96518 @@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
96519 void v9fs_register_trans(struct p9_trans_module *m)
96520 {
96521 spin_lock(&v9fs_trans_lock);
96522 - list_add_tail(&m->list, &v9fs_trans_list);
96523 + pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
96524 spin_unlock(&v9fs_trans_lock);
96525 }
96526 EXPORT_SYMBOL(v9fs_register_trans);
96527 @@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
96528 void v9fs_unregister_trans(struct p9_trans_module *m)
96529 {
96530 spin_lock(&v9fs_trans_lock);
96531 - list_del_init(&m->list);
96532 + pax_list_del_init((struct list_head *)&m->list);
96533 spin_unlock(&v9fs_trans_lock);
96534 }
96535 EXPORT_SYMBOL(v9fs_unregister_trans);
96536 diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
96537 index b7bd7f2..2498bf7 100644
96538 --- a/net/9p/trans_fd.c
96539 +++ b/net/9p/trans_fd.c
96540 @@ -432,7 +432,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
96541 oldfs = get_fs();
96542 set_fs(get_ds());
96543 /* The cast to a user pointer is valid due to the set_fs() */
96544 - ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
96545 + ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
96546 set_fs(oldfs);
96547
96548 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
96549 diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
96550 index af46bc4..f9adfcd 100644
96551 --- a/net/appletalk/atalk_proc.c
96552 +++ b/net/appletalk/atalk_proc.c
96553 @@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
96554 struct proc_dir_entry *p;
96555 int rc = -ENOMEM;
96556
96557 - atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
96558 + atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
96559 if (!atalk_proc_dir)
96560 goto out;
96561
96562 diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
96563 index 876fbe8..8bbea9f 100644
96564 --- a/net/atm/atm_misc.c
96565 +++ b/net/atm/atm_misc.c
96566 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
96567 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
96568 return 1;
96569 atm_return(vcc, truesize);
96570 - atomic_inc(&vcc->stats->rx_drop);
96571 + atomic_inc_unchecked(&vcc->stats->rx_drop);
96572 return 0;
96573 }
96574 EXPORT_SYMBOL(atm_charge);
96575 @@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
96576 }
96577 }
96578 atm_return(vcc, guess);
96579 - atomic_inc(&vcc->stats->rx_drop);
96580 + atomic_inc_unchecked(&vcc->stats->rx_drop);
96581 return NULL;
96582 }
96583 EXPORT_SYMBOL(atm_alloc_charge);
96584 @@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
96585
96586 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
96587 {
96588 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
96589 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
96590 __SONET_ITEMS
96591 #undef __HANDLE_ITEM
96592 }
96593 @@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
96594
96595 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
96596 {
96597 -#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
96598 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
96599 __SONET_ITEMS
96600 #undef __HANDLE_ITEM
96601 }
96602 diff --git a/net/atm/lec.c b/net/atm/lec.c
96603 index 5a2f602..9396143 100644
96604 --- a/net/atm/lec.c
96605 +++ b/net/atm/lec.c
96606 @@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
96607 }
96608
96609 static struct lane2_ops lane2_ops = {
96610 - lane2_resolve, /* resolve, spec 3.1.3 */
96611 - lane2_associate_req, /* associate_req, spec 3.1.4 */
96612 - NULL /* associate indicator, spec 3.1.5 */
96613 + .resolve = lane2_resolve,
96614 + .associate_req = lane2_associate_req,
96615 + .associate_indicator = NULL
96616 };
96617
96618 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
96619 diff --git a/net/atm/lec.h b/net/atm/lec.h
96620 index 4149db1..f2ab682 100644
96621 --- a/net/atm/lec.h
96622 +++ b/net/atm/lec.h
96623 @@ -48,7 +48,7 @@ struct lane2_ops {
96624 const u8 *tlvs, u32 sizeoftlvs);
96625 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
96626 const u8 *tlvs, u32 sizeoftlvs);
96627 -};
96628 +} __no_const;
96629
96630 /*
96631 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
96632 diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
96633 index d1b2d9a..d549f7f 100644
96634 --- a/net/atm/mpoa_caches.c
96635 +++ b/net/atm/mpoa_caches.c
96636 @@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
96637
96638
96639 static struct in_cache_ops ingress_ops = {
96640 - in_cache_add_entry, /* add_entry */
96641 - in_cache_get, /* get */
96642 - in_cache_get_with_mask, /* get_with_mask */
96643 - in_cache_get_by_vcc, /* get_by_vcc */
96644 - in_cache_put, /* put */
96645 - in_cache_remove_entry, /* remove_entry */
96646 - cache_hit, /* cache_hit */
96647 - clear_count_and_expired, /* clear_count */
96648 - check_resolving_entries, /* check_resolving */
96649 - refresh_entries, /* refresh */
96650 - in_destroy_cache /* destroy_cache */
96651 + .add_entry = in_cache_add_entry,
96652 + .get = in_cache_get,
96653 + .get_with_mask = in_cache_get_with_mask,
96654 + .get_by_vcc = in_cache_get_by_vcc,
96655 + .put = in_cache_put,
96656 + .remove_entry = in_cache_remove_entry,
96657 + .cache_hit = cache_hit,
96658 + .clear_count = clear_count_and_expired,
96659 + .check_resolving = check_resolving_entries,
96660 + .refresh = refresh_entries,
96661 + .destroy_cache = in_destroy_cache
96662 };
96663
96664 static struct eg_cache_ops egress_ops = {
96665 - eg_cache_add_entry, /* add_entry */
96666 - eg_cache_get_by_cache_id, /* get_by_cache_id */
96667 - eg_cache_get_by_tag, /* get_by_tag */
96668 - eg_cache_get_by_vcc, /* get_by_vcc */
96669 - eg_cache_get_by_src_ip, /* get_by_src_ip */
96670 - eg_cache_put, /* put */
96671 - eg_cache_remove_entry, /* remove_entry */
96672 - update_eg_cache_entry, /* update */
96673 - clear_expired, /* clear_expired */
96674 - eg_destroy_cache /* destroy_cache */
96675 + .add_entry = eg_cache_add_entry,
96676 + .get_by_cache_id = eg_cache_get_by_cache_id,
96677 + .get_by_tag = eg_cache_get_by_tag,
96678 + .get_by_vcc = eg_cache_get_by_vcc,
96679 + .get_by_src_ip = eg_cache_get_by_src_ip,
96680 + .put = eg_cache_put,
96681 + .remove_entry = eg_cache_remove_entry,
96682 + .update = update_eg_cache_entry,
96683 + .clear_expired = clear_expired,
96684 + .destroy_cache = eg_destroy_cache
96685 };
96686
96687
96688 diff --git a/net/atm/proc.c b/net/atm/proc.c
96689 index bbb6461..cf04016 100644
96690 --- a/net/atm/proc.c
96691 +++ b/net/atm/proc.c
96692 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
96693 const struct k_atm_aal_stats *stats)
96694 {
96695 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
96696 - atomic_read(&stats->tx), atomic_read(&stats->tx_err),
96697 - atomic_read(&stats->rx), atomic_read(&stats->rx_err),
96698 - atomic_read(&stats->rx_drop));
96699 + atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
96700 + atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
96701 + atomic_read_unchecked(&stats->rx_drop));
96702 }
96703
96704 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
96705 diff --git a/net/atm/resources.c b/net/atm/resources.c
96706 index 0447d5d..3cf4728 100644
96707 --- a/net/atm/resources.c
96708 +++ b/net/atm/resources.c
96709 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
96710 static void copy_aal_stats(struct k_atm_aal_stats *from,
96711 struct atm_aal_stats *to)
96712 {
96713 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
96714 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
96715 __AAL_STAT_ITEMS
96716 #undef __HANDLE_ITEM
96717 }
96718 @@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
96719 static void subtract_aal_stats(struct k_atm_aal_stats *from,
96720 struct atm_aal_stats *to)
96721 {
96722 -#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
96723 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
96724 __AAL_STAT_ITEMS
96725 #undef __HANDLE_ITEM
96726 }
96727 diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
96728 index 919a5ce..cc6b444 100644
96729 --- a/net/ax25/sysctl_net_ax25.c
96730 +++ b/net/ax25/sysctl_net_ax25.c
96731 @@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
96732 {
96733 char path[sizeof("net/ax25/") + IFNAMSIZ];
96734 int k;
96735 - struct ctl_table *table;
96736 + ctl_table_no_const *table;
96737
96738 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
96739 if (!table)
96740 diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
96741 index 8323bce..a03130d 100644
96742 --- a/net/batman-adv/bat_iv_ogm.c
96743 +++ b/net/batman-adv/bat_iv_ogm.c
96744 @@ -312,7 +312,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
96745
96746 /* randomize initial seqno to avoid collision */
96747 get_random_bytes(&random_seqno, sizeof(random_seqno));
96748 - atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
96749 + atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
96750
96751 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
96752 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
96753 @@ -917,9 +917,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
96754 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
96755
96756 /* change sequence number to network order */
96757 - seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
96758 + seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
96759 batadv_ogm_packet->seqno = htonl(seqno);
96760 - atomic_inc(&hard_iface->bat_iv.ogm_seqno);
96761 + atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
96762
96763 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
96764
96765 @@ -1594,7 +1594,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
96766 return;
96767
96768 /* could be changed by schedule_own_packet() */
96769 - if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
96770 + if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
96771
96772 if (ogm_packet->flags & BATADV_DIRECTLINK)
96773 has_directlink_flag = true;
96774 diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
96775 index 88df9b1..69cf7c0 100644
96776 --- a/net/batman-adv/fragmentation.c
96777 +++ b/net/batman-adv/fragmentation.c
96778 @@ -445,7 +445,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
96779 frag_header.packet_type = BATADV_UNICAST_FRAG;
96780 frag_header.version = BATADV_COMPAT_VERSION;
96781 frag_header.ttl = BATADV_TTL;
96782 - frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
96783 + frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
96784 frag_header.reserved = 0;
96785 frag_header.no = 0;
96786 frag_header.total_size = htons(skb->len);
96787 diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
96788 index f82c267..0e56d32 100644
96789 --- a/net/batman-adv/soft-interface.c
96790 +++ b/net/batman-adv/soft-interface.c
96791 @@ -283,7 +283,7 @@ send:
96792 primary_if->net_dev->dev_addr, ETH_ALEN);
96793
96794 /* set broadcast sequence number */
96795 - seqno = atomic_inc_return(&bat_priv->bcast_seqno);
96796 + seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
96797 bcast_packet->seqno = htonl(seqno);
96798
96799 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
96800 @@ -707,7 +707,7 @@ static int batadv_softif_init_late(struct net_device *dev)
96801 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
96802
96803 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
96804 - atomic_set(&bat_priv->bcast_seqno, 1);
96805 + atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
96806 atomic_set(&bat_priv->tt.vn, 0);
96807 atomic_set(&bat_priv->tt.local_changes, 0);
96808 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
96809 @@ -721,7 +721,7 @@ static int batadv_softif_init_late(struct net_device *dev)
96810
96811 /* randomize initial seqno to avoid collision */
96812 get_random_bytes(&random_seqno, sizeof(random_seqno));
96813 - atomic_set(&bat_priv->frag_seqno, random_seqno);
96814 + atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
96815
96816 bat_priv->primary_if = NULL;
96817 bat_priv->num_ifaces = 0;
96818 diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
96819 index 78370ab..1cb3614 100644
96820 --- a/net/batman-adv/types.h
96821 +++ b/net/batman-adv/types.h
96822 @@ -66,7 +66,7 @@ enum batadv_dhcp_recipient {
96823 struct batadv_hard_iface_bat_iv {
96824 unsigned char *ogm_buff;
96825 int ogm_buff_len;
96826 - atomic_t ogm_seqno;
96827 + atomic_unchecked_t ogm_seqno;
96828 };
96829
96830 /**
96831 @@ -714,7 +714,7 @@ struct batadv_priv {
96832 atomic_t bonding;
96833 atomic_t fragmentation;
96834 atomic_t packet_size_max;
96835 - atomic_t frag_seqno;
96836 + atomic_unchecked_t frag_seqno;
96837 #ifdef CONFIG_BATMAN_ADV_BLA
96838 atomic_t bridge_loop_avoidance;
96839 #endif
96840 @@ -730,7 +730,7 @@ struct batadv_priv {
96841 #endif
96842 uint32_t isolation_mark;
96843 uint32_t isolation_mark_mask;
96844 - atomic_t bcast_seqno;
96845 + atomic_unchecked_t bcast_seqno;
96846 atomic_t bcast_queue_left;
96847 atomic_t batman_queue_left;
96848 char num_ifaces;
96849 diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
96850 index 7552f9e..074ce29 100644
96851 --- a/net/bluetooth/hci_sock.c
96852 +++ b/net/bluetooth/hci_sock.c
96853 @@ -1052,7 +1052,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
96854 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
96855 }
96856
96857 - len = min_t(unsigned int, len, sizeof(uf));
96858 + len = min((size_t)len, sizeof(uf));
96859 if (copy_from_user(&uf, optval, len)) {
96860 err = -EFAULT;
96861 break;
96862 diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
96863 index b0ad2c7..96f6a5e 100644
96864 --- a/net/bluetooth/l2cap_core.c
96865 +++ b/net/bluetooth/l2cap_core.c
96866 @@ -3740,8 +3740,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
96867 break;
96868
96869 case L2CAP_CONF_RFC:
96870 - if (olen == sizeof(rfc))
96871 - memcpy(&rfc, (void *)val, olen);
96872 + if (olen != sizeof(rfc))
96873 + break;
96874 +
96875 + memcpy(&rfc, (void *)val, olen);
96876
96877 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
96878 rfc.mode != chan->mode)
96879 diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
96880 index d58f76b..b69600a 100644
96881 --- a/net/bluetooth/l2cap_sock.c
96882 +++ b/net/bluetooth/l2cap_sock.c
96883 @@ -625,7 +625,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
96884 struct sock *sk = sock->sk;
96885 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
96886 struct l2cap_options opts;
96887 - int len, err = 0;
96888 + int err = 0;
96889 + size_t len = optlen;
96890 u32 opt;
96891
96892 BT_DBG("sk %p", sk);
96893 @@ -652,7 +653,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
96894 opts.max_tx = chan->max_tx;
96895 opts.txwin_size = chan->tx_win;
96896
96897 - len = min_t(unsigned int, sizeof(opts), optlen);
96898 + len = min(sizeof(opts), len);
96899 if (copy_from_user((char *) &opts, optval, len)) {
96900 err = -EFAULT;
96901 break;
96902 @@ -734,7 +735,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
96903 struct bt_security sec;
96904 struct bt_power pwr;
96905 struct l2cap_conn *conn;
96906 - int len, err = 0;
96907 + int err = 0;
96908 + size_t len = optlen;
96909 u32 opt;
96910
96911 BT_DBG("sk %p", sk);
96912 @@ -757,7 +759,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
96913
96914 sec.level = BT_SECURITY_LOW;
96915
96916 - len = min_t(unsigned int, sizeof(sec), optlen);
96917 + len = min(sizeof(sec), len);
96918 if (copy_from_user((char *) &sec, optval, len)) {
96919 err = -EFAULT;
96920 break;
96921 @@ -857,7 +859,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
96922
96923 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
96924
96925 - len = min_t(unsigned int, sizeof(pwr), optlen);
96926 + len = min(sizeof(pwr), len);
96927 if (copy_from_user((char *) &pwr, optval, len)) {
96928 err = -EFAULT;
96929 break;
96930 diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
96931 index 3c2d3e4..884855a 100644
96932 --- a/net/bluetooth/rfcomm/sock.c
96933 +++ b/net/bluetooth/rfcomm/sock.c
96934 @@ -672,7 +672,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
96935 struct sock *sk = sock->sk;
96936 struct bt_security sec;
96937 int err = 0;
96938 - size_t len;
96939 + size_t len = optlen;
96940 u32 opt;
96941
96942 BT_DBG("sk %p", sk);
96943 @@ -694,7 +694,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
96944
96945 sec.level = BT_SECURITY_LOW;
96946
96947 - len = min_t(unsigned int, sizeof(sec), optlen);
96948 + len = min(sizeof(sec), len);
96949 if (copy_from_user((char *) &sec, optval, len)) {
96950 err = -EFAULT;
96951 break;
96952 diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
96953 index f9c0980a..fcbbfeb 100644
96954 --- a/net/bluetooth/rfcomm/tty.c
96955 +++ b/net/bluetooth/rfcomm/tty.c
96956 @@ -717,7 +717,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
96957 BT_DBG("tty %p id %d", tty, tty->index);
96958
96959 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
96960 - dev->channel, dev->port.count);
96961 + dev->channel, atomic_read(&dev->port.count));
96962
96963 err = tty_port_open(&dev->port, tty, filp);
96964 if (err)
96965 @@ -740,7 +740,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
96966 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
96967
96968 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
96969 - dev->port.count);
96970 + atomic_read(&dev->port.count));
96971
96972 tty_port_close(&dev->port, tty, filp);
96973 }
96974 diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
96975 index 0e474b1..fb7109c 100644
96976 --- a/net/bridge/netfilter/ebtables.c
96977 +++ b/net/bridge/netfilter/ebtables.c
96978 @@ -1525,7 +1525,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
96979 tmp.valid_hooks = t->table->valid_hooks;
96980 }
96981 mutex_unlock(&ebt_mutex);
96982 - if (copy_to_user(user, &tmp, *len) != 0) {
96983 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
96984 BUGPRINT("c2u Didn't work\n");
96985 ret = -EFAULT;
96986 break;
96987 @@ -2331,7 +2331,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
96988 goto out;
96989 tmp.valid_hooks = t->valid_hooks;
96990
96991 - if (copy_to_user(user, &tmp, *len) != 0) {
96992 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
96993 ret = -EFAULT;
96994 break;
96995 }
96996 @@ -2342,7 +2342,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
96997 tmp.entries_size = t->table->entries_size;
96998 tmp.valid_hooks = t->table->valid_hooks;
96999
97000 - if (copy_to_user(user, &tmp, *len) != 0) {
97001 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
97002 ret = -EFAULT;
97003 break;
97004 }
97005 diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
97006 index 0f45522..dab651f 100644
97007 --- a/net/caif/cfctrl.c
97008 +++ b/net/caif/cfctrl.c
97009 @@ -10,6 +10,7 @@
97010 #include <linux/spinlock.h>
97011 #include <linux/slab.h>
97012 #include <linux/pkt_sched.h>
97013 +#include <linux/sched.h>
97014 #include <net/caif/caif_layer.h>
97015 #include <net/caif/cfpkt.h>
97016 #include <net/caif/cfctrl.h>
97017 @@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
97018 memset(&dev_info, 0, sizeof(dev_info));
97019 dev_info.id = 0xff;
97020 cfsrvl_init(&this->serv, 0, &dev_info, false);
97021 - atomic_set(&this->req_seq_no, 1);
97022 - atomic_set(&this->rsp_seq_no, 1);
97023 + atomic_set_unchecked(&this->req_seq_no, 1);
97024 + atomic_set_unchecked(&this->rsp_seq_no, 1);
97025 this->serv.layer.receive = cfctrl_recv;
97026 sprintf(this->serv.layer.name, "ctrl");
97027 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
97028 @@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
97029 struct cfctrl_request_info *req)
97030 {
97031 spin_lock_bh(&ctrl->info_list_lock);
97032 - atomic_inc(&ctrl->req_seq_no);
97033 - req->sequence_no = atomic_read(&ctrl->req_seq_no);
97034 + atomic_inc_unchecked(&ctrl->req_seq_no);
97035 + req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
97036 list_add_tail(&req->list, &ctrl->list);
97037 spin_unlock_bh(&ctrl->info_list_lock);
97038 }
97039 @@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
97040 if (p != first)
97041 pr_warn("Requests are not received in order\n");
97042
97043 - atomic_set(&ctrl->rsp_seq_no,
97044 + atomic_set_unchecked(&ctrl->rsp_seq_no,
97045 p->sequence_no);
97046 list_del(&p->list);
97047 goto out;
97048 diff --git a/net/can/af_can.c b/net/can/af_can.c
97049 index a27f8aa..67174a3 100644
97050 --- a/net/can/af_can.c
97051 +++ b/net/can/af_can.c
97052 @@ -863,7 +863,7 @@ static const struct net_proto_family can_family_ops = {
97053 };
97054
97055 /* notifier block for netdevice event */
97056 -static struct notifier_block can_netdev_notifier __read_mostly = {
97057 +static struct notifier_block can_netdev_notifier = {
97058 .notifier_call = can_notifier,
97059 };
97060
97061 diff --git a/net/can/bcm.c b/net/can/bcm.c
97062 index dcb75c0..24b1b43 100644
97063 --- a/net/can/bcm.c
97064 +++ b/net/can/bcm.c
97065 @@ -1624,7 +1624,7 @@ static int __init bcm_module_init(void)
97066 }
97067
97068 /* create /proc/net/can-bcm directory */
97069 - proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
97070 + proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
97071 return 0;
97072 }
97073
97074 diff --git a/net/can/gw.c b/net/can/gw.c
97075 index ac31891..4799c17 100644
97076 --- a/net/can/gw.c
97077 +++ b/net/can/gw.c
97078 @@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
97079 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
97080
97081 static HLIST_HEAD(cgw_list);
97082 -static struct notifier_block notifier;
97083
97084 static struct kmem_cache *cgw_cache __read_mostly;
97085
97086 @@ -947,6 +946,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
97087 return err;
97088 }
97089
97090 +static struct notifier_block notifier = {
97091 + .notifier_call = cgw_notifier
97092 +};
97093 +
97094 static __init int cgw_module_init(void)
97095 {
97096 /* sanitize given module parameter */
97097 @@ -962,7 +965,6 @@ static __init int cgw_module_init(void)
97098 return -ENOMEM;
97099
97100 /* set notifier */
97101 - notifier.notifier_call = cgw_notifier;
97102 register_netdevice_notifier(&notifier);
97103
97104 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
97105 diff --git a/net/can/proc.c b/net/can/proc.c
97106 index b543470..d2ddae2 100644
97107 --- a/net/can/proc.c
97108 +++ b/net/can/proc.c
97109 @@ -468,7 +468,7 @@ static void can_remove_proc_readentry(const char *name)
97110 void can_init_proc(void)
97111 {
97112 /* create /proc/net/can directory */
97113 - can_dir = proc_mkdir("can", init_net.proc_net);
97114 + can_dir = proc_mkdir_restrict("can", init_net.proc_net);
97115
97116 if (!can_dir) {
97117 printk(KERN_INFO "can: failed to create /proc/net/can . "
97118 diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
97119 index 30efc5c..cfa1bbc 100644
97120 --- a/net/ceph/messenger.c
97121 +++ b/net/ceph/messenger.c
97122 @@ -187,7 +187,7 @@ static void con_fault(struct ceph_connection *con);
97123 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
97124
97125 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
97126 -static atomic_t addr_str_seq = ATOMIC_INIT(0);
97127 +static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
97128
97129 static struct page *zero_page; /* used in certain error cases */
97130
97131 @@ -198,7 +198,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
97132 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
97133 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
97134
97135 - i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
97136 + i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
97137 s = addr_str[i];
97138
97139 switch (ss->ss_family) {
97140 diff --git a/net/compat.c b/net/compat.c
97141 index f50161f..94fa415 100644
97142 --- a/net/compat.c
97143 +++ b/net/compat.c
97144 @@ -73,9 +73,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
97145 return -EFAULT;
97146 if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
97147 kmsg->msg_namelen = sizeof(struct sockaddr_storage);
97148 - kmsg->msg_name = compat_ptr(tmp1);
97149 - kmsg->msg_iov = compat_ptr(tmp2);
97150 - kmsg->msg_control = compat_ptr(tmp3);
97151 + kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
97152 + kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
97153 + kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
97154 return 0;
97155 }
97156
97157 @@ -87,7 +87,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
97158
97159 if (kern_msg->msg_namelen) {
97160 if (mode == VERIFY_READ) {
97161 - int err = move_addr_to_kernel(kern_msg->msg_name,
97162 + int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
97163 kern_msg->msg_namelen,
97164 kern_address);
97165 if (err < 0)
97166 @@ -99,7 +99,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
97167 kern_msg->msg_name = NULL;
97168
97169 tot_len = iov_from_user_compat_to_kern(kern_iov,
97170 - (struct compat_iovec __user *)kern_msg->msg_iov,
97171 + (struct compat_iovec __force_user *)kern_msg->msg_iov,
97172 kern_msg->msg_iovlen);
97173 if (tot_len >= 0)
97174 kern_msg->msg_iov = kern_iov;
97175 @@ -119,20 +119,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
97176
97177 #define CMSG_COMPAT_FIRSTHDR(msg) \
97178 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
97179 - (struct compat_cmsghdr __user *)((msg)->msg_control) : \
97180 + (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
97181 (struct compat_cmsghdr __user *)NULL)
97182
97183 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
97184 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
97185 (ucmlen) <= (unsigned long) \
97186 ((mhdr)->msg_controllen - \
97187 - ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
97188 + ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
97189
97190 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
97191 struct compat_cmsghdr __user *cmsg, int cmsg_len)
97192 {
97193 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
97194 - if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
97195 + if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
97196 msg->msg_controllen)
97197 return NULL;
97198 return (struct compat_cmsghdr __user *)ptr;
97199 @@ -222,7 +222,7 @@ Efault:
97200
97201 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
97202 {
97203 - struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
97204 + struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
97205 struct compat_cmsghdr cmhdr;
97206 struct compat_timeval ctv;
97207 struct compat_timespec cts[3];
97208 @@ -278,7 +278,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
97209
97210 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
97211 {
97212 - struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
97213 + struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
97214 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
97215 int fdnum = scm->fp->count;
97216 struct file **fp = scm->fp->fp;
97217 @@ -366,7 +366,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
97218 return -EFAULT;
97219 old_fs = get_fs();
97220 set_fs(KERNEL_DS);
97221 - err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
97222 + err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
97223 set_fs(old_fs);
97224
97225 return err;
97226 @@ -427,7 +427,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
97227 len = sizeof(ktime);
97228 old_fs = get_fs();
97229 set_fs(KERNEL_DS);
97230 - err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
97231 + err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
97232 set_fs(old_fs);
97233
97234 if (!err) {
97235 @@ -570,7 +570,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
97236 case MCAST_JOIN_GROUP:
97237 case MCAST_LEAVE_GROUP:
97238 {
97239 - struct compat_group_req __user *gr32 = (void *)optval;
97240 + struct compat_group_req __user *gr32 = (void __user *)optval;
97241 struct group_req __user *kgr =
97242 compat_alloc_user_space(sizeof(struct group_req));
97243 u32 interface;
97244 @@ -591,7 +591,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
97245 case MCAST_BLOCK_SOURCE:
97246 case MCAST_UNBLOCK_SOURCE:
97247 {
97248 - struct compat_group_source_req __user *gsr32 = (void *)optval;
97249 + struct compat_group_source_req __user *gsr32 = (void __user *)optval;
97250 struct group_source_req __user *kgsr = compat_alloc_user_space(
97251 sizeof(struct group_source_req));
97252 u32 interface;
97253 @@ -612,7 +612,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
97254 }
97255 case MCAST_MSFILTER:
97256 {
97257 - struct compat_group_filter __user *gf32 = (void *)optval;
97258 + struct compat_group_filter __user *gf32 = (void __user *)optval;
97259 struct group_filter __user *kgf;
97260 u32 interface, fmode, numsrc;
97261
97262 @@ -650,7 +650,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
97263 char __user *optval, int __user *optlen,
97264 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
97265 {
97266 - struct compat_group_filter __user *gf32 = (void *)optval;
97267 + struct compat_group_filter __user *gf32 = (void __user *)optval;
97268 struct group_filter __user *kgf;
97269 int __user *koptlen;
97270 u32 interface, fmode, numsrc;
97271 @@ -803,7 +803,7 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args)
97272
97273 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
97274 return -EINVAL;
97275 - if (copy_from_user(a, args, nas[call]))
97276 + if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
97277 return -EFAULT;
97278 a0 = a[0];
97279 a1 = a[1];
97280 diff --git a/net/core/datagram.c b/net/core/datagram.c
97281 index a16ed7b..eb44d17 100644
97282 --- a/net/core/datagram.c
97283 +++ b/net/core/datagram.c
97284 @@ -301,7 +301,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
97285 }
97286
97287 kfree_skb(skb);
97288 - atomic_inc(&sk->sk_drops);
97289 + atomic_inc_unchecked(&sk->sk_drops);
97290 sk_mem_reclaim_partial(sk);
97291
97292 return err;
97293 diff --git a/net/core/dev.c b/net/core/dev.c
97294 index 45fa2f1..f3e28ec 100644
97295 --- a/net/core/dev.c
97296 +++ b/net/core/dev.c
97297 @@ -1688,14 +1688,14 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
97298 {
97299 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
97300 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
97301 - atomic_long_inc(&dev->rx_dropped);
97302 + atomic_long_inc_unchecked(&dev->rx_dropped);
97303 kfree_skb(skb);
97304 return NET_RX_DROP;
97305 }
97306 }
97307
97308 if (unlikely(!is_skb_forwardable(dev, skb))) {
97309 - atomic_long_inc(&dev->rx_dropped);
97310 + atomic_long_inc_unchecked(&dev->rx_dropped);
97311 kfree_skb(skb);
97312 return NET_RX_DROP;
97313 }
97314 @@ -2453,7 +2453,7 @@ static int illegal_highdma(const struct net_device *dev, struct sk_buff *skb)
97315
97316 struct dev_gso_cb {
97317 void (*destructor)(struct sk_buff *skb);
97318 -};
97319 +} __no_const;
97320
97321 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
97322
97323 @@ -3227,7 +3227,7 @@ enqueue:
97324
97325 local_irq_restore(flags);
97326
97327 - atomic_long_inc(&skb->dev->rx_dropped);
97328 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
97329 kfree_skb(skb);
97330 return NET_RX_DROP;
97331 }
97332 @@ -3308,7 +3308,7 @@ int netif_rx_ni(struct sk_buff *skb)
97333 }
97334 EXPORT_SYMBOL(netif_rx_ni);
97335
97336 -static void net_tx_action(struct softirq_action *h)
97337 +static __latent_entropy void net_tx_action(void)
97338 {
97339 struct softnet_data *sd = &__get_cpu_var(softnet_data);
97340
97341 @@ -3645,7 +3645,7 @@ ncls:
97342 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
97343 } else {
97344 drop:
97345 - atomic_long_inc(&skb->dev->rx_dropped);
97346 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
97347 kfree_skb(skb);
97348 /* Jamal, now you will not able to escape explaining
97349 * me how you were going to use this. :-)
97350 @@ -4331,7 +4331,7 @@ void netif_napi_del(struct napi_struct *napi)
97351 }
97352 EXPORT_SYMBOL(netif_napi_del);
97353
97354 -static void net_rx_action(struct softirq_action *h)
97355 +static __latent_entropy void net_rx_action(void)
97356 {
97357 struct softnet_data *sd = &__get_cpu_var(softnet_data);
97358 unsigned long time_limit = jiffies + 2;
97359 @@ -6250,7 +6250,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
97360 } else {
97361 netdev_stats_to_stats64(storage, &dev->stats);
97362 }
97363 - storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
97364 + storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
97365 return storage;
97366 }
97367 EXPORT_SYMBOL(dev_get_stats);
97368 diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
97369 index cf999e0..c59a975 100644
97370 --- a/net/core/dev_ioctl.c
97371 +++ b/net/core/dev_ioctl.c
97372 @@ -366,9 +366,13 @@ void dev_load(struct net *net, const char *name)
97373 if (no_module && capable(CAP_NET_ADMIN))
97374 no_module = request_module("netdev-%s", name);
97375 if (no_module && capable(CAP_SYS_MODULE)) {
97376 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
97377 + ___request_module(true, "grsec_modharden_netdev", "%s", name);
97378 +#else
97379 if (!request_module("%s", name))
97380 pr_warn("Loading kernel module for a network device with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s instead.\n",
97381 name);
97382 +#endif
97383 }
97384 }
97385 EXPORT_SYMBOL(dev_load);
97386 diff --git a/net/core/filter.c b/net/core/filter.c
97387 index ad30d62..21c0743 100644
97388 --- a/net/core/filter.c
97389 +++ b/net/core/filter.c
97390 @@ -126,7 +126,7 @@ unsigned int sk_run_filter(const struct sk_buff *skb,
97391 void *ptr;
97392 u32 A = 0; /* Accumulator */
97393 u32 X = 0; /* Index Register */
97394 - u32 mem[BPF_MEMWORDS]; /* Scratch Memory Store */
97395 + u32 mem[BPF_MEMWORDS] = {}; /* Scratch Memory Store */
97396 u32 tmp;
97397 int k;
97398
97399 @@ -292,10 +292,10 @@ load_b:
97400 X = K;
97401 continue;
97402 case BPF_S_LD_MEM:
97403 - A = mem[K];
97404 + A = mem[K&15];
97405 continue;
97406 case BPF_S_LDX_MEM:
97407 - X = mem[K];
97408 + X = mem[K&15];
97409 continue;
97410 case BPF_S_MISC_TAX:
97411 X = A;
97412 @@ -308,10 +308,10 @@ load_b:
97413 case BPF_S_RET_A:
97414 return A;
97415 case BPF_S_ST:
97416 - mem[K] = A;
97417 + mem[K&15] = A;
97418 continue;
97419 case BPF_S_STX:
97420 - mem[K] = X;
97421 + mem[K&15] = X;
97422 continue;
97423 case BPF_S_ANC_PROTOCOL:
97424 A = ntohs(skb->protocol);
97425 @@ -355,6 +355,10 @@ load_b:
97426
97427 if (skb_is_nonlinear(skb))
97428 return 0;
97429 +
97430 + if (skb->len < sizeof(struct nlattr))
97431 + return 0;
97432 +
97433 if (A > skb->len - sizeof(struct nlattr))
97434 return 0;
97435
97436 @@ -371,11 +375,15 @@ load_b:
97437
97438 if (skb_is_nonlinear(skb))
97439 return 0;
97440 +
97441 + if (skb->len < sizeof(struct nlattr))
97442 + return 0;
97443 +
97444 if (A > skb->len - sizeof(struct nlattr))
97445 return 0;
97446
97447 nla = (struct nlattr *)&skb->data[A];
97448 - if (nla->nla_len > A - skb->len)
97449 + if (nla->nla_len > skb->len - A)
97450 return 0;
97451
97452 nla = nla_find_nested(nla, X);
97453 @@ -391,9 +399,10 @@ load_b:
97454 continue;
97455 #endif
97456 default:
97457 - WARN_RATELIMIT(1, "Unknown code:%u jt:%u tf:%u k:%u\n",
97458 + WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
97459 fentry->code, fentry->jt,
97460 fentry->jf, fentry->k);
97461 + BUG();
97462 return 0;
97463 }
97464 }
97465 @@ -416,7 +425,7 @@ static int check_load_and_stores(struct sock_filter *filter, int flen)
97466 u16 *masks, memvalid = 0; /* one bit per cell, 16 cells */
97467 int pc, ret = 0;
97468
97469 - BUILD_BUG_ON(BPF_MEMWORDS > 16);
97470 + BUILD_BUG_ON(BPF_MEMWORDS != 16);
97471 masks = kmalloc(flen * sizeof(*masks), GFP_KERNEL);
97472 if (!masks)
97473 return -ENOMEM;
97474 @@ -679,7 +688,7 @@ int sk_unattached_filter_create(struct sk_filter **pfp,
97475 fp = kmalloc(sk_filter_size(fprog->len), GFP_KERNEL);
97476 if (!fp)
97477 return -ENOMEM;
97478 - memcpy(fp->insns, fprog->filter, fsize);
97479 + memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
97480
97481 atomic_set(&fp->refcnt, 1);
97482 fp->len = fprog->len;
97483 diff --git a/net/core/flow.c b/net/core/flow.c
97484 index dfa602c..3103d88 100644
97485 --- a/net/core/flow.c
97486 +++ b/net/core/flow.c
97487 @@ -61,7 +61,7 @@ struct flow_cache {
97488 struct timer_list rnd_timer;
97489 };
97490
97491 -atomic_t flow_cache_genid = ATOMIC_INIT(0);
97492 +atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
97493 EXPORT_SYMBOL(flow_cache_genid);
97494 static struct flow_cache flow_cache_global;
97495 static struct kmem_cache *flow_cachep __read_mostly;
97496 @@ -86,7 +86,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
97497
97498 static int flow_entry_valid(struct flow_cache_entry *fle)
97499 {
97500 - if (atomic_read(&flow_cache_genid) != fle->genid)
97501 + if (atomic_read_unchecked(&flow_cache_genid) != fle->genid)
97502 return 0;
97503 if (fle->object && !fle->object->ops->check(fle->object))
97504 return 0;
97505 @@ -258,7 +258,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
97506 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
97507 fcp->hash_count++;
97508 }
97509 - } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) {
97510 + } else if (likely(fle->genid == atomic_read_unchecked(&flow_cache_genid))) {
97511 flo = fle->object;
97512 if (!flo)
97513 goto ret_object;
97514 @@ -279,7 +279,7 @@ nocache:
97515 }
97516 flo = resolver(net, key, family, dir, flo, ctx);
97517 if (fle) {
97518 - fle->genid = atomic_read(&flow_cache_genid);
97519 + fle->genid = atomic_read_unchecked(&flow_cache_genid);
97520 if (!IS_ERR(flo))
97521 fle->object = flo;
97522 else
97523 diff --git a/net/core/iovec.c b/net/core/iovec.c
97524 index b618694..192bbba 100644
97525 --- a/net/core/iovec.c
97526 +++ b/net/core/iovec.c
97527 @@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
97528 if (m->msg_namelen) {
97529 if (mode == VERIFY_READ) {
97530 void __user *namep;
97531 - namep = (void __user __force *) m->msg_name;
97532 + namep = (void __force_user *) m->msg_name;
97533 err = move_addr_to_kernel(namep, m->msg_namelen,
97534 address);
97535 if (err < 0)
97536 @@ -55,7 +55,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
97537 }
97538
97539 size = m->msg_iovlen * sizeof(struct iovec);
97540 - if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
97541 + if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
97542 return -EFAULT;
97543
97544 m->msg_iov = iov;
97545 diff --git a/net/core/neighbour.c b/net/core/neighbour.c
97546 index e161290..8149aea 100644
97547 --- a/net/core/neighbour.c
97548 +++ b/net/core/neighbour.c
97549 @@ -2824,7 +2824,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
97550 void __user *buffer, size_t *lenp, loff_t *ppos)
97551 {
97552 int size, ret;
97553 - struct ctl_table tmp = *ctl;
97554 + ctl_table_no_const tmp = *ctl;
97555
97556 tmp.extra1 = &zero;
97557 tmp.extra2 = &unres_qlen_max;
97558 @@ -2886,7 +2886,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
97559 void __user *buffer,
97560 size_t *lenp, loff_t *ppos)
97561 {
97562 - struct ctl_table tmp = *ctl;
97563 + ctl_table_no_const tmp = *ctl;
97564 int ret;
97565
97566 tmp.extra1 = &zero;
97567 @@ -3058,11 +3058,12 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,
97568 memset(&t->neigh_vars[NEIGH_VAR_GC_INTERVAL], 0,
97569 sizeof(t->neigh_vars[NEIGH_VAR_GC_INTERVAL]));
97570 } else {
97571 + struct neigh_table *ntable = container_of(p, struct neigh_table, parms);
97572 dev_name_source = "default";
97573 - t->neigh_vars[NEIGH_VAR_GC_INTERVAL].data = (int *)(p + 1);
97574 - t->neigh_vars[NEIGH_VAR_GC_THRESH1].data = (int *)(p + 1) + 1;
97575 - t->neigh_vars[NEIGH_VAR_GC_THRESH2].data = (int *)(p + 1) + 2;
97576 - t->neigh_vars[NEIGH_VAR_GC_THRESH3].data = (int *)(p + 1) + 3;
97577 + t->neigh_vars[NEIGH_VAR_GC_INTERVAL].data = &ntable->gc_interval;
97578 + t->neigh_vars[NEIGH_VAR_GC_THRESH1].data = &ntable->gc_thresh1;
97579 + t->neigh_vars[NEIGH_VAR_GC_THRESH2].data = &ntable->gc_thresh2;
97580 + t->neigh_vars[NEIGH_VAR_GC_THRESH3].data = &ntable->gc_thresh3;
97581 }
97582
97583 if (handler) {
97584 diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
97585 index 2bf8329..2eb1423 100644
97586 --- a/net/core/net-procfs.c
97587 +++ b/net/core/net-procfs.c
97588 @@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
97589 struct rtnl_link_stats64 temp;
97590 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
97591
97592 - seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
97593 + if (gr_proc_is_restricted())
97594 + seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
97595 + "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
97596 + dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
97597 + 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
97598 + else
97599 + seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
97600 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
97601 dev->name, stats->rx_bytes, stats->rx_packets,
97602 stats->rx_errors,
97603 @@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
97604 return 0;
97605 }
97606
97607 -static const struct seq_operations dev_seq_ops = {
97608 +const struct seq_operations dev_seq_ops = {
97609 .start = dev_seq_start,
97610 .next = dev_seq_next,
97611 .stop = dev_seq_stop,
97612 @@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
97613
97614 static int softnet_seq_open(struct inode *inode, struct file *file)
97615 {
97616 - return seq_open(file, &softnet_seq_ops);
97617 + return seq_open_restrict(file, &softnet_seq_ops);
97618 }
97619
97620 static const struct file_operations softnet_seq_fops = {
97621 @@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
97622 else
97623 seq_printf(seq, "%04x", ntohs(pt->type));
97624
97625 +#ifdef CONFIG_GRKERNSEC_HIDESYM
97626 + seq_printf(seq, " %-8s %pf\n",
97627 + pt->dev ? pt->dev->name : "", NULL);
97628 +#else
97629 seq_printf(seq, " %-8s %pf\n",
97630 pt->dev ? pt->dev->name : "", pt->func);
97631 +#endif
97632 }
97633
97634 return 0;
97635 diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
97636 index 81d3a9a..a0bd7a8 100644
97637 --- a/net/core/net_namespace.c
97638 +++ b/net/core/net_namespace.c
97639 @@ -443,7 +443,7 @@ static int __register_pernet_operations(struct list_head *list,
97640 int error;
97641 LIST_HEAD(net_exit_list);
97642
97643 - list_add_tail(&ops->list, list);
97644 + pax_list_add_tail((struct list_head *)&ops->list, list);
97645 if (ops->init || (ops->id && ops->size)) {
97646 for_each_net(net) {
97647 error = ops_init(ops, net);
97648 @@ -456,7 +456,7 @@ static int __register_pernet_operations(struct list_head *list,
97649
97650 out_undo:
97651 /* If I have an error cleanup all namespaces I initialized */
97652 - list_del(&ops->list);
97653 + pax_list_del((struct list_head *)&ops->list);
97654 ops_exit_list(ops, &net_exit_list);
97655 ops_free_list(ops, &net_exit_list);
97656 return error;
97657 @@ -467,7 +467,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
97658 struct net *net;
97659 LIST_HEAD(net_exit_list);
97660
97661 - list_del(&ops->list);
97662 + pax_list_del((struct list_head *)&ops->list);
97663 for_each_net(net)
97664 list_add_tail(&net->exit_list, &net_exit_list);
97665 ops_exit_list(ops, &net_exit_list);
97666 @@ -601,7 +601,7 @@ int register_pernet_device(struct pernet_operations *ops)
97667 mutex_lock(&net_mutex);
97668 error = register_pernet_operations(&pernet_list, ops);
97669 if (!error && (first_device == &pernet_list))
97670 - first_device = &ops->list;
97671 + first_device = (struct list_head *)&ops->list;
97672 mutex_unlock(&net_mutex);
97673 return error;
97674 }
97675 diff --git a/net/core/netpoll.c b/net/core/netpoll.c
97676 index df9e6b1..6e68e4e 100644
97677 --- a/net/core/netpoll.c
97678 +++ b/net/core/netpoll.c
97679 @@ -435,7 +435,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
97680 struct udphdr *udph;
97681 struct iphdr *iph;
97682 struct ethhdr *eth;
97683 - static atomic_t ip_ident;
97684 + static atomic_unchecked_t ip_ident;
97685 struct ipv6hdr *ip6h;
97686
97687 udp_len = len + sizeof(*udph);
97688 @@ -506,7 +506,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
97689 put_unaligned(0x45, (unsigned char *)iph);
97690 iph->tos = 0;
97691 put_unaligned(htons(ip_len), &(iph->tot_len));
97692 - iph->id = htons(atomic_inc_return(&ip_ident));
97693 + iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
97694 iph->frag_off = 0;
97695 iph->ttl = 64;
97696 iph->protocol = IPPROTO_UDP;
97697 diff --git a/net/core/pktgen.c b/net/core/pktgen.c
97698 index fdac61c..e5e5b46 100644
97699 --- a/net/core/pktgen.c
97700 +++ b/net/core/pktgen.c
97701 @@ -3719,7 +3719,7 @@ static int __net_init pg_net_init(struct net *net)
97702 pn->net = net;
97703 INIT_LIST_HEAD(&pn->pktgen_threads);
97704 pn->pktgen_exiting = false;
97705 - pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
97706 + pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
97707 if (!pn->proc_dir) {
97708 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
97709 return -ENODEV;
97710 diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
97711 index 120eecc..cd1ec44 100644
97712 --- a/net/core/rtnetlink.c
97713 +++ b/net/core/rtnetlink.c
97714 @@ -58,7 +58,7 @@ struct rtnl_link {
97715 rtnl_doit_func doit;
97716 rtnl_dumpit_func dumpit;
97717 rtnl_calcit_func calcit;
97718 -};
97719 +} __no_const;
97720
97721 static DEFINE_MUTEX(rtnl_mutex);
97722
97723 @@ -299,10 +299,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
97724 if (rtnl_link_ops_get(ops->kind))
97725 return -EEXIST;
97726
97727 - if (!ops->dellink)
97728 - ops->dellink = unregister_netdevice_queue;
97729 + if (!ops->dellink) {
97730 + pax_open_kernel();
97731 + *(void **)&ops->dellink = unregister_netdevice_queue;
97732 + pax_close_kernel();
97733 + }
97734
97735 - list_add_tail(&ops->list, &link_ops);
97736 + pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
97737 return 0;
97738 }
97739 EXPORT_SYMBOL_GPL(__rtnl_link_register);
97740 @@ -349,7 +352,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
97741 for_each_net(net) {
97742 __rtnl_kill_links(net, ops);
97743 }
97744 - list_del(&ops->list);
97745 + pax_list_del((struct list_head *)&ops->list);
97746 }
97747 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
97748
97749 diff --git a/net/core/scm.c b/net/core/scm.c
97750 index b442e7e..6f5b5a2 100644
97751 --- a/net/core/scm.c
97752 +++ b/net/core/scm.c
97753 @@ -210,7 +210,7 @@ EXPORT_SYMBOL(__scm_send);
97754 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
97755 {
97756 struct cmsghdr __user *cm
97757 - = (__force struct cmsghdr __user *)msg->msg_control;
97758 + = (struct cmsghdr __force_user *)msg->msg_control;
97759 struct cmsghdr cmhdr;
97760 int cmlen = CMSG_LEN(len);
97761 int err;
97762 @@ -233,7 +233,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
97763 err = -EFAULT;
97764 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
97765 goto out;
97766 - if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
97767 + if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
97768 goto out;
97769 cmlen = CMSG_SPACE(len);
97770 if (msg->msg_controllen < cmlen)
97771 @@ -249,7 +249,7 @@ EXPORT_SYMBOL(put_cmsg);
97772 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
97773 {
97774 struct cmsghdr __user *cm
97775 - = (__force struct cmsghdr __user*)msg->msg_control;
97776 + = (struct cmsghdr __force_user *)msg->msg_control;
97777
97778 int fdmax = 0;
97779 int fdnum = scm->fp->count;
97780 @@ -269,7 +269,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
97781 if (fdnum < fdmax)
97782 fdmax = fdnum;
97783
97784 - for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
97785 + for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
97786 i++, cmfptr++)
97787 {
97788 struct socket *sock;
97789 diff --git a/net/core/skbuff.c b/net/core/skbuff.c
97790 index 90b96a1..cd18f16d 100644
97791 --- a/net/core/skbuff.c
97792 +++ b/net/core/skbuff.c
97793 @@ -2003,7 +2003,7 @@ EXPORT_SYMBOL(__skb_checksum);
97794 __wsum skb_checksum(const struct sk_buff *skb, int offset,
97795 int len, __wsum csum)
97796 {
97797 - const struct skb_checksum_ops ops = {
97798 + static const struct skb_checksum_ops ops = {
97799 .update = csum_partial_ext,
97800 .combine = csum_block_add_ext,
97801 };
97802 @@ -3220,13 +3220,15 @@ void __init skb_init(void)
97803 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
97804 sizeof(struct sk_buff),
97805 0,
97806 - SLAB_HWCACHE_ALIGN|SLAB_PANIC,
97807 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|
97808 + SLAB_NO_SANITIZE,
97809 NULL);
97810 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
97811 (2*sizeof(struct sk_buff)) +
97812 sizeof(atomic_t),
97813 0,
97814 - SLAB_HWCACHE_ALIGN|SLAB_PANIC,
97815 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|
97816 + SLAB_NO_SANITIZE,
97817 NULL);
97818 }
97819
97820 diff --git a/net/core/sock.c b/net/core/sock.c
97821 index c0fc6bd..51d8326 100644
97822 --- a/net/core/sock.c
97823 +++ b/net/core/sock.c
97824 @@ -393,7 +393,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
97825 struct sk_buff_head *list = &sk->sk_receive_queue;
97826
97827 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
97828 - atomic_inc(&sk->sk_drops);
97829 + atomic_inc_unchecked(&sk->sk_drops);
97830 trace_sock_rcvqueue_full(sk, skb);
97831 return -ENOMEM;
97832 }
97833 @@ -403,7 +403,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
97834 return err;
97835
97836 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
97837 - atomic_inc(&sk->sk_drops);
97838 + atomic_inc_unchecked(&sk->sk_drops);
97839 return -ENOBUFS;
97840 }
97841
97842 @@ -423,7 +423,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
97843 skb_dst_force(skb);
97844
97845 spin_lock_irqsave(&list->lock, flags);
97846 - skb->dropcount = atomic_read(&sk->sk_drops);
97847 + skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
97848 __skb_queue_tail(list, skb);
97849 spin_unlock_irqrestore(&list->lock, flags);
97850
97851 @@ -443,7 +443,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
97852 skb->dev = NULL;
97853
97854 if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) {
97855 - atomic_inc(&sk->sk_drops);
97856 + atomic_inc_unchecked(&sk->sk_drops);
97857 goto discard_and_relse;
97858 }
97859 if (nested)
97860 @@ -461,7 +461,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
97861 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
97862 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
97863 bh_unlock_sock(sk);
97864 - atomic_inc(&sk->sk_drops);
97865 + atomic_inc_unchecked(&sk->sk_drops);
97866 goto discard_and_relse;
97867 }
97868
97869 @@ -949,12 +949,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
97870 struct timeval tm;
97871 } v;
97872
97873 - int lv = sizeof(int);
97874 - int len;
97875 + unsigned int lv = sizeof(int);
97876 + unsigned int len;
97877
97878 if (get_user(len, optlen))
97879 return -EFAULT;
97880 - if (len < 0)
97881 + if (len > INT_MAX)
97882 return -EINVAL;
97883
97884 memset(&v, 0, sizeof(v));
97885 @@ -1106,11 +1106,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
97886
97887 case SO_PEERNAME:
97888 {
97889 - char address[128];
97890 + char address[_K_SS_MAXSIZE];
97891
97892 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
97893 return -ENOTCONN;
97894 - if (lv < len)
97895 + if (lv < len || sizeof address < len)
97896 return -EINVAL;
97897 if (copy_to_user(optval, address, len))
97898 return -EFAULT;
97899 @@ -1191,7 +1191,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
97900
97901 if (len > lv)
97902 len = lv;
97903 - if (copy_to_user(optval, &v, len))
97904 + if (len > sizeof(v) || copy_to_user(optval, &v, len))
97905 return -EFAULT;
97906 lenout:
97907 if (put_user(len, optlen))
97908 @@ -2326,7 +2326,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
97909 */
97910 smp_wmb();
97911 atomic_set(&sk->sk_refcnt, 1);
97912 - atomic_set(&sk->sk_drops, 0);
97913 + atomic_set_unchecked(&sk->sk_drops, 0);
97914 }
97915 EXPORT_SYMBOL(sock_init_data);
97916
97917 @@ -2454,6 +2454,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
97918 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
97919 int level, int type)
97920 {
97921 + struct sock_extended_err ee;
97922 struct sock_exterr_skb *serr;
97923 struct sk_buff *skb, *skb2;
97924 int copied, err;
97925 @@ -2475,7 +2476,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
97926 sock_recv_timestamp(msg, sk, skb);
97927
97928 serr = SKB_EXT_ERR(skb);
97929 - put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
97930 + ee = serr->ee;
97931 + put_cmsg(msg, level, type, sizeof ee, &ee);
97932
97933 msg->msg_flags |= MSG_ERRQUEUE;
97934 err = copied;
97935 diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
97936 index a0e9cf6..ef7f9ed 100644
97937 --- a/net/core/sock_diag.c
97938 +++ b/net/core/sock_diag.c
97939 @@ -9,26 +9,33 @@
97940 #include <linux/inet_diag.h>
97941 #include <linux/sock_diag.h>
97942
97943 -static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
97944 +static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
97945 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
97946 static DEFINE_MUTEX(sock_diag_table_mutex);
97947
97948 int sock_diag_check_cookie(void *sk, __u32 *cookie)
97949 {
97950 +#ifndef CONFIG_GRKERNSEC_HIDESYM
97951 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
97952 cookie[1] != INET_DIAG_NOCOOKIE) &&
97953 ((u32)(unsigned long)sk != cookie[0] ||
97954 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
97955 return -ESTALE;
97956 else
97957 +#endif
97958 return 0;
97959 }
97960 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
97961
97962 void sock_diag_save_cookie(void *sk, __u32 *cookie)
97963 {
97964 +#ifdef CONFIG_GRKERNSEC_HIDESYM
97965 + cookie[0] = 0;
97966 + cookie[1] = 0;
97967 +#else
97968 cookie[0] = (u32)(unsigned long)sk;
97969 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
97970 +#endif
97971 }
97972 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
97973
97974 @@ -113,8 +120,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
97975 mutex_lock(&sock_diag_table_mutex);
97976 if (sock_diag_handlers[hndl->family])
97977 err = -EBUSY;
97978 - else
97979 + else {
97980 + pax_open_kernel();
97981 sock_diag_handlers[hndl->family] = hndl;
97982 + pax_close_kernel();
97983 + }
97984 mutex_unlock(&sock_diag_table_mutex);
97985
97986 return err;
97987 @@ -130,7 +140,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
97988
97989 mutex_lock(&sock_diag_table_mutex);
97990 BUG_ON(sock_diag_handlers[family] != hnld);
97991 + pax_open_kernel();
97992 sock_diag_handlers[family] = NULL;
97993 + pax_close_kernel();
97994 mutex_unlock(&sock_diag_table_mutex);
97995 }
97996 EXPORT_SYMBOL_GPL(sock_diag_unregister);
97997 diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
97998 index cf9cd13..8b56af3 100644
97999 --- a/net/core/sysctl_net_core.c
98000 +++ b/net/core/sysctl_net_core.c
98001 @@ -32,7 +32,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
98002 {
98003 unsigned int orig_size, size;
98004 int ret, i;
98005 - struct ctl_table tmp = {
98006 + ctl_table_no_const tmp = {
98007 .data = &size,
98008 .maxlen = sizeof(size),
98009 .mode = table->mode
98010 @@ -200,7 +200,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
98011 void __user *buffer, size_t *lenp, loff_t *ppos)
98012 {
98013 char id[IFNAMSIZ];
98014 - struct ctl_table tbl = {
98015 + ctl_table_no_const tbl = {
98016 .data = id,
98017 .maxlen = IFNAMSIZ,
98018 };
98019 @@ -379,13 +379,12 @@ static struct ctl_table netns_core_table[] = {
98020
98021 static __net_init int sysctl_core_net_init(struct net *net)
98022 {
98023 - struct ctl_table *tbl;
98024 + ctl_table_no_const *tbl = NULL;
98025
98026 net->core.sysctl_somaxconn = SOMAXCONN;
98027
98028 - tbl = netns_core_table;
98029 if (!net_eq(net, &init_net)) {
98030 - tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
98031 + tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
98032 if (tbl == NULL)
98033 goto err_dup;
98034
98035 @@ -395,17 +394,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
98036 if (net->user_ns != &init_user_ns) {
98037 tbl[0].procname = NULL;
98038 }
98039 - }
98040 -
98041 - net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
98042 + net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
98043 + } else
98044 + net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
98045 if (net->core.sysctl_hdr == NULL)
98046 goto err_reg;
98047
98048 return 0;
98049
98050 err_reg:
98051 - if (tbl != netns_core_table)
98052 - kfree(tbl);
98053 + kfree(tbl);
98054 err_dup:
98055 return -ENOMEM;
98056 }
98057 @@ -420,7 +418,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
98058 kfree(tbl);
98059 }
98060
98061 -static __net_initdata struct pernet_operations sysctl_core_ops = {
98062 +static __net_initconst struct pernet_operations sysctl_core_ops = {
98063 .init = sysctl_core_net_init,
98064 .exit = sysctl_core_net_exit,
98065 };
98066 diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
98067 index 4c04848..f575934 100644
98068 --- a/net/decnet/af_decnet.c
98069 +++ b/net/decnet/af_decnet.c
98070 @@ -465,6 +465,7 @@ static struct proto dn_proto = {
98071 .sysctl_rmem = sysctl_decnet_rmem,
98072 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
98073 .obj_size = sizeof(struct dn_sock),
98074 + .slab_flags = SLAB_USERCOPY,
98075 };
98076
98077 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
98078 diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
98079 index a603823..a36ee0b 100644
98080 --- a/net/decnet/dn_dev.c
98081 +++ b/net/decnet/dn_dev.c
98082 @@ -200,7 +200,7 @@ static struct dn_dev_sysctl_table {
98083 .extra1 = &min_t3,
98084 .extra2 = &max_t3
98085 },
98086 - {0}
98087 + { }
98088 },
98089 };
98090
98091 diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
98092 index 5325b54..a0d4d69 100644
98093 --- a/net/decnet/sysctl_net_decnet.c
98094 +++ b/net/decnet/sysctl_net_decnet.c
98095 @@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
98096
98097 if (len > *lenp) len = *lenp;
98098
98099 - if (copy_to_user(buffer, addr, len))
98100 + if (len > sizeof addr || copy_to_user(buffer, addr, len))
98101 return -EFAULT;
98102
98103 *lenp = len;
98104 @@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
98105
98106 if (len > *lenp) len = *lenp;
98107
98108 - if (copy_to_user(buffer, devname, len))
98109 + if (len > sizeof devname || copy_to_user(buffer, devname, len))
98110 return -EFAULT;
98111
98112 *lenp = len;
98113 diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c
98114 index 1846c1f..96d4a9f 100644
98115 --- a/net/ieee802154/dgram.c
98116 +++ b/net/ieee802154/dgram.c
98117 @@ -313,8 +313,9 @@ static int dgram_recvmsg(struct kiocb *iocb, struct sock *sk,
98118 if (saddr) {
98119 saddr->family = AF_IEEE802154;
98120 saddr->addr = mac_cb(skb)->sa;
98121 + }
98122 + if (addr_len)
98123 *addr_len = sizeof(*saddr);
98124 - }
98125
98126 if (flags & MSG_TRUNC)
98127 copied = skb->len;
98128 diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
98129 index 19ab78a..bf575c9 100644
98130 --- a/net/ipv4/af_inet.c
98131 +++ b/net/ipv4/af_inet.c
98132 @@ -1703,13 +1703,9 @@ static int __init inet_init(void)
98133
98134 BUILD_BUG_ON(sizeof(struct inet_skb_parm) > FIELD_SIZEOF(struct sk_buff, cb));
98135
98136 - sysctl_local_reserved_ports = kzalloc(65536 / 8, GFP_KERNEL);
98137 - if (!sysctl_local_reserved_ports)
98138 - goto out;
98139 -
98140 rc = proto_register(&tcp_prot, 1);
98141 if (rc)
98142 - goto out_free_reserved_ports;
98143 + goto out;
98144
98145 rc = proto_register(&udp_prot, 1);
98146 if (rc)
98147 @@ -1816,8 +1812,6 @@ out_unregister_udp_proto:
98148 proto_unregister(&udp_prot);
98149 out_unregister_tcp_proto:
98150 proto_unregister(&tcp_prot);
98151 -out_free_reserved_ports:
98152 - kfree(sysctl_local_reserved_ports);
98153 goto out;
98154 }
98155
98156 diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
98157 index bdbf68b..deb4759 100644
98158 --- a/net/ipv4/devinet.c
98159 +++ b/net/ipv4/devinet.c
98160 @@ -1543,7 +1543,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
98161 idx = 0;
98162 head = &net->dev_index_head[h];
98163 rcu_read_lock();
98164 - cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
98165 + cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
98166 net->dev_base_seq;
98167 hlist_for_each_entry_rcu(dev, head, index_hlist) {
98168 if (idx < s_idx)
98169 @@ -1861,7 +1861,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
98170 idx = 0;
98171 head = &net->dev_index_head[h];
98172 rcu_read_lock();
98173 - cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
98174 + cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
98175 net->dev_base_seq;
98176 hlist_for_each_entry_rcu(dev, head, index_hlist) {
98177 if (idx < s_idx)
98178 @@ -2096,7 +2096,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
98179 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
98180 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
98181
98182 -static struct devinet_sysctl_table {
98183 +static const struct devinet_sysctl_table {
98184 struct ctl_table_header *sysctl_header;
98185 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
98186 } devinet_sysctl = {
98187 @@ -2218,7 +2218,7 @@ static __net_init int devinet_init_net(struct net *net)
98188 int err;
98189 struct ipv4_devconf *all, *dflt;
98190 #ifdef CONFIG_SYSCTL
98191 - struct ctl_table *tbl = ctl_forward_entry;
98192 + ctl_table_no_const *tbl = NULL;
98193 struct ctl_table_header *forw_hdr;
98194 #endif
98195
98196 @@ -2236,7 +2236,7 @@ static __net_init int devinet_init_net(struct net *net)
98197 goto err_alloc_dflt;
98198
98199 #ifdef CONFIG_SYSCTL
98200 - tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
98201 + tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
98202 if (tbl == NULL)
98203 goto err_alloc_ctl;
98204
98205 @@ -2256,7 +2256,10 @@ static __net_init int devinet_init_net(struct net *net)
98206 goto err_reg_dflt;
98207
98208 err = -ENOMEM;
98209 - forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
98210 + if (!net_eq(net, &init_net))
98211 + forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
98212 + else
98213 + forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
98214 if (forw_hdr == NULL)
98215 goto err_reg_ctl;
98216 net->ipv4.forw_hdr = forw_hdr;
98217 @@ -2272,8 +2275,7 @@ err_reg_ctl:
98218 err_reg_dflt:
98219 __devinet_sysctl_unregister(all);
98220 err_reg_all:
98221 - if (tbl != ctl_forward_entry)
98222 - kfree(tbl);
98223 + kfree(tbl);
98224 err_alloc_ctl:
98225 #endif
98226 if (dflt != &ipv4_devconf_dflt)
98227 diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
98228 index c7539e2..b455e51 100644
98229 --- a/net/ipv4/fib_frontend.c
98230 +++ b/net/ipv4/fib_frontend.c
98231 @@ -1015,12 +1015,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
98232 #ifdef CONFIG_IP_ROUTE_MULTIPATH
98233 fib_sync_up(dev);
98234 #endif
98235 - atomic_inc(&net->ipv4.dev_addr_genid);
98236 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
98237 rt_cache_flush(dev_net(dev));
98238 break;
98239 case NETDEV_DOWN:
98240 fib_del_ifaddr(ifa, NULL);
98241 - atomic_inc(&net->ipv4.dev_addr_genid);
98242 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
98243 if (ifa->ifa_dev->ifa_list == NULL) {
98244 /* Last address was deleted from this interface.
98245 * Disable IP.
98246 @@ -1058,7 +1058,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
98247 #ifdef CONFIG_IP_ROUTE_MULTIPATH
98248 fib_sync_up(dev);
98249 #endif
98250 - atomic_inc(&net->ipv4.dev_addr_genid);
98251 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
98252 rt_cache_flush(net);
98253 break;
98254 case NETDEV_DOWN:
98255 diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
98256 index b53f0bf..3585b33 100644
98257 --- a/net/ipv4/fib_semantics.c
98258 +++ b/net/ipv4/fib_semantics.c
98259 @@ -767,7 +767,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
98260 nh->nh_saddr = inet_select_addr(nh->nh_dev,
98261 nh->nh_gw,
98262 nh->nh_parent->fib_scope);
98263 - nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
98264 + nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
98265
98266 return nh->nh_saddr;
98267 }
98268 diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
98269 index 0d1e2cb..4501a2c 100644
98270 --- a/net/ipv4/inet_connection_sock.c
98271 +++ b/net/ipv4/inet_connection_sock.c
98272 @@ -29,7 +29,7 @@ const char inet_csk_timer_bug_msg[] = "inet_csk BUG: unknown timer value\n";
98273 EXPORT_SYMBOL(inet_csk_timer_bug_msg);
98274 #endif
98275
98276 -unsigned long *sysctl_local_reserved_ports;
98277 +unsigned long sysctl_local_reserved_ports[65536 / 8 / sizeof(unsigned long)];
98278 EXPORT_SYMBOL(sysctl_local_reserved_ports);
98279
98280 void inet_get_local_port_range(struct net *net, int *low, int *high)
98281 diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
98282 index 8b9cf27..0d8d592 100644
98283 --- a/net/ipv4/inet_hashtables.c
98284 +++ b/net/ipv4/inet_hashtables.c
98285 @@ -18,6 +18,7 @@
98286 #include <linux/sched.h>
98287 #include <linux/slab.h>
98288 #include <linux/wait.h>
98289 +#include <linux/security.h>
98290
98291 #include <net/inet_connection_sock.h>
98292 #include <net/inet_hashtables.h>
98293 @@ -49,6 +50,8 @@ static unsigned int inet_sk_ehashfn(const struct sock *sk)
98294 return inet_ehashfn(net, laddr, lport, faddr, fport);
98295 }
98296
98297 +extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
98298 +
98299 /*
98300 * Allocate and initialize a new local port bind bucket.
98301 * The bindhash mutex for snum's hash chain must be held here.
98302 @@ -554,6 +557,8 @@ ok:
98303 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
98304 spin_unlock(&head->lock);
98305
98306 + gr_update_task_in_ip_table(current, inet_sk(sk));
98307 +
98308 if (tw) {
98309 inet_twsk_deschedule(tw, death_row);
98310 while (twrefcnt) {
98311 diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
98312 index 48f4244..f56d83a 100644
98313 --- a/net/ipv4/inetpeer.c
98314 +++ b/net/ipv4/inetpeer.c
98315 @@ -496,8 +496,8 @@ relookup:
98316 if (p) {
98317 p->daddr = *daddr;
98318 atomic_set(&p->refcnt, 1);
98319 - atomic_set(&p->rid, 0);
98320 - atomic_set(&p->ip_id_count,
98321 + atomic_set_unchecked(&p->rid, 0);
98322 + atomic_set_unchecked(&p->ip_id_count,
98323 (daddr->family == AF_INET) ?
98324 secure_ip_id(daddr->addr.a4) :
98325 secure_ipv6_id(daddr->addr.a6));
98326 diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
98327 index c10a3ce..dd71f84 100644
98328 --- a/net/ipv4/ip_fragment.c
98329 +++ b/net/ipv4/ip_fragment.c
98330 @@ -283,7 +283,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
98331 return 0;
98332
98333 start = qp->rid;
98334 - end = atomic_inc_return(&peer->rid);
98335 + end = atomic_inc_return_unchecked(&peer->rid);
98336 qp->rid = end;
98337
98338 rc = qp->q.fragments && (end - start) > max;
98339 @@ -760,12 +760,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
98340
98341 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
98342 {
98343 - struct ctl_table *table;
98344 + ctl_table_no_const *table = NULL;
98345 struct ctl_table_header *hdr;
98346
98347 - table = ip4_frags_ns_ctl_table;
98348 if (!net_eq(net, &init_net)) {
98349 - table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
98350 + table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
98351 if (table == NULL)
98352 goto err_alloc;
98353
98354 @@ -776,9 +775,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
98355 /* Don't export sysctls to unprivileged users */
98356 if (net->user_ns != &init_user_ns)
98357 table[0].procname = NULL;
98358 - }
98359 + hdr = register_net_sysctl(net, "net/ipv4", table);
98360 + } else
98361 + hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
98362
98363 - hdr = register_net_sysctl(net, "net/ipv4", table);
98364 if (hdr == NULL)
98365 goto err_reg;
98366
98367 @@ -786,8 +786,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
98368 return 0;
98369
98370 err_reg:
98371 - if (!net_eq(net, &init_net))
98372 - kfree(table);
98373 + kfree(table);
98374 err_alloc:
98375 return -ENOMEM;
98376 }
98377 diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
98378 index ec4f762..4ce3645 100644
98379 --- a/net/ipv4/ip_gre.c
98380 +++ b/net/ipv4/ip_gre.c
98381 @@ -115,7 +115,7 @@ static bool log_ecn_error = true;
98382 module_param(log_ecn_error, bool, 0644);
98383 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
98384
98385 -static struct rtnl_link_ops ipgre_link_ops __read_mostly;
98386 +static struct rtnl_link_ops ipgre_link_ops;
98387 static int ipgre_tunnel_init(struct net_device *dev);
98388
98389 static int ipgre_net_id __read_mostly;
98390 @@ -732,7 +732,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
98391 [IFLA_GRE_PMTUDISC] = { .type = NLA_U8 },
98392 };
98393
98394 -static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
98395 +static struct rtnl_link_ops ipgre_link_ops = {
98396 .kind = "gre",
98397 .maxtype = IFLA_GRE_MAX,
98398 .policy = ipgre_policy,
98399 @@ -746,7 +746,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
98400 .fill_info = ipgre_fill_info,
98401 };
98402
98403 -static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
98404 +static struct rtnl_link_ops ipgre_tap_ops = {
98405 .kind = "gretap",
98406 .maxtype = IFLA_GRE_MAX,
98407 .policy = ipgre_policy,
98408 diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
98409 index 580dd96..9fcef7e 100644
98410 --- a/net/ipv4/ip_sockglue.c
98411 +++ b/net/ipv4/ip_sockglue.c
98412 @@ -1171,7 +1171,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
98413 len = min_t(unsigned int, len, opt->optlen);
98414 if (put_user(len, optlen))
98415 return -EFAULT;
98416 - if (copy_to_user(optval, opt->__data, len))
98417 + if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
98418 + copy_to_user(optval, opt->__data, len))
98419 return -EFAULT;
98420 return 0;
98421 }
98422 @@ -1302,7 +1303,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
98423 if (sk->sk_type != SOCK_STREAM)
98424 return -ENOPROTOOPT;
98425
98426 - msg.msg_control = optval;
98427 + msg.msg_control = (void __force_kernel *)optval;
98428 msg.msg_controllen = len;
98429 msg.msg_flags = flags;
98430
98431 diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
98432 index 48eafae..defff53 100644
98433 --- a/net/ipv4/ip_vti.c
98434 +++ b/net/ipv4/ip_vti.c
98435 @@ -44,7 +44,7 @@
98436 #include <net/net_namespace.h>
98437 #include <net/netns/generic.h>
98438
98439 -static struct rtnl_link_ops vti_link_ops __read_mostly;
98440 +static struct rtnl_link_ops vti_link_ops;
98441
98442 static int vti_net_id __read_mostly;
98443 static int vti_tunnel_init(struct net_device *dev);
98444 @@ -360,7 +360,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
98445 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
98446 };
98447
98448 -static struct rtnl_link_ops vti_link_ops __read_mostly = {
98449 +static struct rtnl_link_ops vti_link_ops = {
98450 .kind = "vti",
98451 .maxtype = IFLA_VTI_MAX,
98452 .policy = vti_policy,
98453 diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
98454 index b3e86ea..18ce98c 100644
98455 --- a/net/ipv4/ipconfig.c
98456 +++ b/net/ipv4/ipconfig.c
98457 @@ -334,7 +334,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
98458
98459 mm_segment_t oldfs = get_fs();
98460 set_fs(get_ds());
98461 - res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
98462 + res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
98463 set_fs(oldfs);
98464 return res;
98465 }
98466 @@ -345,7 +345,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
98467
98468 mm_segment_t oldfs = get_fs();
98469 set_fs(get_ds());
98470 - res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
98471 + res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
98472 set_fs(oldfs);
98473 return res;
98474 }
98475 @@ -356,7 +356,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
98476
98477 mm_segment_t oldfs = get_fs();
98478 set_fs(get_ds());
98479 - res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
98480 + res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
98481 set_fs(oldfs);
98482 return res;
98483 }
98484 diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
98485 index 812b183..56cbe9c 100644
98486 --- a/net/ipv4/ipip.c
98487 +++ b/net/ipv4/ipip.c
98488 @@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
98489 static int ipip_net_id __read_mostly;
98490
98491 static int ipip_tunnel_init(struct net_device *dev);
98492 -static struct rtnl_link_ops ipip_link_ops __read_mostly;
98493 +static struct rtnl_link_ops ipip_link_ops;
98494
98495 static int ipip_err(struct sk_buff *skb, u32 info)
98496 {
98497 @@ -409,7 +409,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
98498 [IFLA_IPTUN_PMTUDISC] = { .type = NLA_U8 },
98499 };
98500
98501 -static struct rtnl_link_ops ipip_link_ops __read_mostly = {
98502 +static struct rtnl_link_ops ipip_link_ops = {
98503 .kind = "ipip",
98504 .maxtype = IFLA_IPTUN_MAX,
98505 .policy = ipip_policy,
98506 diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
98507 index 59da7cd..e318de1 100644
98508 --- a/net/ipv4/netfilter/arp_tables.c
98509 +++ b/net/ipv4/netfilter/arp_tables.c
98510 @@ -885,14 +885,14 @@ static int compat_table_info(const struct xt_table_info *info,
98511 #endif
98512
98513 static int get_info(struct net *net, void __user *user,
98514 - const int *len, int compat)
98515 + int len, int compat)
98516 {
98517 char name[XT_TABLE_MAXNAMELEN];
98518 struct xt_table *t;
98519 int ret;
98520
98521 - if (*len != sizeof(struct arpt_getinfo)) {
98522 - duprintf("length %u != %Zu\n", *len,
98523 + if (len != sizeof(struct arpt_getinfo)) {
98524 + duprintf("length %u != %Zu\n", len,
98525 sizeof(struct arpt_getinfo));
98526 return -EINVAL;
98527 }
98528 @@ -929,7 +929,7 @@ static int get_info(struct net *net, void __user *user,
98529 info.size = private->size;
98530 strcpy(info.name, name);
98531
98532 - if (copy_to_user(user, &info, *len) != 0)
98533 + if (copy_to_user(user, &info, len) != 0)
98534 ret = -EFAULT;
98535 else
98536 ret = 0;
98537 @@ -1688,7 +1688,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
98538
98539 switch (cmd) {
98540 case ARPT_SO_GET_INFO:
98541 - ret = get_info(sock_net(sk), user, len, 1);
98542 + ret = get_info(sock_net(sk), user, *len, 1);
98543 break;
98544 case ARPT_SO_GET_ENTRIES:
98545 ret = compat_get_entries(sock_net(sk), user, len);
98546 @@ -1733,7 +1733,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
98547
98548 switch (cmd) {
98549 case ARPT_SO_GET_INFO:
98550 - ret = get_info(sock_net(sk), user, len, 0);
98551 + ret = get_info(sock_net(sk), user, *len, 0);
98552 break;
98553
98554 case ARPT_SO_GET_ENTRIES:
98555 diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
98556 index 718dfbd..cef4152 100644
98557 --- a/net/ipv4/netfilter/ip_tables.c
98558 +++ b/net/ipv4/netfilter/ip_tables.c
98559 @@ -1073,14 +1073,14 @@ static int compat_table_info(const struct xt_table_info *info,
98560 #endif
98561
98562 static int get_info(struct net *net, void __user *user,
98563 - const int *len, int compat)
98564 + int len, int compat)
98565 {
98566 char name[XT_TABLE_MAXNAMELEN];
98567 struct xt_table *t;
98568 int ret;
98569
98570 - if (*len != sizeof(struct ipt_getinfo)) {
98571 - duprintf("length %u != %zu\n", *len,
98572 + if (len != sizeof(struct ipt_getinfo)) {
98573 + duprintf("length %u != %zu\n", len,
98574 sizeof(struct ipt_getinfo));
98575 return -EINVAL;
98576 }
98577 @@ -1117,7 +1117,7 @@ static int get_info(struct net *net, void __user *user,
98578 info.size = private->size;
98579 strcpy(info.name, name);
98580
98581 - if (copy_to_user(user, &info, *len) != 0)
98582 + if (copy_to_user(user, &info, len) != 0)
98583 ret = -EFAULT;
98584 else
98585 ret = 0;
98586 @@ -1971,7 +1971,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
98587
98588 switch (cmd) {
98589 case IPT_SO_GET_INFO:
98590 - ret = get_info(sock_net(sk), user, len, 1);
98591 + ret = get_info(sock_net(sk), user, *len, 1);
98592 break;
98593 case IPT_SO_GET_ENTRIES:
98594 ret = compat_get_entries(sock_net(sk), user, len);
98595 @@ -2018,7 +2018,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
98596
98597 switch (cmd) {
98598 case IPT_SO_GET_INFO:
98599 - ret = get_info(sock_net(sk), user, len, 0);
98600 + ret = get_info(sock_net(sk), user, *len, 0);
98601 break;
98602
98603 case IPT_SO_GET_ENTRIES:
98604 diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
98605 index 2510c02..cfb34fa 100644
98606 --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
98607 +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
98608 @@ -720,7 +720,7 @@ static int clusterip_net_init(struct net *net)
98609 spin_lock_init(&cn->lock);
98610
98611 #ifdef CONFIG_PROC_FS
98612 - cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
98613 + cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
98614 if (!cn->procdir) {
98615 pr_err("Unable to proc dir entry\n");
98616 return -ENOMEM;
98617 diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
98618 index 2d11c09..3f153f8 100644
98619 --- a/net/ipv4/ping.c
98620 +++ b/net/ipv4/ping.c
98621 @@ -59,7 +59,7 @@ struct ping_table {
98622 };
98623
98624 static struct ping_table ping_table;
98625 -struct pingv6_ops pingv6_ops;
98626 +struct pingv6_ops *pingv6_ops;
98627 EXPORT_SYMBOL_GPL(pingv6_ops);
98628
98629 static u16 ping_port_rover;
98630 @@ -255,23 +255,28 @@ int ping_init_sock(struct sock *sk)
98631 struct group_info *group_info = get_current_groups();
98632 int i, j, count = group_info->ngroups;
98633 kgid_t low, high;
98634 + int ret = 0;
98635
98636 inet_get_ping_group_range_net(net, &low, &high);
98637 if (gid_lte(low, group) && gid_lte(group, high))
98638 - return 0;
98639 + goto out_release_group;
98640
98641 for (i = 0; i < group_info->nblocks; i++) {
98642 int cp_count = min_t(int, NGROUPS_PER_BLOCK, count);
98643 for (j = 0; j < cp_count; j++) {
98644 kgid_t gid = group_info->blocks[i][j];
98645 if (gid_lte(low, gid) && gid_lte(gid, high))
98646 - return 0;
98647 + goto out_release_group;
98648 }
98649
98650 count -= cp_count;
98651 }
98652
98653 - return -EACCES;
98654 + ret = -EACCES;
98655 +
98656 +out_release_group:
98657 + put_group_info(group_info);
98658 + return ret;
98659 }
98660 EXPORT_SYMBOL_GPL(ping_init_sock);
98661
98662 @@ -341,7 +346,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
98663 return -ENODEV;
98664 }
98665 }
98666 - has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
98667 + has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
98668 scoped);
98669 rcu_read_unlock();
98670
98671 @@ -549,7 +554,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
98672 }
98673 #if IS_ENABLED(CONFIG_IPV6)
98674 } else if (skb->protocol == htons(ETH_P_IPV6)) {
98675 - harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
98676 + harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
98677 #endif
98678 }
98679
98680 @@ -567,7 +572,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
98681 info, (u8 *)icmph);
98682 #if IS_ENABLED(CONFIG_IPV6)
98683 } else if (family == AF_INET6) {
98684 - pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
98685 + pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
98686 info, (u8 *)icmph);
98687 #endif
98688 }
98689 @@ -837,6 +842,8 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
98690 {
98691 struct inet_sock *isk = inet_sk(sk);
98692 int family = sk->sk_family;
98693 + struct sockaddr_in *sin;
98694 + struct sockaddr_in6 *sin6;
98695 struct sk_buff *skb;
98696 int copied, err;
98697
98698 @@ -846,12 +853,19 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
98699 if (flags & MSG_OOB)
98700 goto out;
98701
98702 + if (addr_len) {
98703 + if (family == AF_INET)
98704 + *addr_len = sizeof(*sin);
98705 + else if (family == AF_INET6 && addr_len)
98706 + *addr_len = sizeof(*sin6);
98707 + }
98708 +
98709 if (flags & MSG_ERRQUEUE) {
98710 if (family == AF_INET) {
98711 return ip_recv_error(sk, msg, len, addr_len);
98712 #if IS_ENABLED(CONFIG_IPV6)
98713 } else if (family == AF_INET6) {
98714 - return pingv6_ops.ipv6_recv_error(sk, msg, len,
98715 + return pingv6_ops->ipv6_recv_error(sk, msg, len,
98716 addr_len);
98717 #endif
98718 }
98719 @@ -883,7 +897,6 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
98720 sin->sin_port = 0 /* skb->h.uh->source */;
98721 sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
98722 memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
98723 - *addr_len = sizeof(*sin);
98724 }
98725
98726 if (isk->cmsg_flags)
98727 @@ -905,14 +918,13 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
98728 sin6->sin6_scope_id =
98729 ipv6_iface_scope_id(&sin6->sin6_addr,
98730 IP6CB(skb)->iif);
98731 - *addr_len = sizeof(*sin6);
98732 }
98733
98734 if (inet6_sk(sk)->rxopt.all)
98735 - pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
98736 + pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
98737 if (skb->protocol == htons(ETH_P_IPV6) &&
98738 inet6_sk(sk)->rxopt.all)
98739 - pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
98740 + pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
98741 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
98742 ip_cmsg_recv(msg, skb);
98743 #endif
98744 @@ -1104,7 +1116,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
98745 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
98746 0, sock_i_ino(sp),
98747 atomic_read(&sp->sk_refcnt), sp,
98748 - atomic_read(&sp->sk_drops));
98749 + atomic_read_unchecked(&sp->sk_drops));
98750 }
98751
98752 static int ping_v4_seq_show(struct seq_file *seq, void *v)
98753 diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
98754 index c04518f..824ebe5 100644
98755 --- a/net/ipv4/raw.c
98756 +++ b/net/ipv4/raw.c
98757 @@ -311,7 +311,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
98758 int raw_rcv(struct sock *sk, struct sk_buff *skb)
98759 {
98760 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
98761 - atomic_inc(&sk->sk_drops);
98762 + atomic_inc_unchecked(&sk->sk_drops);
98763 kfree_skb(skb);
98764 return NET_RX_DROP;
98765 }
98766 @@ -696,6 +696,9 @@ static int raw_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
98767 if (flags & MSG_OOB)
98768 goto out;
98769
98770 + if (addr_len)
98771 + *addr_len = sizeof(*sin);
98772 +
98773 if (flags & MSG_ERRQUEUE) {
98774 err = ip_recv_error(sk, msg, len, addr_len);
98775 goto out;
98776 @@ -723,7 +726,6 @@ static int raw_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
98777 sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
98778 sin->sin_port = 0;
98779 memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
98780 - *addr_len = sizeof(*sin);
98781 }
98782 if (inet->cmsg_flags)
98783 ip_cmsg_recv(msg, skb);
98784 @@ -748,16 +750,20 @@ static int raw_init(struct sock *sk)
98785
98786 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
98787 {
98788 + struct icmp_filter filter;
98789 +
98790 if (optlen > sizeof(struct icmp_filter))
98791 optlen = sizeof(struct icmp_filter);
98792 - if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
98793 + if (copy_from_user(&filter, optval, optlen))
98794 return -EFAULT;
98795 + raw_sk(sk)->filter = filter;
98796 return 0;
98797 }
98798
98799 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
98800 {
98801 int len, ret = -EFAULT;
98802 + struct icmp_filter filter;
98803
98804 if (get_user(len, optlen))
98805 goto out;
98806 @@ -767,8 +773,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
98807 if (len > sizeof(struct icmp_filter))
98808 len = sizeof(struct icmp_filter);
98809 ret = -EFAULT;
98810 - if (put_user(len, optlen) ||
98811 - copy_to_user(optval, &raw_sk(sk)->filter, len))
98812 + filter = raw_sk(sk)->filter;
98813 + if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
98814 goto out;
98815 ret = 0;
98816 out: return ret;
98817 @@ -997,7 +1003,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
98818 0, 0L, 0,
98819 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
98820 0, sock_i_ino(sp),
98821 - atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
98822 + atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
98823 }
98824
98825 static int raw_seq_show(struct seq_file *seq, void *v)
98826 diff --git a/net/ipv4/route.c b/net/ipv4/route.c
98827 index 4c011ec..8fae66b 100644
98828 --- a/net/ipv4/route.c
98829 +++ b/net/ipv4/route.c
98830 @@ -233,7 +233,7 @@ static const struct seq_operations rt_cache_seq_ops = {
98831
98832 static int rt_cache_seq_open(struct inode *inode, struct file *file)
98833 {
98834 - return seq_open(file, &rt_cache_seq_ops);
98835 + return seq_open_restrict(file, &rt_cache_seq_ops);
98836 }
98837
98838 static const struct file_operations rt_cache_seq_fops = {
98839 @@ -324,7 +324,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
98840
98841 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
98842 {
98843 - return seq_open(file, &rt_cpu_seq_ops);
98844 + return seq_open_restrict(file, &rt_cpu_seq_ops);
98845 }
98846
98847 static const struct file_operations rt_cpu_seq_fops = {
98848 @@ -362,7 +362,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
98849
98850 static int rt_acct_proc_open(struct inode *inode, struct file *file)
98851 {
98852 - return single_open(file, rt_acct_proc_show, NULL);
98853 + return single_open_restrict(file, rt_acct_proc_show, NULL);
98854 }
98855
98856 static const struct file_operations rt_acct_proc_fops = {
98857 @@ -2623,34 +2623,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
98858 .maxlen = sizeof(int),
98859 .mode = 0200,
98860 .proc_handler = ipv4_sysctl_rtcache_flush,
98861 + .extra1 = &init_net,
98862 },
98863 { },
98864 };
98865
98866 static __net_init int sysctl_route_net_init(struct net *net)
98867 {
98868 - struct ctl_table *tbl;
98869 + ctl_table_no_const *tbl = NULL;
98870
98871 - tbl = ipv4_route_flush_table;
98872 if (!net_eq(net, &init_net)) {
98873 - tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
98874 + tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
98875 if (tbl == NULL)
98876 goto err_dup;
98877
98878 /* Don't export sysctls to unprivileged users */
98879 if (net->user_ns != &init_user_ns)
98880 tbl[0].procname = NULL;
98881 - }
98882 - tbl[0].extra1 = net;
98883 + tbl[0].extra1 = net;
98884 + net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
98885 + } else
98886 + net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
98887
98888 - net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
98889 if (net->ipv4.route_hdr == NULL)
98890 goto err_reg;
98891 return 0;
98892
98893 err_reg:
98894 - if (tbl != ipv4_route_flush_table)
98895 - kfree(tbl);
98896 + kfree(tbl);
98897 err_dup:
98898 return -ENOMEM;
98899 }
98900 @@ -2673,8 +2673,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
98901
98902 static __net_init int rt_genid_init(struct net *net)
98903 {
98904 - atomic_set(&net->ipv4.rt_genid, 0);
98905 - atomic_set(&net->fnhe_genid, 0);
98906 + atomic_set_unchecked(&net->ipv4.rt_genid, 0);
98907 + atomic_set_unchecked(&net->fnhe_genid, 0);
98908 get_random_bytes(&net->ipv4.dev_addr_genid,
98909 sizeof(net->ipv4.dev_addr_genid));
98910 return 0;
98911 diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
98912 index 44eba05..b36864b 100644
98913 --- a/net/ipv4/sysctl_net_ipv4.c
98914 +++ b/net/ipv4/sysctl_net_ipv4.c
98915 @@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
98916 container_of(table->data, struct net, ipv4.sysctl_local_ports.range);
98917 int ret;
98918 int range[2];
98919 - struct ctl_table tmp = {
98920 + ctl_table_no_const tmp = {
98921 .data = &range,
98922 .maxlen = sizeof(range),
98923 .mode = table->mode,
98924 @@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
98925 int ret;
98926 gid_t urange[2];
98927 kgid_t low, high;
98928 - struct ctl_table tmp = {
98929 + ctl_table_no_const tmp = {
98930 .data = &urange,
98931 .maxlen = sizeof(urange),
98932 .mode = table->mode,
98933 @@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
98934 void __user *buffer, size_t *lenp, loff_t *ppos)
98935 {
98936 char val[TCP_CA_NAME_MAX];
98937 - struct ctl_table tbl = {
98938 + ctl_table_no_const tbl = {
98939 .data = val,
98940 .maxlen = TCP_CA_NAME_MAX,
98941 };
98942 @@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
98943 void __user *buffer, size_t *lenp,
98944 loff_t *ppos)
98945 {
98946 - struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
98947 + ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
98948 int ret;
98949
98950 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
98951 @@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
98952 void __user *buffer, size_t *lenp,
98953 loff_t *ppos)
98954 {
98955 - struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
98956 + ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
98957 int ret;
98958
98959 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
98960 @@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
98961 void __user *buffer, size_t *lenp,
98962 loff_t *ppos)
98963 {
98964 - struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
98965 + ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
98966 struct tcp_fastopen_context *ctxt;
98967 int ret;
98968 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
98969 @@ -438,7 +438,7 @@ static struct ctl_table ipv4_table[] = {
98970 },
98971 {
98972 .procname = "ip_local_reserved_ports",
98973 - .data = NULL, /* initialized in sysctl_ipv4_init */
98974 + .data = sysctl_local_reserved_ports,
98975 .maxlen = 65536,
98976 .mode = 0644,
98977 .proc_handler = proc_do_large_bitmap,
98978 @@ -843,13 +843,12 @@ static struct ctl_table ipv4_net_table[] = {
98979
98980 static __net_init int ipv4_sysctl_init_net(struct net *net)
98981 {
98982 - struct ctl_table *table;
98983 + ctl_table_no_const *table = NULL;
98984
98985 - table = ipv4_net_table;
98986 if (!net_eq(net, &init_net)) {
98987 int i;
98988
98989 - table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
98990 + table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
98991 if (table == NULL)
98992 goto err_alloc;
98993
98994 @@ -872,15 +871,17 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
98995 net->ipv4.sysctl_local_ports.range[0] = 32768;
98996 net->ipv4.sysctl_local_ports.range[1] = 61000;
98997
98998 - net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
98999 + if (!net_eq(net, &init_net))
99000 + net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
99001 + else
99002 + net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
99003 if (net->ipv4.ipv4_hdr == NULL)
99004 goto err_reg;
99005
99006 return 0;
99007
99008 err_reg:
99009 - if (!net_eq(net, &init_net))
99010 - kfree(table);
99011 + kfree(table);
99012 err_alloc:
99013 return -ENOMEM;
99014 }
99015 @@ -902,16 +903,6 @@ static __net_initdata struct pernet_operations ipv4_sysctl_ops = {
99016 static __init int sysctl_ipv4_init(void)
99017 {
99018 struct ctl_table_header *hdr;
99019 - struct ctl_table *i;
99020 -
99021 - for (i = ipv4_table; i->procname; i++) {
99022 - if (strcmp(i->procname, "ip_local_reserved_ports") == 0) {
99023 - i->data = sysctl_local_reserved_ports;
99024 - break;
99025 - }
99026 - }
99027 - if (!i->procname)
99028 - return -EINVAL;
99029
99030 hdr = register_net_sysctl(&init_net, "net/ipv4", ipv4_table);
99031 if (hdr == NULL)
99032 diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
99033 index eeaac39..dc29942 100644
99034 --- a/net/ipv4/tcp_input.c
99035 +++ b/net/ipv4/tcp_input.c
99036 @@ -761,7 +761,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
99037 * without any lock. We want to make sure compiler wont store
99038 * intermediate values in this location.
99039 */
99040 - ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
99041 + ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
99042 sk->sk_max_pacing_rate);
99043 }
99044
99045 @@ -4485,7 +4485,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
99046 * simplifies code)
99047 */
99048 static void
99049 -tcp_collapse(struct sock *sk, struct sk_buff_head *list,
99050 +__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
99051 struct sk_buff *head, struct sk_buff *tail,
99052 u32 start, u32 end)
99053 {
99054 @@ -5562,6 +5562,7 @@ discard:
99055 tcp_paws_reject(&tp->rx_opt, 0))
99056 goto discard_and_undo;
99057
99058 +#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
99059 if (th->syn) {
99060 /* We see SYN without ACK. It is attempt of
99061 * simultaneous connect with crossed SYNs.
99062 @@ -5612,6 +5613,7 @@ discard:
99063 goto discard;
99064 #endif
99065 }
99066 +#endif
99067 /* "fifth, if neither of the SYN or RST bits is set then
99068 * drop the segment and return."
99069 */
99070 @@ -5658,7 +5660,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
99071 goto discard;
99072
99073 if (th->syn) {
99074 - if (th->fin)
99075 + if (th->fin || th->urg || th->psh)
99076 goto discard;
99077 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
99078 return 1;
99079 diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
99080 index 1e4eac7..a66fa4a 100644
99081 --- a/net/ipv4/tcp_ipv4.c
99082 +++ b/net/ipv4/tcp_ipv4.c
99083 @@ -91,6 +91,10 @@ int sysctl_tcp_low_latency __read_mostly;
99084 EXPORT_SYMBOL(sysctl_tcp_low_latency);
99085
99086
99087 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99088 +extern int grsec_enable_blackhole;
99089 +#endif
99090 +
99091 #ifdef CONFIG_TCP_MD5SIG
99092 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
99093 __be32 daddr, __be32 saddr, const struct tcphdr *th);
99094 @@ -1829,6 +1833,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
99095 return 0;
99096
99097 reset:
99098 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99099 + if (!grsec_enable_blackhole)
99100 +#endif
99101 tcp_v4_send_reset(rsk, skb);
99102 discard:
99103 kfree_skb(skb);
99104 @@ -1974,12 +1981,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
99105 TCP_SKB_CB(skb)->sacked = 0;
99106
99107 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
99108 - if (!sk)
99109 + if (!sk) {
99110 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99111 + ret = 1;
99112 +#endif
99113 goto no_tcp_socket;
99114 -
99115 + }
99116 process:
99117 - if (sk->sk_state == TCP_TIME_WAIT)
99118 + if (sk->sk_state == TCP_TIME_WAIT) {
99119 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99120 + ret = 2;
99121 +#endif
99122 goto do_time_wait;
99123 + }
99124
99125 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
99126 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
99127 @@ -2033,6 +2047,10 @@ csum_error:
99128 bad_packet:
99129 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
99130 } else {
99131 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99132 + if (!grsec_enable_blackhole || (ret == 1 &&
99133 + (skb->dev->flags & IFF_LOOPBACK)))
99134 +#endif
99135 tcp_v4_send_reset(NULL, skb);
99136 }
99137
99138 diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
99139 index 7a436c5..1b05c59 100644
99140 --- a/net/ipv4/tcp_minisocks.c
99141 +++ b/net/ipv4/tcp_minisocks.c
99142 @@ -27,6 +27,10 @@
99143 #include <net/inet_common.h>
99144 #include <net/xfrm.h>
99145
99146 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99147 +extern int grsec_enable_blackhole;
99148 +#endif
99149 +
99150 int sysctl_tcp_syncookies __read_mostly = 1;
99151 EXPORT_SYMBOL(sysctl_tcp_syncookies);
99152
99153 @@ -709,7 +713,10 @@ embryonic_reset:
99154 * avoid becoming vulnerable to outside attack aiming at
99155 * resetting legit local connections.
99156 */
99157 - req->rsk_ops->send_reset(sk, skb);
99158 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99159 + if (!grsec_enable_blackhole)
99160 +#endif
99161 + req->rsk_ops->send_reset(sk, skb);
99162 } else if (fastopen) { /* received a valid RST pkt */
99163 reqsk_fastopen_remove(sk, req, true);
99164 tcp_reset(sk);
99165 diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
99166 index 1f2d376..01d18c4 100644
99167 --- a/net/ipv4/tcp_probe.c
99168 +++ b/net/ipv4/tcp_probe.c
99169 @@ -238,7 +238,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
99170 if (cnt + width >= len)
99171 break;
99172
99173 - if (copy_to_user(buf + cnt, tbuf, width))
99174 + if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
99175 return -EFAULT;
99176 cnt += width;
99177 }
99178 diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
99179 index 64f0354..a81b39d 100644
99180 --- a/net/ipv4/tcp_timer.c
99181 +++ b/net/ipv4/tcp_timer.c
99182 @@ -22,6 +22,10 @@
99183 #include <linux/gfp.h>
99184 #include <net/tcp.h>
99185
99186 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99187 +extern int grsec_lastack_retries;
99188 +#endif
99189 +
99190 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
99191 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
99192 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
99193 @@ -189,6 +193,13 @@ static int tcp_write_timeout(struct sock *sk)
99194 }
99195 }
99196
99197 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99198 + if ((sk->sk_state == TCP_LAST_ACK) &&
99199 + (grsec_lastack_retries > 0) &&
99200 + (grsec_lastack_retries < retry_until))
99201 + retry_until = grsec_lastack_retries;
99202 +#endif
99203 +
99204 if (retransmits_timed_out(sk, retry_until,
99205 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
99206 /* Has it gone just too far? */
99207 diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
99208 index 77bd16f..5f7174a 100644
99209 --- a/net/ipv4/udp.c
99210 +++ b/net/ipv4/udp.c
99211 @@ -87,6 +87,7 @@
99212 #include <linux/types.h>
99213 #include <linux/fcntl.h>
99214 #include <linux/module.h>
99215 +#include <linux/security.h>
99216 #include <linux/socket.h>
99217 #include <linux/sockios.h>
99218 #include <linux/igmp.h>
99219 @@ -113,6 +114,10 @@
99220 #include <net/busy_poll.h>
99221 #include "udp_impl.h"
99222
99223 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99224 +extern int grsec_enable_blackhole;
99225 +#endif
99226 +
99227 struct udp_table udp_table __read_mostly;
99228 EXPORT_SYMBOL(udp_table);
99229
99230 @@ -615,6 +620,9 @@ found:
99231 return s;
99232 }
99233
99234 +extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
99235 +extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
99236 +
99237 /*
99238 * This routine is called by the ICMP module when it gets some
99239 * sort of error condition. If err < 0 then the socket should
99240 @@ -914,9 +922,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
99241 dport = usin->sin_port;
99242 if (dport == 0)
99243 return -EINVAL;
99244 +
99245 + err = gr_search_udp_sendmsg(sk, usin);
99246 + if (err)
99247 + return err;
99248 } else {
99249 if (sk->sk_state != TCP_ESTABLISHED)
99250 return -EDESTADDRREQ;
99251 +
99252 + err = gr_search_udp_sendmsg(sk, NULL);
99253 + if (err)
99254 + return err;
99255 +
99256 daddr = inet->inet_daddr;
99257 dport = inet->inet_dport;
99258 /* Open fast path for connected socket.
99259 @@ -1163,7 +1180,7 @@ static unsigned int first_packet_length(struct sock *sk)
99260 IS_UDPLITE(sk));
99261 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
99262 IS_UDPLITE(sk));
99263 - atomic_inc(&sk->sk_drops);
99264 + atomic_inc_unchecked(&sk->sk_drops);
99265 __skb_unlink(skb, rcvq);
99266 __skb_queue_tail(&list_kill, skb);
99267 }
99268 @@ -1234,6 +1251,12 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
99269 int is_udplite = IS_UDPLITE(sk);
99270 bool slow;
99271
99272 + /*
99273 + * Check any passed addresses
99274 + */
99275 + if (addr_len)
99276 + *addr_len = sizeof(*sin);
99277 +
99278 if (flags & MSG_ERRQUEUE)
99279 return ip_recv_error(sk, msg, len, addr_len);
99280
99281 @@ -1243,6 +1266,10 @@ try_again:
99282 if (!skb)
99283 goto out;
99284
99285 + err = gr_search_udp_recvmsg(sk, skb);
99286 + if (err)
99287 + goto out_free;
99288 +
99289 ulen = skb->len - sizeof(struct udphdr);
99290 copied = len;
99291 if (copied > ulen)
99292 @@ -1276,7 +1303,7 @@ try_again:
99293 if (unlikely(err)) {
99294 trace_kfree_skb(skb, udp_recvmsg);
99295 if (!peeked) {
99296 - atomic_inc(&sk->sk_drops);
99297 + atomic_inc_unchecked(&sk->sk_drops);
99298 UDP_INC_STATS_USER(sock_net(sk),
99299 UDP_MIB_INERRORS, is_udplite);
99300 }
99301 @@ -1295,7 +1322,6 @@ try_again:
99302 sin->sin_port = udp_hdr(skb)->source;
99303 sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
99304 memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
99305 - *addr_len = sizeof(*sin);
99306 }
99307 if (inet->cmsg_flags)
99308 ip_cmsg_recv(msg, skb);
99309 @@ -1566,7 +1592,7 @@ csum_error:
99310 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
99311 drop:
99312 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
99313 - atomic_inc(&sk->sk_drops);
99314 + atomic_inc_unchecked(&sk->sk_drops);
99315 kfree_skb(skb);
99316 return -1;
99317 }
99318 @@ -1585,7 +1611,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
99319 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
99320
99321 if (!skb1) {
99322 - atomic_inc(&sk->sk_drops);
99323 + atomic_inc_unchecked(&sk->sk_drops);
99324 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
99325 IS_UDPLITE(sk));
99326 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
99327 @@ -1786,6 +1812,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
99328 goto csum_error;
99329
99330 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
99331 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99332 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
99333 +#endif
99334 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
99335
99336 /*
99337 @@ -2350,7 +2379,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
99338 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
99339 0, sock_i_ino(sp),
99340 atomic_read(&sp->sk_refcnt), sp,
99341 - atomic_read(&sp->sk_drops));
99342 + atomic_read_unchecked(&sp->sk_drops));
99343 }
99344
99345 int udp4_seq_show(struct seq_file *seq, void *v)
99346 diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
99347 index e1a6393..f634ce5 100644
99348 --- a/net/ipv4/xfrm4_policy.c
99349 +++ b/net/ipv4/xfrm4_policy.c
99350 @@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
99351 fl4->flowi4_tos = iph->tos;
99352 }
99353
99354 -static inline int xfrm4_garbage_collect(struct dst_ops *ops)
99355 +static int xfrm4_garbage_collect(struct dst_ops *ops)
99356 {
99357 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
99358
99359 - xfrm4_policy_afinfo.garbage_collect(net);
99360 + xfrm_garbage_collect_deferred(net);
99361 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
99362 }
99363
99364 @@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
99365
99366 static int __net_init xfrm4_net_init(struct net *net)
99367 {
99368 - struct ctl_table *table;
99369 + ctl_table_no_const *table = NULL;
99370 struct ctl_table_header *hdr;
99371
99372 - table = xfrm4_policy_table;
99373 if (!net_eq(net, &init_net)) {
99374 - table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
99375 + table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
99376 if (!table)
99377 goto err_alloc;
99378
99379 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
99380 - }
99381 -
99382 - hdr = register_net_sysctl(net, "net/ipv4", table);
99383 + hdr = register_net_sysctl(net, "net/ipv4", table);
99384 + } else
99385 + hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
99386 if (!hdr)
99387 goto err_reg;
99388
99389 @@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
99390 return 0;
99391
99392 err_reg:
99393 - if (!net_eq(net, &init_net))
99394 - kfree(table);
99395 + kfree(table);
99396 err_alloc:
99397 return -ENOMEM;
99398 }
99399 diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
99400 index 6c7fa08..285086c 100644
99401 --- a/net/ipv6/addrconf.c
99402 +++ b/net/ipv6/addrconf.c
99403 @@ -598,7 +598,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
99404 idx = 0;
99405 head = &net->dev_index_head[h];
99406 rcu_read_lock();
99407 - cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
99408 + cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
99409 net->dev_base_seq;
99410 hlist_for_each_entry_rcu(dev, head, index_hlist) {
99411 if (idx < s_idx)
99412 @@ -2395,7 +2395,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
99413 p.iph.ihl = 5;
99414 p.iph.protocol = IPPROTO_IPV6;
99415 p.iph.ttl = 64;
99416 - ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
99417 + ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
99418
99419 if (ops->ndo_do_ioctl) {
99420 mm_segment_t oldfs = get_fs();
99421 @@ -4146,7 +4146,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
99422 s_ip_idx = ip_idx = cb->args[2];
99423
99424 rcu_read_lock();
99425 - cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
99426 + cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
99427 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
99428 idx = 0;
99429 head = &net->dev_index_head[h];
99430 @@ -4758,7 +4758,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
99431 dst_free(&ifp->rt->dst);
99432 break;
99433 }
99434 - atomic_inc(&net->ipv6.dev_addr_genid);
99435 + atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
99436 rt_genid_bump_ipv6(net);
99437 }
99438
99439 @@ -4779,7 +4779,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
99440 int *valp = ctl->data;
99441 int val = *valp;
99442 loff_t pos = *ppos;
99443 - struct ctl_table lctl;
99444 + ctl_table_no_const lctl;
99445 int ret;
99446
99447 /*
99448 @@ -4864,7 +4864,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
99449 int *valp = ctl->data;
99450 int val = *valp;
99451 loff_t pos = *ppos;
99452 - struct ctl_table lctl;
99453 + ctl_table_no_const lctl;
99454 int ret;
99455
99456 /*
99457 diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
99458 index d935889..2f64330 100644
99459 --- a/net/ipv6/af_inet6.c
99460 +++ b/net/ipv6/af_inet6.c
99461 @@ -776,7 +776,7 @@ static int __net_init inet6_net_init(struct net *net)
99462 net->ipv6.sysctl.bindv6only = 0;
99463 net->ipv6.sysctl.icmpv6_time = 1*HZ;
99464 net->ipv6.sysctl.flowlabel_consistency = 1;
99465 - atomic_set(&net->ipv6.rt_genid, 0);
99466 + atomic_set_unchecked(&net->ipv6.rt_genid, 0);
99467
99468 err = ipv6_init_mibs(net);
99469 if (err)
99470 diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
99471 index c3bf2d2..1f00573 100644
99472 --- a/net/ipv6/datagram.c
99473 +++ b/net/ipv6/datagram.c
99474 @@ -938,5 +938,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
99475 0,
99476 sock_i_ino(sp),
99477 atomic_read(&sp->sk_refcnt), sp,
99478 - atomic_read(&sp->sk_drops));
99479 + atomic_read_unchecked(&sp->sk_drops));
99480 }
99481 diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
99482 index 7b32652..0bc348b 100644
99483 --- a/net/ipv6/icmp.c
99484 +++ b/net/ipv6/icmp.c
99485 @@ -1005,7 +1005,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
99486
99487 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
99488 {
99489 - struct ctl_table *table;
99490 + ctl_table_no_const *table;
99491
99492 table = kmemdup(ipv6_icmp_table_template,
99493 sizeof(ipv6_icmp_table_template),
99494 diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
99495 index f3ffb43..1172ba7 100644
99496 --- a/net/ipv6/ip6_gre.c
99497 +++ b/net/ipv6/ip6_gre.c
99498 @@ -71,7 +71,7 @@ struct ip6gre_net {
99499 struct net_device *fb_tunnel_dev;
99500 };
99501
99502 -static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
99503 +static struct rtnl_link_ops ip6gre_link_ops;
99504 static int ip6gre_tunnel_init(struct net_device *dev);
99505 static void ip6gre_tunnel_setup(struct net_device *dev);
99506 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
99507 @@ -1291,7 +1291,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
99508 }
99509
99510
99511 -static struct inet6_protocol ip6gre_protocol __read_mostly = {
99512 +static struct inet6_protocol ip6gre_protocol = {
99513 .handler = ip6gre_rcv,
99514 .err_handler = ip6gre_err,
99515 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
99516 @@ -1634,7 +1634,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
99517 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
99518 };
99519
99520 -static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
99521 +static struct rtnl_link_ops ip6gre_link_ops = {
99522 .kind = "ip6gre",
99523 .maxtype = IFLA_GRE_MAX,
99524 .policy = ip6gre_policy,
99525 @@ -1647,7 +1647,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
99526 .fill_info = ip6gre_fill_info,
99527 };
99528
99529 -static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
99530 +static struct rtnl_link_ops ip6gre_tap_ops = {
99531 .kind = "ip6gretap",
99532 .maxtype = IFLA_GRE_MAX,
99533 .policy = ip6gre_policy,
99534 diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
99535 index 5db8d31..4a72c26 100644
99536 --- a/net/ipv6/ip6_tunnel.c
99537 +++ b/net/ipv6/ip6_tunnel.c
99538 @@ -85,7 +85,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
99539
99540 static int ip6_tnl_dev_init(struct net_device *dev);
99541 static void ip6_tnl_dev_setup(struct net_device *dev);
99542 -static struct rtnl_link_ops ip6_link_ops __read_mostly;
99543 +static struct rtnl_link_ops ip6_link_ops;
99544
99545 static int ip6_tnl_net_id __read_mostly;
99546 struct ip6_tnl_net {
99547 @@ -1714,7 +1714,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
99548 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
99549 };
99550
99551 -static struct rtnl_link_ops ip6_link_ops __read_mostly = {
99552 +static struct rtnl_link_ops ip6_link_ops = {
99553 .kind = "ip6tnl",
99554 .maxtype = IFLA_IPTUN_MAX,
99555 .policy = ip6_tnl_policy,
99556 diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
99557 index 2d19272..3a46322 100644
99558 --- a/net/ipv6/ip6_vti.c
99559 +++ b/net/ipv6/ip6_vti.c
99560 @@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
99561
99562 static int vti6_dev_init(struct net_device *dev);
99563 static void vti6_dev_setup(struct net_device *dev);
99564 -static struct rtnl_link_ops vti6_link_ops __read_mostly;
99565 +static struct rtnl_link_ops vti6_link_ops;
99566
99567 static int vti6_net_id __read_mostly;
99568 struct vti6_net {
99569 @@ -901,7 +901,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
99570 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
99571 };
99572
99573 -static struct rtnl_link_ops vti6_link_ops __read_mostly = {
99574 +static struct rtnl_link_ops vti6_link_ops = {
99575 .kind = "vti6",
99576 .maxtype = IFLA_VTI_MAX,
99577 .policy = vti6_policy,
99578 diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
99579 index 0a00f44..bec42b2 100644
99580 --- a/net/ipv6/ipv6_sockglue.c
99581 +++ b/net/ipv6/ipv6_sockglue.c
99582 @@ -991,7 +991,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
99583 if (sk->sk_type != SOCK_STREAM)
99584 return -ENOPROTOOPT;
99585
99586 - msg.msg_control = optval;
99587 + msg.msg_control = (void __force_kernel *)optval;
99588 msg.msg_controllen = len;
99589 msg.msg_flags = flags;
99590
99591 diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
99592 index 710238f..0fd1816 100644
99593 --- a/net/ipv6/netfilter/ip6_tables.c
99594 +++ b/net/ipv6/netfilter/ip6_tables.c
99595 @@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
99596 #endif
99597
99598 static int get_info(struct net *net, void __user *user,
99599 - const int *len, int compat)
99600 + int len, int compat)
99601 {
99602 char name[XT_TABLE_MAXNAMELEN];
99603 struct xt_table *t;
99604 int ret;
99605
99606 - if (*len != sizeof(struct ip6t_getinfo)) {
99607 - duprintf("length %u != %zu\n", *len,
99608 + if (len != sizeof(struct ip6t_getinfo)) {
99609 + duprintf("length %u != %zu\n", len,
99610 sizeof(struct ip6t_getinfo));
99611 return -EINVAL;
99612 }
99613 @@ -1127,7 +1127,7 @@ static int get_info(struct net *net, void __user *user,
99614 info.size = private->size;
99615 strcpy(info.name, name);
99616
99617 - if (copy_to_user(user, &info, *len) != 0)
99618 + if (copy_to_user(user, &info, len) != 0)
99619 ret = -EFAULT;
99620 else
99621 ret = 0;
99622 @@ -1981,7 +1981,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
99623
99624 switch (cmd) {
99625 case IP6T_SO_GET_INFO:
99626 - ret = get_info(sock_net(sk), user, len, 1);
99627 + ret = get_info(sock_net(sk), user, *len, 1);
99628 break;
99629 case IP6T_SO_GET_ENTRIES:
99630 ret = compat_get_entries(sock_net(sk), user, len);
99631 @@ -2028,7 +2028,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
99632
99633 switch (cmd) {
99634 case IP6T_SO_GET_INFO:
99635 - ret = get_info(sock_net(sk), user, len, 0);
99636 + ret = get_info(sock_net(sk), user, *len, 0);
99637 break;
99638
99639 case IP6T_SO_GET_ENTRIES:
99640 diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
99641 index 767ab8d..c5ec70a 100644
99642 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c
99643 +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
99644 @@ -90,12 +90,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
99645
99646 static int nf_ct_frag6_sysctl_register(struct net *net)
99647 {
99648 - struct ctl_table *table;
99649 + ctl_table_no_const *table = NULL;
99650 struct ctl_table_header *hdr;
99651
99652 - table = nf_ct_frag6_sysctl_table;
99653 if (!net_eq(net, &init_net)) {
99654 - table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
99655 + table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
99656 GFP_KERNEL);
99657 if (table == NULL)
99658 goto err_alloc;
99659 @@ -103,9 +102,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
99660 table[0].data = &net->nf_frag.frags.timeout;
99661 table[1].data = &net->nf_frag.frags.low_thresh;
99662 table[2].data = &net->nf_frag.frags.high_thresh;
99663 - }
99664 -
99665 - hdr = register_net_sysctl(net, "net/netfilter", table);
99666 + hdr = register_net_sysctl(net, "net/netfilter", table);
99667 + } else
99668 + hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
99669 if (hdr == NULL)
99670 goto err_reg;
99671
99672 @@ -113,8 +112,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
99673 return 0;
99674
99675 err_reg:
99676 - if (!net_eq(net, &init_net))
99677 - kfree(table);
99678 + kfree(table);
99679 err_alloc:
99680 return -ENOMEM;
99681 }
99682 diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
99683 index 827f795..7e28e82 100644
99684 --- a/net/ipv6/output_core.c
99685 +++ b/net/ipv6/output_core.c
99686 @@ -9,8 +9,8 @@
99687
99688 void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
99689 {
99690 - static atomic_t ipv6_fragmentation_id;
99691 - int old, new;
99692 + static atomic_unchecked_t ipv6_fragmentation_id;
99693 + int id;
99694
99695 #if IS_ENABLED(CONFIG_IPV6)
99696 if (rt && !(rt->dst.flags & DST_NOPEER)) {
99697 @@ -26,13 +26,10 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
99698 }
99699 }
99700 #endif
99701 - do {
99702 - old = atomic_read(&ipv6_fragmentation_id);
99703 - new = old + 1;
99704 - if (!new)
99705 - new = 1;
99706 - } while (atomic_cmpxchg(&ipv6_fragmentation_id, old, new) != old);
99707 - fhdr->identification = htonl(new);
99708 + id = atomic_inc_return_unchecked(&ipv6_fragmentation_id);
99709 + if (!id)
99710 + id = atomic_inc_return_unchecked(&ipv6_fragmentation_id);
99711 + fhdr->identification = htonl(id);
99712 }
99713 EXPORT_SYMBOL(ipv6_select_ident);
99714
99715 diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
99716 index bda7429..469b26b 100644
99717 --- a/net/ipv6/ping.c
99718 +++ b/net/ipv6/ping.c
99719 @@ -246,6 +246,24 @@ static struct pernet_operations ping_v6_net_ops = {
99720 };
99721 #endif
99722
99723 +static struct pingv6_ops real_pingv6_ops = {
99724 + .ipv6_recv_error = ipv6_recv_error,
99725 + .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
99726 + .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
99727 + .icmpv6_err_convert = icmpv6_err_convert,
99728 + .ipv6_icmp_error = ipv6_icmp_error,
99729 + .ipv6_chk_addr = ipv6_chk_addr,
99730 +};
99731 +
99732 +static struct pingv6_ops dummy_pingv6_ops = {
99733 + .ipv6_recv_error = dummy_ipv6_recv_error,
99734 + .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
99735 + .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
99736 + .icmpv6_err_convert = dummy_icmpv6_err_convert,
99737 + .ipv6_icmp_error = dummy_ipv6_icmp_error,
99738 + .ipv6_chk_addr = dummy_ipv6_chk_addr,
99739 +};
99740 +
99741 int __init pingv6_init(void)
99742 {
99743 #ifdef CONFIG_PROC_FS
99744 @@ -253,13 +271,7 @@ int __init pingv6_init(void)
99745 if (ret)
99746 return ret;
99747 #endif
99748 - pingv6_ops.ipv6_recv_error = ipv6_recv_error;
99749 - pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
99750 - pingv6_ops.ip6_datagram_recv_specific_ctl =
99751 - ip6_datagram_recv_specific_ctl;
99752 - pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
99753 - pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
99754 - pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
99755 + pingv6_ops = &real_pingv6_ops;
99756 return inet6_register_protosw(&pingv6_protosw);
99757 }
99758
99759 @@ -268,14 +280,9 @@ int __init pingv6_init(void)
99760 */
99761 void pingv6_exit(void)
99762 {
99763 - pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
99764 - pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
99765 - pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
99766 - pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
99767 - pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
99768 - pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
99769 #ifdef CONFIG_PROC_FS
99770 unregister_pernet_subsys(&ping_v6_net_ops);
99771 #endif
99772 + pingv6_ops = &dummy_pingv6_ops;
99773 inet6_unregister_protosw(&pingv6_protosw);
99774 }
99775 diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
99776 index 091d066..139d410 100644
99777 --- a/net/ipv6/proc.c
99778 +++ b/net/ipv6/proc.c
99779 @@ -309,7 +309,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
99780 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
99781 goto proc_snmp6_fail;
99782
99783 - net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
99784 + net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
99785 if (!net->mib.proc_net_devsnmp6)
99786 goto proc_dev_snmp6_fail;
99787 return 0;
99788 diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
99789 index 1f29996..46fe0c7 100644
99790 --- a/net/ipv6/raw.c
99791 +++ b/net/ipv6/raw.c
99792 @@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
99793 {
99794 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
99795 skb_checksum_complete(skb)) {
99796 - atomic_inc(&sk->sk_drops);
99797 + atomic_inc_unchecked(&sk->sk_drops);
99798 kfree_skb(skb);
99799 return NET_RX_DROP;
99800 }
99801 @@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
99802 struct raw6_sock *rp = raw6_sk(sk);
99803
99804 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
99805 - atomic_inc(&sk->sk_drops);
99806 + atomic_inc_unchecked(&sk->sk_drops);
99807 kfree_skb(skb);
99808 return NET_RX_DROP;
99809 }
99810 @@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
99811
99812 if (inet->hdrincl) {
99813 if (skb_checksum_complete(skb)) {
99814 - atomic_inc(&sk->sk_drops);
99815 + atomic_inc_unchecked(&sk->sk_drops);
99816 kfree_skb(skb);
99817 return NET_RX_DROP;
99818 }
99819 @@ -469,6 +469,9 @@ static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk,
99820 if (flags & MSG_OOB)
99821 return -EOPNOTSUPP;
99822
99823 + if (addr_len)
99824 + *addr_len=sizeof(*sin6);
99825 +
99826 if (flags & MSG_ERRQUEUE)
99827 return ipv6_recv_error(sk, msg, len, addr_len);
99828
99829 @@ -507,7 +510,6 @@ static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk,
99830 sin6->sin6_flowinfo = 0;
99831 sin6->sin6_scope_id = ipv6_iface_scope_id(&sin6->sin6_addr,
99832 IP6CB(skb)->iif);
99833 - *addr_len = sizeof(*sin6);
99834 }
99835
99836 sock_recv_ts_and_drops(msg, sk, skb);
99837 @@ -610,7 +612,7 @@ out:
99838 return err;
99839 }
99840
99841 -static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
99842 +static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
99843 struct flowi6 *fl6, struct dst_entry **dstp,
99844 unsigned int flags)
99845 {
99846 @@ -922,12 +924,15 @@ do_confirm:
99847 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
99848 char __user *optval, int optlen)
99849 {
99850 + struct icmp6_filter filter;
99851 +
99852 switch (optname) {
99853 case ICMPV6_FILTER:
99854 if (optlen > sizeof(struct icmp6_filter))
99855 optlen = sizeof(struct icmp6_filter);
99856 - if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
99857 + if (copy_from_user(&filter, optval, optlen))
99858 return -EFAULT;
99859 + raw6_sk(sk)->filter = filter;
99860 return 0;
99861 default:
99862 return -ENOPROTOOPT;
99863 @@ -940,6 +945,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
99864 char __user *optval, int __user *optlen)
99865 {
99866 int len;
99867 + struct icmp6_filter filter;
99868
99869 switch (optname) {
99870 case ICMPV6_FILTER:
99871 @@ -951,7 +957,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
99872 len = sizeof(struct icmp6_filter);
99873 if (put_user(len, optlen))
99874 return -EFAULT;
99875 - if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
99876 + filter = raw6_sk(sk)->filter;
99877 + if (len > sizeof filter || copy_to_user(optval, &filter, len))
99878 return -EFAULT;
99879 return 0;
99880 default:
99881 diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
99882 index cc85a9b..526a133 100644
99883 --- a/net/ipv6/reassembly.c
99884 +++ b/net/ipv6/reassembly.c
99885 @@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
99886
99887 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
99888 {
99889 - struct ctl_table *table;
99890 + ctl_table_no_const *table = NULL;
99891 struct ctl_table_header *hdr;
99892
99893 - table = ip6_frags_ns_ctl_table;
99894 if (!net_eq(net, &init_net)) {
99895 - table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
99896 + table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
99897 if (table == NULL)
99898 goto err_alloc;
99899
99900 @@ -642,9 +641,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
99901 /* Don't export sysctls to unprivileged users */
99902 if (net->user_ns != &init_user_ns)
99903 table[0].procname = NULL;
99904 - }
99905 + hdr = register_net_sysctl(net, "net/ipv6", table);
99906 + } else
99907 + hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
99908
99909 - hdr = register_net_sysctl(net, "net/ipv6", table);
99910 if (hdr == NULL)
99911 goto err_reg;
99912
99913 @@ -652,8 +652,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
99914 return 0;
99915
99916 err_reg:
99917 - if (!net_eq(net, &init_net))
99918 - kfree(table);
99919 + kfree(table);
99920 err_alloc:
99921 return -ENOMEM;
99922 }
99923 diff --git a/net/ipv6/route.c b/net/ipv6/route.c
99924 index fba54a4..73e374e 100644
99925 --- a/net/ipv6/route.c
99926 +++ b/net/ipv6/route.c
99927 @@ -2972,7 +2972,7 @@ struct ctl_table ipv6_route_table_template[] = {
99928
99929 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
99930 {
99931 - struct ctl_table *table;
99932 + ctl_table_no_const *table;
99933
99934 table = kmemdup(ipv6_route_table_template,
99935 sizeof(ipv6_route_table_template),
99936 diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
99937 index b4d74c8..b4f3fbe 100644
99938 --- a/net/ipv6/sit.c
99939 +++ b/net/ipv6/sit.c
99940 @@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
99941 static void ipip6_dev_free(struct net_device *dev);
99942 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
99943 __be32 *v4dst);
99944 -static struct rtnl_link_ops sit_link_ops __read_mostly;
99945 +static struct rtnl_link_ops sit_link_ops;
99946
99947 static int sit_net_id __read_mostly;
99948 struct sit_net {
99949 @@ -1683,7 +1683,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
99950 unregister_netdevice_queue(dev, head);
99951 }
99952
99953 -static struct rtnl_link_ops sit_link_ops __read_mostly = {
99954 +static struct rtnl_link_ops sit_link_ops = {
99955 .kind = "sit",
99956 .maxtype = IFLA_IPTUN_MAX,
99957 .policy = ipip6_policy,
99958 diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
99959 index 7f405a1..eabef92 100644
99960 --- a/net/ipv6/sysctl_net_ipv6.c
99961 +++ b/net/ipv6/sysctl_net_ipv6.c
99962 @@ -54,7 +54,7 @@ static struct ctl_table ipv6_rotable[] = {
99963
99964 static int __net_init ipv6_sysctl_net_init(struct net *net)
99965 {
99966 - struct ctl_table *ipv6_table;
99967 + ctl_table_no_const *ipv6_table;
99968 struct ctl_table *ipv6_route_table;
99969 struct ctl_table *ipv6_icmp_table;
99970 int err;
99971 diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
99972 index 889079b..a04512c 100644
99973 --- a/net/ipv6/tcp_ipv6.c
99974 +++ b/net/ipv6/tcp_ipv6.c
99975 @@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
99976 inet6_sk(sk)->rx_dst_cookie = rt->rt6i_node->fn_sernum;
99977 }
99978
99979 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99980 +extern int grsec_enable_blackhole;
99981 +#endif
99982 +
99983 static void tcp_v6_hash(struct sock *sk)
99984 {
99985 if (sk->sk_state != TCP_CLOSE) {
99986 @@ -1412,6 +1416,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
99987 return 0;
99988
99989 reset:
99990 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99991 + if (!grsec_enable_blackhole)
99992 +#endif
99993 tcp_v6_send_reset(sk, skb);
99994 discard:
99995 if (opt_skb)
99996 @@ -1496,12 +1503,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
99997 TCP_SKB_CB(skb)->sacked = 0;
99998
99999 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
100000 - if (!sk)
100001 + if (!sk) {
100002 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100003 + ret = 1;
100004 +#endif
100005 goto no_tcp_socket;
100006 + }
100007
100008 process:
100009 - if (sk->sk_state == TCP_TIME_WAIT)
100010 + if (sk->sk_state == TCP_TIME_WAIT) {
100011 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100012 + ret = 2;
100013 +#endif
100014 goto do_time_wait;
100015 + }
100016
100017 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
100018 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
100019 @@ -1553,6 +1568,10 @@ csum_error:
100020 bad_packet:
100021 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
100022 } else {
100023 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100024 + if (!grsec_enable_blackhole || (ret == 1 &&
100025 + (skb->dev->flags & IFF_LOOPBACK)))
100026 +#endif
100027 tcp_v6_send_reset(NULL, skb);
100028 }
100029
100030 diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
100031 index 1e586d9..384a9c9 100644
100032 --- a/net/ipv6/udp.c
100033 +++ b/net/ipv6/udp.c
100034 @@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
100035 udp_ipv6_hash_secret + net_hash_mix(net));
100036 }
100037
100038 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100039 +extern int grsec_enable_blackhole;
100040 +#endif
100041 +
100042 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
100043 {
100044 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
100045 @@ -392,6 +396,9 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk,
100046 int is_udp4;
100047 bool slow;
100048
100049 + if (addr_len)
100050 + *addr_len = sizeof(struct sockaddr_in6);
100051 +
100052 if (flags & MSG_ERRQUEUE)
100053 return ipv6_recv_error(sk, msg, len, addr_len);
100054
100055 @@ -435,7 +442,7 @@ try_again:
100056 if (unlikely(err)) {
100057 trace_kfree_skb(skb, udpv6_recvmsg);
100058 if (!peeked) {
100059 - atomic_inc(&sk->sk_drops);
100060 + atomic_inc_unchecked(&sk->sk_drops);
100061 if (is_udp4)
100062 UDP_INC_STATS_USER(sock_net(sk),
100063 UDP_MIB_INERRORS,
100064 @@ -475,7 +482,7 @@ try_again:
100065 ipv6_iface_scope_id(&sin6->sin6_addr,
100066 IP6CB(skb)->iif);
100067 }
100068 - *addr_len = sizeof(*sin6);
100069 +
100070 }
100071
100072 if (np->rxopt.all)
100073 @@ -690,7 +697,7 @@ csum_error:
100074 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
100075 drop:
100076 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
100077 - atomic_inc(&sk->sk_drops);
100078 + atomic_inc_unchecked(&sk->sk_drops);
100079 kfree_skb(skb);
100080 return -1;
100081 }
100082 @@ -747,7 +754,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
100083 if (likely(skb1 == NULL))
100084 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
100085 if (!skb1) {
100086 - atomic_inc(&sk->sk_drops);
100087 + atomic_inc_unchecked(&sk->sk_drops);
100088 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
100089 IS_UDPLITE(sk));
100090 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
100091 @@ -886,6 +893,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
100092 goto csum_error;
100093
100094 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
100095 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100096 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
100097 +#endif
100098 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
100099
100100 kfree_skb(skb);
100101 diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
100102 index 5f8e128..865d38e 100644
100103 --- a/net/ipv6/xfrm6_policy.c
100104 +++ b/net/ipv6/xfrm6_policy.c
100105 @@ -212,11 +212,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
100106 }
100107 }
100108
100109 -static inline int xfrm6_garbage_collect(struct dst_ops *ops)
100110 +static int xfrm6_garbage_collect(struct dst_ops *ops)
100111 {
100112 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
100113
100114 - xfrm6_policy_afinfo.garbage_collect(net);
100115 + xfrm_garbage_collect_deferred(net);
100116 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
100117 }
100118
100119 @@ -329,19 +329,19 @@ static struct ctl_table xfrm6_policy_table[] = {
100120
100121 static int __net_init xfrm6_net_init(struct net *net)
100122 {
100123 - struct ctl_table *table;
100124 + ctl_table_no_const *table = NULL;
100125 struct ctl_table_header *hdr;
100126
100127 - table = xfrm6_policy_table;
100128 if (!net_eq(net, &init_net)) {
100129 - table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
100130 + table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
100131 if (!table)
100132 goto err_alloc;
100133
100134 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
100135 - }
100136 + hdr = register_net_sysctl(net, "net/ipv6", table);
100137 + } else
100138 + hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
100139
100140 - hdr = register_net_sysctl(net, "net/ipv6", table);
100141 if (!hdr)
100142 goto err_reg;
100143
100144 @@ -349,8 +349,7 @@ static int __net_init xfrm6_net_init(struct net *net)
100145 return 0;
100146
100147 err_reg:
100148 - if (!net_eq(net, &init_net))
100149 - kfree(table);
100150 + kfree(table);
100151 err_alloc:
100152 return -ENOMEM;
100153 }
100154 diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
100155 index e15c16a..7cf07aa 100644
100156 --- a/net/ipx/ipx_proc.c
100157 +++ b/net/ipx/ipx_proc.c
100158 @@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
100159 struct proc_dir_entry *p;
100160 int rc = -ENOMEM;
100161
100162 - ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
100163 + ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
100164
100165 if (!ipx_proc_dir)
100166 goto out;
100167 diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
100168 index 2ba8b97..6d33010 100644
100169 --- a/net/irda/ircomm/ircomm_tty.c
100170 +++ b/net/irda/ircomm/ircomm_tty.c
100171 @@ -317,11 +317,11 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
100172 add_wait_queue(&port->open_wait, &wait);
100173
100174 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
100175 - __FILE__, __LINE__, tty->driver->name, port->count);
100176 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
100177
100178 spin_lock_irqsave(&port->lock, flags);
100179 if (!tty_hung_up_p(filp))
100180 - port->count--;
100181 + atomic_dec(&port->count);
100182 port->blocked_open++;
100183 spin_unlock_irqrestore(&port->lock, flags);
100184
100185 @@ -356,7 +356,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
100186 }
100187
100188 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
100189 - __FILE__, __LINE__, tty->driver->name, port->count);
100190 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
100191
100192 schedule();
100193 }
100194 @@ -366,12 +366,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
100195
100196 spin_lock_irqsave(&port->lock, flags);
100197 if (!tty_hung_up_p(filp))
100198 - port->count++;
100199 + atomic_inc(&port->count);
100200 port->blocked_open--;
100201 spin_unlock_irqrestore(&port->lock, flags);
100202
100203 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
100204 - __FILE__, __LINE__, tty->driver->name, port->count);
100205 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
100206
100207 if (!retval)
100208 port->flags |= ASYNC_NORMAL_ACTIVE;
100209 @@ -445,12 +445,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
100210
100211 /* ++ is not atomic, so this should be protected - Jean II */
100212 spin_lock_irqsave(&self->port.lock, flags);
100213 - self->port.count++;
100214 + atomic_inc(&self->port.count);
100215 spin_unlock_irqrestore(&self->port.lock, flags);
100216 tty_port_tty_set(&self->port, tty);
100217
100218 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
100219 - self->line, self->port.count);
100220 + self->line, atomic_read(&self->port.count));
100221
100222 /* Not really used by us, but lets do it anyway */
100223 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
100224 @@ -987,7 +987,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
100225 tty_kref_put(port->tty);
100226 }
100227 port->tty = NULL;
100228 - port->count = 0;
100229 + atomic_set(&port->count, 0);
100230 spin_unlock_irqrestore(&port->lock, flags);
100231
100232 wake_up_interruptible(&port->open_wait);
100233 @@ -1344,7 +1344,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
100234 seq_putc(m, '\n');
100235
100236 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
100237 - seq_printf(m, "Open count: %d\n", self->port.count);
100238 + seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
100239 seq_printf(m, "Max data size: %d\n", self->max_data_size);
100240 seq_printf(m, "Max header size: %d\n", self->max_header_size);
100241
100242 diff --git a/net/irda/irproc.c b/net/irda/irproc.c
100243 index b9ac598..f88cc56 100644
100244 --- a/net/irda/irproc.c
100245 +++ b/net/irda/irproc.c
100246 @@ -66,7 +66,7 @@ void __init irda_proc_register(void)
100247 {
100248 int i;
100249
100250 - proc_irda = proc_mkdir("irda", init_net.proc_net);
100251 + proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
100252 if (proc_irda == NULL)
100253 return;
100254
100255 diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
100256 index c4b7218..3e83259 100644
100257 --- a/net/iucv/af_iucv.c
100258 +++ b/net/iucv/af_iucv.c
100259 @@ -773,10 +773,10 @@ static int iucv_sock_autobind(struct sock *sk)
100260
100261 write_lock_bh(&iucv_sk_list.lock);
100262
100263 - sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
100264 + sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
100265 while (__iucv_get_sock_by_name(name)) {
100266 sprintf(name, "%08x",
100267 - atomic_inc_return(&iucv_sk_list.autobind_name));
100268 + atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
100269 }
100270
100271 write_unlock_bh(&iucv_sk_list.lock);
100272 diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
100273 index cd5b8ec..f205e6b 100644
100274 --- a/net/iucv/iucv.c
100275 +++ b/net/iucv/iucv.c
100276 @@ -690,7 +690,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
100277 return NOTIFY_OK;
100278 }
100279
100280 -static struct notifier_block __refdata iucv_cpu_notifier = {
100281 +static struct notifier_block iucv_cpu_notifier = {
100282 .notifier_call = iucv_cpu_notify,
100283 };
100284
100285 diff --git a/net/key/af_key.c b/net/key/af_key.c
100286 index 7932697..a13d158 100644
100287 --- a/net/key/af_key.c
100288 +++ b/net/key/af_key.c
100289 @@ -3052,10 +3052,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
100290 static u32 get_acqseq(void)
100291 {
100292 u32 res;
100293 - static atomic_t acqseq;
100294 + static atomic_unchecked_t acqseq;
100295
100296 do {
100297 - res = atomic_inc_return(&acqseq);
100298 + res = atomic_inc_return_unchecked(&acqseq);
100299 } while (!res);
100300 return res;
100301 }
100302 diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
100303 index 0b44d85..1a7f88b 100644
100304 --- a/net/l2tp/l2tp_ip.c
100305 +++ b/net/l2tp/l2tp_ip.c
100306 @@ -518,6 +518,9 @@ static int l2tp_ip_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m
100307 if (flags & MSG_OOB)
100308 goto out;
100309
100310 + if (addr_len)
100311 + *addr_len = sizeof(*sin);
100312 +
100313 skb = skb_recv_datagram(sk, flags, noblock, &err);
100314 if (!skb)
100315 goto out;
100316 @@ -540,7 +543,6 @@ static int l2tp_ip_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m
100317 sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
100318 sin->sin_port = 0;
100319 memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
100320 - *addr_len = sizeof(*sin);
100321 }
100322 if (inet->cmsg_flags)
100323 ip_cmsg_recv(msg, skb);
100324 diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
100325 index 1a3c7e0..80f8b0c 100644
100326 --- a/net/llc/llc_proc.c
100327 +++ b/net/llc/llc_proc.c
100328 @@ -247,7 +247,7 @@ int __init llc_proc_init(void)
100329 int rc = -ENOMEM;
100330 struct proc_dir_entry *p;
100331
100332 - llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
100333 + llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
100334 if (!llc_proc_dir)
100335 goto out;
100336
100337 diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
100338 index 453e974..b3a43a5 100644
100339 --- a/net/mac80211/cfg.c
100340 +++ b/net/mac80211/cfg.c
100341 @@ -839,7 +839,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
100342 ret = ieee80211_vif_use_channel(sdata, chandef,
100343 IEEE80211_CHANCTX_EXCLUSIVE);
100344 }
100345 - } else if (local->open_count == local->monitors) {
100346 + } else if (local_read(&local->open_count) == local->monitors) {
100347 local->_oper_chandef = *chandef;
100348 ieee80211_hw_config(local, 0);
100349 }
100350 @@ -3356,7 +3356,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
100351 else
100352 local->probe_req_reg--;
100353
100354 - if (!local->open_count)
100355 + if (!local_read(&local->open_count))
100356 break;
100357
100358 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
100359 @@ -3819,8 +3819,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
100360 if (chanctx_conf) {
100361 *chandef = chanctx_conf->def;
100362 ret = 0;
100363 - } else if (local->open_count > 0 &&
100364 - local->open_count == local->monitors &&
100365 + } else if (local_read(&local->open_count) > 0 &&
100366 + local_read(&local->open_count) == local->monitors &&
100367 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
100368 if (local->use_chanctx)
100369 *chandef = local->monitor_chandef;
100370 diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
100371 index 5e44e317..3d404a6 100644
100372 --- a/net/mac80211/ieee80211_i.h
100373 +++ b/net/mac80211/ieee80211_i.h
100374 @@ -28,6 +28,7 @@
100375 #include <net/ieee80211_radiotap.h>
100376 #include <net/cfg80211.h>
100377 #include <net/mac80211.h>
100378 +#include <asm/local.h>
100379 #include "key.h"
100380 #include "sta_info.h"
100381 #include "debug.h"
100382 @@ -994,7 +995,7 @@ struct ieee80211_local {
100383 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
100384 spinlock_t queue_stop_reason_lock;
100385
100386 - int open_count;
100387 + local_t open_count;
100388 int monitors, cooked_mntrs;
100389 /* number of interfaces with corresponding FIF_ flags */
100390 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
100391 diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
100392 index ce1c443..6cd39e1 100644
100393 --- a/net/mac80211/iface.c
100394 +++ b/net/mac80211/iface.c
100395 @@ -529,7 +529,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
100396 break;
100397 }
100398
100399 - if (local->open_count == 0) {
100400 + if (local_read(&local->open_count) == 0) {
100401 res = drv_start(local);
100402 if (res)
100403 goto err_del_bss;
100404 @@ -576,7 +576,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
100405 res = drv_add_interface(local, sdata);
100406 if (res)
100407 goto err_stop;
100408 - } else if (local->monitors == 0 && local->open_count == 0) {
100409 + } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
100410 res = ieee80211_add_virtual_monitor(local);
100411 if (res)
100412 goto err_stop;
100413 @@ -685,7 +685,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
100414 atomic_inc(&local->iff_promiscs);
100415
100416 if (coming_up)
100417 - local->open_count++;
100418 + local_inc(&local->open_count);
100419
100420 if (hw_reconf_flags)
100421 ieee80211_hw_config(local, hw_reconf_flags);
100422 @@ -723,7 +723,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
100423 err_del_interface:
100424 drv_remove_interface(local, sdata);
100425 err_stop:
100426 - if (!local->open_count)
100427 + if (!local_read(&local->open_count))
100428 drv_stop(local);
100429 err_del_bss:
100430 sdata->bss = NULL;
100431 @@ -874,7 +874,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
100432 }
100433
100434 if (going_down)
100435 - local->open_count--;
100436 + local_dec(&local->open_count);
100437
100438 switch (sdata->vif.type) {
100439 case NL80211_IFTYPE_AP_VLAN:
100440 @@ -933,7 +933,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
100441 }
100442 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
100443
100444 - if (local->open_count == 0)
100445 + if (local_read(&local->open_count) == 0)
100446 ieee80211_clear_tx_pending(local);
100447
100448 /*
100449 @@ -973,7 +973,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
100450
100451 ieee80211_recalc_ps(local, -1);
100452
100453 - if (local->open_count == 0) {
100454 + if (local_read(&local->open_count) == 0) {
100455 ieee80211_stop_device(local);
100456
100457 /* no reconfiguring after stop! */
100458 @@ -984,7 +984,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
100459 ieee80211_configure_filter(local);
100460 ieee80211_hw_config(local, hw_reconf_flags);
100461
100462 - if (local->monitors == local->open_count)
100463 + if (local->monitors == local_read(&local->open_count))
100464 ieee80211_add_virtual_monitor(local);
100465 }
100466
100467 diff --git a/net/mac80211/main.c b/net/mac80211/main.c
100468 index d767cfb..b4cd07d 100644
100469 --- a/net/mac80211/main.c
100470 +++ b/net/mac80211/main.c
100471 @@ -172,7 +172,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
100472 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
100473 IEEE80211_CONF_CHANGE_POWER);
100474
100475 - if (changed && local->open_count) {
100476 + if (changed && local_read(&local->open_count)) {
100477 ret = drv_config(local, changed);
100478 /*
100479 * Goal:
100480 diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
100481 index af64fb8..366e371 100644
100482 --- a/net/mac80211/pm.c
100483 +++ b/net/mac80211/pm.c
100484 @@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
100485 struct ieee80211_sub_if_data *sdata;
100486 struct sta_info *sta;
100487
100488 - if (!local->open_count)
100489 + if (!local_read(&local->open_count))
100490 goto suspend;
100491
100492 ieee80211_scan_cancel(local);
100493 @@ -58,7 +58,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
100494 cancel_work_sync(&local->dynamic_ps_enable_work);
100495 del_timer_sync(&local->dynamic_ps_timer);
100496
100497 - local->wowlan = wowlan && local->open_count;
100498 + local->wowlan = wowlan && local_read(&local->open_count);
100499 if (local->wowlan) {
100500 int err = drv_suspend(local, wowlan);
100501 if (err < 0) {
100502 @@ -115,7 +115,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
100503 WARN_ON(!list_empty(&local->chanctx_list));
100504
100505 /* stop hardware - this must stop RX */
100506 - if (local->open_count)
100507 + if (local_read(&local->open_count))
100508 ieee80211_stop_device(local);
100509
100510 suspend:
100511 diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
100512 index 22b223f..ab70070 100644
100513 --- a/net/mac80211/rate.c
100514 +++ b/net/mac80211/rate.c
100515 @@ -734,7 +734,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
100516
100517 ASSERT_RTNL();
100518
100519 - if (local->open_count)
100520 + if (local_read(&local->open_count))
100521 return -EBUSY;
100522
100523 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
100524 diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
100525 index 6ff1346..936ca9a 100644
100526 --- a/net/mac80211/rc80211_pid_debugfs.c
100527 +++ b/net/mac80211/rc80211_pid_debugfs.c
100528 @@ -193,7 +193,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
100529
100530 spin_unlock_irqrestore(&events->lock, status);
100531
100532 - if (copy_to_user(buf, pb, p))
100533 + if (p > sizeof(pb) || copy_to_user(buf, pb, p))
100534 return -EFAULT;
100535
100536 return p;
100537 diff --git a/net/mac80211/util.c b/net/mac80211/util.c
100538 index b8700d4..89086d5 100644
100539 --- a/net/mac80211/util.c
100540 +++ b/net/mac80211/util.c
100541 @@ -1483,7 +1483,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
100542 }
100543 #endif
100544 /* everything else happens only if HW was up & running */
100545 - if (!local->open_count)
100546 + if (!local_read(&local->open_count))
100547 goto wake_up;
100548
100549 /*
100550 @@ -1708,7 +1708,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
100551 local->in_reconfig = false;
100552 barrier();
100553
100554 - if (local->monitors == local->open_count && local->monitors > 0)
100555 + if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
100556 ieee80211_add_virtual_monitor(local);
100557
100558 /*
100559 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
100560 index e9410d1..77b6378 100644
100561 --- a/net/netfilter/Kconfig
100562 +++ b/net/netfilter/Kconfig
100563 @@ -1081,6 +1081,16 @@ config NETFILTER_XT_MATCH_ESP
100564
100565 To compile it as a module, choose M here. If unsure, say N.
100566
100567 +config NETFILTER_XT_MATCH_GRADM
100568 + tristate '"gradm" match support'
100569 + depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
100570 + depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
100571 + ---help---
100572 + The gradm match allows to match on grsecurity RBAC being enabled.
100573 + It is useful when iptables rules are applied early on bootup to
100574 + prevent connections to the machine (except from a trusted host)
100575 + while the RBAC system is disabled.
100576 +
100577 config NETFILTER_XT_MATCH_HASHLIMIT
100578 tristate '"hashlimit" match support'
100579 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
100580 diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
100581 index bffdad7..f9317d1 100644
100582 --- a/net/netfilter/Makefile
100583 +++ b/net/netfilter/Makefile
100584 @@ -133,6 +133,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
100585 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
100586 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
100587 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
100588 +obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
100589 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
100590 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
100591 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
100592 diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
100593 index de770ec..3fc49d2 100644
100594 --- a/net/netfilter/ipset/ip_set_core.c
100595 +++ b/net/netfilter/ipset/ip_set_core.c
100596 @@ -1922,7 +1922,7 @@ done:
100597 return ret;
100598 }
100599
100600 -static struct nf_sockopt_ops so_set __read_mostly = {
100601 +static struct nf_sockopt_ops so_set = {
100602 .pf = PF_INET,
100603 .get_optmin = SO_IP_SET,
100604 .get_optmax = SO_IP_SET + 1,
100605 diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
100606 index a8eb0a8..86f2de4 100644
100607 --- a/net/netfilter/ipvs/ip_vs_conn.c
100608 +++ b/net/netfilter/ipvs/ip_vs_conn.c
100609 @@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
100610 /* Increase the refcnt counter of the dest */
100611 ip_vs_dest_hold(dest);
100612
100613 - conn_flags = atomic_read(&dest->conn_flags);
100614 + conn_flags = atomic_read_unchecked(&dest->conn_flags);
100615 if (cp->protocol != IPPROTO_UDP)
100616 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
100617 flags = cp->flags;
100618 @@ -900,7 +900,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
100619
100620 cp->control = NULL;
100621 atomic_set(&cp->n_control, 0);
100622 - atomic_set(&cp->in_pkts, 0);
100623 + atomic_set_unchecked(&cp->in_pkts, 0);
100624
100625 cp->packet_xmit = NULL;
100626 cp->app = NULL;
100627 @@ -1188,7 +1188,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
100628
100629 /* Don't drop the entry if its number of incoming packets is not
100630 located in [0, 8] */
100631 - i = atomic_read(&cp->in_pkts);
100632 + i = atomic_read_unchecked(&cp->in_pkts);
100633 if (i > 8 || i < 0) return 0;
100634
100635 if (!todrop_rate[i]) return 0;
100636 diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
100637 index 4f26ee4..6a9d7c3 100644
100638 --- a/net/netfilter/ipvs/ip_vs_core.c
100639 +++ b/net/netfilter/ipvs/ip_vs_core.c
100640 @@ -567,7 +567,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
100641 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
100642 /* do not touch skb anymore */
100643
100644 - atomic_inc(&cp->in_pkts);
100645 + atomic_inc_unchecked(&cp->in_pkts);
100646 ip_vs_conn_put(cp);
100647 return ret;
100648 }
100649 @@ -1706,7 +1706,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
100650 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
100651 pkts = sysctl_sync_threshold(ipvs);
100652 else
100653 - pkts = atomic_add_return(1, &cp->in_pkts);
100654 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
100655
100656 if (ipvs->sync_state & IP_VS_STATE_MASTER)
100657 ip_vs_sync_conn(net, cp, pkts);
100658 diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
100659 index 35be035..50f8834 100644
100660 --- a/net/netfilter/ipvs/ip_vs_ctl.c
100661 +++ b/net/netfilter/ipvs/ip_vs_ctl.c
100662 @@ -794,7 +794,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
100663 */
100664 ip_vs_rs_hash(ipvs, dest);
100665 }
100666 - atomic_set(&dest->conn_flags, conn_flags);
100667 + atomic_set_unchecked(&dest->conn_flags, conn_flags);
100668
100669 /* bind the service */
100670 old_svc = rcu_dereference_protected(dest->svc, 1);
100671 @@ -1654,7 +1654,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
100672 * align with netns init in ip_vs_control_net_init()
100673 */
100674
100675 -static struct ctl_table vs_vars[] = {
100676 +static ctl_table_no_const vs_vars[] __read_only = {
100677 {
100678 .procname = "amemthresh",
100679 .maxlen = sizeof(int),
100680 @@ -2075,7 +2075,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
100681 " %-7s %-6d %-10d %-10d\n",
100682 &dest->addr.in6,
100683 ntohs(dest->port),
100684 - ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
100685 + ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
100686 atomic_read(&dest->weight),
100687 atomic_read(&dest->activeconns),
100688 atomic_read(&dest->inactconns));
100689 @@ -2086,7 +2086,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
100690 "%-7s %-6d %-10d %-10d\n",
100691 ntohl(dest->addr.ip),
100692 ntohs(dest->port),
100693 - ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
100694 + ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
100695 atomic_read(&dest->weight),
100696 atomic_read(&dest->activeconns),
100697 atomic_read(&dest->inactconns));
100698 @@ -2564,7 +2564,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
100699
100700 entry.addr = dest->addr.ip;
100701 entry.port = dest->port;
100702 - entry.conn_flags = atomic_read(&dest->conn_flags);
100703 + entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
100704 entry.weight = atomic_read(&dest->weight);
100705 entry.u_threshold = dest->u_threshold;
100706 entry.l_threshold = dest->l_threshold;
100707 @@ -3107,7 +3107,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
100708 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
100709 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
100710 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
100711 - (atomic_read(&dest->conn_flags) &
100712 + (atomic_read_unchecked(&dest->conn_flags) &
100713 IP_VS_CONN_F_FWD_MASK)) ||
100714 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
100715 atomic_read(&dest->weight)) ||
100716 @@ -3580,7 +3580,7 @@ out:
100717 }
100718
100719
100720 -static const struct genl_ops ip_vs_genl_ops[] __read_mostly = {
100721 +static const struct genl_ops ip_vs_genl_ops[] = {
100722 {
100723 .cmd = IPVS_CMD_NEW_SERVICE,
100724 .flags = GENL_ADMIN_PERM,
100725 @@ -3697,7 +3697,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
100726 {
100727 int idx;
100728 struct netns_ipvs *ipvs = net_ipvs(net);
100729 - struct ctl_table *tbl;
100730 + ctl_table_no_const *tbl;
100731
100732 atomic_set(&ipvs->dropentry, 0);
100733 spin_lock_init(&ipvs->dropentry_lock);
100734 diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
100735 index ca056a3..9cf01ef 100644
100736 --- a/net/netfilter/ipvs/ip_vs_lblc.c
100737 +++ b/net/netfilter/ipvs/ip_vs_lblc.c
100738 @@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
100739 * IPVS LBLC sysctl table
100740 */
100741 #ifdef CONFIG_SYSCTL
100742 -static struct ctl_table vs_vars_table[] = {
100743 +static ctl_table_no_const vs_vars_table[] __read_only = {
100744 {
100745 .procname = "lblc_expiration",
100746 .data = NULL,
100747 diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
100748 index 3f21a2f..a112e85 100644
100749 --- a/net/netfilter/ipvs/ip_vs_lblcr.c
100750 +++ b/net/netfilter/ipvs/ip_vs_lblcr.c
100751 @@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
100752 * IPVS LBLCR sysctl table
100753 */
100754
100755 -static struct ctl_table vs_vars_table[] = {
100756 +static ctl_table_no_const vs_vars_table[] __read_only = {
100757 {
100758 .procname = "lblcr_expiration",
100759 .data = NULL,
100760 diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
100761 index db80126..ef7110e 100644
100762 --- a/net/netfilter/ipvs/ip_vs_sync.c
100763 +++ b/net/netfilter/ipvs/ip_vs_sync.c
100764 @@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
100765 cp = cp->control;
100766 if (cp) {
100767 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
100768 - pkts = atomic_add_return(1, &cp->in_pkts);
100769 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
100770 else
100771 pkts = sysctl_sync_threshold(ipvs);
100772 ip_vs_sync_conn(net, cp->control, pkts);
100773 @@ -771,7 +771,7 @@ control:
100774 if (!cp)
100775 return;
100776 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
100777 - pkts = atomic_add_return(1, &cp->in_pkts);
100778 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
100779 else
100780 pkts = sysctl_sync_threshold(ipvs);
100781 goto sloop;
100782 @@ -895,7 +895,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
100783
100784 if (opt)
100785 memcpy(&cp->in_seq, opt, sizeof(*opt));
100786 - atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
100787 + atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
100788 cp->state = state;
100789 cp->old_state = cp->state;
100790 /*
100791 diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
100792 index c47444e..b0961c6 100644
100793 --- a/net/netfilter/ipvs/ip_vs_xmit.c
100794 +++ b/net/netfilter/ipvs/ip_vs_xmit.c
100795 @@ -1102,7 +1102,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
100796 else
100797 rc = NF_ACCEPT;
100798 /* do not touch skb anymore */
100799 - atomic_inc(&cp->in_pkts);
100800 + atomic_inc_unchecked(&cp->in_pkts);
100801 goto out;
100802 }
100803
100804 @@ -1194,7 +1194,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
100805 else
100806 rc = NF_ACCEPT;
100807 /* do not touch skb anymore */
100808 - atomic_inc(&cp->in_pkts);
100809 + atomic_inc_unchecked(&cp->in_pkts);
100810 goto out;
100811 }
100812
100813 diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
100814 index a4b5e2a..13b1de3 100644
100815 --- a/net/netfilter/nf_conntrack_acct.c
100816 +++ b/net/netfilter/nf_conntrack_acct.c
100817 @@ -62,7 +62,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
100818 #ifdef CONFIG_SYSCTL
100819 static int nf_conntrack_acct_init_sysctl(struct net *net)
100820 {
100821 - struct ctl_table *table;
100822 + ctl_table_no_const *table;
100823
100824 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
100825 GFP_KERNEL);
100826 diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
100827 index 356bef5..99932cb 100644
100828 --- a/net/netfilter/nf_conntrack_core.c
100829 +++ b/net/netfilter/nf_conntrack_core.c
100830 @@ -1627,6 +1627,10 @@ void nf_conntrack_init_end(void)
100831 #define DYING_NULLS_VAL ((1<<30)+1)
100832 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
100833
100834 +#ifdef CONFIG_GRKERNSEC_HIDESYM
100835 +static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
100836 +#endif
100837 +
100838 int nf_conntrack_init_net(struct net *net)
100839 {
100840 int ret;
100841 @@ -1641,7 +1645,11 @@ int nf_conntrack_init_net(struct net *net)
100842 goto err_stat;
100843 }
100844
100845 +#ifdef CONFIG_GRKERNSEC_HIDESYM
100846 + net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08lx", atomic_inc_return_unchecked(&conntrack_cache_id));
100847 +#else
100848 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
100849 +#endif
100850 if (!net->ct.slabname) {
100851 ret = -ENOMEM;
100852 goto err_slabname;
100853 diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
100854 index 1df1761..ce8b88a 100644
100855 --- a/net/netfilter/nf_conntrack_ecache.c
100856 +++ b/net/netfilter/nf_conntrack_ecache.c
100857 @@ -188,7 +188,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
100858 #ifdef CONFIG_SYSCTL
100859 static int nf_conntrack_event_init_sysctl(struct net *net)
100860 {
100861 - struct ctl_table *table;
100862 + ctl_table_no_const *table;
100863
100864 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
100865 GFP_KERNEL);
100866 diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
100867 index 974a2a4..52cc6ff 100644
100868 --- a/net/netfilter/nf_conntrack_helper.c
100869 +++ b/net/netfilter/nf_conntrack_helper.c
100870 @@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
100871
100872 static int nf_conntrack_helper_init_sysctl(struct net *net)
100873 {
100874 - struct ctl_table *table;
100875 + ctl_table_no_const *table;
100876
100877 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
100878 GFP_KERNEL);
100879 diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
100880 index b65d586..beec902 100644
100881 --- a/net/netfilter/nf_conntrack_proto.c
100882 +++ b/net/netfilter/nf_conntrack_proto.c
100883 @@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
100884
100885 static void
100886 nf_ct_unregister_sysctl(struct ctl_table_header **header,
100887 - struct ctl_table **table,
100888 + ctl_table_no_const **table,
100889 unsigned int users)
100890 {
100891 if (users > 0)
100892 diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
100893 index f641751..d3c5b51 100644
100894 --- a/net/netfilter/nf_conntrack_standalone.c
100895 +++ b/net/netfilter/nf_conntrack_standalone.c
100896 @@ -471,7 +471,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
100897
100898 static int nf_conntrack_standalone_init_sysctl(struct net *net)
100899 {
100900 - struct ctl_table *table;
100901 + ctl_table_no_const *table;
100902
100903 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
100904 GFP_KERNEL);
100905 diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
100906 index 7a394df..bd91a8a 100644
100907 --- a/net/netfilter/nf_conntrack_timestamp.c
100908 +++ b/net/netfilter/nf_conntrack_timestamp.c
100909 @@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
100910 #ifdef CONFIG_SYSCTL
100911 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
100912 {
100913 - struct ctl_table *table;
100914 + ctl_table_no_const *table;
100915
100916 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
100917 GFP_KERNEL);
100918 diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
100919 index 85296d4..8becdec 100644
100920 --- a/net/netfilter/nf_log.c
100921 +++ b/net/netfilter/nf_log.c
100922 @@ -243,7 +243,7 @@ static const struct file_operations nflog_file_ops = {
100923
100924 #ifdef CONFIG_SYSCTL
100925 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
100926 -static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
100927 +static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
100928
100929 static int nf_log_proc_dostring(struct ctl_table *table, int write,
100930 void __user *buffer, size_t *lenp, loff_t *ppos)
100931 @@ -274,14 +274,16 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
100932 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
100933 mutex_unlock(&nf_log_mutex);
100934 } else {
100935 + ctl_table_no_const nf_log_table = *table;
100936 +
100937 mutex_lock(&nf_log_mutex);
100938 logger = rcu_dereference_protected(net->nf.nf_loggers[tindex],
100939 lockdep_is_held(&nf_log_mutex));
100940 if (!logger)
100941 - table->data = "NONE";
100942 + nf_log_table.data = "NONE";
100943 else
100944 - table->data = logger->name;
100945 - r = proc_dostring(table, write, buffer, lenp, ppos);
100946 + nf_log_table.data = logger->name;
100947 + r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
100948 mutex_unlock(&nf_log_mutex);
100949 }
100950
100951 diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
100952 index f042ae5..30ea486 100644
100953 --- a/net/netfilter/nf_sockopt.c
100954 +++ b/net/netfilter/nf_sockopt.c
100955 @@ -45,7 +45,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
100956 }
100957 }
100958
100959 - list_add(&reg->list, &nf_sockopts);
100960 + pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
100961 out:
100962 mutex_unlock(&nf_sockopt_mutex);
100963 return ret;
100964 @@ -55,7 +55,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
100965 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
100966 {
100967 mutex_lock(&nf_sockopt_mutex);
100968 - list_del(&reg->list);
100969 + pax_list_del((struct list_head *)&reg->list);
100970 mutex_unlock(&nf_sockopt_mutex);
100971 }
100972 EXPORT_SYMBOL(nf_unregister_sockopt);
100973 diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
100974 index adce01e..8d52d50 100644
100975 --- a/net/netfilter/nf_tables_api.c
100976 +++ b/net/netfilter/nf_tables_api.c
100977 @@ -152,8 +152,8 @@ nf_tables_chain_type_lookup(const struct nft_af_info *afi,
100978 #ifdef CONFIG_MODULES
100979 if (autoload) {
100980 nfnl_unlock(NFNL_SUBSYS_NFTABLES);
100981 - request_module("nft-chain-%u-%*.s", afi->family,
100982 - nla_len(nla)-1, (const char *)nla_data(nla));
100983 + request_module("nft-chain-%u-%.*s", afi->family,
100984 + nla_len(nla), (const char *)nla_data(nla));
100985 nfnl_lock(NFNL_SUBSYS_NFTABLES);
100986 type = __nf_tables_chain_type_lookup(afi->family, nla);
100987 if (type != NULL)
100988 @@ -1934,7 +1934,8 @@ static const struct nft_set_ops *nft_select_set_ops(const struct nlattr * const
100989
100990 static const struct nla_policy nft_set_policy[NFTA_SET_MAX + 1] = {
100991 [NFTA_SET_TABLE] = { .type = NLA_STRING },
100992 - [NFTA_SET_NAME] = { .type = NLA_STRING },
100993 + [NFTA_SET_NAME] = { .type = NLA_STRING,
100994 + .len = IFNAMSIZ - 1 },
100995 [NFTA_SET_FLAGS] = { .type = NLA_U32 },
100996 [NFTA_SET_KEY_TYPE] = { .type = NLA_U32 },
100997 [NFTA_SET_KEY_LEN] = { .type = NLA_U32 },
100998 diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
100999 index a155d19..726b0f2 100644
101000 --- a/net/netfilter/nfnetlink_log.c
101001 +++ b/net/netfilter/nfnetlink_log.c
101002 @@ -82,7 +82,7 @@ static int nfnl_log_net_id __read_mostly;
101003 struct nfnl_log_net {
101004 spinlock_t instances_lock;
101005 struct hlist_head instance_table[INSTANCE_BUCKETS];
101006 - atomic_t global_seq;
101007 + atomic_unchecked_t global_seq;
101008 };
101009
101010 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
101011 @@ -564,7 +564,7 @@ __build_packet_message(struct nfnl_log_net *log,
101012 /* global sequence number */
101013 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
101014 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
101015 - htonl(atomic_inc_return(&log->global_seq))))
101016 + htonl(atomic_inc_return_unchecked(&log->global_seq))))
101017 goto nla_put_failure;
101018
101019 if (data_len) {
101020 diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
101021 index 82cb823..5685dd5 100644
101022 --- a/net/netfilter/nft_compat.c
101023 +++ b/net/netfilter/nft_compat.c
101024 @@ -216,7 +216,7 @@ target_dump_info(struct sk_buff *skb, const struct xt_target *t, const void *in)
101025 /* We want to reuse existing compat_to_user */
101026 old_fs = get_fs();
101027 set_fs(KERNEL_DS);
101028 - t->compat_to_user(out, in);
101029 + t->compat_to_user((void __force_user *)out, in);
101030 set_fs(old_fs);
101031 ret = nla_put(skb, NFTA_TARGET_INFO, XT_ALIGN(t->targetsize), out);
101032 kfree(out);
101033 @@ -403,7 +403,7 @@ match_dump_info(struct sk_buff *skb, const struct xt_match *m, const void *in)
101034 /* We want to reuse existing compat_to_user */
101035 old_fs = get_fs();
101036 set_fs(KERNEL_DS);
101037 - m->compat_to_user(out, in);
101038 + m->compat_to_user((void __force_user *)out, in);
101039 set_fs(old_fs);
101040 ret = nla_put(skb, NFTA_MATCH_INFO, XT_ALIGN(m->matchsize), out);
101041 kfree(out);
101042 diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
101043 new file mode 100644
101044 index 0000000..c566332
101045 --- /dev/null
101046 +++ b/net/netfilter/xt_gradm.c
101047 @@ -0,0 +1,51 @@
101048 +/*
101049 + * gradm match for netfilter
101050 + * Copyright © Zbigniew Krzystolik, 2010
101051 + *
101052 + * This program is free software; you can redistribute it and/or modify
101053 + * it under the terms of the GNU General Public License; either version
101054 + * 2 or 3 as published by the Free Software Foundation.
101055 + */
101056 +#include <linux/module.h>
101057 +#include <linux/moduleparam.h>
101058 +#include <linux/skbuff.h>
101059 +#include <linux/netfilter/x_tables.h>
101060 +#include <linux/grsecurity.h>
101061 +#include <linux/netfilter/xt_gradm.h>
101062 +
101063 +static bool
101064 +gradm_mt(const struct sk_buff *skb, struct xt_action_param *par)
101065 +{
101066 + const struct xt_gradm_mtinfo *info = par->matchinfo;
101067 + bool retval = false;
101068 + if (gr_acl_is_enabled())
101069 + retval = true;
101070 + return retval ^ info->invflags;
101071 +}
101072 +
101073 +static struct xt_match gradm_mt_reg __read_mostly = {
101074 + .name = "gradm",
101075 + .revision = 0,
101076 + .family = NFPROTO_UNSPEC,
101077 + .match = gradm_mt,
101078 + .matchsize = XT_ALIGN(sizeof(struct xt_gradm_mtinfo)),
101079 + .me = THIS_MODULE,
101080 +};
101081 +
101082 +static int __init gradm_mt_init(void)
101083 +{
101084 + return xt_register_match(&gradm_mt_reg);
101085 +}
101086 +
101087 +static void __exit gradm_mt_exit(void)
101088 +{
101089 + xt_unregister_match(&gradm_mt_reg);
101090 +}
101091 +
101092 +module_init(gradm_mt_init);
101093 +module_exit(gradm_mt_exit);
101094 +MODULE_AUTHOR("Zbigniew Krzystolik <zbyniu@destrukcja.pl>");
101095 +MODULE_DESCRIPTION("Xtables: Grsecurity RBAC match");
101096 +MODULE_LICENSE("GPL");
101097 +MODULE_ALIAS("ipt_gradm");
101098 +MODULE_ALIAS("ip6t_gradm");
101099 diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
101100 index a3910fc..2d2ba14 100644
101101 --- a/net/netfilter/xt_hashlimit.c
101102 +++ b/net/netfilter/xt_hashlimit.c
101103 @@ -870,11 +870,11 @@ static int __net_init hashlimit_proc_net_init(struct net *net)
101104 {
101105 struct hashlimit_net *hashlimit_net = hashlimit_pernet(net);
101106
101107 - hashlimit_net->ipt_hashlimit = proc_mkdir("ipt_hashlimit", net->proc_net);
101108 + hashlimit_net->ipt_hashlimit = proc_mkdir_restrict("ipt_hashlimit", net->proc_net);
101109 if (!hashlimit_net->ipt_hashlimit)
101110 return -ENOMEM;
101111 #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
101112 - hashlimit_net->ip6t_hashlimit = proc_mkdir("ip6t_hashlimit", net->proc_net);
101113 + hashlimit_net->ip6t_hashlimit = proc_mkdir_restrict("ip6t_hashlimit", net->proc_net);
101114 if (!hashlimit_net->ip6t_hashlimit) {
101115 remove_proc_entry("ipt_hashlimit", net->proc_net);
101116 return -ENOMEM;
101117 diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
101118 index 1e657cf..1eb1c34 100644
101119 --- a/net/netfilter/xt_recent.c
101120 +++ b/net/netfilter/xt_recent.c
101121 @@ -618,7 +618,7 @@ static int __net_init recent_proc_net_init(struct net *net)
101122 {
101123 struct recent_net *recent_net = recent_pernet(net);
101124
101125 - recent_net->xt_recent = proc_mkdir("xt_recent", net->proc_net);
101126 + recent_net->xt_recent = proc_mkdir_restrict("xt_recent", net->proc_net);
101127 if (!recent_net->xt_recent)
101128 return -ENOMEM;
101129 return 0;
101130 diff --git a/net/netfilter/xt_statistic.c b/net/netfilter/xt_statistic.c
101131 index 11de55e..f25e448 100644
101132 --- a/net/netfilter/xt_statistic.c
101133 +++ b/net/netfilter/xt_statistic.c
101134 @@ -19,7 +19,7 @@
101135 #include <linux/module.h>
101136
101137 struct xt_statistic_priv {
101138 - atomic_t count;
101139 + atomic_unchecked_t count;
101140 } ____cacheline_aligned_in_smp;
101141
101142 MODULE_LICENSE("GPL");
101143 @@ -42,9 +42,9 @@ statistic_mt(const struct sk_buff *skb, struct xt_action_param *par)
101144 break;
101145 case XT_STATISTIC_MODE_NTH:
101146 do {
101147 - oval = atomic_read(&info->master->count);
101148 + oval = atomic_read_unchecked(&info->master->count);
101149 nval = (oval == info->u.nth.every) ? 0 : oval + 1;
101150 - } while (atomic_cmpxchg(&info->master->count, oval, nval) != oval);
101151 + } while (atomic_cmpxchg_unchecked(&info->master->count, oval, nval) != oval);
101152 if (nval == 0)
101153 ret = !ret;
101154 break;
101155 @@ -64,7 +64,7 @@ static int statistic_mt_check(const struct xt_mtchk_param *par)
101156 info->master = kzalloc(sizeof(*info->master), GFP_KERNEL);
101157 if (info->master == NULL)
101158 return -ENOMEM;
101159 - atomic_set(&info->master->count, info->u.nth.count);
101160 + atomic_set_unchecked(&info->master->count, info->u.nth.count);
101161
101162 return 0;
101163 }
101164 diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
101165 index 04748ab6..ca8f86f 100644
101166 --- a/net/netlink/af_netlink.c
101167 +++ b/net/netlink/af_netlink.c
101168 @@ -257,7 +257,7 @@ static void netlink_overrun(struct sock *sk)
101169 sk->sk_error_report(sk);
101170 }
101171 }
101172 - atomic_inc(&sk->sk_drops);
101173 + atomic_inc_unchecked(&sk->sk_drops);
101174 }
101175
101176 static void netlink_rcv_wake(struct sock *sk)
101177 @@ -2933,7 +2933,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
101178 sk_wmem_alloc_get(s),
101179 nlk->cb_running,
101180 atomic_read(&s->sk_refcnt),
101181 - atomic_read(&s->sk_drops),
101182 + atomic_read_unchecked(&s->sk_drops),
101183 sock_i_ino(s)
101184 );
101185
101186 diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
101187 index b74aa07..d41926e 100644
101188 --- a/net/netrom/af_netrom.c
101189 +++ b/net/netrom/af_netrom.c
101190 @@ -850,7 +850,6 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
101191 *uaddr_len = sizeof(struct full_sockaddr_ax25);
101192 } else {
101193 sax->fsa_ax25.sax25_family = AF_NETROM;
101194 - sax->fsa_ax25.sax25_ndigis = 0;
101195 sax->fsa_ax25.sax25_call = nr->source_addr;
101196 *uaddr_len = sizeof(struct sockaddr_ax25);
101197 }
101198 diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
101199 index 48a6a93..0b0496e 100644
101200 --- a/net/packet/af_packet.c
101201 +++ b/net/packet/af_packet.c
101202 @@ -1845,7 +1845,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
101203
101204 spin_lock(&sk->sk_receive_queue.lock);
101205 po->stats.stats1.tp_packets++;
101206 - skb->dropcount = atomic_read(&sk->sk_drops);
101207 + skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
101208 __skb_queue_tail(&sk->sk_receive_queue, skb);
101209 spin_unlock(&sk->sk_receive_queue.lock);
101210 sk->sk_data_ready(sk, skb->len);
101211 @@ -1854,7 +1854,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
101212 drop_n_acct:
101213 spin_lock(&sk->sk_receive_queue.lock);
101214 po->stats.stats1.tp_drops++;
101215 - atomic_inc(&sk->sk_drops);
101216 + atomic_inc_unchecked(&sk->sk_drops);
101217 spin_unlock(&sk->sk_receive_queue.lock);
101218
101219 drop_n_restore:
101220 @@ -3449,7 +3449,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
101221 case PACKET_HDRLEN:
101222 if (len > sizeof(int))
101223 len = sizeof(int);
101224 - if (copy_from_user(&val, optval, len))
101225 + if (len > sizeof(val) || copy_from_user(&val, optval, len))
101226 return -EFAULT;
101227 switch (val) {
101228 case TPACKET_V1:
101229 @@ -3495,7 +3495,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
101230 len = lv;
101231 if (put_user(len, optlen))
101232 return -EFAULT;
101233 - if (copy_to_user(optval, data, len))
101234 + if (len > sizeof(st) || copy_to_user(optval, data, len))
101235 return -EFAULT;
101236 return 0;
101237 }
101238 diff --git a/net/phonet/pep.c b/net/phonet/pep.c
101239 index e774117..900b8b7 100644
101240 --- a/net/phonet/pep.c
101241 +++ b/net/phonet/pep.c
101242 @@ -388,7 +388,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
101243
101244 case PNS_PEP_CTRL_REQ:
101245 if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX) {
101246 - atomic_inc(&sk->sk_drops);
101247 + atomic_inc_unchecked(&sk->sk_drops);
101248 break;
101249 }
101250 __skb_pull(skb, 4);
101251 @@ -409,7 +409,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
101252 }
101253
101254 if (pn->rx_credits == 0) {
101255 - atomic_inc(&sk->sk_drops);
101256 + atomic_inc_unchecked(&sk->sk_drops);
101257 err = -ENOBUFS;
101258 break;
101259 }
101260 @@ -580,7 +580,7 @@ static int pipe_handler_do_rcv(struct sock *sk, struct sk_buff *skb)
101261 }
101262
101263 if (pn->rx_credits == 0) {
101264 - atomic_inc(&sk->sk_drops);
101265 + atomic_inc_unchecked(&sk->sk_drops);
101266 err = NET_RX_DROP;
101267 break;
101268 }
101269 diff --git a/net/phonet/socket.c b/net/phonet/socket.c
101270 index 008214a..bb68240 100644
101271 --- a/net/phonet/socket.c
101272 +++ b/net/phonet/socket.c
101273 @@ -611,7 +611,7 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)
101274 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sk)),
101275 sock_i_ino(sk),
101276 atomic_read(&sk->sk_refcnt), sk,
101277 - atomic_read(&sk->sk_drops));
101278 + atomic_read_unchecked(&sk->sk_drops));
101279 }
101280 seq_pad(seq, '\n');
101281 return 0;
101282 diff --git a/net/phonet/sysctl.c b/net/phonet/sysctl.c
101283 index c02a8c4..3c5b600 100644
101284 --- a/net/phonet/sysctl.c
101285 +++ b/net/phonet/sysctl.c
101286 @@ -67,7 +67,7 @@ static int proc_local_port_range(struct ctl_table *table, int write,
101287 {
101288 int ret;
101289 int range[2] = {local_port_range[0], local_port_range[1]};
101290 - struct ctl_table tmp = {
101291 + ctl_table_no_const tmp = {
101292 .data = &range,
101293 .maxlen = sizeof(range),
101294 .mode = table->mode,
101295 diff --git a/net/rds/cong.c b/net/rds/cong.c
101296 index e5b65ac..f3b6fb7 100644
101297 --- a/net/rds/cong.c
101298 +++ b/net/rds/cong.c
101299 @@ -78,7 +78,7 @@
101300 * finds that the saved generation number is smaller than the global generation
101301 * number, it wakes up the process.
101302 */
101303 -static atomic_t rds_cong_generation = ATOMIC_INIT(0);
101304 +static atomic_unchecked_t rds_cong_generation = ATOMIC_INIT(0);
101305
101306 /*
101307 * Congestion monitoring
101308 @@ -233,7 +233,7 @@ void rds_cong_map_updated(struct rds_cong_map *map, uint64_t portmask)
101309 rdsdebug("waking map %p for %pI4\n",
101310 map, &map->m_addr);
101311 rds_stats_inc(s_cong_update_received);
101312 - atomic_inc(&rds_cong_generation);
101313 + atomic_inc_unchecked(&rds_cong_generation);
101314 if (waitqueue_active(&map->m_waitq))
101315 wake_up(&map->m_waitq);
101316 if (waitqueue_active(&rds_poll_waitq))
101317 @@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(rds_cong_map_updated);
101318
101319 int rds_cong_updated_since(unsigned long *recent)
101320 {
101321 - unsigned long gen = atomic_read(&rds_cong_generation);
101322 + unsigned long gen = atomic_read_unchecked(&rds_cong_generation);
101323
101324 if (likely(*recent == gen))
101325 return 0;
101326 diff --git a/net/rds/ib.h b/net/rds/ib.h
101327 index 7280ab8..e04f4ea 100644
101328 --- a/net/rds/ib.h
101329 +++ b/net/rds/ib.h
101330 @@ -128,7 +128,7 @@ struct rds_ib_connection {
101331 /* sending acks */
101332 unsigned long i_ack_flags;
101333 #ifdef KERNEL_HAS_ATOMIC64
101334 - atomic64_t i_ack_next; /* next ACK to send */
101335 + atomic64_unchecked_t i_ack_next; /* next ACK to send */
101336 #else
101337 spinlock_t i_ack_lock; /* protect i_ack_next */
101338 u64 i_ack_next; /* next ACK to send */
101339 diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
101340 index 31b74f5..dc1fbfa 100644
101341 --- a/net/rds/ib_cm.c
101342 +++ b/net/rds/ib_cm.c
101343 @@ -717,7 +717,7 @@ void rds_ib_conn_shutdown(struct rds_connection *conn)
101344 /* Clear the ACK state */
101345 clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
101346 #ifdef KERNEL_HAS_ATOMIC64
101347 - atomic64_set(&ic->i_ack_next, 0);
101348 + atomic64_set_unchecked(&ic->i_ack_next, 0);
101349 #else
101350 ic->i_ack_next = 0;
101351 #endif
101352 diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
101353 index b7ebe23..b6352f6 100644
101354 --- a/net/rds/ib_recv.c
101355 +++ b/net/rds/ib_recv.c
101356 @@ -596,7 +596,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
101357 static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq,
101358 int ack_required)
101359 {
101360 - atomic64_set(&ic->i_ack_next, seq);
101361 + atomic64_set_unchecked(&ic->i_ack_next, seq);
101362 if (ack_required) {
101363 smp_mb__before_clear_bit();
101364 set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
101365 @@ -608,7 +608,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
101366 clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
101367 smp_mb__after_clear_bit();
101368
101369 - return atomic64_read(&ic->i_ack_next);
101370 + return atomic64_read_unchecked(&ic->i_ack_next);
101371 }
101372 #endif
101373
101374 diff --git a/net/rds/iw.h b/net/rds/iw.h
101375 index 04ce3b1..48119a6 100644
101376 --- a/net/rds/iw.h
101377 +++ b/net/rds/iw.h
101378 @@ -134,7 +134,7 @@ struct rds_iw_connection {
101379 /* sending acks */
101380 unsigned long i_ack_flags;
101381 #ifdef KERNEL_HAS_ATOMIC64
101382 - atomic64_t i_ack_next; /* next ACK to send */
101383 + atomic64_unchecked_t i_ack_next; /* next ACK to send */
101384 #else
101385 spinlock_t i_ack_lock; /* protect i_ack_next */
101386 u64 i_ack_next; /* next ACK to send */
101387 diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c
101388 index a91e1db..cf3053f 100644
101389 --- a/net/rds/iw_cm.c
101390 +++ b/net/rds/iw_cm.c
101391 @@ -663,7 +663,7 @@ void rds_iw_conn_shutdown(struct rds_connection *conn)
101392 /* Clear the ACK state */
101393 clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
101394 #ifdef KERNEL_HAS_ATOMIC64
101395 - atomic64_set(&ic->i_ack_next, 0);
101396 + atomic64_set_unchecked(&ic->i_ack_next, 0);
101397 #else
101398 ic->i_ack_next = 0;
101399 #endif
101400 diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c
101401 index 4503335..db566b4 100644
101402 --- a/net/rds/iw_recv.c
101403 +++ b/net/rds/iw_recv.c
101404 @@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
101405 static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq,
101406 int ack_required)
101407 {
101408 - atomic64_set(&ic->i_ack_next, seq);
101409 + atomic64_set_unchecked(&ic->i_ack_next, seq);
101410 if (ack_required) {
101411 smp_mb__before_clear_bit();
101412 set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
101413 @@ -439,7 +439,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
101414 clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
101415 smp_mb__after_clear_bit();
101416
101417 - return atomic64_read(&ic->i_ack_next);
101418 + return atomic64_read_unchecked(&ic->i_ack_next);
101419 }
101420 #endif
101421
101422 diff --git a/net/rds/rds.h b/net/rds/rds.h
101423 index 48f8ffc..0ef3eec 100644
101424 --- a/net/rds/rds.h
101425 +++ b/net/rds/rds.h
101426 @@ -449,7 +449,7 @@ struct rds_transport {
101427 void (*sync_mr)(void *trans_private, int direction);
101428 void (*free_mr)(void *trans_private, int invalidate);
101429 void (*flush_mrs)(void);
101430 -};
101431 +} __do_const;
101432
101433 struct rds_sock {
101434 struct sock rs_sk;
101435 diff --git a/net/rds/tcp.c b/net/rds/tcp.c
101436 index edac9ef..16bcb98 100644
101437 --- a/net/rds/tcp.c
101438 +++ b/net/rds/tcp.c
101439 @@ -59,7 +59,7 @@ void rds_tcp_nonagle(struct socket *sock)
101440 int val = 1;
101441
101442 set_fs(KERNEL_DS);
101443 - sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __user *)&val,
101444 + sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __force_user *)&val,
101445 sizeof(val));
101446 set_fs(oldfs);
101447 }
101448 diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c
101449 index 81cf5a4..b5826ff 100644
101450 --- a/net/rds/tcp_send.c
101451 +++ b/net/rds/tcp_send.c
101452 @@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket *sock, int val)
101453
101454 oldfs = get_fs();
101455 set_fs(KERNEL_DS);
101456 - sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __user *)&val,
101457 + sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __force_user *)&val,
101458 sizeof(val));
101459 set_fs(oldfs);
101460 }
101461 diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
101462 index e61aa60..f07cc89 100644
101463 --- a/net/rxrpc/af_rxrpc.c
101464 +++ b/net/rxrpc/af_rxrpc.c
101465 @@ -40,7 +40,7 @@ static const struct proto_ops rxrpc_rpc_ops;
101466 __be32 rxrpc_epoch;
101467
101468 /* current debugging ID */
101469 -atomic_t rxrpc_debug_id;
101470 +atomic_unchecked_t rxrpc_debug_id;
101471
101472 /* count of skbs currently in use */
101473 atomic_t rxrpc_n_skbs;
101474 diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
101475 index cd97a0c..0041649 100644
101476 --- a/net/rxrpc/ar-ack.c
101477 +++ b/net/rxrpc/ar-ack.c
101478 @@ -182,7 +182,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
101479
101480 _enter("{%d,%d,%d,%d},",
101481 call->acks_hard, call->acks_unacked,
101482 - atomic_read(&call->sequence),
101483 + atomic_read_unchecked(&call->sequence),
101484 CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz));
101485
101486 stop = 0;
101487 @@ -206,7 +206,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
101488
101489 /* each Tx packet has a new serial number */
101490 sp->hdr.serial =
101491 - htonl(atomic_inc_return(&call->conn->serial));
101492 + htonl(atomic_inc_return_unchecked(&call->conn->serial));
101493
101494 hdr = (struct rxrpc_header *) txb->head;
101495 hdr->serial = sp->hdr.serial;
101496 @@ -410,7 +410,7 @@ static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
101497 */
101498 static void rxrpc_clear_tx_window(struct rxrpc_call *call)
101499 {
101500 - rxrpc_rotate_tx_window(call, atomic_read(&call->sequence));
101501 + rxrpc_rotate_tx_window(call, atomic_read_unchecked(&call->sequence));
101502 }
101503
101504 /*
101505 @@ -636,7 +636,7 @@ process_further:
101506
101507 latest = ntohl(sp->hdr.serial);
101508 hard = ntohl(ack.firstPacket);
101509 - tx = atomic_read(&call->sequence);
101510 + tx = atomic_read_unchecked(&call->sequence);
101511
101512 _proto("Rx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
101513 latest,
101514 @@ -1168,7 +1168,7 @@ void rxrpc_process_call(struct work_struct *work)
101515 goto maybe_reschedule;
101516
101517 send_ACK_with_skew:
101518 - ack.maxSkew = htons(atomic_read(&call->conn->hi_serial) -
101519 + ack.maxSkew = htons(atomic_read_unchecked(&call->conn->hi_serial) -
101520 ntohl(ack.serial));
101521 send_ACK:
101522 mtu = call->conn->trans->peer->if_mtu;
101523 @@ -1180,7 +1180,7 @@ send_ACK:
101524 ackinfo.rxMTU = htonl(5692);
101525 ackinfo.jumbo_max = htonl(4);
101526
101527 - hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
101528 + hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
101529 _proto("Tx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
101530 ntohl(hdr.serial),
101531 ntohs(ack.maxSkew),
101532 @@ -1198,7 +1198,7 @@ send_ACK:
101533 send_message:
101534 _debug("send message");
101535
101536 - hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
101537 + hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
101538 _proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
101539 send_message_2:
101540
101541 diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c
101542 index a3bbb36..3341fb9 100644
101543 --- a/net/rxrpc/ar-call.c
101544 +++ b/net/rxrpc/ar-call.c
101545 @@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp)
101546 spin_lock_init(&call->lock);
101547 rwlock_init(&call->state_lock);
101548 atomic_set(&call->usage, 1);
101549 - call->debug_id = atomic_inc_return(&rxrpc_debug_id);
101550 + call->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
101551 call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
101552
101553 memset(&call->sock_node, 0xed, sizeof(call->sock_node));
101554 diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c
101555 index 7bf5b5b..4a3bf2c 100644
101556 --- a/net/rxrpc/ar-connection.c
101557 +++ b/net/rxrpc/ar-connection.c
101558 @@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_alloc_connection(gfp_t gfp)
101559 rwlock_init(&conn->lock);
101560 spin_lock_init(&conn->state_lock);
101561 atomic_set(&conn->usage, 1);
101562 - conn->debug_id = atomic_inc_return(&rxrpc_debug_id);
101563 + conn->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
101564 conn->avail_calls = RXRPC_MAXCALLS;
101565 conn->size_align = 4;
101566 conn->header_size = sizeof(struct rxrpc_header);
101567 diff --git a/net/rxrpc/ar-connevent.c b/net/rxrpc/ar-connevent.c
101568 index e7ed43a..6afa140 100644
101569 --- a/net/rxrpc/ar-connevent.c
101570 +++ b/net/rxrpc/ar-connevent.c
101571 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct rxrpc_connection *conn,
101572
101573 len = iov[0].iov_len + iov[1].iov_len;
101574
101575 - hdr.serial = htonl(atomic_inc_return(&conn->serial));
101576 + hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
101577 _proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
101578
101579 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
101580 diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c
101581 index 529572f..c758ca7 100644
101582 --- a/net/rxrpc/ar-input.c
101583 +++ b/net/rxrpc/ar-input.c
101584 @@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb)
101585 /* track the latest serial number on this connection for ACK packet
101586 * information */
101587 serial = ntohl(sp->hdr.serial);
101588 - hi_serial = atomic_read(&call->conn->hi_serial);
101589 + hi_serial = atomic_read_unchecked(&call->conn->hi_serial);
101590 while (serial > hi_serial)
101591 - hi_serial = atomic_cmpxchg(&call->conn->hi_serial, hi_serial,
101592 + hi_serial = atomic_cmpxchg_unchecked(&call->conn->hi_serial, hi_serial,
101593 serial);
101594
101595 /* request ACK generation for any ACK or DATA packet that requests
101596 diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
101597 index 5f43675..ca07817 100644
101598 --- a/net/rxrpc/ar-internal.h
101599 +++ b/net/rxrpc/ar-internal.h
101600 @@ -272,8 +272,8 @@ struct rxrpc_connection {
101601 int error; /* error code for local abort */
101602 int debug_id; /* debug ID for printks */
101603 unsigned int call_counter; /* call ID counter */
101604 - atomic_t serial; /* packet serial number counter */
101605 - atomic_t hi_serial; /* highest serial number received */
101606 + atomic_unchecked_t serial; /* packet serial number counter */
101607 + atomic_unchecked_t hi_serial; /* highest serial number received */
101608 u8 avail_calls; /* number of calls available */
101609 u8 size_align; /* data size alignment (for security) */
101610 u8 header_size; /* rxrpc + security header size */
101611 @@ -346,7 +346,7 @@ struct rxrpc_call {
101612 spinlock_t lock;
101613 rwlock_t state_lock; /* lock for state transition */
101614 atomic_t usage;
101615 - atomic_t sequence; /* Tx data packet sequence counter */
101616 + atomic_unchecked_t sequence; /* Tx data packet sequence counter */
101617 u32 abort_code; /* local/remote abort code */
101618 enum { /* current state of call */
101619 RXRPC_CALL_CLIENT_SEND_REQUEST, /* - client sending request phase */
101620 @@ -420,7 +420,7 @@ static inline void rxrpc_abort_call(struct rxrpc_call *call, u32 abort_code)
101621 */
101622 extern atomic_t rxrpc_n_skbs;
101623 extern __be32 rxrpc_epoch;
101624 -extern atomic_t rxrpc_debug_id;
101625 +extern atomic_unchecked_t rxrpc_debug_id;
101626 extern struct workqueue_struct *rxrpc_workqueue;
101627
101628 /*
101629 diff --git a/net/rxrpc/ar-local.c b/net/rxrpc/ar-local.c
101630 index 87f7135..74d3703 100644
101631 --- a/net/rxrpc/ar-local.c
101632 +++ b/net/rxrpc/ar-local.c
101633 @@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(struct sockaddr_rxrpc *srx)
101634 spin_lock_init(&local->lock);
101635 rwlock_init(&local->services_lock);
101636 atomic_set(&local->usage, 1);
101637 - local->debug_id = atomic_inc_return(&rxrpc_debug_id);
101638 + local->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
101639 memcpy(&local->srx, srx, sizeof(*srx));
101640 }
101641
101642 diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
101643 index d0e8f1c..a3a1686 100644
101644 --- a/net/rxrpc/ar-output.c
101645 +++ b/net/rxrpc/ar-output.c
101646 @@ -682,9 +682,9 @@ static int rxrpc_send_data(struct kiocb *iocb,
101647 sp->hdr.cid = call->cid;
101648 sp->hdr.callNumber = call->call_id;
101649 sp->hdr.seq =
101650 - htonl(atomic_inc_return(&call->sequence));
101651 + htonl(atomic_inc_return_unchecked(&call->sequence));
101652 sp->hdr.serial =
101653 - htonl(atomic_inc_return(&conn->serial));
101654 + htonl(atomic_inc_return_unchecked(&conn->serial));
101655 sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
101656 sp->hdr.userStatus = 0;
101657 sp->hdr.securityIndex = conn->security_ix;
101658 diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/ar-peer.c
101659 index bebaa43..2644591 100644
101660 --- a/net/rxrpc/ar-peer.c
101661 +++ b/net/rxrpc/ar-peer.c
101662 @@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_peer(struct sockaddr_rxrpc *srx,
101663 INIT_LIST_HEAD(&peer->error_targets);
101664 spin_lock_init(&peer->lock);
101665 atomic_set(&peer->usage, 1);
101666 - peer->debug_id = atomic_inc_return(&rxrpc_debug_id);
101667 + peer->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
101668 memcpy(&peer->srx, srx, sizeof(*srx));
101669
101670 rxrpc_assess_MTU_size(peer);
101671 diff --git a/net/rxrpc/ar-proc.c b/net/rxrpc/ar-proc.c
101672 index 38047f7..9f48511 100644
101673 --- a/net/rxrpc/ar-proc.c
101674 +++ b/net/rxrpc/ar-proc.c
101675 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(struct seq_file *seq, void *v)
101676 atomic_read(&conn->usage),
101677 rxrpc_conn_states[conn->state],
101678 key_serial(conn->key),
101679 - atomic_read(&conn->serial),
101680 - atomic_read(&conn->hi_serial));
101681 + atomic_read_unchecked(&conn->serial),
101682 + atomic_read_unchecked(&conn->hi_serial));
101683
101684 return 0;
101685 }
101686 diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c
101687 index 92df566..87ec1bf 100644
101688 --- a/net/rxrpc/ar-transport.c
101689 +++ b/net/rxrpc/ar-transport.c
101690 @@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_alloc_transport(struct rxrpc_local *local,
101691 spin_lock_init(&trans->client_lock);
101692 rwlock_init(&trans->conn_lock);
101693 atomic_set(&trans->usage, 1);
101694 - trans->debug_id = atomic_inc_return(&rxrpc_debug_id);
101695 + trans->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
101696
101697 if (peer->srx.transport.family == AF_INET) {
101698 switch (peer->srx.transport_type) {
101699 diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
101700 index f226709..0e735a8 100644
101701 --- a/net/rxrpc/rxkad.c
101702 +++ b/net/rxrpc/rxkad.c
101703 @@ -610,7 +610,7 @@ static int rxkad_issue_challenge(struct rxrpc_connection *conn)
101704
101705 len = iov[0].iov_len + iov[1].iov_len;
101706
101707 - hdr.serial = htonl(atomic_inc_return(&conn->serial));
101708 + hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
101709 _proto("Tx CHALLENGE %%%u", ntohl(hdr.serial));
101710
101711 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
101712 @@ -660,7 +660,7 @@ static int rxkad_send_response(struct rxrpc_connection *conn,
101713
101714 len = iov[0].iov_len + iov[1].iov_len + iov[2].iov_len;
101715
101716 - hdr->serial = htonl(atomic_inc_return(&conn->serial));
101717 + hdr->serial = htonl(atomic_inc_return_unchecked(&conn->serial));
101718 _proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
101719
101720 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
101721 diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
101722 index 2b1738e..a9d0fc9 100644
101723 --- a/net/sctp/ipv6.c
101724 +++ b/net/sctp/ipv6.c
101725 @@ -966,7 +966,7 @@ static const struct inet6_protocol sctpv6_protocol = {
101726 .flags = INET6_PROTO_NOPOLICY | INET6_PROTO_FINAL,
101727 };
101728
101729 -static struct sctp_af sctp_af_inet6 = {
101730 +static struct sctp_af sctp_af_inet6 __read_only = {
101731 .sa_family = AF_INET6,
101732 .sctp_xmit = sctp_v6_xmit,
101733 .setsockopt = ipv6_setsockopt,
101734 @@ -998,7 +998,7 @@ static struct sctp_af sctp_af_inet6 = {
101735 #endif
101736 };
101737
101738 -static struct sctp_pf sctp_pf_inet6 = {
101739 +static struct sctp_pf sctp_pf_inet6 __read_only = {
101740 .event_msgname = sctp_inet6_event_msgname,
101741 .skb_msgname = sctp_inet6_skb_msgname,
101742 .af_supported = sctp_inet6_af_supported,
101743 @@ -1023,7 +1023,7 @@ void sctp_v6_pf_init(void)
101744
101745 void sctp_v6_pf_exit(void)
101746 {
101747 - list_del(&sctp_af_inet6.list);
101748 + pax_list_del(&sctp_af_inet6.list);
101749 }
101750
101751 /* Initialize IPv6 support and register with socket layer. */
101752 diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
101753 index 4e1d0fc..068fef7 100644
101754 --- a/net/sctp/protocol.c
101755 +++ b/net/sctp/protocol.c
101756 @@ -831,8 +831,10 @@ int sctp_register_af(struct sctp_af *af)
101757 return 0;
101758 }
101759
101760 + pax_open_kernel();
101761 INIT_LIST_HEAD(&af->list);
101762 - list_add_tail(&af->list, &sctp_address_families);
101763 + pax_close_kernel();
101764 + pax_list_add_tail(&af->list, &sctp_address_families);
101765 return 1;
101766 }
101767
101768 @@ -962,7 +964,7 @@ static inline int sctp_v4_xmit(struct sk_buff *skb,
101769
101770 static struct sctp_af sctp_af_inet;
101771
101772 -static struct sctp_pf sctp_pf_inet = {
101773 +static struct sctp_pf sctp_pf_inet __read_only = {
101774 .event_msgname = sctp_inet_event_msgname,
101775 .skb_msgname = sctp_inet_skb_msgname,
101776 .af_supported = sctp_inet_af_supported,
101777 @@ -1034,7 +1036,7 @@ static const struct net_protocol sctp_protocol = {
101778 };
101779
101780 /* IPv4 address related functions. */
101781 -static struct sctp_af sctp_af_inet = {
101782 +static struct sctp_af sctp_af_inet __read_only = {
101783 .sa_family = AF_INET,
101784 .sctp_xmit = sctp_v4_xmit,
101785 .setsockopt = ip_setsockopt,
101786 @@ -1119,7 +1121,7 @@ static void sctp_v4_pf_init(void)
101787
101788 static void sctp_v4_pf_exit(void)
101789 {
101790 - list_del(&sctp_af_inet.list);
101791 + pax_list_del(&sctp_af_inet.list);
101792 }
101793
101794 static int sctp_v4_protosw_init(void)
101795 diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
101796 index 5d6883f..394a102 100644
101797 --- a/net/sctp/sm_sideeffect.c
101798 +++ b/net/sctp/sm_sideeffect.c
101799 @@ -439,7 +439,7 @@ static void sctp_generate_sack_event(unsigned long data)
101800 sctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_SACK);
101801 }
101802
101803 -sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES] = {
101804 +sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES] = {
101805 NULL,
101806 sctp_generate_t1_cookie_event,
101807 sctp_generate_t1_init_event,
101808 diff --git a/net/sctp/socket.c b/net/sctp/socket.c
101809 index 981aaf8..5bc016d 100644
101810 --- a/net/sctp/socket.c
101811 +++ b/net/sctp/socket.c
101812 @@ -2169,11 +2169,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
101813 {
101814 struct sctp_association *asoc;
101815 struct sctp_ulpevent *event;
101816 + struct sctp_event_subscribe subscribe;
101817
101818 if (optlen > sizeof(struct sctp_event_subscribe))
101819 return -EINVAL;
101820 - if (copy_from_user(&sctp_sk(sk)->subscribe, optval, optlen))
101821 + if (copy_from_user(&subscribe, optval, optlen))
101822 return -EFAULT;
101823 + sctp_sk(sk)->subscribe = subscribe;
101824
101825 /*
101826 * At the time when a user app subscribes to SCTP_SENDER_DRY_EVENT,
101827 @@ -4255,13 +4257,16 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
101828 static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
101829 int __user *optlen)
101830 {
101831 + struct sctp_event_subscribe subscribe;
101832 +
101833 if (len <= 0)
101834 return -EINVAL;
101835 if (len > sizeof(struct sctp_event_subscribe))
101836 len = sizeof(struct sctp_event_subscribe);
101837 if (put_user(len, optlen))
101838 return -EFAULT;
101839 - if (copy_to_user(optval, &sctp_sk(sk)->subscribe, len))
101840 + subscribe = sctp_sk(sk)->subscribe;
101841 + if (copy_to_user(optval, &subscribe, len))
101842 return -EFAULT;
101843 return 0;
101844 }
101845 @@ -4279,6 +4284,8 @@ static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
101846 */
101847 static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optval, int __user *optlen)
101848 {
101849 + __u32 autoclose;
101850 +
101851 /* Applicable to UDP-style socket only */
101852 if (sctp_style(sk, TCP))
101853 return -EOPNOTSUPP;
101854 @@ -4287,7 +4294,8 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
101855 len = sizeof(int);
101856 if (put_user(len, optlen))
101857 return -EFAULT;
101858 - if (copy_to_user(optval, &sctp_sk(sk)->autoclose, sizeof(int)))
101859 + autoclose = sctp_sk(sk)->autoclose;
101860 + if (copy_to_user(optval, &autoclose, sizeof(int)))
101861 return -EFAULT;
101862 return 0;
101863 }
101864 @@ -4662,12 +4670,15 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len,
101865 */
101866 static int sctp_getsockopt_initmsg(struct sock *sk, int len, char __user *optval, int __user *optlen)
101867 {
101868 + struct sctp_initmsg initmsg;
101869 +
101870 if (len < sizeof(struct sctp_initmsg))
101871 return -EINVAL;
101872 len = sizeof(struct sctp_initmsg);
101873 if (put_user(len, optlen))
101874 return -EFAULT;
101875 - if (copy_to_user(optval, &sctp_sk(sk)->initmsg, len))
101876 + initmsg = sctp_sk(sk)->initmsg;
101877 + if (copy_to_user(optval, &initmsg, len))
101878 return -EFAULT;
101879 return 0;
101880 }
101881 @@ -4708,6 +4719,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
101882 addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
101883 if (space_left < addrlen)
101884 return -ENOMEM;
101885 + if (addrlen > sizeof(temp) || addrlen < 0)
101886 + return -EFAULT;
101887 if (copy_to_user(to, &temp, addrlen))
101888 return -EFAULT;
101889 to += addrlen;
101890 diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
101891 index 35c8923..536614e 100644
101892 --- a/net/sctp/sysctl.c
101893 +++ b/net/sctp/sysctl.c
101894 @@ -305,7 +305,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl, int write,
101895 {
101896 struct net *net = current->nsproxy->net_ns;
101897 char tmp[8];
101898 - struct ctl_table tbl;
101899 + ctl_table_no_const tbl;
101900 int ret;
101901 int changed = 0;
101902 char *none = "none";
101903 @@ -352,7 +352,7 @@ static int proc_sctp_do_rto_min(struct ctl_table *ctl, int write,
101904 {
101905 struct net *net = current->nsproxy->net_ns;
101906 int new_value;
101907 - struct ctl_table tbl;
101908 + ctl_table_no_const tbl;
101909 unsigned int min = *(unsigned int *) ctl->extra1;
101910 unsigned int max = *(unsigned int *) ctl->extra2;
101911 int ret;
101912 @@ -379,7 +379,7 @@ static int proc_sctp_do_rto_max(struct ctl_table *ctl, int write,
101913 {
101914 struct net *net = current->nsproxy->net_ns;
101915 int new_value;
101916 - struct ctl_table tbl;
101917 + ctl_table_no_const tbl;
101918 unsigned int min = *(unsigned int *) ctl->extra1;
101919 unsigned int max = *(unsigned int *) ctl->extra2;
101920 int ret;
101921 @@ -402,7 +402,7 @@ static int proc_sctp_do_rto_max(struct ctl_table *ctl, int write,
101922
101923 int sctp_sysctl_net_register(struct net *net)
101924 {
101925 - struct ctl_table *table = sctp_net_table;
101926 + ctl_table_no_const *table = NULL;
101927
101928 if (!net_eq(net, &init_net)) {
101929 int i;
101930 @@ -415,7 +415,10 @@ int sctp_sysctl_net_register(struct net *net)
101931 table[i].data += (char *)(&net->sctp) - (char *)&init_net.sctp;
101932 }
101933
101934 - net->sctp.sysctl_header = register_net_sysctl(net, "net/sctp", table);
101935 + if (!net_eq(net, &init_net))
101936 + net->sctp.sysctl_header = register_net_sysctl(net, "net/sctp", table);
101937 + else
101938 + net->sctp.sysctl_header = register_net_sysctl(net, "net/sctp", sctp_net_table);
101939 return 0;
101940 }
101941
101942 diff --git a/net/socket.c b/net/socket.c
101943 index a19ae19..89554dc 100644
101944 --- a/net/socket.c
101945 +++ b/net/socket.c
101946 @@ -88,6 +88,7 @@
101947 #include <linux/magic.h>
101948 #include <linux/slab.h>
101949 #include <linux/xattr.h>
101950 +#include <linux/in.h>
101951
101952 #include <asm/uaccess.h>
101953 #include <asm/unistd.h>
101954 @@ -111,6 +112,8 @@ unsigned int sysctl_net_busy_read __read_mostly;
101955 unsigned int sysctl_net_busy_poll __read_mostly;
101956 #endif
101957
101958 +#include <linux/grsock.h>
101959 +
101960 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
101961 static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
101962 unsigned long nr_segs, loff_t pos);
101963 @@ -162,7 +165,7 @@ static const struct file_operations socket_file_ops = {
101964 */
101965
101966 static DEFINE_SPINLOCK(net_family_lock);
101967 -static const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
101968 +const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
101969
101970 /*
101971 * Statistics counters of the socket lists
101972 @@ -328,7 +331,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type,
101973 &sockfs_dentry_operations, SOCKFS_MAGIC);
101974 }
101975
101976 -static struct vfsmount *sock_mnt __read_mostly;
101977 +struct vfsmount *sock_mnt __read_mostly;
101978
101979 static struct file_system_type sock_fs_type = {
101980 .name = "sockfs",
101981 @@ -1256,6 +1259,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
101982 return -EAFNOSUPPORT;
101983 if (type < 0 || type >= SOCK_MAX)
101984 return -EINVAL;
101985 + if (protocol < 0)
101986 + return -EINVAL;
101987
101988 /* Compatibility.
101989
101990 @@ -1276,6 +1281,20 @@ int __sock_create(struct net *net, int family, int type, int protocol,
101991 if (err)
101992 return err;
101993
101994 + if(!kern && !gr_search_socket(family, type, protocol)) {
101995 + if (rcu_access_pointer(net_families[family]) == NULL)
101996 + return -EAFNOSUPPORT;
101997 + else
101998 + return -EACCES;
101999 + }
102000 +
102001 + if (!kern && gr_handle_sock_all(family, type, protocol)) {
102002 + if (rcu_access_pointer(net_families[family]) == NULL)
102003 + return -EAFNOSUPPORT;
102004 + else
102005 + return -EACCES;
102006 + }
102007 +
102008 /*
102009 * Allocate the socket and allow the family to set things up. if
102010 * the protocol is 0, the family is instructed to select an appropriate
102011 @@ -1527,6 +1546,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
102012 if (sock) {
102013 err = move_addr_to_kernel(umyaddr, addrlen, &address);
102014 if (err >= 0) {
102015 + if (gr_handle_sock_server((struct sockaddr *)&address)) {
102016 + err = -EACCES;
102017 + goto error;
102018 + }
102019 + err = gr_search_bind(sock, (struct sockaddr_in *)&address);
102020 + if (err)
102021 + goto error;
102022 +
102023 err = security_socket_bind(sock,
102024 (struct sockaddr *)&address,
102025 addrlen);
102026 @@ -1535,6 +1562,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
102027 (struct sockaddr *)
102028 &address, addrlen);
102029 }
102030 +error:
102031 fput_light(sock->file, fput_needed);
102032 }
102033 return err;
102034 @@ -1558,10 +1586,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
102035 if ((unsigned int)backlog > somaxconn)
102036 backlog = somaxconn;
102037
102038 + if (gr_handle_sock_server_other(sock->sk)) {
102039 + err = -EPERM;
102040 + goto error;
102041 + }
102042 +
102043 + err = gr_search_listen(sock);
102044 + if (err)
102045 + goto error;
102046 +
102047 err = security_socket_listen(sock, backlog);
102048 if (!err)
102049 err = sock->ops->listen(sock, backlog);
102050
102051 +error:
102052 fput_light(sock->file, fput_needed);
102053 }
102054 return err;
102055 @@ -1605,6 +1643,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
102056 newsock->type = sock->type;
102057 newsock->ops = sock->ops;
102058
102059 + if (gr_handle_sock_server_other(sock->sk)) {
102060 + err = -EPERM;
102061 + sock_release(newsock);
102062 + goto out_put;
102063 + }
102064 +
102065 + err = gr_search_accept(sock);
102066 + if (err) {
102067 + sock_release(newsock);
102068 + goto out_put;
102069 + }
102070 +
102071 /*
102072 * We don't need try_module_get here, as the listening socket (sock)
102073 * has the protocol module (sock->ops->owner) held.
102074 @@ -1650,6 +1700,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
102075 fd_install(newfd, newfile);
102076 err = newfd;
102077
102078 + gr_attach_curr_ip(newsock->sk);
102079 +
102080 out_put:
102081 fput_light(sock->file, fput_needed);
102082 out:
102083 @@ -1682,6 +1734,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
102084 int, addrlen)
102085 {
102086 struct socket *sock;
102087 + struct sockaddr *sck;
102088 struct sockaddr_storage address;
102089 int err, fput_needed;
102090
102091 @@ -1692,6 +1745,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
102092 if (err < 0)
102093 goto out_put;
102094
102095 + sck = (struct sockaddr *)&address;
102096 +
102097 + if (gr_handle_sock_client(sck)) {
102098 + err = -EACCES;
102099 + goto out_put;
102100 + }
102101 +
102102 + err = gr_search_connect(sock, (struct sockaddr_in *)sck);
102103 + if (err)
102104 + goto out_put;
102105 +
102106 err =
102107 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
102108 if (err)
102109 @@ -1773,6 +1837,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
102110 * the protocol.
102111 */
102112
102113 +asmlinkage long sys_sendto(int, void __user *, size_t, unsigned, struct sockaddr __user *, int);
102114 +
102115 SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len,
102116 unsigned int, flags, struct sockaddr __user *, addr,
102117 int, addr_len)
102118 @@ -1839,7 +1905,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
102119 struct socket *sock;
102120 struct iovec iov;
102121 struct msghdr msg;
102122 - struct sockaddr_storage address;
102123 + struct sockaddr_storage address = { };
102124 int err, err2;
102125 int fput_needed;
102126
102127 @@ -2065,7 +2131,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
102128 * checking falls down on this.
102129 */
102130 if (copy_from_user(ctl_buf,
102131 - (void __user __force *)msg_sys->msg_control,
102132 + (void __force_user *)msg_sys->msg_control,
102133 ctl_len))
102134 goto out_freectl;
102135 msg_sys->msg_control = ctl_buf;
102136 @@ -2216,7 +2282,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
102137 int err, total_len, len;
102138
102139 /* kernel mode address */
102140 - struct sockaddr_storage addr;
102141 + struct sockaddr_storage addr = { };
102142
102143 /* user mode address pointers */
102144 struct sockaddr __user *uaddr;
102145 @@ -2245,7 +2311,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
102146 /* Save the user-mode address (verify_iovec will change the
102147 * kernel msghdr to use the kernel address space)
102148 */
102149 - uaddr = (__force void __user *)msg_sys->msg_name;
102150 + uaddr = (void __force_user *)msg_sys->msg_name;
102151 uaddr_len = COMPAT_NAMELEN(msg);
102152 if (MSG_CMSG_COMPAT & flags)
102153 err = verify_compat_iovec(msg_sys, iov, &addr, VERIFY_WRITE);
102154 @@ -2889,7 +2955,7 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
102155 ifr = compat_alloc_user_space(buf_size);
102156 rxnfc = (void __user *)ifr + ALIGN(sizeof(struct ifreq), 8);
102157
102158 - if (copy_in_user(&ifr->ifr_name, &ifr32->ifr_name, IFNAMSIZ))
102159 + if (copy_in_user(ifr->ifr_name, ifr32->ifr_name, IFNAMSIZ))
102160 return -EFAULT;
102161
102162 if (put_user(convert_in ? rxnfc : compat_ptr(data),
102163 @@ -3000,7 +3066,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
102164 old_fs = get_fs();
102165 set_fs(KERNEL_DS);
102166 err = dev_ioctl(net, cmd,
102167 - (struct ifreq __user __force *) &kifr);
102168 + (struct ifreq __force_user *) &kifr);
102169 set_fs(old_fs);
102170
102171 return err;
102172 @@ -3093,7 +3159,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
102173
102174 old_fs = get_fs();
102175 set_fs(KERNEL_DS);
102176 - err = dev_ioctl(net, cmd, (void __user __force *)&ifr);
102177 + err = dev_ioctl(net, cmd, (void __force_user *)&ifr);
102178 set_fs(old_fs);
102179
102180 if (cmd == SIOCGIFMAP && !err) {
102181 @@ -3177,7 +3243,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
102182 ret |= get_user(rtdev, &(ur4->rt_dev));
102183 if (rtdev) {
102184 ret |= copy_from_user(devname, compat_ptr(rtdev), 15);
102185 - r4.rt_dev = (char __user __force *)devname;
102186 + r4.rt_dev = (char __force_user *)devname;
102187 devname[15] = 0;
102188 } else
102189 r4.rt_dev = NULL;
102190 @@ -3404,8 +3470,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
102191 int __user *uoptlen;
102192 int err;
102193
102194 - uoptval = (char __user __force *) optval;
102195 - uoptlen = (int __user __force *) optlen;
102196 + uoptval = (char __force_user *) optval;
102197 + uoptlen = (int __force_user *) optlen;
102198
102199 set_fs(KERNEL_DS);
102200 if (level == SOL_SOCKET)
102201 @@ -3425,7 +3491,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
102202 char __user *uoptval;
102203 int err;
102204
102205 - uoptval = (char __user __force *) optval;
102206 + uoptval = (char __force_user *) optval;
102207
102208 set_fs(KERNEL_DS);
102209 if (level == SOL_SOCKET)
102210 diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
102211 index 0f73f45..a96aa52 100644
102212 --- a/net/sunrpc/auth_gss/svcauth_gss.c
102213 +++ b/net/sunrpc/auth_gss/svcauth_gss.c
102214 @@ -1140,7 +1140,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
102215 uint64_t *handle)
102216 {
102217 struct rsc rsci, *rscp = NULL;
102218 - static atomic64_t ctxhctr;
102219 + static atomic64_unchecked_t ctxhctr = ATOMIC64_INIT(0);
102220 long long ctxh;
102221 struct gss_api_mech *gm = NULL;
102222 time_t expiry;
102223 @@ -1151,7 +1151,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
102224 status = -ENOMEM;
102225 /* the handle needs to be just a unique id,
102226 * use a static counter */
102227 - ctxh = atomic64_inc_return(&ctxhctr);
102228 + ctxh = atomic64_inc_return_unchecked(&ctxhctr);
102229
102230 /* make a copy for the caller */
102231 *handle = ctxh;
102232 diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
102233 index ae333c1..18521f0 100644
102234 --- a/net/sunrpc/cache.c
102235 +++ b/net/sunrpc/cache.c
102236 @@ -1609,7 +1609,7 @@ static int create_cache_proc_entries(struct cache_detail *cd, struct net *net)
102237 struct sunrpc_net *sn;
102238
102239 sn = net_generic(net, sunrpc_net_id);
102240 - cd->u.procfs.proc_ent = proc_mkdir(cd->name, sn->proc_net_rpc);
102241 + cd->u.procfs.proc_ent = proc_mkdir_restrict(cd->name, sn->proc_net_rpc);
102242 if (cd->u.procfs.proc_ent == NULL)
102243 goto out_nomem;
102244 cd->u.procfs.channel_ent = NULL;
102245 diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
102246 index 0edada9..9247ea0 100644
102247 --- a/net/sunrpc/clnt.c
102248 +++ b/net/sunrpc/clnt.c
102249 @@ -1415,7 +1415,9 @@ call_start(struct rpc_task *task)
102250 (RPC_IS_ASYNC(task) ? "async" : "sync"));
102251
102252 /* Increment call count */
102253 - task->tk_msg.rpc_proc->p_count++;
102254 + pax_open_kernel();
102255 + (*(unsigned int *)&task->tk_msg.rpc_proc->p_count)++;
102256 + pax_close_kernel();
102257 clnt->cl_stats->rpccnt++;
102258 task->tk_action = call_reserve;
102259 }
102260 diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
102261 index ff3cc4b..7612a9e 100644
102262 --- a/net/sunrpc/sched.c
102263 +++ b/net/sunrpc/sched.c
102264 @@ -261,9 +261,9 @@ static int rpc_wait_bit_killable(void *word)
102265 #if defined(RPC_DEBUG) || defined(RPC_TRACEPOINTS)
102266 static void rpc_task_set_debuginfo(struct rpc_task *task)
102267 {
102268 - static atomic_t rpc_pid;
102269 + static atomic_unchecked_t rpc_pid;
102270
102271 - task->tk_pid = atomic_inc_return(&rpc_pid);
102272 + task->tk_pid = atomic_inc_return_unchecked(&rpc_pid);
102273 }
102274 #else
102275 static inline void rpc_task_set_debuginfo(struct rpc_task *task)
102276 diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
102277 index 5453049..465669a 100644
102278 --- a/net/sunrpc/stats.c
102279 +++ b/net/sunrpc/stats.c
102280 @@ -267,7 +267,7 @@ int rpc_proc_init(struct net *net)
102281
102282 dprintk("RPC: registering /proc/net/rpc\n");
102283 sn = net_generic(net, sunrpc_net_id);
102284 - sn->proc_net_rpc = proc_mkdir("rpc", net->proc_net);
102285 + sn->proc_net_rpc = proc_mkdir_restrict("rpc", net->proc_net);
102286 if (sn->proc_net_rpc == NULL)
102287 return -ENOMEM;
102288
102289 diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
102290 index 5de6801..b4e330d 100644
102291 --- a/net/sunrpc/svc.c
102292 +++ b/net/sunrpc/svc.c
102293 @@ -1167,7 +1167,9 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
102294 svc_putnl(resv, RPC_SUCCESS);
102295
102296 /* Bump per-procedure stats counter */
102297 - procp->pc_count++;
102298 + pax_open_kernel();
102299 + (*(unsigned int *)&procp->pc_count)++;
102300 + pax_close_kernel();
102301
102302 /* Initialize storage for argp and resp */
102303 memset(rqstp->rq_argp, 0, procp->pc_argsize);
102304 diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
102305 index 621ca7b..59421dd 100644
102306 --- a/net/sunrpc/svcauth_unix.c
102307 +++ b/net/sunrpc/svcauth_unix.c
102308 @@ -414,7 +414,7 @@ struct unix_gid {
102309 struct group_info *gi;
102310 };
102311
102312 -static int unix_gid_hash(kuid_t uid)
102313 +static int __intentional_overflow(-1) unix_gid_hash(kuid_t uid)
102314 {
102315 return hash_long(from_kuid(&init_user_ns, uid), GID_HASHBITS);
102316 }
102317 @@ -470,7 +470,7 @@ static void unix_gid_request(struct cache_detail *cd,
102318 (*bpp)[-1] = '\n';
102319 }
102320
102321 -static struct unix_gid *unix_gid_lookup(struct cache_detail *cd, kuid_t uid);
102322 +static struct unix_gid * __intentional_overflow(-1) unix_gid_lookup(struct cache_detail *cd, kuid_t uid);
102323
102324 static int unix_gid_parse(struct cache_detail *cd,
102325 char *mesg, int mlen)
102326 diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c
102327 index c1b6270..05089c1 100644
102328 --- a/net/sunrpc/xprtrdma/svc_rdma.c
102329 +++ b/net/sunrpc/xprtrdma/svc_rdma.c
102330 @@ -62,15 +62,15 @@ unsigned int svcrdma_max_req_size = RPCRDMA_MAX_REQ_SIZE;
102331 static unsigned int min_max_inline = 4096;
102332 static unsigned int max_max_inline = 65536;
102333
102334 -atomic_t rdma_stat_recv;
102335 -atomic_t rdma_stat_read;
102336 -atomic_t rdma_stat_write;
102337 -atomic_t rdma_stat_sq_starve;
102338 -atomic_t rdma_stat_rq_starve;
102339 -atomic_t rdma_stat_rq_poll;
102340 -atomic_t rdma_stat_rq_prod;
102341 -atomic_t rdma_stat_sq_poll;
102342 -atomic_t rdma_stat_sq_prod;
102343 +atomic_unchecked_t rdma_stat_recv;
102344 +atomic_unchecked_t rdma_stat_read;
102345 +atomic_unchecked_t rdma_stat_write;
102346 +atomic_unchecked_t rdma_stat_sq_starve;
102347 +atomic_unchecked_t rdma_stat_rq_starve;
102348 +atomic_unchecked_t rdma_stat_rq_poll;
102349 +atomic_unchecked_t rdma_stat_rq_prod;
102350 +atomic_unchecked_t rdma_stat_sq_poll;
102351 +atomic_unchecked_t rdma_stat_sq_prod;
102352
102353 /* Temporary NFS request map and context caches */
102354 struct kmem_cache *svc_rdma_map_cachep;
102355 @@ -110,7 +110,7 @@ static int read_reset_stat(struct ctl_table *table, int write,
102356 len -= *ppos;
102357 if (len > *lenp)
102358 len = *lenp;
102359 - if (len && copy_to_user(buffer, str_buf, len))
102360 + if (len > sizeof str_buf || (len && copy_to_user(buffer, str_buf, len)))
102361 return -EFAULT;
102362 *lenp = len;
102363 *ppos += len;
102364 @@ -151,63 +151,63 @@ static struct ctl_table svcrdma_parm_table[] = {
102365 {
102366 .procname = "rdma_stat_read",
102367 .data = &rdma_stat_read,
102368 - .maxlen = sizeof(atomic_t),
102369 + .maxlen = sizeof(atomic_unchecked_t),
102370 .mode = 0644,
102371 .proc_handler = read_reset_stat,
102372 },
102373 {
102374 .procname = "rdma_stat_recv",
102375 .data = &rdma_stat_recv,
102376 - .maxlen = sizeof(atomic_t),
102377 + .maxlen = sizeof(atomic_unchecked_t),
102378 .mode = 0644,
102379 .proc_handler = read_reset_stat,
102380 },
102381 {
102382 .procname = "rdma_stat_write",
102383 .data = &rdma_stat_write,
102384 - .maxlen = sizeof(atomic_t),
102385 + .maxlen = sizeof(atomic_unchecked_t),
102386 .mode = 0644,
102387 .proc_handler = read_reset_stat,
102388 },
102389 {
102390 .procname = "rdma_stat_sq_starve",
102391 .data = &rdma_stat_sq_starve,
102392 - .maxlen = sizeof(atomic_t),
102393 + .maxlen = sizeof(atomic_unchecked_t),
102394 .mode = 0644,
102395 .proc_handler = read_reset_stat,
102396 },
102397 {
102398 .procname = "rdma_stat_rq_starve",
102399 .data = &rdma_stat_rq_starve,
102400 - .maxlen = sizeof(atomic_t),
102401 + .maxlen = sizeof(atomic_unchecked_t),
102402 .mode = 0644,
102403 .proc_handler = read_reset_stat,
102404 },
102405 {
102406 .procname = "rdma_stat_rq_poll",
102407 .data = &rdma_stat_rq_poll,
102408 - .maxlen = sizeof(atomic_t),
102409 + .maxlen = sizeof(atomic_unchecked_t),
102410 .mode = 0644,
102411 .proc_handler = read_reset_stat,
102412 },
102413 {
102414 .procname = "rdma_stat_rq_prod",
102415 .data = &rdma_stat_rq_prod,
102416 - .maxlen = sizeof(atomic_t),
102417 + .maxlen = sizeof(atomic_unchecked_t),
102418 .mode = 0644,
102419 .proc_handler = read_reset_stat,
102420 },
102421 {
102422 .procname = "rdma_stat_sq_poll",
102423 .data = &rdma_stat_sq_poll,
102424 - .maxlen = sizeof(atomic_t),
102425 + .maxlen = sizeof(atomic_unchecked_t),
102426 .mode = 0644,
102427 .proc_handler = read_reset_stat,
102428 },
102429 {
102430 .procname = "rdma_stat_sq_prod",
102431 .data = &rdma_stat_sq_prod,
102432 - .maxlen = sizeof(atomic_t),
102433 + .maxlen = sizeof(atomic_unchecked_t),
102434 .mode = 0644,
102435 .proc_handler = read_reset_stat,
102436 },
102437 diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
102438 index 0ce7552..d074459 100644
102439 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
102440 +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
102441 @@ -501,7 +501,7 @@ next_sge:
102442 svc_rdma_put_context(ctxt, 0);
102443 goto out;
102444 }
102445 - atomic_inc(&rdma_stat_read);
102446 + atomic_inc_unchecked(&rdma_stat_read);
102447
102448 if (read_wr.num_sge < chl_map->ch[ch_no].count) {
102449 chl_map->ch[ch_no].count -= read_wr.num_sge;
102450 @@ -611,7 +611,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
102451 dto_q);
102452 list_del_init(&ctxt->dto_q);
102453 } else {
102454 - atomic_inc(&rdma_stat_rq_starve);
102455 + atomic_inc_unchecked(&rdma_stat_rq_starve);
102456 clear_bit(XPT_DATA, &xprt->xpt_flags);
102457 ctxt = NULL;
102458 }
102459 @@ -631,7 +631,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
102460 dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n",
102461 ctxt, rdma_xprt, rqstp, ctxt->wc_status);
102462 BUG_ON(ctxt->wc_status != IB_WC_SUCCESS);
102463 - atomic_inc(&rdma_stat_recv);
102464 + atomic_inc_unchecked(&rdma_stat_recv);
102465
102466 /* Build up the XDR from the receive buffers. */
102467 rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
102468 diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
102469 index c1d124d..acfc59e 100644
102470 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
102471 +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
102472 @@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp,
102473 write_wr.wr.rdma.remote_addr = to;
102474
102475 /* Post It */
102476 - atomic_inc(&rdma_stat_write);
102477 + atomic_inc_unchecked(&rdma_stat_write);
102478 if (svc_rdma_send(xprt, &write_wr))
102479 goto err;
102480 return 0;
102481 diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
102482 index 62e4f9b..dd3f2d7 100644
102483 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
102484 +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
102485 @@ -292,7 +292,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
102486 return;
102487
102488 ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP);
102489 - atomic_inc(&rdma_stat_rq_poll);
102490 + atomic_inc_unchecked(&rdma_stat_rq_poll);
102491
102492 while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) {
102493 ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id;
102494 @@ -314,7 +314,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
102495 }
102496
102497 if (ctxt)
102498 - atomic_inc(&rdma_stat_rq_prod);
102499 + atomic_inc_unchecked(&rdma_stat_rq_prod);
102500
102501 set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags);
102502 /*
102503 @@ -386,7 +386,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
102504 return;
102505
102506 ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP);
102507 - atomic_inc(&rdma_stat_sq_poll);
102508 + atomic_inc_unchecked(&rdma_stat_sq_poll);
102509 while ((ret = ib_poll_cq(cq, 1, &wc)) > 0) {
102510 if (wc.status != IB_WC_SUCCESS)
102511 /* Close the transport */
102512 @@ -404,7 +404,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
102513 }
102514
102515 if (ctxt)
102516 - atomic_inc(&rdma_stat_sq_prod);
102517 + atomic_inc_unchecked(&rdma_stat_sq_prod);
102518 }
102519
102520 static void sq_comp_handler(struct ib_cq *cq, void *cq_context)
102521 @@ -1262,7 +1262,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
102522 spin_lock_bh(&xprt->sc_lock);
102523 if (xprt->sc_sq_depth < atomic_read(&xprt->sc_sq_count) + wr_count) {
102524 spin_unlock_bh(&xprt->sc_lock);
102525 - atomic_inc(&rdma_stat_sq_starve);
102526 + atomic_inc_unchecked(&rdma_stat_sq_starve);
102527
102528 /* See if we can opportunistically reap SQ WR to make room */
102529 sq_cq_reap(xprt);
102530 diff --git a/net/sysctl_net.c b/net/sysctl_net.c
102531 index e7000be..e3b0ba7 100644
102532 --- a/net/sysctl_net.c
102533 +++ b/net/sysctl_net.c
102534 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ctl_table_header *head,
102535 kgid_t root_gid = make_kgid(net->user_ns, 0);
102536
102537 /* Allow network administrator to have same access as root. */
102538 - if (ns_capable(net->user_ns, CAP_NET_ADMIN) ||
102539 + if (ns_capable_nolog(net->user_ns, CAP_NET_ADMIN) ||
102540 uid_eq(root_uid, current_euid())) {
102541 int mode = (table->mode >> 6) & 7;
102542 return (mode << 6) | (mode << 3) | mode;
102543 diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
102544 index 6424372..afd36e9 100644
102545 --- a/net/tipc/subscr.c
102546 +++ b/net/tipc/subscr.c
102547 @@ -97,7 +97,7 @@ static void subscr_send_event(struct tipc_subscription *sub, u32 found_lower,
102548 struct tipc_subscriber *subscriber = sub->subscriber;
102549 struct kvec msg_sect;
102550
102551 - msg_sect.iov_base = (void *)&sub->evt;
102552 + msg_sect.iov_base = &sub->evt;
102553 msg_sect.iov_len = sizeof(struct tipc_event);
102554 sub->evt.event = htohl(event, sub->swap);
102555 sub->evt.found_lower = htohl(found_lower, sub->swap);
102556 diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
102557 index 94404f1..5782191 100644
102558 --- a/net/unix/af_unix.c
102559 +++ b/net/unix/af_unix.c
102560 @@ -791,6 +791,12 @@ static struct sock *unix_find_other(struct net *net,
102561 err = -ECONNREFUSED;
102562 if (!S_ISSOCK(inode->i_mode))
102563 goto put_fail;
102564 +
102565 + if (!gr_acl_handle_unix(path.dentry, path.mnt)) {
102566 + err = -EACCES;
102567 + goto put_fail;
102568 + }
102569 +
102570 u = unix_find_socket_byinode(inode);
102571 if (!u)
102572 goto put_fail;
102573 @@ -811,6 +817,13 @@ static struct sock *unix_find_other(struct net *net,
102574 if (u) {
102575 struct dentry *dentry;
102576 dentry = unix_sk(u)->path.dentry;
102577 +
102578 + if (!gr_handle_chroot_unix(pid_vnr(u->sk_peer_pid))) {
102579 + err = -EPERM;
102580 + sock_put(u);
102581 + goto fail;
102582 + }
102583 +
102584 if (dentry)
102585 touch_atime(&unix_sk(u)->path);
102586 } else
102587 @@ -844,12 +857,18 @@ static int unix_mknod(const char *sun_path, umode_t mode, struct path *res)
102588 */
102589 err = security_path_mknod(&path, dentry, mode, 0);
102590 if (!err) {
102591 + if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
102592 + err = -EACCES;
102593 + goto out;
102594 + }
102595 err = vfs_mknod(path.dentry->d_inode, dentry, mode, 0);
102596 if (!err) {
102597 res->mnt = mntget(path.mnt);
102598 res->dentry = dget(dentry);
102599 + gr_handle_create(dentry, path.mnt);
102600 }
102601 }
102602 +out:
102603 done_path_create(&path, dentry);
102604 return err;
102605 }
102606 @@ -2344,9 +2363,13 @@ static int unix_seq_show(struct seq_file *seq, void *v)
102607 seq_puts(seq, "Num RefCount Protocol Flags Type St "
102608 "Inode Path\n");
102609 else {
102610 - struct sock *s = v;
102611 + struct sock *s = v, *peer;
102612 struct unix_sock *u = unix_sk(s);
102613 unix_state_lock(s);
102614 + peer = unix_peer(s);
102615 + unix_state_unlock(s);
102616 +
102617 + unix_state_double_lock(s, peer);
102618
102619 seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu",
102620 s,
102621 @@ -2373,8 +2396,10 @@ static int unix_seq_show(struct seq_file *seq, void *v)
102622 }
102623 for ( ; i < len; i++)
102624 seq_putc(seq, u->addr->name->sun_path[i]);
102625 - }
102626 - unix_state_unlock(s);
102627 + } else if (peer)
102628 + seq_printf(seq, " P%lu", sock_i_ino(peer));
102629 +
102630 + unix_state_double_unlock(s, peer);
102631 seq_putc(seq, '\n');
102632 }
102633
102634 diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
102635 index b3d5150..ff3a837 100644
102636 --- a/net/unix/sysctl_net_unix.c
102637 +++ b/net/unix/sysctl_net_unix.c
102638 @@ -28,7 +28,7 @@ static struct ctl_table unix_table[] = {
102639
102640 int __net_init unix_sysctl_register(struct net *net)
102641 {
102642 - struct ctl_table *table;
102643 + ctl_table_no_const *table;
102644
102645 table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);
102646 if (table == NULL)
102647 diff --git a/net/vmw_vsock/vmci_transport_notify.c b/net/vmw_vsock/vmci_transport_notify.c
102648 index 9a73074..aecba9a 100644
102649 --- a/net/vmw_vsock/vmci_transport_notify.c
102650 +++ b/net/vmw_vsock/vmci_transport_notify.c
102651 @@ -662,19 +662,19 @@ static void vmci_transport_notify_pkt_process_negotiate(struct sock *sk)
102652
102653 /* Socket control packet based operations. */
102654 struct vmci_transport_notify_ops vmci_transport_notify_pkt_ops = {
102655 - vmci_transport_notify_pkt_socket_init,
102656 - vmci_transport_notify_pkt_socket_destruct,
102657 - vmci_transport_notify_pkt_poll_in,
102658 - vmci_transport_notify_pkt_poll_out,
102659 - vmci_transport_notify_pkt_handle_pkt,
102660 - vmci_transport_notify_pkt_recv_init,
102661 - vmci_transport_notify_pkt_recv_pre_block,
102662 - vmci_transport_notify_pkt_recv_pre_dequeue,
102663 - vmci_transport_notify_pkt_recv_post_dequeue,
102664 - vmci_transport_notify_pkt_send_init,
102665 - vmci_transport_notify_pkt_send_pre_block,
102666 - vmci_transport_notify_pkt_send_pre_enqueue,
102667 - vmci_transport_notify_pkt_send_post_enqueue,
102668 - vmci_transport_notify_pkt_process_request,
102669 - vmci_transport_notify_pkt_process_negotiate,
102670 + .socket_init = vmci_transport_notify_pkt_socket_init,
102671 + .socket_destruct = vmci_transport_notify_pkt_socket_destruct,
102672 + .poll_in = vmci_transport_notify_pkt_poll_in,
102673 + .poll_out = vmci_transport_notify_pkt_poll_out,
102674 + .handle_notify_pkt = vmci_transport_notify_pkt_handle_pkt,
102675 + .recv_init = vmci_transport_notify_pkt_recv_init,
102676 + .recv_pre_block = vmci_transport_notify_pkt_recv_pre_block,
102677 + .recv_pre_dequeue = vmci_transport_notify_pkt_recv_pre_dequeue,
102678 + .recv_post_dequeue = vmci_transport_notify_pkt_recv_post_dequeue,
102679 + .send_init = vmci_transport_notify_pkt_send_init,
102680 + .send_pre_block = vmci_transport_notify_pkt_send_pre_block,
102681 + .send_pre_enqueue = vmci_transport_notify_pkt_send_pre_enqueue,
102682 + .send_post_enqueue = vmci_transport_notify_pkt_send_post_enqueue,
102683 + .process_request = vmci_transport_notify_pkt_process_request,
102684 + .process_negotiate = vmci_transport_notify_pkt_process_negotiate,
102685 };
102686 diff --git a/net/vmw_vsock/vmci_transport_notify_qstate.c b/net/vmw_vsock/vmci_transport_notify_qstate.c
102687 index 622bd7a..b92086c 100644
102688 --- a/net/vmw_vsock/vmci_transport_notify_qstate.c
102689 +++ b/net/vmw_vsock/vmci_transport_notify_qstate.c
102690 @@ -420,19 +420,19 @@ vmci_transport_notify_pkt_send_pre_enqueue(
102691
102692 /* Socket always on control packet based operations. */
102693 struct vmci_transport_notify_ops vmci_transport_notify_pkt_q_state_ops = {
102694 - vmci_transport_notify_pkt_socket_init,
102695 - vmci_transport_notify_pkt_socket_destruct,
102696 - vmci_transport_notify_pkt_poll_in,
102697 - vmci_transport_notify_pkt_poll_out,
102698 - vmci_transport_notify_pkt_handle_pkt,
102699 - vmci_transport_notify_pkt_recv_init,
102700 - vmci_transport_notify_pkt_recv_pre_block,
102701 - vmci_transport_notify_pkt_recv_pre_dequeue,
102702 - vmci_transport_notify_pkt_recv_post_dequeue,
102703 - vmci_transport_notify_pkt_send_init,
102704 - vmci_transport_notify_pkt_send_pre_block,
102705 - vmci_transport_notify_pkt_send_pre_enqueue,
102706 - vmci_transport_notify_pkt_send_post_enqueue,
102707 - vmci_transport_notify_pkt_process_request,
102708 - vmci_transport_notify_pkt_process_negotiate,
102709 + .socket_init = vmci_transport_notify_pkt_socket_init,
102710 + .socket_destruct = vmci_transport_notify_pkt_socket_destruct,
102711 + .poll_in = vmci_transport_notify_pkt_poll_in,
102712 + .poll_out = vmci_transport_notify_pkt_poll_out,
102713 + .handle_notify_pkt = vmci_transport_notify_pkt_handle_pkt,
102714 + .recv_init = vmci_transport_notify_pkt_recv_init,
102715 + .recv_pre_block = vmci_transport_notify_pkt_recv_pre_block,
102716 + .recv_pre_dequeue = vmci_transport_notify_pkt_recv_pre_dequeue,
102717 + .recv_post_dequeue = vmci_transport_notify_pkt_recv_post_dequeue,
102718 + .send_init = vmci_transport_notify_pkt_send_init,
102719 + .send_pre_block = vmci_transport_notify_pkt_send_pre_block,
102720 + .send_pre_enqueue = vmci_transport_notify_pkt_send_pre_enqueue,
102721 + .send_post_enqueue = vmci_transport_notify_pkt_send_post_enqueue,
102722 + .process_request = vmci_transport_notify_pkt_process_request,
102723 + .process_negotiate = vmci_transport_notify_pkt_process_negotiate,
102724 };
102725 diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
102726 index c8717c1..08539f5 100644
102727 --- a/net/wireless/wext-core.c
102728 +++ b/net/wireless/wext-core.c
102729 @@ -748,8 +748,7 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
102730 */
102731
102732 /* Support for very large requests */
102733 - if ((descr->flags & IW_DESCR_FLAG_NOMAX) &&
102734 - (user_length > descr->max_tokens)) {
102735 + if (user_length > descr->max_tokens) {
102736 /* Allow userspace to GET more than max so
102737 * we can support any size GET requests.
102738 * There is still a limit : -ENOMEM.
102739 @@ -788,22 +787,6 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
102740 }
102741 }
102742
102743 - if (IW_IS_GET(cmd) && !(descr->flags & IW_DESCR_FLAG_NOMAX)) {
102744 - /*
102745 - * If this is a GET, but not NOMAX, it means that the extra
102746 - * data is not bounded by userspace, but by max_tokens. Thus
102747 - * set the length to max_tokens. This matches the extra data
102748 - * allocation.
102749 - * The driver should fill it with the number of tokens it
102750 - * provided, and it may check iwp->length rather than having
102751 - * knowledge of max_tokens. If the driver doesn't change the
102752 - * iwp->length, this ioctl just copies back max_token tokens
102753 - * filled with zeroes. Hopefully the driver isn't claiming
102754 - * them to be valid data.
102755 - */
102756 - iwp->length = descr->max_tokens;
102757 - }
102758 -
102759 err = handler(dev, info, (union iwreq_data *) iwp, extra);
102760
102761 iwp->length += essid_compat;
102762 diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c
102763 index 4323952..a06dfe1 100644
102764 --- a/net/x25/sysctl_net_x25.c
102765 +++ b/net/x25/sysctl_net_x25.c
102766 @@ -70,7 +70,7 @@ static struct ctl_table x25_table[] = {
102767 .mode = 0644,
102768 .proc_handler = proc_dointvec,
102769 },
102770 - { 0, },
102771 + { },
102772 };
102773
102774 void __init x25_register_sysctl(void)
102775 diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c
102776 index 0917f04..f4e3d8c 100644
102777 --- a/net/x25/x25_proc.c
102778 +++ b/net/x25/x25_proc.c
102779 @@ -209,7 +209,7 @@ static const struct file_operations x25_seq_forward_fops = {
102780
102781 int __init x25_proc_init(void)
102782 {
102783 - if (!proc_mkdir("x25", init_net.proc_net))
102784 + if (!proc_mkdir_restrict("x25", init_net.proc_net))
102785 return -ENOMEM;
102786
102787 if (!proc_create("x25/route", S_IRUGO, init_net.proc_net,
102788 diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
102789 index 1d5c7bf..f762f1f 100644
102790 --- a/net/xfrm/xfrm_policy.c
102791 +++ b/net/xfrm/xfrm_policy.c
102792 @@ -327,7 +327,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
102793 {
102794 policy->walk.dead = 1;
102795
102796 - atomic_inc(&policy->genid);
102797 + atomic_inc_unchecked(&policy->genid);
102798
102799 if (del_timer(&policy->polq.hold_timer))
102800 xfrm_pol_put(policy);
102801 @@ -661,7 +661,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
102802 hlist_add_head(&policy->bydst, chain);
102803 xfrm_pol_hold(policy);
102804 net->xfrm.policy_count[dir]++;
102805 - atomic_inc(&flow_cache_genid);
102806 + atomic_inc_unchecked(&flow_cache_genid);
102807
102808 /* After previous checking, family can either be AF_INET or AF_INET6 */
102809 if (policy->family == AF_INET)
102810 @@ -1761,7 +1761,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
102811
102812 xdst->num_pols = num_pols;
102813 memcpy(xdst->pols, pols, sizeof(struct xfrm_policy *) * num_pols);
102814 - xdst->policy_genid = atomic_read(&pols[0]->genid);
102815 + xdst->policy_genid = atomic_read_unchecked(&pols[0]->genid);
102816
102817 return xdst;
102818 }
102819 @@ -2572,11 +2572,12 @@ void xfrm_garbage_collect(struct net *net)
102820 }
102821 EXPORT_SYMBOL(xfrm_garbage_collect);
102822
102823 -static void xfrm_garbage_collect_deferred(struct net *net)
102824 +void xfrm_garbage_collect_deferred(struct net *net)
102825 {
102826 flow_cache_flush_deferred();
102827 __xfrm_garbage_collect(net);
102828 }
102829 +EXPORT_SYMBOL(xfrm_garbage_collect_deferred);
102830
102831 static void xfrm_init_pmtu(struct dst_entry *dst)
102832 {
102833 @@ -2626,7 +2627,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first)
102834 if (xdst->xfrm_genid != dst->xfrm->genid)
102835 return 0;
102836 if (xdst->num_pols > 0 &&
102837 - xdst->policy_genid != atomic_read(&xdst->pols[0]->genid))
102838 + xdst->policy_genid != atomic_read_unchecked(&xdst->pols[0]->genid))
102839 return 0;
102840
102841 mtu = dst_mtu(dst->child);
102842 @@ -2714,8 +2715,6 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
102843 dst_ops->link_failure = xfrm_link_failure;
102844 if (likely(dst_ops->neigh_lookup == NULL))
102845 dst_ops->neigh_lookup = xfrm_neigh_lookup;
102846 - if (likely(afinfo->garbage_collect == NULL))
102847 - afinfo->garbage_collect = xfrm_garbage_collect_deferred;
102848 rcu_assign_pointer(xfrm_policy_afinfo[afinfo->family], afinfo);
102849 }
102850 spin_unlock(&xfrm_policy_afinfo_lock);
102851 @@ -2769,7 +2768,6 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo)
102852 dst_ops->check = NULL;
102853 dst_ops->negative_advice = NULL;
102854 dst_ops->link_failure = NULL;
102855 - afinfo->garbage_collect = NULL;
102856 }
102857 return err;
102858 }
102859 @@ -3159,7 +3157,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,
102860 sizeof(pol->xfrm_vec[i].saddr));
102861 pol->xfrm_vec[i].encap_family = mp->new_family;
102862 /* flush bundles */
102863 - atomic_inc(&pol->genid);
102864 + atomic_inc_unchecked(&pol->genid);
102865 }
102866 }
102867
102868 diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
102869 index 40f1b3e..e33fdfa 100644
102870 --- a/net/xfrm/xfrm_state.c
102871 +++ b/net/xfrm/xfrm_state.c
102872 @@ -172,12 +172,14 @@ int xfrm_register_type(const struct xfrm_type *type, unsigned short family)
102873
102874 if (unlikely(afinfo == NULL))
102875 return -EAFNOSUPPORT;
102876 - typemap = afinfo->type_map;
102877 + typemap = (const struct xfrm_type **)afinfo->type_map;
102878 spin_lock_bh(&xfrm_type_lock);
102879
102880 - if (likely(typemap[type->proto] == NULL))
102881 + if (likely(typemap[type->proto] == NULL)) {
102882 + pax_open_kernel();
102883 typemap[type->proto] = type;
102884 - else
102885 + pax_close_kernel();
102886 + } else
102887 err = -EEXIST;
102888 spin_unlock_bh(&xfrm_type_lock);
102889 xfrm_state_put_afinfo(afinfo);
102890 @@ -193,13 +195,16 @@ int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family)
102891
102892 if (unlikely(afinfo == NULL))
102893 return -EAFNOSUPPORT;
102894 - typemap = afinfo->type_map;
102895 + typemap = (const struct xfrm_type **)afinfo->type_map;
102896 spin_lock_bh(&xfrm_type_lock);
102897
102898 if (unlikely(typemap[type->proto] != type))
102899 err = -ENOENT;
102900 - else
102901 + else {
102902 + pax_open_kernel();
102903 typemap[type->proto] = NULL;
102904 + pax_close_kernel();
102905 + }
102906 spin_unlock_bh(&xfrm_type_lock);
102907 xfrm_state_put_afinfo(afinfo);
102908 return err;
102909 @@ -209,7 +214,6 @@ EXPORT_SYMBOL(xfrm_unregister_type);
102910 static const struct xfrm_type *xfrm_get_type(u8 proto, unsigned short family)
102911 {
102912 struct xfrm_state_afinfo *afinfo;
102913 - const struct xfrm_type **typemap;
102914 const struct xfrm_type *type;
102915 int modload_attempted = 0;
102916
102917 @@ -217,9 +221,8 @@ retry:
102918 afinfo = xfrm_state_get_afinfo(family);
102919 if (unlikely(afinfo == NULL))
102920 return NULL;
102921 - typemap = afinfo->type_map;
102922
102923 - type = typemap[proto];
102924 + type = afinfo->type_map[proto];
102925 if (unlikely(type && !try_module_get(type->owner)))
102926 type = NULL;
102927 if (!type && !modload_attempted) {
102928 @@ -253,7 +256,7 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
102929 return -EAFNOSUPPORT;
102930
102931 err = -EEXIST;
102932 - modemap = afinfo->mode_map;
102933 + modemap = (struct xfrm_mode **)afinfo->mode_map;
102934 spin_lock_bh(&xfrm_mode_lock);
102935 if (modemap[mode->encap])
102936 goto out;
102937 @@ -262,8 +265,10 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
102938 if (!try_module_get(afinfo->owner))
102939 goto out;
102940
102941 - mode->afinfo = afinfo;
102942 + pax_open_kernel();
102943 + *(const void **)&mode->afinfo = afinfo;
102944 modemap[mode->encap] = mode;
102945 + pax_close_kernel();
102946 err = 0;
102947
102948 out:
102949 @@ -287,10 +292,12 @@ int xfrm_unregister_mode(struct xfrm_mode *mode, int family)
102950 return -EAFNOSUPPORT;
102951
102952 err = -ENOENT;
102953 - modemap = afinfo->mode_map;
102954 + modemap = (struct xfrm_mode **)afinfo->mode_map;
102955 spin_lock_bh(&xfrm_mode_lock);
102956 if (likely(modemap[mode->encap] == mode)) {
102957 + pax_open_kernel();
102958 modemap[mode->encap] = NULL;
102959 + pax_close_kernel();
102960 module_put(mode->afinfo->owner);
102961 err = 0;
102962 }
102963 @@ -1512,10 +1519,10 @@ EXPORT_SYMBOL(xfrm_find_acq_byseq);
102964 u32 xfrm_get_acqseq(void)
102965 {
102966 u32 res;
102967 - static atomic_t acqseq;
102968 + static atomic_unchecked_t acqseq;
102969
102970 do {
102971 - res = atomic_inc_return(&acqseq);
102972 + res = atomic_inc_return_unchecked(&acqseq);
102973 } while (!res);
102974
102975 return res;
102976 diff --git a/net/xfrm/xfrm_sysctl.c b/net/xfrm/xfrm_sysctl.c
102977 index 05a6e3d..6716ec9 100644
102978 --- a/net/xfrm/xfrm_sysctl.c
102979 +++ b/net/xfrm/xfrm_sysctl.c
102980 @@ -42,7 +42,7 @@ static struct ctl_table xfrm_table[] = {
102981
102982 int __net_init xfrm_sysctl_init(struct net *net)
102983 {
102984 - struct ctl_table *table;
102985 + ctl_table_no_const *table;
102986
102987 __xfrm_sysctl_init(net);
102988
102989 diff --git a/scripts/Makefile b/scripts/Makefile
102990 index 01e7adb..6176d5d 100644
102991 --- a/scripts/Makefile
102992 +++ b/scripts/Makefile
102993 @@ -40,3 +40,5 @@ subdir-$(CONFIG_DTC) += dtc
102994
102995 # Let clean descend into subdirs
102996 subdir- += basic kconfig package selinux
102997 +
102998 +clean-files := randstruct.seed
102999 diff --git a/scripts/Makefile.build b/scripts/Makefile.build
103000 index d5d859c..781cbcb 100644
103001 --- a/scripts/Makefile.build
103002 +++ b/scripts/Makefile.build
103003 @@ -111,7 +111,7 @@ endif
103004 endif
103005
103006 # Do not include host rules unless needed
103007 -ifneq ($(hostprogs-y)$(hostprogs-m),)
103008 +ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m)$(hostcxxlibs-y)$(hostcxxlibs-m),)
103009 include scripts/Makefile.host
103010 endif
103011
103012 diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
103013 index 686cb0d..9d653bf 100644
103014 --- a/scripts/Makefile.clean
103015 +++ b/scripts/Makefile.clean
103016 @@ -43,7 +43,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn))
103017 __clean-files := $(extra-y) $(always) \
103018 $(targets) $(clean-files) \
103019 $(host-progs) \
103020 - $(hostprogs-y) $(hostprogs-m) $(hostprogs-)
103021 + $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \
103022 + $(hostlibs-y) $(hostlibs-m) $(hostlibs-)
103023
103024 __clean-files := $(filter-out $(no-clean-files), $(__clean-files))
103025
103026 diff --git a/scripts/Makefile.host b/scripts/Makefile.host
103027 index 1ac414f..38575f7 100644
103028 --- a/scripts/Makefile.host
103029 +++ b/scripts/Makefile.host
103030 @@ -31,6 +31,8 @@
103031 # Note: Shared libraries consisting of C++ files are not supported
103032
103033 __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
103034 +__hostlibs := $(sort $(hostlibs-y) $(hostlibs-m))
103035 +__hostcxxlibs := $(sort $(hostcxxlibs-y) $(hostcxxlibs-m))
103036
103037 # C code
103038 # Executables compiled from a single .c file
103039 @@ -54,11 +56,15 @@ host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs)))
103040 # Shared libaries (only .c supported)
103041 # Shared libraries (.so) - all .so files referenced in "xxx-objs"
103042 host-cshlib := $(sort $(filter %.so, $(host-cobjs)))
103043 +host-cshlib += $(sort $(filter %.so, $(__hostlibs)))
103044 +host-cxxshlib := $(sort $(filter %.so, $(__hostcxxlibs)))
103045 # Remove .so files from "xxx-objs"
103046 host-cobjs := $(filter-out %.so,$(host-cobjs))
103047 +host-cxxobjs := $(filter-out %.so,$(host-cxxobjs))
103048
103049 -#Object (.o) files used by the shared libaries
103050 +# Object (.o) files used by the shared libaries
103051 host-cshobjs := $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs))))
103052 +host-cxxshobjs := $(sort $(foreach m,$(host-cxxshlib),$($(m:.so=-objs))))
103053
103054 # output directory for programs/.o files
103055 # hostprogs-y := tools/build may have been specified. Retrieve directory
103056 @@ -82,7 +88,9 @@ host-cobjs := $(addprefix $(obj)/,$(host-cobjs))
103057 host-cxxmulti := $(addprefix $(obj)/,$(host-cxxmulti))
103058 host-cxxobjs := $(addprefix $(obj)/,$(host-cxxobjs))
103059 host-cshlib := $(addprefix $(obj)/,$(host-cshlib))
103060 +host-cxxshlib := $(addprefix $(obj)/,$(host-cxxshlib))
103061 host-cshobjs := $(addprefix $(obj)/,$(host-cshobjs))
103062 +host-cxxshobjs := $(addprefix $(obj)/,$(host-cxxshobjs))
103063 host-objdirs := $(addprefix $(obj)/,$(host-objdirs))
103064
103065 obj-dirs += $(host-objdirs)
103066 @@ -156,6 +164,13 @@ quiet_cmd_host-cshobjs = HOSTCC -fPIC $@
103067 $(host-cshobjs): $(obj)/%.o: $(src)/%.c FORCE
103068 $(call if_changed_dep,host-cshobjs)
103069
103070 +# Compile .c file, create position independent .o file
103071 +# host-cxxshobjs -> .o
103072 +quiet_cmd_host-cxxshobjs = HOSTCXX -fPIC $@
103073 + cmd_host-cxxshobjs = $(HOSTCXX) $(hostcxx_flags) -fPIC -c -o $@ $<
103074 +$(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE
103075 + $(call if_changed_dep,host-cxxshobjs)
103076 +
103077 # Link a shared library, based on position independent .o files
103078 # *.o -> .so shared library (host-cshlib)
103079 quiet_cmd_host-cshlib = HOSTLLD -shared $@
103080 @@ -165,6 +180,15 @@ quiet_cmd_host-cshlib = HOSTLLD -shared $@
103081 $(host-cshlib): $(obj)/%: $(host-cshobjs) FORCE
103082 $(call if_changed,host-cshlib)
103083
103084 +# Link a shared library, based on position independent .o files
103085 +# *.o -> .so shared library (host-cxxshlib)
103086 +quiet_cmd_host-cxxshlib = HOSTLLD -shared $@
103087 + cmd_host-cxxshlib = $(HOSTCXX) $(HOSTLDFLAGS) -shared -o $@ \
103088 + $(addprefix $(obj)/,$($(@F:.so=-objs))) \
103089 + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
103090 +$(host-cxxshlib): $(obj)/%: $(host-cxxshobjs) FORCE
103091 + $(call if_changed,host-cxxshlib)
103092 +
103093 targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\
103094 - $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
103095 + $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) $(host-cxxshlib) $(host-cxxshobjs)
103096
103097 diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
103098 index 078fe1d..fbdb363 100644
103099 --- a/scripts/basic/fixdep.c
103100 +++ b/scripts/basic/fixdep.c
103101 @@ -161,7 +161,7 @@ static unsigned int strhash(const char *str, unsigned int sz)
103102 /*
103103 * Lookup a value in the configuration string.
103104 */
103105 -static int is_defined_config(const char *name, int len, unsigned int hash)
103106 +static int is_defined_config(const char *name, unsigned int len, unsigned int hash)
103107 {
103108 struct item *aux;
103109
103110 @@ -211,10 +211,10 @@ static void clear_config(void)
103111 /*
103112 * Record the use of a CONFIG_* word.
103113 */
103114 -static void use_config(const char *m, int slen)
103115 +static void use_config(const char *m, unsigned int slen)
103116 {
103117 unsigned int hash = strhash(m, slen);
103118 - int c, i;
103119 + unsigned int c, i;
103120
103121 if (is_defined_config(m, slen, hash))
103122 return;
103123 @@ -235,9 +235,9 @@ static void use_config(const char *m, int slen)
103124
103125 static void parse_config_file(const char *map, size_t len)
103126 {
103127 - const int *end = (const int *) (map + len);
103128 + const unsigned int *end = (const unsigned int *) (map + len);
103129 /* start at +1, so that p can never be < map */
103130 - const int *m = (const int *) map + 1;
103131 + const unsigned int *m = (const unsigned int *) map + 1;
103132 const char *p, *q;
103133
103134 for (; m < end; m++) {
103135 @@ -435,7 +435,7 @@ static void print_deps(void)
103136 static void traps(void)
103137 {
103138 static char test[] __attribute__((aligned(sizeof(int)))) = "CONF";
103139 - int *p = (int *)test;
103140 + unsigned int *p = (unsigned int *)test;
103141
103142 if (*p != INT_CONF) {
103143 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianness? %#x\n",
103144 diff --git a/scripts/gcc-plugin.sh b/scripts/gcc-plugin.sh
103145 new file mode 100644
103146 index 0000000..edcbc3a
103147 --- /dev/null
103148 +++ b/scripts/gcc-plugin.sh
103149 @@ -0,0 +1,16 @@
103150 +#!/bin/bash
103151 +srctree=$(dirname "$0")
103152 +gccplugins_dir=$($3 -print-file-name=plugin)
103153 +plugincc=$($1 -E -shared - -o /dev/null -I${srctree}/../tools/gcc -I${gccplugins_dir}/include 2>&1 <<EOF
103154 +#include "gcc-common.h"
103155 +#if BUILDING_GCC_VERSION >= 4008 || defined(ENABLE_BUILD_WITH_CXX)
103156 +#warning $2
103157 +#else
103158 +#warning $1
103159 +#endif
103160 +EOF
103161 +)
103162 +if [ $? -eq 0 ]
103163 +then
103164 + ( [[ "$plugincc" =~ "$1" ]] && echo "$1" ) || ( [[ "$plugincc" =~ "$2" ]] && echo "$2" )
103165 +fi
103166 diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh
103167 index 5de5660..d3deb89 100644
103168 --- a/scripts/headers_install.sh
103169 +++ b/scripts/headers_install.sh
103170 @@ -32,6 +32,7 @@ do
103171 FILE="$(basename "$i")"
103172 sed -r \
103173 -e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \
103174 + -e 's/__intentional_overflow\([- \t,0-9]*\)//g' \
103175 -e 's/__attribute_const__([ \t]|$)/\1/g' \
103176 -e 's@^#include <linux/compiler.h>@@' \
103177 -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
103178 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
103179 index 2dcb377..a82c500 100644
103180 --- a/scripts/link-vmlinux.sh
103181 +++ b/scripts/link-vmlinux.sh
103182 @@ -162,7 +162,7 @@ else
103183 fi;
103184
103185 # final build of init/
103186 -${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init
103187 +${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init GCC_PLUGINS_CFLAGS="${GCC_PLUGINS_CFLAGS}" GCC_PLUGINS_AFLAGS="${GCC_PLUGINS_AFLAGS}"
103188
103189 kallsymso=""
103190 kallsyms_vmlinux=""
103191 diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
103192 index 25e5cb0..6e85821 100644
103193 --- a/scripts/mod/file2alias.c
103194 +++ b/scripts/mod/file2alias.c
103195 @@ -142,7 +142,7 @@ static void device_id_check(const char *modname, const char *device_id,
103196 unsigned long size, unsigned long id_size,
103197 void *symval)
103198 {
103199 - int i;
103200 + unsigned int i;
103201
103202 if (size % id_size || size < id_size) {
103203 fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo "
103204 @@ -170,7 +170,7 @@ static void device_id_check(const char *modname, const char *device_id,
103205 /* USB is special because the bcdDevice can be matched against a numeric range */
103206 /* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipNinN" */
103207 static void do_usb_entry(void *symval,
103208 - unsigned int bcdDevice_initial, int bcdDevice_initial_digits,
103209 + unsigned int bcdDevice_initial, unsigned int bcdDevice_initial_digits,
103210 unsigned char range_lo, unsigned char range_hi,
103211 unsigned char max, struct module *mod)
103212 {
103213 @@ -280,7 +280,7 @@ static void do_usb_entry_multi(void *symval, struct module *mod)
103214 {
103215 unsigned int devlo, devhi;
103216 unsigned char chi, clo, max;
103217 - int ndigits;
103218 + unsigned int ndigits;
103219
103220 DEF_FIELD(symval, usb_device_id, match_flags);
103221 DEF_FIELD(symval, usb_device_id, idVendor);
103222 @@ -533,7 +533,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
103223 for (i = 0; i < count; i++) {
103224 DEF_FIELD_ADDR(symval + i*id_size, pnp_device_id, id);
103225 char acpi_id[sizeof(*id)];
103226 - int j;
103227 + unsigned int j;
103228
103229 buf_printf(&mod->dev_table_buf,
103230 "MODULE_ALIAS(\"pnp:d%s*\");\n", *id);
103231 @@ -562,7 +562,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
103232
103233 for (j = 0; j < PNP_MAX_DEVICES; j++) {
103234 const char *id = (char *)(*devs)[j].id;
103235 - int i2, j2;
103236 + unsigned int i2, j2;
103237 int dup = 0;
103238
103239 if (!id[0])
103240 @@ -588,7 +588,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
103241 /* add an individual alias for every device entry */
103242 if (!dup) {
103243 char acpi_id[PNP_ID_LEN];
103244 - int k;
103245 + unsigned int k;
103246
103247 buf_printf(&mod->dev_table_buf,
103248 "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
103249 @@ -940,7 +940,7 @@ static void dmi_ascii_filter(char *d, const char *s)
103250 static int do_dmi_entry(const char *filename, void *symval,
103251 char *alias)
103252 {
103253 - int i, j;
103254 + unsigned int i, j;
103255 DEF_FIELD_ADDR(symval, dmi_system_id, matches);
103256 sprintf(alias, "dmi*");
103257
103258 diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
103259 index 99a45fd..4b995a3 100644
103260 --- a/scripts/mod/modpost.c
103261 +++ b/scripts/mod/modpost.c
103262 @@ -945,6 +945,7 @@ enum mismatch {
103263 ANY_INIT_TO_ANY_EXIT,
103264 ANY_EXIT_TO_ANY_INIT,
103265 EXPORT_TO_INIT_EXIT,
103266 + DATA_TO_TEXT
103267 };
103268
103269 struct sectioncheck {
103270 @@ -1031,6 +1032,12 @@ const struct sectioncheck sectioncheck[] = {
103271 .tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
103272 .mismatch = EXPORT_TO_INIT_EXIT,
103273 .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
103274 +},
103275 +/* Do not reference code from writable data */
103276 +{
103277 + .fromsec = { DATA_SECTIONS, NULL },
103278 + .tosec = { TEXT_SECTIONS, NULL },
103279 + .mismatch = DATA_TO_TEXT
103280 }
103281 };
103282
103283 @@ -1151,10 +1158,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
103284 continue;
103285 if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
103286 continue;
103287 - if (sym->st_value == addr)
103288 - return sym;
103289 /* Find a symbol nearby - addr are maybe negative */
103290 d = sym->st_value - addr;
103291 + if (d == 0)
103292 + return sym;
103293 if (d < 0)
103294 d = addr - sym->st_value;
103295 if (d < distance) {
103296 @@ -1432,6 +1439,14 @@ static void report_sec_mismatch(const char *modname,
103297 tosym, prl_to, prl_to, tosym);
103298 free(prl_to);
103299 break;
103300 + case DATA_TO_TEXT:
103301 +#if 0
103302 + fprintf(stderr,
103303 + "The %s %s:%s references\n"
103304 + "the %s %s:%s%s\n",
103305 + from, fromsec, fromsym, to, tosec, tosym, to_p);
103306 +#endif
103307 + break;
103308 }
103309 fprintf(stderr, "\n");
103310 }
103311 @@ -1679,7 +1694,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
103312 static void check_sec_ref(struct module *mod, const char *modname,
103313 struct elf_info *elf)
103314 {
103315 - int i;
103316 + unsigned int i;
103317 Elf_Shdr *sechdrs = elf->sechdrs;
103318
103319 /* Walk through all sections */
103320 @@ -1798,7 +1813,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
103321 va_end(ap);
103322 }
103323
103324 -void buf_write(struct buffer *buf, const char *s, int len)
103325 +void buf_write(struct buffer *buf, const char *s, unsigned int len)
103326 {
103327 if (buf->size - buf->pos < len) {
103328 buf->size += len + SZ;
103329 @@ -2017,7 +2032,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
103330 if (fstat(fileno(file), &st) < 0)
103331 goto close_write;
103332
103333 - if (st.st_size != b->pos)
103334 + if (st.st_size != (off_t)b->pos)
103335 goto close_write;
103336
103337 tmp = NOFAIL(malloc(b->pos));
103338 diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
103339 index 51207e4..f7d603d 100644
103340 --- a/scripts/mod/modpost.h
103341 +++ b/scripts/mod/modpost.h
103342 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *expr);
103343
103344 struct buffer {
103345 char *p;
103346 - int pos;
103347 - int size;
103348 + unsigned int pos;
103349 + unsigned int size;
103350 };
103351
103352 void __attribute__((format(printf, 2, 3)))
103353 buf_printf(struct buffer *buf, const char *fmt, ...);
103354
103355 void
103356 -buf_write(struct buffer *buf, const char *s, int len);
103357 +buf_write(struct buffer *buf, const char *s, unsigned int len);
103358
103359 struct module {
103360 struct module *next;
103361 diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
103362 index deb2994..af4f63e 100644
103363 --- a/scripts/mod/sumversion.c
103364 +++ b/scripts/mod/sumversion.c
103365 @@ -470,7 +470,7 @@ static void write_version(const char *filename, const char *sum,
103366 goto out;
103367 }
103368
103369 - if (write(fd, sum, strlen(sum)+1) != strlen(sum)+1) {
103370 + if (write(fd, sum, strlen(sum)+1) != (ssize_t)strlen(sum)+1) {
103371 warn("writing sum in %s failed: %s\n",
103372 filename, strerror(errno));
103373 goto out;
103374 diff --git a/scripts/module-common.lds b/scripts/module-common.lds
103375 index 0865b3e..7235dd4 100644
103376 --- a/scripts/module-common.lds
103377 +++ b/scripts/module-common.lds
103378 @@ -6,6 +6,10 @@
103379 SECTIONS {
103380 /DISCARD/ : { *(.discard) }
103381
103382 + .rodata : {
103383 + *(.rodata) *(.rodata.*)
103384 + *(.data..read_only)
103385 + }
103386 __ksymtab : { *(SORT(___ksymtab+*)) }
103387 __ksymtab_gpl : { *(SORT(___ksymtab_gpl+*)) }
103388 __ksymtab_unused : { *(SORT(___ksymtab_unused+*)) }
103389 diff --git a/scripts/package/builddeb b/scripts/package/builddeb
103390 index f46e4dd..090e168 100644
103391 --- a/scripts/package/builddeb
103392 +++ b/scripts/package/builddeb
103393 @@ -291,6 +291,7 @@ fi
103394 (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
103395 (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
103396 (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
103397 +(cd $objtree; find tools/gcc -name \*.so >> "$objtree/debian/hdrobjfiles")
103398 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
103399 mkdir -p "$destdir"
103400 (cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)
103401 diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
103402 index 68bb4ef..2f419e1 100644
103403 --- a/scripts/pnmtologo.c
103404 +++ b/scripts/pnmtologo.c
103405 @@ -244,14 +244,14 @@ static void write_header(void)
103406 fprintf(out, " * Linux logo %s\n", logoname);
103407 fputs(" */\n\n", out);
103408 fputs("#include <linux/linux_logo.h>\n\n", out);
103409 - fprintf(out, "static unsigned char %s_data[] __initdata = {\n",
103410 + fprintf(out, "static unsigned char %s_data[] = {\n",
103411 logoname);
103412 }
103413
103414 static void write_footer(void)
103415 {
103416 fputs("\n};\n\n", out);
103417 - fprintf(out, "const struct linux_logo %s __initconst = {\n", logoname);
103418 + fprintf(out, "const struct linux_logo %s = {\n", logoname);
103419 fprintf(out, "\t.type\t\t= %s,\n", logo_types[logo_type]);
103420 fprintf(out, "\t.width\t\t= %d,\n", logo_width);
103421 fprintf(out, "\t.height\t\t= %d,\n", logo_height);
103422 @@ -381,7 +381,7 @@ static void write_logo_clut224(void)
103423 fputs("\n};\n\n", out);
103424
103425 /* write logo clut */
103426 - fprintf(out, "static unsigned char %s_clut[] __initdata = {\n",
103427 + fprintf(out, "static unsigned char %s_clut[] = {\n",
103428 logoname);
103429 write_hex_cnt = 0;
103430 for (i = 0; i < logo_clutsize; i++) {
103431 diff --git a/scripts/sortextable.h b/scripts/sortextable.h
103432 index 8fac3fd..32ff38d 100644
103433 --- a/scripts/sortextable.h
103434 +++ b/scripts/sortextable.h
103435 @@ -108,9 +108,9 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
103436 const char *secstrtab;
103437 const char *strtab;
103438 char *extab_image;
103439 - int extab_index = 0;
103440 - int i;
103441 - int idx;
103442 + unsigned int extab_index = 0;
103443 + unsigned int i;
103444 + unsigned int idx;
103445 unsigned int num_sections;
103446 unsigned int secindex_strings;
103447
103448 diff --git a/security/Kconfig b/security/Kconfig
103449 index beb86b5..1ea5a01 100644
103450 --- a/security/Kconfig
103451 +++ b/security/Kconfig
103452 @@ -4,6 +4,960 @@
103453
103454 menu "Security options"
103455
103456 +menu "Grsecurity"
103457 +
103458 + config ARCH_TRACK_EXEC_LIMIT
103459 + bool
103460 +
103461 + config PAX_KERNEXEC_PLUGIN
103462 + bool
103463 +
103464 + config PAX_PER_CPU_PGD
103465 + bool
103466 +
103467 + config TASK_SIZE_MAX_SHIFT
103468 + int
103469 + depends on X86_64
103470 + default 47 if !PAX_PER_CPU_PGD
103471 + default 42 if PAX_PER_CPU_PGD
103472 +
103473 + config PAX_ENABLE_PAE
103474 + bool
103475 + default y if (X86_32 && (MPENTIUM4 || MK8 || MPSC || MCORE2 || MATOM))
103476 +
103477 + config PAX_USERCOPY_SLABS
103478 + bool
103479 +
103480 +config GRKERNSEC
103481 + bool "Grsecurity"
103482 + select CRYPTO
103483 + select CRYPTO_SHA256
103484 + select PROC_FS
103485 + select STOP_MACHINE
103486 + select TTY
103487 + select DEBUG_KERNEL
103488 + select DEBUG_LIST
103489 + help
103490 + If you say Y here, you will be able to configure many features
103491 + that will enhance the security of your system. It is highly
103492 + recommended that you say Y here and read through the help
103493 + for each option so that you fully understand the features and
103494 + can evaluate their usefulness for your machine.
103495 +
103496 +choice
103497 + prompt "Configuration Method"
103498 + depends on GRKERNSEC
103499 + default GRKERNSEC_CONFIG_CUSTOM
103500 + help
103501 +
103502 +config GRKERNSEC_CONFIG_AUTO
103503 + bool "Automatic"
103504 + help
103505 + If you choose this configuration method, you'll be able to answer a small
103506 + number of simple questions about how you plan to use this kernel.
103507 + The settings of grsecurity and PaX will be automatically configured for
103508 + the highest commonly-used settings within the provided constraints.
103509 +
103510 + If you require additional configuration, custom changes can still be made
103511 + from the "custom configuration" menu.
103512 +
103513 +config GRKERNSEC_CONFIG_CUSTOM
103514 + bool "Custom"
103515 + help
103516 + If you choose this configuration method, you'll be able to configure all
103517 + grsecurity and PaX settings manually. Via this method, no options are
103518 + automatically enabled.
103519 +
103520 +endchoice
103521 +
103522 +choice
103523 + prompt "Usage Type"
103524 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
103525 + default GRKERNSEC_CONFIG_SERVER
103526 + help
103527 +
103528 +config GRKERNSEC_CONFIG_SERVER
103529 + bool "Server"
103530 + help
103531 + Choose this option if you plan to use this kernel on a server.
103532 +
103533 +config GRKERNSEC_CONFIG_DESKTOP
103534 + bool "Desktop"
103535 + help
103536 + Choose this option if you plan to use this kernel on a desktop.
103537 +
103538 +endchoice
103539 +
103540 +choice
103541 + prompt "Virtualization Type"
103542 + depends on (GRKERNSEC && X86 && GRKERNSEC_CONFIG_AUTO)
103543 + default GRKERNSEC_CONFIG_VIRT_NONE
103544 + help
103545 +
103546 +config GRKERNSEC_CONFIG_VIRT_NONE
103547 + bool "None"
103548 + help
103549 + Choose this option if this kernel will be run on bare metal.
103550 +
103551 +config GRKERNSEC_CONFIG_VIRT_GUEST
103552 + bool "Guest"
103553 + help
103554 + Choose this option if this kernel will be run as a VM guest.
103555 +
103556 +config GRKERNSEC_CONFIG_VIRT_HOST
103557 + bool "Host"
103558 + help
103559 + Choose this option if this kernel will be run as a VM host.
103560 +
103561 +endchoice
103562 +
103563 +choice
103564 + prompt "Virtualization Hardware"
103565 + depends on (GRKERNSEC && X86 && GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_GUEST || GRKERNSEC_CONFIG_VIRT_HOST))
103566 + help
103567 +
103568 +config GRKERNSEC_CONFIG_VIRT_EPT
103569 + bool "EPT/RVI Processor Support"
103570 + depends on X86
103571 + help
103572 + Choose this option if your CPU supports the EPT or RVI features of 2nd-gen
103573 + hardware virtualization. This allows for additional kernel hardening protections
103574 + to operate without additional performance impact.
103575 +
103576 + To see if your Intel processor supports EPT, see:
103577 + http://ark.intel.com/Products/VirtualizationTechnology
103578 + (Most Core i3/5/7 support EPT)
103579 +
103580 + To see if your AMD processor supports RVI, see:
103581 + http://support.amd.com/us/kbarticles/Pages/GPU120AMDRVICPUsHyperVWin8.aspx
103582 +
103583 +config GRKERNSEC_CONFIG_VIRT_SOFT
103584 + bool "First-gen/No Hardware Virtualization"
103585 + help
103586 + Choose this option if you use an Atom/Pentium/Core 2 processor that either doesn't
103587 + support hardware virtualization or doesn't support the EPT/RVI extensions.
103588 +
103589 +endchoice
103590 +
103591 +choice
103592 + prompt "Virtualization Software"
103593 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_GUEST || GRKERNSEC_CONFIG_VIRT_HOST))
103594 + help
103595 +
103596 +config GRKERNSEC_CONFIG_VIRT_XEN
103597 + bool "Xen"
103598 + help
103599 + Choose this option if this kernel is running as a Xen guest or host.
103600 +
103601 +config GRKERNSEC_CONFIG_VIRT_VMWARE
103602 + bool "VMWare"
103603 + help
103604 + Choose this option if this kernel is running as a VMWare guest or host.
103605 +
103606 +config GRKERNSEC_CONFIG_VIRT_KVM
103607 + bool "KVM"
103608 + help
103609 + Choose this option if this kernel is running as a KVM guest or host.
103610 +
103611 +config GRKERNSEC_CONFIG_VIRT_VIRTUALBOX
103612 + bool "VirtualBox"
103613 + help
103614 + Choose this option if this kernel is running as a VirtualBox guest or host.
103615 +
103616 +endchoice
103617 +
103618 +choice
103619 + prompt "Required Priorities"
103620 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
103621 + default GRKERNSEC_CONFIG_PRIORITY_PERF
103622 + help
103623 +
103624 +config GRKERNSEC_CONFIG_PRIORITY_PERF
103625 + bool "Performance"
103626 + help
103627 + Choose this option if performance is of highest priority for this deployment
103628 + of grsecurity. Features like UDEREF on a 64bit kernel, kernel stack clearing,
103629 + clearing of structures intended for userland, and freed memory sanitizing will
103630 + be disabled.
103631 +
103632 +config GRKERNSEC_CONFIG_PRIORITY_SECURITY
103633 + bool "Security"
103634 + help
103635 + Choose this option if security is of highest priority for this deployment of
103636 + grsecurity. UDEREF, kernel stack clearing, clearing of structures intended
103637 + for userland, and freed memory sanitizing will be enabled for this kernel.
103638 + In a worst-case scenario, these features can introduce a 20% performance hit
103639 + (UDEREF on x64 contributing half of this hit).
103640 +
103641 +endchoice
103642 +
103643 +menu "Default Special Groups"
103644 +depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
103645 +
103646 +config GRKERNSEC_PROC_GID
103647 + int "GID exempted from /proc restrictions"
103648 + default 1001
103649 + help
103650 + Setting this GID determines which group will be exempted from
103651 + grsecurity's /proc restrictions, allowing users of the specified
103652 + group to view network statistics and the existence of other users'
103653 + processes on the system. This GID may also be chosen at boot time
103654 + via "grsec_proc_gid=" on the kernel commandline.
103655 +
103656 +config GRKERNSEC_TPE_UNTRUSTED_GID
103657 + int "GID for TPE-untrusted users"
103658 + depends on GRKERNSEC_CONFIG_SERVER && GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
103659 + default 1005
103660 + help
103661 + Setting this GID determines which group untrusted users should
103662 + be added to. These users will be placed under grsecurity's Trusted Path
103663 + Execution mechanism, preventing them from executing their own binaries.
103664 + The users will only be able to execute binaries in directories owned and
103665 + writable only by the root user. If the sysctl option is enabled, a sysctl
103666 + option with name "tpe_gid" is created.
103667 +
103668 +config GRKERNSEC_TPE_TRUSTED_GID
103669 + int "GID for TPE-trusted users"
103670 + depends on GRKERNSEC_CONFIG_SERVER && GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
103671 + default 1005
103672 + help
103673 + Setting this GID determines what group TPE restrictions will be
103674 + *disabled* for. If the sysctl option is enabled, a sysctl option
103675 + with name "tpe_gid" is created.
103676 +
103677 +config GRKERNSEC_SYMLINKOWN_GID
103678 + int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
103679 + depends on GRKERNSEC_CONFIG_SERVER
103680 + default 1006
103681 + help
103682 + Setting this GID determines what group kernel-enforced
103683 + SymlinksIfOwnerMatch will be enabled for. If the sysctl option
103684 + is enabled, a sysctl option with name "symlinkown_gid" is created.
103685 +
103686 +
103687 +endmenu
103688 +
103689 +menu "Customize Configuration"
103690 +depends on GRKERNSEC
103691 +
103692 +menu "PaX"
103693 +
103694 +config PAX
103695 + bool "Enable various PaX features"
103696 + default y if GRKERNSEC_CONFIG_AUTO
103697 + depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS || PARISC || PPC || SPARC || X86)
103698 + help
103699 + This allows you to enable various PaX features. PaX adds
103700 + intrusion prevention mechanisms to the kernel that reduce
103701 + the risks posed by exploitable memory corruption bugs.
103702 +
103703 +menu "PaX Control"
103704 + depends on PAX
103705 +
103706 +config PAX_SOFTMODE
103707 + bool 'Support soft mode'
103708 + help
103709 + Enabling this option will allow you to run PaX in soft mode, that
103710 + is, PaX features will not be enforced by default, only on executables
103711 + marked explicitly. You must also enable PT_PAX_FLAGS or XATTR_PAX_FLAGS
103712 + support as they are the only way to mark executables for soft mode use.
103713 +
103714 + Soft mode can be activated by using the "pax_softmode=1" kernel command
103715 + line option on boot. Furthermore you can control various PaX features
103716 + at runtime via the entries in /proc/sys/kernel/pax.
103717 +
103718 +config PAX_EI_PAX
103719 + bool 'Use legacy ELF header marking'
103720 + default y if GRKERNSEC_CONFIG_AUTO
103721 + help
103722 + Enabling this option will allow you to control PaX features on
103723 + a per executable basis via the 'chpax' utility available at
103724 + http://pax.grsecurity.net/. The control flags will be read from
103725 + an otherwise reserved part of the ELF header. This marking has
103726 + numerous drawbacks (no support for soft-mode, toolchain does not
103727 + know about the non-standard use of the ELF header) therefore it
103728 + has been deprecated in favour of PT_PAX_FLAGS and XATTR_PAX_FLAGS
103729 + support.
103730 +
103731 + Note that if you enable PT_PAX_FLAGS or XATTR_PAX_FLAGS marking
103732 + support as well, they will override the legacy EI_PAX marks.
103733 +
103734 + If you enable none of the marking options then all applications
103735 + will run with PaX enabled on them by default.
103736 +
103737 +config PAX_PT_PAX_FLAGS
103738 + bool 'Use ELF program header marking'
103739 + default y if GRKERNSEC_CONFIG_AUTO
103740 + help
103741 + Enabling this option will allow you to control PaX features on
103742 + a per executable basis via the 'paxctl' utility available at
103743 + http://pax.grsecurity.net/. The control flags will be read from
103744 + a PaX specific ELF program header (PT_PAX_FLAGS). This marking
103745 + has the benefits of supporting both soft mode and being fully
103746 + integrated into the toolchain (the binutils patch is available
103747 + from http://pax.grsecurity.net).
103748 +
103749 + Note that if you enable the legacy EI_PAX marking support as well,
103750 + the EI_PAX marks will be overridden by the PT_PAX_FLAGS marks.
103751 +
103752 + If you enable both PT_PAX_FLAGS and XATTR_PAX_FLAGS support then you
103753 + must make sure that the marks are the same if a binary has both marks.
103754 +
103755 + If you enable none of the marking options then all applications
103756 + will run with PaX enabled on them by default.
103757 +
103758 +config PAX_XATTR_PAX_FLAGS
103759 + bool 'Use filesystem extended attributes marking'
103760 + default y if GRKERNSEC_CONFIG_AUTO
103761 + select CIFS_XATTR if CIFS
103762 + select EXT2_FS_XATTR if EXT2_FS
103763 + select EXT3_FS_XATTR if EXT3_FS
103764 + select JFFS2_FS_XATTR if JFFS2_FS
103765 + select REISERFS_FS_XATTR if REISERFS_FS
103766 + select SQUASHFS_XATTR if SQUASHFS
103767 + select TMPFS_XATTR if TMPFS
103768 + select UBIFS_FS_XATTR if UBIFS_FS
103769 + help
103770 + Enabling this option will allow you to control PaX features on
103771 + a per executable basis via the 'setfattr' utility. The control
103772 + flags will be read from the user.pax.flags extended attribute of
103773 + the file. This marking has the benefit of supporting binary-only
103774 + applications that self-check themselves (e.g., skype) and would
103775 + not tolerate chpax/paxctl changes. The main drawback is that
103776 + extended attributes are not supported by some filesystems (e.g.,
103777 + isofs, udf, vfat) so copying files through such filesystems will
103778 + lose the extended attributes and these PaX markings.
103779 +
103780 + Note that if you enable the legacy EI_PAX marking support as well,
103781 + the EI_PAX marks will be overridden by the XATTR_PAX_FLAGS marks.
103782 +
103783 + If you enable both PT_PAX_FLAGS and XATTR_PAX_FLAGS support then you
103784 + must make sure that the marks are the same if a binary has both marks.
103785 +
103786 + If you enable none of the marking options then all applications
103787 + will run with PaX enabled on them by default.
103788 +
103789 +choice
103790 + prompt 'MAC system integration'
103791 + default PAX_HAVE_ACL_FLAGS
103792 + help
103793 + Mandatory Access Control systems have the option of controlling
103794 + PaX flags on a per executable basis, choose the method supported
103795 + by your particular system.
103796 +
103797 + - "none": if your MAC system does not interact with PaX,
103798 + - "direct": if your MAC system defines pax_set_initial_flags() itself,
103799 + - "hook": if your MAC system uses the pax_set_initial_flags_func callback.
103800 +
103801 + NOTE: this option is for developers/integrators only.
103802 +
103803 + config PAX_NO_ACL_FLAGS
103804 + bool 'none'
103805 +
103806 + config PAX_HAVE_ACL_FLAGS
103807 + bool 'direct'
103808 +
103809 + config PAX_HOOK_ACL_FLAGS
103810 + bool 'hook'
103811 +endchoice
103812 +
103813 +endmenu
103814 +
103815 +menu "Non-executable pages"
103816 + depends on PAX
103817 +
103818 +config PAX_NOEXEC
103819 + bool "Enforce non-executable pages"
103820 + default y if GRKERNSEC_CONFIG_AUTO
103821 + depends on ALPHA || (ARM && (CPU_V6 || CPU_V6K || CPU_V7)) || IA64 || MIPS || PARISC || PPC || S390 || SPARC || X86
103822 + help
103823 + By design some architectures do not allow for protecting memory
103824 + pages against execution or even if they do, Linux does not make
103825 + use of this feature. In practice this means that if a page is
103826 + readable (such as the stack or heap) it is also executable.
103827 +
103828 + There is a well known exploit technique that makes use of this
103829 + fact and a common programming mistake where an attacker can
103830 + introduce code of his choice somewhere in the attacked program's
103831 + memory (typically the stack or the heap) and then execute it.
103832 +
103833 + If the attacked program was running with different (typically
103834 + higher) privileges than that of the attacker, then he can elevate
103835 + his own privilege level (e.g. get a root shell, write to files for
103836 + which he does not have write access to, etc).
103837 +
103838 + Enabling this option will let you choose from various features
103839 + that prevent the injection and execution of 'foreign' code in
103840 + a program.
103841 +
103842 + This will also break programs that rely on the old behaviour and
103843 + expect that dynamically allocated memory via the malloc() family
103844 + of functions is executable (which it is not). Notable examples
103845 + are the XFree86 4.x server, the java runtime and wine.
103846 +
103847 +config PAX_PAGEEXEC
103848 + bool "Paging based non-executable pages"
103849 + default y if GRKERNSEC_CONFIG_AUTO
103850 + 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)
103851 + select ARCH_TRACK_EXEC_LIMIT if X86_32
103852 + help
103853 + This implementation is based on the paging feature of the CPU.
103854 + On i386 without hardware non-executable bit support there is a
103855 + variable but usually low performance impact, however on Intel's
103856 + P4 core based CPUs it is very high so you should not enable this
103857 + for kernels meant to be used on such CPUs.
103858 +
103859 + On alpha, avr32, ia64, parisc, sparc, sparc64, x86_64 and i386
103860 + with hardware non-executable bit support there is no performance
103861 + impact, on ppc the impact is negligible.
103862 +
103863 + Note that several architectures require various emulations due to
103864 + badly designed userland ABIs, this will cause a performance impact
103865 + but will disappear as soon as userland is fixed. For example, ppc
103866 + userland MUST have been built with secure-plt by a recent toolchain.
103867 +
103868 +config PAX_SEGMEXEC
103869 + bool "Segmentation based non-executable pages"
103870 + default y if GRKERNSEC_CONFIG_AUTO
103871 + depends on PAX_NOEXEC && X86_32
103872 + help
103873 + This implementation is based on the segmentation feature of the
103874 + CPU and has a very small performance impact, however applications
103875 + will be limited to a 1.5 GB address space instead of the normal
103876 + 3 GB.
103877 +
103878 +config PAX_EMUTRAMP
103879 + bool "Emulate trampolines"
103880 + default y if PARISC || GRKERNSEC_CONFIG_AUTO
103881 + depends on (PAX_PAGEEXEC || PAX_SEGMEXEC) && (PARISC || X86)
103882 + help
103883 + There are some programs and libraries that for one reason or
103884 + another attempt to execute special small code snippets from
103885 + non-executable memory pages. Most notable examples are the
103886 + signal handler return code generated by the kernel itself and
103887 + the GCC trampolines.
103888 +
103889 + If you enabled CONFIG_PAX_PAGEEXEC or CONFIG_PAX_SEGMEXEC then
103890 + such programs will no longer work under your kernel.
103891 +
103892 + As a remedy you can say Y here and use the 'chpax' or 'paxctl'
103893 + utilities to enable trampoline emulation for the affected programs
103894 + yet still have the protection provided by the non-executable pages.
103895 +
103896 + On parisc you MUST enable this option and EMUSIGRT as well, otherwise
103897 + your system will not even boot.
103898 +
103899 + Alternatively you can say N here and use the 'chpax' or 'paxctl'
103900 + utilities to disable CONFIG_PAX_PAGEEXEC and CONFIG_PAX_SEGMEXEC
103901 + for the affected files.
103902 +
103903 + NOTE: enabling this feature *may* open up a loophole in the
103904 + protection provided by non-executable pages that an attacker
103905 + could abuse. Therefore the best solution is to not have any
103906 + files on your system that would require this option. This can
103907 + be achieved by not using libc5 (which relies on the kernel
103908 + signal handler return code) and not using or rewriting programs
103909 + that make use of the nested function implementation of GCC.
103910 + Skilled users can just fix GCC itself so that it implements
103911 + nested function calls in a way that does not interfere with PaX.
103912 +
103913 +config PAX_EMUSIGRT
103914 + bool "Automatically emulate sigreturn trampolines"
103915 + depends on PAX_EMUTRAMP && PARISC
103916 + default y
103917 + help
103918 + Enabling this option will have the kernel automatically detect
103919 + and emulate signal return trampolines executing on the stack
103920 + that would otherwise lead to task termination.
103921 +
103922 + This solution is intended as a temporary one for users with
103923 + legacy versions of libc (libc5, glibc 2.0, uClibc before 0.9.17,
103924 + Modula-3 runtime, etc) or executables linked to such, basically
103925 + everything that does not specify its own SA_RESTORER function in
103926 + normal executable memory like glibc 2.1+ does.
103927 +
103928 + On parisc you MUST enable this option, otherwise your system will
103929 + not even boot.
103930 +
103931 + NOTE: this feature cannot be disabled on a per executable basis
103932 + and since it *does* open up a loophole in the protection provided
103933 + by non-executable pages, the best solution is to not have any
103934 + files on your system that would require this option.
103935 +
103936 +config PAX_MPROTECT
103937 + bool "Restrict mprotect()"
103938 + default y if GRKERNSEC_CONFIG_AUTO
103939 + depends on (PAX_PAGEEXEC || PAX_SEGMEXEC)
103940 + help
103941 + Enabling this option will prevent programs from
103942 + - changing the executable status of memory pages that were
103943 + not originally created as executable,
103944 + - making read-only executable pages writable again,
103945 + - creating executable pages from anonymous memory,
103946 + - making read-only-after-relocations (RELRO) data pages writable again.
103947 +
103948 + You should say Y here to complete the protection provided by
103949 + the enforcement of non-executable pages.
103950 +
103951 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control
103952 + this feature on a per file basis.
103953 +
103954 +config PAX_MPROTECT_COMPAT
103955 + bool "Use legacy/compat protection demoting (read help)"
103956 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_DESKTOP)
103957 + depends on PAX_MPROTECT
103958 + help
103959 + The current implementation of PAX_MPROTECT denies RWX allocations/mprotects
103960 + by sending the proper error code to the application. For some broken
103961 + userland, this can cause problems with Python or other applications. The
103962 + current implementation however allows for applications like clamav to
103963 + detect if JIT compilation/execution is allowed and to fall back gracefully
103964 + to an interpreter-based mode if it does not. While we encourage everyone
103965 + to use the current implementation as-is and push upstream to fix broken
103966 + userland (note that the RWX logging option can assist with this), in some
103967 + environments this may not be possible. Having to disable MPROTECT
103968 + completely on certain binaries reduces the security benefit of PaX,
103969 + so this option is provided for those environments to revert to the old
103970 + behavior.
103971 +
103972 +config PAX_ELFRELOCS
103973 + bool "Allow ELF text relocations (read help)"
103974 + depends on PAX_MPROTECT
103975 + default n
103976 + help
103977 + Non-executable pages and mprotect() restrictions are effective
103978 + in preventing the introduction of new executable code into an
103979 + attacked task's address space. There remain only two venues
103980 + for this kind of attack: if the attacker can execute already
103981 + existing code in the attacked task then he can either have it
103982 + create and mmap() a file containing his code or have it mmap()
103983 + an already existing ELF library that does not have position
103984 + independent code in it and use mprotect() on it to make it
103985 + writable and copy his code there. While protecting against
103986 + the former approach is beyond PaX, the latter can be prevented
103987 + by having only PIC ELF libraries on one's system (which do not
103988 + need to relocate their code). If you are sure this is your case,
103989 + as is the case with all modern Linux distributions, then leave
103990 + this option disabled. You should say 'n' here.
103991 +
103992 +config PAX_ETEXECRELOCS
103993 + bool "Allow ELF ET_EXEC text relocations"
103994 + depends on PAX_MPROTECT && (ALPHA || IA64 || PARISC)
103995 + select PAX_ELFRELOCS
103996 + default y
103997 + help
103998 + On some architectures there are incorrectly created applications
103999 + that require text relocations and would not work without enabling
104000 + this option. If you are an alpha, ia64 or parisc user, you should
104001 + enable this option and disable it once you have made sure that
104002 + none of your applications need it.
104003 +
104004 +config PAX_EMUPLT
104005 + bool "Automatically emulate ELF PLT"
104006 + depends on PAX_MPROTECT && (ALPHA || PARISC || SPARC)
104007 + default y
104008 + help
104009 + Enabling this option will have the kernel automatically detect
104010 + and emulate the Procedure Linkage Table entries in ELF files.
104011 + On some architectures such entries are in writable memory, and
104012 + become non-executable leading to task termination. Therefore
104013 + it is mandatory that you enable this option on alpha, parisc,
104014 + sparc and sparc64, otherwise your system would not even boot.
104015 +
104016 + NOTE: this feature *does* open up a loophole in the protection
104017 + provided by the non-executable pages, therefore the proper
104018 + solution is to modify the toolchain to produce a PLT that does
104019 + not need to be writable.
104020 +
104021 +config PAX_DLRESOLVE
104022 + bool 'Emulate old glibc resolver stub'
104023 + depends on PAX_EMUPLT && SPARC
104024 + default n
104025 + help
104026 + This option is needed if userland has an old glibc (before 2.4)
104027 + that puts a 'save' instruction into the runtime generated resolver
104028 + stub that needs special emulation.
104029 +
104030 +config PAX_KERNEXEC
104031 + bool "Enforce non-executable kernel pages"
104032 + 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))
104033 + depends on (X86 || (ARM && (CPU_V6 || CPU_V6K || CPU_V7) && !(ARM_LPAE && MODULES))) && !XEN
104034 + select PAX_PER_CPU_PGD if X86_64 || (X86_32 && X86_PAE)
104035 + select PAX_KERNEXEC_PLUGIN if X86_64
104036 + help
104037 + This is the kernel land equivalent of PAGEEXEC and MPROTECT,
104038 + that is, enabling this option will make it harder to inject
104039 + and execute 'foreign' code in kernel memory itself.
104040 +
104041 +choice
104042 + prompt "Return Address Instrumentation Method"
104043 + default PAX_KERNEXEC_PLUGIN_METHOD_BTS
104044 + depends on PAX_KERNEXEC_PLUGIN
104045 + help
104046 + Select the method used to instrument function pointer dereferences.
104047 + Note that binary modules cannot be instrumented by this approach.
104048 +
104049 + Note that the implementation requires a gcc with plugin support,
104050 + i.e., gcc 4.5 or newer. You may need to install the supporting
104051 + headers explicitly in addition to the normal gcc package.
104052 +
104053 + config PAX_KERNEXEC_PLUGIN_METHOD_BTS
104054 + bool "bts"
104055 + help
104056 + This method is compatible with binary only modules but has
104057 + a higher runtime overhead.
104058 +
104059 + config PAX_KERNEXEC_PLUGIN_METHOD_OR
104060 + bool "or"
104061 + depends on !PARAVIRT
104062 + help
104063 + This method is incompatible with binary only modules but has
104064 + a lower runtime overhead.
104065 +endchoice
104066 +
104067 +config PAX_KERNEXEC_PLUGIN_METHOD
104068 + string
104069 + default "bts" if PAX_KERNEXEC_PLUGIN_METHOD_BTS
104070 + default "or" if PAX_KERNEXEC_PLUGIN_METHOD_OR
104071 + default ""
104072 +
104073 +config PAX_KERNEXEC_MODULE_TEXT
104074 + int "Minimum amount of memory reserved for module code"
104075 + default "4" if (!GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_SERVER)
104076 + default "12" if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_DESKTOP)
104077 + depends on PAX_KERNEXEC && X86_32
104078 + help
104079 + Due to implementation details the kernel must reserve a fixed
104080 + amount of memory for runtime allocated code (such as modules)
104081 + at compile time that cannot be changed at runtime. Here you
104082 + can specify the minimum amount in MB that will be reserved.
104083 + Due to the same implementation details this size will always
104084 + be rounded up to the next 2/4 MB boundary (depends on PAE) so
104085 + the actually available memory for runtime allocated code will
104086 + usually be more than this minimum.
104087 +
104088 + The default 4 MB should be enough for most users but if you have
104089 + an excessive number of modules (e.g., most distribution configs
104090 + compile many drivers as modules) or use huge modules such as
104091 + nvidia's kernel driver, you will need to adjust this amount.
104092 + A good rule of thumb is to look at your currently loaded kernel
104093 + modules and add up their sizes.
104094 +
104095 +endmenu
104096 +
104097 +menu "Address Space Layout Randomization"
104098 + depends on PAX
104099 +
104100 +config PAX_ASLR
104101 + bool "Address Space Layout Randomization"
104102 + default y if GRKERNSEC_CONFIG_AUTO
104103 + help
104104 + Many if not most exploit techniques rely on the knowledge of
104105 + certain addresses in the attacked program. The following options
104106 + will allow the kernel to apply a certain amount of randomization
104107 + to specific parts of the program thereby forcing an attacker to
104108 + guess them in most cases. Any failed guess will most likely crash
104109 + the attacked program which allows the kernel to detect such attempts
104110 + and react on them. PaX itself provides no reaction mechanisms,
104111 + instead it is strongly encouraged that you make use of Nergal's
104112 + segvguard (ftp://ftp.pl.openwall.com/misc/segvguard/) or grsecurity's
104113 + (http://www.grsecurity.net/) built-in crash detection features or
104114 + develop one yourself.
104115 +
104116 + By saying Y here you can choose to randomize the following areas:
104117 + - top of the task's kernel stack
104118 + - top of the task's userland stack
104119 + - base address for mmap() requests that do not specify one
104120 + (this includes all libraries)
104121 + - base address of the main executable
104122 +
104123 + It is strongly recommended to say Y here as address space layout
104124 + randomization has negligible impact on performance yet it provides
104125 + a very effective protection.
104126 +
104127 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control
104128 + this feature on a per file basis.
104129 +
104130 +config PAX_RANDKSTACK
104131 + bool "Randomize kernel stack base"
104132 + default y if GRKERNSEC_CONFIG_AUTO && !(GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_VIRTUALBOX)
104133 + depends on X86_TSC && X86
104134 + help
104135 + By saying Y here the kernel will randomize every task's kernel
104136 + stack on every system call. This will not only force an attacker
104137 + to guess it but also prevent him from making use of possible
104138 + leaked information about it.
104139 +
104140 + Since the kernel stack is a rather scarce resource, randomization
104141 + may cause unexpected stack overflows, therefore you should very
104142 + carefully test your system. Note that once enabled in the kernel
104143 + configuration, this feature cannot be disabled on a per file basis.
104144 +
104145 +config PAX_RANDUSTACK
104146 + bool "Randomize user stack base"
104147 + default y if GRKERNSEC_CONFIG_AUTO
104148 + depends on PAX_ASLR
104149 + help
104150 + By saying Y here the kernel will randomize every task's userland
104151 + stack. The randomization is done in two steps where the second
104152 + one may apply a big amount of shift to the top of the stack and
104153 + cause problems for programs that want to use lots of memory (more
104154 + than 2.5 GB if SEGMEXEC is not active, or 1.25 GB when it is).
104155 + For this reason the second step can be controlled by 'chpax' or
104156 + 'paxctl' on a per file basis.
104157 +
104158 +config PAX_RANDMMAP
104159 + bool "Randomize mmap() base"
104160 + default y if GRKERNSEC_CONFIG_AUTO
104161 + depends on PAX_ASLR
104162 + help
104163 + By saying Y here the kernel will use a randomized base address for
104164 + mmap() requests that do not specify one themselves. As a result
104165 + all dynamically loaded libraries will appear at random addresses
104166 + and therefore be harder to exploit by a technique where an attacker
104167 + attempts to execute library code for his purposes (e.g. spawn a
104168 + shell from an exploited program that is running at an elevated
104169 + privilege level).
104170 +
104171 + Furthermore, if a program is relinked as a dynamic ELF file, its
104172 + base address will be randomized as well, completing the full
104173 + randomization of the address space layout. Attacking such programs
104174 + becomes a guess game. You can find an example of doing this at
104175 + http://pax.grsecurity.net/et_dyn.tar.gz and practical samples at
104176 + http://www.grsecurity.net/grsec-gcc-specs.tar.gz .
104177 +
104178 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control this
104179 + feature on a per file basis.
104180 +
104181 +endmenu
104182 +
104183 +menu "Miscellaneous hardening features"
104184 +
104185 +config PAX_MEMORY_SANITIZE
104186 + bool "Sanitize all freed memory"
104187 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
104188 + help
104189 + By saying Y here the kernel will erase memory pages and slab objects
104190 + as soon as they are freed. This in turn reduces the lifetime of data
104191 + stored in them, making it less likely that sensitive information such
104192 + as passwords, cryptographic secrets, etc stay in memory for too long.
104193 +
104194 + This is especially useful for programs whose runtime is short, long
104195 + lived processes and the kernel itself benefit from this as long as
104196 + they ensure timely freeing of memory that may hold sensitive
104197 + information.
104198 +
104199 + A nice side effect of the sanitization of slab objects is the
104200 + reduction of possible info leaks caused by padding bytes within the
104201 + leaky structures. Use-after-free bugs for structures containing
104202 + pointers can also be detected as dereferencing the sanitized pointer
104203 + will generate an access violation.
104204 +
104205 + The tradeoff is performance impact, on a single CPU system kernel
104206 + compilation sees a 3% slowdown, other systems and workloads may vary
104207 + and you are advised to test this feature on your expected workload
104208 + before deploying it.
104209 +
104210 + To reduce the performance penalty by sanitizing pages only, albeit
104211 + limiting the effectiveness of this feature at the same time, slab
104212 + sanitization can be disabled with the kernel commandline parameter
104213 + "pax_sanitize_slab=0".
104214 +
104215 + Note that this feature does not protect data stored in live pages,
104216 + e.g., process memory swapped to disk may stay there for a long time.
104217 +
104218 +config PAX_MEMORY_STACKLEAK
104219 + bool "Sanitize kernel stack"
104220 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
104221 + depends on X86
104222 + help
104223 + By saying Y here the kernel will erase the kernel stack before it
104224 + returns from a system call. This in turn reduces the information
104225 + that a kernel stack leak bug can reveal.
104226 +
104227 + Note that such a bug can still leak information that was put on
104228 + the stack by the current system call (the one eventually triggering
104229 + the bug) but traces of earlier system calls on the kernel stack
104230 + cannot leak anymore.
104231 +
104232 + The tradeoff is performance impact: on a single CPU system kernel
104233 + compilation sees a 1% slowdown, other systems and workloads may vary
104234 + and you are advised to test this feature on your expected workload
104235 + before deploying it.
104236 +
104237 + Note that the full feature requires a gcc with plugin support,
104238 + i.e., gcc 4.5 or newer. You may need to install the supporting
104239 + headers explicitly in addition to the normal gcc package. Using
104240 + older gcc versions means that functions with large enough stack
104241 + frames may leave uninitialized memory behind that may be exposed
104242 + to a later syscall leaking the stack.
104243 +
104244 +config PAX_MEMORY_STRUCTLEAK
104245 + bool "Forcibly initialize local variables copied to userland"
104246 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
104247 + help
104248 + By saying Y here the kernel will zero initialize some local
104249 + variables that are going to be copied to userland. This in
104250 + turn prevents unintended information leakage from the kernel
104251 + stack should later code forget to explicitly set all parts of
104252 + the copied variable.
104253 +
104254 + The tradeoff is less performance impact than PAX_MEMORY_STACKLEAK
104255 + at a much smaller coverage.
104256 +
104257 + Note that the implementation requires a gcc with plugin support,
104258 + i.e., gcc 4.5 or newer. You may need to install the supporting
104259 + headers explicitly in addition to the normal gcc package.
104260 +
104261 +config PAX_MEMORY_UDEREF
104262 + bool "Prevent invalid userland pointer dereference"
104263 + default y if GRKERNSEC_CONFIG_AUTO && !(X86_64 && GRKERNSEC_CONFIG_PRIORITY_PERF) && (!X86 || GRKERNSEC_CONFIG_VIRT_NONE || GRKERNSEC_CONFIG_VIRT_EPT)
104264 + depends on (X86 || (ARM && (CPU_V6 || CPU_V6K || CPU_V7) && !ARM_LPAE)) && !UML_X86 && !XEN
104265 + select PAX_PER_CPU_PGD if X86_64
104266 + help
104267 + By saying Y here the kernel will be prevented from dereferencing
104268 + userland pointers in contexts where the kernel expects only kernel
104269 + pointers. This is both a useful runtime debugging feature and a
104270 + security measure that prevents exploiting a class of kernel bugs.
104271 +
104272 + The tradeoff is that some virtualization solutions may experience
104273 + a huge slowdown and therefore you should not enable this feature
104274 + for kernels meant to run in such environments. Whether a given VM
104275 + solution is affected or not is best determined by simply trying it
104276 + out, the performance impact will be obvious right on boot as this
104277 + mechanism engages from very early on. A good rule of thumb is that
104278 + VMs running on CPUs without hardware virtualization support (i.e.,
104279 + the majority of IA-32 CPUs) will likely experience the slowdown.
104280 +
104281 + On X86_64 the kernel will make use of PCID support when available
104282 + (Intel's Westmere, Sandy Bridge, etc) for better security (default)
104283 + or performance impact. Pass pax_weakuderef on the kernel command
104284 + line to choose the latter.
104285 +
104286 +config PAX_REFCOUNT
104287 + bool "Prevent various kernel object reference counter overflows"
104288 + default y if GRKERNSEC_CONFIG_AUTO
104289 + depends on GRKERNSEC && ((ARM && (CPU_V6 || CPU_V6K || CPU_V7)) || MIPS || SPARC64 || X86)
104290 + help
104291 + By saying Y here the kernel will detect and prevent overflowing
104292 + various (but not all) kinds of object reference counters. Such
104293 + overflows can normally occur due to bugs only and are often, if
104294 + not always, exploitable.
104295 +
104296 + The tradeoff is that data structures protected by an overflowed
104297 + refcount will never be freed and therefore will leak memory. Note
104298 + that this leak also happens even without this protection but in
104299 + that case the overflow can eventually trigger the freeing of the
104300 + data structure while it is still being used elsewhere, resulting
104301 + in the exploitable situation that this feature prevents.
104302 +
104303 + Since this has a negligible performance impact, you should enable
104304 + this feature.
104305 +
104306 +config PAX_CONSTIFY_PLUGIN
104307 + bool "Automatically constify eligible structures"
104308 + default y
104309 + depends on !UML && PAX_KERNEXEC
104310 + help
104311 + By saying Y here the compiler will automatically constify a class
104312 + of types that contain only function pointers. This reduces the
104313 + kernel's attack surface and also produces a better memory layout.
104314 +
104315 + Note that the implementation requires a gcc with plugin support,
104316 + i.e., gcc 4.5 or newer. You may need to install the supporting
104317 + headers explicitly in addition to the normal gcc package.
104318 +
104319 + Note that if some code really has to modify constified variables
104320 + then the source code will have to be patched to allow it. Examples
104321 + can be found in PaX itself (the no_const attribute) and for some
104322 + out-of-tree modules at http://www.grsecurity.net/~paxguy1/ .
104323 +
104324 +config PAX_USERCOPY
104325 + bool "Harden heap object copies between kernel and userland"
104326 + default y if GRKERNSEC_CONFIG_AUTO
104327 + depends on ARM || IA64 || PPC || SPARC || X86
104328 + depends on GRKERNSEC && (SLAB || SLUB || SLOB)
104329 + select PAX_USERCOPY_SLABS
104330 + help
104331 + By saying Y here the kernel will enforce the size of heap objects
104332 + when they are copied in either direction between the kernel and
104333 + userland, even if only a part of the heap object is copied.
104334 +
104335 + Specifically, this checking prevents information leaking from the
104336 + kernel heap during kernel to userland copies (if the kernel heap
104337 + object is otherwise fully initialized) and prevents kernel heap
104338 + overflows during userland to kernel copies.
104339 +
104340 + Note that the current implementation provides the strictest bounds
104341 + checks for the SLUB allocator.
104342 +
104343 + Enabling this option also enables per-slab cache protection against
104344 + data in a given cache being copied into/out of via userland
104345 + accessors. Though the whitelist of regions will be reduced over
104346 + time, it notably protects important data structures like task structs.
104347 +
104348 + If frame pointers are enabled on x86, this option will also restrict
104349 + copies into and out of the kernel stack to local variables within a
104350 + single frame.
104351 +
104352 + Since this has a negligible performance impact, you should enable
104353 + this feature.
104354 +
104355 +config PAX_USERCOPY_DEBUG
104356 + bool
104357 + depends on X86 && PAX_USERCOPY
104358 + default n
104359 +
104360 +config PAX_SIZE_OVERFLOW
104361 + bool "Prevent various integer overflows in function size parameters"
104362 + default y if GRKERNSEC_CONFIG_AUTO
104363 + depends on X86
104364 + help
104365 + By saying Y here the kernel recomputes expressions of function
104366 + arguments marked by a size_overflow attribute with double integer
104367 + precision (DImode/TImode for 32/64 bit integer types).
104368 +
104369 + The recomputed argument is checked against TYPE_MAX and an event
104370 + is logged on overflow and the triggering process is killed.
104371 +
104372 + Homepage: http://www.grsecurity.net/~ephox/overflow_plugin/
104373 +
104374 + Note that the implementation requires a gcc with plugin support,
104375 + i.e., gcc 4.5 or newer. You may need to install the supporting
104376 + headers explicitly in addition to the normal gcc package.
104377 +
104378 +config PAX_LATENT_ENTROPY
104379 + bool "Generate some entropy during boot and runtime"
104380 + default y if GRKERNSEC_CONFIG_AUTO
104381 + help
104382 + By saying Y here the kernel will instrument some kernel code to
104383 + extract some entropy from both original and artificially created
104384 + program state. This will help especially embedded systems where
104385 + there is little 'natural' source of entropy normally. The cost
104386 + is some slowdown of the boot process and fork and irq processing.
104387 +
104388 + When pax_extra_latent_entropy is passed on the kernel command line,
104389 + entropy will be extracted from up to the first 4GB of RAM while the
104390 + runtime memory allocator is being initialized. This costs even more
104391 + slowdown of the boot process.
104392 +
104393 + Note that the implementation requires a gcc with plugin support,
104394 + i.e., gcc 4.5 or newer. You may need to install the supporting
104395 + headers explicitly in addition to the normal gcc package.
104396 +
104397 + Note that entropy extracted this way is not cryptographically
104398 + secure!
104399 +
104400 +endmenu
104401 +
104402 +endmenu
104403 +
104404 +source grsecurity/Kconfig
104405 +
104406 +endmenu
104407 +
104408 +endmenu
104409 +
104410 source security/keys/Kconfig
104411
104412 config SECURITY_DMESG_RESTRICT
104413 @@ -103,7 +1057,7 @@ config INTEL_TXT
104414 config LSM_MMAP_MIN_ADDR
104415 int "Low address space for LSM to protect from user allocation"
104416 depends on SECURITY && SECURITY_SELINUX
104417 - default 32768 if ARM || (ARM64 && COMPAT)
104418 + default 32768 if ALPHA || ARM || (ARM64 && COMPAT) || PARISC || SPARC32
104419 default 65536
104420 help
104421 This is the portion of low virtual memory which should be protected
104422 diff --git a/security/apparmor/file.c b/security/apparmor/file.c
104423 index fdaa50c..2761dcb 100644
104424 --- a/security/apparmor/file.c
104425 +++ b/security/apparmor/file.c
104426 @@ -348,8 +348,8 @@ static inline bool xindex_is_subset(u32 link, u32 target)
104427 int aa_path_link(struct aa_profile *profile, struct dentry *old_dentry,
104428 struct path *new_dir, struct dentry *new_dentry)
104429 {
104430 - struct path link = { new_dir->mnt, new_dentry };
104431 - struct path target = { new_dir->mnt, old_dentry };
104432 + struct path link = { .mnt = new_dir->mnt, .dentry = new_dentry };
104433 + struct path target = { .mnt = new_dir->mnt, .dentry = old_dentry };
104434 struct path_cond cond = {
104435 old_dentry->d_inode->i_uid,
104436 old_dentry->d_inode->i_mode
104437 diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
104438 index 4257b7e..2d0732d 100644
104439 --- a/security/apparmor/lsm.c
104440 +++ b/security/apparmor/lsm.c
104441 @@ -186,7 +186,7 @@ static int common_perm_dir_dentry(int op, struct path *dir,
104442 struct dentry *dentry, u32 mask,
104443 struct path_cond *cond)
104444 {
104445 - struct path path = { dir->mnt, dentry };
104446 + struct path path = { .mnt = dir->mnt, .dentry = dentry };
104447
104448 return common_perm(op, &path, mask, cond);
104449 }
104450 @@ -203,7 +203,7 @@ static int common_perm_dir_dentry(int op, struct path *dir,
104451 static int common_perm_mnt_dentry(int op, struct vfsmount *mnt,
104452 struct dentry *dentry, u32 mask)
104453 {
104454 - struct path path = { mnt, dentry };
104455 + struct path path = { .mnt = mnt, .dentry = dentry };
104456 struct path_cond cond = { dentry->d_inode->i_uid,
104457 dentry->d_inode->i_mode
104458 };
104459 @@ -325,8 +325,8 @@ static int apparmor_path_rename(struct path *old_dir, struct dentry *old_dentry,
104460
104461 profile = aa_current_profile();
104462 if (!unconfined(profile)) {
104463 - struct path old_path = { old_dir->mnt, old_dentry };
104464 - struct path new_path = { new_dir->mnt, new_dentry };
104465 + struct path old_path = { .mnt = old_dir->mnt, .dentry = old_dentry };
104466 + struct path new_path = { .mnt = new_dir->mnt, .dentry = new_dentry };
104467 struct path_cond cond = { old_dentry->d_inode->i_uid,
104468 old_dentry->d_inode->i_mode
104469 };
104470 @@ -615,7 +615,7 @@ static int apparmor_task_setrlimit(struct task_struct *task,
104471 return error;
104472 }
104473
104474 -static struct security_operations apparmor_ops = {
104475 +static struct security_operations apparmor_ops __read_only = {
104476 .name = "apparmor",
104477
104478 .ptrace_access_check = apparmor_ptrace_access_check,
104479 diff --git a/security/commoncap.c b/security/commoncap.c
104480 index b9d613e..f68305c 100644
104481 --- a/security/commoncap.c
104482 +++ b/security/commoncap.c
104483 @@ -424,6 +424,32 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
104484 return 0;
104485 }
104486
104487 +/* returns:
104488 + 1 for suid privilege
104489 + 2 for sgid privilege
104490 + 3 for fscap privilege
104491 +*/
104492 +int is_privileged_binary(const struct dentry *dentry)
104493 +{
104494 + struct cpu_vfs_cap_data capdata;
104495 + struct inode *inode = dentry->d_inode;
104496 +
104497 + if (!inode || S_ISDIR(inode->i_mode))
104498 + return 0;
104499 +
104500 + if (inode->i_mode & S_ISUID)
104501 + return 1;
104502 + if ((inode->i_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))
104503 + return 2;
104504 +
104505 + if (!get_vfs_caps_from_disk(dentry, &capdata)) {
104506 + if (!cap_isclear(capdata.inheritable) || !cap_isclear(capdata.permitted))
104507 + return 3;
104508 + }
104509 +
104510 + return 0;
104511 +}
104512 +
104513 /*
104514 * Attempt to get the on-exec apply capability sets for an executable file from
104515 * its xattrs and, if present, apply them to the proposed credentials being
104516 @@ -592,6 +618,9 @@ int cap_bprm_secureexec(struct linux_binprm *bprm)
104517 const struct cred *cred = current_cred();
104518 kuid_t root_uid = make_kuid(cred->user_ns, 0);
104519
104520 + if (gr_acl_enable_at_secure())
104521 + return 1;
104522 +
104523 if (!uid_eq(cred->uid, root_uid)) {
104524 if (bprm->cap_effective)
104525 return 1;
104526 diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
104527 index f79fa8b..6161868 100644
104528 --- a/security/integrity/ima/ima.h
104529 +++ b/security/integrity/ima/ima.h
104530 @@ -118,8 +118,8 @@ int ima_init_template(void);
104531 extern spinlock_t ima_queue_lock;
104532
104533 struct ima_h_table {
104534 - atomic_long_t len; /* number of stored measurements in the list */
104535 - atomic_long_t violations;
104536 + atomic_long_unchecked_t len; /* number of stored measurements in the list */
104537 + atomic_long_unchecked_t violations;
104538 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
104539 };
104540 extern struct ima_h_table ima_htable;
104541 diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
104542 index c38bbce..f45133d 100644
104543 --- a/security/integrity/ima/ima_api.c
104544 +++ b/security/integrity/ima/ima_api.c
104545 @@ -137,7 +137,7 @@ void ima_add_violation(struct file *file, const unsigned char *filename,
104546 int result;
104547
104548 /* can overflow, only indicator */
104549 - atomic_long_inc(&ima_htable.violations);
104550 + atomic_long_inc_unchecked(&ima_htable.violations);
104551
104552 result = ima_alloc_init_template(NULL, file, filename,
104553 NULL, 0, &entry);
104554 diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
104555 index 468a3ba..9af5cae 100644
104556 --- a/security/integrity/ima/ima_fs.c
104557 +++ b/security/integrity/ima/ima_fs.c
104558 @@ -28,12 +28,12 @@
104559 static int valid_policy = 1;
104560 #define TMPBUFLEN 12
104561 static ssize_t ima_show_htable_value(char __user *buf, size_t count,
104562 - loff_t *ppos, atomic_long_t *val)
104563 + loff_t *ppos, atomic_long_unchecked_t *val)
104564 {
104565 char tmpbuf[TMPBUFLEN];
104566 ssize_t len;
104567
104568 - len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
104569 + len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
104570 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
104571 }
104572
104573 diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
104574 index d85e997..6992813 100644
104575 --- a/security/integrity/ima/ima_queue.c
104576 +++ b/security/integrity/ima/ima_queue.c
104577 @@ -80,7 +80,7 @@ static int ima_add_digest_entry(struct ima_template_entry *entry)
104578 INIT_LIST_HEAD(&qe->later);
104579 list_add_tail_rcu(&qe->later, &ima_measurements);
104580
104581 - atomic_long_inc(&ima_htable.len);
104582 + atomic_long_inc_unchecked(&ima_htable.len);
104583 key = ima_hash_key(entry->digest);
104584 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
104585 return 0;
104586 diff --git a/security/keys/compat.c b/security/keys/compat.c
104587 index bbd32c7..c60c927 100644
104588 --- a/security/keys/compat.c
104589 +++ b/security/keys/compat.c
104590 @@ -44,7 +44,7 @@ static long compat_keyctl_instantiate_key_iov(
104591 if (ret == 0)
104592 goto no_payload_free;
104593
104594 - ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
104595 + ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid);
104596 err:
104597 if (iov != iovstack)
104598 kfree(iov);
104599 diff --git a/security/keys/internal.h b/security/keys/internal.h
104600 index 80b2aac..bb7ee65 100644
104601 --- a/security/keys/internal.h
104602 +++ b/security/keys/internal.h
104603 @@ -253,7 +253,7 @@ extern long keyctl_instantiate_key_iov(key_serial_t,
104604 extern long keyctl_invalidate_key(key_serial_t);
104605
104606 extern long keyctl_instantiate_key_common(key_serial_t,
104607 - const struct iovec *,
104608 + const struct iovec __user *,
104609 unsigned, size_t, key_serial_t);
104610 #ifdef CONFIG_PERSISTENT_KEYRINGS
104611 extern long keyctl_get_persistent(uid_t, key_serial_t);
104612 diff --git a/security/keys/key.c b/security/keys/key.c
104613 index 6e21c11..9ed67ca 100644
104614 --- a/security/keys/key.c
104615 +++ b/security/keys/key.c
104616 @@ -285,7 +285,7 @@ struct key *key_alloc(struct key_type *type, const char *desc,
104617
104618 atomic_set(&key->usage, 1);
104619 init_rwsem(&key->sem);
104620 - lockdep_set_class(&key->sem, &type->lock_class);
104621 + lockdep_set_class(&key->sem, (struct lock_class_key *)&type->lock_class);
104622 key->index_key.type = type;
104623 key->user = user;
104624 key->quotalen = quotalen;
104625 @@ -1036,7 +1036,9 @@ int register_key_type(struct key_type *ktype)
104626 struct key_type *p;
104627 int ret;
104628
104629 - memset(&ktype->lock_class, 0, sizeof(ktype->lock_class));
104630 + pax_open_kernel();
104631 + memset((void *)&ktype->lock_class, 0, sizeof(ktype->lock_class));
104632 + pax_close_kernel();
104633
104634 ret = -EEXIST;
104635 down_write(&key_types_sem);
104636 @@ -1048,7 +1050,7 @@ int register_key_type(struct key_type *ktype)
104637 }
104638
104639 /* store the type */
104640 - list_add(&ktype->link, &key_types_list);
104641 + pax_list_add((struct list_head *)&ktype->link, &key_types_list);
104642
104643 pr_notice("Key type %s registered\n", ktype->name);
104644 ret = 0;
104645 @@ -1070,7 +1072,7 @@ EXPORT_SYMBOL(register_key_type);
104646 void unregister_key_type(struct key_type *ktype)
104647 {
104648 down_write(&key_types_sem);
104649 - list_del_init(&ktype->link);
104650 + pax_list_del_init((struct list_head *)&ktype->link);
104651 downgrade_write(&key_types_sem);
104652 key_gc_keytype(ktype);
104653 pr_notice("Key type %s unregistered\n", ktype->name);
104654 @@ -1088,10 +1090,10 @@ void __init key_init(void)
104655 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
104656
104657 /* add the special key types */
104658 - list_add_tail(&key_type_keyring.link, &key_types_list);
104659 - list_add_tail(&key_type_dead.link, &key_types_list);
104660 - list_add_tail(&key_type_user.link, &key_types_list);
104661 - list_add_tail(&key_type_logon.link, &key_types_list);
104662 + pax_list_add_tail((struct list_head *)&key_type_keyring.link, &key_types_list);
104663 + pax_list_add_tail((struct list_head *)&key_type_dead.link, &key_types_list);
104664 + pax_list_add_tail((struct list_head *)&key_type_user.link, &key_types_list);
104665 + pax_list_add_tail((struct list_head *)&key_type_logon.link, &key_types_list);
104666
104667 /* record the root user tracking */
104668 rb_link_node(&root_key_user.node,
104669 diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
104670 index cee72ce..e46074a 100644
104671 --- a/security/keys/keyctl.c
104672 +++ b/security/keys/keyctl.c
104673 @@ -987,7 +987,7 @@ static int keyctl_change_reqkey_auth(struct key *key)
104674 /*
104675 * Copy the iovec data from userspace
104676 */
104677 -static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
104678 +static long copy_from_user_iovec(void *buffer, const struct iovec __user *iov,
104679 unsigned ioc)
104680 {
104681 for (; ioc > 0; ioc--) {
104682 @@ -1009,7 +1009,7 @@ static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
104683 * If successful, 0 will be returned.
104684 */
104685 long keyctl_instantiate_key_common(key_serial_t id,
104686 - const struct iovec *payload_iov,
104687 + const struct iovec __user *payload_iov,
104688 unsigned ioc,
104689 size_t plen,
104690 key_serial_t ringid)
104691 @@ -1104,7 +1104,7 @@ long keyctl_instantiate_key(key_serial_t id,
104692 [0].iov_len = plen
104693 };
104694
104695 - return keyctl_instantiate_key_common(id, iov, 1, plen, ringid);
104696 + return keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, 1, plen, ringid);
104697 }
104698
104699 return keyctl_instantiate_key_common(id, NULL, 0, 0, ringid);
104700 @@ -1137,7 +1137,7 @@ long keyctl_instantiate_key_iov(key_serial_t id,
104701 if (ret == 0)
104702 goto no_payload_free;
104703
104704 - ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
104705 + ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid);
104706 err:
104707 if (iov != iovstack)
104708 kfree(iov);
104709 diff --git a/security/min_addr.c b/security/min_addr.c
104710 index f728728..6457a0c 100644
104711 --- a/security/min_addr.c
104712 +++ b/security/min_addr.c
104713 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
104714 */
104715 static void update_mmap_min_addr(void)
104716 {
104717 +#ifndef SPARC
104718 #ifdef CONFIG_LSM_MMAP_MIN_ADDR
104719 if (dac_mmap_min_addr > CONFIG_LSM_MMAP_MIN_ADDR)
104720 mmap_min_addr = dac_mmap_min_addr;
104721 @@ -22,6 +23,7 @@ static void update_mmap_min_addr(void)
104722 #else
104723 mmap_min_addr = dac_mmap_min_addr;
104724 #endif
104725 +#endif
104726 }
104727
104728 /*
104729 diff --git a/security/security.c b/security/security.c
104730 index 919cad9..2127be1 100644
104731 --- a/security/security.c
104732 +++ b/security/security.c
104733 @@ -33,8 +33,8 @@
104734 static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
104735 CONFIG_DEFAULT_SECURITY;
104736
104737 -static struct security_operations *security_ops;
104738 -static struct security_operations default_security_ops = {
104739 +struct security_operations *security_ops __read_only;
104740 +struct security_operations default_security_ops __read_only = {
104741 .name = "default",
104742 };
104743
104744 @@ -73,11 +73,6 @@ int __init security_init(void)
104745 return 0;
104746 }
104747
104748 -void reset_security_ops(void)
104749 -{
104750 - security_ops = &default_security_ops;
104751 -}
104752 -
104753 /* Save user chosen LSM */
104754 static int __init choose_lsm(char *str)
104755 {
104756 diff --git a/security/selinux/avc.c b/security/selinux/avc.c
104757 index fc3e662..7844c60 100644
104758 --- a/security/selinux/avc.c
104759 +++ b/security/selinux/avc.c
104760 @@ -59,7 +59,7 @@ struct avc_node {
104761 struct avc_cache {
104762 struct hlist_head slots[AVC_CACHE_SLOTS]; /* head for avc_node->list */
104763 spinlock_t slots_lock[AVC_CACHE_SLOTS]; /* lock for writes */
104764 - atomic_t lru_hint; /* LRU hint for reclaim scan */
104765 + atomic_unchecked_t lru_hint; /* LRU hint for reclaim scan */
104766 atomic_t active_nodes;
104767 u32 latest_notif; /* latest revocation notification */
104768 };
104769 @@ -167,7 +167,7 @@ void __init avc_init(void)
104770 spin_lock_init(&avc_cache.slots_lock[i]);
104771 }
104772 atomic_set(&avc_cache.active_nodes, 0);
104773 - atomic_set(&avc_cache.lru_hint, 0);
104774 + atomic_set_unchecked(&avc_cache.lru_hint, 0);
104775
104776 avc_node_cachep = kmem_cache_create("avc_node", sizeof(struct avc_node),
104777 0, SLAB_PANIC, NULL);
104778 @@ -242,7 +242,7 @@ static inline int avc_reclaim_node(void)
104779 spinlock_t *lock;
104780
104781 for (try = 0, ecx = 0; try < AVC_CACHE_SLOTS; try++) {
104782 - hvalue = atomic_inc_return(&avc_cache.lru_hint) & (AVC_CACHE_SLOTS - 1);
104783 + hvalue = atomic_inc_return_unchecked(&avc_cache.lru_hint) & (AVC_CACHE_SLOTS - 1);
104784 head = &avc_cache.slots[hvalue];
104785 lock = &avc_cache.slots_lock[hvalue];
104786
104787 diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
104788 index e294b86..eda45c55 100644
104789 --- a/security/selinux/hooks.c
104790 +++ b/security/selinux/hooks.c
104791 @@ -95,8 +95,6 @@
104792 #include "audit.h"
104793 #include "avc_ss.h"
104794
104795 -extern struct security_operations *security_ops;
104796 -
104797 /* SECMARK reference count */
104798 static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
104799
104800 @@ -5759,7 +5757,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
104801
104802 #endif
104803
104804 -static struct security_operations selinux_ops = {
104805 +static struct security_operations selinux_ops __read_only = {
104806 .name = "selinux",
104807
104808 .ptrace_access_check = selinux_ptrace_access_check,
104809 @@ -6112,6 +6110,9 @@ static void selinux_nf_ip_exit(void)
104810 #ifdef CONFIG_SECURITY_SELINUX_DISABLE
104811 static int selinux_disabled;
104812
104813 +extern struct security_operations *security_ops;
104814 +extern struct security_operations default_security_ops;
104815 +
104816 int selinux_disable(void)
104817 {
104818 if (ss_initialized) {
104819 @@ -6129,7 +6130,9 @@ int selinux_disable(void)
104820 selinux_disabled = 1;
104821 selinux_enabled = 0;
104822
104823 - reset_security_ops();
104824 + pax_open_kernel();
104825 + security_ops = &default_security_ops;
104826 + pax_close_kernel();
104827
104828 /* Try to destroy the avc node cache */
104829 avc_disable();
104830 diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
104831 index 9f05847..7933395 100644
104832 --- a/security/selinux/include/xfrm.h
104833 +++ b/security/selinux/include/xfrm.h
104834 @@ -46,7 +46,7 @@ static inline void selinux_xfrm_notify_policyload(void)
104835 {
104836 struct net *net;
104837
104838 - atomic_inc(&flow_cache_genid);
104839 + atomic_inc_unchecked(&flow_cache_genid);
104840 rtnl_lock();
104841 for_each_net(net)
104842 rt_genid_bump_all(net);
104843 diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
104844 index 14f52be..7352368 100644
104845 --- a/security/smack/smack_lsm.c
104846 +++ b/security/smack/smack_lsm.c
104847 @@ -3726,7 +3726,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
104848 return 0;
104849 }
104850
104851 -struct security_operations smack_ops = {
104852 +struct security_operations smack_ops __read_only = {
104853 .name = "smack",
104854
104855 .ptrace_access_check = smack_ptrace_access_check,
104856 diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c
104857 index 4003907..13a2b55 100644
104858 --- a/security/tomoyo/file.c
104859 +++ b/security/tomoyo/file.c
104860 @@ -692,7 +692,7 @@ int tomoyo_path_number_perm(const u8 type, struct path *path,
104861 {
104862 struct tomoyo_request_info r;
104863 struct tomoyo_obj_info obj = {
104864 - .path1 = *path,
104865 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
104866 };
104867 int error = -ENOMEM;
104868 struct tomoyo_path_info buf;
104869 @@ -740,7 +740,7 @@ int tomoyo_check_open_permission(struct tomoyo_domain_info *domain,
104870 struct tomoyo_path_info buf;
104871 struct tomoyo_request_info r;
104872 struct tomoyo_obj_info obj = {
104873 - .path1 = *path,
104874 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
104875 };
104876 int idx;
104877
104878 @@ -786,7 +786,7 @@ int tomoyo_path_perm(const u8 operation, struct path *path, const char *target)
104879 {
104880 struct tomoyo_request_info r;
104881 struct tomoyo_obj_info obj = {
104882 - .path1 = *path,
104883 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
104884 };
104885 int error;
104886 struct tomoyo_path_info buf;
104887 @@ -843,7 +843,7 @@ int tomoyo_mkdev_perm(const u8 operation, struct path *path,
104888 {
104889 struct tomoyo_request_info r;
104890 struct tomoyo_obj_info obj = {
104891 - .path1 = *path,
104892 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
104893 };
104894 int error = -ENOMEM;
104895 struct tomoyo_path_info buf;
104896 @@ -890,8 +890,8 @@ int tomoyo_path2_perm(const u8 operation, struct path *path1,
104897 struct tomoyo_path_info buf2;
104898 struct tomoyo_request_info r;
104899 struct tomoyo_obj_info obj = {
104900 - .path1 = *path1,
104901 - .path2 = *path2,
104902 + .path1 = { .mnt = path1->mnt, .dentry = path1->dentry },
104903 + .path2 = { .mnt = path2->mnt, .dentry = path2->dentry }
104904 };
104905 int idx;
104906
104907 diff --git a/security/tomoyo/mount.c b/security/tomoyo/mount.c
104908 index 390c646..f2f8db3 100644
104909 --- a/security/tomoyo/mount.c
104910 +++ b/security/tomoyo/mount.c
104911 @@ -118,6 +118,10 @@ static int tomoyo_mount_acl(struct tomoyo_request_info *r,
104912 type == tomoyo_mounts[TOMOYO_MOUNT_MOVE]) {
104913 need_dev = -1; /* dev_name is a directory */
104914 } else {
104915 + if (!capable(CAP_SYS_ADMIN)) {
104916 + error = -EPERM;
104917 + goto out;
104918 + }
104919 fstype = get_fs_type(type);
104920 if (!fstype) {
104921 error = -ENODEV;
104922 diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
104923 index f0b756e..8aa497b 100644
104924 --- a/security/tomoyo/tomoyo.c
104925 +++ b/security/tomoyo/tomoyo.c
104926 @@ -146,7 +146,7 @@ static int tomoyo_bprm_check_security(struct linux_binprm *bprm)
104927 */
104928 static int tomoyo_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)
104929 {
104930 - struct path path = { mnt, dentry };
104931 + struct path path = { .mnt = mnt, .dentry = dentry };
104932 return tomoyo_path_perm(TOMOYO_TYPE_GETATTR, &path, NULL);
104933 }
104934
104935 @@ -172,7 +172,7 @@ static int tomoyo_path_truncate(struct path *path)
104936 */
104937 static int tomoyo_path_unlink(struct path *parent, struct dentry *dentry)
104938 {
104939 - struct path path = { parent->mnt, dentry };
104940 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
104941 return tomoyo_path_perm(TOMOYO_TYPE_UNLINK, &path, NULL);
104942 }
104943
104944 @@ -188,7 +188,7 @@ static int tomoyo_path_unlink(struct path *parent, struct dentry *dentry)
104945 static int tomoyo_path_mkdir(struct path *parent, struct dentry *dentry,
104946 umode_t mode)
104947 {
104948 - struct path path = { parent->mnt, dentry };
104949 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
104950 return tomoyo_path_number_perm(TOMOYO_TYPE_MKDIR, &path,
104951 mode & S_IALLUGO);
104952 }
104953 @@ -203,7 +203,7 @@ static int tomoyo_path_mkdir(struct path *parent, struct dentry *dentry,
104954 */
104955 static int tomoyo_path_rmdir(struct path *parent, struct dentry *dentry)
104956 {
104957 - struct path path = { parent->mnt, dentry };
104958 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
104959 return tomoyo_path_perm(TOMOYO_TYPE_RMDIR, &path, NULL);
104960 }
104961
104962 @@ -219,7 +219,7 @@ static int tomoyo_path_rmdir(struct path *parent, struct dentry *dentry)
104963 static int tomoyo_path_symlink(struct path *parent, struct dentry *dentry,
104964 const char *old_name)
104965 {
104966 - struct path path = { parent->mnt, dentry };
104967 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
104968 return tomoyo_path_perm(TOMOYO_TYPE_SYMLINK, &path, old_name);
104969 }
104970
104971 @@ -236,7 +236,7 @@ static int tomoyo_path_symlink(struct path *parent, struct dentry *dentry,
104972 static int tomoyo_path_mknod(struct path *parent, struct dentry *dentry,
104973 umode_t mode, unsigned int dev)
104974 {
104975 - struct path path = { parent->mnt, dentry };
104976 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
104977 int type = TOMOYO_TYPE_CREATE;
104978 const unsigned int perm = mode & S_IALLUGO;
104979
104980 @@ -275,8 +275,8 @@ static int tomoyo_path_mknod(struct path *parent, struct dentry *dentry,
104981 static int tomoyo_path_link(struct dentry *old_dentry, struct path *new_dir,
104982 struct dentry *new_dentry)
104983 {
104984 - struct path path1 = { new_dir->mnt, old_dentry };
104985 - struct path path2 = { new_dir->mnt, new_dentry };
104986 + struct path path1 = { .mnt = new_dir->mnt, .dentry = old_dentry };
104987 + struct path path2 = { .mnt = new_dir->mnt, .dentry = new_dentry };
104988 return tomoyo_path2_perm(TOMOYO_TYPE_LINK, &path1, &path2);
104989 }
104990
104991 @@ -295,8 +295,8 @@ static int tomoyo_path_rename(struct path *old_parent,
104992 struct path *new_parent,
104993 struct dentry *new_dentry)
104994 {
104995 - struct path path1 = { old_parent->mnt, old_dentry };
104996 - struct path path2 = { new_parent->mnt, new_dentry };
104997 + struct path path1 = { .mnt = old_parent->mnt, .dentry = old_dentry };
104998 + struct path path2 = { .mnt = new_parent->mnt, .dentry = new_dentry };
104999 return tomoyo_path2_perm(TOMOYO_TYPE_RENAME, &path1, &path2);
105000 }
105001
105002 @@ -424,7 +424,7 @@ static int tomoyo_sb_mount(const char *dev_name, struct path *path,
105003 */
105004 static int tomoyo_sb_umount(struct vfsmount *mnt, int flags)
105005 {
105006 - struct path path = { mnt, mnt->mnt_root };
105007 + struct path path = { .mnt = mnt, .dentry = mnt->mnt_root };
105008 return tomoyo_path_perm(TOMOYO_TYPE_UMOUNT, &path, NULL);
105009 }
105010
105011 @@ -503,7 +503,7 @@ static int tomoyo_socket_sendmsg(struct socket *sock, struct msghdr *msg,
105012 * tomoyo_security_ops is a "struct security_operations" which is used for
105013 * registering TOMOYO.
105014 */
105015 -static struct security_operations tomoyo_security_ops = {
105016 +static struct security_operations tomoyo_security_ops __read_only = {
105017 .name = "tomoyo",
105018 .cred_alloc_blank = tomoyo_cred_alloc_blank,
105019 .cred_prepare = tomoyo_cred_prepare,
105020 diff --git a/security/yama/Kconfig b/security/yama/Kconfig
105021 index 20ef514..4182bed 100644
105022 --- a/security/yama/Kconfig
105023 +++ b/security/yama/Kconfig
105024 @@ -1,6 +1,6 @@
105025 config SECURITY_YAMA
105026 bool "Yama support"
105027 - depends on SECURITY
105028 + depends on SECURITY && !GRKERNSEC
105029 select SECURITYFS
105030 select SECURITY_PATH
105031 default n
105032 diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
105033 index 13c88fbc..f8c115e 100644
105034 --- a/security/yama/yama_lsm.c
105035 +++ b/security/yama/yama_lsm.c
105036 @@ -365,7 +365,7 @@ int yama_ptrace_traceme(struct task_struct *parent)
105037 }
105038
105039 #ifndef CONFIG_SECURITY_YAMA_STACKED
105040 -static struct security_operations yama_ops = {
105041 +static struct security_operations yama_ops __read_only = {
105042 .name = "yama",
105043
105044 .ptrace_access_check = yama_ptrace_access_check,
105045 @@ -376,28 +376,24 @@ static struct security_operations yama_ops = {
105046 #endif
105047
105048 #ifdef CONFIG_SYSCTL
105049 +static int zero __read_only;
105050 +static int max_scope __read_only = YAMA_SCOPE_NO_ATTACH;
105051 +
105052 static int yama_dointvec_minmax(struct ctl_table *table, int write,
105053 void __user *buffer, size_t *lenp, loff_t *ppos)
105054 {
105055 - int rc;
105056 + ctl_table_no_const yama_table;
105057
105058 if (write && !capable(CAP_SYS_PTRACE))
105059 return -EPERM;
105060
105061 - rc = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
105062 - if (rc)
105063 - return rc;
105064 -
105065 + yama_table = *table;
105066 /* Lock the max value if it ever gets set. */
105067 - if (write && *(int *)table->data == *(int *)table->extra2)
105068 - table->extra1 = table->extra2;
105069 -
105070 - return rc;
105071 + if (ptrace_scope == max_scope)
105072 + yama_table.extra1 = &max_scope;
105073 + return proc_dointvec_minmax(&yama_table, write, buffer, lenp, ppos);
105074 }
105075
105076 -static int zero;
105077 -static int max_scope = YAMA_SCOPE_NO_ATTACH;
105078 -
105079 struct ctl_path yama_sysctl_path[] = {
105080 { .procname = "kernel", },
105081 { .procname = "yama", },
105082 diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
105083 index 4cedc69..e59d8a3 100644
105084 --- a/sound/aoa/codecs/onyx.c
105085 +++ b/sound/aoa/codecs/onyx.c
105086 @@ -54,7 +54,7 @@ struct onyx {
105087 spdif_locked:1,
105088 analog_locked:1,
105089 original_mute:2;
105090 - int open_count;
105091 + local_t open_count;
105092 struct codec_info *codec_info;
105093
105094 /* mutex serializes concurrent access to the device
105095 @@ -753,7 +753,7 @@ static int onyx_open(struct codec_info_item *cii,
105096 struct onyx *onyx = cii->codec_data;
105097
105098 mutex_lock(&onyx->mutex);
105099 - onyx->open_count++;
105100 + local_inc(&onyx->open_count);
105101 mutex_unlock(&onyx->mutex);
105102
105103 return 0;
105104 @@ -765,8 +765,7 @@ static int onyx_close(struct codec_info_item *cii,
105105 struct onyx *onyx = cii->codec_data;
105106
105107 mutex_lock(&onyx->mutex);
105108 - onyx->open_count--;
105109 - if (!onyx->open_count)
105110 + if (local_dec_and_test(&onyx->open_count))
105111 onyx->spdif_locked = onyx->analog_locked = 0;
105112 mutex_unlock(&onyx->mutex);
105113
105114 diff --git a/sound/aoa/codecs/onyx.h b/sound/aoa/codecs/onyx.h
105115 index ffd2025..df062c9 100644
105116 --- a/sound/aoa/codecs/onyx.h
105117 +++ b/sound/aoa/codecs/onyx.h
105118 @@ -11,6 +11,7 @@
105119 #include <linux/i2c.h>
105120 #include <asm/pmac_low_i2c.h>
105121 #include <asm/prom.h>
105122 +#include <asm/local.h>
105123
105124 /* PCM3052 register definitions */
105125
105126 diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
105127 index 4c1cc51..16040040 100644
105128 --- a/sound/core/oss/pcm_oss.c
105129 +++ b/sound/core/oss/pcm_oss.c
105130 @@ -1189,10 +1189,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream, const
105131 if (in_kernel) {
105132 mm_segment_t fs;
105133 fs = snd_enter_user();
105134 - ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
105135 + ret = snd_pcm_lib_write(substream, (void __force_user *)ptr, frames);
105136 snd_leave_user(fs);
105137 } else {
105138 - ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
105139 + ret = snd_pcm_lib_write(substream, (void __force_user *)ptr, frames);
105140 }
105141 if (ret != -EPIPE && ret != -ESTRPIPE)
105142 break;
105143 @@ -1234,10 +1234,10 @@ snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, char *p
105144 if (in_kernel) {
105145 mm_segment_t fs;
105146 fs = snd_enter_user();
105147 - ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
105148 + ret = snd_pcm_lib_read(substream, (void __force_user *)ptr, frames);
105149 snd_leave_user(fs);
105150 } else {
105151 - ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
105152 + ret = snd_pcm_lib_read(substream, (void __force_user *)ptr, frames);
105153 }
105154 if (ret == -EPIPE) {
105155 if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
105156 @@ -1337,7 +1337,7 @@ static ssize_t snd_pcm_oss_write2(struct snd_pcm_substream *substream, const cha
105157 struct snd_pcm_plugin_channel *channels;
105158 size_t oss_frame_bytes = (runtime->oss.plugin_first->src_width * runtime->oss.plugin_first->src_format.channels) / 8;
105159 if (!in_kernel) {
105160 - if (copy_from_user(runtime->oss.buffer, (const char __force __user *)buf, bytes))
105161 + if (copy_from_user(runtime->oss.buffer, (const char __force_user *)buf, bytes))
105162 return -EFAULT;
105163 buf = runtime->oss.buffer;
105164 }
105165 @@ -1407,7 +1407,7 @@ static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const cha
105166 }
105167 } else {
105168 tmp = snd_pcm_oss_write2(substream,
105169 - (const char __force *)buf,
105170 + (const char __force_kernel *)buf,
105171 runtime->oss.period_bytes, 0);
105172 if (tmp <= 0)
105173 goto err;
105174 @@ -1433,7 +1433,7 @@ static ssize_t snd_pcm_oss_read2(struct snd_pcm_substream *substream, char *buf,
105175 struct snd_pcm_runtime *runtime = substream->runtime;
105176 snd_pcm_sframes_t frames, frames1;
105177 #ifdef CONFIG_SND_PCM_OSS_PLUGINS
105178 - char __user *final_dst = (char __force __user *)buf;
105179 + char __user *final_dst = (char __force_user *)buf;
105180 if (runtime->oss.plugin_first) {
105181 struct snd_pcm_plugin_channel *channels;
105182 size_t oss_frame_bytes = (runtime->oss.plugin_last->dst_width * runtime->oss.plugin_last->dst_format.channels) / 8;
105183 @@ -1495,7 +1495,7 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __use
105184 xfer += tmp;
105185 runtime->oss.buffer_used -= tmp;
105186 } else {
105187 - tmp = snd_pcm_oss_read2(substream, (char __force *)buf,
105188 + tmp = snd_pcm_oss_read2(substream, (char __force_kernel *)buf,
105189 runtime->oss.period_bytes, 0);
105190 if (tmp <= 0)
105191 goto err;
105192 @@ -1663,7 +1663,7 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file)
105193 size1);
105194 size1 /= runtime->channels; /* frames */
105195 fs = snd_enter_user();
105196 - snd_pcm_lib_write(substream, (void __force __user *)runtime->oss.buffer, size1);
105197 + snd_pcm_lib_write(substream, (void __force_user *)runtime->oss.buffer, size1);
105198 snd_leave_user(fs);
105199 }
105200 } else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
105201 diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
105202 index af49721..e85058e 100644
105203 --- a/sound/core/pcm_compat.c
105204 +++ b/sound/core/pcm_compat.c
105205 @@ -31,7 +31,7 @@ static int snd_pcm_ioctl_delay_compat(struct snd_pcm_substream *substream,
105206 int err;
105207
105208 fs = snd_enter_user();
105209 - err = snd_pcm_delay(substream, &delay);
105210 + err = snd_pcm_delay(substream, (snd_pcm_sframes_t __force_user *)&delay);
105211 snd_leave_user(fs);
105212 if (err < 0)
105213 return err;
105214 diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
105215 index 01a5e05..c6bb425 100644
105216 --- a/sound/core/pcm_native.c
105217 +++ b/sound/core/pcm_native.c
105218 @@ -2811,11 +2811,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
105219 switch (substream->stream) {
105220 case SNDRV_PCM_STREAM_PLAYBACK:
105221 result = snd_pcm_playback_ioctl1(NULL, substream, cmd,
105222 - (void __user *)arg);
105223 + (void __force_user *)arg);
105224 break;
105225 case SNDRV_PCM_STREAM_CAPTURE:
105226 result = snd_pcm_capture_ioctl1(NULL, substream, cmd,
105227 - (void __user *)arg);
105228 + (void __force_user *)arg);
105229 break;
105230 default:
105231 result = -EINVAL;
105232 diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c
105233 index 8d4d5e8..fdd0826 100644
105234 --- a/sound/core/seq/oss/seq_oss.c
105235 +++ b/sound/core/seq/oss/seq_oss.c
105236 @@ -75,8 +75,8 @@ static int __init alsa_seq_oss_init(void)
105237 {
105238 int rc;
105239 static struct snd_seq_dev_ops ops = {
105240 - snd_seq_oss_synth_register,
105241 - snd_seq_oss_synth_unregister,
105242 + .init_device = snd_seq_oss_synth_register,
105243 + .free_device = snd_seq_oss_synth_unregister,
105244 };
105245
105246 snd_seq_autoload_lock();
105247 diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
105248 index 040c60e..989a19a 100644
105249 --- a/sound/core/seq/seq_device.c
105250 +++ b/sound/core/seq/seq_device.c
105251 @@ -64,7 +64,7 @@ struct ops_list {
105252 int argsize; /* argument size */
105253
105254 /* operators */
105255 - struct snd_seq_dev_ops ops;
105256 + struct snd_seq_dev_ops *ops;
105257
105258 /* registered devices */
105259 struct list_head dev_list; /* list of devices */
105260 @@ -333,7 +333,7 @@ int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry,
105261
105262 mutex_lock(&ops->reg_mutex);
105263 /* copy driver operators */
105264 - ops->ops = *entry;
105265 + ops->ops = entry;
105266 ops->driver |= DRIVER_LOADED;
105267 ops->argsize = argsize;
105268
105269 @@ -463,7 +463,7 @@ static int init_device(struct snd_seq_device *dev, struct ops_list *ops)
105270 dev->name, ops->id, ops->argsize, dev->argsize);
105271 return -EINVAL;
105272 }
105273 - if (ops->ops.init_device(dev) >= 0) {
105274 + if (ops->ops->init_device(dev) >= 0) {
105275 dev->status = SNDRV_SEQ_DEVICE_REGISTERED;
105276 ops->num_init_devices++;
105277 } else {
105278 @@ -490,7 +490,7 @@ static int free_device(struct snd_seq_device *dev, struct ops_list *ops)
105279 dev->name, ops->id, ops->argsize, dev->argsize);
105280 return -EINVAL;
105281 }
105282 - if ((result = ops->ops.free_device(dev)) >= 0 || result == -ENXIO) {
105283 + if ((result = ops->ops->free_device(dev)) >= 0 || result == -ENXIO) {
105284 dev->status = SNDRV_SEQ_DEVICE_FREE;
105285 dev->driver_data = NULL;
105286 ops->num_init_devices--;
105287 diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
105288 index 64069db..3c6d392 100644
105289 --- a/sound/core/seq/seq_midi.c
105290 +++ b/sound/core/seq/seq_midi.c
105291 @@ -462,8 +462,8 @@ snd_seq_midisynth_unregister_port(struct snd_seq_device *dev)
105292 static int __init alsa_seq_midi_init(void)
105293 {
105294 static struct snd_seq_dev_ops ops = {
105295 - snd_seq_midisynth_register_port,
105296 - snd_seq_midisynth_unregister_port,
105297 + .init_device = snd_seq_midisynth_register_port,
105298 + .free_device = snd_seq_midisynth_unregister_port,
105299 };
105300 memset(&synths, 0, sizeof(synths));
105301 snd_seq_autoload_lock();
105302 diff --git a/sound/core/sound.c b/sound/core/sound.c
105303 index 437c25e..cd040ab 100644
105304 --- a/sound/core/sound.c
105305 +++ b/sound/core/sound.c
105306 @@ -86,7 +86,7 @@ static void snd_request_other(int minor)
105307 case SNDRV_MINOR_TIMER: str = "snd-timer"; break;
105308 default: return;
105309 }
105310 - request_module(str);
105311 + request_module("%s", str);
105312 }
105313
105314 #endif /* modular kernel */
105315 diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
105316 index 4e0dd22..7a1f32c 100644
105317 --- a/sound/drivers/mts64.c
105318 +++ b/sound/drivers/mts64.c
105319 @@ -29,6 +29,7 @@
105320 #include <sound/initval.h>
105321 #include <sound/rawmidi.h>
105322 #include <sound/control.h>
105323 +#include <asm/local.h>
105324
105325 #define CARD_NAME "Miditerminal 4140"
105326 #define DRIVER_NAME "MTS64"
105327 @@ -67,7 +68,7 @@ struct mts64 {
105328 struct pardevice *pardev;
105329 int pardev_claimed;
105330
105331 - int open_count;
105332 + local_t open_count;
105333 int current_midi_output_port;
105334 int current_midi_input_port;
105335 u8 mode[MTS64_NUM_INPUT_PORTS];
105336 @@ -697,7 +698,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
105337 {
105338 struct mts64 *mts = substream->rmidi->private_data;
105339
105340 - if (mts->open_count == 0) {
105341 + if (local_read(&mts->open_count) == 0) {
105342 /* We don't need a spinlock here, because this is just called
105343 if the device has not been opened before.
105344 So there aren't any IRQs from the device */
105345 @@ -705,7 +706,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
105346
105347 msleep(50);
105348 }
105349 - ++(mts->open_count);
105350 + local_inc(&mts->open_count);
105351
105352 return 0;
105353 }
105354 @@ -715,8 +716,7 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
105355 struct mts64 *mts = substream->rmidi->private_data;
105356 unsigned long flags;
105357
105358 - --(mts->open_count);
105359 - if (mts->open_count == 0) {
105360 + if (local_dec_return(&mts->open_count) == 0) {
105361 /* We need the spinlock_irqsave here because we can still
105362 have IRQs at this point */
105363 spin_lock_irqsave(&mts->lock, flags);
105364 @@ -725,8 +725,8 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
105365
105366 msleep(500);
105367
105368 - } else if (mts->open_count < 0)
105369 - mts->open_count = 0;
105370 + } else if (local_read(&mts->open_count) < 0)
105371 + local_set(&mts->open_count, 0);
105372
105373 return 0;
105374 }
105375 diff --git a/sound/drivers/opl3/opl3_seq.c b/sound/drivers/opl3/opl3_seq.c
105376 index 6839953..7a0f4b9 100644
105377 --- a/sound/drivers/opl3/opl3_seq.c
105378 +++ b/sound/drivers/opl3/opl3_seq.c
105379 @@ -281,8 +281,8 @@ static int __init alsa_opl3_seq_init(void)
105380 {
105381 static struct snd_seq_dev_ops ops =
105382 {
105383 - snd_opl3_seq_new_device,
105384 - snd_opl3_seq_delete_device
105385 + .init_device = snd_opl3_seq_new_device,
105386 + .free_device = snd_opl3_seq_delete_device
105387 };
105388
105389 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OPL3, &ops,
105390 diff --git a/sound/drivers/opl4/opl4_lib.c b/sound/drivers/opl4/opl4_lib.c
105391 index b953fb4..1999c01 100644
105392 --- a/sound/drivers/opl4/opl4_lib.c
105393 +++ b/sound/drivers/opl4/opl4_lib.c
105394 @@ -29,7 +29,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
105395 MODULE_DESCRIPTION("OPL4 driver");
105396 MODULE_LICENSE("GPL");
105397
105398 -static void inline snd_opl4_wait(struct snd_opl4 *opl4)
105399 +static inline void snd_opl4_wait(struct snd_opl4 *opl4)
105400 {
105401 int timeout = 10;
105402 while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
105403 diff --git a/sound/drivers/opl4/opl4_seq.c b/sound/drivers/opl4/opl4_seq.c
105404 index 9919769..d7de36c 100644
105405 --- a/sound/drivers/opl4/opl4_seq.c
105406 +++ b/sound/drivers/opl4/opl4_seq.c
105407 @@ -198,8 +198,8 @@ static int snd_opl4_seq_delete_device(struct snd_seq_device *dev)
105408 static int __init alsa_opl4_synth_init(void)
105409 {
105410 static struct snd_seq_dev_ops ops = {
105411 - snd_opl4_seq_new_device,
105412 - snd_opl4_seq_delete_device
105413 + .init_device = snd_opl4_seq_new_device,
105414 + .free_device = snd_opl4_seq_delete_device
105415 };
105416
105417 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OPL4, &ops,
105418 diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
105419 index 991018d..8984740 100644
105420 --- a/sound/drivers/portman2x4.c
105421 +++ b/sound/drivers/portman2x4.c
105422 @@ -48,6 +48,7 @@
105423 #include <sound/initval.h>
105424 #include <sound/rawmidi.h>
105425 #include <sound/control.h>
105426 +#include <asm/local.h>
105427
105428 #define CARD_NAME "Portman 2x4"
105429 #define DRIVER_NAME "portman"
105430 @@ -85,7 +86,7 @@ struct portman {
105431 struct pardevice *pardev;
105432 int pardev_claimed;
105433
105434 - int open_count;
105435 + local_t open_count;
105436 int mode[PORTMAN_NUM_INPUT_PORTS];
105437 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
105438 };
105439 diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c
105440 index 9048777..2d8b1fc 100644
105441 --- a/sound/firewire/amdtp.c
105442 +++ b/sound/firewire/amdtp.c
105443 @@ -488,7 +488,7 @@ static void queue_out_packet(struct amdtp_out_stream *s, unsigned int cycle)
105444 ptr = s->pcm_buffer_pointer + data_blocks;
105445 if (ptr >= pcm->runtime->buffer_size)
105446 ptr -= pcm->runtime->buffer_size;
105447 - ACCESS_ONCE(s->pcm_buffer_pointer) = ptr;
105448 + ACCESS_ONCE_RW(s->pcm_buffer_pointer) = ptr;
105449
105450 s->pcm_period_pointer += data_blocks;
105451 if (s->pcm_period_pointer >= pcm->runtime->period_size) {
105452 @@ -655,7 +655,7 @@ EXPORT_SYMBOL(amdtp_out_stream_pcm_pointer);
105453 */
105454 void amdtp_out_stream_update(struct amdtp_out_stream *s)
105455 {
105456 - ACCESS_ONCE(s->source_node_id_field) =
105457 + ACCESS_ONCE_RW(s->source_node_id_field) =
105458 (fw_parent_device(s->unit)->card->node_id & 0x3f) << 24;
105459 }
105460 EXPORT_SYMBOL(amdtp_out_stream_update);
105461 diff --git a/sound/firewire/amdtp.h b/sound/firewire/amdtp.h
105462 index 2746ecd..c35dedd 100644
105463 --- a/sound/firewire/amdtp.h
105464 +++ b/sound/firewire/amdtp.h
105465 @@ -135,7 +135,7 @@ static inline bool amdtp_out_streaming_error(struct amdtp_out_stream *s)
105466 static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream *s,
105467 struct snd_pcm_substream *pcm)
105468 {
105469 - ACCESS_ONCE(s->pcm) = pcm;
105470 + ACCESS_ONCE_RW(s->pcm) = pcm;
105471 }
105472
105473 static inline bool cip_sfc_is_base_44100(enum cip_sfc sfc)
105474 diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
105475 index fd42e6b..c041971 100644
105476 --- a/sound/firewire/isight.c
105477 +++ b/sound/firewire/isight.c
105478 @@ -96,7 +96,7 @@ static void isight_update_pointers(struct isight *isight, unsigned int count)
105479 ptr += count;
105480 if (ptr >= runtime->buffer_size)
105481 ptr -= runtime->buffer_size;
105482 - ACCESS_ONCE(isight->buffer_pointer) = ptr;
105483 + ACCESS_ONCE_RW(isight->buffer_pointer) = ptr;
105484
105485 isight->period_counter += count;
105486 if (isight->period_counter >= runtime->period_size) {
105487 @@ -299,7 +299,7 @@ static int isight_hw_params(struct snd_pcm_substream *substream,
105488 if (err < 0)
105489 return err;
105490
105491 - ACCESS_ONCE(isight->pcm_active) = true;
105492 + ACCESS_ONCE_RW(isight->pcm_active) = true;
105493
105494 return 0;
105495 }
105496 @@ -337,7 +337,7 @@ static int isight_hw_free(struct snd_pcm_substream *substream)
105497 {
105498 struct isight *isight = substream->private_data;
105499
105500 - ACCESS_ONCE(isight->pcm_active) = false;
105501 + ACCESS_ONCE_RW(isight->pcm_active) = false;
105502
105503 mutex_lock(&isight->mutex);
105504 isight_stop_streaming(isight);
105505 @@ -430,10 +430,10 @@ static int isight_trigger(struct snd_pcm_substream *substream, int cmd)
105506
105507 switch (cmd) {
105508 case SNDRV_PCM_TRIGGER_START:
105509 - ACCESS_ONCE(isight->pcm_running) = true;
105510 + ACCESS_ONCE_RW(isight->pcm_running) = true;
105511 break;
105512 case SNDRV_PCM_TRIGGER_STOP:
105513 - ACCESS_ONCE(isight->pcm_running) = false;
105514 + ACCESS_ONCE_RW(isight->pcm_running) = false;
105515 break;
105516 default:
105517 return -EINVAL;
105518 diff --git a/sound/firewire/scs1x.c b/sound/firewire/scs1x.c
105519 index 858023c..83b3d3c 100644
105520 --- a/sound/firewire/scs1x.c
105521 +++ b/sound/firewire/scs1x.c
105522 @@ -74,7 +74,7 @@ static void scs_output_trigger(struct snd_rawmidi_substream *stream, int up)
105523 {
105524 struct scs *scs = stream->rmidi->private_data;
105525
105526 - ACCESS_ONCE(scs->output) = up ? stream : NULL;
105527 + ACCESS_ONCE_RW(scs->output) = up ? stream : NULL;
105528 if (up) {
105529 scs->output_idle = false;
105530 tasklet_schedule(&scs->tasklet);
105531 @@ -257,7 +257,7 @@ static void scs_input_trigger(struct snd_rawmidi_substream *stream, int up)
105532 {
105533 struct scs *scs = stream->rmidi->private_data;
105534
105535 - ACCESS_ONCE(scs->input) = up ? stream : NULL;
105536 + ACCESS_ONCE_RW(scs->input) = up ? stream : NULL;
105537 }
105538
105539 static void scs_input_escaped_byte(struct snd_rawmidi_substream *stream,
105540 @@ -473,8 +473,8 @@ static void scs_remove(struct fw_unit *unit)
105541
105542 snd_card_disconnect(scs->card);
105543
105544 - ACCESS_ONCE(scs->output) = NULL;
105545 - ACCESS_ONCE(scs->input) = NULL;
105546 + ACCESS_ONCE_RW(scs->output) = NULL;
105547 + ACCESS_ONCE_RW(scs->input) = NULL;
105548
105549 wait_event(scs->idle_wait, scs->output_idle);
105550
105551 diff --git a/sound/isa/sb/emu8000_synth.c b/sound/isa/sb/emu8000_synth.c
105552 index 4e3fcfb..ab45a9d 100644
105553 --- a/sound/isa/sb/emu8000_synth.c
105554 +++ b/sound/isa/sb/emu8000_synth.c
105555 @@ -120,8 +120,8 @@ static int __init alsa_emu8000_init(void)
105556 {
105557
105558 static struct snd_seq_dev_ops ops = {
105559 - snd_emu8000_new_device,
105560 - snd_emu8000_delete_device,
105561 + .init_device = snd_emu8000_new_device,
105562 + .free_device = snd_emu8000_delete_device,
105563 };
105564 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU8000, &ops,
105565 sizeof(struct snd_emu8000*));
105566 diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
105567 index 048439a..3be9f6f 100644
105568 --- a/sound/oss/sb_audio.c
105569 +++ b/sound/oss/sb_audio.c
105570 @@ -904,7 +904,7 @@ sb16_copy_from_user(int dev,
105571 buf16 = (signed short *)(localbuf + localoffs);
105572 while (c)
105573 {
105574 - locallen = (c >= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);
105575 + locallen = ((unsigned)c >= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);
105576 if (copy_from_user(lbuf8,
105577 userbuf+useroffs + p,
105578 locallen))
105579 diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
105580 index f851fd0..92576fb 100644
105581 --- a/sound/oss/swarm_cs4297a.c
105582 +++ b/sound/oss/swarm_cs4297a.c
105583 @@ -2623,7 +2623,6 @@ static int __init cs4297a_init(void)
105584 {
105585 struct cs4297a_state *s;
105586 u32 pwr, id;
105587 - mm_segment_t fs;
105588 int rval;
105589 #ifndef CONFIG_BCM_CS4297A_CSWARM
105590 u64 cfg;
105591 @@ -2713,22 +2712,23 @@ static int __init cs4297a_init(void)
105592 if (!rval) {
105593 char *sb1250_duart_present;
105594
105595 +#if 0
105596 + mm_segment_t fs;
105597 fs = get_fs();
105598 set_fs(KERNEL_DS);
105599 -#if 0
105600 val = SOUND_MASK_LINE;
105601 mixer_ioctl(s, SOUND_MIXER_WRITE_RECSRC, (unsigned long) &val);
105602 for (i = 0; i < ARRAY_SIZE(initvol); i++) {
105603 val = initvol[i].vol;
105604 mixer_ioctl(s, initvol[i].mixch, (unsigned long) &val);
105605 }
105606 + set_fs(fs);
105607 // cs4297a_write_ac97(s, 0x18, 0x0808);
105608 #else
105609 // cs4297a_write_ac97(s, 0x5e, 0x180);
105610 cs4297a_write_ac97(s, 0x02, 0x0808);
105611 cs4297a_write_ac97(s, 0x18, 0x0808);
105612 #endif
105613 - set_fs(fs);
105614
105615 list_add(&s->list, &cs4297a_devs);
105616
105617 diff --git a/sound/pci/emu10k1/emu10k1_synth.c b/sound/pci/emu10k1/emu10k1_synth.c
105618 index 4c41c90..37f3631 100644
105619 --- a/sound/pci/emu10k1/emu10k1_synth.c
105620 +++ b/sound/pci/emu10k1/emu10k1_synth.c
105621 @@ -108,8 +108,8 @@ static int __init alsa_emu10k1_synth_init(void)
105622 {
105623
105624 static struct snd_seq_dev_ops ops = {
105625 - snd_emu10k1_synth_new_device,
105626 - snd_emu10k1_synth_delete_device,
105627 + .init_device = snd_emu10k1_synth_new_device,
105628 + .free_device = snd_emu10k1_synth_delete_device,
105629 };
105630 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, &ops,
105631 sizeof(struct snd_emu10k1_synth_arg));
105632 diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
105633 index dafcf82..dd9356f 100644
105634 --- a/sound/pci/hda/hda_codec.c
105635 +++ b/sound/pci/hda/hda_codec.c
105636 @@ -983,14 +983,10 @@ find_codec_preset(struct hda_codec *codec)
105637 mutex_unlock(&preset_mutex);
105638
105639 if (mod_requested < HDA_MODREQ_MAX_COUNT) {
105640 - char name[32];
105641 if (!mod_requested)
105642 - snprintf(name, sizeof(name), "snd-hda-codec-id:%08x",
105643 - codec->vendor_id);
105644 + request_module("snd-hda-codec-id:%08x", codec->vendor_id);
105645 else
105646 - snprintf(name, sizeof(name), "snd-hda-codec-id:%04x*",
105647 - (codec->vendor_id >> 16) & 0xffff);
105648 - request_module(name);
105649 + request_module("snd-hda-codec-id:%04x*", (codec->vendor_id >> 16) & 0xffff);
105650 mod_requested++;
105651 goto again;
105652 }
105653 @@ -2739,7 +2735,7 @@ static int get_kctl_0dB_offset(struct snd_kcontrol *kctl, int *step_to_check)
105654 /* FIXME: set_fs() hack for obtaining user-space TLV data */
105655 mm_segment_t fs = get_fs();
105656 set_fs(get_ds());
105657 - if (!kctl->tlv.c(kctl, 0, sizeof(_tlv), _tlv))
105658 + if (!kctl->tlv.c(kctl, 0, sizeof(_tlv), (unsigned int __force_user *)_tlv))
105659 tlv = _tlv;
105660 set_fs(fs);
105661 } else if (kctl->vd[0].access & SNDRV_CTL_ELEM_ACCESS_TLV_READ)
105662 diff --git a/sound/pci/ymfpci/ymfpci.h b/sound/pci/ymfpci/ymfpci.h
105663 index 4631a23..001ae57 100644
105664 --- a/sound/pci/ymfpci/ymfpci.h
105665 +++ b/sound/pci/ymfpci/ymfpci.h
105666 @@ -358,7 +358,7 @@ struct snd_ymfpci {
105667 spinlock_t reg_lock;
105668 spinlock_t voice_lock;
105669 wait_queue_head_t interrupt_sleep;
105670 - atomic_t interrupt_sleep_count;
105671 + atomic_unchecked_t interrupt_sleep_count;
105672 struct snd_info_entry *proc_entry;
105673 const struct firmware *dsp_microcode;
105674 const struct firmware *controller_microcode;
105675 diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
105676 index d591c15..8cb8f94 100644
105677 --- a/sound/pci/ymfpci/ymfpci_main.c
105678 +++ b/sound/pci/ymfpci/ymfpci_main.c
105679 @@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct snd_ymfpci *chip)
105680 if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
105681 break;
105682 }
105683 - if (atomic_read(&chip->interrupt_sleep_count)) {
105684 - atomic_set(&chip->interrupt_sleep_count, 0);
105685 + if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
105686 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
105687 wake_up(&chip->interrupt_sleep);
105688 }
105689 __end:
105690 @@ -787,7 +787,7 @@ static void snd_ymfpci_irq_wait(struct snd_ymfpci *chip)
105691 continue;
105692 init_waitqueue_entry(&wait, current);
105693 add_wait_queue(&chip->interrupt_sleep, &wait);
105694 - atomic_inc(&chip->interrupt_sleep_count);
105695 + atomic_inc_unchecked(&chip->interrupt_sleep_count);
105696 schedule_timeout_uninterruptible(msecs_to_jiffies(50));
105697 remove_wait_queue(&chip->interrupt_sleep, &wait);
105698 }
105699 @@ -825,8 +825,8 @@ static irqreturn_t snd_ymfpci_interrupt(int irq, void *dev_id)
105700 snd_ymfpci_writel(chip, YDSXGR_MODE, mode);
105701 spin_unlock(&chip->reg_lock);
105702
105703 - if (atomic_read(&chip->interrupt_sleep_count)) {
105704 - atomic_set(&chip->interrupt_sleep_count, 0);
105705 + if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
105706 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
105707 wake_up(&chip->interrupt_sleep);
105708 }
105709 }
105710 @@ -2421,7 +2421,7 @@ int snd_ymfpci_create(struct snd_card *card,
105711 spin_lock_init(&chip->reg_lock);
105712 spin_lock_init(&chip->voice_lock);
105713 init_waitqueue_head(&chip->interrupt_sleep);
105714 - atomic_set(&chip->interrupt_sleep_count, 0);
105715 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
105716 chip->card = card;
105717 chip->pci = pci;
105718 chip->irq = -1;
105719 diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
105720 index 5428a1f..474f651 100644
105721 --- a/sound/soc/fsl/fsl_ssi.c
105722 +++ b/sound/soc/fsl/fsl_ssi.c
105723 @@ -1255,7 +1255,6 @@ static int fsl_ssi_probe(struct platform_device *pdev)
105724 {
105725 struct fsl_ssi_private *ssi_private;
105726 int ret = 0;
105727 - struct device_attribute *dev_attr = NULL;
105728 struct device_node *np = pdev->dev.of_node;
105729 const struct of_device_id *of_id;
105730 enum fsl_ssi_type hw_type;
105731 @@ -1481,7 +1480,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
105732 &ssi_private->cpu_dai_drv, 1);
105733 if (ret) {
105734 dev_err(&pdev->dev, "failed to register DAI: %d\n", ret);
105735 - goto error_dev;
105736 + goto error_clk;
105737 }
105738
105739 ret = fsl_ssi_debugfs_create(ssi_private, &pdev->dev);
105740 @@ -1562,9 +1561,6 @@ error_pcm:
105741 error_dbgfs:
105742 snd_soc_unregister_component(&pdev->dev);
105743
105744 -error_dev:
105745 - device_remove_file(&pdev->dev, dev_attr);
105746 -
105747 error_clk:
105748 if (ssi_private->ssi_on_imx) {
105749 if (!IS_ERR(ssi_private->baudclk))
105750 diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
105751 index fe1df50..09d3be6 100644
105752 --- a/sound/soc/soc-core.c
105753 +++ b/sound/soc/soc-core.c
105754 @@ -2254,8 +2254,10 @@ int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops,
105755 if (ret)
105756 return ret;
105757
105758 - ops->warm_reset = snd_soc_ac97_warm_reset;
105759 - ops->reset = snd_soc_ac97_reset;
105760 + pax_open_kernel();
105761 + *(void **)&ops->warm_reset = snd_soc_ac97_warm_reset;
105762 + *(void **)&ops->reset = snd_soc_ac97_reset;
105763 + pax_close_kernel();
105764
105765 snd_ac97_rst_cfg = cfg;
105766 return 0;
105767 diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c
105768 index 7778b8e..3d619fc 100644
105769 --- a/sound/synth/emux/emux_seq.c
105770 +++ b/sound/synth/emux/emux_seq.c
105771 @@ -33,13 +33,13 @@ static int snd_emux_unuse(void *private_data, struct snd_seq_port_subscribe *inf
105772 * MIDI emulation operators
105773 */
105774 static struct snd_midi_op emux_ops = {
105775 - snd_emux_note_on,
105776 - snd_emux_note_off,
105777 - snd_emux_key_press,
105778 - snd_emux_terminate_note,
105779 - snd_emux_control,
105780 - snd_emux_nrpn,
105781 - snd_emux_sysex,
105782 + .note_on = snd_emux_note_on,
105783 + .note_off = snd_emux_note_off,
105784 + .key_press = snd_emux_key_press,
105785 + .note_terminate = snd_emux_terminate_note,
105786 + .control = snd_emux_control,
105787 + .nrpn = snd_emux_nrpn,
105788 + .sysex = snd_emux_sysex,
105789 };
105790
105791
105792 diff --git a/tools/gcc/.gitignore b/tools/gcc/.gitignore
105793 new file mode 100644
105794 index 0000000..1f0214f
105795 --- /dev/null
105796 +++ b/tools/gcc/.gitignore
105797 @@ -0,0 +1,3 @@
105798 +randomize_layout_seed.h
105799 +size_overflow_hash.h
105800 +size_overflow_hash_aux.h
105801 diff --git a/tools/gcc/Makefile b/tools/gcc/Makefile
105802 new file mode 100644
105803 index 0000000..5ca9688
105804 --- /dev/null
105805 +++ b/tools/gcc/Makefile
105806 @@ -0,0 +1,62 @@
105807 +#CC := gcc
105808 +#PLUGIN_SOURCE_FILES := pax_plugin.c
105809 +#PLUGIN_OBJECT_FILES := $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES))
105810 +GCCPLUGINS_DIR := $(shell $(CC) -print-file-name=plugin)
105811 +#CFLAGS += -I$(GCCPLUGINS_DIR)/include -fPIC -O2 -Wall -W -std=gnu99
105812 +
105813 +ifeq ($(PLUGINCC),$(HOSTCC))
105814 +HOSTLIBS := hostlibs
105815 +HOST_EXTRACFLAGS += -I$(GCCPLUGINS_DIR)/include -std=gnu99 -ggdb
105816 +else
105817 +HOSTLIBS := hostcxxlibs
105818 +HOST_EXTRACXXFLAGS += -I$(GCCPLUGINS_DIR)/include -std=gnu++98 -fno-rtti -ggdb -Wno-unused-parameter -Wno-narrowing
105819 +endif
105820 +
105821 +$(HOSTLIBS)-$(CONFIG_PAX_CONSTIFY_PLUGIN) := constify_plugin.so
105822 +$(HOSTLIBS)-$(CONFIG_PAX_MEMORY_STACKLEAK) += stackleak_plugin.so
105823 +$(HOSTLIBS)-$(CONFIG_KALLOCSTAT_PLUGIN) += kallocstat_plugin.so
105824 +$(HOSTLIBS)-$(CONFIG_PAX_KERNEXEC_PLUGIN) += kernexec_plugin.so
105825 +$(HOSTLIBS)-$(CONFIG_CHECKER_PLUGIN) += checker_plugin.so
105826 +$(HOSTLIBS)-y += colorize_plugin.so
105827 +$(HOSTLIBS)-$(CONFIG_PAX_SIZE_OVERFLOW) += size_overflow_plugin.so
105828 +$(HOSTLIBS)-$(CONFIG_PAX_LATENT_ENTROPY) += latent_entropy_plugin.so
105829 +$(HOSTLIBS)-$(CONFIG_PAX_MEMORY_STRUCTLEAK) += structleak_plugin.so
105830 +$(HOSTLIBS)-$(CONFIG_GRKERNSEC_RANDSTRUCT) += randomize_layout_plugin.so
105831 +
105832 +always := $($(HOSTLIBS)-y)
105833 +
105834 +constify_plugin-objs := constify_plugin.o
105835 +stackleak_plugin-objs := stackleak_plugin.o
105836 +kallocstat_plugin-objs := kallocstat_plugin.o
105837 +kernexec_plugin-objs := kernexec_plugin.o
105838 +checker_plugin-objs := checker_plugin.o
105839 +colorize_plugin-objs := colorize_plugin.o
105840 +size_overflow_plugin-objs := size_overflow_plugin.o
105841 +latent_entropy_plugin-objs := latent_entropy_plugin.o
105842 +structleak_plugin-objs := structleak_plugin.o
105843 +randomize_layout_plugin-objs := randomize_layout_plugin.o
105844 +
105845 +$(obj)/size_overflow_plugin.o: $(objtree)/$(obj)/size_overflow_hash.h $(objtree)/$(obj)/size_overflow_hash_aux.h
105846 +$(obj)/randomize_layout_plugin.o: $(objtree)/$(obj)/randomize_layout_seed.h
105847 +
105848 +quiet_cmd_build_size_overflow_hash = GENHASH $@
105849 + cmd_build_size_overflow_hash = \
105850 + $(CONFIG_SHELL) $(srctree)/$(src)/generate_size_overflow_hash.sh -s size_overflow_hash -d $< -o $@
105851 +$(objtree)/$(obj)/size_overflow_hash.h: $(src)/size_overflow_hash.data FORCE
105852 + $(call if_changed,build_size_overflow_hash)
105853 +
105854 +quiet_cmd_build_size_overflow_hash_aux = GENHASH $@
105855 + cmd_build_size_overflow_hash_aux = \
105856 + $(CONFIG_SHELL) $(srctree)/$(src)/generate_size_overflow_hash.sh -s size_overflow_hash_aux -d $< -o $@
105857 +$(objtree)/$(obj)/size_overflow_hash_aux.h: $(src)/size_overflow_hash_aux.data FORCE
105858 + $(call if_changed,build_size_overflow_hash_aux)
105859 +
105860 +targets += size_overflow_hash.h size_overflow_hash_aux.h
105861 +
105862 +quiet_cmd_create_randomize_layout_seed = GENSEED $@
105863 + cmd_create_randomize_layout_seed = \
105864 + $(CONFIG_SHELL) $(srctree)/$(src)/gen-random-seed.sh $@ $(objtree)/include/generated/randomize_layout_hash.h
105865 +$(objtree)/$(obj)/randomize_layout_seed.h: FORCE
105866 + $(call if_changed,create_randomize_layout_seed)
105867 +
105868 +targets += size_overflow_hash.h randomize_layout_seed.h randomize_layout_hash.h
105869 diff --git a/tools/gcc/checker_plugin.c b/tools/gcc/checker_plugin.c
105870 new file mode 100644
105871 index 0000000..5452feea
105872 --- /dev/null
105873 +++ b/tools/gcc/checker_plugin.c
105874 @@ -0,0 +1,150 @@
105875 +/*
105876 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
105877 + * Licensed under the GPL v2
105878 + *
105879 + * Note: the choice of the license means that the compilation process is
105880 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
105881 + * but for the kernel it doesn't matter since it doesn't link against
105882 + * any of the gcc libraries
105883 + *
105884 + * gcc plugin to implement various sparse (source code checker) features
105885 + *
105886 + * TODO:
105887 + * - define separate __iomem, __percpu and __rcu address spaces (lots of code to patch)
105888 + *
105889 + * BUGS:
105890 + * - none known
105891 + */
105892 +
105893 +#include "gcc-common.h"
105894 +
105895 +extern void c_register_addr_space (const char *str, addr_space_t as);
105896 +extern enum machine_mode default_addr_space_pointer_mode (addr_space_t);
105897 +extern enum machine_mode default_addr_space_address_mode (addr_space_t);
105898 +extern bool default_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as);
105899 +extern bool default_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as);
105900 +extern rtx default_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as);
105901 +
105902 +int plugin_is_GPL_compatible;
105903 +
105904 +static struct plugin_info checker_plugin_info = {
105905 + .version = "201304082245",
105906 + .help = NULL,
105907 +};
105908 +
105909 +#define ADDR_SPACE_KERNEL 0
105910 +#define ADDR_SPACE_FORCE_KERNEL 1
105911 +#define ADDR_SPACE_USER 2
105912 +#define ADDR_SPACE_FORCE_USER 3
105913 +#define ADDR_SPACE_IOMEM 0
105914 +#define ADDR_SPACE_FORCE_IOMEM 0
105915 +#define ADDR_SPACE_PERCPU 0
105916 +#define ADDR_SPACE_FORCE_PERCPU 0
105917 +#define ADDR_SPACE_RCU 0
105918 +#define ADDR_SPACE_FORCE_RCU 0
105919 +
105920 +static enum machine_mode checker_addr_space_pointer_mode(addr_space_t addrspace)
105921 +{
105922 + return default_addr_space_pointer_mode(ADDR_SPACE_GENERIC);
105923 +}
105924 +
105925 +static enum machine_mode checker_addr_space_address_mode(addr_space_t addrspace)
105926 +{
105927 + return default_addr_space_address_mode(ADDR_SPACE_GENERIC);
105928 +}
105929 +
105930 +static bool checker_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as)
105931 +{
105932 + return default_addr_space_valid_pointer_mode(mode, as);
105933 +}
105934 +
105935 +static bool checker_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as)
105936 +{
105937 + return default_addr_space_legitimate_address_p(mode, mem, strict, ADDR_SPACE_GENERIC);
105938 +}
105939 +
105940 +static rtx checker_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as)
105941 +{
105942 + return default_addr_space_legitimize_address(x, oldx, mode, as);
105943 +}
105944 +
105945 +static bool checker_addr_space_subset_p(addr_space_t subset, addr_space_t superset)
105946 +{
105947 + if (subset == ADDR_SPACE_FORCE_KERNEL && superset == ADDR_SPACE_KERNEL)
105948 + return true;
105949 +
105950 + if (subset == ADDR_SPACE_FORCE_USER && superset == ADDR_SPACE_USER)
105951 + return true;
105952 +
105953 + if (subset == ADDR_SPACE_FORCE_IOMEM && superset == ADDR_SPACE_IOMEM)
105954 + return true;
105955 +
105956 + if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_USER)
105957 + return true;
105958 +
105959 + if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_IOMEM)
105960 + return true;
105961 +
105962 + if (subset == ADDR_SPACE_USER && superset == ADDR_SPACE_FORCE_KERNEL)
105963 + return true;
105964 +
105965 + if (subset == ADDR_SPACE_IOMEM && superset == ADDR_SPACE_FORCE_KERNEL)
105966 + return true;
105967 +
105968 + return subset == superset;
105969 +}
105970 +
105971 +static rtx checker_addr_space_convert(rtx op, tree from_type, tree to_type)
105972 +{
105973 +// addr_space_t from_as = TYPE_ADDR_SPACE(TREE_TYPE(from_type));
105974 +// addr_space_t to_as = TYPE_ADDR_SPACE(TREE_TYPE(to_type));
105975 +
105976 + return op;
105977 +}
105978 +
105979 +static void register_checker_address_spaces(void *event_data, void *data)
105980 +{
105981 + c_register_addr_space("__kernel", ADDR_SPACE_KERNEL);
105982 + c_register_addr_space("__force_kernel", ADDR_SPACE_FORCE_KERNEL);
105983 + c_register_addr_space("__user", ADDR_SPACE_USER);
105984 + c_register_addr_space("__force_user", ADDR_SPACE_FORCE_USER);
105985 +// c_register_addr_space("__iomem", ADDR_SPACE_IOMEM);
105986 +// c_register_addr_space("__force_iomem", ADDR_SPACE_FORCE_IOMEM);
105987 +// c_register_addr_space("__percpu", ADDR_SPACE_PERCPU);
105988 +// c_register_addr_space("__force_percpu", ADDR_SPACE_FORCE_PERCPU);
105989 +// c_register_addr_space("__rcu", ADDR_SPACE_RCU);
105990 +// c_register_addr_space("__force_rcu", ADDR_SPACE_FORCE_RCU);
105991 +
105992 + targetm.addr_space.pointer_mode = checker_addr_space_pointer_mode;
105993 + targetm.addr_space.address_mode = checker_addr_space_address_mode;
105994 + targetm.addr_space.valid_pointer_mode = checker_addr_space_valid_pointer_mode;
105995 + targetm.addr_space.legitimate_address_p = checker_addr_space_legitimate_address_p;
105996 +// targetm.addr_space.legitimize_address = checker_addr_space_legitimize_address;
105997 + targetm.addr_space.subset_p = checker_addr_space_subset_p;
105998 + targetm.addr_space.convert = checker_addr_space_convert;
105999 +}
106000 +
106001 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
106002 +{
106003 + const char * const plugin_name = plugin_info->base_name;
106004 + const int argc = plugin_info->argc;
106005 + const struct plugin_argument * const argv = plugin_info->argv;
106006 + int i;
106007 +
106008 + if (!plugin_default_version_check(version, &gcc_version)) {
106009 + error(G_("incompatible gcc/plugin versions"));
106010 + return 1;
106011 + }
106012 +
106013 + register_callback(plugin_name, PLUGIN_INFO, NULL, &checker_plugin_info);
106014 +
106015 + for (i = 0; i < argc; ++i)
106016 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
106017 +
106018 + if (TARGET_64BIT == 0)
106019 + return 0;
106020 +
106021 + register_callback(plugin_name, PLUGIN_PRAGMAS, register_checker_address_spaces, NULL);
106022 +
106023 + return 0;
106024 +}
106025 diff --git a/tools/gcc/colorize_plugin.c b/tools/gcc/colorize_plugin.c
106026 new file mode 100644
106027 index 0000000..54461af
106028 --- /dev/null
106029 +++ b/tools/gcc/colorize_plugin.c
106030 @@ -0,0 +1,210 @@
106031 +/*
106032 + * Copyright 2012-2014 by PaX Team <pageexec@freemail.hu>
106033 + * Licensed under the GPL v2
106034 + *
106035 + * Note: the choice of the license means that the compilation process is
106036 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
106037 + * but for the kernel it doesn't matter since it doesn't link against
106038 + * any of the gcc libraries
106039 + *
106040 + * gcc plugin to colorize diagnostic output
106041 + *
106042 + */
106043 +
106044 +#include "gcc-common.h"
106045 +
106046 +int plugin_is_GPL_compatible;
106047 +
106048 +static struct plugin_info colorize_plugin_info = {
106049 + .version = "201404202350",
106050 + .help = "color=[never|always|auto]\tdetermine when to colorize\n",
106051 +};
106052 +
106053 +#define GREEN "\033[32m\033[K"
106054 +#define LIGHTGREEN "\033[1;32m\033[K"
106055 +#define YELLOW "\033[33m\033[K"
106056 +#define LIGHTYELLOW "\033[1;33m\033[K"
106057 +#define RED "\033[31m\033[K"
106058 +#define LIGHTRED "\033[1;31m\033[K"
106059 +#define BLUE "\033[34m\033[K"
106060 +#define LIGHTBLUE "\033[1;34m\033[K"
106061 +#define BRIGHT "\033[1;m\033[K"
106062 +#define NORMAL "\033[m\033[K"
106063 +
106064 +static diagnostic_starter_fn old_starter;
106065 +static diagnostic_finalizer_fn old_finalizer;
106066 +
106067 +static void start_colorize(diagnostic_context *context, diagnostic_info *diagnostic)
106068 +{
106069 + const char *color;
106070 + char *newprefix;
106071 +
106072 + switch (diagnostic->kind) {
106073 + case DK_NOTE:
106074 + color = LIGHTBLUE;
106075 + break;
106076 +
106077 + case DK_PEDWARN:
106078 + case DK_WARNING:
106079 + color = LIGHTYELLOW;
106080 + break;
106081 +
106082 + case DK_ERROR:
106083 + case DK_FATAL:
106084 + case DK_ICE:
106085 + case DK_PERMERROR:
106086 + case DK_SORRY:
106087 + color = LIGHTRED;
106088 + break;
106089 +
106090 + default:
106091 + color = NORMAL;
106092 + }
106093 +
106094 + old_starter(context, diagnostic);
106095 + if (-1 == asprintf(&newprefix, "%s%s" NORMAL, color, context->printer->prefix))
106096 + return;
106097 + pp_destroy_prefix(context->printer);
106098 + pp_set_prefix(context->printer, newprefix);
106099 +}
106100 +
106101 +static void finalize_colorize(diagnostic_context *context, diagnostic_info *diagnostic)
106102 +{
106103 + old_finalizer(context, diagnostic);
106104 +}
106105 +
106106 +static void colorize_arm(void)
106107 +{
106108 + old_starter = diagnostic_starter(global_dc);
106109 + old_finalizer = diagnostic_finalizer(global_dc);
106110 +
106111 + diagnostic_starter(global_dc) = start_colorize;
106112 + diagnostic_finalizer(global_dc) = finalize_colorize;
106113 +}
106114 +
106115 +static unsigned int execute_colorize_rearm(void)
106116 +{
106117 + if (diagnostic_starter(global_dc) == start_colorize)
106118 + return 0;
106119 +
106120 + colorize_arm();
106121 + return 0;
106122 +}
106123 +
106124 +#if BUILDING_GCC_VERSION >= 4009
106125 +static const struct pass_data colorize_rearm_pass_data = {
106126 +#else
106127 +struct simple_ipa_opt_pass colorize_rearm_pass = {
106128 + .pass = {
106129 +#endif
106130 + .type = SIMPLE_IPA_PASS,
106131 + .name = "colorize_rearm",
106132 +#if BUILDING_GCC_VERSION >= 4008
106133 + .optinfo_flags = OPTGROUP_NONE,
106134 +#endif
106135 +#if BUILDING_GCC_VERSION >= 4009
106136 + .has_gate = false,
106137 + .has_execute = true,
106138 +#else
106139 + .gate = NULL,
106140 + .execute = execute_colorize_rearm,
106141 + .sub = NULL,
106142 + .next = NULL,
106143 + .static_pass_number = 0,
106144 +#endif
106145 + .tv_id = TV_NONE,
106146 + .properties_required = 0,
106147 + .properties_provided = 0,
106148 + .properties_destroyed = 0,
106149 + .todo_flags_start = 0,
106150 + .todo_flags_finish = 0
106151 +#if BUILDING_GCC_VERSION < 4009
106152 + }
106153 +#endif
106154 +};
106155 +
106156 +#if BUILDING_GCC_VERSION >= 4009
106157 +namespace {
106158 +class colorize_rearm_pass : public simple_ipa_opt_pass {
106159 +public:
106160 + colorize_rearm_pass() : simple_ipa_opt_pass(colorize_rearm_pass_data, g) {}
106161 + unsigned int execute() { return execute_colorize_rearm(); }
106162 +};
106163 +}
106164 +
106165 +static opt_pass *make_colorize_rearm_pass(void)
106166 +{
106167 + return new colorize_rearm_pass();
106168 +}
106169 +#else
106170 +static struct opt_pass *make_colorize_rearm_pass(void)
106171 +{
106172 + return &colorize_rearm_pass.pass;
106173 +}
106174 +#endif
106175 +
106176 +static void colorize_start_unit(void *gcc_data, void *user_data)
106177 +{
106178 + colorize_arm();
106179 +}
106180 +
106181 +static bool should_colorize(void)
106182 +{
106183 +#if BUILDING_GCC_VERSION >= 4009
106184 + return false;
106185 +#else
106186 + char const *t = getenv("TERM");
106187 +
106188 + return t && strcmp(t, "dumb") && isatty(STDERR_FILENO);
106189 +#endif
106190 +}
106191 +
106192 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
106193 +{
106194 + const char * const plugin_name = plugin_info->base_name;
106195 + const int argc = plugin_info->argc;
106196 + const struct plugin_argument * const argv = plugin_info->argv;
106197 + int i;
106198 + struct register_pass_info colorize_rearm_pass_info;
106199 + bool colorize;
106200 +
106201 + colorize_rearm_pass_info.pass = make_colorize_rearm_pass();
106202 + colorize_rearm_pass_info.reference_pass_name = "*free_lang_data";
106203 + colorize_rearm_pass_info.ref_pass_instance_number = 1;
106204 + colorize_rearm_pass_info.pos_op = PASS_POS_INSERT_AFTER;
106205 +
106206 + if (!plugin_default_version_check(version, &gcc_version)) {
106207 + error(G_("incompatible gcc/plugin versions"));
106208 + return 1;
106209 + }
106210 +
106211 + register_callback(plugin_name, PLUGIN_INFO, NULL, &colorize_plugin_info);
106212 +
106213 + colorize = getenv("GCC_COLORS") ? should_colorize() : false;
106214 +
106215 + for (i = 0; i < argc; ++i) {
106216 + if (!strcmp(argv[i].key, "color")) {
106217 + if (!argv[i].value) {
106218 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
106219 + continue;
106220 + }
106221 + if (!strcmp(argv[i].value, "always"))
106222 + colorize = true;
106223 + else if (!strcmp(argv[i].value, "never"))
106224 + colorize = false;
106225 + else if (!strcmp(argv[i].value, "auto"))
106226 + colorize = should_colorize();
106227 + else
106228 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
106229 + continue;
106230 + }
106231 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
106232 + }
106233 +
106234 + if (colorize) {
106235 + // TODO: parse GCC_COLORS as used by gcc 4.9+
106236 + register_callback(plugin_name, PLUGIN_START_UNIT, &colorize_start_unit, NULL);
106237 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &colorize_rearm_pass_info);
106238 + }
106239 + return 0;
106240 +}
106241 diff --git a/tools/gcc/constify_plugin.c b/tools/gcc/constify_plugin.c
106242 new file mode 100644
106243 index 0000000..82bc5a8
106244 --- /dev/null
106245 +++ b/tools/gcc/constify_plugin.c
106246 @@ -0,0 +1,557 @@
106247 +/*
106248 + * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
106249 + * Copyright 2011-2014 by PaX Team <pageexec@freemail.hu>
106250 + * Licensed under the GPL v2, or (at your option) v3
106251 + *
106252 + * This gcc plugin constifies all structures which contain only function pointers or are explicitly marked for constification.
106253 + *
106254 + * Homepage:
106255 + * http://www.grsecurity.net/~ephox/const_plugin/
106256 + *
106257 + * Usage:
106258 + * $ gcc -I`gcc -print-file-name=plugin`/include -fPIC -shared -O2 -o constify_plugin.so constify_plugin.c
106259 + * $ gcc -fplugin=constify_plugin.so test.c -O2
106260 + */
106261 +
106262 +#include "gcc-common.h"
106263 +
106264 +// unused C type flag in all versions 4.5-4.9
106265 +#define TYPE_CONSTIFY_VISITED(TYPE) TYPE_LANG_FLAG_4(TYPE)
106266 +
106267 +int plugin_is_GPL_compatible;
106268 +
106269 +static struct plugin_info const_plugin_info = {
106270 + .version = "201401270210",
106271 + .help = "no-constify\tturn off constification\n",
106272 +};
106273 +
106274 +typedef struct {
106275 + bool has_fptr_field;
106276 + bool has_writable_field;
106277 + bool has_do_const_field;
106278 + bool has_no_const_field;
106279 +} constify_info;
106280 +
106281 +static const_tree get_field_type(const_tree field)
106282 +{
106283 + return strip_array_types(TREE_TYPE(field));
106284 +}
106285 +
106286 +static bool is_fptr(const_tree field)
106287 +{
106288 + const_tree ptr = get_field_type(field);
106289 +
106290 + if (TREE_CODE(ptr) != POINTER_TYPE)
106291 + return false;
106292 +
106293 + return TREE_CODE(TREE_TYPE(ptr)) == FUNCTION_TYPE;
106294 +}
106295 +
106296 +/*
106297 + * determine whether the given structure type meets the requirements for automatic constification,
106298 + * including the constification attributes on nested structure types
106299 + */
106300 +static void constifiable(const_tree node, constify_info *cinfo)
106301 +{
106302 + const_tree field;
106303 +
106304 + gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);
106305 +
106306 + // e.g., pointer to structure fields while still constructing the structure type
106307 + if (TYPE_FIELDS(node) == NULL_TREE)
106308 + return;
106309 +
106310 + for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
106311 + const_tree type = get_field_type(field);
106312 + enum tree_code code = TREE_CODE(type);
106313 +
106314 + if (node == type)
106315 + continue;
106316 +
106317 + if (is_fptr(field))
106318 + cinfo->has_fptr_field = true;
106319 + else if (!TREE_READONLY(field))
106320 + cinfo->has_writable_field = true;
106321 +
106322 + if (code == RECORD_TYPE || code == UNION_TYPE) {
106323 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type)))
106324 + cinfo->has_do_const_field = true;
106325 + else if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type)))
106326 + cinfo->has_no_const_field = true;
106327 + else
106328 + constifiable(type, cinfo);
106329 + }
106330 + }
106331 +}
106332 +
106333 +static bool constified(const_tree node)
106334 +{
106335 + constify_info cinfo = {
106336 + .has_fptr_field = false,
106337 + .has_writable_field = false,
106338 + .has_do_const_field = false,
106339 + .has_no_const_field = false
106340 + };
106341 +
106342 + gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);
106343 +
106344 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(node))) {
106345 +// gcc_assert(!TYPE_READONLY(node));
106346 + return false;
106347 + }
106348 +
106349 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(node))) {
106350 + gcc_assert(TYPE_READONLY(node));
106351 + return true;
106352 + }
106353 +
106354 + constifiable(node, &cinfo);
106355 + if ((!cinfo.has_fptr_field || cinfo.has_writable_field) && !cinfo.has_do_const_field)
106356 + return false;
106357 +
106358 + return TYPE_READONLY(node);
106359 +}
106360 +
106361 +static void deconstify_tree(tree node);
106362 +
106363 +static void deconstify_type(tree type)
106364 +{
106365 + tree field;
106366 +
106367 + gcc_assert(TREE_CODE(type) == RECORD_TYPE || TREE_CODE(type) == UNION_TYPE);
106368 +
106369 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
106370 + const_tree fieldtype = get_field_type(field);
106371 +
106372 + // special case handling of simple ptr-to-same-array-type members
106373 + if (TREE_CODE(TREE_TYPE(field)) == POINTER_TYPE) {
106374 + tree ptrtype = TREE_TYPE(TREE_TYPE(field));
106375 +
106376 + if (TREE_TYPE(TREE_TYPE(field)) == type)
106377 + continue;
106378 + if (TREE_CODE(ptrtype) != RECORD_TYPE && TREE_CODE(ptrtype) != UNION_TYPE)
106379 + continue;
106380 + if (!constified(ptrtype))
106381 + continue;
106382 + if (TYPE_MAIN_VARIANT(ptrtype) == TYPE_MAIN_VARIANT(type)) {
106383 + TREE_TYPE(field) = copy_node(TREE_TYPE(field));
106384 + TREE_TYPE(TREE_TYPE(field)) = build_qualified_type(type, TYPE_QUALS(ptrtype) & ~TYPE_QUAL_CONST);
106385 + }
106386 + continue;
106387 + }
106388 + if (TREE_CODE(fieldtype) != RECORD_TYPE && TREE_CODE(fieldtype) != UNION_TYPE)
106389 + continue;
106390 + if (!constified(fieldtype))
106391 + continue;
106392 +
106393 + deconstify_tree(field);
106394 + TREE_READONLY(field) = 0;
106395 + }
106396 + TYPE_READONLY(type) = 0;
106397 + C_TYPE_FIELDS_READONLY(type) = 0;
106398 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
106399 + TYPE_ATTRIBUTES(type) = copy_list(TYPE_ATTRIBUTES(type));
106400 + TYPE_ATTRIBUTES(type) = remove_attribute("do_const", TYPE_ATTRIBUTES(type));
106401 + }
106402 +}
106403 +
106404 +static void deconstify_tree(tree node)
106405 +{
106406 + tree old_type, new_type, field;
106407 +
106408 + old_type = TREE_TYPE(node);
106409 + while (TREE_CODE(old_type) == ARRAY_TYPE && TREE_CODE(TREE_TYPE(old_type)) != ARRAY_TYPE) {
106410 + node = TREE_TYPE(node) = copy_node(old_type);
106411 + old_type = TREE_TYPE(old_type);
106412 + }
106413 +
106414 + gcc_assert(TREE_CODE(old_type) == RECORD_TYPE || TREE_CODE(old_type) == UNION_TYPE);
106415 + gcc_assert(TYPE_READONLY(old_type) && (TYPE_QUALS(old_type) & TYPE_QUAL_CONST));
106416 +
106417 + new_type = build_qualified_type(old_type, TYPE_QUALS(old_type) & ~TYPE_QUAL_CONST);
106418 + TYPE_FIELDS(new_type) = copy_list(TYPE_FIELDS(new_type));
106419 + for (field = TYPE_FIELDS(new_type); field; field = TREE_CHAIN(field))
106420 + DECL_FIELD_CONTEXT(field) = new_type;
106421 +
106422 + deconstify_type(new_type);
106423 +
106424 + TREE_TYPE(node) = new_type;
106425 +}
106426 +
106427 +static tree handle_no_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
106428 +{
106429 + tree type;
106430 + constify_info cinfo = {
106431 + .has_fptr_field = false,
106432 + .has_writable_field = false,
106433 + .has_do_const_field = false,
106434 + .has_no_const_field = false
106435 + };
106436 +
106437 + *no_add_attrs = true;
106438 + if (TREE_CODE(*node) == FUNCTION_DECL) {
106439 + error("%qE attribute does not apply to functions (%qF)", name, *node);
106440 + return NULL_TREE;
106441 + }
106442 +
106443 + if (TREE_CODE(*node) == PARM_DECL) {
106444 + error("%qE attribute does not apply to function parameters (%qD)", name, *node);
106445 + return NULL_TREE;
106446 + }
106447 +
106448 + if (TREE_CODE(*node) == VAR_DECL) {
106449 + error("%qE attribute does not apply to variables (%qD)", name, *node);
106450 + return NULL_TREE;
106451 + }
106452 +
106453 + if (TYPE_P(*node)) {
106454 + type = *node;
106455 + } else {
106456 + gcc_assert(TREE_CODE(*node) == TYPE_DECL);
106457 + type = TREE_TYPE(*node);
106458 + }
106459 +
106460 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE) {
106461 + error("%qE attribute used on %qT applies to struct and union types only", name, type);
106462 + return NULL_TREE;
106463 + }
106464 +
106465 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(type))) {
106466 + error("%qE attribute is already applied to the type %qT", name, type);
106467 + return NULL_TREE;
106468 + }
106469 +
106470 + if (TYPE_P(*node)) {
106471 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type)))
106472 + error("%qE attribute used on type %qT is incompatible with 'do_const'", name, type);
106473 + else
106474 + *no_add_attrs = false;
106475 + return NULL_TREE;
106476 + }
106477 +
106478 + constifiable(type, &cinfo);
106479 + if ((cinfo.has_fptr_field && !cinfo.has_writable_field) || lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
106480 + deconstify_tree(*node);
106481 + TYPE_CONSTIFY_VISITED(TREE_TYPE(*node)) = 1;
106482 + return NULL_TREE;
106483 + }
106484 +
106485 + error("%qE attribute used on type %qT that is not constified", name, type);
106486 + return NULL_TREE;
106487 +}
106488 +
106489 +static void constify_type(tree type)
106490 +{
106491 + TYPE_READONLY(type) = 1;
106492 + C_TYPE_FIELDS_READONLY(type) = 1;
106493 + TYPE_CONSTIFY_VISITED(type) = 1;
106494 +// TYPE_ATTRIBUTES(type) = copy_list(TYPE_ATTRIBUTES(type));
106495 +// TYPE_ATTRIBUTES(type) = tree_cons(get_identifier("do_const"), NULL_TREE, TYPE_ATTRIBUTES(type));
106496 +}
106497 +
106498 +static tree handle_do_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
106499 +{
106500 + *no_add_attrs = true;
106501 + if (!TYPE_P(*node)) {
106502 + error("%qE attribute applies to types only (%qD)", name, *node);
106503 + return NULL_TREE;
106504 + }
106505 +
106506 + if (TREE_CODE(*node) != RECORD_TYPE && TREE_CODE(*node) != UNION_TYPE) {
106507 + error("%qE attribute used on %qT applies to struct and union types only", name, *node);
106508 + return NULL_TREE;
106509 + }
106510 +
106511 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(*node))) {
106512 + error("%qE attribute used on %qT is already applied to the type", name, *node);
106513 + return NULL_TREE;
106514 + }
106515 +
106516 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(*node))) {
106517 + error("%qE attribute used on %qT is incompatible with 'no_const'", name, *node);
106518 + return NULL_TREE;
106519 + }
106520 +
106521 + *no_add_attrs = false;
106522 + return NULL_TREE;
106523 +}
106524 +
106525 +static struct attribute_spec no_const_attr = {
106526 + .name = "no_const",
106527 + .min_length = 0,
106528 + .max_length = 0,
106529 + .decl_required = false,
106530 + .type_required = false,
106531 + .function_type_required = false,
106532 + .handler = handle_no_const_attribute,
106533 +#if BUILDING_GCC_VERSION >= 4007
106534 + .affects_type_identity = true
106535 +#endif
106536 +};
106537 +
106538 +static struct attribute_spec do_const_attr = {
106539 + .name = "do_const",
106540 + .min_length = 0,
106541 + .max_length = 0,
106542 + .decl_required = false,
106543 + .type_required = false,
106544 + .function_type_required = false,
106545 + .handler = handle_do_const_attribute,
106546 +#if BUILDING_GCC_VERSION >= 4007
106547 + .affects_type_identity = true
106548 +#endif
106549 +};
106550 +
106551 +static void register_attributes(void *event_data, void *data)
106552 +{
106553 + register_attribute(&no_const_attr);
106554 + register_attribute(&do_const_attr);
106555 +}
106556 +
106557 +static void finish_type(void *event_data, void *data)
106558 +{
106559 + tree type = (tree)event_data;
106560 + constify_info cinfo = {
106561 + .has_fptr_field = false,
106562 + .has_writable_field = false,
106563 + .has_do_const_field = false,
106564 + .has_no_const_field = false
106565 + };
106566 +
106567 + if (type == NULL_TREE || type == error_mark_node)
106568 + return;
106569 +
106570 + if (TYPE_FIELDS(type) == NULL_TREE || TYPE_CONSTIFY_VISITED(type))
106571 + return;
106572 +
106573 + constifiable(type, &cinfo);
106574 +
106575 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type))) {
106576 + if ((cinfo.has_fptr_field && !cinfo.has_writable_field) || cinfo.has_do_const_field) {
106577 + deconstify_type(type);
106578 + TYPE_CONSTIFY_VISITED(type) = 1;
106579 + } else
106580 + error("'no_const' attribute used on type %qT that is not constified", type);
106581 + return;
106582 + }
106583 +
106584 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
106585 + if (!cinfo.has_writable_field) {
106586 + error("'do_const' attribute used on type %qT that is%sconstified", type, cinfo.has_fptr_field ? " " : " not ");
106587 + return;
106588 + }
106589 + constify_type(type);
106590 + return;
106591 + }
106592 +
106593 + if (cinfo.has_fptr_field && !cinfo.has_writable_field) {
106594 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
106595 + error("'do_const' attribute used on type %qT that is constified", type);
106596 + return;
106597 + }
106598 + constify_type(type);
106599 + return;
106600 + }
106601 +
106602 + deconstify_type(type);
106603 + TYPE_CONSTIFY_VISITED(type) = 1;
106604 +}
106605 +
106606 +static void check_global_variables(void *event_data, void *data)
106607 +{
106608 +#if BUILDING_GCC_VERSION >= 4009
106609 + varpool_node *node;
106610 +#else
106611 + struct varpool_node *node;
106612 +#endif
106613 +
106614 + FOR_EACH_VARIABLE(node) {
106615 + tree var = NODE_DECL(node);
106616 + tree type = TREE_TYPE(var);
106617 +
106618 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
106619 + continue;
106620 +
106621 + if (!TYPE_READONLY(type) || !C_TYPE_FIELDS_READONLY(type))
106622 + continue;
106623 +
106624 + if (!TYPE_CONSTIFY_VISITED(type))
106625 + continue;
106626 +
106627 + if (DECL_EXTERNAL(var))
106628 + continue;
106629 +
106630 + if (DECL_INITIAL(var))
106631 + continue;
106632 +
106633 + // this works around a gcc bug/feature where uninitialized globals
106634 + // are moved into the .bss section regardless of any constification
106635 + DECL_INITIAL(var) = build_constructor(type, NULL);
106636 +// inform(DECL_SOURCE_LOCATION(var), "constified variable %qE moved into .rodata", var);
106637 + }
106638 +}
106639 +
106640 +static unsigned int check_local_variables(void)
106641 +{
106642 + unsigned int ret = 0;
106643 + tree var;
106644 +
106645 + unsigned int i;
106646 +
106647 + FOR_EACH_LOCAL_DECL(cfun, i, var) {
106648 + tree type = TREE_TYPE(var);
106649 +
106650 + gcc_assert(DECL_P(var));
106651 + if (is_global_var(var))
106652 + continue;
106653 +
106654 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
106655 + continue;
106656 +
106657 + if (!TYPE_READONLY(type) || !C_TYPE_FIELDS_READONLY(type))
106658 + continue;
106659 +
106660 + if (!TYPE_CONSTIFY_VISITED(type))
106661 + continue;
106662 +
106663 + error_at(DECL_SOURCE_LOCATION(var), "constified variable %qE cannot be local", var);
106664 + ret = 1;
106665 + }
106666 + return ret;
106667 +}
106668 +
106669 +#if BUILDING_GCC_VERSION >= 4009
106670 +static const struct pass_data check_local_variables_pass_data = {
106671 +#else
106672 +static struct gimple_opt_pass check_local_variables_pass = {
106673 + .pass = {
106674 +#endif
106675 + .type = GIMPLE_PASS,
106676 + .name = "check_local_variables",
106677 +#if BUILDING_GCC_VERSION >= 4008
106678 + .optinfo_flags = OPTGROUP_NONE,
106679 +#endif
106680 +#if BUILDING_GCC_VERSION >= 4009
106681 + .has_gate = false,
106682 + .has_execute = true,
106683 +#else
106684 + .gate = NULL,
106685 + .execute = check_local_variables,
106686 + .sub = NULL,
106687 + .next = NULL,
106688 + .static_pass_number = 0,
106689 +#endif
106690 + .tv_id = TV_NONE,
106691 + .properties_required = 0,
106692 + .properties_provided = 0,
106693 + .properties_destroyed = 0,
106694 + .todo_flags_start = 0,
106695 + .todo_flags_finish = 0
106696 +#if BUILDING_GCC_VERSION < 4009
106697 + }
106698 +#endif
106699 +};
106700 +
106701 +#if BUILDING_GCC_VERSION >= 4009
106702 +namespace {
106703 +class check_local_variables_pass : public gimple_opt_pass {
106704 +public:
106705 + check_local_variables_pass() : gimple_opt_pass(check_local_variables_pass_data, g) {}
106706 + unsigned int execute() { return check_local_variables(); }
106707 +};
106708 +}
106709 +
106710 +static opt_pass *make_check_local_variables_pass(void)
106711 +{
106712 + return new check_local_variables_pass();
106713 +}
106714 +#else
106715 +static struct opt_pass *make_check_local_variables_pass(void)
106716 +{
106717 + return &check_local_variables_pass.pass;
106718 +}
106719 +#endif
106720 +
106721 +static struct {
106722 + const char *name;
106723 + const char *asm_op;
106724 +} sections[] = {
106725 + {".init.rodata", "\t.section\t.init.rodata,\"a\""},
106726 + {".ref.rodata", "\t.section\t.ref.rodata,\"a\""},
106727 + {".devinit.rodata", "\t.section\t.devinit.rodata,\"a\""},
106728 + {".devexit.rodata", "\t.section\t.devexit.rodata,\"a\""},
106729 + {".cpuinit.rodata", "\t.section\t.cpuinit.rodata,\"a\""},
106730 + {".cpuexit.rodata", "\t.section\t.cpuexit.rodata,\"a\""},
106731 + {".meminit.rodata", "\t.section\t.meminit.rodata,\"a\""},
106732 + {".memexit.rodata", "\t.section\t.memexit.rodata,\"a\""},
106733 + {".data..read_only", "\t.section\t.data..read_only,\"a\""},
106734 +};
106735 +
106736 +static unsigned int (*old_section_type_flags)(tree decl, const char *name, int reloc);
106737 +
106738 +static unsigned int constify_section_type_flags(tree decl, const char *name, int reloc)
106739 +{
106740 + size_t i;
106741 +
106742 + for (i = 0; i < ARRAY_SIZE(sections); i++)
106743 + if (!strcmp(sections[i].name, name))
106744 + return 0;
106745 + return old_section_type_flags(decl, name, reloc);
106746 +}
106747 +
106748 +static void constify_start_unit(void *gcc_data, void *user_data)
106749 +{
106750 +// size_t i;
106751 +
106752 +// for (i = 0; i < ARRAY_SIZE(sections); i++)
106753 +// sections[i].section = get_unnamed_section(0, output_section_asm_op, sections[i].asm_op);
106754 +// sections[i].section = get_section(sections[i].name, 0, NULL);
106755 +
106756 + old_section_type_flags = targetm.section_type_flags;
106757 + targetm.section_type_flags = constify_section_type_flags;
106758 +}
106759 +
106760 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
106761 +{
106762 + const char * const plugin_name = plugin_info->base_name;
106763 + const int argc = plugin_info->argc;
106764 + const struct plugin_argument * const argv = plugin_info->argv;
106765 + int i;
106766 + bool constify = true;
106767 +
106768 + struct register_pass_info check_local_variables_pass_info;
106769 +
106770 + check_local_variables_pass_info.pass = make_check_local_variables_pass();
106771 + check_local_variables_pass_info.reference_pass_name = "ssa";
106772 + check_local_variables_pass_info.ref_pass_instance_number = 1;
106773 + check_local_variables_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
106774 +
106775 + if (!plugin_default_version_check(version, &gcc_version)) {
106776 + error(G_("incompatible gcc/plugin versions"));
106777 + return 1;
106778 + }
106779 +
106780 + for (i = 0; i < argc; ++i) {
106781 + if (!(strcmp(argv[i].key, "no-constify"))) {
106782 + constify = false;
106783 + continue;
106784 + }
106785 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
106786 + }
106787 +
106788 + if (strcmp(lang_hooks.name, "GNU C")) {
106789 + inform(UNKNOWN_LOCATION, G_("%s supports C only"), plugin_name);
106790 + constify = false;
106791 + }
106792 +
106793 + register_callback(plugin_name, PLUGIN_INFO, NULL, &const_plugin_info);
106794 + if (constify) {
106795 + register_callback(plugin_name, PLUGIN_ALL_IPA_PASSES_START, check_global_variables, NULL);
106796 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
106797 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &check_local_variables_pass_info);
106798 + register_callback(plugin_name, PLUGIN_START_UNIT, constify_start_unit, NULL);
106799 + }
106800 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
106801 +
106802 + return 0;
106803 +}
106804 diff --git a/tools/gcc/gcc-common.h b/tools/gcc/gcc-common.h
106805 new file mode 100644
106806 index 0000000..8af3693
106807 --- /dev/null
106808 +++ b/tools/gcc/gcc-common.h
106809 @@ -0,0 +1,287 @@
106810 +#ifndef GCC_COMMON_H_INCLUDED
106811 +#define GCC_COMMON_H_INCLUDED
106812 +
106813 +#include "plugin.h"
106814 +#include "bversion.h"
106815 +#include "plugin-version.h"
106816 +#include "config.h"
106817 +#include "system.h"
106818 +#include "coretypes.h"
106819 +#include "tm.h"
106820 +#include "line-map.h"
106821 +#include "input.h"
106822 +#include "tree.h"
106823 +
106824 +#include "tree-inline.h"
106825 +#include "version.h"
106826 +#include "rtl.h"
106827 +#include "tm_p.h"
106828 +#include "flags.h"
106829 +//#include "insn-attr.h"
106830 +//#include "insn-config.h"
106831 +//#include "insn-flags.h"
106832 +#include "hard-reg-set.h"
106833 +//#include "recog.h"
106834 +#include "output.h"
106835 +#include "except.h"
106836 +#include "function.h"
106837 +#include "toplev.h"
106838 +//#include "expr.h"
106839 +#include "basic-block.h"
106840 +#include "intl.h"
106841 +#include "ggc.h"
106842 +//#include "regs.h"
106843 +#include "timevar.h"
106844 +
106845 +#include "params.h"
106846 +#include "pointer-set.h"
106847 +#include "emit-rtl.h"
106848 +//#include "reload.h"
106849 +//#include "ira.h"
106850 +//#include "dwarf2asm.h"
106851 +#include "debug.h"
106852 +#include "target.h"
106853 +#include "langhooks.h"
106854 +#include "cfgloop.h"
106855 +//#include "hosthooks.h"
106856 +#include "cgraph.h"
106857 +#include "opts.h"
106858 +//#include "coverage.h"
106859 +//#include "value-prof.h"
106860 +
106861 +#if BUILDING_GCC_VERSION >= 4007
106862 +#include "tree-pretty-print.h"
106863 +#include "gimple-pretty-print.h"
106864 +#include "c-tree.h"
106865 +//#include "alloc-pool.h"
106866 +#endif
106867 +
106868 +#if BUILDING_GCC_VERSION <= 4008
106869 +#include "tree-flow.h"
106870 +#else
106871 +#include "tree-cfgcleanup.h"
106872 +#endif
106873 +
106874 +#include "diagnostic.h"
106875 +//#include "tree-diagnostic.h"
106876 +#include "tree-dump.h"
106877 +#include "tree-pass.h"
106878 +//#include "df.h"
106879 +#include "predict.h"
106880 +//#include "lto-streamer.h"
106881 +#include "ipa-utils.h"
106882 +
106883 +#if BUILDING_GCC_VERSION >= 4009
106884 +#include "varasm.h"
106885 +#include "stor-layout.h"
106886 +#include "internal-fn.h"
106887 +#include "gimple-expr.h"
106888 +//#include "diagnostic-color.h"
106889 +#include "context.h"
106890 +#include "tree-ssa-alias.h"
106891 +#include "stringpool.h"
106892 +#include "tree-ssanames.h"
106893 +#include "print-tree.h"
106894 +#include "tree-eh.h"
106895 +#endif
106896 +
106897 +#include "gimple.h"
106898 +
106899 +#if BUILDING_GCC_VERSION >= 4009
106900 +#include "tree-ssa-operands.h"
106901 +#include "tree-phinodes.h"
106902 +#include "tree-cfg.h"
106903 +#include "gimple-iterator.h"
106904 +#include "gimple-ssa.h"
106905 +#include "ssa-iterators.h"
106906 +#endif
106907 +
106908 +//#include "expr.h" where are you...
106909 +extern rtx emit_move_insn(rtx x, rtx y);
106910 +
106911 +// missing from basic_block.h...
106912 +extern void debug_dominance_info(enum cdi_direction dir);
106913 +extern void debug_dominance_tree(enum cdi_direction dir, basic_block root);
106914 +
106915 +#define __unused __attribute__((__unused__))
106916 +
106917 +#define DECL_NAME_POINTER(node) IDENTIFIER_POINTER(DECL_NAME(node))
106918 +#define DECL_NAME_LENGTH(node) IDENTIFIER_LENGTH(DECL_NAME(node))
106919 +
106920 +#if BUILDING_GCC_VERSION == 4005
106921 +#define FOR_EACH_LOCAL_DECL(FUN, I, D) for (tree vars = (FUN)->local_decls; vars && (D = TREE_VALUE(vars)); vars = TREE_CHAIN(vars), I)
106922 +#define DECL_CHAIN(NODE) (TREE_CHAIN(DECL_MINIMAL_CHECK(NODE)))
106923 +#define FOR_EACH_VEC_ELT(T, V, I, P) for (I = 0; VEC_iterate(T, (V), (I), (P)); ++(I))
106924 +#define TODO_rebuild_cgraph_edges 0
106925 +
106926 +static inline bool gimple_call_builtin_p(gimple stmt, enum built_in_function code)
106927 +{
106928 + tree fndecl;
106929 +
106930 + if (!is_gimple_call(stmt))
106931 + return false;
106932 + fndecl = gimple_call_fndecl(stmt);
106933 + if (!fndecl || DECL_BUILT_IN_CLASS(fndecl) != BUILT_IN_NORMAL)
106934 + return false;
106935 +// print_node(stderr, "pax", fndecl, 4);
106936 + return DECL_FUNCTION_CODE(fndecl) == code;
106937 +}
106938 +
106939 +static inline bool is_simple_builtin(tree decl)
106940 +{
106941 + if (decl && DECL_BUILT_IN_CLASS(decl) != BUILT_IN_NORMAL)
106942 + return false;
106943 +
106944 + switch (DECL_FUNCTION_CODE(decl)) {
106945 + /* Builtins that expand to constants. */
106946 + case BUILT_IN_CONSTANT_P:
106947 + case BUILT_IN_EXPECT:
106948 + case BUILT_IN_OBJECT_SIZE:
106949 + case BUILT_IN_UNREACHABLE:
106950 + /* Simple register moves or loads from stack. */
106951 + case BUILT_IN_RETURN_ADDRESS:
106952 + case BUILT_IN_EXTRACT_RETURN_ADDR:
106953 + case BUILT_IN_FROB_RETURN_ADDR:
106954 + case BUILT_IN_RETURN:
106955 + case BUILT_IN_AGGREGATE_INCOMING_ADDRESS:
106956 + case BUILT_IN_FRAME_ADDRESS:
106957 + case BUILT_IN_VA_END:
106958 + case BUILT_IN_STACK_SAVE:
106959 + case BUILT_IN_STACK_RESTORE:
106960 + /* Exception state returns or moves registers around. */
106961 + case BUILT_IN_EH_FILTER:
106962 + case BUILT_IN_EH_POINTER:
106963 + case BUILT_IN_EH_COPY_VALUES:
106964 + return true;
106965 +
106966 + default:
106967 + return false;
106968 + }
106969 +}
106970 +#endif
106971 +
106972 +#if BUILDING_GCC_VERSION <= 4006
106973 +#define ANY_RETURN_P(rtx) (GET_CODE(rtx) == RETURN)
106974 +#define C_DECL_REGISTER(EXP) DECL_LANG_FLAG_4(EXP)
106975 +
106976 +// should come from c-tree.h if only it were installed for gcc 4.5...
106977 +#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1(TYPE)
106978 +
106979 +#define get_random_seed(noinit) ({ \
106980 + unsigned HOST_WIDE_INT seed; \
106981 + sscanf(get_random_seed(noinit), "%" HOST_WIDE_INT_PRINT "x", &seed); \
106982 + seed * seed; })
106983 +
106984 +static inline bool gimple_clobber_p(gimple s)
106985 +{
106986 + return false;
106987 +}
106988 +
106989 +static inline tree builtin_decl_implicit(enum built_in_function fncode)
106990 +{
106991 + return implicit_built_in_decls[fncode];
106992 +}
106993 +
106994 +static inline struct cgraph_node *cgraph_get_create_node(tree decl)
106995 +{
106996 + struct cgraph_node *node = cgraph_get_node(decl);
106997 +
106998 + return node ? node : cgraph_node(decl);
106999 +}
107000 +
107001 +static inline bool cgraph_function_with_gimple_body_p(struct cgraph_node *node)
107002 +{
107003 + return node->analyzed && !node->thunk.thunk_p && !node->alias;
107004 +}
107005 +
107006 +static inline struct cgraph_node *cgraph_first_function_with_gimple_body(void)
107007 +{
107008 + struct cgraph_node *node;
107009 +
107010 + for (node = cgraph_nodes; node; node = node->next)
107011 + if (cgraph_function_with_gimple_body_p(node))
107012 + return node;
107013 + return NULL;
107014 +}
107015 +
107016 +static inline struct cgraph_node *cgraph_next_function_with_gimple_body(struct cgraph_node *node)
107017 +{
107018 + for (node = node->next; node; node = node->next)
107019 + if (cgraph_function_with_gimple_body_p(node))
107020 + return node;
107021 + return NULL;
107022 +}
107023 +
107024 +#define FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) \
107025 + for ((node) = cgraph_first_function_with_gimple_body(); (node); \
107026 + (node) = cgraph_next_function_with_gimple_body(node))
107027 +#endif
107028 +
107029 +#if BUILDING_GCC_VERSION == 4006
107030 +extern void debug_gimple_stmt(gimple);
107031 +extern void debug_gimple_seq(gimple_seq);
107032 +extern void print_gimple_seq(FILE *, gimple_seq, int, int);
107033 +extern void print_gimple_stmt(FILE *, gimple, int, int);
107034 +extern void print_gimple_expr(FILE *, gimple, int, int);
107035 +extern void dump_gimple_stmt(pretty_printer *, gimple, int, int);
107036 +#endif
107037 +
107038 +#if BUILDING_GCC_VERSION <= 4007
107039 +#define FOR_EACH_VARIABLE(node) for (node = varpool_nodes; node; node = node->next)
107040 +#define PROP_loops 0
107041 +
107042 +static inline int bb_loop_depth(const_basic_block bb)
107043 +{
107044 + return bb->loop_father ? loop_depth(bb->loop_father) : 0;
107045 +}
107046 +
107047 +static inline bool gimple_store_p(gimple gs)
107048 +{
107049 + tree lhs = gimple_get_lhs(gs);
107050 + return lhs && !is_gimple_reg(lhs);
107051 +}
107052 +#endif
107053 +
107054 +#if BUILDING_GCC_VERSION >= 4007
107055 +#define cgraph_create_edge(caller, callee, call_stmt, count, freq, nest) \
107056 + cgraph_create_edge((caller), (callee), (call_stmt), (count), (freq))
107057 +#endif
107058 +
107059 +#if BUILDING_GCC_VERSION <= 4008
107060 +#define ENTRY_BLOCK_PTR_FOR_FN(FN) ENTRY_BLOCK_PTR_FOR_FUNCTION(FN)
107061 +#define EXIT_BLOCK_PTR_FOR_FN(FN) EXIT_BLOCK_PTR_FOR_FUNCTION(FN)
107062 +#define basic_block_info_for_fn(FN) ((FN)->cfg->x_basic_block_info)
107063 +#define n_basic_blocks_for_fn(FN) ((FN)->cfg->x_n_basic_blocks)
107064 +#define n_edges_for_fn(FN) ((FN)->cfg->x_n_edges)
107065 +#define last_basic_block_for_fn(FN) ((FN)->cfg->x_last_basic_block)
107066 +#define label_to_block_map_for_fn(FN) ((FN)->cfg->x_label_to_block_map)
107067 +#define profile_status_for_fn(FN) ((FN)->cfg->x_profile_status)
107068 +
107069 +static inline const char *get_tree_code_name(enum tree_code code)
107070 +{
107071 + gcc_assert(code < MAX_TREE_CODES);
107072 + return tree_code_name[code];
107073 +}
107074 +
107075 +#define ipa_remove_stmt_references(cnode, stmt)
107076 +#endif
107077 +
107078 +#if BUILDING_GCC_VERSION == 4008
107079 +#define NODE_DECL(node) node->symbol.decl
107080 +#else
107081 +#define NODE_DECL(node) node->decl
107082 +#endif
107083 +
107084 +#if BUILDING_GCC_VERSION >= 4008
107085 +#define add_referenced_var(var)
107086 +#define mark_sym_for_renaming(var)
107087 +#define varpool_mark_needed_node(node)
107088 +#define TODO_dump_func 0
107089 +#define TODO_dump_cgraph 0
107090 +#endif
107091 +
107092 +#if BUILDING_GCC_VERSION >= 4009
107093 +#define TODO_ggc_collect 0
107094 +#endif
107095 +
107096 +#endif
107097 diff --git a/tools/gcc/gen-random-seed.sh b/tools/gcc/gen-random-seed.sh
107098 new file mode 100644
107099 index 0000000..7514850
107100 --- /dev/null
107101 +++ b/tools/gcc/gen-random-seed.sh
107102 @@ -0,0 +1,8 @@
107103 +#!/bin/sh
107104 +
107105 +if [ ! -f "$1" ]; then
107106 + SEED=`od -A n -t x8 -N 32 /dev/urandom | tr -d ' \n'`
107107 + echo "const char *randstruct_seed = \"$SEED\";" > "$1"
107108 + HASH=`echo -n "$SEED" | sha256sum | cut -d" " -f1 | tr -d ' \n'`
107109 + echo "#define RANDSTRUCT_HASHED_SEED \"$HASH\"" > "$2"
107110 +fi
107111 diff --git a/tools/gcc/generate_size_overflow_hash.sh b/tools/gcc/generate_size_overflow_hash.sh
107112 new file mode 100644
107113 index 0000000..791ca76
107114 --- /dev/null
107115 +++ b/tools/gcc/generate_size_overflow_hash.sh
107116 @@ -0,0 +1,97 @@
107117 +#!/bin/bash
107118 +
107119 +# This script generates the hash table (size_overflow_hash.h) for the size_overflow gcc plugin (size_overflow_plugin.c).
107120 +
107121 +header1="size_overflow_hash.h"
107122 +database="size_overflow_hash.data"
107123 +n=65536
107124 +hashtable_name="size_overflow_hash"
107125 +
107126 +usage() {
107127 +cat <<EOF
107128 +usage: $0 options
107129 +OPTIONS:
107130 + -h|--help help
107131 + -o header file
107132 + -d database file
107133 + -n hash array size
107134 + -s name of the hash table
107135 +EOF
107136 + return 0
107137 +}
107138 +
107139 +while true
107140 +do
107141 + case "$1" in
107142 + -h|--help) usage && exit 0;;
107143 + -n) n=$2; shift 2;;
107144 + -o) header1="$2"; shift 2;;
107145 + -d) database="$2"; shift 2;;
107146 + -s) hashtable_name="$2"; shift 2;;
107147 + --) shift 1; break ;;
107148 + *) break ;;
107149 + esac
107150 +done
107151 +
107152 +create_defines() {
107153 + for i in `seq 0 31`
107154 + do
107155 + echo -e "#define PARAM"$i" (1U << "$i")" >> "$header1"
107156 + done
107157 + echo >> "$header1"
107158 +}
107159 +
107160 +create_structs() {
107161 + rm -f "$header1"
107162 +
107163 + create_defines
107164 +
107165 + cat "$database" | while read data
107166 + do
107167 + data_array=($data)
107168 + struct_hash_name="${data_array[0]}"
107169 + funcn="${data_array[1]}"
107170 + params="${data_array[2]}"
107171 + next="${data_array[4]}"
107172 +
107173 + echo "const struct size_overflow_hash $struct_hash_name = {" >> "$header1"
107174 +
107175 + echo -e "\t.next\t= $next,\n\t.name\t= \"$funcn\"," >> "$header1"
107176 + echo -en "\t.param\t= " >> "$header1"
107177 + line=
107178 + for param_num in ${params//-/ };
107179 + do
107180 + line="${line}PARAM"$param_num"|"
107181 + done
107182 +
107183 + echo -e "${line%?},\n};\n" >> "$header1"
107184 + done
107185 +}
107186 +
107187 +create_headers() {
107188 + echo "const struct size_overflow_hash * const $hashtable_name[$n] = {" >> "$header1"
107189 +}
107190 +
107191 +create_array_elements() {
107192 + index=0
107193 + grep -v "nohasharray" $database | sort -n -k 4 | while read data
107194 + do
107195 + data_array=($data)
107196 + i="${data_array[3]}"
107197 + hash="${data_array[0]}"
107198 + while [[ $index -lt $i ]]
107199 + do
107200 + echo -e "\t["$index"]\t= NULL," >> "$header1"
107201 + index=$(($index + 1))
107202 + done
107203 + index=$(($index + 1))
107204 + echo -e "\t["$i"]\t= &"$hash"," >> "$header1"
107205 + done
107206 + echo '};' >> $header1
107207 +}
107208 +
107209 +create_structs
107210 +create_headers
107211 +create_array_elements
107212 +
107213 +exit 0
107214 diff --git a/tools/gcc/kallocstat_plugin.c b/tools/gcc/kallocstat_plugin.c
107215 new file mode 100644
107216 index 0000000..d81c094
107217 --- /dev/null
107218 +++ b/tools/gcc/kallocstat_plugin.c
107219 @@ -0,0 +1,183 @@
107220 +/*
107221 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
107222 + * Licensed under the GPL v2
107223 + *
107224 + * Note: the choice of the license means that the compilation process is
107225 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
107226 + * but for the kernel it doesn't matter since it doesn't link against
107227 + * any of the gcc libraries
107228 + *
107229 + * gcc plugin to find the distribution of k*alloc sizes
107230 + *
107231 + * TODO:
107232 + *
107233 + * BUGS:
107234 + * - none known
107235 + */
107236 +
107237 +#include "gcc-common.h"
107238 +
107239 +int plugin_is_GPL_compatible;
107240 +
107241 +static struct plugin_info kallocstat_plugin_info = {
107242 + .version = "201401260140",
107243 + .help = NULL
107244 +};
107245 +
107246 +static const char * const kalloc_functions[] = {
107247 + "__kmalloc",
107248 + "kmalloc",
107249 + "kmalloc_large",
107250 + "kmalloc_node",
107251 + "kmalloc_order",
107252 + "kmalloc_order_trace",
107253 + "kmalloc_slab",
107254 + "kzalloc",
107255 + "kzalloc_node",
107256 +};
107257 +
107258 +static bool is_kalloc(const char *fnname)
107259 +{
107260 + size_t i;
107261 +
107262 + for (i = 0; i < ARRAY_SIZE(kalloc_functions); i++)
107263 + if (!strcmp(fnname, kalloc_functions[i]))
107264 + return true;
107265 + return false;
107266 +}
107267 +
107268 +static unsigned int execute_kallocstat(void)
107269 +{
107270 + basic_block bb;
107271 +
107272 + // 1. loop through BBs and GIMPLE statements
107273 + FOR_EACH_BB_FN(bb, cfun) {
107274 + gimple_stmt_iterator gsi;
107275 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
107276 + // gimple match:
107277 + tree fndecl, size;
107278 + gimple stmt;
107279 + const char *fnname;
107280 +
107281 + // is it a call
107282 + stmt = gsi_stmt(gsi);
107283 + if (!is_gimple_call(stmt))
107284 + continue;
107285 + fndecl = gimple_call_fndecl(stmt);
107286 + if (fndecl == NULL_TREE)
107287 + continue;
107288 + if (TREE_CODE(fndecl) != FUNCTION_DECL)
107289 + continue;
107290 +
107291 + // is it a call to k*alloc
107292 + fnname = DECL_NAME_POINTER(fndecl);
107293 + if (!is_kalloc(fnname))
107294 + continue;
107295 +
107296 + // is the size arg const or the result of a simple const assignment
107297 + size = gimple_call_arg(stmt, 0);
107298 + while (true) {
107299 + expanded_location xloc;
107300 + size_t size_val;
107301 +
107302 + if (TREE_CONSTANT(size)) {
107303 + xloc = expand_location(gimple_location(stmt));
107304 + if (!xloc.file)
107305 + xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl));
107306 + size_val = TREE_INT_CST_LOW(size);
107307 + fprintf(stderr, "kallocsize: %8zu %8zx %s %s:%u\n", size_val, size_val, fnname, xloc.file, xloc.line);
107308 + break;
107309 + }
107310 +
107311 + if (TREE_CODE(size) != SSA_NAME)
107312 + break;
107313 + stmt = SSA_NAME_DEF_STMT(size);
107314 +//debug_gimple_stmt(stmt);
107315 +//debug_tree(size);
107316 + if (!stmt || !is_gimple_assign(stmt))
107317 + break;
107318 + if (gimple_num_ops(stmt) != 2)
107319 + break;
107320 + size = gimple_assign_rhs1(stmt);
107321 + }
107322 +//print_gimple_stmt(stderr, call_stmt, 0, TDF_LINENO);
107323 +//debug_tree(gimple_call_fn(call_stmt));
107324 +//print_node(stderr, "pax", fndecl, 4);
107325 + }
107326 + }
107327 +
107328 + return 0;
107329 +}
107330 +
107331 +#if BUILDING_GCC_VERSION >= 4009
107332 +static const struct pass_data kallocstat_pass_data = {
107333 +#else
107334 +static struct gimple_opt_pass kallocstat_pass = {
107335 + .pass = {
107336 +#endif
107337 + .type = GIMPLE_PASS,
107338 + .name = "kallocstat",
107339 +#if BUILDING_GCC_VERSION >= 4008
107340 + .optinfo_flags = OPTGROUP_NONE,
107341 +#endif
107342 +#if BUILDING_GCC_VERSION >= 4009
107343 + .has_gate = false,
107344 + .has_execute = true,
107345 +#else
107346 + .gate = NULL,
107347 + .execute = execute_kallocstat,
107348 + .sub = NULL,
107349 + .next = NULL,
107350 + .static_pass_number = 0,
107351 +#endif
107352 + .tv_id = TV_NONE,
107353 + .properties_required = 0,
107354 + .properties_provided = 0,
107355 + .properties_destroyed = 0,
107356 + .todo_flags_start = 0,
107357 + .todo_flags_finish = 0
107358 +#if BUILDING_GCC_VERSION < 4009
107359 + }
107360 +#endif
107361 +};
107362 +
107363 +#if BUILDING_GCC_VERSION >= 4009
107364 +namespace {
107365 +class kallocstat_pass : public gimple_opt_pass {
107366 +public:
107367 + kallocstat_pass() : gimple_opt_pass(kallocstat_pass_data, g) {}
107368 + unsigned int execute() { return execute_kallocstat(); }
107369 +};
107370 +}
107371 +
107372 +static opt_pass *make_kallocstat_pass(void)
107373 +{
107374 + return new kallocstat_pass();
107375 +}
107376 +#else
107377 +static struct opt_pass *make_kallocstat_pass(void)
107378 +{
107379 + return &kallocstat_pass.pass;
107380 +}
107381 +#endif
107382 +
107383 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
107384 +{
107385 + const char * const plugin_name = plugin_info->base_name;
107386 + struct register_pass_info kallocstat_pass_info;
107387 +
107388 + kallocstat_pass_info.pass = make_kallocstat_pass();
107389 + kallocstat_pass_info.reference_pass_name = "ssa";
107390 + kallocstat_pass_info.ref_pass_instance_number = 1;
107391 + kallocstat_pass_info.pos_op = PASS_POS_INSERT_AFTER;
107392 +
107393 + if (!plugin_default_version_check(version, &gcc_version)) {
107394 + error(G_("incompatible gcc/plugin versions"));
107395 + return 1;
107396 + }
107397 +
107398 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kallocstat_plugin_info);
107399 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kallocstat_pass_info);
107400 +
107401 + return 0;
107402 +}
107403 diff --git a/tools/gcc/kernexec_plugin.c b/tools/gcc/kernexec_plugin.c
107404 new file mode 100644
107405 index 0000000..89f256d
107406 --- /dev/null
107407 +++ b/tools/gcc/kernexec_plugin.c
107408 @@ -0,0 +1,522 @@
107409 +/*
107410 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
107411 + * Licensed under the GPL v2
107412 + *
107413 + * Note: the choice of the license means that the compilation process is
107414 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
107415 + * but for the kernel it doesn't matter since it doesn't link against
107416 + * any of the gcc libraries
107417 + *
107418 + * gcc plugin to make KERNEXEC/amd64 almost as good as it is on i386
107419 + *
107420 + * TODO:
107421 + *
107422 + * BUGS:
107423 + * - none known
107424 + */
107425 +
107426 +#include "gcc-common.h"
107427 +
107428 +int plugin_is_GPL_compatible;
107429 +
107430 +static struct plugin_info kernexec_plugin_info = {
107431 + .version = "201401260140",
107432 + .help = "method=[bts|or]\tinstrumentation method\n"
107433 +};
107434 +
107435 +static void (*kernexec_instrument_fptr)(gimple_stmt_iterator *);
107436 +static void (*kernexec_instrument_retaddr)(rtx);
107437 +
107438 +/*
107439 + * add special KERNEXEC instrumentation: reload %r12 after it has been clobbered
107440 + */
107441 +static void kernexec_reload_fptr_mask(gimple_stmt_iterator *gsi)
107442 +{
107443 + gimple asm_movabs_stmt;
107444 +
107445 + // build asm volatile("movabs $0x8000000000000000, %%r12\n\t" : : : );
107446 + asm_movabs_stmt = gimple_build_asm_vec("movabs $0x8000000000000000, %%r12\n\t", NULL, NULL, NULL, NULL);
107447 + gimple_asm_set_volatile(asm_movabs_stmt, true);
107448 + gsi_insert_after(gsi, asm_movabs_stmt, GSI_CONTINUE_LINKING);
107449 + update_stmt(asm_movabs_stmt);
107450 +}
107451 +
107452 +/*
107453 + * find all asm() stmts that clobber r12 and add a reload of r12
107454 + */
107455 +static unsigned int execute_kernexec_reload(void)
107456 +{
107457 + basic_block bb;
107458 +
107459 + // 1. loop through BBs and GIMPLE statements
107460 + FOR_EACH_BB_FN(bb, cfun) {
107461 + gimple_stmt_iterator gsi;
107462 +
107463 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
107464 + // gimple match: __asm__ ("" : : : "r12");
107465 + gimple asm_stmt;
107466 + size_t nclobbers;
107467 +
107468 + // is it an asm ...
107469 + asm_stmt = gsi_stmt(gsi);
107470 + if (gimple_code(asm_stmt) != GIMPLE_ASM)
107471 + continue;
107472 +
107473 + // ... clobbering r12
107474 + nclobbers = gimple_asm_nclobbers(asm_stmt);
107475 + while (nclobbers--) {
107476 + tree op = gimple_asm_clobber_op(asm_stmt, nclobbers);
107477 + if (strcmp(TREE_STRING_POINTER(TREE_VALUE(op)), "r12"))
107478 + continue;
107479 + kernexec_reload_fptr_mask(&gsi);
107480 +//print_gimple_stmt(stderr, asm_stmt, 0, TDF_LINENO);
107481 + break;
107482 + }
107483 + }
107484 + }
107485 +
107486 + return 0;
107487 +}
107488 +
107489 +/*
107490 + * add special KERNEXEC instrumentation: force MSB of fptr to 1, which will produce
107491 + * a non-canonical address from a userland ptr and will just trigger a GPF on dereference
107492 + */
107493 +static void kernexec_instrument_fptr_bts(gimple_stmt_iterator *gsi)
107494 +{
107495 + gimple assign_intptr, assign_new_fptr, call_stmt;
107496 + tree intptr, orptr, old_fptr, new_fptr, kernexec_mask;
107497 +
107498 + call_stmt = gsi_stmt(*gsi);
107499 + old_fptr = gimple_call_fn(call_stmt);
107500 +
107501 + // create temporary unsigned long variable used for bitops and cast fptr to it
107502 + intptr = create_tmp_var(long_unsigned_type_node, "kernexec_bts");
107503 + add_referenced_var(intptr);
107504 + intptr = make_ssa_name(intptr, NULL);
107505 + assign_intptr = gimple_build_assign(intptr, fold_convert(long_unsigned_type_node, old_fptr));
107506 + SSA_NAME_DEF_STMT(intptr) = assign_intptr;
107507 + gsi_insert_before(gsi, assign_intptr, GSI_SAME_STMT);
107508 + update_stmt(assign_intptr);
107509 +
107510 + // apply logical or to temporary unsigned long and bitmask
107511 + kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0x8000000000000000LL);
107512 +// kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0xffffffff80000000LL);
107513 + orptr = fold_build2(BIT_IOR_EXPR, long_long_unsigned_type_node, intptr, kernexec_mask);
107514 + intptr = make_ssa_name(SSA_NAME_VAR(intptr), NULL);
107515 + assign_intptr = gimple_build_assign(intptr, orptr);
107516 + SSA_NAME_DEF_STMT(intptr) = assign_intptr;
107517 + gsi_insert_before(gsi, assign_intptr, GSI_SAME_STMT);
107518 + update_stmt(assign_intptr);
107519 +
107520 + // cast temporary unsigned long back to a temporary fptr variable
107521 + new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_fptr");
107522 + add_referenced_var(new_fptr);
107523 + new_fptr = make_ssa_name(new_fptr, NULL);
107524 + assign_new_fptr = gimple_build_assign(new_fptr, fold_convert(TREE_TYPE(old_fptr), intptr));
107525 + SSA_NAME_DEF_STMT(new_fptr) = assign_new_fptr;
107526 + gsi_insert_before(gsi, assign_new_fptr, GSI_SAME_STMT);
107527 + update_stmt(assign_new_fptr);
107528 +
107529 + // replace call stmt fn with the new fptr
107530 + gimple_call_set_fn(call_stmt, new_fptr);
107531 + update_stmt(call_stmt);
107532 +}
107533 +
107534 +static void kernexec_instrument_fptr_or(gimple_stmt_iterator *gsi)
107535 +{
107536 + gimple asm_or_stmt, call_stmt;
107537 + tree old_fptr, new_fptr, input, output;
107538 +#if BUILDING_GCC_VERSION <= 4007
107539 + VEC(tree, gc) *inputs = NULL;
107540 + VEC(tree, gc) *outputs = NULL;
107541 +#else
107542 + vec<tree, va_gc> *inputs = NULL;
107543 + vec<tree, va_gc> *outputs = NULL;
107544 +#endif
107545 +
107546 + call_stmt = gsi_stmt(*gsi);
107547 + old_fptr = gimple_call_fn(call_stmt);
107548 +
107549 + // create temporary fptr variable
107550 + new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_or");
107551 + add_referenced_var(new_fptr);
107552 + new_fptr = make_ssa_name(new_fptr, NULL);
107553 +
107554 + // build asm volatile("orq %%r12, %0\n\t" : "=r"(new_fptr) : "0"(old_fptr));
107555 + input = build_tree_list(NULL_TREE, build_string(1, "0"));
107556 + input = chainon(NULL_TREE, build_tree_list(input, old_fptr));
107557 + output = build_tree_list(NULL_TREE, build_string(2, "=r"));
107558 + output = chainon(NULL_TREE, build_tree_list(output, new_fptr));
107559 +#if BUILDING_GCC_VERSION <= 4007
107560 + VEC_safe_push(tree, gc, inputs, input);
107561 + VEC_safe_push(tree, gc, outputs, output);
107562 +#else
107563 + vec_safe_push(inputs, input);
107564 + vec_safe_push(outputs, output);
107565 +#endif
107566 + asm_or_stmt = gimple_build_asm_vec("orq %%r12, %0\n\t", inputs, outputs, NULL, NULL);
107567 + SSA_NAME_DEF_STMT(new_fptr) = asm_or_stmt;
107568 + gimple_asm_set_volatile(asm_or_stmt, true);
107569 + gsi_insert_before(gsi, asm_or_stmt, GSI_SAME_STMT);
107570 + update_stmt(asm_or_stmt);
107571 +
107572 + // replace call stmt fn with the new fptr
107573 + gimple_call_set_fn(call_stmt, new_fptr);
107574 + update_stmt(call_stmt);
107575 +}
107576 +
107577 +/*
107578 + * find all C level function pointer dereferences and forcibly set the highest bit of the pointer
107579 + */
107580 +static unsigned int execute_kernexec_fptr(void)
107581 +{
107582 + basic_block bb;
107583 +
107584 + // 1. loop through BBs and GIMPLE statements
107585 + FOR_EACH_BB_FN(bb, cfun) {
107586 + gimple_stmt_iterator gsi;
107587 +
107588 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
107589 + // gimple match: h_1 = get_fptr (); D.2709_3 = h_1 (x_2(D));
107590 + tree fn;
107591 + gimple call_stmt;
107592 +
107593 + // is it a call ...
107594 + call_stmt = gsi_stmt(gsi);
107595 + if (!is_gimple_call(call_stmt))
107596 + continue;
107597 + fn = gimple_call_fn(call_stmt);
107598 + if (TREE_CODE(fn) == ADDR_EXPR)
107599 + continue;
107600 + if (TREE_CODE(fn) != SSA_NAME)
107601 + gcc_unreachable();
107602 +
107603 + // ... through a function pointer
107604 + if (SSA_NAME_VAR(fn) != NULL_TREE) {
107605 + fn = SSA_NAME_VAR(fn);
107606 + if (TREE_CODE(fn) != VAR_DECL && TREE_CODE(fn) != PARM_DECL) {
107607 + debug_tree(fn);
107608 + gcc_unreachable();
107609 + }
107610 + }
107611 + fn = TREE_TYPE(fn);
107612 + if (TREE_CODE(fn) != POINTER_TYPE)
107613 + continue;
107614 + fn = TREE_TYPE(fn);
107615 + if (TREE_CODE(fn) != FUNCTION_TYPE)
107616 + continue;
107617 +
107618 + kernexec_instrument_fptr(&gsi);
107619 +
107620 +//debug_tree(gimple_call_fn(call_stmt));
107621 +//print_gimple_stmt(stderr, call_stmt, 0, TDF_LINENO);
107622 + }
107623 + }
107624 +
107625 + return 0;
107626 +}
107627 +
107628 +// add special KERNEXEC instrumentation: btsq $63,(%rsp) just before retn
107629 +static void kernexec_instrument_retaddr_bts(rtx insn)
107630 +{
107631 + rtx btsq;
107632 + rtvec argvec, constraintvec, labelvec;
107633 + int line;
107634 +
107635 + // create asm volatile("btsq $63,(%%rsp)":::)
107636 + argvec = rtvec_alloc(0);
107637 + constraintvec = rtvec_alloc(0);
107638 + labelvec = rtvec_alloc(0);
107639 + line = expand_location(RTL_LOCATION(insn)).line;
107640 + btsq = gen_rtx_ASM_OPERANDS(VOIDmode, "btsq $63,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
107641 + MEM_VOLATILE_P(btsq) = 1;
107642 +// RTX_FRAME_RELATED_P(btsq) = 1; // not for ASM_OPERANDS
107643 + emit_insn_before(btsq, insn);
107644 +}
107645 +
107646 +// add special KERNEXEC instrumentation: orq %r12,(%rsp) just before retn
107647 +static void kernexec_instrument_retaddr_or(rtx insn)
107648 +{
107649 + rtx orq;
107650 + rtvec argvec, constraintvec, labelvec;
107651 + int line;
107652 +
107653 + // create asm volatile("orq %%r12,(%%rsp)":::)
107654 + argvec = rtvec_alloc(0);
107655 + constraintvec = rtvec_alloc(0);
107656 + labelvec = rtvec_alloc(0);
107657 + line = expand_location(RTL_LOCATION(insn)).line;
107658 + orq = gen_rtx_ASM_OPERANDS(VOIDmode, "orq %%r12,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
107659 + MEM_VOLATILE_P(orq) = 1;
107660 +// RTX_FRAME_RELATED_P(orq) = 1; // not for ASM_OPERANDS
107661 + emit_insn_before(orq, insn);
107662 +}
107663 +
107664 +/*
107665 + * find all asm level function returns and forcibly set the highest bit of the return address
107666 + */
107667 +static unsigned int execute_kernexec_retaddr(void)
107668 +{
107669 + rtx insn;
107670 +
107671 +// if (stack_realign_drap)
107672 +// inform(DECL_SOURCE_LOCATION(current_function_decl), "drap detected in %s\n", IDENTIFIER_POINTER(DECL_NAME(current_function_decl)));
107673 +
107674 + // 1. find function returns
107675 + for (insn = get_insns(); insn; insn = NEXT_INSN(insn)) {
107676 + // rtl match: (jump_insn 41 40 42 2 (return) fptr.c:42 634 {return_internal} (nil))
107677 + // (jump_insn 12 9 11 2 (parallel [ (return) (unspec [ (0) ] UNSPEC_REP) ]) fptr.c:46 635 {return_internal_long} (nil))
107678 + // (jump_insn 97 96 98 6 (simple_return) fptr.c:50 -1 (nil) -> simple_return)
107679 + rtx body;
107680 +
107681 + // is it a retn
107682 + if (!JUMP_P(insn))
107683 + continue;
107684 + body = PATTERN(insn);
107685 + if (GET_CODE(body) == PARALLEL)
107686 + body = XVECEXP(body, 0, 0);
107687 + if (!ANY_RETURN_P(body))
107688 + continue;
107689 + kernexec_instrument_retaddr(insn);
107690 + }
107691 +
107692 +// print_simple_rtl(stderr, get_insns());
107693 +// print_rtl(stderr, get_insns());
107694 +
107695 + return 0;
107696 +}
107697 +
107698 +static bool kernexec_cmodel_check(void)
107699 +{
107700 + tree section;
107701 +
107702 + if (ix86_cmodel != CM_KERNEL)
107703 + return false;
107704 +
107705 + section = lookup_attribute("section", DECL_ATTRIBUTES(current_function_decl));
107706 + if (!section || !TREE_VALUE(section))
107707 + return true;
107708 +
107709 + section = TREE_VALUE(TREE_VALUE(section));
107710 + if (strncmp(TREE_STRING_POINTER(section), ".vsyscall_", 10))
107711 + return true;
107712 +
107713 + return false;
107714 +}
107715 +
107716 +#if BUILDING_GCC_VERSION >= 4009
107717 +static const struct pass_data kernexec_reload_pass_data = {
107718 +#else
107719 +static struct gimple_opt_pass kernexec_reload_pass = {
107720 + .pass = {
107721 +#endif
107722 + .type = GIMPLE_PASS,
107723 + .name = "kernexec_reload",
107724 +#if BUILDING_GCC_VERSION >= 4008
107725 + .optinfo_flags = OPTGROUP_NONE,
107726 +#endif
107727 +#if BUILDING_GCC_VERSION >= 4009
107728 + .has_gate = true,
107729 + .has_execute = true,
107730 +#else
107731 + .gate = kernexec_cmodel_check,
107732 + .execute = execute_kernexec_reload,
107733 + .sub = NULL,
107734 + .next = NULL,
107735 + .static_pass_number = 0,
107736 +#endif
107737 + .tv_id = TV_NONE,
107738 + .properties_required = 0,
107739 + .properties_provided = 0,
107740 + .properties_destroyed = 0,
107741 + .todo_flags_start = 0,
107742 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa_no_phi
107743 +#if BUILDING_GCC_VERSION < 4009
107744 + }
107745 +#endif
107746 +};
107747 +
107748 +#if BUILDING_GCC_VERSION >= 4009
107749 +static const struct pass_data kernexec_fptr_pass_data = {
107750 +#else
107751 +static struct gimple_opt_pass kernexec_fptr_pass = {
107752 + .pass = {
107753 +#endif
107754 + .type = GIMPLE_PASS,
107755 + .name = "kernexec_fptr",
107756 +#if BUILDING_GCC_VERSION >= 4008
107757 + .optinfo_flags = OPTGROUP_NONE,
107758 +#endif
107759 +#if BUILDING_GCC_VERSION >= 4009
107760 + .has_gate = true,
107761 + .has_execute = true,
107762 +#else
107763 + .gate = kernexec_cmodel_check,
107764 + .execute = execute_kernexec_fptr,
107765 + .sub = NULL,
107766 + .next = NULL,
107767 + .static_pass_number = 0,
107768 +#endif
107769 + .tv_id = TV_NONE,
107770 + .properties_required = 0,
107771 + .properties_provided = 0,
107772 + .properties_destroyed = 0,
107773 + .todo_flags_start = 0,
107774 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa_no_phi
107775 +#if BUILDING_GCC_VERSION < 4009
107776 + }
107777 +#endif
107778 +};
107779 +
107780 +#if BUILDING_GCC_VERSION >= 4009
107781 +static const struct pass_data kernexec_retaddr_pass_data = {
107782 +#else
107783 +static struct rtl_opt_pass kernexec_retaddr_pass = {
107784 + .pass = {
107785 +#endif
107786 + .type = RTL_PASS,
107787 + .name = "kernexec_retaddr",
107788 +#if BUILDING_GCC_VERSION >= 4008
107789 + .optinfo_flags = OPTGROUP_NONE,
107790 +#endif
107791 +#if BUILDING_GCC_VERSION >= 4009
107792 + .has_gate = true,
107793 + .has_execute = true,
107794 +#else
107795 + .gate = kernexec_cmodel_check,
107796 + .execute = execute_kernexec_retaddr,
107797 + .sub = NULL,
107798 + .next = NULL,
107799 + .static_pass_number = 0,
107800 +#endif
107801 + .tv_id = TV_NONE,
107802 + .properties_required = 0,
107803 + .properties_provided = 0,
107804 + .properties_destroyed = 0,
107805 + .todo_flags_start = 0,
107806 + .todo_flags_finish = TODO_dump_func | TODO_ggc_collect
107807 +#if BUILDING_GCC_VERSION < 4009
107808 + }
107809 +#endif
107810 +};
107811 +
107812 +#if BUILDING_GCC_VERSION >= 4009
107813 +namespace {
107814 +class kernexec_reload_pass : public gimple_opt_pass {
107815 +public:
107816 + kernexec_reload_pass() : gimple_opt_pass(kernexec_reload_pass_data, g) {}
107817 + bool gate() { return kernexec_cmodel_check(); }
107818 + unsigned int execute() { return execute_kernexec_reload(); }
107819 +};
107820 +
107821 +class kernexec_fptr_pass : public gimple_opt_pass {
107822 +public:
107823 + kernexec_fptr_pass() : gimple_opt_pass(kernexec_fptr_pass_data, g) {}
107824 + bool gate() { return kernexec_cmodel_check(); }
107825 + unsigned int execute() { return execute_kernexec_fptr(); }
107826 +};
107827 +
107828 +class kernexec_retaddr_pass : public rtl_opt_pass {
107829 +public:
107830 + kernexec_retaddr_pass() : rtl_opt_pass(kernexec_retaddr_pass_data, g) {}
107831 + bool gate() { return kernexec_cmodel_check(); }
107832 + unsigned int execute() { return execute_kernexec_retaddr(); }
107833 +};
107834 +}
107835 +
107836 +static opt_pass *make_kernexec_reload_pass(void)
107837 +{
107838 + return new kernexec_reload_pass();
107839 +}
107840 +
107841 +static opt_pass *make_kernexec_fptr_pass(void)
107842 +{
107843 + return new kernexec_fptr_pass();
107844 +}
107845 +
107846 +static opt_pass *make_kernexec_retaddr_pass(void)
107847 +{
107848 + return new kernexec_retaddr_pass();
107849 +}
107850 +#else
107851 +static struct opt_pass *make_kernexec_reload_pass(void)
107852 +{
107853 + return &kernexec_reload_pass.pass;
107854 +}
107855 +
107856 +static struct opt_pass *make_kernexec_fptr_pass(void)
107857 +{
107858 + return &kernexec_fptr_pass.pass;
107859 +}
107860 +
107861 +static struct opt_pass *make_kernexec_retaddr_pass(void)
107862 +{
107863 + return &kernexec_retaddr_pass.pass;
107864 +}
107865 +#endif
107866 +
107867 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
107868 +{
107869 + const char * const plugin_name = plugin_info->base_name;
107870 + const int argc = plugin_info->argc;
107871 + const struct plugin_argument * const argv = plugin_info->argv;
107872 + int i;
107873 + struct register_pass_info kernexec_reload_pass_info;
107874 + struct register_pass_info kernexec_fptr_pass_info;
107875 + struct register_pass_info kernexec_retaddr_pass_info;
107876 +
107877 + kernexec_reload_pass_info.pass = make_kernexec_reload_pass();
107878 + kernexec_reload_pass_info.reference_pass_name = "ssa";
107879 + kernexec_reload_pass_info.ref_pass_instance_number = 1;
107880 + kernexec_reload_pass_info.pos_op = PASS_POS_INSERT_AFTER;
107881 +
107882 + kernexec_fptr_pass_info.pass = make_kernexec_fptr_pass();
107883 + kernexec_fptr_pass_info.reference_pass_name = "ssa";
107884 + kernexec_fptr_pass_info.ref_pass_instance_number = 1;
107885 + kernexec_fptr_pass_info.pos_op = PASS_POS_INSERT_AFTER;
107886 +
107887 + kernexec_retaddr_pass_info.pass = make_kernexec_retaddr_pass();
107888 + kernexec_retaddr_pass_info.reference_pass_name = "pro_and_epilogue";
107889 + kernexec_retaddr_pass_info.ref_pass_instance_number = 1;
107890 + kernexec_retaddr_pass_info.pos_op = PASS_POS_INSERT_AFTER;
107891 +
107892 + if (!plugin_default_version_check(version, &gcc_version)) {
107893 + error(G_("incompatible gcc/plugin versions"));
107894 + return 1;
107895 + }
107896 +
107897 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kernexec_plugin_info);
107898 +
107899 + if (TARGET_64BIT == 0)
107900 + return 0;
107901 +
107902 + for (i = 0; i < argc; ++i) {
107903 + if (!strcmp(argv[i].key, "method")) {
107904 + if (!argv[i].value) {
107905 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
107906 + continue;
107907 + }
107908 + if (!strcmp(argv[i].value, "bts")) {
107909 + kernexec_instrument_fptr = kernexec_instrument_fptr_bts;
107910 + kernexec_instrument_retaddr = kernexec_instrument_retaddr_bts;
107911 + } else if (!strcmp(argv[i].value, "or")) {
107912 + kernexec_instrument_fptr = kernexec_instrument_fptr_or;
107913 + kernexec_instrument_retaddr = kernexec_instrument_retaddr_or;
107914 + fix_register("r12", 1, 1);
107915 + } else
107916 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
107917 + continue;
107918 + }
107919 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
107920 + }
107921 + if (!kernexec_instrument_fptr || !kernexec_instrument_retaddr)
107922 + error(G_("no instrumentation method was selected via '-fplugin-arg-%s-method'"), plugin_name);
107923 +
107924 + if (kernexec_instrument_fptr == kernexec_instrument_fptr_or)
107925 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_reload_pass_info);
107926 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_fptr_pass_info);
107927 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_retaddr_pass_info);
107928 +
107929 + return 0;
107930 +}
107931 diff --git a/tools/gcc/latent_entropy_plugin.c b/tools/gcc/latent_entropy_plugin.c
107932 new file mode 100644
107933 index 0000000..39d7cc7
107934 --- /dev/null
107935 +++ b/tools/gcc/latent_entropy_plugin.c
107936 @@ -0,0 +1,462 @@
107937 +/*
107938 + * Copyright 2012-2014 by the PaX Team <pageexec@freemail.hu>
107939 + * Licensed under the GPL v2
107940 + *
107941 + * Note: the choice of the license means that the compilation process is
107942 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
107943 + * but for the kernel it doesn't matter since it doesn't link against
107944 + * any of the gcc libraries
107945 + *
107946 + * gcc plugin to help generate a little bit of entropy from program state,
107947 + * used throughout the uptime of the kernel
107948 + *
107949 + * TODO:
107950 + * - add ipa pass to identify not explicitly marked candidate functions
107951 + * - mix in more program state (function arguments/return values, loop variables, etc)
107952 + * - more instrumentation control via attribute parameters
107953 + *
107954 + * BUGS:
107955 + * - LTO needs -flto-partition=none for now
107956 + */
107957 +
107958 +#include "gcc-common.h"
107959 +
107960 +int plugin_is_GPL_compatible;
107961 +
107962 +static tree latent_entropy_decl;
107963 +
107964 +static struct plugin_info latent_entropy_plugin_info = {
107965 + .version = "201403280150",
107966 + .help = NULL
107967 +};
107968 +
107969 +static unsigned HOST_WIDE_INT seed;
107970 +static unsigned HOST_WIDE_INT get_random_const(void)
107971 +{
107972 + unsigned int i;
107973 + unsigned HOST_WIDE_INT ret = 0;
107974 +
107975 + for (i = 0; i < 8 * sizeof ret; i++) {
107976 + ret = (ret << 1) | (seed & 1);
107977 + seed >>= 1;
107978 + if (ret & 1)
107979 + seed ^= 0xD800000000000000ULL;
107980 + }
107981 +
107982 + return ret;
107983 +}
107984 +
107985 +static tree handle_latent_entropy_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
107986 +{
107987 + tree type;
107988 + unsigned long long mask;
107989 +#if BUILDING_GCC_VERSION <= 4007
107990 + VEC(constructor_elt, gc) *vals;
107991 +#else
107992 + vec<constructor_elt, va_gc> *vals;
107993 +#endif
107994 +
107995 + switch (TREE_CODE(*node)) {
107996 + default:
107997 + *no_add_attrs = true;
107998 + error("%qE attribute only applies to functions and variables", name);
107999 + break;
108000 +
108001 + case VAR_DECL:
108002 + if (DECL_INITIAL(*node)) {
108003 + *no_add_attrs = true;
108004 + error("variable %qD with %qE attribute must not be initialized", *node, name);
108005 + break;
108006 + }
108007 +
108008 + if (!TREE_STATIC(*node)) {
108009 + *no_add_attrs = true;
108010 + error("variable %qD with %qE attribute must not be local", *node, name);
108011 + break;
108012 + }
108013 +
108014 + type = TREE_TYPE(*node);
108015 + switch (TREE_CODE(type)) {
108016 + default:
108017 + *no_add_attrs = true;
108018 + 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);
108019 + break;
108020 +
108021 + case RECORD_TYPE: {
108022 + tree field;
108023 + unsigned int nelt = 0;
108024 +
108025 + for (field = TYPE_FIELDS(type); field; nelt++, field = TREE_CHAIN(field)) {
108026 + tree fieldtype;
108027 +
108028 + fieldtype = TREE_TYPE(field);
108029 + if (TREE_CODE(fieldtype) != INTEGER_TYPE) {
108030 + *no_add_attrs = true;
108031 + error("structure variable %qD with %qE attribute has a non-integer field %qE", *node, name, field);
108032 + break;
108033 + }
108034 + }
108035 +
108036 + if (field)
108037 + break;
108038 +
108039 +#if BUILDING_GCC_VERSION <= 4007
108040 + vals = VEC_alloc(constructor_elt, gc, nelt);
108041 +#else
108042 + vec_alloc(vals, nelt);
108043 +#endif
108044 +
108045 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
108046 + tree fieldtype;
108047 +
108048 + fieldtype = TREE_TYPE(field);
108049 + mask = 1ULL << (TREE_INT_CST_LOW(TYPE_SIZE(fieldtype)) - 1);
108050 + mask = 2 * (mask - 1) + 1;
108051 +
108052 + if (TYPE_UNSIGNED(fieldtype))
108053 + CONSTRUCTOR_APPEND_ELT(vals, field, build_int_cstu(fieldtype, mask & get_random_const()));
108054 + else
108055 + CONSTRUCTOR_APPEND_ELT(vals, field, build_int_cst(fieldtype, mask & get_random_const()));
108056 + }
108057 +
108058 + DECL_INITIAL(*node) = build_constructor(type, vals);
108059 +//debug_tree(DECL_INITIAL(*node));
108060 + break;
108061 + }
108062 +
108063 + case INTEGER_TYPE:
108064 + mask = 1ULL << (TREE_INT_CST_LOW(TYPE_SIZE(type)) - 1);
108065 + mask = 2 * (mask - 1) + 1;
108066 +
108067 + if (TYPE_UNSIGNED(type))
108068 + DECL_INITIAL(*node) = build_int_cstu(type, mask & get_random_const());
108069 + else
108070 + DECL_INITIAL(*node) = build_int_cst(type, mask & get_random_const());
108071 + break;
108072 +
108073 + case ARRAY_TYPE: {
108074 + tree elt_type, array_size, elt_size;
108075 + unsigned int i, nelt;
108076 +
108077 + elt_type = TREE_TYPE(type);
108078 + elt_size = TYPE_SIZE_UNIT(TREE_TYPE(type));
108079 + array_size = TYPE_SIZE_UNIT(type);
108080 +
108081 + if (TREE_CODE(elt_type) != INTEGER_TYPE || !array_size || TREE_CODE(array_size) != INTEGER_CST) {
108082 + *no_add_attrs = true;
108083 + error("array variable %qD with %qE attribute must be a fixed length integer array type", *node, name);
108084 + break;
108085 + }
108086 +
108087 + nelt = TREE_INT_CST_LOW(array_size) / TREE_INT_CST_LOW(elt_size);
108088 +#if BUILDING_GCC_VERSION <= 4007
108089 + vals = VEC_alloc(constructor_elt, gc, nelt);
108090 +#else
108091 + vec_alloc(vals, nelt);
108092 +#endif
108093 +
108094 + mask = 1ULL << (TREE_INT_CST_LOW(TYPE_SIZE(elt_type)) - 1);
108095 + mask = 2 * (mask - 1) + 1;
108096 +
108097 + for (i = 0; i < nelt; i++)
108098 + if (TYPE_UNSIGNED(elt_type))
108099 + CONSTRUCTOR_APPEND_ELT(vals, size_int(i), build_int_cstu(elt_type, mask & get_random_const()));
108100 + else
108101 + CONSTRUCTOR_APPEND_ELT(vals, size_int(i), build_int_cst(elt_type, mask & get_random_const()));
108102 +
108103 + DECL_INITIAL(*node) = build_constructor(type, vals);
108104 +//debug_tree(DECL_INITIAL(*node));
108105 + break;
108106 + }
108107 + }
108108 + break;
108109 +
108110 + case FUNCTION_DECL:
108111 + break;
108112 + }
108113 +
108114 + return NULL_TREE;
108115 +}
108116 +
108117 +static struct attribute_spec latent_entropy_attr = {
108118 + .name = "latent_entropy",
108119 + .min_length = 0,
108120 + .max_length = 0,
108121 + .decl_required = true,
108122 + .type_required = false,
108123 + .function_type_required = false,
108124 + .handler = handle_latent_entropy_attribute,
108125 +#if BUILDING_GCC_VERSION >= 4007
108126 + .affects_type_identity = false
108127 +#endif
108128 +};
108129 +
108130 +static void register_attributes(void *event_data, void *data)
108131 +{
108132 + register_attribute(&latent_entropy_attr);
108133 +}
108134 +
108135 +static bool gate_latent_entropy(void)
108136 +{
108137 + // don't bother with noreturn functions for now
108138 + if (TREE_THIS_VOLATILE(current_function_decl))
108139 + return false;
108140 +
108141 + return lookup_attribute("latent_entropy", DECL_ATTRIBUTES(current_function_decl)) != NULL_TREE;
108142 +}
108143 +
108144 +static enum tree_code get_op(tree *rhs)
108145 +{
108146 + static enum tree_code op;
108147 + unsigned HOST_WIDE_INT random_const;
108148 +
108149 + random_const = get_random_const();
108150 +
108151 + switch (op) {
108152 + case BIT_XOR_EXPR:
108153 + op = PLUS_EXPR;
108154 + break;
108155 +
108156 + case PLUS_EXPR:
108157 + if (rhs) {
108158 + op = LROTATE_EXPR;
108159 + random_const &= HOST_BITS_PER_WIDE_INT - 1;
108160 + break;
108161 + }
108162 +
108163 + case LROTATE_EXPR:
108164 + default:
108165 + op = BIT_XOR_EXPR;
108166 + break;
108167 + }
108168 + if (rhs)
108169 + *rhs = build_int_cstu(unsigned_intDI_type_node, random_const);
108170 + return op;
108171 +}
108172 +
108173 +static void perturb_local_entropy(basic_block bb, tree local_entropy)
108174 +{
108175 + gimple_stmt_iterator gsi;
108176 + gimple assign;
108177 + tree addxorrol, rhs;
108178 + enum tree_code op;
108179 +
108180 + op = get_op(&rhs);
108181 + addxorrol = fold_build2_loc(UNKNOWN_LOCATION, op, unsigned_intDI_type_node, local_entropy, rhs);
108182 + assign = gimple_build_assign(local_entropy, addxorrol);
108183 + gsi = gsi_after_labels(bb);
108184 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
108185 + update_stmt(assign);
108186 +//debug_bb(bb);
108187 +}
108188 +
108189 +static void perturb_latent_entropy(basic_block bb, tree rhs)
108190 +{
108191 + gimple_stmt_iterator gsi;
108192 + gimple assign;
108193 + tree addxorrol, temp;
108194 +
108195 + // 1. create temporary copy of latent_entropy
108196 + temp = create_tmp_var(unsigned_intDI_type_node, "temp_latent_entropy");
108197 + add_referenced_var(temp);
108198 +
108199 + // 2. read...
108200 + temp = make_ssa_name(temp, NULL);
108201 + assign = gimple_build_assign(temp, latent_entropy_decl);
108202 + SSA_NAME_DEF_STMT(temp) = assign;
108203 + add_referenced_var(latent_entropy_decl);
108204 + gsi = gsi_after_labels(bb);
108205 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
108206 + update_stmt(assign);
108207 +
108208 + // 3. ...modify...
108209 + addxorrol = fold_build2_loc(UNKNOWN_LOCATION, get_op(NULL), unsigned_intDI_type_node, temp, rhs);
108210 + temp = make_ssa_name(SSA_NAME_VAR(temp), NULL);
108211 + assign = gimple_build_assign(temp, addxorrol);
108212 + SSA_NAME_DEF_STMT(temp) = assign;
108213 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
108214 + update_stmt(assign);
108215 +
108216 + // 4. ...write latent_entropy
108217 + assign = gimple_build_assign(latent_entropy_decl, temp);
108218 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
108219 + update_stmt(assign);
108220 +}
108221 +
108222 +static unsigned int execute_latent_entropy(void)
108223 +{
108224 + basic_block bb;
108225 + gimple assign;
108226 + gimple_stmt_iterator gsi;
108227 + tree local_entropy;
108228 +
108229 + if (!latent_entropy_decl) {
108230 +#if BUILDING_GCC_VERSION >= 4009
108231 + varpool_node *node;
108232 +#else
108233 + struct varpool_node *node;
108234 +#endif
108235 +
108236 + FOR_EACH_VARIABLE(node) {
108237 + tree var = NODE_DECL(node);
108238 +
108239 + if (strcmp(IDENTIFIER_POINTER(DECL_NAME(var)), "latent_entropy"))
108240 + continue;
108241 + latent_entropy_decl = var;
108242 +// debug_tree(var);
108243 + break;
108244 + }
108245 + if (!latent_entropy_decl) {
108246 +// debug_tree(current_function_decl);
108247 + return 0;
108248 + }
108249 + }
108250 +
108251 +//fprintf(stderr, "latent_entropy: %s\n", IDENTIFIER_POINTER(DECL_NAME(current_function_decl)));
108252 +
108253 + // 1. create local entropy variable
108254 + local_entropy = create_tmp_var(unsigned_intDI_type_node, "local_entropy");
108255 + add_referenced_var(local_entropy);
108256 + mark_sym_for_renaming(local_entropy);
108257 +
108258 + // 2. initialize local entropy variable
108259 + bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
108260 + if (dom_info_available_p(CDI_DOMINATORS))
108261 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
108262 + gsi = gsi_start_bb(bb);
108263 +
108264 + assign = gimple_build_assign(local_entropy, build_int_cstu(unsigned_intDI_type_node, get_random_const()));
108265 +// gimple_set_location(assign, loc);
108266 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
108267 + update_stmt(assign);
108268 +//debug_bb(bb);
108269 + gcc_assert(single_succ_p(bb));
108270 + bb = single_succ(bb);
108271 +
108272 + // 3. instrument each BB with an operation on the local entropy variable
108273 + while (bb != EXIT_BLOCK_PTR_FOR_FN(cfun)) {
108274 + perturb_local_entropy(bb, local_entropy);
108275 +//debug_bb(bb);
108276 + bb = bb->next_bb;
108277 + };
108278 +
108279 + // 4. mix local entropy into the global entropy variable
108280 + gcc_assert(single_pred_p(EXIT_BLOCK_PTR_FOR_FN(cfun)));
108281 + perturb_latent_entropy(single_pred(EXIT_BLOCK_PTR_FOR_FN(cfun)), local_entropy);
108282 +//debug_bb(single_pred(EXIT_BLOCK_PTR_FOR_FN(cfun)));
108283 + return 0;
108284 +}
108285 +
108286 +static void latent_entropy_start_unit(void *gcc_data, void *user_data)
108287 +{
108288 + tree latent_entropy_type;
108289 +
108290 + seed = get_random_seed(false);
108291 +
108292 + if (in_lto_p)
108293 + return;
108294 +
108295 + // extern volatile u64 latent_entropy
108296 + gcc_assert(TYPE_PRECISION(long_long_unsigned_type_node) == 64);
108297 + latent_entropy_type = build_qualified_type(long_long_unsigned_type_node, TYPE_QUALS(long_long_unsigned_type_node) | TYPE_QUAL_VOLATILE);
108298 + latent_entropy_decl = build_decl(UNKNOWN_LOCATION, VAR_DECL, get_identifier("latent_entropy"), latent_entropy_type);
108299 +
108300 + TREE_STATIC(latent_entropy_decl) = 1;
108301 + TREE_PUBLIC(latent_entropy_decl) = 1;
108302 + TREE_USED(latent_entropy_decl) = 1;
108303 + TREE_THIS_VOLATILE(latent_entropy_decl) = 1;
108304 + DECL_EXTERNAL(latent_entropy_decl) = 1;
108305 + DECL_ARTIFICIAL(latent_entropy_decl) = 1;
108306 + lang_hooks.decls.pushdecl(latent_entropy_decl);
108307 +// DECL_ASSEMBLER_NAME(latent_entropy_decl);
108308 +// varpool_finalize_decl(latent_entropy_decl);
108309 +// varpool_mark_needed_node(latent_entropy_decl);
108310 +}
108311 +
108312 +#if BUILDING_GCC_VERSION >= 4009
108313 +static const struct pass_data latent_entropy_pass_data = {
108314 +#else
108315 +static struct gimple_opt_pass latent_entropy_pass = {
108316 + .pass = {
108317 +#endif
108318 + .type = GIMPLE_PASS,
108319 + .name = "latent_entropy",
108320 +#if BUILDING_GCC_VERSION >= 4008
108321 + .optinfo_flags = OPTGROUP_NONE,
108322 +#endif
108323 +#if BUILDING_GCC_VERSION >= 4009
108324 + .has_gate = true,
108325 + .has_execute = true,
108326 +#else
108327 + .gate = gate_latent_entropy,
108328 + .execute = execute_latent_entropy,
108329 + .sub = NULL,
108330 + .next = NULL,
108331 + .static_pass_number = 0,
108332 +#endif
108333 + .tv_id = TV_NONE,
108334 + .properties_required = PROP_gimple_leh | PROP_cfg,
108335 + .properties_provided = 0,
108336 + .properties_destroyed = 0,
108337 + .todo_flags_start = 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
108338 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa
108339 +#if BUILDING_GCC_VERSION < 4009
108340 + }
108341 +#endif
108342 +};
108343 +
108344 +#if BUILDING_GCC_VERSION >= 4009
108345 +namespace {
108346 +class latent_entropy_pass : public gimple_opt_pass {
108347 +public:
108348 + latent_entropy_pass() : gimple_opt_pass(latent_entropy_pass_data, g) {}
108349 + bool gate() { return gate_latent_entropy(); }
108350 + unsigned int execute() { return execute_latent_entropy(); }
108351 +};
108352 +}
108353 +
108354 +static opt_pass *make_latent_entropy_pass(void)
108355 +{
108356 + return new latent_entropy_pass();
108357 +}
108358 +#else
108359 +static struct opt_pass *make_latent_entropy_pass(void)
108360 +{
108361 + return &latent_entropy_pass.pass;
108362 +}
108363 +#endif
108364 +
108365 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
108366 +{
108367 + const char * const plugin_name = plugin_info->base_name;
108368 + struct register_pass_info latent_entropy_pass_info;
108369 +
108370 + latent_entropy_pass_info.pass = make_latent_entropy_pass();
108371 + latent_entropy_pass_info.reference_pass_name = "optimized";
108372 + latent_entropy_pass_info.ref_pass_instance_number = 1;
108373 + latent_entropy_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
108374 + static const struct ggc_root_tab gt_ggc_r_gt_latent_entropy[] = {
108375 + {
108376 + .base = &latent_entropy_decl,
108377 + .nelt = 1,
108378 + .stride = sizeof(latent_entropy_decl),
108379 + .cb = &gt_ggc_mx_tree_node,
108380 + .pchw = &gt_pch_nx_tree_node
108381 + },
108382 + LAST_GGC_ROOT_TAB
108383 + };
108384 +
108385 + if (!plugin_default_version_check(version, &gcc_version)) {
108386 + error(G_("incompatible gcc/plugin versions"));
108387 + return 1;
108388 + }
108389 +
108390 + register_callback(plugin_name, PLUGIN_INFO, NULL, &latent_entropy_plugin_info);
108391 + register_callback(plugin_name, PLUGIN_START_UNIT, &latent_entropy_start_unit, NULL);
108392 + if (!in_lto_p)
108393 + register_callback(plugin_name, PLUGIN_REGISTER_GGC_ROOTS, NULL, (void *)&gt_ggc_r_gt_latent_entropy);
108394 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &latent_entropy_pass_info);
108395 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
108396 +
108397 + return 0;
108398 +}
108399 diff --git a/tools/gcc/randomize_layout_plugin.c b/tools/gcc/randomize_layout_plugin.c
108400 new file mode 100644
108401 index 0000000..8dafb22
108402 --- /dev/null
108403 +++ b/tools/gcc/randomize_layout_plugin.c
108404 @@ -0,0 +1,910 @@
108405 +/*
108406 + * Copyright 2014 by Open Source Security, Inc., Brad Spengler <spender@grsecurity.net>
108407 + * and PaX Team <pageexec@freemail.hu>
108408 + * Licensed under the GPL v2
108409 + *
108410 + * Usage:
108411 + * $ # for 4.5/4.6/C based 4.7
108412 + * $ 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
108413 + * $ # for C++ based 4.7/4.8+
108414 + * $ 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
108415 + * $ gcc -fplugin=./randomize_layout_plugin.so test.c -O2
108416 + */
108417 +
108418 +#include "gcc-common.h"
108419 +#include "randomize_layout_seed.h"
108420 +
108421 +#if BUILDING_GCC_MAJOR < 4 || BUILDING_GCC_MINOR < 6 || (BUILDING_GCC_MINOR == 6 && BUILDING_GCC_PATCHLEVEL < 4)
108422 +#error "The RANDSTRUCT plugin requires GCC 4.6.4 or newer."
108423 +#endif
108424 +
108425 +#define ORIG_TYPE_NAME(node) \
108426 + (TYPE_NAME(TYPE_MAIN_VARIANT(node)) != NULL_TREE ? ((const unsigned char *)IDENTIFIER_POINTER(TYPE_NAME(TYPE_MAIN_VARIANT(node)))) : (const unsigned char *)"anonymous")
108427 +
108428 +int plugin_is_GPL_compatible;
108429 +
108430 +static int performance_mode;
108431 +
108432 +static struct plugin_info randomize_layout_plugin_info = {
108433 + .version = "201402201816",
108434 + .help = "disable\t\t\tdo not activate plugin\n"
108435 + "performance-mode\tenable cacheline-aware layout randomization\n"
108436 +};
108437 +
108438 +/* from old Linux dcache.h */
108439 +static inline unsigned long
108440 +partial_name_hash(unsigned long c, unsigned long prevhash)
108441 +{
108442 + return (prevhash + (c << 4) + (c >> 4)) * 11;
108443 +}
108444 +static inline unsigned int
108445 +name_hash(const unsigned char *name)
108446 +{
108447 + unsigned long hash = 0;
108448 + unsigned int len = strlen((const char *)name);
108449 + while (len--)
108450 + hash = partial_name_hash(*name++, hash);
108451 + return (unsigned int)hash;
108452 +}
108453 +
108454 +static tree handle_randomize_layout_attr(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
108455 +{
108456 + tree type;
108457 +
108458 + *no_add_attrs = true;
108459 + if (TREE_CODE(*node) == FUNCTION_DECL) {
108460 + error("%qE attribute does not apply to functions (%qF)", name, *node);
108461 + return NULL_TREE;
108462 + }
108463 +
108464 + if (TREE_CODE(*node) == PARM_DECL) {
108465 + error("%qE attribute does not apply to function parameters (%qD)", name, *node);
108466 + return NULL_TREE;
108467 + }
108468 +
108469 + if (TREE_CODE(*node) == VAR_DECL) {
108470 + error("%qE attribute does not apply to variables (%qD)", name, *node);
108471 + return NULL_TREE;
108472 + }
108473 +
108474 + if (TYPE_P(*node)) {
108475 + type = *node;
108476 + } else {
108477 + gcc_assert(TREE_CODE(*node) == TYPE_DECL);
108478 + type = TREE_TYPE(*node);
108479 + }
108480 +
108481 + if (TREE_CODE(type) != RECORD_TYPE) {
108482 + error("%qE attribute used on %qT applies to struct types only", name, type);
108483 + return NULL_TREE;
108484 + }
108485 +
108486 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(type))) {
108487 + error("%qE attribute is already applied to the type %qT", name, type);
108488 + return NULL_TREE;
108489 + }
108490 +
108491 + *no_add_attrs = false;
108492 +
108493 + return NULL_TREE;
108494 +}
108495 +
108496 +/* set on complete types that we don't need to inspect further at all */
108497 +static tree handle_randomize_considered_attr(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
108498 +{
108499 + *no_add_attrs = false;
108500 + return NULL_TREE;
108501 +}
108502 +
108503 +/*
108504 + * set on types that we've performed a shuffle on, to prevent re-shuffling
108505 + * this does not preclude us from inspecting its fields for potential shuffles
108506 + */
108507 +static tree handle_randomize_performed_attr(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
108508 +{
108509 + *no_add_attrs = false;
108510 + return NULL_TREE;
108511 +}
108512 +
108513 +/*
108514 + * 64bit variant of Bob Jenkins' public domain PRNG
108515 + * 256 bits of internal state
108516 + */
108517 +
108518 +typedef unsigned long long u64;
108519 +
108520 +typedef struct ranctx { u64 a; u64 b; u64 c; u64 d; } ranctx;
108521 +
108522 +#define rot(x,k) (((x)<<(k))|((x)>>(64-(k))))
108523 +static u64 ranval(ranctx *x) {
108524 + u64 e = x->a - rot(x->b, 7);
108525 + x->a = x->b ^ rot(x->c, 13);
108526 + x->b = x->c + rot(x->d, 37);
108527 + x->c = x->d + e;
108528 + x->d = e + x->a;
108529 + return x->d;
108530 +}
108531 +
108532 +static void raninit(ranctx *x, u64 *seed) {
108533 + int i;
108534 +
108535 + x->a = seed[0];
108536 + x->b = seed[1];
108537 + x->c = seed[2];
108538 + x->d = seed[3];
108539 +
108540 + for (i=0; i < 30; ++i)
108541 + (void)ranval(x);
108542 +}
108543 +
108544 +static u64 shuffle_seed[4];
108545 +
108546 +struct partition_group {
108547 + tree tree_start;
108548 + unsigned long start;
108549 + unsigned long length;
108550 +};
108551 +
108552 +static void partition_struct(tree *fields, unsigned long length, struct partition_group *size_groups, unsigned long *num_groups)
108553 +{
108554 + unsigned long i;
108555 + unsigned long accum_size = 0;
108556 + unsigned long accum_length = 0;
108557 + unsigned long group_idx = 0;
108558 +
108559 + gcc_assert(length < INT_MAX);
108560 +
108561 + memset(size_groups, 0, sizeof(struct partition_group) * length);
108562 +
108563 + for (i = 0; i < length; i++) {
108564 + if (size_groups[group_idx].tree_start == NULL_TREE) {
108565 + size_groups[group_idx].tree_start = fields[i];
108566 + size_groups[group_idx].start = i;
108567 + accum_length = 0;
108568 + accum_size = 0;
108569 + }
108570 + accum_size += (unsigned long)int_size_in_bytes(TREE_TYPE(fields[i]));
108571 + accum_length++;
108572 + if (accum_size >= 64) {
108573 + size_groups[group_idx].length = accum_length;
108574 + accum_length = 0;
108575 + group_idx++;
108576 + }
108577 + }
108578 +
108579 + if (size_groups[group_idx].tree_start != NULL_TREE &&
108580 + !size_groups[group_idx].length) {
108581 + size_groups[group_idx].length = accum_length;
108582 + group_idx++;
108583 + }
108584 +
108585 + *num_groups = group_idx;
108586 +}
108587 +
108588 +static void performance_shuffle(tree *newtree, unsigned long length, ranctx *prng_state)
108589 +{
108590 + unsigned long i, x;
108591 + struct partition_group size_group[length];
108592 + unsigned long num_groups = 0;
108593 + unsigned long randnum;
108594 +
108595 + partition_struct(newtree, length, (struct partition_group *)&size_group, &num_groups);
108596 + for (i = num_groups - 1; i > 0; i--) {
108597 + struct partition_group tmp;
108598 + randnum = ranval(prng_state) % (i + 1);
108599 + tmp = size_group[i];
108600 + size_group[i] = size_group[randnum];
108601 + size_group[randnum] = tmp;
108602 + }
108603 +
108604 + for (x = 0; x < num_groups; x++) {
108605 + for (i = size_group[x].start + size_group[x].length - 1; i > size_group[x].start; i--) {
108606 + tree tmp;
108607 + if (DECL_BIT_FIELD_TYPE(newtree[i]))
108608 + continue;
108609 + randnum = ranval(prng_state) % (i + 1);
108610 + // we could handle this case differently if desired
108611 + if (DECL_BIT_FIELD_TYPE(newtree[randnum]))
108612 + continue;
108613 + tmp = newtree[i];
108614 + newtree[i] = newtree[randnum];
108615 + newtree[randnum] = tmp;
108616 + }
108617 + }
108618 +}
108619 +
108620 +static void full_shuffle(tree *newtree, unsigned long length, ranctx *prng_state)
108621 +{
108622 + unsigned long i, randnum;
108623 +
108624 + for (i = length - 1; i > 0; i--) {
108625 + tree tmp;
108626 + randnum = ranval(prng_state) % (i + 1);
108627 + tmp = newtree[i];
108628 + newtree[i] = newtree[randnum];
108629 + newtree[randnum] = tmp;
108630 + }
108631 +}
108632 +
108633 +/* modern in-place Fisher-Yates shuffle */
108634 +static void shuffle(const_tree type, tree *newtree, unsigned long length)
108635 +{
108636 + unsigned long i;
108637 + u64 seed[4];
108638 + ranctx prng_state;
108639 + const unsigned char *structname;
108640 +
108641 + if (length == 0)
108642 + return;
108643 +
108644 + gcc_assert(TREE_CODE(type) == RECORD_TYPE);
108645 +
108646 + structname = ORIG_TYPE_NAME(type);
108647 +
108648 +#ifdef __DEBUG_PLUGIN
108649 + fprintf(stderr, "Shuffling struct %s %p\n", (const char *)structname, type);
108650 +#ifdef __DEBUG_VERBOSE
108651 + debug_tree((tree)type);
108652 +#endif
108653 +#endif
108654 +
108655 + for (i = 0; i < 4; i++) {
108656 + seed[i] = shuffle_seed[i];
108657 + seed[i] ^= name_hash(structname);
108658 + }
108659 +
108660 + raninit(&prng_state, (u64 *)&seed);
108661 +
108662 + if (performance_mode)
108663 + performance_shuffle(newtree, length, &prng_state);
108664 + else
108665 + full_shuffle(newtree, length, &prng_state);
108666 +}
108667 +
108668 +static bool is_flexible_array(const_tree field)
108669 +{
108670 + const_tree fieldtype;
108671 + const_tree typesize;
108672 + const_tree elemtype;
108673 + const_tree elemsize;
108674 +
108675 + fieldtype = TREE_TYPE(field);
108676 + typesize = TYPE_SIZE(fieldtype);
108677 +
108678 + if (TREE_CODE(fieldtype) != ARRAY_TYPE)
108679 + return false;
108680 +
108681 + elemtype = TREE_TYPE(fieldtype);
108682 + elemsize = TYPE_SIZE(elemtype);
108683 +
108684 + /* size of type is represented in bits */
108685 +
108686 + if (typesize == NULL_TREE && TYPE_DOMAIN(fieldtype) != NULL_TREE &&
108687 + TYPE_MAX_VALUE(TYPE_DOMAIN(fieldtype)) == NULL_TREE)
108688 + return true;
108689 +
108690 + if (typesize != NULL_TREE &&
108691 + (TREE_CONSTANT(typesize) && (!TREE_INT_CST_LOW(typesize) ||
108692 + TREE_INT_CST_LOW(typesize) == TREE_INT_CST_LOW(elemsize))))
108693 + return true;
108694 +
108695 + return false;
108696 +}
108697 +
108698 +static int relayout_struct(tree type)
108699 +{
108700 + unsigned long num_fields = (unsigned long)list_length(TYPE_FIELDS(type));
108701 + unsigned long shuffle_length = num_fields;
108702 + tree field;
108703 + tree newtree[num_fields];
108704 + unsigned long i;
108705 + tree list;
108706 + tree variant;
108707 + expanded_location xloc;
108708 +
108709 + if (TYPE_FIELDS(type) == NULL_TREE)
108710 + return 0;
108711 +
108712 + if (num_fields < 2)
108713 + return 0;
108714 +
108715 + gcc_assert(TREE_CODE(type) == RECORD_TYPE);
108716 +
108717 + gcc_assert(num_fields < INT_MAX);
108718 +
108719 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(type)) ||
108720 + lookup_attribute("no_randomize_layout", TYPE_ATTRIBUTES(TYPE_MAIN_VARIANT(type))))
108721 + return 0;
108722 +
108723 + /* throw out any structs in uapi */
108724 + xloc = expand_location(DECL_SOURCE_LOCATION(TYPE_FIELDS(type)));
108725 +
108726 + if (strstr(xloc.file, "/uapi/"))
108727 + error(G_("attempted to randomize userland API struct %s"), ORIG_TYPE_NAME(type));
108728 +
108729 + for (field = TYPE_FIELDS(type), i = 0; field; field = TREE_CHAIN(field), i++) {
108730 + gcc_assert(TREE_CODE(field) == FIELD_DECL);
108731 + newtree[i] = field;
108732 + }
108733 +
108734 + /*
108735 + * enforce that we don't randomize the layout of the last
108736 + * element of a struct if it's a 0 or 1-length array
108737 + * or a proper flexible array
108738 + */
108739 + if (is_flexible_array(newtree[num_fields - 1]))
108740 + shuffle_length--;
108741 +
108742 + shuffle(type, (tree *)newtree, shuffle_length);
108743 +
108744 + /*
108745 + * set up a bogus anonymous struct field designed to error out on unnamed struct initializers
108746 + * as gcc provides no other way to detect such code
108747 + */
108748 + list = make_node(FIELD_DECL);
108749 + TREE_CHAIN(list) = newtree[0];
108750 + TREE_TYPE(list) = void_type_node;
108751 + DECL_SIZE(list) = bitsize_zero_node;
108752 + DECL_NONADDRESSABLE_P(list) = 1;
108753 + DECL_FIELD_BIT_OFFSET(list) = bitsize_zero_node;
108754 + DECL_SIZE_UNIT(list) = size_zero_node;
108755 + DECL_FIELD_OFFSET(list) = size_zero_node;
108756 + // to satisfy the constify plugin
108757 + TREE_READONLY(list) = 1;
108758 +
108759 + for (i = 0; i < num_fields - 1; i++)
108760 + TREE_CHAIN(newtree[i]) = newtree[i+1];
108761 + TREE_CHAIN(newtree[num_fields - 1]) = NULL_TREE;
108762 +
108763 + for (variant = TYPE_MAIN_VARIANT(type); variant; variant = TYPE_NEXT_VARIANT(variant)) {
108764 + TYPE_FIELDS(variant) = list;
108765 + TYPE_ATTRIBUTES(variant) = copy_list(TYPE_ATTRIBUTES(variant));
108766 + TYPE_ATTRIBUTES(variant) = tree_cons(get_identifier("randomize_performed"), NULL_TREE, TYPE_ATTRIBUTES(variant));
108767 + // force a re-layout
108768 + TYPE_SIZE(variant) = NULL_TREE;
108769 + layout_type(variant);
108770 + }
108771 +
108772 + return 1;
108773 +}
108774 +
108775 +/* from constify plugin */
108776 +static const_tree get_field_type(const_tree field)
108777 +{
108778 + return strip_array_types(TREE_TYPE(field));
108779 +}
108780 +
108781 +/* from constify plugin */
108782 +static bool is_fptr(const_tree fieldtype)
108783 +{
108784 + if (TREE_CODE(fieldtype) != POINTER_TYPE)
108785 + return false;
108786 +
108787 + return TREE_CODE(TREE_TYPE(fieldtype)) == FUNCTION_TYPE;
108788 +}
108789 +
108790 +/* derived from constify plugin */
108791 +static int is_pure_ops_struct(const_tree node)
108792 +{
108793 + const_tree field;
108794 +
108795 + gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);
108796 +
108797 + for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
108798 + const_tree fieldtype = get_field_type(field);
108799 + enum tree_code code = TREE_CODE(fieldtype);
108800 +
108801 + if (node == fieldtype)
108802 + continue;
108803 +
108804 + if (!is_fptr(fieldtype))
108805 + return 0;
108806 +
108807 + if (code != RECORD_TYPE && code != UNION_TYPE)
108808 + continue;
108809 +
108810 + if (!is_pure_ops_struct(fieldtype))
108811 + return 0;
108812 + }
108813 +
108814 + return 1;
108815 +}
108816 +
108817 +static void randomize_type(tree type)
108818 +{
108819 + tree variant;
108820 +
108821 + gcc_assert(TREE_CODE(type) == RECORD_TYPE);
108822 +
108823 + if (lookup_attribute("randomize_considered", TYPE_ATTRIBUTES(type)))
108824 + return;
108825 +
108826 + if (lookup_attribute("randomize_layout", TYPE_ATTRIBUTES(TYPE_MAIN_VARIANT(type))) || is_pure_ops_struct(type))
108827 + relayout_struct(type);
108828 +
108829 + for (variant = TYPE_MAIN_VARIANT(type); variant; variant = TYPE_NEXT_VARIANT(variant)) {
108830 + TYPE_ATTRIBUTES(type) = copy_list(TYPE_ATTRIBUTES(type));
108831 + TYPE_ATTRIBUTES(type) = tree_cons(get_identifier("randomize_considered"), NULL_TREE, TYPE_ATTRIBUTES(type));
108832 + }
108833 +#ifdef __DEBUG_PLUGIN
108834 + fprintf(stderr, "Marking randomize_considered on struct %s\n", ORIG_TYPE_NAME(type));
108835 +#ifdef __DEBUG_VERBOSE
108836 + debug_tree(type);
108837 +#endif
108838 +#endif
108839 +}
108840 +
108841 +static void randomize_layout_finish_decl(void *event_data, void *data)
108842 +{
108843 + tree decl = (tree)event_data;
108844 + tree type;
108845 +
108846 + if (decl == NULL_TREE || decl == error_mark_node)
108847 + return;
108848 +
108849 + type = TREE_TYPE(decl);
108850 +
108851 + if (TREE_CODE(decl) != VAR_DECL)
108852 + return;
108853 +
108854 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
108855 + return;
108856 +
108857 + if (!lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(type)))
108858 + return;
108859 +
108860 + relayout_decl(decl);
108861 +}
108862 +
108863 +static void finish_type(void *event_data, void *data)
108864 +{
108865 + tree type = (tree)event_data;
108866 +
108867 + if (type == NULL_TREE || type == error_mark_node)
108868 + return;
108869 +
108870 + if (TREE_CODE(type) != RECORD_TYPE)
108871 + return;
108872 +
108873 + if (TYPE_FIELDS(type) == NULL_TREE)
108874 + return;
108875 +
108876 + if (lookup_attribute("randomize_considered", TYPE_ATTRIBUTES(type)))
108877 + return;
108878 +
108879 +#ifdef __DEBUG_PLUGIN
108880 + fprintf(stderr, "Calling randomize_type on %s\n", ORIG_TYPE_NAME(type));
108881 +#endif
108882 +#ifdef __DEBUG_VERBOSE
108883 + debug_tree(type);
108884 +#endif
108885 + randomize_type(type);
108886 +
108887 + return;
108888 +}
108889 +
108890 +static struct attribute_spec randomize_layout_attr = {
108891 + .name = "randomize_layout",
108892 + // related to args
108893 + .min_length = 0,
108894 + .max_length = 0,
108895 + .decl_required = false,
108896 + // need type declaration
108897 + .type_required = true,
108898 + .function_type_required = false,
108899 + .handler = handle_randomize_layout_attr,
108900 +#if BUILDING_GCC_VERSION >= 4007
108901 + .affects_type_identity = true
108902 +#endif
108903 +};
108904 +
108905 +static struct attribute_spec no_randomize_layout_attr = {
108906 + .name = "no_randomize_layout",
108907 + // related to args
108908 + .min_length = 0,
108909 + .max_length = 0,
108910 + .decl_required = false,
108911 + // need type declaration
108912 + .type_required = true,
108913 + .function_type_required = false,
108914 + .handler = handle_randomize_layout_attr,
108915 +#if BUILDING_GCC_VERSION >= 4007
108916 + .affects_type_identity = true
108917 +#endif
108918 +};
108919 +
108920 +static struct attribute_spec randomize_considered_attr = {
108921 + .name = "randomize_considered",
108922 + // related to args
108923 + .min_length = 0,
108924 + .max_length = 0,
108925 + .decl_required = false,
108926 + // need type declaration
108927 + .type_required = true,
108928 + .function_type_required = false,
108929 + .handler = handle_randomize_considered_attr,
108930 +#if BUILDING_GCC_VERSION >= 4007
108931 + .affects_type_identity = false
108932 +#endif
108933 +};
108934 +
108935 +static struct attribute_spec randomize_performed_attr = {
108936 + .name = "randomize_performed",
108937 + // related to args
108938 + .min_length = 0,
108939 + .max_length = 0,
108940 + .decl_required = false,
108941 + // need type declaration
108942 + .type_required = true,
108943 + .function_type_required = false,
108944 + .handler = handle_randomize_performed_attr,
108945 +#if BUILDING_GCC_VERSION >= 4007
108946 + .affects_type_identity = false
108947 +#endif
108948 +};
108949 +
108950 +static void register_attributes(void *event_data, void *data)
108951 +{
108952 + register_attribute(&randomize_layout_attr);
108953 + register_attribute(&no_randomize_layout_attr);
108954 + register_attribute(&randomize_considered_attr);
108955 + register_attribute(&randomize_performed_attr);
108956 +}
108957 +
108958 +static void check_bad_casts_in_constructor(tree var, tree init)
108959 +{
108960 + unsigned HOST_WIDE_INT idx;
108961 + tree field, val;
108962 + tree field_type, val_type;
108963 +
108964 + FOR_EACH_CONSTRUCTOR_ELT(CONSTRUCTOR_ELTS(init), idx, field, val) {
108965 + if (TREE_CODE(val) == CONSTRUCTOR) {
108966 + check_bad_casts_in_constructor(var, val);
108967 + continue;
108968 + }
108969 +
108970 + /* pipacs' plugin creates franken-arrays that differ from those produced by
108971 + normal code which all have valid 'field' trees. work around this */
108972 + if (field == NULL_TREE)
108973 + continue;
108974 + field_type = TREE_TYPE(field);
108975 + val_type = TREE_TYPE(val);
108976 +
108977 + if (TREE_CODE(field_type) != POINTER_TYPE || TREE_CODE(val_type) != POINTER_TYPE)
108978 + continue;
108979 +
108980 + if (field_type == val_type)
108981 + continue;
108982 +
108983 + field_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(field_type))));
108984 + val_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(val_type))));
108985 +
108986 + if (field_type == void_type_node)
108987 + continue;
108988 + if (field_type == val_type)
108989 + continue;
108990 + if (TREE_CODE(val_type) != RECORD_TYPE)
108991 + continue;
108992 +
108993 + if (!lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(val_type)))
108994 + continue;
108995 + inform(DECL_SOURCE_LOCATION(var), "found mismatched struct pointer types: %qT and %qT\n", TYPE_MAIN_VARIANT(field_type), TYPE_MAIN_VARIANT(val_type));
108996 + }
108997 +}
108998 +
108999 +/* derived from the constify plugin */
109000 +static void check_global_variables(void *event_data, void *data)
109001 +{
109002 + struct varpool_node *node;
109003 + tree init;
109004 +
109005 + FOR_EACH_VARIABLE(node) {
109006 + tree var = NODE_DECL(node);
109007 + init = DECL_INITIAL(var);
109008 + if (init == NULL_TREE)
109009 + continue;
109010 +
109011 + if (TREE_CODE(init) != CONSTRUCTOR)
109012 + continue;
109013 +
109014 + check_bad_casts_in_constructor(var, init);
109015 + }
109016 +}
109017 +
109018 +static bool dominated_by_is_err(const_tree rhs, basic_block bb)
109019 +{
109020 + basic_block dom;
109021 + gimple dom_stmt;
109022 + gimple call_stmt;
109023 + const_tree dom_lhs;
109024 + const_tree poss_is_err_cond;
109025 + const_tree poss_is_err_func;
109026 + const_tree is_err_arg;
109027 +
109028 + dom = get_immediate_dominator(CDI_DOMINATORS, bb);
109029 + if (!dom)
109030 + return false;
109031 +
109032 + dom_stmt = last_stmt(dom);
109033 + if (!dom_stmt)
109034 + return false;
109035 +
109036 + if (gimple_code(dom_stmt) != GIMPLE_COND)
109037 + return false;
109038 +
109039 + if (gimple_cond_code(dom_stmt) != NE_EXPR)
109040 + return false;
109041 +
109042 + if (!integer_zerop(gimple_cond_rhs(dom_stmt)))
109043 + return false;
109044 +
109045 + poss_is_err_cond = gimple_cond_lhs(dom_stmt);
109046 +
109047 + if (TREE_CODE(poss_is_err_cond) != SSA_NAME)
109048 + return false;
109049 +
109050 + call_stmt = SSA_NAME_DEF_STMT(poss_is_err_cond);
109051 +
109052 + if (gimple_code(call_stmt) != GIMPLE_CALL)
109053 + return false;
109054 +
109055 + dom_lhs = gimple_get_lhs(call_stmt);
109056 + poss_is_err_func = gimple_call_fndecl(call_stmt);
109057 + if (!poss_is_err_func)
109058 + return false;
109059 + if (dom_lhs != poss_is_err_cond)
109060 + return false;
109061 + if (strcmp(DECL_NAME_POINTER(poss_is_err_func), "IS_ERR"))
109062 + return false;
109063 +
109064 + is_err_arg = gimple_call_arg(call_stmt, 0);
109065 + if (!is_err_arg)
109066 + return false;
109067 +
109068 + if (is_err_arg != rhs)
109069 + return false;
109070 +
109071 + return true;
109072 +}
109073 +
109074 +static void handle_local_var_initializers(void)
109075 +{
109076 + tree var;
109077 + unsigned int i;
109078 +
109079 + FOR_EACH_LOCAL_DECL(cfun, i, var) {
109080 + tree init = DECL_INITIAL(var);
109081 + if (!init)
109082 + continue;
109083 + if (TREE_CODE(init) != CONSTRUCTOR)
109084 + continue;
109085 + check_bad_casts_in_constructor(var, init);
109086 + }
109087 +}
109088 +
109089 +/*
109090 + * iterate over all statements to find "bad" casts:
109091 + * those where the address of the start of a structure is cast
109092 + * to a pointer of a structure of a different type, or a
109093 + * structure pointer type is cast to a different structure pointer type
109094 + */
109095 +static unsigned int find_bad_casts(void)
109096 +{
109097 + basic_block bb;
109098 +
109099 + handle_local_var_initializers();
109100 +
109101 + FOR_ALL_BB_FN(bb, cfun) {
109102 + gimple_stmt_iterator gsi;
109103 +
109104 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
109105 + gimple stmt;
109106 + const_tree lhs;
109107 + const_tree lhs_type;
109108 + const_tree rhs1;
109109 + const_tree rhs_type;
109110 + const_tree ptr_lhs_type;
109111 + const_tree ptr_rhs_type;
109112 + const_tree op0;
109113 + const_tree op0_type;
109114 + enum tree_code rhs_code;
109115 +
109116 + stmt = gsi_stmt(gsi);
109117 +
109118 +#ifdef __DEBUG_PLUGIN
109119 +#ifdef __DEBUG_VERBOSE
109120 + debug_gimple_stmt(stmt);
109121 + debug_tree(gimple_get_lhs(stmt));
109122 +#endif
109123 +#endif
109124 +
109125 + if (gimple_code(stmt) != GIMPLE_ASSIGN)
109126 + continue;
109127 +
109128 +#ifdef __DEBUG_PLUGIN
109129 +#ifdef __DEBUG_VERBOSE
109130 + debug_tree(gimple_assign_rhs1(stmt));
109131 +#endif
109132 +#endif
109133 +
109134 + rhs_code = gimple_assign_rhs_code(stmt);
109135 +
109136 + if (rhs_code != ADDR_EXPR && rhs_code != SSA_NAME)
109137 + continue;
109138 +
109139 + lhs = gimple_get_lhs(stmt);
109140 + lhs_type = TREE_TYPE(lhs);
109141 + rhs1 = gimple_assign_rhs1(stmt);
109142 + rhs_type = TREE_TYPE(rhs1);
109143 +
109144 + if (TREE_CODE(rhs_type) != POINTER_TYPE ||
109145 + TREE_CODE(lhs_type) != POINTER_TYPE)
109146 + continue;
109147 +
109148 + ptr_lhs_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(lhs_type))));
109149 + ptr_rhs_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(rhs_type))));
109150 +
109151 + if (ptr_rhs_type == void_type_node)
109152 + continue;
109153 +
109154 + if (ptr_lhs_type == void_type_node)
109155 + continue;
109156 +
109157 + if (dominated_by_is_err(rhs1, bb))
109158 + continue;
109159 +
109160 + if (TREE_CODE(ptr_rhs_type) != RECORD_TYPE) {
109161 +#ifndef __DEBUG_PLUGIN
109162 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(ptr_lhs_type)))
109163 +#endif
109164 + inform(gimple_location(stmt), "found mismatched struct pointer types: %qT and %qT\n", ptr_lhs_type, ptr_rhs_type);
109165 + continue;
109166 + }
109167 +
109168 + if (rhs_code == SSA_NAME && ptr_lhs_type == ptr_rhs_type)
109169 + continue;
109170 +
109171 + if (rhs_code == ADDR_EXPR) {
109172 + op0 = TREE_OPERAND(rhs1, 0);
109173 +
109174 + if (op0 == NULL_TREE)
109175 + continue;
109176 +
109177 + if (TREE_CODE(op0) != VAR_DECL)
109178 + continue;
109179 +
109180 + op0_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(op0))));
109181 + if (op0_type == ptr_lhs_type)
109182 + continue;
109183 +
109184 +#ifndef __DEBUG_PLUGIN
109185 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(op0_type)))
109186 +#endif
109187 + inform(gimple_location(stmt), "found mismatched struct pointer types: %qT and %qT\n", ptr_lhs_type, op0_type);
109188 + } else {
109189 + const_tree ssa_name_var = SSA_NAME_VAR(rhs1);
109190 + /* skip bogus type casts introduced by container_of */
109191 + if (ssa_name_var != NULL_TREE && DECL_NAME(ssa_name_var) &&
109192 + !strcmp((const char *)DECL_NAME_POINTER(ssa_name_var), "__mptr"))
109193 + continue;
109194 +#ifndef __DEBUG_PLUGIN
109195 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(ptr_rhs_type)))
109196 +#endif
109197 + inform(gimple_location(stmt), "found mismatched struct pointer types: %qT and %qT\n", ptr_lhs_type, ptr_rhs_type);
109198 + }
109199 +
109200 + }
109201 + }
109202 + return 0;
109203 +}
109204 +
109205 +#if BUILDING_GCC_VERSION >= 4009
109206 +static const struct pass_data randomize_layout_bad_cast_data = {
109207 +#else
109208 +static struct gimple_opt_pass randomize_layout_bad_cast = {
109209 + .pass = {
109210 +#endif
109211 + .type = GIMPLE_PASS,
109212 + .name = "randomize_layout_bad_cast",
109213 +#if BUILDING_GCC_VERSION >= 4008
109214 + .optinfo_flags = OPTGROUP_NONE,
109215 +#endif
109216 +#if BUILDING_GCC_VERSION >= 4009
109217 + .has_gate = false,
109218 + .has_execute = true,
109219 +#else
109220 + .gate = NULL,
109221 + .execute = find_bad_casts,
109222 + .sub = NULL,
109223 + .next = NULL,
109224 + .static_pass_number = 0,
109225 +#endif
109226 + .tv_id = TV_NONE,
109227 + .properties_required = PROP_cfg,
109228 + .properties_provided = 0,
109229 + .properties_destroyed = 0,
109230 + .todo_flags_start = 0,
109231 + .todo_flags_finish = TODO_dump_func
109232 +#if BUILDING_GCC_VERSION < 4009
109233 + }
109234 +#endif
109235 +};
109236 +
109237 +#if BUILDING_GCC_VERSION >= 4009
109238 +namespace {
109239 +class randomize_layout_bad_cast : public gimple_opt_pass {
109240 +public:
109241 + randomize_layout_bad_cast() : gimple_opt_pass(randomize_layout_bad_cast_data, g) {}
109242 + unsigned int execute() { return find_bad_casts(); }
109243 +};
109244 +}
109245 +#endif
109246 +
109247 +static struct opt_pass *make_randomize_layout_bad_cast(void)
109248 +{
109249 +#if BUILDING_GCC_VERSION >= 4009
109250 + return new randomize_layout_bad_cast();
109251 +#else
109252 + return &randomize_layout_bad_cast.pass;
109253 +#endif
109254 +}
109255 +
109256 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
109257 +{
109258 + int i;
109259 + const char * const plugin_name = plugin_info->base_name;
109260 + const int argc = plugin_info->argc;
109261 + const struct plugin_argument * const argv = plugin_info->argv;
109262 + bool enable = true;
109263 + int obtained_seed = 0;
109264 + struct register_pass_info randomize_layout_bad_cast_info;
109265 +
109266 + randomize_layout_bad_cast_info.pass = make_randomize_layout_bad_cast();
109267 + randomize_layout_bad_cast_info.reference_pass_name = "ssa";
109268 + randomize_layout_bad_cast_info.ref_pass_instance_number = 1;
109269 + randomize_layout_bad_cast_info.pos_op = PASS_POS_INSERT_AFTER;
109270 +
109271 + if (!plugin_default_version_check(version, &gcc_version)) {
109272 + error(G_("incompatible gcc/plugin versions"));
109273 + return 1;
109274 + }
109275 +
109276 + if (strcmp(lang_hooks.name, "GNU C")) {
109277 + inform(UNKNOWN_LOCATION, G_("%s supports C only"), plugin_name);
109278 + enable = false;
109279 + }
109280 +
109281 + for (i = 0; i < argc; ++i) {
109282 + if (!strcmp(argv[i].key, "disable")) {
109283 + enable = false;
109284 + continue;
109285 + }
109286 + if (!strcmp(argv[i].key, "performance-mode")) {
109287 + performance_mode = 1;
109288 + continue;
109289 + }
109290 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
109291 + }
109292 +
109293 + if (strlen(randstruct_seed) != 64) {
109294 + error(G_("invalid seed value supplied for %s plugin"), plugin_name);
109295 + return 1;
109296 + }
109297 + obtained_seed = sscanf(randstruct_seed, "%016llx%016llx%016llx%016llx",
109298 + &shuffle_seed[0], &shuffle_seed[1], &shuffle_seed[2], &shuffle_seed[3]);
109299 + if (obtained_seed != 4) {
109300 + error(G_("Invalid seed supplied for %s plugin"), plugin_name);
109301 + return 1;
109302 + }
109303 +
109304 + register_callback(plugin_name, PLUGIN_INFO, NULL, &randomize_layout_plugin_info);
109305 + if (enable) {
109306 + register_callback(plugin_name, PLUGIN_ALL_IPA_PASSES_START, check_global_variables, NULL);
109307 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &randomize_layout_bad_cast_info);
109308 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
109309 + register_callback(plugin_name, PLUGIN_FINISH_DECL, randomize_layout_finish_decl, NULL);
109310 + }
109311 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
109312 +
109313 + return 0;
109314 +}
109315 diff --git a/tools/gcc/size_overflow_hash.data b/tools/gcc/size_overflow_hash.data
109316 new file mode 100644
109317 index 0000000..ebbd9a3
109318 --- /dev/null
109319 +++ b/tools/gcc/size_overflow_hash.data
109320 @@ -0,0 +1,5933 @@
109321 +intel_fake_agp_alloc_by_type_1 intel_fake_agp_alloc_by_type 1 1 NULL
109322 +ocfs2_get_refcount_tree_3 ocfs2_get_refcount_tree 0 3 NULL
109323 +storvsc_connect_to_vsp_22 storvsc_connect_to_vsp 2 22 NULL
109324 +compat_sock_setsockopt_23 compat_sock_setsockopt 5 23 NULL
109325 +carl9170_alloc_27 carl9170_alloc 1 27 NULL
109326 +sel_read_policyvers_55 sel_read_policyvers 3 55 NULL nohasharray
109327 +padzero_55 padzero 1 55 &sel_read_policyvers_55
109328 +cfg80211_disconnected_57 cfg80211_disconnected 4 57 NULL
109329 +__skb_to_sgvec_72 __skb_to_sgvec 0 72 NULL
109330 +snd_korg1212_copy_to_92 snd_korg1212_copy_to 6 92 NULL
109331 +load_msg_95 load_msg 2 95 NULL
109332 +ipath_verbs_send_117 ipath_verbs_send 5-3 117 NULL
109333 +init_q_132 init_q 4 132 NULL
109334 +memstick_alloc_host_142 memstick_alloc_host 1 142 NULL
109335 +gfs2_glock_get_147 gfs2_glock_get 0 147 NULL
109336 +hva_to_gfn_memslot_149 hva_to_gfn_memslot 0-1 149 NULL
109337 +ping_v6_sendmsg_152 ping_v6_sendmsg 4 152 NULL
109338 +ext4_ext_get_actual_len_153 ext4_ext_get_actual_len 0 153 NULL nohasharray
109339 +tracing_trace_options_write_153 tracing_trace_options_write 3 153 &ext4_ext_get_actual_len_153
109340 +pci_request_selected_regions_169 pci_request_selected_regions 0 169 NULL
109341 +xfs_buf_item_get_format_189 xfs_buf_item_get_format 2 189 NULL
109342 +xfs_bmap_btalloc_192 xfs_bmap_btalloc 0 192 NULL
109343 +iscsi_session_setup_196 iscsi_session_setup 4-5 196 NULL
109344 +ll_xattr_cache_seq_write_250 ll_xattr_cache_seq_write 3 250 NULL
109345 +br_port_info_size_268 br_port_info_size 0 268 NULL
109346 +generic_file_direct_write_291 generic_file_direct_write 0 291 NULL
109347 +read_file_war_stats_292 read_file_war_stats 3 292 NULL
109348 +xfs_zero_last_block_298 xfs_zero_last_block 0 298 NULL
109349 +SYSC_connect_304 SYSC_connect 3 304 NULL
109350 +syslog_print_307 syslog_print 2 307 NULL
109351 +dn_setsockopt_314 dn_setsockopt 5 314 NULL
109352 +mlx5_core_access_reg_361 mlx5_core_access_reg 3-5 361 NULL
109353 +aio_read_events_ring_410 aio_read_events_ring 3-0 410 NULL
109354 +lbs_rdmac_read_418 lbs_rdmac_read 3 418 NULL
109355 +snd_ca0106_ptr_read_467 snd_ca0106_ptr_read 0 467 NULL
109356 +cfs_trace_set_debug_mb_usrstr_486 cfs_trace_set_debug_mb_usrstr 2 486 NULL
109357 +nvme_trans_modesel_data_488 nvme_trans_modesel_data 4 488 NULL
109358 +iwl_dbgfs_protection_mode_write_502 iwl_dbgfs_protection_mode_write 3 502 NULL
109359 +rx_rx_defrag_end_read_505 rx_rx_defrag_end_read 3 505 NULL
109360 +ocfs2_validate_meta_ecc_bhs_527 ocfs2_validate_meta_ecc_bhs 0 527 NULL
109361 +zlib_deflate_workspacesize_537 zlib_deflate_workspacesize 0-1-2 537 NULL
109362 +iwl_dbgfs_wowlan_sram_read_540 iwl_dbgfs_wowlan_sram_read 3 540 NULL
109363 +sco_sock_setsockopt_552 sco_sock_setsockopt 5 552 NULL
109364 +snd_aw2_saa7146_get_hw_ptr_playback_558 snd_aw2_saa7146_get_hw_ptr_playback 0 558 NULL
109365 +start_isoc_chain_565 start_isoc_chain 2 565 NULL nohasharray
109366 +dev_hard_header_565 dev_hard_header 0 565 &start_isoc_chain_565
109367 +ocfs2_refcounted_xattr_delete_need_584 ocfs2_refcounted_xattr_delete_need 0 584 NULL
109368 +smk_write_load_self2_591 smk_write_load_self2 3 591 NULL
109369 +btrfs_stack_file_extent_offset_607 btrfs_stack_file_extent_offset 0 607 NULL
109370 +ni_gpct_device_construct_610 ni_gpct_device_construct 5 610 NULL
109371 +fuse_request_alloc_nofs_617 fuse_request_alloc_nofs 1 617 NULL
109372 +ptlrpc_lprocfs_nrs_seq_write_621 ptlrpc_lprocfs_nrs_seq_write 3 621 NULL
109373 +viafb_dfpl_proc_write_627 viafb_dfpl_proc_write 3 627 NULL
109374 +ceph_osdc_new_request_635 ceph_osdc_new_request 6 635 NULL
109375 +cfs_hash_bkt_size_643 cfs_hash_bkt_size 0 643 NULL
109376 +unlink_queued_645 unlink_queued 4 645 NULL
109377 +dtim_interval_read_654 dtim_interval_read 3 654 NULL
109378 +mem_rx_free_mem_blks_read_675 mem_rx_free_mem_blks_read 3 675 NULL
109379 +persistent_ram_vmap_709 persistent_ram_vmap 2-1 709 NULL
109380 +xfs_bmap_eof_728 xfs_bmap_eof 0 728 NULL
109381 +sctp_setsockopt_peer_addr_params_734 sctp_setsockopt_peer_addr_params 3 734 NULL
109382 +dvb_video_write_754 dvb_video_write 3 754 NULL
109383 +cfs_trace_allocate_string_buffer_781 cfs_trace_allocate_string_buffer 2 781 NULL
109384 +ath6kl_disconnect_timeout_write_794 ath6kl_disconnect_timeout_write 3 794 NULL
109385 +if_writecmd_815 if_writecmd 2 815 NULL
109386 +aac_change_queue_depth_825 aac_change_queue_depth 2 825 NULL
109387 +error_state_read_859 error_state_read 6 859 NULL
109388 +o2net_send_message_vec_879 o2net_send_message_vec 4 879 NULL nohasharray
109389 +iwl_dbgfs_fh_reg_read_879 iwl_dbgfs_fh_reg_read 3 879 &o2net_send_message_vec_879
109390 +snd_pcm_action_single_905 snd_pcm_action_single 0 905 NULL
109391 +carl9170_cmd_buf_950 carl9170_cmd_buf 3 950 NULL
109392 +__nodes_weight_956 __nodes_weight 2-0 956 NULL
109393 +mnt_want_write_975 mnt_want_write 0 975 NULL
109394 +usnic_ib_qp_grp_dump_hdr_989 usnic_ib_qp_grp_dump_hdr 2 989 NULL
109395 +memcmp_990 memcmp 0 990 NULL
109396 +readreg_1017 readreg 0-1 1017 NULL
109397 +smk_write_cipso2_1021 smk_write_cipso2 3 1021 NULL
109398 +gigaset_initdriver_1060 gigaset_initdriver 2 1060 NULL
109399 +mce_request_packet_1073 mce_request_packet 3 1073 NULL
109400 +agp_create_memory_1075 agp_create_memory 1 1075 NULL
109401 +_scsih_adjust_queue_depth_1083 _scsih_adjust_queue_depth 2 1083 NULL
109402 +llcp_sock_sendmsg_1092 llcp_sock_sendmsg 4 1092 NULL
109403 +nfs4_init_nonuniform_client_string_1097 nfs4_init_nonuniform_client_string 3 1097 NULL
109404 +utf8s_to_utf16s_1115 utf8s_to_utf16s 0 1115 NULL
109405 +cfg80211_report_obss_beacon_1133 cfg80211_report_obss_beacon 3 1133 NULL
109406 +i2400m_rx_ctl_1157 i2400m_rx_ctl 4 1157 NULL
109407 +ipc_alloc_1192 ipc_alloc 1 1192 NULL
109408 +ib_create_send_mad_1196 ib_create_send_mad 5 1196 NULL
109409 +pstore_ftrace_knob_write_1198 pstore_ftrace_knob_write 3 1198 NULL
109410 +i2400m_rx_ctl_ack_1199 i2400m_rx_ctl_ack 3 1199 NULL
109411 +dgrp_dpa_read_1204 dgrp_dpa_read 3 1204 NULL
109412 +i2cdev_read_1206 i2cdev_read 3 1206 NULL
109413 +lov_ost_pool_init_1215 lov_ost_pool_init 2 1215 NULL
109414 +fsync_buffers_list_1219 fsync_buffers_list 0 1219 NULL
109415 +kernfs_file_direct_read_1238 kernfs_file_direct_read 3 1238 NULL
109416 +ocfs2_extend_file_1266 ocfs2_extend_file 3 1266 NULL
109417 +qla4xxx_change_queue_depth_1268 qla4xxx_change_queue_depth 2 1268 NULL
109418 +ioctl_private_iw_point_1273 ioctl_private_iw_point 7 1273 NULL
109419 +SyS_flistxattr_1287 SyS_flistxattr 3 1287 NULL
109420 +tx_frag_in_process_called_read_1290 tx_frag_in_process_called_read 3 1290 NULL
109421 +posix_acl_xattr_set_1301 posix_acl_xattr_set 4 1301 NULL
109422 +tcf_hash_create_1305 tcf_hash_create 4 1305 NULL
109423 +ffs_1322 ffs 0 1322 NULL
109424 +qlcnic_pci_sriov_configure_1327 qlcnic_pci_sriov_configure 2 1327 NULL
109425 +btrfs_submit_compressed_write_1347 btrfs_submit_compressed_write 5 1347 NULL
109426 +snd_pcm_lib_write1_1358 snd_pcm_lib_write1 0-3 1358 NULL
109427 +ipx_sendmsg_1362 ipx_sendmsg 4 1362 NULL
109428 +fw_stats_raw_read_1369 fw_stats_raw_read 3 1369 NULL
109429 +ocfs2_prepare_inode_for_write_1372 ocfs2_prepare_inode_for_write 3 1372 NULL
109430 +sctp_setsockopt_initmsg_1383 sctp_setsockopt_initmsg 3 1383 NULL
109431 +do_msgsnd_1387 do_msgsnd 4 1387 NULL
109432 +SYSC_io_getevents_1392 SYSC_io_getevents 3 1392 NULL
109433 +file_read_actor_1401 file_read_actor 4-0 1401 NULL
109434 +cfs_trace_copyout_string_1416 cfs_trace_copyout_string 2 1416 NULL
109435 +init_rs_internal_1436 init_rs_internal 1 1436 NULL
109436 +stack_max_size_read_1445 stack_max_size_read 3 1445 NULL
109437 +tx_queue_len_read_1463 tx_queue_len_read 3 1463 NULL
109438 +xprt_alloc_1475 xprt_alloc 2 1475 NULL
109439 +SYSC_syslog_1477 SYSC_syslog 3 1477 NULL
109440 +sta_num_ps_buf_frames_read_1488 sta_num_ps_buf_frames_read 3 1488 NULL
109441 +fpregs_set_1497 fpregs_set 4 1497 NULL
109442 +tomoyo_round2_1518 tomoyo_round2 0 1518 NULL
109443 +alloc_perm_bits_1532 alloc_perm_bits 2 1532 NULL
109444 +ath6kl_init_get_fwcaps_1557 ath6kl_init_get_fwcaps 3 1557 NULL
109445 +ffs_mutex_lock_1564 ffs_mutex_lock 0 1564 NULL
109446 +ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime_1589 ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime 3 1589 NULL
109447 +packet_buffer_init_1607 packet_buffer_init 2 1607 NULL
109448 +btmrvl_hscmd_read_1614 btmrvl_hscmd_read 3 1614 NULL
109449 +v9fs_fid_xattr_get_1618 v9fs_fid_xattr_get 0 1618 NULL
109450 +ikconfig_read_current_1658 ikconfig_read_current 3 1658 NULL
109451 +mei_cl_recv_1665 mei_cl_recv 3 1665 NULL
109452 +rmap_add_1677 rmap_add 3 1677 NULL
109453 +configfs_read_file_1683 configfs_read_file 3 1683 NULL
109454 +pdu_write_u_1710 pdu_write_u 3 1710 NULL
109455 +coda_psdev_write_1711 coda_psdev_write 3 1711 NULL
109456 +btrfs_dir_data_len_1714 btrfs_dir_data_len 0 1714 NULL
109457 +internal_create_group_1733 internal_create_group 0 1733 NULL
109458 +dev_irnet_read_1741 dev_irnet_read 3 1741 NULL
109459 +usb_ep_align_maybe_1743 usb_ep_align_maybe 0-3 1743 NULL
109460 +tx_frag_called_read_1748 tx_frag_called_read 3 1748 NULL
109461 +cosa_write_1774 cosa_write 3 1774 NULL
109462 +fcoe_ctlr_device_add_1793 fcoe_ctlr_device_add 3 1793 NULL
109463 +__nodelist_scnprintf_1815 __nodelist_scnprintf 2-0 1815 NULL
109464 +sb_issue_zeroout_1884 sb_issue_zeroout 3 1884 NULL
109465 +rx_defrag_called_read_1897 rx_defrag_called_read 3 1897 NULL
109466 +nfs_parse_server_name_1899 nfs_parse_server_name 2 1899 NULL
109467 +SyS_add_key_1900 SyS_add_key 4 1900 NULL
109468 +uhid_char_read_1920 uhid_char_read 3 1920 NULL
109469 +tx_tx_retry_data_read_1926 tx_tx_retry_data_read 3 1926 NULL
109470 +bdev_erase_1933 bdev_erase 3 1933 NULL
109471 +ext3_fiemap_1936 ext3_fiemap 4 1936 NULL
109472 +cyttsp_probe_1940 cyttsp_probe 4 1940 NULL
109473 +ieee80211_if_fmt_dot11MeshConfirmTimeout_1945 ieee80211_if_fmt_dot11MeshConfirmTimeout 3 1945 NULL
109474 +update_qd_1955 update_qd 0 1955 NULL
109475 +ivtv_v4l2_read_1964 ivtv_v4l2_read 3 1964 NULL
109476 +sel_read_avc_hash_stats_1984 sel_read_avc_hash_stats 3 1984 NULL
109477 +gpio_power_write_1991 gpio_power_write 3 1991 NULL
109478 +__alloc_bootmem_node_1992 __alloc_bootmem_node 2 1992 NULL
109479 +rx_rx_defrag_read_2010 rx_rx_defrag_read 3 2010 NULL
109480 +xfs_mru_cache_insert_2013 xfs_mru_cache_insert 0 2013 NULL
109481 +ocfs2_global_qinit_alloc_2018 ocfs2_global_qinit_alloc 0 2018 NULL
109482 +write_flush_pipefs_2021 write_flush_pipefs 3 2021 NULL
109483 +BcmCopySection_2035 BcmCopySection 5 2035 NULL
109484 +ath6kl_fwlog_mask_read_2050 ath6kl_fwlog_mask_read 3 2050 NULL
109485 +ocfs2_expand_inline_dir_2063 ocfs2_expand_inline_dir 3 2063 NULL
109486 +__generic_copy_from_user_intel_2073 __generic_copy_from_user_intel 0-3 2073 NULL
109487 +diva_set_driver_dbg_mask_2077 diva_set_driver_dbg_mask 0 2077 NULL
109488 +iwl_dbgfs_current_sleep_command_read_2081 iwl_dbgfs_current_sleep_command_read 3 2081 NULL
109489 +idetape_chrdev_read_2097 idetape_chrdev_read 3 2097 NULL
109490 +audit_expand_2098 audit_expand 0 2098 NULL
109491 +__set_print_fmt_2106 __set_print_fmt 0 2106 NULL
109492 +iwl_dbgfs_log_event_read_2107 iwl_dbgfs_log_event_read 3 2107 NULL
109493 +ecryptfs_encrypt_and_encode_filename_2109 ecryptfs_encrypt_and_encode_filename 6 2109 NULL
109494 +btrfs_file_extent_inline_len_2116 btrfs_file_extent_inline_len 0 2116 NULL
109495 +enable_read_2117 enable_read 3 2117 NULL
109496 +pcf50633_write_block_2124 pcf50633_write_block 2-3 2124 NULL
109497 +xfs_recover_inode_owner_change_2132 xfs_recover_inode_owner_change 0 2132 NULL
109498 +check_load_and_stores_2143 check_load_and_stores 2 2143 NULL
109499 +iov_iter_count_2152 iov_iter_count 0 2152 NULL
109500 +__copy_to_user_ll_2157 __copy_to_user_ll 0-3 2157 NULL
109501 +_ore_get_io_state_2166 _ore_get_io_state 3-4-5 2166 NULL
109502 +bio_integrity_alloc_2194 bio_integrity_alloc 3 2194 NULL
109503 +picolcd_debug_reset_write_2195 picolcd_debug_reset_write 3 2195 NULL
109504 +xfs_inobt_update_2206 xfs_inobt_update 0 2206 NULL
109505 +u32_array_read_2219 u32_array_read 3 2219 NULL nohasharray
109506 +mei_dbgfs_read_meclients_2219 mei_dbgfs_read_meclients 3 2219 &u32_array_read_2219
109507 +__ocfs2_journal_access_2241 __ocfs2_journal_access 0 2241 NULL
109508 +ieee80211_if_read_dot11MeshHWMPRannInterval_2249 ieee80211_if_read_dot11MeshHWMPRannInterval 3 2249 NULL
109509 +netlbl_secattr_catmap_walk_2255 netlbl_secattr_catmap_walk 0-2 2255 NULL
109510 +sel_write_avc_cache_threshold_2256 sel_write_avc_cache_threshold 3 2256 NULL
109511 +do_update_counters_2259 do_update_counters 4 2259 NULL
109512 +ath6kl_wmi_bssinfo_event_rx_2275 ath6kl_wmi_bssinfo_event_rx 3 2275 NULL
109513 +debug_debug5_read_2291 debug_debug5_read 3 2291 NULL
109514 +sr_read_cmd_2299 sr_read_cmd 5 2299 NULL
109515 +kvm_clear_guest_page_2308 kvm_clear_guest_page 4 2308 NULL
109516 +intel_sdvo_set_value_2311 intel_sdvo_set_value 4 2311 NULL
109517 +hfsplus_find_init_2318 hfsplus_find_init 0 2318 NULL nohasharray
109518 +picolcd_fb_write_2318 picolcd_fb_write 3 2318 &hfsplus_find_init_2318
109519 +dice_hwdep_read_2326 dice_hwdep_read 3 2326 NULL
109520 +__erst_read_to_erange_2341 __erst_read_to_erange 0 2341 NULL
109521 +zr364xx_read_2354 zr364xx_read 3 2354 NULL
109522 +ntfs_file_aio_write_nolock_2360 ntfs_file_aio_write_nolock 0 2360 NULL
109523 +viafb_iga2_odev_proc_write_2363 viafb_iga2_odev_proc_write 3 2363 NULL
109524 +xfs_buf_map_from_irec_2368 xfs_buf_map_from_irec 5-0 2368 NULL nohasharray
109525 +rose_recvmsg_2368 rose_recvmsg 4 2368 &xfs_buf_map_from_irec_2368
109526 +il_dbgfs_sensitivity_read_2370 il_dbgfs_sensitivity_read 3 2370 NULL
109527 +rxpipe_rx_prep_beacon_drop_read_2403 rxpipe_rx_prep_beacon_drop_read 3 2403 NULL
109528 +isdn_v110_open_2418 isdn_v110_open 3 2418 NULL
109529 +raid1_size_2419 raid1_size 0-2 2419 NULL
109530 +b43legacy_debugfs_read_2473 b43legacy_debugfs_read 3 2473 NULL
109531 +wiphy_new_2482 wiphy_new 2 2482 NULL
109532 +bio_alloc_bioset_2484 bio_alloc_bioset 2 2484 NULL
109533 +squashfs_read_fragment_index_table_2506 squashfs_read_fragment_index_table 4 2506 NULL
109534 +v9fs_cached_file_read_2514 v9fs_cached_file_read 3 2514 NULL
109535 +ext4_get_inode_loc_2516 ext4_get_inode_loc 0 2516 NULL
109536 +batadv_tvlv_container_list_size_2524 batadv_tvlv_container_list_size 0 2524 NULL
109537 +smk_write_syslog_2529 smk_write_syslog 3 2529 NULL
109538 +__ceph_setxattr_2532 __ceph_setxattr 4 2532 NULL
109539 +gspca_dev_probe_2570 gspca_dev_probe 4 2570 NULL
109540 +pcm_sanity_check_2574 pcm_sanity_check 0 2574 NULL
109541 +mdc_max_rpcs_in_flight_seq_write_2594 mdc_max_rpcs_in_flight_seq_write 3 2594 NULL
109542 +slot_bytes_2609 slot_bytes 0 2609 NULL
109543 +smk_write_logging_2618 smk_write_logging 3 2618 NULL
109544 +switch_status_2629 switch_status 5 2629 NULL
109545 +tcp_xmit_size_goal_2661 tcp_xmit_size_goal 2 2661 NULL
109546 +osc_build_ppga_2670 osc_build_ppga 2 2670 NULL
109547 +ffs_ep0_read_2672 ffs_ep0_read 3 2672 NULL
109548 +oti6858_write_2692 oti6858_write 4 2692 NULL
109549 +nfc_llcp_send_ui_frame_2702 nfc_llcp_send_ui_frame 5 2702 NULL
109550 +memcpy_fromiovecend_2707 memcpy_fromiovecend 3-4 2707 NULL
109551 +lprocfs_stats_counter_size_2708 lprocfs_stats_counter_size 0 2708 NULL
109552 +gfs2_glock_nq_num_2747 gfs2_glock_nq_num 0 2747 NULL
109553 +xfs_readdir_2767 xfs_readdir 3 2767 NULL
109554 +mon_bin_ioctl_2771 mon_bin_ioctl 3 2771 NULL
109555 +set_msr_hyperv_pw_2785 set_msr_hyperv_pw 3 2785 NULL
109556 +device_add_attrs_2789 device_add_attrs 0 2789 NULL
109557 +iwl_dbgfs_clear_ucode_statistics_write_2804 iwl_dbgfs_clear_ucode_statistics_write 3 2804 NULL
109558 +sel_read_enforce_2828 sel_read_enforce 3 2828 NULL
109559 +vb2_dc_get_userptr_2829 vb2_dc_get_userptr 2-3 2829 NULL
109560 +wait_for_avail_2847 wait_for_avail 0 2847 NULL
109561 +sfq_alloc_2861 sfq_alloc 1 2861 NULL
109562 +irnet_ctrl_read_2863 irnet_ctrl_read 4 2863 NULL
109563 +move_addr_to_user_2868 move_addr_to_user 2 2868 NULL
109564 +nla_padlen_2883 nla_padlen 1 2883 NULL
109565 +cmm_write_2896 cmm_write 3 2896 NULL
109566 +osc_import_seq_write_2923 osc_import_seq_write 3 2923 NULL
109567 +xfs_trans_get_buf_map_2927 xfs_trans_get_buf_map 4 2927 NULL
109568 +nes_read_indexed_2946 nes_read_indexed 0 2946 NULL
109569 +tm6000_i2c_recv_regs16_2949 tm6000_i2c_recv_regs16 5 2949 NULL
109570 +i40e_dbg_prep_dump_buf_2951 i40e_dbg_prep_dump_buf 2 2951 NULL
109571 +set_fast_connectable_2952 set_fast_connectable 4 2952 NULL
109572 +free_area_init_core_2962 free_area_init_core 2-3 2962 NULL
109573 +bio_setup_sector_2970 bio_setup_sector 3 2970 NULL
109574 +do_strnlen_user_2976 do_strnlen_user 0-2 2976 NULL
109575 +p9_nr_pages_2992 p9_nr_pages 0-2 2992 NULL
109576 +_xfs_filestream_pick_ag_3007 _xfs_filestream_pick_ag 0 3007 NULL
109577 +lov_stripetype_seq_write_3013 lov_stripetype_seq_write 3 3013 NULL
109578 +do_dmabuf_dirty_sou_3017 do_dmabuf_dirty_sou 7 3017 NULL
109579 +depth_write_3021 depth_write 3 3021 NULL
109580 +snd_azf3328_codec_inl_3022 snd_azf3328_codec_inl 0 3022 NULL
109581 +nvme_split_and_submit_3027 nvme_split_and_submit 3 3027 NULL
109582 +kvm_unmap_hva_3028 kvm_unmap_hva 2 3028 NULL
109583 +xfrm_dst_alloc_copy_3034 xfrm_dst_alloc_copy 3 3034 NULL
109584 +lpfc_idiag_mbxacc_write_3038 lpfc_idiag_mbxacc_write 3 3038 NULL nohasharray
109585 +iwl_dbgfs_sleep_level_override_read_3038 iwl_dbgfs_sleep_level_override_read 3 3038 &lpfc_idiag_mbxacc_write_3038
109586 +nr_free_buffer_pages_3044 nr_free_buffer_pages 0 3044 NULL
109587 +il3945_ucode_rx_stats_read_3048 il3945_ucode_rx_stats_read 3 3048 NULL
109588 +qp_alloc_ppn_set_3068 qp_alloc_ppn_set 2-4 3068 NULL
109589 +__blk_end_bidi_request_3070 __blk_end_bidi_request 3-4 3070 NULL
109590 +dac960_user_command_proc_write_3071 dac960_user_command_proc_write 3 3071 NULL
109591 +read_file_antenna_diversity_3077 read_file_antenna_diversity 3 3077 NULL
109592 +ttusb2_msg_3100 ttusb2_msg 4 3100 NULL
109593 +rb_alloc_3102 rb_alloc 1 3102 NULL
109594 +simple_write_to_buffer_3122 simple_write_to_buffer 5-2 3122 NULL
109595 +print_time_3132 print_time 0 3132 NULL
109596 +fill_write_buffer_3142 fill_write_buffer 3 3142 NULL
109597 +CIFSSMBSetPosixACL_3154 CIFSSMBSetPosixACL 5 3154 NULL
109598 +compat_sys_migrate_pages_3157 compat_sys_migrate_pages 2 3157 NULL
109599 +gfs2_rindex_update_3165 gfs2_rindex_update 0 3165 NULL
109600 +uv_num_possible_blades_3177 uv_num_possible_blades 0 3177 NULL
109601 +uvc_video_stats_dump_3181 uvc_video_stats_dump 3 3181 NULL
109602 +compat_do_ip6t_set_ctl_3184 compat_do_ip6t_set_ctl 4 3184 NULL
109603 +mempool_create_node_3191 mempool_create_node 1 3191 NULL
109604 +alloc_context_3194 alloc_context 1 3194 NULL
109605 +shmem_pread_slow_3198 shmem_pread_slow 3-2 3198 NULL
109606 +codec_reg_write_file_3204 codec_reg_write_file 3 3204 NULL
109607 +SyS_sendto_3219 SyS_sendto 6 3219 NULL
109608 +btrfs_prealloc_file_range_3227 btrfs_prealloc_file_range 3 3227 NULL
109609 +kimage_crash_alloc_3233 kimage_crash_alloc 3 3233 NULL
109610 +write_adapter_mem_3234 write_adapter_mem 3 3234 NULL
109611 +do_read_log_to_user_3236 do_read_log_to_user 4 3236 NULL
109612 +ext3_xattr_find_entry_3237 ext3_xattr_find_entry 0 3237 NULL
109613 +key_key_read_3241 key_key_read 3 3241 NULL
109614 +__ilog2_u64_3284 __ilog2_u64 0 3284 NULL
109615 +__set_extent_bit_3305 __set_extent_bit 0 3305 NULL
109616 +__iovec_copy_from_user_inatomic_3314 __iovec_copy_from_user_inatomic 0-4-3 3314 NULL
109617 +_iwl_dbgfs_d3_sram_write_3315 _iwl_dbgfs_d3_sram_write 3 3315 NULL
109618 +dbDiscardAG_3322 dbDiscardAG 3 3322 NULL
109619 +compat_sys_setsockopt_3326 compat_sys_setsockopt 5 3326 NULL
109620 +read_from_oldmem_3337 read_from_oldmem 2 3337 NULL
109621 +sysfs_create_group_3339 sysfs_create_group 0 3339 NULL
109622 +tty_port_register_device_attr_3341 tty_port_register_device_attr 3 3341 NULL
109623 +il_dbgfs_interrupt_read_3351 il_dbgfs_interrupt_read 3 3351 NULL
109624 +gsm_control_rls_3353 gsm_control_rls 3 3353 NULL
109625 +scnprintf_3360 scnprintf 0-2 3360 NULL
109626 +ReadByteAmd7930_3365 ReadByteAmd7930 0 3365 NULL
109627 +sr_read_3366 sr_read 3 3366 NULL
109628 +mtdchar_writeoob_3393 mtdchar_writeoob 4 3393 NULL
109629 +send_stream_3397 send_stream 4 3397 NULL
109630 +isdn_readbchan_3401 isdn_readbchan 0-5 3401 NULL
109631 +mei_io_cb_alloc_resp_buf_3414 mei_io_cb_alloc_resp_buf 2 3414 NULL
109632 +pci_add_cap_save_buffer_3426 pci_add_cap_save_buffer 3 3426 NULL
109633 +crystalhd_create_dio_pool_3427 crystalhd_create_dio_pool 2 3427 NULL
109634 +SyS_msgsnd_3436 SyS_msgsnd 3 3436 NULL
109635 +pipe_iov_copy_to_user_3447 pipe_iov_copy_to_user 3 3447 NULL
109636 +softsynth_write_3455 softsynth_write 3 3455 NULL
109637 +snd_pcm_lib_readv_transfer_3464 snd_pcm_lib_readv_transfer 5-4-2 3464 NULL
109638 +security_context_to_sid_default_3492 security_context_to_sid_default 2 3492 NULL
109639 +xfrm_migrate_msgsize_3496 xfrm_migrate_msgsize 1 3496 NULL
109640 +mem_tx_free_mem_blks_read_3521 mem_tx_free_mem_blks_read 3 3521 NULL
109641 +SyS_semtimedop_3532 SyS_semtimedop 3 3532 NULL
109642 +SyS_readv_3539 SyS_readv 3 3539 NULL
109643 +btrfs_dir_name_len_3549 btrfs_dir_name_len 0 3549 NULL
109644 +alloc_smp_resp_3566 alloc_smp_resp 1 3566 NULL
109645 +evtchn_read_3569 evtchn_read 3 3569 NULL
109646 +ll_track_ppid_seq_write_3582 ll_track_ppid_seq_write 3 3582 NULL
109647 +vc_resize_3585 vc_resize 3-2 3585 NULL
109648 +kvm_mmu_notifier_change_pte_3596 kvm_mmu_notifier_change_pte 3 3596 NULL
109649 +sctp_getsockopt_events_3607 sctp_getsockopt_events 2 3607 NULL
109650 +edac_mc_alloc_3611 edac_mc_alloc 4 3611 NULL
109651 +tx_tx_starts_read_3617 tx_tx_starts_read 3 3617 NULL
109652 +aligned_kmalloc_3628 aligned_kmalloc 1 3628 NULL
109653 +ath6kl_disconnect_timeout_read_3650 ath6kl_disconnect_timeout_read 3 3650 NULL
109654 +i915_compat_ioctl_3656 i915_compat_ioctl 2 3656 NULL
109655 +xfs_attr3_leaf_list_int_3661 xfs_attr3_leaf_list_int 0 3661 NULL
109656 +_iwl_dbgfs_tx_flush_write_3675 _iwl_dbgfs_tx_flush_write 3 3675 NULL
109657 +snd_m3_assp_read_3703 snd_m3_assp_read 0 3703 NULL
109658 +ci_ll_write_3740 ci_ll_write 4 3740 NULL
109659 +sctp_setsockopt_auth_key_3793 sctp_setsockopt_auth_key 3 3793 NULL
109660 +ncp_file_write_3813 ncp_file_write 3 3813 NULL
109661 +llc_ui_recvmsg_3826 llc_ui_recvmsg 4 3826 NULL
109662 +hfsplus_direct_IO_3835 hfsplus_direct_IO 4 3835 NULL
109663 +create_one_cdev_3852 create_one_cdev 2 3852 NULL
109664 +smk_read_onlycap_3855 smk_read_onlycap 3 3855 NULL
109665 +get_fd_set_3866 get_fd_set 1 3866 NULL
109666 +apei_res_sub_3873 apei_res_sub 0 3873 NULL
109667 +garp_attr_create_3883 garp_attr_create 3 3883 NULL
109668 +efivarfs_file_read_3893 efivarfs_file_read 3 3893 NULL
109669 +nvram_write_3894 nvram_write 3 3894 NULL
109670 +pipeline_pre_proc_swi_read_3898 pipeline_pre_proc_swi_read 3 3898 NULL
109671 +comedi_buf_read_n_available_3899 comedi_buf_read_n_available 0 3899 NULL
109672 +vcs_write_3910 vcs_write 3 3910 NULL
109673 +SyS_move_pages_3920 SyS_move_pages 2 3920 NULL
109674 +hdlc_irq_one_3944 hdlc_irq_one 2 3944 NULL
109675 +brcmf_debugfs_fws_stats_read_3947 brcmf_debugfs_fws_stats_read 3 3947 NULL
109676 +mite_bytes_written_to_memory_lb_3987 mite_bytes_written_to_memory_lb 0 3987 NULL
109677 +do_add_counters_3992 do_add_counters 3 3992 NULL
109678 +xfs_bmbt_lookup_eq_3997 xfs_bmbt_lookup_eq 0 3997 NULL
109679 +obd_alloc_memmd_4002 obd_alloc_memmd 0 4002 NULL
109680 +userspace_status_4004 userspace_status 4 4004 NULL
109681 +xfs_check_block_4005 xfs_check_block 4 4005 NULL nohasharray
109682 +mei_write_4005 mei_write 3 4005 &xfs_check_block_4005
109683 +snd_hdsp_capture_copy_4011 snd_hdsp_capture_copy 5 4011 NULL
109684 +blk_end_request_4024 blk_end_request 3 4024 NULL
109685 +ext4_xattr_find_entry_4025 ext4_xattr_find_entry 0 4025 NULL
109686 +xfs_free_ag_extent_4036 xfs_free_ag_extent 0 4036 NULL
109687 +mtip_hw_read_registers_4037 mtip_hw_read_registers 3 4037 NULL
109688 +read_file_queues_4078 read_file_queues 3 4078 NULL
109689 +fbcon_do_set_font_4079 fbcon_do_set_font 2-3 4079 NULL
109690 +tm6000_read_4151 tm6000_read 3 4151 NULL
109691 +mpt_raid_phys_disk_get_num_paths_4155 mpt_raid_phys_disk_get_num_paths 0 4155 NULL
109692 +msg_bits_4158 msg_bits 0-3-4 4158 NULL
109693 +get_alua_req_4166 get_alua_req 3 4166 NULL
109694 +blk_dropped_read_4168 blk_dropped_read 3 4168 NULL
109695 +read_file_bool_4180 read_file_bool 3 4180 NULL
109696 +ocfs2_find_cpos_for_right_leaf_4194 ocfs2_find_cpos_for_right_leaf 0 4194 NULL
109697 +vring_new_virtqueue_4199 vring_new_virtqueue 2 4199 NULL
109698 +f1x_determine_channel_4202 f1x_determine_channel 2 4202 NULL
109699 +_osd_req_list_objects_4204 _osd_req_list_objects 6 4204 NULL
109700 +__snd_gf1_read_addr_4210 __snd_gf1_read_addr 0 4210 NULL
109701 +ath6kl_force_roam_write_4282 ath6kl_force_roam_write 3 4282 NULL
109702 +goldfish_audio_write_4284 goldfish_audio_write 3 4284 NULL
109703 +__usbnet_read_cmd_4299 __usbnet_read_cmd 7 4299 NULL
109704 +dvb_ringbuffer_pkt_read_user_4303 dvb_ringbuffer_pkt_read_user 2-3-5 4303 NULL
109705 +count_strings_4315 count_strings 0 4315 NULL
109706 +nouveau_fifo_create__4327 nouveau_fifo_create_ 5-6 4327 NULL
109707 +snd_rawmidi_kernel_read_4328 snd_rawmidi_kernel_read 3 4328 NULL
109708 +ima_eventdigest_init_common_4338 ima_eventdigest_init_common 2 4338 NULL
109709 +__copy_from_user_inatomic_4365 __copy_from_user_inatomic 0-3 4365 NULL nohasharray
109710 +lookup_string_4365 lookup_string 0 4365 &__copy_from_user_inatomic_4365
109711 +irda_sendmsg_4388 irda_sendmsg 4 4388 NULL
109712 +access_process_vm_4412 access_process_vm 0 4412 NULL nohasharray
109713 +cxacru_cm_get_array_4412 cxacru_cm_get_array 4 4412 &access_process_vm_4412
109714 +libfc_vport_create_4415 libfc_vport_create 2 4415 NULL
109715 +rtw_android_get_rssi_4421 rtw_android_get_rssi 0 4421 NULL
109716 +do_pages_stat_4437 do_pages_stat 2 4437 NULL
109717 +at76_set_card_command_4471 at76_set_card_command 4 4471 NULL
109718 +snd_seq_expand_var_event_4481 snd_seq_expand_var_event 5-0 4481 NULL
109719 +vmbus_establish_gpadl_4495 vmbus_establish_gpadl 3 4495 NULL
109720 +set_link_security_4502 set_link_security 4 4502 NULL
109721 +xfs_btree_kill_root_4526 xfs_btree_kill_root 0 4526 NULL
109722 +ll_max_readahead_per_file_mb_seq_write_4531 ll_max_readahead_per_file_mb_seq_write 3 4531 NULL
109723 +tty_register_device_4544 tty_register_device 2 4544 NULL
109724 +btrfs_file_extent_inline_item_len_4575 btrfs_file_extent_inline_item_len 0 4575 NULL
109725 +xfs_buf_get_maps_4581 xfs_buf_get_maps 2 4581 NULL
109726 +bch_alloc_4593 bch_alloc 1 4593 NULL
109727 +ocfs2_refcount_lock_4595 ocfs2_refcount_lock 0 4595 NULL
109728 +ll_rw_extents_stats_seq_write_4633 ll_rw_extents_stats_seq_write 3 4633 NULL
109729 +iwl_dbgfs_tx_queue_read_4635 iwl_dbgfs_tx_queue_read 3 4635 NULL
109730 +skb_add_data_nocache_4682 skb_add_data_nocache 4 4682 NULL
109731 +cx18_read_pos_4683 cx18_read_pos 3 4683 NULL
109732 +short_retry_limit_read_4687 short_retry_limit_read 3 4687 NULL
109733 +kone_receive_4690 kone_receive 4 4690 NULL
109734 +hash_netportnet6_expire_4702 hash_netportnet6_expire 4 4702 NULL
109735 +cxgbi_alloc_big_mem_4707 cxgbi_alloc_big_mem 1 4707 NULL
109736 +ati_create_gatt_pages_4722 ati_create_gatt_pages 1 4722 NULL nohasharray
109737 +show_header_4722 show_header 3 4722 &ati_create_gatt_pages_4722
109738 +bitmap_startwrite_4736 bitmap_startwrite 2 4736 NULL nohasharray
109739 +ll_rw_offset_stats_seq_write_4736 ll_rw_offset_stats_seq_write 3 4736 &bitmap_startwrite_4736
109740 +lu_buf_alloc_4753 lu_buf_alloc 2 4753 NULL
109741 +pwr_rcvd_bcns_cnt_read_4774 pwr_rcvd_bcns_cnt_read 3 4774 NULL
109742 +create_subvol_4791 create_subvol 4 4791 NULL
109743 +ncp__vol2io_4804 ncp__vol2io 5 4804 NULL
109744 +repair_io_failure_4815 repair_io_failure 4-3 4815 NULL
109745 +comedi_buf_write_free_4847 comedi_buf_write_free 2 4847 NULL
109746 +gigaset_if_receive_4861 gigaset_if_receive 3 4861 NULL
109747 +key_tx_spec_read_4862 key_tx_spec_read 3 4862 NULL
109748 +ocfs2_defrag_extent_4873 ocfs2_defrag_extent 2 4873 NULL
109749 +hid_register_field_4874 hid_register_field 2-3 4874 NULL
109750 +vga_arb_read_4886 vga_arb_read 3 4886 NULL
109751 +ieee80211_if_fmt_ave_beacon_4941 ieee80211_if_fmt_ave_beacon 3 4941 NULL
109752 +ocfs2_should_refresh_lock_res_4958 ocfs2_should_refresh_lock_res 0 4958 NULL
109753 +compat_rawv6_setsockopt_4967 compat_rawv6_setsockopt 5 4967 NULL
109754 +ath10k_read_chip_id_4969 ath10k_read_chip_id 3 4969 NULL
109755 +skb_network_header_len_4971 skb_network_header_len 0 4971 NULL
109756 +ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval_4976 ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval 3 4976 NULL
109757 +compat_SyS_ipc_5000 compat_SyS_ipc 3 5000 NULL
109758 +do_mincore_5018 do_mincore 0-2-1 5018 NULL
109759 +btrfs_punch_hole_5041 btrfs_punch_hole 2 5041 NULL
109760 +cfg80211_rx_mgmt_5056 cfg80211_rx_mgmt 5 5056 NULL
109761 +ocfs2_check_range_for_holes_5066 ocfs2_check_range_for_holes 3-2 5066 NULL
109762 +snd_mixart_BA1_read_5082 snd_mixart_BA1_read 5 5082 NULL
109763 +snd_emu10k1_ptr20_read_5087 snd_emu10k1_ptr20_read 0 5087 NULL
109764 +kfifo_copy_from_user_5091 kfifo_copy_from_user 3-4-0 5091 NULL nohasharray
109765 +get_random_bytes_5091 get_random_bytes 2 5091 &kfifo_copy_from_user_5091 nohasharray
109766 +blk_rq_sectors_5091 blk_rq_sectors 0 5091 &get_random_bytes_5091
109767 +sound_write_5102 sound_write 3 5102 NULL
109768 +i40e_dbg_netdev_ops_write_5117 i40e_dbg_netdev_ops_write 3 5117 NULL
109769 +__uwb_addr_print_5161 __uwb_addr_print 2 5161 NULL
109770 +iwl_dbgfs_status_read_5171 iwl_dbgfs_status_read 3 5171 NULL
109771 +acpi_pcc_get_sqty_5176 acpi_pcc_get_sqty 0 5176 NULL
109772 +ppp_cp_parse_cr_5214 ppp_cp_parse_cr 4 5214 NULL
109773 +dwc2_hcd_urb_alloc_5217 dwc2_hcd_urb_alloc 2 5217 NULL
109774 +ath6kl_debug_roam_tbl_event_5224 ath6kl_debug_roam_tbl_event 3 5224 NULL
109775 +usb_descriptor_fillbuf_5302 usb_descriptor_fillbuf 0 5302 NULL
109776 +r592_write_fifo_pio_5315 r592_write_fifo_pio 3 5315 NULL
109777 +sbc_get_write_same_sectors_5317 sbc_get_write_same_sectors 0 5317 NULL
109778 +pwr_elp_enter_read_5324 pwr_elp_enter_read 3 5324 NULL
109779 +cq_free_res_5355 cq_free_res 5 5355 NULL
109780 +ps_pspoll_utilization_read_5361 ps_pspoll_utilization_read 3 5361 NULL
109781 +cciss_allocate_sg_chain_blocks_5368 cciss_allocate_sg_chain_blocks 3-2 5368 NULL
109782 +xfs_free_extent_5411 xfs_free_extent 0 5411 NULL
109783 +xfs_efd_init_5463 xfs_efd_init 3 5463 NULL
109784 +ll_xattr_cache_refill_5468 ll_xattr_cache_refill 0 5468 NULL
109785 +kernfs_fop_write_5471 kernfs_fop_write 3 5471 NULL
109786 +xfs_efi_init_5476 xfs_efi_init 2 5476 NULL
109787 +cifs_security_flags_proc_write_5484 cifs_security_flags_proc_write 3 5484 NULL
109788 +tty_write_5494 tty_write 3 5494 NULL
109789 +tomoyo_update_domain_5498 tomoyo_update_domain 2 5498 NULL nohasharray
109790 +ieee80211_if_fmt_last_beacon_5498 ieee80211_if_fmt_last_beacon 3 5498 &tomoyo_update_domain_5498
109791 +__max_nr_grant_frames_5505 __max_nr_grant_frames 0 5505 NULL
109792 +ieee80211_if_fmt_auto_open_plinks_5534 ieee80211_if_fmt_auto_open_plinks 3 5534 NULL
109793 +get_entry_msg_len_5552 get_entry_msg_len 0 5552 NULL
109794 +le_readq_5557 le_readq 0 5557 NULL
109795 +inw_5558 inw 0 5558 NULL
109796 +gfs2_extent_map_5561 gfs2_extent_map 0 5561 NULL
109797 +bioset_create_5580 bioset_create 1 5580 NULL
109798 +oz_ep_alloc_5587 oz_ep_alloc 1 5587 NULL
109799 +__remove_suid_5618 __remove_suid 0 5618 NULL
109800 +gfs2_unstuffer_page_5620 gfs2_unstuffer_page 0 5620 NULL
109801 +SYSC_fsetxattr_5639 SYSC_fsetxattr 4 5639 NULL
109802 +ext4_xattr_get_5661 ext4_xattr_get 0 5661 NULL
109803 +posix_clock_register_5662 posix_clock_register 2 5662 NULL
109804 +get_arg_5694 get_arg 3 5694 NULL
109805 +subbuf_read_actor_5708 subbuf_read_actor 3 5708 NULL
109806 +vmw_kms_readback_5727 vmw_kms_readback 6 5727 NULL
109807 +rts51x_transfer_data_partial_5735 rts51x_transfer_data_partial 6 5735 NULL
109808 +sctp_setsockopt_autoclose_5775 sctp_setsockopt_autoclose 3 5775 NULL
109809 +__vxge_hw_blockpool_malloc_5786 __vxge_hw_blockpool_malloc 2 5786 NULL
109810 +nvme_trans_bdev_char_page_5797 nvme_trans_bdev_char_page 3 5797 NULL
109811 +skb_copy_datagram_iovec_5806 skb_copy_datagram_iovec 2-4 5806 NULL
109812 +nv50_disp_pioc_create__5812 nv50_disp_pioc_create_ 5 5812 NULL
109813 +ceph_x_encrypt_buflen_5829 ceph_x_encrypt_buflen 0-1 5829 NULL
109814 +ceph_msg_new_5846 ceph_msg_new 2 5846 NULL
109815 +setup_req_5848 setup_req 3 5848 NULL
109816 +ria_page_count_5849 ria_page_count 0 5849 NULL
109817 +rx_filter_max_arp_queue_dep_read_5851 rx_filter_max_arp_queue_dep_read 3 5851 NULL
109818 +config_buf_5862 config_buf 0 5862 NULL
109819 +lprocfs_fid_width_seq_write_5889 lprocfs_fid_width_seq_write 3 5889 NULL
109820 +port_show_regs_5904 port_show_regs 3 5904 NULL
109821 +rbd_segment_length_5907 rbd_segment_length 0-3-2 5907 NULL
109822 +uhci_debug_read_5911 uhci_debug_read 3 5911 NULL
109823 +lbs_highsnr_read_5931 lbs_highsnr_read 3 5931 NULL
109824 +ps_poll_ps_poll_timeouts_read_5934 ps_poll_ps_poll_timeouts_read 3 5934 NULL
109825 +edac_device_alloc_ctl_info_5941 edac_device_alloc_ctl_info 1 5941 NULL
109826 +ll_statahead_one_5962 ll_statahead_one 3 5962 NULL
109827 +__apu_get_register_5967 __apu_get_register 0 5967 NULL
109828 +ieee80211_if_fmt_rc_rateidx_mask_5ghz_5971 ieee80211_if_fmt_rc_rateidx_mask_5ghz 3 5971 NULL
109829 +alloc_msg_6072 alloc_msg 1 6072 NULL
109830 +sctp_setsockopt_connectx_6073 sctp_setsockopt_connectx 3 6073 NULL
109831 +rts51x_ms_rw_multi_sector_6076 rts51x_ms_rw_multi_sector 3-4 6076 NULL
109832 +__mnt_want_write_6091 __mnt_want_write 0 6091 NULL
109833 +ipmi_addr_length_6110 ipmi_addr_length 0 6110 NULL
109834 +dfs_global_file_write_6112 dfs_global_file_write 3 6112 NULL
109835 +nouveau_parent_create__6131 nouveau_parent_create_ 7 6131 NULL
109836 +ieee80211_if_fmt_beacon_timeout_6153 ieee80211_if_fmt_beacon_timeout 3 6153 NULL
109837 +ivtv_copy_buf_to_user_6159 ivtv_copy_buf_to_user 4 6159 NULL
109838 +maybe_insert_hole_6167 maybe_insert_hole 3 6167 NULL
109839 +wl1251_cmd_template_set_6172 wl1251_cmd_template_set 4 6172 NULL
109840 +SyS_setgroups_6182 SyS_setgroups 1 6182 NULL
109841 +mxt_show_instance_6207 mxt_show_instance 2-0 6207 NULL
109842 +v4l2_ctrl_new_std_menu_6221 v4l2_ctrl_new_std_menu 4 6221 NULL
109843 +mqueue_read_file_6228 mqueue_read_file 3 6228 NULL
109844 +f_hidg_read_6238 f_hidg_read 3 6238 NULL
109845 +fbcon_prepare_logo_6246 fbcon_prepare_logo 5 6246 NULL
109846 +tx_tx_start_null_frame_read_6281 tx_tx_start_null_frame_read 3 6281 NULL
109847 +snd_hda_override_conn_list_6282 snd_hda_override_conn_list 3-0 6282 NULL nohasharray
109848 +xenbus_file_write_6282 xenbus_file_write 3 6282 &snd_hda_override_conn_list_6282
109849 +posix_acl_fix_xattr_to_user_6283 posix_acl_fix_xattr_to_user 2 6283 NULL
109850 +serial_port_in_6291 serial_port_in 0 6291 NULL
109851 +qlcnic_sriov_alloc_bc_msg_6309 qlcnic_sriov_alloc_bc_msg 2 6309 NULL
109852 +hfa384x_inw_6329 hfa384x_inw 0 6329 NULL nohasharray
109853 +SyS_mincore_6329 SyS_mincore 2-1 6329 &hfa384x_inw_6329
109854 +fuse_get_req_for_background_6337 fuse_get_req_for_background 2 6337 NULL
109855 +ucs2_strnlen_6342 ucs2_strnlen 0 6342 NULL
109856 +regcache_sync_block_raw_6350 regcache_sync_block_raw 5-4 6350 NULL
109857 +mei_dbgfs_read_devstate_6352 mei_dbgfs_read_devstate 3 6352 NULL
109858 +_proc_do_string_6376 _proc_do_string 2 6376 NULL
109859 +osd_req_read_sg_kern_6378 osd_req_read_sg_kern 5 6378 NULL
109860 +xfs_bmap_extents_to_btree_6387 xfs_bmap_extents_to_btree 0 6387 NULL
109861 +posix_acl_fix_xattr_userns_6420 posix_acl_fix_xattr_userns 4 6420 NULL
109862 +add_transaction_credits_6422 add_transaction_credits 2-3 6422 NULL
109863 +ipr_change_queue_depth_6431 ipr_change_queue_depth 2 6431 NULL
109864 +__alloc_bootmem_node_nopanic_6432 __alloc_bootmem_node_nopanic 2 6432 NULL
109865 +ieee80211_if_fmt_dot11MeshMaxRetries_6476 ieee80211_if_fmt_dot11MeshMaxRetries 3 6476 NULL
109866 +qp_memcpy_from_queue_6479 qp_memcpy_from_queue 5-4 6479 NULL
109867 +cipso_v4_map_lvl_hton_6490 cipso_v4_map_lvl_hton 0 6490 NULL
109868 +dbg_intr_buf_6501 dbg_intr_buf 2 6501 NULL
109869 +mei_read_6507 mei_read 3 6507 NULL
109870 +rndis_set_oid_6547 rndis_set_oid 4 6547 NULL
109871 +wdm_read_6549 wdm_read 3 6549 NULL
109872 +dm_stats_create_6551 dm_stats_create 4-2-3 6551 NULL
109873 +fb_alloc_cmap_6554 fb_alloc_cmap 2 6554 NULL
109874 +SyS_semtimedop_6563 SyS_semtimedop 3 6563 NULL
109875 +xfs_iozero_6573 xfs_iozero 0 6573 NULL
109876 +ecryptfs_filldir_6622 ecryptfs_filldir 3 6622 NULL
109877 +process_rcvd_data_6679 process_rcvd_data 3 6679 NULL
109878 +btrfs_lookup_csums_range_6696 btrfs_lookup_csums_range 2-3 6696 NULL
109879 +ps_pspoll_max_apturn_read_6699 ps_pspoll_max_apturn_read 3 6699 NULL
109880 +bnad_debugfs_write_regrd_6706 bnad_debugfs_write_regrd 3 6706 NULL
109881 +mpeg_read_6708 mpeg_read 3 6708 NULL
109882 +ibmpex_query_sensor_count_6709 ibmpex_query_sensor_count 0 6709 NULL
109883 +video_proc_write_6724 video_proc_write 3 6724 NULL
109884 +posix_acl_xattr_count_6725 posix_acl_xattr_count 0-1 6725 NULL
109885 +kobject_add_varg_6781 kobject_add_varg 0 6781 NULL
109886 +iwl_dbgfs_channels_read_6784 iwl_dbgfs_channels_read 3 6784 NULL
109887 +ieee80211_if_read_6785 ieee80211_if_read 3 6785 NULL
109888 +zone_spanned_pages_in_node_6787 zone_spanned_pages_in_node 0-3-4 6787 NULL
109889 +hdlcdrv_register_6792 hdlcdrv_register 2 6792 NULL
109890 +ll_xattr_cache_find_6798 ll_xattr_cache_find 0 6798 NULL
109891 +tx_tx_done_data_read_6799 tx_tx_done_data_read 3 6799 NULL
109892 +lbs_rdrf_write_6826 lbs_rdrf_write 3 6826 NULL
109893 +calc_pages_for_6838 calc_pages_for 0-1-2 6838 NULL
109894 +mon_bin_read_6841 mon_bin_read 3 6841 NULL
109895 +snd_cs4281_BA0_read_6847 snd_cs4281_BA0_read 5 6847 NULL
109896 +xfs_rtany_summary_6851 xfs_rtany_summary 0 6851 NULL
109897 +perf_output_sample_ustack_6868 perf_output_sample_ustack 2 6868 NULL
109898 +dio_complete_6879 dio_complete 0-2-3 6879 NULL
109899 +raw_seticmpfilter_6888 raw_seticmpfilter 3 6888 NULL nohasharray
109900 +ieee80211_if_fmt_path_refresh_time_6888 ieee80211_if_fmt_path_refresh_time 3 6888 &raw_seticmpfilter_6888
109901 +dlmfs_file_write_6892 dlmfs_file_write 3 6892 NULL
109902 +proc_sessionid_read_6911 proc_sessionid_read 3 6911 NULL nohasharray
109903 +spi_show_regs_6911 spi_show_regs 3 6911 &proc_sessionid_read_6911 nohasharray
109904 +acm_alloc_minor_6911 acm_alloc_minor 0 6911 &spi_show_regs_6911
109905 +__kfifo_dma_in_finish_r_6913 __kfifo_dma_in_finish_r 2-3 6913 NULL
109906 +lops_scan_elements_6916 lops_scan_elements 0 6916 NULL
109907 +cache_do_downcall_6926 cache_do_downcall 3 6926 NULL
109908 +ipath_verbs_send_dma_6929 ipath_verbs_send_dma 6 6929 NULL
109909 +qsfp_cks_6945 qsfp_cks 2-0 6945 NULL
109910 +tg3_nvram_write_block_unbuffered_6955 tg3_nvram_write_block_unbuffered 3 6955 NULL
109911 +pch_uart_hal_read_6961 pch_uart_hal_read 0 6961 NULL
109912 +rsa_extract_mpi_6973 rsa_extract_mpi 5 6973 NULL nohasharray
109913 +i40e_dbg_dump_write_6973 i40e_dbg_dump_write 3 6973 &rsa_extract_mpi_6973
109914 +request_key_async_6990 request_key_async 4 6990 NULL
109915 +tpl_write_6998 tpl_write 3 6998 NULL
109916 +r871x_set_wpa_ie_7000 r871x_set_wpa_ie 3 7000 NULL
109917 +cipso_v4_gentag_enum_7006 cipso_v4_gentag_enum 0 7006 NULL
109918 +tracing_cpumask_read_7010 tracing_cpumask_read 3 7010 NULL
109919 +ld_usb_write_7022 ld_usb_write 3 7022 NULL
109920 +wimax_msg_7030 wimax_msg 4 7030 NULL
109921 +ceph_kvmalloc_7033 ceph_kvmalloc 1 7033 NULL
109922 +ipath_get_base_info_7043 ipath_get_base_info 3 7043 NULL
109923 +snd_pcm_oss_bytes_7051 snd_pcm_oss_bytes 2 7051 NULL
109924 +hci_sock_recvmsg_7072 hci_sock_recvmsg 4 7072 NULL
109925 +event_enable_read_7074 event_enable_read 3 7074 NULL
109926 +beacon_interval_read_7091 beacon_interval_read 3 7091 NULL
109927 +pipeline_enc_rx_stat_fifo_int_read_7107 pipeline_enc_rx_stat_fifo_int_read 3 7107 NULL
109928 +osc_resend_count_seq_write_7120 osc_resend_count_seq_write 3 7120 NULL
109929 +kvm_mmu_notifier_test_young_7139 kvm_mmu_notifier_test_young 3 7139 NULL
109930 +__alloc_objio_seg_7203 __alloc_objio_seg 1 7203 NULL
109931 +hdlc_loop_7255 hdlc_loop 0 7255 NULL
109932 +f_midi_start_ep_7270 f_midi_start_ep 0 7270 NULL
109933 +rx_rate_rx_frames_per_rates_read_7282 rx_rate_rx_frames_per_rates_read 3 7282 NULL
109934 +get_string_7302 get_string 0 7302 NULL
109935 +security_inode_need_killpriv_7322 security_inode_need_killpriv 0 7322 NULL
109936 +pci_vpd_info_field_size_7324 pci_vpd_info_field_size 0 7324 NULL
109937 +mgmt_control_7349 mgmt_control 3 7349 NULL
109938 +at_est2timeout_7365 at_est2timeout 0-1 7365 NULL
109939 +ieee80211_if_read_dot11MeshHWMPactivePathTimeout_7368 ieee80211_if_read_dot11MeshHWMPactivePathTimeout 3 7368 NULL
109940 +xfs_btree_delete_7384 xfs_btree_delete 0 7384 NULL
109941 +ath10k_read_fw_stats_7387 ath10k_read_fw_stats 3 7387 NULL
109942 +hweight_long_7388 hweight_long 1-0 7388 NULL
109943 +sl_change_mtu_7396 sl_change_mtu 2 7396 NULL
109944 +_ore_add_stripe_unit_7399 _ore_add_stripe_unit 6-3 7399 NULL
109945 +readb_7401 readb 0 7401 NULL
109946 +drm_property_create_blob_7414 drm_property_create_blob 2 7414 NULL
109947 +__copy_to_user_nocheck_7443 __copy_to_user_nocheck 0-3 7443 NULL
109948 +ip_options_get_alloc_7448 ip_options_get_alloc 1 7448 NULL
109949 +SYSC_setgroups_7454 SYSC_setgroups 1 7454 NULL
109950 +rt2x00debug_read_queue_stats_7455 rt2x00debug_read_queue_stats 3 7455 NULL
109951 +l2tp_ip6_sendmsg_7461 l2tp_ip6_sendmsg 4 7461 NULL
109952 +garp_request_join_7471 garp_request_join 4 7471 NULL nohasharray
109953 +ReadHSCX_7471 ReadHSCX 0 7471 &garp_request_join_7471
109954 +snd_pcm_lib_read1_7491 snd_pcm_lib_read1 0-3 7491 NULL
109955 +iwl_mvm_power_dbgfs_read_7502 iwl_mvm_power_dbgfs_read 0 7502 NULL
109956 +ahash_instance_headroom_7509 ahash_instance_headroom 0 7509 NULL nohasharray
109957 +sdhci_alloc_host_7509 sdhci_alloc_host 2 7509 &ahash_instance_headroom_7509
109958 +array_zalloc_7519 array_zalloc 1-2 7519 NULL
109959 +ath10k_read_htt_stats_mask_7557 ath10k_read_htt_stats_mask 3 7557 NULL
109960 +smk_read_mapped_7562 smk_read_mapped 3 7562 NULL
109961 +cfs_cpt_num_estimate_7571 cfs_cpt_num_estimate 0 7571 NULL
109962 +ocfs2_lock_create_7612 ocfs2_lock_create 0 7612 NULL
109963 +groups_alloc_7614 groups_alloc 1 7614 NULL nohasharray
109964 +create_dir_7614 create_dir 0 7614 &groups_alloc_7614
109965 +_rtw_zmalloc_7636 _rtw_zmalloc 1 7636 NULL
109966 +xfs_bmap_btalloc_nullfb_7654 xfs_bmap_btalloc_nullfb 0 7654 NULL
109967 +fault_inject_write_7662 fault_inject_write 3 7662 NULL
109968 +acpi_ex_allocate_name_string_7685 acpi_ex_allocate_name_string 2-1 7685 NULL
109969 +acpi_ns_get_pathname_length_7699 acpi_ns_get_pathname_length 0 7699 NULL
109970 +dev_write_7708 dev_write 3 7708 NULL
109971 +pci_raw_set_power_state_7729 pci_raw_set_power_state 0 7729 NULL
109972 +vxge_device_register_7752 vxge_device_register 4 7752 NULL
109973 +iwl_dbgfs_bt_cmd_read_7770 iwl_dbgfs_bt_cmd_read 3 7770 NULL
109974 +alloc_candev_7776 alloc_candev 1-2 7776 NULL
109975 +dfs_global_file_read_7787 dfs_global_file_read 3 7787 NULL
109976 +bnx2_nvram_write_7790 bnx2_nvram_write 4-2 7790 NULL
109977 +diva_os_copy_from_user_7792 diva_os_copy_from_user 4 7792 NULL nohasharray
109978 +lustre_packed_msg_size_7792 lustre_packed_msg_size 0 7792 &diva_os_copy_from_user_7792
109979 +xfs_alloc_find_best_extent_7837 xfs_alloc_find_best_extent 0 7837 NULL
109980 +cfs_trace_dump_debug_buffer_usrstr_7861 cfs_trace_dump_debug_buffer_usrstr 2 7861 NULL
109981 +tipc_alloc_entry_7875 tipc_alloc_entry 2 7875 NULL
109982 +config_desc_7878 config_desc 0 7878 NULL
109983 +gfs2_permission_7884 gfs2_permission 0 7884 NULL
109984 +dvb_dmxdev_read_sec_7892 dvb_dmxdev_read_sec 4 7892 NULL
109985 +xfs_trans_get_efi_7898 xfs_trans_get_efi 2 7898 NULL
109986 +libfc_host_alloc_7917 libfc_host_alloc 2 7917 NULL
109987 +f_hidg_write_7932 f_hidg_write 3 7932 NULL
109988 +integrity_digsig_verify_7956 integrity_digsig_verify 3-0 7956 NULL
109989 +smk_write_load_self_7958 smk_write_load_self 3 7958 NULL
109990 +tt3650_ci_msg_locked_8013 tt3650_ci_msg_locked 4 8013 NULL
109991 +vcs_read_8017 vcs_read 3 8017 NULL
109992 +vhost_add_used_and_signal_n_8038 vhost_add_used_and_signal_n 4 8038 NULL
109993 +ms_read_multiple_pages_8052 ms_read_multiple_pages 5-4 8052 NULL
109994 +dgrp_mon_read_8065 dgrp_mon_read 3 8065 NULL
109995 +spi_write_then_read_8073 spi_write_then_read 5-3 8073 NULL
109996 +qla4xxx_post_ping_evt_work_8074 qla4xxx_post_ping_evt_work 4 8074 NULL
109997 +venus_lookup_8121 venus_lookup 4 8121 NULL
109998 +ieee80211_if_fmt_num_buffered_multicast_8127 ieee80211_if_fmt_num_buffered_multicast 3 8127 NULL
109999 +__sk_mem_schedule_8185 __sk_mem_schedule 2 8185 NULL
110000 +ieee80211_if_fmt_dot11MeshHoldingTimeout_8187 ieee80211_if_fmt_dot11MeshHoldingTimeout 3 8187 NULL
110001 +recent_mt_proc_write_8206 recent_mt_proc_write 3 8206 NULL
110002 +__ocfs2_lock_refcount_tree_8207 __ocfs2_lock_refcount_tree 0 8207 NULL
110003 +rt2x00debug_write_bbp_8212 rt2x00debug_write_bbp 3 8212 NULL
110004 +ad7879_spi_multi_read_8218 ad7879_spi_multi_read 3 8218 NULL
110005 +play_iframe_8219 play_iframe 3 8219 NULL
110006 +kvm_mmu_page_set_gfn_8225 kvm_mmu_page_set_gfn 2 8225 NULL
110007 +sctp_ssnmap_size_8228 sctp_ssnmap_size 0-1-2 8228 NULL
110008 +check_xattr_ref_inode_8244 check_xattr_ref_inode 0 8244 NULL
110009 +t3_init_l2t_8261 t3_init_l2t 1 8261 NULL
110010 +init_cdev_8274 init_cdev 1 8274 NULL
110011 +rproc_recovery_write_8281 rproc_recovery_write 3 8281 NULL
110012 +qib_decode_7220_err_8315 qib_decode_7220_err 3 8315 NULL
110013 +ipwireless_send_packet_8328 ipwireless_send_packet 4 8328 NULL
110014 +tracing_entries_read_8345 tracing_entries_read 3 8345 NULL
110015 +ieee80211_if_fmt_ht_opmode_8347 ieee80211_if_fmt_ht_opmode 3 8347 NULL
110016 +generic_write_sync_8358 generic_write_sync 0 8358 NULL
110017 +ping_getfrag_8360 ping_getfrag 4-3 8360 NULL
110018 +ath6kl_lrssi_roam_write_8362 ath6kl_lrssi_roam_write 3 8362 NULL
110019 +xdi_copy_from_user_8395 xdi_copy_from_user 4 8395 NULL
110020 +zd_rf_scnprint_id_8406 zd_rf_scnprint_id 0-3 8406 NULL
110021 +smk_write_change_rule_8411 smk_write_change_rule 3 8411 NULL nohasharray
110022 +uvc_v4l2_ioctl_8411 uvc_v4l2_ioctl 2 8411 &smk_write_change_rule_8411
110023 +roccat_common2_sysfs_read_8431 roccat_common2_sysfs_read 6 8431 NULL
110024 +afs_cell_lookup_8482 afs_cell_lookup 2 8482 NULL
110025 +fore200e_chunk_alloc_8501 fore200e_chunk_alloc 4-3 8501 NULL
110026 +batadv_tt_len_8502 batadv_tt_len 0-1 8502 NULL
110027 +dev_config_8506 dev_config 3 8506 NULL
110028 +ACL_to_cifs_posix_8509 ACL_to_cifs_posix 3 8509 NULL
110029 +opticon_process_data_packet_8524 opticon_process_data_packet 3 8524 NULL
110030 +user_on_off_8552 user_on_off 2 8552 NULL
110031 +profile_remove_8556 profile_remove 3 8556 NULL
110032 +cache_slow_downcall_8570 cache_slow_downcall 2 8570 NULL
110033 +isr_dma0_done_read_8574 isr_dma0_done_read 3 8574 NULL
110034 +tower_write_8580 tower_write 3 8580 NULL
110035 +cfs_cpt_number_8618 cfs_cpt_number 0 8618 NULL
110036 +shash_setkey_unaligned_8620 shash_setkey_unaligned 3 8620 NULL
110037 +xfs_qm_dqattach_locked_8625 xfs_qm_dqattach_locked 0 8625 NULL
110038 +it821x_firmware_command_8628 it821x_firmware_command 3 8628 NULL
110039 +scsi_dma_map_8632 scsi_dma_map 0 8632 NULL
110040 +fuse_send_write_pages_8636 fuse_send_write_pages 0-5 8636 NULL
110041 +mlx5_vzalloc_8663 mlx5_vzalloc 1 8663 NULL
110042 +dio_bio_alloc_8677 dio_bio_alloc 5 8677 NULL
110043 +lbs_bcnmiss_read_8678 lbs_bcnmiss_read 3 8678 NULL
110044 +rproc_trace_read_8686 rproc_trace_read 3 8686 NULL
110045 +skb_frag_size_8695 skb_frag_size 0 8695 NULL
110046 +arcfb_write_8702 arcfb_write 3 8702 NULL
110047 +i_size_read_8703 i_size_read 0 8703 NULL nohasharray
110048 +init_header_8703 init_header 0 8703 &i_size_read_8703
110049 +HDLC_irq_8709 HDLC_irq 2 8709 NULL
110050 +ctrl_out_8712 ctrl_out 3-5 8712 NULL
110051 +tracing_max_lat_write_8728 tracing_max_lat_write 3 8728 NULL
110052 +jffs2_acl_count_8729 jffs2_acl_count 0-1 8729 NULL
110053 +__create_irqs_8733 __create_irqs 2 8733 NULL
110054 +tx_tx_exch_expiry_read_8749 tx_tx_exch_expiry_read 3 8749 NULL
110055 +compound_order_8750 compound_order 0 8750 NULL
110056 +ocfs2_find_path_8754 ocfs2_find_path 0 8754 NULL
110057 +yurex_write_8761 yurex_write 3 8761 NULL
110058 +joydev_compat_ioctl_8765 joydev_compat_ioctl 2 8765 NULL
110059 +kstrtoint_from_user_8778 kstrtoint_from_user 2 8778 NULL
110060 +paging32_prefetch_gpte_8783 paging32_prefetch_gpte 4 8783 NULL
110061 +ext4_try_to_write_inline_data_8785 ext4_try_to_write_inline_data 3-4 8785 NULL
110062 +__bitmap_weight_8796 __bitmap_weight 0-2 8796 NULL
110063 +gfs2_glock_nq_8808 gfs2_glock_nq 0 8808 NULL
110064 +ntfs_commit_pages_after_write_8809 ntfs_commit_pages_after_write 0 8809 NULL
110065 +metronomefb_write_8823 metronomefb_write 3 8823 NULL
110066 +SyS_llistxattr_8824 SyS_llistxattr 3 8824 NULL
110067 +extent_read_full_page_8826 extent_read_full_page 0 8826 NULL
110068 +ll_xattr_cache_get_8829 ll_xattr_cache_get 0 8829 NULL
110069 +get_queue_depth_8833 get_queue_depth 0 8833 NULL
110070 +dvb_ringbuffer_pkt_next_8834 dvb_ringbuffer_pkt_next 0-2 8834 NULL
110071 +usb_ep_queue_8839 usb_ep_queue 0 8839 NULL
110072 +iwl_rx_packet_len_8854 iwl_rx_packet_len 0 8854 NULL
110073 +debug_debug1_read_8856 debug_debug1_read 3 8856 NULL
110074 +wa_nep_queue_8858 wa_nep_queue 2 8858 NULL
110075 +radeon_drm_ioctl_8875 radeon_drm_ioctl 2 8875 NULL
110076 +compressed_bio_size_8887 compressed_bio_size 0-2 8887 NULL
110077 +ab3100_get_set_reg_8890 ab3100_get_set_reg 3 8890 NULL nohasharray
110078 +tracing_max_lat_read_8890 tracing_max_lat_read 3 8890 &ab3100_get_set_reg_8890
110079 +sdio_max_byte_size_8907 sdio_max_byte_size 0 8907 NULL
110080 +sysfs_merge_group_8917 sysfs_merge_group 0 8917 NULL
110081 +write_file_ani_8918 write_file_ani 3 8918 NULL
110082 +layout_commit_8926 layout_commit 3 8926 NULL
110083 +adjust_priv_size_8935 adjust_priv_size 0-1 8935 NULL
110084 +driver_stats_read_8944 driver_stats_read 3 8944 NULL
110085 +read_file_tgt_stats_8959 read_file_tgt_stats 3 8959 NULL
110086 +usb_allocate_stream_buffers_8964 usb_allocate_stream_buffers 3 8964 NULL
110087 +qib_qsfp_dump_8966 qib_qsfp_dump 0-3 8966 NULL
110088 +venus_mkdir_8967 venus_mkdir 4 8967 NULL
110089 +seq_open_net_8968 seq_open_net 4 8968 NULL nohasharray
110090 +vol_cdev_read_8968 vol_cdev_read 3 8968 &seq_open_net_8968
110091 +bio_integrity_get_tag_8974 bio_integrity_get_tag 3 8974 NULL
110092 +jbd2_journal_blocks_per_page_9004 jbd2_journal_blocks_per_page 0 9004 NULL
110093 +il_dbgfs_clear_ucode_stats_write_9016 il_dbgfs_clear_ucode_stats_write 3 9016 NULL
110094 +xfs_inobt_get_rec_9023 xfs_inobt_get_rec 0 9023 NULL
110095 +snd_emu10k1_ptr_read_9026 snd_emu10k1_ptr_read 0-2 9026 NULL
110096 +fd_ioctl_9028 fd_ioctl 3 9028 NULL
110097 +nla_put_9042 nla_put 3 9042 NULL
110098 +ffs_func_revmap_intf_9043 ffs_func_revmap_intf 0 9043 NULL
110099 +sta_tx_latency_stat_header_9050 sta_tx_latency_stat_header 0-3-4 9050 NULL
110100 +snd_emu10k1_synth_copy_from_user_9061 snd_emu10k1_synth_copy_from_user 3-5 9061 NULL
110101 +snd_gus_dram_peek_9062 snd_gus_dram_peek 4 9062 NULL
110102 +fib_info_hash_alloc_9075 fib_info_hash_alloc 1 9075 NULL
110103 +create_queues_9088 create_queues 2-3 9088 NULL
110104 +ftdi_prepare_write_buffer_9093 ftdi_prepare_write_buffer 3 9093 NULL
110105 +adxl34x_spi_read_block_9108 adxl34x_spi_read_block 3 9108 NULL
110106 +caif_stream_sendmsg_9110 caif_stream_sendmsg 4 9110 NULL nohasharray
110107 +gfn_to_rmap_9110 gfn_to_rmap 3-2 9110 &caif_stream_sendmsg_9110 nohasharray
110108 +jhead_scan_9110 jhead_scan 0 9110 &gfn_to_rmap_9110
110109 +udf_direct_IO_9111 udf_direct_IO 4 9111 NULL
110110 +pmcraid_change_queue_depth_9116 pmcraid_change_queue_depth 2 9116 NULL
110111 +apei_resources_merge_9149 apei_resources_merge 0 9149 NULL
110112 +vb2_dma_sg_alloc_9157 vb2_dma_sg_alloc 2 9157 NULL
110113 +dbg_command_buf_9165 dbg_command_buf 2 9165 NULL
110114 +isr_irqs_read_9181 isr_irqs_read 3 9181 NULL
110115 +count_leading_zeros_9183 count_leading_zeros 0 9183 NULL
110116 +xfs_btree_rshift_9187 xfs_btree_rshift 0 9187 NULL
110117 +altera_swap_ir_9194 altera_swap_ir 2 9194 NULL
110118 +snd_m3_get_pointer_9206 snd_m3_get_pointer 0 9206 NULL
110119 +virtqueue_add_9217 virtqueue_add 4-5 9217 NULL
110120 +tx_tx_prepared_descs_read_9221 tx_tx_prepared_descs_read 3 9221 NULL
110121 +sctp_getsockopt_delayed_ack_9232 sctp_getsockopt_delayed_ack 2 9232 NULL
110122 +xfs_error_trap_9239 xfs_error_trap 0-1 9239 NULL
110123 +hfsplus_bnode_read_u16_9262 hfsplus_bnode_read_u16 0 9262 NULL
110124 +hdpvr_read_9273 hdpvr_read 3 9273 NULL
110125 +flakey_status_9274 flakey_status 5 9274 NULL
110126 +iwl_dbgfs_stations_read_9309 iwl_dbgfs_stations_read 3 9309 NULL
110127 +ceph_sync_setxattr_9310 ceph_sync_setxattr 4 9310 NULL
110128 +ieee80211_if_fmt_txpower_9334 ieee80211_if_fmt_txpower 3 9334 NULL
110129 +nvme_trans_fmt_get_parm_header_9340 nvme_trans_fmt_get_parm_header 2 9340 NULL
110130 +ocfs2_orphan_for_truncate_9342 ocfs2_orphan_for_truncate 4 9342 NULL
110131 +ll_direct_rw_pages_9361 ll_direct_rw_pages 0 9361 NULL
110132 +sta_beacon_loss_count_read_9370 sta_beacon_loss_count_read 3 9370 NULL
110133 +get_request_type_9393 get_request_type 0 9393 NULL nohasharray
110134 +mlx4_bitmap_init_9393 mlx4_bitmap_init 5-2 9393 &get_request_type_9393
110135 +virtqueue_add_outbuf_9395 virtqueue_add_outbuf 3 9395 NULL
110136 +read_9397 read 3 9397 NULL
110137 +hash_ipportip4_expire_9415 hash_ipportip4_expire 4 9415 NULL
110138 +btrfs_drop_extents_9423 btrfs_drop_extents 4 9423 NULL
110139 +bm_realloc_pages_9431 bm_realloc_pages 2 9431 NULL
110140 +ffs_ep0_write_9438 ffs_ep0_write 3 9438 NULL
110141 +ieee80211_if_fmt_fwded_unicast_9454 ieee80211_if_fmt_fwded_unicast 3 9454 NULL
110142 +agp_generic_alloc_user_9470 agp_generic_alloc_user 1 9470 NULL nohasharray
110143 +get_registers_9470 get_registers 4 9470 &agp_generic_alloc_user_9470
110144 +crypt_status_9492 crypt_status 5 9492 NULL
110145 +lbs_threshold_write_9502 lbs_threshold_write 5 9502 NULL
110146 +lp_write_9511 lp_write 3 9511 NULL
110147 +scsi_tgt_kspace_exec_9522 scsi_tgt_kspace_exec 8 9522 NULL
110148 +ll_max_read_ahead_whole_mb_seq_write_9528 ll_max_read_ahead_whole_mb_seq_write 3 9528 NULL
110149 +read_file_dma_9530 read_file_dma 3 9530 NULL
110150 +iwl_dbgfs_bf_params_read_9542 iwl_dbgfs_bf_params_read 3 9542 NULL
110151 +xfs_ialloc_read_agi_9545 xfs_ialloc_read_agi 0 9545 NULL
110152 +il_dbgfs_missed_beacon_write_9546 il_dbgfs_missed_beacon_write 3 9546 NULL
110153 +compat_SyS_pwritev64_9548 compat_SyS_pwritev64 3 9548 NULL
110154 +fw_node_create_9559 fw_node_create 2 9559 NULL
110155 +kobj_map_9566 kobj_map 2-3 9566 NULL
110156 +f2fs_read_data_pages_9574 f2fs_read_data_pages 4 9574 NULL
110157 +snd_emu10k1_fx8010_read_9605 snd_emu10k1_fx8010_read 5-6 9605 NULL
110158 +xfs_qm_dqattach_one_9612 xfs_qm_dqattach_one 0 9612 NULL
110159 +lov_ost_pool_add_9626 lov_ost_pool_add 3 9626 NULL
110160 +saa7164_buffer_alloc_user_9627 saa7164_buffer_alloc_user 2 9627 NULL
110161 +ceph_copy_user_to_page_vector_9635 ceph_copy_user_to_page_vector 4-3 9635 NULL
110162 +acpi_ex_insert_into_field_9638 acpi_ex_insert_into_field 3 9638 NULL
110163 +compat_sys_keyctl_9639 compat_sys_keyctl 4 9639 NULL
110164 +ll_checksum_seq_write_9648 ll_checksum_seq_write 3 9648 NULL
110165 +ocfs2_xattr_get_rec_9652 ocfs2_xattr_get_rec 0 9652 NULL
110166 +queue_received_packet_9657 queue_received_packet 5 9657 NULL
110167 +snd_opl4_mem_proc_write_9670 snd_opl4_mem_proc_write 5 9670 NULL
110168 +dns_query_9676 dns_query 3 9676 NULL
110169 +qib_7322_handle_hwerrors_9678 qib_7322_handle_hwerrors 3 9678 NULL
110170 +__erst_read_from_storage_9690 __erst_read_from_storage 0 9690 NULL
110171 +vx_transfer_end_9701 vx_transfer_end 0 9701 NULL
110172 +fuse_iter_npages_9705 fuse_iter_npages 0 9705 NULL nohasharray
110173 +ieee80211_if_read_aid_9705 ieee80211_if_read_aid 3 9705 &fuse_iter_npages_9705
110174 +cfg80211_tx_mlme_mgmt_9715 cfg80211_tx_mlme_mgmt 3 9715 NULL
110175 +btrfs_stack_file_extent_num_bytes_9720 btrfs_stack_file_extent_num_bytes 0 9720 NULL
110176 +SYSC_ppoll_9721 SYSC_ppoll 2 9721 NULL
110177 +nla_get_u8_9736 nla_get_u8 0 9736 NULL
110178 +ieee80211_if_fmt_num_mcast_sta_9738 ieee80211_if_fmt_num_mcast_sta 3 9738 NULL
110179 +shmem_replace_page_9740 shmem_replace_page 0 9740 NULL
110180 +ddb_input_read_9743 ddb_input_read 3-0 9743 NULL
110181 +sta_last_ack_signal_read_9751 sta_last_ack_signal_read 3 9751 NULL
110182 +btrfs_super_root_9763 btrfs_super_root 0 9763 NULL
110183 +__blk_queue_init_tags_9778 __blk_queue_init_tags 2 9778 NULL
110184 +kvm_age_hva_9795 kvm_age_hva 2 9795 NULL
110185 +parse_uac2_sample_rate_range_9801 parse_uac2_sample_rate_range 0 9801 NULL
110186 +tpm_data_in_9802 tpm_data_in 0 9802 NULL
110187 +ieee80211_if_read_state_9813 ieee80211_if_read_state 3 9813 NULL nohasharray
110188 +udpv6_recvmsg_9813 udpv6_recvmsg 4 9813 &ieee80211_if_read_state_9813
110189 +pmcraid_alloc_sglist_9864 pmcraid_alloc_sglist 1 9864 NULL
110190 +btrfs_free_reserved_extent_9867 btrfs_free_reserved_extent 2 9867 NULL
110191 +f1x_translate_sysaddr_to_cs_9868 f1x_translate_sysaddr_to_cs 2 9868 NULL
110192 +wil_read_file_ioblob_9878 wil_read_file_ioblob 3 9878 NULL
110193 +snd_midi_event_new_9893 snd_midi_event_new 1 9893 NULL nohasharray
110194 +bm_register_write_9893 bm_register_write 3 9893 &snd_midi_event_new_9893
110195 +snd_gf1_pcm_playback_copy_9895 snd_gf1_pcm_playback_copy 5-3 9895 NULL
110196 +nonpaging_page_fault_9908 nonpaging_page_fault 2 9908 NULL
110197 +pstore_ftrace_knob_read_9947 pstore_ftrace_knob_read 3 9947 NULL
110198 +read_file_misc_9948 read_file_misc 3 9948 NULL
110199 +csum_partial_copy_fromiovecend_9957 csum_partial_copy_fromiovecend 3-4 9957 NULL
110200 +xfs_buf_geterror_9959 xfs_buf_geterror 0 9959 NULL
110201 +SyS_gethostname_9964 SyS_gethostname 2 9964 NULL
110202 +get_free_serial_index_9969 get_free_serial_index 0 9969 NULL
110203 +btrfs_add_link_9973 btrfs_add_link 5 9973 NULL
110204 +gameport_read_9983 gameport_read 0 9983 NULL
110205 +SYSC_move_pages_9986 SYSC_move_pages 2 9986 NULL
110206 +ceph_oloc_oid_to_pg_10003 ceph_oloc_oid_to_pg 0 10003 NULL
110207 +aat2870_dump_reg_10019 aat2870_dump_reg 0 10019 NULL
110208 +ieee80211_set_probe_resp_10077 ieee80211_set_probe_resp 3 10077 NULL
110209 +xfs_attr_rmtval_get_10092 xfs_attr_rmtval_get 0 10092 NULL
110210 +xfs_btree_check_lptr_10104 xfs_btree_check_lptr 0 10104 NULL
110211 +get_elem_size_10110 get_elem_size 0-2 10110 NULL nohasharray
110212 +dynamic_ps_timeout_read_10110 dynamic_ps_timeout_read 3 10110 &get_elem_size_10110
110213 +gfs2_meta_read_10112 gfs2_meta_read 0 10112 NULL
110214 +SyS_migrate_pages_10134 SyS_migrate_pages 2 10134 NULL
110215 +aes_decrypt_packets_read_10155 aes_decrypt_packets_read 3 10155 NULL
110216 +rx_out_of_mem_read_10157 rx_out_of_mem_read 3 10157 NULL
110217 +hidg_alloc_ep_req_10159 hidg_alloc_ep_req 2 10159 NULL
110218 +asd_store_update_bios_10165 asd_store_update_bios 4 10165 NULL
110219 +kstrtol_from_user_10168 kstrtol_from_user 2 10168 NULL
110220 +proc_pid_attr_read_10173 proc_pid_attr_read 3 10173 NULL
110221 +jffs2_user_setxattr_10182 jffs2_user_setxattr 4 10182 NULL
110222 +xfs_attr_rmtval_copyout_10222 xfs_attr_rmtval_copyout 0 10222 NULL nohasharray
110223 +xfs_btree_read_buf_block_10222 xfs_btree_read_buf_block 0 10222 &xfs_attr_rmtval_copyout_10222
110224 +hdlc_rpr_irq_10240 hdlc_rpr_irq 2 10240 NULL
110225 +cciss_proc_write_10259 cciss_proc_write 3 10259 NULL
110226 +__qlcnic_pci_sriov_enable_10281 __qlcnic_pci_sriov_enable 2 10281 NULL
110227 +snd_rme9652_capture_copy_10287 snd_rme9652_capture_copy 5 10287 NULL
110228 +read_emulate_10310 read_emulate 2-4 10310 NULL
110229 +read_file_spectral_count_10320 read_file_spectral_count 3 10320 NULL
110230 +compat_SyS_writev_10327 compat_SyS_writev 3 10327 NULL
110231 +tun_sendmsg_10337 tun_sendmsg 4 10337 NULL
110232 +ufx_alloc_urb_list_10349 ufx_alloc_urb_list 3 10349 NULL
110233 +whci_add_cap_10350 whci_add_cap 0 10350 NULL
110234 +dbAllocAny_10354 dbAllocAny 0 10354 NULL
110235 +ath6kl_listen_int_read_10355 ath6kl_listen_int_read 3 10355 NULL
110236 +ms_write_multiple_pages_10362 ms_write_multiple_pages 6-5 10362 NULL
110237 +sta_ht_capa_read_10366 sta_ht_capa_read 3 10366 NULL
110238 +ecryptfs_decode_and_decrypt_filename_10379 ecryptfs_decode_and_decrypt_filename 5 10379 NULL
110239 +do_compat_pselect_10398 do_compat_pselect 1 10398 NULL
110240 +fwtty_rx_10434 fwtty_rx 3 10434 NULL
110241 +event_phy_transmit_error_read_10471 event_phy_transmit_error_read 3 10471 NULL
110242 +hash_ipportip6_expire_10478 hash_ipportip6_expire 4 10478 NULL
110243 +nouveau_pwr_create__10483 nouveau_pwr_create_ 4 10483 NULL
110244 +ext4_itable_unused_count_10501 ext4_itable_unused_count 0 10501 NULL
110245 +qib_alloc_fast_reg_page_list_10507 qib_alloc_fast_reg_page_list 2 10507 NULL
110246 +sel_write_disable_10511 sel_write_disable 3 10511 NULL
110247 +osd_req_write_sg_kern_10514 osd_req_write_sg_kern 5 10514 NULL
110248 +rds_message_alloc_10517 rds_message_alloc 1 10517 NULL
110249 +qlcnic_pci_sriov_enable_10519 qlcnic_pci_sriov_enable 2 10519 NULL
110250 +kstrtouint_from_user_10536 kstrtouint_from_user 2 10536 NULL nohasharray
110251 +snd_pcm_lib_read_10536 snd_pcm_lib_read 0-3 10536 &kstrtouint_from_user_10536
110252 +ext4_write_begin_10576 ext4_write_begin 3-4 10576 NULL
110253 +scrub_remap_extent_10588 scrub_remap_extent 2 10588 NULL
110254 +otp_read_10594 otp_read 2-4-5 10594 NULL
110255 +supply_map_read_file_10608 supply_map_read_file 3 10608 NULL
110256 +ima_show_htable_violations_10619 ima_show_htable_violations 3 10619 NULL
110257 +fq_alloc_node_10633 fq_alloc_node 1 10633 NULL
110258 +nfs_idmap_lookup_id_10660 nfs_idmap_lookup_id 2 10660 NULL
110259 +efx_max_tx_len_10662 efx_max_tx_len 0-2 10662 NULL
110260 +parport_write_10669 parport_write 0 10669 NULL
110261 +edge_write_10692 edge_write 4 10692 NULL
110262 +selinux_inode_setxattr_10708 selinux_inode_setxattr 4 10708 NULL nohasharray
110263 +inl_10708 inl 0 10708 &selinux_inode_setxattr_10708
110264 +shash_async_setkey_10720 shash_async_setkey 3 10720 NULL nohasharray
110265 +pvr2_ioread_read_10720 pvr2_ioread_read 3 10720 &shash_async_setkey_10720
110266 +spi_sync_10731 spi_sync 0 10731 NULL
110267 +sctp_getsockopt_maxseg_10737 sctp_getsockopt_maxseg 2 10737 NULL nohasharray
110268 +apu_get_register_10737 apu_get_register 0 10737 &sctp_getsockopt_maxseg_10737
110269 +SyS_io_getevents_10756 SyS_io_getevents 3 10756 NULL
110270 +vhost_add_used_n_10760 vhost_add_used_n 3 10760 NULL
110271 +kvm_read_guest_atomic_10765 kvm_read_guest_atomic 4 10765 NULL
110272 +__qp_memcpy_to_queue_10779 __qp_memcpy_to_queue 2-4 10779 NULL
110273 +diva_set_trace_filter_10820 diva_set_trace_filter 0-1 10820 NULL
110274 +lbs_sleepparams_read_10840 lbs_sleepparams_read 3 10840 NULL
110275 +ida_get_new_above_10853 ida_get_new_above 0 10853 NULL
110276 +fuse_conn_max_background_read_10855 fuse_conn_max_background_read 3 10855 NULL
110277 +snd_pcm_oss_write1_10872 snd_pcm_oss_write1 3 10872 NULL
110278 +wiidebug_drm_write_10879 wiidebug_drm_write 3 10879 NULL
110279 +get_scq_10897 get_scq 2 10897 NULL
110280 +tifm_alloc_adapter_10903 tifm_alloc_adapter 1 10903 NULL
110281 +lprocfs_wr_atomic_10912 lprocfs_wr_atomic 3 10912 NULL
110282 +__copy_from_user_10918 __copy_from_user 0-3 10918 NULL
110283 +kobject_add_10919 kobject_add 0 10919 NULL
110284 +ar9003_dump_modal_eeprom_10959 ar9003_dump_modal_eeprom 3-2-0 10959 NULL
110285 +ci_port_test_write_10962 ci_port_test_write 3 10962 NULL
110286 +bm_entry_read_10976 bm_entry_read 3 10976 NULL
110287 +sched_autogroup_write_10984 sched_autogroup_write 3 10984 NULL
110288 +xfrm_hash_alloc_10997 xfrm_hash_alloc 1 10997 NULL
110289 +rx_filter_accum_arp_pend_requests_read_11003 rx_filter_accum_arp_pend_requests_read 3 11003 NULL
110290 +gfs2_dir_read_11017 gfs2_dir_read 0 11017 NULL
110291 +SetLineNumber_11023 SetLineNumber 0 11023 NULL
110292 +tda10048_writeregbulk_11050 tda10048_writeregbulk 4 11050 NULL
110293 +insert_inline_extent_backref_11063 insert_inline_extent_backref 8 11063 NULL
110294 +tcp_send_mss_11079 tcp_send_mss 0 11079 NULL
110295 +count_argc_11083 count_argc 0 11083 NULL
110296 +kvm_write_guest_cached_11106 kvm_write_guest_cached 4 11106 NULL
110297 +tw_change_queue_depth_11116 tw_change_queue_depth 2 11116 NULL
110298 +page_offset_11120 page_offset 0 11120 NULL
110299 +tracing_buffers_read_11124 tracing_buffers_read 3 11124 NULL nohasharray
110300 +cea_db_payload_len_11124 cea_db_payload_len 0 11124 &tracing_buffers_read_11124
110301 +snd_gf1_pcm_playback_silence_11172 snd_gf1_pcm_playback_silence 4-3 11172 NULL
110302 +il_dbgfs_rx_queue_read_11221 il_dbgfs_rx_queue_read 3 11221 NULL
110303 +comedi_alloc_spriv_11234 comedi_alloc_spriv 2 11234 NULL
110304 +hugetlbfs_read_11268 hugetlbfs_read 3 11268 NULL
110305 +ath6kl_power_params_write_11274 ath6kl_power_params_write 3 11274 NULL
110306 +__proc_daemon_file_11305 __proc_daemon_file 5 11305 NULL
110307 +ext4_xattr_check_names_11314 ext4_xattr_check_names 0 11314 NULL
110308 +bcache_dev_sectors_dirty_add_11315 bcache_dev_sectors_dirty_add 3-4 11315 NULL
110309 +sk_filter_size_11316 sk_filter_size 0 11316 NULL nohasharray
110310 +tcp_send_rcvq_11316 tcp_send_rcvq 3 11316 &sk_filter_size_11316
110311 +shmem_radix_tree_replace_11325 shmem_radix_tree_replace 0 11325 NULL
110312 +construct_key_11329 construct_key 3 11329 NULL nohasharray
110313 +__kfifo_out_peek_11329 __kfifo_out_peek 0-3 11329 &construct_key_11329
110314 +next_segment_11330 next_segment 0-2-1 11330 NULL
110315 +persistent_ram_buffer_map_11332 persistent_ram_buffer_map 1-2 11332 NULL
110316 +ext4_get_inline_size_11349 ext4_get_inline_size 0 11349 NULL
110317 +sel_write_create_11353 sel_write_create 3 11353 NULL nohasharray
110318 +nl80211_send_mgmt_11353 nl80211_send_mgmt 7 11353 &sel_write_create_11353
110319 +qib_get_base_info_11369 qib_get_base_info 3 11369 NULL
110320 +nft_value_dump_11381 nft_value_dump 3 11381 NULL
110321 +isku_sysfs_read_keys_capslock_11392 isku_sysfs_read_keys_capslock 6 11392 NULL
110322 +dev_irnet_write_11398 dev_irnet_write 3 11398 NULL
110323 +lprocfs_wr_evict_client_11402 lprocfs_wr_evict_client 3 11402 NULL
110324 +___alloc_bootmem_11410 ___alloc_bootmem 1 11410 NULL
110325 +str_to_user_11411 str_to_user 2 11411 NULL
110326 +mem_fw_gen_free_mem_blks_read_11413 mem_fw_gen_free_mem_blks_read 3 11413 NULL
110327 +ath6kl_wmi_test_rx_11414 ath6kl_wmi_test_rx 3 11414 NULL
110328 +xfs_btree_lookup_11417 xfs_btree_lookup 0 11417 NULL nohasharray
110329 +adis16480_show_firmware_revision_11417 adis16480_show_firmware_revision 3 11417 &xfs_btree_lookup_11417
110330 +trace_options_read_11419 trace_options_read 3 11419 NULL
110331 +i40e_dbg_command_write_11421 i40e_dbg_command_write 3 11421 NULL
110332 +xd_read_multiple_pages_11422 xd_read_multiple_pages 5-4 11422 NULL
110333 +bttv_read_11432 bttv_read 3 11432 NULL
110334 +create_zero_mask_11453 create_zero_mask 0-1 11453 NULL
110335 +do_blockdev_direct_IO_11455 do_blockdev_direct_IO 0-6 11455 NULL
110336 +pci_set_power_state_11479 pci_set_power_state 0 11479 NULL nohasharray
110337 +sca3000_read_first_n_hw_rb_11479 sca3000_read_first_n_hw_rb 2 11479 &pci_set_power_state_11479
110338 +xfs_file_buffered_aio_write_11492 xfs_file_buffered_aio_write 4-0 11492 NULL
110339 +sd_do_mode_sense_11507 sd_do_mode_sense 5 11507 NULL
110340 +kmem_zalloc_11510 kmem_zalloc 1 11510 NULL
110341 +ll_direct_IO_26_seg_11518 ll_direct_IO_26_seg 0 11518 NULL
110342 +twl_direction_in_11527 twl_direction_in 2 11527 NULL
110343 +xfs_rtcheck_alloc_range_11553 xfs_rtcheck_alloc_range 0 11553 NULL
110344 +radix_tree_extend_11555 radix_tree_extend 0 11555 NULL
110345 +skb_cow_data_11565 skb_cow_data 0 11565 NULL
110346 +lpfc_idiag_ctlacc_write_11576 lpfc_idiag_ctlacc_write 3 11576 NULL
110347 +oprofilefs_ulong_to_user_11582 oprofilefs_ulong_to_user 3 11582 NULL
110348 +batadv_iv_ogm_orig_add_if_11586 batadv_iv_ogm_orig_add_if 2 11586 NULL
110349 +snd_pcm_action_11589 snd_pcm_action 0 11589 NULL
110350 +fw_device_op_ioctl_11595 fw_device_op_ioctl 2 11595 NULL
110351 +batadv_iv_ogm_orig_del_if_11604 batadv_iv_ogm_orig_del_if 2 11604 NULL
110352 +SYSC_mq_timedsend_11607 SYSC_mq_timedsend 3 11607 NULL
110353 +sisusb_send_bridge_packet_11649 sisusb_send_bridge_packet 2 11649 NULL
110354 +nla_total_size_11658 nla_total_size 1-0 11658 NULL
110355 +slab_ksize_11664 slab_ksize 0 11664 NULL
110356 +ide_queue_pc_tail_11673 ide_queue_pc_tail 5 11673 NULL
110357 +compat_SyS_msgsnd_11675 compat_SyS_msgsnd 3 11675 NULL
110358 +btrfs_alloc_delayed_item_11678 btrfs_alloc_delayed_item 1 11678 NULL
110359 +sctp_setsockopt_hmac_ident_11687 sctp_setsockopt_hmac_ident 3 11687 NULL
110360 +split_11691 split 2 11691 NULL
110361 +snd_ctl_elem_user_tlv_11695 snd_ctl_elem_user_tlv 3 11695 NULL
110362 +blk_rq_cur_bytes_11723 blk_rq_cur_bytes 0 11723 NULL
110363 +dm_bio_prison_create_11749 dm_bio_prison_create 1 11749 NULL
110364 +iwl_dbgfs_qos_read_11753 iwl_dbgfs_qos_read 3 11753 NULL
110365 +ieee80211_get_num_supported_channels_11768 ieee80211_get_num_supported_channels 0 11768 NULL
110366 +ps_pspoll_timeouts_read_11776 ps_pspoll_timeouts_read 3 11776 NULL
110367 +btrfs_key_blockptr_11786 btrfs_key_blockptr 0 11786 NULL
110368 +pcpu_fc_alloc_11818 pcpu_fc_alloc 2 11818 NULL
110369 +xfs_ialloc_11819 xfs_ialloc 0 11819 NULL
110370 +umc_device_register_11824 umc_device_register 0 11824 NULL
110371 +zerocopy_sg_from_iovec_11828 zerocopy_sg_from_iovec 3 11828 NULL
110372 +sctp_setsockopt_maxseg_11829 sctp_setsockopt_maxseg 3 11829 NULL
110373 +rts51x_read_status_11830 rts51x_read_status 4 11830 NULL
110374 +unix_stream_connect_11844 unix_stream_connect 3 11844 NULL
110375 +xfs_file_aio_write_checks_11851 xfs_file_aio_write_checks 0 11851 NULL
110376 +ecryptfs_copy_filename_11868 ecryptfs_copy_filename 4 11868 NULL
110377 +ieee80211_rx_bss_info_11887 ieee80211_rx_bss_info 3 11887 NULL
110378 +mdc_rename_11899 mdc_rename 4-6 11899 NULL
110379 +xstateregs_get_11906 xstateregs_get 4 11906 NULL
110380 +ti_write_11916 ti_write 4 11916 NULL
110381 +fs_devrw_entry_11924 fs_devrw_entry 3 11924 NULL
110382 +bitmap_remap_11929 bitmap_remap 5 11929 NULL
110383 +atomic_sub_return_11939 atomic_sub_return 0-1 11939 NULL
110384 +r1_sync_page_io_11963 r1_sync_page_io 3 11963 NULL
110385 +f1x_swap_interleaved_region_11970 f1x_swap_interleaved_region 0-2 11970 NULL
110386 +read_and_add_raw_conns_11987 read_and_add_raw_conns 0 11987 NULL
110387 +i40e_pci_sriov_configure_12011 i40e_pci_sriov_configure 2 12011 NULL
110388 +ftdi_elan_total_command_size_12045 ftdi_elan_total_command_size 0 12045 NULL
110389 +ieee80211_if_read_user_power_level_12050 ieee80211_if_read_user_power_level 3 12050 NULL
110390 +il4965_ucode_tx_stats_read_12064 il4965_ucode_tx_stats_read 3 12064 NULL
110391 +ptc_proc_write_12076 ptc_proc_write 3 12076 NULL
110392 +batadv_tt_global_size_mod_12085 batadv_tt_global_size_mod 3 12085 NULL
110393 +rtw_malloc2d_12102 rtw_malloc2d 1-2-3 12102 NULL
110394 +gfs2_find_jhead_12117 gfs2_find_jhead 0 12117 NULL
110395 +alloc_bulk_urbs_generic_12127 alloc_bulk_urbs_generic 5 12127 NULL
110396 +set_powered_12129 set_powered 4 12129 NULL
110397 +ramoops_init_prz_12134 ramoops_init_prz 5 12134 NULL
110398 +xfs_handle_to_dentry_12135 xfs_handle_to_dentry 3 12135 NULL
110399 +rawv6_seticmpfilter_12137 rawv6_seticmpfilter 5 12137 NULL
110400 +rawsock_recvmsg_12144 rawsock_recvmsg 4 12144 NULL
110401 +btmrvl_sdio_host_to_card_12152 btmrvl_sdio_host_to_card 3 12152 NULL
110402 +vmbus_open_12154 vmbus_open 2-3 12154 NULL
110403 +fnic_reset_stats_write_12177 fnic_reset_stats_write 3 12177 NULL
110404 +LNetEQAlloc_12178 LNetEQAlloc 1 12178 NULL
110405 +ddp_make_gl_12179 ddp_make_gl 1 12179 NULL
110406 +compat_do_arpt_set_ctl_12184 compat_do_arpt_set_ctl 4 12184 NULL
110407 +ip_generic_getfrag_12187 ip_generic_getfrag 3-4 12187 NULL
110408 +snd_pcm_kernel_ioctl_12219 snd_pcm_kernel_ioctl 0 12219 NULL
110409 +fuse_get_req_12221 fuse_get_req 2 12221 NULL nohasharray
110410 +aat2870_reg_read_file_12221 aat2870_reg_read_file 3 12221 &fuse_get_req_12221
110411 +xfs_attr3_leaf_read_12222 xfs_attr3_leaf_read 0 12222 NULL
110412 +__alloc_bootmem_low_nopanic_12235 __alloc_bootmem_low_nopanic 1 12235 NULL
110413 +usnic_ib_qp_grp_dump_rows_12239 usnic_ib_qp_grp_dump_rows 3 12239 NULL
110414 +ib_uverbs_unmarshall_recv_12251 ib_uverbs_unmarshall_recv 5 12251 NULL
110415 +shash_compat_setkey_12267 shash_compat_setkey 3 12267 NULL
110416 +add_sctp_bind_addr_12269 add_sctp_bind_addr 3 12269 NULL
110417 +note_last_dentry_12285 note_last_dentry 3 12285 NULL
110418 +roundup_to_multiple_of_64_12288 roundup_to_multiple_of_64 0-1 12288 NULL nohasharray
110419 +il_dbgfs_nvm_read_12288 il_dbgfs_nvm_read 3 12288 &roundup_to_multiple_of_64_12288
110420 +bt_sock_recvmsg_12316 bt_sock_recvmsg 4 12316 NULL
110421 +usnic_transport_sock_to_str_12322 usnic_transport_sock_to_str 2-0 12322 NULL
110422 +pcbit_writecmd_12332 pcbit_writecmd 2 12332 NULL
110423 +xfs_bmap_last_extent_12335 xfs_bmap_last_extent 0 12335 NULL
110424 +mptctl_ioctl_12355 mptctl_ioctl 2 12355 NULL
110425 +__nf_ct_ext_add_length_12364 __nf_ct_ext_add_length 3 12364 NULL
110426 +xfs_iext_inline_to_direct_12384 xfs_iext_inline_to_direct 2 12384 NULL
110427 +populate_dir_12391 populate_dir 0 12391 NULL nohasharray
110428 +write_file_dump_12391 write_file_dump 3 12391 &populate_dir_12391
110429 +hbucket_elem_add_12416 hbucket_elem_add 3 12416 NULL
110430 +ieee80211_if_read_num_mcast_sta_12419 ieee80211_if_read_num_mcast_sta 3 12419 NULL
110431 +cfs_array_alloc_12441 cfs_array_alloc 2 12441 NULL
110432 +skb_do_copy_data_nocache_12465 skb_do_copy_data_nocache 5 12465 NULL
110433 +x25_sendmsg_12487 x25_sendmsg 4 12487 NULL
110434 +fnic_trace_ctrl_read_12497 fnic_trace_ctrl_read 3 12497 NULL
110435 +__ceph_osdc_start_request_12502 __ceph_osdc_start_request 0 12502 NULL
110436 +qib_alloc_fast_reg_mr_12526 qib_alloc_fast_reg_mr 2 12526 NULL
110437 +write_inode_now_12565 write_inode_now 0 12565 NULL
110438 +hvc_alloc_12579 hvc_alloc 4 12579 NULL
110439 +pcpu_extend_area_map_12589 pcpu_extend_area_map 2 12589 NULL
110440 +tlbflush_write_file_12598 tlbflush_write_file 3 12598 NULL
110441 +vhci_put_user_12604 vhci_put_user 4 12604 NULL
110442 +sdhci_pltfm_init_12627 sdhci_pltfm_init 3 12627 NULL
110443 +pwr_rcvd_awake_bcns_cnt_read_12632 pwr_rcvd_awake_bcns_cnt_read 3 12632 NULL
110444 +pn_sendmsg_12640 pn_sendmsg 4 12640 NULL
110445 +dwc3_link_state_write_12641 dwc3_link_state_write 3 12641 NULL
110446 +nr_recvmsg_12649 nr_recvmsg 4 12649 NULL
110447 +rtw_android_get_link_speed_12655 rtw_android_get_link_speed 0 12655 NULL
110448 +ocfs2_read_block_12659 ocfs2_read_block 0 12659 NULL
110449 +sel_read_class_12669 sel_read_class 3 12669 NULL nohasharray
110450 +sparse_mem_maps_populate_node_12669 sparse_mem_maps_populate_node 4 12669 &sel_read_class_12669
110451 +iwl_dbgfs_calib_disabled_write_12707 iwl_dbgfs_calib_disabled_write 3 12707 NULL
110452 +ieee80211_if_read_num_buffered_multicast_12716 ieee80211_if_read_num_buffered_multicast 3 12716 NULL
110453 +ivtv_write_12721 ivtv_write 3 12721 NULL
110454 +key_rx_spec_read_12736 key_rx_spec_read 3 12736 NULL
110455 +__mei_cl_async_send_12737 __mei_cl_async_send 3 12737 NULL
110456 +ieee80211_if_read_dot11MeshMaxRetries_12756 ieee80211_if_read_dot11MeshMaxRetries 3 12756 NULL
110457 +listxattr_12769 listxattr 3 12769 NULL
110458 +sctp_ssnmap_init_12772 sctp_ssnmap_init 2-3 12772 NULL
110459 +scsi_adjust_queue_depth_12802 scsi_adjust_queue_depth 3 12802 NULL
110460 +xfs_inumbers_fmt_12817 xfs_inumbers_fmt 3 12817 NULL
110461 +readq_12825 readq 0 12825 NULL
110462 +SyS_add_key_12834 SyS_add_key 4 12834 NULL
110463 +gfs2_log_reserve_12835 gfs2_log_reserve 0 12835 NULL
110464 +TSS_authhmac_12839 TSS_authhmac 3 12839 NULL
110465 +spidev_sync_12842 spidev_sync 0 12842 NULL
110466 +spidev_ioctl_12846 spidev_ioctl 2 12846 NULL
110467 +xfs_rtallocate_extent_exact_12865 xfs_rtallocate_extent_exact 0 12865 NULL
110468 +ath9k_dump_4k_modal_eeprom_12883 ath9k_dump_4k_modal_eeprom 3-2 12883 NULL
110469 +get_leb_cnt_12892 get_leb_cnt 0-2 12892 NULL
110470 +get_virtual_node_size_12908 get_virtual_node_size 0 12908 NULL
110471 +rds_pages_in_vec_12922 rds_pages_in_vec 0 12922 NULL
110472 +do_inode_permission_12946 do_inode_permission 0 12946 NULL
110473 +bm_status_write_12964 bm_status_write 3 12964 NULL
110474 +raid56_parity_recover_12987 raid56_parity_recover 5 12987 NULL
110475 +TransmitTcb_12989 TransmitTcb 4 12989 NULL
110476 +sk_peek_offset_12991 sk_peek_offset 0 12991 NULL
110477 +bset_prev_bytes_13020 bset_prev_bytes 0 13020 NULL
110478 +subsystem_filter_write_13022 subsystem_filter_write 3 13022 NULL
110479 +generic_segment_checks_13041 generic_segment_checks 0 13041 NULL
110480 +ocfs2_write_begin_13045 ocfs2_write_begin 3-4 13045 NULL
110481 +__dn_setsockopt_13060 __dn_setsockopt 5 13060 NULL nohasharray
110482 +ptlrpc_lprocfs_threads_min_seq_write_13060 ptlrpc_lprocfs_threads_min_seq_write 3 13060 &__dn_setsockopt_13060
110483 +biovec_create_pool_13079 biovec_create_pool 2 13079 NULL
110484 +xattr_getsecurity_13090 xattr_getsecurity 0 13090 NULL
110485 +ttm_dma_pool_alloc_new_pages_13105 ttm_dma_pool_alloc_new_pages 3 13105 NULL
110486 +snd_rme96_playback_copy_13111 snd_rme96_playback_copy 5 13111 NULL
110487 +bfad_debugfs_read_13119 bfad_debugfs_read 3 13119 NULL
110488 +blk_update_request_13146 blk_update_request 3 13146 NULL
110489 +caif_stream_recvmsg_13173 caif_stream_recvmsg 4 13173 NULL
110490 +pwr_disable_ps_read_13176 pwr_disable_ps_read 3 13176 NULL
110491 +ucs2_strlen_13178 ucs2_strlen 0 13178 NULL
110492 +dgrp_net_ioctl_13183 dgrp_net_ioctl 2 13183 NULL
110493 +create_trace_uprobe_13184 create_trace_uprobe 1 13184 NULL
110494 +comedi_read_13199 comedi_read 3 13199 NULL
110495 +hash_ipport4_expire_13201 hash_ipport4_expire 4 13201 NULL
110496 +mmc_ext_csd_read_13205 mmc_ext_csd_read 3 13205 NULL
110497 +svm_msrpm_offset_13220 svm_msrpm_offset 0-1 13220 NULL
110498 +fnic_trace_ctrl_write_13229 fnic_trace_ctrl_write 3 13229 NULL
110499 +_iwl_dbgfs_disable_power_off_write_13243 _iwl_dbgfs_disable_power_off_write 3 13243 NULL
110500 +asix_read_cmd_13245 asix_read_cmd 5 13245 NULL
110501 +init_tid_tabs_13252 init_tid_tabs 2-3-4 13252 NULL
110502 +bio_integrity_trim_13259 bio_integrity_trim 3-2 13259 NULL
110503 +simple_attr_write_13260 simple_attr_write 3 13260 NULL
110504 +pmcraid_notify_aen_13274 pmcraid_notify_aen 3 13274 NULL
110505 +il4965_stats_flag_13281 il4965_stats_flag 0-3 13281 NULL
110506 +lpfc_idiag_mbxacc_get_setup_13282 lpfc_idiag_mbxacc_get_setup 0 13282 NULL
110507 +sd_major_13294 sd_major 0-1 13294 NULL
110508 +module_param_sysfs_setup_13296 module_param_sysfs_setup 0 13296 NULL
110509 +read_file_phy_err_13318 read_file_phy_err 3 13318 NULL
110510 +kvm_read_nested_guest_page_13337 kvm_read_nested_guest_page 5 13337 NULL
110511 +round_event_name_len_13348 round_event_name_len 0 13348 NULL
110512 +hscx_empty_fifo_13360 hscx_empty_fifo 2 13360 NULL
110513 +xfs_btree_delrec_13364 xfs_btree_delrec 0 13364 NULL
110514 +iso_sched_alloc_13377 iso_sched_alloc 1 13377 NULL nohasharray
110515 +wep_key_not_found_read_13377 wep_key_not_found_read 3 13377 &iso_sched_alloc_13377
110516 +ext4_meta_trans_blocks_13380 ext4_meta_trans_blocks 0-3-2 13380 NULL
110517 +lov_mds_md_size_13388 lov_mds_md_size 0-1 13388 NULL nohasharray
110518 +dis_bypass_write_13388 dis_bypass_write 3 13388 &lov_mds_md_size_13388
110519 +netxen_alloc_sds_rings_13417 netxen_alloc_sds_rings 2 13417 NULL
110520 +sctp_setsockopt_peer_primary_addr_13440 sctp_setsockopt_peer_primary_addr 3 13440 NULL
110521 +ath6kl_cfg80211_connect_event_13443 ath6kl_cfg80211_connect_event 8-9-7 13443 NULL
110522 +sb_init_dio_done_wq_13482 sb_init_dio_done_wq 0 13482 NULL
110523 +data_read_13494 data_read 3 13494 NULL
110524 +ioat_chansts_32_13506 ioat_chansts_32 0 13506 NULL
110525 +core_status_13515 core_status 4 13515 NULL
110526 +smk_write_mapped_13519 smk_write_mapped 3 13519 NULL
110527 +bm_init_13529 bm_init 2 13529 NULL
110528 +llcp_sock_recvmsg_13556 llcp_sock_recvmsg 4 13556 NULL
110529 +ieee80211_if_read_ap_power_level_13558 ieee80211_if_read_ap_power_level 3 13558 NULL
110530 +hash_net4_expire_13559 hash_net4_expire 4 13559 NULL
110531 +read_file_antenna_13574 read_file_antenna 3 13574 NULL
110532 +cache_write_13589 cache_write 3 13589 NULL
110533 +Rd_Indx_13602 Rd_Indx 3-2 13602 NULL
110534 +wm8994_bulk_write_13615 wm8994_bulk_write 2-3 13615 NULL
110535 +__ntfs_grab_cache_pages_13617 __ntfs_grab_cache_pages 0 13617 NULL
110536 +pmcraid_get_minor_13619 pmcraid_get_minor 0 13619 NULL
110537 +packet_snd_13634 packet_snd 3 13634 NULL
110538 +blk_msg_write_13655 blk_msg_write 3 13655 NULL
110539 +cache_downcall_13666 cache_downcall 3 13666 NULL
110540 +usb_get_string_13693 usb_get_string 0 13693 NULL
110541 +fw_iso_buffer_alloc_13704 fw_iso_buffer_alloc 2 13704 NULL
110542 +audit_unpack_string_13748 audit_unpack_string 3 13748 NULL
110543 +ieee802154_alloc_device_13767 ieee802154_alloc_device 1 13767 NULL
110544 +fb_sys_read_13778 fb_sys_read 3 13778 NULL
110545 +ath6kl_mgmt_powersave_ap_13791 ath6kl_mgmt_powersave_ap 6 13791 NULL
110546 +random_read_13815 random_read 3 13815 NULL
110547 +mutex_lock_interruptible_nested_13817 mutex_lock_interruptible_nested 0 13817 NULL
110548 +hsi_register_board_info_13820 hsi_register_board_info 2 13820 NULL
110549 +___mei_cl_send_13821 ___mei_cl_send 3 13821 NULL
110550 +enc_pools_insert_13849 enc_pools_insert 3 13849 NULL
110551 +evdev_ioctl_compat_13851 evdev_ioctl_compat 2 13851 NULL
110552 +compat_ip_setsockopt_13870 compat_ip_setsockopt 5 13870 NULL
110553 +qp_memcpy_to_queue_13886 qp_memcpy_to_queue 5-2 13886 NULL
110554 +snd_pcm_aio_read_13900 snd_pcm_aio_read 3 13900 NULL
110555 +cfg80211_inform_bss_width_13933 cfg80211_inform_bss_width 9 13933 NULL
110556 +ext3_xattr_block_get_13936 ext3_xattr_block_get 0 13936 NULL
110557 +ieee80211_if_read_dot11MeshForwarding_13940 ieee80211_if_read_dot11MeshForwarding 3 13940 NULL nohasharray
110558 +ocfs2_xa_value_truncate_13940 ocfs2_xa_value_truncate 2 13940 &ieee80211_if_read_dot11MeshForwarding_13940
110559 +iwl_dbgfs_protection_mode_read_13943 iwl_dbgfs_protection_mode_read 3 13943 NULL
110560 +ieee80211_if_read_min_discovery_timeout_13946 ieee80211_if_read_min_discovery_timeout 3 13946 NULL
110561 +lpfc_idiag_queacc_read_13950 lpfc_idiag_queacc_read 3 13950 NULL nohasharray
110562 +pagecache_write_end_13950 pagecache_write_end 0 13950 &lpfc_idiag_queacc_read_13950
110563 +osc_grant_shrink_interval_seq_write_13952 osc_grant_shrink_interval_seq_write 3 13952 NULL
110564 +ocfs2_refresh_slot_info_13957 ocfs2_refresh_slot_info 0 13957 NULL
110565 +snd_pcm_plug_slave_size_13967 snd_pcm_plug_slave_size 0-2 13967 NULL
110566 +qcam_read_13977 qcam_read 3 13977 NULL
110567 +dsp_read_13980 dsp_read 2 13980 NULL
110568 +dvb_demux_read_13981 dvb_demux_read 3 13981 NULL
110569 +sddr09_write_data_14014 sddr09_write_data 3 14014 NULL
110570 +btrfs_get_blocks_direct_14016 btrfs_get_blocks_direct 2 14016 NULL
110571 +dmi_format_ids_14018 dmi_format_ids 2 14018 NULL
110572 +iscsi_create_flashnode_conn_14022 iscsi_create_flashnode_conn 4 14022 NULL
110573 +pci_add_ext_cap_save_buffer_14032 pci_add_ext_cap_save_buffer 3 14032 NULL
110574 +dvb_usercopy_14036 dvb_usercopy 2 14036 NULL
110575 +read_def_modal_eeprom_14041 read_def_modal_eeprom 3 14041 NULL
110576 +xfs_bmap_alloc_14044 xfs_bmap_alloc 0 14044 NULL
110577 +ieee80211_if_fmt_aid_14055 ieee80211_if_fmt_aid 3 14055 NULL
110578 +ovs_nla_alloc_flow_actions_14056 ovs_nla_alloc_flow_actions 1 14056 NULL
110579 +sta_agg_status_read_14058 sta_agg_status_read 3 14058 NULL
110580 +lov_stripeoffset_seq_write_14078 lov_stripeoffset_seq_write 3 14078 NULL
110581 +do_proc_readlink_14096 do_proc_readlink 3 14096 NULL
110582 +compat_sys_pselect6_14105 compat_sys_pselect6 1 14105 NULL
110583 +ext4_journal_blocks_per_page_14127 ext4_journal_blocks_per_page 0 14127 NULL
110584 +isku_sysfs_read_light_14140 isku_sysfs_read_light 6 14140 NULL
110585 +em_canid_change_14150 em_canid_change 3 14150 NULL
110586 +gsm_dlci_data_14155 gsm_dlci_data 3 14155 NULL
110587 +midi_alloc_ep_req_14159 midi_alloc_ep_req 2 14159 NULL
110588 +print_input_mask_14168 print_input_mask 3-0 14168 NULL
110589 +ocfs2_xattr_value_truncate_14183 ocfs2_xattr_value_truncate 3 14183 NULL
110590 +datafab_read_data_14186 datafab_read_data 4 14186 NULL
110591 +hfsplus_brec_find_14200 hfsplus_brec_find 0 14200 NULL
110592 +alloc_async_14208 alloc_async 1 14208 NULL
110593 +ath6kl_regread_write_14220 ath6kl_regread_write 3 14220 NULL
110594 +ieee80211_if_write_uapsd_max_sp_len_14233 ieee80211_if_write_uapsd_max_sp_len 3 14233 NULL
110595 +dma_declare_coherent_memory_14244 dma_declare_coherent_memory 4 14244 NULL
110596 +btrfs_token_file_extent_ram_bytes_14247 btrfs_token_file_extent_ram_bytes 0 14247 NULL
110597 +ath6kl_connect_event_14267 ath6kl_connect_event 7-8-9 14267 NULL
110598 +rr_status_14293 rr_status 5 14293 NULL
110599 +read_default_ldt_14302 read_default_ldt 2 14302 NULL
110600 +update_rgrp_lvb_14303 update_rgrp_lvb 0 14303 NULL
110601 +xfs_qm_qino_alloc_14309 xfs_qm_qino_alloc 0 14309 NULL
110602 +oo_objects_14319 oo_objects 0 14319 NULL
110603 +ll_get_user_pages_14328 ll_get_user_pages 3-2-0 14328 NULL
110604 +p9_client_zc_rpc_14345 p9_client_zc_rpc 7 14345 NULL
110605 +alloc_tx_struct_14349 alloc_tx_struct 1 14349 NULL
110606 +hash_ipportnet4_expire_14354 hash_ipportnet4_expire 4 14354 NULL
110607 +snd_pcm_lib_readv_14363 snd_pcm_lib_readv 0-3 14363 NULL
110608 +lowpan_read_14369 lowpan_read 3 14369 NULL
110609 +ath6kl_regdump_read_14393 ath6kl_regdump_read 3 14393 NULL
110610 +smk_write_onlycap_14400 smk_write_onlycap 3 14400 NULL
110611 +mtd_concat_create_14416 mtd_concat_create 2 14416 NULL
110612 +_iwl_dbgfs_sram_write_14439 _iwl_dbgfs_sram_write 3 14439 NULL
110613 +block_size_14443 block_size 0 14443 NULL
110614 +lmv_user_md_size_14456 lmv_user_md_size 0-1 14456 NULL
110615 +snd_emu10k1_proc_spdif_status_14457 snd_emu10k1_proc_spdif_status 4-5 14457 NULL
110616 +ath10k_write_htt_stats_mask_14458 ath10k_write_htt_stats_mask 3 14458 NULL
110617 +lustre_msg_size_v2_14470 lustre_msg_size_v2 0 14470 NULL
110618 +dma_transfer_size_14473 dma_transfer_size 0 14473 NULL
110619 +udplite_getfrag_14479 udplite_getfrag 3-4 14479 NULL
110620 +ieee80211_if_read_dot11MeshGateAnnouncementProtocol_14486 ieee80211_if_read_dot11MeshGateAnnouncementProtocol 3 14486 NULL
110621 +split_state_14491 split_state 0 14491 NULL
110622 +ocfs2_debug_read_14507 ocfs2_debug_read 3 14507 NULL
110623 +ep0_write_14536 ep0_write 3 14536 NULL nohasharray
110624 +dataflash_read_user_otp_14536 dataflash_read_user_otp 3-2 14536 &ep0_write_14536
110625 +picolcd_debug_eeprom_read_14549 picolcd_debug_eeprom_read 3 14549 NULL
110626 +qp_host_alloc_queue_14566 qp_host_alloc_queue 1 14566 NULL
110627 +SyS_setdomainname_14569 SyS_setdomainname 2 14569 NULL
110628 +stuffed_readpage_14581 stuffed_readpage 0 14581 NULL
110629 +idmap_pipe_downcall_14591 idmap_pipe_downcall 3 14591 NULL
110630 +ceph_osdc_alloc_request_14597 ceph_osdc_alloc_request 3 14597 NULL
110631 +dbJoin_14644 dbJoin 0 14644 NULL
110632 +profile_replace_14652 profile_replace 3 14652 NULL
110633 +usnic_vnic_dump_14662 usnic_vnic_dump 3 14662 NULL
110634 +add_to_page_cache_locked_14668 add_to_page_cache_locked 0 14668 NULL
110635 +min_bytes_needed_14675 min_bytes_needed 0 14675 NULL
110636 +nvme_trans_log_info_exceptions_14677 nvme_trans_log_info_exceptions 3 14677 NULL
110637 +pipeline_enc_tx_stat_fifo_int_read_14680 pipeline_enc_tx_stat_fifo_int_read 3 14680 NULL
110638 +ieee80211_if_fmt_rc_rateidx_mask_2ghz_14683 ieee80211_if_fmt_rc_rateidx_mask_2ghz 3 14683 NULL
110639 +SyS_fsetxattr_14702 SyS_fsetxattr 4 14702 NULL
110640 +persistent_ram_ecc_string_14704 persistent_ram_ecc_string 0 14704 NULL
110641 +u_audio_playback_14709 u_audio_playback 3 14709 NULL
110642 +rtw_cbuf_alloc_14710 rtw_cbuf_alloc 1 14710 NULL
110643 +vfd_write_14717 vfd_write 3 14717 NULL
110644 +__blk_end_request_14729 __blk_end_request 3 14729 NULL
110645 +raid1_resize_14740 raid1_resize 2 14740 NULL
110646 +i915_error_state_buf_init_14742 i915_error_state_buf_init 2 14742 NULL
110647 +btrfs_inode_extref_name_len_14752 btrfs_inode_extref_name_len 0 14752 NULL
110648 +rx_rx_cmplt_read_14753 rx_rx_cmplt_read 3 14753 NULL
110649 +regmap_range_read_file_14775 regmap_range_read_file 3 14775 NULL
110650 +sta_dev_read_14782 sta_dev_read 3 14782 NULL
110651 +keys_proc_write_14792 keys_proc_write 3 14792 NULL
110652 +ext4_kvmalloc_14796 ext4_kvmalloc 1 14796 NULL
110653 +__kfifo_in_14797 __kfifo_in 3-0 14797 NULL
110654 +hpet_readl_14801 hpet_readl 0 14801 NULL nohasharray
110655 +snd_als300_gcr_read_14801 snd_als300_gcr_read 0 14801 &hpet_readl_14801
110656 +xfs_btree_kill_iroot_14824 xfs_btree_kill_iroot 0 14824 NULL
110657 +mrp_attr_create_14853 mrp_attr_create 3 14853 NULL
110658 +lcd_write_14857 lcd_write 3 14857 NULL
110659 +get_user_cpu_mask_14861 get_user_cpu_mask 2 14861 NULL
110660 +xfs_bmapi_convert_unwritten_14886 xfs_bmapi_convert_unwritten 0 14886 NULL
110661 +gmux_index_read8_14890 gmux_index_read8 0 14890 NULL
110662 +acpi_os_allocate_14892 acpi_os_allocate 1 14892 NULL
110663 +SYSC_readv_14901 SYSC_readv 3 14901 NULL
110664 +__arch_hweight64_14923 __arch_hweight64 0 14923 NULL nohasharray
110665 +qp_memcpy_to_queue_iov_14923 qp_memcpy_to_queue_iov 5-2 14923 &__arch_hweight64_14923
110666 +ocfs2_expand_nonsparse_inode_14936 ocfs2_expand_nonsparse_inode 3-4 14936 NULL
110667 +queue_cnt_14951 queue_cnt 0 14951 NULL
110668 +unix_dgram_recvmsg_14952 unix_dgram_recvmsg 4 14952 NULL
110669 +videobuf_read_stream_14956 videobuf_read_stream 3 14956 NULL
110670 +mce_flush_rx_buffer_14976 mce_flush_rx_buffer 2 14976 NULL
110671 +setkey_14987 setkey 3 14987 NULL nohasharray
110672 +gpio_twl4030_write_14987 gpio_twl4030_write 1 14987 &setkey_14987
110673 +blk_integrity_tuple_size_15027 blk_integrity_tuple_size 0 15027 NULL
110674 +read_file_node_aggr_15040 read_file_node_aggr 3 15040 NULL
110675 +cld_pipe_downcall_15058 cld_pipe_downcall 3 15058 NULL
110676 +ieee80211_if_read_uapsd_max_sp_len_15067 ieee80211_if_read_uapsd_max_sp_len 3 15067 NULL
110677 +nfs4_write_cached_acl_15070 nfs4_write_cached_acl 4 15070 NULL
110678 +ntfs_copy_from_user_15072 ntfs_copy_from_user 3-5-0 15072 NULL
110679 +pppoe_recvmsg_15073 pppoe_recvmsg 4 15073 NULL
110680 +smscore_load_firmware_family2_15086 smscore_load_firmware_family2 3 15086 NULL
110681 +xfs_btree_insrec_15090 xfs_btree_insrec 0 15090 NULL
110682 +btrfs_readpage_15094 btrfs_readpage 0 15094 NULL
110683 +hex_dump_to_buffer_15121 hex_dump_to_buffer 6 15121 NULL
110684 +start_port_15124 start_port 0 15124 NULL
110685 +ipwireless_ppp_mru_15153 ipwireless_ppp_mru 0 15153 NULL
110686 +SYSC_setdomainname_15180 SYSC_setdomainname 2 15180 NULL
110687 +iscsi_create_endpoint_15193 iscsi_create_endpoint 1 15193 NULL
110688 +mtt_alloc_res_15211 mtt_alloc_res 5 15211 NULL
110689 +bfad_debugfs_write_regrd_15218 bfad_debugfs_write_regrd 3 15218 NULL
110690 +iwl_dbgfs_sram_write_15239 iwl_dbgfs_sram_write 3 15239 NULL
110691 +il_dbgfs_rx_stats_read_15243 il_dbgfs_rx_stats_read 3 15243 NULL
110692 +simple_strtol_15273 simple_strtol 0 15273 NULL
110693 +fw_realloc_buffer_15280 fw_realloc_buffer 2 15280 NULL
110694 +ocfs2_read_refcount_block_15305 ocfs2_read_refcount_block 0 15305 NULL
110695 +kovaplus_sysfs_read_15337 kovaplus_sysfs_read 6 15337 NULL
110696 +ioread16_15342 ioread16 0 15342 NULL
110697 +ept_prefetch_gpte_15348 ept_prefetch_gpte 4 15348 NULL
110698 +acpi_ut_create_string_object_15360 acpi_ut_create_string_object 1 15360 NULL
110699 +ext4_direct_IO_15369 ext4_direct_IO 4 15369 NULL
110700 +graph_depth_read_15371 graph_depth_read 3 15371 NULL
110701 +compat_sys_process_vm_readv_15374 compat_sys_process_vm_readv 3-5 15374 NULL
110702 +fq_codel_zalloc_15378 fq_codel_zalloc 1 15378 NULL
110703 +alloc_fddidev_15382 alloc_fddidev 1 15382 NULL
110704 +pipeline_csum_to_rx_xfer_swi_read_15403 pipeline_csum_to_rx_xfer_swi_read 3 15403 NULL
110705 +get_modalias_15406 get_modalias 2 15406 NULL
110706 +blockdev_direct_IO_15408 blockdev_direct_IO 5 15408 NULL
110707 +__videobuf_copy_to_user_15423 __videobuf_copy_to_user 4-0 15423 NULL
110708 +tcp_mtu_to_mss_15438 tcp_mtu_to_mss 2-0 15438 NULL
110709 +hpsa_change_queue_depth_15449 hpsa_change_queue_depth 2 15449 NULL
110710 +memweight_15450 memweight 2 15450 NULL
110711 +zd_chip_is_zd1211b_15518 zd_chip_is_zd1211b 0 15518 NULL
110712 +ifx_spi_write_15531 ifx_spi_write 3 15531 NULL
110713 +p9_check_zc_errors_15534 p9_check_zc_errors 4 15534 NULL
110714 +xfrm_state_mtu_15548 xfrm_state_mtu 0-2 15548 NULL
110715 +persistent_status_15574 persistent_status 4 15574 NULL
110716 +bnx2fc_process_unsol_compl_15576 bnx2fc_process_unsol_compl 2 15576 NULL
110717 +vme_user_write_15587 vme_user_write 3 15587 NULL
110718 +compat_fillonedir_15620 compat_fillonedir 3 15620 NULL
110719 +proc_loginuid_read_15631 proc_loginuid_read 3 15631 NULL
110720 +tomoyo_scan_bprm_15642 tomoyo_scan_bprm 2-4 15642 NULL nohasharray
110721 +sk_memory_allocated_add_15642 sk_memory_allocated_add 2 15642 &tomoyo_scan_bprm_15642 nohasharray
110722 +pipeline_hs_tx_stat_fifo_int_read_15642 pipeline_hs_tx_stat_fifo_int_read 3 15642 &sk_memory_allocated_add_15642
110723 +joydev_handle_JSIOCSBTNMAP_15643 joydev_handle_JSIOCSBTNMAP 3 15643 NULL
110724 +fs_path_add_15648 fs_path_add 3 15648 NULL
110725 +__do_readpage_15652 __do_readpage 0 15652 NULL
110726 +xsd_read_15653 xsd_read 3 15653 NULL
110727 +unix_bind_15668 unix_bind 3 15668 NULL
110728 +dm_read_15674 dm_read 3 15674 NULL nohasharray
110729 +SyS_connect_15674 SyS_connect 3 15674 &dm_read_15674
110730 +tracing_snapshot_write_15719 tracing_snapshot_write 3 15719 NULL
110731 +HiSax_readstatus_15752 HiSax_readstatus 2 15752 NULL
110732 +smk_read_direct_15803 smk_read_direct 3 15803 NULL
110733 +nameseq_list_15817 nameseq_list 3-0 15817 NULL nohasharray
110734 +gnttab_expand_15817 gnttab_expand 1 15817 &nameseq_list_15817
110735 +afs_proc_rootcell_write_15822 afs_proc_rootcell_write 3 15822 NULL
110736 +table_size_15851 table_size 0-1-2 15851 NULL
110737 +write_file_tx99_15856 write_file_tx99 3 15856 NULL
110738 +media_entity_init_15870 media_entity_init 2-4 15870 NULL
110739 +__mptctl_ioctl_15875 __mptctl_ioctl 2 15875 NULL
110740 +native_read_msr_15905 native_read_msr 0 15905 NULL
110741 +parse_audio_stream_data_15937 parse_audio_stream_data 3 15937 NULL
110742 +power_read_15939 power_read 3 15939 NULL
110743 +lpfc_idiag_drbacc_read_15948 lpfc_idiag_drbacc_read 3 15948 NULL
110744 +snd_pcm_lib_read_transfer_15952 snd_pcm_lib_read_transfer 5-2-4 15952 NULL
110745 +memblock_virt_alloc_try_nid_15954 memblock_virt_alloc_try_nid 1 15954 NULL
110746 +viafb_vt1636_proc_write_16018 viafb_vt1636_proc_write 3 16018 NULL
110747 +dccp_recvmsg_16056 dccp_recvmsg 4 16056 NULL
110748 +read_file_spectral_period_16057 read_file_spectral_period 3 16057 NULL
110749 +si5351_msynth_params_address_16062 si5351_msynth_params_address 0-1 16062 NULL
110750 +isr_tx_exch_complete_read_16103 isr_tx_exch_complete_read 3 16103 NULL
110751 +isr_hw_pm_mode_changes_read_16110 isr_hw_pm_mode_changes_read 3 16110 NULL nohasharray
110752 +dma_tx_requested_read_16110 dma_tx_requested_read 3 16110 &isr_hw_pm_mode_changes_read_16110
110753 +gfs2_jdesc_check_16122 gfs2_jdesc_check 0 16122 NULL
110754 +snd_dma_pointer_16126 snd_dma_pointer 0-2 16126 NULL
110755 +compat_sys_select_16131 compat_sys_select 1 16131 NULL
110756 +fsm_init_16134 fsm_init 2 16134 NULL
110757 +ext4_xattr_block_get_16148 ext4_xattr_block_get 0 16148 NULL
110758 +optimal_reclaimed_pages_16172 optimal_reclaimed_pages 0 16172 NULL
110759 +mapping_level_16188 mapping_level 2-0 16188 NULL
110760 +i40e_allocate_virt_mem_d_16191 i40e_allocate_virt_mem_d 3 16191 NULL
110761 +ath10k_htt_rx_ring_size_16201 ath10k_htt_rx_ring_size 0 16201 NULL
110762 +cipso_v4_map_cat_rng_hton_16203 cipso_v4_map_cat_rng_hton 0 16203 NULL
110763 +SyS_pselect6_16210 SyS_pselect6 1 16210 NULL
110764 +create_table_16213 create_table 2 16213 NULL
110765 +ath9k_hw_ar9287_dump_eeprom_16224 ath9k_hw_ar9287_dump_eeprom 5-4 16224 NULL
110766 +atomic_read_file_16227 atomic_read_file 3 16227 NULL
110767 +BcmGetSectionValStartOffset_16235 BcmGetSectionValStartOffset 0 16235 NULL
110768 +lov_prep_brw_set_16246 lov_prep_brw_set 3 16246 NULL
110769 +btrfs_dev_extent_chunk_offset_16247 btrfs_dev_extent_chunk_offset 0 16247 NULL nohasharray
110770 +i40e_dbg_dump_read_16247 i40e_dbg_dump_read 3 16247 &btrfs_dev_extent_chunk_offset_16247
110771 +il_dbgfs_disable_ht40_write_16249 il_dbgfs_disable_ht40_write 3 16249 NULL
110772 +SyS_fgetxattr_16254 SyS_fgetxattr 4 16254 NULL
110773 +reiserfs_acl_count_16265 reiserfs_acl_count 0-1 16265 NULL
110774 +ocfs2_xattr_bucket_value_truncate_16279 ocfs2_xattr_bucket_value_truncate 4 16279 NULL
110775 +nand_bch_init_16280 nand_bch_init 3-2 16280 NULL nohasharray
110776 +drbd_setsockopt_16280 drbd_setsockopt 5 16280 &nand_bch_init_16280
110777 +account_16283 account 0-4-2 16283 NULL nohasharray
110778 +mirror_status_16283 mirror_status 5 16283 &account_16283
110779 +jumpshot_read_data_16287 jumpshot_read_data 4 16287 NULL
110780 +mo_xattr_get_16288 mo_xattr_get 0 16288 NULL
110781 +stk_allocate_buffers_16291 stk_allocate_buffers 2 16291 NULL
110782 +rbd_segment_offset_16293 rbd_segment_offset 0-2 16293 NULL
110783 +rsc_mgr_init_16299 rsc_mgr_init 3 16299 NULL
110784 +kvm_handle_hva_range_16312 kvm_handle_hva_range 3-2 16312 NULL
110785 +sysfs_create_groups_16360 sysfs_create_groups 0 16360 NULL
110786 +total_ps_buffered_read_16365 total_ps_buffered_read 3 16365 NULL
110787 +xfs_inobt_lookup_16367 xfs_inobt_lookup 0 16367 NULL
110788 +iscsi_tcp_conn_setup_16376 iscsi_tcp_conn_setup 2 16376 NULL
110789 +gfs2_dinode_in_16378 gfs2_dinode_in 0 16378 NULL
110790 +xfs_btree_check_block_16419 xfs_btree_check_block 0 16419 NULL
110791 +ieee80211_if_read_tsf_16420 ieee80211_if_read_tsf 3 16420 NULL
110792 +rxrpc_server_keyring_16431 rxrpc_server_keyring 3 16431 NULL
110793 +__bio_add_page_16435 __bio_add_page 0-4 16435 NULL
110794 +cmdline_store_16442 cmdline_store 4 16442 NULL
110795 +btrfs_truncate_inode_items_16452 btrfs_truncate_inode_items 4 16452 NULL
110796 +netlink_change_ngroups_16457 netlink_change_ngroups 2 16457 NULL
110797 +req_capsule_get_size_16467 req_capsule_get_size 0 16467 NULL
110798 +tracing_readme_read_16493 tracing_readme_read 3 16493 NULL
110799 +KEY_OFFSET_16504 KEY_OFFSET 0 16504 NULL
110800 +snd_interval_max_16529 snd_interval_max 0 16529 NULL
110801 +raid10_resize_16537 raid10_resize 2 16537 NULL
110802 +lpfc_debugfs_read_16566 lpfc_debugfs_read 3 16566 NULL
110803 +agp_allocate_memory_wrap_16576 agp_allocate_memory_wrap 1 16576 NULL
110804 +lustre_msg_hdr_size_v2_16589 lustre_msg_hdr_size_v2 0 16589 NULL
110805 +gmux_index_read32_16604 gmux_index_read32 0 16604 NULL
110806 +rtw_set_wpa_ie_16633 rtw_set_wpa_ie 3 16633 NULL
110807 +btrfs_get_token_32_16651 btrfs_get_token_32 0 16651 NULL
110808 +__wa_populate_dto_urb_16699 __wa_populate_dto_urb 3-4 16699 NULL
110809 +__proc_lnet_buffers_16717 __proc_lnet_buffers 5 16717 NULL
110810 +__copy_to_user_swizzled_16748 __copy_to_user_swizzled 3-4 16748 NULL
110811 +arcmsr_adjust_disk_queue_depth_16756 arcmsr_adjust_disk_queue_depth 2 16756 NULL
110812 +blk_rq_map_user_iov_16772 blk_rq_map_user_iov 5 16772 NULL
110813 +i2o_parm_issue_16790 i2o_parm_issue 0 16790 NULL
110814 +get_server_iovec_16804 get_server_iovec 2 16804 NULL
110815 +drm_malloc_ab_16831 drm_malloc_ab 1-2 16831 NULL
110816 +scsi_mode_sense_16835 scsi_mode_sense 5 16835 NULL
110817 +hfsplus_min_io_size_16859 hfsplus_min_io_size 0 16859 NULL
110818 +xfs_dialloc_ag_16868 xfs_dialloc_ag 0 16868 NULL
110819 +alloc_idx_lebs_16872 alloc_idx_lebs 2 16872 NULL nohasharray
110820 +xfs_iget_16872 xfs_iget 0 16872 &alloc_idx_lebs_16872
110821 +carl9170_debugfs_ampdu_state_read_16873 carl9170_debugfs_ampdu_state_read 3 16873 NULL
110822 +st_write_16874 st_write 3 16874 NULL
110823 +__kfifo_peek_n_16877 __kfifo_peek_n 0 16877 NULL
110824 +transport_init_session_tags_16878 transport_init_session_tags 1-2 16878 NULL
110825 +snd_gf1_mem_proc_dump_16926 snd_gf1_mem_proc_dump 5 16926 NULL nohasharray
110826 +psb_unlocked_ioctl_16926 psb_unlocked_ioctl 2 16926 &snd_gf1_mem_proc_dump_16926
110827 +_sp2d_alloc_16944 _sp2d_alloc 1-2-3 16944 NULL
110828 +squashfs_read_table_16945 squashfs_read_table 3 16945 NULL
110829 +keyctl_instantiate_key_iov_16969 keyctl_instantiate_key_iov 3 16969 NULL
110830 +ocfs2_read_quota_phys_block_16990 ocfs2_read_quota_phys_block 0 16990 NULL
110831 +ceph_read_dir_17005 ceph_read_dir 3 17005 NULL
110832 +copy_counters_to_user_17027 copy_counters_to_user 5 17027 NULL
110833 +jffs2_trusted_setxattr_17048 jffs2_trusted_setxattr 4 17048 NULL
110834 +__arch_hweight32_17060 __arch_hweight32 0 17060 NULL
110835 +sddr55_read_data_17072 sddr55_read_data 4 17072 NULL
110836 +dvb_dvr_read_17073 dvb_dvr_read 3 17073 NULL
110837 +simple_transaction_read_17076 simple_transaction_read 3 17076 NULL
110838 +carl9170_debugfs_mem_usage_read_17084 carl9170_debugfs_mem_usage_read 3 17084 NULL
110839 +entry_length_17093 entry_length 0 17093 NULL
110840 +ocfs2_get_refcount_cpos_end_17113 ocfs2_get_refcount_cpos_end 0 17113 NULL
110841 +write_mem_17114 write_mem 3 17114 NULL
110842 +pvr2_hdw_state_report_17121 pvr2_hdw_state_report 3 17121 NULL
110843 +nouveau_instobj_create__17144 nouveau_instobj_create_ 4 17144 NULL
110844 +jumpshot_write_data_17151 jumpshot_write_data 4 17151 NULL
110845 +sep_read_17161 sep_read 3 17161 NULL
110846 +befs_nls2utf_17163 befs_nls2utf 3 17163 NULL
110847 +tx_tx_start_templates_read_17164 tx_tx_start_templates_read 3 17164 NULL
110848 +UniStrnlen_17169 UniStrnlen 0 17169 NULL
110849 +access_remote_vm_17189 access_remote_vm 0 17189 NULL nohasharray
110850 +iwl_dbgfs_txfifo_flush_write_17189 iwl_dbgfs_txfifo_flush_write 3 17189 &access_remote_vm_17189 nohasharray
110851 +ocfs2_flock_handle_signal_17189 ocfs2_flock_handle_signal 0 17189 &iwl_dbgfs_txfifo_flush_write_17189
110852 +iscsit_find_cmd_from_itt_or_dump_17194 iscsit_find_cmd_from_itt_or_dump 3 17194 NULL nohasharray
110853 +driver_state_read_17194 driver_state_read 3 17194 &iscsit_find_cmd_from_itt_or_dump_17194
110854 +sync_request_17208 sync_request 2 17208 NULL
110855 +dn_recvmsg_17213 dn_recvmsg 4 17213 NULL
110856 +lprocfs_read_frac_helper_17261 lprocfs_read_frac_helper 0 17261 NULL
110857 +error_error_frame_cts_nul_flid_read_17262 error_error_frame_cts_nul_flid_read 3 17262 NULL
110858 +alloc_ep_17269 alloc_ep 1 17269 NULL
110859 +pg_read_17276 pg_read 3 17276 NULL
110860 +raw_recvmsg_17277 raw_recvmsg 4 17277 NULL
110861 +hmac_sha256_17278 hmac_sha256 2 17278 NULL
110862 +neigh_hash_grow_17283 neigh_hash_grow 2 17283 NULL
110863 +minstrel_stats_read_17290 minstrel_stats_read 3 17290 NULL
110864 +ieee80211_if_fmt_dot11MeshForwarding_17301 ieee80211_if_fmt_dot11MeshForwarding 3 17301 NULL
110865 +mb_cache_create_17307 mb_cache_create 2 17307 NULL
110866 +gnttab_map_frames_v2_17314 gnttab_map_frames_v2 2 17314 NULL
110867 +ieee80211_if_read_dot11MeshHWMPperrMinInterval_17346 ieee80211_if_read_dot11MeshHWMPperrMinInterval 3 17346 NULL
110868 +ath6kl_wmi_send_mgmt_cmd_17347 ath6kl_wmi_send_mgmt_cmd 7 17347 NULL
110869 +mdc_import_seq_write_17409 mdc_import_seq_write 3 17409 NULL
110870 +lpfc_debugfs_dif_err_write_17424 lpfc_debugfs_dif_err_write 3 17424 NULL
110871 +compat_sys_ppoll_17430 compat_sys_ppoll 2 17430 NULL
110872 +sta_connected_time_read_17435 sta_connected_time_read 3 17435 NULL
110873 +libcfs_ipif_enumerate_17445 libcfs_ipif_enumerate 0 17445 NULL
110874 +xfs_btree_lshift_17448 xfs_btree_lshift 0 17448 NULL
110875 +nla_get_u32_17455 nla_get_u32 0 17455 NULL
110876 +__ref_totlen_17461 __ref_totlen 0 17461 NULL
110877 +probe_kernel_write_17481 probe_kernel_write 3 17481 NULL
110878 +TSS_rawhmac_17486 TSS_rawhmac 3 17486 NULL
110879 +lbs_highrssi_write_17515 lbs_highrssi_write 3 17515 NULL
110880 +qp_free_res_17541 qp_free_res 5 17541 NULL
110881 +__copy_to_user_17551 __copy_to_user 3-0 17551 NULL
110882 +copy_from_user_17559 copy_from_user 0-3 17559 NULL
110883 +hash_netport4_expire_17573 hash_netport4_expire 4 17573 NULL
110884 +acpi_ut_create_package_object_17594 acpi_ut_create_package_object 1 17594 NULL
110885 +neigh_hash_alloc_17595 neigh_hash_alloc 1 17595 NULL
110886 +osst_execute_17607 osst_execute 7-6 17607 NULL
110887 +ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout_17618 ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout 3 17618 NULL
110888 +dma_map_page_17628 dma_map_page 0 17628 NULL
110889 +twl4030_set_gpio_direction_17645 twl4030_set_gpio_direction 1 17645 NULL
110890 +SYSC_migrate_pages_17657 SYSC_migrate_pages 2 17657 NULL
110891 +packet_setsockopt_17662 packet_setsockopt 5 17662 NULL
110892 +pwr_enable_ps_read_17686 pwr_enable_ps_read 3 17686 NULL
110893 +filemap_fdatawait_17688 filemap_fdatawait 0 17688 NULL
110894 +venus_rename_17707 venus_rename 4-5 17707 NULL nohasharray
110895 +__einj_error_trigger_17707 __einj_error_trigger 0 17707 &venus_rename_17707
110896 +exofs_read_lookup_dev_table_17733 exofs_read_lookup_dev_table 3 17733 NULL
110897 +sctpprobe_read_17741 sctpprobe_read 3 17741 NULL
110898 +dgap_do_fep_load_17765 dgap_do_fep_load 3 17765 NULL
110899 +shrink_slab_node_17794 shrink_slab_node 3 17794 NULL
110900 +gnet_stats_copy_app_17821 gnet_stats_copy_app 3 17821 NULL
110901 +cipso_v4_gentag_rbm_17836 cipso_v4_gentag_rbm 0 17836 NULL
110902 +em28xx_audio_ep_packet_size_17844 em28xx_audio_ep_packet_size 0 17844 NULL
110903 +dm_stats_message_17863 dm_stats_message 5 17863 NULL
110904 +sisusb_send_bulk_msg_17864 sisusb_send_bulk_msg 3 17864 NULL
110905 +alloc_sja1000dev_17868 alloc_sja1000dev 1 17868 NULL
110906 +virtio_cread32_17873 virtio_cread32 0 17873 NULL
110907 +ray_cs_essid_proc_write_17875 ray_cs_essid_proc_write 3 17875 NULL
110908 +orinoco_set_key_17878 orinoco_set_key 5-7 17878 NULL nohasharray
110909 +i40e_align_l2obj_base_17878 i40e_align_l2obj_base 0-1 17878 &orinoco_set_key_17878
110910 +init_per_cpu_17880 init_per_cpu 1 17880 NULL
110911 +ieee80211_if_fmt_dot11MeshMaxPeerLinks_17883 ieee80211_if_fmt_dot11MeshMaxPeerLinks 3 17883 NULL
110912 +ieee80211_if_fmt_dot11MeshHWMPRootMode_17890 ieee80211_if_fmt_dot11MeshHWMPRootMode 3 17890 NULL
110913 +xfs_buf_associate_memory_17915 xfs_buf_associate_memory 3 17915 NULL
110914 +xfs_rtallocate_extent_near_17916 xfs_rtallocate_extent_near 0 17916 NULL
110915 +scsi_bufflen_17933 scsi_bufflen 0 17933 NULL
110916 +__mutex_lock_check_stamp_17947 __mutex_lock_check_stamp 0 17947 NULL
110917 +beacon_interval_write_17952 beacon_interval_write 3 17952 NULL
110918 +calc_nr_buckets_17976 calc_nr_buckets 0 17976 NULL
110919 +ext4_ext_calc_credits_for_single_extent_17983 ext4_ext_calc_credits_for_single_extent 0-2 17983 NULL
110920 +smk_write_cipso_17989 smk_write_cipso 3 17989 NULL
110921 +gnttab_max_grant_frames_17993 gnttab_max_grant_frames 0 17993 NULL
110922 +pvr2_v4l2_read_18006 pvr2_v4l2_read 3 18006 NULL
110923 +alloc_rx_desc_ring_18016 alloc_rx_desc_ring 2 18016 NULL
110924 +o2hb_highest_node_18034 o2hb_highest_node 0 18034 NULL
110925 +cryptd_alloc_instance_18048 cryptd_alloc_instance 2-3 18048 NULL
110926 +__btrfs_drop_extents_18049 __btrfs_drop_extents 5 18049 NULL
110927 +ddebug_proc_write_18055 ddebug_proc_write 3 18055 NULL
110928 +lua_sysfs_read_18062 lua_sysfs_read 6 18062 NULL
110929 +fpregs_get_18066 fpregs_get 4 18066 NULL
110930 +kvm_read_guest_page_18074 kvm_read_guest_page 5 18074 NULL
110931 +SYSC_pselect6_18076 SYSC_pselect6 1 18076 NULL
110932 +SYSC_semtimedop_18091 SYSC_semtimedop 3 18091 NULL
110933 +mpi_alloc_18094 mpi_alloc 1 18094 NULL
110934 +hfs_direct_IO_18104 hfs_direct_IO 4 18104 NULL
110935 +dfs_file_read_18116 dfs_file_read 3 18116 NULL
110936 +svc_getnl_18120 svc_getnl 0 18120 NULL
110937 +paging32_gpte_to_gfn_lvl_18131 paging32_gpte_to_gfn_lvl 0-2-1 18131 NULL
110938 +xfs_zero_eof_18134 xfs_zero_eof 0 18134 NULL
110939 +selinux_inode_setsecurity_18148 selinux_inode_setsecurity 4 18148 NULL
110940 +pccard_store_cis_18176 pccard_store_cis 6 18176 NULL
110941 +orinoco_add_extscan_result_18207 orinoco_add_extscan_result 3 18207 NULL
110942 +gsm_control_message_18209 gsm_control_message 4 18209 NULL
110943 +read_rindex_entry_18213 read_rindex_entry 0 18213 NULL
110944 +do_ipv6_setsockopt_18215 do_ipv6_setsockopt 5 18215 NULL
110945 +gnttab_alloc_grant_references_18240 gnttab_alloc_grant_references 1 18240 NULL
110946 +alloc_trace_uprobe_18247 alloc_trace_uprobe 3 18247 NULL
110947 +rfcomm_sock_setsockopt_18254 rfcomm_sock_setsockopt 5 18254 NULL
110948 +qdisc_class_hash_alloc_18262 qdisc_class_hash_alloc 1 18262 NULL
110949 +gfs2_alloc_sort_buffer_18275 gfs2_alloc_sort_buffer 1 18275 NULL
110950 +alloc_ring_18278 alloc_ring 2-4 18278 NULL
110951 +bio_phys_segments_18281 bio_phys_segments 0 18281 NULL nohasharray
110952 +nouveau_subdev_create__18281 nouveau_subdev_create_ 7 18281 &bio_phys_segments_18281
110953 +ext4_readpages_18283 ext4_readpages 4 18283 NULL
110954 +mmc_send_bus_test_18285 mmc_send_bus_test 4 18285 NULL
110955 +um_idi_write_18293 um_idi_write 3 18293 NULL
110956 +nouveau_disp_create__18305 nouveau_disp_create_ 4-7 18305 NULL
110957 +vga_r_18310 vga_r 0 18310 NULL
110958 +class_add_profile_18315 class_add_profile 1-3-5 18315 NULL
110959 +csio_mem_read_18319 csio_mem_read 3 18319 NULL
110960 +alloc_and_copy_string_18321 alloc_and_copy_string 2 18321 NULL
110961 +ecryptfs_send_message_18322 ecryptfs_send_message 2 18322 NULL
110962 +bio_integrity_advance_18324 bio_integrity_advance 2 18324 NULL
110963 +lcd_proc_write_18351 lcd_proc_write 3 18351 NULL
110964 +pwr_power_save_off_read_18355 pwr_power_save_off_read 3 18355 NULL
110965 +SyS_process_vm_readv_18366 SyS_process_vm_readv 3-5 18366 NULL
110966 +ep_io_18367 ep_io 0 18367 NULL
110967 +qib_user_sdma_num_pages_18371 qib_user_sdma_num_pages 0 18371 NULL
110968 +__ceph_getxattr_18386 __ceph_getxattr 0 18386 NULL
110969 +ci_role_write_18388 ci_role_write 3 18388 NULL
110970 +hdlc_empty_fifo_18397 hdlc_empty_fifo 2 18397 NULL
110971 +adis16136_show_serial_18402 adis16136_show_serial 3 18402 NULL
110972 +crystalhd_user_data_18407 crystalhd_user_data 3 18407 NULL
110973 +memblock_virt_alloc_node_nopanic_18431 memblock_virt_alloc_node_nopanic 1 18431 NULL
110974 +iscsi_create_flashnode_sess_18433 iscsi_create_flashnode_sess 4 18433 NULL
110975 +snd_hda_get_connections_18437 snd_hda_get_connections 0 18437 NULL
110976 +flash_dev_cache_miss_18454 flash_dev_cache_miss 4 18454 NULL
110977 +fuse_perform_write_18457 fuse_perform_write 4 18457 NULL
110978 +regset_tls_set_18459 regset_tls_set 4 18459 NULL
110979 +pci_vpd_lrdt_size_18479 pci_vpd_lrdt_size 0 18479 NULL nohasharray
110980 +mite_bytes_in_transit_18479 mite_bytes_in_transit 0 18479 &pci_vpd_lrdt_size_18479
110981 +udpv6_setsockopt_18487 udpv6_setsockopt 5 18487 NULL
110982 +btrfs_fiemap_18501 btrfs_fiemap 3 18501 NULL
110983 +__copy_user_zeroing_intel_18510 __copy_user_zeroing_intel 0-3 18510 NULL
110984 +__block_write_begin_18511 __block_write_begin 0 18511 NULL
110985 +snd_vx_inb_18514 snd_vx_inb 0 18514 NULL
110986 +snd_gus_dram_poke_18525 snd_gus_dram_poke 4 18525 NULL
110987 +nouveau_fifo_channel_create__18530 nouveau_fifo_channel_create_ 9 18530 NULL
110988 +seq_copy_in_user_18543 seq_copy_in_user 3 18543 NULL
110989 +sas_change_queue_depth_18555 sas_change_queue_depth 2 18555 NULL
110990 +smk_write_rules_list_18565 smk_write_rules_list 3 18565 NULL
110991 +debug_output_18575 debug_output 3 18575 NULL
110992 +xfs_btree_read_bufl_18597 xfs_btree_read_bufl 0 18597 NULL
110993 +filemap_fdatawait_range_18600 filemap_fdatawait_range 0 18600 NULL
110994 +iowarrior_write_18604 iowarrior_write 3 18604 NULL
110995 +nvc0_ram_create__18624 nvc0_ram_create_ 4 18624 NULL
110996 +from_buffer_18625 from_buffer 3 18625 NULL
110997 +snd_pcm_oss_write3_18657 snd_pcm_oss_write3 0-3 18657 NULL
110998 +ieee80211_if_fmt_rssi_threshold_18664 ieee80211_if_fmt_rssi_threshold 3 18664 NULL
110999 +xfs_iext_insert_18667 xfs_iext_insert 3 18667 NULL
111000 +fnic_stats_debugfs_read_18688 fnic_stats_debugfs_read 3 18688 NULL
111001 +echo_client_prep_commit_18693 echo_client_prep_commit 8 18693 NULL
111002 +iwl_dbgfs_rx_handlers_read_18708 iwl_dbgfs_rx_handlers_read 3 18708 NULL
111003 +ceph_alloc_page_vector_18710 ceph_alloc_page_vector 1 18710 NULL
111004 +blk_rq_bytes_18715 blk_rq_bytes 0 18715 NULL
111005 +snd_als4k_gcr_read_addr_18741 snd_als4k_gcr_read_addr 0 18741 NULL
111006 +o2hb_debug_create_18744 o2hb_debug_create 4 18744 NULL
111007 +__erst_read_to_erange_from_nvram_18748 __erst_read_to_erange_from_nvram 0 18748 NULL
111008 +wep_packets_read_18751 wep_packets_read 3 18751 NULL
111009 +read_file_dump_nfcal_18766 read_file_dump_nfcal 3 18766 NULL
111010 +ffs_epfile_read_18775 ffs_epfile_read 3 18775 NULL
111011 +SyS_lsetxattr_18776 SyS_lsetxattr 4 18776 NULL
111012 +alloc_fcdev_18780 alloc_fcdev 1 18780 NULL
111013 +dm_stats_print_18815 dm_stats_print 7 18815 NULL
111014 +sys_modify_ldt_18824 sys_modify_ldt 3 18824 NULL
111015 +mtf_test_write_18844 mtf_test_write 3 18844 NULL
111016 +sctp_setsockopt_events_18862 sctp_setsockopt_events 3 18862 NULL
111017 +ieee80211_if_read_element_ttl_18869 ieee80211_if_read_element_ttl 3 18869 NULL
111018 +xlog_find_verify_log_record_18870 xlog_find_verify_log_record 2 18870 NULL
111019 +ceph_setxattr_18913 ceph_setxattr 4 18913 NULL
111020 +ieee80211_rx_mgmt_disassoc_18927 ieee80211_rx_mgmt_disassoc 3 18927 NULL
111021 +snapshot_write_next_18937 snapshot_write_next 0 18937 NULL
111022 +clean_journal_18955 clean_journal 0 18955 NULL
111023 +__nla_reserve_18974 __nla_reserve 3 18974 NULL
111024 +__blockdev_direct_IO_18977 __blockdev_direct_IO 0-6 18977 NULL
111025 +layout_in_gaps_19006 layout_in_gaps 2 19006 NULL
111026 +huge_page_size_19008 huge_page_size 0 19008 NULL
111027 +hash_netport6_expire_19013 hash_netport6_expire 4 19013 NULL
111028 +sysfs_create_dir_ns_19033 sysfs_create_dir_ns 0 19033 NULL
111029 +revalidate_19043 revalidate 2 19043 NULL
111030 +afs_vnode_store_data_19048 afs_vnode_store_data 2-3-4-5 19048 NULL
111031 +osc_pinger_recov_seq_write_19056 osc_pinger_recov_seq_write 3 19056 NULL
111032 +get_log_header_19063 get_log_header 0 19063 NULL
111033 +create_gpadl_header_19064 create_gpadl_header 2 19064 NULL
111034 +ceph_create_snap_context_19082 ceph_create_snap_context 1 19082 NULL
111035 +sta_last_seq_ctrl_read_19106 sta_last_seq_ctrl_read 3 19106 NULL
111036 +cifs_readv_from_socket_19109 cifs_readv_from_socket 3 19109 NULL
111037 +snd_als4k_iobase_readl_19136 snd_als4k_iobase_readl 0 19136 NULL
111038 +alloc_irdadev_19140 alloc_irdadev 1 19140 NULL
111039 +sleep_auth_read_19159 sleep_auth_read 3 19159 NULL
111040 +smk_write_access2_19170 smk_write_access2 3 19170 NULL
111041 +iwl_dbgfs_reply_tx_error_read_19205 iwl_dbgfs_reply_tx_error_read 3 19205 NULL
111042 +vmw_unlocked_ioctl_19212 vmw_unlocked_ioctl 2 19212 NULL
111043 +__copy_to_user_inatomic_19214 __copy_to_user_inatomic 3-0 19214 NULL
111044 +dev_counters_read_19216 dev_counters_read 3 19216 NULL
111045 +wbcir_tx_19219 wbcir_tx 3 19219 NULL
111046 +snd_mask_max_19224 snd_mask_max 0 19224 NULL
111047 +bio_alloc_mddev_19238 bio_alloc_mddev 2 19238 NULL
111048 +ucma_query_19260 ucma_query 4 19260 NULL
111049 +il_dbgfs_rxon_filter_flags_read_19281 il_dbgfs_rxon_filter_flags_read 3 19281 NULL
111050 +batadv_tt_save_orig_buffer_19288 batadv_tt_save_orig_buffer 4 19288 NULL nohasharray
111051 +cfg80211_rx_unprot_mlme_mgmt_19288 cfg80211_rx_unprot_mlme_mgmt 3 19288 &batadv_tt_save_orig_buffer_19288
111052 +qc_capture_19298 qc_capture 3 19298 NULL
111053 +ocfs2_prepare_inode_for_refcount_19303 ocfs2_prepare_inode_for_refcount 4-3 19303 NULL
111054 +event_tx_stuck_read_19305 event_tx_stuck_read 3 19305 NULL
111055 +debug_read_19322 debug_read 3 19322 NULL
111056 +lbs_host_sleep_write_19332 lbs_host_sleep_write 3 19332 NULL nohasharray
111057 +cfg80211_inform_bss_19332 cfg80211_inform_bss 8 19332 &lbs_host_sleep_write_19332
111058 +closure_sub_19359 closure_sub 2 19359 NULL
111059 +firmware_data_write_19360 firmware_data_write 6-5 19360 NULL
111060 +read_zero_19366 read_zero 3 19366 NULL
111061 +interpret_user_input_19393 interpret_user_input 2 19393 NULL
111062 +sync_fill_pt_info_19397 sync_fill_pt_info 0 19397 NULL
111063 +pep_recvmsg_19402 pep_recvmsg 4 19402 NULL
111064 +dvbdmx_write_19423 dvbdmx_write 3 19423 NULL
111065 +SyS_sched_getaffinity_19444 SyS_sched_getaffinity 2 19444 NULL
111066 +xfrm_alg_auth_len_19454 xfrm_alg_auth_len 0 19454 NULL
111067 +gnet_stats_copy_19458 gnet_stats_copy 4 19458 NULL
111068 +gp2ap020a00f_get_thresh_reg_19468 gp2ap020a00f_get_thresh_reg 0 19468 NULL
111069 +sky2_read16_19475 sky2_read16 0 19475 NULL
111070 +__read_status_pciv2_19492 __read_status_pciv2 0 19492 NULL
111071 +kstrtoll_from_user_19500 kstrtoll_from_user 2 19500 NULL
111072 +ext4_add_new_descs_19509 ext4_add_new_descs 3 19509 NULL
111073 +batadv_tvlv_container_register_19520 batadv_tvlv_container_register 5 19520 NULL
111074 +apei_exec_pre_map_gars_19529 apei_exec_pre_map_gars 0 19529 NULL nohasharray
111075 +cfc_write_array_to_buffer_19529 cfc_write_array_to_buffer 3 19529 &apei_exec_pre_map_gars_19529
111076 +nfc_llcp_build_tlv_19536 nfc_llcp_build_tlv 3 19536 NULL
111077 +gfn_to_index_19558 gfn_to_index 0-1-3-2 19558 NULL
111078 +ocfs2_control_message_19564 ocfs2_control_message 3 19564 NULL
111079 +nfsd_read_19568 nfsd_read 5 19568 NULL
111080 +ieee80211_key_alloc_19575 ieee80211_key_alloc 3 19575 NULL
111081 +mnt_want_write_file_19579 mnt_want_write_file 0 19579 NULL
111082 +bm_status_read_19583 bm_status_read 3 19583 NULL
111083 +load_xattr_datum_19594 load_xattr_datum 0 19594 NULL
111084 +fallocate_chunk_19610 fallocate_chunk 0 19610 NULL
111085 +__mei_cl_recv_19636 __mei_cl_recv 3 19636 NULL
111086 +LoadBitmap_19658 LoadBitmap 2 19658 NULL
111087 +memblock_virt_alloc_low_nopanic_19714 memblock_virt_alloc_low_nopanic 1 19714 NULL
111088 +ocfs2_control_get_this_node_19721 ocfs2_control_get_this_node 0 19721 NULL
111089 +read_reg_19723 read_reg 0 19723 NULL
111090 +wm8350_block_write_19727 wm8350_block_write 2-3 19727 NULL
111091 +memcpy_toiovecend_19736 memcpy_toiovecend 4-3 19736 NULL
111092 +snd_es1968_get_dma_ptr_19747 snd_es1968_get_dma_ptr 0 19747 NULL
111093 +p9_client_read_19750 p9_client_read 5-0 19750 NULL
111094 +pnpbios_proc_write_19758 pnpbios_proc_write 3 19758 NULL
111095 +ocfs2_readpages_19759 ocfs2_readpages 4 19759 NULL
111096 +jffs2_acl_from_medium_19762 jffs2_acl_from_medium 2 19762 NULL
111097 +readhscx_19769 readhscx 0 19769 NULL
111098 +irda_setsockopt_19824 irda_setsockopt 5 19824 NULL
111099 +xfs_bmap_add_extent_hole_real_19828 xfs_bmap_add_extent_hole_real 0 19828 NULL
111100 +vfs_getxattr_19832 vfs_getxattr 0 19832 NULL
111101 +crypt_alloc_buffer_19846 crypt_alloc_buffer 2 19846 NULL
111102 +cfg80211_mlme_register_mgmt_19852 cfg80211_mlme_register_mgmt 5 19852 NULL
111103 +__nla_put_19857 __nla_put 3 19857 NULL
111104 +mrp_request_join_19882 mrp_request_join 4 19882 NULL
111105 +aes_decrypt_interrupt_read_19910 aes_decrypt_interrupt_read 3 19910 NULL
111106 +ps_upsd_max_apturn_read_19918 ps_upsd_max_apturn_read 3 19918 NULL
111107 +mangle_name_19923 mangle_name 0 19923 NULL
111108 +cgroup_task_count_19930 cgroup_task_count 0 19930 NULL
111109 +guest_read_tsc_19931 guest_read_tsc 0 19931 NULL
111110 +iwl_dbgfs_rx_queue_read_19943 iwl_dbgfs_rx_queue_read 3 19943 NULL
111111 +cfg80211_rx_assoc_resp_19944 cfg80211_rx_assoc_resp 4 19944 NULL
111112 +ll_xattr_cache_list_19954 ll_xattr_cache_list 0 19954 NULL
111113 +attach_hdlc_protocol_19986 attach_hdlc_protocol 3 19986 NULL
111114 +rtw_set_wps_probe_resp_19989 rtw_set_wps_probe_resp 3 19989 NULL
111115 +diva_um_idi_read_20003 diva_um_idi_read 0 20003 NULL
111116 +event_trigger_write_20009 event_trigger_write 3 20009 NULL nohasharray
111117 +lov_stripe_md_size_20009 lov_stripe_md_size 0-1 20009 &event_trigger_write_20009
111118 +tree_mod_log_eb_move_20011 tree_mod_log_eb_move 5 20011 NULL
111119 +SYSC_fgetxattr_20027 SYSC_fgetxattr 4 20027 NULL
111120 +split_scan_timeout_read_20029 split_scan_timeout_read 3 20029 NULL
111121 +alloc_ieee80211_20063 alloc_ieee80211 1 20063 NULL
111122 +iwl_mvm_power_mac_dbgfs_read_20067 iwl_mvm_power_mac_dbgfs_read 4 20067 NULL
111123 +rawv6_sendmsg_20080 rawv6_sendmsg 4 20080 NULL
111124 +fuse_conn_limit_read_20084 fuse_conn_limit_read 3 20084 NULL
111125 +aat2870_reg_write_file_20086 aat2870_reg_write_file 3 20086 NULL
111126 +team_options_register_20091 team_options_register 3 20091 NULL
111127 +qla2x00_adjust_sdev_qdepth_up_20097 qla2x00_adjust_sdev_qdepth_up 2 20097 NULL
111128 +xfs_qm_dqget_20103 xfs_qm_dqget 0 20103 NULL
111129 +hptiop_adjust_disk_queue_depth_20122 hptiop_adjust_disk_queue_depth 2 20122 NULL
111130 +tomoyo_commit_ok_20167 tomoyo_commit_ok 2 20167 NULL
111131 +read_flush_pipefs_20171 read_flush_pipefs 3 20171 NULL
111132 +wep_addr_key_count_read_20174 wep_addr_key_count_read 3 20174 NULL
111133 +crystalhd_map_dio_20181 crystalhd_map_dio 3 20181 NULL
111134 +pvr2_ctrl_value_to_sym_20229 pvr2_ctrl_value_to_sym 5 20229 NULL
111135 +rose_sendmsg_20249 rose_sendmsg 4 20249 NULL
111136 +tm6000_i2c_send_regs_20250 tm6000_i2c_send_regs 5 20250 NULL
111137 +btrfs_header_nritems_20296 btrfs_header_nritems 0 20296 NULL
111138 +r10_sync_page_io_20307 r10_sync_page_io 3 20307 NULL
111139 +dm_get_reserved_bio_based_ios_20315 dm_get_reserved_bio_based_ios 0 20315 NULL
111140 +tx_tx_burst_programmed_read_20320 tx_tx_burst_programmed_read 3 20320 NULL
111141 +vx_send_msg_nolock_20322 vx_send_msg_nolock 0 20322 NULL
111142 +snd_cs4281_BA1_read_20323 snd_cs4281_BA1_read 5 20323 NULL
111143 +gfs2_glock_nq_m_20347 gfs2_glock_nq_m 1 20347 NULL
111144 +handle_arr_calc_size_20355 handle_arr_calc_size 0-1 20355 NULL
111145 +smk_set_cipso_20379 smk_set_cipso 3 20379 NULL
111146 +snd_nm256_readl_20394 snd_nm256_readl 0 20394 NULL nohasharray
111147 +read_7220_creg32_20394 read_7220_creg32 0 20394 &snd_nm256_readl_20394
111148 +__kfifo_from_user_20399 __kfifo_from_user 3 20399 NULL nohasharray
111149 +SyS_get_mempolicy_20399 SyS_get_mempolicy 3 20399 &__kfifo_from_user_20399
111150 +compat_ipv6_setsockopt_20468 compat_ipv6_setsockopt 5 20468 NULL
111151 +read_buf_20469 read_buf 2 20469 NULL
111152 +bio_trim_20472 bio_trim 2 20472 NULL
111153 +btrfs_get_32_20476 btrfs_get_32 0 20476 NULL
111154 +xfs_iext_realloc_direct_20521 xfs_iext_realloc_direct 2 20521 NULL
111155 +drbd_bm_resize_20522 drbd_bm_resize 2 20522 NULL
111156 +amd_create_gatt_pages_20537 amd_create_gatt_pages 1 20537 NULL
111157 +scsi_report_opcode_20551 scsi_report_opcode 3 20551 NULL
111158 +venus_create_20555 venus_create 4 20555 NULL
111159 +btrfs_super_log_root_20565 btrfs_super_log_root 0 20565 NULL
111160 +crypto_ahash_reqsize_20569 crypto_ahash_reqsize 0 20569 NULL
111161 +xfs_bmap_isaeof_20570 xfs_bmap_isaeof 0 20570 NULL
111162 +ocfs2_cluster_lock_20588 ocfs2_cluster_lock 0 20588 NULL
111163 +kvm_test_age_hva_20593 kvm_test_age_hva 2 20593 NULL
111164 +sync_timeline_create_20601 sync_timeline_create 2 20601 NULL
111165 +lirc_write_20604 lirc_write 3 20604 NULL
111166 +qib_qsfp_write_20614 qib_qsfp_write 0-2-4 20614 NULL
111167 +snd_pcm_oss_prepare_20641 snd_pcm_oss_prepare 0 20641 NULL
111168 +get_extent_skip_holes_20642 get_extent_skip_holes 2 20642 NULL
111169 +kfifo_copy_to_user_20646 kfifo_copy_to_user 3-4 20646 NULL
111170 +cpulist_scnprintf_20648 cpulist_scnprintf 2-0 20648 NULL
111171 +oz_add_farewell_20652 oz_add_farewell 5 20652 NULL
111172 +oz_cdev_read_20659 oz_cdev_read 3 20659 NULL
111173 +snd_hdsp_playback_copy_20676 snd_hdsp_playback_copy 5 20676 NULL nohasharray
111174 +btrfs_qgroup_reserve_20676 btrfs_qgroup_reserve 0 20676 &snd_hdsp_playback_copy_20676
111175 +dvb_dmxdev_buffer_read_20682 dvb_dmxdev_buffer_read 0-4 20682 NULL
111176 +cpumask_size_20683 cpumask_size 0 20683 NULL
111177 +btrfs_node_blockptr_20685 btrfs_node_blockptr 0 20685 NULL
111178 +read_file_tgt_int_stats_20697 read_file_tgt_int_stats 3 20697 NULL
111179 +__maestro_read_20700 __maestro_read 0 20700 NULL
111180 +cipso_v4_gentag_rng_20703 cipso_v4_gentag_rng 0 20703 NULL
111181 +pcpu_page_first_chunk_20712 pcpu_page_first_chunk 1 20712 NULL
111182 +ocfs2_read_xattr_bucket_20722 ocfs2_read_xattr_bucket 0 20722 NULL
111183 +security_context_to_sid_force_20724 security_context_to_sid_force 2 20724 NULL
111184 +fb_prepare_logo_20743 fb_prepare_logo 0 20743 NULL
111185 +vol_cdev_direct_write_20751 vol_cdev_direct_write 3 20751 NULL
111186 +ocfs2_align_bytes_to_clusters_20754 ocfs2_align_bytes_to_clusters 2 20754 NULL
111187 +brcmf_p2p_escan_20763 brcmf_p2p_escan 2 20763 NULL nohasharray
111188 +mnt_clone_write_20763 mnt_clone_write 0 20763 &brcmf_p2p_escan_20763
111189 +fb_alloc_cmap_gfp_20792 fb_alloc_cmap_gfp 2 20792 NULL
111190 +iwl_dbgfs_rxon_flags_read_20795 iwl_dbgfs_rxon_flags_read 3 20795 NULL
111191 +lowpan_write_20800 lowpan_write 3 20800 NULL
111192 +strndup_user_20819 strndup_user 2 20819 NULL nohasharray
111193 +do_glock_20819 do_glock 0 20819 &strndup_user_20819
111194 +tipc_msg_build_20825 tipc_msg_build 3 20825 NULL
111195 +wl1271_format_buffer_20834 wl1271_format_buffer 2 20834 NULL
111196 +uvc_alloc_entity_20836 uvc_alloc_entity 4-3 20836 NULL
111197 +p9_tag_alloc_20845 p9_tag_alloc 3 20845 NULL
111198 +nvme_trans_supported_vpd_pages_20847 nvme_trans_supported_vpd_pages 4 20847 NULL
111199 +iwl_dbgfs_pm_params_read_20866 iwl_dbgfs_pm_params_read 3 20866 NULL
111200 +snd_pcm_capture_avail_20867 snd_pcm_capture_avail 0 20867 NULL
111201 +srq_free_res_20868 srq_free_res 5 20868 NULL
111202 +cfs_cpt_table_create_20884 cfs_cpt_table_create 1 20884 NULL
111203 +rb_simple_write_20890 rb_simple_write 3 20890 NULL
111204 +sisusb_send_packet_20891 sisusb_send_packet 2 20891 NULL
111205 +key_icverrors_read_20895 key_icverrors_read 3 20895 NULL
111206 +vfio_msi_enable_20906 vfio_msi_enable 2 20906 NULL
111207 +lbs_rdbbp_write_20918 lbs_rdbbp_write 3 20918 NULL
111208 +htable_bits_20933 htable_bits 0 20933 NULL
111209 +altera_set_ir_post_20948 altera_set_ir_post 2 20948 NULL
111210 +rx_rx_phy_hdr_read_20950 rx_rx_phy_hdr_read 3 20950 NULL
111211 +rsxx_cram_read_20957 rsxx_cram_read 3 20957 NULL
111212 +nfs_map_name_to_uid_20962 nfs_map_name_to_uid 3 20962 NULL
111213 +snd_rme9652_playback_copy_20970 snd_rme9652_playback_copy 5 20970 NULL
111214 +alg_setsockopt_20985 alg_setsockopt 5 20985 NULL
111215 +qib_verbs_send_20999 qib_verbs_send 5-3 20999 NULL
111216 +btrfs_dirty_pages_21019 btrfs_dirty_pages 0 21019 NULL
111217 +btrfs_inode_ref_name_len_21024 btrfs_inode_ref_name_len 0 21024 NULL
111218 +xfs_btree_new_root_21028 xfs_btree_new_root 0 21028 NULL
111219 +rx_defrag_tkip_called_read_21031 rx_defrag_tkip_called_read 3 21031 NULL
111220 +srp_change_queue_depth_21038 srp_change_queue_depth 2 21038 NULL
111221 +lbs_threshold_read_21046 lbs_threshold_read 5 21046 NULL
111222 +reiserfs_direct_IO_21051 reiserfs_direct_IO 4 21051 NULL
111223 +proc_fault_inject_write_21058 proc_fault_inject_write 3 21058 NULL
111224 +event_calibration_read_21083 event_calibration_read 3 21083 NULL
111225 +bl_add_page_to_bio_21094 bl_add_page_to_bio 2 21094 NULL nohasharray
111226 +multipath_status_21094 multipath_status 5 21094 &bl_add_page_to_bio_21094
111227 +rate_control_pid_events_read_21099 rate_control_pid_events_read 3 21099 NULL
111228 +ath6kl_send_go_probe_resp_21113 ath6kl_send_go_probe_resp 3 21113 NULL
111229 +_efx_mcdi_rpc_async_21119 _efx_mcdi_rpc_async 4-5 21119 NULL
111230 +i2400m_rx_trace_21127 i2400m_rx_trace 3 21127 NULL
111231 +cx18_v4l2_read_21196 cx18_v4l2_read 3 21196 NULL
111232 +ipc_rcu_alloc_21208 ipc_rcu_alloc 1 21208 NULL
111233 +scsi_execute_req_flags_21215 scsi_execute_req_flags 5 21215 NULL
111234 +get_numpages_21227 get_numpages 0-1-2 21227 NULL
111235 +input_ff_create_21240 input_ff_create 2 21240 NULL
111236 +cfg80211_notify_new_peer_candidate_21242 cfg80211_notify_new_peer_candidate 4 21242 NULL
111237 +use_debug_keys_read_21251 use_debug_keys_read 3 21251 NULL
111238 +fru_length_21257 fru_length 0 21257 NULL
111239 +rtw_set_wps_beacon_21262 rtw_set_wps_beacon 3 21262 NULL
111240 +xfs_alloc_ag_vextent_size_21276 xfs_alloc_ag_vextent_size 0 21276 NULL
111241 +do_msg_fill_21307 do_msg_fill 3 21307 NULL
111242 +add_res_range_21310 add_res_range 4 21310 NULL
111243 +get_zeroed_page_21322 get_zeroed_page 0 21322 NULL
111244 +ftrace_profile_read_21327 ftrace_profile_read 3 21327 NULL
111245 +read_file_bool_bmps_21344 read_file_bool_bmps 3 21344 NULL
111246 +gfs2_ea_get_copy_21353 gfs2_ea_get_copy 0 21353 NULL
111247 +alloc_orinocodev_21371 alloc_orinocodev 1 21371 NULL
111248 +SYSC_rt_sigpending_21379 SYSC_rt_sigpending 2 21379 NULL
111249 +video_ioctl2_21380 video_ioctl2 2 21380 NULL
111250 +insert_ptr_21386 insert_ptr 6 21386 NULL
111251 +diva_get_driver_dbg_mask_21399 diva_get_driver_dbg_mask 0 21399 NULL
111252 +__clone_and_map_simple_bio_21404 __clone_and_map_simple_bio 4 21404 NULL
111253 +snd_m3_inw_21406 snd_m3_inw 0 21406 NULL
111254 +usnic_ib_dump_vf_hdr_21423 usnic_ib_dump_vf_hdr 3 21423 NULL
111255 +snapshot_read_next_21426 snapshot_read_next 0 21426 NULL
111256 +tcp_bound_to_half_wnd_21429 tcp_bound_to_half_wnd 0-2 21429 NULL
111257 +tracing_saved_cmdlines_read_21434 tracing_saved_cmdlines_read 3 21434 NULL
111258 +aggr_size_tx_agg_vs_rate_read_21438 aggr_size_tx_agg_vs_rate_read 3 21438 NULL
111259 +__ertm_hdr_size_21450 __ertm_hdr_size 0 21450 NULL
111260 +ReadISAR_21453 ReadISAR 0 21453 NULL
111261 +mei_nfc_send_21477 mei_nfc_send 3 21477 NULL
111262 +read_file_xmit_21487 read_file_xmit 3 21487 NULL
111263 +mmc_alloc_sg_21504 mmc_alloc_sg 1 21504 NULL
111264 +btrfs_file_aio_write_21520 btrfs_file_aio_write 4 21520 NULL
111265 +il_dbgfs_stations_read_21532 il_dbgfs_stations_read 3 21532 NULL
111266 +cipso_v4_map_cat_enum_hton_21540 cipso_v4_map_cat_enum_hton 0 21540 NULL
111267 +rxrpc_send_data_21553 rxrpc_send_data 5 21553 NULL
111268 +rx_rx_beacon_early_term_read_21559 rx_rx_beacon_early_term_read 3 21559 NULL
111269 +xfs_buf_read_uncached_21585 xfs_buf_read_uncached 3 21585 NULL
111270 +snd_es18xx_mixer_read_21586 snd_es18xx_mixer_read 0 21586 NULL
111271 +ocfs2_acl_from_xattr_21604 ocfs2_acl_from_xattr 2 21604 NULL
111272 +filemap_get_page_21606 filemap_get_page 2 21606 NULL
111273 +gfs2_glock_nq_init_21624 gfs2_glock_nq_init 0 21624 NULL
111274 +__jfs_getxattr_21631 __jfs_getxattr 0 21631 NULL
111275 +atalk_sendmsg_21677 atalk_sendmsg 4 21677 NULL
111276 +ocfs2_xattr_get_nolock_21678 ocfs2_xattr_get_nolock 0 21678 NULL
111277 +rtllib_alloc_txb_21687 rtllib_alloc_txb 1 21687 NULL
111278 +evdev_ioctl_handler_21705 evdev_ioctl_handler 2 21705 NULL
111279 +xfs_btree_insert_21712 xfs_btree_insert 0 21712 NULL
111280 +update_time_21719 update_time 0 21719 NULL
111281 +unix_skb_len_21722 unix_skb_len 0 21722 NULL
111282 +lprocfs_wr_import_21728 lprocfs_wr_import 3 21728 NULL
111283 +mthca_alloc_init_21754 mthca_alloc_init 2 21754 NULL
111284 +usbat_flash_read_data_21762 usbat_flash_read_data 4 21762 NULL
111285 +gen_pool_add_21776 gen_pool_add 3 21776 NULL
111286 +xfs_da_grow_inode_int_21785 xfs_da_grow_inode_int 3 21785 NULL
111287 +dvb_generic_ioctl_21810 dvb_generic_ioctl 2 21810 NULL
111288 +__ocfs2_cluster_lock_21812 __ocfs2_cluster_lock 0 21812 NULL
111289 +_iwl_dbgfs_sta_drain_write_21837 _iwl_dbgfs_sta_drain_write 3 21837 NULL
111290 +oom_adj_read_21847 oom_adj_read 3 21847 NULL
111291 +lpfc_idiag_extacc_avail_get_21865 lpfc_idiag_extacc_avail_get 0-3 21865 NULL
111292 +brcms_debugfs_hardware_read_21867 brcms_debugfs_hardware_read 3 21867 NULL
111293 +sisusbcon_bmove_21873 sisusbcon_bmove 6-5-7 21873 NULL
111294 +ldlm_lock_create_21888 ldlm_lock_create 7 21888 NULL
111295 +dbAllocCtl_21911 dbAllocCtl 0 21911 NULL
111296 +qsfp_1_read_21915 qsfp_1_read 3 21915 NULL
111297 +__build_xattrs_21979 __build_xattrs 0 21979 NULL
111298 +SYSC_prctl_21980 SYSC_prctl 4 21980 NULL
111299 +compat_rw_copy_check_uvector_22001 compat_rw_copy_check_uvector 0-3 22001 NULL nohasharray
111300 +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
111301 +regcache_sync_block_raw_flush_22021 regcache_sync_block_raw_flush 3-4 22021 NULL
111302 +btrfs_get_16_22023 btrfs_get_16 0 22023 NULL
111303 +_sp2d_min_pg_22032 _sp2d_min_pg 0 22032 NULL
111304 +lookup_metapath_22039 lookup_metapath 0 22039 NULL
111305 +zd_usb_read_fw_22049 zd_usb_read_fw 4 22049 NULL
111306 +ieee80211_if_fmt_dropped_frames_ttl_22054 ieee80211_if_fmt_dropped_frames_ttl 3 22054 NULL
111307 +btrfs_reloc_clone_csums_22077 btrfs_reloc_clone_csums 2-3 22077 NULL
111308 +mem_rw_22085 mem_rw 3 22085 NULL
111309 +xfs_bmapi_reserve_delalloc_22086 xfs_bmapi_reserve_delalloc 0 22086 NULL
111310 +kstrtos32_from_user_22087 kstrtos32_from_user 2 22087 NULL
111311 +rt2x00debug_read_crypto_stats_22109 rt2x00debug_read_crypto_stats 3 22109 NULL
111312 +shmem_add_to_page_cache_22121 shmem_add_to_page_cache 0 22121 NULL
111313 +snd_hda_codec_read_22130 snd_hda_codec_read 0 22130 NULL
111314 +SyS_sched_setaffinity_22148 SyS_sched_setaffinity 2 22148 NULL
111315 +do_tcp_sendpages_22155 do_tcp_sendpages 4 22155 NULL
111316 +__kfifo_alloc_22173 __kfifo_alloc 3 22173 NULL
111317 +rfcomm_sock_recvmsg_22227 rfcomm_sock_recvmsg 4 22227 NULL
111318 +mem_write_22232 mem_write 3 22232 NULL
111319 +p9_virtio_zc_request_22240 p9_virtio_zc_request 6-5 22240 NULL
111320 +prepare_to_wait_event_22247 prepare_to_wait_event 0 22247 NULL
111321 +compat_process_vm_rw_22254 compat_process_vm_rw 3-5 22254 NULL
111322 +ping_common_sendmsg_22261 ping_common_sendmsg 5 22261 NULL
111323 +add_res_tree_22263 add_res_tree 7 22263 NULL
111324 +__btrfs_direct_write_22273 __btrfs_direct_write 4-0 22273 NULL
111325 +queue_max_sectors_22280 queue_max_sectors 0 22280 NULL
111326 +__tun_chr_ioctl_22300 __tun_chr_ioctl 4 22300 NULL nohasharray
111327 +pci_vpd_srdt_size_22300 pci_vpd_srdt_size 0 22300 &__tun_chr_ioctl_22300
111328 +mesh_table_alloc_22305 mesh_table_alloc 1 22305 NULL
111329 +lov_setstripe_22307 lov_setstripe 2 22307 NULL
111330 +udpv6_sendmsg_22316 udpv6_sendmsg 4 22316 NULL
111331 +atomic_read_22342 atomic_read 0 22342 NULL
111332 +ll_lazystatfs_seq_write_22353 ll_lazystatfs_seq_write 3 22353 NULL
111333 +snd_pcm_alsa_frames_22363 snd_pcm_alsa_frames 2 22363 NULL
111334 +evdev_ioctl_22371 evdev_ioctl 2 22371 NULL
111335 +alloc_large_system_hash_22391 alloc_large_system_hash 2 22391 NULL
111336 +zoran_write_22404 zoran_write 3 22404 NULL
111337 +queue_reply_22416 queue_reply 3 22416 NULL
111338 +__set_enter_print_fmt_22431 __set_enter_print_fmt 0 22431 NULL
111339 +queue_max_segments_22441 queue_max_segments 0 22441 NULL
111340 +handle_received_packet_22457 handle_received_packet 3 22457 NULL
111341 +ecryptfs_write_22488 ecryptfs_write 4-3 22488 NULL
111342 +qib_user_sdma_alloc_header_22490 qib_user_sdma_alloc_header 2 22490 NULL
111343 +cache_write_procfs_22491 cache_write_procfs 3 22491 NULL
111344 +mutex_lock_interruptible_22505 mutex_lock_interruptible 0 22505 NULL
111345 +trim_no_bitmap_22524 trim_no_bitmap 4-3 22524 NULL
111346 +ocfs2_read_extent_block_22550 ocfs2_read_extent_block 0 22550 NULL
111347 +agp_alloc_page_array_22554 agp_alloc_page_array 1 22554 NULL
111348 +dbFindCtl_22587 dbFindCtl 0 22587 NULL
111349 +snapshot_read_22601 snapshot_read 3 22601 NULL
111350 +sctp_setsockopt_connectx_old_22631 sctp_setsockopt_connectx_old 3 22631 NULL
111351 +ide_core_cp_entry_22636 ide_core_cp_entry 3 22636 NULL
111352 +wl1271_rx_filter_get_fields_size_22638 wl1271_rx_filter_get_fields_size 0 22638 NULL
111353 +pwr_wake_on_timer_exp_read_22640 pwr_wake_on_timer_exp_read 3 22640 NULL
111354 +iwl_dbgfs_calib_disabled_read_22649 iwl_dbgfs_calib_disabled_read 3 22649 NULL
111355 +ext4_ext_direct_IO_22679 ext4_ext_direct_IO 4 22679 NULL
111356 +l2tp_ip_recvmsg_22681 l2tp_ip_recvmsg 4 22681 NULL
111357 +bch_dump_read_22685 bch_dump_read 3 22685 NULL
111358 +reg_umr_22686 reg_umr 5 22686 NULL
111359 +alloc_libipw_22708 alloc_libipw 1 22708 NULL
111360 +cx18_copy_buf_to_user_22735 cx18_copy_buf_to_user 4-0 22735 NULL
111361 +ceph_decode_32_22738 ceph_decode_32 0 22738 NULL nohasharray
111362 +__mei_cl_send_22738 __mei_cl_send 3 22738 &ceph_decode_32_22738
111363 +__writeback_single_inode_22739 __writeback_single_inode 0 22739 NULL
111364 +iio_debugfs_write_reg_22742 iio_debugfs_write_reg 3 22742 NULL
111365 +qlcnic_sriov_init_22762 qlcnic_sriov_init 2 22762 NULL
111366 +print_frame_22769 print_frame 0 22769 NULL
111367 +ftrace_arch_read_dyn_info_22773 ftrace_arch_read_dyn_info 0 22773 NULL
111368 +__break_lease_22777 __break_lease 0 22777 NULL
111369 +vnic_dev_get_res_count_22791 vnic_dev_get_res_count 0 22791 NULL
111370 +pla_ocp_write_22802 pla_ocp_write 4 22802 NULL
111371 +__generic_copy_to_user_intel_22806 __generic_copy_to_user_intel 0-3 22806 NULL
111372 +read_file_rcstat_22854 read_file_rcstat 3 22854 NULL
111373 +create_attr_set_22861 create_attr_set 1 22861 NULL
111374 +hash_ip6_expire_22867 hash_ip6_expire 4 22867 NULL
111375 +vmw_execbuf_process_22885 vmw_execbuf_process 5 22885 NULL
111376 +usblp_new_writeurb_22894 usblp_new_writeurb 2 22894 NULL
111377 +mdc800_device_read_22896 mdc800_device_read 3 22896 NULL
111378 +ion_handle_test_kernel_22900 ion_handle_test_kernel 4-3 22900 NULL nohasharray
111379 +policy_emit_config_values_22900 policy_emit_config_values 3 22900 &ion_handle_test_kernel_22900
111380 +__set_xattr_22923 __set_xattr 0 22923 NULL
111381 +xstateregs_set_22932 xstateregs_set 4 22932 NULL
111382 +pcpu_mem_zalloc_22948 pcpu_mem_zalloc 1 22948 NULL
111383 +alloc_sglist_22960 alloc_sglist 2-3 22960 NULL
111384 +caif_seqpkt_sendmsg_22961 caif_seqpkt_sendmsg 4 22961 NULL
111385 +vme_get_size_22964 vme_get_size 0 22964 NULL
111386 +tx_frag_key_not_found_read_22971 tx_frag_key_not_found_read 3 22971 NULL
111387 +cached_dev_cache_miss_22979 cached_dev_cache_miss 4 22979 NULL
111388 +usb_get_langid_22983 usb_get_langid 0 22983 NULL
111389 +remote_settings_file_write_22987 remote_settings_file_write 3 22987 NULL
111390 +viafb_dvp0_proc_write_23023 viafb_dvp0_proc_write 3 23023 NULL
111391 +cifs_local_to_utf16_bytes_23025 cifs_local_to_utf16_bytes 0 23025 NULL
111392 +ocfs2_refcount_cow_xattr_23029 ocfs2_refcount_cow_xattr 0 23029 NULL
111393 +st_status_23032 st_status 5 23032 NULL
111394 +nv50_disp_chan_create__23056 nv50_disp_chan_create_ 5 23056 NULL
111395 +comedi_buf_write_n_available_23057 comedi_buf_write_n_available 0 23057 NULL
111396 +security_inode_killpriv_23060 security_inode_killpriv 0 23060 NULL
111397 +reiserfs_add_entry_23062 reiserfs_add_entry 4 23062 NULL nohasharray
111398 +unix_seqpacket_recvmsg_23062 unix_seqpacket_recvmsg 4 23062 &reiserfs_add_entry_23062
111399 +mei_cl_send_23068 mei_cl_send 3 23068 NULL
111400 +kvm_mmu_gva_to_gpa_write_23075 kvm_mmu_gva_to_gpa_write 0 23075 NULL
111401 +raw_sendmsg_23078 raw_sendmsg 4 23078 NULL
111402 +get_user_hdr_len_23079 get_user_hdr_len 0 23079 NULL
111403 +isr_tx_procs_read_23084 isr_tx_procs_read 3 23084 NULL
111404 +rt2x00debug_write_eeprom_23091 rt2x00debug_write_eeprom 3 23091 NULL
111405 +ntfs_ucstonls_23097 ntfs_ucstonls 3-5 23097 NULL
111406 +xfs_dir_ialloc_23100 xfs_dir_ialloc 0 23100 NULL
111407 +pipe_iov_copy_from_user_23102 pipe_iov_copy_from_user 3 23102 NULL
111408 +dgram_recvmsg_23104 dgram_recvmsg 4 23104 NULL
111409 +mwl8k_cmd_set_beacon_23110 mwl8k_cmd_set_beacon 4 23110 NULL
111410 +nl80211_send_rx_auth_23111 nl80211_send_rx_auth 4 23111 NULL nohasharray
111411 +bset_tree_bytes_23111 bset_tree_bytes 0 23111 &nl80211_send_rx_auth_23111
111412 +__clear_user_23118 __clear_user 0-2 23118 NULL
111413 +drm_mode_create_tv_properties_23122 drm_mode_create_tv_properties 2 23122 NULL
111414 +ata_scsi_change_queue_depth_23126 ata_scsi_change_queue_depth 2 23126 NULL
111415 +read_file_ani_23161 read_file_ani 3 23161 NULL
111416 +usblp_write_23178 usblp_write 3 23178 NULL
111417 +gss_pipe_downcall_23182 gss_pipe_downcall 3 23182 NULL
111418 +mpi_alloc_limb_space_23190 mpi_alloc_limb_space 1 23190 NULL
111419 +tty_buffer_request_room_23228 tty_buffer_request_room 2-0 23228 NULL
111420 +xlog_get_bp_23229 xlog_get_bp 2 23229 NULL nohasharray
111421 +__read_status_pci_23229 __read_status_pci 0 23229 &xlog_get_bp_23229
111422 +ft1000_read_dpram_mag_32_23232 ft1000_read_dpram_mag_32 0 23232 NULL
111423 +rxrpc_client_sendmsg_23236 rxrpc_client_sendmsg 5 23236 NULL
111424 +__gfn_to_rmap_23240 __gfn_to_rmap 2-1 23240 NULL
111425 +nv50_ram_create__23241 nv50_ram_create_ 4 23241 NULL
111426 +sctp_recvmsg_23265 sctp_recvmsg 4 23265 NULL
111427 +uwb_dev_addr_print_23282 uwb_dev_addr_print 2 23282 NULL
111428 +diva_get_trace_filter_23286 diva_get_trace_filter 0 23286 NULL
111429 +i2cdev_write_23310 i2cdev_write 3 23310 NULL
111430 +__aa_kvmalloc_23320 __aa_kvmalloc 1 23320 NULL
111431 +page_readlink_23346 page_readlink 3 23346 NULL
111432 +kmem_zalloc_large_23351 kmem_zalloc_large 1 23351 NULL
111433 +get_dst_timing_23358 get_dst_timing 0 23358 NULL nohasharray
111434 +write_inode_23358 write_inode 0 23358 &get_dst_timing_23358
111435 +fd_setup_write_same_buf_23369 fd_setup_write_same_buf 3 23369 NULL
111436 +iscsi_change_queue_depth_23416 iscsi_change_queue_depth 2 23416 NULL
111437 +vga_mm_r_23419 vga_mm_r 0 23419 NULL
111438 +ocfs2_zero_tail_23447 ocfs2_zero_tail 3 23447 NULL
111439 +hidraw_send_report_23449 hidraw_send_report 3 23449 NULL
111440 +__ata_change_queue_depth_23484 __ata_change_queue_depth 3 23484 NULL
111441 +linear_conf_23485 linear_conf 2 23485 NULL nohasharray
111442 +sync_mapping_buffers_23485 sync_mapping_buffers 0 23485 &linear_conf_23485
111443 +event_filter_read_23494 event_filter_read 3 23494 NULL
111444 +lustre_acl_xattr_merge2ext_23502 lustre_acl_xattr_merge2ext 2 23502 NULL
111445 +devm_iio_device_alloc_23511 devm_iio_device_alloc 2 23511 NULL
111446 +__proc_cpt_table_23516 __proc_cpt_table 5 23516 NULL
111447 +ima_show_measurements_count_23536 ima_show_measurements_count 3 23536 NULL
111448 +tcp_current_mss_23552 tcp_current_mss 0 23552 NULL
111449 +btrfs_super_bytenr_23561 btrfs_super_bytenr 0 23561 NULL
111450 +venus_symlink_23570 venus_symlink 6-4 23570 NULL
111451 +iwl_dbgfs_interrupt_read_23574 iwl_dbgfs_interrupt_read 3 23574 NULL
111452 +xfpregs_get_23586 xfpregs_get 4 23586 NULL
111453 +snd_interval_min_23590 snd_interval_min 0 23590 NULL
111454 +islpci_mgt_transaction_23610 islpci_mgt_transaction 5 23610 NULL
111455 +xfs_qm_dqread_23613 xfs_qm_dqread 0 23613 NULL
111456 +ocfs2_journal_access_23616 ocfs2_journal_access 0 23616 NULL
111457 +__i2400mu_send_barker_23652 __i2400mu_send_barker 3 23652 NULL
111458 +sInW_23663 sInW 0 23663 NULL
111459 +SyS_connect_23669 SyS_connect 3 23669 NULL
111460 +cx18_read_23699 cx18_read 3 23699 NULL
111461 +at_get_23708 at_get 0 23708 NULL
111462 +rx_rx_dropped_frame_read_23748 rx_rx_dropped_frame_read 3 23748 NULL
111463 +__kfifo_max_r_23768 __kfifo_max_r 0-2-1 23768 NULL
111464 +__build_packet_message_23778 __build_packet_message 4-10 23778 NULL
111465 +security_inode_getxattr_23781 security_inode_getxattr 0 23781 NULL
111466 +cfg80211_inform_bss_width_frame_23782 cfg80211_inform_bss_width_frame 5 23782 NULL
111467 +mpt_free_res_23793 mpt_free_res 5 23793 NULL
111468 +map_write_23795 map_write 3 23795 NULL
111469 +rx_path_reset_read_23801 rx_path_reset_read 3 23801 NULL
111470 +ocfs2_replace_cow_23803 ocfs2_replace_cow 0 23803 NULL
111471 +__earlyonly_bootmem_alloc_23824 __earlyonly_bootmem_alloc 2 23824 NULL
111472 +lustre_msg_buflen_23827 lustre_msg_buflen 0 23827 NULL
111473 +ceph_copy_page_vector_to_user_23829 ceph_copy_page_vector_to_user 0-4-3 23829 NULL
111474 +pgdat_end_pfn_23842 pgdat_end_pfn 0 23842 NULL
111475 +iwl_dbgfs_nvm_read_23845 iwl_dbgfs_nvm_read 3 23845 NULL
111476 +p54_init_common_23850 p54_init_common 1 23850 NULL
111477 +bin_to_hex_dup_23853 bin_to_hex_dup 2 23853 NULL
111478 +ocfs2_xattr_get_clusters_23857 ocfs2_xattr_get_clusters 0 23857 NULL
111479 +ieee80211_if_read_dot11MeshMaxPeerLinks_23878 ieee80211_if_read_dot11MeshMaxPeerLinks 3 23878 NULL
111480 +writeback_single_inode_23881 writeback_single_inode 0 23881 NULL nohasharray
111481 +nouveau_clock_create__23881 nouveau_clock_create_ 5 23881 &writeback_single_inode_23881
111482 +tipc_snprintf_23893 tipc_snprintf 2-0 23893 NULL
111483 +add_new_gdb_meta_bg_23911 add_new_gdb_meta_bg 3 23911 NULL nohasharray
111484 +ieee80211_if_read_hw_queues_23911 ieee80211_if_read_hw_queues 3 23911 &add_new_gdb_meta_bg_23911
111485 +f2fs_getxattr_23917 f2fs_getxattr 0 23917 NULL
111486 +mpihelp_mul_karatsuba_case_23918 mpihelp_mul_karatsuba_case 5-3 23918 NULL nohasharray
111487 +ipath_reg_phys_mr_23918 ipath_reg_phys_mr 3 23918 &mpihelp_mul_karatsuba_case_23918
111488 +kvm_read_guest_23928 kvm_read_guest 4-2 23928 NULL
111489 +uvc_endpoint_max_bpi_23944 uvc_endpoint_max_bpi 0 23944 NULL
111490 +cifs_setxattr_23957 cifs_setxattr 4 23957 NULL
111491 +size_roundup_power2_23958 size_roundup_power2 0-1 23958 NULL
111492 +sddr55_write_data_23983 sddr55_write_data 4 23983 NULL
111493 +zd_usb_iowrite16v_async_23984 zd_usb_iowrite16v_async 3 23984 NULL
111494 +cxgb_alloc_mem_24007 cxgb_alloc_mem 1 24007 NULL
111495 +give_pages_24021 give_pages 3 24021 NULL
111496 +adis16400_show_serial_number_24037 adis16400_show_serial_number 3 24037 NULL
111497 +hmac_setkey_24043 hmac_setkey 3 24043 NULL
111498 +afs_cell_alloc_24052 afs_cell_alloc 2 24052 NULL
111499 +blkcipher_copy_iv_24075 blkcipher_copy_iv 3 24075 NULL
111500 +vb2_fop_read_24080 vb2_fop_read 3 24080 NULL
111501 +pipeline_post_proc_swi_read_24108 pipeline_post_proc_swi_read 3 24108 NULL
111502 +request_key_auth_read_24109 request_key_auth_read 3 24109 NULL
111503 +lov_brw_24122 lov_brw 4 24122 NULL
111504 +mpu401_read_24126 mpu401_read 3-0 24126 NULL
111505 +_picolcd_flash_write_24134 _picolcd_flash_write 4 24134 NULL
111506 +irnet_ctrl_write_24139 irnet_ctrl_write 3 24139 NULL nohasharray
111507 +xfs_btree_increment_24139 xfs_btree_increment 0 24139 &irnet_ctrl_write_24139
111508 +SyS_sethostname_24150 SyS_sethostname 2 24150 NULL
111509 +trim_bitmaps_24158 trim_bitmaps 3 24158 NULL
111510 +adu_read_24177 adu_read 3 24177 NULL
111511 +safe_prepare_write_buffer_24187 safe_prepare_write_buffer 3 24187 NULL
111512 +irq_remapping_setup_msi_irqs_24194 irq_remapping_setup_msi_irqs 2 24194 NULL
111513 +ieee80211_if_read_dot11MeshHWMPpreqMinInterval_24208 ieee80211_if_read_dot11MeshHWMPpreqMinInterval 3 24208 NULL
111514 +tcpprobe_sprint_24222 tcpprobe_sprint 0-2 24222 NULL
111515 +pcpu_embed_first_chunk_24224 pcpu_embed_first_chunk 3-2-1 24224 NULL nohasharray
111516 +mei_amthif_read_24224 mei_amthif_read 4 24224 &pcpu_embed_first_chunk_24224
111517 +pci_num_vf_24235 pci_num_vf 0 24235 NULL
111518 +sel_read_bool_24236 sel_read_bool 3 24236 NULL
111519 +xfs_bmap_rtalloc_24237 xfs_bmap_rtalloc 0 24237 NULL
111520 +em28xx_alloc_urbs_24260 em28xx_alloc_urbs 4-6 24260 NULL
111521 +calculate_sizes_24273 calculate_sizes 2 24273 NULL
111522 +thin_status_24278 thin_status 5 24278 NULL
111523 +msg_size_24288 msg_size 0 24288 NULL
111524 +gserial_connect_24302 gserial_connect 0 24302 NULL
111525 +btmrvl_pscmd_read_24308 btmrvl_pscmd_read 3 24308 NULL
111526 +reserve_metadata_bytes_24313 reserve_metadata_bytes 0 24313 NULL
111527 +ath6kl_add_bss_if_needed_24317 ath6kl_add_bss_if_needed 6 24317 NULL
111528 +si476x_radio_read_acf_blob_24336 si476x_radio_read_acf_blob 3 24336 NULL
111529 +prepare_pages_24349 prepare_pages 0 24349 NULL
111530 +kzalloc_node_24352 kzalloc_node 1 24352 NULL
111531 +qla2x00_handle_queue_full_24365 qla2x00_handle_queue_full 2 24365 NULL
111532 +cfi_read_pri_24366 cfi_read_pri 3 24366 NULL
111533 +btrfs_item_size_nr_24367 btrfs_item_size_nr 0 24367 NULL
111534 +igetword_24373 igetword 0 24373 NULL nohasharray
111535 +break_deleg_24373 break_deleg 0 24373 &igetword_24373
111536 +max_io_len_24384 max_io_len 0-1 24384 NULL
111537 +mpt_alloc_res_24387 mpt_alloc_res 5 24387 NULL
111538 +xfs_bmapi_read_24392 xfs_bmapi_read 0 24392 NULL
111539 +osc_cur_grant_bytes_seq_write_24396 osc_cur_grant_bytes_seq_write 3 24396 NULL
111540 +getxattr_24398 getxattr 4 24398 NULL nohasharray
111541 +pvr2_v4l2_ioctl_24398 pvr2_v4l2_ioctl 2 24398 &getxattr_24398
111542 +blk_update_bidi_request_24415 blk_update_bidi_request 3-4 24415 NULL
111543 +nvme_trans_log_supp_pages_24418 nvme_trans_log_supp_pages 3 24418 NULL
111544 +b43_debugfs_read_24425 b43_debugfs_read 3 24425 NULL
111545 +xenbus_file_read_24427 xenbus_file_read 3 24427 NULL
111546 +ieee80211_rx_mgmt_beacon_24430 ieee80211_rx_mgmt_beacon 3 24430 NULL
111547 +copy_and_ioctl_24434 copy_and_ioctl 4 24434 NULL
111548 +ixgbe_alloc_q_vector_24439 ixgbe_alloc_q_vector 4-6 24439 NULL
111549 +smk_user_access_24440 smk_user_access 3 24440 NULL nohasharray
111550 +rtw_set_wps_assoc_resp_24440 rtw_set_wps_assoc_resp 3 24440 &smk_user_access_24440
111551 +evdev_do_ioctl_24459 evdev_do_ioctl 2 24459 NULL
111552 +lbs_highsnr_write_24460 lbs_highsnr_write 3 24460 NULL
111553 +skb_copy_and_csum_datagram_iovec_24466 skb_copy_and_csum_datagram_iovec 2 24466 NULL
111554 +dut_mode_read_24489 dut_mode_read 3 24489 NULL
111555 +read_file_spec_scan_ctl_24491 read_file_spec_scan_ctl 3 24491 NULL
111556 +pd_video_read_24510 pd_video_read 3 24510 NULL
111557 +request_key_with_auxdata_24515 request_key_with_auxdata 4 24515 NULL
111558 +xfs_buf_get_map_24522 xfs_buf_get_map 3 24522 NULL
111559 +do_mpage_readpage_24536 do_mpage_readpage 3 24536 NULL
111560 +write_cache_pages_24562 write_cache_pages 0 24562 NULL
111561 +SyS_pselect6_24582 SyS_pselect6 1 24582 NULL
111562 +udf_compute_nr_groups_24594 udf_compute_nr_groups 0 24594 NULL
111563 +sensor_hub_get_physical_device_count_24605 sensor_hub_get_physical_device_count 0 24605 NULL nohasharray
111564 +lov_alloc_memmd_24605 lov_alloc_memmd 2 24605 &sensor_hub_get_physical_device_count_24605
111565 +SyS_poll_24620 SyS_poll 2 24620 NULL
111566 +context_alloc_24645 context_alloc 3 24645 NULL
111567 +blk_rq_err_bytes_24650 blk_rq_err_bytes 0 24650 NULL
111568 +xfs_log_commit_cil_24653 xfs_log_commit_cil 0 24653 NULL
111569 +btrfs_check_data_free_space_24692 btrfs_check_data_free_space 0 24692 NULL
111570 +datafab_write_data_24696 datafab_write_data 4 24696 NULL
111571 +intelfbhw_get_p1p2_24703 intelfbhw_get_p1p2 2 24703 NULL
111572 +simple_attr_read_24738 simple_attr_read 3 24738 NULL
111573 +qla2x00_change_queue_depth_24742 qla2x00_change_queue_depth 2 24742 NULL
111574 +get_dma_residue_24749 get_dma_residue 0 24749 NULL
111575 +kgdb_hex2mem_24755 kgdb_hex2mem 3 24755 NULL
111576 +ocfs2_read_blocks_24777 ocfs2_read_blocks 0 24777 NULL
111577 +datablob_hmac_verify_24786 datablob_hmac_verify 4 24786 NULL
111578 +cache_read_24790 cache_read 3 24790 NULL
111579 +user_regset_copyout_24796 user_regset_copyout 7 24796 NULL
111580 +kvm_read_guest_virt_helper_24804 kvm_read_guest_virt_helper 3-1 24804 NULL
111581 +ath6kl_fwlog_mask_write_24810 ath6kl_fwlog_mask_write 3 24810 NULL
111582 +net2272_read_24825 net2272_read 0 24825 NULL
111583 +snd_als4k_gcr_read_24840 snd_als4k_gcr_read 0 24840 NULL
111584 +snd_pcm_lib_buffer_bytes_24865 snd_pcm_lib_buffer_bytes 0 24865 NULL
111585 +pnp_alloc_24869 pnp_alloc 1 24869 NULL nohasharray
111586 +l2cap_create_basic_pdu_24869 l2cap_create_basic_pdu 3 24869 &pnp_alloc_24869
111587 +queues_read_24877 queues_read 3 24877 NULL
111588 +__vxge_hw_vp_initialize_24885 __vxge_hw_vp_initialize 2 24885 NULL
111589 +xfs_qm_dqattach_24898 xfs_qm_dqattach 0 24898 NULL
111590 +codec_list_read_file_24910 codec_list_read_file 3 24910 NULL
111591 +__btrfs_free_extent_24927 __btrfs_free_extent 7 24927 NULL nohasharray
111592 +v4l2_ctrl_new_24927 v4l2_ctrl_new 7 24927 &__btrfs_free_extent_24927
111593 +ocfs2_fiemap_24949 ocfs2_fiemap 4-3 24949 NULL
111594 +packet_sendmsg_24954 packet_sendmsg 4 24954 NULL
111595 +twl_i2c_write_u8_24976 twl_i2c_write_u8 3 24976 NULL
111596 +llc_ui_sendmsg_24987 llc_ui_sendmsg 4 24987 NULL
111597 +slot_get_24999 slot_get 0 24999 NULL
111598 +key_conf_hw_key_idx_read_25003 key_conf_hw_key_idx_read 3 25003 NULL
111599 +il_dbgfs_channels_read_25005 il_dbgfs_channels_read 3 25005 NULL
111600 +ni_660x_num_counters_25031 ni_660x_num_counters 0 25031 NULL
111601 +nfs_dns_resolve_name_25036 nfs_dns_resolve_name 3 25036 NULL
111602 +load_unaligned_zeropad_25050 load_unaligned_zeropad 0 25050 NULL
111603 +btrfs_stack_key_blockptr_25058 btrfs_stack_key_blockptr 0 25058 NULL
111604 +gs_buf_alloc_25067 gs_buf_alloc 2 25067 NULL
111605 +ll_track_pid_seq_write_25068 ll_track_pid_seq_write 3 25068 NULL
111606 +SYSC_listxattr_25072 SYSC_listxattr 3 25072 NULL
111607 +ima_appraise_measurement_25093 ima_appraise_measurement 6 25093 NULL
111608 +snd_rawmidi_kernel_write_25106 snd_rawmidi_kernel_write 3 25106 NULL
111609 +gfs2_quota_check_25130 gfs2_quota_check 0 25130 NULL
111610 +ipath_init_qp_table_25167 ipath_init_qp_table 2 25167 NULL
111611 +kvm_mmu_notifier_change_pte_25169 kvm_mmu_notifier_change_pte 3 25169 NULL
111612 +sctp_getsockopt_local_addrs_25178 sctp_getsockopt_local_addrs 2 25178 NULL
111613 +mon_stat_read_25238 mon_stat_read 3 25238 NULL
111614 +stripe_status_25259 stripe_status 5 25259 NULL
111615 +snd_pcm_start_25273 snd_pcm_start 0 25273 NULL
111616 +crypto_alloc_instance2_25277 crypto_alloc_instance2 3 25277 NULL
111617 +vfs_writev_25278 vfs_writev 3 25278 NULL
111618 +l2tp_session_create_25286 l2tp_session_create 1 25286 NULL
111619 +ath9k_debugfs_read_buf_25316 ath9k_debugfs_read_buf 3 25316 NULL
111620 +rng_buffer_size_25348 rng_buffer_size 0 25348 NULL
111621 +SYSC_kexec_load_25361 SYSC_kexec_load 2 25361 NULL
111622 +unix_mkname_25368 unix_mkname 0-2 25368 NULL
111623 +sel_read_mls_25369 sel_read_mls 3 25369 NULL
111624 +vsp1_entity_init_25407 vsp1_entity_init 3 25407 NULL
111625 +xfs_ialloc_pagi_init_25411 xfs_ialloc_pagi_init 0 25411 NULL
111626 +dai_list_read_file_25421 dai_list_read_file 3 25421 NULL
111627 +xfs_qm_dqtobp_25448 xfs_qm_dqtobp 0 25448 NULL
111628 +generic_file_buffered_write_25464 generic_file_buffered_write 4-0-7 25464 NULL
111629 +crypto_hash_digestsize_25469 crypto_hash_digestsize 0 25469 NULL
111630 +ivtv_buf_copy_from_user_25502 ivtv_buf_copy_from_user 4-0 25502 NULL
111631 +snd_pcm_plugin_build_25505 snd_pcm_plugin_build 5 25505 NULL
111632 +xfs_alloc_fix_freelist_25514 xfs_alloc_fix_freelist 0 25514 NULL
111633 +sb_permission_25523 sb_permission 0 25523 NULL
111634 +ext3_get_inode_loc_25542 ext3_get_inode_loc 0 25542 NULL
111635 +ieee80211_if_read_path_refresh_time_25545 ieee80211_if_read_path_refresh_time 3 25545 NULL
111636 +wimax_addr_scnprint_25548 wimax_addr_scnprint 2 25548 NULL
111637 +ht_print_chan_25556 ht_print_chan 0-3-4 25556 NULL
111638 +skb_tailroom_25567 skb_tailroom 0 25567 NULL
111639 +ping_recvmsg_25597 ping_recvmsg 4 25597 NULL
111640 +copy_user_generic_25611 copy_user_generic 0 25611 NULL
111641 +proc_coredump_filter_write_25625 proc_coredump_filter_write 3 25625 NULL
111642 +befs_utf2nls_25628 befs_utf2nls 3 25628 NULL nohasharray
111643 +__get_user_pages_25628 __get_user_pages 0 25628 &befs_utf2nls_25628
111644 +__direct_map_25647 __direct_map 5-6 25647 NULL
111645 +aircable_prepare_write_buffer_25669 aircable_prepare_write_buffer 3 25669 NULL
111646 +lpfc_idiag_cmd_get_25672 lpfc_idiag_cmd_get 2 25672 NULL
111647 +sta_inactive_ms_read_25690 sta_inactive_ms_read 3 25690 NULL
111648 +rx_filter_mc_filter_read_25712 rx_filter_mc_filter_read 3 25712 NULL
111649 +ibmasm_new_command_25714 ibmasm_new_command 2 25714 NULL
111650 +__alloc_bootmem_low_node_25726 __alloc_bootmem_low_node 2 25726 NULL nohasharray
111651 +sel_write_context_25726 sel_write_context 3 25726 &__alloc_bootmem_low_node_25726
111652 +cxgbi_device_portmap_create_25747 cxgbi_device_portmap_create 3 25747 NULL
111653 +event_rx_pool_read_25792 event_rx_pool_read 3 25792 NULL
111654 +sg_read_25799 sg_read 3 25799 NULL
111655 +xfs_alloc_ag_vextent_exact_25810 xfs_alloc_ag_vextent_exact 0 25810 NULL
111656 +system_enable_read_25815 system_enable_read 3 25815 NULL
111657 +realloc_buffer_25816 realloc_buffer 2 25816 NULL
111658 +pwr_missing_bcns_read_25824 pwr_missing_bcns_read 3 25824 NULL
111659 +parport_read_25855 parport_read 0 25855 NULL
111660 +xfs_dir2_sf_hdr_size_25858 xfs_dir2_sf_hdr_size 0 25858 NULL
111661 +key_attr_size_25865 key_attr_size 0 25865 NULL
111662 +ath6kl_regread_read_25884 ath6kl_regread_read 3 25884 NULL
111663 +run_delalloc_nocow_25896 run_delalloc_nocow 3-4 25896 NULL
111664 +sisusbcon_scroll_area_25899 sisusbcon_scroll_area 4-3 25899 NULL
111665 +lpfc_change_queue_depth_25905 lpfc_change_queue_depth 2 25905 NULL
111666 +nvme_trans_mode_page_create_25908 nvme_trans_mode_page_create 7-4 25908 NULL
111667 +do_jffs2_setxattr_25910 do_jffs2_setxattr 5 25910 NULL
111668 +rcname_read_25919 rcname_read 3 25919 NULL
111669 +snd_es1938_capture_copy_25930 snd_es1938_capture_copy 5 25930 NULL
111670 +key_flags_read_25931 key_flags_read 3 25931 NULL
111671 +copy_play_buf_25932 copy_play_buf 3 25932 NULL
111672 +flush_25957 flush 2 25957 NULL
111673 +udp_setsockopt_25985 udp_setsockopt 5 25985 NULL
111674 +lustre_msg_buflen_v2_25997 lustre_msg_buflen_v2 0 25997 NULL
111675 +SyS_process_vm_readv_26019 SyS_process_vm_readv 3-5 26019 NULL
111676 +mptscsih_change_queue_depth_26036 mptscsih_change_queue_depth 2 26036 NULL
111677 +selinux_inode_post_setxattr_26037 selinux_inode_post_setxattr 4 26037 NULL
111678 +keyctl_update_key_26061 keyctl_update_key 3 26061 NULL
111679 +btrfs_wait_ordered_range_26086 btrfs_wait_ordered_range 0 26086 NULL
111680 +rx_rx_wa_density_dropped_frame_read_26095 rx_rx_wa_density_dropped_frame_read 3 26095 NULL
111681 +read_sb_page_26119 read_sb_page 5 26119 NULL
111682 +ath9k_hw_name_26146 ath9k_hw_name 3 26146 NULL
111683 +copy_oldmem_page_26164 copy_oldmem_page 3 26164 NULL
111684 +gfs2_xattr_acl_get_26166 gfs2_xattr_acl_get 0 26166 NULL nohasharray
111685 +ath6kl_roam_table_read_26166 ath6kl_roam_table_read 3 26166 &gfs2_xattr_acl_get_26166
111686 +disk_devt_26180 disk_devt 0 26180 NULL
111687 +cgroup_setxattr_26188 cgroup_setxattr 4 26188 NULL
111688 +ieee80211_if_fmt_dot11MeshTTL_26198 ieee80211_if_fmt_dot11MeshTTL 3 26198 NULL
111689 +xfs_idata_realloc_26199 xfs_idata_realloc 2 26199 NULL
111690 +mce_write_26201 mce_write 3 26201 NULL
111691 +mwifiex_regrdwr_write_26225 mwifiex_regrdwr_write 3 26225 NULL
111692 +_scsih_change_queue_depth_26230 _scsih_change_queue_depth 2 26230 NULL
111693 +rxrpc_recvmsg_26233 rxrpc_recvmsg 4 26233 NULL
111694 +simple_setattr_26234 simple_setattr 0 26234 NULL
111695 +genwqe_ffdc_buff_size_26263 genwqe_ffdc_buff_size 0 26263 NULL
111696 +crypto_ctxsize_26278 crypto_ctxsize 0 26278 NULL
111697 +apei_resources_request_26279 apei_resources_request 0 26279 NULL
111698 +wacom_set_device_mode_26280 wacom_set_device_mode 3 26280 NULL
111699 +snd_pcm_plug_client_channels_buf_26309 snd_pcm_plug_client_channels_buf 0-3 26309 NULL
111700 +pwr_wake_on_host_read_26321 pwr_wake_on_host_read 3 26321 NULL
111701 +check_can_nocow_26336 check_can_nocow 2 26336 NULL
111702 +snd_vx_check_reg_bit_26344 snd_vx_check_reg_bit 0 26344 NULL
111703 +ocfs2_duplicate_clusters_by_page_26357 ocfs2_duplicate_clusters_by_page 6-3 26357 NULL
111704 +cifs_readdata_alloc_26360 cifs_readdata_alloc 1 26360 NULL
111705 +invalidate_inode_pages2_range_26403 invalidate_inode_pages2_range 0 26403 NULL
111706 +ntty_write_26404 ntty_write 3 26404 NULL
111707 +firmware_store_26408 firmware_store 4 26408 NULL
111708 +pagemap_read_26441 pagemap_read 3 26441 NULL
111709 +tower_read_26461 tower_read 3 26461 NULL nohasharray
111710 +enc_pools_add_pages_26461 enc_pools_add_pages 1 26461 &tower_read_26461
111711 +ib_alloc_device_26483 ib_alloc_device 1 26483 NULL
111712 +ulong_write_file_26485 ulong_write_file 3 26485 NULL
111713 +dvb_ca_en50221_io_ioctl_26490 dvb_ca_en50221_io_ioctl 2 26490 NULL
111714 +read_vmcore_26501 read_vmcore 3 26501 NULL
111715 +uhid_char_write_26502 uhid_char_write 3 26502 NULL
111716 +vfio_pci_set_msi_trigger_26507 vfio_pci_set_msi_trigger 4-3 26507 NULL
111717 +iwl_dbgfs_rf_reset_read_26512 iwl_dbgfs_rf_reset_read 3 26512 NULL
111718 +alloc_ep_req_26521 alloc_ep_req 3-2 26521 NULL
111719 +SyS_rt_sigpending_26538 SyS_rt_sigpending 2 26538 NULL
111720 +__vhost_add_used_n_26554 __vhost_add_used_n 3 26554 NULL
111721 +dio_new_bio_26562 dio_new_bio 0 26562 NULL
111722 +rts51x_read_mem_26577 rts51x_read_mem 4 26577 NULL
111723 +xfs_rtcheck_range_26614 xfs_rtcheck_range 0 26614 NULL
111724 +pwr_fix_tsf_ps_read_26627 pwr_fix_tsf_ps_read 3 26627 NULL
111725 +irq_alloc_generic_chip_26650 irq_alloc_generic_chip 2 26650 NULL nohasharray
111726 +inb_p_26650 inb_p 0 26650 &irq_alloc_generic_chip_26650
111727 +nouveau_volt_create__26654 nouveau_volt_create_ 4 26654 NULL
111728 +cipso_v4_map_cat_rbm_hton_26680 cipso_v4_map_cat_rbm_hton 0 26680 NULL
111729 +flowinfo_read_26683 flowinfo_read 3 26683 NULL
111730 +sysfs_add_file_26716 sysfs_add_file 0 26716 NULL
111731 +nouveau_namedb_create__26732 nouveau_namedb_create_ 7 26732 NULL
111732 +pipeline_tcp_rx_stat_fifo_int_read_26745 pipeline_tcp_rx_stat_fifo_int_read 3 26745 NULL
111733 +bos_desc_26752 bos_desc 0 26752 NULL
111734 +snd_hda_get_raw_connections_26762 snd_hda_get_raw_connections 0 26762 NULL
111735 +dma_map_single_attrs_26779 dma_map_single_attrs 0 26779 NULL
111736 +qlcnic_alloc_sds_rings_26795 qlcnic_alloc_sds_rings 2 26795 NULL
111737 +cipso_v4_genopt_26812 cipso_v4_genopt 0 26812 NULL
111738 +iwl_trans_read_mem32_26825 iwl_trans_read_mem32 0 26825 NULL
111739 +smk_write_load_26829 smk_write_load 3 26829 NULL
111740 +xfs_alloc_pagf_init_26834 xfs_alloc_pagf_init 0 26834 NULL
111741 +scnprint_id_26842 scnprint_id 3-0 26842 NULL
111742 +ecryptfs_miscdev_write_26847 ecryptfs_miscdev_write 3 26847 NULL
111743 +ss_alloc_ep_req_26848 ss_alloc_ep_req 2 26848 NULL
111744 +tipc_conn_sendmsg_26867 tipc_conn_sendmsg 5 26867 NULL
111745 +ath6kl_create_qos_write_26879 ath6kl_create_qos_write 3 26879 NULL
111746 +svc_print_xprts_26881 svc_print_xprts 0 26881 NULL
111747 +skb_zerocopy_headlen_26910 skb_zerocopy_headlen 0 26910 NULL
111748 +hhf_zalloc_26912 hhf_zalloc 1 26912 NULL
111749 +cfg80211_process_auth_26916 cfg80211_process_auth 3 26916 NULL
111750 +x25_asy_change_mtu_26928 x25_asy_change_mtu 2 26928 NULL
111751 +scsi_tgt_copy_sense_26933 scsi_tgt_copy_sense 3 26933 NULL
111752 +sctp_setsockopt_adaptation_layer_26935 sctp_setsockopt_adaptation_layer 3 26935 NULL nohasharray
111753 +pwr_ps_enter_read_26935 pwr_ps_enter_read 3 26935 &sctp_setsockopt_adaptation_layer_26935
111754 +hecubafb_write_26942 hecubafb_write 3 26942 NULL
111755 +do_trimming_26952 do_trimming 3 26952 NULL nohasharray
111756 +extract_entropy_user_26952 extract_entropy_user 3 26952 &do_trimming_26952
111757 +do_direct_IO_26979 do_direct_IO 0 26979 NULL
111758 +xfs_filestream_associate_27030 xfs_filestream_associate 0 27030 NULL
111759 +__videobuf_alloc_vb_27062 __videobuf_alloc_vb 1 27062 NULL
111760 +ext4_convert_unwritten_extents_27064 ext4_convert_unwritten_extents 4-3-0 27064 NULL
111761 +snd_pcm_lib_period_bytes_27071 snd_pcm_lib_period_bytes 0 27071 NULL
111762 +paravirt_read_msr_27077 paravirt_read_msr 0 27077 NULL
111763 +alloc_fdmem_27083 alloc_fdmem 1 27083 NULL
111764 +btmrvl_hscmd_write_27089 btmrvl_hscmd_write 3 27089 NULL nohasharray
111765 +ath9k_hw_4k_dump_eeprom_27089 ath9k_hw_4k_dump_eeprom 5-4 27089 &btmrvl_hscmd_write_27089
111766 +__devcgroup_inode_permission_27108 __devcgroup_inode_permission 0 27108 NULL
111767 +get_kernel_page_27133 get_kernel_page 0 27133 NULL
111768 +drbd_get_capacity_27141 drbd_get_capacity 0 27141 NULL
111769 +pms_capture_27142 pms_capture 4 27142 NULL
111770 +btmrvl_hscfgcmd_write_27143 btmrvl_hscfgcmd_write 3 27143 NULL
111771 +snd_compr_calc_avail_27165 snd_compr_calc_avail 0 27165 NULL
111772 +ieee80211_if_read_rc_rateidx_mask_5ghz_27183 ieee80211_if_read_rc_rateidx_mask_5ghz 3 27183 NULL
111773 +__sg_alloc_table_27198 __sg_alloc_table 0 27198 NULL
111774 +write_kmem_27225 write_kmem 3 27225 NULL
111775 +dbAllocAG_27228 dbAllocAG 0 27228 NULL
111776 +rxrpc_request_key_27235 rxrpc_request_key 3 27235 NULL
111777 +ll_track_gid_seq_write_27267 ll_track_gid_seq_write 3 27267 NULL
111778 +comedi_alloc_devpriv_27272 comedi_alloc_devpriv 2 27272 NULL
111779 +copy_from_buf_27308 copy_from_buf 4-2 27308 NULL
111780 +virtqueue_add_inbuf_27312 virtqueue_add_inbuf 3 27312 NULL
111781 +snd_pcm_oss_write2_27332 snd_pcm_oss_write2 3-0 27332 NULL
111782 +afs_cell_create_27346 afs_cell_create 2 27346 NULL
111783 +iwl_dbgfs_csr_write_27363 iwl_dbgfs_csr_write 3 27363 NULL
111784 +pcbit_stat_27364 pcbit_stat 2 27364 NULL
111785 +seq_read_27411 seq_read 3 27411 NULL
111786 +ib_dma_map_sg_27413 ib_dma_map_sg 0 27413 NULL
111787 +ieee80211_if_read_smps_27416 ieee80211_if_read_smps 3 27416 NULL
111788 +ocfs2_refcount_cal_cow_clusters_27422 ocfs2_refcount_cal_cow_clusters 0 27422 NULL
111789 +cypress_write_27423 cypress_write 4 27423 NULL
111790 +sddr09_read_data_27447 sddr09_read_data 3 27447 NULL
111791 +xfs_btree_lookup_get_block_27448 xfs_btree_lookup_get_block 0 27448 NULL
111792 +v4l2_ctrl_new_std_menu_items_27487 v4l2_ctrl_new_std_menu_items 4 27487 NULL
111793 +hcd_buffer_alloc_27495 hcd_buffer_alloc 2 27495 NULL
111794 +ip_set_get_h32_27498 ip_set_get_h32 0 27498 NULL
111795 +btrfs_get_64_27499 btrfs_get_64 0 27499 NULL
111796 +garmin_read_process_27509 garmin_read_process 3 27509 NULL
111797 +oti_alloc_cookies_27510 oti_alloc_cookies 2 27510 NULL
111798 +ib_copy_to_udata_27525 ib_copy_to_udata 3 27525 NULL
111799 +snd_sonicvibes_getdmaa_27552 snd_sonicvibes_getdmaa 0 27552 NULL
111800 +SyS_fgetxattr_27571 SyS_fgetxattr 4 27571 NULL
111801 +sco_sock_recvmsg_27572 sco_sock_recvmsg 4 27572 NULL
111802 +libipw_alloc_txb_27579 libipw_alloc_txb 1 27579 NULL
111803 +ocfs2_xattr_ibody_get_27642 ocfs2_xattr_ibody_get 0 27642 NULL nohasharray
111804 +nl80211_send_connect_result_27642 nl80211_send_connect_result 5-7 27642 &ocfs2_xattr_ibody_get_27642 nohasharray
111805 +read_flush_procfs_27642 read_flush_procfs 3 27642 &nl80211_send_connect_result_27642 nohasharray
111806 +ocfs2_direct_IO_27642 ocfs2_direct_IO 4 27642 &read_flush_procfs_27642 nohasharray
111807 +xfs_alloc_vextent_27642 xfs_alloc_vextent 0 27642 &ocfs2_direct_IO_27642
111808 +add_new_gdb_27643 add_new_gdb 3 27643 NULL
111809 +btrfs_fallocate_27647 btrfs_fallocate 3-4 27647 NULL
111810 +qnx6_readpages_27657 qnx6_readpages 4 27657 NULL
111811 +cdrom_read_cdda_old_27664 cdrom_read_cdda_old 4 27664 NULL
111812 +ocfs2_extend_dir_27695 ocfs2_extend_dir 4 27695 NULL
111813 +fs_path_add_from_extent_buffer_27702 fs_path_add_from_extent_buffer 4 27702 NULL
111814 +evm_write_key_27715 evm_write_key 3 27715 NULL
111815 +ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol_27722 ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol 3 27722 NULL
111816 +xfs_dir2_block_sfsize_27727 xfs_dir2_block_sfsize 0 27727 NULL
111817 +SyS_setsockopt_27759 SyS_setsockopt 5 27759 NULL
111818 +__lov_setstripe_27782 __lov_setstripe 2 27782 NULL
111819 +twl4030_set_gpio_dataout_27792 twl4030_set_gpio_dataout 1 27792 NULL
111820 +SyS_readv_27804 SyS_readv 3 27804 NULL
111821 +mpihelp_mul_27805 mpihelp_mul 5-3 27805 NULL
111822 +hpt374_read_freq_27828 hpt374_read_freq 0 27828 NULL
111823 +init_header_complete_27833 init_header_complete 0 27833 NULL
111824 +read_profile_27859 read_profile 3 27859 NULL
111825 +sky2_pci_read16_27863 sky2_pci_read16 0 27863 NULL
111826 +ieee80211_if_read_dot11MeshHWMProotInterval_27873 ieee80211_if_read_dot11MeshHWMProotInterval 3 27873 NULL
111827 +unix_seqpacket_sendmsg_27893 unix_seqpacket_sendmsg 4 27893 NULL
111828 +tracing_clock_write_27961 tracing_clock_write 3 27961 NULL nohasharray
111829 +bio_next_split_27961 bio_next_split 2 27961 &tracing_clock_write_27961
111830 +tipc_media_addr_printf_27971 tipc_media_addr_printf 2 27971 NULL
111831 +device_register_27972 device_register 0 27972 NULL nohasharray
111832 +mic_rx_pkts_read_27972 mic_rx_pkts_read 3 27972 &device_register_27972
111833 +xfs_alloc_fixup_trees_27975 xfs_alloc_fixup_trees 0 27975 NULL
111834 +pci_enable_device_flags_27977 pci_enable_device_flags 0 27977 NULL nohasharray
111835 +__kernfs_setattr_27977 __kernfs_setattr 0 27977 &pci_enable_device_flags_27977
111836 +edt_ft5x06_debugfs_raw_data_read_28002 edt_ft5x06_debugfs_raw_data_read 3 28002 NULL
111837 +seq_get_buf_28006 seq_get_buf 0 28006 NULL
111838 +snd_rawmidi_write_28008 snd_rawmidi_write 3 28008 NULL
111839 +powercap_register_zone_28028 powercap_register_zone 6 28028 NULL
111840 +sctp_setsockopt_maxburst_28041 sctp_setsockopt_maxburst 3 28041 NULL
111841 +rts51x_xd_rw_28046 rts51x_xd_rw 3-4 28046 NULL
111842 +cx231xx_init_vbi_isoc_28053 cx231xx_init_vbi_isoc 3-2-4 28053 NULL
111843 +pool_status_28055 pool_status 5 28055 NULL
111844 +init_rs_non_canonical_28059 init_rs_non_canonical 1 28059 NULL
111845 +lpfc_idiag_mbxacc_read_28061 lpfc_idiag_mbxacc_read 3 28061 NULL
111846 +tx_frag_bad_mblk_num_read_28064 tx_frag_bad_mblk_num_read 3 28064 NULL
111847 +mmc_test_alloc_mem_28102 mmc_test_alloc_mem 3-2 28102 NULL
111848 +rx_defrag_need_defrag_read_28117 rx_defrag_need_defrag_read 3 28117 NULL
111849 +vgacon_adjust_height_28124 vgacon_adjust_height 2 28124 NULL
111850 +memblock_virt_alloc_from_nopanic_28146 memblock_virt_alloc_from_nopanic 1 28146 NULL
111851 +video_read_28148 video_read 3 28148 NULL
111852 +snd_midi_channel_alloc_set_28153 snd_midi_channel_alloc_set 1 28153 NULL
111853 +stats_dot11FCSErrorCount_read_28154 stats_dot11FCSErrorCount_read 3 28154 NULL
111854 +vread_28173 vread 0-3 28173 NULL
111855 +macvtap_get_user_28185 macvtap_get_user 4 28185 NULL
111856 +counter_free_res_28187 counter_free_res 5 28187 NULL
111857 +read_disk_sb_28188 read_disk_sb 2 28188 NULL
111858 +nouveau_mxm_create__28200 nouveau_mxm_create_ 4 28200 NULL
111859 +__qp_memcpy_from_queue_28220 __qp_memcpy_from_queue 3-4 28220 NULL
111860 +line6_alloc_sysex_buffer_28225 line6_alloc_sysex_buffer 4 28225 NULL
111861 +amd_nb_num_28228 amd_nb_num 0 28228 NULL
111862 +fuse_direct_IO_28275 fuse_direct_IO 4 28275 NULL
111863 +usemap_size_28281 usemap_size 0 28281 NULL
111864 +inline_xattr_size_28285 inline_xattr_size 0 28285 NULL
111865 +dma_map_sg_attrs_28289 dma_map_sg_attrs 0 28289 NULL
111866 +SyS_ppoll_28290 SyS_ppoll 2 28290 NULL
111867 +kstrtos16_from_user_28300 kstrtos16_from_user 2 28300 NULL
111868 +nouveau_compat_ioctl_28305 nouveau_compat_ioctl 2 28305 NULL
111869 +snd_pcm_oss_read_28317 snd_pcm_oss_read 3 28317 NULL
111870 +generic_write_checks_28329 generic_write_checks 0 28329 NULL
111871 +bm_entry_write_28338 bm_entry_write 3 28338 NULL
111872 +tcp_copy_to_iovec_28344 tcp_copy_to_iovec 3 28344 NULL
111873 +snapshot_write_28351 snapshot_write 3 28351 NULL
111874 +xfs_iomap_write_unwritten_28365 xfs_iomap_write_unwritten 3-2 28365 NULL
111875 +batadv_handle_tt_response_28370 batadv_handle_tt_response 4 28370 NULL
111876 +dlmfs_file_read_28385 dlmfs_file_read 3 28385 NULL
111877 +tx_frag_cache_miss_read_28394 tx_frag_cache_miss_read 3 28394 NULL
111878 +bypass_pwup_write_28416 bypass_pwup_write 3 28416 NULL
111879 +subdev_ioctl_28417 subdev_ioctl 2 28417 NULL
111880 +ksocknal_alloc_tx_28426 ksocknal_alloc_tx 2 28426 NULL
111881 +mpage_readpages_28436 mpage_readpages 3 28436 NULL
111882 +xfs_rtfind_back_28450 xfs_rtfind_back 0 28450 NULL
111883 +snd_emu10k1_efx_read_28452 snd_emu10k1_efx_read 2 28452 NULL
111884 +key_mic_failures_read_28457 key_mic_failures_read 3 28457 NULL
111885 +alloc_irq_cpu_rmap_28459 alloc_irq_cpu_rmap 1 28459 NULL
111886 +__filemap_fdatawrite_28485 __filemap_fdatawrite 0 28485 NULL
111887 +ps_poll_upsd_utilization_read_28519 ps_poll_upsd_utilization_read 3 28519 NULL
111888 +i2400m_tx_stats_read_28527 i2400m_tx_stats_read 3 28527 NULL
111889 +sel_read_policycap_28544 sel_read_policycap 3 28544 NULL
111890 +mptctl_getiocinfo_28545 mptctl_getiocinfo 2 28545 NULL nohasharray
111891 +run_delalloc_range_28545 run_delalloc_range 3-4 28545 &mptctl_getiocinfo_28545 nohasharray
111892 +aio_read_events_28545 aio_read_events 3 28545 &run_delalloc_range_28545
111893 +sysfs_create_bin_file_28551 sysfs_create_bin_file 0 28551 NULL
111894 +b43legacy_debugfs_write_28556 b43legacy_debugfs_write 3 28556 NULL
111895 +asymmetric_verify_28567 asymmetric_verify 3 28567 NULL
111896 +gfs2_meta_indirect_buffer_28573 gfs2_meta_indirect_buffer 0 28573 NULL
111897 +oxygen_read32_28582 oxygen_read32 0 28582 NULL
111898 +extract_entropy_28604 extract_entropy 5-3 28604 NULL
111899 +kfifo_unused_28612 kfifo_unused 0 28612 NULL
111900 +snd_nm256_capture_copy_28622 snd_nm256_capture_copy 5-3 28622 NULL
111901 +setup_usemap_28636 setup_usemap 3-4 28636 NULL
111902 +xfs_bmap_finish_28644 xfs_bmap_finish 0 28644 NULL
111903 +p9_fcall_alloc_28652 p9_fcall_alloc 1 28652 NULL
111904 +read_nic_io_byte_28654 read_nic_io_byte 0 28654 NULL
111905 +blk_queue_resize_tags_28670 blk_queue_resize_tags 2 28670 NULL
111906 +SyS_setgroups16_28686 SyS_setgroups16 1 28686 NULL
111907 +kvm_mmu_get_page_28692 kvm_mmu_get_page 2 28692 NULL
111908 +drm_plane_init_28731 drm_plane_init 6 28731 NULL
111909 +spi_execute_28736 spi_execute 5 28736 NULL
111910 +snd_pcm_aio_write_28738 snd_pcm_aio_write 3 28738 NULL
111911 +read_file_btcoex_28743 read_file_btcoex 3 28743 NULL
111912 +max_hw_blocks_28748 max_hw_blocks 0 28748 NULL
111913 +rpc_pipe_generic_upcall_28766 rpc_pipe_generic_upcall 4 28766 NULL
111914 +ath6kl_get_num_reg_28780 ath6kl_get_num_reg 0 28780 NULL
111915 +sel_write_member_28800 sel_write_member 3 28800 NULL
111916 +iwl_dbgfs_rxon_filter_flags_read_28832 iwl_dbgfs_rxon_filter_flags_read 3 28832 NULL
111917 +vp_request_msix_vectors_28849 vp_request_msix_vectors 2 28849 NULL
111918 +ipv6_renew_options_28867 ipv6_renew_options 5 28867 NULL
111919 +max_io_len_target_boundary_28879 max_io_len_target_boundary 0-1 28879 NULL
111920 +packet_sendmsg_spkt_28885 packet_sendmsg_spkt 4 28885 NULL
111921 +da9055_group_write_28904 da9055_group_write 2-3 28904 NULL
111922 +ps_upsd_timeouts_read_28924 ps_upsd_timeouts_read 3 28924 NULL
111923 +iwl_dbgfs_sleep_level_override_write_28925 iwl_dbgfs_sleep_level_override_write 3 28925 NULL
111924 +push_rx_28939 push_rx 3 28939 NULL
111925 +mxuport_prepare_write_buffer_28943 mxuport_prepare_write_buffer 3 28943 NULL
111926 +btrfs_trim_block_group_28963 btrfs_trim_block_group 3-4 28963 NULL
111927 +alloc_sched_domains_28972 alloc_sched_domains 1 28972 NULL
111928 +hash_net6_expire_28979 hash_net6_expire 4 28979 NULL
111929 +xfs_alloc_update_28982 xfs_alloc_update 0 28982 NULL
111930 +hci_sock_setsockopt_28993 hci_sock_setsockopt 5 28993 NULL
111931 +bin_uuid_28999 bin_uuid 3 28999 NULL
111932 +fd_execute_rw_29004 fd_execute_rw 3 29004 NULL
111933 +ieee80211_if_read_ht_opmode_29044 ieee80211_if_read_ht_opmode 3 29044 NULL
111934 +rxrpc_sendmsg_29049 rxrpc_sendmsg 4 29049 NULL
111935 +btrfs_root_bytenr_29058 btrfs_root_bytenr 0 29058 NULL
111936 +iso_packets_buffer_init_29061 iso_packets_buffer_init 3-4 29061 NULL
111937 +lpfc_idiag_extacc_drivr_get_29067 lpfc_idiag_extacc_drivr_get 0-3 29067 NULL
111938 +sctp_getsockopt_assoc_stats_29074 sctp_getsockopt_assoc_stats 2 29074 NULL
111939 +xfs_alloc_ag_vextent_small_29084 xfs_alloc_ag_vextent_small 0 29084 NULL
111940 +iwl_dbgfs_log_event_write_29088 iwl_dbgfs_log_event_write 3 29088 NULL
111941 +i915_error_object_create_sized_29091 i915_error_object_create_sized 3 29091 NULL
111942 +ccp_init_dm_workarea_29097 ccp_init_dm_workarea 3 29097 NULL
111943 +isdn_ppp_write_29109 isdn_ppp_write 4 29109 NULL
111944 +snprintf_29125 snprintf 0 29125 NULL
111945 +iov_shorten_29130 iov_shorten 0 29130 NULL
111946 +proc_scsi_write_29142 proc_scsi_write 3 29142 NULL
111947 +kvm_mmu_notifier_clear_flush_young_29154 kvm_mmu_notifier_clear_flush_young 3 29154 NULL
111948 +drm_property_create_enum_29201 drm_property_create_enum 5 29201 NULL
111949 +wusb_prf_256_29203 wusb_prf_256 7 29203 NULL
111950 +iwl_dbgfs_temperature_read_29224 iwl_dbgfs_temperature_read 3 29224 NULL
111951 +nvme_trans_copy_from_user_29227 nvme_trans_copy_from_user 3 29227 NULL
111952 +irq_domain_add_linear_29236 irq_domain_add_linear 2 29236 NULL
111953 +evdev_handle_get_val_29242 evdev_handle_get_val 5-6 29242 NULL
111954 +security_context_to_sid_core_29248 security_context_to_sid_core 2 29248 NULL
111955 +prism2_set_genericelement_29277 prism2_set_genericelement 3 29277 NULL
111956 +ext4_fiemap_29296 ext4_fiemap 4 29296 NULL
111957 +xfs_bmap_btree_to_extents_29297 xfs_bmap_btree_to_extents 0 29297 NULL
111958 +sn9c102_read_29305 sn9c102_read 3 29305 NULL
111959 +__fuse_get_req_29315 __fuse_get_req 2 29315 NULL
111960 +lprocfs_write_helper_29323 lprocfs_write_helper 2 29323 NULL
111961 +xfs_bmbt_change_owner_29325 xfs_bmbt_change_owner 0 29325 NULL
111962 +kvm_handle_hva_29326 kvm_handle_hva 2 29326 NULL
111963 +tun_put_user_29337 tun_put_user 5 29337 NULL
111964 +__alloc_ei_netdev_29338 __alloc_ei_netdev 1 29338 NULL
111965 +l2cap_sock_setsockopt_old_29346 l2cap_sock_setsockopt_old 4 29346 NULL
111966 +read_file_tx99_power_29405 read_file_tx99_power 3 29405 NULL
111967 +mempool_create_29437 mempool_create 1 29437 NULL
111968 +crypto_ahash_alignmask_29445 crypto_ahash_alignmask 0 29445 NULL
111969 +p9_client_prepare_req_29448 p9_client_prepare_req 3 29448 NULL
111970 +validate_scan_freqs_29462 validate_scan_freqs 0 29462 NULL
111971 +SyS_flistxattr_29474 SyS_flistxattr 3 29474 NULL
111972 +do_register_entry_29478 do_register_entry 4 29478 NULL
111973 +simple_strtoul_29480 simple_strtoul 0 29480 NULL
111974 +btmrvl_pscmd_write_29504 btmrvl_pscmd_write 3 29504 NULL
111975 +btrfs_file_extent_disk_bytenr_29505 btrfs_file_extent_disk_bytenr 0 29505 NULL
111976 +usnic_vnic_spec_dump_29508 usnic_vnic_spec_dump 2 29508 NULL
111977 +write_file_regidx_29517 write_file_regidx 3 29517 NULL
111978 +atk_debugfs_ggrp_read_29522 atk_debugfs_ggrp_read 3 29522 NULL
111979 +add_to_page_cache_lru_29534 add_to_page_cache_lru 0 29534 NULL
111980 +ftrace_write_29551 ftrace_write 3 29551 NULL
111981 +idetape_queue_rw_tail_29562 idetape_queue_rw_tail 3 29562 NULL
111982 +leaf_dealloc_29566 leaf_dealloc 3 29566 NULL
111983 +kvm_read_guest_virt_system_29569 kvm_read_guest_virt_system 4-2 29569 NULL
111984 +lbs_lowsnr_read_29571 lbs_lowsnr_read 3 29571 NULL
111985 +iwl_dbgfs_missed_beacon_write_29586 iwl_dbgfs_missed_beacon_write 3 29586 NULL
111986 +pvr2_hdw_report_unlocked_29589 pvr2_hdw_report_unlocked 4-0 29589 NULL
111987 +dio_set_defer_completion_29599 dio_set_defer_completion 0 29599 NULL
111988 +slots_per_page_29601 slots_per_page 0 29601 NULL
111989 +osc_cached_mb_seq_write_29610 osc_cached_mb_seq_write 3 29610 NULL
111990 +nla_get_u16_29624 nla_get_u16 0 29624 NULL
111991 +gfs2_alloc_blocks_29630 gfs2_alloc_blocks 0 29630 NULL
111992 +tx_frag_cache_hit_read_29639 tx_frag_cache_hit_read 3 29639 NULL
111993 +sctp_make_abort_user_29654 sctp_make_abort_user 3 29654 NULL
111994 +sisusb_write_mem_bulk_29678 sisusb_write_mem_bulk 4 29678 NULL
111995 +lustre_posix_acl_xattr_2ext_29693 lustre_posix_acl_xattr_2ext 2 29693 NULL
111996 +posix_acl_from_xattr_29708 posix_acl_from_xattr 3 29708 NULL
111997 +probes_write_29711 probes_write 3 29711 NULL
111998 +read_cis_cache_29735 read_cis_cache 4 29735 NULL
111999 +xfs_new_eof_29737 xfs_new_eof 2 29737 NULL
112000 +std_nic_write_29752 std_nic_write 3 29752 NULL
112001 +dbAlloc_29794 dbAlloc 0 29794 NULL
112002 +tcp_sendpage_29829 tcp_sendpage 4 29829 NULL
112003 +__probe_kernel_write_29842 __probe_kernel_write 3 29842 NULL
112004 +kvm_read_hva_atomic_29848 kvm_read_hva_atomic 3 29848 NULL
112005 +count_partial_29850 count_partial 0 29850 NULL
112006 +xfs_rtfind_forw_29866 xfs_rtfind_forw 0 29866 NULL
112007 +write_file_bool_bmps_29870 write_file_bool_bmps 3 29870 NULL
112008 +ipv6_setsockopt_29871 ipv6_setsockopt 5 29871 NULL
112009 +scsi_end_request_29876 scsi_end_request 3 29876 NULL
112010 +crypto_aead_alignmask_29885 crypto_aead_alignmask 0 29885 NULL
112011 +xfs_alloc_read_agf_29893 xfs_alloc_read_agf 0 29893 NULL
112012 +lov_ost_pool_extend_29914 lov_ost_pool_extend 2 29914 NULL
112013 +write_file_queue_29922 write_file_queue 3 29922 NULL
112014 +__btrfs_getxattr_29947 __btrfs_getxattr 0 29947 NULL nohasharray
112015 +ipv6_recv_error_29947 ipv6_recv_error 3 29947 &__btrfs_getxattr_29947
112016 +dev_mem_write_30028 dev_mem_write 3 30028 NULL
112017 +alloc_netdev_mqs_30030 alloc_netdev_mqs 1 30030 NULL
112018 +sysfs_add_file_mode_ns_30038 sysfs_add_file_mode_ns 0 30038 NULL
112019 +scsi_vpd_inquiry_30040 scsi_vpd_inquiry 4 30040 NULL
112020 +drp_wmove_30043 drp_wmove 4 30043 NULL
112021 +mem_cgroup_charge_common_30047 mem_cgroup_charge_common 0 30047 NULL
112022 +__pci_request_selected_regions_30058 __pci_request_selected_regions 0 30058 NULL
112023 +cxgbi_ddp_reserve_30091 cxgbi_ddp_reserve 4 30091 NULL
112024 +snd_midi_channel_init_set_30092 snd_midi_channel_init_set 1 30092 NULL
112025 +rx_filter_data_filter_read_30098 rx_filter_data_filter_read 3 30098 NULL
112026 +defragment_dma_buffer_30113 defragment_dma_buffer 0 30113 NULL
112027 +xfs_iget_cache_miss_30115 xfs_iget_cache_miss 0 30115 NULL
112028 +spi_async_locked_30117 spi_async_locked 0 30117 NULL
112029 +recv_stream_30138 recv_stream 4 30138 NULL
112030 +u_memcpya_30139 u_memcpya 3-2 30139 NULL
112031 +dbg_port_buf_30145 dbg_port_buf 2 30145 NULL
112032 +elfcorehdr_read_30159 elfcorehdr_read 2 30159 NULL
112033 +alloc_switch_ctx_30165 alloc_switch_ctx 2 30165 NULL
112034 +expand_inode_data_30169 expand_inode_data 3-2 30169 NULL
112035 +mempool_create_page_pool_30189 mempool_create_page_pool 1 30189 NULL
112036 +drm_property_create_bitmask_30195 drm_property_create_bitmask 5 30195 NULL
112037 +__genwqe_readq_30197 __genwqe_readq 0 30197 NULL
112038 +usblp_ioctl_30203 usblp_ioctl 2 30203 NULL
112039 +read_4k_modal_eeprom_30212 read_4k_modal_eeprom 3 30212 NULL
112040 +bitmap_file_set_bit_30228 bitmap_file_set_bit 2 30228 NULL
112041 +shmem_unuse_inode_30263 shmem_unuse_inode 0 30263 NULL
112042 +rawv6_recvmsg_30265 rawv6_recvmsg 4 30265 NULL
112043 +try_break_deleg_30271 try_break_deleg 0 30271 NULL nohasharray
112044 +isr_pci_pm_read_30271 isr_pci_pm_read 3 30271 &try_break_deleg_30271
112045 +compat_readv_30273 compat_readv 3 30273 NULL
112046 +skcipher_sendmsg_30290 skcipher_sendmsg 4 30290 NULL
112047 +pipeline_sec_frag_swi_read_30294 pipeline_sec_frag_swi_read 3 30294 NULL
112048 +tcp_sendmsg_30296 tcp_sendmsg 4 30296 NULL
112049 +osc_contention_seconds_seq_write_30305 osc_contention_seconds_seq_write 3 30305 NULL
112050 +ext4_acl_from_disk_30320 ext4_acl_from_disk 2 30320 NULL
112051 +i8254_read_30330 i8254_read 0 30330 NULL
112052 +resource_from_user_30341 resource_from_user 3 30341 NULL
112053 +o2nm_this_node_30342 o2nm_this_node 0 30342 NULL
112054 +gfs2_trans_begin_30359 gfs2_trans_begin 0 30359 NULL
112055 +kstrtou32_from_user_30361 kstrtou32_from_user 2 30361 NULL
112056 +pagecache_write_begin_30364 pagecache_write_begin 0 30364 NULL
112057 +C_SYSC_readv_30369 C_SYSC_readv 3 30369 NULL
112058 +blkdev_issue_zeroout_30392 blkdev_issue_zeroout 3 30392 NULL
112059 +c4iw_init_resource_30393 c4iw_init_resource 2-3 30393 NULL
112060 +get_kernel_pages_30397 get_kernel_pages 0 30397 NULL
112061 +vb2_fop_write_30420 vb2_fop_write 3 30420 NULL
112062 +tx_tx_template_prepared_read_30424 tx_tx_template_prepared_read 3 30424 NULL
112063 +lstcon_session_info_30425 lstcon_session_info 6 30425 NULL
112064 +enable_write_30456 enable_write 3 30456 NULL
112065 +tx_tx_template_programmed_read_30461 tx_tx_template_programmed_read 3 30461 NULL
112066 +urandom_read_30462 urandom_read 3 30462 NULL
112067 +zoran_ioctl_30465 zoran_ioctl 2 30465 NULL
112068 +i2c_ctrl_read_30467 i2c_ctrl_read 0 30467 NULL
112069 +adu_write_30487 adu_write 3 30487 NULL
112070 +dtim_interval_write_30489 dtim_interval_write 3 30489 NULL
112071 +batadv_send_tt_request_30493 batadv_send_tt_request 5 30493 NULL
112072 +__send_duplicate_bios_30498 __send_duplicate_bios 4 30498 NULL
112073 +memblock_virt_alloc_node_30515 memblock_virt_alloc_node 1 30515 NULL
112074 +dwc3_testmode_write_30516 dwc3_testmode_write 3 30516 NULL
112075 +set_config_30526 set_config 0 30526 NULL nohasharray
112076 +debug_debug2_read_30526 debug_debug2_read 3 30526 &set_config_30526
112077 +xfs_sb_version_hasftype_30559 xfs_sb_version_hasftype 0 30559 NULL
112078 +disk_expand_part_tbl_30561 disk_expand_part_tbl 2 30561 NULL
112079 +set_le_30581 set_le 4 30581 NULL
112080 +blk_init_tags_30592 blk_init_tags 1 30592 NULL
112081 +sgl_map_user_pages_30610 sgl_map_user_pages 2 30610 NULL
112082 +macvtap_sendmsg_30629 macvtap_sendmsg 4 30629 NULL
112083 +ieee80211_if_read_dot11MeshAwakeWindowDuration_30631 ieee80211_if_read_dot11MeshAwakeWindowDuration 3 30631 NULL
112084 +compat_raw_setsockopt_30634 compat_raw_setsockopt 5 30634 NULL
112085 +mlx5_ib_alloc_fast_reg_page_list_30638 mlx5_ib_alloc_fast_reg_page_list 2 30638 NULL
112086 +SyS_listxattr_30647 SyS_listxattr 3 30647 NULL
112087 +jffs2_flash_read_30667 jffs2_flash_read 0 30667 NULL
112088 +ni_ai_fifo_read_30681 ni_ai_fifo_read 3 30681 NULL
112089 +dccp_setsockopt_ccid_30701 dccp_setsockopt_ccid 4 30701 NULL nohasharray
112090 +xfs_bmap_add_extent_unwritten_real_30701 xfs_bmap_add_extent_unwritten_real 0 30701 &dccp_setsockopt_ccid_30701
112091 +lbs_wrbbp_write_30712 lbs_wrbbp_write 3 30712 NULL
112092 +lbs_debugfs_read_30721 lbs_debugfs_read 3 30721 NULL
112093 +snd_nm256_playback_silence_30727 snd_nm256_playback_silence 4-3 30727 NULL
112094 +snapshot_status_30744 snapshot_status 5 30744 NULL
112095 +fuse_conn_limit_write_30777 fuse_conn_limit_write 3 30777 NULL
112096 +__bio_alloc_30787 __bio_alloc 3 30787 NULL
112097 +smk_read_doi_30813 smk_read_doi 3 30813 NULL
112098 +xlog_grant_head_wait_30829 xlog_grant_head_wait 0 30829 NULL
112099 +get_kobj_path_length_30831 get_kobj_path_length 0 30831 NULL
112100 +ath10k_write_fw_dbglog_30835 ath10k_write_fw_dbglog 3 30835 NULL
112101 +sctp_setsockopt_auth_chunk_30843 sctp_setsockopt_auth_chunk 3 30843 NULL
112102 +wd_autoreset_write_30862 wd_autoreset_write 3 30862 NULL
112103 +ieee80211_if_fmt_dropped_frames_no_route_30884 ieee80211_if_fmt_dropped_frames_no_route 3 30884 NULL
112104 +pn_recvmsg_30887 pn_recvmsg 4 30887 NULL
112105 +usnic_debugfs_buildinfo_read_30928 usnic_debugfs_buildinfo_read 3 30928 NULL
112106 +sctp_setsockopt_rtoinfo_30941 sctp_setsockopt_rtoinfo 3 30941 NULL
112107 +tty_insert_flip_string_flags_30969 tty_insert_flip_string_flags 4 30969 NULL
112108 +huge_page_mask_30981 huge_page_mask 0 30981 NULL
112109 +read_file_bt_ant_diversity_30983 read_file_bt_ant_diversity 3 30983 NULL
112110 +lbs_host_sleep_read_31013 lbs_host_sleep_read 3 31013 NULL
112111 +ima_eventsig_init_31022 ima_eventsig_init 5 31022 NULL
112112 +template_fmt_size_31033 template_fmt_size 0 31033 NULL
112113 +do_setup_msi_irqs_31043 do_setup_msi_irqs 2 31043 NULL
112114 +stride_pg_count_31053 stride_pg_count 0-3-2-1-4-5 31053 NULL
112115 +lbs_failcount_read_31063 lbs_failcount_read 3 31063 NULL
112116 +sctp_setsockopt_context_31091 sctp_setsockopt_context 3 31091 NULL
112117 +proc_gid_map_write_31093 proc_gid_map_write 3 31093 NULL
112118 +compat_sys_get_mempolicy_31109 compat_sys_get_mempolicy 3 31109 NULL
112119 +depth_read_31112 depth_read 3 31112 NULL
112120 +hash_ipportnet6_expire_31118 hash_ipportnet6_expire 4 31118 NULL
112121 +kimage_normal_alloc_31140 kimage_normal_alloc 3 31140 NULL
112122 +size_inside_page_31141 size_inside_page 0 31141 NULL
112123 +w9966_v4l_read_31148 w9966_v4l_read 3 31148 NULL
112124 +ch_do_scsi_31171 ch_do_scsi 4 31171 NULL
112125 +r592_read_fifo_pio_31198 r592_read_fifo_pio 3 31198 NULL
112126 +mtdchar_readoob_31200 mtdchar_readoob 4 31200 NULL
112127 +__btrfs_free_reserved_extent_31207 __btrfs_free_reserved_extent 2 31207 NULL
112128 +cpumask_weight_31215 cpumask_weight 0 31215 NULL
112129 +__read_reg_31216 __read_reg 0 31216 NULL
112130 +atm_get_addr_31221 atm_get_addr 3 31221 NULL
112131 +tcp_recvmsg_31238 tcp_recvmsg 4 31238 NULL
112132 +cyy_readb_31240 cyy_readb 0 31240 NULL
112133 +_create_sg_bios_31244 _create_sg_bios 4 31244 NULL
112134 +ieee80211_if_read_last_beacon_31257 ieee80211_if_read_last_beacon 3 31257 NULL
112135 +hash_netportnet4_expire_31290 hash_netportnet4_expire 4 31290 NULL
112136 +uvc_simplify_fraction_31303 uvc_simplify_fraction 3 31303 NULL
112137 +sisusbcon_scroll_31315 sisusbcon_scroll 5-2-3 31315 NULL
112138 +command_file_write_31318 command_file_write 3 31318 NULL
112139 +radix_tree_insert_31336 radix_tree_insert 0 31336 NULL
112140 +em28xx_init_usb_xfer_31337 em28xx_init_usb_xfer 4-6 31337 NULL
112141 +outlen_write_31358 outlen_write 3 31358 NULL
112142 +ieee80211_rx_mgmt_auth_31366 ieee80211_rx_mgmt_auth 3 31366 NULL
112143 +xprt_rdma_allocate_31372 xprt_rdma_allocate 2 31372 NULL
112144 +vb2_vmalloc_get_userptr_31374 vb2_vmalloc_get_userptr 3-2 31374 NULL
112145 +trace_parser_get_init_31379 trace_parser_get_init 2 31379 NULL
112146 +inb_31388 inb 0 31388 NULL
112147 +key_ifindex_read_31411 key_ifindex_read 3 31411 NULL
112148 +_sp2d_max_pg_31422 _sp2d_max_pg 0 31422 NULL
112149 +TSS_checkhmac1_31429 TSS_checkhmac1 5 31429 NULL
112150 +snd_aw2_saa7146_get_hw_ptr_capture_31431 snd_aw2_saa7146_get_hw_ptr_capture 0 31431 NULL
112151 +transport_alloc_session_tags_31449 transport_alloc_session_tags 2-3 31449 NULL
112152 +opera1_xilinx_rw_31453 opera1_xilinx_rw 5 31453 NULL
112153 +xfs_btree_get_numrecs_31477 xfs_btree_get_numrecs 0 31477 NULL
112154 +alg_setkey_31485 alg_setkey 3 31485 NULL
112155 +rds_message_map_pages_31487 rds_message_map_pages 2 31487 NULL
112156 +qsfp_2_read_31491 qsfp_2_read 3 31491 NULL
112157 +__alloc_bootmem_31498 __alloc_bootmem 1 31498 NULL
112158 +hidraw_write_31536 hidraw_write 3 31536 NULL
112159 +usbvision_read_31555 usbvision_read 3 31555 NULL
112160 +tx_frag_tkip_called_read_31575 tx_frag_tkip_called_read 3 31575 NULL
112161 +get_max_inline_xattr_value_size_31578 get_max_inline_xattr_value_size 0 31578 NULL
112162 +osst_write_31581 osst_write 3 31581 NULL
112163 +snd_compr_get_avail_31584 snd_compr_get_avail 0 31584 NULL
112164 +iwl_dbgfs_ucode_tx_stats_read_31611 iwl_dbgfs_ucode_tx_stats_read 3 31611 NULL
112165 +mtd_get_user_prot_info_31616 mtd_get_user_prot_info 0 31616 NULL
112166 +arvo_sysfs_read_31617 arvo_sysfs_read 6 31617 NULL nohasharray
112167 +memblock_virt_alloc_nopanic_31617 memblock_virt_alloc_nopanic 1 31617 &arvo_sysfs_read_31617
112168 +usnic_ib_dump_vf_31623 usnic_ib_dump_vf 3 31623 NULL
112169 +videobuf_read_one_31637 videobuf_read_one 3 31637 NULL
112170 +pod_alloc_sysex_buffer_31651 pod_alloc_sysex_buffer 3 31651 NULL
112171 +xfer_secondary_pool_31661 xfer_secondary_pool 2 31661 NULL
112172 +__lgread_31668 __lgread 4 31668 NULL
112173 +copy_from_user_nmi_31672 copy_from_user_nmi 3-0 31672 NULL
112174 +forced_ps_read_31685 forced_ps_read 3 31685 NULL
112175 +fst_recover_rx_error_31687 fst_recover_rx_error 3 31687 NULL
112176 +gfs2_dir_check_31711 gfs2_dir_check 0 31711 NULL
112177 +rs_pretty_print_rate_31727 rs_pretty_print_rate 0 31727 NULL
112178 +utf16s_to_utf8s_31735 utf16s_to_utf8s 0 31735 NULL nohasharray
112179 +lu_buf_check_and_grow_31735 lu_buf_check_and_grow 2 31735 &utf16s_to_utf8s_31735
112180 +shmem_pwrite_slow_31741 shmem_pwrite_slow 3-2 31741 NULL
112181 +input_abs_get_max_31742 input_abs_get_max 0 31742 NULL nohasharray
112182 +NCR_700_change_queue_depth_31742 NCR_700_change_queue_depth 2 31742 &input_abs_get_max_31742
112183 +bcm_char_read_31750 bcm_char_read 3 31750 NULL
112184 +snd_seq_device_new_31753 snd_seq_device_new 4 31753 NULL
112185 +SyS_lsetxattr_31766 SyS_lsetxattr 4 31766 NULL
112186 +osync_buffers_list_31789 osync_buffers_list 0 31789 NULL
112187 +usblp_cache_device_id_string_31790 usblp_cache_device_id_string 0 31790 NULL
112188 +ecryptfs_send_message_locked_31801 ecryptfs_send_message_locked 2 31801 NULL
112189 +isr_rx_procs_read_31804 isr_rx_procs_read 3 31804 NULL
112190 +data_write_31805 data_write 3 31805 NULL
112191 +SyS_msgsnd_31814 SyS_msgsnd 3 31814 NULL
112192 +strnlen_user_31815 strnlen_user 0-2 31815 NULL
112193 +sta_last_signal_read_31818 sta_last_signal_read 3 31818 NULL
112194 +clone_bio_31854 clone_bio 4-3 31854 NULL
112195 +SyS_ppoll_31855 SyS_ppoll 2 31855 NULL
112196 +foreach_descriptor_31873 foreach_descriptor 0 31873 NULL
112197 +iwl_dbgfs_disable_ht40_write_31876 iwl_dbgfs_disable_ht40_write 3 31876 NULL
112198 +drm_mode_crtc_set_gamma_size_31881 drm_mode_crtc_set_gamma_size 2 31881 NULL
112199 +ddb_output_write_31902 ddb_output_write 3-0 31902 NULL
112200 +xattr_permission_31907 xattr_permission 0 31907 NULL
112201 +lu_buf_realloc_31915 lu_buf_realloc 2 31915 NULL
112202 +new_dir_31919 new_dir 3 31919 NULL
112203 +kmem_alloc_31920 kmem_alloc 1 31920 NULL
112204 +SYSC_sethostname_31940 SYSC_sethostname 2 31940 NULL
112205 +read_mem_31942 read_mem 3 31942 NULL nohasharray
112206 +iov_iter_copy_from_user_31942 iov_iter_copy_from_user 4-0 31942 &read_mem_31942
112207 +vb2_write_31948 vb2_write 3 31948 NULL
112208 +pvr2_ctrl_get_valname_31951 pvr2_ctrl_get_valname 4 31951 NULL
112209 +regcache_rbtree_sync_31964 regcache_rbtree_sync 2 31964 NULL
112210 +iwl_rx_packet_payload_len_31965 iwl_rx_packet_payload_len 0 31965 NULL
112211 +copy_from_user_toio_31966 copy_from_user_toio 3 31966 NULL
112212 +iblock_execute_rw_31982 iblock_execute_rw 3 31982 NULL nohasharray
112213 +vx_read_status_31982 vx_read_status 0 31982 &iblock_execute_rw_31982
112214 +find_next_zero_bit_31990 find_next_zero_bit 0 31990 NULL
112215 +lustre_acl_xattr_merge2posix_31992 lustre_acl_xattr_merge2posix 2 31992 NULL
112216 +sysfs_create_file_31996 sysfs_create_file 0 31996 NULL
112217 +calc_hmac_32010 calc_hmac 3 32010 NULL
112218 +aead_len_32021 aead_len 0 32021 NULL
112219 +stk_read_32038 stk_read 3 32038 NULL
112220 +SYSC_llistxattr_32061 SYSC_llistxattr 3 32061 NULL
112221 +proc_scsi_devinfo_write_32064 proc_scsi_devinfo_write 3 32064 NULL
112222 +xfs_buf_iowait_32068 xfs_buf_iowait 0 32068 NULL
112223 +cow_file_range_inline_32091 cow_file_range_inline 3 32091 NULL
112224 +bio_alloc_32095 bio_alloc 2 32095 NULL
112225 +ath6kl_fwlog_read_32101 ath6kl_fwlog_read 3 32101 NULL
112226 +disk_status_32120 disk_status 4 32120 NULL
112227 +kobject_add_internal_32133 kobject_add_internal 0 32133 NULL
112228 +venus_link_32165 venus_link 5 32165 NULL
112229 +do_writepages_32173 do_writepages 0 32173 NULL
112230 +del_ptr_32197 del_ptr 4 32197 NULL
112231 +wusb_ccm_mac_32199 wusb_ccm_mac 7 32199 NULL
112232 +__mem_cgroup_try_charge_swapin_32204 __mem_cgroup_try_charge_swapin 0 32204 NULL
112233 +riva_get_cmap_len_32218 riva_get_cmap_len 0 32218 NULL
112234 +caif_seqpkt_recvmsg_32241 caif_seqpkt_recvmsg 4 32241 NULL
112235 +lbs_lowrssi_read_32242 lbs_lowrssi_read 3 32242 NULL
112236 +ocfs2_xattr_find_entry_32260 ocfs2_xattr_find_entry 0 32260 NULL
112237 +kvm_set_spte_hva_32312 kvm_set_spte_hva 2 32312 NULL
112238 +cas_calc_tabort_32316 cas_calc_tabort 0 32316 NULL
112239 +SyS_select_32319 SyS_select 1 32319 NULL
112240 +nouveau_bar_create__32332 nouveau_bar_create_ 4 32332 NULL
112241 +nl80211_send_mlme_event_32337 nl80211_send_mlme_event 4 32337 NULL
112242 +xfs_bmap_extsize_align_32338 xfs_bmap_extsize_align 0 32338 NULL
112243 +t4_alloc_mem_32342 t4_alloc_mem 1 32342 NULL
112244 +dispatch_ioctl_32357 dispatch_ioctl 2 32357 NULL nohasharray
112245 +rx_streaming_always_write_32357 rx_streaming_always_write 3 32357 &dispatch_ioctl_32357
112246 +ReadHDLCPCI_32362 ReadHDLCPCI 0 32362 NULL nohasharray
112247 +sel_read_initcon_32362 sel_read_initcon 3 32362 &ReadHDLCPCI_32362
112248 +ocfs2_cancel_convert_32392 ocfs2_cancel_convert 0 32392 NULL
112249 +ll_setxattr_common_32398 ll_setxattr_common 4 32398 NULL
112250 +xfs_iext_add_indirect_multi_32400 xfs_iext_add_indirect_multi 3 32400 NULL
112251 +vmci_qp_alloc_32405 vmci_qp_alloc 5-3 32405 NULL
112252 +xfs_alloc_put_freelist_32437 xfs_alloc_put_freelist 0 32437 NULL
112253 +cache_status_32462 cache_status 5 32462 NULL
112254 +fill_readbuf_32464 fill_readbuf 3 32464 NULL
112255 +dgap_usertoboard_32490 dgap_usertoboard 4 32490 NULL
112256 +ide_driver_proc_write_32493 ide_driver_proc_write 3 32493 NULL
112257 +bypass_pwoff_write_32499 bypass_pwoff_write 3 32499 NULL
112258 +mdc_pinger_recov_seq_write_32510 mdc_pinger_recov_seq_write 3 32510 NULL
112259 +ctrl_std_val_to_sym_32516 ctrl_std_val_to_sym 5 32516 NULL
112260 +disconnect_32521 disconnect 4 32521 NULL
112261 +qsfp_read_32522 qsfp_read 0-2-4 32522 NULL
112262 +ocfs2_refresh_qinfo_32524 ocfs2_refresh_qinfo 0 32524 NULL
112263 +ilo_read_32531 ilo_read 3 32531 NULL
112264 +ieee80211_if_read_estab_plinks_32533 ieee80211_if_read_estab_plinks 3 32533 NULL
112265 +format_devstat_counter_32550 format_devstat_counter 3 32550 NULL
112266 +aes_encrypt_fail_read_32562 aes_encrypt_fail_read 3 32562 NULL
112267 +osc_iocontrol_32565 osc_iocontrol 3 32565 NULL
112268 +mem_swapout_entry_32586 mem_swapout_entry 3 32586 NULL
112269 +pipeline_tcp_tx_stat_fifo_int_read_32589 pipeline_tcp_tx_stat_fifo_int_read 3 32589 NULL
112270 +read_file_beacon_32595 read_file_beacon 3 32595 NULL
112271 +ieee80211_if_read_dropped_frames_congestion_32603 ieee80211_if_read_dropped_frames_congestion 3 32603 NULL
112272 +xfs_bmap_last_offset_32614 xfs_bmap_last_offset 0 32614 NULL
112273 +irda_recvmsg_dgram_32631 irda_recvmsg_dgram 4 32631 NULL
112274 +cfg80211_roamed_32632 cfg80211_roamed 5-7 32632 NULL
112275 +kvmalloc_32646 kvmalloc 1 32646 NULL
112276 +ib_sg_dma_len_32649 ib_sg_dma_len 0 32649 NULL
112277 +generic_readlink_32654 generic_readlink 3 32654 NULL
112278 +move_addr_to_kernel_32673 move_addr_to_kernel 2 32673 NULL
112279 +apei_res_add_32674 apei_res_add 0 32674 NULL
112280 +jfs_readpages_32702 jfs_readpages 4 32702 NULL
112281 +xfs_filestream_new_ag_32711 xfs_filestream_new_ag 0 32711 NULL
112282 +rt2x00debug_read_queue_dump_32712 rt2x00debug_read_queue_dump 3 32712 NULL
112283 +xfs_bmbt_update_32713 xfs_bmbt_update 0 32713 NULL
112284 +i40e_pci_sriov_enable_32742 i40e_pci_sriov_enable 2 32742 NULL
112285 +megasas_change_queue_depth_32747 megasas_change_queue_depth 2 32747 NULL
112286 +stats_read_ul_32751 stats_read_ul 3 32751 NULL
112287 +vmci_transport_dgram_dequeue_32775 vmci_transport_dgram_dequeue 4 32775 NULL
112288 +sctp_tsnmap_grow_32784 sctp_tsnmap_grow 2 32784 NULL
112289 +xfs_trans_read_buf_32795 xfs_trans_read_buf 0 32795 NULL
112290 +rproc_name_read_32805 rproc_name_read 3 32805 NULL
112291 +sta_tx_latency_stat_read_32862 sta_tx_latency_stat_read 3 32862 NULL
112292 +new_tape_buffer_32866 new_tape_buffer 2 32866 NULL
112293 +cifs_writedata_alloc_32880 cifs_writedata_alloc 1 32880 NULL nohasharray
112294 +ath6kl_usb_submit_ctrl_in_32880 ath6kl_usb_submit_ctrl_in 6 32880 &cifs_writedata_alloc_32880
112295 +vp702x_usb_inout_cmd_32884 vp702x_usb_inout_cmd 4-6 32884 NULL
112296 +il_dbgfs_tx_stats_read_32913 il_dbgfs_tx_stats_read 3 32913 NULL
112297 +zlib_inflate_workspacesize_32927 zlib_inflate_workspacesize 0 32927 NULL
112298 +rmap_recycle_32938 rmap_recycle 3 32938 NULL
112299 +xfs_log_reserve_32959 xfs_log_reserve 0 32959 NULL
112300 +compat_filldir_32999 compat_filldir 3 32999 NULL
112301 +SyS_syslog_33007 SyS_syslog 3 33007 NULL
112302 +br_multicast_set_hash_max_33012 br_multicast_set_hash_max 2 33012 NULL
112303 +write_file_bt_ant_diversity_33019 write_file_bt_ant_diversity 3 33019 NULL
112304 +mic_virtio_copy_to_user_33048 mic_virtio_copy_to_user 3 33048 NULL
112305 +SYSC_lgetxattr_33049 SYSC_lgetxattr 4 33049 NULL
112306 +pipeline_dec_packet_in_fifo_full_read_33052 pipeline_dec_packet_in_fifo_full_read 3 33052 NULL
112307 +ebt_compat_match_offset_33053 ebt_compat_match_offset 0-2 33053 NULL
112308 +bitmap_resize_33054 bitmap_resize 2 33054 NULL
112309 +stats_dot11RTSSuccessCount_read_33065 stats_dot11RTSSuccessCount_read 3 33065 NULL
112310 +sel_read_checkreqprot_33068 sel_read_checkreqprot 3 33068 NULL
112311 +alloc_tio_33077 alloc_tio 3 33077 NULL
112312 +acl_permission_check_33083 acl_permission_check 0 33083 NULL
112313 +fb_sys_write_33130 fb_sys_write 3 33130 NULL
112314 +notify_change_33143 notify_change 0 33143 NULL
112315 +SyS_poll_33152 SyS_poll 2 33152 NULL
112316 +_pci_add_cap_save_buffer_33153 _pci_add_cap_save_buffer 4 33153 NULL
112317 +debug_debug6_read_33168 debug_debug6_read 3 33168 NULL
112318 +dataflash_read_fact_otp_33204 dataflash_read_fact_otp 3-2 33204 NULL
112319 +pp_read_33210 pp_read 3 33210 NULL
112320 +xfs_file_aio_write_33234 xfs_file_aio_write 4 33234 NULL
112321 +snd_pcm_plug_client_size_33267 snd_pcm_plug_client_size 0-2 33267 NULL
112322 +cachefiles_cook_key_33274 cachefiles_cook_key 2 33274 NULL
112323 +sync_pt_create_33282 sync_pt_create 2 33282 NULL
112324 +mcs7830_get_reg_33308 mcs7830_get_reg 3 33308 NULL
112325 +isku_sysfs_read_keys_easyzone_33318 isku_sysfs_read_keys_easyzone 6 33318 NULL
112326 +vx_send_irq_dsp_33329 vx_send_irq_dsp 0 33329 NULL
112327 +joydev_ioctl_33343 joydev_ioctl 2 33343 NULL
112328 +lov_stripesize_seq_write_33353 lov_stripesize_seq_write 3 33353 NULL
112329 +create_xattr_datum_33356 create_xattr_datum 5 33356 NULL nohasharray
112330 +irq_pkt_threshold_read_33356 irq_pkt_threshold_read 3 33356 &create_xattr_datum_33356
112331 +read_file_regidx_33370 read_file_regidx 3 33370 NULL
112332 +ieee80211_if_read_dropped_frames_no_route_33383 ieee80211_if_read_dropped_frames_no_route 3 33383 NULL
112333 +scsi_varlen_cdb_length_33385 scsi_varlen_cdb_length 0 33385 NULL
112334 +ocfs2_allocate_unwritten_extents_33394 ocfs2_allocate_unwritten_extents 3-2 33394 NULL
112335 +cfs_trace_copyin_string_33396 cfs_trace_copyin_string 4 33396 NULL
112336 +snd_pcm_capture_ioctl1_33408 snd_pcm_capture_ioctl1 0 33408 NULL
112337 +filemap_fdatawrite_33415 filemap_fdatawrite 0 33415 NULL
112338 +hash_netiface6_expire_33421 hash_netiface6_expire 4 33421 NULL
112339 +dis_tap_write_33426 dis_tap_write 3 33426 NULL
112340 +message_stats_list_33440 message_stats_list 5 33440 NULL
112341 +ovs_vport_alloc_33475 ovs_vport_alloc 1 33475 NULL
112342 +create_entry_33479 create_entry 2 33479 NULL
112343 +ip_setsockopt_33487 ip_setsockopt 5 33487 NULL
112344 +res_counter_read_33499 res_counter_read 4 33499 NULL
112345 +hash_netnet4_expire_33500 hash_netnet4_expire 4 33500 NULL
112346 +fb_read_33506 fb_read 3 33506 NULL
112347 +musb_test_mode_write_33518 musb_test_mode_write 3 33518 NULL
112348 +ahash_setkey_unaligned_33521 ahash_setkey_unaligned 3 33521 NULL
112349 +nes_alloc_fast_reg_page_list_33523 nes_alloc_fast_reg_page_list 2 33523 NULL
112350 +aggr_size_rx_size_read_33526 aggr_size_rx_size_read 3 33526 NULL
112351 +tomoyo_read_self_33539 tomoyo_read_self 3 33539 NULL nohasharray
112352 +osc_max_rpcs_in_flight_seq_write_33539 osc_max_rpcs_in_flight_seq_write 3 33539 &tomoyo_read_self_33539
112353 +count_subheaders_33591 count_subheaders 0 33591 NULL
112354 +scsi_execute_33596 scsi_execute 5 33596 NULL
112355 +comedi_buf_write_n_allocated_33604 comedi_buf_write_n_allocated 0 33604 NULL
112356 +xt_compat_target_offset_33608 xt_compat_target_offset 0 33608 NULL
112357 +usb_gstrings_attach_33615 usb_gstrings_attach 3 33615 NULL nohasharray
112358 +il_dbgfs_qos_read_33615 il_dbgfs_qos_read 3 33615 &usb_gstrings_attach_33615
112359 +xfs_btree_check_sblock_33618 xfs_btree_check_sblock 0 33618 NULL
112360 +stride_page_count_33641 stride_page_count 2 33641 NULL
112361 +irq_blk_threshold_read_33666 irq_blk_threshold_read 3 33666 NULL
112362 +inw_p_33668 inw_p 0 33668 NULL
112363 +arp_hdr_len_33671 arp_hdr_len 0 33671 NULL
112364 +i2c_hid_alloc_buffers_33673 i2c_hid_alloc_buffers 2 33673 NULL
112365 +submit_one_bio_33683 submit_one_bio 0 33683 NULL
112366 +nv50_disp_dmac_create__33696 nv50_disp_dmac_create_ 6 33696 NULL
112367 +netlink_sendmsg_33708 netlink_sendmsg 4 33708 NULL
112368 +tipc_link_stats_33716 tipc_link_stats 3 33716 NULL
112369 +ext4_wb_update_i_disksize_33717 ext4_wb_update_i_disksize 2 33717 NULL
112370 +pvr2_stream_buffer_count_33719 pvr2_stream_buffer_count 2 33719 NULL
112371 +write_file_spectral_count_33723 write_file_spectral_count 3 33723 NULL
112372 +read_file_node_recv_33729 read_file_node_recv 3 33729 NULL
112373 +__mutex_lock_interruptible_slowpath_33735 __mutex_lock_interruptible_slowpath 0 33735 NULL
112374 +vifs_state_read_33762 vifs_state_read 3 33762 NULL
112375 +hashtab_create_33769 hashtab_create 3 33769 NULL
112376 +if_sdio_read_rx_len_33800 if_sdio_read_rx_len 0 33800 NULL
112377 +filter_write_33819 filter_write 3 33819 NULL
112378 +sep_create_msgarea_context_33829 sep_create_msgarea_context 4 33829 NULL
112379 +scrub_setup_recheck_block_33831 scrub_setup_recheck_block 5-4 33831 NULL
112380 +ext4_journal_extend_33835 ext4_journal_extend 2 33835 NULL
112381 +oz_cdev_write_33852 oz_cdev_write 3 33852 NULL
112382 +get_user_pages_33908 get_user_pages 0 33908 NULL
112383 +sg_nents_33909 sg_nents 0 33909 NULL
112384 +ath6kl_roam_mode_write_33912 ath6kl_roam_mode_write 3 33912 NULL
112385 +queue_logical_block_size_33918 queue_logical_block_size 0 33918 NULL
112386 +sel_read_avc_cache_threshold_33942 sel_read_avc_cache_threshold 3 33942 NULL
112387 +lpfc_idiag_ctlacc_read_33943 lpfc_idiag_ctlacc_read 3 33943 NULL
112388 +read_file_tgt_rx_stats_33944 read_file_tgt_rx_stats 3 33944 NULL
112389 +__proc_dump_kernel_33954 __proc_dump_kernel 5 33954 NULL
112390 +btrfs_delalloc_reserve_metadata_33963 btrfs_delalloc_reserve_metadata 0 33963 NULL
112391 +vga_switcheroo_debugfs_write_33984 vga_switcheroo_debugfs_write 3 33984 NULL
112392 +lbs_lowrssi_write_34025 lbs_lowrssi_write 3 34025 NULL
112393 +ppp_write_34034 ppp_write 3 34034 NULL
112394 +tty_insert_flip_string_34042 tty_insert_flip_string 3-0 34042 NULL
112395 +memcg_update_all_caches_34068 memcg_update_all_caches 1 34068 NULL
112396 +xfs_dialloc_34078 xfs_dialloc 0 34078 NULL
112397 +pipeline_pipeline_fifo_full_read_34095 pipeline_pipeline_fifo_full_read 3 34095 NULL
112398 +__irq_domain_add_34101 __irq_domain_add 2 34101 NULL
112399 +proc_scsi_host_write_34107 proc_scsi_host_write 3 34107 NULL
112400 +islpci_mgt_transmit_34133 islpci_mgt_transmit 5 34133 NULL
112401 +ttm_dma_page_pool_free_34135 ttm_dma_page_pool_free 2-0 34135 NULL
112402 +ixgbe_dbg_netdev_ops_write_34141 ixgbe_dbg_netdev_ops_write 3 34141 NULL
112403 +shmem_pread_fast_34147 shmem_pread_fast 3 34147 NULL
112404 +ocfs2_xattr_list_entry_34165 ocfs2_xattr_list_entry 0 34165 NULL
112405 +skb_to_sgvec_34171 skb_to_sgvec 0 34171 NULL
112406 +xfs_bmapi_write_34208 xfs_bmapi_write 0 34208 NULL
112407 +ext4_da_write_begin_34215 ext4_da_write_begin 3-4 34215 NULL
112408 +bl_pipe_downcall_34264 bl_pipe_downcall 3 34264 NULL
112409 +ocfs2_dlm_lock_34265 ocfs2_dlm_lock 0 34265 NULL
112410 +device_private_init_34279 device_private_init 0 34279 NULL
112411 +ext4_get_groups_count_34324 ext4_get_groups_count 0 34324 NULL
112412 +pcpu_need_to_extend_34326 pcpu_need_to_extend 0 34326 NULL nohasharray
112413 +iov_iter_single_seg_count_34326 iov_iter_single_seg_count 0 34326 &pcpu_need_to_extend_34326
112414 +crypto_ablkcipher_ivsize_34363 crypto_ablkcipher_ivsize 0 34363 NULL nohasharray
112415 +sync_page_io_34363 sync_page_io 3 34363 &crypto_ablkcipher_ivsize_34363
112416 +rngapi_reset_34366 rngapi_reset 3 34366 NULL
112417 +ea_read_34378 ea_read 0 34378 NULL
112418 +fuse_send_read_34379 fuse_send_read 4 34379 NULL
112419 +av7110_vbi_write_34384 av7110_vbi_write 3 34384 NULL
112420 +usbvision_v4l2_read_34386 usbvision_v4l2_read 3 34386 NULL
112421 +read_rbu_image_type_34387 read_rbu_image_type 6 34387 NULL
112422 +iwl_calib_set_34400 iwl_calib_set 3 34400 NULL nohasharray
112423 +ivtv_read_pos_34400 ivtv_read_pos 3 34400 &iwl_calib_set_34400
112424 +wd_exp_mode_write_34407 wd_exp_mode_write 3 34407 NULL
112425 +nl80211_send_disassoc_34424 nl80211_send_disassoc 4 34424 NULL
112426 +__extent_read_full_page_34437 __extent_read_full_page 0 34437 NULL
112427 +usbtest_alloc_urb_34446 usbtest_alloc_urb 3-5 34446 NULL
112428 +mwifiex_regrdwr_read_34472 mwifiex_regrdwr_read 3 34472 NULL
112429 +skcipher_sndbuf_34476 skcipher_sndbuf 0 34476 NULL
112430 +i2o_parm_field_get_34477 i2o_parm_field_get 5 34477 NULL
112431 +security_inode_permission_34488 security_inode_permission 0 34488 NULL
112432 +SyS_pwritev_34494 SyS_pwritev 3 34494 NULL
112433 +qp_alloc_res_34496 qp_alloc_res 5 34496 NULL
112434 +lu_buf_check_and_alloc_34505 lu_buf_check_and_alloc 2 34505 NULL
112435 +ext4_fallocate_34537 ext4_fallocate 4-3 34537 NULL nohasharray
112436 +tracing_stats_read_34537 tracing_stats_read 3 34537 &ext4_fallocate_34537
112437 +hugetlbfs_read_actor_34547 hugetlbfs_read_actor 2-5-4-0 34547 NULL
112438 +dbBackSplit_34561 dbBackSplit 0 34561 NULL
112439 +alloc_ieee80211_rsl_34564 alloc_ieee80211_rsl 1 34564 NULL
112440 +lov_stripecount_seq_write_34582 lov_stripecount_seq_write 3 34582 NULL
112441 +init_send_hfcd_34586 init_send_hfcd 1 34586 NULL
112442 +inet6_ifla6_size_34591 inet6_ifla6_size 0 34591 NULL
112443 +ceph_msgpool_init_34599 ceph_msgpool_init 4 34599 NULL nohasharray
112444 +cw1200_queue_init_34599 cw1200_queue_init 4 34599 &ceph_msgpool_init_34599
112445 +bio_integrity_bytes_34602 bio_integrity_bytes 2 34602 NULL
112446 +__jffs2_ref_totlen_34609 __jffs2_ref_totlen 0 34609 NULL
112447 +apei_get_nvs_resources_34616 apei_get_nvs_resources 0 34616 NULL
112448 +__cfg80211_disconnected_34622 __cfg80211_disconnected 3 34622 NULL
112449 +cnic_alloc_dma_34641 cnic_alloc_dma 3 34641 NULL
112450 +kvm_set_spte_hva_34671 kvm_set_spte_hva 2 34671 NULL
112451 +sleep_auth_write_34676 sleep_auth_write 3 34676 NULL
112452 +isr_fiqs_read_34687 isr_fiqs_read 3 34687 NULL
112453 +batadv_tvlv_realloc_packet_buff_34688 batadv_tvlv_realloc_packet_buff 3-4 34688 NULL
112454 +port_print_34704 port_print 3 34704 NULL
112455 +ieee80211_if_read_num_sta_ps_34722 ieee80211_if_read_num_sta_ps 3 34722 NULL
112456 +platform_list_read_file_34734 platform_list_read_file 3 34734 NULL
112457 +reg_w_ixbuf_34736 reg_w_ixbuf 4 34736 NULL
112458 +lsm_alloc_plain_34755 lsm_alloc_plain 1 34755 NULL
112459 +bootmode_store_34762 bootmode_store 4 34762 NULL
112460 +device_add_34766 device_add 0 34766 NULL
112461 +xfs_iget_cache_hit_34767 xfs_iget_cache_hit 0 34767 NULL
112462 +qib_cdev_init_34778 qib_cdev_init 1 34778 NULL
112463 +SYSC_keyctl_34800 SYSC_keyctl 4 34800 NULL
112464 +can_nocow_extent_34801 can_nocow_extent 2 34801 NULL
112465 +drbd_get_max_capacity_34804 drbd_get_max_capacity 0 34804 NULL
112466 +ll_setxattr_34806 ll_setxattr 4 34806 NULL
112467 +file_page_index_34820 file_page_index 0-2 34820 NULL
112468 +bio_segments_34832 bio_segments 0 34832 NULL
112469 +b43_debugfs_write_34838 b43_debugfs_write 3 34838 NULL
112470 +nl_portid_hash_zalloc_34843 nl_portid_hash_zalloc 1 34843 NULL
112471 +acpi_system_write_wakeup_device_34853 acpi_system_write_wakeup_device 3 34853 NULL
112472 +usb_serial_generic_prepare_write_buffer_34857 usb_serial_generic_prepare_write_buffer 3 34857 NULL
112473 +ieee80211_if_read_txpower_34871 ieee80211_if_read_txpower 3 34871 NULL
112474 +msg_print_text_34889 msg_print_text 0 34889 NULL
112475 +ieee80211_if_write_34894 ieee80211_if_write 3 34894 NULL
112476 +gfs2_glock_wait_34913 gfs2_glock_wait 0 34913 NULL
112477 +si476x_radio_read_rsq_primary_blob_34916 si476x_radio_read_rsq_primary_blob 3 34916 NULL
112478 +btrfs_super_chunk_root_34925 btrfs_super_chunk_root 0 34925 NULL nohasharray
112479 +__inode_permission_34925 __inode_permission 0 34925 &btrfs_super_chunk_root_34925
112480 +ceph_aio_write_34930 ceph_aio_write 4 34930 NULL
112481 +snd_info_entry_read_34938 snd_info_entry_read 3 34938 NULL
112482 +i2c_transfer_34958 i2c_transfer 0 34958 NULL
112483 +do_add_page_to_bio_34974 do_add_page_to_bio 2-10 34974 NULL
112484 +print_message_35000 print_message 0 35000 NULL
112485 +rx_rx_hdr_overflow_read_35002 rx_rx_hdr_overflow_read 3 35002 NULL
112486 +l2cap_skbuff_fromiovec_35003 l2cap_skbuff_fromiovec 4-3 35003 NULL
112487 +sisusb_copy_memory_35016 sisusb_copy_memory 4 35016 NULL
112488 +coda_psdev_read_35029 coda_psdev_read 3 35029 NULL
112489 +xfs_rtallocate_extent_35052 xfs_rtallocate_extent 0 35052 NULL
112490 +pwr_connection_out_of_sync_read_35061 pwr_connection_out_of_sync_read 3 35061 NULL
112491 +ntfs_attr_extend_initialized_35084 ntfs_attr_extend_initialized 0 35084 NULL
112492 +__kfifo_uint_must_check_helper_35097 __kfifo_uint_must_check_helper 0-1 35097 NULL
112493 +capi_write_35104 capi_write 3 35104 NULL nohasharray
112494 +tx_tx_done_template_read_35104 tx_tx_done_template_read 3 35104 &capi_write_35104
112495 +ide_settings_proc_write_35110 ide_settings_proc_write 3 35110 NULL
112496 +ceph_osdc_start_request_35122 ceph_osdc_start_request 0 35122 NULL
112497 +message_stats_print_35158 message_stats_print 6 35158 NULL
112498 +iscsi_conn_setup_35159 iscsi_conn_setup 2 35159 NULL
112499 +ieee80211_if_read_bssid_35161 ieee80211_if_read_bssid 3 35161 NULL
112500 +unix_stream_recvmsg_35210 unix_stream_recvmsg 4 35210 NULL
112501 +striped_read_35218 striped_read 0-2 35218 NULL nohasharray
112502 +security_key_getsecurity_35218 security_key_getsecurity 0 35218 &striped_read_35218
112503 +rx_rx_cmplt_task_read_35226 rx_rx_cmplt_task_read 3 35226 NULL
112504 +set_fd_set_35249 set_fd_set 1 35249 NULL
112505 +ioapic_setup_resources_35255 ioapic_setup_resources 1 35255 NULL
112506 +jbd2_journal_get_write_access_35263 jbd2_journal_get_write_access 0 35263 NULL
112507 +dis_disc_write_35265 dis_disc_write 3 35265 NULL
112508 +dma_show_regs_35266 dma_show_regs 3 35266 NULL
112509 +irda_recvmsg_stream_35280 irda_recvmsg_stream 4 35280 NULL
112510 +i2o_block_end_request_35282 i2o_block_end_request 3 35282 NULL
112511 +isr_rx_rdys_read_35283 isr_rx_rdys_read 3 35283 NULL
112512 +__btrfs_buffered_write_35311 __btrfs_buffered_write 3-0 35311 NULL nohasharray
112513 +brcmf_sdio_forensic_read_35311 brcmf_sdio_forensic_read 3 35311 &__btrfs_buffered_write_35311
112514 +tracing_read_pipe_35312 tracing_read_pipe 3 35312 NULL
112515 +sta_tx_latency_stat_write_35323 sta_tx_latency_stat_write 3 35323 NULL
112516 +xfs_btree_check_lblock_35333 xfs_btree_check_lblock 0 35333 NULL
112517 +ieee80211_if_fmt_ap_power_level_35347 ieee80211_if_fmt_ap_power_level 3 35347 NULL
112518 +nouveau_devinit_create__35348 nouveau_devinit_create_ 4 35348 NULL
112519 +ieee80211_rx_mgmt_deauth_35351 ieee80211_rx_mgmt_deauth 3 35351 NULL
112520 +compat_filldir64_35354 compat_filldir64 3 35354 NULL
112521 +read_kmem_35372 read_kmem 3 35372 NULL
112522 +SyS_getxattr_35408 SyS_getxattr 4 35408 NULL
112523 +rawv6_send_hdrinc_35425 rawv6_send_hdrinc 3 35425 NULL
112524 +buffer_to_user_35439 buffer_to_user 3 35439 NULL
112525 +efx_mcdi_rpc_async_quiet_35460 efx_mcdi_rpc_async_quiet 4-5 35460 NULL
112526 +macvtap_do_read_35475 macvtap_do_read 3 35475 NULL
112527 +fiemap_prepare_and_copy_exts_35494 fiemap_prepare_and_copy_exts 5 35494 NULL
112528 +btrfs_prealloc_file_range_trans_35500 btrfs_prealloc_file_range_trans 4 35500 NULL
112529 +async_setkey_35521 async_setkey 3 35521 NULL
112530 +__filemap_fdatawrite_range_35528 __filemap_fdatawrite_range 0 35528 NULL
112531 +iwl_dbgfs_bt_traffic_read_35534 iwl_dbgfs_bt_traffic_read 3 35534 NULL
112532 +pstore_mkfile_35536 pstore_mkfile 7 35536 NULL
112533 +rxpipe_tx_xfr_host_int_trig_rx_data_read_35538 rxpipe_tx_xfr_host_int_trig_rx_data_read 3 35538 NULL
112534 +ocfs2_write_zero_page_35539 ocfs2_write_zero_page 3 35539 NULL
112535 +ibnl_put_attr_35541 ibnl_put_attr 3 35541 NULL
112536 +ieee80211_if_write_smps_35550 ieee80211_if_write_smps 3 35550 NULL
112537 +ext4_blocks_for_truncate_35579 ext4_blocks_for_truncate 0 35579 NULL
112538 +ext2_acl_from_disk_35580 ext2_acl_from_disk 2 35580 NULL
112539 +spk_msg_set_35586 spk_msg_set 3 35586 NULL
112540 +kernel_readv_35617 kernel_readv 3 35617 NULL
112541 +reiserfs_readpages_35629 reiserfs_readpages 4 35629 NULL
112542 +pci_request_regions_35635 pci_request_regions 0 35635 NULL
112543 +ptlrpcd_steal_rqset_35637 ptlrpcd_steal_rqset 0 35637 NULL
112544 +spi_register_board_info_35651 spi_register_board_info 2 35651 NULL
112545 +rdmaltWithLock_35669 rdmaltWithLock 0 35669 NULL
112546 +SYSC_pwritev_35690 SYSC_pwritev 3 35690 NULL
112547 +rds_page_copy_user_35691 rds_page_copy_user 4 35691 NULL
112548 +md_super_write_35703 md_super_write 4 35703 NULL
112549 +iwl_dbgfs_disable_ht40_read_35761 iwl_dbgfs_disable_ht40_read 3 35761 NULL
112550 +udf_alloc_i_data_35786 udf_alloc_i_data 2 35786 NULL
112551 +pvr2_hdw_cpufw_get_35824 pvr2_hdw_cpufw_get 0-4-2 35824 NULL
112552 +tx_tx_cmplt_read_35854 tx_tx_cmplt_read 3 35854 NULL
112553 +vx_query_hbuffer_size_35859 vx_query_hbuffer_size 0 35859 NULL
112554 +mthca_buf_alloc_35861 mthca_buf_alloc 2 35861 NULL
112555 +fls64_35862 fls64 0 35862 NULL
112556 +kvm_dirty_bitmap_bytes_35886 kvm_dirty_bitmap_bytes 0 35886 NULL
112557 +ieee80211_if_fmt_dot11MeshRetryTimeout_35890 ieee80211_if_fmt_dot11MeshRetryTimeout 3 35890 NULL
112558 +uwb_rc_cmd_done_35892 uwb_rc_cmd_done 4 35892 NULL
112559 +SyS_set_mempolicy_35909 SyS_set_mempolicy 3 35909 NULL
112560 +kernel_setsockopt_35913 kernel_setsockopt 5 35913 NULL
112561 +rbio_nr_pages_35916 rbio_nr_pages 0-1-2 35916 NULL
112562 +sctp_tsnmap_mark_35929 sctp_tsnmap_mark 2 35929 NULL
112563 +rx_defrag_init_called_read_35935 rx_defrag_init_called_read 3 35935 NULL
112564 +put_cmsg_compat_35937 put_cmsg_compat 4 35937 NULL
112565 +ext_rts51x_sd_execute_write_data_35971 ext_rts51x_sd_execute_write_data 9 35971 NULL
112566 +ceph_buffer_new_35974 ceph_buffer_new 1 35974 NULL nohasharray
112567 +generic_ocp_read_35974 generic_ocp_read 3 35974 &ceph_buffer_new_35974
112568 +acl_alloc_35979 acl_alloc 1 35979 NULL
112569 +device_add_class_symlinks_35985 device_add_class_symlinks 0 35985 NULL
112570 +write_file_antenna_35998 write_file_antenna 3 35998 NULL nohasharray
112571 +kuc_alloc_35998 kuc_alloc 1 35998 &write_file_antenna_35998
112572 +il3945_ucode_tx_stats_read_36016 il3945_ucode_tx_stats_read 3 36016 NULL
112573 +__videobuf_alloc_36031 __videobuf_alloc 1 36031 NULL
112574 +account_shadowed_36048 account_shadowed 2 36048 NULL
112575 +gpio_power_read_36059 gpio_power_read 3 36059 NULL
112576 +write_emulate_36065 write_emulate 2-4 36065 NULL
112577 +stack_max_size_write_36068 stack_max_size_write 3 36068 NULL
112578 +radeon_vm_num_pdes_36070 radeon_vm_num_pdes 0 36070 NULL
112579 +ieee80211_if_fmt_peer_36071 ieee80211_if_fmt_peer 3 36071 NULL
112580 +ieee80211_if_write_tsf_36077 ieee80211_if_write_tsf 3 36077 NULL
112581 +snd_pcm_plug_read_transfer_36080 snd_pcm_plug_read_transfer 0-3 36080 NULL
112582 +mtip_hw_read_device_status_36082 mtip_hw_read_device_status 3 36082 NULL
112583 +vga_arb_write_36112 vga_arb_write 3 36112 NULL
112584 +simple_xattr_alloc_36118 simple_xattr_alloc 2 36118 NULL
112585 +ext3_readpages_36144 ext3_readpages 4 36144 NULL
112586 +twl_set_36154 twl_set 2 36154 NULL
112587 +b1_alloc_card_36155 b1_alloc_card 1 36155 NULL
112588 +snd_korg1212_copy_from_36169 snd_korg1212_copy_from 6 36169 NULL
112589 +SyS_kexec_load_36176 SyS_kexec_load 2 36176 NULL
112590 +ramoops_init_przs_36199 ramoops_init_przs 4 36199 NULL
112591 +SYSC_sched_getaffinity_36208 SYSC_sched_getaffinity 2 36208 NULL
112592 +SYSC_process_vm_readv_36216 SYSC_process_vm_readv 3-5 36216 NULL
112593 +atomic_stats_read_36228 atomic_stats_read 3 36228 NULL
112594 +viafb_iga1_odev_proc_write_36241 viafb_iga1_odev_proc_write 3 36241 NULL
112595 +SYSC_getxattr_36242 SYSC_getxattr 4 36242 NULL
112596 +rproc_recovery_read_36245 rproc_recovery_read 3 36245 NULL
112597 +scrub_stripe_36248 scrub_stripe 5-4 36248 NULL
112598 +compat_sys_mbind_36256 compat_sys_mbind 5 36256 NULL
112599 +usb_buffer_alloc_36276 usb_buffer_alloc 2 36276 NULL nohasharray
112600 +cfs_hash_buckets_realloc_36276 cfs_hash_buckets_realloc 4 36276 &usb_buffer_alloc_36276
112601 +codec_reg_read_file_36280 codec_reg_read_file 3 36280 NULL
112602 +crypto_shash_digestsize_36284 crypto_shash_digestsize 0 36284 NULL
112603 +nouveau_cli_create_36293 nouveau_cli_create 3 36293 NULL
112604 +lpfc_debugfs_dif_err_read_36303 lpfc_debugfs_dif_err_read 3 36303 NULL
112605 +cfg80211_rx_mlme_mgmt_36306 cfg80211_rx_mlme_mgmt 3 36306 NULL
112606 +ad7879_spi_xfer_36311 ad7879_spi_xfer 3 36311 NULL
112607 +fat_compat_ioctl_filldir_36328 fat_compat_ioctl_filldir 3 36328 NULL
112608 +lc_create_36332 lc_create 4 36332 NULL
112609 +jbd2_journal_init_revoke_table_36336 jbd2_journal_init_revoke_table 1 36336 NULL
112610 +isku_sysfs_read_key_mask_36343 isku_sysfs_read_key_mask 6 36343 NULL
112611 +ath6kl_regwrite_write_36351 ath6kl_regwrite_write 3 36351 NULL
112612 +v9fs_file_readn_36353 v9fs_file_readn 4 36353 NULL
112613 +to_sector_36361 to_sector 0-1 36361 NULL
112614 +tunables_read_36385 tunables_read 3 36385 NULL
112615 +afs_alloc_flat_call_36399 afs_alloc_flat_call 2-3 36399 NULL
112616 +sierra_write_36402 sierra_write 4 36402 NULL
112617 +qdsb_get_36409 qdsb_get 0 36409 NULL
112618 +SyS_sethostname_36417 SyS_sethostname 2 36417 NULL
112619 +ReadW6692B_36445 ReadW6692B 0 36445 NULL
112620 +sctp_tsnmap_init_36446 sctp_tsnmap_init 2 36446 NULL
112621 +alloc_etherdev_mqs_36450 alloc_etherdev_mqs 1 36450 NULL
112622 +SyS_process_vm_writev_36476 SyS_process_vm_writev 3-5 36476 NULL
112623 +lock_and_cleanup_extent_if_need_36480 lock_and_cleanup_extent_if_need 0 36480 NULL
112624 +b43_nphy_load_samples_36481 b43_nphy_load_samples 3 36481 NULL
112625 +ip6_append_data_36490 ip6_append_data 4 36490 NULL nohasharray
112626 +tx_tx_checksum_result_read_36490 tx_tx_checksum_result_read 3 36490 &ip6_append_data_36490
112627 +cmd_loop_36491 cmd_loop 0 36491 NULL
112628 +__hwahc_op_set_ptk_36510 __hwahc_op_set_ptk 5 36510 NULL
112629 +mcam_v4l_read_36513 mcam_v4l_read 3 36513 NULL
112630 +_iwl_dbgfs_fw_nmi_write_36515 _iwl_dbgfs_fw_nmi_write 3 36515 NULL
112631 +get_param_l_36518 get_param_l 0 36518 NULL
112632 +ieee80211_if_read_fwded_frames_36520 ieee80211_if_read_fwded_frames 3 36520 NULL
112633 +crypto_aead_authsize_36537 crypto_aead_authsize 0 36537 NULL
112634 +cpu_type_read_36540 cpu_type_read 3 36540 NULL
112635 +__kfifo_to_user_36555 __kfifo_to_user 3-0 36555 NULL
112636 +btrfs_get_token_64_36572 btrfs_get_token_64 0 36572 NULL
112637 +__erst_read_36579 __erst_read 0 36579 NULL
112638 +put_cmsg_36589 put_cmsg 4 36589 NULL
112639 +fat_ioctl_filldir_36621 fat_ioctl_filldir 3 36621 NULL
112640 +vxge_config_vpaths_36636 vxge_config_vpaths 0 36636 NULL
112641 +convert_extent_item_v0_36645 convert_extent_item_v0 4 36645 NULL
112642 +ced_ioctl_36647 ced_ioctl 2 36647 NULL
112643 +lpfc_idiag_extacc_alloc_get_36648 lpfc_idiag_extacc_alloc_get 0-3 36648 NULL
112644 +osd_req_list_collection_objects_36664 osd_req_list_collection_objects 5 36664 NULL
112645 +iscsi_host_alloc_36671 iscsi_host_alloc 2 36671 NULL
112646 +xillybus_read_36678 xillybus_read 3 36678 NULL
112647 +gsmtty_write_36702 gsmtty_write 3 36702 NULL
112648 +snd_rawmidi_kernel_read1_36740 snd_rawmidi_kernel_read1 4-0 36740 NULL
112649 +cxgbi_device_register_36746 cxgbi_device_register 1-2 36746 NULL
112650 +ps_poll_upsd_timeouts_read_36755 ps_poll_upsd_timeouts_read 3 36755 NULL
112651 +ptp_filter_init_36780 ptp_filter_init 2 36780 NULL
112652 +i40e_init_lan_hmc_36796 i40e_init_lan_hmc 5-4-3-2 36796 NULL
112653 +proc_fault_inject_read_36802 proc_fault_inject_read 3 36802 NULL
112654 +hiddev_ioctl_36816 hiddev_ioctl 2 36816 NULL
112655 +int_hardware_entry_36833 int_hardware_entry 3 36833 NULL
112656 +fc_change_queue_depth_36841 fc_change_queue_depth 2 36841 NULL
112657 +keyctl_describe_key_36853 keyctl_describe_key 3 36853 NULL
112658 +cm_write_36858 cm_write 3 36858 NULL
112659 +tx_tx_data_programmed_read_36871 tx_tx_data_programmed_read 3 36871 NULL
112660 +svc_setsockopt_36876 svc_setsockopt 5 36876 NULL
112661 +raid56_parity_write_36877 raid56_parity_write 5 36877 NULL
112662 +__btrfs_map_block_36883 __btrfs_map_block 3 36883 NULL
112663 +ib_ucm_alloc_data_36885 ib_ucm_alloc_data 3 36885 NULL
112664 +selinux_inode_notifysecctx_36896 selinux_inode_notifysecctx 3 36896 NULL
112665 +OS_kmalloc_36909 OS_kmalloc 1 36909 NULL
112666 +crypto_blkcipher_ivsize_36944 crypto_blkcipher_ivsize 0 36944 NULL
112667 +il4965_rs_sta_dbgfs_scale_table_write_36979 il4965_rs_sta_dbgfs_scale_table_write 3 36979 NULL
112668 +xfs_btree_check_sptr_36984 xfs_btree_check_sptr 0 36984 NULL
112669 +drbd_new_dev_size_36998 drbd_new_dev_size 0-3 36998 NULL
112670 +auok190xfb_write_37001 auok190xfb_write 3 37001 NULL
112671 +setxattr_37006 setxattr 4 37006 NULL
112672 +ocfs2_dlm_unlock_37037 ocfs2_dlm_unlock 0 37037 NULL
112673 +command_file_read_37038 command_file_read 3 37038 NULL
112674 +figure_loop_size_37051 figure_loop_size 2-3 37051 NULL
112675 +ieee80211_if_read_drop_unencrypted_37053 ieee80211_if_read_drop_unencrypted 3 37053 NULL nohasharray
112676 +qp_broker_create_37053 qp_broker_create 6-5 37053 &ieee80211_if_read_drop_unencrypted_37053
112677 +SYSC_setxattr_37078 SYSC_setxattr 4 37078 NULL
112678 +parse_command_37079 parse_command 2 37079 NULL
112679 +pipeline_cs_rx_packet_in_read_37089 pipeline_cs_rx_packet_in_read 3 37089 NULL
112680 +tun_get_user_37094 tun_get_user 5 37094 NULL
112681 +xlog_grant_head_check_37116 xlog_grant_head_check 0 37116 NULL
112682 +has_wrprotected_page_37123 has_wrprotected_page 3-2 37123 NULL
112683 +snd_hda_get_conn_list_37132 snd_hda_get_conn_list 0 37132 NULL
112684 +mtt_free_res_37144 mtt_free_res 5 37144 NULL
112685 +msg_word_37164 msg_word 0 37164 NULL
112686 +f2fs_direct_IO_37167 f2fs_direct_IO 4 37167 NULL
112687 +vcc_recvmsg_37198 vcc_recvmsg 4 37198 NULL
112688 +forced_ps_write_37209 forced_ps_write 3 37209 NULL
112689 +crypto_shash_descsize_37212 crypto_shash_descsize 0 37212 NULL nohasharray
112690 +ext4_ind_direct_IO_37212 ext4_ind_direct_IO 0-4 37212 &crypto_shash_descsize_37212
112691 +bchannel_get_rxbuf_37213 bchannel_get_rxbuf 2-0 37213 NULL
112692 +regmap_access_read_file_37223 regmap_access_read_file 3 37223 NULL
112693 +__do_replace_37227 __do_replace 5 37227 NULL
112694 +iwl_dbgfs_d3_sram_read_37237 iwl_dbgfs_d3_sram_read 3 37237 NULL
112695 +rx_filter_dup_filter_read_37238 rx_filter_dup_filter_read 3 37238 NULL
112696 +xfs_reclaim_inode_37257 xfs_reclaim_inode 0 37257 NULL
112697 +exofs_max_io_pages_37263 exofs_max_io_pages 0-2 37263 NULL
112698 +_iwl_dbgfs_fw_restart_write_37270 _iwl_dbgfs_fw_restart_write 3 37270 NULL
112699 +ieee80211_if_read_power_mode_37305 ieee80211_if_read_power_mode 3 37305 NULL
112700 +ext3_direct_IO_37308 ext3_direct_IO 4 37308 NULL
112701 +jffs2_write_dirent_37311 jffs2_write_dirent 5 37311 NULL
112702 +send_msg_37323 send_msg 4 37323 NULL
112703 +l2cap_create_connless_pdu_37327 l2cap_create_connless_pdu 3 37327 NULL
112704 +scsi_mode_select_37330 scsi_mode_select 6 37330 NULL
112705 +rxrpc_server_sendmsg_37331 rxrpc_server_sendmsg 4 37331 NULL
112706 +xfs_iomap_write_allocate_37336 xfs_iomap_write_allocate 0 37336 NULL
112707 +security_inode_getsecurity_37354 security_inode_getsecurity 0 37354 NULL
112708 +hci_sock_sendmsg_37420 hci_sock_sendmsg 4 37420 NULL
112709 +acpi_os_allocate_zeroed_37422 acpi_os_allocate_zeroed 1 37422 NULL
112710 +tty_insert_flip_string_fixed_flag_37428 tty_insert_flip_string_fixed_flag 4-0 37428 NULL
112711 +iwl_print_last_event_logs_37433 iwl_print_last_event_logs 0-7-9 37433 NULL
112712 +fru_alloc_37442 fru_alloc 1 37442 NULL
112713 +tcp_established_options_37450 tcp_established_options 0 37450 NULL nohasharray
112714 +tipc_send2port_37450 tipc_send2port 4 37450 &tcp_established_options_37450
112715 +xfs_btree_dec_cursor_37452 xfs_btree_dec_cursor 0 37452 NULL
112716 +brcmf_sdio_dump_console_37455 brcmf_sdio_dump_console 4 37455 NULL
112717 +get_est_timing_37484 get_est_timing 0 37484 NULL
112718 +kmem_realloc_37489 kmem_realloc 2 37489 NULL
112719 +bitmap_dirty_bits_37503 bitmap_dirty_bits 2 37503 NULL
112720 +osc_active_seq_write_37514 osc_active_seq_write 3 37514 NULL
112721 +bdev_writeseg_37519 bdev_writeseg 2-3 37519 NULL
112722 +xz_dec_test_write_37527 xz_dec_test_write 3 37527 NULL
112723 +fault_inject_read_37534 fault_inject_read 3 37534 NULL
112724 +hdr_size_37536 hdr_size 0 37536 NULL
112725 +extent_map_end_37550 extent_map_end 0 37550 NULL
112726 +sep_create_dcb_dmatables_context_37551 sep_create_dcb_dmatables_context 6 37551 NULL
112727 +fat_cont_expand_37552 fat_cont_expand 0 37552 NULL
112728 +ioat_chansts_37558 ioat_chansts 0 37558 NULL
112729 +xhci_alloc_streams_37586 xhci_alloc_streams 5 37586 NULL
112730 +qla2x00_debounce_register_37597 qla2x00_debounce_register 0 37597 NULL
112731 +kvm_read_guest_page_mmu_37611 kvm_read_guest_page_mmu 6 37611 NULL
112732 +SYSC_mbind_37622 SYSC_mbind 5 37622 NULL
112733 +SyS_mbind_37638 SyS_mbind 5 37638 NULL
112734 +may_delete_37656 may_delete 0 37656 NULL
112735 +bio_copy_user_iov_37660 bio_copy_user_iov 4 37660 NULL
112736 +rfcomm_sock_sendmsg_37661 rfcomm_sock_sendmsg 4 37661 NULL nohasharray
112737 +vmw_framebuffer_dmabuf_dirty_37661 vmw_framebuffer_dmabuf_dirty 6 37661 &rfcomm_sock_sendmsg_37661
112738 +SYSC_get_mempolicy_37664 SYSC_get_mempolicy 3 37664 NULL
112739 +__wa_seg_calculate_isoc_frame_count_37672 __wa_seg_calculate_isoc_frame_count 0 37672 NULL
112740 +ieee80211_if_read_rc_rateidx_mcs_mask_2ghz_37675 ieee80211_if_read_rc_rateidx_mcs_mask_2ghz 3 37675 NULL
112741 +regmap_map_read_file_37685 regmap_map_read_file 3 37685 NULL
112742 +nametbl_header_37698 nametbl_header 2-0 37698 NULL
112743 +__le32_to_cpup_37702 __le32_to_cpup 0 37702 NULL
112744 +dynamic_ps_timeout_write_37713 dynamic_ps_timeout_write 3 37713 NULL
112745 +read_enabled_file_bool_37744 read_enabled_file_bool 3 37744 NULL
112746 +xfs_read_agf_37749 xfs_read_agf 0 37749 NULL
112747 +ocfs2_control_cfu_37750 ocfs2_control_cfu 2 37750 NULL
112748 +ipath_cdev_init_37752 ipath_cdev_init 1 37752 NULL
112749 +dccp_setsockopt_cscov_37766 dccp_setsockopt_cscov 2 37766 NULL
112750 +il4965_rs_sta_dbgfs_rate_scale_data_read_37792 il4965_rs_sta_dbgfs_rate_scale_data_read 3 37792 NULL
112751 +smk_read_logging_37804 smk_read_logging 3 37804 NULL
112752 +ocrdma_alloc_frmr_page_list_37815 ocrdma_alloc_frmr_page_list 2 37815 NULL
112753 +rx_decrypt_key_not_found_read_37820 rx_decrypt_key_not_found_read 3 37820 NULL
112754 +android_get_p2p_addr_37832 android_get_p2p_addr 0 37832 NULL
112755 +jbd2_journal_get_undo_access_37837 jbd2_journal_get_undo_access 0 37837 NULL
112756 +o2hb_debug_read_37851 o2hb_debug_read 3 37851 NULL
112757 +xfs_dir2_block_to_sf_37868 xfs_dir2_block_to_sf 3 37868 NULL
112758 +set_registers_37883 set_registers 4 37883 NULL
112759 +btrfs_stack_file_extent_disk_bytenr_37888 btrfs_stack_file_extent_disk_bytenr 0 37888 NULL
112760 +pkt_alloc_packet_data_37928 pkt_alloc_packet_data 1 37928 NULL nohasharray
112761 +_rtw_malloc_37928 _rtw_malloc 1 37928 &pkt_alloc_packet_data_37928
112762 +read_rbu_packet_size_37939 read_rbu_packet_size 6 37939 NULL
112763 +write_file_bool_37957 write_file_bool 3 37957 NULL
112764 +fifo_alloc_37961 fifo_alloc 1 37961 NULL
112765 +rds_rdma_extra_size_37990 rds_rdma_extra_size 0 37990 NULL
112766 +persistent_ram_old_size_37997 persistent_ram_old_size 0 37997 NULL
112767 +vfs_readv_38011 vfs_readv 3 38011 NULL
112768 +aggr_recv_addba_req_evt_38037 aggr_recv_addba_req_evt 4 38037 NULL
112769 +il_dbgfs_chain_noise_read_38044 il_dbgfs_chain_noise_read 3 38044 NULL nohasharray
112770 +klsi_105_prepare_write_buffer_38044 klsi_105_prepare_write_buffer 3 38044 &il_dbgfs_chain_noise_read_38044
112771 +SyS_llistxattr_38048 SyS_llistxattr 3 38048 NULL
112772 +sysfs_do_create_link_38051 sysfs_do_create_link 0 38051 NULL
112773 +_xfs_buf_alloc_38058 _xfs_buf_alloc 3 38058 NULL
112774 +nsm_create_handle_38060 nsm_create_handle 4 38060 NULL
112775 +alloc_ltalkdev_38071 alloc_ltalkdev 1 38071 NULL
112776 +xfs_buf_readahead_map_38081 xfs_buf_readahead_map 3 38081 NULL nohasharray
112777 +wcn36xx_smd_rsp_process_38081 wcn36xx_smd_rsp_process 3 38081 &xfs_buf_readahead_map_38081
112778 +uwb_mac_addr_print_38085 uwb_mac_addr_print 2 38085 NULL
112779 +request_key_auth_new_38092 request_key_auth_new 3 38092 NULL
112780 +proc_self_readlink_38094 proc_self_readlink 3 38094 NULL
112781 +ep0_read_38095 ep0_read 3 38095 NULL
112782 +sk_wmem_schedule_38096 sk_wmem_schedule 2 38096 NULL nohasharray
112783 +osc_checksum_seq_write_38096 osc_checksum_seq_write 3 38096 &sk_wmem_schedule_38096
112784 +o2hb_read_slots_38105 o2hb_read_slots 2 38105 NULL
112785 +snd_pcm_oss_write_38108 snd_pcm_oss_write 3 38108 NULL
112786 +vmw_kms_present_38130 vmw_kms_present 9 38130 NULL
112787 +__ntfs_copy_from_user_iovec_inatomic_38153 __ntfs_copy_from_user_iovec_inatomic 0-4-3 38153 NULL
112788 +btrfs_extent_same_38163 btrfs_extent_same 3-2 38163 NULL
112789 +kvm_clear_guest_38164 kvm_clear_guest 3-2 38164 NULL
112790 +cdev_add_38176 cdev_add 2-3 38176 NULL
112791 +rt2x00debug_write_rf_38195 rt2x00debug_write_rf 3 38195 NULL
112792 +get_ucode_user_38202 get_ucode_user 3 38202 NULL
112793 +osd_req_list_partition_collections_38223 osd_req_list_partition_collections 5 38223 NULL nohasharray
112794 +xfs_rtallocate_range_38223 xfs_rtallocate_range 0 38223 &osd_req_list_partition_collections_38223
112795 +ceph_decode_16_38239 ceph_decode_16 0 38239 NULL
112796 +_ipw_read_reg32_38245 _ipw_read_reg32 0 38245 NULL
112797 +xfs_qm_dqrepair_38262 xfs_qm_dqrepair 0 38262 NULL
112798 +mthca_alloc_icm_table_38268 mthca_alloc_icm_table 4-3 38268 NULL nohasharray
112799 +ieee80211_if_read_auto_open_plinks_38268 ieee80211_if_read_auto_open_plinks 3 38268 &mthca_alloc_icm_table_38268
112800 +xfs_bmbt_to_bmdr_38275 xfs_bmbt_to_bmdr 3 38275 NULL nohasharray
112801 +xfs_bmdr_to_bmbt_38275 xfs_bmdr_to_bmbt 5 38275 &xfs_bmbt_to_bmdr_38275
112802 +ftdi_process_packet_38281 ftdi_process_packet 4 38281 NULL
112803 +ucma_query_path_38305 ucma_query_path 3 38305 NULL
112804 +isr_rx_headers_read_38325 isr_rx_headers_read 3 38325 NULL
112805 +ida_simple_get_38326 ida_simple_get 0 38326 NULL
112806 +__snd_gf1_look8_38333 __snd_gf1_look8 0 38333 NULL
112807 +btrfs_file_extent_disk_num_bytes_38363 btrfs_file_extent_disk_num_bytes 0 38363 NULL
112808 +dn_sendmsg_38390 dn_sendmsg 4 38390 NULL
112809 +ieee80211_if_read_dtim_count_38419 ieee80211_if_read_dtim_count 3 38419 NULL
112810 +pmcraid_copy_sglist_38431 pmcraid_copy_sglist 3 38431 NULL
112811 +kvm_write_guest_38454 kvm_write_guest 4-2 38454 NULL
112812 +_iwl_dbgfs_scan_ant_rxchain_write_38479 _iwl_dbgfs_scan_ant_rxchain_write 3 38479 NULL
112813 +blk_end_bidi_request_38482 blk_end_bidi_request 3-4 38482 NULL
112814 +dev_names_read_38509 dev_names_read 3 38509 NULL
112815 +iscsi_create_iface_38510 iscsi_create_iface 5 38510 NULL
112816 +event_rx_mismatch_read_38518 event_rx_mismatch_read 3 38518 NULL
112817 +ubifs_idx_node_sz_38546 ubifs_idx_node_sz 0-2 38546 NULL
112818 +btrfs_discard_extent_38547 btrfs_discard_extent 2 38547 NULL
112819 +kuc_len_38557 kuc_len 0-1 38557 NULL
112820 +irda_sendmsg_dgram_38563 irda_sendmsg_dgram 4 38563 NULL
112821 +il4965_rs_sta_dbgfs_scale_table_read_38564 il4965_rs_sta_dbgfs_scale_table_read 3 38564 NULL
112822 +_ipw_read32_38565 _ipw_read32 0 38565 NULL
112823 +snd_nm256_playback_copy_38567 snd_nm256_playback_copy 5-3 38567 NULL
112824 +copy_ctl_value_to_user_38587 copy_ctl_value_to_user 4 38587 NULL
112825 +rd_allocate_sgl_table_38607 rd_allocate_sgl_table 3 38607 NULL
112826 +icn_writecmd_38629 icn_writecmd 2 38629 NULL
112827 +write_enabled_file_bool_38630 write_enabled_file_bool 3 38630 NULL
112828 +ext2_readpages_38640 ext2_readpages 4 38640 NULL
112829 +audit_init_entry_38644 audit_init_entry 1 38644 NULL
112830 +qp_broker_alloc_38646 qp_broker_alloc 6-5 38646 NULL
112831 +mmc_send_cxd_data_38655 mmc_send_cxd_data 5 38655 NULL
112832 +nouveau_instmem_create__38664 nouveau_instmem_create_ 4 38664 NULL
112833 +snd_es1371_wait_src_ready_38673 snd_es1371_wait_src_ready 0 38673 NULL
112834 +iscsit_dump_data_payload_38683 iscsit_dump_data_payload 2 38683 NULL
112835 +rbio_add_io_page_38700 rbio_add_io_page 6 38700 NULL
112836 +w83977af_sir_interrupt_38738 w83977af_sir_interrupt 0 38738 NULL
112837 +udf_readpages_38761 udf_readpages 4 38761 NULL
112838 +iwl_dbgfs_thermal_throttling_read_38779 iwl_dbgfs_thermal_throttling_read 3 38779 NULL
112839 +bcache_device_init_38781 bcache_device_init 3 38781 NULL
112840 +snd_gus_dram_write_38784 snd_gus_dram_write 4 38784 NULL
112841 +do_pci_enable_device_38802 do_pci_enable_device 0 38802 NULL
112842 +err_decode_38804 err_decode 2 38804 NULL
112843 +ipv6_renew_option_38813 ipv6_renew_option 3 38813 NULL
112844 +direct_entry_38836 direct_entry 3 38836 NULL
112845 +compat_udp_setsockopt_38840 compat_udp_setsockopt 5 38840 NULL
112846 +read_nic_io_word_38853 read_nic_io_word 0 38853 NULL
112847 +interfaces_38859 interfaces 2 38859 NULL
112848 +dbgfs_state_38894 dbgfs_state 3 38894 NULL
112849 +il_dbgfs_sram_write_38942 il_dbgfs_sram_write 3 38942 NULL
112850 +__ath6kl_wmi_send_mgmt_cmd_38971 __ath6kl_wmi_send_mgmt_cmd 7 38971 NULL
112851 +usb_maxpacket_38977 usb_maxpacket 0 38977 NULL nohasharray
112852 +C_SYSC_preadv64_38977 C_SYSC_preadv64 3 38977 &usb_maxpacket_38977
112853 +OSDSetBlock_38986 OSDSetBlock 2-4 38986 NULL
112854 +bio_clone_range_38997 bio_clone_range 2 38997 NULL
112855 +lpfc_idiag_extacc_write_38998 lpfc_idiag_extacc_write 3 38998 NULL
112856 +get_nodes_39012 get_nodes 3 39012 NULL
112857 +twl6030_interrupt_unmask_39013 twl6030_interrupt_unmask 2 39013 NULL
112858 +__blkdev_issue_zeroout_39020 __blkdev_issue_zeroout 3 39020 NULL
112859 +_zd_iowrite32v_async_locked_39034 _zd_iowrite32v_async_locked 3 39034 NULL
112860 +do_write_kmem_39051 do_write_kmem 0-1-3 39051 NULL
112861 +ReadHFC_39104 ReadHFC 0 39104 NULL
112862 +tomoyo_truncate_39105 tomoyo_truncate 0 39105 NULL
112863 +__kfifo_to_user_r_39123 __kfifo_to_user_r 5-3 39123 NULL
112864 +ea_foreach_39133 ea_foreach 0 39133 NULL
112865 +generic_permission_39150 generic_permission 0 39150 NULL
112866 +proc_coredump_filter_read_39153 proc_coredump_filter_read 3 39153 NULL
112867 +ath9k_hw_ar9003_dump_eeprom_39156 ath9k_hw_ar9003_dump_eeprom 5-4 39156 NULL
112868 +echo_client_kbrw_39170 echo_client_kbrw 6 39170 NULL
112869 +ext3_xattr_check_names_39174 ext3_xattr_check_names 0 39174 NULL
112870 +ubi_more_update_data_39189 ubi_more_update_data 4 39189 NULL
112871 +qcam_read_bytes_39205 qcam_read_bytes 0 39205 NULL
112872 +ivtv_v4l2_write_39226 ivtv_v4l2_write 3 39226 NULL
112873 +posix_acl_to_xattr_39237 posix_acl_to_xattr 0 39237 NULL
112874 +pwr_cont_miss_bcns_spread_read_39250 pwr_cont_miss_bcns_spread_read 3 39250 NULL nohasharray
112875 +r128_compat_ioctl_39250 r128_compat_ioctl 2 39250 &pwr_cont_miss_bcns_spread_read_39250
112876 +i915_error_state_read_39254 i915_error_state_read 3 39254 NULL
112877 +rx_filter_protection_filter_read_39282 rx_filter_protection_filter_read 3 39282 NULL
112878 +_iwl_dbgfs_pm_params_write_39325 _iwl_dbgfs_pm_params_write 3 39325 NULL
112879 +__cfg80211_connect_result_39326 __cfg80211_connect_result 4-6 39326 NULL
112880 +insert_reserved_file_extent_39327 insert_reserved_file_extent 3 39327 NULL
112881 +wimax_msg_alloc_39343 wimax_msg_alloc 4 39343 NULL
112882 +ide_complete_rq_39354 ide_complete_rq 3 39354 NULL
112883 +do_write_log_from_user_39362 do_write_log_from_user 3-0 39362 NULL
112884 +vortex_wtdma_getlinearpos_39371 vortex_wtdma_getlinearpos 0 39371 NULL
112885 +regmap_name_read_file_39379 regmap_name_read_file 3 39379 NULL
112886 +fnic_trace_debugfs_read_39380 fnic_trace_debugfs_read 3 39380 NULL
112887 +ps_poll_ps_poll_utilization_read_39383 ps_poll_ps_poll_utilization_read 3 39383 NULL
112888 +__send_to_port_39386 __send_to_port 3 39386 NULL
112889 +xfs_btree_dup_cursor_39394 xfs_btree_dup_cursor 0 39394 NULL
112890 +gfs2_internal_read_39413 gfs2_internal_read 0 39413 NULL
112891 +user_power_read_39414 user_power_read 3 39414 NULL
112892 +alloc_agpphysmem_i8xx_39427 alloc_agpphysmem_i8xx 1 39427 NULL
112893 +mic_desc_size_39464 mic_desc_size 0 39464 NULL
112894 +apei_resources_add_39470 apei_resources_add 0 39470 NULL
112895 +setkey_unaligned_39474 setkey_unaligned 3 39474 NULL
112896 +ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries_39499 ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries 3 39499 NULL
112897 +cl_req_alloc_39523 cl_req_alloc 4 39523 NULL
112898 +int_proc_write_39542 int_proc_write 3 39542 NULL
112899 +pp_write_39554 pp_write 3 39554 NULL
112900 +datablob_format_39571 datablob_format 2 39571 NULL nohasharray
112901 +ieee80211_if_read_fwded_mcast_39571 ieee80211_if_read_fwded_mcast 3 39571 &datablob_format_39571
112902 +memblock_virt_alloc_internal_39600 memblock_virt_alloc_internal 1 39600 NULL
112903 +ext_depth_39607 ext_depth 0 39607 NULL
112904 +batadv_tt_tvlv_generate_39615 batadv_tt_tvlv_generate 4 39615 NULL
112905 +nfs_idmap_get_key_39616 nfs_idmap_get_key 2 39616 NULL
112906 +sdio_readb_39618 sdio_readb 0 39618 NULL
112907 +prepare_uptodate_page_39622 prepare_uptodate_page 0 39622 NULL
112908 +set_dev_class_39645 set_dev_class 4 39645 NULL
112909 +snd_rme32_capture_copy_39653 snd_rme32_capture_copy 5 39653 NULL
112910 +tcp_try_rmem_schedule_39657 tcp_try_rmem_schedule 3 39657 NULL
112911 +kvm_read_guest_cached_39666 kvm_read_guest_cached 4 39666 NULL
112912 +v4l_stk_read_39672 v4l_stk_read 3 39672 NULL
112913 +hsc_msg_len_get_39673 hsc_msg_len_get 0 39673 NULL
112914 +do_surface_dirty_sou_39678 do_surface_dirty_sou 7 39678 NULL
112915 +sd_completed_bytes_39705 sd_completed_bytes 0 39705 NULL
112916 +ftrace_pid_write_39710 ftrace_pid_write 3 39710 NULL
112917 +adt7316_spi_multi_read_39765 adt7316_spi_multi_read 3 39765 NULL
112918 +security_inode_listsecurity_39812 security_inode_listsecurity 0 39812 NULL
112919 +snd_pcm_oss_writev3_39818 snd_pcm_oss_writev3 3 39818 NULL
112920 +get_priv_size_39828 get_priv_size 0-1 39828 NULL
112921 +pkt_add_39897 pkt_add 3 39897 NULL
112922 +read_file_modal_eeprom_39909 read_file_modal_eeprom 3 39909 NULL
112923 +gen_pool_add_virt_39913 gen_pool_add_virt 4 39913 NULL
112924 +dw210x_op_rw_39915 dw210x_op_rw 6 39915 NULL
112925 +__mnt_want_write_file_39917 __mnt_want_write_file 0 39917 NULL
112926 +aes_encrypt_interrupt_read_39919 aes_encrypt_interrupt_read 3 39919 NULL
112927 +exofs_read_kern_39921 exofs_read_kern 6 39921 NULL nohasharray
112928 +oom_score_adj_read_39921 oom_score_adj_read 3 39921 &exofs_read_kern_39921
112929 +__spi_async_39932 __spi_async 0 39932 NULL
112930 +__get_order_39935 __get_order 0 39935 NULL
112931 +error_error_frame_read_39947 error_error_frame_read 3 39947 NULL
112932 +tty_prepare_flip_string_39955 tty_prepare_flip_string 3-0 39955 NULL
112933 +lstcon_group_list_39958 lstcon_group_list 2 39958 NULL
112934 +bio_chain_clone_range_39967 bio_chain_clone_range 3 39967 NULL
112935 +dma_push_rx_39973 dma_push_rx 2 39973 NULL
112936 +broadsheetfb_write_39976 broadsheetfb_write 3 39976 NULL
112937 +mthca_array_init_39987 mthca_array_init 2 39987 NULL
112938 +fw_device_op_read_39990 fw_device_op_read 3 39990 NULL
112939 +xen_hvm_config_40018 xen_hvm_config 2 40018 NULL
112940 +ivtvfb_write_40023 ivtvfb_write 3 40023 NULL
112941 +disc_pwup_write_40027 disc_pwup_write 3 40027 NULL
112942 +ea_foreach_i_40028 ea_foreach_i 0 40028 NULL
112943 +datablob_hmac_append_40038 datablob_hmac_append 3 40038 NULL
112944 +l2cap_create_iframe_pdu_40055 l2cap_create_iframe_pdu 3 40055 NULL nohasharray
112945 +add_tty_40055 add_tty 1 40055 &l2cap_create_iframe_pdu_40055
112946 +atomic_xchg_40070 atomic_xchg 0 40070 NULL
112947 +xfs_rtbuf_get_40107 xfs_rtbuf_get 0 40107 NULL
112948 +sctp_setsockopt_delayed_ack_40129 sctp_setsockopt_delayed_ack 3 40129 NULL
112949 +dwc2_max_desc_num_40132 dwc2_max_desc_num 0 40132 NULL
112950 +rx_rx_frame_checksum_read_40140 rx_rx_frame_checksum_read 3 40140 NULL
112951 +ath10k_write_simulate_fw_crash_40143 ath10k_write_simulate_fw_crash 3 40143 NULL
112952 +iwch_alloc_fastreg_pbl_40153 iwch_alloc_fastreg_pbl 2 40153 NULL
112953 +pt_write_40159 pt_write 3 40159 NULL
112954 +scsi_sg_count_40182 scsi_sg_count 0 40182 NULL
112955 +ipr_alloc_ucode_buffer_40199 ipr_alloc_ucode_buffer 1 40199 NULL
112956 +allocate_probes_40204 allocate_probes 1 40204 NULL
112957 +au0828_v4l2_read_40220 au0828_v4l2_read 3 40220 NULL
112958 +compress_file_range_40225 compress_file_range 3-4 40225 NULL
112959 +osst_read_40237 osst_read 3 40237 NULL
112960 +lpage_info_slot_40243 lpage_info_slot 3-1 40243 NULL
112961 +ocfs2_zero_extend_get_range_40248 ocfs2_zero_extend_get_range 4 40248 NULL
112962 +rs_sta_dbgfs_scale_table_read_40262 rs_sta_dbgfs_scale_table_read 3 40262 NULL
112963 +ext2_fiemap_40271 ext2_fiemap 4 40271 NULL
112964 +usbnet_read_cmd_40275 usbnet_read_cmd 7 40275 NULL
112965 +rx_xfr_hint_trig_read_40283 rx_xfr_hint_trig_read 3 40283 NULL
112966 +SyS_bind_40303 SyS_bind 3 40303 NULL
112967 +ib_get_mad_data_offset_40336 ib_get_mad_data_offset 0 40336 NULL
112968 +mmio_read_40348 mmio_read 4 40348 NULL
112969 +event_rx_mem_empty_read_40363 event_rx_mem_empty_read 3 40363 NULL
112970 +ocfs2_check_range_for_refcount_40365 ocfs2_check_range_for_refcount 3-2 40365 NULL
112971 +get_chars_40373 get_chars 3 40373 NULL
112972 +fb_prepare_extra_logos_40429 fb_prepare_extra_logos 0-2 40429 NULL
112973 +tomoyo_update_policy_40458 tomoyo_update_policy 2 40458 NULL
112974 +zd_usb_scnprint_id_40459 zd_usb_scnprint_id 0-3 40459 NULL
112975 +gp2ap020a00f_write_event_threshold_40461 gp2ap020a00f_write_event_threshold 2 40461 NULL
112976 +SyS_writev_40467 SyS_writev 3 40467 NULL
112977 +SyS_select_40473 SyS_select 1 40473 NULL
112978 +afs_fs_store_data_40484 afs_fs_store_data 3-4-5-6 40484 NULL
112979 +batadv_hash_new_40491 batadv_hash_new 1 40491 NULL
112980 +devcgroup_inode_permission_40492 devcgroup_inode_permission 0 40492 NULL
112981 +xfs_iread_extents_40510 xfs_iread_extents 0 40510 NULL
112982 +__ethtool_get_sset_count_40511 __ethtool_get_sset_count 0 40511 NULL
112983 +TSS_checkhmac2_40520 TSS_checkhmac2 5-7 40520 NULL
112984 +ixgbe_dbg_reg_ops_read_40540 ixgbe_dbg_reg_ops_read 3 40540 NULL
112985 +ima_write_policy_40548 ima_write_policy 3 40548 NULL
112986 +esp_alloc_tmp_40558 esp_alloc_tmp 3-2 40558 NULL
112987 +b1_get_byte_40597 b1_get_byte 0 40597 NULL
112988 +get_priv_descr_and_size_40612 get_priv_descr_and_size 0 40612 NULL
112989 +twl4030_kpwrite_u8_40665 twl4030_kpwrite_u8 3 40665 NULL
112990 +__cfg80211_roamed_40668 __cfg80211_roamed 4-6 40668 NULL
112991 +pipeline_rx_complete_stat_fifo_int_read_40671 pipeline_rx_complete_stat_fifo_int_read 3 40671 NULL
112992 +fops_read_40672 fops_read 3 40672 NULL
112993 +idr_get_empty_slot_40674 idr_get_empty_slot 0 40674 NULL
112994 +alloc_rbio_40676 alloc_rbio 4 40676 NULL
112995 +videobuf_dma_init_user_locked_40678 videobuf_dma_init_user_locked 4-3 40678 NULL
112996 +pci_enable_resources_40680 pci_enable_resources 0 40680 NULL
112997 +nfc_hci_set_param_40697 nfc_hci_set_param 5 40697 NULL
112998 +__seq_open_private_40715 __seq_open_private 3 40715 NULL
112999 +set_extent_bit_40719 set_extent_bit 0 40719 NULL
113000 +fuse_readpages_40737 fuse_readpages 4 40737 NULL
113001 +xfs_iext_remove_direct_40744 xfs_iext_remove_direct 3 40744 NULL
113002 +security_inode_listxattr_40752 security_inode_listxattr 0 40752 NULL
113003 +card_send_command_40757 card_send_command 3 40757 NULL
113004 +ad1889_readl_40765 ad1889_readl 0 40765 NULL
113005 +pg_write_40766 pg_write 3 40766 NULL
113006 +kernfs_fop_read_40770 kernfs_fop_read 3 40770 NULL
113007 +show_list_40775 show_list 3-0 40775 NULL
113008 +kfifo_out_copy_r_40784 kfifo_out_copy_r 0-3 40784 NULL
113009 +bitmap_weight_40791 bitmap_weight 0-2 40791 NULL
113010 +pyra_sysfs_read_40795 pyra_sysfs_read 6 40795 NULL
113011 +add_action_40811 add_action 4 40811 NULL
113012 +nl80211_send_roamed_40825 nl80211_send_roamed 5-7 40825 NULL
113013 +SyS_mbind_40828 SyS_mbind 5 40828 NULL
113014 +nilfs_mdt_init_40849 nilfs_mdt_init 3 40849 NULL
113015 +v9fs_file_read_40858 v9fs_file_read 3 40858 NULL
113016 +read_file_queue_40895 read_file_queue 3 40895 NULL
113017 +waiters_read_40902 waiters_read 3 40902 NULL
113018 +isdn_add_channels_40905 isdn_add_channels 3 40905 NULL
113019 +gfs2_ea_find_40913 gfs2_ea_find 0 40913 NULL
113020 +vol_cdev_write_40915 vol_cdev_write 3 40915 NULL
113021 +snd_vx_create_40948 snd_vx_create 4 40948 NULL nohasharray
113022 +sg_alloc_table_40948 sg_alloc_table 0 40948 &snd_vx_create_40948
113023 +rds_sendmsg_40976 rds_sendmsg 4 40976 NULL
113024 +il_dbgfs_fh_reg_read_40993 il_dbgfs_fh_reg_read 3 40993 NULL
113025 +iwl_dbgfs_scan_ant_rxchain_read_40999 iwl_dbgfs_scan_ant_rxchain_read 3 40999 NULL
113026 +mac80211_format_buffer_41010 mac80211_format_buffer 2 41010 NULL
113027 +__proc_dobitmasks_41029 __proc_dobitmasks 5 41029 NULL
113028 +_req_append_segment_41031 _req_append_segment 2 41031 NULL
113029 +mISDN_sock_sendmsg_41035 mISDN_sock_sendmsg 4 41035 NULL
113030 +ocfs2_xattr_index_block_find_41040 ocfs2_xattr_index_block_find 0 41040 NULL
113031 +lprocfs_write_frac_helper_41050 lprocfs_write_frac_helper 2 41050 NULL
113032 +vfs_listxattr_41062 vfs_listxattr 0 41062 NULL nohasharray
113033 +beacon_filtering_write_41062 beacon_filtering_write 3 41062 &vfs_listxattr_41062
113034 +cfg80211_inform_bss_frame_41078 cfg80211_inform_bss_frame 4 41078 NULL
113035 +nvme_map_user_pages_41093 nvme_map_user_pages 4-3 41093 NULL nohasharray
113036 +roccat_read_41093 roccat_read 3 41093 &nvme_map_user_pages_41093
113037 +dma_attach_41094 dma_attach 5-6 41094 NULL
113038 +provide_user_output_41105 provide_user_output 3 41105 NULL
113039 +f_audio_buffer_alloc_41110 f_audio_buffer_alloc 1 41110 NULL
113040 +ath10k_read_wmi_services_41112 ath10k_read_wmi_services 3 41112 NULL
113041 +v4l2_ctrl_new_int_menu_41151 v4l2_ctrl_new_int_menu 4 41151 NULL
113042 +tx_frag_mpdu_alloc_failed_read_41167 tx_frag_mpdu_alloc_failed_read 3 41167 NULL
113043 +dvb_ca_write_41171 dvb_ca_write 3 41171 NULL
113044 +compat_sys_process_vm_writev_41194 compat_sys_process_vm_writev 3-5 41194 NULL
113045 +dfs_file_write_41196 dfs_file_write 3 41196 NULL
113046 +nfs_page_array_len_41219 nfs_page_array_len 0-2-1 41219 NULL
113047 +cfg80211_process_disassoc_41231 cfg80211_process_disassoc 3 41231 NULL
113048 +hiddev_compat_ioctl_41255 hiddev_compat_ioctl 2 41255 NULL
113049 +erst_read_41260 erst_read 0 41260 NULL
113050 +alloc_context_41283 alloc_context 1 41283 NULL
113051 +o2hb_setup_one_bio_41341 o2hb_setup_one_bio 4 41341 NULL
113052 +twl_change_queue_depth_41342 twl_change_queue_depth 2 41342 NULL
113053 +rtw_android_set_block_41347 rtw_android_set_block 0 41347 NULL
113054 +ceph_do_getattr_41349 ceph_do_getattr 0 41349 NULL
113055 +cnic_init_id_tbl_41354 cnic_init_id_tbl 2 41354 NULL
113056 +kmp_init_41373 kmp_init 2 41373 NULL
113057 +isr_commands_read_41398 isr_commands_read 3 41398 NULL
113058 +rx_defrag_decrypt_failed_read_41411 rx_defrag_decrypt_failed_read 3 41411 NULL
113059 +xfs_iext_add_41422 xfs_iext_add 3 41422 NULL
113060 +isdn_ppp_fill_rq_41428 isdn_ppp_fill_rq 2 41428 NULL
113061 +lbs_rdrf_read_41431 lbs_rdrf_read 3 41431 NULL
113062 +iio_device_alloc_41440 iio_device_alloc 1 41440 NULL
113063 +ntfs_file_buffered_write_41442 ntfs_file_buffered_write 6-4-0 41442 NULL
113064 +pcpu_build_alloc_info_41443 pcpu_build_alloc_info 1-2-3 41443 NULL
113065 +se_io_cb_41461 se_io_cb 3 41461 NULL
113066 +layout_leb_in_gaps_41470 layout_leb_in_gaps 0 41470 NULL
113067 +rt2x00debug_write_rfcsr_41473 rt2x00debug_write_rfcsr 3 41473 NULL
113068 +bl_alloc_init_bio_41478 bl_alloc_init_bio 1 41478 NULL
113069 +kvm_unmap_hva_range_41484 kvm_unmap_hva_range 3-2 41484 NULL
113070 +wep_interrupt_read_41492 wep_interrupt_read 3 41492 NULL
113071 +SyS_get_mempolicy_41495 SyS_get_mempolicy 3 41495 NULL
113072 +hpfs_translate_name_41497 hpfs_translate_name 3 41497 NULL
113073 +xfrm_hash_new_size_41505 xfrm_hash_new_size 0-1 41505 NULL
113074 +SyS_preadv_41523 SyS_preadv 3 41523 NULL
113075 +dm_get_reserved_rq_based_ios_41529 dm_get_reserved_rq_based_ios 0 41529 NULL
113076 +tx_tx_frame_checksum_read_41553 tx_tx_frame_checksum_read 3 41553 NULL
113077 +ath6kl_endpoint_stats_read_41554 ath6kl_endpoint_stats_read 3 41554 NULL
113078 +nr_status_frames_41559 nr_status_frames 0-1 41559 NULL nohasharray
113079 +si476x_radio_fops_read_41559 si476x_radio_fops_read 3 41559 &nr_status_frames_41559
113080 +rng_dev_read_41581 rng_dev_read 3 41581 NULL
113081 +batadv_tvlv_container_ogm_append_41588 batadv_tvlv_container_ogm_append 4 41588 NULL
113082 +vga_io_r_41609 vga_io_r 0 41609 NULL
113083 +tcp_hdrlen_41610 tcp_hdrlen 0 41610 NULL
113084 +lbs_bcnmiss_write_41613 lbs_bcnmiss_write 3 41613 NULL nohasharray
113085 +usb_endpoint_maxp_41613 usb_endpoint_maxp 0 41613 &lbs_bcnmiss_write_41613
113086 +a2mp_send_41615 a2mp_send 4 41615 NULL
113087 +lstcon_batch_list_41627 lstcon_batch_list 2 41627 NULL
113088 +mempool_create_kmalloc_pool_41650 mempool_create_kmalloc_pool 1 41650 NULL
113089 +rx_rx_pre_complt_read_41653 rx_rx_pre_complt_read 3 41653 NULL
113090 +get_std_timing_41654 get_std_timing 0 41654 NULL
113091 +ieee80211_if_fmt_bssid_41677 ieee80211_if_fmt_bssid 3 41677 NULL
113092 +lov_unpackmd_41701 lov_unpackmd 4 41701 NULL
113093 +apei_exec_for_each_entry_41717 apei_exec_for_each_entry 0 41717 NULL
113094 +fillonedir_41746 fillonedir 3 41746 NULL
113095 +iwl_dbgfs_bt_notif_read_41794 iwl_dbgfs_bt_notif_read 3 41794 NULL
113096 +hsi_alloc_controller_41802 hsi_alloc_controller 1 41802 NULL
113097 +rtw_android_get_macaddr_41812 rtw_android_get_macaddr 0 41812 NULL
113098 +sco_send_frame_41815 sco_send_frame 3 41815 NULL
113099 +ixgbe_dbg_netdev_ops_read_41839 ixgbe_dbg_netdev_ops_read 3 41839 NULL
113100 +do_ip_setsockopt_41852 do_ip_setsockopt 5 41852 NULL
113101 +keyctl_instantiate_key_41855 keyctl_instantiate_key 3 41855 NULL
113102 +xfs_rtget_summary_41864 xfs_rtget_summary 0 41864 NULL
113103 +pci_map_single_41869 pci_map_single 0 41869 NULL
113104 +usb_gadget_get_string_41871 usb_gadget_get_string 0 41871 NULL
113105 +v_APCI3120_InterruptDmaMoveBlock16bit_41914 v_APCI3120_InterruptDmaMoveBlock16bit 4 41914 NULL
113106 +get_fdb_entries_41916 get_fdb_entries 3 41916 NULL
113107 +ext4_da_write_inline_data_begin_41935 ext4_da_write_inline_data_begin 3-4 41935 NULL
113108 +sci_rxfill_41945 sci_rxfill 0 41945 NULL
113109 +read_gssp_41947 read_gssp 3 41947 NULL
113110 +ocfs2_xattr_bucket_get_name_value_41949 ocfs2_xattr_bucket_get_name_value 0 41949 NULL
113111 +portnames_read_41958 portnames_read 3 41958 NULL
113112 +dst_mtu_41969 dst_mtu 0 41969 NULL
113113 +cx24116_writeregN_41975 cx24116_writeregN 4 41975 NULL
113114 +xfs_qm_dqalloc_41985 xfs_qm_dqalloc 0 41985 NULL
113115 +pool_allocate_42012 pool_allocate 3 42012 NULL
113116 +spidev_sync_read_42014 spidev_sync_read 0 42014 NULL
113117 +rs_sta_dbgfs_scale_table_write_42017 rs_sta_dbgfs_scale_table_write 3 42017 NULL
113118 +acpi_ut_create_buffer_object_42030 acpi_ut_create_buffer_object 1 42030 NULL
113119 +__hwahc_op_set_gtk_42038 __hwahc_op_set_gtk 4 42038 NULL
113120 +alloc_trace_kprobe_42041 alloc_trace_kprobe 6 42041 NULL
113121 +irda_sendmsg_ultra_42047 irda_sendmsg_ultra 4 42047 NULL
113122 +jffs2_do_link_42048 jffs2_do_link 6 42048 NULL
113123 +ps_poll_upsd_max_ap_turn_read_42050 ps_poll_upsd_max_ap_turn_read 3 42050 NULL
113124 +InterfaceTransmitPacket_42058 InterfaceTransmitPacket 3 42058 NULL
113125 +scsi_execute_req_42088 scsi_execute_req 5 42088 NULL
113126 +sk_chk_filter_42095 sk_chk_filter 2 42095 NULL
113127 +submit_inquiry_42108 submit_inquiry 3 42108 NULL
113128 +dw_dma_cyclic_prep_42113 dw_dma_cyclic_prep 3-4 42113 NULL
113129 +blk_ioctl_zeroout_42160 blk_ioctl_zeroout 3 42160 NULL
113130 +mmc_align_data_size_42161 mmc_align_data_size 0-2 42161 NULL
113131 +read_file_base_eeprom_42168 read_file_base_eeprom 3 42168 NULL
113132 +oprofilefs_str_to_user_42182 oprofilefs_str_to_user 3 42182 NULL
113133 +write_file_beacon_42185 write_file_beacon 3 42185 NULL
113134 +get_znodes_to_commit_42201 get_znodes_to_commit 0 42201 NULL
113135 +pla_ocp_read_42235 pla_ocp_read 3 42235 NULL
113136 +xfs_rtfree_range_42244 xfs_rtfree_range 0 42244 NULL
113137 +rx_defrag_need_decrypt_read_42253 rx_defrag_need_decrypt_read 3 42253 NULL
113138 +find_last_bit_42260 find_last_bit 0 42260 NULL
113139 +__pcpu_size_to_slot_42271 __pcpu_size_to_slot 0 42271 NULL
113140 +__tty_buffer_request_room_42276 __tty_buffer_request_room 2-0 42276 NULL
113141 +snd_pcm_hw_param_value_max_42280 snd_pcm_hw_param_value_max 0 42280 NULL
113142 +__cpus_weight_42299 __cpus_weight 2-0 42299 NULL
113143 +sel_read_perm_42302 sel_read_perm 3 42302 NULL
113144 +sctp_setsockopt_del_key_42304 sctp_setsockopt_del_key 3 42304 NULL nohasharray
113145 +ulong_read_file_42304 ulong_read_file 3 42304 &sctp_setsockopt_del_key_42304
113146 +xfs_vm_readpages_42308 xfs_vm_readpages 4 42308 NULL
113147 +hysdn_conf_read_42324 hysdn_conf_read 3 42324 NULL
113148 +tcp_sync_mss_42330 tcp_sync_mss 2-0 42330 NULL
113149 +ide_raw_taskfile_42355 ide_raw_taskfile 4 42355 NULL
113150 +tipc_send_42374 tipc_send 3 42374 NULL
113151 +drbd_md_last_sector_42378 drbd_md_last_sector 0 42378 NULL
113152 +il_dbgfs_disable_ht40_read_42386 il_dbgfs_disable_ht40_read 3 42386 NULL
113153 +msnd_fifo_read_42406 msnd_fifo_read 0-3 42406 NULL
113154 +krng_get_random_42420 krng_get_random 3 42420 NULL
113155 +gsm_data_alloc_42437 gsm_data_alloc 3 42437 NULL
113156 +key_conf_keyidx_read_42443 key_conf_keyidx_read 3 42443 NULL
113157 +snd_pcm_action_group_42452 snd_pcm_action_group 0 42452 NULL
113158 +tcm_loop_change_queue_depth_42454 tcm_loop_change_queue_depth 2 42454 NULL
113159 +kuc_free_42455 kuc_free 2 42455 NULL
113160 +__simple_xattr_set_42474 __simple_xattr_set 4 42474 NULL
113161 +omfs_readpages_42490 omfs_readpages 4 42490 NULL
113162 +bypass_write_42498 bypass_write 3 42498 NULL
113163 +SyS_mincore_42511 SyS_mincore 1-2 42511 NULL
113164 +kvm_write_wall_clock_42520 kvm_write_wall_clock 2 42520 NULL
113165 +dio_bio_complete_42524 dio_bio_complete 0 42524 NULL
113166 +smk_write_netlbladdr_42525 smk_write_netlbladdr 3 42525 NULL
113167 +dbAllocNear_42546 dbAllocNear 0 42546 NULL
113168 +ath6kl_wmi_proc_events_vif_42549 ath6kl_wmi_proc_events_vif 5 42549 NULL
113169 +udp_recvmsg_42558 udp_recvmsg 4 42558 NULL
113170 +iwl_print_event_log_42566 iwl_print_event_log 7-5-0 42566 NULL
113171 +xfrm_new_hash_mask_42579 xfrm_new_hash_mask 0-1 42579 NULL
113172 +oom_score_adj_write_42594 oom_score_adj_write 3 42594 NULL
113173 +ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout_42635 ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout 3 42635 NULL
113174 +scsi_activate_tcq_42640 scsi_activate_tcq 2 42640 NULL
113175 +br_mdb_rehash_42643 br_mdb_rehash 2 42643 NULL
113176 +parport_pc_compat_write_block_pio_42644 parport_pc_compat_write_block_pio 3 42644 NULL
113177 +_regmap_raw_write_42652 _regmap_raw_write 4-2 42652 NULL
113178 +request_key_and_link_42693 request_key_and_link 4 42693 NULL
113179 +vb2_read_42703 vb2_read 3 42703 NULL
113180 +read_status_42722 read_status 0 42722 NULL
113181 +dvb_demux_ioctl_42733 dvb_demux_ioctl 2 42733 NULL
113182 +set_aoe_iflist_42737 set_aoe_iflist 2 42737 NULL
113183 +ax25_setsockopt_42740 ax25_setsockopt 5 42740 NULL
113184 +dpm_sysfs_add_42756 dpm_sysfs_add 0 42756 NULL
113185 +x25_recvmsg_42777 x25_recvmsg 4 42777 NULL
113186 +snd_midi_event_decode_42780 snd_midi_event_decode 0 42780 NULL
113187 +cryptd_hash_setkey_42781 cryptd_hash_setkey 3 42781 NULL nohasharray
113188 +isku_sysfs_read_info_42781 isku_sysfs_read_info 6 42781 &cryptd_hash_setkey_42781
113189 +elfcorehdr_read_notes_42786 elfcorehdr_read_notes 2 42786 NULL
113190 +koneplus_sysfs_read_42792 koneplus_sysfs_read 6 42792 NULL
113191 +ntfs_attr_extend_allocation_42796 ntfs_attr_extend_allocation 0 42796 NULL
113192 +fw_device_op_compat_ioctl_42804 fw_device_op_compat_ioctl 2 42804 NULL
113193 +drm_ioctl_42813 drm_ioctl 2 42813 NULL
113194 +iwl_dbgfs_ucode_bt_stats_read_42820 iwl_dbgfs_ucode_bt_stats_read 3 42820 NULL
113195 +set_arg_42824 set_arg 3 42824 NULL
113196 +si476x_radio_read_rsq_blob_42827 si476x_radio_read_rsq_blob 3 42827 NULL
113197 +ocfs2_clusters_for_bytes_42872 ocfs2_clusters_for_bytes 0-2 42872 NULL
113198 +nvme_trans_unit_serial_page_42879 nvme_trans_unit_serial_page 4 42879 NULL
113199 +xpc_kmalloc_cacheline_aligned_42895 xpc_kmalloc_cacheline_aligned 1 42895 NULL
113200 +hd_end_request_42904 hd_end_request 2 42904 NULL
113201 +sta_last_rx_rate_read_42909 sta_last_rx_rate_read 3 42909 NULL
113202 +xfs_bmapi_allocate_42938 xfs_bmapi_allocate 0 42938 NULL
113203 +sctp_getsockopt_maxburst_42941 sctp_getsockopt_maxburst 2 42941 NULL
113204 +vx_reset_chk_42946 vx_reset_chk 0 42946 NULL
113205 +blkdev_direct_IO_42962 blkdev_direct_IO 4 42962 NULL
113206 +compat_udpv6_setsockopt_42981 compat_udpv6_setsockopt 5 42981 NULL
113207 +nfs_idmap_get_desc_42990 nfs_idmap_get_desc 4-2 42990 NULL nohasharray
113208 +rtw_os_xmit_resource_alloc_42990 rtw_os_xmit_resource_alloc 3 42990 &nfs_idmap_get_desc_42990
113209 +xfs_da_read_buf_43008 xfs_da_read_buf 0 43008 NULL
113210 +isr_rx_mem_overflow_read_43025 isr_rx_mem_overflow_read 3 43025 NULL
113211 +wep_default_key_count_read_43035 wep_default_key_count_read 3 43035 NULL
113212 +nouveau_gpuobj_create__43072 nouveau_gpuobj_create_ 9 43072 NULL
113213 +nfs_map_group_to_gid_43082 nfs_map_group_to_gid 3 43082 NULL
113214 +_xfer_secondary_pool_43089 _xfer_secondary_pool 2 43089 NULL
113215 +sysfs_create_file_ns_43103 sysfs_create_file_ns 0 43103 NULL
113216 +ieee80211_if_fmt_drop_unencrypted_43107 ieee80211_if_fmt_drop_unencrypted 3 43107 NULL
113217 +calculate_node_totalpages_43118 calculate_node_totalpages 2-3 43118 NULL
113218 +read_file_dfs_43145 read_file_dfs 3 43145 NULL
113219 +cfs_cpt_table_alloc_43159 cfs_cpt_table_alloc 1 43159 NULL
113220 +usb_string_sub_43164 usb_string_sub 0 43164 NULL
113221 +il_dbgfs_power_save_status_read_43165 il_dbgfs_power_save_status_read 3 43165 NULL
113222 +ath6kl_set_assoc_req_ies_43185 ath6kl_set_assoc_req_ies 3 43185 NULL
113223 +ext4_xattr_ibody_get_43200 ext4_xattr_ibody_get 0 43200 NULL
113224 +uio_write_43202 uio_write 3 43202 NULL
113225 +iso_callback_43208 iso_callback 3 43208 NULL
113226 +ath10k_p2p_calc_noa_ie_len_43209 ath10k_p2p_calc_noa_ie_len 0 43209 NULL
113227 +f2fs_acl_from_disk_43210 f2fs_acl_from_disk 2 43210 NULL
113228 +atomic_long_add_return_43217 atomic_long_add_return 1-0 43217 NULL
113229 +inode_init_always_43225 inode_init_always 0 43225 NULL
113230 +batadv_tt_tvlv_unicast_handler_v1_43239 batadv_tt_tvlv_unicast_handler_v1 5 43239 NULL
113231 +vmemmap_alloc_block_43245 vmemmap_alloc_block 1 43245 NULL
113232 +ide_end_rq_43269 ide_end_rq 4 43269 NULL
113233 +nilfs_direct_IO_43271 nilfs_direct_IO 4 43271 NULL
113234 +parport_pc_ecp_write_block_pio_43278 parport_pc_ecp_write_block_pio 3 43278 NULL nohasharray
113235 +evtchn_write_43278 evtchn_write 3 43278 &parport_pc_ecp_write_block_pio_43278
113236 +filemap_write_and_wait_range_43279 filemap_write_and_wait_range 0 43279 NULL
113237 +mpage_alloc_43299 mpage_alloc 3 43299 NULL
113238 +mmu_set_spte_43327 mmu_set_spte 6-7 43327 NULL
113239 +__ext4_get_inode_loc_43332 __ext4_get_inode_loc 0 43332 NULL
113240 +xfs_log_regrant_43350 xfs_log_regrant 0 43350 NULL
113241 +gfs2_rgrp_bh_get_43375 gfs2_rgrp_bh_get 0 43375 NULL
113242 +xfs_btree_new_iroot_43392 xfs_btree_new_iroot 0 43392 NULL
113243 +xenfb_write_43412 xenfb_write 3 43412 NULL
113244 +__alloc_bootmem_low_43423 __alloc_bootmem_low 1 43423 NULL
113245 +usb_alloc_urb_43436 usb_alloc_urb 1 43436 NULL
113246 +cifs_writev_43437 cifs_writev 4 43437 NULL
113247 +ath6kl_wmi_roam_tbl_event_rx_43440 ath6kl_wmi_roam_tbl_event_rx 3 43440 NULL
113248 +usb_string_43443 usb_string 0 43443 NULL nohasharray
113249 +usemap_size_43443 usemap_size 0-2-1 43443 &usb_string_43443
113250 +get_vm_area_size_43444 get_vm_area_size 0 43444 NULL
113251 +nvme_trans_device_id_page_43466 nvme_trans_device_id_page 4 43466 NULL
113252 +tx_tx_data_prepared_read_43497 tx_tx_data_prepared_read 3 43497 NULL
113253 +ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime_43505 ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime 3 43505 NULL
113254 +do_readlink_43518 do_readlink 2 43518 NULL
113255 +dvb_ca_en50221_io_write_43533 dvb_ca_en50221_io_write 3 43533 NULL
113256 +read_events_43534 read_events 3 43534 NULL
113257 +cachefiles_daemon_write_43535 cachefiles_daemon_write 3 43535 NULL
113258 +tx_frag_failed_read_43540 tx_frag_failed_read 3 43540 NULL
113259 +request_resource_43548 request_resource 0 43548 NULL
113260 +rpc_malloc_43573 rpc_malloc 2 43573 NULL
113261 +lpfc_idiag_drbacc_read_reg_43606 lpfc_idiag_drbacc_read_reg 0-3 43606 NULL
113262 +proc_read_43614 proc_read 3 43614 NULL
113263 +disable_dma_on_even_43618 disable_dma_on_even 0 43618 NULL
113264 +alloc_thread_groups_43625 alloc_thread_groups 2 43625 NULL
113265 +random_write_43656 random_write 3 43656 NULL
113266 +bio_integrity_tag_43658 bio_integrity_tag 3 43658 NULL
113267 +ext4_acl_count_43659 ext4_acl_count 0-1 43659 NULL
113268 +write_file_tx99_power_43670 write_file_tx99_power 3 43670 NULL
113269 +dmam_declare_coherent_memory_43679 dmam_declare_coherent_memory 4 43679 NULL
113270 +max77693_bulk_write_43698 max77693_bulk_write 2-3 43698 NULL
113271 +drbd_md_first_sector_43729 drbd_md_first_sector 0 43729 NULL
113272 +snd_rme32_playback_copy_43732 snd_rme32_playback_copy 5 43732 NULL
113273 +fuse_conn_congestion_threshold_write_43736 fuse_conn_congestion_threshold_write 3 43736 NULL
113274 +gigaset_initcs_43753 gigaset_initcs 2 43753 NULL
113275 +sctp_setsockopt_active_key_43755 sctp_setsockopt_active_key 3 43755 NULL
113276 +xfs_alloc_lookup_eq_43775 xfs_alloc_lookup_eq 0 43775 NULL
113277 +ocfs2_xattr_get_value_outside_43787 ocfs2_xattr_get_value_outside 0 43787 NULL nohasharray
113278 +byte_pos_43787 byte_pos 0-2 43787 &ocfs2_xattr_get_value_outside_43787
113279 +xfs_trans_reserve_quota_bydquots_43797 xfs_trans_reserve_quota_bydquots 0 43797 NULL
113280 +btrfs_copy_from_user_43806 btrfs_copy_from_user 0-3-1 43806 NULL
113281 +_xfs_filestream_update_ag_43824 _xfs_filestream_update_ag 0 43824 NULL
113282 +ieee80211_if_fmt_element_ttl_43825 ieee80211_if_fmt_element_ttl 3 43825 NULL
113283 +ieee80211_alloc_hw_43829 ieee80211_alloc_hw 1 43829 NULL
113284 +read_flush_43851 read_flush 3 43851 NULL
113285 +pm860x_bulk_write_43875 pm860x_bulk_write 2-3 43875 NULL
113286 +SendString_43928 SendString 3 43928 NULL
113287 +stats_dot11RTSFailureCount_read_43948 stats_dot11RTSFailureCount_read 3 43948 NULL
113288 +xfs_trans_dqresv_43960 xfs_trans_dqresv 0 43960 NULL
113289 +__get_required_blob_size_43980 __get_required_blob_size 0-3-2 43980 NULL
113290 +nla_reserve_43984 nla_reserve 3 43984 NULL
113291 +__clkdev_alloc_43990 __clkdev_alloc 1 43990 NULL
113292 +scsi_command_size_43992 scsi_command_size 0 43992 NULL nohasharray
113293 +kvm_read_guest_virt_43992 kvm_read_guest_virt 4-2 43992 &scsi_command_size_43992 nohasharray
113294 +bcm_recvmsg_43992 bcm_recvmsg 4 43992 &kvm_read_guest_virt_43992
113295 +ulist_add_43994 ulist_add 0 43994 NULL
113296 +emit_flags_44006 emit_flags 4-3 44006 NULL
113297 +write_flush_procfs_44011 write_flush_procfs 3 44011 NULL
113298 +fru_strlen_44046 fru_strlen 0 44046 NULL
113299 +ath9k_def_dump_modal_eeprom_44078 ath9k_def_dump_modal_eeprom 3-2-0 44078 NULL
113300 +SYSC_add_key_44079 SYSC_add_key 4 44079 NULL
113301 +pci_msix_vec_count_44093 pci_msix_vec_count 0 44093 NULL nohasharray
113302 +__vxge_hw_vpath_tim_configure_44093 __vxge_hw_vpath_tim_configure 2 44093 &pci_msix_vec_count_44093
113303 +xlog_recover_add_to_cont_trans_44102 xlog_recover_add_to_cont_trans 4 44102 NULL
113304 +skb_frag_dma_map_44112 skb_frag_dma_map 0 44112 NULL
113305 +file_remove_suid_44122 file_remove_suid 0 44122 NULL nohasharray
113306 +tracing_set_trace_read_44122 tracing_set_trace_read 3 44122 &file_remove_suid_44122
113307 +SyS_process_vm_writev_44129 SyS_process_vm_writev 3-5 44129 NULL
113308 +ttm_get_pages_44142 ttm_get_pages 2 44142 NULL
113309 +scsi_get_resid_44147 scsi_get_resid 0 44147 NULL
113310 +ocfs2_xattr_bucket_find_44174 ocfs2_xattr_bucket_find 0 44174 NULL
113311 +SYSC_set_mempolicy_44176 SYSC_set_mempolicy 3 44176 NULL
113312 +readreg_ipac_44186 readreg_ipac 0 44186 NULL
113313 +handle_eviocgbit_44193 handle_eviocgbit 3 44193 NULL
113314 +srp_alloc_iu_44227 srp_alloc_iu 2 44227 NULL
113315 +scsi_track_queue_full_44239 scsi_track_queue_full 2 44239 NULL
113316 +sigma_action_write_regmap_44240 sigma_action_write_regmap 3 44240 NULL
113317 +apei_resources_sub_44252 apei_resources_sub 0 44252 NULL
113318 +device_create_file_44285 device_create_file 0 44285 NULL
113319 +ath6kl_keepalive_read_44303 ath6kl_keepalive_read 3 44303 NULL
113320 +bitmap_scnprintf_44318 bitmap_scnprintf 0-2 44318 NULL
113321 +dispatch_proc_write_44320 dispatch_proc_write 3 44320 NULL
113322 +ccp_init_data_44324 ccp_init_data 5 44324 NULL
113323 +rs_init_44327 rs_init 1 44327 NULL
113324 +radix_tree_maybe_preload_44346 radix_tree_maybe_preload 0 44346 NULL
113325 +blk_queue_init_tags_44355 blk_queue_init_tags 2 44355 NULL nohasharray
113326 +nfs_fscache_get_super_cookie_44355 nfs_fscache_get_super_cookie 3 44355 &blk_queue_init_tags_44355
113327 +rts_threshold_read_44384 rts_threshold_read 3 44384 NULL
113328 +mtip_hw_read_flags_44396 mtip_hw_read_flags 3 44396 NULL
113329 +aoedev_flush_44398 aoedev_flush 2 44398 NULL
113330 +drm_buffer_alloc_44405 drm_buffer_alloc 2 44405 NULL
113331 +osst_do_scsi_44410 osst_do_scsi 4 44410 NULL
113332 +ieee80211_if_read_rc_rateidx_mcs_mask_5ghz_44423 ieee80211_if_read_rc_rateidx_mcs_mask_5ghz 3 44423 NULL
113333 +xfs_mod_incore_sb_44439 xfs_mod_incore_sb 0 44439 NULL
113334 +write_file_debug_44476 write_file_debug 3 44476 NULL
113335 +btrfs_chunk_item_size_44478 btrfs_chunk_item_size 0-1 44478 NULL
113336 +sdio_align_size_44489 sdio_align_size 0-2 44489 NULL
113337 +bio_advance_44496 bio_advance 2 44496 NULL
113338 +ieee80211_if_read_dropped_frames_ttl_44500 ieee80211_if_read_dropped_frames_ttl 3 44500 NULL
113339 +ac_register_board_44504 ac_register_board 3 44504 NULL
113340 +security_getprocattr_44505 security_getprocattr 0 44505 NULL nohasharray
113341 +iwl_dbgfs_sram_read_44505 iwl_dbgfs_sram_read 3 44505 &security_getprocattr_44505
113342 +spidev_write_44510 spidev_write 3 44510 NULL
113343 +SyS_io_getevents_44519 SyS_io_getevents 3 44519 NULL
113344 +ieee80211_rx_mgmt_assoc_resp_44525 ieee80211_rx_mgmt_assoc_resp 3 44525 NULL
113345 +comm_write_44537 comm_write 3 44537 NULL
113346 +dgrp_config_proc_write_44571 dgrp_config_proc_write 3 44571 NULL
113347 +btrfs_set_extent_delalloc_44587 btrfs_set_extent_delalloc 0 44587 NULL
113348 +nouveau_perfmon_create__44602 nouveau_perfmon_create_ 4 44602 NULL
113349 +xfs_bmapi_delay_44630 xfs_bmapi_delay 0 44630 NULL
113350 +alloc_ctrl_packet_44667 alloc_ctrl_packet 1 44667 NULL
113351 +mpi_resize_44674 mpi_resize 2 44674 NULL
113352 +sysfs_create_link_44685 sysfs_create_link 0 44685 NULL
113353 +ts_read_44687 ts_read 3 44687 NULL
113354 +lov_emerg_alloc_44698 lov_emerg_alloc 1 44698 NULL
113355 +xfer_to_user_44713 xfer_to_user 3 44713 NULL nohasharray
113356 +__generic_block_fiemap_44713 __generic_block_fiemap 4 44713 &xfer_to_user_44713
113357 +_zd_iowrite32v_locked_44725 _zd_iowrite32v_locked 3 44725 NULL
113358 +clusterip_proc_write_44729 clusterip_proc_write 3 44729 NULL
113359 +fib_count_nexthops_44730 fib_count_nexthops 0 44730 NULL
113360 +key_tx_rx_count_read_44742 key_tx_rx_count_read 3 44742 NULL
113361 +bch_bio_max_sectors_44755 bch_bio_max_sectors 0 44755 NULL
113362 +tnode_new_44757 tnode_new 3 44757 NULL nohasharray
113363 +pty_write_44757 pty_write 3 44757 &tnode_new_44757
113364 +__videobuf_copy_stream_44769 __videobuf_copy_stream 4-0 44769 NULL
113365 +handsfree_ramp_44777 handsfree_ramp 2 44777 NULL
113366 +irq_domain_add_legacy_44781 irq_domain_add_legacy 4-2 44781 NULL
113367 +sctp_setsockopt_44788 sctp_setsockopt 5 44788 NULL
113368 +rx_dropped_read_44799 rx_dropped_read 3 44799 NULL
113369 +qla4xxx_alloc_work_44813 qla4xxx_alloc_work 2 44813 NULL
113370 +mei_cl_read_start_44824 mei_cl_read_start 2 44824 NULL
113371 +rmap_write_protect_44833 rmap_write_protect 2 44833 NULL
113372 +sisusb_write_44834 sisusb_write 3 44834 NULL
113373 +kvm_read_hva_44847 kvm_read_hva 3 44847 NULL
113374 +qib_verbs_send_dma_44850 qib_verbs_send_dma 6 44850 NULL
113375 +copydesc_user_44855 copydesc_user 3 44855 NULL
113376 +set_advertising_44870 set_advertising 4 44870 NULL
113377 +init_rs_44873 init_rs 1 44873 NULL
113378 +skb_availroom_44883 skb_availroom 0 44883 NULL
113379 +ocfs2_wait_for_mask_44893 ocfs2_wait_for_mask 0 44893 NULL
113380 +do_tty_write_44896 do_tty_write 5 44896 NULL
113381 +regmap_spi_read_44921 regmap_spi_read 3-5 44921 NULL
113382 +tx_queue_status_read_44978 tx_queue_status_read 3 44978 NULL
113383 +bytepos_delta_45017 bytepos_delta 0-2 45017 NULL
113384 +ptrace_writedata_45021 ptrace_writedata 4 45021 NULL
113385 +dm_kvzalloc_45025 dm_kvzalloc 1 45025 NULL
113386 +sysfs_do_create_link_sd_45057 sysfs_do_create_link_sd 0 45057 NULL
113387 +sel_write_user_45060 sel_write_user 3 45060 NULL
113388 +snd_mixart_BA0_read_45069 snd_mixart_BA0_read 5 45069 NULL
113389 +kvm_mmu_page_get_gfn_45110 kvm_mmu_page_get_gfn 0-2 45110 NULL
113390 +pwr_missing_bcns_cnt_read_45113 pwr_missing_bcns_cnt_read 3 45113 NULL
113391 +usbdev_read_45114 usbdev_read 3 45114 NULL
113392 +send_to_tty_45141 send_to_tty 3 45141 NULL
113393 +cfs_trace_daemon_command_usrstr_45147 cfs_trace_daemon_command_usrstr 2 45147 NULL
113394 +gen_bitmask_string_45149 gen_bitmask_string 6 45149 NULL
113395 +device_write_45156 device_write 3 45156 NULL nohasharray
113396 +ocfs2_remove_inode_range_45156 ocfs2_remove_inode_range 3 45156 &device_write_45156
113397 +tomoyo_write_self_45161 tomoyo_write_self 3 45161 NULL
113398 +sta_agg_status_write_45164 sta_agg_status_write 3 45164 NULL
113399 +snd_sb_csp_load_user_45190 snd_sb_csp_load_user 3 45190 NULL nohasharray
113400 +sctp_pack_cookie_45190 sctp_pack_cookie 6 45190 &snd_sb_csp_load_user_45190
113401 +__radix_tree_preload_45197 __radix_tree_preload 0 45197 NULL
113402 +iso_alloc_urb_45206 iso_alloc_urb 4-5 45206 NULL
113403 +spi_alloc_master_45223 spi_alloc_master 2 45223 NULL
113404 +ieee80211_if_read_peer_45233 ieee80211_if_read_peer 3 45233 NULL
113405 +event_enable_write_45238 event_enable_write 3 45238 NULL
113406 +prism2_pda_proc_read_45246 prism2_pda_proc_read 3 45246 NULL
113407 +input_mt_init_slots_45279 input_mt_init_slots 2 45279 NULL
113408 +gfs2_fiemap_45282 gfs2_fiemap 4 45282 NULL
113409 +snd_pcm_oss_sync1_45298 snd_pcm_oss_sync1 2 45298 NULL
113410 +xfs_alert_fsblock_zero_45304 xfs_alert_fsblock_zero 0 45304 NULL
113411 +e1000_tx_map_45309 e1000_tx_map 5 45309 NULL
113412 +copy_vm86_regs_from_user_45340 copy_vm86_regs_from_user 3 45340 NULL
113413 +brcmf_sdio_died_dump_45359 brcmf_sdio_died_dump 3 45359 NULL
113414 +null_alloc_repbuf_45375 null_alloc_repbuf 3 45375 NULL
113415 +sock_recv_errqueue_45412 sock_recv_errqueue 3 45412 NULL
113416 +ieee80211_if_fmt_dot11MeshHWMProotInterval_45421 ieee80211_if_fmt_dot11MeshHWMProotInterval 3 45421 NULL
113417 +ll_iocontrol_register_45430 ll_iocontrol_register 2 45430 NULL
113418 +tty_buffer_alloc_45437 tty_buffer_alloc 2 45437 NULL
113419 +__node_remap_45458 __node_remap 4 45458 NULL
113420 +rds_ib_set_wr_signal_state_45463 rds_ib_set_wr_signal_state 0 45463 NULL
113421 +tracing_read_dyn_info_45468 tracing_read_dyn_info 3 45468 NULL
113422 +__calc_request_pg_45470 __calc_request_pg 0 45470 NULL
113423 +xfs_btree_block_change_owner_45476 xfs_btree_block_change_owner 0 45476 NULL
113424 +rds_message_copy_from_user_45510 rds_message_copy_from_user 3 45510 NULL
113425 +i40e_alloc_vfs_45511 i40e_alloc_vfs 2 45511 NULL
113426 +copy_macs_45534 copy_macs 4 45534 NULL
113427 +nla_attr_size_45545 nla_attr_size 0-1 45545 NULL
113428 +v9fs_direct_read_45546 v9fs_direct_read 3 45546 NULL
113429 +cx18_copy_mdl_to_user_45549 cx18_copy_mdl_to_user 4 45549 NULL
113430 +stats_dot11ACKFailureCount_read_45558 stats_dot11ACKFailureCount_read 3 45558 NULL
113431 +_regmap_bus_raw_write_45559 _regmap_bus_raw_write 2 45559 NULL
113432 +posix_acl_xattr_size_45561 posix_acl_xattr_size 0-1 45561 NULL
113433 +venus_rmdir_45564 venus_rmdir 4 45564 NULL
113434 +ath6kl_keepalive_write_45600 ath6kl_keepalive_write 3 45600 NULL
113435 +hidraw_get_report_45609 hidraw_get_report 3 45609 NULL
113436 +compat_mpctl_ioctl_45671 compat_mpctl_ioctl 2 45671 NULL
113437 +dgram_sendmsg_45679 dgram_sendmsg 4 45679 NULL
113438 +smk_write_ambient_45691 smk_write_ambient 3 45691 NULL
113439 +unix_dgram_sendmsg_45699 unix_dgram_sendmsg 4 45699 NULL nohasharray
113440 +bscnl_emit_45699 bscnl_emit 2-5-0 45699 &unix_dgram_sendmsg_45699
113441 +sg_proc_write_adio_45704 sg_proc_write_adio 3 45704 NULL
113442 +snd_cs46xx_io_read_45734 snd_cs46xx_io_read 5 45734 NULL
113443 +rw_copy_check_uvector_45748 rw_copy_check_uvector 3-0 45748 NULL nohasharray
113444 +v4l2_ctrl_new_std_45748 v4l2_ctrl_new_std 5 45748 &rw_copy_check_uvector_45748
113445 +lkdtm_debugfs_read_45752 lkdtm_debugfs_read 3 45752 NULL
113446 +alloc_ts_config_45775 alloc_ts_config 1 45775 NULL
113447 +osc_checksum_type_seq_write_45785 osc_checksum_type_seq_write 3 45785 NULL
113448 +raw_setsockopt_45800 raw_setsockopt 5 45800 NULL
113449 +rds_tcp_inc_copy_to_user_45804 rds_tcp_inc_copy_to_user 3 45804 NULL
113450 +lbs_rdbbp_read_45805 lbs_rdbbp_read 3 45805 NULL
113451 +pcpu_alloc_alloc_info_45813 pcpu_alloc_alloc_info 1-2 45813 NULL
113452 +ll_max_readahead_mb_seq_write_45815 ll_max_readahead_mb_seq_write 3 45815 NULL
113453 +memcg_update_cache_size_45828 memcg_update_cache_size 2 45828 NULL
113454 +ipv6_recv_rxpmtu_45830 ipv6_recv_rxpmtu 3 45830 NULL
113455 +insert_state_45848 insert_state 0 45848 NULL
113456 +x509_process_extension_45854 x509_process_extension 5 45854 NULL
113457 +efx_tx_queue_insert_45859 efx_tx_queue_insert 2 45859 NULL
113458 +isdn_write_45863 isdn_write 3 45863 NULL
113459 +tpm_config_in_45880 tpm_config_in 0 45880 NULL
113460 +get_rdac_req_45882 get_rdac_req 3 45882 NULL
113461 +ocfs2_xattr_block_find_45891 ocfs2_xattr_block_find 0 45891 NULL
113462 +cfs_cpt_weight_45903 cfs_cpt_weight 0 45903 NULL
113463 +wm_adsp_region_to_reg_45915 wm_adsp_region_to_reg 0-2 45915 NULL
113464 +dbgfs_frame_45917 dbgfs_frame 3 45917 NULL
113465 +btree_keys_cachelines_45928 btree_keys_cachelines 0 45928 NULL
113466 +alloc_mr_45935 alloc_mr 1 45935 NULL
113467 +copy_to_45969 copy_to 3 45969 NULL
113468 +rb_simple_read_45972 rb_simple_read 3 45972 NULL
113469 +ioat2_dca_count_dca_slots_45984 ioat2_dca_count_dca_slots 0 45984 NULL
113470 +kobject_init_and_add_46003 kobject_init_and_add 0 46003 NULL
113471 +sierra_setup_urb_46029 sierra_setup_urb 5 46029 NULL
113472 +fnic_reset_stats_read_46030 fnic_reset_stats_read 3 46030 NULL nohasharray
113473 +get_free_entries_46030 get_free_entries 1 46030 &fnic_reset_stats_read_46030
113474 +__access_remote_vm_46031 __access_remote_vm 0 46031 NULL
113475 +snd_emu10k1x_ptr_read_46049 snd_emu10k1x_ptr_read 0 46049 NULL
113476 +__ocfs2_move_extent_46060 __ocfs2_move_extent 3-4 46060 NULL nohasharray
113477 +dma_tx_errors_read_46060 dma_tx_errors_read 3 46060 &__ocfs2_move_extent_46060
113478 +sel_commit_bools_write_46077 sel_commit_bools_write 3 46077 NULL
113479 +il3945_ucode_general_stats_read_46111 il3945_ucode_general_stats_read 3 46111 NULL nohasharray
113480 +memcg_update_array_size_46111 memcg_update_array_size 1 46111 &il3945_ucode_general_stats_read_46111
113481 +C_SYSC_writev_46113 C_SYSC_writev 3 46113 NULL
113482 +mlx4_ib_alloc_fast_reg_page_list_46119 mlx4_ib_alloc_fast_reg_page_list 2 46119 NULL
113483 +rtw_buf_update_46138 rtw_buf_update 4 46138 NULL
113484 +vb2_dma_sg_get_userptr_46146 vb2_dma_sg_get_userptr 3-2 46146 NULL
113485 +__netlink_change_ngroups_46156 __netlink_change_ngroups 2 46156 NULL
113486 +twl_direction_out_46182 twl_direction_out 2 46182 NULL
113487 +vxge_os_dma_malloc_46184 vxge_os_dma_malloc 2 46184 NULL
113488 +fq_resize_46195 fq_resize 2 46195 NULL
113489 +add_conn_list_46197 add_conn_list 3-0 46197 NULL
113490 +i2400m_op_msg_from_user_46213 i2400m_op_msg_from_user 4 46213 NULL
113491 +tm6000_i2c_recv_regs_46215 tm6000_i2c_recv_regs 5 46215 NULL
113492 +dsp_write_46218 dsp_write 2 46218 NULL
113493 +hash_netiface4_expire_46226 hash_netiface4_expire 4 46226 NULL
113494 +xen_setup_msi_irqs_46245 xen_setup_msi_irqs 2 46245 NULL
113495 +mpi_read_raw_data_46248 mpi_read_raw_data 2 46248 NULL
113496 +ReadReg_46277 ReadReg 0 46277 NULL
113497 +sg_proc_write_dressz_46316 sg_proc_write_dressz 3 46316 NULL
113498 +__hwahc_dev_set_key_46328 __hwahc_dev_set_key 5 46328 NULL nohasharray
113499 +compat_SyS_readv_46328 compat_SyS_readv 3 46328 &__hwahc_dev_set_key_46328
113500 +iwl_dbgfs_chain_noise_read_46355 iwl_dbgfs_chain_noise_read 3 46355 NULL
113501 +smk_write_direct_46363 smk_write_direct 3 46363 NULL
113502 +fuse_file_aio_write_46399 fuse_file_aio_write 4 46399 NULL
113503 +crypto_ablkcipher_reqsize_46411 crypto_ablkcipher_reqsize 0 46411 NULL
113504 +ttm_page_pool_get_pages_46431 ttm_page_pool_get_pages 0-5 46431 NULL
113505 +cfs_power2_roundup_46433 cfs_power2_roundup 0-1 46433 NULL
113506 +cp210x_set_config_46447 cp210x_set_config 4 46447 NULL
113507 +parport_pc_fifo_write_block_46455 parport_pc_fifo_write_block 3 46455 NULL
113508 +il_dbgfs_clear_traffic_stats_write_46458 il_dbgfs_clear_traffic_stats_write 3 46458 NULL
113509 +filldir64_46469 filldir64 3 46469 NULL
113510 +fill_in_write_vector_46498 fill_in_write_vector 0 46498 NULL
113511 +pin_code_reply_46510 pin_code_reply 4 46510 NULL
113512 +mthca_alloc_cq_buf_46512 mthca_alloc_cq_buf 3 46512 NULL
113513 +kmsg_read_46514 kmsg_read 3 46514 NULL nohasharray
113514 +nouveau_drm_ioctl_46514 nouveau_drm_ioctl 2 46514 &kmsg_read_46514
113515 +nl80211_send_rx_assoc_46538 nl80211_send_rx_assoc 4 46538 NULL
113516 +dn_current_mss_46574 dn_current_mss 0 46574 NULL
113517 +serverworks_create_gatt_pages_46582 serverworks_create_gatt_pages 1 46582 NULL
113518 +snd_compr_write_data_46592 snd_compr_write_data 3 46592 NULL
113519 +il3945_stats_flag_46606 il3945_stats_flag 0-3 46606 NULL
113520 +vscnprintf_46617 vscnprintf 0-2 46617 NULL
113521 +__kfifo_out_r_46623 __kfifo_out_r 0-3 46623 NULL
113522 +request_key_async_with_auxdata_46624 request_key_async_with_auxdata 4 46624 NULL
113523 +pci_enable_device_46642 pci_enable_device 0 46642 NULL
113524 +vfs_getxattr_alloc_46649 vfs_getxattr_alloc 0 46649 NULL
113525 +e1000_tx_map_46672 e1000_tx_map 4 46672 NULL
113526 +l2cap_create_le_flowctl_pdu_46682 l2cap_create_le_flowctl_pdu 3 46682 NULL
113527 +alloc_data_packet_46698 alloc_data_packet 1 46698 NULL
113528 +__ilog2_u32_46706 __ilog2_u32 0 46706 NULL
113529 +erst_dbg_write_46715 erst_dbg_write 3 46715 NULL
113530 +wl1271_rx_filter_alloc_field_46721 wl1271_rx_filter_alloc_field 5 46721 NULL
113531 +irq_domain_add_simple_46734 irq_domain_add_simple 2 46734 NULL
113532 +read_file_tx99_46741 read_file_tx99 3 46741 NULL
113533 +ext4_count_free_46754 ext4_count_free 2 46754 NULL
113534 +hest_ghes_dev_register_46766 hest_ghes_dev_register 1 46766 NULL
113535 +int_hw_irq_en_46776 int_hw_irq_en 3 46776 NULL
113536 +_xfs_buf_get_pages_46811 _xfs_buf_get_pages 2 46811 NULL
113537 +xfs_iroot_realloc_46826 xfs_iroot_realloc 2 46826 NULL
113538 +readreg_46845 readreg 0 46845 NULL
113539 +spi_async_46857 spi_async 0 46857 NULL
113540 +SyS_move_pages_46863 SyS_move_pages 2 46863 NULL nohasharray
113541 +vsnprintf_46863 vsnprintf 0 46863 &SyS_move_pages_46863
113542 +nvme_alloc_queue_46865 nvme_alloc_queue 3 46865 NULL
113543 +qp_memcpy_from_queue_iov_46874 qp_memcpy_from_queue_iov 5-4 46874 NULL
113544 +lov_iocontrol_46876 lov_iocontrol 3 46876 NULL
113545 +ixgbe_dbg_reg_ops_write_46895 ixgbe_dbg_reg_ops_write 3 46895 NULL
113546 +sk_mem_pages_46896 sk_mem_pages 0-1 46896 NULL
113547 +ieee80211_if_fmt_power_mode_46906 ieee80211_if_fmt_power_mode 3 46906 NULL
113548 +wlcore_alloc_hw_46917 wlcore_alloc_hw 1-3 46917 NULL
113549 +fb_write_46924 fb_write 3 46924 NULL
113550 +__sctp_setsockopt_connectx_46949 __sctp_setsockopt_connectx 3 46949 NULL
113551 +qla4xxx_post_aen_work_46953 qla4xxx_post_aen_work 3 46953 NULL nohasharray
113552 +ntfs_truncate_46953 ntfs_truncate 0 46953 &qla4xxx_post_aen_work_46953
113553 +SYSC_poll_46965 SYSC_poll 2 46965 NULL
113554 +crypto_tfm_alg_alignmask_46971 crypto_tfm_alg_alignmask 0 46971 NULL
113555 +mgmt_pending_add_46976 mgmt_pending_add 5 46976 NULL
113556 +bitmap_file_clear_bit_46990 bitmap_file_clear_bit 2 46990 NULL
113557 +sel_write_bool_46996 sel_write_bool 3 46996 NULL
113558 +blk_rq_map_kern_47004 blk_rq_map_kern 4 47004 NULL
113559 +cx231xx_init_bulk_47024 cx231xx_init_bulk 3-2-4 47024 NULL
113560 +fs_path_len_47060 fs_path_len 0 47060 NULL
113561 +event_trigger_regex_write_47067 event_trigger_regex_write 3 47067 NULL
113562 +pipeline_dec_packet_in_read_47076 pipeline_dec_packet_in_read 3 47076 NULL
113563 +scsi_deactivate_tcq_47086 scsi_deactivate_tcq 2 47086 NULL
113564 +iwl_dump_nic_event_log_47089 iwl_dump_nic_event_log 0 47089 NULL
113565 +ptlrpc_lprocfs_threads_max_seq_write_47104 ptlrpc_lprocfs_threads_max_seq_write 3 47104 NULL
113566 +mousedev_read_47123 mousedev_read 3 47123 NULL
113567 +upcall_msg_size_47141 upcall_msg_size 2 47141 NULL
113568 +acpi_ut_initialize_buffer_47143 acpi_ut_initialize_buffer 2 47143 NULL nohasharray
113569 +ses_recv_diag_47143 ses_recv_diag 4 47143 &acpi_ut_initialize_buffer_47143
113570 +mxms_headerlen_47161 mxms_headerlen 0 47161 NULL
113571 +rs_sta_dbgfs_rate_scale_data_read_47165 rs_sta_dbgfs_rate_scale_data_read 3 47165 NULL
113572 +rts51x_ms_rw_47171 rts51x_ms_rw 3-4 47171 NULL
113573 +xfs_btree_get_buf_block_47197 xfs_btree_get_buf_block 0 47197 NULL
113574 +options_write_47243 options_write 3 47243 NULL
113575 +portcntrs_1_read_47253 portcntrs_1_read 3 47253 NULL
113576 +ablkcipher_next_slow_47274 ablkcipher_next_slow 4-3 47274 NULL
113577 +gfs2_readpages_47285 gfs2_readpages 4 47285 NULL
113578 +vsnprintf_47291 vsnprintf 0 47291 NULL
113579 +tx_internal_desc_overflow_read_47300 tx_internal_desc_overflow_read 3 47300 NULL
113580 +xfs_trans_reserve_quota_nblks_47313 xfs_trans_reserve_quota_nblks 0 47313 NULL
113581 +nouveau_fb_create__47316 nouveau_fb_create_ 4 47316 NULL
113582 +ieee80211_if_read_dot11MeshHoldingTimeout_47356 ieee80211_if_read_dot11MeshHoldingTimeout 3 47356 NULL
113583 +gfs2_replay_read_block_47357 gfs2_replay_read_block 0 47357 NULL
113584 +avc_get_hash_stats_47359 avc_get_hash_stats 0 47359 NULL
113585 +kvm_arch_create_memslot_47364 kvm_arch_create_memslot 3 47364 NULL nohasharray
113586 +__output_copy_user_47364 __output_copy_user 3 47364 &kvm_arch_create_memslot_47364
113587 +__bio_map_kern_47379 __bio_map_kern 3 47379 NULL
113588 +trace_options_core_read_47390 trace_options_core_read 3 47390 NULL nohasharray
113589 +nv_rd32_47390 nv_rd32 0 47390 &trace_options_core_read_47390
113590 +nametbl_list_47391 nametbl_list 2 47391 NULL
113591 +dgrp_net_write_47392 dgrp_net_write 3 47392 NULL
113592 +pfkey_sendmsg_47394 pfkey_sendmsg 4 47394 NULL
113593 +lbs_wrmac_write_47400 lbs_wrmac_write 3 47400 NULL
113594 +sta_vht_capa_read_47409 sta_vht_capa_read 3 47409 NULL
113595 +crypto_ablkcipher_alignmask_47410 crypto_ablkcipher_alignmask 0 47410 NULL
113596 +lbs_wrrf_write_47418 lbs_wrrf_write 3 47418 NULL
113597 +nvme_trans_send_fw_cmd_47479 nvme_trans_send_fw_cmd 4 47479 NULL
113598 +newpart_47485 newpart 6-4 47485 NULL
113599 +core_sys_select_47494 core_sys_select 1 47494 NULL
113600 +unlink_simple_47506 unlink_simple 3 47506 NULL
113601 +pstore_decompress_47510 pstore_decompress 0 47510 NULL
113602 +__proc_lnet_portal_rotor_47529 __proc_lnet_portal_rotor 5 47529 NULL
113603 +process_vm_rw_47533 process_vm_rw 3-5 47533 NULL nohasharray
113604 +vscnprintf_47533 vscnprintf 0-2 47533 &process_vm_rw_47533
113605 +einj_check_trigger_header_47534 einj_check_trigger_header 0 47534 NULL
113606 +ieee80211_if_fmt_min_discovery_timeout_47539 ieee80211_if_fmt_min_discovery_timeout 3 47539 NULL
113607 +read_ldt_47570 read_ldt 2 47570 NULL
113608 +isku_sysfs_read_last_set_47572 isku_sysfs_read_last_set 6 47572 NULL
113609 +btrfs_stack_header_bytenr_47589 btrfs_stack_header_bytenr 0 47589 NULL
113610 +ext4_kvzalloc_47605 ext4_kvzalloc 1 47605 NULL
113611 +sctp_ssnmap_new_47608 sctp_ssnmap_new 2-1 47608 NULL
113612 +cache_read_pipefs_47615 cache_read_pipefs 3 47615 NULL
113613 +twl4030_clear_set_47624 twl4030_clear_set 4 47624 NULL
113614 +ccp_sha_setkey_47633 ccp_sha_setkey 3 47633 NULL
113615 +get_size_47644 get_size 1-2 47644 NULL
113616 +packet_recvmsg_47700 packet_recvmsg 4 47700 NULL
113617 +save_microcode_47717 save_microcode 3 47717 NULL
113618 +bits_to_user_47733 bits_to_user 2-3 47733 NULL
113619 +carl9170_debugfs_read_47738 carl9170_debugfs_read 3 47738 NULL
113620 +ir_prepare_write_buffer_47747 ir_prepare_write_buffer 3 47747 NULL
113621 +mvumi_alloc_mem_resource_47750 mvumi_alloc_mem_resource 3 47750 NULL
113622 +alloc_sched_domains_47756 alloc_sched_domains 1 47756 NULL
113623 +uwb_ie_dump_hex_47774 uwb_ie_dump_hex 4 47774 NULL
113624 +SyS_setgroups16_47780 SyS_setgroups16 1 47780 NULL
113625 +error_error_numll_frame_cts_start_read_47781 error_error_numll_frame_cts_start_read 3 47781 NULL
113626 +posix_acl_fix_xattr_from_user_47793 posix_acl_fix_xattr_from_user 2 47793 NULL
113627 +W6692_empty_Bfifo_47804 W6692_empty_Bfifo 2 47804 NULL
113628 +lov_packmd_47810 lov_packmd 0 47810 NULL
113629 +tree_mod_log_insert_move_47823 tree_mod_log_insert_move 5 47823 NULL
113630 +pinconf_dbg_config_write_47835 pinconf_dbg_config_write 3 47835 NULL
113631 +KEY_SIZE_47855 KEY_SIZE 0 47855 NULL
113632 +vhci_read_47878 vhci_read 3 47878 NULL
113633 +keyctl_instantiate_key_common_47889 keyctl_instantiate_key_common 4 47889 NULL
113634 +cfs_percpt_alloc_47918 cfs_percpt_alloc 2 47918 NULL
113635 +comedi_write_47926 comedi_write 3 47926 NULL
113636 +nvme_trans_get_blk_desc_len_47946 nvme_trans_get_blk_desc_len 0-2 47946 NULL
113637 +mempool_resize_47983 mempool_resize 2 47983 NULL nohasharray
113638 +iwl_dbgfs_ucode_tracing_read_47983 iwl_dbgfs_ucode_tracing_read 3 47983 &mempool_resize_47983
113639 +dbg_port_buf_47990 dbg_port_buf 2 47990 NULL
113640 +ib_umad_write_47993 ib_umad_write 3 47993 NULL
113641 +lustre_cfg_len_48002 lustre_cfg_len 0 48002 NULL
113642 +gdm_tty_recv_complete_48011 gdm_tty_recv_complete 2 48011 NULL
113643 +ffs_epfile_write_48014 ffs_epfile_write 3 48014 NULL
113644 +bio_integrity_set_tag_48035 bio_integrity_set_tag 3 48035 NULL
113645 +pppoe_sendmsg_48039 pppoe_sendmsg 4 48039 NULL
113646 +SYSC_writev_48040 SYSC_writev 3 48040 NULL
113647 +wpan_phy_alloc_48056 wpan_phy_alloc 1 48056 NULL
113648 +posix_acl_alloc_48063 posix_acl_alloc 1 48063 NULL
113649 +palmas_bulk_write_48068 palmas_bulk_write 2-3-5 48068 NULL
113650 +disc_write_48070 disc_write 3 48070 NULL
113651 +mmc_alloc_host_48097 mmc_alloc_host 1 48097 NULL
113652 +xfs_read_agi_48100 xfs_read_agi 0 48100 NULL
113653 +skb_copy_datagram_const_iovec_48102 skb_copy_datagram_const_iovec 4-2-5 48102 NULL
113654 +vmw_framebuffer_surface_dirty_48132 vmw_framebuffer_surface_dirty 6 48132 NULL
113655 +set_discoverable_48141 set_discoverable 4 48141 NULL
113656 +dn_fib_count_nhs_48145 dn_fib_count_nhs 0 48145 NULL
113657 +_add_to_r4w_48152 _add_to_r4w 4 48152 NULL
113658 +isr_dma1_done_read_48159 isr_dma1_done_read 3 48159 NULL
113659 +c4iw_id_table_alloc_48163 c4iw_id_table_alloc 3 48163 NULL
113660 +rbd_obj_method_sync_48170 rbd_obj_method_sync 8 48170 NULL
113661 +alloc_cc770dev_48186 alloc_cc770dev 1 48186 NULL
113662 +cfg80211_process_deauth_48200 cfg80211_process_deauth 3 48200 NULL
113663 +ext4_index_trans_blocks_48205 ext4_index_trans_blocks 0-2 48205 NULL
113664 +snd_seq_dump_var_event_48209 snd_seq_dump_var_event 0 48209 NULL
113665 +ll_direct_IO_26_48216 ll_direct_IO_26 4 48216 NULL
113666 +uv_blade_nr_possible_cpus_48226 uv_blade_nr_possible_cpus 0 48226 NULL
113667 +nilfs_readpages_48229 nilfs_readpages 4 48229 NULL
113668 +read_file_recv_48232 read_file_recv 3 48232 NULL
113669 +unaccount_shadowed_48233 unaccount_shadowed 2 48233 NULL
113670 +nouveau_i2c_port_create__48240 nouveau_i2c_port_create_ 7 48240 NULL
113671 +nfsctl_transaction_read_48250 nfsctl_transaction_read 3 48250 NULL
113672 +batadv_socket_read_48257 batadv_socket_read 3 48257 NULL
113673 +cache_write_pipefs_48270 cache_write_pipefs 3 48270 NULL
113674 +trace_options_write_48275 trace_options_write 3 48275 NULL
113675 +send_set_info_48288 send_set_info 7 48288 NULL
113676 +lpfc_idiag_extacc_read_48301 lpfc_idiag_extacc_read 3 48301 NULL
113677 +timblogiw_read_48305 timblogiw_read 3 48305 NULL
113678 +hash_setkey_48310 hash_setkey 3 48310 NULL
113679 +kvm_mmu_pte_write_48340 kvm_mmu_pte_write 2 48340 NULL
113680 +skb_add_data_48363 skb_add_data 3 48363 NULL
113681 +tx_frag_init_called_read_48377 tx_frag_init_called_read 3 48377 NULL
113682 +lbs_debugfs_write_48413 lbs_debugfs_write 3 48413 NULL
113683 +uhid_event_from_user_48417 uhid_event_from_user 2 48417 NULL
113684 +div64_u64_rem_48418 div64_u64_rem 0-1-2 48418 NULL
113685 +pwr_tx_without_ps_read_48423 pwr_tx_without_ps_read 3 48423 NULL
113686 +print_filtered_48442 print_filtered 2-0 48442 NULL
113687 +tun_recvmsg_48463 tun_recvmsg 4 48463 NULL
113688 +compat_SyS_preadv64_48469 compat_SyS_preadv64 3 48469 NULL
113689 +r8712_usbctrl_vendorreq_48489 r8712_usbctrl_vendorreq 6 48489 NULL
113690 +send_control_msg_48498 send_control_msg 6 48498 NULL
113691 +count_masked_bytes_48507 count_masked_bytes 0-1 48507 NULL
113692 +diva_os_copy_to_user_48508 diva_os_copy_to_user 4 48508 NULL
113693 +brcmf_sdio_trap_info_48510 brcmf_sdio_trap_info 4 48510 NULL
113694 +phantom_get_free_48514 phantom_get_free 0 48514 NULL
113695 +drbd_bm_capacity_48530 drbd_bm_capacity 0 48530 NULL
113696 +raid10_size_48571 raid10_size 0-2-3 48571 NULL
113697 +llog_data_len_48607 llog_data_len 1 48607 NULL
113698 +do_ip_vs_set_ctl_48641 do_ip_vs_set_ctl 4 48641 NULL
113699 +ll_rw_extents_stats_pp_seq_write_48651 ll_rw_extents_stats_pp_seq_write 3 48651 NULL
113700 +mtd_read_48655 mtd_read 0 48655 NULL
113701 +aes_encrypt_packets_read_48666 aes_encrypt_packets_read 3 48666 NULL
113702 +sm501_create_subdev_48668 sm501_create_subdev 3-4 48668 NULL
113703 +security_inode_setattr_48689 security_inode_setattr 0 48689 NULL
113704 +hysdn_log_write_48694 hysdn_log_write 3 48694 NULL
113705 +altera_drscan_48698 altera_drscan 2 48698 NULL
113706 +kvm_set_irq_routing_48704 kvm_set_irq_routing 3 48704 NULL
113707 +recv_msg_48709 recv_msg 4 48709 NULL
113708 +lpfc_idiag_drbacc_write_48712 lpfc_idiag_drbacc_write 3 48712 NULL
113709 +SyS_lgetxattr_48719 SyS_lgetxattr 4 48719 NULL
113710 +ath6kl_usb_bmi_read_48745 ath6kl_usb_bmi_read 3 48745 NULL
113711 +ath6kl_regwrite_read_48747 ath6kl_regwrite_read 3 48747 NULL
113712 +l2cap_segment_sdu_48772 l2cap_segment_sdu 4 48772 NULL
113713 +gfs2_direct_IO_48774 gfs2_direct_IO 4 48774 NULL
113714 +il3945_sta_dbgfs_stats_table_read_48802 il3945_sta_dbgfs_stats_table_read 3 48802 NULL
113715 +twa_change_queue_depth_48808 twa_change_queue_depth 2 48808 NULL
113716 +atomic_counters_read_48827 atomic_counters_read 3 48827 NULL
113717 +azx_get_position_48841 azx_get_position 0 48841 NULL
113718 +vc_do_resize_48842 vc_do_resize 3-4 48842 NULL
113719 +comedi_buf_write_alloc_48846 comedi_buf_write_alloc 0-2 48846 NULL
113720 +suspend_dtim_interval_write_48854 suspend_dtim_interval_write 3 48854 NULL
113721 +C_SYSC_pwritev64_48864 C_SYSC_pwritev64 3 48864 NULL nohasharray
113722 +viafb_dvp1_proc_write_48864 viafb_dvp1_proc_write 3 48864 &C_SYSC_pwritev64_48864
113723 +__ffs_ep0_read_events_48868 __ffs_ep0_read_events 3 48868 NULL
113724 +crypto_cipher_ctxsize_48890 crypto_cipher_ctxsize 0 48890 NULL
113725 +joydev_handle_JSIOCSAXMAP_48898 joydev_handle_JSIOCSAXMAP 3 48898 NULL
113726 +xdi_copy_to_user_48900 xdi_copy_to_user 4 48900 NULL
113727 +msg_hdr_sz_48908 msg_hdr_sz 0 48908 NULL
113728 +sep_crypto_dma_48937 sep_crypto_dma 0 48937 NULL
113729 +si5351_write_parameters_48940 si5351_write_parameters 2 48940 NULL
113730 +event_heart_beat_read_48961 event_heart_beat_read 3 48961 NULL
113731 +nand_ecc_test_run_48966 nand_ecc_test_run 1 48966 NULL
113732 +vmci_handle_arr_create_48971 vmci_handle_arr_create 1 48971 NULL
113733 +xfs_trans_commit_48982 xfs_trans_commit 0 48982 NULL
113734 +gfs2_dir_add_48987 gfs2_dir_add 0 48987 NULL
113735 +rds_rm_size_48996 rds_rm_size 0-2 48996 NULL
113736 +sel_write_enforce_48998 sel_write_enforce 3 48998 NULL
113737 +null_alloc_rs_49019 null_alloc_rs 2 49019 NULL
113738 +filemap_check_errors_49022 filemap_check_errors 0 49022 NULL
113739 +transient_status_49027 transient_status 4 49027 NULL
113740 +ll_xattr_cache_add_49032 ll_xattr_cache_add 4-0 49032 NULL
113741 +iwl_mvm_power_legacy_dbgfs_read_49038 iwl_mvm_power_legacy_dbgfs_read 4 49038 NULL
113742 +scsi_register_49094 scsi_register 2 49094 NULL
113743 +compat_do_readv_writev_49102 compat_do_readv_writev 4 49102 NULL
113744 +gfs2_diradd_alloc_required_49105 gfs2_diradd_alloc_required 0 49105 NULL
113745 +xfrm_replay_state_esn_len_49119 xfrm_replay_state_esn_len 0 49119 NULL
113746 +ll_max_cached_mb_seq_write_49122 ll_max_cached_mb_seq_write 3 49122 NULL
113747 +pt_read_49136 pt_read 3 49136 NULL
113748 +ipwireless_tty_received_49154 ipwireless_tty_received 3 49154 NULL
113749 +f2fs_acl_count_49155 f2fs_acl_count 0-1 49155 NULL
113750 +ipw_queue_tx_init_49161 ipw_queue_tx_init 3 49161 NULL
113751 +__jfs_setxattr_49175 __jfs_setxattr 5 49175 NULL
113752 +ath6kl_bgscan_int_write_49178 ath6kl_bgscan_int_write 3 49178 NULL
113753 +dvb_dvr_ioctl_49182 dvb_dvr_ioctl 2 49182 NULL
113754 +print_queue_49191 print_queue 4-0 49191 NULL
113755 +iwl_dbgfs_ucode_general_stats_read_49199 iwl_dbgfs_ucode_general_stats_read 3 49199 NULL
113756 +il4965_rs_sta_dbgfs_stats_table_read_49206 il4965_rs_sta_dbgfs_stats_table_read 3 49206 NULL
113757 +do_jffs2_getxattr_49210 do_jffs2_getxattr 0 49210 NULL
113758 +nouveau_therm_create__49228 nouveau_therm_create_ 4 49228 NULL
113759 +ieee80211_if_read_rssi_threshold_49260 ieee80211_if_read_rssi_threshold 3 49260 NULL
113760 +isku_sysfs_read_keys_media_49268 isku_sysfs_read_keys_media 6 49268 NULL
113761 +ptlrpc_check_set_49277 ptlrpc_check_set 0 49277 NULL
113762 +rx_filter_beacon_filter_read_49279 rx_filter_beacon_filter_read 3 49279 NULL
113763 +viafb_dfph_proc_write_49288 viafb_dfph_proc_write 3 49288 NULL
113764 +uio_read_49300 uio_read 3 49300 NULL
113765 +isku_sysfs_read_keys_macro_49312 isku_sysfs_read_keys_macro 6 49312 NULL
113766 +SYSC_mincore_49319 SYSC_mincore 2-1 49319 NULL
113767 +fwtty_port_handler_49327 fwtty_port_handler 9 49327 NULL
113768 +srpt_alloc_ioctx_ring_49330 srpt_alloc_ioctx_ring 2-4-3 49330 NULL
113769 +joydev_ioctl_common_49359 joydev_ioctl_common 2 49359 NULL
113770 +iscsi_alloc_session_49390 iscsi_alloc_session 3 49390 NULL
113771 +ext4_ext_index_trans_blocks_49396 ext4_ext_index_trans_blocks 0 49396 NULL
113772 +rx_streaming_always_read_49401 rx_streaming_always_read 3 49401 NULL
113773 +tnode_alloc_49407 tnode_alloc 1 49407 NULL
113774 +samples_to_bytes_49426 samples_to_bytes 0-2 49426 NULL
113775 +compat_do_msg_fill_49440 compat_do_msg_fill 3 49440 NULL
113776 +__hfsplus_getxattr_49460 __hfsplus_getxattr 0 49460 NULL
113777 +agp_3_5_isochronous_node_enable_49465 agp_3_5_isochronous_node_enable 3 49465 NULL
113778 +xfs_iformat_local_49472 xfs_iformat_local 4-0 49472 NULL
113779 +isr_decrypt_done_read_49490 isr_decrypt_done_read 3 49490 NULL
113780 +iwl_dbgfs_disable_power_off_read_49517 iwl_dbgfs_disable_power_off_read 3 49517 NULL
113781 +SyS_listxattr_49519 SyS_listxattr 3 49519 NULL
113782 +emulator_write_phys_49520 emulator_write_phys 2-4 49520 NULL
113783 +smk_write_access_49561 smk_write_access 3 49561 NULL
113784 +alloc_chunk_49575 alloc_chunk 1 49575 NULL
113785 +sctp_setsockopt_default_send_param_49578 sctp_setsockopt_default_send_param 3 49578 NULL
113786 +readfifo_49583 readfifo 1 49583 NULL
113787 +gfs2_quota_lock_49587 gfs2_quota_lock 0 49587 NULL
113788 +evm_inode_setattr_49594 evm_inode_setattr 0 49594 NULL
113789 +tap_write_49595 tap_write 3 49595 NULL
113790 +isr_wakeups_read_49607 isr_wakeups_read 3 49607 NULL
113791 +btrfs_mksubvol_49616 btrfs_mksubvol 3 49616 NULL
113792 +heap_init_49617 heap_init 2 49617 NULL
113793 +smk_write_doi_49621 smk_write_doi 3 49621 NULL
113794 +port_fops_read_49626 port_fops_read 3 49626 NULL
113795 +btrfsic_cmp_log_and_dev_bytenr_49628 btrfsic_cmp_log_and_dev_bytenr 2 49628 NULL
113796 +xfs_ialloc_get_rec_49648 xfs_ialloc_get_rec 0 49648 NULL
113797 +aa_simple_write_to_buffer_49683 aa_simple_write_to_buffer 4-3 49683 NULL
113798 +SyS_pwritev_49688 SyS_pwritev 3 49688 NULL
113799 +__copy_from_user_nocheck_49699 __copy_from_user_nocheck 0-3 49699 NULL
113800 +cx2341x_ctrl_new_menu_49700 cx2341x_ctrl_new_menu 3 49700 NULL
113801 +write_pool_49718 write_pool 3 49718 NULL
113802 +kvm_mmu_notifier_invalidate_page_49723 kvm_mmu_notifier_invalidate_page 3 49723 NULL
113803 +sep_create_dcb_dmatables_context_kernel_49728 sep_create_dcb_dmatables_context_kernel 6 49728 NULL
113804 +zd_usb_iowrite16v_49744 zd_usb_iowrite16v 3 49744 NULL
113805 +btrfs_chunk_num_stripes_49751 btrfs_chunk_num_stripes 0 49751 NULL
113806 +fuse_wr_pages_49753 fuse_wr_pages 0-1-2 49753 NULL
113807 +key_conf_keylen_read_49758 key_conf_keylen_read 3 49758 NULL
113808 +fuse_conn_waiting_read_49762 fuse_conn_waiting_read 3 49762 NULL
113809 +w83977af_fir_interrupt_49775 w83977af_fir_interrupt 0 49775 NULL
113810 +ceph_osdc_readpages_49789 ceph_osdc_readpages 0 49789 NULL
113811 +nfs4_acl_new_49806 nfs4_acl_new 1 49806 NULL
113812 +ntfs_copy_from_user_iovec_49829 ntfs_copy_from_user_iovec 3-6-0 49829 NULL
113813 +add_uuid_49831 add_uuid 4 49831 NULL
113814 +iraw_loop_49842 iraw_loop 0-1 49842 NULL
113815 +twl4030_write_49846 twl4030_write 2 49846 NULL
113816 +scsi_dispatch_cmd_entry_49848 scsi_dispatch_cmd_entry 3 49848 NULL
113817 +timeradd_entry_49850 timeradd_entry 3 49850 NULL
113818 +fiemap_count_to_size_49869 fiemap_count_to_size 0-1 49869 NULL
113819 +sctp_setsockopt_bindx_49870 sctp_setsockopt_bindx 3 49870 NULL
113820 +osc_brw_49896 osc_brw 4 49896 NULL
113821 +config_ep_by_speed_49939 config_ep_by_speed 0 49939 NULL
113822 +xfs_ialloc_ag_alloc_49960 xfs_ialloc_ag_alloc 0 49960 NULL
113823 +ieee80211_if_fmt_dtim_count_49987 ieee80211_if_fmt_dtim_count 3 49987 NULL
113824 +drm_buffer_copy_from_user_49990 drm_buffer_copy_from_user 3 49990 NULL
113825 +l2cap_chan_send_49995 l2cap_chan_send 3 49995 NULL
113826 +dn_mss_from_pmtu_50011 dn_mss_from_pmtu 0-2 50011 NULL
113827 +xfs_ialloc_inode_init_50015 xfs_ialloc_inode_init 0 50015 NULL
113828 +security_context_to_sid_50019 security_context_to_sid 2 50019 NULL
113829 +isdn_read_50021 isdn_read 3 50021 NULL
113830 +mdc_rename_pack_50023 mdc_rename_pack 4-6 50023 NULL
113831 +brcmf_debugfs_chipinfo_read_50033 brcmf_debugfs_chipinfo_read 3 50033 NULL
113832 +ioread8_50049 ioread8 0 50049 NULL
113833 +fuse_conn_max_background_write_50061 fuse_conn_max_background_write 3 50061 NULL
113834 +__kfifo_dma_in_prepare_50081 __kfifo_dma_in_prepare 4 50081 NULL
113835 +libcfs_ioctl_popdata_50087 libcfs_ioctl_popdata 3 50087 NULL
113836 +sock_setsockopt_50088 sock_setsockopt 5 50088 NULL
113837 +altera_swap_dr_50090 altera_swap_dr 2 50090 NULL
113838 +android_set_cntry_50100 android_set_cntry 0 50100 NULL
113839 +read_file_slot_50111 read_file_slot 3 50111 NULL
113840 +rx_streaming_interval_write_50120 rx_streaming_interval_write 3 50120 NULL
113841 +jfs_direct_IO_50125 jfs_direct_IO 4 50125 NULL
113842 +SYSC_preadv_50134 SYSC_preadv 3 50134 NULL
113843 +tx_frag_need_fragmentation_read_50153 tx_frag_need_fragmentation_read 3 50153 NULL
113844 +xfs_bwrite_50154 xfs_bwrite 0 50154 NULL
113845 +kmalloc_node_50163 kmalloc_node 1 50163 NULL
113846 +rx_filter_ibss_filter_read_50167 rx_filter_ibss_filter_read 3 50167 NULL
113847 +ahd_probe_stack_size_50168 ahd_probe_stack_size 0 50168 NULL
113848 +odev_update_50169 odev_update 2 50169 NULL
113849 +ubi_resize_volume_50172 ubi_resize_volume 2 50172 NULL nohasharray
113850 +ieee80211_if_fmt_dot11MeshHWMPRannInterval_50172 ieee80211_if_fmt_dot11MeshHWMPRannInterval 3 50172 &ubi_resize_volume_50172
113851 +cfg80211_roamed_bss_50198 cfg80211_roamed_bss 4-6 50198 NULL
113852 +cyttsp4_probe_50201 cyttsp4_probe 4 50201 NULL
113853 +rx_rx_timeout_wa_read_50204 rx_rx_timeout_wa_read 3 50204 NULL
113854 +mthca_buddy_init_50206 mthca_buddy_init 2 50206 NULL
113855 +l2cap_sock_setsockopt_50207 l2cap_sock_setsockopt 5 50207 NULL
113856 +mon_bin_compat_ioctl_50234 mon_bin_compat_ioctl 3 50234 NULL
113857 +sg_kmalloc_50240 sg_kmalloc 1 50240 NULL
113858 +rxrpc_setsockopt_50286 rxrpc_setsockopt 5 50286 NULL
113859 +soc_codec_reg_show_50302 soc_codec_reg_show 0-3 50302 NULL
113860 +SYSC_flistxattr_50307 SYSC_flistxattr 3 50307 NULL
113861 +SYSC_sched_setaffinity_50310 SYSC_sched_setaffinity 2 50310 NULL
113862 +soc_camera_read_50319 soc_camera_read 3 50319 NULL
113863 +do_launder_page_50329 do_launder_page 0 50329 NULL
113864 +nouveau_engine_create__50331 nouveau_engine_create_ 7 50331 NULL
113865 +lpfc_idiag_pcicfg_read_50334 lpfc_idiag_pcicfg_read 3 50334 NULL
113866 +snd_pcm_lib_writev_50337 snd_pcm_lib_writev 0-3 50337 NULL
113867 +tpm_read_50344 tpm_read 3 50344 NULL
113868 +isdn_ppp_read_50356 isdn_ppp_read 4 50356 NULL
113869 +iwl_dbgfs_echo_test_write_50362 iwl_dbgfs_echo_test_write 3 50362 NULL
113870 +xfrm_send_migrate_50365 xfrm_send_migrate 5 50365 NULL
113871 +roccat_common2_receive_50369 roccat_common2_receive 4 50369 NULL
113872 +sl_alloc_bufs_50380 sl_alloc_bufs 2 50380 NULL
113873 +l2tp_ip_sendmsg_50411 l2tp_ip_sendmsg 4 50411 NULL
113874 +iscsi_create_conn_50425 iscsi_create_conn 2 50425 NULL
113875 +validate_acl_mac_addrs_50429 validate_acl_mac_addrs 0 50429 NULL
113876 +xfs_alloc_update_counters_50441 xfs_alloc_update_counters 0 50441 NULL
113877 +btrfs_error_discard_extent_50444 btrfs_error_discard_extent 2 50444 NULL
113878 +pgctrl_write_50453 pgctrl_write 3 50453 NULL
113879 +device_create_sys_dev_entry_50458 device_create_sys_dev_entry 0 50458 NULL
113880 +cfs_size_round_50472 cfs_size_round 0-1 50472 NULL
113881 +cdrom_read_cdda_50478 cdrom_read_cdda 4 50478 NULL
113882 +xfs_iformat_extents_50486 xfs_iformat_extents 0 50486 NULL
113883 +gfs2_block_map_50492 gfs2_block_map 0 50492 NULL
113884 +mei_io_cb_alloc_req_buf_50493 mei_io_cb_alloc_req_buf 2 50493 NULL
113885 +pwr_rcvd_awake_beacons_read_50505 pwr_rcvd_awake_beacons_read 3 50505 NULL
113886 +ath6kl_set_ap_probe_resp_ies_50539 ath6kl_set_ap_probe_resp_ies 3 50539 NULL
113887 +bh_get_50543 bh_get 0 50543 NULL
113888 +gfs2_meta_inode_buffer_50544 gfs2_meta_inode_buffer 0 50544 NULL
113889 +usbat_flash_write_data_50553 usbat_flash_write_data 4 50553 NULL
113890 +fat_readpages_50582 fat_readpages 4 50582 NULL
113891 +iwl_dbgfs_missed_beacon_read_50584 iwl_dbgfs_missed_beacon_read 3 50584 NULL
113892 +xillybus_write_50605 xillybus_write 3 50605 NULL
113893 +rx_rx_checksum_result_read_50617 rx_rx_checksum_result_read 3 50617 NULL
113894 +sparse_early_usemaps_alloc_node_50623 sparse_early_usemaps_alloc_node 4 50623 NULL
113895 +simple_transaction_get_50633 simple_transaction_get 3 50633 NULL
113896 +gfs2_unstuff_dinode_50644 gfs2_unstuff_dinode 0 50644 NULL
113897 +ath6kl_tm_rx_event_50664 ath6kl_tm_rx_event 3 50664 NULL
113898 +bnad_debugfs_read_50665 bnad_debugfs_read 3 50665 NULL
113899 +prism2_read_fid_reg_50689 prism2_read_fid_reg 0 50689 NULL
113900 +xfs_growfs_get_hdr_buf_50697 xfs_growfs_get_hdr_buf 3 50697 NULL
113901 +dev_mem_read_50706 dev_mem_read 3 50706 NULL
113902 +blk_check_plugged_50736 blk_check_plugged 3 50736 NULL
113903 +__ext3_get_inode_loc_50744 __ext3_get_inode_loc 0 50744 NULL
113904 +ocfs2_xattr_block_get_50773 ocfs2_xattr_block_get 0 50773 NULL
113905 +tm6000_read_write_usb_50774 tm6000_read_write_usb 7 50774 NULL
113906 +bio_alloc_map_data_50782 bio_alloc_map_data 2 50782 NULL
113907 +tpm_write_50798 tpm_write 3 50798 NULL
113908 +tun_do_read_50800 tun_do_read 4 50800 NULL
113909 +write_flush_50803 write_flush 3 50803 NULL
113910 +dvb_play_50814 dvb_play 3 50814 NULL
113911 +btrfs_stack_file_extent_disk_num_bytes_50825 btrfs_stack_file_extent_disk_num_bytes 0 50825 NULL
113912 +dpcm_show_state_50827 dpcm_show_state 0 50827 NULL
113913 +SetArea_50835 SetArea 4 50835 NULL
113914 +videobuf_dma_init_user_50839 videobuf_dma_init_user 4-3 50839 NULL
113915 +carl9170_debugfs_write_50857 carl9170_debugfs_write 3 50857 NULL
113916 +SyS_lgetxattr_50889 SyS_lgetxattr 4 50889 NULL
113917 +netlbl_secattr_catmap_walk_rng_50894 netlbl_secattr_catmap_walk_rng 0-2 50894 NULL
113918 +__bdev_writeseg_50903 __bdev_writeseg 4 50903 NULL
113919 +xfs_alloc_get_freelist_50906 xfs_alloc_get_freelist 0 50906 NULL
113920 +xfs_iext_remove_50909 xfs_iext_remove 3 50909 NULL
113921 +blk_rq_cur_sectors_50910 blk_rq_cur_sectors 0 50910 NULL
113922 +hash_recvmsg_50924 hash_recvmsg 4 50924 NULL
113923 +chd_dec_fetch_cdata_50926 chd_dec_fetch_cdata 3 50926 NULL
113924 +show_device_status_50947 show_device_status 0 50947 NULL
113925 +irq_timeout_write_50950 irq_timeout_write 3 50950 NULL
113926 +virtio_cread16_50951 virtio_cread16 0 50951 NULL
113927 +sdio_uart_write_50954 sdio_uart_write 3 50954 NULL
113928 +SyS_setxattr_50957 SyS_setxattr 4 50957 NULL
113929 +iwl_statistics_flag_50981 iwl_statistics_flag 0-3 50981 NULL
113930 +timeout_write_50991 timeout_write 3 50991 NULL
113931 +proc_write_51003 proc_write 3 51003 NULL
113932 +jbd2_journal_extend_51012 jbd2_journal_extend 2 51012 NULL
113933 +lbs_dev_info_51023 lbs_dev_info 3 51023 NULL
113934 +fuse_conn_congestion_threshold_read_51028 fuse_conn_congestion_threshold_read 3 51028 NULL
113935 +BcmGetSectionValEndOffset_51039 BcmGetSectionValEndOffset 0 51039 NULL
113936 +dump_midi_51040 dump_midi 3 51040 NULL
113937 +usb_get_descriptor_51041 usb_get_descriptor 0 51041 NULL
113938 +srpt_alloc_ioctx_51042 srpt_alloc_ioctx 2-3 51042 NULL
113939 +do_arpt_set_ctl_51053 do_arpt_set_ctl 4 51053 NULL
113940 +wusb_prf_64_51065 wusb_prf_64 7 51065 NULL
113941 +jbd2_journal_init_revoke_51088 jbd2_journal_init_revoke 2 51088 NULL
113942 +__ocfs2_find_path_51096 __ocfs2_find_path 0 51096 NULL
113943 +ti_recv_51110 ti_recv 3 51110 NULL
113944 +alloc_rtllib_51136 alloc_rtllib 1 51136 NULL
113945 +simple_xattr_set_51140 simple_xattr_set 4 51140 NULL
113946 +xfs_trans_get_efd_51148 xfs_trans_get_efd 3 51148 NULL
113947 +nf_ct_ext_create_51232 nf_ct_ext_create 3 51232 NULL
113948 +snd_pcm_write_51235 snd_pcm_write 3 51235 NULL
113949 +drm_property_create_51239 drm_property_create 4 51239 NULL
113950 +__mxt_read_reg_51249 __mxt_read_reg 0 51249 NULL
113951 +st_read_51251 st_read 3 51251 NULL
113952 +compat_dccp_setsockopt_51263 compat_dccp_setsockopt 5 51263 NULL
113953 +target_alloc_sgl_51264 target_alloc_sgl 3 51264 NULL
113954 +dvb_audio_write_51275 dvb_audio_write 3 51275 NULL
113955 +ipwireless_network_packet_received_51277 ipwireless_network_packet_received 4 51277 NULL
113956 +pvr2_std_id_to_str_51288 pvr2_std_id_to_str 2 51288 NULL
113957 +bnad_debugfs_read_regrd_51308 bnad_debugfs_read_regrd 3 51308 NULL
113958 +init_map_ipmac_51317 init_map_ipmac 5 51317 NULL
113959 +alloc_hippi_dev_51320 alloc_hippi_dev 1 51320 NULL
113960 +ext2_xattr_get_51327 ext2_xattr_get 0 51327 NULL
113961 +alloc_smp_req_51337 alloc_smp_req 1 51337 NULL
113962 +ipw_get_event_log_len_51341 ipw_get_event_log_len 0 51341 NULL
113963 +ieee80211_if_fmt_estab_plinks_51370 ieee80211_if_fmt_estab_plinks 3 51370 NULL
113964 +radeon_kms_compat_ioctl_51371 radeon_kms_compat_ioctl 2 51371 NULL
113965 +blk_register_region_51424 blk_register_region 1-2 51424 NULL
113966 +mwifiex_rdeeprom_read_51429 mwifiex_rdeeprom_read 3 51429 NULL
113967 +hfsplus_brec_read_51436 hfsplus_brec_read 0 51436 NULL
113968 +xfs_mod_incore_sb_unlocked_51439 xfs_mod_incore_sb_unlocked 0 51439 NULL
113969 +ieee80211_if_read_dot11MeshHWMPRootMode_51441 ieee80211_if_read_dot11MeshHWMPRootMode 3 51441 NULL
113970 +print_devstats_dot11ACKFailureCount_51443 print_devstats_dot11ACKFailureCount 3 51443 NULL
113971 +____alloc_ei_netdev_51475 ____alloc_ei_netdev 1 51475 NULL
113972 +xfs_buf_get_uncached_51477 xfs_buf_get_uncached 2 51477 NULL
113973 +kvm_fetch_guest_virt_51493 kvm_fetch_guest_virt 4-2 51493 NULL
113974 +ieee80211_if_write_uapsd_queues_51526 ieee80211_if_write_uapsd_queues 3 51526 NULL
113975 +__alloc_eip_netdev_51549 __alloc_eip_netdev 1 51549 NULL
113976 +batadv_tt_prepare_tvlv_local_data_51568 batadv_tt_prepare_tvlv_local_data 0 51568 NULL
113977 +ixgb_get_eeprom_len_51586 ixgb_get_eeprom_len 0 51586 NULL
113978 +aac_convert_sgraw2_51598 aac_convert_sgraw2 4 51598 NULL
113979 +table_size_to_number_of_entries_51613 table_size_to_number_of_entries 0-1 51613 NULL
113980 +extent_fiemap_51621 extent_fiemap 3 51621 NULL
113981 +sctp_auth_create_key_51641 sctp_auth_create_key 1 51641 NULL
113982 +iscsi_create_session_51647 iscsi_create_session 3 51647 NULL
113983 +xfs_iformat_btree_51651 xfs_iformat_btree 0 51651 NULL
113984 +ps_upsd_utilization_read_51669 ps_upsd_utilization_read 3 51669 NULL
113985 +sctp_setsockopt_associnfo_51684 sctp_setsockopt_associnfo 3 51684 NULL
113986 +host_mapping_level_51696 host_mapping_level 0 51696 NULL
113987 +sel_write_access_51704 sel_write_access 3 51704 NULL
113988 +tty_cdev_add_51714 tty_cdev_add 2-4 51714 NULL
113989 +v9fs_alloc_rdir_buf_51716 v9fs_alloc_rdir_buf 2 51716 NULL
113990 +drm_compat_ioctl_51717 drm_compat_ioctl 2 51717 NULL
113991 +sg_read_oxfer_51724 sg_read_oxfer 3 51724 NULL
113992 +cm4040_read_51732 cm4040_read 3 51732 NULL
113993 +get_user_pages_fast_51751 get_user_pages_fast 0 51751 NULL
113994 +ifx_spi_insert_flip_string_51752 ifx_spi_insert_flip_string 3 51752 NULL
113995 +if_write_51756 if_write 3 51756 NULL
113996 +qib_alloc_devdata_51819 qib_alloc_devdata 2 51819 NULL
113997 +buffer_from_user_51826 buffer_from_user 3 51826 NULL
113998 +ioread32_51847 ioread32 0 51847 NULL nohasharray
113999 +read_file_tgt_tx_stats_51847 read_file_tgt_tx_stats 3 51847 &ioread32_51847
114000 +do_readv_writev_51849 do_readv_writev 4 51849 NULL
114001 +SYSC_sendto_51852 SYSC_sendto 6 51852 NULL
114002 +bm_page_io_async_51858 bm_page_io_async 2 51858 NULL
114003 +pointer_size_read_51863 pointer_size_read 3 51863 NULL
114004 +get_indirect_ea_51869 get_indirect_ea 4 51869 NULL
114005 +user_read_51881 user_read 3 51881 NULL
114006 +dbAdjCtl_51888 dbAdjCtl 0 51888 NULL
114007 +SyS_mq_timedsend_51896 SyS_mq_timedsend 3 51896 NULL
114008 +wmi_set_ie_51919 wmi_set_ie 3 51919 NULL
114009 +dbg_status_buf_51930 dbg_status_buf 2 51930 NULL
114010 +__tcp_mtu_to_mss_51938 __tcp_mtu_to_mss 0-2 51938 NULL
114011 +xfrm_alg_len_51940 xfrm_alg_len 0 51940 NULL
114012 +scsi_get_vpd_page_51951 scsi_get_vpd_page 4 51951 NULL
114013 +snd_mask_min_51969 snd_mask_min 0 51969 NULL
114014 +__blkdev_get_51972 __blkdev_get 0 51972 NULL
114015 +get_zone_51981 get_zone 0-1 51981 NULL
114016 +cifs_strict_writev_51984 cifs_strict_writev 4 51984 NULL
114017 +ath6kl_sdio_alloc_prep_scat_req_51986 ath6kl_sdio_alloc_prep_scat_req 2 51986 NULL
114018 +_c4iw_write_mem_dma_51991 _c4iw_write_mem_dma 3 51991 NULL
114019 +dwc3_mode_write_51997 dwc3_mode_write 3 51997 NULL
114020 +skb_copy_datagram_from_iovec_52014 skb_copy_datagram_from_iovec 4-2-5 52014 NULL
114021 +rdmalt_52022 rdmalt 0 52022 NULL
114022 +override_release_52032 override_release 2 52032 NULL
114023 +end_port_52042 end_port 0 52042 NULL
114024 +dma_rx_errors_read_52045 dma_rx_errors_read 3 52045 NULL
114025 +msnd_fifo_write_52052 msnd_fifo_write 0-3 52052 NULL
114026 +dvb_ringbuffer_avail_52057 dvb_ringbuffer_avail 0 52057 NULL
114027 +__fuse_request_alloc_52060 __fuse_request_alloc 1 52060 NULL
114028 +isofs_readpages_52067 isofs_readpages 4 52067 NULL
114029 +mxuport_process_read_urb_data_52072 mxuport_process_read_urb_data 3 52072 NULL
114030 +nsm_get_handle_52089 nsm_get_handle 4 52089 NULL
114031 +ulist_add_merge_52096 ulist_add_merge 0 52096 NULL
114032 +o2net_debug_read_52105 o2net_debug_read 3 52105 NULL
114033 +split_scan_timeout_write_52128 split_scan_timeout_write 3 52128 NULL
114034 +retry_count_read_52129 retry_count_read 3 52129 NULL
114035 +xfs_btree_change_owner_52137 xfs_btree_change_owner 0 52137 NULL
114036 +gdm_usb_hci_send_52138 gdm_usb_hci_send 3 52138 NULL
114037 +sub_alloc_52140 sub_alloc 0 52140 NULL
114038 +hysdn_conf_write_52145 hysdn_conf_write 3 52145 NULL
114039 +htable_size_52148 htable_size 0-1 52148 NULL
114040 +gfs2_rs_alloc_52152 gfs2_rs_alloc 0 52152 NULL
114041 +smk_write_load2_52155 smk_write_load2 3 52155 NULL
114042 +ieee80211_if_read_dot11MeshRetryTimeout_52168 ieee80211_if_read_dot11MeshRetryTimeout 3 52168 NULL
114043 +mga_compat_ioctl_52170 mga_compat_ioctl 2 52170 NULL
114044 +print_prefix_52176 print_prefix 0 52176 NULL
114045 +proc_pid_readlink_52186 proc_pid_readlink 3 52186 NULL
114046 +reiserfs_posix_acl_from_disk_52191 reiserfs_posix_acl_from_disk 2 52191 NULL
114047 +vmci_qp_broker_alloc_52216 vmci_qp_broker_alloc 6-5 52216 NULL
114048 +fuse_request_alloc_52243 fuse_request_alloc 1 52243 NULL nohasharray
114049 +xfs_iomap_eof_align_last_fsb_52243 xfs_iomap_eof_align_last_fsb 0 52243 &fuse_request_alloc_52243
114050 +mdiobus_alloc_size_52259 mdiobus_alloc_size 1 52259 NULL
114051 +shrink_slab_52261 shrink_slab 2 52261 NULL
114052 +sisusbcon_do_font_op_52271 sisusbcon_do_font_op 9 52271 NULL
114053 +kobject_set_name_vargs_52309 kobject_set_name_vargs 0 52309 NULL
114054 +read_file_reset_52310 read_file_reset 3 52310 NULL
114055 +request_asymmetric_key_52317 request_asymmetric_key 2-4 52317 NULL
114056 +hwflags_read_52318 hwflags_read 3 52318 NULL
114057 +test_unaligned_bulk_52333 test_unaligned_bulk 3 52333 NULL
114058 +hur_len_52339 hur_len 0 52339 NULL
114059 +bytes_to_frames_52362 bytes_to_frames 0-2 52362 NULL nohasharray
114060 +cap_inode_killpriv_52362 cap_inode_killpriv 0 52362 &bytes_to_frames_52362
114061 +copy_entries_to_user_52367 copy_entries_to_user 1 52367 NULL
114062 +iwl_dump_fh_52371 iwl_dump_fh 0 52371 NULL
114063 +hfsplus_find_attr_52374 hfsplus_find_attr 0 52374 NULL
114064 +mq_emit_config_values_52378 mq_emit_config_values 3 52378 NULL
114065 +isdn_writebuf_stub_52383 isdn_writebuf_stub 4 52383 NULL
114066 +jfs_setxattr_52389 jfs_setxattr 4 52389 NULL
114067 +aer_inject_write_52399 aer_inject_write 3 52399 NULL
114068 +cgroup_file_write_52417 cgroup_file_write 3 52417 NULL
114069 +line6_midibuf_init_52425 line6_midibuf_init 2 52425 NULL
114070 +hso_serial_common_create_52428 hso_serial_common_create 4 52428 NULL
114071 +delay_status_52431 delay_status 5 52431 NULL
114072 +ath6kl_delete_qos_write_52435 ath6kl_delete_qos_write 3 52435 NULL
114073 +ieee80211_if_fmt_num_sta_ps_52438 ieee80211_if_fmt_num_sta_ps 3 52438 NULL
114074 +acpi_nvs_for_each_region_52448 acpi_nvs_for_each_region 0 52448 NULL
114075 +alauda_read_data_52452 alauda_read_data 3 52452 NULL
114076 +ieee80211_alloc_txb_52477 ieee80211_alloc_txb 1 52477 NULL
114077 +usb_tranzport_write_52479 usb_tranzport_write 3 52479 NULL
114078 +ocfs2_extend_no_holes_52483 ocfs2_extend_no_holes 3-4 52483 NULL
114079 +fd_do_rw_52495 fd_do_rw 3 52495 NULL
114080 +int_tasklet_entry_52500 int_tasklet_entry 3 52500 NULL
114081 +xfs_alloc_get_rec_52502 xfs_alloc_get_rec 0 52502 NULL
114082 +lmv_get_easize_52504 lmv_get_easize 0 52504 NULL
114083 +pm_qos_power_write_52513 pm_qos_power_write 3 52513 NULL
114084 +bt_sock_stream_recvmsg_52518 bt_sock_stream_recvmsg 4 52518 NULL
114085 +dup_variable_bug_52525 dup_variable_bug 3 52525 NULL
114086 +raw_recvmsg_52529 raw_recvmsg 4 52529 NULL
114087 +dccpprobe_read_52549 dccpprobe_read 3 52549 NULL
114088 +ntfs_prepare_pages_for_non_resident_write_52556 ntfs_prepare_pages_for_non_resident_write 0 52556 NULL
114089 +debug_level_proc_write_52572 debug_level_proc_write 3 52572 NULL
114090 +kernfs_setattr_52583 kernfs_setattr 0 52583 NULL
114091 +isku_sysfs_read_macro_52587 isku_sysfs_read_macro 6 52587 NULL
114092 +SyS_setsockopt_52610 SyS_setsockopt 5 52610 NULL
114093 +ll_sa_entry_alloc_52611 ll_sa_entry_alloc 4 52611 NULL
114094 +tps80031_writes_52638 tps80031_writes 3-4 52638 NULL
114095 +brcmf_sdio_assert_info_52653 brcmf_sdio_assert_info 4 52653 NULL
114096 +nvme_queue_extra_52661 nvme_queue_extra 0-1 52661 NULL
114097 +SYSC_gethostname_52677 SYSC_gethostname 2 52677 NULL
114098 +nvd0_disp_pioc_create__52693 nvd0_disp_pioc_create_ 5 52693 NULL
114099 +nouveau_client_create__52715 nouveau_client_create_ 5 52715 NULL
114100 +__dm_stat_bio_52722 __dm_stat_bio 3 52722 NULL
114101 +cx25840_ir_rx_read_52724 cx25840_ir_rx_read 3 52724 NULL
114102 +blkcipher_next_slow_52733 blkcipher_next_slow 3-4 52733 NULL
114103 +relay_alloc_page_array_52735 relay_alloc_page_array 1 52735 NULL
114104 +hfcsusb_rx_frame_52745 hfcsusb_rx_frame 3 52745 NULL
114105 +carl9170_debugfs_vif_dump_read_52755 carl9170_debugfs_vif_dump_read 3 52755 NULL
114106 +ieee80211_if_read_beacon_timeout_52756 ieee80211_if_read_beacon_timeout 3 52756 NULL
114107 +nvme_trans_ext_inq_page_52776 nvme_trans_ext_inq_page 3 52776 NULL
114108 +pwr_rcvd_beacons_read_52836 pwr_rcvd_beacons_read 3 52836 NULL
114109 +lb_alloc_ep_req_52837 lb_alloc_ep_req 2 52837 NULL
114110 +mon_bin_get_event_52863 mon_bin_get_event 4-6 52863 NULL
114111 +twl6030_gpadc_write_52867 twl6030_gpadc_write 1 52867 NULL
114112 +twlreg_write_52880 twlreg_write 3 52880 NULL
114113 +pvr2_ctrl_value_to_sym_internal_52881 pvr2_ctrl_value_to_sym_internal 5 52881 NULL
114114 +cache_read_procfs_52882 cache_read_procfs 3 52882 NULL
114115 +kvm_kvzalloc_52894 kvm_kvzalloc 1 52894 NULL
114116 +dio_bio_reap_52913 dio_bio_reap 0 52913 NULL
114117 +__kfifo_out_peek_r_52919 __kfifo_out_peek_r 3 52919 NULL
114118 +iblock_get_bio_52936 iblock_get_bio 3 52936 NULL
114119 +__nodes_remap_52951 __nodes_remap 5 52951 NULL
114120 +send_packet_52960 send_packet 4 52960 NULL
114121 +ieee80211_if_fmt_fwded_mcast_52961 ieee80211_if_fmt_fwded_mcast 3 52961 NULL
114122 +tx_tx_exch_read_52986 tx_tx_exch_read 3 52986 NULL
114123 +num_node_state_52989 num_node_state 0 52989 NULL
114124 +btrfs_free_and_pin_reserved_extent_53016 btrfs_free_and_pin_reserved_extent 2 53016 NULL
114125 +tx_tx_exch_pending_read_53018 tx_tx_exch_pending_read 3 53018 NULL
114126 +xfs_rtfree_extent_53024 xfs_rtfree_extent 0 53024 NULL
114127 +bio_cur_bytes_53037 bio_cur_bytes 0 53037 NULL
114128 +regcache_lzo_block_count_53056 regcache_lzo_block_count 0 53056 NULL
114129 +cfi_read_query_53066 cfi_read_query 0 53066 NULL
114130 +iwl_dbgfs_interrupt_write_53069 iwl_dbgfs_interrupt_write 3 53069 NULL
114131 +mwifiex_debug_read_53074 mwifiex_debug_read 3 53074 NULL
114132 +mic_virtio_copy_from_user_53107 mic_virtio_copy_from_user 3 53107 NULL
114133 +verity_status_53120 verity_status 5 53120 NULL
114134 +brcmf_usb_dl_cmd_53130 brcmf_usb_dl_cmd 4 53130 NULL
114135 +inode_newsize_ok_53140 inode_newsize_ok 0 53140 NULL nohasharray
114136 +ps_poll_ps_poll_max_ap_turn_read_53140 ps_poll_ps_poll_max_ap_turn_read 3 53140 &inode_newsize_ok_53140
114137 +ieee80211_bss_info_update_53170 ieee80211_bss_info_update 4 53170 NULL
114138 +btrfs_io_bio_alloc_53179 btrfs_io_bio_alloc 2 53179 NULL
114139 +find_good_lh_53183 find_good_lh 0 53183 NULL
114140 +clear_capture_buf_53192 clear_capture_buf 2 53192 NULL
114141 +xfs_btree_updkey_53195 xfs_btree_updkey 0 53195 NULL
114142 +tx_tx_start_data_read_53219 tx_tx_start_data_read 3 53219 NULL
114143 +ptlrpc_lprocfs_req_history_max_seq_write_53243 ptlrpc_lprocfs_req_history_max_seq_write 3 53243 NULL
114144 +xfs_trans_read_buf_map_53258 xfs_trans_read_buf_map 5-0 53258 NULL
114145 +wil_write_file_ssid_53266 wil_write_file_ssid 3 53266 NULL
114146 +btrfs_file_extent_num_bytes_53269 btrfs_file_extent_num_bytes 0 53269 NULL
114147 +ftrace_profile_write_53327 ftrace_profile_write 3 53327 NULL
114148 +find_nr_power_limit_53330 find_nr_power_limit 0 53330 NULL
114149 +gsm_control_reply_53333 gsm_control_reply 4 53333 NULL
114150 +btree_keys_bytes_53348 btree_keys_bytes 0 53348 NULL
114151 +read_6120_creg32_53363 read_6120_creg32 0 53363 NULL
114152 +sock_setbindtodevice_53369 sock_setbindtodevice 3 53369 NULL
114153 +get_random_bytes_arch_53370 get_random_bytes_arch 2 53370 NULL
114154 +xfs_imap_53389 xfs_imap 0 53389 NULL
114155 +isr_cmd_cmplt_read_53439 isr_cmd_cmplt_read 3 53439 NULL
114156 +mwifiex_info_read_53447 mwifiex_info_read 3 53447 NULL
114157 +apei_exec_run_optional_53452 apei_exec_run_optional 0 53452 NULL
114158 +paging64_prefetch_gpte_53468 paging64_prefetch_gpte 4 53468 NULL
114159 +ima_write_template_field_data_53475 ima_write_template_field_data 2 53475 NULL nohasharray
114160 +create_trace_kprobe_53475 create_trace_kprobe 1 53475 &ima_write_template_field_data_53475
114161 +iowarrior_read_53483 iowarrior_read 3 53483 NULL
114162 +osd_req_write_kern_53486 osd_req_write_kern 5 53486 NULL
114163 +do_verify_xattr_datum_53499 do_verify_xattr_datum 0 53499 NULL
114164 +snd_pcm_format_physical_width_53505 snd_pcm_format_physical_width 0 53505 NULL
114165 +dbAllocNext_53506 dbAllocNext 0 53506 NULL
114166 +check_acl_53512 check_acl 0 53512 NULL
114167 +ll_xattr_cache_update_53515 ll_xattr_cache_update 4 53515 NULL
114168 +nft_data_dump_53549 nft_data_dump 5 53549 NULL
114169 +SYSC_bind_53582 SYSC_bind 3 53582 NULL
114170 +cifs_utf16_bytes_53593 cifs_utf16_bytes 0 53593 NULL
114171 +proc_uid_map_write_53596 proc_uid_map_write 3 53596 NULL
114172 +pfkey_recvmsg_53604 pfkey_recvmsg 4 53604 NULL
114173 +___alloc_bootmem_nopanic_53626 ___alloc_bootmem_nopanic 1 53626 NULL
114174 +xd_write_multiple_pages_53633 xd_write_multiple_pages 6-5 53633 NULL
114175 +ccid_getsockopt_builtin_ccids_53634 ccid_getsockopt_builtin_ccids 2 53634 NULL
114176 +nr_sendmsg_53656 nr_sendmsg 4 53656 NULL
114177 +fuse_fill_write_pages_53682 fuse_fill_write_pages 0-4 53682 NULL
114178 +v4l2_event_subscribe_53687 v4l2_event_subscribe 3 53687 NULL
114179 +bdev_logical_block_size_53690 bdev_logical_block_size 0 53690 NULL nohasharray
114180 +igb_alloc_q_vector_53690 igb_alloc_q_vector 4-6 53690 &bdev_logical_block_size_53690
114181 +find_overflow_devnum_53711 find_overflow_devnum 0 53711 NULL
114182 +__proc_debug_mb_53732 __proc_debug_mb 5 53732 NULL
114183 +wdm_write_53735 wdm_write 3 53735 NULL
114184 +amdtp_out_stream_get_max_payload_53755 amdtp_out_stream_get_max_payload 0 53755 NULL nohasharray
114185 +lpfc_idiag_queacc_read_qe_53755 lpfc_idiag_queacc_read_qe 0-2 53755 &amdtp_out_stream_get_max_payload_53755
114186 +wa_populate_buf_in_urb_53758 wa_populate_buf_in_urb 3-4 53758 NULL
114187 +ext2_acl_count_53773 ext2_acl_count 0-1 53773 NULL
114188 +__kfifo_dma_in_prepare_r_53792 __kfifo_dma_in_prepare_r 4-5 53792 NULL
114189 +qp_alloc_host_work_53798 qp_alloc_host_work 5-3 53798 NULL
114190 +regmap_raw_write_53803 regmap_raw_write 2-4 53803 NULL
114191 +lpfc_idiag_ctlacc_read_reg_53809 lpfc_idiag_ctlacc_read_reg 0-3 53809 NULL
114192 +nls_nullsize_53815 nls_nullsize 0 53815 NULL
114193 +setup_data_read_53822 setup_data_read 3 53822 NULL
114194 +pms_read_53873 pms_read 3 53873 NULL
114195 +ieee80211_if_fmt_dropped_frames_congestion_53883 ieee80211_if_fmt_dropped_frames_congestion 3 53883 NULL
114196 +SyS_setgroups_53900 SyS_setgroups 1 53900 NULL
114197 +posix_acl_chmod_53904 posix_acl_chmod 0 53904 NULL
114198 +batadv_tt_tvlv_ogm_handler_v1_53909 batadv_tt_tvlv_ogm_handler_v1 5 53909 NULL
114199 +usb_serial_generic_write_53927 usb_serial_generic_write 4 53927 NULL
114200 +ocfs2_make_clusters_writable_53938 ocfs2_make_clusters_writable 0 53938 NULL
114201 +idetape_chrdev_write_53976 idetape_chrdev_write 3 53976 NULL
114202 +__ocfs2_xattr_set_value_outside_53981 __ocfs2_xattr_set_value_outside 5 53981 NULL
114203 +ieee80211_if_fmt_dot11MeshHWMPperrMinInterval_53998 ieee80211_if_fmt_dot11MeshHWMPperrMinInterval 3 53998 NULL
114204 +hfsplus_attr_build_key_54013 hfsplus_attr_build_key 0 54013 NULL
114205 +snd_pcm_lib_write_transfer_54018 snd_pcm_lib_write_transfer 5-2-4 54018 NULL
114206 +mdc_kuc_write_54019 mdc_kuc_write 3 54019 NULL
114207 +ipxrtr_route_packet_54036 ipxrtr_route_packet 4 54036 NULL
114208 +batadv_tt_update_orig_54049 batadv_tt_update_orig 6-4 54049 NULL
114209 +pipeline_dec_packet_out_read_54052 pipeline_dec_packet_out_read 3 54052 NULL
114210 +nl80211_send_disconnected_54056 nl80211_send_disconnected 5 54056 NULL
114211 +rproc_state_read_54057 rproc_state_read 3 54057 NULL
114212 +_malloc_54077 _malloc 1 54077 NULL
114213 +bitmap_bitremap_54096 bitmap_bitremap 4 54096 NULL
114214 +altera_set_ir_pre_54103 altera_set_ir_pre 2 54103 NULL nohasharray
114215 +lustre_posix_acl_xattr_filter_54103 lustre_posix_acl_xattr_filter 2-0 54103 &altera_set_ir_pre_54103
114216 +__comedi_buf_write_alloc_54112 __comedi_buf_write_alloc 0-2 54112 NULL
114217 +strn_len_54122 strn_len 0 54122 NULL
114218 +isku_receive_54130 isku_receive 4 54130 NULL
114219 +isr_host_acknowledges_read_54136 isr_host_acknowledges_read 3 54136 NULL
114220 +irq_blk_threshold_write_54138 irq_blk_threshold_write 3 54138 NULL
114221 +memcpy_toiovec_54166 memcpy_toiovec 3 54166 NULL
114222 +nouveau_falcon_create__54169 nouveau_falcon_create_ 8 54169 NULL
114223 +p9_client_prepare_req_54175 p9_client_prepare_req 3 54175 NULL
114224 +do_sys_poll_54221 do_sys_poll 2 54221 NULL
114225 +__register_chrdev_54223 __register_chrdev 2-3 54223 NULL
114226 +pi_read_regr_54231 pi_read_regr 0 54231 NULL
114227 +reada_add_block_54247 reada_add_block 2 54247 NULL
114228 +xfs_dir2_sf_addname_hard_54254 xfs_dir2_sf_addname_hard 3 54254 NULL
114229 +ceph_msgpool_get_54258 ceph_msgpool_get 2 54258 NULL
114230 +audio_write_54261 audio_write 4 54261 NULL nohasharray
114231 +wusb_prf_54261 wusb_prf 7 54261 &audio_write_54261
114232 +mwifiex_getlog_read_54269 mwifiex_getlog_read 3 54269 NULL
114233 +kstrtou16_from_user_54274 kstrtou16_from_user 2 54274 NULL
114234 +tipc_multicast_54285 tipc_multicast 4 54285 NULL
114235 +altera_set_dr_post_54291 altera_set_dr_post 2 54291 NULL
114236 +dlm_alloc_pagevec_54296 dlm_alloc_pagevec 1 54296 NULL
114237 +reclaim_pages_54301 reclaim_pages 3 54301 NULL
114238 +sprintf_54306 sprintf 0 54306 NULL
114239 +bio_add_pc_page_54319 bio_add_pc_page 4 54319 NULL
114240 +br_fdb_fillbuf_54339 br_fdb_fillbuf 0 54339 NULL
114241 +__alloc_dev_table_54343 __alloc_dev_table 2 54343 NULL
114242 +__get_free_pages_54352 __get_free_pages 0 54352 NULL
114243 +read_file_credit_dist_stats_54367 read_file_credit_dist_stats 3 54367 NULL
114244 +vfs_readlink_54368 vfs_readlink 3 54368 NULL
114245 +do_dccp_setsockopt_54377 do_dccp_setsockopt 5 54377 NULL nohasharray
114246 +intel_sdvo_write_cmd_54377 intel_sdvo_write_cmd 4 54377 &do_dccp_setsockopt_54377
114247 +ah_alloc_tmp_54378 ah_alloc_tmp 3-2 54378 NULL
114248 +snd_pcm_oss_read2_54387 snd_pcm_oss_read2 3-0 54387 NULL
114249 +iwl_dbgfs_power_save_status_read_54392 iwl_dbgfs_power_save_status_read 3 54392 NULL
114250 +ll_ra_count_get_54410 ll_ra_count_get 3 54410 NULL
114251 +copy_gadget_strings_54417 copy_gadget_strings 2-3 54417 NULL
114252 +sparse_early_mem_maps_alloc_node_54485 sparse_early_mem_maps_alloc_node 4 54485 NULL
114253 +simple_strtoull_54493 simple_strtoull 0 54493 NULL
114254 +btrfs_ordered_sum_size_54509 btrfs_ordered_sum_size 0-2 54509 NULL
114255 +rfc4106_set_key_54519 rfc4106_set_key 3 54519 NULL
114256 +vmci_transport_dgram_enqueue_54525 vmci_transport_dgram_enqueue 4 54525 NULL
114257 +viacam_read_54526 viacam_read 3 54526 NULL
114258 +unix_dgram_connect_54535 unix_dgram_connect 3 54535 NULL
114259 +setsockopt_54539 setsockopt 5 54539 NULL
114260 +lbs_lowsnr_write_54549 lbs_lowsnr_write 3 54549 NULL
114261 +SYSC_setsockopt_54561 SYSC_setsockopt 5 54561 NULL
114262 +nfsd_vfs_write_54577 nfsd_vfs_write 6 54577 NULL
114263 +fw_iso_buffer_init_54582 fw_iso_buffer_init 3 54582 NULL
114264 +nvme_npages_54601 nvme_npages 0-1 54601 NULL
114265 +irq_pkt_threshold_write_54605 irq_pkt_threshold_write 3 54605 NULL
114266 +port_fops_write_54627 port_fops_write 3 54627 NULL
114267 +irq_timeout_read_54653 irq_timeout_read 3 54653 NULL
114268 +dns_resolver_read_54658 dns_resolver_read 3 54658 NULL
114269 +twl6030_interrupt_mask_54659 twl6030_interrupt_mask 2 54659 NULL
114270 +tdp_page_fault_54663 tdp_page_fault 2 54663 NULL
114271 +bus_add_device_54665 bus_add_device 0 54665 NULL
114272 +cw1200_queue_stats_init_54670 cw1200_queue_stats_init 2 54670 NULL
114273 +bio_kmalloc_54672 bio_kmalloc 2 54672 NULL
114274 +evm_read_key_54674 evm_read_key 3 54674 NULL
114275 +tipc_link_send_sections_fast_54689 tipc_link_send_sections_fast 3 54689 NULL
114276 +__btrfs_inc_extent_ref_54706 __btrfs_inc_extent_ref 7 54706 NULL
114277 +rfkill_fop_read_54711 rfkill_fop_read 3 54711 NULL
114278 +ocfs2_control_write_54737 ocfs2_control_write 3 54737 NULL
114279 +kzalloc_54740 kzalloc 1 54740 NULL
114280 +wep_iv_read_54744 wep_iv_read 3 54744 NULL
114281 +lpfc_idiag_pcicfg_write_54749 lpfc_idiag_pcicfg_write 3 54749 NULL
114282 +iio_event_chrdev_read_54757 iio_event_chrdev_read 3 54757 NULL
114283 +adis16480_show_firmware_date_54762 adis16480_show_firmware_date 3 54762 NULL
114284 +ldsem_atomic_update_54774 ldsem_atomic_update 1 54774 NULL
114285 +xfs_rtallocate_extent_block_54791 xfs_rtallocate_extent_block 0 54791 NULL
114286 +flexcop_device_kmalloc_54793 flexcop_device_kmalloc 1 54793 NULL
114287 +nfsd_write_54809 nfsd_write 6 54809 NULL
114288 +ar9287_dump_modal_eeprom_54814 ar9287_dump_modal_eeprom 3-2 54814 NULL
114289 +crypto_tfm_ctx_alignment_54815 crypto_tfm_ctx_alignment 0 54815 NULL nohasharray
114290 +kvzalloc_54815 kvzalloc 1 54815 &crypto_tfm_ctx_alignment_54815 nohasharray
114291 +aes_decrypt_fail_read_54815 aes_decrypt_fail_read 3 54815 &kvzalloc_54815
114292 +generic_perform_write_54832 generic_perform_write 3-0 54832 NULL
114293 +write_rio_54837 write_rio 3 54837 NULL
114294 +ext3_acl_from_disk_54839 ext3_acl_from_disk 2 54839 NULL nohasharray
114295 +nouveau_engctx_create__54839 nouveau_engctx_create_ 8 54839 &ext3_acl_from_disk_54839
114296 +ufx_ops_write_54848 ufx_ops_write 3 54848 NULL
114297 +printer_read_54851 printer_read 3 54851 NULL
114298 +broadsheet_spiflash_rewrite_sector_54864 broadsheet_spiflash_rewrite_sector 2 54864 NULL
114299 +prism_build_supp_rates_54865 prism_build_supp_rates 0 54865 NULL
114300 +xfs_alloc_read_agfl_54879 xfs_alloc_read_agfl 0 54879 NULL
114301 +iscsi_pool_init_54913 iscsi_pool_init 2-4 54913 NULL nohasharray
114302 +kobject_set_name_vargs_54913 kobject_set_name_vargs 0 54913 &iscsi_pool_init_54913
114303 +btrfs_stack_chunk_num_stripes_54923 btrfs_stack_chunk_num_stripes 0 54923 NULL
114304 +bio_add_page_54933 bio_add_page 0-3 54933 NULL
114305 +mxms_structlen_54939 mxms_structlen 0 54939 NULL
114306 +add_port_54941 add_port 2 54941 NULL
114307 +ath9k_dump_btcoex_54949 ath9k_dump_btcoex 3-0 54949 NULL
114308 +alauda_write_data_54967 alauda_write_data 3 54967 NULL
114309 +c4_add_card_54968 c4_add_card 3 54968 NULL
114310 +ext3_xattr_get_54989 ext3_xattr_get 0 54989 NULL
114311 +cx231xx_v4l2_read_55014 cx231xx_v4l2_read 3 55014 NULL
114312 +error_error_null_Frame_tx_start_read_55024 error_error_null_Frame_tx_start_read 3 55024 NULL
114313 +dgap_do_bios_load_55025 dgap_do_bios_load 3 55025 NULL
114314 +apei_exec_run_55075 apei_exec_run 0 55075 NULL
114315 +bitmap_storage_alloc_55077 bitmap_storage_alloc 2 55077 NULL
114316 +read_dma_55086 read_dma 3 55086 NULL
114317 +rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read_55106 rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read 3 55106 NULL
114318 +crypto_ahash_setkey_55134 crypto_ahash_setkey 3 55134 NULL
114319 +filldir_55137 filldir 3 55137 NULL
114320 +ocfs2_truncate_file_55148 ocfs2_truncate_file 3 55148 NULL
114321 +xfs_check_agi_freecount_55149 xfs_check_agi_freecount 0 55149 NULL nohasharray
114322 +npages_to_npools_55149 npages_to_npools 0-1 55149 &xfs_check_agi_freecount_55149
114323 +ieee80211_if_read_uapsd_queues_55150 ieee80211_if_read_uapsd_queues 3 55150 NULL
114324 +xfs_icsb_modify_counters_55156 xfs_icsb_modify_counters 0 55156 NULL
114325 +gfs2_ri_update_55185 gfs2_ri_update 0 55185 NULL
114326 +mtd_get_fact_prot_info_55186 mtd_get_fact_prot_info 0 55186 NULL
114327 +sel_write_relabel_55195 sel_write_relabel 3 55195 NULL
114328 +sched_feat_write_55202 sched_feat_write 3 55202 NULL
114329 +ht40allow_map_read_55209 ht40allow_map_read 3 55209 NULL
114330 +__kfifo_dma_out_prepare_r_55211 __kfifo_dma_out_prepare_r 4-5 55211 NULL
114331 +do_raw_setsockopt_55215 do_raw_setsockopt 5 55215 NULL
114332 +qxl_alloc_client_monitors_config_55216 qxl_alloc_client_monitors_config 2 55216 NULL
114333 +nouveau_mc_create__55217 nouveau_mc_create_ 4 55217 NULL
114334 +dbAllocDmap_55227 dbAllocDmap 0 55227 NULL
114335 +memcpy_fromiovec_55247 memcpy_fromiovec 3 55247 NULL
114336 +lbs_failcount_write_55276 lbs_failcount_write 3 55276 NULL
114337 +persistent_ram_new_55286 persistent_ram_new 1-2 55286 NULL
114338 +rx_streaming_interval_read_55291 rx_streaming_interval_read 3 55291 NULL
114339 +lov_get_stripecnt_55297 lov_get_stripecnt 0-3 55297 NULL
114340 +gsm_control_modem_55303 gsm_control_modem 3 55303 NULL
114341 +wimax_msg_len_55304 wimax_msg_len 0 55304 NULL
114342 +qp_alloc_guest_work_55305 qp_alloc_guest_work 5-3 55305 NULL
114343 +__vxge_hw_vpath_initialize_55328 __vxge_hw_vpath_initialize 2 55328 NULL
114344 +vme_user_read_55338 vme_user_read 3 55338 NULL
114345 +__wa_xfer_setup_sizes_55342 __wa_xfer_setup_sizes 0 55342 NULL nohasharray
114346 +sctp_datamsg_from_user_55342 sctp_datamsg_from_user 4 55342 &__wa_xfer_setup_sizes_55342
114347 +tipc_send2name_55373 tipc_send2name 5 55373 NULL
114348 +cw1200_sdio_align_size_55391 cw1200_sdio_align_size 2 55391 NULL
114349 +iwl_dbgfs_plcp_delta_read_55407 iwl_dbgfs_plcp_delta_read 3 55407 NULL
114350 +sysfs_chmod_file_55408 sysfs_chmod_file 0 55408 NULL
114351 +si476x_radio_read_rds_blckcnt_blob_55427 si476x_radio_read_rds_blckcnt_blob 3 55427 NULL
114352 +__vxge_hw_channel_allocate_55462 __vxge_hw_channel_allocate 3 55462 NULL
114353 +cx23888_ir_rx_read_55473 cx23888_ir_rx_read 3 55473 NULL
114354 +snd_pcm_lib_write_55483 snd_pcm_lib_write 0-3 55483 NULL
114355 +i2o_pool_alloc_55485 i2o_pool_alloc 4 55485 NULL
114356 +batadv_tt_entries_55487 batadv_tt_entries 0-1 55487 NULL
114357 +ras_stride_increase_window_55501 ras_stride_increase_window 3 55501 NULL
114358 +tx_tx_done_int_template_read_55511 tx_tx_done_int_template_read 3 55511 NULL
114359 +xfs_btree_split_55515 xfs_btree_split 0 55515 NULL
114360 +ea_get_55522 ea_get 3-0 55522 NULL
114361 +buffer_size_55534 buffer_size 0 55534 NULL
114362 +set_msr_interception_55538 set_msr_interception 2 55538 NULL
114363 +tty_port_register_device_55543 tty_port_register_device 3 55543 NULL
114364 +dgap_do_config_load_55548 dgap_do_config_load 2 55548 NULL
114365 +hash_ipport6_expire_55549 hash_ipport6_expire 4 55549 NULL
114366 +dm_stats_list_55551 dm_stats_list 4 55551 NULL
114367 +add_partition_55588 add_partition 2 55588 NULL
114368 +kstrtou8_from_user_55599 kstrtou8_from_user 2 55599 NULL
114369 +SyS_keyctl_55602 SyS_keyctl 4 55602 NULL
114370 +macvtap_put_user_55609 macvtap_put_user 4 55609 NULL
114371 +selinux_setprocattr_55611 selinux_setprocattr 4 55611 NULL
114372 +edge_tty_recv_55622 edge_tty_recv 3 55622 NULL
114373 +pktgen_if_write_55628 pktgen_if_write 3 55628 NULL nohasharray
114374 +reiserfs_xattr_get_55628 reiserfs_xattr_get 0 55628 &pktgen_if_write_55628
114375 +osc_obd_max_pages_per_rpc_seq_write_55636 osc_obd_max_pages_per_rpc_seq_write 3 55636 NULL
114376 +xfs_bmbt_maxrecs_55649 xfs_bmbt_maxrecs 0-2 55649 NULL
114377 +lpfc_idiag_queinfo_read_55662 lpfc_idiag_queinfo_read 3 55662 NULL
114378 +il_dbgfs_tx_queue_read_55668 il_dbgfs_tx_queue_read 3 55668 NULL
114379 +get_info_55681 get_info 3 55681 NULL
114380 +iwl_dbgfs_plcp_delta_write_55682 iwl_dbgfs_plcp_delta_write 3 55682 NULL
114381 +genl_allocate_reserve_groups_55705 genl_allocate_reserve_groups 1 55705 NULL
114382 +pm8001_store_update_fw_55716 pm8001_store_update_fw 4 55716 NULL
114383 +ocfs2_lock_refcount_tree_55719 ocfs2_lock_refcount_tree 0 55719 NULL
114384 +tap_pwup_write_55723 tap_pwup_write 3 55723 NULL
114385 +__iio_allocate_kfifo_55738 __iio_allocate_kfifo 2 55738 NULL
114386 +set_local_name_55757 set_local_name 4 55757 NULL
114387 +strlen_55778 strlen 0 55778 NULL
114388 +set_spte_55783 set_spte 4-5 55783 NULL
114389 +req_bio_endio_55786 req_bio_endio 3 55786 NULL nohasharray
114390 +conf_read_55786 conf_read 3 55786 &req_bio_endio_55786
114391 +uwb_rc_neh_grok_event_55799 uwb_rc_neh_grok_event 3 55799 NULL
114392 +sb16_copy_from_user_55836 sb16_copy_from_user 10-6-7 55836 NULL
114393 +ip_hdrlen_55849 ip_hdrlen 0 55849 NULL
114394 +hcd_alloc_coherent_55862 hcd_alloc_coherent 5 55862 NULL
114395 +shmem_setxattr_55867 shmem_setxattr 4 55867 NULL
114396 +hsc_write_55875 hsc_write 3 55875 NULL
114397 +ramdisk_store_55885 ramdisk_store 4 55885 NULL
114398 +pm_qos_power_read_55891 pm_qos_power_read 3 55891 NULL
114399 +hash_ip4_expire_55911 hash_ip4_expire 4 55911 NULL
114400 +snd_pcm_hw_param_value_min_55917 snd_pcm_hw_param_value_min 0 55917 NULL
114401 +ext2_direct_IO_55932 ext2_direct_IO 4 55932 NULL
114402 +kvm_write_guest_virt_system_55944 kvm_write_guest_virt_system 4-2 55944 NULL
114403 +sel_read_policy_55947 sel_read_policy 3 55947 NULL
114404 +ceph_get_direct_page_vector_55956 ceph_get_direct_page_vector 2 55956 NULL
114405 +simple_read_from_buffer_55957 simple_read_from_buffer 2-5 55957 NULL
114406 +tx_tx_imm_resp_read_55964 tx_tx_imm_resp_read 3 55964 NULL
114407 +btrfs_clone_55977 btrfs_clone 5-3 55977 NULL
114408 +wa_xfer_create_subset_sg_55992 wa_xfer_create_subset_sg 3-2 55992 NULL
114409 +nvme_alloc_iod_56027 nvme_alloc_iod 1-2 56027 NULL
114410 +usb_ocp_write_56047 usb_ocp_write 4 56047 NULL
114411 +dccp_sendmsg_56058 dccp_sendmsg 4 56058 NULL
114412 +pscsi_get_bio_56103 pscsi_get_bio 1 56103 NULL
114413 +add_sysfs_param_56108 add_sysfs_param 0 56108 NULL
114414 +usb_alloc_stream_buffers_56123 usb_alloc_stream_buffers 3 56123 NULL
114415 +sel_read_handle_status_56139 sel_read_handle_status 3 56139 NULL
114416 +write_file_frameerrors_56145 write_file_frameerrors 3 56145 NULL
114417 +__i2c_transfer_56162 __i2c_transfer 0 56162 NULL
114418 +rawv6_setsockopt_56165 rawv6_setsockopt 5 56165 NULL
114419 +ath9k_dump_legacy_btcoex_56194 ath9k_dump_legacy_btcoex 3-0 56194 NULL
114420 +vring_add_indirect_56222 vring_add_indirect 4 56222 NULL
114421 +ocfs2_find_xe_in_bucket_56224 ocfs2_find_xe_in_bucket 0 56224 NULL
114422 +do_ipt_set_ctl_56238 do_ipt_set_ctl 4 56238 NULL
114423 +fd_copyin_56247 fd_copyin 3 56247 NULL
114424 +sk_rmem_schedule_56255 sk_rmem_schedule 3 56255 NULL
114425 +il4965_ucode_general_stats_read_56277 il4965_ucode_general_stats_read 3 56277 NULL
114426 +ieee80211_if_fmt_user_power_level_56283 ieee80211_if_fmt_user_power_level 3 56283 NULL
114427 +RESIZE_IF_NEEDED_56286 RESIZE_IF_NEEDED 2 56286 NULL
114428 +dvb_aplay_56296 dvb_aplay 3 56296 NULL
114429 +btmrvl_hscfgcmd_read_56303 btmrvl_hscfgcmd_read 3 56303 NULL
114430 +speakup_file_write_56310 speakup_file_write 3 56310 NULL
114431 +pipeline_pre_to_defrag_swi_read_56321 pipeline_pre_to_defrag_swi_read 3 56321 NULL
114432 +journal_init_revoke_table_56331 journal_init_revoke_table 1 56331 NULL
114433 +snd_rawmidi_read_56337 snd_rawmidi_read 3 56337 NULL
114434 +vxge_os_dma_malloc_async_56348 vxge_os_dma_malloc_async 3 56348 NULL
114435 +mite_device_bytes_transferred_56355 mite_device_bytes_transferred 0 56355 NULL
114436 +qd_get_56365 qd_get 0 56365 NULL
114437 +iov_iter_copy_from_user_atomic_56368 iov_iter_copy_from_user_atomic 4-0 56368 NULL
114438 +dev_read_56369 dev_read 3 56369 NULL
114439 +ath10k_read_simulate_fw_crash_56371 ath10k_read_simulate_fw_crash 3 56371 NULL
114440 +write_gssp_56404 write_gssp 3 56404 NULL
114441 +ocfs2_control_read_56405 ocfs2_control_read 3 56405 NULL
114442 +do_get_write_access_56410 do_get_write_access 0 56410 NULL
114443 +store_msg_56417 store_msg 3 56417 NULL
114444 +pppol2tp_sendmsg_56420 pppol2tp_sendmsg 4 56420 NULL
114445 +l2cap_segment_le_sdu_56426 l2cap_segment_le_sdu 4 56426 NULL
114446 +fl_create_56435 fl_create 5 56435 NULL
114447 +gnttab_map_56439 gnttab_map 2 56439 NULL
114448 +cx231xx_init_isoc_56453 cx231xx_init_isoc 3-2-4 56453 NULL
114449 +set_connectable_56458 set_connectable 4 56458 NULL
114450 +osd_req_list_partition_objects_56464 osd_req_list_partition_objects 5 56464 NULL
114451 +putused_user_56467 putused_user 3 56467 NULL
114452 +ocfs2_zero_extend_range_56468 ocfs2_zero_extend_range 3-2 56468 NULL
114453 +lbs_rdmac_write_56471 lbs_rdmac_write 3 56471 NULL
114454 +calc_linear_pos_56472 calc_linear_pos 0-3 56472 NULL
114455 +crypto_shash_alignmask_56486 crypto_shash_alignmask 0 56486 NULL
114456 +ieee80211_rx_mgmt_probe_beacon_56491 ieee80211_rx_mgmt_probe_beacon 3 56491 NULL
114457 +memblock_virt_alloc_56501 memblock_virt_alloc 1 56501 NULL
114458 +init_map_ip_56508 init_map_ip 5 56508 NULL
114459 +lustre_posix_acl_xattr_reduce_space_56512 lustre_posix_acl_xattr_reduce_space 3-0-2 56512 NULL
114460 +cfg80211_connect_result_56515 cfg80211_connect_result 4-6 56515 NULL
114461 +ip_options_get_56538 ip_options_get 4 56538 NULL
114462 +ll_wr_track_id_56544 ll_wr_track_id 2 56544 NULL
114463 +alloc_apertures_56561 alloc_apertures 1 56561 NULL
114464 +rs_sta_dbgfs_stats_table_read_56573 rs_sta_dbgfs_stats_table_read 3 56573 NULL
114465 +portcntrs_2_read_56586 portcntrs_2_read 3 56586 NULL
114466 +event_filter_write_56609 event_filter_write 3 56609 NULL
114467 +nvme_trans_log_temperature_56613 nvme_trans_log_temperature 3 56613 NULL
114468 +edac_device_create_block_56619 edac_device_create_block 0 56619 NULL
114469 +gather_array_56641 gather_array 3 56641 NULL
114470 +lookup_extent_backref_56644 lookup_extent_backref 9 56644 NULL
114471 +uvc_debugfs_stats_read_56651 uvc_debugfs_stats_read 3 56651 NULL
114472 +tg3_nvram_write_block_56666 tg3_nvram_write_block 3 56666 NULL
114473 +snd_gus_dram_read_56686 snd_gus_dram_read 4 56686 NULL
114474 +dvb_ringbuffer_read_user_56702 dvb_ringbuffer_read_user 3-0 56702 NULL
114475 +sta_flags_read_56710 sta_flags_read 3 56710 NULL
114476 +ipv6_getsockopt_sticky_56711 ipv6_getsockopt_sticky 5 56711 NULL
114477 +xfs_btree_decrement_56718 xfs_btree_decrement 0 56718 NULL
114478 +__wa_xfer_setup_segs_56725 __wa_xfer_setup_segs 2 56725 NULL
114479 +__copy_from_user_ll_56738 __copy_from_user_ll 0-3 56738 NULL
114480 +drm_agp_bind_pages_56748 drm_agp_bind_pages 3 56748 NULL
114481 +btrfsic_map_block_56751 btrfsic_map_block 2 56751 NULL
114482 +ttm_alloc_new_pages_56792 ttm_alloc_new_pages 5 56792 NULL
114483 +ion_ioctl_56806 ion_ioctl 2 56806 NULL
114484 +do_syslog_56807 do_syslog 3 56807 NULL
114485 +mtdchar_write_56831 mtdchar_write 3 56831 NULL
114486 +snd_rawmidi_kernel_write1_56847 snd_rawmidi_kernel_write1 4-0 56847 NULL
114487 +si476x_radio_read_agc_blob_56849 si476x_radio_read_agc_blob 3 56849 NULL
114488 +ext3_xattr_ibody_get_56880 ext3_xattr_ibody_get 0 56880 NULL
114489 +pvr2_debugifc_print_status_56890 pvr2_debugifc_print_status 3 56890 NULL
114490 +debug_debug3_read_56894 debug_debug3_read 3 56894 NULL
114491 +batadv_tt_update_changes_56895 batadv_tt_update_changes 3 56895 NULL
114492 +hfsplus_find_cat_56899 hfsplus_find_cat 0 56899 NULL
114493 +__kfifo_out_56927 __kfifo_out 0-3 56927 NULL
114494 +journal_init_revoke_56933 journal_init_revoke 2 56933 NULL
114495 +xfs_alloc_ag_vextent_56943 xfs_alloc_ag_vextent 0 56943 NULL
114496 +nouveau_xtensa_create__56952 nouveau_xtensa_create_ 8 56952 NULL
114497 +diva_get_driver_info_56967 diva_get_driver_info 0 56967 NULL
114498 +nouveau_device_create__56984 nouveau_device_create_ 6 56984 NULL
114499 +vlsi_alloc_ring_57003 vlsi_alloc_ring 3-4 57003 NULL
114500 +btrfs_super_csum_size_57004 btrfs_super_csum_size 0 57004 NULL
114501 +aircable_process_packet_57027 aircable_process_packet 4 57027 NULL
114502 +ieee80211_if_fmt_state_57043 ieee80211_if_fmt_state 3 57043 NULL nohasharray
114503 +skb_network_offset_57043 skb_network_offset 0 57043 &ieee80211_if_fmt_state_57043
114504 +bytes_to_samples_57049 bytes_to_samples 0-2 57049 NULL
114505 +xfs_buf_read_map_57053 xfs_buf_read_map 3 57053 NULL
114506 +cx2341x_ctrl_new_std_57061 cx2341x_ctrl_new_std 4 57061 NULL
114507 +sca3000_read_data_57064 sca3000_read_data 4 57064 NULL
114508 +pcmcia_replace_cis_57066 pcmcia_replace_cis 3 57066 NULL
114509 +tracing_set_trace_write_57096 tracing_set_trace_write 3 57096 NULL
114510 +hpfs_readpages_57106 hpfs_readpages 4 57106 NULL
114511 +crypto_compress_ctxsize_57109 crypto_compress_ctxsize 0 57109 NULL
114512 +cipso_v4_gentag_loc_57119 cipso_v4_gentag_loc 0 57119 NULL
114513 +rds_ib_sub_signaled_57136 rds_ib_sub_signaled 2 57136 NULL nohasharray
114514 +nl80211_send_deauth_57136 nl80211_send_deauth 4 57136 &rds_ib_sub_signaled_57136 nohasharray
114515 +ima_show_htable_value_57136 ima_show_htable_value 2 57136 &nl80211_send_deauth_57136
114516 +snd_sonicvibes_getdmac_57140 snd_sonicvibes_getdmac 0 57140 NULL
114517 +_iwl_dbgfs_bf_params_write_57141 _iwl_dbgfs_bf_params_write 3 57141 NULL
114518 +udl_prime_create_57159 udl_prime_create 2 57159 NULL
114519 +stk_prepare_sio_buffers_57168 stk_prepare_sio_buffers 2 57168 NULL
114520 +rx_hw_stuck_read_57179 rx_hw_stuck_read 3 57179 NULL
114521 +hash_netnet6_expire_57191 hash_netnet6_expire 4 57191 NULL
114522 +tt3650_ci_msg_57219 tt3650_ci_msg 4 57219 NULL
114523 +dma_fifo_alloc_57236 dma_fifo_alloc 2-3-5 57236 NULL
114524 +flush_space_57241 flush_space 0 57241 NULL
114525 +rsxx_cram_write_57244 rsxx_cram_write 3 57244 NULL
114526 +ieee80211_if_fmt_tsf_57249 ieee80211_if_fmt_tsf 3 57249 NULL
114527 +oprofilefs_ulong_from_user_57251 oprofilefs_ulong_from_user 3 57251 NULL
114528 +alloc_flex_gd_57259 alloc_flex_gd 1 57259 NULL
114529 +lbs_sleepparams_write_57283 lbs_sleepparams_write 3 57283 NULL
114530 +pstore_file_read_57288 pstore_file_read 3 57288 NULL
114531 +snd_pcm_read_57289 snd_pcm_read 3 57289 NULL
114532 +ftdi_elan_write_57309 ftdi_elan_write 3 57309 NULL
114533 +xfs_iread_57313 xfs_iread 0 57313 NULL nohasharray
114534 +write_file_regval_57313 write_file_regval 3 57313 &xfs_iread_57313
114535 +__mxt_write_reg_57326 __mxt_write_reg 3 57326 NULL
114536 +usblp_read_57342 usblp_read 3 57342 NULL
114537 +print_devstats_dot11RTSFailureCount_57347 print_devstats_dot11RTSFailureCount 3 57347 NULL
114538 +dio_send_cur_page_57348 dio_send_cur_page 0 57348 NULL
114539 +tipc_bclink_stats_57372 tipc_bclink_stats 2 57372 NULL
114540 +tty_register_device_attr_57381 tty_register_device_attr 2 57381 NULL
114541 +read_file_blob_57406 read_file_blob 3 57406 NULL
114542 +enclosure_register_57412 enclosure_register 3 57412 NULL
114543 +compat_keyctl_instantiate_key_iov_57431 compat_keyctl_instantiate_key_iov 3 57431 NULL
114544 +copy_to_user_fromio_57432 copy_to_user_fromio 3 57432 NULL
114545 +__roundup_pow_of_two_57461 __roundup_pow_of_two 0 57461 NULL
114546 +sisusb_clear_vram_57466 sisusb_clear_vram 2-3 57466 NULL
114547 +ieee80211_if_read_flags_57470 ieee80211_if_read_flags 3 57470 NULL
114548 +tipc_port_reject_sections_57478 tipc_port_reject_sections 4 57478 NULL
114549 +bnad_debugfs_write_regwr_57500 bnad_debugfs_write_regwr 3 57500 NULL
114550 +skb_headlen_57501 skb_headlen 0 57501 NULL
114551 +copy_in_user_57502 copy_in_user 3 57502 NULL
114552 +ckhdid_printf_57505 ckhdid_printf 2 57505 NULL nohasharray
114553 +gfs2_quota_hold_57505 gfs2_quota_hold 0 57505 &ckhdid_printf_57505
114554 +init_tag_map_57515 init_tag_map 3 57515 NULL
114555 +il_dbgfs_force_reset_read_57517 il_dbgfs_force_reset_read 3 57517 NULL nohasharray
114556 +wil_read_file_ssid_57517 wil_read_file_ssid 3 57517 &il_dbgfs_force_reset_read_57517
114557 +cmm_read_57520 cmm_read 3 57520 NULL
114558 +inode_permission_57531 inode_permission 0 57531 NULL
114559 +acpi_dev_get_resources_57534 acpi_dev_get_resources 0 57534 NULL
114560 +ptlrpc_lprocfs_hp_ratio_seq_write_57537 ptlrpc_lprocfs_hp_ratio_seq_write 3 57537 NULL
114561 +ReadHDLCPnP_57559 ReadHDLCPnP 0 57559 NULL
114562 +obd_unpackmd_57563 obd_unpackmd 0 57563 NULL
114563 +snd_pcm_playback_ioctl1_57569 snd_pcm_playback_ioctl1 0 57569 NULL
114564 +get_bridge_ifindices_57579 get_bridge_ifindices 0 57579 NULL
114565 +ldlm_cli_enqueue_local_57582 ldlm_cli_enqueue_local 11 57582 NULL
114566 +il_dbgfs_interrupt_write_57591 il_dbgfs_interrupt_write 3 57591 NULL
114567 +read_file_spectral_fft_period_57593 read_file_spectral_fft_period 3 57593 NULL
114568 +tx_tx_retry_template_read_57623 tx_tx_retry_template_read 3 57623 NULL
114569 +sisusbcon_putcs_57630 sisusbcon_putcs 3 57630 NULL
114570 +mem_read_57631 mem_read 3 57631 NULL
114571 +xfs_alloc_ag_vextent_near_57653 xfs_alloc_ag_vextent_near 0 57653 NULL
114572 +r3964_write_57662 r3964_write 4 57662 NULL
114573 +proc_ns_readlink_57664 proc_ns_readlink 3 57664 NULL
114574 +__lgwrite_57669 __lgwrite 4 57669 NULL
114575 +f1x_match_to_this_node_57695 f1x_match_to_this_node 3 57695 NULL
114576 +i2400m_rx_stats_read_57706 i2400m_rx_stats_read 3 57706 NULL
114577 +ieee80211_if_read_dot11MeshHWMPconfirmationInterval_57722 ieee80211_if_read_dot11MeshHWMPconfirmationInterval 3 57722 NULL
114578 +nouveau_gpio_create__57735 nouveau_gpio_create_ 4-5 57735 NULL
114579 +pppol2tp_recvmsg_57742 pppol2tp_recvmsg 4 57742 NULL nohasharray
114580 +compat_sys_set_mempolicy_57742 compat_sys_set_mempolicy 3 57742 &pppol2tp_recvmsg_57742
114581 +ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval_57762 ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval 3 57762 NULL
114582 +SYSC_process_vm_writev_57776 SYSC_process_vm_writev 3-5 57776 NULL
114583 +apei_exec_collect_resources_57788 apei_exec_collect_resources 0 57788 NULL
114584 +ld2_57794 ld2 0 57794 NULL
114585 +ivtv_read_57796 ivtv_read 3 57796 NULL
114586 +ion_test_ioctl_57799 ion_test_ioctl 2 57799 NULL
114587 +bfad_debugfs_read_regrd_57830 bfad_debugfs_read_regrd 3 57830 NULL
114588 +copy_to_user_57835 copy_to_user 3-0 57835 NULL
114589 +xfs_rtpick_extent_57843 xfs_rtpick_extent 0 57843 NULL nohasharray
114590 +flash_read_57843 flash_read 3 57843 &xfs_rtpick_extent_57843
114591 +kiblnd_create_tx_pool_57846 kiblnd_create_tx_pool 2 57846 NULL
114592 +radeon_ttm_gtt_read_57879 radeon_ttm_gtt_read 3 57879 NULL
114593 +xt_alloc_table_info_57903 xt_alloc_table_info 1 57903 NULL
114594 +iio_read_first_n_kfifo_57910 iio_read_first_n_kfifo 2 57910 NULL
114595 +ll_xattr_find_get_lock_57912 ll_xattr_find_get_lock 0 57912 NULL
114596 +memcg_caches_array_size_57918 memcg_caches_array_size 0-1 57918 NULL
114597 +twl_i2c_write_57923 twl_i2c_write 3-4 57923 NULL
114598 +__snd_gf1_look16_57925 __snd_gf1_look16 0 57925 NULL
114599 +sel_read_handle_unknown_57933 sel_read_handle_unknown 3 57933 NULL
114600 +xfs_inode_item_format_convert_57937 xfs_inode_item_format_convert 0 57937 NULL
114601 +xfs_mru_cache_create_57943 xfs_mru_cache_create 3 57943 NULL
114602 +key_algorithm_read_57946 key_algorithm_read 3 57946 NULL
114603 +ip_set_alloc_57953 ip_set_alloc 1 57953 NULL nohasharray
114604 +ioat3_dca_count_dca_slots_57953 ioat3_dca_count_dca_slots 0 57953 &ip_set_alloc_57953
114605 +rx_reset_counter_read_58001 rx_reset_counter_read 3 58001 NULL
114606 +iwl_dbgfs_ucode_rx_stats_read_58023 iwl_dbgfs_ucode_rx_stats_read 3 58023 NULL
114607 +io_playback_transfer_58030 io_playback_transfer 4 58030 NULL
114608 +mce_async_out_58056 mce_async_out 3 58056 NULL
114609 +ocfs2_find_leaf_58065 ocfs2_find_leaf 0 58065 NULL
114610 +dt3155_alloc_coherent_58073 dt3155_alloc_coherent 2 58073 NULL
114611 +cm4040_write_58079 cm4040_write 3 58079 NULL
114612 +ipv6_flowlabel_opt_58135 ipv6_flowlabel_opt 3 58135 NULL nohasharray
114613 +slhc_init_58135 slhc_init 1-2 58135 &ipv6_flowlabel_opt_58135
114614 +rd_build_prot_space_58137 rd_build_prot_space 2 58137 NULL
114615 +xfs_bmap_add_extent_delay_real_58151 xfs_bmap_add_extent_delay_real 0 58151 NULL
114616 +xfs_btree_update_58167 xfs_btree_update 0 58167 NULL
114617 +garmin_write_bulk_58191 garmin_write_bulk 3 58191 NULL
114618 +ieee80211_if_fmt_flags_58205 ieee80211_if_fmt_flags 3 58205 NULL
114619 +i40evf_allocate_virt_mem_d_58210 i40evf_allocate_virt_mem_d 3 58210 NULL
114620 +btrfsic_create_link_to_next_block_58246 btrfsic_create_link_to_next_block 4 58246 NULL
114621 +read_file_debug_58256 read_file_debug 3 58256 NULL
114622 +osc_max_dirty_mb_seq_write_58263 osc_max_dirty_mb_seq_write 3 58263 NULL
114623 +cfg80211_mgmt_tx_status_58266 cfg80211_mgmt_tx_status 4 58266 NULL
114624 +profile_load_58267 profile_load 3 58267 NULL
114625 +kstrtos8_from_user_58268 kstrtos8_from_user 2 58268 NULL
114626 +acpi_ds_build_internal_package_obj_58271 acpi_ds_build_internal_package_obj 3 58271 NULL
114627 +iscsi_decode_text_input_58292 iscsi_decode_text_input 4 58292 NULL
114628 +ieee80211_if_read_dot11MeshTTL_58307 ieee80211_if_read_dot11MeshTTL 3 58307 NULL
114629 +tx_tx_start_int_templates_read_58324 tx_tx_start_int_templates_read 3 58324 NULL
114630 +ext4_ext_truncate_extend_restart_58331 ext4_ext_truncate_extend_restart 3 58331 NULL
114631 +__copy_from_user_swizzled_58337 __copy_from_user_swizzled 2-4 58337 NULL
114632 +SyS_migrate_pages_58348 SyS_migrate_pages 2 58348 NULL
114633 +brcmf_debugfs_sdio_counter_read_58369 brcmf_debugfs_sdio_counter_read 3 58369 NULL
114634 +il_dbgfs_status_read_58388 il_dbgfs_status_read 3 58388 NULL
114635 +_drbd_md_sync_page_io_58403 _drbd_md_sync_page_io 6 58403 NULL
114636 +kvm_mmu_write_protect_pt_masked_58406 kvm_mmu_write_protect_pt_masked 3 58406 NULL nohasharray
114637 +idetape_pad_zeros_58406 idetape_pad_zeros 2 58406 &kvm_mmu_write_protect_pt_masked_58406
114638 +xfs_btree_get_rec_58410 xfs_btree_get_rec 0 58410 NULL
114639 +i2400m_pld_size_58415 i2400m_pld_size 0 58415 NULL
114640 +capabilities_read_58457 capabilities_read 3 58457 NULL
114641 +usnic_vnic_get_resources_58462 usnic_vnic_get_resources 3 58462 NULL
114642 +lpfc_idiag_baracc_read_58466 lpfc_idiag_baracc_read 3 58466 NULL nohasharray
114643 +compat_do_ipt_set_ctl_58466 compat_do_ipt_set_ctl 4 58466 &lpfc_idiag_baracc_read_58466
114644 +nv_rd08_58472 nv_rd08 0 58472 NULL
114645 +acpi_tables_sysfs_init_58477 acpi_tables_sysfs_init 0 58477 NULL
114646 +snd_gf1_read_addr_58483 snd_gf1_read_addr 0 58483 NULL
114647 +snd_rme96_capture_copy_58484 snd_rme96_capture_copy 5 58484 NULL
114648 +btrfs_cont_expand_58498 btrfs_cont_expand 0-2-3 58498 NULL
114649 +gfs2_dir_get_new_buffer_58509 gfs2_dir_get_new_buffer 0 58509 NULL
114650 +rndis_add_response_58544 rndis_add_response 2 58544 NULL
114651 +wep_decrypt_fail_read_58567 wep_decrypt_fail_read 3 58567 NULL
114652 +scnprint_mac_oui_58578 scnprint_mac_oui 3-0 58578 NULL
114653 +ea_read_inline_58589 ea_read_inline 0 58589 NULL
114654 +isku_sysfs_read_keys_thumbster_58590 isku_sysfs_read_keys_thumbster 6 58590 NULL
114655 +xip_file_read_58592 xip_file_read 3 58592 NULL
114656 +ecryptfs_write_end_58594 ecryptfs_write_end 5-3 58594 NULL
114657 +radeon_bo_size_58606 radeon_bo_size 0 58606 NULL
114658 +skb_copy_to_page_nocache_58624 skb_copy_to_page_nocache 6 58624 NULL
114659 +filemap_fdatawrite_range_58630 filemap_fdatawrite_range 0 58630 NULL
114660 +tx_tx_start_fw_gen_read_58648 tx_tx_start_fw_gen_read 3 58648 NULL
114661 +iwl_dbgfs_rx_handlers_write_58655 iwl_dbgfs_rx_handlers_write 3 58655 NULL
114662 +find_zero_58685 find_zero 0-1 58685 NULL
114663 +uwb_bce_print_IEs_58686 uwb_bce_print_IEs 4 58686 NULL
114664 +tps6586x_writes_58689 tps6586x_writes 2-3 58689 NULL
114665 +vx_send_msg_58711 vx_send_msg 0 58711 NULL
114666 +csum_exist_in_range_58730 csum_exist_in_range 2-3 58730 NULL
114667 +frames_to_bytes_58741 frames_to_bytes 0-2 58741 NULL
114668 +ieee80211_if_write_tkip_mic_test_58748 ieee80211_if_write_tkip_mic_test 3 58748 NULL
114669 +agp_allocate_memory_58761 agp_allocate_memory 2 58761 NULL
114670 +regmap_calc_reg_len_58795 regmap_calc_reg_len 0 58795 NULL
114671 +raw_send_hdrinc_58803 raw_send_hdrinc 4 58803 NULL
114672 +isku_sysfs_read_58806 isku_sysfs_read 5 58806 NULL
114673 +ep_read_58813 ep_read 3 58813 NULL
114674 +command_write_58841 command_write 3 58841 NULL
114675 +ath6kl_wmi_send_action_cmd_58860 ath6kl_wmi_send_action_cmd 7 58860 NULL
114676 +gs_alloc_req_58883 gs_alloc_req 2 58883 NULL
114677 +esas2r_change_queue_depth_58886 esas2r_change_queue_depth 2 58886 NULL
114678 +lprocfs_wr_pinger_recov_58914 lprocfs_wr_pinger_recov 3 58914 NULL
114679 +print_devstats_dot11FCSErrorCount_58919 print_devstats_dot11FCSErrorCount 3 58919 NULL
114680 +pipeline_cs_rx_packet_out_read_58926 pipeline_cs_rx_packet_out_read 3 58926 NULL
114681 +xfs_bmap_read_extents_58936 xfs_bmap_read_extents 0 58936 NULL
114682 +wait_table_hash_nr_entries_58962 wait_table_hash_nr_entries 0 58962 NULL
114683 +ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout_58965 ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout 3 58965 NULL
114684 +crypto_aead_ivsize_58970 crypto_aead_ivsize 0 58970 NULL
114685 +__mem_cgroup_try_charge_58976 __mem_cgroup_try_charge 0 58976 NULL
114686 +init_list_set_59005 init_list_set 3 59005 NULL
114687 +ep_write_59008 ep_write 3 59008 NULL
114688 +lpfc_idiag_baracc_write_59014 lpfc_idiag_baracc_write 3 59014 NULL
114689 +SyS_preadv_59029 SyS_preadv 3 59029 NULL
114690 +init_pci_cap_msi_perm_59033 init_pci_cap_msi_perm 2 59033 NULL
114691 +selinux_transaction_write_59038 selinux_transaction_write 3 59038 NULL
114692 +crypto_aead_reqsize_59039 crypto_aead_reqsize 0 59039 NULL
114693 +regmap_bulk_write_59049 regmap_bulk_write 2-4 59049 NULL
114694 +mmc_sd_num_wr_blocks_59112 mmc_sd_num_wr_blocks 0 59112 NULL
114695 +scsi_io_completion_59122 scsi_io_completion 2 59122 NULL nohasharray
114696 +sta_tx_latency_stat_table_59122 sta_tx_latency_stat_table 0-4-5 59122 &scsi_io_completion_59122
114697 +nfc_llcp_send_i_frame_59130 nfc_llcp_send_i_frame 3 59130 NULL
114698 +print_devstats_dot11RTSSuccessCount_59145 print_devstats_dot11RTSSuccessCount 3 59145 NULL nohasharray
114699 +framebuffer_alloc_59145 framebuffer_alloc 1 59145 &print_devstats_dot11RTSSuccessCount_59145
114700 +radeon_compat_ioctl_59150 radeon_compat_ioctl 2 59150 NULL
114701 +pvr2_hdw_report_clients_59152 pvr2_hdw_report_clients 3 59152 NULL
114702 +ksize_59176 ksize 0 59176 NULL
114703 +setup_window_59178 setup_window 4-2-5-7 59178 NULL
114704 +ocfs2_move_extent_59187 ocfs2_move_extent 2-5 59187 NULL
114705 +xfs_ialloc_next_rec_59193 xfs_ialloc_next_rec 0 59193 NULL
114706 +xfs_iext_realloc_indirect_59211 xfs_iext_realloc_indirect 2 59211 NULL
114707 +dt3155_read_59226 dt3155_read 3 59226 NULL
114708 +paging64_gpte_to_gfn_lvl_59229 paging64_gpte_to_gfn_lvl 0-1-2 59229 NULL
114709 +nla_len_59258 nla_len 0 59258 NULL
114710 +drbd_bm_write_page_59290 drbd_bm_write_page 2 59290 NULL
114711 +btrfs_insert_dir_item_59304 btrfs_insert_dir_item 4 59304 NULL
114712 +xfs_iformat_fork_59312 xfs_iformat_fork 0 59312 NULL
114713 +fd_copyout_59323 fd_copyout 3 59323 NULL
114714 +read_9287_modal_eeprom_59327 read_9287_modal_eeprom 3 59327 NULL
114715 +rx_defrag_in_process_called_read_59338 rx_defrag_in_process_called_read 3 59338 NULL
114716 +xfs_attrmulti_attr_set_59346 xfs_attrmulti_attr_set 4 59346 NULL nohasharray
114717 +xfs_alloc_lookup_le_59346 xfs_alloc_lookup_le 0 59346 &xfs_attrmulti_attr_set_59346
114718 +__map_request_59350 __map_request 0 59350 NULL
114719 +gfs2_quota_lock_check_59353 gfs2_quota_lock_check 0 59353 NULL
114720 +f2fs_fallocate_59377 f2fs_fallocate 4-3 59377 NULL
114721 +pvr2_debugifc_print_info_59380 pvr2_debugifc_print_info 3 59380 NULL
114722 +journal_init_dev_59384 journal_init_dev 5 59384 NULL
114723 +__net_get_random_once_59389 __net_get_random_once 2 59389 NULL
114724 +isku_sysfs_read_keys_function_59412 isku_sysfs_read_keys_function 6 59412 NULL
114725 +pci_ctrl_read_59424 pci_ctrl_read 0 59424 NULL
114726 +vxge_hw_ring_rxds_per_block_get_59425 vxge_hw_ring_rxds_per_block_get 0 59425 NULL
114727 +SyS_sched_setaffinity_59442 SyS_sched_setaffinity 2 59442 NULL
114728 +fs_path_ensure_buf_59445 fs_path_ensure_buf 2 59445 NULL
114729 +ib_copy_from_udata_59502 ib_copy_from_udata 3 59502 NULL
114730 +mic_vringh_copy_59523 mic_vringh_copy 4 59523 NULL
114731 +mpi_get_nbits_59551 mpi_get_nbits 0 59551 NULL
114732 +tunables_write_59563 tunables_write 3 59563 NULL
114733 +bio_split_59564 bio_split 2 59564 NULL
114734 +__copy_from_user_ll_nozero_59571 __copy_from_user_ll_nozero 0-3 59571 NULL
114735 +write_pbl_59583 write_pbl 4 59583 NULL
114736 +memdup_user_59590 memdup_user 2 59590 NULL
114737 +xrcdn_free_res_59616 xrcdn_free_res 5 59616 NULL nohasharray
114738 +mem_fwlog_free_mem_blks_read_59616 mem_fwlog_free_mem_blks_read 3 59616 &xrcdn_free_res_59616
114739 +ath6kl_endpoint_stats_write_59621 ath6kl_endpoint_stats_write 3 59621 NULL
114740 +mtrr_write_59622 mtrr_write 3 59622 NULL
114741 +find_first_zero_bit_59636 find_first_zero_bit 0 59636 NULL
114742 +SyS_setdomainname_59646 SyS_setdomainname 2 59646 NULL
114743 +file_update_time_59647 file_update_time 0 59647 NULL
114744 +hidraw_read_59650 hidraw_read 3 59650 NULL
114745 +v9fs_xattr_set_acl_59651 v9fs_xattr_set_acl 4 59651 NULL
114746 +__devcgroup_check_permission_59665 __devcgroup_check_permission 0 59665 NULL
114747 +iwl_dbgfs_mac_params_read_59666 iwl_dbgfs_mac_params_read 3 59666 NULL
114748 +alloc_dca_provider_59670 alloc_dca_provider 2 59670 NULL
114749 +mic_calc_failure_read_59700 mic_calc_failure_read 3 59700 NULL
114750 +ioperm_get_59701 ioperm_get 4-3 59701 NULL
114751 +prism2_info_scanresults_59729 prism2_info_scanresults 3 59729 NULL
114752 +ieee80211_if_read_fwded_unicast_59740 ieee80211_if_read_fwded_unicast 3 59740 NULL
114753 +fat_direct_IO_59741 fat_direct_IO 4 59741 NULL
114754 +qib_decode_7220_sdma_errs_59745 qib_decode_7220_sdma_errs 4 59745 NULL
114755 +strnlen_59746 strnlen 0 59746 NULL
114756 +ext3_acl_count_59754 ext3_acl_count 0-1 59754 NULL
114757 +long_retry_limit_read_59766 long_retry_limit_read 3 59766 NULL nohasharray
114758 +cap_inode_need_killpriv_59766 cap_inode_need_killpriv 0 59766 &long_retry_limit_read_59766
114759 +venus_remove_59781 venus_remove 4 59781 NULL
114760 +mei_nfc_recv_59784 mei_nfc_recv 3 59784 NULL
114761 +ipw_write_59807 ipw_write 3 59807 NULL
114762 +scsi_init_shared_tag_map_59812 scsi_init_shared_tag_map 2 59812 NULL
114763 +ieee80211_if_read_dot11MeshHWMPmaxPREQretries_59829 ieee80211_if_read_dot11MeshHWMPmaxPREQretries 3 59829 NULL
114764 +gspca_dev_probe2_59833 gspca_dev_probe2 4 59833 NULL
114765 +regmap_raw_write_async_59849 regmap_raw_write_async 2-4 59849 NULL
114766 +pvr2_ioread_set_sync_key_59882 pvr2_ioread_set_sync_key 3 59882 NULL
114767 +l2cap_sock_recvmsg_59886 l2cap_sock_recvmsg 4 59886 NULL
114768 +ffs_prepare_buffer_59892 ffs_prepare_buffer 2 59892 NULL
114769 +kvm_mmu_notifier_invalidate_range_start_59944 kvm_mmu_notifier_invalidate_range_start 3-4 59944 NULL
114770 +ath10k_read_dfs_stats_59949 ath10k_read_dfs_stats 3 59949 NULL
114771 +dapm_widget_power_read_file_59950 dapm_widget_power_read_file 3 59950 NULL nohasharray
114772 +il_dbgfs_rxon_flags_read_59950 il_dbgfs_rxon_flags_read 3 59950 &dapm_widget_power_read_file_59950
114773 +il_dbgfs_missed_beacon_read_59956 il_dbgfs_missed_beacon_read 3 59956 NULL
114774 +__arch_hweight16_59975 __arch_hweight16 0 59975 NULL
114775 +osd_req_read_kern_59990 osd_req_read_kern 5 59990 NULL
114776 +ghash_async_setkey_60001 ghash_async_setkey 3 60001 NULL
114777 +ieee80211_if_fmt_dot11MeshAwakeWindowDuration_60006 ieee80211_if_fmt_dot11MeshAwakeWindowDuration 3 60006 NULL
114778 +copy_items_60009 copy_items 7 60009 NULL
114779 +rawsock_sendmsg_60010 rawsock_sendmsg 4 60010 NULL
114780 +mthca_init_cq_60011 mthca_init_cq 2 60011 NULL
114781 +osd_req_list_dev_partitions_60027 osd_req_list_dev_partitions 4 60027 NULL
114782 +xlog_bread_offset_60030 xlog_bread_offset 3 60030 NULL
114783 +xfs_imap_to_bp_60034 xfs_imap_to_bp 0 60034 NULL
114784 +bio_integrity_hw_sectors_60039 bio_integrity_hw_sectors 0-2 60039 NULL
114785 +do_ip6t_set_ctl_60040 do_ip6t_set_ctl 4 60040 NULL
114786 +vcs_size_60050 vcs_size 0 60050 NULL
114787 +gru_alloc_gts_60056 gru_alloc_gts 3-2 60056 NULL
114788 +compat_writev_60063 compat_writev 3 60063 NULL
114789 +ath6kl_listen_int_write_60066 ath6kl_listen_int_write 3 60066 NULL
114790 +c4iw_num_stags_60073 c4iw_num_stags 0 60073 NULL
114791 +rxrpc_kernel_send_data_60083 rxrpc_kernel_send_data 3 60083 NULL
114792 +ieee80211_if_fmt_fwded_frames_60103 ieee80211_if_fmt_fwded_frames 3 60103 NULL
114793 +SYSC_msgsnd_60113 SYSC_msgsnd 3 60113 NULL
114794 +nfs_idmap_request_key_60124 nfs_idmap_request_key 2 60124 NULL
114795 +__mutex_lock_common_60134 __mutex_lock_common 0 60134 NULL
114796 +ld_usb_read_60156 ld_usb_read 3 60156 NULL
114797 +jmb38x_ms_count_slots_60164 jmb38x_ms_count_slots 0 60164 NULL
114798 +init_state_60165 init_state 2 60165 NULL
114799 +jffs2_alloc_full_dirent_60179 jffs2_alloc_full_dirent 1 60179 NULL nohasharray
114800 +sg_build_sgat_60179 sg_build_sgat 3 60179 &jffs2_alloc_full_dirent_60179
114801 +fuse_async_req_send_60183 fuse_async_req_send 0-3 60183 NULL
114802 +rx_rx_tkip_replays_read_60193 rx_rx_tkip_replays_read 3 60193 NULL
114803 +qib_reg_phys_mr_60202 qib_reg_phys_mr 3 60202 NULL
114804 +btrfs_get_token_16_60220 btrfs_get_token_16 0 60220 NULL
114805 +irq_alloc_domain_generic_chips_60264 irq_alloc_domain_generic_chips 2-3 60264 NULL
114806 +display_crc_ctl_write_60273 display_crc_ctl_write 3 60273 NULL
114807 +printer_write_60276 printer_write 3 60276 NULL
114808 +do_xip_mapping_read_60297 do_xip_mapping_read 5 60297 NULL
114809 +getDataLength_60301 getDataLength 0 60301 NULL
114810 +usb_alphatrack_write_60341 usb_alphatrack_write 3 60341 NULL
114811 +__kfifo_from_user_r_60345 __kfifo_from_user_r 5-3 60345 NULL
114812 +dccp_setsockopt_60367 dccp_setsockopt 5 60367 NULL
114813 +mthca_alloc_resize_buf_60394 mthca_alloc_resize_buf 3 60394 NULL
114814 +ocfs2_zero_extend_60396 ocfs2_zero_extend 3 60396 NULL
114815 +driver_names_read_60399 driver_names_read 3 60399 NULL
114816 +simple_alloc_urb_60420 simple_alloc_urb 3 60420 NULL
114817 +excessive_retries_read_60425 excessive_retries_read 3 60425 NULL
114818 +kmalloc_60432 kmalloc 1 60432 NULL nohasharray
114819 +tstats_write_60432 tstats_write 3 60432 &kmalloc_60432
114820 +snd_hda_get_num_raw_conns_60462 snd_hda_get_num_raw_conns 0 60462 NULL
114821 +crypto_shash_setkey_60483 crypto_shash_setkey 3 60483 NULL
114822 +lustre_msg_early_size_60496 lustre_msg_early_size 0 60496 NULL
114823 +xfs_btree_make_block_unfull_60511 xfs_btree_make_block_unfull 0 60511 NULL
114824 +v9fs_fid_readn_60544 v9fs_fid_readn 4 60544 NULL
114825 +nonpaging_map_60551 nonpaging_map 4 60551 NULL
114826 +osc_lockless_truncate_seq_write_60553 osc_lockless_truncate_seq_write 3 60553 NULL
114827 +tracing_entries_write_60563 tracing_entries_write 3 60563 NULL
114828 +memblock_virt_alloc_try_nid_nopanic_60604 memblock_virt_alloc_try_nid_nopanic 1 60604 NULL
114829 +inode_change_ok_60614 inode_change_ok 0 60614 NULL
114830 +skb_transport_offset_60619 skb_transport_offset 0 60619 NULL
114831 +wl1273_fm_fops_write_60621 wl1273_fm_fops_write 3 60621 NULL
114832 +acl_alloc_stack_init_60630 acl_alloc_stack_init 1 60630 NULL
114833 +__proc_lnet_stats_60647 __proc_lnet_stats 5 60647 NULL
114834 +if_sdio_host_to_card_60666 if_sdio_host_to_card 4 60666 NULL
114835 +ieee80211_if_read_dot11MeshConfirmTimeout_60670 ieee80211_if_read_dot11MeshConfirmTimeout 3 60670 NULL
114836 +vga_rcrt_60731 vga_rcrt 0 60731 NULL
114837 +snd_ice1712_ds_read_60754 snd_ice1712_ds_read 0 60754 NULL
114838 +raid_status_60755 raid_status 5 60755 NULL
114839 +sel_write_checkreqprot_60774 sel_write_checkreqprot 3 60774 NULL
114840 +opticon_write_60775 opticon_write 4 60775 NULL
114841 +acl_alloc_num_60778 acl_alloc_num 1-2 60778 NULL
114842 +snd_pcm_oss_readv3_60792 snd_pcm_oss_readv3 3 60792 NULL
114843 +gfs2_bmap_alloc_60822 gfs2_bmap_alloc 0 60822 NULL
114844 +pwr_tx_with_ps_read_60851 pwr_tx_with_ps_read 3 60851 NULL
114845 +__clone_and_map_data_bio_60861 __clone_and_map_data_bio 4-3 60861 NULL
114846 +alloc_buf_60864 alloc_buf 3-2 60864 NULL
114847 +generic_writepages_60871 generic_writepages 0 60871 NULL
114848 +ext4_update_inline_data_60888 ext4_update_inline_data 3 60888 NULL
114849 +iio_debugfs_read_reg_60908 iio_debugfs_read_reg 3 60908 NULL
114850 +libcfs_sock_ioctl_60915 libcfs_sock_ioctl 0 60915 NULL
114851 +mgt_set_varlen_60916 mgt_set_varlen 4 60916 NULL
114852 +scrub_chunk_60926 scrub_chunk 5 60926 NULL
114853 +submit_extent_page_60928 submit_extent_page 5 60928 NULL
114854 +xfs_rtallocate_extent_size_60939 xfs_rtallocate_extent_size 0 60939 NULL
114855 +pti_char_write_60960 pti_char_write 3 60960 NULL
114856 +mwifiex_alloc_sdio_mpa_buffers_60961 mwifiex_alloc_sdio_mpa_buffers 2-3 60961 NULL
114857 +__a2mp_build_60987 __a2mp_build 3 60987 NULL
114858 +hsc_msg_alloc_60990 hsc_msg_alloc 1 60990 NULL
114859 +ath6kl_lrssi_roam_read_61022 ath6kl_lrssi_roam_read 3 61022 NULL
114860 +graph_depth_write_61024 graph_depth_write 3 61024 NULL
114861 +sdhci_pltfm_register_61031 sdhci_pltfm_register 3 61031 NULL
114862 +lpfc_idiag_queacc_write_61043 lpfc_idiag_queacc_write 3 61043 NULL
114863 +symtab_init_61050 symtab_init 2 61050 NULL
114864 +fuse_send_write_61053 fuse_send_write 0-4 61053 NULL
114865 +bitmap_scnlistprintf_61062 bitmap_scnlistprintf 0-2 61062 NULL
114866 +ahash_align_buffer_size_61070 ahash_align_buffer_size 0-1-2 61070 NULL
114867 +xfs_dabuf_map_61093 xfs_dabuf_map 0 61093 NULL
114868 +get_derived_key_61100 get_derived_key 4 61100 NULL
114869 +mem_cgroup_cache_charge_61101 mem_cgroup_cache_charge 0 61101 NULL
114870 +i40e_calculate_l2fpm_size_61104 i40e_calculate_l2fpm_size 0-4-3-2-1 61104 NULL
114871 +alloc_chrdev_region_61112 alloc_chrdev_region 0 61112 NULL
114872 +__probe_kernel_read_61119 __probe_kernel_read 3 61119 NULL
114873 +vmemmap_alloc_block_buf_61126 vmemmap_alloc_block_buf 1 61126 NULL
114874 +afs_proc_cells_write_61139 afs_proc_cells_write 3 61139 NULL
114875 +pair_device_61175 pair_device 4 61175 NULL nohasharray
114876 +event_oom_late_read_61175 event_oom_late_read 3 61175 &pair_device_61175
114877 +dio_bio_add_page_61178 dio_bio_add_page 0 61178 NULL
114878 +SyS_prctl_61202 SyS_prctl 4 61202 NULL
114879 +arch_hibernation_header_save_61212 arch_hibernation_header_save 0 61212 NULL
114880 +smk_read_ambient_61220 smk_read_ambient 3 61220 NULL
114881 +v9fs_mmap_file_read_61262 v9fs_mmap_file_read 3 61262 NULL
114882 +btrfs_bio_alloc_61270 btrfs_bio_alloc 3 61270 NULL nohasharray
114883 +find_get_pages_tag_61270 find_get_pages_tag 0 61270 &btrfs_bio_alloc_61270
114884 +vortex_adbdma_getlinearpos_61283 vortex_adbdma_getlinearpos 0 61283 NULL nohasharray
114885 +hfsplus_getxattr_finder_info_61283 hfsplus_getxattr_finder_info 0 61283 &vortex_adbdma_getlinearpos_61283
114886 +nvme_trans_copy_to_user_61288 nvme_trans_copy_to_user 3 61288 NULL
114887 +xfer_from_user_61307 xfer_from_user 3 61307 NULL
114888 +xfrm_user_sec_ctx_size_61320 xfrm_user_sec_ctx_size 0 61320 NULL
114889 +C_SYSC_msgsnd_61330 C_SYSC_msgsnd 3 61330 NULL
114890 +write_file_spectral_short_repeat_61335 write_file_spectral_short_repeat 3 61335 NULL
114891 +st5481_setup_isocpipes_61340 st5481_setup_isocpipes 6-4 61340 NULL
114892 +rx_rx_wa_ba_not_expected_read_61341 rx_rx_wa_ba_not_expected_read 3 61341 NULL
114893 +__dm_get_reserved_ios_61342 __dm_get_reserved_ios 0-3-2 61342 NULL
114894 +f1x_map_sysaddr_to_csrow_61344 f1x_map_sysaddr_to_csrow 2 61344 NULL
114895 +debug_debug4_read_61367 debug_debug4_read 3 61367 NULL
114896 +system_enable_write_61396 system_enable_write 3 61396 NULL
114897 +unix_stream_sendmsg_61455 unix_stream_sendmsg 4 61455 NULL
114898 +snd_pcm_lib_writev_transfer_61483 snd_pcm_lib_writev_transfer 5-4-2 61483 NULL
114899 +btrfs_item_size_61485 btrfs_item_size 0 61485 NULL
114900 +ocfs2_get_refcount_rec_61514 ocfs2_get_refcount_rec 0 61514 NULL
114901 +erst_errno_61526 erst_errno 0 61526 NULL
114902 +trace_options_core_write_61551 trace_options_core_write 3 61551 NULL
114903 +dvb_net_ioctl_61559 dvb_net_ioctl 2 61559 NULL
114904 +parport_pc_fifo_write_block_dma_61568 parport_pc_fifo_write_block_dma 3 61568 NULL
114905 +fan_proc_write_61569 fan_proc_write 3 61569 NULL
114906 +ieee80211_if_read_rc_rateidx_mask_2ghz_61570 ieee80211_if_read_rc_rateidx_mask_2ghz 3 61570 NULL
114907 +ldlm_pool_rw_atomic_seq_write_61572 ldlm_pool_rw_atomic_seq_write 3 61572 NULL
114908 +seq_open_private_61589 seq_open_private 3 61589 NULL
114909 +ept_gpte_to_gfn_lvl_61591 ept_gpte_to_gfn_lvl 0-1-2 61591 NULL
114910 +netlink_recvmsg_61600 netlink_recvmsg 4 61600 NULL
114911 +nfs4_init_uniform_client_string_61601 nfs4_init_uniform_client_string 3 61601 NULL
114912 +configfs_write_file_61621 configfs_write_file 3 61621 NULL
114913 +ieee80211_if_fmt_hw_queues_61629 ieee80211_if_fmt_hw_queues 3 61629 NULL
114914 +i2o_parm_table_get_61635 i2o_parm_table_get 6 61635 NULL
114915 +snd_pcm_oss_read3_61643 snd_pcm_oss_read3 0-3 61643 NULL nohasharray
114916 +tcf_hashinfo_init_61643 tcf_hashinfo_init 2 61643 &snd_pcm_oss_read3_61643
114917 +resize_stripes_61650 resize_stripes 2 61650 NULL
114918 +ttm_page_pool_free_61661 ttm_page_pool_free 2-0 61661 NULL
114919 +insert_one_name_61668 insert_one_name 7 61668 NULL
114920 +lock_loop_61681 lock_loop 1 61681 NULL
114921 +filter_read_61692 filter_read 3 61692 NULL
114922 +iov_length_61716 iov_length 0 61716 NULL
114923 +fragmentation_threshold_read_61718 fragmentation_threshold_read 3 61718 NULL
114924 +null_alloc_reqbuf_61719 null_alloc_reqbuf 3 61719 NULL
114925 +read_file_interrupt_61742 read_file_interrupt 3 61742 NULL nohasharray
114926 +read_file_regval_61742 read_file_regval 3 61742 &read_file_interrupt_61742
114927 +SyS_sendto_61763 SyS_sendto 6 61763 NULL
114928 +gfs2_meta_wait_61773 gfs2_meta_wait 0 61773 NULL
114929 +xfs_file_dio_aio_write_61801 xfs_file_dio_aio_write 0 61801 NULL
114930 +mls_compute_context_len_61812 mls_compute_context_len 0 61812 NULL
114931 +bfad_debugfs_write_regwr_61841 bfad_debugfs_write_regwr 3 61841 NULL
114932 +regcache_sync_block_61846 regcache_sync_block 5-4 61846 NULL
114933 +ath9k_hw_def_dump_eeprom_61853 ath9k_hw_def_dump_eeprom 5-4 61853 NULL
114934 +fs_path_prepare_for_add_61854 fs_path_prepare_for_add 2 61854 NULL
114935 +evdev_compute_buffer_size_61863 evdev_compute_buffer_size 0 61863 NULL
114936 +SYSC_lsetxattr_61869 SYSC_lsetxattr 4 61869 NULL
114937 +get_fw_name_61874 get_fw_name 3 61874 NULL
114938 +btrfs_ioctl_clone_61886 btrfs_ioctl_clone 3-4-5 61886 NULL
114939 +lprocfs_write_frac_u64_helper_61897 lprocfs_write_frac_u64_helper 2 61897 NULL
114940 +lov_mds_md_stripecnt_61899 lov_mds_md_stripecnt 0-1 61899 NULL
114941 +clear_refs_write_61904 clear_refs_write 3 61904 NULL
114942 +rx_filter_arp_filter_read_61914 rx_filter_arp_filter_read 3 61914 NULL
114943 +au0828_init_isoc_61917 au0828_init_isoc 3-2-4 61917 NULL
114944 +sctp_sendmsg_61919 sctp_sendmsg 4 61919 NULL
114945 +edac_device_create_instance_61940 edac_device_create_instance 0 61940 NULL
114946 +SyS_kexec_load_61946 SyS_kexec_load 2 61946 NULL
114947 +il4965_ucode_rx_stats_read_61948 il4965_ucode_rx_stats_read 3 61948 NULL
114948 +squashfs_read_id_index_table_61961 squashfs_read_id_index_table 4 61961 NULL
114949 +fix_read_error_61965 fix_read_error 4 61965 NULL
114950 +fd_locked_ioctl_61978 fd_locked_ioctl 3 61978 NULL
114951 +cow_file_range_61979 cow_file_range 3 61979 NULL
114952 +set_extent_delalloc_61982 set_extent_delalloc 0 61982 NULL
114953 +dequeue_event_62000 dequeue_event 3 62000 NULL
114954 +xt_compat_match_offset_62011 xt_compat_match_offset 0 62011 NULL
114955 +SyS_setxattr_62019 SyS_setxattr 4 62019 NULL
114956 +jffs2_do_unlink_62020 jffs2_do_unlink 4 62020 NULL
114957 +SYSC_select_62024 SYSC_select 1 62024 NULL
114958 +pmcraid_build_passthrough_ioadls_62034 pmcraid_build_passthrough_ioadls 2 62034 NULL
114959 +sctp_user_addto_chunk_62047 sctp_user_addto_chunk 2-3 62047 NULL
114960 +do_pselect_62061 do_pselect 1 62061 NULL
114961 +pcpu_alloc_bootmem_62074 pcpu_alloc_bootmem 2 62074 NULL
114962 +_xfs_log_force_lsn_62083 _xfs_log_force_lsn 0 62083 NULL
114963 +fat_setattr_62084 fat_setattr 0 62084 NULL
114964 +jffs2_security_setxattr_62107 jffs2_security_setxattr 4 62107 NULL
114965 +btrfs_direct_IO_62114 btrfs_direct_IO 4 62114 NULL
114966 +ip_recv_error_62117 ip_recv_error 3 62117 NULL
114967 +generic_block_fiemap_62122 generic_block_fiemap 4 62122 NULL
114968 +llc_ui_header_len_62131 llc_ui_header_len 0 62131 NULL
114969 +kobject_add_varg_62133 kobject_add_varg 0 62133 NULL nohasharray
114970 +qib_diag_write_62133 qib_diag_write 3 62133 &kobject_add_varg_62133
114971 +device_add_attrs_62135 device_add_attrs 0 62135 NULL nohasharray
114972 +ql_status_62135 ql_status 5 62135 &device_add_attrs_62135
114973 +video_usercopy_62151 video_usercopy 2 62151 NULL
114974 +SyS_getxattr_62166 SyS_getxattr 4 62166 NULL
114975 +prism54_wpa_bss_ie_get_62173 prism54_wpa_bss_ie_get 0 62173 NULL
114976 +write_file_dfs_62180 write_file_dfs 3 62180 NULL
114977 +alloc_upcall_62186 alloc_upcall 2 62186 NULL
114978 +sock_kmalloc_62205 sock_kmalloc 2 62205 NULL
114979 +smk_read_syslog_62227 smk_read_syslog 3 62227 NULL
114980 +SYSC_setgroups16_62232 SYSC_setgroups16 1 62232 NULL
114981 +nfsd_read_file_62241 nfsd_read_file 6 62241 NULL
114982 +subtract_dirty_62242 subtract_dirty 2-3 62242 NULL
114983 +ion_handle_test_dma_62262 ion_handle_test_dma 4-5 62262 NULL
114984 +il_dbgfs_sram_read_62296 il_dbgfs_sram_read 3 62296 NULL
114985 +sparse_early_usemaps_alloc_pgdat_section_62304 sparse_early_usemaps_alloc_pgdat_section 2 62304 NULL
114986 +subsystem_filter_read_62310 subsystem_filter_read 3 62310 NULL
114987 +Wb35Reg_BurstWrite_62327 Wb35Reg_BurstWrite 4 62327 NULL
114988 +subseq_list_62332 subseq_list 3-0 62332 NULL
114989 +ll_statahead_max_seq_write_62333 ll_statahead_max_seq_write 3 62333 NULL
114990 +flash_write_62354 flash_write 3 62354 NULL
114991 +xfpregs_set_62363 xfpregs_set 4 62363 NULL
114992 +rx_rx_timeout_read_62389 rx_rx_timeout_read 3 62389 NULL
114993 +altera_irscan_62396 altera_irscan 2 62396 NULL
114994 +set_ssp_62411 set_ssp 4 62411 NULL
114995 +udf_expand_file_adinicb_62470 udf_expand_file_adinicb 0 62470 NULL
114996 +ext_rts51x_sd_execute_read_data_62501 ext_rts51x_sd_execute_read_data 9 62501 NULL
114997 +pep_sendmsg_62524 pep_sendmsg 4 62524 NULL
114998 +test_iso_queue_62534 test_iso_queue 5 62534 NULL
114999 +debugfs_read_62535 debugfs_read 3 62535 NULL
115000 +sco_sock_sendmsg_62542 sco_sock_sendmsg 4 62542 NULL
115001 +qib_refresh_qsfp_cache_62547 qib_refresh_qsfp_cache 0 62547 NULL
115002 +link_send_sections_long_62557 link_send_sections_long 3 62557 NULL
115003 +compute_bitstructs_62570 compute_bitstructs 0 62570 NULL
115004 +xfrm_user_policy_62573 xfrm_user_policy 4 62573 NULL
115005 +get_subdir_62581 get_subdir 3 62581 NULL
115006 +nfsd_vfs_read_62605 nfsd_vfs_read 6 62605 NULL
115007 +tipc_port_recv_sections_62609 tipc_port_recv_sections 3 62609 NULL
115008 +dut_mode_write_62630 dut_mode_write 3 62630 NULL
115009 +vfs_fsync_range_62635 vfs_fsync_range 0 62635 NULL
115010 +lpfc_sli4_queue_alloc_62646 lpfc_sli4_queue_alloc 3 62646 NULL
115011 +printer_req_alloc_62687 printer_req_alloc 2 62687 NULL
115012 +bioset_integrity_create_62708 bioset_integrity_create 2 62708 NULL
115013 +gfs2_log_write_62717 gfs2_log_write 3 62717 NULL
115014 +rdm_62719 rdm 0 62719 NULL
115015 +add_to_page_cache_62724 add_to_page_cache 0 62724 NULL
115016 +obd_ioctl_popdata_62741 obd_ioctl_popdata 3 62741 NULL
115017 +key_replays_read_62746 key_replays_read 3 62746 NULL
115018 +lov_verify_lmm_62747 lov_verify_lmm 2 62747 NULL
115019 +mwifiex_rdeeprom_write_62754 mwifiex_rdeeprom_write 3 62754 NULL
115020 +ax25_sendmsg_62770 ax25_sendmsg 4 62770 NULL
115021 +C_SYSC_ipc_62776 C_SYSC_ipc 3 62776 NULL
115022 +SyS_sched_getaffinity_62786 SyS_sched_getaffinity 2 62786 NULL
115023 +dm_stats_account_io_62787 dm_stats_account_io 3 62787 NULL
115024 +tracing_total_entries_read_62817 tracing_total_entries_read 3 62817 NULL
115025 +__rounddown_pow_of_two_62836 __rounddown_pow_of_two 0 62836 NULL
115026 +bio_get_nr_vecs_62838 bio_get_nr_vecs 0 62838 NULL
115027 +xlog_recover_add_to_trans_62839 xlog_recover_add_to_trans 4 62839 NULL
115028 +rx_fcs_err_read_62844 rx_fcs_err_read 3 62844 NULL
115029 +read_nic_io_dword_62859 read_nic_io_dword 0 62859 NULL
115030 +l2tp_ip6_recvmsg_62874 l2tp_ip6_recvmsg 4 62874 NULL
115031 +xfs_rtmodify_range_62877 xfs_rtmodify_range 0 62877 NULL
115032 +aoechr_write_62883 aoechr_write 3 62883 NULL
115033 +if_spi_host_to_card_62890 if_spi_host_to_card 4 62890 NULL
115034 +ocfs2_validate_gd_parent_62905 ocfs2_validate_gd_parent 0 62905 NULL
115035 +mempool_create_slab_pool_62907 mempool_create_slab_pool 1 62907 NULL
115036 +getdqbuf_62908 getdqbuf 1 62908 NULL
115037 +ll_statahead_agl_seq_write_62928 ll_statahead_agl_seq_write 3 62928 NULL
115038 +agp_create_user_memory_62955 agp_create_user_memory 1 62955 NULL
115039 +kstrtoull_from_user_63026 kstrtoull_from_user 2 63026 NULL nohasharray
115040 +xfs_trans_reserve_63026 xfs_trans_reserve 0 63026 &kstrtoull_from_user_63026
115041 +__vb2_perform_fileio_63033 __vb2_perform_fileio 3 63033 NULL
115042 +pipeline_defrag_to_csum_swi_read_63037 pipeline_defrag_to_csum_swi_read 3 63037 NULL
115043 +scsi_host_alloc_63041 scsi_host_alloc 2 63041 NULL
115044 +unlink1_63059 unlink1 3 63059 NULL
115045 +xen_set_nslabs_63066 xen_set_nslabs 0 63066 NULL
115046 +iwl_dbgfs_fw_rx_stats_read_63070 iwl_dbgfs_fw_rx_stats_read 3 63070 NULL
115047 +sep_prepare_input_output_dma_table_in_dcb_63087 sep_prepare_input_output_dma_table_in_dcb 4-5 63087 NULL
115048 +iwl_dbgfs_sensitivity_read_63116 iwl_dbgfs_sensitivity_read 3 63116 NULL
115049 +ext4_chunk_trans_blocks_63123 ext4_chunk_trans_blocks 0-2 63123 NULL
115050 +smk_write_revoke_subj_63173 smk_write_revoke_subj 3 63173 NULL
115051 +SyS_syslog_63178 SyS_syslog 3 63178 NULL
115052 +vme_master_read_63221 vme_master_read 0 63221 NULL
115053 +SyS_gethostname_63227 SyS_gethostname 2 63227 NULL
115054 +ptp_read_63251 ptp_read 4 63251 NULL
115055 +xfs_dir2_leaf_getdents_63262 xfs_dir2_leaf_getdents 3 63262 NULL
115056 +raid5_resize_63306 raid5_resize 2 63306 NULL
115057 +ath10k_read_fw_dbglog_63323 ath10k_read_fw_dbglog 3 63323 NULL
115058 +proc_info_read_63344 proc_info_read 3 63344 NULL
115059 +ps_upsd_max_sptime_read_63362 ps_upsd_max_sptime_read 3 63362 NULL
115060 +idmouse_read_63374 idmouse_read 3 63374 NULL
115061 +usbnet_read_cmd_nopm_63388 usbnet_read_cmd_nopm 7 63388 NULL nohasharray
115062 +edac_pci_alloc_ctl_info_63388 edac_pci_alloc_ctl_info 1 63388 &usbnet_read_cmd_nopm_63388
115063 +rxpipe_missed_beacon_host_int_trig_rx_data_read_63405 rxpipe_missed_beacon_host_int_trig_rx_data_read 3 63405 NULL
115064 +nouveau_event_create_63411 nouveau_event_create 1 63411 NULL
115065 +l2cap_sock_sendmsg_63427 l2cap_sock_sendmsg 4 63427 NULL
115066 +nfsd_symlink_63442 nfsd_symlink 6 63442 NULL
115067 +si5351_bulk_write_63468 si5351_bulk_write 2-3 63468 NULL
115068 +snd_info_entry_write_63474 snd_info_entry_write 3 63474 NULL
115069 +reada_find_extent_63486 reada_find_extent 2 63486 NULL
115070 +snd_pcm_plug_write_transfer_63503 snd_pcm_plug_write_transfer 0-3 63503 NULL
115071 +efx_mcdi_rpc_async_63529 efx_mcdi_rpc_async 4-5 63529 NULL
115072 +ubi_more_leb_change_data_63534 ubi_more_leb_change_data 4 63534 NULL nohasharray
115073 +generic_cont_expand_simple_63534 generic_cont_expand_simple 0 63534 &ubi_more_leb_change_data_63534
115074 +write_file_spectral_period_63536 write_file_spectral_period 3 63536 NULL
115075 +if_sdio_read_scratch_63540 if_sdio_read_scratch 0 63540 NULL
115076 +append_to_buffer_63550 append_to_buffer 3 63550 NULL
115077 +kvm_write_guest_page_63555 kvm_write_guest_page 5 63555 NULL
115078 +rproc_alloc_63577 rproc_alloc 5 63577 NULL
115079 +write_debug_level_63613 write_debug_level 3 63613 NULL
115080 +__spi_validate_63618 __spi_validate 0 63618 NULL
115081 +symbol_build_supp_rates_63634 symbol_build_supp_rates 0 63634 NULL
115082 +proc_loginuid_write_63648 proc_loginuid_write 3 63648 NULL
115083 +ValidateDSDParamsChecksum_63654 ValidateDSDParamsChecksum 3 63654 NULL
115084 +ldlm_cli_enqueue_63657 ldlm_cli_enqueue 8 63657 NULL
115085 +hidraw_ioctl_63658 hidraw_ioctl 2 63658 NULL
115086 +vbi_read_63673 vbi_read 3 63673 NULL
115087 +write_file_spectral_fft_period_63696 write_file_spectral_fft_period 3 63696 NULL
115088 +nouveau_object_create__63715 nouveau_object_create_ 5 63715 NULL
115089 +btrfs_insert_delayed_dir_index_63720 btrfs_insert_delayed_dir_index 4 63720 NULL
115090 +selinux_secctx_to_secid_63744 selinux_secctx_to_secid 2 63744 NULL
115091 +snd_pcm_oss_read1_63771 snd_pcm_oss_read1 3 63771 NULL
115092 +snd_opl4_mem_proc_read_63774 snd_opl4_mem_proc_read 5 63774 NULL
115093 +spidev_compat_ioctl_63778 spidev_compat_ioctl 2 63778 NULL
115094 +mwifiex_11n_create_rx_reorder_tbl_63806 mwifiex_11n_create_rx_reorder_tbl 4 63806 NULL
115095 +copy_nodes_to_user_63807 copy_nodes_to_user 2 63807 NULL
115096 +sel_write_load_63830 sel_write_load 3 63830 NULL
115097 +ll_readlink_63836 ll_readlink 3 63836 NULL
115098 +proc_pid_attr_write_63845 proc_pid_attr_write 3 63845 NULL
115099 +xhci_alloc_stream_info_63902 xhci_alloc_stream_info 3 63902 NULL
115100 +uvc_alloc_urb_buffers_63922 uvc_alloc_urb_buffers 0-2-3 63922 NULL
115101 +snd_compr_write_63923 snd_compr_write 3 63923 NULL
115102 +afs_send_simple_reply_63940 afs_send_simple_reply 3 63940 NULL
115103 +__team_options_register_63941 __team_options_register 3 63941 NULL
115104 +macvtap_recvmsg_63949 macvtap_recvmsg 4 63949 NULL
115105 +xfs_iflush_63956 xfs_iflush 0 63956 NULL
115106 +set_bredr_63975 set_bredr 4 63975 NULL
115107 +construct_key_and_link_63985 construct_key_and_link 3 63985 NULL
115108 +rs_extent_to_bm_page_63996 rs_extent_to_bm_page 0-1 63996 NULL
115109 +read_file_frameerrors_64001 read_file_frameerrors 3 64001 NULL
115110 +SyS_rt_sigpending_64018 SyS_rt_sigpending 2 64018 NULL
115111 +dbAllocDmapLev_64030 dbAllocDmapLev 0 64030 NULL
115112 +SyS_fsetxattr_64039 SyS_fsetxattr 4 64039 NULL
115113 +__generic_file_aio_write_64049 __generic_file_aio_write 0 64049 NULL
115114 +get_u8_64076 get_u8 0 64076 NULL
115115 +xilly_malloc_64077 xilly_malloc 2 64077 NULL
115116 +sl_realloc_bufs_64086 sl_realloc_bufs 2 64086 NULL
115117 +vmci_handle_arr_get_size_64088 vmci_handle_arr_get_size 0 64088 NULL
115118 +lbs_highrssi_read_64089 lbs_highrssi_read 3 64089 NULL
115119 +gfs2_inplace_reserve_64096 gfs2_inplace_reserve 0 64096 NULL nohasharray
115120 +SyS_set_mempolicy_64096 SyS_set_mempolicy 3 64096 &gfs2_inplace_reserve_64096
115121 +to_bytes_64103 to_bytes 0-1 64103 NULL
115122 +SyS_mq_timedsend_64107 SyS_mq_timedsend 3 64107 NULL
115123 +rdma_addr_size_64116 rdma_addr_size 0 64116 NULL
115124 +do_load_xattr_datum_64118 do_load_xattr_datum 0 64118 NULL
115125 +bypass_wd_write_64120 bypass_wd_write 3 64120 NULL
115126 +ext4_prepare_inline_data_64124 ext4_prepare_inline_data 3 64124 NULL
115127 +init_bch_64130 init_bch 1-2 64130 NULL
115128 +ablkcipher_copy_iv_64140 ablkcipher_copy_iv 3 64140 NULL
115129 +dlfb_ops_write_64150 dlfb_ops_write 3 64150 NULL
115130 +cpumask_scnprintf_64170 cpumask_scnprintf 0-2 64170 NULL
115131 +kernfs_iop_setxattr_64220 kernfs_iop_setxattr 4 64220 NULL
115132 +xfs_vm_direct_IO_64223 xfs_vm_direct_IO 4 64223 NULL
115133 +read_pulse_64227 read_pulse 0-3 64227 NULL
115134 +ea_len_64229 ea_len 0 64229 NULL
115135 +xfs_rtmodify_summary_64265 xfs_rtmodify_summary 0 64265 NULL
115136 +io_capture_transfer_64276 io_capture_transfer 4 64276 NULL
115137 +btrfs_file_extent_offset_64278 btrfs_file_extent_offset 0 64278 NULL
115138 +sta_current_tx_rate_read_64286 sta_current_tx_rate_read 3 64286 NULL
115139 +xfs_dir_cilookup_result_64288 xfs_dir_cilookup_result 3-0 64288 NULL nohasharray
115140 +event_id_read_64288 event_id_read 3 64288 &xfs_dir_cilookup_result_64288
115141 +ocfs2_block_check_validate_bhs_64302 ocfs2_block_check_validate_bhs 0 64302 NULL
115142 +snd_hda_get_sub_nodes_64304 snd_hda_get_sub_nodes 0 64304 NULL
115143 +error_error_bar_retry_read_64305 error_error_bar_retry_read 3 64305 NULL
115144 +sisusbcon_clear_64329 sisusbcon_clear 4-3-5 64329 NULL
115145 +ts_write_64336 ts_write 3 64336 NULL
115146 +usbtmc_write_64340 usbtmc_write 3 64340 NULL
115147 +bnx2x_vfop_mcast_cmd_64354 bnx2x_vfop_mcast_cmd 5 64354 NULL
115148 +user_regset_copyin_64360 user_regset_copyin 7 64360 NULL
115149 +wlc_phy_loadsampletable_nphy_64367 wlc_phy_loadsampletable_nphy 3 64367 NULL
115150 +reg_create_64372 reg_create 5 64372 NULL
115151 +ilo_write_64378 ilo_write 3 64378 NULL
115152 +btrfs_map_block_64379 btrfs_map_block 3 64379 NULL
115153 +vmcs_readl_64381 vmcs_readl 0 64381 NULL
115154 +nilfs_alloc_seg_bio_64383 nilfs_alloc_seg_bio 3 64383 NULL
115155 +ir_lirc_transmit_ir_64403 ir_lirc_transmit_ir 3 64403 NULL
115156 +pidlist_allocate_64404 pidlist_allocate 1 64404 NULL
115157 +rx_hdr_overflow_read_64407 rx_hdr_overflow_read 3 64407 NULL
115158 +snd_card_create_64418 snd_card_create 4 64418 NULL nohasharray
115159 +keyctl_get_security_64418 keyctl_get_security 3 64418 &snd_card_create_64418
115160 +oom_adj_write_64428 oom_adj_write 3 64428 NULL
115161 +read_file_spectral_short_repeat_64431 read_file_spectral_short_repeat 3 64431 NULL
115162 +ax25_recvmsg_64441 ax25_recvmsg 4 64441 NULL
115163 +single_open_size_64483 single_open_size 4 64483 NULL
115164 +p54_parse_rssical_64493 p54_parse_rssical 3 64493 NULL nohasharray
115165 +xfs_inode_ag_walk_64493 xfs_inode_ag_walk 0 64493 &p54_parse_rssical_64493
115166 +msg_data_sz_64503 msg_data_sz 0 64503 NULL
115167 +remove_uuid_64505 remove_uuid 4 64505 NULL
115168 +crypto_blkcipher_alignmask_64520 crypto_blkcipher_alignmask 0 64520 NULL
115169 +opera1_usb_i2c_msgxfer_64521 opera1_usb_i2c_msgxfer 4 64521 NULL
115170 +iwl_dbgfs_ucode_tracing_write_64524 iwl_dbgfs_ucode_tracing_write 3 64524 NULL
115171 +ses_send_diag_64527 ses_send_diag 4 64527 NULL
115172 +prctl_set_mm_64538 prctl_set_mm 3 64538 NULL
115173 +SyS_bind_64544 SyS_bind 3 64544 NULL
115174 +rbd_obj_read_sync_64554 rbd_obj_read_sync 4-3 64554 NULL
115175 +__btrfs_prealloc_file_range_64557 __btrfs_prealloc_file_range 3 64557 NULL
115176 +__spi_sync_64561 __spi_sync 0 64561 NULL nohasharray
115177 +ll_max_rw_chunk_seq_write_64561 ll_max_rw_chunk_seq_write 3 64561 &__spi_sync_64561
115178 +__apei_exec_run_64563 __apei_exec_run 0 64563 NULL
115179 +kstrtoul_from_user_64569 kstrtoul_from_user 2 64569 NULL
115180 +do_erase_64574 do_erase 4 64574 NULL
115181 +fanotify_write_64623 fanotify_write 3 64623 NULL
115182 +regmap_read_debugfs_64658 regmap_read_debugfs 5 64658 NULL
115183 +ocfs2_read_xattr_block_64661 ocfs2_read_xattr_block 0 64661 NULL nohasharray
115184 +tlbflush_read_file_64661 tlbflush_read_file 3 64661 &ocfs2_read_xattr_block_64661
115185 +efx_tsoh_get_buffer_64664 efx_tsoh_get_buffer 3 64664 NULL
115186 +rx_rx_out_of_mpdu_nodes_read_64668 rx_rx_out_of_mpdu_nodes_read 3 64668 NULL
115187 +nr_free_zone_pages_64680 nr_free_zone_pages 0 64680 NULL
115188 +snd_pcm_oss_capture_position_fixup_64713 snd_pcm_oss_capture_position_fixup 0 64713 NULL
115189 +dapm_bias_read_file_64715 dapm_bias_read_file 3 64715 NULL
115190 +atomic_add_return_64720 atomic_add_return 0-1 64720 NULL
115191 +i2400m_msg_to_dev_64722 i2400m_msg_to_dev 3 64722 NULL
115192 +AscGetChipVersion_64737 AscGetChipVersion 0 64737 NULL
115193 +squashfs_read_inode_lookup_table_64739 squashfs_read_inode_lookup_table 4 64739 NULL
115194 +bio_map_kern_64751 bio_map_kern 3 64751 NULL
115195 +rt2x00debug_write_csr_64753 rt2x00debug_write_csr 3 64753 NULL
115196 +message_for_md_64777 message_for_md 5 64777 NULL
115197 +isr_low_rssi_read_64789 isr_low_rssi_read 3 64789 NULL
115198 +regmap_reg_ranges_read_file_64798 regmap_reg_ranges_read_file 3 64798 NULL
115199 +nfsctl_transaction_write_64800 nfsctl_transaction_write 3 64800 NULL
115200 +rfkill_fop_write_64808 rfkill_fop_write 3 64808 NULL
115201 +proc_projid_map_write_64810 proc_projid_map_write 3 64810 NULL
115202 +megaraid_change_queue_depth_64815 megaraid_change_queue_depth 2 64815 NULL
115203 +ecryptfs_send_miscdev_64816 ecryptfs_send_miscdev 2 64816 NULL
115204 +do_kimage_alloc_64827 do_kimage_alloc 3 64827 NULL
115205 +altera_set_dr_pre_64862 altera_set_dr_pre 2 64862 NULL
115206 +pci_vc_do_save_buffer_64876 pci_vc_do_save_buffer 0 64876 NULL
115207 +lprocfs_write_u64_helper_64880 lprocfs_write_u64_helper 2 64880 NULL
115208 +ffs_epfile_io_64886 ffs_epfile_io 3 64886 NULL
115209 +xfs_imap_lookup_64906 xfs_imap_lookup 0 64906 NULL
115210 +ieee80211_if_read_ave_beacon_64924 ieee80211_if_read_ave_beacon 3 64924 NULL
115211 +ip_options_get_from_user_64958 ip_options_get_from_user 4 64958 NULL
115212 +traceprobe_probes_write_64969 traceprobe_probes_write 3 64969 NULL
115213 +suspend_dtim_interval_read_64971 suspend_dtim_interval_read 3 64971 NULL
115214 +crypto_ahash_digestsize_65014 crypto_ahash_digestsize 0 65014 NULL
115215 +insert_dent_65034 insert_dent 7 65034 NULL
115216 +ext4_ind_trans_blocks_65053 ext4_ind_trans_blocks 0-2 65053 NULL
115217 +pcibios_enable_device_65059 pcibios_enable_device 0 65059 NULL
115218 +__alloc_bootmem_node_high_65076 __alloc_bootmem_node_high 2 65076 NULL
115219 +batadv_socket_write_65083 batadv_socket_write 3 65083 NULL
115220 +ocfs2_truncate_cluster_pages_65086 ocfs2_truncate_cluster_pages 2 65086 NULL
115221 +ath9k_dump_mci_btcoex_65090 ath9k_dump_mci_btcoex 3-0 65090 NULL
115222 +generic_ocp_write_65107 generic_ocp_write 4 65107 NULL
115223 +__xfs_bmapi_allocate_65142 __xfs_bmapi_allocate 0 65142 NULL
115224 +rx_rx_done_read_65217 rx_rx_done_read 3 65217 NULL
115225 +print_endpoint_stat_65232 print_endpoint_stat 3-4-0 65232 NULL
115226 +whci_n_caps_65247 whci_n_caps 0 65247 NULL
115227 +kmalloc_parameter_65279 kmalloc_parameter 1 65279 NULL
115228 +xfs_btree_check_ptr_65281 xfs_btree_check_ptr 0 65281 NULL
115229 +compat_core_sys_select_65285 compat_core_sys_select 1 65285 NULL
115230 +mpi_set_buffer_65294 mpi_set_buffer 3 65294 NULL
115231 +redirected_tty_write_65297 redirected_tty_write 3 65297 NULL
115232 +get_var_len_65304 get_var_len 0 65304 NULL
115233 +unpack_array_65318 unpack_array 0 65318 NULL
115234 +pci_vpd_find_tag_65325 pci_vpd_find_tag 0-2 65325 NULL
115235 +dccp_setsockopt_service_65336 dccp_setsockopt_service 4 65336 NULL
115236 +dma_rx_requested_read_65354 dma_rx_requested_read 3 65354 NULL
115237 +alloc_cpu_rmap_65363 alloc_cpu_rmap 1 65363 NULL
115238 +SyS_writev_65372 SyS_writev 3 65372 NULL
115239 +__alloc_bootmem_nopanic_65397 __alloc_bootmem_nopanic 1 65397 NULL
115240 +trace_seq_to_user_65398 trace_seq_to_user 3 65398 NULL
115241 +__read_vmcore_65402 __read_vmcore 2 65402 NULL
115242 +usb_ep_enable_65405 usb_ep_enable 0 65405 NULL
115243 +ocfs2_write_begin_nolock_65410 ocfs2_write_begin_nolock 3-4 65410 NULL
115244 +device_add_groups_65423 device_add_groups 0 65423 NULL
115245 +xpc_kzalloc_cacheline_aligned_65433 xpc_kzalloc_cacheline_aligned 1 65433 NULL
115246 +usb_alloc_coherent_65444 usb_alloc_coherent 2 65444 NULL
115247 +il_dbgfs_wd_timeout_write_65464 il_dbgfs_wd_timeout_write 3 65464 NULL
115248 +clear_user_65470 clear_user 2 65470 NULL
115249 +xfs_alloc_lookup_ge_65481 xfs_alloc_lookup_ge 0 65481 NULL
115250 +dpcm_state_read_file_65489 dpcm_state_read_file 3 65489 NULL
115251 +lookup_inline_extent_backref_65493 lookup_inline_extent_backref 9 65493 NULL
115252 +nvme_trans_standard_inquiry_page_65526 nvme_trans_standard_inquiry_page 4 65526 NULL
115253 +tree_mod_log_eb_copy_65535 tree_mod_log_eb_copy 6 65535 NULL
115254 diff --git a/tools/gcc/size_overflow_hash_aux.data b/tools/gcc/size_overflow_hash_aux.data
115255 new file mode 100644
115256 index 0000000..560cd7b
115257 --- /dev/null
115258 +++ b/tools/gcc/size_overflow_hash_aux.data
115259 @@ -0,0 +1,92 @@
115260 +spa_set_aux_vdevs_746 spa_set_aux_vdevs 3 746 NULL
115261 +zfs_lookup_2144 zfs_lookup 0 2144 NULL
115262 +mappedread_2627 mappedread 2 2627 NULL
115263 +vdev_disk_dio_alloc_2957 vdev_disk_dio_alloc 1 2957 NULL
115264 +nv_alloc_pushpage_spl_4286 nv_alloc_pushpage_spl 2 4286 NULL
115265 +zpl_xattr_get_4574 zpl_xattr_get 0 4574 NULL
115266 +sa_replace_all_by_template_5699 sa_replace_all_by_template 3 5699 NULL
115267 +dmu_write_6048 dmu_write 4-3 6048 NULL
115268 +dmu_buf_hold_array_6095 dmu_buf_hold_array 4-3 6095 NULL
115269 +update_pages_6225 update_pages 2-3 6225 NULL
115270 +bio_nr_pages_7117 bio_nr_pages 0-2 7117 NULL
115271 +dmu_buf_hold_array_by_bonus_8562 dmu_buf_hold_array_by_bonus 3-2 8562 NULL
115272 +zpios_dmu_write_8858 zpios_dmu_write 4-5 8858 NULL
115273 +ddi_copyout_9401 ddi_copyout 3 9401 NULL
115274 +avl_numnodes_12384 avl_numnodes 0 12384 NULL
115275 +dmu_write_uio_dnode_12473 dmu_write_uio_dnode 3 12473 NULL
115276 +dmu_xuio_init_12866 dmu_xuio_init 2 12866 NULL
115277 +zpl_read_common_14389 zpl_read_common 0 14389 NULL
115278 +dmu_snapshot_realname_14632 dmu_snapshot_realname 4 14632 NULL
115279 +kmem_alloc_debug_14852 kmem_alloc_debug 1 14852 NULL
115280 +kmalloc_node_nofail_15151 kmalloc_node_nofail 1 15151 NULL
115281 +dmu_write_uio_16351 dmu_write_uio 4 16351 NULL
115282 +zfs_log_write_16524 zfs_log_write 6-5 16524 NULL
115283 +sa_build_layouts_16910 sa_build_layouts 3 16910 NULL
115284 +dsl_dir_namelen_17053 dsl_dir_namelen 0 17053 NULL
115285 +kcopy_copy_to_user_17336 kcopy_copy_to_user 5 17336 NULL
115286 +sa_add_layout_entry_17507 sa_add_layout_entry 3 17507 NULL
115287 +sa_attr_table_setup_18029 sa_attr_table_setup 3 18029 NULL
115288 +uiocopy_18680 uiocopy 2 18680 NULL
115289 +dmu_buf_hold_array_by_dnode_19125 dmu_buf_hold_array_by_dnode 2-3 19125 NULL
115290 +zpl_acl_from_xattr_21141 zpl_acl_from_xattr 2 21141 NULL
115291 +dsl_pool_tx_assign_init_22518 dsl_pool_tx_assign_init 2 22518 NULL
115292 +nvlist_lookup_byte_array_22527 nvlist_lookup_byte_array 0 22527 NULL
115293 +sa_replace_all_by_template_locked_22533 sa_replace_all_by_template_locked 3 22533 NULL
115294 +tsd_hash_table_init_22559 tsd_hash_table_init 1 22559 NULL
115295 +spa_vdev_remove_aux_23966 spa_vdev_remove_aux 4 23966 NULL
115296 +zpl_xattr_acl_set_access_24129 zpl_xattr_acl_set_access 4 24129 NULL
115297 +dmu_assign_arcbuf_24622 dmu_assign_arcbuf 2 24622 NULL
115298 +zap_lookup_norm_25166 zap_lookup_norm 9 25166 NULL
115299 +dmu_prealloc_25456 dmu_prealloc 4-3 25456 NULL
115300 +kmalloc_nofail_26347 kmalloc_nofail 1 26347 NULL
115301 +zfsctl_snapshot_zpath_27578 zfsctl_snapshot_zpath 2 27578 NULL
115302 +zpios_dmu_read_30015 zpios_dmu_read 4-5 30015 NULL
115303 +splat_write_30943 splat_write 3 30943 NULL
115304 +zpl_xattr_get_sa_31183 zpl_xattr_get_sa 0 31183 NULL
115305 +dmu_read_uio_31467 dmu_read_uio 4 31467 NULL
115306 +zfs_replay_fuids_31479 zfs_replay_fuids 4 31479 NULL
115307 +spa_history_log_to_phys_31632 spa_history_log_to_phys 0-1 31632 NULL
115308 +__zpl_xattr_get_32601 __zpl_xattr_get 0 32601 NULL
115309 +proc_copyout_string_34049 proc_copyout_string 2 34049 NULL
115310 +nv_alloc_sleep_spl_34544 nv_alloc_sleep_spl 2 34544 NULL
115311 +nv_alloc_nosleep_spl_34761 nv_alloc_nosleep_spl 2 34761 NULL
115312 +zap_leaf_array_match_36922 zap_leaf_array_match 4 36922 NULL
115313 +copyinstr_36980 copyinstr 3 36980 NULL
115314 +zpl_xattr_acl_set_default_37864 zpl_xattr_acl_set_default 4 37864 NULL
115315 +splat_read_38116 splat_read 3 38116 NULL
115316 +sa_setup_38756 sa_setup 4 38756 NULL
115317 +vdev_disk_physio_39898 vdev_disk_physio 3 39898 NULL
115318 +arc_buf_size_39982 arc_buf_size 0 39982 NULL
115319 +kzalloc_nofail_40719 kzalloc_nofail 1 40719 NULL
115320 +fuidstr_to_sid_40777 fuidstr_to_sid 4 40777 NULL
115321 +vdev_raidz_matrix_reconstruct_40852 vdev_raidz_matrix_reconstruct 2-3 40852 NULL
115322 +sa_find_layout_40892 sa_find_layout 4 40892 NULL
115323 +zpl_xattr_get_dir_41918 zpl_xattr_get_dir 0 41918 NULL
115324 +zfs_sa_get_xattr_42600 zfs_sa_get_xattr 0 42600 NULL
115325 +zpl_xattr_acl_set_42808 zpl_xattr_acl_set 4 42808 NULL
115326 +xdr_dec_array_43091 xdr_dec_array 5 43091 NULL
115327 +dsl_dataset_namelen_43136 dsl_dataset_namelen 0 43136 NULL
115328 +kcopy_write_43683 kcopy_write 3 43683 NULL
115329 +uiomove_44355 uiomove 2 44355 NULL
115330 +dmu_read_44418 dmu_read 4-3 44418 NULL
115331 +ddi_copyin_44846 ddi_copyin 3 44846 NULL
115332 +kcopy_do_get_45061 kcopy_do_get 5 45061 NULL
115333 +copyin_45945 copyin 3 45945 NULL
115334 +zil_itx_create_46555 zil_itx_create 2 46555 NULL
115335 +dmu_write_uio_dbuf_48064 dmu_write_uio_dbuf 3 48064 NULL
115336 +blk_rq_pos_48233 blk_rq_pos 0 48233 NULL
115337 +spa_history_write_49650 spa_history_write 3 49650 NULL
115338 +kcopy_copy_pages_to_user_49823 kcopy_copy_pages_to_user 3-4 49823 NULL
115339 +zfs_log_write_50162 zfs_log_write 6-5 50162 NULL
115340 +i_fm_alloc_51038 i_fm_alloc 2 51038 NULL
115341 +copyout_51409 copyout 3 51409 NULL
115342 +zvol_log_write_54898 zvol_log_write 4-3 54898 NULL
115343 +zfs_acl_node_alloc_55641 zfs_acl_node_alloc 1 55641 NULL
115344 +get_nvlist_56685 get_nvlist 2 56685 NULL
115345 +zprop_get_numprops_56820 zprop_get_numprops 0 56820 NULL
115346 +splat_taskq_test4_common_59829 splat_taskq_test4_common 5 59829 NULL
115347 +zfs_replay_domain_cnt_61399 zfs_replay_domain_cnt 0 61399 NULL
115348 +zpios_write_61823 zpios_write 3 61823 NULL
115349 +proc_copyin_string_62019 proc_copyin_string 4 62019 NULL
115350 +random_get_pseudo_bytes_64611 random_get_pseudo_bytes 2 64611 NULL
115351 +zpios_read_64734 zpios_read 3 64734 NULL
115352 diff --git a/tools/gcc/size_overflow_plugin.c b/tools/gcc/size_overflow_plugin.c
115353 new file mode 100644
115354 index 0000000..948ec25
115355 --- /dev/null
115356 +++ b/tools/gcc/size_overflow_plugin.c
115357 @@ -0,0 +1,4169 @@
115358 +/*
115359 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
115360 + * Licensed under the GPL v2, or (at your option) v3
115361 + *
115362 + * Homepage:
115363 + * http://www.grsecurity.net/~ephox/overflow_plugin/
115364 + *
115365 + * Documentation:
115366 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
115367 + *
115368 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
115369 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
115370 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
115371 + *
115372 + * Usage:
115373 + * $ # for 4.5/4.6/C based 4.7
115374 + * $ gcc -I`gcc -print-file-name=plugin`/include -I`gcc -print-file-name=plugin`/include/c-family -fPIC -shared -O2 -std=gnu99 -ggdb -o size_overflow_plugin.so size_overflow_plugin.c
115375 + * $ # for C++ based 4.7/4.8+
115376 + * $ g++ -I`g++ -print-file-name=plugin`/include -I`g++ -print-file-name=plugin`/include/c-family -fPIC -shared -O2 -std=gnu++98 -fno-rtti -ggdb -o size_overflow_plugin.so size_overflow_plugin.c
115377 + *
115378 + * $ gcc -fplugin=./size_overflow_plugin.so test.c -O2
115379 + */
115380 +
115381 +#include "gcc-common.h"
115382 +
115383 +int plugin_is_GPL_compatible;
115384 +
115385 +static struct plugin_info size_overflow_plugin_info = {
115386 + .version = "20140407",
115387 + .help = "no-size-overflow\tturn off size overflow checking\n",
115388 +};
115389 +
115390 +#define BEFORE_STMT true
115391 +#define AFTER_STMT false
115392 +#define CREATE_NEW_VAR NULL_TREE
115393 +#define CODES_LIMIT 32
115394 +#define MAX_PARAM 31
115395 +#define VEC_LEN 128
115396 +#define RET_CHECK NULL_TREE
115397 +#define CANNOT_FIND_ARG 32
115398 +#define WRONG_NODE 32
115399 +#define NOT_INTENTIONAL_ASM NULL
115400 +#define MIN_CHECK true
115401 +#define MAX_CHECK false
115402 +
115403 +#define TURN_OFF_ASM_STR "# size_overflow MARK_TURN_OFF "
115404 +#define YES_ASM_STR "# size_overflow MARK_YES "
115405 +#define OK_ASM_STR "# size_overflow "
115406 +
115407 +struct size_overflow_hash {
115408 + const struct size_overflow_hash * const next;
115409 + const char * const name;
115410 + const unsigned int param;
115411 +};
115412 +
115413 +#include "size_overflow_hash.h"
115414 +#include "size_overflow_hash_aux.h"
115415 +
115416 +enum mark {
115417 + MARK_NO, MARK_YES, MARK_NOT_INTENTIONAL, MARK_TURN_OFF
115418 +};
115419 +
115420 +static unsigned int call_count;
115421 +
115422 +enum stmt_flags {
115423 + MY_STMT, NO_CAST_CHECK, VISITED_STMT, NO_FLAGS
115424 +};
115425 +
115426 +struct visited {
115427 + struct visited *next;
115428 + const_tree fndecl;
115429 + unsigned int num;
115430 +};
115431 +
115432 +struct next_cgraph_node {
115433 + struct next_cgraph_node *next;
115434 + struct cgraph_node *current_function;
115435 + tree callee_fndecl;
115436 + unsigned int num;
115437 +};
115438 +
115439 +struct interesting_node {
115440 + struct interesting_node *next;
115441 + gimple first_stmt;
115442 + const_tree fndecl;
115443 + tree node;
115444 +#if BUILDING_GCC_VERSION <= 4007
115445 + VEC(tree, gc) *last_nodes;
115446 +#else
115447 + vec<tree, va_gc> *last_nodes;
115448 +#endif
115449 + unsigned int num;
115450 + enum mark intentional_attr_decl;
115451 + enum mark intentional_attr_cur_fndecl;
115452 + gimple intentional_mark_from_gimple;
115453 +};
115454 +
115455 +static tree report_size_overflow_decl;
115456 +
115457 +static tree expand(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree lhs);
115458 +static void set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree lhs);
115459 +static void walk_use_def(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs);
115460 +static enum mark search_intentional(struct pointer_set_t *visited, const_tree lhs);
115461 +static void search_size_overflow_attribute(struct pointer_set_t *visited, tree lhs);
115462 +
115463 +static void check_size_overflow(struct cgraph_node *caller_node, gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before);
115464 +static tree get_size_overflow_type(gimple stmt, const_tree node);
115465 +static tree dup_assign(struct pointer_set_t *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3);
115466 +
115467 +static tree handle_size_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs)
115468 +{
115469 + unsigned int arg_count;
115470 + enum tree_code code = TREE_CODE(*node);
115471 +
115472 + switch (code) {
115473 + case FUNCTION_DECL:
115474 + arg_count = type_num_arguments(TREE_TYPE(*node));
115475 + break;
115476 + case FUNCTION_TYPE:
115477 + case METHOD_TYPE:
115478 + arg_count = type_num_arguments(*node);
115479 + break;
115480 + default:
115481 + *no_add_attrs = true;
115482 + error("%s: %qE attribute only applies to functions", __func__, name);
115483 + return NULL_TREE;
115484 + }
115485 +
115486 + for (; args; args = TREE_CHAIN(args)) {
115487 + tree position = TREE_VALUE(args);
115488 + if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_LOW(position) > arg_count ) {
115489 + error("%s: parameter %u is outside range.", __func__, (unsigned int)TREE_INT_CST_LOW(position));
115490 + *no_add_attrs = true;
115491 + }
115492 + }
115493 + return NULL_TREE;
115494 +}
115495 +
115496 +static tree handle_intentional_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs)
115497 +{
115498 + unsigned int arg_count;
115499 + enum tree_code code = TREE_CODE(*node);
115500 +
115501 + switch (code) {
115502 + case FUNCTION_DECL:
115503 + arg_count = type_num_arguments(TREE_TYPE(*node));
115504 + break;
115505 + case FUNCTION_TYPE:
115506 + case METHOD_TYPE:
115507 + arg_count = type_num_arguments(*node);
115508 + break;
115509 + case FIELD_DECL:
115510 + return NULL_TREE;
115511 + default:
115512 + *no_add_attrs = true;
115513 + error("%qE attribute only applies to functions", name);
115514 + return NULL_TREE;
115515 + }
115516 +
115517 + if (TREE_INT_CST_HIGH(TREE_VALUE(args)) != 0)
115518 + return NULL_TREE;
115519 +
115520 + for (; args; args = TREE_CHAIN(args)) {
115521 + tree position = TREE_VALUE(args);
115522 + if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_LOW(position) > arg_count ) {
115523 + error("%s: parameter %u is outside range.", __func__, (unsigned int)TREE_INT_CST_LOW(position));
115524 + *no_add_attrs = true;
115525 + }
115526 + }
115527 + return NULL_TREE;
115528 +}
115529 +
115530 +static struct attribute_spec size_overflow_attr = {
115531 + .name = "size_overflow",
115532 + .min_length = 1,
115533 + .max_length = -1,
115534 + .decl_required = true,
115535 + .type_required = false,
115536 + .function_type_required = false,
115537 + .handler = handle_size_overflow_attribute,
115538 +#if BUILDING_GCC_VERSION >= 4007
115539 + .affects_type_identity = false
115540 +#endif
115541 +};
115542 +
115543 +static struct attribute_spec intentional_overflow_attr = {
115544 + .name = "intentional_overflow",
115545 + .min_length = 1,
115546 + .max_length = -1,
115547 + .decl_required = true,
115548 + .type_required = false,
115549 + .function_type_required = false,
115550 + .handler = handle_intentional_overflow_attribute,
115551 +#if BUILDING_GCC_VERSION >= 4007
115552 + .affects_type_identity = false
115553 +#endif
115554 +};
115555 +
115556 +static void register_attributes(void __unused *event_data, void __unused *data)
115557 +{
115558 + register_attribute(&size_overflow_attr);
115559 + register_attribute(&intentional_overflow_attr);
115560 +}
115561 +
115562 +static enum stmt_flags get_stmt_flag(gimple stmt)
115563 +{
115564 + bool bit_1, bit_2;
115565 +
115566 + bit_1 = gimple_plf(stmt, GF_PLF_1);
115567 + bit_2 = gimple_plf(stmt, GF_PLF_2);
115568 +
115569 + if (!bit_1 && !bit_2)
115570 + return NO_FLAGS;
115571 + if (bit_1 && bit_2)
115572 + return MY_STMT;
115573 + if (!bit_1 && bit_2)
115574 + return VISITED_STMT;
115575 + return NO_CAST_CHECK;
115576 +}
115577 +
115578 +static void set_stmt_flag(gimple stmt, enum stmt_flags new_flag)
115579 +{
115580 + bool bit_1, bit_2;
115581 +
115582 + switch (new_flag) {
115583 + case NO_FLAGS:
115584 + bit_1 = bit_2 = false;
115585 + break;
115586 + case MY_STMT:
115587 + bit_1 = bit_2 = true;
115588 + break;
115589 + case VISITED_STMT:
115590 + bit_1 = false;
115591 + bit_2 = true;
115592 + break;
115593 + case NO_CAST_CHECK:
115594 + bit_1 = true;
115595 + bit_2 = false;
115596 + break;
115597 + default:
115598 + gcc_unreachable();
115599 + }
115600 +
115601 + gimple_set_plf(stmt, GF_PLF_1, bit_1);
115602 + gimple_set_plf(stmt, GF_PLF_2, bit_2);
115603 +}
115604 +
115605 +static bool is_bool(const_tree node)
115606 +{
115607 + const_tree type;
115608 +
115609 + if (node == NULL_TREE)
115610 + return false;
115611 +
115612 + type = TREE_TYPE(node);
115613 + if (!INTEGRAL_TYPE_P(type))
115614 + return false;
115615 + if (TREE_CODE(type) == BOOLEAN_TYPE)
115616 + return true;
115617 + if (TYPE_PRECISION(type) == 1)
115618 + return true;
115619 + return false;
115620 +}
115621 +
115622 +static bool skip_types(const_tree var)
115623 +{
115624 + tree type;
115625 + enum tree_code code;
115626 +
115627 + if (is_gimple_constant(var))
115628 + return true;
115629 +
115630 + switch (TREE_CODE(var)) {
115631 + case ADDR_EXPR:
115632 +#if BUILDING_GCC_VERSION >= 4006
115633 + case MEM_REF:
115634 +#endif
115635 + case ARRAY_REF:
115636 + case BIT_FIELD_REF:
115637 + case INDIRECT_REF:
115638 + case TARGET_MEM_REF:
115639 + case COMPONENT_REF:
115640 + case VAR_DECL:
115641 + case VIEW_CONVERT_EXPR:
115642 + return true;
115643 + default:
115644 + break;
115645 + }
115646 +
115647 + code = TREE_CODE(var);
115648 + gcc_assert(code == SSA_NAME || code == PARM_DECL);
115649 +
115650 + type = TREE_TYPE(var);
115651 + switch (TREE_CODE(type)) {
115652 + case INTEGER_TYPE:
115653 + case ENUMERAL_TYPE:
115654 + return false;
115655 + case BOOLEAN_TYPE:
115656 + return is_bool(var);
115657 + default:
115658 + return true;
115659 + }
115660 +}
115661 +
115662 +static inline gimple get_def_stmt(const_tree node)
115663 +{
115664 + gcc_assert(node != NULL_TREE);
115665 +
115666 + if (skip_types(node))
115667 + return NULL;
115668 +
115669 + if (TREE_CODE(node) != SSA_NAME)
115670 + return NULL;
115671 + return SSA_NAME_DEF_STMT(node);
115672 +}
115673 +
115674 +static unsigned char get_tree_code(const_tree type)
115675 +{
115676 + switch (TREE_CODE(type)) {
115677 + case ARRAY_TYPE:
115678 + return 0;
115679 + case BOOLEAN_TYPE:
115680 + return 1;
115681 + case ENUMERAL_TYPE:
115682 + return 2;
115683 + case FUNCTION_TYPE:
115684 + return 3;
115685 + case INTEGER_TYPE:
115686 + return 4;
115687 + case POINTER_TYPE:
115688 + return 5;
115689 + case RECORD_TYPE:
115690 + return 6;
115691 + case UNION_TYPE:
115692 + return 7;
115693 + case VOID_TYPE:
115694 + return 8;
115695 + case REAL_TYPE:
115696 + return 9;
115697 + case VECTOR_TYPE:
115698 + return 10;
115699 + case REFERENCE_TYPE:
115700 + return 11;
115701 + case OFFSET_TYPE:
115702 + return 12;
115703 + case COMPLEX_TYPE:
115704 + return 13;
115705 + default:
115706 + debug_tree((tree)type);
115707 + gcc_unreachable();
115708 + }
115709 +}
115710 +
115711 +struct function_hash {
115712 + size_t tree_codes_len;
115713 + unsigned char tree_codes[CODES_LIMIT];
115714 + const_tree fndecl;
115715 + unsigned int hash;
115716 +};
115717 +
115718 +// http://www.team5150.com/~andrew/noncryptohashzoo2~/CrapWow.html
115719 +static unsigned int CrapWow(const char *key, unsigned int len, unsigned int seed)
115720 +{
115721 +#define cwfold( a, b, lo, hi ) { p = (unsigned int)(a) * (unsigned long long)(b); lo ^= (unsigned int)p; hi ^= (unsigned int)(p >> 32); }
115722 +#define cwmixa( in ) { cwfold( in, m, k, h ); }
115723 +#define cwmixb( in ) { cwfold( in, n, h, k ); }
115724 +
115725 + unsigned int m = 0x57559429;
115726 + unsigned int n = 0x5052acdb;
115727 + const unsigned int *key4 = (const unsigned int *)key;
115728 + unsigned int h = len;
115729 + unsigned int k = len + seed + n;
115730 + unsigned long long p;
115731 +
115732 + while (len >= 8) {
115733 + cwmixb(key4[0]) cwmixa(key4[1]) key4 += 2;
115734 + len -= 8;
115735 + }
115736 + if (len >= 4) {
115737 + cwmixb(key4[0]) key4 += 1;
115738 + len -= 4;
115739 + }
115740 + if (len)
115741 + cwmixa(key4[0] & ((1 << (len * 8)) - 1 ));
115742 + cwmixb(h ^ (k + n));
115743 + return k ^ h;
115744 +
115745 +#undef cwfold
115746 +#undef cwmixa
115747 +#undef cwmixb
115748 +}
115749 +
115750 +static void set_hash(const char *fn_name, struct function_hash *fn_hash_data)
115751 +{
115752 + unsigned int fn, codes, seed = 0;
115753 +
115754 + fn = CrapWow(fn_name, strlen(fn_name), seed) & 0xffff;
115755 + codes = CrapWow((const char*)fn_hash_data->tree_codes, fn_hash_data->tree_codes_len, seed) & 0xffff;
115756 +
115757 + fn_hash_data->hash = fn ^ codes;
115758 +}
115759 +
115760 +static void set_node_codes(const_tree type, struct function_hash *fn_hash_data)
115761 +{
115762 + gcc_assert(type != NULL_TREE);
115763 + gcc_assert(TREE_CODE_CLASS(TREE_CODE(type)) == tcc_type);
115764 +
115765 + while (type && fn_hash_data->tree_codes_len < CODES_LIMIT) {
115766 + fn_hash_data->tree_codes[fn_hash_data->tree_codes_len] = get_tree_code(type);
115767 + fn_hash_data->tree_codes_len++;
115768 + type = TREE_TYPE(type);
115769 + }
115770 +}
115771 +
115772 +static void set_result_codes(const_tree node, struct function_hash *fn_hash_data)
115773 +{
115774 + const_tree result;
115775 +
115776 + gcc_assert(node != NULL_TREE);
115777 +
115778 + if (DECL_P(node)) {
115779 + result = DECL_RESULT(node);
115780 + if (result != NULL_TREE)
115781 + return set_node_codes(TREE_TYPE(result), fn_hash_data);
115782 + return set_result_codes(TREE_TYPE(node), fn_hash_data);
115783 + }
115784 +
115785 + gcc_assert(TYPE_P(node));
115786 +
115787 + if (TREE_CODE(node) == FUNCTION_TYPE)
115788 + return set_result_codes(TREE_TYPE(node), fn_hash_data);
115789 +
115790 + return set_node_codes(node, fn_hash_data);
115791 +}
115792 +
115793 +static void set_function_codes(struct function_hash *fn_hash_data)
115794 +{
115795 + const_tree arg, type = TREE_TYPE(fn_hash_data->fndecl);
115796 + enum tree_code code = TREE_CODE(type);
115797 +
115798 + gcc_assert(code == FUNCTION_TYPE || code == METHOD_TYPE);
115799 +
115800 + set_result_codes(fn_hash_data->fndecl, fn_hash_data);
115801 +
115802 + for (arg = TYPE_ARG_TYPES(type); arg != NULL_TREE && fn_hash_data->tree_codes_len < CODES_LIMIT; arg = TREE_CHAIN(arg))
115803 + set_node_codes(TREE_VALUE(arg), fn_hash_data);
115804 +}
115805 +
115806 +static const struct size_overflow_hash *get_proper_hash_chain(const struct size_overflow_hash *entry, const char *func_name)
115807 +{
115808 + while (entry) {
115809 + if (!strcmp(entry->name, func_name))
115810 + return entry;
115811 + entry = entry->next;
115812 + }
115813 + return NULL;
115814 +}
115815 +
115816 +static const struct size_overflow_hash *get_function_hash(const_tree fndecl)
115817 +{
115818 + const struct size_overflow_hash *entry;
115819 + struct function_hash fn_hash_data;
115820 + const char *func_name;
115821 +
115822 + // skip builtins __builtin_constant_p
115823 + if (DECL_BUILT_IN(fndecl))
115824 + return NULL;
115825 +
115826 + fn_hash_data.fndecl = fndecl;
115827 + fn_hash_data.tree_codes_len = 0;
115828 +
115829 + set_function_codes(&fn_hash_data);
115830 + gcc_assert(fn_hash_data.tree_codes_len != 0);
115831 +
115832 + func_name = DECL_NAME_POINTER(fn_hash_data.fndecl);
115833 + set_hash(func_name, &fn_hash_data);
115834 +
115835 + entry = size_overflow_hash[fn_hash_data.hash];
115836 + entry = get_proper_hash_chain(entry, func_name);
115837 + if (entry)
115838 + return entry;
115839 + entry = size_overflow_hash_aux[fn_hash_data.hash];
115840 + return get_proper_hash_chain(entry, func_name);
115841 +}
115842 +
115843 +static void print_missing_msg(const_tree func, unsigned int argnum)
115844 +{
115845 + location_t loc;
115846 + const char *curfunc;
115847 + struct function_hash fn_hash_data;
115848 +
115849 + fn_hash_data.fndecl = DECL_ORIGIN(func);
115850 + fn_hash_data.tree_codes_len = 0;
115851 +
115852 + loc = DECL_SOURCE_LOCATION(fn_hash_data.fndecl);
115853 + curfunc = DECL_NAME_POINTER(fn_hash_data.fndecl);
115854 +
115855 + set_function_codes(&fn_hash_data);
115856 + set_hash(curfunc, &fn_hash_data);
115857 +
115858 + inform(loc, "Function %s is missing from the size_overflow hash table +%s+%u+%u+", curfunc, curfunc, argnum, fn_hash_data.hash);
115859 +}
115860 +
115861 +static unsigned int find_arg_number_tree(const_tree arg, const_tree func)
115862 +{
115863 + tree var;
115864 + unsigned int argnum = 1;
115865 +
115866 + if (TREE_CODE(arg) == SSA_NAME)
115867 + arg = SSA_NAME_VAR(arg);
115868 +
115869 + for (var = DECL_ARGUMENTS(func); var; var = TREE_CHAIN(var), argnum++) {
115870 + if (!operand_equal_p(arg, var, 0) && strcmp(DECL_NAME_POINTER(var), DECL_NAME_POINTER(arg)))
115871 + continue;
115872 + if (!skip_types(var))
115873 + return argnum;
115874 + }
115875 +
115876 + return CANNOT_FIND_ARG;
115877 +}
115878 +
115879 +static tree create_new_var(tree type)
115880 +{
115881 + tree new_var = create_tmp_var(type, "cicus");
115882 +
115883 + add_referenced_var(new_var);
115884 + return new_var;
115885 +}
115886 +
115887 +static gimple create_binary_assign(enum tree_code code, gimple stmt, tree rhs1, tree rhs2)
115888 +{
115889 + gimple assign;
115890 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
115891 + tree type = TREE_TYPE(rhs1);
115892 + tree lhs = create_new_var(type);
115893 +
115894 + gcc_assert(types_compatible_p(type, TREE_TYPE(rhs2)));
115895 + assign = gimple_build_assign_with_ops(code, lhs, rhs1, rhs2);
115896 + gimple_assign_set_lhs(assign, make_ssa_name(lhs, assign));
115897 +
115898 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
115899 + update_stmt(assign);
115900 + set_stmt_flag(assign, MY_STMT);
115901 + return assign;
115902 +}
115903 +
115904 +static tree cast_a_tree(tree type, tree var)
115905 +{
115906 + gcc_assert(type != NULL_TREE);
115907 + gcc_assert(var != NULL_TREE);
115908 + gcc_assert(fold_convertible_p(type, var));
115909 +
115910 + return fold_convert(type, var);
115911 +}
115912 +
115913 +static tree get_lhs(const_gimple stmt)
115914 +{
115915 + switch (gimple_code(stmt)) {
115916 + case GIMPLE_ASSIGN:
115917 + case GIMPLE_CALL:
115918 + return gimple_get_lhs(stmt);
115919 + case GIMPLE_PHI:
115920 + return gimple_phi_result(stmt);
115921 + default:
115922 + return NULL_TREE;
115923 + }
115924 +}
115925 +
115926 +static bool skip_cast(tree dst_type, const_tree rhs, bool force)
115927 +{
115928 + const_gimple def_stmt = get_def_stmt(rhs);
115929 +
115930 + if (force)
115931 + return false;
115932 +
115933 + if (is_gimple_constant(rhs))
115934 + return false;
115935 +
115936 + if (!def_stmt || gimple_code(def_stmt) == GIMPLE_NOP)
115937 + return false;
115938 +
115939 + if (!types_compatible_p(dst_type, TREE_TYPE(rhs)))
115940 + return false;
115941 +
115942 + // DI type can be on 32 bit (from create_assign) but overflow type stays DI
115943 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode))
115944 + return false;
115945 +
115946 + return true;
115947 +}
115948 +
115949 +static gimple build_cast_stmt(tree dst_type, tree rhs, tree lhs, gimple_stmt_iterator *gsi, bool before, bool force)
115950 +{
115951 + gimple assign, def_stmt;
115952 +
115953 + gcc_assert(dst_type != NULL_TREE && rhs != NULL_TREE);
115954 + if (gsi_end_p(*gsi) && before == AFTER_STMT)
115955 + gcc_unreachable();
115956 +
115957 + def_stmt = get_def_stmt(rhs);
115958 + if (def_stmt && gimple_code(def_stmt) != GIMPLE_NOP && skip_cast(dst_type, rhs, force) && get_stmt_flag(def_stmt) == MY_STMT)
115959 + return def_stmt;
115960 +
115961 + if (lhs == CREATE_NEW_VAR)
115962 + lhs = create_new_var(dst_type);
115963 +
115964 + assign = gimple_build_assign(lhs, cast_a_tree(dst_type, rhs));
115965 +
115966 + if (!gsi_end_p(*gsi)) {
115967 + location_t loc = gimple_location(gsi_stmt(*gsi));
115968 + gimple_set_location(assign, loc);
115969 + }
115970 +
115971 + gimple_assign_set_lhs(assign, make_ssa_name(lhs, assign));
115972 +
115973 + if (before)
115974 + gsi_insert_before(gsi, assign, GSI_NEW_STMT);
115975 + else
115976 + gsi_insert_after(gsi, assign, GSI_NEW_STMT);
115977 + update_stmt(assign);
115978 + return assign;
115979 +}
115980 +
115981 +static tree cast_to_new_size_overflow_type(gimple stmt, tree rhs, tree size_overflow_type, bool before)
115982 +{
115983 + gimple_stmt_iterator gsi;
115984 + tree lhs;
115985 + gimple new_stmt;
115986 +
115987 + if (rhs == NULL_TREE)
115988 + return NULL_TREE;
115989 +
115990 + gsi = gsi_for_stmt(stmt);
115991 + new_stmt = build_cast_stmt(size_overflow_type, rhs, CREATE_NEW_VAR, &gsi, before, false);
115992 + set_stmt_flag(new_stmt, MY_STMT);
115993 +
115994 + lhs = get_lhs(new_stmt);
115995 + gcc_assert(lhs != NULL_TREE);
115996 + return lhs;
115997 +}
115998 +
115999 +static tree cast_to_TI_type(gimple stmt, tree node)
116000 +{
116001 + gimple_stmt_iterator gsi;
116002 + gimple cast_stmt;
116003 + tree type = TREE_TYPE(node);
116004 +
116005 + if (types_compatible_p(type, intTI_type_node))
116006 + return node;
116007 +
116008 + gsi = gsi_for_stmt(stmt);
116009 + cast_stmt = build_cast_stmt(intTI_type_node, node, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
116010 + set_stmt_flag(cast_stmt, MY_STMT);
116011 + return gimple_assign_lhs(cast_stmt);
116012 +}
116013 +
116014 +static tree create_assign(struct pointer_set_t *visited, gimple oldstmt, tree rhs1, bool before)
116015 +{
116016 + tree lhs, new_lhs;
116017 + gimple_stmt_iterator gsi;
116018 +
116019 + if (rhs1 == NULL_TREE) {
116020 + debug_gimple_stmt(oldstmt);
116021 + error("%s: rhs1 is NULL_TREE", __func__);
116022 + gcc_unreachable();
116023 + }
116024 +
116025 + switch (gimple_code(oldstmt)) {
116026 + case GIMPLE_ASM:
116027 + lhs = rhs1;
116028 + break;
116029 + case GIMPLE_CALL:
116030 + case GIMPLE_ASSIGN:
116031 + lhs = gimple_get_lhs(oldstmt);
116032 + break;
116033 + default:
116034 + debug_gimple_stmt(oldstmt);
116035 + gcc_unreachable();
116036 + }
116037 +
116038 + gsi = gsi_for_stmt(oldstmt);
116039 + pointer_set_insert(visited, oldstmt);
116040 + if (lookup_stmt_eh_lp(oldstmt) != 0) {
116041 + basic_block next_bb, cur_bb;
116042 + const_edge e;
116043 +
116044 + gcc_assert(before == false);
116045 + gcc_assert(stmt_can_throw_internal(oldstmt));
116046 + gcc_assert(gimple_code(oldstmt) == GIMPLE_CALL);
116047 + gcc_assert(!gsi_end_p(gsi));
116048 +
116049 + cur_bb = gimple_bb(oldstmt);
116050 + next_bb = cur_bb->next_bb;
116051 + e = find_edge(cur_bb, next_bb);
116052 + gcc_assert(e != NULL);
116053 + gcc_assert(e->flags & EDGE_FALLTHRU);
116054 +
116055 + gsi = gsi_after_labels(next_bb);
116056 + gcc_assert(!gsi_end_p(gsi));
116057 +
116058 + before = true;
116059 + oldstmt = gsi_stmt(gsi);
116060 + }
116061 +
116062 + new_lhs = cast_to_new_size_overflow_type(oldstmt, rhs1, get_size_overflow_type(oldstmt, lhs), before);
116063 + return new_lhs;
116064 +}
116065 +
116066 +static tree dup_assign(struct pointer_set_t *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3)
116067 +{
116068 + gimple stmt;
116069 + gimple_stmt_iterator gsi;
116070 + tree size_overflow_type, new_var, lhs = gimple_assign_lhs(oldstmt);
116071 +
116072 + if (get_stmt_flag(oldstmt) == MY_STMT)
116073 + return lhs;
116074 +
116075 + if (gimple_num_ops(oldstmt) != 4 && rhs1 == NULL_TREE) {
116076 + rhs1 = gimple_assign_rhs1(oldstmt);
116077 + rhs1 = create_assign(visited, oldstmt, rhs1, BEFORE_STMT);
116078 + }
116079 + if (gimple_num_ops(oldstmt) == 3 && rhs2 == NULL_TREE) {
116080 + rhs2 = gimple_assign_rhs2(oldstmt);
116081 + rhs2 = create_assign(visited, oldstmt, rhs2, BEFORE_STMT);
116082 + }
116083 +
116084 + stmt = gimple_copy(oldstmt);
116085 + gimple_set_location(stmt, gimple_location(oldstmt));
116086 + set_stmt_flag(stmt, MY_STMT);
116087 +
116088 + if (gimple_assign_rhs_code(oldstmt) == WIDEN_MULT_EXPR)
116089 + gimple_assign_set_rhs_code(stmt, MULT_EXPR);
116090 +
116091 + size_overflow_type = get_size_overflow_type(oldstmt, node);
116092 +
116093 + new_var = create_new_var(size_overflow_type);
116094 + new_var = make_ssa_name(new_var, stmt);
116095 + gimple_assign_set_lhs(stmt, new_var);
116096 +
116097 + if (rhs1 != NULL_TREE)
116098 + gimple_assign_set_rhs1(stmt, rhs1);
116099 +
116100 + if (rhs2 != NULL_TREE)
116101 + gimple_assign_set_rhs2(stmt, rhs2);
116102 +#if BUILDING_GCC_VERSION >= 4006
116103 + if (rhs3 != NULL_TREE)
116104 + gimple_assign_set_rhs3(stmt, rhs3);
116105 +#endif
116106 + gimple_set_vuse(stmt, gimple_vuse(oldstmt));
116107 + gimple_set_vdef(stmt, gimple_vdef(oldstmt));
116108 +
116109 + gsi = gsi_for_stmt(oldstmt);
116110 + gsi_insert_after(&gsi, stmt, GSI_SAME_STMT);
116111 + update_stmt(stmt);
116112 + pointer_set_insert(visited, oldstmt);
116113 + return gimple_assign_lhs(stmt);
116114 +}
116115 +
116116 +static tree cast_parm_decl(tree phi_ssa_name, tree arg, tree size_overflow_type, basic_block bb)
116117 +{
116118 + gimple assign;
116119 + gimple_stmt_iterator gsi;
116120 + basic_block first_bb;
116121 +
116122 + gcc_assert(SSA_NAME_IS_DEFAULT_DEF(arg));
116123 +
116124 + if (bb->index == 0) {
116125 + first_bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
116126 + gcc_assert(dom_info_available_p(CDI_DOMINATORS));
116127 + set_immediate_dominator(CDI_DOMINATORS, first_bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
116128 + bb = first_bb;
116129 + }
116130 +
116131 + gsi = gsi_after_labels(bb);
116132 + assign = build_cast_stmt(size_overflow_type, arg, phi_ssa_name, &gsi, BEFORE_STMT, false);
116133 + set_stmt_flag(assign, MY_STMT);
116134 +
116135 + return gimple_assign_lhs(assign);
116136 +}
116137 +
116138 +static tree use_phi_ssa_name(tree ssa_name_var, tree new_arg)
116139 +{
116140 + gimple_stmt_iterator gsi;
116141 + gimple assign, def_stmt = get_def_stmt(new_arg);
116142 +
116143 + if (gimple_code(def_stmt) == GIMPLE_PHI) {
116144 + gsi = gsi_after_labels(gimple_bb(def_stmt));
116145 + assign = build_cast_stmt(TREE_TYPE(new_arg), new_arg, ssa_name_var, &gsi, BEFORE_STMT, true);
116146 + } else {
116147 + gsi = gsi_for_stmt(def_stmt);
116148 + assign = build_cast_stmt(TREE_TYPE(new_arg), new_arg, ssa_name_var, &gsi, AFTER_STMT, true);
116149 + }
116150 +
116151 + set_stmt_flag(assign, MY_STMT);
116152 + return gimple_assign_lhs(assign);
116153 +}
116154 +
116155 +static tree cast_visited_phi_arg(tree ssa_name_var, tree arg, tree size_overflow_type)
116156 +{
116157 + basic_block bb;
116158 + gimple_stmt_iterator gsi;
116159 + const_gimple def_stmt;
116160 + gimple assign;
116161 +
116162 + def_stmt = get_def_stmt(arg);
116163 + bb = gimple_bb(def_stmt);
116164 + gcc_assert(bb->index != 0);
116165 + gsi = gsi_after_labels(bb);
116166 +
116167 + assign = build_cast_stmt(size_overflow_type, arg, ssa_name_var, &gsi, BEFORE_STMT, false);
116168 + set_stmt_flag(assign, MY_STMT);
116169 + return gimple_assign_lhs(assign);
116170 +}
116171 +
116172 +static tree create_new_phi_arg(tree ssa_name_var, tree new_arg, gimple oldstmt, unsigned int i)
116173 +{
116174 + tree size_overflow_type;
116175 + tree arg;
116176 + const_gimple def_stmt;
116177 +
116178 + if (new_arg != NULL_TREE && is_gimple_constant(new_arg))
116179 + return new_arg;
116180 +
116181 + arg = gimple_phi_arg_def(oldstmt, i);
116182 + def_stmt = get_def_stmt(arg);
116183 + gcc_assert(def_stmt != NULL);
116184 + size_overflow_type = get_size_overflow_type(oldstmt, arg);
116185 +
116186 + switch (gimple_code(def_stmt)) {
116187 + case GIMPLE_PHI:
116188 + return cast_visited_phi_arg(ssa_name_var, arg, size_overflow_type);
116189 + case GIMPLE_NOP: {
116190 + basic_block bb;
116191 +
116192 + bb = gimple_phi_arg_edge(oldstmt, i)->src;
116193 + return cast_parm_decl(ssa_name_var, arg, size_overflow_type, bb);
116194 + }
116195 + case GIMPLE_ASM: {
116196 + gimple_stmt_iterator gsi;
116197 + gimple assign, stmt = get_def_stmt(arg);
116198 +
116199 + gsi = gsi_for_stmt(stmt);
116200 + assign = build_cast_stmt(size_overflow_type, arg, ssa_name_var, &gsi, AFTER_STMT, false);
116201 + set_stmt_flag(assign, MY_STMT);
116202 + return gimple_assign_lhs(assign);
116203 + }
116204 + default:
116205 + gcc_assert(new_arg != NULL_TREE);
116206 + gcc_assert(types_compatible_p(TREE_TYPE(new_arg), size_overflow_type));
116207 + return use_phi_ssa_name(ssa_name_var, new_arg);
116208 + }
116209 +}
116210 +
116211 +static gimple overflow_create_phi_node(gimple oldstmt, tree result)
116212 +{
116213 + basic_block bb;
116214 + gimple phi;
116215 + gimple_seq seq;
116216 + gimple_stmt_iterator gsi = gsi_for_stmt(oldstmt);
116217 +
116218 + bb = gsi_bb(gsi);
116219 +
116220 + if (result == NULL_TREE) {
116221 + tree old_result = gimple_phi_result(oldstmt);
116222 + tree size_overflow_type = get_size_overflow_type(oldstmt, old_result);
116223 +
116224 + result = create_new_var(size_overflow_type);
116225 + }
116226 +
116227 + phi = create_phi_node(result, bb);
116228 + gimple_phi_set_result(phi, make_ssa_name(result, phi));
116229 + seq = phi_nodes(bb);
116230 + gsi = gsi_last(seq);
116231 + gsi_remove(&gsi, false);
116232 +
116233 + gsi = gsi_for_stmt(oldstmt);
116234 + gsi_insert_after(&gsi, phi, GSI_NEW_STMT);
116235 + gimple_set_bb(phi, bb);
116236 + set_stmt_flag(phi, MY_STMT);
116237 + return phi;
116238 +}
116239 +
116240 +#if BUILDING_GCC_VERSION <= 4007
116241 +static tree create_new_phi_node(VEC(tree, heap) **args, tree ssa_name_var, gimple oldstmt)
116242 +#else
116243 +static tree create_new_phi_node(vec<tree, va_heap, vl_embed> *&args, tree ssa_name_var, gimple oldstmt)
116244 +#endif
116245 +{
116246 + gimple new_phi;
116247 + unsigned int i;
116248 + tree arg, result;
116249 + location_t loc = gimple_location(oldstmt);
116250 +
116251 +#if BUILDING_GCC_VERSION <= 4007
116252 + gcc_assert(!VEC_empty(tree, *args));
116253 +#else
116254 + gcc_assert(!args->is_empty());
116255 +#endif
116256 +
116257 + new_phi = overflow_create_phi_node(oldstmt, ssa_name_var);
116258 + result = gimple_phi_result(new_phi);
116259 + ssa_name_var = SSA_NAME_VAR(result);
116260 +
116261 +#if BUILDING_GCC_VERSION <= 4007
116262 + FOR_EACH_VEC_ELT(tree, *args, i, arg) {
116263 +#else
116264 + FOR_EACH_VEC_SAFE_ELT(args, i, arg) {
116265 +#endif
116266 + arg = create_new_phi_arg(ssa_name_var, arg, oldstmt, i);
116267 + add_phi_arg(new_phi, arg, gimple_phi_arg_edge(oldstmt, i), loc);
116268 + }
116269 +
116270 +#if BUILDING_GCC_VERSION <= 4007
116271 + VEC_free(tree, heap, *args);
116272 +#else
116273 + vec_free(args);
116274 +#endif
116275 + update_stmt(new_phi);
116276 + return result;
116277 +}
116278 +
116279 +static tree handle_phi(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree orig_result)
116280 +{
116281 + tree ssa_name_var = NULL_TREE;
116282 +#if BUILDING_GCC_VERSION <= 4007
116283 + VEC(tree, heap) *args = NULL;
116284 +#else
116285 + vec<tree, va_heap, vl_embed> *args = NULL;
116286 +#endif
116287 + gimple oldstmt = get_def_stmt(orig_result);
116288 + unsigned int i, len = gimple_phi_num_args(oldstmt);
116289 +
116290 + pointer_set_insert(visited, oldstmt);
116291 + for (i = 0; i < len; i++) {
116292 + tree arg, new_arg;
116293 +
116294 + arg = gimple_phi_arg_def(oldstmt, i);
116295 + new_arg = expand(visited, caller_node, arg);
116296 +
116297 + if (ssa_name_var == NULL_TREE && new_arg != NULL_TREE)
116298 + ssa_name_var = SSA_NAME_VAR(new_arg);
116299 +
116300 + if (is_gimple_constant(arg)) {
116301 + tree size_overflow_type = get_size_overflow_type(oldstmt, arg);
116302 +
116303 + new_arg = cast_a_tree(size_overflow_type, arg);
116304 + }
116305 +
116306 +#if BUILDING_GCC_VERSION <= 4007
116307 + VEC_safe_push(tree, heap, args, new_arg);
116308 +#else
116309 + vec_safe_push(args, new_arg);
116310 +#endif
116311 + }
116312 +
116313 +#if BUILDING_GCC_VERSION <= 4007
116314 + return create_new_phi_node(&args, ssa_name_var, oldstmt);
116315 +#else
116316 + return create_new_phi_node(args, ssa_name_var, oldstmt);
116317 +#endif
116318 +}
116319 +
116320 +static tree change_assign_rhs(gimple stmt, const_tree orig_rhs, tree new_rhs)
116321 +{
116322 + gimple assign;
116323 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
116324 + tree origtype = TREE_TYPE(orig_rhs);
116325 +
116326 + gcc_assert(is_gimple_assign(stmt));
116327 +
116328 + assign = build_cast_stmt(origtype, new_rhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
116329 + set_stmt_flag(assign, MY_STMT);
116330 + return gimple_assign_lhs(assign);
116331 +}
116332 +
116333 +static bool is_a_cast_and_const_overflow(const_tree no_const_rhs)
116334 +{
116335 + const_tree rhs1, lhs, rhs1_type, lhs_type;
116336 + enum machine_mode lhs_mode, rhs_mode;
116337 + gimple def_stmt = get_def_stmt(no_const_rhs);
116338 +
116339 + if (!def_stmt || !gimple_assign_cast_p(def_stmt))
116340 + return false;
116341 +
116342 + rhs1 = gimple_assign_rhs1(def_stmt);
116343 + lhs = gimple_assign_lhs(def_stmt);
116344 + rhs1_type = TREE_TYPE(rhs1);
116345 + lhs_type = TREE_TYPE(lhs);
116346 + rhs_mode = TYPE_MODE(rhs1_type);
116347 + lhs_mode = TYPE_MODE(lhs_type);
116348 + if (TYPE_UNSIGNED(lhs_type) == TYPE_UNSIGNED(rhs1_type) || lhs_mode != rhs_mode)
116349 + return false;
116350 +
116351 + return true;
116352 +}
116353 +
116354 +static tree create_cast_assign(struct pointer_set_t *visited, gimple stmt)
116355 +{
116356 + tree rhs1 = gimple_assign_rhs1(stmt);
116357 + tree lhs = gimple_assign_lhs(stmt);
116358 + const_tree rhs1_type = TREE_TYPE(rhs1);
116359 + const_tree lhs_type = TREE_TYPE(lhs);
116360 +
116361 + if (TYPE_UNSIGNED(rhs1_type) == TYPE_UNSIGNED(lhs_type))
116362 + return create_assign(visited, stmt, lhs, AFTER_STMT);
116363 +
116364 + return create_assign(visited, stmt, rhs1, AFTER_STMT);
116365 +}
116366 +
116367 +static bool no_uses(tree node)
116368 +{
116369 + imm_use_iterator imm_iter;
116370 + use_operand_p use_p;
116371 +
116372 + FOR_EACH_IMM_USE_FAST(use_p, imm_iter, node) {
116373 + const_gimple use_stmt = USE_STMT(use_p);
116374 +
116375 + if (use_stmt == NULL)
116376 + return true;
116377 + if (is_gimple_debug(use_stmt))
116378 + continue;
116379 + return false;
116380 + }
116381 + return true;
116382 +}
116383 +
116384 +// 3.8.5 mm/page-writeback.c __ilog2_u64(): ret, uint + uintmax; uint -> int; int max
116385 +static bool is_const_plus_unsigned_signed_truncation(const_tree lhs)
116386 +{
116387 + tree rhs1, lhs_type, rhs_type, rhs2, not_const_rhs;
116388 + gimple def_stmt = get_def_stmt(lhs);
116389 +
116390 + if (!def_stmt || !gimple_assign_cast_p(def_stmt))
116391 + return false;
116392 +
116393 + rhs1 = gimple_assign_rhs1(def_stmt);
116394 + rhs_type = TREE_TYPE(rhs1);
116395 + lhs_type = TREE_TYPE(lhs);
116396 + if (TYPE_UNSIGNED(lhs_type) || !TYPE_UNSIGNED(rhs_type))
116397 + return false;
116398 + if (TYPE_MODE(lhs_type) != TYPE_MODE(rhs_type))
116399 + return false;
116400 +
116401 + def_stmt = get_def_stmt(rhs1);
116402 + if (!def_stmt || !is_gimple_assign(def_stmt) || gimple_num_ops(def_stmt) != 3)
116403 + return false;
116404 +
116405 + if (gimple_assign_rhs_code(def_stmt) != PLUS_EXPR)
116406 + return false;
116407 +
116408 + rhs1 = gimple_assign_rhs1(def_stmt);
116409 + rhs2 = gimple_assign_rhs2(def_stmt);
116410 + if (!is_gimple_constant(rhs1) && !is_gimple_constant(rhs2))
116411 + return false;
116412 +
116413 + if (is_gimple_constant(rhs2))
116414 + not_const_rhs = rhs1;
116415 + else
116416 + not_const_rhs = rhs2;
116417 +
116418 + return no_uses(not_const_rhs);
116419 +}
116420 +
116421 +static bool skip_lhs_cast_check(const_gimple stmt)
116422 +{
116423 + const_tree rhs = gimple_assign_rhs1(stmt);
116424 + const_gimple def_stmt = get_def_stmt(rhs);
116425 +
116426 + // 3.8.2 kernel/futex_compat.c compat_exit_robust_list(): get_user() 64 ulong -> int (compat_long_t), int max
116427 + if (gimple_code(def_stmt) == GIMPLE_ASM)
116428 + return true;
116429 +
116430 + if (is_const_plus_unsigned_signed_truncation(rhs))
116431 + return true;
116432 +
116433 + return false;
116434 +}
116435 +
116436 +static tree create_cast_overflow_check(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree new_rhs1, gimple stmt)
116437 +{
116438 + bool cast_lhs, cast_rhs;
116439 + tree lhs = gimple_assign_lhs(stmt);
116440 + tree rhs = gimple_assign_rhs1(stmt);
116441 + const_tree lhs_type = TREE_TYPE(lhs);
116442 + const_tree rhs_type = TREE_TYPE(rhs);
116443 + enum machine_mode lhs_mode = TYPE_MODE(lhs_type);
116444 + enum machine_mode rhs_mode = TYPE_MODE(rhs_type);
116445 + unsigned int lhs_size = GET_MODE_BITSIZE(lhs_mode);
116446 + unsigned int rhs_size = GET_MODE_BITSIZE(rhs_mode);
116447 +
116448 + static bool check_lhs[3][4] = {
116449 + // ss su us uu
116450 + { false, true, true, false }, // lhs > rhs
116451 + { false, false, false, false }, // lhs = rhs
116452 + { true, true, true, true }, // lhs < rhs
116453 + };
116454 +
116455 + static bool check_rhs[3][4] = {
116456 + // ss su us uu
116457 + { true, false, true, true }, // lhs > rhs
116458 + { true, false, true, true }, // lhs = rhs
116459 + { true, false, true, true }, // lhs < rhs
116460 + };
116461 +
116462 + // skip lhs check on signed SI -> HI cast or signed SI -> QI cast !!!!
116463 + if (rhs_mode == SImode && !TYPE_UNSIGNED(rhs_type) && (lhs_mode == HImode || lhs_mode == QImode))
116464 + return create_assign(visited, stmt, lhs, AFTER_STMT);
116465 +
116466 + if (lhs_size > rhs_size) {
116467 + cast_lhs = check_lhs[0][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
116468 + cast_rhs = check_rhs[0][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
116469 + } else if (lhs_size == rhs_size) {
116470 + cast_lhs = check_lhs[1][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
116471 + cast_rhs = check_rhs[1][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
116472 + } else {
116473 + cast_lhs = check_lhs[2][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
116474 + cast_rhs = check_rhs[2][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
116475 + }
116476 +
116477 + if (!cast_lhs && !cast_rhs)
116478 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
116479 +
116480 + if (cast_lhs && !skip_lhs_cast_check(stmt))
116481 + check_size_overflow(caller_node, stmt, TREE_TYPE(new_rhs1), new_rhs1, lhs, BEFORE_STMT);
116482 +
116483 + if (cast_rhs)
116484 + check_size_overflow(caller_node, stmt, TREE_TYPE(new_rhs1), new_rhs1, rhs, BEFORE_STMT);
116485 +
116486 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
116487 +}
116488 +
116489 +static tree handle_unary_rhs(struct pointer_set_t *visited, struct cgraph_node *caller_node, gimple stmt)
116490 +{
116491 + tree rhs1, new_rhs1, lhs = gimple_assign_lhs(stmt);
116492 +
116493 + if (get_stmt_flag(stmt) == MY_STMT)
116494 + return lhs;
116495 +
116496 + rhs1 = gimple_assign_rhs1(stmt);
116497 + if (TREE_CODE(TREE_TYPE(rhs1)) == POINTER_TYPE)
116498 + return create_assign(visited, stmt, lhs, AFTER_STMT);
116499 +
116500 + new_rhs1 = expand(visited, caller_node, rhs1);
116501 +
116502 + if (new_rhs1 == NULL_TREE)
116503 + return create_cast_assign(visited, stmt);
116504 +
116505 + if (get_stmt_flag(stmt) == NO_CAST_CHECK)
116506 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
116507 +
116508 + if (gimple_assign_rhs_code(stmt) == BIT_NOT_EXPR) {
116509 + tree size_overflow_type = get_size_overflow_type(stmt, rhs1);
116510 +
116511 + new_rhs1 = cast_to_new_size_overflow_type(stmt, new_rhs1, size_overflow_type, BEFORE_STMT);
116512 + check_size_overflow(caller_node, stmt, size_overflow_type, new_rhs1, rhs1, BEFORE_STMT);
116513 + return create_assign(visited, stmt, lhs, AFTER_STMT);
116514 + }
116515 +
116516 + if (!gimple_assign_cast_p(stmt))
116517 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
116518 +
116519 + return create_cast_overflow_check(visited, caller_node, new_rhs1, stmt);
116520 +}
116521 +
116522 +static tree handle_unary_ops(struct pointer_set_t *visited, struct cgraph_node *caller_node, gimple stmt)
116523 +{
116524 + tree rhs1, lhs = gimple_assign_lhs(stmt);
116525 + gimple def_stmt = get_def_stmt(lhs);
116526 +
116527 + gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP);
116528 + rhs1 = gimple_assign_rhs1(def_stmt);
116529 +
116530 + if (is_gimple_constant(rhs1))
116531 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
116532 +
116533 + switch (TREE_CODE(rhs1)) {
116534 + case SSA_NAME:
116535 + return handle_unary_rhs(visited, caller_node, def_stmt);
116536 + case ARRAY_REF:
116537 + case BIT_FIELD_REF:
116538 + case ADDR_EXPR:
116539 + case COMPONENT_REF:
116540 + case INDIRECT_REF:
116541 +#if BUILDING_GCC_VERSION >= 4006
116542 + case MEM_REF:
116543 +#endif
116544 + case TARGET_MEM_REF:
116545 + case VIEW_CONVERT_EXPR:
116546 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
116547 + case PARM_DECL:
116548 + case VAR_DECL:
116549 + return create_assign(visited, stmt, lhs, AFTER_STMT);
116550 +
116551 + default:
116552 + debug_gimple_stmt(def_stmt);
116553 + debug_tree(rhs1);
116554 + gcc_unreachable();
116555 + }
116556 +}
116557 +
116558 +static void insert_cond(basic_block cond_bb, tree arg, enum tree_code cond_code, tree type_value)
116559 +{
116560 + gimple cond_stmt;
116561 + gimple_stmt_iterator gsi = gsi_last_bb(cond_bb);
116562 +
116563 + cond_stmt = gimple_build_cond(cond_code, arg, type_value, NULL_TREE, NULL_TREE);
116564 + gsi_insert_after(&gsi, cond_stmt, GSI_CONTINUE_LINKING);
116565 + update_stmt(cond_stmt);
116566 +}
116567 +
116568 +static tree create_string_param(tree string)
116569 +{
116570 + tree i_type, a_type;
116571 + const int length = TREE_STRING_LENGTH(string);
116572 +
116573 + gcc_assert(length > 0);
116574 +
116575 + i_type = build_index_type(build_int_cst(NULL_TREE, length - 1));
116576 + a_type = build_array_type(char_type_node, i_type);
116577 +
116578 + TREE_TYPE(string) = a_type;
116579 + TREE_CONSTANT(string) = 1;
116580 + TREE_READONLY(string) = 1;
116581 +
116582 + return build1(ADDR_EXPR, ptr_type_node, string);
116583 +}
116584 +
116585 +static void insert_cond_result(struct cgraph_node *caller_node, basic_block bb_true, const_gimple stmt, const_tree arg, bool min)
116586 +{
116587 + gimple func_stmt;
116588 + const_gimple def_stmt;
116589 + const_tree loc_line;
116590 + tree loc_file, ssa_name, current_func;
116591 + expanded_location xloc;
116592 + char *ssa_name_buf;
116593 + int len;
116594 + struct cgraph_edge *edge;
116595 + struct cgraph_node *callee_node;
116596 + int frequency;
116597 + gimple_stmt_iterator gsi = gsi_start_bb(bb_true);
116598 +
116599 + def_stmt = get_def_stmt(arg);
116600 + xloc = expand_location(gimple_location(def_stmt));
116601 +
116602 + if (!gimple_has_location(def_stmt)) {
116603 + xloc = expand_location(gimple_location(stmt));
116604 + if (!gimple_has_location(stmt))
116605 + xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl));
116606 + }
116607 +
116608 + loc_line = build_int_cstu(unsigned_type_node, xloc.line);
116609 +
116610 + loc_file = build_string(strlen(xloc.file) + 1, xloc.file);
116611 + loc_file = create_string_param(loc_file);
116612 +
116613 + current_func = build_string(DECL_NAME_LENGTH(current_function_decl) + 1, DECL_NAME_POINTER(current_function_decl));
116614 + current_func = create_string_param(current_func);
116615 +
116616 + gcc_assert(DECL_NAME(SSA_NAME_VAR(arg)) != NULL);
116617 + call_count++;
116618 + 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);
116619 + gcc_assert(len > 0);
116620 + ssa_name = build_string(len + 1, ssa_name_buf);
116621 + free(ssa_name_buf);
116622 + ssa_name = create_string_param(ssa_name);
116623 +
116624 + // void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
116625 + func_stmt = gimple_build_call(report_size_overflow_decl, 4, loc_file, loc_line, current_func, ssa_name);
116626 + gsi_insert_after(&gsi, func_stmt, GSI_CONTINUE_LINKING);
116627 +
116628 + callee_node = cgraph_get_create_node(report_size_overflow_decl);
116629 + frequency = compute_call_stmt_bb_frequency(current_function_decl, bb_true);
116630 +
116631 + edge = cgraph_create_edge(caller_node, callee_node, func_stmt, bb_true->count, frequency, bb_true->loop_depth);
116632 + gcc_assert(edge != NULL);
116633 +}
116634 +
116635 +static void __unused print_the_code_insertions(const_gimple stmt)
116636 +{
116637 + location_t loc = gimple_location(stmt);
116638 +
116639 + inform(loc, "Integer size_overflow check applied here.");
116640 +}
116641 +
116642 +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)
116643 +{
116644 + basic_block cond_bb, join_bb, bb_true;
116645 + edge e;
116646 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
116647 +
116648 + cond_bb = gimple_bb(stmt);
116649 + if (before)
116650 + gsi_prev(&gsi);
116651 + if (gsi_end_p(gsi))
116652 + e = split_block_after_labels(cond_bb);
116653 + else
116654 + e = split_block(cond_bb, gsi_stmt(gsi));
116655 + cond_bb = e->src;
116656 + join_bb = e->dest;
116657 + e->flags = EDGE_FALSE_VALUE;
116658 + e->probability = REG_BR_PROB_BASE;
116659 +
116660 + bb_true = create_empty_bb(cond_bb);
116661 + make_edge(cond_bb, bb_true, EDGE_TRUE_VALUE);
116662 + make_edge(cond_bb, join_bb, EDGE_FALSE_VALUE);
116663 + make_edge(bb_true, join_bb, EDGE_FALLTHRU);
116664 +
116665 + gcc_assert(dom_info_available_p(CDI_DOMINATORS));
116666 + set_immediate_dominator(CDI_DOMINATORS, bb_true, cond_bb);
116667 + set_immediate_dominator(CDI_DOMINATORS, join_bb, cond_bb);
116668 +
116669 + if (current_loops != NULL) {
116670 + gcc_assert(cond_bb->loop_father == join_bb->loop_father);
116671 + add_bb_to_loop(bb_true, cond_bb->loop_father);
116672 + }
116673 +
116674 + insert_cond(cond_bb, arg, cond_code, type_value);
116675 + insert_cond_result(caller_node, bb_true, stmt, arg, min);
116676 +
116677 +// print_the_code_insertions(stmt);
116678 +}
116679 +
116680 +static void check_size_overflow(struct cgraph_node *caller_node, gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before)
116681 +{
116682 + const_tree rhs_type = TREE_TYPE(rhs);
116683 + tree cast_rhs_type, type_max_type, type_min_type, type_max, type_min;
116684 +
116685 + gcc_assert(rhs_type != NULL_TREE);
116686 + if (TREE_CODE(rhs_type) == POINTER_TYPE)
116687 + return;
116688 +
116689 + gcc_assert(TREE_CODE(rhs_type) == INTEGER_TYPE || TREE_CODE(rhs_type) == ENUMERAL_TYPE);
116690 +
116691 + if (is_const_plus_unsigned_signed_truncation(rhs))
116692 + return;
116693 +
116694 + type_max = cast_a_tree(size_overflow_type, TYPE_MAX_VALUE(rhs_type));
116695 + // typemax (-1) < typemin (0)
116696 + if (TREE_OVERFLOW(type_max))
116697 + return;
116698 +
116699 + type_min = cast_a_tree(size_overflow_type, TYPE_MIN_VALUE(rhs_type));
116700 +
116701 + cast_rhs_type = TREE_TYPE(cast_rhs);
116702 + type_max_type = TREE_TYPE(type_max);
116703 + gcc_assert(types_compatible_p(cast_rhs_type, type_max_type));
116704 +
116705 + insert_check_size_overflow(caller_node, stmt, GT_EXPR, cast_rhs, type_max, before, MAX_CHECK);
116706 +
116707 + // special case: get_size_overflow_type(), 32, u64->s
116708 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode) && TYPE_UNSIGNED(size_overflow_type) && !TYPE_UNSIGNED(rhs_type))
116709 + return;
116710 +
116711 + type_min_type = TREE_TYPE(type_min);
116712 + gcc_assert(types_compatible_p(type_max_type, type_min_type));
116713 + insert_check_size_overflow(caller_node, stmt, LT_EXPR, cast_rhs, type_min, before, MIN_CHECK);
116714 +}
116715 +
116716 +static bool is_lt_signed_type_max(const_tree rhs)
116717 +{
116718 + const_tree new_type, type_max, type = TREE_TYPE(rhs);
116719 +
116720 + if (!TYPE_UNSIGNED(type))
116721 + return true;
116722 +
116723 + switch (TYPE_MODE(type)) {
116724 + case QImode:
116725 + new_type = intQI_type_node;
116726 + break;
116727 + case HImode:
116728 + new_type = intHI_type_node;
116729 + break;
116730 + case SImode:
116731 + new_type = intSI_type_node;
116732 + break;
116733 + case DImode:
116734 + new_type = intDI_type_node;
116735 + break;
116736 + default:
116737 + debug_tree((tree)type);
116738 + gcc_unreachable();
116739 + }
116740 +
116741 + type_max = TYPE_MAX_VALUE(new_type);
116742 + if (!tree_int_cst_lt(type_max, rhs))
116743 + return true;
116744 +
116745 + return false;
116746 +}
116747 +
116748 +static bool is_gt_zero(const_tree rhs)
116749 +{
116750 + const_tree type = TREE_TYPE(rhs);
116751 +
116752 + if (TYPE_UNSIGNED(type))
116753 + return true;
116754 +
116755 + if (!tree_int_cst_lt(rhs, integer_zero_node))
116756 + return true;
116757 +
116758 + return false;
116759 +}
116760 +
116761 +static bool is_a_constant_overflow(const_gimple stmt, const_tree rhs)
116762 +{
116763 + if (gimple_assign_rhs_code(stmt) == MIN_EXPR)
116764 + return false;
116765 + if (!is_gimple_constant(rhs))
116766 + return false;
116767 +
116768 + // If the const is between 0 and the max value of the signed type of the same bitsize then there is no intentional overflow
116769 +// if (is_lt_signed_type_max(rhs) && is_gt_zero(rhs))
116770 +// return false;
116771 +
116772 + return true;
116773 +}
116774 +
116775 +static tree get_def_stmt_rhs(const_tree var)
116776 +{
116777 + tree rhs1, def_stmt_rhs1;
116778 + gimple rhs1_def_stmt, def_stmt_rhs1_def_stmt, def_stmt;
116779 +
116780 + def_stmt = get_def_stmt(var);
116781 + if (!gimple_assign_cast_p(def_stmt))
116782 + return NULL_TREE;
116783 + gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP && get_stmt_flag(def_stmt) == MY_STMT && gimple_assign_cast_p(def_stmt));
116784 +
116785 + rhs1 = gimple_assign_rhs1(def_stmt);
116786 + rhs1_def_stmt = get_def_stmt(rhs1);
116787 + if (!gimple_assign_cast_p(rhs1_def_stmt))
116788 + return rhs1;
116789 +
116790 + def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt);
116791 + def_stmt_rhs1_def_stmt = get_def_stmt(def_stmt_rhs1);
116792 +
116793 + switch (gimple_code(def_stmt_rhs1_def_stmt)) {
116794 + case GIMPLE_CALL:
116795 + case GIMPLE_NOP:
116796 + case GIMPLE_ASM:
116797 + case GIMPLE_PHI:
116798 + return def_stmt_rhs1;
116799 + case GIMPLE_ASSIGN:
116800 + return rhs1;
116801 + default:
116802 + debug_gimple_stmt(def_stmt_rhs1_def_stmt);
116803 + gcc_unreachable();
116804 + }
116805 +}
116806 +
116807 +static tree handle_intentional_overflow(struct pointer_set_t *visited, struct cgraph_node *caller_node, bool check_overflow, gimple stmt, tree change_rhs, tree new_rhs2)
116808 +{
116809 + tree new_rhs, orig_rhs;
116810 + void (*gimple_assign_set_rhs)(gimple, tree);
116811 + tree rhs1 = gimple_assign_rhs1(stmt);
116812 + tree rhs2 = gimple_assign_rhs2(stmt);
116813 + tree lhs = gimple_assign_lhs(stmt);
116814 +
116815 + if (!check_overflow)
116816 + return create_assign(visited, stmt, lhs, AFTER_STMT);
116817 +
116818 + if (change_rhs == NULL_TREE)
116819 + return create_assign(visited, stmt, lhs, AFTER_STMT);
116820 +
116821 + if (new_rhs2 == NULL_TREE) {
116822 + orig_rhs = rhs1;
116823 + gimple_assign_set_rhs = &gimple_assign_set_rhs1;
116824 + } else {
116825 + orig_rhs = rhs2;
116826 + gimple_assign_set_rhs = &gimple_assign_set_rhs2;
116827 + }
116828 +
116829 + check_size_overflow(caller_node, stmt, TREE_TYPE(change_rhs), change_rhs, orig_rhs, BEFORE_STMT);
116830 +
116831 + new_rhs = change_assign_rhs(stmt, orig_rhs, change_rhs);
116832 + gimple_assign_set_rhs(stmt, new_rhs);
116833 + update_stmt(stmt);
116834 +
116835 + return create_assign(visited, stmt, lhs, AFTER_STMT);
116836 +}
116837 +
116838 +static bool is_subtraction_special(const_gimple stmt)
116839 +{
116840 + gimple rhs1_def_stmt, rhs2_def_stmt;
116841 + const_tree rhs1_def_stmt_rhs1, rhs2_def_stmt_rhs1, rhs1_def_stmt_lhs, rhs2_def_stmt_lhs;
116842 + enum machine_mode rhs1_def_stmt_rhs1_mode, rhs2_def_stmt_rhs1_mode, rhs1_def_stmt_lhs_mode, rhs2_def_stmt_lhs_mode;
116843 + const_tree rhs1 = gimple_assign_rhs1(stmt);
116844 + const_tree rhs2 = gimple_assign_rhs2(stmt);
116845 +
116846 + if (is_gimple_constant(rhs1) || is_gimple_constant(rhs2))
116847 + return false;
116848 +
116849 + gcc_assert(TREE_CODE(rhs1) == SSA_NAME && TREE_CODE(rhs2) == SSA_NAME);
116850 +
116851 + if (gimple_assign_rhs_code(stmt) != MINUS_EXPR)
116852 + return false;
116853 +
116854 + rhs1_def_stmt = get_def_stmt(rhs1);
116855 + rhs2_def_stmt = get_def_stmt(rhs2);
116856 + if (!gimple_assign_cast_p(rhs1_def_stmt) || !gimple_assign_cast_p(rhs2_def_stmt))
116857 + return false;
116858 +
116859 + rhs1_def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt);
116860 + rhs2_def_stmt_rhs1 = gimple_assign_rhs1(rhs2_def_stmt);
116861 + rhs1_def_stmt_lhs = gimple_assign_lhs(rhs1_def_stmt);
116862 + rhs2_def_stmt_lhs = gimple_assign_lhs(rhs2_def_stmt);
116863 + rhs1_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_rhs1));
116864 + rhs2_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_rhs1));
116865 + rhs1_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_lhs));
116866 + rhs2_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_lhs));
116867 + if (GET_MODE_BITSIZE(rhs1_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs1_def_stmt_lhs_mode))
116868 + return false;
116869 + if (GET_MODE_BITSIZE(rhs2_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs2_def_stmt_lhs_mode))
116870 + return false;
116871 +
116872 + set_stmt_flag(rhs1_def_stmt, NO_CAST_CHECK);
116873 + set_stmt_flag(rhs2_def_stmt, NO_CAST_CHECK);
116874 + return true;
116875 +}
116876 +
116877 +static tree handle_integer_truncation(struct pointer_set_t *visited, struct cgraph_node *caller_node, const_tree lhs)
116878 +{
116879 + tree new_rhs1, new_rhs2;
116880 + tree new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1, new_lhs;
116881 + gimple assign, stmt = get_def_stmt(lhs);
116882 + tree rhs1 = gimple_assign_rhs1(stmt);
116883 + tree rhs2 = gimple_assign_rhs2(stmt);
116884 +
116885 + if (!is_subtraction_special(stmt))
116886 + return NULL_TREE;
116887 +
116888 + new_rhs1 = expand(visited, caller_node, rhs1);
116889 + new_rhs2 = expand(visited, caller_node, rhs2);
116890 +
116891 + new_rhs1_def_stmt_rhs1 = get_def_stmt_rhs(new_rhs1);
116892 + new_rhs2_def_stmt_rhs1 = get_def_stmt_rhs(new_rhs2);
116893 +
116894 + if (new_rhs1_def_stmt_rhs1 == NULL_TREE || new_rhs2_def_stmt_rhs1 == NULL_TREE)
116895 + return NULL_TREE;
116896 +
116897 + if (!types_compatible_p(TREE_TYPE(new_rhs1_def_stmt_rhs1), TREE_TYPE(new_rhs2_def_stmt_rhs1))) {
116898 + new_rhs1_def_stmt_rhs1 = cast_to_TI_type(stmt, new_rhs1_def_stmt_rhs1);
116899 + new_rhs2_def_stmt_rhs1 = cast_to_TI_type(stmt, new_rhs2_def_stmt_rhs1);
116900 + }
116901 +
116902 + assign = create_binary_assign(MINUS_EXPR, stmt, new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1);
116903 + new_lhs = gimple_assign_lhs(assign);
116904 + check_size_overflow(caller_node, assign, TREE_TYPE(new_lhs), new_lhs, rhs1, AFTER_STMT);
116905 +
116906 + return dup_assign(visited, stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
116907 +}
116908 +
116909 +static bool is_a_neg_overflow(const_gimple stmt, const_tree rhs)
116910 +{
116911 + const_gimple def_stmt;
116912 +
116913 + if (TREE_CODE(rhs) != SSA_NAME)
116914 + return false;
116915 +
116916 + if (gimple_assign_rhs_code(stmt) != PLUS_EXPR)
116917 + return false;
116918 +
116919 + def_stmt = get_def_stmt(rhs);
116920 + if (!is_gimple_assign(def_stmt) || gimple_assign_rhs_code(def_stmt) != BIT_NOT_EXPR)
116921 + return false;
116922 +
116923 + return true;
116924 +}
116925 +
116926 +static tree handle_binary_ops(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree lhs)
116927 +{
116928 + tree rhs1, rhs2, new_lhs;
116929 + gimple def_stmt = get_def_stmt(lhs);
116930 + tree new_rhs1 = NULL_TREE;
116931 + tree new_rhs2 = NULL_TREE;
116932 +
116933 + rhs1 = gimple_assign_rhs1(def_stmt);
116934 + rhs2 = gimple_assign_rhs2(def_stmt);
116935 +
116936 + /* no DImode/TImode division in the 32/64 bit kernel */
116937 + switch (gimple_assign_rhs_code(def_stmt)) {
116938 + case RDIV_EXPR:
116939 + case TRUNC_DIV_EXPR:
116940 + case CEIL_DIV_EXPR:
116941 + case FLOOR_DIV_EXPR:
116942 + case ROUND_DIV_EXPR:
116943 + case TRUNC_MOD_EXPR:
116944 + case CEIL_MOD_EXPR:
116945 + case FLOOR_MOD_EXPR:
116946 + case ROUND_MOD_EXPR:
116947 + case EXACT_DIV_EXPR:
116948 + case POINTER_PLUS_EXPR:
116949 + case BIT_AND_EXPR:
116950 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
116951 + default:
116952 + break;
116953 + }
116954 +
116955 + new_lhs = handle_integer_truncation(visited, caller_node, lhs);
116956 + if (new_lhs != NULL_TREE)
116957 + return new_lhs;
116958 +
116959 + if (TREE_CODE(rhs1) == SSA_NAME)
116960 + new_rhs1 = expand(visited, caller_node, rhs1);
116961 + if (TREE_CODE(rhs2) == SSA_NAME)
116962 + new_rhs2 = expand(visited, caller_node, rhs2);
116963 +
116964 + if (is_a_neg_overflow(def_stmt, rhs2))
116965 + return handle_intentional_overflow(visited, caller_node, true, def_stmt, new_rhs1, NULL_TREE);
116966 + if (is_a_neg_overflow(def_stmt, rhs1))
116967 + return handle_intentional_overflow(visited, caller_node, true, def_stmt, new_rhs2, new_rhs2);
116968 +
116969 +
116970 + if (is_a_constant_overflow(def_stmt, rhs2))
116971 + return handle_intentional_overflow(visited, caller_node, !is_a_cast_and_const_overflow(rhs1), def_stmt, new_rhs1, NULL_TREE);
116972 + if (is_a_constant_overflow(def_stmt, rhs1))
116973 + return handle_intentional_overflow(visited, caller_node, !is_a_cast_and_const_overflow(rhs2), def_stmt, new_rhs2, new_rhs2);
116974 +
116975 + // the const is between 0 and (signed) MAX
116976 + if (is_gimple_constant(rhs1))
116977 + new_rhs1 = create_assign(visited, def_stmt, rhs1, BEFORE_STMT);
116978 + if (is_gimple_constant(rhs2))
116979 + new_rhs2 = create_assign(visited, def_stmt, rhs2, BEFORE_STMT);
116980 +
116981 + return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
116982 +}
116983 +
116984 +#if BUILDING_GCC_VERSION >= 4006
116985 +static tree get_new_rhs(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree size_overflow_type, tree rhs)
116986 +{
116987 + if (is_gimple_constant(rhs))
116988 + return cast_a_tree(size_overflow_type, rhs);
116989 + if (TREE_CODE(rhs) != SSA_NAME)
116990 + return NULL_TREE;
116991 + return expand(visited, caller_node, rhs);
116992 +}
116993 +
116994 +static tree handle_ternary_ops(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree lhs)
116995 +{
116996 + tree rhs1, rhs2, rhs3, new_rhs1, new_rhs2, new_rhs3, size_overflow_type;
116997 + gimple def_stmt = get_def_stmt(lhs);
116998 +
116999 + size_overflow_type = get_size_overflow_type(def_stmt, lhs);
117000 +
117001 + rhs1 = gimple_assign_rhs1(def_stmt);
117002 + rhs2 = gimple_assign_rhs2(def_stmt);
117003 + rhs3 = gimple_assign_rhs3(def_stmt);
117004 + new_rhs1 = get_new_rhs(visited, caller_node, size_overflow_type, rhs1);
117005 + new_rhs2 = get_new_rhs(visited, caller_node, size_overflow_type, rhs2);
117006 + new_rhs3 = get_new_rhs(visited, caller_node, size_overflow_type, rhs3);
117007 +
117008 + return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, new_rhs3);
117009 +}
117010 +#endif
117011 +
117012 +static tree get_size_overflow_type(gimple stmt, const_tree node)
117013 +{
117014 + const_tree type;
117015 + tree new_type;
117016 +
117017 + gcc_assert(node != NULL_TREE);
117018 +
117019 + type = TREE_TYPE(node);
117020 +
117021 + if (get_stmt_flag(stmt) == MY_STMT)
117022 + return TREE_TYPE(node);
117023 +
117024 + switch (TYPE_MODE(type)) {
117025 + case QImode:
117026 + new_type = intHI_type_node;
117027 + break;
117028 + case HImode:
117029 + new_type = intSI_type_node;
117030 + break;
117031 + case SImode:
117032 + new_type = intDI_type_node;
117033 + break;
117034 + case DImode:
117035 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode))
117036 + new_type = TYPE_UNSIGNED(type) ? unsigned_intDI_type_node : intDI_type_node;
117037 + else
117038 + new_type = intTI_type_node;
117039 + break;
117040 + case TImode:
117041 + gcc_assert(!TYPE_UNSIGNED(type));
117042 + new_type = intTI_type_node;
117043 + break;
117044 + default:
117045 + debug_tree((tree)node);
117046 + error("%s: unsupported gcc configuration (%qE).", __func__, current_function_decl);
117047 + gcc_unreachable();
117048 + }
117049 +
117050 + if (TYPE_QUALS(type) != 0)
117051 + return build_qualified_type(new_type, TYPE_QUALS(type));
117052 + return new_type;
117053 +}
117054 +
117055 +static tree expand_visited(gimple def_stmt)
117056 +{
117057 + const_gimple next_stmt;
117058 + gimple_stmt_iterator gsi;
117059 + enum gimple_code code = gimple_code(def_stmt);
117060 +
117061 + if (code == GIMPLE_ASM)
117062 + return NULL_TREE;
117063 +
117064 + gsi = gsi_for_stmt(def_stmt);
117065 + gsi_next(&gsi);
117066 +
117067 + if (gimple_code(def_stmt) == GIMPLE_PHI && gsi_end_p(gsi))
117068 + return NULL_TREE;
117069 + gcc_assert(!gsi_end_p(gsi));
117070 + next_stmt = gsi_stmt(gsi);
117071 +
117072 + if (gimple_code(def_stmt) == GIMPLE_PHI && get_stmt_flag((gimple)next_stmt) != MY_STMT)
117073 + return NULL_TREE;
117074 + gcc_assert(get_stmt_flag((gimple)next_stmt) == MY_STMT);
117075 +
117076 + return get_lhs(next_stmt);
117077 +}
117078 +
117079 +static tree expand(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree lhs)
117080 +{
117081 + gimple def_stmt;
117082 +
117083 + def_stmt = get_def_stmt(lhs);
117084 +
117085 + if (!def_stmt || gimple_code(def_stmt) == GIMPLE_NOP)
117086 + return NULL_TREE;
117087 +
117088 + if (get_stmt_flag(def_stmt) == MY_STMT)
117089 + return lhs;
117090 +
117091 + if (pointer_set_contains(visited, def_stmt))
117092 + return expand_visited(def_stmt);
117093 +
117094 + switch (gimple_code(def_stmt)) {
117095 + case GIMPLE_PHI:
117096 + return handle_phi(visited, caller_node, lhs);
117097 + case GIMPLE_CALL:
117098 + case GIMPLE_ASM:
117099 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
117100 + case GIMPLE_ASSIGN:
117101 + switch (gimple_num_ops(def_stmt)) {
117102 + case 2:
117103 + return handle_unary_ops(visited, caller_node, def_stmt);
117104 + case 3:
117105 + return handle_binary_ops(visited, caller_node, lhs);
117106 +#if BUILDING_GCC_VERSION >= 4006
117107 + case 4:
117108 + return handle_ternary_ops(visited, caller_node, lhs);
117109 +#endif
117110 + }
117111 + default:
117112 + debug_gimple_stmt(def_stmt);
117113 + error("%s: unknown gimple code", __func__);
117114 + gcc_unreachable();
117115 + }
117116 +}
117117 +
117118 +static tree cast_to_orig_type(gimple stmt, const_tree orig_node, tree new_node)
117119 +{
117120 + const_gimple assign;
117121 + tree orig_type = TREE_TYPE(orig_node);
117122 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
117123 +
117124 + assign = build_cast_stmt(orig_type, new_node, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
117125 + return gimple_assign_lhs(assign);
117126 +}
117127 +
117128 +static void change_orig_node(struct interesting_node *cur_node, tree new_node)
117129 +{
117130 + void (*set_rhs)(gimple, tree);
117131 + gimple stmt = cur_node->first_stmt;
117132 + const_tree orig_node = cur_node->node;
117133 +
117134 + switch (gimple_code(stmt)) {
117135 + case GIMPLE_RETURN:
117136 + gimple_return_set_retval(stmt, cast_to_orig_type(stmt, orig_node, new_node));
117137 + break;
117138 + case GIMPLE_CALL:
117139 + gimple_call_set_arg(stmt, cur_node->num - 1, cast_to_orig_type(stmt, orig_node, new_node));
117140 + break;
117141 + case GIMPLE_ASSIGN:
117142 + switch (cur_node->num) {
117143 + case 1:
117144 + set_rhs = &gimple_assign_set_rhs1;
117145 + break;
117146 + case 2:
117147 + set_rhs = &gimple_assign_set_rhs2;
117148 + break;
117149 +#if BUILDING_GCC_VERSION >= 4006
117150 + case 3:
117151 + set_rhs = &gimple_assign_set_rhs3;
117152 + break;
117153 +#endif
117154 + default:
117155 + gcc_unreachable();
117156 + }
117157 +
117158 + set_rhs(stmt, cast_to_orig_type(stmt, orig_node, new_node));
117159 + break;
117160 + default:
117161 + debug_gimple_stmt(stmt);
117162 + gcc_unreachable();
117163 + }
117164 +
117165 + update_stmt(stmt);
117166 +}
117167 +
117168 +static unsigned int get_correct_arg_count(unsigned int argnum, const_tree fndecl)
117169 +{
117170 + const struct size_overflow_hash *hash;
117171 + unsigned int new_argnum;
117172 + tree arg;
117173 + const_tree origarg;
117174 +
117175 + if (argnum == 0)
117176 + return argnum;
117177 +
117178 + hash = get_function_hash(fndecl);
117179 + if (hash && hash->param & (1U << argnum))
117180 + return argnum;
117181 +
117182 + if (DECL_EXTERNAL(fndecl))
117183 + return argnum;
117184 +
117185 + origarg = DECL_ARGUMENTS(DECL_ORIGIN(fndecl));
117186 + argnum--;
117187 + while (origarg && argnum) {
117188 + origarg = TREE_CHAIN(origarg);
117189 + argnum--;
117190 + }
117191 + gcc_assert(argnum == 0);
117192 + gcc_assert(origarg != NULL_TREE);
117193 +
117194 + for (arg = DECL_ARGUMENTS(fndecl), new_argnum = 1; arg; arg = TREE_CHAIN(arg), new_argnum++)
117195 + if (operand_equal_p(origarg, arg, 0) || !strcmp(DECL_NAME_POINTER(origarg), DECL_NAME_POINTER(arg)))
117196 + return new_argnum;
117197 +
117198 + return CANNOT_FIND_ARG;
117199 +}
117200 +
117201 +// Don't want to duplicate entries in next_cgraph_node
117202 +static bool is_in_next_cgraph_node(struct next_cgraph_node *head, struct cgraph_node *node, const_tree fndecl, unsigned int num)
117203 +{
117204 + const_tree new_callee_fndecl;
117205 + struct next_cgraph_node *cur_node;
117206 +
117207 + if (fndecl == RET_CHECK)
117208 + new_callee_fndecl = NODE_DECL(node);
117209 + else
117210 + new_callee_fndecl = fndecl;
117211 +
117212 + for (cur_node = head; cur_node; cur_node = cur_node->next) {
117213 + if (!operand_equal_p(NODE_DECL(cur_node->current_function), NODE_DECL(node), 0))
117214 + continue;
117215 + if (!operand_equal_p(cur_node->callee_fndecl, new_callee_fndecl, 0))
117216 + continue;
117217 + if (num == cur_node->num)
117218 + return true;
117219 + }
117220 + return false;
117221 +}
117222 +
117223 +/* Add a next_cgraph_node into the list for handle_function().
117224 + * handle_function() iterates over all the next cgraph nodes and
117225 + * starts the overflow check insertion process.
117226 + */
117227 +static struct next_cgraph_node *create_new_next_cgraph_node(struct next_cgraph_node *head, struct cgraph_node *node, tree fndecl, unsigned int num)
117228 +{
117229 + struct next_cgraph_node *new_node;
117230 +
117231 + if (is_in_next_cgraph_node(head, node, fndecl, num))
117232 + return head;
117233 +
117234 + new_node = (struct next_cgraph_node *)xmalloc(sizeof(*new_node));
117235 + new_node->current_function = node;
117236 + new_node->next = NULL;
117237 + new_node->num = num;
117238 + if (fndecl == RET_CHECK)
117239 + new_node->callee_fndecl = NODE_DECL(node);
117240 + else
117241 + new_node->callee_fndecl = fndecl;
117242 +
117243 + if (!head)
117244 + return new_node;
117245 +
117246 + new_node->next = head;
117247 + return new_node;
117248 +}
117249 +
117250 +static struct next_cgraph_node *create_new_next_cgraph_nodes(struct next_cgraph_node *head, struct cgraph_node *node, unsigned int num)
117251 +{
117252 + struct cgraph_edge *e;
117253 +
117254 + if (num == 0)
117255 + return create_new_next_cgraph_node(head, node, RET_CHECK, num);
117256 +
117257 + for (e = node->callers; e; e = e->next_caller) {
117258 + tree fndecl = gimple_call_fndecl(e->call_stmt);
117259 +
117260 + gcc_assert(fndecl != NULL_TREE);
117261 + head = create_new_next_cgraph_node(head, e->caller, fndecl, num);
117262 + }
117263 +
117264 + return head;
117265 +}
117266 +
117267 +static bool is_a_return_check(const_tree node)
117268 +{
117269 + if (TREE_CODE(node) == FUNCTION_DECL)
117270 + return true;
117271 +
117272 + gcc_assert(TREE_CODE(node) == PARM_DECL);
117273 + return false;
117274 +}
117275 +
117276 +static bool is_in_hash_table(const_tree fndecl, unsigned int num)
117277 +{
117278 + const struct size_overflow_hash *hash;
117279 +
117280 + hash = get_function_hash(fndecl);
117281 + if (hash && (hash->param & (1U << num)))
117282 + return true;
117283 + return false;
117284 +}
117285 +
117286 +struct missing_functions {
117287 + struct missing_functions *next;
117288 + const_tree node;
117289 + tree fndecl;
117290 +};
117291 +
117292 +static struct missing_functions *create_new_missing_function(struct missing_functions *missing_fn_head, tree node)
117293 +{
117294 + struct missing_functions *new_function;
117295 +
117296 + new_function = (struct missing_functions *)xmalloc(sizeof(*new_function));
117297 + new_function->node = node;
117298 + new_function->next = NULL;
117299 +
117300 + if (TREE_CODE(node) == FUNCTION_DECL)
117301 + new_function->fndecl = node;
117302 + else
117303 + new_function->fndecl = current_function_decl;
117304 + gcc_assert(new_function->fndecl);
117305 +
117306 + if (!missing_fn_head)
117307 + return new_function;
117308 +
117309 + new_function->next = missing_fn_head;
117310 + return new_function;
117311 +}
117312 +
117313 +/* Check if the function has a size_overflow attribute or it is in the size_overflow hash table.
117314 + * If the function is missing everywhere then print the missing message into stderr.
117315 + */
117316 +static bool is_missing_function(const_tree orig_fndecl, unsigned int num)
117317 +{
117318 + switch (DECL_FUNCTION_CODE(orig_fndecl)) {
117319 +#if BUILDING_GCC_VERSION >= 4008
117320 + case BUILT_IN_BSWAP16:
117321 +#endif
117322 + case BUILT_IN_BSWAP32:
117323 + case BUILT_IN_BSWAP64:
117324 + case BUILT_IN_EXPECT:
117325 + case BUILT_IN_MEMCMP:
117326 + return false;
117327 + default:
117328 + break;
117329 + }
117330 +
117331 + // skip test.c
117332 + if (strcmp(DECL_NAME_POINTER(current_function_decl), "coolmalloc")) {
117333 + if (lookup_attribute("size_overflow", DECL_ATTRIBUTES(orig_fndecl)))
117334 + warning(0, "unnecessary size_overflow attribute on: %s\n", DECL_NAME_POINTER(orig_fndecl));
117335 + }
117336 +
117337 + if (is_in_hash_table(orig_fndecl, num))
117338 + return false;
117339 +
117340 + print_missing_msg(orig_fndecl, num);
117341 + return true;
117342 +}
117343 +
117344 +// Get the argnum of a function decl, if node is a return then the argnum is 0
117345 +static unsigned int get_function_num(const_tree node, const_tree orig_fndecl)
117346 +{
117347 + if (is_a_return_check(node))
117348 + return 0;
117349 + else
117350 + return find_arg_number_tree(node, orig_fndecl);
117351 +}
117352 +
117353 +/* If the function is missing from the hash table and it is a static function
117354 + * then create a next_cgraph_node from it for handle_function()
117355 + */
117356 +static struct next_cgraph_node *check_missing_overflow_attribute_and_create_next_node(struct next_cgraph_node *cnodes, struct missing_functions *missing_fn_head)
117357 +{
117358 + unsigned int num;
117359 + const_tree orig_fndecl;
117360 + struct cgraph_node *next_node = NULL;
117361 +
117362 + orig_fndecl = DECL_ORIGIN(missing_fn_head->fndecl);
117363 +
117364 + num = get_function_num(missing_fn_head->node, orig_fndecl);
117365 + if (num == CANNOT_FIND_ARG)
117366 + return cnodes;
117367 +
117368 + if (!is_missing_function(orig_fndecl, num))
117369 + return cnodes;
117370 +
117371 + next_node = cgraph_get_node(missing_fn_head->fndecl);
117372 + if (next_node && next_node->local.local)
117373 + cnodes = create_new_next_cgraph_nodes(cnodes, next_node, num);
117374 + return cnodes;
117375 +}
117376 +
117377 +/* Search for missing size_overflow attributes on the last nodes in ipa and collect them
117378 + * into the next_cgraph_node list. They will be the next interesting returns or callees.
117379 + */
117380 +static struct next_cgraph_node *search_overflow_attribute(struct next_cgraph_node *cnodes, struct interesting_node *cur_node)
117381 +{
117382 + unsigned int i;
117383 + tree node;
117384 + struct missing_functions *cur, *missing_fn_head = NULL;
117385 +
117386 +#if BUILDING_GCC_VERSION <= 4007
117387 + FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, node) {
117388 +#else
117389 + FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, node) {
117390 +#endif
117391 + switch (TREE_CODE(node)) {
117392 + case PARM_DECL:
117393 + if (TREE_CODE(TREE_TYPE(node)) != INTEGER_TYPE)
117394 + break;
117395 + case FUNCTION_DECL:
117396 + missing_fn_head = create_new_missing_function(missing_fn_head, node);
117397 + break;
117398 + default:
117399 + break;
117400 + }
117401 + }
117402 +
117403 + while (missing_fn_head) {
117404 + cnodes = check_missing_overflow_attribute_and_create_next_node(cnodes, missing_fn_head);
117405 +
117406 + cur = missing_fn_head->next;
117407 + free(missing_fn_head);
117408 + missing_fn_head = cur;
117409 + }
117410 +
117411 + return cnodes;
117412 +}
117413 +
117414 +static void walk_phi_set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree result)
117415 +{
117416 + gimple phi = get_def_stmt(result);
117417 + unsigned int i, n = gimple_phi_num_args(phi);
117418 +
117419 + pointer_set_insert(visited, phi);
117420 + for (i = 0; i < n; i++) {
117421 + const_tree arg = gimple_phi_arg_def(phi, i);
117422 +
117423 + set_conditions(visited, interesting_conditions, arg);
117424 + }
117425 +}
117426 +
117427 +enum conditions {
117428 + FROM_CONST, NOT_UNARY, CAST
117429 +};
117430 +
117431 +// Search for constants, cast assignments and binary/ternary assignments
117432 +static void set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree lhs)
117433 +{
117434 + gimple def_stmt = get_def_stmt(lhs);
117435 +
117436 + if (is_gimple_constant(lhs)) {
117437 + interesting_conditions[FROM_CONST] = true;
117438 + return;
117439 + }
117440 +
117441 + if (!def_stmt)
117442 + return;
117443 +
117444 + if (pointer_set_contains(visited, def_stmt))
117445 + return;
117446 +
117447 + switch (gimple_code(def_stmt)) {
117448 + case GIMPLE_NOP:
117449 + case GIMPLE_CALL:
117450 + case GIMPLE_ASM:
117451 + return;
117452 + case GIMPLE_PHI:
117453 + return walk_phi_set_conditions(visited, interesting_conditions, lhs);
117454 + case GIMPLE_ASSIGN:
117455 + if (gimple_num_ops(def_stmt) == 2) {
117456 + const_tree rhs = gimple_assign_rhs1(def_stmt);
117457 +
117458 + if (gimple_assign_cast_p(def_stmt))
117459 + interesting_conditions[CAST] = true;
117460 +
117461 + return set_conditions(visited, interesting_conditions, rhs);
117462 + } else {
117463 + interesting_conditions[NOT_UNARY] = true;
117464 + return;
117465 + }
117466 + default:
117467 + debug_gimple_stmt(def_stmt);
117468 + gcc_unreachable();
117469 + }
117470 +}
117471 +
117472 +// determine whether duplication will be necessary or not.
117473 +static void search_interesting_conditions(struct interesting_node *cur_node, bool *interesting_conditions)
117474 +{
117475 + struct pointer_set_t *visited;
117476 +
117477 + if (gimple_assign_cast_p(cur_node->first_stmt))
117478 + interesting_conditions[CAST] = true;
117479 + else if (is_gimple_assign(cur_node->first_stmt) && gimple_num_ops(cur_node->first_stmt) > 2)
117480 + interesting_conditions[NOT_UNARY] = true;
117481 +
117482 + visited = pointer_set_create();
117483 + set_conditions(visited, interesting_conditions, cur_node->node);
117484 + pointer_set_destroy(visited);
117485 +}
117486 +
117487 +// Remove the size_overflow asm stmt and create an assignment from the input and output of the asm
117488 +static void replace_size_overflow_asm_with_assign(gimple asm_stmt, tree lhs, tree rhs)
117489 +{
117490 + gimple assign;
117491 + gimple_stmt_iterator gsi;
117492 +
117493 + // already removed
117494 + if (gimple_bb(asm_stmt) == NULL)
117495 + return;
117496 + gsi = gsi_for_stmt(asm_stmt);
117497 +
117498 + assign = gimple_build_assign(lhs, rhs);
117499 + gsi_insert_before(&gsi, assign, GSI_SAME_STMT);
117500 + SSA_NAME_DEF_STMT(lhs) = assign;
117501 +
117502 + gsi_remove(&gsi, true);
117503 +}
117504 +
117505 +// Get the field decl of a component ref for intentional_overflow checking
117506 +static const_tree search_field_decl(const_tree comp_ref)
117507 +{
117508 + const_tree field = NULL_TREE;
117509 + unsigned int i, len = TREE_OPERAND_LENGTH(comp_ref);
117510 +
117511 + for (i = 0; i < len; i++) {
117512 + field = TREE_OPERAND(comp_ref, i);
117513 + if (TREE_CODE(field) == FIELD_DECL)
117514 + break;
117515 + }
117516 + gcc_assert(TREE_CODE(field) == FIELD_DECL);
117517 + return field;
117518 +}
117519 +
117520 +/* Get the fndecl of an interesting stmt, the fndecl is the caller function if the interesting
117521 + * stmt is a return otherwise it is the callee function.
117522 + */
117523 +static const_tree get_interesting_orig_fndecl(const_gimple stmt, unsigned int argnum)
117524 +{
117525 + const_tree fndecl;
117526 +
117527 + if (argnum == 0)
117528 + fndecl = current_function_decl;
117529 + else
117530 + fndecl = gimple_call_fndecl(stmt);
117531 +
117532 + if (fndecl == NULL_TREE)
117533 + return NULL_TREE;
117534 +
117535 + return DECL_ORIGIN(fndecl);
117536 +}
117537 +
117538 +/* Get the param of the intentional_overflow attribute.
117539 + * * 0: MARK_NOT_INTENTIONAL
117540 + * * 1..MAX_PARAM: MARK_YES
117541 + * * -1: MARK_TURN_OFF
117542 + */
117543 +static tree get_attribute_param(const_tree decl)
117544 +{
117545 + const_tree attr;
117546 +
117547 + if (decl == NULL_TREE)
117548 + return NULL_TREE;
117549 +
117550 + attr = lookup_attribute("intentional_overflow", DECL_ATTRIBUTES(decl));
117551 + if (!attr || !TREE_VALUE(attr))
117552 + return NULL_TREE;
117553 +
117554 + return TREE_VALUE(attr);
117555 +}
117556 +
117557 +// MARK_TURN_OFF
117558 +static bool is_turn_off_intentional_attr(const_tree decl)
117559 +{
117560 + const_tree param_head;
117561 +
117562 + param_head = get_attribute_param(decl);
117563 + if (param_head == NULL_TREE)
117564 + return false;
117565 +
117566 + if (TREE_INT_CST_HIGH(TREE_VALUE(param_head)) == -1)
117567 + return true;
117568 + return false;
117569 +}
117570 +
117571 +// MARK_NOT_INTENTIONAL
117572 +static bool is_end_intentional_intentional_attr(const_tree decl, unsigned int argnum)
117573 +{
117574 + const_tree param_head;
117575 +
117576 + if (argnum == 0)
117577 + return false;
117578 +
117579 + param_head = get_attribute_param(decl);
117580 + if (param_head == NULL_TREE)
117581 + return false;
117582 +
117583 + if (!TREE_INT_CST_LOW(TREE_VALUE(param_head)))
117584 + return true;
117585 + return false;
117586 +}
117587 +
117588 +// MARK_YES
117589 +static bool is_yes_intentional_attr(const_tree decl, unsigned int argnum)
117590 +{
117591 + tree param, param_head;
117592 +
117593 + if (argnum == 0)
117594 + return false;
117595 +
117596 + param_head = get_attribute_param(decl);
117597 + for (param = param_head; param; param = TREE_CHAIN(param))
117598 + if (argnum == TREE_INT_CST_LOW(TREE_VALUE(param)))
117599 + return true;
117600 + return false;
117601 +}
117602 +
117603 +static const char *get_asm_string(const_gimple stmt)
117604 +{
117605 + if (!stmt)
117606 + return NULL;
117607 + if (gimple_code(stmt) != GIMPLE_ASM)
117608 + return NULL;
117609 +
117610 + return gimple_asm_string(stmt);
117611 +}
117612 +
117613 +static bool is_size_overflow_intentional_asm_turn_off(const_gimple stmt)
117614 +{
117615 + const char *str;
117616 +
117617 + str = get_asm_string(stmt);
117618 + if (!str)
117619 + return false;
117620 + return !strncmp(str, TURN_OFF_ASM_STR, sizeof(TURN_OFF_ASM_STR) - 1);
117621 +}
117622 +
117623 +static bool is_size_overflow_intentional_asm_yes(const_gimple stmt)
117624 +{
117625 + const char *str;
117626 +
117627 + str = get_asm_string(stmt);
117628 + if (!str)
117629 + return false;
117630 + return !strncmp(str, YES_ASM_STR, sizeof(YES_ASM_STR) - 1);
117631 +}
117632 +
117633 +static bool is_size_overflow_asm(const_gimple stmt)
117634 +{
117635 + const char *str;
117636 +
117637 + str = get_asm_string(stmt);
117638 + if (!str)
117639 + return false;
117640 + return !strncmp(str, OK_ASM_STR, sizeof(OK_ASM_STR) - 1);
117641 +}
117642 +
117643 +static void print_missing_intentional(enum mark callee_attr, enum mark caller_attr, const_tree decl, unsigned int argnum)
117644 +{
117645 + location_t loc;
117646 +
117647 + if (caller_attr == MARK_NO || caller_attr == MARK_NOT_INTENTIONAL || caller_attr == MARK_TURN_OFF)
117648 + return;
117649 +
117650 + if (callee_attr == MARK_NOT_INTENTIONAL || callee_attr == MARK_YES)
117651 + return;
117652 +
117653 + loc = DECL_SOURCE_LOCATION(decl);
117654 + inform(loc, "The intentional_overflow attribute is missing from +%s+%u+", DECL_NAME_POINTER(decl), argnum);
117655 +}
117656 +
117657 +/* Get the type of the intentional_overflow attribute of a node
117658 + * * MARK_TURN_OFF
117659 + * * MARK_YES
117660 + * * MARK_NO
117661 + * * MARK_NOT_INTENTIONAL
117662 + */
117663 +static enum mark get_intentional_attr_type(const_tree node)
117664 +{
117665 + const_tree cur_decl;
117666 +
117667 + if (node == NULL_TREE)
117668 + return MARK_NO;
117669 +
117670 + switch (TREE_CODE(node)) {
117671 + case COMPONENT_REF:
117672 + cur_decl = search_field_decl(node);
117673 + if (is_turn_off_intentional_attr(cur_decl))
117674 + return MARK_TURN_OFF;
117675 + if (is_end_intentional_intentional_attr(cur_decl, 1))
117676 + return MARK_YES;
117677 + break;
117678 + case PARM_DECL: {
117679 + unsigned int argnum;
117680 +
117681 + cur_decl = DECL_ORIGIN(current_function_decl);
117682 + argnum = find_arg_number_tree(node, cur_decl);
117683 + if (argnum == CANNOT_FIND_ARG)
117684 + return MARK_NO;
117685 + if (is_yes_intentional_attr(cur_decl, argnum))
117686 + return MARK_YES;
117687 + if (is_end_intentional_intentional_attr(cur_decl, argnum))
117688 + return MARK_NOT_INTENTIONAL;
117689 + break;
117690 + }
117691 + case FUNCTION_DECL:
117692 + if (is_turn_off_intentional_attr(DECL_ORIGIN(node)))
117693 + return MARK_TURN_OFF;
117694 + break;
117695 + default:
117696 + break;
117697 + }
117698 + return MARK_NO;
117699 +}
117700 +
117701 +// Search for the intentional_overflow attribute on the last nodes
117702 +static enum mark search_last_nodes_intentional(struct interesting_node *cur_node)
117703 +{
117704 + unsigned int i;
117705 + tree last_node;
117706 + enum mark mark = MARK_NO;
117707 +
117708 +#if BUILDING_GCC_VERSION <= 4007
117709 + FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, last_node) {
117710 +#else
117711 + FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, last_node) {
117712 +#endif
117713 + mark = get_intentional_attr_type(last_node);
117714 + if (mark != MARK_NO)
117715 + break;
117716 + }
117717 + return mark;
117718 +}
117719 +
117720 +/* Check the intentional kind of size_overflow asm stmt (created by the gimple pass) and
117721 + * set the appropriate intentional_overflow type. Delete the asm stmt in the end.
117722 + */
117723 +static bool is_intentional_attribute_from_gimple(struct interesting_node *cur_node)
117724 +{
117725 + if (!cur_node->intentional_mark_from_gimple)
117726 + return false;
117727 +
117728 + if (is_size_overflow_intentional_asm_yes(cur_node->intentional_mark_from_gimple))
117729 + cur_node->intentional_attr_cur_fndecl = MARK_YES;
117730 + else
117731 + cur_node->intentional_attr_cur_fndecl = MARK_TURN_OFF;
117732 +
117733 + // skip param decls
117734 + if (gimple_asm_noutputs(cur_node->intentional_mark_from_gimple) == 0)
117735 + return true;
117736 + return true;
117737 +}
117738 +
117739 +/* Search intentional_overflow attribute on caller and on callee too.
117740 + * 0</MARK_YES: no dup, search size_overflow and intentional_overflow attributes
117741 + * 0/MARK_NOT_INTENTIONAL: no dup, search size_overflow attribute (int)
117742 + * -1/MARK_TURN_OFF: no dup, no search, current_function_decl -> no dup
117743 +*/
117744 +static void check_intentional_attribute_ipa(struct interesting_node *cur_node)
117745 +{
117746 + const_tree fndecl;
117747 +
117748 + if (is_intentional_attribute_from_gimple(cur_node))
117749 + return;
117750 +
117751 + if (is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl))) {
117752 + cur_node->intentional_attr_cur_fndecl = MARK_TURN_OFF;
117753 + return;
117754 + }
117755 +
117756 + if (gimple_code(cur_node->first_stmt) == GIMPLE_ASM) {
117757 + cur_node->intentional_attr_cur_fndecl = MARK_NOT_INTENTIONAL;
117758 + return;
117759 + }
117760 +
117761 + if (gimple_code(cur_node->first_stmt) == GIMPLE_ASSIGN)
117762 + return;
117763 +
117764 + fndecl = get_interesting_orig_fndecl(cur_node->first_stmt, cur_node->num);
117765 + if (is_turn_off_intentional_attr(fndecl)) {
117766 + cur_node->intentional_attr_decl = MARK_TURN_OFF;
117767 + return;
117768 + }
117769 +
117770 + if (is_end_intentional_intentional_attr(fndecl, cur_node->num))
117771 + cur_node->intentional_attr_decl = MARK_NOT_INTENTIONAL;
117772 + else if (is_yes_intentional_attr(fndecl, cur_node->num))
117773 + cur_node->intentional_attr_decl = MARK_YES;
117774 +
117775 + cur_node->intentional_attr_cur_fndecl = search_last_nodes_intentional(cur_node);
117776 + print_missing_intentional(cur_node->intentional_attr_decl, cur_node->intentional_attr_cur_fndecl, cur_node->fndecl, cur_node->num);
117777 +}
117778 +
117779 +// e.g., 3.8.2, 64, arch/x86/ia32/ia32_signal.c copy_siginfo_from_user32(): compat_ptr() u32 max
117780 +static bool skip_asm(const_tree arg)
117781 +{
117782 + gimple def_stmt = get_def_stmt(arg);
117783 +
117784 + if (!def_stmt || !gimple_assign_cast_p(def_stmt))
117785 + return false;
117786 +
117787 + def_stmt = get_def_stmt(gimple_assign_rhs1(def_stmt));
117788 + return def_stmt && gimple_code(def_stmt) == GIMPLE_ASM;
117789 +}
117790 +
117791 +static void walk_use_def_phi(struct pointer_set_t *visited, struct interesting_node *cur_node, tree result)
117792 +{
117793 + gimple phi = get_def_stmt(result);
117794 + unsigned int i, n = gimple_phi_num_args(phi);
117795 +
117796 + pointer_set_insert(visited, phi);
117797 + for (i = 0; i < n; i++) {
117798 + tree arg = gimple_phi_arg_def(phi, i);
117799 +
117800 + walk_use_def(visited, cur_node, arg);
117801 + }
117802 +}
117803 +
117804 +static void walk_use_def_binary(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs)
117805 +{
117806 + gimple def_stmt = get_def_stmt(lhs);
117807 + tree rhs1, rhs2;
117808 +
117809 + rhs1 = gimple_assign_rhs1(def_stmt);
117810 + rhs2 = gimple_assign_rhs2(def_stmt);
117811 +
117812 + walk_use_def(visited, cur_node, rhs1);
117813 + walk_use_def(visited, cur_node, rhs2);
117814 +}
117815 +
117816 +static void insert_last_node(struct interesting_node *cur_node, tree node)
117817 +{
117818 + unsigned int i;
117819 + tree element;
117820 + enum tree_code code;
117821 +
117822 + gcc_assert(node != NULL_TREE);
117823 +
117824 + if (is_gimple_constant(node))
117825 + return;
117826 +
117827 + code = TREE_CODE(node);
117828 + if (code == VAR_DECL) {
117829 + node = DECL_ORIGIN(node);
117830 + code = TREE_CODE(node);
117831 + }
117832 +
117833 + if (code != PARM_DECL && code != FUNCTION_DECL && code != COMPONENT_REF)
117834 + return;
117835 +
117836 +#if BUILDING_GCC_VERSION <= 4007
117837 + FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, element) {
117838 +#else
117839 + FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, element) {
117840 +#endif
117841 + if (operand_equal_p(node, element, 0))
117842 + return;
117843 + }
117844 +
117845 +#if BUILDING_GCC_VERSION <= 4007
117846 + gcc_assert(VEC_length(tree, cur_node->last_nodes) < VEC_LEN);
117847 + VEC_safe_push(tree, gc, cur_node->last_nodes, node);
117848 +#else
117849 + gcc_assert(cur_node->last_nodes->length() < VEC_LEN);
117850 + vec_safe_push(cur_node->last_nodes, node);
117851 +#endif
117852 +}
117853 +
117854 +// a size_overflow asm stmt in the control flow doesn't stop the recursion
117855 +static void handle_asm_stmt(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs, const_gimple stmt)
117856 +{
117857 + if (!is_size_overflow_asm(stmt))
117858 + walk_use_def(visited, cur_node, SSA_NAME_VAR(lhs));
117859 +}
117860 +
117861 +/* collect the parm_decls and fndecls (for checking a missing size_overflow attribute (ret or arg) or intentional_overflow)
117862 + * and component refs (for checking the intentional_overflow attribute).
117863 + */
117864 +static void walk_use_def(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs)
117865 +{
117866 + const_gimple def_stmt;
117867 +
117868 + if (TREE_CODE(lhs) != SSA_NAME) {
117869 + insert_last_node(cur_node, lhs);
117870 + return;
117871 + }
117872 +
117873 + def_stmt = get_def_stmt(lhs);
117874 + if (!def_stmt)
117875 + return;
117876 +
117877 + if (pointer_set_insert(visited, def_stmt))
117878 + return;
117879 +
117880 + switch (gimple_code(def_stmt)) {
117881 + case GIMPLE_NOP:
117882 + return walk_use_def(visited, cur_node, SSA_NAME_VAR(lhs));
117883 + case GIMPLE_ASM:
117884 + return handle_asm_stmt(visited, cur_node, lhs, def_stmt);
117885 + case GIMPLE_CALL: {
117886 + tree fndecl = gimple_call_fndecl(def_stmt);
117887 +
117888 + if (fndecl == NULL_TREE)
117889 + return;
117890 + insert_last_node(cur_node, fndecl);
117891 + return;
117892 + }
117893 + case GIMPLE_PHI:
117894 + return walk_use_def_phi(visited, cur_node, lhs);
117895 + case GIMPLE_ASSIGN:
117896 + switch (gimple_num_ops(def_stmt)) {
117897 + case 2:
117898 + return walk_use_def(visited, cur_node, gimple_assign_rhs1(def_stmt));
117899 + case 3:
117900 + return walk_use_def_binary(visited, cur_node, lhs);
117901 + }
117902 + default:
117903 + debug_gimple_stmt((gimple)def_stmt);
117904 + error("%s: unknown gimple code", __func__);
117905 + gcc_unreachable();
117906 + }
117907 +}
117908 +
117909 +// Collect all the last nodes for checking the intentional_overflow and size_overflow attributes
117910 +static void set_last_nodes(struct interesting_node *cur_node)
117911 +{
117912 + struct pointer_set_t *visited;
117913 +
117914 + visited = pointer_set_create();
117915 + walk_use_def(visited, cur_node, cur_node->node);
117916 + pointer_set_destroy(visited);
117917 +}
117918 +
117919 +enum precond {
117920 + NO_ATTRIBUTE_SEARCH, NO_CHECK_INSERT, NONE
117921 +};
117922 +
117923 +/* 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.
117924 + * There is only missing size_overflow attribute checking if the intentional_overflow attribute is the mark_no type.
117925 + * Stmt duplication is unnecessary if there are no binary/ternary assignements or if the unary assignment isn't a cast.
117926 + * It skips the possible error codes too. If the def_stmts trace back to a constant and there are no binary/ternary assigments then we assume that it is some kind of error code.
117927 + */
117928 +static enum precond check_preconditions(struct interesting_node *cur_node)
117929 +{
117930 + bool interesting_conditions[3] = {false, false, false};
117931 +
117932 + set_last_nodes(cur_node);
117933 +
117934 + check_intentional_attribute_ipa(cur_node);
117935 + if (cur_node->intentional_attr_decl == MARK_TURN_OFF || cur_node->intentional_attr_cur_fndecl == MARK_TURN_OFF)
117936 + return NO_ATTRIBUTE_SEARCH;
117937 +
117938 + search_interesting_conditions(cur_node, interesting_conditions);
117939 +
117940 + // error code
117941 + if (interesting_conditions[CAST] && interesting_conditions[FROM_CONST] && !interesting_conditions[NOT_UNARY])
117942 + return NO_ATTRIBUTE_SEARCH;
117943 +
117944 + // unnecessary overflow check
117945 + if (!interesting_conditions[CAST] && !interesting_conditions[NOT_UNARY])
117946 + return NO_CHECK_INSERT;
117947 +
117948 + if (cur_node->intentional_attr_cur_fndecl != MARK_NO)
117949 + return NO_CHECK_INSERT;
117950 +
117951 + return NONE;
117952 +}
117953 +
117954 +/* This function calls the main recursion function (expand) that duplicates the stmts. Before that it checks the intentional_overflow attribute and asm stmts,
117955 + * 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
117956 + * in the original stmt (first stmt) and it inserts the overflow check for the arg of the callee or for the return value.
117957 + */
117958 +static struct next_cgraph_node *handle_interesting_stmt(struct next_cgraph_node *cnodes, struct interesting_node *cur_node, struct cgraph_node *caller_node)
117959 +{
117960 + enum precond ret;
117961 + struct pointer_set_t *visited;
117962 + tree new_node, orig_node = cur_node->node;
117963 +
117964 + ret = check_preconditions(cur_node);
117965 + if (ret == NO_ATTRIBUTE_SEARCH)
117966 + return cnodes;
117967 +
117968 + cnodes = search_overflow_attribute(cnodes, cur_node);
117969 +
117970 + if (ret == NO_CHECK_INSERT)
117971 + return cnodes;
117972 +
117973 + visited = pointer_set_create();
117974 + new_node = expand(visited, caller_node, orig_node);
117975 + pointer_set_destroy(visited);
117976 +
117977 + if (new_node == NULL_TREE)
117978 + return cnodes;
117979 +
117980 + change_orig_node(cur_node, new_node);
117981 + check_size_overflow(caller_node, cur_node->first_stmt, TREE_TYPE(new_node), new_node, orig_node, BEFORE_STMT);
117982 +
117983 + return cnodes;
117984 +}
117985 +
117986 +// Check visited interesting nodes.
117987 +static bool is_in_interesting_node(struct interesting_node *head, const_gimple first_stmt, const_tree node, unsigned int num)
117988 +{
117989 + struct interesting_node *cur;
117990 +
117991 + for (cur = head; cur; cur = cur->next) {
117992 + if (!operand_equal_p(node, cur->node, 0))
117993 + continue;
117994 + if (num != cur->num)
117995 + continue;
117996 + if (first_stmt == cur->first_stmt)
117997 + return true;
117998 + }
117999 + return false;
118000 +}
118001 +
118002 +/* Create an interesting node. The ipa pass starts to duplicate from these stmts.
118003 + 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
118004 + 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
118005 + the intentional_overflow attribute check. They are collected by set_last_nodes().
118006 + num: arg count of a call stmt or 0 when it is a ret
118007 + node: the recursion starts from here, it is a call arg or a return value
118008 + 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.
118009 + intentional_attr_decl: intentional_overflow attribute of the callee function
118010 + intentional_attr_cur_fndecl: intentional_overflow attribute of the caller function
118011 + intentional_mark_from_gimple: the intentional overflow type of size_overflow asm stmt from gimple if it exists
118012 + */
118013 +static struct interesting_node *create_new_interesting_node(struct interesting_node *head, gimple first_stmt, tree node, unsigned int num, gimple asm_stmt)
118014 +{
118015 + struct interesting_node *new_node;
118016 + tree fndecl;
118017 + enum gimple_code code;
118018 +
118019 + gcc_assert(node != NULL_TREE);
118020 + code = gimple_code(first_stmt);
118021 + gcc_assert(code == GIMPLE_CALL || code == GIMPLE_ASM || code == GIMPLE_ASSIGN || code == GIMPLE_RETURN);
118022 +
118023 + if (num == CANNOT_FIND_ARG)
118024 + return head;
118025 +
118026 + if (skip_types(node))
118027 + return head;
118028 +
118029 + if (skip_asm(node))
118030 + return head;
118031 +
118032 + if (is_gimple_call(first_stmt))
118033 + fndecl = gimple_call_fndecl(first_stmt);
118034 + else
118035 + fndecl = current_function_decl;
118036 +
118037 + if (fndecl == NULL_TREE)
118038 + return head;
118039 +
118040 + if (is_in_interesting_node(head, first_stmt, node, num))
118041 + return head;
118042 +
118043 + new_node = (struct interesting_node *)xmalloc(sizeof(*new_node));
118044 +
118045 + new_node->next = NULL;
118046 + new_node->first_stmt = first_stmt;
118047 +#if BUILDING_GCC_VERSION <= 4007
118048 + new_node->last_nodes = VEC_alloc(tree, gc, VEC_LEN);
118049 +#else
118050 + vec_alloc(new_node->last_nodes, VEC_LEN);
118051 +#endif
118052 + new_node->num = num;
118053 + new_node->node = node;
118054 + new_node->fndecl = fndecl;
118055 + new_node->intentional_attr_decl = MARK_NO;
118056 + new_node->intentional_attr_cur_fndecl = MARK_NO;
118057 + new_node->intentional_mark_from_gimple = asm_stmt;
118058 +
118059 + if (!head)
118060 + return new_node;
118061 +
118062 + new_node->next = head;
118063 + return new_node;
118064 +}
118065 +
118066 +/* 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).
118067 + * If the ret stmt is in the next cgraph node list then it's an interesting ret.
118068 + */
118069 +static struct interesting_node *handle_stmt_by_cgraph_nodes_ret(struct interesting_node *head, gimple stmt, struct next_cgraph_node *next_node)
118070 +{
118071 + struct next_cgraph_node *cur_node;
118072 + tree ret = gimple_return_retval(stmt);
118073 +
118074 + if (ret == NULL_TREE)
118075 + return head;
118076 +
118077 + for (cur_node = next_node; cur_node; cur_node = cur_node->next) {
118078 + if (!operand_equal_p(cur_node->callee_fndecl, DECL_ORIGIN(current_function_decl), 0))
118079 + continue;
118080 + if (cur_node->num == 0)
118081 + head = create_new_interesting_node(head, stmt, ret, 0, NOT_INTENTIONAL_ASM);
118082 + }
118083 +
118084 + return head;
118085 +}
118086 +
118087 +/* 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).
118088 + * If the call stmt is in the next cgraph node list then it's an interesting call.
118089 + */
118090 +static struct interesting_node *handle_stmt_by_cgraph_nodes_call(struct interesting_node *head, gimple stmt, struct next_cgraph_node *next_node)
118091 +{
118092 + unsigned int argnum;
118093 + tree arg;
118094 + const_tree fndecl;
118095 + struct next_cgraph_node *cur_node;
118096 +
118097 + fndecl = gimple_call_fndecl(stmt);
118098 + if (fndecl == NULL_TREE)
118099 + return head;
118100 +
118101 + for (cur_node = next_node; cur_node; cur_node = cur_node->next) {
118102 + if (!operand_equal_p(cur_node->callee_fndecl, fndecl, 0))
118103 + continue;
118104 + argnum = get_correct_arg_count(cur_node->num, fndecl);
118105 + gcc_assert(argnum != CANNOT_FIND_ARG);
118106 + if (argnum == 0)
118107 + continue;
118108 +
118109 + arg = gimple_call_arg(stmt, argnum - 1);
118110 + head = create_new_interesting_node(head, stmt, arg, argnum, NOT_INTENTIONAL_ASM);
118111 + }
118112 +
118113 + return head;
118114 +}
118115 +
118116 +static unsigned int check_ops(const_tree orig_node, const_tree node, unsigned int ret_count)
118117 +{
118118 + if (!operand_equal_p(orig_node, node, 0))
118119 + return WRONG_NODE;
118120 + if (skip_types(node))
118121 + return WRONG_NODE;
118122 + return ret_count;
118123 +}
118124 +
118125 +// Get the index of the rhs node in an assignment
118126 +static unsigned int get_assign_ops_count(const_gimple stmt, tree node)
118127 +{
118128 + const_tree rhs1, rhs2;
118129 + unsigned int ret;
118130 +
118131 + gcc_assert(stmt);
118132 + gcc_assert(is_gimple_assign(stmt));
118133 +
118134 + rhs1 = gimple_assign_rhs1(stmt);
118135 + gcc_assert(rhs1 != NULL_TREE);
118136 +
118137 + switch (gimple_num_ops(stmt)) {
118138 + case 2:
118139 + return check_ops(node, rhs1, 1);
118140 + case 3:
118141 + ret = check_ops(node, rhs1, 1);
118142 + if (ret != WRONG_NODE)
118143 + return ret;
118144 +
118145 + rhs2 = gimple_assign_rhs2(stmt);
118146 + gcc_assert(rhs2 != NULL_TREE);
118147 + return check_ops(node, rhs2, 2);
118148 + default:
118149 + gcc_unreachable();
118150 + }
118151 +}
118152 +
118153 +// Find the correct arg number of a call stmt. It is needed when the interesting function is a cloned function.
118154 +static unsigned int find_arg_number_gimple(const_tree arg, const_gimple stmt)
118155 +{
118156 + unsigned int i;
118157 +
118158 + if (gimple_call_fndecl(stmt) == NULL_TREE)
118159 + return CANNOT_FIND_ARG;
118160 +
118161 + for (i = 0; i < gimple_call_num_args(stmt); i++) {
118162 + tree node;
118163 +
118164 + node = gimple_call_arg(stmt, i);
118165 + if (!operand_equal_p(arg, node, 0))
118166 + continue;
118167 + if (!skip_types(node))
118168 + return i + 1;
118169 + }
118170 +
118171 + return CANNOT_FIND_ARG;
118172 +}
118173 +
118174 +/* starting from the size_overflow asm stmt collect interesting stmts. They can be
118175 + * any of return, call or assignment stmts (because of inlining).
118176 + */
118177 +static struct interesting_node *get_interesting_ret_or_call(struct pointer_set_t *visited, struct interesting_node *head, tree node, gimple intentional_asm)
118178 +{
118179 + use_operand_p use_p;
118180 + imm_use_iterator imm_iter;
118181 + unsigned int argnum;
118182 +
118183 + gcc_assert(TREE_CODE(node) == SSA_NAME);
118184 +
118185 + if (pointer_set_insert(visited, node))
118186 + return head;
118187 +
118188 + FOR_EACH_IMM_USE_FAST(use_p, imm_iter, node) {
118189 + gimple stmt = USE_STMT(use_p);
118190 +
118191 + if (stmt == NULL)
118192 + return head;
118193 + if (is_gimple_debug(stmt))
118194 + continue;
118195 +
118196 + switch (gimple_code(stmt)) {
118197 + case GIMPLE_CALL:
118198 + argnum = find_arg_number_gimple(node, stmt);
118199 + head = create_new_interesting_node(head, stmt, node, argnum, intentional_asm);
118200 + break;
118201 + case GIMPLE_RETURN:
118202 + head = create_new_interesting_node(head, stmt, node, 0, intentional_asm);
118203 + break;
118204 + case GIMPLE_ASSIGN:
118205 + argnum = get_assign_ops_count(stmt, node);
118206 + head = create_new_interesting_node(head, stmt, node, argnum, intentional_asm);
118207 + break;
118208 + case GIMPLE_PHI: {
118209 + tree result = gimple_phi_result(stmt);
118210 + head = get_interesting_ret_or_call(visited, head, result, intentional_asm);
118211 + break;
118212 + }
118213 + case GIMPLE_ASM:
118214 + if (gimple_asm_noutputs(stmt) != 0)
118215 + break;
118216 + if (!is_size_overflow_asm(stmt))
118217 + break;
118218 + head = create_new_interesting_node(head, stmt, node, 1, intentional_asm);
118219 + break;
118220 + case GIMPLE_COND:
118221 + case GIMPLE_SWITCH:
118222 + break;
118223 + default:
118224 + debug_gimple_stmt(stmt);
118225 + gcc_unreachable();
118226 + break;
118227 + }
118228 + }
118229 + return head;
118230 +}
118231 +
118232 +static void remove_size_overflow_asm(gimple stmt)
118233 +{
118234 + gimple_stmt_iterator gsi;
118235 + tree input, output;
118236 +
118237 + if (!is_size_overflow_asm(stmt))
118238 + return;
118239 +
118240 + if (gimple_asm_noutputs(stmt) == 0) {
118241 + gsi = gsi_for_stmt(stmt);
118242 + ipa_remove_stmt_references(cgraph_get_create_node(current_function_decl), stmt);
118243 + gsi_remove(&gsi, true);
118244 + return;
118245 + }
118246 +
118247 + input = gimple_asm_input_op(stmt, 0);
118248 + output = gimple_asm_output_op(stmt, 0);
118249 + replace_size_overflow_asm_with_assign(stmt, TREE_VALUE(output), TREE_VALUE(input));
118250 +}
118251 +
118252 +/* handle the size_overflow asm stmts from the gimple pass and collect the interesting stmts.
118253 + * If the asm stmt is a parm_decl kind (noutputs == 0) then remove it.
118254 + * If it is a simple asm stmt then replace it with an assignment from the asm input to the asm output.
118255 + */
118256 +static struct interesting_node *handle_stmt_by_size_overflow_asm(gimple stmt, struct interesting_node *head)
118257 +{
118258 + const_tree output;
118259 + struct pointer_set_t *visited;
118260 + gimple intentional_asm = NOT_INTENTIONAL_ASM;
118261 +
118262 + if (!is_size_overflow_asm(stmt))
118263 + return head;
118264 +
118265 + if (is_size_overflow_intentional_asm_yes(stmt) || is_size_overflow_intentional_asm_turn_off(stmt))
118266 + intentional_asm = stmt;
118267 +
118268 + gcc_assert(gimple_asm_ninputs(stmt) == 1);
118269 +
118270 + if (gimple_asm_noutputs(stmt) == 0 && is_size_overflow_intentional_asm_turn_off(stmt))
118271 + return head;
118272 +
118273 + if (gimple_asm_noutputs(stmt) == 0) {
118274 + const_tree input;
118275 +
118276 + if (!is_size_overflow_intentional_asm_turn_off(stmt))
118277 + return head;
118278 +
118279 + input = gimple_asm_input_op(stmt, 0);
118280 + remove_size_overflow_asm(stmt);
118281 + if (is_gimple_constant(TREE_VALUE(input)))
118282 + return head;
118283 + visited = pointer_set_create();
118284 + head = get_interesting_ret_or_call(visited, head, TREE_VALUE(input), intentional_asm);
118285 + pointer_set_destroy(visited);
118286 + return head;
118287 + }
118288 +
118289 + if (!is_size_overflow_intentional_asm_yes(stmt) && !is_size_overflow_intentional_asm_turn_off(stmt))
118290 + remove_size_overflow_asm(stmt);
118291 +
118292 + visited = pointer_set_create();
118293 + output = gimple_asm_output_op(stmt, 0);
118294 + head = get_interesting_ret_or_call(visited, head, TREE_VALUE(output), intentional_asm);
118295 + pointer_set_destroy(visited);
118296 + return head;
118297 +}
118298 +
118299 +/* Iterate over all the stmts of a function and look for the size_overflow asm stmts (they were created in the gimple pass)
118300 + * or a call stmt or a return stmt and store them in the interesting_node list
118301 + */
118302 +static struct interesting_node *collect_interesting_stmts(struct next_cgraph_node *next_node)
118303 +{
118304 + basic_block bb;
118305 + struct interesting_node *head = NULL;
118306 +
118307 + FOR_ALL_BB_FN(bb, cfun) {
118308 + gimple_stmt_iterator gsi;
118309 +
118310 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
118311 + enum gimple_code code;
118312 + gimple stmt = gsi_stmt(gsi);
118313 +
118314 + code = gimple_code(stmt);
118315 +
118316 + if (code == GIMPLE_ASM)
118317 + head = handle_stmt_by_size_overflow_asm(stmt, head);
118318 +
118319 + if (!next_node)
118320 + continue;
118321 + if (code == GIMPLE_CALL)
118322 + head = handle_stmt_by_cgraph_nodes_call(head, stmt, next_node);
118323 + if (code == GIMPLE_RETURN)
118324 + head = handle_stmt_by_cgraph_nodes_ret(head, stmt, next_node);
118325 + }
118326 + }
118327 + return head;
118328 +}
118329 +
118330 +static void set_current_function_decl(tree fndecl)
118331 +{
118332 + gcc_assert(fndecl != NULL_TREE);
118333 +
118334 + push_cfun(DECL_STRUCT_FUNCTION(fndecl));
118335 + calculate_dominance_info(CDI_DOMINATORS);
118336 + current_function_decl = fndecl;
118337 +}
118338 +
118339 +static void unset_current_function_decl(void)
118340 +{
118341 + free_dominance_info(CDI_DOMINATORS);
118342 + pop_cfun();
118343 + current_function_decl = NULL_TREE;
118344 +}
118345 +
118346 +static void free_interesting_node(struct interesting_node *head)
118347 +{
118348 + struct interesting_node *cur;
118349 +
118350 + while (head) {
118351 + cur = head->next;
118352 +#if BUILDING_GCC_VERSION <= 4007
118353 + VEC_free(tree, gc, head->last_nodes);
118354 +#else
118355 + vec_free(head->last_nodes);
118356 +#endif
118357 + free(head);
118358 + head = cur;
118359 + }
118360 +}
118361 +
118362 +static struct visited *insert_visited_function(struct visited *head, struct interesting_node *cur_node)
118363 +{
118364 + struct visited *new_visited;
118365 +
118366 + new_visited = (struct visited *)xmalloc(sizeof(*new_visited));
118367 + new_visited->fndecl = cur_node->fndecl;
118368 + new_visited->num = cur_node->num;
118369 + new_visited->next = NULL;
118370 +
118371 + if (!head)
118372 + return new_visited;
118373 +
118374 + new_visited->next = head;
118375 + return new_visited;
118376 +}
118377 +
118378 +/* Check whether the function was already visited. If the fndecl, the arg count of the fndecl and the first_stmt (call or return) are same then
118379 + * it is a visited function.
118380 + */
118381 +static bool is_visited_function(struct visited *head, struct interesting_node *cur_node)
118382 +{
118383 + struct visited *cur;
118384 +
118385 + if (!head)
118386 + return false;
118387 +
118388 + if (get_stmt_flag(cur_node->first_stmt) != VISITED_STMT)
118389 + return false;
118390 +
118391 + for (cur = head; cur; cur = cur->next) {
118392 + if (!operand_equal_p(cur_node->fndecl, cur->fndecl, 0))
118393 + continue;
118394 + if (cur_node->num == cur->num)
118395 + return true;
118396 + }
118397 + return false;
118398 +}
118399 +
118400 +static void free_next_cgraph_node(struct next_cgraph_node *head)
118401 +{
118402 + struct next_cgraph_node *cur;
118403 +
118404 + while (head) {
118405 + cur = head->next;
118406 + free(head);
118407 + head = cur;
118408 + }
118409 +}
118410 +
118411 +static void remove_all_size_overflow_asm(void)
118412 +{
118413 + basic_block bb;
118414 +
118415 + FOR_ALL_BB_FN(bb, cfun) {
118416 + gimple_stmt_iterator si;
118417 +
118418 + for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
118419 + remove_size_overflow_asm(gsi_stmt(si));
118420 + }
118421 +}
118422 +
118423 +/* Main recursive walk of the ipa pass: iterate over the collected interesting stmts in a function
118424 + * (they are interesting if they have an associated size_overflow asm stmt) and recursively walk
118425 + * the newly collected interesting functions (they are interesting if there is control flow between
118426 + * the interesting stmts and them).
118427 + */
118428 +static struct visited *handle_function(struct cgraph_node *node, struct next_cgraph_node *next_node, struct visited *visited)
118429 +{
118430 + struct interesting_node *head, *cur_node;
118431 + struct next_cgraph_node *cur_cnodes, *cnodes_head = NULL;
118432 +
118433 + set_current_function_decl(NODE_DECL(node));
118434 + call_count = 0;
118435 +
118436 + head = collect_interesting_stmts(next_node);
118437 +
118438 + for (cur_node = head; cur_node; cur_node = cur_node->next) {
118439 + if (is_visited_function(visited, cur_node))
118440 + continue;
118441 + cnodes_head = handle_interesting_stmt(cnodes_head, cur_node, node);
118442 + set_stmt_flag(cur_node->first_stmt, VISITED_STMT);
118443 + visited = insert_visited_function(visited, cur_node);
118444 + }
118445 +
118446 + free_interesting_node(head);
118447 + remove_all_size_overflow_asm();
118448 + unset_current_function_decl();
118449 +
118450 + for (cur_cnodes = cnodes_head; cur_cnodes; cur_cnodes = cur_cnodes->next)
118451 + visited = handle_function(cur_cnodes->current_function, cur_cnodes, visited);
118452 +
118453 + free_next_cgraph_node(cnodes_head);
118454 + return visited;
118455 +}
118456 +
118457 +static void free_visited(struct visited *head)
118458 +{
118459 + struct visited *cur;
118460 +
118461 + while (head) {
118462 + cur = head->next;
118463 + free(head);
118464 + head = cur;
118465 + }
118466 +}
118467 +
118468 +// erase the local flag
118469 +static void set_plf_false(void)
118470 +{
118471 + basic_block bb;
118472 +
118473 + FOR_ALL_BB_FN(bb, cfun) {
118474 + gimple_stmt_iterator si;
118475 +
118476 + for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
118477 + set_stmt_flag(gsi_stmt(si), NO_FLAGS);
118478 + for (si = gsi_start_phis(bb); !gsi_end_p(si); gsi_next(&si))
118479 + set_stmt_flag(gsi_stmt(si), NO_FLAGS);
118480 + }
118481 +}
118482 +
118483 +// Main entry point of the ipa pass: erases the plf flag of all stmts and iterates over all the functions
118484 +static unsigned int search_function(void)
118485 +{
118486 + struct cgraph_node *node;
118487 + struct visited *visited = NULL;
118488 +
118489 + FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) {
118490 + set_current_function_decl(NODE_DECL(node));
118491 + set_plf_false();
118492 + unset_current_function_decl();
118493 + }
118494 +
118495 + FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) {
118496 + gcc_assert(cgraph_function_flags_ready);
118497 +#if BUILDING_GCC_VERSION <= 4007
118498 + gcc_assert(node->reachable);
118499 +#endif
118500 +
118501 + visited = handle_function(node, NULL, visited);
118502 + }
118503 +
118504 + free_visited(visited);
118505 + return 0;
118506 +}
118507 +
118508 +#if BUILDING_GCC_VERSION >= 4009
118509 +static const struct pass_data ipa_pass_data = {
118510 +#else
118511 +static struct ipa_opt_pass_d ipa_pass = {
118512 + .pass = {
118513 +#endif
118514 + .type = SIMPLE_IPA_PASS,
118515 + .name = "size_overflow",
118516 +#if BUILDING_GCC_VERSION >= 4008
118517 + .optinfo_flags = OPTGROUP_NONE,
118518 +#endif
118519 +#if BUILDING_GCC_VERSION >= 4009
118520 + .has_gate = false,
118521 + .has_execute = true,
118522 +#else
118523 + .gate = NULL,
118524 + .execute = search_function,
118525 + .sub = NULL,
118526 + .next = NULL,
118527 + .static_pass_number = 0,
118528 +#endif
118529 + .tv_id = TV_NONE,
118530 + .properties_required = 0,
118531 + .properties_provided = 0,
118532 + .properties_destroyed = 0,
118533 + .todo_flags_start = 0,
118534 + .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,
118535 +#if BUILDING_GCC_VERSION < 4009
118536 + },
118537 + .generate_summary = NULL,
118538 + .write_summary = NULL,
118539 + .read_summary = NULL,
118540 +#if BUILDING_GCC_VERSION >= 4006
118541 + .write_optimization_summary = NULL,
118542 + .read_optimization_summary = NULL,
118543 +#endif
118544 + .stmt_fixup = NULL,
118545 + .function_transform_todo_flags_start = 0,
118546 + .function_transform = NULL,
118547 + .variable_transform = NULL,
118548 +#endif
118549 +};
118550 +
118551 +#if BUILDING_GCC_VERSION >= 4009
118552 +namespace {
118553 +class ipa_pass : public ipa_opt_pass_d {
118554 +public:
118555 + ipa_pass() : ipa_opt_pass_d(ipa_pass_data, g, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL) {}
118556 + unsigned int execute() { return search_function(); }
118557 +};
118558 +}
118559 +
118560 +static opt_pass *make_ipa_pass(void)
118561 +{
118562 + return new ipa_pass();
118563 +}
118564 +#else
118565 +static struct opt_pass *make_ipa_pass(void)
118566 +{
118567 + return &ipa_pass.pass;
118568 +}
118569 +#endif
118570 +
118571 +// data for the size_overflow asm stmt
118572 +struct asm_data {
118573 + gimple def_stmt;
118574 + tree input;
118575 + tree output;
118576 +};
118577 +
118578 +#if BUILDING_GCC_VERSION <= 4007
118579 +static VEC(tree, gc) *create_asm_io_list(tree string, tree io)
118580 +#else
118581 +static vec<tree, va_gc> *create_asm_io_list(tree string, tree io)
118582 +#endif
118583 +{
118584 + tree list;
118585 +#if BUILDING_GCC_VERSION <= 4007
118586 + VEC(tree, gc) *vec_list = NULL;
118587 +#else
118588 + vec<tree, va_gc> *vec_list = NULL;
118589 +#endif
118590 +
118591 + list = build_tree_list(NULL_TREE, string);
118592 + list = chainon(NULL_TREE, build_tree_list(list, io));
118593 +#if BUILDING_GCC_VERSION <= 4007
118594 + VEC_safe_push(tree, gc, vec_list, list);
118595 +#else
118596 + vec_safe_push(vec_list, list);
118597 +#endif
118598 + return vec_list;
118599 +}
118600 +
118601 +static void create_asm_stmt(const char *str, tree str_input, tree str_output, struct asm_data *asm_data)
118602 +{
118603 + gimple asm_stmt;
118604 + gimple_stmt_iterator gsi;
118605 +#if BUILDING_GCC_VERSION <= 4007
118606 + VEC(tree, gc) *input, *output = NULL;
118607 +#else
118608 + vec<tree, va_gc> *input, *output = NULL;
118609 +#endif
118610 +
118611 + input = create_asm_io_list(str_input, asm_data->input);
118612 +
118613 + if (asm_data->output)
118614 + output = create_asm_io_list(str_output, asm_data->output);
118615 +
118616 + asm_stmt = gimple_build_asm_vec(str, input, output, NULL, NULL);
118617 + gsi = gsi_for_stmt(asm_data->def_stmt);
118618 + gsi_insert_after(&gsi, asm_stmt, GSI_NEW_STMT);
118619 +
118620 + if (asm_data->output)
118621 + SSA_NAME_DEF_STMT(asm_data->output) = asm_stmt;
118622 +}
118623 +
118624 +static void replace_call_lhs(const struct asm_data *asm_data)
118625 +{
118626 + gimple_set_lhs(asm_data->def_stmt, asm_data->input);
118627 + update_stmt(asm_data->def_stmt);
118628 + SSA_NAME_DEF_STMT(asm_data->input) = asm_data->def_stmt;
118629 +}
118630 +
118631 +static enum mark search_intentional_phi(struct pointer_set_t *visited, const_tree result)
118632 +{
118633 + enum mark cur_fndecl_attr;
118634 + gimple phi = get_def_stmt(result);
118635 + unsigned int i, n = gimple_phi_num_args(phi);
118636 +
118637 + pointer_set_insert(visited, phi);
118638 + for (i = 0; i < n; i++) {
118639 + tree arg = gimple_phi_arg_def(phi, i);
118640 +
118641 + cur_fndecl_attr = search_intentional(visited, arg);
118642 + if (cur_fndecl_attr != MARK_NO)
118643 + return cur_fndecl_attr;
118644 + }
118645 + return MARK_NO;
118646 +}
118647 +
118648 +static enum mark search_intentional_binary(struct pointer_set_t *visited, const_tree lhs)
118649 +{
118650 + enum mark cur_fndecl_attr;
118651 + const_tree rhs1, rhs2;
118652 + gimple def_stmt = get_def_stmt(lhs);
118653 +
118654 + rhs1 = gimple_assign_rhs1(def_stmt);
118655 + rhs2 = gimple_assign_rhs2(def_stmt);
118656 +
118657 + cur_fndecl_attr = search_intentional(visited, rhs1);
118658 + if (cur_fndecl_attr != MARK_NO)
118659 + return cur_fndecl_attr;
118660 + return search_intentional(visited, rhs2);
118661 +}
118662 +
118663 +// Look up the intentional_overflow attribute on the caller and the callee functions.
118664 +static enum mark search_intentional(struct pointer_set_t *visited, const_tree lhs)
118665 +{
118666 + const_gimple def_stmt;
118667 +
118668 + if (TREE_CODE(lhs) != SSA_NAME)
118669 + return get_intentional_attr_type(lhs);
118670 +
118671 + def_stmt = get_def_stmt(lhs);
118672 + if (!def_stmt)
118673 + return MARK_NO;
118674 +
118675 + if (pointer_set_contains(visited, def_stmt))
118676 + return MARK_NO;
118677 +
118678 + switch (gimple_code(def_stmt)) {
118679 + case GIMPLE_NOP:
118680 + return search_intentional(visited, SSA_NAME_VAR(lhs));
118681 + case GIMPLE_ASM:
118682 + if (is_size_overflow_intentional_asm_turn_off(def_stmt))
118683 + return MARK_TURN_OFF;
118684 + return MARK_NO;
118685 + case GIMPLE_CALL:
118686 + return MARK_NO;
118687 + case GIMPLE_PHI:
118688 + return search_intentional_phi(visited, lhs);
118689 + case GIMPLE_ASSIGN:
118690 + switch (gimple_num_ops(def_stmt)) {
118691 + case 2:
118692 + return search_intentional(visited, gimple_assign_rhs1(def_stmt));
118693 + case 3:
118694 + return search_intentional_binary(visited, lhs);
118695 + }
118696 + case GIMPLE_RETURN:
118697 + return MARK_NO;
118698 + default:
118699 + debug_gimple_stmt((gimple)def_stmt);
118700 + error("%s: unknown gimple code", __func__);
118701 + gcc_unreachable();
118702 + }
118703 +}
118704 +
118705 +// Check the intentional_overflow attribute and create the asm comment string for the size_overflow asm stmt.
118706 +static enum mark check_intentional_attribute_gimple(const_tree arg, const_gimple stmt, unsigned int argnum)
118707 +{
118708 + const_tree fndecl;
118709 + struct pointer_set_t *visited;
118710 + enum mark cur_fndecl_attr, decl_attr = MARK_NO;
118711 +
118712 + fndecl = get_interesting_orig_fndecl(stmt, argnum);
118713 + if (is_end_intentional_intentional_attr(fndecl, argnum))
118714 + decl_attr = MARK_NOT_INTENTIONAL;
118715 + else if (is_yes_intentional_attr(fndecl, argnum))
118716 + decl_attr = MARK_YES;
118717 + else if (is_turn_off_intentional_attr(fndecl) || is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl))) {
118718 + return MARK_TURN_OFF;
118719 + }
118720 +
118721 + visited = pointer_set_create();
118722 + cur_fndecl_attr = search_intentional(visited, arg);
118723 + pointer_set_destroy(visited);
118724 +
118725 + switch (cur_fndecl_attr) {
118726 + case MARK_NO:
118727 + case MARK_TURN_OFF:
118728 + return cur_fndecl_attr;
118729 + default:
118730 + print_missing_intentional(decl_attr, cur_fndecl_attr, fndecl, argnum);
118731 + return MARK_YES;
118732 + }
118733 +}
118734 +
118735 +static void check_missing_size_overflow_attribute(tree var)
118736 +{
118737 + tree orig_fndecl;
118738 + unsigned int num;
118739 +
118740 + if (is_a_return_check(var))
118741 + orig_fndecl = DECL_ORIGIN(var);
118742 + else
118743 + orig_fndecl = DECL_ORIGIN(current_function_decl);
118744 +
118745 + num = get_function_num(var, orig_fndecl);
118746 + if (num == CANNOT_FIND_ARG)
118747 + return;
118748 +
118749 + is_missing_function(orig_fndecl, num);
118750 +}
118751 +
118752 +static void search_size_overflow_attribute_phi(struct pointer_set_t *visited, const_tree result)
118753 +{
118754 + gimple phi = get_def_stmt(result);
118755 + unsigned int i, n = gimple_phi_num_args(phi);
118756 +
118757 + pointer_set_insert(visited, phi);
118758 + for (i = 0; i < n; i++) {
118759 + tree arg = gimple_phi_arg_def(phi, i);
118760 +
118761 + search_size_overflow_attribute(visited, arg);
118762 + }
118763 +}
118764 +
118765 +static void search_size_overflow_attribute_binary(struct pointer_set_t *visited, const_tree lhs)
118766 +{
118767 + const_gimple def_stmt = get_def_stmt(lhs);
118768 + tree rhs1, rhs2;
118769 +
118770 + rhs1 = gimple_assign_rhs1(def_stmt);
118771 + rhs2 = gimple_assign_rhs2(def_stmt);
118772 +
118773 + search_size_overflow_attribute(visited, rhs1);
118774 + search_size_overflow_attribute(visited, rhs2);
118775 +}
118776 +
118777 +static void search_size_overflow_attribute(struct pointer_set_t *visited, tree lhs)
118778 +{
118779 + const_gimple def_stmt;
118780 +
118781 + if (TREE_CODE(lhs) == PARM_DECL) {
118782 + check_missing_size_overflow_attribute(lhs);
118783 + return;
118784 + }
118785 +
118786 + def_stmt = get_def_stmt(lhs);
118787 + if (!def_stmt)
118788 + return;
118789 +
118790 + if (pointer_set_insert(visited, def_stmt))
118791 + return;
118792 +
118793 + switch (gimple_code(def_stmt)) {
118794 + case GIMPLE_NOP:
118795 + return search_size_overflow_attribute(visited, SSA_NAME_VAR(lhs));
118796 + case GIMPLE_ASM:
118797 + return;
118798 + case GIMPLE_CALL: {
118799 + tree fndecl = gimple_call_fndecl(def_stmt);
118800 +
118801 + if (fndecl == NULL_TREE)
118802 + return;
118803 + check_missing_size_overflow_attribute(fndecl);
118804 + return;
118805 + }
118806 + case GIMPLE_PHI:
118807 + return search_size_overflow_attribute_phi(visited, lhs);
118808 + case GIMPLE_ASSIGN:
118809 + switch (gimple_num_ops(def_stmt)) {
118810 + case 2:
118811 + return search_size_overflow_attribute(visited, gimple_assign_rhs1(def_stmt));
118812 + case 3:
118813 + return search_size_overflow_attribute_binary(visited, lhs);
118814 + }
118815 + default:
118816 + debug_gimple_stmt((gimple)def_stmt);
118817 + error("%s: unknown gimple code", __func__);
118818 + gcc_unreachable();
118819 + }
118820 +}
118821 +
118822 +// Search missing entries in the hash table (invoked from the gimple pass)
118823 +static void search_missing_size_overflow_attribute_gimple(const_gimple stmt, unsigned int num)
118824 +{
118825 + tree fndecl = NULL_TREE;
118826 + tree lhs;
118827 + struct pointer_set_t *visited;
118828 +
118829 + if (is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl)))
118830 + return;
118831 +
118832 + if (num == 0) {
118833 + gcc_assert(gimple_code(stmt) == GIMPLE_RETURN);
118834 + lhs = gimple_return_retval(stmt);
118835 + } else {
118836 + gcc_assert(is_gimple_call(stmt));
118837 + lhs = gimple_call_arg(stmt, num - 1);
118838 + fndecl = gimple_call_fndecl(stmt);
118839 + }
118840 +
118841 + if (fndecl != NULL_TREE && is_turn_off_intentional_attr(DECL_ORIGIN(fndecl)))
118842 + return;
118843 +
118844 + visited = pointer_set_create();
118845 + search_size_overflow_attribute(visited, lhs);
118846 + pointer_set_destroy(visited);
118847 +}
118848 +
118849 +static void create_output_from_phi(gimple stmt, unsigned int argnum, struct asm_data *asm_data)
118850 +{
118851 + gimple_stmt_iterator gsi;
118852 + gimple assign;
118853 +
118854 + assign = gimple_build_assign(asm_data->input, asm_data->output);
118855 + gsi = gsi_for_stmt(stmt);
118856 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
118857 + asm_data->def_stmt = assign;
118858 +
118859 + asm_data->output = create_new_var(TREE_TYPE(asm_data->output));
118860 + asm_data->output = make_ssa_name(asm_data->output, stmt);
118861 + if (gimple_code(stmt) == GIMPLE_RETURN)
118862 + gimple_return_set_retval(stmt, asm_data->output);
118863 + else
118864 + gimple_call_set_arg(stmt, argnum - 1, asm_data->output);
118865 + update_stmt(stmt);
118866 +}
118867 +
118868 +static char *create_asm_comment(unsigned int argnum, const_gimple stmt , const char *mark_str)
118869 +{
118870 + const char *fn_name;
118871 + char *asm_comment;
118872 + unsigned int len;
118873 +
118874 + if (argnum == 0)
118875 + fn_name = DECL_NAME_POINTER(current_function_decl);
118876 + else
118877 + fn_name = DECL_NAME_POINTER(gimple_call_fndecl(stmt));
118878 +
118879 + len = asprintf(&asm_comment, "%s %s %u", mark_str, fn_name, argnum);
118880 + gcc_assert(len > 0);
118881 +
118882 + return asm_comment;
118883 +}
118884 +
118885 +static const char *convert_mark_to_str(enum mark mark)
118886 +{
118887 + switch (mark) {
118888 + case MARK_NO:
118889 + return OK_ASM_STR;
118890 + case MARK_YES:
118891 + case MARK_NOT_INTENTIONAL:
118892 + return YES_ASM_STR;
118893 + case MARK_TURN_OFF:
118894 + return TURN_OFF_ASM_STR;
118895 + }
118896 +
118897 + gcc_unreachable();
118898 +}
118899 +
118900 +/* Create the input of the size_overflow asm stmt.
118901 + * When the arg of the callee function is a parm_decl it creates this kind of size_overflow asm stmt:
118902 + * __asm__("# size_overflow MARK_YES" : : "rm" size_1(D));
118903 + * The input field in asm_data will be empty if there is no need for further size_overflow asm stmt insertion.
118904 + * otherwise create the input (for a phi stmt the output too) of the asm stmt.
118905 + */
118906 +static void create_asm_input(gimple stmt, unsigned int argnum, struct asm_data *asm_data)
118907 +{
118908 + if (!asm_data->def_stmt) {
118909 + asm_data->input = NULL_TREE;
118910 + return;
118911 + }
118912 +
118913 + asm_data->input = create_new_var(TREE_TYPE(asm_data->output));
118914 + asm_data->input = make_ssa_name(asm_data->input, asm_data->def_stmt);
118915 +
118916 + switch (gimple_code(asm_data->def_stmt)) {
118917 + case GIMPLE_ASSIGN:
118918 + case GIMPLE_CALL:
118919 + replace_call_lhs(asm_data);
118920 + break;
118921 + case GIMPLE_PHI:
118922 + create_output_from_phi(stmt, argnum, asm_data);
118923 + break;
118924 + case GIMPLE_NOP: {
118925 + enum mark mark;
118926 + const char *mark_str;
118927 + char *asm_comment;
118928 +
118929 + mark = check_intentional_attribute_gimple(asm_data->output, stmt, argnum);
118930 +
118931 + asm_data->input = asm_data->output;
118932 + asm_data->output = NULL;
118933 + asm_data->def_stmt = stmt;
118934 +
118935 + mark_str = convert_mark_to_str(mark);
118936 + asm_comment = create_asm_comment(argnum, stmt, mark_str);
118937 +
118938 + create_asm_stmt(asm_comment, build_string(2, "rm"), NULL, asm_data);
118939 + free(asm_comment);
118940 + asm_data->input = NULL_TREE;
118941 + break;
118942 + }
118943 + case GIMPLE_ASM:
118944 + if (is_size_overflow_asm(asm_data->def_stmt)) {
118945 + asm_data->input = NULL_TREE;
118946 + break;
118947 + }
118948 + default:
118949 + debug_gimple_stmt(asm_data->def_stmt);
118950 + gcc_unreachable();
118951 + }
118952 +}
118953 +
118954 +/* This is the gimple part of searching for a missing size_overflow attribute. If the intentional_overflow attribute type
118955 + * is of the right kind create the appropriate size_overflow asm stmts:
118956 + * __asm__("# size_overflow" : =rm" D.3344_8 : "0" cicus.4_16);
118957 + * __asm__("# size_overflow MARK_YES" : : "rm" size_1(D));
118958 + */
118959 +static void create_size_overflow_asm(gimple stmt, tree output_node, unsigned int argnum)
118960 +{
118961 + struct asm_data asm_data;
118962 + const char *mark_str;
118963 + char *asm_comment;
118964 + enum mark mark;
118965 +
118966 + if (is_gimple_constant(output_node))
118967 + return;
118968 +
118969 + asm_data.output = output_node;
118970 + mark = check_intentional_attribute_gimple(asm_data.output, stmt, argnum);
118971 + if (mark != MARK_TURN_OFF)
118972 + search_missing_size_overflow_attribute_gimple(stmt, argnum);
118973 +
118974 + asm_data.def_stmt = get_def_stmt(asm_data.output);
118975 + if (is_size_overflow_intentional_asm_turn_off(asm_data.def_stmt))
118976 + return;
118977 +
118978 + create_asm_input(stmt, argnum, &asm_data);
118979 + if (asm_data.input == NULL_TREE)
118980 + return;
118981 +
118982 + mark_str = convert_mark_to_str(mark);
118983 + asm_comment = create_asm_comment(argnum, stmt, mark_str);
118984 + create_asm_stmt(asm_comment, build_string(1, "0"), build_string(3, "=rm"), &asm_data);
118985 + free(asm_comment);
118986 +}
118987 +
118988 +// Insert an asm stmt with "MARK_TURN_OFF", "MARK_YES" or "MARK_NOT_INTENTIONAL".
118989 +static bool create_mark_asm(gimple stmt, enum mark mark)
118990 +{
118991 + struct asm_data asm_data;
118992 + const char *asm_str;
118993 +
118994 + switch (mark) {
118995 + case MARK_TURN_OFF:
118996 + asm_str = TURN_OFF_ASM_STR;
118997 + break;
118998 + case MARK_NOT_INTENTIONAL:
118999 + case MARK_YES:
119000 + asm_str = YES_ASM_STR;
119001 + break;
119002 + default:
119003 + gcc_unreachable();
119004 + }
119005 +
119006 + asm_data.def_stmt = stmt;
119007 + asm_data.output = gimple_call_lhs(stmt);
119008 +
119009 + if (asm_data.output == NULL_TREE) {
119010 + asm_data.input = gimple_call_arg(stmt, 0);
119011 + if (is_gimple_constant(asm_data.input))
119012 + return false;
119013 + asm_data.output = NULL;
119014 + create_asm_stmt(asm_str, build_string(2, "rm"), NULL, &asm_data);
119015 + return true;
119016 + }
119017 +
119018 + create_asm_input(stmt, 0, &asm_data);
119019 + gcc_assert(asm_data.input != NULL_TREE);
119020 +
119021 + create_asm_stmt(asm_str, build_string(1, "0"), build_string(3, "=rm"), &asm_data);
119022 + return true;
119023 +}
119024 +
119025 +static bool is_from_cast(const_tree node)
119026 +{
119027 + gimple def_stmt = get_def_stmt(node);
119028 +
119029 + if (!def_stmt)
119030 + return false;
119031 +
119032 + if (gimple_assign_cast_p(def_stmt))
119033 + return true;
119034 +
119035 + return false;
119036 +}
119037 +
119038 +// Skip duplication when there is a minus expr and the type of rhs1 or rhs2 is a pointer_type.
119039 +static bool skip_ptr_minus(gimple stmt)
119040 +{
119041 + const_tree rhs1, rhs2, ptr1_rhs, ptr2_rhs;
119042 +
119043 + if (gimple_assign_rhs_code(stmt) != MINUS_EXPR)
119044 + return false;
119045 +
119046 + rhs1 = gimple_assign_rhs1(stmt);
119047 + if (!is_from_cast(rhs1))
119048 + return false;
119049 +
119050 + rhs2 = gimple_assign_rhs2(stmt);
119051 + if (!is_from_cast(rhs2))
119052 + return false;
119053 +
119054 + ptr1_rhs = gimple_assign_rhs1(get_def_stmt(rhs1));
119055 + ptr2_rhs = gimple_assign_rhs1(get_def_stmt(rhs2));
119056 +
119057 + if (TREE_CODE(TREE_TYPE(ptr1_rhs)) != POINTER_TYPE && TREE_CODE(TREE_TYPE(ptr2_rhs)) != POINTER_TYPE)
119058 + return false;
119059 +
119060 + create_mark_asm(stmt, MARK_YES);
119061 + return true;
119062 +}
119063 +
119064 +static void walk_use_def_ptr(struct pointer_set_t *visited, const_tree lhs)
119065 +{
119066 + gimple def_stmt;
119067 +
119068 + def_stmt = get_def_stmt(lhs);
119069 + if (!def_stmt)
119070 + return;
119071 +
119072 + if (pointer_set_insert(visited, def_stmt))
119073 + return;
119074 +
119075 + switch (gimple_code(def_stmt)) {
119076 + case GIMPLE_NOP:
119077 + case GIMPLE_ASM:
119078 + case GIMPLE_CALL:
119079 + break;
119080 + case GIMPLE_PHI: {
119081 + unsigned int i, n = gimple_phi_num_args(def_stmt);
119082 +
119083 + pointer_set_insert(visited, def_stmt);
119084 +
119085 + for (i = 0; i < n; i++) {
119086 + tree arg = gimple_phi_arg_def(def_stmt, i);
119087 +
119088 + walk_use_def_ptr(visited, arg);
119089 + }
119090 + }
119091 + case GIMPLE_ASSIGN:
119092 + switch (gimple_num_ops(def_stmt)) {
119093 + case 2:
119094 + walk_use_def_ptr(visited, gimple_assign_rhs1(def_stmt));
119095 + return;
119096 + case 3:
119097 + if (skip_ptr_minus(def_stmt))
119098 + return;
119099 +
119100 + walk_use_def_ptr(visited, gimple_assign_rhs1(def_stmt));
119101 + walk_use_def_ptr(visited, gimple_assign_rhs2(def_stmt));
119102 + return;
119103 + default:
119104 + return;
119105 + }
119106 + default:
119107 + debug_gimple_stmt((gimple)def_stmt);
119108 + error("%s: unknown gimple code", __func__);
119109 + gcc_unreachable();
119110 + }
119111 +}
119112 +
119113 +// Look for a ptr - ptr expression (e.g., cpuset_common_file_read() s - page)
119114 +static void insert_mark_not_intentional_asm_at_ptr(const_tree arg)
119115 +{
119116 + struct pointer_set_t *visited;
119117 +
119118 + visited = pointer_set_create();
119119 + walk_use_def_ptr(visited, arg);
119120 + pointer_set_destroy(visited);
119121 +}
119122 +
119123 +// Determine the return value and insert the asm stmt to mark the return stmt.
119124 +static void insert_asm_ret(gimple stmt)
119125 +{
119126 + tree ret;
119127 +
119128 + ret = gimple_return_retval(stmt);
119129 + create_size_overflow_asm(stmt, ret, 0);
119130 +}
119131 +
119132 +// Determine the correct arg index and arg and insert the asm stmt to mark the stmt.
119133 +static void insert_asm_arg(gimple stmt, unsigned int orig_argnum)
119134 +{
119135 + tree arg;
119136 + unsigned int argnum;
119137 +
119138 + argnum = get_correct_arg_count(orig_argnum, gimple_call_fndecl(stmt));
119139 + gcc_assert(argnum != 0);
119140 + if (argnum == CANNOT_FIND_ARG)
119141 + return;
119142 +
119143 + arg = gimple_call_arg(stmt, argnum - 1);
119144 + gcc_assert(arg != NULL_TREE);
119145 +
119146 + // skip all ptr - ptr expressions
119147 + insert_mark_not_intentional_asm_at_ptr(arg);
119148 +
119149 + create_size_overflow_asm(stmt, arg, argnum);
119150 +}
119151 +
119152 +// If a function arg or the return value is marked by the size_overflow attribute then set its index in the array.
119153 +static void set_argnum_attribute(const_tree attr, bool *argnums)
119154 +{
119155 + unsigned int argnum;
119156 + tree attr_value;
119157 +
119158 + for (attr_value = TREE_VALUE(attr); attr_value; attr_value = TREE_CHAIN(attr_value)) {
119159 + argnum = TREE_INT_CST_LOW(TREE_VALUE(attr_value));
119160 + argnums[argnum] = true;
119161 + }
119162 +}
119163 +
119164 +// If a function arg or the return value is in the hash table then set its index in the array.
119165 +static void set_argnum_hash(tree fndecl, bool *argnums)
119166 +{
119167 + unsigned int num;
119168 + const struct size_overflow_hash *hash;
119169 +
119170 + hash = get_function_hash(DECL_ORIGIN(fndecl));
119171 + if (!hash)
119172 + return;
119173 +
119174 + for (num = 0; num <= MAX_PARAM; num++) {
119175 + if (!(hash->param & (1U << num)))
119176 + continue;
119177 +
119178 + argnums[num] = true;
119179 + }
119180 +}
119181 +
119182 +static bool is_all_the_argnums_empty(bool *argnums)
119183 +{
119184 + unsigned int i;
119185 +
119186 + for (i = 0; i <= MAX_PARAM; i++)
119187 + if (argnums[i])
119188 + return false;
119189 + return true;
119190 +}
119191 +
119192 +// Check whether the arguments or the return value of the function are in the hash table or are marked by the size_overflow attribute.
119193 +static void search_interesting_args(tree fndecl, bool *argnums)
119194 +{
119195 + const_tree attr;
119196 +
119197 + set_argnum_hash(fndecl, argnums);
119198 + if (!is_all_the_argnums_empty(argnums))
119199 + return;
119200 +
119201 + attr = lookup_attribute("size_overflow", DECL_ATTRIBUTES(fndecl));
119202 + if (attr && TREE_VALUE(attr))
119203 + set_argnum_attribute(attr, argnums);
119204 +}
119205 +
119206 +/*
119207 + * Look up the intentional_overflow attribute that turns off ipa based duplication
119208 + * on the callee function.
119209 + */
119210 +static bool is_mark_turn_off_attribute(gimple stmt)
119211 +{
119212 + enum mark mark;
119213 + const_tree fndecl = gimple_call_fndecl(stmt);
119214 +
119215 + mark = get_intentional_attr_type(DECL_ORIGIN(fndecl));
119216 + if (mark == MARK_TURN_OFF)
119217 + return true;
119218 + return false;
119219 +}
119220 +
119221 +// 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
119222 +static void handle_interesting_function(gimple stmt)
119223 +{
119224 + unsigned int argnum;
119225 + tree fndecl;
119226 + bool orig_argnums[MAX_PARAM + 1] = {false};
119227 +
119228 + if (gimple_call_num_args(stmt) == 0)
119229 + return;
119230 + fndecl = gimple_call_fndecl(stmt);
119231 + if (fndecl == NULL_TREE)
119232 + return;
119233 + fndecl = DECL_ORIGIN(fndecl);
119234 +
119235 + if (is_mark_turn_off_attribute(stmt)) {
119236 + create_mark_asm(stmt, MARK_TURN_OFF);
119237 + return;
119238 + }
119239 +
119240 + search_interesting_args(fndecl, orig_argnums);
119241 +
119242 + for (argnum = 1; argnum < MAX_PARAM; argnum++)
119243 + if (orig_argnums[argnum])
119244 + insert_asm_arg(stmt, argnum);
119245 +}
119246 +
119247 +// 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
119248 +static void handle_interesting_ret(gimple stmt)
119249 +{
119250 + bool orig_argnums[MAX_PARAM + 1] = {false};
119251 +
119252 + search_interesting_args(current_function_decl, orig_argnums);
119253 +
119254 + if (orig_argnums[0])
119255 + insert_asm_ret(stmt);
119256 +}
119257 +
119258 +// Iterate over all the stmts and search for call and return stmts and mark them if they're in the hash table
119259 +static unsigned int search_interesting_functions(void)
119260 +{
119261 + basic_block bb;
119262 +
119263 + FOR_ALL_BB_FN(bb, cfun) {
119264 + gimple_stmt_iterator gsi;
119265 +
119266 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
119267 + gimple stmt = gsi_stmt(gsi);
119268 +
119269 + if (is_size_overflow_asm(stmt))
119270 + continue;
119271 +
119272 + if (is_gimple_call(stmt))
119273 + handle_interesting_function(stmt);
119274 + else if (gimple_code(stmt) == GIMPLE_RETURN)
119275 + handle_interesting_ret(stmt);
119276 + }
119277 + }
119278 + return 0;
119279 +}
119280 +
119281 +/*
119282 + * A lot of functions get inlined before the ipa passes so after the build_ssa gimple pass
119283 + * this pass inserts asm stmts to mark the interesting args
119284 + * that the ipa pass will detect and insert the size overflow checks for.
119285 + */
119286 +#if BUILDING_GCC_VERSION >= 4009
119287 +static const struct pass_data insert_size_overflow_asm_pass_data = {
119288 +#else
119289 +static struct gimple_opt_pass insert_size_overflow_asm_pass = {
119290 + .pass = {
119291 +#endif
119292 + .type = GIMPLE_PASS,
119293 + .name = "insert_size_overflow_asm",
119294 +#if BUILDING_GCC_VERSION >= 4008
119295 + .optinfo_flags = OPTGROUP_NONE,
119296 +#endif
119297 +#if BUILDING_GCC_VERSION >= 4009
119298 + .has_gate = false,
119299 + .has_execute = true,
119300 +#else
119301 + .gate = NULL,
119302 + .execute = search_interesting_functions,
119303 + .sub = NULL,
119304 + .next = NULL,
119305 + .static_pass_number = 0,
119306 +#endif
119307 + .tv_id = TV_NONE,
119308 + .properties_required = PROP_cfg,
119309 + .properties_provided = 0,
119310 + .properties_destroyed = 0,
119311 + .todo_flags_start = 0,
119312 + .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
119313 +#if BUILDING_GCC_VERSION < 4009
119314 + }
119315 +#endif
119316 +};
119317 +
119318 +#if BUILDING_GCC_VERSION >= 4009
119319 +namespace {
119320 +class insert_size_overflow_asm_pass : public gimple_opt_pass {
119321 +public:
119322 + insert_size_overflow_asm_pass() : gimple_opt_pass(insert_size_overflow_asm_pass_data, g) {}
119323 + unsigned int execute() { return search_interesting_functions(); }
119324 +};
119325 +}
119326 +
119327 +static opt_pass *make_insert_size_overflow_asm_pass(void)
119328 +{
119329 + return new insert_size_overflow_asm_pass();
119330 +}
119331 +#else
119332 +static struct opt_pass *make_insert_size_overflow_asm_pass(void)
119333 +{
119334 + return &insert_size_overflow_asm_pass.pass;
119335 +}
119336 +#endif
119337 +
119338 +// Create the noreturn report_size_overflow() function decl.
119339 +static void size_overflow_start_unit(void __unused *gcc_data, void __unused *user_data)
119340 +{
119341 + tree const_char_ptr_type_node;
119342 + tree fntype;
119343 +
119344 + const_char_ptr_type_node = build_pointer_type(build_type_variant(char_type_node, 1, 0));
119345 +
119346 + // void report_size_overflow(const char *loc_file, unsigned int loc_line, const char *current_func, const char *ssa_var)
119347 + fntype = build_function_type_list(void_type_node,
119348 + const_char_ptr_type_node,
119349 + unsigned_type_node,
119350 + const_char_ptr_type_node,
119351 + const_char_ptr_type_node,
119352 + NULL_TREE);
119353 + report_size_overflow_decl = build_fn_decl("report_size_overflow", fntype);
119354 +
119355 + DECL_ASSEMBLER_NAME(report_size_overflow_decl);
119356 + TREE_PUBLIC(report_size_overflow_decl) = 1;
119357 + DECL_EXTERNAL(report_size_overflow_decl) = 1;
119358 + DECL_ARTIFICIAL(report_size_overflow_decl) = 1;
119359 + TREE_THIS_VOLATILE(report_size_overflow_decl) = 1;
119360 +}
119361 +
119362 +static unsigned int dump_functions(void)
119363 +{
119364 + struct cgraph_node *node;
119365 +
119366 + FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) {
119367 + basic_block bb;
119368 +
119369 + push_cfun(DECL_STRUCT_FUNCTION(NODE_DECL(node)));
119370 + current_function_decl = NODE_DECL(node);
119371 +
119372 + fprintf(stderr, "-----------------------------------------\n%s\n-----------------------------------------\n", DECL_NAME_POINTER(current_function_decl));
119373 +
119374 + FOR_ALL_BB_FN(bb, cfun) {
119375 + gimple_stmt_iterator si;
119376 +
119377 + fprintf(stderr, "<bb %u>:\n", bb->index);
119378 + for (si = gsi_start_phis(bb); !gsi_end_p(si); gsi_next(&si))
119379 + debug_gimple_stmt(gsi_stmt(si));
119380 + for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
119381 + debug_gimple_stmt(gsi_stmt(si));
119382 + fprintf(stderr, "\n");
119383 + }
119384 +
119385 + fprintf(stderr, "-------------------------------------------------------------------------\n");
119386 +
119387 + pop_cfun();
119388 + current_function_decl = NULL_TREE;
119389 + }
119390 +
119391 + fprintf(stderr, "###############################################################################\n");
119392 +
119393 + return 0;
119394 +}
119395 +
119396 +#if BUILDING_GCC_VERSION >= 4009
119397 +static const struct pass_data dump_pass_data = {
119398 +#else
119399 +static struct ipa_opt_pass_d dump_pass = {
119400 + .pass = {
119401 +#endif
119402 + .type = SIMPLE_IPA_PASS,
119403 + .name = "dump",
119404 +#if BUILDING_GCC_VERSION >= 4008
119405 + .optinfo_flags = OPTGROUP_NONE,
119406 +#endif
119407 +#if BUILDING_GCC_VERSION >= 4009
119408 + .has_gate = false,
119409 + .has_execute = true,
119410 +#else
119411 + .gate = NULL,
119412 + .execute = dump_functions,
119413 + .sub = NULL,
119414 + .next = NULL,
119415 + .static_pass_number = 0,
119416 +#endif
119417 + .tv_id = TV_NONE,
119418 + .properties_required = 0,
119419 + .properties_provided = 0,
119420 + .properties_destroyed = 0,
119421 + .todo_flags_start = 0,
119422 + .todo_flags_finish = 0,
119423 +#if BUILDING_GCC_VERSION < 4009
119424 + },
119425 + .generate_summary = NULL,
119426 + .write_summary = NULL,
119427 + .read_summary = NULL,
119428 +#if BUILDING_GCC_VERSION >= 4006
119429 + .write_optimization_summary = NULL,
119430 + .read_optimization_summary = NULL,
119431 +#endif
119432 + .stmt_fixup = NULL,
119433 + .function_transform_todo_flags_start = 0,
119434 + .function_transform = NULL,
119435 + .variable_transform = NULL,
119436 +#endif
119437 +};
119438 +
119439 +#if BUILDING_GCC_VERSION >= 4009
119440 +namespace {
119441 +class dump_pass : public ipa_opt_pass_d {
119442 +public:
119443 + dump_pass() : ipa_opt_pass_d(dump_pass_data, g, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL) {}
119444 + unsigned int execute() { return dump_functions(); }
119445 +};
119446 +}
119447 +
119448 +static opt_pass *make_dump_pass(void)
119449 +{
119450 + return new dump_pass();
119451 +}
119452 +#else
119453 +static struct opt_pass *make_dump_pass(void)
119454 +{
119455 + return &dump_pass.pass;
119456 +}
119457 +#endif
119458 +
119459 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
119460 +{
119461 + int i;
119462 + const char * const plugin_name = plugin_info->base_name;
119463 + const int argc = plugin_info->argc;
119464 + const struct plugin_argument * const argv = plugin_info->argv;
119465 + bool enable = true;
119466 + struct register_pass_info insert_size_overflow_asm_pass_info;
119467 + struct register_pass_info __unused dump_before_pass_info;
119468 + struct register_pass_info __unused dump_after_pass_info;
119469 + struct register_pass_info ipa_pass_info;
119470 + static const struct ggc_root_tab gt_ggc_r_gt_size_overflow[] = {
119471 + {
119472 + .base = &report_size_overflow_decl,
119473 + .nelt = 1,
119474 + .stride = sizeof(report_size_overflow_decl),
119475 + .cb = &gt_ggc_mx_tree_node,
119476 + .pchw = &gt_pch_nx_tree_node
119477 + },
119478 + LAST_GGC_ROOT_TAB
119479 + };
119480 +
119481 + insert_size_overflow_asm_pass_info.pass = make_insert_size_overflow_asm_pass();
119482 + insert_size_overflow_asm_pass_info.reference_pass_name = "ssa";
119483 + insert_size_overflow_asm_pass_info.ref_pass_instance_number = 1;
119484 + insert_size_overflow_asm_pass_info.pos_op = PASS_POS_INSERT_AFTER;
119485 +
119486 + dump_before_pass_info.pass = make_dump_pass();
119487 + dump_before_pass_info.reference_pass_name = "increase_alignment";
119488 + dump_before_pass_info.ref_pass_instance_number = 1;
119489 + dump_before_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
119490 +
119491 + ipa_pass_info.pass = make_ipa_pass();
119492 + ipa_pass_info.reference_pass_name = "increase_alignment";
119493 + ipa_pass_info.ref_pass_instance_number = 1;
119494 + ipa_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
119495 +
119496 + dump_after_pass_info.pass = make_dump_pass();
119497 + dump_after_pass_info.reference_pass_name = "increase_alignment";
119498 + dump_after_pass_info.ref_pass_instance_number = 1;
119499 + dump_after_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
119500 +
119501 + if (!plugin_default_version_check(version, &gcc_version)) {
119502 + error(G_("incompatible gcc/plugin versions"));
119503 + return 1;
119504 + }
119505 +
119506 + for (i = 0; i < argc; ++i) {
119507 + if (!strcmp(argv[i].key, "no-size-overflow")) {
119508 + enable = false;
119509 + continue;
119510 + }
119511 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
119512 + }
119513 +
119514 + register_callback(plugin_name, PLUGIN_INFO, NULL, &size_overflow_plugin_info);
119515 + if (enable) {
119516 + register_callback(plugin_name, PLUGIN_START_UNIT, &size_overflow_start_unit, NULL);
119517 + register_callback(plugin_name, PLUGIN_REGISTER_GGC_ROOTS, NULL, (void *)&gt_ggc_r_gt_size_overflow);
119518 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &insert_size_overflow_asm_pass_info);
119519 +// register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dump_before_pass_info);
119520 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &ipa_pass_info);
119521 +// register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dump_after_pass_info);
119522 + }
119523 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
119524 +
119525 + return 0;
119526 +}
119527 diff --git a/tools/gcc/stackleak_plugin.c b/tools/gcc/stackleak_plugin.c
119528 new file mode 100644
119529 index 0000000..dd94983
119530 --- /dev/null
119531 +++ b/tools/gcc/stackleak_plugin.c
119532 @@ -0,0 +1,376 @@
119533 +/*
119534 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
119535 + * Licensed under the GPL v2
119536 + *
119537 + * Note: the choice of the license means that the compilation process is
119538 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
119539 + * but for the kernel it doesn't matter since it doesn't link against
119540 + * any of the gcc libraries
119541 + *
119542 + * gcc plugin to help implement various PaX features
119543 + *
119544 + * - track lowest stack pointer
119545 + *
119546 + * TODO:
119547 + * - initialize all local variables
119548 + *
119549 + * BUGS:
119550 + * - none known
119551 + */
119552 +
119553 +#include "gcc-common.h"
119554 +
119555 +int plugin_is_GPL_compatible;
119556 +
119557 +static int track_frame_size = -1;
119558 +static const char track_function[] = "pax_track_stack";
119559 +static const char check_function[] = "pax_check_alloca";
119560 +static tree track_function_decl, check_function_decl;
119561 +static bool init_locals;
119562 +
119563 +static struct plugin_info stackleak_plugin_info = {
119564 + .version = "201402131920",
119565 + .help = "track-lowest-sp=nn\ttrack sp in functions whose frame size is at least nn bytes\n"
119566 +// "initialize-locals\t\tforcibly initialize all stack frames\n"
119567 +};
119568 +
119569 +static void stackleak_check_alloca(gimple_stmt_iterator *gsi)
119570 +{
119571 + gimple check_alloca;
119572 + tree alloca_size;
119573 +
119574 + // insert call to void pax_check_alloca(unsigned long size)
119575 + alloca_size = gimple_call_arg(gsi_stmt(*gsi), 0);
119576 + check_alloca = gimple_build_call(check_function_decl, 1, alloca_size);
119577 + gsi_insert_before(gsi, check_alloca, GSI_SAME_STMT);
119578 +}
119579 +
119580 +static void stackleak_add_instrumentation(gimple_stmt_iterator *gsi)
119581 +{
119582 + gimple track_stack;
119583 +
119584 + // insert call to void pax_track_stack(void)
119585 + track_stack = gimple_build_call(track_function_decl, 0);
119586 + gsi_insert_after(gsi, track_stack, GSI_CONTINUE_LINKING);
119587 +}
119588 +
119589 +static bool is_alloca(gimple stmt)
119590 +{
119591 + if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA))
119592 + return true;
119593 +
119594 +#if BUILDING_GCC_VERSION >= 4007
119595 + if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA_WITH_ALIGN))
119596 + return true;
119597 +#endif
119598 +
119599 + return false;
119600 +}
119601 +
119602 +static unsigned int execute_stackleak_tree_instrument(void)
119603 +{
119604 + basic_block bb, entry_bb;
119605 + bool prologue_instrumented = false, is_leaf = true;
119606 +
119607 + entry_bb = ENTRY_BLOCK_PTR_FOR_FN(cfun)->next_bb;
119608 +
119609 + // 1. loop through BBs and GIMPLE statements
119610 + FOR_EACH_BB_FN(bb, cfun) {
119611 + gimple_stmt_iterator gsi;
119612 +
119613 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
119614 + gimple stmt;
119615 +
119616 + stmt = gsi_stmt(gsi);
119617 +
119618 + if (is_gimple_call(stmt))
119619 + is_leaf = false;
119620 +
119621 + // gimple match: align 8 built-in BUILT_IN_NORMAL:BUILT_IN_ALLOCA attributes <tree_list 0xb7576450>
119622 + if (!is_alloca(stmt))
119623 + continue;
119624 +
119625 + // 2. insert stack overflow check before each __builtin_alloca call
119626 + stackleak_check_alloca(&gsi);
119627 +
119628 + // 3. insert track call after each __builtin_alloca call
119629 + stackleak_add_instrumentation(&gsi);
119630 + if (bb == entry_bb)
119631 + prologue_instrumented = true;
119632 + }
119633 + }
119634 +
119635 + // special cases for some bad linux code: taking the address of static inline functions will materialize them
119636 + // but we mustn't instrument some of them as the resulting stack alignment required by the function call ABI
119637 + // will break other assumptions regarding the expected (but not otherwise enforced) register clobbering ABI.
119638 + // case in point: native_save_fl on amd64 when optimized for size clobbers rdx if it were instrumented here.
119639 + if (is_leaf && !TREE_PUBLIC(current_function_decl) && DECL_DECLARED_INLINE_P(current_function_decl))
119640 + return 0;
119641 + if (is_leaf && !strncmp(IDENTIFIER_POINTER(DECL_NAME(current_function_decl)), "_paravirt_", 10))
119642 + return 0;
119643 +
119644 + // 4. insert track call at the beginning
119645 + if (!prologue_instrumented) {
119646 + gimple_stmt_iterator gsi;
119647 +
119648 + bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
119649 + if (dom_info_available_p(CDI_DOMINATORS))
119650 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
119651 + gsi = gsi_start_bb(bb);
119652 + stackleak_add_instrumentation(&gsi);
119653 + }
119654 +
119655 + return 0;
119656 +}
119657 +
119658 +static unsigned int execute_stackleak_final(void)
119659 +{
119660 + rtx insn, next;
119661 +
119662 + if (cfun->calls_alloca)
119663 + return 0;
119664 +
119665 + // keep calls only if function frame is big enough
119666 + if (get_frame_size() >= track_frame_size)
119667 + return 0;
119668 +
119669 + // 1. find pax_track_stack calls
119670 + for (insn = get_insns(); insn; insn = next) {
119671 + // 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))
119672 + rtx body;
119673 +
119674 + next = NEXT_INSN(insn);
119675 + if (!CALL_P(insn))
119676 + continue;
119677 + body = PATTERN(insn);
119678 + if (GET_CODE(body) != CALL)
119679 + continue;
119680 + body = XEXP(body, 0);
119681 + if (GET_CODE(body) != MEM)
119682 + continue;
119683 + body = XEXP(body, 0);
119684 + if (GET_CODE(body) != SYMBOL_REF)
119685 + continue;
119686 +// if (strcmp(XSTR(body, 0), track_function))
119687 + if (SYMBOL_REF_DECL(body) != track_function_decl)
119688 + continue;
119689 +// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
119690 + // 2. delete call
119691 + delete_insn_and_edges(insn);
119692 +#if BUILDING_GCC_VERSION >= 4007
119693 + if (GET_CODE(next) == NOTE && NOTE_KIND(next) == NOTE_INSN_CALL_ARG_LOCATION) {
119694 + insn = next;
119695 + next = NEXT_INSN(insn);
119696 + delete_insn_and_edges(insn);
119697 + }
119698 +#endif
119699 + }
119700 +
119701 +// print_simple_rtl(stderr, get_insns());
119702 +// print_rtl(stderr, get_insns());
119703 +// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
119704 +
119705 + return 0;
119706 +}
119707 +
119708 +static bool gate_stackleak_track_stack(void)
119709 +{
119710 + return track_frame_size >= 0;
119711 +}
119712 +
119713 +static void stackleak_start_unit(void *gcc_data, void *user_data)
119714 +{
119715 + tree fntype;
119716 +
119717 + // void pax_track_stack(void)
119718 + fntype = build_function_type_list(void_type_node, NULL_TREE);
119719 + track_function_decl = build_fn_decl(track_function, fntype);
119720 + DECL_ASSEMBLER_NAME(track_function_decl); // for LTO
119721 + TREE_PUBLIC(track_function_decl) = 1;
119722 + DECL_EXTERNAL(track_function_decl) = 1;
119723 + DECL_ARTIFICIAL(track_function_decl) = 1;
119724 +
119725 + // void pax_check_alloca(unsigned long)
119726 + fntype = build_function_type_list(void_type_node, long_unsigned_type_node, NULL_TREE);
119727 + check_function_decl = build_fn_decl(check_function, fntype);
119728 + DECL_ASSEMBLER_NAME(check_function_decl); // for LTO
119729 + TREE_PUBLIC(check_function_decl) = 1;
119730 + DECL_EXTERNAL(check_function_decl) = 1;
119731 + DECL_ARTIFICIAL(check_function_decl) = 1;
119732 +}
119733 +
119734 +#if BUILDING_GCC_VERSION >= 4009
119735 +static const struct pass_data stackleak_tree_instrument_pass_data = {
119736 +#else
119737 +static struct gimple_opt_pass stackleak_tree_instrument_pass = {
119738 + .pass = {
119739 +#endif
119740 + .type = GIMPLE_PASS,
119741 + .name = "stackleak_tree_instrument",
119742 +#if BUILDING_GCC_VERSION >= 4008
119743 + .optinfo_flags = OPTGROUP_NONE,
119744 +#endif
119745 +#if BUILDING_GCC_VERSION >= 4009
119746 + .has_gate = true,
119747 + .has_execute = true,
119748 +#else
119749 + .gate = gate_stackleak_track_stack,
119750 + .execute = execute_stackleak_tree_instrument,
119751 + .sub = NULL,
119752 + .next = NULL,
119753 + .static_pass_number = 0,
119754 +#endif
119755 + .tv_id = TV_NONE,
119756 + .properties_required = PROP_gimple_leh | PROP_cfg,
119757 + .properties_provided = 0,
119758 + .properties_destroyed = 0,
119759 + .todo_flags_start = 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
119760 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa | TODO_rebuild_cgraph_edges
119761 +#if BUILDING_GCC_VERSION < 4009
119762 + }
119763 +#endif
119764 +};
119765 +
119766 +#if BUILDING_GCC_VERSION >= 4009
119767 +static const struct pass_data stackleak_final_rtl_opt_pass_data = {
119768 +#else
119769 +static struct rtl_opt_pass stackleak_final_rtl_opt_pass = {
119770 + .pass = {
119771 +#endif
119772 + .type = RTL_PASS,
119773 + .name = "stackleak_final",
119774 +#if BUILDING_GCC_VERSION >= 4008
119775 + .optinfo_flags = OPTGROUP_NONE,
119776 +#endif
119777 +#if BUILDING_GCC_VERSION >= 4009
119778 + .has_gate = true,
119779 + .has_execute = true,
119780 +#else
119781 + .gate = gate_stackleak_track_stack,
119782 + .execute = execute_stackleak_final,
119783 + .sub = NULL,
119784 + .next = NULL,
119785 + .static_pass_number = 0,
119786 +#endif
119787 + .tv_id = TV_NONE,
119788 + .properties_required = 0,
119789 + .properties_provided = 0,
119790 + .properties_destroyed = 0,
119791 + .todo_flags_start = 0,
119792 + .todo_flags_finish = TODO_dump_func
119793 +#if BUILDING_GCC_VERSION < 4009
119794 + }
119795 +#endif
119796 +};
119797 +
119798 +#if BUILDING_GCC_VERSION >= 4009
119799 +namespace {
119800 +class stackleak_tree_instrument_pass : public gimple_opt_pass {
119801 +public:
119802 + stackleak_tree_instrument_pass() : gimple_opt_pass(stackleak_tree_instrument_pass_data, g) {}
119803 + bool gate() { return gate_stackleak_track_stack(); }
119804 + unsigned int execute() { return execute_stackleak_tree_instrument(); }
119805 +};
119806 +
119807 +class stackleak_final_rtl_opt_pass : public rtl_opt_pass {
119808 +public:
119809 + stackleak_final_rtl_opt_pass() : rtl_opt_pass(stackleak_final_rtl_opt_pass_data, g) {}
119810 + bool gate() { return gate_stackleak_track_stack(); }
119811 + unsigned int execute() { return execute_stackleak_final(); }
119812 +};
119813 +}
119814 +
119815 +static opt_pass *make_stackleak_tree_instrument_pass(void)
119816 +{
119817 + return new stackleak_tree_instrument_pass();
119818 +}
119819 +
119820 +static opt_pass *make_stackleak_final_rtl_opt_pass(void)
119821 +{
119822 + return new stackleak_final_rtl_opt_pass();
119823 +}
119824 +#else
119825 +static struct opt_pass *make_stackleak_tree_instrument_pass(void)
119826 +{
119827 + return &stackleak_tree_instrument_pass.pass;
119828 +}
119829 +
119830 +static struct opt_pass *make_stackleak_final_rtl_opt_pass(void)
119831 +{
119832 + return &stackleak_final_rtl_opt_pass.pass;
119833 +}
119834 +#endif
119835 +
119836 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
119837 +{
119838 + const char * const plugin_name = plugin_info->base_name;
119839 + const int argc = plugin_info->argc;
119840 + const struct plugin_argument * const argv = plugin_info->argv;
119841 + int i;
119842 + struct register_pass_info stackleak_tree_instrument_pass_info;
119843 + struct register_pass_info stackleak_final_pass_info;
119844 + static const struct ggc_root_tab gt_ggc_r_gt_stackleak[] = {
119845 + {
119846 + .base = &track_function_decl,
119847 + .nelt = 1,
119848 + .stride = sizeof(track_function_decl),
119849 + .cb = &gt_ggc_mx_tree_node,
119850 + .pchw = &gt_pch_nx_tree_node
119851 + },
119852 + {
119853 + .base = &check_function_decl,
119854 + .nelt = 1,
119855 + .stride = sizeof(check_function_decl),
119856 + .cb = &gt_ggc_mx_tree_node,
119857 + .pchw = &gt_pch_nx_tree_node
119858 + },
119859 + LAST_GGC_ROOT_TAB
119860 + };
119861 +
119862 + stackleak_tree_instrument_pass_info.pass = make_stackleak_tree_instrument_pass();
119863 +// stackleak_tree_instrument_pass_info.reference_pass_name = "tree_profile";
119864 + stackleak_tree_instrument_pass_info.reference_pass_name = "optimized";
119865 + stackleak_tree_instrument_pass_info.ref_pass_instance_number = 1;
119866 + stackleak_tree_instrument_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
119867 +
119868 + stackleak_final_pass_info.pass = make_stackleak_final_rtl_opt_pass();
119869 + stackleak_final_pass_info.reference_pass_name = "final";
119870 + stackleak_final_pass_info.ref_pass_instance_number = 1;
119871 + stackleak_final_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
119872 +
119873 + if (!plugin_default_version_check(version, &gcc_version)) {
119874 + error(G_("incompatible gcc/plugin versions"));
119875 + return 1;
119876 + }
119877 +
119878 + register_callback(plugin_name, PLUGIN_INFO, NULL, &stackleak_plugin_info);
119879 +
119880 + for (i = 0; i < argc; ++i) {
119881 + if (!strcmp(argv[i].key, "track-lowest-sp")) {
119882 + if (!argv[i].value) {
119883 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
119884 + continue;
119885 + }
119886 + track_frame_size = atoi(argv[i].value);
119887 + if (argv[i].value[0] < '0' || argv[i].value[0] > '9' || track_frame_size < 0)
119888 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
119889 + continue;
119890 + }
119891 + if (!strcmp(argv[i].key, "initialize-locals")) {
119892 + if (argv[i].value) {
119893 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
119894 + continue;
119895 + }
119896 + init_locals = true;
119897 + continue;
119898 + }
119899 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
119900 + }
119901 +
119902 + register_callback(plugin_name, PLUGIN_START_UNIT, &stackleak_start_unit, NULL);
119903 + register_callback(plugin_name, PLUGIN_REGISTER_GGC_ROOTS, NULL, (void *)&gt_ggc_r_gt_stackleak);
119904 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_tree_instrument_pass_info);
119905 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_final_pass_info);
119906 +
119907 + return 0;
119908 +}
119909 diff --git a/tools/gcc/structleak_plugin.c b/tools/gcc/structleak_plugin.c
119910 new file mode 100644
119911 index 0000000..4ee2231
119912 --- /dev/null
119913 +++ b/tools/gcc/structleak_plugin.c
119914 @@ -0,0 +1,274 @@
119915 +/*
119916 + * Copyright 2013-2014 by PaX Team <pageexec@freemail.hu>
119917 + * Licensed under the GPL v2
119918 + *
119919 + * Note: the choice of the license means that the compilation process is
119920 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
119921 + * but for the kernel it doesn't matter since it doesn't link against
119922 + * any of the gcc libraries
119923 + *
119924 + * gcc plugin to forcibly initialize certain local variables that could
119925 + * otherwise leak kernel stack to userland if they aren't properly initialized
119926 + * by later code
119927 + *
119928 + * Homepage: http://pax.grsecurity.net/
119929 + *
119930 + * Usage:
119931 + * $ # for 4.5/4.6/C based 4.7
119932 + * $ 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
119933 + * $ # for C++ based 4.7/4.8+
119934 + * $ 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
119935 + * $ gcc -fplugin=./structleak_plugin.so test.c -O2
119936 + *
119937 + * TODO: eliminate redundant initializers
119938 + * increase type coverage
119939 + */
119940 +
119941 +#include "gcc-common.h"
119942 +
119943 +// unused C type flag in all versions 4.5-4.9
119944 +#define TYPE_USERSPACE(TYPE) TYPE_LANG_FLAG_3(TYPE)
119945 +
119946 +int plugin_is_GPL_compatible;
119947 +
119948 +static struct plugin_info structleak_plugin_info = {
119949 + .version = "201401260140",
119950 + .help = "disable\tdo not activate plugin\n",
119951 +};
119952 +
119953 +static tree handle_user_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
119954 +{
119955 + *no_add_attrs = true;
119956 +
119957 + // check for types? for now accept everything linux has to offer
119958 + if (TREE_CODE(*node) != FIELD_DECL)
119959 + return NULL_TREE;
119960 +
119961 + *no_add_attrs = false;
119962 + return NULL_TREE;
119963 +}
119964 +
119965 +static struct attribute_spec user_attr = {
119966 + .name = "user",
119967 + .min_length = 0,
119968 + .max_length = 0,
119969 + .decl_required = false,
119970 + .type_required = false,
119971 + .function_type_required = false,
119972 + .handler = handle_user_attribute,
119973 +#if BUILDING_GCC_VERSION >= 4007
119974 + .affects_type_identity = true
119975 +#endif
119976 +};
119977 +
119978 +static void register_attributes(void *event_data, void *data)
119979 +{
119980 + register_attribute(&user_attr);
119981 +// register_attribute(&force_attr);
119982 +}
119983 +
119984 +static tree get_field_type(tree field)
119985 +{
119986 + return strip_array_types(TREE_TYPE(field));
119987 +}
119988 +
119989 +static bool is_userspace_type(tree type)
119990 +{
119991 + tree field;
119992 +
119993 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
119994 + tree fieldtype = get_field_type(field);
119995 + enum tree_code code = TREE_CODE(fieldtype);
119996 +
119997 + if (code == RECORD_TYPE || code == UNION_TYPE)
119998 + if (is_userspace_type(fieldtype))
119999 + return true;
120000 +
120001 + if (lookup_attribute("user", DECL_ATTRIBUTES(field)))
120002 + return true;
120003 + }
120004 + return false;
120005 +}
120006 +
120007 +static void finish_type(void *event_data, void *data)
120008 +{
120009 + tree type = (tree)event_data;
120010 +
120011 + if (TYPE_USERSPACE(type))
120012 + return;
120013 +
120014 + if (is_userspace_type(type))
120015 + TYPE_USERSPACE(type) = 1;
120016 +}
120017 +
120018 +static void initialize(tree var)
120019 +{
120020 + basic_block bb;
120021 + gimple_stmt_iterator gsi;
120022 + tree initializer;
120023 + gimple init_stmt;
120024 +
120025 + // this is the original entry bb before the forced split
120026 + // TODO: check further BBs in case more splits occured before us
120027 + bb = ENTRY_BLOCK_PTR_FOR_FN(cfun)->next_bb->next_bb;
120028 +
120029 + // first check if the variable is already initialized, warn otherwise
120030 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
120031 + gimple stmt = gsi_stmt(gsi);
120032 + tree rhs1;
120033 +
120034 + // we're looking for an assignment of a single rhs...
120035 + if (!gimple_assign_single_p(stmt))
120036 + continue;
120037 + rhs1 = gimple_assign_rhs1(stmt);
120038 +#if BUILDING_GCC_VERSION >= 4007
120039 + // ... of a non-clobbering expression...
120040 + if (TREE_CLOBBER_P(rhs1))
120041 + continue;
120042 +#endif
120043 + // ... to our variable...
120044 + if (gimple_get_lhs(stmt) != var)
120045 + continue;
120046 + // if it's an initializer then we're good
120047 + if (TREE_CODE(rhs1) == CONSTRUCTOR)
120048 + return;
120049 + }
120050 +
120051 + // these aren't the 0days you're looking for
120052 +// inform(DECL_SOURCE_LOCATION(var), "userspace variable will be forcibly initialized");
120053 +
120054 + // build the initializer expression
120055 + initializer = build_constructor(TREE_TYPE(var), NULL);
120056 +
120057 + // build the initializer stmt
120058 + init_stmt = gimple_build_assign(var, initializer);
120059 + gsi = gsi_start_bb(ENTRY_BLOCK_PTR_FOR_FN(cfun)->next_bb);
120060 + gsi_insert_before(&gsi, init_stmt, GSI_NEW_STMT);
120061 + update_stmt(init_stmt);
120062 +}
120063 +
120064 +static unsigned int handle_function(void)
120065 +{
120066 + basic_block bb;
120067 + unsigned int ret = 0;
120068 + tree var;
120069 + unsigned int i;
120070 +
120071 + // split the first bb where we can put the forced initializers
120072 + bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
120073 + if (dom_info_available_p(CDI_DOMINATORS))
120074 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
120075 +
120076 + // enumarate all local variables and forcibly initialize our targets
120077 + FOR_EACH_LOCAL_DECL(cfun, i, var) {
120078 + tree type = TREE_TYPE(var);
120079 +
120080 + gcc_assert(DECL_P(var));
120081 + if (!auto_var_in_fn_p(var, current_function_decl))
120082 + continue;
120083 +
120084 + // only care about structure types
120085 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
120086 + continue;
120087 +
120088 + // if the type is of interest, examine the variable
120089 + if (TYPE_USERSPACE(type))
120090 + initialize(var);
120091 + }
120092 +
120093 + return ret;
120094 +}
120095 +
120096 +#if BUILDING_GCC_VERSION >= 4009
120097 +static const struct pass_data structleak_pass_data = {
120098 +#else
120099 +static struct gimple_opt_pass structleak_pass = {
120100 + .pass = {
120101 +#endif
120102 + .type = GIMPLE_PASS,
120103 + .name = "structleak",
120104 +#if BUILDING_GCC_VERSION >= 4008
120105 + .optinfo_flags = OPTGROUP_NONE,
120106 +#endif
120107 +#if BUILDING_GCC_VERSION >= 4009
120108 + .has_gate = false,
120109 + .has_execute = true,
120110 +#else
120111 + .gate = NULL,
120112 + .execute = handle_function,
120113 + .sub = NULL,
120114 + .next = NULL,
120115 + .static_pass_number = 0,
120116 +#endif
120117 + .tv_id = TV_NONE,
120118 + .properties_required = PROP_cfg,
120119 + .properties_provided = 0,
120120 + .properties_destroyed = 0,
120121 + .todo_flags_start = 0,
120122 + .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
120123 +#if BUILDING_GCC_VERSION < 4009
120124 + }
120125 +#endif
120126 +};
120127 +
120128 +#if BUILDING_GCC_VERSION >= 4009
120129 +namespace {
120130 +class structleak_pass : public gimple_opt_pass {
120131 +public:
120132 + structleak_pass() : gimple_opt_pass(structleak_pass_data, g) {}
120133 + unsigned int execute() { return handle_function(); }
120134 +};
120135 +}
120136 +
120137 +static opt_pass *make_structleak_pass(void)
120138 +{
120139 + return new structleak_pass();
120140 +}
120141 +#else
120142 +static struct opt_pass *make_structleak_pass(void)
120143 +{
120144 + return &structleak_pass.pass;
120145 +}
120146 +#endif
120147 +
120148 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
120149 +{
120150 + int i;
120151 + const char * const plugin_name = plugin_info->base_name;
120152 + const int argc = plugin_info->argc;
120153 + const struct plugin_argument * const argv = plugin_info->argv;
120154 + bool enable = true;
120155 + struct register_pass_info structleak_pass_info;
120156 +
120157 + structleak_pass_info.pass = make_structleak_pass();
120158 + structleak_pass_info.reference_pass_name = "ssa";
120159 + structleak_pass_info.ref_pass_instance_number = 1;
120160 + structleak_pass_info.pos_op = PASS_POS_INSERT_AFTER;
120161 +
120162 + if (!plugin_default_version_check(version, &gcc_version)) {
120163 + error(G_("incompatible gcc/plugin versions"));
120164 + return 1;
120165 + }
120166 +
120167 + if (strcmp(lang_hooks.name, "GNU C")) {
120168 + inform(UNKNOWN_LOCATION, G_("%s supports C only"), plugin_name);
120169 + enable = false;
120170 + }
120171 +
120172 + for (i = 0; i < argc; ++i) {
120173 + if (!strcmp(argv[i].key, "disable")) {
120174 + enable = false;
120175 + continue;
120176 + }
120177 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
120178 + }
120179 +
120180 + register_callback(plugin_name, PLUGIN_INFO, NULL, &structleak_plugin_info);
120181 + if (enable) {
120182 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &structleak_pass_info);
120183 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
120184 + }
120185 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
120186 +
120187 + return 0;
120188 +}
120189 diff --git a/tools/include/linux/compiler.h b/tools/include/linux/compiler.h
120190 index fbc6665..5e9ce79 100644
120191 --- a/tools/include/linux/compiler.h
120192 +++ b/tools/include/linux/compiler.h
120193 @@ -35,4 +35,12 @@
120194 # define unlikely(x) __builtin_expect(!!(x), 0)
120195 #endif
120196
120197 +#ifndef __size_overflow
120198 +# define __size_overflow(...)
120199 +#endif
120200 +
120201 +#ifndef __intentional_overflow
120202 +# define __intentional_overflow(...)
120203 +#endif
120204 +
120205 #endif /* _TOOLS_LINUX_COMPILER_H */
120206 diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile
120207 index ed2f51e..cc2d8f6 100644
120208 --- a/tools/lib/api/Makefile
120209 +++ b/tools/lib/api/Makefile
120210 @@ -14,7 +14,7 @@ LIB_OBJS += $(OUTPUT)fs/debugfs.o
120211
120212 LIBFILE = libapikfs.a
120213
120214 -CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC
120215 +CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC
120216 EXTLIBS = -lelf -lpthread -lrt -lm
120217 ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
120218 ALL_LDFLAGS = $(LDFLAGS)
120219 diff --git a/tools/perf/util/include/asm/alternative-asm.h b/tools/perf/util/include/asm/alternative-asm.h
120220 index 6789d78..4afd019e 100644
120221 --- a/tools/perf/util/include/asm/alternative-asm.h
120222 +++ b/tools/perf/util/include/asm/alternative-asm.h
120223 @@ -5,4 +5,7 @@
120224
120225 #define altinstruction_entry #
120226
120227 + .macro pax_force_retaddr rip=0, reload=0
120228 + .endm
120229 +
120230 #endif
120231 diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
120232 index ce9ed99..8c805a0 100644
120233 --- a/virt/kvm/ioapic.c
120234 +++ b/virt/kvm/ioapic.c
120235 @@ -306,7 +306,7 @@ static int ioapic_deliver(struct kvm_ioapic *ioapic, int irq, bool line_status)
120236 BUG_ON(ioapic->rtc_status.pending_eoi != 0);
120237 ret = kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe,
120238 ioapic->rtc_status.dest_map);
120239 - ioapic->rtc_status.pending_eoi = ret;
120240 + ioapic->rtc_status.pending_eoi = (ret < 0 ? 0 : ret);
120241 } else
120242 ret = kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe, NULL);
120243
120244 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
120245 index 03a0381..8b31923 100644
120246 --- a/virt/kvm/kvm_main.c
120247 +++ b/virt/kvm/kvm_main.c
120248 @@ -76,12 +76,17 @@ LIST_HEAD(vm_list);
120249
120250 static cpumask_var_t cpus_hardware_enabled;
120251 static int kvm_usage_count = 0;
120252 -static atomic_t hardware_enable_failed;
120253 +static atomic_unchecked_t hardware_enable_failed;
120254
120255 struct kmem_cache *kvm_vcpu_cache;
120256 EXPORT_SYMBOL_GPL(kvm_vcpu_cache);
120257
120258 -static __read_mostly struct preempt_ops kvm_preempt_ops;
120259 +static void kvm_sched_in(struct preempt_notifier *pn, int cpu);
120260 +static void kvm_sched_out(struct preempt_notifier *pn, struct task_struct *next);
120261 +static struct preempt_ops kvm_preempt_ops = {
120262 + .sched_in = kvm_sched_in,
120263 + .sched_out = kvm_sched_out,
120264 +};
120265
120266 struct dentry *kvm_debugfs_dir;
120267
120268 @@ -758,7 +763,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
120269 /* We can read the guest memory with __xxx_user() later on. */
120270 if ((mem->slot < KVM_USER_MEM_SLOTS) &&
120271 ((mem->userspace_addr & (PAGE_SIZE - 1)) ||
120272 - !access_ok(VERIFY_WRITE,
120273 + !access_ok_noprefault(VERIFY_WRITE,
120274 (void __user *)(unsigned long)mem->userspace_addr,
120275 mem->memory_size)))
120276 goto out;
120277 @@ -1615,9 +1620,17 @@ EXPORT_SYMBOL_GPL(kvm_read_guest_cached);
120278
120279 int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len)
120280 {
120281 - const void *zero_page = (const void *) __va(page_to_phys(ZERO_PAGE(0)));
120282 + int r;
120283 + unsigned long addr;
120284
120285 - return kvm_write_guest_page(kvm, gfn, zero_page, offset, len);
120286 + addr = gfn_to_hva(kvm, gfn);
120287 + if (kvm_is_error_hva(addr))
120288 + return -EFAULT;
120289 + r = __clear_user((void __user *)addr + offset, len);
120290 + if (r)
120291 + return -EFAULT;
120292 + mark_page_dirty(kvm, gfn);
120293 + return 0;
120294 }
120295 EXPORT_SYMBOL_GPL(kvm_clear_guest_page);
120296
120297 @@ -1867,7 +1880,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp)
120298 return 0;
120299 }
120300
120301 -static struct file_operations kvm_vcpu_fops = {
120302 +static file_operations_no_const kvm_vcpu_fops __read_only = {
120303 .release = kvm_vcpu_release,
120304 .unlocked_ioctl = kvm_vcpu_ioctl,
120305 #ifdef CONFIG_COMPAT
120306 @@ -2532,7 +2545,7 @@ out:
120307 }
120308 #endif
120309
120310 -static struct file_operations kvm_vm_fops = {
120311 +static file_operations_no_const kvm_vm_fops __read_only = {
120312 .release = kvm_vm_release,
120313 .unlocked_ioctl = kvm_vm_ioctl,
120314 #ifdef CONFIG_COMPAT
120315 @@ -2632,7 +2645,7 @@ out:
120316 return r;
120317 }
120318
120319 -static struct file_operations kvm_chardev_ops = {
120320 +static file_operations_no_const kvm_chardev_ops __read_only = {
120321 .unlocked_ioctl = kvm_dev_ioctl,
120322 .compat_ioctl = kvm_dev_ioctl,
120323 .llseek = noop_llseek,
120324 @@ -2658,7 +2671,7 @@ static void hardware_enable_nolock(void *junk)
120325
120326 if (r) {
120327 cpumask_clear_cpu(cpu, cpus_hardware_enabled);
120328 - atomic_inc(&hardware_enable_failed);
120329 + atomic_inc_unchecked(&hardware_enable_failed);
120330 printk(KERN_INFO "kvm: enabling virtualization on "
120331 "CPU%d failed\n", cpu);
120332 }
120333 @@ -2714,10 +2727,10 @@ static int hardware_enable_all(void)
120334
120335 kvm_usage_count++;
120336 if (kvm_usage_count == 1) {
120337 - atomic_set(&hardware_enable_failed, 0);
120338 + atomic_set_unchecked(&hardware_enable_failed, 0);
120339 on_each_cpu(hardware_enable_nolock, NULL, 1);
120340
120341 - if (atomic_read(&hardware_enable_failed)) {
120342 + if (atomic_read_unchecked(&hardware_enable_failed)) {
120343 hardware_disable_all_nolock();
120344 r = -EBUSY;
120345 }
120346 @@ -3121,7 +3134,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
120347 kvm_arch_vcpu_put(vcpu);
120348 }
120349
120350 -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
120351 +int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
120352 struct module *module)
120353 {
120354 int r;
120355 @@ -3168,7 +3181,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
120356 if (!vcpu_align)
120357 vcpu_align = __alignof__(struct kvm_vcpu);
120358 kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align,
120359 - 0, NULL);
120360 + SLAB_USERCOPY, NULL);
120361 if (!kvm_vcpu_cache) {
120362 r = -ENOMEM;
120363 goto out_free_3;
120364 @@ -3178,9 +3191,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
120365 if (r)
120366 goto out_free;
120367
120368 + pax_open_kernel();
120369 kvm_chardev_ops.owner = module;
120370 kvm_vm_fops.owner = module;
120371 kvm_vcpu_fops.owner = module;
120372 + pax_close_kernel();
120373
120374 r = misc_register(&kvm_dev);
120375 if (r) {
120376 @@ -3190,9 +3205,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
120377
120378 register_syscore_ops(&kvm_syscore_ops);
120379
120380 - kvm_preempt_ops.sched_in = kvm_sched_in;
120381 - kvm_preempt_ops.sched_out = kvm_sched_out;
120382 -
120383 r = kvm_init_debug();
120384 if (r) {
120385 printk(KERN_ERR "kvm: create debugfs files failed\n");
Unofficial grsecurity patch archive (https://github.com/slashbeast/grsecurity-scrape)