]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blob - test/grsecurity-3.0-3.12.6-201312301223.patch
projects / thirdparty / grsecurity-scrape.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
blame | history | raw | HEAD
Auto commit, 1 new patch{es}.
[thirdparty/grsecurity-scrape.git] / test / grsecurity-3.0-3.12.6-201312301223.patch
1 diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2 index b89a739..79768fb 100644
3 --- a/Documentation/dontdiff
4 +++ b/Documentation/dontdiff
5 @@ -2,9 +2,11 @@
6 *.aux
7 *.bin
8 *.bz2
9 +*.c.[012]*.*
10 *.cis
11 *.cpio
12 *.csp
13 +*.dbg
14 *.dsp
15 *.dvi
16 *.elf
17 @@ -14,6 +16,7 @@
18 *.gcov
19 *.gen.S
20 *.gif
21 +*.gmo
22 *.grep
23 *.grp
24 *.gz
25 @@ -48,14 +51,17 @@
26 *.tab.h
27 *.tex
28 *.ver
29 +*.vim
30 *.xml
31 *.xz
32 *_MODULES
33 +*_reg_safe.h
34 *_vga16.c
35 *~
36 \#*#
37 *.9
38 -.*
39 +.[^g]*
40 +.gen*
41 .*.d
42 .mm
43 53c700_d.h
44 @@ -69,9 +75,11 @@ Image
45 Module.markers
46 Module.symvers
47 PENDING
48 +PERF*
49 SCCS
50 System.map*
51 TAGS
52 +TRACEEVENT-CFLAGS
53 aconf
54 af_names.h
55 aic7*reg.h*
56 @@ -80,6 +88,7 @@ aic7*seq.h*
57 aicasm
58 aicdb.h*
59 altivec*.c
60 +ashldi3.S
61 asm-offsets.h
62 asm_offsets.h
63 autoconf.h*
64 @@ -92,19 +101,24 @@ bounds.h
65 bsetup
66 btfixupprep
67 build
68 +builtin-policy.h
69 bvmlinux
70 bzImage*
71 capability_names.h
72 capflags.c
73 classlist.h*
74 +clut_vga16.c
75 +common-cmds.h
76 comp*.log
77 compile.h*
78 conf
79 config
80 config-*
81 config_data.h*
82 +config.c
83 config.mak
84 config.mak.autogen
85 +config.tmp
86 conmakehash
87 consolemap_deftbl.c*
88 cpustr.h
89 @@ -115,9 +129,11 @@ devlist.h*
90 dnotify_test
91 docproc
92 dslm
93 +dtc-lexer.lex.c
94 elf2ecoff
95 elfconfig.h*
96 evergreen_reg_safe.h
97 +exception_policy.conf
98 fixdep
99 flask.h
100 fore200e_mkfirm
101 @@ -125,12 +141,15 @@ fore200e_pca_fw.c*
102 gconf
103 gconf.glade.h
104 gen-devlist
105 +gen-kdb_cmds.c
106 gen_crc32table
107 gen_init_cpio
108 generated
109 genheaders
110 genksyms
111 *_gray256.c
112 +hash
113 +hid-example
114 hpet_example
115 hugepage-mmap
116 hugepage-shm
117 @@ -145,14 +164,14 @@ int32.c
118 int4.c
119 int8.c
120 kallsyms
121 -kconfig
122 +kern_constants.h
123 keywords.c
124 ksym.c*
125 ksym.h*
126 kxgettext
127 lex.c
128 lex.*.c
129 -linux
130 +lib1funcs.S
131 logo_*.c
132 logo_*_clut224.c
133 logo_*_mono.c
134 @@ -162,14 +181,15 @@ mach-types.h
135 machtypes.h
136 map
137 map_hugetlb
138 -media
139 mconf
140 +mdp
141 miboot*
142 mk_elfconfig
143 mkboot
144 mkbugboot
145 mkcpustr
146 mkdep
147 +mkpiggy
148 mkprep
149 mkregtable
150 mktables
151 @@ -185,6 +205,8 @@ oui.c*
152 page-types
153 parse.c
154 parse.h
155 +parse-events*
156 +pasyms.h
157 patches*
158 pca200e.bin
159 pca200e_ecd.bin2
160 @@ -194,6 +216,7 @@ perf-archive
161 piggyback
162 piggy.gzip
163 piggy.S
164 +pmu-*
165 pnmtologo
166 ppc_defs.h*
167 pss_boot.h
168 @@ -203,7 +226,10 @@ r200_reg_safe.h
169 r300_reg_safe.h
170 r420_reg_safe.h
171 r600_reg_safe.h
172 +realmode.lds
173 +realmode.relocs
174 recordmcount
175 +regdb.c
176 relocs
177 rlim_names.h
178 rn50_reg_safe.h
179 @@ -213,8 +239,12 @@ series
180 setup
181 setup.bin
182 setup.elf
183 +signing_key*
184 +size_overflow_hash.h
185 sImage
186 +slabinfo
187 sm_tbl*
188 +sortextable
189 split-include
190 syscalltab.h
191 tables.c
192 @@ -224,6 +254,7 @@ tftpboot.img
193 timeconst.h
194 times.h*
195 trix_boot.h
196 +user_constants.h
197 utsrelease.h*
198 vdso-syms.lds
199 vdso.lds
200 @@ -235,13 +266,17 @@ vdso32.lds
201 vdso32.so.dbg
202 vdso64.lds
203 vdso64.so.dbg
204 +vdsox32.lds
205 +vdsox32-syms.lds
206 version.h*
207 vmImage
208 vmlinux
209 vmlinux-*
210 vmlinux.aout
211 vmlinux.bin.all
212 +vmlinux.bin.bz2
213 vmlinux.lds
214 +vmlinux.relocs
215 vmlinuz
216 voffset.h
217 vsyscall.lds
218 @@ -249,9 +284,12 @@ vsyscall_32.lds
219 wanxlfw.inc
220 uImage
221 unifdef
222 +utsrelease.h
223 wakeup.bin
224 wakeup.elf
225 wakeup.lds
226 +x509*
227 zImage*
228 zconf.hash.c
229 +zconf.lex.c
230 zoffset.h
231 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
232 index fcbb736..5508d8c 100644
233 --- a/Documentation/kernel-parameters.txt
234 +++ b/Documentation/kernel-parameters.txt
235 @@ -1031,6 +1031,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
236 Format: <unsigned int> such that (rxsize & ~0x1fffc0) == 0.
237 Default: 1024
238
239 + grsec_proc_gid= [GRKERNSEC_PROC_USERGROUP] Chooses GID to
240 + ignore grsecurity's /proc restrictions
241 +
242 +
243 hashdist= [KNL,NUMA] Large hashes allocated during boot
244 are distributed across NUMA nodes. Defaults on
245 for 64-bit NUMA, off otherwise.
246 @@ -1999,6 +2003,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
247 noexec=on: enable non-executable mappings (default)
248 noexec=off: disable non-executable mappings
249
250 + nopcid [X86-64]
251 + Disable PCID (Process-Context IDentifier) even if it
252 + is supported by the processor.
253 +
254 nosmap [X86]
255 Disable SMAP (Supervisor Mode Access Prevention)
256 even if it is supported by processor.
257 @@ -2266,6 +2274,25 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
258 the specified number of seconds. This is to be used if
259 your oopses keep scrolling off the screen.
260
261 + pax_nouderef [X86] disables UDEREF. Most likely needed under certain
262 + virtualization environments that don't cope well with the
263 + expand down segment used by UDEREF on X86-32 or the frequent
264 + page table updates on X86-64.
265 +
266 + pax_sanitize_slab=
267 + 0/1 to disable/enable slab object sanitization (enabled by
268 + default).
269 +
270 + pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
271 +
272 + pax_extra_latent_entropy
273 + Enable a very simple form of latent entropy extraction
274 + from the first 4GB of memory as the bootmem allocator
275 + passes the memory pages to the buddy allocator.
276 +
277 + pax_weakuderef [X86-64] enables the weaker but faster form of UDEREF
278 + when the processor supports PCID.
279 +
280 pcbit= [HW,ISDN]
281
282 pcd. [PARIDE]
283 diff --git a/Makefile b/Makefile
284 index 2b23383..a66cff0 100644
285 --- a/Makefile
286 +++ b/Makefile
287 @@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
288
289 HOSTCC = gcc
290 HOSTCXX = g++
291 -HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
292 -HOSTCXXFLAGS = -O2
293 +HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
294 +HOSTCFLAGS += $(call cc-option, -Wno-empty-body)
295 +HOSTCXXFLAGS = -O2 -Wall -W -fno-delete-null-pointer-checks
296
297 # Decide whether to build built-in, modular, or both.
298 # Normally, just do built-in.
299 @@ -414,8 +415,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
300 # Rules shared between *config targets and build targets
301
302 # Basic helpers built in scripts/
303 -PHONY += scripts_basic
304 -scripts_basic:
305 +PHONY += scripts_basic gcc-plugins
306 +scripts_basic: gcc-plugins
307 $(Q)$(MAKE) $(build)=scripts/basic
308 $(Q)rm -f .tmp_quiet_recordmcount
309
310 @@ -576,6 +577,65 @@ else
311 KBUILD_CFLAGS += -O2
312 endif
313
314 +ifndef DISABLE_PAX_PLUGINS
315 +ifeq ($(call cc-ifversion, -ge, 0408, y), y)
316 +PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCXX)" "$(HOSTCXX)" "$(CC)")
317 +else
318 +PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(HOSTCXX)" "$(CC)")
319 +endif
320 +ifneq ($(PLUGINCC),)
321 +ifdef CONFIG_PAX_CONSTIFY_PLUGIN
322 +CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
323 +endif
324 +ifdef CONFIG_PAX_MEMORY_STACKLEAK
325 +STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
326 +STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
327 +endif
328 +ifdef CONFIG_KALLOCSTAT_PLUGIN
329 +KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
330 +endif
331 +ifdef CONFIG_PAX_KERNEXEC_PLUGIN
332 +KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
333 +KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
334 +KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
335 +endif
336 +ifdef CONFIG_CHECKER_PLUGIN
337 +ifeq ($(call cc-ifversion, -ge, 0406, y), y)
338 +CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
339 +endif
340 +endif
341 +COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
342 +ifdef CONFIG_PAX_SIZE_OVERFLOW
343 +SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
344 +endif
345 +ifdef CONFIG_PAX_LATENT_ENTROPY
346 +LATENT_ENTROPY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/latent_entropy_plugin.so -DLATENT_ENTROPY_PLUGIN
347 +endif
348 +ifdef CONFIG_PAX_MEMORY_STRUCTLEAK
349 +STRUCTLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/structleak_plugin.so -DSTRUCTLEAK_PLUGIN
350 +endif
351 +GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
352 +GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS)
353 +GCC_PLUGINS_CFLAGS += $(SIZE_OVERFLOW_PLUGIN_CFLAGS) $(LATENT_ENTROPY_PLUGIN_CFLAGS) $(STRUCTLEAK_PLUGIN_CFLAGS)
354 +GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
355 +export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGINS_AFLAGS CONSTIFY_PLUGIN
356 +ifeq ($(KBUILD_EXTMOD),)
357 +gcc-plugins:
358 + $(Q)$(MAKE) $(build)=tools/gcc
359 +else
360 +gcc-plugins: ;
361 +endif
362 +else
363 +gcc-plugins:
364 +ifeq ($(call cc-ifversion, -ge, 0405, y), y)
365 + $(error Your gcc installation does not support plugins. If the necessary headers for plugin support are missing, they should be installed. On Debian, apt-get install gcc-<ver>-plugin-dev. If you choose to ignore this error and lessen the improvements provided by this patch, re-run make with the DISABLE_PAX_PLUGINS=y argument.))
366 +else
367 + $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
368 +endif
369 + $(Q)echo "PAX_MEMORY_STACKLEAK, constification, PAX_LATENT_ENTROPY and other features will be less secure. PAX_SIZE_OVERFLOW will not be active."
370 +endif
371 +endif
372 +
373 include $(srctree)/arch/$(SRCARCH)/Makefile
374
375 ifdef CONFIG_READABLE_ASM
376 @@ -733,7 +793,7 @@ export mod_sign_cmd
377
378
379 ifeq ($(KBUILD_EXTMOD),)
380 -core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
381 +core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
382
383 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
384 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
385 @@ -782,6 +842,8 @@ endif
386
387 # The actual objects are generated when descending,
388 # make sure no implicit rule kicks in
389 +$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
390 +$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
391 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
392
393 # Handle descending into subdirectories listed in $(vmlinux-dirs)
394 @@ -791,7 +853,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
395 # Error messages still appears in the original language
396
397 PHONY += $(vmlinux-dirs)
398 -$(vmlinux-dirs): prepare scripts
399 +$(vmlinux-dirs): gcc-plugins prepare scripts
400 $(Q)$(MAKE) $(build)=$@
401
402 define filechk_kernel.release
403 @@ -838,6 +900,7 @@ prepare0: archprepare FORCE
404 $(Q)$(MAKE) $(build)=.
405
406 # All the preparing..
407 +prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
408 prepare: prepare0
409
410 # Generate some files
411 @@ -945,6 +1008,8 @@ all: modules
412 # using awk while concatenating to the final file.
413
414 PHONY += modules
415 +modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
416 +modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
417 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
418 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
419 @$(kecho) ' Building modules, stage 2.';
420 @@ -960,7 +1025,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
421
422 # Target to prepare building external modules
423 PHONY += modules_prepare
424 -modules_prepare: prepare scripts
425 +modules_prepare: gcc-plugins prepare scripts
426
427 # Target to install modules
428 PHONY += modules_install
429 @@ -1026,7 +1091,7 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
430 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
431 signing_key.priv signing_key.x509 x509.genkey \
432 extra_certificates signing_key.x509.keyid \
433 - signing_key.x509.signer
434 + signing_key.x509.signer tools/gcc/size_overflow_hash.h
435
436 # clean - Delete most, but leave enough to build external modules
437 #
438 @@ -1066,6 +1131,7 @@ distclean: mrproper
439 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
440 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
441 -o -name '.*.rej' \
442 + -o -name '.*.rej' -o -name '*.so' \
443 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
444 -type f -print | xargs rm -f
445
446 @@ -1227,6 +1293,8 @@ PHONY += $(module-dirs) modules
447 $(module-dirs): crmodverdir $(objtree)/Module.symvers
448 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
449
450 +modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
451 +modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
452 modules: $(module-dirs)
453 @$(kecho) ' Building modules, stage 2.';
454 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
455 @@ -1366,17 +1434,21 @@ else
456 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
457 endif
458
459 -%.s: %.c prepare scripts FORCE
460 +%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
461 +%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
462 +%.s: %.c gcc-plugins prepare scripts FORCE
463 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
464 %.i: %.c prepare scripts FORCE
465 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
466 -%.o: %.c prepare scripts FORCE
467 +%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
468 +%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
469 +%.o: %.c gcc-plugins prepare scripts FORCE
470 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
471 %.lst: %.c prepare scripts FORCE
472 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
473 -%.s: %.S prepare scripts FORCE
474 +%.s: %.S gcc-plugins prepare scripts FORCE
475 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
476 -%.o: %.S prepare scripts FORCE
477 +%.o: %.S gcc-plugins prepare scripts FORCE
478 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
479 %.symtypes: %.c prepare scripts FORCE
480 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
481 @@ -1386,11 +1458,15 @@ endif
482 $(cmd_crmodverdir)
483 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
484 $(build)=$(build-dir)
485 -%/: prepare scripts FORCE
486 +%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
487 +%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
488 +%/: gcc-plugins prepare scripts FORCE
489 $(cmd_crmodverdir)
490 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
491 $(build)=$(build-dir)
492 -%.ko: prepare scripts FORCE
493 +%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
494 +%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
495 +%.ko: gcc-plugins prepare scripts FORCE
496 $(cmd_crmodverdir)
497 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
498 $(build)=$(build-dir) $(@:.ko=.o)
499 diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
500 index 78b03ef..da28a51 100644
501 --- a/arch/alpha/include/asm/atomic.h
502 +++ b/arch/alpha/include/asm/atomic.h
503 @@ -292,6 +292,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
504 #define atomic_dec(v) atomic_sub(1,(v))
505 #define atomic64_dec(v) atomic64_sub(1,(v))
506
507 +#define atomic64_read_unchecked(v) atomic64_read(v)
508 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
509 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
510 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
511 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
512 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
513 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
514 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
515 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
516 +
517 #define smp_mb__before_atomic_dec() smp_mb()
518 #define smp_mb__after_atomic_dec() smp_mb()
519 #define smp_mb__before_atomic_inc() smp_mb()
520 diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
521 index ad368a9..fbe0f25 100644
522 --- a/arch/alpha/include/asm/cache.h
523 +++ b/arch/alpha/include/asm/cache.h
524 @@ -4,19 +4,19 @@
525 #ifndef __ARCH_ALPHA_CACHE_H
526 #define __ARCH_ALPHA_CACHE_H
527
528 +#include <linux/const.h>
529
530 /* Bytes per L1 (data) cache line. */
531 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
532 -# define L1_CACHE_BYTES 64
533 # define L1_CACHE_SHIFT 6
534 #else
535 /* Both EV4 and EV5 are write-through, read-allocate,
536 direct-mapped, physical.
537 */
538 -# define L1_CACHE_BYTES 32
539 # define L1_CACHE_SHIFT 5
540 #endif
541
542 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
543 #define SMP_CACHE_BYTES L1_CACHE_BYTES
544
545 #endif
546 diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
547 index 968d999..d36b2df 100644
548 --- a/arch/alpha/include/asm/elf.h
549 +++ b/arch/alpha/include/asm/elf.h
550 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
551
552 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
553
554 +#ifdef CONFIG_PAX_ASLR
555 +#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
556 +
557 +#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
558 +#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
559 +#endif
560 +
561 /* $0 is set by ld.so to a pointer to a function which might be
562 registered using atexit. This provides a mean for the dynamic
563 linker to call DT_FINI functions for shared libraries that have
564 diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
565 index bc2a0da..8ad11ee 100644
566 --- a/arch/alpha/include/asm/pgalloc.h
567 +++ b/arch/alpha/include/asm/pgalloc.h
568 @@ -29,6 +29,12 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
569 pgd_set(pgd, pmd);
570 }
571
572 +static inline void
573 +pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
574 +{
575 + pgd_populate(mm, pgd, pmd);
576 +}
577 +
578 extern pgd_t *pgd_alloc(struct mm_struct *mm);
579
580 static inline void
581 diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
582 index d8f9b7e..f6222fa 100644
583 --- a/arch/alpha/include/asm/pgtable.h
584 +++ b/arch/alpha/include/asm/pgtable.h
585 @@ -102,6 +102,17 @@ struct vm_area_struct;
586 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
587 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
588 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
589 +
590 +#ifdef CONFIG_PAX_PAGEEXEC
591 +# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
592 +# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
593 +# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
594 +#else
595 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
596 +# define PAGE_COPY_NOEXEC PAGE_COPY
597 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
598 +#endif
599 +
600 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
601
602 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
603 diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
604 index 2fd00b7..cfd5069 100644
605 --- a/arch/alpha/kernel/module.c
606 +++ b/arch/alpha/kernel/module.c
607 @@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
608
609 /* The small sections were sorted to the end of the segment.
610 The following should definitely cover them. */
611 - gp = (u64)me->module_core + me->core_size - 0x8000;
612 + gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
613 got = sechdrs[me->arch.gotsecindex].sh_addr;
614
615 for (i = 0; i < n; i++) {
616 diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
617 index 1402fcc..0b1abd2 100644
618 --- a/arch/alpha/kernel/osf_sys.c
619 +++ b/arch/alpha/kernel/osf_sys.c
620 @@ -1298,10 +1298,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
621 generic version except that we know how to honor ADDR_LIMIT_32BIT. */
622
623 static unsigned long
624 -arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
625 - unsigned long limit)
626 +arch_get_unmapped_area_1(struct file *filp, unsigned long addr, unsigned long len,
627 + unsigned long limit, unsigned long flags)
628 {
629 struct vm_unmapped_area_info info;
630 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
631
632 info.flags = 0;
633 info.length = len;
634 @@ -1309,6 +1310,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
635 info.high_limit = limit;
636 info.align_mask = 0;
637 info.align_offset = 0;
638 + info.threadstack_offset = offset;
639 return vm_unmapped_area(&info);
640 }
641
642 @@ -1341,20 +1343,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
643 merely specific addresses, but regions of memory -- perhaps
644 this feature should be incorporated into all ports? */
645
646 +#ifdef CONFIG_PAX_RANDMMAP
647 + if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
648 +#endif
649 +
650 if (addr) {
651 - addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
652 + addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(addr), len, limit, flags);
653 if (addr != (unsigned long) -ENOMEM)
654 return addr;
655 }
656
657 /* Next, try allocating at TASK_UNMAPPED_BASE. */
658 - addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
659 - len, limit);
660 + addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(current->mm->mmap_base), len, limit, flags);
661 +
662 if (addr != (unsigned long) -ENOMEM)
663 return addr;
664
665 /* Finally, try allocating in low memory. */
666 - addr = arch_get_unmapped_area_1 (PAGE_SIZE, len, limit);
667 + addr = arch_get_unmapped_area_1 (filp, PAGE_SIZE, len, limit, flags);
668
669 return addr;
670 }
671 diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
672 index 98838a0..b304fb4 100644
673 --- a/arch/alpha/mm/fault.c
674 +++ b/arch/alpha/mm/fault.c
675 @@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
676 __reload_thread(pcb);
677 }
678
679 +#ifdef CONFIG_PAX_PAGEEXEC
680 +/*
681 + * PaX: decide what to do with offenders (regs->pc = fault address)
682 + *
683 + * returns 1 when task should be killed
684 + * 2 when patched PLT trampoline was detected
685 + * 3 when unpatched PLT trampoline was detected
686 + */
687 +static int pax_handle_fetch_fault(struct pt_regs *regs)
688 +{
689 +
690 +#ifdef CONFIG_PAX_EMUPLT
691 + int err;
692 +
693 + do { /* PaX: patched PLT emulation #1 */
694 + unsigned int ldah, ldq, jmp;
695 +
696 + err = get_user(ldah, (unsigned int *)regs->pc);
697 + err |= get_user(ldq, (unsigned int *)(regs->pc+4));
698 + err |= get_user(jmp, (unsigned int *)(regs->pc+8));
699 +
700 + if (err)
701 + break;
702 +
703 + if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
704 + (ldq & 0xFFFF0000U) == 0xA77B0000U &&
705 + jmp == 0x6BFB0000U)
706 + {
707 + unsigned long r27, addr;
708 + unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
709 + unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
710 +
711 + addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
712 + err = get_user(r27, (unsigned long *)addr);
713 + if (err)
714 + break;
715 +
716 + regs->r27 = r27;
717 + regs->pc = r27;
718 + return 2;
719 + }
720 + } while (0);
721 +
722 + do { /* PaX: patched PLT emulation #2 */
723 + unsigned int ldah, lda, br;
724 +
725 + err = get_user(ldah, (unsigned int *)regs->pc);
726 + err |= get_user(lda, (unsigned int *)(regs->pc+4));
727 + err |= get_user(br, (unsigned int *)(regs->pc+8));
728 +
729 + if (err)
730 + break;
731 +
732 + if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
733 + (lda & 0xFFFF0000U) == 0xA77B0000U &&
734 + (br & 0xFFE00000U) == 0xC3E00000U)
735 + {
736 + unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
737 + unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
738 + unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
739 +
740 + regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
741 + regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
742 + return 2;
743 + }
744 + } while (0);
745 +
746 + do { /* PaX: unpatched PLT emulation */
747 + unsigned int br;
748 +
749 + err = get_user(br, (unsigned int *)regs->pc);
750 +
751 + if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
752 + unsigned int br2, ldq, nop, jmp;
753 + unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
754 +
755 + addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
756 + err = get_user(br2, (unsigned int *)addr);
757 + err |= get_user(ldq, (unsigned int *)(addr+4));
758 + err |= get_user(nop, (unsigned int *)(addr+8));
759 + err |= get_user(jmp, (unsigned int *)(addr+12));
760 + err |= get_user(resolver, (unsigned long *)(addr+16));
761 +
762 + if (err)
763 + break;
764 +
765 + if (br2 == 0xC3600000U &&
766 + ldq == 0xA77B000CU &&
767 + nop == 0x47FF041FU &&
768 + jmp == 0x6B7B0000U)
769 + {
770 + regs->r28 = regs->pc+4;
771 + regs->r27 = addr+16;
772 + regs->pc = resolver;
773 + return 3;
774 + }
775 + }
776 + } while (0);
777 +#endif
778 +
779 + return 1;
780 +}
781 +
782 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
783 +{
784 + unsigned long i;
785 +
786 + printk(KERN_ERR "PAX: bytes at PC: ");
787 + for (i = 0; i < 5; i++) {
788 + unsigned int c;
789 + if (get_user(c, (unsigned int *)pc+i))
790 + printk(KERN_CONT "???????? ");
791 + else
792 + printk(KERN_CONT "%08x ", c);
793 + }
794 + printk("\n");
795 +}
796 +#endif
797
798 /*
799 * This routine handles page faults. It determines the address,
800 @@ -133,8 +251,29 @@ retry:
801 good_area:
802 si_code = SEGV_ACCERR;
803 if (cause < 0) {
804 - if (!(vma->vm_flags & VM_EXEC))
805 + if (!(vma->vm_flags & VM_EXEC)) {
806 +
807 +#ifdef CONFIG_PAX_PAGEEXEC
808 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
809 + goto bad_area;
810 +
811 + up_read(&mm->mmap_sem);
812 + switch (pax_handle_fetch_fault(regs)) {
813 +
814 +#ifdef CONFIG_PAX_EMUPLT
815 + case 2:
816 + case 3:
817 + return;
818 +#endif
819 +
820 + }
821 + pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
822 + do_group_exit(SIGKILL);
823 +#else
824 goto bad_area;
825 +#endif
826 +
827 + }
828 } else if (!cause) {
829 /* Allow reads even for write-only mappings */
830 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
831 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
832 index 1ad6fb6..9406b3d 100644
833 --- a/arch/arm/Kconfig
834 +++ b/arch/arm/Kconfig
835 @@ -1832,7 +1832,7 @@ config ALIGNMENT_TRAP
836
837 config UACCESS_WITH_MEMCPY
838 bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
839 - depends on MMU
840 + depends on MMU && !PAX_MEMORY_UDEREF
841 default y if CPU_FEROCEON
842 help
843 Implement faster copy_to_user and clear_user methods for CPU
844 @@ -2097,6 +2097,7 @@ config XIP_PHYS_ADDR
845 config KEXEC
846 bool "Kexec system call (EXPERIMENTAL)"
847 depends on (!SMP || PM_SLEEP_SMP)
848 + depends on !GRKERNSEC_KMEM
849 help
850 kexec is a system call that implements the ability to shutdown your
851 current kernel, and to start another kernel. It is like a reboot
852 diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
853 index da1c77d..2ee6056 100644
854 --- a/arch/arm/include/asm/atomic.h
855 +++ b/arch/arm/include/asm/atomic.h
856 @@ -17,17 +17,35 @@
857 #include <asm/barrier.h>
858 #include <asm/cmpxchg.h>
859
860 +#ifdef CONFIG_GENERIC_ATOMIC64
861 +#include <asm-generic/atomic64.h>
862 +#endif
863 +
864 #define ATOMIC_INIT(i) { (i) }
865
866 #ifdef __KERNEL__
867
868 +#define _ASM_EXTABLE(from, to) \
869 +" .pushsection __ex_table,\"a\"\n"\
870 +" .align 3\n" \
871 +" .long " #from ", " #to"\n" \
872 +" .popsection"
873 +
874 /*
875 * On ARM, ordinary assignment (str instruction) doesn't clear the local
876 * strex/ldrex monitor on some implementations. The reason we can use it for
877 * atomic_set() is the clrex or dummy strex done on every exception return.
878 */
879 #define atomic_read(v) (*(volatile int *)&(v)->counter)
880 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
881 +{
882 + return v->counter;
883 +}
884 #define atomic_set(v,i) (((v)->counter) = (i))
885 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
886 +{
887 + v->counter = i;
888 +}
889
890 #if __LINUX_ARM_ARCH__ >= 6
891
892 @@ -42,6 +60,35 @@ static inline void atomic_add(int i, atomic_t *v)
893 int result;
894
895 __asm__ __volatile__("@ atomic_add\n"
896 +"1: ldrex %1, [%3]\n"
897 +" adds %0, %1, %4\n"
898 +
899 +#ifdef CONFIG_PAX_REFCOUNT
900 +" bvc 3f\n"
901 +"2: bkpt 0xf103\n"
902 +"3:\n"
903 +#endif
904 +
905 +" strex %1, %0, [%3]\n"
906 +" teq %1, #0\n"
907 +" bne 1b"
908 +
909 +#ifdef CONFIG_PAX_REFCOUNT
910 +"\n4:\n"
911 + _ASM_EXTABLE(2b, 4b)
912 +#endif
913 +
914 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
915 + : "r" (&v->counter), "Ir" (i)
916 + : "cc");
917 +}
918 +
919 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
920 +{
921 + unsigned long tmp;
922 + int result;
923 +
924 + __asm__ __volatile__("@ atomic_add_unchecked\n"
925 "1: ldrex %0, [%3]\n"
926 " add %0, %0, %4\n"
927 " strex %1, %0, [%3]\n"
928 @@ -60,6 +107,42 @@ static inline int atomic_add_return(int i, atomic_t *v)
929 smp_mb();
930
931 __asm__ __volatile__("@ atomic_add_return\n"
932 +"1: ldrex %1, [%3]\n"
933 +" adds %0, %1, %4\n"
934 +
935 +#ifdef CONFIG_PAX_REFCOUNT
936 +" bvc 3f\n"
937 +" mov %0, %1\n"
938 +"2: bkpt 0xf103\n"
939 +"3:\n"
940 +#endif
941 +
942 +" strex %1, %0, [%3]\n"
943 +" teq %1, #0\n"
944 +" bne 1b"
945 +
946 +#ifdef CONFIG_PAX_REFCOUNT
947 +"\n4:\n"
948 + _ASM_EXTABLE(2b, 4b)
949 +#endif
950 +
951 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
952 + : "r" (&v->counter), "Ir" (i)
953 + : "cc");
954 +
955 + smp_mb();
956 +
957 + return result;
958 +}
959 +
960 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
961 +{
962 + unsigned long tmp;
963 + int result;
964 +
965 + smp_mb();
966 +
967 + __asm__ __volatile__("@ atomic_add_return_unchecked\n"
968 "1: ldrex %0, [%3]\n"
969 " add %0, %0, %4\n"
970 " strex %1, %0, [%3]\n"
971 @@ -80,6 +163,35 @@ static inline void atomic_sub(int i, atomic_t *v)
972 int result;
973
974 __asm__ __volatile__("@ atomic_sub\n"
975 +"1: ldrex %1, [%3]\n"
976 +" subs %0, %1, %4\n"
977 +
978 +#ifdef CONFIG_PAX_REFCOUNT
979 +" bvc 3f\n"
980 +"2: bkpt 0xf103\n"
981 +"3:\n"
982 +#endif
983 +
984 +" strex %1, %0, [%3]\n"
985 +" teq %1, #0\n"
986 +" bne 1b"
987 +
988 +#ifdef CONFIG_PAX_REFCOUNT
989 +"\n4:\n"
990 + _ASM_EXTABLE(2b, 4b)
991 +#endif
992 +
993 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
994 + : "r" (&v->counter), "Ir" (i)
995 + : "cc");
996 +}
997 +
998 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
999 +{
1000 + unsigned long tmp;
1001 + int result;
1002 +
1003 + __asm__ __volatile__("@ atomic_sub_unchecked\n"
1004 "1: ldrex %0, [%3]\n"
1005 " sub %0, %0, %4\n"
1006 " strex %1, %0, [%3]\n"
1007 @@ -98,11 +210,25 @@ static inline int atomic_sub_return(int i, atomic_t *v)
1008 smp_mb();
1009
1010 __asm__ __volatile__("@ atomic_sub_return\n"
1011 -"1: ldrex %0, [%3]\n"
1012 -" sub %0, %0, %4\n"
1013 +"1: ldrex %1, [%3]\n"
1014 +" subs %0, %1, %4\n"
1015 +
1016 +#ifdef CONFIG_PAX_REFCOUNT
1017 +" bvc 3f\n"
1018 +" mov %0, %1\n"
1019 +"2: bkpt 0xf103\n"
1020 +"3:\n"
1021 +#endif
1022 +
1023 " strex %1, %0, [%3]\n"
1024 " teq %1, #0\n"
1025 " bne 1b"
1026 +
1027 +#ifdef CONFIG_PAX_REFCOUNT
1028 +"\n4:\n"
1029 + _ASM_EXTABLE(2b, 4b)
1030 +#endif
1031 +
1032 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1033 : "r" (&v->counter), "Ir" (i)
1034 : "cc");
1035 @@ -134,6 +260,28 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
1036 return oldval;
1037 }
1038
1039 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1040 +{
1041 + unsigned long oldval, res;
1042 +
1043 + smp_mb();
1044 +
1045 + do {
1046 + __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1047 + "ldrex %1, [%3]\n"
1048 + "mov %0, #0\n"
1049 + "teq %1, %4\n"
1050 + "strexeq %0, %5, [%3]\n"
1051 + : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1052 + : "r" (&ptr->counter), "Ir" (old), "r" (new)
1053 + : "cc");
1054 + } while (res);
1055 +
1056 + smp_mb();
1057 +
1058 + return oldval;
1059 +}
1060 +
1061 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
1062 {
1063 unsigned long tmp, tmp2;
1064 @@ -167,7 +315,17 @@ static inline int atomic_add_return(int i, atomic_t *v)
1065
1066 return val;
1067 }
1068 +
1069 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
1070 +{
1071 + return atomic_add_return(i, v);
1072 +}
1073 +
1074 #define atomic_add(i, v) (void) atomic_add_return(i, v)
1075 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
1076 +{
1077 + (void) atomic_add_return(i, v);
1078 +}
1079
1080 static inline int atomic_sub_return(int i, atomic_t *v)
1081 {
1082 @@ -182,6 +340,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
1083 return val;
1084 }
1085 #define atomic_sub(i, v) (void) atomic_sub_return(i, v)
1086 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
1087 +{
1088 + (void) atomic_sub_return(i, v);
1089 +}
1090
1091 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1092 {
1093 @@ -197,6 +359,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1094 return ret;
1095 }
1096
1097 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1098 +{
1099 + return atomic_cmpxchg(v, old, new);
1100 +}
1101 +
1102 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
1103 {
1104 unsigned long flags;
1105 @@ -209,6 +376,10 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
1106 #endif /* __LINUX_ARM_ARCH__ */
1107
1108 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1109 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1110 +{
1111 + return xchg(&v->counter, new);
1112 +}
1113
1114 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1115 {
1116 @@ -221,11 +392,27 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1117 }
1118
1119 #define atomic_inc(v) atomic_add(1, v)
1120 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1121 +{
1122 + atomic_add_unchecked(1, v);
1123 +}
1124 #define atomic_dec(v) atomic_sub(1, v)
1125 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1126 +{
1127 + atomic_sub_unchecked(1, v);
1128 +}
1129
1130 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1131 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1132 +{
1133 + return atomic_add_return_unchecked(1, v) == 0;
1134 +}
1135 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1136 #define atomic_inc_return(v) (atomic_add_return(1, v))
1137 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1138 +{
1139 + return atomic_add_return_unchecked(1, v);
1140 +}
1141 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1142 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1143
1144 @@ -241,6 +428,14 @@ typedef struct {
1145 u64 __aligned(8) counter;
1146 } atomic64_t;
1147
1148 +#ifdef CONFIG_PAX_REFCOUNT
1149 +typedef struct {
1150 + u64 __aligned(8) counter;
1151 +} atomic64_unchecked_t;
1152 +#else
1153 +typedef atomic64_t atomic64_unchecked_t;
1154 +#endif
1155 +
1156 #define ATOMIC64_INIT(i) { (i) }
1157
1158 #ifdef CONFIG_ARM_LPAE
1159 @@ -257,6 +452,19 @@ static inline u64 atomic64_read(const atomic64_t *v)
1160 return result;
1161 }
1162
1163 +static inline u64 atomic64_read_unchecked(const atomic64_unchecked_t *v)
1164 +{
1165 + u64 result;
1166 +
1167 + __asm__ __volatile__("@ atomic64_read_unchecked\n"
1168 +" ldrd %0, %H0, [%1]"
1169 + : "=&r" (result)
1170 + : "r" (&v->counter), "Qo" (v->counter)
1171 + );
1172 +
1173 + return result;
1174 +}
1175 +
1176 static inline void atomic64_set(atomic64_t *v, u64 i)
1177 {
1178 __asm__ __volatile__("@ atomic64_set\n"
1179 @@ -265,6 +473,15 @@ static inline void atomic64_set(atomic64_t *v, u64 i)
1180 : "r" (&v->counter), "r" (i)
1181 );
1182 }
1183 +
1184 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, u64 i)
1185 +{
1186 + __asm__ __volatile__("@ atomic64_set_unchecked\n"
1187 +" strd %2, %H2, [%1]"
1188 + : "=Qo" (v->counter)
1189 + : "r" (&v->counter), "r" (i)
1190 + );
1191 +}
1192 #else
1193 static inline u64 atomic64_read(const atomic64_t *v)
1194 {
1195 @@ -279,6 +496,19 @@ static inline u64 atomic64_read(const atomic64_t *v)
1196 return result;
1197 }
1198
1199 +static inline u64 atomic64_read_unchecked(atomic64_unchecked_t *v)
1200 +{
1201 + u64 result;
1202 +
1203 + __asm__ __volatile__("@ atomic64_read_unchecked\n"
1204 +" ldrexd %0, %H0, [%1]"
1205 + : "=&r" (result)
1206 + : "r" (&v->counter), "Qo" (v->counter)
1207 + );
1208 +
1209 + return result;
1210 +}
1211 +
1212 static inline void atomic64_set(atomic64_t *v, u64 i)
1213 {
1214 u64 tmp;
1215 @@ -292,6 +522,21 @@ static inline void atomic64_set(atomic64_t *v, u64 i)
1216 : "r" (&v->counter), "r" (i)
1217 : "cc");
1218 }
1219 +
1220 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, u64 i)
1221 +{
1222 + u64 tmp;
1223 +
1224 + __asm__ __volatile__("@ atomic64_set_unchecked\n"
1225 +"1: ldrexd %0, %H0, [%2]\n"
1226 +" strexd %0, %3, %H3, [%2]\n"
1227 +" teq %0, #0\n"
1228 +" bne 1b"
1229 + : "=&r" (tmp), "=Qo" (v->counter)
1230 + : "r" (&v->counter), "r" (i)
1231 + : "cc");
1232 +}
1233 +
1234 #endif
1235
1236 static inline void atomic64_add(u64 i, atomic64_t *v)
1237 @@ -302,6 +547,36 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
1238 __asm__ __volatile__("@ atomic64_add\n"
1239 "1: ldrexd %0, %H0, [%3]\n"
1240 " adds %0, %0, %4\n"
1241 +" adcs %H0, %H0, %H4\n"
1242 +
1243 +#ifdef CONFIG_PAX_REFCOUNT
1244 +" bvc 3f\n"
1245 +"2: bkpt 0xf103\n"
1246 +"3:\n"
1247 +#endif
1248 +
1249 +" strexd %1, %0, %H0, [%3]\n"
1250 +" teq %1, #0\n"
1251 +" bne 1b"
1252 +
1253 +#ifdef CONFIG_PAX_REFCOUNT
1254 +"\n4:\n"
1255 + _ASM_EXTABLE(2b, 4b)
1256 +#endif
1257 +
1258 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1259 + : "r" (&v->counter), "r" (i)
1260 + : "cc");
1261 +}
1262 +
1263 +static inline void atomic64_add_unchecked(u64 i, atomic64_unchecked_t *v)
1264 +{
1265 + u64 result;
1266 + unsigned long tmp;
1267 +
1268 + __asm__ __volatile__("@ atomic64_add_unchecked\n"
1269 +"1: ldrexd %0, %H0, [%3]\n"
1270 +" adds %0, %0, %4\n"
1271 " adc %H0, %H0, %H4\n"
1272 " strexd %1, %0, %H0, [%3]\n"
1273 " teq %1, #0\n"
1274 @@ -313,12 +588,49 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
1275
1276 static inline u64 atomic64_add_return(u64 i, atomic64_t *v)
1277 {
1278 - u64 result;
1279 - unsigned long tmp;
1280 + u64 result, tmp;
1281
1282 smp_mb();
1283
1284 __asm__ __volatile__("@ atomic64_add_return\n"
1285 +"1: ldrexd %1, %H1, [%3]\n"
1286 +" adds %0, %1, %4\n"
1287 +" adcs %H0, %H1, %H4\n"
1288 +
1289 +#ifdef CONFIG_PAX_REFCOUNT
1290 +" bvc 3f\n"
1291 +" mov %0, %1\n"
1292 +" mov %H0, %H1\n"
1293 +"2: bkpt 0xf103\n"
1294 +"3:\n"
1295 +#endif
1296 +
1297 +" strexd %1, %0, %H0, [%3]\n"
1298 +" teq %1, #0\n"
1299 +" bne 1b"
1300 +
1301 +#ifdef CONFIG_PAX_REFCOUNT
1302 +"\n4:\n"
1303 + _ASM_EXTABLE(2b, 4b)
1304 +#endif
1305 +
1306 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1307 + : "r" (&v->counter), "r" (i)
1308 + : "cc");
1309 +
1310 + smp_mb();
1311 +
1312 + return result;
1313 +}
1314 +
1315 +static inline u64 atomic64_add_return_unchecked(u64 i, atomic64_unchecked_t *v)
1316 +{
1317 + u64 result;
1318 + unsigned long tmp;
1319 +
1320 + smp_mb();
1321 +
1322 + __asm__ __volatile__("@ atomic64_add_return_unchecked\n"
1323 "1: ldrexd %0, %H0, [%3]\n"
1324 " adds %0, %0, %4\n"
1325 " adc %H0, %H0, %H4\n"
1326 @@ -342,6 +654,36 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1327 __asm__ __volatile__("@ atomic64_sub\n"
1328 "1: ldrexd %0, %H0, [%3]\n"
1329 " subs %0, %0, %4\n"
1330 +" sbcs %H0, %H0, %H4\n"
1331 +
1332 +#ifdef CONFIG_PAX_REFCOUNT
1333 +" bvc 3f\n"
1334 +"2: bkpt 0xf103\n"
1335 +"3:\n"
1336 +#endif
1337 +
1338 +" strexd %1, %0, %H0, [%3]\n"
1339 +" teq %1, #0\n"
1340 +" bne 1b"
1341 +
1342 +#ifdef CONFIG_PAX_REFCOUNT
1343 +"\n4:\n"
1344 + _ASM_EXTABLE(2b, 4b)
1345 +#endif
1346 +
1347 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1348 + : "r" (&v->counter), "r" (i)
1349 + : "cc");
1350 +}
1351 +
1352 +static inline void atomic64_sub_unchecked(u64 i, atomic64_unchecked_t *v)
1353 +{
1354 + u64 result;
1355 + unsigned long tmp;
1356 +
1357 + __asm__ __volatile__("@ atomic64_sub_unchecked\n"
1358 +"1: ldrexd %0, %H0, [%3]\n"
1359 +" subs %0, %0, %4\n"
1360 " sbc %H0, %H0, %H4\n"
1361 " strexd %1, %0, %H0, [%3]\n"
1362 " teq %1, #0\n"
1363 @@ -353,18 +695,32 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1364
1365 static inline u64 atomic64_sub_return(u64 i, atomic64_t *v)
1366 {
1367 - u64 result;
1368 - unsigned long tmp;
1369 + u64 result, tmp;
1370
1371 smp_mb();
1372
1373 __asm__ __volatile__("@ atomic64_sub_return\n"
1374 -"1: ldrexd %0, %H0, [%3]\n"
1375 -" subs %0, %0, %4\n"
1376 -" sbc %H0, %H0, %H4\n"
1377 +"1: ldrexd %1, %H1, [%3]\n"
1378 +" subs %0, %1, %4\n"
1379 +" sbcs %H0, %H1, %H4\n"
1380 +
1381 +#ifdef CONFIG_PAX_REFCOUNT
1382 +" bvc 3f\n"
1383 +" mov %0, %1\n"
1384 +" mov %H0, %H1\n"
1385 +"2: bkpt 0xf103\n"
1386 +"3:\n"
1387 +#endif
1388 +
1389 " strexd %1, %0, %H0, [%3]\n"
1390 " teq %1, #0\n"
1391 " bne 1b"
1392 +
1393 +#ifdef CONFIG_PAX_REFCOUNT
1394 +"\n4:\n"
1395 + _ASM_EXTABLE(2b, 4b)
1396 +#endif
1397 +
1398 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1399 : "r" (&v->counter), "r" (i)
1400 : "cc");
1401 @@ -398,6 +754,30 @@ static inline u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old, u64 new)
1402 return oldval;
1403 }
1404
1405 +static inline u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old, u64 new)
1406 +{
1407 + u64 oldval;
1408 + unsigned long res;
1409 +
1410 + smp_mb();
1411 +
1412 + do {
1413 + __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1414 + "ldrexd %1, %H1, [%3]\n"
1415 + "mov %0, #0\n"
1416 + "teq %1, %4\n"
1417 + "teqeq %H1, %H4\n"
1418 + "strexdeq %0, %5, %H5, [%3]"
1419 + : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1420 + : "r" (&ptr->counter), "r" (old), "r" (new)
1421 + : "cc");
1422 + } while (res);
1423 +
1424 + smp_mb();
1425 +
1426 + return oldval;
1427 +}
1428 +
1429 static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1430 {
1431 u64 result;
1432 @@ -421,21 +801,34 @@ static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1433
1434 static inline u64 atomic64_dec_if_positive(atomic64_t *v)
1435 {
1436 - u64 result;
1437 - unsigned long tmp;
1438 + u64 result, tmp;
1439
1440 smp_mb();
1441
1442 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1443 -"1: ldrexd %0, %H0, [%3]\n"
1444 -" subs %0, %0, #1\n"
1445 -" sbc %H0, %H0, #0\n"
1446 +"1: ldrexd %1, %H1, [%3]\n"
1447 +" subs %0, %1, #1\n"
1448 +" sbcs %H0, %H1, #0\n"
1449 +
1450 +#ifdef CONFIG_PAX_REFCOUNT
1451 +" bvc 3f\n"
1452 +" mov %0, %1\n"
1453 +" mov %H0, %H1\n"
1454 +"2: bkpt 0xf103\n"
1455 +"3:\n"
1456 +#endif
1457 +
1458 " teq %H0, #0\n"
1459 -" bmi 2f\n"
1460 +" bmi 4f\n"
1461 " strexd %1, %0, %H0, [%3]\n"
1462 " teq %1, #0\n"
1463 " bne 1b\n"
1464 -"2:"
1465 +"4:\n"
1466 +
1467 +#ifdef CONFIG_PAX_REFCOUNT
1468 + _ASM_EXTABLE(2b, 4b)
1469 +#endif
1470 +
1471 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1472 : "r" (&v->counter)
1473 : "cc");
1474 @@ -458,13 +851,25 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1475 " teq %0, %5\n"
1476 " teqeq %H0, %H5\n"
1477 " moveq %1, #0\n"
1478 -" beq 2f\n"
1479 +" beq 4f\n"
1480 " adds %0, %0, %6\n"
1481 -" adc %H0, %H0, %H6\n"
1482 +" adcs %H0, %H0, %H6\n"
1483 +
1484 +#ifdef CONFIG_PAX_REFCOUNT
1485 +" bvc 3f\n"
1486 +"2: bkpt 0xf103\n"
1487 +"3:\n"
1488 +#endif
1489 +
1490 " strexd %2, %0, %H0, [%4]\n"
1491 " teq %2, #0\n"
1492 " bne 1b\n"
1493 -"2:"
1494 +"4:\n"
1495 +
1496 +#ifdef CONFIG_PAX_REFCOUNT
1497 + _ASM_EXTABLE(2b, 4b)
1498 +#endif
1499 +
1500 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1501 : "r" (&v->counter), "r" (u), "r" (a)
1502 : "cc");
1503 @@ -477,10 +882,13 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1504
1505 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1506 #define atomic64_inc(v) atomic64_add(1LL, (v))
1507 +#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1508 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1509 +#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1510 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1511 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1512 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1513 +#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1514 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1515 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1516 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1517 diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1518 index 75fe66b..ba3dee4 100644
1519 --- a/arch/arm/include/asm/cache.h
1520 +++ b/arch/arm/include/asm/cache.h
1521 @@ -4,8 +4,10 @@
1522 #ifndef __ASMARM_CACHE_H
1523 #define __ASMARM_CACHE_H
1524
1525 +#include <linux/const.h>
1526 +
1527 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1528 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1529 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1530
1531 /*
1532 * Memory returned by kmalloc() may be used for DMA, so we must make
1533 @@ -24,5 +26,6 @@
1534 #endif
1535
1536 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1537 +#define __read_only __attribute__ ((__section__(".data..read_only")))
1538
1539 #endif
1540 diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1541 index 15f2d5b..43ffa53 100644
1542 --- a/arch/arm/include/asm/cacheflush.h
1543 +++ b/arch/arm/include/asm/cacheflush.h
1544 @@ -116,7 +116,7 @@ struct cpu_cache_fns {
1545 void (*dma_unmap_area)(const void *, size_t, int);
1546
1547 void (*dma_flush_range)(const void *, const void *);
1548 -};
1549 +} __no_const;
1550
1551 /*
1552 * Select the calling method
1553 diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1554 index 6dcc164..b14d917 100644
1555 --- a/arch/arm/include/asm/checksum.h
1556 +++ b/arch/arm/include/asm/checksum.h
1557 @@ -37,7 +37,19 @@ __wsum
1558 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1559
1560 __wsum
1561 -csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1562 +__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1563 +
1564 +static inline __wsum
1565 +csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1566 +{
1567 + __wsum ret;
1568 + pax_open_userland();
1569 + ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1570 + pax_close_userland();
1571 + return ret;
1572 +}
1573 +
1574 +
1575
1576 /*
1577 * Fold a partial checksum without adding pseudo headers
1578 diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1579 index 4f009c1..466c59b 100644
1580 --- a/arch/arm/include/asm/cmpxchg.h
1581 +++ b/arch/arm/include/asm/cmpxchg.h
1582 @@ -102,6 +102,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1583
1584 #define xchg(ptr,x) \
1585 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1586 +#define xchg_unchecked(ptr,x) \
1587 + ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1588
1589 #include <asm-generic/cmpxchg-local.h>
1590
1591 diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1592 index 6ddbe44..b5e38b1 100644
1593 --- a/arch/arm/include/asm/domain.h
1594 +++ b/arch/arm/include/asm/domain.h
1595 @@ -48,18 +48,37 @@
1596 * Domain types
1597 */
1598 #define DOMAIN_NOACCESS 0
1599 -#define DOMAIN_CLIENT 1
1600 #ifdef CONFIG_CPU_USE_DOMAINS
1601 +#define DOMAIN_USERCLIENT 1
1602 +#define DOMAIN_KERNELCLIENT 1
1603 #define DOMAIN_MANAGER 3
1604 +#define DOMAIN_VECTORS DOMAIN_USER
1605 #else
1606 +
1607 +#ifdef CONFIG_PAX_KERNEXEC
1608 #define DOMAIN_MANAGER 1
1609 +#define DOMAIN_KERNEXEC 3
1610 +#else
1611 +#define DOMAIN_MANAGER 1
1612 +#endif
1613 +
1614 +#ifdef CONFIG_PAX_MEMORY_UDEREF
1615 +#define DOMAIN_USERCLIENT 0
1616 +#define DOMAIN_UDEREF 1
1617 +#define DOMAIN_VECTORS DOMAIN_KERNEL
1618 +#else
1619 +#define DOMAIN_USERCLIENT 1
1620 +#define DOMAIN_VECTORS DOMAIN_USER
1621 +#endif
1622 +#define DOMAIN_KERNELCLIENT 1
1623 +
1624 #endif
1625
1626 #define domain_val(dom,type) ((type) << (2*(dom)))
1627
1628 #ifndef __ASSEMBLY__
1629
1630 -#ifdef CONFIG_CPU_USE_DOMAINS
1631 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1632 static inline void set_domain(unsigned val)
1633 {
1634 asm volatile(
1635 @@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1636 isb();
1637 }
1638
1639 -#define modify_domain(dom,type) \
1640 - do { \
1641 - struct thread_info *thread = current_thread_info(); \
1642 - unsigned int domain = thread->cpu_domain; \
1643 - domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1644 - thread->cpu_domain = domain | domain_val(dom, type); \
1645 - set_domain(thread->cpu_domain); \
1646 - } while (0)
1647 -
1648 +extern void modify_domain(unsigned int dom, unsigned int type);
1649 #else
1650 static inline void set_domain(unsigned val) { }
1651 static inline void modify_domain(unsigned dom, unsigned type) { }
1652 diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1653 index f4b46d3..abc9b2b 100644
1654 --- a/arch/arm/include/asm/elf.h
1655 +++ b/arch/arm/include/asm/elf.h
1656 @@ -114,7 +114,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1657 the loader. We need to make sure that it is out of the way of the program
1658 that it will "exec", and that there is sufficient room for the brk. */
1659
1660 -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1661 +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1662 +
1663 +#ifdef CONFIG_PAX_ASLR
1664 +#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1665 +
1666 +#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1667 +#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1668 +#endif
1669
1670 /* When the program starts, a1 contains a pointer to a function to be
1671 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1672 @@ -124,10 +131,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1673 extern void elf_set_personality(const struct elf32_hdr *);
1674 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1675
1676 -struct mm_struct;
1677 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1678 -#define arch_randomize_brk arch_randomize_brk
1679 -
1680 #ifdef CONFIG_MMU
1681 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
1682 struct linux_binprm;
1683 diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1684 index de53547..52b9a28 100644
1685 --- a/arch/arm/include/asm/fncpy.h
1686 +++ b/arch/arm/include/asm/fncpy.h
1687 @@ -81,7 +81,9 @@
1688 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1689 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1690 \
1691 + pax_open_kernel(); \
1692 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1693 + pax_close_kernel(); \
1694 flush_icache_range((unsigned long)(dest_buf), \
1695 (unsigned long)(dest_buf) + (size)); \
1696 \
1697 diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1698 index e42cf59..7b94b8f 100644
1699 --- a/arch/arm/include/asm/futex.h
1700 +++ b/arch/arm/include/asm/futex.h
1701 @@ -50,6 +50,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1702 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1703 return -EFAULT;
1704
1705 + pax_open_userland();
1706 +
1707 smp_mb();
1708 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1709 "1: ldrex %1, [%4]\n"
1710 @@ -65,6 +67,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1711 : "cc", "memory");
1712 smp_mb();
1713
1714 + pax_close_userland();
1715 +
1716 *uval = val;
1717 return ret;
1718 }
1719 @@ -95,6 +99,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1720 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1721 return -EFAULT;
1722
1723 + pax_open_userland();
1724 +
1725 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1726 "1: " TUSER(ldr) " %1, [%4]\n"
1727 " teq %1, %2\n"
1728 @@ -105,6 +111,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1729 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1730 : "cc", "memory");
1731
1732 + pax_close_userland();
1733 +
1734 *uval = val;
1735 return ret;
1736 }
1737 @@ -127,6 +135,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1738 return -EFAULT;
1739
1740 pagefault_disable(); /* implies preempt_disable() */
1741 + pax_open_userland();
1742
1743 switch (op) {
1744 case FUTEX_OP_SET:
1745 @@ -148,6 +157,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1746 ret = -ENOSYS;
1747 }
1748
1749 + pax_close_userland();
1750 pagefault_enable(); /* subsumes preempt_enable() */
1751
1752 if (!ret) {
1753 diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1754 index 83eb2f7..ed77159 100644
1755 --- a/arch/arm/include/asm/kmap_types.h
1756 +++ b/arch/arm/include/asm/kmap_types.h
1757 @@ -4,6 +4,6 @@
1758 /*
1759 * This is the "bare minimum". AIO seems to require this.
1760 */
1761 -#define KM_TYPE_NR 16
1762 +#define KM_TYPE_NR 17
1763
1764 #endif
1765 diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1766 index 9e614a1..3302cca 100644
1767 --- a/arch/arm/include/asm/mach/dma.h
1768 +++ b/arch/arm/include/asm/mach/dma.h
1769 @@ -22,7 +22,7 @@ struct dma_ops {
1770 int (*residue)(unsigned int, dma_t *); /* optional */
1771 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1772 const char *type;
1773 -};
1774 +} __do_const;
1775
1776 struct dma_struct {
1777 void *addr; /* single DMA address */
1778 diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1779 index 2fe141f..192dc01 100644
1780 --- a/arch/arm/include/asm/mach/map.h
1781 +++ b/arch/arm/include/asm/mach/map.h
1782 @@ -27,13 +27,16 @@ struct map_desc {
1783 #define MT_MINICLEAN 6
1784 #define MT_LOW_VECTORS 7
1785 #define MT_HIGH_VECTORS 8
1786 -#define MT_MEMORY 9
1787 +#define MT_MEMORY_RWX 9
1788 #define MT_ROM 10
1789 -#define MT_MEMORY_NONCACHED 11
1790 +#define MT_MEMORY_NONCACHED_RX 11
1791 #define MT_MEMORY_DTCM 12
1792 #define MT_MEMORY_ITCM 13
1793 #define MT_MEMORY_SO 14
1794 #define MT_MEMORY_DMA_READY 15
1795 +#define MT_MEMORY_RW 16
1796 +#define MT_MEMORY_RX 17
1797 +#define MT_MEMORY_NONCACHED_RW 18
1798
1799 #ifdef CONFIG_MMU
1800 extern void iotable_init(struct map_desc *, int);
1801 diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1802 index f94784f..9a09a4a 100644
1803 --- a/arch/arm/include/asm/outercache.h
1804 +++ b/arch/arm/include/asm/outercache.h
1805 @@ -35,7 +35,7 @@ struct outer_cache_fns {
1806 #endif
1807 void (*set_debug)(unsigned long);
1808 void (*resume)(void);
1809 -};
1810 +} __no_const;
1811
1812 extern struct outer_cache_fns outer_cache;
1813
1814 diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1815 index 4355f0e..c229913 100644
1816 --- a/arch/arm/include/asm/page.h
1817 +++ b/arch/arm/include/asm/page.h
1818 @@ -114,7 +114,7 @@ struct cpu_user_fns {
1819 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1820 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1821 unsigned long vaddr, struct vm_area_struct *vma);
1822 -};
1823 +} __no_const;
1824
1825 #ifdef MULTI_USER
1826 extern struct cpu_user_fns cpu_user;
1827 diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1828 index 943504f..c37a730 100644
1829 --- a/arch/arm/include/asm/pgalloc.h
1830 +++ b/arch/arm/include/asm/pgalloc.h
1831 @@ -17,6 +17,7 @@
1832 #include <asm/processor.h>
1833 #include <asm/cacheflush.h>
1834 #include <asm/tlbflush.h>
1835 +#include <asm/system_info.h>
1836
1837 #define check_pgt_cache() do { } while (0)
1838
1839 @@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1840 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1841 }
1842
1843 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1844 +{
1845 + pud_populate(mm, pud, pmd);
1846 +}
1847 +
1848 #else /* !CONFIG_ARM_LPAE */
1849
1850 /*
1851 @@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1852 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1853 #define pmd_free(mm, pmd) do { } while (0)
1854 #define pud_populate(mm,pmd,pte) BUG()
1855 +#define pud_populate_kernel(mm,pmd,pte) BUG()
1856
1857 #endif /* CONFIG_ARM_LPAE */
1858
1859 @@ -126,6 +133,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1860 __free_page(pte);
1861 }
1862
1863 +static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1864 +{
1865 +#ifdef CONFIG_ARM_LPAE
1866 + pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1867 +#else
1868 + if (addr & SECTION_SIZE)
1869 + pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1870 + else
1871 + pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1872 +#endif
1873 + flush_pmd_entry(pmdp);
1874 +}
1875 +
1876 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1877 pmdval_t prot)
1878 {
1879 @@ -155,7 +175,7 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep)
1880 static inline void
1881 pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep)
1882 {
1883 - __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE);
1884 + __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE | __supported_pmd_mask);
1885 }
1886 #define pmd_pgtable(pmd) pmd_page(pmd)
1887
1888 diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1889 index 5cfba15..f415e1a 100644
1890 --- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1891 +++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1892 @@ -20,12 +20,15 @@
1893 #define PMD_TYPE_FAULT (_AT(pmdval_t, 0) << 0)
1894 #define PMD_TYPE_TABLE (_AT(pmdval_t, 1) << 0)
1895 #define PMD_TYPE_SECT (_AT(pmdval_t, 2) << 0)
1896 +#define PMD_PXNTABLE (_AT(pmdval_t, 1) << 2) /* v7 */
1897 #define PMD_BIT4 (_AT(pmdval_t, 1) << 4)
1898 #define PMD_DOMAIN(x) (_AT(pmdval_t, (x)) << 5)
1899 #define PMD_PROTECTION (_AT(pmdval_t, 1) << 9) /* v5 */
1900 +
1901 /*
1902 * - section
1903 */
1904 +#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1905 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1906 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1907 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1908 @@ -37,6 +40,7 @@
1909 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1910 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1911 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1912 +#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1913
1914 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1915 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1916 @@ -66,6 +70,7 @@
1917 * - extended small page/tiny page
1918 */
1919 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1920 +#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1921 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1922 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1923 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1924 diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1925 index f97ee02..cc9fe9e 100644
1926 --- a/arch/arm/include/asm/pgtable-2level.h
1927 +++ b/arch/arm/include/asm/pgtable-2level.h
1928 @@ -126,6 +126,9 @@
1929 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1930 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1931
1932 +/* Two-level page tables only have PXN in the PGD, not in the PTE. */
1933 +#define L_PTE_PXN (_AT(pteval_t, 0))
1934 +
1935 /*
1936 * These are the memory types, defined to be compatible with
1937 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
1938 diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h
1939 index 626989f..9d67a33 100644
1940 --- a/arch/arm/include/asm/pgtable-3level-hwdef.h
1941 +++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
1942 @@ -75,6 +75,7 @@
1943 #define PTE_EXT_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1944 #define PTE_EXT_AF (_AT(pteval_t, 1) << 10) /* Access Flag */
1945 #define PTE_EXT_NG (_AT(pteval_t, 1) << 11) /* nG */
1946 +#define PTE_EXT_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1947 #define PTE_EXT_XN (_AT(pteval_t, 1) << 54) /* XN */
1948
1949 /*
1950 diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
1951 index 5689c18..eea12f9 100644
1952 --- a/arch/arm/include/asm/pgtable-3level.h
1953 +++ b/arch/arm/include/asm/pgtable-3level.h
1954 @@ -82,6 +82,7 @@
1955 #define L_PTE_RDONLY (_AT(pteval_t, 1) << 7) /* AP[2] */
1956 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1957 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
1958 +#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1959 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
1960 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55) /* unused */
1961 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56) /* unused */
1962 @@ -95,6 +96,7 @@
1963 /*
1964 * To be used in assembly code with the upper page attributes.
1965 */
1966 +#define L_PTE_PXN_HIGH (1 << (53 - 32))
1967 #define L_PTE_XN_HIGH (1 << (54 - 32))
1968 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
1969
1970 diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
1971 index 1571d12..b8a9b43 100644
1972 --- a/arch/arm/include/asm/pgtable.h
1973 +++ b/arch/arm/include/asm/pgtable.h
1974 @@ -33,6 +33,9 @@
1975 #include <asm/pgtable-2level.h>
1976 #endif
1977
1978 +#define ktla_ktva(addr) (addr)
1979 +#define ktva_ktla(addr) (addr)
1980 +
1981 /*
1982 * Just any arbitrary offset to the start of the vmalloc VM area: the
1983 * current 8MB value just means that there will be a 8MB "hole" after the
1984 @@ -48,6 +51,9 @@
1985 #define LIBRARY_TEXT_START 0x0c000000
1986
1987 #ifndef __ASSEMBLY__
1988 +extern pteval_t __supported_pte_mask;
1989 +extern pmdval_t __supported_pmd_mask;
1990 +
1991 extern void __pte_error(const char *file, int line, pte_t);
1992 extern void __pmd_error(const char *file, int line, pmd_t);
1993 extern void __pgd_error(const char *file, int line, pgd_t);
1994 @@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
1995 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
1996 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
1997
1998 +#define __HAVE_ARCH_PAX_OPEN_KERNEL
1999 +#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2000 +
2001 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2002 +#include <asm/domain.h>
2003 +#include <linux/thread_info.h>
2004 +#include <linux/preempt.h>
2005 +
2006 +static inline int test_domain(int domain, int domaintype)
2007 +{
2008 + return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2009 +}
2010 +#endif
2011 +
2012 +#ifdef CONFIG_PAX_KERNEXEC
2013 +static inline unsigned long pax_open_kernel(void) {
2014 +#ifdef CONFIG_ARM_LPAE
2015 + /* TODO */
2016 +#else
2017 + preempt_disable();
2018 + BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2019 + modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2020 +#endif
2021 + return 0;
2022 +}
2023 +
2024 +static inline unsigned long pax_close_kernel(void) {
2025 +#ifdef CONFIG_ARM_LPAE
2026 + /* TODO */
2027 +#else
2028 + BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2029 + /* DOMAIN_MANAGER = "client" under KERNEXEC */
2030 + modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2031 + preempt_enable_no_resched();
2032 +#endif
2033 + return 0;
2034 +}
2035 +#else
2036 +static inline unsigned long pax_open_kernel(void) { return 0; }
2037 +static inline unsigned long pax_close_kernel(void) { return 0; }
2038 +#endif
2039 +
2040 /*
2041 * This is the lowest virtual address we can permit any user space
2042 * mapping to be mapped at. This is particularly important for
2043 @@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2044 /*
2045 * The pgprot_* and protection_map entries will be fixed up in runtime
2046 * to include the cachable and bufferable bits based on memory policy,
2047 - * as well as any architecture dependent bits like global/ASID and SMP
2048 - * shared mapping bits.
2049 + * as well as any architecture dependent bits like global/ASID, PXN,
2050 + * and SMP shared mapping bits.
2051 */
2052 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2053
2054 @@ -260,7 +308,7 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; }
2055 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2056 {
2057 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2058 - L_PTE_NONE | L_PTE_VALID;
2059 + L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2060 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2061 return pte;
2062 }
2063 diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h
2064 index 5324c11..bcae5f0 100644
2065 --- a/arch/arm/include/asm/proc-fns.h
2066 +++ b/arch/arm/include/asm/proc-fns.h
2067 @@ -75,7 +75,7 @@ extern struct processor {
2068 unsigned int suspend_size;
2069 void (*do_suspend)(void *);
2070 void (*do_resume)(void *);
2071 -} processor;
2072 +} __do_const processor;
2073
2074 #ifndef MULTI_CPU
2075 extern void cpu_proc_init(void);
2076 diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2077 index c4ae171..ea0c0c2 100644
2078 --- a/arch/arm/include/asm/psci.h
2079 +++ b/arch/arm/include/asm/psci.h
2080 @@ -29,7 +29,7 @@ struct psci_operations {
2081 int (*cpu_off)(struct psci_power_state state);
2082 int (*cpu_on)(unsigned long cpuid, unsigned long entry_point);
2083 int (*migrate)(unsigned long cpuid);
2084 -};
2085 +} __no_const;
2086
2087 extern struct psci_operations psci_ops;
2088 extern struct smp_operations psci_smp_ops;
2089 diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2090 index a8cae71c..65dd797 100644
2091 --- a/arch/arm/include/asm/smp.h
2092 +++ b/arch/arm/include/asm/smp.h
2093 @@ -110,7 +110,7 @@ struct smp_operations {
2094 int (*cpu_disable)(unsigned int cpu);
2095 #endif
2096 #endif
2097 -};
2098 +} __no_const;
2099
2100 /*
2101 * set platform specific SMP operations
2102 diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2103 index df5e13d..97efb82 100644
2104 --- a/arch/arm/include/asm/thread_info.h
2105 +++ b/arch/arm/include/asm/thread_info.h
2106 @@ -88,9 +88,9 @@ struct thread_info {
2107 .flags = 0, \
2108 .preempt_count = INIT_PREEMPT_COUNT, \
2109 .addr_limit = KERNEL_DS, \
2110 - .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2111 - domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2112 - domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2113 + .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2114 + domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2115 + domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2116 .restart_block = { \
2117 .fn = do_no_restart_syscall, \
2118 }, \
2119 @@ -163,7 +163,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2120 #define TIF_SYSCALL_AUDIT 9
2121 #define TIF_SYSCALL_TRACEPOINT 10
2122 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2123 -#define TIF_NOHZ 12 /* in adaptive nohz mode */
2124 +/* within 8 bits of TIF_SYSCALL_TRACE
2125 + * to meet flexible second operand requirements
2126 + */
2127 +#define TIF_GRSEC_SETXID 12
2128 +#define TIF_NOHZ 13 /* in adaptive nohz mode */
2129 #define TIF_USING_IWMMXT 17
2130 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2131 #define TIF_RESTORE_SIGMASK 20
2132 @@ -176,10 +180,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2133 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2134 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2135 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2136 +#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2137
2138 /* Checks for any syscall work in entry-common.S */
2139 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2140 - _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2141 + _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2142
2143 /*
2144 * Change these and you break ASM code in entry-common.S
2145 diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2146 index 72abdc5..9eba222 100644
2147 --- a/arch/arm/include/asm/uaccess.h
2148 +++ b/arch/arm/include/asm/uaccess.h
2149 @@ -18,6 +18,7 @@
2150 #include <asm/domain.h>
2151 #include <asm/unified.h>
2152 #include <asm/compiler.h>
2153 +#include <asm/pgtable.h>
2154
2155 #if __LINUX_ARM_ARCH__ < 6
2156 #include <asm-generic/uaccess-unaligned.h>
2157 @@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2158 static inline void set_fs(mm_segment_t fs)
2159 {
2160 current_thread_info()->addr_limit = fs;
2161 - modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2162 + modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2163 }
2164
2165 #define segment_eq(a,b) ((a) == (b))
2166
2167 +#define __HAVE_ARCH_PAX_OPEN_USERLAND
2168 +#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2169 +
2170 +static inline void pax_open_userland(void)
2171 +{
2172 +
2173 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2174 + if (segment_eq(get_fs(), USER_DS)) {
2175 + BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2176 + modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2177 + }
2178 +#endif
2179 +
2180 +}
2181 +
2182 +static inline void pax_close_userland(void)
2183 +{
2184 +
2185 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2186 + if (segment_eq(get_fs(), USER_DS)) {
2187 + BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2188 + modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2189 + }
2190 +#endif
2191 +
2192 +}
2193 +
2194 #define __addr_ok(addr) ({ \
2195 unsigned long flag; \
2196 __asm__("cmp %2, %0; movlo %0, #0" \
2197 @@ -150,8 +178,12 @@ extern int __get_user_4(void *);
2198
2199 #define get_user(x,p) \
2200 ({ \
2201 + int __e; \
2202 might_fault(); \
2203 - __get_user_check(x,p); \
2204 + pax_open_userland(); \
2205 + __e = __get_user_check(x,p); \
2206 + pax_close_userland(); \
2207 + __e; \
2208 })
2209
2210 extern int __put_user_1(void *, unsigned int);
2211 @@ -195,8 +227,12 @@ extern int __put_user_8(void *, unsigned long long);
2212
2213 #define put_user(x,p) \
2214 ({ \
2215 + int __e; \
2216 might_fault(); \
2217 - __put_user_check(x,p); \
2218 + pax_open_userland(); \
2219 + __e = __put_user_check(x,p); \
2220 + pax_close_userland(); \
2221 + __e; \
2222 })
2223
2224 #else /* CONFIG_MMU */
2225 @@ -237,13 +273,17 @@ static inline void set_fs(mm_segment_t fs)
2226 #define __get_user(x,ptr) \
2227 ({ \
2228 long __gu_err = 0; \
2229 + pax_open_userland(); \
2230 __get_user_err((x),(ptr),__gu_err); \
2231 + pax_close_userland(); \
2232 __gu_err; \
2233 })
2234
2235 #define __get_user_error(x,ptr,err) \
2236 ({ \
2237 + pax_open_userland(); \
2238 __get_user_err((x),(ptr),err); \
2239 + pax_close_userland(); \
2240 (void) 0; \
2241 })
2242
2243 @@ -319,13 +359,17 @@ do { \
2244 #define __put_user(x,ptr) \
2245 ({ \
2246 long __pu_err = 0; \
2247 + pax_open_userland(); \
2248 __put_user_err((x),(ptr),__pu_err); \
2249 + pax_close_userland(); \
2250 __pu_err; \
2251 })
2252
2253 #define __put_user_error(x,ptr,err) \
2254 ({ \
2255 + pax_open_userland(); \
2256 __put_user_err((x),(ptr),err); \
2257 + pax_close_userland(); \
2258 (void) 0; \
2259 })
2260
2261 @@ -425,11 +469,44 @@ do { \
2262
2263
2264 #ifdef CONFIG_MMU
2265 -extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2266 -extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2267 +extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2268 +extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2269 +
2270 +static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2271 +{
2272 + unsigned long ret;
2273 +
2274 + check_object_size(to, n, false);
2275 + pax_open_userland();
2276 + ret = ___copy_from_user(to, from, n);
2277 + pax_close_userland();
2278 + return ret;
2279 +}
2280 +
2281 +static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2282 +{
2283 + unsigned long ret;
2284 +
2285 + check_object_size(from, n, true);
2286 + pax_open_userland();
2287 + ret = ___copy_to_user(to, from, n);
2288 + pax_close_userland();
2289 + return ret;
2290 +}
2291 +
2292 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2293 -extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2294 +extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2295 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2296 +
2297 +static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2298 +{
2299 + unsigned long ret;
2300 + pax_open_userland();
2301 + ret = ___clear_user(addr, n);
2302 + pax_close_userland();
2303 + return ret;
2304 +}
2305 +
2306 #else
2307 #define __copy_from_user(to,from,n) (memcpy(to, (void __force *)from, n), 0)
2308 #define __copy_to_user(to,from,n) (memcpy((void __force *)to, from, n), 0)
2309 @@ -438,6 +515,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2310
2311 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2312 {
2313 + if ((long)n < 0)
2314 + return n;
2315 +
2316 if (access_ok(VERIFY_READ, from, n))
2317 n = __copy_from_user(to, from, n);
2318 else /* security hole - plug it */
2319 @@ -447,6 +527,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2320
2321 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2322 {
2323 + if ((long)n < 0)
2324 + return n;
2325 +
2326 if (access_ok(VERIFY_WRITE, to, n))
2327 n = __copy_to_user(to, from, n);
2328 return n;
2329 diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2330 index 5af0ed1..cea83883 100644
2331 --- a/arch/arm/include/uapi/asm/ptrace.h
2332 +++ b/arch/arm/include/uapi/asm/ptrace.h
2333 @@ -92,7 +92,7 @@
2334 * ARMv7 groups of PSR bits
2335 */
2336 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2337 -#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2338 +#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2339 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2340 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2341
2342 diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2343 index 60d3b73..e5a0f22 100644
2344 --- a/arch/arm/kernel/armksyms.c
2345 +++ b/arch/arm/kernel/armksyms.c
2346 @@ -53,7 +53,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2347
2348 /* networking */
2349 EXPORT_SYMBOL(csum_partial);
2350 -EXPORT_SYMBOL(csum_partial_copy_from_user);
2351 +EXPORT_SYMBOL(__csum_partial_copy_from_user);
2352 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2353 EXPORT_SYMBOL(__csum_ipv6_magic);
2354
2355 @@ -89,9 +89,9 @@ EXPORT_SYMBOL(__memzero);
2356 #ifdef CONFIG_MMU
2357 EXPORT_SYMBOL(copy_page);
2358
2359 -EXPORT_SYMBOL(__copy_from_user);
2360 -EXPORT_SYMBOL(__copy_to_user);
2361 -EXPORT_SYMBOL(__clear_user);
2362 +EXPORT_SYMBOL(___copy_from_user);
2363 +EXPORT_SYMBOL(___copy_to_user);
2364 +EXPORT_SYMBOL(___clear_user);
2365
2366 EXPORT_SYMBOL(__get_user_1);
2367 EXPORT_SYMBOL(__get_user_2);
2368 diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2369 index ec3e5cf..b450ee3 100644
2370 --- a/arch/arm/kernel/entry-armv.S
2371 +++ b/arch/arm/kernel/entry-armv.S
2372 @@ -47,6 +47,87 @@
2373 9997:
2374 .endm
2375
2376 + .macro pax_enter_kernel
2377 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2378 + @ make aligned space for saved DACR
2379 + sub sp, sp, #8
2380 + @ save regs
2381 + stmdb sp!, {r1, r2}
2382 + @ read DACR from cpu_domain into r1
2383 + mov r2, sp
2384 + @ assume 8K pages, since we have to split the immediate in two
2385 + bic r2, r2, #(0x1fc0)
2386 + bic r2, r2, #(0x3f)
2387 + ldr r1, [r2, #TI_CPU_DOMAIN]
2388 + @ store old DACR on stack
2389 + str r1, [sp, #8]
2390 +#ifdef CONFIG_PAX_KERNEXEC
2391 + @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2392 + bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2393 + orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2394 +#endif
2395 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2396 + @ set current DOMAIN_USER to DOMAIN_NOACCESS
2397 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2398 +#endif
2399 + @ write r1 to current_thread_info()->cpu_domain
2400 + str r1, [r2, #TI_CPU_DOMAIN]
2401 + @ write r1 to DACR
2402 + mcr p15, 0, r1, c3, c0, 0
2403 + @ instruction sync
2404 + instr_sync
2405 + @ restore regs
2406 + ldmia sp!, {r1, r2}
2407 +#endif
2408 + .endm
2409 +
2410 + .macro pax_open_userland
2411 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2412 + @ save regs
2413 + stmdb sp!, {r0, r1}
2414 + @ read DACR from cpu_domain into r1
2415 + mov r0, sp
2416 + @ assume 8K pages, since we have to split the immediate in two
2417 + bic r0, r0, #(0x1fc0)
2418 + bic r0, r0, #(0x3f)
2419 + ldr r1, [r0, #TI_CPU_DOMAIN]
2420 + @ set current DOMAIN_USER to DOMAIN_CLIENT
2421 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2422 + orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2423 + @ write r1 to current_thread_info()->cpu_domain
2424 + str r1, [r0, #TI_CPU_DOMAIN]
2425 + @ write r1 to DACR
2426 + mcr p15, 0, r1, c3, c0, 0
2427 + @ instruction sync
2428 + instr_sync
2429 + @ restore regs
2430 + ldmia sp!, {r0, r1}
2431 +#endif
2432 + .endm
2433 +
2434 + .macro pax_close_userland
2435 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2436 + @ save regs
2437 + stmdb sp!, {r0, r1}
2438 + @ read DACR from cpu_domain into r1
2439 + mov r0, sp
2440 + @ assume 8K pages, since we have to split the immediate in two
2441 + bic r0, r0, #(0x1fc0)
2442 + bic r0, r0, #(0x3f)
2443 + ldr r1, [r0, #TI_CPU_DOMAIN]
2444 + @ set current DOMAIN_USER to DOMAIN_NOACCESS
2445 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2446 + @ write r1 to current_thread_info()->cpu_domain
2447 + str r1, [r0, #TI_CPU_DOMAIN]
2448 + @ write r1 to DACR
2449 + mcr p15, 0, r1, c3, c0, 0
2450 + @ instruction sync
2451 + instr_sync
2452 + @ restore regs
2453 + ldmia sp!, {r0, r1}
2454 +#endif
2455 + .endm
2456 +
2457 .macro pabt_helper
2458 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2459 #ifdef MULTI_PABORT
2460 @@ -89,11 +170,15 @@
2461 * Invalid mode handlers
2462 */
2463 .macro inv_entry, reason
2464 +
2465 + pax_enter_kernel
2466 +
2467 sub sp, sp, #S_FRAME_SIZE
2468 ARM( stmib sp, {r1 - lr} )
2469 THUMB( stmia sp, {r0 - r12} )
2470 THUMB( str sp, [sp, #S_SP] )
2471 THUMB( str lr, [sp, #S_LR] )
2472 +
2473 mov r1, #\reason
2474 .endm
2475
2476 @@ -149,7 +234,11 @@ ENDPROC(__und_invalid)
2477 .macro svc_entry, stack_hole=0
2478 UNWIND(.fnstart )
2479 UNWIND(.save {r0 - pc} )
2480 +
2481 + pax_enter_kernel
2482 +
2483 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2484 +
2485 #ifdef CONFIG_THUMB2_KERNEL
2486 SPFIX( str r0, [sp] ) @ temporarily saved
2487 SPFIX( mov r0, sp )
2488 @@ -164,7 +253,12 @@ ENDPROC(__und_invalid)
2489 ldmia r0, {r3 - r5}
2490 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2491 mov r6, #-1 @ "" "" "" ""
2492 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2493 + @ offset sp by 8 as done in pax_enter_kernel
2494 + add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2495 +#else
2496 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2497 +#endif
2498 SPFIX( addeq r2, r2, #4 )
2499 str r3, [sp, #-4]! @ save the "real" r0 copied
2500 @ from the exception stack
2501 @@ -317,6 +411,9 @@ ENDPROC(__pabt_svc)
2502 .macro usr_entry
2503 UNWIND(.fnstart )
2504 UNWIND(.cantunwind ) @ don't unwind the user space
2505 +
2506 + pax_enter_kernel_user
2507 +
2508 sub sp, sp, #S_FRAME_SIZE
2509 ARM( stmib sp, {r1 - r12} )
2510 THUMB( stmia sp, {r0 - r12} )
2511 @@ -416,7 +513,9 @@ __und_usr:
2512 tst r3, #PSR_T_BIT @ Thumb mode?
2513 bne __und_usr_thumb
2514 sub r4, r2, #4 @ ARM instr at LR - 4
2515 + pax_open_userland
2516 1: ldrt r0, [r4]
2517 + pax_close_userland
2518 #ifdef CONFIG_CPU_ENDIAN_BE8
2519 rev r0, r0 @ little endian instruction
2520 #endif
2521 @@ -451,10 +550,14 @@ __und_usr_thumb:
2522 */
2523 .arch armv6t2
2524 #endif
2525 + pax_open_userland
2526 2: ldrht r5, [r4]
2527 + pax_close_userland
2528 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2529 blo __und_usr_fault_16 @ 16bit undefined instruction
2530 + pax_open_userland
2531 3: ldrht r0, [r2]
2532 + pax_close_userland
2533 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2534 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2535 orr r0, r0, r5, lsl #16
2536 @@ -483,7 +586,8 @@ ENDPROC(__und_usr)
2537 */
2538 .pushsection .fixup, "ax"
2539 .align 2
2540 -4: mov pc, r9
2541 +4: pax_close_userland
2542 + mov pc, r9
2543 .popsection
2544 .pushsection __ex_table,"a"
2545 .long 1b, 4b
2546 @@ -693,7 +797,7 @@ ENTRY(__switch_to)
2547 THUMB( str lr, [ip], #4 )
2548 ldr r4, [r2, #TI_TP_VALUE]
2549 ldr r5, [r2, #TI_TP_VALUE + 4]
2550 -#ifdef CONFIG_CPU_USE_DOMAINS
2551 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2552 ldr r6, [r2, #TI_CPU_DOMAIN]
2553 #endif
2554 switch_tls r1, r4, r5, r3, r7
2555 @@ -702,7 +806,7 @@ ENTRY(__switch_to)
2556 ldr r8, =__stack_chk_guard
2557 ldr r7, [r7, #TSK_STACK_CANARY]
2558 #endif
2559 -#ifdef CONFIG_CPU_USE_DOMAINS
2560 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2561 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2562 #endif
2563 mov r5, r0
2564 diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2565 index bc6bd96..bd026cb 100644
2566 --- a/arch/arm/kernel/entry-common.S
2567 +++ b/arch/arm/kernel/entry-common.S
2568 @@ -10,18 +10,46 @@
2569
2570 #include <asm/unistd.h>
2571 #include <asm/ftrace.h>
2572 +#include <asm/domain.h>
2573 #include <asm/unwind.h>
2574
2575 +#include "entry-header.S"
2576 +
2577 #ifdef CONFIG_NEED_RET_TO_USER
2578 #include <mach/entry-macro.S>
2579 #else
2580 .macro arch_ret_to_user, tmp1, tmp2
2581 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2582 + @ save regs
2583 + stmdb sp!, {r1, r2}
2584 + @ read DACR from cpu_domain into r1
2585 + mov r2, sp
2586 + @ assume 8K pages, since we have to split the immediate in two
2587 + bic r2, r2, #(0x1fc0)
2588 + bic r2, r2, #(0x3f)
2589 + ldr r1, [r2, #TI_CPU_DOMAIN]
2590 +#ifdef CONFIG_PAX_KERNEXEC
2591 + @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2592 + bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2593 + orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2594 +#endif
2595 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2596 + @ set current DOMAIN_USER to DOMAIN_UDEREF
2597 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2598 + orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2599 +#endif
2600 + @ write r1 to current_thread_info()->cpu_domain
2601 + str r1, [r2, #TI_CPU_DOMAIN]
2602 + @ write r1 to DACR
2603 + mcr p15, 0, r1, c3, c0, 0
2604 + @ instruction sync
2605 + instr_sync
2606 + @ restore regs
2607 + ldmia sp!, {r1, r2}
2608 +#endif
2609 .endm
2610 #endif
2611
2612 -#include "entry-header.S"
2613 -
2614 -
2615 .align 5
2616 /*
2617 * This is the fast syscall return path. We do as little as
2618 @@ -413,6 +441,12 @@ ENTRY(vector_swi)
2619 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2620 #endif
2621
2622 + /*
2623 + * do this here to avoid a performance hit of wrapping the code above
2624 + * that directly dereferences userland to parse the SWI instruction
2625 + */
2626 + pax_enter_kernel_user
2627 +
2628 adr tbl, sys_call_table @ load syscall table pointer
2629
2630 #if defined(CONFIG_OABI_COMPAT)
2631 diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2632 index 39f89fb..d612bd9 100644
2633 --- a/arch/arm/kernel/entry-header.S
2634 +++ b/arch/arm/kernel/entry-header.S
2635 @@ -184,6 +184,60 @@
2636 msr cpsr_c, \rtemp @ switch back to the SVC mode
2637 .endm
2638
2639 + .macro pax_enter_kernel_user
2640 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2641 + @ save regs
2642 + stmdb sp!, {r0, r1}
2643 + @ read DACR from cpu_domain into r1
2644 + mov r0, sp
2645 + @ assume 8K pages, since we have to split the immediate in two
2646 + bic r0, r0, #(0x1fc0)
2647 + bic r0, r0, #(0x3f)
2648 + ldr r1, [r0, #TI_CPU_DOMAIN]
2649 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2650 + @ set current DOMAIN_USER to DOMAIN_NOACCESS
2651 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2652 +#endif
2653 +#ifdef CONFIG_PAX_KERNEXEC
2654 + @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2655 + bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2656 + orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2657 +#endif
2658 + @ write r1 to current_thread_info()->cpu_domain
2659 + str r1, [r0, #TI_CPU_DOMAIN]
2660 + @ write r1 to DACR
2661 + mcr p15, 0, r1, c3, c0, 0
2662 + @ instruction sync
2663 + instr_sync
2664 + @ restore regs
2665 + ldmia sp!, {r0, r1}
2666 +#endif
2667 + .endm
2668 +
2669 + .macro pax_exit_kernel
2670 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2671 + @ save regs
2672 + stmdb sp!, {r0, r1}
2673 + @ read old DACR from stack into r1
2674 + ldr r1, [sp, #(8 + S_SP)]
2675 + sub r1, r1, #8
2676 + ldr r1, [r1]
2677 +
2678 + @ write r1 to current_thread_info()->cpu_domain
2679 + mov r0, sp
2680 + @ assume 8K pages, since we have to split the immediate in two
2681 + bic r0, r0, #(0x1fc0)
2682 + bic r0, r0, #(0x3f)
2683 + str r1, [r0, #TI_CPU_DOMAIN]
2684 + @ write r1 to DACR
2685 + mcr p15, 0, r1, c3, c0, 0
2686 + @ instruction sync
2687 + instr_sync
2688 + @ restore regs
2689 + ldmia sp!, {r0, r1}
2690 +#endif
2691 + .endm
2692 +
2693 #ifndef CONFIG_THUMB2_KERNEL
2694 .macro svc_exit, rpsr, irq = 0
2695 .if \irq != 0
2696 @@ -203,6 +257,9 @@
2697 blne trace_hardirqs_off
2698 #endif
2699 .endif
2700 +
2701 + pax_exit_kernel
2702 +
2703 msr spsr_cxsf, \rpsr
2704 #if defined(CONFIG_CPU_V6)
2705 ldr r0, [sp]
2706 @@ -266,6 +323,9 @@
2707 blne trace_hardirqs_off
2708 #endif
2709 .endif
2710 +
2711 + pax_exit_kernel
2712 +
2713 ldr lr, [sp, #S_SP] @ top of the stack
2714 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2715 clrex @ clear the exclusive monitor
2716 diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2717 index 918875d..cd5fa27 100644
2718 --- a/arch/arm/kernel/fiq.c
2719 +++ b/arch/arm/kernel/fiq.c
2720 @@ -87,7 +87,10 @@ void set_fiq_handler(void *start, unsigned int length)
2721 void *base = vectors_page;
2722 unsigned offset = FIQ_OFFSET;
2723
2724 + pax_open_kernel();
2725 memcpy(base + offset, start, length);
2726 + pax_close_kernel();
2727 +
2728 if (!cache_is_vipt_nonaliasing())
2729 flush_icache_range((unsigned long)base + offset, offset +
2730 length);
2731 diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2732 index 476de57..4857a76 100644
2733 --- a/arch/arm/kernel/head.S
2734 +++ b/arch/arm/kernel/head.S
2735 @@ -52,7 +52,9 @@
2736 .equ swapper_pg_dir, KERNEL_RAM_VADDR - PG_DIR_SIZE
2737
2738 .macro pgtbl, rd, phys
2739 - add \rd, \phys, #TEXT_OFFSET - PG_DIR_SIZE
2740 + mov \rd, #TEXT_OFFSET
2741 + sub \rd, #PG_DIR_SIZE
2742 + add \rd, \rd, \phys
2743 .endm
2744
2745 /*
2746 @@ -432,7 +434,7 @@ __enable_mmu:
2747 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2748 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2749 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2750 - domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2751 + domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2752 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2753 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2754 #endif
2755 diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2756 index 084dc88..fce4e68 100644
2757 --- a/arch/arm/kernel/module.c
2758 +++ b/arch/arm/kernel/module.c
2759 @@ -37,12 +37,39 @@
2760 #endif
2761
2762 #ifdef CONFIG_MMU
2763 -void *module_alloc(unsigned long size)
2764 +static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2765 {
2766 + if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2767 + return NULL;
2768 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2769 - GFP_KERNEL, PAGE_KERNEL_EXEC, -1,
2770 + GFP_KERNEL, prot, -1,
2771 __builtin_return_address(0));
2772 }
2773 +
2774 +void *module_alloc(unsigned long size)
2775 +{
2776 +
2777 +#ifdef CONFIG_PAX_KERNEXEC
2778 + return __module_alloc(size, PAGE_KERNEL);
2779 +#else
2780 + return __module_alloc(size, PAGE_KERNEL_EXEC);
2781 +#endif
2782 +
2783 +}
2784 +
2785 +#ifdef CONFIG_PAX_KERNEXEC
2786 +void module_free_exec(struct module *mod, void *module_region)
2787 +{
2788 + module_free(mod, module_region);
2789 +}
2790 +EXPORT_SYMBOL(module_free_exec);
2791 +
2792 +void *module_alloc_exec(unsigned long size)
2793 +{
2794 + return __module_alloc(size, PAGE_KERNEL_EXEC);
2795 +}
2796 +EXPORT_SYMBOL(module_alloc_exec);
2797 +#endif
2798 #endif
2799
2800 int
2801 diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2802 index 07314af..c46655c 100644
2803 --- a/arch/arm/kernel/patch.c
2804 +++ b/arch/arm/kernel/patch.c
2805 @@ -18,6 +18,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2806 bool thumb2 = IS_ENABLED(CONFIG_THUMB2_KERNEL);
2807 int size;
2808
2809 + pax_open_kernel();
2810 if (thumb2 && __opcode_is_thumb16(insn)) {
2811 *(u16 *)addr = __opcode_to_mem_thumb16(insn);
2812 size = sizeof(u16);
2813 @@ -39,6 +40,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2814 *(u32 *)addr = insn;
2815 size = sizeof(u32);
2816 }
2817 + pax_close_kernel();
2818
2819 flush_icache_range((uintptr_t)(addr),
2820 (uintptr_t)(addr) + size);
2821 diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2822 index 92f7b15..7048500 100644
2823 --- a/arch/arm/kernel/process.c
2824 +++ b/arch/arm/kernel/process.c
2825 @@ -217,6 +217,7 @@ void machine_power_off(void)
2826
2827 if (pm_power_off)
2828 pm_power_off();
2829 + BUG();
2830 }
2831
2832 /*
2833 @@ -230,7 +231,7 @@ void machine_power_off(void)
2834 * executing pre-reset code, and using RAM that the primary CPU's code wishes
2835 * to use. Implementing such co-ordination would be essentially impossible.
2836 */
2837 -void machine_restart(char *cmd)
2838 +__noreturn void machine_restart(char *cmd)
2839 {
2840 local_irq_disable();
2841 smp_send_stop();
2842 @@ -253,8 +254,8 @@ void __show_regs(struct pt_regs *regs)
2843
2844 show_regs_print_info(KERN_DEFAULT);
2845
2846 - print_symbol("PC is at %s\n", instruction_pointer(regs));
2847 - print_symbol("LR is at %s\n", regs->ARM_lr);
2848 + printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2849 + printk("LR is at %pA\n", (void *)regs->ARM_lr);
2850 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2851 "sp : %08lx ip : %08lx fp : %08lx\n",
2852 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2853 @@ -425,12 +426,6 @@ unsigned long get_wchan(struct task_struct *p)
2854 return 0;
2855 }
2856
2857 -unsigned long arch_randomize_brk(struct mm_struct *mm)
2858 -{
2859 - unsigned long range_end = mm->brk + 0x02000000;
2860 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2861 -}
2862 -
2863 #ifdef CONFIG_MMU
2864 #ifdef CONFIG_KUSER_HELPERS
2865 /*
2866 @@ -446,7 +441,7 @@ static struct vm_area_struct gate_vma = {
2867
2868 static int __init gate_vma_init(void)
2869 {
2870 - gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2871 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2872 return 0;
2873 }
2874 arch_initcall(gate_vma_init);
2875 @@ -472,41 +467,16 @@ int in_gate_area_no_mm(unsigned long addr)
2876
2877 const char *arch_vma_name(struct vm_area_struct *vma)
2878 {
2879 - return is_gate_vma(vma) ? "[vectors]" :
2880 - (vma->vm_mm && vma->vm_start == vma->vm_mm->context.sigpage) ?
2881 - "[sigpage]" : NULL;
2882 + return is_gate_vma(vma) ? "[vectors]" : NULL;
2883 }
2884
2885 -static struct page *signal_page;
2886 -extern struct page *get_signal_page(void);
2887 -
2888 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2889 {
2890 struct mm_struct *mm = current->mm;
2891 - unsigned long addr;
2892 - int ret;
2893 -
2894 - if (!signal_page)
2895 - signal_page = get_signal_page();
2896 - if (!signal_page)
2897 - return -ENOMEM;
2898
2899 down_write(&mm->mmap_sem);
2900 - addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
2901 - if (IS_ERR_VALUE(addr)) {
2902 - ret = addr;
2903 - goto up_fail;
2904 - }
2905 -
2906 - ret = install_special_mapping(mm, addr, PAGE_SIZE,
2907 - VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
2908 - &signal_page);
2909 -
2910 - if (ret == 0)
2911 - mm->context.sigpage = addr;
2912 -
2913 - up_fail:
2914 + mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
2915 up_write(&mm->mmap_sem);
2916 - return ret;
2917 + return 0;
2918 }
2919 #endif
2920 diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
2921 index 4693188..4596c5e 100644
2922 --- a/arch/arm/kernel/psci.c
2923 +++ b/arch/arm/kernel/psci.c
2924 @@ -24,7 +24,7 @@
2925 #include <asm/opcodes-virt.h>
2926 #include <asm/psci.h>
2927
2928 -struct psci_operations psci_ops;
2929 +struct psci_operations psci_ops __read_only;
2930
2931 static int (*invoke_psci_fn)(u32, u32, u32, u32);
2932
2933 diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
2934 index 0dd3b79..e018f64 100644
2935 --- a/arch/arm/kernel/ptrace.c
2936 +++ b/arch/arm/kernel/ptrace.c
2937 @@ -929,10 +929,19 @@ static int tracehook_report_syscall(struct pt_regs *regs,
2938 return current_thread_info()->syscall;
2939 }
2940
2941 +#ifdef CONFIG_GRKERNSEC_SETXID
2942 +extern void gr_delayed_cred_worker(void);
2943 +#endif
2944 +
2945 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
2946 {
2947 current_thread_info()->syscall = scno;
2948
2949 +#ifdef CONFIG_GRKERNSEC_SETXID
2950 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
2951 + gr_delayed_cred_worker();
2952 +#endif
2953 +
2954 /* Do the secure computing check first; failures should be fast. */
2955 if (secure_computing(scno) == -1)
2956 return -1;
2957 diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
2958 index 0e1e2b3..c0e821d 100644
2959 --- a/arch/arm/kernel/setup.c
2960 +++ b/arch/arm/kernel/setup.c
2961 @@ -98,21 +98,23 @@ EXPORT_SYMBOL(system_serial_high);
2962 unsigned int elf_hwcap __read_mostly;
2963 EXPORT_SYMBOL(elf_hwcap);
2964
2965 +pteval_t __supported_pte_mask __read_only;
2966 +pmdval_t __supported_pmd_mask __read_only;
2967
2968 #ifdef MULTI_CPU
2969 -struct processor processor __read_mostly;
2970 +struct processor processor;
2971 #endif
2972 #ifdef MULTI_TLB
2973 -struct cpu_tlb_fns cpu_tlb __read_mostly;
2974 +struct cpu_tlb_fns cpu_tlb __read_only;
2975 #endif
2976 #ifdef MULTI_USER
2977 -struct cpu_user_fns cpu_user __read_mostly;
2978 +struct cpu_user_fns cpu_user __read_only;
2979 #endif
2980 #ifdef MULTI_CACHE
2981 -struct cpu_cache_fns cpu_cache __read_mostly;
2982 +struct cpu_cache_fns cpu_cache __read_only;
2983 #endif
2984 #ifdef CONFIG_OUTER_CACHE
2985 -struct outer_cache_fns outer_cache __read_mostly;
2986 +struct outer_cache_fns outer_cache __read_only;
2987 EXPORT_SYMBOL(outer_cache);
2988 #endif
2989
2990 @@ -245,9 +247,13 @@ static int __get_cpu_architecture(void)
2991 asm("mrc p15, 0, %0, c0, c1, 4"
2992 : "=r" (mmfr0));
2993 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
2994 - (mmfr0 & 0x000000f0) >= 0x00000030)
2995 + (mmfr0 & 0x000000f0) >= 0x00000030) {
2996 cpu_arch = CPU_ARCH_ARMv7;
2997 - else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
2998 + if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
2999 + __supported_pte_mask |= L_PTE_PXN;
3000 + __supported_pmd_mask |= PMD_PXNTABLE;
3001 + }
3002 + } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3003 (mmfr0 & 0x000000f0) == 0x00000020)
3004 cpu_arch = CPU_ARCH_ARMv6;
3005 else
3006 @@ -571,7 +577,7 @@ static void __init setup_processor(void)
3007 __cpu_architecture = __get_cpu_architecture();
3008
3009 #ifdef MULTI_CPU
3010 - processor = *list->proc;
3011 + memcpy((void *)&processor, list->proc, sizeof processor);
3012 #endif
3013 #ifdef MULTI_TLB
3014 cpu_tlb = *list->tlb;
3015 diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3016 index ab33042..11248a8 100644
3017 --- a/arch/arm/kernel/signal.c
3018 +++ b/arch/arm/kernel/signal.c
3019 @@ -45,8 +45,6 @@ static const unsigned long sigreturn_codes[7] = {
3020 MOV_R7_NR_RT_SIGRETURN, SWI_SYS_RT_SIGRETURN, SWI_THUMB_RT_SIGRETURN,
3021 };
3022
3023 -static unsigned long signal_return_offset;
3024 -
3025 #ifdef CONFIG_CRUNCH
3026 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3027 {
3028 @@ -411,8 +409,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3029 * except when the MPU has protected the vectors
3030 * page from PL0
3031 */
3032 - retcode = mm->context.sigpage + signal_return_offset +
3033 - (idx << 2) + thumb;
3034 + retcode = mm->context.sigpage + (idx << 2) + thumb;
3035 } else
3036 #endif
3037 {
3038 @@ -616,33 +613,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3039 } while (thread_flags & _TIF_WORK_MASK);
3040 return 0;
3041 }
3042 -
3043 -struct page *get_signal_page(void)
3044 -{
3045 - unsigned long ptr;
3046 - unsigned offset;
3047 - struct page *page;
3048 - void *addr;
3049 -
3050 - page = alloc_pages(GFP_KERNEL, 0);
3051 -
3052 - if (!page)
3053 - return NULL;
3054 -
3055 - addr = page_address(page);
3056 -
3057 - /* Give the signal return code some randomness */
3058 - offset = 0x200 + (get_random_int() & 0x7fc);
3059 - signal_return_offset = offset;
3060 -
3061 - /*
3062 - * Copy signal return handlers into the vector page, and
3063 - * set sigreturn to be a pointer to these.
3064 - */
3065 - memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3066 -
3067 - ptr = (unsigned long)addr + offset;
3068 - flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3069 -
3070 - return page;
3071 -}
3072 diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3073 index 72024ea..ae302dd 100644
3074 --- a/arch/arm/kernel/smp.c
3075 +++ b/arch/arm/kernel/smp.c
3076 @@ -70,7 +70,7 @@ enum ipi_msg_type {
3077
3078 static DECLARE_COMPLETION(cpu_running);
3079
3080 -static struct smp_operations smp_ops;
3081 +static struct smp_operations smp_ops __read_only;
3082
3083 void __init smp_set_ops(struct smp_operations *ops)
3084 {
3085 diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3086 index 65ed63f..430c478 100644
3087 --- a/arch/arm/kernel/traps.c
3088 +++ b/arch/arm/kernel/traps.c
3089 @@ -55,7 +55,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3090 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3091 {
3092 #ifdef CONFIG_KALLSYMS
3093 - printk("[<%08lx>] (%pS) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3094 + printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3095 #else
3096 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3097 #endif
3098 @@ -257,6 +257,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3099 static int die_owner = -1;
3100 static unsigned int die_nest_count;
3101
3102 +extern void gr_handle_kernel_exploit(void);
3103 +
3104 static unsigned long oops_begin(void)
3105 {
3106 int cpu;
3107 @@ -299,6 +301,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3108 panic("Fatal exception in interrupt");
3109 if (panic_on_oops)
3110 panic("Fatal exception");
3111 +
3112 + gr_handle_kernel_exploit();
3113 +
3114 if (signr)
3115 do_exit(signr);
3116 }
3117 @@ -629,7 +634,9 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
3118 * The user helper at 0xffff0fe0 must be used instead.
3119 * (see entry-armv.S for details)
3120 */
3121 + pax_open_kernel();
3122 *((unsigned int *)0xffff0ff0) = regs->ARM_r0;
3123 + pax_close_kernel();
3124 }
3125 return 0;
3126
3127 @@ -886,7 +893,11 @@ void __init early_trap_init(void *vectors_base)
3128 kuser_init(vectors_base);
3129
3130 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3131 - modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3132 +
3133 +#ifndef CONFIG_PAX_MEMORY_UDEREF
3134 + modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3135 +#endif
3136 +
3137 #else /* ifndef CONFIG_CPU_V7M */
3138 /*
3139 * on V7-M there is no need to copy the vector table to a dedicated
3140 diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3141 index 7bcee5c..e2f3249 100644
3142 --- a/arch/arm/kernel/vmlinux.lds.S
3143 +++ b/arch/arm/kernel/vmlinux.lds.S
3144 @@ -8,7 +8,11 @@
3145 #include <asm/thread_info.h>
3146 #include <asm/memory.h>
3147 #include <asm/page.h>
3148 -
3149 +
3150 +#ifdef CONFIG_PAX_KERNEXEC
3151 +#include <asm/pgtable.h>
3152 +#endif
3153 +
3154 #define PROC_INFO \
3155 . = ALIGN(4); \
3156 VMLINUX_SYMBOL(__proc_info_begin) = .; \
3157 @@ -34,7 +38,7 @@
3158 #endif
3159
3160 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3161 - defined(CONFIG_GENERIC_BUG)
3162 + defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3163 #define ARM_EXIT_KEEP(x) x
3164 #define ARM_EXIT_DISCARD(x)
3165 #else
3166 @@ -90,6 +94,11 @@ SECTIONS
3167 _text = .;
3168 HEAD_TEXT
3169 }
3170 +
3171 +#ifdef CONFIG_PAX_KERNEXEC
3172 + . = ALIGN(1<<SECTION_SHIFT);
3173 +#endif
3174 +
3175 .text : { /* Real text segment */
3176 _stext = .; /* Text and read-only data */
3177 __exception_text_start = .;
3178 @@ -112,6 +121,8 @@ SECTIONS
3179 ARM_CPU_KEEP(PROC_INFO)
3180 }
3181
3182 + _etext = .; /* End of text section */
3183 +
3184 RO_DATA(PAGE_SIZE)
3185
3186 . = ALIGN(4);
3187 @@ -142,7 +153,9 @@ SECTIONS
3188
3189 NOTES
3190
3191 - _etext = .; /* End of text and rodata section */
3192 +#ifdef CONFIG_PAX_KERNEXEC
3193 + . = ALIGN(1<<SECTION_SHIFT);
3194 +#endif
3195
3196 #ifndef CONFIG_XIP_KERNEL
3197 . = ALIGN(PAGE_SIZE);
3198 @@ -220,6 +233,11 @@ SECTIONS
3199 . = PAGE_OFFSET + TEXT_OFFSET;
3200 #else
3201 __init_end = .;
3202 +
3203 +#ifdef CONFIG_PAX_KERNEXEC
3204 + . = ALIGN(1<<SECTION_SHIFT);
3205 +#endif
3206 +
3207 . = ALIGN(THREAD_SIZE);
3208 __data_loc = .;
3209 #endif
3210 diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3211 index 9c697db..115237f 100644
3212 --- a/arch/arm/kvm/arm.c
3213 +++ b/arch/arm/kvm/arm.c
3214 @@ -56,7 +56,7 @@ static unsigned long hyp_default_vectors;
3215 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3216
3217 /* The VMID used in the VTTBR */
3218 -static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3219 +static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3220 static u8 kvm_next_vmid;
3221 static DEFINE_SPINLOCK(kvm_vmid_lock);
3222
3223 @@ -396,7 +396,7 @@ void force_vm_exit(const cpumask_t *mask)
3224 */
3225 static bool need_new_vmid_gen(struct kvm *kvm)
3226 {
3227 - return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3228 + return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3229 }
3230
3231 /**
3232 @@ -429,7 +429,7 @@ static void update_vttbr(struct kvm *kvm)
3233
3234 /* First user of a new VMID generation? */
3235 if (unlikely(kvm_next_vmid == 0)) {
3236 - atomic64_inc(&kvm_vmid_gen);
3237 + atomic64_inc_unchecked(&kvm_vmid_gen);
3238 kvm_next_vmid = 1;
3239
3240 /*
3241 @@ -446,7 +446,7 @@ static void update_vttbr(struct kvm *kvm)
3242 kvm_call_hyp(__kvm_flush_vm_context);
3243 }
3244
3245 - kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3246 + kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3247 kvm->arch.vmid = kvm_next_vmid;
3248 kvm_next_vmid++;
3249
3250 diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3251 index 14a0d98..7771a7d 100644
3252 --- a/arch/arm/lib/clear_user.S
3253 +++ b/arch/arm/lib/clear_user.S
3254 @@ -12,14 +12,14 @@
3255
3256 .text
3257
3258 -/* Prototype: int __clear_user(void *addr, size_t sz)
3259 +/* Prototype: int ___clear_user(void *addr, size_t sz)
3260 * Purpose : clear some user memory
3261 * Params : addr - user memory address to clear
3262 * : sz - number of bytes to clear
3263 * Returns : number of bytes NOT cleared
3264 */
3265 ENTRY(__clear_user_std)
3266 -WEAK(__clear_user)
3267 +WEAK(___clear_user)
3268 stmfd sp!, {r1, lr}
3269 mov r2, #0
3270 cmp r1, #4
3271 @@ -44,7 +44,7 @@ WEAK(__clear_user)
3272 USER( strnebt r2, [r0])
3273 mov r0, #0
3274 ldmfd sp!, {r1, pc}
3275 -ENDPROC(__clear_user)
3276 +ENDPROC(___clear_user)
3277 ENDPROC(__clear_user_std)
3278
3279 .pushsection .fixup,"ax"
3280 diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3281 index 66a477a..bee61d3 100644
3282 --- a/arch/arm/lib/copy_from_user.S
3283 +++ b/arch/arm/lib/copy_from_user.S
3284 @@ -16,7 +16,7 @@
3285 /*
3286 * Prototype:
3287 *
3288 - * size_t __copy_from_user(void *to, const void *from, size_t n)
3289 + * size_t ___copy_from_user(void *to, const void *from, size_t n)
3290 *
3291 * Purpose:
3292 *
3293 @@ -84,11 +84,11 @@
3294
3295 .text
3296
3297 -ENTRY(__copy_from_user)
3298 +ENTRY(___copy_from_user)
3299
3300 #include "copy_template.S"
3301
3302 -ENDPROC(__copy_from_user)
3303 +ENDPROC(___copy_from_user)
3304
3305 .pushsection .fixup,"ax"
3306 .align 0
3307 diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3308 index 6ee2f67..d1cce76 100644
3309 --- a/arch/arm/lib/copy_page.S
3310 +++ b/arch/arm/lib/copy_page.S
3311 @@ -10,6 +10,7 @@
3312 * ASM optimised string functions
3313 */
3314 #include <linux/linkage.h>
3315 +#include <linux/const.h>
3316 #include <asm/assembler.h>
3317 #include <asm/asm-offsets.h>
3318 #include <asm/cache.h>
3319 diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3320 index d066df6..df28194 100644
3321 --- a/arch/arm/lib/copy_to_user.S
3322 +++ b/arch/arm/lib/copy_to_user.S
3323 @@ -16,7 +16,7 @@
3324 /*
3325 * Prototype:
3326 *
3327 - * size_t __copy_to_user(void *to, const void *from, size_t n)
3328 + * size_t ___copy_to_user(void *to, const void *from, size_t n)
3329 *
3330 * Purpose:
3331 *
3332 @@ -88,11 +88,11 @@
3333 .text
3334
3335 ENTRY(__copy_to_user_std)
3336 -WEAK(__copy_to_user)
3337 +WEAK(___copy_to_user)
3338
3339 #include "copy_template.S"
3340
3341 -ENDPROC(__copy_to_user)
3342 +ENDPROC(___copy_to_user)
3343 ENDPROC(__copy_to_user_std)
3344
3345 .pushsection .fixup,"ax"
3346 diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3347 index 7d08b43..f7ca7ea 100644
3348 --- a/arch/arm/lib/csumpartialcopyuser.S
3349 +++ b/arch/arm/lib/csumpartialcopyuser.S
3350 @@ -57,8 +57,8 @@
3351 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3352 */
3353
3354 -#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3355 -#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3356 +#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3357 +#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3358
3359 #include "csumpartialcopygeneric.S"
3360
3361 diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3362 index 5306de3..aed6d03 100644
3363 --- a/arch/arm/lib/delay.c
3364 +++ b/arch/arm/lib/delay.c
3365 @@ -28,7 +28,7 @@
3366 /*
3367 * Default to the loop-based delay implementation.
3368 */
3369 -struct arm_delay_ops arm_delay_ops = {
3370 +struct arm_delay_ops arm_delay_ops __read_only = {
3371 .delay = __loop_delay,
3372 .const_udelay = __loop_const_udelay,
3373 .udelay = __loop_udelay,
3374 diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3375 index 025f742..a9e5b3b 100644
3376 --- a/arch/arm/lib/uaccess_with_memcpy.c
3377 +++ b/arch/arm/lib/uaccess_with_memcpy.c
3378 @@ -104,7 +104,7 @@ out:
3379 }
3380
3381 unsigned long
3382 -__copy_to_user(void __user *to, const void *from, unsigned long n)
3383 +___copy_to_user(void __user *to, const void *from, unsigned long n)
3384 {
3385 /*
3386 * This test is stubbed out of the main function above to keep
3387 @@ -155,7 +155,7 @@ out:
3388 return n;
3389 }
3390
3391 -unsigned long __clear_user(void __user *addr, unsigned long n)
3392 +unsigned long ___clear_user(void __user *addr, unsigned long n)
3393 {
3394 /* See rational for this in __copy_to_user() above. */
3395 if (n < 64)
3396 diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
3397 index 1767611..d2e7e24 100644
3398 --- a/arch/arm/mach-kirkwood/common.c
3399 +++ b/arch/arm/mach-kirkwood/common.c
3400 @@ -156,7 +156,16 @@ static void clk_gate_fn_disable(struct clk_hw *hw)
3401 clk_gate_ops.disable(hw);
3402 }
3403
3404 -static struct clk_ops clk_gate_fn_ops;
3405 +static int clk_gate_fn_is_enabled(struct clk_hw *hw)
3406 +{
3407 + return clk_gate_ops.is_enabled(hw);
3408 +}
3409 +
3410 +static struct clk_ops clk_gate_fn_ops = {
3411 + .enable = clk_gate_fn_enable,
3412 + .disable = clk_gate_fn_disable,
3413 + .is_enabled = clk_gate_fn_is_enabled,
3414 +};
3415
3416 static struct clk __init *clk_register_gate_fn(struct device *dev,
3417 const char *name,
3418 @@ -190,14 +199,6 @@ static struct clk __init *clk_register_gate_fn(struct device *dev,
3419 gate_fn->fn_en = fn_en;
3420 gate_fn->fn_dis = fn_dis;
3421
3422 - /* ops is the gate ops, but with our enable/disable functions */
3423 - if (clk_gate_fn_ops.enable != clk_gate_fn_enable ||
3424 - clk_gate_fn_ops.disable != clk_gate_fn_disable) {
3425 - clk_gate_fn_ops = clk_gate_ops;
3426 - clk_gate_fn_ops.enable = clk_gate_fn_enable;
3427 - clk_gate_fn_ops.disable = clk_gate_fn_disable;
3428 - }
3429 -
3430 clk = clk_register(dev, &gate_fn->gate.hw);
3431
3432 if (IS_ERR(clk))
3433 diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3434 index 827d1500..2885dc6 100644
3435 --- a/arch/arm/mach-omap2/board-n8x0.c
3436 +++ b/arch/arm/mach-omap2/board-n8x0.c
3437 @@ -627,7 +627,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3438 }
3439 #endif
3440
3441 -static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3442 +static struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3443 .late_init = n8x0_menelaus_late_init,
3444 };
3445
3446 diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
3447 index 579697a..1d5a3b2 100644
3448 --- a/arch/arm/mach-omap2/gpmc.c
3449 +++ b/arch/arm/mach-omap2/gpmc.c
3450 @@ -148,7 +148,6 @@ struct omap3_gpmc_regs {
3451 };
3452
3453 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
3454 -static struct irq_chip gpmc_irq_chip;
3455 static int gpmc_irq_start;
3456
3457 static struct resource gpmc_mem_root;
3458 @@ -716,6 +715,18 @@ static void gpmc_irq_noop(struct irq_data *data) { }
3459
3460 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
3461
3462 +static struct irq_chip gpmc_irq_chip = {
3463 + .name = "gpmc",
3464 + .irq_startup = gpmc_irq_noop_ret,
3465 + .irq_enable = gpmc_irq_enable,
3466 + .irq_disable = gpmc_irq_disable,
3467 + .irq_shutdown = gpmc_irq_noop,
3468 + .irq_ack = gpmc_irq_noop,
3469 + .irq_mask = gpmc_irq_noop,
3470 + .irq_unmask = gpmc_irq_noop,
3471 +
3472 +};
3473 +
3474 static int gpmc_setup_irq(void)
3475 {
3476 int i;
3477 @@ -730,15 +741,6 @@ static int gpmc_setup_irq(void)
3478 return gpmc_irq_start;
3479 }
3480
3481 - gpmc_irq_chip.name = "gpmc";
3482 - gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
3483 - gpmc_irq_chip.irq_enable = gpmc_irq_enable;
3484 - gpmc_irq_chip.irq_disable = gpmc_irq_disable;
3485 - gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
3486 - gpmc_irq_chip.irq_ack = gpmc_irq_noop;
3487 - gpmc_irq_chip.irq_mask = gpmc_irq_noop;
3488 - gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
3489 -
3490 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
3491 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
3492
3493 diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3494 index f991016..145ebeb 100644
3495 --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3496 +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3497 @@ -84,7 +84,7 @@ struct cpu_pm_ops {
3498 int (*finish_suspend)(unsigned long cpu_state);
3499 void (*resume)(void);
3500 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3501 -};
3502 +} __no_const;
3503
3504 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3505 static struct powerdomain *mpuss_pd;
3506 @@ -102,7 +102,7 @@ static void dummy_cpu_resume(void)
3507 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3508 {}
3509
3510 -struct cpu_pm_ops omap_pm_ops = {
3511 +static struct cpu_pm_ops omap_pm_ops __read_only = {
3512 .finish_suspend = default_finish_suspend,
3513 .resume = dummy_cpu_resume,
3514 .scu_prepare = dummy_scu_prepare,
3515 diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3516 index 813c615..ce467c6 100644
3517 --- a/arch/arm/mach-omap2/omap-wakeupgen.c
3518 +++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3519 @@ -339,7 +339,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3520 return NOTIFY_OK;
3521 }
3522
3523 -static struct notifier_block __refdata irq_hotplug_notifier = {
3524 +static struct notifier_block irq_hotplug_notifier = {
3525 .notifier_call = irq_cpu_hotplug_notify,
3526 };
3527
3528 diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3529 index 53f0735..5b54eb6 100644
3530 --- a/arch/arm/mach-omap2/omap_device.c
3531 +++ b/arch/arm/mach-omap2/omap_device.c
3532 @@ -504,7 +504,7 @@ void omap_device_delete(struct omap_device *od)
3533 struct platform_device __init *omap_device_build(const char *pdev_name,
3534 int pdev_id,
3535 struct omap_hwmod *oh,
3536 - void *pdata, int pdata_len)
3537 + const void *pdata, int pdata_len)
3538 {
3539 struct omap_hwmod *ohs[] = { oh };
3540
3541 @@ -532,7 +532,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3542 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3543 int pdev_id,
3544 struct omap_hwmod **ohs,
3545 - int oh_cnt, void *pdata,
3546 + int oh_cnt, const void *pdata,
3547 int pdata_len)
3548 {
3549 int ret = -ENOMEM;
3550 diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3551 index 17ca1ae..beba869 100644
3552 --- a/arch/arm/mach-omap2/omap_device.h
3553 +++ b/arch/arm/mach-omap2/omap_device.h
3554 @@ -71,12 +71,12 @@ int omap_device_idle(struct platform_device *pdev);
3555 /* Core code interface */
3556
3557 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3558 - struct omap_hwmod *oh, void *pdata,
3559 + struct omap_hwmod *oh, const void *pdata,
3560 int pdata_len);
3561
3562 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3563 struct omap_hwmod **oh, int oh_cnt,
3564 - void *pdata, int pdata_len);
3565 + const void *pdata, int pdata_len);
3566
3567 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3568 struct omap_hwmod **ohs, int oh_cnt);
3569 diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3570 index 832adb1..49b62c4 100644
3571 --- a/arch/arm/mach-omap2/omap_hwmod.c
3572 +++ b/arch/arm/mach-omap2/omap_hwmod.c
3573 @@ -194,10 +194,10 @@ struct omap_hwmod_soc_ops {
3574 int (*init_clkdm)(struct omap_hwmod *oh);
3575 void (*update_context_lost)(struct omap_hwmod *oh);
3576 int (*get_context_lost)(struct omap_hwmod *oh);
3577 -};
3578 +} __no_const;
3579
3580 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3581 -static struct omap_hwmod_soc_ops soc_ops;
3582 +static struct omap_hwmod_soc_ops soc_ops __read_only;
3583
3584 /* omap_hwmod_list contains all registered struct omap_hwmods */
3585 static LIST_HEAD(omap_hwmod_list);
3586 diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3587 index d15c7bb..b2d1f0c 100644
3588 --- a/arch/arm/mach-omap2/wd_timer.c
3589 +++ b/arch/arm/mach-omap2/wd_timer.c
3590 @@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3591 struct omap_hwmod *oh;
3592 char *oh_name = "wd_timer2";
3593 char *dev_name = "omap_wdt";
3594 - struct omap_wd_timer_platform_data pdata;
3595 + static struct omap_wd_timer_platform_data pdata = {
3596 + .read_reset_sources = prm_read_reset_sources
3597 + };
3598
3599 if (!cpu_class_is_omap2() || of_have_populated_dt())
3600 return 0;
3601 @@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3602 return -EINVAL;
3603 }
3604
3605 - pdata.read_reset_sources = prm_read_reset_sources;
3606 -
3607 pdev = omap_device_build(dev_name, id, oh, &pdata,
3608 sizeof(struct omap_wd_timer_platform_data));
3609 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3610 diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3611 index b82dcae..44ee5b6 100644
3612 --- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3613 +++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3614 @@ -180,7 +180,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3615 bool entered_lp2 = false;
3616
3617 if (tegra_pending_sgi())
3618 - ACCESS_ONCE(abort_flag) = true;
3619 + ACCESS_ONCE_RW(abort_flag) = true;
3620
3621 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3622
3623 diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3624 index 656324a..0beba28 100644
3625 --- a/arch/arm/mach-ux500/setup.h
3626 +++ b/arch/arm/mach-ux500/setup.h
3627 @@ -40,13 +40,6 @@ extern void ux500_timer_init(void);
3628 .type = MT_DEVICE, \
3629 }
3630
3631 -#define __MEM_DEV_DESC(x, sz) { \
3632 - .virtual = IO_ADDRESS(x), \
3633 - .pfn = __phys_to_pfn(x), \
3634 - .length = sz, \
3635 - .type = MT_MEMORY, \
3636 -}
3637 -
3638 extern struct smp_operations ux500_smp_ops;
3639 extern void ux500_cpu_die(unsigned int cpu);
3640
3641 diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3642 index cd2c88e..4dd9b67 100644
3643 --- a/arch/arm/mm/Kconfig
3644 +++ b/arch/arm/mm/Kconfig
3645 @@ -446,7 +446,7 @@ config CPU_32v5
3646
3647 config CPU_32v6
3648 bool
3649 - select CPU_USE_DOMAINS if CPU_V6 && MMU
3650 + select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3651 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3652
3653 config CPU_32v6K
3654 @@ -601,6 +601,7 @@ config CPU_CP15_MPU
3655
3656 config CPU_USE_DOMAINS
3657 bool
3658 + depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3659 help
3660 This option enables or disables the use of domain switching
3661 via the set_fs() function.
3662 @@ -800,6 +801,7 @@ config NEED_KUSER_HELPERS
3663 config KUSER_HELPERS
3664 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3665 default y
3666 + depends on !(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND
3667 help
3668 Warning: disabling this option may break user programs.
3669
3670 @@ -812,7 +814,7 @@ config KUSER_HELPERS
3671 See Documentation/arm/kernel_user_helpers.txt for details.
3672
3673 However, the fixed address nature of these helpers can be used
3674 - by ROP (return orientated programming) authors when creating
3675 + by ROP (Return Oriented Programming) authors when creating
3676 exploits.
3677
3678 If all of the binaries and libraries which run on your platform
3679 diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3680 index 6f4585b..7b6f52b 100644
3681 --- a/arch/arm/mm/alignment.c
3682 +++ b/arch/arm/mm/alignment.c
3683 @@ -211,10 +211,12 @@ union offset_union {
3684 #define __get16_unaligned_check(ins,val,addr) \
3685 do { \
3686 unsigned int err = 0, v, a = addr; \
3687 + pax_open_userland(); \
3688 __get8_unaligned_check(ins,v,a,err); \
3689 val = v << ((BE) ? 8 : 0); \
3690 __get8_unaligned_check(ins,v,a,err); \
3691 val |= v << ((BE) ? 0 : 8); \
3692 + pax_close_userland(); \
3693 if (err) \
3694 goto fault; \
3695 } while (0)
3696 @@ -228,6 +230,7 @@ union offset_union {
3697 #define __get32_unaligned_check(ins,val,addr) \
3698 do { \
3699 unsigned int err = 0, v, a = addr; \
3700 + pax_open_userland(); \
3701 __get8_unaligned_check(ins,v,a,err); \
3702 val = v << ((BE) ? 24 : 0); \
3703 __get8_unaligned_check(ins,v,a,err); \
3704 @@ -236,6 +239,7 @@ union offset_union {
3705 val |= v << ((BE) ? 8 : 16); \
3706 __get8_unaligned_check(ins,v,a,err); \
3707 val |= v << ((BE) ? 0 : 24); \
3708 + pax_close_userland(); \
3709 if (err) \
3710 goto fault; \
3711 } while (0)
3712 @@ -249,6 +253,7 @@ union offset_union {
3713 #define __put16_unaligned_check(ins,val,addr) \
3714 do { \
3715 unsigned int err = 0, v = val, a = addr; \
3716 + pax_open_userland(); \
3717 __asm__( FIRST_BYTE_16 \
3718 ARM( "1: "ins" %1, [%2], #1\n" ) \
3719 THUMB( "1: "ins" %1, [%2]\n" ) \
3720 @@ -268,6 +273,7 @@ union offset_union {
3721 " .popsection\n" \
3722 : "=r" (err), "=&r" (v), "=&r" (a) \
3723 : "0" (err), "1" (v), "2" (a)); \
3724 + pax_close_userland(); \
3725 if (err) \
3726 goto fault; \
3727 } while (0)
3728 @@ -281,6 +287,7 @@ union offset_union {
3729 #define __put32_unaligned_check(ins,val,addr) \
3730 do { \
3731 unsigned int err = 0, v = val, a = addr; \
3732 + pax_open_userland(); \
3733 __asm__( FIRST_BYTE_32 \
3734 ARM( "1: "ins" %1, [%2], #1\n" ) \
3735 THUMB( "1: "ins" %1, [%2]\n" ) \
3736 @@ -310,6 +317,7 @@ union offset_union {
3737 " .popsection\n" \
3738 : "=r" (err), "=&r" (v), "=&r" (a) \
3739 : "0" (err), "1" (v), "2" (a)); \
3740 + pax_close_userland(); \
3741 if (err) \
3742 goto fault; \
3743 } while (0)
3744 diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3745 index 447da6f..77a5057 100644
3746 --- a/arch/arm/mm/cache-l2x0.c
3747 +++ b/arch/arm/mm/cache-l2x0.c
3748 @@ -45,7 +45,7 @@ struct l2x0_of_data {
3749 void (*setup)(const struct device_node *, u32 *, u32 *);
3750 void (*save)(void);
3751 struct outer_cache_fns outer_cache;
3752 -};
3753 +} __do_const;
3754
3755 static bool of_init = false;
3756
3757 diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3758 index 84e6f77..0b52f31 100644
3759 --- a/arch/arm/mm/context.c
3760 +++ b/arch/arm/mm/context.c
3761 @@ -43,7 +43,7 @@
3762 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3763
3764 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3765 -static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3766 +static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3767 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3768
3769 static DEFINE_PER_CPU(atomic64_t, active_asids);
3770 @@ -180,7 +180,7 @@ static int is_reserved_asid(u64 asid)
3771 static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3772 {
3773 u64 asid = atomic64_read(&mm->context.id);
3774 - u64 generation = atomic64_read(&asid_generation);
3775 + u64 generation = atomic64_read_unchecked(&asid_generation);
3776
3777 if (asid != 0 && is_reserved_asid(asid)) {
3778 /*
3779 @@ -198,7 +198,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3780 */
3781 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3782 if (asid == NUM_USER_ASIDS) {
3783 - generation = atomic64_add_return(ASID_FIRST_VERSION,
3784 + generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3785 &asid_generation);
3786 flush_context(cpu);
3787 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3788 @@ -227,14 +227,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3789 cpu_set_reserved_ttbr0();
3790
3791 asid = atomic64_read(&mm->context.id);
3792 - if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3793 + if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3794 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3795 goto switch_mm_fastpath;
3796
3797 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3798 /* Check that our ASID belongs to the current generation. */
3799 asid = atomic64_read(&mm->context.id);
3800 - if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3801 + if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3802 asid = new_context(mm, cpu);
3803 atomic64_set(&mm->context.id, asid);
3804 }
3805 diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3806 index eb8830a..5360ce7 100644
3807 --- a/arch/arm/mm/fault.c
3808 +++ b/arch/arm/mm/fault.c
3809 @@ -25,6 +25,7 @@
3810 #include <asm/system_misc.h>
3811 #include <asm/system_info.h>
3812 #include <asm/tlbflush.h>
3813 +#include <asm/sections.h>
3814
3815 #include "fault.h"
3816
3817 @@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3818 if (fixup_exception(regs))
3819 return;
3820
3821 +#ifdef CONFIG_PAX_MEMORY_UDEREF
3822 + if (addr < TASK_SIZE) {
3823 + if (current->signal->curr_ip)
3824 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3825 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3826 + else
3827 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3828 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3829 + }
3830 +#endif
3831 +
3832 +#ifdef CONFIG_PAX_KERNEXEC
3833 + if ((fsr & FSR_WRITE) &&
3834 + (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3835 + (MODULES_VADDR <= addr && addr < MODULES_END)))
3836 + {
3837 + if (current->signal->curr_ip)
3838 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3839 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3840 + else
3841 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3842 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3843 + }
3844 +#endif
3845 +
3846 /*
3847 * No handler, we'll have to terminate things with extreme prejudice.
3848 */
3849 @@ -174,6 +200,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3850 }
3851 #endif
3852
3853 +#ifdef CONFIG_PAX_PAGEEXEC
3854 + if (fsr & FSR_LNX_PF) {
3855 + pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3856 + do_group_exit(SIGKILL);
3857 + }
3858 +#endif
3859 +
3860 tsk->thread.address = addr;
3861 tsk->thread.error_code = fsr;
3862 tsk->thread.trap_no = 14;
3863 @@ -401,6 +434,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3864 }
3865 #endif /* CONFIG_MMU */
3866
3867 +#ifdef CONFIG_PAX_PAGEEXEC
3868 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3869 +{
3870 + long i;
3871 +
3872 + printk(KERN_ERR "PAX: bytes at PC: ");
3873 + for (i = 0; i < 20; i++) {
3874 + unsigned char c;
3875 + if (get_user(c, (__force unsigned char __user *)pc+i))
3876 + printk(KERN_CONT "?? ");
3877 + else
3878 + printk(KERN_CONT "%02x ", c);
3879 + }
3880 + printk("\n");
3881 +
3882 + printk(KERN_ERR "PAX: bytes at SP-4: ");
3883 + for (i = -1; i < 20; i++) {
3884 + unsigned long c;
3885 + if (get_user(c, (__force unsigned long __user *)sp+i))
3886 + printk(KERN_CONT "???????? ");
3887 + else
3888 + printk(KERN_CONT "%08lx ", c);
3889 + }
3890 + printk("\n");
3891 +}
3892 +#endif
3893 +
3894 /*
3895 * First Level Translation Fault Handler
3896 *
3897 @@ -548,9 +608,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3898 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
3899 struct siginfo info;
3900
3901 +#ifdef CONFIG_PAX_MEMORY_UDEREF
3902 + if (addr < TASK_SIZE && is_domain_fault(fsr)) {
3903 + if (current->signal->curr_ip)
3904 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3905 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3906 + else
3907 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3908 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3909 + goto die;
3910 + }
3911 +#endif
3912 +
3913 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
3914 return;
3915
3916 +die:
3917 printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
3918 inf->name, fsr, addr);
3919
3920 @@ -574,15 +647,98 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
3921 ifsr_info[nr].name = name;
3922 }
3923
3924 +asmlinkage int sys_sigreturn(struct pt_regs *regs);
3925 +asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
3926 +
3927 asmlinkage void __exception
3928 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
3929 {
3930 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
3931 struct siginfo info;
3932 + unsigned long pc = instruction_pointer(regs);
3933 +
3934 + if (user_mode(regs)) {
3935 + unsigned long sigpage = current->mm->context.sigpage;
3936 +
3937 + if (sigpage <= pc && pc < sigpage + 7*4) {
3938 + if (pc < sigpage + 3*4)
3939 + sys_sigreturn(regs);
3940 + else
3941 + sys_rt_sigreturn(regs);
3942 + return;
3943 + }
3944 + if (pc == 0xffff0f60UL) {
3945 + /*
3946 + * PaX: __kuser_cmpxchg64 emulation
3947 + */
3948 + // TODO
3949 + //regs->ARM_pc = regs->ARM_lr;
3950 + //return;
3951 + }
3952 + if (pc == 0xffff0fa0UL) {
3953 + /*
3954 + * PaX: __kuser_memory_barrier emulation
3955 + */
3956 + // dmb(); implied by the exception
3957 + regs->ARM_pc = regs->ARM_lr;
3958 + return;
3959 + }
3960 + if (pc == 0xffff0fc0UL) {
3961 + /*
3962 + * PaX: __kuser_cmpxchg emulation
3963 + */
3964 + // TODO
3965 + //long new;
3966 + //int op;
3967 +
3968 + //op = FUTEX_OP_SET << 28;
3969 + //new = futex_atomic_op_inuser(op, regs->ARM_r2);
3970 + //regs->ARM_r0 = old != new;
3971 + //regs->ARM_pc = regs->ARM_lr;
3972 + //return;
3973 + }
3974 + if (pc == 0xffff0fe0UL) {
3975 + /*
3976 + * PaX: __kuser_get_tls emulation
3977 + */
3978 + regs->ARM_r0 = current_thread_info()->tp_value[0];
3979 + regs->ARM_pc = regs->ARM_lr;
3980 + return;
3981 + }
3982 + }
3983 +
3984 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
3985 + else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
3986 + if (current->signal->curr_ip)
3987 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3988 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
3989 + pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
3990 + else
3991 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
3992 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
3993 + pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
3994 + goto die;
3995 + }
3996 +#endif
3997 +
3998 +#ifdef CONFIG_PAX_REFCOUNT
3999 + if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4000 + unsigned int bkpt;
4001 +
4002 + if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4003 + current->thread.error_code = ifsr;
4004 + current->thread.trap_no = 0;
4005 + pax_report_refcount_overflow(regs);
4006 + fixup_exception(regs);
4007 + return;
4008 + }
4009 + }
4010 +#endif
4011
4012 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4013 return;
4014
4015 +die:
4016 printk(KERN_ALERT "Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4017 inf->name, ifsr, addr);
4018
4019 diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4020 index cf08bdf..772656c 100644
4021 --- a/arch/arm/mm/fault.h
4022 +++ b/arch/arm/mm/fault.h
4023 @@ -3,6 +3,7 @@
4024
4025 /*
4026 * Fault status register encodings. We steal bit 31 for our own purposes.
4027 + * Set when the FSR value is from an instruction fault.
4028 */
4029 #define FSR_LNX_PF (1 << 31)
4030 #define FSR_WRITE (1 << 11)
4031 @@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4032 }
4033 #endif
4034
4035 +/* valid for LPAE and !LPAE */
4036 +static inline int is_xn_fault(unsigned int fsr)
4037 +{
4038 + return ((fsr_fs(fsr) & 0x3c) == 0xc);
4039 +}
4040 +
4041 +static inline int is_domain_fault(unsigned int fsr)
4042 +{
4043 + return ((fsr_fs(fsr) & 0xD) == 0x9);
4044 +}
4045 +
4046 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4047 unsigned long search_exception_table(unsigned long addr);
4048
4049 diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4050 index 18ec4c5..479bb6a 100644
4051 --- a/arch/arm/mm/init.c
4052 +++ b/arch/arm/mm/init.c
4053 @@ -30,6 +30,8 @@
4054 #include <asm/setup.h>
4055 #include <asm/tlb.h>
4056 #include <asm/fixmap.h>
4057 +#include <asm/system_info.h>
4058 +#include <asm/cp15.h>
4059
4060 #include <asm/mach/arch.h>
4061 #include <asm/mach/map.h>
4062 @@ -684,7 +686,46 @@ void free_initmem(void)
4063 {
4064 #ifdef CONFIG_HAVE_TCM
4065 extern char __tcm_start, __tcm_end;
4066 +#endif
4067
4068 +#ifdef CONFIG_PAX_KERNEXEC
4069 + unsigned long addr;
4070 + pgd_t *pgd;
4071 + pud_t *pud;
4072 + pmd_t *pmd;
4073 + int cpu_arch = cpu_architecture();
4074 + unsigned int cr = get_cr();
4075 +
4076 + if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4077 + /* make pages tables, etc before .text NX */
4078 + for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4079 + pgd = pgd_offset_k(addr);
4080 + pud = pud_offset(pgd, addr);
4081 + pmd = pmd_offset(pud, addr);
4082 + __section_update(pmd, addr, PMD_SECT_XN);
4083 + }
4084 + /* make init NX */
4085 + for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4086 + pgd = pgd_offset_k(addr);
4087 + pud = pud_offset(pgd, addr);
4088 + pmd = pmd_offset(pud, addr);
4089 + __section_update(pmd, addr, PMD_SECT_XN);
4090 + }
4091 + /* make kernel code/rodata RX */
4092 + for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4093 + pgd = pgd_offset_k(addr);
4094 + pud = pud_offset(pgd, addr);
4095 + pmd = pmd_offset(pud, addr);
4096 +#ifdef CONFIG_ARM_LPAE
4097 + __section_update(pmd, addr, PMD_SECT_RDONLY);
4098 +#else
4099 + __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4100 +#endif
4101 + }
4102 + }
4103 +#endif
4104 +
4105 +#ifdef CONFIG_HAVE_TCM
4106 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4107 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4108 #endif
4109 diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4110 index f123d6e..04bf569 100644
4111 --- a/arch/arm/mm/ioremap.c
4112 +++ b/arch/arm/mm/ioremap.c
4113 @@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4114 unsigned int mtype;
4115
4116 if (cached)
4117 - mtype = MT_MEMORY;
4118 + mtype = MT_MEMORY_RX;
4119 else
4120 - mtype = MT_MEMORY_NONCACHED;
4121 + mtype = MT_MEMORY_NONCACHED_RX;
4122
4123 return __arm_ioremap_caller(phys_addr, size, mtype,
4124 __builtin_return_address(0));
4125 diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4126 index 304661d..53a6b19 100644
4127 --- a/arch/arm/mm/mmap.c
4128 +++ b/arch/arm/mm/mmap.c
4129 @@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4130 struct vm_area_struct *vma;
4131 int do_align = 0;
4132 int aliasing = cache_is_vipt_aliasing();
4133 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4134 struct vm_unmapped_area_info info;
4135
4136 /*
4137 @@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4138 if (len > TASK_SIZE)
4139 return -ENOMEM;
4140
4141 +#ifdef CONFIG_PAX_RANDMMAP
4142 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4143 +#endif
4144 +
4145 if (addr) {
4146 if (do_align)
4147 addr = COLOUR_ALIGN(addr, pgoff);
4148 @@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4149 addr = PAGE_ALIGN(addr);
4150
4151 vma = find_vma(mm, addr);
4152 - if (TASK_SIZE - len >= addr &&
4153 - (!vma || addr + len <= vma->vm_start))
4154 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4155 return addr;
4156 }
4157
4158 @@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4159 info.high_limit = TASK_SIZE;
4160 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4161 info.align_offset = pgoff << PAGE_SHIFT;
4162 + info.threadstack_offset = offset;
4163 return vm_unmapped_area(&info);
4164 }
4165
4166 @@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4167 unsigned long addr = addr0;
4168 int do_align = 0;
4169 int aliasing = cache_is_vipt_aliasing();
4170 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4171 struct vm_unmapped_area_info info;
4172
4173 /*
4174 @@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4175 return addr;
4176 }
4177
4178 +#ifdef CONFIG_PAX_RANDMMAP
4179 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4180 +#endif
4181 +
4182 /* requesting a specific address */
4183 if (addr) {
4184 if (do_align)
4185 @@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4186 else
4187 addr = PAGE_ALIGN(addr);
4188 vma = find_vma(mm, addr);
4189 - if (TASK_SIZE - len >= addr &&
4190 - (!vma || addr + len <= vma->vm_start))
4191 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4192 return addr;
4193 }
4194
4195 @@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4196 info.high_limit = mm->mmap_base;
4197 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4198 info.align_offset = pgoff << PAGE_SHIFT;
4199 + info.threadstack_offset = offset;
4200 addr = vm_unmapped_area(&info);
4201
4202 /*
4203 @@ -173,6 +183,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4204 {
4205 unsigned long random_factor = 0UL;
4206
4207 +#ifdef CONFIG_PAX_RANDMMAP
4208 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4209 +#endif
4210 +
4211 /* 8 bits of randomness in 20 address space bits */
4212 if ((current->flags & PF_RANDOMIZE) &&
4213 !(current->personality & ADDR_NO_RANDOMIZE))
4214 @@ -180,9 +194,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4215
4216 if (mmap_is_legacy()) {
4217 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4218 +
4219 +#ifdef CONFIG_PAX_RANDMMAP
4220 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4221 + mm->mmap_base += mm->delta_mmap;
4222 +#endif
4223 +
4224 mm->get_unmapped_area = arch_get_unmapped_area;
4225 } else {
4226 mm->mmap_base = mmap_base(random_factor);
4227 +
4228 +#ifdef CONFIG_PAX_RANDMMAP
4229 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4230 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4231 +#endif
4232 +
4233 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4234 }
4235 }
4236 diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4237 index b1d17ee..7a6f4d3 100644
4238 --- a/arch/arm/mm/mmu.c
4239 +++ b/arch/arm/mm/mmu.c
4240 @@ -36,6 +36,22 @@
4241 #include "mm.h"
4242 #include "tcm.h"
4243
4244 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4245 +void modify_domain(unsigned int dom, unsigned int type)
4246 +{
4247 + struct thread_info *thread = current_thread_info();
4248 + unsigned int domain = thread->cpu_domain;
4249 + /*
4250 + * DOMAIN_MANAGER might be defined to some other value,
4251 + * use the arch-defined constant
4252 + */
4253 + domain &= ~domain_val(dom, 3);
4254 + thread->cpu_domain = domain | domain_val(dom, type);
4255 + set_domain(thread->cpu_domain);
4256 +}
4257 +EXPORT_SYMBOL(modify_domain);
4258 +#endif
4259 +
4260 /*
4261 * empty_zero_page is a special page that is used for
4262 * zero-initialized data and COW.
4263 @@ -228,10 +244,18 @@ __setup("noalign", noalign_setup);
4264
4265 #endif /* ifdef CONFIG_CPU_CP15 / else */
4266
4267 -#define PROT_PTE_DEVICE L_PTE_PRESENT|L_PTE_YOUNG|L_PTE_DIRTY|L_PTE_XN
4268 +#define PROT_PTE_DEVICE L_PTE_PRESENT|L_PTE_YOUNG|L_PTE_DIRTY
4269 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4270
4271 -static struct mem_type mem_types[] = {
4272 +#ifdef CONFIG_PAX_KERNEXEC
4273 +#define L_PTE_KERNEXEC L_PTE_RDONLY
4274 +#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4275 +#else
4276 +#define L_PTE_KERNEXEC L_PTE_DIRTY
4277 +#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4278 +#endif
4279 +
4280 +static struct mem_type mem_types[] __read_only = {
4281 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4282 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4283 L_PTE_SHARED,
4284 @@ -260,16 +284,16 @@ static struct mem_type mem_types[] = {
4285 [MT_UNCACHED] = {
4286 .prot_pte = PROT_PTE_DEVICE,
4287 .prot_l1 = PMD_TYPE_TABLE,
4288 - .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4289 + .prot_sect = PROT_SECT_DEVICE,
4290 .domain = DOMAIN_IO,
4291 },
4292 [MT_CACHECLEAN] = {
4293 - .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4294 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4295 .domain = DOMAIN_KERNEL,
4296 },
4297 #ifndef CONFIG_ARM_LPAE
4298 [MT_MINICLEAN] = {
4299 - .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4300 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_RDONLY,
4301 .domain = DOMAIN_KERNEL,
4302 },
4303 #endif
4304 @@ -277,36 +301,54 @@ static struct mem_type mem_types[] = {
4305 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4306 L_PTE_RDONLY,
4307 .prot_l1 = PMD_TYPE_TABLE,
4308 - .domain = DOMAIN_USER,
4309 + .domain = DOMAIN_VECTORS,
4310 },
4311 [MT_HIGH_VECTORS] = {
4312 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4313 L_PTE_USER | L_PTE_RDONLY,
4314 .prot_l1 = PMD_TYPE_TABLE,
4315 - .domain = DOMAIN_USER,
4316 + .domain = DOMAIN_VECTORS,
4317 },
4318 - [MT_MEMORY] = {
4319 + [MT_MEMORY_RWX] = {
4320 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4321 .prot_l1 = PMD_TYPE_TABLE,
4322 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4323 .domain = DOMAIN_KERNEL,
4324 },
4325 + [MT_MEMORY_RW] = {
4326 + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4327 + .prot_l1 = PMD_TYPE_TABLE,
4328 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4329 + .domain = DOMAIN_KERNEL,
4330 + },
4331 + [MT_MEMORY_RX] = {
4332 + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4333 + .prot_l1 = PMD_TYPE_TABLE,
4334 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4335 + .domain = DOMAIN_KERNEL,
4336 + },
4337 [MT_ROM] = {
4338 - .prot_sect = PMD_TYPE_SECT,
4339 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4340 .domain = DOMAIN_KERNEL,
4341 },
4342 - [MT_MEMORY_NONCACHED] = {
4343 + [MT_MEMORY_NONCACHED_RW] = {
4344 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4345 L_PTE_MT_BUFFERABLE,
4346 .prot_l1 = PMD_TYPE_TABLE,
4347 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4348 .domain = DOMAIN_KERNEL,
4349 },
4350 + [MT_MEMORY_NONCACHED_RX] = {
4351 + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4352 + L_PTE_MT_BUFFERABLE,
4353 + .prot_l1 = PMD_TYPE_TABLE,
4354 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4355 + .domain = DOMAIN_KERNEL,
4356 + },
4357 [MT_MEMORY_DTCM] = {
4358 - .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4359 - L_PTE_XN,
4360 + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4361 .prot_l1 = PMD_TYPE_TABLE,
4362 - .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4363 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4364 .domain = DOMAIN_KERNEL,
4365 },
4366 [MT_MEMORY_ITCM] = {
4367 @@ -316,10 +358,10 @@ static struct mem_type mem_types[] = {
4368 },
4369 [MT_MEMORY_SO] = {
4370 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4371 - L_PTE_MT_UNCACHED | L_PTE_XN,
4372 + L_PTE_MT_UNCACHED,
4373 .prot_l1 = PMD_TYPE_TABLE,
4374 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_S |
4375 - PMD_SECT_UNCACHED | PMD_SECT_XN,
4376 + PMD_SECT_UNCACHED,
4377 .domain = DOMAIN_KERNEL,
4378 },
4379 [MT_MEMORY_DMA_READY] = {
4380 @@ -405,9 +447,35 @@ static void __init build_mem_type_table(void)
4381 * to prevent speculative instruction fetches.
4382 */
4383 mem_types[MT_DEVICE].prot_sect |= PMD_SECT_XN;
4384 + mem_types[MT_DEVICE].prot_pte |= L_PTE_XN;
4385 mem_types[MT_DEVICE_NONSHARED].prot_sect |= PMD_SECT_XN;
4386 + mem_types[MT_DEVICE_NONSHARED].prot_pte |= L_PTE_XN;
4387 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_XN;
4388 + mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_XN;
4389 mem_types[MT_DEVICE_WC].prot_sect |= PMD_SECT_XN;
4390 + mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_XN;
4391 +
4392 + /* Mark other regions on ARMv6+ as execute-never */
4393 +
4394 +#ifdef CONFIG_PAX_KERNEXEC
4395 + mem_types[MT_UNCACHED].prot_sect |= PMD_SECT_XN;
4396 + mem_types[MT_UNCACHED].prot_pte |= L_PTE_XN;
4397 + mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_XN;
4398 + mem_types[MT_CACHECLEAN].prot_pte |= L_PTE_XN;
4399 +#ifndef CONFIG_ARM_LPAE
4400 + mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_XN;
4401 + mem_types[MT_MINICLEAN].prot_pte |= L_PTE_XN;
4402 +#endif
4403 + mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_XN;
4404 + mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_XN;
4405 + mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |= PMD_SECT_XN;
4406 + mem_types[MT_MEMORY_NONCACHED_RW].prot_pte |= PMD_SECT_XN;
4407 + mem_types[MT_MEMORY_DTCM].prot_sect |= PMD_SECT_XN;
4408 + mem_types[MT_MEMORY_DTCM].prot_pte |= L_PTE_XN;
4409 +#endif
4410 +
4411 + mem_types[MT_MEMORY_SO].prot_sect |= PMD_SECT_XN;
4412 + mem_types[MT_MEMORY_SO].prot_pte |= L_PTE_XN;
4413 }
4414 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4415 /*
4416 @@ -468,6 +536,9 @@ static void __init build_mem_type_table(void)
4417 * from SVC mode and no access from userspace.
4418 */
4419 mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4420 +#ifdef CONFIG_PAX_KERNEXEC
4421 + mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4422 +#endif
4423 mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4424 mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4425 #endif
4426 @@ -485,11 +556,17 @@ static void __init build_mem_type_table(void)
4427 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4428 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4429 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4430 - mem_types[MT_MEMORY].prot_sect |= PMD_SECT_S;
4431 - mem_types[MT_MEMORY].prot_pte |= L_PTE_SHARED;
4432 + mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4433 + mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4434 + mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4435 + mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4436 + mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4437 + mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4438 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4439 - mem_types[MT_MEMORY_NONCACHED].prot_sect |= PMD_SECT_S;
4440 - mem_types[MT_MEMORY_NONCACHED].prot_pte |= L_PTE_SHARED;
4441 + mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |= PMD_SECT_S;
4442 + mem_types[MT_MEMORY_NONCACHED_RW].prot_pte |= L_PTE_SHARED;
4443 + mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |= PMD_SECT_S;
4444 + mem_types[MT_MEMORY_NONCACHED_RX].prot_pte |= L_PTE_SHARED;
4445 }
4446 }
4447
4448 @@ -500,15 +577,20 @@ static void __init build_mem_type_table(void)
4449 if (cpu_arch >= CPU_ARCH_ARMv6) {
4450 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4451 /* Non-cacheable Normal is XCB = 001 */
4452 - mem_types[MT_MEMORY_NONCACHED].prot_sect |=
4453 + mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |=
4454 + PMD_SECT_BUFFERED;
4455 + mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |=
4456 PMD_SECT_BUFFERED;
4457 } else {
4458 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4459 - mem_types[MT_MEMORY_NONCACHED].prot_sect |=
4460 + mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |=
4461 + PMD_SECT_TEX(1);
4462 + mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |=
4463 PMD_SECT_TEX(1);
4464 }
4465 } else {
4466 - mem_types[MT_MEMORY_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4467 + mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |= PMD_SECT_BUFFERABLE;
4468 + mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |= PMD_SECT_BUFFERABLE;
4469 }
4470
4471 #ifdef CONFIG_ARM_LPAE
4472 @@ -524,6 +606,8 @@ static void __init build_mem_type_table(void)
4473 vecs_pgprot |= PTE_EXT_AF;
4474 #endif
4475
4476 + user_pgprot |= __supported_pte_mask;
4477 +
4478 for (i = 0; i < 16; i++) {
4479 pteval_t v = pgprot_val(protection_map[i]);
4480 protection_map[i] = __pgprot(v | user_pgprot);
4481 @@ -541,10 +625,15 @@ static void __init build_mem_type_table(void)
4482
4483 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4484 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4485 - mem_types[MT_MEMORY].prot_sect |= ecc_mask | cp->pmd;
4486 - mem_types[MT_MEMORY].prot_pte |= kern_pgprot;
4487 + mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4488 + mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4489 + mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4490 + mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4491 + mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4492 + mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4493 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4494 - mem_types[MT_MEMORY_NONCACHED].prot_sect |= ecc_mask;
4495 + mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |= ecc_mask;
4496 + mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |= ecc_mask;
4497 mem_types[MT_ROM].prot_sect |= cp->pmd;
4498
4499 switch (cp->pmd) {
4500 @@ -1186,18 +1275,15 @@ void __init arm_mm_memblock_reserve(void)
4501 * called function. This means you can't use any function or debugging
4502 * method which may touch any device, otherwise the kernel _will_ crash.
4503 */
4504 +
4505 +static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4506 +
4507 static void __init devicemaps_init(const struct machine_desc *mdesc)
4508 {
4509 struct map_desc map;
4510 unsigned long addr;
4511 - void *vectors;
4512
4513 - /*
4514 - * Allocate the vector page early.
4515 - */
4516 - vectors = early_alloc(PAGE_SIZE * 2);
4517 -
4518 - early_trap_init(vectors);
4519 + early_trap_init(&vectors);
4520
4521 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4522 pmd_clear(pmd_off_k(addr));
4523 @@ -1237,7 +1323,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4524 * location (0xffff0000). If we aren't using high-vectors, also
4525 * create a mapping at the low-vectors virtual address.
4526 */
4527 - map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4528 + map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4529 map.virtual = 0xffff0000;
4530 map.length = PAGE_SIZE;
4531 #ifdef CONFIG_KUSER_HELPERS
4532 @@ -1309,8 +1395,39 @@ static void __init map_lowmem(void)
4533 map.pfn = __phys_to_pfn(start);
4534 map.virtual = __phys_to_virt(start);
4535 map.length = end - start;
4536 - map.type = MT_MEMORY;
4537
4538 +#ifdef CONFIG_PAX_KERNEXEC
4539 + if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4540 + struct map_desc kernel;
4541 + struct map_desc initmap;
4542 +
4543 + /* when freeing initmem we will make this RW */
4544 + initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4545 + initmap.virtual = (unsigned long)__init_begin;
4546 + initmap.length = _sdata - __init_begin;
4547 + initmap.type = MT_MEMORY_RWX;
4548 + create_mapping(&initmap);
4549 +
4550 + /* when freeing initmem we will make this RX */
4551 + kernel.pfn = __phys_to_pfn(__pa(_stext));
4552 + kernel.virtual = (unsigned long)_stext;
4553 + kernel.length = __init_begin - _stext;
4554 + kernel.type = MT_MEMORY_RWX;
4555 + create_mapping(&kernel);
4556 +
4557 + if (map.virtual < (unsigned long)_stext) {
4558 + map.length = (unsigned long)_stext - map.virtual;
4559 + map.type = MT_MEMORY_RWX;
4560 + create_mapping(&map);
4561 + }
4562 +
4563 + map.pfn = __phys_to_pfn(__pa(_sdata));
4564 + map.virtual = (unsigned long)_sdata;
4565 + map.length = end - __pa(_sdata);
4566 + }
4567 +#endif
4568 +
4569 + map.type = MT_MEMORY_RW;
4570 create_mapping(&map);
4571 }
4572 }
4573 diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4574 index a5bc92d..0bb4730 100644
4575 --- a/arch/arm/plat-omap/sram.c
4576 +++ b/arch/arm/plat-omap/sram.c
4577 @@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4578 * Looks like we need to preserve some bootloader code at the
4579 * beginning of SRAM for jumping to flash for reboot to work...
4580 */
4581 + pax_open_kernel();
4582 memset_io(omap_sram_base + omap_sram_skip, 0,
4583 omap_sram_size - omap_sram_skip);
4584 + pax_close_kernel();
4585 }
4586 diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
4587 index ce6d763..cfea917 100644
4588 --- a/arch/arm/plat-samsung/include/plat/dma-ops.h
4589 +++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
4590 @@ -47,7 +47,7 @@ struct samsung_dma_ops {
4591 int (*started)(unsigned ch);
4592 int (*flush)(unsigned ch);
4593 int (*stop)(unsigned ch);
4594 -};
4595 +} __no_const;
4596
4597 extern void *samsung_dmadev_get_ops(void);
4598 extern void *s3c_dma_get_ops(void);
4599 diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4600 index c3a58a1..78fbf54 100644
4601 --- a/arch/avr32/include/asm/cache.h
4602 +++ b/arch/avr32/include/asm/cache.h
4603 @@ -1,8 +1,10 @@
4604 #ifndef __ASM_AVR32_CACHE_H
4605 #define __ASM_AVR32_CACHE_H
4606
4607 +#include <linux/const.h>
4608 +
4609 #define L1_CACHE_SHIFT 5
4610 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4611 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4612
4613 /*
4614 * Memory returned by kmalloc() may be used for DMA, so we must make
4615 diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4616 index d232888..87c8df1 100644
4617 --- a/arch/avr32/include/asm/elf.h
4618 +++ b/arch/avr32/include/asm/elf.h
4619 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4620 the loader. We need to make sure that it is out of the way of the program
4621 that it will "exec", and that there is sufficient room for the brk. */
4622
4623 -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
4624 +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4625
4626 +#ifdef CONFIG_PAX_ASLR
4627 +#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4628 +
4629 +#define PAX_DELTA_MMAP_LEN 15
4630 +#define PAX_DELTA_STACK_LEN 15
4631 +#endif
4632
4633 /* This yields a mask that user programs can use to figure out what
4634 instruction set this CPU supports. This could be done in user space,
4635 diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4636 index 479330b..53717a8 100644
4637 --- a/arch/avr32/include/asm/kmap_types.h
4638 +++ b/arch/avr32/include/asm/kmap_types.h
4639 @@ -2,9 +2,9 @@
4640 #define __ASM_AVR32_KMAP_TYPES_H
4641
4642 #ifdef CONFIG_DEBUG_HIGHMEM
4643 -# define KM_TYPE_NR 29
4644 +# define KM_TYPE_NR 30
4645 #else
4646 -# define KM_TYPE_NR 14
4647 +# define KM_TYPE_NR 15
4648 #endif
4649
4650 #endif /* __ASM_AVR32_KMAP_TYPES_H */
4651 diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
4652 index 0eca933..eb78c7b 100644
4653 --- a/arch/avr32/mm/fault.c
4654 +++ b/arch/avr32/mm/fault.c
4655 @@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
4656
4657 int exception_trace = 1;
4658
4659 +#ifdef CONFIG_PAX_PAGEEXEC
4660 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4661 +{
4662 + unsigned long i;
4663 +
4664 + printk(KERN_ERR "PAX: bytes at PC: ");
4665 + for (i = 0; i < 20; i++) {
4666 + unsigned char c;
4667 + if (get_user(c, (unsigned char *)pc+i))
4668 + printk(KERN_CONT "???????? ");
4669 + else
4670 + printk(KERN_CONT "%02x ", c);
4671 + }
4672 + printk("\n");
4673 +}
4674 +#endif
4675 +
4676 /*
4677 * This routine handles page faults. It determines the address and the
4678 * problem, and then passes it off to one of the appropriate routines.
4679 @@ -176,6 +193,16 @@ bad_area:
4680 up_read(&mm->mmap_sem);
4681
4682 if (user_mode(regs)) {
4683 +
4684 +#ifdef CONFIG_PAX_PAGEEXEC
4685 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4686 + if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
4687 + pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
4688 + do_group_exit(SIGKILL);
4689 + }
4690 + }
4691 +#endif
4692 +
4693 if (exception_trace && printk_ratelimit())
4694 printk("%s%s[%d]: segfault at %08lx pc %08lx "
4695 "sp %08lx ecr %lu\n",
4696 diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
4697 index 568885a..f8008df 100644
4698 --- a/arch/blackfin/include/asm/cache.h
4699 +++ b/arch/blackfin/include/asm/cache.h
4700 @@ -7,6 +7,7 @@
4701 #ifndef __ARCH_BLACKFIN_CACHE_H
4702 #define __ARCH_BLACKFIN_CACHE_H
4703
4704 +#include <linux/const.h>
4705 #include <linux/linkage.h> /* for asmlinkage */
4706
4707 /*
4708 @@ -14,7 +15,7 @@
4709 * Blackfin loads 32 bytes for cache
4710 */
4711 #define L1_CACHE_SHIFT 5
4712 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4713 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4714 #define SMP_CACHE_BYTES L1_CACHE_BYTES
4715
4716 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
4717 diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
4718 index aea2718..3639a60 100644
4719 --- a/arch/cris/include/arch-v10/arch/cache.h
4720 +++ b/arch/cris/include/arch-v10/arch/cache.h
4721 @@ -1,8 +1,9 @@
4722 #ifndef _ASM_ARCH_CACHE_H
4723 #define _ASM_ARCH_CACHE_H
4724
4725 +#include <linux/const.h>
4726 /* Etrax 100LX have 32-byte cache-lines. */
4727 -#define L1_CACHE_BYTES 32
4728 #define L1_CACHE_SHIFT 5
4729 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4730
4731 #endif /* _ASM_ARCH_CACHE_H */
4732 diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
4733 index 7caf25d..ee65ac5 100644
4734 --- a/arch/cris/include/arch-v32/arch/cache.h
4735 +++ b/arch/cris/include/arch-v32/arch/cache.h
4736 @@ -1,11 +1,12 @@
4737 #ifndef _ASM_CRIS_ARCH_CACHE_H
4738 #define _ASM_CRIS_ARCH_CACHE_H
4739
4740 +#include <linux/const.h>
4741 #include <arch/hwregs/dma.h>
4742
4743 /* A cache-line is 32 bytes. */
4744 -#define L1_CACHE_BYTES 32
4745 #define L1_CACHE_SHIFT 5
4746 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4747
4748 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4749
4750 diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
4751 index b86329d..6709906 100644
4752 --- a/arch/frv/include/asm/atomic.h
4753 +++ b/arch/frv/include/asm/atomic.h
4754 @@ -186,6 +186,16 @@ static inline void atomic64_dec(atomic64_t *v)
4755 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
4756 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
4757
4758 +#define atomic64_read_unchecked(v) atomic64_read(v)
4759 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4760 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4761 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4762 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4763 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
4764 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4765 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
4766 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4767 +
4768 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
4769 {
4770 int c, old;
4771 diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
4772 index 2797163..c2a401d 100644
4773 --- a/arch/frv/include/asm/cache.h
4774 +++ b/arch/frv/include/asm/cache.h
4775 @@ -12,10 +12,11 @@
4776 #ifndef __ASM_CACHE_H
4777 #define __ASM_CACHE_H
4778
4779 +#include <linux/const.h>
4780
4781 /* bytes per L1 cache line */
4782 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
4783 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4784 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4785
4786 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
4787 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
4788 diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
4789 index 43901f2..0d8b865 100644
4790 --- a/arch/frv/include/asm/kmap_types.h
4791 +++ b/arch/frv/include/asm/kmap_types.h
4792 @@ -2,6 +2,6 @@
4793 #ifndef _ASM_KMAP_TYPES_H
4794 #define _ASM_KMAP_TYPES_H
4795
4796 -#define KM_TYPE_NR 17
4797 +#define KM_TYPE_NR 18
4798
4799 #endif
4800 diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
4801 index 836f147..4cf23f5 100644
4802 --- a/arch/frv/mm/elf-fdpic.c
4803 +++ b/arch/frv/mm/elf-fdpic.c
4804 @@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
4805 {
4806 struct vm_area_struct *vma;
4807 struct vm_unmapped_area_info info;
4808 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
4809
4810 if (len > TASK_SIZE)
4811 return -ENOMEM;
4812 @@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
4813 if (addr) {
4814 addr = PAGE_ALIGN(addr);
4815 vma = find_vma(current->mm, addr);
4816 - if (TASK_SIZE - len >= addr &&
4817 - (!vma || addr + len <= vma->vm_start))
4818 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4819 goto success;
4820 }
4821
4822 @@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
4823 info.high_limit = (current->mm->start_stack - 0x00200000);
4824 info.align_mask = 0;
4825 info.align_offset = 0;
4826 + info.threadstack_offset = offset;
4827 addr = vm_unmapped_area(&info);
4828 if (!(addr & ~PAGE_MASK))
4829 goto success;
4830 diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
4831 index f4ca594..adc72fd6 100644
4832 --- a/arch/hexagon/include/asm/cache.h
4833 +++ b/arch/hexagon/include/asm/cache.h
4834 @@ -21,9 +21,11 @@
4835 #ifndef __ASM_CACHE_H
4836 #define __ASM_CACHE_H
4837
4838 +#include <linux/const.h>
4839 +
4840 /* Bytes per L1 cache line */
4841 -#define L1_CACHE_SHIFT (5)
4842 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4843 +#define L1_CACHE_SHIFT 5
4844 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4845
4846 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
4847 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
4848 diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
4849 index 7740ab1..17fa8c5 100644
4850 --- a/arch/ia64/Kconfig
4851 +++ b/arch/ia64/Kconfig
4852 @@ -554,6 +554,7 @@ source "drivers/sn/Kconfig"
4853 config KEXEC
4854 bool "kexec system call"
4855 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
4856 + depends on !GRKERNSEC_KMEM
4857 help
4858 kexec is a system call that implements the ability to shutdown your
4859 current kernel, and to start another kernel. It is like a reboot
4860 diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
4861 index 6e6fe18..a6ae668 100644
4862 --- a/arch/ia64/include/asm/atomic.h
4863 +++ b/arch/ia64/include/asm/atomic.h
4864 @@ -208,6 +208,16 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
4865 #define atomic64_inc(v) atomic64_add(1, (v))
4866 #define atomic64_dec(v) atomic64_sub(1, (v))
4867
4868 +#define atomic64_read_unchecked(v) atomic64_read(v)
4869 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4870 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4871 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4872 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4873 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
4874 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4875 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
4876 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4877 +
4878 /* Atomic operations are already serializing */
4879 #define smp_mb__before_atomic_dec() barrier()
4880 #define smp_mb__after_atomic_dec() barrier()
4881 diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
4882 index 988254a..e1ee885 100644
4883 --- a/arch/ia64/include/asm/cache.h
4884 +++ b/arch/ia64/include/asm/cache.h
4885 @@ -1,6 +1,7 @@
4886 #ifndef _ASM_IA64_CACHE_H
4887 #define _ASM_IA64_CACHE_H
4888
4889 +#include <linux/const.h>
4890
4891 /*
4892 * Copyright (C) 1998-2000 Hewlett-Packard Co
4893 @@ -9,7 +10,7 @@
4894
4895 /* Bytes per L1 (data) cache line. */
4896 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
4897 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4898 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4899
4900 #ifdef CONFIG_SMP
4901 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
4902 diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
4903 index 5a83c5c..4d7f553 100644
4904 --- a/arch/ia64/include/asm/elf.h
4905 +++ b/arch/ia64/include/asm/elf.h
4906 @@ -42,6 +42,13 @@
4907 */
4908 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
4909
4910 +#ifdef CONFIG_PAX_ASLR
4911 +#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
4912 +
4913 +#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
4914 +#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
4915 +#endif
4916 +
4917 #define PT_IA_64_UNWIND 0x70000001
4918
4919 /* IA-64 relocations: */
4920 diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
4921 index 96a8d92..617a1cf 100644
4922 --- a/arch/ia64/include/asm/pgalloc.h
4923 +++ b/arch/ia64/include/asm/pgalloc.h
4924 @@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
4925 pgd_val(*pgd_entry) = __pa(pud);
4926 }
4927
4928 +static inline void
4929 +pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
4930 +{
4931 + pgd_populate(mm, pgd_entry, pud);
4932 +}
4933 +
4934 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
4935 {
4936 return quicklist_alloc(0, GFP_KERNEL, NULL);
4937 @@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
4938 pud_val(*pud_entry) = __pa(pmd);
4939 }
4940
4941 +static inline void
4942 +pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
4943 +{
4944 + pud_populate(mm, pud_entry, pmd);
4945 +}
4946 +
4947 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
4948 {
4949 return quicklist_alloc(0, GFP_KERNEL, NULL);
4950 diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
4951 index 7935115..c0eca6a 100644
4952 --- a/arch/ia64/include/asm/pgtable.h
4953 +++ b/arch/ia64/include/asm/pgtable.h
4954 @@ -12,7 +12,7 @@
4955 * David Mosberger-Tang <davidm@hpl.hp.com>
4956 */
4957
4958 -
4959 +#include <linux/const.h>
4960 #include <asm/mman.h>
4961 #include <asm/page.h>
4962 #include <asm/processor.h>
4963 @@ -142,6 +142,17 @@
4964 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
4965 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
4966 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
4967 +
4968 +#ifdef CONFIG_PAX_PAGEEXEC
4969 +# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
4970 +# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
4971 +# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
4972 +#else
4973 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
4974 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
4975 +# define PAGE_COPY_NOEXEC PAGE_COPY
4976 +#endif
4977 +
4978 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
4979 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
4980 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
4981 diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
4982 index 45698cd..e8e2dbc 100644
4983 --- a/arch/ia64/include/asm/spinlock.h
4984 +++ b/arch/ia64/include/asm/spinlock.h
4985 @@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
4986 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
4987
4988 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
4989 - ACCESS_ONCE(*p) = (tmp + 2) & ~1;
4990 + ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
4991 }
4992
4993 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
4994 diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
4995 index 449c8c0..18965fb 100644
4996 --- a/arch/ia64/include/asm/uaccess.h
4997 +++ b/arch/ia64/include/asm/uaccess.h
4998 @@ -240,12 +240,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
4999 static inline unsigned long
5000 __copy_to_user (void __user *to, const void *from, unsigned long count)
5001 {
5002 + if (count > INT_MAX)
5003 + return count;
5004 +
5005 + if (!__builtin_constant_p(count))
5006 + check_object_size(from, count, true);
5007 +
5008 return __copy_user(to, (__force void __user *) from, count);
5009 }
5010
5011 static inline unsigned long
5012 __copy_from_user (void *to, const void __user *from, unsigned long count)
5013 {
5014 + if (count > INT_MAX)
5015 + return count;
5016 +
5017 + if (!__builtin_constant_p(count))
5018 + check_object_size(to, count, false);
5019 +
5020 return __copy_user((__force void __user *) to, from, count);
5021 }
5022
5023 @@ -255,10 +267,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5024 ({ \
5025 void __user *__cu_to = (to); \
5026 const void *__cu_from = (from); \
5027 - long __cu_len = (n); \
5028 + unsigned long __cu_len = (n); \
5029 \
5030 - if (__access_ok(__cu_to, __cu_len, get_fs())) \
5031 + if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5032 + if (!__builtin_constant_p(n)) \
5033 + check_object_size(__cu_from, __cu_len, true); \
5034 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5035 + } \
5036 __cu_len; \
5037 })
5038
5039 @@ -266,11 +281,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5040 ({ \
5041 void *__cu_to = (to); \
5042 const void __user *__cu_from = (from); \
5043 - long __cu_len = (n); \
5044 + unsigned long __cu_len = (n); \
5045 \
5046 __chk_user_ptr(__cu_from); \
5047 - if (__access_ok(__cu_from, __cu_len, get_fs())) \
5048 + if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5049 + if (!__builtin_constant_p(n)) \
5050 + check_object_size(__cu_to, __cu_len, false); \
5051 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5052 + } \
5053 __cu_len; \
5054 })
5055
5056 diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5057 index 24603be..948052d 100644
5058 --- a/arch/ia64/kernel/module.c
5059 +++ b/arch/ia64/kernel/module.c
5060 @@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
5061 void
5062 module_free (struct module *mod, void *module_region)
5063 {
5064 - if (mod && mod->arch.init_unw_table &&
5065 - module_region == mod->module_init) {
5066 + if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
5067 unw_remove_unwind_table(mod->arch.init_unw_table);
5068 mod->arch.init_unw_table = NULL;
5069 }
5070 @@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5071 }
5072
5073 static inline int
5074 +in_init_rx (const struct module *mod, uint64_t addr)
5075 +{
5076 + return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5077 +}
5078 +
5079 +static inline int
5080 +in_init_rw (const struct module *mod, uint64_t addr)
5081 +{
5082 + return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5083 +}
5084 +
5085 +static inline int
5086 in_init (const struct module *mod, uint64_t addr)
5087 {
5088 - return addr - (uint64_t) mod->module_init < mod->init_size;
5089 + return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5090 +}
5091 +
5092 +static inline int
5093 +in_core_rx (const struct module *mod, uint64_t addr)
5094 +{
5095 + return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5096 +}
5097 +
5098 +static inline int
5099 +in_core_rw (const struct module *mod, uint64_t addr)
5100 +{
5101 + return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5102 }
5103
5104 static inline int
5105 in_core (const struct module *mod, uint64_t addr)
5106 {
5107 - return addr - (uint64_t) mod->module_core < mod->core_size;
5108 + return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5109 }
5110
5111 static inline int
5112 @@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5113 break;
5114
5115 case RV_BDREL:
5116 - val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5117 + if (in_init_rx(mod, val))
5118 + val -= (uint64_t) mod->module_init_rx;
5119 + else if (in_init_rw(mod, val))
5120 + val -= (uint64_t) mod->module_init_rw;
5121 + else if (in_core_rx(mod, val))
5122 + val -= (uint64_t) mod->module_core_rx;
5123 + else if (in_core_rw(mod, val))
5124 + val -= (uint64_t) mod->module_core_rw;
5125 break;
5126
5127 case RV_LTV:
5128 @@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5129 * addresses have been selected...
5130 */
5131 uint64_t gp;
5132 - if (mod->core_size > MAX_LTOFF)
5133 + if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5134 /*
5135 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5136 * at the end of the module.
5137 */
5138 - gp = mod->core_size - MAX_LTOFF / 2;
5139 + gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5140 else
5141 - gp = mod->core_size / 2;
5142 - gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5143 + gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5144 + gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5145 mod->arch.gp = gp;
5146 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5147 }
5148 diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5149 index ab33328..f39506c 100644
5150 --- a/arch/ia64/kernel/palinfo.c
5151 +++ b/arch/ia64/kernel/palinfo.c
5152 @@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5153 return NOTIFY_OK;
5154 }
5155
5156 -static struct notifier_block __refdata palinfo_cpu_notifier =
5157 +static struct notifier_block palinfo_cpu_notifier =
5158 {
5159 .notifier_call = palinfo_cpu_callback,
5160 .priority = 0,
5161 diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5162 index 41e33f8..65180b2a 100644
5163 --- a/arch/ia64/kernel/sys_ia64.c
5164 +++ b/arch/ia64/kernel/sys_ia64.c
5165 @@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5166 unsigned long align_mask = 0;
5167 struct mm_struct *mm = current->mm;
5168 struct vm_unmapped_area_info info;
5169 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5170
5171 if (len > RGN_MAP_LIMIT)
5172 return -ENOMEM;
5173 @@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5174 if (REGION_NUMBER(addr) == RGN_HPAGE)
5175 addr = 0;
5176 #endif
5177 +
5178 +#ifdef CONFIG_PAX_RANDMMAP
5179 + if (mm->pax_flags & MF_PAX_RANDMMAP)
5180 + addr = mm->free_area_cache;
5181 + else
5182 +#endif
5183 +
5184 if (!addr)
5185 addr = TASK_UNMAPPED_BASE;
5186
5187 @@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5188 info.high_limit = TASK_SIZE;
5189 info.align_mask = align_mask;
5190 info.align_offset = 0;
5191 + info.threadstack_offset = offset;
5192 return vm_unmapped_area(&info);
5193 }
5194
5195 diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5196 index 0ccb28f..8992469 100644
5197 --- a/arch/ia64/kernel/vmlinux.lds.S
5198 +++ b/arch/ia64/kernel/vmlinux.lds.S
5199 @@ -198,7 +198,7 @@ SECTIONS {
5200 /* Per-cpu data: */
5201 . = ALIGN(PERCPU_PAGE_SIZE);
5202 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5203 - __phys_per_cpu_start = __per_cpu_load;
5204 + __phys_per_cpu_start = per_cpu_load;
5205 /*
5206 * ensure percpu data fits
5207 * into percpu page size
5208 diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5209 index 7225dad..2a7c8256 100644
5210 --- a/arch/ia64/mm/fault.c
5211 +++ b/arch/ia64/mm/fault.c
5212 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5213 return pte_present(pte);
5214 }
5215
5216 +#ifdef CONFIG_PAX_PAGEEXEC
5217 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5218 +{
5219 + unsigned long i;
5220 +
5221 + printk(KERN_ERR "PAX: bytes at PC: ");
5222 + for (i = 0; i < 8; i++) {
5223 + unsigned int c;
5224 + if (get_user(c, (unsigned int *)pc+i))
5225 + printk(KERN_CONT "???????? ");
5226 + else
5227 + printk(KERN_CONT "%08x ", c);
5228 + }
5229 + printk("\n");
5230 +}
5231 +#endif
5232 +
5233 # define VM_READ_BIT 0
5234 # define VM_WRITE_BIT 1
5235 # define VM_EXEC_BIT 2
5236 @@ -151,8 +168,21 @@ retry:
5237 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5238 goto bad_area;
5239
5240 - if ((vma->vm_flags & mask) != mask)
5241 + if ((vma->vm_flags & mask) != mask) {
5242 +
5243 +#ifdef CONFIG_PAX_PAGEEXEC
5244 + if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5245 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5246 + goto bad_area;
5247 +
5248 + up_read(&mm->mmap_sem);
5249 + pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5250 + do_group_exit(SIGKILL);
5251 + }
5252 +#endif
5253 +
5254 goto bad_area;
5255 + }
5256
5257 /*
5258 * If for any reason at all we couldn't handle the fault, make
5259 diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5260 index 68232db..6ca80af 100644
5261 --- a/arch/ia64/mm/hugetlbpage.c
5262 +++ b/arch/ia64/mm/hugetlbpage.c
5263 @@ -154,6 +154,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5264 unsigned long pgoff, unsigned long flags)
5265 {
5266 struct vm_unmapped_area_info info;
5267 + unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5268
5269 if (len > RGN_MAP_LIMIT)
5270 return -ENOMEM;
5271 @@ -177,6 +178,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5272 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5273 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5274 info.align_offset = 0;
5275 + info.threadstack_offset = offset;
5276 return vm_unmapped_area(&info);
5277 }
5278
5279 diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5280 index b6f7f43..c04320d 100644
5281 --- a/arch/ia64/mm/init.c
5282 +++ b/arch/ia64/mm/init.c
5283 @@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5284 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5285 vma->vm_end = vma->vm_start + PAGE_SIZE;
5286 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5287 +
5288 +#ifdef CONFIG_PAX_PAGEEXEC
5289 + if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5290 + vma->vm_flags &= ~VM_EXEC;
5291 +
5292 +#ifdef CONFIG_PAX_MPROTECT
5293 + if (current->mm->pax_flags & MF_PAX_MPROTECT)
5294 + vma->vm_flags &= ~VM_MAYEXEC;
5295 +#endif
5296 +
5297 + }
5298 +#endif
5299 +
5300 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5301 down_write(&current->mm->mmap_sem);
5302 if (insert_vm_struct(current->mm, vma)) {
5303 diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5304 index 40b3ee9..8c2c112 100644
5305 --- a/arch/m32r/include/asm/cache.h
5306 +++ b/arch/m32r/include/asm/cache.h
5307 @@ -1,8 +1,10 @@
5308 #ifndef _ASM_M32R_CACHE_H
5309 #define _ASM_M32R_CACHE_H
5310
5311 +#include <linux/const.h>
5312 +
5313 /* L1 cache line size */
5314 #define L1_CACHE_SHIFT 4
5315 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5316 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5317
5318 #endif /* _ASM_M32R_CACHE_H */
5319 diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5320 index 82abd15..d95ae5d 100644
5321 --- a/arch/m32r/lib/usercopy.c
5322 +++ b/arch/m32r/lib/usercopy.c
5323 @@ -14,6 +14,9 @@
5324 unsigned long
5325 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5326 {
5327 + if ((long)n < 0)
5328 + return n;
5329 +
5330 prefetch(from);
5331 if (access_ok(VERIFY_WRITE, to, n))
5332 __copy_user(to,from,n);
5333 @@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5334 unsigned long
5335 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5336 {
5337 + if ((long)n < 0)
5338 + return n;
5339 +
5340 prefetchw(to);
5341 if (access_ok(VERIFY_READ, from, n))
5342 __copy_user_zeroing(to,from,n);
5343 diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5344 index 0395c51..5f26031 100644
5345 --- a/arch/m68k/include/asm/cache.h
5346 +++ b/arch/m68k/include/asm/cache.h
5347 @@ -4,9 +4,11 @@
5348 #ifndef __ARCH_M68K_CACHE_H
5349 #define __ARCH_M68K_CACHE_H
5350
5351 +#include <linux/const.h>
5352 +
5353 /* bytes per L1 cache line */
5354 #define L1_CACHE_SHIFT 4
5355 -#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5356 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5357
5358 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5359
5360 diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5361 index 0424315..defcca9 100644
5362 --- a/arch/metag/mm/hugetlbpage.c
5363 +++ b/arch/metag/mm/hugetlbpage.c
5364 @@ -205,6 +205,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5365 info.high_limit = TASK_SIZE;
5366 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5367 info.align_offset = 0;
5368 + info.threadstack_offset = 0;
5369 return vm_unmapped_area(&info);
5370 }
5371
5372 diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5373 index 4efe96a..60e8699 100644
5374 --- a/arch/microblaze/include/asm/cache.h
5375 +++ b/arch/microblaze/include/asm/cache.h
5376 @@ -13,11 +13,12 @@
5377 #ifndef _ASM_MICROBLAZE_CACHE_H
5378 #define _ASM_MICROBLAZE_CACHE_H
5379
5380 +#include <linux/const.h>
5381 #include <asm/registers.h>
5382
5383 #define L1_CACHE_SHIFT 5
5384 /* word-granular cache in microblaze */
5385 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5386 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5387
5388 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5389
5390 diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5391 index f75ab4a..adc6968 100644
5392 --- a/arch/mips/Kconfig
5393 +++ b/arch/mips/Kconfig
5394 @@ -2283,6 +2283,7 @@ source "kernel/Kconfig.preempt"
5395
5396 config KEXEC
5397 bool "Kexec system call"
5398 + depends on !GRKERNSEC_KMEM
5399 help
5400 kexec is a system call that implements the ability to shutdown your
5401 current kernel, and to start another kernel. It is like a reboot
5402 diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5403 index 08b6079..8b554d2 100644
5404 --- a/arch/mips/include/asm/atomic.h
5405 +++ b/arch/mips/include/asm/atomic.h
5406 @@ -21,15 +21,39 @@
5407 #include <asm/cmpxchg.h>
5408 #include <asm/war.h>
5409
5410 +#ifdef CONFIG_GENERIC_ATOMIC64
5411 +#include <asm-generic/atomic64.h>
5412 +#endif
5413 +
5414 #define ATOMIC_INIT(i) { (i) }
5415
5416 +#ifdef CONFIG_64BIT
5417 +#define _ASM_EXTABLE(from, to) \
5418 +" .section __ex_table,\"a\"\n" \
5419 +" .dword " #from ", " #to"\n" \
5420 +" .previous\n"
5421 +#else
5422 +#define _ASM_EXTABLE(from, to) \
5423 +" .section __ex_table,\"a\"\n" \
5424 +" .word " #from ", " #to"\n" \
5425 +" .previous\n"
5426 +#endif
5427 +
5428 /*
5429 * atomic_read - read atomic variable
5430 * @v: pointer of type atomic_t
5431 *
5432 * Atomically reads the value of @v.
5433 */
5434 -#define atomic_read(v) (*(volatile int *)&(v)->counter)
5435 +static inline int atomic_read(const atomic_t *v)
5436 +{
5437 + return (*(volatile const int *) &v->counter);
5438 +}
5439 +
5440 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5441 +{
5442 + return (*(volatile const int *) &v->counter);
5443 +}
5444
5445 /*
5446 * atomic_set - set atomic variable
5447 @@ -38,7 +62,15 @@
5448 *
5449 * Atomically sets the value of @v to @i.
5450 */
5451 -#define atomic_set(v, i) ((v)->counter = (i))
5452 +static inline void atomic_set(atomic_t *v, int i)
5453 +{
5454 + v->counter = i;
5455 +}
5456 +
5457 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5458 +{
5459 + v->counter = i;
5460 +}
5461
5462 /*
5463 * atomic_add - add integer to atomic variable
5464 @@ -47,7 +79,67 @@
5465 *
5466 * Atomically adds @i to @v.
5467 */
5468 -static __inline__ void atomic_add(int i, atomic_t * v)
5469 +static __inline__ void atomic_add(int i, atomic_t *v)
5470 +{
5471 + int temp;
5472 +
5473 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
5474 + __asm__ __volatile__(
5475 + " .set mips3 \n"
5476 + "1: ll %0, %1 # atomic_add \n"
5477 +#ifdef CONFIG_PAX_REFCOUNT
5478 + /* Exception on overflow. */
5479 + "2: add %0, %2 \n"
5480 +#else
5481 + " addu %0, %2 \n"
5482 +#endif
5483 + " sc %0, %1 \n"
5484 + " beqzl %0, 1b \n"
5485 +#ifdef CONFIG_PAX_REFCOUNT
5486 + "3: \n"
5487 + _ASM_EXTABLE(2b, 3b)
5488 +#endif
5489 + " .set mips0 \n"
5490 + : "=&r" (temp), "+m" (v->counter)
5491 + : "Ir" (i));
5492 + } else if (kernel_uses_llsc) {
5493 + __asm__ __volatile__(
5494 + " .set mips3 \n"
5495 + "1: ll %0, %1 # atomic_add \n"
5496 +#ifdef CONFIG_PAX_REFCOUNT
5497 + /* Exception on overflow. */
5498 + "2: add %0, %2 \n"
5499 +#else
5500 + " addu %0, %2 \n"
5501 +#endif
5502 + " sc %0, %1 \n"
5503 + " beqz %0, 1b \n"
5504 +#ifdef CONFIG_PAX_REFCOUNT
5505 + "3: \n"
5506 + _ASM_EXTABLE(2b, 3b)
5507 +#endif
5508 + " .set mips0 \n"
5509 + : "=&r" (temp), "+m" (v->counter)
5510 + : "Ir" (i));
5511 + } else {
5512 + unsigned long flags;
5513 +
5514 + raw_local_irq_save(flags);
5515 + __asm__ __volatile__(
5516 +#ifdef CONFIG_PAX_REFCOUNT
5517 + /* Exception on overflow. */
5518 + "1: add %0, %1 \n"
5519 + "2: \n"
5520 + _ASM_EXTABLE(1b, 2b)
5521 +#else
5522 + " addu %0, %1 \n"
5523 +#endif
5524 + : "+r" (v->counter) : "Ir" (i));
5525 + raw_local_irq_restore(flags);
5526 + }
5527 +}
5528 +
5529 +static __inline__ void atomic_add_unchecked(int i, atomic_unchecked_t *v)
5530 {
5531 if (kernel_uses_llsc && R10000_LLSC_WAR) {
5532 int temp;
5533 @@ -90,7 +182,67 @@ static __inline__ void atomic_add(int i, atomic_t * v)
5534 *
5535 * Atomically subtracts @i from @v.
5536 */
5537 -static __inline__ void atomic_sub(int i, atomic_t * v)
5538 +static __inline__ void atomic_sub(int i, atomic_t *v)
5539 +{
5540 + int temp;
5541 +
5542 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
5543 + __asm__ __volatile__(
5544 + " .set mips3 \n"
5545 + "1: ll %0, %1 # atomic64_sub \n"
5546 +#ifdef CONFIG_PAX_REFCOUNT
5547 + /* Exception on overflow. */
5548 + "2: sub %0, %2 \n"
5549 +#else
5550 + " subu %0, %2 \n"
5551 +#endif
5552 + " sc %0, %1 \n"
5553 + " beqzl %0, 1b \n"
5554 +#ifdef CONFIG_PAX_REFCOUNT
5555 + "3: \n"
5556 + _ASM_EXTABLE(2b, 3b)
5557 +#endif
5558 + " .set mips0 \n"
5559 + : "=&r" (temp), "+m" (v->counter)
5560 + : "Ir" (i));
5561 + } else if (kernel_uses_llsc) {
5562 + __asm__ __volatile__(
5563 + " .set mips3 \n"
5564 + "1: ll %0, %1 # atomic64_sub \n"
5565 +#ifdef CONFIG_PAX_REFCOUNT
5566 + /* Exception on overflow. */
5567 + "2: sub %0, %2 \n"
5568 +#else
5569 + " subu %0, %2 \n"
5570 +#endif
5571 + " sc %0, %1 \n"
5572 + " beqz %0, 1b \n"
5573 +#ifdef CONFIG_PAX_REFCOUNT
5574 + "3: \n"
5575 + _ASM_EXTABLE(2b, 3b)
5576 +#endif
5577 + " .set mips0 \n"
5578 + : "=&r" (temp), "+m" (v->counter)
5579 + : "Ir" (i));
5580 + } else {
5581 + unsigned long flags;
5582 +
5583 + raw_local_irq_save(flags);
5584 + __asm__ __volatile__(
5585 +#ifdef CONFIG_PAX_REFCOUNT
5586 + /* Exception on overflow. */
5587 + "1: sub %0, %1 \n"
5588 + "2: \n"
5589 + _ASM_EXTABLE(1b, 2b)
5590 +#else
5591 + " subu %0, %1 \n"
5592 +#endif
5593 + : "+r" (v->counter) : "Ir" (i));
5594 + raw_local_irq_restore(flags);
5595 + }
5596 +}
5597 +
5598 +static __inline__ void atomic_sub_unchecked(long i, atomic_unchecked_t *v)
5599 {
5600 if (kernel_uses_llsc && R10000_LLSC_WAR) {
5601 int temp;
5602 @@ -129,7 +281,93 @@ static __inline__ void atomic_sub(int i, atomic_t * v)
5603 /*
5604 * Same as above, but return the result value
5605 */
5606 -static __inline__ int atomic_add_return(int i, atomic_t * v)
5607 +static __inline__ int atomic_add_return(int i, atomic_t *v)
5608 +{
5609 + int result;
5610 + int temp;
5611 +
5612 + smp_mb__before_llsc();
5613 +
5614 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
5615 + __asm__ __volatile__(
5616 + " .set mips3 \n"
5617 + "1: ll %1, %2 # atomic_add_return \n"
5618 +#ifdef CONFIG_PAX_REFCOUNT
5619 + "2: add %0, %1, %3 \n"
5620 +#else
5621 + " addu %0, %1, %3 \n"
5622 +#endif
5623 + " sc %0, %2 \n"
5624 + " beqzl %0, 1b \n"
5625 +#ifdef CONFIG_PAX_REFCOUNT
5626 + " b 4f \n"
5627 + " .set noreorder \n"
5628 + "3: b 5f \n"
5629 + " move %0, %1 \n"
5630 + " .set reorder \n"
5631 + _ASM_EXTABLE(2b, 3b)
5632 +#endif
5633 + "4: addu %0, %1, %3 \n"
5634 +#ifdef CONFIG_PAX_REFCOUNT
5635 + "5: \n"
5636 +#endif
5637 + " .set mips0 \n"
5638 + : "=&r" (result), "=&r" (temp), "+m" (v->counter)
5639 + : "Ir" (i));
5640 + } else if (kernel_uses_llsc) {
5641 + __asm__ __volatile__(
5642 + " .set mips3 \n"
5643 + "1: ll %1, %2 # atomic_add_return \n"
5644 +#ifdef CONFIG_PAX_REFCOUNT
5645 + "2: add %0, %1, %3 \n"
5646 +#else
5647 + " addu %0, %1, %3 \n"
5648 +#endif
5649 + " sc %0, %2 \n"
5650 + " bnez %0, 4f \n"
5651 + " b 1b \n"
5652 +#ifdef CONFIG_PAX_REFCOUNT
5653 + " .set noreorder \n"
5654 + "3: b 5f \n"
5655 + " move %0, %1 \n"
5656 + " .set reorder \n"
5657 + _ASM_EXTABLE(2b, 3b)
5658 +#endif
5659 + "4: addu %0, %1, %3 \n"
5660 +#ifdef CONFIG_PAX_REFCOUNT
5661 + "5: \n"
5662 +#endif
5663 + " .set mips0 \n"
5664 + : "=&r" (result), "=&r" (temp), "+m" (v->counter)
5665 + : "Ir" (i));
5666 + } else {
5667 + unsigned long flags;
5668 +
5669 + raw_local_irq_save(flags);
5670 + __asm__ __volatile__(
5671 + " lw %0, %1 \n"
5672 +#ifdef CONFIG_PAX_REFCOUNT
5673 + /* Exception on overflow. */
5674 + "1: add %0, %2 \n"
5675 +#else
5676 + " addu %0, %2 \n"
5677 +#endif
5678 + " sw %0, %1 \n"
5679 +#ifdef CONFIG_PAX_REFCOUNT
5680 + /* Note: Dest reg is not modified on overflow */
5681 + "2: \n"
5682 + _ASM_EXTABLE(1b, 2b)
5683 +#endif
5684 + : "=&r" (result), "+m" (v->counter) : "Ir" (i));
5685 + raw_local_irq_restore(flags);
5686 + }
5687 +
5688 + smp_llsc_mb();
5689 +
5690 + return result;
5691 +}
5692 +
5693 +static __inline__ int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
5694 {
5695 int result;
5696
5697 @@ -178,7 +416,93 @@ static __inline__ int atomic_add_return(int i, atomic_t * v)
5698 return result;
5699 }
5700
5701 -static __inline__ int atomic_sub_return(int i, atomic_t * v)
5702 +static __inline__ int atomic_sub_return(int i, atomic_t *v)
5703 +{
5704 + int result;
5705 + int temp;
5706 +
5707 + smp_mb__before_llsc();
5708 +
5709 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
5710 + __asm__ __volatile__(
5711 + " .set mips3 \n"
5712 + "1: ll %1, %2 # atomic_sub_return \n"
5713 +#ifdef CONFIG_PAX_REFCOUNT
5714 + "2: sub %0, %1, %3 \n"
5715 +#else
5716 + " subu %0, %1, %3 \n"
5717 +#endif
5718 + " sc %0, %2 \n"
5719 + " beqzl %0, 1b \n"
5720 +#ifdef CONFIG_PAX_REFCOUNT
5721 + " b 4f \n"
5722 + " .set noreorder \n"
5723 + "3: b 5f \n"
5724 + " move %0, %1 \n"
5725 + " .set reorder \n"
5726 + _ASM_EXTABLE(2b, 3b)
5727 +#endif
5728 + "4: subu %0, %1, %3 \n"
5729 +#ifdef CONFIG_PAX_REFCOUNT
5730 + "5: \n"
5731 +#endif
5732 + " .set mips0 \n"
5733 + : "=&r" (result), "=&r" (temp), "=m" (v->counter)
5734 + : "Ir" (i), "m" (v->counter)
5735 + : "memory");
5736 + } else if (kernel_uses_llsc) {
5737 + __asm__ __volatile__(
5738 + " .set mips3 \n"
5739 + "1: ll %1, %2 # atomic_sub_return \n"
5740 +#ifdef CONFIG_PAX_REFCOUNT
5741 + "2: sub %0, %1, %3 \n"
5742 +#else
5743 + " subu %0, %1, %3 \n"
5744 +#endif
5745 + " sc %0, %2 \n"
5746 + " bnez %0, 4f \n"
5747 + " b 1b \n"
5748 +#ifdef CONFIG_PAX_REFCOUNT
5749 + " .set noreorder \n"
5750 + "3: b 5f \n"
5751 + " move %0, %1 \n"
5752 + " .set reorder \n"
5753 + _ASM_EXTABLE(2b, 3b)
5754 +#endif
5755 + "4: subu %0, %1, %3 \n"
5756 +#ifdef CONFIG_PAX_REFCOUNT
5757 + "5: \n"
5758 +#endif
5759 + " .set mips0 \n"
5760 + : "=&r" (result), "=&r" (temp), "+m" (v->counter)
5761 + : "Ir" (i));
5762 + } else {
5763 + unsigned long flags;
5764 +
5765 + raw_local_irq_save(flags);
5766 + __asm__ __volatile__(
5767 + " lw %0, %1 \n"
5768 +#ifdef CONFIG_PAX_REFCOUNT
5769 + /* Exception on overflow. */
5770 + "1: sub %0, %2 \n"
5771 +#else
5772 + " subu %0, %2 \n"
5773 +#endif
5774 + " sw %0, %1 \n"
5775 +#ifdef CONFIG_PAX_REFCOUNT
5776 + /* Note: Dest reg is not modified on overflow */
5777 + "2: \n"
5778 + _ASM_EXTABLE(1b, 2b)
5779 +#endif
5780 + : "=&r" (result), "+m" (v->counter) : "Ir" (i));
5781 + raw_local_irq_restore(flags);
5782 + }
5783 +
5784 + smp_llsc_mb();
5785 +
5786 + return result;
5787 +}
5788 +static __inline__ int atomic_sub_return_unchecked(int i, atomic_unchecked_t *v)
5789 {
5790 int result;
5791
5792 @@ -238,7 +562,7 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v)
5793 * Atomically test @v and subtract @i if @v is greater or equal than @i.
5794 * The function returns the old value of @v minus @i.
5795 */
5796 -static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5797 +static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
5798 {
5799 int result;
5800
5801 @@ -295,8 +619,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5802 return result;
5803 }
5804
5805 -#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
5806 -#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
5807 +static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
5808 +{
5809 + return cmpxchg(&v->counter, old, new);
5810 +}
5811 +
5812 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
5813 + int new)
5814 +{
5815 + return cmpxchg(&(v->counter), old, new);
5816 +}
5817 +
5818 +static inline int atomic_xchg(atomic_t *v, int new)
5819 +{
5820 + return xchg(&v->counter, new);
5821 +}
5822 +
5823 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
5824 +{
5825 + return xchg(&(v->counter), new);
5826 +}
5827
5828 /**
5829 * __atomic_add_unless - add unless the number is a given value
5830 @@ -324,6 +666,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5831
5832 #define atomic_dec_return(v) atomic_sub_return(1, (v))
5833 #define atomic_inc_return(v) atomic_add_return(1, (v))
5834 +static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
5835 +{
5836 + return atomic_add_return_unchecked(1, v);
5837 +}
5838
5839 /*
5840 * atomic_sub_and_test - subtract value from variable and test result
5841 @@ -345,6 +691,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5842 * other cases.
5843 */
5844 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
5845 +static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
5846 +{
5847 + return atomic_add_return_unchecked(1, v) == 0;
5848 +}
5849
5850 /*
5851 * atomic_dec_and_test - decrement by 1 and test
5852 @@ -369,6 +719,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5853 * Atomically increments @v by 1.
5854 */
5855 #define atomic_inc(v) atomic_add(1, (v))
5856 +static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
5857 +{
5858 + atomic_add_unchecked(1, v);
5859 +}
5860
5861 /*
5862 * atomic_dec - decrement and test
5863 @@ -377,6 +731,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5864 * Atomically decrements @v by 1.
5865 */
5866 #define atomic_dec(v) atomic_sub(1, (v))
5867 +static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
5868 +{
5869 + atomic_sub_unchecked(1, v);
5870 +}
5871
5872 /*
5873 * atomic_add_negative - add and test if negative
5874 @@ -398,14 +756,30 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5875 * @v: pointer of type atomic64_t
5876 *
5877 */
5878 -#define atomic64_read(v) (*(volatile long *)&(v)->counter)
5879 +static inline long atomic64_read(const atomic64_t *v)
5880 +{
5881 + return (*(volatile const long *) &v->counter);
5882 +}
5883 +
5884 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
5885 +{
5886 + return (*(volatile const long *) &v->counter);
5887 +}
5888
5889 /*
5890 * atomic64_set - set atomic variable
5891 * @v: pointer of type atomic64_t
5892 * @i: required value
5893 */
5894 -#define atomic64_set(v, i) ((v)->counter = (i))
5895 +static inline void atomic64_set(atomic64_t *v, long i)
5896 +{
5897 + v->counter = i;
5898 +}
5899 +
5900 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
5901 +{
5902 + v->counter = i;
5903 +}
5904
5905 /*
5906 * atomic64_add - add integer to atomic variable
5907 @@ -414,7 +788,66 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5908 *
5909 * Atomically adds @i to @v.
5910 */
5911 -static __inline__ void atomic64_add(long i, atomic64_t * v)
5912 +static __inline__ void atomic64_add(long i, atomic64_t *v)
5913 +{
5914 + long temp;
5915 +
5916 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
5917 + __asm__ __volatile__(
5918 + " .set mips3 \n"
5919 + "1: lld %0, %1 # atomic64_add \n"
5920 +#ifdef CONFIG_PAX_REFCOUNT
5921 + /* Exception on overflow. */
5922 + "2: dadd %0, %2 \n"
5923 +#else
5924 + " daddu %0, %2 \n"
5925 +#endif
5926 + " scd %0, %1 \n"
5927 + " beqzl %0, 1b \n"
5928 +#ifdef CONFIG_PAX_REFCOUNT
5929 + "3: \n"
5930 + _ASM_EXTABLE(2b, 3b)
5931 +#endif
5932 + " .set mips0 \n"
5933 + : "=&r" (temp), "+m" (v->counter)
5934 + : "Ir" (i));
5935 + } else if (kernel_uses_llsc) {
5936 + __asm__ __volatile__(
5937 + " .set mips3 \n"
5938 + "1: lld %0, %1 # atomic64_add \n"
5939 +#ifdef CONFIG_PAX_REFCOUNT
5940 + /* Exception on overflow. */
5941 + "2: dadd %0, %2 \n"
5942 +#else
5943 + " daddu %0, %2 \n"
5944 +#endif
5945 + " scd %0, %1 \n"
5946 + " beqz %0, 1b \n"
5947 +#ifdef CONFIG_PAX_REFCOUNT
5948 + "3: \n"
5949 + _ASM_EXTABLE(2b, 3b)
5950 +#endif
5951 + " .set mips0 \n"
5952 + : "=&r" (temp), "+m" (v->counter)
5953 + : "Ir" (i));
5954 + } else {
5955 + unsigned long flags;
5956 +
5957 + raw_local_irq_save(flags);
5958 + __asm__ __volatile__(
5959 +#ifdef CONFIG_PAX_REFCOUNT
5960 + /* Exception on overflow. */
5961 + "1: dadd %0, %1 \n"
5962 + "2: \n"
5963 + _ASM_EXTABLE(1b, 2b)
5964 +#else
5965 + " daddu %0, %1 \n"
5966 +#endif
5967 + : "+r" (v->counter) : "Ir" (i));
5968 + raw_local_irq_restore(flags);
5969 + }
5970 +}
5971 +static __inline__ void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
5972 {
5973 if (kernel_uses_llsc && R10000_LLSC_WAR) {
5974 long temp;
5975 @@ -457,7 +890,67 @@ static __inline__ void atomic64_add(long i, atomic64_t * v)
5976 *
5977 * Atomically subtracts @i from @v.
5978 */
5979 -static __inline__ void atomic64_sub(long i, atomic64_t * v)
5980 +static __inline__ void atomic64_sub(long i, atomic64_t *v)
5981 +{
5982 + long temp;
5983 +
5984 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
5985 + __asm__ __volatile__(
5986 + " .set mips3 \n"
5987 + "1: lld %0, %1 # atomic64_sub \n"
5988 +#ifdef CONFIG_PAX_REFCOUNT
5989 + /* Exception on overflow. */
5990 + "2: dsub %0, %2 \n"
5991 +#else
5992 + " dsubu %0, %2 \n"
5993 +#endif
5994 + " scd %0, %1 \n"
5995 + " beqzl %0, 1b \n"
5996 +#ifdef CONFIG_PAX_REFCOUNT
5997 + "3: \n"
5998 + _ASM_EXTABLE(2b, 3b)
5999 +#endif
6000 + " .set mips0 \n"
6001 + : "=&r" (temp), "+m" (v->counter)
6002 + : "Ir" (i));
6003 + } else if (kernel_uses_llsc) {
6004 + __asm__ __volatile__(
6005 + " .set mips3 \n"
6006 + "1: lld %0, %1 # atomic64_sub \n"
6007 +#ifdef CONFIG_PAX_REFCOUNT
6008 + /* Exception on overflow. */
6009 + "2: dsub %0, %2 \n"
6010 +#else
6011 + " dsubu %0, %2 \n"
6012 +#endif
6013 + " scd %0, %1 \n"
6014 + " beqz %0, 1b \n"
6015 +#ifdef CONFIG_PAX_REFCOUNT
6016 + "3: \n"
6017 + _ASM_EXTABLE(2b, 3b)
6018 +#endif
6019 + " .set mips0 \n"
6020 + : "=&r" (temp), "+m" (v->counter)
6021 + : "Ir" (i));
6022 + } else {
6023 + unsigned long flags;
6024 +
6025 + raw_local_irq_save(flags);
6026 + __asm__ __volatile__(
6027 +#ifdef CONFIG_PAX_REFCOUNT
6028 + /* Exception on overflow. */
6029 + "1: dsub %0, %1 \n"
6030 + "2: \n"
6031 + _ASM_EXTABLE(1b, 2b)
6032 +#else
6033 + " dsubu %0, %1 \n"
6034 +#endif
6035 + : "+r" (v->counter) : "Ir" (i));
6036 + raw_local_irq_restore(flags);
6037 + }
6038 +}
6039 +
6040 +static __inline__ void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
6041 {
6042 if (kernel_uses_llsc && R10000_LLSC_WAR) {
6043 long temp;
6044 @@ -496,7 +989,93 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v)
6045 /*
6046 * Same as above, but return the result value
6047 */
6048 -static __inline__ long atomic64_add_return(long i, atomic64_t * v)
6049 +static __inline__ long atomic64_add_return(long i, atomic64_t *v)
6050 +{
6051 + long result;
6052 + long temp;
6053 +
6054 + smp_mb__before_llsc();
6055 +
6056 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
6057 + __asm__ __volatile__(
6058 + " .set mips3 \n"
6059 + "1: lld %1, %2 # atomic64_add_return \n"
6060 +#ifdef CONFIG_PAX_REFCOUNT
6061 + "2: dadd %0, %1, %3 \n"
6062 +#else
6063 + " daddu %0, %1, %3 \n"
6064 +#endif
6065 + " scd %0, %2 \n"
6066 + " beqzl %0, 1b \n"
6067 +#ifdef CONFIG_PAX_REFCOUNT
6068 + " b 4f \n"
6069 + " .set noreorder \n"
6070 + "3: b 5f \n"
6071 + " move %0, %1 \n"
6072 + " .set reorder \n"
6073 + _ASM_EXTABLE(2b, 3b)
6074 +#endif
6075 + "4: daddu %0, %1, %3 \n"
6076 +#ifdef CONFIG_PAX_REFCOUNT
6077 + "5: \n"
6078 +#endif
6079 + " .set mips0 \n"
6080 + : "=&r" (result), "=&r" (temp), "+m" (v->counter)
6081 + : "Ir" (i));
6082 + } else if (kernel_uses_llsc) {
6083 + __asm__ __volatile__(
6084 + " .set mips3 \n"
6085 + "1: lld %1, %2 # atomic64_add_return \n"
6086 +#ifdef CONFIG_PAX_REFCOUNT
6087 + "2: dadd %0, %1, %3 \n"
6088 +#else
6089 + " daddu %0, %1, %3 \n"
6090 +#endif
6091 + " scd %0, %2 \n"
6092 + " bnez %0, 4f \n"
6093 + " b 1b \n"
6094 +#ifdef CONFIG_PAX_REFCOUNT
6095 + " .set noreorder \n"
6096 + "3: b 5f \n"
6097 + " move %0, %1 \n"
6098 + " .set reorder \n"
6099 + _ASM_EXTABLE(2b, 3b)
6100 +#endif
6101 + "4: daddu %0, %1, %3 \n"
6102 +#ifdef CONFIG_PAX_REFCOUNT
6103 + "5: \n"
6104 +#endif
6105 + " .set mips0 \n"
6106 + : "=&r" (result), "=&r" (temp), "=m" (v->counter)
6107 + : "Ir" (i), "m" (v->counter)
6108 + : "memory");
6109 + } else {
6110 + unsigned long flags;
6111 +
6112 + raw_local_irq_save(flags);
6113 + __asm__ __volatile__(
6114 + " ld %0, %1 \n"
6115 +#ifdef CONFIG_PAX_REFCOUNT
6116 + /* Exception on overflow. */
6117 + "1: dadd %0, %2 \n"
6118 +#else
6119 + " daddu %0, %2 \n"
6120 +#endif
6121 + " sd %0, %1 \n"
6122 +#ifdef CONFIG_PAX_REFCOUNT
6123 + /* Note: Dest reg is not modified on overflow */
6124 + "2: \n"
6125 + _ASM_EXTABLE(1b, 2b)
6126 +#endif
6127 + : "=&r" (result), "+m" (v->counter) : "Ir" (i));
6128 + raw_local_irq_restore(flags);
6129 + }
6130 +
6131 + smp_llsc_mb();
6132 +
6133 + return result;
6134 +}
6135 +static __inline__ long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
6136 {
6137 long result;
6138
6139 @@ -546,7 +1125,97 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v)
6140 return result;
6141 }
6142
6143 -static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
6144 +static __inline__ long atomic64_sub_return(long i, atomic64_t *v)
6145 +{
6146 + long result;
6147 + long temp;
6148 +
6149 + smp_mb__before_llsc();
6150 +
6151 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
6152 + long temp;
6153 +
6154 + __asm__ __volatile__(
6155 + " .set mips3 \n"
6156 + "1: lld %1, %2 # atomic64_sub_return \n"
6157 +#ifdef CONFIG_PAX_REFCOUNT
6158 + "2: dsub %0, %1, %3 \n"
6159 +#else
6160 + " dsubu %0, %1, %3 \n"
6161 +#endif
6162 + " scd %0, %2 \n"
6163 + " beqzl %0, 1b \n"
6164 +#ifdef CONFIG_PAX_REFCOUNT
6165 + " b 4f \n"
6166 + " .set noreorder \n"
6167 + "3: b 5f \n"
6168 + " move %0, %1 \n"
6169 + " .set reorder \n"
6170 + _ASM_EXTABLE(2b, 3b)
6171 +#endif
6172 + "4: dsubu %0, %1, %3 \n"
6173 +#ifdef CONFIG_PAX_REFCOUNT
6174 + "5: \n"
6175 +#endif
6176 + " .set mips0 \n"
6177 + : "=&r" (result), "=&r" (temp), "=m" (v->counter)
6178 + : "Ir" (i), "m" (v->counter)
6179 + : "memory");
6180 + } else if (kernel_uses_llsc) {
6181 + __asm__ __volatile__(
6182 + " .set mips3 \n"
6183 + "1: lld %1, %2 # atomic64_sub_return \n"
6184 +#ifdef CONFIG_PAX_REFCOUNT
6185 + "2: dsub %0, %1, %3 \n"
6186 +#else
6187 + " dsubu %0, %1, %3 \n"
6188 +#endif
6189 + " scd %0, %2 \n"
6190 + " bnez %0, 4f \n"
6191 + " b 1b \n"
6192 +#ifdef CONFIG_PAX_REFCOUNT
6193 + " .set noreorder \n"
6194 + "3: b 5f \n"
6195 + " move %0, %1 \n"
6196 + " .set reorder \n"
6197 + _ASM_EXTABLE(2b, 3b)
6198 +#endif
6199 + "4: dsubu %0, %1, %3 \n"
6200 +#ifdef CONFIG_PAX_REFCOUNT
6201 + "5: \n"
6202 +#endif
6203 + " .set mips0 \n"
6204 + : "=&r" (result), "=&r" (temp), "=m" (v->counter)
6205 + : "Ir" (i), "m" (v->counter)
6206 + : "memory");
6207 + } else {
6208 + unsigned long flags;
6209 +
6210 + raw_local_irq_save(flags);
6211 + __asm__ __volatile__(
6212 + " ld %0, %1 \n"
6213 +#ifdef CONFIG_PAX_REFCOUNT
6214 + /* Exception on overflow. */
6215 + "1: dsub %0, %2 \n"
6216 +#else
6217 + " dsubu %0, %2 \n"
6218 +#endif
6219 + " sd %0, %1 \n"
6220 +#ifdef CONFIG_PAX_REFCOUNT
6221 + /* Note: Dest reg is not modified on overflow */
6222 + "2: \n"
6223 + _ASM_EXTABLE(1b, 2b)
6224 +#endif
6225 + : "=&r" (result), "+m" (v->counter) : "Ir" (i));
6226 + raw_local_irq_restore(flags);
6227 + }
6228 +
6229 + smp_llsc_mb();
6230 +
6231 + return result;
6232 +}
6233 +
6234 +static __inline__ long atomic64_sub_return_unchecked(long i, atomic64_unchecked_t *v)
6235 {
6236 long result;
6237
6238 @@ -605,7 +1274,7 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
6239 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6240 * The function returns the old value of @v minus @i.
6241 */
6242 -static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6243 +static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6244 {
6245 long result;
6246
6247 @@ -662,9 +1331,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6248 return result;
6249 }
6250
6251 -#define atomic64_cmpxchg(v, o, n) \
6252 - ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6253 -#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6254 +static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6255 +{
6256 + return cmpxchg(&v->counter, old, new);
6257 +}
6258 +
6259 +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6260 + long new)
6261 +{
6262 + return cmpxchg(&(v->counter), old, new);
6263 +}
6264 +
6265 +static inline long atomic64_xchg(atomic64_t *v, long new)
6266 +{
6267 + return xchg(&v->counter, new);
6268 +}
6269 +
6270 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6271 +{
6272 + return xchg(&(v->counter), new);
6273 +}
6274
6275 /**
6276 * atomic64_add_unless - add unless the number is a given value
6277 @@ -694,6 +1380,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6278
6279 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6280 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6281 +#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6282
6283 /*
6284 * atomic64_sub_and_test - subtract value from variable and test result
6285 @@ -715,6 +1402,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6286 * other cases.
6287 */
6288 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6289 +#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6290
6291 /*
6292 * atomic64_dec_and_test - decrement by 1 and test
6293 @@ -739,6 +1427,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6294 * Atomically increments @v by 1.
6295 */
6296 #define atomic64_inc(v) atomic64_add(1, (v))
6297 +#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6298
6299 /*
6300 * atomic64_dec - decrement and test
6301 @@ -747,6 +1436,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6302 * Atomically decrements @v by 1.
6303 */
6304 #define atomic64_dec(v) atomic64_sub(1, (v))
6305 +#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6306
6307 /*
6308 * atomic64_add_negative - add and test if negative
6309 diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6310 index b4db69f..8f3b093 100644
6311 --- a/arch/mips/include/asm/cache.h
6312 +++ b/arch/mips/include/asm/cache.h
6313 @@ -9,10 +9,11 @@
6314 #ifndef _ASM_CACHE_H
6315 #define _ASM_CACHE_H
6316
6317 +#include <linux/const.h>
6318 #include <kmalloc.h>
6319
6320 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6321 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6322 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6323
6324 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6325 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6326 diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6327 index cf3ae24..238d22f 100644
6328 --- a/arch/mips/include/asm/elf.h
6329 +++ b/arch/mips/include/asm/elf.h
6330 @@ -372,13 +372,16 @@ extern const char *__elf_platform;
6331 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6332 #endif
6333
6334 +#ifdef CONFIG_PAX_ASLR
6335 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6336 +
6337 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6338 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6339 +#endif
6340 +
6341 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6342 struct linux_binprm;
6343 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6344 int uses_interp);
6345
6346 -struct mm_struct;
6347 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
6348 -#define arch_randomize_brk arch_randomize_brk
6349 -
6350 #endif /* _ASM_ELF_H */
6351 diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6352 index c1f6afa..38cc6e9 100644
6353 --- a/arch/mips/include/asm/exec.h
6354 +++ b/arch/mips/include/asm/exec.h
6355 @@ -12,6 +12,6 @@
6356 #ifndef _ASM_EXEC_H
6357 #define _ASM_EXEC_H
6358
6359 -extern unsigned long arch_align_stack(unsigned long sp);
6360 +#define arch_align_stack(x) ((x) & ~0xfUL)
6361
6362 #endif /* _ASM_EXEC_H */
6363 diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6364 index d44622c..64990d2 100644
6365 --- a/arch/mips/include/asm/local.h
6366 +++ b/arch/mips/include/asm/local.h
6367 @@ -12,15 +12,25 @@ typedef struct
6368 atomic_long_t a;
6369 } local_t;
6370
6371 +typedef struct {
6372 + atomic_long_unchecked_t a;
6373 +} local_unchecked_t;
6374 +
6375 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6376
6377 #define local_read(l) atomic_long_read(&(l)->a)
6378 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6379 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6380 +#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6381
6382 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6383 +#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6384 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6385 +#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6386 #define local_inc(l) atomic_long_inc(&(l)->a)
6387 +#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6388 #define local_dec(l) atomic_long_dec(&(l)->a)
6389 +#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6390
6391 /*
6392 * Same as above, but return the result value
6393 @@ -70,6 +80,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6394 return result;
6395 }
6396
6397 +static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6398 +{
6399 + unsigned long result;
6400 +
6401 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
6402 + unsigned long temp;
6403 +
6404 + __asm__ __volatile__(
6405 + " .set mips3 \n"
6406 + "1:" __LL "%1, %2 # local_add_return \n"
6407 + " addu %0, %1, %3 \n"
6408 + __SC "%0, %2 \n"
6409 + " beqzl %0, 1b \n"
6410 + " addu %0, %1, %3 \n"
6411 + " .set mips0 \n"
6412 + : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6413 + : "Ir" (i), "m" (l->a.counter)
6414 + : "memory");
6415 + } else if (kernel_uses_llsc) {
6416 + unsigned long temp;
6417 +
6418 + __asm__ __volatile__(
6419 + " .set mips3 \n"
6420 + "1:" __LL "%1, %2 # local_add_return \n"
6421 + " addu %0, %1, %3 \n"
6422 + __SC "%0, %2 \n"
6423 + " beqz %0, 1b \n"
6424 + " addu %0, %1, %3 \n"
6425 + " .set mips0 \n"
6426 + : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6427 + : "Ir" (i), "m" (l->a.counter)
6428 + : "memory");
6429 + } else {
6430 + unsigned long flags;
6431 +
6432 + local_irq_save(flags);
6433 + result = l->a.counter;
6434 + result += i;
6435 + l->a.counter = result;
6436 + local_irq_restore(flags);
6437 + }
6438 +
6439 + return result;
6440 +}
6441 +
6442 static __inline__ long local_sub_return(long i, local_t * l)
6443 {
6444 unsigned long result;
6445 @@ -117,6 +172,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6446
6447 #define local_cmpxchg(l, o, n) \
6448 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6449 +#define local_cmpxchg_unchecked(l, o, n) \
6450 + ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6451 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6452
6453 /**
6454 diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6455 index f6be474..12ad554 100644
6456 --- a/arch/mips/include/asm/page.h
6457 +++ b/arch/mips/include/asm/page.h
6458 @@ -95,7 +95,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6459 #ifdef CONFIG_CPU_MIPS32
6460 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6461 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6462 - #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6463 + #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6464 #else
6465 typedef struct { unsigned long long pte; } pte_t;
6466 #define pte_val(x) ((x).pte)
6467 diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6468 index 881d18b..cea38bc 100644
6469 --- a/arch/mips/include/asm/pgalloc.h
6470 +++ b/arch/mips/include/asm/pgalloc.h
6471 @@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6472 {
6473 set_pud(pud, __pud((unsigned long)pmd));
6474 }
6475 +
6476 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6477 +{
6478 + pud_populate(mm, pud, pmd);
6479 +}
6480 #endif
6481
6482 /*
6483 diff --git a/arch/mips/include/asm/smtc_proc.h b/arch/mips/include/asm/smtc_proc.h
6484 index 25da651..ae2a259 100644
6485 --- a/arch/mips/include/asm/smtc_proc.h
6486 +++ b/arch/mips/include/asm/smtc_proc.h
6487 @@ -18,6 +18,6 @@ extern struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS];
6488
6489 /* Count of number of recoveries of "stolen" FPU access rights on 34K */
6490
6491 -extern atomic_t smtc_fpu_recoveries;
6492 +extern atomic_unchecked_t smtc_fpu_recoveries;
6493
6494 #endif /* __ASM_SMTC_PROC_H */
6495 diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6496 index 61215a3..213ee0e 100644
6497 --- a/arch/mips/include/asm/thread_info.h
6498 +++ b/arch/mips/include/asm/thread_info.h
6499 @@ -116,6 +116,8 @@ static inline struct thread_info *current_thread_info(void)
6500 #define TIF_32BIT_ADDR 23 /* 32-bit address space (o32/n32) */
6501 #define TIF_FPUBOUND 24 /* thread bound to FPU-full CPU set */
6502 #define TIF_LOAD_WATCH 25 /* If set, load watch registers */
6503 +/* li takes a 32bit immediate */
6504 +#define TIF_GRSEC_SETXID 29 /* update credentials on syscall entry/exit */
6505 #define TIF_SYSCALL_TRACE 31 /* syscall trace active */
6506
6507 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
6508 @@ -132,20 +134,18 @@ static inline struct thread_info *current_thread_info(void)
6509 #define _TIF_32BIT_ADDR (1<<TIF_32BIT_ADDR)
6510 #define _TIF_FPUBOUND (1<<TIF_FPUBOUND)
6511 #define _TIF_LOAD_WATCH (1<<TIF_LOAD_WATCH)
6512 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6513
6514 -#define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6515 - _TIF_SYSCALL_AUDIT)
6516 +#define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID)
6517
6518 /* work to do in syscall_trace_leave() */
6519 -#define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6520 - _TIF_SYSCALL_AUDIT)
6521 +#define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID)
6522
6523 /* work to do on interrupt/exception return */
6524 #define _TIF_WORK_MASK \
6525 (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_NOTIFY_RESUME)
6526 /* work to do on any return to u-space */
6527 -#define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6528 - _TIF_WORK_SYSCALL_EXIT)
6529 +#define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | _TIF_WORK_SYSCALL_EXIT | _TIF_GRSEC_SETXID)
6530
6531 #endif /* __KERNEL__ */
6532
6533 diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6534 index 1188e00..41cf144 100644
6535 --- a/arch/mips/kernel/binfmt_elfn32.c
6536 +++ b/arch/mips/kernel/binfmt_elfn32.c
6537 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6538 #undef ELF_ET_DYN_BASE
6539 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6540
6541 +#ifdef CONFIG_PAX_ASLR
6542 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6543 +
6544 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6545 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6546 +#endif
6547 +
6548 #include <asm/processor.h>
6549 #include <linux/module.h>
6550 #include <linux/elfcore.h>
6551 diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6552 index 202e581..689ca79 100644
6553 --- a/arch/mips/kernel/binfmt_elfo32.c
6554 +++ b/arch/mips/kernel/binfmt_elfo32.c
6555 @@ -56,6 +56,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6556 #undef ELF_ET_DYN_BASE
6557 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6558
6559 +#ifdef CONFIG_PAX_ASLR
6560 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6561 +
6562 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6563 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6564 +#endif
6565 +
6566 #include <asm/processor.h>
6567
6568 /*
6569 diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6570 index d1fea7a..45602ea 100644
6571 --- a/arch/mips/kernel/irq.c
6572 +++ b/arch/mips/kernel/irq.c
6573 @@ -77,17 +77,17 @@ void ack_bad_irq(unsigned int irq)
6574 printk("unexpected IRQ # %d\n", irq);
6575 }
6576
6577 -atomic_t irq_err_count;
6578 +atomic_unchecked_t irq_err_count;
6579
6580 int arch_show_interrupts(struct seq_file *p, int prec)
6581 {
6582 - seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6583 + seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6584 return 0;
6585 }
6586
6587 asmlinkage void spurious_interrupt(void)
6588 {
6589 - atomic_inc(&irq_err_count);
6590 + atomic_inc_unchecked(&irq_err_count);
6591 }
6592
6593 void __init init_IRQ(void)
6594 diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6595 index ddc7610..8c58f17 100644
6596 --- a/arch/mips/kernel/process.c
6597 +++ b/arch/mips/kernel/process.c
6598 @@ -566,15 +566,3 @@ unsigned long get_wchan(struct task_struct *task)
6599 out:
6600 return pc;
6601 }
6602 -
6603 -/*
6604 - * Don't forget that the stack pointer must be aligned on a 8 bytes
6605 - * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6606 - */
6607 -unsigned long arch_align_stack(unsigned long sp)
6608 -{
6609 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6610 - sp -= get_random_int() & ~PAGE_MASK;
6611 -
6612 - return sp & ALMASK;
6613 -}
6614 diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6615 index 8ae1ebe..1bcbf47 100644
6616 --- a/arch/mips/kernel/ptrace.c
6617 +++ b/arch/mips/kernel/ptrace.c
6618 @@ -529,6 +529,10 @@ static inline int audit_arch(void)
6619 return arch;
6620 }
6621
6622 +#ifdef CONFIG_GRKERNSEC_SETXID
6623 +extern void gr_delayed_cred_worker(void);
6624 +#endif
6625 +
6626 /*
6627 * Notification of system call entry/exit
6628 * - triggered by current->work.syscall_trace
6629 @@ -540,6 +544,11 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs)
6630 /* do the secure computing check first */
6631 secure_computing_strict(regs->regs[2]);
6632
6633 +#ifdef CONFIG_GRKERNSEC_SETXID
6634 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6635 + gr_delayed_cred_worker();
6636 +#endif
6637 +
6638 if (!(current->ptrace & PT_PTRACED))
6639 goto out;
6640
6641 diff --git a/arch/mips/kernel/smtc-proc.c b/arch/mips/kernel/smtc-proc.c
6642 index c10aa84..9ec2e60 100644
6643 --- a/arch/mips/kernel/smtc-proc.c
6644 +++ b/arch/mips/kernel/smtc-proc.c
6645 @@ -31,7 +31,7 @@ unsigned long selfipis[NR_CPUS];
6646
6647 struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS];
6648
6649 -atomic_t smtc_fpu_recoveries;
6650 +atomic_unchecked_t smtc_fpu_recoveries;
6651
6652 static int smtc_proc_show(struct seq_file *m, void *v)
6653 {
6654 @@ -48,7 +48,7 @@ static int smtc_proc_show(struct seq_file *m, void *v)
6655 for(i = 0; i < NR_CPUS; i++)
6656 seq_printf(m, "%d: %ld\n", i, smtc_cpu_stats[i].selfipis);
6657 seq_printf(m, "%d Recoveries of \"stolen\" FPU\n",
6658 - atomic_read(&smtc_fpu_recoveries));
6659 + atomic_read_unchecked(&smtc_fpu_recoveries));
6660 return 0;
6661 }
6662
6663 @@ -73,7 +73,7 @@ void init_smtc_stats(void)
6664 smtc_cpu_stats[i].selfipis = 0;
6665 }
6666
6667 - atomic_set(&smtc_fpu_recoveries, 0);
6668 + atomic_set_unchecked(&smtc_fpu_recoveries, 0);
6669
6670 proc_create("smtc", 0444, NULL, &smtc_proc_fops);
6671 }
6672 diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
6673 index dfc1b91..11a2c07 100644
6674 --- a/arch/mips/kernel/smtc.c
6675 +++ b/arch/mips/kernel/smtc.c
6676 @@ -1359,7 +1359,7 @@ void smtc_soft_dump(void)
6677 }
6678 smtc_ipi_qdump();
6679 printk("%d Recoveries of \"stolen\" FPU\n",
6680 - atomic_read(&smtc_fpu_recoveries));
6681 + atomic_read_unchecked(&smtc_fpu_recoveries));
6682 }
6683
6684
6685 diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6686 index 84536bf..79caa4d 100644
6687 --- a/arch/mips/kernel/sync-r4k.c
6688 +++ b/arch/mips/kernel/sync-r4k.c
6689 @@ -21,8 +21,8 @@
6690 #include <asm/mipsregs.h>
6691
6692 static atomic_t count_start_flag = ATOMIC_INIT(0);
6693 -static atomic_t count_count_start = ATOMIC_INIT(0);
6694 -static atomic_t count_count_stop = ATOMIC_INIT(0);
6695 +static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6696 +static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6697 static atomic_t count_reference = ATOMIC_INIT(0);
6698
6699 #define COUNTON 100
6700 @@ -69,13 +69,13 @@ void synchronise_count_master(int cpu)
6701
6702 for (i = 0; i < NR_LOOPS; i++) {
6703 /* slaves loop on '!= 2' */
6704 - while (atomic_read(&count_count_start) != 1)
6705 + while (atomic_read_unchecked(&count_count_start) != 1)
6706 mb();
6707 - atomic_set(&count_count_stop, 0);
6708 + atomic_set_unchecked(&count_count_stop, 0);
6709 smp_wmb();
6710
6711 /* this lets the slaves write their count register */
6712 - atomic_inc(&count_count_start);
6713 + atomic_inc_unchecked(&count_count_start);
6714
6715 /*
6716 * Everyone initialises count in the last loop:
6717 @@ -86,11 +86,11 @@ void synchronise_count_master(int cpu)
6718 /*
6719 * Wait for all slaves to leave the synchronization point:
6720 */
6721 - while (atomic_read(&count_count_stop) != 1)
6722 + while (atomic_read_unchecked(&count_count_stop) != 1)
6723 mb();
6724 - atomic_set(&count_count_start, 0);
6725 + atomic_set_unchecked(&count_count_start, 0);
6726 smp_wmb();
6727 - atomic_inc(&count_count_stop);
6728 + atomic_inc_unchecked(&count_count_stop);
6729 }
6730 /* Arrange for an interrupt in a short while */
6731 write_c0_compare(read_c0_count() + COUNTON);
6732 @@ -131,8 +131,8 @@ void synchronise_count_slave(int cpu)
6733 initcount = atomic_read(&count_reference);
6734
6735 for (i = 0; i < NR_LOOPS; i++) {
6736 - atomic_inc(&count_count_start);
6737 - while (atomic_read(&count_count_start) != 2)
6738 + atomic_inc_unchecked(&count_count_start);
6739 + while (atomic_read_unchecked(&count_count_start) != 2)
6740 mb();
6741
6742 /*
6743 @@ -141,8 +141,8 @@ void synchronise_count_slave(int cpu)
6744 if (i == NR_LOOPS-1)
6745 write_c0_count(initcount);
6746
6747 - atomic_inc(&count_count_stop);
6748 - while (atomic_read(&count_count_stop) != 2)
6749 + atomic_inc_unchecked(&count_count_stop);
6750 + while (atomic_read_unchecked(&count_count_stop) != 2)
6751 mb();
6752 }
6753 /* Arrange for an interrupt in a short while */
6754 diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6755 index 524841f..3eef41e 100644
6756 --- a/arch/mips/kernel/traps.c
6757 +++ b/arch/mips/kernel/traps.c
6758 @@ -684,7 +684,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6759 siginfo_t info;
6760
6761 prev_state = exception_enter();
6762 - die_if_kernel("Integer overflow", regs);
6763 + if (unlikely(!user_mode(regs))) {
6764 +
6765 +#ifdef CONFIG_PAX_REFCOUNT
6766 + if (fixup_exception(regs)) {
6767 + pax_report_refcount_overflow(regs);
6768 + exception_exit(prev_state);
6769 + return;
6770 + }
6771 +#endif
6772 +
6773 + die("Integer overflow", regs);
6774 + }
6775
6776 info.si_code = FPE_INTOVF;
6777 info.si_signo = SIGFPE;
6778 diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
6779 index becc42b..9e43d4b 100644
6780 --- a/arch/mips/mm/fault.c
6781 +++ b/arch/mips/mm/fault.c
6782 @@ -28,6 +28,23 @@
6783 #include <asm/highmem.h> /* For VMALLOC_END */
6784 #include <linux/kdebug.h>
6785
6786 +#ifdef CONFIG_PAX_PAGEEXEC
6787 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6788 +{
6789 + unsigned long i;
6790 +
6791 + printk(KERN_ERR "PAX: bytes at PC: ");
6792 + for (i = 0; i < 5; i++) {
6793 + unsigned int c;
6794 + if (get_user(c, (unsigned int *)pc+i))
6795 + printk(KERN_CONT "???????? ");
6796 + else
6797 + printk(KERN_CONT "%08x ", c);
6798 + }
6799 + printk("\n");
6800 +}
6801 +#endif
6802 +
6803 /*
6804 * This routine handles page faults. It determines the address,
6805 * and the problem, and then passes it off to one of the appropriate
6806 @@ -199,6 +216,14 @@ bad_area:
6807 bad_area_nosemaphore:
6808 /* User mode accesses just cause a SIGSEGV */
6809 if (user_mode(regs)) {
6810 +
6811 +#ifdef CONFIG_PAX_PAGEEXEC
6812 + if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
6813 + pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
6814 + do_group_exit(SIGKILL);
6815 + }
6816 +#endif
6817 +
6818 tsk->thread.cp0_badvaddr = address;
6819 tsk->thread.error_code = write;
6820 #if 0
6821 diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
6822 index f1baadd..8537544 100644
6823 --- a/arch/mips/mm/mmap.c
6824 +++ b/arch/mips/mm/mmap.c
6825 @@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6826 struct vm_area_struct *vma;
6827 unsigned long addr = addr0;
6828 int do_color_align;
6829 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
6830 struct vm_unmapped_area_info info;
6831
6832 if (unlikely(len > TASK_SIZE))
6833 @@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6834 do_color_align = 1;
6835
6836 /* requesting a specific address */
6837 +
6838 +#ifdef CONFIG_PAX_RANDMMAP
6839 + if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
6840 +#endif
6841 +
6842 if (addr) {
6843 if (do_color_align)
6844 addr = COLOUR_ALIGN(addr, pgoff);
6845 @@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6846 addr = PAGE_ALIGN(addr);
6847
6848 vma = find_vma(mm, addr);
6849 - if (TASK_SIZE - len >= addr &&
6850 - (!vma || addr + len <= vma->vm_start))
6851 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vmm, addr, len, offset))
6852 return addr;
6853 }
6854
6855 info.length = len;
6856 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
6857 info.align_offset = pgoff << PAGE_SHIFT;
6858 + info.threadstack_offset = offset;
6859
6860 if (dir == DOWN) {
6861 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
6862 @@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6863 {
6864 unsigned long random_factor = 0UL;
6865
6866 +#ifdef CONFIG_PAX_RANDMMAP
6867 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
6868 +#endif
6869 +
6870 if (current->flags & PF_RANDOMIZE) {
6871 random_factor = get_random_int();
6872 random_factor = random_factor << PAGE_SHIFT;
6873 @@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6874
6875 if (mmap_is_legacy()) {
6876 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
6877 +
6878 +#ifdef CONFIG_PAX_RANDMMAP
6879 + if (mm->pax_flags & MF_PAX_RANDMMAP)
6880 + mm->mmap_base += mm->delta_mmap;
6881 +#endif
6882 +
6883 mm->get_unmapped_area = arch_get_unmapped_area;
6884 } else {
6885 mm->mmap_base = mmap_base(random_factor);
6886 +
6887 +#ifdef CONFIG_PAX_RANDMMAP
6888 + if (mm->pax_flags & MF_PAX_RANDMMAP)
6889 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
6890 +#endif
6891 +
6892 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
6893 }
6894 }
6895
6896 -static inline unsigned long brk_rnd(void)
6897 -{
6898 - unsigned long rnd = get_random_int();
6899 -
6900 - rnd = rnd << PAGE_SHIFT;
6901 - /* 8MB for 32bit, 256MB for 64bit */
6902 - if (TASK_IS_32BIT_ADDR)
6903 - rnd = rnd & 0x7ffffful;
6904 - else
6905 - rnd = rnd & 0xffffffful;
6906 -
6907 - return rnd;
6908 -}
6909 -
6910 -unsigned long arch_randomize_brk(struct mm_struct *mm)
6911 -{
6912 - unsigned long base = mm->brk;
6913 - unsigned long ret;
6914 -
6915 - ret = PAGE_ALIGN(base + brk_rnd());
6916 -
6917 - if (ret < mm->brk)
6918 - return mm->brk;
6919 -
6920 - return ret;
6921 -}
6922 -
6923 int __virt_addr_valid(const volatile void *kaddr)
6924 {
6925 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
6926 diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
6927 index a2358b4..7cead4f 100644
6928 --- a/arch/mips/sgi-ip27/ip27-nmi.c
6929 +++ b/arch/mips/sgi-ip27/ip27-nmi.c
6930 @@ -187,9 +187,9 @@ void
6931 cont_nmi_dump(void)
6932 {
6933 #ifndef REAL_NMI_SIGNAL
6934 - static atomic_t nmied_cpus = ATOMIC_INIT(0);
6935 + static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
6936
6937 - atomic_inc(&nmied_cpus);
6938 + atomic_inc_unchecked(&nmied_cpus);
6939 #endif
6940 /*
6941 * Only allow 1 cpu to proceed
6942 @@ -233,7 +233,7 @@ cont_nmi_dump(void)
6943 udelay(10000);
6944 }
6945 #else
6946 - while (atomic_read(&nmied_cpus) != num_online_cpus());
6947 + while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
6948 #endif
6949
6950 /*
6951 diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
6952 index 967d144..db12197 100644
6953 --- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
6954 +++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
6955 @@ -11,12 +11,14 @@
6956 #ifndef _ASM_PROC_CACHE_H
6957 #define _ASM_PROC_CACHE_H
6958
6959 +#include <linux/const.h>
6960 +
6961 /* L1 cache */
6962
6963 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
6964 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
6965 -#define L1_CACHE_BYTES 16 /* bytes per entry */
6966 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
6967 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
6968 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
6969
6970 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
6971 diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
6972 index bcb5df2..84fabd2 100644
6973 --- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
6974 +++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
6975 @@ -16,13 +16,15 @@
6976 #ifndef _ASM_PROC_CACHE_H
6977 #define _ASM_PROC_CACHE_H
6978
6979 +#include <linux/const.h>
6980 +
6981 /*
6982 * L1 cache
6983 */
6984 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
6985 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
6986 -#define L1_CACHE_BYTES 32 /* bytes per entry */
6987 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
6988 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
6989 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
6990
6991 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
6992 diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
6993 index 4ce7a01..449202a 100644
6994 --- a/arch/openrisc/include/asm/cache.h
6995 +++ b/arch/openrisc/include/asm/cache.h
6996 @@ -19,11 +19,13 @@
6997 #ifndef __ASM_OPENRISC_CACHE_H
6998 #define __ASM_OPENRISC_CACHE_H
6999
7000 +#include <linux/const.h>
7001 +
7002 /* FIXME: How can we replace these with values from the CPU...
7003 * they shouldn't be hard-coded!
7004 */
7005
7006 -#define L1_CACHE_BYTES 16
7007 #define L1_CACHE_SHIFT 4
7008 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7009
7010 #endif /* __ASM_OPENRISC_CACHE_H */
7011 diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7012 index 472886c..00e7df9 100644
7013 --- a/arch/parisc/include/asm/atomic.h
7014 +++ b/arch/parisc/include/asm/atomic.h
7015 @@ -252,6 +252,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7016 return dec;
7017 }
7018
7019 +#define atomic64_read_unchecked(v) atomic64_read(v)
7020 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7021 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7022 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7023 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7024 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
7025 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7026 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
7027 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7028 +
7029 #endif /* !CONFIG_64BIT */
7030
7031
7032 diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7033 index 47f11c7..3420df2 100644
7034 --- a/arch/parisc/include/asm/cache.h
7035 +++ b/arch/parisc/include/asm/cache.h
7036 @@ -5,6 +5,7 @@
7037 #ifndef __ARCH_PARISC_CACHE_H
7038 #define __ARCH_PARISC_CACHE_H
7039
7040 +#include <linux/const.h>
7041
7042 /*
7043 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7044 @@ -15,13 +16,13 @@
7045 * just ruin performance.
7046 */
7047 #ifdef CONFIG_PA20
7048 -#define L1_CACHE_BYTES 64
7049 #define L1_CACHE_SHIFT 6
7050 #else
7051 -#define L1_CACHE_BYTES 32
7052 #define L1_CACHE_SHIFT 5
7053 #endif
7054
7055 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7056 +
7057 #ifndef __ASSEMBLY__
7058
7059 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7060 diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7061 index ad2b503..bdf1651 100644
7062 --- a/arch/parisc/include/asm/elf.h
7063 +++ b/arch/parisc/include/asm/elf.h
7064 @@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7065
7066 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7067
7068 +#ifdef CONFIG_PAX_ASLR
7069 +#define PAX_ELF_ET_DYN_BASE 0x10000UL
7070 +
7071 +#define PAX_DELTA_MMAP_LEN 16
7072 +#define PAX_DELTA_STACK_LEN 16
7073 +#endif
7074 +
7075 /* This yields a mask that user programs can use to figure out what
7076 instruction set this CPU supports. This could be done in user space,
7077 but it's not easy, and we've already done it here. */
7078 diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7079 index fc987a1..6e068ef 100644
7080 --- a/arch/parisc/include/asm/pgalloc.h
7081 +++ b/arch/parisc/include/asm/pgalloc.h
7082 @@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7083 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7084 }
7085
7086 +static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7087 +{
7088 + pgd_populate(mm, pgd, pmd);
7089 +}
7090 +
7091 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7092 {
7093 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7094 @@ -93,6 +98,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7095 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7096 #define pmd_free(mm, x) do { } while (0)
7097 #define pgd_populate(mm, pmd, pte) BUG()
7098 +#define pgd_populate_kernel(mm, pmd, pte) BUG()
7099
7100 #endif
7101
7102 diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7103 index 34899b5..02dd060 100644
7104 --- a/arch/parisc/include/asm/pgtable.h
7105 +++ b/arch/parisc/include/asm/pgtable.h
7106 @@ -223,6 +223,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7107 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7108 #define PAGE_COPY PAGE_EXECREAD
7109 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7110 +
7111 +#ifdef CONFIG_PAX_PAGEEXEC
7112 +# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7113 +# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7114 +# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7115 +#else
7116 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
7117 +# define PAGE_COPY_NOEXEC PAGE_COPY
7118 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
7119 +#endif
7120 +
7121 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7122 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7123 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7124 diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7125 index e0a8235..ce2f1e1 100644
7126 --- a/arch/parisc/include/asm/uaccess.h
7127 +++ b/arch/parisc/include/asm/uaccess.h
7128 @@ -245,10 +245,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7129 const void __user *from,
7130 unsigned long n)
7131 {
7132 - int sz = __compiletime_object_size(to);
7133 + size_t sz = __compiletime_object_size(to);
7134 int ret = -EFAULT;
7135
7136 - if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7137 + if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7138 ret = __copy_from_user(to, from, n);
7139 else
7140 copy_from_user_overflow();
7141 diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7142 index 2a625fb..9908930 100644
7143 --- a/arch/parisc/kernel/module.c
7144 +++ b/arch/parisc/kernel/module.c
7145 @@ -98,16 +98,38 @@
7146
7147 /* three functions to determine where in the module core
7148 * or init pieces the location is */
7149 +static inline int in_init_rx(struct module *me, void *loc)
7150 +{
7151 + return (loc >= me->module_init_rx &&
7152 + loc < (me->module_init_rx + me->init_size_rx));
7153 +}
7154 +
7155 +static inline int in_init_rw(struct module *me, void *loc)
7156 +{
7157 + return (loc >= me->module_init_rw &&
7158 + loc < (me->module_init_rw + me->init_size_rw));
7159 +}
7160 +
7161 static inline int in_init(struct module *me, void *loc)
7162 {
7163 - return (loc >= me->module_init &&
7164 - loc <= (me->module_init + me->init_size));
7165 + return in_init_rx(me, loc) || in_init_rw(me, loc);
7166 +}
7167 +
7168 +static inline int in_core_rx(struct module *me, void *loc)
7169 +{
7170 + return (loc >= me->module_core_rx &&
7171 + loc < (me->module_core_rx + me->core_size_rx));
7172 +}
7173 +
7174 +static inline int in_core_rw(struct module *me, void *loc)
7175 +{
7176 + return (loc >= me->module_core_rw &&
7177 + loc < (me->module_core_rw + me->core_size_rw));
7178 }
7179
7180 static inline int in_core(struct module *me, void *loc)
7181 {
7182 - return (loc >= me->module_core &&
7183 - loc <= (me->module_core + me->core_size));
7184 + return in_core_rx(me, loc) || in_core_rw(me, loc);
7185 }
7186
7187 static inline int in_local(struct module *me, void *loc)
7188 @@ -371,13 +393,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7189 }
7190
7191 /* align things a bit */
7192 - me->core_size = ALIGN(me->core_size, 16);
7193 - me->arch.got_offset = me->core_size;
7194 - me->core_size += gots * sizeof(struct got_entry);
7195 + me->core_size_rw = ALIGN(me->core_size_rw, 16);
7196 + me->arch.got_offset = me->core_size_rw;
7197 + me->core_size_rw += gots * sizeof(struct got_entry);
7198
7199 - me->core_size = ALIGN(me->core_size, 16);
7200 - me->arch.fdesc_offset = me->core_size;
7201 - me->core_size += fdescs * sizeof(Elf_Fdesc);
7202 + me->core_size_rw = ALIGN(me->core_size_rw, 16);
7203 + me->arch.fdesc_offset = me->core_size_rw;
7204 + me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7205
7206 me->arch.got_max = gots;
7207 me->arch.fdesc_max = fdescs;
7208 @@ -395,7 +417,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7209
7210 BUG_ON(value == 0);
7211
7212 - got = me->module_core + me->arch.got_offset;
7213 + got = me->module_core_rw + me->arch.got_offset;
7214 for (i = 0; got[i].addr; i++)
7215 if (got[i].addr == value)
7216 goto out;
7217 @@ -413,7 +435,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7218 #ifdef CONFIG_64BIT
7219 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7220 {
7221 - Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7222 + Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7223
7224 if (!value) {
7225 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7226 @@ -431,7 +453,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7227
7228 /* Create new one */
7229 fdesc->addr = value;
7230 - fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7231 + fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7232 return (Elf_Addr)fdesc;
7233 }
7234 #endif /* CONFIG_64BIT */
7235 @@ -843,7 +865,7 @@ register_unwind_table(struct module *me,
7236
7237 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7238 end = table + sechdrs[me->arch.unwind_section].sh_size;
7239 - gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7240 + gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7241
7242 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7243 me->arch.unwind_section, table, end, gp);
7244 diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7245 index 0d3a9d4..44975d0 100644
7246 --- a/arch/parisc/kernel/sys_parisc.c
7247 +++ b/arch/parisc/kernel/sys_parisc.c
7248 @@ -33,9 +33,11 @@
7249 #include <linux/utsname.h>
7250 #include <linux/personality.h>
7251
7252 -static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
7253 +static unsigned long get_unshared_area(struct file *filp, unsigned long addr, unsigned long len,
7254 + unsigned long flags)
7255 {
7256 struct vm_unmapped_area_info info;
7257 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7258
7259 info.flags = 0;
7260 info.length = len;
7261 @@ -43,6 +45,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
7262 info.high_limit = TASK_SIZE;
7263 info.align_mask = 0;
7264 info.align_offset = 0;
7265 + info.threadstack_offset = offset;
7266 return vm_unmapped_area(&info);
7267 }
7268
7269 @@ -69,15 +72,17 @@ static unsigned long shared_align_offset(struct file *filp, unsigned long pgoff)
7270 }
7271
7272 static unsigned long get_shared_area(struct file *filp, unsigned long addr,
7273 - unsigned long len, unsigned long pgoff)
7274 + unsigned long len, unsigned long pgoff, unsigned long flags)
7275 {
7276 struct vm_unmapped_area_info info;
7277 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7278
7279 info.flags = 0;
7280 info.length = len;
7281 info.low_limit = PAGE_ALIGN(addr);
7282 info.high_limit = TASK_SIZE;
7283 info.align_mask = PAGE_MASK & (SHMLBA - 1);
7284 + info.threadstack_offset = offset;
7285 info.align_offset = shared_align_offset(filp, pgoff);
7286 return vm_unmapped_area(&info);
7287 }
7288 @@ -93,13 +98,20 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7289 return -EINVAL;
7290 return addr;
7291 }
7292 - if (!addr)
7293 + if (!addr) {
7294 addr = TASK_UNMAPPED_BASE;
7295
7296 +#ifdef CONFIG_PAX_RANDMMAP
7297 + if (current->mm->pax_flags & MF_PAX_RANDMMAP)
7298 + addr += current->mm->delta_mmap;
7299 +#endif
7300 +
7301 + }
7302 +
7303 if (filp || (flags & MAP_SHARED))
7304 - addr = get_shared_area(filp, addr, len, pgoff);
7305 + addr = get_shared_area(filp, addr, len, pgoff, flags);
7306 else
7307 - addr = get_unshared_area(addr, len);
7308 + addr = get_unshared_area(addr, len, flags);
7309
7310 return addr;
7311 }
7312 diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7313 index 1cd1d0c..44ec918 100644
7314 --- a/arch/parisc/kernel/traps.c
7315 +++ b/arch/parisc/kernel/traps.c
7316 @@ -722,9 +722,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7317
7318 down_read(&current->mm->mmap_sem);
7319 vma = find_vma(current->mm,regs->iaoq[0]);
7320 - if (vma && (regs->iaoq[0] >= vma->vm_start)
7321 - && (vma->vm_flags & VM_EXEC)) {
7322 -
7323 + if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7324 fault_address = regs->iaoq[0];
7325 fault_space = regs->iasq[0];
7326
7327 diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7328 index 0293588..3b229aa 100644
7329 --- a/arch/parisc/mm/fault.c
7330 +++ b/arch/parisc/mm/fault.c
7331 @@ -15,6 +15,7 @@
7332 #include <linux/sched.h>
7333 #include <linux/interrupt.h>
7334 #include <linux/module.h>
7335 +#include <linux/unistd.h>
7336
7337 #include <asm/uaccess.h>
7338 #include <asm/traps.h>
7339 @@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, exception_data);
7340 static unsigned long
7341 parisc_acctyp(unsigned long code, unsigned int inst)
7342 {
7343 - if (code == 6 || code == 16)
7344 + if (code == 6 || code == 7 || code == 16)
7345 return VM_EXEC;
7346
7347 switch (inst & 0xf0000000) {
7348 @@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7349 }
7350 #endif
7351
7352 +#ifdef CONFIG_PAX_PAGEEXEC
7353 +/*
7354 + * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7355 + *
7356 + * returns 1 when task should be killed
7357 + * 2 when rt_sigreturn trampoline was detected
7358 + * 3 when unpatched PLT trampoline was detected
7359 + */
7360 +static int pax_handle_fetch_fault(struct pt_regs *regs)
7361 +{
7362 +
7363 +#ifdef CONFIG_PAX_EMUPLT
7364 + int err;
7365 +
7366 + do { /* PaX: unpatched PLT emulation */
7367 + unsigned int bl, depwi;
7368 +
7369 + err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7370 + err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7371 +
7372 + if (err)
7373 + break;
7374 +
7375 + if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7376 + unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7377 +
7378 + err = get_user(ldw, (unsigned int *)addr);
7379 + err |= get_user(bv, (unsigned int *)(addr+4));
7380 + err |= get_user(ldw2, (unsigned int *)(addr+8));
7381 +
7382 + if (err)
7383 + break;
7384 +
7385 + if (ldw == 0x0E801096U &&
7386 + bv == 0xEAC0C000U &&
7387 + ldw2 == 0x0E881095U)
7388 + {
7389 + unsigned int resolver, map;
7390 +
7391 + err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7392 + err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7393 + if (err)
7394 + break;
7395 +
7396 + regs->gr[20] = instruction_pointer(regs)+8;
7397 + regs->gr[21] = map;
7398 + regs->gr[22] = resolver;
7399 + regs->iaoq[0] = resolver | 3UL;
7400 + regs->iaoq[1] = regs->iaoq[0] + 4;
7401 + return 3;
7402 + }
7403 + }
7404 + } while (0);
7405 +#endif
7406 +
7407 +#ifdef CONFIG_PAX_EMUTRAMP
7408 +
7409 +#ifndef CONFIG_PAX_EMUSIGRT
7410 + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7411 + return 1;
7412 +#endif
7413 +
7414 + do { /* PaX: rt_sigreturn emulation */
7415 + unsigned int ldi1, ldi2, bel, nop;
7416 +
7417 + err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7418 + err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7419 + err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7420 + err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7421 +
7422 + if (err)
7423 + break;
7424 +
7425 + if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7426 + ldi2 == 0x3414015AU &&
7427 + bel == 0xE4008200U &&
7428 + nop == 0x08000240U)
7429 + {
7430 + regs->gr[25] = (ldi1 & 2) >> 1;
7431 + regs->gr[20] = __NR_rt_sigreturn;
7432 + regs->gr[31] = regs->iaoq[1] + 16;
7433 + regs->sr[0] = regs->iasq[1];
7434 + regs->iaoq[0] = 0x100UL;
7435 + regs->iaoq[1] = regs->iaoq[0] + 4;
7436 + regs->iasq[0] = regs->sr[2];
7437 + regs->iasq[1] = regs->sr[2];
7438 + return 2;
7439 + }
7440 + } while (0);
7441 +#endif
7442 +
7443 + return 1;
7444 +}
7445 +
7446 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7447 +{
7448 + unsigned long i;
7449 +
7450 + printk(KERN_ERR "PAX: bytes at PC: ");
7451 + for (i = 0; i < 5; i++) {
7452 + unsigned int c;
7453 + if (get_user(c, (unsigned int *)pc+i))
7454 + printk(KERN_CONT "???????? ");
7455 + else
7456 + printk(KERN_CONT "%08x ", c);
7457 + }
7458 + printk("\n");
7459 +}
7460 +#endif
7461 +
7462 int fixup_exception(struct pt_regs *regs)
7463 {
7464 const struct exception_table_entry *fix;
7465 @@ -204,8 +315,33 @@ retry:
7466
7467 good_area:
7468
7469 - if ((vma->vm_flags & acc_type) != acc_type)
7470 + if ((vma->vm_flags & acc_type) != acc_type) {
7471 +
7472 +#ifdef CONFIG_PAX_PAGEEXEC
7473 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7474 + (address & ~3UL) == instruction_pointer(regs))
7475 + {
7476 + up_read(&mm->mmap_sem);
7477 + switch (pax_handle_fetch_fault(regs)) {
7478 +
7479 +#ifdef CONFIG_PAX_EMUPLT
7480 + case 3:
7481 + return;
7482 +#endif
7483 +
7484 +#ifdef CONFIG_PAX_EMUTRAMP
7485 + case 2:
7486 + return;
7487 +#endif
7488 +
7489 + }
7490 + pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7491 + do_group_exit(SIGKILL);
7492 + }
7493 +#endif
7494 +
7495 goto bad_area;
7496 + }
7497
7498 /*
7499 * If for any reason at all we couldn't handle the fault, make
7500 diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7501 index 38f3b7e..7e485c0 100644
7502 --- a/arch/powerpc/Kconfig
7503 +++ b/arch/powerpc/Kconfig
7504 @@ -378,6 +378,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE
7505 config KEXEC
7506 bool "kexec system call"
7507 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7508 + depends on !GRKERNSEC_KMEM
7509 help
7510 kexec is a system call that implements the ability to shutdown your
7511 current kernel, and to start another kernel. It is like a reboot
7512 diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7513 index e3b1d41..8e81edf 100644
7514 --- a/arch/powerpc/include/asm/atomic.h
7515 +++ b/arch/powerpc/include/asm/atomic.h
7516 @@ -523,6 +523,16 @@ static __inline__ long atomic64_inc_not_zero(atomic64_t *v)
7517 return t1;
7518 }
7519
7520 +#define atomic64_read_unchecked(v) atomic64_read(v)
7521 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7522 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7523 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7524 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7525 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
7526 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7527 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
7528 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7529 +
7530 #endif /* __powerpc64__ */
7531
7532 #endif /* __KERNEL__ */
7533 diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
7534 index 9e495c9..b6878e5 100644
7535 --- a/arch/powerpc/include/asm/cache.h
7536 +++ b/arch/powerpc/include/asm/cache.h
7537 @@ -3,6 +3,7 @@
7538
7539 #ifdef __KERNEL__
7540
7541 +#include <linux/const.h>
7542
7543 /* bytes per L1 cache line */
7544 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
7545 @@ -22,7 +23,7 @@
7546 #define L1_CACHE_SHIFT 7
7547 #endif
7548
7549 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
7550 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7551
7552 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7553
7554 diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
7555 index cc0655a..13eac2e 100644
7556 --- a/arch/powerpc/include/asm/elf.h
7557 +++ b/arch/powerpc/include/asm/elf.h
7558 @@ -28,8 +28,19 @@
7559 the loader. We need to make sure that it is out of the way of the program
7560 that it will "exec", and that there is sufficient room for the brk. */
7561
7562 -extern unsigned long randomize_et_dyn(unsigned long base);
7563 -#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
7564 +#define ELF_ET_DYN_BASE (0x20000000)
7565 +
7566 +#ifdef CONFIG_PAX_ASLR
7567 +#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
7568 +
7569 +#ifdef __powerpc64__
7570 +#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
7571 +#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
7572 +#else
7573 +#define PAX_DELTA_MMAP_LEN 15
7574 +#define PAX_DELTA_STACK_LEN 15
7575 +#endif
7576 +#endif
7577
7578 /*
7579 * Our registers are always unsigned longs, whether we're a 32 bit
7580 @@ -123,10 +134,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
7581 (0x7ff >> (PAGE_SHIFT - 12)) : \
7582 (0x3ffff >> (PAGE_SHIFT - 12)))
7583
7584 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
7585 -#define arch_randomize_brk arch_randomize_brk
7586 -
7587 -
7588 #ifdef CONFIG_SPU_BASE
7589 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
7590 #define NT_SPU 1
7591 diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
7592 index 8196e9c..d83a9f3 100644
7593 --- a/arch/powerpc/include/asm/exec.h
7594 +++ b/arch/powerpc/include/asm/exec.h
7595 @@ -4,6 +4,6 @@
7596 #ifndef _ASM_POWERPC_EXEC_H
7597 #define _ASM_POWERPC_EXEC_H
7598
7599 -extern unsigned long arch_align_stack(unsigned long sp);
7600 +#define arch_align_stack(x) ((x) & ~0xfUL)
7601
7602 #endif /* _ASM_POWERPC_EXEC_H */
7603 diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
7604 index 5acabbd..7ea14fa 100644
7605 --- a/arch/powerpc/include/asm/kmap_types.h
7606 +++ b/arch/powerpc/include/asm/kmap_types.h
7607 @@ -10,7 +10,7 @@
7608 * 2 of the License, or (at your option) any later version.
7609 */
7610
7611 -#define KM_TYPE_NR 16
7612 +#define KM_TYPE_NR 17
7613
7614 #endif /* __KERNEL__ */
7615 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
7616 diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
7617 index 8565c25..2865190 100644
7618 --- a/arch/powerpc/include/asm/mman.h
7619 +++ b/arch/powerpc/include/asm/mman.h
7620 @@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
7621 }
7622 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
7623
7624 -static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
7625 +static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
7626 {
7627 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
7628 }
7629 diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
7630 index b9f4262..dcf04f7 100644
7631 --- a/arch/powerpc/include/asm/page.h
7632 +++ b/arch/powerpc/include/asm/page.h
7633 @@ -230,8 +230,9 @@ extern long long virt_phys_offset;
7634 * and needs to be executable. This means the whole heap ends
7635 * up being executable.
7636 */
7637 -#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
7638 - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
7639 +#define VM_DATA_DEFAULT_FLAGS32 \
7640 + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
7641 + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
7642
7643 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
7644 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
7645 @@ -259,6 +260,9 @@ extern long long virt_phys_offset;
7646 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
7647 #endif
7648
7649 +#define ktla_ktva(addr) (addr)
7650 +#define ktva_ktla(addr) (addr)
7651 +
7652 #ifndef CONFIG_PPC_BOOK3S_64
7653 /*
7654 * Use the top bit of the higher-level page table entries to indicate whether
7655 diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
7656 index 88693ce..ac6f9ab 100644
7657 --- a/arch/powerpc/include/asm/page_64.h
7658 +++ b/arch/powerpc/include/asm/page_64.h
7659 @@ -153,15 +153,18 @@ do { \
7660 * stack by default, so in the absence of a PT_GNU_STACK program header
7661 * we turn execute permission off.
7662 */
7663 -#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
7664 - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
7665 +#define VM_STACK_DEFAULT_FLAGS32 \
7666 + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
7667 + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
7668
7669 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
7670 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
7671
7672 +#ifndef CONFIG_PAX_PAGEEXEC
7673 #define VM_STACK_DEFAULT_FLAGS \
7674 (is_32bit_task() ? \
7675 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
7676 +#endif
7677
7678 #include <asm-generic/getorder.h>
7679
7680 diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
7681 index 256d6f8..b0166a7 100644
7682 --- a/arch/powerpc/include/asm/pgalloc-64.h
7683 +++ b/arch/powerpc/include/asm/pgalloc-64.h
7684 @@ -53,6 +53,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
7685 #ifndef CONFIG_PPC_64K_PAGES
7686
7687 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
7688 +#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
7689
7690 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
7691 {
7692 @@ -70,6 +71,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
7693 pud_set(pud, (unsigned long)pmd);
7694 }
7695
7696 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
7697 +{
7698 + pud_populate(mm, pud, pmd);
7699 +}
7700 +
7701 #define pmd_populate(mm, pmd, pte_page) \
7702 pmd_populate_kernel(mm, pmd, page_address(pte_page))
7703 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
7704 @@ -169,6 +175,7 @@ extern void __tlb_remove_table(void *_table);
7705 #endif
7706
7707 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
7708 +#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
7709
7710 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
7711 pte_t *pte)
7712 diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
7713 index 7d6eacf..14c0240 100644
7714 --- a/arch/powerpc/include/asm/pgtable.h
7715 +++ b/arch/powerpc/include/asm/pgtable.h
7716 @@ -2,6 +2,7 @@
7717 #define _ASM_POWERPC_PGTABLE_H
7718 #ifdef __KERNEL__
7719
7720 +#include <linux/const.h>
7721 #ifndef __ASSEMBLY__
7722 #include <asm/processor.h> /* For TASK_SIZE */
7723 #include <asm/mmu.h>
7724 diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
7725 index 4aad413..85d86bf 100644
7726 --- a/arch/powerpc/include/asm/pte-hash32.h
7727 +++ b/arch/powerpc/include/asm/pte-hash32.h
7728 @@ -21,6 +21,7 @@
7729 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
7730 #define _PAGE_USER 0x004 /* usermode access allowed */
7731 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
7732 +#define _PAGE_EXEC _PAGE_GUARDED
7733 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
7734 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
7735 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
7736 diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
7737 index 10d1ef0..8f83abc 100644
7738 --- a/arch/powerpc/include/asm/reg.h
7739 +++ b/arch/powerpc/include/asm/reg.h
7740 @@ -234,6 +234,7 @@
7741 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
7742 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
7743 #define DSISR_NOHPTE 0x40000000 /* no translation found */
7744 +#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
7745 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
7746 #define DSISR_ISSTORE 0x02000000 /* access was a store */
7747 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
7748 diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
7749 index 98da78e..dc68271 100644
7750 --- a/arch/powerpc/include/asm/smp.h
7751 +++ b/arch/powerpc/include/asm/smp.h
7752 @@ -50,7 +50,7 @@ struct smp_ops_t {
7753 int (*cpu_disable)(void);
7754 void (*cpu_die)(unsigned int nr);
7755 int (*cpu_bootable)(unsigned int nr);
7756 -};
7757 +} __no_const;
7758
7759 extern void smp_send_debugger_break(void);
7760 extern void start_secondary_resume(void);
7761 diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
7762 index ba7b197..d292e26 100644
7763 --- a/arch/powerpc/include/asm/thread_info.h
7764 +++ b/arch/powerpc/include/asm/thread_info.h
7765 @@ -93,7 +93,6 @@ static inline struct thread_info *current_thread_info(void)
7766 #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling
7767 TIF_NEED_RESCHED */
7768 #define TIF_32BIT 4 /* 32 bit binary */
7769 -#define TIF_PERFMON_WORK 5 /* work for pfm_handle_work() */
7770 #define TIF_PERFMON_CTXSW 6 /* perfmon needs ctxsw calls */
7771 #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */
7772 #define TIF_SINGLESTEP 8 /* singlestepping active */
7773 @@ -107,6 +106,9 @@ static inline struct thread_info *current_thread_info(void)
7774 #define TIF_EMULATE_STACK_STORE 16 /* Is an instruction emulation
7775 for stack store? */
7776 #define TIF_MEMDIE 17 /* is terminating due to OOM killer */
7777 +#define TIF_PERFMON_WORK 18 /* work for pfm_handle_work() */
7778 +/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
7779 +#define TIF_GRSEC_SETXID 5 /* update credentials on syscall entry/exit */
7780
7781 /* as above, but as bit values */
7782 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
7783 @@ -126,9 +128,10 @@ static inline struct thread_info *current_thread_info(void)
7784 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
7785 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
7786 #define _TIF_NOHZ (1<<TIF_NOHZ)
7787 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
7788 #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
7789 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
7790 - _TIF_NOHZ)
7791 + _TIF_NOHZ | _TIF_GRSEC_SETXID)
7792
7793 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
7794 _TIF_NOTIFY_RESUME | _TIF_UPROBE)
7795 diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
7796 index 9485b43..4718d50 100644
7797 --- a/arch/powerpc/include/asm/uaccess.h
7798 +++ b/arch/powerpc/include/asm/uaccess.h
7799 @@ -318,52 +318,6 @@ do { \
7800 extern unsigned long __copy_tofrom_user(void __user *to,
7801 const void __user *from, unsigned long size);
7802
7803 -#ifndef __powerpc64__
7804 -
7805 -static inline unsigned long copy_from_user(void *to,
7806 - const void __user *from, unsigned long n)
7807 -{
7808 - unsigned long over;
7809 -
7810 - if (access_ok(VERIFY_READ, from, n))
7811 - return __copy_tofrom_user((__force void __user *)to, from, n);
7812 - if ((unsigned long)from < TASK_SIZE) {
7813 - over = (unsigned long)from + n - TASK_SIZE;
7814 - return __copy_tofrom_user((__force void __user *)to, from,
7815 - n - over) + over;
7816 - }
7817 - return n;
7818 -}
7819 -
7820 -static inline unsigned long copy_to_user(void __user *to,
7821 - const void *from, unsigned long n)
7822 -{
7823 - unsigned long over;
7824 -
7825 - if (access_ok(VERIFY_WRITE, to, n))
7826 - return __copy_tofrom_user(to, (__force void __user *)from, n);
7827 - if ((unsigned long)to < TASK_SIZE) {
7828 - over = (unsigned long)to + n - TASK_SIZE;
7829 - return __copy_tofrom_user(to, (__force void __user *)from,
7830 - n - over) + over;
7831 - }
7832 - return n;
7833 -}
7834 -
7835 -#else /* __powerpc64__ */
7836 -
7837 -#define __copy_in_user(to, from, size) \
7838 - __copy_tofrom_user((to), (from), (size))
7839 -
7840 -extern unsigned long copy_from_user(void *to, const void __user *from,
7841 - unsigned long n);
7842 -extern unsigned long copy_to_user(void __user *to, const void *from,
7843 - unsigned long n);
7844 -extern unsigned long copy_in_user(void __user *to, const void __user *from,
7845 - unsigned long n);
7846 -
7847 -#endif /* __powerpc64__ */
7848 -
7849 static inline unsigned long __copy_from_user_inatomic(void *to,
7850 const void __user *from, unsigned long n)
7851 {
7852 @@ -387,6 +341,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
7853 if (ret == 0)
7854 return 0;
7855 }
7856 +
7857 + if (!__builtin_constant_p(n))
7858 + check_object_size(to, n, false);
7859 +
7860 return __copy_tofrom_user((__force void __user *)to, from, n);
7861 }
7862
7863 @@ -413,6 +371,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
7864 if (ret == 0)
7865 return 0;
7866 }
7867 +
7868 + if (!__builtin_constant_p(n))
7869 + check_object_size(from, n, true);
7870 +
7871 return __copy_tofrom_user(to, (__force const void __user *)from, n);
7872 }
7873
7874 @@ -430,6 +392,92 @@ static inline unsigned long __copy_to_user(void __user *to,
7875 return __copy_to_user_inatomic(to, from, size);
7876 }
7877
7878 +#ifndef __powerpc64__
7879 +
7880 +static inline unsigned long __must_check copy_from_user(void *to,
7881 + const void __user *from, unsigned long n)
7882 +{
7883 + unsigned long over;
7884 +
7885 + if ((long)n < 0)
7886 + return n;
7887 +
7888 + if (access_ok(VERIFY_READ, from, n)) {
7889 + if (!__builtin_constant_p(n))
7890 + check_object_size(to, n, false);
7891 + return __copy_tofrom_user((__force void __user *)to, from, n);
7892 + }
7893 + if ((unsigned long)from < TASK_SIZE) {
7894 + over = (unsigned long)from + n - TASK_SIZE;
7895 + if (!__builtin_constant_p(n - over))
7896 + check_object_size(to, n - over, false);
7897 + return __copy_tofrom_user((__force void __user *)to, from,
7898 + n - over) + over;
7899 + }
7900 + return n;
7901 +}
7902 +
7903 +static inline unsigned long __must_check copy_to_user(void __user *to,
7904 + const void *from, unsigned long n)
7905 +{
7906 + unsigned long over;
7907 +
7908 + if ((long)n < 0)
7909 + return n;
7910 +
7911 + if (access_ok(VERIFY_WRITE, to, n)) {
7912 + if (!__builtin_constant_p(n))
7913 + check_object_size(from, n, true);
7914 + return __copy_tofrom_user(to, (__force void __user *)from, n);
7915 + }
7916 + if ((unsigned long)to < TASK_SIZE) {
7917 + over = (unsigned long)to + n - TASK_SIZE;
7918 + if (!__builtin_constant_p(n))
7919 + check_object_size(from, n - over, true);
7920 + return __copy_tofrom_user(to, (__force void __user *)from,
7921 + n - over) + over;
7922 + }
7923 + return n;
7924 +}
7925 +
7926 +#else /* __powerpc64__ */
7927 +
7928 +#define __copy_in_user(to, from, size) \
7929 + __copy_tofrom_user((to), (from), (size))
7930 +
7931 +static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
7932 +{
7933 + if ((long)n < 0 || n > INT_MAX)
7934 + return n;
7935 +
7936 + if (!__builtin_constant_p(n))
7937 + check_object_size(to, n, false);
7938 +
7939 + if (likely(access_ok(VERIFY_READ, from, n)))
7940 + n = __copy_from_user(to, from, n);
7941 + else
7942 + memset(to, 0, n);
7943 + return n;
7944 +}
7945 +
7946 +static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
7947 +{
7948 + if ((long)n < 0 || n > INT_MAX)
7949 + return n;
7950 +
7951 + if (likely(access_ok(VERIFY_WRITE, to, n))) {
7952 + if (!__builtin_constant_p(n))
7953 + check_object_size(from, n, true);
7954 + n = __copy_to_user(to, from, n);
7955 + }
7956 + return n;
7957 +}
7958 +
7959 +extern unsigned long copy_in_user(void __user *to, const void __user *from,
7960 + unsigned long n);
7961 +
7962 +#endif /* __powerpc64__ */
7963 +
7964 extern unsigned long __clear_user(void __user *addr, unsigned long size);
7965
7966 static inline unsigned long clear_user(void __user *addr, unsigned long size)
7967 diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
7968 index 2d06704..1616f1b 100644
7969 --- a/arch/powerpc/kernel/exceptions-64e.S
7970 +++ b/arch/powerpc/kernel/exceptions-64e.S
7971 @@ -757,6 +757,7 @@ storage_fault_common:
7972 std r14,_DAR(r1)
7973 std r15,_DSISR(r1)
7974 addi r3,r1,STACK_FRAME_OVERHEAD
7975 + bl .save_nvgprs
7976 mr r4,r14
7977 mr r5,r15
7978 ld r14,PACA_EXGEN+EX_R14(r13)
7979 @@ -765,8 +766,7 @@ storage_fault_common:
7980 cmpdi r3,0
7981 bne- 1f
7982 b .ret_from_except_lite
7983 -1: bl .save_nvgprs
7984 - mr r5,r3
7985 +1: mr r5,r3
7986 addi r3,r1,STACK_FRAME_OVERHEAD
7987 ld r4,_DAR(r1)
7988 bl .bad_page_fault
7989 diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
7990 index 3a9ed6a..b534681 100644
7991 --- a/arch/powerpc/kernel/exceptions-64s.S
7992 +++ b/arch/powerpc/kernel/exceptions-64s.S
7993 @@ -1364,10 +1364,10 @@ handle_page_fault:
7994 11: ld r4,_DAR(r1)
7995 ld r5,_DSISR(r1)
7996 addi r3,r1,STACK_FRAME_OVERHEAD
7997 + bl .save_nvgprs
7998 bl .do_page_fault
7999 cmpdi r3,0
8000 beq+ 12f
8001 - bl .save_nvgprs
8002 mr r5,r3
8003 addi r3,r1,STACK_FRAME_OVERHEAD
8004 lwz r4,_DAR(r1)
8005 diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8006 index 2e3200c..72095ce 100644
8007 --- a/arch/powerpc/kernel/module_32.c
8008 +++ b/arch/powerpc/kernel/module_32.c
8009 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8010 me->arch.core_plt_section = i;
8011 }
8012 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8013 - printk("Module doesn't contain .plt or .init.plt sections.\n");
8014 + printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
8015 return -ENOEXEC;
8016 }
8017
8018 @@ -192,11 +192,16 @@ static uint32_t do_plt_call(void *location,
8019
8020 DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8021 /* Init, or core PLT? */
8022 - if (location >= mod->module_core
8023 - && location < mod->module_core + mod->core_size)
8024 + if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8025 + (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8026 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8027 - else
8028 + else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8029 + (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8030 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8031 + else {
8032 + printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8033 + return ~0UL;
8034 + }
8035
8036 /* Find this entry, or if that fails, the next avail. entry */
8037 while (entry->jump[0]) {
8038 diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8039 index 96d2fdf..f6d10c8 100644
8040 --- a/arch/powerpc/kernel/process.c
8041 +++ b/arch/powerpc/kernel/process.c
8042 @@ -886,8 +886,8 @@ void show_regs(struct pt_regs * regs)
8043 * Lookup NIP late so we have the best change of getting the
8044 * above info out without failing
8045 */
8046 - printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8047 - printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8048 + printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8049 + printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8050 #endif
8051 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
8052 printk("PACATMSCRATCH [%llx]\n", get_paca()->tm_scratch);
8053 @@ -1352,10 +1352,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8054 newsp = stack[0];
8055 ip = stack[STACK_FRAME_LR_SAVE];
8056 if (!firstframe || ip != lr) {
8057 - printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8058 + printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8059 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8060 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
8061 - printk(" (%pS)",
8062 + printk(" (%pA)",
8063 (void *)current->ret_stack[curr_frame].ret);
8064 curr_frame--;
8065 }
8066 @@ -1375,7 +1375,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8067 struct pt_regs *regs = (struct pt_regs *)
8068 (sp + STACK_FRAME_OVERHEAD);
8069 lr = regs->link;
8070 - printk("--- Exception: %lx at %pS\n LR = %pS\n",
8071 + printk("--- Exception: %lx at %pA\n LR = %pA\n",
8072 regs->trap, (void *)regs->nip, (void *)lr);
8073 firstframe = 1;
8074 }
8075 @@ -1411,58 +1411,3 @@ void notrace __ppc64_runlatch_off(void)
8076 mtspr(SPRN_CTRLT, ctrl);
8077 }
8078 #endif /* CONFIG_PPC64 */
8079 -
8080 -unsigned long arch_align_stack(unsigned long sp)
8081 -{
8082 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8083 - sp -= get_random_int() & ~PAGE_MASK;
8084 - return sp & ~0xf;
8085 -}
8086 -
8087 -static inline unsigned long brk_rnd(void)
8088 -{
8089 - unsigned long rnd = 0;
8090 -
8091 - /* 8MB for 32bit, 1GB for 64bit */
8092 - if (is_32bit_task())
8093 - rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
8094 - else
8095 - rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
8096 -
8097 - return rnd << PAGE_SHIFT;
8098 -}
8099 -
8100 -unsigned long arch_randomize_brk(struct mm_struct *mm)
8101 -{
8102 - unsigned long base = mm->brk;
8103 - unsigned long ret;
8104 -
8105 -#ifdef CONFIG_PPC_STD_MMU_64
8106 - /*
8107 - * If we are using 1TB segments and we are allowed to randomise
8108 - * the heap, we can put it above 1TB so it is backed by a 1TB
8109 - * segment. Otherwise the heap will be in the bottom 1TB
8110 - * which always uses 256MB segments and this may result in a
8111 - * performance penalty.
8112 - */
8113 - if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
8114 - base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
8115 -#endif
8116 -
8117 - ret = PAGE_ALIGN(base + brk_rnd());
8118 -
8119 - if (ret < mm->brk)
8120 - return mm->brk;
8121 -
8122 - return ret;
8123 -}
8124 -
8125 -unsigned long randomize_et_dyn(unsigned long base)
8126 -{
8127 - unsigned long ret = PAGE_ALIGN(base + brk_rnd());
8128 -
8129 - if (ret < base)
8130 - return base;
8131 -
8132 - return ret;
8133 -}
8134 diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
8135 index 9a0d24c..e7fbedf 100644
8136 --- a/arch/powerpc/kernel/ptrace.c
8137 +++ b/arch/powerpc/kernel/ptrace.c
8138 @@ -1761,6 +1761,10 @@ long arch_ptrace(struct task_struct *child, long request,
8139 return ret;
8140 }
8141
8142 +#ifdef CONFIG_GRKERNSEC_SETXID
8143 +extern void gr_delayed_cred_worker(void);
8144 +#endif
8145 +
8146 /*
8147 * We must return the syscall number to actually look up in the table.
8148 * This can be -1L to skip running any syscall at all.
8149 @@ -1773,6 +1777,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
8150
8151 secure_computing_strict(regs->gpr[0]);
8152
8153 +#ifdef CONFIG_GRKERNSEC_SETXID
8154 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
8155 + gr_delayed_cred_worker();
8156 +#endif
8157 +
8158 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
8159 tracehook_report_syscall_entry(regs))
8160 /*
8161 @@ -1807,6 +1816,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
8162 {
8163 int step;
8164
8165 +#ifdef CONFIG_GRKERNSEC_SETXID
8166 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
8167 + gr_delayed_cred_worker();
8168 +#endif
8169 +
8170 audit_syscall_exit(regs);
8171
8172 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
8173 diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
8174 index fea2dba..a779f6b 100644
8175 --- a/arch/powerpc/kernel/signal_32.c
8176 +++ b/arch/powerpc/kernel/signal_32.c
8177 @@ -1002,7 +1002,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
8178 /* Save user registers on the stack */
8179 frame = &rt_sf->uc.uc_mcontext;
8180 addr = frame;
8181 - if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
8182 + if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
8183 sigret = 0;
8184 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
8185 } else {
8186 diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
8187 index 1e7ba88..17afb1b 100644
8188 --- a/arch/powerpc/kernel/signal_64.c
8189 +++ b/arch/powerpc/kernel/signal_64.c
8190 @@ -763,7 +763,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
8191 #endif
8192
8193 /* Set up to return from userspace. */
8194 - if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
8195 + if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
8196 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
8197 } else {
8198 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
8199 diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
8200 index f783c93..619baf1 100644
8201 --- a/arch/powerpc/kernel/traps.c
8202 +++ b/arch/powerpc/kernel/traps.c
8203 @@ -142,6 +142,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
8204 return flags;
8205 }
8206
8207 +extern void gr_handle_kernel_exploit(void);
8208 +
8209 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
8210 int signr)
8211 {
8212 @@ -191,6 +193,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
8213 panic("Fatal exception in interrupt");
8214 if (panic_on_oops)
8215 panic("Fatal exception");
8216 +
8217 + gr_handle_kernel_exploit();
8218 +
8219 do_exit(signr);
8220 }
8221
8222 diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
8223 index 1d9c926..25f4741 100644
8224 --- a/arch/powerpc/kernel/vdso.c
8225 +++ b/arch/powerpc/kernel/vdso.c
8226 @@ -34,6 +34,7 @@
8227 #include <asm/firmware.h>
8228 #include <asm/vdso.h>
8229 #include <asm/vdso_datapage.h>
8230 +#include <asm/mman.h>
8231
8232 #include "setup.h"
8233
8234 @@ -222,7 +223,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
8235 vdso_base = VDSO32_MBASE;
8236 #endif
8237
8238 - current->mm->context.vdso_base = 0;
8239 + current->mm->context.vdso_base = ~0UL;
8240
8241 /* vDSO has a problem and was disabled, just don't "enable" it for the
8242 * process
8243 @@ -242,7 +243,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
8244 vdso_base = get_unmapped_area(NULL, vdso_base,
8245 (vdso_pages << PAGE_SHIFT) +
8246 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
8247 - 0, 0);
8248 + 0, MAP_PRIVATE | MAP_EXECUTABLE);
8249 if (IS_ERR_VALUE(vdso_base)) {
8250 rc = vdso_base;
8251 goto fail_mmapsem;
8252 diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
8253 index 5eea6f3..5d10396 100644
8254 --- a/arch/powerpc/lib/usercopy_64.c
8255 +++ b/arch/powerpc/lib/usercopy_64.c
8256 @@ -9,22 +9,6 @@
8257 #include <linux/module.h>
8258 #include <asm/uaccess.h>
8259
8260 -unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
8261 -{
8262 - if (likely(access_ok(VERIFY_READ, from, n)))
8263 - n = __copy_from_user(to, from, n);
8264 - else
8265 - memset(to, 0, n);
8266 - return n;
8267 -}
8268 -
8269 -unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
8270 -{
8271 - if (likely(access_ok(VERIFY_WRITE, to, n)))
8272 - n = __copy_to_user(to, from, n);
8273 - return n;
8274 -}
8275 -
8276 unsigned long copy_in_user(void __user *to, const void __user *from,
8277 unsigned long n)
8278 {
8279 @@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
8280 return n;
8281 }
8282
8283 -EXPORT_SYMBOL(copy_from_user);
8284 -EXPORT_SYMBOL(copy_to_user);
8285 EXPORT_SYMBOL(copy_in_user);
8286
8287 diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
8288 index 51ab9e7..7d3c78b 100644
8289 --- a/arch/powerpc/mm/fault.c
8290 +++ b/arch/powerpc/mm/fault.c
8291 @@ -33,6 +33,10 @@
8292 #include <linux/magic.h>
8293 #include <linux/ratelimit.h>
8294 #include <linux/context_tracking.h>
8295 +#include <linux/slab.h>
8296 +#include <linux/pagemap.h>
8297 +#include <linux/compiler.h>
8298 +#include <linux/unistd.h>
8299
8300 #include <asm/firmware.h>
8301 #include <asm/page.h>
8302 @@ -69,6 +73,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
8303 }
8304 #endif
8305
8306 +#ifdef CONFIG_PAX_PAGEEXEC
8307 +/*
8308 + * PaX: decide what to do with offenders (regs->nip = fault address)
8309 + *
8310 + * returns 1 when task should be killed
8311 + */
8312 +static int pax_handle_fetch_fault(struct pt_regs *regs)
8313 +{
8314 + return 1;
8315 +}
8316 +
8317 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
8318 +{
8319 + unsigned long i;
8320 +
8321 + printk(KERN_ERR "PAX: bytes at PC: ");
8322 + for (i = 0; i < 5; i++) {
8323 + unsigned int c;
8324 + if (get_user(c, (unsigned int __user *)pc+i))
8325 + printk(KERN_CONT "???????? ");
8326 + else
8327 + printk(KERN_CONT "%08x ", c);
8328 + }
8329 + printk("\n");
8330 +}
8331 +#endif
8332 +
8333 /*
8334 * Check whether the instruction at regs->nip is a store using
8335 * an update addressing form which will update r1.
8336 @@ -216,7 +247,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
8337 * indicate errors in DSISR but can validly be set in SRR1.
8338 */
8339 if (trap == 0x400)
8340 - error_code &= 0x48200000;
8341 + error_code &= 0x58200000;
8342 else
8343 is_write = error_code & DSISR_ISSTORE;
8344 #else
8345 @@ -378,7 +409,7 @@ good_area:
8346 * "undefined". Of those that can be set, this is the only
8347 * one which seems bad.
8348 */
8349 - if (error_code & 0x10000000)
8350 + if (error_code & DSISR_GUARDED)
8351 /* Guarded storage error. */
8352 goto bad_area;
8353 #endif /* CONFIG_8xx */
8354 @@ -393,7 +424,7 @@ good_area:
8355 * processors use the same I/D cache coherency mechanism
8356 * as embedded.
8357 */
8358 - if (error_code & DSISR_PROTFAULT)
8359 + if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
8360 goto bad_area;
8361 #endif /* CONFIG_PPC_STD_MMU */
8362
8363 @@ -483,6 +514,23 @@ bad_area:
8364 bad_area_nosemaphore:
8365 /* User mode accesses cause a SIGSEGV */
8366 if (user_mode(regs)) {
8367 +
8368 +#ifdef CONFIG_PAX_PAGEEXEC
8369 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
8370 +#ifdef CONFIG_PPC_STD_MMU
8371 + if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
8372 +#else
8373 + if (is_exec && regs->nip == address) {
8374 +#endif
8375 + switch (pax_handle_fetch_fault(regs)) {
8376 + }
8377 +
8378 + pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
8379 + do_group_exit(SIGKILL);
8380 + }
8381 + }
8382 +#endif
8383 +
8384 _exception(SIGSEGV, regs, code, address);
8385 goto bail;
8386 }
8387 diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
8388 index cb8bdbe..d770680 100644
8389 --- a/arch/powerpc/mm/mmap.c
8390 +++ b/arch/powerpc/mm/mmap.c
8391 @@ -57,6 +57,10 @@ static unsigned long mmap_rnd(void)
8392 {
8393 unsigned long rnd = 0;
8394
8395 +#ifdef CONFIG_PAX_RANDMMAP
8396 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
8397 +#endif
8398 +
8399 if (current->flags & PF_RANDOMIZE) {
8400 /* 8MB for 32bit, 1GB for 64bit */
8401 if (is_32bit_task())
8402 @@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
8403 */
8404 if (mmap_is_legacy()) {
8405 mm->mmap_base = TASK_UNMAPPED_BASE;
8406 +
8407 +#ifdef CONFIG_PAX_RANDMMAP
8408 + if (mm->pax_flags & MF_PAX_RANDMMAP)
8409 + mm->mmap_base += mm->delta_mmap;
8410 +#endif
8411 +
8412 mm->get_unmapped_area = arch_get_unmapped_area;
8413 } else {
8414 mm->mmap_base = mmap_base();
8415 +
8416 +#ifdef CONFIG_PAX_RANDMMAP
8417 + if (mm->pax_flags & MF_PAX_RANDMMAP)
8418 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
8419 +#endif
8420 +
8421 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
8422 }
8423 }
8424 diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
8425 index 7ce9cf3..a964087 100644
8426 --- a/arch/powerpc/mm/slice.c
8427 +++ b/arch/powerpc/mm/slice.c
8428 @@ -103,7 +103,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
8429 if ((mm->task_size - len) < addr)
8430 return 0;
8431 vma = find_vma(mm, addr);
8432 - return (!vma || (addr + len) <= vma->vm_start);
8433 + return check_heap_stack_gap(vma, addr, len, 0);
8434 }
8435
8436 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
8437 @@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
8438 info.align_offset = 0;
8439
8440 addr = TASK_UNMAPPED_BASE;
8441 +
8442 +#ifdef CONFIG_PAX_RANDMMAP
8443 + if (mm->pax_flags & MF_PAX_RANDMMAP)
8444 + addr += mm->delta_mmap;
8445 +#endif
8446 +
8447 while (addr < TASK_SIZE) {
8448 info.low_limit = addr;
8449 if (!slice_scan_available(addr, available, 1, &addr))
8450 @@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
8451 if (fixed && addr > (mm->task_size - len))
8452 return -EINVAL;
8453
8454 +#ifdef CONFIG_PAX_RANDMMAP
8455 + if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
8456 + addr = 0;
8457 +#endif
8458 +
8459 /* If hint, make sure it matches our alignment restrictions */
8460 if (!fixed && addr) {
8461 addr = _ALIGN_UP(addr, 1ul << pshift);
8462 diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
8463 index 9098692..3d54cd1 100644
8464 --- a/arch/powerpc/platforms/cell/spufs/file.c
8465 +++ b/arch/powerpc/platforms/cell/spufs/file.c
8466 @@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
8467 return VM_FAULT_NOPAGE;
8468 }
8469
8470 -static int spufs_mem_mmap_access(struct vm_area_struct *vma,
8471 +static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
8472 unsigned long address,
8473 - void *buf, int len, int write)
8474 + void *buf, size_t len, int write)
8475 {
8476 struct spu_context *ctx = vma->vm_file->private_data;
8477 unsigned long offset = address - vma->vm_start;
8478 diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
8479 index c797832..ce575c8 100644
8480 --- a/arch/s390/include/asm/atomic.h
8481 +++ b/arch/s390/include/asm/atomic.h
8482 @@ -326,6 +326,16 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
8483 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
8484 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
8485
8486 +#define atomic64_read_unchecked(v) atomic64_read(v)
8487 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
8488 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
8489 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
8490 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
8491 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
8492 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
8493 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
8494 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
8495 +
8496 #define smp_mb__before_atomic_dec() smp_mb()
8497 #define smp_mb__after_atomic_dec() smp_mb()
8498 #define smp_mb__before_atomic_inc() smp_mb()
8499 diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
8500 index 4d7ccac..d03d0ad 100644
8501 --- a/arch/s390/include/asm/cache.h
8502 +++ b/arch/s390/include/asm/cache.h
8503 @@ -9,8 +9,10 @@
8504 #ifndef __ARCH_S390_CACHE_H
8505 #define __ARCH_S390_CACHE_H
8506
8507 -#define L1_CACHE_BYTES 256
8508 +#include <linux/const.h>
8509 +
8510 #define L1_CACHE_SHIFT 8
8511 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8512 #define NET_SKB_PAD 32
8513
8514 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
8515 diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
8516 index 78f4f87..598ce39 100644
8517 --- a/arch/s390/include/asm/elf.h
8518 +++ b/arch/s390/include/asm/elf.h
8519 @@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
8520 the loader. We need to make sure that it is out of the way of the program
8521 that it will "exec", and that there is sufficient room for the brk. */
8522
8523 -extern unsigned long randomize_et_dyn(unsigned long base);
8524 -#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
8525 +#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
8526 +
8527 +#ifdef CONFIG_PAX_ASLR
8528 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
8529 +
8530 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
8531 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
8532 +#endif
8533
8534 /* This yields a mask that user programs can use to figure out what
8535 instruction set this CPU supports. */
8536 @@ -222,9 +228,6 @@ struct linux_binprm;
8537 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
8538 int arch_setup_additional_pages(struct linux_binprm *, int);
8539
8540 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
8541 -#define arch_randomize_brk arch_randomize_brk
8542 -
8543 void *fill_cpu_elf_notes(void *ptr, struct save_area *sa);
8544
8545 #endif
8546 diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
8547 index c4a93d6..4d2a9b4 100644
8548 --- a/arch/s390/include/asm/exec.h
8549 +++ b/arch/s390/include/asm/exec.h
8550 @@ -7,6 +7,6 @@
8551 #ifndef __ASM_EXEC_H
8552 #define __ASM_EXEC_H
8553
8554 -extern unsigned long arch_align_stack(unsigned long sp);
8555 +#define arch_align_stack(x) ((x) & ~0xfUL)
8556
8557 #endif /* __ASM_EXEC_H */
8558 diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
8559 index 9c33ed4..e40cbef 100644
8560 --- a/arch/s390/include/asm/uaccess.h
8561 +++ b/arch/s390/include/asm/uaccess.h
8562 @@ -252,6 +252,10 @@ static inline unsigned long __must_check
8563 copy_to_user(void __user *to, const void *from, unsigned long n)
8564 {
8565 might_fault();
8566 +
8567 + if ((long)n < 0)
8568 + return n;
8569 +
8570 return __copy_to_user(to, from, n);
8571 }
8572
8573 @@ -275,6 +279,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
8574 static inline unsigned long __must_check
8575 __copy_from_user(void *to, const void __user *from, unsigned long n)
8576 {
8577 + if ((long)n < 0)
8578 + return n;
8579 +
8580 if (__builtin_constant_p(n) && (n <= 256))
8581 return uaccess.copy_from_user_small(n, from, to);
8582 else
8583 @@ -306,10 +313,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
8584 static inline unsigned long __must_check
8585 copy_from_user(void *to, const void __user *from, unsigned long n)
8586 {
8587 - unsigned int sz = __compiletime_object_size(to);
8588 + size_t sz = __compiletime_object_size(to);
8589
8590 might_fault();
8591 - if (unlikely(sz != -1 && sz < n)) {
8592 +
8593 + if ((long)n < 0)
8594 + return n;
8595 +
8596 + if (unlikely(sz != (size_t)-1 && sz < n)) {
8597 copy_from_user_overflow();
8598 return n;
8599 }
8600 diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
8601 index 7845e15..59c4353 100644
8602 --- a/arch/s390/kernel/module.c
8603 +++ b/arch/s390/kernel/module.c
8604 @@ -169,11 +169,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
8605
8606 /* Increase core size by size of got & plt and set start
8607 offsets for got and plt. */
8608 - me->core_size = ALIGN(me->core_size, 4);
8609 - me->arch.got_offset = me->core_size;
8610 - me->core_size += me->arch.got_size;
8611 - me->arch.plt_offset = me->core_size;
8612 - me->core_size += me->arch.plt_size;
8613 + me->core_size_rw = ALIGN(me->core_size_rw, 4);
8614 + me->arch.got_offset = me->core_size_rw;
8615 + me->core_size_rw += me->arch.got_size;
8616 + me->arch.plt_offset = me->core_size_rx;
8617 + me->core_size_rx += me->arch.plt_size;
8618 return 0;
8619 }
8620
8621 @@ -289,7 +289,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
8622 if (info->got_initialized == 0) {
8623 Elf_Addr *gotent;
8624
8625 - gotent = me->module_core + me->arch.got_offset +
8626 + gotent = me->module_core_rw + me->arch.got_offset +
8627 info->got_offset;
8628 *gotent = val;
8629 info->got_initialized = 1;
8630 @@ -312,7 +312,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
8631 rc = apply_rela_bits(loc, val, 0, 64, 0);
8632 else if (r_type == R_390_GOTENT ||
8633 r_type == R_390_GOTPLTENT) {
8634 - val += (Elf_Addr) me->module_core - loc;
8635 + val += (Elf_Addr) me->module_core_rw - loc;
8636 rc = apply_rela_bits(loc, val, 1, 32, 1);
8637 }
8638 break;
8639 @@ -325,7 +325,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
8640 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
8641 if (info->plt_initialized == 0) {
8642 unsigned int *ip;
8643 - ip = me->module_core + me->arch.plt_offset +
8644 + ip = me->module_core_rx + me->arch.plt_offset +
8645 info->plt_offset;
8646 #ifndef CONFIG_64BIT
8647 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
8648 @@ -350,7 +350,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
8649 val - loc + 0xffffUL < 0x1ffffeUL) ||
8650 (r_type == R_390_PLT32DBL &&
8651 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
8652 - val = (Elf_Addr) me->module_core +
8653 + val = (Elf_Addr) me->module_core_rx +
8654 me->arch.plt_offset +
8655 info->plt_offset;
8656 val += rela->r_addend - loc;
8657 @@ -372,7 +372,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
8658 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
8659 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
8660 val = val + rela->r_addend -
8661 - ((Elf_Addr) me->module_core + me->arch.got_offset);
8662 + ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
8663 if (r_type == R_390_GOTOFF16)
8664 rc = apply_rela_bits(loc, val, 0, 16, 0);
8665 else if (r_type == R_390_GOTOFF32)
8666 @@ -382,7 +382,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
8667 break;
8668 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
8669 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
8670 - val = (Elf_Addr) me->module_core + me->arch.got_offset +
8671 + val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
8672 rela->r_addend - loc;
8673 if (r_type == R_390_GOTPC)
8674 rc = apply_rela_bits(loc, val, 1, 32, 0);
8675 diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
8676 index c5dbb33..b41f4ee 100644
8677 --- a/arch/s390/kernel/process.c
8678 +++ b/arch/s390/kernel/process.c
8679 @@ -237,39 +237,3 @@ unsigned long get_wchan(struct task_struct *p)
8680 }
8681 return 0;
8682 }
8683 -
8684 -unsigned long arch_align_stack(unsigned long sp)
8685 -{
8686 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8687 - sp -= get_random_int() & ~PAGE_MASK;
8688 - return sp & ~0xf;
8689 -}
8690 -
8691 -static inline unsigned long brk_rnd(void)
8692 -{
8693 - /* 8MB for 32bit, 1GB for 64bit */
8694 - if (is_32bit_task())
8695 - return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
8696 - else
8697 - return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
8698 -}
8699 -
8700 -unsigned long arch_randomize_brk(struct mm_struct *mm)
8701 -{
8702 - unsigned long ret = PAGE_ALIGN(mm->brk + brk_rnd());
8703 -
8704 - if (ret < mm->brk)
8705 - return mm->brk;
8706 - return ret;
8707 -}
8708 -
8709 -unsigned long randomize_et_dyn(unsigned long base)
8710 -{
8711 - unsigned long ret = PAGE_ALIGN(base + brk_rnd());
8712 -
8713 - if (!(current->flags & PF_RANDOMIZE))
8714 - return base;
8715 - if (ret < base)
8716 - return base;
8717 - return ret;
8718 -}
8719 diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
8720 index 4002329..99b67cb 100644
8721 --- a/arch/s390/mm/mmap.c
8722 +++ b/arch/s390/mm/mmap.c
8723 @@ -90,9 +90,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
8724 */
8725 if (mmap_is_legacy()) {
8726 mm->mmap_base = TASK_UNMAPPED_BASE;
8727 +
8728 +#ifdef CONFIG_PAX_RANDMMAP
8729 + if (mm->pax_flags & MF_PAX_RANDMMAP)
8730 + mm->mmap_base += mm->delta_mmap;
8731 +#endif
8732 +
8733 mm->get_unmapped_area = arch_get_unmapped_area;
8734 } else {
8735 mm->mmap_base = mmap_base();
8736 +
8737 +#ifdef CONFIG_PAX_RANDMMAP
8738 + if (mm->pax_flags & MF_PAX_RANDMMAP)
8739 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
8740 +#endif
8741 +
8742 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
8743 }
8744 }
8745 @@ -173,9 +185,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
8746 */
8747 if (mmap_is_legacy()) {
8748 mm->mmap_base = TASK_UNMAPPED_BASE;
8749 +
8750 +#ifdef CONFIG_PAX_RANDMMAP
8751 + if (mm->pax_flags & MF_PAX_RANDMMAP)
8752 + mm->mmap_base += mm->delta_mmap;
8753 +#endif
8754 +
8755 mm->get_unmapped_area = s390_get_unmapped_area;
8756 } else {
8757 mm->mmap_base = mmap_base();
8758 +
8759 +#ifdef CONFIG_PAX_RANDMMAP
8760 + if (mm->pax_flags & MF_PAX_RANDMMAP)
8761 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
8762 +#endif
8763 +
8764 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
8765 }
8766 }
8767 diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
8768 index ae3d59f..f65f075 100644
8769 --- a/arch/score/include/asm/cache.h
8770 +++ b/arch/score/include/asm/cache.h
8771 @@ -1,7 +1,9 @@
8772 #ifndef _ASM_SCORE_CACHE_H
8773 #define _ASM_SCORE_CACHE_H
8774
8775 +#include <linux/const.h>
8776 +
8777 #define L1_CACHE_SHIFT 4
8778 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8779 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8780
8781 #endif /* _ASM_SCORE_CACHE_H */
8782 diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
8783 index f9f3cd5..58ff438 100644
8784 --- a/arch/score/include/asm/exec.h
8785 +++ b/arch/score/include/asm/exec.h
8786 @@ -1,6 +1,6 @@
8787 #ifndef _ASM_SCORE_EXEC_H
8788 #define _ASM_SCORE_EXEC_H
8789
8790 -extern unsigned long arch_align_stack(unsigned long sp);
8791 +#define arch_align_stack(x) (x)
8792
8793 #endif /* _ASM_SCORE_EXEC_H */
8794 diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
8795 index a1519ad3..e8ac1ff 100644
8796 --- a/arch/score/kernel/process.c
8797 +++ b/arch/score/kernel/process.c
8798 @@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
8799
8800 return task_pt_regs(task)->cp0_epc;
8801 }
8802 -
8803 -unsigned long arch_align_stack(unsigned long sp)
8804 -{
8805 - return sp;
8806 -}
8807 diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
8808 index ef9e555..331bd29 100644
8809 --- a/arch/sh/include/asm/cache.h
8810 +++ b/arch/sh/include/asm/cache.h
8811 @@ -9,10 +9,11 @@
8812 #define __ASM_SH_CACHE_H
8813 #ifdef __KERNEL__
8814
8815 +#include <linux/const.h>
8816 #include <linux/init.h>
8817 #include <cpu/cache.h>
8818
8819 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8820 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8821
8822 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
8823
8824 diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
8825 index 6777177..cb5e44f 100644
8826 --- a/arch/sh/mm/mmap.c
8827 +++ b/arch/sh/mm/mmap.c
8828 @@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
8829 struct mm_struct *mm = current->mm;
8830 struct vm_area_struct *vma;
8831 int do_colour_align;
8832 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
8833 struct vm_unmapped_area_info info;
8834
8835 if (flags & MAP_FIXED) {
8836 @@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
8837 if (filp || (flags & MAP_SHARED))
8838 do_colour_align = 1;
8839
8840 +#ifdef CONFIG_PAX_RANDMMAP
8841 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
8842 +#endif
8843 +
8844 if (addr) {
8845 if (do_colour_align)
8846 addr = COLOUR_ALIGN(addr, pgoff);
8847 @@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
8848 addr = PAGE_ALIGN(addr);
8849
8850 vma = find_vma(mm, addr);
8851 - if (TASK_SIZE - len >= addr &&
8852 - (!vma || addr + len <= vma->vm_start))
8853 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
8854 return addr;
8855 }
8856
8857 info.flags = 0;
8858 info.length = len;
8859 - info.low_limit = TASK_UNMAPPED_BASE;
8860 + info.low_limit = mm->mmap_base;
8861 info.high_limit = TASK_SIZE;
8862 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
8863 info.align_offset = pgoff << PAGE_SHIFT;
8864 @@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
8865 struct mm_struct *mm = current->mm;
8866 unsigned long addr = addr0;
8867 int do_colour_align;
8868 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
8869 struct vm_unmapped_area_info info;
8870
8871 if (flags & MAP_FIXED) {
8872 @@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
8873 if (filp || (flags & MAP_SHARED))
8874 do_colour_align = 1;
8875
8876 +#ifdef CONFIG_PAX_RANDMMAP
8877 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
8878 +#endif
8879 +
8880 /* requesting a specific address */
8881 if (addr) {
8882 if (do_colour_align)
8883 @@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
8884 addr = PAGE_ALIGN(addr);
8885
8886 vma = find_vma(mm, addr);
8887 - if (TASK_SIZE - len >= addr &&
8888 - (!vma || addr + len <= vma->vm_start))
8889 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
8890 return addr;
8891 }
8892
8893 @@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
8894 VM_BUG_ON(addr != -ENOMEM);
8895 info.flags = 0;
8896 info.low_limit = TASK_UNMAPPED_BASE;
8897 +
8898 +#ifdef CONFIG_PAX_RANDMMAP
8899 + if (mm->pax_flags & MF_PAX_RANDMMAP)
8900 + info.low_limit += mm->delta_mmap;
8901 +#endif
8902 +
8903 info.high_limit = TASK_SIZE;
8904 addr = vm_unmapped_area(&info);
8905 }
8906 diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
8907 index be56a24..443328f 100644
8908 --- a/arch/sparc/include/asm/atomic_64.h
8909 +++ b/arch/sparc/include/asm/atomic_64.h
8910 @@ -14,18 +14,40 @@
8911 #define ATOMIC64_INIT(i) { (i) }
8912
8913 #define atomic_read(v) (*(volatile int *)&(v)->counter)
8914 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
8915 +{
8916 + return v->counter;
8917 +}
8918 #define atomic64_read(v) (*(volatile long *)&(v)->counter)
8919 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
8920 +{
8921 + return v->counter;
8922 +}
8923
8924 #define atomic_set(v, i) (((v)->counter) = i)
8925 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
8926 +{
8927 + v->counter = i;
8928 +}
8929 #define atomic64_set(v, i) (((v)->counter) = i)
8930 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
8931 +{
8932 + v->counter = i;
8933 +}
8934
8935 extern void atomic_add(int, atomic_t *);
8936 +extern void atomic_add_unchecked(int, atomic_unchecked_t *);
8937 extern void atomic64_add(long, atomic64_t *);
8938 +extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
8939 extern void atomic_sub(int, atomic_t *);
8940 +extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
8941 extern void atomic64_sub(long, atomic64_t *);
8942 +extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
8943
8944 extern int atomic_add_ret(int, atomic_t *);
8945 +extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
8946 extern long atomic64_add_ret(long, atomic64_t *);
8947 +extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
8948 extern int atomic_sub_ret(int, atomic_t *);
8949 extern long atomic64_sub_ret(long, atomic64_t *);
8950
8951 @@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomic64_t *);
8952 #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
8953
8954 #define atomic_inc_return(v) atomic_add_ret(1, v)
8955 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
8956 +{
8957 + return atomic_add_ret_unchecked(1, v);
8958 +}
8959 #define atomic64_inc_return(v) atomic64_add_ret(1, v)
8960 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8961 +{
8962 + return atomic64_add_ret_unchecked(1, v);
8963 +}
8964
8965 #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
8966 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
8967
8968 #define atomic_add_return(i, v) atomic_add_ret(i, v)
8969 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
8970 +{
8971 + return atomic_add_ret_unchecked(i, v);
8972 +}
8973 #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
8974 +static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
8975 +{
8976 + return atomic64_add_ret_unchecked(i, v);
8977 +}
8978
8979 /*
8980 * atomic_inc_and_test - increment and test
8981 @@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomic64_t *);
8982 * other cases.
8983 */
8984 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
8985 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
8986 +{
8987 + return atomic_inc_return_unchecked(v) == 0;
8988 +}
8989 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8990
8991 #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
8992 @@ -59,25 +101,60 @@ extern long atomic64_sub_ret(long, atomic64_t *);
8993 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
8994
8995 #define atomic_inc(v) atomic_add(1, v)
8996 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
8997 +{
8998 + atomic_add_unchecked(1, v);
8999 +}
9000 #define atomic64_inc(v) atomic64_add(1, v)
9001 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9002 +{
9003 + atomic64_add_unchecked(1, v);
9004 +}
9005
9006 #define atomic_dec(v) atomic_sub(1, v)
9007 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9008 +{
9009 + atomic_sub_unchecked(1, v);
9010 +}
9011 #define atomic64_dec(v) atomic64_sub(1, v)
9012 +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9013 +{
9014 + atomic64_sub_unchecked(1, v);
9015 +}
9016
9017 #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
9018 #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
9019
9020 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
9021 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9022 +{
9023 + return cmpxchg(&v->counter, old, new);
9024 +}
9025 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
9026 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9027 +{
9028 + return xchg(&v->counter, new);
9029 +}
9030
9031 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9032 {
9033 - int c, old;
9034 + int c, old, new;
9035 c = atomic_read(v);
9036 for (;;) {
9037 - if (unlikely(c == (u)))
9038 + if (unlikely(c == u))
9039 break;
9040 - old = atomic_cmpxchg((v), c, c + (a));
9041 +
9042 + asm volatile("addcc %2, %0, %0\n"
9043 +
9044 +#ifdef CONFIG_PAX_REFCOUNT
9045 + "tvs %%icc, 6\n"
9046 +#endif
9047 +
9048 + : "=r" (new)
9049 + : "0" (c), "ir" (a)
9050 + : "cc");
9051 +
9052 + old = atomic_cmpxchg(v, c, new);
9053 if (likely(old == c))
9054 break;
9055 c = old;
9056 @@ -88,20 +165,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9057 #define atomic64_cmpxchg(v, o, n) \
9058 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
9059 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
9060 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
9061 +{
9062 + return xchg(&v->counter, new);
9063 +}
9064
9065 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
9066 {
9067 - long c, old;
9068 + long c, old, new;
9069 c = atomic64_read(v);
9070 for (;;) {
9071 - if (unlikely(c == (u)))
9072 + if (unlikely(c == u))
9073 break;
9074 - old = atomic64_cmpxchg((v), c, c + (a));
9075 +
9076 + asm volatile("addcc %2, %0, %0\n"
9077 +
9078 +#ifdef CONFIG_PAX_REFCOUNT
9079 + "tvs %%xcc, 6\n"
9080 +#endif
9081 +
9082 + : "=r" (new)
9083 + : "0" (c), "ir" (a)
9084 + : "cc");
9085 +
9086 + old = atomic64_cmpxchg(v, c, new);
9087 if (likely(old == c))
9088 break;
9089 c = old;
9090 }
9091 - return c != (u);
9092 + return c != u;
9093 }
9094
9095 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9096 diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
9097 index 5bb6991..5c2132e 100644
9098 --- a/arch/sparc/include/asm/cache.h
9099 +++ b/arch/sparc/include/asm/cache.h
9100 @@ -7,10 +7,12 @@
9101 #ifndef _SPARC_CACHE_H
9102 #define _SPARC_CACHE_H
9103
9104 +#include <linux/const.h>
9105 +
9106 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
9107
9108 #define L1_CACHE_SHIFT 5
9109 -#define L1_CACHE_BYTES 32
9110 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9111
9112 #ifdef CONFIG_SPARC32
9113 #define SMP_CACHE_BYTES_SHIFT 5
9114 diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
9115 index a24e41f..47677ff 100644
9116 --- a/arch/sparc/include/asm/elf_32.h
9117 +++ b/arch/sparc/include/asm/elf_32.h
9118 @@ -114,6 +114,13 @@ typedef struct {
9119
9120 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
9121
9122 +#ifdef CONFIG_PAX_ASLR
9123 +#define PAX_ELF_ET_DYN_BASE 0x10000UL
9124 +
9125 +#define PAX_DELTA_MMAP_LEN 16
9126 +#define PAX_DELTA_STACK_LEN 16
9127 +#endif
9128 +
9129 /* This yields a mask that user programs can use to figure out what
9130 instruction set this cpu supports. This can NOT be done in userspace
9131 on Sparc. */
9132 diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
9133 index 370ca1e..d4f4a98 100644
9134 --- a/arch/sparc/include/asm/elf_64.h
9135 +++ b/arch/sparc/include/asm/elf_64.h
9136 @@ -189,6 +189,13 @@ typedef struct {
9137 #define ELF_ET_DYN_BASE 0x0000010000000000UL
9138 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
9139
9140 +#ifdef CONFIG_PAX_ASLR
9141 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
9142 +
9143 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
9144 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
9145 +#endif
9146 +
9147 extern unsigned long sparc64_elf_hwcap;
9148 #define ELF_HWCAP sparc64_elf_hwcap
9149
9150 diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
9151 index 9b1c36d..209298b 100644
9152 --- a/arch/sparc/include/asm/pgalloc_32.h
9153 +++ b/arch/sparc/include/asm/pgalloc_32.h
9154 @@ -33,6 +33,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
9155 }
9156
9157 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
9158 +#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
9159
9160 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
9161 unsigned long address)
9162 diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
9163 index bcfe063..b333142 100644
9164 --- a/arch/sparc/include/asm/pgalloc_64.h
9165 +++ b/arch/sparc/include/asm/pgalloc_64.h
9166 @@ -26,6 +26,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
9167 }
9168
9169 #define pud_populate(MM, PUD, PMD) pud_set(PUD, PMD)
9170 +#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
9171
9172 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
9173 {
9174 diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
9175 index 502f632..da1917f 100644
9176 --- a/arch/sparc/include/asm/pgtable_32.h
9177 +++ b/arch/sparc/include/asm/pgtable_32.h
9178 @@ -50,6 +50,9 @@ extern unsigned long calc_highpages(void);
9179 #define PAGE_SHARED SRMMU_PAGE_SHARED
9180 #define PAGE_COPY SRMMU_PAGE_COPY
9181 #define PAGE_READONLY SRMMU_PAGE_RDONLY
9182 +#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
9183 +#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
9184 +#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
9185 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
9186
9187 /* Top-level page directory - dummy used by init-mm.
9188 @@ -62,18 +65,18 @@ extern unsigned long ptr_in_current_pgd;
9189
9190 /* xwr */
9191 #define __P000 PAGE_NONE
9192 -#define __P001 PAGE_READONLY
9193 -#define __P010 PAGE_COPY
9194 -#define __P011 PAGE_COPY
9195 +#define __P001 PAGE_READONLY_NOEXEC
9196 +#define __P010 PAGE_COPY_NOEXEC
9197 +#define __P011 PAGE_COPY_NOEXEC
9198 #define __P100 PAGE_READONLY
9199 #define __P101 PAGE_READONLY
9200 #define __P110 PAGE_COPY
9201 #define __P111 PAGE_COPY
9202
9203 #define __S000 PAGE_NONE
9204 -#define __S001 PAGE_READONLY
9205 -#define __S010 PAGE_SHARED
9206 -#define __S011 PAGE_SHARED
9207 +#define __S001 PAGE_READONLY_NOEXEC
9208 +#define __S010 PAGE_SHARED_NOEXEC
9209 +#define __S011 PAGE_SHARED_NOEXEC
9210 #define __S100 PAGE_READONLY
9211 #define __S101 PAGE_READONLY
9212 #define __S110 PAGE_SHARED
9213 diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
9214 index 79da178..c2eede8 100644
9215 --- a/arch/sparc/include/asm/pgtsrmmu.h
9216 +++ b/arch/sparc/include/asm/pgtsrmmu.h
9217 @@ -115,6 +115,11 @@
9218 SRMMU_EXEC | SRMMU_REF)
9219 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
9220 SRMMU_EXEC | SRMMU_REF)
9221 +
9222 +#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
9223 +#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
9224 +#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
9225 +
9226 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
9227 SRMMU_DIRTY | SRMMU_REF)
9228
9229 diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
9230 index 9689176..63c18ea 100644
9231 --- a/arch/sparc/include/asm/spinlock_64.h
9232 +++ b/arch/sparc/include/asm/spinlock_64.h
9233 @@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
9234
9235 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
9236
9237 -static void inline arch_read_lock(arch_rwlock_t *lock)
9238 +static inline void arch_read_lock(arch_rwlock_t *lock)
9239 {
9240 unsigned long tmp1, tmp2;
9241
9242 __asm__ __volatile__ (
9243 "1: ldsw [%2], %0\n"
9244 " brlz,pn %0, 2f\n"
9245 -"4: add %0, 1, %1\n"
9246 +"4: addcc %0, 1, %1\n"
9247 +
9248 +#ifdef CONFIG_PAX_REFCOUNT
9249 +" tvs %%icc, 6\n"
9250 +#endif
9251 +
9252 " cas [%2], %0, %1\n"
9253 " cmp %0, %1\n"
9254 " bne,pn %%icc, 1b\n"
9255 @@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
9256 " .previous"
9257 : "=&r" (tmp1), "=&r" (tmp2)
9258 : "r" (lock)
9259 - : "memory");
9260 + : "memory", "cc");
9261 }
9262
9263 -static int inline arch_read_trylock(arch_rwlock_t *lock)
9264 +static inline int arch_read_trylock(arch_rwlock_t *lock)
9265 {
9266 int tmp1, tmp2;
9267
9268 @@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
9269 "1: ldsw [%2], %0\n"
9270 " brlz,a,pn %0, 2f\n"
9271 " mov 0, %0\n"
9272 -" add %0, 1, %1\n"
9273 +" addcc %0, 1, %1\n"
9274 +
9275 +#ifdef CONFIG_PAX_REFCOUNT
9276 +" tvs %%icc, 6\n"
9277 +#endif
9278 +
9279 " cas [%2], %0, %1\n"
9280 " cmp %0, %1\n"
9281 " bne,pn %%icc, 1b\n"
9282 @@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
9283 return tmp1;
9284 }
9285
9286 -static void inline arch_read_unlock(arch_rwlock_t *lock)
9287 +static inline void arch_read_unlock(arch_rwlock_t *lock)
9288 {
9289 unsigned long tmp1, tmp2;
9290
9291 __asm__ __volatile__(
9292 "1: lduw [%2], %0\n"
9293 -" sub %0, 1, %1\n"
9294 +" subcc %0, 1, %1\n"
9295 +
9296 +#ifdef CONFIG_PAX_REFCOUNT
9297 +" tvs %%icc, 6\n"
9298 +#endif
9299 +
9300 " cas [%2], %0, %1\n"
9301 " cmp %0, %1\n"
9302 " bne,pn %%xcc, 1b\n"
9303 @@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
9304 : "memory");
9305 }
9306
9307 -static void inline arch_write_lock(arch_rwlock_t *lock)
9308 +static inline void arch_write_lock(arch_rwlock_t *lock)
9309 {
9310 unsigned long mask, tmp1, tmp2;
9311
9312 @@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
9313 : "memory");
9314 }
9315
9316 -static void inline arch_write_unlock(arch_rwlock_t *lock)
9317 +static inline void arch_write_unlock(arch_rwlock_t *lock)
9318 {
9319 __asm__ __volatile__(
9320 " stw %%g0, [%0]"
9321 @@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
9322 : "memory");
9323 }
9324
9325 -static int inline arch_write_trylock(arch_rwlock_t *lock)
9326 +static inline int arch_write_trylock(arch_rwlock_t *lock)
9327 {
9328 unsigned long mask, tmp1, tmp2, result;
9329
9330 diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
9331 index dd38075..e7cac83 100644
9332 --- a/arch/sparc/include/asm/thread_info_32.h
9333 +++ b/arch/sparc/include/asm/thread_info_32.h
9334 @@ -49,6 +49,8 @@ struct thread_info {
9335 unsigned long w_saved;
9336
9337 struct restart_block restart_block;
9338 +
9339 + unsigned long lowest_stack;
9340 };
9341
9342 /*
9343 diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
9344 index d5e5042..9bfee76 100644
9345 --- a/arch/sparc/include/asm/thread_info_64.h
9346 +++ b/arch/sparc/include/asm/thread_info_64.h
9347 @@ -63,6 +63,8 @@ struct thread_info {
9348 struct pt_regs *kern_una_regs;
9349 unsigned int kern_una_insn;
9350
9351 + unsigned long lowest_stack;
9352 +
9353 unsigned long fpregs[0] __attribute__ ((aligned(64)));
9354 };
9355
9356 @@ -192,10 +194,11 @@ register struct thread_info *current_thread_info_reg asm("g6");
9357 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
9358 /* flag bit 6 is available */
9359 #define TIF_32BIT 7 /* 32-bit binary */
9360 -/* flag bit 8 is available */
9361 +#define TIF_GRSEC_SETXID 8 /* update credentials on syscall entry/exit */
9362 #define TIF_SECCOMP 9 /* secure computing */
9363 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
9364 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
9365 +
9366 /* NOTE: Thread flags >= 12 should be ones we have no interest
9367 * in using in assembly, else we can't use the mask as
9368 * an immediate value in instructions such as andcc.
9369 @@ -214,12 +217,18 @@ register struct thread_info *current_thread_info_reg asm("g6");
9370 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
9371 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
9372 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
9373 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
9374
9375 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
9376 _TIF_DO_NOTIFY_RESUME_MASK | \
9377 _TIF_NEED_RESCHED)
9378 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
9379
9380 +#define _TIF_WORK_SYSCALL \
9381 + (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
9382 + _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
9383 +
9384 +
9385 /*
9386 * Thread-synchronous status.
9387 *
9388 diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
9389 index 0167d26..767bb0c 100644
9390 --- a/arch/sparc/include/asm/uaccess.h
9391 +++ b/arch/sparc/include/asm/uaccess.h
9392 @@ -1,5 +1,6 @@
9393 #ifndef ___ASM_SPARC_UACCESS_H
9394 #define ___ASM_SPARC_UACCESS_H
9395 +
9396 #if defined(__sparc__) && defined(__arch64__)
9397 #include <asm/uaccess_64.h>
9398 #else
9399 diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
9400 index 53a28dd..50c38c3 100644
9401 --- a/arch/sparc/include/asm/uaccess_32.h
9402 +++ b/arch/sparc/include/asm/uaccess_32.h
9403 @@ -250,27 +250,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
9404
9405 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9406 {
9407 - if (n && __access_ok((unsigned long) to, n))
9408 + if ((long)n < 0)
9409 + return n;
9410 +
9411 + if (n && __access_ok((unsigned long) to, n)) {
9412 + if (!__builtin_constant_p(n))
9413 + check_object_size(from, n, true);
9414 return __copy_user(to, (__force void __user *) from, n);
9415 - else
9416 + } else
9417 return n;
9418 }
9419
9420 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
9421 {
9422 + if ((long)n < 0)
9423 + return n;
9424 +
9425 + if (!__builtin_constant_p(n))
9426 + check_object_size(from, n, true);
9427 +
9428 return __copy_user(to, (__force void __user *) from, n);
9429 }
9430
9431 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9432 {
9433 - if (n && __access_ok((unsigned long) from, n))
9434 + if ((long)n < 0)
9435 + return n;
9436 +
9437 + if (n && __access_ok((unsigned long) from, n)) {
9438 + if (!__builtin_constant_p(n))
9439 + check_object_size(to, n, false);
9440 return __copy_user((__force void __user *) to, from, n);
9441 - else
9442 + } else
9443 return n;
9444 }
9445
9446 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
9447 {
9448 + if ((long)n < 0)
9449 + return n;
9450 +
9451 return __copy_user((__force void __user *) to, from, n);
9452 }
9453
9454 diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
9455 index e562d3c..191f176 100644
9456 --- a/arch/sparc/include/asm/uaccess_64.h
9457 +++ b/arch/sparc/include/asm/uaccess_64.h
9458 @@ -10,6 +10,7 @@
9459 #include <linux/compiler.h>
9460 #include <linux/string.h>
9461 #include <linux/thread_info.h>
9462 +#include <linux/kernel.h>
9463 #include <asm/asi.h>
9464 #include <asm/spitfire.h>
9465 #include <asm-generic/uaccess-unaligned.h>
9466 @@ -214,8 +215,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
9467 static inline unsigned long __must_check
9468 copy_from_user(void *to, const void __user *from, unsigned long size)
9469 {
9470 - unsigned long ret = ___copy_from_user(to, from, size);
9471 + unsigned long ret;
9472
9473 + if ((long)size < 0 || size > INT_MAX)
9474 + return size;
9475 +
9476 + if (!__builtin_constant_p(size))
9477 + check_object_size(to, size, false);
9478 +
9479 + ret = ___copy_from_user(to, from, size);
9480 if (unlikely(ret))
9481 ret = copy_from_user_fixup(to, from, size);
9482
9483 @@ -231,8 +239,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
9484 static inline unsigned long __must_check
9485 copy_to_user(void __user *to, const void *from, unsigned long size)
9486 {
9487 - unsigned long ret = ___copy_to_user(to, from, size);
9488 + unsigned long ret;
9489
9490 + if ((long)size < 0 || size > INT_MAX)
9491 + return size;
9492 +
9493 + if (!__builtin_constant_p(size))
9494 + check_object_size(from, size, true);
9495 +
9496 + ret = ___copy_to_user(to, from, size);
9497 if (unlikely(ret))
9498 ret = copy_to_user_fixup(to, from, size);
9499 return ret;
9500 diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
9501 index d15cc17..d0ae796 100644
9502 --- a/arch/sparc/kernel/Makefile
9503 +++ b/arch/sparc/kernel/Makefile
9504 @@ -4,7 +4,7 @@
9505 #
9506
9507 asflags-y := -ansi
9508 -ccflags-y := -Werror
9509 +#ccflags-y := -Werror
9510
9511 extra-y := head_$(BITS).o
9512
9513 diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
9514 index fdd819d..5af08c8 100644
9515 --- a/arch/sparc/kernel/process_32.c
9516 +++ b/arch/sparc/kernel/process_32.c
9517 @@ -116,14 +116,14 @@ void show_regs(struct pt_regs *r)
9518
9519 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
9520 r->psr, r->pc, r->npc, r->y, print_tainted());
9521 - printk("PC: <%pS>\n", (void *) r->pc);
9522 + printk("PC: <%pA>\n", (void *) r->pc);
9523 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
9524 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
9525 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
9526 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
9527 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
9528 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
9529 - printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
9530 + printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
9531
9532 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
9533 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
9534 @@ -160,7 +160,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
9535 rw = (struct reg_window32 *) fp;
9536 pc = rw->ins[7];
9537 printk("[%08lx : ", pc);
9538 - printk("%pS ] ", (void *) pc);
9539 + printk("%pA ] ", (void *) pc);
9540 fp = rw->ins[6];
9541 } while (++count < 16);
9542 printk("\n");
9543 diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
9544 index baebab2..9cd13b1 100644
9545 --- a/arch/sparc/kernel/process_64.c
9546 +++ b/arch/sparc/kernel/process_64.c
9547 @@ -158,7 +158,7 @@ static void show_regwindow(struct pt_regs *regs)
9548 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
9549 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
9550 if (regs->tstate & TSTATE_PRIV)
9551 - printk("I7: <%pS>\n", (void *) rwk->ins[7]);
9552 + printk("I7: <%pA>\n", (void *) rwk->ins[7]);
9553 }
9554
9555 void show_regs(struct pt_regs *regs)
9556 @@ -167,7 +167,7 @@ void show_regs(struct pt_regs *regs)
9557
9558 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
9559 regs->tpc, regs->tnpc, regs->y, print_tainted());
9560 - printk("TPC: <%pS>\n", (void *) regs->tpc);
9561 + printk("TPC: <%pA>\n", (void *) regs->tpc);
9562 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
9563 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
9564 regs->u_regs[3]);
9565 @@ -180,7 +180,7 @@ void show_regs(struct pt_regs *regs)
9566 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
9567 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
9568 regs->u_regs[15]);
9569 - printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
9570 + printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
9571 show_regwindow(regs);
9572 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
9573 }
9574 @@ -269,7 +269,7 @@ void arch_trigger_all_cpu_backtrace(void)
9575 ((tp && tp->task) ? tp->task->pid : -1));
9576
9577 if (gp->tstate & TSTATE_PRIV) {
9578 - printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
9579 + printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
9580 (void *) gp->tpc,
9581 (void *) gp->o7,
9582 (void *) gp->i7,
9583 diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
9584 index 79cc0d1..ec62734 100644
9585 --- a/arch/sparc/kernel/prom_common.c
9586 +++ b/arch/sparc/kernel/prom_common.c
9587 @@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
9588
9589 unsigned int prom_early_allocated __initdata;
9590
9591 -static struct of_pdt_ops prom_sparc_ops __initdata = {
9592 +static struct of_pdt_ops prom_sparc_ops __initconst = {
9593 .nextprop = prom_common_nextprop,
9594 .getproplen = prom_getproplen,
9595 .getproperty = prom_getproperty,
9596 diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
9597 index 773c1f2..a8bdd87 100644
9598 --- a/arch/sparc/kernel/ptrace_64.c
9599 +++ b/arch/sparc/kernel/ptrace_64.c
9600 @@ -1059,6 +1059,10 @@ long arch_ptrace(struct task_struct *child, long request,
9601 return ret;
9602 }
9603
9604 +#ifdef CONFIG_GRKERNSEC_SETXID
9605 +extern void gr_delayed_cred_worker(void);
9606 +#endif
9607 +
9608 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
9609 {
9610 int ret = 0;
9611 @@ -1066,6 +1070,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
9612 /* do the secure computing check first */
9613 secure_computing_strict(regs->u_regs[UREG_G1]);
9614
9615 +#ifdef CONFIG_GRKERNSEC_SETXID
9616 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9617 + gr_delayed_cred_worker();
9618 +#endif
9619 +
9620 if (test_thread_flag(TIF_SYSCALL_TRACE))
9621 ret = tracehook_report_syscall_entry(regs);
9622
9623 @@ -1086,6 +1095,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
9624
9625 asmlinkage void syscall_trace_leave(struct pt_regs *regs)
9626 {
9627 +#ifdef CONFIG_GRKERNSEC_SETXID
9628 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9629 + gr_delayed_cred_worker();
9630 +#endif
9631 +
9632 audit_syscall_exit(regs);
9633
9634 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9635 diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
9636 index e142545..fd29654 100644
9637 --- a/arch/sparc/kernel/smp_64.c
9638 +++ b/arch/sparc/kernel/smp_64.c
9639 @@ -869,8 +869,8 @@ extern unsigned long xcall_flush_dcache_page_cheetah;
9640 extern unsigned long xcall_flush_dcache_page_spitfire;
9641
9642 #ifdef CONFIG_DEBUG_DCFLUSH
9643 -extern atomic_t dcpage_flushes;
9644 -extern atomic_t dcpage_flushes_xcall;
9645 +extern atomic_unchecked_t dcpage_flushes;
9646 +extern atomic_unchecked_t dcpage_flushes_xcall;
9647 #endif
9648
9649 static inline void __local_flush_dcache_page(struct page *page)
9650 @@ -894,7 +894,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
9651 return;
9652
9653 #ifdef CONFIG_DEBUG_DCFLUSH
9654 - atomic_inc(&dcpage_flushes);
9655 + atomic_inc_unchecked(&dcpage_flushes);
9656 #endif
9657
9658 this_cpu = get_cpu();
9659 @@ -918,7 +918,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
9660 xcall_deliver(data0, __pa(pg_addr),
9661 (u64) pg_addr, cpumask_of(cpu));
9662 #ifdef CONFIG_DEBUG_DCFLUSH
9663 - atomic_inc(&dcpage_flushes_xcall);
9664 + atomic_inc_unchecked(&dcpage_flushes_xcall);
9665 #endif
9666 }
9667 }
9668 @@ -937,7 +937,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
9669 preempt_disable();
9670
9671 #ifdef CONFIG_DEBUG_DCFLUSH
9672 - atomic_inc(&dcpage_flushes);
9673 + atomic_inc_unchecked(&dcpage_flushes);
9674 #endif
9675 data0 = 0;
9676 pg_addr = page_address(page);
9677 @@ -954,7 +954,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
9678 xcall_deliver(data0, __pa(pg_addr),
9679 (u64) pg_addr, cpu_online_mask);
9680 #ifdef CONFIG_DEBUG_DCFLUSH
9681 - atomic_inc(&dcpage_flushes_xcall);
9682 + atomic_inc_unchecked(&dcpage_flushes_xcall);
9683 #endif
9684 }
9685 __local_flush_dcache_page(page);
9686 diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
9687 index 3a8d184..49498a8 100644
9688 --- a/arch/sparc/kernel/sys_sparc_32.c
9689 +++ b/arch/sparc/kernel/sys_sparc_32.c
9690 @@ -52,7 +52,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
9691 if (len > TASK_SIZE - PAGE_SIZE)
9692 return -ENOMEM;
9693 if (!addr)
9694 - addr = TASK_UNMAPPED_BASE;
9695 + addr = current->mm->mmap_base;
9696
9697 info.flags = 0;
9698 info.length = len;
9699 diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
9700 index 51561b8..8256764 100644
9701 --- a/arch/sparc/kernel/sys_sparc_64.c
9702 +++ b/arch/sparc/kernel/sys_sparc_64.c
9703 @@ -90,13 +90,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
9704 struct vm_area_struct * vma;
9705 unsigned long task_size = TASK_SIZE;
9706 int do_color_align;
9707 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9708 struct vm_unmapped_area_info info;
9709
9710 if (flags & MAP_FIXED) {
9711 /* We do not accept a shared mapping if it would violate
9712 * cache aliasing constraints.
9713 */
9714 - if ((flags & MAP_SHARED) &&
9715 + if ((filp || (flags & MAP_SHARED)) &&
9716 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
9717 return -EINVAL;
9718 return addr;
9719 @@ -111,6 +112,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
9720 if (filp || (flags & MAP_SHARED))
9721 do_color_align = 1;
9722
9723 +#ifdef CONFIG_PAX_RANDMMAP
9724 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9725 +#endif
9726 +
9727 if (addr) {
9728 if (do_color_align)
9729 addr = COLOR_ALIGN(addr, pgoff);
9730 @@ -118,22 +123,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
9731 addr = PAGE_ALIGN(addr);
9732
9733 vma = find_vma(mm, addr);
9734 - if (task_size - len >= addr &&
9735 - (!vma || addr + len <= vma->vm_start))
9736 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9737 return addr;
9738 }
9739
9740 info.flags = 0;
9741 info.length = len;
9742 - info.low_limit = TASK_UNMAPPED_BASE;
9743 + info.low_limit = mm->mmap_base;
9744 info.high_limit = min(task_size, VA_EXCLUDE_START);
9745 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
9746 info.align_offset = pgoff << PAGE_SHIFT;
9747 + info.threadstack_offset = offset;
9748 addr = vm_unmapped_area(&info);
9749
9750 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
9751 VM_BUG_ON(addr != -ENOMEM);
9752 info.low_limit = VA_EXCLUDE_END;
9753 +
9754 +#ifdef CONFIG_PAX_RANDMMAP
9755 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9756 + info.low_limit += mm->delta_mmap;
9757 +#endif
9758 +
9759 info.high_limit = task_size;
9760 addr = vm_unmapped_area(&info);
9761 }
9762 @@ -151,6 +162,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9763 unsigned long task_size = STACK_TOP32;
9764 unsigned long addr = addr0;
9765 int do_color_align;
9766 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9767 struct vm_unmapped_area_info info;
9768
9769 /* This should only ever run for 32-bit processes. */
9770 @@ -160,7 +172,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9771 /* We do not accept a shared mapping if it would violate
9772 * cache aliasing constraints.
9773 */
9774 - if ((flags & MAP_SHARED) &&
9775 + if ((filp || (flags & MAP_SHARED)) &&
9776 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
9777 return -EINVAL;
9778 return addr;
9779 @@ -173,6 +185,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9780 if (filp || (flags & MAP_SHARED))
9781 do_color_align = 1;
9782
9783 +#ifdef CONFIG_PAX_RANDMMAP
9784 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9785 +#endif
9786 +
9787 /* requesting a specific address */
9788 if (addr) {
9789 if (do_color_align)
9790 @@ -181,8 +197,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9791 addr = PAGE_ALIGN(addr);
9792
9793 vma = find_vma(mm, addr);
9794 - if (task_size - len >= addr &&
9795 - (!vma || addr + len <= vma->vm_start))
9796 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9797 return addr;
9798 }
9799
9800 @@ -192,6 +207,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9801 info.high_limit = mm->mmap_base;
9802 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
9803 info.align_offset = pgoff << PAGE_SHIFT;
9804 + info.threadstack_offset = offset;
9805 addr = vm_unmapped_area(&info);
9806
9807 /*
9808 @@ -204,6 +220,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9809 VM_BUG_ON(addr != -ENOMEM);
9810 info.flags = 0;
9811 info.low_limit = TASK_UNMAPPED_BASE;
9812 +
9813 +#ifdef CONFIG_PAX_RANDMMAP
9814 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9815 + info.low_limit += mm->delta_mmap;
9816 +#endif
9817 +
9818 info.high_limit = STACK_TOP32;
9819 addr = vm_unmapped_area(&info);
9820 }
9821 @@ -260,10 +282,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
9822 EXPORT_SYMBOL(get_fb_unmapped_area);
9823
9824 /* Essentially the same as PowerPC. */
9825 -static unsigned long mmap_rnd(void)
9826 +static unsigned long mmap_rnd(struct mm_struct *mm)
9827 {
9828 unsigned long rnd = 0UL;
9829
9830 +#ifdef CONFIG_PAX_RANDMMAP
9831 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9832 +#endif
9833 +
9834 if (current->flags & PF_RANDOMIZE) {
9835 unsigned long val = get_random_int();
9836 if (test_thread_flag(TIF_32BIT))
9837 @@ -276,7 +302,7 @@ static unsigned long mmap_rnd(void)
9838
9839 void arch_pick_mmap_layout(struct mm_struct *mm)
9840 {
9841 - unsigned long random_factor = mmap_rnd();
9842 + unsigned long random_factor = mmap_rnd(mm);
9843 unsigned long gap;
9844
9845 /*
9846 @@ -289,6 +315,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9847 gap == RLIM_INFINITY ||
9848 sysctl_legacy_va_layout) {
9849 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
9850 +
9851 +#ifdef CONFIG_PAX_RANDMMAP
9852 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9853 + mm->mmap_base += mm->delta_mmap;
9854 +#endif
9855 +
9856 mm->get_unmapped_area = arch_get_unmapped_area;
9857 } else {
9858 /* We know it's 32-bit */
9859 @@ -300,6 +332,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9860 gap = (task_size / 6 * 5);
9861
9862 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
9863 +
9864 +#ifdef CONFIG_PAX_RANDMMAP
9865 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9866 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9867 +#endif
9868 +
9869 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9870 }
9871 }
9872 diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
9873 index d950197..192f9d8 100644
9874 --- a/arch/sparc/kernel/syscalls.S
9875 +++ b/arch/sparc/kernel/syscalls.S
9876 @@ -52,7 +52,7 @@ sys32_rt_sigreturn:
9877 #endif
9878 .align 32
9879 1: ldx [%g6 + TI_FLAGS], %l5
9880 - andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
9881 + andcc %l5, _TIF_WORK_SYSCALL, %g0
9882 be,pt %icc, rtrap
9883 nop
9884 call syscall_trace_leave
9885 @@ -184,7 +184,7 @@ linux_sparc_syscall32:
9886
9887 srl %i3, 0, %o3 ! IEU0
9888 srl %i2, 0, %o2 ! IEU0 Group
9889 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
9890 + andcc %l0, _TIF_WORK_SYSCALL, %g0
9891 bne,pn %icc, linux_syscall_trace32 ! CTI
9892 mov %i0, %l5 ! IEU1
9893 5: call %l7 ! CTI Group brk forced
9894 @@ -207,7 +207,7 @@ linux_sparc_syscall:
9895
9896 mov %i3, %o3 ! IEU1
9897 mov %i4, %o4 ! IEU0 Group
9898 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
9899 + andcc %l0, _TIF_WORK_SYSCALL, %g0
9900 bne,pn %icc, linux_syscall_trace ! CTI Group
9901 mov %i0, %l5 ! IEU0
9902 2: call %l7 ! CTI Group brk forced
9903 @@ -223,7 +223,7 @@ ret_sys_call:
9904
9905 cmp %o0, -ERESTART_RESTARTBLOCK
9906 bgeu,pn %xcc, 1f
9907 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
9908 + andcc %l0, _TIF_WORK_SYSCALL, %g0
9909 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
9910
9911 2:
9912 diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
9913 index 6629829..036032d 100644
9914 --- a/arch/sparc/kernel/traps_32.c
9915 +++ b/arch/sparc/kernel/traps_32.c
9916 @@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
9917 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
9918 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
9919
9920 +extern void gr_handle_kernel_exploit(void);
9921 +
9922 void die_if_kernel(char *str, struct pt_regs *regs)
9923 {
9924 static int die_counter;
9925 @@ -76,15 +78,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
9926 count++ < 30 &&
9927 (((unsigned long) rw) >= PAGE_OFFSET) &&
9928 !(((unsigned long) rw) & 0x7)) {
9929 - printk("Caller[%08lx]: %pS\n", rw->ins[7],
9930 + printk("Caller[%08lx]: %pA\n", rw->ins[7],
9931 (void *) rw->ins[7]);
9932 rw = (struct reg_window32 *)rw->ins[6];
9933 }
9934 }
9935 printk("Instruction DUMP:");
9936 instruction_dump ((unsigned long *) regs->pc);
9937 - if(regs->psr & PSR_PS)
9938 + if(regs->psr & PSR_PS) {
9939 + gr_handle_kernel_exploit();
9940 do_exit(SIGKILL);
9941 + }
9942 do_exit(SIGSEGV);
9943 }
9944
9945 diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
9946 index b3f833a..f485f80 100644
9947 --- a/arch/sparc/kernel/traps_64.c
9948 +++ b/arch/sparc/kernel/traps_64.c
9949 @@ -76,7 +76,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
9950 i + 1,
9951 p->trapstack[i].tstate, p->trapstack[i].tpc,
9952 p->trapstack[i].tnpc, p->trapstack[i].tt);
9953 - printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
9954 + printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
9955 }
9956 }
9957
9958 @@ -96,6 +96,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
9959
9960 lvl -= 0x100;
9961 if (regs->tstate & TSTATE_PRIV) {
9962 +
9963 +#ifdef CONFIG_PAX_REFCOUNT
9964 + if (lvl == 6)
9965 + pax_report_refcount_overflow(regs);
9966 +#endif
9967 +
9968 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
9969 die_if_kernel(buffer, regs);
9970 }
9971 @@ -114,11 +120,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
9972 void bad_trap_tl1(struct pt_regs *regs, long lvl)
9973 {
9974 char buffer[32];
9975 -
9976 +
9977 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
9978 0, lvl, SIGTRAP) == NOTIFY_STOP)
9979 return;
9980
9981 +#ifdef CONFIG_PAX_REFCOUNT
9982 + if (lvl == 6)
9983 + pax_report_refcount_overflow(regs);
9984 +#endif
9985 +
9986 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
9987
9988 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
9989 @@ -1142,7 +1153,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
9990 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
9991 printk("%s" "ERROR(%d): ",
9992 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
9993 - printk("TPC<%pS>\n", (void *) regs->tpc);
9994 + printk("TPC<%pA>\n", (void *) regs->tpc);
9995 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
9996 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
9997 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
9998 @@ -1749,7 +1760,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
9999 smp_processor_id(),
10000 (type & 0x1) ? 'I' : 'D',
10001 regs->tpc);
10002 - printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
10003 + printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
10004 panic("Irrecoverable Cheetah+ parity error.");
10005 }
10006
10007 @@ -1757,7 +1768,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10008 smp_processor_id(),
10009 (type & 0x1) ? 'I' : 'D',
10010 regs->tpc);
10011 - printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
10012 + printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
10013 }
10014
10015 struct sun4v_error_entry {
10016 @@ -1830,8 +1841,8 @@ struct sun4v_error_entry {
10017 /*0x38*/u64 reserved_5;
10018 };
10019
10020 -static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
10021 -static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
10022 +static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
10023 +static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
10024
10025 static const char *sun4v_err_type_to_str(u8 type)
10026 {
10027 @@ -1923,7 +1934,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
10028 }
10029
10030 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
10031 - int cpu, const char *pfx, atomic_t *ocnt)
10032 + int cpu, const char *pfx, atomic_unchecked_t *ocnt)
10033 {
10034 u64 *raw_ptr = (u64 *) ent;
10035 u32 attrs;
10036 @@ -1981,8 +1992,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
10037
10038 show_regs(regs);
10039
10040 - if ((cnt = atomic_read(ocnt)) != 0) {
10041 - atomic_set(ocnt, 0);
10042 + if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
10043 + atomic_set_unchecked(ocnt, 0);
10044 wmb();
10045 printk("%s: Queue overflowed %d times.\n",
10046 pfx, cnt);
10047 @@ -2036,7 +2047,7 @@ void sun4v_resum_error(struct pt_regs *regs, unsigned long offset)
10048 */
10049 void sun4v_resum_overflow(struct pt_regs *regs)
10050 {
10051 - atomic_inc(&sun4v_resum_oflow_cnt);
10052 + atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
10053 }
10054
10055 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
10056 @@ -2089,7 +2100,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
10057 /* XXX Actually even this can make not that much sense. Perhaps
10058 * XXX we should just pull the plug and panic directly from here?
10059 */
10060 - atomic_inc(&sun4v_nonresum_oflow_cnt);
10061 + atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
10062 }
10063
10064 unsigned long sun4v_err_itlb_vaddr;
10065 @@ -2104,9 +2115,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
10066
10067 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
10068 regs->tpc, tl);
10069 - printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
10070 + printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
10071 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
10072 - printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
10073 + printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
10074 (void *) regs->u_regs[UREG_I7]);
10075 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
10076 "pte[%lx] error[%lx]\n",
10077 @@ -2128,9 +2139,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
10078
10079 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
10080 regs->tpc, tl);
10081 - printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
10082 + printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
10083 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
10084 - printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
10085 + printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
10086 (void *) regs->u_regs[UREG_I7]);
10087 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
10088 "pte[%lx] error[%lx]\n",
10089 @@ -2336,13 +2347,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10090 fp = (unsigned long)sf->fp + STACK_BIAS;
10091 }
10092
10093 - printk(" [%016lx] %pS\n", pc, (void *) pc);
10094 + printk(" [%016lx] %pA\n", pc, (void *) pc);
10095 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
10096 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
10097 int index = tsk->curr_ret_stack;
10098 if (tsk->ret_stack && index >= graph) {
10099 pc = tsk->ret_stack[index - graph].ret;
10100 - printk(" [%016lx] %pS\n", pc, (void *) pc);
10101 + printk(" [%016lx] %pA\n", pc, (void *) pc);
10102 graph++;
10103 }
10104 }
10105 @@ -2360,6 +2371,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
10106 return (struct reg_window *) (fp + STACK_BIAS);
10107 }
10108
10109 +extern void gr_handle_kernel_exploit(void);
10110 +
10111 void die_if_kernel(char *str, struct pt_regs *regs)
10112 {
10113 static int die_counter;
10114 @@ -2388,7 +2401,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
10115 while (rw &&
10116 count++ < 30 &&
10117 kstack_valid(tp, (unsigned long) rw)) {
10118 - printk("Caller[%016lx]: %pS\n", rw->ins[7],
10119 + printk("Caller[%016lx]: %pA\n", rw->ins[7],
10120 (void *) rw->ins[7]);
10121
10122 rw = kernel_stack_up(rw);
10123 @@ -2401,8 +2414,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
10124 }
10125 user_instruction_dump ((unsigned int __user *) regs->tpc);
10126 }
10127 - if (regs->tstate & TSTATE_PRIV)
10128 + if (regs->tstate & TSTATE_PRIV) {
10129 + gr_handle_kernel_exploit();
10130 do_exit(SIGKILL);
10131 + }
10132 do_exit(SIGSEGV);
10133 }
10134 EXPORT_SYMBOL(die_if_kernel);
10135 diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
10136 index 8201c25e..072a2a7 100644
10137 --- a/arch/sparc/kernel/unaligned_64.c
10138 +++ b/arch/sparc/kernel/unaligned_64.c
10139 @@ -286,7 +286,7 @@ static void log_unaligned(struct pt_regs *regs)
10140 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
10141
10142 if (__ratelimit(&ratelimit)) {
10143 - printk("Kernel unaligned access at TPC[%lx] %pS\n",
10144 + printk("Kernel unaligned access at TPC[%lx] %pA\n",
10145 regs->tpc, (void *) regs->tpc);
10146 }
10147 }
10148 diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
10149 index dbe119b..089c7c1 100644
10150 --- a/arch/sparc/lib/Makefile
10151 +++ b/arch/sparc/lib/Makefile
10152 @@ -2,7 +2,7 @@
10153 #
10154
10155 asflags-y := -ansi -DST_DIV0=0x02
10156 -ccflags-y := -Werror
10157 +#ccflags-y := -Werror
10158
10159 lib-$(CONFIG_SPARC32) += ashrdi3.o
10160 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
10161 diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
10162 index 85c233d..68500e0 100644
10163 --- a/arch/sparc/lib/atomic_64.S
10164 +++ b/arch/sparc/lib/atomic_64.S
10165 @@ -17,7 +17,12 @@
10166 ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
10167 BACKOFF_SETUP(%o2)
10168 1: lduw [%o1], %g1
10169 - add %g1, %o0, %g7
10170 + addcc %g1, %o0, %g7
10171 +
10172 +#ifdef CONFIG_PAX_REFCOUNT
10173 + tvs %icc, 6
10174 +#endif
10175 +
10176 cas [%o1], %g1, %g7
10177 cmp %g1, %g7
10178 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10179 @@ -27,10 +32,28 @@ ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
10180 2: BACKOFF_SPIN(%o2, %o3, 1b)
10181 ENDPROC(atomic_add)
10182
10183 +ENTRY(atomic_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
10184 + BACKOFF_SETUP(%o2)
10185 +1: lduw [%o1], %g1
10186 + add %g1, %o0, %g7
10187 + cas [%o1], %g1, %g7
10188 + cmp %g1, %g7
10189 + bne,pn %icc, 2f
10190 + nop
10191 + retl
10192 + nop
10193 +2: BACKOFF_SPIN(%o2, %o3, 1b)
10194 +ENDPROC(atomic_add_unchecked)
10195 +
10196 ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
10197 BACKOFF_SETUP(%o2)
10198 1: lduw [%o1], %g1
10199 - sub %g1, %o0, %g7
10200 + subcc %g1, %o0, %g7
10201 +
10202 +#ifdef CONFIG_PAX_REFCOUNT
10203 + tvs %icc, 6
10204 +#endif
10205 +
10206 cas [%o1], %g1, %g7
10207 cmp %g1, %g7
10208 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10209 @@ -40,10 +63,28 @@ ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
10210 2: BACKOFF_SPIN(%o2, %o3, 1b)
10211 ENDPROC(atomic_sub)
10212
10213 +ENTRY(atomic_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
10214 + BACKOFF_SETUP(%o2)
10215 +1: lduw [%o1], %g1
10216 + sub %g1, %o0, %g7
10217 + cas [%o1], %g1, %g7
10218 + cmp %g1, %g7
10219 + bne,pn %icc, 2f
10220 + nop
10221 + retl
10222 + nop
10223 +2: BACKOFF_SPIN(%o2, %o3, 1b)
10224 +ENDPROC(atomic_sub_unchecked)
10225 +
10226 ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
10227 BACKOFF_SETUP(%o2)
10228 1: lduw [%o1], %g1
10229 - add %g1, %o0, %g7
10230 + addcc %g1, %o0, %g7
10231 +
10232 +#ifdef CONFIG_PAX_REFCOUNT
10233 + tvs %icc, 6
10234 +#endif
10235 +
10236 cas [%o1], %g1, %g7
10237 cmp %g1, %g7
10238 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10239 @@ -53,10 +94,29 @@ ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
10240 2: BACKOFF_SPIN(%o2, %o3, 1b)
10241 ENDPROC(atomic_add_ret)
10242
10243 +ENTRY(atomic_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
10244 + BACKOFF_SETUP(%o2)
10245 +1: lduw [%o1], %g1
10246 + addcc %g1, %o0, %g7
10247 + cas [%o1], %g1, %g7
10248 + cmp %g1, %g7
10249 + bne,pn %icc, 2f
10250 + add %g7, %o0, %g7
10251 + sra %g7, 0, %o0
10252 + retl
10253 + nop
10254 +2: BACKOFF_SPIN(%o2, %o3, 1b)
10255 +ENDPROC(atomic_add_ret_unchecked)
10256 +
10257 ENTRY(atomic_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
10258 BACKOFF_SETUP(%o2)
10259 1: lduw [%o1], %g1
10260 - sub %g1, %o0, %g7
10261 + subcc %g1, %o0, %g7
10262 +
10263 +#ifdef CONFIG_PAX_REFCOUNT
10264 + tvs %icc, 6
10265 +#endif
10266 +
10267 cas [%o1], %g1, %g7
10268 cmp %g1, %g7
10269 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10270 @@ -69,7 +129,12 @@ ENDPROC(atomic_sub_ret)
10271 ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
10272 BACKOFF_SETUP(%o2)
10273 1: ldx [%o1], %g1
10274 - add %g1, %o0, %g7
10275 + addcc %g1, %o0, %g7
10276 +
10277 +#ifdef CONFIG_PAX_REFCOUNT
10278 + tvs %xcc, 6
10279 +#endif
10280 +
10281 casx [%o1], %g1, %g7
10282 cmp %g1, %g7
10283 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
10284 @@ -79,10 +144,28 @@ ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
10285 2: BACKOFF_SPIN(%o2, %o3, 1b)
10286 ENDPROC(atomic64_add)
10287
10288 +ENTRY(atomic64_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
10289 + BACKOFF_SETUP(%o2)
10290 +1: ldx [%o1], %g1
10291 + addcc %g1, %o0, %g7
10292 + casx [%o1], %g1, %g7
10293 + cmp %g1, %g7
10294 + bne,pn %xcc, 2f
10295 + nop
10296 + retl
10297 + nop
10298 +2: BACKOFF_SPIN(%o2, %o3, 1b)
10299 +ENDPROC(atomic64_add_unchecked)
10300 +
10301 ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
10302 BACKOFF_SETUP(%o2)
10303 1: ldx [%o1], %g1
10304 - sub %g1, %o0, %g7
10305 + subcc %g1, %o0, %g7
10306 +
10307 +#ifdef CONFIG_PAX_REFCOUNT
10308 + tvs %xcc, 6
10309 +#endif
10310 +
10311 casx [%o1], %g1, %g7
10312 cmp %g1, %g7
10313 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
10314 @@ -92,10 +175,28 @@ ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
10315 2: BACKOFF_SPIN(%o2, %o3, 1b)
10316 ENDPROC(atomic64_sub)
10317
10318 +ENTRY(atomic64_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
10319 + BACKOFF_SETUP(%o2)
10320 +1: ldx [%o1], %g1
10321 + subcc %g1, %o0, %g7
10322 + casx [%o1], %g1, %g7
10323 + cmp %g1, %g7
10324 + bne,pn %xcc, 2f
10325 + nop
10326 + retl
10327 + nop
10328 +2: BACKOFF_SPIN(%o2, %o3, 1b)
10329 +ENDPROC(atomic64_sub_unchecked)
10330 +
10331 ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
10332 BACKOFF_SETUP(%o2)
10333 1: ldx [%o1], %g1
10334 - add %g1, %o0, %g7
10335 + addcc %g1, %o0, %g7
10336 +
10337 +#ifdef CONFIG_PAX_REFCOUNT
10338 + tvs %xcc, 6
10339 +#endif
10340 +
10341 casx [%o1], %g1, %g7
10342 cmp %g1, %g7
10343 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
10344 @@ -105,10 +206,29 @@ ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
10345 2: BACKOFF_SPIN(%o2, %o3, 1b)
10346 ENDPROC(atomic64_add_ret)
10347
10348 +ENTRY(atomic64_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
10349 + BACKOFF_SETUP(%o2)
10350 +1: ldx [%o1], %g1
10351 + addcc %g1, %o0, %g7
10352 + casx [%o1], %g1, %g7
10353 + cmp %g1, %g7
10354 + bne,pn %xcc, 2f
10355 + add %g7, %o0, %g7
10356 + mov %g7, %o0
10357 + retl
10358 + nop
10359 +2: BACKOFF_SPIN(%o2, %o3, 1b)
10360 +ENDPROC(atomic64_add_ret_unchecked)
10361 +
10362 ENTRY(atomic64_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
10363 BACKOFF_SETUP(%o2)
10364 1: ldx [%o1], %g1
10365 - sub %g1, %o0, %g7
10366 + subcc %g1, %o0, %g7
10367 +
10368 +#ifdef CONFIG_PAX_REFCOUNT
10369 + tvs %xcc, 6
10370 +#endif
10371 +
10372 casx [%o1], %g1, %g7
10373 cmp %g1, %g7
10374 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
10375 diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
10376 index 323335b..ed85ea2 100644
10377 --- a/arch/sparc/lib/ksyms.c
10378 +++ b/arch/sparc/lib/ksyms.c
10379 @@ -100,12 +100,18 @@ EXPORT_SYMBOL(__clear_user);
10380
10381 /* Atomic counter implementation. */
10382 EXPORT_SYMBOL(atomic_add);
10383 +EXPORT_SYMBOL(atomic_add_unchecked);
10384 EXPORT_SYMBOL(atomic_add_ret);
10385 +EXPORT_SYMBOL(atomic_add_ret_unchecked);
10386 EXPORT_SYMBOL(atomic_sub);
10387 +EXPORT_SYMBOL(atomic_sub_unchecked);
10388 EXPORT_SYMBOL(atomic_sub_ret);
10389 EXPORT_SYMBOL(atomic64_add);
10390 +EXPORT_SYMBOL(atomic64_add_unchecked);
10391 EXPORT_SYMBOL(atomic64_add_ret);
10392 +EXPORT_SYMBOL(atomic64_add_ret_unchecked);
10393 EXPORT_SYMBOL(atomic64_sub);
10394 +EXPORT_SYMBOL(atomic64_sub_unchecked);
10395 EXPORT_SYMBOL(atomic64_sub_ret);
10396 EXPORT_SYMBOL(atomic64_dec_if_positive);
10397
10398 diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
10399 index 30c3ecc..736f015 100644
10400 --- a/arch/sparc/mm/Makefile
10401 +++ b/arch/sparc/mm/Makefile
10402 @@ -2,7 +2,7 @@
10403 #
10404
10405 asflags-y := -ansi
10406 -ccflags-y := -Werror
10407 +#ccflags-y := -Werror
10408
10409 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
10410 obj-y += fault_$(BITS).o
10411 diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
10412 index 59dbd46..1dd7f5e 100644
10413 --- a/arch/sparc/mm/fault_32.c
10414 +++ b/arch/sparc/mm/fault_32.c
10415 @@ -21,6 +21,9 @@
10416 #include <linux/perf_event.h>
10417 #include <linux/interrupt.h>
10418 #include <linux/kdebug.h>
10419 +#include <linux/slab.h>
10420 +#include <linux/pagemap.h>
10421 +#include <linux/compiler.h>
10422
10423 #include <asm/page.h>
10424 #include <asm/pgtable.h>
10425 @@ -159,6 +162,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
10426 return safe_compute_effective_address(regs, insn);
10427 }
10428
10429 +#ifdef CONFIG_PAX_PAGEEXEC
10430 +#ifdef CONFIG_PAX_DLRESOLVE
10431 +static void pax_emuplt_close(struct vm_area_struct *vma)
10432 +{
10433 + vma->vm_mm->call_dl_resolve = 0UL;
10434 +}
10435 +
10436 +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
10437 +{
10438 + unsigned int *kaddr;
10439 +
10440 + vmf->page = alloc_page(GFP_HIGHUSER);
10441 + if (!vmf->page)
10442 + return VM_FAULT_OOM;
10443 +
10444 + kaddr = kmap(vmf->page);
10445 + memset(kaddr, 0, PAGE_SIZE);
10446 + kaddr[0] = 0x9DE3BFA8U; /* save */
10447 + flush_dcache_page(vmf->page);
10448 + kunmap(vmf->page);
10449 + return VM_FAULT_MAJOR;
10450 +}
10451 +
10452 +static const struct vm_operations_struct pax_vm_ops = {
10453 + .close = pax_emuplt_close,
10454 + .fault = pax_emuplt_fault
10455 +};
10456 +
10457 +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
10458 +{
10459 + int ret;
10460 +
10461 + INIT_LIST_HEAD(&vma->anon_vma_chain);
10462 + vma->vm_mm = current->mm;
10463 + vma->vm_start = addr;
10464 + vma->vm_end = addr + PAGE_SIZE;
10465 + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
10466 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
10467 + vma->vm_ops = &pax_vm_ops;
10468 +
10469 + ret = insert_vm_struct(current->mm, vma);
10470 + if (ret)
10471 + return ret;
10472 +
10473 + ++current->mm->total_vm;
10474 + return 0;
10475 +}
10476 +#endif
10477 +
10478 +/*
10479 + * PaX: decide what to do with offenders (regs->pc = fault address)
10480 + *
10481 + * returns 1 when task should be killed
10482 + * 2 when patched PLT trampoline was detected
10483 + * 3 when unpatched PLT trampoline was detected
10484 + */
10485 +static int pax_handle_fetch_fault(struct pt_regs *regs)
10486 +{
10487 +
10488 +#ifdef CONFIG_PAX_EMUPLT
10489 + int err;
10490 +
10491 + do { /* PaX: patched PLT emulation #1 */
10492 + unsigned int sethi1, sethi2, jmpl;
10493 +
10494 + err = get_user(sethi1, (unsigned int *)regs->pc);
10495 + err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
10496 + err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
10497 +
10498 + if (err)
10499 + break;
10500 +
10501 + if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
10502 + (sethi2 & 0xFFC00000U) == 0x03000000U &&
10503 + (jmpl & 0xFFFFE000U) == 0x81C06000U)
10504 + {
10505 + unsigned int addr;
10506 +
10507 + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
10508 + addr = regs->u_regs[UREG_G1];
10509 + addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
10510 + regs->pc = addr;
10511 + regs->npc = addr+4;
10512 + return 2;
10513 + }
10514 + } while (0);
10515 +
10516 + do { /* PaX: patched PLT emulation #2 */
10517 + unsigned int ba;
10518 +
10519 + err = get_user(ba, (unsigned int *)regs->pc);
10520 +
10521 + if (err)
10522 + break;
10523 +
10524 + if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
10525 + unsigned int addr;
10526 +
10527 + if ((ba & 0xFFC00000U) == 0x30800000U)
10528 + addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
10529 + else
10530 + addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
10531 + regs->pc = addr;
10532 + regs->npc = addr+4;
10533 + return 2;
10534 + }
10535 + } while (0);
10536 +
10537 + do { /* PaX: patched PLT emulation #3 */
10538 + unsigned int sethi, bajmpl, nop;
10539 +
10540 + err = get_user(sethi, (unsigned int *)regs->pc);
10541 + err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
10542 + err |= get_user(nop, (unsigned int *)(regs->pc+8));
10543 +
10544 + if (err)
10545 + break;
10546 +
10547 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
10548 + ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
10549 + nop == 0x01000000U)
10550 + {
10551 + unsigned int addr;
10552 +
10553 + addr = (sethi & 0x003FFFFFU) << 10;
10554 + regs->u_regs[UREG_G1] = addr;
10555 + if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
10556 + addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
10557 + else
10558 + addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
10559 + regs->pc = addr;
10560 + regs->npc = addr+4;
10561 + return 2;
10562 + }
10563 + } while (0);
10564 +
10565 + do { /* PaX: unpatched PLT emulation step 1 */
10566 + unsigned int sethi, ba, nop;
10567 +
10568 + err = get_user(sethi, (unsigned int *)regs->pc);
10569 + err |= get_user(ba, (unsigned int *)(regs->pc+4));
10570 + err |= get_user(nop, (unsigned int *)(regs->pc+8));
10571 +
10572 + if (err)
10573 + break;
10574 +
10575 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
10576 + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
10577 + nop == 0x01000000U)
10578 + {
10579 + unsigned int addr, save, call;
10580 +
10581 + if ((ba & 0xFFC00000U) == 0x30800000U)
10582 + addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
10583 + else
10584 + addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
10585 +
10586 + err = get_user(save, (unsigned int *)addr);
10587 + err |= get_user(call, (unsigned int *)(addr+4));
10588 + err |= get_user(nop, (unsigned int *)(addr+8));
10589 + if (err)
10590 + break;
10591 +
10592 +#ifdef CONFIG_PAX_DLRESOLVE
10593 + if (save == 0x9DE3BFA8U &&
10594 + (call & 0xC0000000U) == 0x40000000U &&
10595 + nop == 0x01000000U)
10596 + {
10597 + struct vm_area_struct *vma;
10598 + unsigned long call_dl_resolve;
10599 +
10600 + down_read(&current->mm->mmap_sem);
10601 + call_dl_resolve = current->mm->call_dl_resolve;
10602 + up_read(&current->mm->mmap_sem);
10603 + if (likely(call_dl_resolve))
10604 + goto emulate;
10605 +
10606 + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
10607 +
10608 + down_write(&current->mm->mmap_sem);
10609 + if (current->mm->call_dl_resolve) {
10610 + call_dl_resolve = current->mm->call_dl_resolve;
10611 + up_write(&current->mm->mmap_sem);
10612 + if (vma)
10613 + kmem_cache_free(vm_area_cachep, vma);
10614 + goto emulate;
10615 + }
10616 +
10617 + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
10618 + if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
10619 + up_write(&current->mm->mmap_sem);
10620 + if (vma)
10621 + kmem_cache_free(vm_area_cachep, vma);
10622 + return 1;
10623 + }
10624 +
10625 + if (pax_insert_vma(vma, call_dl_resolve)) {
10626 + up_write(&current->mm->mmap_sem);
10627 + kmem_cache_free(vm_area_cachep, vma);
10628 + return 1;
10629 + }
10630 +
10631 + current->mm->call_dl_resolve = call_dl_resolve;
10632 + up_write(&current->mm->mmap_sem);
10633 +
10634 +emulate:
10635 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
10636 + regs->pc = call_dl_resolve;
10637 + regs->npc = addr+4;
10638 + return 3;
10639 + }
10640 +#endif
10641 +
10642 + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
10643 + if ((save & 0xFFC00000U) == 0x05000000U &&
10644 + (call & 0xFFFFE000U) == 0x85C0A000U &&
10645 + nop == 0x01000000U)
10646 + {
10647 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
10648 + regs->u_regs[UREG_G2] = addr + 4;
10649 + addr = (save & 0x003FFFFFU) << 10;
10650 + addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
10651 + regs->pc = addr;
10652 + regs->npc = addr+4;
10653 + return 3;
10654 + }
10655 + }
10656 + } while (0);
10657 +
10658 + do { /* PaX: unpatched PLT emulation step 2 */
10659 + unsigned int save, call, nop;
10660 +
10661 + err = get_user(save, (unsigned int *)(regs->pc-4));
10662 + err |= get_user(call, (unsigned int *)regs->pc);
10663 + err |= get_user(nop, (unsigned int *)(regs->pc+4));
10664 + if (err)
10665 + break;
10666 +
10667 + if (save == 0x9DE3BFA8U &&
10668 + (call & 0xC0000000U) == 0x40000000U &&
10669 + nop == 0x01000000U)
10670 + {
10671 + unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
10672 +
10673 + regs->u_regs[UREG_RETPC] = regs->pc;
10674 + regs->pc = dl_resolve;
10675 + regs->npc = dl_resolve+4;
10676 + return 3;
10677 + }
10678 + } while (0);
10679 +#endif
10680 +
10681 + return 1;
10682 +}
10683 +
10684 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
10685 +{
10686 + unsigned long i;
10687 +
10688 + printk(KERN_ERR "PAX: bytes at PC: ");
10689 + for (i = 0; i < 8; i++) {
10690 + unsigned int c;
10691 + if (get_user(c, (unsigned int *)pc+i))
10692 + printk(KERN_CONT "???????? ");
10693 + else
10694 + printk(KERN_CONT "%08x ", c);
10695 + }
10696 + printk("\n");
10697 +}
10698 +#endif
10699 +
10700 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
10701 int text_fault)
10702 {
10703 @@ -229,6 +503,24 @@ good_area:
10704 if (!(vma->vm_flags & VM_WRITE))
10705 goto bad_area;
10706 } else {
10707 +
10708 +#ifdef CONFIG_PAX_PAGEEXEC
10709 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
10710 + up_read(&mm->mmap_sem);
10711 + switch (pax_handle_fetch_fault(regs)) {
10712 +
10713 +#ifdef CONFIG_PAX_EMUPLT
10714 + case 2:
10715 + case 3:
10716 + return;
10717 +#endif
10718 +
10719 + }
10720 + pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
10721 + do_group_exit(SIGKILL);
10722 + }
10723 +#endif
10724 +
10725 /* Allow reads even for write-only mappings */
10726 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
10727 goto bad_area;
10728 diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
10729 index 2ebec26..b212598 100644
10730 --- a/arch/sparc/mm/fault_64.c
10731 +++ b/arch/sparc/mm/fault_64.c
10732 @@ -21,6 +21,9 @@
10733 #include <linux/kprobes.h>
10734 #include <linux/kdebug.h>
10735 #include <linux/percpu.h>
10736 +#include <linux/slab.h>
10737 +#include <linux/pagemap.h>
10738 +#include <linux/compiler.h>
10739
10740 #include <asm/page.h>
10741 #include <asm/pgtable.h>
10742 @@ -74,7 +77,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
10743 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
10744 regs->tpc);
10745 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
10746 - printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
10747 + printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
10748 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
10749 dump_stack();
10750 unhandled_fault(regs->tpc, current, regs);
10751 @@ -270,6 +273,466 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
10752 show_regs(regs);
10753 }
10754
10755 +#ifdef CONFIG_PAX_PAGEEXEC
10756 +#ifdef CONFIG_PAX_DLRESOLVE
10757 +static void pax_emuplt_close(struct vm_area_struct *vma)
10758 +{
10759 + vma->vm_mm->call_dl_resolve = 0UL;
10760 +}
10761 +
10762 +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
10763 +{
10764 + unsigned int *kaddr;
10765 +
10766 + vmf->page = alloc_page(GFP_HIGHUSER);
10767 + if (!vmf->page)
10768 + return VM_FAULT_OOM;
10769 +
10770 + kaddr = kmap(vmf->page);
10771 + memset(kaddr, 0, PAGE_SIZE);
10772 + kaddr[0] = 0x9DE3BFA8U; /* save */
10773 + flush_dcache_page(vmf->page);
10774 + kunmap(vmf->page);
10775 + return VM_FAULT_MAJOR;
10776 +}
10777 +
10778 +static const struct vm_operations_struct pax_vm_ops = {
10779 + .close = pax_emuplt_close,
10780 + .fault = pax_emuplt_fault
10781 +};
10782 +
10783 +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
10784 +{
10785 + int ret;
10786 +
10787 + INIT_LIST_HEAD(&vma->anon_vma_chain);
10788 + vma->vm_mm = current->mm;
10789 + vma->vm_start = addr;
10790 + vma->vm_end = addr + PAGE_SIZE;
10791 + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
10792 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
10793 + vma->vm_ops = &pax_vm_ops;
10794 +
10795 + ret = insert_vm_struct(current->mm, vma);
10796 + if (ret)
10797 + return ret;
10798 +
10799 + ++current->mm->total_vm;
10800 + return 0;
10801 +}
10802 +#endif
10803 +
10804 +/*
10805 + * PaX: decide what to do with offenders (regs->tpc = fault address)
10806 + *
10807 + * returns 1 when task should be killed
10808 + * 2 when patched PLT trampoline was detected
10809 + * 3 when unpatched PLT trampoline was detected
10810 + */
10811 +static int pax_handle_fetch_fault(struct pt_regs *regs)
10812 +{
10813 +
10814 +#ifdef CONFIG_PAX_EMUPLT
10815 + int err;
10816 +
10817 + do { /* PaX: patched PLT emulation #1 */
10818 + unsigned int sethi1, sethi2, jmpl;
10819 +
10820 + err = get_user(sethi1, (unsigned int *)regs->tpc);
10821 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
10822 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
10823 +
10824 + if (err)
10825 + break;
10826 +
10827 + if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
10828 + (sethi2 & 0xFFC00000U) == 0x03000000U &&
10829 + (jmpl & 0xFFFFE000U) == 0x81C06000U)
10830 + {
10831 + unsigned long addr;
10832 +
10833 + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
10834 + addr = regs->u_regs[UREG_G1];
10835 + addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
10836 +
10837 + if (test_thread_flag(TIF_32BIT))
10838 + addr &= 0xFFFFFFFFUL;
10839 +
10840 + regs->tpc = addr;
10841 + regs->tnpc = addr+4;
10842 + return 2;
10843 + }
10844 + } while (0);
10845 +
10846 + do { /* PaX: patched PLT emulation #2 */
10847 + unsigned int ba;
10848 +
10849 + err = get_user(ba, (unsigned int *)regs->tpc);
10850 +
10851 + if (err)
10852 + break;
10853 +
10854 + if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
10855 + unsigned long addr;
10856 +
10857 + if ((ba & 0xFFC00000U) == 0x30800000U)
10858 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
10859 + else
10860 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
10861 +
10862 + if (test_thread_flag(TIF_32BIT))
10863 + addr &= 0xFFFFFFFFUL;
10864 +
10865 + regs->tpc = addr;
10866 + regs->tnpc = addr+4;
10867 + return 2;
10868 + }
10869 + } while (0);
10870 +
10871 + do { /* PaX: patched PLT emulation #3 */
10872 + unsigned int sethi, bajmpl, nop;
10873 +
10874 + err = get_user(sethi, (unsigned int *)regs->tpc);
10875 + err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
10876 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
10877 +
10878 + if (err)
10879 + break;
10880 +
10881 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
10882 + ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
10883 + nop == 0x01000000U)
10884 + {
10885 + unsigned long addr;
10886 +
10887 + addr = (sethi & 0x003FFFFFU) << 10;
10888 + regs->u_regs[UREG_G1] = addr;
10889 + if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
10890 + addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
10891 + else
10892 + addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
10893 +
10894 + if (test_thread_flag(TIF_32BIT))
10895 + addr &= 0xFFFFFFFFUL;
10896 +
10897 + regs->tpc = addr;
10898 + regs->tnpc = addr+4;
10899 + return 2;
10900 + }
10901 + } while (0);
10902 +
10903 + do { /* PaX: patched PLT emulation #4 */
10904 + unsigned int sethi, mov1, call, mov2;
10905 +
10906 + err = get_user(sethi, (unsigned int *)regs->tpc);
10907 + err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
10908 + err |= get_user(call, (unsigned int *)(regs->tpc+8));
10909 + err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
10910 +
10911 + if (err)
10912 + break;
10913 +
10914 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
10915 + mov1 == 0x8210000FU &&
10916 + (call & 0xC0000000U) == 0x40000000U &&
10917 + mov2 == 0x9E100001U)
10918 + {
10919 + unsigned long addr;
10920 +
10921 + regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
10922 + addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
10923 +
10924 + if (test_thread_flag(TIF_32BIT))
10925 + addr &= 0xFFFFFFFFUL;
10926 +
10927 + regs->tpc = addr;
10928 + regs->tnpc = addr+4;
10929 + return 2;
10930 + }
10931 + } while (0);
10932 +
10933 + do { /* PaX: patched PLT emulation #5 */
10934 + unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
10935 +
10936 + err = get_user(sethi, (unsigned int *)regs->tpc);
10937 + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
10938 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
10939 + err |= get_user(or1, (unsigned int *)(regs->tpc+12));
10940 + err |= get_user(or2, (unsigned int *)(regs->tpc+16));
10941 + err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
10942 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
10943 + err |= get_user(nop, (unsigned int *)(regs->tpc+28));
10944 +
10945 + if (err)
10946 + break;
10947 +
10948 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
10949 + (sethi1 & 0xFFC00000U) == 0x03000000U &&
10950 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
10951 + (or1 & 0xFFFFE000U) == 0x82106000U &&
10952 + (or2 & 0xFFFFE000U) == 0x8A116000U &&
10953 + sllx == 0x83287020U &&
10954 + jmpl == 0x81C04005U &&
10955 + nop == 0x01000000U)
10956 + {
10957 + unsigned long addr;
10958 +
10959 + regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
10960 + regs->u_regs[UREG_G1] <<= 32;
10961 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
10962 + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
10963 + regs->tpc = addr;
10964 + regs->tnpc = addr+4;
10965 + return 2;
10966 + }
10967 + } while (0);
10968 +
10969 + do { /* PaX: patched PLT emulation #6 */
10970 + unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
10971 +
10972 + err = get_user(sethi, (unsigned int *)regs->tpc);
10973 + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
10974 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
10975 + err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
10976 + err |= get_user(or, (unsigned int *)(regs->tpc+16));
10977 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
10978 + err |= get_user(nop, (unsigned int *)(regs->tpc+24));
10979 +
10980 + if (err)
10981 + break;
10982 +
10983 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
10984 + (sethi1 & 0xFFC00000U) == 0x03000000U &&
10985 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
10986 + sllx == 0x83287020U &&
10987 + (or & 0xFFFFE000U) == 0x8A116000U &&
10988 + jmpl == 0x81C04005U &&
10989 + nop == 0x01000000U)
10990 + {
10991 + unsigned long addr;
10992 +
10993 + regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
10994 + regs->u_regs[UREG_G1] <<= 32;
10995 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
10996 + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
10997 + regs->tpc = addr;
10998 + regs->tnpc = addr+4;
10999 + return 2;
11000 + }
11001 + } while (0);
11002 +
11003 + do { /* PaX: unpatched PLT emulation step 1 */
11004 + unsigned int sethi, ba, nop;
11005 +
11006 + err = get_user(sethi, (unsigned int *)regs->tpc);
11007 + err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11008 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11009 +
11010 + if (err)
11011 + break;
11012 +
11013 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11014 + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11015 + nop == 0x01000000U)
11016 + {
11017 + unsigned long addr;
11018 + unsigned int save, call;
11019 + unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11020 +
11021 + if ((ba & 0xFFC00000U) == 0x30800000U)
11022 + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11023 + else
11024 + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11025 +
11026 + if (test_thread_flag(TIF_32BIT))
11027 + addr &= 0xFFFFFFFFUL;
11028 +
11029 + err = get_user(save, (unsigned int *)addr);
11030 + err |= get_user(call, (unsigned int *)(addr+4));
11031 + err |= get_user(nop, (unsigned int *)(addr+8));
11032 + if (err)
11033 + break;
11034 +
11035 +#ifdef CONFIG_PAX_DLRESOLVE
11036 + if (save == 0x9DE3BFA8U &&
11037 + (call & 0xC0000000U) == 0x40000000U &&
11038 + nop == 0x01000000U)
11039 + {
11040 + struct vm_area_struct *vma;
11041 + unsigned long call_dl_resolve;
11042 +
11043 + down_read(&current->mm->mmap_sem);
11044 + call_dl_resolve = current->mm->call_dl_resolve;
11045 + up_read(&current->mm->mmap_sem);
11046 + if (likely(call_dl_resolve))
11047 + goto emulate;
11048 +
11049 + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11050 +
11051 + down_write(&current->mm->mmap_sem);
11052 + if (current->mm->call_dl_resolve) {
11053 + call_dl_resolve = current->mm->call_dl_resolve;
11054 + up_write(&current->mm->mmap_sem);
11055 + if (vma)
11056 + kmem_cache_free(vm_area_cachep, vma);
11057 + goto emulate;
11058 + }
11059 +
11060 + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11061 + if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11062 + up_write(&current->mm->mmap_sem);
11063 + if (vma)
11064 + kmem_cache_free(vm_area_cachep, vma);
11065 + return 1;
11066 + }
11067 +
11068 + if (pax_insert_vma(vma, call_dl_resolve)) {
11069 + up_write(&current->mm->mmap_sem);
11070 + kmem_cache_free(vm_area_cachep, vma);
11071 + return 1;
11072 + }
11073 +
11074 + current->mm->call_dl_resolve = call_dl_resolve;
11075 + up_write(&current->mm->mmap_sem);
11076 +
11077 +emulate:
11078 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11079 + regs->tpc = call_dl_resolve;
11080 + regs->tnpc = addr+4;
11081 + return 3;
11082 + }
11083 +#endif
11084 +
11085 + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11086 + if ((save & 0xFFC00000U) == 0x05000000U &&
11087 + (call & 0xFFFFE000U) == 0x85C0A000U &&
11088 + nop == 0x01000000U)
11089 + {
11090 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11091 + regs->u_regs[UREG_G2] = addr + 4;
11092 + addr = (save & 0x003FFFFFU) << 10;
11093 + addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11094 +
11095 + if (test_thread_flag(TIF_32BIT))
11096 + addr &= 0xFFFFFFFFUL;
11097 +
11098 + regs->tpc = addr;
11099 + regs->tnpc = addr+4;
11100 + return 3;
11101 + }
11102 +
11103 + /* PaX: 64-bit PLT stub */
11104 + err = get_user(sethi1, (unsigned int *)addr);
11105 + err |= get_user(sethi2, (unsigned int *)(addr+4));
11106 + err |= get_user(or1, (unsigned int *)(addr+8));
11107 + err |= get_user(or2, (unsigned int *)(addr+12));
11108 + err |= get_user(sllx, (unsigned int *)(addr+16));
11109 + err |= get_user(add, (unsigned int *)(addr+20));
11110 + err |= get_user(jmpl, (unsigned int *)(addr+24));
11111 + err |= get_user(nop, (unsigned int *)(addr+28));
11112 + if (err)
11113 + break;
11114 +
11115 + if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
11116 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11117 + (or1 & 0xFFFFE000U) == 0x88112000U &&
11118 + (or2 & 0xFFFFE000U) == 0x8A116000U &&
11119 + sllx == 0x89293020U &&
11120 + add == 0x8A010005U &&
11121 + jmpl == 0x89C14000U &&
11122 + nop == 0x01000000U)
11123 + {
11124 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11125 + regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11126 + regs->u_regs[UREG_G4] <<= 32;
11127 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11128 + regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
11129 + regs->u_regs[UREG_G4] = addr + 24;
11130 + addr = regs->u_regs[UREG_G5];
11131 + regs->tpc = addr;
11132 + regs->tnpc = addr+4;
11133 + return 3;
11134 + }
11135 + }
11136 + } while (0);
11137 +
11138 +#ifdef CONFIG_PAX_DLRESOLVE
11139 + do { /* PaX: unpatched PLT emulation step 2 */
11140 + unsigned int save, call, nop;
11141 +
11142 + err = get_user(save, (unsigned int *)(regs->tpc-4));
11143 + err |= get_user(call, (unsigned int *)regs->tpc);
11144 + err |= get_user(nop, (unsigned int *)(regs->tpc+4));
11145 + if (err)
11146 + break;
11147 +
11148 + if (save == 0x9DE3BFA8U &&
11149 + (call & 0xC0000000U) == 0x40000000U &&
11150 + nop == 0x01000000U)
11151 + {
11152 + unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11153 +
11154 + if (test_thread_flag(TIF_32BIT))
11155 + dl_resolve &= 0xFFFFFFFFUL;
11156 +
11157 + regs->u_regs[UREG_RETPC] = regs->tpc;
11158 + regs->tpc = dl_resolve;
11159 + regs->tnpc = dl_resolve+4;
11160 + return 3;
11161 + }
11162 + } while (0);
11163 +#endif
11164 +
11165 + do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
11166 + unsigned int sethi, ba, nop;
11167 +
11168 + err = get_user(sethi, (unsigned int *)regs->tpc);
11169 + err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11170 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11171 +
11172 + if (err)
11173 + break;
11174 +
11175 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11176 + (ba & 0xFFF00000U) == 0x30600000U &&
11177 + nop == 0x01000000U)
11178 + {
11179 + unsigned long addr;
11180 +
11181 + addr = (sethi & 0x003FFFFFU) << 10;
11182 + regs->u_regs[UREG_G1] = addr;
11183 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11184 +
11185 + if (test_thread_flag(TIF_32BIT))
11186 + addr &= 0xFFFFFFFFUL;
11187 +
11188 + regs->tpc = addr;
11189 + regs->tnpc = addr+4;
11190 + return 2;
11191 + }
11192 + } while (0);
11193 +
11194 +#endif
11195 +
11196 + return 1;
11197 +}
11198 +
11199 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11200 +{
11201 + unsigned long i;
11202 +
11203 + printk(KERN_ERR "PAX: bytes at PC: ");
11204 + for (i = 0; i < 8; i++) {
11205 + unsigned int c;
11206 + if (get_user(c, (unsigned int *)pc+i))
11207 + printk(KERN_CONT "???????? ");
11208 + else
11209 + printk(KERN_CONT "%08x ", c);
11210 + }
11211 + printk("\n");
11212 +}
11213 +#endif
11214 +
11215 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
11216 {
11217 struct mm_struct *mm = current->mm;
11218 @@ -342,6 +805,29 @@ retry:
11219 if (!vma)
11220 goto bad_area;
11221
11222 +#ifdef CONFIG_PAX_PAGEEXEC
11223 + /* PaX: detect ITLB misses on non-exec pages */
11224 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
11225 + !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
11226 + {
11227 + if (address != regs->tpc)
11228 + goto good_area;
11229 +
11230 + up_read(&mm->mmap_sem);
11231 + switch (pax_handle_fetch_fault(regs)) {
11232 +
11233 +#ifdef CONFIG_PAX_EMUPLT
11234 + case 2:
11235 + case 3:
11236 + return;
11237 +#endif
11238 +
11239 + }
11240 + pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
11241 + do_group_exit(SIGKILL);
11242 + }
11243 +#endif
11244 +
11245 /* Pure DTLB misses do not tell us whether the fault causing
11246 * load/store/atomic was a write or not, it only says that there
11247 * was no match. So in such a case we (carefully) read the
11248 diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
11249 index 9639964..806cd0c 100644
11250 --- a/arch/sparc/mm/hugetlbpage.c
11251 +++ b/arch/sparc/mm/hugetlbpage.c
11252 @@ -28,7 +28,8 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
11253 unsigned long addr,
11254 unsigned long len,
11255 unsigned long pgoff,
11256 - unsigned long flags)
11257 + unsigned long flags,
11258 + unsigned long offset)
11259 {
11260 unsigned long task_size = TASK_SIZE;
11261 struct vm_unmapped_area_info info;
11262 @@ -38,15 +39,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
11263
11264 info.flags = 0;
11265 info.length = len;
11266 - info.low_limit = TASK_UNMAPPED_BASE;
11267 + info.low_limit = mm->mmap_base;
11268 info.high_limit = min(task_size, VA_EXCLUDE_START);
11269 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
11270 info.align_offset = 0;
11271 + info.threadstack_offset = offset;
11272 addr = vm_unmapped_area(&info);
11273
11274 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
11275 VM_BUG_ON(addr != -ENOMEM);
11276 info.low_limit = VA_EXCLUDE_END;
11277 +
11278 +#ifdef CONFIG_PAX_RANDMMAP
11279 + if (mm->pax_flags & MF_PAX_RANDMMAP)
11280 + info.low_limit += mm->delta_mmap;
11281 +#endif
11282 +
11283 info.high_limit = task_size;
11284 addr = vm_unmapped_area(&info);
11285 }
11286 @@ -58,7 +66,8 @@ static unsigned long
11287 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
11288 const unsigned long len,
11289 const unsigned long pgoff,
11290 - const unsigned long flags)
11291 + const unsigned long flags,
11292 + const unsigned long offset)
11293 {
11294 struct mm_struct *mm = current->mm;
11295 unsigned long addr = addr0;
11296 @@ -73,6 +82,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
11297 info.high_limit = mm->mmap_base;
11298 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
11299 info.align_offset = 0;
11300 + info.threadstack_offset = offset;
11301 addr = vm_unmapped_area(&info);
11302
11303 /*
11304 @@ -85,6 +95,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
11305 VM_BUG_ON(addr != -ENOMEM);
11306 info.flags = 0;
11307 info.low_limit = TASK_UNMAPPED_BASE;
11308 +
11309 +#ifdef CONFIG_PAX_RANDMMAP
11310 + if (mm->pax_flags & MF_PAX_RANDMMAP)
11311 + info.low_limit += mm->delta_mmap;
11312 +#endif
11313 +
11314 info.high_limit = STACK_TOP32;
11315 addr = vm_unmapped_area(&info);
11316 }
11317 @@ -99,6 +115,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
11318 struct mm_struct *mm = current->mm;
11319 struct vm_area_struct *vma;
11320 unsigned long task_size = TASK_SIZE;
11321 + unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
11322
11323 if (test_thread_flag(TIF_32BIT))
11324 task_size = STACK_TOP32;
11325 @@ -114,19 +131,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
11326 return addr;
11327 }
11328
11329 +#ifdef CONFIG_PAX_RANDMMAP
11330 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
11331 +#endif
11332 +
11333 if (addr) {
11334 addr = ALIGN(addr, HPAGE_SIZE);
11335 vma = find_vma(mm, addr);
11336 - if (task_size - len >= addr &&
11337 - (!vma || addr + len <= vma->vm_start))
11338 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
11339 return addr;
11340 }
11341 if (mm->get_unmapped_area == arch_get_unmapped_area)
11342 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
11343 - pgoff, flags);
11344 + pgoff, flags, offset);
11345 else
11346 return hugetlb_get_unmapped_area_topdown(file, addr, len,
11347 - pgoff, flags);
11348 + pgoff, flags, offset);
11349 }
11350
11351 pte_t *huge_pte_alloc(struct mm_struct *mm,
11352 diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
11353 index ed82eda..0d80e77 100644
11354 --- a/arch/sparc/mm/init_64.c
11355 +++ b/arch/sparc/mm/init_64.c
11356 @@ -188,9 +188,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
11357 int num_kernel_image_mappings;
11358
11359 #ifdef CONFIG_DEBUG_DCFLUSH
11360 -atomic_t dcpage_flushes = ATOMIC_INIT(0);
11361 +atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
11362 #ifdef CONFIG_SMP
11363 -atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
11364 +atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
11365 #endif
11366 #endif
11367
11368 @@ -198,7 +198,7 @@ inline void flush_dcache_page_impl(struct page *page)
11369 {
11370 BUG_ON(tlb_type == hypervisor);
11371 #ifdef CONFIG_DEBUG_DCFLUSH
11372 - atomic_inc(&dcpage_flushes);
11373 + atomic_inc_unchecked(&dcpage_flushes);
11374 #endif
11375
11376 #ifdef DCACHE_ALIASING_POSSIBLE
11377 @@ -466,10 +466,10 @@ void mmu_info(struct seq_file *m)
11378
11379 #ifdef CONFIG_DEBUG_DCFLUSH
11380 seq_printf(m, "DCPageFlushes\t: %d\n",
11381 - atomic_read(&dcpage_flushes));
11382 + atomic_read_unchecked(&dcpage_flushes));
11383 #ifdef CONFIG_SMP
11384 seq_printf(m, "DCPageFlushesXC\t: %d\n",
11385 - atomic_read(&dcpage_flushes_xcall));
11386 + atomic_read_unchecked(&dcpage_flushes_xcall));
11387 #endif /* CONFIG_SMP */
11388 #endif /* CONFIG_DEBUG_DCFLUSH */
11389 }
11390 diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
11391 index d45a2c4..3c05a78 100644
11392 --- a/arch/tile/Kconfig
11393 +++ b/arch/tile/Kconfig
11394 @@ -185,6 +185,7 @@ source "kernel/Kconfig.hz"
11395
11396 config KEXEC
11397 bool "kexec system call"
11398 + depends on !GRKERNSEC_KMEM
11399 ---help---
11400 kexec is a system call that implements the ability to shutdown your
11401 current kernel, and to start another kernel. It is like a reboot
11402 diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
11403 index ad220ee..2f537b3 100644
11404 --- a/arch/tile/include/asm/atomic_64.h
11405 +++ b/arch/tile/include/asm/atomic_64.h
11406 @@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
11407
11408 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
11409
11410 +#define atomic64_read_unchecked(v) atomic64_read(v)
11411 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
11412 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
11413 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
11414 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
11415 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
11416 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
11417 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
11418 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
11419 +
11420 /* Atomic dec and inc don't implement barrier, so provide them if needed. */
11421 #define smp_mb__before_atomic_dec() smp_mb()
11422 #define smp_mb__after_atomic_dec() smp_mb()
11423 diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
11424 index 6160761..00cac88 100644
11425 --- a/arch/tile/include/asm/cache.h
11426 +++ b/arch/tile/include/asm/cache.h
11427 @@ -15,11 +15,12 @@
11428 #ifndef _ASM_TILE_CACHE_H
11429 #define _ASM_TILE_CACHE_H
11430
11431 +#include <linux/const.h>
11432 #include <arch/chip.h>
11433
11434 /* bytes per L1 data cache line */
11435 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
11436 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
11437 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
11438
11439 /* bytes per L2 cache line */
11440 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
11441 diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
11442 index b6cde32..c0cb736 100644
11443 --- a/arch/tile/include/asm/uaccess.h
11444 +++ b/arch/tile/include/asm/uaccess.h
11445 @@ -414,9 +414,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
11446 const void __user *from,
11447 unsigned long n)
11448 {
11449 - int sz = __compiletime_object_size(to);
11450 + size_t sz = __compiletime_object_size(to);
11451
11452 - if (likely(sz == -1 || sz >= n))
11453 + if (likely(sz == (size_t)-1 || sz >= n))
11454 n = _copy_from_user(to, from, n);
11455 else
11456 copy_from_user_overflow();
11457 diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
11458 index 0cb3bba..7338b2d 100644
11459 --- a/arch/tile/mm/hugetlbpage.c
11460 +++ b/arch/tile/mm/hugetlbpage.c
11461 @@ -212,6 +212,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
11462 info.high_limit = TASK_SIZE;
11463 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
11464 info.align_offset = 0;
11465 + info.threadstack_offset = 0;
11466 return vm_unmapped_area(&info);
11467 }
11468
11469 @@ -229,6 +230,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
11470 info.high_limit = current->mm->mmap_base;
11471 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
11472 info.align_offset = 0;
11473 + info.threadstack_offset = 0;
11474 addr = vm_unmapped_area(&info);
11475
11476 /*
11477 diff --git a/arch/um/Makefile b/arch/um/Makefile
11478 index 133f7de..1d6f2f1 100644
11479 --- a/arch/um/Makefile
11480 +++ b/arch/um/Makefile
11481 @@ -62,6 +62,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
11482 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
11483 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
11484
11485 +ifdef CONSTIFY_PLUGIN
11486 +USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
11487 +endif
11488 +
11489 #This will adjust *FLAGS accordingly to the platform.
11490 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
11491
11492 diff --git a/arch/um/defconfig b/arch/um/defconfig
11493 index 2665e6b..3e3822b 100644
11494 --- a/arch/um/defconfig
11495 +++ b/arch/um/defconfig
11496 @@ -51,7 +51,6 @@ CONFIG_X86_CMPXCHG=y
11497 CONFIG_X86_L1_CACHE_SHIFT=5
11498 CONFIG_X86_XADD=y
11499 CONFIG_X86_PPRO_FENCE=y
11500 -CONFIG_X86_WP_WORKS_OK=y
11501 CONFIG_X86_INVLPG=y
11502 CONFIG_X86_BSWAP=y
11503 CONFIG_X86_POPAD_OK=y
11504 diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
11505 index 19e1bdd..3665b77 100644
11506 --- a/arch/um/include/asm/cache.h
11507 +++ b/arch/um/include/asm/cache.h
11508 @@ -1,6 +1,7 @@
11509 #ifndef __UM_CACHE_H
11510 #define __UM_CACHE_H
11511
11512 +#include <linux/const.h>
11513
11514 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
11515 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
11516 @@ -12,6 +13,6 @@
11517 # define L1_CACHE_SHIFT 5
11518 #endif
11519
11520 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
11521 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
11522
11523 #endif
11524 diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
11525 index 2e0a6b1..a64d0f5 100644
11526 --- a/arch/um/include/asm/kmap_types.h
11527 +++ b/arch/um/include/asm/kmap_types.h
11528 @@ -8,6 +8,6 @@
11529
11530 /* No more #include "asm/arch/kmap_types.h" ! */
11531
11532 -#define KM_TYPE_NR 14
11533 +#define KM_TYPE_NR 15
11534
11535 #endif
11536 diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
11537 index 5ff53d9..5850cdf 100644
11538 --- a/arch/um/include/asm/page.h
11539 +++ b/arch/um/include/asm/page.h
11540 @@ -14,6 +14,9 @@
11541 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
11542 #define PAGE_MASK (~(PAGE_SIZE-1))
11543
11544 +#define ktla_ktva(addr) (addr)
11545 +#define ktva_ktla(addr) (addr)
11546 +
11547 #ifndef __ASSEMBLY__
11548
11549 struct page;
11550 diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
11551 index 0032f92..cd151e0 100644
11552 --- a/arch/um/include/asm/pgtable-3level.h
11553 +++ b/arch/um/include/asm/pgtable-3level.h
11554 @@ -58,6 +58,7 @@
11555 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
11556 #define pud_populate(mm, pud, pmd) \
11557 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
11558 +#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
11559
11560 #ifdef CONFIG_64BIT
11561 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
11562 diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
11563 index bbcef52..6a2a483 100644
11564 --- a/arch/um/kernel/process.c
11565 +++ b/arch/um/kernel/process.c
11566 @@ -367,22 +367,6 @@ int singlestepping(void * t)
11567 return 2;
11568 }
11569
11570 -/*
11571 - * Only x86 and x86_64 have an arch_align_stack().
11572 - * All other arches have "#define arch_align_stack(x) (x)"
11573 - * in their asm/system.h
11574 - * As this is included in UML from asm-um/system-generic.h,
11575 - * we can use it to behave as the subarch does.
11576 - */
11577 -#ifndef arch_align_stack
11578 -unsigned long arch_align_stack(unsigned long sp)
11579 -{
11580 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
11581 - sp -= get_random_int() % 8192;
11582 - return sp & ~0xf;
11583 -}
11584 -#endif
11585 -
11586 unsigned long get_wchan(struct task_struct *p)
11587 {
11588 unsigned long stack_page, sp, ip;
11589 diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
11590 index ad8f795..2c7eec6 100644
11591 --- a/arch/unicore32/include/asm/cache.h
11592 +++ b/arch/unicore32/include/asm/cache.h
11593 @@ -12,8 +12,10 @@
11594 #ifndef __UNICORE_CACHE_H__
11595 #define __UNICORE_CACHE_H__
11596
11597 -#define L1_CACHE_SHIFT (5)
11598 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
11599 +#include <linux/const.h>
11600 +
11601 +#define L1_CACHE_SHIFT 5
11602 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
11603
11604 /*
11605 * Memory returned by kmalloc() may be used for DMA, so we must make
11606 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
11607 index f67e839..bfd4748 100644
11608 --- a/arch/x86/Kconfig
11609 +++ b/arch/x86/Kconfig
11610 @@ -247,7 +247,7 @@ config X86_HT
11611
11612 config X86_32_LAZY_GS
11613 def_bool y
11614 - depends on X86_32 && !CC_STACKPROTECTOR
11615 + depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
11616
11617 config ARCH_HWEIGHT_CFLAGS
11618 string
11619 @@ -1099,6 +1099,7 @@ config MICROCODE_EARLY
11620
11621 config X86_MSR
11622 tristate "/dev/cpu/*/msr - Model-specific register support"
11623 + depends on !GRKERNSEC_KMEM
11624 ---help---
11625 This device gives privileged processes access to the x86
11626 Model-Specific Registers (MSRs). It is a character device with
11627 @@ -1122,7 +1123,7 @@ choice
11628
11629 config NOHIGHMEM
11630 bool "off"
11631 - depends on !X86_NUMAQ
11632 + depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
11633 ---help---
11634 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
11635 However, the address space of 32-bit x86 processors is only 4
11636 @@ -1159,7 +1160,7 @@ config NOHIGHMEM
11637
11638 config HIGHMEM4G
11639 bool "4GB"
11640 - depends on !X86_NUMAQ
11641 + depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
11642 ---help---
11643 Select this if you have a 32-bit processor and between 1 and 4
11644 gigabytes of physical RAM.
11645 @@ -1212,7 +1213,7 @@ config PAGE_OFFSET
11646 hex
11647 default 0xB0000000 if VMSPLIT_3G_OPT
11648 default 0x80000000 if VMSPLIT_2G
11649 - default 0x78000000 if VMSPLIT_2G_OPT
11650 + default 0x70000000 if VMSPLIT_2G_OPT
11651 default 0x40000000 if VMSPLIT_1G
11652 default 0xC0000000
11653 depends on X86_32
11654 @@ -1614,6 +1615,7 @@ config SECCOMP
11655
11656 config CC_STACKPROTECTOR
11657 bool "Enable -fstack-protector buffer overflow detection"
11658 + depends on X86_64 || !PAX_MEMORY_UDEREF
11659 ---help---
11660 This option turns on the -fstack-protector GCC feature. This
11661 feature puts, at the beginning of functions, a canary value on
11662 @@ -1632,6 +1634,7 @@ source kernel/Kconfig.hz
11663
11664 config KEXEC
11665 bool "kexec system call"
11666 + depends on !GRKERNSEC_KMEM
11667 ---help---
11668 kexec is a system call that implements the ability to shutdown your
11669 current kernel, and to start another kernel. It is like a reboot
11670 @@ -1733,6 +1736,8 @@ config X86_NEED_RELOCS
11671 config PHYSICAL_ALIGN
11672 hex "Alignment value to which kernel should be aligned"
11673 default "0x1000000"
11674 + range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
11675 + range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
11676 range 0x2000 0x1000000 if X86_32
11677 range 0x200000 0x1000000 if X86_64
11678 ---help---
11679 @@ -1812,9 +1817,10 @@ config DEBUG_HOTPLUG_CPU0
11680 If unsure, say N.
11681
11682 config COMPAT_VDSO
11683 - def_bool y
11684 + def_bool n
11685 prompt "Compat VDSO support"
11686 depends on X86_32 || IA32_EMULATION
11687 + depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
11688 ---help---
11689 Map the 32-bit VDSO to the predictable old-style address too.
11690
11691 diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
11692 index c026cca..14657ae 100644
11693 --- a/arch/x86/Kconfig.cpu
11694 +++ b/arch/x86/Kconfig.cpu
11695 @@ -319,7 +319,7 @@ config X86_PPRO_FENCE
11696
11697 config X86_F00F_BUG
11698 def_bool y
11699 - depends on M586MMX || M586TSC || M586 || M486
11700 + depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
11701
11702 config X86_INVD_BUG
11703 def_bool y
11704 @@ -327,7 +327,7 @@ config X86_INVD_BUG
11705
11706 config X86_ALIGNMENT_16
11707 def_bool y
11708 - depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
11709 + depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
11710
11711 config X86_INTEL_USERCOPY
11712 def_bool y
11713 @@ -373,7 +373,7 @@ config X86_CMPXCHG64
11714 # generates cmov.
11715 config X86_CMOV
11716 def_bool y
11717 - depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
11718 + depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
11719
11720 config X86_MINIMUM_CPU_FAMILY
11721 int
11722 diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
11723 index 78d91af..8ceb94b 100644
11724 --- a/arch/x86/Kconfig.debug
11725 +++ b/arch/x86/Kconfig.debug
11726 @@ -74,7 +74,7 @@ config X86_PTDUMP
11727 config DEBUG_RODATA
11728 bool "Write protect kernel read-only data structures"
11729 default y
11730 - depends on DEBUG_KERNEL
11731 + depends on DEBUG_KERNEL && BROKEN
11732 ---help---
11733 Mark the kernel read-only data as write-protected in the pagetables,
11734 in order to catch accidental (and incorrect) writes to such const
11735 @@ -92,7 +92,7 @@ config DEBUG_RODATA_TEST
11736
11737 config DEBUG_SET_MODULE_RONX
11738 bool "Set loadable kernel module data as NX and text as RO"
11739 - depends on MODULES
11740 + depends on MODULES && BROKEN
11741 ---help---
11742 This option helps catch unintended modifications to loadable
11743 kernel module's text and read-only data. It also prevents execution
11744 diff --git a/arch/x86/Makefile b/arch/x86/Makefile
11745 index 57d0215..b4373fb 100644
11746 --- a/arch/x86/Makefile
11747 +++ b/arch/x86/Makefile
11748 @@ -49,14 +49,12 @@ ifeq ($(CONFIG_X86_32),y)
11749 # CPU-specific tuning. Anything which can be shared with UML should go here.
11750 include $(srctree)/arch/x86/Makefile_32.cpu
11751 KBUILD_CFLAGS += $(cflags-y)
11752 -
11753 - # temporary until string.h is fixed
11754 - KBUILD_CFLAGS += -ffreestanding
11755 else
11756 BITS := 64
11757 UTS_MACHINE := x86_64
11758 CHECKFLAGS += -D__x86_64__ -m64
11759
11760 + biarch := $(call cc-option,-m64)
11761 KBUILD_AFLAGS += -m64
11762 KBUILD_CFLAGS += -m64
11763
11764 @@ -89,6 +87,9 @@ else
11765 KBUILD_CFLAGS += -maccumulate-outgoing-args
11766 endif
11767
11768 +# temporary until string.h is fixed
11769 +KBUILD_CFLAGS += -ffreestanding
11770 +
11771 ifdef CONFIG_CC_STACKPROTECTOR
11772 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
11773 ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC) $(KBUILD_CPPFLAGS) $(biarch)),y)
11774 @@ -247,3 +248,12 @@ define archhelp
11775 echo ' FDINITRD=file initrd for the booted kernel'
11776 echo ' kvmconfig - Enable additional options for guest kernel support'
11777 endef
11778 +
11779 +define OLD_LD
11780 +
11781 +*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
11782 +*** Please upgrade your binutils to 2.18 or newer
11783 +endef
11784 +
11785 +archprepare:
11786 + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
11787 diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
11788 index 6cf0111..f2e2398 100644
11789 --- a/arch/x86/boot/Makefile
11790 +++ b/arch/x86/boot/Makefile
11791 @@ -65,6 +65,9 @@ KBUILD_CFLAGS := $(USERINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ \
11792 $(call cc-option, -fno-unit-at-a-time)) \
11793 $(call cc-option, -fno-stack-protector) \
11794 $(call cc-option, -mpreferred-stack-boundary=2)
11795 +ifdef CONSTIFY_PLUGIN
11796 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
11797 +endif
11798 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
11799 GCOV_PROFILE := n
11800
11801 diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
11802 index 878e4b9..20537ab 100644
11803 --- a/arch/x86/boot/bitops.h
11804 +++ b/arch/x86/boot/bitops.h
11805 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
11806 u8 v;
11807 const u32 *p = (const u32 *)addr;
11808
11809 - asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
11810 + asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
11811 return v;
11812 }
11813
11814 @@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
11815
11816 static inline void set_bit(int nr, void *addr)
11817 {
11818 - asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
11819 + asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
11820 }
11821
11822 #endif /* BOOT_BITOPS_H */
11823 diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
11824 index ef72bae..353a184 100644
11825 --- a/arch/x86/boot/boot.h
11826 +++ b/arch/x86/boot/boot.h
11827 @@ -85,7 +85,7 @@ static inline void io_delay(void)
11828 static inline u16 ds(void)
11829 {
11830 u16 seg;
11831 - asm("movw %%ds,%0" : "=rm" (seg));
11832 + asm volatile("movw %%ds,%0" : "=rm" (seg));
11833 return seg;
11834 }
11835
11836 @@ -181,7 +181,7 @@ static inline void wrgs32(u32 v, addr_t addr)
11837 static inline int memcmp(const void *s1, const void *s2, size_t len)
11838 {
11839 u8 diff;
11840 - asm("repe; cmpsb; setnz %0"
11841 + asm volatile("repe; cmpsb; setnz %0"
11842 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
11843 return diff;
11844 }
11845 diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
11846 index c8a6792..2402765 100644
11847 --- a/arch/x86/boot/compressed/Makefile
11848 +++ b/arch/x86/boot/compressed/Makefile
11849 @@ -16,6 +16,9 @@ KBUILD_CFLAGS += $(cflags-y)
11850 KBUILD_CFLAGS += -mno-mmx -mno-sse
11851 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
11852 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
11853 +ifdef CONSTIFY_PLUGIN
11854 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
11855 +endif
11856
11857 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
11858 GCOV_PROFILE := n
11859 diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
11860 index b7388a4..03844ec 100644
11861 --- a/arch/x86/boot/compressed/eboot.c
11862 +++ b/arch/x86/boot/compressed/eboot.c
11863 @@ -150,7 +150,6 @@ again:
11864 *addr = max_addr;
11865 }
11866
11867 -free_pool:
11868 efi_call_phys1(sys_table->boottime->free_pool, map);
11869
11870 fail:
11871 @@ -214,7 +213,6 @@ static efi_status_t low_alloc(unsigned long size, unsigned long align,
11872 if (i == map_size / desc_size)
11873 status = EFI_NOT_FOUND;
11874
11875 -free_pool:
11876 efi_call_phys1(sys_table->boottime->free_pool, map);
11877 fail:
11878 return status;
11879 diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
11880 index a53440e..c3dbf1e 100644
11881 --- a/arch/x86/boot/compressed/efi_stub_32.S
11882 +++ b/arch/x86/boot/compressed/efi_stub_32.S
11883 @@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
11884 * parameter 2, ..., param n. To make things easy, we save the return
11885 * address of efi_call_phys in a global variable.
11886 */
11887 - popl %ecx
11888 - movl %ecx, saved_return_addr(%edx)
11889 - /* get the function pointer into ECX*/
11890 - popl %ecx
11891 - movl %ecx, efi_rt_function_ptr(%edx)
11892 + popl saved_return_addr(%edx)
11893 + popl efi_rt_function_ptr(%edx)
11894
11895 /*
11896 * 3. Call the physical function.
11897 */
11898 - call *%ecx
11899 + call *efi_rt_function_ptr(%edx)
11900
11901 /*
11902 * 4. Balance the stack. And because EAX contain the return value,
11903 @@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
11904 1: popl %edx
11905 subl $1b, %edx
11906
11907 - movl efi_rt_function_ptr(%edx), %ecx
11908 - pushl %ecx
11909 + pushl efi_rt_function_ptr(%edx)
11910
11911 /*
11912 * 10. Push the saved return address onto the stack and return.
11913 */
11914 - movl saved_return_addr(%edx), %ecx
11915 - pushl %ecx
11916 - ret
11917 + jmpl *saved_return_addr(%edx)
11918 ENDPROC(efi_call_phys)
11919 .previous
11920
11921 diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
11922 index 5d6f689..9d06730 100644
11923 --- a/arch/x86/boot/compressed/head_32.S
11924 +++ b/arch/x86/boot/compressed/head_32.S
11925 @@ -118,7 +118,7 @@ preferred_addr:
11926 notl %eax
11927 andl %eax, %ebx
11928 #else
11929 - movl $LOAD_PHYSICAL_ADDR, %ebx
11930 + movl $____LOAD_PHYSICAL_ADDR, %ebx
11931 #endif
11932
11933 /* Target address to relocate to for decompression */
11934 diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
11935 index c337422..2c5be72 100644
11936 --- a/arch/x86/boot/compressed/head_64.S
11937 +++ b/arch/x86/boot/compressed/head_64.S
11938 @@ -95,7 +95,7 @@ ENTRY(startup_32)
11939 notl %eax
11940 andl %eax, %ebx
11941 #else
11942 - movl $LOAD_PHYSICAL_ADDR, %ebx
11943 + movl $____LOAD_PHYSICAL_ADDR, %ebx
11944 #endif
11945
11946 /* Target address to relocate to for decompression */
11947 @@ -270,7 +270,7 @@ preferred_addr:
11948 notq %rax
11949 andq %rax, %rbp
11950 #else
11951 - movq $LOAD_PHYSICAL_ADDR, %rbp
11952 + movq $____LOAD_PHYSICAL_ADDR, %rbp
11953 #endif
11954
11955 /* Target address to relocate to for decompression */
11956 @@ -362,8 +362,8 @@ gdt:
11957 .long gdt
11958 .word 0
11959 .quad 0x0000000000000000 /* NULL descriptor */
11960 - .quad 0x00af9a000000ffff /* __KERNEL_CS */
11961 - .quad 0x00cf92000000ffff /* __KERNEL_DS */
11962 + .quad 0x00af9b000000ffff /* __KERNEL_CS */
11963 + .quad 0x00cf93000000ffff /* __KERNEL_DS */
11964 .quad 0x0080890000000000 /* TS descriptor */
11965 .quad 0x0000000000000000 /* TS continued */
11966 gdt_end:
11967 diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
11968 index 434f077..b6b4b38 100644
11969 --- a/arch/x86/boot/compressed/misc.c
11970 +++ b/arch/x86/boot/compressed/misc.c
11971 @@ -283,7 +283,7 @@ static void handle_relocations(void *output, unsigned long output_len)
11972 * Calculate the delta between where vmlinux was linked to load
11973 * and where it was actually loaded.
11974 */
11975 - delta = min_addr - LOAD_PHYSICAL_ADDR;
11976 + delta = min_addr - ____LOAD_PHYSICAL_ADDR;
11977 if (!delta) {
11978 debug_putstr("No relocation needed... ");
11979 return;
11980 @@ -380,7 +380,7 @@ static void parse_elf(void *output)
11981 case PT_LOAD:
11982 #ifdef CONFIG_RELOCATABLE
11983 dest = output;
11984 - dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
11985 + dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
11986 #else
11987 dest = (void *)(phdr->p_paddr);
11988 #endif
11989 @@ -432,7 +432,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
11990 error("Destination address too large");
11991 #endif
11992 #ifndef CONFIG_RELOCATABLE
11993 - if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
11994 + if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
11995 error("Wrong destination address");
11996 #endif
11997
11998 diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
11999 index 4d3ff03..e4972ff 100644
12000 --- a/arch/x86/boot/cpucheck.c
12001 +++ b/arch/x86/boot/cpucheck.c
12002 @@ -74,7 +74,7 @@ static int has_fpu(void)
12003 u16 fcw = -1, fsw = -1;
12004 u32 cr0;
12005
12006 - asm("movl %%cr0,%0" : "=r" (cr0));
12007 + asm volatile("movl %%cr0,%0" : "=r" (cr0));
12008 if (cr0 & (X86_CR0_EM|X86_CR0_TS)) {
12009 cr0 &= ~(X86_CR0_EM|X86_CR0_TS);
12010 asm volatile("movl %0,%%cr0" : : "r" (cr0));
12011 @@ -90,7 +90,7 @@ static int has_eflag(u32 mask)
12012 {
12013 u32 f0, f1;
12014
12015 - asm("pushfl ; "
12016 + asm volatile("pushfl ; "
12017 "pushfl ; "
12018 "popl %0 ; "
12019 "movl %0,%1 ; "
12020 @@ -115,7 +115,7 @@ static void get_flags(void)
12021 set_bit(X86_FEATURE_FPU, cpu.flags);
12022
12023 if (has_eflag(X86_EFLAGS_ID)) {
12024 - asm("cpuid"
12025 + asm volatile("cpuid"
12026 : "=a" (max_intel_level),
12027 "=b" (cpu_vendor[0]),
12028 "=d" (cpu_vendor[1]),
12029 @@ -124,7 +124,7 @@ static void get_flags(void)
12030
12031 if (max_intel_level >= 0x00000001 &&
12032 max_intel_level <= 0x0000ffff) {
12033 - asm("cpuid"
12034 + asm volatile("cpuid"
12035 : "=a" (tfms),
12036 "=c" (cpu.flags[4]),
12037 "=d" (cpu.flags[0])
12038 @@ -136,7 +136,7 @@ static void get_flags(void)
12039 cpu.model += ((tfms >> 16) & 0xf) << 4;
12040 }
12041
12042 - asm("cpuid"
12043 + asm volatile("cpuid"
12044 : "=a" (max_amd_level)
12045 : "a" (0x80000000)
12046 : "ebx", "ecx", "edx");
12047 @@ -144,7 +144,7 @@ static void get_flags(void)
12048 if (max_amd_level >= 0x80000001 &&
12049 max_amd_level <= 0x8000ffff) {
12050 u32 eax = 0x80000001;
12051 - asm("cpuid"
12052 + asm volatile("cpuid"
12053 : "+a" (eax),
12054 "=c" (cpu.flags[6]),
12055 "=d" (cpu.flags[1])
12056 @@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12057 u32 ecx = MSR_K7_HWCR;
12058 u32 eax, edx;
12059
12060 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12061 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12062 eax &= ~(1 << 15);
12063 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12064 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12065
12066 get_flags(); /* Make sure it really did something */
12067 err = check_flags();
12068 @@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12069 u32 ecx = MSR_VIA_FCR;
12070 u32 eax, edx;
12071
12072 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12073 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12074 eax |= (1<<1)|(1<<7);
12075 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12076 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12077
12078 set_bit(X86_FEATURE_CX8, cpu.flags);
12079 err = check_flags();
12080 @@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12081 u32 eax, edx;
12082 u32 level = 1;
12083
12084 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12085 - asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12086 - asm("cpuid"
12087 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12088 + asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12089 + asm volatile("cpuid"
12090 : "+a" (level), "=d" (cpu.flags[0])
12091 : : "ecx", "ebx");
12092 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12093 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12094
12095 err = check_flags();
12096 }
12097 diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12098 index 9ec06a1..2c25e79 100644
12099 --- a/arch/x86/boot/header.S
12100 +++ b/arch/x86/boot/header.S
12101 @@ -409,10 +409,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12102 # single linked list of
12103 # struct setup_data
12104
12105 -pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12106 +pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12107
12108 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12109 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12110 +#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12111 +#else
12112 #define VO_INIT_SIZE (VO__end - VO__text)
12113 +#endif
12114 #if ZO_INIT_SIZE > VO_INIT_SIZE
12115 #define INIT_SIZE ZO_INIT_SIZE
12116 #else
12117 diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
12118 index db75d07..8e6d0af 100644
12119 --- a/arch/x86/boot/memory.c
12120 +++ b/arch/x86/boot/memory.c
12121 @@ -19,7 +19,7 @@
12122
12123 static int detect_memory_e820(void)
12124 {
12125 - int count = 0;
12126 + unsigned int count = 0;
12127 struct biosregs ireg, oreg;
12128 struct e820entry *desc = boot_params.e820_map;
12129 static struct e820entry buf; /* static so it is zeroed */
12130 diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
12131 index 11e8c6e..fdbb1ed 100644
12132 --- a/arch/x86/boot/video-vesa.c
12133 +++ b/arch/x86/boot/video-vesa.c
12134 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
12135
12136 boot_params.screen_info.vesapm_seg = oreg.es;
12137 boot_params.screen_info.vesapm_off = oreg.di;
12138 + boot_params.screen_info.vesapm_size = oreg.cx;
12139 }
12140
12141 /*
12142 diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
12143 index 43eda28..5ab5fdb 100644
12144 --- a/arch/x86/boot/video.c
12145 +++ b/arch/x86/boot/video.c
12146 @@ -96,7 +96,7 @@ static void store_mode_params(void)
12147 static unsigned int get_entry(void)
12148 {
12149 char entry_buf[4];
12150 - int i, len = 0;
12151 + unsigned int i, len = 0;
12152 int key;
12153 unsigned int v;
12154
12155 diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
12156 index 9105655..41779c1 100644
12157 --- a/arch/x86/crypto/aes-x86_64-asm_64.S
12158 +++ b/arch/x86/crypto/aes-x86_64-asm_64.S
12159 @@ -8,6 +8,8 @@
12160 * including this sentence is retained in full.
12161 */
12162
12163 +#include <asm/alternative-asm.h>
12164 +
12165 .extern crypto_ft_tab
12166 .extern crypto_it_tab
12167 .extern crypto_fl_tab
12168 @@ -70,6 +72,8 @@
12169 je B192; \
12170 leaq 32(r9),r9;
12171
12172 +#define ret pax_force_retaddr; ret
12173 +
12174 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
12175 movq r1,r2; \
12176 movq r3,r4; \
12177 diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
12178 index 477e9d7..c92c7d8 100644
12179 --- a/arch/x86/crypto/aesni-intel_asm.S
12180 +++ b/arch/x86/crypto/aesni-intel_asm.S
12181 @@ -31,6 +31,7 @@
12182
12183 #include <linux/linkage.h>
12184 #include <asm/inst.h>
12185 +#include <asm/alternative-asm.h>
12186
12187 #ifdef __x86_64__
12188 .data
12189 @@ -205,7 +206,7 @@ enc: .octa 0x2
12190 * num_initial_blocks = b mod 4
12191 * encrypt the initial num_initial_blocks blocks and apply ghash on
12192 * the ciphertext
12193 -* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12194 +* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12195 * are clobbered
12196 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
12197 */
12198 @@ -214,8 +215,8 @@ enc: .octa 0x2
12199 .macro INITIAL_BLOCKS_DEC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
12200 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
12201 mov arg7, %r10 # %r10 = AAD
12202 - mov arg8, %r12 # %r12 = aadLen
12203 - mov %r12, %r11
12204 + mov arg8, %r15 # %r15 = aadLen
12205 + mov %r15, %r11
12206 pxor %xmm\i, %xmm\i
12207 _get_AAD_loop\num_initial_blocks\operation:
12208 movd (%r10), \TMP1
12209 @@ -223,15 +224,15 @@ _get_AAD_loop\num_initial_blocks\operation:
12210 psrldq $4, %xmm\i
12211 pxor \TMP1, %xmm\i
12212 add $4, %r10
12213 - sub $4, %r12
12214 + sub $4, %r15
12215 jne _get_AAD_loop\num_initial_blocks\operation
12216 cmp $16, %r11
12217 je _get_AAD_loop2_done\num_initial_blocks\operation
12218 - mov $16, %r12
12219 + mov $16, %r15
12220 _get_AAD_loop2\num_initial_blocks\operation:
12221 psrldq $4, %xmm\i
12222 - sub $4, %r12
12223 - cmp %r11, %r12
12224 + sub $4, %r15
12225 + cmp %r11, %r15
12226 jne _get_AAD_loop2\num_initial_blocks\operation
12227 _get_AAD_loop2_done\num_initial_blocks\operation:
12228 movdqa SHUF_MASK(%rip), %xmm14
12229 @@ -443,7 +444,7 @@ _initial_blocks_done\num_initial_blocks\operation:
12230 * num_initial_blocks = b mod 4
12231 * encrypt the initial num_initial_blocks blocks and apply ghash on
12232 * the ciphertext
12233 -* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12234 +* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12235 * are clobbered
12236 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
12237 */
12238 @@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
12239 .macro INITIAL_BLOCKS_ENC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
12240 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
12241 mov arg7, %r10 # %r10 = AAD
12242 - mov arg8, %r12 # %r12 = aadLen
12243 - mov %r12, %r11
12244 + mov arg8, %r15 # %r15 = aadLen
12245 + mov %r15, %r11
12246 pxor %xmm\i, %xmm\i
12247 _get_AAD_loop\num_initial_blocks\operation:
12248 movd (%r10), \TMP1
12249 @@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
12250 psrldq $4, %xmm\i
12251 pxor \TMP1, %xmm\i
12252 add $4, %r10
12253 - sub $4, %r12
12254 + sub $4, %r15
12255 jne _get_AAD_loop\num_initial_blocks\operation
12256 cmp $16, %r11
12257 je _get_AAD_loop2_done\num_initial_blocks\operation
12258 - mov $16, %r12
12259 + mov $16, %r15
12260 _get_AAD_loop2\num_initial_blocks\operation:
12261 psrldq $4, %xmm\i
12262 - sub $4, %r12
12263 - cmp %r11, %r12
12264 + sub $4, %r15
12265 + cmp %r11, %r15
12266 jne _get_AAD_loop2\num_initial_blocks\operation
12267 _get_AAD_loop2_done\num_initial_blocks\operation:
12268 movdqa SHUF_MASK(%rip), %xmm14
12269 @@ -1269,7 +1270,7 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst
12270 *
12271 *****************************************************************************/
12272 ENTRY(aesni_gcm_dec)
12273 - push %r12
12274 + push %r15
12275 push %r13
12276 push %r14
12277 mov %rsp, %r14
12278 @@ -1279,8 +1280,8 @@ ENTRY(aesni_gcm_dec)
12279 */
12280 sub $VARIABLE_OFFSET, %rsp
12281 and $~63, %rsp # align rsp to 64 bytes
12282 - mov %arg6, %r12
12283 - movdqu (%r12), %xmm13 # %xmm13 = HashKey
12284 + mov %arg6, %r15
12285 + movdqu (%r15), %xmm13 # %xmm13 = HashKey
12286 movdqa SHUF_MASK(%rip), %xmm2
12287 PSHUFB_XMM %xmm2, %xmm13
12288
12289 @@ -1308,10 +1309,10 @@ ENTRY(aesni_gcm_dec)
12290 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
12291 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
12292 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
12293 - mov %r13, %r12
12294 - and $(3<<4), %r12
12295 + mov %r13, %r15
12296 + and $(3<<4), %r15
12297 jz _initial_num_blocks_is_0_decrypt
12298 - cmp $(2<<4), %r12
12299 + cmp $(2<<4), %r15
12300 jb _initial_num_blocks_is_1_decrypt
12301 je _initial_num_blocks_is_2_decrypt
12302 _initial_num_blocks_is_3_decrypt:
12303 @@ -1361,16 +1362,16 @@ _zero_cipher_left_decrypt:
12304 sub $16, %r11
12305 add %r13, %r11
12306 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
12307 - lea SHIFT_MASK+16(%rip), %r12
12308 - sub %r13, %r12
12309 + lea SHIFT_MASK+16(%rip), %r15
12310 + sub %r13, %r15
12311 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
12312 # (%r13 is the number of bytes in plaintext mod 16)
12313 - movdqu (%r12), %xmm2 # get the appropriate shuffle mask
12314 + movdqu (%r15), %xmm2 # get the appropriate shuffle mask
12315 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
12316
12317 movdqa %xmm1, %xmm2
12318 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
12319 - movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
12320 + movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
12321 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
12322 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
12323 pand %xmm1, %xmm2
12324 @@ -1399,9 +1400,9 @@ _less_than_8_bytes_left_decrypt:
12325 sub $1, %r13
12326 jne _less_than_8_bytes_left_decrypt
12327 _multiple_of_16_bytes_decrypt:
12328 - mov arg8, %r12 # %r13 = aadLen (number of bytes)
12329 - shl $3, %r12 # convert into number of bits
12330 - movd %r12d, %xmm15 # len(A) in %xmm15
12331 + mov arg8, %r15 # %r13 = aadLen (number of bytes)
12332 + shl $3, %r15 # convert into number of bits
12333 + movd %r15d, %xmm15 # len(A) in %xmm15
12334 shl $3, %arg4 # len(C) in bits (*128)
12335 MOVQ_R64_XMM %arg4, %xmm1
12336 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
12337 @@ -1440,7 +1441,8 @@ _return_T_done_decrypt:
12338 mov %r14, %rsp
12339 pop %r14
12340 pop %r13
12341 - pop %r12
12342 + pop %r15
12343 + pax_force_retaddr
12344 ret
12345 ENDPROC(aesni_gcm_dec)
12346
12347 @@ -1529,7 +1531,7 @@ ENDPROC(aesni_gcm_dec)
12348 * poly = x^128 + x^127 + x^126 + x^121 + 1
12349 ***************************************************************************/
12350 ENTRY(aesni_gcm_enc)
12351 - push %r12
12352 + push %r15
12353 push %r13
12354 push %r14
12355 mov %rsp, %r14
12356 @@ -1539,8 +1541,8 @@ ENTRY(aesni_gcm_enc)
12357 #
12358 sub $VARIABLE_OFFSET, %rsp
12359 and $~63, %rsp
12360 - mov %arg6, %r12
12361 - movdqu (%r12), %xmm13
12362 + mov %arg6, %r15
12363 + movdqu (%r15), %xmm13
12364 movdqa SHUF_MASK(%rip), %xmm2
12365 PSHUFB_XMM %xmm2, %xmm13
12366
12367 @@ -1564,13 +1566,13 @@ ENTRY(aesni_gcm_enc)
12368 movdqa %xmm13, HashKey(%rsp)
12369 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
12370 and $-16, %r13
12371 - mov %r13, %r12
12372 + mov %r13, %r15
12373
12374 # Encrypt first few blocks
12375
12376 - and $(3<<4), %r12
12377 + and $(3<<4), %r15
12378 jz _initial_num_blocks_is_0_encrypt
12379 - cmp $(2<<4), %r12
12380 + cmp $(2<<4), %r15
12381 jb _initial_num_blocks_is_1_encrypt
12382 je _initial_num_blocks_is_2_encrypt
12383 _initial_num_blocks_is_3_encrypt:
12384 @@ -1623,14 +1625,14 @@ _zero_cipher_left_encrypt:
12385 sub $16, %r11
12386 add %r13, %r11
12387 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
12388 - lea SHIFT_MASK+16(%rip), %r12
12389 - sub %r13, %r12
12390 + lea SHIFT_MASK+16(%rip), %r15
12391 + sub %r13, %r15
12392 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
12393 # (%r13 is the number of bytes in plaintext mod 16)
12394 - movdqu (%r12), %xmm2 # get the appropriate shuffle mask
12395 + movdqu (%r15), %xmm2 # get the appropriate shuffle mask
12396 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
12397 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
12398 - movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
12399 + movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
12400 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
12401 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
12402 movdqa SHUF_MASK(%rip), %xmm10
12403 @@ -1663,9 +1665,9 @@ _less_than_8_bytes_left_encrypt:
12404 sub $1, %r13
12405 jne _less_than_8_bytes_left_encrypt
12406 _multiple_of_16_bytes_encrypt:
12407 - mov arg8, %r12 # %r12 = addLen (number of bytes)
12408 - shl $3, %r12
12409 - movd %r12d, %xmm15 # len(A) in %xmm15
12410 + mov arg8, %r15 # %r15 = addLen (number of bytes)
12411 + shl $3, %r15
12412 + movd %r15d, %xmm15 # len(A) in %xmm15
12413 shl $3, %arg4 # len(C) in bits (*128)
12414 MOVQ_R64_XMM %arg4, %xmm1
12415 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
12416 @@ -1704,7 +1706,8 @@ _return_T_done_encrypt:
12417 mov %r14, %rsp
12418 pop %r14
12419 pop %r13
12420 - pop %r12
12421 + pop %r15
12422 + pax_force_retaddr
12423 ret
12424 ENDPROC(aesni_gcm_enc)
12425
12426 @@ -1722,6 +1725,7 @@ _key_expansion_256a:
12427 pxor %xmm1, %xmm0
12428 movaps %xmm0, (TKEYP)
12429 add $0x10, TKEYP
12430 + pax_force_retaddr
12431 ret
12432 ENDPROC(_key_expansion_128)
12433 ENDPROC(_key_expansion_256a)
12434 @@ -1748,6 +1752,7 @@ _key_expansion_192a:
12435 shufps $0b01001110, %xmm2, %xmm1
12436 movaps %xmm1, 0x10(TKEYP)
12437 add $0x20, TKEYP
12438 + pax_force_retaddr
12439 ret
12440 ENDPROC(_key_expansion_192a)
12441
12442 @@ -1768,6 +1773,7 @@ _key_expansion_192b:
12443
12444 movaps %xmm0, (TKEYP)
12445 add $0x10, TKEYP
12446 + pax_force_retaddr
12447 ret
12448 ENDPROC(_key_expansion_192b)
12449
12450 @@ -1781,6 +1787,7 @@ _key_expansion_256b:
12451 pxor %xmm1, %xmm2
12452 movaps %xmm2, (TKEYP)
12453 add $0x10, TKEYP
12454 + pax_force_retaddr
12455 ret
12456 ENDPROC(_key_expansion_256b)
12457
12458 @@ -1894,6 +1901,7 @@ ENTRY(aesni_set_key)
12459 #ifndef __x86_64__
12460 popl KEYP
12461 #endif
12462 + pax_force_retaddr
12463 ret
12464 ENDPROC(aesni_set_key)
12465
12466 @@ -1916,6 +1924,7 @@ ENTRY(aesni_enc)
12467 popl KLEN
12468 popl KEYP
12469 #endif
12470 + pax_force_retaddr
12471 ret
12472 ENDPROC(aesni_enc)
12473
12474 @@ -1974,6 +1983,7 @@ _aesni_enc1:
12475 AESENC KEY STATE
12476 movaps 0x70(TKEYP), KEY
12477 AESENCLAST KEY STATE
12478 + pax_force_retaddr
12479 ret
12480 ENDPROC(_aesni_enc1)
12481
12482 @@ -2083,6 +2093,7 @@ _aesni_enc4:
12483 AESENCLAST KEY STATE2
12484 AESENCLAST KEY STATE3
12485 AESENCLAST KEY STATE4
12486 + pax_force_retaddr
12487 ret
12488 ENDPROC(_aesni_enc4)
12489
12490 @@ -2106,6 +2117,7 @@ ENTRY(aesni_dec)
12491 popl KLEN
12492 popl KEYP
12493 #endif
12494 + pax_force_retaddr
12495 ret
12496 ENDPROC(aesni_dec)
12497
12498 @@ -2164,6 +2176,7 @@ _aesni_dec1:
12499 AESDEC KEY STATE
12500 movaps 0x70(TKEYP), KEY
12501 AESDECLAST KEY STATE
12502 + pax_force_retaddr
12503 ret
12504 ENDPROC(_aesni_dec1)
12505
12506 @@ -2273,6 +2286,7 @@ _aesni_dec4:
12507 AESDECLAST KEY STATE2
12508 AESDECLAST KEY STATE3
12509 AESDECLAST KEY STATE4
12510 + pax_force_retaddr
12511 ret
12512 ENDPROC(_aesni_dec4)
12513
12514 @@ -2331,6 +2345,7 @@ ENTRY(aesni_ecb_enc)
12515 popl KEYP
12516 popl LEN
12517 #endif
12518 + pax_force_retaddr
12519 ret
12520 ENDPROC(aesni_ecb_enc)
12521
12522 @@ -2390,6 +2405,7 @@ ENTRY(aesni_ecb_dec)
12523 popl KEYP
12524 popl LEN
12525 #endif
12526 + pax_force_retaddr
12527 ret
12528 ENDPROC(aesni_ecb_dec)
12529
12530 @@ -2432,6 +2448,7 @@ ENTRY(aesni_cbc_enc)
12531 popl LEN
12532 popl IVP
12533 #endif
12534 + pax_force_retaddr
12535 ret
12536 ENDPROC(aesni_cbc_enc)
12537
12538 @@ -2523,6 +2540,7 @@ ENTRY(aesni_cbc_dec)
12539 popl LEN
12540 popl IVP
12541 #endif
12542 + pax_force_retaddr
12543 ret
12544 ENDPROC(aesni_cbc_dec)
12545
12546 @@ -2550,6 +2568,7 @@ _aesni_inc_init:
12547 mov $1, TCTR_LOW
12548 MOVQ_R64_XMM TCTR_LOW INC
12549 MOVQ_R64_XMM CTR TCTR_LOW
12550 + pax_force_retaddr
12551 ret
12552 ENDPROC(_aesni_inc_init)
12553
12554 @@ -2579,6 +2598,7 @@ _aesni_inc:
12555 .Linc_low:
12556 movaps CTR, IV
12557 PSHUFB_XMM BSWAP_MASK IV
12558 + pax_force_retaddr
12559 ret
12560 ENDPROC(_aesni_inc)
12561
12562 @@ -2640,6 +2660,7 @@ ENTRY(aesni_ctr_enc)
12563 .Lctr_enc_ret:
12564 movups IV, (IVP)
12565 .Lctr_enc_just_ret:
12566 + pax_force_retaddr
12567 ret
12568 ENDPROC(aesni_ctr_enc)
12569
12570 @@ -2766,6 +2787,7 @@ ENTRY(aesni_xts_crypt8)
12571 pxor INC, STATE4
12572 movdqu STATE4, 0x70(OUTP)
12573
12574 + pax_force_retaddr
12575 ret
12576 ENDPROC(aesni_xts_crypt8)
12577
12578 diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
12579 index 246c670..466e2d6 100644
12580 --- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
12581 +++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
12582 @@ -21,6 +21,7 @@
12583 */
12584
12585 #include <linux/linkage.h>
12586 +#include <asm/alternative-asm.h>
12587
12588 .file "blowfish-x86_64-asm.S"
12589 .text
12590 @@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
12591 jnz .L__enc_xor;
12592
12593 write_block();
12594 + pax_force_retaddr
12595 ret;
12596 .L__enc_xor:
12597 xor_block();
12598 + pax_force_retaddr
12599 ret;
12600 ENDPROC(__blowfish_enc_blk)
12601
12602 @@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
12603
12604 movq %r11, %rbp;
12605
12606 + pax_force_retaddr
12607 ret;
12608 ENDPROC(blowfish_dec_blk)
12609
12610 @@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
12611
12612 popq %rbx;
12613 popq %rbp;
12614 + pax_force_retaddr
12615 ret;
12616
12617 .L__enc_xor4:
12618 @@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
12619
12620 popq %rbx;
12621 popq %rbp;
12622 + pax_force_retaddr
12623 ret;
12624 ENDPROC(__blowfish_enc_blk_4way)
12625
12626 @@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
12627 popq %rbx;
12628 popq %rbp;
12629
12630 + pax_force_retaddr
12631 ret;
12632 ENDPROC(blowfish_dec_blk_4way)
12633 diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
12634 index ce71f92..1dce7ec 100644
12635 --- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
12636 +++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
12637 @@ -16,6 +16,7 @@
12638 */
12639
12640 #include <linux/linkage.h>
12641 +#include <asm/alternative-asm.h>
12642
12643 #define CAMELLIA_TABLE_BYTE_LEN 272
12644
12645 @@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
12646 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
12647 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
12648 %rcx, (%r9));
12649 + pax_force_retaddr
12650 ret;
12651 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
12652
12653 @@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
12654 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
12655 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
12656 %rax, (%r9));
12657 + pax_force_retaddr
12658 ret;
12659 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
12660
12661 @@ -780,6 +783,7 @@ __camellia_enc_blk16:
12662 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
12663 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
12664
12665 + pax_force_retaddr
12666 ret;
12667
12668 .align 8
12669 @@ -865,6 +869,7 @@ __camellia_dec_blk16:
12670 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
12671 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
12672
12673 + pax_force_retaddr
12674 ret;
12675
12676 .align 8
12677 @@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
12678 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
12679 %xmm8, %rsi);
12680
12681 + pax_force_retaddr
12682 ret;
12683 ENDPROC(camellia_ecb_enc_16way)
12684
12685 @@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
12686 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
12687 %xmm8, %rsi);
12688
12689 + pax_force_retaddr
12690 ret;
12691 ENDPROC(camellia_ecb_dec_16way)
12692
12693 @@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
12694 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
12695 %xmm8, %rsi);
12696
12697 + pax_force_retaddr
12698 ret;
12699 ENDPROC(camellia_cbc_dec_16way)
12700
12701 @@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
12702 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
12703 %xmm8, %rsi);
12704
12705 + pax_force_retaddr
12706 ret;
12707 ENDPROC(camellia_ctr_16way)
12708
12709 @@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
12710 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
12711 %xmm8, %rsi);
12712
12713 + pax_force_retaddr
12714 ret;
12715 ENDPROC(camellia_xts_crypt_16way)
12716
12717 diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
12718 index 0e0b886..5a3123c 100644
12719 --- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
12720 +++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
12721 @@ -11,6 +11,7 @@
12722 */
12723
12724 #include <linux/linkage.h>
12725 +#include <asm/alternative-asm.h>
12726
12727 #define CAMELLIA_TABLE_BYTE_LEN 272
12728
12729 @@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
12730 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
12731 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
12732 %rcx, (%r9));
12733 + pax_force_retaddr
12734 ret;
12735 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
12736
12737 @@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
12738 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
12739 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
12740 %rax, (%r9));
12741 + pax_force_retaddr
12742 ret;
12743 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
12744
12745 @@ -820,6 +823,7 @@ __camellia_enc_blk32:
12746 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
12747 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
12748
12749 + pax_force_retaddr
12750 ret;
12751
12752 .align 8
12753 @@ -905,6 +909,7 @@ __camellia_dec_blk32:
12754 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
12755 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
12756
12757 + pax_force_retaddr
12758 ret;
12759
12760 .align 8
12761 @@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
12762
12763 vzeroupper;
12764
12765 + pax_force_retaddr
12766 ret;
12767 ENDPROC(camellia_ecb_enc_32way)
12768
12769 @@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
12770
12771 vzeroupper;
12772
12773 + pax_force_retaddr
12774 ret;
12775 ENDPROC(camellia_ecb_dec_32way)
12776
12777 @@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
12778
12779 vzeroupper;
12780
12781 + pax_force_retaddr
12782 ret;
12783 ENDPROC(camellia_cbc_dec_32way)
12784
12785 @@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
12786
12787 vzeroupper;
12788
12789 + pax_force_retaddr
12790 ret;
12791 ENDPROC(camellia_ctr_32way)
12792
12793 @@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
12794
12795 vzeroupper;
12796
12797 + pax_force_retaddr
12798 ret;
12799 ENDPROC(camellia_xts_crypt_32way)
12800
12801 diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
12802 index 310319c..db3d7b5 100644
12803 --- a/arch/x86/crypto/camellia-x86_64-asm_64.S
12804 +++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
12805 @@ -21,6 +21,7 @@
12806 */
12807
12808 #include <linux/linkage.h>
12809 +#include <asm/alternative-asm.h>
12810
12811 .file "camellia-x86_64-asm_64.S"
12812 .text
12813 @@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
12814 enc_outunpack(mov, RT1);
12815
12816 movq RRBP, %rbp;
12817 + pax_force_retaddr
12818 ret;
12819
12820 .L__enc_xor:
12821 enc_outunpack(xor, RT1);
12822
12823 movq RRBP, %rbp;
12824 + pax_force_retaddr
12825 ret;
12826 ENDPROC(__camellia_enc_blk)
12827
12828 @@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
12829 dec_outunpack();
12830
12831 movq RRBP, %rbp;
12832 + pax_force_retaddr
12833 ret;
12834 ENDPROC(camellia_dec_blk)
12835
12836 @@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
12837
12838 movq RRBP, %rbp;
12839 popq %rbx;
12840 + pax_force_retaddr
12841 ret;
12842
12843 .L__enc2_xor:
12844 @@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
12845
12846 movq RRBP, %rbp;
12847 popq %rbx;
12848 + pax_force_retaddr
12849 ret;
12850 ENDPROC(__camellia_enc_blk_2way)
12851
12852 @@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
12853
12854 movq RRBP, %rbp;
12855 movq RXOR, %rbx;
12856 + pax_force_retaddr
12857 ret;
12858 ENDPROC(camellia_dec_blk_2way)
12859 diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
12860 index c35fd5d..2d8c7db 100644
12861 --- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
12862 +++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
12863 @@ -24,6 +24,7 @@
12864 */
12865
12866 #include <linux/linkage.h>
12867 +#include <asm/alternative-asm.h>
12868
12869 .file "cast5-avx-x86_64-asm_64.S"
12870
12871 @@ -281,6 +282,7 @@ __cast5_enc_blk16:
12872 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
12873 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
12874
12875 + pax_force_retaddr
12876 ret;
12877 ENDPROC(__cast5_enc_blk16)
12878
12879 @@ -352,6 +354,7 @@ __cast5_dec_blk16:
12880 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
12881 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
12882
12883 + pax_force_retaddr
12884 ret;
12885
12886 .L__skip_dec:
12887 @@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
12888 vmovdqu RR4, (6*4*4)(%r11);
12889 vmovdqu RL4, (7*4*4)(%r11);
12890
12891 + pax_force_retaddr
12892 ret;
12893 ENDPROC(cast5_ecb_enc_16way)
12894
12895 @@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
12896 vmovdqu RR4, (6*4*4)(%r11);
12897 vmovdqu RL4, (7*4*4)(%r11);
12898
12899 + pax_force_retaddr
12900 ret;
12901 ENDPROC(cast5_ecb_dec_16way)
12902
12903 @@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
12904 * %rdx: src
12905 */
12906
12907 - pushq %r12;
12908 + pushq %r14;
12909
12910 movq %rsi, %r11;
12911 - movq %rdx, %r12;
12912 + movq %rdx, %r14;
12913
12914 vmovdqu (0*16)(%rdx), RL1;
12915 vmovdqu (1*16)(%rdx), RR1;
12916 @@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
12917 call __cast5_dec_blk16;
12918
12919 /* xor with src */
12920 - vmovq (%r12), RX;
12921 + vmovq (%r14), RX;
12922 vpshufd $0x4f, RX, RX;
12923 vpxor RX, RR1, RR1;
12924 - vpxor 0*16+8(%r12), RL1, RL1;
12925 - vpxor 1*16+8(%r12), RR2, RR2;
12926 - vpxor 2*16+8(%r12), RL2, RL2;
12927 - vpxor 3*16+8(%r12), RR3, RR3;
12928 - vpxor 4*16+8(%r12), RL3, RL3;
12929 - vpxor 5*16+8(%r12), RR4, RR4;
12930 - vpxor 6*16+8(%r12), RL4, RL4;
12931 + vpxor 0*16+8(%r14), RL1, RL1;
12932 + vpxor 1*16+8(%r14), RR2, RR2;
12933 + vpxor 2*16+8(%r14), RL2, RL2;
12934 + vpxor 3*16+8(%r14), RR3, RR3;
12935 + vpxor 4*16+8(%r14), RL3, RL3;
12936 + vpxor 5*16+8(%r14), RR4, RR4;
12937 + vpxor 6*16+8(%r14), RL4, RL4;
12938
12939 vmovdqu RR1, (0*16)(%r11);
12940 vmovdqu RL1, (1*16)(%r11);
12941 @@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
12942 vmovdqu RR4, (6*16)(%r11);
12943 vmovdqu RL4, (7*16)(%r11);
12944
12945 - popq %r12;
12946 + popq %r14;
12947
12948 + pax_force_retaddr
12949 ret;
12950 ENDPROC(cast5_cbc_dec_16way)
12951
12952 @@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
12953 * %rcx: iv (big endian, 64bit)
12954 */
12955
12956 - pushq %r12;
12957 + pushq %r14;
12958
12959 movq %rsi, %r11;
12960 - movq %rdx, %r12;
12961 + movq %rdx, %r14;
12962
12963 vpcmpeqd RTMP, RTMP, RTMP;
12964 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
12965 @@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
12966 call __cast5_enc_blk16;
12967
12968 /* dst = src ^ iv */
12969 - vpxor (0*16)(%r12), RR1, RR1;
12970 - vpxor (1*16)(%r12), RL1, RL1;
12971 - vpxor (2*16)(%r12), RR2, RR2;
12972 - vpxor (3*16)(%r12), RL2, RL2;
12973 - vpxor (4*16)(%r12), RR3, RR3;
12974 - vpxor (5*16)(%r12), RL3, RL3;
12975 - vpxor (6*16)(%r12), RR4, RR4;
12976 - vpxor (7*16)(%r12), RL4, RL4;
12977 + vpxor (0*16)(%r14), RR1, RR1;
12978 + vpxor (1*16)(%r14), RL1, RL1;
12979 + vpxor (2*16)(%r14), RR2, RR2;
12980 + vpxor (3*16)(%r14), RL2, RL2;
12981 + vpxor (4*16)(%r14), RR3, RR3;
12982 + vpxor (5*16)(%r14), RL3, RL3;
12983 + vpxor (6*16)(%r14), RR4, RR4;
12984 + vpxor (7*16)(%r14), RL4, RL4;
12985 vmovdqu RR1, (0*16)(%r11);
12986 vmovdqu RL1, (1*16)(%r11);
12987 vmovdqu RR2, (2*16)(%r11);
12988 @@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
12989 vmovdqu RR4, (6*16)(%r11);
12990 vmovdqu RL4, (7*16)(%r11);
12991
12992 - popq %r12;
12993 + popq %r14;
12994
12995 + pax_force_retaddr
12996 ret;
12997 ENDPROC(cast5_ctr_16way)
12998 diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
12999 index e3531f8..e123f35 100644
13000 --- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13001 +++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13002 @@ -24,6 +24,7 @@
13003 */
13004
13005 #include <linux/linkage.h>
13006 +#include <asm/alternative-asm.h>
13007 #include "glue_helper-asm-avx.S"
13008
13009 .file "cast6-avx-x86_64-asm_64.S"
13010 @@ -295,6 +296,7 @@ __cast6_enc_blk8:
13011 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13012 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13013
13014 + pax_force_retaddr
13015 ret;
13016 ENDPROC(__cast6_enc_blk8)
13017
13018 @@ -340,6 +342,7 @@ __cast6_dec_blk8:
13019 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13020 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13021
13022 + pax_force_retaddr
13023 ret;
13024 ENDPROC(__cast6_dec_blk8)
13025
13026 @@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13027
13028 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13029
13030 + pax_force_retaddr
13031 ret;
13032 ENDPROC(cast6_ecb_enc_8way)
13033
13034 @@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13035
13036 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13037
13038 + pax_force_retaddr
13039 ret;
13040 ENDPROC(cast6_ecb_dec_8way)
13041
13042 @@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13043 * %rdx: src
13044 */
13045
13046 - pushq %r12;
13047 + pushq %r14;
13048
13049 movq %rsi, %r11;
13050 - movq %rdx, %r12;
13051 + movq %rdx, %r14;
13052
13053 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13054
13055 call __cast6_dec_blk8;
13056
13057 - store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13058 + store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13059
13060 - popq %r12;
13061 + popq %r14;
13062
13063 + pax_force_retaddr
13064 ret;
13065 ENDPROC(cast6_cbc_dec_8way)
13066
13067 @@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13068 * %rcx: iv (little endian, 128bit)
13069 */
13070
13071 - pushq %r12;
13072 + pushq %r14;
13073
13074 movq %rsi, %r11;
13075 - movq %rdx, %r12;
13076 + movq %rdx, %r14;
13077
13078 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13079 RD2, RX, RKR, RKM);
13080
13081 call __cast6_enc_blk8;
13082
13083 - store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13084 + store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13085
13086 - popq %r12;
13087 + popq %r14;
13088
13089 + pax_force_retaddr
13090 ret;
13091 ENDPROC(cast6_ctr_8way)
13092
13093 @@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13094 /* dst <= regs xor IVs(in dst) */
13095 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13096
13097 + pax_force_retaddr
13098 ret;
13099 ENDPROC(cast6_xts_enc_8way)
13100
13101 @@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13102 /* dst <= regs xor IVs(in dst) */
13103 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13104
13105 + pax_force_retaddr
13106 ret;
13107 ENDPROC(cast6_xts_dec_8way)
13108 diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13109 index dbc4339..de6e120 100644
13110 --- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13111 +++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13112 @@ -45,6 +45,7 @@
13113
13114 #include <asm/inst.h>
13115 #include <linux/linkage.h>
13116 +#include <asm/alternative-asm.h>
13117
13118 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
13119
13120 @@ -312,6 +313,7 @@ do_return:
13121 popq %rsi
13122 popq %rdi
13123 popq %rbx
13124 + pax_force_retaddr
13125 ret
13126
13127 ################################################################
13128 diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
13129 index 586f41a..d02851e 100644
13130 --- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
13131 +++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
13132 @@ -18,6 +18,7 @@
13133
13134 #include <linux/linkage.h>
13135 #include <asm/inst.h>
13136 +#include <asm/alternative-asm.h>
13137
13138 .data
13139
13140 @@ -93,6 +94,7 @@ __clmul_gf128mul_ble:
13141 psrlq $1, T2
13142 pxor T2, T1
13143 pxor T1, DATA
13144 + pax_force_retaddr
13145 ret
13146 ENDPROC(__clmul_gf128mul_ble)
13147
13148 @@ -105,6 +107,7 @@ ENTRY(clmul_ghash_mul)
13149 call __clmul_gf128mul_ble
13150 PSHUFB_XMM BSWAP DATA
13151 movups DATA, (%rdi)
13152 + pax_force_retaddr
13153 ret
13154 ENDPROC(clmul_ghash_mul)
13155
13156 @@ -132,6 +135,7 @@ ENTRY(clmul_ghash_update)
13157 PSHUFB_XMM BSWAP DATA
13158 movups DATA, (%rdi)
13159 .Lupdate_just_ret:
13160 + pax_force_retaddr
13161 ret
13162 ENDPROC(clmul_ghash_update)
13163
13164 @@ -157,5 +161,6 @@ ENTRY(clmul_ghash_setkey)
13165 pand .Lpoly, %xmm1
13166 pxor %xmm1, %xmm0
13167 movups %xmm0, (%rdi)
13168 + pax_force_retaddr
13169 ret
13170 ENDPROC(clmul_ghash_setkey)
13171 diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
13172 index 9279e0b..c4b3d2c 100644
13173 --- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
13174 +++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
13175 @@ -1,4 +1,5 @@
13176 #include <linux/linkage.h>
13177 +#include <asm/alternative-asm.h>
13178
13179 # enter salsa20_encrypt_bytes
13180 ENTRY(salsa20_encrypt_bytes)
13181 @@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
13182 add %r11,%rsp
13183 mov %rdi,%rax
13184 mov %rsi,%rdx
13185 + pax_force_retaddr
13186 ret
13187 # bytesatleast65:
13188 ._bytesatleast65:
13189 @@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
13190 add %r11,%rsp
13191 mov %rdi,%rax
13192 mov %rsi,%rdx
13193 + pax_force_retaddr
13194 ret
13195 ENDPROC(salsa20_keysetup)
13196
13197 @@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
13198 add %r11,%rsp
13199 mov %rdi,%rax
13200 mov %rsi,%rdx
13201 + pax_force_retaddr
13202 ret
13203 ENDPROC(salsa20_ivsetup)
13204 diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
13205 index 2f202f4..d9164d6 100644
13206 --- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
13207 +++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
13208 @@ -24,6 +24,7 @@
13209 */
13210
13211 #include <linux/linkage.h>
13212 +#include <asm/alternative-asm.h>
13213 #include "glue_helper-asm-avx.S"
13214
13215 .file "serpent-avx-x86_64-asm_64.S"
13216 @@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
13217 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13218 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13219
13220 + pax_force_retaddr
13221 ret;
13222 ENDPROC(__serpent_enc_blk8_avx)
13223
13224 @@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
13225 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
13226 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
13227
13228 + pax_force_retaddr
13229 ret;
13230 ENDPROC(__serpent_dec_blk8_avx)
13231
13232 @@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
13233
13234 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13235
13236 + pax_force_retaddr
13237 ret;
13238 ENDPROC(serpent_ecb_enc_8way_avx)
13239
13240 @@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
13241
13242 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
13243
13244 + pax_force_retaddr
13245 ret;
13246 ENDPROC(serpent_ecb_dec_8way_avx)
13247
13248 @@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
13249
13250 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
13251
13252 + pax_force_retaddr
13253 ret;
13254 ENDPROC(serpent_cbc_dec_8way_avx)
13255
13256 @@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
13257
13258 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13259
13260 + pax_force_retaddr
13261 ret;
13262 ENDPROC(serpent_ctr_8way_avx)
13263
13264 @@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
13265 /* dst <= regs xor IVs(in dst) */
13266 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13267
13268 + pax_force_retaddr
13269 ret;
13270 ENDPROC(serpent_xts_enc_8way_avx)
13271
13272 @@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
13273 /* dst <= regs xor IVs(in dst) */
13274 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
13275
13276 + pax_force_retaddr
13277 ret;
13278 ENDPROC(serpent_xts_dec_8way_avx)
13279 diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
13280 index b222085..abd483c 100644
13281 --- a/arch/x86/crypto/serpent-avx2-asm_64.S
13282 +++ b/arch/x86/crypto/serpent-avx2-asm_64.S
13283 @@ -15,6 +15,7 @@
13284 */
13285
13286 #include <linux/linkage.h>
13287 +#include <asm/alternative-asm.h>
13288 #include "glue_helper-asm-avx2.S"
13289
13290 .file "serpent-avx2-asm_64.S"
13291 @@ -610,6 +611,7 @@ __serpent_enc_blk16:
13292 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13293 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13294
13295 + pax_force_retaddr
13296 ret;
13297 ENDPROC(__serpent_enc_blk16)
13298
13299 @@ -664,6 +666,7 @@ __serpent_dec_blk16:
13300 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
13301 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
13302
13303 + pax_force_retaddr
13304 ret;
13305 ENDPROC(__serpent_dec_blk16)
13306
13307 @@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
13308
13309 vzeroupper;
13310
13311 + pax_force_retaddr
13312 ret;
13313 ENDPROC(serpent_ecb_enc_16way)
13314
13315 @@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
13316
13317 vzeroupper;
13318
13319 + pax_force_retaddr
13320 ret;
13321 ENDPROC(serpent_ecb_dec_16way)
13322
13323 @@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
13324
13325 vzeroupper;
13326
13327 + pax_force_retaddr
13328 ret;
13329 ENDPROC(serpent_cbc_dec_16way)
13330
13331 @@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
13332
13333 vzeroupper;
13334
13335 + pax_force_retaddr
13336 ret;
13337 ENDPROC(serpent_ctr_16way)
13338
13339 @@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
13340
13341 vzeroupper;
13342
13343 + pax_force_retaddr
13344 ret;
13345 ENDPROC(serpent_xts_enc_16way)
13346
13347 @@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
13348
13349 vzeroupper;
13350
13351 + pax_force_retaddr
13352 ret;
13353 ENDPROC(serpent_xts_dec_16way)
13354 diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
13355 index acc066c..1559cc4 100644
13356 --- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
13357 +++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
13358 @@ -25,6 +25,7 @@
13359 */
13360
13361 #include <linux/linkage.h>
13362 +#include <asm/alternative-asm.h>
13363
13364 .file "serpent-sse2-x86_64-asm_64.S"
13365 .text
13366 @@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
13367 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13368 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13369
13370 + pax_force_retaddr
13371 ret;
13372
13373 .L__enc_xor8:
13374 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13375 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13376
13377 + pax_force_retaddr
13378 ret;
13379 ENDPROC(__serpent_enc_blk_8way)
13380
13381 @@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
13382 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
13383 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
13384
13385 + pax_force_retaddr
13386 ret;
13387 ENDPROC(serpent_dec_blk_8way)
13388 diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
13389 index a410950..9dfe7ad 100644
13390 --- a/arch/x86/crypto/sha1_ssse3_asm.S
13391 +++ b/arch/x86/crypto/sha1_ssse3_asm.S
13392 @@ -29,6 +29,7 @@
13393 */
13394
13395 #include <linux/linkage.h>
13396 +#include <asm/alternative-asm.h>
13397
13398 #define CTX %rdi // arg1
13399 #define BUF %rsi // arg2
13400 @@ -75,9 +76,9 @@
13401
13402 push %rbx
13403 push %rbp
13404 - push %r12
13405 + push %r14
13406
13407 - mov %rsp, %r12
13408 + mov %rsp, %r14
13409 sub $64, %rsp # allocate workspace
13410 and $~15, %rsp # align stack
13411
13412 @@ -99,11 +100,12 @@
13413 xor %rax, %rax
13414 rep stosq
13415
13416 - mov %r12, %rsp # deallocate workspace
13417 + mov %r14, %rsp # deallocate workspace
13418
13419 - pop %r12
13420 + pop %r14
13421 pop %rbp
13422 pop %rbx
13423 + pax_force_retaddr
13424 ret
13425
13426 ENDPROC(\name)
13427 diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
13428 index 642f156..51a513c 100644
13429 --- a/arch/x86/crypto/sha256-avx-asm.S
13430 +++ b/arch/x86/crypto/sha256-avx-asm.S
13431 @@ -49,6 +49,7 @@
13432
13433 #ifdef CONFIG_AS_AVX
13434 #include <linux/linkage.h>
13435 +#include <asm/alternative-asm.h>
13436
13437 ## assume buffers not aligned
13438 #define VMOVDQ vmovdqu
13439 @@ -460,6 +461,7 @@ done_hash:
13440 popq %r13
13441 popq %rbp
13442 popq %rbx
13443 + pax_force_retaddr
13444 ret
13445 ENDPROC(sha256_transform_avx)
13446
13447 diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
13448 index 9e86944..3795e6a 100644
13449 --- a/arch/x86/crypto/sha256-avx2-asm.S
13450 +++ b/arch/x86/crypto/sha256-avx2-asm.S
13451 @@ -50,6 +50,7 @@
13452
13453 #ifdef CONFIG_AS_AVX2
13454 #include <linux/linkage.h>
13455 +#include <asm/alternative-asm.h>
13456
13457 ## assume buffers not aligned
13458 #define VMOVDQ vmovdqu
13459 @@ -720,6 +721,7 @@ done_hash:
13460 popq %r12
13461 popq %rbp
13462 popq %rbx
13463 + pax_force_retaddr
13464 ret
13465 ENDPROC(sha256_transform_rorx)
13466
13467 diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
13468 index f833b74..8c62a9e 100644
13469 --- a/arch/x86/crypto/sha256-ssse3-asm.S
13470 +++ b/arch/x86/crypto/sha256-ssse3-asm.S
13471 @@ -47,6 +47,7 @@
13472 ########################################################################
13473
13474 #include <linux/linkage.h>
13475 +#include <asm/alternative-asm.h>
13476
13477 ## assume buffers not aligned
13478 #define MOVDQ movdqu
13479 @@ -471,6 +472,7 @@ done_hash:
13480 popq %rbp
13481 popq %rbx
13482
13483 + pax_force_retaddr
13484 ret
13485 ENDPROC(sha256_transform_ssse3)
13486
13487 diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
13488 index 974dde9..a823ff9 100644
13489 --- a/arch/x86/crypto/sha512-avx-asm.S
13490 +++ b/arch/x86/crypto/sha512-avx-asm.S
13491 @@ -49,6 +49,7 @@
13492
13493 #ifdef CONFIG_AS_AVX
13494 #include <linux/linkage.h>
13495 +#include <asm/alternative-asm.h>
13496
13497 .text
13498
13499 @@ -364,6 +365,7 @@ updateblock:
13500 mov frame_RSPSAVE(%rsp), %rsp
13501
13502 nowork:
13503 + pax_force_retaddr
13504 ret
13505 ENDPROC(sha512_transform_avx)
13506
13507 diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
13508 index 568b961..ed20c37 100644
13509 --- a/arch/x86/crypto/sha512-avx2-asm.S
13510 +++ b/arch/x86/crypto/sha512-avx2-asm.S
13511 @@ -51,6 +51,7 @@
13512
13513 #ifdef CONFIG_AS_AVX2
13514 #include <linux/linkage.h>
13515 +#include <asm/alternative-asm.h>
13516
13517 .text
13518
13519 @@ -678,6 +679,7 @@ done_hash:
13520
13521 # Restore Stack Pointer
13522 mov frame_RSPSAVE(%rsp), %rsp
13523 + pax_force_retaddr
13524 ret
13525 ENDPROC(sha512_transform_rorx)
13526
13527 diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
13528 index fb56855..6edd768 100644
13529 --- a/arch/x86/crypto/sha512-ssse3-asm.S
13530 +++ b/arch/x86/crypto/sha512-ssse3-asm.S
13531 @@ -48,6 +48,7 @@
13532 ########################################################################
13533
13534 #include <linux/linkage.h>
13535 +#include <asm/alternative-asm.h>
13536
13537 .text
13538
13539 @@ -363,6 +364,7 @@ updateblock:
13540 mov frame_RSPSAVE(%rsp), %rsp
13541
13542 nowork:
13543 + pax_force_retaddr
13544 ret
13545 ENDPROC(sha512_transform_ssse3)
13546
13547 diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
13548 index 0505813..b067311 100644
13549 --- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
13550 +++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
13551 @@ -24,6 +24,7 @@
13552 */
13553
13554 #include <linux/linkage.h>
13555 +#include <asm/alternative-asm.h>
13556 #include "glue_helper-asm-avx.S"
13557
13558 .file "twofish-avx-x86_64-asm_64.S"
13559 @@ -284,6 +285,7 @@ __twofish_enc_blk8:
13560 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
13561 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
13562
13563 + pax_force_retaddr
13564 ret;
13565 ENDPROC(__twofish_enc_blk8)
13566
13567 @@ -324,6 +326,7 @@ __twofish_dec_blk8:
13568 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
13569 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
13570
13571 + pax_force_retaddr
13572 ret;
13573 ENDPROC(__twofish_dec_blk8)
13574
13575 @@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
13576
13577 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
13578
13579 + pax_force_retaddr
13580 ret;
13581 ENDPROC(twofish_ecb_enc_8way)
13582
13583 @@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
13584
13585 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13586
13587 + pax_force_retaddr
13588 ret;
13589 ENDPROC(twofish_ecb_dec_8way)
13590
13591 @@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
13592 * %rdx: src
13593 */
13594
13595 - pushq %r12;
13596 + pushq %r14;
13597
13598 movq %rsi, %r11;
13599 - movq %rdx, %r12;
13600 + movq %rdx, %r14;
13601
13602 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
13603
13604 call __twofish_dec_blk8;
13605
13606 - store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13607 + store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13608
13609 - popq %r12;
13610 + popq %r14;
13611
13612 + pax_force_retaddr
13613 ret;
13614 ENDPROC(twofish_cbc_dec_8way)
13615
13616 @@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
13617 * %rcx: iv (little endian, 128bit)
13618 */
13619
13620 - pushq %r12;
13621 + pushq %r14;
13622
13623 movq %rsi, %r11;
13624 - movq %rdx, %r12;
13625 + movq %rdx, %r14;
13626
13627 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13628 RD2, RX0, RX1, RY0);
13629
13630 call __twofish_enc_blk8;
13631
13632 - store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
13633 + store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
13634
13635 - popq %r12;
13636 + popq %r14;
13637
13638 + pax_force_retaddr
13639 ret;
13640 ENDPROC(twofish_ctr_8way)
13641
13642 @@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
13643 /* dst <= regs xor IVs(in dst) */
13644 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
13645
13646 + pax_force_retaddr
13647 ret;
13648 ENDPROC(twofish_xts_enc_8way)
13649
13650 @@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
13651 /* dst <= regs xor IVs(in dst) */
13652 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13653
13654 + pax_force_retaddr
13655 ret;
13656 ENDPROC(twofish_xts_dec_8way)
13657 diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
13658 index 1c3b7ce..02f578d 100644
13659 --- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
13660 +++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
13661 @@ -21,6 +21,7 @@
13662 */
13663
13664 #include <linux/linkage.h>
13665 +#include <asm/alternative-asm.h>
13666
13667 .file "twofish-x86_64-asm-3way.S"
13668 .text
13669 @@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
13670 popq %r13;
13671 popq %r14;
13672 popq %r15;
13673 + pax_force_retaddr
13674 ret;
13675
13676 .L__enc_xor3:
13677 @@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
13678 popq %r13;
13679 popq %r14;
13680 popq %r15;
13681 + pax_force_retaddr
13682 ret;
13683 ENDPROC(__twofish_enc_blk_3way)
13684
13685 @@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
13686 popq %r13;
13687 popq %r14;
13688 popq %r15;
13689 + pax_force_retaddr
13690 ret;
13691 ENDPROC(twofish_dec_blk_3way)
13692 diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
13693 index a039d21..524b8b2 100644
13694 --- a/arch/x86/crypto/twofish-x86_64-asm_64.S
13695 +++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
13696 @@ -22,6 +22,7 @@
13697
13698 #include <linux/linkage.h>
13699 #include <asm/asm-offsets.h>
13700 +#include <asm/alternative-asm.h>
13701
13702 #define a_offset 0
13703 #define b_offset 4
13704 @@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
13705
13706 popq R1
13707 movq $1,%rax
13708 + pax_force_retaddr
13709 ret
13710 ENDPROC(twofish_enc_blk)
13711
13712 @@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
13713
13714 popq R1
13715 movq $1,%rax
13716 + pax_force_retaddr
13717 ret
13718 ENDPROC(twofish_dec_blk)
13719 diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
13720 index bae3aba..c1788c1 100644
13721 --- a/arch/x86/ia32/ia32_aout.c
13722 +++ b/arch/x86/ia32/ia32_aout.c
13723 @@ -159,6 +159,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
13724 unsigned long dump_start, dump_size;
13725 struct user32 dump;
13726
13727 + memset(&dump, 0, sizeof(dump));
13728 +
13729 fs = get_fs();
13730 set_fs(KERNEL_DS);
13731 has_dumped = 1;
13732 diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
13733 index 665a730..8e7a67a 100644
13734 --- a/arch/x86/ia32/ia32_signal.c
13735 +++ b/arch/x86/ia32/ia32_signal.c
13736 @@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
13737 sp -= frame_size;
13738 /* Align the stack pointer according to the i386 ABI,
13739 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
13740 - sp = ((sp + 4) & -16ul) - 4;
13741 + sp = ((sp - 12) & -16ul) - 4;
13742 return (void __user *) sp;
13743 }
13744
13745 @@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
13746 * These are actually not used anymore, but left because some
13747 * gdb versions depend on them as a marker.
13748 */
13749 - put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
13750 + put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
13751 } put_user_catch(err);
13752
13753 if (err)
13754 @@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
13755 0xb8,
13756 __NR_ia32_rt_sigreturn,
13757 0x80cd,
13758 - 0,
13759 + 0
13760 };
13761
13762 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
13763 @@ -461,16 +461,18 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
13764
13765 if (ksig->ka.sa.sa_flags & SA_RESTORER)
13766 restorer = ksig->ka.sa.sa_restorer;
13767 + else if (current->mm->context.vdso)
13768 + /* Return stub is in 32bit vsyscall page */
13769 + restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
13770 else
13771 - restorer = VDSO32_SYMBOL(current->mm->context.vdso,
13772 - rt_sigreturn);
13773 + restorer = &frame->retcode;
13774 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
13775
13776 /*
13777 * Not actually used anymore, but left because some gdb
13778 * versions need it.
13779 */
13780 - put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
13781 + put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
13782 } put_user_catch(err);
13783
13784 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
13785 diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
13786 index 4299eb0..c0687a7 100644
13787 --- a/arch/x86/ia32/ia32entry.S
13788 +++ b/arch/x86/ia32/ia32entry.S
13789 @@ -15,8 +15,10 @@
13790 #include <asm/irqflags.h>
13791 #include <asm/asm.h>
13792 #include <asm/smap.h>
13793 +#include <asm/pgtable.h>
13794 #include <linux/linkage.h>
13795 #include <linux/err.h>
13796 +#include <asm/alternative-asm.h>
13797
13798 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
13799 #include <linux/elf-em.h>
13800 @@ -62,12 +64,12 @@
13801 */
13802 .macro LOAD_ARGS32 offset, _r9=0
13803 .if \_r9
13804 - movl \offset+16(%rsp),%r9d
13805 + movl \offset+R9(%rsp),%r9d
13806 .endif
13807 - movl \offset+40(%rsp),%ecx
13808 - movl \offset+48(%rsp),%edx
13809 - movl \offset+56(%rsp),%esi
13810 - movl \offset+64(%rsp),%edi
13811 + movl \offset+RCX(%rsp),%ecx
13812 + movl \offset+RDX(%rsp),%edx
13813 + movl \offset+RSI(%rsp),%esi
13814 + movl \offset+RDI(%rsp),%edi
13815 movl %eax,%eax /* zero extension */
13816 .endm
13817
13818 @@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
13819 ENDPROC(native_irq_enable_sysexit)
13820 #endif
13821
13822 + .macro pax_enter_kernel_user
13823 + pax_set_fptr_mask
13824 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13825 + call pax_enter_kernel_user
13826 +#endif
13827 + .endm
13828 +
13829 + .macro pax_exit_kernel_user
13830 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13831 + call pax_exit_kernel_user
13832 +#endif
13833 +#ifdef CONFIG_PAX_RANDKSTACK
13834 + pushq %rax
13835 + pushq %r11
13836 + call pax_randomize_kstack
13837 + popq %r11
13838 + popq %rax
13839 +#endif
13840 + .endm
13841 +
13842 + .macro pax_erase_kstack
13843 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
13844 + call pax_erase_kstack
13845 +#endif
13846 + .endm
13847 +
13848 /*
13849 * 32bit SYSENTER instruction entry.
13850 *
13851 @@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
13852 CFI_REGISTER rsp,rbp
13853 SWAPGS_UNSAFE_STACK
13854 movq PER_CPU_VAR(kernel_stack), %rsp
13855 - addq $(KERNEL_STACK_OFFSET),%rsp
13856 - /*
13857 - * No need to follow this irqs on/off section: the syscall
13858 - * disabled irqs, here we enable it straight after entry:
13859 - */
13860 - ENABLE_INTERRUPTS(CLBR_NONE)
13861 movl %ebp,%ebp /* zero extension */
13862 pushq_cfi $__USER32_DS
13863 /*CFI_REL_OFFSET ss,0*/
13864 @@ -135,24 +157,49 @@ ENTRY(ia32_sysenter_target)
13865 CFI_REL_OFFSET rsp,0
13866 pushfq_cfi
13867 /*CFI_REL_OFFSET rflags,0*/
13868 - movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
13869 - CFI_REGISTER rip,r10
13870 + orl $X86_EFLAGS_IF,(%rsp)
13871 + GET_THREAD_INFO(%r11)
13872 + movl TI_sysenter_return(%r11), %r11d
13873 + CFI_REGISTER rip,r11
13874 pushq_cfi $__USER32_CS
13875 /*CFI_REL_OFFSET cs,0*/
13876 movl %eax, %eax
13877 - pushq_cfi %r10
13878 + pushq_cfi %r11
13879 CFI_REL_OFFSET rip,0
13880 pushq_cfi %rax
13881 cld
13882 SAVE_ARGS 0,1,0
13883 + pax_enter_kernel_user
13884 +
13885 +#ifdef CONFIG_PAX_RANDKSTACK
13886 + pax_erase_kstack
13887 +#endif
13888 +
13889 + /*
13890 + * No need to follow this irqs on/off section: the syscall
13891 + * disabled irqs, here we enable it straight after entry:
13892 + */
13893 + ENABLE_INTERRUPTS(CLBR_NONE)
13894 /* no need to do an access_ok check here because rbp has been
13895 32bit zero extended */
13896 +
13897 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13898 + addq pax_user_shadow_base,%rbp
13899 + ASM_PAX_OPEN_USERLAND
13900 +#endif
13901 +
13902 ASM_STAC
13903 1: movl (%rbp),%ebp
13904 _ASM_EXTABLE(1b,ia32_badarg)
13905 ASM_CLAC
13906 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
13907 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
13908 +
13909 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13910 + ASM_PAX_CLOSE_USERLAND
13911 +#endif
13912 +
13913 + GET_THREAD_INFO(%r11)
13914 + orl $TS_COMPAT,TI_status(%r11)
13915 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
13916 CFI_REMEMBER_STATE
13917 jnz sysenter_tracesys
13918 cmpq $(IA32_NR_syscalls-1),%rax
13919 @@ -162,15 +209,18 @@ sysenter_do_call:
13920 sysenter_dispatch:
13921 call *ia32_sys_call_table(,%rax,8)
13922 movq %rax,RAX-ARGOFFSET(%rsp)
13923 + GET_THREAD_INFO(%r11)
13924 DISABLE_INTERRUPTS(CLBR_NONE)
13925 TRACE_IRQS_OFF
13926 - testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
13927 + testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
13928 jnz sysexit_audit
13929 sysexit_from_sys_call:
13930 - andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
13931 + pax_exit_kernel_user
13932 + pax_erase_kstack
13933 + andl $~TS_COMPAT,TI_status(%r11)
13934 /* clear IF, that popfq doesn't enable interrupts early */
13935 - andl $~0x200,EFLAGS-R11(%rsp)
13936 - movl RIP-R11(%rsp),%edx /* User %eip */
13937 + andl $~X86_EFLAGS_IF,EFLAGS(%rsp)
13938 + movl RIP(%rsp),%edx /* User %eip */
13939 CFI_REGISTER rip,rdx
13940 RESTORE_ARGS 0,24,0,0,0,0
13941 xorq %r8,%r8
13942 @@ -193,6 +243,9 @@ sysexit_from_sys_call:
13943 movl %eax,%esi /* 2nd arg: syscall number */
13944 movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
13945 call __audit_syscall_entry
13946 +
13947 + pax_erase_kstack
13948 +
13949 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
13950 cmpq $(IA32_NR_syscalls-1),%rax
13951 ja ia32_badsys
13952 @@ -204,7 +257,7 @@ sysexit_from_sys_call:
13953 .endm
13954
13955 .macro auditsys_exit exit
13956 - testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
13957 + testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
13958 jnz ia32_ret_from_sys_call
13959 TRACE_IRQS_ON
13960 ENABLE_INTERRUPTS(CLBR_NONE)
13961 @@ -215,11 +268,12 @@ sysexit_from_sys_call:
13962 1: setbe %al /* 1 if error, 0 if not */
13963 movzbl %al,%edi /* zero-extend that into %edi */
13964 call __audit_syscall_exit
13965 + GET_THREAD_INFO(%r11)
13966 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
13967 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
13968 DISABLE_INTERRUPTS(CLBR_NONE)
13969 TRACE_IRQS_OFF
13970 - testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
13971 + testl %edi,TI_flags(%r11)
13972 jz \exit
13973 CLEAR_RREGS -ARGOFFSET
13974 jmp int_with_check
13975 @@ -237,7 +291,7 @@ sysexit_audit:
13976
13977 sysenter_tracesys:
13978 #ifdef CONFIG_AUDITSYSCALL
13979 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
13980 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
13981 jz sysenter_auditsys
13982 #endif
13983 SAVE_REST
13984 @@ -249,6 +303,9 @@ sysenter_tracesys:
13985 RESTORE_REST
13986 cmpq $(IA32_NR_syscalls-1),%rax
13987 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
13988 +
13989 + pax_erase_kstack
13990 +
13991 jmp sysenter_do_call
13992 CFI_ENDPROC
13993 ENDPROC(ia32_sysenter_target)
13994 @@ -276,19 +333,25 @@ ENDPROC(ia32_sysenter_target)
13995 ENTRY(ia32_cstar_target)
13996 CFI_STARTPROC32 simple
13997 CFI_SIGNAL_FRAME
13998 - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
13999 + CFI_DEF_CFA rsp,0
14000 CFI_REGISTER rip,rcx
14001 /*CFI_REGISTER rflags,r11*/
14002 SWAPGS_UNSAFE_STACK
14003 movl %esp,%r8d
14004 CFI_REGISTER rsp,r8
14005 movq PER_CPU_VAR(kernel_stack),%rsp
14006 + SAVE_ARGS 8*6,0,0
14007 + pax_enter_kernel_user
14008 +
14009 +#ifdef CONFIG_PAX_RANDKSTACK
14010 + pax_erase_kstack
14011 +#endif
14012 +
14013 /*
14014 * No need to follow this irqs on/off section: the syscall
14015 * disabled irqs and here we enable it straight after entry:
14016 */
14017 ENABLE_INTERRUPTS(CLBR_NONE)
14018 - SAVE_ARGS 8,0,0
14019 movl %eax,%eax /* zero extension */
14020 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14021 movq %rcx,RIP-ARGOFFSET(%rsp)
14022 @@ -304,12 +367,25 @@ ENTRY(ia32_cstar_target)
14023 /* no need to do an access_ok check here because r8 has been
14024 32bit zero extended */
14025 /* hardware stack frame is complete now */
14026 +
14027 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14028 + ASM_PAX_OPEN_USERLAND
14029 + movq pax_user_shadow_base,%r8
14030 + addq RSP-ARGOFFSET(%rsp),%r8
14031 +#endif
14032 +
14033 ASM_STAC
14034 1: movl (%r8),%r9d
14035 _ASM_EXTABLE(1b,ia32_badarg)
14036 ASM_CLAC
14037 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14038 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14039 +
14040 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14041 + ASM_PAX_CLOSE_USERLAND
14042 +#endif
14043 +
14044 + GET_THREAD_INFO(%r11)
14045 + orl $TS_COMPAT,TI_status(%r11)
14046 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14047 CFI_REMEMBER_STATE
14048 jnz cstar_tracesys
14049 cmpq $IA32_NR_syscalls-1,%rax
14050 @@ -319,13 +395,16 @@ cstar_do_call:
14051 cstar_dispatch:
14052 call *ia32_sys_call_table(,%rax,8)
14053 movq %rax,RAX-ARGOFFSET(%rsp)
14054 + GET_THREAD_INFO(%r11)
14055 DISABLE_INTERRUPTS(CLBR_NONE)
14056 TRACE_IRQS_OFF
14057 - testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14058 + testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14059 jnz sysretl_audit
14060 sysretl_from_sys_call:
14061 - andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14062 - RESTORE_ARGS 0,-ARG_SKIP,0,0,0
14063 + pax_exit_kernel_user
14064 + pax_erase_kstack
14065 + andl $~TS_COMPAT,TI_status(%r11)
14066 + RESTORE_ARGS 0,-ORIG_RAX,0,0,0
14067 movl RIP-ARGOFFSET(%rsp),%ecx
14068 CFI_REGISTER rip,rcx
14069 movl EFLAGS-ARGOFFSET(%rsp),%r11d
14070 @@ -352,7 +431,7 @@ sysretl_audit:
14071
14072 cstar_tracesys:
14073 #ifdef CONFIG_AUDITSYSCALL
14074 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14075 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14076 jz cstar_auditsys
14077 #endif
14078 xchgl %r9d,%ebp
14079 @@ -366,11 +445,19 @@ cstar_tracesys:
14080 xchgl %ebp,%r9d
14081 cmpq $(IA32_NR_syscalls-1),%rax
14082 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14083 +
14084 + pax_erase_kstack
14085 +
14086 jmp cstar_do_call
14087 END(ia32_cstar_target)
14088
14089 ia32_badarg:
14090 ASM_CLAC
14091 +
14092 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14093 + ASM_PAX_CLOSE_USERLAND
14094 +#endif
14095 +
14096 movq $-EFAULT,%rax
14097 jmp ia32_sysret
14098 CFI_ENDPROC
14099 @@ -407,19 +494,26 @@ ENTRY(ia32_syscall)
14100 CFI_REL_OFFSET rip,RIP-RIP
14101 PARAVIRT_ADJUST_EXCEPTION_FRAME
14102 SWAPGS
14103 - /*
14104 - * No need to follow this irqs on/off section: the syscall
14105 - * disabled irqs and here we enable it straight after entry:
14106 - */
14107 - ENABLE_INTERRUPTS(CLBR_NONE)
14108 movl %eax,%eax
14109 pushq_cfi %rax
14110 cld
14111 /* note the registers are not zero extended to the sf.
14112 this could be a problem. */
14113 SAVE_ARGS 0,1,0
14114 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14115 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14116 + pax_enter_kernel_user
14117 +
14118 +#ifdef CONFIG_PAX_RANDKSTACK
14119 + pax_erase_kstack
14120 +#endif
14121 +
14122 + /*
14123 + * No need to follow this irqs on/off section: the syscall
14124 + * disabled irqs and here we enable it straight after entry:
14125 + */
14126 + ENABLE_INTERRUPTS(CLBR_NONE)
14127 + GET_THREAD_INFO(%r11)
14128 + orl $TS_COMPAT,TI_status(%r11)
14129 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14130 jnz ia32_tracesys
14131 cmpq $(IA32_NR_syscalls-1),%rax
14132 ja ia32_badsys
14133 @@ -442,6 +536,9 @@ ia32_tracesys:
14134 RESTORE_REST
14135 cmpq $(IA32_NR_syscalls-1),%rax
14136 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
14137 +
14138 + pax_erase_kstack
14139 +
14140 jmp ia32_do_call
14141 END(ia32_syscall)
14142
14143 diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
14144 index 8e0ceec..af13504 100644
14145 --- a/arch/x86/ia32/sys_ia32.c
14146 +++ b/arch/x86/ia32/sys_ia32.c
14147 @@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
14148 */
14149 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
14150 {
14151 - typeof(ubuf->st_uid) uid = 0;
14152 - typeof(ubuf->st_gid) gid = 0;
14153 + typeof(((struct stat64 *)0)->st_uid) uid = 0;
14154 + typeof(((struct stat64 *)0)->st_gid) gid = 0;
14155 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
14156 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
14157 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
14158 diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
14159 index 372231c..51b537d 100644
14160 --- a/arch/x86/include/asm/alternative-asm.h
14161 +++ b/arch/x86/include/asm/alternative-asm.h
14162 @@ -18,6 +18,45 @@
14163 .endm
14164 #endif
14165
14166 +#ifdef KERNEXEC_PLUGIN
14167 + .macro pax_force_retaddr_bts rip=0
14168 + btsq $63,\rip(%rsp)
14169 + .endm
14170 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
14171 + .macro pax_force_retaddr rip=0, reload=0
14172 + btsq $63,\rip(%rsp)
14173 + .endm
14174 + .macro pax_force_fptr ptr
14175 + btsq $63,\ptr
14176 + .endm
14177 + .macro pax_set_fptr_mask
14178 + .endm
14179 +#endif
14180 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
14181 + .macro pax_force_retaddr rip=0, reload=0
14182 + .if \reload
14183 + pax_set_fptr_mask
14184 + .endif
14185 + orq %r12,\rip(%rsp)
14186 + .endm
14187 + .macro pax_force_fptr ptr
14188 + orq %r12,\ptr
14189 + .endm
14190 + .macro pax_set_fptr_mask
14191 + movabs $0x8000000000000000,%r12
14192 + .endm
14193 +#endif
14194 +#else
14195 + .macro pax_force_retaddr rip=0, reload=0
14196 + .endm
14197 + .macro pax_force_fptr ptr
14198 + .endm
14199 + .macro pax_force_retaddr_bts rip=0
14200 + .endm
14201 + .macro pax_set_fptr_mask
14202 + .endm
14203 +#endif
14204 +
14205 .macro altinstruction_entry orig alt feature orig_len alt_len
14206 .long \orig - .
14207 .long \alt - .
14208 diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
14209 index 0a3f9c9..c9d081d 100644
14210 --- a/arch/x86/include/asm/alternative.h
14211 +++ b/arch/x86/include/asm/alternative.h
14212 @@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
14213 ".pushsection .discard,\"aw\",@progbits\n" \
14214 DISCARD_ENTRY(1) \
14215 ".popsection\n" \
14216 - ".pushsection .altinstr_replacement, \"ax\"\n" \
14217 + ".pushsection .altinstr_replacement, \"a\"\n" \
14218 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
14219 ".popsection"
14220
14221 @@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
14222 DISCARD_ENTRY(1) \
14223 DISCARD_ENTRY(2) \
14224 ".popsection\n" \
14225 - ".pushsection .altinstr_replacement, \"ax\"\n" \
14226 + ".pushsection .altinstr_replacement, \"a\"\n" \
14227 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
14228 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
14229 ".popsection"
14230 diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
14231 index 1d2091a..f5074c1 100644
14232 --- a/arch/x86/include/asm/apic.h
14233 +++ b/arch/x86/include/asm/apic.h
14234 @@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
14235
14236 #ifdef CONFIG_X86_LOCAL_APIC
14237
14238 -extern unsigned int apic_verbosity;
14239 +extern int apic_verbosity;
14240 extern int local_apic_timer_c2_ok;
14241
14242 extern int disable_apic;
14243 diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
14244 index 20370c6..a2eb9b0 100644
14245 --- a/arch/x86/include/asm/apm.h
14246 +++ b/arch/x86/include/asm/apm.h
14247 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
14248 __asm__ __volatile__(APM_DO_ZERO_SEGS
14249 "pushl %%edi\n\t"
14250 "pushl %%ebp\n\t"
14251 - "lcall *%%cs:apm_bios_entry\n\t"
14252 + "lcall *%%ss:apm_bios_entry\n\t"
14253 "setc %%al\n\t"
14254 "popl %%ebp\n\t"
14255 "popl %%edi\n\t"
14256 @@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
14257 __asm__ __volatile__(APM_DO_ZERO_SEGS
14258 "pushl %%edi\n\t"
14259 "pushl %%ebp\n\t"
14260 - "lcall *%%cs:apm_bios_entry\n\t"
14261 + "lcall *%%ss:apm_bios_entry\n\t"
14262 "setc %%bl\n\t"
14263 "popl %%ebp\n\t"
14264 "popl %%edi\n\t"
14265 diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
14266 index 722aa3b..c392d85 100644
14267 --- a/arch/x86/include/asm/atomic.h
14268 +++ b/arch/x86/include/asm/atomic.h
14269 @@ -22,7 +22,18 @@
14270 */
14271 static inline int atomic_read(const atomic_t *v)
14272 {
14273 - return (*(volatile int *)&(v)->counter);
14274 + return (*(volatile const int *)&(v)->counter);
14275 +}
14276 +
14277 +/**
14278 + * atomic_read_unchecked - read atomic variable
14279 + * @v: pointer of type atomic_unchecked_t
14280 + *
14281 + * Atomically reads the value of @v.
14282 + */
14283 +static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
14284 +{
14285 + return (*(volatile const int *)&(v)->counter);
14286 }
14287
14288 /**
14289 @@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *v, int i)
14290 }
14291
14292 /**
14293 + * atomic_set_unchecked - set atomic variable
14294 + * @v: pointer of type atomic_unchecked_t
14295 + * @i: required value
14296 + *
14297 + * Atomically sets the value of @v to @i.
14298 + */
14299 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
14300 +{
14301 + v->counter = i;
14302 +}
14303 +
14304 +/**
14305 * atomic_add - add integer to atomic variable
14306 * @i: integer value to add
14307 * @v: pointer of type atomic_t
14308 @@ -46,7 +69,29 @@ static inline void atomic_set(atomic_t *v, int i)
14309 */
14310 static inline void atomic_add(int i, atomic_t *v)
14311 {
14312 - asm volatile(LOCK_PREFIX "addl %1,%0"
14313 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
14314 +
14315 +#ifdef CONFIG_PAX_REFCOUNT
14316 + "jno 0f\n"
14317 + LOCK_PREFIX "subl %1,%0\n"
14318 + "int $4\n0:\n"
14319 + _ASM_EXTABLE(0b, 0b)
14320 +#endif
14321 +
14322 + : "+m" (v->counter)
14323 + : "ir" (i));
14324 +}
14325 +
14326 +/**
14327 + * atomic_add_unchecked - add integer to atomic variable
14328 + * @i: integer value to add
14329 + * @v: pointer of type atomic_unchecked_t
14330 + *
14331 + * Atomically adds @i to @v.
14332 + */
14333 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
14334 +{
14335 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
14336 : "+m" (v->counter)
14337 : "ir" (i));
14338 }
14339 @@ -60,7 +105,29 @@ static inline void atomic_add(int i, atomic_t *v)
14340 */
14341 static inline void atomic_sub(int i, atomic_t *v)
14342 {
14343 - asm volatile(LOCK_PREFIX "subl %1,%0"
14344 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
14345 +
14346 +#ifdef CONFIG_PAX_REFCOUNT
14347 + "jno 0f\n"
14348 + LOCK_PREFIX "addl %1,%0\n"
14349 + "int $4\n0:\n"
14350 + _ASM_EXTABLE(0b, 0b)
14351 +#endif
14352 +
14353 + : "+m" (v->counter)
14354 + : "ir" (i));
14355 +}
14356 +
14357 +/**
14358 + * atomic_sub_unchecked - subtract integer from atomic variable
14359 + * @i: integer value to subtract
14360 + * @v: pointer of type atomic_unchecked_t
14361 + *
14362 + * Atomically subtracts @i from @v.
14363 + */
14364 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
14365 +{
14366 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
14367 : "+m" (v->counter)
14368 : "ir" (i));
14369 }
14370 @@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
14371 {
14372 unsigned char c;
14373
14374 - asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
14375 + asm volatile(LOCK_PREFIX "subl %2,%0\n"
14376 +
14377 +#ifdef CONFIG_PAX_REFCOUNT
14378 + "jno 0f\n"
14379 + LOCK_PREFIX "addl %2,%0\n"
14380 + "int $4\n0:\n"
14381 + _ASM_EXTABLE(0b, 0b)
14382 +#endif
14383 +
14384 + "sete %1\n"
14385 : "+m" (v->counter), "=qm" (c)
14386 : "ir" (i) : "memory");
14387 return c;
14388 @@ -92,7 +168,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
14389 */
14390 static inline void atomic_inc(atomic_t *v)
14391 {
14392 - asm volatile(LOCK_PREFIX "incl %0"
14393 + asm volatile(LOCK_PREFIX "incl %0\n"
14394 +
14395 +#ifdef CONFIG_PAX_REFCOUNT
14396 + "jno 0f\n"
14397 + LOCK_PREFIX "decl %0\n"
14398 + "int $4\n0:\n"
14399 + _ASM_EXTABLE(0b, 0b)
14400 +#endif
14401 +
14402 + : "+m" (v->counter));
14403 +}
14404 +
14405 +/**
14406 + * atomic_inc_unchecked - increment atomic variable
14407 + * @v: pointer of type atomic_unchecked_t
14408 + *
14409 + * Atomically increments @v by 1.
14410 + */
14411 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
14412 +{
14413 + asm volatile(LOCK_PREFIX "incl %0\n"
14414 : "+m" (v->counter));
14415 }
14416
14417 @@ -104,7 +200,27 @@ static inline void atomic_inc(atomic_t *v)
14418 */
14419 static inline void atomic_dec(atomic_t *v)
14420 {
14421 - asm volatile(LOCK_PREFIX "decl %0"
14422 + asm volatile(LOCK_PREFIX "decl %0\n"
14423 +
14424 +#ifdef CONFIG_PAX_REFCOUNT
14425 + "jno 0f\n"
14426 + LOCK_PREFIX "incl %0\n"
14427 + "int $4\n0:\n"
14428 + _ASM_EXTABLE(0b, 0b)
14429 +#endif
14430 +
14431 + : "+m" (v->counter));
14432 +}
14433 +
14434 +/**
14435 + * atomic_dec_unchecked - decrement atomic variable
14436 + * @v: pointer of type atomic_unchecked_t
14437 + *
14438 + * Atomically decrements @v by 1.
14439 + */
14440 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
14441 +{
14442 + asm volatile(LOCK_PREFIX "decl %0\n"
14443 : "+m" (v->counter));
14444 }
14445
14446 @@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(atomic_t *v)
14447 {
14448 unsigned char c;
14449
14450 - asm volatile(LOCK_PREFIX "decl %0; sete %1"
14451 + asm volatile(LOCK_PREFIX "decl %0\n"
14452 +
14453 +#ifdef CONFIG_PAX_REFCOUNT
14454 + "jno 0f\n"
14455 + LOCK_PREFIX "incl %0\n"
14456 + "int $4\n0:\n"
14457 + _ASM_EXTABLE(0b, 0b)
14458 +#endif
14459 +
14460 + "sete %1\n"
14461 : "+m" (v->counter), "=qm" (c)
14462 : : "memory");
14463 return c != 0;
14464 @@ -138,7 +263,35 @@ static inline int atomic_inc_and_test(atomic_t *v)
14465 {
14466 unsigned char c;
14467
14468 - asm volatile(LOCK_PREFIX "incl %0; sete %1"
14469 + asm volatile(LOCK_PREFIX "incl %0\n"
14470 +
14471 +#ifdef CONFIG_PAX_REFCOUNT
14472 + "jno 0f\n"
14473 + LOCK_PREFIX "decl %0\n"
14474 + "int $4\n0:\n"
14475 + _ASM_EXTABLE(0b, 0b)
14476 +#endif
14477 +
14478 + "sete %1\n"
14479 + : "+m" (v->counter), "=qm" (c)
14480 + : : "memory");
14481 + return c != 0;
14482 +}
14483 +
14484 +/**
14485 + * atomic_inc_and_test_unchecked - increment and test
14486 + * @v: pointer of type atomic_unchecked_t
14487 + *
14488 + * Atomically increments @v by 1
14489 + * and returns true if the result is zero, or false for all
14490 + * other cases.
14491 + */
14492 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
14493 +{
14494 + unsigned char c;
14495 +
14496 + asm volatile(LOCK_PREFIX "incl %0\n"
14497 + "sete %1\n"
14498 : "+m" (v->counter), "=qm" (c)
14499 : : "memory");
14500 return c != 0;
14501 @@ -157,7 +310,16 @@ static inline int atomic_add_negative(int i, atomic_t *v)
14502 {
14503 unsigned char c;
14504
14505 - asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
14506 + asm volatile(LOCK_PREFIX "addl %2,%0\n"
14507 +
14508 +#ifdef CONFIG_PAX_REFCOUNT
14509 + "jno 0f\n"
14510 + LOCK_PREFIX "subl %2,%0\n"
14511 + "int $4\n0:\n"
14512 + _ASM_EXTABLE(0b, 0b)
14513 +#endif
14514 +
14515 + "sets %1\n"
14516 : "+m" (v->counter), "=qm" (c)
14517 : "ir" (i) : "memory");
14518 return c;
14519 @@ -172,6 +334,18 @@ static inline int atomic_add_negative(int i, atomic_t *v)
14520 */
14521 static inline int atomic_add_return(int i, atomic_t *v)
14522 {
14523 + return i + xadd_check_overflow(&v->counter, i);
14524 +}
14525 +
14526 +/**
14527 + * atomic_add_return_unchecked - add integer and return
14528 + * @i: integer value to add
14529 + * @v: pointer of type atomic_unchecked_t
14530 + *
14531 + * Atomically adds @i to @v and returns @i + @v
14532 + */
14533 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
14534 +{
14535 return i + xadd(&v->counter, i);
14536 }
14537
14538 @@ -188,9 +362,18 @@ static inline int atomic_sub_return(int i, atomic_t *v)
14539 }
14540
14541 #define atomic_inc_return(v) (atomic_add_return(1, v))
14542 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
14543 +{
14544 + return atomic_add_return_unchecked(1, v);
14545 +}
14546 #define atomic_dec_return(v) (atomic_sub_return(1, v))
14547
14548 -static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
14549 +static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
14550 +{
14551 + return cmpxchg(&v->counter, old, new);
14552 +}
14553 +
14554 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
14555 {
14556 return cmpxchg(&v->counter, old, new);
14557 }
14558 @@ -200,6 +383,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
14559 return xchg(&v->counter, new);
14560 }
14561
14562 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
14563 +{
14564 + return xchg(&v->counter, new);
14565 +}
14566 +
14567 /**
14568 * __atomic_add_unless - add unless the number is already a given value
14569 * @v: pointer of type atomic_t
14570 @@ -209,14 +397,27 @@ static inline int atomic_xchg(atomic_t *v, int new)
14571 * Atomically adds @a to @v, so long as @v was not already @u.
14572 * Returns the old value of @v.
14573 */
14574 -static inline int __atomic_add_unless(atomic_t *v, int a, int u)
14575 +static inline int __intentional_overflow(-1) __atomic_add_unless(atomic_t *v, int a, int u)
14576 {
14577 - int c, old;
14578 + int c, old, new;
14579 c = atomic_read(v);
14580 for (;;) {
14581 - if (unlikely(c == (u)))
14582 + if (unlikely(c == u))
14583 break;
14584 - old = atomic_cmpxchg((v), c, c + (a));
14585 +
14586 + asm volatile("addl %2,%0\n"
14587 +
14588 +#ifdef CONFIG_PAX_REFCOUNT
14589 + "jno 0f\n"
14590 + "subl %2,%0\n"
14591 + "int $4\n0:\n"
14592 + _ASM_EXTABLE(0b, 0b)
14593 +#endif
14594 +
14595 + : "=r" (new)
14596 + : "0" (c), "ir" (a));
14597 +
14598 + old = atomic_cmpxchg(v, c, new);
14599 if (likely(old == c))
14600 break;
14601 c = old;
14602 @@ -225,6 +426,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
14603 }
14604
14605 /**
14606 + * atomic_inc_not_zero_hint - increment if not null
14607 + * @v: pointer of type atomic_t
14608 + * @hint: probable value of the atomic before the increment
14609 + *
14610 + * This version of atomic_inc_not_zero() gives a hint of probable
14611 + * value of the atomic. This helps processor to not read the memory
14612 + * before doing the atomic read/modify/write cycle, lowering
14613 + * number of bus transactions on some arches.
14614 + *
14615 + * Returns: 0 if increment was not done, 1 otherwise.
14616 + */
14617 +#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
14618 +static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
14619 +{
14620 + int val, c = hint, new;
14621 +
14622 + /* sanity test, should be removed by compiler if hint is a constant */
14623 + if (!hint)
14624 + return __atomic_add_unless(v, 1, 0);
14625 +
14626 + do {
14627 + asm volatile("incl %0\n"
14628 +
14629 +#ifdef CONFIG_PAX_REFCOUNT
14630 + "jno 0f\n"
14631 + "decl %0\n"
14632 + "int $4\n0:\n"
14633 + _ASM_EXTABLE(0b, 0b)
14634 +#endif
14635 +
14636 + : "=r" (new)
14637 + : "0" (c));
14638 +
14639 + val = atomic_cmpxchg(v, c, new);
14640 + if (val == c)
14641 + return 1;
14642 + c = val;
14643 + } while (c);
14644 +
14645 + return 0;
14646 +}
14647 +
14648 +/**
14649 * atomic_inc_short - increment of a short integer
14650 * @v: pointer to type int
14651 *
14652 @@ -253,14 +497,37 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
14653 #endif
14654
14655 /* These are x86-specific, used by some header files */
14656 -#define atomic_clear_mask(mask, addr) \
14657 - asm volatile(LOCK_PREFIX "andl %0,%1" \
14658 - : : "r" (~(mask)), "m" (*(addr)) : "memory")
14659 +static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
14660 +{
14661 + asm volatile(LOCK_PREFIX "andl %1,%0"
14662 + : "+m" (v->counter)
14663 + : "r" (~(mask))
14664 + : "memory");
14665 +}
14666
14667 -#define atomic_set_mask(mask, addr) \
14668 - asm volatile(LOCK_PREFIX "orl %0,%1" \
14669 - : : "r" ((unsigned)(mask)), "m" (*(addr)) \
14670 - : "memory")
14671 +static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
14672 +{
14673 + asm volatile(LOCK_PREFIX "andl %1,%0"
14674 + : "+m" (v->counter)
14675 + : "r" (~(mask))
14676 + : "memory");
14677 +}
14678 +
14679 +static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
14680 +{
14681 + asm volatile(LOCK_PREFIX "orl %1,%0"
14682 + : "+m" (v->counter)
14683 + : "r" (mask)
14684 + : "memory");
14685 +}
14686 +
14687 +static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
14688 +{
14689 + asm volatile(LOCK_PREFIX "orl %1,%0"
14690 + : "+m" (v->counter)
14691 + : "r" (mask)
14692 + : "memory");
14693 +}
14694
14695 /* Atomic operations are already serializing on x86 */
14696 #define smp_mb__before_atomic_dec() barrier()
14697 diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
14698 index b154de7..bf18a5a 100644
14699 --- a/arch/x86/include/asm/atomic64_32.h
14700 +++ b/arch/x86/include/asm/atomic64_32.h
14701 @@ -12,6 +12,14 @@ typedef struct {
14702 u64 __aligned(8) counter;
14703 } atomic64_t;
14704
14705 +#ifdef CONFIG_PAX_REFCOUNT
14706 +typedef struct {
14707 + u64 __aligned(8) counter;
14708 +} atomic64_unchecked_t;
14709 +#else
14710 +typedef atomic64_t atomic64_unchecked_t;
14711 +#endif
14712 +
14713 #define ATOMIC64_INIT(val) { (val) }
14714
14715 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
14716 @@ -37,21 +45,31 @@ typedef struct {
14717 ATOMIC64_DECL_ONE(sym##_386)
14718
14719 ATOMIC64_DECL_ONE(add_386);
14720 +ATOMIC64_DECL_ONE(add_unchecked_386);
14721 ATOMIC64_DECL_ONE(sub_386);
14722 +ATOMIC64_DECL_ONE(sub_unchecked_386);
14723 ATOMIC64_DECL_ONE(inc_386);
14724 +ATOMIC64_DECL_ONE(inc_unchecked_386);
14725 ATOMIC64_DECL_ONE(dec_386);
14726 +ATOMIC64_DECL_ONE(dec_unchecked_386);
14727 #endif
14728
14729 #define alternative_atomic64(f, out, in...) \
14730 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
14731
14732 ATOMIC64_DECL(read);
14733 +ATOMIC64_DECL(read_unchecked);
14734 ATOMIC64_DECL(set);
14735 +ATOMIC64_DECL(set_unchecked);
14736 ATOMIC64_DECL(xchg);
14737 ATOMIC64_DECL(add_return);
14738 +ATOMIC64_DECL(add_return_unchecked);
14739 ATOMIC64_DECL(sub_return);
14740 +ATOMIC64_DECL(sub_return_unchecked);
14741 ATOMIC64_DECL(inc_return);
14742 +ATOMIC64_DECL(inc_return_unchecked);
14743 ATOMIC64_DECL(dec_return);
14744 +ATOMIC64_DECL(dec_return_unchecked);
14745 ATOMIC64_DECL(dec_if_positive);
14746 ATOMIC64_DECL(inc_not_zero);
14747 ATOMIC64_DECL(add_unless);
14748 @@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
14749 }
14750
14751 /**
14752 + * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
14753 + * @p: pointer to type atomic64_unchecked_t
14754 + * @o: expected value
14755 + * @n: new value
14756 + *
14757 + * Atomically sets @v to @n if it was equal to @o and returns
14758 + * the old value.
14759 + */
14760 +
14761 +static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
14762 +{
14763 + return cmpxchg64(&v->counter, o, n);
14764 +}
14765 +
14766 +/**
14767 * atomic64_xchg - xchg atomic64 variable
14768 * @v: pointer to type atomic64_t
14769 * @n: value to assign
14770 @@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
14771 }
14772
14773 /**
14774 + * atomic64_set_unchecked - set atomic64 variable
14775 + * @v: pointer to type atomic64_unchecked_t
14776 + * @n: value to assign
14777 + *
14778 + * Atomically sets the value of @v to @n.
14779 + */
14780 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
14781 +{
14782 + unsigned high = (unsigned)(i >> 32);
14783 + unsigned low = (unsigned)i;
14784 + alternative_atomic64(set, /* no output */,
14785 + "S" (v), "b" (low), "c" (high)
14786 + : "eax", "edx", "memory");
14787 +}
14788 +
14789 +/**
14790 * atomic64_read - read atomic64 variable
14791 * @v: pointer to type atomic64_t
14792 *
14793 @@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
14794 }
14795
14796 /**
14797 + * atomic64_read_unchecked - read atomic64 variable
14798 + * @v: pointer to type atomic64_unchecked_t
14799 + *
14800 + * Atomically reads the value of @v and returns it.
14801 + */
14802 +static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
14803 +{
14804 + long long r;
14805 + alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
14806 + return r;
14807 + }
14808 +
14809 +/**
14810 * atomic64_add_return - add and return
14811 * @i: integer value to add
14812 * @v: pointer to type atomic64_t
14813 @@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
14814 return i;
14815 }
14816
14817 +/**
14818 + * atomic64_add_return_unchecked - add and return
14819 + * @i: integer value to add
14820 + * @v: pointer to type atomic64_unchecked_t
14821 + *
14822 + * Atomically adds @i to @v and returns @i + *@v
14823 + */
14824 +static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
14825 +{
14826 + alternative_atomic64(add_return_unchecked,
14827 + ASM_OUTPUT2("+A" (i), "+c" (v)),
14828 + ASM_NO_INPUT_CLOBBER("memory"));
14829 + return i;
14830 +}
14831 +
14832 /*
14833 * Other variants with different arithmetic operators:
14834 */
14835 @@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
14836 return a;
14837 }
14838
14839 +static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
14840 +{
14841 + long long a;
14842 + alternative_atomic64(inc_return_unchecked, "=&A" (a),
14843 + "S" (v) : "memory", "ecx");
14844 + return a;
14845 +}
14846 +
14847 static inline long long atomic64_dec_return(atomic64_t *v)
14848 {
14849 long long a;
14850 @@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
14851 }
14852
14853 /**
14854 + * atomic64_add_unchecked - add integer to atomic64 variable
14855 + * @i: integer value to add
14856 + * @v: pointer to type atomic64_unchecked_t
14857 + *
14858 + * Atomically adds @i to @v.
14859 + */
14860 +static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
14861 +{
14862 + __alternative_atomic64(add_unchecked, add_return_unchecked,
14863 + ASM_OUTPUT2("+A" (i), "+c" (v)),
14864 + ASM_NO_INPUT_CLOBBER("memory"));
14865 + return i;
14866 +}
14867 +
14868 +/**
14869 * atomic64_sub - subtract the atomic64 variable
14870 * @i: integer value to subtract
14871 * @v: pointer to type atomic64_t
14872 diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
14873 index 0e1cbfc..a891fc7 100644
14874 --- a/arch/x86/include/asm/atomic64_64.h
14875 +++ b/arch/x86/include/asm/atomic64_64.h
14876 @@ -18,7 +18,19 @@
14877 */
14878 static inline long atomic64_read(const atomic64_t *v)
14879 {
14880 - return (*(volatile long *)&(v)->counter);
14881 + return (*(volatile const long *)&(v)->counter);
14882 +}
14883 +
14884 +/**
14885 + * atomic64_read_unchecked - read atomic64 variable
14886 + * @v: pointer of type atomic64_unchecked_t
14887 + *
14888 + * Atomically reads the value of @v.
14889 + * Doesn't imply a read memory barrier.
14890 + */
14891 +static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
14892 +{
14893 + return (*(volatile const long *)&(v)->counter);
14894 }
14895
14896 /**
14897 @@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
14898 }
14899
14900 /**
14901 + * atomic64_set_unchecked - set atomic64 variable
14902 + * @v: pointer to type atomic64_unchecked_t
14903 + * @i: required value
14904 + *
14905 + * Atomically sets the value of @v to @i.
14906 + */
14907 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
14908 +{
14909 + v->counter = i;
14910 +}
14911 +
14912 +/**
14913 * atomic64_add - add integer to atomic64 variable
14914 * @i: integer value to add
14915 * @v: pointer to type atomic64_t
14916 @@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
14917 */
14918 static inline void atomic64_add(long i, atomic64_t *v)
14919 {
14920 + asm volatile(LOCK_PREFIX "addq %1,%0\n"
14921 +
14922 +#ifdef CONFIG_PAX_REFCOUNT
14923 + "jno 0f\n"
14924 + LOCK_PREFIX "subq %1,%0\n"
14925 + "int $4\n0:\n"
14926 + _ASM_EXTABLE(0b, 0b)
14927 +#endif
14928 +
14929 + : "=m" (v->counter)
14930 + : "er" (i), "m" (v->counter));
14931 +}
14932 +
14933 +/**
14934 + * atomic64_add_unchecked - add integer to atomic64 variable
14935 + * @i: integer value to add
14936 + * @v: pointer to type atomic64_unchecked_t
14937 + *
14938 + * Atomically adds @i to @v.
14939 + */
14940 +static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
14941 +{
14942 asm volatile(LOCK_PREFIX "addq %1,%0"
14943 : "=m" (v->counter)
14944 : "er" (i), "m" (v->counter));
14945 @@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
14946 */
14947 static inline void atomic64_sub(long i, atomic64_t *v)
14948 {
14949 - asm volatile(LOCK_PREFIX "subq %1,%0"
14950 + asm volatile(LOCK_PREFIX "subq %1,%0\n"
14951 +
14952 +#ifdef CONFIG_PAX_REFCOUNT
14953 + "jno 0f\n"
14954 + LOCK_PREFIX "addq %1,%0\n"
14955 + "int $4\n0:\n"
14956 + _ASM_EXTABLE(0b, 0b)
14957 +#endif
14958 +
14959 + : "=m" (v->counter)
14960 + : "er" (i), "m" (v->counter));
14961 +}
14962 +
14963 +/**
14964 + * atomic64_sub_unchecked - subtract the atomic64 variable
14965 + * @i: integer value to subtract
14966 + * @v: pointer to type atomic64_unchecked_t
14967 + *
14968 + * Atomically subtracts @i from @v.
14969 + */
14970 +static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
14971 +{
14972 + asm volatile(LOCK_PREFIX "subq %1,%0\n"
14973 : "=m" (v->counter)
14974 : "er" (i), "m" (v->counter));
14975 }
14976 @@ -74,7 +142,16 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
14977 {
14978 unsigned char c;
14979
14980 - asm volatile(LOCK_PREFIX "subq %2,%0; sete %1"
14981 + asm volatile(LOCK_PREFIX "subq %2,%0\n"
14982 +
14983 +#ifdef CONFIG_PAX_REFCOUNT
14984 + "jno 0f\n"
14985 + LOCK_PREFIX "addq %2,%0\n"
14986 + "int $4\n0:\n"
14987 + _ASM_EXTABLE(0b, 0b)
14988 +#endif
14989 +
14990 + "sete %1\n"
14991 : "=m" (v->counter), "=qm" (c)
14992 : "er" (i), "m" (v->counter) : "memory");
14993 return c;
14994 @@ -88,6 +165,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
14995 */
14996 static inline void atomic64_inc(atomic64_t *v)
14997 {
14998 + asm volatile(LOCK_PREFIX "incq %0\n"
14999 +
15000 +#ifdef CONFIG_PAX_REFCOUNT
15001 + "jno 0f\n"
15002 + LOCK_PREFIX "decq %0\n"
15003 + "int $4\n0:\n"
15004 + _ASM_EXTABLE(0b, 0b)
15005 +#endif
15006 +
15007 + : "=m" (v->counter)
15008 + : "m" (v->counter));
15009 +}
15010 +
15011 +/**
15012 + * atomic64_inc_unchecked - increment atomic64 variable
15013 + * @v: pointer to type atomic64_unchecked_t
15014 + *
15015 + * Atomically increments @v by 1.
15016 + */
15017 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15018 +{
15019 asm volatile(LOCK_PREFIX "incq %0"
15020 : "=m" (v->counter)
15021 : "m" (v->counter));
15022 @@ -101,7 +199,28 @@ static inline void atomic64_inc(atomic64_t *v)
15023 */
15024 static inline void atomic64_dec(atomic64_t *v)
15025 {
15026 - asm volatile(LOCK_PREFIX "decq %0"
15027 + asm volatile(LOCK_PREFIX "decq %0\n"
15028 +
15029 +#ifdef CONFIG_PAX_REFCOUNT
15030 + "jno 0f\n"
15031 + LOCK_PREFIX "incq %0\n"
15032 + "int $4\n0:\n"
15033 + _ASM_EXTABLE(0b, 0b)
15034 +#endif
15035 +
15036 + : "=m" (v->counter)
15037 + : "m" (v->counter));
15038 +}
15039 +
15040 +/**
15041 + * atomic64_dec_unchecked - decrement atomic64 variable
15042 + * @v: pointer to type atomic64_t
15043 + *
15044 + * Atomically decrements @v by 1.
15045 + */
15046 +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15047 +{
15048 + asm volatile(LOCK_PREFIX "decq %0\n"
15049 : "=m" (v->counter)
15050 : "m" (v->counter));
15051 }
15052 @@ -118,7 +237,16 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15053 {
15054 unsigned char c;
15055
15056 - asm volatile(LOCK_PREFIX "decq %0; sete %1"
15057 + asm volatile(LOCK_PREFIX "decq %0\n"
15058 +
15059 +#ifdef CONFIG_PAX_REFCOUNT
15060 + "jno 0f\n"
15061 + LOCK_PREFIX "incq %0\n"
15062 + "int $4\n0:\n"
15063 + _ASM_EXTABLE(0b, 0b)
15064 +#endif
15065 +
15066 + "sete %1\n"
15067 : "=m" (v->counter), "=qm" (c)
15068 : "m" (v->counter) : "memory");
15069 return c != 0;
15070 @@ -136,7 +264,16 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15071 {
15072 unsigned char c;
15073
15074 - asm volatile(LOCK_PREFIX "incq %0; sete %1"
15075 + asm volatile(LOCK_PREFIX "incq %0\n"
15076 +
15077 +#ifdef CONFIG_PAX_REFCOUNT
15078 + "jno 0f\n"
15079 + LOCK_PREFIX "decq %0\n"
15080 + "int $4\n0:\n"
15081 + _ASM_EXTABLE(0b, 0b)
15082 +#endif
15083 +
15084 + "sete %1\n"
15085 : "=m" (v->counter), "=qm" (c)
15086 : "m" (v->counter) : "memory");
15087 return c != 0;
15088 @@ -155,7 +292,16 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15089 {
15090 unsigned char c;
15091
15092 - asm volatile(LOCK_PREFIX "addq %2,%0; sets %1"
15093 + asm volatile(LOCK_PREFIX "addq %2,%0\n"
15094 +
15095 +#ifdef CONFIG_PAX_REFCOUNT
15096 + "jno 0f\n"
15097 + LOCK_PREFIX "subq %2,%0\n"
15098 + "int $4\n0:\n"
15099 + _ASM_EXTABLE(0b, 0b)
15100 +#endif
15101 +
15102 + "sets %1\n"
15103 : "=m" (v->counter), "=qm" (c)
15104 : "er" (i), "m" (v->counter) : "memory");
15105 return c;
15106 @@ -170,6 +316,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15107 */
15108 static inline long atomic64_add_return(long i, atomic64_t *v)
15109 {
15110 + return i + xadd_check_overflow(&v->counter, i);
15111 +}
15112 +
15113 +/**
15114 + * atomic64_add_return_unchecked - add and return
15115 + * @i: integer value to add
15116 + * @v: pointer to type atomic64_unchecked_t
15117 + *
15118 + * Atomically adds @i to @v and returns @i + @v
15119 + */
15120 +static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15121 +{
15122 return i + xadd(&v->counter, i);
15123 }
15124
15125 @@ -179,6 +337,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15126 }
15127
15128 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15129 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15130 +{
15131 + return atomic64_add_return_unchecked(1, v);
15132 +}
15133 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15134
15135 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15136 @@ -186,6 +348,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15137 return cmpxchg(&v->counter, old, new);
15138 }
15139
15140 +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15141 +{
15142 + return cmpxchg(&v->counter, old, new);
15143 +}
15144 +
15145 static inline long atomic64_xchg(atomic64_t *v, long new)
15146 {
15147 return xchg(&v->counter, new);
15148 @@ -202,17 +369,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15149 */
15150 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15151 {
15152 - long c, old;
15153 + long c, old, new;
15154 c = atomic64_read(v);
15155 for (;;) {
15156 - if (unlikely(c == (u)))
15157 + if (unlikely(c == u))
15158 break;
15159 - old = atomic64_cmpxchg((v), c, c + (a));
15160 +
15161 + asm volatile("add %2,%0\n"
15162 +
15163 +#ifdef CONFIG_PAX_REFCOUNT
15164 + "jno 0f\n"
15165 + "sub %2,%0\n"
15166 + "int $4\n0:\n"
15167 + _ASM_EXTABLE(0b, 0b)
15168 +#endif
15169 +
15170 + : "=r" (new)
15171 + : "0" (c), "ir" (a));
15172 +
15173 + old = atomic64_cmpxchg(v, c, new);
15174 if (likely(old == c))
15175 break;
15176 c = old;
15177 }
15178 - return c != (u);
15179 + return c != u;
15180 }
15181
15182 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
15183 diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
15184 index 41639ce..ebce552 100644
15185 --- a/arch/x86/include/asm/bitops.h
15186 +++ b/arch/x86/include/asm/bitops.h
15187 @@ -48,7 +48,7 @@
15188 * a mask operation on a byte.
15189 */
15190 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
15191 -#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
15192 +#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
15193 #define CONST_MASK(nr) (1 << ((nr) & 7))
15194
15195 /**
15196 @@ -361,7 +361,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
15197 *
15198 * Undefined if no bit exists, so code should check against 0 first.
15199 */
15200 -static inline unsigned long __ffs(unsigned long word)
15201 +static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
15202 {
15203 asm("rep; bsf %1,%0"
15204 : "=r" (word)
15205 @@ -375,7 +375,7 @@ static inline unsigned long __ffs(unsigned long word)
15206 *
15207 * Undefined if no zero exists, so code should check against ~0UL first.
15208 */
15209 -static inline unsigned long ffz(unsigned long word)
15210 +static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
15211 {
15212 asm("rep; bsf %1,%0"
15213 : "=r" (word)
15214 @@ -389,7 +389,7 @@ static inline unsigned long ffz(unsigned long word)
15215 *
15216 * Undefined if no set bit exists, so code should check against 0 first.
15217 */
15218 -static inline unsigned long __fls(unsigned long word)
15219 +static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
15220 {
15221 asm("bsr %1,%0"
15222 : "=r" (word)
15223 @@ -452,7 +452,7 @@ static inline int ffs(int x)
15224 * set bit if value is nonzero. The last (most significant) bit is
15225 * at position 32.
15226 */
15227 -static inline int fls(int x)
15228 +static inline int __intentional_overflow(-1) fls(int x)
15229 {
15230 int r;
15231
15232 @@ -494,7 +494,7 @@ static inline int fls(int x)
15233 * at position 64.
15234 */
15235 #ifdef CONFIG_X86_64
15236 -static __always_inline int fls64(__u64 x)
15237 +static __always_inline long fls64(__u64 x)
15238 {
15239 int bitpos = -1;
15240 /*
15241 diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
15242 index 4fa687a..60f2d39 100644
15243 --- a/arch/x86/include/asm/boot.h
15244 +++ b/arch/x86/include/asm/boot.h
15245 @@ -6,10 +6,15 @@
15246 #include <uapi/asm/boot.h>
15247
15248 /* Physical address where kernel should be loaded. */
15249 -#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
15250 +#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
15251 + (CONFIG_PHYSICAL_ALIGN - 1)) \
15252 & ~(CONFIG_PHYSICAL_ALIGN - 1))
15253
15254 +#ifndef __ASSEMBLY__
15255 +extern unsigned char __LOAD_PHYSICAL_ADDR[];
15256 +#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
15257 +#endif
15258 +
15259 /* Minimum kernel alignment, as a power of two */
15260 #ifdef CONFIG_X86_64
15261 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
15262 diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
15263 index 48f99f1..d78ebf9 100644
15264 --- a/arch/x86/include/asm/cache.h
15265 +++ b/arch/x86/include/asm/cache.h
15266 @@ -5,12 +5,13 @@
15267
15268 /* L1 cache line size */
15269 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
15270 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
15271 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
15272
15273 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
15274 +#define __read_only __attribute__((__section__(".data..read_only")))
15275
15276 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
15277 -#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
15278 +#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
15279
15280 #ifdef CONFIG_X86_VSMP
15281 #ifdef CONFIG_SMP
15282 diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
15283 index 9863ee3..4a1f8e1 100644
15284 --- a/arch/x86/include/asm/cacheflush.h
15285 +++ b/arch/x86/include/asm/cacheflush.h
15286 @@ -27,7 +27,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
15287 unsigned long pg_flags = pg->flags & _PGMT_MASK;
15288
15289 if (pg_flags == _PGMT_DEFAULT)
15290 - return -1;
15291 + return ~0UL;
15292 else if (pg_flags == _PGMT_WC)
15293 return _PAGE_CACHE_WC;
15294 else if (pg_flags == _PGMT_UC_MINUS)
15295 diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
15296 index 0fa6750..cb7b2c3 100644
15297 --- a/arch/x86/include/asm/calling.h
15298 +++ b/arch/x86/include/asm/calling.h
15299 @@ -80,103 +80,113 @@ For 32-bit we have the following conventions - kernel is built with
15300 #define RSP 152
15301 #define SS 160
15302
15303 -#define ARGOFFSET R11
15304 -#define SWFRAME ORIG_RAX
15305 +#define ARGOFFSET R15
15306
15307 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1
15308 - subq $9*8+\addskip, %rsp
15309 - CFI_ADJUST_CFA_OFFSET 9*8+\addskip
15310 - movq_cfi rdi, 8*8
15311 - movq_cfi rsi, 7*8
15312 - movq_cfi rdx, 6*8
15313 + subq $ORIG_RAX-ARGOFFSET+\addskip, %rsp
15314 + CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+\addskip
15315 + movq_cfi rdi, RDI
15316 + movq_cfi rsi, RSI
15317 + movq_cfi rdx, RDX
15318
15319 .if \save_rcx
15320 - movq_cfi rcx, 5*8
15321 + movq_cfi rcx, RCX
15322 .endif
15323
15324 - movq_cfi rax, 4*8
15325 + movq_cfi rax, RAX
15326
15327 .if \save_r891011
15328 - movq_cfi r8, 3*8
15329 - movq_cfi r9, 2*8
15330 - movq_cfi r10, 1*8
15331 - movq_cfi r11, 0*8
15332 + movq_cfi r8, R8
15333 + movq_cfi r9, R9
15334 + movq_cfi r10, R10
15335 + movq_cfi r11, R11
15336 .endif
15337
15338 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15339 + movq_cfi r12, R12
15340 +#endif
15341 +
15342 .endm
15343
15344 -#define ARG_SKIP (9*8)
15345 +#define ARG_SKIP ORIG_RAX
15346
15347 .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
15348 rstor_r8910=1, rstor_rdx=1
15349 +
15350 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15351 + movq_cfi_restore R12, r12
15352 +#endif
15353 +
15354 .if \rstor_r11
15355 - movq_cfi_restore 0*8, r11
15356 + movq_cfi_restore R11, r11
15357 .endif
15358
15359 .if \rstor_r8910
15360 - movq_cfi_restore 1*8, r10
15361 - movq_cfi_restore 2*8, r9
15362 - movq_cfi_restore 3*8, r8
15363 + movq_cfi_restore R10, r10
15364 + movq_cfi_restore R9, r9
15365 + movq_cfi_restore R8, r8
15366 .endif
15367
15368 .if \rstor_rax
15369 - movq_cfi_restore 4*8, rax
15370 + movq_cfi_restore RAX, rax
15371 .endif
15372
15373 .if \rstor_rcx
15374 - movq_cfi_restore 5*8, rcx
15375 + movq_cfi_restore RCX, rcx
15376 .endif
15377
15378 .if \rstor_rdx
15379 - movq_cfi_restore 6*8, rdx
15380 + movq_cfi_restore RDX, rdx
15381 .endif
15382
15383 - movq_cfi_restore 7*8, rsi
15384 - movq_cfi_restore 8*8, rdi
15385 + movq_cfi_restore RSI, rsi
15386 + movq_cfi_restore RDI, rdi
15387
15388 - .if ARG_SKIP+\addskip > 0
15389 - addq $ARG_SKIP+\addskip, %rsp
15390 - CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
15391 + .if ORIG_RAX+\addskip > 0
15392 + addq $ORIG_RAX+\addskip, %rsp
15393 + CFI_ADJUST_CFA_OFFSET -(ORIG_RAX+\addskip)
15394 .endif
15395 .endm
15396
15397 - .macro LOAD_ARGS offset, skiprax=0
15398 - movq \offset(%rsp), %r11
15399 - movq \offset+8(%rsp), %r10
15400 - movq \offset+16(%rsp), %r9
15401 - movq \offset+24(%rsp), %r8
15402 - movq \offset+40(%rsp), %rcx
15403 - movq \offset+48(%rsp), %rdx
15404 - movq \offset+56(%rsp), %rsi
15405 - movq \offset+64(%rsp), %rdi
15406 + .macro LOAD_ARGS skiprax=0
15407 + movq R11(%rsp), %r11
15408 + movq R10(%rsp), %r10
15409 + movq R9(%rsp), %r9
15410 + movq R8(%rsp), %r8
15411 + movq RCX(%rsp), %rcx
15412 + movq RDX(%rsp), %rdx
15413 + movq RSI(%rsp), %rsi
15414 + movq RDI(%rsp), %rdi
15415 .if \skiprax
15416 .else
15417 - movq \offset+72(%rsp), %rax
15418 + movq RAX(%rsp), %rax
15419 .endif
15420 .endm
15421
15422 -#define REST_SKIP (6*8)
15423 -
15424 .macro SAVE_REST
15425 - subq $REST_SKIP, %rsp
15426 - CFI_ADJUST_CFA_OFFSET REST_SKIP
15427 - movq_cfi rbx, 5*8
15428 - movq_cfi rbp, 4*8
15429 - movq_cfi r12, 3*8
15430 - movq_cfi r13, 2*8
15431 - movq_cfi r14, 1*8
15432 - movq_cfi r15, 0*8
15433 + movq_cfi rbx, RBX
15434 + movq_cfi rbp, RBP
15435 +
15436 +#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15437 + movq_cfi r12, R12
15438 +#endif
15439 +
15440 + movq_cfi r13, R13
15441 + movq_cfi r14, R14
15442 + movq_cfi r15, R15
15443 .endm
15444
15445 .macro RESTORE_REST
15446 - movq_cfi_restore 0*8, r15
15447 - movq_cfi_restore 1*8, r14
15448 - movq_cfi_restore 2*8, r13
15449 - movq_cfi_restore 3*8, r12
15450 - movq_cfi_restore 4*8, rbp
15451 - movq_cfi_restore 5*8, rbx
15452 - addq $REST_SKIP, %rsp
15453 - CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
15454 + movq_cfi_restore R15, r15
15455 + movq_cfi_restore R14, r14
15456 + movq_cfi_restore R13, r13
15457 +
15458 +#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15459 + movq_cfi_restore R12, r12
15460 +#endif
15461 +
15462 + movq_cfi_restore RBP, rbp
15463 + movq_cfi_restore RBX, rbx
15464 .endm
15465
15466 .macro SAVE_ALL
15467 diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
15468 index f50de69..2b0a458 100644
15469 --- a/arch/x86/include/asm/checksum_32.h
15470 +++ b/arch/x86/include/asm/checksum_32.h
15471 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
15472 int len, __wsum sum,
15473 int *src_err_ptr, int *dst_err_ptr);
15474
15475 +asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
15476 + int len, __wsum sum,
15477 + int *src_err_ptr, int *dst_err_ptr);
15478 +
15479 +asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
15480 + int len, __wsum sum,
15481 + int *src_err_ptr, int *dst_err_ptr);
15482 +
15483 /*
15484 * Note: when you get a NULL pointer exception here this means someone
15485 * passed in an incorrect kernel address to one of these functions.
15486 @@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
15487
15488 might_sleep();
15489 stac();
15490 - ret = csum_partial_copy_generic((__force void *)src, dst,
15491 + ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
15492 len, sum, err_ptr, NULL);
15493 clac();
15494
15495 @@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
15496 might_sleep();
15497 if (access_ok(VERIFY_WRITE, dst, len)) {
15498 stac();
15499 - ret = csum_partial_copy_generic(src, (__force void *)dst,
15500 + ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
15501 len, sum, NULL, err_ptr);
15502 clac();
15503 return ret;
15504 diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
15505 index d47786a..ce1b05d 100644
15506 --- a/arch/x86/include/asm/cmpxchg.h
15507 +++ b/arch/x86/include/asm/cmpxchg.h
15508 @@ -14,8 +14,12 @@ extern void __cmpxchg_wrong_size(void)
15509 __compiletime_error("Bad argument size for cmpxchg");
15510 extern void __xadd_wrong_size(void)
15511 __compiletime_error("Bad argument size for xadd");
15512 +extern void __xadd_check_overflow_wrong_size(void)
15513 + __compiletime_error("Bad argument size for xadd_check_overflow");
15514 extern void __add_wrong_size(void)
15515 __compiletime_error("Bad argument size for add");
15516 +extern void __add_check_overflow_wrong_size(void)
15517 + __compiletime_error("Bad argument size for add_check_overflow");
15518
15519 /*
15520 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
15521 @@ -67,6 +71,34 @@ extern void __add_wrong_size(void)
15522 __ret; \
15523 })
15524
15525 +#define __xchg_op_check_overflow(ptr, arg, op, lock) \
15526 + ({ \
15527 + __typeof__ (*(ptr)) __ret = (arg); \
15528 + switch (sizeof(*(ptr))) { \
15529 + case __X86_CASE_L: \
15530 + asm volatile (lock #op "l %0, %1\n" \
15531 + "jno 0f\n" \
15532 + "mov %0,%1\n" \
15533 + "int $4\n0:\n" \
15534 + _ASM_EXTABLE(0b, 0b) \
15535 + : "+r" (__ret), "+m" (*(ptr)) \
15536 + : : "memory", "cc"); \
15537 + break; \
15538 + case __X86_CASE_Q: \
15539 + asm volatile (lock #op "q %q0, %1\n" \
15540 + "jno 0f\n" \
15541 + "mov %0,%1\n" \
15542 + "int $4\n0:\n" \
15543 + _ASM_EXTABLE(0b, 0b) \
15544 + : "+r" (__ret), "+m" (*(ptr)) \
15545 + : : "memory", "cc"); \
15546 + break; \
15547 + default: \
15548 + __ ## op ## _check_overflow_wrong_size(); \
15549 + } \
15550 + __ret; \
15551 + })
15552 +
15553 /*
15554 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
15555 * Since this is generally used to protect other memory information, we
15556 @@ -167,6 +199,9 @@ extern void __add_wrong_size(void)
15557 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
15558 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
15559
15560 +#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
15561 +#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
15562 +
15563 #define __add(ptr, inc, lock) \
15564 ({ \
15565 __typeof__ (*(ptr)) __ret = (inc); \
15566 diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
15567 index 59c6c40..5e0b22c 100644
15568 --- a/arch/x86/include/asm/compat.h
15569 +++ b/arch/x86/include/asm/compat.h
15570 @@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
15571 typedef u32 compat_uint_t;
15572 typedef u32 compat_ulong_t;
15573 typedef u64 __attribute__((aligned(4))) compat_u64;
15574 -typedef u32 compat_uptr_t;
15575 +typedef u32 __user compat_uptr_t;
15576
15577 struct compat_timespec {
15578 compat_time_t tv_sec;
15579 diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
15580 index 89270b4..f0abf8e 100644
15581 --- a/arch/x86/include/asm/cpufeature.h
15582 +++ b/arch/x86/include/asm/cpufeature.h
15583 @@ -203,7 +203,7 @@
15584 #define X86_FEATURE_DECODEASSISTS (8*32+12) /* AMD Decode Assists support */
15585 #define X86_FEATURE_PAUSEFILTER (8*32+13) /* AMD filtered pause intercept */
15586 #define X86_FEATURE_PFTHRESHOLD (8*32+14) /* AMD pause filter threshold */
15587 -
15588 +#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
15589
15590 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
15591 #define X86_FEATURE_FSGSBASE (9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
15592 @@ -211,7 +211,7 @@
15593 #define X86_FEATURE_BMI1 (9*32+ 3) /* 1st group bit manipulation extensions */
15594 #define X86_FEATURE_HLE (9*32+ 4) /* Hardware Lock Elision */
15595 #define X86_FEATURE_AVX2 (9*32+ 5) /* AVX2 instructions */
15596 -#define X86_FEATURE_SMEP (9*32+ 7) /* Supervisor Mode Execution Protection */
15597 +#define X86_FEATURE_SMEP (9*32+ 7) /* Supervisor Mode Execution Prevention */
15598 #define X86_FEATURE_BMI2 (9*32+ 8) /* 2nd group bit manipulation extensions */
15599 #define X86_FEATURE_ERMS (9*32+ 9) /* Enhanced REP MOVSB/STOSB */
15600 #define X86_FEATURE_INVPCID (9*32+10) /* Invalidate Processor Context ID */
15601 @@ -353,6 +353,7 @@ extern const char * const x86_power_flags[32];
15602 #undef cpu_has_centaur_mcr
15603 #define cpu_has_centaur_mcr 0
15604
15605 +#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
15606 #endif /* CONFIG_X86_64 */
15607
15608 #if __GNUC__ >= 4
15609 @@ -405,7 +406,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
15610
15611 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
15612 t_warn:
15613 - warn_pre_alternatives();
15614 + if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
15615 + warn_pre_alternatives();
15616 return false;
15617 #endif
15618
15619 @@ -425,7 +427,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
15620 ".section .discard,\"aw\",@progbits\n"
15621 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
15622 ".previous\n"
15623 - ".section .altinstr_replacement,\"ax\"\n"
15624 + ".section .altinstr_replacement,\"a\"\n"
15625 "3: movb $1,%0\n"
15626 "4:\n"
15627 ".previous\n"
15628 @@ -462,7 +464,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
15629 " .byte 2b - 1b\n" /* src len */
15630 " .byte 4f - 3f\n" /* repl len */
15631 ".previous\n"
15632 - ".section .altinstr_replacement,\"ax\"\n"
15633 + ".section .altinstr_replacement,\"a\"\n"
15634 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
15635 "4:\n"
15636 ".previous\n"
15637 @@ -495,7 +497,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
15638 ".section .discard,\"aw\",@progbits\n"
15639 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
15640 ".previous\n"
15641 - ".section .altinstr_replacement,\"ax\"\n"
15642 + ".section .altinstr_replacement,\"a\"\n"
15643 "3: movb $0,%0\n"
15644 "4:\n"
15645 ".previous\n"
15646 @@ -509,7 +511,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
15647 ".section .discard,\"aw\",@progbits\n"
15648 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
15649 ".previous\n"
15650 - ".section .altinstr_replacement,\"ax\"\n"
15651 + ".section .altinstr_replacement,\"a\"\n"
15652 "5: movb $1,%0\n"
15653 "6:\n"
15654 ".previous\n"
15655 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
15656 index b90e5df..b462c91 100644
15657 --- a/arch/x86/include/asm/desc.h
15658 +++ b/arch/x86/include/asm/desc.h
15659 @@ -4,6 +4,7 @@
15660 #include <asm/desc_defs.h>
15661 #include <asm/ldt.h>
15662 #include <asm/mmu.h>
15663 +#include <asm/pgtable.h>
15664
15665 #include <linux/smp.h>
15666 #include <linux/percpu.h>
15667 @@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
15668
15669 desc->type = (info->read_exec_only ^ 1) << 1;
15670 desc->type |= info->contents << 2;
15671 + desc->type |= info->seg_not_present ^ 1;
15672
15673 desc->s = 1;
15674 desc->dpl = 0x3;
15675 @@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
15676 }
15677
15678 extern struct desc_ptr idt_descr;
15679 -extern gate_desc idt_table[];
15680 -extern struct desc_ptr debug_idt_descr;
15681 -extern gate_desc debug_idt_table[];
15682 -
15683 -struct gdt_page {
15684 - struct desc_struct gdt[GDT_ENTRIES];
15685 -} __attribute__((aligned(PAGE_SIZE)));
15686 -
15687 -DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
15688 +extern gate_desc idt_table[IDT_ENTRIES];
15689 +extern const struct desc_ptr debug_idt_descr;
15690 +extern gate_desc debug_idt_table[IDT_ENTRIES];
15691
15692 +extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
15693 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
15694 {
15695 - return per_cpu(gdt_page, cpu).gdt;
15696 + return cpu_gdt_table[cpu];
15697 }
15698
15699 #ifdef CONFIG_X86_64
15700 @@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
15701 unsigned long base, unsigned dpl, unsigned flags,
15702 unsigned short seg)
15703 {
15704 - gate->a = (seg << 16) | (base & 0xffff);
15705 - gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
15706 + gate->gate.offset_low = base;
15707 + gate->gate.seg = seg;
15708 + gate->gate.reserved = 0;
15709 + gate->gate.type = type;
15710 + gate->gate.s = 0;
15711 + gate->gate.dpl = dpl;
15712 + gate->gate.p = 1;
15713 + gate->gate.offset_high = base >> 16;
15714 }
15715
15716 #endif
15717 @@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
15718
15719 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
15720 {
15721 + pax_open_kernel();
15722 memcpy(&idt[entry], gate, sizeof(*gate));
15723 + pax_close_kernel();
15724 }
15725
15726 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
15727 {
15728 + pax_open_kernel();
15729 memcpy(&ldt[entry], desc, 8);
15730 + pax_close_kernel();
15731 }
15732
15733 static inline void
15734 @@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
15735 default: size = sizeof(*gdt); break;
15736 }
15737
15738 + pax_open_kernel();
15739 memcpy(&gdt[entry], desc, size);
15740 + pax_close_kernel();
15741 }
15742
15743 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
15744 @@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
15745
15746 static inline void native_load_tr_desc(void)
15747 {
15748 + pax_open_kernel();
15749 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
15750 + pax_close_kernel();
15751 }
15752
15753 static inline void native_load_gdt(const struct desc_ptr *dtr)
15754 @@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
15755 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
15756 unsigned int i;
15757
15758 + pax_open_kernel();
15759 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
15760 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
15761 + pax_close_kernel();
15762 }
15763
15764 #define _LDT_empty(info) \
15765 @@ -287,7 +300,7 @@ static inline void load_LDT(mm_context_t *pc)
15766 preempt_enable();
15767 }
15768
15769 -static inline unsigned long get_desc_base(const struct desc_struct *desc)
15770 +static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
15771 {
15772 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
15773 }
15774 @@ -311,7 +324,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
15775 }
15776
15777 #ifdef CONFIG_X86_64
15778 -static inline void set_nmi_gate(int gate, void *addr)
15779 +static inline void set_nmi_gate(int gate, const void *addr)
15780 {
15781 gate_desc s;
15782
15783 @@ -321,8 +334,8 @@ static inline void set_nmi_gate(int gate, void *addr)
15784 #endif
15785
15786 #ifdef CONFIG_TRACING
15787 -extern struct desc_ptr trace_idt_descr;
15788 -extern gate_desc trace_idt_table[];
15789 +extern const struct desc_ptr trace_idt_descr;
15790 +extern gate_desc trace_idt_table[IDT_ENTRIES];
15791 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
15792 {
15793 write_idt_entry(trace_idt_table, entry, gate);
15794 @@ -333,7 +346,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
15795 }
15796 #endif
15797
15798 -static inline void _set_gate(int gate, unsigned type, void *addr,
15799 +static inline void _set_gate(int gate, unsigned type, const void *addr,
15800 unsigned dpl, unsigned ist, unsigned seg)
15801 {
15802 gate_desc s;
15803 @@ -353,7 +366,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
15804 * Pentium F0 0F bugfix can have resulted in the mapped
15805 * IDT being write-protected.
15806 */
15807 -static inline void set_intr_gate(unsigned int n, void *addr)
15808 +static inline void set_intr_gate(unsigned int n, const void *addr)
15809 {
15810 BUG_ON((unsigned)n > 0xFF);
15811 _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
15812 @@ -410,19 +423,19 @@ static inline void __alloc_intr_gate(unsigned int n, void *addr)
15813 /*
15814 * This routine sets up an interrupt gate at directory privilege level 3.
15815 */
15816 -static inline void set_system_intr_gate(unsigned int n, void *addr)
15817 +static inline void set_system_intr_gate(unsigned int n, const void *addr)
15818 {
15819 BUG_ON((unsigned)n > 0xFF);
15820 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
15821 }
15822
15823 -static inline void set_system_trap_gate(unsigned int n, void *addr)
15824 +static inline void set_system_trap_gate(unsigned int n, const void *addr)
15825 {
15826 BUG_ON((unsigned)n > 0xFF);
15827 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
15828 }
15829
15830 -static inline void set_trap_gate(unsigned int n, void *addr)
15831 +static inline void set_trap_gate(unsigned int n, const void *addr)
15832 {
15833 BUG_ON((unsigned)n > 0xFF);
15834 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
15835 @@ -431,16 +444,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
15836 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
15837 {
15838 BUG_ON((unsigned)n > 0xFF);
15839 - _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
15840 + _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
15841 }
15842
15843 -static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
15844 +static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
15845 {
15846 BUG_ON((unsigned)n > 0xFF);
15847 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
15848 }
15849
15850 -static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
15851 +static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
15852 {
15853 BUG_ON((unsigned)n > 0xFF);
15854 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
15855 @@ -512,4 +525,17 @@ static inline void load_current_idt(void)
15856 else
15857 load_idt((const struct desc_ptr *)&idt_descr);
15858 }
15859 +
15860 +#ifdef CONFIG_X86_32
15861 +static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
15862 +{
15863 + struct desc_struct d;
15864 +
15865 + if (likely(limit))
15866 + limit = (limit - 1UL) >> PAGE_SHIFT;
15867 + pack_descriptor(&d, base, limit, 0xFB, 0xC);
15868 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
15869 +}
15870 +#endif
15871 +
15872 #endif /* _ASM_X86_DESC_H */
15873 diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
15874 index 278441f..b95a174 100644
15875 --- a/arch/x86/include/asm/desc_defs.h
15876 +++ b/arch/x86/include/asm/desc_defs.h
15877 @@ -31,6 +31,12 @@ struct desc_struct {
15878 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
15879 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
15880 };
15881 + struct {
15882 + u16 offset_low;
15883 + u16 seg;
15884 + unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
15885 + unsigned offset_high: 16;
15886 + } gate;
15887 };
15888 } __attribute__((packed));
15889
15890 diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
15891 index ced283a..ffe04cc 100644
15892 --- a/arch/x86/include/asm/div64.h
15893 +++ b/arch/x86/include/asm/div64.h
15894 @@ -39,7 +39,7 @@
15895 __mod; \
15896 })
15897
15898 -static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
15899 +static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
15900 {
15901 union {
15902 u64 v64;
15903 diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
15904 index 9c999c1..3860cb8 100644
15905 --- a/arch/x86/include/asm/elf.h
15906 +++ b/arch/x86/include/asm/elf.h
15907 @@ -243,7 +243,25 @@ extern int force_personality32;
15908 the loader. We need to make sure that it is out of the way of the program
15909 that it will "exec", and that there is sufficient room for the brk. */
15910
15911 +#ifdef CONFIG_PAX_SEGMEXEC
15912 +#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
15913 +#else
15914 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
15915 +#endif
15916 +
15917 +#ifdef CONFIG_PAX_ASLR
15918 +#ifdef CONFIG_X86_32
15919 +#define PAX_ELF_ET_DYN_BASE 0x10000000UL
15920 +
15921 +#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
15922 +#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
15923 +#else
15924 +#define PAX_ELF_ET_DYN_BASE 0x400000UL
15925 +
15926 +#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
15927 +#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
15928 +#endif
15929 +#endif
15930
15931 /* This yields a mask that user programs can use to figure out what
15932 instruction set this CPU supports. This could be done in user space,
15933 @@ -296,16 +314,12 @@ do { \
15934
15935 #define ARCH_DLINFO \
15936 do { \
15937 - if (vdso_enabled) \
15938 - NEW_AUX_ENT(AT_SYSINFO_EHDR, \
15939 - (unsigned long)current->mm->context.vdso); \
15940 + NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
15941 } while (0)
15942
15943 #define ARCH_DLINFO_X32 \
15944 do { \
15945 - if (vdso_enabled) \
15946 - NEW_AUX_ENT(AT_SYSINFO_EHDR, \
15947 - (unsigned long)current->mm->context.vdso); \
15948 + NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
15949 } while (0)
15950
15951 #define AT_SYSINFO 32
15952 @@ -320,7 +334,7 @@ else \
15953
15954 #endif /* !CONFIG_X86_32 */
15955
15956 -#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
15957 +#define VDSO_CURRENT_BASE (current->mm->context.vdso)
15958
15959 #define VDSO_ENTRY \
15960 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
15961 @@ -336,9 +350,6 @@ extern int x32_setup_additional_pages(struct linux_binprm *bprm,
15962 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
15963 #define compat_arch_setup_additional_pages syscall32_setup_pages
15964
15965 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
15966 -#define arch_randomize_brk arch_randomize_brk
15967 -
15968 /*
15969 * True on X86_32 or when emulating IA32 on X86_64
15970 */
15971 diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
15972 index 77a99ac..39ff7f5 100644
15973 --- a/arch/x86/include/asm/emergency-restart.h
15974 +++ b/arch/x86/include/asm/emergency-restart.h
15975 @@ -1,6 +1,6 @@
15976 #ifndef _ASM_X86_EMERGENCY_RESTART_H
15977 #define _ASM_X86_EMERGENCY_RESTART_H
15978
15979 -extern void machine_emergency_restart(void);
15980 +extern void machine_emergency_restart(void) __noreturn;
15981
15982 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
15983 diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
15984 index 4d0bda7..221da4d 100644
15985 --- a/arch/x86/include/asm/fpu-internal.h
15986 +++ b/arch/x86/include/asm/fpu-internal.h
15987 @@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
15988 #define user_insn(insn, output, input...) \
15989 ({ \
15990 int err; \
15991 + pax_open_userland(); \
15992 asm volatile(ASM_STAC "\n" \
15993 - "1:" #insn "\n\t" \
15994 + "1:" \
15995 + __copyuser_seg \
15996 + #insn "\n\t" \
15997 "2: " ASM_CLAC "\n" \
15998 ".section .fixup,\"ax\"\n" \
15999 "3: movl $-1,%[err]\n" \
16000 @@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16001 _ASM_EXTABLE(1b, 3b) \
16002 : [err] "=r" (err), output \
16003 : "0"(0), input); \
16004 + pax_close_userland(); \
16005 err; \
16006 })
16007
16008 @@ -298,7 +302,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16009 "emms\n\t" /* clear stack tags */
16010 "fildl %P[addr]", /* set F?P to defined value */
16011 X86_FEATURE_FXSAVE_LEAK,
16012 - [addr] "m" (tsk->thread.fpu.has_fpu));
16013 + [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
16014
16015 return fpu_restore_checking(&tsk->thread.fpu);
16016 }
16017 diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16018 index be27ba1..04a8801 100644
16019 --- a/arch/x86/include/asm/futex.h
16020 +++ b/arch/x86/include/asm/futex.h
16021 @@ -12,6 +12,7 @@
16022 #include <asm/smap.h>
16023
16024 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16025 + typecheck(u32 __user *, uaddr); \
16026 asm volatile("\t" ASM_STAC "\n" \
16027 "1:\t" insn "\n" \
16028 "2:\t" ASM_CLAC "\n" \
16029 @@ -20,15 +21,16 @@
16030 "\tjmp\t2b\n" \
16031 "\t.previous\n" \
16032 _ASM_EXTABLE(1b, 3b) \
16033 - : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16034 + : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16035 : "i" (-EFAULT), "0" (oparg), "1" (0))
16036
16037 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16038 + typecheck(u32 __user *, uaddr); \
16039 asm volatile("\t" ASM_STAC "\n" \
16040 "1:\tmovl %2, %0\n" \
16041 "\tmovl\t%0, %3\n" \
16042 "\t" insn "\n" \
16043 - "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16044 + "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16045 "\tjnz\t1b\n" \
16046 "3:\t" ASM_CLAC "\n" \
16047 "\t.section .fixup,\"ax\"\n" \
16048 @@ -38,7 +40,7 @@
16049 _ASM_EXTABLE(1b, 4b) \
16050 _ASM_EXTABLE(2b, 4b) \
16051 : "=&a" (oldval), "=&r" (ret), \
16052 - "+m" (*uaddr), "=&r" (tem) \
16053 + "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
16054 : "r" (oparg), "i" (-EFAULT), "1" (0))
16055
16056 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16057 @@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16058
16059 pagefault_disable();
16060
16061 + pax_open_userland();
16062 switch (op) {
16063 case FUTEX_OP_SET:
16064 - __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
16065 + __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
16066 break;
16067 case FUTEX_OP_ADD:
16068 - __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
16069 + __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
16070 uaddr, oparg);
16071 break;
16072 case FUTEX_OP_OR:
16073 @@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16074 default:
16075 ret = -ENOSYS;
16076 }
16077 + pax_close_userland();
16078
16079 pagefault_enable();
16080
16081 @@ -115,18 +119,20 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
16082 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
16083 return -EFAULT;
16084
16085 + pax_open_userland();
16086 asm volatile("\t" ASM_STAC "\n"
16087 - "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n"
16088 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"
16089 "2:\t" ASM_CLAC "\n"
16090 "\t.section .fixup, \"ax\"\n"
16091 "3:\tmov %3, %0\n"
16092 "\tjmp 2b\n"
16093 "\t.previous\n"
16094 _ASM_EXTABLE(1b, 3b)
16095 - : "+r" (ret), "=a" (oldval), "+m" (*uaddr)
16096 + : "+r" (ret), "=a" (oldval), "+m" (*(u32 __user *)____m(uaddr))
16097 : "i" (-EFAULT), "r" (newval), "1" (oldval)
16098 : "memory"
16099 );
16100 + pax_close_userland();
16101
16102 *uval = oldval;
16103 return ret;
16104 diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
16105 index 92b3bae..3866449 100644
16106 --- a/arch/x86/include/asm/hw_irq.h
16107 +++ b/arch/x86/include/asm/hw_irq.h
16108 @@ -165,8 +165,8 @@ extern void setup_ioapic_dest(void);
16109 extern void enable_IO_APIC(void);
16110
16111 /* Statistics */
16112 -extern atomic_t irq_err_count;
16113 -extern atomic_t irq_mis_count;
16114 +extern atomic_unchecked_t irq_err_count;
16115 +extern atomic_unchecked_t irq_mis_count;
16116
16117 /* EISA */
16118 extern void eisa_set_level_irq(unsigned int irq);
16119 diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
16120 index a203659..9889f1c 100644
16121 --- a/arch/x86/include/asm/i8259.h
16122 +++ b/arch/x86/include/asm/i8259.h
16123 @@ -62,7 +62,7 @@ struct legacy_pic {
16124 void (*init)(int auto_eoi);
16125 int (*irq_pending)(unsigned int irq);
16126 void (*make_irq)(unsigned int irq);
16127 -};
16128 +} __do_const;
16129
16130 extern struct legacy_pic *legacy_pic;
16131 extern struct legacy_pic null_legacy_pic;
16132 diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
16133 index 34f69cb..6d95446 100644
16134 --- a/arch/x86/include/asm/io.h
16135 +++ b/arch/x86/include/asm/io.h
16136 @@ -51,12 +51,12 @@ static inline void name(type val, volatile void __iomem *addr) \
16137 "m" (*(volatile type __force *)addr) barrier); }
16138
16139 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
16140 -build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
16141 -build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
16142 +build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
16143 +build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
16144
16145 build_mmio_read(__readb, "b", unsigned char, "=q", )
16146 -build_mmio_read(__readw, "w", unsigned short, "=r", )
16147 -build_mmio_read(__readl, "l", unsigned int, "=r", )
16148 +build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
16149 +build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
16150
16151 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
16152 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
16153 @@ -184,7 +184,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
16154 return ioremap_nocache(offset, size);
16155 }
16156
16157 -extern void iounmap(volatile void __iomem *addr);
16158 +extern void iounmap(const volatile void __iomem *addr);
16159
16160 extern void set_iounmap_nonlazy(void);
16161
16162 @@ -194,6 +194,17 @@ extern void set_iounmap_nonlazy(void);
16163
16164 #include <linux/vmalloc.h>
16165
16166 +#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
16167 +static inline int valid_phys_addr_range(unsigned long addr, size_t count)
16168 +{
16169 + return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
16170 +}
16171 +
16172 +static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
16173 +{
16174 + return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
16175 +}
16176 +
16177 /*
16178 * Convert a virtual cached pointer to an uncached pointer
16179 */
16180 diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
16181 index bba3cf8..06bc8da 100644
16182 --- a/arch/x86/include/asm/irqflags.h
16183 +++ b/arch/x86/include/asm/irqflags.h
16184 @@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
16185 sti; \
16186 sysexit
16187
16188 +#define GET_CR0_INTO_RDI mov %cr0, %rdi
16189 +#define SET_RDI_INTO_CR0 mov %rdi, %cr0
16190 +#define GET_CR3_INTO_RDI mov %cr3, %rdi
16191 +#define SET_RDI_INTO_CR3 mov %rdi, %cr3
16192 +
16193 #else
16194 #define INTERRUPT_RETURN iret
16195 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
16196 diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
16197 index 9454c16..e4100e3 100644
16198 --- a/arch/x86/include/asm/kprobes.h
16199 +++ b/arch/x86/include/asm/kprobes.h
16200 @@ -38,13 +38,8 @@ typedef u8 kprobe_opcode_t;
16201 #define RELATIVEJUMP_SIZE 5
16202 #define RELATIVECALL_OPCODE 0xe8
16203 #define RELATIVE_ADDR_SIZE 4
16204 -#define MAX_STACK_SIZE 64
16205 -#define MIN_STACK_SIZE(ADDR) \
16206 - (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
16207 - THREAD_SIZE - (unsigned long)(ADDR))) \
16208 - ? (MAX_STACK_SIZE) \
16209 - : (((unsigned long)current_thread_info()) + \
16210 - THREAD_SIZE - (unsigned long)(ADDR)))
16211 +#define MAX_STACK_SIZE 64UL
16212 +#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
16213
16214 #define flush_insn_slot(p) do { } while (0)
16215
16216 diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
16217 index 2d89e39..baee879 100644
16218 --- a/arch/x86/include/asm/local.h
16219 +++ b/arch/x86/include/asm/local.h
16220 @@ -10,33 +10,97 @@ typedef struct {
16221 atomic_long_t a;
16222 } local_t;
16223
16224 +typedef struct {
16225 + atomic_long_unchecked_t a;
16226 +} local_unchecked_t;
16227 +
16228 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
16229
16230 #define local_read(l) atomic_long_read(&(l)->a)
16231 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
16232 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
16233 +#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
16234
16235 static inline void local_inc(local_t *l)
16236 {
16237 - asm volatile(_ASM_INC "%0"
16238 + asm volatile(_ASM_INC "%0\n"
16239 +
16240 +#ifdef CONFIG_PAX_REFCOUNT
16241 + "jno 0f\n"
16242 + _ASM_DEC "%0\n"
16243 + "int $4\n0:\n"
16244 + _ASM_EXTABLE(0b, 0b)
16245 +#endif
16246 +
16247 + : "+m" (l->a.counter));
16248 +}
16249 +
16250 +static inline void local_inc_unchecked(local_unchecked_t *l)
16251 +{
16252 + asm volatile(_ASM_INC "%0\n"
16253 : "+m" (l->a.counter));
16254 }
16255
16256 static inline void local_dec(local_t *l)
16257 {
16258 - asm volatile(_ASM_DEC "%0"
16259 + asm volatile(_ASM_DEC "%0\n"
16260 +
16261 +#ifdef CONFIG_PAX_REFCOUNT
16262 + "jno 0f\n"
16263 + _ASM_INC "%0\n"
16264 + "int $4\n0:\n"
16265 + _ASM_EXTABLE(0b, 0b)
16266 +#endif
16267 +
16268 + : "+m" (l->a.counter));
16269 +}
16270 +
16271 +static inline void local_dec_unchecked(local_unchecked_t *l)
16272 +{
16273 + asm volatile(_ASM_DEC "%0\n"
16274 : "+m" (l->a.counter));
16275 }
16276
16277 static inline void local_add(long i, local_t *l)
16278 {
16279 - asm volatile(_ASM_ADD "%1,%0"
16280 + asm volatile(_ASM_ADD "%1,%0\n"
16281 +
16282 +#ifdef CONFIG_PAX_REFCOUNT
16283 + "jno 0f\n"
16284 + _ASM_SUB "%1,%0\n"
16285 + "int $4\n0:\n"
16286 + _ASM_EXTABLE(0b, 0b)
16287 +#endif
16288 +
16289 + : "+m" (l->a.counter)
16290 + : "ir" (i));
16291 +}
16292 +
16293 +static inline void local_add_unchecked(long i, local_unchecked_t *l)
16294 +{
16295 + asm volatile(_ASM_ADD "%1,%0\n"
16296 : "+m" (l->a.counter)
16297 : "ir" (i));
16298 }
16299
16300 static inline void local_sub(long i, local_t *l)
16301 {
16302 - asm volatile(_ASM_SUB "%1,%0"
16303 + asm volatile(_ASM_SUB "%1,%0\n"
16304 +
16305 +#ifdef CONFIG_PAX_REFCOUNT
16306 + "jno 0f\n"
16307 + _ASM_ADD "%1,%0\n"
16308 + "int $4\n0:\n"
16309 + _ASM_EXTABLE(0b, 0b)
16310 +#endif
16311 +
16312 + : "+m" (l->a.counter)
16313 + : "ir" (i));
16314 +}
16315 +
16316 +static inline void local_sub_unchecked(long i, local_unchecked_t *l)
16317 +{
16318 + asm volatile(_ASM_SUB "%1,%0\n"
16319 : "+m" (l->a.counter)
16320 : "ir" (i));
16321 }
16322 @@ -54,7 +118,16 @@ static inline int local_sub_and_test(long i, local_t *l)
16323 {
16324 unsigned char c;
16325
16326 - asm volatile(_ASM_SUB "%2,%0; sete %1"
16327 + asm volatile(_ASM_SUB "%2,%0\n"
16328 +
16329 +#ifdef CONFIG_PAX_REFCOUNT
16330 + "jno 0f\n"
16331 + _ASM_ADD "%2,%0\n"
16332 + "int $4\n0:\n"
16333 + _ASM_EXTABLE(0b, 0b)
16334 +#endif
16335 +
16336 + "sete %1\n"
16337 : "+m" (l->a.counter), "=qm" (c)
16338 : "ir" (i) : "memory");
16339 return c;
16340 @@ -72,7 +145,16 @@ static inline int local_dec_and_test(local_t *l)
16341 {
16342 unsigned char c;
16343
16344 - asm volatile(_ASM_DEC "%0; sete %1"
16345 + asm volatile(_ASM_DEC "%0\n"
16346 +
16347 +#ifdef CONFIG_PAX_REFCOUNT
16348 + "jno 0f\n"
16349 + _ASM_INC "%0\n"
16350 + "int $4\n0:\n"
16351 + _ASM_EXTABLE(0b, 0b)
16352 +#endif
16353 +
16354 + "sete %1\n"
16355 : "+m" (l->a.counter), "=qm" (c)
16356 : : "memory");
16357 return c != 0;
16358 @@ -90,7 +172,16 @@ static inline int local_inc_and_test(local_t *l)
16359 {
16360 unsigned char c;
16361
16362 - asm volatile(_ASM_INC "%0; sete %1"
16363 + asm volatile(_ASM_INC "%0\n"
16364 +
16365 +#ifdef CONFIG_PAX_REFCOUNT
16366 + "jno 0f\n"
16367 + _ASM_DEC "%0\n"
16368 + "int $4\n0:\n"
16369 + _ASM_EXTABLE(0b, 0b)
16370 +#endif
16371 +
16372 + "sete %1\n"
16373 : "+m" (l->a.counter), "=qm" (c)
16374 : : "memory");
16375 return c != 0;
16376 @@ -109,7 +200,16 @@ static inline int local_add_negative(long i, local_t *l)
16377 {
16378 unsigned char c;
16379
16380 - asm volatile(_ASM_ADD "%2,%0; sets %1"
16381 + asm volatile(_ASM_ADD "%2,%0\n"
16382 +
16383 +#ifdef CONFIG_PAX_REFCOUNT
16384 + "jno 0f\n"
16385 + _ASM_SUB "%2,%0\n"
16386 + "int $4\n0:\n"
16387 + _ASM_EXTABLE(0b, 0b)
16388 +#endif
16389 +
16390 + "sets %1\n"
16391 : "+m" (l->a.counter), "=qm" (c)
16392 : "ir" (i) : "memory");
16393 return c;
16394 @@ -125,6 +225,30 @@ static inline int local_add_negative(long i, local_t *l)
16395 static inline long local_add_return(long i, local_t *l)
16396 {
16397 long __i = i;
16398 + asm volatile(_ASM_XADD "%0, %1\n"
16399 +
16400 +#ifdef CONFIG_PAX_REFCOUNT
16401 + "jno 0f\n"
16402 + _ASM_MOV "%0,%1\n"
16403 + "int $4\n0:\n"
16404 + _ASM_EXTABLE(0b, 0b)
16405 +#endif
16406 +
16407 + : "+r" (i), "+m" (l->a.counter)
16408 + : : "memory");
16409 + return i + __i;
16410 +}
16411 +
16412 +/**
16413 + * local_add_return_unchecked - add and return
16414 + * @i: integer value to add
16415 + * @l: pointer to type local_unchecked_t
16416 + *
16417 + * Atomically adds @i to @l and returns @i + @l
16418 + */
16419 +static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
16420 +{
16421 + long __i = i;
16422 asm volatile(_ASM_XADD "%0, %1;"
16423 : "+r" (i), "+m" (l->a.counter)
16424 : : "memory");
16425 @@ -141,6 +265,8 @@ static inline long local_sub_return(long i, local_t *l)
16426
16427 #define local_cmpxchg(l, o, n) \
16428 (cmpxchg_local(&((l)->a.counter), (o), (n)))
16429 +#define local_cmpxchg_unchecked(l, o, n) \
16430 + (cmpxchg_local(&((l)->a.counter), (o), (n)))
16431 /* Always has a lock prefix */
16432 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
16433
16434 diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
16435 new file mode 100644
16436 index 0000000..2bfd3ba
16437 --- /dev/null
16438 +++ b/arch/x86/include/asm/mman.h
16439 @@ -0,0 +1,15 @@
16440 +#ifndef _X86_MMAN_H
16441 +#define _X86_MMAN_H
16442 +
16443 +#include <uapi/asm/mman.h>
16444 +
16445 +#ifdef __KERNEL__
16446 +#ifndef __ASSEMBLY__
16447 +#ifdef CONFIG_X86_32
16448 +#define arch_mmap_check i386_mmap_check
16449 +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
16450 +#endif
16451 +#endif
16452 +#endif
16453 +
16454 +#endif /* X86_MMAN_H */
16455 diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
16456 index 5f55e69..e20bfb1 100644
16457 --- a/arch/x86/include/asm/mmu.h
16458 +++ b/arch/x86/include/asm/mmu.h
16459 @@ -9,7 +9,7 @@
16460 * we put the segment information here.
16461 */
16462 typedef struct {
16463 - void *ldt;
16464 + struct desc_struct *ldt;
16465 int size;
16466
16467 #ifdef CONFIG_X86_64
16468 @@ -18,7 +18,19 @@ typedef struct {
16469 #endif
16470
16471 struct mutex lock;
16472 - void *vdso;
16473 + unsigned long vdso;
16474 +
16475 +#ifdef CONFIG_X86_32
16476 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
16477 + unsigned long user_cs_base;
16478 + unsigned long user_cs_limit;
16479 +
16480 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
16481 + cpumask_t cpu_user_cs_mask;
16482 +#endif
16483 +
16484 +#endif
16485 +#endif
16486 } mm_context_t;
16487
16488 #ifdef CONFIG_SMP
16489 diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
16490 index be12c53..4d24039 100644
16491 --- a/arch/x86/include/asm/mmu_context.h
16492 +++ b/arch/x86/include/asm/mmu_context.h
16493 @@ -24,6 +24,20 @@ void destroy_context(struct mm_struct *mm);
16494
16495 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
16496 {
16497 +
16498 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16499 + if (!(static_cpu_has(X86_FEATURE_PCID))) {
16500 + unsigned int i;
16501 + pgd_t *pgd;
16502 +
16503 + pax_open_kernel();
16504 + pgd = get_cpu_pgd(smp_processor_id(), kernel);
16505 + for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
16506 + set_pgd_batched(pgd+i, native_make_pgd(0));
16507 + pax_close_kernel();
16508 + }
16509 +#endif
16510 +
16511 #ifdef CONFIG_SMP
16512 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
16513 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
16514 @@ -34,16 +48,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
16515 struct task_struct *tsk)
16516 {
16517 unsigned cpu = smp_processor_id();
16518 +#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
16519 + int tlbstate = TLBSTATE_OK;
16520 +#endif
16521
16522 if (likely(prev != next)) {
16523 #ifdef CONFIG_SMP
16524 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
16525 + tlbstate = this_cpu_read(cpu_tlbstate.state);
16526 +#endif
16527 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
16528 this_cpu_write(cpu_tlbstate.active_mm, next);
16529 #endif
16530 cpumask_set_cpu(cpu, mm_cpumask(next));
16531
16532 /* Re-load page tables */
16533 +#ifdef CONFIG_PAX_PER_CPU_PGD
16534 + pax_open_kernel();
16535 +
16536 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16537 + if (static_cpu_has(X86_FEATURE_PCID))
16538 + __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
16539 + else
16540 +#endif
16541 +
16542 + __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
16543 + __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
16544 + pax_close_kernel();
16545 + 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));
16546 +
16547 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16548 + if (static_cpu_has(X86_FEATURE_PCID)) {
16549 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
16550 + u64 descriptor[2];
16551 + descriptor[0] = PCID_USER;
16552 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
16553 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
16554 + descriptor[0] = PCID_KERNEL;
16555 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
16556 + }
16557 + } else {
16558 + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
16559 + if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
16560 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
16561 + else
16562 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
16563 + }
16564 + } else
16565 +#endif
16566 +
16567 + load_cr3(get_cpu_pgd(cpu, kernel));
16568 +#else
16569 load_cr3(next->pgd);
16570 +#endif
16571
16572 /* Stop flush ipis for the previous mm */
16573 cpumask_clear_cpu(cpu, mm_cpumask(prev));
16574 @@ -51,9 +108,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
16575 /* Load the LDT, if the LDT is different: */
16576 if (unlikely(prev->context.ldt != next->context.ldt))
16577 load_LDT_nolock(&next->context);
16578 +
16579 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
16580 + if (!(__supported_pte_mask & _PAGE_NX)) {
16581 + smp_mb__before_clear_bit();
16582 + cpu_clear(cpu, prev->context.cpu_user_cs_mask);
16583 + smp_mb__after_clear_bit();
16584 + cpu_set(cpu, next->context.cpu_user_cs_mask);
16585 + }
16586 +#endif
16587 +
16588 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
16589 + if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
16590 + prev->context.user_cs_limit != next->context.user_cs_limit))
16591 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
16592 +#ifdef CONFIG_SMP
16593 + else if (unlikely(tlbstate != TLBSTATE_OK))
16594 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
16595 +#endif
16596 +#endif
16597 +
16598 }
16599 + else {
16600 +
16601 +#ifdef CONFIG_PAX_PER_CPU_PGD
16602 + pax_open_kernel();
16603 +
16604 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16605 + if (static_cpu_has(X86_FEATURE_PCID))
16606 + __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
16607 + else
16608 +#endif
16609 +
16610 + __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
16611 + __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
16612 + pax_close_kernel();
16613 + 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));
16614 +
16615 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16616 + if (static_cpu_has(X86_FEATURE_PCID)) {
16617 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
16618 + u64 descriptor[2];
16619 + descriptor[0] = PCID_USER;
16620 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
16621 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
16622 + descriptor[0] = PCID_KERNEL;
16623 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
16624 + }
16625 + } else {
16626 + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
16627 + if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
16628 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
16629 + else
16630 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
16631 + }
16632 + } else
16633 +#endif
16634 +
16635 + load_cr3(get_cpu_pgd(cpu, kernel));
16636 +#endif
16637 +
16638 #ifdef CONFIG_SMP
16639 - else {
16640 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
16641 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
16642
16643 @@ -70,11 +185,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
16644 * tlb flush IPI delivery. We must reload CR3
16645 * to make sure to use no freed page tables.
16646 */
16647 +
16648 +#ifndef CONFIG_PAX_PER_CPU_PGD
16649 load_cr3(next->pgd);
16650 +#endif
16651 +
16652 load_LDT_nolock(&next->context);
16653 +
16654 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
16655 + if (!(__supported_pte_mask & _PAGE_NX))
16656 + cpu_set(cpu, next->context.cpu_user_cs_mask);
16657 +#endif
16658 +
16659 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
16660 +#ifdef CONFIG_PAX_PAGEEXEC
16661 + if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
16662 +#endif
16663 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
16664 +#endif
16665 +
16666 }
16667 +#endif
16668 }
16669 -#endif
16670 }
16671
16672 #define activate_mm(prev, next) \
16673 diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
16674 index e3b7819..b257c64 100644
16675 --- a/arch/x86/include/asm/module.h
16676 +++ b/arch/x86/include/asm/module.h
16677 @@ -5,6 +5,7 @@
16678
16679 #ifdef CONFIG_X86_64
16680 /* X86_64 does not define MODULE_PROC_FAMILY */
16681 +#define MODULE_PROC_FAMILY ""
16682 #elif defined CONFIG_M486
16683 #define MODULE_PROC_FAMILY "486 "
16684 #elif defined CONFIG_M586
16685 @@ -57,8 +58,20 @@
16686 #error unknown processor family
16687 #endif
16688
16689 -#ifdef CONFIG_X86_32
16690 -# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
16691 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
16692 +#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
16693 +#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
16694 +#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
16695 +#else
16696 +#define MODULE_PAX_KERNEXEC ""
16697 #endif
16698
16699 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16700 +#define MODULE_PAX_UDEREF "UDEREF "
16701 +#else
16702 +#define MODULE_PAX_UDEREF ""
16703 +#endif
16704 +
16705 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
16706 +
16707 #endif /* _ASM_X86_MODULE_H */
16708 diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
16709 index 86f9301..b365cda 100644
16710 --- a/arch/x86/include/asm/nmi.h
16711 +++ b/arch/x86/include/asm/nmi.h
16712 @@ -40,11 +40,11 @@ struct nmiaction {
16713 nmi_handler_t handler;
16714 unsigned long flags;
16715 const char *name;
16716 -};
16717 +} __do_const;
16718
16719 #define register_nmi_handler(t, fn, fg, n, init...) \
16720 ({ \
16721 - static struct nmiaction init fn##_na = { \
16722 + static const struct nmiaction init fn##_na = { \
16723 .handler = (fn), \
16724 .name = (n), \
16725 .flags = (fg), \
16726 @@ -52,7 +52,7 @@ struct nmiaction {
16727 __register_nmi_handler((t), &fn##_na); \
16728 })
16729
16730 -int __register_nmi_handler(unsigned int, struct nmiaction *);
16731 +int __register_nmi_handler(unsigned int, const struct nmiaction *);
16732
16733 void unregister_nmi_handler(unsigned int, const char *);
16734
16735 diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
16736 index c878924..21f4889 100644
16737 --- a/arch/x86/include/asm/page.h
16738 +++ b/arch/x86/include/asm/page.h
16739 @@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
16740 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
16741
16742 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
16743 +#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
16744
16745 #define __boot_va(x) __va(x)
16746 #define __boot_pa(x) __pa(x)
16747 diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
16748 index 0f1ddee..e2fc3d1 100644
16749 --- a/arch/x86/include/asm/page_64.h
16750 +++ b/arch/x86/include/asm/page_64.h
16751 @@ -7,9 +7,9 @@
16752
16753 /* duplicated to the one in bootmem.h */
16754 extern unsigned long max_pfn;
16755 -extern unsigned long phys_base;
16756 +extern const unsigned long phys_base;
16757
16758 -static inline unsigned long __phys_addr_nodebug(unsigned long x)
16759 +static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
16760 {
16761 unsigned long y = x - __START_KERNEL_map;
16762
16763 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
16764 index 401f350..dee5d13 100644
16765 --- a/arch/x86/include/asm/paravirt.h
16766 +++ b/arch/x86/include/asm/paravirt.h
16767 @@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
16768 return (pmd_t) { ret };
16769 }
16770
16771 -static inline pmdval_t pmd_val(pmd_t pmd)
16772 +static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
16773 {
16774 pmdval_t ret;
16775
16776 @@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
16777 val);
16778 }
16779
16780 +static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
16781 +{
16782 + pgdval_t val = native_pgd_val(pgd);
16783 +
16784 + if (sizeof(pgdval_t) > sizeof(long))
16785 + PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
16786 + val, (u64)val >> 32);
16787 + else
16788 + PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
16789 + val);
16790 +}
16791 +
16792 static inline void pgd_clear(pgd_t *pgdp)
16793 {
16794 set_pgd(pgdp, __pgd(0));
16795 @@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
16796 pv_mmu_ops.set_fixmap(idx, phys, flags);
16797 }
16798
16799 +#ifdef CONFIG_PAX_KERNEXEC
16800 +static inline unsigned long pax_open_kernel(void)
16801 +{
16802 + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
16803 +}
16804 +
16805 +static inline unsigned long pax_close_kernel(void)
16806 +{
16807 + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
16808 +}
16809 +#else
16810 +static inline unsigned long pax_open_kernel(void) { return 0; }
16811 +static inline unsigned long pax_close_kernel(void) { return 0; }
16812 +#endif
16813 +
16814 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
16815
16816 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
16817 @@ -906,7 +933,7 @@ extern void default_banner(void);
16818
16819 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
16820 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
16821 -#define PARA_INDIRECT(addr) *%cs:addr
16822 +#define PARA_INDIRECT(addr) *%ss:addr
16823 #endif
16824
16825 #define INTERRUPT_RETURN \
16826 @@ -981,6 +1008,21 @@ extern void default_banner(void);
16827 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
16828 CLBR_NONE, \
16829 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
16830 +
16831 +#define GET_CR0_INTO_RDI \
16832 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
16833 + mov %rax,%rdi
16834 +
16835 +#define SET_RDI_INTO_CR0 \
16836 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
16837 +
16838 +#define GET_CR3_INTO_RDI \
16839 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
16840 + mov %rax,%rdi
16841 +
16842 +#define SET_RDI_INTO_CR3 \
16843 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
16844 +
16845 #endif /* CONFIG_X86_32 */
16846
16847 #endif /* __ASSEMBLY__ */
16848 diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
16849 index aab8f67..2531748 100644
16850 --- a/arch/x86/include/asm/paravirt_types.h
16851 +++ b/arch/x86/include/asm/paravirt_types.h
16852 @@ -84,7 +84,7 @@ struct pv_init_ops {
16853 */
16854 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
16855 unsigned long addr, unsigned len);
16856 -};
16857 +} __no_const;
16858
16859
16860 struct pv_lazy_ops {
16861 @@ -98,7 +98,7 @@ struct pv_time_ops {
16862 unsigned long long (*sched_clock)(void);
16863 unsigned long long (*steal_clock)(int cpu);
16864 unsigned long (*get_tsc_khz)(void);
16865 -};
16866 +} __no_const;
16867
16868 struct pv_cpu_ops {
16869 /* hooks for various privileged instructions */
16870 @@ -192,7 +192,7 @@ struct pv_cpu_ops {
16871
16872 void (*start_context_switch)(struct task_struct *prev);
16873 void (*end_context_switch)(struct task_struct *next);
16874 -};
16875 +} __no_const;
16876
16877 struct pv_irq_ops {
16878 /*
16879 @@ -223,7 +223,7 @@ struct pv_apic_ops {
16880 unsigned long start_eip,
16881 unsigned long start_esp);
16882 #endif
16883 -};
16884 +} __no_const;
16885
16886 struct pv_mmu_ops {
16887 unsigned long (*read_cr2)(void);
16888 @@ -313,6 +313,7 @@ struct pv_mmu_ops {
16889 struct paravirt_callee_save make_pud;
16890
16891 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
16892 + void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
16893 #endif /* PAGETABLE_LEVELS == 4 */
16894 #endif /* PAGETABLE_LEVELS >= 3 */
16895
16896 @@ -324,6 +325,12 @@ struct pv_mmu_ops {
16897 an mfn. We can tell which is which from the index. */
16898 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
16899 phys_addr_t phys, pgprot_t flags);
16900 +
16901 +#ifdef CONFIG_PAX_KERNEXEC
16902 + unsigned long (*pax_open_kernel)(void);
16903 + unsigned long (*pax_close_kernel)(void);
16904 +#endif
16905 +
16906 };
16907
16908 struct arch_spinlock;
16909 diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
16910 index b4389a4..7024269 100644
16911 --- a/arch/x86/include/asm/pgalloc.h
16912 +++ b/arch/x86/include/asm/pgalloc.h
16913 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
16914 pmd_t *pmd, pte_t *pte)
16915 {
16916 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
16917 + set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
16918 +}
16919 +
16920 +static inline void pmd_populate_user(struct mm_struct *mm,
16921 + pmd_t *pmd, pte_t *pte)
16922 +{
16923 + paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
16924 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
16925 }
16926
16927 @@ -99,12 +106,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
16928
16929 #ifdef CONFIG_X86_PAE
16930 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
16931 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
16932 +{
16933 + pud_populate(mm, pudp, pmd);
16934 +}
16935 #else /* !CONFIG_X86_PAE */
16936 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
16937 {
16938 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
16939 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
16940 }
16941 +
16942 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
16943 +{
16944 + paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
16945 + set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
16946 +}
16947 #endif /* CONFIG_X86_PAE */
16948
16949 #if PAGETABLE_LEVELS > 3
16950 @@ -114,6 +131,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
16951 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
16952 }
16953
16954 +static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
16955 +{
16956 + paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
16957 + set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
16958 +}
16959 +
16960 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
16961 {
16962 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
16963 diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
16964 index 3bf2dd0..23d2a9f 100644
16965 --- a/arch/x86/include/asm/pgtable-2level.h
16966 +++ b/arch/x86/include/asm/pgtable-2level.h
16967 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
16968
16969 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
16970 {
16971 + pax_open_kernel();
16972 *pmdp = pmd;
16973 + pax_close_kernel();
16974 }
16975
16976 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
16977 diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
16978 index 81bb91b..9392125 100644
16979 --- a/arch/x86/include/asm/pgtable-3level.h
16980 +++ b/arch/x86/include/asm/pgtable-3level.h
16981 @@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
16982
16983 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
16984 {
16985 + pax_open_kernel();
16986 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
16987 + pax_close_kernel();
16988 }
16989
16990 static inline void native_set_pud(pud_t *pudp, pud_t pud)
16991 {
16992 + pax_open_kernel();
16993 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
16994 + pax_close_kernel();
16995 }
16996
16997 /*
16998 diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
16999 index 3d19994..732a48c 100644
17000 --- a/arch/x86/include/asm/pgtable.h
17001 +++ b/arch/x86/include/asm/pgtable.h
17002 @@ -45,6 +45,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17003
17004 #ifndef __PAGETABLE_PUD_FOLDED
17005 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
17006 +#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
17007 #define pgd_clear(pgd) native_pgd_clear(pgd)
17008 #endif
17009
17010 @@ -82,12 +83,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17011
17012 #define arch_end_context_switch(prev) do {} while(0)
17013
17014 +#define pax_open_kernel() native_pax_open_kernel()
17015 +#define pax_close_kernel() native_pax_close_kernel()
17016 #endif /* CONFIG_PARAVIRT */
17017
17018 +#define __HAVE_ARCH_PAX_OPEN_KERNEL
17019 +#define __HAVE_ARCH_PAX_CLOSE_KERNEL
17020 +
17021 +#ifdef CONFIG_PAX_KERNEXEC
17022 +static inline unsigned long native_pax_open_kernel(void)
17023 +{
17024 + unsigned long cr0;
17025 +
17026 + preempt_disable();
17027 + barrier();
17028 + cr0 = read_cr0() ^ X86_CR0_WP;
17029 + BUG_ON(cr0 & X86_CR0_WP);
17030 + write_cr0(cr0);
17031 + return cr0 ^ X86_CR0_WP;
17032 +}
17033 +
17034 +static inline unsigned long native_pax_close_kernel(void)
17035 +{
17036 + unsigned long cr0;
17037 +
17038 + cr0 = read_cr0() ^ X86_CR0_WP;
17039 + BUG_ON(!(cr0 & X86_CR0_WP));
17040 + write_cr0(cr0);
17041 + barrier();
17042 + preempt_enable_no_resched();
17043 + return cr0 ^ X86_CR0_WP;
17044 +}
17045 +#else
17046 +static inline unsigned long native_pax_open_kernel(void) { return 0; }
17047 +static inline unsigned long native_pax_close_kernel(void) { return 0; }
17048 +#endif
17049 +
17050 /*
17051 * The following only work if pte_present() is true.
17052 * Undefined behaviour if not..
17053 */
17054 +static inline int pte_user(pte_t pte)
17055 +{
17056 + return pte_val(pte) & _PAGE_USER;
17057 +}
17058 +
17059 static inline int pte_dirty(pte_t pte)
17060 {
17061 return pte_flags(pte) & _PAGE_DIRTY;
17062 @@ -148,6 +188,11 @@ static inline unsigned long pud_pfn(pud_t pud)
17063 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
17064 }
17065
17066 +static inline unsigned long pgd_pfn(pgd_t pgd)
17067 +{
17068 + return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
17069 +}
17070 +
17071 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
17072
17073 static inline int pmd_large(pmd_t pte)
17074 @@ -201,9 +246,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
17075 return pte_clear_flags(pte, _PAGE_RW);
17076 }
17077
17078 +static inline pte_t pte_mkread(pte_t pte)
17079 +{
17080 + return __pte(pte_val(pte) | _PAGE_USER);
17081 +}
17082 +
17083 static inline pte_t pte_mkexec(pte_t pte)
17084 {
17085 - return pte_clear_flags(pte, _PAGE_NX);
17086 +#ifdef CONFIG_X86_PAE
17087 + if (__supported_pte_mask & _PAGE_NX)
17088 + return pte_clear_flags(pte, _PAGE_NX);
17089 + else
17090 +#endif
17091 + return pte_set_flags(pte, _PAGE_USER);
17092 +}
17093 +
17094 +static inline pte_t pte_exprotect(pte_t pte)
17095 +{
17096 +#ifdef CONFIG_X86_PAE
17097 + if (__supported_pte_mask & _PAGE_NX)
17098 + return pte_set_flags(pte, _PAGE_NX);
17099 + else
17100 +#endif
17101 + return pte_clear_flags(pte, _PAGE_USER);
17102 }
17103
17104 static inline pte_t pte_mkdirty(pte_t pte)
17105 @@ -430,6 +495,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
17106 #endif
17107
17108 #ifndef __ASSEMBLY__
17109 +
17110 +#ifdef CONFIG_PAX_PER_CPU_PGD
17111 +extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
17112 +enum cpu_pgd_type {kernel = 0, user = 1};
17113 +static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
17114 +{
17115 + return cpu_pgd[cpu][type];
17116 +}
17117 +#endif
17118 +
17119 #include <linux/mm_types.h>
17120 #include <linux/mmdebug.h>
17121 #include <linux/log2.h>
17122 @@ -563,7 +638,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
17123 * Currently stuck as a macro due to indirect forward reference to
17124 * linux/mmzone.h's __section_mem_map_addr() definition:
17125 */
17126 -#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
17127 +#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
17128
17129 /* Find an entry in the second-level page table.. */
17130 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
17131 @@ -603,7 +678,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
17132 * Currently stuck as a macro due to indirect forward reference to
17133 * linux/mmzone.h's __section_mem_map_addr() definition:
17134 */
17135 -#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
17136 +#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
17137
17138 /* to find an entry in a page-table-directory. */
17139 static inline unsigned long pud_index(unsigned long address)
17140 @@ -618,7 +693,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
17141
17142 static inline int pgd_bad(pgd_t pgd)
17143 {
17144 - return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
17145 + return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
17146 }
17147
17148 static inline int pgd_none(pgd_t pgd)
17149 @@ -641,7 +716,12 @@ static inline int pgd_none(pgd_t pgd)
17150 * pgd_offset() returns a (pgd_t *)
17151 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
17152 */
17153 -#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
17154 +#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
17155 +
17156 +#ifdef CONFIG_PAX_PER_CPU_PGD
17157 +#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
17158 +#endif
17159 +
17160 /*
17161 * a shortcut which implies the use of the kernel's pgd, instead
17162 * of a process's
17163 @@ -652,6 +732,23 @@ static inline int pgd_none(pgd_t pgd)
17164 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
17165 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
17166
17167 +#ifdef CONFIG_X86_32
17168 +#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
17169 +#else
17170 +#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
17171 +#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
17172 +
17173 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17174 +#ifdef __ASSEMBLY__
17175 +#define pax_user_shadow_base pax_user_shadow_base(%rip)
17176 +#else
17177 +extern unsigned long pax_user_shadow_base;
17178 +extern pgdval_t clone_pgd_mask;
17179 +#endif
17180 +#endif
17181 +
17182 +#endif
17183 +
17184 #ifndef __ASSEMBLY__
17185
17186 extern int direct_gbpages;
17187 @@ -818,11 +915,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
17188 * dst and src can be on the same page, but the range must not overlap,
17189 * and must not cross a page boundary.
17190 */
17191 -static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
17192 +static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
17193 {
17194 - memcpy(dst, src, count * sizeof(pgd_t));
17195 + pax_open_kernel();
17196 + while (count--)
17197 + *dst++ = *src++;
17198 + pax_close_kernel();
17199 }
17200
17201 +#ifdef CONFIG_PAX_PER_CPU_PGD
17202 +extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
17203 +#endif
17204 +
17205 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17206 +extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
17207 +#else
17208 +static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
17209 +#endif
17210 +
17211 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
17212 static inline int page_level_shift(enum pg_level level)
17213 {
17214 diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
17215 index 9ee3221..b979c6b 100644
17216 --- a/arch/x86/include/asm/pgtable_32.h
17217 +++ b/arch/x86/include/asm/pgtable_32.h
17218 @@ -25,9 +25,6 @@
17219 struct mm_struct;
17220 struct vm_area_struct;
17221
17222 -extern pgd_t swapper_pg_dir[1024];
17223 -extern pgd_t initial_page_table[1024];
17224 -
17225 static inline void pgtable_cache_init(void) { }
17226 static inline void check_pgt_cache(void) { }
17227 void paging_init(void);
17228 @@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
17229 # include <asm/pgtable-2level.h>
17230 #endif
17231
17232 +extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
17233 +extern pgd_t initial_page_table[PTRS_PER_PGD];
17234 +#ifdef CONFIG_X86_PAE
17235 +extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
17236 +#endif
17237 +
17238 #if defined(CONFIG_HIGHPTE)
17239 #define pte_offset_map(dir, address) \
17240 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
17241 @@ -62,12 +65,17 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
17242 /* Clear a kernel PTE and flush it from the TLB */
17243 #define kpte_clear_flush(ptep, vaddr) \
17244 do { \
17245 + pax_open_kernel(); \
17246 pte_clear(&init_mm, (vaddr), (ptep)); \
17247 + pax_close_kernel(); \
17248 __flush_tlb_one((vaddr)); \
17249 } while (0)
17250
17251 #endif /* !__ASSEMBLY__ */
17252
17253 +#define HAVE_ARCH_UNMAPPED_AREA
17254 +#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
17255 +
17256 /*
17257 * kern_addr_valid() is (1) for FLATMEM and (0) for
17258 * SPARSEMEM and DISCONTIGMEM
17259 diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
17260 index ed5903b..c7fe163 100644
17261 --- a/arch/x86/include/asm/pgtable_32_types.h
17262 +++ b/arch/x86/include/asm/pgtable_32_types.h
17263 @@ -8,7 +8,7 @@
17264 */
17265 #ifdef CONFIG_X86_PAE
17266 # include <asm/pgtable-3level_types.h>
17267 -# define PMD_SIZE (1UL << PMD_SHIFT)
17268 +# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
17269 # define PMD_MASK (~(PMD_SIZE - 1))
17270 #else
17271 # include <asm/pgtable-2level_types.h>
17272 @@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
17273 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
17274 #endif
17275
17276 +#ifdef CONFIG_PAX_KERNEXEC
17277 +#ifndef __ASSEMBLY__
17278 +extern unsigned char MODULES_EXEC_VADDR[];
17279 +extern unsigned char MODULES_EXEC_END[];
17280 +#endif
17281 +#include <asm/boot.h>
17282 +#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
17283 +#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
17284 +#else
17285 +#define ktla_ktva(addr) (addr)
17286 +#define ktva_ktla(addr) (addr)
17287 +#endif
17288 +
17289 #define MODULES_VADDR VMALLOC_START
17290 #define MODULES_END VMALLOC_END
17291 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
17292 diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
17293 index e22c1db..23a625a 100644
17294 --- a/arch/x86/include/asm/pgtable_64.h
17295 +++ b/arch/x86/include/asm/pgtable_64.h
17296 @@ -16,10 +16,14 @@
17297
17298 extern pud_t level3_kernel_pgt[512];
17299 extern pud_t level3_ident_pgt[512];
17300 +extern pud_t level3_vmalloc_start_pgt[512];
17301 +extern pud_t level3_vmalloc_end_pgt[512];
17302 +extern pud_t level3_vmemmap_pgt[512];
17303 +extern pud_t level2_vmemmap_pgt[512];
17304 extern pmd_t level2_kernel_pgt[512];
17305 extern pmd_t level2_fixmap_pgt[512];
17306 -extern pmd_t level2_ident_pgt[512];
17307 -extern pgd_t init_level4_pgt[];
17308 +extern pmd_t level2_ident_pgt[512*2];
17309 +extern pgd_t init_level4_pgt[512];
17310
17311 #define swapper_pg_dir init_level4_pgt
17312
17313 @@ -61,7 +65,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17314
17315 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17316 {
17317 + pax_open_kernel();
17318 *pmdp = pmd;
17319 + pax_close_kernel();
17320 }
17321
17322 static inline void native_pmd_clear(pmd_t *pmd)
17323 @@ -97,7 +103,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
17324
17325 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17326 {
17327 + pax_open_kernel();
17328 *pudp = pud;
17329 + pax_close_kernel();
17330 }
17331
17332 static inline void native_pud_clear(pud_t *pud)
17333 @@ -107,6 +115,13 @@ static inline void native_pud_clear(pud_t *pud)
17334
17335 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
17336 {
17337 + pax_open_kernel();
17338 + *pgdp = pgd;
17339 + pax_close_kernel();
17340 +}
17341 +
17342 +static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17343 +{
17344 *pgdp = pgd;
17345 }
17346
17347 diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
17348 index 2d88344..4679fc3 100644
17349 --- a/arch/x86/include/asm/pgtable_64_types.h
17350 +++ b/arch/x86/include/asm/pgtable_64_types.h
17351 @@ -61,6 +61,11 @@ typedef struct { pteval_t pte; } pte_t;
17352 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
17353 #define MODULES_END _AC(0xffffffffff000000, UL)
17354 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
17355 +#define MODULES_EXEC_VADDR MODULES_VADDR
17356 +#define MODULES_EXEC_END MODULES_END
17357 +
17358 +#define ktla_ktva(addr) (addr)
17359 +#define ktva_ktla(addr) (addr)
17360
17361 #define EARLY_DYNAMIC_PAGE_TABLES 64
17362
17363 diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
17364 index 0ecac25..306c276 100644
17365 --- a/arch/x86/include/asm/pgtable_types.h
17366 +++ b/arch/x86/include/asm/pgtable_types.h
17367 @@ -16,13 +16,12 @@
17368 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
17369 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
17370 #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
17371 -#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
17372 +#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */
17373 #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */
17374 #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */
17375 #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */
17376 -#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1
17377 -#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1
17378 -#define _PAGE_BIT_SPLITTING _PAGE_BIT_UNUSED1 /* only valid on a PSE pmd */
17379 +#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL
17380 +#define _PAGE_BIT_SPLITTING _PAGE_BIT_SPECIAL /* only valid on a PSE pmd */
17381 #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
17382
17383 /* If _PAGE_BIT_PRESENT is clear, we use these: */
17384 @@ -40,7 +39,6 @@
17385 #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY)
17386 #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE)
17387 #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)
17388 -#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)
17389 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
17390 #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
17391 #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
17392 @@ -87,8 +85,10 @@
17393
17394 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
17395 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
17396 -#else
17397 +#elif defined(CONFIG_KMEMCHECK)
17398 #define _PAGE_NX (_AT(pteval_t, 0))
17399 +#else
17400 +#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
17401 #endif
17402
17403 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
17404 @@ -146,6 +146,9 @@
17405 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
17406 _PAGE_ACCESSED)
17407
17408 +#define PAGE_READONLY_NOEXEC PAGE_READONLY
17409 +#define PAGE_SHARED_NOEXEC PAGE_SHARED
17410 +
17411 #define __PAGE_KERNEL_EXEC \
17412 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
17413 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
17414 @@ -156,7 +159,7 @@
17415 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
17416 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
17417 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
17418 -#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
17419 +#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
17420 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
17421 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
17422 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
17423 @@ -218,8 +221,8 @@
17424 * bits are combined, this will alow user to access the high address mapped
17425 * VDSO in the presence of CONFIG_COMPAT_VDSO
17426 */
17427 -#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
17428 -#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */
17429 +#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
17430 +#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
17431 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
17432 #endif
17433
17434 @@ -257,7 +260,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
17435 {
17436 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
17437 }
17438 +#endif
17439
17440 +#if PAGETABLE_LEVELS == 3
17441 +#include <asm-generic/pgtable-nopud.h>
17442 +#endif
17443 +
17444 +#if PAGETABLE_LEVELS == 2
17445 +#include <asm-generic/pgtable-nopmd.h>
17446 +#endif
17447 +
17448 +#ifndef __ASSEMBLY__
17449 #if PAGETABLE_LEVELS > 3
17450 typedef struct { pudval_t pud; } pud_t;
17451
17452 @@ -271,8 +284,6 @@ static inline pudval_t native_pud_val(pud_t pud)
17453 return pud.pud;
17454 }
17455 #else
17456 -#include <asm-generic/pgtable-nopud.h>
17457 -
17458 static inline pudval_t native_pud_val(pud_t pud)
17459 {
17460 return native_pgd_val(pud.pgd);
17461 @@ -292,8 +303,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
17462 return pmd.pmd;
17463 }
17464 #else
17465 -#include <asm-generic/pgtable-nopmd.h>
17466 -
17467 static inline pmdval_t native_pmd_val(pmd_t pmd)
17468 {
17469 return native_pgd_val(pmd.pud.pgd);
17470 @@ -333,7 +342,6 @@ typedef struct page *pgtable_t;
17471
17472 extern pteval_t __supported_pte_mask;
17473 extern void set_nx(void);
17474 -extern int nx_enabled;
17475
17476 #define pgprot_writecombine pgprot_writecombine
17477 extern pgprot_t pgprot_writecombine(pgprot_t prot);
17478 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
17479 index 987c75e..2723054 100644
17480 --- a/arch/x86/include/asm/processor.h
17481 +++ b/arch/x86/include/asm/processor.h
17482 @@ -199,9 +199,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
17483 : "memory");
17484 }
17485
17486 +/* invpcid (%rdx),%rax */
17487 +#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
17488 +
17489 +#define INVPCID_SINGLE_ADDRESS 0UL
17490 +#define INVPCID_SINGLE_CONTEXT 1UL
17491 +#define INVPCID_ALL_GLOBAL 2UL
17492 +#define INVPCID_ALL_MONGLOBAL 3UL
17493 +
17494 +#define PCID_KERNEL 0UL
17495 +#define PCID_USER 1UL
17496 +#define PCID_NOFLUSH (1UL << 63)
17497 +
17498 static inline void load_cr3(pgd_t *pgdir)
17499 {
17500 - write_cr3(__pa(pgdir));
17501 + write_cr3(__pa(pgdir) | PCID_KERNEL);
17502 }
17503
17504 #ifdef CONFIG_X86_32
17505 @@ -283,7 +295,7 @@ struct tss_struct {
17506
17507 } ____cacheline_aligned;
17508
17509 -DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
17510 +extern struct tss_struct init_tss[NR_CPUS];
17511
17512 /*
17513 * Save the original ist values for checking stack pointers during debugging
17514 @@ -453,6 +465,7 @@ struct thread_struct {
17515 unsigned short ds;
17516 unsigned short fsindex;
17517 unsigned short gsindex;
17518 + unsigned short ss;
17519 #endif
17520 #ifdef CONFIG_X86_32
17521 unsigned long ip;
17522 @@ -553,29 +566,8 @@ static inline void load_sp0(struct tss_struct *tss,
17523 extern unsigned long mmu_cr4_features;
17524 extern u32 *trampoline_cr4_features;
17525
17526 -static inline void set_in_cr4(unsigned long mask)
17527 -{
17528 - unsigned long cr4;
17529 -
17530 - mmu_cr4_features |= mask;
17531 - if (trampoline_cr4_features)
17532 - *trampoline_cr4_features = mmu_cr4_features;
17533 - cr4 = read_cr4();
17534 - cr4 |= mask;
17535 - write_cr4(cr4);
17536 -}
17537 -
17538 -static inline void clear_in_cr4(unsigned long mask)
17539 -{
17540 - unsigned long cr4;
17541 -
17542 - mmu_cr4_features &= ~mask;
17543 - if (trampoline_cr4_features)
17544 - *trampoline_cr4_features = mmu_cr4_features;
17545 - cr4 = read_cr4();
17546 - cr4 &= ~mask;
17547 - write_cr4(cr4);
17548 -}
17549 +extern void set_in_cr4(unsigned long mask);
17550 +extern void clear_in_cr4(unsigned long mask);
17551
17552 typedef struct {
17553 unsigned long seg;
17554 @@ -824,11 +816,18 @@ static inline void spin_lock_prefetch(const void *x)
17555 */
17556 #define TASK_SIZE PAGE_OFFSET
17557 #define TASK_SIZE_MAX TASK_SIZE
17558 +
17559 +#ifdef CONFIG_PAX_SEGMEXEC
17560 +#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
17561 +#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
17562 +#else
17563 #define STACK_TOP TASK_SIZE
17564 -#define STACK_TOP_MAX STACK_TOP
17565 +#endif
17566 +
17567 +#define STACK_TOP_MAX TASK_SIZE
17568
17569 #define INIT_THREAD { \
17570 - .sp0 = sizeof(init_stack) + (long)&init_stack, \
17571 + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
17572 .vm86_info = NULL, \
17573 .sysenter_cs = __KERNEL_CS, \
17574 .io_bitmap_ptr = NULL, \
17575 @@ -842,7 +841,7 @@ static inline void spin_lock_prefetch(const void *x)
17576 */
17577 #define INIT_TSS { \
17578 .x86_tss = { \
17579 - .sp0 = sizeof(init_stack) + (long)&init_stack, \
17580 + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
17581 .ss0 = __KERNEL_DS, \
17582 .ss1 = __KERNEL_CS, \
17583 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
17584 @@ -853,11 +852,7 @@ static inline void spin_lock_prefetch(const void *x)
17585 extern unsigned long thread_saved_pc(struct task_struct *tsk);
17586
17587 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
17588 -#define KSTK_TOP(info) \
17589 -({ \
17590 - unsigned long *__ptr = (unsigned long *)(info); \
17591 - (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
17592 -})
17593 +#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
17594
17595 /*
17596 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
17597 @@ -872,7 +867,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
17598 #define task_pt_regs(task) \
17599 ({ \
17600 struct pt_regs *__regs__; \
17601 - __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
17602 + __regs__ = (struct pt_regs *)((task)->thread.sp0); \
17603 __regs__ - 1; \
17604 })
17605
17606 @@ -882,13 +877,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
17607 /*
17608 * User space process size. 47bits minus one guard page.
17609 */
17610 -#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
17611 +#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
17612
17613 /* This decides where the kernel will search for a free chunk of vm
17614 * space during mmap's.
17615 */
17616 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
17617 - 0xc0000000 : 0xFFFFe000)
17618 + 0xc0000000 : 0xFFFFf000)
17619
17620 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
17621 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
17622 @@ -899,11 +894,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
17623 #define STACK_TOP_MAX TASK_SIZE_MAX
17624
17625 #define INIT_THREAD { \
17626 - .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
17627 + .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
17628 }
17629
17630 #define INIT_TSS { \
17631 - .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
17632 + .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
17633 }
17634
17635 /*
17636 @@ -931,6 +926,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
17637 */
17638 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
17639
17640 +#ifdef CONFIG_PAX_SEGMEXEC
17641 +#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
17642 +#endif
17643 +
17644 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
17645
17646 /* Get/set a process' ability to use the timestamp counter instruction */
17647 @@ -957,7 +956,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
17648 return 0;
17649 }
17650
17651 -extern unsigned long arch_align_stack(unsigned long sp);
17652 +#define arch_align_stack(x) ((x) & ~0xfUL)
17653 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
17654
17655 void default_idle(void);
17656 @@ -967,6 +966,6 @@ bool xen_set_default_idle(void);
17657 #define xen_set_default_idle 0
17658 #endif
17659
17660 -void stop_this_cpu(void *dummy);
17661 +void stop_this_cpu(void *dummy) __noreturn;
17662 void df_debug(struct pt_regs *regs, long error_code);
17663 #endif /* _ASM_X86_PROCESSOR_H */
17664 diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
17665 index 942a086..6c26446 100644
17666 --- a/arch/x86/include/asm/ptrace.h
17667 +++ b/arch/x86/include/asm/ptrace.h
17668 @@ -85,28 +85,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
17669 }
17670
17671 /*
17672 - * user_mode_vm(regs) determines whether a register set came from user mode.
17673 + * user_mode(regs) determines whether a register set came from user mode.
17674 * This is true if V8086 mode was enabled OR if the register set was from
17675 * protected mode with RPL-3 CS value. This tricky test checks that with
17676 * one comparison. Many places in the kernel can bypass this full check
17677 - * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
17678 + * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
17679 + * be used.
17680 */
17681 -static inline int user_mode(struct pt_regs *regs)
17682 +static inline int user_mode_novm(struct pt_regs *regs)
17683 {
17684 #ifdef CONFIG_X86_32
17685 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
17686 #else
17687 - return !!(regs->cs & 3);
17688 + return !!(regs->cs & SEGMENT_RPL_MASK);
17689 #endif
17690 }
17691
17692 -static inline int user_mode_vm(struct pt_regs *regs)
17693 +static inline int user_mode(struct pt_regs *regs)
17694 {
17695 #ifdef CONFIG_X86_32
17696 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
17697 USER_RPL;
17698 #else
17699 - return user_mode(regs);
17700 + return user_mode_novm(regs);
17701 #endif
17702 }
17703
17704 @@ -122,15 +123,16 @@ static inline int v8086_mode(struct pt_regs *regs)
17705 #ifdef CONFIG_X86_64
17706 static inline bool user_64bit_mode(struct pt_regs *regs)
17707 {
17708 + unsigned long cs = regs->cs & 0xffff;
17709 #ifndef CONFIG_PARAVIRT
17710 /*
17711 * On non-paravirt systems, this is the only long mode CPL 3
17712 * selector. We do not allow long mode selectors in the LDT.
17713 */
17714 - return regs->cs == __USER_CS;
17715 + return cs == __USER_CS;
17716 #else
17717 /* Headers are too twisted for this to go in paravirt.h. */
17718 - return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
17719 + return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
17720 #endif
17721 }
17722
17723 @@ -181,9 +183,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
17724 * Traps from the kernel do not save sp and ss.
17725 * Use the helper function to retrieve sp.
17726 */
17727 - if (offset == offsetof(struct pt_regs, sp) &&
17728 - regs->cs == __KERNEL_CS)
17729 - return kernel_stack_pointer(regs);
17730 + if (offset == offsetof(struct pt_regs, sp)) {
17731 + unsigned long cs = regs->cs & 0xffff;
17732 + if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
17733 + return kernel_stack_pointer(regs);
17734 + }
17735 #endif
17736 return *(unsigned long *)((unsigned long)regs + offset);
17737 }
17738 diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
17739 index 9c6b890..5305f53 100644
17740 --- a/arch/x86/include/asm/realmode.h
17741 +++ b/arch/x86/include/asm/realmode.h
17742 @@ -22,16 +22,14 @@ struct real_mode_header {
17743 #endif
17744 /* APM/BIOS reboot */
17745 u32 machine_real_restart_asm;
17746 -#ifdef CONFIG_X86_64
17747 u32 machine_real_restart_seg;
17748 -#endif
17749 };
17750
17751 /* This must match data at trampoline_32/64.S */
17752 struct trampoline_header {
17753 #ifdef CONFIG_X86_32
17754 u32 start;
17755 - u16 gdt_pad;
17756 + u16 boot_cs;
17757 u16 gdt_limit;
17758 u32 gdt_base;
17759 #else
17760 diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
17761 index a82c4f1..ac45053 100644
17762 --- a/arch/x86/include/asm/reboot.h
17763 +++ b/arch/x86/include/asm/reboot.h
17764 @@ -6,13 +6,13 @@
17765 struct pt_regs;
17766
17767 struct machine_ops {
17768 - void (*restart)(char *cmd);
17769 - void (*halt)(void);
17770 - void (*power_off)(void);
17771 + void (* __noreturn restart)(char *cmd);
17772 + void (* __noreturn halt)(void);
17773 + void (* __noreturn power_off)(void);
17774 void (*shutdown)(void);
17775 void (*crash_shutdown)(struct pt_regs *);
17776 - void (*emergency_restart)(void);
17777 -};
17778 + void (* __noreturn emergency_restart)(void);
17779 +} __no_const;
17780
17781 extern struct machine_ops machine_ops;
17782
17783 diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
17784 index cad82c9..2e5c5c1 100644
17785 --- a/arch/x86/include/asm/rwsem.h
17786 +++ b/arch/x86/include/asm/rwsem.h
17787 @@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
17788 {
17789 asm volatile("# beginning down_read\n\t"
17790 LOCK_PREFIX _ASM_INC "(%1)\n\t"
17791 +
17792 +#ifdef CONFIG_PAX_REFCOUNT
17793 + "jno 0f\n"
17794 + LOCK_PREFIX _ASM_DEC "(%1)\n"
17795 + "int $4\n0:\n"
17796 + _ASM_EXTABLE(0b, 0b)
17797 +#endif
17798 +
17799 /* adds 0x00000001 */
17800 " jns 1f\n"
17801 " call call_rwsem_down_read_failed\n"
17802 @@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
17803 "1:\n\t"
17804 " mov %1,%2\n\t"
17805 " add %3,%2\n\t"
17806 +
17807 +#ifdef CONFIG_PAX_REFCOUNT
17808 + "jno 0f\n"
17809 + "sub %3,%2\n"
17810 + "int $4\n0:\n"
17811 + _ASM_EXTABLE(0b, 0b)
17812 +#endif
17813 +
17814 " jle 2f\n\t"
17815 LOCK_PREFIX " cmpxchg %2,%0\n\t"
17816 " jnz 1b\n\t"
17817 @@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
17818 long tmp;
17819 asm volatile("# beginning down_write\n\t"
17820 LOCK_PREFIX " xadd %1,(%2)\n\t"
17821 +
17822 +#ifdef CONFIG_PAX_REFCOUNT
17823 + "jno 0f\n"
17824 + "mov %1,(%2)\n"
17825 + "int $4\n0:\n"
17826 + _ASM_EXTABLE(0b, 0b)
17827 +#endif
17828 +
17829 /* adds 0xffff0001, returns the old value */
17830 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
17831 /* was the active mask 0 before? */
17832 @@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
17833 long tmp;
17834 asm volatile("# beginning __up_read\n\t"
17835 LOCK_PREFIX " xadd %1,(%2)\n\t"
17836 +
17837 +#ifdef CONFIG_PAX_REFCOUNT
17838 + "jno 0f\n"
17839 + "mov %1,(%2)\n"
17840 + "int $4\n0:\n"
17841 + _ASM_EXTABLE(0b, 0b)
17842 +#endif
17843 +
17844 /* subtracts 1, returns the old value */
17845 " jns 1f\n\t"
17846 " call call_rwsem_wake\n" /* expects old value in %edx */
17847 @@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
17848 long tmp;
17849 asm volatile("# beginning __up_write\n\t"
17850 LOCK_PREFIX " xadd %1,(%2)\n\t"
17851 +
17852 +#ifdef CONFIG_PAX_REFCOUNT
17853 + "jno 0f\n"
17854 + "mov %1,(%2)\n"
17855 + "int $4\n0:\n"
17856 + _ASM_EXTABLE(0b, 0b)
17857 +#endif
17858 +
17859 /* subtracts 0xffff0001, returns the old value */
17860 " jns 1f\n\t"
17861 " call call_rwsem_wake\n" /* expects old value in %edx */
17862 @@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
17863 {
17864 asm volatile("# beginning __downgrade_write\n\t"
17865 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
17866 +
17867 +#ifdef CONFIG_PAX_REFCOUNT
17868 + "jno 0f\n"
17869 + LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
17870 + "int $4\n0:\n"
17871 + _ASM_EXTABLE(0b, 0b)
17872 +#endif
17873 +
17874 /*
17875 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
17876 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
17877 @@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
17878 */
17879 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
17880 {
17881 - asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
17882 + asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
17883 +
17884 +#ifdef CONFIG_PAX_REFCOUNT
17885 + "jno 0f\n"
17886 + LOCK_PREFIX _ASM_SUB "%1,%0\n"
17887 + "int $4\n0:\n"
17888 + _ASM_EXTABLE(0b, 0b)
17889 +#endif
17890 +
17891 : "+m" (sem->count)
17892 : "er" (delta));
17893 }
17894 @@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
17895 */
17896 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
17897 {
17898 - return delta + xadd(&sem->count, delta);
17899 + return delta + xadd_check_overflow(&sem->count, delta);
17900 }
17901
17902 #endif /* __KERNEL__ */
17903 diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
17904 index c48a950..bc40804 100644
17905 --- a/arch/x86/include/asm/segment.h
17906 +++ b/arch/x86/include/asm/segment.h
17907 @@ -64,10 +64,15 @@
17908 * 26 - ESPFIX small SS
17909 * 27 - per-cpu [ offset to per-cpu data area ]
17910 * 28 - stack_canary-20 [ for stack protector ]
17911 - * 29 - unused
17912 - * 30 - unused
17913 + * 29 - PCI BIOS CS
17914 + * 30 - PCI BIOS DS
17915 * 31 - TSS for double fault handler
17916 */
17917 +#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
17918 +#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
17919 +#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
17920 +#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
17921 +
17922 #define GDT_ENTRY_TLS_MIN 6
17923 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
17924
17925 @@ -79,6 +84,8 @@
17926
17927 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
17928
17929 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
17930 +
17931 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
17932
17933 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
17934 @@ -104,6 +111,12 @@
17935 #define __KERNEL_STACK_CANARY 0
17936 #endif
17937
17938 +#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
17939 +#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
17940 +
17941 +#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
17942 +#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
17943 +
17944 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
17945
17946 /*
17947 @@ -141,7 +154,7 @@
17948 */
17949
17950 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
17951 -#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
17952 +#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
17953
17954
17955 #else
17956 @@ -165,6 +178,8 @@
17957 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
17958 #define __USER32_DS __USER_DS
17959
17960 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
17961 +
17962 #define GDT_ENTRY_TSS 8 /* needs two entries */
17963 #define GDT_ENTRY_LDT 10 /* needs two entries */
17964 #define GDT_ENTRY_TLS_MIN 12
17965 @@ -173,6 +188,8 @@
17966 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
17967 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
17968
17969 +#define GDT_ENTRY_UDEREF_KERNEL_DS 16
17970 +
17971 /* TLS indexes for 64bit - hardcoded in arch_prctl */
17972 #define FS_TLS 0
17973 #define GS_TLS 1
17974 @@ -180,12 +197,14 @@
17975 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
17976 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
17977
17978 -#define GDT_ENTRIES 16
17979 +#define GDT_ENTRIES 17
17980
17981 #endif
17982
17983 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
17984 +#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
17985 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
17986 +#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
17987 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
17988 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
17989 #ifndef CONFIG_PARAVIRT
17990 @@ -265,7 +284,7 @@ static inline unsigned long get_limit(unsigned long segment)
17991 {
17992 unsigned long __limit;
17993 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
17994 - return __limit + 1;
17995 + return __limit;
17996 }
17997
17998 #endif /* !__ASSEMBLY__ */
17999 diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
18000 index 8d3120f..352b440 100644
18001 --- a/arch/x86/include/asm/smap.h
18002 +++ b/arch/x86/include/asm/smap.h
18003 @@ -25,11 +25,40 @@
18004
18005 #include <asm/alternative-asm.h>
18006
18007 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18008 +#define ASM_PAX_OPEN_USERLAND \
18009 + 661: jmp 663f; \
18010 + .pushsection .altinstr_replacement, "a" ; \
18011 + 662: pushq %rax; nop; \
18012 + .popsection ; \
18013 + .pushsection .altinstructions, "a" ; \
18014 + altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
18015 + .popsection ; \
18016 + call __pax_open_userland; \
18017 + popq %rax; \
18018 + 663:
18019 +
18020 +#define ASM_PAX_CLOSE_USERLAND \
18021 + 661: jmp 663f; \
18022 + .pushsection .altinstr_replacement, "a" ; \
18023 + 662: pushq %rax; nop; \
18024 + .popsection; \
18025 + .pushsection .altinstructions, "a" ; \
18026 + altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
18027 + .popsection; \
18028 + call __pax_close_userland; \
18029 + popq %rax; \
18030 + 663:
18031 +#else
18032 +#define ASM_PAX_OPEN_USERLAND
18033 +#define ASM_PAX_CLOSE_USERLAND
18034 +#endif
18035 +
18036 #ifdef CONFIG_X86_SMAP
18037
18038 #define ASM_CLAC \
18039 661: ASM_NOP3 ; \
18040 - .pushsection .altinstr_replacement, "ax" ; \
18041 + .pushsection .altinstr_replacement, "a" ; \
18042 662: __ASM_CLAC ; \
18043 .popsection ; \
18044 .pushsection .altinstructions, "a" ; \
18045 @@ -38,7 +67,7 @@
18046
18047 #define ASM_STAC \
18048 661: ASM_NOP3 ; \
18049 - .pushsection .altinstr_replacement, "ax" ; \
18050 + .pushsection .altinstr_replacement, "a" ; \
18051 662: __ASM_STAC ; \
18052 .popsection ; \
18053 .pushsection .altinstructions, "a" ; \
18054 @@ -56,6 +85,37 @@
18055
18056 #include <asm/alternative.h>
18057
18058 +#define __HAVE_ARCH_PAX_OPEN_USERLAND
18059 +#define __HAVE_ARCH_PAX_CLOSE_USERLAND
18060 +
18061 +extern void __pax_open_userland(void);
18062 +static __always_inline unsigned long pax_open_userland(void)
18063 +{
18064 +
18065 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18066 + asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
18067 + :
18068 + : [open] "i" (__pax_open_userland)
18069 + : "memory", "rax");
18070 +#endif
18071 +
18072 + return 0;
18073 +}
18074 +
18075 +extern void __pax_close_userland(void);
18076 +static __always_inline unsigned long pax_close_userland(void)
18077 +{
18078 +
18079 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18080 + asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
18081 + :
18082 + : [close] "i" (__pax_close_userland)
18083 + : "memory", "rax");
18084 +#endif
18085 +
18086 + return 0;
18087 +}
18088 +
18089 #ifdef CONFIG_X86_SMAP
18090
18091 static __always_inline void clac(void)
18092 diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
18093 index 4137890..03fa172 100644
18094 --- a/arch/x86/include/asm/smp.h
18095 +++ b/arch/x86/include/asm/smp.h
18096 @@ -36,7 +36,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
18097 /* cpus sharing the last level cache: */
18098 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
18099 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
18100 -DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
18101 +DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
18102
18103 static inline struct cpumask *cpu_sibling_mask(int cpu)
18104 {
18105 @@ -79,7 +79,7 @@ struct smp_ops {
18106
18107 void (*send_call_func_ipi)(const struct cpumask *mask);
18108 void (*send_call_func_single_ipi)(int cpu);
18109 -};
18110 +} __no_const;
18111
18112 /* Globals due to paravirt */
18113 extern void set_cpu_sibling_map(int cpu);
18114 @@ -191,14 +191,8 @@ extern unsigned disabled_cpus;
18115 extern int safe_smp_processor_id(void);
18116
18117 #elif defined(CONFIG_X86_64_SMP)
18118 -#define raw_smp_processor_id() (this_cpu_read(cpu_number))
18119 -
18120 -#define stack_smp_processor_id() \
18121 -({ \
18122 - struct thread_info *ti; \
18123 - __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
18124 - ti->cpu; \
18125 -})
18126 +#define raw_smp_processor_id() (this_cpu_read(cpu_number))
18127 +#define stack_smp_processor_id() raw_smp_processor_id()
18128 #define safe_smp_processor_id() smp_processor_id()
18129
18130 #endif
18131 diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
18132 index bf156de..1a782ab 100644
18133 --- a/arch/x86/include/asm/spinlock.h
18134 +++ b/arch/x86/include/asm/spinlock.h
18135 @@ -223,6 +223,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
18136 static inline void arch_read_lock(arch_rwlock_t *rw)
18137 {
18138 asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
18139 +
18140 +#ifdef CONFIG_PAX_REFCOUNT
18141 + "jno 0f\n"
18142 + LOCK_PREFIX READ_LOCK_SIZE(inc) " (%0)\n"
18143 + "int $4\n0:\n"
18144 + _ASM_EXTABLE(0b, 0b)
18145 +#endif
18146 +
18147 "jns 1f\n"
18148 "call __read_lock_failed\n\t"
18149 "1:\n"
18150 @@ -232,6 +240,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
18151 static inline void arch_write_lock(arch_rwlock_t *rw)
18152 {
18153 asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
18154 +
18155 +#ifdef CONFIG_PAX_REFCOUNT
18156 + "jno 0f\n"
18157 + LOCK_PREFIX WRITE_LOCK_ADD(%1) "(%0)\n"
18158 + "int $4\n0:\n"
18159 + _ASM_EXTABLE(0b, 0b)
18160 +#endif
18161 +
18162 "jz 1f\n"
18163 "call __write_lock_failed\n\t"
18164 "1:\n"
18165 @@ -261,13 +277,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
18166
18167 static inline void arch_read_unlock(arch_rwlock_t *rw)
18168 {
18169 - asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0"
18170 + asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0\n"
18171 +
18172 +#ifdef CONFIG_PAX_REFCOUNT
18173 + "jno 0f\n"
18174 + LOCK_PREFIX READ_LOCK_SIZE(dec) " %0\n"
18175 + "int $4\n0:\n"
18176 + _ASM_EXTABLE(0b, 0b)
18177 +#endif
18178 +
18179 :"+m" (rw->lock) : : "memory");
18180 }
18181
18182 static inline void arch_write_unlock(arch_rwlock_t *rw)
18183 {
18184 - asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0"
18185 + asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0\n"
18186 +
18187 +#ifdef CONFIG_PAX_REFCOUNT
18188 + "jno 0f\n"
18189 + LOCK_PREFIX WRITE_LOCK_SUB(%1) "%0\n"
18190 + "int $4\n0:\n"
18191 + _ASM_EXTABLE(0b, 0b)
18192 +#endif
18193 +
18194 : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
18195 }
18196
18197 diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
18198 index 6a99859..03cb807 100644
18199 --- a/arch/x86/include/asm/stackprotector.h
18200 +++ b/arch/x86/include/asm/stackprotector.h
18201 @@ -47,7 +47,7 @@
18202 * head_32 for boot CPU and setup_per_cpu_areas() for others.
18203 */
18204 #define GDT_STACK_CANARY_INIT \
18205 - [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
18206 + [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
18207
18208 /*
18209 * Initialize the stackprotector canary value.
18210 @@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
18211
18212 static inline void load_stack_canary_segment(void)
18213 {
18214 -#ifdef CONFIG_X86_32
18215 +#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
18216 asm volatile ("mov %0, %%gs" : : "r" (0));
18217 #endif
18218 }
18219 diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
18220 index 70bbe39..4ae2bd4 100644
18221 --- a/arch/x86/include/asm/stacktrace.h
18222 +++ b/arch/x86/include/asm/stacktrace.h
18223 @@ -11,28 +11,20 @@
18224
18225 extern int kstack_depth_to_print;
18226
18227 -struct thread_info;
18228 +struct task_struct;
18229 struct stacktrace_ops;
18230
18231 -typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
18232 - unsigned long *stack,
18233 - unsigned long bp,
18234 - const struct stacktrace_ops *ops,
18235 - void *data,
18236 - unsigned long *end,
18237 - int *graph);
18238 +typedef unsigned long walk_stack_t(struct task_struct *task,
18239 + void *stack_start,
18240 + unsigned long *stack,
18241 + unsigned long bp,
18242 + const struct stacktrace_ops *ops,
18243 + void *data,
18244 + unsigned long *end,
18245 + int *graph);
18246
18247 -extern unsigned long
18248 -print_context_stack(struct thread_info *tinfo,
18249 - unsigned long *stack, unsigned long bp,
18250 - const struct stacktrace_ops *ops, void *data,
18251 - unsigned long *end, int *graph);
18252 -
18253 -extern unsigned long
18254 -print_context_stack_bp(struct thread_info *tinfo,
18255 - unsigned long *stack, unsigned long bp,
18256 - const struct stacktrace_ops *ops, void *data,
18257 - unsigned long *end, int *graph);
18258 +extern walk_stack_t print_context_stack;
18259 +extern walk_stack_t print_context_stack_bp;
18260
18261 /* Generic stack tracer with callbacks */
18262
18263 @@ -40,7 +32,7 @@ struct stacktrace_ops {
18264 void (*address)(void *data, unsigned long address, int reliable);
18265 /* On negative return stop dumping */
18266 int (*stack)(void *data, char *name);
18267 - walk_stack_t walk_stack;
18268 + walk_stack_t *walk_stack;
18269 };
18270
18271 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
18272 diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
18273 index d7f3b3b..3cc39f1 100644
18274 --- a/arch/x86/include/asm/switch_to.h
18275 +++ b/arch/x86/include/asm/switch_to.h
18276 @@ -108,7 +108,7 @@ do { \
18277 "call __switch_to\n\t" \
18278 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
18279 __switch_canary \
18280 - "movq %P[thread_info](%%rsi),%%r8\n\t" \
18281 + "movq "__percpu_arg([thread_info])",%%r8\n\t" \
18282 "movq %%rax,%%rdi\n\t" \
18283 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
18284 "jnz ret_from_fork\n\t" \
18285 @@ -119,7 +119,7 @@ do { \
18286 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
18287 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
18288 [_tif_fork] "i" (_TIF_FORK), \
18289 - [thread_info] "i" (offsetof(struct task_struct, stack)), \
18290 + [thread_info] "m" (current_tinfo), \
18291 [current_task] "m" (current_task) \
18292 __switch_canary_iparam \
18293 : "memory", "cc" __EXTRA_CLOBBER)
18294 diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
18295 index 2781119..618b59b 100644
18296 --- a/arch/x86/include/asm/thread_info.h
18297 +++ b/arch/x86/include/asm/thread_info.h
18298 @@ -10,6 +10,7 @@
18299 #include <linux/compiler.h>
18300 #include <asm/page.h>
18301 #include <asm/types.h>
18302 +#include <asm/percpu.h>
18303
18304 /*
18305 * low level task data that entry.S needs immediate access to
18306 @@ -23,7 +24,6 @@ struct exec_domain;
18307 #include <linux/atomic.h>
18308
18309 struct thread_info {
18310 - struct task_struct *task; /* main task structure */
18311 struct exec_domain *exec_domain; /* execution domain */
18312 __u32 flags; /* low level flags */
18313 __u32 status; /* thread synchronous flags */
18314 @@ -33,19 +33,13 @@ struct thread_info {
18315 mm_segment_t addr_limit;
18316 struct restart_block restart_block;
18317 void __user *sysenter_return;
18318 -#ifdef CONFIG_X86_32
18319 - unsigned long previous_esp; /* ESP of the previous stack in
18320 - case of nested (IRQ) stacks
18321 - */
18322 - __u8 supervisor_stack[0];
18323 -#endif
18324 + unsigned long lowest_stack;
18325 unsigned int sig_on_uaccess_error:1;
18326 unsigned int uaccess_err:1; /* uaccess failed */
18327 };
18328
18329 -#define INIT_THREAD_INFO(tsk) \
18330 +#define INIT_THREAD_INFO \
18331 { \
18332 - .task = &tsk, \
18333 .exec_domain = &default_exec_domain, \
18334 .flags = 0, \
18335 .cpu = 0, \
18336 @@ -56,7 +50,7 @@ struct thread_info {
18337 }, \
18338 }
18339
18340 -#define init_thread_info (init_thread_union.thread_info)
18341 +#define init_thread_info (init_thread_union.stack)
18342 #define init_stack (init_thread_union.stack)
18343
18344 #else /* !__ASSEMBLY__ */
18345 @@ -96,6 +90,7 @@ struct thread_info {
18346 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
18347 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
18348 #define TIF_X32 30 /* 32-bit native x86-64 binary */
18349 +#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
18350
18351 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
18352 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
18353 @@ -119,17 +114,18 @@ struct thread_info {
18354 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
18355 #define _TIF_ADDR32 (1 << TIF_ADDR32)
18356 #define _TIF_X32 (1 << TIF_X32)
18357 +#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
18358
18359 /* work to do in syscall_trace_enter() */
18360 #define _TIF_WORK_SYSCALL_ENTRY \
18361 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
18362 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
18363 - _TIF_NOHZ)
18364 + _TIF_NOHZ | _TIF_GRSEC_SETXID)
18365
18366 /* work to do in syscall_trace_leave() */
18367 #define _TIF_WORK_SYSCALL_EXIT \
18368 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
18369 - _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
18370 + _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
18371
18372 /* work to do on interrupt/exception return */
18373 #define _TIF_WORK_MASK \
18374 @@ -140,7 +136,7 @@ struct thread_info {
18375 /* work to do on any return to user space */
18376 #define _TIF_ALLWORK_MASK \
18377 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
18378 - _TIF_NOHZ)
18379 + _TIF_NOHZ | _TIF_GRSEC_SETXID)
18380
18381 /* Only used for 64 bit */
18382 #define _TIF_DO_NOTIFY_MASK \
18383 @@ -156,45 +152,40 @@ struct thread_info {
18384
18385 #define PREEMPT_ACTIVE 0x10000000
18386
18387 -#ifdef CONFIG_X86_32
18388 -
18389 -#define STACK_WARN (THREAD_SIZE/8)
18390 -/*
18391 - * macros/functions for gaining access to the thread information structure
18392 - *
18393 - * preempt_count needs to be 1 initially, until the scheduler is functional.
18394 - */
18395 -#ifndef __ASSEMBLY__
18396 -
18397 -
18398 -/* how to get the current stack pointer from C */
18399 -register unsigned long current_stack_pointer asm("esp") __used;
18400 -
18401 -/* how to get the thread information struct from C */
18402 -static inline struct thread_info *current_thread_info(void)
18403 -{
18404 - return (struct thread_info *)
18405 - (current_stack_pointer & ~(THREAD_SIZE - 1));
18406 -}
18407 -
18408 -#else /* !__ASSEMBLY__ */
18409 -
18410 +#ifdef __ASSEMBLY__
18411 /* how to get the thread information struct from ASM */
18412 #define GET_THREAD_INFO(reg) \
18413 - movl $-THREAD_SIZE, reg; \
18414 - andl %esp, reg
18415 + mov PER_CPU_VAR(current_tinfo), reg
18416
18417 /* use this one if reg already contains %esp */
18418 -#define GET_THREAD_INFO_WITH_ESP(reg) \
18419 - andl $-THREAD_SIZE, reg
18420 +#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg)
18421 +#else
18422 +/* how to get the thread information struct from C */
18423 +DECLARE_PER_CPU(struct thread_info *, current_tinfo);
18424 +
18425 +static __always_inline struct thread_info *current_thread_info(void)
18426 +{
18427 + return this_cpu_read_stable(current_tinfo);
18428 +}
18429 +#endif
18430 +
18431 +#ifdef CONFIG_X86_32
18432 +
18433 +#define STACK_WARN (THREAD_SIZE/8)
18434 +/*
18435 + * macros/functions for gaining access to the thread information structure
18436 + *
18437 + * preempt_count needs to be 1 initially, until the scheduler is functional.
18438 + */
18439 +#ifndef __ASSEMBLY__
18440 +
18441 +/* how to get the current stack pointer from C */
18442 +register unsigned long current_stack_pointer asm("esp") __used;
18443
18444 #endif
18445
18446 #else /* X86_32 */
18447
18448 -#include <asm/percpu.h>
18449 -#define KERNEL_STACK_OFFSET (5*8)
18450 -
18451 /*
18452 * macros/functions for gaining access to the thread information structure
18453 * preempt_count needs to be 1 initially, until the scheduler is functional.
18454 @@ -202,27 +193,8 @@ static inline struct thread_info *current_thread_info(void)
18455 #ifndef __ASSEMBLY__
18456 DECLARE_PER_CPU(unsigned long, kernel_stack);
18457
18458 -static inline struct thread_info *current_thread_info(void)
18459 -{
18460 - struct thread_info *ti;
18461 - ti = (void *)(this_cpu_read_stable(kernel_stack) +
18462 - KERNEL_STACK_OFFSET - THREAD_SIZE);
18463 - return ti;
18464 -}
18465 -
18466 -#else /* !__ASSEMBLY__ */
18467 -
18468 -/* how to get the thread information struct from ASM */
18469 -#define GET_THREAD_INFO(reg) \
18470 - movq PER_CPU_VAR(kernel_stack),reg ; \
18471 - subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg
18472 -
18473 -/*
18474 - * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
18475 - * a certain register (to be used in assembler memory operands).
18476 - */
18477 -#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
18478 -
18479 +/* how to get the current stack pointer from C */
18480 +register unsigned long current_stack_pointer asm("rsp") __used;
18481 #endif
18482
18483 #endif /* !X86_32 */
18484 @@ -281,5 +253,12 @@ static inline bool is_ia32_task(void)
18485 extern void arch_task_cache_init(void);
18486 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
18487 extern void arch_release_task_struct(struct task_struct *tsk);
18488 +
18489 +#define __HAVE_THREAD_FUNCTIONS
18490 +#define task_thread_info(task) (&(task)->tinfo)
18491 +#define task_stack_page(task) ((task)->stack)
18492 +#define setup_thread_stack(p, org) do {} while (0)
18493 +#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
18494 +
18495 #endif
18496 #endif /* _ASM_X86_THREAD_INFO_H */
18497 diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
18498 index e6d90ba..0897f44 100644
18499 --- a/arch/x86/include/asm/tlbflush.h
18500 +++ b/arch/x86/include/asm/tlbflush.h
18501 @@ -17,18 +17,44 @@
18502
18503 static inline void __native_flush_tlb(void)
18504 {
18505 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
18506 + u64 descriptor[2];
18507 +
18508 + descriptor[0] = PCID_KERNEL;
18509 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_MONGLOBAL) : "memory");
18510 + return;
18511 + }
18512 +
18513 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18514 + if (static_cpu_has(X86_FEATURE_PCID)) {
18515 + unsigned int cpu = raw_get_cpu();
18516 +
18517 + native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
18518 + native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
18519 + raw_put_cpu_no_resched();
18520 + return;
18521 + }
18522 +#endif
18523 +
18524 native_write_cr3(native_read_cr3());
18525 }
18526
18527 static inline void __native_flush_tlb_global_irq_disabled(void)
18528 {
18529 - unsigned long cr4;
18530 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
18531 + u64 descriptor[2];
18532
18533 - cr4 = native_read_cr4();
18534 - /* clear PGE */
18535 - native_write_cr4(cr4 & ~X86_CR4_PGE);
18536 - /* write old PGE again and flush TLBs */
18537 - native_write_cr4(cr4);
18538 + descriptor[0] = PCID_KERNEL;
18539 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
18540 + } else {
18541 + unsigned long cr4;
18542 +
18543 + cr4 = native_read_cr4();
18544 + /* clear PGE */
18545 + native_write_cr4(cr4 & ~X86_CR4_PGE);
18546 + /* write old PGE again and flush TLBs */
18547 + native_write_cr4(cr4);
18548 + }
18549 }
18550
18551 static inline void __native_flush_tlb_global(void)
18552 @@ -49,6 +75,42 @@ static inline void __native_flush_tlb_global(void)
18553
18554 static inline void __native_flush_tlb_single(unsigned long addr)
18555 {
18556 +
18557 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
18558 + u64 descriptor[2];
18559 +
18560 + descriptor[0] = PCID_KERNEL;
18561 + descriptor[1] = addr;
18562 +
18563 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18564 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
18565 + if (addr < TASK_SIZE_MAX)
18566 + descriptor[1] += pax_user_shadow_base;
18567 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
18568 + }
18569 +
18570 + descriptor[0] = PCID_USER;
18571 + descriptor[1] = addr;
18572 +#endif
18573 +
18574 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
18575 + return;
18576 + }
18577 +
18578 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18579 + if (static_cpu_has(X86_FEATURE_PCID)) {
18580 + unsigned int cpu = raw_get_cpu();
18581 +
18582 + native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
18583 + asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
18584 + native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
18585 + raw_put_cpu_no_resched();
18586 +
18587 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
18588 + addr += pax_user_shadow_base;
18589 + }
18590 +#endif
18591 +
18592 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
18593 }
18594
18595 diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
18596 index 5838fa9..f7ae572 100644
18597 --- a/arch/x86/include/asm/uaccess.h
18598 +++ b/arch/x86/include/asm/uaccess.h
18599 @@ -7,6 +7,7 @@
18600 #include <linux/compiler.h>
18601 #include <linux/thread_info.h>
18602 #include <linux/string.h>
18603 +#include <linux/sched.h>
18604 #include <asm/asm.h>
18605 #include <asm/page.h>
18606 #include <asm/smap.h>
18607 @@ -29,7 +30,12 @@
18608
18609 #define get_ds() (KERNEL_DS)
18610 #define get_fs() (current_thread_info()->addr_limit)
18611 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
18612 +void __set_fs(mm_segment_t x);
18613 +void set_fs(mm_segment_t x);
18614 +#else
18615 #define set_fs(x) (current_thread_info()->addr_limit = (x))
18616 +#endif
18617
18618 #define segment_eq(a, b) ((a).seg == (b).seg)
18619
18620 @@ -77,8 +83,33 @@
18621 * checks that the pointer is in the user space range - after calling
18622 * this function, memory access functions may still return -EFAULT.
18623 */
18624 -#define access_ok(type, addr, size) \
18625 - (likely(__range_not_ok(addr, size, user_addr_max()) == 0))
18626 +#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size, user_addr_max()) == 0))
18627 +#define access_ok(type, addr, size) \
18628 +({ \
18629 + long __size = size; \
18630 + unsigned long __addr = (unsigned long)addr; \
18631 + unsigned long __addr_ao = __addr & PAGE_MASK; \
18632 + unsigned long __end_ao = __addr + __size - 1; \
18633 + bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
18634 + if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
18635 + while(__addr_ao <= __end_ao) { \
18636 + char __c_ao; \
18637 + __addr_ao += PAGE_SIZE; \
18638 + if (__size > PAGE_SIZE) \
18639 + cond_resched(); \
18640 + if (__get_user(__c_ao, (char __user *)__addr)) \
18641 + break; \
18642 + if (type != VERIFY_WRITE) { \
18643 + __addr = __addr_ao; \
18644 + continue; \
18645 + } \
18646 + if (__put_user(__c_ao, (char __user *)__addr)) \
18647 + break; \
18648 + __addr = __addr_ao; \
18649 + } \
18650 + } \
18651 + __ret_ao; \
18652 +})
18653
18654 /*
18655 * The exception table consists of pairs of addresses relative to the
18656 @@ -168,10 +199,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
18657 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
18658 __chk_user_ptr(ptr); \
18659 might_fault(); \
18660 + pax_open_userland(); \
18661 asm volatile("call __get_user_%P3" \
18662 : "=a" (__ret_gu), "=r" (__val_gu) \
18663 : "0" (ptr), "i" (sizeof(*(ptr)))); \
18664 (x) = (__typeof__(*(ptr))) __val_gu; \
18665 + pax_close_userland(); \
18666 __ret_gu; \
18667 })
18668
18669 @@ -179,13 +212,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
18670 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
18671 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
18672
18673 -
18674 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
18675 +#define __copyuser_seg "gs;"
18676 +#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
18677 +#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
18678 +#else
18679 +#define __copyuser_seg
18680 +#define __COPYUSER_SET_ES
18681 +#define __COPYUSER_RESTORE_ES
18682 +#endif
18683
18684 #ifdef CONFIG_X86_32
18685 #define __put_user_asm_u64(x, addr, err, errret) \
18686 asm volatile(ASM_STAC "\n" \
18687 - "1: movl %%eax,0(%2)\n" \
18688 - "2: movl %%edx,4(%2)\n" \
18689 + "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
18690 + "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
18691 "3: " ASM_CLAC "\n" \
18692 ".section .fixup,\"ax\"\n" \
18693 "4: movl %3,%0\n" \
18694 @@ -198,8 +239,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
18695
18696 #define __put_user_asm_ex_u64(x, addr) \
18697 asm volatile(ASM_STAC "\n" \
18698 - "1: movl %%eax,0(%1)\n" \
18699 - "2: movl %%edx,4(%1)\n" \
18700 + "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
18701 + "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
18702 "3: " ASM_CLAC "\n" \
18703 _ASM_EXTABLE_EX(1b, 2b) \
18704 _ASM_EXTABLE_EX(2b, 3b) \
18705 @@ -249,7 +290,8 @@ extern void __put_user_8(void);
18706 __typeof__(*(ptr)) __pu_val; \
18707 __chk_user_ptr(ptr); \
18708 might_fault(); \
18709 - __pu_val = x; \
18710 + __pu_val = (x); \
18711 + pax_open_userland(); \
18712 switch (sizeof(*(ptr))) { \
18713 case 1: \
18714 __put_user_x(1, __pu_val, ptr, __ret_pu); \
18715 @@ -267,6 +309,7 @@ extern void __put_user_8(void);
18716 __put_user_x(X, __pu_val, ptr, __ret_pu); \
18717 break; \
18718 } \
18719 + pax_close_userland(); \
18720 __ret_pu; \
18721 })
18722
18723 @@ -347,8 +390,10 @@ do { \
18724 } while (0)
18725
18726 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
18727 +do { \
18728 + pax_open_userland(); \
18729 asm volatile(ASM_STAC "\n" \
18730 - "1: mov"itype" %2,%"rtype"1\n" \
18731 + "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
18732 "2: " ASM_CLAC "\n" \
18733 ".section .fixup,\"ax\"\n" \
18734 "3: mov %3,%0\n" \
18735 @@ -356,8 +401,10 @@ do { \
18736 " jmp 2b\n" \
18737 ".previous\n" \
18738 _ASM_EXTABLE(1b, 3b) \
18739 - : "=r" (err), ltype(x) \
18740 - : "m" (__m(addr)), "i" (errret), "0" (err))
18741 + : "=r" (err), ltype (x) \
18742 + : "m" (__m(addr)), "i" (errret), "0" (err)); \
18743 + pax_close_userland(); \
18744 +} while (0)
18745
18746 #define __get_user_size_ex(x, ptr, size) \
18747 do { \
18748 @@ -381,7 +428,7 @@ do { \
18749 } while (0)
18750
18751 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
18752 - asm volatile("1: mov"itype" %1,%"rtype"0\n" \
18753 + asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
18754 "2:\n" \
18755 _ASM_EXTABLE_EX(1b, 2b) \
18756 : ltype(x) : "m" (__m(addr)))
18757 @@ -398,13 +445,24 @@ do { \
18758 int __gu_err; \
18759 unsigned long __gu_val; \
18760 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
18761 - (x) = (__force __typeof__(*(ptr)))__gu_val; \
18762 + (x) = (__typeof__(*(ptr)))__gu_val; \
18763 __gu_err; \
18764 })
18765
18766 /* FIXME: this hack is definitely wrong -AK */
18767 struct __large_struct { unsigned long buf[100]; };
18768 -#define __m(x) (*(struct __large_struct __user *)(x))
18769 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18770 +#define ____m(x) \
18771 +({ \
18772 + unsigned long ____x = (unsigned long)(x); \
18773 + if (____x < pax_user_shadow_base) \
18774 + ____x += pax_user_shadow_base; \
18775 + (typeof(x))____x; \
18776 +})
18777 +#else
18778 +#define ____m(x) (x)
18779 +#endif
18780 +#define __m(x) (*(struct __large_struct __user *)____m(x))
18781
18782 /*
18783 * Tell gcc we read from memory instead of writing: this is because
18784 @@ -412,8 +470,10 @@ struct __large_struct { unsigned long buf[100]; };
18785 * aliasing issues.
18786 */
18787 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
18788 +do { \
18789 + pax_open_userland(); \
18790 asm volatile(ASM_STAC "\n" \
18791 - "1: mov"itype" %"rtype"1,%2\n" \
18792 + "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
18793 "2: " ASM_CLAC "\n" \
18794 ".section .fixup,\"ax\"\n" \
18795 "3: mov %3,%0\n" \
18796 @@ -421,10 +481,12 @@ struct __large_struct { unsigned long buf[100]; };
18797 ".previous\n" \
18798 _ASM_EXTABLE(1b, 3b) \
18799 : "=r"(err) \
18800 - : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
18801 + : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
18802 + pax_close_userland(); \
18803 +} while (0)
18804
18805 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
18806 - asm volatile("1: mov"itype" %"rtype"0,%1\n" \
18807 + asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
18808 "2:\n" \
18809 _ASM_EXTABLE_EX(1b, 2b) \
18810 : : ltype(x), "m" (__m(addr)))
18811 @@ -434,11 +496,13 @@ struct __large_struct { unsigned long buf[100]; };
18812 */
18813 #define uaccess_try do { \
18814 current_thread_info()->uaccess_err = 0; \
18815 + pax_open_userland(); \
18816 stac(); \
18817 barrier();
18818
18819 #define uaccess_catch(err) \
18820 clac(); \
18821 + pax_close_userland(); \
18822 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
18823 } while (0)
18824
18825 @@ -463,8 +527,12 @@ struct __large_struct { unsigned long buf[100]; };
18826 * On error, the variable @x is set to zero.
18827 */
18828
18829 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18830 +#define __get_user(x, ptr) get_user((x), (ptr))
18831 +#else
18832 #define __get_user(x, ptr) \
18833 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
18834 +#endif
18835
18836 /**
18837 * __put_user: - Write a simple value into user space, with less checking.
18838 @@ -486,8 +554,12 @@ struct __large_struct { unsigned long buf[100]; };
18839 * Returns zero on success, or -EFAULT on error.
18840 */
18841
18842 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18843 +#define __put_user(x, ptr) put_user((x), (ptr))
18844 +#else
18845 #define __put_user(x, ptr) \
18846 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
18847 +#endif
18848
18849 #define __get_user_unaligned __get_user
18850 #define __put_user_unaligned __put_user
18851 @@ -505,7 +577,7 @@ struct __large_struct { unsigned long buf[100]; };
18852 #define get_user_ex(x, ptr) do { \
18853 unsigned long __gue_val; \
18854 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
18855 - (x) = (__force __typeof__(*(ptr)))__gue_val; \
18856 + (x) = (__typeof__(*(ptr)))__gue_val; \
18857 } while (0)
18858
18859 #define put_user_try uaccess_try
18860 diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
18861 index 7f760a9..b596b9a 100644
18862 --- a/arch/x86/include/asm/uaccess_32.h
18863 +++ b/arch/x86/include/asm/uaccess_32.h
18864 @@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
18865 static __always_inline unsigned long __must_check
18866 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
18867 {
18868 + if ((long)n < 0)
18869 + return n;
18870 +
18871 + check_object_size(from, n, true);
18872 +
18873 if (__builtin_constant_p(n)) {
18874 unsigned long ret;
18875
18876 @@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
18877 __copy_to_user(void __user *to, const void *from, unsigned long n)
18878 {
18879 might_fault();
18880 +
18881 return __copy_to_user_inatomic(to, from, n);
18882 }
18883
18884 static __always_inline unsigned long
18885 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
18886 {
18887 + if ((long)n < 0)
18888 + return n;
18889 +
18890 /* Avoid zeroing the tail if the copy fails..
18891 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
18892 * but as the zeroing behaviour is only significant when n is not
18893 @@ -137,6 +146,12 @@ static __always_inline unsigned long
18894 __copy_from_user(void *to, const void __user *from, unsigned long n)
18895 {
18896 might_fault();
18897 +
18898 + if ((long)n < 0)
18899 + return n;
18900 +
18901 + check_object_size(to, n, false);
18902 +
18903 if (__builtin_constant_p(n)) {
18904 unsigned long ret;
18905
18906 @@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
18907 const void __user *from, unsigned long n)
18908 {
18909 might_fault();
18910 +
18911 + if ((long)n < 0)
18912 + return n;
18913 +
18914 if (__builtin_constant_p(n)) {
18915 unsigned long ret;
18916
18917 @@ -181,15 +200,19 @@ static __always_inline unsigned long
18918 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
18919 unsigned long n)
18920 {
18921 - return __copy_from_user_ll_nocache_nozero(to, from, n);
18922 + if ((long)n < 0)
18923 + return n;
18924 +
18925 + return __copy_from_user_ll_nocache_nozero(to, from, n);
18926 }
18927
18928 -unsigned long __must_check copy_to_user(void __user *to,
18929 - const void *from, unsigned long n);
18930 -unsigned long __must_check _copy_from_user(void *to,
18931 - const void __user *from,
18932 - unsigned long n);
18933 -
18934 +extern void copy_to_user_overflow(void)
18935 +#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
18936 + __compiletime_error("copy_to_user() buffer size is not provably correct")
18937 +#else
18938 + __compiletime_warning("copy_to_user() buffer size is not provably correct")
18939 +#endif
18940 +;
18941
18942 extern void copy_from_user_overflow(void)
18943 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
18944 @@ -199,17 +222,60 @@ extern void copy_from_user_overflow(void)
18945 #endif
18946 ;
18947
18948 -static inline unsigned long __must_check copy_from_user(void *to,
18949 - const void __user *from,
18950 - unsigned long n)
18951 +/**
18952 + * copy_to_user: - Copy a block of data into user space.
18953 + * @to: Destination address, in user space.
18954 + * @from: Source address, in kernel space.
18955 + * @n: Number of bytes to copy.
18956 + *
18957 + * Context: User context only. This function may sleep.
18958 + *
18959 + * Copy data from kernel space to user space.
18960 + *
18961 + * Returns number of bytes that could not be copied.
18962 + * On success, this will be zero.
18963 + */
18964 +static inline unsigned long __must_check
18965 +copy_to_user(void __user *to, const void *from, unsigned long n)
18966 {
18967 - int sz = __compiletime_object_size(to);
18968 + size_t sz = __compiletime_object_size(from);
18969
18970 - if (likely(sz == -1 || sz >= n))
18971 - n = _copy_from_user(to, from, n);
18972 - else
18973 + if (unlikely(sz != (size_t)-1 && sz < n))
18974 + copy_to_user_overflow();
18975 + else if (access_ok(VERIFY_WRITE, to, n))
18976 + n = __copy_to_user(to, from, n);
18977 + return n;
18978 +}
18979 +
18980 +/**
18981 + * copy_from_user: - Copy a block of data from user space.
18982 + * @to: Destination address, in kernel space.
18983 + * @from: Source address, in user space.
18984 + * @n: Number of bytes to copy.
18985 + *
18986 + * Context: User context only. This function may sleep.
18987 + *
18988 + * Copy data from user space to kernel space.
18989 + *
18990 + * Returns number of bytes that could not be copied.
18991 + * On success, this will be zero.
18992 + *
18993 + * If some data could not be copied, this function will pad the copied
18994 + * data to the requested size using zero bytes.
18995 + */
18996 +static inline unsigned long __must_check
18997 +copy_from_user(void *to, const void __user *from, unsigned long n)
18998 +{
18999 + size_t sz = __compiletime_object_size(to);
19000 +
19001 + check_object_size(to, n, false);
19002 +
19003 + if (unlikely(sz != (size_t)-1 && sz < n))
19004 copy_from_user_overflow();
19005 -
19006 + else if (access_ok(VERIFY_READ, from, n))
19007 + n = __copy_from_user(to, from, n);
19008 + else if ((long)n > 0)
19009 + memset(to, 0, n);
19010 return n;
19011 }
19012
19013 diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
19014 index 4f7923d..201b58d 100644
19015 --- a/arch/x86/include/asm/uaccess_64.h
19016 +++ b/arch/x86/include/asm/uaccess_64.h
19017 @@ -10,6 +10,9 @@
19018 #include <asm/alternative.h>
19019 #include <asm/cpufeature.h>
19020 #include <asm/page.h>
19021 +#include <asm/pgtable.h>
19022 +
19023 +#define set_fs(x) (current_thread_info()->addr_limit = (x))
19024
19025 /*
19026 * Copy To/From Userspace
19027 @@ -17,14 +20,14 @@
19028
19029 /* Handles exceptions in both to and from, but doesn't do access_ok */
19030 __must_check unsigned long
19031 -copy_user_enhanced_fast_string(void *to, const void *from, unsigned len);
19032 +copy_user_enhanced_fast_string(void *to, const void *from, unsigned len) __size_overflow(3);
19033 __must_check unsigned long
19034 -copy_user_generic_string(void *to, const void *from, unsigned len);
19035 +copy_user_generic_string(void *to, const void *from, unsigned len) __size_overflow(3);
19036 __must_check unsigned long
19037 -copy_user_generic_unrolled(void *to, const void *from, unsigned len);
19038 +copy_user_generic_unrolled(void *to, const void *from, unsigned len) __size_overflow(3);
19039
19040 -static __always_inline __must_check unsigned long
19041 -copy_user_generic(void *to, const void *from, unsigned len)
19042 +static __always_inline __must_check unsigned long
19043 +copy_user_generic(void *to, const void *from, unsigned long len)
19044 {
19045 unsigned ret;
19046
19047 @@ -45,138 +48,200 @@ copy_user_generic(void *to, const void *from, unsigned len)
19048 return ret;
19049 }
19050
19051 +static __always_inline __must_check unsigned long
19052 +__copy_to_user(void __user *to, const void *from, unsigned long len);
19053 +static __always_inline __must_check unsigned long
19054 +__copy_from_user(void *to, const void __user *from, unsigned long len);
19055 __must_check unsigned long
19056 -_copy_to_user(void __user *to, const void *from, unsigned len);
19057 -__must_check unsigned long
19058 -_copy_from_user(void *to, const void __user *from, unsigned len);
19059 -__must_check unsigned long
19060 -copy_in_user(void __user *to, const void __user *from, unsigned len);
19061 +copy_in_user(void __user *to, const void __user *from, unsigned long len);
19062 +
19063 +extern void copy_to_user_overflow(void)
19064 +#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19065 + __compiletime_error("copy_to_user() buffer size is not provably correct")
19066 +#else
19067 + __compiletime_warning("copy_to_user() buffer size is not provably correct")
19068 +#endif
19069 +;
19070 +
19071 +extern void copy_from_user_overflow(void)
19072 +#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19073 + __compiletime_error("copy_from_user() buffer size is not provably correct")
19074 +#else
19075 + __compiletime_warning("copy_from_user() buffer size is not provably correct")
19076 +#endif
19077 +;
19078
19079 static inline unsigned long __must_check copy_from_user(void *to,
19080 const void __user *from,
19081 unsigned long n)
19082 {
19083 - int sz = __compiletime_object_size(to);
19084 -
19085 might_fault();
19086 - if (likely(sz == -1 || sz >= n))
19087 - n = _copy_from_user(to, from, n);
19088 -#ifdef CONFIG_DEBUG_VM
19089 - else
19090 - WARN(1, "Buffer overflow detected!\n");
19091 -#endif
19092 +
19093 + check_object_size(to, n, false);
19094 +
19095 + if (access_ok(VERIFY_READ, from, n))
19096 + n = __copy_from_user(to, from, n);
19097 + else if (n < INT_MAX)
19098 + memset(to, 0, n);
19099 return n;
19100 }
19101
19102 static __always_inline __must_check
19103 -int copy_to_user(void __user *dst, const void *src, unsigned size)
19104 +int copy_to_user(void __user *dst, const void *src, unsigned long size)
19105 {
19106 might_fault();
19107
19108 - return _copy_to_user(dst, src, size);
19109 + if (access_ok(VERIFY_WRITE, dst, size))
19110 + size = __copy_to_user(dst, src, size);
19111 + return size;
19112 }
19113
19114 static __always_inline __must_check
19115 -int __copy_from_user(void *dst, const void __user *src, unsigned size)
19116 +unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
19117 {
19118 - int ret = 0;
19119 + size_t sz = __compiletime_object_size(dst);
19120 + unsigned ret = 0;
19121
19122 might_fault();
19123 +
19124 + if (size > INT_MAX)
19125 + return size;
19126 +
19127 + check_object_size(dst, size, false);
19128 +
19129 +#ifdef CONFIG_PAX_MEMORY_UDEREF
19130 + if (!__access_ok(VERIFY_READ, src, size))
19131 + return size;
19132 +#endif
19133 +
19134 + if (unlikely(sz != (size_t)-1 && sz < size)) {
19135 + copy_from_user_overflow();
19136 + return size;
19137 + }
19138 +
19139 if (!__builtin_constant_p(size))
19140 - return copy_user_generic(dst, (__force void *)src, size);
19141 + return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
19142 switch (size) {
19143 - case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
19144 + case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
19145 ret, "b", "b", "=q", 1);
19146 return ret;
19147 - case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
19148 + case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
19149 ret, "w", "w", "=r", 2);
19150 return ret;
19151 - case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
19152 + case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
19153 ret, "l", "k", "=r", 4);
19154 return ret;
19155 - case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
19156 + case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
19157 ret, "q", "", "=r", 8);
19158 return ret;
19159 case 10:
19160 - __get_user_asm(*(u64 *)dst, (u64 __user *)src,
19161 + __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
19162 ret, "q", "", "=r", 10);
19163 if (unlikely(ret))
19164 return ret;
19165 __get_user_asm(*(u16 *)(8 + (char *)dst),
19166 - (u16 __user *)(8 + (char __user *)src),
19167 + (const u16 __user *)(8 + (const char __user *)src),
19168 ret, "w", "w", "=r", 2);
19169 return ret;
19170 case 16:
19171 - __get_user_asm(*(u64 *)dst, (u64 __user *)src,
19172 + __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
19173 ret, "q", "", "=r", 16);
19174 if (unlikely(ret))
19175 return ret;
19176 __get_user_asm(*(u64 *)(8 + (char *)dst),
19177 - (u64 __user *)(8 + (char __user *)src),
19178 + (const u64 __user *)(8 + (const char __user *)src),
19179 ret, "q", "", "=r", 8);
19180 return ret;
19181 default:
19182 - return copy_user_generic(dst, (__force void *)src, size);
19183 + return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
19184 }
19185 }
19186
19187 static __always_inline __must_check
19188 -int __copy_to_user(void __user *dst, const void *src, unsigned size)
19189 +unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
19190 {
19191 - int ret = 0;
19192 + size_t sz = __compiletime_object_size(src);
19193 + unsigned ret = 0;
19194
19195 might_fault();
19196 +
19197 + if (size > INT_MAX)
19198 + return size;
19199 +
19200 + check_object_size(src, size, true);
19201 +
19202 +#ifdef CONFIG_PAX_MEMORY_UDEREF
19203 + if (!__access_ok(VERIFY_WRITE, dst, size))
19204 + return size;
19205 +#endif
19206 +
19207 + if (unlikely(sz != (size_t)-1 && sz < size)) {
19208 + copy_to_user_overflow();
19209 + return size;
19210 + }
19211 +
19212 if (!__builtin_constant_p(size))
19213 - return copy_user_generic((__force void *)dst, src, size);
19214 + return copy_user_generic((__force_kernel void *)____m(dst), src, size);
19215 switch (size) {
19216 - case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
19217 + case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
19218 ret, "b", "b", "iq", 1);
19219 return ret;
19220 - case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
19221 + case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
19222 ret, "w", "w", "ir", 2);
19223 return ret;
19224 - case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
19225 + case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
19226 ret, "l", "k", "ir", 4);
19227 return ret;
19228 - case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
19229 + case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
19230 ret, "q", "", "er", 8);
19231 return ret;
19232 case 10:
19233 - __put_user_asm(*(u64 *)src, (u64 __user *)dst,
19234 + __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
19235 ret, "q", "", "er", 10);
19236 if (unlikely(ret))
19237 return ret;
19238 asm("":::"memory");
19239 - __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
19240 + __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
19241 ret, "w", "w", "ir", 2);
19242 return ret;
19243 case 16:
19244 - __put_user_asm(*(u64 *)src, (u64 __user *)dst,
19245 + __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
19246 ret, "q", "", "er", 16);
19247 if (unlikely(ret))
19248 return ret;
19249 asm("":::"memory");
19250 - __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
19251 + __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
19252 ret, "q", "", "er", 8);
19253 return ret;
19254 default:
19255 - return copy_user_generic((__force void *)dst, src, size);
19256 + return copy_user_generic((__force_kernel void *)____m(dst), src, size);
19257 }
19258 }
19259
19260 static __always_inline __must_check
19261 -int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
19262 +unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned long size)
19263 {
19264 - int ret = 0;
19265 + unsigned ret = 0;
19266
19267 might_fault();
19268 +
19269 + if (size > INT_MAX)
19270 + return size;
19271 +
19272 +#ifdef CONFIG_PAX_MEMORY_UDEREF
19273 + if (!__access_ok(VERIFY_READ, src, size))
19274 + return size;
19275 + if (!__access_ok(VERIFY_WRITE, dst, size))
19276 + return size;
19277 +#endif
19278 +
19279 if (!__builtin_constant_p(size))
19280 - return copy_user_generic((__force void *)dst,
19281 - (__force void *)src, size);
19282 + return copy_user_generic((__force_kernel void *)____m(dst),
19283 + (__force_kernel const void *)____m(src), size);
19284 switch (size) {
19285 case 1: {
19286 u8 tmp;
19287 - __get_user_asm(tmp, (u8 __user *)src,
19288 + __get_user_asm(tmp, (const u8 __user *)src,
19289 ret, "b", "b", "=q", 1);
19290 if (likely(!ret))
19291 __put_user_asm(tmp, (u8 __user *)dst,
19292 @@ -185,7 +250,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
19293 }
19294 case 2: {
19295 u16 tmp;
19296 - __get_user_asm(tmp, (u16 __user *)src,
19297 + __get_user_asm(tmp, (const u16 __user *)src,
19298 ret, "w", "w", "=r", 2);
19299 if (likely(!ret))
19300 __put_user_asm(tmp, (u16 __user *)dst,
19301 @@ -195,7 +260,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
19302
19303 case 4: {
19304 u32 tmp;
19305 - __get_user_asm(tmp, (u32 __user *)src,
19306 + __get_user_asm(tmp, (const u32 __user *)src,
19307 ret, "l", "k", "=r", 4);
19308 if (likely(!ret))
19309 __put_user_asm(tmp, (u32 __user *)dst,
19310 @@ -204,7 +269,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
19311 }
19312 case 8: {
19313 u64 tmp;
19314 - __get_user_asm(tmp, (u64 __user *)src,
19315 + __get_user_asm(tmp, (const u64 __user *)src,
19316 ret, "q", "", "=r", 8);
19317 if (likely(!ret))
19318 __put_user_asm(tmp, (u64 __user *)dst,
19319 @@ -212,41 +277,74 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
19320 return ret;
19321 }
19322 default:
19323 - return copy_user_generic((__force void *)dst,
19324 - (__force void *)src, size);
19325 + return copy_user_generic((__force_kernel void *)____m(dst),
19326 + (__force_kernel const void *)____m(src), size);
19327 }
19328 }
19329
19330 -static __must_check __always_inline int
19331 -__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
19332 +static __must_check __always_inline unsigned long
19333 +__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
19334 {
19335 - return copy_user_generic(dst, (__force const void *)src, size);
19336 + if (size > INT_MAX)
19337 + return size;
19338 +
19339 +#ifdef CONFIG_PAX_MEMORY_UDEREF
19340 + if (!__access_ok(VERIFY_READ, src, size))
19341 + return size;
19342 +#endif
19343 +
19344 + return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
19345 }
19346
19347 -static __must_check __always_inline int
19348 -__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
19349 +static __must_check __always_inline unsigned long
19350 +__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
19351 {
19352 - return copy_user_generic((__force void *)dst, src, size);
19353 + if (size > INT_MAX)
19354 + return size;
19355 +
19356 +#ifdef CONFIG_PAX_MEMORY_UDEREF
19357 + if (!__access_ok(VERIFY_WRITE, dst, size))
19358 + return size;
19359 +#endif
19360 +
19361 + return copy_user_generic((__force_kernel void *)____m(dst), src, size);
19362 }
19363
19364 -extern long __copy_user_nocache(void *dst, const void __user *src,
19365 - unsigned size, int zerorest);
19366 +extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
19367 + unsigned long size, int zerorest);
19368
19369 -static inline int
19370 -__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
19371 +static inline unsigned long
19372 +__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
19373 {
19374 might_fault();
19375 +
19376 + if (size > INT_MAX)
19377 + return size;
19378 +
19379 +#ifdef CONFIG_PAX_MEMORY_UDEREF
19380 + if (!__access_ok(VERIFY_READ, src, size))
19381 + return size;
19382 +#endif
19383 +
19384 return __copy_user_nocache(dst, src, size, 1);
19385 }
19386
19387 -static inline int
19388 +static inline unsigned long
19389 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
19390 - unsigned size)
19391 + unsigned long size)
19392 {
19393 + if (size > INT_MAX)
19394 + return size;
19395 +
19396 +#ifdef CONFIG_PAX_MEMORY_UDEREF
19397 + if (!__access_ok(VERIFY_READ, src, size))
19398 + return size;
19399 +#endif
19400 +
19401 return __copy_user_nocache(dst, src, size, 0);
19402 }
19403
19404 unsigned long
19405 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
19406 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
19407
19408 #endif /* _ASM_X86_UACCESS_64_H */
19409 diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
19410 index 5b238981..77fdd78 100644
19411 --- a/arch/x86/include/asm/word-at-a-time.h
19412 +++ b/arch/x86/include/asm/word-at-a-time.h
19413 @@ -11,7 +11,7 @@
19414 * and shift, for example.
19415 */
19416 struct word_at_a_time {
19417 - const unsigned long one_bits, high_bits;
19418 + unsigned long one_bits, high_bits;
19419 };
19420
19421 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
19422 diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
19423 index 828a156..650e625 100644
19424 --- a/arch/x86/include/asm/x86_init.h
19425 +++ b/arch/x86/include/asm/x86_init.h
19426 @@ -129,7 +129,7 @@ struct x86_init_ops {
19427 struct x86_init_timers timers;
19428 struct x86_init_iommu iommu;
19429 struct x86_init_pci pci;
19430 -};
19431 +} __no_const;
19432
19433 /**
19434 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
19435 @@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
19436 void (*setup_percpu_clockev)(void);
19437 void (*early_percpu_clock_init)(void);
19438 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
19439 -};
19440 +} __no_const;
19441
19442 struct timespec;
19443
19444 @@ -168,7 +168,7 @@ struct x86_platform_ops {
19445 void (*save_sched_clock_state)(void);
19446 void (*restore_sched_clock_state)(void);
19447 void (*apic_post_init)(void);
19448 -};
19449 +} __no_const;
19450
19451 struct pci_dev;
19452 struct msi_msg;
19453 @@ -182,7 +182,7 @@ struct x86_msi_ops {
19454 void (*teardown_msi_irqs)(struct pci_dev *dev);
19455 void (*restore_msi_irqs)(struct pci_dev *dev, int irq);
19456 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
19457 -};
19458 +} __no_const;
19459
19460 struct IO_APIC_route_entry;
19461 struct io_apic_irq_attr;
19462 @@ -203,7 +203,7 @@ struct x86_io_apic_ops {
19463 unsigned int destination, int vector,
19464 struct io_apic_irq_attr *attr);
19465 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
19466 -};
19467 +} __no_const;
19468
19469 extern struct x86_init_ops x86_init;
19470 extern struct x86_cpuinit_ops x86_cpuinit;
19471 diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
19472 index b913915..4f5a581 100644
19473 --- a/arch/x86/include/asm/xen/page.h
19474 +++ b/arch/x86/include/asm/xen/page.h
19475 @@ -56,7 +56,7 @@ extern int m2p_remove_override(struct page *page,
19476 extern struct page *m2p_find_override(unsigned long mfn);
19477 extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn);
19478
19479 -static inline unsigned long pfn_to_mfn(unsigned long pfn)
19480 +static inline unsigned long __intentional_overflow(-1) pfn_to_mfn(unsigned long pfn)
19481 {
19482 unsigned long mfn;
19483
19484 diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
19485 index 0415cda..3b22adc 100644
19486 --- a/arch/x86/include/asm/xsave.h
19487 +++ b/arch/x86/include/asm/xsave.h
19488 @@ -70,8 +70,11 @@ static inline int xsave_user(struct xsave_struct __user *buf)
19489 if (unlikely(err))
19490 return -EFAULT;
19491
19492 + pax_open_userland();
19493 __asm__ __volatile__(ASM_STAC "\n"
19494 - "1: .byte " REX_PREFIX "0x0f,0xae,0x27\n"
19495 + "1:"
19496 + __copyuser_seg
19497 + ".byte " REX_PREFIX "0x0f,0xae,0x27\n"
19498 "2: " ASM_CLAC "\n"
19499 ".section .fixup,\"ax\"\n"
19500 "3: movl $-1,%[err]\n"
19501 @@ -81,18 +84,22 @@ static inline int xsave_user(struct xsave_struct __user *buf)
19502 : [err] "=r" (err)
19503 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
19504 : "memory");
19505 + pax_close_userland();
19506 return err;
19507 }
19508
19509 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
19510 {
19511 int err;
19512 - struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
19513 + struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
19514 u32 lmask = mask;
19515 u32 hmask = mask >> 32;
19516
19517 + pax_open_userland();
19518 __asm__ __volatile__(ASM_STAC "\n"
19519 - "1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
19520 + "1:"
19521 + __copyuser_seg
19522 + ".byte " REX_PREFIX "0x0f,0xae,0x2f\n"
19523 "2: " ASM_CLAC "\n"
19524 ".section .fixup,\"ax\"\n"
19525 "3: movl $-1,%[err]\n"
19526 @@ -102,6 +109,7 @@ static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
19527 : [err] "=r" (err)
19528 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
19529 : "memory"); /* memory required? */
19530 + pax_close_userland();
19531 return err;
19532 }
19533
19534 diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
19535 index bbae024..e1528f9 100644
19536 --- a/arch/x86/include/uapi/asm/e820.h
19537 +++ b/arch/x86/include/uapi/asm/e820.h
19538 @@ -63,7 +63,7 @@ struct e820map {
19539 #define ISA_START_ADDRESS 0xa0000
19540 #define ISA_END_ADDRESS 0x100000
19541
19542 -#define BIOS_BEGIN 0x000a0000
19543 +#define BIOS_BEGIN 0x000c0000
19544 #define BIOS_END 0x00100000
19545
19546 #define BIOS_ROM_BASE 0xffe00000
19547 diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
19548 index 7b0a55a..ad115bf 100644
19549 --- a/arch/x86/include/uapi/asm/ptrace-abi.h
19550 +++ b/arch/x86/include/uapi/asm/ptrace-abi.h
19551 @@ -49,7 +49,6 @@
19552 #define EFLAGS 144
19553 #define RSP 152
19554 #define SS 160
19555 -#define ARGOFFSET R11
19556 #endif /* __ASSEMBLY__ */
19557
19558 /* top of stack page */
19559 diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
19560 index a5408b9..5133813 100644
19561 --- a/arch/x86/kernel/Makefile
19562 +++ b/arch/x86/kernel/Makefile
19563 @@ -24,7 +24,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
19564 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
19565 obj-$(CONFIG_IRQ_WORK) += irq_work.o
19566 obj-y += probe_roms.o
19567 -obj-$(CONFIG_X86_32) += i386_ksyms_32.o
19568 +obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
19569 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
19570 obj-y += syscall_$(BITS).o
19571 obj-$(CONFIG_X86_64) += vsyscall_64.o
19572 diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
19573 index 40c7660..f709f4b 100644
19574 --- a/arch/x86/kernel/acpi/boot.c
19575 +++ b/arch/x86/kernel/acpi/boot.c
19576 @@ -1365,7 +1365,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
19577 * If your system is blacklisted here, but you find that acpi=force
19578 * works for you, please contact linux-acpi@vger.kernel.org
19579 */
19580 -static struct dmi_system_id __initdata acpi_dmi_table[] = {
19581 +static const struct dmi_system_id __initconst acpi_dmi_table[] = {
19582 /*
19583 * Boxes that need ACPI disabled
19584 */
19585 @@ -1440,7 +1440,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
19586 };
19587
19588 /* second table for DMI checks that should run after early-quirks */
19589 -static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
19590 +static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
19591 /*
19592 * HP laptops which use a DSDT reporting as HP/SB400/10000,
19593 * which includes some code which overrides all temperature
19594 diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
19595 index 3312010..a65ca7b 100644
19596 --- a/arch/x86/kernel/acpi/sleep.c
19597 +++ b/arch/x86/kernel/acpi/sleep.c
19598 @@ -88,8 +88,12 @@ int x86_acpi_suspend_lowlevel(void)
19599 #else /* CONFIG_64BIT */
19600 #ifdef CONFIG_SMP
19601 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
19602 +
19603 + pax_open_kernel();
19604 early_gdt_descr.address =
19605 (unsigned long)get_cpu_gdt_table(smp_processor_id());
19606 + pax_close_kernel();
19607 +
19608 initial_gs = per_cpu_offset(smp_processor_id());
19609 #endif
19610 initial_code = (unsigned long)wakeup_long64;
19611 diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
19612 index d1daa66..59fecba 100644
19613 --- a/arch/x86/kernel/acpi/wakeup_32.S
19614 +++ b/arch/x86/kernel/acpi/wakeup_32.S
19615 @@ -29,13 +29,11 @@ wakeup_pmode_return:
19616 # and restore the stack ... but you need gdt for this to work
19617 movl saved_context_esp, %esp
19618
19619 - movl %cs:saved_magic, %eax
19620 - cmpl $0x12345678, %eax
19621 + cmpl $0x12345678, saved_magic
19622 jne bogus_magic
19623
19624 # jump to place where we left off
19625 - movl saved_eip, %eax
19626 - jmp *%eax
19627 + jmp *(saved_eip)
19628
19629 bogus_magic:
19630 jmp bogus_magic
19631 diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
19632 index 15e8563..323cbe1 100644
19633 --- a/arch/x86/kernel/alternative.c
19634 +++ b/arch/x86/kernel/alternative.c
19635 @@ -269,6 +269,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
19636 */
19637 for (a = start; a < end; a++) {
19638 instr = (u8 *)&a->instr_offset + a->instr_offset;
19639 +
19640 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19641 + instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
19642 + if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
19643 + instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
19644 +#endif
19645 +
19646 replacement = (u8 *)&a->repl_offset + a->repl_offset;
19647 BUG_ON(a->replacementlen > a->instrlen);
19648 BUG_ON(a->instrlen > sizeof(insnbuf));
19649 @@ -300,10 +307,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
19650 for (poff = start; poff < end; poff++) {
19651 u8 *ptr = (u8 *)poff + *poff;
19652
19653 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19654 + ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
19655 + if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
19656 + ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
19657 +#endif
19658 +
19659 if (!*poff || ptr < text || ptr >= text_end)
19660 continue;
19661 /* turn DS segment override prefix into lock prefix */
19662 - if (*ptr == 0x3e)
19663 + if (*ktla_ktva(ptr) == 0x3e)
19664 text_poke(ptr, ((unsigned char []){0xf0}), 1);
19665 }
19666 mutex_unlock(&text_mutex);
19667 @@ -318,10 +331,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
19668 for (poff = start; poff < end; poff++) {
19669 u8 *ptr = (u8 *)poff + *poff;
19670
19671 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19672 + ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
19673 + if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
19674 + ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
19675 +#endif
19676 +
19677 if (!*poff || ptr < text || ptr >= text_end)
19678 continue;
19679 /* turn lock prefix into DS segment override prefix */
19680 - if (*ptr == 0xf0)
19681 + if (*ktla_ktva(ptr) == 0xf0)
19682 text_poke(ptr, ((unsigned char []){0x3E}), 1);
19683 }
19684 mutex_unlock(&text_mutex);
19685 @@ -469,7 +488,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
19686
19687 BUG_ON(p->len > MAX_PATCH_LEN);
19688 /* prep the buffer with the original instructions */
19689 - memcpy(insnbuf, p->instr, p->len);
19690 + memcpy(insnbuf, ktla_ktva(p->instr), p->len);
19691 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
19692 (unsigned long)p->instr, p->len);
19693
19694 @@ -516,7 +535,7 @@ void __init alternative_instructions(void)
19695 if (!uniproc_patched || num_possible_cpus() == 1)
19696 free_init_pages("SMP alternatives",
19697 (unsigned long)__smp_locks,
19698 - (unsigned long)__smp_locks_end);
19699 + PAGE_ALIGN((unsigned long)__smp_locks_end));
19700 #endif
19701
19702 apply_paravirt(__parainstructions, __parainstructions_end);
19703 @@ -536,13 +555,17 @@ void __init alternative_instructions(void)
19704 * instructions. And on the local CPU you need to be protected again NMI or MCE
19705 * handlers seeing an inconsistent instruction while you patch.
19706 */
19707 -void *__init_or_module text_poke_early(void *addr, const void *opcode,
19708 +void *__kprobes text_poke_early(void *addr, const void *opcode,
19709 size_t len)
19710 {
19711 unsigned long flags;
19712 local_irq_save(flags);
19713 - memcpy(addr, opcode, len);
19714 +
19715 + pax_open_kernel();
19716 + memcpy(ktla_ktva(addr), opcode, len);
19717 sync_core();
19718 + pax_close_kernel();
19719 +
19720 local_irq_restore(flags);
19721 /* Could also do a CLFLUSH here to speed up CPU recovery; but
19722 that causes hangs on some VIA CPUs. */
19723 @@ -564,36 +587,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
19724 */
19725 void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
19726 {
19727 - unsigned long flags;
19728 - char *vaddr;
19729 + unsigned char *vaddr = ktla_ktva(addr);
19730 struct page *pages[2];
19731 - int i;
19732 + size_t i;
19733
19734 if (!core_kernel_text((unsigned long)addr)) {
19735 - pages[0] = vmalloc_to_page(addr);
19736 - pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
19737 + pages[0] = vmalloc_to_page(vaddr);
19738 + pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
19739 } else {
19740 - pages[0] = virt_to_page(addr);
19741 + pages[0] = virt_to_page(vaddr);
19742 WARN_ON(!PageReserved(pages[0]));
19743 - pages[1] = virt_to_page(addr + PAGE_SIZE);
19744 + pages[1] = virt_to_page(vaddr + PAGE_SIZE);
19745 }
19746 BUG_ON(!pages[0]);
19747 - local_irq_save(flags);
19748 - set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
19749 - if (pages[1])
19750 - set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
19751 - vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
19752 - memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
19753 - clear_fixmap(FIX_TEXT_POKE0);
19754 - if (pages[1])
19755 - clear_fixmap(FIX_TEXT_POKE1);
19756 - local_flush_tlb();
19757 - sync_core();
19758 - /* Could also do a CLFLUSH here to speed up CPU recovery; but
19759 - that causes hangs on some VIA CPUs. */
19760 + text_poke_early(addr, opcode, len);
19761 for (i = 0; i < len; i++)
19762 - BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
19763 - local_irq_restore(flags);
19764 + BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
19765 return addr;
19766 }
19767
19768 @@ -613,7 +622,7 @@ int poke_int3_handler(struct pt_regs *regs)
19769 if (likely(!bp_patching_in_progress))
19770 return 0;
19771
19772 - if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
19773 + if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
19774 return 0;
19775
19776 /* set up the specified breakpoint handler */
19777 @@ -647,7 +656,7 @@ int poke_int3_handler(struct pt_regs *regs)
19778 */
19779 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
19780 {
19781 - unsigned char int3 = 0xcc;
19782 + const unsigned char int3 = 0xcc;
19783
19784 bp_int3_handler = handler;
19785 bp_int3_addr = (u8 *)addr + sizeof(int3);
19786 diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
19787 index a7eb82d..f6e52d4 100644
19788 --- a/arch/x86/kernel/apic/apic.c
19789 +++ b/arch/x86/kernel/apic/apic.c
19790 @@ -190,7 +190,7 @@ int first_system_vector = 0xfe;
19791 /*
19792 * Debug level, exported for io_apic.c
19793 */
19794 -unsigned int apic_verbosity;
19795 +int apic_verbosity;
19796
19797 int pic_mode;
19798
19799 @@ -1985,7 +1985,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
19800 apic_write(APIC_ESR, 0);
19801 v1 = apic_read(APIC_ESR);
19802 ack_APIC_irq();
19803 - atomic_inc(&irq_err_count);
19804 + atomic_inc_unchecked(&irq_err_count);
19805
19806 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x(%02x)",
19807 smp_processor_id(), v0 , v1);
19808 diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
19809 index 00c77cf..2dc6a2d 100644
19810 --- a/arch/x86/kernel/apic/apic_flat_64.c
19811 +++ b/arch/x86/kernel/apic/apic_flat_64.c
19812 @@ -157,7 +157,7 @@ static int flat_probe(void)
19813 return 1;
19814 }
19815
19816 -static struct apic apic_flat = {
19817 +static struct apic apic_flat __read_only = {
19818 .name = "flat",
19819 .probe = flat_probe,
19820 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
19821 @@ -271,7 +271,7 @@ static int physflat_probe(void)
19822 return 0;
19823 }
19824
19825 -static struct apic apic_physflat = {
19826 +static struct apic apic_physflat __read_only = {
19827
19828 .name = "physical flat",
19829 .probe = physflat_probe,
19830 diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
19831 index e145f28..2752888 100644
19832 --- a/arch/x86/kernel/apic/apic_noop.c
19833 +++ b/arch/x86/kernel/apic/apic_noop.c
19834 @@ -119,7 +119,7 @@ static void noop_apic_write(u32 reg, u32 v)
19835 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
19836 }
19837
19838 -struct apic apic_noop = {
19839 +struct apic apic_noop __read_only = {
19840 .name = "noop",
19841 .probe = noop_probe,
19842 .acpi_madt_oem_check = NULL,
19843 diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
19844 index d50e364..543bee3 100644
19845 --- a/arch/x86/kernel/apic/bigsmp_32.c
19846 +++ b/arch/x86/kernel/apic/bigsmp_32.c
19847 @@ -152,7 +152,7 @@ static int probe_bigsmp(void)
19848 return dmi_bigsmp;
19849 }
19850
19851 -static struct apic apic_bigsmp = {
19852 +static struct apic apic_bigsmp __read_only = {
19853
19854 .name = "bigsmp",
19855 .probe = probe_bigsmp,
19856 diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
19857 index c552247..587a316 100644
19858 --- a/arch/x86/kernel/apic/es7000_32.c
19859 +++ b/arch/x86/kernel/apic/es7000_32.c
19860 @@ -608,8 +608,7 @@ static int es7000_mps_oem_check_cluster(struct mpc_table *mpc, char *oem,
19861 return ret && es7000_apic_is_cluster();
19862 }
19863
19864 -/* We've been warned by a false positive warning.Use __refdata to keep calm. */
19865 -static struct apic __refdata apic_es7000_cluster = {
19866 +static struct apic apic_es7000_cluster __read_only = {
19867
19868 .name = "es7000",
19869 .probe = probe_es7000,
19870 @@ -675,7 +674,7 @@ static struct apic __refdata apic_es7000_cluster = {
19871 .x86_32_early_logical_apicid = es7000_early_logical_apicid,
19872 };
19873
19874 -static struct apic __refdata apic_es7000 = {
19875 +static struct apic apic_es7000 __read_only = {
19876
19877 .name = "es7000",
19878 .probe = probe_es7000,
19879 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
19880 index e63a5bd..c0babf8 100644
19881 --- a/arch/x86/kernel/apic/io_apic.c
19882 +++ b/arch/x86/kernel/apic/io_apic.c
19883 @@ -1060,7 +1060,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
19884 }
19885 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
19886
19887 -void lock_vector_lock(void)
19888 +void lock_vector_lock(void) __acquires(vector_lock)
19889 {
19890 /* Used to the online set of cpus does not change
19891 * during assign_irq_vector.
19892 @@ -1068,7 +1068,7 @@ void lock_vector_lock(void)
19893 raw_spin_lock(&vector_lock);
19894 }
19895
19896 -void unlock_vector_lock(void)
19897 +void unlock_vector_lock(void) __releases(vector_lock)
19898 {
19899 raw_spin_unlock(&vector_lock);
19900 }
19901 @@ -2367,7 +2367,7 @@ static void ack_apic_edge(struct irq_data *data)
19902 ack_APIC_irq();
19903 }
19904
19905 -atomic_t irq_mis_count;
19906 +atomic_unchecked_t irq_mis_count;
19907
19908 #ifdef CONFIG_GENERIC_PENDING_IRQ
19909 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
19910 @@ -2508,7 +2508,7 @@ static void ack_apic_level(struct irq_data *data)
19911 * at the cpu.
19912 */
19913 if (!(v & (1 << (i & 0x1f)))) {
19914 - atomic_inc(&irq_mis_count);
19915 + atomic_inc_unchecked(&irq_mis_count);
19916
19917 eoi_ioapic_irq(irq, cfg);
19918 }
19919 diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
19920 index 1e42e8f..daacf44 100644
19921 --- a/arch/x86/kernel/apic/numaq_32.c
19922 +++ b/arch/x86/kernel/apic/numaq_32.c
19923 @@ -455,8 +455,7 @@ static void numaq_setup_portio_remap(void)
19924 (u_long) xquad_portio, (u_long) num_quads*XQUAD_PORTIO_QUAD);
19925 }
19926
19927 -/* Use __refdata to keep false positive warning calm. */
19928 -static struct apic __refdata apic_numaq = {
19929 +static struct apic apic_numaq __read_only = {
19930
19931 .name = "NUMAQ",
19932 .probe = probe_numaq,
19933 diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
19934 index eb35ef9..f184a21 100644
19935 --- a/arch/x86/kernel/apic/probe_32.c
19936 +++ b/arch/x86/kernel/apic/probe_32.c
19937 @@ -72,7 +72,7 @@ static int probe_default(void)
19938 return 1;
19939 }
19940
19941 -static struct apic apic_default = {
19942 +static struct apic apic_default __read_only = {
19943
19944 .name = "default",
19945 .probe = probe_default,
19946 diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
19947 index 77c95c0..434f8a4 100644
19948 --- a/arch/x86/kernel/apic/summit_32.c
19949 +++ b/arch/x86/kernel/apic/summit_32.c
19950 @@ -486,7 +486,7 @@ void setup_summit(void)
19951 }
19952 #endif
19953
19954 -static struct apic apic_summit = {
19955 +static struct apic apic_summit __read_only = {
19956
19957 .name = "summit",
19958 .probe = probe_summit,
19959 diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
19960 index 140e29d..d88bc95 100644
19961 --- a/arch/x86/kernel/apic/x2apic_cluster.c
19962 +++ b/arch/x86/kernel/apic/x2apic_cluster.c
19963 @@ -183,7 +183,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
19964 return notifier_from_errno(err);
19965 }
19966
19967 -static struct notifier_block __refdata x2apic_cpu_notifier = {
19968 +static struct notifier_block x2apic_cpu_notifier = {
19969 .notifier_call = update_clusterinfo,
19970 };
19971
19972 @@ -235,7 +235,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
19973 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
19974 }
19975
19976 -static struct apic apic_x2apic_cluster = {
19977 +static struct apic apic_x2apic_cluster __read_only = {
19978
19979 .name = "cluster x2apic",
19980 .probe = x2apic_cluster_probe,
19981 diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
19982 index 562a76d..a003c0f 100644
19983 --- a/arch/x86/kernel/apic/x2apic_phys.c
19984 +++ b/arch/x86/kernel/apic/x2apic_phys.c
19985 @@ -89,7 +89,7 @@ static int x2apic_phys_probe(void)
19986 return apic == &apic_x2apic_phys;
19987 }
19988
19989 -static struct apic apic_x2apic_phys = {
19990 +static struct apic apic_x2apic_phys __read_only = {
19991
19992 .name = "physical x2apic",
19993 .probe = x2apic_phys_probe,
19994 diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
19995 index a419814..1dd34a0 100644
19996 --- a/arch/x86/kernel/apic/x2apic_uv_x.c
19997 +++ b/arch/x86/kernel/apic/x2apic_uv_x.c
19998 @@ -357,7 +357,7 @@ static int uv_probe(void)
19999 return apic == &apic_x2apic_uv_x;
20000 }
20001
20002 -static struct apic __refdata apic_x2apic_uv_x = {
20003 +static struct apic apic_x2apic_uv_x __read_only = {
20004
20005 .name = "UV large system",
20006 .probe = uv_probe,
20007 diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20008 index 3ab0343..814c4787 100644
20009 --- a/arch/x86/kernel/apm_32.c
20010 +++ b/arch/x86/kernel/apm_32.c
20011 @@ -433,7 +433,7 @@ static DEFINE_MUTEX(apm_mutex);
20012 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20013 * even though they are called in protected mode.
20014 */
20015 -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
20016 +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
20017 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
20018
20019 static const char driver_version[] = "1.16ac"; /* no spaces */
20020 @@ -611,7 +611,10 @@ static long __apm_bios_call(void *_call)
20021 BUG_ON(cpu != 0);
20022 gdt = get_cpu_gdt_table(cpu);
20023 save_desc_40 = gdt[0x40 / 8];
20024 +
20025 + pax_open_kernel();
20026 gdt[0x40 / 8] = bad_bios_desc;
20027 + pax_close_kernel();
20028
20029 apm_irq_save(flags);
20030 APM_DO_SAVE_SEGS;
20031 @@ -620,7 +623,11 @@ static long __apm_bios_call(void *_call)
20032 &call->esi);
20033 APM_DO_RESTORE_SEGS;
20034 apm_irq_restore(flags);
20035 +
20036 + pax_open_kernel();
20037 gdt[0x40 / 8] = save_desc_40;
20038 + pax_close_kernel();
20039 +
20040 put_cpu();
20041
20042 return call->eax & 0xff;
20043 @@ -687,7 +694,10 @@ static long __apm_bios_call_simple(void *_call)
20044 BUG_ON(cpu != 0);
20045 gdt = get_cpu_gdt_table(cpu);
20046 save_desc_40 = gdt[0x40 / 8];
20047 +
20048 + pax_open_kernel();
20049 gdt[0x40 / 8] = bad_bios_desc;
20050 + pax_close_kernel();
20051
20052 apm_irq_save(flags);
20053 APM_DO_SAVE_SEGS;
20054 @@ -695,7 +705,11 @@ static long __apm_bios_call_simple(void *_call)
20055 &call->eax);
20056 APM_DO_RESTORE_SEGS;
20057 apm_irq_restore(flags);
20058 +
20059 + pax_open_kernel();
20060 gdt[0x40 / 8] = save_desc_40;
20061 + pax_close_kernel();
20062 +
20063 put_cpu();
20064 return error;
20065 }
20066 @@ -2362,12 +2376,15 @@ static int __init apm_init(void)
20067 * code to that CPU.
20068 */
20069 gdt = get_cpu_gdt_table(0);
20070 +
20071 + pax_open_kernel();
20072 set_desc_base(&gdt[APM_CS >> 3],
20073 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
20074 set_desc_base(&gdt[APM_CS_16 >> 3],
20075 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
20076 set_desc_base(&gdt[APM_DS >> 3],
20077 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
20078 + pax_close_kernel();
20079
20080 proc_create("apm", 0, NULL, &apm_file_ops);
20081
20082 diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
20083 index 2861082..6d4718e 100644
20084 --- a/arch/x86/kernel/asm-offsets.c
20085 +++ b/arch/x86/kernel/asm-offsets.c
20086 @@ -33,6 +33,8 @@ void common(void) {
20087 OFFSET(TI_status, thread_info, status);
20088 OFFSET(TI_addr_limit, thread_info, addr_limit);
20089 OFFSET(TI_preempt_count, thread_info, preempt_count);
20090 + OFFSET(TI_lowest_stack, thread_info, lowest_stack);
20091 + DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
20092
20093 BLANK();
20094 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
20095 @@ -53,8 +55,26 @@ void common(void) {
20096 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
20097 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
20098 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
20099 +
20100 +#ifdef CONFIG_PAX_KERNEXEC
20101 + OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
20102 #endif
20103
20104 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20105 + OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
20106 + OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
20107 +#ifdef CONFIG_X86_64
20108 + OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
20109 +#endif
20110 +#endif
20111 +
20112 +#endif
20113 +
20114 + BLANK();
20115 + DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
20116 + DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
20117 + DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
20118 +
20119 #ifdef CONFIG_XEN
20120 BLANK();
20121 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
20122 diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
20123 index e7c798b..2b2019b 100644
20124 --- a/arch/x86/kernel/asm-offsets_64.c
20125 +++ b/arch/x86/kernel/asm-offsets_64.c
20126 @@ -77,6 +77,7 @@ int main(void)
20127 BLANK();
20128 #undef ENTRY
20129
20130 + DEFINE(TSS_size, sizeof(struct tss_struct));
20131 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
20132 BLANK();
20133
20134 diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
20135 index 47b56a7..efc2bc6 100644
20136 --- a/arch/x86/kernel/cpu/Makefile
20137 +++ b/arch/x86/kernel/cpu/Makefile
20138 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
20139 CFLAGS_REMOVE_perf_event.o = -pg
20140 endif
20141
20142 -# Make sure load_percpu_segment has no stackprotector
20143 -nostackp := $(call cc-option, -fno-stack-protector)
20144 -CFLAGS_common.o := $(nostackp)
20145 -
20146 obj-y := intel_cacheinfo.o scattered.o topology.o
20147 obj-y += proc.o capflags.o powerflags.o common.o
20148 obj-y += rdrand.o
20149 diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
20150 index 903a264..fc955f3 100644
20151 --- a/arch/x86/kernel/cpu/amd.c
20152 +++ b/arch/x86/kernel/cpu/amd.c
20153 @@ -743,7 +743,7 @@ static void init_amd(struct cpuinfo_x86 *c)
20154 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
20155 {
20156 /* AMD errata T13 (order #21922) */
20157 - if ((c->x86 == 6)) {
20158 + if (c->x86 == 6) {
20159 /* Duron Rev A0 */
20160 if (c->x86_model == 3 && c->x86_mask == 0)
20161 size = 64;
20162 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
20163 index 2793d1f..b4f313a 100644
20164 --- a/arch/x86/kernel/cpu/common.c
20165 +++ b/arch/x86/kernel/cpu/common.c
20166 @@ -88,60 +88,6 @@ static const struct cpu_dev default_cpu = {
20167
20168 static const struct cpu_dev *this_cpu = &default_cpu;
20169
20170 -DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
20171 -#ifdef CONFIG_X86_64
20172 - /*
20173 - * We need valid kernel segments for data and code in long mode too
20174 - * IRET will check the segment types kkeil 2000/10/28
20175 - * Also sysret mandates a special GDT layout
20176 - *
20177 - * TLS descriptors are currently at a different place compared to i386.
20178 - * Hopefully nobody expects them at a fixed place (Wine?)
20179 - */
20180 - [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
20181 - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
20182 - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
20183 - [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
20184 - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
20185 - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
20186 -#else
20187 - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
20188 - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
20189 - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
20190 - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
20191 - /*
20192 - * Segments used for calling PnP BIOS have byte granularity.
20193 - * They code segments and data segments have fixed 64k limits,
20194 - * the transfer segment sizes are set at run time.
20195 - */
20196 - /* 32-bit code */
20197 - [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
20198 - /* 16-bit code */
20199 - [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
20200 - /* 16-bit data */
20201 - [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
20202 - /* 16-bit data */
20203 - [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
20204 - /* 16-bit data */
20205 - [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
20206 - /*
20207 - * The APM segments have byte granularity and their bases
20208 - * are set at run time. All have 64k limits.
20209 - */
20210 - /* 32-bit code */
20211 - [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
20212 - /* 16-bit code */
20213 - [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
20214 - /* data */
20215 - [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
20216 -
20217 - [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
20218 - [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
20219 - GDT_STACK_CANARY_INIT
20220 -#endif
20221 -} };
20222 -EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
20223 -
20224 static int __init x86_xsave_setup(char *s)
20225 {
20226 setup_clear_cpu_cap(X86_FEATURE_XSAVE);
20227 @@ -288,6 +234,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
20228 set_in_cr4(X86_CR4_SMAP);
20229 }
20230
20231 +#ifdef CONFIG_X86_64
20232 +static __init int setup_disable_pcid(char *arg)
20233 +{
20234 + setup_clear_cpu_cap(X86_FEATURE_PCID);
20235 + setup_clear_cpu_cap(X86_FEATURE_INVPCID);
20236 +
20237 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20238 + if (clone_pgd_mask != ~(pgdval_t)0UL)
20239 + pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
20240 +#endif
20241 +
20242 + return 1;
20243 +}
20244 +__setup("nopcid", setup_disable_pcid);
20245 +
20246 +static void setup_pcid(struct cpuinfo_x86 *c)
20247 +{
20248 + if (!cpu_has(c, X86_FEATURE_PCID)) {
20249 + clear_cpu_cap(c, X86_FEATURE_INVPCID);
20250 +
20251 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20252 + if (clone_pgd_mask != ~(pgdval_t)0UL) {
20253 + pax_open_kernel();
20254 + pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
20255 + pax_close_kernel();
20256 + printk("PAX: slow and weak UDEREF enabled\n");
20257 + } else
20258 + printk("PAX: UDEREF disabled\n");
20259 +#endif
20260 +
20261 + return;
20262 + }
20263 +
20264 + printk("PAX: PCID detected\n");
20265 + set_in_cr4(X86_CR4_PCIDE);
20266 +
20267 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20268 + pax_open_kernel();
20269 + clone_pgd_mask = ~(pgdval_t)0UL;
20270 + pax_close_kernel();
20271 + if (pax_user_shadow_base)
20272 + printk("PAX: weak UDEREF enabled\n");
20273 + else {
20274 + set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
20275 + printk("PAX: strong UDEREF enabled\n");
20276 + }
20277 +#endif
20278 +
20279 + if (cpu_has(c, X86_FEATURE_INVPCID))
20280 + printk("PAX: INVPCID detected\n");
20281 +}
20282 +#endif
20283 +
20284 /*
20285 * Some CPU features depend on higher CPUID levels, which may not always
20286 * be available due to CPUID level capping or broken virtualization
20287 @@ -386,7 +385,7 @@ void switch_to_new_gdt(int cpu)
20288 {
20289 struct desc_ptr gdt_descr;
20290
20291 - gdt_descr.address = (long)get_cpu_gdt_table(cpu);
20292 + gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
20293 gdt_descr.size = GDT_SIZE - 1;
20294 load_gdt(&gdt_descr);
20295 /* Reload the per-cpu base */
20296 @@ -875,6 +874,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
20297 setup_smep(c);
20298 setup_smap(c);
20299
20300 +#ifdef CONFIG_X86_64
20301 + setup_pcid(c);
20302 +#endif
20303 +
20304 /*
20305 * The vendor-specific functions might have changed features.
20306 * Now we do "generic changes."
20307 @@ -883,6 +886,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
20308 /* Filter out anything that depends on CPUID levels we don't have */
20309 filter_cpuid_features(c, true);
20310
20311 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
20312 + setup_clear_cpu_cap(X86_FEATURE_SEP);
20313 +#endif
20314 +
20315 /* If the model name is still unset, do table lookup. */
20316 if (!c->x86_model_id[0]) {
20317 const char *p;
20318 @@ -1070,10 +1077,12 @@ static __init int setup_disablecpuid(char *arg)
20319 }
20320 __setup("clearcpuid=", setup_disablecpuid);
20321
20322 +DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
20323 +EXPORT_PER_CPU_SYMBOL(current_tinfo);
20324 +
20325 #ifdef CONFIG_X86_64
20326 -struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
20327 -struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
20328 - (unsigned long) debug_idt_table };
20329 +struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
20330 +const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
20331
20332 DEFINE_PER_CPU_FIRST(union irq_stack_union,
20333 irq_stack_union) __aligned(PAGE_SIZE) __visible;
20334 @@ -1087,7 +1096,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
20335 EXPORT_PER_CPU_SYMBOL(current_task);
20336
20337 DEFINE_PER_CPU(unsigned long, kernel_stack) =
20338 - (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
20339 + (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
20340 EXPORT_PER_CPU_SYMBOL(kernel_stack);
20341
20342 DEFINE_PER_CPU(char *, irq_stack_ptr) =
20343 @@ -1232,7 +1241,7 @@ void cpu_init(void)
20344 load_ucode_ap();
20345
20346 cpu = stack_smp_processor_id();
20347 - t = &per_cpu(init_tss, cpu);
20348 + t = init_tss + cpu;
20349 oist = &per_cpu(orig_ist, cpu);
20350
20351 #ifdef CONFIG_NUMA
20352 @@ -1267,7 +1276,6 @@ void cpu_init(void)
20353 wrmsrl(MSR_KERNEL_GS_BASE, 0);
20354 barrier();
20355
20356 - x86_configure_nx();
20357 enable_x2apic();
20358
20359 /*
20360 @@ -1319,7 +1327,7 @@ void cpu_init(void)
20361 {
20362 int cpu = smp_processor_id();
20363 struct task_struct *curr = current;
20364 - struct tss_struct *t = &per_cpu(init_tss, cpu);
20365 + struct tss_struct *t = init_tss + cpu;
20366 struct thread_struct *thread = &curr->thread;
20367
20368 show_ucode_info_early();
20369 diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
20370 index 1414c90..1159406 100644
20371 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c
20372 +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
20373 @@ -1014,6 +1014,22 @@ static struct attribute *default_attrs[] = {
20374 };
20375
20376 #ifdef CONFIG_AMD_NB
20377 +static struct attribute *default_attrs_amd_nb[] = {
20378 + &type.attr,
20379 + &level.attr,
20380 + &coherency_line_size.attr,
20381 + &physical_line_partition.attr,
20382 + &ways_of_associativity.attr,
20383 + &number_of_sets.attr,
20384 + &size.attr,
20385 + &shared_cpu_map.attr,
20386 + &shared_cpu_list.attr,
20387 + NULL,
20388 + NULL,
20389 + NULL,
20390 + NULL
20391 +};
20392 +
20393 static struct attribute **amd_l3_attrs(void)
20394 {
20395 static struct attribute **attrs;
20396 @@ -1024,18 +1040,7 @@ static struct attribute **amd_l3_attrs(void)
20397
20398 n = ARRAY_SIZE(default_attrs);
20399
20400 - if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
20401 - n += 2;
20402 -
20403 - if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
20404 - n += 1;
20405 -
20406 - attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
20407 - if (attrs == NULL)
20408 - return attrs = default_attrs;
20409 -
20410 - for (n = 0; default_attrs[n]; n++)
20411 - attrs[n] = default_attrs[n];
20412 + attrs = default_attrs_amd_nb;
20413
20414 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
20415 attrs[n++] = &cache_disable_0.attr;
20416 @@ -1086,6 +1091,13 @@ static struct kobj_type ktype_cache = {
20417 .default_attrs = default_attrs,
20418 };
20419
20420 +#ifdef CONFIG_AMD_NB
20421 +static struct kobj_type ktype_cache_amd_nb = {
20422 + .sysfs_ops = &sysfs_ops,
20423 + .default_attrs = default_attrs_amd_nb,
20424 +};
20425 +#endif
20426 +
20427 static struct kobj_type ktype_percpu_entry = {
20428 .sysfs_ops = &sysfs_ops,
20429 };
20430 @@ -1151,20 +1163,26 @@ static int cache_add_dev(struct device *dev)
20431 return retval;
20432 }
20433
20434 +#ifdef CONFIG_AMD_NB
20435 + amd_l3_attrs();
20436 +#endif
20437 +
20438 for (i = 0; i < num_cache_leaves; i++) {
20439 + struct kobj_type *ktype;
20440 +
20441 this_object = INDEX_KOBJECT_PTR(cpu, i);
20442 this_object->cpu = cpu;
20443 this_object->index = i;
20444
20445 this_leaf = CPUID4_INFO_IDX(cpu, i);
20446
20447 - ktype_cache.default_attrs = default_attrs;
20448 + ktype = &ktype_cache;
20449 #ifdef CONFIG_AMD_NB
20450 if (this_leaf->base.nb)
20451 - ktype_cache.default_attrs = amd_l3_attrs();
20452 + ktype = &ktype_cache_amd_nb;
20453 #endif
20454 retval = kobject_init_and_add(&(this_object->kobj),
20455 - &ktype_cache,
20456 + ktype,
20457 per_cpu(ici_cache_kobject, cpu),
20458 "index%1lu", i);
20459 if (unlikely(retval)) {
20460 diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
20461 index b3218cd..99a75de 100644
20462 --- a/arch/x86/kernel/cpu/mcheck/mce.c
20463 +++ b/arch/x86/kernel/cpu/mcheck/mce.c
20464 @@ -45,6 +45,7 @@
20465 #include <asm/processor.h>
20466 #include <asm/mce.h>
20467 #include <asm/msr.h>
20468 +#include <asm/local.h>
20469
20470 #include "mce-internal.h"
20471
20472 @@ -258,7 +259,7 @@ static void print_mce(struct mce *m)
20473 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
20474 m->cs, m->ip);
20475
20476 - if (m->cs == __KERNEL_CS)
20477 + if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
20478 print_symbol("{%s}", m->ip);
20479 pr_cont("\n");
20480 }
20481 @@ -291,10 +292,10 @@ static void print_mce(struct mce *m)
20482
20483 #define PANIC_TIMEOUT 5 /* 5 seconds */
20484
20485 -static atomic_t mce_paniced;
20486 +static atomic_unchecked_t mce_paniced;
20487
20488 static int fake_panic;
20489 -static atomic_t mce_fake_paniced;
20490 +static atomic_unchecked_t mce_fake_paniced;
20491
20492 /* Panic in progress. Enable interrupts and wait for final IPI */
20493 static void wait_for_panic(void)
20494 @@ -318,7 +319,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
20495 /*
20496 * Make sure only one CPU runs in machine check panic
20497 */
20498 - if (atomic_inc_return(&mce_paniced) > 1)
20499 + if (atomic_inc_return_unchecked(&mce_paniced) > 1)
20500 wait_for_panic();
20501 barrier();
20502
20503 @@ -326,7 +327,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
20504 console_verbose();
20505 } else {
20506 /* Don't log too much for fake panic */
20507 - if (atomic_inc_return(&mce_fake_paniced) > 1)
20508 + if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
20509 return;
20510 }
20511 /* First print corrected ones that are still unlogged */
20512 @@ -365,7 +366,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
20513 if (!fake_panic) {
20514 if (panic_timeout == 0)
20515 panic_timeout = mca_cfg.panic_timeout;
20516 - panic(msg);
20517 + panic("%s", msg);
20518 } else
20519 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
20520 }
20521 @@ -695,7 +696,7 @@ static int mce_timed_out(u64 *t)
20522 * might have been modified by someone else.
20523 */
20524 rmb();
20525 - if (atomic_read(&mce_paniced))
20526 + if (atomic_read_unchecked(&mce_paniced))
20527 wait_for_panic();
20528 if (!mca_cfg.monarch_timeout)
20529 goto out;
20530 @@ -1666,7 +1667,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
20531 }
20532
20533 /* Call the installed machine check handler for this CPU setup. */
20534 -void (*machine_check_vector)(struct pt_regs *, long error_code) =
20535 +void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
20536 unexpected_machine_check;
20537
20538 /*
20539 @@ -1689,7 +1690,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
20540 return;
20541 }
20542
20543 + pax_open_kernel();
20544 machine_check_vector = do_machine_check;
20545 + pax_close_kernel();
20546
20547 __mcheck_cpu_init_generic();
20548 __mcheck_cpu_init_vendor(c);
20549 @@ -1703,7 +1706,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
20550 */
20551
20552 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
20553 -static int mce_chrdev_open_count; /* #times opened */
20554 +static local_t mce_chrdev_open_count; /* #times opened */
20555 static int mce_chrdev_open_exclu; /* already open exclusive? */
20556
20557 static int mce_chrdev_open(struct inode *inode, struct file *file)
20558 @@ -1711,7 +1714,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
20559 spin_lock(&mce_chrdev_state_lock);
20560
20561 if (mce_chrdev_open_exclu ||
20562 - (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
20563 + (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
20564 spin_unlock(&mce_chrdev_state_lock);
20565
20566 return -EBUSY;
20567 @@ -1719,7 +1722,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
20568
20569 if (file->f_flags & O_EXCL)
20570 mce_chrdev_open_exclu = 1;
20571 - mce_chrdev_open_count++;
20572 + local_inc(&mce_chrdev_open_count);
20573
20574 spin_unlock(&mce_chrdev_state_lock);
20575
20576 @@ -1730,7 +1733,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
20577 {
20578 spin_lock(&mce_chrdev_state_lock);
20579
20580 - mce_chrdev_open_count--;
20581 + local_dec(&mce_chrdev_open_count);
20582 mce_chrdev_open_exclu = 0;
20583
20584 spin_unlock(&mce_chrdev_state_lock);
20585 @@ -2404,7 +2407,7 @@ static __init void mce_init_banks(void)
20586
20587 for (i = 0; i < mca_cfg.banks; i++) {
20588 struct mce_bank *b = &mce_banks[i];
20589 - struct device_attribute *a = &b->attr;
20590 + device_attribute_no_const *a = &b->attr;
20591
20592 sysfs_attr_init(&a->attr);
20593 a->attr.name = b->attrname;
20594 @@ -2472,7 +2475,7 @@ struct dentry *mce_get_debugfs_dir(void)
20595 static void mce_reset(void)
20596 {
20597 cpu_missing = 0;
20598 - atomic_set(&mce_fake_paniced, 0);
20599 + atomic_set_unchecked(&mce_fake_paniced, 0);
20600 atomic_set(&mce_executing, 0);
20601 atomic_set(&mce_callin, 0);
20602 atomic_set(&global_nwo, 0);
20603 diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
20604 index 1c044b1..37a2a43 100644
20605 --- a/arch/x86/kernel/cpu/mcheck/p5.c
20606 +++ b/arch/x86/kernel/cpu/mcheck/p5.c
20607 @@ -11,6 +11,7 @@
20608 #include <asm/processor.h>
20609 #include <asm/mce.h>
20610 #include <asm/msr.h>
20611 +#include <asm/pgtable.h>
20612
20613 /* By default disabled */
20614 int mce_p5_enabled __read_mostly;
20615 @@ -49,7 +50,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
20616 if (!cpu_has(c, X86_FEATURE_MCE))
20617 return;
20618
20619 + pax_open_kernel();
20620 machine_check_vector = pentium_machine_check;
20621 + pax_close_kernel();
20622 /* Make sure the vector pointer is visible before we enable MCEs: */
20623 wmb();
20624
20625 diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
20626 index e9a701a..35317d6 100644
20627 --- a/arch/x86/kernel/cpu/mcheck/winchip.c
20628 +++ b/arch/x86/kernel/cpu/mcheck/winchip.c
20629 @@ -10,6 +10,7 @@
20630 #include <asm/processor.h>
20631 #include <asm/mce.h>
20632 #include <asm/msr.h>
20633 +#include <asm/pgtable.h>
20634
20635 /* Machine check handler for WinChip C6: */
20636 static void winchip_machine_check(struct pt_regs *regs, long error_code)
20637 @@ -23,7 +24,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
20638 {
20639 u32 lo, hi;
20640
20641 + pax_open_kernel();
20642 machine_check_vector = winchip_machine_check;
20643 + pax_close_kernel();
20644 /* Make sure the vector pointer is visible before we enable MCEs: */
20645 wmb();
20646
20647 diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
20648 index f961de9..8a9d332 100644
20649 --- a/arch/x86/kernel/cpu/mtrr/main.c
20650 +++ b/arch/x86/kernel/cpu/mtrr/main.c
20651 @@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
20652 u64 size_or_mask, size_and_mask;
20653 static bool mtrr_aps_delayed_init;
20654
20655 -static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
20656 +static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
20657
20658 const struct mtrr_ops *mtrr_if;
20659
20660 diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
20661 index df5e41f..816c719 100644
20662 --- a/arch/x86/kernel/cpu/mtrr/mtrr.h
20663 +++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
20664 @@ -25,7 +25,7 @@ struct mtrr_ops {
20665 int (*validate_add_page)(unsigned long base, unsigned long size,
20666 unsigned int type);
20667 int (*have_wrcomb)(void);
20668 -};
20669 +} __do_const;
20670
20671 extern int generic_get_free_region(unsigned long base, unsigned long size,
20672 int replace_reg);
20673 diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
20674 index 8a87a32..682a22a 100644
20675 --- a/arch/x86/kernel/cpu/perf_event.c
20676 +++ b/arch/x86/kernel/cpu/perf_event.c
20677 @@ -1348,7 +1348,7 @@ static void __init pmu_check_apic(void)
20678 pr_info("no hardware sampling interrupt available.\n");
20679 }
20680
20681 -static struct attribute_group x86_pmu_format_group = {
20682 +static attribute_group_no_const x86_pmu_format_group = {
20683 .name = "format",
20684 .attrs = NULL,
20685 };
20686 @@ -1447,7 +1447,7 @@ static struct attribute *events_attr[] = {
20687 NULL,
20688 };
20689
20690 -static struct attribute_group x86_pmu_events_group = {
20691 +static attribute_group_no_const x86_pmu_events_group = {
20692 .name = "events",
20693 .attrs = events_attr,
20694 };
20695 @@ -1958,7 +1958,7 @@ static unsigned long get_segment_base(unsigned int segment)
20696 if (idx > GDT_ENTRIES)
20697 return 0;
20698
20699 - desc = __this_cpu_ptr(&gdt_page.gdt[0]);
20700 + desc = get_cpu_gdt_table(smp_processor_id());
20701 }
20702
20703 return get_desc_base(desc + idx);
20704 @@ -2048,7 +2048,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
20705 break;
20706
20707 perf_callchain_store(entry, frame.return_address);
20708 - fp = frame.next_frame;
20709 + fp = (const void __force_user *)frame.next_frame;
20710 }
20711 }
20712
20713 diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
20714 index 639d128..e92d7e5 100644
20715 --- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
20716 +++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
20717 @@ -405,7 +405,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
20718 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
20719 {
20720 struct attribute **attrs;
20721 - struct attribute_group *attr_group;
20722 + attribute_group_no_const *attr_group;
20723 int i = 0, j;
20724
20725 while (amd_iommu_v2_event_descs[i].attr.attr.name)
20726 diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
20727 index f31a165..7b46cd8 100644
20728 --- a/arch/x86/kernel/cpu/perf_event_intel.c
20729 +++ b/arch/x86/kernel/cpu/perf_event_intel.c
20730 @@ -2247,10 +2247,10 @@ __init int intel_pmu_init(void)
20731 * v2 and above have a perf capabilities MSR
20732 */
20733 if (version > 1) {
20734 - u64 capabilities;
20735 + u64 capabilities = x86_pmu.intel_cap.capabilities;
20736
20737 - rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
20738 - x86_pmu.intel_cap.capabilities = capabilities;
20739 + if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
20740 + x86_pmu.intel_cap.capabilities = capabilities;
20741 }
20742
20743 intel_ds_init();
20744 diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
20745 index 4118f9f..f91d0ab 100644
20746 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
20747 +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
20748 @@ -3204,7 +3204,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
20749 static int __init uncore_type_init(struct intel_uncore_type *type)
20750 {
20751 struct intel_uncore_pmu *pmus;
20752 - struct attribute_group *attr_group;
20753 + attribute_group_no_const *attr_group;
20754 struct attribute **attrs;
20755 int i, j;
20756
20757 diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
20758 index a80ab71..4089da5 100644
20759 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
20760 +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
20761 @@ -498,7 +498,7 @@ struct intel_uncore_box {
20762 struct uncore_event_desc {
20763 struct kobj_attribute attr;
20764 const char *config;
20765 -};
20766 +} __do_const;
20767
20768 #define INTEL_UNCORE_EVENT_DESC(_name, _config) \
20769 { \
20770 diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
20771 index 7d9481c..99c7e4b 100644
20772 --- a/arch/x86/kernel/cpuid.c
20773 +++ b/arch/x86/kernel/cpuid.c
20774 @@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
20775 return notifier_from_errno(err);
20776 }
20777
20778 -static struct notifier_block __refdata cpuid_class_cpu_notifier =
20779 +static struct notifier_block cpuid_class_cpu_notifier =
20780 {
20781 .notifier_call = cpuid_class_cpu_callback,
20782 };
20783 diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
20784 index 18677a9..f67c45b 100644
20785 --- a/arch/x86/kernel/crash.c
20786 +++ b/arch/x86/kernel/crash.c
20787 @@ -58,10 +58,8 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
20788 {
20789 #ifdef CONFIG_X86_32
20790 struct pt_regs fixed_regs;
20791 -#endif
20792
20793 -#ifdef CONFIG_X86_32
20794 - if (!user_mode_vm(regs)) {
20795 + if (!user_mode(regs)) {
20796 crash_fixup_ss_esp(&fixed_regs, regs);
20797 regs = &fixed_regs;
20798 }
20799 diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
20800 index afa64ad..dce67dd 100644
20801 --- a/arch/x86/kernel/crash_dump_64.c
20802 +++ b/arch/x86/kernel/crash_dump_64.c
20803 @@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
20804 return -ENOMEM;
20805
20806 if (userbuf) {
20807 - if (copy_to_user(buf, vaddr + offset, csize)) {
20808 + if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
20809 iounmap(vaddr);
20810 return -EFAULT;
20811 }
20812 diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
20813 index 5d3fe8d..02e1429 100644
20814 --- a/arch/x86/kernel/doublefault.c
20815 +++ b/arch/x86/kernel/doublefault.c
20816 @@ -13,7 +13,7 @@
20817
20818 #define DOUBLEFAULT_STACKSIZE (1024)
20819 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
20820 -#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
20821 +#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
20822
20823 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
20824
20825 @@ -23,7 +23,7 @@ static void doublefault_fn(void)
20826 unsigned long gdt, tss;
20827
20828 native_store_gdt(&gdt_desc);
20829 - gdt = gdt_desc.address;
20830 + gdt = (unsigned long)gdt_desc.address;
20831
20832 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
20833
20834 @@ -60,10 +60,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
20835 /* 0x2 bit is always set */
20836 .flags = X86_EFLAGS_SF | 0x2,
20837 .sp = STACK_START,
20838 - .es = __USER_DS,
20839 + .es = __KERNEL_DS,
20840 .cs = __KERNEL_CS,
20841 .ss = __KERNEL_DS,
20842 - .ds = __USER_DS,
20843 + .ds = __KERNEL_DS,
20844 .fs = __KERNEL_PERCPU,
20845
20846 .__cr3 = __pa_nodebug(swapper_pg_dir),
20847 diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
20848 index deb6421..76bbc12 100644
20849 --- a/arch/x86/kernel/dumpstack.c
20850 +++ b/arch/x86/kernel/dumpstack.c
20851 @@ -2,6 +2,9 @@
20852 * Copyright (C) 1991, 1992 Linus Torvalds
20853 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
20854 */
20855 +#ifdef CONFIG_GRKERNSEC_HIDESYM
20856 +#define __INCLUDED_BY_HIDESYM 1
20857 +#endif
20858 #include <linux/kallsyms.h>
20859 #include <linux/kprobes.h>
20860 #include <linux/uaccess.h>
20861 @@ -35,16 +38,14 @@ void printk_address(unsigned long address, int reliable)
20862 static void
20863 print_ftrace_graph_addr(unsigned long addr, void *data,
20864 const struct stacktrace_ops *ops,
20865 - struct thread_info *tinfo, int *graph)
20866 + struct task_struct *task, int *graph)
20867 {
20868 - struct task_struct *task;
20869 unsigned long ret_addr;
20870 int index;
20871
20872 if (addr != (unsigned long)return_to_handler)
20873 return;
20874
20875 - task = tinfo->task;
20876 index = task->curr_ret_stack;
20877
20878 if (!task->ret_stack || index < *graph)
20879 @@ -61,7 +62,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
20880 static inline void
20881 print_ftrace_graph_addr(unsigned long addr, void *data,
20882 const struct stacktrace_ops *ops,
20883 - struct thread_info *tinfo, int *graph)
20884 + struct task_struct *task, int *graph)
20885 { }
20886 #endif
20887
20888 @@ -72,10 +73,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
20889 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
20890 */
20891
20892 -static inline int valid_stack_ptr(struct thread_info *tinfo,
20893 - void *p, unsigned int size, void *end)
20894 +static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
20895 {
20896 - void *t = tinfo;
20897 if (end) {
20898 if (p < end && p >= (end-THREAD_SIZE))
20899 return 1;
20900 @@ -86,14 +85,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
20901 }
20902
20903 unsigned long
20904 -print_context_stack(struct thread_info *tinfo,
20905 +print_context_stack(struct task_struct *task, void *stack_start,
20906 unsigned long *stack, unsigned long bp,
20907 const struct stacktrace_ops *ops, void *data,
20908 unsigned long *end, int *graph)
20909 {
20910 struct stack_frame *frame = (struct stack_frame *)bp;
20911
20912 - while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
20913 + while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
20914 unsigned long addr;
20915
20916 addr = *stack;
20917 @@ -105,7 +104,7 @@ print_context_stack(struct thread_info *tinfo,
20918 } else {
20919 ops->address(data, addr, 0);
20920 }
20921 - print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
20922 + print_ftrace_graph_addr(addr, data, ops, task, graph);
20923 }
20924 stack++;
20925 }
20926 @@ -114,7 +113,7 @@ print_context_stack(struct thread_info *tinfo,
20927 EXPORT_SYMBOL_GPL(print_context_stack);
20928
20929 unsigned long
20930 -print_context_stack_bp(struct thread_info *tinfo,
20931 +print_context_stack_bp(struct task_struct *task, void *stack_start,
20932 unsigned long *stack, unsigned long bp,
20933 const struct stacktrace_ops *ops, void *data,
20934 unsigned long *end, int *graph)
20935 @@ -122,7 +121,7 @@ print_context_stack_bp(struct thread_info *tinfo,
20936 struct stack_frame *frame = (struct stack_frame *)bp;
20937 unsigned long *ret_addr = &frame->return_address;
20938
20939 - while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
20940 + while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
20941 unsigned long addr = *ret_addr;
20942
20943 if (!__kernel_text_address(addr))
20944 @@ -131,7 +130,7 @@ print_context_stack_bp(struct thread_info *tinfo,
20945 ops->address(data, addr, 1);
20946 frame = frame->next_frame;
20947 ret_addr = &frame->return_address;
20948 - print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
20949 + print_ftrace_graph_addr(addr, data, ops, task, graph);
20950 }
20951
20952 return (unsigned long)frame;
20953 @@ -150,7 +149,7 @@ static int print_trace_stack(void *data, char *name)
20954 static void print_trace_address(void *data, unsigned long addr, int reliable)
20955 {
20956 touch_nmi_watchdog();
20957 - printk(data);
20958 + printk("%s", (char *)data);
20959 printk_address(addr, reliable);
20960 }
20961
20962 @@ -219,6 +218,8 @@ unsigned __kprobes long oops_begin(void)
20963 }
20964 EXPORT_SYMBOL_GPL(oops_begin);
20965
20966 +extern void gr_handle_kernel_exploit(void);
20967 +
20968 void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
20969 {
20970 if (regs && kexec_should_crash(current))
20971 @@ -240,7 +241,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
20972 panic("Fatal exception in interrupt");
20973 if (panic_on_oops)
20974 panic("Fatal exception");
20975 - do_exit(signr);
20976 +
20977 + gr_handle_kernel_exploit();
20978 +
20979 + do_group_exit(signr);
20980 }
20981
20982 int __kprobes __die(const char *str, struct pt_regs *regs, long err)
20983 @@ -268,7 +272,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
20984 print_modules();
20985 show_regs(regs);
20986 #ifdef CONFIG_X86_32
20987 - if (user_mode_vm(regs)) {
20988 + if (user_mode(regs)) {
20989 sp = regs->sp;
20990 ss = regs->ss & 0xffff;
20991 } else {
20992 @@ -296,7 +300,7 @@ void die(const char *str, struct pt_regs *regs, long err)
20993 unsigned long flags = oops_begin();
20994 int sig = SIGSEGV;
20995
20996 - if (!user_mode_vm(regs))
20997 + if (!user_mode(regs))
20998 report_bug(regs->ip, regs);
20999
21000 if (__die(str, regs, err))
21001 diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
21002 index f2a1770..540657f 100644
21003 --- a/arch/x86/kernel/dumpstack_32.c
21004 +++ b/arch/x86/kernel/dumpstack_32.c
21005 @@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21006 bp = stack_frame(task, regs);
21007
21008 for (;;) {
21009 - struct thread_info *context;
21010 + void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
21011
21012 - context = (struct thread_info *)
21013 - ((unsigned long)stack & (~(THREAD_SIZE - 1)));
21014 - bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph);
21015 + bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
21016
21017 - stack = (unsigned long *)context->previous_esp;
21018 - if (!stack)
21019 + if (stack_start == task_stack_page(task))
21020 break;
21021 + stack = *(unsigned long **)stack_start;
21022 if (ops->stack(data, "IRQ") < 0)
21023 break;
21024 touch_nmi_watchdog();
21025 @@ -87,27 +85,28 @@ void show_regs(struct pt_regs *regs)
21026 int i;
21027
21028 show_regs_print_info(KERN_EMERG);
21029 - __show_regs(regs, !user_mode_vm(regs));
21030 + __show_regs(regs, !user_mode(regs));
21031
21032 /*
21033 * When in-kernel, we also print out the stack and code at the
21034 * time of the fault..
21035 */
21036 - if (!user_mode_vm(regs)) {
21037 + if (!user_mode(regs)) {
21038 unsigned int code_prologue = code_bytes * 43 / 64;
21039 unsigned int code_len = code_bytes;
21040 unsigned char c;
21041 u8 *ip;
21042 + unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
21043
21044 pr_emerg("Stack:\n");
21045 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
21046
21047 pr_emerg("Code:");
21048
21049 - ip = (u8 *)regs->ip - code_prologue;
21050 + ip = (u8 *)regs->ip - code_prologue + cs_base;
21051 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
21052 /* try starting at IP */
21053 - ip = (u8 *)regs->ip;
21054 + ip = (u8 *)regs->ip + cs_base;
21055 code_len = code_len - code_prologue + 1;
21056 }
21057 for (i = 0; i < code_len; i++, ip++) {
21058 @@ -116,7 +115,7 @@ void show_regs(struct pt_regs *regs)
21059 pr_cont(" Bad EIP value.");
21060 break;
21061 }
21062 - if (ip == (u8 *)regs->ip)
21063 + if (ip == (u8 *)regs->ip + cs_base)
21064 pr_cont(" <%02x>", c);
21065 else
21066 pr_cont(" %02x", c);
21067 @@ -129,6 +128,7 @@ int is_valid_bugaddr(unsigned long ip)
21068 {
21069 unsigned short ud2;
21070
21071 + ip = ktla_ktva(ip);
21072 if (ip < PAGE_OFFSET)
21073 return 0;
21074 if (probe_kernel_address((unsigned short *)ip, ud2))
21075 @@ -136,3 +136,15 @@ int is_valid_bugaddr(unsigned long ip)
21076
21077 return ud2 == 0x0b0f;
21078 }
21079 +
21080 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
21081 +void pax_check_alloca(unsigned long size)
21082 +{
21083 + unsigned long sp = (unsigned long)&sp, stack_left;
21084 +
21085 + /* all kernel stacks are of the same size */
21086 + stack_left = sp & (THREAD_SIZE - 1);
21087 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
21088 +}
21089 +EXPORT_SYMBOL(pax_check_alloca);
21090 +#endif
21091 diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
21092 index addb207..99635fa 100644
21093 --- a/arch/x86/kernel/dumpstack_64.c
21094 +++ b/arch/x86/kernel/dumpstack_64.c
21095 @@ -119,9 +119,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21096 unsigned long *irq_stack_end =
21097 (unsigned long *)per_cpu(irq_stack_ptr, cpu);
21098 unsigned used = 0;
21099 - struct thread_info *tinfo;
21100 int graph = 0;
21101 unsigned long dummy;
21102 + void *stack_start;
21103
21104 if (!task)
21105 task = current;
21106 @@ -142,10 +142,10 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21107 * current stack address. If the stacks consist of nested
21108 * exceptions
21109 */
21110 - tinfo = task_thread_info(task);
21111 for (;;) {
21112 char *id;
21113 unsigned long *estack_end;
21114 +
21115 estack_end = in_exception_stack(cpu, (unsigned long)stack,
21116 &used, &id);
21117
21118 @@ -153,7 +153,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21119 if (ops->stack(data, id) < 0)
21120 break;
21121
21122 - bp = ops->walk_stack(tinfo, stack, bp, ops,
21123 + bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
21124 data, estack_end, &graph);
21125 ops->stack(data, "<EOE>");
21126 /*
21127 @@ -161,6 +161,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21128 * second-to-last pointer (index -2 to end) in the
21129 * exception stack:
21130 */
21131 + if ((u16)estack_end[-1] != __KERNEL_DS)
21132 + goto out;
21133 stack = (unsigned long *) estack_end[-2];
21134 continue;
21135 }
21136 @@ -172,7 +174,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21137 if (in_irq_stack(stack, irq_stack, irq_stack_end)) {
21138 if (ops->stack(data, "IRQ") < 0)
21139 break;
21140 - bp = ops->walk_stack(tinfo, stack, bp,
21141 + bp = ops->walk_stack(task, irq_stack, stack, bp,
21142 ops, data, irq_stack_end, &graph);
21143 /*
21144 * We link to the next stack (which would be
21145 @@ -191,7 +193,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21146 /*
21147 * This handles the process stack:
21148 */
21149 - bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
21150 + stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
21151 + bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
21152 +out:
21153 put_cpu();
21154 }
21155 EXPORT_SYMBOL(dump_trace);
21156 @@ -300,3 +304,50 @@ int is_valid_bugaddr(unsigned long ip)
21157
21158 return ud2 == 0x0b0f;
21159 }
21160 +
21161 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
21162 +void pax_check_alloca(unsigned long size)
21163 +{
21164 + unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
21165 + unsigned cpu, used;
21166 + char *id;
21167 +
21168 + /* check the process stack first */
21169 + stack_start = (unsigned long)task_stack_page(current);
21170 + stack_end = stack_start + THREAD_SIZE;
21171 + if (likely(stack_start <= sp && sp < stack_end)) {
21172 + unsigned long stack_left = sp & (THREAD_SIZE - 1);
21173 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
21174 + return;
21175 + }
21176 +
21177 + cpu = get_cpu();
21178 +
21179 + /* check the irq stacks */
21180 + stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
21181 + stack_start = stack_end - IRQ_STACK_SIZE;
21182 + if (stack_start <= sp && sp < stack_end) {
21183 + unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
21184 + put_cpu();
21185 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
21186 + return;
21187 + }
21188 +
21189 + /* check the exception stacks */
21190 + used = 0;
21191 + stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
21192 + stack_start = stack_end - EXCEPTION_STKSZ;
21193 + if (stack_end && stack_start <= sp && sp < stack_end) {
21194 + unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
21195 + put_cpu();
21196 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
21197 + return;
21198 + }
21199 +
21200 + put_cpu();
21201 +
21202 + /* unknown stack */
21203 + BUG();
21204 +}
21205 +EXPORT_SYMBOL(pax_check_alloca);
21206 +#endif
21207 diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
21208 index 174da5f..5e55606 100644
21209 --- a/arch/x86/kernel/e820.c
21210 +++ b/arch/x86/kernel/e820.c
21211 @@ -803,8 +803,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
21212
21213 static void early_panic(char *msg)
21214 {
21215 - early_printk(msg);
21216 - panic(msg);
21217 + early_printk("%s", msg);
21218 + panic("%s", msg);
21219 }
21220
21221 static int userdef __initdata;
21222 diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
21223 index d15f575..d692043 100644
21224 --- a/arch/x86/kernel/early_printk.c
21225 +++ b/arch/x86/kernel/early_printk.c
21226 @@ -7,6 +7,7 @@
21227 #include <linux/pci_regs.h>
21228 #include <linux/pci_ids.h>
21229 #include <linux/errno.h>
21230 +#include <linux/sched.h>
21231 #include <asm/io.h>
21232 #include <asm/processor.h>
21233 #include <asm/fcntl.h>
21234 diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
21235 index f0dcb0c..9f39b80 100644
21236 --- a/arch/x86/kernel/entry_32.S
21237 +++ b/arch/x86/kernel/entry_32.S
21238 @@ -177,13 +177,153 @@
21239 /*CFI_REL_OFFSET gs, PT_GS*/
21240 .endm
21241 .macro SET_KERNEL_GS reg
21242 +
21243 +#ifdef CONFIG_CC_STACKPROTECTOR
21244 movl $(__KERNEL_STACK_CANARY), \reg
21245 +#elif defined(CONFIG_PAX_MEMORY_UDEREF)
21246 + movl $(__USER_DS), \reg
21247 +#else
21248 + xorl \reg, \reg
21249 +#endif
21250 +
21251 movl \reg, %gs
21252 .endm
21253
21254 #endif /* CONFIG_X86_32_LAZY_GS */
21255
21256 -.macro SAVE_ALL
21257 +.macro pax_enter_kernel
21258 +#ifdef CONFIG_PAX_KERNEXEC
21259 + call pax_enter_kernel
21260 +#endif
21261 +.endm
21262 +
21263 +.macro pax_exit_kernel
21264 +#ifdef CONFIG_PAX_KERNEXEC
21265 + call pax_exit_kernel
21266 +#endif
21267 +.endm
21268 +
21269 +#ifdef CONFIG_PAX_KERNEXEC
21270 +ENTRY(pax_enter_kernel)
21271 +#ifdef CONFIG_PARAVIRT
21272 + pushl %eax
21273 + pushl %ecx
21274 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
21275 + mov %eax, %esi
21276 +#else
21277 + mov %cr0, %esi
21278 +#endif
21279 + bts $16, %esi
21280 + jnc 1f
21281 + mov %cs, %esi
21282 + cmp $__KERNEL_CS, %esi
21283 + jz 3f
21284 + ljmp $__KERNEL_CS, $3f
21285 +1: ljmp $__KERNEXEC_KERNEL_CS, $2f
21286 +2:
21287 +#ifdef CONFIG_PARAVIRT
21288 + mov %esi, %eax
21289 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
21290 +#else
21291 + mov %esi, %cr0
21292 +#endif
21293 +3:
21294 +#ifdef CONFIG_PARAVIRT
21295 + popl %ecx
21296 + popl %eax
21297 +#endif
21298 + ret
21299 +ENDPROC(pax_enter_kernel)
21300 +
21301 +ENTRY(pax_exit_kernel)
21302 +#ifdef CONFIG_PARAVIRT
21303 + pushl %eax
21304 + pushl %ecx
21305 +#endif
21306 + mov %cs, %esi
21307 + cmp $__KERNEXEC_KERNEL_CS, %esi
21308 + jnz 2f
21309 +#ifdef CONFIG_PARAVIRT
21310 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
21311 + mov %eax, %esi
21312 +#else
21313 + mov %cr0, %esi
21314 +#endif
21315 + btr $16, %esi
21316 + ljmp $__KERNEL_CS, $1f
21317 +1:
21318 +#ifdef CONFIG_PARAVIRT
21319 + mov %esi, %eax
21320 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
21321 +#else
21322 + mov %esi, %cr0
21323 +#endif
21324 +2:
21325 +#ifdef CONFIG_PARAVIRT
21326 + popl %ecx
21327 + popl %eax
21328 +#endif
21329 + ret
21330 +ENDPROC(pax_exit_kernel)
21331 +#endif
21332 +
21333 + .macro pax_erase_kstack
21334 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
21335 + call pax_erase_kstack
21336 +#endif
21337 + .endm
21338 +
21339 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
21340 +/*
21341 + * ebp: thread_info
21342 + */
21343 +ENTRY(pax_erase_kstack)
21344 + pushl %edi
21345 + pushl %ecx
21346 + pushl %eax
21347 +
21348 + mov TI_lowest_stack(%ebp), %edi
21349 + mov $-0xBEEF, %eax
21350 + std
21351 +
21352 +1: mov %edi, %ecx
21353 + and $THREAD_SIZE_asm - 1, %ecx
21354 + shr $2, %ecx
21355 + repne scasl
21356 + jecxz 2f
21357 +
21358 + cmp $2*16, %ecx
21359 + jc 2f
21360 +
21361 + mov $2*16, %ecx
21362 + repe scasl
21363 + jecxz 2f
21364 + jne 1b
21365 +
21366 +2: cld
21367 + mov %esp, %ecx
21368 + sub %edi, %ecx
21369 +
21370 + cmp $THREAD_SIZE_asm, %ecx
21371 + jb 3f
21372 + ud2
21373 +3:
21374 +
21375 + shr $2, %ecx
21376 + rep stosl
21377 +
21378 + mov TI_task_thread_sp0(%ebp), %edi
21379 + sub $128, %edi
21380 + mov %edi, TI_lowest_stack(%ebp)
21381 +
21382 + popl %eax
21383 + popl %ecx
21384 + popl %edi
21385 + ret
21386 +ENDPROC(pax_erase_kstack)
21387 +#endif
21388 +
21389 +.macro __SAVE_ALL _DS
21390 cld
21391 PUSH_GS
21392 pushl_cfi %fs
21393 @@ -206,7 +346,7 @@
21394 CFI_REL_OFFSET ecx, 0
21395 pushl_cfi %ebx
21396 CFI_REL_OFFSET ebx, 0
21397 - movl $(__USER_DS), %edx
21398 + movl $\_DS, %edx
21399 movl %edx, %ds
21400 movl %edx, %es
21401 movl $(__KERNEL_PERCPU), %edx
21402 @@ -214,6 +354,15 @@
21403 SET_KERNEL_GS %edx
21404 .endm
21405
21406 +.macro SAVE_ALL
21407 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
21408 + __SAVE_ALL __KERNEL_DS
21409 + pax_enter_kernel
21410 +#else
21411 + __SAVE_ALL __USER_DS
21412 +#endif
21413 +.endm
21414 +
21415 .macro RESTORE_INT_REGS
21416 popl_cfi %ebx
21417 CFI_RESTORE ebx
21418 @@ -297,7 +446,7 @@ ENTRY(ret_from_fork)
21419 popfl_cfi
21420 jmp syscall_exit
21421 CFI_ENDPROC
21422 -END(ret_from_fork)
21423 +ENDPROC(ret_from_fork)
21424
21425 ENTRY(ret_from_kernel_thread)
21426 CFI_STARTPROC
21427 @@ -344,7 +493,15 @@ ret_from_intr:
21428 andl $SEGMENT_RPL_MASK, %eax
21429 #endif
21430 cmpl $USER_RPL, %eax
21431 +
21432 +#ifdef CONFIG_PAX_KERNEXEC
21433 + jae resume_userspace
21434 +
21435 + pax_exit_kernel
21436 + jmp resume_kernel
21437 +#else
21438 jb resume_kernel # not returning to v8086 or userspace
21439 +#endif
21440
21441 ENTRY(resume_userspace)
21442 LOCKDEP_SYS_EXIT
21443 @@ -356,8 +513,8 @@ ENTRY(resume_userspace)
21444 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
21445 # int/exception return?
21446 jne work_pending
21447 - jmp restore_all
21448 -END(ret_from_exception)
21449 + jmp restore_all_pax
21450 +ENDPROC(ret_from_exception)
21451
21452 #ifdef CONFIG_PREEMPT
21453 ENTRY(resume_kernel)
21454 @@ -372,7 +529,7 @@ need_resched:
21455 jz restore_all
21456 call preempt_schedule_irq
21457 jmp need_resched
21458 -END(resume_kernel)
21459 +ENDPROC(resume_kernel)
21460 #endif
21461 CFI_ENDPROC
21462 /*
21463 @@ -406,30 +563,45 @@ sysenter_past_esp:
21464 /*CFI_REL_OFFSET cs, 0*/
21465 /*
21466 * Push current_thread_info()->sysenter_return to the stack.
21467 - * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
21468 - * pushed above; +8 corresponds to copy_thread's esp0 setting.
21469 */
21470 - pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
21471 + pushl_cfi $0
21472 CFI_REL_OFFSET eip, 0
21473
21474 pushl_cfi %eax
21475 SAVE_ALL
21476 + GET_THREAD_INFO(%ebp)
21477 + movl TI_sysenter_return(%ebp),%ebp
21478 + movl %ebp,PT_EIP(%esp)
21479 ENABLE_INTERRUPTS(CLBR_NONE)
21480
21481 /*
21482 * Load the potential sixth argument from user stack.
21483 * Careful about security.
21484 */
21485 + movl PT_OLDESP(%esp),%ebp
21486 +
21487 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21488 + mov PT_OLDSS(%esp),%ds
21489 +1: movl %ds:(%ebp),%ebp
21490 + push %ss
21491 + pop %ds
21492 +#else
21493 cmpl $__PAGE_OFFSET-3,%ebp
21494 jae syscall_fault
21495 ASM_STAC
21496 1: movl (%ebp),%ebp
21497 ASM_CLAC
21498 +#endif
21499 +
21500 movl %ebp,PT_EBP(%esp)
21501 _ASM_EXTABLE(1b,syscall_fault)
21502
21503 GET_THREAD_INFO(%ebp)
21504
21505 +#ifdef CONFIG_PAX_RANDKSTACK
21506 + pax_erase_kstack
21507 +#endif
21508 +
21509 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
21510 jnz sysenter_audit
21511 sysenter_do_call:
21512 @@ -444,12 +616,24 @@ sysenter_do_call:
21513 testl $_TIF_ALLWORK_MASK, %ecx
21514 jne sysexit_audit
21515 sysenter_exit:
21516 +
21517 +#ifdef CONFIG_PAX_RANDKSTACK
21518 + pushl_cfi %eax
21519 + movl %esp, %eax
21520 + call pax_randomize_kstack
21521 + popl_cfi %eax
21522 +#endif
21523 +
21524 + pax_erase_kstack
21525 +
21526 /* if something modifies registers it must also disable sysexit */
21527 movl PT_EIP(%esp), %edx
21528 movl PT_OLDESP(%esp), %ecx
21529 xorl %ebp,%ebp
21530 TRACE_IRQS_ON
21531 1: mov PT_FS(%esp), %fs
21532 +2: mov PT_DS(%esp), %ds
21533 +3: mov PT_ES(%esp), %es
21534 PTGS_TO_GS
21535 ENABLE_INTERRUPTS_SYSEXIT
21536
21537 @@ -466,6 +650,9 @@ sysenter_audit:
21538 movl %eax,%edx /* 2nd arg: syscall number */
21539 movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
21540 call __audit_syscall_entry
21541 +
21542 + pax_erase_kstack
21543 +
21544 pushl_cfi %ebx
21545 movl PT_EAX(%esp),%eax /* reload syscall number */
21546 jmp sysenter_do_call
21547 @@ -491,10 +678,16 @@ sysexit_audit:
21548
21549 CFI_ENDPROC
21550 .pushsection .fixup,"ax"
21551 -2: movl $0,PT_FS(%esp)
21552 +4: movl $0,PT_FS(%esp)
21553 + jmp 1b
21554 +5: movl $0,PT_DS(%esp)
21555 + jmp 1b
21556 +6: movl $0,PT_ES(%esp)
21557 jmp 1b
21558 .popsection
21559 - _ASM_EXTABLE(1b,2b)
21560 + _ASM_EXTABLE(1b,4b)
21561 + _ASM_EXTABLE(2b,5b)
21562 + _ASM_EXTABLE(3b,6b)
21563 PTGS_TO_GS_EX
21564 ENDPROC(ia32_sysenter_target)
21565
21566 @@ -509,6 +702,11 @@ ENTRY(system_call)
21567 pushl_cfi %eax # save orig_eax
21568 SAVE_ALL
21569 GET_THREAD_INFO(%ebp)
21570 +
21571 +#ifdef CONFIG_PAX_RANDKSTACK
21572 + pax_erase_kstack
21573 +#endif
21574 +
21575 # system call tracing in operation / emulation
21576 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
21577 jnz syscall_trace_entry
21578 @@ -527,6 +725,15 @@ syscall_exit:
21579 testl $_TIF_ALLWORK_MASK, %ecx # current->work
21580 jne syscall_exit_work
21581
21582 +restore_all_pax:
21583 +
21584 +#ifdef CONFIG_PAX_RANDKSTACK
21585 + movl %esp, %eax
21586 + call pax_randomize_kstack
21587 +#endif
21588 +
21589 + pax_erase_kstack
21590 +
21591 restore_all:
21592 TRACE_IRQS_IRET
21593 restore_all_notrace:
21594 @@ -583,14 +790,34 @@ ldt_ss:
21595 * compensating for the offset by changing to the ESPFIX segment with
21596 * a base address that matches for the difference.
21597 */
21598 -#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
21599 +#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
21600 mov %esp, %edx /* load kernel esp */
21601 mov PT_OLDESP(%esp), %eax /* load userspace esp */
21602 mov %dx, %ax /* eax: new kernel esp */
21603 sub %eax, %edx /* offset (low word is 0) */
21604 +#ifdef CONFIG_SMP
21605 + movl PER_CPU_VAR(cpu_number), %ebx
21606 + shll $PAGE_SHIFT_asm, %ebx
21607 + addl $cpu_gdt_table, %ebx
21608 +#else
21609 + movl $cpu_gdt_table, %ebx
21610 +#endif
21611 shr $16, %edx
21612 - mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
21613 - mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
21614 +
21615 +#ifdef CONFIG_PAX_KERNEXEC
21616 + mov %cr0, %esi
21617 + btr $16, %esi
21618 + mov %esi, %cr0
21619 +#endif
21620 +
21621 + mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
21622 + mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
21623 +
21624 +#ifdef CONFIG_PAX_KERNEXEC
21625 + bts $16, %esi
21626 + mov %esi, %cr0
21627 +#endif
21628 +
21629 pushl_cfi $__ESPFIX_SS
21630 pushl_cfi %eax /* new kernel esp */
21631 /* Disable interrupts, but do not irqtrace this section: we
21632 @@ -619,20 +846,18 @@ work_resched:
21633 movl TI_flags(%ebp), %ecx
21634 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
21635 # than syscall tracing?
21636 - jz restore_all
21637 + jz restore_all_pax
21638 testb $_TIF_NEED_RESCHED, %cl
21639 jnz work_resched
21640
21641 work_notifysig: # deal with pending signals and
21642 # notify-resume requests
21643 + movl %esp, %eax
21644 #ifdef CONFIG_VM86
21645 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
21646 - movl %esp, %eax
21647 jne work_notifysig_v86 # returning to kernel-space or
21648 # vm86-space
21649 1:
21650 -#else
21651 - movl %esp, %eax
21652 #endif
21653 TRACE_IRQS_ON
21654 ENABLE_INTERRUPTS(CLBR_NONE)
21655 @@ -653,7 +878,7 @@ work_notifysig_v86:
21656 movl %eax, %esp
21657 jmp 1b
21658 #endif
21659 -END(work_pending)
21660 +ENDPROC(work_pending)
21661
21662 # perform syscall exit tracing
21663 ALIGN
21664 @@ -661,11 +886,14 @@ syscall_trace_entry:
21665 movl $-ENOSYS,PT_EAX(%esp)
21666 movl %esp, %eax
21667 call syscall_trace_enter
21668 +
21669 + pax_erase_kstack
21670 +
21671 /* What it returned is what we'll actually use. */
21672 cmpl $(NR_syscalls), %eax
21673 jnae syscall_call
21674 jmp syscall_exit
21675 -END(syscall_trace_entry)
21676 +ENDPROC(syscall_trace_entry)
21677
21678 # perform syscall exit tracing
21679 ALIGN
21680 @@ -678,21 +906,25 @@ syscall_exit_work:
21681 movl %esp, %eax
21682 call syscall_trace_leave
21683 jmp resume_userspace
21684 -END(syscall_exit_work)
21685 +ENDPROC(syscall_exit_work)
21686 CFI_ENDPROC
21687
21688 RING0_INT_FRAME # can't unwind into user space anyway
21689 syscall_fault:
21690 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21691 + push %ss
21692 + pop %ds
21693 +#endif
21694 ASM_CLAC
21695 GET_THREAD_INFO(%ebp)
21696 movl $-EFAULT,PT_EAX(%esp)
21697 jmp resume_userspace
21698 -END(syscall_fault)
21699 +ENDPROC(syscall_fault)
21700
21701 syscall_badsys:
21702 movl $-ENOSYS,PT_EAX(%esp)
21703 jmp resume_userspace
21704 -END(syscall_badsys)
21705 +ENDPROC(syscall_badsys)
21706 CFI_ENDPROC
21707 /*
21708 * End of kprobes section
21709 @@ -708,8 +940,15 @@ END(syscall_badsys)
21710 * normal stack and adjusts ESP with the matching offset.
21711 */
21712 /* fixup the stack */
21713 - mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
21714 - mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
21715 +#ifdef CONFIG_SMP
21716 + movl PER_CPU_VAR(cpu_number), %ebx
21717 + shll $PAGE_SHIFT_asm, %ebx
21718 + addl $cpu_gdt_table, %ebx
21719 +#else
21720 + movl $cpu_gdt_table, %ebx
21721 +#endif
21722 + mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
21723 + mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
21724 shl $16, %eax
21725 addl %esp, %eax /* the adjusted stack pointer */
21726 pushl_cfi $__KERNEL_DS
21727 @@ -762,7 +1001,7 @@ vector=vector+1
21728 .endr
21729 2: jmp common_interrupt
21730 .endr
21731 -END(irq_entries_start)
21732 +ENDPROC(irq_entries_start)
21733
21734 .previous
21735 END(interrupt)
21736 @@ -823,7 +1062,7 @@ ENTRY(coprocessor_error)
21737 pushl_cfi $do_coprocessor_error
21738 jmp error_code
21739 CFI_ENDPROC
21740 -END(coprocessor_error)
21741 +ENDPROC(coprocessor_error)
21742
21743 ENTRY(simd_coprocessor_error)
21744 RING0_INT_FRAME
21745 @@ -836,7 +1075,7 @@ ENTRY(simd_coprocessor_error)
21746 .section .altinstructions,"a"
21747 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
21748 .previous
21749 -.section .altinstr_replacement,"ax"
21750 +.section .altinstr_replacement,"a"
21751 663: pushl $do_simd_coprocessor_error
21752 664:
21753 .previous
21754 @@ -845,7 +1084,7 @@ ENTRY(simd_coprocessor_error)
21755 #endif
21756 jmp error_code
21757 CFI_ENDPROC
21758 -END(simd_coprocessor_error)
21759 +ENDPROC(simd_coprocessor_error)
21760
21761 ENTRY(device_not_available)
21762 RING0_INT_FRAME
21763 @@ -854,18 +1093,18 @@ ENTRY(device_not_available)
21764 pushl_cfi $do_device_not_available
21765 jmp error_code
21766 CFI_ENDPROC
21767 -END(device_not_available)
21768 +ENDPROC(device_not_available)
21769
21770 #ifdef CONFIG_PARAVIRT
21771 ENTRY(native_iret)
21772 iret
21773 _ASM_EXTABLE(native_iret, iret_exc)
21774 -END(native_iret)
21775 +ENDPROC(native_iret)
21776
21777 ENTRY(native_irq_enable_sysexit)
21778 sti
21779 sysexit
21780 -END(native_irq_enable_sysexit)
21781 +ENDPROC(native_irq_enable_sysexit)
21782 #endif
21783
21784 ENTRY(overflow)
21785 @@ -875,7 +1114,7 @@ ENTRY(overflow)
21786 pushl_cfi $do_overflow
21787 jmp error_code
21788 CFI_ENDPROC
21789 -END(overflow)
21790 +ENDPROC(overflow)
21791
21792 ENTRY(bounds)
21793 RING0_INT_FRAME
21794 @@ -884,7 +1123,7 @@ ENTRY(bounds)
21795 pushl_cfi $do_bounds
21796 jmp error_code
21797 CFI_ENDPROC
21798 -END(bounds)
21799 +ENDPROC(bounds)
21800
21801 ENTRY(invalid_op)
21802 RING0_INT_FRAME
21803 @@ -893,7 +1132,7 @@ ENTRY(invalid_op)
21804 pushl_cfi $do_invalid_op
21805 jmp error_code
21806 CFI_ENDPROC
21807 -END(invalid_op)
21808 +ENDPROC(invalid_op)
21809
21810 ENTRY(coprocessor_segment_overrun)
21811 RING0_INT_FRAME
21812 @@ -902,7 +1141,7 @@ ENTRY(coprocessor_segment_overrun)
21813 pushl_cfi $do_coprocessor_segment_overrun
21814 jmp error_code
21815 CFI_ENDPROC
21816 -END(coprocessor_segment_overrun)
21817 +ENDPROC(coprocessor_segment_overrun)
21818
21819 ENTRY(invalid_TSS)
21820 RING0_EC_FRAME
21821 @@ -910,7 +1149,7 @@ ENTRY(invalid_TSS)
21822 pushl_cfi $do_invalid_TSS
21823 jmp error_code
21824 CFI_ENDPROC
21825 -END(invalid_TSS)
21826 +ENDPROC(invalid_TSS)
21827
21828 ENTRY(segment_not_present)
21829 RING0_EC_FRAME
21830 @@ -918,7 +1157,7 @@ ENTRY(segment_not_present)
21831 pushl_cfi $do_segment_not_present
21832 jmp error_code
21833 CFI_ENDPROC
21834 -END(segment_not_present)
21835 +ENDPROC(segment_not_present)
21836
21837 ENTRY(stack_segment)
21838 RING0_EC_FRAME
21839 @@ -926,7 +1165,7 @@ ENTRY(stack_segment)
21840 pushl_cfi $do_stack_segment
21841 jmp error_code
21842 CFI_ENDPROC
21843 -END(stack_segment)
21844 +ENDPROC(stack_segment)
21845
21846 ENTRY(alignment_check)
21847 RING0_EC_FRAME
21848 @@ -934,7 +1173,7 @@ ENTRY(alignment_check)
21849 pushl_cfi $do_alignment_check
21850 jmp error_code
21851 CFI_ENDPROC
21852 -END(alignment_check)
21853 +ENDPROC(alignment_check)
21854
21855 ENTRY(divide_error)
21856 RING0_INT_FRAME
21857 @@ -943,7 +1182,7 @@ ENTRY(divide_error)
21858 pushl_cfi $do_divide_error
21859 jmp error_code
21860 CFI_ENDPROC
21861 -END(divide_error)
21862 +ENDPROC(divide_error)
21863
21864 #ifdef CONFIG_X86_MCE
21865 ENTRY(machine_check)
21866 @@ -953,7 +1192,7 @@ ENTRY(machine_check)
21867 pushl_cfi machine_check_vector
21868 jmp error_code
21869 CFI_ENDPROC
21870 -END(machine_check)
21871 +ENDPROC(machine_check)
21872 #endif
21873
21874 ENTRY(spurious_interrupt_bug)
21875 @@ -963,7 +1202,7 @@ ENTRY(spurious_interrupt_bug)
21876 pushl_cfi $do_spurious_interrupt_bug
21877 jmp error_code
21878 CFI_ENDPROC
21879 -END(spurious_interrupt_bug)
21880 +ENDPROC(spurious_interrupt_bug)
21881 /*
21882 * End of kprobes section
21883 */
21884 @@ -1073,7 +1312,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
21885
21886 ENTRY(mcount)
21887 ret
21888 -END(mcount)
21889 +ENDPROC(mcount)
21890
21891 ENTRY(ftrace_caller)
21892 cmpl $0, function_trace_stop
21893 @@ -1106,7 +1345,7 @@ ftrace_graph_call:
21894 .globl ftrace_stub
21895 ftrace_stub:
21896 ret
21897 -END(ftrace_caller)
21898 +ENDPROC(ftrace_caller)
21899
21900 ENTRY(ftrace_regs_caller)
21901 pushf /* push flags before compare (in cs location) */
21902 @@ -1210,7 +1449,7 @@ trace:
21903 popl %ecx
21904 popl %eax
21905 jmp ftrace_stub
21906 -END(mcount)
21907 +ENDPROC(mcount)
21908 #endif /* CONFIG_DYNAMIC_FTRACE */
21909 #endif /* CONFIG_FUNCTION_TRACER */
21910
21911 @@ -1228,7 +1467,7 @@ ENTRY(ftrace_graph_caller)
21912 popl %ecx
21913 popl %eax
21914 ret
21915 -END(ftrace_graph_caller)
21916 +ENDPROC(ftrace_graph_caller)
21917
21918 .globl return_to_handler
21919 return_to_handler:
21920 @@ -1284,15 +1523,18 @@ error_code:
21921 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
21922 REG_TO_PTGS %ecx
21923 SET_KERNEL_GS %ecx
21924 - movl $(__USER_DS), %ecx
21925 + movl $(__KERNEL_DS), %ecx
21926 movl %ecx, %ds
21927 movl %ecx, %es
21928 +
21929 + pax_enter_kernel
21930 +
21931 TRACE_IRQS_OFF
21932 movl %esp,%eax # pt_regs pointer
21933 call *%edi
21934 jmp ret_from_exception
21935 CFI_ENDPROC
21936 -END(page_fault)
21937 +ENDPROC(page_fault)
21938
21939 /*
21940 * Debug traps and NMI can happen at the one SYSENTER instruction
21941 @@ -1335,7 +1577,7 @@ debug_stack_correct:
21942 call do_debug
21943 jmp ret_from_exception
21944 CFI_ENDPROC
21945 -END(debug)
21946 +ENDPROC(debug)
21947
21948 /*
21949 * NMI is doubly nasty. It can happen _while_ we're handling
21950 @@ -1373,6 +1615,9 @@ nmi_stack_correct:
21951 xorl %edx,%edx # zero error code
21952 movl %esp,%eax # pt_regs pointer
21953 call do_nmi
21954 +
21955 + pax_exit_kernel
21956 +
21957 jmp restore_all_notrace
21958 CFI_ENDPROC
21959
21960 @@ -1409,12 +1654,15 @@ nmi_espfix_stack:
21961 FIXUP_ESPFIX_STACK # %eax == %esp
21962 xorl %edx,%edx # zero error code
21963 call do_nmi
21964 +
21965 + pax_exit_kernel
21966 +
21967 RESTORE_REGS
21968 lss 12+4(%esp), %esp # back to espfix stack
21969 CFI_ADJUST_CFA_OFFSET -24
21970 jmp irq_return
21971 CFI_ENDPROC
21972 -END(nmi)
21973 +ENDPROC(nmi)
21974
21975 ENTRY(int3)
21976 RING0_INT_FRAME
21977 @@ -1427,14 +1675,14 @@ ENTRY(int3)
21978 call do_int3
21979 jmp ret_from_exception
21980 CFI_ENDPROC
21981 -END(int3)
21982 +ENDPROC(int3)
21983
21984 ENTRY(general_protection)
21985 RING0_EC_FRAME
21986 pushl_cfi $do_general_protection
21987 jmp error_code
21988 CFI_ENDPROC
21989 -END(general_protection)
21990 +ENDPROC(general_protection)
21991
21992 #ifdef CONFIG_KVM_GUEST
21993 ENTRY(async_page_fault)
21994 @@ -1443,7 +1691,7 @@ ENTRY(async_page_fault)
21995 pushl_cfi $do_async_page_fault
21996 jmp error_code
21997 CFI_ENDPROC
21998 -END(async_page_fault)
21999 +ENDPROC(async_page_fault)
22000 #endif
22001
22002 /*
22003 diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
22004 index b077f4c..8e0df9f 100644
22005 --- a/arch/x86/kernel/entry_64.S
22006 +++ b/arch/x86/kernel/entry_64.S
22007 @@ -59,6 +59,8 @@
22008 #include <asm/context_tracking.h>
22009 #include <asm/smap.h>
22010 #include <linux/err.h>
22011 +#include <asm/pgtable.h>
22012 +#include <asm/alternative-asm.h>
22013
22014 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
22015 #include <linux/elf-em.h>
22016 @@ -80,8 +82,9 @@
22017 #ifdef CONFIG_DYNAMIC_FTRACE
22018
22019 ENTRY(function_hook)
22020 + pax_force_retaddr
22021 retq
22022 -END(function_hook)
22023 +ENDPROC(function_hook)
22024
22025 /* skip is set if stack has been adjusted */
22026 .macro ftrace_caller_setup skip=0
22027 @@ -122,8 +125,9 @@ GLOBAL(ftrace_graph_call)
22028 #endif
22029
22030 GLOBAL(ftrace_stub)
22031 + pax_force_retaddr
22032 retq
22033 -END(ftrace_caller)
22034 +ENDPROC(ftrace_caller)
22035
22036 ENTRY(ftrace_regs_caller)
22037 /* Save the current flags before compare (in SS location)*/
22038 @@ -191,7 +195,7 @@ ftrace_restore_flags:
22039 popfq
22040 jmp ftrace_stub
22041
22042 -END(ftrace_regs_caller)
22043 +ENDPROC(ftrace_regs_caller)
22044
22045
22046 #else /* ! CONFIG_DYNAMIC_FTRACE */
22047 @@ -212,6 +216,7 @@ ENTRY(function_hook)
22048 #endif
22049
22050 GLOBAL(ftrace_stub)
22051 + pax_force_retaddr
22052 retq
22053
22054 trace:
22055 @@ -225,12 +230,13 @@ trace:
22056 #endif
22057 subq $MCOUNT_INSN_SIZE, %rdi
22058
22059 + pax_force_fptr ftrace_trace_function
22060 call *ftrace_trace_function
22061
22062 MCOUNT_RESTORE_FRAME
22063
22064 jmp ftrace_stub
22065 -END(function_hook)
22066 +ENDPROC(function_hook)
22067 #endif /* CONFIG_DYNAMIC_FTRACE */
22068 #endif /* CONFIG_FUNCTION_TRACER */
22069
22070 @@ -252,8 +258,9 @@ ENTRY(ftrace_graph_caller)
22071
22072 MCOUNT_RESTORE_FRAME
22073
22074 + pax_force_retaddr
22075 retq
22076 -END(ftrace_graph_caller)
22077 +ENDPROC(ftrace_graph_caller)
22078
22079 GLOBAL(return_to_handler)
22080 subq $24, %rsp
22081 @@ -269,7 +276,9 @@ GLOBAL(return_to_handler)
22082 movq 8(%rsp), %rdx
22083 movq (%rsp), %rax
22084 addq $24, %rsp
22085 + pax_force_fptr %rdi
22086 jmp *%rdi
22087 +ENDPROC(return_to_handler)
22088 #endif
22089
22090
22091 @@ -284,6 +293,430 @@ ENTRY(native_usergs_sysret64)
22092 ENDPROC(native_usergs_sysret64)
22093 #endif /* CONFIG_PARAVIRT */
22094
22095 + .macro ljmpq sel, off
22096 +#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
22097 + .byte 0x48; ljmp *1234f(%rip)
22098 + .pushsection .rodata
22099 + .align 16
22100 + 1234: .quad \off; .word \sel
22101 + .popsection
22102 +#else
22103 + pushq $\sel
22104 + pushq $\off
22105 + lretq
22106 +#endif
22107 + .endm
22108 +
22109 + .macro pax_enter_kernel
22110 + pax_set_fptr_mask
22111 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22112 + call pax_enter_kernel
22113 +#endif
22114 + .endm
22115 +
22116 + .macro pax_exit_kernel
22117 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22118 + call pax_exit_kernel
22119 +#endif
22120 +
22121 + .endm
22122 +
22123 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22124 +ENTRY(pax_enter_kernel)
22125 + pushq %rdi
22126 +
22127 +#ifdef CONFIG_PARAVIRT
22128 + PV_SAVE_REGS(CLBR_RDI)
22129 +#endif
22130 +
22131 +#ifdef CONFIG_PAX_KERNEXEC
22132 + GET_CR0_INTO_RDI
22133 + bts $16,%rdi
22134 + jnc 3f
22135 + mov %cs,%edi
22136 + cmp $__KERNEL_CS,%edi
22137 + jnz 2f
22138 +1:
22139 +#endif
22140 +
22141 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22142 + 661: jmp 111f
22143 + .pushsection .altinstr_replacement, "a"
22144 + 662: ASM_NOP2
22145 + .popsection
22146 + .pushsection .altinstructions, "a"
22147 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
22148 + .popsection
22149 + GET_CR3_INTO_RDI
22150 + cmp $0,%dil
22151 + jnz 112f
22152 + mov $__KERNEL_DS,%edi
22153 + mov %edi,%ss
22154 + jmp 111f
22155 +112: cmp $1,%dil
22156 + jz 113f
22157 + ud2
22158 +113: sub $4097,%rdi
22159 + bts $63,%rdi
22160 + SET_RDI_INTO_CR3
22161 + mov $__UDEREF_KERNEL_DS,%edi
22162 + mov %edi,%ss
22163 +111:
22164 +#endif
22165 +
22166 +#ifdef CONFIG_PARAVIRT
22167 + PV_RESTORE_REGS(CLBR_RDI)
22168 +#endif
22169 +
22170 + popq %rdi
22171 + pax_force_retaddr
22172 + retq
22173 +
22174 +#ifdef CONFIG_PAX_KERNEXEC
22175 +2: ljmpq __KERNEL_CS,1b
22176 +3: ljmpq __KERNEXEC_KERNEL_CS,4f
22177 +4: SET_RDI_INTO_CR0
22178 + jmp 1b
22179 +#endif
22180 +ENDPROC(pax_enter_kernel)
22181 +
22182 +ENTRY(pax_exit_kernel)
22183 + pushq %rdi
22184 +
22185 +#ifdef CONFIG_PARAVIRT
22186 + PV_SAVE_REGS(CLBR_RDI)
22187 +#endif
22188 +
22189 +#ifdef CONFIG_PAX_KERNEXEC
22190 + mov %cs,%rdi
22191 + cmp $__KERNEXEC_KERNEL_CS,%edi
22192 + jz 2f
22193 + GET_CR0_INTO_RDI
22194 + bts $16,%rdi
22195 + jnc 4f
22196 +1:
22197 +#endif
22198 +
22199 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22200 + 661: jmp 111f
22201 + .pushsection .altinstr_replacement, "a"
22202 + 662: ASM_NOP2
22203 + .popsection
22204 + .pushsection .altinstructions, "a"
22205 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
22206 + .popsection
22207 + mov %ss,%edi
22208 + cmp $__UDEREF_KERNEL_DS,%edi
22209 + jnz 111f
22210 + GET_CR3_INTO_RDI
22211 + cmp $0,%dil
22212 + jz 112f
22213 + ud2
22214 +112: add $4097,%rdi
22215 + bts $63,%rdi
22216 + SET_RDI_INTO_CR3
22217 + mov $__KERNEL_DS,%edi
22218 + mov %edi,%ss
22219 +111:
22220 +#endif
22221 +
22222 +#ifdef CONFIG_PARAVIRT
22223 + PV_RESTORE_REGS(CLBR_RDI);
22224 +#endif
22225 +
22226 + popq %rdi
22227 + pax_force_retaddr
22228 + retq
22229 +
22230 +#ifdef CONFIG_PAX_KERNEXEC
22231 +2: GET_CR0_INTO_RDI
22232 + btr $16,%rdi
22233 + jnc 4f
22234 + ljmpq __KERNEL_CS,3f
22235 +3: SET_RDI_INTO_CR0
22236 + jmp 1b
22237 +4: ud2
22238 + jmp 4b
22239 +#endif
22240 +ENDPROC(pax_exit_kernel)
22241 +#endif
22242 +
22243 + .macro pax_enter_kernel_user
22244 + pax_set_fptr_mask
22245 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22246 + call pax_enter_kernel_user
22247 +#endif
22248 + .endm
22249 +
22250 + .macro pax_exit_kernel_user
22251 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22252 + call pax_exit_kernel_user
22253 +#endif
22254 +#ifdef CONFIG_PAX_RANDKSTACK
22255 + pushq %rax
22256 + pushq %r11
22257 + call pax_randomize_kstack
22258 + popq %r11
22259 + popq %rax
22260 +#endif
22261 + .endm
22262 +
22263 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22264 +ENTRY(pax_enter_kernel_user)
22265 + pushq %rdi
22266 + pushq %rbx
22267 +
22268 +#ifdef CONFIG_PARAVIRT
22269 + PV_SAVE_REGS(CLBR_RDI)
22270 +#endif
22271 +
22272 + 661: jmp 111f
22273 + .pushsection .altinstr_replacement, "a"
22274 + 662: ASM_NOP2
22275 + .popsection
22276 + .pushsection .altinstructions, "a"
22277 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
22278 + .popsection
22279 + GET_CR3_INTO_RDI
22280 + cmp $1,%dil
22281 + jnz 4f
22282 + sub $4097,%rdi
22283 + bts $63,%rdi
22284 + SET_RDI_INTO_CR3
22285 + jmp 3f
22286 +111:
22287 +
22288 + GET_CR3_INTO_RDI
22289 + mov %rdi,%rbx
22290 + add $__START_KERNEL_map,%rbx
22291 + sub phys_base(%rip),%rbx
22292 +
22293 +#ifdef CONFIG_PARAVIRT
22294 + cmpl $0, pv_info+PARAVIRT_enabled
22295 + jz 1f
22296 + pushq %rdi
22297 + i = 0
22298 + .rept USER_PGD_PTRS
22299 + mov i*8(%rbx),%rsi
22300 + mov $0,%sil
22301 + lea i*8(%rbx),%rdi
22302 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
22303 + i = i + 1
22304 + .endr
22305 + popq %rdi
22306 + jmp 2f
22307 +1:
22308 +#endif
22309 +
22310 + i = 0
22311 + .rept USER_PGD_PTRS
22312 + movb $0,i*8(%rbx)
22313 + i = i + 1
22314 + .endr
22315 +
22316 +2: SET_RDI_INTO_CR3
22317 +
22318 +#ifdef CONFIG_PAX_KERNEXEC
22319 + GET_CR0_INTO_RDI
22320 + bts $16,%rdi
22321 + SET_RDI_INTO_CR0
22322 +#endif
22323 +
22324 +3:
22325 +
22326 +#ifdef CONFIG_PARAVIRT
22327 + PV_RESTORE_REGS(CLBR_RDI)
22328 +#endif
22329 +
22330 + popq %rbx
22331 + popq %rdi
22332 + pax_force_retaddr
22333 + retq
22334 +4: ud2
22335 +ENDPROC(pax_enter_kernel_user)
22336 +
22337 +ENTRY(pax_exit_kernel_user)
22338 + pushq %rdi
22339 + pushq %rbx
22340 +
22341 +#ifdef CONFIG_PARAVIRT
22342 + PV_SAVE_REGS(CLBR_RDI)
22343 +#endif
22344 +
22345 + GET_CR3_INTO_RDI
22346 + 661: jmp 1f
22347 + .pushsection .altinstr_replacement, "a"
22348 + 662: ASM_NOP2
22349 + .popsection
22350 + .pushsection .altinstructions, "a"
22351 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
22352 + .popsection
22353 + cmp $0,%dil
22354 + jnz 3f
22355 + add $4097,%rdi
22356 + bts $63,%rdi
22357 + SET_RDI_INTO_CR3
22358 + jmp 2f
22359 +1:
22360 +
22361 + mov %rdi,%rbx
22362 +
22363 +#ifdef CONFIG_PAX_KERNEXEC
22364 + GET_CR0_INTO_RDI
22365 + btr $16,%rdi
22366 + jnc 3f
22367 + SET_RDI_INTO_CR0
22368 +#endif
22369 +
22370 + add $__START_KERNEL_map,%rbx
22371 + sub phys_base(%rip),%rbx
22372 +
22373 +#ifdef CONFIG_PARAVIRT
22374 + cmpl $0, pv_info+PARAVIRT_enabled
22375 + jz 1f
22376 + i = 0
22377 + .rept USER_PGD_PTRS
22378 + mov i*8(%rbx),%rsi
22379 + mov $0x67,%sil
22380 + lea i*8(%rbx),%rdi
22381 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
22382 + i = i + 1
22383 + .endr
22384 + jmp 2f
22385 +1:
22386 +#endif
22387 +
22388 + i = 0
22389 + .rept USER_PGD_PTRS
22390 + movb $0x67,i*8(%rbx)
22391 + i = i + 1
22392 + .endr
22393 +2:
22394 +
22395 +#ifdef CONFIG_PARAVIRT
22396 + PV_RESTORE_REGS(CLBR_RDI)
22397 +#endif
22398 +
22399 + popq %rbx
22400 + popq %rdi
22401 + pax_force_retaddr
22402 + retq
22403 +3: ud2
22404 +ENDPROC(pax_exit_kernel_user)
22405 +#endif
22406 +
22407 + .macro pax_enter_kernel_nmi
22408 + pax_set_fptr_mask
22409 +
22410 +#ifdef CONFIG_PAX_KERNEXEC
22411 + GET_CR0_INTO_RDI
22412 + bts $16,%rdi
22413 + jc 110f
22414 + SET_RDI_INTO_CR0
22415 + or $2,%ebx
22416 +110:
22417 +#endif
22418 +
22419 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22420 + 661: jmp 111f
22421 + .pushsection .altinstr_replacement, "a"
22422 + 662: ASM_NOP2
22423 + .popsection
22424 + .pushsection .altinstructions, "a"
22425 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
22426 + .popsection
22427 + GET_CR3_INTO_RDI
22428 + cmp $0,%dil
22429 + jz 111f
22430 + sub $4097,%rdi
22431 + or $4,%ebx
22432 + bts $63,%rdi
22433 + SET_RDI_INTO_CR3
22434 + mov $__UDEREF_KERNEL_DS,%edi
22435 + mov %edi,%ss
22436 +111:
22437 +#endif
22438 + .endm
22439 +
22440 + .macro pax_exit_kernel_nmi
22441 +#ifdef CONFIG_PAX_KERNEXEC
22442 + btr $1,%ebx
22443 + jnc 110f
22444 + GET_CR0_INTO_RDI
22445 + btr $16,%rdi
22446 + SET_RDI_INTO_CR0
22447 +110:
22448 +#endif
22449 +
22450 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22451 + btr $2,%ebx
22452 + jnc 111f
22453 + GET_CR3_INTO_RDI
22454 + add $4097,%rdi
22455 + bts $63,%rdi
22456 + SET_RDI_INTO_CR3
22457 + mov $__KERNEL_DS,%edi
22458 + mov %edi,%ss
22459 +111:
22460 +#endif
22461 + .endm
22462 +
22463 + .macro pax_erase_kstack
22464 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22465 + call pax_erase_kstack
22466 +#endif
22467 + .endm
22468 +
22469 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22470 +ENTRY(pax_erase_kstack)
22471 + pushq %rdi
22472 + pushq %rcx
22473 + pushq %rax
22474 + pushq %r11
22475 +
22476 + GET_THREAD_INFO(%r11)
22477 + mov TI_lowest_stack(%r11), %rdi
22478 + mov $-0xBEEF, %rax
22479 + std
22480 +
22481 +1: mov %edi, %ecx
22482 + and $THREAD_SIZE_asm - 1, %ecx
22483 + shr $3, %ecx
22484 + repne scasq
22485 + jecxz 2f
22486 +
22487 + cmp $2*8, %ecx
22488 + jc 2f
22489 +
22490 + mov $2*8, %ecx
22491 + repe scasq
22492 + jecxz 2f
22493 + jne 1b
22494 +
22495 +2: cld
22496 + mov %esp, %ecx
22497 + sub %edi, %ecx
22498 +
22499 + cmp $THREAD_SIZE_asm, %rcx
22500 + jb 3f
22501 + ud2
22502 +3:
22503 +
22504 + shr $3, %ecx
22505 + rep stosq
22506 +
22507 + mov TI_task_thread_sp0(%r11), %rdi
22508 + sub $256, %rdi
22509 + mov %rdi, TI_lowest_stack(%r11)
22510 +
22511 + popq %r11
22512 + popq %rax
22513 + popq %rcx
22514 + popq %rdi
22515 + pax_force_retaddr
22516 + ret
22517 +ENDPROC(pax_erase_kstack)
22518 +#endif
22519
22520 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
22521 #ifdef CONFIG_TRACE_IRQFLAGS
22522 @@ -320,7 +753,7 @@ ENDPROC(native_usergs_sysret64)
22523 .endm
22524
22525 .macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
22526 - bt $9,EFLAGS-\offset(%rsp) /* interrupts off? */
22527 + bt $X86_EFLAGS_IF_BIT,EFLAGS-\offset(%rsp) /* interrupts off? */
22528 jnc 1f
22529 TRACE_IRQS_ON_DEBUG
22530 1:
22531 @@ -358,27 +791,6 @@ ENDPROC(native_usergs_sysret64)
22532 movq \tmp,R11+\offset(%rsp)
22533 .endm
22534
22535 - .macro FAKE_STACK_FRAME child_rip
22536 - /* push in order ss, rsp, eflags, cs, rip */
22537 - xorl %eax, %eax
22538 - pushq_cfi $__KERNEL_DS /* ss */
22539 - /*CFI_REL_OFFSET ss,0*/
22540 - pushq_cfi %rax /* rsp */
22541 - CFI_REL_OFFSET rsp,0
22542 - pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_FIXED) /* eflags - interrupts on */
22543 - /*CFI_REL_OFFSET rflags,0*/
22544 - pushq_cfi $__KERNEL_CS /* cs */
22545 - /*CFI_REL_OFFSET cs,0*/
22546 - pushq_cfi \child_rip /* rip */
22547 - CFI_REL_OFFSET rip,0
22548 - pushq_cfi %rax /* orig rax */
22549 - .endm
22550 -
22551 - .macro UNFAKE_STACK_FRAME
22552 - addq $8*6, %rsp
22553 - CFI_ADJUST_CFA_OFFSET -(6*8)
22554 - .endm
22555 -
22556 /*
22557 * initial frame state for interrupts (and exceptions without error code)
22558 */
22559 @@ -445,25 +857,26 @@ ENDPROC(native_usergs_sysret64)
22560 /* save partial stack frame */
22561 .macro SAVE_ARGS_IRQ
22562 cld
22563 - /* start from rbp in pt_regs and jump over */
22564 - movq_cfi rdi, (RDI-RBP)
22565 - movq_cfi rsi, (RSI-RBP)
22566 - movq_cfi rdx, (RDX-RBP)
22567 - movq_cfi rcx, (RCX-RBP)
22568 - movq_cfi rax, (RAX-RBP)
22569 - movq_cfi r8, (R8-RBP)
22570 - movq_cfi r9, (R9-RBP)
22571 - movq_cfi r10, (R10-RBP)
22572 - movq_cfi r11, (R11-RBP)
22573 + /* start from r15 in pt_regs and jump over */
22574 + movq_cfi rdi, RDI
22575 + movq_cfi rsi, RSI
22576 + movq_cfi rdx, RDX
22577 + movq_cfi rcx, RCX
22578 + movq_cfi rax, RAX
22579 + movq_cfi r8, R8
22580 + movq_cfi r9, R9
22581 + movq_cfi r10, R10
22582 + movq_cfi r11, R11
22583 + movq_cfi r12, R12
22584
22585 /* Save rbp so that we can unwind from get_irq_regs() */
22586 - movq_cfi rbp, 0
22587 + movq_cfi rbp, RBP
22588
22589 /* Save previous stack value */
22590 movq %rsp, %rsi
22591
22592 - leaq -RBP(%rsp),%rdi /* arg1 for handler */
22593 - testl $3, CS-RBP(%rsi)
22594 + movq %rsp,%rdi /* arg1 for handler */
22595 + testb $3, CS(%rsi)
22596 je 1f
22597 SWAPGS
22598 /*
22599 @@ -514,9 +927,10 @@ ENTRY(save_paranoid)
22600 js 1f /* negative -> in kernel */
22601 SWAPGS
22602 xorl %ebx,%ebx
22603 -1: ret
22604 +1: pax_force_retaddr_bts
22605 + ret
22606 CFI_ENDPROC
22607 -END(save_paranoid)
22608 +ENDPROC(save_paranoid)
22609 .popsection
22610
22611 /*
22612 @@ -538,7 +952,7 @@ ENTRY(ret_from_fork)
22613
22614 RESTORE_REST
22615
22616 - testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
22617 + testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
22618 jz 1f
22619
22620 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
22621 @@ -548,15 +962,13 @@ ENTRY(ret_from_fork)
22622 jmp ret_from_sys_call # go to the SYSRET fastpath
22623
22624 1:
22625 - subq $REST_SKIP, %rsp # leave space for volatiles
22626 - CFI_ADJUST_CFA_OFFSET REST_SKIP
22627 movq %rbp, %rdi
22628 call *%rbx
22629 movl $0, RAX(%rsp)
22630 RESTORE_REST
22631 jmp int_ret_from_sys_call
22632 CFI_ENDPROC
22633 -END(ret_from_fork)
22634 +ENDPROC(ret_from_fork)
22635
22636 /*
22637 * System call entry. Up to 6 arguments in registers are supported.
22638 @@ -593,7 +1005,7 @@ END(ret_from_fork)
22639 ENTRY(system_call)
22640 CFI_STARTPROC simple
22641 CFI_SIGNAL_FRAME
22642 - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
22643 + CFI_DEF_CFA rsp,0
22644 CFI_REGISTER rip,rcx
22645 /*CFI_REGISTER rflags,r11*/
22646 SWAPGS_UNSAFE_STACK
22647 @@ -606,16 +1018,23 @@ GLOBAL(system_call_after_swapgs)
22648
22649 movq %rsp,PER_CPU_VAR(old_rsp)
22650 movq PER_CPU_VAR(kernel_stack),%rsp
22651 + SAVE_ARGS 8*6,0
22652 + pax_enter_kernel_user
22653 +
22654 +#ifdef CONFIG_PAX_RANDKSTACK
22655 + pax_erase_kstack
22656 +#endif
22657 +
22658 /*
22659 * No need to follow this irqs off/on section - it's straight
22660 * and short:
22661 */
22662 ENABLE_INTERRUPTS(CLBR_NONE)
22663 - SAVE_ARGS 8,0
22664 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
22665 movq %rcx,RIP-ARGOFFSET(%rsp)
22666 CFI_REL_OFFSET rip,RIP-ARGOFFSET
22667 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
22668 + GET_THREAD_INFO(%rcx)
22669 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
22670 jnz tracesys
22671 system_call_fastpath:
22672 #if __SYSCALL_MASK == ~0
22673 @@ -639,10 +1058,13 @@ sysret_check:
22674 LOCKDEP_SYS_EXIT
22675 DISABLE_INTERRUPTS(CLBR_NONE)
22676 TRACE_IRQS_OFF
22677 - movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
22678 + GET_THREAD_INFO(%rcx)
22679 + movl TI_flags(%rcx),%edx
22680 andl %edi,%edx
22681 jnz sysret_careful
22682 CFI_REMEMBER_STATE
22683 + pax_exit_kernel_user
22684 + pax_erase_kstack
22685 /*
22686 * sysretq will re-enable interrupts:
22687 */
22688 @@ -701,6 +1123,9 @@ auditsys:
22689 movq %rax,%rsi /* 2nd arg: syscall number */
22690 movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
22691 call __audit_syscall_entry
22692 +
22693 + pax_erase_kstack
22694 +
22695 LOAD_ARGS 0 /* reload call-clobbered registers */
22696 jmp system_call_fastpath
22697
22698 @@ -722,7 +1147,7 @@ sysret_audit:
22699 /* Do syscall tracing */
22700 tracesys:
22701 #ifdef CONFIG_AUDITSYSCALL
22702 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
22703 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%rcx)
22704 jz auditsys
22705 #endif
22706 SAVE_REST
22707 @@ -730,12 +1155,15 @@ tracesys:
22708 FIXUP_TOP_OF_STACK %rdi
22709 movq %rsp,%rdi
22710 call syscall_trace_enter
22711 +
22712 + pax_erase_kstack
22713 +
22714 /*
22715 * Reload arg registers from stack in case ptrace changed them.
22716 * We don't reload %rax because syscall_trace_enter() returned
22717 * the value it wants us to use in the table lookup.
22718 */
22719 - LOAD_ARGS ARGOFFSET, 1
22720 + LOAD_ARGS 1
22721 RESTORE_REST
22722 #if __SYSCALL_MASK == ~0
22723 cmpq $__NR_syscall_max,%rax
22724 @@ -765,7 +1193,9 @@ GLOBAL(int_with_check)
22725 andl %edi,%edx
22726 jnz int_careful
22727 andl $~TS_COMPAT,TI_status(%rcx)
22728 - jmp retint_swapgs
22729 + pax_exit_kernel_user
22730 + pax_erase_kstack
22731 + jmp retint_swapgs_pax
22732
22733 /* Either reschedule or signal or syscall exit tracking needed. */
22734 /* First do a reschedule test. */
22735 @@ -811,7 +1241,7 @@ int_restore_rest:
22736 TRACE_IRQS_OFF
22737 jmp int_with_check
22738 CFI_ENDPROC
22739 -END(system_call)
22740 +ENDPROC(system_call)
22741
22742 .macro FORK_LIKE func
22743 ENTRY(stub_\func)
22744 @@ -824,9 +1254,10 @@ ENTRY(stub_\func)
22745 DEFAULT_FRAME 0 8 /* offset 8: return address */
22746 call sys_\func
22747 RESTORE_TOP_OF_STACK %r11, 8
22748 - ret $REST_SKIP /* pop extended registers */
22749 + pax_force_retaddr
22750 + ret
22751 CFI_ENDPROC
22752 -END(stub_\func)
22753 +ENDPROC(stub_\func)
22754 .endm
22755
22756 .macro FIXED_FRAME label,func
22757 @@ -836,9 +1267,10 @@ ENTRY(\label)
22758 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
22759 call \func
22760 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
22761 + pax_force_retaddr
22762 ret
22763 CFI_ENDPROC
22764 -END(\label)
22765 +ENDPROC(\label)
22766 .endm
22767
22768 FORK_LIKE clone
22769 @@ -846,19 +1278,6 @@ END(\label)
22770 FORK_LIKE vfork
22771 FIXED_FRAME stub_iopl, sys_iopl
22772
22773 -ENTRY(ptregscall_common)
22774 - DEFAULT_FRAME 1 8 /* offset 8: return address */
22775 - RESTORE_TOP_OF_STACK %r11, 8
22776 - movq_cfi_restore R15+8, r15
22777 - movq_cfi_restore R14+8, r14
22778 - movq_cfi_restore R13+8, r13
22779 - movq_cfi_restore R12+8, r12
22780 - movq_cfi_restore RBP+8, rbp
22781 - movq_cfi_restore RBX+8, rbx
22782 - ret $REST_SKIP /* pop extended registers */
22783 - CFI_ENDPROC
22784 -END(ptregscall_common)
22785 -
22786 ENTRY(stub_execve)
22787 CFI_STARTPROC
22788 addq $8, %rsp
22789 @@ -870,7 +1289,7 @@ ENTRY(stub_execve)
22790 RESTORE_REST
22791 jmp int_ret_from_sys_call
22792 CFI_ENDPROC
22793 -END(stub_execve)
22794 +ENDPROC(stub_execve)
22795
22796 /*
22797 * sigreturn is special because it needs to restore all registers on return.
22798 @@ -887,7 +1306,7 @@ ENTRY(stub_rt_sigreturn)
22799 RESTORE_REST
22800 jmp int_ret_from_sys_call
22801 CFI_ENDPROC
22802 -END(stub_rt_sigreturn)
22803 +ENDPROC(stub_rt_sigreturn)
22804
22805 #ifdef CONFIG_X86_X32_ABI
22806 ENTRY(stub_x32_rt_sigreturn)
22807 @@ -901,7 +1320,7 @@ ENTRY(stub_x32_rt_sigreturn)
22808 RESTORE_REST
22809 jmp int_ret_from_sys_call
22810 CFI_ENDPROC
22811 -END(stub_x32_rt_sigreturn)
22812 +ENDPROC(stub_x32_rt_sigreturn)
22813
22814 ENTRY(stub_x32_execve)
22815 CFI_STARTPROC
22816 @@ -915,7 +1334,7 @@ ENTRY(stub_x32_execve)
22817 RESTORE_REST
22818 jmp int_ret_from_sys_call
22819 CFI_ENDPROC
22820 -END(stub_x32_execve)
22821 +ENDPROC(stub_x32_execve)
22822
22823 #endif
22824
22825 @@ -952,7 +1371,7 @@ vector=vector+1
22826 2: jmp common_interrupt
22827 .endr
22828 CFI_ENDPROC
22829 -END(irq_entries_start)
22830 +ENDPROC(irq_entries_start)
22831
22832 .previous
22833 END(interrupt)
22834 @@ -969,9 +1388,19 @@ END(interrupt)
22835 /* 0(%rsp): ~(interrupt number) */
22836 .macro interrupt func
22837 /* reserve pt_regs for scratch regs and rbp */
22838 - subq $ORIG_RAX-RBP, %rsp
22839 - CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
22840 + subq $ORIG_RAX, %rsp
22841 + CFI_ADJUST_CFA_OFFSET ORIG_RAX
22842 SAVE_ARGS_IRQ
22843 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22844 + testb $3, CS(%rdi)
22845 + jnz 1f
22846 + pax_enter_kernel
22847 + jmp 2f
22848 +1: pax_enter_kernel_user
22849 +2:
22850 +#else
22851 + pax_enter_kernel
22852 +#endif
22853 call \func
22854 .endm
22855
22856 @@ -997,14 +1426,14 @@ ret_from_intr:
22857
22858 /* Restore saved previous stack */
22859 popq %rsi
22860 - CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */
22861 - leaq ARGOFFSET-RBP(%rsi), %rsp
22862 + CFI_DEF_CFA rsi,SS+8 /* reg/off reset after def_cfa_expr */
22863 + movq %rsi, %rsp
22864 CFI_DEF_CFA_REGISTER rsp
22865 - CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET
22866 + CFI_ADJUST_CFA_OFFSET -ARGOFFSET
22867
22868 exit_intr:
22869 GET_THREAD_INFO(%rcx)
22870 - testl $3,CS-ARGOFFSET(%rsp)
22871 + testb $3,CS-ARGOFFSET(%rsp)
22872 je retint_kernel
22873
22874 /* Interrupt came from user space */
22875 @@ -1026,12 +1455,16 @@ retint_swapgs: /* return to user-space */
22876 * The iretq could re-enable interrupts:
22877 */
22878 DISABLE_INTERRUPTS(CLBR_ANY)
22879 + pax_exit_kernel_user
22880 +retint_swapgs_pax:
22881 TRACE_IRQS_IRETQ
22882 SWAPGS
22883 jmp restore_args
22884
22885 retint_restore_args: /* return to kernel space */
22886 DISABLE_INTERRUPTS(CLBR_ANY)
22887 + pax_exit_kernel
22888 + pax_force_retaddr (RIP-ARGOFFSET)
22889 /*
22890 * The iretq could re-enable interrupts:
22891 */
22892 @@ -1114,7 +1547,7 @@ ENTRY(retint_kernel)
22893 #endif
22894
22895 CFI_ENDPROC
22896 -END(common_interrupt)
22897 +ENDPROC(common_interrupt)
22898 /*
22899 * End of kprobes section
22900 */
22901 @@ -1132,7 +1565,7 @@ ENTRY(\sym)
22902 interrupt \do_sym
22903 jmp ret_from_intr
22904 CFI_ENDPROC
22905 -END(\sym)
22906 +ENDPROC(\sym)
22907 .endm
22908
22909 #ifdef CONFIG_TRACING
22910 @@ -1215,12 +1648,22 @@ ENTRY(\sym)
22911 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
22912 call error_entry
22913 DEFAULT_FRAME 0
22914 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22915 + testb $3, CS(%rsp)
22916 + jnz 1f
22917 + pax_enter_kernel
22918 + jmp 2f
22919 +1: pax_enter_kernel_user
22920 +2:
22921 +#else
22922 + pax_enter_kernel
22923 +#endif
22924 movq %rsp,%rdi /* pt_regs pointer */
22925 xorl %esi,%esi /* no error code */
22926 call \do_sym
22927 jmp error_exit /* %ebx: no swapgs flag */
22928 CFI_ENDPROC
22929 -END(\sym)
22930 +ENDPROC(\sym)
22931 .endm
22932
22933 .macro paranoidzeroentry sym do_sym
22934 @@ -1233,15 +1676,25 @@ ENTRY(\sym)
22935 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
22936 call save_paranoid
22937 TRACE_IRQS_OFF
22938 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22939 + testb $3, CS(%rsp)
22940 + jnz 1f
22941 + pax_enter_kernel
22942 + jmp 2f
22943 +1: pax_enter_kernel_user
22944 +2:
22945 +#else
22946 + pax_enter_kernel
22947 +#endif
22948 movq %rsp,%rdi /* pt_regs pointer */
22949 xorl %esi,%esi /* no error code */
22950 call \do_sym
22951 jmp paranoid_exit /* %ebx: no swapgs flag */
22952 CFI_ENDPROC
22953 -END(\sym)
22954 +ENDPROC(\sym)
22955 .endm
22956
22957 -#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
22958 +#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
22959 .macro paranoidzeroentry_ist sym do_sym ist
22960 ENTRY(\sym)
22961 INTR_FRAME
22962 @@ -1252,14 +1705,30 @@ ENTRY(\sym)
22963 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
22964 call save_paranoid
22965 TRACE_IRQS_OFF_DEBUG
22966 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22967 + testb $3, CS(%rsp)
22968 + jnz 1f
22969 + pax_enter_kernel
22970 + jmp 2f
22971 +1: pax_enter_kernel_user
22972 +2:
22973 +#else
22974 + pax_enter_kernel
22975 +#endif
22976 movq %rsp,%rdi /* pt_regs pointer */
22977 xorl %esi,%esi /* no error code */
22978 +#ifdef CONFIG_SMP
22979 + imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
22980 + lea init_tss(%r13), %r13
22981 +#else
22982 + lea init_tss(%rip), %r13
22983 +#endif
22984 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
22985 call \do_sym
22986 addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
22987 jmp paranoid_exit /* %ebx: no swapgs flag */
22988 CFI_ENDPROC
22989 -END(\sym)
22990 +ENDPROC(\sym)
22991 .endm
22992
22993 .macro errorentry sym do_sym
22994 @@ -1271,13 +1740,23 @@ ENTRY(\sym)
22995 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
22996 call error_entry
22997 DEFAULT_FRAME 0
22998 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22999 + testb $3, CS(%rsp)
23000 + jnz 1f
23001 + pax_enter_kernel
23002 + jmp 2f
23003 +1: pax_enter_kernel_user
23004 +2:
23005 +#else
23006 + pax_enter_kernel
23007 +#endif
23008 movq %rsp,%rdi /* pt_regs pointer */
23009 movq ORIG_RAX(%rsp),%rsi /* get error code */
23010 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
23011 call \do_sym
23012 jmp error_exit /* %ebx: no swapgs flag */
23013 CFI_ENDPROC
23014 -END(\sym)
23015 +ENDPROC(\sym)
23016 .endm
23017
23018 /* error code is on the stack already */
23019 @@ -1291,13 +1770,23 @@ ENTRY(\sym)
23020 call save_paranoid
23021 DEFAULT_FRAME 0
23022 TRACE_IRQS_OFF
23023 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23024 + testb $3, CS(%rsp)
23025 + jnz 1f
23026 + pax_enter_kernel
23027 + jmp 2f
23028 +1: pax_enter_kernel_user
23029 +2:
23030 +#else
23031 + pax_enter_kernel
23032 +#endif
23033 movq %rsp,%rdi /* pt_regs pointer */
23034 movq ORIG_RAX(%rsp),%rsi /* get error code */
23035 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
23036 call \do_sym
23037 jmp paranoid_exit /* %ebx: no swapgs flag */
23038 CFI_ENDPROC
23039 -END(\sym)
23040 +ENDPROC(\sym)
23041 .endm
23042
23043 zeroentry divide_error do_divide_error
23044 @@ -1327,9 +1816,10 @@ gs_change:
23045 2: mfence /* workaround */
23046 SWAPGS
23047 popfq_cfi
23048 + pax_force_retaddr
23049 ret
23050 CFI_ENDPROC
23051 -END(native_load_gs_index)
23052 +ENDPROC(native_load_gs_index)
23053
23054 _ASM_EXTABLE(gs_change,bad_gs)
23055 .section .fixup,"ax"
23056 @@ -1357,9 +1847,10 @@ ENTRY(call_softirq)
23057 CFI_DEF_CFA_REGISTER rsp
23058 CFI_ADJUST_CFA_OFFSET -8
23059 decl PER_CPU_VAR(irq_count)
23060 + pax_force_retaddr
23061 ret
23062 CFI_ENDPROC
23063 -END(call_softirq)
23064 +ENDPROC(call_softirq)
23065
23066 #ifdef CONFIG_XEN
23067 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
23068 @@ -1397,7 +1888,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
23069 decl PER_CPU_VAR(irq_count)
23070 jmp error_exit
23071 CFI_ENDPROC
23072 -END(xen_do_hypervisor_callback)
23073 +ENDPROC(xen_do_hypervisor_callback)
23074
23075 /*
23076 * Hypervisor uses this for application faults while it executes.
23077 @@ -1456,7 +1947,7 @@ ENTRY(xen_failsafe_callback)
23078 SAVE_ALL
23079 jmp error_exit
23080 CFI_ENDPROC
23081 -END(xen_failsafe_callback)
23082 +ENDPROC(xen_failsafe_callback)
23083
23084 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
23085 xen_hvm_callback_vector xen_evtchn_do_upcall
23086 @@ -1508,18 +1999,33 @@ ENTRY(paranoid_exit)
23087 DEFAULT_FRAME
23088 DISABLE_INTERRUPTS(CLBR_NONE)
23089 TRACE_IRQS_OFF_DEBUG
23090 - testl %ebx,%ebx /* swapgs needed? */
23091 + testl $1,%ebx /* swapgs needed? */
23092 jnz paranoid_restore
23093 - testl $3,CS(%rsp)
23094 + testb $3,CS(%rsp)
23095 jnz paranoid_userspace
23096 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23097 + pax_exit_kernel
23098 + TRACE_IRQS_IRETQ 0
23099 + SWAPGS_UNSAFE_STACK
23100 + RESTORE_ALL 8
23101 + pax_force_retaddr_bts
23102 + jmp irq_return
23103 +#endif
23104 paranoid_swapgs:
23105 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23106 + pax_exit_kernel_user
23107 +#else
23108 + pax_exit_kernel
23109 +#endif
23110 TRACE_IRQS_IRETQ 0
23111 SWAPGS_UNSAFE_STACK
23112 RESTORE_ALL 8
23113 jmp irq_return
23114 paranoid_restore:
23115 + pax_exit_kernel
23116 TRACE_IRQS_IRETQ_DEBUG 0
23117 RESTORE_ALL 8
23118 + pax_force_retaddr_bts
23119 jmp irq_return
23120 paranoid_userspace:
23121 GET_THREAD_INFO(%rcx)
23122 @@ -1548,7 +2054,7 @@ paranoid_schedule:
23123 TRACE_IRQS_OFF
23124 jmp paranoid_userspace
23125 CFI_ENDPROC
23126 -END(paranoid_exit)
23127 +ENDPROC(paranoid_exit)
23128
23129 /*
23130 * Exception entry point. This expects an error code/orig_rax on the stack.
23131 @@ -1575,12 +2081,13 @@ ENTRY(error_entry)
23132 movq_cfi r14, R14+8
23133 movq_cfi r15, R15+8
23134 xorl %ebx,%ebx
23135 - testl $3,CS+8(%rsp)
23136 + testb $3,CS+8(%rsp)
23137 je error_kernelspace
23138 error_swapgs:
23139 SWAPGS
23140 error_sti:
23141 TRACE_IRQS_OFF
23142 + pax_force_retaddr_bts
23143 ret
23144
23145 /*
23146 @@ -1607,7 +2114,7 @@ bstep_iret:
23147 movq %rcx,RIP+8(%rsp)
23148 jmp error_swapgs
23149 CFI_ENDPROC
23150 -END(error_entry)
23151 +ENDPROC(error_entry)
23152
23153
23154 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
23155 @@ -1618,7 +2125,7 @@ ENTRY(error_exit)
23156 DISABLE_INTERRUPTS(CLBR_NONE)
23157 TRACE_IRQS_OFF
23158 GET_THREAD_INFO(%rcx)
23159 - testl %eax,%eax
23160 + testl $1,%eax
23161 jne retint_kernel
23162 LOCKDEP_SYS_EXIT_IRQ
23163 movl TI_flags(%rcx),%edx
23164 @@ -1627,7 +2134,7 @@ ENTRY(error_exit)
23165 jnz retint_careful
23166 jmp retint_swapgs
23167 CFI_ENDPROC
23168 -END(error_exit)
23169 +ENDPROC(error_exit)
23170
23171 /*
23172 * Test if a given stack is an NMI stack or not.
23173 @@ -1685,9 +2192,11 @@ ENTRY(nmi)
23174 * If %cs was not the kernel segment, then the NMI triggered in user
23175 * space, which means it is definitely not nested.
23176 */
23177 + cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
23178 + je 1f
23179 cmpl $__KERNEL_CS, 16(%rsp)
23180 jne first_nmi
23181 -
23182 +1:
23183 /*
23184 * Check the special variable on the stack to see if NMIs are
23185 * executing.
23186 @@ -1721,8 +2230,7 @@ nested_nmi:
23187
23188 1:
23189 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
23190 - leaq -1*8(%rsp), %rdx
23191 - movq %rdx, %rsp
23192 + subq $8, %rsp
23193 CFI_ADJUST_CFA_OFFSET 1*8
23194 leaq -10*8(%rsp), %rdx
23195 pushq_cfi $__KERNEL_DS
23196 @@ -1740,6 +2248,7 @@ nested_nmi_out:
23197 CFI_RESTORE rdx
23198
23199 /* No need to check faults here */
23200 +# pax_force_retaddr_bts
23201 INTERRUPT_RETURN
23202
23203 CFI_RESTORE_STATE
23204 @@ -1852,9 +2361,11 @@ end_repeat_nmi:
23205 * NMI itself takes a page fault, the page fault that was preempted
23206 * will read the information from the NMI page fault and not the
23207 * origin fault. Save it off and restore it if it changes.
23208 - * Use the r12 callee-saved register.
23209 + * Use the r13 callee-saved register.
23210 */
23211 - movq %cr2, %r12
23212 + movq %cr2, %r13
23213 +
23214 + pax_enter_kernel_nmi
23215
23216 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
23217 movq %rsp,%rdi
23218 @@ -1863,31 +2374,36 @@ end_repeat_nmi:
23219
23220 /* Did the NMI take a page fault? Restore cr2 if it did */
23221 movq %cr2, %rcx
23222 - cmpq %rcx, %r12
23223 + cmpq %rcx, %r13
23224 je 1f
23225 - movq %r12, %cr2
23226 + movq %r13, %cr2
23227 1:
23228
23229 - testl %ebx,%ebx /* swapgs needed? */
23230 + testl $1,%ebx /* swapgs needed? */
23231 jnz nmi_restore
23232 nmi_swapgs:
23233 SWAPGS_UNSAFE_STACK
23234 nmi_restore:
23235 + pax_exit_kernel_nmi
23236 /* Pop the extra iret frame at once */
23237 RESTORE_ALL 6*8
23238 + testb $3, 8(%rsp)
23239 + jnz 1f
23240 + pax_force_retaddr_bts
23241 +1:
23242
23243 /* Clear the NMI executing stack variable */
23244 movq $0, 5*8(%rsp)
23245 jmp irq_return
23246 CFI_ENDPROC
23247 -END(nmi)
23248 +ENDPROC(nmi)
23249
23250 ENTRY(ignore_sysret)
23251 CFI_STARTPROC
23252 mov $-ENOSYS,%eax
23253 sysret
23254 CFI_ENDPROC
23255 -END(ignore_sysret)
23256 +ENDPROC(ignore_sysret)
23257
23258 /*
23259 * End of kprobes section
23260 diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
23261 index d4bdd25..912664c 100644
23262 --- a/arch/x86/kernel/ftrace.c
23263 +++ b/arch/x86/kernel/ftrace.c
23264 @@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
23265 {
23266 unsigned char replaced[MCOUNT_INSN_SIZE];
23267
23268 + ip = ktla_ktva(ip);
23269 +
23270 /*
23271 * Note: Due to modules and __init, code can
23272 * disappear and change, we need to protect against faulting
23273 @@ -227,7 +229,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
23274 unsigned char old[MCOUNT_INSN_SIZE], *new;
23275 int ret;
23276
23277 - memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
23278 + memcpy(old, (void *)ktla_ktva((unsigned long)ftrace_call), MCOUNT_INSN_SIZE);
23279 new = ftrace_call_replace(ip, (unsigned long)func);
23280
23281 /* See comment above by declaration of modifying_ftrace_code */
23282 @@ -238,7 +240,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
23283 /* Also update the regs callback function */
23284 if (!ret) {
23285 ip = (unsigned long)(&ftrace_regs_call);
23286 - memcpy(old, &ftrace_regs_call, MCOUNT_INSN_SIZE);
23287 + memcpy(old, ktla_ktva((void *)&ftrace_regs_call), MCOUNT_INSN_SIZE);
23288 new = ftrace_call_replace(ip, (unsigned long)func);
23289 ret = ftrace_modify_code(ip, old, new);
23290 }
23291 @@ -291,7 +293,7 @@ static int ftrace_write(unsigned long ip, const char *val, int size)
23292 * kernel identity mapping to modify code.
23293 */
23294 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
23295 - ip = (unsigned long)__va(__pa_symbol(ip));
23296 + ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
23297
23298 return probe_kernel_write((void *)ip, val, size);
23299 }
23300 @@ -301,7 +303,7 @@ static int add_break(unsigned long ip, const char *old)
23301 unsigned char replaced[MCOUNT_INSN_SIZE];
23302 unsigned char brk = BREAKPOINT_INSTRUCTION;
23303
23304 - if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
23305 + if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
23306 return -EFAULT;
23307
23308 /* Make sure it is what we expect it to be */
23309 @@ -649,7 +651,7 @@ ftrace_modify_code(unsigned long ip, unsigned const char *old_code,
23310 return ret;
23311
23312 fail_update:
23313 - probe_kernel_write((void *)ip, &old_code[0], 1);
23314 + probe_kernel_write((void *)ktla_ktva(ip), &old_code[0], 1);
23315 goto out;
23316 }
23317
23318 @@ -682,6 +684,8 @@ static int ftrace_mod_jmp(unsigned long ip,
23319 {
23320 unsigned char code[MCOUNT_INSN_SIZE];
23321
23322 + ip = ktla_ktva(ip);
23323 +
23324 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
23325 return -EFAULT;
23326
23327 diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
23328 index 1be8e43..d9b9ef6 100644
23329 --- a/arch/x86/kernel/head64.c
23330 +++ b/arch/x86/kernel/head64.c
23331 @@ -67,12 +67,12 @@ again:
23332 pgd = *pgd_p;
23333
23334 /*
23335 - * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
23336 - * critical -- __PAGE_OFFSET would point us back into the dynamic
23337 + * The use of __early_va rather than __va here is critical:
23338 + * __va would point us back into the dynamic
23339 * range and we might end up looping forever...
23340 */
23341 if (pgd)
23342 - pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
23343 + pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
23344 else {
23345 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
23346 reset_early_page_tables();
23347 @@ -82,13 +82,13 @@ again:
23348 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
23349 for (i = 0; i < PTRS_PER_PUD; i++)
23350 pud_p[i] = 0;
23351 - *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
23352 + *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
23353 }
23354 pud_p += pud_index(address);
23355 pud = *pud_p;
23356
23357 if (pud)
23358 - pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
23359 + pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
23360 else {
23361 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
23362 reset_early_page_tables();
23363 @@ -98,7 +98,7 @@ again:
23364 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
23365 for (i = 0; i < PTRS_PER_PMD; i++)
23366 pmd_p[i] = 0;
23367 - *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
23368 + *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
23369 }
23370 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
23371 pmd_p[pmd_index(address)] = pmd;
23372 @@ -175,7 +175,6 @@ asmlinkage void __init x86_64_start_kernel(char * real_mode_data)
23373 if (console_loglevel == 10)
23374 early_printk("Kernel alive\n");
23375
23376 - clear_page(init_level4_pgt);
23377 /* set init_level4_pgt kernel high mapping*/
23378 init_level4_pgt[511] = early_level4_pgt[511];
23379
23380 diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
23381 index 81ba276..30c5411 100644
23382 --- a/arch/x86/kernel/head_32.S
23383 +++ b/arch/x86/kernel/head_32.S
23384 @@ -26,6 +26,12 @@
23385 /* Physical address */
23386 #define pa(X) ((X) - __PAGE_OFFSET)
23387
23388 +#ifdef CONFIG_PAX_KERNEXEC
23389 +#define ta(X) (X)
23390 +#else
23391 +#define ta(X) ((X) - __PAGE_OFFSET)
23392 +#endif
23393 +
23394 /*
23395 * References to members of the new_cpu_data structure.
23396 */
23397 @@ -55,11 +61,7 @@
23398 * and small than max_low_pfn, otherwise will waste some page table entries
23399 */
23400
23401 -#if PTRS_PER_PMD > 1
23402 -#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
23403 -#else
23404 -#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
23405 -#endif
23406 +#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
23407
23408 /* Number of possible pages in the lowmem region */
23409 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
23410 @@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
23411 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
23412
23413 /*
23414 + * Real beginning of normal "text" segment
23415 + */
23416 +ENTRY(stext)
23417 +ENTRY(_stext)
23418 +
23419 +/*
23420 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
23421 * %esi points to the real-mode code as a 32-bit pointer.
23422 * CS and DS must be 4 GB flat segments, but we don't depend on
23423 @@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
23424 * can.
23425 */
23426 __HEAD
23427 +
23428 +#ifdef CONFIG_PAX_KERNEXEC
23429 + jmp startup_32
23430 +/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
23431 +.fill PAGE_SIZE-5,1,0xcc
23432 +#endif
23433 +
23434 ENTRY(startup_32)
23435 movl pa(stack_start),%ecx
23436
23437 @@ -106,6 +121,59 @@ ENTRY(startup_32)
23438 2:
23439 leal -__PAGE_OFFSET(%ecx),%esp
23440
23441 +#ifdef CONFIG_SMP
23442 + movl $pa(cpu_gdt_table),%edi
23443 + movl $__per_cpu_load,%eax
23444 + movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
23445 + rorl $16,%eax
23446 + movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
23447 + movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
23448 + movl $__per_cpu_end - 1,%eax
23449 + subl $__per_cpu_start,%eax
23450 + movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
23451 +#endif
23452 +
23453 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23454 + movl $NR_CPUS,%ecx
23455 + movl $pa(cpu_gdt_table),%edi
23456 +1:
23457 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
23458 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
23459 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
23460 + addl $PAGE_SIZE_asm,%edi
23461 + loop 1b
23462 +#endif
23463 +
23464 +#ifdef CONFIG_PAX_KERNEXEC
23465 + movl $pa(boot_gdt),%edi
23466 + movl $__LOAD_PHYSICAL_ADDR,%eax
23467 + movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
23468 + rorl $16,%eax
23469 + movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
23470 + movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
23471 + rorl $16,%eax
23472 +
23473 + ljmp $(__BOOT_CS),$1f
23474 +1:
23475 +
23476 + movl $NR_CPUS,%ecx
23477 + movl $pa(cpu_gdt_table),%edi
23478 + addl $__PAGE_OFFSET,%eax
23479 +1:
23480 + movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
23481 + movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
23482 + movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
23483 + movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
23484 + rorl $16,%eax
23485 + movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
23486 + movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
23487 + movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
23488 + movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
23489 + rorl $16,%eax
23490 + addl $PAGE_SIZE_asm,%edi
23491 + loop 1b
23492 +#endif
23493 +
23494 /*
23495 * Clear BSS first so that there are no surprises...
23496 */
23497 @@ -201,8 +269,11 @@ ENTRY(startup_32)
23498 movl %eax, pa(max_pfn_mapped)
23499
23500 /* Do early initialization of the fixmap area */
23501 - movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
23502 - movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
23503 +#ifdef CONFIG_COMPAT_VDSO
23504 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
23505 +#else
23506 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
23507 +#endif
23508 #else /* Not PAE */
23509
23510 page_pde_offset = (__PAGE_OFFSET >> 20);
23511 @@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
23512 movl %eax, pa(max_pfn_mapped)
23513
23514 /* Do early initialization of the fixmap area */
23515 - movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
23516 - movl %eax,pa(initial_page_table+0xffc)
23517 +#ifdef CONFIG_COMPAT_VDSO
23518 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
23519 +#else
23520 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
23521 +#endif
23522 #endif
23523
23524 #ifdef CONFIG_PARAVIRT
23525 @@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
23526 cmpl $num_subarch_entries, %eax
23527 jae bad_subarch
23528
23529 - movl pa(subarch_entries)(,%eax,4), %eax
23530 - subl $__PAGE_OFFSET, %eax
23531 - jmp *%eax
23532 + jmp *pa(subarch_entries)(,%eax,4)
23533
23534 bad_subarch:
23535 WEAK(lguest_entry)
23536 @@ -261,10 +333,10 @@ WEAK(xen_entry)
23537 __INITDATA
23538
23539 subarch_entries:
23540 - .long default_entry /* normal x86/PC */
23541 - .long lguest_entry /* lguest hypervisor */
23542 - .long xen_entry /* Xen hypervisor */
23543 - .long default_entry /* Moorestown MID */
23544 + .long ta(default_entry) /* normal x86/PC */
23545 + .long ta(lguest_entry) /* lguest hypervisor */
23546 + .long ta(xen_entry) /* Xen hypervisor */
23547 + .long ta(default_entry) /* Moorestown MID */
23548 num_subarch_entries = (. - subarch_entries) / 4
23549 .previous
23550 #else
23551 @@ -354,6 +426,7 @@ default_entry:
23552 movl pa(mmu_cr4_features),%eax
23553 movl %eax,%cr4
23554
23555 +#ifdef CONFIG_X86_PAE
23556 testb $X86_CR4_PAE, %al # check if PAE is enabled
23557 jz enable_paging
23558
23559 @@ -382,6 +455,9 @@ default_entry:
23560 /* Make changes effective */
23561 wrmsr
23562
23563 + btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
23564 +#endif
23565 +
23566 enable_paging:
23567
23568 /*
23569 @@ -449,14 +525,20 @@ is486:
23570 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
23571 movl %eax,%ss # after changing gdt.
23572
23573 - movl $(__USER_DS),%eax # DS/ES contains default USER segment
23574 +# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
23575 movl %eax,%ds
23576 movl %eax,%es
23577
23578 movl $(__KERNEL_PERCPU), %eax
23579 movl %eax,%fs # set this cpu's percpu
23580
23581 +#ifdef CONFIG_CC_STACKPROTECTOR
23582 movl $(__KERNEL_STACK_CANARY),%eax
23583 +#elif defined(CONFIG_PAX_MEMORY_UDEREF)
23584 + movl $(__USER_DS),%eax
23585 +#else
23586 + xorl %eax,%eax
23587 +#endif
23588 movl %eax,%gs
23589
23590 xorl %eax,%eax # Clear LDT
23591 @@ -512,8 +594,11 @@ setup_once:
23592 * relocation. Manually set base address in stack canary
23593 * segment descriptor.
23594 */
23595 - movl $gdt_page,%eax
23596 + movl $cpu_gdt_table,%eax
23597 movl $stack_canary,%ecx
23598 +#ifdef CONFIG_SMP
23599 + addl $__per_cpu_load,%ecx
23600 +#endif
23601 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
23602 shrl $16, %ecx
23603 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
23604 @@ -544,7 +629,7 @@ ENDPROC(early_idt_handlers)
23605 /* This is global to keep gas from relaxing the jumps */
23606 ENTRY(early_idt_handler)
23607 cld
23608 - cmpl $2,%ss:early_recursion_flag
23609 + cmpl $1,%ss:early_recursion_flag
23610 je hlt_loop
23611 incl %ss:early_recursion_flag
23612
23613 @@ -582,8 +667,8 @@ ENTRY(early_idt_handler)
23614 pushl (20+6*4)(%esp) /* trapno */
23615 pushl $fault_msg
23616 call printk
23617 -#endif
23618 call dump_stack
23619 +#endif
23620 hlt_loop:
23621 hlt
23622 jmp hlt_loop
23623 @@ -602,8 +687,11 @@ ENDPROC(early_idt_handler)
23624 /* This is the default interrupt "handler" :-) */
23625 ALIGN
23626 ignore_int:
23627 - cld
23628 #ifdef CONFIG_PRINTK
23629 + cmpl $2,%ss:early_recursion_flag
23630 + je hlt_loop
23631 + incl %ss:early_recursion_flag
23632 + cld
23633 pushl %eax
23634 pushl %ecx
23635 pushl %edx
23636 @@ -612,9 +700,6 @@ ignore_int:
23637 movl $(__KERNEL_DS),%eax
23638 movl %eax,%ds
23639 movl %eax,%es
23640 - cmpl $2,early_recursion_flag
23641 - je hlt_loop
23642 - incl early_recursion_flag
23643 pushl 16(%esp)
23644 pushl 24(%esp)
23645 pushl 32(%esp)
23646 @@ -648,29 +733,34 @@ ENTRY(setup_once_ref)
23647 /*
23648 * BSS section
23649 */
23650 -__PAGE_ALIGNED_BSS
23651 - .align PAGE_SIZE
23652 #ifdef CONFIG_X86_PAE
23653 +.section .initial_pg_pmd,"a",@progbits
23654 initial_pg_pmd:
23655 .fill 1024*KPMDS,4,0
23656 #else
23657 +.section .initial_page_table,"a",@progbits
23658 ENTRY(initial_page_table)
23659 .fill 1024,4,0
23660 #endif
23661 +.section .initial_pg_fixmap,"a",@progbits
23662 initial_pg_fixmap:
23663 .fill 1024,4,0
23664 +.section .empty_zero_page,"a",@progbits
23665 ENTRY(empty_zero_page)
23666 .fill 4096,1,0
23667 +.section .swapper_pg_dir,"a",@progbits
23668 ENTRY(swapper_pg_dir)
23669 +#ifdef CONFIG_X86_PAE
23670 + .fill 4,8,0
23671 +#else
23672 .fill 1024,4,0
23673 +#endif
23674
23675 /*
23676 * This starts the data section.
23677 */
23678 #ifdef CONFIG_X86_PAE
23679 -__PAGE_ALIGNED_DATA
23680 - /* Page-aligned for the benefit of paravirt? */
23681 - .align PAGE_SIZE
23682 +.section .initial_page_table,"a",@progbits
23683 ENTRY(initial_page_table)
23684 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
23685 # if KPMDS == 3
23686 @@ -689,12 +779,20 @@ ENTRY(initial_page_table)
23687 # error "Kernel PMDs should be 1, 2 or 3"
23688 # endif
23689 .align PAGE_SIZE /* needs to be page-sized too */
23690 +
23691 +#ifdef CONFIG_PAX_PER_CPU_PGD
23692 +ENTRY(cpu_pgd)
23693 + .rept 2*NR_CPUS
23694 + .fill 4,8,0
23695 + .endr
23696 +#endif
23697 +
23698 #endif
23699
23700 .data
23701 .balign 4
23702 ENTRY(stack_start)
23703 - .long init_thread_union+THREAD_SIZE
23704 + .long init_thread_union+THREAD_SIZE-8
23705
23706 __INITRODATA
23707 int_msg:
23708 @@ -722,7 +820,7 @@ fault_msg:
23709 * segment size, and 32-bit linear address value:
23710 */
23711
23712 - .data
23713 +.section .rodata,"a",@progbits
23714 .globl boot_gdt_descr
23715 .globl idt_descr
23716
23717 @@ -731,7 +829,7 @@ fault_msg:
23718 .word 0 # 32 bit align gdt_desc.address
23719 boot_gdt_descr:
23720 .word __BOOT_DS+7
23721 - .long boot_gdt - __PAGE_OFFSET
23722 + .long pa(boot_gdt)
23723
23724 .word 0 # 32-bit align idt_desc.address
23725 idt_descr:
23726 @@ -742,7 +840,7 @@ idt_descr:
23727 .word 0 # 32 bit align gdt_desc.address
23728 ENTRY(early_gdt_descr)
23729 .word GDT_ENTRIES*8-1
23730 - .long gdt_page /* Overwritten for secondary CPUs */
23731 + .long cpu_gdt_table /* Overwritten for secondary CPUs */
23732
23733 /*
23734 * The boot_gdt must mirror the equivalent in setup.S and is
23735 @@ -751,5 +849,65 @@ ENTRY(early_gdt_descr)
23736 .align L1_CACHE_BYTES
23737 ENTRY(boot_gdt)
23738 .fill GDT_ENTRY_BOOT_CS,8,0
23739 - .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
23740 - .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
23741 + .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
23742 + .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
23743 +
23744 + .align PAGE_SIZE_asm
23745 +ENTRY(cpu_gdt_table)
23746 + .rept NR_CPUS
23747 + .quad 0x0000000000000000 /* NULL descriptor */
23748 + .quad 0x0000000000000000 /* 0x0b reserved */
23749 + .quad 0x0000000000000000 /* 0x13 reserved */
23750 + .quad 0x0000000000000000 /* 0x1b reserved */
23751 +
23752 +#ifdef CONFIG_PAX_KERNEXEC
23753 + .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
23754 +#else
23755 + .quad 0x0000000000000000 /* 0x20 unused */
23756 +#endif
23757 +
23758 + .quad 0x0000000000000000 /* 0x28 unused */
23759 + .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
23760 + .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
23761 + .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
23762 + .quad 0x0000000000000000 /* 0x4b reserved */
23763 + .quad 0x0000000000000000 /* 0x53 reserved */
23764 + .quad 0x0000000000000000 /* 0x5b reserved */
23765 +
23766 + .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
23767 + .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
23768 + .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
23769 + .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
23770 +
23771 + .quad 0x0000000000000000 /* 0x80 TSS descriptor */
23772 + .quad 0x0000000000000000 /* 0x88 LDT descriptor */
23773 +
23774 + /*
23775 + * Segments used for calling PnP BIOS have byte granularity.
23776 + * The code segments and data segments have fixed 64k limits,
23777 + * the transfer segment sizes are set at run time.
23778 + */
23779 + .quad 0x00409b000000ffff /* 0x90 32-bit code */
23780 + .quad 0x00009b000000ffff /* 0x98 16-bit code */
23781 + .quad 0x000093000000ffff /* 0xa0 16-bit data */
23782 + .quad 0x0000930000000000 /* 0xa8 16-bit data */
23783 + .quad 0x0000930000000000 /* 0xb0 16-bit data */
23784 +
23785 + /*
23786 + * The APM segments have byte granularity and their bases
23787 + * are set at run time. All have 64k limits.
23788 + */
23789 + .quad 0x00409b000000ffff /* 0xb8 APM CS code */
23790 + .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
23791 + .quad 0x004093000000ffff /* 0xc8 APM DS data */
23792 +
23793 + .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */
23794 + .quad 0x0040930000000000 /* 0xd8 - PERCPU */
23795 + .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
23796 + .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
23797 + .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
23798 + .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
23799 +
23800 + /* Be sure this is zeroed to avoid false validations in Xen */
23801 + .fill PAGE_SIZE_asm - GDT_SIZE,1,0
23802 + .endr
23803 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
23804 index e1aabdb..fee4fee 100644
23805 --- a/arch/x86/kernel/head_64.S
23806 +++ b/arch/x86/kernel/head_64.S
23807 @@ -20,6 +20,8 @@
23808 #include <asm/processor-flags.h>
23809 #include <asm/percpu.h>
23810 #include <asm/nops.h>
23811 +#include <asm/cpufeature.h>
23812 +#include <asm/alternative-asm.h>
23813
23814 #ifdef CONFIG_PARAVIRT
23815 #include <asm/asm-offsets.h>
23816 @@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
23817 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
23818 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
23819 L3_START_KERNEL = pud_index(__START_KERNEL_map)
23820 +L4_VMALLOC_START = pgd_index(VMALLOC_START)
23821 +L3_VMALLOC_START = pud_index(VMALLOC_START)
23822 +L4_VMALLOC_END = pgd_index(VMALLOC_END)
23823 +L3_VMALLOC_END = pud_index(VMALLOC_END)
23824 +L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
23825 +L3_VMEMMAP_START = pud_index(VMEMMAP_START)
23826
23827 .text
23828 __HEAD
23829 @@ -89,11 +97,24 @@ startup_64:
23830 * Fixup the physical addresses in the page table
23831 */
23832 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
23833 + addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
23834 + addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
23835 + addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
23836 + addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
23837 + addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
23838
23839 - addq %rbp, level3_kernel_pgt + (510*8)(%rip)
23840 - addq %rbp, level3_kernel_pgt + (511*8)(%rip)
23841 + addq %rbp, level3_ident_pgt + (0*8)(%rip)
23842 +#ifndef CONFIG_XEN
23843 + addq %rbp, level3_ident_pgt + (1*8)(%rip)
23844 +#endif
23845 +
23846 + addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
23847 +
23848 + addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
23849 + addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
23850
23851 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
23852 + addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
23853
23854 /*
23855 * Set up the identity mapping for the switchover. These
23856 @@ -177,8 +198,8 @@ ENTRY(secondary_startup_64)
23857 movq $(init_level4_pgt - __START_KERNEL_map), %rax
23858 1:
23859
23860 - /* Enable PAE mode and PGE */
23861 - movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
23862 + /* Enable PAE mode and PSE/PGE */
23863 + movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
23864 movq %rcx, %cr4
23865
23866 /* Setup early boot stage 4 level pagetables. */
23867 @@ -199,10 +220,19 @@ ENTRY(secondary_startup_64)
23868 movl $MSR_EFER, %ecx
23869 rdmsr
23870 btsl $_EFER_SCE, %eax /* Enable System Call */
23871 - btl $20,%edi /* No Execute supported? */
23872 + btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
23873 jnc 1f
23874 btsl $_EFER_NX, %eax
23875 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
23876 +#ifndef CONFIG_EFI
23877 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
23878 +#endif
23879 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
23880 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
23881 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
23882 + btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
23883 + btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
23884 + btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
23885 1: wrmsr /* Make changes effective */
23886
23887 /* Setup cr0 */
23888 @@ -282,6 +312,7 @@ ENTRY(secondary_startup_64)
23889 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
23890 * address given in m16:64.
23891 */
23892 + pax_set_fptr_mask
23893 movq initial_code(%rip),%rax
23894 pushq $0 # fake return address to stop unwinder
23895 pushq $__KERNEL_CS # set correct cs
23896 @@ -388,7 +419,7 @@ ENTRY(early_idt_handler)
23897 call dump_stack
23898 #ifdef CONFIG_KALLSYMS
23899 leaq early_idt_ripmsg(%rip),%rdi
23900 - movq 40(%rsp),%rsi # %rip again
23901 + movq 88(%rsp),%rsi # %rip again
23902 call __print_symbol
23903 #endif
23904 #endif /* EARLY_PRINTK */
23905 @@ -416,6 +447,7 @@ ENDPROC(early_idt_handler)
23906 early_recursion_flag:
23907 .long 0
23908
23909 + .section .rodata,"a",@progbits
23910 #ifdef CONFIG_EARLY_PRINTK
23911 early_idt_msg:
23912 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
23913 @@ -443,29 +475,52 @@ NEXT_PAGE(early_level4_pgt)
23914 NEXT_PAGE(early_dynamic_pgts)
23915 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
23916
23917 - .data
23918 + .section .rodata,"a",@progbits
23919
23920 -#ifndef CONFIG_XEN
23921 NEXT_PAGE(init_level4_pgt)
23922 - .fill 512,8,0
23923 -#else
23924 -NEXT_PAGE(init_level4_pgt)
23925 - .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
23926 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
23927 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
23928 + .org init_level4_pgt + L4_VMALLOC_START*8, 0
23929 + .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
23930 + .org init_level4_pgt + L4_VMALLOC_END*8, 0
23931 + .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
23932 + .org init_level4_pgt + L4_VMEMMAP_START*8, 0
23933 + .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
23934 .org init_level4_pgt + L4_START_KERNEL*8, 0
23935 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
23936 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
23937
23938 +#ifdef CONFIG_PAX_PER_CPU_PGD
23939 +NEXT_PAGE(cpu_pgd)
23940 + .rept 2*NR_CPUS
23941 + .fill 512,8,0
23942 + .endr
23943 +#endif
23944 +
23945 NEXT_PAGE(level3_ident_pgt)
23946 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
23947 +#ifdef CONFIG_XEN
23948 .fill 511, 8, 0
23949 +#else
23950 + .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
23951 + .fill 510,8,0
23952 +#endif
23953 +
23954 +NEXT_PAGE(level3_vmalloc_start_pgt)
23955 + .fill 512,8,0
23956 +
23957 +NEXT_PAGE(level3_vmalloc_end_pgt)
23958 + .fill 512,8,0
23959 +
23960 +NEXT_PAGE(level3_vmemmap_pgt)
23961 + .fill L3_VMEMMAP_START,8,0
23962 + .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
23963 +
23964 NEXT_PAGE(level2_ident_pgt)
23965 - /* Since I easily can, map the first 1G.
23966 + /* Since I easily can, map the first 2G.
23967 * Don't set NX because code runs from these pages.
23968 */
23969 - PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
23970 -#endif
23971 + PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
23972
23973 NEXT_PAGE(level3_kernel_pgt)
23974 .fill L3_START_KERNEL,8,0
23975 @@ -473,6 +528,9 @@ NEXT_PAGE(level3_kernel_pgt)
23976 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
23977 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
23978
23979 +NEXT_PAGE(level2_vmemmap_pgt)
23980 + .fill 512,8,0
23981 +
23982 NEXT_PAGE(level2_kernel_pgt)
23983 /*
23984 * 512 MB kernel mapping. We spend a full page on this pagetable
23985 @@ -490,28 +548,64 @@ NEXT_PAGE(level2_kernel_pgt)
23986 NEXT_PAGE(level2_fixmap_pgt)
23987 .fill 506,8,0
23988 .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
23989 - /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
23990 - .fill 5,8,0
23991 + .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
23992 + /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
23993 + .fill 4,8,0
23994
23995 NEXT_PAGE(level1_fixmap_pgt)
23996 .fill 512,8,0
23997
23998 +NEXT_PAGE(level1_vsyscall_pgt)
23999 + .fill 512,8,0
24000 +
24001 #undef PMDS
24002
24003 - .data
24004 + .align PAGE_SIZE
24005 +ENTRY(cpu_gdt_table)
24006 + .rept NR_CPUS
24007 + .quad 0x0000000000000000 /* NULL descriptor */
24008 + .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
24009 + .quad 0x00af9b000000ffff /* __KERNEL_CS */
24010 + .quad 0x00cf93000000ffff /* __KERNEL_DS */
24011 + .quad 0x00cffb000000ffff /* __USER32_CS */
24012 + .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
24013 + .quad 0x00affb000000ffff /* __USER_CS */
24014 +
24015 +#ifdef CONFIG_PAX_KERNEXEC
24016 + .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
24017 +#else
24018 + .quad 0x0 /* unused */
24019 +#endif
24020 +
24021 + .quad 0,0 /* TSS */
24022 + .quad 0,0 /* LDT */
24023 + .quad 0,0,0 /* three TLS descriptors */
24024 + .quad 0x0000f40000000000 /* node/CPU stored in limit */
24025 + /* asm/segment.h:GDT_ENTRIES must match this */
24026 +
24027 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24028 + .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
24029 +#else
24030 + .quad 0x0 /* unused */
24031 +#endif
24032 +
24033 + /* zero the remaining page */
24034 + .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
24035 + .endr
24036 +
24037 .align 16
24038 .globl early_gdt_descr
24039 early_gdt_descr:
24040 .word GDT_ENTRIES*8-1
24041 early_gdt_descr_base:
24042 - .quad INIT_PER_CPU_VAR(gdt_page)
24043 + .quad cpu_gdt_table
24044
24045 ENTRY(phys_base)
24046 /* This must match the first entry in level2_kernel_pgt */
24047 .quad 0x0000000000000000
24048
24049 #include "../../x86/xen/xen-head.S"
24050 -
24051 - __PAGE_ALIGNED_BSS
24052 +
24053 + .section .rodata,"a",@progbits
24054 NEXT_PAGE(empty_zero_page)
24055 .skip PAGE_SIZE
24056 diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
24057 index 0fa6912..b37438b 100644
24058 --- a/arch/x86/kernel/i386_ksyms_32.c
24059 +++ b/arch/x86/kernel/i386_ksyms_32.c
24060 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
24061 EXPORT_SYMBOL(cmpxchg8b_emu);
24062 #endif
24063
24064 +EXPORT_SYMBOL_GPL(cpu_gdt_table);
24065 +
24066 /* Networking helper routines. */
24067 EXPORT_SYMBOL(csum_partial_copy_generic);
24068 +EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
24069 +EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
24070
24071 EXPORT_SYMBOL(__get_user_1);
24072 EXPORT_SYMBOL(__get_user_2);
24073 @@ -37,3 +41,11 @@ EXPORT_SYMBOL(strstr);
24074
24075 EXPORT_SYMBOL(csum_partial);
24076 EXPORT_SYMBOL(empty_zero_page);
24077 +
24078 +#ifdef CONFIG_PAX_KERNEXEC
24079 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
24080 +#endif
24081 +
24082 +#ifdef CONFIG_PAX_PER_CPU_PGD
24083 +EXPORT_SYMBOL(cpu_pgd);
24084 +#endif
24085 diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
24086 index 5d576ab..1403a03 100644
24087 --- a/arch/x86/kernel/i387.c
24088 +++ b/arch/x86/kernel/i387.c
24089 @@ -51,7 +51,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
24090 static inline bool interrupted_user_mode(void)
24091 {
24092 struct pt_regs *regs = get_irq_regs();
24093 - return regs && user_mode_vm(regs);
24094 + return regs && user_mode(regs);
24095 }
24096
24097 /*
24098 diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
24099 index 9a5c460..84868423 100644
24100 --- a/arch/x86/kernel/i8259.c
24101 +++ b/arch/x86/kernel/i8259.c
24102 @@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
24103 static void make_8259A_irq(unsigned int irq)
24104 {
24105 disable_irq_nosync(irq);
24106 - io_apic_irqs &= ~(1<<irq);
24107 + io_apic_irqs &= ~(1UL<<irq);
24108 irq_set_chip_and_handler_name(irq, &i8259A_chip, handle_level_irq,
24109 i8259A_chip.name);
24110 enable_irq(irq);
24111 @@ -209,7 +209,7 @@ spurious_8259A_irq:
24112 "spurious 8259A interrupt: IRQ%d.\n", irq);
24113 spurious_irq_mask |= irqmask;
24114 }
24115 - atomic_inc(&irq_err_count);
24116 + atomic_inc_unchecked(&irq_err_count);
24117 /*
24118 * Theoretically we do not have to handle this IRQ,
24119 * but in Linux this does not cause problems and is
24120 @@ -333,14 +333,16 @@ static void init_8259A(int auto_eoi)
24121 /* (slave's support for AEOI in flat mode is to be investigated) */
24122 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
24123
24124 + pax_open_kernel();
24125 if (auto_eoi)
24126 /*
24127 * In AEOI mode we just have to mask the interrupt
24128 * when acking.
24129 */
24130 - i8259A_chip.irq_mask_ack = disable_8259A_irq;
24131 + *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
24132 else
24133 - i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
24134 + *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
24135 + pax_close_kernel();
24136
24137 udelay(100); /* wait for 8259A to initialize */
24138
24139 diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
24140 index a979b5b..1d6db75 100644
24141 --- a/arch/x86/kernel/io_delay.c
24142 +++ b/arch/x86/kernel/io_delay.c
24143 @@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
24144 * Quirk table for systems that misbehave (lock up, etc.) if port
24145 * 0x80 is used:
24146 */
24147 -static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
24148 +static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
24149 {
24150 .callback = dmi_io_delay_0xed_port,
24151 .ident = "Compaq Presario V6000",
24152 diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
24153 index 4ddaf66..49d5c18 100644
24154 --- a/arch/x86/kernel/ioport.c
24155 +++ b/arch/x86/kernel/ioport.c
24156 @@ -6,6 +6,7 @@
24157 #include <linux/sched.h>
24158 #include <linux/kernel.h>
24159 #include <linux/capability.h>
24160 +#include <linux/security.h>
24161 #include <linux/errno.h>
24162 #include <linux/types.h>
24163 #include <linux/ioport.h>
24164 @@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
24165 return -EINVAL;
24166 if (turn_on && !capable(CAP_SYS_RAWIO))
24167 return -EPERM;
24168 +#ifdef CONFIG_GRKERNSEC_IO
24169 + if (turn_on && grsec_disable_privio) {
24170 + gr_handle_ioperm();
24171 + return -ENODEV;
24172 + }
24173 +#endif
24174
24175 /*
24176 * If it's the first ioperm() call in this thread's lifetime, set the
24177 @@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
24178 * because the ->io_bitmap_max value must match the bitmap
24179 * contents:
24180 */
24181 - tss = &per_cpu(init_tss, get_cpu());
24182 + tss = init_tss + get_cpu();
24183
24184 if (turn_on)
24185 bitmap_clear(t->io_bitmap_ptr, from, num);
24186 @@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
24187 if (level > old) {
24188 if (!capable(CAP_SYS_RAWIO))
24189 return -EPERM;
24190 +#ifdef CONFIG_GRKERNSEC_IO
24191 + if (grsec_disable_privio) {
24192 + gr_handle_iopl();
24193 + return -ENODEV;
24194 + }
24195 +#endif
24196 }
24197 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
24198 t->iopl = level << 12;
24199 diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
24200 index 22d0687..e07b2a5 100644
24201 --- a/arch/x86/kernel/irq.c
24202 +++ b/arch/x86/kernel/irq.c
24203 @@ -21,7 +21,7 @@
24204 #define CREATE_TRACE_POINTS
24205 #include <asm/trace/irq_vectors.h>
24206
24207 -atomic_t irq_err_count;
24208 +atomic_unchecked_t irq_err_count;
24209
24210 /* Function pointer for generic interrupt vector handling */
24211 void (*x86_platform_ipi_callback)(void) = NULL;
24212 @@ -125,9 +125,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
24213 seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
24214 seq_printf(p, " Machine check polls\n");
24215 #endif
24216 - seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
24217 + seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
24218 #if defined(CONFIG_X86_IO_APIC)
24219 - seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
24220 + seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
24221 #endif
24222 return 0;
24223 }
24224 @@ -167,7 +167,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
24225
24226 u64 arch_irq_stat(void)
24227 {
24228 - u64 sum = atomic_read(&irq_err_count);
24229 + u64 sum = atomic_read_unchecked(&irq_err_count);
24230 return sum;
24231 }
24232
24233 diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
24234 index 4186755..784efa0 100644
24235 --- a/arch/x86/kernel/irq_32.c
24236 +++ b/arch/x86/kernel/irq_32.c
24237 @@ -39,7 +39,7 @@ static int check_stack_overflow(void)
24238 __asm__ __volatile__("andl %%esp,%0" :
24239 "=r" (sp) : "0" (THREAD_SIZE - 1));
24240
24241 - return sp < (sizeof(struct thread_info) + STACK_WARN);
24242 + return sp < STACK_WARN;
24243 }
24244
24245 static void print_stack_overflow(void)
24246 @@ -59,8 +59,8 @@ static inline void print_stack_overflow(void) { }
24247 * per-CPU IRQ handling contexts (thread information and stack)
24248 */
24249 union irq_ctx {
24250 - struct thread_info tinfo;
24251 - u32 stack[THREAD_SIZE/sizeof(u32)];
24252 + unsigned long previous_esp;
24253 + u32 stack[THREAD_SIZE/sizeof(u32)];
24254 } __attribute__((aligned(THREAD_SIZE)));
24255
24256 static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
24257 @@ -80,10 +80,9 @@ static void call_on_stack(void *func, void *stack)
24258 static inline int
24259 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
24260 {
24261 - union irq_ctx *curctx, *irqctx;
24262 + union irq_ctx *irqctx;
24263 u32 *isp, arg1, arg2;
24264
24265 - curctx = (union irq_ctx *) current_thread_info();
24266 irqctx = __this_cpu_read(hardirq_ctx);
24267
24268 /*
24269 @@ -92,16 +91,16 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
24270 * handler) we can't do that and just have to keep using the
24271 * current stack (which is the irq stack already after all)
24272 */
24273 - if (unlikely(curctx == irqctx))
24274 + if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_SIZE))
24275 return 0;
24276
24277 /* build the stack frame on the IRQ stack */
24278 - isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
24279 - irqctx->tinfo.task = curctx->tinfo.task;
24280 - irqctx->tinfo.previous_esp = current_stack_pointer;
24281 + isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
24282 + irqctx->previous_esp = current_stack_pointer;
24283
24284 - /* Copy the preempt_count so that the [soft]irq checks work. */
24285 - irqctx->tinfo.preempt_count = curctx->tinfo.preempt_count;
24286 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24287 + __set_fs(MAKE_MM_SEG(0));
24288 +#endif
24289
24290 if (unlikely(overflow))
24291 call_on_stack(print_stack_overflow, isp);
24292 @@ -113,6 +112,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
24293 : "0" (irq), "1" (desc), "2" (isp),
24294 "D" (desc->handle_irq)
24295 : "memory", "cc", "ecx");
24296 +
24297 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24298 + __set_fs(current_thread_info()->addr_limit);
24299 +#endif
24300 +
24301 return 1;
24302 }
24303
24304 @@ -121,29 +125,14 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
24305 */
24306 void irq_ctx_init(int cpu)
24307 {
24308 - union irq_ctx *irqctx;
24309 -
24310 if (per_cpu(hardirq_ctx, cpu))
24311 return;
24312
24313 - irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
24314 - THREADINFO_GFP,
24315 - THREAD_SIZE_ORDER));
24316 - memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
24317 - irqctx->tinfo.cpu = cpu;
24318 - irqctx->tinfo.preempt_count = HARDIRQ_OFFSET;
24319 - irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
24320 + per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
24321 + per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
24322
24323 - per_cpu(hardirq_ctx, cpu) = irqctx;
24324 -
24325 - irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
24326 - THREADINFO_GFP,
24327 - THREAD_SIZE_ORDER));
24328 - memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
24329 - irqctx->tinfo.cpu = cpu;
24330 - irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
24331 -
24332 - per_cpu(softirq_ctx, cpu) = irqctx;
24333 + printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
24334 + cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
24335
24336 printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
24337 cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
24338 @@ -152,7 +141,6 @@ void irq_ctx_init(int cpu)
24339 asmlinkage void do_softirq(void)
24340 {
24341 unsigned long flags;
24342 - struct thread_info *curctx;
24343 union irq_ctx *irqctx;
24344 u32 *isp;
24345
24346 @@ -162,15 +150,22 @@ asmlinkage void do_softirq(void)
24347 local_irq_save(flags);
24348
24349 if (local_softirq_pending()) {
24350 - curctx = current_thread_info();
24351 irqctx = __this_cpu_read(softirq_ctx);
24352 - irqctx->tinfo.task = curctx->task;
24353 - irqctx->tinfo.previous_esp = current_stack_pointer;
24354 + irqctx->previous_esp = current_stack_pointer;
24355
24356 /* build the stack frame on the softirq stack */
24357 - isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
24358 + isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
24359 +
24360 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24361 + __set_fs(MAKE_MM_SEG(0));
24362 +#endif
24363
24364 call_on_stack(__do_softirq, isp);
24365 +
24366 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24367 + __set_fs(current_thread_info()->addr_limit);
24368 +#endif
24369 +
24370 /*
24371 * Shouldn't happen, we returned above if in_interrupt():
24372 */
24373 @@ -191,7 +186,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
24374 if (unlikely(!desc))
24375 return false;
24376
24377 - if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
24378 + if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
24379 if (unlikely(overflow))
24380 print_stack_overflow();
24381 desc->handle_irq(irq, desc);
24382 diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
24383 index d04d3ec..ea4b374 100644
24384 --- a/arch/x86/kernel/irq_64.c
24385 +++ b/arch/x86/kernel/irq_64.c
24386 @@ -44,7 +44,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
24387 u64 estack_top, estack_bottom;
24388 u64 curbase = (u64)task_stack_page(current);
24389
24390 - if (user_mode_vm(regs))
24391 + if (user_mode(regs))
24392 return;
24393
24394 if (regs->sp >= curbase + sizeof(struct thread_info) +
24395 diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
24396 index ee11b7d..4df4d0c 100644
24397 --- a/arch/x86/kernel/jump_label.c
24398 +++ b/arch/x86/kernel/jump_label.c
24399 @@ -49,7 +49,7 @@ static void __jump_label_transform(struct jump_entry *entry,
24400 * We are enabling this jump label. If it is not a nop
24401 * then something must have gone wrong.
24402 */
24403 - if (unlikely(memcmp((void *)entry->code, ideal_nop, 5) != 0))
24404 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5) != 0))
24405 bug_at((void *)entry->code, __LINE__);
24406
24407 code.jump = 0xe9;
24408 @@ -64,13 +64,13 @@ static void __jump_label_transform(struct jump_entry *entry,
24409 */
24410 if (init) {
24411 const unsigned char default_nop[] = { STATIC_KEY_INIT_NOP };
24412 - if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
24413 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
24414 bug_at((void *)entry->code, __LINE__);
24415 } else {
24416 code.jump = 0xe9;
24417 code.offset = entry->target -
24418 (entry->code + JUMP_LABEL_NOP_SIZE);
24419 - if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
24420 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
24421 bug_at((void *)entry->code, __LINE__);
24422 }
24423 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
24424 diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
24425 index 836f832..a8bda67 100644
24426 --- a/arch/x86/kernel/kgdb.c
24427 +++ b/arch/x86/kernel/kgdb.c
24428 @@ -127,11 +127,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
24429 #ifdef CONFIG_X86_32
24430 switch (regno) {
24431 case GDB_SS:
24432 - if (!user_mode_vm(regs))
24433 + if (!user_mode(regs))
24434 *(unsigned long *)mem = __KERNEL_DS;
24435 break;
24436 case GDB_SP:
24437 - if (!user_mode_vm(regs))
24438 + if (!user_mode(regs))
24439 *(unsigned long *)mem = kernel_stack_pointer(regs);
24440 break;
24441 case GDB_GS:
24442 @@ -229,7 +229,10 @@ static void kgdb_correct_hw_break(void)
24443 bp->attr.bp_addr = breakinfo[breakno].addr;
24444 bp->attr.bp_len = breakinfo[breakno].len;
24445 bp->attr.bp_type = breakinfo[breakno].type;
24446 - info->address = breakinfo[breakno].addr;
24447 + if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
24448 + info->address = ktla_ktva(breakinfo[breakno].addr);
24449 + else
24450 + info->address = breakinfo[breakno].addr;
24451 info->len = breakinfo[breakno].len;
24452 info->type = breakinfo[breakno].type;
24453 val = arch_install_hw_breakpoint(bp);
24454 @@ -476,12 +479,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
24455 case 'k':
24456 /* clear the trace bit */
24457 linux_regs->flags &= ~X86_EFLAGS_TF;
24458 - atomic_set(&kgdb_cpu_doing_single_step, -1);
24459 + atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
24460
24461 /* set the trace bit if we're stepping */
24462 if (remcomInBuffer[0] == 's') {
24463 linux_regs->flags |= X86_EFLAGS_TF;
24464 - atomic_set(&kgdb_cpu_doing_single_step,
24465 + atomic_set_unchecked(&kgdb_cpu_doing_single_step,
24466 raw_smp_processor_id());
24467 }
24468
24469 @@ -546,7 +549,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
24470
24471 switch (cmd) {
24472 case DIE_DEBUG:
24473 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
24474 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
24475 if (user_mode(regs))
24476 return single_step_cont(regs, args);
24477 break;
24478 @@ -751,11 +754,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
24479 #endif /* CONFIG_DEBUG_RODATA */
24480
24481 bpt->type = BP_BREAKPOINT;
24482 - err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
24483 + err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
24484 BREAK_INSTR_SIZE);
24485 if (err)
24486 return err;
24487 - err = probe_kernel_write((char *)bpt->bpt_addr,
24488 + err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
24489 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
24490 #ifdef CONFIG_DEBUG_RODATA
24491 if (!err)
24492 @@ -768,7 +771,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
24493 return -EBUSY;
24494 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
24495 BREAK_INSTR_SIZE);
24496 - err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
24497 + err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
24498 if (err)
24499 return err;
24500 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
24501 @@ -793,13 +796,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
24502 if (mutex_is_locked(&text_mutex))
24503 goto knl_write;
24504 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
24505 - err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
24506 + err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
24507 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
24508 goto knl_write;
24509 return err;
24510 knl_write:
24511 #endif /* CONFIG_DEBUG_RODATA */
24512 - return probe_kernel_write((char *)bpt->bpt_addr,
24513 + return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
24514 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
24515 }
24516
24517 diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
24518 index 79a3f96..6ba030a 100644
24519 --- a/arch/x86/kernel/kprobes/core.c
24520 +++ b/arch/x86/kernel/kprobes/core.c
24521 @@ -119,9 +119,12 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
24522 s32 raddr;
24523 } __packed *insn;
24524
24525 - insn = (struct __arch_relative_insn *)from;
24526 + insn = (struct __arch_relative_insn *)ktla_ktva(from);
24527 +
24528 + pax_open_kernel();
24529 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
24530 insn->op = op;
24531 + pax_close_kernel();
24532 }
24533
24534 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
24535 @@ -164,7 +167,7 @@ int __kprobes can_boost(kprobe_opcode_t *opcodes)
24536 kprobe_opcode_t opcode;
24537 kprobe_opcode_t *orig_opcodes = opcodes;
24538
24539 - if (search_exception_tables((unsigned long)opcodes))
24540 + if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
24541 return 0; /* Page fault may occur on this address. */
24542
24543 retry:
24544 @@ -238,9 +241,9 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
24545 * for the first byte, we can recover the original instruction
24546 * from it and kp->opcode.
24547 */
24548 - memcpy(buf, kp->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
24549 + memcpy(buf, ktla_ktva(kp->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
24550 buf[0] = kp->opcode;
24551 - return (unsigned long)buf;
24552 + return ktva_ktla((unsigned long)buf);
24553 }
24554
24555 /*
24556 @@ -332,7 +335,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
24557 /* Another subsystem puts a breakpoint, failed to recover */
24558 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
24559 return 0;
24560 + pax_open_kernel();
24561 memcpy(dest, insn.kaddr, insn.length);
24562 + pax_close_kernel();
24563
24564 #ifdef CONFIG_X86_64
24565 if (insn_rip_relative(&insn)) {
24566 @@ -359,7 +364,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
24567 return 0;
24568 }
24569 disp = (u8 *) dest + insn_offset_displacement(&insn);
24570 + pax_open_kernel();
24571 *(s32 *) disp = (s32) newdisp;
24572 + pax_close_kernel();
24573 }
24574 #endif
24575 return insn.length;
24576 @@ -498,7 +505,7 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
24577 * nor set current_kprobe, because it doesn't use single
24578 * stepping.
24579 */
24580 - regs->ip = (unsigned long)p->ainsn.insn;
24581 + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
24582 preempt_enable_no_resched();
24583 return;
24584 }
24585 @@ -515,9 +522,9 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
24586 regs->flags &= ~X86_EFLAGS_IF;
24587 /* single step inline if the instruction is an int3 */
24588 if (p->opcode == BREAKPOINT_INSTRUCTION)
24589 - regs->ip = (unsigned long)p->addr;
24590 + regs->ip = ktla_ktva((unsigned long)p->addr);
24591 else
24592 - regs->ip = (unsigned long)p->ainsn.insn;
24593 + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
24594 }
24595
24596 /*
24597 @@ -596,7 +603,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
24598 setup_singlestep(p, regs, kcb, 0);
24599 return 1;
24600 }
24601 - } else if (*addr != BREAKPOINT_INSTRUCTION) {
24602 + } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
24603 /*
24604 * The breakpoint instruction was removed right
24605 * after we hit it. Another cpu has removed
24606 @@ -642,6 +649,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
24607 " movq %rax, 152(%rsp)\n"
24608 RESTORE_REGS_STRING
24609 " popfq\n"
24610 +#ifdef KERNEXEC_PLUGIN
24611 + " btsq $63,(%rsp)\n"
24612 +#endif
24613 #else
24614 " pushf\n"
24615 SAVE_REGS_STRING
24616 @@ -779,7 +789,7 @@ static void __kprobes
24617 resume_execution(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)
24618 {
24619 unsigned long *tos = stack_addr(regs);
24620 - unsigned long copy_ip = (unsigned long)p->ainsn.insn;
24621 + unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
24622 unsigned long orig_ip = (unsigned long)p->addr;
24623 kprobe_opcode_t *insn = p->ainsn.insn;
24624
24625 @@ -961,7 +971,7 @@ kprobe_exceptions_notify(struct notifier_block *self, unsigned long val, void *d
24626 struct die_args *args = data;
24627 int ret = NOTIFY_DONE;
24628
24629 - if (args->regs && user_mode_vm(args->regs))
24630 + if (args->regs && user_mode(args->regs))
24631 return ret;
24632
24633 switch (val) {
24634 diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
24635 index 898160b..758cde8 100644
24636 --- a/arch/x86/kernel/kprobes/opt.c
24637 +++ b/arch/x86/kernel/kprobes/opt.c
24638 @@ -79,6 +79,7 @@ found:
24639 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
24640 static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
24641 {
24642 + pax_open_kernel();
24643 #ifdef CONFIG_X86_64
24644 *addr++ = 0x48;
24645 *addr++ = 0xbf;
24646 @@ -86,6 +87,7 @@ static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long v
24647 *addr++ = 0xb8;
24648 #endif
24649 *(unsigned long *)addr = val;
24650 + pax_close_kernel();
24651 }
24652
24653 asm (
24654 @@ -335,7 +337,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
24655 * Verify if the address gap is in 2GB range, because this uses
24656 * a relative jump.
24657 */
24658 - rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
24659 + rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
24660 if (abs(rel) > 0x7fffffff)
24661 return -ERANGE;
24662
24663 @@ -350,16 +352,18 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
24664 op->optinsn.size = ret;
24665
24666 /* Copy arch-dep-instance from template */
24667 - memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
24668 + pax_open_kernel();
24669 + memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
24670 + pax_close_kernel();
24671
24672 /* Set probe information */
24673 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
24674
24675 /* Set probe function call */
24676 - synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
24677 + synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
24678
24679 /* Set returning jmp instruction at the tail of out-of-line buffer */
24680 - synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
24681 + synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
24682 (u8 *)op->kp.addr + op->optinsn.size);
24683
24684 flush_icache_range((unsigned long) buf,
24685 @@ -384,7 +388,7 @@ void __kprobes arch_optimize_kprobes(struct list_head *oplist)
24686 WARN_ON(kprobe_disabled(&op->kp));
24687
24688 /* Backup instructions which will be replaced by jump address */
24689 - memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
24690 + memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
24691 RELATIVE_ADDR_SIZE);
24692
24693 insn_buf[0] = RELATIVEJUMP_OPCODE;
24694 @@ -433,7 +437,7 @@ setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
24695 /* This kprobe is really able to run optimized path. */
24696 op = container_of(p, struct optimized_kprobe, kp);
24697 /* Detour through copied instructions */
24698 - regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
24699 + regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
24700 if (!reenter)
24701 reset_current_kprobe();
24702 preempt_enable_no_resched();
24703 diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
24704 index ebc9873..1b9724b 100644
24705 --- a/arch/x86/kernel/ldt.c
24706 +++ b/arch/x86/kernel/ldt.c
24707 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
24708 if (reload) {
24709 #ifdef CONFIG_SMP
24710 preempt_disable();
24711 - load_LDT(pc);
24712 + load_LDT_nolock(pc);
24713 if (!cpumask_equal(mm_cpumask(current->mm),
24714 cpumask_of(smp_processor_id())))
24715 smp_call_function(flush_ldt, current->mm, 1);
24716 preempt_enable();
24717 #else
24718 - load_LDT(pc);
24719 + load_LDT_nolock(pc);
24720 #endif
24721 }
24722 if (oldsize) {
24723 @@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
24724 return err;
24725
24726 for (i = 0; i < old->size; i++)
24727 - write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
24728 + write_ldt_entry(new->ldt, i, old->ldt + i);
24729 return 0;
24730 }
24731
24732 @@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
24733 retval = copy_ldt(&mm->context, &old_mm->context);
24734 mutex_unlock(&old_mm->context.lock);
24735 }
24736 +
24737 + if (tsk == current) {
24738 + mm->context.vdso = 0;
24739 +
24740 +#ifdef CONFIG_X86_32
24741 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24742 + mm->context.user_cs_base = 0UL;
24743 + mm->context.user_cs_limit = ~0UL;
24744 +
24745 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
24746 + cpus_clear(mm->context.cpu_user_cs_mask);
24747 +#endif
24748 +
24749 +#endif
24750 +#endif
24751 +
24752 + }
24753 +
24754 return retval;
24755 }
24756
24757 @@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
24758 }
24759 }
24760
24761 +#ifdef CONFIG_PAX_SEGMEXEC
24762 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
24763 + error = -EINVAL;
24764 + goto out_unlock;
24765 + }
24766 +#endif
24767 +
24768 fill_ldt(&ldt, &ldt_info);
24769 if (oldmode)
24770 ldt.avl = 0;
24771 diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
24772 index 5b19e4d..6476a76 100644
24773 --- a/arch/x86/kernel/machine_kexec_32.c
24774 +++ b/arch/x86/kernel/machine_kexec_32.c
24775 @@ -26,7 +26,7 @@
24776 #include <asm/cacheflush.h>
24777 #include <asm/debugreg.h>
24778
24779 -static void set_idt(void *newidt, __u16 limit)
24780 +static void set_idt(struct desc_struct *newidt, __u16 limit)
24781 {
24782 struct desc_ptr curidt;
24783
24784 @@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
24785 }
24786
24787
24788 -static void set_gdt(void *newgdt, __u16 limit)
24789 +static void set_gdt(struct desc_struct *newgdt, __u16 limit)
24790 {
24791 struct desc_ptr curgdt;
24792
24793 @@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image)
24794 }
24795
24796 control_page = page_address(image->control_code_page);
24797 - memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
24798 + memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
24799
24800 relocate_kernel_ptr = control_page;
24801 page_list[PA_CONTROL_PAGE] = __pa(control_page);
24802 diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
24803 index 15c9876..0a43909 100644
24804 --- a/arch/x86/kernel/microcode_core.c
24805 +++ b/arch/x86/kernel/microcode_core.c
24806 @@ -513,7 +513,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
24807 return NOTIFY_OK;
24808 }
24809
24810 -static struct notifier_block __refdata mc_cpu_notifier = {
24811 +static struct notifier_block mc_cpu_notifier = {
24812 .notifier_call = mc_cpu_callback,
24813 };
24814
24815 diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
24816 index 5fb2ceb..3ae90bb 100644
24817 --- a/arch/x86/kernel/microcode_intel.c
24818 +++ b/arch/x86/kernel/microcode_intel.c
24819 @@ -293,13 +293,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
24820
24821 static int get_ucode_user(void *to, const void *from, size_t n)
24822 {
24823 - return copy_from_user(to, from, n);
24824 + return copy_from_user(to, (const void __force_user *)from, n);
24825 }
24826
24827 static enum ucode_state
24828 request_microcode_user(int cpu, const void __user *buf, size_t size)
24829 {
24830 - return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
24831 + return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
24832 }
24833
24834 static void microcode_fini_cpu(int cpu)
24835 diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
24836 index 216a4d7..228255a 100644
24837 --- a/arch/x86/kernel/module.c
24838 +++ b/arch/x86/kernel/module.c
24839 @@ -43,15 +43,60 @@ do { \
24840 } while (0)
24841 #endif
24842
24843 -void *module_alloc(unsigned long size)
24844 +static inline void *__module_alloc(unsigned long size, pgprot_t prot)
24845 {
24846 - if (PAGE_ALIGN(size) > MODULES_LEN)
24847 + if (!size || PAGE_ALIGN(size) > MODULES_LEN)
24848 return NULL;
24849 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
24850 - GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
24851 + GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot,
24852 -1, __builtin_return_address(0));
24853 }
24854
24855 +void *module_alloc(unsigned long size)
24856 +{
24857 +
24858 +#ifdef CONFIG_PAX_KERNEXEC
24859 + return __module_alloc(size, PAGE_KERNEL);
24860 +#else
24861 + return __module_alloc(size, PAGE_KERNEL_EXEC);
24862 +#endif
24863 +
24864 +}
24865 +
24866 +#ifdef CONFIG_PAX_KERNEXEC
24867 +#ifdef CONFIG_X86_32
24868 +void *module_alloc_exec(unsigned long size)
24869 +{
24870 + struct vm_struct *area;
24871 +
24872 + if (size == 0)
24873 + return NULL;
24874 +
24875 + area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
24876 + return area ? area->addr : NULL;
24877 +}
24878 +EXPORT_SYMBOL(module_alloc_exec);
24879 +
24880 +void module_free_exec(struct module *mod, void *module_region)
24881 +{
24882 + vunmap(module_region);
24883 +}
24884 +EXPORT_SYMBOL(module_free_exec);
24885 +#else
24886 +void module_free_exec(struct module *mod, void *module_region)
24887 +{
24888 + module_free(mod, module_region);
24889 +}
24890 +EXPORT_SYMBOL(module_free_exec);
24891 +
24892 +void *module_alloc_exec(unsigned long size)
24893 +{
24894 + return __module_alloc(size, PAGE_KERNEL_RX);
24895 +}
24896 +EXPORT_SYMBOL(module_alloc_exec);
24897 +#endif
24898 +#endif
24899 +
24900 #ifdef CONFIG_X86_32
24901 int apply_relocate(Elf32_Shdr *sechdrs,
24902 const char *strtab,
24903 @@ -62,14 +107,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
24904 unsigned int i;
24905 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
24906 Elf32_Sym *sym;
24907 - uint32_t *location;
24908 + uint32_t *plocation, location;
24909
24910 DEBUGP("Applying relocate section %u to %u\n",
24911 relsec, sechdrs[relsec].sh_info);
24912 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
24913 /* This is where to make the change */
24914 - location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
24915 - + rel[i].r_offset;
24916 + plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
24917 + location = (uint32_t)plocation;
24918 + if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
24919 + plocation = ktla_ktva((void *)plocation);
24920 /* This is the symbol it is referring to. Note that all
24921 undefined symbols have been resolved. */
24922 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
24923 @@ -78,11 +125,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
24924 switch (ELF32_R_TYPE(rel[i].r_info)) {
24925 case R_386_32:
24926 /* We add the value into the location given */
24927 - *location += sym->st_value;
24928 + pax_open_kernel();
24929 + *plocation += sym->st_value;
24930 + pax_close_kernel();
24931 break;
24932 case R_386_PC32:
24933 /* Add the value, subtract its position */
24934 - *location += sym->st_value - (uint32_t)location;
24935 + pax_open_kernel();
24936 + *plocation += sym->st_value - location;
24937 + pax_close_kernel();
24938 break;
24939 default:
24940 pr_err("%s: Unknown relocation: %u\n",
24941 @@ -127,21 +178,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
24942 case R_X86_64_NONE:
24943 break;
24944 case R_X86_64_64:
24945 + pax_open_kernel();
24946 *(u64 *)loc = val;
24947 + pax_close_kernel();
24948 break;
24949 case R_X86_64_32:
24950 + pax_open_kernel();
24951 *(u32 *)loc = val;
24952 + pax_close_kernel();
24953 if (val != *(u32 *)loc)
24954 goto overflow;
24955 break;
24956 case R_X86_64_32S:
24957 + pax_open_kernel();
24958 *(s32 *)loc = val;
24959 + pax_close_kernel();
24960 if ((s64)val != *(s32 *)loc)
24961 goto overflow;
24962 break;
24963 case R_X86_64_PC32:
24964 val -= (u64)loc;
24965 + pax_open_kernel();
24966 *(u32 *)loc = val;
24967 + pax_close_kernel();
24968 +
24969 #if 0
24970 if ((s64)val != *(s32 *)loc)
24971 goto overflow;
24972 diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
24973 index 88458fa..349f7a4 100644
24974 --- a/arch/x86/kernel/msr.c
24975 +++ b/arch/x86/kernel/msr.c
24976 @@ -233,7 +233,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
24977 return notifier_from_errno(err);
24978 }
24979
24980 -static struct notifier_block __refdata msr_class_cpu_notifier = {
24981 +static struct notifier_block msr_class_cpu_notifier = {
24982 .notifier_call = msr_class_cpu_callback,
24983 };
24984
24985 diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
24986 index 6fcb49c..5b3f4ff 100644
24987 --- a/arch/x86/kernel/nmi.c
24988 +++ b/arch/x86/kernel/nmi.c
24989 @@ -138,7 +138,7 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2
24990 return handled;
24991 }
24992
24993 -int __register_nmi_handler(unsigned int type, struct nmiaction *action)
24994 +int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
24995 {
24996 struct nmi_desc *desc = nmi_to_desc(type);
24997 unsigned long flags;
24998 @@ -162,9 +162,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
24999 * event confuses some handlers (kdump uses this flag)
25000 */
25001 if (action->flags & NMI_FLAG_FIRST)
25002 - list_add_rcu(&action->list, &desc->head);
25003 + pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
25004 else
25005 - list_add_tail_rcu(&action->list, &desc->head);
25006 + pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
25007
25008 spin_unlock_irqrestore(&desc->lock, flags);
25009 return 0;
25010 @@ -187,7 +187,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
25011 if (!strcmp(n->name, name)) {
25012 WARN(in_nmi(),
25013 "Trying to free NMI (%s) from NMI context!\n", n->name);
25014 - list_del_rcu(&n->list);
25015 + pax_list_del_rcu((struct list_head *)&n->list);
25016 break;
25017 }
25018 }
25019 @@ -512,6 +512,17 @@ static inline void nmi_nesting_postprocess(void)
25020 dotraplinkage notrace __kprobes void
25021 do_nmi(struct pt_regs *regs, long error_code)
25022 {
25023 +
25024 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
25025 + if (!user_mode(regs)) {
25026 + unsigned long cs = regs->cs & 0xFFFF;
25027 + unsigned long ip = ktva_ktla(regs->ip);
25028 +
25029 + if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
25030 + regs->ip = ip;
25031 + }
25032 +#endif
25033 +
25034 nmi_nesting_preprocess(regs);
25035
25036 nmi_enter();
25037 diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
25038 index 6d9582e..f746287 100644
25039 --- a/arch/x86/kernel/nmi_selftest.c
25040 +++ b/arch/x86/kernel/nmi_selftest.c
25041 @@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
25042 {
25043 /* trap all the unknown NMIs we may generate */
25044 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
25045 - __initdata);
25046 + __initconst);
25047 }
25048
25049 static void __init cleanup_nmi_testsuite(void)
25050 @@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
25051 unsigned long timeout;
25052
25053 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
25054 - NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
25055 + NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
25056 nmi_fail = FAILURE;
25057 return;
25058 }
25059 diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
25060 index bbb6c73..24a58ef 100644
25061 --- a/arch/x86/kernel/paravirt-spinlocks.c
25062 +++ b/arch/x86/kernel/paravirt-spinlocks.c
25063 @@ -8,7 +8,7 @@
25064
25065 #include <asm/paravirt.h>
25066
25067 -struct pv_lock_ops pv_lock_ops = {
25068 +struct pv_lock_ops pv_lock_ops __read_only = {
25069 #ifdef CONFIG_SMP
25070 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
25071 .unlock_kick = paravirt_nop,
25072 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
25073 index 1b10af8..0b58cbc 100644
25074 --- a/arch/x86/kernel/paravirt.c
25075 +++ b/arch/x86/kernel/paravirt.c
25076 @@ -55,6 +55,9 @@ u64 _paravirt_ident_64(u64 x)
25077 {
25078 return x;
25079 }
25080 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25081 +PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
25082 +#endif
25083
25084 void __init default_banner(void)
25085 {
25086 @@ -142,15 +145,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
25087 if (opfunc == NULL)
25088 /* If there's no function, patch it with a ud2a (BUG) */
25089 ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
25090 - else if (opfunc == _paravirt_nop)
25091 + else if (opfunc == (void *)_paravirt_nop)
25092 /* If the operation is a nop, then nop the callsite */
25093 ret = paravirt_patch_nop();
25094
25095 /* identity functions just return their single argument */
25096 - else if (opfunc == _paravirt_ident_32)
25097 + else if (opfunc == (void *)_paravirt_ident_32)
25098 ret = paravirt_patch_ident_32(insnbuf, len);
25099 - else if (opfunc == _paravirt_ident_64)
25100 + else if (opfunc == (void *)_paravirt_ident_64)
25101 ret = paravirt_patch_ident_64(insnbuf, len);
25102 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25103 + else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
25104 + ret = paravirt_patch_ident_64(insnbuf, len);
25105 +#endif
25106
25107 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
25108 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
25109 @@ -175,7 +182,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
25110 if (insn_len > len || start == NULL)
25111 insn_len = len;
25112 else
25113 - memcpy(insnbuf, start, insn_len);
25114 + memcpy(insnbuf, ktla_ktva(start), insn_len);
25115
25116 return insn_len;
25117 }
25118 @@ -299,7 +306,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
25119 return this_cpu_read(paravirt_lazy_mode);
25120 }
25121
25122 -struct pv_info pv_info = {
25123 +struct pv_info pv_info __read_only = {
25124 .name = "bare hardware",
25125 .paravirt_enabled = 0,
25126 .kernel_rpl = 0,
25127 @@ -310,16 +317,16 @@ struct pv_info pv_info = {
25128 #endif
25129 };
25130
25131 -struct pv_init_ops pv_init_ops = {
25132 +struct pv_init_ops pv_init_ops __read_only = {
25133 .patch = native_patch,
25134 };
25135
25136 -struct pv_time_ops pv_time_ops = {
25137 +struct pv_time_ops pv_time_ops __read_only = {
25138 .sched_clock = native_sched_clock,
25139 .steal_clock = native_steal_clock,
25140 };
25141
25142 -__visible struct pv_irq_ops pv_irq_ops = {
25143 +__visible struct pv_irq_ops pv_irq_ops __read_only = {
25144 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
25145 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
25146 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
25147 @@ -331,7 +338,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
25148 #endif
25149 };
25150
25151 -__visible struct pv_cpu_ops pv_cpu_ops = {
25152 +__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
25153 .cpuid = native_cpuid,
25154 .get_debugreg = native_get_debugreg,
25155 .set_debugreg = native_set_debugreg,
25156 @@ -389,21 +396,26 @@ __visible struct pv_cpu_ops pv_cpu_ops = {
25157 .end_context_switch = paravirt_nop,
25158 };
25159
25160 -struct pv_apic_ops pv_apic_ops = {
25161 +struct pv_apic_ops pv_apic_ops __read_only= {
25162 #ifdef CONFIG_X86_LOCAL_APIC
25163 .startup_ipi_hook = paravirt_nop,
25164 #endif
25165 };
25166
25167 -#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
25168 +#ifdef CONFIG_X86_32
25169 +#ifdef CONFIG_X86_PAE
25170 +/* 64-bit pagetable entries */
25171 +#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
25172 +#else
25173 /* 32-bit pagetable entries */
25174 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
25175 +#endif
25176 #else
25177 /* 64-bit pagetable entries */
25178 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
25179 #endif
25180
25181 -struct pv_mmu_ops pv_mmu_ops = {
25182 +struct pv_mmu_ops pv_mmu_ops __read_only = {
25183
25184 .read_cr2 = native_read_cr2,
25185 .write_cr2 = native_write_cr2,
25186 @@ -453,6 +465,7 @@ struct pv_mmu_ops pv_mmu_ops = {
25187 .make_pud = PTE_IDENT,
25188
25189 .set_pgd = native_set_pgd,
25190 + .set_pgd_batched = native_set_pgd_batched,
25191 #endif
25192 #endif /* PAGETABLE_LEVELS >= 3 */
25193
25194 @@ -473,6 +486,12 @@ struct pv_mmu_ops pv_mmu_ops = {
25195 },
25196
25197 .set_fixmap = native_set_fixmap,
25198 +
25199 +#ifdef CONFIG_PAX_KERNEXEC
25200 + .pax_open_kernel = native_pax_open_kernel,
25201 + .pax_close_kernel = native_pax_close_kernel,
25202 +#endif
25203 +
25204 };
25205
25206 EXPORT_SYMBOL_GPL(pv_time_ops);
25207 diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
25208 index 299d493..2ccb0ee 100644
25209 --- a/arch/x86/kernel/pci-calgary_64.c
25210 +++ b/arch/x86/kernel/pci-calgary_64.c
25211 @@ -1339,7 +1339,7 @@ static void __init get_tce_space_from_tar(void)
25212 tce_space = be64_to_cpu(readq(target));
25213 tce_space = tce_space & TAR_SW_BITS;
25214
25215 - tce_space = tce_space & (~specified_table_size);
25216 + tce_space = tce_space & (~(unsigned long)specified_table_size);
25217 info->tce_space = (u64 *)__va(tce_space);
25218 }
25219 }
25220 diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
25221 index 35ccf75..7a15747 100644
25222 --- a/arch/x86/kernel/pci-iommu_table.c
25223 +++ b/arch/x86/kernel/pci-iommu_table.c
25224 @@ -2,7 +2,7 @@
25225 #include <asm/iommu_table.h>
25226 #include <linux/string.h>
25227 #include <linux/kallsyms.h>
25228 -
25229 +#include <linux/sched.h>
25230
25231 #define DEBUG 1
25232
25233 diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
25234 index 6c483ba..d10ce2f 100644
25235 --- a/arch/x86/kernel/pci-swiotlb.c
25236 +++ b/arch/x86/kernel/pci-swiotlb.c
25237 @@ -32,7 +32,7 @@ static void x86_swiotlb_free_coherent(struct device *dev, size_t size,
25238 void *vaddr, dma_addr_t dma_addr,
25239 struct dma_attrs *attrs)
25240 {
25241 - swiotlb_free_coherent(dev, size, vaddr, dma_addr);
25242 + swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
25243 }
25244
25245 static struct dma_map_ops swiotlb_dma_ops = {
25246 diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
25247 index 3fb8d95..254dc51 100644
25248 --- a/arch/x86/kernel/process.c
25249 +++ b/arch/x86/kernel/process.c
25250 @@ -36,7 +36,8 @@
25251 * section. Since TSS's are completely CPU-local, we want them
25252 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
25253 */
25254 -__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
25255 +struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
25256 +EXPORT_SYMBOL(init_tss);
25257
25258 #ifdef CONFIG_X86_64
25259 static DEFINE_PER_CPU(unsigned char, is_idle);
25260 @@ -92,7 +93,7 @@ void arch_task_cache_init(void)
25261 task_xstate_cachep =
25262 kmem_cache_create("task_xstate", xstate_size,
25263 __alignof__(union thread_xstate),
25264 - SLAB_PANIC | SLAB_NOTRACK, NULL);
25265 + SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
25266 }
25267
25268 /*
25269 @@ -105,7 +106,7 @@ void exit_thread(void)
25270 unsigned long *bp = t->io_bitmap_ptr;
25271
25272 if (bp) {
25273 - struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
25274 + struct tss_struct *tss = init_tss + get_cpu();
25275
25276 t->io_bitmap_ptr = NULL;
25277 clear_thread_flag(TIF_IO_BITMAP);
25278 @@ -125,6 +126,9 @@ void flush_thread(void)
25279 {
25280 struct task_struct *tsk = current;
25281
25282 +#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
25283 + loadsegment(gs, 0);
25284 +#endif
25285 flush_ptrace_hw_breakpoint(tsk);
25286 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
25287 drop_init_fpu(tsk);
25288 @@ -271,7 +275,7 @@ static void __exit_idle(void)
25289 void exit_idle(void)
25290 {
25291 /* idle loop has pid 0 */
25292 - if (current->pid)
25293 + if (task_pid_nr(current))
25294 return;
25295 __exit_idle();
25296 }
25297 @@ -327,7 +331,7 @@ bool xen_set_default_idle(void)
25298 return ret;
25299 }
25300 #endif
25301 -void stop_this_cpu(void *dummy)
25302 +__noreturn void stop_this_cpu(void *dummy)
25303 {
25304 local_irq_disable();
25305 /*
25306 @@ -456,16 +460,37 @@ static int __init idle_setup(char *str)
25307 }
25308 early_param("idle", idle_setup);
25309
25310 -unsigned long arch_align_stack(unsigned long sp)
25311 +#ifdef CONFIG_PAX_RANDKSTACK
25312 +void pax_randomize_kstack(struct pt_regs *regs)
25313 {
25314 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
25315 - sp -= get_random_int() % 8192;
25316 - return sp & ~0xf;
25317 -}
25318 + struct thread_struct *thread = &current->thread;
25319 + unsigned long time;
25320
25321 -unsigned long arch_randomize_brk(struct mm_struct *mm)
25322 -{
25323 - unsigned long range_end = mm->brk + 0x02000000;
25324 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
25325 -}
25326 + if (!randomize_va_space)
25327 + return;
25328 +
25329 + if (v8086_mode(regs))
25330 + return;
25331
25332 + rdtscl(time);
25333 +
25334 + /* P4 seems to return a 0 LSB, ignore it */
25335 +#ifdef CONFIG_MPENTIUM4
25336 + time &= 0x3EUL;
25337 + time <<= 2;
25338 +#elif defined(CONFIG_X86_64)
25339 + time &= 0xFUL;
25340 + time <<= 4;
25341 +#else
25342 + time &= 0x1FUL;
25343 + time <<= 3;
25344 +#endif
25345 +
25346 + thread->sp0 ^= time;
25347 + load_sp0(init_tss + smp_processor_id(), thread);
25348 +
25349 +#ifdef CONFIG_X86_64
25350 + this_cpu_write(kernel_stack, thread->sp0);
25351 +#endif
25352 +}
25353 +#endif
25354 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
25355 index 884f98f..ec23e04 100644
25356 --- a/arch/x86/kernel/process_32.c
25357 +++ b/arch/x86/kernel/process_32.c
25358 @@ -65,6 +65,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
25359 unsigned long thread_saved_pc(struct task_struct *tsk)
25360 {
25361 return ((unsigned long *)tsk->thread.sp)[3];
25362 +//XXX return tsk->thread.eip;
25363 }
25364
25365 void __show_regs(struct pt_regs *regs, int all)
25366 @@ -74,19 +75,18 @@ void __show_regs(struct pt_regs *regs, int all)
25367 unsigned long sp;
25368 unsigned short ss, gs;
25369
25370 - if (user_mode_vm(regs)) {
25371 + if (user_mode(regs)) {
25372 sp = regs->sp;
25373 ss = regs->ss & 0xffff;
25374 - gs = get_user_gs(regs);
25375 } else {
25376 sp = kernel_stack_pointer(regs);
25377 savesegment(ss, ss);
25378 - savesegment(gs, gs);
25379 }
25380 + gs = get_user_gs(regs);
25381
25382 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
25383 (u16)regs->cs, regs->ip, regs->flags,
25384 - smp_processor_id());
25385 + raw_smp_processor_id());
25386 print_symbol("EIP is at %s\n", regs->ip);
25387
25388 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
25389 @@ -133,20 +133,21 @@ void release_thread(struct task_struct *dead_task)
25390 int copy_thread(unsigned long clone_flags, unsigned long sp,
25391 unsigned long arg, struct task_struct *p)
25392 {
25393 - struct pt_regs *childregs = task_pt_regs(p);
25394 + struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
25395 struct task_struct *tsk;
25396 int err;
25397
25398 p->thread.sp = (unsigned long) childregs;
25399 p->thread.sp0 = (unsigned long) (childregs+1);
25400 + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
25401
25402 if (unlikely(p->flags & PF_KTHREAD)) {
25403 /* kernel thread */
25404 memset(childregs, 0, sizeof(struct pt_regs));
25405 p->thread.ip = (unsigned long) ret_from_kernel_thread;
25406 - task_user_gs(p) = __KERNEL_STACK_CANARY;
25407 - childregs->ds = __USER_DS;
25408 - childregs->es = __USER_DS;
25409 + savesegment(gs, childregs->gs);
25410 + childregs->ds = __KERNEL_DS;
25411 + childregs->es = __KERNEL_DS;
25412 childregs->fs = __KERNEL_PERCPU;
25413 childregs->bx = sp; /* function */
25414 childregs->bp = arg;
25415 @@ -253,7 +254,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
25416 struct thread_struct *prev = &prev_p->thread,
25417 *next = &next_p->thread;
25418 int cpu = smp_processor_id();
25419 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
25420 + struct tss_struct *tss = init_tss + cpu;
25421 fpu_switch_t fpu;
25422
25423 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
25424 @@ -277,6 +278,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
25425 */
25426 lazy_save_gs(prev->gs);
25427
25428 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25429 + __set_fs(task_thread_info(next_p)->addr_limit);
25430 +#endif
25431 +
25432 /*
25433 * Load the per-thread Thread-Local Storage descriptor.
25434 */
25435 @@ -307,6 +312,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
25436 */
25437 arch_end_context_switch(next_p);
25438
25439 + this_cpu_write(current_task, next_p);
25440 + this_cpu_write(current_tinfo, &next_p->tinfo);
25441 +
25442 /*
25443 * Restore %gs if needed (which is common)
25444 */
25445 @@ -315,8 +323,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
25446
25447 switch_fpu_finish(next_p, fpu);
25448
25449 - this_cpu_write(current_task, next_p);
25450 -
25451 return prev_p;
25452 }
25453
25454 @@ -346,4 +352,3 @@ unsigned long get_wchan(struct task_struct *p)
25455 } while (count++ < 16);
25456 return 0;
25457 }
25458 -
25459 diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
25460 index bb1dc51..08dda7f 100644
25461 --- a/arch/x86/kernel/process_64.c
25462 +++ b/arch/x86/kernel/process_64.c
25463 @@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
25464 struct pt_regs *childregs;
25465 struct task_struct *me = current;
25466
25467 - p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
25468 + p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
25469 childregs = task_pt_regs(p);
25470 p->thread.sp = (unsigned long) childregs;
25471 p->thread.usersp = me->thread.usersp;
25472 + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
25473 set_tsk_thread_flag(p, TIF_FORK);
25474 p->fpu_counter = 0;
25475 p->thread.io_bitmap_ptr = NULL;
25476 @@ -172,6 +173,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
25477 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
25478 savesegment(es, p->thread.es);
25479 savesegment(ds, p->thread.ds);
25480 + savesegment(ss, p->thread.ss);
25481 + BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
25482 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
25483
25484 if (unlikely(p->flags & PF_KTHREAD)) {
25485 @@ -280,7 +283,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
25486 struct thread_struct *prev = &prev_p->thread;
25487 struct thread_struct *next = &next_p->thread;
25488 int cpu = smp_processor_id();
25489 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
25490 + struct tss_struct *tss = init_tss + cpu;
25491 unsigned fsindex, gsindex;
25492 fpu_switch_t fpu;
25493
25494 @@ -303,6 +306,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
25495 if (unlikely(next->ds | prev->ds))
25496 loadsegment(ds, next->ds);
25497
25498 + savesegment(ss, prev->ss);
25499 + if (unlikely(next->ss != prev->ss))
25500 + loadsegment(ss, next->ss);
25501
25502 /* We must save %fs and %gs before load_TLS() because
25503 * %fs and %gs may be cleared by load_TLS().
25504 @@ -362,10 +368,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
25505 prev->usersp = this_cpu_read(old_rsp);
25506 this_cpu_write(old_rsp, next->usersp);
25507 this_cpu_write(current_task, next_p);
25508 + this_cpu_write(current_tinfo, &next_p->tinfo);
25509
25510 - this_cpu_write(kernel_stack,
25511 - (unsigned long)task_stack_page(next_p) +
25512 - THREAD_SIZE - KERNEL_STACK_OFFSET);
25513 + this_cpu_write(kernel_stack, next->sp0);
25514
25515 /*
25516 * Now maybe reload the debug registers and handle I/O bitmaps
25517 @@ -434,12 +439,11 @@ unsigned long get_wchan(struct task_struct *p)
25518 if (!p || p == current || p->state == TASK_RUNNING)
25519 return 0;
25520 stack = (unsigned long)task_stack_page(p);
25521 - if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
25522 + if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
25523 return 0;
25524 fp = *(u64 *)(p->thread.sp);
25525 do {
25526 - if (fp < (unsigned long)stack ||
25527 - fp >= (unsigned long)stack+THREAD_SIZE)
25528 + if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
25529 return 0;
25530 ip = *(u64 *)(fp+8);
25531 if (!in_sched_functions(ip))
25532 diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
25533 index 7461f50..1334029 100644
25534 --- a/arch/x86/kernel/ptrace.c
25535 +++ b/arch/x86/kernel/ptrace.c
25536 @@ -184,14 +184,13 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
25537 {
25538 unsigned long context = (unsigned long)regs & ~(THREAD_SIZE - 1);
25539 unsigned long sp = (unsigned long)&regs->sp;
25540 - struct thread_info *tinfo;
25541
25542 - if (context == (sp & ~(THREAD_SIZE - 1)))
25543 + if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
25544 return sp;
25545
25546 - tinfo = (struct thread_info *)context;
25547 - if (tinfo->previous_esp)
25548 - return tinfo->previous_esp;
25549 + sp = *(unsigned long *)context;
25550 + if (sp)
25551 + return sp;
25552
25553 return (unsigned long)regs;
25554 }
25555 @@ -588,7 +587,7 @@ static void ptrace_triggered(struct perf_event *bp,
25556 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
25557 {
25558 int i;
25559 - int dr7 = 0;
25560 + unsigned long dr7 = 0;
25561 struct arch_hw_breakpoint *info;
25562
25563 for (i = 0; i < HBP_NUM; i++) {
25564 @@ -822,7 +821,7 @@ long arch_ptrace(struct task_struct *child, long request,
25565 unsigned long addr, unsigned long data)
25566 {
25567 int ret;
25568 - unsigned long __user *datap = (unsigned long __user *)data;
25569 + unsigned long __user *datap = (__force unsigned long __user *)data;
25570
25571 switch (request) {
25572 /* read the word at location addr in the USER area. */
25573 @@ -907,14 +906,14 @@ long arch_ptrace(struct task_struct *child, long request,
25574 if ((int) addr < 0)
25575 return -EIO;
25576 ret = do_get_thread_area(child, addr,
25577 - (struct user_desc __user *)data);
25578 + (__force struct user_desc __user *) data);
25579 break;
25580
25581 case PTRACE_SET_THREAD_AREA:
25582 if ((int) addr < 0)
25583 return -EIO;
25584 ret = do_set_thread_area(child, addr,
25585 - (struct user_desc __user *)data, 0);
25586 + (__force struct user_desc __user *) data, 0);
25587 break;
25588 #endif
25589
25590 @@ -1292,7 +1291,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
25591
25592 #ifdef CONFIG_X86_64
25593
25594 -static struct user_regset x86_64_regsets[] __read_mostly = {
25595 +static user_regset_no_const x86_64_regsets[] __read_only = {
25596 [REGSET_GENERAL] = {
25597 .core_note_type = NT_PRSTATUS,
25598 .n = sizeof(struct user_regs_struct) / sizeof(long),
25599 @@ -1333,7 +1332,7 @@ static const struct user_regset_view user_x86_64_view = {
25600 #endif /* CONFIG_X86_64 */
25601
25602 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
25603 -static struct user_regset x86_32_regsets[] __read_mostly = {
25604 +static user_regset_no_const x86_32_regsets[] __read_only = {
25605 [REGSET_GENERAL] = {
25606 .core_note_type = NT_PRSTATUS,
25607 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
25608 @@ -1386,7 +1385,7 @@ static const struct user_regset_view user_x86_32_view = {
25609 */
25610 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
25611
25612 -void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
25613 +void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
25614 {
25615 #ifdef CONFIG_X86_64
25616 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
25617 @@ -1421,7 +1420,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
25618 memset(info, 0, sizeof(*info));
25619 info->si_signo = SIGTRAP;
25620 info->si_code = si_code;
25621 - info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
25622 + info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
25623 }
25624
25625 void user_single_step_siginfo(struct task_struct *tsk,
25626 @@ -1450,6 +1449,10 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
25627 # define IS_IA32 0
25628 #endif
25629
25630 +#ifdef CONFIG_GRKERNSEC_SETXID
25631 +extern void gr_delayed_cred_worker(void);
25632 +#endif
25633 +
25634 /*
25635 * We must return the syscall number to actually look up in the table.
25636 * This can be -1L to skip running any syscall at all.
25637 @@ -1460,6 +1463,11 @@ long syscall_trace_enter(struct pt_regs *regs)
25638
25639 user_exit();
25640
25641 +#ifdef CONFIG_GRKERNSEC_SETXID
25642 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
25643 + gr_delayed_cred_worker();
25644 +#endif
25645 +
25646 /*
25647 * If we stepped into a sysenter/syscall insn, it trapped in
25648 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
25649 @@ -1515,6 +1523,11 @@ void syscall_trace_leave(struct pt_regs *regs)
25650 */
25651 user_exit();
25652
25653 +#ifdef CONFIG_GRKERNSEC_SETXID
25654 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
25655 + gr_delayed_cred_worker();
25656 +#endif
25657 +
25658 audit_syscall_exit(regs);
25659
25660 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
25661 diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
25662 index a16bae3..1f65f25 100644
25663 --- a/arch/x86/kernel/pvclock.c
25664 +++ b/arch/x86/kernel/pvclock.c
25665 @@ -43,11 +43,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
25666 return pv_tsc_khz;
25667 }
25668
25669 -static atomic64_t last_value = ATOMIC64_INIT(0);
25670 +static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
25671
25672 void pvclock_resume(void)
25673 {
25674 - atomic64_set(&last_value, 0);
25675 + atomic64_set_unchecked(&last_value, 0);
25676 }
25677
25678 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
25679 @@ -92,11 +92,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
25680 * updating at the same time, and one of them could be slightly behind,
25681 * making the assumption that last_value always go forward fail to hold.
25682 */
25683 - last = atomic64_read(&last_value);
25684 + last = atomic64_read_unchecked(&last_value);
25685 do {
25686 if (ret < last)
25687 return last;
25688 - last = atomic64_cmpxchg(&last_value, last, ret);
25689 + last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
25690 } while (unlikely(last != ret));
25691
25692 return ret;
25693 diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
25694 index 618ce26..ec7e21c 100644
25695 --- a/arch/x86/kernel/reboot.c
25696 +++ b/arch/x86/kernel/reboot.c
25697 @@ -68,6 +68,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
25698
25699 void __noreturn machine_real_restart(unsigned int type)
25700 {
25701 +
25702 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
25703 + struct desc_struct *gdt;
25704 +#endif
25705 +
25706 local_irq_disable();
25707
25708 /*
25709 @@ -95,7 +100,29 @@ void __noreturn machine_real_restart(unsigned int type)
25710
25711 /* Jump to the identity-mapped low memory code */
25712 #ifdef CONFIG_X86_32
25713 - asm volatile("jmpl *%0" : :
25714 +
25715 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
25716 + gdt = get_cpu_gdt_table(smp_processor_id());
25717 + pax_open_kernel();
25718 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25719 + gdt[GDT_ENTRY_KERNEL_DS].type = 3;
25720 + gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
25721 + loadsegment(ds, __KERNEL_DS);
25722 + loadsegment(es, __KERNEL_DS);
25723 + loadsegment(ss, __KERNEL_DS);
25724 +#endif
25725 +#ifdef CONFIG_PAX_KERNEXEC
25726 + gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
25727 + gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
25728 + gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
25729 + gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
25730 + gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
25731 + gdt[GDT_ENTRY_KERNEL_CS].g = 1;
25732 +#endif
25733 + pax_close_kernel();
25734 +#endif
25735 +
25736 + asm volatile("ljmpl *%0" : :
25737 "rm" (real_mode_header->machine_real_restart_asm),
25738 "a" (type));
25739 #else
25740 @@ -466,7 +493,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
25741 * try to force a triple fault and then cycle between hitting the keyboard
25742 * controller and doing that
25743 */
25744 -static void native_machine_emergency_restart(void)
25745 +static void __noreturn native_machine_emergency_restart(void)
25746 {
25747 int i;
25748 int attempt = 0;
25749 @@ -575,13 +602,13 @@ void native_machine_shutdown(void)
25750 #endif
25751 }
25752
25753 -static void __machine_emergency_restart(int emergency)
25754 +static void __noreturn __machine_emergency_restart(int emergency)
25755 {
25756 reboot_emergency = emergency;
25757 machine_ops.emergency_restart();
25758 }
25759
25760 -static void native_machine_restart(char *__unused)
25761 +static void __noreturn native_machine_restart(char *__unused)
25762 {
25763 pr_notice("machine restart\n");
25764
25765 @@ -590,7 +617,7 @@ static void native_machine_restart(char *__unused)
25766 __machine_emergency_restart(0);
25767 }
25768
25769 -static void native_machine_halt(void)
25770 +static void __noreturn native_machine_halt(void)
25771 {
25772 /* Stop other cpus and apics */
25773 machine_shutdown();
25774 @@ -600,7 +627,7 @@ static void native_machine_halt(void)
25775 stop_this_cpu(NULL);
25776 }
25777
25778 -static void native_machine_power_off(void)
25779 +static void __noreturn native_machine_power_off(void)
25780 {
25781 if (pm_power_off) {
25782 if (!reboot_force)
25783 @@ -609,9 +636,10 @@ static void native_machine_power_off(void)
25784 }
25785 /* A fallback in case there is no PM info available */
25786 tboot_shutdown(TB_SHUTDOWN_HALT);
25787 + unreachable();
25788 }
25789
25790 -struct machine_ops machine_ops = {
25791 +struct machine_ops machine_ops __read_only = {
25792 .power_off = native_machine_power_off,
25793 .shutdown = native_machine_shutdown,
25794 .emergency_restart = native_machine_emergency_restart,
25795 diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
25796 index c8e41e9..64049ef 100644
25797 --- a/arch/x86/kernel/reboot_fixups_32.c
25798 +++ b/arch/x86/kernel/reboot_fixups_32.c
25799 @@ -57,7 +57,7 @@ struct device_fixup {
25800 unsigned int vendor;
25801 unsigned int device;
25802 void (*reboot_fixup)(struct pci_dev *);
25803 -};
25804 +} __do_const;
25805
25806 /*
25807 * PCI ids solely used for fixups_table go here
25808 diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
25809 index 3fd2c69..16ef367 100644
25810 --- a/arch/x86/kernel/relocate_kernel_64.S
25811 +++ b/arch/x86/kernel/relocate_kernel_64.S
25812 @@ -11,6 +11,7 @@
25813 #include <asm/kexec.h>
25814 #include <asm/processor-flags.h>
25815 #include <asm/pgtable_types.h>
25816 +#include <asm/alternative-asm.h>
25817
25818 /*
25819 * Must be relocatable PIC code callable as a C function
25820 @@ -96,8 +97,7 @@ relocate_kernel:
25821
25822 /* jump to identity mapped page */
25823 addq $(identity_mapped - relocate_kernel), %r8
25824 - pushq %r8
25825 - ret
25826 + jmp *%r8
25827
25828 identity_mapped:
25829 /* set return address to 0 if not preserving context */
25830 @@ -167,6 +167,7 @@ identity_mapped:
25831 xorl %r14d, %r14d
25832 xorl %r15d, %r15d
25833
25834 + pax_force_retaddr 0, 1
25835 ret
25836
25837 1:
25838 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
25839 index f0de629..a4978a8f 100644
25840 --- a/arch/x86/kernel/setup.c
25841 +++ b/arch/x86/kernel/setup.c
25842 @@ -110,6 +110,7 @@
25843 #include <asm/mce.h>
25844 #include <asm/alternative.h>
25845 #include <asm/prom.h>
25846 +#include <asm/boot.h>
25847
25848 /*
25849 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
25850 @@ -205,12 +206,50 @@ EXPORT_SYMBOL(boot_cpu_data);
25851 #endif
25852
25853
25854 -#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
25855 -__visible unsigned long mmu_cr4_features;
25856 +#ifdef CONFIG_X86_64
25857 +__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
25858 +#elif defined(CONFIG_X86_PAE)
25859 +__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
25860 #else
25861 -__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
25862 +__visible unsigned long mmu_cr4_features __read_only;
25863 #endif
25864
25865 +void set_in_cr4(unsigned long mask)
25866 +{
25867 + unsigned long cr4 = read_cr4();
25868 +
25869 + if ((cr4 & mask) == mask && cr4 == mmu_cr4_features)
25870 + return;
25871 +
25872 + pax_open_kernel();
25873 + mmu_cr4_features |= mask;
25874 + pax_close_kernel();
25875 +
25876 + if (trampoline_cr4_features)
25877 + *trampoline_cr4_features = mmu_cr4_features;
25878 + cr4 |= mask;
25879 + write_cr4(cr4);
25880 +}
25881 +EXPORT_SYMBOL(set_in_cr4);
25882 +
25883 +void clear_in_cr4(unsigned long mask)
25884 +{
25885 + unsigned long cr4 = read_cr4();
25886 +
25887 + if (!(cr4 & mask) && cr4 == mmu_cr4_features)
25888 + return;
25889 +
25890 + pax_open_kernel();
25891 + mmu_cr4_features &= ~mask;
25892 + pax_close_kernel();
25893 +
25894 + if (trampoline_cr4_features)
25895 + *trampoline_cr4_features = mmu_cr4_features;
25896 + cr4 &= ~mask;
25897 + write_cr4(cr4);
25898 +}
25899 +EXPORT_SYMBOL(clear_in_cr4);
25900 +
25901 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
25902 int bootloader_type, bootloader_version;
25903
25904 @@ -768,7 +807,7 @@ static void __init trim_bios_range(void)
25905 * area (640->1Mb) as ram even though it is not.
25906 * take them out.
25907 */
25908 - e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
25909 + e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
25910
25911 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
25912 }
25913 @@ -776,7 +815,7 @@ static void __init trim_bios_range(void)
25914 /* called before trim_bios_range() to spare extra sanitize */
25915 static void __init e820_add_kernel_range(void)
25916 {
25917 - u64 start = __pa_symbol(_text);
25918 + u64 start = __pa_symbol(ktla_ktva(_text));
25919 u64 size = __pa_symbol(_end) - start;
25920
25921 /*
25922 @@ -838,8 +877,12 @@ static void __init trim_low_memory_range(void)
25923
25924 void __init setup_arch(char **cmdline_p)
25925 {
25926 +#ifdef CONFIG_X86_32
25927 + memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
25928 +#else
25929 memblock_reserve(__pa_symbol(_text),
25930 (unsigned long)__bss_stop - (unsigned long)_text);
25931 +#endif
25932
25933 early_reserve_initrd();
25934
25935 @@ -931,14 +974,14 @@ void __init setup_arch(char **cmdline_p)
25936
25937 if (!boot_params.hdr.root_flags)
25938 root_mountflags &= ~MS_RDONLY;
25939 - init_mm.start_code = (unsigned long) _text;
25940 - init_mm.end_code = (unsigned long) _etext;
25941 + init_mm.start_code = ktla_ktva((unsigned long) _text);
25942 + init_mm.end_code = ktla_ktva((unsigned long) _etext);
25943 init_mm.end_data = (unsigned long) _edata;
25944 init_mm.brk = _brk_end;
25945
25946 - code_resource.start = __pa_symbol(_text);
25947 - code_resource.end = __pa_symbol(_etext)-1;
25948 - data_resource.start = __pa_symbol(_etext);
25949 + code_resource.start = __pa_symbol(ktla_ktva(_text));
25950 + code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
25951 + data_resource.start = __pa_symbol(_sdata);
25952 data_resource.end = __pa_symbol(_edata)-1;
25953 bss_resource.start = __pa_symbol(__bss_start);
25954 bss_resource.end = __pa_symbol(__bss_stop)-1;
25955 diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
25956 index 5cdff03..80fa283 100644
25957 --- a/arch/x86/kernel/setup_percpu.c
25958 +++ b/arch/x86/kernel/setup_percpu.c
25959 @@ -21,19 +21,17 @@
25960 #include <asm/cpu.h>
25961 #include <asm/stackprotector.h>
25962
25963 -DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
25964 +#ifdef CONFIG_SMP
25965 +DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
25966 EXPORT_PER_CPU_SYMBOL(cpu_number);
25967 +#endif
25968
25969 -#ifdef CONFIG_X86_64
25970 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
25971 -#else
25972 -#define BOOT_PERCPU_OFFSET 0
25973 -#endif
25974
25975 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
25976 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
25977
25978 -unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
25979 +unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
25980 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
25981 };
25982 EXPORT_SYMBOL(__per_cpu_offset);
25983 @@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
25984 {
25985 #ifdef CONFIG_NEED_MULTIPLE_NODES
25986 pg_data_t *last = NULL;
25987 - unsigned int cpu;
25988 + int cpu;
25989
25990 for_each_possible_cpu(cpu) {
25991 int node = early_cpu_to_node(cpu);
25992 @@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
25993 {
25994 #ifdef CONFIG_X86_32
25995 struct desc_struct gdt;
25996 + unsigned long base = per_cpu_offset(cpu);
25997
25998 - pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
25999 - 0x2 | DESCTYPE_S, 0x8);
26000 - gdt.s = 1;
26001 + pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
26002 + 0x83 | DESCTYPE_S, 0xC);
26003 write_gdt_entry(get_cpu_gdt_table(cpu),
26004 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
26005 #endif
26006 @@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
26007 /* alrighty, percpu areas up and running */
26008 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
26009 for_each_possible_cpu(cpu) {
26010 +#ifdef CONFIG_CC_STACKPROTECTOR
26011 +#ifdef CONFIG_X86_32
26012 + unsigned long canary = per_cpu(stack_canary.canary, cpu);
26013 +#endif
26014 +#endif
26015 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
26016 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
26017 per_cpu(cpu_number, cpu) = cpu;
26018 @@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
26019 */
26020 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
26021 #endif
26022 +#ifdef CONFIG_CC_STACKPROTECTOR
26023 +#ifdef CONFIG_X86_32
26024 + if (!cpu)
26025 + per_cpu(stack_canary.canary, cpu) = canary;
26026 +#endif
26027 +#endif
26028 /*
26029 * Up to this point, the boot CPU has been using .init.data
26030 * area. Reload any changed state for the boot CPU.
26031 diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
26032 index 9e5de68..16c53cb 100644
26033 --- a/arch/x86/kernel/signal.c
26034 +++ b/arch/x86/kernel/signal.c
26035 @@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
26036 * Align the stack pointer according to the i386 ABI,
26037 * i.e. so that on function entry ((sp + 4) & 15) == 0.
26038 */
26039 - sp = ((sp + 4) & -16ul) - 4;
26040 + sp = ((sp - 12) & -16ul) - 4;
26041 #else /* !CONFIG_X86_32 */
26042 sp = round_down(sp, 16) - 8;
26043 #endif
26044 @@ -298,9 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
26045 }
26046
26047 if (current->mm->context.vdso)
26048 - restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
26049 + restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
26050 else
26051 - restorer = &frame->retcode;
26052 + restorer = (void __user *)&frame->retcode;
26053 if (ksig->ka.sa.sa_flags & SA_RESTORER)
26054 restorer = ksig->ka.sa.sa_restorer;
26055
26056 @@ -314,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
26057 * reasons and because gdb uses it as a signature to notice
26058 * signal handler stack frames.
26059 */
26060 - err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
26061 + err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
26062
26063 if (err)
26064 return -EFAULT;
26065 @@ -361,7 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
26066 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
26067
26068 /* Set up to return from userspace. */
26069 - restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
26070 + if (current->mm->context.vdso)
26071 + restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
26072 + else
26073 + restorer = (void __user *)&frame->retcode;
26074 if (ksig->ka.sa.sa_flags & SA_RESTORER)
26075 restorer = ksig->ka.sa.sa_restorer;
26076 put_user_ex(restorer, &frame->pretcode);
26077 @@ -373,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
26078 * reasons and because gdb uses it as a signature to notice
26079 * signal handler stack frames.
26080 */
26081 - put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
26082 + put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
26083 } put_user_catch(err);
26084
26085 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
26086 @@ -609,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
26087 {
26088 int usig = signr_convert(ksig->sig);
26089 sigset_t *set = sigmask_to_save();
26090 - compat_sigset_t *cset = (compat_sigset_t *) set;
26091 + sigset_t sigcopy;
26092 + compat_sigset_t *cset;
26093 +
26094 + sigcopy = *set;
26095 +
26096 + cset = (compat_sigset_t *) &sigcopy;
26097
26098 /* Set up the stack frame */
26099 if (is_ia32_frame()) {
26100 @@ -620,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
26101 } else if (is_x32_frame()) {
26102 return x32_setup_rt_frame(ksig, cset, regs);
26103 } else {
26104 - return __setup_rt_frame(ksig->sig, ksig, set, regs);
26105 + return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
26106 }
26107 }
26108
26109 diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
26110 index 7c3a5a6..f0a8961 100644
26111 --- a/arch/x86/kernel/smp.c
26112 +++ b/arch/x86/kernel/smp.c
26113 @@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
26114
26115 __setup("nonmi_ipi", nonmi_ipi_setup);
26116
26117 -struct smp_ops smp_ops = {
26118 +struct smp_ops smp_ops __read_only = {
26119 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
26120 .smp_prepare_cpus = native_smp_prepare_cpus,
26121 .smp_cpus_done = native_smp_cpus_done,
26122 diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
26123 index 6cacab6..750636a 100644
26124 --- a/arch/x86/kernel/smpboot.c
26125 +++ b/arch/x86/kernel/smpboot.c
26126 @@ -251,14 +251,18 @@ static void notrace start_secondary(void *unused)
26127
26128 enable_start_cpu0 = 0;
26129
26130 -#ifdef CONFIG_X86_32
26131 - /* switch away from the initial page table */
26132 - load_cr3(swapper_pg_dir);
26133 - __flush_tlb_all();
26134 -#endif
26135 -
26136 /* otherwise gcc will move up smp_processor_id before the cpu_init */
26137 barrier();
26138 +
26139 + /* switch away from the initial page table */
26140 +#ifdef CONFIG_PAX_PER_CPU_PGD
26141 + load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
26142 + __flush_tlb_all();
26143 +#elif defined(CONFIG_X86_32)
26144 + load_cr3(swapper_pg_dir);
26145 + __flush_tlb_all();
26146 +#endif
26147 +
26148 /*
26149 * Check TSC synchronization with the BP:
26150 */
26151 @@ -749,6 +753,7 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
26152 idle->thread.sp = (unsigned long) (((struct pt_regs *)
26153 (THREAD_SIZE + task_stack_page(idle))) - 1);
26154 per_cpu(current_task, cpu) = idle;
26155 + per_cpu(current_tinfo, cpu) = &idle->tinfo;
26156
26157 #ifdef CONFIG_X86_32
26158 /* Stack for startup_32 can be just as for start_secondary onwards */
26159 @@ -756,11 +761,13 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
26160 #else
26161 clear_tsk_thread_flag(idle, TIF_FORK);
26162 initial_gs = per_cpu_offset(cpu);
26163 - per_cpu(kernel_stack, cpu) =
26164 - (unsigned long)task_stack_page(idle) -
26165 - KERNEL_STACK_OFFSET + THREAD_SIZE;
26166 + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
26167 #endif
26168 +
26169 + pax_open_kernel();
26170 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
26171 + pax_close_kernel();
26172 +
26173 initial_code = (unsigned long)start_secondary;
26174 stack_start = idle->thread.sp;
26175
26176 @@ -909,6 +916,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
26177 /* the FPU context is blank, nobody can own it */
26178 __cpu_disable_lazy_restore(cpu);
26179
26180 +#ifdef CONFIG_PAX_PER_CPU_PGD
26181 + clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
26182 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
26183 + KERNEL_PGD_PTRS);
26184 + clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
26185 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
26186 + KERNEL_PGD_PTRS);
26187 +#endif
26188 +
26189 err = do_boot_cpu(apicid, cpu, tidle);
26190 if (err) {
26191 pr_debug("do_boot_cpu failed %d\n", err);
26192 diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
26193 index 9b4d51d..5d28b58 100644
26194 --- a/arch/x86/kernel/step.c
26195 +++ b/arch/x86/kernel/step.c
26196 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
26197 struct desc_struct *desc;
26198 unsigned long base;
26199
26200 - seg &= ~7UL;
26201 + seg >>= 3;
26202
26203 mutex_lock(&child->mm->context.lock);
26204 - if (unlikely((seg >> 3) >= child->mm->context.size))
26205 + if (unlikely(seg >= child->mm->context.size))
26206 addr = -1L; /* bogus selector, access would fault */
26207 else {
26208 desc = child->mm->context.ldt + seg;
26209 @@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
26210 addr += base;
26211 }
26212 mutex_unlock(&child->mm->context.lock);
26213 - }
26214 + } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
26215 + addr = ktla_ktva(addr);
26216
26217 return addr;
26218 }
26219 @@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
26220 unsigned char opcode[15];
26221 unsigned long addr = convert_ip_to_linear(child, regs);
26222
26223 + if (addr == -EINVAL)
26224 + return 0;
26225 +
26226 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
26227 for (i = 0; i < copied; i++) {
26228 switch (opcode[i]) {
26229 diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
26230 new file mode 100644
26231 index 0000000..5877189
26232 --- /dev/null
26233 +++ b/arch/x86/kernel/sys_i386_32.c
26234 @@ -0,0 +1,189 @@
26235 +/*
26236 + * This file contains various random system calls that
26237 + * have a non-standard calling sequence on the Linux/i386
26238 + * platform.
26239 + */
26240 +
26241 +#include <linux/errno.h>
26242 +#include <linux/sched.h>
26243 +#include <linux/mm.h>
26244 +#include <linux/fs.h>
26245 +#include <linux/smp.h>
26246 +#include <linux/sem.h>
26247 +#include <linux/msg.h>
26248 +#include <linux/shm.h>
26249 +#include <linux/stat.h>
26250 +#include <linux/syscalls.h>
26251 +#include <linux/mman.h>
26252 +#include <linux/file.h>
26253 +#include <linux/utsname.h>
26254 +#include <linux/ipc.h>
26255 +#include <linux/elf.h>
26256 +
26257 +#include <linux/uaccess.h>
26258 +#include <linux/unistd.h>
26259 +
26260 +#include <asm/syscalls.h>
26261 +
26262 +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
26263 +{
26264 + unsigned long pax_task_size = TASK_SIZE;
26265 +
26266 +#ifdef CONFIG_PAX_SEGMEXEC
26267 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
26268 + pax_task_size = SEGMEXEC_TASK_SIZE;
26269 +#endif
26270 +
26271 + if (flags & MAP_FIXED)
26272 + if (len > pax_task_size || addr > pax_task_size - len)
26273 + return -EINVAL;
26274 +
26275 + return 0;
26276 +}
26277 +
26278 +/*
26279 + * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
26280 + */
26281 +static unsigned long get_align_mask(void)
26282 +{
26283 + if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
26284 + return 0;
26285 +
26286 + if (!(current->flags & PF_RANDOMIZE))
26287 + return 0;
26288 +
26289 + return va_align.mask;
26290 +}
26291 +
26292 +unsigned long
26293 +arch_get_unmapped_area(struct file *filp, unsigned long addr,
26294 + unsigned long len, unsigned long pgoff, unsigned long flags)
26295 +{
26296 + struct mm_struct *mm = current->mm;
26297 + struct vm_area_struct *vma;
26298 + unsigned long pax_task_size = TASK_SIZE;
26299 + struct vm_unmapped_area_info info;
26300 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
26301 +
26302 +#ifdef CONFIG_PAX_SEGMEXEC
26303 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
26304 + pax_task_size = SEGMEXEC_TASK_SIZE;
26305 +#endif
26306 +
26307 + pax_task_size -= PAGE_SIZE;
26308 +
26309 + if (len > pax_task_size)
26310 + return -ENOMEM;
26311 +
26312 + if (flags & MAP_FIXED)
26313 + return addr;
26314 +
26315 +#ifdef CONFIG_PAX_RANDMMAP
26316 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
26317 +#endif
26318 +
26319 + if (addr) {
26320 + addr = PAGE_ALIGN(addr);
26321 + if (pax_task_size - len >= addr) {
26322 + vma = find_vma(mm, addr);
26323 + if (check_heap_stack_gap(vma, addr, len, offset))
26324 + return addr;
26325 + }
26326 + }
26327 +
26328 + info.flags = 0;
26329 + info.length = len;
26330 + info.align_mask = filp ? get_align_mask() : 0;
26331 + info.align_offset = pgoff << PAGE_SHIFT;
26332 + info.threadstack_offset = offset;
26333 +
26334 +#ifdef CONFIG_PAX_PAGEEXEC
26335 + if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
26336 + info.low_limit = 0x00110000UL;
26337 + info.high_limit = mm->start_code;
26338 +
26339 +#ifdef CONFIG_PAX_RANDMMAP
26340 + if (mm->pax_flags & MF_PAX_RANDMMAP)
26341 + info.low_limit += mm->delta_mmap & 0x03FFF000UL;
26342 +#endif
26343 +
26344 + if (info.low_limit < info.high_limit) {
26345 + addr = vm_unmapped_area(&info);
26346 + if (!IS_ERR_VALUE(addr))
26347 + return addr;
26348 + }
26349 + } else
26350 +#endif
26351 +
26352 + info.low_limit = mm->mmap_base;
26353 + info.high_limit = pax_task_size;
26354 +
26355 + return vm_unmapped_area(&info);
26356 +}
26357 +
26358 +unsigned long
26359 +arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
26360 + const unsigned long len, const unsigned long pgoff,
26361 + const unsigned long flags)
26362 +{
26363 + struct vm_area_struct *vma;
26364 + struct mm_struct *mm = current->mm;
26365 + unsigned long addr = addr0, pax_task_size = TASK_SIZE;
26366 + struct vm_unmapped_area_info info;
26367 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
26368 +
26369 +#ifdef CONFIG_PAX_SEGMEXEC
26370 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
26371 + pax_task_size = SEGMEXEC_TASK_SIZE;
26372 +#endif
26373 +
26374 + pax_task_size -= PAGE_SIZE;
26375 +
26376 + /* requested length too big for entire address space */
26377 + if (len > pax_task_size)
26378 + return -ENOMEM;
26379 +
26380 + if (flags & MAP_FIXED)
26381 + return addr;
26382 +
26383 +#ifdef CONFIG_PAX_PAGEEXEC
26384 + if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
26385 + goto bottomup;
26386 +#endif
26387 +
26388 +#ifdef CONFIG_PAX_RANDMMAP
26389 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
26390 +#endif
26391 +
26392 + /* requesting a specific address */
26393 + if (addr) {
26394 + addr = PAGE_ALIGN(addr);
26395 + if (pax_task_size - len >= addr) {
26396 + vma = find_vma(mm, addr);
26397 + if (check_heap_stack_gap(vma, addr, len, offset))
26398 + return addr;
26399 + }
26400 + }
26401 +
26402 + info.flags = VM_UNMAPPED_AREA_TOPDOWN;
26403 + info.length = len;
26404 + info.low_limit = PAGE_SIZE;
26405 + info.high_limit = mm->mmap_base;
26406 + info.align_mask = filp ? get_align_mask() : 0;
26407 + info.align_offset = pgoff << PAGE_SHIFT;
26408 + info.threadstack_offset = offset;
26409 +
26410 + addr = vm_unmapped_area(&info);
26411 + if (!(addr & ~PAGE_MASK))
26412 + return addr;
26413 + VM_BUG_ON(addr != -ENOMEM);
26414 +
26415 +bottomup:
26416 + /*
26417 + * A failed mmap() very likely causes application failure,
26418 + * so fall back to the bottom-up function here. This scenario
26419 + * can happen with large stack limits and large mmap()
26420 + * allocations.
26421 + */
26422 + return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
26423 +}
26424 diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
26425 index 30277e2..5664a29 100644
26426 --- a/arch/x86/kernel/sys_x86_64.c
26427 +++ b/arch/x86/kernel/sys_x86_64.c
26428 @@ -81,8 +81,8 @@ out:
26429 return error;
26430 }
26431
26432 -static void find_start_end(unsigned long flags, unsigned long *begin,
26433 - unsigned long *end)
26434 +static void find_start_end(struct mm_struct *mm, unsigned long flags,
26435 + unsigned long *begin, unsigned long *end)
26436 {
26437 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
26438 unsigned long new_begin;
26439 @@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
26440 *begin = new_begin;
26441 }
26442 } else {
26443 - *begin = current->mm->mmap_legacy_base;
26444 + *begin = mm->mmap_legacy_base;
26445 *end = TASK_SIZE;
26446 }
26447 }
26448 @@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
26449 struct vm_area_struct *vma;
26450 struct vm_unmapped_area_info info;
26451 unsigned long begin, end;
26452 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
26453
26454 if (flags & MAP_FIXED)
26455 return addr;
26456
26457 - find_start_end(flags, &begin, &end);
26458 + find_start_end(mm, flags, &begin, &end);
26459
26460 if (len > end)
26461 return -ENOMEM;
26462
26463 +#ifdef CONFIG_PAX_RANDMMAP
26464 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
26465 +#endif
26466 +
26467 if (addr) {
26468 addr = PAGE_ALIGN(addr);
26469 vma = find_vma(mm, addr);
26470 - if (end - len >= addr &&
26471 - (!vma || addr + len <= vma->vm_start))
26472 + if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
26473 return addr;
26474 }
26475
26476 @@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
26477 info.high_limit = end;
26478 info.align_mask = filp ? get_align_mask() : 0;
26479 info.align_offset = pgoff << PAGE_SHIFT;
26480 + info.threadstack_offset = offset;
26481 return vm_unmapped_area(&info);
26482 }
26483
26484 @@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
26485 struct mm_struct *mm = current->mm;
26486 unsigned long addr = addr0;
26487 struct vm_unmapped_area_info info;
26488 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
26489
26490 /* requested length too big for entire address space */
26491 if (len > TASK_SIZE)
26492 @@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
26493 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
26494 goto bottomup;
26495
26496 +#ifdef CONFIG_PAX_RANDMMAP
26497 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
26498 +#endif
26499 +
26500 /* requesting a specific address */
26501 if (addr) {
26502 addr = PAGE_ALIGN(addr);
26503 vma = find_vma(mm, addr);
26504 - if (TASK_SIZE - len >= addr &&
26505 - (!vma || addr + len <= vma->vm_start))
26506 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
26507 return addr;
26508 }
26509
26510 @@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
26511 info.high_limit = mm->mmap_base;
26512 info.align_mask = filp ? get_align_mask() : 0;
26513 info.align_offset = pgoff << PAGE_SHIFT;
26514 + info.threadstack_offset = offset;
26515 addr = vm_unmapped_area(&info);
26516 if (!(addr & ~PAGE_MASK))
26517 return addr;
26518 diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
26519 index 91a4496..1730bff 100644
26520 --- a/arch/x86/kernel/tboot.c
26521 +++ b/arch/x86/kernel/tboot.c
26522 @@ -221,7 +221,7 @@ static int tboot_setup_sleep(void)
26523
26524 void tboot_shutdown(u32 shutdown_type)
26525 {
26526 - void (*shutdown)(void);
26527 + void (* __noreturn shutdown)(void);
26528
26529 if (!tboot_enabled())
26530 return;
26531 @@ -243,7 +243,7 @@ void tboot_shutdown(u32 shutdown_type)
26532
26533 switch_to_tboot_pt();
26534
26535 - shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
26536 + shutdown = (void *)tboot->shutdown_entry;
26537 shutdown();
26538
26539 /* should not reach here */
26540 @@ -310,7 +310,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
26541 return -ENODEV;
26542 }
26543
26544 -static atomic_t ap_wfs_count;
26545 +static atomic_unchecked_t ap_wfs_count;
26546
26547 static int tboot_wait_for_aps(int num_aps)
26548 {
26549 @@ -334,9 +334,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
26550 {
26551 switch (action) {
26552 case CPU_DYING:
26553 - atomic_inc(&ap_wfs_count);
26554 + atomic_inc_unchecked(&ap_wfs_count);
26555 if (num_online_cpus() == 1)
26556 - if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
26557 + if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
26558 return NOTIFY_BAD;
26559 break;
26560 }
26561 @@ -422,7 +422,7 @@ static __init int tboot_late_init(void)
26562
26563 tboot_create_trampoline();
26564
26565 - atomic_set(&ap_wfs_count, 0);
26566 + atomic_set_unchecked(&ap_wfs_count, 0);
26567 register_hotcpu_notifier(&tboot_cpu_notifier);
26568
26569 #ifdef CONFIG_DEBUG_FS
26570 diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
26571 index 24d3c91..d06b473 100644
26572 --- a/arch/x86/kernel/time.c
26573 +++ b/arch/x86/kernel/time.c
26574 @@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
26575 {
26576 unsigned long pc = instruction_pointer(regs);
26577
26578 - if (!user_mode_vm(regs) && in_lock_functions(pc)) {
26579 + if (!user_mode(regs) && in_lock_functions(pc)) {
26580 #ifdef CONFIG_FRAME_POINTER
26581 - return *(unsigned long *)(regs->bp + sizeof(long));
26582 + return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
26583 #else
26584 unsigned long *sp =
26585 (unsigned long *)kernel_stack_pointer(regs);
26586 @@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
26587 * or above a saved flags. Eflags has bits 22-31 zero,
26588 * kernel addresses don't.
26589 */
26590 +
26591 +#ifdef CONFIG_PAX_KERNEXEC
26592 + return ktla_ktva(sp[0]);
26593 +#else
26594 if (sp[0] >> 22)
26595 return sp[0];
26596 if (sp[1] >> 22)
26597 return sp[1];
26598 #endif
26599 +
26600 +#endif
26601 }
26602 return pc;
26603 }
26604 diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
26605 index f7fec09..9991981 100644
26606 --- a/arch/x86/kernel/tls.c
26607 +++ b/arch/x86/kernel/tls.c
26608 @@ -84,6 +84,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
26609 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
26610 return -EINVAL;
26611
26612 +#ifdef CONFIG_PAX_SEGMEXEC
26613 + if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
26614 + return -EINVAL;
26615 +#endif
26616 +
26617 set_tls_desc(p, idx, &info, 1);
26618
26619 return 0;
26620 @@ -200,7 +205,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
26621
26622 if (kbuf)
26623 info = kbuf;
26624 - else if (__copy_from_user(infobuf, ubuf, count))
26625 + else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
26626 return -EFAULT;
26627 else
26628 info = infobuf;
26629 diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
26630 index 1c113db..287b42e 100644
26631 --- a/arch/x86/kernel/tracepoint.c
26632 +++ b/arch/x86/kernel/tracepoint.c
26633 @@ -9,11 +9,11 @@
26634 #include <linux/atomic.h>
26635
26636 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
26637 -struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
26638 +const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
26639 (unsigned long) trace_idt_table };
26640
26641 /* No need to be aligned, but done to keep all IDTs defined the same way. */
26642 -gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
26643 +gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
26644
26645 static int trace_irq_vector_refcount;
26646 static DEFINE_MUTEX(irq_vector_mutex);
26647 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
26648 index 8c8093b..c93f581 100644
26649 --- a/arch/x86/kernel/traps.c
26650 +++ b/arch/x86/kernel/traps.c
26651 @@ -66,7 +66,7 @@
26652 #include <asm/proto.h>
26653
26654 /* No need to be aligned, but done to keep all IDTs defined the same way. */
26655 -gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
26656 +gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
26657 #else
26658 #include <asm/processor-flags.h>
26659 #include <asm/setup.h>
26660 @@ -75,7 +75,7 @@ asmlinkage int system_call(void);
26661 #endif
26662
26663 /* Must be page-aligned because the real IDT is used in a fixmap. */
26664 -gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
26665 +gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
26666
26667 DECLARE_BITMAP(used_vectors, NR_VECTORS);
26668 EXPORT_SYMBOL_GPL(used_vectors);
26669 @@ -107,11 +107,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
26670 }
26671
26672 static int __kprobes
26673 -do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
26674 +do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
26675 struct pt_regs *regs, long error_code)
26676 {
26677 #ifdef CONFIG_X86_32
26678 - if (regs->flags & X86_VM_MASK) {
26679 + if (v8086_mode(regs)) {
26680 /*
26681 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
26682 * On nmi (interrupt 2), do_trap should not be called.
26683 @@ -124,12 +124,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
26684 return -1;
26685 }
26686 #endif
26687 - if (!user_mode(regs)) {
26688 + if (!user_mode_novm(regs)) {
26689 if (!fixup_exception(regs)) {
26690 tsk->thread.error_code = error_code;
26691 tsk->thread.trap_nr = trapnr;
26692 +
26693 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26694 + if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
26695 + str = "PAX: suspicious stack segment fault";
26696 +#endif
26697 +
26698 die(str, regs, error_code);
26699 }
26700 +
26701 +#ifdef CONFIG_PAX_REFCOUNT
26702 + if (trapnr == 4)
26703 + pax_report_refcount_overflow(regs);
26704 +#endif
26705 +
26706 return 0;
26707 }
26708
26709 @@ -137,7 +149,7 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
26710 }
26711
26712 static void __kprobes
26713 -do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
26714 +do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
26715 long error_code, siginfo_t *info)
26716 {
26717 struct task_struct *tsk = current;
26718 @@ -161,7 +173,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
26719 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
26720 printk_ratelimit()) {
26721 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
26722 - tsk->comm, tsk->pid, str,
26723 + tsk->comm, task_pid_nr(tsk), str,
26724 regs->ip, regs->sp, error_code);
26725 print_vma_addr(" in ", regs->ip);
26726 pr_cont("\n");
26727 @@ -277,7 +289,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
26728 conditional_sti(regs);
26729
26730 #ifdef CONFIG_X86_32
26731 - if (regs->flags & X86_VM_MASK) {
26732 + if (v8086_mode(regs)) {
26733 local_irq_enable();
26734 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
26735 goto exit;
26736 @@ -285,18 +297,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
26737 #endif
26738
26739 tsk = current;
26740 - if (!user_mode(regs)) {
26741 + if (!user_mode_novm(regs)) {
26742 if (fixup_exception(regs))
26743 goto exit;
26744
26745 tsk->thread.error_code = error_code;
26746 tsk->thread.trap_nr = X86_TRAP_GP;
26747 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
26748 - X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
26749 + X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
26750 +
26751 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26752 + if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
26753 + die("PAX: suspicious general protection fault", regs, error_code);
26754 + else
26755 +#endif
26756 +
26757 die("general protection fault", regs, error_code);
26758 + }
26759 goto exit;
26760 }
26761
26762 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
26763 + if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
26764 + struct mm_struct *mm = tsk->mm;
26765 + unsigned long limit;
26766 +
26767 + down_write(&mm->mmap_sem);
26768 + limit = mm->context.user_cs_limit;
26769 + if (limit < TASK_SIZE) {
26770 + track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
26771 + up_write(&mm->mmap_sem);
26772 + return;
26773 + }
26774 + up_write(&mm->mmap_sem);
26775 + }
26776 +#endif
26777 +
26778 tsk->thread.error_code = error_code;
26779 tsk->thread.trap_nr = X86_TRAP_GP;
26780
26781 @@ -457,7 +493,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
26782 /* It's safe to allow irq's after DR6 has been saved */
26783 preempt_conditional_sti(regs);
26784
26785 - if (regs->flags & X86_VM_MASK) {
26786 + if (v8086_mode(regs)) {
26787 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
26788 X86_TRAP_DB);
26789 preempt_conditional_cli(regs);
26790 @@ -472,7 +508,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
26791 * We already checked v86 mode above, so we can check for kernel mode
26792 * by just checking the CPL of CS.
26793 */
26794 - if ((dr6 & DR_STEP) && !user_mode(regs)) {
26795 + if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
26796 tsk->thread.debugreg6 &= ~DR_STEP;
26797 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
26798 regs->flags &= ~X86_EFLAGS_TF;
26799 @@ -504,7 +540,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
26800 return;
26801 conditional_sti(regs);
26802
26803 - if (!user_mode_vm(regs))
26804 + if (!user_mode(regs))
26805 {
26806 if (!fixup_exception(regs)) {
26807 task->thread.error_code = error_code;
26808 diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
26809 index 2ed8459..7cf329f 100644
26810 --- a/arch/x86/kernel/uprobes.c
26811 +++ b/arch/x86/kernel/uprobes.c
26812 @@ -629,7 +629,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
26813 int ret = NOTIFY_DONE;
26814
26815 /* We are only interested in userspace traps */
26816 - if (regs && !user_mode_vm(regs))
26817 + if (regs && !user_mode(regs))
26818 return NOTIFY_DONE;
26819
26820 switch (val) {
26821 @@ -719,7 +719,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
26822
26823 if (ncopied != rasize) {
26824 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
26825 - "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
26826 + "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
26827
26828 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
26829 }
26830 diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
26831 index b9242ba..50c5edd 100644
26832 --- a/arch/x86/kernel/verify_cpu.S
26833 +++ b/arch/x86/kernel/verify_cpu.S
26834 @@ -20,6 +20,7 @@
26835 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
26836 * arch/x86/kernel/trampoline_64.S: secondary processor verification
26837 * arch/x86/kernel/head_32.S: processor startup
26838 + * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
26839 *
26840 * verify_cpu, returns the status of longmode and SSE in register %eax.
26841 * 0: Success 1: Failure
26842 diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
26843 index e8edcf5..27f9344 100644
26844 --- a/arch/x86/kernel/vm86_32.c
26845 +++ b/arch/x86/kernel/vm86_32.c
26846 @@ -44,6 +44,7 @@
26847 #include <linux/ptrace.h>
26848 #include <linux/audit.h>
26849 #include <linux/stddef.h>
26850 +#include <linux/grsecurity.h>
26851
26852 #include <asm/uaccess.h>
26853 #include <asm/io.h>
26854 @@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
26855 do_exit(SIGSEGV);
26856 }
26857
26858 - tss = &per_cpu(init_tss, get_cpu());
26859 + tss = init_tss + get_cpu();
26860 current->thread.sp0 = current->thread.saved_sp0;
26861 current->thread.sysenter_cs = __KERNEL_CS;
26862 load_sp0(tss, &current->thread);
26863 @@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
26864
26865 if (tsk->thread.saved_sp0)
26866 return -EPERM;
26867 +
26868 +#ifdef CONFIG_GRKERNSEC_VM86
26869 + if (!capable(CAP_SYS_RAWIO)) {
26870 + gr_handle_vm86();
26871 + return -EPERM;
26872 + }
26873 +#endif
26874 +
26875 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
26876 offsetof(struct kernel_vm86_struct, vm86plus) -
26877 sizeof(info.regs));
26878 @@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
26879 int tmp;
26880 struct vm86plus_struct __user *v86;
26881
26882 +#ifdef CONFIG_GRKERNSEC_VM86
26883 + if (!capable(CAP_SYS_RAWIO)) {
26884 + gr_handle_vm86();
26885 + return -EPERM;
26886 + }
26887 +#endif
26888 +
26889 tsk = current;
26890 switch (cmd) {
26891 case VM86_REQUEST_IRQ:
26892 @@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
26893 tsk->thread.saved_fs = info->regs32->fs;
26894 tsk->thread.saved_gs = get_user_gs(info->regs32);
26895
26896 - tss = &per_cpu(init_tss, get_cpu());
26897 + tss = init_tss + get_cpu();
26898 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
26899 if (cpu_has_sep)
26900 tsk->thread.sysenter_cs = 0;
26901 @@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
26902 goto cannot_handle;
26903 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
26904 goto cannot_handle;
26905 - intr_ptr = (unsigned long __user *) (i << 2);
26906 + intr_ptr = (__force unsigned long __user *) (i << 2);
26907 if (get_user(segoffs, intr_ptr))
26908 goto cannot_handle;
26909 if ((segoffs >> 16) == BIOSSEG)
26910 diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
26911 index 10c4f30..65408b9 100644
26912 --- a/arch/x86/kernel/vmlinux.lds.S
26913 +++ b/arch/x86/kernel/vmlinux.lds.S
26914 @@ -26,6 +26,13 @@
26915 #include <asm/page_types.h>
26916 #include <asm/cache.h>
26917 #include <asm/boot.h>
26918 +#include <asm/segment.h>
26919 +
26920 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26921 +#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
26922 +#else
26923 +#define __KERNEL_TEXT_OFFSET 0
26924 +#endif
26925
26926 #undef i386 /* in case the preprocessor is a 32bit one */
26927
26928 @@ -69,30 +76,43 @@ jiffies_64 = jiffies;
26929
26930 PHDRS {
26931 text PT_LOAD FLAGS(5); /* R_E */
26932 +#ifdef CONFIG_X86_32
26933 + module PT_LOAD FLAGS(5); /* R_E */
26934 +#endif
26935 +#ifdef CONFIG_XEN
26936 + rodata PT_LOAD FLAGS(5); /* R_E */
26937 +#else
26938 + rodata PT_LOAD FLAGS(4); /* R__ */
26939 +#endif
26940 data PT_LOAD FLAGS(6); /* RW_ */
26941 -#ifdef CONFIG_X86_64
26942 + init.begin PT_LOAD FLAGS(6); /* RW_ */
26943 #ifdef CONFIG_SMP
26944 percpu PT_LOAD FLAGS(6); /* RW_ */
26945 #endif
26946 + text.init PT_LOAD FLAGS(5); /* R_E */
26947 + text.exit PT_LOAD FLAGS(5); /* R_E */
26948 init PT_LOAD FLAGS(7); /* RWE */
26949 -#endif
26950 note PT_NOTE FLAGS(0); /* ___ */
26951 }
26952
26953 SECTIONS
26954 {
26955 #ifdef CONFIG_X86_32
26956 - . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
26957 - phys_startup_32 = startup_32 - LOAD_OFFSET;
26958 + . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
26959 #else
26960 - . = __START_KERNEL;
26961 - phys_startup_64 = startup_64 - LOAD_OFFSET;
26962 + . = __START_KERNEL;
26963 #endif
26964
26965 /* Text and read-only data */
26966 - .text : AT(ADDR(.text) - LOAD_OFFSET) {
26967 - _text = .;
26968 + .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
26969 /* bootstrapping code */
26970 +#ifdef CONFIG_X86_32
26971 + phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
26972 +#else
26973 + phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
26974 +#endif
26975 + __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
26976 + _text = .;
26977 HEAD_TEXT
26978 . = ALIGN(8);
26979 _stext = .;
26980 @@ -104,13 +124,47 @@ SECTIONS
26981 IRQENTRY_TEXT
26982 *(.fixup)
26983 *(.gnu.warning)
26984 - /* End of text section */
26985 - _etext = .;
26986 } :text = 0x9090
26987
26988 - NOTES :text :note
26989 + . += __KERNEL_TEXT_OFFSET;
26990
26991 - EXCEPTION_TABLE(16) :text = 0x9090
26992 +#ifdef CONFIG_X86_32
26993 + . = ALIGN(PAGE_SIZE);
26994 + .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
26995 +
26996 +#ifdef CONFIG_PAX_KERNEXEC
26997 + MODULES_EXEC_VADDR = .;
26998 + BYTE(0)
26999 + . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
27000 + . = ALIGN(HPAGE_SIZE) - 1;
27001 + MODULES_EXEC_END = .;
27002 +#endif
27003 +
27004 + } :module
27005 +#endif
27006 +
27007 + .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
27008 + /* End of text section */
27009 + BYTE(0)
27010 + _etext = . - __KERNEL_TEXT_OFFSET;
27011 + }
27012 +
27013 +#ifdef CONFIG_X86_32
27014 + . = ALIGN(PAGE_SIZE);
27015 + .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
27016 + . = ALIGN(PAGE_SIZE);
27017 + *(.empty_zero_page)
27018 + *(.initial_pg_fixmap)
27019 + *(.initial_pg_pmd)
27020 + *(.initial_page_table)
27021 + *(.swapper_pg_dir)
27022 + } :rodata
27023 +#endif
27024 +
27025 + . = ALIGN(PAGE_SIZE);
27026 + NOTES :rodata :note
27027 +
27028 + EXCEPTION_TABLE(16) :rodata
27029
27030 #if defined(CONFIG_DEBUG_RODATA)
27031 /* .text should occupy whole number of pages */
27032 @@ -122,16 +176,20 @@ SECTIONS
27033
27034 /* Data */
27035 .data : AT(ADDR(.data) - LOAD_OFFSET) {
27036 +
27037 +#ifdef CONFIG_PAX_KERNEXEC
27038 + . = ALIGN(HPAGE_SIZE);
27039 +#else
27040 + . = ALIGN(PAGE_SIZE);
27041 +#endif
27042 +
27043 /* Start of data section */
27044 _sdata = .;
27045
27046 /* init_task */
27047 INIT_TASK_DATA(THREAD_SIZE)
27048
27049 -#ifdef CONFIG_X86_32
27050 - /* 32 bit has nosave before _edata */
27051 NOSAVE_DATA
27052 -#endif
27053
27054 PAGE_ALIGNED_DATA(PAGE_SIZE)
27055
27056 @@ -172,12 +230,19 @@ SECTIONS
27057 #endif /* CONFIG_X86_64 */
27058
27059 /* Init code and data - will be freed after init */
27060 - . = ALIGN(PAGE_SIZE);
27061 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
27062 + BYTE(0)
27063 +
27064 +#ifdef CONFIG_PAX_KERNEXEC
27065 + . = ALIGN(HPAGE_SIZE);
27066 +#else
27067 + . = ALIGN(PAGE_SIZE);
27068 +#endif
27069 +
27070 __init_begin = .; /* paired with __init_end */
27071 - }
27072 + } :init.begin
27073
27074 -#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
27075 +#ifdef CONFIG_SMP
27076 /*
27077 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
27078 * output PHDR, so the next output section - .init.text - should
27079 @@ -186,12 +251,27 @@ SECTIONS
27080 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
27081 #endif
27082
27083 - INIT_TEXT_SECTION(PAGE_SIZE)
27084 -#ifdef CONFIG_X86_64
27085 - :init
27086 -#endif
27087 + . = ALIGN(PAGE_SIZE);
27088 + init_begin = .;
27089 + .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
27090 + VMLINUX_SYMBOL(_sinittext) = .;
27091 + INIT_TEXT
27092 + VMLINUX_SYMBOL(_einittext) = .;
27093 + . = ALIGN(PAGE_SIZE);
27094 + } :text.init
27095
27096 - INIT_DATA_SECTION(16)
27097 + /*
27098 + * .exit.text is discard at runtime, not link time, to deal with
27099 + * references from .altinstructions and .eh_frame
27100 + */
27101 + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
27102 + EXIT_TEXT
27103 + . = ALIGN(16);
27104 + } :text.exit
27105 + . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
27106 +
27107 + . = ALIGN(PAGE_SIZE);
27108 + INIT_DATA_SECTION(16) :init
27109
27110 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
27111 __x86_cpu_dev_start = .;
27112 @@ -253,19 +333,12 @@ SECTIONS
27113 }
27114
27115 . = ALIGN(8);
27116 - /*
27117 - * .exit.text is discard at runtime, not link time, to deal with
27118 - * references from .altinstructions and .eh_frame
27119 - */
27120 - .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
27121 - EXIT_TEXT
27122 - }
27123
27124 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
27125 EXIT_DATA
27126 }
27127
27128 -#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
27129 +#ifndef CONFIG_SMP
27130 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
27131 #endif
27132
27133 @@ -284,16 +357,10 @@ SECTIONS
27134 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
27135 __smp_locks = .;
27136 *(.smp_locks)
27137 - . = ALIGN(PAGE_SIZE);
27138 __smp_locks_end = .;
27139 + . = ALIGN(PAGE_SIZE);
27140 }
27141
27142 -#ifdef CONFIG_X86_64
27143 - .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
27144 - NOSAVE_DATA
27145 - }
27146 -#endif
27147 -
27148 /* BSS */
27149 . = ALIGN(PAGE_SIZE);
27150 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
27151 @@ -309,6 +376,7 @@ SECTIONS
27152 __brk_base = .;
27153 . += 64 * 1024; /* 64k alignment slop space */
27154 *(.brk_reservation) /* areas brk users have reserved */
27155 + . = ALIGN(HPAGE_SIZE);
27156 __brk_limit = .;
27157 }
27158
27159 @@ -335,13 +403,12 @@ SECTIONS
27160 * for the boot processor.
27161 */
27162 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
27163 -INIT_PER_CPU(gdt_page);
27164 INIT_PER_CPU(irq_stack_union);
27165
27166 /*
27167 * Build-time check on the image size:
27168 */
27169 -. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
27170 +. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
27171 "kernel image bigger than KERNEL_IMAGE_SIZE");
27172
27173 #ifdef CONFIG_SMP
27174 diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
27175 index 1f96f93..d5c8f7a 100644
27176 --- a/arch/x86/kernel/vsyscall_64.c
27177 +++ b/arch/x86/kernel/vsyscall_64.c
27178 @@ -56,15 +56,13 @@
27179 DEFINE_VVAR(int, vgetcpu_mode);
27180 DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data);
27181
27182 -static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
27183 +static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
27184
27185 static int __init vsyscall_setup(char *str)
27186 {
27187 if (str) {
27188 if (!strcmp("emulate", str))
27189 vsyscall_mode = EMULATE;
27190 - else if (!strcmp("native", str))
27191 - vsyscall_mode = NATIVE;
27192 else if (!strcmp("none", str))
27193 vsyscall_mode = NONE;
27194 else
27195 @@ -323,8 +321,7 @@ do_ret:
27196 return true;
27197
27198 sigsegv:
27199 - force_sig(SIGSEGV, current);
27200 - return true;
27201 + do_group_exit(SIGKILL);
27202 }
27203
27204 /*
27205 @@ -377,10 +374,7 @@ void __init map_vsyscall(void)
27206 extern char __vvar_page;
27207 unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
27208
27209 - __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall,
27210 - vsyscall_mode == NATIVE
27211 - ? PAGE_KERNEL_VSYSCALL
27212 - : PAGE_KERNEL_VVAR);
27213 + __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
27214 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
27215 (unsigned long)VSYSCALL_START);
27216
27217 diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
27218 index b014d94..e775258 100644
27219 --- a/arch/x86/kernel/x8664_ksyms_64.c
27220 +++ b/arch/x86/kernel/x8664_ksyms_64.c
27221 @@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
27222 EXPORT_SYMBOL(copy_user_generic_unrolled);
27223 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
27224 EXPORT_SYMBOL(__copy_user_nocache);
27225 -EXPORT_SYMBOL(_copy_from_user);
27226 -EXPORT_SYMBOL(_copy_to_user);
27227
27228 EXPORT_SYMBOL(copy_page);
27229 EXPORT_SYMBOL(clear_page);
27230 @@ -66,3 +64,7 @@ EXPORT_SYMBOL(empty_zero_page);
27231 #ifndef CONFIG_PARAVIRT
27232 EXPORT_SYMBOL(native_load_gs_index);
27233 #endif
27234 +
27235 +#ifdef CONFIG_PAX_PER_CPU_PGD
27236 +EXPORT_SYMBOL(cpu_pgd);
27237 +#endif
27238 diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
27239 index 8ce0072..431a0e7 100644
27240 --- a/arch/x86/kernel/x86_init.c
27241 +++ b/arch/x86/kernel/x86_init.c
27242 @@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
27243 static void default_nmi_init(void) { };
27244 static int default_i8042_detect(void) { return 1; };
27245
27246 -struct x86_platform_ops x86_platform = {
27247 +struct x86_platform_ops x86_platform __read_only = {
27248 .calibrate_tsc = native_calibrate_tsc,
27249 .get_wallclock = mach_get_cmos_time,
27250 .set_wallclock = mach_set_rtc_mmss,
27251 @@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
27252 EXPORT_SYMBOL_GPL(x86_platform);
27253
27254 #if defined(CONFIG_PCI_MSI)
27255 -struct x86_msi_ops x86_msi = {
27256 +struct x86_msi_ops x86_msi __read_only = {
27257 .setup_msi_irqs = native_setup_msi_irqs,
27258 .compose_msi_msg = native_compose_msi_msg,
27259 .teardown_msi_irq = native_teardown_msi_irq,
27260 @@ -140,7 +140,7 @@ void arch_restore_msi_irqs(struct pci_dev *dev, int irq)
27261 }
27262 #endif
27263
27264 -struct x86_io_apic_ops x86_io_apic_ops = {
27265 +struct x86_io_apic_ops x86_io_apic_ops __read_only = {
27266 .init = native_io_apic_init_mappings,
27267 .read = native_io_apic_read,
27268 .write = native_io_apic_write,
27269 diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
27270 index 422fd82..c3687ca 100644
27271 --- a/arch/x86/kernel/xsave.c
27272 +++ b/arch/x86/kernel/xsave.c
27273 @@ -199,6 +199,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
27274 {
27275 int err;
27276
27277 + buf = (struct xsave_struct __user *)____m(buf);
27278 if (use_xsave())
27279 err = xsave_user(buf);
27280 else if (use_fxsr())
27281 @@ -311,6 +312,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
27282 */
27283 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
27284 {
27285 + buf = (void __user *)____m(buf);
27286 if (use_xsave()) {
27287 if ((unsigned long)buf % 64 || fx_only) {
27288 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
27289 diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
27290 index b110fe6..d9c19f2 100644
27291 --- a/arch/x86/kvm/cpuid.c
27292 +++ b/arch/x86/kvm/cpuid.c
27293 @@ -124,15 +124,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
27294 struct kvm_cpuid2 *cpuid,
27295 struct kvm_cpuid_entry2 __user *entries)
27296 {
27297 - int r;
27298 + int r, i;
27299
27300 r = -E2BIG;
27301 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
27302 goto out;
27303 r = -EFAULT;
27304 - if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
27305 - cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
27306 + if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
27307 goto out;
27308 + for (i = 0; i < cpuid->nent; ++i) {
27309 + struct kvm_cpuid_entry2 cpuid_entry;
27310 + if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
27311 + goto out;
27312 + vcpu->arch.cpuid_entries[i] = cpuid_entry;
27313 + }
27314 vcpu->arch.cpuid_nent = cpuid->nent;
27315 kvm_apic_set_version(vcpu);
27316 kvm_x86_ops->cpuid_update(vcpu);
27317 @@ -147,15 +152,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
27318 struct kvm_cpuid2 *cpuid,
27319 struct kvm_cpuid_entry2 __user *entries)
27320 {
27321 - int r;
27322 + int r, i;
27323
27324 r = -E2BIG;
27325 if (cpuid->nent < vcpu->arch.cpuid_nent)
27326 goto out;
27327 r = -EFAULT;
27328 - if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
27329 - vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
27330 + if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
27331 goto out;
27332 + for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
27333 + struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
27334 + if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
27335 + goto out;
27336 + }
27337 return 0;
27338
27339 out:
27340 diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
27341 index dec48bf..f4d21f7 100644
27342 --- a/arch/x86/kvm/lapic.c
27343 +++ b/arch/x86/kvm/lapic.c
27344 @@ -55,7 +55,7 @@
27345 #define APIC_BUS_CYCLE_NS 1
27346
27347 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
27348 -#define apic_debug(fmt, arg...)
27349 +#define apic_debug(fmt, arg...) do {} while (0)
27350
27351 #define APIC_LVT_NUM 6
27352 /* 14 is the version for Xeon and Pentium 8.4.8*/
27353 diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
27354 index ad75d77..a679d32 100644
27355 --- a/arch/x86/kvm/paging_tmpl.h
27356 +++ b/arch/x86/kvm/paging_tmpl.h
27357 @@ -331,7 +331,7 @@ retry_walk:
27358 if (unlikely(kvm_is_error_hva(host_addr)))
27359 goto error;
27360
27361 - ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
27362 + ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
27363 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
27364 goto error;
27365 walker->ptep_user[walker->level - 1] = ptep_user;
27366 diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
27367 index c0bc803..6837a50 100644
27368 --- a/arch/x86/kvm/svm.c
27369 +++ b/arch/x86/kvm/svm.c
27370 @@ -3501,7 +3501,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
27371 int cpu = raw_smp_processor_id();
27372
27373 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
27374 +
27375 + pax_open_kernel();
27376 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
27377 + pax_close_kernel();
27378 +
27379 load_TR_desc();
27380 }
27381
27382 @@ -3902,6 +3906,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
27383 #endif
27384 #endif
27385
27386 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
27387 + __set_fs(current_thread_info()->addr_limit);
27388 +#endif
27389 +
27390 reload_tss(vcpu);
27391
27392 local_irq_disable();
27393 diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
27394 index 2b2fce1..da76be4 100644
27395 --- a/arch/x86/kvm/vmx.c
27396 +++ b/arch/x86/kvm/vmx.c
27397 @@ -1316,12 +1316,12 @@ static void vmcs_write64(unsigned long field, u64 value)
27398 #endif
27399 }
27400
27401 -static void vmcs_clear_bits(unsigned long field, u32 mask)
27402 +static void vmcs_clear_bits(unsigned long field, unsigned long mask)
27403 {
27404 vmcs_writel(field, vmcs_readl(field) & ~mask);
27405 }
27406
27407 -static void vmcs_set_bits(unsigned long field, u32 mask)
27408 +static void vmcs_set_bits(unsigned long field, unsigned long mask)
27409 {
27410 vmcs_writel(field, vmcs_readl(field) | mask);
27411 }
27412 @@ -1522,7 +1522,11 @@ static void reload_tss(void)
27413 struct desc_struct *descs;
27414
27415 descs = (void *)gdt->address;
27416 +
27417 + pax_open_kernel();
27418 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
27419 + pax_close_kernel();
27420 +
27421 load_TR_desc();
27422 }
27423
27424 @@ -1746,6 +1750,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
27425 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
27426 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
27427
27428 +#ifdef CONFIG_PAX_PER_CPU_PGD
27429 + vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
27430 +#endif
27431 +
27432 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
27433 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
27434 vmx->loaded_vmcs->cpu = cpu;
27435 @@ -2037,7 +2045,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
27436 * reads and returns guest's timestamp counter "register"
27437 * guest_tsc = host_tsc + tsc_offset -- 21.3
27438 */
27439 -static u64 guest_read_tsc(void)
27440 +static u64 __intentional_overflow(-1) guest_read_tsc(void)
27441 {
27442 u64 host_tsc, tsc_offset;
27443
27444 @@ -2982,8 +2990,11 @@ static __init int hardware_setup(void)
27445 if (!cpu_has_vmx_flexpriority())
27446 flexpriority_enabled = 0;
27447
27448 - if (!cpu_has_vmx_tpr_shadow())
27449 - kvm_x86_ops->update_cr8_intercept = NULL;
27450 + if (!cpu_has_vmx_tpr_shadow()) {
27451 + pax_open_kernel();
27452 + *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
27453 + pax_close_kernel();
27454 + }
27455
27456 if (enable_ept && !cpu_has_vmx_ept_2m_page())
27457 kvm_disable_largepages();
27458 @@ -2994,13 +3005,15 @@ static __init int hardware_setup(void)
27459 if (!cpu_has_vmx_apicv())
27460 enable_apicv = 0;
27461
27462 + pax_open_kernel();
27463 if (enable_apicv)
27464 - kvm_x86_ops->update_cr8_intercept = NULL;
27465 + *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
27466 else {
27467 - kvm_x86_ops->hwapic_irr_update = NULL;
27468 - kvm_x86_ops->deliver_posted_interrupt = NULL;
27469 - kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
27470 + *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
27471 + *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
27472 + *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
27473 }
27474 + pax_close_kernel();
27475
27476 if (nested)
27477 nested_vmx_setup_ctls_msrs();
27478 @@ -4127,7 +4140,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
27479
27480 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
27481 vmcs_writel(HOST_CR4, read_cr4()); /* 22.2.3, 22.2.5 */
27482 +
27483 +#ifndef CONFIG_PAX_PER_CPU_PGD
27484 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
27485 +#endif
27486
27487 vmcs_write16(HOST_CS_SELECTOR, __KERNEL_CS); /* 22.2.4 */
27488 #ifdef CONFIG_X86_64
27489 @@ -4149,7 +4165,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
27490 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
27491 vmx->host_idt_base = dt.address;
27492
27493 - vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
27494 + vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
27495
27496 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
27497 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
27498 @@ -7191,6 +7207,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
27499 "jmp 2f \n\t"
27500 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
27501 "2: "
27502 +
27503 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27504 + "ljmp %[cs],$3f\n\t"
27505 + "3: "
27506 +#endif
27507 +
27508 /* Save guest registers, load host registers, keep flags */
27509 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
27510 "pop %0 \n\t"
27511 @@ -7243,6 +7265,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
27512 #endif
27513 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
27514 [wordsize]"i"(sizeof(ulong))
27515 +
27516 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27517 + ,[cs]"i"(__KERNEL_CS)
27518 +#endif
27519 +
27520 : "cc", "memory"
27521 #ifdef CONFIG_X86_64
27522 , "rax", "rbx", "rdi", "rsi"
27523 @@ -7256,7 +7283,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
27524 if (debugctlmsr)
27525 update_debugctlmsr(debugctlmsr);
27526
27527 -#ifndef CONFIG_X86_64
27528 +#ifdef CONFIG_X86_32
27529 /*
27530 * The sysexit path does not restore ds/es, so we must set them to
27531 * a reasonable value ourselves.
27532 @@ -7265,8 +7292,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
27533 * may be executed in interrupt context, which saves and restore segments
27534 * around it, nullifying its effect.
27535 */
27536 - loadsegment(ds, __USER_DS);
27537 - loadsegment(es, __USER_DS);
27538 + loadsegment(ds, __KERNEL_DS);
27539 + loadsegment(es, __KERNEL_DS);
27540 + loadsegment(ss, __KERNEL_DS);
27541 +
27542 +#ifdef CONFIG_PAX_KERNEXEC
27543 + loadsegment(fs, __KERNEL_PERCPU);
27544 +#endif
27545 +
27546 +#ifdef CONFIG_PAX_MEMORY_UDEREF
27547 + __set_fs(current_thread_info()->addr_limit);
27548 +#endif
27549 +
27550 #endif
27551
27552 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
27553 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
27554 index eb9b9c9..0f30b12 100644
27555 --- a/arch/x86/kvm/x86.c
27556 +++ b/arch/x86/kvm/x86.c
27557 @@ -1779,8 +1779,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
27558 {
27559 struct kvm *kvm = vcpu->kvm;
27560 int lm = is_long_mode(vcpu);
27561 - u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
27562 - : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
27563 + u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
27564 + : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
27565 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
27566 : kvm->arch.xen_hvm_config.blob_size_32;
27567 u32 page_num = data & ~PAGE_MASK;
27568 @@ -2663,6 +2663,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
27569 if (n < msr_list.nmsrs)
27570 goto out;
27571 r = -EFAULT;
27572 + if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
27573 + goto out;
27574 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
27575 num_msrs_to_save * sizeof(u32)))
27576 goto out;
27577 @@ -5461,7 +5463,7 @@ static struct notifier_block pvclock_gtod_notifier = {
27578 };
27579 #endif
27580
27581 -int kvm_arch_init(void *opaque)
27582 +int kvm_arch_init(const void *opaque)
27583 {
27584 int r;
27585 struct kvm_x86_ops *ops = opaque;
27586 diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
27587 index bdf8532..f63c587 100644
27588 --- a/arch/x86/lguest/boot.c
27589 +++ b/arch/x86/lguest/boot.c
27590 @@ -1206,9 +1206,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
27591 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
27592 * Launcher to reboot us.
27593 */
27594 -static void lguest_restart(char *reason)
27595 +static __noreturn void lguest_restart(char *reason)
27596 {
27597 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
27598 + BUG();
27599 }
27600
27601 /*G:050
27602 diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
27603 index 00933d5..3a64af9 100644
27604 --- a/arch/x86/lib/atomic64_386_32.S
27605 +++ b/arch/x86/lib/atomic64_386_32.S
27606 @@ -48,6 +48,10 @@ BEGIN(read)
27607 movl (v), %eax
27608 movl 4(v), %edx
27609 RET_ENDP
27610 +BEGIN(read_unchecked)
27611 + movl (v), %eax
27612 + movl 4(v), %edx
27613 +RET_ENDP
27614 #undef v
27615
27616 #define v %esi
27617 @@ -55,6 +59,10 @@ BEGIN(set)
27618 movl %ebx, (v)
27619 movl %ecx, 4(v)
27620 RET_ENDP
27621 +BEGIN(set_unchecked)
27622 + movl %ebx, (v)
27623 + movl %ecx, 4(v)
27624 +RET_ENDP
27625 #undef v
27626
27627 #define v %esi
27628 @@ -70,6 +78,20 @@ RET_ENDP
27629 BEGIN(add)
27630 addl %eax, (v)
27631 adcl %edx, 4(v)
27632 +
27633 +#ifdef CONFIG_PAX_REFCOUNT
27634 + jno 0f
27635 + subl %eax, (v)
27636 + sbbl %edx, 4(v)
27637 + int $4
27638 +0:
27639 + _ASM_EXTABLE(0b, 0b)
27640 +#endif
27641 +
27642 +RET_ENDP
27643 +BEGIN(add_unchecked)
27644 + addl %eax, (v)
27645 + adcl %edx, 4(v)
27646 RET_ENDP
27647 #undef v
27648
27649 @@ -77,6 +99,24 @@ RET_ENDP
27650 BEGIN(add_return)
27651 addl (v), %eax
27652 adcl 4(v), %edx
27653 +
27654 +#ifdef CONFIG_PAX_REFCOUNT
27655 + into
27656 +1234:
27657 + _ASM_EXTABLE(1234b, 2f)
27658 +#endif
27659 +
27660 + movl %eax, (v)
27661 + movl %edx, 4(v)
27662 +
27663 +#ifdef CONFIG_PAX_REFCOUNT
27664 +2:
27665 +#endif
27666 +
27667 +RET_ENDP
27668 +BEGIN(add_return_unchecked)
27669 + addl (v), %eax
27670 + adcl 4(v), %edx
27671 movl %eax, (v)
27672 movl %edx, 4(v)
27673 RET_ENDP
27674 @@ -86,6 +126,20 @@ RET_ENDP
27675 BEGIN(sub)
27676 subl %eax, (v)
27677 sbbl %edx, 4(v)
27678 +
27679 +#ifdef CONFIG_PAX_REFCOUNT
27680 + jno 0f
27681 + addl %eax, (v)
27682 + adcl %edx, 4(v)
27683 + int $4
27684 +0:
27685 + _ASM_EXTABLE(0b, 0b)
27686 +#endif
27687 +
27688 +RET_ENDP
27689 +BEGIN(sub_unchecked)
27690 + subl %eax, (v)
27691 + sbbl %edx, 4(v)
27692 RET_ENDP
27693 #undef v
27694
27695 @@ -96,6 +150,27 @@ BEGIN(sub_return)
27696 sbbl $0, %edx
27697 addl (v), %eax
27698 adcl 4(v), %edx
27699 +
27700 +#ifdef CONFIG_PAX_REFCOUNT
27701 + into
27702 +1234:
27703 + _ASM_EXTABLE(1234b, 2f)
27704 +#endif
27705 +
27706 + movl %eax, (v)
27707 + movl %edx, 4(v)
27708 +
27709 +#ifdef CONFIG_PAX_REFCOUNT
27710 +2:
27711 +#endif
27712 +
27713 +RET_ENDP
27714 +BEGIN(sub_return_unchecked)
27715 + negl %edx
27716 + negl %eax
27717 + sbbl $0, %edx
27718 + addl (v), %eax
27719 + adcl 4(v), %edx
27720 movl %eax, (v)
27721 movl %edx, 4(v)
27722 RET_ENDP
27723 @@ -105,6 +180,20 @@ RET_ENDP
27724 BEGIN(inc)
27725 addl $1, (v)
27726 adcl $0, 4(v)
27727 +
27728 +#ifdef CONFIG_PAX_REFCOUNT
27729 + jno 0f
27730 + subl $1, (v)
27731 + sbbl $0, 4(v)
27732 + int $4
27733 +0:
27734 + _ASM_EXTABLE(0b, 0b)
27735 +#endif
27736 +
27737 +RET_ENDP
27738 +BEGIN(inc_unchecked)
27739 + addl $1, (v)
27740 + adcl $0, 4(v)
27741 RET_ENDP
27742 #undef v
27743
27744 @@ -114,6 +203,26 @@ BEGIN(inc_return)
27745 movl 4(v), %edx
27746 addl $1, %eax
27747 adcl $0, %edx
27748 +
27749 +#ifdef CONFIG_PAX_REFCOUNT
27750 + into
27751 +1234:
27752 + _ASM_EXTABLE(1234b, 2f)
27753 +#endif
27754 +
27755 + movl %eax, (v)
27756 + movl %edx, 4(v)
27757 +
27758 +#ifdef CONFIG_PAX_REFCOUNT
27759 +2:
27760 +#endif
27761 +
27762 +RET_ENDP
27763 +BEGIN(inc_return_unchecked)
27764 + movl (v), %eax
27765 + movl 4(v), %edx
27766 + addl $1, %eax
27767 + adcl $0, %edx
27768 movl %eax, (v)
27769 movl %edx, 4(v)
27770 RET_ENDP
27771 @@ -123,6 +232,20 @@ RET_ENDP
27772 BEGIN(dec)
27773 subl $1, (v)
27774 sbbl $0, 4(v)
27775 +
27776 +#ifdef CONFIG_PAX_REFCOUNT
27777 + jno 0f
27778 + addl $1, (v)
27779 + adcl $0, 4(v)
27780 + int $4
27781 +0:
27782 + _ASM_EXTABLE(0b, 0b)
27783 +#endif
27784 +
27785 +RET_ENDP
27786 +BEGIN(dec_unchecked)
27787 + subl $1, (v)
27788 + sbbl $0, 4(v)
27789 RET_ENDP
27790 #undef v
27791
27792 @@ -132,6 +255,26 @@ BEGIN(dec_return)
27793 movl 4(v), %edx
27794 subl $1, %eax
27795 sbbl $0, %edx
27796 +
27797 +#ifdef CONFIG_PAX_REFCOUNT
27798 + into
27799 +1234:
27800 + _ASM_EXTABLE(1234b, 2f)
27801 +#endif
27802 +
27803 + movl %eax, (v)
27804 + movl %edx, 4(v)
27805 +
27806 +#ifdef CONFIG_PAX_REFCOUNT
27807 +2:
27808 +#endif
27809 +
27810 +RET_ENDP
27811 +BEGIN(dec_return_unchecked)
27812 + movl (v), %eax
27813 + movl 4(v), %edx
27814 + subl $1, %eax
27815 + sbbl $0, %edx
27816 movl %eax, (v)
27817 movl %edx, 4(v)
27818 RET_ENDP
27819 @@ -143,6 +286,13 @@ BEGIN(add_unless)
27820 adcl %edx, %edi
27821 addl (v), %eax
27822 adcl 4(v), %edx
27823 +
27824 +#ifdef CONFIG_PAX_REFCOUNT
27825 + into
27826 +1234:
27827 + _ASM_EXTABLE(1234b, 2f)
27828 +#endif
27829 +
27830 cmpl %eax, %ecx
27831 je 3f
27832 1:
27833 @@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
27834 1:
27835 addl $1, %eax
27836 adcl $0, %edx
27837 +
27838 +#ifdef CONFIG_PAX_REFCOUNT
27839 + into
27840 +1234:
27841 + _ASM_EXTABLE(1234b, 2f)
27842 +#endif
27843 +
27844 movl %eax, (v)
27845 movl %edx, 4(v)
27846 movl $1, %eax
27847 @@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
27848 movl 4(v), %edx
27849 subl $1, %eax
27850 sbbl $0, %edx
27851 +
27852 +#ifdef CONFIG_PAX_REFCOUNT
27853 + into
27854 +1234:
27855 + _ASM_EXTABLE(1234b, 1f)
27856 +#endif
27857 +
27858 js 1f
27859 movl %eax, (v)
27860 movl %edx, 4(v)
27861 diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
27862 index f5cc9eb..51fa319 100644
27863 --- a/arch/x86/lib/atomic64_cx8_32.S
27864 +++ b/arch/x86/lib/atomic64_cx8_32.S
27865 @@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
27866 CFI_STARTPROC
27867
27868 read64 %ecx
27869 + pax_force_retaddr
27870 ret
27871 CFI_ENDPROC
27872 ENDPROC(atomic64_read_cx8)
27873
27874 +ENTRY(atomic64_read_unchecked_cx8)
27875 + CFI_STARTPROC
27876 +
27877 + read64 %ecx
27878 + pax_force_retaddr
27879 + ret
27880 + CFI_ENDPROC
27881 +ENDPROC(atomic64_read_unchecked_cx8)
27882 +
27883 ENTRY(atomic64_set_cx8)
27884 CFI_STARTPROC
27885
27886 @@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
27887 cmpxchg8b (%esi)
27888 jne 1b
27889
27890 + pax_force_retaddr
27891 ret
27892 CFI_ENDPROC
27893 ENDPROC(atomic64_set_cx8)
27894
27895 +ENTRY(atomic64_set_unchecked_cx8)
27896 + CFI_STARTPROC
27897 +
27898 +1:
27899 +/* we don't need LOCK_PREFIX since aligned 64-bit writes
27900 + * are atomic on 586 and newer */
27901 + cmpxchg8b (%esi)
27902 + jne 1b
27903 +
27904 + pax_force_retaddr
27905 + ret
27906 + CFI_ENDPROC
27907 +ENDPROC(atomic64_set_unchecked_cx8)
27908 +
27909 ENTRY(atomic64_xchg_cx8)
27910 CFI_STARTPROC
27911
27912 @@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
27913 cmpxchg8b (%esi)
27914 jne 1b
27915
27916 + pax_force_retaddr
27917 ret
27918 CFI_ENDPROC
27919 ENDPROC(atomic64_xchg_cx8)
27920
27921 -.macro addsub_return func ins insc
27922 -ENTRY(atomic64_\func\()_return_cx8)
27923 +.macro addsub_return func ins insc unchecked=""
27924 +ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
27925 CFI_STARTPROC
27926 SAVE ebp
27927 SAVE ebx
27928 @@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
27929 movl %edx, %ecx
27930 \ins\()l %esi, %ebx
27931 \insc\()l %edi, %ecx
27932 +
27933 +.ifb \unchecked
27934 +#ifdef CONFIG_PAX_REFCOUNT
27935 + into
27936 +2:
27937 + _ASM_EXTABLE(2b, 3f)
27938 +#endif
27939 +.endif
27940 +
27941 LOCK_PREFIX
27942 cmpxchg8b (%ebp)
27943 jne 1b
27944 -
27945 -10:
27946 movl %ebx, %eax
27947 movl %ecx, %edx
27948 +
27949 +.ifb \unchecked
27950 +#ifdef CONFIG_PAX_REFCOUNT
27951 +3:
27952 +#endif
27953 +.endif
27954 +
27955 RESTORE edi
27956 RESTORE esi
27957 RESTORE ebx
27958 RESTORE ebp
27959 + pax_force_retaddr
27960 ret
27961 CFI_ENDPROC
27962 -ENDPROC(atomic64_\func\()_return_cx8)
27963 +ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
27964 .endm
27965
27966 addsub_return add add adc
27967 addsub_return sub sub sbb
27968 +addsub_return add add adc _unchecked
27969 +addsub_return sub sub sbb _unchecked
27970
27971 -.macro incdec_return func ins insc
27972 -ENTRY(atomic64_\func\()_return_cx8)
27973 +.macro incdec_return func ins insc unchecked=""
27974 +ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
27975 CFI_STARTPROC
27976 SAVE ebx
27977
27978 @@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
27979 movl %edx, %ecx
27980 \ins\()l $1, %ebx
27981 \insc\()l $0, %ecx
27982 +
27983 +.ifb \unchecked
27984 +#ifdef CONFIG_PAX_REFCOUNT
27985 + into
27986 +2:
27987 + _ASM_EXTABLE(2b, 3f)
27988 +#endif
27989 +.endif
27990 +
27991 LOCK_PREFIX
27992 cmpxchg8b (%esi)
27993 jne 1b
27994
27995 -10:
27996 movl %ebx, %eax
27997 movl %ecx, %edx
27998 +
27999 +.ifb \unchecked
28000 +#ifdef CONFIG_PAX_REFCOUNT
28001 +3:
28002 +#endif
28003 +.endif
28004 +
28005 RESTORE ebx
28006 + pax_force_retaddr
28007 ret
28008 CFI_ENDPROC
28009 -ENDPROC(atomic64_\func\()_return_cx8)
28010 +ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
28011 .endm
28012
28013 incdec_return inc add adc
28014 incdec_return dec sub sbb
28015 +incdec_return inc add adc _unchecked
28016 +incdec_return dec sub sbb _unchecked
28017
28018 ENTRY(atomic64_dec_if_positive_cx8)
28019 CFI_STARTPROC
28020 @@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
28021 movl %edx, %ecx
28022 subl $1, %ebx
28023 sbb $0, %ecx
28024 +
28025 +#ifdef CONFIG_PAX_REFCOUNT
28026 + into
28027 +1234:
28028 + _ASM_EXTABLE(1234b, 2f)
28029 +#endif
28030 +
28031 js 2f
28032 LOCK_PREFIX
28033 cmpxchg8b (%esi)
28034 @@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
28035 movl %ebx, %eax
28036 movl %ecx, %edx
28037 RESTORE ebx
28038 + pax_force_retaddr
28039 ret
28040 CFI_ENDPROC
28041 ENDPROC(atomic64_dec_if_positive_cx8)
28042 @@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
28043 movl %edx, %ecx
28044 addl %ebp, %ebx
28045 adcl %edi, %ecx
28046 +
28047 +#ifdef CONFIG_PAX_REFCOUNT
28048 + into
28049 +1234:
28050 + _ASM_EXTABLE(1234b, 3f)
28051 +#endif
28052 +
28053 LOCK_PREFIX
28054 cmpxchg8b (%esi)
28055 jne 1b
28056 @@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
28057 CFI_ADJUST_CFA_OFFSET -8
28058 RESTORE ebx
28059 RESTORE ebp
28060 + pax_force_retaddr
28061 ret
28062 4:
28063 cmpl %edx, 4(%esp)
28064 @@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
28065 xorl %ecx, %ecx
28066 addl $1, %ebx
28067 adcl %edx, %ecx
28068 +
28069 +#ifdef CONFIG_PAX_REFCOUNT
28070 + into
28071 +1234:
28072 + _ASM_EXTABLE(1234b, 3f)
28073 +#endif
28074 +
28075 LOCK_PREFIX
28076 cmpxchg8b (%esi)
28077 jne 1b
28078 @@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
28079 movl $1, %eax
28080 3:
28081 RESTORE ebx
28082 + pax_force_retaddr
28083 ret
28084 CFI_ENDPROC
28085 ENDPROC(atomic64_inc_not_zero_cx8)
28086 diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
28087 index e78b8ee..7e173a8 100644
28088 --- a/arch/x86/lib/checksum_32.S
28089 +++ b/arch/x86/lib/checksum_32.S
28090 @@ -29,7 +29,8 @@
28091 #include <asm/dwarf2.h>
28092 #include <asm/errno.h>
28093 #include <asm/asm.h>
28094 -
28095 +#include <asm/segment.h>
28096 +
28097 /*
28098 * computes a partial checksum, e.g. for TCP/UDP fragments
28099 */
28100 @@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
28101
28102 #define ARGBASE 16
28103 #define FP 12
28104 -
28105 -ENTRY(csum_partial_copy_generic)
28106 +
28107 +ENTRY(csum_partial_copy_generic_to_user)
28108 CFI_STARTPROC
28109 +
28110 +#ifdef CONFIG_PAX_MEMORY_UDEREF
28111 + pushl_cfi %gs
28112 + popl_cfi %es
28113 + jmp csum_partial_copy_generic
28114 +#endif
28115 +
28116 +ENTRY(csum_partial_copy_generic_from_user)
28117 +
28118 +#ifdef CONFIG_PAX_MEMORY_UDEREF
28119 + pushl_cfi %gs
28120 + popl_cfi %ds
28121 +#endif
28122 +
28123 +ENTRY(csum_partial_copy_generic)
28124 subl $4,%esp
28125 CFI_ADJUST_CFA_OFFSET 4
28126 pushl_cfi %edi
28127 @@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
28128 jmp 4f
28129 SRC(1: movw (%esi), %bx )
28130 addl $2, %esi
28131 -DST( movw %bx, (%edi) )
28132 +DST( movw %bx, %es:(%edi) )
28133 addl $2, %edi
28134 addw %bx, %ax
28135 adcl $0, %eax
28136 @@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
28137 SRC(1: movl (%esi), %ebx )
28138 SRC( movl 4(%esi), %edx )
28139 adcl %ebx, %eax
28140 -DST( movl %ebx, (%edi) )
28141 +DST( movl %ebx, %es:(%edi) )
28142 adcl %edx, %eax
28143 -DST( movl %edx, 4(%edi) )
28144 +DST( movl %edx, %es:4(%edi) )
28145
28146 SRC( movl 8(%esi), %ebx )
28147 SRC( movl 12(%esi), %edx )
28148 adcl %ebx, %eax
28149 -DST( movl %ebx, 8(%edi) )
28150 +DST( movl %ebx, %es:8(%edi) )
28151 adcl %edx, %eax
28152 -DST( movl %edx, 12(%edi) )
28153 +DST( movl %edx, %es:12(%edi) )
28154
28155 SRC( movl 16(%esi), %ebx )
28156 SRC( movl 20(%esi), %edx )
28157 adcl %ebx, %eax
28158 -DST( movl %ebx, 16(%edi) )
28159 +DST( movl %ebx, %es:16(%edi) )
28160 adcl %edx, %eax
28161 -DST( movl %edx, 20(%edi) )
28162 +DST( movl %edx, %es:20(%edi) )
28163
28164 SRC( movl 24(%esi), %ebx )
28165 SRC( movl 28(%esi), %edx )
28166 adcl %ebx, %eax
28167 -DST( movl %ebx, 24(%edi) )
28168 +DST( movl %ebx, %es:24(%edi) )
28169 adcl %edx, %eax
28170 -DST( movl %edx, 28(%edi) )
28171 +DST( movl %edx, %es:28(%edi) )
28172
28173 lea 32(%esi), %esi
28174 lea 32(%edi), %edi
28175 @@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
28176 shrl $2, %edx # This clears CF
28177 SRC(3: movl (%esi), %ebx )
28178 adcl %ebx, %eax
28179 -DST( movl %ebx, (%edi) )
28180 +DST( movl %ebx, %es:(%edi) )
28181 lea 4(%esi), %esi
28182 lea 4(%edi), %edi
28183 dec %edx
28184 @@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
28185 jb 5f
28186 SRC( movw (%esi), %cx )
28187 leal 2(%esi), %esi
28188 -DST( movw %cx, (%edi) )
28189 +DST( movw %cx, %es:(%edi) )
28190 leal 2(%edi), %edi
28191 je 6f
28192 shll $16,%ecx
28193 SRC(5: movb (%esi), %cl )
28194 -DST( movb %cl, (%edi) )
28195 +DST( movb %cl, %es:(%edi) )
28196 6: addl %ecx, %eax
28197 adcl $0, %eax
28198 7:
28199 @@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
28200
28201 6001:
28202 movl ARGBASE+20(%esp), %ebx # src_err_ptr
28203 - movl $-EFAULT, (%ebx)
28204 + movl $-EFAULT, %ss:(%ebx)
28205
28206 # zero the complete destination - computing the rest
28207 # is too much work
28208 @@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
28209
28210 6002:
28211 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
28212 - movl $-EFAULT,(%ebx)
28213 + movl $-EFAULT,%ss:(%ebx)
28214 jmp 5000b
28215
28216 .previous
28217
28218 + pushl_cfi %ss
28219 + popl_cfi %ds
28220 + pushl_cfi %ss
28221 + popl_cfi %es
28222 popl_cfi %ebx
28223 CFI_RESTORE ebx
28224 popl_cfi %esi
28225 @@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
28226 popl_cfi %ecx # equivalent to addl $4,%esp
28227 ret
28228 CFI_ENDPROC
28229 -ENDPROC(csum_partial_copy_generic)
28230 +ENDPROC(csum_partial_copy_generic_to_user)
28231
28232 #else
28233
28234 /* Version for PentiumII/PPro */
28235
28236 #define ROUND1(x) \
28237 + nop; nop; nop; \
28238 SRC(movl x(%esi), %ebx ) ; \
28239 addl %ebx, %eax ; \
28240 - DST(movl %ebx, x(%edi) ) ;
28241 + DST(movl %ebx, %es:x(%edi)) ;
28242
28243 #define ROUND(x) \
28244 + nop; nop; nop; \
28245 SRC(movl x(%esi), %ebx ) ; \
28246 adcl %ebx, %eax ; \
28247 - DST(movl %ebx, x(%edi) ) ;
28248 + DST(movl %ebx, %es:x(%edi)) ;
28249
28250 #define ARGBASE 12
28251 -
28252 -ENTRY(csum_partial_copy_generic)
28253 +
28254 +ENTRY(csum_partial_copy_generic_to_user)
28255 CFI_STARTPROC
28256 +
28257 +#ifdef CONFIG_PAX_MEMORY_UDEREF
28258 + pushl_cfi %gs
28259 + popl_cfi %es
28260 + jmp csum_partial_copy_generic
28261 +#endif
28262 +
28263 +ENTRY(csum_partial_copy_generic_from_user)
28264 +
28265 +#ifdef CONFIG_PAX_MEMORY_UDEREF
28266 + pushl_cfi %gs
28267 + popl_cfi %ds
28268 +#endif
28269 +
28270 +ENTRY(csum_partial_copy_generic)
28271 pushl_cfi %ebx
28272 CFI_REL_OFFSET ebx, 0
28273 pushl_cfi %edi
28274 @@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
28275 subl %ebx, %edi
28276 lea -1(%esi),%edx
28277 andl $-32,%edx
28278 - lea 3f(%ebx,%ebx), %ebx
28279 + lea 3f(%ebx,%ebx,2), %ebx
28280 testl %esi, %esi
28281 jmp *%ebx
28282 1: addl $64,%esi
28283 @@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
28284 jb 5f
28285 SRC( movw (%esi), %dx )
28286 leal 2(%esi), %esi
28287 -DST( movw %dx, (%edi) )
28288 +DST( movw %dx, %es:(%edi) )
28289 leal 2(%edi), %edi
28290 je 6f
28291 shll $16,%edx
28292 5:
28293 SRC( movb (%esi), %dl )
28294 -DST( movb %dl, (%edi) )
28295 +DST( movb %dl, %es:(%edi) )
28296 6: addl %edx, %eax
28297 adcl $0, %eax
28298 7:
28299 .section .fixup, "ax"
28300 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
28301 - movl $-EFAULT, (%ebx)
28302 + movl $-EFAULT, %ss:(%ebx)
28303 # zero the complete destination (computing the rest is too much work)
28304 movl ARGBASE+8(%esp),%edi # dst
28305 movl ARGBASE+12(%esp),%ecx # len
28306 @@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
28307 rep; stosb
28308 jmp 7b
28309 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
28310 - movl $-EFAULT, (%ebx)
28311 + movl $-EFAULT, %ss:(%ebx)
28312 jmp 7b
28313 .previous
28314
28315 +#ifdef CONFIG_PAX_MEMORY_UDEREF
28316 + pushl_cfi %ss
28317 + popl_cfi %ds
28318 + pushl_cfi %ss
28319 + popl_cfi %es
28320 +#endif
28321 +
28322 popl_cfi %esi
28323 CFI_RESTORE esi
28324 popl_cfi %edi
28325 @@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
28326 CFI_RESTORE ebx
28327 ret
28328 CFI_ENDPROC
28329 -ENDPROC(csum_partial_copy_generic)
28330 +ENDPROC(csum_partial_copy_generic_to_user)
28331
28332 #undef ROUND
28333 #undef ROUND1
28334 diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
28335 index f2145cf..cea889d 100644
28336 --- a/arch/x86/lib/clear_page_64.S
28337 +++ b/arch/x86/lib/clear_page_64.S
28338 @@ -11,6 +11,7 @@ ENTRY(clear_page_c)
28339 movl $4096/8,%ecx
28340 xorl %eax,%eax
28341 rep stosq
28342 + pax_force_retaddr
28343 ret
28344 CFI_ENDPROC
28345 ENDPROC(clear_page_c)
28346 @@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
28347 movl $4096,%ecx
28348 xorl %eax,%eax
28349 rep stosb
28350 + pax_force_retaddr
28351 ret
28352 CFI_ENDPROC
28353 ENDPROC(clear_page_c_e)
28354 @@ -43,6 +45,7 @@ ENTRY(clear_page)
28355 leaq 64(%rdi),%rdi
28356 jnz .Lloop
28357 nop
28358 + pax_force_retaddr
28359 ret
28360 CFI_ENDPROC
28361 .Lclear_page_end:
28362 @@ -58,7 +61,7 @@ ENDPROC(clear_page)
28363
28364 #include <asm/cpufeature.h>
28365
28366 - .section .altinstr_replacement,"ax"
28367 + .section .altinstr_replacement,"a"
28368 1: .byte 0xeb /* jmp <disp8> */
28369 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
28370 2: .byte 0xeb /* jmp <disp8> */
28371 diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
28372 index 1e572c5..2a162cd 100644
28373 --- a/arch/x86/lib/cmpxchg16b_emu.S
28374 +++ b/arch/x86/lib/cmpxchg16b_emu.S
28375 @@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
28376
28377 popf
28378 mov $1, %al
28379 + pax_force_retaddr
28380 ret
28381
28382 not_same:
28383 popf
28384 xor %al,%al
28385 + pax_force_retaddr
28386 ret
28387
28388 CFI_ENDPROC
28389 diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
28390 index 176cca6..e0d658e 100644
28391 --- a/arch/x86/lib/copy_page_64.S
28392 +++ b/arch/x86/lib/copy_page_64.S
28393 @@ -9,6 +9,7 @@ copy_page_rep:
28394 CFI_STARTPROC
28395 movl $4096/8, %ecx
28396 rep movsq
28397 + pax_force_retaddr
28398 ret
28399 CFI_ENDPROC
28400 ENDPROC(copy_page_rep)
28401 @@ -24,8 +25,8 @@ ENTRY(copy_page)
28402 CFI_ADJUST_CFA_OFFSET 2*8
28403 movq %rbx, (%rsp)
28404 CFI_REL_OFFSET rbx, 0
28405 - movq %r12, 1*8(%rsp)
28406 - CFI_REL_OFFSET r12, 1*8
28407 + movq %r13, 1*8(%rsp)
28408 + CFI_REL_OFFSET r13, 1*8
28409
28410 movl $(4096/64)-5, %ecx
28411 .p2align 4
28412 @@ -38,7 +39,7 @@ ENTRY(copy_page)
28413 movq 0x8*4(%rsi), %r9
28414 movq 0x8*5(%rsi), %r10
28415 movq 0x8*6(%rsi), %r11
28416 - movq 0x8*7(%rsi), %r12
28417 + movq 0x8*7(%rsi), %r13
28418
28419 prefetcht0 5*64(%rsi)
28420
28421 @@ -49,7 +50,7 @@ ENTRY(copy_page)
28422 movq %r9, 0x8*4(%rdi)
28423 movq %r10, 0x8*5(%rdi)
28424 movq %r11, 0x8*6(%rdi)
28425 - movq %r12, 0x8*7(%rdi)
28426 + movq %r13, 0x8*7(%rdi)
28427
28428 leaq 64 (%rsi), %rsi
28429 leaq 64 (%rdi), %rdi
28430 @@ -68,7 +69,7 @@ ENTRY(copy_page)
28431 movq 0x8*4(%rsi), %r9
28432 movq 0x8*5(%rsi), %r10
28433 movq 0x8*6(%rsi), %r11
28434 - movq 0x8*7(%rsi), %r12
28435 + movq 0x8*7(%rsi), %r13
28436
28437 movq %rax, 0x8*0(%rdi)
28438 movq %rbx, 0x8*1(%rdi)
28439 @@ -77,7 +78,7 @@ ENTRY(copy_page)
28440 movq %r9, 0x8*4(%rdi)
28441 movq %r10, 0x8*5(%rdi)
28442 movq %r11, 0x8*6(%rdi)
28443 - movq %r12, 0x8*7(%rdi)
28444 + movq %r13, 0x8*7(%rdi)
28445
28446 leaq 64(%rdi), %rdi
28447 leaq 64(%rsi), %rsi
28448 @@ -85,10 +86,11 @@ ENTRY(copy_page)
28449
28450 movq (%rsp), %rbx
28451 CFI_RESTORE rbx
28452 - movq 1*8(%rsp), %r12
28453 - CFI_RESTORE r12
28454 + movq 1*8(%rsp), %r13
28455 + CFI_RESTORE r13
28456 addq $2*8, %rsp
28457 CFI_ADJUST_CFA_OFFSET -2*8
28458 + pax_force_retaddr
28459 ret
28460 .Lcopy_page_end:
28461 CFI_ENDPROC
28462 @@ -99,7 +101,7 @@ ENDPROC(copy_page)
28463
28464 #include <asm/cpufeature.h>
28465
28466 - .section .altinstr_replacement,"ax"
28467 + .section .altinstr_replacement,"a"
28468 1: .byte 0xeb /* jmp <disp8> */
28469 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
28470 2:
28471 diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
28472 index a30ca15..407412b 100644
28473 --- a/arch/x86/lib/copy_user_64.S
28474 +++ b/arch/x86/lib/copy_user_64.S
28475 @@ -18,31 +18,7 @@
28476 #include <asm/alternative-asm.h>
28477 #include <asm/asm.h>
28478 #include <asm/smap.h>
28479 -
28480 -/*
28481 - * By placing feature2 after feature1 in altinstructions section, we logically
28482 - * implement:
28483 - * If CPU has feature2, jmp to alt2 is used
28484 - * else if CPU has feature1, jmp to alt1 is used
28485 - * else jmp to orig is used.
28486 - */
28487 - .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
28488 -0:
28489 - .byte 0xe9 /* 32bit jump */
28490 - .long \orig-1f /* by default jump to orig */
28491 -1:
28492 - .section .altinstr_replacement,"ax"
28493 -2: .byte 0xe9 /* near jump with 32bit immediate */
28494 - .long \alt1-1b /* offset */ /* or alternatively to alt1 */
28495 -3: .byte 0xe9 /* near jump with 32bit immediate */
28496 - .long \alt2-1b /* offset */ /* or alternatively to alt2 */
28497 - .previous
28498 -
28499 - .section .altinstructions,"a"
28500 - altinstruction_entry 0b,2b,\feature1,5,5
28501 - altinstruction_entry 0b,3b,\feature2,5,5
28502 - .previous
28503 - .endm
28504 +#include <asm/pgtable.h>
28505
28506 .macro ALIGN_DESTINATION
28507 #ifdef FIX_ALIGNMENT
28508 @@ -70,52 +46,6 @@
28509 #endif
28510 .endm
28511
28512 -/* Standard copy_to_user with segment limit checking */
28513 -ENTRY(_copy_to_user)
28514 - CFI_STARTPROC
28515 - GET_THREAD_INFO(%rax)
28516 - movq %rdi,%rcx
28517 - addq %rdx,%rcx
28518 - jc bad_to_user
28519 - cmpq TI_addr_limit(%rax),%rcx
28520 - ja bad_to_user
28521 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
28522 - copy_user_generic_unrolled,copy_user_generic_string, \
28523 - copy_user_enhanced_fast_string
28524 - CFI_ENDPROC
28525 -ENDPROC(_copy_to_user)
28526 -
28527 -/* Standard copy_from_user with segment limit checking */
28528 -ENTRY(_copy_from_user)
28529 - CFI_STARTPROC
28530 - GET_THREAD_INFO(%rax)
28531 - movq %rsi,%rcx
28532 - addq %rdx,%rcx
28533 - jc bad_from_user
28534 - cmpq TI_addr_limit(%rax),%rcx
28535 - ja bad_from_user
28536 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
28537 - copy_user_generic_unrolled,copy_user_generic_string, \
28538 - copy_user_enhanced_fast_string
28539 - CFI_ENDPROC
28540 -ENDPROC(_copy_from_user)
28541 -
28542 - .section .fixup,"ax"
28543 - /* must zero dest */
28544 -ENTRY(bad_from_user)
28545 -bad_from_user:
28546 - CFI_STARTPROC
28547 - movl %edx,%ecx
28548 - xorl %eax,%eax
28549 - rep
28550 - stosb
28551 -bad_to_user:
28552 - movl %edx,%eax
28553 - ret
28554 - CFI_ENDPROC
28555 -ENDPROC(bad_from_user)
28556 - .previous
28557 -
28558 /*
28559 * copy_user_generic_unrolled - memory copy with exception handling.
28560 * This version is for CPUs like P4 that don't have efficient micro
28561 @@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
28562 */
28563 ENTRY(copy_user_generic_unrolled)
28564 CFI_STARTPROC
28565 + ASM_PAX_OPEN_USERLAND
28566 ASM_STAC
28567 cmpl $8,%edx
28568 jb 20f /* less then 8 bytes, go to byte copy loop */
28569 @@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
28570 jnz 21b
28571 23: xor %eax,%eax
28572 ASM_CLAC
28573 + ASM_PAX_CLOSE_USERLAND
28574 + pax_force_retaddr
28575 ret
28576
28577 .section .fixup,"ax"
28578 @@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
28579 */
28580 ENTRY(copy_user_generic_string)
28581 CFI_STARTPROC
28582 + ASM_PAX_OPEN_USERLAND
28583 ASM_STAC
28584 andl %edx,%edx
28585 jz 4f
28586 @@ -251,6 +185,8 @@ ENTRY(copy_user_generic_string)
28587 movsb
28588 4: xorl %eax,%eax
28589 ASM_CLAC
28590 + ASM_PAX_CLOSE_USERLAND
28591 + pax_force_retaddr
28592 ret
28593
28594 .section .fixup,"ax"
28595 @@ -278,6 +214,7 @@ ENDPROC(copy_user_generic_string)
28596 */
28597 ENTRY(copy_user_enhanced_fast_string)
28598 CFI_STARTPROC
28599 + ASM_PAX_OPEN_USERLAND
28600 ASM_STAC
28601 andl %edx,%edx
28602 jz 2f
28603 @@ -286,6 +223,8 @@ ENTRY(copy_user_enhanced_fast_string)
28604 movsb
28605 2: xorl %eax,%eax
28606 ASM_CLAC
28607 + ASM_PAX_CLOSE_USERLAND
28608 + pax_force_retaddr
28609 ret
28610
28611 .section .fixup,"ax"
28612 diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
28613 index 6a4f43c..c70fb52 100644
28614 --- a/arch/x86/lib/copy_user_nocache_64.S
28615 +++ b/arch/x86/lib/copy_user_nocache_64.S
28616 @@ -8,6 +8,7 @@
28617
28618 #include <linux/linkage.h>
28619 #include <asm/dwarf2.h>
28620 +#include <asm/alternative-asm.h>
28621
28622 #define FIX_ALIGNMENT 1
28623
28624 @@ -16,6 +17,7 @@
28625 #include <asm/thread_info.h>
28626 #include <asm/asm.h>
28627 #include <asm/smap.h>
28628 +#include <asm/pgtable.h>
28629
28630 .macro ALIGN_DESTINATION
28631 #ifdef FIX_ALIGNMENT
28632 @@ -49,6 +51,16 @@
28633 */
28634 ENTRY(__copy_user_nocache)
28635 CFI_STARTPROC
28636 +
28637 +#ifdef CONFIG_PAX_MEMORY_UDEREF
28638 + mov pax_user_shadow_base,%rcx
28639 + cmp %rcx,%rsi
28640 + jae 1f
28641 + add %rcx,%rsi
28642 +1:
28643 +#endif
28644 +
28645 + ASM_PAX_OPEN_USERLAND
28646 ASM_STAC
28647 cmpl $8,%edx
28648 jb 20f /* less then 8 bytes, go to byte copy loop */
28649 @@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
28650 jnz 21b
28651 23: xorl %eax,%eax
28652 ASM_CLAC
28653 + ASM_PAX_CLOSE_USERLAND
28654 sfence
28655 + pax_force_retaddr
28656 ret
28657
28658 .section .fixup,"ax"
28659 diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
28660 index 2419d5f..fe52d0e 100644
28661 --- a/arch/x86/lib/csum-copy_64.S
28662 +++ b/arch/x86/lib/csum-copy_64.S
28663 @@ -9,6 +9,7 @@
28664 #include <asm/dwarf2.h>
28665 #include <asm/errno.h>
28666 #include <asm/asm.h>
28667 +#include <asm/alternative-asm.h>
28668
28669 /*
28670 * Checksum copy with exception handling.
28671 @@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
28672 CFI_ADJUST_CFA_OFFSET 7*8
28673 movq %rbx, 2*8(%rsp)
28674 CFI_REL_OFFSET rbx, 2*8
28675 - movq %r12, 3*8(%rsp)
28676 - CFI_REL_OFFSET r12, 3*8
28677 + movq %r15, 3*8(%rsp)
28678 + CFI_REL_OFFSET r15, 3*8
28679 movq %r14, 4*8(%rsp)
28680 CFI_REL_OFFSET r14, 4*8
28681 movq %r13, 5*8(%rsp)
28682 @@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
28683 movl %edx, %ecx
28684
28685 xorl %r9d, %r9d
28686 - movq %rcx, %r12
28687 + movq %rcx, %r15
28688
28689 - shrq $6, %r12
28690 + shrq $6, %r15
28691 jz .Lhandle_tail /* < 64 */
28692
28693 clc
28694
28695 /* main loop. clear in 64 byte blocks */
28696 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
28697 - /* r11: temp3, rdx: temp4, r12 loopcnt */
28698 + /* r11: temp3, rdx: temp4, r15 loopcnt */
28699 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
28700 .p2align 4
28701 .Lloop:
28702 @@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
28703 adcq %r14, %rax
28704 adcq %r13, %rax
28705
28706 - decl %r12d
28707 + decl %r15d
28708
28709 dest
28710 movq %rbx, (%rsi)
28711 @@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
28712 .Lende:
28713 movq 2*8(%rsp), %rbx
28714 CFI_RESTORE rbx
28715 - movq 3*8(%rsp), %r12
28716 - CFI_RESTORE r12
28717 + movq 3*8(%rsp), %r15
28718 + CFI_RESTORE r15
28719 movq 4*8(%rsp), %r14
28720 CFI_RESTORE r14
28721 movq 5*8(%rsp), %r13
28722 @@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
28723 CFI_RESTORE rbp
28724 addq $7*8, %rsp
28725 CFI_ADJUST_CFA_OFFSET -7*8
28726 + pax_force_retaddr
28727 ret
28728 CFI_RESTORE_STATE
28729
28730 diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
28731 index 7609e0e..b449b98 100644
28732 --- a/arch/x86/lib/csum-wrappers_64.c
28733 +++ b/arch/x86/lib/csum-wrappers_64.c
28734 @@ -53,10 +53,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
28735 len -= 2;
28736 }
28737 }
28738 + pax_open_userland();
28739 stac();
28740 - isum = csum_partial_copy_generic((__force const void *)src,
28741 + isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
28742 dst, len, isum, errp, NULL);
28743 clac();
28744 + pax_close_userland();
28745 if (unlikely(*errp))
28746 goto out_err;
28747
28748 @@ -110,10 +112,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
28749 }
28750
28751 *errp = 0;
28752 + pax_open_userland();
28753 stac();
28754 - ret = csum_partial_copy_generic(src, (void __force *)dst,
28755 + ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
28756 len, isum, NULL, errp);
28757 clac();
28758 + pax_close_userland();
28759 return ret;
28760 }
28761 EXPORT_SYMBOL(csum_partial_copy_to_user);
28762 diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
28763 index a451235..1daa956 100644
28764 --- a/arch/x86/lib/getuser.S
28765 +++ b/arch/x86/lib/getuser.S
28766 @@ -33,17 +33,40 @@
28767 #include <asm/thread_info.h>
28768 #include <asm/asm.h>
28769 #include <asm/smap.h>
28770 +#include <asm/segment.h>
28771 +#include <asm/pgtable.h>
28772 +#include <asm/alternative-asm.h>
28773 +
28774 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28775 +#define __copyuser_seg gs;
28776 +#else
28777 +#define __copyuser_seg
28778 +#endif
28779
28780 .text
28781 ENTRY(__get_user_1)
28782 CFI_STARTPROC
28783 +
28784 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
28785 GET_THREAD_INFO(%_ASM_DX)
28786 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
28787 jae bad_get_user
28788 ASM_STAC
28789 -1: movzbl (%_ASM_AX),%edx
28790 +
28791 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
28792 + mov pax_user_shadow_base,%_ASM_DX
28793 + cmp %_ASM_DX,%_ASM_AX
28794 + jae 1234f
28795 + add %_ASM_DX,%_ASM_AX
28796 +1234:
28797 +#endif
28798 +
28799 +#endif
28800 +
28801 +1: __copyuser_seg movzbl (%_ASM_AX),%edx
28802 xor %eax,%eax
28803 ASM_CLAC
28804 + pax_force_retaddr
28805 ret
28806 CFI_ENDPROC
28807 ENDPROC(__get_user_1)
28808 @@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
28809 ENTRY(__get_user_2)
28810 CFI_STARTPROC
28811 add $1,%_ASM_AX
28812 +
28813 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
28814 jc bad_get_user
28815 GET_THREAD_INFO(%_ASM_DX)
28816 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
28817 jae bad_get_user
28818 ASM_STAC
28819 -2: movzwl -1(%_ASM_AX),%edx
28820 +
28821 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
28822 + mov pax_user_shadow_base,%_ASM_DX
28823 + cmp %_ASM_DX,%_ASM_AX
28824 + jae 1234f
28825 + add %_ASM_DX,%_ASM_AX
28826 +1234:
28827 +#endif
28828 +
28829 +#endif
28830 +
28831 +2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
28832 xor %eax,%eax
28833 ASM_CLAC
28834 + pax_force_retaddr
28835 ret
28836 CFI_ENDPROC
28837 ENDPROC(__get_user_2)
28838 @@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
28839 ENTRY(__get_user_4)
28840 CFI_STARTPROC
28841 add $3,%_ASM_AX
28842 +
28843 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
28844 jc bad_get_user
28845 GET_THREAD_INFO(%_ASM_DX)
28846 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
28847 jae bad_get_user
28848 ASM_STAC
28849 -3: movl -3(%_ASM_AX),%edx
28850 +
28851 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
28852 + mov pax_user_shadow_base,%_ASM_DX
28853 + cmp %_ASM_DX,%_ASM_AX
28854 + jae 1234f
28855 + add %_ASM_DX,%_ASM_AX
28856 +1234:
28857 +#endif
28858 +
28859 +#endif
28860 +
28861 +3: __copyuser_seg movl -3(%_ASM_AX),%edx
28862 xor %eax,%eax
28863 ASM_CLAC
28864 + pax_force_retaddr
28865 ret
28866 CFI_ENDPROC
28867 ENDPROC(__get_user_4)
28868 @@ -86,10 +137,20 @@ ENTRY(__get_user_8)
28869 GET_THREAD_INFO(%_ASM_DX)
28870 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
28871 jae bad_get_user
28872 +
28873 +#ifdef CONFIG_PAX_MEMORY_UDEREF
28874 + mov pax_user_shadow_base,%_ASM_DX
28875 + cmp %_ASM_DX,%_ASM_AX
28876 + jae 1234f
28877 + add %_ASM_DX,%_ASM_AX
28878 +1234:
28879 +#endif
28880 +
28881 ASM_STAC
28882 4: movq -7(%_ASM_AX),%rdx
28883 xor %eax,%eax
28884 ASM_CLAC
28885 + pax_force_retaddr
28886 ret
28887 #else
28888 add $7,%_ASM_AX
28889 @@ -98,10 +159,11 @@ ENTRY(__get_user_8)
28890 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
28891 jae bad_get_user_8
28892 ASM_STAC
28893 -4: movl -7(%_ASM_AX),%edx
28894 -5: movl -3(%_ASM_AX),%ecx
28895 +4: __copyuser_seg movl -7(%_ASM_AX),%edx
28896 +5: __copyuser_seg movl -3(%_ASM_AX),%ecx
28897 xor %eax,%eax
28898 ASM_CLAC
28899 + pax_force_retaddr
28900 ret
28901 #endif
28902 CFI_ENDPROC
28903 @@ -113,6 +175,7 @@ bad_get_user:
28904 xor %edx,%edx
28905 mov $(-EFAULT),%_ASM_AX
28906 ASM_CLAC
28907 + pax_force_retaddr
28908 ret
28909 CFI_ENDPROC
28910 END(bad_get_user)
28911 @@ -124,6 +187,7 @@ bad_get_user_8:
28912 xor %ecx,%ecx
28913 mov $(-EFAULT),%_ASM_AX
28914 ASM_CLAC
28915 + pax_force_retaddr
28916 ret
28917 CFI_ENDPROC
28918 END(bad_get_user_8)
28919 diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
28920 index 54fcffe..7be149e 100644
28921 --- a/arch/x86/lib/insn.c
28922 +++ b/arch/x86/lib/insn.c
28923 @@ -20,8 +20,10 @@
28924
28925 #ifdef __KERNEL__
28926 #include <linux/string.h>
28927 +#include <asm/pgtable_types.h>
28928 #else
28929 #include <string.h>
28930 +#define ktla_ktva(addr) addr
28931 #endif
28932 #include <asm/inat.h>
28933 #include <asm/insn.h>
28934 @@ -53,8 +55,8 @@
28935 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
28936 {
28937 memset(insn, 0, sizeof(*insn));
28938 - insn->kaddr = kaddr;
28939 - insn->next_byte = kaddr;
28940 + insn->kaddr = ktla_ktva(kaddr);
28941 + insn->next_byte = ktla_ktva(kaddr);
28942 insn->x86_64 = x86_64 ? 1 : 0;
28943 insn->opnd_bytes = 4;
28944 if (x86_64)
28945 diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
28946 index 05a95e7..326f2fa 100644
28947 --- a/arch/x86/lib/iomap_copy_64.S
28948 +++ b/arch/x86/lib/iomap_copy_64.S
28949 @@ -17,6 +17,7 @@
28950
28951 #include <linux/linkage.h>
28952 #include <asm/dwarf2.h>
28953 +#include <asm/alternative-asm.h>
28954
28955 /*
28956 * override generic version in lib/iomap_copy.c
28957 @@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
28958 CFI_STARTPROC
28959 movl %edx,%ecx
28960 rep movsd
28961 + pax_force_retaddr
28962 ret
28963 CFI_ENDPROC
28964 ENDPROC(__iowrite32_copy)
28965 diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
28966 index 56313a3..0db417e 100644
28967 --- a/arch/x86/lib/memcpy_64.S
28968 +++ b/arch/x86/lib/memcpy_64.S
28969 @@ -24,7 +24,7 @@
28970 * This gets patched over the unrolled variant (below) via the
28971 * alternative instructions framework:
28972 */
28973 - .section .altinstr_replacement, "ax", @progbits
28974 + .section .altinstr_replacement, "a", @progbits
28975 .Lmemcpy_c:
28976 movq %rdi, %rax
28977 movq %rdx, %rcx
28978 @@ -33,6 +33,7 @@
28979 rep movsq
28980 movl %edx, %ecx
28981 rep movsb
28982 + pax_force_retaddr
28983 ret
28984 .Lmemcpy_e:
28985 .previous
28986 @@ -44,11 +45,12 @@
28987 * This gets patched over the unrolled variant (below) via the
28988 * alternative instructions framework:
28989 */
28990 - .section .altinstr_replacement, "ax", @progbits
28991 + .section .altinstr_replacement, "a", @progbits
28992 .Lmemcpy_c_e:
28993 movq %rdi, %rax
28994 movq %rdx, %rcx
28995 rep movsb
28996 + pax_force_retaddr
28997 ret
28998 .Lmemcpy_e_e:
28999 .previous
29000 @@ -136,6 +138,7 @@ ENTRY(memcpy)
29001 movq %r9, 1*8(%rdi)
29002 movq %r10, -2*8(%rdi, %rdx)
29003 movq %r11, -1*8(%rdi, %rdx)
29004 + pax_force_retaddr
29005 retq
29006 .p2align 4
29007 .Lless_16bytes:
29008 @@ -148,6 +151,7 @@ ENTRY(memcpy)
29009 movq -1*8(%rsi, %rdx), %r9
29010 movq %r8, 0*8(%rdi)
29011 movq %r9, -1*8(%rdi, %rdx)
29012 + pax_force_retaddr
29013 retq
29014 .p2align 4
29015 .Lless_8bytes:
29016 @@ -161,6 +165,7 @@ ENTRY(memcpy)
29017 movl -4(%rsi, %rdx), %r8d
29018 movl %ecx, (%rdi)
29019 movl %r8d, -4(%rdi, %rdx)
29020 + pax_force_retaddr
29021 retq
29022 .p2align 4
29023 .Lless_3bytes:
29024 @@ -179,6 +184,7 @@ ENTRY(memcpy)
29025 movb %cl, (%rdi)
29026
29027 .Lend:
29028 + pax_force_retaddr
29029 retq
29030 CFI_ENDPROC
29031 ENDPROC(memcpy)
29032 diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
29033 index 65268a6..dd1de11 100644
29034 --- a/arch/x86/lib/memmove_64.S
29035 +++ b/arch/x86/lib/memmove_64.S
29036 @@ -202,14 +202,16 @@ ENTRY(memmove)
29037 movb (%rsi), %r11b
29038 movb %r11b, (%rdi)
29039 13:
29040 + pax_force_retaddr
29041 retq
29042 CFI_ENDPROC
29043
29044 - .section .altinstr_replacement,"ax"
29045 + .section .altinstr_replacement,"a"
29046 .Lmemmove_begin_forward_efs:
29047 /* Forward moving data. */
29048 movq %rdx, %rcx
29049 rep movsb
29050 + pax_force_retaddr
29051 retq
29052 .Lmemmove_end_forward_efs:
29053 .previous
29054 diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
29055 index 2dcb380..2eb79fe 100644
29056 --- a/arch/x86/lib/memset_64.S
29057 +++ b/arch/x86/lib/memset_64.S
29058 @@ -16,7 +16,7 @@
29059 *
29060 * rax original destination
29061 */
29062 - .section .altinstr_replacement, "ax", @progbits
29063 + .section .altinstr_replacement, "a", @progbits
29064 .Lmemset_c:
29065 movq %rdi,%r9
29066 movq %rdx,%rcx
29067 @@ -30,6 +30,7 @@
29068 movl %edx,%ecx
29069 rep stosb
29070 movq %r9,%rax
29071 + pax_force_retaddr
29072 ret
29073 .Lmemset_e:
29074 .previous
29075 @@ -45,13 +46,14 @@
29076 *
29077 * rax original destination
29078 */
29079 - .section .altinstr_replacement, "ax", @progbits
29080 + .section .altinstr_replacement, "a", @progbits
29081 .Lmemset_c_e:
29082 movq %rdi,%r9
29083 movb %sil,%al
29084 movq %rdx,%rcx
29085 rep stosb
29086 movq %r9,%rax
29087 + pax_force_retaddr
29088 ret
29089 .Lmemset_e_e:
29090 .previous
29091 @@ -118,6 +120,7 @@ ENTRY(__memset)
29092
29093 .Lende:
29094 movq %r10,%rax
29095 + pax_force_retaddr
29096 ret
29097
29098 CFI_RESTORE_STATE
29099 diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
29100 index c9f2d9b..e7fd2c0 100644
29101 --- a/arch/x86/lib/mmx_32.c
29102 +++ b/arch/x86/lib/mmx_32.c
29103 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
29104 {
29105 void *p;
29106 int i;
29107 + unsigned long cr0;
29108
29109 if (unlikely(in_interrupt()))
29110 return __memcpy(to, from, len);
29111 @@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
29112 kernel_fpu_begin();
29113
29114 __asm__ __volatile__ (
29115 - "1: prefetch (%0)\n" /* This set is 28 bytes */
29116 - " prefetch 64(%0)\n"
29117 - " prefetch 128(%0)\n"
29118 - " prefetch 192(%0)\n"
29119 - " prefetch 256(%0)\n"
29120 + "1: prefetch (%1)\n" /* This set is 28 bytes */
29121 + " prefetch 64(%1)\n"
29122 + " prefetch 128(%1)\n"
29123 + " prefetch 192(%1)\n"
29124 + " prefetch 256(%1)\n"
29125 "2: \n"
29126 ".section .fixup, \"ax\"\n"
29127 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
29128 + "3: \n"
29129 +
29130 +#ifdef CONFIG_PAX_KERNEXEC
29131 + " movl %%cr0, %0\n"
29132 + " movl %0, %%eax\n"
29133 + " andl $0xFFFEFFFF, %%eax\n"
29134 + " movl %%eax, %%cr0\n"
29135 +#endif
29136 +
29137 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
29138 +
29139 +#ifdef CONFIG_PAX_KERNEXEC
29140 + " movl %0, %%cr0\n"
29141 +#endif
29142 +
29143 " jmp 2b\n"
29144 ".previous\n"
29145 _ASM_EXTABLE(1b, 3b)
29146 - : : "r" (from));
29147 + : "=&r" (cr0) : "r" (from) : "ax");
29148
29149 for ( ; i > 5; i--) {
29150 __asm__ __volatile__ (
29151 - "1: prefetch 320(%0)\n"
29152 - "2: movq (%0), %%mm0\n"
29153 - " movq 8(%0), %%mm1\n"
29154 - " movq 16(%0), %%mm2\n"
29155 - " movq 24(%0), %%mm3\n"
29156 - " movq %%mm0, (%1)\n"
29157 - " movq %%mm1, 8(%1)\n"
29158 - " movq %%mm2, 16(%1)\n"
29159 - " movq %%mm3, 24(%1)\n"
29160 - " movq 32(%0), %%mm0\n"
29161 - " movq 40(%0), %%mm1\n"
29162 - " movq 48(%0), %%mm2\n"
29163 - " movq 56(%0), %%mm3\n"
29164 - " movq %%mm0, 32(%1)\n"
29165 - " movq %%mm1, 40(%1)\n"
29166 - " movq %%mm2, 48(%1)\n"
29167 - " movq %%mm3, 56(%1)\n"
29168 + "1: prefetch 320(%1)\n"
29169 + "2: movq (%1), %%mm0\n"
29170 + " movq 8(%1), %%mm1\n"
29171 + " movq 16(%1), %%mm2\n"
29172 + " movq 24(%1), %%mm3\n"
29173 + " movq %%mm0, (%2)\n"
29174 + " movq %%mm1, 8(%2)\n"
29175 + " movq %%mm2, 16(%2)\n"
29176 + " movq %%mm3, 24(%2)\n"
29177 + " movq 32(%1), %%mm0\n"
29178 + " movq 40(%1), %%mm1\n"
29179 + " movq 48(%1), %%mm2\n"
29180 + " movq 56(%1), %%mm3\n"
29181 + " movq %%mm0, 32(%2)\n"
29182 + " movq %%mm1, 40(%2)\n"
29183 + " movq %%mm2, 48(%2)\n"
29184 + " movq %%mm3, 56(%2)\n"
29185 ".section .fixup, \"ax\"\n"
29186 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
29187 + "3:\n"
29188 +
29189 +#ifdef CONFIG_PAX_KERNEXEC
29190 + " movl %%cr0, %0\n"
29191 + " movl %0, %%eax\n"
29192 + " andl $0xFFFEFFFF, %%eax\n"
29193 + " movl %%eax, %%cr0\n"
29194 +#endif
29195 +
29196 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
29197 +
29198 +#ifdef CONFIG_PAX_KERNEXEC
29199 + " movl %0, %%cr0\n"
29200 +#endif
29201 +
29202 " jmp 2b\n"
29203 ".previous\n"
29204 _ASM_EXTABLE(1b, 3b)
29205 - : : "r" (from), "r" (to) : "memory");
29206 + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
29207
29208 from += 64;
29209 to += 64;
29210 @@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
29211 static void fast_copy_page(void *to, void *from)
29212 {
29213 int i;
29214 + unsigned long cr0;
29215
29216 kernel_fpu_begin();
29217
29218 @@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
29219 * but that is for later. -AV
29220 */
29221 __asm__ __volatile__(
29222 - "1: prefetch (%0)\n"
29223 - " prefetch 64(%0)\n"
29224 - " prefetch 128(%0)\n"
29225 - " prefetch 192(%0)\n"
29226 - " prefetch 256(%0)\n"
29227 + "1: prefetch (%1)\n"
29228 + " prefetch 64(%1)\n"
29229 + " prefetch 128(%1)\n"
29230 + " prefetch 192(%1)\n"
29231 + " prefetch 256(%1)\n"
29232 "2: \n"
29233 ".section .fixup, \"ax\"\n"
29234 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
29235 + "3: \n"
29236 +
29237 +#ifdef CONFIG_PAX_KERNEXEC
29238 + " movl %%cr0, %0\n"
29239 + " movl %0, %%eax\n"
29240 + " andl $0xFFFEFFFF, %%eax\n"
29241 + " movl %%eax, %%cr0\n"
29242 +#endif
29243 +
29244 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
29245 +
29246 +#ifdef CONFIG_PAX_KERNEXEC
29247 + " movl %0, %%cr0\n"
29248 +#endif
29249 +
29250 " jmp 2b\n"
29251 ".previous\n"
29252 - _ASM_EXTABLE(1b, 3b) : : "r" (from));
29253 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
29254
29255 for (i = 0; i < (4096-320)/64; i++) {
29256 __asm__ __volatile__ (
29257 - "1: prefetch 320(%0)\n"
29258 - "2: movq (%0), %%mm0\n"
29259 - " movntq %%mm0, (%1)\n"
29260 - " movq 8(%0), %%mm1\n"
29261 - " movntq %%mm1, 8(%1)\n"
29262 - " movq 16(%0), %%mm2\n"
29263 - " movntq %%mm2, 16(%1)\n"
29264 - " movq 24(%0), %%mm3\n"
29265 - " movntq %%mm3, 24(%1)\n"
29266 - " movq 32(%0), %%mm4\n"
29267 - " movntq %%mm4, 32(%1)\n"
29268 - " movq 40(%0), %%mm5\n"
29269 - " movntq %%mm5, 40(%1)\n"
29270 - " movq 48(%0), %%mm6\n"
29271 - " movntq %%mm6, 48(%1)\n"
29272 - " movq 56(%0), %%mm7\n"
29273 - " movntq %%mm7, 56(%1)\n"
29274 + "1: prefetch 320(%1)\n"
29275 + "2: movq (%1), %%mm0\n"
29276 + " movntq %%mm0, (%2)\n"
29277 + " movq 8(%1), %%mm1\n"
29278 + " movntq %%mm1, 8(%2)\n"
29279 + " movq 16(%1), %%mm2\n"
29280 + " movntq %%mm2, 16(%2)\n"
29281 + " movq 24(%1), %%mm3\n"
29282 + " movntq %%mm3, 24(%2)\n"
29283 + " movq 32(%1), %%mm4\n"
29284 + " movntq %%mm4, 32(%2)\n"
29285 + " movq 40(%1), %%mm5\n"
29286 + " movntq %%mm5, 40(%2)\n"
29287 + " movq 48(%1), %%mm6\n"
29288 + " movntq %%mm6, 48(%2)\n"
29289 + " movq 56(%1), %%mm7\n"
29290 + " movntq %%mm7, 56(%2)\n"
29291 ".section .fixup, \"ax\"\n"
29292 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
29293 + "3:\n"
29294 +
29295 +#ifdef CONFIG_PAX_KERNEXEC
29296 + " movl %%cr0, %0\n"
29297 + " movl %0, %%eax\n"
29298 + " andl $0xFFFEFFFF, %%eax\n"
29299 + " movl %%eax, %%cr0\n"
29300 +#endif
29301 +
29302 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
29303 +
29304 +#ifdef CONFIG_PAX_KERNEXEC
29305 + " movl %0, %%cr0\n"
29306 +#endif
29307 +
29308 " jmp 2b\n"
29309 ".previous\n"
29310 - _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
29311 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
29312
29313 from += 64;
29314 to += 64;
29315 @@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
29316 static void fast_copy_page(void *to, void *from)
29317 {
29318 int i;
29319 + unsigned long cr0;
29320
29321 kernel_fpu_begin();
29322
29323 __asm__ __volatile__ (
29324 - "1: prefetch (%0)\n"
29325 - " prefetch 64(%0)\n"
29326 - " prefetch 128(%0)\n"
29327 - " prefetch 192(%0)\n"
29328 - " prefetch 256(%0)\n"
29329 + "1: prefetch (%1)\n"
29330 + " prefetch 64(%1)\n"
29331 + " prefetch 128(%1)\n"
29332 + " prefetch 192(%1)\n"
29333 + " prefetch 256(%1)\n"
29334 "2: \n"
29335 ".section .fixup, \"ax\"\n"
29336 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
29337 + "3: \n"
29338 +
29339 +#ifdef CONFIG_PAX_KERNEXEC
29340 + " movl %%cr0, %0\n"
29341 + " movl %0, %%eax\n"
29342 + " andl $0xFFFEFFFF, %%eax\n"
29343 + " movl %%eax, %%cr0\n"
29344 +#endif
29345 +
29346 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
29347 +
29348 +#ifdef CONFIG_PAX_KERNEXEC
29349 + " movl %0, %%cr0\n"
29350 +#endif
29351 +
29352 " jmp 2b\n"
29353 ".previous\n"
29354 - _ASM_EXTABLE(1b, 3b) : : "r" (from));
29355 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
29356
29357 for (i = 0; i < 4096/64; i++) {
29358 __asm__ __volatile__ (
29359 - "1: prefetch 320(%0)\n"
29360 - "2: movq (%0), %%mm0\n"
29361 - " movq 8(%0), %%mm1\n"
29362 - " movq 16(%0), %%mm2\n"
29363 - " movq 24(%0), %%mm3\n"
29364 - " movq %%mm0, (%1)\n"
29365 - " movq %%mm1, 8(%1)\n"
29366 - " movq %%mm2, 16(%1)\n"
29367 - " movq %%mm3, 24(%1)\n"
29368 - " movq 32(%0), %%mm0\n"
29369 - " movq 40(%0), %%mm1\n"
29370 - " movq 48(%0), %%mm2\n"
29371 - " movq 56(%0), %%mm3\n"
29372 - " movq %%mm0, 32(%1)\n"
29373 - " movq %%mm1, 40(%1)\n"
29374 - " movq %%mm2, 48(%1)\n"
29375 - " movq %%mm3, 56(%1)\n"
29376 + "1: prefetch 320(%1)\n"
29377 + "2: movq (%1), %%mm0\n"
29378 + " movq 8(%1), %%mm1\n"
29379 + " movq 16(%1), %%mm2\n"
29380 + " movq 24(%1), %%mm3\n"
29381 + " movq %%mm0, (%2)\n"
29382 + " movq %%mm1, 8(%2)\n"
29383 + " movq %%mm2, 16(%2)\n"
29384 + " movq %%mm3, 24(%2)\n"
29385 + " movq 32(%1), %%mm0\n"
29386 + " movq 40(%1), %%mm1\n"
29387 + " movq 48(%1), %%mm2\n"
29388 + " movq 56(%1), %%mm3\n"
29389 + " movq %%mm0, 32(%2)\n"
29390 + " movq %%mm1, 40(%2)\n"
29391 + " movq %%mm2, 48(%2)\n"
29392 + " movq %%mm3, 56(%2)\n"
29393 ".section .fixup, \"ax\"\n"
29394 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
29395 + "3:\n"
29396 +
29397 +#ifdef CONFIG_PAX_KERNEXEC
29398 + " movl %%cr0, %0\n"
29399 + " movl %0, %%eax\n"
29400 + " andl $0xFFFEFFFF, %%eax\n"
29401 + " movl %%eax, %%cr0\n"
29402 +#endif
29403 +
29404 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
29405 +
29406 +#ifdef CONFIG_PAX_KERNEXEC
29407 + " movl %0, %%cr0\n"
29408 +#endif
29409 +
29410 " jmp 2b\n"
29411 ".previous\n"
29412 _ASM_EXTABLE(1b, 3b)
29413 - : : "r" (from), "r" (to) : "memory");
29414 + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
29415
29416 from += 64;
29417 to += 64;
29418 diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
29419 index f6d13ee..d789440 100644
29420 --- a/arch/x86/lib/msr-reg.S
29421 +++ b/arch/x86/lib/msr-reg.S
29422 @@ -3,6 +3,7 @@
29423 #include <asm/dwarf2.h>
29424 #include <asm/asm.h>
29425 #include <asm/msr.h>
29426 +#include <asm/alternative-asm.h>
29427
29428 #ifdef CONFIG_X86_64
29429 /*
29430 @@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
29431 movl %edi, 28(%r10)
29432 popq_cfi %rbp
29433 popq_cfi %rbx
29434 + pax_force_retaddr
29435 ret
29436 3:
29437 CFI_RESTORE_STATE
29438 diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
29439 index fc6ba17..d4d989d 100644
29440 --- a/arch/x86/lib/putuser.S
29441 +++ b/arch/x86/lib/putuser.S
29442 @@ -16,7 +16,9 @@
29443 #include <asm/errno.h>
29444 #include <asm/asm.h>
29445 #include <asm/smap.h>
29446 -
29447 +#include <asm/segment.h>
29448 +#include <asm/pgtable.h>
29449 +#include <asm/alternative-asm.h>
29450
29451 /*
29452 * __put_user_X
29453 @@ -30,57 +32,125 @@
29454 * as they get called from within inline assembly.
29455 */
29456
29457 -#define ENTER CFI_STARTPROC ; \
29458 - GET_THREAD_INFO(%_ASM_BX)
29459 -#define EXIT ASM_CLAC ; \
29460 - ret ; \
29461 +#define ENTER CFI_STARTPROC
29462 +#define EXIT ASM_CLAC ; \
29463 + pax_force_retaddr ; \
29464 + ret ; \
29465 CFI_ENDPROC
29466
29467 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29468 +#define _DEST %_ASM_CX,%_ASM_BX
29469 +#else
29470 +#define _DEST %_ASM_CX
29471 +#endif
29472 +
29473 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
29474 +#define __copyuser_seg gs;
29475 +#else
29476 +#define __copyuser_seg
29477 +#endif
29478 +
29479 .text
29480 ENTRY(__put_user_1)
29481 ENTER
29482 +
29483 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
29484 + GET_THREAD_INFO(%_ASM_BX)
29485 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
29486 jae bad_put_user
29487 ASM_STAC
29488 -1: movb %al,(%_ASM_CX)
29489 +
29490 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29491 + mov pax_user_shadow_base,%_ASM_BX
29492 + cmp %_ASM_BX,%_ASM_CX
29493 + jb 1234f
29494 + xor %ebx,%ebx
29495 +1234:
29496 +#endif
29497 +
29498 +#endif
29499 +
29500 +1: __copyuser_seg movb %al,(_DEST)
29501 xor %eax,%eax
29502 EXIT
29503 ENDPROC(__put_user_1)
29504
29505 ENTRY(__put_user_2)
29506 ENTER
29507 +
29508 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
29509 + GET_THREAD_INFO(%_ASM_BX)
29510 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
29511 sub $1,%_ASM_BX
29512 cmp %_ASM_BX,%_ASM_CX
29513 jae bad_put_user
29514 ASM_STAC
29515 -2: movw %ax,(%_ASM_CX)
29516 +
29517 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29518 + mov pax_user_shadow_base,%_ASM_BX
29519 + cmp %_ASM_BX,%_ASM_CX
29520 + jb 1234f
29521 + xor %ebx,%ebx
29522 +1234:
29523 +#endif
29524 +
29525 +#endif
29526 +
29527 +2: __copyuser_seg movw %ax,(_DEST)
29528 xor %eax,%eax
29529 EXIT
29530 ENDPROC(__put_user_2)
29531
29532 ENTRY(__put_user_4)
29533 ENTER
29534 +
29535 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
29536 + GET_THREAD_INFO(%_ASM_BX)
29537 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
29538 sub $3,%_ASM_BX
29539 cmp %_ASM_BX,%_ASM_CX
29540 jae bad_put_user
29541 ASM_STAC
29542 -3: movl %eax,(%_ASM_CX)
29543 +
29544 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29545 + mov pax_user_shadow_base,%_ASM_BX
29546 + cmp %_ASM_BX,%_ASM_CX
29547 + jb 1234f
29548 + xor %ebx,%ebx
29549 +1234:
29550 +#endif
29551 +
29552 +#endif
29553 +
29554 +3: __copyuser_seg movl %eax,(_DEST)
29555 xor %eax,%eax
29556 EXIT
29557 ENDPROC(__put_user_4)
29558
29559 ENTRY(__put_user_8)
29560 ENTER
29561 +
29562 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
29563 + GET_THREAD_INFO(%_ASM_BX)
29564 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
29565 sub $7,%_ASM_BX
29566 cmp %_ASM_BX,%_ASM_CX
29567 jae bad_put_user
29568 ASM_STAC
29569 -4: mov %_ASM_AX,(%_ASM_CX)
29570 +
29571 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29572 + mov pax_user_shadow_base,%_ASM_BX
29573 + cmp %_ASM_BX,%_ASM_CX
29574 + jb 1234f
29575 + xor %ebx,%ebx
29576 +1234:
29577 +#endif
29578 +
29579 +#endif
29580 +
29581 +4: __copyuser_seg mov %_ASM_AX,(_DEST)
29582 #ifdef CONFIG_X86_32
29583 -5: movl %edx,4(%_ASM_CX)
29584 +5: __copyuser_seg movl %edx,4(_DEST)
29585 #endif
29586 xor %eax,%eax
29587 EXIT
29588 diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
29589 index 1cad221..de671ee 100644
29590 --- a/arch/x86/lib/rwlock.S
29591 +++ b/arch/x86/lib/rwlock.S
29592 @@ -16,13 +16,34 @@ ENTRY(__write_lock_failed)
29593 FRAME
29594 0: LOCK_PREFIX
29595 WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
29596 +
29597 +#ifdef CONFIG_PAX_REFCOUNT
29598 + jno 1234f
29599 + LOCK_PREFIX
29600 + WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
29601 + int $4
29602 +1234:
29603 + _ASM_EXTABLE(1234b, 1234b)
29604 +#endif
29605 +
29606 1: rep; nop
29607 cmpl $WRITE_LOCK_CMP, (%__lock_ptr)
29608 jne 1b
29609 LOCK_PREFIX
29610 WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
29611 +
29612 +#ifdef CONFIG_PAX_REFCOUNT
29613 + jno 1234f
29614 + LOCK_PREFIX
29615 + WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
29616 + int $4
29617 +1234:
29618 + _ASM_EXTABLE(1234b, 1234b)
29619 +#endif
29620 +
29621 jnz 0b
29622 ENDFRAME
29623 + pax_force_retaddr
29624 ret
29625 CFI_ENDPROC
29626 END(__write_lock_failed)
29627 @@ -32,13 +53,34 @@ ENTRY(__read_lock_failed)
29628 FRAME
29629 0: LOCK_PREFIX
29630 READ_LOCK_SIZE(inc) (%__lock_ptr)
29631 +
29632 +#ifdef CONFIG_PAX_REFCOUNT
29633 + jno 1234f
29634 + LOCK_PREFIX
29635 + READ_LOCK_SIZE(dec) (%__lock_ptr)
29636 + int $4
29637 +1234:
29638 + _ASM_EXTABLE(1234b, 1234b)
29639 +#endif
29640 +
29641 1: rep; nop
29642 READ_LOCK_SIZE(cmp) $1, (%__lock_ptr)
29643 js 1b
29644 LOCK_PREFIX
29645 READ_LOCK_SIZE(dec) (%__lock_ptr)
29646 +
29647 +#ifdef CONFIG_PAX_REFCOUNT
29648 + jno 1234f
29649 + LOCK_PREFIX
29650 + READ_LOCK_SIZE(inc) (%__lock_ptr)
29651 + int $4
29652 +1234:
29653 + _ASM_EXTABLE(1234b, 1234b)
29654 +#endif
29655 +
29656 js 0b
29657 ENDFRAME
29658 + pax_force_retaddr
29659 ret
29660 CFI_ENDPROC
29661 END(__read_lock_failed)
29662 diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
29663 index 5dff5f0..cadebf4 100644
29664 --- a/arch/x86/lib/rwsem.S
29665 +++ b/arch/x86/lib/rwsem.S
29666 @@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
29667 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
29668 CFI_RESTORE __ASM_REG(dx)
29669 restore_common_regs
29670 + pax_force_retaddr
29671 ret
29672 CFI_ENDPROC
29673 ENDPROC(call_rwsem_down_read_failed)
29674 @@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
29675 movq %rax,%rdi
29676 call rwsem_down_write_failed
29677 restore_common_regs
29678 + pax_force_retaddr
29679 ret
29680 CFI_ENDPROC
29681 ENDPROC(call_rwsem_down_write_failed)
29682 @@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
29683 movq %rax,%rdi
29684 call rwsem_wake
29685 restore_common_regs
29686 -1: ret
29687 +1: pax_force_retaddr
29688 + ret
29689 CFI_ENDPROC
29690 ENDPROC(call_rwsem_wake)
29691
29692 @@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
29693 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
29694 CFI_RESTORE __ASM_REG(dx)
29695 restore_common_regs
29696 + pax_force_retaddr
29697 ret
29698 CFI_ENDPROC
29699 ENDPROC(call_rwsem_downgrade_wake)
29700 diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
29701 index a63efd6..8149fbe 100644
29702 --- a/arch/x86/lib/thunk_64.S
29703 +++ b/arch/x86/lib/thunk_64.S
29704 @@ -8,6 +8,7 @@
29705 #include <linux/linkage.h>
29706 #include <asm/dwarf2.h>
29707 #include <asm/calling.h>
29708 +#include <asm/alternative-asm.h>
29709
29710 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
29711 .macro THUNK name, func, put_ret_addr_in_rdi=0
29712 @@ -15,11 +16,11 @@
29713 \name:
29714 CFI_STARTPROC
29715
29716 - /* this one pushes 9 elems, the next one would be %rIP */
29717 - SAVE_ARGS
29718 + /* this one pushes 15+1 elems, the next one would be %rIP */
29719 + SAVE_ARGS 8
29720
29721 .if \put_ret_addr_in_rdi
29722 - movq_cfi_restore 9*8, rdi
29723 + movq_cfi_restore RIP, rdi
29724 .endif
29725
29726 call \func
29727 @@ -38,8 +39,9 @@
29728
29729 /* SAVE_ARGS below is used only for the .cfi directives it contains. */
29730 CFI_STARTPROC
29731 - SAVE_ARGS
29732 + SAVE_ARGS 8
29733 restore:
29734 - RESTORE_ARGS
29735 + RESTORE_ARGS 1,8
29736 + pax_force_retaddr
29737 ret
29738 CFI_ENDPROC
29739 diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
29740 index 3eb18ac..4b22130 100644
29741 --- a/arch/x86/lib/usercopy_32.c
29742 +++ b/arch/x86/lib/usercopy_32.c
29743 @@ -42,11 +42,13 @@ do { \
29744 int __d0; \
29745 might_fault(); \
29746 __asm__ __volatile__( \
29747 + __COPYUSER_SET_ES \
29748 ASM_STAC "\n" \
29749 "0: rep; stosl\n" \
29750 " movl %2,%0\n" \
29751 "1: rep; stosb\n" \
29752 "2: " ASM_CLAC "\n" \
29753 + __COPYUSER_RESTORE_ES \
29754 ".section .fixup,\"ax\"\n" \
29755 "3: lea 0(%2,%0,4),%0\n" \
29756 " jmp 2b\n" \
29757 @@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
29758
29759 #ifdef CONFIG_X86_INTEL_USERCOPY
29760 static unsigned long
29761 -__copy_user_intel(void __user *to, const void *from, unsigned long size)
29762 +__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
29763 {
29764 int d0, d1;
29765 __asm__ __volatile__(
29766 @@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
29767 " .align 2,0x90\n"
29768 "3: movl 0(%4), %%eax\n"
29769 "4: movl 4(%4), %%edx\n"
29770 - "5: movl %%eax, 0(%3)\n"
29771 - "6: movl %%edx, 4(%3)\n"
29772 + "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
29773 + "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
29774 "7: movl 8(%4), %%eax\n"
29775 "8: movl 12(%4),%%edx\n"
29776 - "9: movl %%eax, 8(%3)\n"
29777 - "10: movl %%edx, 12(%3)\n"
29778 + "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
29779 + "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
29780 "11: movl 16(%4), %%eax\n"
29781 "12: movl 20(%4), %%edx\n"
29782 - "13: movl %%eax, 16(%3)\n"
29783 - "14: movl %%edx, 20(%3)\n"
29784 + "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
29785 + "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
29786 "15: movl 24(%4), %%eax\n"
29787 "16: movl 28(%4), %%edx\n"
29788 - "17: movl %%eax, 24(%3)\n"
29789 - "18: movl %%edx, 28(%3)\n"
29790 + "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
29791 + "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
29792 "19: movl 32(%4), %%eax\n"
29793 "20: movl 36(%4), %%edx\n"
29794 - "21: movl %%eax, 32(%3)\n"
29795 - "22: movl %%edx, 36(%3)\n"
29796 + "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
29797 + "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
29798 "23: movl 40(%4), %%eax\n"
29799 "24: movl 44(%4), %%edx\n"
29800 - "25: movl %%eax, 40(%3)\n"
29801 - "26: movl %%edx, 44(%3)\n"
29802 + "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
29803 + "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
29804 "27: movl 48(%4), %%eax\n"
29805 "28: movl 52(%4), %%edx\n"
29806 - "29: movl %%eax, 48(%3)\n"
29807 - "30: movl %%edx, 52(%3)\n"
29808 + "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
29809 + "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
29810 "31: movl 56(%4), %%eax\n"
29811 "32: movl 60(%4), %%edx\n"
29812 - "33: movl %%eax, 56(%3)\n"
29813 - "34: movl %%edx, 60(%3)\n"
29814 + "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
29815 + "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
29816 " addl $-64, %0\n"
29817 " addl $64, %4\n"
29818 " addl $64, %3\n"
29819 @@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
29820 " shrl $2, %0\n"
29821 " andl $3, %%eax\n"
29822 " cld\n"
29823 + __COPYUSER_SET_ES
29824 "99: rep; movsl\n"
29825 "36: movl %%eax, %0\n"
29826 "37: rep; movsb\n"
29827 "100:\n"
29828 + __COPYUSER_RESTORE_ES
29829 + ".section .fixup,\"ax\"\n"
29830 + "101: lea 0(%%eax,%0,4),%0\n"
29831 + " jmp 100b\n"
29832 + ".previous\n"
29833 + _ASM_EXTABLE(1b,100b)
29834 + _ASM_EXTABLE(2b,100b)
29835 + _ASM_EXTABLE(3b,100b)
29836 + _ASM_EXTABLE(4b,100b)
29837 + _ASM_EXTABLE(5b,100b)
29838 + _ASM_EXTABLE(6b,100b)
29839 + _ASM_EXTABLE(7b,100b)
29840 + _ASM_EXTABLE(8b,100b)
29841 + _ASM_EXTABLE(9b,100b)
29842 + _ASM_EXTABLE(10b,100b)
29843 + _ASM_EXTABLE(11b,100b)
29844 + _ASM_EXTABLE(12b,100b)
29845 + _ASM_EXTABLE(13b,100b)
29846 + _ASM_EXTABLE(14b,100b)
29847 + _ASM_EXTABLE(15b,100b)
29848 + _ASM_EXTABLE(16b,100b)
29849 + _ASM_EXTABLE(17b,100b)
29850 + _ASM_EXTABLE(18b,100b)
29851 + _ASM_EXTABLE(19b,100b)
29852 + _ASM_EXTABLE(20b,100b)
29853 + _ASM_EXTABLE(21b,100b)
29854 + _ASM_EXTABLE(22b,100b)
29855 + _ASM_EXTABLE(23b,100b)
29856 + _ASM_EXTABLE(24b,100b)
29857 + _ASM_EXTABLE(25b,100b)
29858 + _ASM_EXTABLE(26b,100b)
29859 + _ASM_EXTABLE(27b,100b)
29860 + _ASM_EXTABLE(28b,100b)
29861 + _ASM_EXTABLE(29b,100b)
29862 + _ASM_EXTABLE(30b,100b)
29863 + _ASM_EXTABLE(31b,100b)
29864 + _ASM_EXTABLE(32b,100b)
29865 + _ASM_EXTABLE(33b,100b)
29866 + _ASM_EXTABLE(34b,100b)
29867 + _ASM_EXTABLE(35b,100b)
29868 + _ASM_EXTABLE(36b,100b)
29869 + _ASM_EXTABLE(37b,100b)
29870 + _ASM_EXTABLE(99b,101b)
29871 + : "=&c"(size), "=&D" (d0), "=&S" (d1)
29872 + : "1"(to), "2"(from), "0"(size)
29873 + : "eax", "edx", "memory");
29874 + return size;
29875 +}
29876 +
29877 +static unsigned long
29878 +__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
29879 +{
29880 + int d0, d1;
29881 + __asm__ __volatile__(
29882 + " .align 2,0x90\n"
29883 + "1: "__copyuser_seg" movl 32(%4), %%eax\n"
29884 + " cmpl $67, %0\n"
29885 + " jbe 3f\n"
29886 + "2: "__copyuser_seg" movl 64(%4), %%eax\n"
29887 + " .align 2,0x90\n"
29888 + "3: "__copyuser_seg" movl 0(%4), %%eax\n"
29889 + "4: "__copyuser_seg" movl 4(%4), %%edx\n"
29890 + "5: movl %%eax, 0(%3)\n"
29891 + "6: movl %%edx, 4(%3)\n"
29892 + "7: "__copyuser_seg" movl 8(%4), %%eax\n"
29893 + "8: "__copyuser_seg" movl 12(%4),%%edx\n"
29894 + "9: movl %%eax, 8(%3)\n"
29895 + "10: movl %%edx, 12(%3)\n"
29896 + "11: "__copyuser_seg" movl 16(%4), %%eax\n"
29897 + "12: "__copyuser_seg" movl 20(%4), %%edx\n"
29898 + "13: movl %%eax, 16(%3)\n"
29899 + "14: movl %%edx, 20(%3)\n"
29900 + "15: "__copyuser_seg" movl 24(%4), %%eax\n"
29901 + "16: "__copyuser_seg" movl 28(%4), %%edx\n"
29902 + "17: movl %%eax, 24(%3)\n"
29903 + "18: movl %%edx, 28(%3)\n"
29904 + "19: "__copyuser_seg" movl 32(%4), %%eax\n"
29905 + "20: "__copyuser_seg" movl 36(%4), %%edx\n"
29906 + "21: movl %%eax, 32(%3)\n"
29907 + "22: movl %%edx, 36(%3)\n"
29908 + "23: "__copyuser_seg" movl 40(%4), %%eax\n"
29909 + "24: "__copyuser_seg" movl 44(%4), %%edx\n"
29910 + "25: movl %%eax, 40(%3)\n"
29911 + "26: movl %%edx, 44(%3)\n"
29912 + "27: "__copyuser_seg" movl 48(%4), %%eax\n"
29913 + "28: "__copyuser_seg" movl 52(%4), %%edx\n"
29914 + "29: movl %%eax, 48(%3)\n"
29915 + "30: movl %%edx, 52(%3)\n"
29916 + "31: "__copyuser_seg" movl 56(%4), %%eax\n"
29917 + "32: "__copyuser_seg" movl 60(%4), %%edx\n"
29918 + "33: movl %%eax, 56(%3)\n"
29919 + "34: movl %%edx, 60(%3)\n"
29920 + " addl $-64, %0\n"
29921 + " addl $64, %4\n"
29922 + " addl $64, %3\n"
29923 + " cmpl $63, %0\n"
29924 + " ja 1b\n"
29925 + "35: movl %0, %%eax\n"
29926 + " shrl $2, %0\n"
29927 + " andl $3, %%eax\n"
29928 + " cld\n"
29929 + "99: rep; "__copyuser_seg" movsl\n"
29930 + "36: movl %%eax, %0\n"
29931 + "37: rep; "__copyuser_seg" movsb\n"
29932 + "100:\n"
29933 ".section .fixup,\"ax\"\n"
29934 "101: lea 0(%%eax,%0,4),%0\n"
29935 " jmp 100b\n"
29936 @@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
29937 int d0, d1;
29938 __asm__ __volatile__(
29939 " .align 2,0x90\n"
29940 - "0: movl 32(%4), %%eax\n"
29941 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
29942 " cmpl $67, %0\n"
29943 " jbe 2f\n"
29944 - "1: movl 64(%4), %%eax\n"
29945 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
29946 " .align 2,0x90\n"
29947 - "2: movl 0(%4), %%eax\n"
29948 - "21: movl 4(%4), %%edx\n"
29949 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
29950 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
29951 " movl %%eax, 0(%3)\n"
29952 " movl %%edx, 4(%3)\n"
29953 - "3: movl 8(%4), %%eax\n"
29954 - "31: movl 12(%4),%%edx\n"
29955 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
29956 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
29957 " movl %%eax, 8(%3)\n"
29958 " movl %%edx, 12(%3)\n"
29959 - "4: movl 16(%4), %%eax\n"
29960 - "41: movl 20(%4), %%edx\n"
29961 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
29962 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
29963 " movl %%eax, 16(%3)\n"
29964 " movl %%edx, 20(%3)\n"
29965 - "10: movl 24(%4), %%eax\n"
29966 - "51: movl 28(%4), %%edx\n"
29967 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
29968 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
29969 " movl %%eax, 24(%3)\n"
29970 " movl %%edx, 28(%3)\n"
29971 - "11: movl 32(%4), %%eax\n"
29972 - "61: movl 36(%4), %%edx\n"
29973 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
29974 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
29975 " movl %%eax, 32(%3)\n"
29976 " movl %%edx, 36(%3)\n"
29977 - "12: movl 40(%4), %%eax\n"
29978 - "71: movl 44(%4), %%edx\n"
29979 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
29980 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
29981 " movl %%eax, 40(%3)\n"
29982 " movl %%edx, 44(%3)\n"
29983 - "13: movl 48(%4), %%eax\n"
29984 - "81: movl 52(%4), %%edx\n"
29985 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
29986 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
29987 " movl %%eax, 48(%3)\n"
29988 " movl %%edx, 52(%3)\n"
29989 - "14: movl 56(%4), %%eax\n"
29990 - "91: movl 60(%4), %%edx\n"
29991 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
29992 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
29993 " movl %%eax, 56(%3)\n"
29994 " movl %%edx, 60(%3)\n"
29995 " addl $-64, %0\n"
29996 @@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
29997 " shrl $2, %0\n"
29998 " andl $3, %%eax\n"
29999 " cld\n"
30000 - "6: rep; movsl\n"
30001 + "6: rep; "__copyuser_seg" movsl\n"
30002 " movl %%eax,%0\n"
30003 - "7: rep; movsb\n"
30004 + "7: rep; "__copyuser_seg" movsb\n"
30005 "8:\n"
30006 ".section .fixup,\"ax\"\n"
30007 "9: lea 0(%%eax,%0,4),%0\n"
30008 @@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
30009
30010 __asm__ __volatile__(
30011 " .align 2,0x90\n"
30012 - "0: movl 32(%4), %%eax\n"
30013 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
30014 " cmpl $67, %0\n"
30015 " jbe 2f\n"
30016 - "1: movl 64(%4), %%eax\n"
30017 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
30018 " .align 2,0x90\n"
30019 - "2: movl 0(%4), %%eax\n"
30020 - "21: movl 4(%4), %%edx\n"
30021 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
30022 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
30023 " movnti %%eax, 0(%3)\n"
30024 " movnti %%edx, 4(%3)\n"
30025 - "3: movl 8(%4), %%eax\n"
30026 - "31: movl 12(%4),%%edx\n"
30027 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
30028 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
30029 " movnti %%eax, 8(%3)\n"
30030 " movnti %%edx, 12(%3)\n"
30031 - "4: movl 16(%4), %%eax\n"
30032 - "41: movl 20(%4), %%edx\n"
30033 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
30034 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
30035 " movnti %%eax, 16(%3)\n"
30036 " movnti %%edx, 20(%3)\n"
30037 - "10: movl 24(%4), %%eax\n"
30038 - "51: movl 28(%4), %%edx\n"
30039 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
30040 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
30041 " movnti %%eax, 24(%3)\n"
30042 " movnti %%edx, 28(%3)\n"
30043 - "11: movl 32(%4), %%eax\n"
30044 - "61: movl 36(%4), %%edx\n"
30045 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
30046 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
30047 " movnti %%eax, 32(%3)\n"
30048 " movnti %%edx, 36(%3)\n"
30049 - "12: movl 40(%4), %%eax\n"
30050 - "71: movl 44(%4), %%edx\n"
30051 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
30052 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
30053 " movnti %%eax, 40(%3)\n"
30054 " movnti %%edx, 44(%3)\n"
30055 - "13: movl 48(%4), %%eax\n"
30056 - "81: movl 52(%4), %%edx\n"
30057 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
30058 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
30059 " movnti %%eax, 48(%3)\n"
30060 " movnti %%edx, 52(%3)\n"
30061 - "14: movl 56(%4), %%eax\n"
30062 - "91: movl 60(%4), %%edx\n"
30063 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
30064 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
30065 " movnti %%eax, 56(%3)\n"
30066 " movnti %%edx, 60(%3)\n"
30067 " addl $-64, %0\n"
30068 @@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
30069 " shrl $2, %0\n"
30070 " andl $3, %%eax\n"
30071 " cld\n"
30072 - "6: rep; movsl\n"
30073 + "6: rep; "__copyuser_seg" movsl\n"
30074 " movl %%eax,%0\n"
30075 - "7: rep; movsb\n"
30076 + "7: rep; "__copyuser_seg" movsb\n"
30077 "8:\n"
30078 ".section .fixup,\"ax\"\n"
30079 "9: lea 0(%%eax,%0,4),%0\n"
30080 @@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
30081
30082 __asm__ __volatile__(
30083 " .align 2,0x90\n"
30084 - "0: movl 32(%4), %%eax\n"
30085 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
30086 " cmpl $67, %0\n"
30087 " jbe 2f\n"
30088 - "1: movl 64(%4), %%eax\n"
30089 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
30090 " .align 2,0x90\n"
30091 - "2: movl 0(%4), %%eax\n"
30092 - "21: movl 4(%4), %%edx\n"
30093 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
30094 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
30095 " movnti %%eax, 0(%3)\n"
30096 " movnti %%edx, 4(%3)\n"
30097 - "3: movl 8(%4), %%eax\n"
30098 - "31: movl 12(%4),%%edx\n"
30099 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
30100 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
30101 " movnti %%eax, 8(%3)\n"
30102 " movnti %%edx, 12(%3)\n"
30103 - "4: movl 16(%4), %%eax\n"
30104 - "41: movl 20(%4), %%edx\n"
30105 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
30106 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
30107 " movnti %%eax, 16(%3)\n"
30108 " movnti %%edx, 20(%3)\n"
30109 - "10: movl 24(%4), %%eax\n"
30110 - "51: movl 28(%4), %%edx\n"
30111 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
30112 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
30113 " movnti %%eax, 24(%3)\n"
30114 " movnti %%edx, 28(%3)\n"
30115 - "11: movl 32(%4), %%eax\n"
30116 - "61: movl 36(%4), %%edx\n"
30117 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
30118 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
30119 " movnti %%eax, 32(%3)\n"
30120 " movnti %%edx, 36(%3)\n"
30121 - "12: movl 40(%4), %%eax\n"
30122 - "71: movl 44(%4), %%edx\n"
30123 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
30124 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
30125 " movnti %%eax, 40(%3)\n"
30126 " movnti %%edx, 44(%3)\n"
30127 - "13: movl 48(%4), %%eax\n"
30128 - "81: movl 52(%4), %%edx\n"
30129 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
30130 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
30131 " movnti %%eax, 48(%3)\n"
30132 " movnti %%edx, 52(%3)\n"
30133 - "14: movl 56(%4), %%eax\n"
30134 - "91: movl 60(%4), %%edx\n"
30135 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
30136 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
30137 " movnti %%eax, 56(%3)\n"
30138 " movnti %%edx, 60(%3)\n"
30139 " addl $-64, %0\n"
30140 @@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
30141 " shrl $2, %0\n"
30142 " andl $3, %%eax\n"
30143 " cld\n"
30144 - "6: rep; movsl\n"
30145 + "6: rep; "__copyuser_seg" movsl\n"
30146 " movl %%eax,%0\n"
30147 - "7: rep; movsb\n"
30148 + "7: rep; "__copyuser_seg" movsb\n"
30149 "8:\n"
30150 ".section .fixup,\"ax\"\n"
30151 "9: lea 0(%%eax,%0,4),%0\n"
30152 @@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
30153 */
30154 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
30155 unsigned long size);
30156 -unsigned long __copy_user_intel(void __user *to, const void *from,
30157 +unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
30158 + unsigned long size);
30159 +unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
30160 unsigned long size);
30161 unsigned long __copy_user_zeroing_intel_nocache(void *to,
30162 const void __user *from, unsigned long size);
30163 #endif /* CONFIG_X86_INTEL_USERCOPY */
30164
30165 /* Generic arbitrary sized copy. */
30166 -#define __copy_user(to, from, size) \
30167 +#define __copy_user(to, from, size, prefix, set, restore) \
30168 do { \
30169 int __d0, __d1, __d2; \
30170 __asm__ __volatile__( \
30171 + set \
30172 " cmp $7,%0\n" \
30173 " jbe 1f\n" \
30174 " movl %1,%0\n" \
30175 " negl %0\n" \
30176 " andl $7,%0\n" \
30177 " subl %0,%3\n" \
30178 - "4: rep; movsb\n" \
30179 + "4: rep; "prefix"movsb\n" \
30180 " movl %3,%0\n" \
30181 " shrl $2,%0\n" \
30182 " andl $3,%3\n" \
30183 " .align 2,0x90\n" \
30184 - "0: rep; movsl\n" \
30185 + "0: rep; "prefix"movsl\n" \
30186 " movl %3,%0\n" \
30187 - "1: rep; movsb\n" \
30188 + "1: rep; "prefix"movsb\n" \
30189 "2:\n" \
30190 + restore \
30191 ".section .fixup,\"ax\"\n" \
30192 "5: addl %3,%0\n" \
30193 " jmp 2b\n" \
30194 @@ -538,14 +650,14 @@ do { \
30195 " negl %0\n" \
30196 " andl $7,%0\n" \
30197 " subl %0,%3\n" \
30198 - "4: rep; movsb\n" \
30199 + "4: rep; "__copyuser_seg"movsb\n" \
30200 " movl %3,%0\n" \
30201 " shrl $2,%0\n" \
30202 " andl $3,%3\n" \
30203 " .align 2,0x90\n" \
30204 - "0: rep; movsl\n" \
30205 + "0: rep; "__copyuser_seg"movsl\n" \
30206 " movl %3,%0\n" \
30207 - "1: rep; movsb\n" \
30208 + "1: rep; "__copyuser_seg"movsb\n" \
30209 "2:\n" \
30210 ".section .fixup,\"ax\"\n" \
30211 "5: addl %3,%0\n" \
30212 @@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
30213 {
30214 stac();
30215 if (movsl_is_ok(to, from, n))
30216 - __copy_user(to, from, n);
30217 + __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
30218 else
30219 - n = __copy_user_intel(to, from, n);
30220 + n = __generic_copy_to_user_intel(to, from, n);
30221 clac();
30222 return n;
30223 }
30224 @@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
30225 {
30226 stac();
30227 if (movsl_is_ok(to, from, n))
30228 - __copy_user(to, from, n);
30229 + __copy_user(to, from, n, __copyuser_seg, "", "");
30230 else
30231 - n = __copy_user_intel((void __user *)to,
30232 - (const void *)from, n);
30233 + n = __generic_copy_from_user_intel(to, from, n);
30234 clac();
30235 return n;
30236 }
30237 @@ -632,60 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
30238 if (n > 64 && cpu_has_xmm2)
30239 n = __copy_user_intel_nocache(to, from, n);
30240 else
30241 - __copy_user(to, from, n);
30242 + __copy_user(to, from, n, __copyuser_seg, "", "");
30243 #else
30244 - __copy_user(to, from, n);
30245 + __copy_user(to, from, n, __copyuser_seg, "", "");
30246 #endif
30247 clac();
30248 return n;
30249 }
30250 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
30251
30252 -/**
30253 - * copy_to_user: - Copy a block of data into user space.
30254 - * @to: Destination address, in user space.
30255 - * @from: Source address, in kernel space.
30256 - * @n: Number of bytes to copy.
30257 - *
30258 - * Context: User context only. This function may sleep.
30259 - *
30260 - * Copy data from kernel space to user space.
30261 - *
30262 - * Returns number of bytes that could not be copied.
30263 - * On success, this will be zero.
30264 - */
30265 -unsigned long
30266 -copy_to_user(void __user *to, const void *from, unsigned long n)
30267 +#ifdef CONFIG_PAX_MEMORY_UDEREF
30268 +void __set_fs(mm_segment_t x)
30269 {
30270 - if (access_ok(VERIFY_WRITE, to, n))
30271 - n = __copy_to_user(to, from, n);
30272 - return n;
30273 + switch (x.seg) {
30274 + case 0:
30275 + loadsegment(gs, 0);
30276 + break;
30277 + case TASK_SIZE_MAX:
30278 + loadsegment(gs, __USER_DS);
30279 + break;
30280 + case -1UL:
30281 + loadsegment(gs, __KERNEL_DS);
30282 + break;
30283 + default:
30284 + BUG();
30285 + }
30286 }
30287 -EXPORT_SYMBOL(copy_to_user);
30288 +EXPORT_SYMBOL(__set_fs);
30289
30290 -/**
30291 - * copy_from_user: - Copy a block of data from user space.
30292 - * @to: Destination address, in kernel space.
30293 - * @from: Source address, in user space.
30294 - * @n: Number of bytes to copy.
30295 - *
30296 - * Context: User context only. This function may sleep.
30297 - *
30298 - * Copy data from user space to kernel space.
30299 - *
30300 - * Returns number of bytes that could not be copied.
30301 - * On success, this will be zero.
30302 - *
30303 - * If some data could not be copied, this function will pad the copied
30304 - * data to the requested size using zero bytes.
30305 - */
30306 -unsigned long
30307 -_copy_from_user(void *to, const void __user *from, unsigned long n)
30308 +void set_fs(mm_segment_t x)
30309 {
30310 - if (access_ok(VERIFY_READ, from, n))
30311 - n = __copy_from_user(to, from, n);
30312 - else
30313 - memset(to, 0, n);
30314 - return n;
30315 + current_thread_info()->addr_limit = x;
30316 + __set_fs(x);
30317 }
30318 -EXPORT_SYMBOL(_copy_from_user);
30319 +EXPORT_SYMBOL(set_fs);
30320 +#endif
30321 diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
30322 index c905e89..01ab928 100644
30323 --- a/arch/x86/lib/usercopy_64.c
30324 +++ b/arch/x86/lib/usercopy_64.c
30325 @@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
30326 might_fault();
30327 /* no memory constraint because it doesn't change any memory gcc knows
30328 about */
30329 + pax_open_userland();
30330 stac();
30331 asm volatile(
30332 " testq %[size8],%[size8]\n"
30333 @@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
30334 _ASM_EXTABLE(0b,3b)
30335 _ASM_EXTABLE(1b,2b)
30336 : [size8] "=&c"(size), [dst] "=&D" (__d0)
30337 - : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
30338 + : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
30339 [zero] "r" (0UL), [eight] "r" (8UL));
30340 clac();
30341 + pax_close_userland();
30342 return size;
30343 }
30344 EXPORT_SYMBOL(__clear_user);
30345 @@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
30346 }
30347 EXPORT_SYMBOL(clear_user);
30348
30349 -unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
30350 +unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
30351 {
30352 - if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
30353 - return copy_user_generic((__force void *)to, (__force void *)from, len);
30354 - }
30355 - return len;
30356 + if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
30357 + return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
30358 + return len;
30359 }
30360 EXPORT_SYMBOL(copy_in_user);
30361
30362 @@ -69,11 +70,13 @@ EXPORT_SYMBOL(copy_in_user);
30363 * it is not necessary to optimize tail handling.
30364 */
30365 __visible unsigned long
30366 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
30367 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
30368 {
30369 char c;
30370 unsigned zero_len;
30371
30372 + clac();
30373 + pax_close_userland();
30374 for (; len; --len, to++) {
30375 if (__get_user_nocheck(c, from++, sizeof(char)))
30376 break;
30377 @@ -84,6 +87,5 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
30378 for (c = 0, zero_len = len; zerorest && zero_len; --zero_len)
30379 if (__put_user_nocheck(c, to++, sizeof(char)))
30380 break;
30381 - clac();
30382 return len;
30383 }
30384 diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
30385 index 23d8e5f..9ccc13a 100644
30386 --- a/arch/x86/mm/Makefile
30387 +++ b/arch/x86/mm/Makefile
30388 @@ -28,3 +28,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
30389 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
30390
30391 obj-$(CONFIG_MEMTEST) += memtest.o
30392 +
30393 +quote:="
30394 +obj-$(CONFIG_X86_64) += uderef_64.o
30395 +CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
30396 diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
30397 index 903ec1e..c4166b2 100644
30398 --- a/arch/x86/mm/extable.c
30399 +++ b/arch/x86/mm/extable.c
30400 @@ -6,12 +6,24 @@
30401 static inline unsigned long
30402 ex_insn_addr(const struct exception_table_entry *x)
30403 {
30404 - return (unsigned long)&x->insn + x->insn;
30405 + unsigned long reloc = 0;
30406 +
30407 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
30408 + reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
30409 +#endif
30410 +
30411 + return (unsigned long)&x->insn + x->insn + reloc;
30412 }
30413 static inline unsigned long
30414 ex_fixup_addr(const struct exception_table_entry *x)
30415 {
30416 - return (unsigned long)&x->fixup + x->fixup;
30417 + unsigned long reloc = 0;
30418 +
30419 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
30420 + reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
30421 +#endif
30422 +
30423 + return (unsigned long)&x->fixup + x->fixup + reloc;
30424 }
30425
30426 int fixup_exception(struct pt_regs *regs)
30427 @@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
30428 unsigned long new_ip;
30429
30430 #ifdef CONFIG_PNPBIOS
30431 - if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
30432 + if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
30433 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
30434 extern u32 pnp_bios_is_utter_crap;
30435 pnp_bios_is_utter_crap = 1;
30436 @@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
30437 i += 4;
30438 p->fixup -= i;
30439 i += 4;
30440 +
30441 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
30442 + BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
30443 + p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
30444 + p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
30445 +#endif
30446 +
30447 }
30448 }
30449
30450 diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
30451 index 3aaeffc..42ea9fb 100644
30452 --- a/arch/x86/mm/fault.c
30453 +++ b/arch/x86/mm/fault.c
30454 @@ -14,11 +14,18 @@
30455 #include <linux/hugetlb.h> /* hstate_index_to_shift */
30456 #include <linux/prefetch.h> /* prefetchw */
30457 #include <linux/context_tracking.h> /* exception_enter(), ... */
30458 +#include <linux/unistd.h>
30459 +#include <linux/compiler.h>
30460
30461 #include <asm/traps.h> /* dotraplinkage, ... */
30462 #include <asm/pgalloc.h> /* pgd_*(), ... */
30463 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
30464 #include <asm/fixmap.h> /* VSYSCALL_START */
30465 +#include <asm/tlbflush.h>
30466 +
30467 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30468 +#include <asm/stacktrace.h>
30469 +#endif
30470
30471 /*
30472 * Page fault error code bits:
30473 @@ -56,7 +63,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs)
30474 int ret = 0;
30475
30476 /* kprobe_running() needs smp_processor_id() */
30477 - if (kprobes_built_in() && !user_mode_vm(regs)) {
30478 + if (kprobes_built_in() && !user_mode(regs)) {
30479 preempt_disable();
30480 if (kprobe_running() && kprobe_fault_handler(regs, 14))
30481 ret = 1;
30482 @@ -117,7 +124,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
30483 return !instr_lo || (instr_lo>>1) == 1;
30484 case 0x00:
30485 /* Prefetch instruction is 0x0F0D or 0x0F18 */
30486 - if (probe_kernel_address(instr, opcode))
30487 + if (user_mode(regs)) {
30488 + if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
30489 + return 0;
30490 + } else if (probe_kernel_address(instr, opcode))
30491 return 0;
30492
30493 *prefetch = (instr_lo == 0xF) &&
30494 @@ -151,7 +161,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
30495 while (instr < max_instr) {
30496 unsigned char opcode;
30497
30498 - if (probe_kernel_address(instr, opcode))
30499 + if (user_mode(regs)) {
30500 + if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
30501 + break;
30502 + } else if (probe_kernel_address(instr, opcode))
30503 break;
30504
30505 instr++;
30506 @@ -182,6 +195,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
30507 force_sig_info(si_signo, &info, tsk);
30508 }
30509
30510 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
30511 +static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
30512 +#endif
30513 +
30514 +#ifdef CONFIG_PAX_EMUTRAMP
30515 +static int pax_handle_fetch_fault(struct pt_regs *regs);
30516 +#endif
30517 +
30518 +#ifdef CONFIG_PAX_PAGEEXEC
30519 +static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
30520 +{
30521 + pgd_t *pgd;
30522 + pud_t *pud;
30523 + pmd_t *pmd;
30524 +
30525 + pgd = pgd_offset(mm, address);
30526 + if (!pgd_present(*pgd))
30527 + return NULL;
30528 + pud = pud_offset(pgd, address);
30529 + if (!pud_present(*pud))
30530 + return NULL;
30531 + pmd = pmd_offset(pud, address);
30532 + if (!pmd_present(*pmd))
30533 + return NULL;
30534 + return pmd;
30535 +}
30536 +#endif
30537 +
30538 DEFINE_SPINLOCK(pgd_lock);
30539 LIST_HEAD(pgd_list);
30540
30541 @@ -232,10 +273,27 @@ void vmalloc_sync_all(void)
30542 for (address = VMALLOC_START & PMD_MASK;
30543 address >= TASK_SIZE && address < FIXADDR_TOP;
30544 address += PMD_SIZE) {
30545 +
30546 +#ifdef CONFIG_PAX_PER_CPU_PGD
30547 + unsigned long cpu;
30548 +#else
30549 struct page *page;
30550 +#endif
30551
30552 spin_lock(&pgd_lock);
30553 +
30554 +#ifdef CONFIG_PAX_PER_CPU_PGD
30555 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
30556 + pgd_t *pgd = get_cpu_pgd(cpu, user);
30557 + pmd_t *ret;
30558 +
30559 + ret = vmalloc_sync_one(pgd, address);
30560 + if (!ret)
30561 + break;
30562 + pgd = get_cpu_pgd(cpu, kernel);
30563 +#else
30564 list_for_each_entry(page, &pgd_list, lru) {
30565 + pgd_t *pgd;
30566 spinlock_t *pgt_lock;
30567 pmd_t *ret;
30568
30569 @@ -243,8 +301,14 @@ void vmalloc_sync_all(void)
30570 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
30571
30572 spin_lock(pgt_lock);
30573 - ret = vmalloc_sync_one(page_address(page), address);
30574 + pgd = page_address(page);
30575 +#endif
30576 +
30577 + ret = vmalloc_sync_one(pgd, address);
30578 +
30579 +#ifndef CONFIG_PAX_PER_CPU_PGD
30580 spin_unlock(pgt_lock);
30581 +#endif
30582
30583 if (!ret)
30584 break;
30585 @@ -278,6 +342,12 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
30586 * an interrupt in the middle of a task switch..
30587 */
30588 pgd_paddr = read_cr3();
30589 +
30590 +#ifdef CONFIG_PAX_PER_CPU_PGD
30591 + BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
30592 + vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
30593 +#endif
30594 +
30595 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
30596 if (!pmd_k)
30597 return -1;
30598 @@ -373,11 +443,25 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
30599 * happen within a race in page table update. In the later
30600 * case just flush:
30601 */
30602 - pgd = pgd_offset(current->active_mm, address);
30603 +
30604 pgd_ref = pgd_offset_k(address);
30605 if (pgd_none(*pgd_ref))
30606 return -1;
30607
30608 +#ifdef CONFIG_PAX_PER_CPU_PGD
30609 + BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
30610 + pgd = pgd_offset_cpu(smp_processor_id(), user, address);
30611 + if (pgd_none(*pgd)) {
30612 + set_pgd(pgd, *pgd_ref);
30613 + arch_flush_lazy_mmu_mode();
30614 + } else {
30615 + BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
30616 + }
30617 + pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
30618 +#else
30619 + pgd = pgd_offset(current->active_mm, address);
30620 +#endif
30621 +
30622 if (pgd_none(*pgd)) {
30623 set_pgd(pgd, *pgd_ref);
30624 arch_flush_lazy_mmu_mode();
30625 @@ -543,7 +627,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
30626 static int is_errata100(struct pt_regs *regs, unsigned long address)
30627 {
30628 #ifdef CONFIG_X86_64
30629 - if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
30630 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
30631 return 1;
30632 #endif
30633 return 0;
30634 @@ -570,7 +654,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
30635 }
30636
30637 static const char nx_warning[] = KERN_CRIT
30638 -"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
30639 +"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
30640
30641 static void
30642 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
30643 @@ -579,15 +663,27 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
30644 if (!oops_may_print())
30645 return;
30646
30647 - if (error_code & PF_INSTR) {
30648 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
30649 unsigned int level;
30650
30651 pte_t *pte = lookup_address(address, &level);
30652
30653 if (pte && pte_present(*pte) && !pte_exec(*pte))
30654 - printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
30655 + printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
30656 }
30657
30658 +#ifdef CONFIG_PAX_KERNEXEC
30659 + if (init_mm.start_code <= address && address < init_mm.end_code) {
30660 + if (current->signal->curr_ip)
30661 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
30662 + &current->signal->curr_ip, current->comm, task_pid_nr(current),
30663 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
30664 + else
30665 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
30666 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
30667 + }
30668 +#endif
30669 +
30670 printk(KERN_ALERT "BUG: unable to handle kernel ");
30671 if (address < PAGE_SIZE)
30672 printk(KERN_CONT "NULL pointer dereference");
30673 @@ -750,6 +846,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
30674 return;
30675 }
30676 #endif
30677 +
30678 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
30679 + if (pax_is_fetch_fault(regs, error_code, address)) {
30680 +
30681 +#ifdef CONFIG_PAX_EMUTRAMP
30682 + switch (pax_handle_fetch_fault(regs)) {
30683 + case 2:
30684 + return;
30685 + }
30686 +#endif
30687 +
30688 + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
30689 + do_group_exit(SIGKILL);
30690 + }
30691 +#endif
30692 +
30693 /* Kernel addresses are always protection faults: */
30694 if (address >= TASK_SIZE)
30695 error_code |= PF_PROT;
30696 @@ -835,7 +947,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
30697 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
30698 printk(KERN_ERR
30699 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
30700 - tsk->comm, tsk->pid, address);
30701 + tsk->comm, task_pid_nr(tsk), address);
30702 code = BUS_MCEERR_AR;
30703 }
30704 #endif
30705 @@ -889,6 +1001,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
30706 return 1;
30707 }
30708
30709 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
30710 +static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
30711 +{
30712 + pte_t *pte;
30713 + pmd_t *pmd;
30714 + spinlock_t *ptl;
30715 + unsigned char pte_mask;
30716 +
30717 + if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
30718 + !(mm->pax_flags & MF_PAX_PAGEEXEC))
30719 + return 0;
30720 +
30721 + /* PaX: it's our fault, let's handle it if we can */
30722 +
30723 + /* PaX: take a look at read faults before acquiring any locks */
30724 + if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
30725 + /* instruction fetch attempt from a protected page in user mode */
30726 + up_read(&mm->mmap_sem);
30727 +
30728 +#ifdef CONFIG_PAX_EMUTRAMP
30729 + switch (pax_handle_fetch_fault(regs)) {
30730 + case 2:
30731 + return 1;
30732 + }
30733 +#endif
30734 +
30735 + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
30736 + do_group_exit(SIGKILL);
30737 + }
30738 +
30739 + pmd = pax_get_pmd(mm, address);
30740 + if (unlikely(!pmd))
30741 + return 0;
30742 +
30743 + pte = pte_offset_map_lock(mm, pmd, address, &ptl);
30744 + if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
30745 + pte_unmap_unlock(pte, ptl);
30746 + return 0;
30747 + }
30748 +
30749 + if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
30750 + /* write attempt to a protected page in user mode */
30751 + pte_unmap_unlock(pte, ptl);
30752 + return 0;
30753 + }
30754 +
30755 +#ifdef CONFIG_SMP
30756 + if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
30757 +#else
30758 + if (likely(address > get_limit(regs->cs)))
30759 +#endif
30760 + {
30761 + set_pte(pte, pte_mkread(*pte));
30762 + __flush_tlb_one(address);
30763 + pte_unmap_unlock(pte, ptl);
30764 + up_read(&mm->mmap_sem);
30765 + return 1;
30766 + }
30767 +
30768 + pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
30769 +
30770 + /*
30771 + * PaX: fill DTLB with user rights and retry
30772 + */
30773 + __asm__ __volatile__ (
30774 + "orb %2,(%1)\n"
30775 +#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
30776 +/*
30777 + * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
30778 + * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
30779 + * page fault when examined during a TLB load attempt. this is true not only
30780 + * for PTEs holding a non-present entry but also present entries that will
30781 + * raise a page fault (such as those set up by PaX, or the copy-on-write
30782 + * mechanism). in effect it means that we do *not* need to flush the TLBs
30783 + * for our target pages since their PTEs are simply not in the TLBs at all.
30784 +
30785 + * the best thing in omitting it is that we gain around 15-20% speed in the
30786 + * fast path of the page fault handler and can get rid of tracing since we
30787 + * can no longer flush unintended entries.
30788 + */
30789 + "invlpg (%0)\n"
30790 +#endif
30791 + __copyuser_seg"testb $0,(%0)\n"
30792 + "xorb %3,(%1)\n"
30793 + :
30794 + : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
30795 + : "memory", "cc");
30796 + pte_unmap_unlock(pte, ptl);
30797 + up_read(&mm->mmap_sem);
30798 + return 1;
30799 +}
30800 +#endif
30801 +
30802 /*
30803 * Handle a spurious fault caused by a stale TLB entry.
30804 *
30805 @@ -955,6 +1160,9 @@ int show_unhandled_signals = 1;
30806 static inline int
30807 access_error(unsigned long error_code, struct vm_area_struct *vma)
30808 {
30809 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
30810 + return 1;
30811 +
30812 if (error_code & PF_WRITE) {
30813 /* write, present and write, not present: */
30814 if (unlikely(!(vma->vm_flags & VM_WRITE)))
30815 @@ -983,7 +1191,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
30816 if (error_code & PF_USER)
30817 return false;
30818
30819 - if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
30820 + if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
30821 return false;
30822
30823 return true;
30824 @@ -1010,6 +1218,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
30825 /* Get the faulting address: */
30826 address = read_cr2();
30827
30828 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30829 + if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
30830 + if (!search_exception_tables(regs->ip)) {
30831 + printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
30832 + bad_area_nosemaphore(regs, error_code, address);
30833 + return;
30834 + }
30835 + if (address < pax_user_shadow_base) {
30836 + printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
30837 + printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
30838 + show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
30839 + } else
30840 + address -= pax_user_shadow_base;
30841 + }
30842 +#endif
30843 +
30844 /*
30845 * Detect and handle instructions that would cause a page fault for
30846 * both a tracked kernel page and a userspace page.
30847 @@ -1069,7 +1293,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
30848 * User-mode registers count as a user access even for any
30849 * potential system fault or CPU buglet:
30850 */
30851 - if (user_mode_vm(regs)) {
30852 + if (user_mode(regs)) {
30853 local_irq_enable();
30854 error_code |= PF_USER;
30855 flags |= FAULT_FLAG_USER;
30856 @@ -1135,6 +1359,11 @@ retry:
30857 might_sleep();
30858 }
30859
30860 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
30861 + if (pax_handle_pageexec_fault(regs, mm, address, error_code))
30862 + return;
30863 +#endif
30864 +
30865 vma = find_vma(mm, address);
30866 if (unlikely(!vma)) {
30867 bad_area(regs, error_code, address);
30868 @@ -1146,18 +1375,24 @@ retry:
30869 bad_area(regs, error_code, address);
30870 return;
30871 }
30872 - if (error_code & PF_USER) {
30873 - /*
30874 - * Accessing the stack below %sp is always a bug.
30875 - * The large cushion allows instructions like enter
30876 - * and pusha to work. ("enter $65535, $31" pushes
30877 - * 32 pointers and then decrements %sp by 65535.)
30878 - */
30879 - if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
30880 - bad_area(regs, error_code, address);
30881 - return;
30882 - }
30883 + /*
30884 + * Accessing the stack below %sp is always a bug.
30885 + * The large cushion allows instructions like enter
30886 + * and pusha to work. ("enter $65535, $31" pushes
30887 + * 32 pointers and then decrements %sp by 65535.)
30888 + */
30889 + if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
30890 + bad_area(regs, error_code, address);
30891 + return;
30892 }
30893 +
30894 +#ifdef CONFIG_PAX_SEGMEXEC
30895 + if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
30896 + bad_area(regs, error_code, address);
30897 + return;
30898 + }
30899 +#endif
30900 +
30901 if (unlikely(expand_stack(vma, address))) {
30902 bad_area(regs, error_code, address);
30903 return;
30904 @@ -1231,3 +1466,292 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
30905 __do_page_fault(regs, error_code);
30906 exception_exit(prev_state);
30907 }
30908 +
30909 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
30910 +static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
30911 +{
30912 + struct mm_struct *mm = current->mm;
30913 + unsigned long ip = regs->ip;
30914 +
30915 + if (v8086_mode(regs))
30916 + ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
30917 +
30918 +#ifdef CONFIG_PAX_PAGEEXEC
30919 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
30920 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
30921 + return true;
30922 + if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
30923 + return true;
30924 + return false;
30925 + }
30926 +#endif
30927 +
30928 +#ifdef CONFIG_PAX_SEGMEXEC
30929 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
30930 + if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
30931 + return true;
30932 + return false;
30933 + }
30934 +#endif
30935 +
30936 + return false;
30937 +}
30938 +#endif
30939 +
30940 +#ifdef CONFIG_PAX_EMUTRAMP
30941 +static int pax_handle_fetch_fault_32(struct pt_regs *regs)
30942 +{
30943 + int err;
30944 +
30945 + do { /* PaX: libffi trampoline emulation */
30946 + unsigned char mov, jmp;
30947 + unsigned int addr1, addr2;
30948 +
30949 +#ifdef CONFIG_X86_64
30950 + if ((regs->ip + 9) >> 32)
30951 + break;
30952 +#endif
30953 +
30954 + err = get_user(mov, (unsigned char __user *)regs->ip);
30955 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
30956 + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
30957 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
30958 +
30959 + if (err)
30960 + break;
30961 +
30962 + if (mov == 0xB8 && jmp == 0xE9) {
30963 + regs->ax = addr1;
30964 + regs->ip = (unsigned int)(regs->ip + addr2 + 10);
30965 + return 2;
30966 + }
30967 + } while (0);
30968 +
30969 + do { /* PaX: gcc trampoline emulation #1 */
30970 + unsigned char mov1, mov2;
30971 + unsigned short jmp;
30972 + unsigned int addr1, addr2;
30973 +
30974 +#ifdef CONFIG_X86_64
30975 + if ((regs->ip + 11) >> 32)
30976 + break;
30977 +#endif
30978 +
30979 + err = get_user(mov1, (unsigned char __user *)regs->ip);
30980 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
30981 + err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
30982 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
30983 + err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
30984 +
30985 + if (err)
30986 + break;
30987 +
30988 + if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
30989 + regs->cx = addr1;
30990 + regs->ax = addr2;
30991 + regs->ip = addr2;
30992 + return 2;
30993 + }
30994 + } while (0);
30995 +
30996 + do { /* PaX: gcc trampoline emulation #2 */
30997 + unsigned char mov, jmp;
30998 + unsigned int addr1, addr2;
30999 +
31000 +#ifdef CONFIG_X86_64
31001 + if ((regs->ip + 9) >> 32)
31002 + break;
31003 +#endif
31004 +
31005 + err = get_user(mov, (unsigned char __user *)regs->ip);
31006 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
31007 + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
31008 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
31009 +
31010 + if (err)
31011 + break;
31012 +
31013 + if (mov == 0xB9 && jmp == 0xE9) {
31014 + regs->cx = addr1;
31015 + regs->ip = (unsigned int)(regs->ip + addr2 + 10);
31016 + return 2;
31017 + }
31018 + } while (0);
31019 +
31020 + return 1; /* PaX in action */
31021 +}
31022 +
31023 +#ifdef CONFIG_X86_64
31024 +static int pax_handle_fetch_fault_64(struct pt_regs *regs)
31025 +{
31026 + int err;
31027 +
31028 + do { /* PaX: libffi trampoline emulation */
31029 + unsigned short mov1, mov2, jmp1;
31030 + unsigned char stcclc, jmp2;
31031 + unsigned long addr1, addr2;
31032 +
31033 + err = get_user(mov1, (unsigned short __user *)regs->ip);
31034 + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
31035 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
31036 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
31037 + err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
31038 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
31039 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
31040 +
31041 + if (err)
31042 + break;
31043 +
31044 + if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
31045 + regs->r11 = addr1;
31046 + regs->r10 = addr2;
31047 + if (stcclc == 0xF8)
31048 + regs->flags &= ~X86_EFLAGS_CF;
31049 + else
31050 + regs->flags |= X86_EFLAGS_CF;
31051 + regs->ip = addr1;
31052 + return 2;
31053 + }
31054 + } while (0);
31055 +
31056 + do { /* PaX: gcc trampoline emulation #1 */
31057 + unsigned short mov1, mov2, jmp1;
31058 + unsigned char jmp2;
31059 + unsigned int addr1;
31060 + unsigned long addr2;
31061 +
31062 + err = get_user(mov1, (unsigned short __user *)regs->ip);
31063 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
31064 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
31065 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
31066 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
31067 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
31068 +
31069 + if (err)
31070 + break;
31071 +
31072 + if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
31073 + regs->r11 = addr1;
31074 + regs->r10 = addr2;
31075 + regs->ip = addr1;
31076 + return 2;
31077 + }
31078 + } while (0);
31079 +
31080 + do { /* PaX: gcc trampoline emulation #2 */
31081 + unsigned short mov1, mov2, jmp1;
31082 + unsigned char jmp2;
31083 + unsigned long addr1, addr2;
31084 +
31085 + err = get_user(mov1, (unsigned short __user *)regs->ip);
31086 + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
31087 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
31088 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
31089 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
31090 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
31091 +
31092 + if (err)
31093 + break;
31094 +
31095 + if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
31096 + regs->r11 = addr1;
31097 + regs->r10 = addr2;
31098 + regs->ip = addr1;
31099 + return 2;
31100 + }
31101 + } while (0);
31102 +
31103 + return 1; /* PaX in action */
31104 +}
31105 +#endif
31106 +
31107 +/*
31108 + * PaX: decide what to do with offenders (regs->ip = fault address)
31109 + *
31110 + * returns 1 when task should be killed
31111 + * 2 when gcc trampoline was detected
31112 + */
31113 +static int pax_handle_fetch_fault(struct pt_regs *regs)
31114 +{
31115 + if (v8086_mode(regs))
31116 + return 1;
31117 +
31118 + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
31119 + return 1;
31120 +
31121 +#ifdef CONFIG_X86_32
31122 + return pax_handle_fetch_fault_32(regs);
31123 +#else
31124 + if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
31125 + return pax_handle_fetch_fault_32(regs);
31126 + else
31127 + return pax_handle_fetch_fault_64(regs);
31128 +#endif
31129 +}
31130 +#endif
31131 +
31132 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31133 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
31134 +{
31135 + long i;
31136 +
31137 + printk(KERN_ERR "PAX: bytes at PC: ");
31138 + for (i = 0; i < 20; i++) {
31139 + unsigned char c;
31140 + if (get_user(c, (unsigned char __force_user *)pc+i))
31141 + printk(KERN_CONT "?? ");
31142 + else
31143 + printk(KERN_CONT "%02x ", c);
31144 + }
31145 + printk("\n");
31146 +
31147 + printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
31148 + for (i = -1; i < 80 / (long)sizeof(long); i++) {
31149 + unsigned long c;
31150 + if (get_user(c, (unsigned long __force_user *)sp+i)) {
31151 +#ifdef CONFIG_X86_32
31152 + printk(KERN_CONT "???????? ");
31153 +#else
31154 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
31155 + printk(KERN_CONT "???????? ???????? ");
31156 + else
31157 + printk(KERN_CONT "???????????????? ");
31158 +#endif
31159 + } else {
31160 +#ifdef CONFIG_X86_64
31161 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
31162 + printk(KERN_CONT "%08x ", (unsigned int)c);
31163 + printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
31164 + } else
31165 +#endif
31166 + printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
31167 + }
31168 + }
31169 + printk("\n");
31170 +}
31171 +#endif
31172 +
31173 +/**
31174 + * probe_kernel_write(): safely attempt to write to a location
31175 + * @dst: address to write to
31176 + * @src: pointer to the data that shall be written
31177 + * @size: size of the data chunk
31178 + *
31179 + * Safely write to address @dst from the buffer at @src. If a kernel fault
31180 + * happens, handle that and return -EFAULT.
31181 + */
31182 +long notrace probe_kernel_write(void *dst, const void *src, size_t size)
31183 +{
31184 + long ret;
31185 + mm_segment_t old_fs = get_fs();
31186 +
31187 + set_fs(KERNEL_DS);
31188 + pagefault_disable();
31189 + pax_open_kernel();
31190 + ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
31191 + pax_close_kernel();
31192 + pagefault_enable();
31193 + set_fs(old_fs);
31194 +
31195 + return ret ? -EFAULT : 0;
31196 +}
31197 diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
31198 index dd74e46..0970b01 100644
31199 --- a/arch/x86/mm/gup.c
31200 +++ b/arch/x86/mm/gup.c
31201 @@ -255,7 +255,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
31202 addr = start;
31203 len = (unsigned long) nr_pages << PAGE_SHIFT;
31204 end = start + len;
31205 - if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
31206 + if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ,
31207 (void __user *)start, len)))
31208 return 0;
31209
31210 @@ -331,6 +331,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
31211 goto slow_irqon;
31212 #endif
31213
31214 + if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ,
31215 + (void __user *)start, len)))
31216 + return 0;
31217 +
31218 /*
31219 * XXX: batch / limit 'nr', to avoid large irq off latency
31220 * needs some instrumenting to determine the common sizes used by
31221 diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
31222 index 4500142..53a363c 100644
31223 --- a/arch/x86/mm/highmem_32.c
31224 +++ b/arch/x86/mm/highmem_32.c
31225 @@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
31226 idx = type + KM_TYPE_NR*smp_processor_id();
31227 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
31228 BUG_ON(!pte_none(*(kmap_pte-idx)));
31229 +
31230 + pax_open_kernel();
31231 set_pte(kmap_pte-idx, mk_pte(page, prot));
31232 + pax_close_kernel();
31233 +
31234 arch_flush_lazy_mmu_mode();
31235
31236 return (void *)vaddr;
31237 diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
31238 index 9d980d8..6bbfacb 100644
31239 --- a/arch/x86/mm/hugetlbpage.c
31240 +++ b/arch/x86/mm/hugetlbpage.c
31241 @@ -92,23 +92,30 @@ int pmd_huge_support(void)
31242 #ifdef HAVE_ARCH_HUGETLB_UNMAPPED_AREA
31243 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
31244 unsigned long addr, unsigned long len,
31245 - unsigned long pgoff, unsigned long flags)
31246 + unsigned long pgoff, unsigned long flags, unsigned long offset)
31247 {
31248 struct hstate *h = hstate_file(file);
31249 struct vm_unmapped_area_info info;
31250 -
31251 +
31252 info.flags = 0;
31253 info.length = len;
31254 info.low_limit = TASK_UNMAPPED_BASE;
31255 +
31256 +#ifdef CONFIG_PAX_RANDMMAP
31257 + if (current->mm->pax_flags & MF_PAX_RANDMMAP)
31258 + info.low_limit += current->mm->delta_mmap;
31259 +#endif
31260 +
31261 info.high_limit = TASK_SIZE;
31262 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
31263 info.align_offset = 0;
31264 + info.threadstack_offset = offset;
31265 return vm_unmapped_area(&info);
31266 }
31267
31268 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
31269 unsigned long addr0, unsigned long len,
31270 - unsigned long pgoff, unsigned long flags)
31271 + unsigned long pgoff, unsigned long flags, unsigned long offset)
31272 {
31273 struct hstate *h = hstate_file(file);
31274 struct vm_unmapped_area_info info;
31275 @@ -120,6 +127,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
31276 info.high_limit = current->mm->mmap_base;
31277 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
31278 info.align_offset = 0;
31279 + info.threadstack_offset = offset;
31280 addr = vm_unmapped_area(&info);
31281
31282 /*
31283 @@ -132,6 +140,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
31284 VM_BUG_ON(addr != -ENOMEM);
31285 info.flags = 0;
31286 info.low_limit = TASK_UNMAPPED_BASE;
31287 +
31288 +#ifdef CONFIG_PAX_RANDMMAP
31289 + if (current->mm->pax_flags & MF_PAX_RANDMMAP)
31290 + info.low_limit += current->mm->delta_mmap;
31291 +#endif
31292 +
31293 info.high_limit = TASK_SIZE;
31294 addr = vm_unmapped_area(&info);
31295 }
31296 @@ -146,10 +160,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
31297 struct hstate *h = hstate_file(file);
31298 struct mm_struct *mm = current->mm;
31299 struct vm_area_struct *vma;
31300 + unsigned long pax_task_size = TASK_SIZE;
31301 + unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
31302
31303 if (len & ~huge_page_mask(h))
31304 return -EINVAL;
31305 - if (len > TASK_SIZE)
31306 +
31307 +#ifdef CONFIG_PAX_SEGMEXEC
31308 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
31309 + pax_task_size = SEGMEXEC_TASK_SIZE;
31310 +#endif
31311 +
31312 + pax_task_size -= PAGE_SIZE;
31313 +
31314 + if (len > pax_task_size)
31315 return -ENOMEM;
31316
31317 if (flags & MAP_FIXED) {
31318 @@ -158,19 +182,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
31319 return addr;
31320 }
31321
31322 +#ifdef CONFIG_PAX_RANDMMAP
31323 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
31324 +#endif
31325 +
31326 if (addr) {
31327 addr = ALIGN(addr, huge_page_size(h));
31328 vma = find_vma(mm, addr);
31329 - if (TASK_SIZE - len >= addr &&
31330 - (!vma || addr + len <= vma->vm_start))
31331 + if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
31332 return addr;
31333 }
31334 if (mm->get_unmapped_area == arch_get_unmapped_area)
31335 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
31336 - pgoff, flags);
31337 + pgoff, flags, offset);
31338 else
31339 return hugetlb_get_unmapped_area_topdown(file, addr, len,
31340 - pgoff, flags);
31341 + pgoff, flags, offset);
31342 }
31343
31344 #endif /*HAVE_ARCH_HUGETLB_UNMAPPED_AREA*/
31345 diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
31346 index 04664cd..dae6e5d 100644
31347 --- a/arch/x86/mm/init.c
31348 +++ b/arch/x86/mm/init.c
31349 @@ -4,6 +4,7 @@
31350 #include <linux/swap.h>
31351 #include <linux/memblock.h>
31352 #include <linux/bootmem.h> /* for max_low_pfn */
31353 +#include <linux/tboot.h>
31354
31355 #include <asm/cacheflush.h>
31356 #include <asm/e820.h>
31357 @@ -17,6 +18,8 @@
31358 #include <asm/proto.h>
31359 #include <asm/dma.h> /* for MAX_DMA_PFN */
31360 #include <asm/microcode.h>
31361 +#include <asm/desc.h>
31362 +#include <asm/bios_ebda.h>
31363
31364 #include "mm_internal.h"
31365
31366 @@ -465,7 +468,18 @@ void __init init_mem_mapping(void)
31367 early_ioremap_page_table_range_init();
31368 #endif
31369
31370 +#ifdef CONFIG_PAX_PER_CPU_PGD
31371 + clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
31372 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
31373 + KERNEL_PGD_PTRS);
31374 + clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
31375 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
31376 + KERNEL_PGD_PTRS);
31377 + load_cr3(get_cpu_pgd(0, kernel));
31378 +#else
31379 load_cr3(swapper_pg_dir);
31380 +#endif
31381 +
31382 __flush_tlb_all();
31383
31384 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
31385 @@ -481,10 +495,40 @@ void __init init_mem_mapping(void)
31386 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
31387 * mmio resources as well as potential bios/acpi data regions.
31388 */
31389 +
31390 +#ifdef CONFIG_GRKERNSEC_KMEM
31391 +static unsigned int ebda_start __read_only;
31392 +static unsigned int ebda_end __read_only;
31393 +#endif
31394 +
31395 int devmem_is_allowed(unsigned long pagenr)
31396 {
31397 - if (pagenr < 256)
31398 +#ifdef CONFIG_GRKERNSEC_KMEM
31399 + /* allow BDA */
31400 + if (!pagenr)
31401 return 1;
31402 + /* allow EBDA */
31403 + if (pagenr >= ebda_start && pagenr < ebda_end)
31404 + return 1;
31405 + /* if tboot is in use, allow access to its hardcoded serial log range */
31406 + if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
31407 + return 1;
31408 +#else
31409 + if (!pagenr)
31410 + return 1;
31411 +#ifdef CONFIG_VM86
31412 + if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
31413 + return 1;
31414 +#endif
31415 +#endif
31416 +
31417 + if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
31418 + return 1;
31419 +#ifdef CONFIG_GRKERNSEC_KMEM
31420 + /* throw out everything else below 1MB */
31421 + if (pagenr <= 256)
31422 + return 0;
31423 +#endif
31424 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
31425 return 0;
31426 if (!page_is_ram(pagenr))
31427 @@ -530,8 +574,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
31428 #endif
31429 }
31430
31431 +#ifdef CONFIG_GRKERNSEC_KMEM
31432 +static inline void gr_init_ebda(void)
31433 +{
31434 + unsigned int ebda_addr;
31435 + unsigned int ebda_size = 0;
31436 +
31437 + ebda_addr = get_bios_ebda();
31438 + if (ebda_addr) {
31439 + ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
31440 + ebda_size <<= 10;
31441 + }
31442 + if (ebda_addr && ebda_size) {
31443 + ebda_start = ebda_addr >> PAGE_SHIFT;
31444 + ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
31445 + } else {
31446 + ebda_start = 0x9f000 >> PAGE_SHIFT;
31447 + ebda_end = 0xa0000 >> PAGE_SHIFT;
31448 + }
31449 +}
31450 +#else
31451 +static inline void gr_init_ebda(void) { }
31452 +#endif
31453 +
31454 void free_initmem(void)
31455 {
31456 +#ifdef CONFIG_PAX_KERNEXEC
31457 +#ifdef CONFIG_X86_32
31458 + /* PaX: limit KERNEL_CS to actual size */
31459 + unsigned long addr, limit;
31460 + struct desc_struct d;
31461 + int cpu;
31462 +#else
31463 + pgd_t *pgd;
31464 + pud_t *pud;
31465 + pmd_t *pmd;
31466 + unsigned long addr, end;
31467 +#endif
31468 +#endif
31469 +
31470 + gr_init_ebda();
31471 +
31472 +#ifdef CONFIG_PAX_KERNEXEC
31473 +#ifdef CONFIG_X86_32
31474 + limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
31475 + limit = (limit - 1UL) >> PAGE_SHIFT;
31476 +
31477 + memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
31478 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
31479 + pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
31480 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
31481 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
31482 + }
31483 +
31484 + /* PaX: make KERNEL_CS read-only */
31485 + addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
31486 + if (!paravirt_enabled())
31487 + set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
31488 +/*
31489 + for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
31490 + pgd = pgd_offset_k(addr);
31491 + pud = pud_offset(pgd, addr);
31492 + pmd = pmd_offset(pud, addr);
31493 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
31494 + }
31495 +*/
31496 +#ifdef CONFIG_X86_PAE
31497 + set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
31498 +/*
31499 + for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
31500 + pgd = pgd_offset_k(addr);
31501 + pud = pud_offset(pgd, addr);
31502 + pmd = pmd_offset(pud, addr);
31503 + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
31504 + }
31505 +*/
31506 +#endif
31507 +
31508 +#ifdef CONFIG_MODULES
31509 + set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
31510 +#endif
31511 +
31512 +#else
31513 + /* PaX: make kernel code/rodata read-only, rest non-executable */
31514 + for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
31515 + pgd = pgd_offset_k(addr);
31516 + pud = pud_offset(pgd, addr);
31517 + pmd = pmd_offset(pud, addr);
31518 + if (!pmd_present(*pmd))
31519 + continue;
31520 + if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
31521 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
31522 + else
31523 + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
31524 + }
31525 +
31526 + addr = (unsigned long)__va(__pa(__START_KERNEL_map));
31527 + end = addr + KERNEL_IMAGE_SIZE;
31528 + for (; addr < end; addr += PMD_SIZE) {
31529 + pgd = pgd_offset_k(addr);
31530 + pud = pud_offset(pgd, addr);
31531 + pmd = pmd_offset(pud, addr);
31532 + if (!pmd_present(*pmd))
31533 + continue;
31534 + if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
31535 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
31536 + }
31537 +#endif
31538 +
31539 + flush_tlb_all();
31540 +#endif
31541 +
31542 free_init_pages("unused kernel",
31543 (unsigned long)(&__init_begin),
31544 (unsigned long)(&__init_end));
31545 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
31546 index 4287f1f..3b99c71 100644
31547 --- a/arch/x86/mm/init_32.c
31548 +++ b/arch/x86/mm/init_32.c
31549 @@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
31550 bool __read_mostly __vmalloc_start_set = false;
31551
31552 /*
31553 - * Creates a middle page table and puts a pointer to it in the
31554 - * given global directory entry. This only returns the gd entry
31555 - * in non-PAE compilation mode, since the middle layer is folded.
31556 - */
31557 -static pmd_t * __init one_md_table_init(pgd_t *pgd)
31558 -{
31559 - pud_t *pud;
31560 - pmd_t *pmd_table;
31561 -
31562 -#ifdef CONFIG_X86_PAE
31563 - if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
31564 - pmd_table = (pmd_t *)alloc_low_page();
31565 - paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
31566 - set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
31567 - pud = pud_offset(pgd, 0);
31568 - BUG_ON(pmd_table != pmd_offset(pud, 0));
31569 -
31570 - return pmd_table;
31571 - }
31572 -#endif
31573 - pud = pud_offset(pgd, 0);
31574 - pmd_table = pmd_offset(pud, 0);
31575 -
31576 - return pmd_table;
31577 -}
31578 -
31579 -/*
31580 * Create a page table and place a pointer to it in a middle page
31581 * directory entry:
31582 */
31583 @@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
31584 pte_t *page_table = (pte_t *)alloc_low_page();
31585
31586 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
31587 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31588 + set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
31589 +#else
31590 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
31591 +#endif
31592 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
31593 }
31594
31595 return pte_offset_kernel(pmd, 0);
31596 }
31597
31598 +static pmd_t * __init one_md_table_init(pgd_t *pgd)
31599 +{
31600 + pud_t *pud;
31601 + pmd_t *pmd_table;
31602 +
31603 + pud = pud_offset(pgd, 0);
31604 + pmd_table = pmd_offset(pud, 0);
31605 +
31606 + return pmd_table;
31607 +}
31608 +
31609 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
31610 {
31611 int pgd_idx = pgd_index(vaddr);
31612 @@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
31613 int pgd_idx, pmd_idx;
31614 unsigned long vaddr;
31615 pgd_t *pgd;
31616 + pud_t *pud;
31617 pmd_t *pmd;
31618 pte_t *pte = NULL;
31619 unsigned long count = page_table_range_init_count(start, end);
31620 @@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
31621 pgd = pgd_base + pgd_idx;
31622
31623 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
31624 - pmd = one_md_table_init(pgd);
31625 - pmd = pmd + pmd_index(vaddr);
31626 + pud = pud_offset(pgd, vaddr);
31627 + pmd = pmd_offset(pud, vaddr);
31628 +
31629 +#ifdef CONFIG_X86_PAE
31630 + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
31631 +#endif
31632 +
31633 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
31634 pmd++, pmd_idx++) {
31635 pte = page_table_kmap_check(one_page_table_init(pmd),
31636 @@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
31637 }
31638 }
31639
31640 -static inline int is_kernel_text(unsigned long addr)
31641 +static inline int is_kernel_text(unsigned long start, unsigned long end)
31642 {
31643 - if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
31644 - return 1;
31645 - return 0;
31646 + if ((start > ktla_ktva((unsigned long)_etext) ||
31647 + end <= ktla_ktva((unsigned long)_stext)) &&
31648 + (start > ktla_ktva((unsigned long)_einittext) ||
31649 + end <= ktla_ktva((unsigned long)_sinittext)) &&
31650 +
31651 +#ifdef CONFIG_ACPI_SLEEP
31652 + (start > (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
31653 +#endif
31654 +
31655 + (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
31656 + return 0;
31657 + return 1;
31658 }
31659
31660 /*
31661 @@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
31662 unsigned long last_map_addr = end;
31663 unsigned long start_pfn, end_pfn;
31664 pgd_t *pgd_base = swapper_pg_dir;
31665 - int pgd_idx, pmd_idx, pte_ofs;
31666 + unsigned int pgd_idx, pmd_idx, pte_ofs;
31667 unsigned long pfn;
31668 pgd_t *pgd;
31669 + pud_t *pud;
31670 pmd_t *pmd;
31671 pte_t *pte;
31672 unsigned pages_2m, pages_4k;
31673 @@ -291,8 +295,13 @@ repeat:
31674 pfn = start_pfn;
31675 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
31676 pgd = pgd_base + pgd_idx;
31677 - for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
31678 - pmd = one_md_table_init(pgd);
31679 + for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
31680 + pud = pud_offset(pgd, 0);
31681 + pmd = pmd_offset(pud, 0);
31682 +
31683 +#ifdef CONFIG_X86_PAE
31684 + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
31685 +#endif
31686
31687 if (pfn >= end_pfn)
31688 continue;
31689 @@ -304,14 +313,13 @@ repeat:
31690 #endif
31691 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
31692 pmd++, pmd_idx++) {
31693 - unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
31694 + unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
31695
31696 /*
31697 * Map with big pages if possible, otherwise
31698 * create normal page tables:
31699 */
31700 if (use_pse) {
31701 - unsigned int addr2;
31702 pgprot_t prot = PAGE_KERNEL_LARGE;
31703 /*
31704 * first pass will use the same initial
31705 @@ -322,11 +330,7 @@ repeat:
31706 _PAGE_PSE);
31707
31708 pfn &= PMD_MASK >> PAGE_SHIFT;
31709 - addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
31710 - PAGE_OFFSET + PAGE_SIZE-1;
31711 -
31712 - if (is_kernel_text(addr) ||
31713 - is_kernel_text(addr2))
31714 + if (is_kernel_text(address, address + PMD_SIZE))
31715 prot = PAGE_KERNEL_LARGE_EXEC;
31716
31717 pages_2m++;
31718 @@ -343,7 +347,7 @@ repeat:
31719 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
31720 pte += pte_ofs;
31721 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
31722 - pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
31723 + pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
31724 pgprot_t prot = PAGE_KERNEL;
31725 /*
31726 * first pass will use the same initial
31727 @@ -351,7 +355,7 @@ repeat:
31728 */
31729 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
31730
31731 - if (is_kernel_text(addr))
31732 + if (is_kernel_text(address, address + PAGE_SIZE))
31733 prot = PAGE_KERNEL_EXEC;
31734
31735 pages_4k++;
31736 @@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
31737
31738 pud = pud_offset(pgd, va);
31739 pmd = pmd_offset(pud, va);
31740 - if (!pmd_present(*pmd))
31741 + if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
31742 break;
31743
31744 /* should not be large page here */
31745 @@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
31746
31747 static void __init pagetable_init(void)
31748 {
31749 - pgd_t *pgd_base = swapper_pg_dir;
31750 -
31751 - permanent_kmaps_init(pgd_base);
31752 + permanent_kmaps_init(swapper_pg_dir);
31753 }
31754
31755 -pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
31756 +pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
31757 EXPORT_SYMBOL_GPL(__supported_pte_mask);
31758
31759 /* user-defined highmem size */
31760 @@ -787,10 +789,10 @@ void __init mem_init(void)
31761 ((unsigned long)&__init_end -
31762 (unsigned long)&__init_begin) >> 10,
31763
31764 - (unsigned long)&_etext, (unsigned long)&_edata,
31765 - ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
31766 + (unsigned long)&_sdata, (unsigned long)&_edata,
31767 + ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
31768
31769 - (unsigned long)&_text, (unsigned long)&_etext,
31770 + ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
31771 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
31772
31773 /*
31774 @@ -880,6 +882,7 @@ void set_kernel_text_rw(void)
31775 if (!kernel_set_to_readonly)
31776 return;
31777
31778 + start = ktla_ktva(start);
31779 pr_debug("Set kernel text: %lx - %lx for read write\n",
31780 start, start+size);
31781
31782 @@ -894,6 +897,7 @@ void set_kernel_text_ro(void)
31783 if (!kernel_set_to_readonly)
31784 return;
31785
31786 + start = ktla_ktva(start);
31787 pr_debug("Set kernel text: %lx - %lx for read only\n",
31788 start, start+size);
31789
31790 @@ -922,6 +926,7 @@ void mark_rodata_ro(void)
31791 unsigned long start = PFN_ALIGN(_text);
31792 unsigned long size = PFN_ALIGN(_etext) - start;
31793
31794 + start = ktla_ktva(start);
31795 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
31796 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
31797 size >> 10);
31798 diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
31799 index 104d56a..62ba13f1 100644
31800 --- a/arch/x86/mm/init_64.c
31801 +++ b/arch/x86/mm/init_64.c
31802 @@ -151,7 +151,7 @@ early_param("gbpages", parse_direct_gbpages_on);
31803 * around without checking the pgd every time.
31804 */
31805
31806 -pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
31807 +pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_IOMAP);
31808 EXPORT_SYMBOL_GPL(__supported_pte_mask);
31809
31810 int force_personality32;
31811 @@ -184,12 +184,29 @@ void sync_global_pgds(unsigned long start, unsigned long end)
31812
31813 for (address = start; address <= end; address += PGDIR_SIZE) {
31814 const pgd_t *pgd_ref = pgd_offset_k(address);
31815 +
31816 +#ifdef CONFIG_PAX_PER_CPU_PGD
31817 + unsigned long cpu;
31818 +#else
31819 struct page *page;
31820 +#endif
31821
31822 if (pgd_none(*pgd_ref))
31823 continue;
31824
31825 spin_lock(&pgd_lock);
31826 +
31827 +#ifdef CONFIG_PAX_PER_CPU_PGD
31828 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31829 + pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
31830 +
31831 + if (pgd_none(*pgd))
31832 + set_pgd(pgd, *pgd_ref);
31833 + else
31834 + BUG_ON(pgd_page_vaddr(*pgd)
31835 + != pgd_page_vaddr(*pgd_ref));
31836 + pgd = pgd_offset_cpu(cpu, kernel, address);
31837 +#else
31838 list_for_each_entry(page, &pgd_list, lru) {
31839 pgd_t *pgd;
31840 spinlock_t *pgt_lock;
31841 @@ -198,6 +215,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
31842 /* the pgt_lock only for Xen */
31843 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31844 spin_lock(pgt_lock);
31845 +#endif
31846
31847 if (pgd_none(*pgd))
31848 set_pgd(pgd, *pgd_ref);
31849 @@ -205,7 +223,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
31850 BUG_ON(pgd_page_vaddr(*pgd)
31851 != pgd_page_vaddr(*pgd_ref));
31852
31853 +#ifndef CONFIG_PAX_PER_CPU_PGD
31854 spin_unlock(pgt_lock);
31855 +#endif
31856 +
31857 }
31858 spin_unlock(&pgd_lock);
31859 }
31860 @@ -238,7 +259,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
31861 {
31862 if (pgd_none(*pgd)) {
31863 pud_t *pud = (pud_t *)spp_getpage();
31864 - pgd_populate(&init_mm, pgd, pud);
31865 + pgd_populate_kernel(&init_mm, pgd, pud);
31866 if (pud != pud_offset(pgd, 0))
31867 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
31868 pud, pud_offset(pgd, 0));
31869 @@ -250,7 +271,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
31870 {
31871 if (pud_none(*pud)) {
31872 pmd_t *pmd = (pmd_t *) spp_getpage();
31873 - pud_populate(&init_mm, pud, pmd);
31874 + pud_populate_kernel(&init_mm, pud, pmd);
31875 if (pmd != pmd_offset(pud, 0))
31876 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
31877 pmd, pmd_offset(pud, 0));
31878 @@ -279,7 +300,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
31879 pmd = fill_pmd(pud, vaddr);
31880 pte = fill_pte(pmd, vaddr);
31881
31882 + pax_open_kernel();
31883 set_pte(pte, new_pte);
31884 + pax_close_kernel();
31885
31886 /*
31887 * It's enough to flush this one mapping.
31888 @@ -338,14 +361,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
31889 pgd = pgd_offset_k((unsigned long)__va(phys));
31890 if (pgd_none(*pgd)) {
31891 pud = (pud_t *) spp_getpage();
31892 - set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
31893 - _PAGE_USER));
31894 + set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
31895 }
31896 pud = pud_offset(pgd, (unsigned long)__va(phys));
31897 if (pud_none(*pud)) {
31898 pmd = (pmd_t *) spp_getpage();
31899 - set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
31900 - _PAGE_USER));
31901 + set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
31902 }
31903 pmd = pmd_offset(pud, phys);
31904 BUG_ON(!pmd_none(*pmd));
31905 @@ -586,7 +607,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
31906 prot);
31907
31908 spin_lock(&init_mm.page_table_lock);
31909 - pud_populate(&init_mm, pud, pmd);
31910 + pud_populate_kernel(&init_mm, pud, pmd);
31911 spin_unlock(&init_mm.page_table_lock);
31912 }
31913 __flush_tlb_all();
31914 @@ -627,7 +648,7 @@ kernel_physical_mapping_init(unsigned long start,
31915 page_size_mask);
31916
31917 spin_lock(&init_mm.page_table_lock);
31918 - pgd_populate(&init_mm, pgd, pud);
31919 + pgd_populate_kernel(&init_mm, pgd, pud);
31920 spin_unlock(&init_mm.page_table_lock);
31921 pgd_changed = true;
31922 }
31923 @@ -1188,8 +1209,8 @@ int kern_addr_valid(unsigned long addr)
31924 static struct vm_area_struct gate_vma = {
31925 .vm_start = VSYSCALL_START,
31926 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
31927 - .vm_page_prot = PAGE_READONLY_EXEC,
31928 - .vm_flags = VM_READ | VM_EXEC
31929 + .vm_page_prot = PAGE_READONLY,
31930 + .vm_flags = VM_READ
31931 };
31932
31933 struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
31934 @@ -1223,7 +1244,7 @@ int in_gate_area_no_mm(unsigned long addr)
31935
31936 const char *arch_vma_name(struct vm_area_struct *vma)
31937 {
31938 - if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
31939 + if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
31940 return "[vdso]";
31941 if (vma == &gate_vma)
31942 return "[vsyscall]";
31943 diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
31944 index 7b179b4..6bd17777 100644
31945 --- a/arch/x86/mm/iomap_32.c
31946 +++ b/arch/x86/mm/iomap_32.c
31947 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
31948 type = kmap_atomic_idx_push();
31949 idx = type + KM_TYPE_NR * smp_processor_id();
31950 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
31951 +
31952 + pax_open_kernel();
31953 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
31954 + pax_close_kernel();
31955 +
31956 arch_flush_lazy_mmu_mode();
31957
31958 return (void *)vaddr;
31959 diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
31960 index 799580c..72f9fe0 100644
31961 --- a/arch/x86/mm/ioremap.c
31962 +++ b/arch/x86/mm/ioremap.c
31963 @@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
31964 for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
31965 int is_ram = page_is_ram(pfn);
31966
31967 - if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
31968 + if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
31969 return NULL;
31970 WARN_ON_ONCE(is_ram);
31971 }
31972 @@ -256,7 +256,7 @@ EXPORT_SYMBOL(ioremap_prot);
31973 *
31974 * Caller must ensure there is only one unmapping for the same pointer.
31975 */
31976 -void iounmap(volatile void __iomem *addr)
31977 +void iounmap(const volatile void __iomem *addr)
31978 {
31979 struct vm_struct *p, *o;
31980
31981 @@ -310,6 +310,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
31982
31983 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
31984 if (page_is_ram(start >> PAGE_SHIFT))
31985 +#ifdef CONFIG_HIGHMEM
31986 + if ((start >> PAGE_SHIFT) < max_low_pfn)
31987 +#endif
31988 return __va(phys);
31989
31990 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
31991 @@ -322,6 +325,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
31992 void unxlate_dev_mem_ptr(unsigned long phys, void *addr)
31993 {
31994 if (page_is_ram(phys >> PAGE_SHIFT))
31995 +#ifdef CONFIG_HIGHMEM
31996 + if ((phys >> PAGE_SHIFT) < max_low_pfn)
31997 +#endif
31998 return;
31999
32000 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
32001 @@ -339,7 +345,7 @@ static int __init early_ioremap_debug_setup(char *str)
32002 early_param("early_ioremap_debug", early_ioremap_debug_setup);
32003
32004 static __initdata int after_paging_init;
32005 -static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
32006 +static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
32007
32008 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
32009 {
32010 @@ -376,8 +382,7 @@ void __init early_ioremap_init(void)
32011 slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
32012
32013 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
32014 - memset(bm_pte, 0, sizeof(bm_pte));
32015 - pmd_populate_kernel(&init_mm, pmd, bm_pte);
32016 + pmd_populate_user(&init_mm, pmd, bm_pte);
32017
32018 /*
32019 * The boot-ioremap range spans multiple pmds, for which
32020 diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
32021 index d87dd6d..bf3fa66 100644
32022 --- a/arch/x86/mm/kmemcheck/kmemcheck.c
32023 +++ b/arch/x86/mm/kmemcheck/kmemcheck.c
32024 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
32025 * memory (e.g. tracked pages)? For now, we need this to avoid
32026 * invoking kmemcheck for PnP BIOS calls.
32027 */
32028 - if (regs->flags & X86_VM_MASK)
32029 + if (v8086_mode(regs))
32030 return false;
32031 - if (regs->cs != __KERNEL_CS)
32032 + if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
32033 return false;
32034
32035 pte = kmemcheck_pte_lookup(address);
32036 diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
32037 index 25e7e13..1964579 100644
32038 --- a/arch/x86/mm/mmap.c
32039 +++ b/arch/x86/mm/mmap.c
32040 @@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
32041 * Leave an at least ~128 MB hole with possible stack randomization.
32042 */
32043 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
32044 -#define MAX_GAP (TASK_SIZE/6*5)
32045 +#define MAX_GAP (pax_task_size/6*5)
32046
32047 static int mmap_is_legacy(void)
32048 {
32049 @@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
32050 return rnd << PAGE_SHIFT;
32051 }
32052
32053 -static unsigned long mmap_base(void)
32054 +static unsigned long mmap_base(struct mm_struct *mm)
32055 {
32056 unsigned long gap = rlimit(RLIMIT_STACK);
32057 + unsigned long pax_task_size = TASK_SIZE;
32058 +
32059 +#ifdef CONFIG_PAX_SEGMEXEC
32060 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
32061 + pax_task_size = SEGMEXEC_TASK_SIZE;
32062 +#endif
32063
32064 if (gap < MIN_GAP)
32065 gap = MIN_GAP;
32066 else if (gap > MAX_GAP)
32067 gap = MAX_GAP;
32068
32069 - return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
32070 + return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
32071 }
32072
32073 /*
32074 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
32075 * does, but not when emulating X86_32
32076 */
32077 -static unsigned long mmap_legacy_base(void)
32078 +static unsigned long mmap_legacy_base(struct mm_struct *mm)
32079 {
32080 - if (mmap_is_ia32())
32081 + if (mmap_is_ia32()) {
32082 +
32083 +#ifdef CONFIG_PAX_SEGMEXEC
32084 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
32085 + return SEGMEXEC_TASK_UNMAPPED_BASE;
32086 + else
32087 +#endif
32088 +
32089 return TASK_UNMAPPED_BASE;
32090 - else
32091 + } else
32092 return TASK_UNMAPPED_BASE + mmap_rnd();
32093 }
32094
32095 @@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
32096 */
32097 void arch_pick_mmap_layout(struct mm_struct *mm)
32098 {
32099 - mm->mmap_legacy_base = mmap_legacy_base();
32100 - mm->mmap_base = mmap_base();
32101 + mm->mmap_legacy_base = mmap_legacy_base(mm);
32102 + mm->mmap_base = mmap_base(mm);
32103 +
32104 +#ifdef CONFIG_PAX_RANDMMAP
32105 + if (mm->pax_flags & MF_PAX_RANDMMAP) {
32106 + mm->mmap_legacy_base += mm->delta_mmap;
32107 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
32108 + }
32109 +#endif
32110
32111 if (mmap_is_legacy()) {
32112 mm->mmap_base = mm->mmap_legacy_base;
32113 diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
32114 index 0057a7a..95c7edd 100644
32115 --- a/arch/x86/mm/mmio-mod.c
32116 +++ b/arch/x86/mm/mmio-mod.c
32117 @@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
32118 break;
32119 default:
32120 {
32121 - unsigned char *ip = (unsigned char *)instptr;
32122 + unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
32123 my_trace->opcode = MMIO_UNKNOWN_OP;
32124 my_trace->width = 0;
32125 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
32126 @@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
32127 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
32128 void __iomem *addr)
32129 {
32130 - static atomic_t next_id;
32131 + static atomic_unchecked_t next_id;
32132 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
32133 /* These are page-unaligned. */
32134 struct mmiotrace_map map = {
32135 @@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
32136 .private = trace
32137 },
32138 .phys = offset,
32139 - .id = atomic_inc_return(&next_id)
32140 + .id = atomic_inc_return_unchecked(&next_id)
32141 };
32142 map.map_id = trace->id;
32143
32144 @@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
32145 ioremap_trace_core(offset, size, addr);
32146 }
32147
32148 -static void iounmap_trace_core(volatile void __iomem *addr)
32149 +static void iounmap_trace_core(const volatile void __iomem *addr)
32150 {
32151 struct mmiotrace_map map = {
32152 .phys = 0,
32153 @@ -328,7 +328,7 @@ not_enabled:
32154 }
32155 }
32156
32157 -void mmiotrace_iounmap(volatile void __iomem *addr)
32158 +void mmiotrace_iounmap(const volatile void __iomem *addr)
32159 {
32160 might_sleep();
32161 if (is_enabled()) /* recheck and proper locking in *_core() */
32162 diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
32163 index 8bf93ba..dbcd670 100644
32164 --- a/arch/x86/mm/numa.c
32165 +++ b/arch/x86/mm/numa.c
32166 @@ -474,7 +474,7 @@ static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi)
32167 return true;
32168 }
32169
32170 -static int __init numa_register_memblks(struct numa_meminfo *mi)
32171 +static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
32172 {
32173 unsigned long uninitialized_var(pfn_align);
32174 int i, nid;
32175 diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
32176 index d0b1773..4c3327c 100644
32177 --- a/arch/x86/mm/pageattr-test.c
32178 +++ b/arch/x86/mm/pageattr-test.c
32179 @@ -36,7 +36,7 @@ enum {
32180
32181 static int pte_testbit(pte_t pte)
32182 {
32183 - return pte_flags(pte) & _PAGE_UNUSED1;
32184 + return pte_flags(pte) & _PAGE_CPA_TEST;
32185 }
32186
32187 struct split_state {
32188 diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
32189 index bb32480..75f2f5e 100644
32190 --- a/arch/x86/mm/pageattr.c
32191 +++ b/arch/x86/mm/pageattr.c
32192 @@ -261,7 +261,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
32193 */
32194 #ifdef CONFIG_PCI_BIOS
32195 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
32196 - pgprot_val(forbidden) |= _PAGE_NX;
32197 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
32198 #endif
32199
32200 /*
32201 @@ -269,9 +269,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
32202 * Does not cover __inittext since that is gone later on. On
32203 * 64bit we do not enforce !NX on the low mapping
32204 */
32205 - if (within(address, (unsigned long)_text, (unsigned long)_etext))
32206 - pgprot_val(forbidden) |= _PAGE_NX;
32207 + if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
32208 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
32209
32210 +#ifdef CONFIG_DEBUG_RODATA
32211 /*
32212 * The .rodata section needs to be read-only. Using the pfn
32213 * catches all aliases.
32214 @@ -279,6 +280,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
32215 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
32216 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
32217 pgprot_val(forbidden) |= _PAGE_RW;
32218 +#endif
32219
32220 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
32221 /*
32222 @@ -317,6 +319,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
32223 }
32224 #endif
32225
32226 +#ifdef CONFIG_PAX_KERNEXEC
32227 + if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
32228 + pgprot_val(forbidden) |= _PAGE_RW;
32229 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
32230 + }
32231 +#endif
32232 +
32233 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
32234
32235 return prot;
32236 @@ -400,23 +409,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
32237 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
32238 {
32239 /* change init_mm */
32240 + pax_open_kernel();
32241 set_pte_atomic(kpte, pte);
32242 +
32243 #ifdef CONFIG_X86_32
32244 if (!SHARED_KERNEL_PMD) {
32245 +
32246 +#ifdef CONFIG_PAX_PER_CPU_PGD
32247 + unsigned long cpu;
32248 +#else
32249 struct page *page;
32250 +#endif
32251
32252 +#ifdef CONFIG_PAX_PER_CPU_PGD
32253 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
32254 + pgd_t *pgd = get_cpu_pgd(cpu, kernel);
32255 +#else
32256 list_for_each_entry(page, &pgd_list, lru) {
32257 - pgd_t *pgd;
32258 + pgd_t *pgd = (pgd_t *)page_address(page);
32259 +#endif
32260 +
32261 pud_t *pud;
32262 pmd_t *pmd;
32263
32264 - pgd = (pgd_t *)page_address(page) + pgd_index(address);
32265 + pgd += pgd_index(address);
32266 pud = pud_offset(pgd, address);
32267 pmd = pmd_offset(pud, address);
32268 set_pte_atomic((pte_t *)pmd, pte);
32269 }
32270 }
32271 #endif
32272 + pax_close_kernel();
32273 }
32274
32275 static int
32276 diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
32277 index 6574388..87e9bef 100644
32278 --- a/arch/x86/mm/pat.c
32279 +++ b/arch/x86/mm/pat.c
32280 @@ -376,7 +376,7 @@ int free_memtype(u64 start, u64 end)
32281
32282 if (!entry) {
32283 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
32284 - current->comm, current->pid, start, end - 1);
32285 + current->comm, task_pid_nr(current), start, end - 1);
32286 return -EINVAL;
32287 }
32288
32289 @@ -506,8 +506,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
32290
32291 while (cursor < to) {
32292 if (!devmem_is_allowed(pfn)) {
32293 - printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
32294 - current->comm, from, to - 1);
32295 + printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
32296 + current->comm, from, to - 1, cursor);
32297 return 0;
32298 }
32299 cursor += PAGE_SIZE;
32300 @@ -577,7 +577,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
32301 if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) {
32302 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
32303 "for [mem %#010Lx-%#010Lx]\n",
32304 - current->comm, current->pid,
32305 + current->comm, task_pid_nr(current),
32306 cattr_name(flags),
32307 base, (unsigned long long)(base + size-1));
32308 return -EINVAL;
32309 @@ -612,7 +612,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
32310 flags = lookup_memtype(paddr);
32311 if (want_flags != flags) {
32312 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
32313 - current->comm, current->pid,
32314 + current->comm, task_pid_nr(current),
32315 cattr_name(want_flags),
32316 (unsigned long long)paddr,
32317 (unsigned long long)(paddr + size - 1),
32318 @@ -634,7 +634,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
32319 free_memtype(paddr, paddr + size);
32320 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
32321 " for [mem %#010Lx-%#010Lx], got %s\n",
32322 - current->comm, current->pid,
32323 + current->comm, task_pid_nr(current),
32324 cattr_name(want_flags),
32325 (unsigned long long)paddr,
32326 (unsigned long long)(paddr + size - 1),
32327 diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
32328 index 415f6c4..d319983 100644
32329 --- a/arch/x86/mm/pat_rbtree.c
32330 +++ b/arch/x86/mm/pat_rbtree.c
32331 @@ -160,7 +160,7 @@ success:
32332
32333 failure:
32334 printk(KERN_INFO "%s:%d conflicting memory types "
32335 - "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
32336 + "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
32337 end, cattr_name(found_type), cattr_name(match->type));
32338 return -EBUSY;
32339 }
32340 diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
32341 index 9f0614d..92ae64a 100644
32342 --- a/arch/x86/mm/pf_in.c
32343 +++ b/arch/x86/mm/pf_in.c
32344 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
32345 int i;
32346 enum reason_type rv = OTHERS;
32347
32348 - p = (unsigned char *)ins_addr;
32349 + p = (unsigned char *)ktla_ktva(ins_addr);
32350 p += skip_prefix(p, &prf);
32351 p += get_opcode(p, &opcode);
32352
32353 @@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
32354 struct prefix_bits prf;
32355 int i;
32356
32357 - p = (unsigned char *)ins_addr;
32358 + p = (unsigned char *)ktla_ktva(ins_addr);
32359 p += skip_prefix(p, &prf);
32360 p += get_opcode(p, &opcode);
32361
32362 @@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
32363 struct prefix_bits prf;
32364 int i;
32365
32366 - p = (unsigned char *)ins_addr;
32367 + p = (unsigned char *)ktla_ktva(ins_addr);
32368 p += skip_prefix(p, &prf);
32369 p += get_opcode(p, &opcode);
32370
32371 @@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
32372 struct prefix_bits prf;
32373 int i;
32374
32375 - p = (unsigned char *)ins_addr;
32376 + p = (unsigned char *)ktla_ktva(ins_addr);
32377 p += skip_prefix(p, &prf);
32378 p += get_opcode(p, &opcode);
32379 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
32380 @@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
32381 struct prefix_bits prf;
32382 int i;
32383
32384 - p = (unsigned char *)ins_addr;
32385 + p = (unsigned char *)ktla_ktva(ins_addr);
32386 p += skip_prefix(p, &prf);
32387 p += get_opcode(p, &opcode);
32388 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
32389 diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
32390 index dfa537a..fd45c64 100644
32391 --- a/arch/x86/mm/pgtable.c
32392 +++ b/arch/x86/mm/pgtable.c
32393 @@ -91,10 +91,67 @@ static inline void pgd_list_del(pgd_t *pgd)
32394 list_del(&page->lru);
32395 }
32396
32397 -#define UNSHARED_PTRS_PER_PGD \
32398 - (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
32399 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32400 +pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
32401
32402 +void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
32403 +{
32404 + unsigned int count = USER_PGD_PTRS;
32405
32406 + if (!pax_user_shadow_base)
32407 + return;
32408 +
32409 + while (count--)
32410 + *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
32411 +}
32412 +#endif
32413 +
32414 +#ifdef CONFIG_PAX_PER_CPU_PGD
32415 +void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
32416 +{
32417 + unsigned int count = USER_PGD_PTRS;
32418 +
32419 + while (count--) {
32420 + pgd_t pgd;
32421 +
32422 +#ifdef CONFIG_X86_64
32423 + pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
32424 +#else
32425 + pgd = *src++;
32426 +#endif
32427 +
32428 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32429 + pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
32430 +#endif
32431 +
32432 + *dst++ = pgd;
32433 + }
32434 +
32435 +}
32436 +#endif
32437 +
32438 +#ifdef CONFIG_X86_64
32439 +#define pxd_t pud_t
32440 +#define pyd_t pgd_t
32441 +#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
32442 +#define pxd_free(mm, pud) pud_free((mm), (pud))
32443 +#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
32444 +#define pyd_offset(mm, address) pgd_offset((mm), (address))
32445 +#define PYD_SIZE PGDIR_SIZE
32446 +#else
32447 +#define pxd_t pmd_t
32448 +#define pyd_t pud_t
32449 +#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
32450 +#define pxd_free(mm, pud) pmd_free((mm), (pud))
32451 +#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
32452 +#define pyd_offset(mm, address) pud_offset((mm), (address))
32453 +#define PYD_SIZE PUD_SIZE
32454 +#endif
32455 +
32456 +#ifdef CONFIG_PAX_PER_CPU_PGD
32457 +static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
32458 +static inline void pgd_dtor(pgd_t *pgd) {}
32459 +#else
32460 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
32461 {
32462 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
32463 @@ -135,6 +192,7 @@ static void pgd_dtor(pgd_t *pgd)
32464 pgd_list_del(pgd);
32465 spin_unlock(&pgd_lock);
32466 }
32467 +#endif
32468
32469 /*
32470 * List of all pgd's needed for non-PAE so it can invalidate entries
32471 @@ -147,7 +205,7 @@ static void pgd_dtor(pgd_t *pgd)
32472 * -- nyc
32473 */
32474
32475 -#ifdef CONFIG_X86_PAE
32476 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
32477 /*
32478 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
32479 * updating the top-level pagetable entries to guarantee the
32480 @@ -159,7 +217,7 @@ static void pgd_dtor(pgd_t *pgd)
32481 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
32482 * and initialize the kernel pmds here.
32483 */
32484 -#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
32485 +#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
32486
32487 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
32488 {
32489 @@ -177,36 +235,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
32490 */
32491 flush_tlb_mm(mm);
32492 }
32493 +#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
32494 +#define PREALLOCATED_PXDS USER_PGD_PTRS
32495 #else /* !CONFIG_X86_PAE */
32496
32497 /* No need to prepopulate any pagetable entries in non-PAE modes. */
32498 -#define PREALLOCATED_PMDS 0
32499 +#define PREALLOCATED_PXDS 0
32500
32501 #endif /* CONFIG_X86_PAE */
32502
32503 -static void free_pmds(pmd_t *pmds[])
32504 +static void free_pxds(pxd_t *pxds[])
32505 {
32506 int i;
32507
32508 - for(i = 0; i < PREALLOCATED_PMDS; i++)
32509 - if (pmds[i])
32510 - free_page((unsigned long)pmds[i]);
32511 + for(i = 0; i < PREALLOCATED_PXDS; i++)
32512 + if (pxds[i])
32513 + free_page((unsigned long)pxds[i]);
32514 }
32515
32516 -static int preallocate_pmds(pmd_t *pmds[])
32517 +static int preallocate_pxds(pxd_t *pxds[])
32518 {
32519 int i;
32520 bool failed = false;
32521
32522 - for(i = 0; i < PREALLOCATED_PMDS; i++) {
32523 - pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
32524 - if (pmd == NULL)
32525 + for(i = 0; i < PREALLOCATED_PXDS; i++) {
32526 + pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
32527 + if (pxd == NULL)
32528 failed = true;
32529 - pmds[i] = pmd;
32530 + pxds[i] = pxd;
32531 }
32532
32533 if (failed) {
32534 - free_pmds(pmds);
32535 + free_pxds(pxds);
32536 return -ENOMEM;
32537 }
32538
32539 @@ -219,49 +279,52 @@ static int preallocate_pmds(pmd_t *pmds[])
32540 * preallocate which never got a corresponding vma will need to be
32541 * freed manually.
32542 */
32543 -static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
32544 +static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
32545 {
32546 int i;
32547
32548 - for(i = 0; i < PREALLOCATED_PMDS; i++) {
32549 + for(i = 0; i < PREALLOCATED_PXDS; i++) {
32550 pgd_t pgd = pgdp[i];
32551
32552 if (pgd_val(pgd) != 0) {
32553 - pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
32554 + pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
32555
32556 - pgdp[i] = native_make_pgd(0);
32557 + set_pgd(pgdp + i, native_make_pgd(0));
32558
32559 - paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
32560 - pmd_free(mm, pmd);
32561 + paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
32562 + pxd_free(mm, pxd);
32563 }
32564 }
32565 }
32566
32567 -static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
32568 +static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
32569 {
32570 - pud_t *pud;
32571 + pyd_t *pyd;
32572 int i;
32573
32574 - if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
32575 + if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
32576 return;
32577
32578 - pud = pud_offset(pgd, 0);
32579 -
32580 - for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
32581 - pmd_t *pmd = pmds[i];
32582 +#ifdef CONFIG_X86_64
32583 + pyd = pyd_offset(mm, 0L);
32584 +#else
32585 + pyd = pyd_offset(pgd, 0L);
32586 +#endif
32587
32588 + for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
32589 + pxd_t *pxd = pxds[i];
32590 if (i >= KERNEL_PGD_BOUNDARY)
32591 - memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
32592 - sizeof(pmd_t) * PTRS_PER_PMD);
32593 + memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
32594 + sizeof(pxd_t) * PTRS_PER_PMD);
32595
32596 - pud_populate(mm, pud, pmd);
32597 + pyd_populate(mm, pyd, pxd);
32598 }
32599 }
32600
32601 pgd_t *pgd_alloc(struct mm_struct *mm)
32602 {
32603 pgd_t *pgd;
32604 - pmd_t *pmds[PREALLOCATED_PMDS];
32605 + pxd_t *pxds[PREALLOCATED_PXDS];
32606
32607 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
32608
32609 @@ -270,11 +333,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
32610
32611 mm->pgd = pgd;
32612
32613 - if (preallocate_pmds(pmds) != 0)
32614 + if (preallocate_pxds(pxds) != 0)
32615 goto out_free_pgd;
32616
32617 if (paravirt_pgd_alloc(mm) != 0)
32618 - goto out_free_pmds;
32619 + goto out_free_pxds;
32620
32621 /*
32622 * Make sure that pre-populating the pmds is atomic with
32623 @@ -284,14 +347,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
32624 spin_lock(&pgd_lock);
32625
32626 pgd_ctor(mm, pgd);
32627 - pgd_prepopulate_pmd(mm, pgd, pmds);
32628 + pgd_prepopulate_pxd(mm, pgd, pxds);
32629
32630 spin_unlock(&pgd_lock);
32631
32632 return pgd;
32633
32634 -out_free_pmds:
32635 - free_pmds(pmds);
32636 +out_free_pxds:
32637 + free_pxds(pxds);
32638 out_free_pgd:
32639 free_page((unsigned long)pgd);
32640 out:
32641 @@ -300,7 +363,7 @@ out:
32642
32643 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
32644 {
32645 - pgd_mop_up_pmds(mm, pgd);
32646 + pgd_mop_up_pxds(mm, pgd);
32647 pgd_dtor(pgd);
32648 paravirt_pgd_free(mm, pgd);
32649 free_page((unsigned long)pgd);
32650 diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
32651 index a69bcb8..19068ab 100644
32652 --- a/arch/x86/mm/pgtable_32.c
32653 +++ b/arch/x86/mm/pgtable_32.c
32654 @@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
32655 return;
32656 }
32657 pte = pte_offset_kernel(pmd, vaddr);
32658 +
32659 + pax_open_kernel();
32660 if (pte_val(pteval))
32661 set_pte_at(&init_mm, vaddr, pte, pteval);
32662 else
32663 pte_clear(&init_mm, vaddr, pte);
32664 + pax_close_kernel();
32665
32666 /*
32667 * It's enough to flush this one mapping.
32668 diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
32669 index e666cbb..61788c45 100644
32670 --- a/arch/x86/mm/physaddr.c
32671 +++ b/arch/x86/mm/physaddr.c
32672 @@ -10,7 +10,7 @@
32673 #ifdef CONFIG_X86_64
32674
32675 #ifdef CONFIG_DEBUG_VIRTUAL
32676 -unsigned long __phys_addr(unsigned long x)
32677 +unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
32678 {
32679 unsigned long y = x - __START_KERNEL_map;
32680
32681 @@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
32682 #else
32683
32684 #ifdef CONFIG_DEBUG_VIRTUAL
32685 -unsigned long __phys_addr(unsigned long x)
32686 +unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
32687 {
32688 unsigned long phys_addr = x - PAGE_OFFSET;
32689 /* VMALLOC_* aren't constants */
32690 diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
32691 index 90555bf..f5f1828 100644
32692 --- a/arch/x86/mm/setup_nx.c
32693 +++ b/arch/x86/mm/setup_nx.c
32694 @@ -5,8 +5,10 @@
32695 #include <asm/pgtable.h>
32696 #include <asm/proto.h>
32697
32698 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
32699 static int disable_nx;
32700
32701 +#ifndef CONFIG_PAX_PAGEEXEC
32702 /*
32703 * noexec = on|off
32704 *
32705 @@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
32706 return 0;
32707 }
32708 early_param("noexec", noexec_setup);
32709 +#endif
32710 +
32711 +#endif
32712
32713 void x86_configure_nx(void)
32714 {
32715 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
32716 if (cpu_has_nx && !disable_nx)
32717 __supported_pte_mask |= _PAGE_NX;
32718 else
32719 +#endif
32720 __supported_pte_mask &= ~_PAGE_NX;
32721 }
32722
32723 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
32724 index ae699b3..f1b2ad2 100644
32725 --- a/arch/x86/mm/tlb.c
32726 +++ b/arch/x86/mm/tlb.c
32727 @@ -48,7 +48,11 @@ void leave_mm(int cpu)
32728 BUG();
32729 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
32730 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
32731 +
32732 +#ifndef CONFIG_PAX_PER_CPU_PGD
32733 load_cr3(swapper_pg_dir);
32734 +#endif
32735 +
32736 }
32737 }
32738 EXPORT_SYMBOL_GPL(leave_mm);
32739 diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
32740 new file mode 100644
32741 index 0000000..dace51c
32742 --- /dev/null
32743 +++ b/arch/x86/mm/uderef_64.c
32744 @@ -0,0 +1,37 @@
32745 +#include <linux/mm.h>
32746 +#include <asm/pgtable.h>
32747 +#include <asm/uaccess.h>
32748 +
32749 +#ifdef CONFIG_PAX_MEMORY_UDEREF
32750 +/* PaX: due to the special call convention these functions must
32751 + * - remain leaf functions under all configurations,
32752 + * - never be called directly, only dereferenced from the wrappers.
32753 + */
32754 +void __pax_open_userland(void)
32755 +{
32756 + unsigned int cpu;
32757 +
32758 + if (unlikely(!segment_eq(get_fs(), USER_DS)))
32759 + return;
32760 +
32761 + cpu = raw_get_cpu();
32762 + BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
32763 + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
32764 + raw_put_cpu_no_resched();
32765 +}
32766 +EXPORT_SYMBOL(__pax_open_userland);
32767 +
32768 +void __pax_close_userland(void)
32769 +{
32770 + unsigned int cpu;
32771 +
32772 + if (unlikely(!segment_eq(get_fs(), USER_DS)))
32773 + return;
32774 +
32775 + cpu = raw_get_cpu();
32776 + BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
32777 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
32778 + raw_put_cpu_no_resched();
32779 +}
32780 +EXPORT_SYMBOL(__pax_close_userland);
32781 +#endif
32782 diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
32783 index 877b9a1..a8ecf42 100644
32784 --- a/arch/x86/net/bpf_jit.S
32785 +++ b/arch/x86/net/bpf_jit.S
32786 @@ -9,6 +9,7 @@
32787 */
32788 #include <linux/linkage.h>
32789 #include <asm/dwarf2.h>
32790 +#include <asm/alternative-asm.h>
32791
32792 /*
32793 * Calling convention :
32794 @@ -35,6 +36,7 @@ sk_load_word_positive_offset:
32795 jle bpf_slow_path_word
32796 mov (SKBDATA,%rsi),%eax
32797 bswap %eax /* ntohl() */
32798 + pax_force_retaddr
32799 ret
32800
32801 sk_load_half:
32802 @@ -52,6 +54,7 @@ sk_load_half_positive_offset:
32803 jle bpf_slow_path_half
32804 movzwl (SKBDATA,%rsi),%eax
32805 rol $8,%ax # ntohs()
32806 + pax_force_retaddr
32807 ret
32808
32809 sk_load_byte:
32810 @@ -66,6 +69,7 @@ sk_load_byte_positive_offset:
32811 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
32812 jle bpf_slow_path_byte
32813 movzbl (SKBDATA,%rsi),%eax
32814 + pax_force_retaddr
32815 ret
32816
32817 /**
32818 @@ -87,6 +91,7 @@ sk_load_byte_msh_positive_offset:
32819 movzbl (SKBDATA,%rsi),%ebx
32820 and $15,%bl
32821 shl $2,%bl
32822 + pax_force_retaddr
32823 ret
32824
32825 /* rsi contains offset and can be scratched */
32826 @@ -109,6 +114,7 @@ bpf_slow_path_word:
32827 js bpf_error
32828 mov -12(%rbp),%eax
32829 bswap %eax
32830 + pax_force_retaddr
32831 ret
32832
32833 bpf_slow_path_half:
32834 @@ -117,12 +123,14 @@ bpf_slow_path_half:
32835 mov -12(%rbp),%ax
32836 rol $8,%ax
32837 movzwl %ax,%eax
32838 + pax_force_retaddr
32839 ret
32840
32841 bpf_slow_path_byte:
32842 bpf_slow_path_common(1)
32843 js bpf_error
32844 movzbl -12(%rbp),%eax
32845 + pax_force_retaddr
32846 ret
32847
32848 bpf_slow_path_byte_msh:
32849 @@ -133,6 +141,7 @@ bpf_slow_path_byte_msh:
32850 and $15,%al
32851 shl $2,%al
32852 xchg %eax,%ebx
32853 + pax_force_retaddr
32854 ret
32855
32856 #define sk_negative_common(SIZE) \
32857 @@ -157,6 +166,7 @@ sk_load_word_negative_offset:
32858 sk_negative_common(4)
32859 mov (%rax), %eax
32860 bswap %eax
32861 + pax_force_retaddr
32862 ret
32863
32864 bpf_slow_path_half_neg:
32865 @@ -168,6 +178,7 @@ sk_load_half_negative_offset:
32866 mov (%rax),%ax
32867 rol $8,%ax
32868 movzwl %ax,%eax
32869 + pax_force_retaddr
32870 ret
32871
32872 bpf_slow_path_byte_neg:
32873 @@ -177,6 +188,7 @@ sk_load_byte_negative_offset:
32874 .globl sk_load_byte_negative_offset
32875 sk_negative_common(1)
32876 movzbl (%rax), %eax
32877 + pax_force_retaddr
32878 ret
32879
32880 bpf_slow_path_byte_msh_neg:
32881 @@ -190,6 +202,7 @@ sk_load_byte_msh_negative_offset:
32882 and $15,%al
32883 shl $2,%al
32884 xchg %eax,%ebx
32885 + pax_force_retaddr
32886 ret
32887
32888 bpf_error:
32889 @@ -197,4 +210,5 @@ bpf_error:
32890 xor %eax,%eax
32891 mov -8(%rbp),%rbx
32892 leaveq
32893 + pax_force_retaddr
32894 ret
32895 diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
32896 index 26328e8..5f96c25 100644
32897 --- a/arch/x86/net/bpf_jit_comp.c
32898 +++ b/arch/x86/net/bpf_jit_comp.c
32899 @@ -50,13 +50,90 @@ static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)
32900 return ptr + len;
32901 }
32902
32903 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
32904 +#define MAX_INSTR_CODE_SIZE 96
32905 +#else
32906 +#define MAX_INSTR_CODE_SIZE 64
32907 +#endif
32908 +
32909 #define EMIT(bytes, len) do { prog = emit_code(prog, bytes, len); } while (0)
32910
32911 #define EMIT1(b1) EMIT(b1, 1)
32912 #define EMIT2(b1, b2) EMIT((b1) + ((b2) << 8), 2)
32913 #define EMIT3(b1, b2, b3) EMIT((b1) + ((b2) << 8) + ((b3) << 16), 3)
32914 #define EMIT4(b1, b2, b3, b4) EMIT((b1) + ((b2) << 8) + ((b3) << 16) + ((b4) << 24), 4)
32915 +
32916 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
32917 +/* original constant will appear in ecx */
32918 +#define DILUTE_CONST_SEQUENCE(_off, _key) \
32919 +do { \
32920 + /* mov ecx, randkey */ \
32921 + EMIT1(0xb9); \
32922 + EMIT(_key, 4); \
32923 + /* xor ecx, randkey ^ off */ \
32924 + EMIT2(0x81, 0xf1); \
32925 + EMIT((_key) ^ (_off), 4); \
32926 +} while (0)
32927 +
32928 +#define EMIT1_off32(b1, _off) \
32929 +do { \
32930 + switch (b1) { \
32931 + case 0x05: /* add eax, imm32 */ \
32932 + case 0x2d: /* sub eax, imm32 */ \
32933 + case 0x25: /* and eax, imm32 */ \
32934 + case 0x0d: /* or eax, imm32 */ \
32935 + case 0xb8: /* mov eax, imm32 */ \
32936 + case 0x35: /* xor eax, imm32 */ \
32937 + case 0x3d: /* cmp eax, imm32 */ \
32938 + case 0xa9: /* test eax, imm32 */ \
32939 + DILUTE_CONST_SEQUENCE(_off, randkey); \
32940 + EMIT2((b1) - 4, 0xc8); /* convert imm instruction to eax, ecx */\
32941 + break; \
32942 + case 0xbb: /* mov ebx, imm32 */ \
32943 + DILUTE_CONST_SEQUENCE(_off, randkey); \
32944 + /* mov ebx, ecx */ \
32945 + EMIT2(0x89, 0xcb); \
32946 + break; \
32947 + case 0xbe: /* mov esi, imm32 */ \
32948 + DILUTE_CONST_SEQUENCE(_off, randkey); \
32949 + /* mov esi, ecx */ \
32950 + EMIT2(0x89, 0xce); \
32951 + break; \
32952 + case 0xe8: /* call rel imm32, always to known funcs */ \
32953 + EMIT1(b1); \
32954 + EMIT(_off, 4); \
32955 + break; \
32956 + case 0xe9: /* jmp rel imm32 */ \
32957 + EMIT1(b1); \
32958 + EMIT(_off, 4); \
32959 + /* prevent fall-through, we're not called if off = 0 */ \
32960 + EMIT(0xcccccccc, 4); \
32961 + EMIT(0xcccccccc, 4); \
32962 + break; \
32963 + default: \
32964 + BUILD_BUG(); \
32965 + } \
32966 +} while (0)
32967 +
32968 +#define EMIT2_off32(b1, b2, _off) \
32969 +do { \
32970 + if ((b1) == 0x8d && (b2) == 0xb3) { /* lea esi, [rbx+imm32] */ \
32971 + EMIT2(0x8d, 0xb3); /* lea esi, [rbx+randkey] */ \
32972 + EMIT(randkey, 4); \
32973 + EMIT2(0x8d, 0xb6); /* lea esi, [esi+off-randkey] */ \
32974 + EMIT((_off) - randkey, 4); \
32975 + } else if ((b1) == 0x69 && (b2) == 0xc0) { /* imul eax, imm32 */\
32976 + DILUTE_CONST_SEQUENCE(_off, randkey); \
32977 + /* imul eax, ecx */ \
32978 + EMIT3(0x0f, 0xaf, 0xc1); \
32979 + } else { \
32980 + BUILD_BUG(); \
32981 + } \
32982 +} while (0)
32983 +#else
32984 #define EMIT1_off32(b1, off) do { EMIT1(b1); EMIT(off, 4);} while (0)
32985 +#define EMIT2_off32(b1, b2, off) do { EMIT2(b1, b2); EMIT(off, 4);} while (0)
32986 +#endif
32987
32988 #define CLEAR_A() EMIT2(0x31, 0xc0) /* xor %eax,%eax */
32989 #define CLEAR_X() EMIT2(0x31, 0xdb) /* xor %ebx,%ebx */
32990 @@ -91,6 +168,24 @@ do { \
32991 #define X86_JBE 0x76
32992 #define X86_JA 0x77
32993
32994 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
32995 +#define APPEND_FLOW_VERIFY() \
32996 +do { \
32997 + /* mov ecx, randkey */ \
32998 + EMIT1(0xb9); \
32999 + EMIT(randkey, 4); \
33000 + /* cmp ecx, randkey */ \
33001 + EMIT2(0x81, 0xf9); \
33002 + EMIT(randkey, 4); \
33003 + /* jz after 8 int 3s */ \
33004 + EMIT2(0x74, 0x08); \
33005 + EMIT(0xcccccccc, 4); \
33006 + EMIT(0xcccccccc, 4); \
33007 +} while (0)
33008 +#else
33009 +#define APPEND_FLOW_VERIFY() do { } while (0)
33010 +#endif
33011 +
33012 #define EMIT_COND_JMP(op, offset) \
33013 do { \
33014 if (is_near(offset)) \
33015 @@ -98,6 +193,7 @@ do { \
33016 else { \
33017 EMIT2(0x0f, op + 0x10); \
33018 EMIT(offset, 4); /* jxx .+off32 */ \
33019 + APPEND_FLOW_VERIFY(); \
33020 } \
33021 } while (0)
33022
33023 @@ -145,55 +241,54 @@ static int pkt_type_offset(void)
33024 return -1;
33025 }
33026
33027 -struct bpf_binary_header {
33028 - unsigned int pages;
33029 - /* Note : for security reasons, bpf code will follow a randomly
33030 - * sized amount of int3 instructions
33031 - */
33032 - u8 image[];
33033 -};
33034 -
33035 -static struct bpf_binary_header *bpf_alloc_binary(unsigned int proglen,
33036 +/* Note : for security reasons, bpf code will follow a randomly
33037 + * sized amount of int3 instructions
33038 + */
33039 +static u8 *bpf_alloc_binary(unsigned int proglen,
33040 u8 **image_ptr)
33041 {
33042 unsigned int sz, hole;
33043 - struct bpf_binary_header *header;
33044 + u8 *header;
33045
33046 /* Most of BPF filters are really small,
33047 * but if some of them fill a page, allow at least
33048 * 128 extra bytes to insert a random section of int3
33049 */
33050 - sz = round_up(proglen + sizeof(*header) + 128, PAGE_SIZE);
33051 - header = module_alloc(sz);
33052 + sz = round_up(proglen + 128, PAGE_SIZE);
33053 + header = module_alloc_exec(sz);
33054 if (!header)
33055 return NULL;
33056
33057 + pax_open_kernel();
33058 memset(header, 0xcc, sz); /* fill whole space with int3 instructions */
33059 + pax_close_kernel();
33060
33061 - header->pages = sz / PAGE_SIZE;
33062 - hole = sz - (proglen + sizeof(*header));
33063 + hole = PAGE_SIZE - (proglen & ~PAGE_MASK);
33064
33065 /* insert a random number of int3 instructions before BPF code */
33066 - *image_ptr = &header->image[prandom_u32() % hole];
33067 + *image_ptr = &header[prandom_u32() % hole];
33068 return header;
33069 }
33070
33071 void bpf_jit_compile(struct sk_filter *fp)
33072 {
33073 - u8 temp[64];
33074 + u8 temp[MAX_INSTR_CODE_SIZE];
33075 u8 *prog;
33076 unsigned int proglen, oldproglen = 0;
33077 int ilen, i;
33078 int t_offset, f_offset;
33079 u8 t_op, f_op, seen = 0, pass;
33080 u8 *image = NULL;
33081 - struct bpf_binary_header *header = NULL;
33082 + u8 *header = NULL;
33083 u8 *func;
33084 int pc_ret0 = -1; /* bpf index of first RET #0 instruction (if any) */
33085 unsigned int cleanup_addr; /* epilogue code offset */
33086 unsigned int *addrs;
33087 const struct sock_filter *filter = fp->insns;
33088 int flen = fp->len;
33089 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33090 + unsigned int randkey;
33091 +#endif
33092
33093 if (!bpf_jit_enable)
33094 return;
33095 @@ -202,11 +297,15 @@ void bpf_jit_compile(struct sk_filter *fp)
33096 if (addrs == NULL)
33097 return;
33098
33099 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33100 + randkey = get_random_int();
33101 +#endif
33102 +
33103 /* Before first pass, make a rough estimation of addrs[]
33104 - * each bpf instruction is translated to less than 64 bytes
33105 + * each bpf instruction is translated to less than MAX_INSTR_CODE_SIZE bytes
33106 */
33107 for (proglen = 0, i = 0; i < flen; i++) {
33108 - proglen += 64;
33109 + proglen += MAX_INSTR_CODE_SIZE;
33110 addrs[i] = proglen;
33111 }
33112 cleanup_addr = proglen; /* epilogue address */
33113 @@ -317,10 +416,8 @@ void bpf_jit_compile(struct sk_filter *fp)
33114 case BPF_S_ALU_MUL_K: /* A *= K */
33115 if (is_imm8(K))
33116 EMIT3(0x6b, 0xc0, K); /* imul imm8,%eax,%eax */
33117 - else {
33118 - EMIT2(0x69, 0xc0); /* imul imm32,%eax */
33119 - EMIT(K, 4);
33120 - }
33121 + else
33122 + EMIT2_off32(0x69, 0xc0, K); /* imul imm32,%eax */
33123 break;
33124 case BPF_S_ALU_DIV_X: /* A /= X; */
33125 seen |= SEEN_XREG;
33126 @@ -360,13 +457,23 @@ void bpf_jit_compile(struct sk_filter *fp)
33127 break;
33128 case BPF_S_ALU_MOD_K: /* A %= K; */
33129 EMIT2(0x31, 0xd2); /* xor %edx,%edx */
33130 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33131 + DILUTE_CONST_SEQUENCE(K, randkey);
33132 +#else
33133 EMIT1(0xb9);EMIT(K, 4); /* mov imm32,%ecx */
33134 +#endif
33135 EMIT2(0xf7, 0xf1); /* div %ecx */
33136 EMIT2(0x89, 0xd0); /* mov %edx,%eax */
33137 break;
33138 case BPF_S_ALU_DIV_K: /* A = reciprocal_divide(A, K); */
33139 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33140 + DILUTE_CONST_SEQUENCE(K, randkey);
33141 + // imul rax, rcx
33142 + EMIT4(0x48, 0x0f, 0xaf, 0xc1);
33143 +#else
33144 EMIT3(0x48, 0x69, 0xc0); /* imul imm32,%rax,%rax */
33145 EMIT(K, 4);
33146 +#endif
33147 EMIT4(0x48, 0xc1, 0xe8, 0x20); /* shr $0x20,%rax */
33148 break;
33149 case BPF_S_ALU_AND_X:
33150 @@ -637,8 +744,7 @@ common_load_ind: seen |= SEEN_DATAREF | SEEN_XREG;
33151 if (is_imm8(K)) {
33152 EMIT3(0x8d, 0x73, K); /* lea imm8(%rbx), %esi */
33153 } else {
33154 - EMIT2(0x8d, 0xb3); /* lea imm32(%rbx),%esi */
33155 - EMIT(K, 4);
33156 + EMIT2_off32(0x8d, 0xb3, K); /* lea imm32(%rbx),%esi */
33157 }
33158 } else {
33159 EMIT2(0x89,0xde); /* mov %ebx,%esi */
33160 @@ -728,10 +834,12 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
33161 if (unlikely(proglen + ilen > oldproglen)) {
33162 pr_err("bpb_jit_compile fatal error\n");
33163 kfree(addrs);
33164 - module_free(NULL, header);
33165 + module_free_exec(NULL, image);
33166 return;
33167 }
33168 + pax_open_kernel();
33169 memcpy(image + proglen, temp, ilen);
33170 + pax_close_kernel();
33171 }
33172 proglen += ilen;
33173 addrs[i] = proglen;
33174 @@ -764,7 +872,6 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
33175
33176 if (image) {
33177 bpf_flush_icache(header, image + proglen);
33178 - set_memory_ro((unsigned long)header, header->pages);
33179 fp->bpf_func = (void *)image;
33180 }
33181 out:
33182 @@ -776,10 +883,9 @@ static void bpf_jit_free_deferred(struct work_struct *work)
33183 {
33184 struct sk_filter *fp = container_of(work, struct sk_filter, work);
33185 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
33186 - struct bpf_binary_header *header = (void *)addr;
33187
33188 - set_memory_rw(addr, header->pages);
33189 - module_free(NULL, header);
33190 + set_memory_rw(addr, 1);
33191 + module_free_exec(NULL, (void *)addr);
33192 kfree(fp);
33193 }
33194
33195 diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
33196 index d6aa6e8..266395a 100644
33197 --- a/arch/x86/oprofile/backtrace.c
33198 +++ b/arch/x86/oprofile/backtrace.c
33199 @@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
33200 struct stack_frame_ia32 *fp;
33201 unsigned long bytes;
33202
33203 - bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
33204 + bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
33205 if (bytes != sizeof(bufhead))
33206 return NULL;
33207
33208 - fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
33209 + fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
33210
33211 oprofile_add_trace(bufhead[0].return_address);
33212
33213 @@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
33214 struct stack_frame bufhead[2];
33215 unsigned long bytes;
33216
33217 - bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
33218 + bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
33219 if (bytes != sizeof(bufhead))
33220 return NULL;
33221
33222 @@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
33223 {
33224 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
33225
33226 - if (!user_mode_vm(regs)) {
33227 + if (!user_mode(regs)) {
33228 unsigned long stack = kernel_stack_pointer(regs);
33229 if (depth)
33230 dump_trace(NULL, regs, (unsigned long *)stack, 0,
33231 diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
33232 index 6890d84..1dad1f1 100644
33233 --- a/arch/x86/oprofile/nmi_int.c
33234 +++ b/arch/x86/oprofile/nmi_int.c
33235 @@ -23,6 +23,7 @@
33236 #include <asm/nmi.h>
33237 #include <asm/msr.h>
33238 #include <asm/apic.h>
33239 +#include <asm/pgtable.h>
33240
33241 #include "op_counter.h"
33242 #include "op_x86_model.h"
33243 @@ -774,8 +775,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
33244 if (ret)
33245 return ret;
33246
33247 - if (!model->num_virt_counters)
33248 - model->num_virt_counters = model->num_counters;
33249 + if (!model->num_virt_counters) {
33250 + pax_open_kernel();
33251 + *(unsigned int *)&model->num_virt_counters = model->num_counters;
33252 + pax_close_kernel();
33253 + }
33254
33255 mux_init(ops);
33256
33257 diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
33258 index 50d86c0..7985318 100644
33259 --- a/arch/x86/oprofile/op_model_amd.c
33260 +++ b/arch/x86/oprofile/op_model_amd.c
33261 @@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
33262 num_counters = AMD64_NUM_COUNTERS;
33263 }
33264
33265 - op_amd_spec.num_counters = num_counters;
33266 - op_amd_spec.num_controls = num_counters;
33267 - op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
33268 + pax_open_kernel();
33269 + *(unsigned int *)&op_amd_spec.num_counters = num_counters;
33270 + *(unsigned int *)&op_amd_spec.num_controls = num_counters;
33271 + *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
33272 + pax_close_kernel();
33273
33274 return 0;
33275 }
33276 diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
33277 index d90528e..0127e2b 100644
33278 --- a/arch/x86/oprofile/op_model_ppro.c
33279 +++ b/arch/x86/oprofile/op_model_ppro.c
33280 @@ -19,6 +19,7 @@
33281 #include <asm/msr.h>
33282 #include <asm/apic.h>
33283 #include <asm/nmi.h>
33284 +#include <asm/pgtable.h>
33285
33286 #include "op_x86_model.h"
33287 #include "op_counter.h"
33288 @@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
33289
33290 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
33291
33292 - op_arch_perfmon_spec.num_counters = num_counters;
33293 - op_arch_perfmon_spec.num_controls = num_counters;
33294 + pax_open_kernel();
33295 + *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
33296 + *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
33297 + pax_close_kernel();
33298 }
33299
33300 static int arch_perfmon_init(struct oprofile_operations *ignore)
33301 diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
33302 index 71e8a67..6a313bb 100644
33303 --- a/arch/x86/oprofile/op_x86_model.h
33304 +++ b/arch/x86/oprofile/op_x86_model.h
33305 @@ -52,7 +52,7 @@ struct op_x86_model_spec {
33306 void (*switch_ctrl)(struct op_x86_model_spec const *model,
33307 struct op_msrs const * const msrs);
33308 #endif
33309 -};
33310 +} __do_const;
33311
33312 struct op_counter_config;
33313
33314 diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
33315 index 372e9b8..e775a6c 100644
33316 --- a/arch/x86/pci/irq.c
33317 +++ b/arch/x86/pci/irq.c
33318 @@ -50,7 +50,7 @@ struct irq_router {
33319 struct irq_router_handler {
33320 u16 vendor;
33321 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
33322 -};
33323 +} __do_const;
33324
33325 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
33326 void (*pcibios_disable_irq)(struct pci_dev *dev) = NULL;
33327 @@ -794,7 +794,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
33328 return 0;
33329 }
33330
33331 -static __initdata struct irq_router_handler pirq_routers[] = {
33332 +static __initconst const struct irq_router_handler pirq_routers[] = {
33333 { PCI_VENDOR_ID_INTEL, intel_router_probe },
33334 { PCI_VENDOR_ID_AL, ali_router_probe },
33335 { PCI_VENDOR_ID_ITE, ite_router_probe },
33336 @@ -821,7 +821,7 @@ static struct pci_dev *pirq_router_dev;
33337 static void __init pirq_find_router(struct irq_router *r)
33338 {
33339 struct irq_routing_table *rt = pirq_table;
33340 - struct irq_router_handler *h;
33341 + const struct irq_router_handler *h;
33342
33343 #ifdef CONFIG_PCI_BIOS
33344 if (!rt->signature) {
33345 @@ -1094,7 +1094,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
33346 return 0;
33347 }
33348
33349 -static struct dmi_system_id __initdata pciirq_dmi_table[] = {
33350 +static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
33351 {
33352 .callback = fix_broken_hp_bios_irq9,
33353 .ident = "HP Pavilion N5400 Series Laptop",
33354 diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c
33355 index 903fded..94b0d88 100644
33356 --- a/arch/x86/pci/mrst.c
33357 +++ b/arch/x86/pci/mrst.c
33358 @@ -241,7 +241,9 @@ int __init pci_mrst_init(void)
33359 pr_info("Intel MID platform detected, using MID PCI ops\n");
33360 pci_mmcfg_late_init();
33361 pcibios_enable_irq = mrst_pci_irq_enable;
33362 - pci_root_ops = pci_mrst_ops;
33363 + pax_open_kernel();
33364 + memcpy((void *)&pci_root_ops, &pci_mrst_ops, sizeof(pci_mrst_ops));
33365 + pax_close_kernel();
33366 pci_soc_mode = 1;
33367 /* Continue with standard init */
33368 return 1;
33369 diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
33370 index c77b24a..c979855 100644
33371 --- a/arch/x86/pci/pcbios.c
33372 +++ b/arch/x86/pci/pcbios.c
33373 @@ -79,7 +79,7 @@ union bios32 {
33374 static struct {
33375 unsigned long address;
33376 unsigned short segment;
33377 -} bios32_indirect = { 0, __KERNEL_CS };
33378 +} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
33379
33380 /*
33381 * Returns the entry point for the given service, NULL on error
33382 @@ -92,37 +92,80 @@ static unsigned long bios32_service(unsigned long service)
33383 unsigned long length; /* %ecx */
33384 unsigned long entry; /* %edx */
33385 unsigned long flags;
33386 + struct desc_struct d, *gdt;
33387
33388 local_irq_save(flags);
33389 - __asm__("lcall *(%%edi); cld"
33390 +
33391 + gdt = get_cpu_gdt_table(smp_processor_id());
33392 +
33393 + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
33394 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
33395 + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
33396 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
33397 +
33398 + __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
33399 : "=a" (return_code),
33400 "=b" (address),
33401 "=c" (length),
33402 "=d" (entry)
33403 : "0" (service),
33404 "1" (0),
33405 - "D" (&bios32_indirect));
33406 + "D" (&bios32_indirect),
33407 + "r"(__PCIBIOS_DS)
33408 + : "memory");
33409 +
33410 + pax_open_kernel();
33411 + gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
33412 + gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
33413 + gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
33414 + gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
33415 + pax_close_kernel();
33416 +
33417 local_irq_restore(flags);
33418
33419 switch (return_code) {
33420 - case 0:
33421 - return address + entry;
33422 - case 0x80: /* Not present */
33423 - printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
33424 - return 0;
33425 - default: /* Shouldn't happen */
33426 - printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
33427 - service, return_code);
33428 + case 0: {
33429 + int cpu;
33430 + unsigned char flags;
33431 +
33432 + printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
33433 + if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
33434 + printk(KERN_WARNING "bios32_service: not valid\n");
33435 return 0;
33436 + }
33437 + address = address + PAGE_OFFSET;
33438 + length += 16UL; /* some BIOSs underreport this... */
33439 + flags = 4;
33440 + if (length >= 64*1024*1024) {
33441 + length >>= PAGE_SHIFT;
33442 + flags |= 8;
33443 + }
33444 +
33445 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
33446 + gdt = get_cpu_gdt_table(cpu);
33447 + pack_descriptor(&d, address, length, 0x9b, flags);
33448 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
33449 + pack_descriptor(&d, address, length, 0x93, flags);
33450 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
33451 + }
33452 + return entry;
33453 + }
33454 + case 0x80: /* Not present */
33455 + printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
33456 + return 0;
33457 + default: /* Shouldn't happen */
33458 + printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
33459 + service, return_code);
33460 + return 0;
33461 }
33462 }
33463
33464 static struct {
33465 unsigned long address;
33466 unsigned short segment;
33467 -} pci_indirect = { 0, __KERNEL_CS };
33468 +} pci_indirect __read_only = { 0, __PCIBIOS_CS };
33469
33470 -static int pci_bios_present;
33471 +static int pci_bios_present __read_only;
33472
33473 static int check_pcibios(void)
33474 {
33475 @@ -131,11 +174,13 @@ static int check_pcibios(void)
33476 unsigned long flags, pcibios_entry;
33477
33478 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
33479 - pci_indirect.address = pcibios_entry + PAGE_OFFSET;
33480 + pci_indirect.address = pcibios_entry;
33481
33482 local_irq_save(flags);
33483 - __asm__(
33484 - "lcall *(%%edi); cld\n\t"
33485 + __asm__("movw %w6, %%ds\n\t"
33486 + "lcall *%%ss:(%%edi); cld\n\t"
33487 + "push %%ss\n\t"
33488 + "pop %%ds\n\t"
33489 "jc 1f\n\t"
33490 "xor %%ah, %%ah\n"
33491 "1:"
33492 @@ -144,7 +189,8 @@ static int check_pcibios(void)
33493 "=b" (ebx),
33494 "=c" (ecx)
33495 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
33496 - "D" (&pci_indirect)
33497 + "D" (&pci_indirect),
33498 + "r" (__PCIBIOS_DS)
33499 : "memory");
33500 local_irq_restore(flags);
33501
33502 @@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
33503
33504 switch (len) {
33505 case 1:
33506 - __asm__("lcall *(%%esi); cld\n\t"
33507 + __asm__("movw %w6, %%ds\n\t"
33508 + "lcall *%%ss:(%%esi); cld\n\t"
33509 + "push %%ss\n\t"
33510 + "pop %%ds\n\t"
33511 "jc 1f\n\t"
33512 "xor %%ah, %%ah\n"
33513 "1:"
33514 @@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
33515 : "1" (PCIBIOS_READ_CONFIG_BYTE),
33516 "b" (bx),
33517 "D" ((long)reg),
33518 - "S" (&pci_indirect));
33519 + "S" (&pci_indirect),
33520 + "r" (__PCIBIOS_DS));
33521 /*
33522 * Zero-extend the result beyond 8 bits, do not trust the
33523 * BIOS having done it:
33524 @@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
33525 *value &= 0xff;
33526 break;
33527 case 2:
33528 - __asm__("lcall *(%%esi); cld\n\t"
33529 + __asm__("movw %w6, %%ds\n\t"
33530 + "lcall *%%ss:(%%esi); cld\n\t"
33531 + "push %%ss\n\t"
33532 + "pop %%ds\n\t"
33533 "jc 1f\n\t"
33534 "xor %%ah, %%ah\n"
33535 "1:"
33536 @@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
33537 : "1" (PCIBIOS_READ_CONFIG_WORD),
33538 "b" (bx),
33539 "D" ((long)reg),
33540 - "S" (&pci_indirect));
33541 + "S" (&pci_indirect),
33542 + "r" (__PCIBIOS_DS));
33543 /*
33544 * Zero-extend the result beyond 16 bits, do not trust the
33545 * BIOS having done it:
33546 @@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
33547 *value &= 0xffff;
33548 break;
33549 case 4:
33550 - __asm__("lcall *(%%esi); cld\n\t"
33551 + __asm__("movw %w6, %%ds\n\t"
33552 + "lcall *%%ss:(%%esi); cld\n\t"
33553 + "push %%ss\n\t"
33554 + "pop %%ds\n\t"
33555 "jc 1f\n\t"
33556 "xor %%ah, %%ah\n"
33557 "1:"
33558 @@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
33559 : "1" (PCIBIOS_READ_CONFIG_DWORD),
33560 "b" (bx),
33561 "D" ((long)reg),
33562 - "S" (&pci_indirect));
33563 + "S" (&pci_indirect),
33564 + "r" (__PCIBIOS_DS));
33565 break;
33566 }
33567
33568 @@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
33569
33570 switch (len) {
33571 case 1:
33572 - __asm__("lcall *(%%esi); cld\n\t"
33573 + __asm__("movw %w6, %%ds\n\t"
33574 + "lcall *%%ss:(%%esi); cld\n\t"
33575 + "push %%ss\n\t"
33576 + "pop %%ds\n\t"
33577 "jc 1f\n\t"
33578 "xor %%ah, %%ah\n"
33579 "1:"
33580 @@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
33581 "c" (value),
33582 "b" (bx),
33583 "D" ((long)reg),
33584 - "S" (&pci_indirect));
33585 + "S" (&pci_indirect),
33586 + "r" (__PCIBIOS_DS));
33587 break;
33588 case 2:
33589 - __asm__("lcall *(%%esi); cld\n\t"
33590 + __asm__("movw %w6, %%ds\n\t"
33591 + "lcall *%%ss:(%%esi); cld\n\t"
33592 + "push %%ss\n\t"
33593 + "pop %%ds\n\t"
33594 "jc 1f\n\t"
33595 "xor %%ah, %%ah\n"
33596 "1:"
33597 @@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
33598 "c" (value),
33599 "b" (bx),
33600 "D" ((long)reg),
33601 - "S" (&pci_indirect));
33602 + "S" (&pci_indirect),
33603 + "r" (__PCIBIOS_DS));
33604 break;
33605 case 4:
33606 - __asm__("lcall *(%%esi); cld\n\t"
33607 + __asm__("movw %w6, %%ds\n\t"
33608 + "lcall *%%ss:(%%esi); cld\n\t"
33609 + "push %%ss\n\t"
33610 + "pop %%ds\n\t"
33611 "jc 1f\n\t"
33612 "xor %%ah, %%ah\n"
33613 "1:"
33614 @@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
33615 "c" (value),
33616 "b" (bx),
33617 "D" ((long)reg),
33618 - "S" (&pci_indirect));
33619 + "S" (&pci_indirect),
33620 + "r" (__PCIBIOS_DS));
33621 break;
33622 }
33623
33624 @@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
33625
33626 DBG("PCI: Fetching IRQ routing table... ");
33627 __asm__("push %%es\n\t"
33628 + "movw %w8, %%ds\n\t"
33629 "push %%ds\n\t"
33630 "pop %%es\n\t"
33631 - "lcall *(%%esi); cld\n\t"
33632 + "lcall *%%ss:(%%esi); cld\n\t"
33633 "pop %%es\n\t"
33634 + "push %%ss\n\t"
33635 + "pop %%ds\n"
33636 "jc 1f\n\t"
33637 "xor %%ah, %%ah\n"
33638 "1:"
33639 @@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
33640 "1" (0),
33641 "D" ((long) &opt),
33642 "S" (&pci_indirect),
33643 - "m" (opt)
33644 + "m" (opt),
33645 + "r" (__PCIBIOS_DS)
33646 : "memory");
33647 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
33648 if (ret & 0xff00)
33649 @@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
33650 {
33651 int ret;
33652
33653 - __asm__("lcall *(%%esi); cld\n\t"
33654 + __asm__("movw %w5, %%ds\n\t"
33655 + "lcall *%%ss:(%%esi); cld\n\t"
33656 + "push %%ss\n\t"
33657 + "pop %%ds\n"
33658 "jc 1f\n\t"
33659 "xor %%ah, %%ah\n"
33660 "1:"
33661 @@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
33662 : "0" (PCIBIOS_SET_PCI_HW_INT),
33663 "b" ((dev->bus->number << 8) | dev->devfn),
33664 "c" ((irq << 8) | (pin + 10)),
33665 - "S" (&pci_indirect));
33666 + "S" (&pci_indirect),
33667 + "r" (__PCIBIOS_DS));
33668 return !(ret & 0xff00);
33669 }
33670 EXPORT_SYMBOL(pcibios_set_irq_routing);
33671 diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
33672 index 40e4469..d915bf9 100644
33673 --- a/arch/x86/platform/efi/efi_32.c
33674 +++ b/arch/x86/platform/efi/efi_32.c
33675 @@ -44,11 +44,22 @@ void efi_call_phys_prelog(void)
33676 {
33677 struct desc_ptr gdt_descr;
33678
33679 +#ifdef CONFIG_PAX_KERNEXEC
33680 + struct desc_struct d;
33681 +#endif
33682 +
33683 local_irq_save(efi_rt_eflags);
33684
33685 load_cr3(initial_page_table);
33686 __flush_tlb_all();
33687
33688 +#ifdef CONFIG_PAX_KERNEXEC
33689 + pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
33690 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
33691 + pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
33692 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
33693 +#endif
33694 +
33695 gdt_descr.address = __pa(get_cpu_gdt_table(0));
33696 gdt_descr.size = GDT_SIZE - 1;
33697 load_gdt(&gdt_descr);
33698 @@ -58,11 +69,24 @@ void efi_call_phys_epilog(void)
33699 {
33700 struct desc_ptr gdt_descr;
33701
33702 +#ifdef CONFIG_PAX_KERNEXEC
33703 + struct desc_struct d;
33704 +
33705 + memset(&d, 0, sizeof d);
33706 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
33707 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
33708 +#endif
33709 +
33710 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
33711 gdt_descr.size = GDT_SIZE - 1;
33712 load_gdt(&gdt_descr);
33713
33714 +#ifdef CONFIG_PAX_PER_CPU_PGD
33715 + load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
33716 +#else
33717 load_cr3(swapper_pg_dir);
33718 +#endif
33719 +
33720 __flush_tlb_all();
33721
33722 local_irq_restore(efi_rt_eflags);
33723 diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
33724 index 39a0e7f1..872396e 100644
33725 --- a/arch/x86/platform/efi/efi_64.c
33726 +++ b/arch/x86/platform/efi/efi_64.c
33727 @@ -76,6 +76,11 @@ void __init efi_call_phys_prelog(void)
33728 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
33729 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
33730 }
33731 +
33732 +#ifdef CONFIG_PAX_PER_CPU_PGD
33733 + load_cr3(swapper_pg_dir);
33734 +#endif
33735 +
33736 __flush_tlb_all();
33737 }
33738
33739 @@ -89,6 +94,11 @@ void __init efi_call_phys_epilog(void)
33740 for (pgd = 0; pgd < n_pgds; pgd++)
33741 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
33742 kfree(save_pgd);
33743 +
33744 +#ifdef CONFIG_PAX_PER_CPU_PGD
33745 + load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
33746 +#endif
33747 +
33748 __flush_tlb_all();
33749 local_irq_restore(efi_flags);
33750 early_code_mapping_set_exec(0);
33751 diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
33752 index fbe66e6..eae5e38 100644
33753 --- a/arch/x86/platform/efi/efi_stub_32.S
33754 +++ b/arch/x86/platform/efi/efi_stub_32.S
33755 @@ -6,7 +6,9 @@
33756 */
33757
33758 #include <linux/linkage.h>
33759 +#include <linux/init.h>
33760 #include <asm/page_types.h>
33761 +#include <asm/segment.h>
33762
33763 /*
33764 * efi_call_phys(void *, ...) is a function with variable parameters.
33765 @@ -20,7 +22,7 @@
33766 * service functions will comply with gcc calling convention, too.
33767 */
33768
33769 -.text
33770 +__INIT
33771 ENTRY(efi_call_phys)
33772 /*
33773 * 0. The function can only be called in Linux kernel. So CS has been
33774 @@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
33775 * The mapping of lower virtual memory has been created in prelog and
33776 * epilog.
33777 */
33778 - movl $1f, %edx
33779 - subl $__PAGE_OFFSET, %edx
33780 - jmp *%edx
33781 +#ifdef CONFIG_PAX_KERNEXEC
33782 + movl $(__KERNEXEC_EFI_DS), %edx
33783 + mov %edx, %ds
33784 + mov %edx, %es
33785 + mov %edx, %ss
33786 + addl $2f,(1f)
33787 + ljmp *(1f)
33788 +
33789 +__INITDATA
33790 +1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
33791 +.previous
33792 +
33793 +2:
33794 + subl $2b,(1b)
33795 +#else
33796 + jmp 1f-__PAGE_OFFSET
33797 1:
33798 +#endif
33799
33800 /*
33801 * 2. Now on the top of stack is the return
33802 @@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
33803 * parameter 2, ..., param n. To make things easy, we save the return
33804 * address of efi_call_phys in a global variable.
33805 */
33806 - popl %edx
33807 - movl %edx, saved_return_addr
33808 - /* get the function pointer into ECX*/
33809 - popl %ecx
33810 - movl %ecx, efi_rt_function_ptr
33811 - movl $2f, %edx
33812 - subl $__PAGE_OFFSET, %edx
33813 - pushl %edx
33814 + popl (saved_return_addr)
33815 + popl (efi_rt_function_ptr)
33816
33817 /*
33818 * 3. Clear PG bit in %CR0.
33819 @@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
33820 /*
33821 * 5. Call the physical function.
33822 */
33823 - jmp *%ecx
33824 + call *(efi_rt_function_ptr-__PAGE_OFFSET)
33825
33826 -2:
33827 /*
33828 * 6. After EFI runtime service returns, control will return to
33829 * following instruction. We'd better readjust stack pointer first.
33830 @@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
33831 movl %cr0, %edx
33832 orl $0x80000000, %edx
33833 movl %edx, %cr0
33834 - jmp 1f
33835 -1:
33836 +
33837 /*
33838 * 8. Now restore the virtual mode from flat mode by
33839 * adding EIP with PAGE_OFFSET.
33840 */
33841 - movl $1f, %edx
33842 - jmp *%edx
33843 +#ifdef CONFIG_PAX_KERNEXEC
33844 + movl $(__KERNEL_DS), %edx
33845 + mov %edx, %ds
33846 + mov %edx, %es
33847 + mov %edx, %ss
33848 + ljmp $(__KERNEL_CS),$1f
33849 +#else
33850 + jmp 1f+__PAGE_OFFSET
33851 +#endif
33852 1:
33853
33854 /*
33855 * 9. Balance the stack. And because EAX contain the return value,
33856 * we'd better not clobber it.
33857 */
33858 - leal efi_rt_function_ptr, %edx
33859 - movl (%edx), %ecx
33860 - pushl %ecx
33861 + pushl (efi_rt_function_ptr)
33862
33863 /*
33864 - * 10. Push the saved return address onto the stack and return.
33865 + * 10. Return to the saved return address.
33866 */
33867 - leal saved_return_addr, %edx
33868 - movl (%edx), %ecx
33869 - pushl %ecx
33870 - ret
33871 + jmpl *(saved_return_addr)
33872 ENDPROC(efi_call_phys)
33873 .previous
33874
33875 -.data
33876 +__INITDATA
33877 saved_return_addr:
33878 .long 0
33879 efi_rt_function_ptr:
33880 diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
33881 index 4c07cca..2c8427d 100644
33882 --- a/arch/x86/platform/efi/efi_stub_64.S
33883 +++ b/arch/x86/platform/efi/efi_stub_64.S
33884 @@ -7,6 +7,7 @@
33885 */
33886
33887 #include <linux/linkage.h>
33888 +#include <asm/alternative-asm.h>
33889
33890 #define SAVE_XMM \
33891 mov %rsp, %rax; \
33892 @@ -40,6 +41,7 @@ ENTRY(efi_call0)
33893 call *%rdi
33894 addq $32, %rsp
33895 RESTORE_XMM
33896 + pax_force_retaddr 0, 1
33897 ret
33898 ENDPROC(efi_call0)
33899
33900 @@ -50,6 +52,7 @@ ENTRY(efi_call1)
33901 call *%rdi
33902 addq $32, %rsp
33903 RESTORE_XMM
33904 + pax_force_retaddr 0, 1
33905 ret
33906 ENDPROC(efi_call1)
33907
33908 @@ -60,6 +63,7 @@ ENTRY(efi_call2)
33909 call *%rdi
33910 addq $32, %rsp
33911 RESTORE_XMM
33912 + pax_force_retaddr 0, 1
33913 ret
33914 ENDPROC(efi_call2)
33915
33916 @@ -71,6 +75,7 @@ ENTRY(efi_call3)
33917 call *%rdi
33918 addq $32, %rsp
33919 RESTORE_XMM
33920 + pax_force_retaddr 0, 1
33921 ret
33922 ENDPROC(efi_call3)
33923
33924 @@ -83,6 +88,7 @@ ENTRY(efi_call4)
33925 call *%rdi
33926 addq $32, %rsp
33927 RESTORE_XMM
33928 + pax_force_retaddr 0, 1
33929 ret
33930 ENDPROC(efi_call4)
33931
33932 @@ -96,6 +102,7 @@ ENTRY(efi_call5)
33933 call *%rdi
33934 addq $48, %rsp
33935 RESTORE_XMM
33936 + pax_force_retaddr 0, 1
33937 ret
33938 ENDPROC(efi_call5)
33939
33940 @@ -112,5 +119,6 @@ ENTRY(efi_call6)
33941 call *%rdi
33942 addq $48, %rsp
33943 RESTORE_XMM
33944 + pax_force_retaddr 0, 1
33945 ret
33946 ENDPROC(efi_call6)
33947 diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
33948 index 3ca5957..7909c18 100644
33949 --- a/arch/x86/platform/mrst/mrst.c
33950 +++ b/arch/x86/platform/mrst/mrst.c
33951 @@ -78,13 +78,15 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
33952 EXPORT_SYMBOL_GPL(sfi_mrtc_array);
33953 int sfi_mrtc_num;
33954
33955 -static void mrst_power_off(void)
33956 +static __noreturn void mrst_power_off(void)
33957 {
33958 + BUG();
33959 }
33960
33961 -static void mrst_reboot(void)
33962 +static __noreturn void mrst_reboot(void)
33963 {
33964 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
33965 + BUG();
33966 }
33967
33968 /* parse all the mtimer info to a static mtimer array */
33969 diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
33970 index d6ee929..3637cb5 100644
33971 --- a/arch/x86/platform/olpc/olpc_dt.c
33972 +++ b/arch/x86/platform/olpc/olpc_dt.c
33973 @@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
33974 return res;
33975 }
33976
33977 -static struct of_pdt_ops prom_olpc_ops __initdata = {
33978 +static struct of_pdt_ops prom_olpc_ops __initconst = {
33979 .nextprop = olpc_dt_nextprop,
33980 .getproplen = olpc_dt_getproplen,
33981 .getproperty = olpc_dt_getproperty,
33982 diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
33983 index 424f4c9..f2a2988 100644
33984 --- a/arch/x86/power/cpu.c
33985 +++ b/arch/x86/power/cpu.c
33986 @@ -137,11 +137,8 @@ static void do_fpu_end(void)
33987 static void fix_processor_context(void)
33988 {
33989 int cpu = smp_processor_id();
33990 - struct tss_struct *t = &per_cpu(init_tss, cpu);
33991 -#ifdef CONFIG_X86_64
33992 - struct desc_struct *desc = get_cpu_gdt_table(cpu);
33993 - tss_desc tss;
33994 -#endif
33995 + struct tss_struct *t = init_tss + cpu;
33996 +
33997 set_tss_desc(cpu, t); /*
33998 * This just modifies memory; should not be
33999 * necessary. But... This is necessary, because
34000 @@ -150,10 +147,6 @@ static void fix_processor_context(void)
34001 */
34002
34003 #ifdef CONFIG_X86_64
34004 - memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
34005 - tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
34006 - write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
34007 -
34008 syscall_init(); /* This sets MSR_*STAR and related */
34009 #endif
34010 load_TR_desc(); /* This does ltr */
34011 diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
34012 index a44f457..9140171 100644
34013 --- a/arch/x86/realmode/init.c
34014 +++ b/arch/x86/realmode/init.c
34015 @@ -70,7 +70,13 @@ void __init setup_real_mode(void)
34016 __va(real_mode_header->trampoline_header);
34017
34018 #ifdef CONFIG_X86_32
34019 - trampoline_header->start = __pa_symbol(startup_32_smp);
34020 + trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
34021 +
34022 +#ifdef CONFIG_PAX_KERNEXEC
34023 + trampoline_header->start -= LOAD_PHYSICAL_ADDR;
34024 +#endif
34025 +
34026 + trampoline_header->boot_cs = __BOOT_CS;
34027 trampoline_header->gdt_limit = __BOOT_DS + 7;
34028 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
34029 #else
34030 @@ -86,7 +92,7 @@ void __init setup_real_mode(void)
34031 *trampoline_cr4_features = read_cr4();
34032
34033 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
34034 - trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
34035 + trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
34036 trampoline_pgd[511] = init_level4_pgt[511].pgd;
34037 #endif
34038 }
34039 diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
34040 index 9cac825..4890b25 100644
34041 --- a/arch/x86/realmode/rm/Makefile
34042 +++ b/arch/x86/realmode/rm/Makefile
34043 @@ -79,5 +79,8 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ -D_WAKEUP \
34044 $(call cc-option, -fno-unit-at-a-time)) \
34045 $(call cc-option, -fno-stack-protector) \
34046 $(call cc-option, -mpreferred-stack-boundary=2)
34047 +ifdef CONSTIFY_PLUGIN
34048 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
34049 +endif
34050 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
34051 GCOV_PROFILE := n
34052 diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
34053 index a28221d..93c40f1 100644
34054 --- a/arch/x86/realmode/rm/header.S
34055 +++ b/arch/x86/realmode/rm/header.S
34056 @@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
34057 #endif
34058 /* APM/BIOS reboot */
34059 .long pa_machine_real_restart_asm
34060 -#ifdef CONFIG_X86_64
34061 +#ifdef CONFIG_X86_32
34062 + .long __KERNEL_CS
34063 +#else
34064 .long __KERNEL32_CS
34065 #endif
34066 END(real_mode_header)
34067 diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
34068 index c1b2791..f9e31c7 100644
34069 --- a/arch/x86/realmode/rm/trampoline_32.S
34070 +++ b/arch/x86/realmode/rm/trampoline_32.S
34071 @@ -25,6 +25,12 @@
34072 #include <asm/page_types.h>
34073 #include "realmode.h"
34074
34075 +#ifdef CONFIG_PAX_KERNEXEC
34076 +#define ta(X) (X)
34077 +#else
34078 +#define ta(X) (pa_ ## X)
34079 +#endif
34080 +
34081 .text
34082 .code16
34083
34084 @@ -39,8 +45,6 @@ ENTRY(trampoline_start)
34085
34086 cli # We should be safe anyway
34087
34088 - movl tr_start, %eax # where we need to go
34089 -
34090 movl $0xA5A5A5A5, trampoline_status
34091 # write marker for master knows we're running
34092
34093 @@ -56,7 +60,7 @@ ENTRY(trampoline_start)
34094 movw $1, %dx # protected mode (PE) bit
34095 lmsw %dx # into protected mode
34096
34097 - ljmpl $__BOOT_CS, $pa_startup_32
34098 + ljmpl *(trampoline_header)
34099
34100 .section ".text32","ax"
34101 .code32
34102 @@ -67,7 +71,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
34103 .balign 8
34104 GLOBAL(trampoline_header)
34105 tr_start: .space 4
34106 - tr_gdt_pad: .space 2
34107 + tr_boot_cs: .space 2
34108 tr_gdt: .space 6
34109 END(trampoline_header)
34110
34111 diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
34112 index bb360dc..d0fd8f8 100644
34113 --- a/arch/x86/realmode/rm/trampoline_64.S
34114 +++ b/arch/x86/realmode/rm/trampoline_64.S
34115 @@ -94,6 +94,7 @@ ENTRY(startup_32)
34116 movl %edx, %gs
34117
34118 movl pa_tr_cr4, %eax
34119 + andl $~X86_CR4_PCIDE, %eax
34120 movl %eax, %cr4 # Enable PAE mode
34121
34122 # Setup trampoline 4 level pagetables
34123 @@ -107,7 +108,7 @@ ENTRY(startup_32)
34124 wrmsr
34125
34126 # Enable paging and in turn activate Long Mode
34127 - movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
34128 + movl $(X86_CR0_PG | X86_CR0_PE), %eax
34129 movl %eax, %cr0
34130
34131 /*
34132 diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
34133 index e812034..c747134 100644
34134 --- a/arch/x86/tools/Makefile
34135 +++ b/arch/x86/tools/Makefile
34136 @@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
34137
34138 $(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
34139
34140 -HOST_EXTRACFLAGS += -I$(srctree)/tools/include
34141 +HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
34142 hostprogs-y += relocs
34143 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
34144 relocs: $(obj)/relocs
34145 diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
34146 index f7bab68..b6d9886 100644
34147 --- a/arch/x86/tools/relocs.c
34148 +++ b/arch/x86/tools/relocs.c
34149 @@ -1,5 +1,7 @@
34150 /* This is included from relocs_32/64.c */
34151
34152 +#include "../../../include/generated/autoconf.h"
34153 +
34154 #define ElfW(type) _ElfW(ELF_BITS, type)
34155 #define _ElfW(bits, type) __ElfW(bits, type)
34156 #define __ElfW(bits, type) Elf##bits##_##type
34157 @@ -11,6 +13,7 @@
34158 #define Elf_Sym ElfW(Sym)
34159
34160 static Elf_Ehdr ehdr;
34161 +static Elf_Phdr *phdr;
34162
34163 struct relocs {
34164 uint32_t *offset;
34165 @@ -383,9 +386,39 @@ static void read_ehdr(FILE *fp)
34166 }
34167 }
34168
34169 +static void read_phdrs(FILE *fp)
34170 +{
34171 + unsigned int i;
34172 +
34173 + phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
34174 + if (!phdr) {
34175 + die("Unable to allocate %d program headers\n",
34176 + ehdr.e_phnum);
34177 + }
34178 + if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
34179 + die("Seek to %d failed: %s\n",
34180 + ehdr.e_phoff, strerror(errno));
34181 + }
34182 + if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
34183 + die("Cannot read ELF program headers: %s\n",
34184 + strerror(errno));
34185 + }
34186 + for(i = 0; i < ehdr.e_phnum; i++) {
34187 + phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
34188 + phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
34189 + phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
34190 + phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
34191 + phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
34192 + phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
34193 + phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
34194 + phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
34195 + }
34196 +
34197 +}
34198 +
34199 static void read_shdrs(FILE *fp)
34200 {
34201 - int i;
34202 + unsigned int i;
34203 Elf_Shdr shdr;
34204
34205 secs = calloc(ehdr.e_shnum, sizeof(struct section));
34206 @@ -420,7 +453,7 @@ static void read_shdrs(FILE *fp)
34207
34208 static void read_strtabs(FILE *fp)
34209 {
34210 - int i;
34211 + unsigned int i;
34212 for (i = 0; i < ehdr.e_shnum; i++) {
34213 struct section *sec = &secs[i];
34214 if (sec->shdr.sh_type != SHT_STRTAB) {
34215 @@ -445,7 +478,7 @@ static void read_strtabs(FILE *fp)
34216
34217 static void read_symtabs(FILE *fp)
34218 {
34219 - int i,j;
34220 + unsigned int i,j;
34221 for (i = 0; i < ehdr.e_shnum; i++) {
34222 struct section *sec = &secs[i];
34223 if (sec->shdr.sh_type != SHT_SYMTAB) {
34224 @@ -476,9 +509,11 @@ static void read_symtabs(FILE *fp)
34225 }
34226
34227
34228 -static void read_relocs(FILE *fp)
34229 +static void read_relocs(FILE *fp, int use_real_mode)
34230 {
34231 - int i,j;
34232 + unsigned int i,j;
34233 + uint32_t base;
34234 +
34235 for (i = 0; i < ehdr.e_shnum; i++) {
34236 struct section *sec = &secs[i];
34237 if (sec->shdr.sh_type != SHT_REL_TYPE) {
34238 @@ -498,9 +533,22 @@ static void read_relocs(FILE *fp)
34239 die("Cannot read symbol table: %s\n",
34240 strerror(errno));
34241 }
34242 + base = 0;
34243 +
34244 +#ifdef CONFIG_X86_32
34245 + for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
34246 + if (phdr[j].p_type != PT_LOAD )
34247 + continue;
34248 + 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)
34249 + continue;
34250 + base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
34251 + break;
34252 + }
34253 +#endif
34254 +
34255 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
34256 Elf_Rel *rel = &sec->reltab[j];
34257 - rel->r_offset = elf_addr_to_cpu(rel->r_offset);
34258 + rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
34259 rel->r_info = elf_xword_to_cpu(rel->r_info);
34260 #if (SHT_REL_TYPE == SHT_RELA)
34261 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
34262 @@ -512,7 +560,7 @@ static void read_relocs(FILE *fp)
34263
34264 static void print_absolute_symbols(void)
34265 {
34266 - int i;
34267 + unsigned int i;
34268 const char *format;
34269
34270 if (ELF_BITS == 64)
34271 @@ -525,7 +573,7 @@ static void print_absolute_symbols(void)
34272 for (i = 0; i < ehdr.e_shnum; i++) {
34273 struct section *sec = &secs[i];
34274 char *sym_strtab;
34275 - int j;
34276 + unsigned int j;
34277
34278 if (sec->shdr.sh_type != SHT_SYMTAB) {
34279 continue;
34280 @@ -552,7 +600,7 @@ static void print_absolute_symbols(void)
34281
34282 static void print_absolute_relocs(void)
34283 {
34284 - int i, printed = 0;
34285 + unsigned int i, printed = 0;
34286 const char *format;
34287
34288 if (ELF_BITS == 64)
34289 @@ -565,7 +613,7 @@ static void print_absolute_relocs(void)
34290 struct section *sec_applies, *sec_symtab;
34291 char *sym_strtab;
34292 Elf_Sym *sh_symtab;
34293 - int j;
34294 + unsigned int j;
34295 if (sec->shdr.sh_type != SHT_REL_TYPE) {
34296 continue;
34297 }
34298 @@ -642,13 +690,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
34299 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
34300 Elf_Sym *sym, const char *symname))
34301 {
34302 - int i;
34303 + unsigned int i;
34304 /* Walk through the relocations */
34305 for (i = 0; i < ehdr.e_shnum; i++) {
34306 char *sym_strtab;
34307 Elf_Sym *sh_symtab;
34308 struct section *sec_applies, *sec_symtab;
34309 - int j;
34310 + unsigned int j;
34311 struct section *sec = &secs[i];
34312
34313 if (sec->shdr.sh_type != SHT_REL_TYPE) {
34314 @@ -812,6 +860,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
34315 {
34316 unsigned r_type = ELF32_R_TYPE(rel->r_info);
34317 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
34318 + char *sym_strtab = sec->link->link->strtab;
34319 +
34320 + /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
34321 + if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
34322 + return 0;
34323 +
34324 +#ifdef CONFIG_PAX_KERNEXEC
34325 + /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
34326 + if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
34327 + return 0;
34328 + if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
34329 + return 0;
34330 + if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
34331 + return 0;
34332 + if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
34333 + return 0;
34334 +#endif
34335
34336 switch (r_type) {
34337 case R_386_NONE:
34338 @@ -950,7 +1015,7 @@ static int write32_as_text(uint32_t v, FILE *f)
34339
34340 static void emit_relocs(int as_text, int use_real_mode)
34341 {
34342 - int i;
34343 + unsigned int i;
34344 int (*write_reloc)(uint32_t, FILE *) = write32;
34345 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
34346 const char *symname);
34347 @@ -1026,10 +1091,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
34348 {
34349 regex_init(use_real_mode);
34350 read_ehdr(fp);
34351 + read_phdrs(fp);
34352 read_shdrs(fp);
34353 read_strtabs(fp);
34354 read_symtabs(fp);
34355 - read_relocs(fp);
34356 + read_relocs(fp, use_real_mode);
34357 if (ELF_BITS == 64)
34358 percpu_init();
34359 if (show_absolute_syms) {
34360 diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
34361 index 80ffa5b..a33bd15 100644
34362 --- a/arch/x86/um/tls_32.c
34363 +++ b/arch/x86/um/tls_32.c
34364 @@ -260,7 +260,7 @@ out:
34365 if (unlikely(task == current &&
34366 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
34367 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
34368 - "without flushed TLS.", current->pid);
34369 + "without flushed TLS.", task_pid_nr(current));
34370 }
34371
34372 return 0;
34373 diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
34374 index fd14be1..e3c79c0 100644
34375 --- a/arch/x86/vdso/Makefile
34376 +++ b/arch/x86/vdso/Makefile
34377 @@ -181,7 +181,7 @@ quiet_cmd_vdso = VDSO $@
34378 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
34379 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
34380
34381 -VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
34382 +VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
34383 GCOV_PROFILE := n
34384
34385 #
34386 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
34387 index d6bfb87..876ee18 100644
34388 --- a/arch/x86/vdso/vdso32-setup.c
34389 +++ b/arch/x86/vdso/vdso32-setup.c
34390 @@ -25,6 +25,7 @@
34391 #include <asm/tlbflush.h>
34392 #include <asm/vdso.h>
34393 #include <asm/proto.h>
34394 +#include <asm/mman.h>
34395
34396 enum {
34397 VDSO_DISABLED = 0,
34398 @@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map)
34399 void enable_sep_cpu(void)
34400 {
34401 int cpu = get_cpu();
34402 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
34403 + struct tss_struct *tss = init_tss + cpu;
34404
34405 if (!boot_cpu_has(X86_FEATURE_SEP)) {
34406 put_cpu();
34407 @@ -249,7 +250,7 @@ static int __init gate_vma_init(void)
34408 gate_vma.vm_start = FIXADDR_USER_START;
34409 gate_vma.vm_end = FIXADDR_USER_END;
34410 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
34411 - gate_vma.vm_page_prot = __P101;
34412 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
34413
34414 return 0;
34415 }
34416 @@ -330,14 +331,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
34417 if (compat)
34418 addr = VDSO_HIGH_BASE;
34419 else {
34420 - addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
34421 + addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE);
34422 if (IS_ERR_VALUE(addr)) {
34423 ret = addr;
34424 goto up_fail;
34425 }
34426 }
34427
34428 - current->mm->context.vdso = (void *)addr;
34429 + current->mm->context.vdso = addr;
34430
34431 if (compat_uses_vma || !compat) {
34432 /*
34433 @@ -353,11 +354,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
34434 }
34435
34436 current_thread_info()->sysenter_return =
34437 - VDSO32_SYMBOL(addr, SYSENTER_RETURN);
34438 + (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
34439
34440 up_fail:
34441 if (ret)
34442 - current->mm->context.vdso = NULL;
34443 + current->mm->context.vdso = 0;
34444
34445 up_write(&mm->mmap_sem);
34446
34447 @@ -404,8 +405,14 @@ __initcall(ia32_binfmt_init);
34448
34449 const char *arch_vma_name(struct vm_area_struct *vma)
34450 {
34451 - if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
34452 + if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
34453 return "[vdso]";
34454 +
34455 +#ifdef CONFIG_PAX_SEGMEXEC
34456 + if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
34457 + return "[vdso]";
34458 +#endif
34459 +
34460 return NULL;
34461 }
34462
34463 @@ -415,7 +422,7 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
34464 * Check to see if the corresponding task was created in compat vdso
34465 * mode.
34466 */
34467 - if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
34468 + if (mm && mm->context.vdso == VDSO_HIGH_BASE)
34469 return &gate_vma;
34470 return NULL;
34471 }
34472 diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
34473 index 431e875..cbb23f3 100644
34474 --- a/arch/x86/vdso/vma.c
34475 +++ b/arch/x86/vdso/vma.c
34476 @@ -16,8 +16,6 @@
34477 #include <asm/vdso.h>
34478 #include <asm/page.h>
34479
34480 -unsigned int __read_mostly vdso_enabled = 1;
34481 -
34482 extern char vdso_start[], vdso_end[];
34483 extern unsigned short vdso_sync_cpuid;
34484
34485 @@ -141,7 +139,6 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
34486 * unaligned here as a result of stack start randomization.
34487 */
34488 addr = PAGE_ALIGN(addr);
34489 - addr = align_vdso_addr(addr);
34490
34491 return addr;
34492 }
34493 @@ -154,30 +151,31 @@ static int setup_additional_pages(struct linux_binprm *bprm,
34494 unsigned size)
34495 {
34496 struct mm_struct *mm = current->mm;
34497 - unsigned long addr;
34498 + unsigned long addr = 0;
34499 int ret;
34500
34501 - if (!vdso_enabled)
34502 - return 0;
34503 -
34504 down_write(&mm->mmap_sem);
34505 +
34506 +#ifdef CONFIG_PAX_RANDMMAP
34507 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
34508 +#endif
34509 +
34510 addr = vdso_addr(mm->start_stack, size);
34511 + addr = align_vdso_addr(addr);
34512 addr = get_unmapped_area(NULL, addr, size, 0, 0);
34513 if (IS_ERR_VALUE(addr)) {
34514 ret = addr;
34515 goto up_fail;
34516 }
34517
34518 - current->mm->context.vdso = (void *)addr;
34519 + mm->context.vdso = addr;
34520
34521 ret = install_special_mapping(mm, addr, size,
34522 VM_READ|VM_EXEC|
34523 VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,
34524 pages);
34525 - if (ret) {
34526 - current->mm->context.vdso = NULL;
34527 - goto up_fail;
34528 - }
34529 + if (ret)
34530 + mm->context.vdso = 0;
34531
34532 up_fail:
34533 up_write(&mm->mmap_sem);
34534 @@ -197,10 +195,3 @@ int x32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
34535 vdsox32_size);
34536 }
34537 #endif
34538 -
34539 -static __init int vdso_setup(char *s)
34540 -{
34541 - vdso_enabled = simple_strtoul(s, NULL, 0);
34542 - return 0;
34543 -}
34544 -__setup("vdso=", vdso_setup);
34545 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
34546 index fa6ade7..73da73a5 100644
34547 --- a/arch/x86/xen/enlighten.c
34548 +++ b/arch/x86/xen/enlighten.c
34549 @@ -123,8 +123,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
34550
34551 struct shared_info xen_dummy_shared_info;
34552
34553 -void *xen_initial_gdt;
34554 -
34555 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
34556 __read_mostly int xen_have_vector_callback;
34557 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
34558 @@ -541,8 +539,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
34559 {
34560 unsigned long va = dtr->address;
34561 unsigned int size = dtr->size + 1;
34562 - unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
34563 - unsigned long frames[pages];
34564 + unsigned long frames[65536 / PAGE_SIZE];
34565 int f;
34566
34567 /*
34568 @@ -590,8 +587,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
34569 {
34570 unsigned long va = dtr->address;
34571 unsigned int size = dtr->size + 1;
34572 - unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
34573 - unsigned long frames[pages];
34574 + unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
34575 int f;
34576
34577 /*
34578 @@ -599,7 +595,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
34579 * 8-byte entries, or 16 4k pages..
34580 */
34581
34582 - BUG_ON(size > 65536);
34583 + BUG_ON(size > GDT_SIZE);
34584 BUG_ON(va & ~PAGE_MASK);
34585
34586 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
34587 @@ -988,7 +984,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
34588 return 0;
34589 }
34590
34591 -static void set_xen_basic_apic_ops(void)
34592 +static void __init set_xen_basic_apic_ops(void)
34593 {
34594 apic->read = xen_apic_read;
34595 apic->write = xen_apic_write;
34596 @@ -1293,30 +1289,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
34597 #endif
34598 };
34599
34600 -static void xen_reboot(int reason)
34601 +static __noreturn void xen_reboot(int reason)
34602 {
34603 struct sched_shutdown r = { .reason = reason };
34604
34605 - if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
34606 - BUG();
34607 + HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
34608 + BUG();
34609 }
34610
34611 -static void xen_restart(char *msg)
34612 +static __noreturn void xen_restart(char *msg)
34613 {
34614 xen_reboot(SHUTDOWN_reboot);
34615 }
34616
34617 -static void xen_emergency_restart(void)
34618 +static __noreturn void xen_emergency_restart(void)
34619 {
34620 xen_reboot(SHUTDOWN_reboot);
34621 }
34622
34623 -static void xen_machine_halt(void)
34624 +static __noreturn void xen_machine_halt(void)
34625 {
34626 xen_reboot(SHUTDOWN_poweroff);
34627 }
34628
34629 -static void xen_machine_power_off(void)
34630 +static __noreturn void xen_machine_power_off(void)
34631 {
34632 if (pm_power_off)
34633 pm_power_off();
34634 @@ -1467,7 +1463,17 @@ asmlinkage void __init xen_start_kernel(void)
34635 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
34636
34637 /* Work out if we support NX */
34638 - x86_configure_nx();
34639 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34640 + if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
34641 + (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
34642 + unsigned l, h;
34643 +
34644 + __supported_pte_mask |= _PAGE_NX;
34645 + rdmsr(MSR_EFER, l, h);
34646 + l |= EFER_NX;
34647 + wrmsr(MSR_EFER, l, h);
34648 + }
34649 +#endif
34650
34651 xen_setup_features();
34652
34653 @@ -1498,13 +1504,6 @@ asmlinkage void __init xen_start_kernel(void)
34654
34655 machine_ops = xen_machine_ops;
34656
34657 - /*
34658 - * The only reliable way to retain the initial address of the
34659 - * percpu gdt_page is to remember it here, so we can go and
34660 - * mark it RW later, when the initial percpu area is freed.
34661 - */
34662 - xen_initial_gdt = &per_cpu(gdt_page, 0);
34663 -
34664 xen_smp_init();
34665
34666 #ifdef CONFIG_ACPI_NUMA
34667 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
34668 index fdc3ba2..23cae00 100644
34669 --- a/arch/x86/xen/mmu.c
34670 +++ b/arch/x86/xen/mmu.c
34671 @@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
34672 return val;
34673 }
34674
34675 -static pteval_t pte_pfn_to_mfn(pteval_t val)
34676 +static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
34677 {
34678 if (val & _PAGE_PRESENT) {
34679 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
34680 @@ -1894,6 +1894,9 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
34681 /* L3_k[510] -> level2_kernel_pgt
34682 * L3_i[511] -> level2_fixmap_pgt */
34683 convert_pfn_mfn(level3_kernel_pgt);
34684 + convert_pfn_mfn(level3_vmalloc_start_pgt);
34685 + convert_pfn_mfn(level3_vmalloc_end_pgt);
34686 + convert_pfn_mfn(level3_vmemmap_pgt);
34687
34688 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
34689 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
34690 @@ -1923,8 +1926,12 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
34691 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
34692 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
34693 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
34694 + set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
34695 + set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
34696 + set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
34697 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
34698 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
34699 + set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
34700 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
34701 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
34702
34703 @@ -2108,6 +2115,7 @@ static void __init xen_post_allocator_init(void)
34704 pv_mmu_ops.set_pud = xen_set_pud;
34705 #if PAGETABLE_LEVELS == 4
34706 pv_mmu_ops.set_pgd = xen_set_pgd;
34707 + pv_mmu_ops.set_pgd_batched = xen_set_pgd;
34708 #endif
34709
34710 /* This will work as long as patching hasn't happened yet
34711 @@ -2186,6 +2194,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
34712 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
34713 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
34714 .set_pgd = xen_set_pgd_hyper,
34715 + .set_pgd_batched = xen_set_pgd_hyper,
34716
34717 .alloc_pud = xen_alloc_pmd_init,
34718 .release_pud = xen_release_pmd_init,
34719 diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
34720 index 31d0475..51af671 100644
34721 --- a/arch/x86/xen/smp.c
34722 +++ b/arch/x86/xen/smp.c
34723 @@ -274,17 +274,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
34724 native_smp_prepare_boot_cpu();
34725
34726 if (xen_pv_domain()) {
34727 - /* We've switched to the "real" per-cpu gdt, so make sure the
34728 - old memory can be recycled */
34729 - make_lowmem_page_readwrite(xen_initial_gdt);
34730 -
34731 #ifdef CONFIG_X86_32
34732 /*
34733 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
34734 * expects __USER_DS
34735 */
34736 - loadsegment(ds, __USER_DS);
34737 - loadsegment(es, __USER_DS);
34738 + loadsegment(ds, __KERNEL_DS);
34739 + loadsegment(es, __KERNEL_DS);
34740 #endif
34741
34742 xen_filter_cpu_maps();
34743 @@ -364,7 +360,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
34744 ctxt->user_regs.ss = __KERNEL_DS;
34745 #ifdef CONFIG_X86_32
34746 ctxt->user_regs.fs = __KERNEL_PERCPU;
34747 - ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
34748 + savesegment(gs, ctxt->user_regs.gs);
34749 #else
34750 ctxt->gs_base_kernel = per_cpu_offset(cpu);
34751 #endif
34752 @@ -374,8 +370,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
34753
34754 {
34755 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
34756 - ctxt->user_regs.ds = __USER_DS;
34757 - ctxt->user_regs.es = __USER_DS;
34758 + ctxt->user_regs.ds = __KERNEL_DS;
34759 + ctxt->user_regs.es = __KERNEL_DS;
34760
34761 xen_copy_trap_info(ctxt->trap_ctxt);
34762
34763 @@ -420,13 +416,12 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
34764 int rc;
34765
34766 per_cpu(current_task, cpu) = idle;
34767 + per_cpu(current_tinfo, cpu) = &idle->tinfo;
34768 #ifdef CONFIG_X86_32
34769 irq_ctx_init(cpu);
34770 #else
34771 clear_tsk_thread_flag(idle, TIF_FORK);
34772 - per_cpu(kernel_stack, cpu) =
34773 - (unsigned long)task_stack_page(idle) -
34774 - KERNEL_STACK_OFFSET + THREAD_SIZE;
34775 + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
34776 #endif
34777 xen_setup_runstate_info(cpu);
34778 xen_setup_timer(cpu);
34779 @@ -702,7 +697,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
34780
34781 void __init xen_smp_init(void)
34782 {
34783 - smp_ops = xen_smp_ops;
34784 + memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
34785 xen_fill_possible_map();
34786 }
34787
34788 diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
34789 index 33ca6e4..0ded929 100644
34790 --- a/arch/x86/xen/xen-asm_32.S
34791 +++ b/arch/x86/xen/xen-asm_32.S
34792 @@ -84,14 +84,14 @@ ENTRY(xen_iret)
34793 ESP_OFFSET=4 # bytes pushed onto stack
34794
34795 /*
34796 - * Store vcpu_info pointer for easy access. Do it this way to
34797 - * avoid having to reload %fs
34798 + * Store vcpu_info pointer for easy access.
34799 */
34800 #ifdef CONFIG_SMP
34801 - GET_THREAD_INFO(%eax)
34802 - movl %ss:TI_cpu(%eax), %eax
34803 - movl %ss:__per_cpu_offset(,%eax,4), %eax
34804 - mov %ss:xen_vcpu(%eax), %eax
34805 + push %fs
34806 + mov $(__KERNEL_PERCPU), %eax
34807 + mov %eax, %fs
34808 + mov PER_CPU_VAR(xen_vcpu), %eax
34809 + pop %fs
34810 #else
34811 movl %ss:xen_vcpu, %eax
34812 #endif
34813 diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
34814 index 7faed58..ba4427c 100644
34815 --- a/arch/x86/xen/xen-head.S
34816 +++ b/arch/x86/xen/xen-head.S
34817 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
34818 #ifdef CONFIG_X86_32
34819 mov %esi,xen_start_info
34820 mov $init_thread_union+THREAD_SIZE,%esp
34821 +#ifdef CONFIG_SMP
34822 + movl $cpu_gdt_table,%edi
34823 + movl $__per_cpu_load,%eax
34824 + movw %ax,__KERNEL_PERCPU + 2(%edi)
34825 + rorl $16,%eax
34826 + movb %al,__KERNEL_PERCPU + 4(%edi)
34827 + movb %ah,__KERNEL_PERCPU + 7(%edi)
34828 + movl $__per_cpu_end - 1,%eax
34829 + subl $__per_cpu_start,%eax
34830 + movw %ax,__KERNEL_PERCPU + 0(%edi)
34831 +#endif
34832 #else
34833 mov %rsi,xen_start_info
34834 mov $init_thread_union+THREAD_SIZE,%rsp
34835 diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
34836 index 95f8c61..611d6e8 100644
34837 --- a/arch/x86/xen/xen-ops.h
34838 +++ b/arch/x86/xen/xen-ops.h
34839 @@ -10,8 +10,6 @@
34840 extern const char xen_hypervisor_callback[];
34841 extern const char xen_failsafe_callback[];
34842
34843 -extern void *xen_initial_gdt;
34844 -
34845 struct trap_info;
34846 void xen_copy_trap_info(struct trap_info *traps);
34847
34848 diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
34849 index 525bd3d..ef888b1 100644
34850 --- a/arch/xtensa/variants/dc232b/include/variant/core.h
34851 +++ b/arch/xtensa/variants/dc232b/include/variant/core.h
34852 @@ -119,9 +119,9 @@
34853 ----------------------------------------------------------------------*/
34854
34855 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
34856 -#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
34857 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
34858 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
34859 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
34860
34861 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
34862 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
34863 diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
34864 index 2f33760..835e50a 100644
34865 --- a/arch/xtensa/variants/fsf/include/variant/core.h
34866 +++ b/arch/xtensa/variants/fsf/include/variant/core.h
34867 @@ -11,6 +11,7 @@
34868 #ifndef _XTENSA_CORE_H
34869 #define _XTENSA_CORE_H
34870
34871 +#include <linux/const.h>
34872
34873 /****************************************************************************
34874 Parameters Useful for Any Code, USER or PRIVILEGED
34875 @@ -112,9 +113,9 @@
34876 ----------------------------------------------------------------------*/
34877
34878 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
34879 -#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
34880 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
34881 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
34882 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
34883
34884 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
34885 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
34886 diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
34887 index af00795..2bb8105 100644
34888 --- a/arch/xtensa/variants/s6000/include/variant/core.h
34889 +++ b/arch/xtensa/variants/s6000/include/variant/core.h
34890 @@ -11,6 +11,7 @@
34891 #ifndef _XTENSA_CORE_CONFIGURATION_H
34892 #define _XTENSA_CORE_CONFIGURATION_H
34893
34894 +#include <linux/const.h>
34895
34896 /****************************************************************************
34897 Parameters Useful for Any Code, USER or PRIVILEGED
34898 @@ -118,9 +119,9 @@
34899 ----------------------------------------------------------------------*/
34900
34901 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
34902 -#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
34903 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
34904 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
34905 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
34906
34907 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
34908 #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
34909 diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
34910 index 4e491d9..c8e18e4 100644
34911 --- a/block/blk-cgroup.c
34912 +++ b/block/blk-cgroup.c
34913 @@ -812,7 +812,7 @@ static void blkcg_css_free(struct cgroup_subsys_state *css)
34914 static struct cgroup_subsys_state *
34915 blkcg_css_alloc(struct cgroup_subsys_state *parent_css)
34916 {
34917 - static atomic64_t id_seq = ATOMIC64_INIT(0);
34918 + static atomic64_unchecked_t id_seq = ATOMIC64_INIT(0);
34919 struct blkcg *blkcg;
34920
34921 if (!parent_css) {
34922 @@ -826,7 +826,7 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css)
34923
34924 blkcg->cfq_weight = CFQ_WEIGHT_DEFAULT;
34925 blkcg->cfq_leaf_weight = CFQ_WEIGHT_DEFAULT;
34926 - blkcg->id = atomic64_inc_return(&id_seq); /* root is 0, start from 1 */
34927 + blkcg->id = atomic64_inc_return_unchecked(&id_seq); /* root is 0, start from 1 */
34928 done:
34929 spin_lock_init(&blkcg->lock);
34930 INIT_RADIX_TREE(&blkcg->blkg_tree, GFP_ATOMIC);
34931 diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
34932 index 4b8d9b54..a7178c0 100644
34933 --- a/block/blk-iopoll.c
34934 +++ b/block/blk-iopoll.c
34935 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
34936 }
34937 EXPORT_SYMBOL(blk_iopoll_complete);
34938
34939 -static void blk_iopoll_softirq(struct softirq_action *h)
34940 +static __latent_entropy void blk_iopoll_softirq(void)
34941 {
34942 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
34943 int rearm = 0, budget = blk_iopoll_budget;
34944 diff --git a/block/blk-map.c b/block/blk-map.c
34945 index 623e1cd..ca1e109 100644
34946 --- a/block/blk-map.c
34947 +++ b/block/blk-map.c
34948 @@ -302,7 +302,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
34949 if (!len || !kbuf)
34950 return -EINVAL;
34951
34952 - do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
34953 + do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
34954 if (do_copy)
34955 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
34956 else
34957 diff --git a/block/blk-softirq.c b/block/blk-softirq.c
34958 index ec9e606..3f38839 100644
34959 --- a/block/blk-softirq.c
34960 +++ b/block/blk-softirq.c
34961 @@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
34962 * Softirq action handler - move entries to local list and loop over them
34963 * while passing them to the queue registered handler.
34964 */
34965 -static void blk_done_softirq(struct softirq_action *h)
34966 +static __latent_entropy void blk_done_softirq(void)
34967 {
34968 struct list_head *cpu_list, local_list;
34969
34970 diff --git a/block/bsg.c b/block/bsg.c
34971 index 420a5a9..23834aa 100644
34972 --- a/block/bsg.c
34973 +++ b/block/bsg.c
34974 @@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
34975 struct sg_io_v4 *hdr, struct bsg_device *bd,
34976 fmode_t has_write_perm)
34977 {
34978 + unsigned char tmpcmd[sizeof(rq->__cmd)];
34979 + unsigned char *cmdptr;
34980 +
34981 if (hdr->request_len > BLK_MAX_CDB) {
34982 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
34983 if (!rq->cmd)
34984 return -ENOMEM;
34985 - }
34986 + cmdptr = rq->cmd;
34987 + } else
34988 + cmdptr = tmpcmd;
34989
34990 - if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
34991 + if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
34992 hdr->request_len))
34993 return -EFAULT;
34994
34995 + if (cmdptr != rq->cmd)
34996 + memcpy(rq->cmd, cmdptr, hdr->request_len);
34997 +
34998 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
34999 if (blk_verify_command(rq->cmd, has_write_perm))
35000 return -EPERM;
35001 diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
35002 index fbd5a67..5d631b5 100644
35003 --- a/block/compat_ioctl.c
35004 +++ b/block/compat_ioctl.c
35005 @@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
35006 err |= __get_user(f->spec1, &uf->spec1);
35007 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
35008 err |= __get_user(name, &uf->name);
35009 - f->name = compat_ptr(name);
35010 + f->name = (void __force_kernel *)compat_ptr(name);
35011 if (err) {
35012 err = -EFAULT;
35013 goto out;
35014 diff --git a/block/genhd.c b/block/genhd.c
35015 index 791f419..89f21c4 100644
35016 --- a/block/genhd.c
35017 +++ b/block/genhd.c
35018 @@ -467,21 +467,24 @@ static char *bdevt_str(dev_t devt, char *buf)
35019
35020 /*
35021 * Register device numbers dev..(dev+range-1)
35022 - * range must be nonzero
35023 + * Noop if @range is zero.
35024 * The hash chain is sorted on range, so that subranges can override.
35025 */
35026 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
35027 struct kobject *(*probe)(dev_t, int *, void *),
35028 int (*lock)(dev_t, void *), void *data)
35029 {
35030 - kobj_map(bdev_map, devt, range, module, probe, lock, data);
35031 + if (range)
35032 + kobj_map(bdev_map, devt, range, module, probe, lock, data);
35033 }
35034
35035 EXPORT_SYMBOL(blk_register_region);
35036
35037 +/* undo blk_register_region(), noop if @range is zero */
35038 void blk_unregister_region(dev_t devt, unsigned long range)
35039 {
35040 - kobj_unmap(bdev_map, devt, range);
35041 + if (range)
35042 + kobj_unmap(bdev_map, devt, range);
35043 }
35044
35045 EXPORT_SYMBOL(blk_unregister_region);
35046 diff --git a/block/partitions/efi.c b/block/partitions/efi.c
35047 index a8287b4..241a48e 100644
35048 --- a/block/partitions/efi.c
35049 +++ b/block/partitions/efi.c
35050 @@ -292,14 +292,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
35051 if (!gpt)
35052 return NULL;
35053
35054 + if (!le32_to_cpu(gpt->num_partition_entries))
35055 + return NULL;
35056 + pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
35057 + if (!pte)
35058 + return NULL;
35059 +
35060 count = le32_to_cpu(gpt->num_partition_entries) *
35061 le32_to_cpu(gpt->sizeof_partition_entry);
35062 - if (!count)
35063 - return NULL;
35064 - pte = kmalloc(count, GFP_KERNEL);
35065 - if (!pte)
35066 - return NULL;
35067 -
35068 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
35069 (u8 *) pte, count) < count) {
35070 kfree(pte);
35071 diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
35072 index a5ffcc9..e057498 100644
35073 --- a/block/scsi_ioctl.c
35074 +++ b/block/scsi_ioctl.c
35075 @@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
35076 return put_user(0, p);
35077 }
35078
35079 -static int sg_get_timeout(struct request_queue *q)
35080 +static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
35081 {
35082 return jiffies_to_clock_t(q->sg_timeout);
35083 }
35084 @@ -224,8 +224,20 @@ EXPORT_SYMBOL(blk_verify_command);
35085 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
35086 struct sg_io_hdr *hdr, fmode_t mode)
35087 {
35088 - if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
35089 + unsigned char tmpcmd[sizeof(rq->__cmd)];
35090 + unsigned char *cmdptr;
35091 +
35092 + if (rq->cmd != rq->__cmd)
35093 + cmdptr = rq->cmd;
35094 + else
35095 + cmdptr = tmpcmd;
35096 +
35097 + if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
35098 return -EFAULT;
35099 +
35100 + if (cmdptr != rq->cmd)
35101 + memcpy(rq->cmd, cmdptr, hdr->cmd_len);
35102 +
35103 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
35104 return -EPERM;
35105
35106 @@ -434,6 +446,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
35107 int err;
35108 unsigned int in_len, out_len, bytes, opcode, cmdlen;
35109 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
35110 + unsigned char tmpcmd[sizeof(rq->__cmd)];
35111 + unsigned char *cmdptr;
35112
35113 if (!sic)
35114 return -EINVAL;
35115 @@ -467,9 +481,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
35116 */
35117 err = -EFAULT;
35118 rq->cmd_len = cmdlen;
35119 - if (copy_from_user(rq->cmd, sic->data, cmdlen))
35120 +
35121 + if (rq->cmd != rq->__cmd)
35122 + cmdptr = rq->cmd;
35123 + else
35124 + cmdptr = tmpcmd;
35125 +
35126 + if (copy_from_user(cmdptr, sic->data, cmdlen))
35127 goto error;
35128
35129 + if (rq->cmd != cmdptr)
35130 + memcpy(rq->cmd, cmdptr, cmdlen);
35131 +
35132 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
35133 goto error;
35134
35135 diff --git a/crypto/cryptd.c b/crypto/cryptd.c
35136 index 7bdd61b..afec999 100644
35137 --- a/crypto/cryptd.c
35138 +++ b/crypto/cryptd.c
35139 @@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
35140
35141 struct cryptd_blkcipher_request_ctx {
35142 crypto_completion_t complete;
35143 -};
35144 +} __no_const;
35145
35146 struct cryptd_hash_ctx {
35147 struct crypto_shash *child;
35148 @@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
35149
35150 struct cryptd_aead_request_ctx {
35151 crypto_completion_t complete;
35152 -};
35153 +} __no_const;
35154
35155 static void cryptd_queue_worker(struct work_struct *work);
35156
35157 diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
35158 index f8c920c..ab2cb5a 100644
35159 --- a/crypto/pcrypt.c
35160 +++ b/crypto/pcrypt.c
35161 @@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
35162 int ret;
35163
35164 pinst->kobj.kset = pcrypt_kset;
35165 - ret = kobject_add(&pinst->kobj, NULL, name);
35166 + ret = kobject_add(&pinst->kobj, NULL, "%s", name);
35167 if (!ret)
35168 kobject_uevent(&pinst->kobj, KOBJ_ADD);
35169
35170 diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
35171 index f220d64..d359ad6 100644
35172 --- a/drivers/acpi/apei/apei-internal.h
35173 +++ b/drivers/acpi/apei/apei-internal.h
35174 @@ -20,7 +20,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
35175 struct apei_exec_ins_type {
35176 u32 flags;
35177 apei_exec_ins_func_t run;
35178 -};
35179 +} __do_const;
35180
35181 struct apei_exec_context {
35182 u32 ip;
35183 diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
35184 index 33dc6a0..4b24b47 100644
35185 --- a/drivers/acpi/apei/cper.c
35186 +++ b/drivers/acpi/apei/cper.c
35187 @@ -39,12 +39,12 @@
35188 */
35189 u64 cper_next_record_id(void)
35190 {
35191 - static atomic64_t seq;
35192 + static atomic64_unchecked_t seq;
35193
35194 - if (!atomic64_read(&seq))
35195 - atomic64_set(&seq, ((u64)get_seconds()) << 32);
35196 + if (!atomic64_read_unchecked(&seq))
35197 + atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
35198
35199 - return atomic64_inc_return(&seq);
35200 + return atomic64_inc_return_unchecked(&seq);
35201 }
35202 EXPORT_SYMBOL_GPL(cper_next_record_id);
35203
35204 diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
35205 index 8ec37bb..b0716e5 100644
35206 --- a/drivers/acpi/apei/ghes.c
35207 +++ b/drivers/acpi/apei/ghes.c
35208 @@ -498,7 +498,7 @@ static void __ghes_print_estatus(const char *pfx,
35209 const struct acpi_hest_generic *generic,
35210 const struct acpi_hest_generic_status *estatus)
35211 {
35212 - static atomic_t seqno;
35213 + static atomic_unchecked_t seqno;
35214 unsigned int curr_seqno;
35215 char pfx_seq[64];
35216
35217 @@ -509,7 +509,7 @@ static void __ghes_print_estatus(const char *pfx,
35218 else
35219 pfx = KERN_ERR;
35220 }
35221 - curr_seqno = atomic_inc_return(&seqno);
35222 + curr_seqno = atomic_inc_return_unchecked(&seqno);
35223 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
35224 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
35225 pfx_seq, generic->header.source_id);
35226 diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
35227 index a83e3c6..c3d617f 100644
35228 --- a/drivers/acpi/bgrt.c
35229 +++ b/drivers/acpi/bgrt.c
35230 @@ -86,8 +86,10 @@ static int __init bgrt_init(void)
35231 if (!bgrt_image)
35232 return -ENODEV;
35233
35234 - bin_attr_image.private = bgrt_image;
35235 - bin_attr_image.size = bgrt_image_size;
35236 + pax_open_kernel();
35237 + *(void **)&bin_attr_image.private = bgrt_image;
35238 + *(size_t *)&bin_attr_image.size = bgrt_image_size;
35239 + pax_close_kernel();
35240
35241 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
35242 if (!bgrt_kobj)
35243 diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
35244 index 9515f18..4b149c9 100644
35245 --- a/drivers/acpi/blacklist.c
35246 +++ b/drivers/acpi/blacklist.c
35247 @@ -52,7 +52,7 @@ struct acpi_blacklist_item {
35248 u32 is_critical_error;
35249 };
35250
35251 -static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
35252 +static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
35253
35254 /*
35255 * POLICY: If *anything* doesn't work, put it on the blacklist.
35256 @@ -199,7 +199,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
35257 return 0;
35258 }
35259
35260 -static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
35261 +static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
35262 {
35263 .callback = dmi_disable_osi_vista,
35264 .ident = "Fujitsu Siemens",
35265 diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
35266 index 12b62f2..dc2aac8 100644
35267 --- a/drivers/acpi/custom_method.c
35268 +++ b/drivers/acpi/custom_method.c
35269 @@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
35270 struct acpi_table_header table;
35271 acpi_status status;
35272
35273 +#ifdef CONFIG_GRKERNSEC_KMEM
35274 + return -EPERM;
35275 +#endif
35276 +
35277 if (!(*ppos)) {
35278 /* parse the table header to get the table length */
35279 if (count <= sizeof(struct acpi_table_header))
35280 diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
35281 index c7414a5..d5afd71 100644
35282 --- a/drivers/acpi/processor_idle.c
35283 +++ b/drivers/acpi/processor_idle.c
35284 @@ -966,7 +966,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
35285 {
35286 int i, count = CPUIDLE_DRIVER_STATE_START;
35287 struct acpi_processor_cx *cx;
35288 - struct cpuidle_state *state;
35289 + cpuidle_state_no_const *state;
35290 struct cpuidle_driver *drv = &acpi_idle_driver;
35291
35292 if (!pr->flags.power_setup_done)
35293 diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
35294 index 05306a5..733d1f0 100644
35295 --- a/drivers/acpi/sysfs.c
35296 +++ b/drivers/acpi/sysfs.c
35297 @@ -423,11 +423,11 @@ static u32 num_counters;
35298 static struct attribute **all_attrs;
35299 static u32 acpi_gpe_count;
35300
35301 -static struct attribute_group interrupt_stats_attr_group = {
35302 +static attribute_group_no_const interrupt_stats_attr_group = {
35303 .name = "interrupts",
35304 };
35305
35306 -static struct kobj_attribute *counter_attrs;
35307 +static kobj_attribute_no_const *counter_attrs;
35308
35309 static void delete_gpe_attr_array(void)
35310 {
35311 diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
35312 index cfb7447..98f2149 100644
35313 --- a/drivers/ata/libahci.c
35314 +++ b/drivers/ata/libahci.c
35315 @@ -1239,7 +1239,7 @@ int ahci_kick_engine(struct ata_port *ap)
35316 }
35317 EXPORT_SYMBOL_GPL(ahci_kick_engine);
35318
35319 -static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
35320 +static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
35321 struct ata_taskfile *tf, int is_cmd, u16 flags,
35322 unsigned long timeout_msec)
35323 {
35324 diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
35325 index 81a94a3..b711c74 100644
35326 --- a/drivers/ata/libata-core.c
35327 +++ b/drivers/ata/libata-core.c
35328 @@ -98,7 +98,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
35329 static void ata_dev_xfermask(struct ata_device *dev);
35330 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
35331
35332 -atomic_t ata_print_id = ATOMIC_INIT(0);
35333 +atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
35334
35335 struct ata_force_param {
35336 const char *name;
35337 @@ -4809,7 +4809,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
35338 struct ata_port *ap;
35339 unsigned int tag;
35340
35341 - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
35342 + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
35343 ap = qc->ap;
35344
35345 qc->flags = 0;
35346 @@ -4825,7 +4825,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
35347 struct ata_port *ap;
35348 struct ata_link *link;
35349
35350 - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
35351 + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
35352 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
35353 ap = qc->ap;
35354 link = qc->dev->link;
35355 @@ -5944,6 +5944,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
35356 return;
35357
35358 spin_lock(&lock);
35359 + pax_open_kernel();
35360
35361 for (cur = ops->inherits; cur; cur = cur->inherits) {
35362 void **inherit = (void **)cur;
35363 @@ -5957,8 +5958,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
35364 if (IS_ERR(*pp))
35365 *pp = NULL;
35366
35367 - ops->inherits = NULL;
35368 + *(struct ata_port_operations **)&ops->inherits = NULL;
35369
35370 + pax_close_kernel();
35371 spin_unlock(&lock);
35372 }
35373
35374 @@ -6151,7 +6153,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
35375
35376 /* give ports names and add SCSI hosts */
35377 for (i = 0; i < host->n_ports; i++) {
35378 - host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
35379 + host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
35380 host->ports[i]->local_port_no = i + 1;
35381 }
35382
35383 diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
35384 index ab58556..ed19dd2 100644
35385 --- a/drivers/ata/libata-scsi.c
35386 +++ b/drivers/ata/libata-scsi.c
35387 @@ -4114,7 +4114,7 @@ int ata_sas_port_init(struct ata_port *ap)
35388
35389 if (rc)
35390 return rc;
35391 - ap->print_id = atomic_inc_return(&ata_print_id);
35392 + ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
35393 return 0;
35394 }
35395 EXPORT_SYMBOL_GPL(ata_sas_port_init);
35396 diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
35397 index 45b5ab3..98446b8 100644
35398 --- a/drivers/ata/libata.h
35399 +++ b/drivers/ata/libata.h
35400 @@ -53,7 +53,7 @@ enum {
35401 ATA_DNXFER_QUIET = (1 << 31),
35402 };
35403
35404 -extern atomic_t ata_print_id;
35405 +extern atomic_unchecked_t ata_print_id;
35406 extern int atapi_passthru16;
35407 extern int libata_fua;
35408 extern int libata_noacpi;
35409 diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
35410 index 853f610..97d24da 100644
35411 --- a/drivers/ata/pata_arasan_cf.c
35412 +++ b/drivers/ata/pata_arasan_cf.c
35413 @@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
35414 /* Handle platform specific quirks */
35415 if (quirk) {
35416 if (quirk & CF_BROKEN_PIO) {
35417 - ap->ops->set_piomode = NULL;
35418 + pax_open_kernel();
35419 + *(void **)&ap->ops->set_piomode = NULL;
35420 + pax_close_kernel();
35421 ap->pio_mask = 0;
35422 }
35423 if (quirk & CF_BROKEN_MWDMA)
35424 diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
35425 index f9b983a..887b9d8 100644
35426 --- a/drivers/atm/adummy.c
35427 +++ b/drivers/atm/adummy.c
35428 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
35429 vcc->pop(vcc, skb);
35430 else
35431 dev_kfree_skb_any(skb);
35432 - atomic_inc(&vcc->stats->tx);
35433 + atomic_inc_unchecked(&vcc->stats->tx);
35434
35435 return 0;
35436 }
35437 diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
35438 index 62a7607..cc4be104 100644
35439 --- a/drivers/atm/ambassador.c
35440 +++ b/drivers/atm/ambassador.c
35441 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
35442 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
35443
35444 // VC layer stats
35445 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
35446 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
35447
35448 // free the descriptor
35449 kfree (tx_descr);
35450 @@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
35451 dump_skb ("<<<", vc, skb);
35452
35453 // VC layer stats
35454 - atomic_inc(&atm_vcc->stats->rx);
35455 + atomic_inc_unchecked(&atm_vcc->stats->rx);
35456 __net_timestamp(skb);
35457 // end of our responsibility
35458 atm_vcc->push (atm_vcc, skb);
35459 @@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
35460 } else {
35461 PRINTK (KERN_INFO, "dropped over-size frame");
35462 // should we count this?
35463 - atomic_inc(&atm_vcc->stats->rx_drop);
35464 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
35465 }
35466
35467 } else {
35468 @@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
35469 }
35470
35471 if (check_area (skb->data, skb->len)) {
35472 - atomic_inc(&atm_vcc->stats->tx_err);
35473 + atomic_inc_unchecked(&atm_vcc->stats->tx_err);
35474 return -ENOMEM; // ?
35475 }
35476
35477 diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
35478 index 0e3f8f9..765a7a5 100644
35479 --- a/drivers/atm/atmtcp.c
35480 +++ b/drivers/atm/atmtcp.c
35481 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
35482 if (vcc->pop) vcc->pop(vcc,skb);
35483 else dev_kfree_skb(skb);
35484 if (dev_data) return 0;
35485 - atomic_inc(&vcc->stats->tx_err);
35486 + atomic_inc_unchecked(&vcc->stats->tx_err);
35487 return -ENOLINK;
35488 }
35489 size = skb->len+sizeof(struct atmtcp_hdr);
35490 @@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
35491 if (!new_skb) {
35492 if (vcc->pop) vcc->pop(vcc,skb);
35493 else dev_kfree_skb(skb);
35494 - atomic_inc(&vcc->stats->tx_err);
35495 + atomic_inc_unchecked(&vcc->stats->tx_err);
35496 return -ENOBUFS;
35497 }
35498 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
35499 @@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
35500 if (vcc->pop) vcc->pop(vcc,skb);
35501 else dev_kfree_skb(skb);
35502 out_vcc->push(out_vcc,new_skb);
35503 - atomic_inc(&vcc->stats->tx);
35504 - atomic_inc(&out_vcc->stats->rx);
35505 + atomic_inc_unchecked(&vcc->stats->tx);
35506 + atomic_inc_unchecked(&out_vcc->stats->rx);
35507 return 0;
35508 }
35509
35510 @@ -299,7 +299,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
35511 out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
35512 read_unlock(&vcc_sklist_lock);
35513 if (!out_vcc) {
35514 - atomic_inc(&vcc->stats->tx_err);
35515 + atomic_inc_unchecked(&vcc->stats->tx_err);
35516 goto done;
35517 }
35518 skb_pull(skb,sizeof(struct atmtcp_hdr));
35519 @@ -311,8 +311,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
35520 __net_timestamp(new_skb);
35521 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
35522 out_vcc->push(out_vcc,new_skb);
35523 - atomic_inc(&vcc->stats->tx);
35524 - atomic_inc(&out_vcc->stats->rx);
35525 + atomic_inc_unchecked(&vcc->stats->tx);
35526 + atomic_inc_unchecked(&out_vcc->stats->rx);
35527 done:
35528 if (vcc->pop) vcc->pop(vcc,skb);
35529 else dev_kfree_skb(skb);
35530 diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
35531 index b1955ba..b179940 100644
35532 --- a/drivers/atm/eni.c
35533 +++ b/drivers/atm/eni.c
35534 @@ -522,7 +522,7 @@ static int rx_aal0(struct atm_vcc *vcc)
35535 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
35536 vcc->dev->number);
35537 length = 0;
35538 - atomic_inc(&vcc->stats->rx_err);
35539 + atomic_inc_unchecked(&vcc->stats->rx_err);
35540 }
35541 else {
35542 length = ATM_CELL_SIZE-1; /* no HEC */
35543 @@ -577,7 +577,7 @@ static int rx_aal5(struct atm_vcc *vcc)
35544 size);
35545 }
35546 eff = length = 0;
35547 - atomic_inc(&vcc->stats->rx_err);
35548 + atomic_inc_unchecked(&vcc->stats->rx_err);
35549 }
35550 else {
35551 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
35552 @@ -594,7 +594,7 @@ static int rx_aal5(struct atm_vcc *vcc)
35553 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
35554 vcc->dev->number,vcc->vci,length,size << 2,descr);
35555 length = eff = 0;
35556 - atomic_inc(&vcc->stats->rx_err);
35557 + atomic_inc_unchecked(&vcc->stats->rx_err);
35558 }
35559 }
35560 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
35561 @@ -767,7 +767,7 @@ rx_dequeued++;
35562 vcc->push(vcc,skb);
35563 pushed++;
35564 }
35565 - atomic_inc(&vcc->stats->rx);
35566 + atomic_inc_unchecked(&vcc->stats->rx);
35567 }
35568 wake_up(&eni_dev->rx_wait);
35569 }
35570 @@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *dev)
35571 PCI_DMA_TODEVICE);
35572 if (vcc->pop) vcc->pop(vcc,skb);
35573 else dev_kfree_skb_irq(skb);
35574 - atomic_inc(&vcc->stats->tx);
35575 + atomic_inc_unchecked(&vcc->stats->tx);
35576 wake_up(&eni_dev->tx_wait);
35577 dma_complete++;
35578 }
35579 diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
35580 index b41c948..a002b17 100644
35581 --- a/drivers/atm/firestream.c
35582 +++ b/drivers/atm/firestream.c
35583 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
35584 }
35585 }
35586
35587 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
35588 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
35589
35590 fs_dprintk (FS_DEBUG_TXMEM, "i");
35591 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
35592 @@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
35593 #endif
35594 skb_put (skb, qe->p1 & 0xffff);
35595 ATM_SKB(skb)->vcc = atm_vcc;
35596 - atomic_inc(&atm_vcc->stats->rx);
35597 + atomic_inc_unchecked(&atm_vcc->stats->rx);
35598 __net_timestamp(skb);
35599 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
35600 atm_vcc->push (atm_vcc, skb);
35601 @@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
35602 kfree (pe);
35603 }
35604 if (atm_vcc)
35605 - atomic_inc(&atm_vcc->stats->rx_drop);
35606 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
35607 break;
35608 case 0x1f: /* Reassembly abort: no buffers. */
35609 /* Silently increment error counter. */
35610 if (atm_vcc)
35611 - atomic_inc(&atm_vcc->stats->rx_drop);
35612 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
35613 break;
35614 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
35615 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
35616 diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
35617 index 204814e..cede831 100644
35618 --- a/drivers/atm/fore200e.c
35619 +++ b/drivers/atm/fore200e.c
35620 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
35621 #endif
35622 /* check error condition */
35623 if (*entry->status & STATUS_ERROR)
35624 - atomic_inc(&vcc->stats->tx_err);
35625 + atomic_inc_unchecked(&vcc->stats->tx_err);
35626 else
35627 - atomic_inc(&vcc->stats->tx);
35628 + atomic_inc_unchecked(&vcc->stats->tx);
35629 }
35630 }
35631
35632 @@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
35633 if (skb == NULL) {
35634 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
35635
35636 - atomic_inc(&vcc->stats->rx_drop);
35637 + atomic_inc_unchecked(&vcc->stats->rx_drop);
35638 return -ENOMEM;
35639 }
35640
35641 @@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
35642
35643 dev_kfree_skb_any(skb);
35644
35645 - atomic_inc(&vcc->stats->rx_drop);
35646 + atomic_inc_unchecked(&vcc->stats->rx_drop);
35647 return -ENOMEM;
35648 }
35649
35650 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
35651
35652 vcc->push(vcc, skb);
35653 - atomic_inc(&vcc->stats->rx);
35654 + atomic_inc_unchecked(&vcc->stats->rx);
35655
35656 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
35657
35658 @@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
35659 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
35660 fore200e->atm_dev->number,
35661 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
35662 - atomic_inc(&vcc->stats->rx_err);
35663 + atomic_inc_unchecked(&vcc->stats->rx_err);
35664 }
35665 }
35666
35667 @@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
35668 goto retry_here;
35669 }
35670
35671 - atomic_inc(&vcc->stats->tx_err);
35672 + atomic_inc_unchecked(&vcc->stats->tx_err);
35673
35674 fore200e->tx_sat++;
35675 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
35676 diff --git a/drivers/atm/he.c b/drivers/atm/he.c
35677 index 8557adc..3fb5d55 100644
35678 --- a/drivers/atm/he.c
35679 +++ b/drivers/atm/he.c
35680 @@ -1691,7 +1691,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
35681
35682 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
35683 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
35684 - atomic_inc(&vcc->stats->rx_drop);
35685 + atomic_inc_unchecked(&vcc->stats->rx_drop);
35686 goto return_host_buffers;
35687 }
35688
35689 @@ -1718,7 +1718,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
35690 RBRQ_LEN_ERR(he_dev->rbrq_head)
35691 ? "LEN_ERR" : "",
35692 vcc->vpi, vcc->vci);
35693 - atomic_inc(&vcc->stats->rx_err);
35694 + atomic_inc_unchecked(&vcc->stats->rx_err);
35695 goto return_host_buffers;
35696 }
35697
35698 @@ -1770,7 +1770,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
35699 vcc->push(vcc, skb);
35700 spin_lock(&he_dev->global_lock);
35701
35702 - atomic_inc(&vcc->stats->rx);
35703 + atomic_inc_unchecked(&vcc->stats->rx);
35704
35705 return_host_buffers:
35706 ++pdus_assembled;
35707 @@ -2096,7 +2096,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
35708 tpd->vcc->pop(tpd->vcc, tpd->skb);
35709 else
35710 dev_kfree_skb_any(tpd->skb);
35711 - atomic_inc(&tpd->vcc->stats->tx_err);
35712 + atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
35713 }
35714 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
35715 return;
35716 @@ -2508,7 +2508,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
35717 vcc->pop(vcc, skb);
35718 else
35719 dev_kfree_skb_any(skb);
35720 - atomic_inc(&vcc->stats->tx_err);
35721 + atomic_inc_unchecked(&vcc->stats->tx_err);
35722 return -EINVAL;
35723 }
35724
35725 @@ -2519,7 +2519,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
35726 vcc->pop(vcc, skb);
35727 else
35728 dev_kfree_skb_any(skb);
35729 - atomic_inc(&vcc->stats->tx_err);
35730 + atomic_inc_unchecked(&vcc->stats->tx_err);
35731 return -EINVAL;
35732 }
35733 #endif
35734 @@ -2531,7 +2531,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
35735 vcc->pop(vcc, skb);
35736 else
35737 dev_kfree_skb_any(skb);
35738 - atomic_inc(&vcc->stats->tx_err);
35739 + atomic_inc_unchecked(&vcc->stats->tx_err);
35740 spin_unlock_irqrestore(&he_dev->global_lock, flags);
35741 return -ENOMEM;
35742 }
35743 @@ -2573,7 +2573,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
35744 vcc->pop(vcc, skb);
35745 else
35746 dev_kfree_skb_any(skb);
35747 - atomic_inc(&vcc->stats->tx_err);
35748 + atomic_inc_unchecked(&vcc->stats->tx_err);
35749 spin_unlock_irqrestore(&he_dev->global_lock, flags);
35750 return -ENOMEM;
35751 }
35752 @@ -2604,7 +2604,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
35753 __enqueue_tpd(he_dev, tpd, cid);
35754 spin_unlock_irqrestore(&he_dev->global_lock, flags);
35755
35756 - atomic_inc(&vcc->stats->tx);
35757 + atomic_inc_unchecked(&vcc->stats->tx);
35758
35759 return 0;
35760 }
35761 diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
35762 index 1dc0519..1aadaf7 100644
35763 --- a/drivers/atm/horizon.c
35764 +++ b/drivers/atm/horizon.c
35765 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
35766 {
35767 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
35768 // VC layer stats
35769 - atomic_inc(&vcc->stats->rx);
35770 + atomic_inc_unchecked(&vcc->stats->rx);
35771 __net_timestamp(skb);
35772 // end of our responsibility
35773 vcc->push (vcc, skb);
35774 @@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
35775 dev->tx_iovec = NULL;
35776
35777 // VC layer stats
35778 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
35779 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
35780
35781 // free the skb
35782 hrz_kfree_skb (skb);
35783 diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
35784 index 1bdf104..9dc44b1 100644
35785 --- a/drivers/atm/idt77252.c
35786 +++ b/drivers/atm/idt77252.c
35787 @@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
35788 else
35789 dev_kfree_skb(skb);
35790
35791 - atomic_inc(&vcc->stats->tx);
35792 + atomic_inc_unchecked(&vcc->stats->tx);
35793 }
35794
35795 atomic_dec(&scq->used);
35796 @@ -1075,13 +1075,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
35797 if ((sb = dev_alloc_skb(64)) == NULL) {
35798 printk("%s: Can't allocate buffers for aal0.\n",
35799 card->name);
35800 - atomic_add(i, &vcc->stats->rx_drop);
35801 + atomic_add_unchecked(i, &vcc->stats->rx_drop);
35802 break;
35803 }
35804 if (!atm_charge(vcc, sb->truesize)) {
35805 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
35806 card->name);
35807 - atomic_add(i - 1, &vcc->stats->rx_drop);
35808 + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
35809 dev_kfree_skb(sb);
35810 break;
35811 }
35812 @@ -1098,7 +1098,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
35813 ATM_SKB(sb)->vcc = vcc;
35814 __net_timestamp(sb);
35815 vcc->push(vcc, sb);
35816 - atomic_inc(&vcc->stats->rx);
35817 + atomic_inc_unchecked(&vcc->stats->rx);
35818
35819 cell += ATM_CELL_PAYLOAD;
35820 }
35821 @@ -1135,13 +1135,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
35822 "(CDC: %08x)\n",
35823 card->name, len, rpp->len, readl(SAR_REG_CDC));
35824 recycle_rx_pool_skb(card, rpp);
35825 - atomic_inc(&vcc->stats->rx_err);
35826 + atomic_inc_unchecked(&vcc->stats->rx_err);
35827 return;
35828 }
35829 if (stat & SAR_RSQE_CRC) {
35830 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
35831 recycle_rx_pool_skb(card, rpp);
35832 - atomic_inc(&vcc->stats->rx_err);
35833 + atomic_inc_unchecked(&vcc->stats->rx_err);
35834 return;
35835 }
35836 if (skb_queue_len(&rpp->queue) > 1) {
35837 @@ -1152,7 +1152,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
35838 RXPRINTK("%s: Can't alloc RX skb.\n",
35839 card->name);
35840 recycle_rx_pool_skb(card, rpp);
35841 - atomic_inc(&vcc->stats->rx_err);
35842 + atomic_inc_unchecked(&vcc->stats->rx_err);
35843 return;
35844 }
35845 if (!atm_charge(vcc, skb->truesize)) {
35846 @@ -1171,7 +1171,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
35847 __net_timestamp(skb);
35848
35849 vcc->push(vcc, skb);
35850 - atomic_inc(&vcc->stats->rx);
35851 + atomic_inc_unchecked(&vcc->stats->rx);
35852
35853 return;
35854 }
35855 @@ -1193,7 +1193,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
35856 __net_timestamp(skb);
35857
35858 vcc->push(vcc, skb);
35859 - atomic_inc(&vcc->stats->rx);
35860 + atomic_inc_unchecked(&vcc->stats->rx);
35861
35862 if (skb->truesize > SAR_FB_SIZE_3)
35863 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
35864 @@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
35865 if (vcc->qos.aal != ATM_AAL0) {
35866 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
35867 card->name, vpi, vci);
35868 - atomic_inc(&vcc->stats->rx_drop);
35869 + atomic_inc_unchecked(&vcc->stats->rx_drop);
35870 goto drop;
35871 }
35872
35873 if ((sb = dev_alloc_skb(64)) == NULL) {
35874 printk("%s: Can't allocate buffers for AAL0.\n",
35875 card->name);
35876 - atomic_inc(&vcc->stats->rx_err);
35877 + atomic_inc_unchecked(&vcc->stats->rx_err);
35878 goto drop;
35879 }
35880
35881 @@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
35882 ATM_SKB(sb)->vcc = vcc;
35883 __net_timestamp(sb);
35884 vcc->push(vcc, sb);
35885 - atomic_inc(&vcc->stats->rx);
35886 + atomic_inc_unchecked(&vcc->stats->rx);
35887
35888 drop:
35889 skb_pull(queue, 64);
35890 @@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
35891
35892 if (vc == NULL) {
35893 printk("%s: NULL connection in send().\n", card->name);
35894 - atomic_inc(&vcc->stats->tx_err);
35895 + atomic_inc_unchecked(&vcc->stats->tx_err);
35896 dev_kfree_skb(skb);
35897 return -EINVAL;
35898 }
35899 if (!test_bit(VCF_TX, &vc->flags)) {
35900 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
35901 - atomic_inc(&vcc->stats->tx_err);
35902 + atomic_inc_unchecked(&vcc->stats->tx_err);
35903 dev_kfree_skb(skb);
35904 return -EINVAL;
35905 }
35906 @@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
35907 break;
35908 default:
35909 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
35910 - atomic_inc(&vcc->stats->tx_err);
35911 + atomic_inc_unchecked(&vcc->stats->tx_err);
35912 dev_kfree_skb(skb);
35913 return -EINVAL;
35914 }
35915
35916 if (skb_shinfo(skb)->nr_frags != 0) {
35917 printk("%s: No scatter-gather yet.\n", card->name);
35918 - atomic_inc(&vcc->stats->tx_err);
35919 + atomic_inc_unchecked(&vcc->stats->tx_err);
35920 dev_kfree_skb(skb);
35921 return -EINVAL;
35922 }
35923 @@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
35924
35925 err = queue_skb(card, vc, skb, oam);
35926 if (err) {
35927 - atomic_inc(&vcc->stats->tx_err);
35928 + atomic_inc_unchecked(&vcc->stats->tx_err);
35929 dev_kfree_skb(skb);
35930 return err;
35931 }
35932 @@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
35933 skb = dev_alloc_skb(64);
35934 if (!skb) {
35935 printk("%s: Out of memory in send_oam().\n", card->name);
35936 - atomic_inc(&vcc->stats->tx_err);
35937 + atomic_inc_unchecked(&vcc->stats->tx_err);
35938 return -ENOMEM;
35939 }
35940 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
35941 diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
35942 index 4217f29..88f547a 100644
35943 --- a/drivers/atm/iphase.c
35944 +++ b/drivers/atm/iphase.c
35945 @@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
35946 status = (u_short) (buf_desc_ptr->desc_mode);
35947 if (status & (RX_CER | RX_PTE | RX_OFL))
35948 {
35949 - atomic_inc(&vcc->stats->rx_err);
35950 + atomic_inc_unchecked(&vcc->stats->rx_err);
35951 IF_ERR(printk("IA: bad packet, dropping it");)
35952 if (status & RX_CER) {
35953 IF_ERR(printk(" cause: packet CRC error\n");)
35954 @@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
35955 len = dma_addr - buf_addr;
35956 if (len > iadev->rx_buf_sz) {
35957 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
35958 - atomic_inc(&vcc->stats->rx_err);
35959 + atomic_inc_unchecked(&vcc->stats->rx_err);
35960 goto out_free_desc;
35961 }
35962
35963 @@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
35964 ia_vcc = INPH_IA_VCC(vcc);
35965 if (ia_vcc == NULL)
35966 {
35967 - atomic_inc(&vcc->stats->rx_err);
35968 + atomic_inc_unchecked(&vcc->stats->rx_err);
35969 atm_return(vcc, skb->truesize);
35970 dev_kfree_skb_any(skb);
35971 goto INCR_DLE;
35972 @@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
35973 if ((length > iadev->rx_buf_sz) || (length >
35974 (skb->len - sizeof(struct cpcs_trailer))))
35975 {
35976 - atomic_inc(&vcc->stats->rx_err);
35977 + atomic_inc_unchecked(&vcc->stats->rx_err);
35978 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
35979 length, skb->len);)
35980 atm_return(vcc, skb->truesize);
35981 @@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
35982
35983 IF_RX(printk("rx_dle_intr: skb push");)
35984 vcc->push(vcc,skb);
35985 - atomic_inc(&vcc->stats->rx);
35986 + atomic_inc_unchecked(&vcc->stats->rx);
35987 iadev->rx_pkt_cnt++;
35988 }
35989 INCR_DLE:
35990 @@ -2826,15 +2826,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
35991 {
35992 struct k_sonet_stats *stats;
35993 stats = &PRIV(_ia_dev[board])->sonet_stats;
35994 - printk("section_bip: %d\n", atomic_read(&stats->section_bip));
35995 - printk("line_bip : %d\n", atomic_read(&stats->line_bip));
35996 - printk("path_bip : %d\n", atomic_read(&stats->path_bip));
35997 - printk("line_febe : %d\n", atomic_read(&stats->line_febe));
35998 - printk("path_febe : %d\n", atomic_read(&stats->path_febe));
35999 - printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
36000 - printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
36001 - printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
36002 - printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
36003 + printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
36004 + printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
36005 + printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
36006 + printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
36007 + printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
36008 + printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
36009 + printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
36010 + printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
36011 + printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
36012 }
36013 ia_cmds.status = 0;
36014 break;
36015 @@ -2939,7 +2939,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
36016 if ((desc == 0) || (desc > iadev->num_tx_desc))
36017 {
36018 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
36019 - atomic_inc(&vcc->stats->tx);
36020 + atomic_inc_unchecked(&vcc->stats->tx);
36021 if (vcc->pop)
36022 vcc->pop(vcc, skb);
36023 else
36024 @@ -3044,14 +3044,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
36025 ATM_DESC(skb) = vcc->vci;
36026 skb_queue_tail(&iadev->tx_dma_q, skb);
36027
36028 - atomic_inc(&vcc->stats->tx);
36029 + atomic_inc_unchecked(&vcc->stats->tx);
36030 iadev->tx_pkt_cnt++;
36031 /* Increment transaction counter */
36032 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
36033
36034 #if 0
36035 /* add flow control logic */
36036 - if (atomic_read(&vcc->stats->tx) % 20 == 0) {
36037 + if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
36038 if (iavcc->vc_desc_cnt > 10) {
36039 vcc->tx_quota = vcc->tx_quota * 3 / 4;
36040 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
36041 diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
36042 index fa7d701..1e404c7 100644
36043 --- a/drivers/atm/lanai.c
36044 +++ b/drivers/atm/lanai.c
36045 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
36046 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
36047 lanai_endtx(lanai, lvcc);
36048 lanai_free_skb(lvcc->tx.atmvcc, skb);
36049 - atomic_inc(&lvcc->tx.atmvcc->stats->tx);
36050 + atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
36051 }
36052
36053 /* Try to fill the buffer - don't call unless there is backlog */
36054 @@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
36055 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
36056 __net_timestamp(skb);
36057 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
36058 - atomic_inc(&lvcc->rx.atmvcc->stats->rx);
36059 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
36060 out:
36061 lvcc->rx.buf.ptr = end;
36062 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
36063 @@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
36064 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
36065 "vcc %d\n", lanai->number, (unsigned int) s, vci);
36066 lanai->stats.service_rxnotaal5++;
36067 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
36068 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
36069 return 0;
36070 }
36071 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
36072 @@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
36073 int bytes;
36074 read_unlock(&vcc_sklist_lock);
36075 DPRINTK("got trashed rx pdu on vci %d\n", vci);
36076 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
36077 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
36078 lvcc->stats.x.aal5.service_trash++;
36079 bytes = (SERVICE_GET_END(s) * 16) -
36080 (((unsigned long) lvcc->rx.buf.ptr) -
36081 @@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
36082 }
36083 if (s & SERVICE_STREAM) {
36084 read_unlock(&vcc_sklist_lock);
36085 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
36086 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
36087 lvcc->stats.x.aal5.service_stream++;
36088 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
36089 "PDU on VCI %d!\n", lanai->number, vci);
36090 @@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
36091 return 0;
36092 }
36093 DPRINTK("got rx crc error on vci %d\n", vci);
36094 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
36095 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
36096 lvcc->stats.x.aal5.service_rxcrc++;
36097 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
36098 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
36099 diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
36100 index 5aca5f4..ce3a6b0 100644
36101 --- a/drivers/atm/nicstar.c
36102 +++ b/drivers/atm/nicstar.c
36103 @@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
36104 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
36105 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
36106 card->index);
36107 - atomic_inc(&vcc->stats->tx_err);
36108 + atomic_inc_unchecked(&vcc->stats->tx_err);
36109 dev_kfree_skb_any(skb);
36110 return -EINVAL;
36111 }
36112 @@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
36113 if (!vc->tx) {
36114 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
36115 card->index);
36116 - atomic_inc(&vcc->stats->tx_err);
36117 + atomic_inc_unchecked(&vcc->stats->tx_err);
36118 dev_kfree_skb_any(skb);
36119 return -EINVAL;
36120 }
36121 @@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
36122 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
36123 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
36124 card->index);
36125 - atomic_inc(&vcc->stats->tx_err);
36126 + atomic_inc_unchecked(&vcc->stats->tx_err);
36127 dev_kfree_skb_any(skb);
36128 return -EINVAL;
36129 }
36130
36131 if (skb_shinfo(skb)->nr_frags != 0) {
36132 printk("nicstar%d: No scatter-gather yet.\n", card->index);
36133 - atomic_inc(&vcc->stats->tx_err);
36134 + atomic_inc_unchecked(&vcc->stats->tx_err);
36135 dev_kfree_skb_any(skb);
36136 return -EINVAL;
36137 }
36138 @@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
36139 }
36140
36141 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
36142 - atomic_inc(&vcc->stats->tx_err);
36143 + atomic_inc_unchecked(&vcc->stats->tx_err);
36144 dev_kfree_skb_any(skb);
36145 return -EIO;
36146 }
36147 - atomic_inc(&vcc->stats->tx);
36148 + atomic_inc_unchecked(&vcc->stats->tx);
36149
36150 return 0;
36151 }
36152 @@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36153 printk
36154 ("nicstar%d: Can't allocate buffers for aal0.\n",
36155 card->index);
36156 - atomic_add(i, &vcc->stats->rx_drop);
36157 + atomic_add_unchecked(i, &vcc->stats->rx_drop);
36158 break;
36159 }
36160 if (!atm_charge(vcc, sb->truesize)) {
36161 RXPRINTK
36162 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
36163 card->index);
36164 - atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
36165 + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
36166 dev_kfree_skb_any(sb);
36167 break;
36168 }
36169 @@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36170 ATM_SKB(sb)->vcc = vcc;
36171 __net_timestamp(sb);
36172 vcc->push(vcc, sb);
36173 - atomic_inc(&vcc->stats->rx);
36174 + atomic_inc_unchecked(&vcc->stats->rx);
36175 cell += ATM_CELL_PAYLOAD;
36176 }
36177
36178 @@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36179 if (iovb == NULL) {
36180 printk("nicstar%d: Out of iovec buffers.\n",
36181 card->index);
36182 - atomic_inc(&vcc->stats->rx_drop);
36183 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36184 recycle_rx_buf(card, skb);
36185 return;
36186 }
36187 @@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36188 small or large buffer itself. */
36189 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
36190 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
36191 - atomic_inc(&vcc->stats->rx_err);
36192 + atomic_inc_unchecked(&vcc->stats->rx_err);
36193 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
36194 NS_MAX_IOVECS);
36195 NS_PRV_IOVCNT(iovb) = 0;
36196 @@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36197 ("nicstar%d: Expected a small buffer, and this is not one.\n",
36198 card->index);
36199 which_list(card, skb);
36200 - atomic_inc(&vcc->stats->rx_err);
36201 + atomic_inc_unchecked(&vcc->stats->rx_err);
36202 recycle_rx_buf(card, skb);
36203 vc->rx_iov = NULL;
36204 recycle_iov_buf(card, iovb);
36205 @@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36206 ("nicstar%d: Expected a large buffer, and this is not one.\n",
36207 card->index);
36208 which_list(card, skb);
36209 - atomic_inc(&vcc->stats->rx_err);
36210 + atomic_inc_unchecked(&vcc->stats->rx_err);
36211 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
36212 NS_PRV_IOVCNT(iovb));
36213 vc->rx_iov = NULL;
36214 @@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36215 printk(" - PDU size mismatch.\n");
36216 else
36217 printk(".\n");
36218 - atomic_inc(&vcc->stats->rx_err);
36219 + atomic_inc_unchecked(&vcc->stats->rx_err);
36220 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
36221 NS_PRV_IOVCNT(iovb));
36222 vc->rx_iov = NULL;
36223 @@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36224 /* skb points to a small buffer */
36225 if (!atm_charge(vcc, skb->truesize)) {
36226 push_rxbufs(card, skb);
36227 - atomic_inc(&vcc->stats->rx_drop);
36228 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36229 } else {
36230 skb_put(skb, len);
36231 dequeue_sm_buf(card, skb);
36232 @@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36233 ATM_SKB(skb)->vcc = vcc;
36234 __net_timestamp(skb);
36235 vcc->push(vcc, skb);
36236 - atomic_inc(&vcc->stats->rx);
36237 + atomic_inc_unchecked(&vcc->stats->rx);
36238 }
36239 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
36240 struct sk_buff *sb;
36241 @@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36242 if (len <= NS_SMBUFSIZE) {
36243 if (!atm_charge(vcc, sb->truesize)) {
36244 push_rxbufs(card, sb);
36245 - atomic_inc(&vcc->stats->rx_drop);
36246 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36247 } else {
36248 skb_put(sb, len);
36249 dequeue_sm_buf(card, sb);
36250 @@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36251 ATM_SKB(sb)->vcc = vcc;
36252 __net_timestamp(sb);
36253 vcc->push(vcc, sb);
36254 - atomic_inc(&vcc->stats->rx);
36255 + atomic_inc_unchecked(&vcc->stats->rx);
36256 }
36257
36258 push_rxbufs(card, skb);
36259 @@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36260
36261 if (!atm_charge(vcc, skb->truesize)) {
36262 push_rxbufs(card, skb);
36263 - atomic_inc(&vcc->stats->rx_drop);
36264 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36265 } else {
36266 dequeue_lg_buf(card, skb);
36267 #ifdef NS_USE_DESTRUCTORS
36268 @@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36269 ATM_SKB(skb)->vcc = vcc;
36270 __net_timestamp(skb);
36271 vcc->push(vcc, skb);
36272 - atomic_inc(&vcc->stats->rx);
36273 + atomic_inc_unchecked(&vcc->stats->rx);
36274 }
36275
36276 push_rxbufs(card, sb);
36277 @@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36278 printk
36279 ("nicstar%d: Out of huge buffers.\n",
36280 card->index);
36281 - atomic_inc(&vcc->stats->rx_drop);
36282 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36283 recycle_iovec_rx_bufs(card,
36284 (struct iovec *)
36285 iovb->data,
36286 @@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36287 card->hbpool.count++;
36288 } else
36289 dev_kfree_skb_any(hb);
36290 - atomic_inc(&vcc->stats->rx_drop);
36291 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36292 } else {
36293 /* Copy the small buffer to the huge buffer */
36294 sb = (struct sk_buff *)iov->iov_base;
36295 @@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36296 #endif /* NS_USE_DESTRUCTORS */
36297 __net_timestamp(hb);
36298 vcc->push(vcc, hb);
36299 - atomic_inc(&vcc->stats->rx);
36300 + atomic_inc_unchecked(&vcc->stats->rx);
36301 }
36302 }
36303
36304 diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
36305 index 32784d1..4a8434a 100644
36306 --- a/drivers/atm/solos-pci.c
36307 +++ b/drivers/atm/solos-pci.c
36308 @@ -838,7 +838,7 @@ void solos_bh(unsigned long card_arg)
36309 }
36310 atm_charge(vcc, skb->truesize);
36311 vcc->push(vcc, skb);
36312 - atomic_inc(&vcc->stats->rx);
36313 + atomic_inc_unchecked(&vcc->stats->rx);
36314 break;
36315
36316 case PKT_STATUS:
36317 @@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
36318 vcc = SKB_CB(oldskb)->vcc;
36319
36320 if (vcc) {
36321 - atomic_inc(&vcc->stats->tx);
36322 + atomic_inc_unchecked(&vcc->stats->tx);
36323 solos_pop(vcc, oldskb);
36324 } else {
36325 dev_kfree_skb_irq(oldskb);
36326 diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
36327 index 0215934..ce9f5b1 100644
36328 --- a/drivers/atm/suni.c
36329 +++ b/drivers/atm/suni.c
36330 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
36331
36332
36333 #define ADD_LIMITED(s,v) \
36334 - atomic_add((v),&stats->s); \
36335 - if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
36336 + atomic_add_unchecked((v),&stats->s); \
36337 + if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
36338
36339
36340 static void suni_hz(unsigned long from_timer)
36341 diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
36342 index 5120a96..e2572bd 100644
36343 --- a/drivers/atm/uPD98402.c
36344 +++ b/drivers/atm/uPD98402.c
36345 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
36346 struct sonet_stats tmp;
36347 int error = 0;
36348
36349 - atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
36350 + atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
36351 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
36352 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
36353 if (zero && !error) {
36354 @@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
36355
36356
36357 #define ADD_LIMITED(s,v) \
36358 - { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
36359 - if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
36360 - atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
36361 + { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
36362 + if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
36363 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
36364
36365
36366 static void stat_event(struct atm_dev *dev)
36367 @@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
36368 if (reason & uPD98402_INT_PFM) stat_event(dev);
36369 if (reason & uPD98402_INT_PCO) {
36370 (void) GET(PCOCR); /* clear interrupt cause */
36371 - atomic_add(GET(HECCT),
36372 + atomic_add_unchecked(GET(HECCT),
36373 &PRIV(dev)->sonet_stats.uncorr_hcs);
36374 }
36375 if ((reason & uPD98402_INT_RFO) &&
36376 @@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
36377 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
36378 uPD98402_INT_LOS),PIMR); /* enable them */
36379 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
36380 - atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
36381 - atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
36382 - atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
36383 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
36384 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
36385 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
36386 return 0;
36387 }
36388
36389 diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
36390 index 969c3c2..9b72956 100644
36391 --- a/drivers/atm/zatm.c
36392 +++ b/drivers/atm/zatm.c
36393 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
36394 }
36395 if (!size) {
36396 dev_kfree_skb_irq(skb);
36397 - if (vcc) atomic_inc(&vcc->stats->rx_err);
36398 + if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
36399 continue;
36400 }
36401 if (!atm_charge(vcc,skb->truesize)) {
36402 @@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
36403 skb->len = size;
36404 ATM_SKB(skb)->vcc = vcc;
36405 vcc->push(vcc,skb);
36406 - atomic_inc(&vcc->stats->rx);
36407 + atomic_inc_unchecked(&vcc->stats->rx);
36408 }
36409 zout(pos & 0xffff,MTA(mbx));
36410 #if 0 /* probably a stupid idea */
36411 @@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
36412 skb_queue_head(&zatm_vcc->backlog,skb);
36413 break;
36414 }
36415 - atomic_inc(&vcc->stats->tx);
36416 + atomic_inc_unchecked(&vcc->stats->tx);
36417 wake_up(&zatm_vcc->tx_wait);
36418 }
36419
36420 diff --git a/drivers/base/bus.c b/drivers/base/bus.c
36421 index 4c289ab..de1c333 100644
36422 --- a/drivers/base/bus.c
36423 +++ b/drivers/base/bus.c
36424 @@ -1193,7 +1193,7 @@ int subsys_interface_register(struct subsys_interface *sif)
36425 return -EINVAL;
36426
36427 mutex_lock(&subsys->p->mutex);
36428 - list_add_tail(&sif->node, &subsys->p->interfaces);
36429 + pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
36430 if (sif->add_dev) {
36431 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
36432 while ((dev = subsys_dev_iter_next(&iter)))
36433 @@ -1218,7 +1218,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
36434 subsys = sif->subsys;
36435
36436 mutex_lock(&subsys->p->mutex);
36437 - list_del_init(&sif->node);
36438 + pax_list_del_init((struct list_head *)&sif->node);
36439 if (sif->remove_dev) {
36440 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
36441 while ((dev = subsys_dev_iter_next(&iter)))
36442 diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
36443 index 7413d06..79155fa 100644
36444 --- a/drivers/base/devtmpfs.c
36445 +++ b/drivers/base/devtmpfs.c
36446 @@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
36447 if (!thread)
36448 return 0;
36449
36450 - err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
36451 + err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
36452 if (err)
36453 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
36454 else
36455 @@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
36456 *err = sys_unshare(CLONE_NEWNS);
36457 if (*err)
36458 goto out;
36459 - *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
36460 + *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
36461 if (*err)
36462 goto out;
36463 - sys_chdir("/.."); /* will traverse into overmounted root */
36464 - sys_chroot(".");
36465 + sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
36466 + sys_chroot((char __force_user *)".");
36467 complete(&setup_done);
36468 while (1) {
36469 spin_lock(&req_lock);
36470 diff --git a/drivers/base/node.c b/drivers/base/node.c
36471 index bc9f43b..29703b8 100644
36472 --- a/drivers/base/node.c
36473 +++ b/drivers/base/node.c
36474 @@ -620,7 +620,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
36475 struct node_attr {
36476 struct device_attribute attr;
36477 enum node_states state;
36478 -};
36479 +} __do_const;
36480
36481 static ssize_t show_node_state(struct device *dev,
36482 struct device_attribute *attr, char *buf)
36483 diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
36484 index bfb8955..42c9b9a 100644
36485 --- a/drivers/base/power/domain.c
36486 +++ b/drivers/base/power/domain.c
36487 @@ -1850,7 +1850,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
36488 {
36489 struct cpuidle_driver *cpuidle_drv;
36490 struct gpd_cpu_data *cpu_data;
36491 - struct cpuidle_state *idle_state;
36492 + cpuidle_state_no_const *idle_state;
36493 int ret = 0;
36494
36495 if (IS_ERR_OR_NULL(genpd) || state < 0)
36496 @@ -1918,7 +1918,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
36497 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
36498 {
36499 struct gpd_cpu_data *cpu_data;
36500 - struct cpuidle_state *idle_state;
36501 + cpuidle_state_no_const *idle_state;
36502 int ret = 0;
36503
36504 if (IS_ERR_OR_NULL(genpd))
36505 diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
36506 index 03e089a..0e9560c 100644
36507 --- a/drivers/base/power/sysfs.c
36508 +++ b/drivers/base/power/sysfs.c
36509 @@ -185,7 +185,7 @@ static ssize_t rtpm_status_show(struct device *dev,
36510 return -EIO;
36511 }
36512 }
36513 - return sprintf(buf, p);
36514 + return sprintf(buf, "%s", p);
36515 }
36516
36517 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
36518 diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
36519 index 2d56f41..8830f19 100644
36520 --- a/drivers/base/power/wakeup.c
36521 +++ b/drivers/base/power/wakeup.c
36522 @@ -29,14 +29,14 @@ bool events_check_enabled __read_mostly;
36523 * They need to be modified together atomically, so it's better to use one
36524 * atomic variable to hold them both.
36525 */
36526 -static atomic_t combined_event_count = ATOMIC_INIT(0);
36527 +static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
36528
36529 #define IN_PROGRESS_BITS (sizeof(int) * 4)
36530 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
36531
36532 static void split_counters(unsigned int *cnt, unsigned int *inpr)
36533 {
36534 - unsigned int comb = atomic_read(&combined_event_count);
36535 + unsigned int comb = atomic_read_unchecked(&combined_event_count);
36536
36537 *cnt = (comb >> IN_PROGRESS_BITS);
36538 *inpr = comb & MAX_IN_PROGRESS;
36539 @@ -395,7 +395,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
36540 ws->start_prevent_time = ws->last_time;
36541
36542 /* Increment the counter of events in progress. */
36543 - cec = atomic_inc_return(&combined_event_count);
36544 + cec = atomic_inc_return_unchecked(&combined_event_count);
36545
36546 trace_wakeup_source_activate(ws->name, cec);
36547 }
36548 @@ -521,7 +521,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
36549 * Increment the counter of registered wakeup events and decrement the
36550 * couter of wakeup events in progress simultaneously.
36551 */
36552 - cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
36553 + cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
36554 trace_wakeup_source_deactivate(ws->name, cec);
36555
36556 split_counters(&cnt, &inpr);
36557 diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
36558 index e8d11b6..7b1b36f 100644
36559 --- a/drivers/base/syscore.c
36560 +++ b/drivers/base/syscore.c
36561 @@ -21,7 +21,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
36562 void register_syscore_ops(struct syscore_ops *ops)
36563 {
36564 mutex_lock(&syscore_ops_lock);
36565 - list_add_tail(&ops->node, &syscore_ops_list);
36566 + pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
36567 mutex_unlock(&syscore_ops_lock);
36568 }
36569 EXPORT_SYMBOL_GPL(register_syscore_ops);
36570 @@ -33,7 +33,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
36571 void unregister_syscore_ops(struct syscore_ops *ops)
36572 {
36573 mutex_lock(&syscore_ops_lock);
36574 - list_del(&ops->node);
36575 + pax_list_del((struct list_head *)&ops->node);
36576 mutex_unlock(&syscore_ops_lock);
36577 }
36578 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
36579 diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
36580 index edfa251..1734d4d 100644
36581 --- a/drivers/block/cciss.c
36582 +++ b/drivers/block/cciss.c
36583 @@ -3011,7 +3011,7 @@ static void start_io(ctlr_info_t *h)
36584 while (!list_empty(&h->reqQ)) {
36585 c = list_entry(h->reqQ.next, CommandList_struct, list);
36586 /* can't do anything if fifo is full */
36587 - if ((h->access.fifo_full(h))) {
36588 + if ((h->access->fifo_full(h))) {
36589 dev_warn(&h->pdev->dev, "fifo full\n");
36590 break;
36591 }
36592 @@ -3021,7 +3021,7 @@ static void start_io(ctlr_info_t *h)
36593 h->Qdepth--;
36594
36595 /* Tell the controller execute command */
36596 - h->access.submit_command(h, c);
36597 + h->access->submit_command(h, c);
36598
36599 /* Put job onto the completed Q */
36600 addQ(&h->cmpQ, c);
36601 @@ -3447,17 +3447,17 @@ startio:
36602
36603 static inline unsigned long get_next_completion(ctlr_info_t *h)
36604 {
36605 - return h->access.command_completed(h);
36606 + return h->access->command_completed(h);
36607 }
36608
36609 static inline int interrupt_pending(ctlr_info_t *h)
36610 {
36611 - return h->access.intr_pending(h);
36612 + return h->access->intr_pending(h);
36613 }
36614
36615 static inline long interrupt_not_for_us(ctlr_info_t *h)
36616 {
36617 - return ((h->access.intr_pending(h) == 0) ||
36618 + return ((h->access->intr_pending(h) == 0) ||
36619 (h->interrupts_enabled == 0));
36620 }
36621
36622 @@ -3490,7 +3490,7 @@ static inline u32 next_command(ctlr_info_t *h)
36623 u32 a;
36624
36625 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
36626 - return h->access.command_completed(h);
36627 + return h->access->command_completed(h);
36628
36629 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
36630 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
36631 @@ -4047,7 +4047,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
36632 trans_support & CFGTBL_Trans_use_short_tags);
36633
36634 /* Change the access methods to the performant access methods */
36635 - h->access = SA5_performant_access;
36636 + h->access = &SA5_performant_access;
36637 h->transMethod = CFGTBL_Trans_Performant;
36638
36639 return;
36640 @@ -4327,7 +4327,7 @@ static int cciss_pci_init(ctlr_info_t *h)
36641 if (prod_index < 0)
36642 return -ENODEV;
36643 h->product_name = products[prod_index].product_name;
36644 - h->access = *(products[prod_index].access);
36645 + h->access = products[prod_index].access;
36646
36647 if (cciss_board_disabled(h)) {
36648 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
36649 @@ -5059,7 +5059,7 @@ reinit_after_soft_reset:
36650 }
36651
36652 /* make sure the board interrupts are off */
36653 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
36654 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
36655 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
36656 if (rc)
36657 goto clean2;
36658 @@ -5109,7 +5109,7 @@ reinit_after_soft_reset:
36659 * fake ones to scoop up any residual completions.
36660 */
36661 spin_lock_irqsave(&h->lock, flags);
36662 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
36663 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
36664 spin_unlock_irqrestore(&h->lock, flags);
36665 free_irq(h->intr[h->intr_mode], h);
36666 rc = cciss_request_irq(h, cciss_msix_discard_completions,
36667 @@ -5129,9 +5129,9 @@ reinit_after_soft_reset:
36668 dev_info(&h->pdev->dev, "Board READY.\n");
36669 dev_info(&h->pdev->dev,
36670 "Waiting for stale completions to drain.\n");
36671 - h->access.set_intr_mask(h, CCISS_INTR_ON);
36672 + h->access->set_intr_mask(h, CCISS_INTR_ON);
36673 msleep(10000);
36674 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
36675 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
36676
36677 rc = controller_reset_failed(h->cfgtable);
36678 if (rc)
36679 @@ -5154,7 +5154,7 @@ reinit_after_soft_reset:
36680 cciss_scsi_setup(h);
36681
36682 /* Turn the interrupts on so we can service requests */
36683 - h->access.set_intr_mask(h, CCISS_INTR_ON);
36684 + h->access->set_intr_mask(h, CCISS_INTR_ON);
36685
36686 /* Get the firmware version */
36687 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
36688 @@ -5226,7 +5226,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
36689 kfree(flush_buf);
36690 if (return_code != IO_OK)
36691 dev_warn(&h->pdev->dev, "Error flushing cache\n");
36692 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
36693 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
36694 free_irq(h->intr[h->intr_mode], h);
36695 }
36696
36697 diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
36698 index 7fda30e..eb5dfe0 100644
36699 --- a/drivers/block/cciss.h
36700 +++ b/drivers/block/cciss.h
36701 @@ -101,7 +101,7 @@ struct ctlr_info
36702 /* information about each logical volume */
36703 drive_info_struct *drv[CISS_MAX_LUN];
36704
36705 - struct access_method access;
36706 + struct access_method *access;
36707
36708 /* queue and queue Info */
36709 struct list_head reqQ;
36710 diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
36711 index 2b94403..fd6ad1f 100644
36712 --- a/drivers/block/cpqarray.c
36713 +++ b/drivers/block/cpqarray.c
36714 @@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
36715 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
36716 goto Enomem4;
36717 }
36718 - hba[i]->access.set_intr_mask(hba[i], 0);
36719 + hba[i]->access->set_intr_mask(hba[i], 0);
36720 if (request_irq(hba[i]->intr, do_ida_intr,
36721 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
36722 {
36723 @@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
36724 add_timer(&hba[i]->timer);
36725
36726 /* Enable IRQ now that spinlock and rate limit timer are set up */
36727 - hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
36728 + hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
36729
36730 for(j=0; j<NWD; j++) {
36731 struct gendisk *disk = ida_gendisk[i][j];
36732 @@ -694,7 +694,7 @@ DBGINFO(
36733 for(i=0; i<NR_PRODUCTS; i++) {
36734 if (board_id == products[i].board_id) {
36735 c->product_name = products[i].product_name;
36736 - c->access = *(products[i].access);
36737 + c->access = products[i].access;
36738 break;
36739 }
36740 }
36741 @@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
36742 hba[ctlr]->intr = intr;
36743 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
36744 hba[ctlr]->product_name = products[j].product_name;
36745 - hba[ctlr]->access = *(products[j].access);
36746 + hba[ctlr]->access = products[j].access;
36747 hba[ctlr]->ctlr = ctlr;
36748 hba[ctlr]->board_id = board_id;
36749 hba[ctlr]->pci_dev = NULL; /* not PCI */
36750 @@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
36751
36752 while((c = h->reqQ) != NULL) {
36753 /* Can't do anything if we're busy */
36754 - if (h->access.fifo_full(h) == 0)
36755 + if (h->access->fifo_full(h) == 0)
36756 return;
36757
36758 /* Get the first entry from the request Q */
36759 @@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
36760 h->Qdepth--;
36761
36762 /* Tell the controller to do our bidding */
36763 - h->access.submit_command(h, c);
36764 + h->access->submit_command(h, c);
36765
36766 /* Get onto the completion Q */
36767 addQ(&h->cmpQ, c);
36768 @@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
36769 unsigned long flags;
36770 __u32 a,a1;
36771
36772 - istat = h->access.intr_pending(h);
36773 + istat = h->access->intr_pending(h);
36774 /* Is this interrupt for us? */
36775 if (istat == 0)
36776 return IRQ_NONE;
36777 @@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
36778 */
36779 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
36780 if (istat & FIFO_NOT_EMPTY) {
36781 - while((a = h->access.command_completed(h))) {
36782 + while((a = h->access->command_completed(h))) {
36783 a1 = a; a &= ~3;
36784 if ((c = h->cmpQ) == NULL)
36785 {
36786 @@ -1448,11 +1448,11 @@ static int sendcmd(
36787 /*
36788 * Disable interrupt
36789 */
36790 - info_p->access.set_intr_mask(info_p, 0);
36791 + info_p->access->set_intr_mask(info_p, 0);
36792 /* Make sure there is room in the command FIFO */
36793 /* Actually it should be completely empty at this time. */
36794 for (i = 200000; i > 0; i--) {
36795 - temp = info_p->access.fifo_full(info_p);
36796 + temp = info_p->access->fifo_full(info_p);
36797 if (temp != 0) {
36798 break;
36799 }
36800 @@ -1465,7 +1465,7 @@ DBG(
36801 /*
36802 * Send the cmd
36803 */
36804 - info_p->access.submit_command(info_p, c);
36805 + info_p->access->submit_command(info_p, c);
36806 complete = pollcomplete(ctlr);
36807
36808 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
36809 @@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
36810 * we check the new geometry. Then turn interrupts back on when
36811 * we're done.
36812 */
36813 - host->access.set_intr_mask(host, 0);
36814 + host->access->set_intr_mask(host, 0);
36815 getgeometry(ctlr);
36816 - host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
36817 + host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
36818
36819 for(i=0; i<NWD; i++) {
36820 struct gendisk *disk = ida_gendisk[ctlr][i];
36821 @@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
36822 /* Wait (up to 2 seconds) for a command to complete */
36823
36824 for (i = 200000; i > 0; i--) {
36825 - done = hba[ctlr]->access.command_completed(hba[ctlr]);
36826 + done = hba[ctlr]->access->command_completed(hba[ctlr]);
36827 if (done == 0) {
36828 udelay(10); /* a short fixed delay */
36829 } else
36830 diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
36831 index be73e9d..7fbf140 100644
36832 --- a/drivers/block/cpqarray.h
36833 +++ b/drivers/block/cpqarray.h
36834 @@ -99,7 +99,7 @@ struct ctlr_info {
36835 drv_info_t drv[NWD];
36836 struct proc_dir_entry *proc;
36837
36838 - struct access_method access;
36839 + struct access_method *access;
36840
36841 cmdlist_t *reqQ;
36842 cmdlist_t *cmpQ;
36843 diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
36844 index 2d7f608..11245fe 100644
36845 --- a/drivers/block/drbd/drbd_int.h
36846 +++ b/drivers/block/drbd/drbd_int.h
36847 @@ -582,7 +582,7 @@ struct drbd_epoch {
36848 struct drbd_tconn *tconn;
36849 struct list_head list;
36850 unsigned int barrier_nr;
36851 - atomic_t epoch_size; /* increased on every request added. */
36852 + atomic_unchecked_t epoch_size; /* increased on every request added. */
36853 atomic_t active; /* increased on every req. added, and dec on every finished. */
36854 unsigned long flags;
36855 };
36856 @@ -1022,7 +1022,7 @@ struct drbd_conf {
36857 unsigned int al_tr_number;
36858 int al_tr_cycle;
36859 wait_queue_head_t seq_wait;
36860 - atomic_t packet_seq;
36861 + atomic_unchecked_t packet_seq;
36862 unsigned int peer_seq;
36863 spinlock_t peer_seq_lock;
36864 unsigned int minor;
36865 @@ -1572,7 +1572,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
36866 char __user *uoptval;
36867 int err;
36868
36869 - uoptval = (char __user __force *)optval;
36870 + uoptval = (char __force_user *)optval;
36871
36872 set_fs(KERNEL_DS);
36873 if (level == SOL_SOCKET)
36874 diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
36875 index 55635ed..40e837c 100644
36876 --- a/drivers/block/drbd/drbd_main.c
36877 +++ b/drivers/block/drbd/drbd_main.c
36878 @@ -1317,7 +1317,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packet cmd,
36879 p->sector = sector;
36880 p->block_id = block_id;
36881 p->blksize = blksize;
36882 - p->seq_num = cpu_to_be32(atomic_inc_return(&mdev->packet_seq));
36883 + p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&mdev->packet_seq));
36884 return drbd_send_command(mdev, sock, cmd, sizeof(*p), NULL, 0);
36885 }
36886
36887 @@ -1619,7 +1619,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
36888 return -EIO;
36889 p->sector = cpu_to_be64(req->i.sector);
36890 p->block_id = (unsigned long)req;
36891 - p->seq_num = cpu_to_be32(atomic_inc_return(&mdev->packet_seq));
36892 + p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&mdev->packet_seq));
36893 dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
36894 if (mdev->state.conn >= C_SYNC_SOURCE &&
36895 mdev->state.conn <= C_PAUSED_SYNC_T)
36896 @@ -2574,8 +2574,8 @@ void conn_destroy(struct kref *kref)
36897 {
36898 struct drbd_tconn *tconn = container_of(kref, struct drbd_tconn, kref);
36899
36900 - if (atomic_read(&tconn->current_epoch->epoch_size) != 0)
36901 - conn_err(tconn, "epoch_size:%d\n", atomic_read(&tconn->current_epoch->epoch_size));
36902 + if (atomic_read_unchecked(&tconn->current_epoch->epoch_size) != 0)
36903 + conn_err(tconn, "epoch_size:%d\n", atomic_read_unchecked(&tconn->current_epoch->epoch_size));
36904 kfree(tconn->current_epoch);
36905
36906 idr_destroy(&tconn->volumes);
36907 diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
36908 index 8cc1e64..ba7ffa9 100644
36909 --- a/drivers/block/drbd/drbd_nl.c
36910 +++ b/drivers/block/drbd/drbd_nl.c
36911 @@ -3440,7 +3440,7 @@ out:
36912
36913 void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib)
36914 {
36915 - static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
36916 + static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
36917 struct sk_buff *msg;
36918 struct drbd_genlmsghdr *d_out;
36919 unsigned seq;
36920 @@ -3453,7 +3453,7 @@ void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib)
36921 return;
36922 }
36923
36924 - seq = atomic_inc_return(&drbd_genl_seq);
36925 + seq = atomic_inc_return_unchecked(&drbd_genl_seq);
36926 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
36927 if (!msg)
36928 goto failed;
36929 diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
36930 index cc29cd3..d4b058b 100644
36931 --- a/drivers/block/drbd/drbd_receiver.c
36932 +++ b/drivers/block/drbd/drbd_receiver.c
36933 @@ -834,7 +834,7 @@ int drbd_connected(struct drbd_conf *mdev)
36934 {
36935 int err;
36936
36937 - atomic_set(&mdev->packet_seq, 0);
36938 + atomic_set_unchecked(&mdev->packet_seq, 0);
36939 mdev->peer_seq = 0;
36940
36941 mdev->state_mutex = mdev->tconn->agreed_pro_version < 100 ?
36942 @@ -1193,7 +1193,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_tconn *tconn,
36943 do {
36944 next_epoch = NULL;
36945
36946 - epoch_size = atomic_read(&epoch->epoch_size);
36947 + epoch_size = atomic_read_unchecked(&epoch->epoch_size);
36948
36949 switch (ev & ~EV_CLEANUP) {
36950 case EV_PUT:
36951 @@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_tconn *tconn,
36952 rv = FE_DESTROYED;
36953 } else {
36954 epoch->flags = 0;
36955 - atomic_set(&epoch->epoch_size, 0);
36956 + atomic_set_unchecked(&epoch->epoch_size, 0);
36957 /* atomic_set(&epoch->active, 0); is already zero */
36958 if (rv == FE_STILL_LIVE)
36959 rv = FE_RECYCLED;
36960 @@ -1451,7 +1451,7 @@ static int receive_Barrier(struct drbd_tconn *tconn, struct packet_info *pi)
36961 conn_wait_active_ee_empty(tconn);
36962 drbd_flush(tconn);
36963
36964 - if (atomic_read(&tconn->current_epoch->epoch_size)) {
36965 + if (atomic_read_unchecked(&tconn->current_epoch->epoch_size)) {
36966 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
36967 if (epoch)
36968 break;
36969 @@ -1464,11 +1464,11 @@ static int receive_Barrier(struct drbd_tconn *tconn, struct packet_info *pi)
36970 }
36971
36972 epoch->flags = 0;
36973 - atomic_set(&epoch->epoch_size, 0);
36974 + atomic_set_unchecked(&epoch->epoch_size, 0);
36975 atomic_set(&epoch->active, 0);
36976
36977 spin_lock(&tconn->epoch_lock);
36978 - if (atomic_read(&tconn->current_epoch->epoch_size)) {
36979 + if (atomic_read_unchecked(&tconn->current_epoch->epoch_size)) {
36980 list_add(&epoch->list, &tconn->current_epoch->list);
36981 tconn->current_epoch = epoch;
36982 tconn->epochs++;
36983 @@ -2172,7 +2172,7 @@ static int receive_Data(struct drbd_tconn *tconn, struct packet_info *pi)
36984
36985 err = wait_for_and_update_peer_seq(mdev, peer_seq);
36986 drbd_send_ack_dp(mdev, P_NEG_ACK, p, pi->size);
36987 - atomic_inc(&tconn->current_epoch->epoch_size);
36988 + atomic_inc_unchecked(&tconn->current_epoch->epoch_size);
36989 err2 = drbd_drain_block(mdev, pi->size);
36990 if (!err)
36991 err = err2;
36992 @@ -2206,7 +2206,7 @@ static int receive_Data(struct drbd_tconn *tconn, struct packet_info *pi)
36993
36994 spin_lock(&tconn->epoch_lock);
36995 peer_req->epoch = tconn->current_epoch;
36996 - atomic_inc(&peer_req->epoch->epoch_size);
36997 + atomic_inc_unchecked(&peer_req->epoch->epoch_size);
36998 atomic_inc(&peer_req->epoch->active);
36999 spin_unlock(&tconn->epoch_lock);
37000
37001 @@ -4347,7 +4347,7 @@ struct data_cmd {
37002 int expect_payload;
37003 size_t pkt_size;
37004 int (*fn)(struct drbd_tconn *, struct packet_info *);
37005 -};
37006 +} __do_const;
37007
37008 static struct data_cmd drbd_cmd_handler[] = {
37009 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
37010 @@ -4467,7 +4467,7 @@ static void conn_disconnect(struct drbd_tconn *tconn)
37011 if (!list_empty(&tconn->current_epoch->list))
37012 conn_err(tconn, "ASSERTION FAILED: tconn->current_epoch->list not empty\n");
37013 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
37014 - atomic_set(&tconn->current_epoch->epoch_size, 0);
37015 + atomic_set_unchecked(&tconn->current_epoch->epoch_size, 0);
37016 tconn->send.seen_any_write_yet = false;
37017
37018 conn_info(tconn, "Connection closed\n");
37019 @@ -5223,7 +5223,7 @@ static int tconn_finish_peer_reqs(struct drbd_tconn *tconn)
37020 struct asender_cmd {
37021 size_t pkt_size;
37022 int (*fn)(struct drbd_tconn *tconn, struct packet_info *);
37023 -};
37024 +} __do_const;
37025
37026 static struct asender_cmd asender_tbl[] = {
37027 [P_PING] = { 0, got_Ping },
37028 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
37029 index c8dac73..1800093 100644
37030 --- a/drivers/block/loop.c
37031 +++ b/drivers/block/loop.c
37032 @@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file,
37033
37034 file_start_write(file);
37035 set_fs(get_ds());
37036 - bw = file->f_op->write(file, buf, len, &pos);
37037 + bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
37038 set_fs(old_fs);
37039 file_end_write(file);
37040 if (likely(bw == len))
37041 diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
37042 index 5618847..5a46f3b 100644
37043 --- a/drivers/block/pktcdvd.c
37044 +++ b/drivers/block/pktcdvd.c
37045 @@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
37046
37047 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
37048 {
37049 - return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
37050 + return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
37051 }
37052
37053 /*
37054 @@ -1897,7 +1897,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
37055 return -EROFS;
37056 }
37057 pd->settings.fp = ti.fp;
37058 - pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
37059 + pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
37060
37061 if (ti.nwa_v) {
37062 pd->nwa = be32_to_cpu(ti.next_writable);
37063 diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
37064 index 60abf59..80789e1 100644
37065 --- a/drivers/bluetooth/btwilink.c
37066 +++ b/drivers/bluetooth/btwilink.c
37067 @@ -293,7 +293,7 @@ static int ti_st_send_frame(struct sk_buff *skb)
37068
37069 static int bt_ti_probe(struct platform_device *pdev)
37070 {
37071 - static struct ti_st *hst;
37072 + struct ti_st *hst;
37073 struct hci_dev *hdev;
37074 int err;
37075
37076 diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
37077 index 2009266..7be9ca2 100644
37078 --- a/drivers/bus/arm-cci.c
37079 +++ b/drivers/bus/arm-cci.c
37080 @@ -405,7 +405,7 @@ static int __init cci_probe(void)
37081
37082 nb_cci_ports = cci_config->nb_ace + cci_config->nb_ace_lite;
37083
37084 - ports = kcalloc(sizeof(*ports), nb_cci_ports, GFP_KERNEL);
37085 + ports = kcalloc(nb_cci_ports, sizeof(*ports), GFP_KERNEL);
37086 if (!ports)
37087 return -ENOMEM;
37088
37089 diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
37090 index 8a3aff7..d7538c2 100644
37091 --- a/drivers/cdrom/cdrom.c
37092 +++ b/drivers/cdrom/cdrom.c
37093 @@ -416,7 +416,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
37094 ENSURE(reset, CDC_RESET);
37095 ENSURE(generic_packet, CDC_GENERIC_PACKET);
37096 cdi->mc_flags = 0;
37097 - cdo->n_minors = 0;
37098 cdi->options = CDO_USE_FFLAGS;
37099
37100 if (autoclose==1 && CDROM_CAN(CDC_CLOSE_TRAY))
37101 @@ -436,8 +435,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
37102 else
37103 cdi->cdda_method = CDDA_OLD;
37104
37105 - if (!cdo->generic_packet)
37106 - cdo->generic_packet = cdrom_dummy_generic_packet;
37107 + if (!cdo->generic_packet) {
37108 + pax_open_kernel();
37109 + *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
37110 + pax_close_kernel();
37111 + }
37112
37113 cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
37114 mutex_lock(&cdrom_mutex);
37115 @@ -458,7 +460,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
37116 if (cdi->exit)
37117 cdi->exit(cdi);
37118
37119 - cdi->ops->n_minors--;
37120 cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
37121 }
37122
37123 @@ -2107,7 +2108,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
37124 */
37125 nr = nframes;
37126 do {
37127 - cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
37128 + cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
37129 if (cgc.buffer)
37130 break;
37131
37132 @@ -3429,7 +3430,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
37133 struct cdrom_device_info *cdi;
37134 int ret;
37135
37136 - ret = scnprintf(info + *pos, max_size - *pos, header);
37137 + ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
37138 if (!ret)
37139 return 1;
37140
37141 diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
37142 index 5980cb9..6d7bd7e 100644
37143 --- a/drivers/cdrom/gdrom.c
37144 +++ b/drivers/cdrom/gdrom.c
37145 @@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
37146 .audio_ioctl = gdrom_audio_ioctl,
37147 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
37148 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
37149 - .n_minors = 1,
37150 };
37151
37152 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
37153 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
37154 index 1421997..33f5d6d 100644
37155 --- a/drivers/char/Kconfig
37156 +++ b/drivers/char/Kconfig
37157 @@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
37158
37159 config DEVKMEM
37160 bool "/dev/kmem virtual device support"
37161 - default y
37162 + default n
37163 + depends on !GRKERNSEC_KMEM
37164 help
37165 Say Y here if you want to support the /dev/kmem device. The
37166 /dev/kmem device is rarely used, but can be used for certain
37167 @@ -570,6 +571,7 @@ config DEVPORT
37168 bool
37169 depends on !M68K
37170 depends on ISA || PCI
37171 + depends on !GRKERNSEC_KMEM
37172 default y
37173
37174 source "drivers/s390/char/Kconfig"
37175 diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
37176 index a48e05b..6bac831 100644
37177 --- a/drivers/char/agp/compat_ioctl.c
37178 +++ b/drivers/char/agp/compat_ioctl.c
37179 @@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
37180 return -ENOMEM;
37181 }
37182
37183 - if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
37184 + if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
37185 sizeof(*usegment) * ureserve.seg_count)) {
37186 kfree(usegment);
37187 kfree(ksegment);
37188 diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
37189 index 1b19239..b87b143 100644
37190 --- a/drivers/char/agp/frontend.c
37191 +++ b/drivers/char/agp/frontend.c
37192 @@ -819,7 +819,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
37193 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
37194 return -EFAULT;
37195
37196 - if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
37197 + if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
37198 return -EFAULT;
37199
37200 client = agp_find_client_by_pid(reserve.pid);
37201 @@ -849,7 +849,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
37202 if (segment == NULL)
37203 return -ENOMEM;
37204
37205 - if (copy_from_user(segment, (void __user *) reserve.seg_list,
37206 + if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
37207 sizeof(struct agp_segment) * reserve.seg_count)) {
37208 kfree(segment);
37209 return -EFAULT;
37210 diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
37211 index 4f94375..413694e 100644
37212 --- a/drivers/char/genrtc.c
37213 +++ b/drivers/char/genrtc.c
37214 @@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
37215 switch (cmd) {
37216
37217 case RTC_PLL_GET:
37218 + memset(&pll, 0, sizeof(pll));
37219 if (get_rtc_pll(&pll))
37220 return -EINVAL;
37221 else
37222 diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
37223 index 448ce5e..3a76625 100644
37224 --- a/drivers/char/hpet.c
37225 +++ b/drivers/char/hpet.c
37226 @@ -559,7 +559,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
37227 }
37228
37229 static int
37230 -hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
37231 +hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
37232 struct hpet_info *info)
37233 {
37234 struct hpet_timer __iomem *timer;
37235 diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c
37236 index 86fe45c..c0ea948 100644
37237 --- a/drivers/char/hw_random/intel-rng.c
37238 +++ b/drivers/char/hw_random/intel-rng.c
37239 @@ -314,7 +314,7 @@ PFX "RNG, try using the 'no_fwh_detect' option.\n";
37240
37241 if (no_fwh_detect)
37242 return -ENODEV;
37243 - printk(warning);
37244 + printk("%s", warning);
37245 return -EBUSY;
37246 }
37247
37248 diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
37249 index ec4e10f..f2a763b 100644
37250 --- a/drivers/char/ipmi/ipmi_msghandler.c
37251 +++ b/drivers/char/ipmi/ipmi_msghandler.c
37252 @@ -420,7 +420,7 @@ struct ipmi_smi {
37253 struct proc_dir_entry *proc_dir;
37254 char proc_dir_name[10];
37255
37256 - atomic_t stats[IPMI_NUM_STATS];
37257 + atomic_unchecked_t stats[IPMI_NUM_STATS];
37258
37259 /*
37260 * run_to_completion duplicate of smb_info, smi_info
37261 @@ -453,9 +453,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
37262
37263
37264 #define ipmi_inc_stat(intf, stat) \
37265 - atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
37266 + atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
37267 #define ipmi_get_stat(intf, stat) \
37268 - ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
37269 + ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
37270
37271 static int is_lan_addr(struct ipmi_addr *addr)
37272 {
37273 @@ -2883,7 +2883,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
37274 INIT_LIST_HEAD(&intf->cmd_rcvrs);
37275 init_waitqueue_head(&intf->waitq);
37276 for (i = 0; i < IPMI_NUM_STATS; i++)
37277 - atomic_set(&intf->stats[i], 0);
37278 + atomic_set_unchecked(&intf->stats[i], 0);
37279
37280 intf->proc_dir = NULL;
37281
37282 diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
37283 index 15e4a60..b046093 100644
37284 --- a/drivers/char/ipmi/ipmi_si_intf.c
37285 +++ b/drivers/char/ipmi/ipmi_si_intf.c
37286 @@ -280,7 +280,7 @@ struct smi_info {
37287 unsigned char slave_addr;
37288
37289 /* Counters and things for the proc filesystem. */
37290 - atomic_t stats[SI_NUM_STATS];
37291 + atomic_unchecked_t stats[SI_NUM_STATS];
37292
37293 struct task_struct *thread;
37294
37295 @@ -289,9 +289,9 @@ struct smi_info {
37296 };
37297
37298 #define smi_inc_stat(smi, stat) \
37299 - atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
37300 + atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
37301 #define smi_get_stat(smi, stat) \
37302 - ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
37303 + ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
37304
37305 #define SI_MAX_PARMS 4
37306
37307 @@ -3324,7 +3324,7 @@ static int try_smi_init(struct smi_info *new_smi)
37308 atomic_set(&new_smi->req_events, 0);
37309 new_smi->run_to_completion = 0;
37310 for (i = 0; i < SI_NUM_STATS; i++)
37311 - atomic_set(&new_smi->stats[i], 0);
37312 + atomic_set_unchecked(&new_smi->stats[i], 0);
37313
37314 new_smi->interrupt_disabled = 1;
37315 atomic_set(&new_smi->stop_operation, 0);
37316 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
37317 index f895a8c..2bc9147 100644
37318 --- a/drivers/char/mem.c
37319 +++ b/drivers/char/mem.c
37320 @@ -18,6 +18,7 @@
37321 #include <linux/raw.h>
37322 #include <linux/tty.h>
37323 #include <linux/capability.h>
37324 +#include <linux/security.h>
37325 #include <linux/ptrace.h>
37326 #include <linux/device.h>
37327 #include <linux/highmem.h>
37328 @@ -37,6 +38,10 @@
37329
37330 #define DEVPORT_MINOR 4
37331
37332 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
37333 +extern const struct file_operations grsec_fops;
37334 +#endif
37335 +
37336 static inline unsigned long size_inside_page(unsigned long start,
37337 unsigned long size)
37338 {
37339 @@ -68,9 +73,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
37340
37341 while (cursor < to) {
37342 if (!devmem_is_allowed(pfn)) {
37343 +#ifdef CONFIG_GRKERNSEC_KMEM
37344 + gr_handle_mem_readwrite(from, to);
37345 +#else
37346 printk(KERN_INFO
37347 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
37348 current->comm, from, to);
37349 +#endif
37350 return 0;
37351 }
37352 cursor += PAGE_SIZE;
37353 @@ -78,6 +87,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
37354 }
37355 return 1;
37356 }
37357 +#elif defined(CONFIG_GRKERNSEC_KMEM)
37358 +static inline int range_is_allowed(unsigned long pfn, unsigned long size)
37359 +{
37360 + return 0;
37361 +}
37362 #else
37363 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
37364 {
37365 @@ -120,6 +134,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
37366
37367 while (count > 0) {
37368 unsigned long remaining;
37369 + char *temp;
37370
37371 sz = size_inside_page(p, count);
37372
37373 @@ -135,7 +150,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
37374 if (!ptr)
37375 return -EFAULT;
37376
37377 - remaining = copy_to_user(buf, ptr, sz);
37378 +#ifdef CONFIG_PAX_USERCOPY
37379 + temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
37380 + if (!temp) {
37381 + unxlate_dev_mem_ptr(p, ptr);
37382 + return -ENOMEM;
37383 + }
37384 + memcpy(temp, ptr, sz);
37385 +#else
37386 + temp = ptr;
37387 +#endif
37388 +
37389 + remaining = copy_to_user(buf, temp, sz);
37390 +
37391 +#ifdef CONFIG_PAX_USERCOPY
37392 + kfree(temp);
37393 +#endif
37394 +
37395 unxlate_dev_mem_ptr(p, ptr);
37396 if (remaining)
37397 return -EFAULT;
37398 @@ -364,9 +395,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
37399 size_t count, loff_t *ppos)
37400 {
37401 unsigned long p = *ppos;
37402 - ssize_t low_count, read, sz;
37403 + ssize_t low_count, read, sz, err = 0;
37404 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
37405 - int err = 0;
37406
37407 read = 0;
37408 if (p < (unsigned long) high_memory) {
37409 @@ -388,6 +418,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
37410 }
37411 #endif
37412 while (low_count > 0) {
37413 + char *temp;
37414 +
37415 sz = size_inside_page(p, low_count);
37416
37417 /*
37418 @@ -397,7 +429,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
37419 */
37420 kbuf = xlate_dev_kmem_ptr((char *)p);
37421
37422 - if (copy_to_user(buf, kbuf, sz))
37423 +#ifdef CONFIG_PAX_USERCOPY
37424 + temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
37425 + if (!temp)
37426 + return -ENOMEM;
37427 + memcpy(temp, kbuf, sz);
37428 +#else
37429 + temp = kbuf;
37430 +#endif
37431 +
37432 + err = copy_to_user(buf, temp, sz);
37433 +
37434 +#ifdef CONFIG_PAX_USERCOPY
37435 + kfree(temp);
37436 +#endif
37437 +
37438 + if (err)
37439 return -EFAULT;
37440 buf += sz;
37441 p += sz;
37442 @@ -822,6 +869,9 @@ static const struct memdev {
37443 #ifdef CONFIG_PRINTK
37444 [11] = { "kmsg", 0644, &kmsg_fops, NULL },
37445 #endif
37446 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
37447 + [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
37448 +#endif
37449 };
37450
37451 static int memory_open(struct inode *inode, struct file *filp)
37452 @@ -893,7 +943,7 @@ static int __init chr_dev_init(void)
37453 continue;
37454
37455 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
37456 - NULL, devlist[minor].name);
37457 + NULL, "%s", devlist[minor].name);
37458 }
37459
37460 return tty_init();
37461 diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
37462 index 9df78e2..01ba9ae 100644
37463 --- a/drivers/char/nvram.c
37464 +++ b/drivers/char/nvram.c
37465 @@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
37466
37467 spin_unlock_irq(&rtc_lock);
37468
37469 - if (copy_to_user(buf, contents, tmp - contents))
37470 + if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
37471 return -EFAULT;
37472
37473 *ppos = i;
37474 diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
37475 index d39cca6..8c1e269 100644
37476 --- a/drivers/char/pcmcia/synclink_cs.c
37477 +++ b/drivers/char/pcmcia/synclink_cs.c
37478 @@ -2345,9 +2345,9 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
37479
37480 if (debug_level >= DEBUG_LEVEL_INFO)
37481 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
37482 - __FILE__, __LINE__, info->device_name, port->count);
37483 + __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
37484
37485 - WARN_ON(!port->count);
37486 + WARN_ON(!atomic_read(&port->count));
37487
37488 if (tty_port_close_start(port, tty, filp) == 0)
37489 goto cleanup;
37490 @@ -2365,7 +2365,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
37491 cleanup:
37492 if (debug_level >= DEBUG_LEVEL_INFO)
37493 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
37494 - tty->driver->name, port->count);
37495 + tty->driver->name, atomic_read(&port->count));
37496 }
37497
37498 /* Wait until the transmitter is empty.
37499 @@ -2507,7 +2507,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
37500
37501 if (debug_level >= DEBUG_LEVEL_INFO)
37502 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
37503 - __FILE__, __LINE__, tty->driver->name, port->count);
37504 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
37505
37506 /* If port is closing, signal caller to try again */
37507 if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING){
37508 @@ -2527,11 +2527,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
37509 goto cleanup;
37510 }
37511 spin_lock(&port->lock);
37512 - port->count++;
37513 + atomic_inc(&port->count);
37514 spin_unlock(&port->lock);
37515 spin_unlock_irqrestore(&info->netlock, flags);
37516
37517 - if (port->count == 1) {
37518 + if (atomic_read(&port->count) == 1) {
37519 /* 1st open on this device, init hardware */
37520 retval = startup(info, tty);
37521 if (retval < 0)
37522 @@ -3920,7 +3920,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
37523 unsigned short new_crctype;
37524
37525 /* return error if TTY interface open */
37526 - if (info->port.count)
37527 + if (atomic_read(&info->port.count))
37528 return -EBUSY;
37529
37530 switch (encoding)
37531 @@ -4024,7 +4024,7 @@ static int hdlcdev_open(struct net_device *dev)
37532
37533 /* arbitrate between network and tty opens */
37534 spin_lock_irqsave(&info->netlock, flags);
37535 - if (info->port.count != 0 || info->netcount != 0) {
37536 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
37537 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
37538 spin_unlock_irqrestore(&info->netlock, flags);
37539 return -EBUSY;
37540 @@ -4114,7 +4114,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
37541 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
37542
37543 /* return error if TTY interface open */
37544 - if (info->port.count)
37545 + if (atomic_read(&info->port.count))
37546 return -EBUSY;
37547
37548 if (cmd != SIOCWANDEV)
37549 diff --git a/drivers/char/random.c b/drivers/char/random.c
37550 index 7a744d3..35a177ee 100644
37551 --- a/drivers/char/random.c
37552 +++ b/drivers/char/random.c
37553 @@ -269,8 +269,13 @@
37554 /*
37555 * Configuration information
37556 */
37557 +#ifdef CONFIG_GRKERNSEC_RANDNET
37558 +#define INPUT_POOL_WORDS 512
37559 +#define OUTPUT_POOL_WORDS 128
37560 +#else
37561 #define INPUT_POOL_WORDS 128
37562 #define OUTPUT_POOL_WORDS 32
37563 +#endif
37564 #define SEC_XFER_SIZE 512
37565 #define EXTRACT_SIZE 10
37566
37567 @@ -310,10 +315,17 @@ static struct poolinfo {
37568 int poolwords;
37569 int tap1, tap2, tap3, tap4, tap5;
37570 } poolinfo_table[] = {
37571 +#ifdef CONFIG_GRKERNSEC_RANDNET
37572 + /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */
37573 + { 512, 411, 308, 208, 104, 1 },
37574 + /* x^128 + x^103 + x^76 + x^51 + x^25 + x + 1 -- 105 */
37575 + { 128, 103, 76, 51, 25, 1 },
37576 +#else
37577 /* x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 -- 105 */
37578 { 128, 103, 76, 51, 25, 1 },
37579 /* x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 -- 15 */
37580 { 32, 26, 20, 14, 7, 1 },
37581 +#endif
37582 #if 0
37583 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
37584 { 2048, 1638, 1231, 819, 411, 1 },
37585 @@ -521,8 +533,8 @@ static void _mix_pool_bytes(struct entropy_store *r, const void *in,
37586 input_rotate += i ? 7 : 14;
37587 }
37588
37589 - ACCESS_ONCE(r->input_rotate) = input_rotate;
37590 - ACCESS_ONCE(r->add_ptr) = i;
37591 + ACCESS_ONCE_RW(r->input_rotate) = input_rotate;
37592 + ACCESS_ONCE_RW(r->add_ptr) = i;
37593 smp_wmb();
37594
37595 if (out)
37596 @@ -1029,7 +1041,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
37597
37598 extract_buf(r, tmp);
37599 i = min_t(int, nbytes, EXTRACT_SIZE);
37600 - if (copy_to_user(buf, tmp, i)) {
37601 + if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
37602 ret = -EFAULT;
37603 break;
37604 }
37605 @@ -1365,7 +1377,7 @@ EXPORT_SYMBOL(generate_random_uuid);
37606 #include <linux/sysctl.h>
37607
37608 static int min_read_thresh = 8, min_write_thresh;
37609 -static int max_read_thresh = INPUT_POOL_WORDS * 32;
37610 +static int max_read_thresh = OUTPUT_POOL_WORDS * 32;
37611 static int max_write_thresh = INPUT_POOL_WORDS * 32;
37612 static char sysctl_bootid[16];
37613
37614 @@ -1381,7 +1393,7 @@ static char sysctl_bootid[16];
37615 static int proc_do_uuid(struct ctl_table *table, int write,
37616 void __user *buffer, size_t *lenp, loff_t *ppos)
37617 {
37618 - struct ctl_table fake_table;
37619 + ctl_table_no_const fake_table;
37620 unsigned char buf[64], tmp_uuid[16], *uuid;
37621
37622 uuid = table->data;
37623 diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
37624 index 7cc1fe22..b602d6b 100644
37625 --- a/drivers/char/sonypi.c
37626 +++ b/drivers/char/sonypi.c
37627 @@ -54,6 +54,7 @@
37628
37629 #include <asm/uaccess.h>
37630 #include <asm/io.h>
37631 +#include <asm/local.h>
37632
37633 #include <linux/sonypi.h>
37634
37635 @@ -490,7 +491,7 @@ static struct sonypi_device {
37636 spinlock_t fifo_lock;
37637 wait_queue_head_t fifo_proc_list;
37638 struct fasync_struct *fifo_async;
37639 - int open_count;
37640 + local_t open_count;
37641 int model;
37642 struct input_dev *input_jog_dev;
37643 struct input_dev *input_key_dev;
37644 @@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
37645 static int sonypi_misc_release(struct inode *inode, struct file *file)
37646 {
37647 mutex_lock(&sonypi_device.lock);
37648 - sonypi_device.open_count--;
37649 + local_dec(&sonypi_device.open_count);
37650 mutex_unlock(&sonypi_device.lock);
37651 return 0;
37652 }
37653 @@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
37654 {
37655 mutex_lock(&sonypi_device.lock);
37656 /* Flush input queue on first open */
37657 - if (!sonypi_device.open_count)
37658 + if (!local_read(&sonypi_device.open_count))
37659 kfifo_reset(&sonypi_device.fifo);
37660 - sonypi_device.open_count++;
37661 + local_inc(&sonypi_device.open_count);
37662 mutex_unlock(&sonypi_device.lock);
37663
37664 return 0;
37665 diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
37666 index 64420b3..5c40b56 100644
37667 --- a/drivers/char/tpm/tpm_acpi.c
37668 +++ b/drivers/char/tpm/tpm_acpi.c
37669 @@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
37670 virt = acpi_os_map_memory(start, len);
37671 if (!virt) {
37672 kfree(log->bios_event_log);
37673 + log->bios_event_log = NULL;
37674 printk("%s: ERROR - Unable to map memory\n", __func__);
37675 return -EIO;
37676 }
37677
37678 - memcpy_fromio(log->bios_event_log, virt, len);
37679 + memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
37680
37681 acpi_os_unmap_memory(virt, len);
37682 return 0;
37683 diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
37684 index 84ddc55..1d32f1e 100644
37685 --- a/drivers/char/tpm/tpm_eventlog.c
37686 +++ b/drivers/char/tpm/tpm_eventlog.c
37687 @@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
37688 event = addr;
37689
37690 if ((event->event_type == 0 && event->event_size == 0) ||
37691 - ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
37692 + (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
37693 return NULL;
37694
37695 return addr;
37696 @@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
37697 return NULL;
37698
37699 if ((event->event_type == 0 && event->event_size == 0) ||
37700 - ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
37701 + (event->event_size >= limit - v - sizeof(struct tcpa_event)))
37702 return NULL;
37703
37704 (*pos)++;
37705 @@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
37706 int i;
37707
37708 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
37709 - seq_putc(m, data[i]);
37710 + if (!seq_putc(m, data[i]))
37711 + return -EFAULT;
37712
37713 return 0;
37714 }
37715 diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
37716 index b79cf3e..de172d64f 100644
37717 --- a/drivers/char/virtio_console.c
37718 +++ b/drivers/char/virtio_console.c
37719 @@ -682,7 +682,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
37720 if (to_user) {
37721 ssize_t ret;
37722
37723 - ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
37724 + ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
37725 if (ret)
37726 return -EFAULT;
37727 } else {
37728 @@ -785,7 +785,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
37729 if (!port_has_data(port) && !port->host_connected)
37730 return 0;
37731
37732 - return fill_readbuf(port, ubuf, count, true);
37733 + return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
37734 }
37735
37736 static int wait_port_writable(struct port *port, bool nonblock)
37737 diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
37738 index a33f46f..a720eed 100644
37739 --- a/drivers/clk/clk-composite.c
37740 +++ b/drivers/clk/clk-composite.c
37741 @@ -122,7 +122,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
37742 struct clk *clk;
37743 struct clk_init_data init;
37744 struct clk_composite *composite;
37745 - struct clk_ops *clk_composite_ops;
37746 + clk_ops_no_const *clk_composite_ops;
37747
37748 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
37749 if (!composite) {
37750 diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c
37751 index 81dd31a..ef5c542 100644
37752 --- a/drivers/clk/socfpga/clk.c
37753 +++ b/drivers/clk/socfpga/clk.c
37754 @@ -22,6 +22,7 @@
37755 #include <linux/clk-provider.h>
37756 #include <linux/io.h>
37757 #include <linux/of.h>
37758 +#include <asm/pgtable.h>
37759
37760 /* Clock Manager offsets */
37761 #define CLKMGR_CTRL 0x0
37762 @@ -152,8 +153,10 @@ static __init struct clk *socfpga_clk_init(struct device_node *node,
37763 streq(clk_name, "periph_pll") ||
37764 streq(clk_name, "sdram_pll")) {
37765 socfpga_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
37766 - clk_pll_ops.enable = clk_gate_ops.enable;
37767 - clk_pll_ops.disable = clk_gate_ops.disable;
37768 + pax_open_kernel();
37769 + *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
37770 + *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
37771 + pax_close_kernel();
37772 }
37773
37774 clk = clk_register(NULL, &socfpga_clk->hw.hw);
37775 @@ -244,7 +247,7 @@ static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk,
37776 return parent_rate / div;
37777 }
37778
37779 -static struct clk_ops gateclk_ops = {
37780 +static clk_ops_no_const gateclk_ops __read_only = {
37781 .recalc_rate = socfpga_clk_recalc_rate,
37782 .get_parent = socfpga_clk_get_parent,
37783 .set_parent = socfpga_clk_set_parent,
37784 diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
37785 index 506fd23..01a593f 100644
37786 --- a/drivers/cpufreq/acpi-cpufreq.c
37787 +++ b/drivers/cpufreq/acpi-cpufreq.c
37788 @@ -172,7 +172,7 @@ static ssize_t show_global_boost(struct kobject *kobj,
37789 return sprintf(buf, "%u\n", boost_enabled);
37790 }
37791
37792 -static struct global_attr global_boost = __ATTR(boost, 0644,
37793 +static global_attr_no_const global_boost = __ATTR(boost, 0644,
37794 show_global_boost,
37795 store_global_boost);
37796
37797 @@ -721,8 +721,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
37798 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
37799 per_cpu(acfreq_data, cpu) = data;
37800
37801 - if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
37802 - acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
37803 + if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
37804 + pax_open_kernel();
37805 + *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
37806 + pax_close_kernel();
37807 + }
37808
37809 result = acpi_processor_register_performance(data->acpi_data, cpu);
37810 if (result)
37811 @@ -850,7 +853,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
37812 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
37813 break;
37814 case ACPI_ADR_SPACE_FIXED_HARDWARE:
37815 - acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
37816 + pax_open_kernel();
37817 + *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
37818 + pax_close_kernel();
37819 policy->cur = get_cur_freq_on_cpu(cpu);
37820 break;
37821 default:
37822 diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
37823 index 04548f7..457a342 100644
37824 --- a/drivers/cpufreq/cpufreq.c
37825 +++ b/drivers/cpufreq/cpufreq.c
37826 @@ -2069,7 +2069,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
37827 return NOTIFY_OK;
37828 }
37829
37830 -static struct notifier_block __refdata cpufreq_cpu_notifier = {
37831 +static struct notifier_block cpufreq_cpu_notifier = {
37832 .notifier_call = cpufreq_cpu_callback,
37833 };
37834
37835 @@ -2101,8 +2101,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
37836
37837 pr_debug("trying to register driver %s\n", driver_data->name);
37838
37839 - if (driver_data->setpolicy)
37840 - driver_data->flags |= CPUFREQ_CONST_LOOPS;
37841 + if (driver_data->setpolicy) {
37842 + pax_open_kernel();
37843 + *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
37844 + pax_close_kernel();
37845 + }
37846
37847 write_lock_irqsave(&cpufreq_driver_lock, flags);
37848 if (cpufreq_driver) {
37849 diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
37850 index 0806c31..6a73276 100644
37851 --- a/drivers/cpufreq/cpufreq_governor.c
37852 +++ b/drivers/cpufreq/cpufreq_governor.c
37853 @@ -187,7 +187,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
37854 struct dbs_data *dbs_data;
37855 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
37856 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
37857 - struct od_ops *od_ops = NULL;
37858 + const struct od_ops *od_ops = NULL;
37859 struct od_dbs_tuners *od_tuners = NULL;
37860 struct cs_dbs_tuners *cs_tuners = NULL;
37861 struct cpu_dbs_common_info *cpu_cdbs;
37862 @@ -253,7 +253,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
37863
37864 if ((cdata->governor == GOV_CONSERVATIVE) &&
37865 (!policy->governor->initialized)) {
37866 - struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
37867 + const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
37868
37869 cpufreq_register_notifier(cs_ops->notifier_block,
37870 CPUFREQ_TRANSITION_NOTIFIER);
37871 @@ -273,7 +273,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
37872
37873 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
37874 (policy->governor->initialized == 1)) {
37875 - struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
37876 + const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
37877
37878 cpufreq_unregister_notifier(cs_ops->notifier_block,
37879 CPUFREQ_TRANSITION_NOTIFIER);
37880 diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
37881 index 88cd39f..87f0393 100644
37882 --- a/drivers/cpufreq/cpufreq_governor.h
37883 +++ b/drivers/cpufreq/cpufreq_governor.h
37884 @@ -202,7 +202,7 @@ struct common_dbs_data {
37885 void (*exit)(struct dbs_data *dbs_data);
37886
37887 /* Governor specific ops, see below */
37888 - void *gov_ops;
37889 + const void *gov_ops;
37890 };
37891
37892 /* Governor Per policy data */
37893 @@ -222,7 +222,7 @@ struct od_ops {
37894 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
37895 unsigned int freq_next, unsigned int relation);
37896 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
37897 -};
37898 +} __no_const;
37899
37900 struct cs_ops {
37901 struct notifier_block *notifier_block;
37902 diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
37903 index 32f26f6..feb657b 100644
37904 --- a/drivers/cpufreq/cpufreq_ondemand.c
37905 +++ b/drivers/cpufreq/cpufreq_ondemand.c
37906 @@ -522,7 +522,7 @@ static void od_exit(struct dbs_data *dbs_data)
37907
37908 define_get_cpu_dbs_routines(od_cpu_dbs_info);
37909
37910 -static struct od_ops od_ops = {
37911 +static struct od_ops od_ops __read_only = {
37912 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
37913 .powersave_bias_target = generic_powersave_bias_target,
37914 .freq_increase = dbs_freq_increase,
37915 @@ -577,14 +577,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
37916 (struct cpufreq_policy *, unsigned int, unsigned int),
37917 unsigned int powersave_bias)
37918 {
37919 - od_ops.powersave_bias_target = f;
37920 + pax_open_kernel();
37921 + *(void **)&od_ops.powersave_bias_target = f;
37922 + pax_close_kernel();
37923 od_set_powersave_bias(powersave_bias);
37924 }
37925 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
37926
37927 void od_unregister_powersave_bias_handler(void)
37928 {
37929 - od_ops.powersave_bias_target = generic_powersave_bias_target;
37930 + pax_open_kernel();
37931 + *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
37932 + pax_close_kernel();
37933 od_set_powersave_bias(0);
37934 }
37935 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
37936 diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
37937 index 4cf0d28..5830372 100644
37938 --- a/drivers/cpufreq/cpufreq_stats.c
37939 +++ b/drivers/cpufreq/cpufreq_stats.c
37940 @@ -352,7 +352,7 @@ static int cpufreq_stat_cpu_callback(struct notifier_block *nfb,
37941 }
37942
37943 /* priority=1 so this will get called before cpufreq_remove_dev */
37944 -static struct notifier_block cpufreq_stat_cpu_notifier __refdata = {
37945 +static struct notifier_block cpufreq_stat_cpu_notifier = {
37946 .notifier_call = cpufreq_stat_cpu_callback,
37947 .priority = 1,
37948 };
37949 diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
37950 index 2f0a2a6..93d728e 100644
37951 --- a/drivers/cpufreq/p4-clockmod.c
37952 +++ b/drivers/cpufreq/p4-clockmod.c
37953 @@ -160,10 +160,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
37954 case 0x0F: /* Core Duo */
37955 case 0x16: /* Celeron Core */
37956 case 0x1C: /* Atom */
37957 - p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
37958 + pax_open_kernel();
37959 + *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
37960 + pax_close_kernel();
37961 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
37962 case 0x0D: /* Pentium M (Dothan) */
37963 - p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
37964 + pax_open_kernel();
37965 + *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
37966 + pax_close_kernel();
37967 /* fall through */
37968 case 0x09: /* Pentium M (Banias) */
37969 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
37970 @@ -175,7 +179,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
37971
37972 /* on P-4s, the TSC runs with constant frequency independent whether
37973 * throttling is active or not. */
37974 - p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
37975 + pax_open_kernel();
37976 + *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
37977 + pax_close_kernel();
37978
37979 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
37980 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
37981 diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
37982 index ac76b48..2445bc6 100644
37983 --- a/drivers/cpufreq/sparc-us3-cpufreq.c
37984 +++ b/drivers/cpufreq/sparc-us3-cpufreq.c
37985 @@ -18,14 +18,12 @@
37986 #include <asm/head.h>
37987 #include <asm/timer.h>
37988
37989 -static struct cpufreq_driver *cpufreq_us3_driver;
37990 -
37991 struct us3_freq_percpu_info {
37992 struct cpufreq_frequency_table table[4];
37993 };
37994
37995 /* Indexed by cpu number. */
37996 -static struct us3_freq_percpu_info *us3_freq_table;
37997 +static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
37998
37999 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
38000 * in the Safari config register.
38001 @@ -186,12 +184,25 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
38002
38003 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
38004 {
38005 - if (cpufreq_us3_driver)
38006 - us3_set_cpu_divider_index(policy, 0);
38007 + us3_set_cpu_divider_index(policy->cpu, 0);
38008
38009 return 0;
38010 }
38011
38012 +static int __init us3_freq_init(void);
38013 +static void __exit us3_freq_exit(void);
38014 +
38015 +static struct cpufreq_driver cpufreq_us3_driver = {
38016 + .init = us3_freq_cpu_init,
38017 + .verify = us3_freq_verify,
38018 + .target = us3_freq_target,
38019 + .get = us3_freq_get,
38020 + .exit = us3_freq_cpu_exit,
38021 + .owner = THIS_MODULE,
38022 + .name = "UltraSPARC-III",
38023 +
38024 +};
38025 +
38026 static int __init us3_freq_init(void)
38027 {
38028 unsigned long manuf, impl, ver;
38029 @@ -208,55 +219,15 @@ static int __init us3_freq_init(void)
38030 (impl == CHEETAH_IMPL ||
38031 impl == CHEETAH_PLUS_IMPL ||
38032 impl == JAGUAR_IMPL ||
38033 - impl == PANTHER_IMPL)) {
38034 - struct cpufreq_driver *driver;
38035 -
38036 - ret = -ENOMEM;
38037 - driver = kzalloc(sizeof(*driver), GFP_KERNEL);
38038 - if (!driver)
38039 - goto err_out;
38040 -
38041 - us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
38042 - GFP_KERNEL);
38043 - if (!us3_freq_table)
38044 - goto err_out;
38045 -
38046 - driver->init = us3_freq_cpu_init;
38047 - driver->verify = us3_freq_verify;
38048 - driver->target = us3_freq_target;
38049 - driver->get = us3_freq_get;
38050 - driver->exit = us3_freq_cpu_exit;
38051 - strcpy(driver->name, "UltraSPARC-III");
38052 -
38053 - cpufreq_us3_driver = driver;
38054 - ret = cpufreq_register_driver(driver);
38055 - if (ret)
38056 - goto err_out;
38057 -
38058 - return 0;
38059 -
38060 -err_out:
38061 - if (driver) {
38062 - kfree(driver);
38063 - cpufreq_us3_driver = NULL;
38064 - }
38065 - kfree(us3_freq_table);
38066 - us3_freq_table = NULL;
38067 - return ret;
38068 - }
38069 + impl == PANTHER_IMPL))
38070 + return cpufreq_register_driver(&cpufreq_us3_driver);
38071
38072 return -ENODEV;
38073 }
38074
38075 static void __exit us3_freq_exit(void)
38076 {
38077 - if (cpufreq_us3_driver) {
38078 - cpufreq_unregister_driver(cpufreq_us3_driver);
38079 - kfree(cpufreq_us3_driver);
38080 - cpufreq_us3_driver = NULL;
38081 - kfree(us3_freq_table);
38082 - us3_freq_table = NULL;
38083 - }
38084 + cpufreq_unregister_driver(&cpufreq_us3_driver);
38085 }
38086
38087 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
38088 diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
38089 index f897d51..15da295 100644
38090 --- a/drivers/cpufreq/speedstep-centrino.c
38091 +++ b/drivers/cpufreq/speedstep-centrino.c
38092 @@ -353,8 +353,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
38093 !cpu_has(cpu, X86_FEATURE_EST))
38094 return -ENODEV;
38095
38096 - if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
38097 - centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
38098 + if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
38099 + pax_open_kernel();
38100 + *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
38101 + pax_close_kernel();
38102 + }
38103
38104 if (policy->cpu != 0)
38105 return -ENODEV;
38106 diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
38107 index 22c07fb..9dff5ac 100644
38108 --- a/drivers/cpuidle/cpuidle.c
38109 +++ b/drivers/cpuidle/cpuidle.c
38110 @@ -252,7 +252,7 @@ static int poll_idle(struct cpuidle_device *dev,
38111
38112 static void poll_idle_init(struct cpuidle_driver *drv)
38113 {
38114 - struct cpuidle_state *state = &drv->states[0];
38115 + cpuidle_state_no_const *state = &drv->states[0];
38116
38117 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
38118 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
38119 diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
38120 index ea2f8e7..70ac501 100644
38121 --- a/drivers/cpuidle/governor.c
38122 +++ b/drivers/cpuidle/governor.c
38123 @@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
38124 mutex_lock(&cpuidle_lock);
38125 if (__cpuidle_find_governor(gov->name) == NULL) {
38126 ret = 0;
38127 - list_add_tail(&gov->governor_list, &cpuidle_governors);
38128 + pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
38129 if (!cpuidle_curr_governor ||
38130 cpuidle_curr_governor->rating < gov->rating)
38131 cpuidle_switch_governor(gov);
38132 @@ -135,7 +135,7 @@ void cpuidle_unregister_governor(struct cpuidle_governor *gov)
38133 new_gov = cpuidle_replace_governor(gov->rating);
38134 cpuidle_switch_governor(new_gov);
38135 }
38136 - list_del(&gov->governor_list);
38137 + pax_list_del((struct list_head *)&gov->governor_list);
38138 mutex_unlock(&cpuidle_lock);
38139 }
38140
38141 diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
38142 index 8739cc0..dc859d0 100644
38143 --- a/drivers/cpuidle/sysfs.c
38144 +++ b/drivers/cpuidle/sysfs.c
38145 @@ -134,7 +134,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
38146 NULL
38147 };
38148
38149 -static struct attribute_group cpuidle_attr_group = {
38150 +static attribute_group_no_const cpuidle_attr_group = {
38151 .attrs = cpuidle_default_attrs,
38152 .name = "cpuidle",
38153 };
38154 diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
38155 index 12fea3e..1e28f47 100644
38156 --- a/drivers/crypto/hifn_795x.c
38157 +++ b/drivers/crypto/hifn_795x.c
38158 @@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
38159 MODULE_PARM_DESC(hifn_pll_ref,
38160 "PLL reference clock (pci[freq] or ext[freq], default ext)");
38161
38162 -static atomic_t hifn_dev_number;
38163 +static atomic_unchecked_t hifn_dev_number;
38164
38165 #define ACRYPTO_OP_DECRYPT 0
38166 #define ACRYPTO_OP_ENCRYPT 1
38167 @@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
38168 goto err_out_disable_pci_device;
38169
38170 snprintf(name, sizeof(name), "hifn%d",
38171 - atomic_inc_return(&hifn_dev_number)-1);
38172 + atomic_inc_return_unchecked(&hifn_dev_number)-1);
38173
38174 err = pci_request_regions(pdev, name);
38175 if (err)
38176 diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
38177 index c99c00d..990a4b2 100644
38178 --- a/drivers/devfreq/devfreq.c
38179 +++ b/drivers/devfreq/devfreq.c
38180 @@ -607,7 +607,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
38181 goto err_out;
38182 }
38183
38184 - list_add(&governor->node, &devfreq_governor_list);
38185 + pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
38186
38187 list_for_each_entry(devfreq, &devfreq_list, node) {
38188 int ret = 0;
38189 @@ -695,7 +695,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
38190 }
38191 }
38192
38193 - list_del(&governor->node);
38194 + pax_list_del((struct list_head *)&governor->node);
38195 err_out:
38196 mutex_unlock(&devfreq_list_lock);
38197
38198 diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
38199 index 1069e88..dfcd642 100644
38200 --- a/drivers/dma/sh/shdmac.c
38201 +++ b/drivers/dma/sh/shdmac.c
38202 @@ -511,7 +511,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
38203 return ret;
38204 }
38205
38206 -static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
38207 +static struct notifier_block sh_dmae_nmi_notifier = {
38208 .notifier_call = sh_dmae_nmi_handler,
38209
38210 /* Run before NMI debug handler and KGDB */
38211 diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
38212 index 211021d..201d47f 100644
38213 --- a/drivers/edac/edac_device.c
38214 +++ b/drivers/edac/edac_device.c
38215 @@ -474,9 +474,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
38216 */
38217 int edac_device_alloc_index(void)
38218 {
38219 - static atomic_t device_indexes = ATOMIC_INIT(0);
38220 + static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
38221
38222 - return atomic_inc_return(&device_indexes) - 1;
38223 + return atomic_inc_return_unchecked(&device_indexes) - 1;
38224 }
38225 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
38226
38227 diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
38228 index 9f7e0e60..348c875 100644
38229 --- a/drivers/edac/edac_mc_sysfs.c
38230 +++ b/drivers/edac/edac_mc_sysfs.c
38231 @@ -150,7 +150,7 @@ static const char * const edac_caps[] = {
38232 struct dev_ch_attribute {
38233 struct device_attribute attr;
38234 int channel;
38235 -};
38236 +} __do_const;
38237
38238 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
38239 struct dev_ch_attribute dev_attr_legacy_##_name = \
38240 @@ -1007,14 +1007,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
38241 }
38242
38243 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
38244 + pax_open_kernel();
38245 if (mci->get_sdram_scrub_rate) {
38246 - dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
38247 - dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
38248 + *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
38249 + *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
38250 }
38251 if (mci->set_sdram_scrub_rate) {
38252 - dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
38253 - dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
38254 + *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
38255 + *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
38256 }
38257 + pax_close_kernel();
38258 err = device_create_file(&mci->dev,
38259 &dev_attr_sdram_scrub_rate);
38260 if (err) {
38261 diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
38262 index dd370f9..0281629 100644
38263 --- a/drivers/edac/edac_pci.c
38264 +++ b/drivers/edac/edac_pci.c
38265 @@ -29,7 +29,7 @@
38266
38267 static DEFINE_MUTEX(edac_pci_ctls_mutex);
38268 static LIST_HEAD(edac_pci_list);
38269 -static atomic_t pci_indexes = ATOMIC_INIT(0);
38270 +static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
38271
38272 /*
38273 * edac_pci_alloc_ctl_info
38274 @@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
38275 */
38276 int edac_pci_alloc_index(void)
38277 {
38278 - return atomic_inc_return(&pci_indexes) - 1;
38279 + return atomic_inc_return_unchecked(&pci_indexes) - 1;
38280 }
38281 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
38282
38283 diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
38284 index e8658e4..22746d6 100644
38285 --- a/drivers/edac/edac_pci_sysfs.c
38286 +++ b/drivers/edac/edac_pci_sysfs.c
38287 @@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
38288 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
38289 static int edac_pci_poll_msec = 1000; /* one second workq period */
38290
38291 -static atomic_t pci_parity_count = ATOMIC_INIT(0);
38292 -static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
38293 +static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
38294 +static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
38295
38296 static struct kobject *edac_pci_top_main_kobj;
38297 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
38298 @@ -235,7 +235,7 @@ struct edac_pci_dev_attribute {
38299 void *value;
38300 ssize_t(*show) (void *, char *);
38301 ssize_t(*store) (void *, const char *, size_t);
38302 -};
38303 +} __do_const;
38304
38305 /* Set of show/store abstract level functions for PCI Parity object */
38306 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
38307 @@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
38308 edac_printk(KERN_CRIT, EDAC_PCI,
38309 "Signaled System Error on %s\n",
38310 pci_name(dev));
38311 - atomic_inc(&pci_nonparity_count);
38312 + atomic_inc_unchecked(&pci_nonparity_count);
38313 }
38314
38315 if (status & (PCI_STATUS_PARITY)) {
38316 @@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
38317 "Master Data Parity Error on %s\n",
38318 pci_name(dev));
38319
38320 - atomic_inc(&pci_parity_count);
38321 + atomic_inc_unchecked(&pci_parity_count);
38322 }
38323
38324 if (status & (PCI_STATUS_DETECTED_PARITY)) {
38325 @@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
38326 "Detected Parity Error on %s\n",
38327 pci_name(dev));
38328
38329 - atomic_inc(&pci_parity_count);
38330 + atomic_inc_unchecked(&pci_parity_count);
38331 }
38332 }
38333
38334 @@ -618,7 +618,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
38335 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
38336 "Signaled System Error on %s\n",
38337 pci_name(dev));
38338 - atomic_inc(&pci_nonparity_count);
38339 + atomic_inc_unchecked(&pci_nonparity_count);
38340 }
38341
38342 if (status & (PCI_STATUS_PARITY)) {
38343 @@ -626,7 +626,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
38344 "Master Data Parity Error on "
38345 "%s\n", pci_name(dev));
38346
38347 - atomic_inc(&pci_parity_count);
38348 + atomic_inc_unchecked(&pci_parity_count);
38349 }
38350
38351 if (status & (PCI_STATUS_DETECTED_PARITY)) {
38352 @@ -634,7 +634,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
38353 "Detected Parity Error on %s\n",
38354 pci_name(dev));
38355
38356 - atomic_inc(&pci_parity_count);
38357 + atomic_inc_unchecked(&pci_parity_count);
38358 }
38359 }
38360 }
38361 @@ -672,7 +672,7 @@ void edac_pci_do_parity_check(void)
38362 if (!check_pci_errors)
38363 return;
38364
38365 - before_count = atomic_read(&pci_parity_count);
38366 + before_count = atomic_read_unchecked(&pci_parity_count);
38367
38368 /* scan all PCI devices looking for a Parity Error on devices and
38369 * bridges.
38370 @@ -684,7 +684,7 @@ void edac_pci_do_parity_check(void)
38371 /* Only if operator has selected panic on PCI Error */
38372 if (edac_pci_get_panic_on_pe()) {
38373 /* If the count is different 'after' from 'before' */
38374 - if (before_count != atomic_read(&pci_parity_count))
38375 + if (before_count != atomic_read_unchecked(&pci_parity_count))
38376 panic("EDAC: PCI Parity Error");
38377 }
38378 }
38379 diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
38380 index 51b7e3a..aa8a3e8 100644
38381 --- a/drivers/edac/mce_amd.h
38382 +++ b/drivers/edac/mce_amd.h
38383 @@ -77,7 +77,7 @@ struct amd_decoder_ops {
38384 bool (*mc0_mce)(u16, u8);
38385 bool (*mc1_mce)(u16, u8);
38386 bool (*mc2_mce)(u16, u8);
38387 -};
38388 +} __no_const;
38389
38390 void amd_report_gart_errors(bool);
38391 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
38392 diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
38393 index 57ea7f4..af06b76 100644
38394 --- a/drivers/firewire/core-card.c
38395 +++ b/drivers/firewire/core-card.c
38396 @@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
38397 const struct fw_card_driver *driver,
38398 struct device *device)
38399 {
38400 - static atomic_t index = ATOMIC_INIT(-1);
38401 + static atomic_unchecked_t index = ATOMIC_INIT(-1);
38402
38403 - card->index = atomic_inc_return(&index);
38404 + card->index = atomic_inc_return_unchecked(&index);
38405 card->driver = driver;
38406 card->device = device;
38407 card->current_tlabel = 0;
38408 @@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
38409
38410 void fw_core_remove_card(struct fw_card *card)
38411 {
38412 - struct fw_card_driver dummy_driver = dummy_driver_template;
38413 + fw_card_driver_no_const dummy_driver = dummy_driver_template;
38414
38415 card->driver->update_phy_reg(card, 4,
38416 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
38417 diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
38418 index de4aa40..49ab1f2 100644
38419 --- a/drivers/firewire/core-device.c
38420 +++ b/drivers/firewire/core-device.c
38421 @@ -253,7 +253,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
38422 struct config_rom_attribute {
38423 struct device_attribute attr;
38424 u32 key;
38425 -};
38426 +} __do_const;
38427
38428 static ssize_t show_immediate(struct device *dev,
38429 struct device_attribute *dattr, char *buf)
38430 diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
38431 index e5af0e3..d318058 100644
38432 --- a/drivers/firewire/core-transaction.c
38433 +++ b/drivers/firewire/core-transaction.c
38434 @@ -38,6 +38,7 @@
38435 #include <linux/timer.h>
38436 #include <linux/types.h>
38437 #include <linux/workqueue.h>
38438 +#include <linux/sched.h>
38439
38440 #include <asm/byteorder.h>
38441
38442 diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
38443 index 515a42c..5ecf3ba 100644
38444 --- a/drivers/firewire/core.h
38445 +++ b/drivers/firewire/core.h
38446 @@ -111,6 +111,7 @@ struct fw_card_driver {
38447
38448 int (*stop_iso)(struct fw_iso_context *ctx);
38449 };
38450 +typedef struct fw_card_driver __no_const fw_card_driver_no_const;
38451
38452 void fw_card_initialize(struct fw_card *card,
38453 const struct fw_card_driver *driver, struct device *device);
38454 diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
38455 index 94a58a0..f5eba42 100644
38456 --- a/drivers/firmware/dmi-id.c
38457 +++ b/drivers/firmware/dmi-id.c
38458 @@ -16,7 +16,7 @@
38459 struct dmi_device_attribute{
38460 struct device_attribute dev_attr;
38461 int field;
38462 -};
38463 +} __do_const;
38464 #define to_dmi_dev_attr(_dev_attr) \
38465 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
38466
38467 diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
38468 index fa0affb..aa448eb 100644
38469 --- a/drivers/firmware/dmi_scan.c
38470 +++ b/drivers/firmware/dmi_scan.c
38471 @@ -791,7 +791,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
38472 if (buf == NULL)
38473 return -1;
38474
38475 - dmi_table(buf, dmi_len, dmi_num, decode, private_data);
38476 + dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
38477
38478 iounmap(buf);
38479 return 0;
38480 diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
38481 index 5145fa3..0d3babd 100644
38482 --- a/drivers/firmware/efi/efi.c
38483 +++ b/drivers/firmware/efi/efi.c
38484 @@ -65,14 +65,16 @@ static struct attribute_group efi_subsys_attr_group = {
38485 };
38486
38487 static struct efivars generic_efivars;
38488 -static struct efivar_operations generic_ops;
38489 +static efivar_operations_no_const generic_ops __read_only;
38490
38491 static int generic_ops_register(void)
38492 {
38493 - generic_ops.get_variable = efi.get_variable;
38494 - generic_ops.set_variable = efi.set_variable;
38495 - generic_ops.get_next_variable = efi.get_next_variable;
38496 - generic_ops.query_variable_store = efi_query_variable_store;
38497 + pax_open_kernel();
38498 + *(void **)&generic_ops.get_variable = efi.get_variable;
38499 + *(void **)&generic_ops.set_variable = efi.set_variable;
38500 + *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
38501 + *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
38502 + pax_close_kernel();
38503
38504 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
38505 }
38506 diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
38507 index 8c5a61a..cf07bd0 100644
38508 --- a/drivers/firmware/efi/efivars.c
38509 +++ b/drivers/firmware/efi/efivars.c
38510 @@ -456,7 +456,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
38511 static int
38512 create_efivars_bin_attributes(void)
38513 {
38514 - struct bin_attribute *attr;
38515 + bin_attribute_no_const *attr;
38516 int error;
38517
38518 /* new_var */
38519 diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
38520 index 2a90ba6..07f3733 100644
38521 --- a/drivers/firmware/google/memconsole.c
38522 +++ b/drivers/firmware/google/memconsole.c
38523 @@ -147,7 +147,9 @@ static int __init memconsole_init(void)
38524 if (!found_memconsole())
38525 return -ENODEV;
38526
38527 - memconsole_bin_attr.size = memconsole_length;
38528 + pax_open_kernel();
38529 + *(size_t *)&memconsole_bin_attr.size = memconsole_length;
38530 + pax_close_kernel();
38531
38532 ret = sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
38533
38534 diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
38535 index 814addb..0937d7f 100644
38536 --- a/drivers/gpio/gpio-ich.c
38537 +++ b/drivers/gpio/gpio-ich.c
38538 @@ -71,7 +71,7 @@ struct ichx_desc {
38539 /* Some chipsets have quirks, let these use their own request/get */
38540 int (*request)(struct gpio_chip *chip, unsigned offset);
38541 int (*get)(struct gpio_chip *chip, unsigned offset);
38542 -};
38543 +} __do_const;
38544
38545 static struct {
38546 spinlock_t lock;
38547 diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
38548 index 9902732..64b62dd 100644
38549 --- a/drivers/gpio/gpio-vr41xx.c
38550 +++ b/drivers/gpio/gpio-vr41xx.c
38551 @@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
38552 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
38553 maskl, pendl, maskh, pendh);
38554
38555 - atomic_inc(&irq_err_count);
38556 + atomic_inc_unchecked(&irq_err_count);
38557
38558 return -EINVAL;
38559 }
38560 diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
38561 index c722c3b..2ec6040 100644
38562 --- a/drivers/gpu/drm/drm_crtc_helper.c
38563 +++ b/drivers/gpu/drm/drm_crtc_helper.c
38564 @@ -328,7 +328,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
38565 struct drm_crtc *tmp;
38566 int crtc_mask = 1;
38567
38568 - WARN(!crtc, "checking null crtc?\n");
38569 + BUG_ON(!crtc);
38570
38571 dev = crtc->dev;
38572
38573 diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
38574 index fe58d08..07bc38e 100644
38575 --- a/drivers/gpu/drm/drm_drv.c
38576 +++ b/drivers/gpu/drm/drm_drv.c
38577 @@ -186,7 +186,7 @@ static void drm_legacy_dev_reinit(struct drm_device *dev)
38578 atomic_set(&dev->vma_count, 0);
38579
38580 for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
38581 - atomic_set(&dev->counts[i], 0);
38582 + atomic_set_unchecked(&dev->counts[i], 0);
38583
38584 dev->sigdata.lock = NULL;
38585
38586 @@ -302,7 +302,7 @@ module_exit(drm_core_exit);
38587 /**
38588 * Copy and IOCTL return string to user space
38589 */
38590 -static int drm_copy_field(char *buf, size_t *buf_len, const char *value)
38591 +static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
38592 {
38593 int len;
38594
38595 @@ -372,7 +372,7 @@ long drm_ioctl(struct file *filp,
38596 struct drm_file *file_priv = filp->private_data;
38597 struct drm_device *dev;
38598 const struct drm_ioctl_desc *ioctl = NULL;
38599 - drm_ioctl_t *func;
38600 + drm_ioctl_no_const_t func;
38601 unsigned int nr = DRM_IOCTL_NR(cmd);
38602 int retcode = -EINVAL;
38603 char stack_kdata[128];
38604 @@ -385,7 +385,7 @@ long drm_ioctl(struct file *filp,
38605 return -ENODEV;
38606
38607 atomic_inc(&dev->ioctl_count);
38608 - atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
38609 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]);
38610 ++file_priv->ioctl_count;
38611
38612 if ((nr >= DRM_CORE_IOCTL_COUNT) &&
38613 diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
38614 index 3f84277..c627c54 100644
38615 --- a/drivers/gpu/drm/drm_fops.c
38616 +++ b/drivers/gpu/drm/drm_fops.c
38617 @@ -97,7 +97,7 @@ int drm_open(struct inode *inode, struct file *filp)
38618 if (drm_device_is_unplugged(dev))
38619 return -ENODEV;
38620
38621 - if (!dev->open_count++)
38622 + if (local_inc_return(&dev->open_count) == 1)
38623 need_setup = 1;
38624 mutex_lock(&dev->struct_mutex);
38625 old_imapping = inode->i_mapping;
38626 @@ -113,7 +113,7 @@ int drm_open(struct inode *inode, struct file *filp)
38627 retcode = drm_open_helper(inode, filp, dev);
38628 if (retcode)
38629 goto err_undo;
38630 - atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
38631 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
38632 if (need_setup) {
38633 retcode = drm_setup(dev);
38634 if (retcode)
38635 @@ -128,7 +128,7 @@ err_undo:
38636 iput(container_of(dev->dev_mapping, struct inode, i_data));
38637 dev->dev_mapping = old_mapping;
38638 mutex_unlock(&dev->struct_mutex);
38639 - dev->open_count--;
38640 + local_dec(&dev->open_count);
38641 return retcode;
38642 }
38643 EXPORT_SYMBOL(drm_open);
38644 @@ -405,7 +405,7 @@ int drm_release(struct inode *inode, struct file *filp)
38645
38646 mutex_lock(&drm_global_mutex);
38647
38648 - DRM_DEBUG("open_count = %d\n", dev->open_count);
38649 + DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
38650
38651 if (dev->driver->preclose)
38652 dev->driver->preclose(dev, file_priv);
38653 @@ -414,10 +414,10 @@ int drm_release(struct inode *inode, struct file *filp)
38654 * Begin inline drm_release
38655 */
38656
38657 - DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
38658 + DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
38659 task_pid_nr(current),
38660 (long)old_encode_dev(file_priv->minor->device),
38661 - dev->open_count);
38662 + local_read(&dev->open_count));
38663
38664 /* Release any auth tokens that might point to this file_priv,
38665 (do that under the drm_global_mutex) */
38666 @@ -516,8 +516,8 @@ int drm_release(struct inode *inode, struct file *filp)
38667 * End inline drm_release
38668 */
38669
38670 - atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
38671 - if (!--dev->open_count) {
38672 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]);
38673 + if (local_dec_and_test(&dev->open_count)) {
38674 if (atomic_read(&dev->ioctl_count)) {
38675 DRM_ERROR("Device busy: %d\n",
38676 atomic_read(&dev->ioctl_count));
38677 diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
38678 index f731116..629842c 100644
38679 --- a/drivers/gpu/drm/drm_global.c
38680 +++ b/drivers/gpu/drm/drm_global.c
38681 @@ -36,7 +36,7 @@
38682 struct drm_global_item {
38683 struct mutex mutex;
38684 void *object;
38685 - int refcount;
38686 + atomic_t refcount;
38687 };
38688
38689 static struct drm_global_item glob[DRM_GLOBAL_NUM];
38690 @@ -49,7 +49,7 @@ void drm_global_init(void)
38691 struct drm_global_item *item = &glob[i];
38692 mutex_init(&item->mutex);
38693 item->object = NULL;
38694 - item->refcount = 0;
38695 + atomic_set(&item->refcount, 0);
38696 }
38697 }
38698
38699 @@ -59,7 +59,7 @@ void drm_global_release(void)
38700 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
38701 struct drm_global_item *item = &glob[i];
38702 BUG_ON(item->object != NULL);
38703 - BUG_ON(item->refcount != 0);
38704 + BUG_ON(atomic_read(&item->refcount) != 0);
38705 }
38706 }
38707
38708 @@ -70,7 +70,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
38709 void *object;
38710
38711 mutex_lock(&item->mutex);
38712 - if (item->refcount == 0) {
38713 + if (atomic_read(&item->refcount) == 0) {
38714 item->object = kzalloc(ref->size, GFP_KERNEL);
38715 if (unlikely(item->object == NULL)) {
38716 ret = -ENOMEM;
38717 @@ -83,7 +83,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
38718 goto out_err;
38719
38720 }
38721 - ++item->refcount;
38722 + atomic_inc(&item->refcount);
38723 ref->object = item->object;
38724 object = item->object;
38725 mutex_unlock(&item->mutex);
38726 @@ -100,9 +100,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
38727 struct drm_global_item *item = &glob[ref->global_type];
38728
38729 mutex_lock(&item->mutex);
38730 - BUG_ON(item->refcount == 0);
38731 + BUG_ON(atomic_read(&item->refcount) == 0);
38732 BUG_ON(ref->object != item->object);
38733 - if (--item->refcount == 0) {
38734 + if (atomic_dec_and_test(&item->refcount)) {
38735 ref->release(ref);
38736 item->object = NULL;
38737 }
38738 diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
38739 index 5329832..b503f49 100644
38740 --- a/drivers/gpu/drm/drm_info.c
38741 +++ b/drivers/gpu/drm/drm_info.c
38742 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void *data)
38743 struct drm_local_map *map;
38744 struct drm_map_list *r_list;
38745
38746 - /* Hardcoded from _DRM_FRAME_BUFFER,
38747 - _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
38748 - _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
38749 - const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
38750 + static const char * const types[] = {
38751 + [_DRM_FRAME_BUFFER] = "FB",
38752 + [_DRM_REGISTERS] = "REG",
38753 + [_DRM_SHM] = "SHM",
38754 + [_DRM_AGP] = "AGP",
38755 + [_DRM_SCATTER_GATHER] = "SG",
38756 + [_DRM_CONSISTENT] = "PCI",
38757 + [_DRM_GEM] = "GEM" };
38758 const char *type;
38759 int i;
38760
38761 @@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
38762 map = r_list->map;
38763 if (!map)
38764 continue;
38765 - if (map->type < 0 || map->type > 5)
38766 + if (map->type >= ARRAY_SIZE(types))
38767 type = "??";
38768 else
38769 type = types[map->type];
38770 @@ -257,7 +261,11 @@ int drm_vma_info(struct seq_file *m, void *data)
38771 vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
38772 vma->vm_flags & VM_LOCKED ? 'l' : '-',
38773 vma->vm_flags & VM_IO ? 'i' : '-',
38774 +#ifdef CONFIG_GRKERNSEC_HIDESYM
38775 + 0);
38776 +#else
38777 vma->vm_pgoff);
38778 +#endif
38779
38780 #if defined(__i386__)
38781 pgprot = pgprot_val(vma->vm_page_prot);
38782 diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
38783 index 2f4c434..dd12cd2 100644
38784 --- a/drivers/gpu/drm/drm_ioc32.c
38785 +++ b/drivers/gpu/drm/drm_ioc32.c
38786 @@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
38787 request = compat_alloc_user_space(nbytes);
38788 if (!access_ok(VERIFY_WRITE, request, nbytes))
38789 return -EFAULT;
38790 - list = (struct drm_buf_desc *) (request + 1);
38791 + list = (struct drm_buf_desc __user *) (request + 1);
38792
38793 if (__put_user(count, &request->count)
38794 || __put_user(list, &request->list))
38795 @@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
38796 request = compat_alloc_user_space(nbytes);
38797 if (!access_ok(VERIFY_WRITE, request, nbytes))
38798 return -EFAULT;
38799 - list = (struct drm_buf_pub *) (request + 1);
38800 + list = (struct drm_buf_pub __user *) (request + 1);
38801
38802 if (__put_user(count, &request->count)
38803 || __put_user(list, &request->list))
38804 @@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
38805 return 0;
38806 }
38807
38808 -drm_ioctl_compat_t *drm_compat_ioctls[] = {
38809 +drm_ioctl_compat_t drm_compat_ioctls[] = {
38810 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
38811 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
38812 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
38813 @@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
38814 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
38815 {
38816 unsigned int nr = DRM_IOCTL_NR(cmd);
38817 - drm_ioctl_compat_t *fn;
38818 int ret;
38819
38820 /* Assume that ioctls without an explicit compat routine will just
38821 @@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
38822 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
38823 return drm_ioctl(filp, cmd, arg);
38824
38825 - fn = drm_compat_ioctls[nr];
38826 -
38827 - if (fn != NULL)
38828 - ret = (*fn) (filp, cmd, arg);
38829 + if (drm_compat_ioctls[nr] != NULL)
38830 + ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
38831 else
38832 ret = drm_ioctl(filp, cmd, arg);
38833
38834 diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
38835 index d752c96..fe08455 100644
38836 --- a/drivers/gpu/drm/drm_lock.c
38837 +++ b/drivers/gpu/drm/drm_lock.c
38838 @@ -86,7 +86,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
38839 if (drm_lock_take(&master->lock, lock->context)) {
38840 master->lock.file_priv = file_priv;
38841 master->lock.lock_time = jiffies;
38842 - atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
38843 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_LOCKS]);
38844 break; /* Got lock */
38845 }
38846
38847 @@ -157,7 +157,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
38848 return -EINVAL;
38849 }
38850
38851 - atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
38852 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_UNLOCKS]);
38853
38854 if (drm_lock_free(&master->lock, lock->context)) {
38855 /* FIXME: Should really bail out here. */
38856 diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
38857 index 39d8645..59e06fa 100644
38858 --- a/drivers/gpu/drm/drm_stub.c
38859 +++ b/drivers/gpu/drm/drm_stub.c
38860 @@ -484,7 +484,7 @@ void drm_unplug_dev(struct drm_device *dev)
38861
38862 drm_device_set_unplugged(dev);
38863
38864 - if (dev->open_count == 0) {
38865 + if (local_read(&dev->open_count) == 0) {
38866 drm_put_dev(dev);
38867 }
38868 mutex_unlock(&drm_global_mutex);
38869 diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
38870 index 2290b3b..22056a1 100644
38871 --- a/drivers/gpu/drm/drm_sysfs.c
38872 +++ b/drivers/gpu/drm/drm_sysfs.c
38873 @@ -524,7 +524,7 @@ EXPORT_SYMBOL(drm_sysfs_hotplug_event);
38874 int drm_sysfs_device_add(struct drm_minor *minor)
38875 {
38876 int err;
38877 - char *minor_str;
38878 + const char *minor_str;
38879
38880 minor->kdev.parent = minor->dev->dev;
38881
38882 diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
38883 index ab1892eb..d7009ca 100644
38884 --- a/drivers/gpu/drm/i810/i810_dma.c
38885 +++ b/drivers/gpu/drm/i810/i810_dma.c
38886 @@ -944,8 +944,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
38887 dma->buflist[vertex->idx],
38888 vertex->discard, vertex->used);
38889
38890 - atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
38891 - atomic_inc(&dev->counts[_DRM_STAT_DMA]);
38892 + atomic_add_unchecked(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
38893 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
38894 sarea_priv->last_enqueue = dev_priv->counter - 1;
38895 sarea_priv->last_dispatch = (int)hw_status[5];
38896
38897 @@ -1105,8 +1105,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
38898 i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
38899 mc->last_render);
38900
38901 - atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
38902 - atomic_inc(&dev->counts[_DRM_STAT_DMA]);
38903 + atomic_add_unchecked(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
38904 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
38905 sarea_priv->last_enqueue = dev_priv->counter - 1;
38906 sarea_priv->last_dispatch = (int)hw_status[5];
38907
38908 diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
38909 index d4d16ed..8fb0b51 100644
38910 --- a/drivers/gpu/drm/i810/i810_drv.h
38911 +++ b/drivers/gpu/drm/i810/i810_drv.h
38912 @@ -108,8 +108,8 @@ typedef struct drm_i810_private {
38913 int page_flipping;
38914
38915 wait_queue_head_t irq_queue;
38916 - atomic_t irq_received;
38917 - atomic_t irq_emitted;
38918 + atomic_unchecked_t irq_received;
38919 + atomic_unchecked_t irq_emitted;
38920
38921 int front_offset;
38922 } drm_i810_private_t;
38923 diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
38924 index a6f4cb5..6b2beb2 100644
38925 --- a/drivers/gpu/drm/i915/i915_debugfs.c
38926 +++ b/drivers/gpu/drm/i915/i915_debugfs.c
38927 @@ -624,7 +624,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
38928 I915_READ(GTIMR));
38929 }
38930 seq_printf(m, "Interrupts received: %d\n",
38931 - atomic_read(&dev_priv->irq_received));
38932 + atomic_read_unchecked(&dev_priv->irq_received));
38933 for_each_ring(ring, dev_priv, i) {
38934 if (IS_GEN6(dev) || IS_GEN7(dev)) {
38935 seq_printf(m,
38936 diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
38937 index d5c784d..06e5c36 100644
38938 --- a/drivers/gpu/drm/i915/i915_dma.c
38939 +++ b/drivers/gpu/drm/i915/i915_dma.c
38940 @@ -1263,7 +1263,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
38941 bool can_switch;
38942
38943 spin_lock(&dev->count_lock);
38944 - can_switch = (dev->open_count == 0);
38945 + can_switch = (local_read(&dev->open_count) == 0);
38946 spin_unlock(&dev->count_lock);
38947 return can_switch;
38948 }
38949 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
38950 index ab0f2c0..53c1bda 100644
38951 --- a/drivers/gpu/drm/i915/i915_drv.h
38952 +++ b/drivers/gpu/drm/i915/i915_drv.h
38953 @@ -1181,7 +1181,7 @@ typedef struct drm_i915_private {
38954 drm_dma_handle_t *status_page_dmah;
38955 struct resource mch_res;
38956
38957 - atomic_t irq_received;
38958 + atomic_unchecked_t irq_received;
38959
38960 /* protects the irq masks */
38961 spinlock_t irq_lock;
38962 diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
38963 index bf34577..3fd2ffa 100644
38964 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
38965 +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
38966 @@ -768,9 +768,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
38967
38968 static int
38969 validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
38970 - int count)
38971 + unsigned int count)
38972 {
38973 - int i;
38974 + unsigned int i;
38975 int relocs_total = 0;
38976 int relocs_max = INT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
38977
38978 diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
38979 index 3c59584..500f2e9 100644
38980 --- a/drivers/gpu/drm/i915/i915_ioc32.c
38981 +++ b/drivers/gpu/drm/i915/i915_ioc32.c
38982 @@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
38983 (unsigned long)request);
38984 }
38985
38986 -static drm_ioctl_compat_t *i915_compat_ioctls[] = {
38987 +static drm_ioctl_compat_t i915_compat_ioctls[] = {
38988 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
38989 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
38990 [DRM_I915_GETPARAM] = compat_i915_getparam,
38991 @@ -202,18 +202,15 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
38992 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
38993 {
38994 unsigned int nr = DRM_IOCTL_NR(cmd);
38995 - drm_ioctl_compat_t *fn = NULL;
38996 int ret;
38997
38998 if (nr < DRM_COMMAND_BASE)
38999 return drm_compat_ioctl(filp, cmd, arg);
39000
39001 - if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls))
39002 - fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
39003 -
39004 - if (fn != NULL)
39005 + if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls)) {
39006 + drm_ioctl_compat_t fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
39007 ret = (*fn) (filp, cmd, arg);
39008 - else
39009 + } else
39010 ret = drm_ioctl(filp, cmd, arg);
39011
39012 return ret;
39013 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
39014 index 4b91228..590c643 100644
39015 --- a/drivers/gpu/drm/i915/i915_irq.c
39016 +++ b/drivers/gpu/drm/i915/i915_irq.c
39017 @@ -1085,7 +1085,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
39018 int pipe;
39019 u32 pipe_stats[I915_MAX_PIPES];
39020
39021 - atomic_inc(&dev_priv->irq_received);
39022 + atomic_inc_unchecked(&dev_priv->irq_received);
39023
39024 while (true) {
39025 iir = I915_READ(VLV_IIR);
39026 @@ -1390,7 +1390,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg)
39027 irqreturn_t ret = IRQ_NONE;
39028 bool err_int_reenable = false;
39029
39030 - atomic_inc(&dev_priv->irq_received);
39031 + atomic_inc_unchecked(&dev_priv->irq_received);
39032
39033 /* We get interrupts on unclaimed registers, so check for this before we
39034 * do any I915_{READ,WRITE}. */
39035 @@ -2146,7 +2146,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
39036 {
39037 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
39038
39039 - atomic_set(&dev_priv->irq_received, 0);
39040 + atomic_set_unchecked(&dev_priv->irq_received, 0);
39041
39042 I915_WRITE(HWSTAM, 0xeffe);
39043
39044 @@ -2164,7 +2164,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev)
39045 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
39046 int pipe;
39047
39048 - atomic_set(&dev_priv->irq_received, 0);
39049 + atomic_set_unchecked(&dev_priv->irq_received, 0);
39050
39051 /* VLV magic */
39052 I915_WRITE(VLV_IMR, 0);
39053 @@ -2452,7 +2452,7 @@ static void i8xx_irq_preinstall(struct drm_device * dev)
39054 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
39055 int pipe;
39056
39057 - atomic_set(&dev_priv->irq_received, 0);
39058 + atomic_set_unchecked(&dev_priv->irq_received, 0);
39059
39060 for_each_pipe(pipe)
39061 I915_WRITE(PIPESTAT(pipe), 0);
39062 @@ -2530,7 +2530,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg)
39063 I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
39064 I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
39065
39066 - atomic_inc(&dev_priv->irq_received);
39067 + atomic_inc_unchecked(&dev_priv->irq_received);
39068
39069 iir = I915_READ16(IIR);
39070 if (iir == 0)
39071 @@ -2604,7 +2604,7 @@ static void i915_irq_preinstall(struct drm_device * dev)
39072 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
39073 int pipe;
39074
39075 - atomic_set(&dev_priv->irq_received, 0);
39076 + atomic_set_unchecked(&dev_priv->irq_received, 0);
39077
39078 if (I915_HAS_HOTPLUG(dev)) {
39079 I915_WRITE(PORT_HOTPLUG_EN, 0);
39080 @@ -2703,7 +2703,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
39081 I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
39082 int pipe, ret = IRQ_NONE;
39083
39084 - atomic_inc(&dev_priv->irq_received);
39085 + atomic_inc_unchecked(&dev_priv->irq_received);
39086
39087 iir = I915_READ(IIR);
39088 do {
39089 @@ -2827,7 +2827,7 @@ static void i965_irq_preinstall(struct drm_device * dev)
39090 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
39091 int pipe;
39092
39093 - atomic_set(&dev_priv->irq_received, 0);
39094 + atomic_set_unchecked(&dev_priv->irq_received, 0);
39095
39096 I915_WRITE(PORT_HOTPLUG_EN, 0);
39097 I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
39098 @@ -2941,7 +2941,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
39099 I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
39100 I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
39101
39102 - atomic_inc(&dev_priv->irq_received);
39103 + atomic_inc_unchecked(&dev_priv->irq_received);
39104
39105 iir = I915_READ(IIR);
39106
39107 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
39108 index f535670..bde09e2 100644
39109 --- a/drivers/gpu/drm/i915/intel_display.c
39110 +++ b/drivers/gpu/drm/i915/intel_display.c
39111 @@ -10019,13 +10019,13 @@ struct intel_quirk {
39112 int subsystem_vendor;
39113 int subsystem_device;
39114 void (*hook)(struct drm_device *dev);
39115 -};
39116 +} __do_const;
39117
39118 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
39119 struct intel_dmi_quirk {
39120 void (*hook)(struct drm_device *dev);
39121 const struct dmi_system_id (*dmi_id_list)[];
39122 -};
39123 +} __do_const;
39124
39125 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
39126 {
39127 @@ -10033,18 +10033,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
39128 return 1;
39129 }
39130
39131 -static const struct intel_dmi_quirk intel_dmi_quirks[] = {
39132 +static const struct dmi_system_id intel_dmi_quirks_table[] = {
39133 {
39134 - .dmi_id_list = &(const struct dmi_system_id[]) {
39135 - {
39136 - .callback = intel_dmi_reverse_brightness,
39137 - .ident = "NCR Corporation",
39138 - .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
39139 - DMI_MATCH(DMI_PRODUCT_NAME, ""),
39140 - },
39141 - },
39142 - { } /* terminating entry */
39143 + .callback = intel_dmi_reverse_brightness,
39144 + .ident = "NCR Corporation",
39145 + .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
39146 + DMI_MATCH(DMI_PRODUCT_NAME, ""),
39147 },
39148 + },
39149 + { } /* terminating entry */
39150 +};
39151 +
39152 +static const struct intel_dmi_quirk intel_dmi_quirks[] = {
39153 + {
39154 + .dmi_id_list = &intel_dmi_quirks_table,
39155 .hook = quirk_invert_brightness,
39156 },
39157 };
39158 diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
39159 index ca4bc54..ee598a2 100644
39160 --- a/drivers/gpu/drm/mga/mga_drv.h
39161 +++ b/drivers/gpu/drm/mga/mga_drv.h
39162 @@ -120,9 +120,9 @@ typedef struct drm_mga_private {
39163 u32 clear_cmd;
39164 u32 maccess;
39165
39166 - atomic_t vbl_received; /**< Number of vblanks received. */
39167 + atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
39168 wait_queue_head_t fence_queue;
39169 - atomic_t last_fence_retired;
39170 + atomic_unchecked_t last_fence_retired;
39171 u32 next_fence_to_post;
39172
39173 unsigned int fb_cpp;
39174 diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
39175 index 709e90d..89a1c0d 100644
39176 --- a/drivers/gpu/drm/mga/mga_ioc32.c
39177 +++ b/drivers/gpu/drm/mga/mga_ioc32.c
39178 @@ -189,7 +189,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
39179 return 0;
39180 }
39181
39182 -drm_ioctl_compat_t *mga_compat_ioctls[] = {
39183 +drm_ioctl_compat_t mga_compat_ioctls[] = {
39184 [DRM_MGA_INIT] = compat_mga_init,
39185 [DRM_MGA_GETPARAM] = compat_mga_getparam,
39186 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
39187 @@ -207,18 +207,15 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
39188 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
39189 {
39190 unsigned int nr = DRM_IOCTL_NR(cmd);
39191 - drm_ioctl_compat_t *fn = NULL;
39192 int ret;
39193
39194 if (nr < DRM_COMMAND_BASE)
39195 return drm_compat_ioctl(filp, cmd, arg);
39196
39197 - if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(mga_compat_ioctls))
39198 - fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
39199 -
39200 - if (fn != NULL)
39201 + if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(mga_compat_ioctls)) {
39202 + drm_ioctl_compat_t fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
39203 ret = (*fn) (filp, cmd, arg);
39204 - else
39205 + } else
39206 ret = drm_ioctl(filp, cmd, arg);
39207
39208 return ret;
39209 diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
39210 index 598c281..60d590e 100644
39211 --- a/drivers/gpu/drm/mga/mga_irq.c
39212 +++ b/drivers/gpu/drm/mga/mga_irq.c
39213 @@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
39214 if (crtc != 0)
39215 return 0;
39216
39217 - return atomic_read(&dev_priv->vbl_received);
39218 + return atomic_read_unchecked(&dev_priv->vbl_received);
39219 }
39220
39221
39222 @@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
39223 /* VBLANK interrupt */
39224 if (status & MGA_VLINEPEN) {
39225 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
39226 - atomic_inc(&dev_priv->vbl_received);
39227 + atomic_inc_unchecked(&dev_priv->vbl_received);
39228 drm_handle_vblank(dev, 0);
39229 handled = 1;
39230 }
39231 @@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
39232 if ((prim_start & ~0x03) != (prim_end & ~0x03))
39233 MGA_WRITE(MGA_PRIMEND, prim_end);
39234
39235 - atomic_inc(&dev_priv->last_fence_retired);
39236 + atomic_inc_unchecked(&dev_priv->last_fence_retired);
39237 DRM_WAKEUP(&dev_priv->fence_queue);
39238 handled = 1;
39239 }
39240 @@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
39241 * using fences.
39242 */
39243 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
39244 - (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
39245 + (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
39246 - *sequence) <= (1 << 23)));
39247
39248 *sequence = cur_fence;
39249 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
39250 index 3e72876..d1c15ad 100644
39251 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c
39252 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
39253 @@ -965,7 +965,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
39254 struct bit_table {
39255 const char id;
39256 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
39257 -};
39258 +} __no_const;
39259
39260 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
39261
39262 diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
39263 index 994fd6e..6e12565 100644
39264 --- a/drivers/gpu/drm/nouveau/nouveau_drm.h
39265 +++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
39266 @@ -94,7 +94,6 @@ struct nouveau_drm {
39267 struct drm_global_reference mem_global_ref;
39268 struct ttm_bo_global_ref bo_global_ref;
39269 struct ttm_bo_device bdev;
39270 - atomic_t validate_sequence;
39271 int (*move)(struct nouveau_channel *,
39272 struct ttm_buffer_object *,
39273 struct ttm_mem_reg *, struct ttm_mem_reg *);
39274 diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
39275 index c1a7e5a..38b8539 100644
39276 --- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
39277 +++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
39278 @@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
39279 unsigned long arg)
39280 {
39281 unsigned int nr = DRM_IOCTL_NR(cmd);
39282 - drm_ioctl_compat_t *fn = NULL;
39283 + drm_ioctl_compat_t fn = NULL;
39284 int ret;
39285
39286 if (nr < DRM_COMMAND_BASE)
39287 diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
39288 index 81638d7..2e45854 100644
39289 --- a/drivers/gpu/drm/nouveau/nouveau_vga.c
39290 +++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
39291 @@ -65,7 +65,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
39292 bool can_switch;
39293
39294 spin_lock(&dev->count_lock);
39295 - can_switch = (dev->open_count == 0);
39296 + can_switch = (local_read(&dev->open_count) == 0);
39297 spin_unlock(&dev->count_lock);
39298 return can_switch;
39299 }
39300 diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
39301 index eb89653..613cf71 100644
39302 --- a/drivers/gpu/drm/qxl/qxl_cmd.c
39303 +++ b/drivers/gpu/drm/qxl/qxl_cmd.c
39304 @@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
39305 int ret;
39306
39307 mutex_lock(&qdev->async_io_mutex);
39308 - irq_num = atomic_read(&qdev->irq_received_io_cmd);
39309 + irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
39310 if (qdev->last_sent_io_cmd > irq_num) {
39311 if (intr)
39312 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
39313 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
39314 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
39315 else
39316 ret = wait_event_timeout(qdev->io_cmd_event,
39317 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
39318 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
39319 /* 0 is timeout, just bail the "hw" has gone away */
39320 if (ret <= 0)
39321 goto out;
39322 - irq_num = atomic_read(&qdev->irq_received_io_cmd);
39323 + irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
39324 }
39325 outb(val, addr);
39326 qdev->last_sent_io_cmd = irq_num + 1;
39327 if (intr)
39328 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
39329 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
39330 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
39331 else
39332 ret = wait_event_timeout(qdev->io_cmd_event,
39333 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
39334 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
39335 out:
39336 if (ret > 0)
39337 ret = 0;
39338 diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
39339 index c3c2bbd..bc3c0fb 100644
39340 --- a/drivers/gpu/drm/qxl/qxl_debugfs.c
39341 +++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
39342 @@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
39343 struct drm_info_node *node = (struct drm_info_node *) m->private;
39344 struct qxl_device *qdev = node->minor->dev->dev_private;
39345
39346 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
39347 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
39348 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
39349 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
39350 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
39351 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
39352 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
39353 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
39354 seq_printf(m, "%d\n", qdev->irq_received_error);
39355 return 0;
39356 }
39357 diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
39358 index f7c9add..fb971d2 100644
39359 --- a/drivers/gpu/drm/qxl/qxl_drv.h
39360 +++ b/drivers/gpu/drm/qxl/qxl_drv.h
39361 @@ -290,10 +290,10 @@ struct qxl_device {
39362 unsigned int last_sent_io_cmd;
39363
39364 /* interrupt handling */
39365 - atomic_t irq_received;
39366 - atomic_t irq_received_display;
39367 - atomic_t irq_received_cursor;
39368 - atomic_t irq_received_io_cmd;
39369 + atomic_unchecked_t irq_received;
39370 + atomic_unchecked_t irq_received_display;
39371 + atomic_unchecked_t irq_received_cursor;
39372 + atomic_unchecked_t irq_received_io_cmd;
39373 unsigned irq_received_error;
39374 wait_queue_head_t display_event;
39375 wait_queue_head_t cursor_event;
39376 diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
39377 index 21393dc..329f3a9 100644
39378 --- a/drivers/gpu/drm/qxl/qxl_irq.c
39379 +++ b/drivers/gpu/drm/qxl/qxl_irq.c
39380 @@ -33,19 +33,19 @@ irqreturn_t qxl_irq_handler(DRM_IRQ_ARGS)
39381
39382 pending = xchg(&qdev->ram_header->int_pending, 0);
39383
39384 - atomic_inc(&qdev->irq_received);
39385 + atomic_inc_unchecked(&qdev->irq_received);
39386
39387 if (pending & QXL_INTERRUPT_DISPLAY) {
39388 - atomic_inc(&qdev->irq_received_display);
39389 + atomic_inc_unchecked(&qdev->irq_received_display);
39390 wake_up_all(&qdev->display_event);
39391 qxl_queue_garbage_collect(qdev, false);
39392 }
39393 if (pending & QXL_INTERRUPT_CURSOR) {
39394 - atomic_inc(&qdev->irq_received_cursor);
39395 + atomic_inc_unchecked(&qdev->irq_received_cursor);
39396 wake_up_all(&qdev->cursor_event);
39397 }
39398 if (pending & QXL_INTERRUPT_IO_CMD) {
39399 - atomic_inc(&qdev->irq_received_io_cmd);
39400 + atomic_inc_unchecked(&qdev->irq_received_io_cmd);
39401 wake_up_all(&qdev->io_cmd_event);
39402 }
39403 if (pending & QXL_INTERRUPT_ERROR) {
39404 @@ -82,10 +82,10 @@ int qxl_irq_init(struct qxl_device *qdev)
39405 init_waitqueue_head(&qdev->io_cmd_event);
39406 INIT_WORK(&qdev->client_monitors_config_work,
39407 qxl_client_monitors_config_work_func);
39408 - atomic_set(&qdev->irq_received, 0);
39409 - atomic_set(&qdev->irq_received_display, 0);
39410 - atomic_set(&qdev->irq_received_cursor, 0);
39411 - atomic_set(&qdev->irq_received_io_cmd, 0);
39412 + atomic_set_unchecked(&qdev->irq_received, 0);
39413 + atomic_set_unchecked(&qdev->irq_received_display, 0);
39414 + atomic_set_unchecked(&qdev->irq_received_cursor, 0);
39415 + atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
39416 qdev->irq_received_error = 0;
39417 ret = drm_irq_install(qdev->ddev);
39418 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
39419 diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
39420 index 037786d..2a95e33 100644
39421 --- a/drivers/gpu/drm/qxl/qxl_ttm.c
39422 +++ b/drivers/gpu/drm/qxl/qxl_ttm.c
39423 @@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
39424 }
39425 }
39426
39427 -static struct vm_operations_struct qxl_ttm_vm_ops;
39428 +static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
39429 static const struct vm_operations_struct *ttm_vm_ops;
39430
39431 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
39432 @@ -147,8 +147,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
39433 return r;
39434 if (unlikely(ttm_vm_ops == NULL)) {
39435 ttm_vm_ops = vma->vm_ops;
39436 + pax_open_kernel();
39437 qxl_ttm_vm_ops = *ttm_vm_ops;
39438 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
39439 + pax_close_kernel();
39440 }
39441 vma->vm_ops = &qxl_ttm_vm_ops;
39442 return 0;
39443 @@ -558,25 +560,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
39444 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
39445 {
39446 #if defined(CONFIG_DEBUG_FS)
39447 - static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
39448 - static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
39449 - unsigned i;
39450 + static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
39451 + {
39452 + .name = "qxl_mem_mm",
39453 + .show = &qxl_mm_dump_table,
39454 + },
39455 + {
39456 + .name = "qxl_surf_mm",
39457 + .show = &qxl_mm_dump_table,
39458 + }
39459 + };
39460
39461 - for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
39462 - if (i == 0)
39463 - sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
39464 - else
39465 - sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
39466 - qxl_mem_types_list[i].name = qxl_mem_types_names[i];
39467 - qxl_mem_types_list[i].show = &qxl_mm_dump_table;
39468 - qxl_mem_types_list[i].driver_features = 0;
39469 - if (i == 0)
39470 - qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
39471 - else
39472 - qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
39473 + pax_open_kernel();
39474 + *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
39475 + *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
39476 + pax_close_kernel();
39477
39478 - }
39479 - return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
39480 + return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
39481 #else
39482 return 0;
39483 #endif
39484 diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
39485 index c451257..0ad2134 100644
39486 --- a/drivers/gpu/drm/r128/r128_cce.c
39487 +++ b/drivers/gpu/drm/r128/r128_cce.c
39488 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
39489
39490 /* GH: Simple idle check.
39491 */
39492 - atomic_set(&dev_priv->idle_count, 0);
39493 + atomic_set_unchecked(&dev_priv->idle_count, 0);
39494
39495 /* We don't support anything other than bus-mastering ring mode,
39496 * but the ring can be in either AGP or PCI space for the ring
39497 diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
39498 index 56eb5e3..c4ec43d 100644
39499 --- a/drivers/gpu/drm/r128/r128_drv.h
39500 +++ b/drivers/gpu/drm/r128/r128_drv.h
39501 @@ -90,14 +90,14 @@ typedef struct drm_r128_private {
39502 int is_pci;
39503 unsigned long cce_buffers_offset;
39504
39505 - atomic_t idle_count;
39506 + atomic_unchecked_t idle_count;
39507
39508 int page_flipping;
39509 int current_page;
39510 u32 crtc_offset;
39511 u32 crtc_offset_cntl;
39512
39513 - atomic_t vbl_received;
39514 + atomic_unchecked_t vbl_received;
39515
39516 u32 color_fmt;
39517 unsigned int front_offset;
39518 diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
39519 index a954c54..9cc595c 100644
39520 --- a/drivers/gpu/drm/r128/r128_ioc32.c
39521 +++ b/drivers/gpu/drm/r128/r128_ioc32.c
39522 @@ -177,7 +177,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
39523 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
39524 }
39525
39526 -drm_ioctl_compat_t *r128_compat_ioctls[] = {
39527 +drm_ioctl_compat_t r128_compat_ioctls[] = {
39528 [DRM_R128_INIT] = compat_r128_init,
39529 [DRM_R128_DEPTH] = compat_r128_depth,
39530 [DRM_R128_STIPPLE] = compat_r128_stipple,
39531 @@ -196,18 +196,15 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
39532 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
39533 {
39534 unsigned int nr = DRM_IOCTL_NR(cmd);
39535 - drm_ioctl_compat_t *fn = NULL;
39536 int ret;
39537
39538 if (nr < DRM_COMMAND_BASE)
39539 return drm_compat_ioctl(filp, cmd, arg);
39540
39541 - if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(r128_compat_ioctls))
39542 - fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
39543 -
39544 - if (fn != NULL)
39545 + if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(r128_compat_ioctls)) {
39546 + drm_ioctl_compat_t fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
39547 ret = (*fn) (filp, cmd, arg);
39548 - else
39549 + } else
39550 ret = drm_ioctl(filp, cmd, arg);
39551
39552 return ret;
39553 diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
39554 index 2ea4f09..d391371 100644
39555 --- a/drivers/gpu/drm/r128/r128_irq.c
39556 +++ b/drivers/gpu/drm/r128/r128_irq.c
39557 @@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
39558 if (crtc != 0)
39559 return 0;
39560
39561 - return atomic_read(&dev_priv->vbl_received);
39562 + return atomic_read_unchecked(&dev_priv->vbl_received);
39563 }
39564
39565 irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
39566 @@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
39567 /* VBLANK interrupt */
39568 if (status & R128_CRTC_VBLANK_INT) {
39569 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
39570 - atomic_inc(&dev_priv->vbl_received);
39571 + atomic_inc_unchecked(&dev_priv->vbl_received);
39572 drm_handle_vblank(dev, 0);
39573 return IRQ_HANDLED;
39574 }
39575 diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
39576 index 01dd9ae..6352f04 100644
39577 --- a/drivers/gpu/drm/r128/r128_state.c
39578 +++ b/drivers/gpu/drm/r128/r128_state.c
39579 @@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
39580
39581 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
39582 {
39583 - if (atomic_read(&dev_priv->idle_count) == 0)
39584 + if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
39585 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
39586 else
39587 - atomic_set(&dev_priv->idle_count, 0);
39588 + atomic_set_unchecked(&dev_priv->idle_count, 0);
39589 }
39590
39591 #endif
39592 diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
39593 index af85299..ed9ac8d 100644
39594 --- a/drivers/gpu/drm/radeon/mkregtable.c
39595 +++ b/drivers/gpu/drm/radeon/mkregtable.c
39596 @@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
39597 regex_t mask_rex;
39598 regmatch_t match[4];
39599 char buf[1024];
39600 - size_t end;
39601 + long end;
39602 int len;
39603 int done = 0;
39604 int r;
39605 unsigned o;
39606 struct offset *offset;
39607 char last_reg_s[10];
39608 - int last_reg;
39609 + unsigned long last_reg;
39610
39611 if (regcomp
39612 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
39613 diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
39614 index 841d0e0..9eaa268 100644
39615 --- a/drivers/gpu/drm/radeon/radeon_device.c
39616 +++ b/drivers/gpu/drm/radeon/radeon_device.c
39617 @@ -1117,7 +1117,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
39618 bool can_switch;
39619
39620 spin_lock(&dev->count_lock);
39621 - can_switch = (dev->open_count == 0);
39622 + can_switch = (local_read(&dev->open_count) == 0);
39623 spin_unlock(&dev->count_lock);
39624 return can_switch;
39625 }
39626 diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
39627 index b369d42..8dd04eb 100644
39628 --- a/drivers/gpu/drm/radeon/radeon_drv.h
39629 +++ b/drivers/gpu/drm/radeon/radeon_drv.h
39630 @@ -258,7 +258,7 @@ typedef struct drm_radeon_private {
39631
39632 /* SW interrupt */
39633 wait_queue_head_t swi_queue;
39634 - atomic_t swi_emitted;
39635 + atomic_unchecked_t swi_emitted;
39636 int vblank_crtc;
39637 uint32_t irq_enable_reg;
39638 uint32_t r500_disp_irq_reg;
39639 diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
39640 index c180df8..5fd8186 100644
39641 --- a/drivers/gpu/drm/radeon/radeon_ioc32.c
39642 +++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
39643 @@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
39644 request = compat_alloc_user_space(sizeof(*request));
39645 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
39646 || __put_user(req32.param, &request->param)
39647 - || __put_user((void __user *)(unsigned long)req32.value,
39648 + || __put_user((unsigned long)req32.value,
39649 &request->value))
39650 return -EFAULT;
39651
39652 @@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
39653 #define compat_radeon_cp_setparam NULL
39654 #endif /* X86_64 || IA64 */
39655
39656 -static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
39657 +static drm_ioctl_compat_t radeon_compat_ioctls[] = {
39658 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
39659 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
39660 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
39661 @@ -393,18 +393,15 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
39662 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
39663 {
39664 unsigned int nr = DRM_IOCTL_NR(cmd);
39665 - drm_ioctl_compat_t *fn = NULL;
39666 int ret;
39667
39668 if (nr < DRM_COMMAND_BASE)
39669 return drm_compat_ioctl(filp, cmd, arg);
39670
39671 - if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls))
39672 - fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
39673 -
39674 - if (fn != NULL)
39675 + if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls)) {
39676 + drm_ioctl_compat_t fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
39677 ret = (*fn) (filp, cmd, arg);
39678 - else
39679 + } else
39680 ret = drm_ioctl(filp, cmd, arg);
39681
39682 return ret;
39683 diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
39684 index 8d68e97..9dcfed8 100644
39685 --- a/drivers/gpu/drm/radeon/radeon_irq.c
39686 +++ b/drivers/gpu/drm/radeon/radeon_irq.c
39687 @@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
39688 unsigned int ret;
39689 RING_LOCALS;
39690
39691 - atomic_inc(&dev_priv->swi_emitted);
39692 - ret = atomic_read(&dev_priv->swi_emitted);
39693 + atomic_inc_unchecked(&dev_priv->swi_emitted);
39694 + ret = atomic_read_unchecked(&dev_priv->swi_emitted);
39695
39696 BEGIN_RING(4);
39697 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
39698 @@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
39699 drm_radeon_private_t *dev_priv =
39700 (drm_radeon_private_t *) dev->dev_private;
39701
39702 - atomic_set(&dev_priv->swi_emitted, 0);
39703 + atomic_set_unchecked(&dev_priv->swi_emitted, 0);
39704 DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
39705
39706 dev->max_vblank_count = 0x001fffff;
39707 diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
39708 index 4d20910..6726b6d 100644
39709 --- a/drivers/gpu/drm/radeon/radeon_state.c
39710 +++ b/drivers/gpu/drm/radeon/radeon_state.c
39711 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
39712 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
39713 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
39714
39715 - if (DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
39716 + if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
39717 sarea_priv->nbox * sizeof(depth_boxes[0])))
39718 return -EFAULT;
39719
39720 @@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
39721 {
39722 drm_radeon_private_t *dev_priv = dev->dev_private;
39723 drm_radeon_getparam_t *param = data;
39724 - int value;
39725 + int value = 0;
39726
39727 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
39728
39729 diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
39730 index 71245d6..94c556d 100644
39731 --- a/drivers/gpu/drm/radeon/radeon_ttm.c
39732 +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
39733 @@ -784,7 +784,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
39734 man->size = size >> PAGE_SHIFT;
39735 }
39736
39737 -static struct vm_operations_struct radeon_ttm_vm_ops;
39738 +static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
39739 static const struct vm_operations_struct *ttm_vm_ops = NULL;
39740
39741 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
39742 @@ -825,8 +825,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
39743 }
39744 if (unlikely(ttm_vm_ops == NULL)) {
39745 ttm_vm_ops = vma->vm_ops;
39746 + pax_open_kernel();
39747 radeon_ttm_vm_ops = *ttm_vm_ops;
39748 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
39749 + pax_close_kernel();
39750 }
39751 vma->vm_ops = &radeon_ttm_vm_ops;
39752 return 0;
39753 @@ -855,38 +857,33 @@ static int radeon_mm_dump_table(struct seq_file *m, void *data)
39754 static int radeon_ttm_debugfs_init(struct radeon_device *rdev)
39755 {
39756 #if defined(CONFIG_DEBUG_FS)
39757 - static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+2];
39758 - static char radeon_mem_types_names[RADEON_DEBUGFS_MEM_TYPES+2][32];
39759 - unsigned i;
39760 + static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+2] = {
39761 + {
39762 + .name = "radeon_vram_mm",
39763 + .show = &radeon_mm_dump_table,
39764 + },
39765 + {
39766 + .name = "radeon_gtt_mm",
39767 + .show = &radeon_mm_dump_table,
39768 + },
39769 + {
39770 + .name = "ttm_page_pool",
39771 + .show = &ttm_page_alloc_debugfs,
39772 + },
39773 + {
39774 + .name = "ttm_dma_page_pool",
39775 + .show = &ttm_dma_page_alloc_debugfs,
39776 + },
39777 + };
39778 + unsigned i = RADEON_DEBUGFS_MEM_TYPES + 1;
39779
39780 - for (i = 0; i < RADEON_DEBUGFS_MEM_TYPES; i++) {
39781 - if (i == 0)
39782 - sprintf(radeon_mem_types_names[i], "radeon_vram_mm");
39783 - else
39784 - sprintf(radeon_mem_types_names[i], "radeon_gtt_mm");
39785 - radeon_mem_types_list[i].name = radeon_mem_types_names[i];
39786 - radeon_mem_types_list[i].show = &radeon_mm_dump_table;
39787 - radeon_mem_types_list[i].driver_features = 0;
39788 - if (i == 0)
39789 - radeon_mem_types_list[i].data = rdev->mman.bdev.man[TTM_PL_VRAM].priv;
39790 - else
39791 - radeon_mem_types_list[i].data = rdev->mman.bdev.man[TTM_PL_TT].priv;
39792 -
39793 - }
39794 - /* Add ttm page pool to debugfs */
39795 - sprintf(radeon_mem_types_names[i], "ttm_page_pool");
39796 - radeon_mem_types_list[i].name = radeon_mem_types_names[i];
39797 - radeon_mem_types_list[i].show = &ttm_page_alloc_debugfs;
39798 - radeon_mem_types_list[i].driver_features = 0;
39799 - radeon_mem_types_list[i++].data = NULL;
39800 + pax_open_kernel();
39801 + *(void **)&radeon_mem_types_list[0].data = rdev->mman.bdev.man[TTM_PL_VRAM].priv;
39802 + *(void **)&radeon_mem_types_list[1].data = rdev->mman.bdev.man[TTM_PL_TT].priv;
39803 + pax_close_kernel();
39804 #ifdef CONFIG_SWIOTLB
39805 - if (swiotlb_nr_tbl()) {
39806 - sprintf(radeon_mem_types_names[i], "ttm_dma_page_pool");
39807 - radeon_mem_types_list[i].name = radeon_mem_types_names[i];
39808 - radeon_mem_types_list[i].show = &ttm_dma_page_alloc_debugfs;
39809 - radeon_mem_types_list[i].driver_features = 0;
39810 - radeon_mem_types_list[i++].data = NULL;
39811 - }
39812 + if (swiotlb_nr_tbl())
39813 + i++;
39814 #endif
39815 return radeon_debugfs_add_files(rdev, radeon_mem_types_list, i);
39816
39817 diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
39818 index 1447d79..40b2a5b 100644
39819 --- a/drivers/gpu/drm/radeon/rs690.c
39820 +++ b/drivers/gpu/drm/radeon/rs690.c
39821 @@ -345,9 +345,11 @@ static void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
39822 if (max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
39823 rdev->pm.sideport_bandwidth.full)
39824 max_bandwidth = rdev->pm.sideport_bandwidth;
39825 - read_delay_latency.full = dfixed_const(370 * 800 * 1000);
39826 + read_delay_latency.full = dfixed_const(800 * 1000);
39827 read_delay_latency.full = dfixed_div(read_delay_latency,
39828 rdev->pm.igp_sideport_mclk);
39829 + a.full = dfixed_const(370);
39830 + read_delay_latency.full = dfixed_mul(read_delay_latency, a);
39831 } else {
39832 if (max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
39833 rdev->pm.k8_bandwidth.full)
39834 diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
39835 index dbc2def..0a9f710 100644
39836 --- a/drivers/gpu/drm/ttm/ttm_memory.c
39837 +++ b/drivers/gpu/drm/ttm/ttm_memory.c
39838 @@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
39839 zone->glob = glob;
39840 glob->zone_kernel = zone;
39841 ret = kobject_init_and_add(
39842 - &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
39843 + &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
39844 if (unlikely(ret != 0)) {
39845 kobject_put(&zone->kobj);
39846 return ret;
39847 @@ -347,7 +347,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
39848 zone->glob = glob;
39849 glob->zone_dma32 = zone;
39850 ret = kobject_init_and_add(
39851 - &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
39852 + &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
39853 if (unlikely(ret != 0)) {
39854 kobject_put(&zone->kobj);
39855 return ret;
39856 diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
39857 index 863bef9..cba15cf 100644
39858 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
39859 +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
39860 @@ -391,9 +391,9 @@ out:
39861 static unsigned long
39862 ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
39863 {
39864 - static atomic_t start_pool = ATOMIC_INIT(0);
39865 + static atomic_unchecked_t start_pool = ATOMIC_INIT(0);
39866 unsigned i;
39867 - unsigned pool_offset = atomic_add_return(1, &start_pool);
39868 + unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool);
39869 struct ttm_page_pool *pool;
39870 int shrink_pages = sc->nr_to_scan;
39871 unsigned long freed = 0;
39872 diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
39873 index 97e9d61..bf23c461 100644
39874 --- a/drivers/gpu/drm/udl/udl_fb.c
39875 +++ b/drivers/gpu/drm/udl/udl_fb.c
39876 @@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
39877 fb_deferred_io_cleanup(info);
39878 kfree(info->fbdefio);
39879 info->fbdefio = NULL;
39880 - info->fbops->fb_mmap = udl_fb_mmap;
39881 }
39882
39883 pr_warn("released /dev/fb%d user=%d count=%d\n",
39884 diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
39885 index a811ef2..ff99b05 100644
39886 --- a/drivers/gpu/drm/via/via_drv.h
39887 +++ b/drivers/gpu/drm/via/via_drv.h
39888 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
39889 typedef uint32_t maskarray_t[5];
39890
39891 typedef struct drm_via_irq {
39892 - atomic_t irq_received;
39893 + atomic_unchecked_t irq_received;
39894 uint32_t pending_mask;
39895 uint32_t enable_mask;
39896 wait_queue_head_t irq_queue;
39897 @@ -75,7 +75,7 @@ typedef struct drm_via_private {
39898 struct timeval last_vblank;
39899 int last_vblank_valid;
39900 unsigned usec_per_vblank;
39901 - atomic_t vbl_received;
39902 + atomic_unchecked_t vbl_received;
39903 drm_via_state_t hc_state;
39904 char pci_buf[VIA_PCI_BUF_SIZE];
39905 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
39906 diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
39907 index ac98964..5dbf512 100644
39908 --- a/drivers/gpu/drm/via/via_irq.c
39909 +++ b/drivers/gpu/drm/via/via_irq.c
39910 @@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
39911 if (crtc != 0)
39912 return 0;
39913
39914 - return atomic_read(&dev_priv->vbl_received);
39915 + return atomic_read_unchecked(&dev_priv->vbl_received);
39916 }
39917
39918 irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
39919 @@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
39920
39921 status = VIA_READ(VIA_REG_INTERRUPT);
39922 if (status & VIA_IRQ_VBLANK_PENDING) {
39923 - atomic_inc(&dev_priv->vbl_received);
39924 - if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
39925 + atomic_inc_unchecked(&dev_priv->vbl_received);
39926 + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
39927 do_gettimeofday(&cur_vblank);
39928 if (dev_priv->last_vblank_valid) {
39929 dev_priv->usec_per_vblank =
39930 @@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
39931 dev_priv->last_vblank = cur_vblank;
39932 dev_priv->last_vblank_valid = 1;
39933 }
39934 - if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
39935 + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
39936 DRM_DEBUG("US per vblank is: %u\n",
39937 dev_priv->usec_per_vblank);
39938 }
39939 @@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
39940
39941 for (i = 0; i < dev_priv->num_irqs; ++i) {
39942 if (status & cur_irq->pending_mask) {
39943 - atomic_inc(&cur_irq->irq_received);
39944 + atomic_inc_unchecked(&cur_irq->irq_received);
39945 DRM_WAKEUP(&cur_irq->irq_queue);
39946 handled = 1;
39947 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
39948 @@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
39949 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
39950 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
39951 masks[irq][4]));
39952 - cur_irq_sequence = atomic_read(&cur_irq->irq_received);
39953 + cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
39954 } else {
39955 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
39956 (((cur_irq_sequence =
39957 - atomic_read(&cur_irq->irq_received)) -
39958 + atomic_read_unchecked(&cur_irq->irq_received)) -
39959 *sequence) <= (1 << 23)));
39960 }
39961 *sequence = cur_irq_sequence;
39962 @@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
39963 }
39964
39965 for (i = 0; i < dev_priv->num_irqs; ++i) {
39966 - atomic_set(&cur_irq->irq_received, 0);
39967 + atomic_set_unchecked(&cur_irq->irq_received, 0);
39968 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
39969 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
39970 DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
39971 @@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
39972 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
39973 case VIA_IRQ_RELATIVE:
39974 irqwait->request.sequence +=
39975 - atomic_read(&cur_irq->irq_received);
39976 + atomic_read_unchecked(&cur_irq->irq_received);
39977 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
39978 case VIA_IRQ_ABSOLUTE:
39979 break;
39980 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
39981 index 150ec64..f5165f2 100644
39982 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
39983 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
39984 @@ -290,7 +290,7 @@ struct vmw_private {
39985 * Fencing and IRQs.
39986 */
39987
39988 - atomic_t marker_seq;
39989 + atomic_unchecked_t marker_seq;
39990 wait_queue_head_t fence_queue;
39991 wait_queue_head_t fifo_queue;
39992 int fence_queue_waiters; /* Protected by hw_mutex */
39993 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
39994 index 3eb1486..0a47ee9 100644
39995 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
39996 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
39997 @@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
39998 (unsigned int) min,
39999 (unsigned int) fifo->capabilities);
40000
40001 - atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
40002 + atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
40003 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
40004 vmw_marker_queue_init(&fifo->marker_queue);
40005 return vmw_fifo_send_fence(dev_priv, &dummy);
40006 @@ -355,7 +355,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
40007 if (reserveable)
40008 iowrite32(bytes, fifo_mem +
40009 SVGA_FIFO_RESERVED);
40010 - return fifo_mem + (next_cmd >> 2);
40011 + return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
40012 } else {
40013 need_bounce = true;
40014 }
40015 @@ -475,7 +475,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
40016
40017 fm = vmw_fifo_reserve(dev_priv, bytes);
40018 if (unlikely(fm == NULL)) {
40019 - *seqno = atomic_read(&dev_priv->marker_seq);
40020 + *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
40021 ret = -ENOMEM;
40022 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
40023 false, 3*HZ);
40024 @@ -483,7 +483,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
40025 }
40026
40027 do {
40028 - *seqno = atomic_add_return(1, &dev_priv->marker_seq);
40029 + *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
40030 } while (*seqno == 0);
40031
40032 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
40033 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
40034 index c509d40..3b640c3 100644
40035 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
40036 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
40037 @@ -138,7 +138,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
40038 int ret;
40039
40040 num_clips = arg->num_clips;
40041 - clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
40042 + clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
40043
40044 if (unlikely(num_clips == 0))
40045 return 0;
40046 @@ -222,7 +222,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
40047 int ret;
40048
40049 num_clips = arg->num_clips;
40050 - clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
40051 + clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
40052
40053 if (unlikely(num_clips == 0))
40054 return 0;
40055 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
40056 index 4640adb..e1384ed 100644
40057 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
40058 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
40059 @@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
40060 * emitted. Then the fence is stale and signaled.
40061 */
40062
40063 - ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
40064 + ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
40065 > VMW_FENCE_WRAP);
40066
40067 return ret;
40068 @@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
40069
40070 if (fifo_idle)
40071 down_read(&fifo_state->rwsem);
40072 - signal_seq = atomic_read(&dev_priv->marker_seq);
40073 + signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
40074 ret = 0;
40075
40076 for (;;) {
40077 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
40078 index 8a8725c2..afed796 100644
40079 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
40080 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
40081 @@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
40082 while (!vmw_lag_lt(queue, us)) {
40083 spin_lock(&queue->lock);
40084 if (list_empty(&queue->head))
40085 - seqno = atomic_read(&dev_priv->marker_seq);
40086 + seqno = atomic_read_unchecked(&dev_priv->marker_seq);
40087 else {
40088 marker = list_first_entry(&queue->head,
40089 struct vmw_marker, head);
40090 diff --git a/drivers/gpu/host1x/drm/dc.c b/drivers/gpu/host1x/drm/dc.c
40091 index b1a05ad..1c9d899 100644
40092 --- a/drivers/gpu/host1x/drm/dc.c
40093 +++ b/drivers/gpu/host1x/drm/dc.c
40094 @@ -1004,7 +1004,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
40095 }
40096
40097 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
40098 - dc->debugfs_files[i].data = dc;
40099 + *(void **)&dc->debugfs_files[i].data = dc;
40100
40101 err = drm_debugfs_create_files(dc->debugfs_files,
40102 ARRAY_SIZE(debugfs_files),
40103 diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
40104 index ec0ae2d..dc0780b 100644
40105 --- a/drivers/gpu/vga/vga_switcheroo.c
40106 +++ b/drivers/gpu/vga/vga_switcheroo.c
40107 @@ -643,7 +643,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
40108
40109 /* this version is for the case where the power switch is separate
40110 to the device being powered down. */
40111 -int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
40112 +int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
40113 {
40114 /* copy over all the bus versions */
40115 if (dev->bus && dev->bus->pm) {
40116 @@ -688,7 +688,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
40117 return ret;
40118 }
40119
40120 -int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
40121 +int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
40122 {
40123 /* copy over all the bus versions */
40124 if (dev->bus && dev->bus->pm) {
40125 diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
40126 index aedfe50..1dc929b 100644
40127 --- a/drivers/hid/hid-core.c
40128 +++ b/drivers/hid/hid-core.c
40129 @@ -2416,7 +2416,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
40130
40131 int hid_add_device(struct hid_device *hdev)
40132 {
40133 - static atomic_t id = ATOMIC_INIT(0);
40134 + static atomic_unchecked_t id = ATOMIC_INIT(0);
40135 int ret;
40136
40137 if (WARN_ON(hdev->status & HID_STAT_ADDED))
40138 @@ -2450,7 +2450,7 @@ int hid_add_device(struct hid_device *hdev)
40139 /* XXX hack, any other cleaner solution after the driver core
40140 * is converted to allow more than 20 bytes as the device name? */
40141 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
40142 - hdev->vendor, hdev->product, atomic_inc_return(&id));
40143 + hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
40144
40145 hid_debug_register(hdev, dev_name(&hdev->dev));
40146 ret = device_add(&hdev->dev);
40147 diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
40148 index c13fb5b..55a3802 100644
40149 --- a/drivers/hid/hid-wiimote-debug.c
40150 +++ b/drivers/hid/hid-wiimote-debug.c
40151 @@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
40152 else if (size == 0)
40153 return -EIO;
40154
40155 - if (copy_to_user(u, buf, size))
40156 + if (size > sizeof(buf) || copy_to_user(u, buf, size))
40157 return -EFAULT;
40158
40159 *off += size;
40160 diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
40161 index cedc6da..2c3da2a 100644
40162 --- a/drivers/hid/uhid.c
40163 +++ b/drivers/hid/uhid.c
40164 @@ -47,7 +47,7 @@ struct uhid_device {
40165 struct mutex report_lock;
40166 wait_queue_head_t report_wait;
40167 atomic_t report_done;
40168 - atomic_t report_id;
40169 + atomic_unchecked_t report_id;
40170 struct uhid_event report_buf;
40171 };
40172
40173 @@ -163,7 +163,7 @@ static int uhid_hid_get_raw(struct hid_device *hid, unsigned char rnum,
40174
40175 spin_lock_irqsave(&uhid->qlock, flags);
40176 ev->type = UHID_FEATURE;
40177 - ev->u.feature.id = atomic_inc_return(&uhid->report_id);
40178 + ev->u.feature.id = atomic_inc_return_unchecked(&uhid->report_id);
40179 ev->u.feature.rnum = rnum;
40180 ev->u.feature.rtype = report_type;
40181
40182 @@ -446,7 +446,7 @@ static int uhid_dev_feature_answer(struct uhid_device *uhid,
40183 spin_lock_irqsave(&uhid->qlock, flags);
40184
40185 /* id for old report; drop it silently */
40186 - if (atomic_read(&uhid->report_id) != ev->u.feature_answer.id)
40187 + if (atomic_read_unchecked(&uhid->report_id) != ev->u.feature_answer.id)
40188 goto unlock;
40189 if (atomic_read(&uhid->report_done))
40190 goto unlock;
40191 diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
40192 index 6de6c98..18319e9 100644
40193 --- a/drivers/hv/channel.c
40194 +++ b/drivers/hv/channel.c
40195 @@ -406,8 +406,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
40196 int ret = 0;
40197 int t;
40198
40199 - next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
40200 - atomic_inc(&vmbus_connection.next_gpadl_handle);
40201 + next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
40202 + atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
40203
40204 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
40205 if (ret)
40206 diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
40207 index 88f4096..e50452e 100644
40208 --- a/drivers/hv/hv.c
40209 +++ b/drivers/hv/hv.c
40210 @@ -112,7 +112,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
40211 u64 output_address = (output) ? virt_to_phys(output) : 0;
40212 u32 output_address_hi = output_address >> 32;
40213 u32 output_address_lo = output_address & 0xFFFFFFFF;
40214 - void *hypercall_page = hv_context.hypercall_page;
40215 + void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
40216
40217 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
40218 "=a"(hv_status_lo) : "d" (control_hi),
40219 diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
40220 index 7e17a54..a50a33d 100644
40221 --- a/drivers/hv/hv_balloon.c
40222 +++ b/drivers/hv/hv_balloon.c
40223 @@ -464,7 +464,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
40224
40225 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
40226 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
40227 -static atomic_t trans_id = ATOMIC_INIT(0);
40228 +static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
40229
40230 static int dm_ring_size = (5 * PAGE_SIZE);
40231
40232 @@ -886,7 +886,7 @@ static void hot_add_req(struct work_struct *dummy)
40233 pr_info("Memory hot add failed\n");
40234
40235 dm->state = DM_INITIALIZED;
40236 - resp.hdr.trans_id = atomic_inc_return(&trans_id);
40237 + resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
40238 vmbus_sendpacket(dm->dev->channel, &resp,
40239 sizeof(struct dm_hot_add_response),
40240 (unsigned long)NULL,
40241 @@ -960,7 +960,7 @@ static void post_status(struct hv_dynmem_device *dm)
40242 memset(&status, 0, sizeof(struct dm_status));
40243 status.hdr.type = DM_STATUS_REPORT;
40244 status.hdr.size = sizeof(struct dm_status);
40245 - status.hdr.trans_id = atomic_inc_return(&trans_id);
40246 + status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
40247
40248 /*
40249 * The host expects the guest to report free memory.
40250 @@ -980,7 +980,7 @@ static void post_status(struct hv_dynmem_device *dm)
40251 * send the status. This can happen if we were interrupted
40252 * after we picked our transaction ID.
40253 */
40254 - if (status.hdr.trans_id != atomic_read(&trans_id))
40255 + if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
40256 return;
40257
40258 vmbus_sendpacket(dm->dev->channel, &status,
40259 @@ -1108,7 +1108,7 @@ static void balloon_up(struct work_struct *dummy)
40260 */
40261
40262 do {
40263 - bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
40264 + bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
40265 ret = vmbus_sendpacket(dm_device.dev->channel,
40266 bl_resp,
40267 bl_resp->hdr.size,
40268 @@ -1152,7 +1152,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
40269
40270 memset(&resp, 0, sizeof(struct dm_unballoon_response));
40271 resp.hdr.type = DM_UNBALLOON_RESPONSE;
40272 - resp.hdr.trans_id = atomic_inc_return(&trans_id);
40273 + resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
40274 resp.hdr.size = sizeof(struct dm_unballoon_response);
40275
40276 vmbus_sendpacket(dm_device.dev->channel, &resp,
40277 @@ -1215,7 +1215,7 @@ static void version_resp(struct hv_dynmem_device *dm,
40278 memset(&version_req, 0, sizeof(struct dm_version_request));
40279 version_req.hdr.type = DM_VERSION_REQUEST;
40280 version_req.hdr.size = sizeof(struct dm_version_request);
40281 - version_req.hdr.trans_id = atomic_inc_return(&trans_id);
40282 + version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
40283 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
40284 version_req.is_last_attempt = 1;
40285
40286 @@ -1385,7 +1385,7 @@ static int balloon_probe(struct hv_device *dev,
40287 memset(&version_req, 0, sizeof(struct dm_version_request));
40288 version_req.hdr.type = DM_VERSION_REQUEST;
40289 version_req.hdr.size = sizeof(struct dm_version_request);
40290 - version_req.hdr.trans_id = atomic_inc_return(&trans_id);
40291 + version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
40292 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
40293 version_req.is_last_attempt = 0;
40294
40295 @@ -1416,7 +1416,7 @@ static int balloon_probe(struct hv_device *dev,
40296 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
40297 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
40298 cap_msg.hdr.size = sizeof(struct dm_capabilities);
40299 - cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
40300 + cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
40301
40302 cap_msg.caps.cap_bits.balloon = 1;
40303 cap_msg.caps.cap_bits.hot_add = 1;
40304 diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
40305 index d84918f..7f38f9f 100644
40306 --- a/drivers/hv/hyperv_vmbus.h
40307 +++ b/drivers/hv/hyperv_vmbus.h
40308 @@ -595,7 +595,7 @@ enum vmbus_connect_state {
40309 struct vmbus_connection {
40310 enum vmbus_connect_state conn_state;
40311
40312 - atomic_t next_gpadl_handle;
40313 + atomic_unchecked_t next_gpadl_handle;
40314
40315 /*
40316 * Represents channel interrupts. Each bit position represents a
40317 diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
40318 index f9fe46f..356b119 100644
40319 --- a/drivers/hv/vmbus_drv.c
40320 +++ b/drivers/hv/vmbus_drv.c
40321 @@ -672,10 +672,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
40322 {
40323 int ret = 0;
40324
40325 - static atomic_t device_num = ATOMIC_INIT(0);
40326 + static atomic_unchecked_t device_num = ATOMIC_INIT(0);
40327
40328 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
40329 - atomic_inc_return(&device_num));
40330 + atomic_inc_return_unchecked(&device_num));
40331
40332 child_device_obj->device.bus = &hv_bus;
40333 child_device_obj->device.parent = &hv_acpi_dev->dev;
40334 diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
40335 index a9e3d01..9dd246e 100644
40336 --- a/drivers/hwmon/acpi_power_meter.c
40337 +++ b/drivers/hwmon/acpi_power_meter.c
40338 @@ -117,7 +117,7 @@ struct sensor_template {
40339 struct device_attribute *devattr,
40340 const char *buf, size_t count);
40341 int index;
40342 -};
40343 +} __do_const;
40344
40345 /* Averaging interval */
40346 static int update_avg_interval(struct acpi_power_meter_resource *resource)
40347 @@ -629,7 +629,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
40348 struct sensor_template *attrs)
40349 {
40350 struct device *dev = &resource->acpi_dev->dev;
40351 - struct sensor_device_attribute *sensors =
40352 + sensor_device_attribute_no_const *sensors =
40353 &resource->sensors[resource->num_sensors];
40354 int res = 0;
40355
40356 diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
40357 index 3288f13..71cfb4e 100644
40358 --- a/drivers/hwmon/applesmc.c
40359 +++ b/drivers/hwmon/applesmc.c
40360 @@ -1106,7 +1106,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
40361 {
40362 struct applesmc_node_group *grp;
40363 struct applesmc_dev_attr *node;
40364 - struct attribute *attr;
40365 + attribute_no_const *attr;
40366 int ret, i;
40367
40368 for (grp = groups; grp->format; grp++) {
40369 diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
40370 index b25c643..a13460d 100644
40371 --- a/drivers/hwmon/asus_atk0110.c
40372 +++ b/drivers/hwmon/asus_atk0110.c
40373 @@ -152,10 +152,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
40374 struct atk_sensor_data {
40375 struct list_head list;
40376 struct atk_data *data;
40377 - struct device_attribute label_attr;
40378 - struct device_attribute input_attr;
40379 - struct device_attribute limit1_attr;
40380 - struct device_attribute limit2_attr;
40381 + device_attribute_no_const label_attr;
40382 + device_attribute_no_const input_attr;
40383 + device_attribute_no_const limit1_attr;
40384 + device_attribute_no_const limit2_attr;
40385 char label_attr_name[ATTR_NAME_SIZE];
40386 char input_attr_name[ATTR_NAME_SIZE];
40387 char limit1_attr_name[ATTR_NAME_SIZE];
40388 @@ -275,7 +275,7 @@ static ssize_t atk_name_show(struct device *dev,
40389 static struct device_attribute atk_name_attr =
40390 __ATTR(name, 0444, atk_name_show, NULL);
40391
40392 -static void atk_init_attribute(struct device_attribute *attr, char *name,
40393 +static void atk_init_attribute(device_attribute_no_const *attr, char *name,
40394 sysfs_show_func show)
40395 {
40396 sysfs_attr_init(&attr->attr);
40397 diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
40398 index 78be661..4dd032f 100644
40399 --- a/drivers/hwmon/coretemp.c
40400 +++ b/drivers/hwmon/coretemp.c
40401 @@ -797,7 +797,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
40402 return NOTIFY_OK;
40403 }
40404
40405 -static struct notifier_block coretemp_cpu_notifier __refdata = {
40406 +static struct notifier_block coretemp_cpu_notifier = {
40407 .notifier_call = coretemp_cpu_callback,
40408 };
40409
40410 diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
40411 index 632f1dc..57e6a58 100644
40412 --- a/drivers/hwmon/ibmaem.c
40413 +++ b/drivers/hwmon/ibmaem.c
40414 @@ -926,7 +926,7 @@ static int aem_register_sensors(struct aem_data *data,
40415 struct aem_rw_sensor_template *rw)
40416 {
40417 struct device *dev = &data->pdev->dev;
40418 - struct sensor_device_attribute *sensors = data->sensors;
40419 + sensor_device_attribute_no_const *sensors = data->sensors;
40420 int err;
40421
40422 /* Set up read-only sensors */
40423 diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
40424 index 708081b..fe2d4ab 100644
40425 --- a/drivers/hwmon/iio_hwmon.c
40426 +++ b/drivers/hwmon/iio_hwmon.c
40427 @@ -73,7 +73,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
40428 {
40429 struct device *dev = &pdev->dev;
40430 struct iio_hwmon_state *st;
40431 - struct sensor_device_attribute *a;
40432 + sensor_device_attribute_no_const *a;
40433 int ret, i;
40434 int in_i = 1, temp_i = 1, curr_i = 1;
40435 enum iio_chan_type type;
40436 diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
40437 index 6eb03ce..bea7e3e 100644
40438 --- a/drivers/hwmon/nct6775.c
40439 +++ b/drivers/hwmon/nct6775.c
40440 @@ -936,10 +936,10 @@ static struct attribute_group *
40441 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
40442 int repeat)
40443 {
40444 - struct attribute_group *group;
40445 + attribute_group_no_const *group;
40446 struct sensor_device_attr_u *su;
40447 - struct sensor_device_attribute *a;
40448 - struct sensor_device_attribute_2 *a2;
40449 + sensor_device_attribute_no_const *a;
40450 + sensor_device_attribute_2_no_const *a2;
40451 struct attribute **attrs;
40452 struct sensor_device_template **t;
40453 int err, i, j, count;
40454 diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
40455 index 9319fcf..189ff45 100644
40456 --- a/drivers/hwmon/pmbus/pmbus_core.c
40457 +++ b/drivers/hwmon/pmbus/pmbus_core.c
40458 @@ -781,7 +781,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
40459 return 0;
40460 }
40461
40462 -static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
40463 +static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
40464 const char *name,
40465 umode_t mode,
40466 ssize_t (*show)(struct device *dev,
40467 @@ -798,7 +798,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
40468 dev_attr->store = store;
40469 }
40470
40471 -static void pmbus_attr_init(struct sensor_device_attribute *a,
40472 +static void pmbus_attr_init(sensor_device_attribute_no_const *a,
40473 const char *name,
40474 umode_t mode,
40475 ssize_t (*show)(struct device *dev,
40476 @@ -820,7 +820,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
40477 u16 reg, u8 mask)
40478 {
40479 struct pmbus_boolean *boolean;
40480 - struct sensor_device_attribute *a;
40481 + sensor_device_attribute_no_const *a;
40482
40483 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
40484 if (!boolean)
40485 @@ -845,7 +845,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
40486 bool update, bool readonly)
40487 {
40488 struct pmbus_sensor *sensor;
40489 - struct device_attribute *a;
40490 + device_attribute_no_const *a;
40491
40492 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
40493 if (!sensor)
40494 @@ -876,7 +876,7 @@ static int pmbus_add_label(struct pmbus_data *data,
40495 const char *lstring, int index)
40496 {
40497 struct pmbus_label *label;
40498 - struct device_attribute *a;
40499 + device_attribute_no_const *a;
40500
40501 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
40502 if (!label)
40503 diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
40504 index 97cd45a..ac54d8b 100644
40505 --- a/drivers/hwmon/sht15.c
40506 +++ b/drivers/hwmon/sht15.c
40507 @@ -169,7 +169,7 @@ struct sht15_data {
40508 int supply_uv;
40509 bool supply_uv_valid;
40510 struct work_struct update_supply_work;
40511 - atomic_t interrupt_handled;
40512 + atomic_unchecked_t interrupt_handled;
40513 };
40514
40515 /**
40516 @@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
40517 ret = gpio_direction_input(data->pdata->gpio_data);
40518 if (ret)
40519 return ret;
40520 - atomic_set(&data->interrupt_handled, 0);
40521 + atomic_set_unchecked(&data->interrupt_handled, 0);
40522
40523 enable_irq(gpio_to_irq(data->pdata->gpio_data));
40524 if (gpio_get_value(data->pdata->gpio_data) == 0) {
40525 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
40526 /* Only relevant if the interrupt hasn't occurred. */
40527 - if (!atomic_read(&data->interrupt_handled))
40528 + if (!atomic_read_unchecked(&data->interrupt_handled))
40529 schedule_work(&data->read_work);
40530 }
40531 ret = wait_event_timeout(data->wait_queue,
40532 @@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
40533
40534 /* First disable the interrupt */
40535 disable_irq_nosync(irq);
40536 - atomic_inc(&data->interrupt_handled);
40537 + atomic_inc_unchecked(&data->interrupt_handled);
40538 /* Then schedule a reading work struct */
40539 if (data->state != SHT15_READING_NOTHING)
40540 schedule_work(&data->read_work);
40541 @@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
40542 * If not, then start the interrupt again - care here as could
40543 * have gone low in meantime so verify it hasn't!
40544 */
40545 - atomic_set(&data->interrupt_handled, 0);
40546 + atomic_set_unchecked(&data->interrupt_handled, 0);
40547 enable_irq(gpio_to_irq(data->pdata->gpio_data));
40548 /* If still not occurred or another handler was scheduled */
40549 if (gpio_get_value(data->pdata->gpio_data)
40550 - || atomic_read(&data->interrupt_handled))
40551 + || atomic_read_unchecked(&data->interrupt_handled))
40552 return;
40553 }
40554
40555 diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
40556 index 38944e9..ae9e5ed 100644
40557 --- a/drivers/hwmon/via-cputemp.c
40558 +++ b/drivers/hwmon/via-cputemp.c
40559 @@ -296,7 +296,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
40560 return NOTIFY_OK;
40561 }
40562
40563 -static struct notifier_block via_cputemp_cpu_notifier __refdata = {
40564 +static struct notifier_block via_cputemp_cpu_notifier = {
40565 .notifier_call = via_cputemp_cpu_callback,
40566 };
40567
40568 diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
40569 index 07f01ac..d79ad3d 100644
40570 --- a/drivers/i2c/busses/i2c-amd756-s4882.c
40571 +++ b/drivers/i2c/busses/i2c-amd756-s4882.c
40572 @@ -43,7 +43,7 @@
40573 extern struct i2c_adapter amd756_smbus;
40574
40575 static struct i2c_adapter *s4882_adapter;
40576 -static struct i2c_algorithm *s4882_algo;
40577 +static i2c_algorithm_no_const *s4882_algo;
40578
40579 /* Wrapper access functions for multiplexed SMBus */
40580 static DEFINE_MUTEX(amd756_lock);
40581 diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
40582 index dae3ddf..26e21d1 100644
40583 --- a/drivers/i2c/busses/i2c-diolan-u2c.c
40584 +++ b/drivers/i2c/busses/i2c-diolan-u2c.c
40585 @@ -99,7 +99,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
40586 /* usb layer */
40587
40588 /* Send command to device, and get response. */
40589 -static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
40590 +static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
40591 {
40592 int ret = 0;
40593 int actual;
40594 diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
40595 index 2ca268d..c6acbdf 100644
40596 --- a/drivers/i2c/busses/i2c-nforce2-s4985.c
40597 +++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
40598 @@ -41,7 +41,7 @@
40599 extern struct i2c_adapter *nforce2_smbus;
40600
40601 static struct i2c_adapter *s4985_adapter;
40602 -static struct i2c_algorithm *s4985_algo;
40603 +static i2c_algorithm_no_const *s4985_algo;
40604
40605 /* Wrapper access functions for multiplexed SMBus */
40606 static DEFINE_MUTEX(nforce2_lock);
40607 diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
40608 index c3ccdea..5b3dc1a 100644
40609 --- a/drivers/i2c/i2c-dev.c
40610 +++ b/drivers/i2c/i2c-dev.c
40611 @@ -271,7 +271,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
40612 break;
40613 }
40614
40615 - data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
40616 + data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
40617 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
40618 if (IS_ERR(rdwr_pa[i].buf)) {
40619 res = PTR_ERR(rdwr_pa[i].buf);
40620 diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
40621 index 0b510ba..4fbb5085 100644
40622 --- a/drivers/ide/ide-cd.c
40623 +++ b/drivers/ide/ide-cd.c
40624 @@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
40625 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
40626 if ((unsigned long)buf & alignment
40627 || blk_rq_bytes(rq) & q->dma_pad_mask
40628 - || object_is_on_stack(buf))
40629 + || object_starts_on_stack(buf))
40630 drive->dma = 0;
40631 }
40632 }
40633 diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
40634 index f95c697..0a1b05c 100644
40635 --- a/drivers/iio/industrialio-core.c
40636 +++ b/drivers/iio/industrialio-core.c
40637 @@ -506,7 +506,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
40638 }
40639
40640 static
40641 -int __iio_device_attr_init(struct device_attribute *dev_attr,
40642 +int __iio_device_attr_init(device_attribute_no_const *dev_attr,
40643 const char *postfix,
40644 struct iio_chan_spec const *chan,
40645 ssize_t (*readfunc)(struct device *dev,
40646 diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
40647 index 784b97c..c9ceadf 100644
40648 --- a/drivers/infiniband/core/cm.c
40649 +++ b/drivers/infiniband/core/cm.c
40650 @@ -114,7 +114,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
40651
40652 struct cm_counter_group {
40653 struct kobject obj;
40654 - atomic_long_t counter[CM_ATTR_COUNT];
40655 + atomic_long_unchecked_t counter[CM_ATTR_COUNT];
40656 };
40657
40658 struct cm_counter_attribute {
40659 @@ -1395,7 +1395,7 @@ static void cm_dup_req_handler(struct cm_work *work,
40660 struct ib_mad_send_buf *msg = NULL;
40661 int ret;
40662
40663 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40664 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40665 counter[CM_REQ_COUNTER]);
40666
40667 /* Quick state check to discard duplicate REQs. */
40668 @@ -1779,7 +1779,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
40669 if (!cm_id_priv)
40670 return;
40671
40672 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40673 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40674 counter[CM_REP_COUNTER]);
40675 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
40676 if (ret)
40677 @@ -1946,7 +1946,7 @@ static int cm_rtu_handler(struct cm_work *work)
40678 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
40679 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
40680 spin_unlock_irq(&cm_id_priv->lock);
40681 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40682 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40683 counter[CM_RTU_COUNTER]);
40684 goto out;
40685 }
40686 @@ -2129,7 +2129,7 @@ static int cm_dreq_handler(struct cm_work *work)
40687 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
40688 dreq_msg->local_comm_id);
40689 if (!cm_id_priv) {
40690 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40691 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40692 counter[CM_DREQ_COUNTER]);
40693 cm_issue_drep(work->port, work->mad_recv_wc);
40694 return -EINVAL;
40695 @@ -2154,7 +2154,7 @@ static int cm_dreq_handler(struct cm_work *work)
40696 case IB_CM_MRA_REP_RCVD:
40697 break;
40698 case IB_CM_TIMEWAIT:
40699 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40700 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40701 counter[CM_DREQ_COUNTER]);
40702 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
40703 goto unlock;
40704 @@ -2168,7 +2168,7 @@ static int cm_dreq_handler(struct cm_work *work)
40705 cm_free_msg(msg);
40706 goto deref;
40707 case IB_CM_DREQ_RCVD:
40708 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40709 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40710 counter[CM_DREQ_COUNTER]);
40711 goto unlock;
40712 default:
40713 @@ -2535,7 +2535,7 @@ static int cm_mra_handler(struct cm_work *work)
40714 ib_modify_mad(cm_id_priv->av.port->mad_agent,
40715 cm_id_priv->msg, timeout)) {
40716 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
40717 - atomic_long_inc(&work->port->
40718 + atomic_long_inc_unchecked(&work->port->
40719 counter_group[CM_RECV_DUPLICATES].
40720 counter[CM_MRA_COUNTER]);
40721 goto out;
40722 @@ -2544,7 +2544,7 @@ static int cm_mra_handler(struct cm_work *work)
40723 break;
40724 case IB_CM_MRA_REQ_RCVD:
40725 case IB_CM_MRA_REP_RCVD:
40726 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40727 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40728 counter[CM_MRA_COUNTER]);
40729 /* fall through */
40730 default:
40731 @@ -2706,7 +2706,7 @@ static int cm_lap_handler(struct cm_work *work)
40732 case IB_CM_LAP_IDLE:
40733 break;
40734 case IB_CM_MRA_LAP_SENT:
40735 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40736 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40737 counter[CM_LAP_COUNTER]);
40738 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
40739 goto unlock;
40740 @@ -2722,7 +2722,7 @@ static int cm_lap_handler(struct cm_work *work)
40741 cm_free_msg(msg);
40742 goto deref;
40743 case IB_CM_LAP_RCVD:
40744 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40745 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40746 counter[CM_LAP_COUNTER]);
40747 goto unlock;
40748 default:
40749 @@ -3006,7 +3006,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
40750 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
40751 if (cur_cm_id_priv) {
40752 spin_unlock_irq(&cm.lock);
40753 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40754 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40755 counter[CM_SIDR_REQ_COUNTER]);
40756 goto out; /* Duplicate message. */
40757 }
40758 @@ -3218,10 +3218,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
40759 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
40760 msg->retries = 1;
40761
40762 - atomic_long_add(1 + msg->retries,
40763 + atomic_long_add_unchecked(1 + msg->retries,
40764 &port->counter_group[CM_XMIT].counter[attr_index]);
40765 if (msg->retries)
40766 - atomic_long_add(msg->retries,
40767 + atomic_long_add_unchecked(msg->retries,
40768 &port->counter_group[CM_XMIT_RETRIES].
40769 counter[attr_index]);
40770
40771 @@ -3431,7 +3431,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
40772 }
40773
40774 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
40775 - atomic_long_inc(&port->counter_group[CM_RECV].
40776 + atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
40777 counter[attr_id - CM_ATTR_ID_OFFSET]);
40778
40779 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
40780 @@ -3636,7 +3636,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
40781 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
40782
40783 return sprintf(buf, "%ld\n",
40784 - atomic_long_read(&group->counter[cm_attr->index]));
40785 + atomic_long_read_unchecked(&group->counter[cm_attr->index]));
40786 }
40787
40788 static const struct sysfs_ops cm_counter_ops = {
40789 diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
40790 index 9f5ad7c..588cd84 100644
40791 --- a/drivers/infiniband/core/fmr_pool.c
40792 +++ b/drivers/infiniband/core/fmr_pool.c
40793 @@ -98,8 +98,8 @@ struct ib_fmr_pool {
40794
40795 struct task_struct *thread;
40796
40797 - atomic_t req_ser;
40798 - atomic_t flush_ser;
40799 + atomic_unchecked_t req_ser;
40800 + atomic_unchecked_t flush_ser;
40801
40802 wait_queue_head_t force_wait;
40803 };
40804 @@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
40805 struct ib_fmr_pool *pool = pool_ptr;
40806
40807 do {
40808 - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
40809 + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
40810 ib_fmr_batch_release(pool);
40811
40812 - atomic_inc(&pool->flush_ser);
40813 + atomic_inc_unchecked(&pool->flush_ser);
40814 wake_up_interruptible(&pool->force_wait);
40815
40816 if (pool->flush_function)
40817 @@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
40818 }
40819
40820 set_current_state(TASK_INTERRUPTIBLE);
40821 - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
40822 + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
40823 !kthread_should_stop())
40824 schedule();
40825 __set_current_state(TASK_RUNNING);
40826 @@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
40827 pool->dirty_watermark = params->dirty_watermark;
40828 pool->dirty_len = 0;
40829 spin_lock_init(&pool->pool_lock);
40830 - atomic_set(&pool->req_ser, 0);
40831 - atomic_set(&pool->flush_ser, 0);
40832 + atomic_set_unchecked(&pool->req_ser, 0);
40833 + atomic_set_unchecked(&pool->flush_ser, 0);
40834 init_waitqueue_head(&pool->force_wait);
40835
40836 pool->thread = kthread_run(ib_fmr_cleanup_thread,
40837 @@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
40838 }
40839 spin_unlock_irq(&pool->pool_lock);
40840
40841 - serial = atomic_inc_return(&pool->req_ser);
40842 + serial = atomic_inc_return_unchecked(&pool->req_ser);
40843 wake_up_process(pool->thread);
40844
40845 if (wait_event_interruptible(pool->force_wait,
40846 - atomic_read(&pool->flush_ser) - serial >= 0))
40847 + atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
40848 return -EINTR;
40849
40850 return 0;
40851 @@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
40852 } else {
40853 list_add_tail(&fmr->list, &pool->dirty_list);
40854 if (++pool->dirty_len >= pool->dirty_watermark) {
40855 - atomic_inc(&pool->req_ser);
40856 + atomic_inc_unchecked(&pool->req_ser);
40857 wake_up_process(pool->thread);
40858 }
40859 }
40860 diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
40861 index 4cb8eb2..146bf60 100644
40862 --- a/drivers/infiniband/hw/cxgb4/mem.c
40863 +++ b/drivers/infiniband/hw/cxgb4/mem.c
40864 @@ -249,7 +249,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
40865 int err;
40866 struct fw_ri_tpte tpt;
40867 u32 stag_idx;
40868 - static atomic_t key;
40869 + static atomic_unchecked_t key;
40870
40871 if (c4iw_fatal_error(rdev))
40872 return -EIO;
40873 @@ -266,7 +266,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
40874 if (rdev->stats.stag.cur > rdev->stats.stag.max)
40875 rdev->stats.stag.max = rdev->stats.stag.cur;
40876 mutex_unlock(&rdev->stats.lock);
40877 - *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
40878 + *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
40879 }
40880 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
40881 __func__, stag_state, type, pdid, stag_idx);
40882 diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
40883 index 79b3dbc..96e5fcc 100644
40884 --- a/drivers/infiniband/hw/ipath/ipath_rc.c
40885 +++ b/drivers/infiniband/hw/ipath/ipath_rc.c
40886 @@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
40887 struct ib_atomic_eth *ateth;
40888 struct ipath_ack_entry *e;
40889 u64 vaddr;
40890 - atomic64_t *maddr;
40891 + atomic64_unchecked_t *maddr;
40892 u64 sdata;
40893 u32 rkey;
40894 u8 next;
40895 @@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
40896 IB_ACCESS_REMOTE_ATOMIC)))
40897 goto nack_acc_unlck;
40898 /* Perform atomic OP and save result. */
40899 - maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
40900 + maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
40901 sdata = be64_to_cpu(ateth->swap_data);
40902 e = &qp->s_ack_queue[qp->r_head_ack_queue];
40903 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
40904 - (u64) atomic64_add_return(sdata, maddr) - sdata :
40905 + (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
40906 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
40907 be64_to_cpu(ateth->compare_data),
40908 sdata);
40909 diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
40910 index 1f95bba..9530f87 100644
40911 --- a/drivers/infiniband/hw/ipath/ipath_ruc.c
40912 +++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
40913 @@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
40914 unsigned long flags;
40915 struct ib_wc wc;
40916 u64 sdata;
40917 - atomic64_t *maddr;
40918 + atomic64_unchecked_t *maddr;
40919 enum ib_wc_status send_status;
40920
40921 /*
40922 @@ -382,11 +382,11 @@ again:
40923 IB_ACCESS_REMOTE_ATOMIC)))
40924 goto acc_err;
40925 /* Perform atomic OP and save result. */
40926 - maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
40927 + maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
40928 sdata = wqe->wr.wr.atomic.compare_add;
40929 *(u64 *) sqp->s_sge.sge.vaddr =
40930 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
40931 - (u64) atomic64_add_return(sdata, maddr) - sdata :
40932 + (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
40933 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
40934 sdata, wqe->wr.wr.atomic.swap);
40935 goto send_comp;
40936 diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
40937 index f2a3f48..673ec79 100644
40938 --- a/drivers/infiniband/hw/mlx4/mad.c
40939 +++ b/drivers/infiniband/hw/mlx4/mad.c
40940 @@ -98,7 +98,7 @@ __be64 mlx4_ib_gen_node_guid(void)
40941
40942 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
40943 {
40944 - return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
40945 + return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
40946 cpu_to_be64(0xff00000000000000LL);
40947 }
40948
40949 diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
40950 index 25b2cdf..099ff97 100644
40951 --- a/drivers/infiniband/hw/mlx4/mcg.c
40952 +++ b/drivers/infiniband/hw/mlx4/mcg.c
40953 @@ -1040,7 +1040,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
40954 {
40955 char name[20];
40956
40957 - atomic_set(&ctx->tid, 0);
40958 + atomic_set_unchecked(&ctx->tid, 0);
40959 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
40960 ctx->mcg_wq = create_singlethread_workqueue(name);
40961 if (!ctx->mcg_wq)
40962 diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
40963 index 036b663..c9a8c73 100644
40964 --- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
40965 +++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
40966 @@ -404,7 +404,7 @@ struct mlx4_ib_demux_ctx {
40967 struct list_head mcg_mgid0_list;
40968 struct workqueue_struct *mcg_wq;
40969 struct mlx4_ib_demux_pv_ctx **tun;
40970 - atomic_t tid;
40971 + atomic_unchecked_t tid;
40972 int flushing; /* flushing the work queue */
40973 };
40974
40975 diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
40976 index 9d3e5c1..6f166df 100644
40977 --- a/drivers/infiniband/hw/mthca/mthca_cmd.c
40978 +++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
40979 @@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
40980 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
40981 }
40982
40983 -int mthca_QUERY_FW(struct mthca_dev *dev)
40984 +int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
40985 {
40986 struct mthca_mailbox *mailbox;
40987 u32 *outbox;
40988 @@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
40989 CMD_TIME_CLASS_B);
40990 }
40991
40992 -int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
40993 +int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
40994 int num_mtt)
40995 {
40996 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
40997 @@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
40998 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
40999 }
41000
41001 -int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
41002 +int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
41003 int eq_num)
41004 {
41005 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
41006 @@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
41007 CMD_TIME_CLASS_B);
41008 }
41009
41010 -int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
41011 +int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
41012 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
41013 void *in_mad, void *response_mad)
41014 {
41015 diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
41016 index 87897b9..7e79542 100644
41017 --- a/drivers/infiniband/hw/mthca/mthca_main.c
41018 +++ b/drivers/infiniband/hw/mthca/mthca_main.c
41019 @@ -692,7 +692,7 @@ err_close:
41020 return err;
41021 }
41022
41023 -static int mthca_setup_hca(struct mthca_dev *dev)
41024 +static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
41025 {
41026 int err;
41027
41028 diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
41029 index ed9a989..6aa5dc2 100644
41030 --- a/drivers/infiniband/hw/mthca/mthca_mr.c
41031 +++ b/drivers/infiniband/hw/mthca/mthca_mr.c
41032 @@ -81,7 +81,7 @@ struct mthca_mpt_entry {
41033 * through the bitmaps)
41034 */
41035
41036 -static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
41037 +static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
41038 {
41039 int o;
41040 int m;
41041 @@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
41042 return key;
41043 }
41044
41045 -int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
41046 +int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
41047 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
41048 {
41049 struct mthca_mailbox *mailbox;
41050 @@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
41051 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
41052 }
41053
41054 -int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
41055 +int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
41056 u64 *buffer_list, int buffer_size_shift,
41057 int list_len, u64 iova, u64 total_size,
41058 u32 access, struct mthca_mr *mr)
41059 diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
41060 index 5b71d43..35a9e14 100644
41061 --- a/drivers/infiniband/hw/mthca/mthca_provider.c
41062 +++ b/drivers/infiniband/hw/mthca/mthca_provider.c
41063 @@ -763,7 +763,7 @@ unlock:
41064 return 0;
41065 }
41066
41067 -static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
41068 +static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
41069 {
41070 struct mthca_dev *dev = to_mdev(ibcq->device);
41071 struct mthca_cq *cq = to_mcq(ibcq);
41072 diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
41073 index 4291410..d2ab1fb 100644
41074 --- a/drivers/infiniband/hw/nes/nes.c
41075 +++ b/drivers/infiniband/hw/nes/nes.c
41076 @@ -98,7 +98,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
41077 LIST_HEAD(nes_adapter_list);
41078 static LIST_HEAD(nes_dev_list);
41079
41080 -atomic_t qps_destroyed;
41081 +atomic_unchecked_t qps_destroyed;
41082
41083 static unsigned int ee_flsh_adapter;
41084 static unsigned int sysfs_nonidx_addr;
41085 @@ -269,7 +269,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
41086 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
41087 struct nes_adapter *nesadapter = nesdev->nesadapter;
41088
41089 - atomic_inc(&qps_destroyed);
41090 + atomic_inc_unchecked(&qps_destroyed);
41091
41092 /* Free the control structures */
41093
41094 diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
41095 index 33cc589..3bd6538 100644
41096 --- a/drivers/infiniband/hw/nes/nes.h
41097 +++ b/drivers/infiniband/hw/nes/nes.h
41098 @@ -177,17 +177,17 @@ extern unsigned int nes_debug_level;
41099 extern unsigned int wqm_quanta;
41100 extern struct list_head nes_adapter_list;
41101
41102 -extern atomic_t cm_connects;
41103 -extern atomic_t cm_accepts;
41104 -extern atomic_t cm_disconnects;
41105 -extern atomic_t cm_closes;
41106 -extern atomic_t cm_connecteds;
41107 -extern atomic_t cm_connect_reqs;
41108 -extern atomic_t cm_rejects;
41109 -extern atomic_t mod_qp_timouts;
41110 -extern atomic_t qps_created;
41111 -extern atomic_t qps_destroyed;
41112 -extern atomic_t sw_qps_destroyed;
41113 +extern atomic_unchecked_t cm_connects;
41114 +extern atomic_unchecked_t cm_accepts;
41115 +extern atomic_unchecked_t cm_disconnects;
41116 +extern atomic_unchecked_t cm_closes;
41117 +extern atomic_unchecked_t cm_connecteds;
41118 +extern atomic_unchecked_t cm_connect_reqs;
41119 +extern atomic_unchecked_t cm_rejects;
41120 +extern atomic_unchecked_t mod_qp_timouts;
41121 +extern atomic_unchecked_t qps_created;
41122 +extern atomic_unchecked_t qps_destroyed;
41123 +extern atomic_unchecked_t sw_qps_destroyed;
41124 extern u32 mh_detected;
41125 extern u32 mh_pauses_sent;
41126 extern u32 cm_packets_sent;
41127 @@ -196,16 +196,16 @@ extern u32 cm_packets_created;
41128 extern u32 cm_packets_received;
41129 extern u32 cm_packets_dropped;
41130 extern u32 cm_packets_retrans;
41131 -extern atomic_t cm_listens_created;
41132 -extern atomic_t cm_listens_destroyed;
41133 +extern atomic_unchecked_t cm_listens_created;
41134 +extern atomic_unchecked_t cm_listens_destroyed;
41135 extern u32 cm_backlog_drops;
41136 -extern atomic_t cm_loopbacks;
41137 -extern atomic_t cm_nodes_created;
41138 -extern atomic_t cm_nodes_destroyed;
41139 -extern atomic_t cm_accel_dropped_pkts;
41140 -extern atomic_t cm_resets_recvd;
41141 -extern atomic_t pau_qps_created;
41142 -extern atomic_t pau_qps_destroyed;
41143 +extern atomic_unchecked_t cm_loopbacks;
41144 +extern atomic_unchecked_t cm_nodes_created;
41145 +extern atomic_unchecked_t cm_nodes_destroyed;
41146 +extern atomic_unchecked_t cm_accel_dropped_pkts;
41147 +extern atomic_unchecked_t cm_resets_recvd;
41148 +extern atomic_unchecked_t pau_qps_created;
41149 +extern atomic_unchecked_t pau_qps_destroyed;
41150
41151 extern u32 int_mod_timer_init;
41152 extern u32 int_mod_cq_depth_256;
41153 diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
41154 index 6b29249..57081dd 100644
41155 --- a/drivers/infiniband/hw/nes/nes_cm.c
41156 +++ b/drivers/infiniband/hw/nes/nes_cm.c
41157 @@ -68,14 +68,14 @@ u32 cm_packets_dropped;
41158 u32 cm_packets_retrans;
41159 u32 cm_packets_created;
41160 u32 cm_packets_received;
41161 -atomic_t cm_listens_created;
41162 -atomic_t cm_listens_destroyed;
41163 +atomic_unchecked_t cm_listens_created;
41164 +atomic_unchecked_t cm_listens_destroyed;
41165 u32 cm_backlog_drops;
41166 -atomic_t cm_loopbacks;
41167 -atomic_t cm_nodes_created;
41168 -atomic_t cm_nodes_destroyed;
41169 -atomic_t cm_accel_dropped_pkts;
41170 -atomic_t cm_resets_recvd;
41171 +atomic_unchecked_t cm_loopbacks;
41172 +atomic_unchecked_t cm_nodes_created;
41173 +atomic_unchecked_t cm_nodes_destroyed;
41174 +atomic_unchecked_t cm_accel_dropped_pkts;
41175 +atomic_unchecked_t cm_resets_recvd;
41176
41177 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
41178 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
41179 @@ -148,13 +148,13 @@ static struct nes_cm_ops nes_cm_api = {
41180
41181 static struct nes_cm_core *g_cm_core;
41182
41183 -atomic_t cm_connects;
41184 -atomic_t cm_accepts;
41185 -atomic_t cm_disconnects;
41186 -atomic_t cm_closes;
41187 -atomic_t cm_connecteds;
41188 -atomic_t cm_connect_reqs;
41189 -atomic_t cm_rejects;
41190 +atomic_unchecked_t cm_connects;
41191 +atomic_unchecked_t cm_accepts;
41192 +atomic_unchecked_t cm_disconnects;
41193 +atomic_unchecked_t cm_closes;
41194 +atomic_unchecked_t cm_connecteds;
41195 +atomic_unchecked_t cm_connect_reqs;
41196 +atomic_unchecked_t cm_rejects;
41197
41198 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
41199 {
41200 @@ -1272,7 +1272,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
41201 kfree(listener);
41202 listener = NULL;
41203 ret = 0;
41204 - atomic_inc(&cm_listens_destroyed);
41205 + atomic_inc_unchecked(&cm_listens_destroyed);
41206 } else {
41207 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
41208 }
41209 @@ -1466,7 +1466,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
41210 cm_node->rem_mac);
41211
41212 add_hte_node(cm_core, cm_node);
41213 - atomic_inc(&cm_nodes_created);
41214 + atomic_inc_unchecked(&cm_nodes_created);
41215
41216 return cm_node;
41217 }
41218 @@ -1524,7 +1524,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
41219 }
41220
41221 atomic_dec(&cm_core->node_cnt);
41222 - atomic_inc(&cm_nodes_destroyed);
41223 + atomic_inc_unchecked(&cm_nodes_destroyed);
41224 nesqp = cm_node->nesqp;
41225 if (nesqp) {
41226 nesqp->cm_node = NULL;
41227 @@ -1588,7 +1588,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
41228
41229 static void drop_packet(struct sk_buff *skb)
41230 {
41231 - atomic_inc(&cm_accel_dropped_pkts);
41232 + atomic_inc_unchecked(&cm_accel_dropped_pkts);
41233 dev_kfree_skb_any(skb);
41234 }
41235
41236 @@ -1651,7 +1651,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
41237 {
41238
41239 int reset = 0; /* whether to send reset in case of err.. */
41240 - atomic_inc(&cm_resets_recvd);
41241 + atomic_inc_unchecked(&cm_resets_recvd);
41242 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
41243 " refcnt=%d\n", cm_node, cm_node->state,
41244 atomic_read(&cm_node->ref_count));
41245 @@ -2292,7 +2292,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
41246 rem_ref_cm_node(cm_node->cm_core, cm_node);
41247 return NULL;
41248 }
41249 - atomic_inc(&cm_loopbacks);
41250 + atomic_inc_unchecked(&cm_loopbacks);
41251 loopbackremotenode->loopbackpartner = cm_node;
41252 loopbackremotenode->tcp_cntxt.rcv_wscale =
41253 NES_CM_DEFAULT_RCV_WND_SCALE;
41254 @@ -2567,7 +2567,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
41255 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
41256 else {
41257 rem_ref_cm_node(cm_core, cm_node);
41258 - atomic_inc(&cm_accel_dropped_pkts);
41259 + atomic_inc_unchecked(&cm_accel_dropped_pkts);
41260 dev_kfree_skb_any(skb);
41261 }
41262 break;
41263 @@ -2875,7 +2875,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
41264
41265 if ((cm_id) && (cm_id->event_handler)) {
41266 if (issue_disconn) {
41267 - atomic_inc(&cm_disconnects);
41268 + atomic_inc_unchecked(&cm_disconnects);
41269 cm_event.event = IW_CM_EVENT_DISCONNECT;
41270 cm_event.status = disconn_status;
41271 cm_event.local_addr = cm_id->local_addr;
41272 @@ -2897,7 +2897,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
41273 }
41274
41275 if (issue_close) {
41276 - atomic_inc(&cm_closes);
41277 + atomic_inc_unchecked(&cm_closes);
41278 nes_disconnect(nesqp, 1);
41279
41280 cm_id->provider_data = nesqp;
41281 @@ -3035,7 +3035,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
41282
41283 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
41284 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
41285 - atomic_inc(&cm_accepts);
41286 + atomic_inc_unchecked(&cm_accepts);
41287
41288 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
41289 netdev_refcnt_read(nesvnic->netdev));
41290 @@ -3224,7 +3224,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
41291 struct nes_cm_core *cm_core;
41292 u8 *start_buff;
41293
41294 - atomic_inc(&cm_rejects);
41295 + atomic_inc_unchecked(&cm_rejects);
41296 cm_node = (struct nes_cm_node *)cm_id->provider_data;
41297 loopback = cm_node->loopbackpartner;
41298 cm_core = cm_node->cm_core;
41299 @@ -3286,7 +3286,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
41300 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
41301 ntohs(laddr->sin_port));
41302
41303 - atomic_inc(&cm_connects);
41304 + atomic_inc_unchecked(&cm_connects);
41305 nesqp->active_conn = 1;
41306
41307 /* cache the cm_id in the qp */
41308 @@ -3398,7 +3398,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
41309 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
41310 return err;
41311 }
41312 - atomic_inc(&cm_listens_created);
41313 + atomic_inc_unchecked(&cm_listens_created);
41314 }
41315
41316 cm_id->add_ref(cm_id);
41317 @@ -3505,7 +3505,7 @@ static void cm_event_connected(struct nes_cm_event *event)
41318
41319 if (nesqp->destroyed)
41320 return;
41321 - atomic_inc(&cm_connecteds);
41322 + atomic_inc_unchecked(&cm_connecteds);
41323 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
41324 " local port 0x%04X. jiffies = %lu.\n",
41325 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
41326 @@ -3686,7 +3686,7 @@ static void cm_event_reset(struct nes_cm_event *event)
41327
41328 cm_id->add_ref(cm_id);
41329 ret = cm_id->event_handler(cm_id, &cm_event);
41330 - atomic_inc(&cm_closes);
41331 + atomic_inc_unchecked(&cm_closes);
41332 cm_event.event = IW_CM_EVENT_CLOSE;
41333 cm_event.status = 0;
41334 cm_event.provider_data = cm_id->provider_data;
41335 @@ -3726,7 +3726,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
41336 return;
41337 cm_id = cm_node->cm_id;
41338
41339 - atomic_inc(&cm_connect_reqs);
41340 + atomic_inc_unchecked(&cm_connect_reqs);
41341 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
41342 cm_node, cm_id, jiffies);
41343
41344 @@ -3770,7 +3770,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
41345 return;
41346 cm_id = cm_node->cm_id;
41347
41348 - atomic_inc(&cm_connect_reqs);
41349 + atomic_inc_unchecked(&cm_connect_reqs);
41350 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
41351 cm_node, cm_id, jiffies);
41352
41353 diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
41354 index 4166452..fc952c3 100644
41355 --- a/drivers/infiniband/hw/nes/nes_mgt.c
41356 +++ b/drivers/infiniband/hw/nes/nes_mgt.c
41357 @@ -40,8 +40,8 @@
41358 #include "nes.h"
41359 #include "nes_mgt.h"
41360
41361 -atomic_t pau_qps_created;
41362 -atomic_t pau_qps_destroyed;
41363 +atomic_unchecked_t pau_qps_created;
41364 +atomic_unchecked_t pau_qps_destroyed;
41365
41366 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
41367 {
41368 @@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
41369 {
41370 struct sk_buff *skb;
41371 unsigned long flags;
41372 - atomic_inc(&pau_qps_destroyed);
41373 + atomic_inc_unchecked(&pau_qps_destroyed);
41374
41375 /* Free packets that have not yet been forwarded */
41376 /* Lock is acquired by skb_dequeue when removing the skb */
41377 @@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
41378 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
41379 skb_queue_head_init(&nesqp->pau_list);
41380 spin_lock_init(&nesqp->pau_lock);
41381 - atomic_inc(&pau_qps_created);
41382 + atomic_inc_unchecked(&pau_qps_created);
41383 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
41384 }
41385
41386 diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
41387 index 49eb511..a774366 100644
41388 --- a/drivers/infiniband/hw/nes/nes_nic.c
41389 +++ b/drivers/infiniband/hw/nes/nes_nic.c
41390 @@ -1273,39 +1273,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
41391 target_stat_values[++index] = mh_detected;
41392 target_stat_values[++index] = mh_pauses_sent;
41393 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
41394 - target_stat_values[++index] = atomic_read(&cm_connects);
41395 - target_stat_values[++index] = atomic_read(&cm_accepts);
41396 - target_stat_values[++index] = atomic_read(&cm_disconnects);
41397 - target_stat_values[++index] = atomic_read(&cm_connecteds);
41398 - target_stat_values[++index] = atomic_read(&cm_connect_reqs);
41399 - target_stat_values[++index] = atomic_read(&cm_rejects);
41400 - target_stat_values[++index] = atomic_read(&mod_qp_timouts);
41401 - target_stat_values[++index] = atomic_read(&qps_created);
41402 - target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
41403 - target_stat_values[++index] = atomic_read(&qps_destroyed);
41404 - target_stat_values[++index] = atomic_read(&cm_closes);
41405 + target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
41406 + target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
41407 + target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
41408 + target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
41409 + target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
41410 + target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
41411 + target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
41412 + target_stat_values[++index] = atomic_read_unchecked(&qps_created);
41413 + target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
41414 + target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
41415 + target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
41416 target_stat_values[++index] = cm_packets_sent;
41417 target_stat_values[++index] = cm_packets_bounced;
41418 target_stat_values[++index] = cm_packets_created;
41419 target_stat_values[++index] = cm_packets_received;
41420 target_stat_values[++index] = cm_packets_dropped;
41421 target_stat_values[++index] = cm_packets_retrans;
41422 - target_stat_values[++index] = atomic_read(&cm_listens_created);
41423 - target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
41424 + target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
41425 + target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
41426 target_stat_values[++index] = cm_backlog_drops;
41427 - target_stat_values[++index] = atomic_read(&cm_loopbacks);
41428 - target_stat_values[++index] = atomic_read(&cm_nodes_created);
41429 - target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
41430 - target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
41431 - target_stat_values[++index] = atomic_read(&cm_resets_recvd);
41432 + target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
41433 + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
41434 + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
41435 + target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
41436 + target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
41437 target_stat_values[++index] = nesadapter->free_4kpbl;
41438 target_stat_values[++index] = nesadapter->free_256pbl;
41439 target_stat_values[++index] = int_mod_timer_init;
41440 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
41441 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
41442 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
41443 - target_stat_values[++index] = atomic_read(&pau_qps_created);
41444 - target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
41445 + target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
41446 + target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
41447 }
41448
41449 /**
41450 diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
41451 index 5b53ca5..443da3c 100644
41452 --- a/drivers/infiniband/hw/nes/nes_verbs.c
41453 +++ b/drivers/infiniband/hw/nes/nes_verbs.c
41454 @@ -46,9 +46,9 @@
41455
41456 #include <rdma/ib_umem.h>
41457
41458 -atomic_t mod_qp_timouts;
41459 -atomic_t qps_created;
41460 -atomic_t sw_qps_destroyed;
41461 +atomic_unchecked_t mod_qp_timouts;
41462 +atomic_unchecked_t qps_created;
41463 +atomic_unchecked_t sw_qps_destroyed;
41464
41465 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
41466
41467 @@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
41468 if (init_attr->create_flags)
41469 return ERR_PTR(-EINVAL);
41470
41471 - atomic_inc(&qps_created);
41472 + atomic_inc_unchecked(&qps_created);
41473 switch (init_attr->qp_type) {
41474 case IB_QPT_RC:
41475 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
41476 @@ -1466,7 +1466,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
41477 struct iw_cm_event cm_event;
41478 int ret = 0;
41479
41480 - atomic_inc(&sw_qps_destroyed);
41481 + atomic_inc_unchecked(&sw_qps_destroyed);
41482 nesqp->destroyed = 1;
41483
41484 /* Blow away the connection if it exists. */
41485 diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
41486 index 1946101..09766d2 100644
41487 --- a/drivers/infiniband/hw/qib/qib.h
41488 +++ b/drivers/infiniband/hw/qib/qib.h
41489 @@ -52,6 +52,7 @@
41490 #include <linux/kref.h>
41491 #include <linux/sched.h>
41492 #include <linux/kthread.h>
41493 +#include <linux/slab.h>
41494
41495 #include "qib_common.h"
41496 #include "qib_verbs.h"
41497 diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
41498 index 922a7fe..bb035db 100644
41499 --- a/drivers/input/gameport/gameport.c
41500 +++ b/drivers/input/gameport/gameport.c
41501 @@ -487,14 +487,14 @@ EXPORT_SYMBOL(gameport_set_phys);
41502 */
41503 static void gameport_init_port(struct gameport *gameport)
41504 {
41505 - static atomic_t gameport_no = ATOMIC_INIT(0);
41506 + static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
41507
41508 __module_get(THIS_MODULE);
41509
41510 mutex_init(&gameport->drv_mutex);
41511 device_initialize(&gameport->dev);
41512 dev_set_name(&gameport->dev, "gameport%lu",
41513 - (unsigned long)atomic_inc_return(&gameport_no) - 1);
41514 + (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
41515 gameport->dev.bus = &gameport_bus;
41516 gameport->dev.release = gameport_release_port;
41517 if (gameport->parent)
41518 diff --git a/drivers/input/input.c b/drivers/input/input.c
41519 index e75d015..57d1c28 100644
41520 --- a/drivers/input/input.c
41521 +++ b/drivers/input/input.c
41522 @@ -1734,7 +1734,7 @@ EXPORT_SYMBOL_GPL(input_class);
41523 */
41524 struct input_dev *input_allocate_device(void)
41525 {
41526 - static atomic_t input_no = ATOMIC_INIT(0);
41527 + static atomic_unchecked_t input_no = ATOMIC_INIT(0);
41528 struct input_dev *dev;
41529
41530 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
41531 @@ -1749,7 +1749,7 @@ struct input_dev *input_allocate_device(void)
41532 INIT_LIST_HEAD(&dev->node);
41533
41534 dev_set_name(&dev->dev, "input%ld",
41535 - (unsigned long) atomic_inc_return(&input_no) - 1);
41536 + (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
41537
41538 __module_get(THIS_MODULE);
41539 }
41540 diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
41541 index 04c69af..5f92d00 100644
41542 --- a/drivers/input/joystick/sidewinder.c
41543 +++ b/drivers/input/joystick/sidewinder.c
41544 @@ -30,6 +30,7 @@
41545 #include <linux/kernel.h>
41546 #include <linux/module.h>
41547 #include <linux/slab.h>
41548 +#include <linux/sched.h>
41549 #include <linux/init.h>
41550 #include <linux/input.h>
41551 #include <linux/gameport.h>
41552 diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
41553 index 75e3b10..fb390fd 100644
41554 --- a/drivers/input/joystick/xpad.c
41555 +++ b/drivers/input/joystick/xpad.c
41556 @@ -736,7 +736,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
41557
41558 static int xpad_led_probe(struct usb_xpad *xpad)
41559 {
41560 - static atomic_t led_seq = ATOMIC_INIT(0);
41561 + static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
41562 long led_no;
41563 struct xpad_led *led;
41564 struct led_classdev *led_cdev;
41565 @@ -749,7 +749,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
41566 if (!led)
41567 return -ENOMEM;
41568
41569 - led_no = (long)atomic_inc_return(&led_seq) - 1;
41570 + led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
41571
41572 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
41573 led->xpad = xpad;
41574 diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
41575 index e204f26..8459f15 100644
41576 --- a/drivers/input/misc/ims-pcu.c
41577 +++ b/drivers/input/misc/ims-pcu.c
41578 @@ -1621,7 +1621,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
41579
41580 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
41581 {
41582 - static atomic_t device_no = ATOMIC_INIT(0);
41583 + static atomic_unchecked_t device_no = ATOMIC_INIT(0);
41584
41585 const struct ims_pcu_device_info *info;
41586 u8 device_id;
41587 @@ -1653,7 +1653,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
41588 }
41589
41590 /* Device appears to be operable, complete initialization */
41591 - pcu->device_no = atomic_inc_return(&device_no) - 1;
41592 + pcu->device_no = atomic_inc_return_unchecked(&device_no) - 1;
41593
41594 error = ims_pcu_setup_backlight(pcu);
41595 if (error)
41596 diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
41597 index 2f0b39d..7370f13 100644
41598 --- a/drivers/input/mouse/psmouse.h
41599 +++ b/drivers/input/mouse/psmouse.h
41600 @@ -116,7 +116,7 @@ struct psmouse_attribute {
41601 ssize_t (*set)(struct psmouse *psmouse, void *data,
41602 const char *buf, size_t count);
41603 bool protect;
41604 -};
41605 +} __do_const;
41606 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
41607
41608 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
41609 diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
41610 index 4c842c3..590b0bf 100644
41611 --- a/drivers/input/mousedev.c
41612 +++ b/drivers/input/mousedev.c
41613 @@ -738,7 +738,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
41614
41615 spin_unlock_irq(&client->packet_lock);
41616
41617 - if (copy_to_user(buffer, data, count))
41618 + if (count > sizeof(data) || copy_to_user(buffer, data, count))
41619 return -EFAULT;
41620
41621 return count;
41622 diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
41623 index 2b56855..5a55837 100644
41624 --- a/drivers/input/serio/serio.c
41625 +++ b/drivers/input/serio/serio.c
41626 @@ -496,7 +496,7 @@ static void serio_release_port(struct device *dev)
41627 */
41628 static void serio_init_port(struct serio *serio)
41629 {
41630 - static atomic_t serio_no = ATOMIC_INIT(0);
41631 + static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
41632
41633 __module_get(THIS_MODULE);
41634
41635 @@ -507,7 +507,7 @@ static void serio_init_port(struct serio *serio)
41636 mutex_init(&serio->drv_mutex);
41637 device_initialize(&serio->dev);
41638 dev_set_name(&serio->dev, "serio%ld",
41639 - (long)atomic_inc_return(&serio_no) - 1);
41640 + (long)atomic_inc_return_unchecked(&serio_no) - 1);
41641 serio->dev.bus = &serio_bus;
41642 serio->dev.release = serio_release_port;
41643 serio->dev.groups = serio_device_attr_groups;
41644 diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
41645 index 59df2e7..8f1cafb 100644
41646 --- a/drivers/input/serio/serio_raw.c
41647 +++ b/drivers/input/serio/serio_raw.c
41648 @@ -293,7 +293,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
41649
41650 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
41651 {
41652 - static atomic_t serio_raw_no = ATOMIC_INIT(0);
41653 + static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(0);
41654 struct serio_raw *serio_raw;
41655 int err;
41656
41657 @@ -304,7 +304,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
41658 }
41659
41660 snprintf(serio_raw->name, sizeof(serio_raw->name),
41661 - "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no) - 1);
41662 + "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no) - 1);
41663 kref_init(&serio_raw->kref);
41664 INIT_LIST_HEAD(&serio_raw->client_list);
41665 init_waitqueue_head(&serio_raw->wait);
41666 diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
41667 index fbe9ca7..dbee61d 100644
41668 --- a/drivers/iommu/iommu.c
41669 +++ b/drivers/iommu/iommu.c
41670 @@ -583,7 +583,7 @@ static struct notifier_block iommu_bus_nb = {
41671 static void iommu_bus_init(struct bus_type *bus, struct iommu_ops *ops)
41672 {
41673 bus_register_notifier(bus, &iommu_bus_nb);
41674 - bus_for_each_dev(bus, NULL, ops, add_iommu_group);
41675 + bus_for_each_dev(bus, NULL, (void *)ops, add_iommu_group);
41676 }
41677
41678 /**
41679 diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
41680 index 39f81ae..2660096 100644
41681 --- a/drivers/iommu/irq_remapping.c
41682 +++ b/drivers/iommu/irq_remapping.c
41683 @@ -356,7 +356,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
41684 void panic_if_irq_remap(const char *msg)
41685 {
41686 if (irq_remapping_enabled)
41687 - panic(msg);
41688 + panic("%s", msg);
41689 }
41690
41691 static void ir_ack_apic_edge(struct irq_data *data)
41692 @@ -377,10 +377,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
41693
41694 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
41695 {
41696 - chip->irq_print_chip = ir_print_prefix;
41697 - chip->irq_ack = ir_ack_apic_edge;
41698 - chip->irq_eoi = ir_ack_apic_level;
41699 - chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
41700 + pax_open_kernel();
41701 + *(void **)&chip->irq_print_chip = ir_print_prefix;
41702 + *(void **)&chip->irq_ack = ir_ack_apic_edge;
41703 + *(void **)&chip->irq_eoi = ir_ack_apic_level;
41704 + *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
41705 + pax_close_kernel();
41706 }
41707
41708 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
41709 diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
41710 index d0e9480..d2b6340 100644
41711 --- a/drivers/irqchip/irq-gic.c
41712 +++ b/drivers/irqchip/irq-gic.c
41713 @@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
41714 * Supported arch specific GIC irq extension.
41715 * Default make them NULL.
41716 */
41717 -struct irq_chip gic_arch_extn = {
41718 +irq_chip_no_const gic_arch_extn = {
41719 .irq_eoi = NULL,
41720 .irq_mask = NULL,
41721 .irq_unmask = NULL,
41722 @@ -333,7 +333,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
41723 chained_irq_exit(chip, desc);
41724 }
41725
41726 -static struct irq_chip gic_chip = {
41727 +static irq_chip_no_const gic_chip __read_only = {
41728 .name = "GIC",
41729 .irq_mask = gic_mask_irq,
41730 .irq_unmask = gic_unmask_irq,
41731 diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
41732 index ac6f72b..81150f2 100644
41733 --- a/drivers/isdn/capi/capi.c
41734 +++ b/drivers/isdn/capi/capi.c
41735 @@ -81,8 +81,8 @@ struct capiminor {
41736
41737 struct capi20_appl *ap;
41738 u32 ncci;
41739 - atomic_t datahandle;
41740 - atomic_t msgid;
41741 + atomic_unchecked_t datahandle;
41742 + atomic_unchecked_t msgid;
41743
41744 struct tty_port port;
41745 int ttyinstop;
41746 @@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
41747 capimsg_setu16(s, 2, mp->ap->applid);
41748 capimsg_setu8 (s, 4, CAPI_DATA_B3);
41749 capimsg_setu8 (s, 5, CAPI_RESP);
41750 - capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
41751 + capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
41752 capimsg_setu32(s, 8, mp->ncci);
41753 capimsg_setu16(s, 12, datahandle);
41754 }
41755 @@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
41756 mp->outbytes -= len;
41757 spin_unlock_bh(&mp->outlock);
41758
41759 - datahandle = atomic_inc_return(&mp->datahandle);
41760 + datahandle = atomic_inc_return_unchecked(&mp->datahandle);
41761 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
41762 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
41763 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
41764 capimsg_setu16(skb->data, 2, mp->ap->applid);
41765 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
41766 capimsg_setu8 (skb->data, 5, CAPI_REQ);
41767 - capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
41768 + capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
41769 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
41770 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
41771 capimsg_setu16(skb->data, 16, len); /* Data length */
41772 diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
41773 index 600c79b..3752bab 100644
41774 --- a/drivers/isdn/gigaset/interface.c
41775 +++ b/drivers/isdn/gigaset/interface.c
41776 @@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
41777 }
41778 tty->driver_data = cs;
41779
41780 - ++cs->port.count;
41781 + atomic_inc(&cs->port.count);
41782
41783 - if (cs->port.count == 1) {
41784 + if (atomic_read(&cs->port.count) == 1) {
41785 tty_port_tty_set(&cs->port, tty);
41786 cs->port.low_latency = 1;
41787 }
41788 @@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
41789
41790 if (!cs->connected)
41791 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
41792 - else if (!cs->port.count)
41793 + else if (!atomic_read(&cs->port.count))
41794 dev_warn(cs->dev, "%s: device not opened\n", __func__);
41795 - else if (!--cs->port.count)
41796 + else if (!atomic_dec_return(&cs->port.count))
41797 tty_port_tty_set(&cs->port, NULL);
41798
41799 mutex_unlock(&cs->mutex);
41800 diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
41801 index d0a41cb..f0cdb8c 100644
41802 --- a/drivers/isdn/gigaset/usb-gigaset.c
41803 +++ b/drivers/isdn/gigaset/usb-gigaset.c
41804 @@ -547,7 +547,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
41805 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
41806 memcpy(cs->hw.usb->bchars, buf, 6);
41807 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
41808 - 0, 0, &buf, 6, 2000);
41809 + 0, 0, buf, 6, 2000);
41810 }
41811
41812 static void gigaset_freebcshw(struct bc_state *bcs)
41813 diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
41814 index 4d9b195..455075c 100644
41815 --- a/drivers/isdn/hardware/avm/b1.c
41816 +++ b/drivers/isdn/hardware/avm/b1.c
41817 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
41818 }
41819 if (left) {
41820 if (t4file->user) {
41821 - if (copy_from_user(buf, dp, left))
41822 + if (left > sizeof buf || copy_from_user(buf, dp, left))
41823 return -EFAULT;
41824 } else {
41825 memcpy(buf, dp, left);
41826 @@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
41827 }
41828 if (left) {
41829 if (config->user) {
41830 - if (copy_from_user(buf, dp, left))
41831 + if (left > sizeof buf || copy_from_user(buf, dp, left))
41832 return -EFAULT;
41833 } else {
41834 memcpy(buf, dp, left);
41835 diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
41836 index 9bb12ba..d4262f7 100644
41837 --- a/drivers/isdn/i4l/isdn_common.c
41838 +++ b/drivers/isdn/i4l/isdn_common.c
41839 @@ -1651,6 +1651,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
41840 } else
41841 return -EINVAL;
41842 case IIOCDBGVAR:
41843 + if (!capable(CAP_SYS_RAWIO))
41844 + return -EPERM;
41845 if (arg) {
41846 if (copy_to_user(argp, &dev, sizeof(ulong)))
41847 return -EFAULT;
41848 diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
41849 index 3c5f249..5fac4d0 100644
41850 --- a/drivers/isdn/i4l/isdn_tty.c
41851 +++ b/drivers/isdn/i4l/isdn_tty.c
41852 @@ -1508,9 +1508,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
41853
41854 #ifdef ISDN_DEBUG_MODEM_OPEN
41855 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
41856 - port->count);
41857 + atomic_read(&port->count));
41858 #endif
41859 - port->count++;
41860 + atomic_inc(&port->count);
41861 port->tty = tty;
41862 /*
41863 * Start up serial port
41864 @@ -1554,7 +1554,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
41865 #endif
41866 return;
41867 }
41868 - if ((tty->count == 1) && (port->count != 1)) {
41869 + if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
41870 /*
41871 * Uh, oh. tty->count is 1, which means that the tty
41872 * structure will be freed. Info->count should always
41873 @@ -1563,15 +1563,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
41874 * serial port won't be shutdown.
41875 */
41876 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
41877 - "info->count is %d\n", port->count);
41878 - port->count = 1;
41879 + "info->count is %d\n", atomic_read(&port->count));
41880 + atomic_set(&port->count, 1);
41881 }
41882 - if (--port->count < 0) {
41883 + if (atomic_dec_return(&port->count) < 0) {
41884 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
41885 - info->line, port->count);
41886 - port->count = 0;
41887 + info->line, atomic_read(&port->count));
41888 + atomic_set(&port->count, 0);
41889 }
41890 - if (port->count) {
41891 + if (atomic_read(&port->count)) {
41892 #ifdef ISDN_DEBUG_MODEM_OPEN
41893 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
41894 #endif
41895 @@ -1625,7 +1625,7 @@ isdn_tty_hangup(struct tty_struct *tty)
41896 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
41897 return;
41898 isdn_tty_shutdown(info);
41899 - port->count = 0;
41900 + atomic_set(&port->count, 0);
41901 port->flags &= ~ASYNC_NORMAL_ACTIVE;
41902 port->tty = NULL;
41903 wake_up_interruptible(&port->open_wait);
41904 @@ -1970,7 +1970,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
41905 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
41906 modem_info *info = &dev->mdm.info[i];
41907
41908 - if (info->port.count == 0)
41909 + if (atomic_read(&info->port.count) == 0)
41910 continue;
41911 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
41912 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
41913 diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
41914 index e74df7c..03a03ba 100644
41915 --- a/drivers/isdn/icn/icn.c
41916 +++ b/drivers/isdn/icn/icn.c
41917 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
41918 if (count > len)
41919 count = len;
41920 if (user) {
41921 - if (copy_from_user(msg, buf, count))
41922 + if (count > sizeof msg || copy_from_user(msg, buf, count))
41923 return -EFAULT;
41924 } else
41925 memcpy(msg, buf, count);
41926 diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
41927 index a4f05c5..1433bc5 100644
41928 --- a/drivers/isdn/mISDN/dsp_cmx.c
41929 +++ b/drivers/isdn/mISDN/dsp_cmx.c
41930 @@ -1628,7 +1628,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
41931 static u16 dsp_count; /* last sample count */
41932 static int dsp_count_valid; /* if we have last sample count */
41933
41934 -void
41935 +void __intentional_overflow(-1)
41936 dsp_cmx_send(void *arg)
41937 {
41938 struct dsp_conf *conf;
41939 diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
41940 index d93e245..e7ece6b 100644
41941 --- a/drivers/leds/leds-clevo-mail.c
41942 +++ b/drivers/leds/leds-clevo-mail.c
41943 @@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
41944 * detected as working, but in reality it is not) as low as
41945 * possible.
41946 */
41947 -static struct dmi_system_id clevo_mail_led_dmi_table[] __initdata = {
41948 +static struct dmi_system_id clevo_mail_led_dmi_table[] __initconst = {
41949 {
41950 .callback = clevo_mail_led_dmi_callback,
41951 .ident = "Clevo D410J",
41952 diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
41953 index 5b8f938..b73d657 100644
41954 --- a/drivers/leds/leds-ss4200.c
41955 +++ b/drivers/leds/leds-ss4200.c
41956 @@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
41957 * detected as working, but in reality it is not) as low as
41958 * possible.
41959 */
41960 -static struct dmi_system_id nas_led_whitelist[] __initdata = {
41961 +static struct dmi_system_id nas_led_whitelist[] __initconst = {
41962 {
41963 .callback = ss4200_led_dmi_callback,
41964 .ident = "Intel SS4200-E",
41965 diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
41966 index 0bf1e4e..b4bf44e 100644
41967 --- a/drivers/lguest/core.c
41968 +++ b/drivers/lguest/core.c
41969 @@ -97,9 +97,17 @@ static __init int map_switcher(void)
41970 * The end address needs +1 because __get_vm_area allocates an
41971 * extra guard page, so we need space for that.
41972 */
41973 +
41974 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
41975 + switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
41976 + VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
41977 + + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
41978 +#else
41979 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
41980 VM_ALLOC, switcher_addr, switcher_addr
41981 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
41982 +#endif
41983 +
41984 if (!switcher_vma) {
41985 err = -ENOMEM;
41986 printk("lguest: could not map switcher pages high\n");
41987 @@ -124,7 +132,7 @@ static __init int map_switcher(void)
41988 * Now the Switcher is mapped at the right address, we can't fail!
41989 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
41990 */
41991 - memcpy(switcher_vma->addr, start_switcher_text,
41992 + memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
41993 end_switcher_text - start_switcher_text);
41994
41995 printk(KERN_INFO "lguest: mapped switcher at %p\n",
41996 diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
41997 index bfb39bb..08a603b 100644
41998 --- a/drivers/lguest/page_tables.c
41999 +++ b/drivers/lguest/page_tables.c
42000 @@ -559,7 +559,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
42001 /*:*/
42002
42003 #ifdef CONFIG_X86_PAE
42004 -static void release_pmd(pmd_t *spmd)
42005 +static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
42006 {
42007 /* If the entry's not present, there's nothing to release. */
42008 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
42009 diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
42010 index 5169239..47cb4db 100644
42011 --- a/drivers/lguest/x86/core.c
42012 +++ b/drivers/lguest/x86/core.c
42013 @@ -59,7 +59,7 @@ static struct {
42014 /* Offset from where switcher.S was compiled to where we've copied it */
42015 static unsigned long switcher_offset(void)
42016 {
42017 - return switcher_addr - (unsigned long)start_switcher_text;
42018 + return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
42019 }
42020
42021 /* This cpu's struct lguest_pages (after the Switcher text page) */
42022 @@ -99,7 +99,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
42023 * These copies are pretty cheap, so we do them unconditionally: */
42024 /* Save the current Host top-level page directory.
42025 */
42026 +
42027 +#ifdef CONFIG_PAX_PER_CPU_PGD
42028 + pages->state.host_cr3 = read_cr3();
42029 +#else
42030 pages->state.host_cr3 = __pa(current->mm->pgd);
42031 +#endif
42032 +
42033 /*
42034 * Set up the Guest's page tables to see this CPU's pages (and no
42035 * other CPU's pages).
42036 @@ -475,7 +481,7 @@ void __init lguest_arch_host_init(void)
42037 * compiled-in switcher code and the high-mapped copy we just made.
42038 */
42039 for (i = 0; i < IDT_ENTRIES; i++)
42040 - default_idt_entries[i] += switcher_offset();
42041 + default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
42042
42043 /*
42044 * Set up the Switcher's per-cpu areas.
42045 @@ -558,7 +564,7 @@ void __init lguest_arch_host_init(void)
42046 * it will be undisturbed when we switch. To change %cs and jump we
42047 * need this structure to feed to Intel's "lcall" instruction.
42048 */
42049 - lguest_entry.offset = (long)switch_to_guest + switcher_offset();
42050 + lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
42051 lguest_entry.segment = LGUEST_CS;
42052
42053 /*
42054 diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
42055 index 40634b0..4f5855e 100644
42056 --- a/drivers/lguest/x86/switcher_32.S
42057 +++ b/drivers/lguest/x86/switcher_32.S
42058 @@ -87,6 +87,7 @@
42059 #include <asm/page.h>
42060 #include <asm/segment.h>
42061 #include <asm/lguest.h>
42062 +#include <asm/processor-flags.h>
42063
42064 // We mark the start of the code to copy
42065 // It's placed in .text tho it's never run here
42066 @@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
42067 // Changes type when we load it: damn Intel!
42068 // For after we switch over our page tables
42069 // That entry will be read-only: we'd crash.
42070 +
42071 +#ifdef CONFIG_PAX_KERNEXEC
42072 + mov %cr0, %edx
42073 + xor $X86_CR0_WP, %edx
42074 + mov %edx, %cr0
42075 +#endif
42076 +
42077 movl $(GDT_ENTRY_TSS*8), %edx
42078 ltr %dx
42079
42080 @@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
42081 // Let's clear it again for our return.
42082 // The GDT descriptor of the Host
42083 // Points to the table after two "size" bytes
42084 - movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
42085 + movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
42086 // Clear "used" from type field (byte 5, bit 2)
42087 - andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
42088 + andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
42089 +
42090 +#ifdef CONFIG_PAX_KERNEXEC
42091 + mov %cr0, %eax
42092 + xor $X86_CR0_WP, %eax
42093 + mov %eax, %cr0
42094 +#endif
42095
42096 // Once our page table's switched, the Guest is live!
42097 // The Host fades as we run this final step.
42098 @@ -295,13 +309,12 @@ deliver_to_host:
42099 // I consulted gcc, and it gave
42100 // These instructions, which I gladly credit:
42101 leal (%edx,%ebx,8), %eax
42102 - movzwl (%eax),%edx
42103 - movl 4(%eax), %eax
42104 - xorw %ax, %ax
42105 - orl %eax, %edx
42106 + movl 4(%eax), %edx
42107 + movw (%eax), %dx
42108 // Now the address of the handler's in %edx
42109 // We call it now: its "iret" drops us home.
42110 - jmp *%edx
42111 + ljmp $__KERNEL_CS, $1f
42112 +1: jmp *%edx
42113
42114 // Every interrupt can come to us here
42115 // But we must truly tell each apart.
42116 diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
42117 index 0003992..854bbce 100644
42118 --- a/drivers/md/bcache/closure.h
42119 +++ b/drivers/md/bcache/closure.h
42120 @@ -622,7 +622,7 @@ static inline void closure_wake_up(struct closure_waitlist *list)
42121 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
42122 struct workqueue_struct *wq)
42123 {
42124 - BUG_ON(object_is_on_stack(cl));
42125 + BUG_ON(object_starts_on_stack(cl));
42126 closure_set_ip(cl);
42127 cl->fn = fn;
42128 cl->wq = wq;
42129 diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
42130 index 547c4c5..5be1de4 100644
42131 --- a/drivers/md/bcache/super.c
42132 +++ b/drivers/md/bcache/super.c
42133 @@ -1644,7 +1644,7 @@ err_unlock_gc:
42134 err:
42135 closure_sync(&op.cl);
42136 /* XXX: test this, it's broken */
42137 - bch_cache_set_error(c, err);
42138 + bch_cache_set_error(c, "%s", err);
42139 }
42140
42141 static bool can_attach_cache(struct cache *ca, struct cache_set *c)
42142 diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
42143 index a7fd821..9dcf6c3 100644
42144 --- a/drivers/md/bitmap.c
42145 +++ b/drivers/md/bitmap.c
42146 @@ -1779,7 +1779,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
42147 chunk_kb ? "KB" : "B");
42148 if (bitmap->storage.file) {
42149 seq_printf(seq, ", file: ");
42150 - seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
42151 + seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
42152 }
42153
42154 seq_printf(seq, "\n");
42155 diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
42156 index afe0814..8cf3794 100644
42157 --- a/drivers/md/dm-ioctl.c
42158 +++ b/drivers/md/dm-ioctl.c
42159 @@ -1745,7 +1745,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
42160 cmd == DM_LIST_VERSIONS_CMD)
42161 return 0;
42162
42163 - if ((cmd == DM_DEV_CREATE_CMD)) {
42164 + if (cmd == DM_DEV_CREATE_CMD) {
42165 if (!*param->name) {
42166 DMWARN("name not supplied when creating device");
42167 return -EINVAL;
42168 diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
42169 index 9584443..9fc9ac9 100644
42170 --- a/drivers/md/dm-raid1.c
42171 +++ b/drivers/md/dm-raid1.c
42172 @@ -40,7 +40,7 @@ enum dm_raid1_error {
42173
42174 struct mirror {
42175 struct mirror_set *ms;
42176 - atomic_t error_count;
42177 + atomic_unchecked_t error_count;
42178 unsigned long error_type;
42179 struct dm_dev *dev;
42180 sector_t offset;
42181 @@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
42182 struct mirror *m;
42183
42184 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
42185 - if (!atomic_read(&m->error_count))
42186 + if (!atomic_read_unchecked(&m->error_count))
42187 return m;
42188
42189 return NULL;
42190 @@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
42191 * simple way to tell if a device has encountered
42192 * errors.
42193 */
42194 - atomic_inc(&m->error_count);
42195 + atomic_inc_unchecked(&m->error_count);
42196
42197 if (test_and_set_bit(error_type, &m->error_type))
42198 return;
42199 @@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
42200 struct mirror *m = get_default_mirror(ms);
42201
42202 do {
42203 - if (likely(!atomic_read(&m->error_count)))
42204 + if (likely(!atomic_read_unchecked(&m->error_count)))
42205 return m;
42206
42207 if (m-- == ms->mirror)
42208 @@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
42209 {
42210 struct mirror *default_mirror = get_default_mirror(m->ms);
42211
42212 - return !atomic_read(&default_mirror->error_count);
42213 + return !atomic_read_unchecked(&default_mirror->error_count);
42214 }
42215
42216 static int mirror_available(struct mirror_set *ms, struct bio *bio)
42217 @@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
42218 */
42219 if (likely(region_in_sync(ms, region, 1)))
42220 m = choose_mirror(ms, bio->bi_sector);
42221 - else if (m && atomic_read(&m->error_count))
42222 + else if (m && atomic_read_unchecked(&m->error_count))
42223 m = NULL;
42224
42225 if (likely(m))
42226 @@ -927,7 +927,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
42227 }
42228
42229 ms->mirror[mirror].ms = ms;
42230 - atomic_set(&(ms->mirror[mirror].error_count), 0);
42231 + atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
42232 ms->mirror[mirror].error_type = 0;
42233 ms->mirror[mirror].offset = offset;
42234
42235 @@ -1339,7 +1339,7 @@ static void mirror_resume(struct dm_target *ti)
42236 */
42237 static char device_status_char(struct mirror *m)
42238 {
42239 - if (!atomic_read(&(m->error_count)))
42240 + if (!atomic_read_unchecked(&(m->error_count)))
42241 return 'A';
42242
42243 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
42244 diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
42245 index 28a9012..9c0f6a5 100644
42246 --- a/drivers/md/dm-stats.c
42247 +++ b/drivers/md/dm-stats.c
42248 @@ -382,7 +382,7 @@ do_sync_free:
42249 synchronize_rcu_expedited();
42250 dm_stat_free(&s->rcu_head);
42251 } else {
42252 - ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
42253 + ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
42254 call_rcu(&s->rcu_head, dm_stat_free);
42255 }
42256 return 0;
42257 @@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
42258 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
42259 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
42260 ));
42261 - ACCESS_ONCE(last->last_sector) = end_sector;
42262 - ACCESS_ONCE(last->last_rw) = bi_rw;
42263 + ACCESS_ONCE_RW(last->last_sector) = end_sector;
42264 + ACCESS_ONCE_RW(last->last_rw) = bi_rw;
42265 }
42266
42267 rcu_read_lock();
42268 diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
42269 index 73c1712..7347292 100644
42270 --- a/drivers/md/dm-stripe.c
42271 +++ b/drivers/md/dm-stripe.c
42272 @@ -21,7 +21,7 @@ struct stripe {
42273 struct dm_dev *dev;
42274 sector_t physical_start;
42275
42276 - atomic_t error_count;
42277 + atomic_unchecked_t error_count;
42278 };
42279
42280 struct stripe_c {
42281 @@ -186,7 +186,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
42282 kfree(sc);
42283 return r;
42284 }
42285 - atomic_set(&(sc->stripe[i].error_count), 0);
42286 + atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
42287 }
42288
42289 ti->private = sc;
42290 @@ -327,7 +327,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
42291 DMEMIT("%d ", sc->stripes);
42292 for (i = 0; i < sc->stripes; i++) {
42293 DMEMIT("%s ", sc->stripe[i].dev->name);
42294 - buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
42295 + buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
42296 'D' : 'A';
42297 }
42298 buffer[i] = '\0';
42299 @@ -372,8 +372,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
42300 */
42301 for (i = 0; i < sc->stripes; i++)
42302 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
42303 - atomic_inc(&(sc->stripe[i].error_count));
42304 - if (atomic_read(&(sc->stripe[i].error_count)) <
42305 + atomic_inc_unchecked(&(sc->stripe[i].error_count));
42306 + if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
42307 DM_IO_ERROR_THRESHOLD)
42308 schedule_work(&sc->trigger_event);
42309 }
42310 diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
42311 index 20a8cc0..5447b11 100644
42312 --- a/drivers/md/dm-table.c
42313 +++ b/drivers/md/dm-table.c
42314 @@ -291,7 +291,7 @@ static struct dm_dev_internal *find_device(struct list_head *l, dev_t dev)
42315 static int open_dev(struct dm_dev_internal *d, dev_t dev,
42316 struct mapped_device *md)
42317 {
42318 - static char *_claim_ptr = "I belong to device-mapper";
42319 + static char _claim_ptr[] = "I belong to device-mapper";
42320 struct block_device *bdev;
42321
42322 int r;
42323 @@ -359,7 +359,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
42324 if (!dev_size)
42325 return 0;
42326
42327 - if ((start >= dev_size) || (start + len > dev_size)) {
42328 + if ((start >= dev_size) || (len > dev_size - start)) {
42329 DMWARN("%s: %s too small for target: "
42330 "start=%llu, len=%llu, dev_size=%llu",
42331 dm_device_name(ti->table->md), bdevname(bdev, b),
42332 diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
42333 index 8a30ad5..72792d3 100644
42334 --- a/drivers/md/dm-thin-metadata.c
42335 +++ b/drivers/md/dm-thin-metadata.c
42336 @@ -397,7 +397,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
42337 {
42338 pmd->info.tm = pmd->tm;
42339 pmd->info.levels = 2;
42340 - pmd->info.value_type.context = pmd->data_sm;
42341 + pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
42342 pmd->info.value_type.size = sizeof(__le64);
42343 pmd->info.value_type.inc = data_block_inc;
42344 pmd->info.value_type.dec = data_block_dec;
42345 @@ -416,7 +416,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
42346
42347 pmd->bl_info.tm = pmd->tm;
42348 pmd->bl_info.levels = 1;
42349 - pmd->bl_info.value_type.context = pmd->data_sm;
42350 + pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
42351 pmd->bl_info.value_type.size = sizeof(__le64);
42352 pmd->bl_info.value_type.inc = data_block_inc;
42353 pmd->bl_info.value_type.dec = data_block_dec;
42354 diff --git a/drivers/md/dm.c b/drivers/md/dm.c
42355 index b3e26c7..1efca94 100644
42356 --- a/drivers/md/dm.c
42357 +++ b/drivers/md/dm.c
42358 @@ -179,9 +179,9 @@ struct mapped_device {
42359 /*
42360 * Event handling.
42361 */
42362 - atomic_t event_nr;
42363 + atomic_unchecked_t event_nr;
42364 wait_queue_head_t eventq;
42365 - atomic_t uevent_seq;
42366 + atomic_unchecked_t uevent_seq;
42367 struct list_head uevent_list;
42368 spinlock_t uevent_lock; /* Protect access to uevent_list */
42369
42370 @@ -1985,8 +1985,8 @@ static struct mapped_device *alloc_dev(int minor)
42371 spin_lock_init(&md->deferred_lock);
42372 atomic_set(&md->holders, 1);
42373 atomic_set(&md->open_count, 0);
42374 - atomic_set(&md->event_nr, 0);
42375 - atomic_set(&md->uevent_seq, 0);
42376 + atomic_set_unchecked(&md->event_nr, 0);
42377 + atomic_set_unchecked(&md->uevent_seq, 0);
42378 INIT_LIST_HEAD(&md->uevent_list);
42379 spin_lock_init(&md->uevent_lock);
42380
42381 @@ -2139,7 +2139,7 @@ static void event_callback(void *context)
42382
42383 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
42384
42385 - atomic_inc(&md->event_nr);
42386 + atomic_inc_unchecked(&md->event_nr);
42387 wake_up(&md->eventq);
42388 }
42389
42390 @@ -2832,18 +2832,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
42391
42392 uint32_t dm_next_uevent_seq(struct mapped_device *md)
42393 {
42394 - return atomic_add_return(1, &md->uevent_seq);
42395 + return atomic_add_return_unchecked(1, &md->uevent_seq);
42396 }
42397
42398 uint32_t dm_get_event_nr(struct mapped_device *md)
42399 {
42400 - return atomic_read(&md->event_nr);
42401 + return atomic_read_unchecked(&md->event_nr);
42402 }
42403
42404 int dm_wait_event(struct mapped_device *md, int event_nr)
42405 {
42406 return wait_event_interruptible(md->eventq,
42407 - (event_nr != atomic_read(&md->event_nr)));
42408 + (event_nr != atomic_read_unchecked(&md->event_nr)));
42409 }
42410
42411 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
42412 diff --git a/drivers/md/md.c b/drivers/md/md.c
42413 index ba46d97..f8f5019 100644
42414 --- a/drivers/md/md.c
42415 +++ b/drivers/md/md.c
42416 @@ -234,10 +234,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
42417 * start build, activate spare
42418 */
42419 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
42420 -static atomic_t md_event_count;
42421 +static atomic_unchecked_t md_event_count;
42422 void md_new_event(struct mddev *mddev)
42423 {
42424 - atomic_inc(&md_event_count);
42425 + atomic_inc_unchecked(&md_event_count);
42426 wake_up(&md_event_waiters);
42427 }
42428 EXPORT_SYMBOL_GPL(md_new_event);
42429 @@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
42430 */
42431 static void md_new_event_inintr(struct mddev *mddev)
42432 {
42433 - atomic_inc(&md_event_count);
42434 + atomic_inc_unchecked(&md_event_count);
42435 wake_up(&md_event_waiters);
42436 }
42437
42438 @@ -1502,7 +1502,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
42439 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
42440 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
42441 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
42442 - atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
42443 + atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
42444
42445 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
42446 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
42447 @@ -1746,7 +1746,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
42448 else
42449 sb->resync_offset = cpu_to_le64(0);
42450
42451 - sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
42452 + sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
42453
42454 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
42455 sb->size = cpu_to_le64(mddev->dev_sectors);
42456 @@ -2751,7 +2751,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
42457 static ssize_t
42458 errors_show(struct md_rdev *rdev, char *page)
42459 {
42460 - return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
42461 + return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
42462 }
42463
42464 static ssize_t
42465 @@ -2760,7 +2760,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
42466 char *e;
42467 unsigned long n = simple_strtoul(buf, &e, 10);
42468 if (*buf && (*e == 0 || *e == '\n')) {
42469 - atomic_set(&rdev->corrected_errors, n);
42470 + atomic_set_unchecked(&rdev->corrected_errors, n);
42471 return len;
42472 }
42473 return -EINVAL;
42474 @@ -3208,8 +3208,8 @@ int md_rdev_init(struct md_rdev *rdev)
42475 rdev->sb_loaded = 0;
42476 rdev->bb_page = NULL;
42477 atomic_set(&rdev->nr_pending, 0);
42478 - atomic_set(&rdev->read_errors, 0);
42479 - atomic_set(&rdev->corrected_errors, 0);
42480 + atomic_set_unchecked(&rdev->read_errors, 0);
42481 + atomic_set_unchecked(&rdev->corrected_errors, 0);
42482
42483 INIT_LIST_HEAD(&rdev->same_set);
42484 init_waitqueue_head(&rdev->blocked_wait);
42485 @@ -7043,7 +7043,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
42486
42487 spin_unlock(&pers_lock);
42488 seq_printf(seq, "\n");
42489 - seq->poll_event = atomic_read(&md_event_count);
42490 + seq->poll_event = atomic_read_unchecked(&md_event_count);
42491 return 0;
42492 }
42493 if (v == (void*)2) {
42494 @@ -7146,7 +7146,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
42495 return error;
42496
42497 seq = file->private_data;
42498 - seq->poll_event = atomic_read(&md_event_count);
42499 + seq->poll_event = atomic_read_unchecked(&md_event_count);
42500 return error;
42501 }
42502
42503 @@ -7160,7 +7160,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
42504 /* always allow read */
42505 mask = POLLIN | POLLRDNORM;
42506
42507 - if (seq->poll_event != atomic_read(&md_event_count))
42508 + if (seq->poll_event != atomic_read_unchecked(&md_event_count))
42509 mask |= POLLERR | POLLPRI;
42510 return mask;
42511 }
42512 @@ -7204,7 +7204,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
42513 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
42514 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
42515 (int)part_stat_read(&disk->part0, sectors[1]) -
42516 - atomic_read(&disk->sync_io);
42517 + atomic_read_unchecked(&disk->sync_io);
42518 /* sync IO will cause sync_io to increase before the disk_stats
42519 * as sync_io is counted when a request starts, and
42520 * disk_stats is counted when it completes.
42521 diff --git a/drivers/md/md.h b/drivers/md/md.h
42522 index 608050c..6e77db5d 100644
42523 --- a/drivers/md/md.h
42524 +++ b/drivers/md/md.h
42525 @@ -94,13 +94,13 @@ struct md_rdev {
42526 * only maintained for arrays that
42527 * support hot removal
42528 */
42529 - atomic_t read_errors; /* number of consecutive read errors that
42530 + atomic_unchecked_t read_errors; /* number of consecutive read errors that
42531 * we have tried to ignore.
42532 */
42533 struct timespec last_read_error; /* monotonic time since our
42534 * last read error
42535 */
42536 - atomic_t corrected_errors; /* number of corrected read errors,
42537 + atomic_unchecked_t corrected_errors; /* number of corrected read errors,
42538 * for reporting to userspace and storing
42539 * in superblock.
42540 */
42541 @@ -446,7 +446,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
42542
42543 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
42544 {
42545 - atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
42546 + atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
42547 }
42548
42549 struct md_personality
42550 diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
42551 index 3e6d115..ffecdeb 100644
42552 --- a/drivers/md/persistent-data/dm-space-map.h
42553 +++ b/drivers/md/persistent-data/dm-space-map.h
42554 @@ -71,6 +71,7 @@ struct dm_space_map {
42555 dm_sm_threshold_fn fn,
42556 void *context);
42557 };
42558 +typedef struct dm_space_map __no_const dm_space_map_no_const;
42559
42560 /*----------------------------------------------------------------*/
42561
42562 diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
42563 index aacf6bf..67d63f2 100644
42564 --- a/drivers/md/raid1.c
42565 +++ b/drivers/md/raid1.c
42566 @@ -1824,7 +1824,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
42567 if (r1_sync_page_io(rdev, sect, s,
42568 bio->bi_io_vec[idx].bv_page,
42569 READ) != 0)
42570 - atomic_add(s, &rdev->corrected_errors);
42571 + atomic_add_unchecked(s, &rdev->corrected_errors);
42572 }
42573 sectors -= s;
42574 sect += s;
42575 @@ -2051,7 +2051,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
42576 test_bit(In_sync, &rdev->flags)) {
42577 if (r1_sync_page_io(rdev, sect, s,
42578 conf->tmppage, READ)) {
42579 - atomic_add(s, &rdev->corrected_errors);
42580 + atomic_add_unchecked(s, &rdev->corrected_errors);
42581 printk(KERN_INFO
42582 "md/raid1:%s: read error corrected "
42583 "(%d sectors at %llu on %s)\n",
42584 diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
42585 index 73dc8a3..bdd515a 100644
42586 --- a/drivers/md/raid10.c
42587 +++ b/drivers/md/raid10.c
42588 @@ -1963,7 +1963,7 @@ static void end_sync_read(struct bio *bio, int error)
42589 /* The write handler will notice the lack of
42590 * R10BIO_Uptodate and record any errors etc
42591 */
42592 - atomic_add(r10_bio->sectors,
42593 + atomic_add_unchecked(r10_bio->sectors,
42594 &conf->mirrors[d].rdev->corrected_errors);
42595
42596 /* for reconstruct, we always reschedule after a read.
42597 @@ -2321,7 +2321,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
42598 {
42599 struct timespec cur_time_mon;
42600 unsigned long hours_since_last;
42601 - unsigned int read_errors = atomic_read(&rdev->read_errors);
42602 + unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
42603
42604 ktime_get_ts(&cur_time_mon);
42605
42606 @@ -2343,9 +2343,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
42607 * overflowing the shift of read_errors by hours_since_last.
42608 */
42609 if (hours_since_last >= 8 * sizeof(read_errors))
42610 - atomic_set(&rdev->read_errors, 0);
42611 + atomic_set_unchecked(&rdev->read_errors, 0);
42612 else
42613 - atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
42614 + atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
42615 }
42616
42617 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
42618 @@ -2399,8 +2399,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
42619 return;
42620
42621 check_decay_read_errors(mddev, rdev);
42622 - atomic_inc(&rdev->read_errors);
42623 - if (atomic_read(&rdev->read_errors) > max_read_errors) {
42624 + atomic_inc_unchecked(&rdev->read_errors);
42625 + if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
42626 char b[BDEVNAME_SIZE];
42627 bdevname(rdev->bdev, b);
42628
42629 @@ -2408,7 +2408,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
42630 "md/raid10:%s: %s: Raid device exceeded "
42631 "read_error threshold [cur %d:max %d]\n",
42632 mdname(mddev), b,
42633 - atomic_read(&rdev->read_errors), max_read_errors);
42634 + atomic_read_unchecked(&rdev->read_errors), max_read_errors);
42635 printk(KERN_NOTICE
42636 "md/raid10:%s: %s: Failing raid device\n",
42637 mdname(mddev), b);
42638 @@ -2563,7 +2563,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
42639 sect +
42640 choose_data_offset(r10_bio, rdev)),
42641 bdevname(rdev->bdev, b));
42642 - atomic_add(s, &rdev->corrected_errors);
42643 + atomic_add_unchecked(s, &rdev->corrected_errors);
42644 }
42645
42646 rdev_dec_pending(rdev, mddev);
42647 diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
42648 index 8a0665d..984c46d 100644
42649 --- a/drivers/md/raid5.c
42650 +++ b/drivers/md/raid5.c
42651 @@ -1887,21 +1887,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
42652 mdname(conf->mddev), STRIPE_SECTORS,
42653 (unsigned long long)s,
42654 bdevname(rdev->bdev, b));
42655 - atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
42656 + atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
42657 clear_bit(R5_ReadError, &sh->dev[i].flags);
42658 clear_bit(R5_ReWrite, &sh->dev[i].flags);
42659 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
42660 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
42661
42662 - if (atomic_read(&rdev->read_errors))
42663 - atomic_set(&rdev->read_errors, 0);
42664 + if (atomic_read_unchecked(&rdev->read_errors))
42665 + atomic_set_unchecked(&rdev->read_errors, 0);
42666 } else {
42667 const char *bdn = bdevname(rdev->bdev, b);
42668 int retry = 0;
42669 int set_bad = 0;
42670
42671 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
42672 - atomic_inc(&rdev->read_errors);
42673 + atomic_inc_unchecked(&rdev->read_errors);
42674 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
42675 printk_ratelimited(
42676 KERN_WARNING
42677 @@ -1929,7 +1929,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
42678 mdname(conf->mddev),
42679 (unsigned long long)s,
42680 bdn);
42681 - } else if (atomic_read(&rdev->read_errors)
42682 + } else if (atomic_read_unchecked(&rdev->read_errors)
42683 > conf->max_nr_stripes)
42684 printk(KERN_WARNING
42685 "md/raid:%s: Too many read errors, failing device %s.\n",
42686 diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
42687 index 401ef64..836e563 100644
42688 --- a/drivers/media/dvb-core/dvbdev.c
42689 +++ b/drivers/media/dvb-core/dvbdev.c
42690 @@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
42691 const struct dvb_device *template, void *priv, int type)
42692 {
42693 struct dvb_device *dvbdev;
42694 - struct file_operations *dvbdevfops;
42695 + file_operations_no_const *dvbdevfops;
42696 struct device *clsdev;
42697 int minor;
42698 int id;
42699 diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
42700 index 9b6c3bb..baeb5c7 100644
42701 --- a/drivers/media/dvb-frontends/dib3000.h
42702 +++ b/drivers/media/dvb-frontends/dib3000.h
42703 @@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
42704 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
42705 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
42706 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
42707 -};
42708 +} __no_const;
42709
42710 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
42711 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
42712 diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
42713 index ecf21d9..b992428d 100644
42714 --- a/drivers/media/pci/cx88/cx88-video.c
42715 +++ b/drivers/media/pci/cx88/cx88-video.c
42716 @@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
42717
42718 /* ------------------------------------------------------------------ */
42719
42720 -static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
42721 -static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
42722 -static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
42723 +static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
42724 +static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
42725 +static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
42726
42727 module_param_array(video_nr, int, NULL, 0444);
42728 module_param_array(vbi_nr, int, NULL, 0444);
42729 diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
42730 index c08ae3e..eb59af1 100644
42731 --- a/drivers/media/pci/ivtv/ivtv-driver.c
42732 +++ b/drivers/media/pci/ivtv/ivtv-driver.c
42733 @@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
42734 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
42735
42736 /* ivtv instance counter */
42737 -static atomic_t ivtv_instance = ATOMIC_INIT(0);
42738 +static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
42739
42740 /* Parameter declarations */
42741 static int cardtype[IVTV_MAX_CARDS];
42742 diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
42743 index dfd0a21..6bbb465 100644
42744 --- a/drivers/media/platform/omap/omap_vout.c
42745 +++ b/drivers/media/platform/omap/omap_vout.c
42746 @@ -63,7 +63,6 @@ enum omap_vout_channels {
42747 OMAP_VIDEO2,
42748 };
42749
42750 -static struct videobuf_queue_ops video_vbq_ops;
42751 /* Variables configurable through module params*/
42752 static u32 video1_numbuffers = 3;
42753 static u32 video2_numbuffers = 3;
42754 @@ -1014,6 +1013,12 @@ static int omap_vout_open(struct file *file)
42755 {
42756 struct videobuf_queue *q;
42757 struct omap_vout_device *vout = NULL;
42758 + static struct videobuf_queue_ops video_vbq_ops = {
42759 + .buf_setup = omap_vout_buffer_setup,
42760 + .buf_prepare = omap_vout_buffer_prepare,
42761 + .buf_release = omap_vout_buffer_release,
42762 + .buf_queue = omap_vout_buffer_queue,
42763 + };
42764
42765 vout = video_drvdata(file);
42766 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
42767 @@ -1031,10 +1036,6 @@ static int omap_vout_open(struct file *file)
42768 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
42769
42770 q = &vout->vbq;
42771 - video_vbq_ops.buf_setup = omap_vout_buffer_setup;
42772 - video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
42773 - video_vbq_ops.buf_release = omap_vout_buffer_release;
42774 - video_vbq_ops.buf_queue = omap_vout_buffer_queue;
42775 spin_lock_init(&vout->vbq_lock);
42776
42777 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
42778 diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
42779 index 04e6490..2df65bf 100644
42780 --- a/drivers/media/platform/s5p-tv/mixer.h
42781 +++ b/drivers/media/platform/s5p-tv/mixer.h
42782 @@ -156,7 +156,7 @@ struct mxr_layer {
42783 /** layer index (unique identifier) */
42784 int idx;
42785 /** callbacks for layer methods */
42786 - struct mxr_layer_ops ops;
42787 + struct mxr_layer_ops *ops;
42788 /** format array */
42789 const struct mxr_format **fmt_array;
42790 /** size of format array */
42791 diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
42792 index b93a21f..2535195 100644
42793 --- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
42794 +++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
42795 @@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
42796 {
42797 struct mxr_layer *layer;
42798 int ret;
42799 - struct mxr_layer_ops ops = {
42800 + static struct mxr_layer_ops ops = {
42801 .release = mxr_graph_layer_release,
42802 .buffer_set = mxr_graph_buffer_set,
42803 .stream_set = mxr_graph_stream_set,
42804 diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
42805 index b713403..53cb5ad 100644
42806 --- a/drivers/media/platform/s5p-tv/mixer_reg.c
42807 +++ b/drivers/media/platform/s5p-tv/mixer_reg.c
42808 @@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
42809 layer->update_buf = next;
42810 }
42811
42812 - layer->ops.buffer_set(layer, layer->update_buf);
42813 + layer->ops->buffer_set(layer, layer->update_buf);
42814
42815 if (done && done != layer->shadow_buf)
42816 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
42817 diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
42818 index 641b1f0..49cff30 100644
42819 --- a/drivers/media/platform/s5p-tv/mixer_video.c
42820 +++ b/drivers/media/platform/s5p-tv/mixer_video.c
42821 @@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
42822 layer->geo.src.height = layer->geo.src.full_height;
42823
42824 mxr_geometry_dump(mdev, &layer->geo);
42825 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
42826 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
42827 mxr_geometry_dump(mdev, &layer->geo);
42828 }
42829
42830 @@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
42831 layer->geo.dst.full_width = mbus_fmt.width;
42832 layer->geo.dst.full_height = mbus_fmt.height;
42833 layer->geo.dst.field = mbus_fmt.field;
42834 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
42835 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
42836
42837 mxr_geometry_dump(mdev, &layer->geo);
42838 }
42839 @@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
42840 /* set source size to highest accepted value */
42841 geo->src.full_width = max(geo->dst.full_width, pix->width);
42842 geo->src.full_height = max(geo->dst.full_height, pix->height);
42843 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
42844 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
42845 mxr_geometry_dump(mdev, &layer->geo);
42846 /* set cropping to total visible screen */
42847 geo->src.width = pix->width;
42848 @@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
42849 geo->src.x_offset = 0;
42850 geo->src.y_offset = 0;
42851 /* assure consistency of geometry */
42852 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
42853 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
42854 mxr_geometry_dump(mdev, &layer->geo);
42855 /* set full size to lowest possible value */
42856 geo->src.full_width = 0;
42857 geo->src.full_height = 0;
42858 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
42859 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
42860 mxr_geometry_dump(mdev, &layer->geo);
42861
42862 /* returning results */
42863 @@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
42864 target->width = s->r.width;
42865 target->height = s->r.height;
42866
42867 - layer->ops.fix_geometry(layer, stage, s->flags);
42868 + layer->ops->fix_geometry(layer, stage, s->flags);
42869
42870 /* retrieve update selection rectangle */
42871 res.left = target->x_offset;
42872 @@ -955,13 +955,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
42873 mxr_output_get(mdev);
42874
42875 mxr_layer_update_output(layer);
42876 - layer->ops.format_set(layer);
42877 + layer->ops->format_set(layer);
42878 /* enabling layer in hardware */
42879 spin_lock_irqsave(&layer->enq_slock, flags);
42880 layer->state = MXR_LAYER_STREAMING;
42881 spin_unlock_irqrestore(&layer->enq_slock, flags);
42882
42883 - layer->ops.stream_set(layer, MXR_ENABLE);
42884 + layer->ops->stream_set(layer, MXR_ENABLE);
42885 mxr_streamer_get(mdev);
42886
42887 return 0;
42888 @@ -1031,7 +1031,7 @@ static int stop_streaming(struct vb2_queue *vq)
42889 spin_unlock_irqrestore(&layer->enq_slock, flags);
42890
42891 /* disabling layer in hardware */
42892 - layer->ops.stream_set(layer, MXR_DISABLE);
42893 + layer->ops->stream_set(layer, MXR_DISABLE);
42894 /* remove one streamer */
42895 mxr_streamer_put(mdev);
42896 /* allow changes in output configuration */
42897 @@ -1070,8 +1070,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
42898
42899 void mxr_layer_release(struct mxr_layer *layer)
42900 {
42901 - if (layer->ops.release)
42902 - layer->ops.release(layer);
42903 + if (layer->ops->release)
42904 + layer->ops->release(layer);
42905 }
42906
42907 void mxr_base_layer_release(struct mxr_layer *layer)
42908 @@ -1097,7 +1097,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
42909
42910 layer->mdev = mdev;
42911 layer->idx = idx;
42912 - layer->ops = *ops;
42913 + layer->ops = ops;
42914
42915 spin_lock_init(&layer->enq_slock);
42916 INIT_LIST_HEAD(&layer->enq_list);
42917 diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
42918 index 3d13a63..da31bf1 100644
42919 --- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
42920 +++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
42921 @@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
42922 {
42923 struct mxr_layer *layer;
42924 int ret;
42925 - struct mxr_layer_ops ops = {
42926 + static struct mxr_layer_ops ops = {
42927 .release = mxr_vp_layer_release,
42928 .buffer_set = mxr_vp_buffer_set,
42929 .stream_set = mxr_vp_stream_set,
42930 diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
42931 index 545c04c..a14bded 100644
42932 --- a/drivers/media/radio/radio-cadet.c
42933 +++ b/drivers/media/radio/radio-cadet.c
42934 @@ -324,6 +324,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
42935 unsigned char readbuf[RDS_BUFFER];
42936 int i = 0;
42937
42938 + if (count > RDS_BUFFER)
42939 + return -EFAULT;
42940 mutex_lock(&dev->lock);
42941 if (dev->rdsstat == 0)
42942 cadet_start_rds(dev);
42943 @@ -339,7 +341,7 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
42944 while (i < count && dev->rdsin != dev->rdsout)
42945 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
42946
42947 - if (i && copy_to_user(data, readbuf, i))
42948 + if (i > sizeof(readbuf) || copy_to_user(data, readbuf, i))
42949 i = -EFAULT;
42950 unlock:
42951 mutex_unlock(&dev->lock);
42952 diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
42953 index 5236035..c622c74 100644
42954 --- a/drivers/media/radio/radio-maxiradio.c
42955 +++ b/drivers/media/radio/radio-maxiradio.c
42956 @@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
42957 /* TEA5757 pin mappings */
42958 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
42959
42960 -static atomic_t maxiradio_instance = ATOMIC_INIT(0);
42961 +static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
42962
42963 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
42964 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
42965 diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
42966 index b914772..7ddbf9b 100644
42967 --- a/drivers/media/radio/radio-shark.c
42968 +++ b/drivers/media/radio/radio-shark.c
42969 @@ -79,7 +79,7 @@ struct shark_device {
42970 u32 last_val;
42971 };
42972
42973 -static atomic_t shark_instance = ATOMIC_INIT(0);
42974 +static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
42975
42976 static void shark_write_val(struct snd_tea575x *tea, u32 val)
42977 {
42978 diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
42979 index 9fb6697..f167415 100644
42980 --- a/drivers/media/radio/radio-shark2.c
42981 +++ b/drivers/media/radio/radio-shark2.c
42982 @@ -74,7 +74,7 @@ struct shark_device {
42983 u8 *transfer_buffer;
42984 };
42985
42986 -static atomic_t shark_instance = ATOMIC_INIT(0);
42987 +static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
42988
42989 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
42990 {
42991 diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
42992 index 9c9084c..a9e8dfb 100644
42993 --- a/drivers/media/radio/radio-si476x.c
42994 +++ b/drivers/media/radio/radio-si476x.c
42995 @@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
42996 struct si476x_radio *radio;
42997 struct v4l2_ctrl *ctrl;
42998
42999 - static atomic_t instance = ATOMIC_INIT(0);
43000 + static atomic_unchecked_t instance = ATOMIC_INIT(0);
43001
43002 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
43003 if (!radio)
43004 diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
43005 index 46da365..3ba4206 100644
43006 --- a/drivers/media/rc/rc-main.c
43007 +++ b/drivers/media/rc/rc-main.c
43008 @@ -1065,7 +1065,7 @@ EXPORT_SYMBOL_GPL(rc_free_device);
43009 int rc_register_device(struct rc_dev *dev)
43010 {
43011 static bool raw_init = false; /* raw decoders loaded? */
43012 - static atomic_t devno = ATOMIC_INIT(0);
43013 + static atomic_unchecked_t devno = ATOMIC_INIT(0);
43014 struct rc_map *rc_map;
43015 const char *path;
43016 int rc;
43017 @@ -1096,7 +1096,7 @@ int rc_register_device(struct rc_dev *dev)
43018 */
43019 mutex_lock(&dev->lock);
43020
43021 - dev->devno = (unsigned long)(atomic_inc_return(&devno) - 1);
43022 + dev->devno = (unsigned long)(atomic_inc_return_unchecked(&devno) - 1);
43023 dev_set_name(&dev->dev, "rc%ld", dev->devno);
43024 dev_set_drvdata(&dev->dev, dev);
43025 rc = device_add(&dev->dev);
43026 diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
43027 index 20e345d..da56fe4 100644
43028 --- a/drivers/media/usb/dvb-usb/cxusb.c
43029 +++ b/drivers/media/usb/dvb-usb/cxusb.c
43030 @@ -1101,7 +1101,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
43031
43032 struct dib0700_adapter_state {
43033 int (*set_param_save) (struct dvb_frontend *);
43034 -};
43035 +} __no_const;
43036
43037 static int dib7070_set_param_override(struct dvb_frontend *fe)
43038 {
43039 diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
43040 index 71b22f5..a63b33f 100644
43041 --- a/drivers/media/usb/dvb-usb/dw2102.c
43042 +++ b/drivers/media/usb/dvb-usb/dw2102.c
43043 @@ -121,7 +121,7 @@ struct su3000_state {
43044
43045 struct s6x0_state {
43046 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
43047 -};
43048 +} __no_const;
43049
43050 /* debug */
43051 static int dvb_usb_dw2102_debug;
43052 diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
43053 index 8f7a6a4..59502dd 100644
43054 --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
43055 +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
43056 @@ -326,7 +326,7 @@ struct v4l2_buffer32 {
43057 __u32 reserved;
43058 };
43059
43060 -static int get_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
43061 +static int get_v4l2_plane32(struct v4l2_plane __user *up, struct v4l2_plane32 __user *up32,
43062 enum v4l2_memory memory)
43063 {
43064 void __user *up_pln;
43065 @@ -355,7 +355,7 @@ static int get_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
43066 return 0;
43067 }
43068
43069 -static int put_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
43070 +static int put_v4l2_plane32(struct v4l2_plane __user *up, struct v4l2_plane32 __user *up32,
43071 enum v4l2_memory memory)
43072 {
43073 if (copy_in_user(up32, up, 2 * sizeof(__u32)) ||
43074 @@ -772,7 +772,7 @@ static int put_v4l2_subdev_edid32(struct v4l2_subdev_edid *kp, struct v4l2_subde
43075 put_user(kp->start_block, &up->start_block) ||
43076 put_user(kp->blocks, &up->blocks) ||
43077 put_user(tmp, &up->edid) ||
43078 - copy_to_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
43079 + copy_to_user(up->reserved, kp->reserved, sizeof(kp->reserved)))
43080 return -EFAULT;
43081 return 0;
43082 }
43083 diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
43084 index 02d1b63..5fd6b16 100644
43085 --- a/drivers/media/v4l2-core/v4l2-device.c
43086 +++ b/drivers/media/v4l2-core/v4l2-device.c
43087 @@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
43088 EXPORT_SYMBOL_GPL(v4l2_device_put);
43089
43090 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
43091 - atomic_t *instance)
43092 + atomic_unchecked_t *instance)
43093 {
43094 - int num = atomic_inc_return(instance) - 1;
43095 + int num = atomic_inc_return_unchecked(instance) - 1;
43096 int len = strlen(basename);
43097
43098 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
43099 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
43100 index 68e6b5e..d8b923e 100644
43101 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
43102 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
43103 @@ -1939,7 +1939,8 @@ struct v4l2_ioctl_info {
43104 struct file *file, void *fh, void *p);
43105 } u;
43106 void (*debug)(const void *arg, bool write_only);
43107 -};
43108 +} __do_const;
43109 +typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
43110
43111 /* This control needs a priority check */
43112 #define INFO_FL_PRIO (1 << 0)
43113 @@ -2120,7 +2121,7 @@ static long __video_do_ioctl(struct file *file,
43114 struct video_device *vfd = video_devdata(file);
43115 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
43116 bool write_only = false;
43117 - struct v4l2_ioctl_info default_info;
43118 + v4l2_ioctl_info_no_const default_info;
43119 const struct v4l2_ioctl_info *info;
43120 void *fh = file->private_data;
43121 struct v4l2_fh *vfh = NULL;
43122 @@ -2194,7 +2195,7 @@ done:
43123 }
43124
43125 static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
43126 - void * __user *user_ptr, void ***kernel_ptr)
43127 + void __user **user_ptr, void ***kernel_ptr)
43128 {
43129 int ret = 0;
43130
43131 @@ -2210,7 +2211,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
43132 ret = -EINVAL;
43133 break;
43134 }
43135 - *user_ptr = (void __user *)buf->m.planes;
43136 + *user_ptr = (void __force_user *)buf->m.planes;
43137 *kernel_ptr = (void *)&buf->m.planes;
43138 *array_size = sizeof(struct v4l2_plane) * buf->length;
43139 ret = 1;
43140 @@ -2245,7 +2246,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
43141 ret = -EINVAL;
43142 break;
43143 }
43144 - *user_ptr = (void __user *)ctrls->controls;
43145 + *user_ptr = (void __force_user *)ctrls->controls;
43146 *kernel_ptr = (void *)&ctrls->controls;
43147 *array_size = sizeof(struct v4l2_ext_control)
43148 * ctrls->count;
43149 diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
43150 index 767ff4d..c69d259 100644
43151 --- a/drivers/message/fusion/mptbase.c
43152 +++ b/drivers/message/fusion/mptbase.c
43153 @@ -6755,8 +6755,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
43154 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
43155 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
43156
43157 +#ifdef CONFIG_GRKERNSEC_HIDESYM
43158 + seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
43159 +#else
43160 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
43161 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
43162 +#endif
43163 +
43164 /*
43165 * Rounding UP to nearest 4-kB boundary here...
43166 */
43167 @@ -6769,7 +6774,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
43168 ioc->facts.GlobalCredits);
43169
43170 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
43171 +#ifdef CONFIG_GRKERNSEC_HIDESYM
43172 + NULL, NULL);
43173 +#else
43174 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
43175 +#endif
43176 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
43177 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
43178 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
43179 diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
43180 index dd239bd..689c4f7 100644
43181 --- a/drivers/message/fusion/mptsas.c
43182 +++ b/drivers/message/fusion/mptsas.c
43183 @@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
43184 return 0;
43185 }
43186
43187 +static inline void
43188 +mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
43189 +{
43190 + if (phy_info->port_details) {
43191 + phy_info->port_details->rphy = rphy;
43192 + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
43193 + ioc->name, rphy));
43194 + }
43195 +
43196 + if (rphy) {
43197 + dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
43198 + &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
43199 + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
43200 + ioc->name, rphy, rphy->dev.release));
43201 + }
43202 +}
43203 +
43204 /* no mutex */
43205 static void
43206 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
43207 @@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
43208 return NULL;
43209 }
43210
43211 -static inline void
43212 -mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
43213 -{
43214 - if (phy_info->port_details) {
43215 - phy_info->port_details->rphy = rphy;
43216 - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
43217 - ioc->name, rphy));
43218 - }
43219 -
43220 - if (rphy) {
43221 - dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
43222 - &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
43223 - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
43224 - ioc->name, rphy, rphy->dev.release));
43225 - }
43226 -}
43227 -
43228 static inline struct sas_port *
43229 mptsas_get_port(struct mptsas_phyinfo *phy_info)
43230 {
43231 diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
43232 index 727819c..ad74694 100644
43233 --- a/drivers/message/fusion/mptscsih.c
43234 +++ b/drivers/message/fusion/mptscsih.c
43235 @@ -1271,15 +1271,16 @@ mptscsih_info(struct Scsi_Host *SChost)
43236
43237 h = shost_priv(SChost);
43238
43239 - if (h) {
43240 - if (h->info_kbuf == NULL)
43241 - if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
43242 - return h->info_kbuf;
43243 - h->info_kbuf[0] = '\0';
43244 + if (!h)
43245 + return NULL;
43246
43247 - mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
43248 - h->info_kbuf[size-1] = '\0';
43249 - }
43250 + if (h->info_kbuf == NULL)
43251 + if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
43252 + return h->info_kbuf;
43253 + h->info_kbuf[0] = '\0';
43254 +
43255 + mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
43256 + h->info_kbuf[size-1] = '\0';
43257
43258 return h->info_kbuf;
43259 }
43260 diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
43261 index b7d87cd..3fb36da 100644
43262 --- a/drivers/message/i2o/i2o_proc.c
43263 +++ b/drivers/message/i2o/i2o_proc.c
43264 @@ -255,12 +255,6 @@ static char *scsi_devices[] = {
43265 "Array Controller Device"
43266 };
43267
43268 -static char *chtostr(char *tmp, u8 *chars, int n)
43269 -{
43270 - tmp[0] = 0;
43271 - return strncat(tmp, (char *)chars, n);
43272 -}
43273 -
43274 static int i2o_report_query_status(struct seq_file *seq, int block_status,
43275 char *group)
43276 {
43277 @@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
43278 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
43279 {
43280 struct i2o_controller *c = (struct i2o_controller *)seq->private;
43281 - static u32 work32[5];
43282 - static u8 *work8 = (u8 *) work32;
43283 - static u16 *work16 = (u16 *) work32;
43284 + u32 work32[5];
43285 + u8 *work8 = (u8 *) work32;
43286 + u16 *work16 = (u16 *) work32;
43287 int token;
43288 u32 hwcap;
43289
43290 @@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
43291 } *result;
43292
43293 i2o_exec_execute_ddm_table ddm_table;
43294 - char tmp[28 + 1];
43295
43296 result = kmalloc(sizeof(*result), GFP_KERNEL);
43297 if (!result)
43298 @@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
43299
43300 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
43301 seq_printf(seq, "%-#8x", ddm_table.module_id);
43302 - seq_printf(seq, "%-29s",
43303 - chtostr(tmp, ddm_table.module_name_version, 28));
43304 + seq_printf(seq, "%-.28s", ddm_table.module_name_version);
43305 seq_printf(seq, "%9d ", ddm_table.data_size);
43306 seq_printf(seq, "%8d", ddm_table.code_size);
43307
43308 @@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
43309
43310 i2o_driver_result_table *result;
43311 i2o_driver_store_table *dst;
43312 - char tmp[28 + 1];
43313
43314 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
43315 if (result == NULL)
43316 @@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
43317
43318 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
43319 seq_printf(seq, "%-#8x", dst->module_id);
43320 - seq_printf(seq, "%-29s",
43321 - chtostr(tmp, dst->module_name_version, 28));
43322 - seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
43323 + seq_printf(seq, "%-.28s", dst->module_name_version);
43324 + seq_printf(seq, "%-.8s", dst->date);
43325 seq_printf(seq, "%8d ", dst->module_size);
43326 seq_printf(seq, "%8d ", dst->mpb_size);
43327 seq_printf(seq, "0x%04x", dst->module_flags);
43328 @@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
43329 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
43330 {
43331 struct i2o_device *d = (struct i2o_device *)seq->private;
43332 - static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
43333 + u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
43334 // == (allow) 512d bytes (max)
43335 - static u16 *work16 = (u16 *) work32;
43336 + u16 *work16 = (u16 *) work32;
43337 int token;
43338 - char tmp[16 + 1];
43339
43340 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
43341
43342 @@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
43343 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
43344 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
43345 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
43346 - seq_printf(seq, "Vendor info : %s\n",
43347 - chtostr(tmp, (u8 *) (work32 + 2), 16));
43348 - seq_printf(seq, "Product info : %s\n",
43349 - chtostr(tmp, (u8 *) (work32 + 6), 16));
43350 - seq_printf(seq, "Description : %s\n",
43351 - chtostr(tmp, (u8 *) (work32 + 10), 16));
43352 - seq_printf(seq, "Product rev. : %s\n",
43353 - chtostr(tmp, (u8 *) (work32 + 14), 8));
43354 + seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
43355 + seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
43356 + seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
43357 + seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
43358
43359 seq_printf(seq, "Serial number : ");
43360 print_serial_number(seq, (u8 *) (work32 + 16),
43361 @@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
43362 u8 pad[256]; // allow up to 256 byte (max) serial number
43363 } result;
43364
43365 - char tmp[24 + 1];
43366 -
43367 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
43368
43369 if (token < 0) {
43370 @@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
43371 }
43372
43373 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
43374 - seq_printf(seq, "Module name : %s\n",
43375 - chtostr(tmp, result.module_name, 24));
43376 - seq_printf(seq, "Module revision : %s\n",
43377 - chtostr(tmp, result.module_rev, 8));
43378 + seq_printf(seq, "Module name : %.24s\n", result.module_name);
43379 + seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
43380
43381 seq_printf(seq, "Serial number : ");
43382 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
43383 @@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
43384 u8 instance_number[4];
43385 } result;
43386
43387 - char tmp[64 + 1];
43388 -
43389 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
43390
43391 if (token < 0) {
43392 @@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
43393 return 0;
43394 }
43395
43396 - seq_printf(seq, "Device name : %s\n",
43397 - chtostr(tmp, result.device_name, 64));
43398 - seq_printf(seq, "Service name : %s\n",
43399 - chtostr(tmp, result.service_name, 64));
43400 - seq_printf(seq, "Physical name : %s\n",
43401 - chtostr(tmp, result.physical_location, 64));
43402 - seq_printf(seq, "Instance number : %s\n",
43403 - chtostr(tmp, result.instance_number, 4));
43404 + seq_printf(seq, "Device name : %.64s\n", result.device_name);
43405 + seq_printf(seq, "Service name : %.64s\n", result.service_name);
43406 + seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
43407 + seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
43408
43409 return 0;
43410 }
43411 @@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
43412 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
43413 {
43414 struct i2o_device *d = (struct i2o_device *)seq->private;
43415 - static u32 work32[12];
43416 - static u16 *work16 = (u16 *) work32;
43417 - static u8 *work8 = (u8 *) work32;
43418 + u32 work32[12];
43419 + u16 *work16 = (u16 *) work32;
43420 + u8 *work8 = (u8 *) work32;
43421 int token;
43422
43423 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
43424 diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
43425 index a8c08f3..155fe3d 100644
43426 --- a/drivers/message/i2o/iop.c
43427 +++ b/drivers/message/i2o/iop.c
43428 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
43429
43430 spin_lock_irqsave(&c->context_list_lock, flags);
43431
43432 - if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
43433 - atomic_inc(&c->context_list_counter);
43434 + if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
43435 + atomic_inc_unchecked(&c->context_list_counter);
43436
43437 - entry->context = atomic_read(&c->context_list_counter);
43438 + entry->context = atomic_read_unchecked(&c->context_list_counter);
43439
43440 list_add(&entry->list, &c->context_list);
43441
43442 @@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(void)
43443
43444 #if BITS_PER_LONG == 64
43445 spin_lock_init(&c->context_list_lock);
43446 - atomic_set(&c->context_list_counter, 0);
43447 + atomic_set_unchecked(&c->context_list_counter, 0);
43448 INIT_LIST_HEAD(&c->context_list);
43449 #endif
43450
43451 diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
43452 index fcbb2e9..2635e11 100644
43453 --- a/drivers/mfd/janz-cmodio.c
43454 +++ b/drivers/mfd/janz-cmodio.c
43455 @@ -13,6 +13,7 @@
43456
43457 #include <linux/kernel.h>
43458 #include <linux/module.h>
43459 +#include <linux/slab.h>
43460 #include <linux/init.h>
43461 #include <linux/pci.h>
43462 #include <linux/interrupt.h>
43463 diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
43464 index de7fb80..7c1b931 100644
43465 --- a/drivers/mfd/max8925-i2c.c
43466 +++ b/drivers/mfd/max8925-i2c.c
43467 @@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
43468 const struct i2c_device_id *id)
43469 {
43470 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
43471 - static struct max8925_chip *chip;
43472 + struct max8925_chip *chip;
43473 struct device_node *node = client->dev.of_node;
43474
43475 if (node && !pdata) {
43476 diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
43477 index d792772..cd73ba3 100644
43478 --- a/drivers/mfd/tps65910.c
43479 +++ b/drivers/mfd/tps65910.c
43480 @@ -229,7 +229,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
43481 struct tps65910_platform_data *pdata)
43482 {
43483 int ret = 0;
43484 - static struct regmap_irq_chip *tps6591x_irqs_chip;
43485 + struct regmap_irq_chip *tps6591x_irqs_chip;
43486
43487 if (!irq) {
43488 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
43489 diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
43490 index 9aa6d1e..1631bfc 100644
43491 --- a/drivers/mfd/twl4030-irq.c
43492 +++ b/drivers/mfd/twl4030-irq.c
43493 @@ -35,6 +35,7 @@
43494 #include <linux/of.h>
43495 #include <linux/irqdomain.h>
43496 #include <linux/i2c/twl.h>
43497 +#include <asm/pgtable.h>
43498
43499 #include "twl-core.h"
43500
43501 @@ -726,10 +727,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
43502 * Install an irq handler for each of the SIH modules;
43503 * clone dummy irq_chip since PIH can't *do* anything
43504 */
43505 - twl4030_irq_chip = dummy_irq_chip;
43506 - twl4030_irq_chip.name = "twl4030";
43507 + pax_open_kernel();
43508 + memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
43509 + *(const char **)&twl4030_irq_chip.name = "twl4030";
43510
43511 - twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
43512 + *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
43513 + pax_close_kernel();
43514
43515 for (i = irq_base; i < irq_end; i++) {
43516 irq_set_chip_and_handler(i, &twl4030_irq_chip,
43517 diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
43518 index 464419b..64bae8d 100644
43519 --- a/drivers/misc/c2port/core.c
43520 +++ b/drivers/misc/c2port/core.c
43521 @@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
43522 goto error_idr_alloc;
43523 c2dev->id = ret;
43524
43525 - bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
43526 + pax_open_kernel();
43527 + *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
43528 + pax_close_kernel();
43529
43530 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
43531 "c2port%d", c2dev->id);
43532 diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
43533 index 36f5d52..32311c3 100644
43534 --- a/drivers/misc/kgdbts.c
43535 +++ b/drivers/misc/kgdbts.c
43536 @@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
43537 char before[BREAK_INSTR_SIZE];
43538 char after[BREAK_INSTR_SIZE];
43539
43540 - probe_kernel_read(before, (char *)kgdbts_break_test,
43541 + probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
43542 BREAK_INSTR_SIZE);
43543 init_simple_test();
43544 ts.tst = plant_and_detach_test;
43545 @@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
43546 /* Activate test with initial breakpoint */
43547 if (!is_early)
43548 kgdb_breakpoint();
43549 - probe_kernel_read(after, (char *)kgdbts_break_test,
43550 + probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
43551 BREAK_INSTR_SIZE);
43552 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
43553 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
43554 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
43555 index 036effe..b3a6336 100644
43556 --- a/drivers/misc/lis3lv02d/lis3lv02d.c
43557 +++ b/drivers/misc/lis3lv02d/lis3lv02d.c
43558 @@ -498,7 +498,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
43559 * the lid is closed. This leads to interrupts as soon as a little move
43560 * is done.
43561 */
43562 - atomic_inc(&lis3->count);
43563 + atomic_inc_unchecked(&lis3->count);
43564
43565 wake_up_interruptible(&lis3->misc_wait);
43566 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
43567 @@ -584,7 +584,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
43568 if (lis3->pm_dev)
43569 pm_runtime_get_sync(lis3->pm_dev);
43570
43571 - atomic_set(&lis3->count, 0);
43572 + atomic_set_unchecked(&lis3->count, 0);
43573 return 0;
43574 }
43575
43576 @@ -616,7 +616,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
43577 add_wait_queue(&lis3->misc_wait, &wait);
43578 while (true) {
43579 set_current_state(TASK_INTERRUPTIBLE);
43580 - data = atomic_xchg(&lis3->count, 0);
43581 + data = atomic_xchg_unchecked(&lis3->count, 0);
43582 if (data)
43583 break;
43584
43585 @@ -657,7 +657,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
43586 struct lis3lv02d, miscdev);
43587
43588 poll_wait(file, &lis3->misc_wait, wait);
43589 - if (atomic_read(&lis3->count))
43590 + if (atomic_read_unchecked(&lis3->count))
43591 return POLLIN | POLLRDNORM;
43592 return 0;
43593 }
43594 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
43595 index c439c82..1f20f57 100644
43596 --- a/drivers/misc/lis3lv02d/lis3lv02d.h
43597 +++ b/drivers/misc/lis3lv02d/lis3lv02d.h
43598 @@ -297,7 +297,7 @@ struct lis3lv02d {
43599 struct input_polled_dev *idev; /* input device */
43600 struct platform_device *pdev; /* platform device */
43601 struct regulator_bulk_data regulators[2];
43602 - atomic_t count; /* interrupt count after last read */
43603 + atomic_unchecked_t count; /* interrupt count after last read */
43604 union axis_conversion ac; /* hw -> logical axis */
43605 int mapped_btns[3];
43606
43607 diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
43608 index 2f30bad..c4c13d0 100644
43609 --- a/drivers/misc/sgi-gru/gruhandles.c
43610 +++ b/drivers/misc/sgi-gru/gruhandles.c
43611 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
43612 unsigned long nsec;
43613
43614 nsec = CLKS2NSEC(clks);
43615 - atomic_long_inc(&mcs_op_statistics[op].count);
43616 - atomic_long_add(nsec, &mcs_op_statistics[op].total);
43617 + atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
43618 + atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
43619 if (mcs_op_statistics[op].max < nsec)
43620 mcs_op_statistics[op].max = nsec;
43621 }
43622 diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
43623 index 4f76359..cdfcb2e 100644
43624 --- a/drivers/misc/sgi-gru/gruprocfs.c
43625 +++ b/drivers/misc/sgi-gru/gruprocfs.c
43626 @@ -32,9 +32,9 @@
43627
43628 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
43629
43630 -static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
43631 +static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
43632 {
43633 - unsigned long val = atomic_long_read(v);
43634 + unsigned long val = atomic_long_read_unchecked(v);
43635
43636 seq_printf(s, "%16lu %s\n", val, id);
43637 }
43638 @@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
43639
43640 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
43641 for (op = 0; op < mcsop_last; op++) {
43642 - count = atomic_long_read(&mcs_op_statistics[op].count);
43643 - total = atomic_long_read(&mcs_op_statistics[op].total);
43644 + count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
43645 + total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
43646 max = mcs_op_statistics[op].max;
43647 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
43648 count ? total / count : 0, max);
43649 diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
43650 index 5c3ce24..4915ccb 100644
43651 --- a/drivers/misc/sgi-gru/grutables.h
43652 +++ b/drivers/misc/sgi-gru/grutables.h
43653 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
43654 * GRU statistics.
43655 */
43656 struct gru_stats_s {
43657 - atomic_long_t vdata_alloc;
43658 - atomic_long_t vdata_free;
43659 - atomic_long_t gts_alloc;
43660 - atomic_long_t gts_free;
43661 - atomic_long_t gms_alloc;
43662 - atomic_long_t gms_free;
43663 - atomic_long_t gts_double_allocate;
43664 - atomic_long_t assign_context;
43665 - atomic_long_t assign_context_failed;
43666 - atomic_long_t free_context;
43667 - atomic_long_t load_user_context;
43668 - atomic_long_t load_kernel_context;
43669 - atomic_long_t lock_kernel_context;
43670 - atomic_long_t unlock_kernel_context;
43671 - atomic_long_t steal_user_context;
43672 - atomic_long_t steal_kernel_context;
43673 - atomic_long_t steal_context_failed;
43674 - atomic_long_t nopfn;
43675 - atomic_long_t asid_new;
43676 - atomic_long_t asid_next;
43677 - atomic_long_t asid_wrap;
43678 - atomic_long_t asid_reuse;
43679 - atomic_long_t intr;
43680 - atomic_long_t intr_cbr;
43681 - atomic_long_t intr_tfh;
43682 - atomic_long_t intr_spurious;
43683 - atomic_long_t intr_mm_lock_failed;
43684 - atomic_long_t call_os;
43685 - atomic_long_t call_os_wait_queue;
43686 - atomic_long_t user_flush_tlb;
43687 - atomic_long_t user_unload_context;
43688 - atomic_long_t user_exception;
43689 - atomic_long_t set_context_option;
43690 - atomic_long_t check_context_retarget_intr;
43691 - atomic_long_t check_context_unload;
43692 - atomic_long_t tlb_dropin;
43693 - atomic_long_t tlb_preload_page;
43694 - atomic_long_t tlb_dropin_fail_no_asid;
43695 - atomic_long_t tlb_dropin_fail_upm;
43696 - atomic_long_t tlb_dropin_fail_invalid;
43697 - atomic_long_t tlb_dropin_fail_range_active;
43698 - atomic_long_t tlb_dropin_fail_idle;
43699 - atomic_long_t tlb_dropin_fail_fmm;
43700 - atomic_long_t tlb_dropin_fail_no_exception;
43701 - atomic_long_t tfh_stale_on_fault;
43702 - atomic_long_t mmu_invalidate_range;
43703 - atomic_long_t mmu_invalidate_page;
43704 - atomic_long_t flush_tlb;
43705 - atomic_long_t flush_tlb_gru;
43706 - atomic_long_t flush_tlb_gru_tgh;
43707 - atomic_long_t flush_tlb_gru_zero_asid;
43708 + atomic_long_unchecked_t vdata_alloc;
43709 + atomic_long_unchecked_t vdata_free;
43710 + atomic_long_unchecked_t gts_alloc;
43711 + atomic_long_unchecked_t gts_free;
43712 + atomic_long_unchecked_t gms_alloc;
43713 + atomic_long_unchecked_t gms_free;
43714 + atomic_long_unchecked_t gts_double_allocate;
43715 + atomic_long_unchecked_t assign_context;
43716 + atomic_long_unchecked_t assign_context_failed;
43717 + atomic_long_unchecked_t free_context;
43718 + atomic_long_unchecked_t load_user_context;
43719 + atomic_long_unchecked_t load_kernel_context;
43720 + atomic_long_unchecked_t lock_kernel_context;
43721 + atomic_long_unchecked_t unlock_kernel_context;
43722 + atomic_long_unchecked_t steal_user_context;
43723 + atomic_long_unchecked_t steal_kernel_context;
43724 + atomic_long_unchecked_t steal_context_failed;
43725 + atomic_long_unchecked_t nopfn;
43726 + atomic_long_unchecked_t asid_new;
43727 + atomic_long_unchecked_t asid_next;
43728 + atomic_long_unchecked_t asid_wrap;
43729 + atomic_long_unchecked_t asid_reuse;
43730 + atomic_long_unchecked_t intr;
43731 + atomic_long_unchecked_t intr_cbr;
43732 + atomic_long_unchecked_t intr_tfh;
43733 + atomic_long_unchecked_t intr_spurious;
43734 + atomic_long_unchecked_t intr_mm_lock_failed;
43735 + atomic_long_unchecked_t call_os;
43736 + atomic_long_unchecked_t call_os_wait_queue;
43737 + atomic_long_unchecked_t user_flush_tlb;
43738 + atomic_long_unchecked_t user_unload_context;
43739 + atomic_long_unchecked_t user_exception;
43740 + atomic_long_unchecked_t set_context_option;
43741 + atomic_long_unchecked_t check_context_retarget_intr;
43742 + atomic_long_unchecked_t check_context_unload;
43743 + atomic_long_unchecked_t tlb_dropin;
43744 + atomic_long_unchecked_t tlb_preload_page;
43745 + atomic_long_unchecked_t tlb_dropin_fail_no_asid;
43746 + atomic_long_unchecked_t tlb_dropin_fail_upm;
43747 + atomic_long_unchecked_t tlb_dropin_fail_invalid;
43748 + atomic_long_unchecked_t tlb_dropin_fail_range_active;
43749 + atomic_long_unchecked_t tlb_dropin_fail_idle;
43750 + atomic_long_unchecked_t tlb_dropin_fail_fmm;
43751 + atomic_long_unchecked_t tlb_dropin_fail_no_exception;
43752 + atomic_long_unchecked_t tfh_stale_on_fault;
43753 + atomic_long_unchecked_t mmu_invalidate_range;
43754 + atomic_long_unchecked_t mmu_invalidate_page;
43755 + atomic_long_unchecked_t flush_tlb;
43756 + atomic_long_unchecked_t flush_tlb_gru;
43757 + atomic_long_unchecked_t flush_tlb_gru_tgh;
43758 + atomic_long_unchecked_t flush_tlb_gru_zero_asid;
43759
43760 - atomic_long_t copy_gpa;
43761 - atomic_long_t read_gpa;
43762 + atomic_long_unchecked_t copy_gpa;
43763 + atomic_long_unchecked_t read_gpa;
43764
43765 - atomic_long_t mesq_receive;
43766 - atomic_long_t mesq_receive_none;
43767 - atomic_long_t mesq_send;
43768 - atomic_long_t mesq_send_failed;
43769 - atomic_long_t mesq_noop;
43770 - atomic_long_t mesq_send_unexpected_error;
43771 - atomic_long_t mesq_send_lb_overflow;
43772 - atomic_long_t mesq_send_qlimit_reached;
43773 - atomic_long_t mesq_send_amo_nacked;
43774 - atomic_long_t mesq_send_put_nacked;
43775 - atomic_long_t mesq_page_overflow;
43776 - atomic_long_t mesq_qf_locked;
43777 - atomic_long_t mesq_qf_noop_not_full;
43778 - atomic_long_t mesq_qf_switch_head_failed;
43779 - atomic_long_t mesq_qf_unexpected_error;
43780 - atomic_long_t mesq_noop_unexpected_error;
43781 - atomic_long_t mesq_noop_lb_overflow;
43782 - atomic_long_t mesq_noop_qlimit_reached;
43783 - atomic_long_t mesq_noop_amo_nacked;
43784 - atomic_long_t mesq_noop_put_nacked;
43785 - atomic_long_t mesq_noop_page_overflow;
43786 + atomic_long_unchecked_t mesq_receive;
43787 + atomic_long_unchecked_t mesq_receive_none;
43788 + atomic_long_unchecked_t mesq_send;
43789 + atomic_long_unchecked_t mesq_send_failed;
43790 + atomic_long_unchecked_t mesq_noop;
43791 + atomic_long_unchecked_t mesq_send_unexpected_error;
43792 + atomic_long_unchecked_t mesq_send_lb_overflow;
43793 + atomic_long_unchecked_t mesq_send_qlimit_reached;
43794 + atomic_long_unchecked_t mesq_send_amo_nacked;
43795 + atomic_long_unchecked_t mesq_send_put_nacked;
43796 + atomic_long_unchecked_t mesq_page_overflow;
43797 + atomic_long_unchecked_t mesq_qf_locked;
43798 + atomic_long_unchecked_t mesq_qf_noop_not_full;
43799 + atomic_long_unchecked_t mesq_qf_switch_head_failed;
43800 + atomic_long_unchecked_t mesq_qf_unexpected_error;
43801 + atomic_long_unchecked_t mesq_noop_unexpected_error;
43802 + atomic_long_unchecked_t mesq_noop_lb_overflow;
43803 + atomic_long_unchecked_t mesq_noop_qlimit_reached;
43804 + atomic_long_unchecked_t mesq_noop_amo_nacked;
43805 + atomic_long_unchecked_t mesq_noop_put_nacked;
43806 + atomic_long_unchecked_t mesq_noop_page_overflow;
43807
43808 };
43809
43810 @@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
43811 tghop_invalidate, mcsop_last};
43812
43813 struct mcs_op_statistic {
43814 - atomic_long_t count;
43815 - atomic_long_t total;
43816 + atomic_long_unchecked_t count;
43817 + atomic_long_unchecked_t total;
43818 unsigned long max;
43819 };
43820
43821 @@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
43822
43823 #define STAT(id) do { \
43824 if (gru_options & OPT_STATS) \
43825 - atomic_long_inc(&gru_stats.id); \
43826 + atomic_long_inc_unchecked(&gru_stats.id); \
43827 } while (0)
43828
43829 #ifdef CONFIG_SGI_GRU_DEBUG
43830 diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
43831 index c862cd4..0d176fe 100644
43832 --- a/drivers/misc/sgi-xp/xp.h
43833 +++ b/drivers/misc/sgi-xp/xp.h
43834 @@ -288,7 +288,7 @@ struct xpc_interface {
43835 xpc_notify_func, void *);
43836 void (*received) (short, int, void *);
43837 enum xp_retval (*partid_to_nasids) (short, void *);
43838 -};
43839 +} __no_const;
43840
43841 extern struct xpc_interface xpc_interface;
43842
43843 diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
43844 index b94d5f7..7f494c5 100644
43845 --- a/drivers/misc/sgi-xp/xpc.h
43846 +++ b/drivers/misc/sgi-xp/xpc.h
43847 @@ -835,6 +835,7 @@ struct xpc_arch_operations {
43848 void (*received_payload) (struct xpc_channel *, void *);
43849 void (*notify_senders_of_disconnect) (struct xpc_channel *);
43850 };
43851 +typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
43852
43853 /* struct xpc_partition act_state values (for XPC HB) */
43854
43855 @@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
43856 /* found in xpc_main.c */
43857 extern struct device *xpc_part;
43858 extern struct device *xpc_chan;
43859 -extern struct xpc_arch_operations xpc_arch_ops;
43860 +extern xpc_arch_operations_no_const xpc_arch_ops;
43861 extern int xpc_disengage_timelimit;
43862 extern int xpc_disengage_timedout;
43863 extern int xpc_activate_IRQ_rcvd;
43864 diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
43865 index 82dc574..8539ab2 100644
43866 --- a/drivers/misc/sgi-xp/xpc_main.c
43867 +++ b/drivers/misc/sgi-xp/xpc_main.c
43868 @@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
43869 .notifier_call = xpc_system_die,
43870 };
43871
43872 -struct xpc_arch_operations xpc_arch_ops;
43873 +xpc_arch_operations_no_const xpc_arch_ops;
43874
43875 /*
43876 * Timer function to enforce the timelimit on the partition disengage.
43877 @@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
43878
43879 if (((die_args->trapnr == X86_TRAP_MF) ||
43880 (die_args->trapnr == X86_TRAP_XF)) &&
43881 - !user_mode_vm(die_args->regs))
43882 + !user_mode(die_args->regs))
43883 xpc_die_deactivate();
43884
43885 break;
43886 diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
43887 index ef18348..1b53cf0 100644
43888 --- a/drivers/mmc/core/mmc_ops.c
43889 +++ b/drivers/mmc/core/mmc_ops.c
43890 @@ -213,7 +213,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
43891 void *data_buf;
43892 int is_on_stack;
43893
43894 - is_on_stack = object_is_on_stack(buf);
43895 + is_on_stack = object_starts_on_stack(buf);
43896 if (is_on_stack) {
43897 /*
43898 * dma onto stack is unsafe/nonportable, but callers to this
43899 diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
43900 index 81b2994..dce857e 100644
43901 --- a/drivers/mmc/host/dw_mmc.h
43902 +++ b/drivers/mmc/host/dw_mmc.h
43903 @@ -203,5 +203,5 @@ struct dw_mci_drv_data {
43904 void (*prepare_command)(struct dw_mci *host, u32 *cmdr);
43905 void (*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
43906 int (*parse_dt)(struct dw_mci *host);
43907 -};
43908 +} __do_const;
43909 #endif /* _DW_MMC_H_ */
43910 diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
43911 index c3785ed..1984c44 100644
43912 --- a/drivers/mmc/host/mmci.c
43913 +++ b/drivers/mmc/host/mmci.c
43914 @@ -1482,7 +1482,9 @@ static int mmci_probe(struct amba_device *dev,
43915 }
43916
43917 if (variant->busy_detect) {
43918 - mmci_ops.card_busy = mmci_card_busy;
43919 + pax_open_kernel();
43920 + *(void **)&mmci_ops.card_busy = mmci_card_busy;
43921 + pax_close_kernel();
43922 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
43923 }
43924
43925 diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
43926 index 6debda9..2ba7427 100644
43927 --- a/drivers/mmc/host/sdhci-s3c.c
43928 +++ b/drivers/mmc/host/sdhci-s3c.c
43929 @@ -668,9 +668,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
43930 * we can use overriding functions instead of default.
43931 */
43932 if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK) {
43933 - sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
43934 - sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
43935 - sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
43936 + pax_open_kernel();
43937 + *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
43938 + *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
43939 + *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
43940 + pax_close_kernel();
43941 }
43942
43943 /* It supports additional host capabilities if needed */
43944 diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
43945 index 096993f..f02c23b 100644
43946 --- a/drivers/mtd/chips/cfi_cmdset_0020.c
43947 +++ b/drivers/mtd/chips/cfi_cmdset_0020.c
43948 @@ -669,7 +669,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
43949 size_t totlen = 0, thislen;
43950 int ret = 0;
43951 size_t buflen = 0;
43952 - static char *buffer;
43953 + char *buffer;
43954
43955 if (!ECCBUF_SIZE) {
43956 /* We should fall back to a general writev implementation.
43957 diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
43958 index 2ed2bb3..2d0b82e 100644
43959 --- a/drivers/mtd/nand/denali.c
43960 +++ b/drivers/mtd/nand/denali.c
43961 @@ -24,6 +24,7 @@
43962 #include <linux/slab.h>
43963 #include <linux/mtd/mtd.h>
43964 #include <linux/module.h>
43965 +#include <linux/slab.h>
43966
43967 #include "denali.h"
43968
43969 diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
43970 index 51b9d6a..52af9a7 100644
43971 --- a/drivers/mtd/nftlmount.c
43972 +++ b/drivers/mtd/nftlmount.c
43973 @@ -24,6 +24,7 @@
43974 #include <asm/errno.h>
43975 #include <linux/delay.h>
43976 #include <linux/slab.h>
43977 +#include <linux/sched.h>
43978 #include <linux/mtd/mtd.h>
43979 #include <linux/mtd/nand.h>
43980 #include <linux/mtd/nftl.h>
43981 diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
43982 index 4b8e895..6b3c498 100644
43983 --- a/drivers/mtd/sm_ftl.c
43984 +++ b/drivers/mtd/sm_ftl.c
43985 @@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
43986 #define SM_CIS_VENDOR_OFFSET 0x59
43987 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
43988 {
43989 - struct attribute_group *attr_group;
43990 + attribute_group_no_const *attr_group;
43991 struct attribute **attributes;
43992 struct sm_sysfs_attribute *vendor_attribute;
43993
43994 diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
43995 index dd8057d..22aaf36 100644
43996 --- a/drivers/net/bonding/bond_main.c
43997 +++ b/drivers/net/bonding/bond_main.c
43998 @@ -4511,7 +4511,7 @@ static unsigned int bond_get_num_tx_queues(void)
43999 return tx_queues;
44000 }
44001
44002 -static struct rtnl_link_ops bond_link_ops __read_mostly = {
44003 +static struct rtnl_link_ops bond_link_ops = {
44004 .kind = "bond",
44005 .priv_size = sizeof(struct bonding),
44006 .setup = bond_setup,
44007 @@ -4636,8 +4636,8 @@ static void __exit bonding_exit(void)
44008
44009 bond_destroy_debugfs();
44010
44011 - rtnl_link_unregister(&bond_link_ops);
44012 unregister_pernet_subsys(&bond_net_ops);
44013 + rtnl_link_unregister(&bond_link_ops);
44014
44015 #ifdef CONFIG_NET_POLL_CONTROLLER
44016 /*
44017 diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
44018 index f92f001..0b2f9bf 100644
44019 --- a/drivers/net/ethernet/8390/ax88796.c
44020 +++ b/drivers/net/ethernet/8390/ax88796.c
44021 @@ -872,9 +872,11 @@ static int ax_probe(struct platform_device *pdev)
44022 if (ax->plat->reg_offsets)
44023 ei_local->reg_offset = ax->plat->reg_offsets;
44024 else {
44025 + resource_size_t _mem_size = mem_size;
44026 + do_div(_mem_size, 0x18);
44027 ei_local->reg_offset = ax->reg_offsets;
44028 for (ret = 0; ret < 0x18; ret++)
44029 - ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
44030 + ax->reg_offsets[ret] = _mem_size * ret;
44031 }
44032
44033 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
44034 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
44035 index da8fcaa..f4b5d3b 100644
44036 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
44037 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
44038 @@ -1138,7 +1138,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
44039 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
44040 {
44041 /* RX_MODE controlling object */
44042 - bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
44043 + bnx2x_init_rx_mode_obj(bp);
44044
44045 /* multicast configuration controlling object */
44046 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
44047 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
44048 index 9fbeee5..5e3e37a 100644
44049 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
44050 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
44051 @@ -2590,15 +2590,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
44052 return rc;
44053 }
44054
44055 -void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
44056 - struct bnx2x_rx_mode_obj *o)
44057 +void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
44058 {
44059 if (CHIP_IS_E1x(bp)) {
44060 - o->wait_comp = bnx2x_empty_rx_mode_wait;
44061 - o->config_rx_mode = bnx2x_set_rx_mode_e1x;
44062 + bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
44063 + bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
44064 } else {
44065 - o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
44066 - o->config_rx_mode = bnx2x_set_rx_mode_e2;
44067 + bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
44068 + bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
44069 }
44070 }
44071
44072 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
44073 index 658f4e3..15074a6 100644
44074 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
44075 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
44076 @@ -1325,8 +1325,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
44077
44078 /********************* RX MODE ****************/
44079
44080 -void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
44081 - struct bnx2x_rx_mode_obj *o);
44082 +void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
44083
44084 /**
44085 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
44086 diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
44087 index 7025780..e55a71c 100644
44088 --- a/drivers/net/ethernet/broadcom/tg3.h
44089 +++ b/drivers/net/ethernet/broadcom/tg3.h
44090 @@ -147,6 +147,7 @@
44091 #define CHIPREV_ID_5750_A0 0x4000
44092 #define CHIPREV_ID_5750_A1 0x4001
44093 #define CHIPREV_ID_5750_A3 0x4003
44094 +#define CHIPREV_ID_5750_C1 0x4201
44095 #define CHIPREV_ID_5750_C2 0x4202
44096 #define CHIPREV_ID_5752_A0_HW 0x5000
44097 #define CHIPREV_ID_5752_A0 0x6000
44098 diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
44099 index 8cffcdf..aadf043 100644
44100 --- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
44101 +++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
44102 @@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
44103 */
44104 struct l2t_skb_cb {
44105 arp_failure_handler_func arp_failure_handler;
44106 -};
44107 +} __no_const;
44108
44109 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
44110
44111 diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
44112 index c73cabd..cd278b1 100644
44113 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
44114 +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
44115 @@ -2186,7 +2186,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
44116
44117 int i;
44118 struct adapter *ap = netdev2adap(dev);
44119 - static const unsigned int *reg_ranges;
44120 + const unsigned int *reg_ranges;
44121 int arr_size = 0, buf_size = 0;
44122
44123 if (is_t4(ap->chip)) {
44124 diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
44125 index 263b92c..f05134b 100644
44126 --- a/drivers/net/ethernet/dec/tulip/de4x5.c
44127 +++ b/drivers/net/ethernet/dec/tulip/de4x5.c
44128 @@ -5388,7 +5388,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
44129 for (i=0; i<ETH_ALEN; i++) {
44130 tmp.addr[i] = dev->dev_addr[i];
44131 }
44132 - if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
44133 + if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
44134 break;
44135
44136 case DE4X5_SET_HWADDR: /* Set the hardware address */
44137 @@ -5428,7 +5428,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
44138 spin_lock_irqsave(&lp->lock, flags);
44139 memcpy(&statbuf, &lp->pktStats, ioc->len);
44140 spin_unlock_irqrestore(&lp->lock, flags);
44141 - if (copy_to_user(ioc->data, &statbuf, ioc->len))
44142 + if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
44143 return -EFAULT;
44144 break;
44145 }
44146 diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
44147 index 2c38cc4..0323f6e 100644
44148 --- a/drivers/net/ethernet/emulex/benet/be_main.c
44149 +++ b/drivers/net/ethernet/emulex/benet/be_main.c
44150 @@ -470,7 +470,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
44151
44152 if (wrapped)
44153 newacc += 65536;
44154 - ACCESS_ONCE(*acc) = newacc;
44155 + ACCESS_ONCE_RW(*acc) = newacc;
44156 }
44157
44158 static void populate_erx_stats(struct be_adapter *adapter,
44159 diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
44160 index 212f44b..fb69959 100644
44161 --- a/drivers/net/ethernet/faraday/ftgmac100.c
44162 +++ b/drivers/net/ethernet/faraday/ftgmac100.c
44163 @@ -31,6 +31,8 @@
44164 #include <linux/netdevice.h>
44165 #include <linux/phy.h>
44166 #include <linux/platform_device.h>
44167 +#include <linux/interrupt.h>
44168 +#include <linux/irqreturn.h>
44169 #include <net/ip.h>
44170
44171 #include "ftgmac100.h"
44172 diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
44173 index 8be5b40..081bc1b 100644
44174 --- a/drivers/net/ethernet/faraday/ftmac100.c
44175 +++ b/drivers/net/ethernet/faraday/ftmac100.c
44176 @@ -31,6 +31,8 @@
44177 #include <linux/module.h>
44178 #include <linux/netdevice.h>
44179 #include <linux/platform_device.h>
44180 +#include <linux/interrupt.h>
44181 +#include <linux/irqreturn.h>
44182
44183 #include "ftmac100.h"
44184
44185 diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
44186 index 5184e2a..acb28c3 100644
44187 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
44188 +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
44189 @@ -776,7 +776,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
44190 }
44191
44192 /* update the base incval used to calculate frequency adjustment */
44193 - ACCESS_ONCE(adapter->base_incval) = incval;
44194 + ACCESS_ONCE_RW(adapter->base_incval) = incval;
44195 smp_mb();
44196
44197 /* need lock to prevent incorrect read while modifying cyclecounter */
44198 diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
44199 index fbe5363..266b4e3 100644
44200 --- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
44201 +++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
44202 @@ -3461,7 +3461,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
44203 struct __vxge_hw_fifo *fifo;
44204 struct vxge_hw_fifo_config *config;
44205 u32 txdl_size, txdl_per_memblock;
44206 - struct vxge_hw_mempool_cbs fifo_mp_callback;
44207 + static struct vxge_hw_mempool_cbs fifo_mp_callback = {
44208 + .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
44209 + };
44210 +
44211 struct __vxge_hw_virtualpath *vpath;
44212
44213 if ((vp == NULL) || (attr == NULL)) {
44214 @@ -3544,8 +3547,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
44215 goto exit;
44216 }
44217
44218 - fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
44219 -
44220 fifo->mempool =
44221 __vxge_hw_mempool_create(vpath->hldev,
44222 fifo->config->memblock_size,
44223 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
44224 index f09e787..f3916a8 100644
44225 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
44226 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
44227 @@ -2055,7 +2055,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
44228
44229 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
44230 ahw->nic_mode = QLC_83XX_DEFAULT_MODE;
44231 - adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
44232 + pax_open_kernel();
44233 + *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
44234 + pax_close_kernel();
44235 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
44236 } else {
44237 return -EIO;
44238 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
44239 index 0248a4c..9648d96 100644
44240 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
44241 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
44242 @@ -191,17 +191,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
44243 case QLCNIC_NON_PRIV_FUNC:
44244 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
44245 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
44246 - nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
44247 + pax_open_kernel();
44248 + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
44249 + pax_close_kernel();
44250 break;
44251 case QLCNIC_PRIV_FUNC:
44252 ahw->op_mode = QLCNIC_PRIV_FUNC;
44253 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
44254 - nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
44255 + pax_open_kernel();
44256 + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
44257 + pax_close_kernel();
44258 break;
44259 case QLCNIC_MGMT_FUNC:
44260 ahw->op_mode = QLCNIC_MGMT_FUNC;
44261 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
44262 - nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
44263 + pax_open_kernel();
44264 + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
44265 + pax_close_kernel();
44266 break;
44267 default:
44268 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
44269 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
44270 index 1551360..ed6510f 100644
44271 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
44272 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
44273 @@ -1108,7 +1108,7 @@ int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
44274 struct qlcnic_dump_entry *entry;
44275 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
44276 struct qlcnic_dump_template_hdr *tmpl_hdr = fw_dump->tmpl_hdr;
44277 - static const struct qlcnic_dump_operations *fw_dump_ops;
44278 + const struct qlcnic_dump_operations *fw_dump_ops;
44279 struct device *dev = &adapter->pdev->dev;
44280 struct qlcnic_hardware_context *ahw;
44281 void *temp_buffer;
44282 diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
44283 index fb3f8dc..9d2ff38 100644
44284 --- a/drivers/net/ethernet/realtek/r8169.c
44285 +++ b/drivers/net/ethernet/realtek/r8169.c
44286 @@ -759,22 +759,22 @@ struct rtl8169_private {
44287 struct mdio_ops {
44288 void (*write)(struct rtl8169_private *, int, int);
44289 int (*read)(struct rtl8169_private *, int);
44290 - } mdio_ops;
44291 + } __no_const mdio_ops;
44292
44293 struct pll_power_ops {
44294 void (*down)(struct rtl8169_private *);
44295 void (*up)(struct rtl8169_private *);
44296 - } pll_power_ops;
44297 + } __no_const pll_power_ops;
44298
44299 struct jumbo_ops {
44300 void (*enable)(struct rtl8169_private *);
44301 void (*disable)(struct rtl8169_private *);
44302 - } jumbo_ops;
44303 + } __no_const jumbo_ops;
44304
44305 struct csi_ops {
44306 void (*write)(struct rtl8169_private *, int, int);
44307 u32 (*read)(struct rtl8169_private *, int);
44308 - } csi_ops;
44309 + } __no_const csi_ops;
44310
44311 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
44312 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
44313 diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
44314 index 03acf57..e1251ff 100644
44315 --- a/drivers/net/ethernet/sfc/ptp.c
44316 +++ b/drivers/net/ethernet/sfc/ptp.c
44317 @@ -539,7 +539,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
44318 ptp->start.dma_addr);
44319
44320 /* Clear flag that signals MC ready */
44321 - ACCESS_ONCE(*start) = 0;
44322 + ACCESS_ONCE_RW(*start) = 0;
44323 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
44324 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
44325 EFX_BUG_ON_PARANOID(rc);
44326 diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
44327 index 50617c5..b13724c 100644
44328 --- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
44329 +++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
44330 @@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
44331
44332 writel(value, ioaddr + MMC_CNTRL);
44333
44334 - pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
44335 - MMC_CNTRL, value);
44336 +// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
44337 +// MMC_CNTRL, value);
44338 }
44339
44340 /* To mask all all interrupts.*/
44341 diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c
44342 index 3169252..5d78c1d 100644
44343 --- a/drivers/net/hamradio/hdlcdrv.c
44344 +++ b/drivers/net/hamradio/hdlcdrv.c
44345 @@ -571,6 +571,8 @@ static int hdlcdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
44346 case HDLCDRVCTL_CALIBRATE:
44347 if(!capable(CAP_SYS_RAWIO))
44348 return -EPERM;
44349 + if (bi.data.calibrate > INT_MAX / s->par.bitrate)
44350 + return -EINVAL;
44351 s->hdlctx.calibrate = bi.data.calibrate * s->par.bitrate / 16;
44352 return 0;
44353
44354 diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
44355 index e6fe0d8..2b7d752 100644
44356 --- a/drivers/net/hyperv/hyperv_net.h
44357 +++ b/drivers/net/hyperv/hyperv_net.h
44358 @@ -101,7 +101,7 @@ struct rndis_device {
44359
44360 enum rndis_device_state state;
44361 bool link_state;
44362 - atomic_t new_req_id;
44363 + atomic_unchecked_t new_req_id;
44364
44365 spinlock_t request_lock;
44366 struct list_head req_list;
44367 diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
44368 index 0775f0a..d4fb316 100644
44369 --- a/drivers/net/hyperv/rndis_filter.c
44370 +++ b/drivers/net/hyperv/rndis_filter.c
44371 @@ -104,7 +104,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
44372 * template
44373 */
44374 set = &rndis_msg->msg.set_req;
44375 - set->req_id = atomic_inc_return(&dev->new_req_id);
44376 + set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
44377
44378 /* Add to the request list */
44379 spin_lock_irqsave(&dev->request_lock, flags);
44380 @@ -752,7 +752,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
44381
44382 /* Setup the rndis set */
44383 halt = &request->request_msg.msg.halt_req;
44384 - halt->req_id = atomic_inc_return(&dev->new_req_id);
44385 + halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
44386
44387 /* Ignore return since this msg is optional. */
44388 rndis_filter_send_request(dev, request);
44389 diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
44390 index bf0d55e..82bcfbd1 100644
44391 --- a/drivers/net/ieee802154/fakehard.c
44392 +++ b/drivers/net/ieee802154/fakehard.c
44393 @@ -364,7 +364,7 @@ static int ieee802154fake_probe(struct platform_device *pdev)
44394 phy->transmit_power = 0xbf;
44395
44396 dev->netdev_ops = &fake_ops;
44397 - dev->ml_priv = &fake_mlme;
44398 + dev->ml_priv = (void *)&fake_mlme;
44399
44400 priv = netdev_priv(dev);
44401 priv->phy = phy;
44402 diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
44403 index 9bf46bd..bfdaa84 100644
44404 --- a/drivers/net/macvlan.c
44405 +++ b/drivers/net/macvlan.c
44406 @@ -939,13 +939,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
44407 int macvlan_link_register(struct rtnl_link_ops *ops)
44408 {
44409 /* common fields */
44410 - ops->priv_size = sizeof(struct macvlan_dev);
44411 - ops->validate = macvlan_validate;
44412 - ops->maxtype = IFLA_MACVLAN_MAX;
44413 - ops->policy = macvlan_policy;
44414 - ops->changelink = macvlan_changelink;
44415 - ops->get_size = macvlan_get_size;
44416 - ops->fill_info = macvlan_fill_info;
44417 + pax_open_kernel();
44418 + *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
44419 + *(void **)&ops->validate = macvlan_validate;
44420 + *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
44421 + *(const void **)&ops->policy = macvlan_policy;
44422 + *(void **)&ops->changelink = macvlan_changelink;
44423 + *(void **)&ops->get_size = macvlan_get_size;
44424 + *(void **)&ops->fill_info = macvlan_fill_info;
44425 + pax_close_kernel();
44426
44427 return rtnl_link_register(ops);
44428 };
44429 @@ -1001,7 +1003,7 @@ static int macvlan_device_event(struct notifier_block *unused,
44430 return NOTIFY_DONE;
44431 }
44432
44433 -static struct notifier_block macvlan_notifier_block __read_mostly = {
44434 +static struct notifier_block macvlan_notifier_block = {
44435 .notifier_call = macvlan_device_event,
44436 };
44437
44438 diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
44439 index dc76670..e18f39c 100644
44440 --- a/drivers/net/macvtap.c
44441 +++ b/drivers/net/macvtap.c
44442 @@ -1189,7 +1189,7 @@ static int macvtap_device_event(struct notifier_block *unused,
44443 return NOTIFY_DONE;
44444 }
44445
44446 -static struct notifier_block macvtap_notifier_block __read_mostly = {
44447 +static struct notifier_block macvtap_notifier_block = {
44448 .notifier_call = macvtap_device_event,
44449 };
44450
44451 diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c
44452 index daec9b0..6428fcb 100644
44453 --- a/drivers/net/phy/mdio-bitbang.c
44454 +++ b/drivers/net/phy/mdio-bitbang.c
44455 @@ -234,6 +234,7 @@ void free_mdio_bitbang(struct mii_bus *bus)
44456 struct mdiobb_ctrl *ctrl = bus->priv;
44457
44458 module_put(ctrl->ops->owner);
44459 + mdiobus_unregister(bus);
44460 mdiobus_free(bus);
44461 }
44462 EXPORT_SYMBOL(free_mdio_bitbang);
44463 diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
44464 index 72ff14b..11d442d 100644
44465 --- a/drivers/net/ppp/ppp_generic.c
44466 +++ b/drivers/net/ppp/ppp_generic.c
44467 @@ -999,7 +999,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
44468 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
44469 struct ppp_stats stats;
44470 struct ppp_comp_stats cstats;
44471 - char *vers;
44472
44473 switch (cmd) {
44474 case SIOCGPPPSTATS:
44475 @@ -1021,8 +1020,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
44476 break;
44477
44478 case SIOCGPPPVER:
44479 - vers = PPP_VERSION;
44480 - if (copy_to_user(addr, vers, strlen(vers) + 1))
44481 + if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
44482 break;
44483 err = 0;
44484 break;
44485 diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
44486 index 1252d9c..80e660b 100644
44487 --- a/drivers/net/slip/slhc.c
44488 +++ b/drivers/net/slip/slhc.c
44489 @@ -488,7 +488,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
44490 register struct tcphdr *thp;
44491 register struct iphdr *ip;
44492 register struct cstate *cs;
44493 - int len, hdrlen;
44494 + long len, hdrlen;
44495 unsigned char *cp = icp;
44496
44497 /* We've got a compressed packet; read the change byte */
44498 diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
44499 index 6327df2..e6e1ebe 100644
44500 --- a/drivers/net/team/team.c
44501 +++ b/drivers/net/team/team.c
44502 @@ -2873,7 +2873,7 @@ static int team_device_event(struct notifier_block *unused,
44503 return NOTIFY_DONE;
44504 }
44505
44506 -static struct notifier_block team_notifier_block __read_mostly = {
44507 +static struct notifier_block team_notifier_block = {
44508 .notifier_call = team_device_event,
44509 };
44510
44511 diff --git a/drivers/net/tun.c b/drivers/net/tun.c
44512 index 782e38b..d076fdc 100644
44513 --- a/drivers/net/tun.c
44514 +++ b/drivers/net/tun.c
44515 @@ -1834,7 +1834,7 @@ unlock:
44516 }
44517
44518 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
44519 - unsigned long arg, int ifreq_len)
44520 + unsigned long arg, size_t ifreq_len)
44521 {
44522 struct tun_file *tfile = file->private_data;
44523 struct tun_struct *tun;
44524 @@ -1847,6 +1847,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
44525 unsigned int ifindex;
44526 int ret;
44527
44528 + if (ifreq_len > sizeof ifr)
44529 + return -EFAULT;
44530 +
44531 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
44532 if (copy_from_user(&ifr, argp, ifreq_len))
44533 return -EFAULT;
44534 diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
44535 index 86292e6..8d34433 100644
44536 --- a/drivers/net/usb/hso.c
44537 +++ b/drivers/net/usb/hso.c
44538 @@ -71,7 +71,7 @@
44539 #include <asm/byteorder.h>
44540 #include <linux/serial_core.h>
44541 #include <linux/serial.h>
44542 -
44543 +#include <asm/local.h>
44544
44545 #define MOD_AUTHOR "Option Wireless"
44546 #define MOD_DESCRIPTION "USB High Speed Option driver"
44547 @@ -1180,7 +1180,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
44548 struct urb *urb;
44549
44550 urb = serial->rx_urb[0];
44551 - if (serial->port.count > 0) {
44552 + if (atomic_read(&serial->port.count) > 0) {
44553 count = put_rxbuf_data(urb, serial);
44554 if (count == -1)
44555 return;
44556 @@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
44557 DUMP1(urb->transfer_buffer, urb->actual_length);
44558
44559 /* Anyone listening? */
44560 - if (serial->port.count == 0)
44561 + if (atomic_read(&serial->port.count) == 0)
44562 return;
44563
44564 if (status == 0) {
44565 @@ -1298,8 +1298,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
44566 tty_port_tty_set(&serial->port, tty);
44567
44568 /* check for port already opened, if not set the termios */
44569 - serial->port.count++;
44570 - if (serial->port.count == 1) {
44571 + if (atomic_inc_return(&serial->port.count) == 1) {
44572 serial->rx_state = RX_IDLE;
44573 /* Force default termio settings */
44574 _hso_serial_set_termios(tty, NULL);
44575 @@ -1311,7 +1310,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
44576 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
44577 if (result) {
44578 hso_stop_serial_device(serial->parent);
44579 - serial->port.count--;
44580 + atomic_dec(&serial->port.count);
44581 kref_put(&serial->parent->ref, hso_serial_ref_free);
44582 }
44583 } else {
44584 @@ -1348,10 +1347,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
44585
44586 /* reset the rts and dtr */
44587 /* do the actual close */
44588 - serial->port.count--;
44589 + atomic_dec(&serial->port.count);
44590
44591 - if (serial->port.count <= 0) {
44592 - serial->port.count = 0;
44593 + if (atomic_read(&serial->port.count) <= 0) {
44594 + atomic_set(&serial->port.count, 0);
44595 tty_port_tty_set(&serial->port, NULL);
44596 if (!usb_gone)
44597 hso_stop_serial_device(serial->parent);
44598 @@ -1427,7 +1426,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
44599
44600 /* the actual setup */
44601 spin_lock_irqsave(&serial->serial_lock, flags);
44602 - if (serial->port.count)
44603 + if (atomic_read(&serial->port.count))
44604 _hso_serial_set_termios(tty, old);
44605 else
44606 tty->termios = *old;
44607 @@ -1886,7 +1885,7 @@ static void intr_callback(struct urb *urb)
44608 D1("Pending read interrupt on port %d\n", i);
44609 spin_lock(&serial->serial_lock);
44610 if (serial->rx_state == RX_IDLE &&
44611 - serial->port.count > 0) {
44612 + atomic_read(&serial->port.count) > 0) {
44613 /* Setup and send a ctrl req read on
44614 * port i */
44615 if (!serial->rx_urb_filled[0]) {
44616 @@ -3062,7 +3061,7 @@ static int hso_resume(struct usb_interface *iface)
44617 /* Start all serial ports */
44618 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
44619 if (serial_table[i] && (serial_table[i]->interface == iface)) {
44620 - if (dev2ser(serial_table[i])->port.count) {
44621 + if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
44622 result =
44623 hso_start_serial_device(serial_table[i], GFP_NOIO);
44624 hso_kick_transmit(dev2ser(serial_table[i]));
44625 diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
44626 index a79e9d3..78cd4fa 100644
44627 --- a/drivers/net/usb/sierra_net.c
44628 +++ b/drivers/net/usb/sierra_net.c
44629 @@ -52,7 +52,7 @@ static const char driver_name[] = "sierra_net";
44630 /* atomic counter partially included in MAC address to make sure 2 devices
44631 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
44632 */
44633 -static atomic_t iface_counter = ATOMIC_INIT(0);
44634 +static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
44635
44636 /*
44637 * SYNC Timer Delay definition used to set the expiry time
44638 @@ -698,7 +698,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
44639 dev->net->netdev_ops = &sierra_net_device_ops;
44640
44641 /* change MAC addr to include, ifacenum, and to be unique */
44642 - dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
44643 + dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
44644 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
44645
44646 /* we will have to manufacture ethernet headers, prepare template */
44647 diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
44648 index 2ef5b62..6fa0ec3 100644
44649 --- a/drivers/net/vxlan.c
44650 +++ b/drivers/net/vxlan.c
44651 @@ -2615,7 +2615,7 @@ nla_put_failure:
44652 return -EMSGSIZE;
44653 }
44654
44655 -static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
44656 +static struct rtnl_link_ops vxlan_link_ops = {
44657 .kind = "vxlan",
44658 .maxtype = IFLA_VXLAN_MAX,
44659 .policy = vxlan_policy,
44660 diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
44661 index 0b60295..b8bfa5b 100644
44662 --- a/drivers/net/wimax/i2400m/rx.c
44663 +++ b/drivers/net/wimax/i2400m/rx.c
44664 @@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
44665 if (i2400m->rx_roq == NULL)
44666 goto error_roq_alloc;
44667
44668 - rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
44669 + rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
44670 GFP_KERNEL);
44671 if (rd == NULL) {
44672 result = -ENOMEM;
44673 diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
44674 index 7fe1964..7016de0 100644
44675 --- a/drivers/net/wireless/airo.c
44676 +++ b/drivers/net/wireless/airo.c
44677 @@ -7844,7 +7844,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
44678 struct airo_info *ai = dev->ml_priv;
44679 int ridcode;
44680 int enabled;
44681 - static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
44682 + int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
44683 unsigned char *iobuf;
44684
44685 /* Only super-user can write RIDs */
44686 diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
44687 index 34c8a33..3261fdc 100644
44688 --- a/drivers/net/wireless/at76c50x-usb.c
44689 +++ b/drivers/net/wireless/at76c50x-usb.c
44690 @@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
44691 }
44692
44693 /* Convert timeout from the DFU status to jiffies */
44694 -static inline unsigned long at76_get_timeout(struct dfu_status *s)
44695 +static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
44696 {
44697 return msecs_to_jiffies((s->poll_timeout[2] << 16)
44698 | (s->poll_timeout[1] << 8)
44699 diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
44700 index ef3329e..c28ff5d 100644
44701 --- a/drivers/net/wireless/ath/ath10k/htc.c
44702 +++ b/drivers/net/wireless/ath/ath10k/htc.c
44703 @@ -963,7 +963,10 @@ void ath10k_htc_stop(struct ath10k_htc *htc)
44704 /* registered target arrival callback from the HIF layer */
44705 int ath10k_htc_init(struct ath10k *ar)
44706 {
44707 - struct ath10k_hif_cb htc_callbacks;
44708 + static struct ath10k_hif_cb htc_callbacks = {
44709 + .rx_completion = ath10k_htc_rx_completion_handler,
44710 + .tx_completion = ath10k_htc_tx_completion_handler,
44711 + };
44712 struct ath10k_htc_ep *ep = NULL;
44713 struct ath10k_htc *htc = &ar->htc;
44714
44715 @@ -973,8 +976,6 @@ int ath10k_htc_init(struct ath10k *ar)
44716 ath10k_htc_reset_endpoint_states(htc);
44717
44718 /* setup HIF layer callbacks */
44719 - htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
44720 - htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
44721 htc->ar = ar;
44722
44723 /* Get HIF default pipe for HTC message exchange */
44724 diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
44725 index e1dd8c7..9f91b3f 100644
44726 --- a/drivers/net/wireless/ath/ath10k/htc.h
44727 +++ b/drivers/net/wireless/ath/ath10k/htc.h
44728 @@ -271,12 +271,12 @@ enum ath10k_htc_ep_id {
44729
44730 struct ath10k_htc_ops {
44731 void (*target_send_suspend_complete)(struct ath10k *ar);
44732 -};
44733 +} __no_const;
44734
44735 struct ath10k_htc_ep_ops {
44736 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
44737 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
44738 -};
44739 +} __no_const;
44740
44741 /* service connection information */
44742 struct ath10k_htc_svc_conn_req {
44743 diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
44744 index 8d78253..bebbb68 100644
44745 --- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
44746 +++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
44747 @@ -184,8 +184,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44748 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
44749 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
44750
44751 - ACCESS_ONCE(ads->ds_link) = i->link;
44752 - ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
44753 + ACCESS_ONCE_RW(ads->ds_link) = i->link;
44754 + ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
44755
44756 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
44757 ctl6 = SM(i->keytype, AR_EncrType);
44758 @@ -199,26 +199,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44759
44760 if ((i->is_first || i->is_last) &&
44761 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
44762 - ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
44763 + ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
44764 | set11nTries(i->rates, 1)
44765 | set11nTries(i->rates, 2)
44766 | set11nTries(i->rates, 3)
44767 | (i->dur_update ? AR_DurUpdateEna : 0)
44768 | SM(0, AR_BurstDur);
44769
44770 - ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
44771 + ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
44772 | set11nRate(i->rates, 1)
44773 | set11nRate(i->rates, 2)
44774 | set11nRate(i->rates, 3);
44775 } else {
44776 - ACCESS_ONCE(ads->ds_ctl2) = 0;
44777 - ACCESS_ONCE(ads->ds_ctl3) = 0;
44778 + ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
44779 + ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
44780 }
44781
44782 if (!i->is_first) {
44783 - ACCESS_ONCE(ads->ds_ctl0) = 0;
44784 - ACCESS_ONCE(ads->ds_ctl1) = ctl1;
44785 - ACCESS_ONCE(ads->ds_ctl6) = ctl6;
44786 + ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
44787 + ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
44788 + ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
44789 return;
44790 }
44791
44792 @@ -243,7 +243,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44793 break;
44794 }
44795
44796 - ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
44797 + ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
44798 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
44799 | SM(i->txpower, AR_XmitPower)
44800 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
44801 @@ -253,19 +253,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44802 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
44803 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
44804
44805 - ACCESS_ONCE(ads->ds_ctl1) = ctl1;
44806 - ACCESS_ONCE(ads->ds_ctl6) = ctl6;
44807 + ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
44808 + ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
44809
44810 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
44811 return;
44812
44813 - ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
44814 + ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
44815 | set11nPktDurRTSCTS(i->rates, 1);
44816
44817 - ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
44818 + ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
44819 | set11nPktDurRTSCTS(i->rates, 3);
44820
44821 - ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
44822 + ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
44823 | set11nRateFlags(i->rates, 1)
44824 | set11nRateFlags(i->rates, 2)
44825 | set11nRateFlags(i->rates, 3)
44826 diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
44827 index f6c5c1b..6058354 100644
44828 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
44829 +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
44830 @@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44831 (i->qcu << AR_TxQcuNum_S) | desc_len;
44832
44833 checksum += val;
44834 - ACCESS_ONCE(ads->info) = val;
44835 + ACCESS_ONCE_RW(ads->info) = val;
44836
44837 checksum += i->link;
44838 - ACCESS_ONCE(ads->link) = i->link;
44839 + ACCESS_ONCE_RW(ads->link) = i->link;
44840
44841 checksum += i->buf_addr[0];
44842 - ACCESS_ONCE(ads->data0) = i->buf_addr[0];
44843 + ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
44844 checksum += i->buf_addr[1];
44845 - ACCESS_ONCE(ads->data1) = i->buf_addr[1];
44846 + ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
44847 checksum += i->buf_addr[2];
44848 - ACCESS_ONCE(ads->data2) = i->buf_addr[2];
44849 + ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
44850 checksum += i->buf_addr[3];
44851 - ACCESS_ONCE(ads->data3) = i->buf_addr[3];
44852 + ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
44853
44854 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
44855 - ACCESS_ONCE(ads->ctl3) = val;
44856 + ACCESS_ONCE_RW(ads->ctl3) = val;
44857 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
44858 - ACCESS_ONCE(ads->ctl5) = val;
44859 + ACCESS_ONCE_RW(ads->ctl5) = val;
44860 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
44861 - ACCESS_ONCE(ads->ctl7) = val;
44862 + ACCESS_ONCE_RW(ads->ctl7) = val;
44863 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
44864 - ACCESS_ONCE(ads->ctl9) = val;
44865 + ACCESS_ONCE_RW(ads->ctl9) = val;
44866
44867 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
44868 - ACCESS_ONCE(ads->ctl10) = checksum;
44869 + ACCESS_ONCE_RW(ads->ctl10) = checksum;
44870
44871 if (i->is_first || i->is_last) {
44872 - ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
44873 + ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
44874 | set11nTries(i->rates, 1)
44875 | set11nTries(i->rates, 2)
44876 | set11nTries(i->rates, 3)
44877 | (i->dur_update ? AR_DurUpdateEna : 0)
44878 | SM(0, AR_BurstDur);
44879
44880 - ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
44881 + ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
44882 | set11nRate(i->rates, 1)
44883 | set11nRate(i->rates, 2)
44884 | set11nRate(i->rates, 3);
44885 } else {
44886 - ACCESS_ONCE(ads->ctl13) = 0;
44887 - ACCESS_ONCE(ads->ctl14) = 0;
44888 + ACCESS_ONCE_RW(ads->ctl13) = 0;
44889 + ACCESS_ONCE_RW(ads->ctl14) = 0;
44890 }
44891
44892 ads->ctl20 = 0;
44893 @@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44894
44895 ctl17 = SM(i->keytype, AR_EncrType);
44896 if (!i->is_first) {
44897 - ACCESS_ONCE(ads->ctl11) = 0;
44898 - ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
44899 - ACCESS_ONCE(ads->ctl15) = 0;
44900 - ACCESS_ONCE(ads->ctl16) = 0;
44901 - ACCESS_ONCE(ads->ctl17) = ctl17;
44902 - ACCESS_ONCE(ads->ctl18) = 0;
44903 - ACCESS_ONCE(ads->ctl19) = 0;
44904 + ACCESS_ONCE_RW(ads->ctl11) = 0;
44905 + ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
44906 + ACCESS_ONCE_RW(ads->ctl15) = 0;
44907 + ACCESS_ONCE_RW(ads->ctl16) = 0;
44908 + ACCESS_ONCE_RW(ads->ctl17) = ctl17;
44909 + ACCESS_ONCE_RW(ads->ctl18) = 0;
44910 + ACCESS_ONCE_RW(ads->ctl19) = 0;
44911 return;
44912 }
44913
44914 - ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
44915 + ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
44916 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
44917 | SM(i->txpower, AR_XmitPower)
44918 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
44919 @@ -135,22 +135,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44920 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
44921 ctl12 |= SM(val, AR_PAPRDChainMask);
44922
44923 - ACCESS_ONCE(ads->ctl12) = ctl12;
44924 - ACCESS_ONCE(ads->ctl17) = ctl17;
44925 + ACCESS_ONCE_RW(ads->ctl12) = ctl12;
44926 + ACCESS_ONCE_RW(ads->ctl17) = ctl17;
44927
44928 - ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
44929 + ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
44930 | set11nPktDurRTSCTS(i->rates, 1);
44931
44932 - ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
44933 + ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
44934 | set11nPktDurRTSCTS(i->rates, 3);
44935
44936 - ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
44937 + ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
44938 | set11nRateFlags(i->rates, 1)
44939 | set11nRateFlags(i->rates, 2)
44940 | set11nRateFlags(i->rates, 3)
44941 | SM(i->rtscts_rate, AR_RTSCTSRate);
44942
44943 - ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
44944 + ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
44945 }
44946
44947 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
44948 diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
44949 index 69a907b..91e071c 100644
44950 --- a/drivers/net/wireless/ath/ath9k/hw.h
44951 +++ b/drivers/net/wireless/ath/ath9k/hw.h
44952 @@ -657,7 +657,7 @@ struct ath_hw_private_ops {
44953
44954 /* ANI */
44955 void (*ani_cache_ini_regs)(struct ath_hw *ah);
44956 -};
44957 +} __no_const;
44958
44959 /**
44960 * struct ath_spec_scan - parameters for Atheros spectral scan
44961 @@ -729,7 +729,7 @@ struct ath_hw_ops {
44962 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
44963 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
44964 #endif
44965 -};
44966 +} __no_const;
44967
44968 struct ath_nf_limits {
44969 s16 max;
44970 diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
44971 index 92190da..f3a4c4c 100644
44972 --- a/drivers/net/wireless/b43/phy_lp.c
44973 +++ b/drivers/net/wireless/b43/phy_lp.c
44974 @@ -2514,7 +2514,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
44975 {
44976 struct ssb_bus *bus = dev->dev->sdev->bus;
44977
44978 - static const struct b206x_channel *chandata = NULL;
44979 + const struct b206x_channel *chandata = NULL;
44980 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
44981 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
44982 u16 old_comm15, scale;
44983 diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
44984 index 9581d07..84f6a76 100644
44985 --- a/drivers/net/wireless/iwlegacy/3945-mac.c
44986 +++ b/drivers/net/wireless/iwlegacy/3945-mac.c
44987 @@ -3639,7 +3639,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
44988 */
44989 if (il3945_mod_params.disable_hw_scan) {
44990 D_INFO("Disabling hw_scan\n");
44991 - il3945_mac_ops.hw_scan = NULL;
44992 + pax_open_kernel();
44993 + *(void **)&il3945_mac_ops.hw_scan = NULL;
44994 + pax_close_kernel();
44995 }
44996
44997 D_INFO("*** LOAD DRIVER ***\n");
44998 diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
44999 index d94f8ab..5b568c8 100644
45000 --- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
45001 +++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
45002 @@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
45003 {
45004 struct iwl_priv *priv = file->private_data;
45005 char buf[64];
45006 - int buf_size;
45007 + size_t buf_size;
45008 u32 offset, len;
45009
45010 memset(buf, 0, sizeof(buf));
45011 @@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
45012 struct iwl_priv *priv = file->private_data;
45013
45014 char buf[8];
45015 - int buf_size;
45016 + size_t buf_size;
45017 u32 reset_flag;
45018
45019 memset(buf, 0, sizeof(buf));
45020 @@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
45021 {
45022 struct iwl_priv *priv = file->private_data;
45023 char buf[8];
45024 - int buf_size;
45025 + size_t buf_size;
45026 int ht40;
45027
45028 memset(buf, 0, sizeof(buf));
45029 @@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
45030 {
45031 struct iwl_priv *priv = file->private_data;
45032 char buf[8];
45033 - int buf_size;
45034 + size_t buf_size;
45035 int value;
45036
45037 memset(buf, 0, sizeof(buf));
45038 @@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
45039 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
45040 DEBUGFS_READ_FILE_OPS(current_sleep_command);
45041
45042 -static const char *fmt_value = " %-30s %10u\n";
45043 -static const char *fmt_hex = " %-30s 0x%02X\n";
45044 -static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
45045 -static const char *fmt_header =
45046 +static const char fmt_value[] = " %-30s %10u\n";
45047 +static const char fmt_hex[] = " %-30s 0x%02X\n";
45048 +static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
45049 +static const char fmt_header[] =
45050 "%-32s current cumulative delta max\n";
45051
45052 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
45053 @@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
45054 {
45055 struct iwl_priv *priv = file->private_data;
45056 char buf[8];
45057 - int buf_size;
45058 + size_t buf_size;
45059 int clear;
45060
45061 memset(buf, 0, sizeof(buf));
45062 @@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
45063 {
45064 struct iwl_priv *priv = file->private_data;
45065 char buf[8];
45066 - int buf_size;
45067 + size_t buf_size;
45068 int trace;
45069
45070 memset(buf, 0, sizeof(buf));
45071 @@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
45072 {
45073 struct iwl_priv *priv = file->private_data;
45074 char buf[8];
45075 - int buf_size;
45076 + size_t buf_size;
45077 int missed;
45078
45079 memset(buf, 0, sizeof(buf));
45080 @@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
45081
45082 struct iwl_priv *priv = file->private_data;
45083 char buf[8];
45084 - int buf_size;
45085 + size_t buf_size;
45086 int plcp;
45087
45088 memset(buf, 0, sizeof(buf));
45089 @@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
45090
45091 struct iwl_priv *priv = file->private_data;
45092 char buf[8];
45093 - int buf_size;
45094 + size_t buf_size;
45095 int flush;
45096
45097 memset(buf, 0, sizeof(buf));
45098 @@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
45099
45100 struct iwl_priv *priv = file->private_data;
45101 char buf[8];
45102 - int buf_size;
45103 + size_t buf_size;
45104 int rts;
45105
45106 if (!priv->cfg->ht_params)
45107 @@ -2205,7 +2205,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
45108 {
45109 struct iwl_priv *priv = file->private_data;
45110 char buf[8];
45111 - int buf_size;
45112 + size_t buf_size;
45113
45114 memset(buf, 0, sizeof(buf));
45115 buf_size = min(count, sizeof(buf) - 1);
45116 @@ -2239,7 +2239,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
45117 struct iwl_priv *priv = file->private_data;
45118 u32 event_log_flag;
45119 char buf[8];
45120 - int buf_size;
45121 + size_t buf_size;
45122
45123 /* check that the interface is up */
45124 if (!iwl_is_ready(priv))
45125 @@ -2293,7 +2293,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
45126 struct iwl_priv *priv = file->private_data;
45127 char buf[8];
45128 u32 calib_disabled;
45129 - int buf_size;
45130 + size_t buf_size;
45131
45132 memset(buf, 0, sizeof(buf));
45133 buf_size = min(count, sizeof(buf) - 1);
45134 diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
45135 index 7aad766..06addb4 100644
45136 --- a/drivers/net/wireless/iwlwifi/dvm/main.c
45137 +++ b/drivers/net/wireless/iwlwifi/dvm/main.c
45138 @@ -1123,7 +1123,7 @@ static void iwl_option_config(struct iwl_priv *priv)
45139 static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
45140 {
45141 struct iwl_nvm_data *data = priv->nvm_data;
45142 - char *debug_msg;
45143 + static const char debug_msg[] = "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n";
45144
45145 if (data->sku_cap_11n_enable &&
45146 !priv->cfg->ht_params) {
45147 @@ -1137,7 +1137,6 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
45148 return -EINVAL;
45149 }
45150
45151 - debug_msg = "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n";
45152 IWL_DEBUG_INFO(priv, debug_msg,
45153 data->sku_cap_band_24GHz_enable ? "" : "NOT", "enabled",
45154 data->sku_cap_band_52GHz_enable ? "" : "NOT", "enabled",
45155 diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
45156 index 6bc3100..dd1b80d 100644
45157 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c
45158 +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
45159 @@ -1249,7 +1249,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
45160 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
45161
45162 char buf[8];
45163 - int buf_size;
45164 + size_t buf_size;
45165 u32 reset_flag;
45166
45167 memset(buf, 0, sizeof(buf));
45168 @@ -1270,7 +1270,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
45169 {
45170 struct iwl_trans *trans = file->private_data;
45171 char buf[8];
45172 - int buf_size;
45173 + size_t buf_size;
45174 int csr;
45175
45176 memset(buf, 0, sizeof(buf));
45177 diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
45178 index 2cd3f54..e936f90 100644
45179 --- a/drivers/net/wireless/mac80211_hwsim.c
45180 +++ b/drivers/net/wireless/mac80211_hwsim.c
45181 @@ -2196,25 +2196,19 @@ static int __init init_mac80211_hwsim(void)
45182
45183 if (channels > 1) {
45184 hwsim_if_comb.num_different_channels = channels;
45185 - mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
45186 - mac80211_hwsim_ops.cancel_hw_scan =
45187 - mac80211_hwsim_cancel_hw_scan;
45188 - mac80211_hwsim_ops.sw_scan_start = NULL;
45189 - mac80211_hwsim_ops.sw_scan_complete = NULL;
45190 - mac80211_hwsim_ops.remain_on_channel =
45191 - mac80211_hwsim_roc;
45192 - mac80211_hwsim_ops.cancel_remain_on_channel =
45193 - mac80211_hwsim_croc;
45194 - mac80211_hwsim_ops.add_chanctx =
45195 - mac80211_hwsim_add_chanctx;
45196 - mac80211_hwsim_ops.remove_chanctx =
45197 - mac80211_hwsim_remove_chanctx;
45198 - mac80211_hwsim_ops.change_chanctx =
45199 - mac80211_hwsim_change_chanctx;
45200 - mac80211_hwsim_ops.assign_vif_chanctx =
45201 - mac80211_hwsim_assign_vif_chanctx;
45202 - mac80211_hwsim_ops.unassign_vif_chanctx =
45203 - mac80211_hwsim_unassign_vif_chanctx;
45204 + pax_open_kernel();
45205 + *(void **)&mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
45206 + *(void **)&mac80211_hwsim_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
45207 + *(void **)&mac80211_hwsim_ops.sw_scan_start = NULL;
45208 + *(void **)&mac80211_hwsim_ops.sw_scan_complete = NULL;
45209 + *(void **)&mac80211_hwsim_ops.remain_on_channel = mac80211_hwsim_roc;
45210 + *(void **)&mac80211_hwsim_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
45211 + *(void **)&mac80211_hwsim_ops.add_chanctx = mac80211_hwsim_add_chanctx;
45212 + *(void **)&mac80211_hwsim_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
45213 + *(void **)&mac80211_hwsim_ops.change_chanctx = mac80211_hwsim_change_chanctx;
45214 + *(void **)&mac80211_hwsim_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
45215 + *(void **)&mac80211_hwsim_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
45216 + pax_close_kernel();
45217 }
45218
45219 spin_lock_init(&hwsim_radio_lock);
45220 diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
45221 index 8169a85..7fa3b47 100644
45222 --- a/drivers/net/wireless/rndis_wlan.c
45223 +++ b/drivers/net/wireless/rndis_wlan.c
45224 @@ -1238,7 +1238,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
45225
45226 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
45227
45228 - if (rts_threshold < 0 || rts_threshold > 2347)
45229 + if (rts_threshold > 2347)
45230 rts_threshold = 2347;
45231
45232 tmp = cpu_to_le32(rts_threshold);
45233 diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
45234 index fe4c572..99dedfa 100644
45235 --- a/drivers/net/wireless/rt2x00/rt2x00.h
45236 +++ b/drivers/net/wireless/rt2x00/rt2x00.h
45237 @@ -387,7 +387,7 @@ struct rt2x00_intf {
45238 * for hardware which doesn't support hardware
45239 * sequence counting.
45240 */
45241 - atomic_t seqno;
45242 + atomic_unchecked_t seqno;
45243 };
45244
45245 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
45246 diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
45247 index 66a2db8..70cad04 100644
45248 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c
45249 +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
45250 @@ -252,9 +252,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
45251 * sequence counter given by mac80211.
45252 */
45253 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
45254 - seqno = atomic_add_return(0x10, &intf->seqno);
45255 + seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
45256 else
45257 - seqno = atomic_read(&intf->seqno);
45258 + seqno = atomic_read_unchecked(&intf->seqno);
45259
45260 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
45261 hdr->seq_ctrl |= cpu_to_le16(seqno);
45262 diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
45263 index e2b3d9c..67a5184 100644
45264 --- a/drivers/net/wireless/ti/wl1251/sdio.c
45265 +++ b/drivers/net/wireless/ti/wl1251/sdio.c
45266 @@ -271,13 +271,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
45267
45268 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
45269
45270 - wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
45271 - wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
45272 + pax_open_kernel();
45273 + *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
45274 + *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
45275 + pax_close_kernel();
45276
45277 wl1251_info("using dedicated interrupt line");
45278 } else {
45279 - wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
45280 - wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
45281 + pax_open_kernel();
45282 + *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
45283 + *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
45284 + pax_close_kernel();
45285
45286 wl1251_info("using SDIO interrupt");
45287 }
45288 diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
45289 index 1c627da..69f7d17 100644
45290 --- a/drivers/net/wireless/ti/wl12xx/main.c
45291 +++ b/drivers/net/wireless/ti/wl12xx/main.c
45292 @@ -656,7 +656,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
45293 sizeof(wl->conf.mem));
45294
45295 /* read data preparation is only needed by wl127x */
45296 - wl->ops->prepare_read = wl127x_prepare_read;
45297 + pax_open_kernel();
45298 + *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
45299 + pax_close_kernel();
45300
45301 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
45302 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
45303 @@ -681,7 +683,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
45304 sizeof(wl->conf.mem));
45305
45306 /* read data preparation is only needed by wl127x */
45307 - wl->ops->prepare_read = wl127x_prepare_read;
45308 + pax_open_kernel();
45309 + *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
45310 + pax_close_kernel();
45311
45312 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
45313 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
45314 diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
45315 index 7aa0eb8..5a9ef38 100644
45316 --- a/drivers/net/wireless/ti/wl18xx/main.c
45317 +++ b/drivers/net/wireless/ti/wl18xx/main.c
45318 @@ -1730,8 +1730,10 @@ static int wl18xx_setup(struct wl1271 *wl)
45319 }
45320
45321 if (!checksum_param) {
45322 - wl18xx_ops.set_rx_csum = NULL;
45323 - wl18xx_ops.init_vif = NULL;
45324 + pax_open_kernel();
45325 + *(void **)&wl18xx_ops.set_rx_csum = NULL;
45326 + *(void **)&wl18xx_ops.init_vif = NULL;
45327 + pax_close_kernel();
45328 }
45329
45330 /* Enable 11a Band only if we have 5G antennas */
45331 diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
45332 index 7ef0b4a..ff65c28 100644
45333 --- a/drivers/net/wireless/zd1211rw/zd_usb.c
45334 +++ b/drivers/net/wireless/zd1211rw/zd_usb.c
45335 @@ -386,7 +386,7 @@ static inline void handle_regs_int(struct urb *urb)
45336 {
45337 struct zd_usb *usb = urb->context;
45338 struct zd_usb_interrupt *intr = &usb->intr;
45339 - int len;
45340 + unsigned int len;
45341 u16 int_num;
45342
45343 ZD_ASSERT(in_interrupt());
45344 diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
45345 index 59f95d8..53e0e7f 100644
45346 --- a/drivers/nfc/nfcwilink.c
45347 +++ b/drivers/nfc/nfcwilink.c
45348 @@ -513,7 +513,7 @@ static struct nci_ops nfcwilink_ops = {
45349
45350 static int nfcwilink_probe(struct platform_device *pdev)
45351 {
45352 - static struct nfcwilink *drv;
45353 + struct nfcwilink *drv;
45354 int rc;
45355 __u32 protocols;
45356
45357 diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
45358 index d93b2b6..ae50401 100644
45359 --- a/drivers/oprofile/buffer_sync.c
45360 +++ b/drivers/oprofile/buffer_sync.c
45361 @@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
45362 if (cookie == NO_COOKIE)
45363 offset = pc;
45364 if (cookie == INVALID_COOKIE) {
45365 - atomic_inc(&oprofile_stats.sample_lost_no_mapping);
45366 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
45367 offset = pc;
45368 }
45369 if (cookie != last_cookie) {
45370 @@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
45371 /* add userspace sample */
45372
45373 if (!mm) {
45374 - atomic_inc(&oprofile_stats.sample_lost_no_mm);
45375 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
45376 return 0;
45377 }
45378
45379 cookie = lookup_dcookie(mm, s->eip, &offset);
45380
45381 if (cookie == INVALID_COOKIE) {
45382 - atomic_inc(&oprofile_stats.sample_lost_no_mapping);
45383 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
45384 return 0;
45385 }
45386
45387 @@ -552,7 +552,7 @@ void sync_buffer(int cpu)
45388 /* ignore backtraces if failed to add a sample */
45389 if (state == sb_bt_start) {
45390 state = sb_bt_ignore;
45391 - atomic_inc(&oprofile_stats.bt_lost_no_mapping);
45392 + atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
45393 }
45394 }
45395 release_mm(mm);
45396 diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
45397 index c0cc4e7..44d4e54 100644
45398 --- a/drivers/oprofile/event_buffer.c
45399 +++ b/drivers/oprofile/event_buffer.c
45400 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
45401 }
45402
45403 if (buffer_pos == buffer_size) {
45404 - atomic_inc(&oprofile_stats.event_lost_overflow);
45405 + atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
45406 return;
45407 }
45408
45409 diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
45410 index ed2c3ec..deda85a 100644
45411 --- a/drivers/oprofile/oprof.c
45412 +++ b/drivers/oprofile/oprof.c
45413 @@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
45414 if (oprofile_ops.switch_events())
45415 return;
45416
45417 - atomic_inc(&oprofile_stats.multiplex_counter);
45418 + atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
45419 start_switch_worker();
45420 }
45421
45422 diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
45423 index ee2cfce..7f8f699 100644
45424 --- a/drivers/oprofile/oprofile_files.c
45425 +++ b/drivers/oprofile/oprofile_files.c
45426 @@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
45427
45428 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
45429
45430 -static ssize_t timeout_read(struct file *file, char __user *buf,
45431 +static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
45432 size_t count, loff_t *offset)
45433 {
45434 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
45435 diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
45436 index 59659ce..6c860a0 100644
45437 --- a/drivers/oprofile/oprofile_stats.c
45438 +++ b/drivers/oprofile/oprofile_stats.c
45439 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
45440 cpu_buf->sample_invalid_eip = 0;
45441 }
45442
45443 - atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
45444 - atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
45445 - atomic_set(&oprofile_stats.event_lost_overflow, 0);
45446 - atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
45447 - atomic_set(&oprofile_stats.multiplex_counter, 0);
45448 + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
45449 + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
45450 + atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
45451 + atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
45452 + atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
45453 }
45454
45455
45456 diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
45457 index 1fc622b..8c48fc3 100644
45458 --- a/drivers/oprofile/oprofile_stats.h
45459 +++ b/drivers/oprofile/oprofile_stats.h
45460 @@ -13,11 +13,11 @@
45461 #include <linux/atomic.h>
45462
45463 struct oprofile_stat_struct {
45464 - atomic_t sample_lost_no_mm;
45465 - atomic_t sample_lost_no_mapping;
45466 - atomic_t bt_lost_no_mapping;
45467 - atomic_t event_lost_overflow;
45468 - atomic_t multiplex_counter;
45469 + atomic_unchecked_t sample_lost_no_mm;
45470 + atomic_unchecked_t sample_lost_no_mapping;
45471 + atomic_unchecked_t bt_lost_no_mapping;
45472 + atomic_unchecked_t event_lost_overflow;
45473 + atomic_unchecked_t multiplex_counter;
45474 };
45475
45476 extern struct oprofile_stat_struct oprofile_stats;
45477 diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
45478 index 3f49345..c750d0b 100644
45479 --- a/drivers/oprofile/oprofilefs.c
45480 +++ b/drivers/oprofile/oprofilefs.c
45481 @@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
45482
45483 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
45484 {
45485 - atomic_t *val = file->private_data;
45486 - return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
45487 + atomic_unchecked_t *val = file->private_data;
45488 + return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
45489 }
45490
45491
45492 @@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
45493
45494
45495 int oprofilefs_create_ro_atomic(struct dentry *root,
45496 - char const *name, atomic_t *val)
45497 + char const *name, atomic_unchecked_t *val)
45498 {
45499 return __oprofilefs_create_file(root, name,
45500 &atomic_ro_fops, 0444, val);
45501 diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
45502 index 61be1d9..dec05d7 100644
45503 --- a/drivers/oprofile/timer_int.c
45504 +++ b/drivers/oprofile/timer_int.c
45505 @@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
45506 return NOTIFY_OK;
45507 }
45508
45509 -static struct notifier_block __refdata oprofile_cpu_notifier = {
45510 +static struct notifier_block oprofile_cpu_notifier = {
45511 .notifier_call = oprofile_cpu_notify,
45512 };
45513
45514 diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
45515 index 92ed045..62d39bd7 100644
45516 --- a/drivers/parport/procfs.c
45517 +++ b/drivers/parport/procfs.c
45518 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
45519
45520 *ppos += len;
45521
45522 - return copy_to_user(result, buffer, len) ? -EFAULT : 0;
45523 + return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
45524 }
45525
45526 #ifdef CONFIG_PARPORT_1284
45527 @@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
45528
45529 *ppos += len;
45530
45531 - return copy_to_user (result, buffer, len) ? -EFAULT : 0;
45532 + return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
45533 }
45534 #endif /* IEEE1284.3 support. */
45535
45536 diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
45537 index 2f5786c..61ab4d1 100644
45538 --- a/drivers/pci/hotplug/acpiphp_ibm.c
45539 +++ b/drivers/pci/hotplug/acpiphp_ibm.c
45540 @@ -463,7 +463,9 @@ static int __init ibm_acpiphp_init(void)
45541 goto init_cleanup;
45542 }
45543
45544 - ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
45545 + pax_open_kernel();
45546 + *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
45547 + pax_close_kernel();
45548 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
45549
45550 return retval;
45551 diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
45552 index a6a71c4..c91097b 100644
45553 --- a/drivers/pci/hotplug/cpcihp_generic.c
45554 +++ b/drivers/pci/hotplug/cpcihp_generic.c
45555 @@ -73,7 +73,6 @@ static u16 port;
45556 static unsigned int enum_bit;
45557 static u8 enum_mask;
45558
45559 -static struct cpci_hp_controller_ops generic_hpc_ops;
45560 static struct cpci_hp_controller generic_hpc;
45561
45562 static int __init validate_parameters(void)
45563 @@ -139,6 +138,10 @@ static int query_enum(void)
45564 return ((value & enum_mask) == enum_mask);
45565 }
45566
45567 +static struct cpci_hp_controller_ops generic_hpc_ops = {
45568 + .query_enum = query_enum,
45569 +};
45570 +
45571 static int __init cpcihp_generic_init(void)
45572 {
45573 int status;
45574 @@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
45575 pci_dev_put(dev);
45576
45577 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
45578 - generic_hpc_ops.query_enum = query_enum;
45579 generic_hpc.ops = &generic_hpc_ops;
45580
45581 status = cpci_hp_register_controller(&generic_hpc);
45582 diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
45583 index 449b4bb..257e2e8 100644
45584 --- a/drivers/pci/hotplug/cpcihp_zt5550.c
45585 +++ b/drivers/pci/hotplug/cpcihp_zt5550.c
45586 @@ -59,7 +59,6 @@
45587 /* local variables */
45588 static bool debug;
45589 static bool poll;
45590 -static struct cpci_hp_controller_ops zt5550_hpc_ops;
45591 static struct cpci_hp_controller zt5550_hpc;
45592
45593 /* Primary cPCI bus bridge device */
45594 @@ -205,6 +204,10 @@ static int zt5550_hc_disable_irq(void)
45595 return 0;
45596 }
45597
45598 +static struct cpci_hp_controller_ops zt5550_hpc_ops = {
45599 + .query_enum = zt5550_hc_query_enum,
45600 +};
45601 +
45602 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
45603 {
45604 int status;
45605 @@ -216,16 +219,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
45606 dbg("returned from zt5550_hc_config");
45607
45608 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
45609 - zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
45610 zt5550_hpc.ops = &zt5550_hpc_ops;
45611 if(!poll) {
45612 zt5550_hpc.irq = hc_dev->irq;
45613 zt5550_hpc.irq_flags = IRQF_SHARED;
45614 zt5550_hpc.dev_id = hc_dev;
45615
45616 - zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
45617 - zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
45618 - zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
45619 + pax_open_kernel();
45620 + *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
45621 + *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
45622 + *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
45623 + pax_open_kernel();
45624 } else {
45625 info("using ENUM# polling mode");
45626 }
45627 diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
45628 index 76ba8a1..20ca857 100644
45629 --- a/drivers/pci/hotplug/cpqphp_nvram.c
45630 +++ b/drivers/pci/hotplug/cpqphp_nvram.c
45631 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
45632
45633 void compaq_nvram_init (void __iomem *rom_start)
45634 {
45635 +
45636 +#ifndef CONFIG_PAX_KERNEXEC
45637 if (rom_start) {
45638 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
45639 }
45640 +#endif
45641 +
45642 dbg("int15 entry = %p\n", compaq_int15_entry_point);
45643
45644 /* initialize our int15 lock */
45645 diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
45646 index ec20f74..c1d961e 100644
45647 --- a/drivers/pci/hotplug/pci_hotplug_core.c
45648 +++ b/drivers/pci/hotplug/pci_hotplug_core.c
45649 @@ -441,8 +441,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
45650 return -EINVAL;
45651 }
45652
45653 - slot->ops->owner = owner;
45654 - slot->ops->mod_name = mod_name;
45655 + pax_open_kernel();
45656 + *(struct module **)&slot->ops->owner = owner;
45657 + *(const char **)&slot->ops->mod_name = mod_name;
45658 + pax_close_kernel();
45659
45660 mutex_lock(&pci_hp_mutex);
45661 /*
45662 diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
45663 index f4a18f5..ff2463c 100644
45664 --- a/drivers/pci/hotplug/pciehp_core.c
45665 +++ b/drivers/pci/hotplug/pciehp_core.c
45666 @@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
45667 struct slot *slot = ctrl->slot;
45668 struct hotplug_slot *hotplug = NULL;
45669 struct hotplug_slot_info *info = NULL;
45670 - struct hotplug_slot_ops *ops = NULL;
45671 + hotplug_slot_ops_no_const *ops = NULL;
45672 char name[SLOT_NAME_SIZE];
45673 int retval = -ENOMEM;
45674
45675 diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
45676 index 7128cfd..db7c65b 100644
45677 --- a/drivers/pci/pci-sysfs.c
45678 +++ b/drivers/pci/pci-sysfs.c
45679 @@ -634,6 +634,10 @@ pci_write_config(struct file* filp, struct kobject *kobj,
45680 loff_t init_off = off;
45681 u8 *data = (u8*) buf;
45682
45683 +#ifdef CONFIG_GRKERNSEC_KMEM
45684 + return -EPERM;
45685 +#endif
45686 +
45687 if (off > dev->cfg_size)
45688 return 0;
45689 if (off + count > dev->cfg_size) {
45690 @@ -940,6 +944,10 @@ pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
45691 resource_size_t start, end;
45692 int i;
45693
45694 +#ifdef CONFIG_GRKERNSEC_KMEM
45695 + return -EPERM;
45696 +#endif
45697 +
45698 for (i = 0; i < PCI_ROM_RESOURCE; i++)
45699 if (res == &pdev->resource[i])
45700 break;
45701 @@ -1047,6 +1055,10 @@ pci_write_resource_io(struct file *filp, struct kobject *kobj,
45702 struct bin_attribute *attr, char *buf,
45703 loff_t off, size_t count)
45704 {
45705 +#ifdef CONFIG_GRKERNSEC_KMEM
45706 + return -EPERM;
45707 +#endif
45708 +
45709 return pci_resource_io(filp, kobj, attr, buf, off, count, true);
45710 }
45711
45712 @@ -1083,7 +1095,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
45713 {
45714 /* allocate attribute structure, piggyback attribute name */
45715 int name_len = write_combine ? 13 : 10;
45716 - struct bin_attribute *res_attr;
45717 + bin_attribute_no_const *res_attr;
45718 int retval;
45719
45720 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
45721 @@ -1268,7 +1280,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
45722 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
45723 {
45724 int retval;
45725 - struct bin_attribute *attr;
45726 + bin_attribute_no_const *attr;
45727
45728 /* If the device has VPD, try to expose it in sysfs. */
45729 if (dev->vpd) {
45730 @@ -1315,7 +1327,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
45731 {
45732 int retval;
45733 int rom_size = 0;
45734 - struct bin_attribute *attr;
45735 + bin_attribute_no_const *attr;
45736
45737 if (!sysfs_initialized)
45738 return -EACCES;
45739 diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
45740 index 8a00c06..18a9715 100644
45741 --- a/drivers/pci/pci.h
45742 +++ b/drivers/pci/pci.h
45743 @@ -95,7 +95,7 @@ struct pci_vpd_ops {
45744 struct pci_vpd {
45745 unsigned int len;
45746 const struct pci_vpd_ops *ops;
45747 - struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
45748 + bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
45749 };
45750
45751 int pci_vpd_pci22_init(struct pci_dev *dev);
45752 diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
45753 index 403a443..034e050 100644
45754 --- a/drivers/pci/pcie/aspm.c
45755 +++ b/drivers/pci/pcie/aspm.c
45756 @@ -27,9 +27,9 @@
45757 #define MODULE_PARAM_PREFIX "pcie_aspm."
45758
45759 /* Note: those are not register definitions */
45760 -#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
45761 -#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
45762 -#define ASPM_STATE_L1 (4) /* L1 state */
45763 +#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
45764 +#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
45765 +#define ASPM_STATE_L1 (4U) /* L1 state */
45766 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
45767 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
45768
45769 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
45770 index 7ef0f86..17b710f 100644
45771 --- a/drivers/pci/probe.c
45772 +++ b/drivers/pci/probe.c
45773 @@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
45774 struct pci_bus_region region, inverted_region;
45775 bool bar_too_big = false, bar_disabled = false;
45776
45777 - mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
45778 + mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
45779
45780 /* No printks while decoding is disabled! */
45781 if (!dev->mmio_always_on) {
45782 diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
45783 index cdc7836..2e0eb94 100644
45784 --- a/drivers/pci/proc.c
45785 +++ b/drivers/pci/proc.c
45786 @@ -117,6 +117,10 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof
45787 int size = dev->cfg_size;
45788 int cnt;
45789
45790 +#ifdef CONFIG_GRKERNSEC_KMEM
45791 + return -EPERM;
45792 +#endif
45793 +
45794 if (pos >= size)
45795 return 0;
45796 if (nbytes >= size)
45797 @@ -196,6 +200,10 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
45798 #endif /* HAVE_PCI_MMAP */
45799 int ret = 0;
45800
45801 +#ifdef CONFIG_GRKERNSEC_KMEM
45802 + return -EPERM;
45803 +#endif
45804 +
45805 switch (cmd) {
45806 case PCIIOC_CONTROLLER:
45807 ret = pci_domain_nr(dev->bus);
45808 @@ -234,6 +242,10 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
45809 struct pci_filp_private *fpriv = file->private_data;
45810 int i, ret;
45811
45812 +#ifdef CONFIG_GRKERNSEC_KMEM
45813 + return -EPERM;
45814 +#endif
45815 +
45816 if (!capable(CAP_SYS_RAWIO))
45817 return -EPERM;
45818
45819 @@ -434,7 +446,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
45820 static int __init pci_proc_init(void)
45821 {
45822 struct pci_dev *dev = NULL;
45823 +
45824 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
45825 +#ifdef CONFIG_GRKERNSEC_PROC_USER
45826 + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
45827 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45828 + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
45829 +#endif
45830 +#else
45831 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
45832 +#endif
45833 proc_create("devices", 0, proc_bus_pci_dir,
45834 &proc_bus_pci_dev_operations);
45835 proc_initialized = 1;
45836 diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c
45837 index e1c1ec5..bef4210 100644
45838 --- a/drivers/pci/syscall.c
45839 +++ b/drivers/pci/syscall.c
45840 @@ -92,6 +92,10 @@ SYSCALL_DEFINE5(pciconfig_write, unsigned long, bus, unsigned long, dfn,
45841 u32 dword;
45842 int err = 0;
45843
45844 +#ifdef CONFIG_GRKERNSEC_KMEM
45845 + return -EPERM
45846 +#endif
45847 +
45848 if (!capable(CAP_SYS_ADMIN))
45849 return -EPERM;
45850
45851 diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
45852 index 19c313b..ed28b38 100644
45853 --- a/drivers/platform/x86/asus-wmi.c
45854 +++ b/drivers/platform/x86/asus-wmi.c
45855 @@ -1618,6 +1618,10 @@ static int show_dsts(struct seq_file *m, void *data)
45856 int err;
45857 u32 retval = -1;
45858
45859 +#ifdef CONFIG_GRKERNSEC_KMEM
45860 + return -EPERM;
45861 +#endif
45862 +
45863 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
45864
45865 if (err < 0)
45866 @@ -1634,6 +1638,10 @@ static int show_devs(struct seq_file *m, void *data)
45867 int err;
45868 u32 retval = -1;
45869
45870 +#ifdef CONFIG_GRKERNSEC_KMEM
45871 + return -EPERM;
45872 +#endif
45873 +
45874 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
45875 &retval);
45876
45877 @@ -1658,6 +1666,10 @@ static int show_call(struct seq_file *m, void *data)
45878 union acpi_object *obj;
45879 acpi_status status;
45880
45881 +#ifdef CONFIG_GRKERNSEC_KMEM
45882 + return -EPERM;
45883 +#endif
45884 +
45885 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
45886 1, asus->debug.method_id,
45887 &input, &output);
45888 diff --git a/drivers/platform/x86/chromeos_laptop.c b/drivers/platform/x86/chromeos_laptop.c
45889 index 3e5b4497..dcdfb70 100644
45890 --- a/drivers/platform/x86/chromeos_laptop.c
45891 +++ b/drivers/platform/x86/chromeos_laptop.c
45892 @@ -301,7 +301,7 @@ static int __init setup_tsl2563_als(const struct dmi_system_id *id)
45893 return 0;
45894 }
45895
45896 -static struct dmi_system_id __initdata chromeos_laptop_dmi_table[] = {
45897 +static struct dmi_system_id __initconst chromeos_laptop_dmi_table[] = {
45898 {
45899 .ident = "Samsung Series 5 550 - Touchpad",
45900 .matches = {
45901 diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
45902 index 62f8030..c7f2a45 100644
45903 --- a/drivers/platform/x86/msi-laptop.c
45904 +++ b/drivers/platform/x86/msi-laptop.c
45905 @@ -1000,12 +1000,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
45906
45907 if (!quirks->ec_read_only) {
45908 /* allow userland write sysfs file */
45909 - dev_attr_bluetooth.store = store_bluetooth;
45910 - dev_attr_wlan.store = store_wlan;
45911 - dev_attr_threeg.store = store_threeg;
45912 - dev_attr_bluetooth.attr.mode |= S_IWUSR;
45913 - dev_attr_wlan.attr.mode |= S_IWUSR;
45914 - dev_attr_threeg.attr.mode |= S_IWUSR;
45915 + pax_open_kernel();
45916 + *(void **)&dev_attr_bluetooth.store = store_bluetooth;
45917 + *(void **)&dev_attr_wlan.store = store_wlan;
45918 + *(void **)&dev_attr_threeg.store = store_threeg;
45919 + *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
45920 + *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
45921 + *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
45922 + pax_close_kernel();
45923 }
45924
45925 /* disable hardware control by fn key */
45926 diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
45927 index 70222f2..8c8ce66 100644
45928 --- a/drivers/platform/x86/msi-wmi.c
45929 +++ b/drivers/platform/x86/msi-wmi.c
45930 @@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
45931 static void msi_wmi_notify(u32 value, void *context)
45932 {
45933 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
45934 - static struct key_entry *key;
45935 + struct key_entry *key;
45936 union acpi_object *obj;
45937 acpi_status status;
45938
45939 diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
45940 index 3484dd2..13ee730 100644
45941 --- a/drivers/platform/x86/sony-laptop.c
45942 +++ b/drivers/platform/x86/sony-laptop.c
45943 @@ -2448,7 +2448,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
45944 }
45945
45946 /* High speed charging function */
45947 -static struct device_attribute *hsc_handle;
45948 +static device_attribute_no_const *hsc_handle;
45949
45950 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
45951 struct device_attribute *attr,
45952 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
45953 index 4e86e97..04d50d1 100644
45954 --- a/drivers/platform/x86/thinkpad_acpi.c
45955 +++ b/drivers/platform/x86/thinkpad_acpi.c
45956 @@ -2091,7 +2091,7 @@ static int hotkey_mask_get(void)
45957 return 0;
45958 }
45959
45960 -void static hotkey_mask_warn_incomplete_mask(void)
45961 +static void hotkey_mask_warn_incomplete_mask(void)
45962 {
45963 /* log only what the user can fix... */
45964 const u32 wantedmask = hotkey_driver_mask &
45965 @@ -2318,11 +2318,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
45966 }
45967 }
45968
45969 -static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
45970 - struct tp_nvram_state *newn,
45971 - const u32 event_mask)
45972 -{
45973 -
45974 #define TPACPI_COMPARE_KEY(__scancode, __member) \
45975 do { \
45976 if ((event_mask & (1 << __scancode)) && \
45977 @@ -2336,36 +2331,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
45978 tpacpi_hotkey_send_key(__scancode); \
45979 } while (0)
45980
45981 - void issue_volchange(const unsigned int oldvol,
45982 - const unsigned int newvol)
45983 - {
45984 - unsigned int i = oldvol;
45985 +static void issue_volchange(const unsigned int oldvol,
45986 + const unsigned int newvol,
45987 + const u32 event_mask)
45988 +{
45989 + unsigned int i = oldvol;
45990
45991 - while (i > newvol) {
45992 - TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
45993 - i--;
45994 - }
45995 - while (i < newvol) {
45996 - TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
45997 - i++;
45998 - }
45999 + while (i > newvol) {
46000 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
46001 + i--;
46002 }
46003 + while (i < newvol) {
46004 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
46005 + i++;
46006 + }
46007 +}
46008
46009 - void issue_brightnesschange(const unsigned int oldbrt,
46010 - const unsigned int newbrt)
46011 - {
46012 - unsigned int i = oldbrt;
46013 +static void issue_brightnesschange(const unsigned int oldbrt,
46014 + const unsigned int newbrt,
46015 + const u32 event_mask)
46016 +{
46017 + unsigned int i = oldbrt;
46018
46019 - while (i > newbrt) {
46020 - TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
46021 - i--;
46022 - }
46023 - while (i < newbrt) {
46024 - TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
46025 - i++;
46026 - }
46027 + while (i > newbrt) {
46028 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
46029 + i--;
46030 + }
46031 + while (i < newbrt) {
46032 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
46033 + i++;
46034 }
46035 +}
46036
46037 +static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
46038 + struct tp_nvram_state *newn,
46039 + const u32 event_mask)
46040 +{
46041 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
46042 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
46043 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
46044 @@ -2399,7 +2400,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
46045 oldn->volume_level != newn->volume_level) {
46046 /* recently muted, or repeated mute keypress, or
46047 * multiple presses ending in mute */
46048 - issue_volchange(oldn->volume_level, newn->volume_level);
46049 + issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
46050 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
46051 }
46052 } else {
46053 @@ -2409,7 +2410,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
46054 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
46055 }
46056 if (oldn->volume_level != newn->volume_level) {
46057 - issue_volchange(oldn->volume_level, newn->volume_level);
46058 + issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
46059 } else if (oldn->volume_toggle != newn->volume_toggle) {
46060 /* repeated vol up/down keypress at end of scale ? */
46061 if (newn->volume_level == 0)
46062 @@ -2422,7 +2423,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
46063 /* handle brightness */
46064 if (oldn->brightness_level != newn->brightness_level) {
46065 issue_brightnesschange(oldn->brightness_level,
46066 - newn->brightness_level);
46067 + newn->brightness_level,
46068 + event_mask);
46069 } else if (oldn->brightness_toggle != newn->brightness_toggle) {
46070 /* repeated key presses that didn't change state */
46071 if (newn->brightness_level == 0)
46072 @@ -2431,10 +2433,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
46073 && !tp_features.bright_unkfw)
46074 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
46075 }
46076 +}
46077
46078 #undef TPACPI_COMPARE_KEY
46079 #undef TPACPI_MAY_SEND_KEY
46080 -}
46081
46082 /*
46083 * Polling driver
46084 diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
46085 index 769d265..a3a05ca 100644
46086 --- a/drivers/pnp/pnpbios/bioscalls.c
46087 +++ b/drivers/pnp/pnpbios/bioscalls.c
46088 @@ -58,7 +58,7 @@ do { \
46089 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
46090 } while(0)
46091
46092 -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
46093 +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
46094 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
46095
46096 /*
46097 @@ -95,7 +95,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
46098
46099 cpu = get_cpu();
46100 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
46101 +
46102 + pax_open_kernel();
46103 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
46104 + pax_close_kernel();
46105
46106 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
46107 spin_lock_irqsave(&pnp_bios_lock, flags);
46108 @@ -133,7 +136,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
46109 :"memory");
46110 spin_unlock_irqrestore(&pnp_bios_lock, flags);
46111
46112 + pax_open_kernel();
46113 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
46114 + pax_close_kernel();
46115 +
46116 put_cpu();
46117
46118 /* If we get here and this is set then the PnP BIOS faulted on us. */
46119 @@ -467,7 +473,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
46120 return status;
46121 }
46122
46123 -void pnpbios_calls_init(union pnp_bios_install_struct *header)
46124 +void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
46125 {
46126 int i;
46127
46128 @@ -475,6 +481,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
46129 pnp_bios_callpoint.offset = header->fields.pm16offset;
46130 pnp_bios_callpoint.segment = PNP_CS16;
46131
46132 + pax_open_kernel();
46133 +
46134 for_each_possible_cpu(i) {
46135 struct desc_struct *gdt = get_cpu_gdt_table(i);
46136 if (!gdt)
46137 @@ -486,4 +494,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
46138 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
46139 (unsigned long)__va(header->fields.pm16dseg));
46140 }
46141 +
46142 + pax_close_kernel();
46143 }
46144 diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
46145 index d95e101..67f0c3f 100644
46146 --- a/drivers/pnp/resource.c
46147 +++ b/drivers/pnp/resource.c
46148 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
46149 return 1;
46150
46151 /* check if the resource is valid */
46152 - if (*irq < 0 || *irq > 15)
46153 + if (*irq > 15)
46154 return 0;
46155
46156 /* check if the resource is reserved */
46157 @@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
46158 return 1;
46159
46160 /* check if the resource is valid */
46161 - if (*dma < 0 || *dma == 4 || *dma > 7)
46162 + if (*dma == 4 || *dma > 7)
46163 return 0;
46164
46165 /* check if the resource is reserved */
46166 diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
46167 index 0c52e2a..3421ab7 100644
46168 --- a/drivers/power/pda_power.c
46169 +++ b/drivers/power/pda_power.c
46170 @@ -37,7 +37,11 @@ static int polling;
46171
46172 #if IS_ENABLED(CONFIG_USB_PHY)
46173 static struct usb_phy *transceiver;
46174 -static struct notifier_block otg_nb;
46175 +static int otg_handle_notification(struct notifier_block *nb,
46176 + unsigned long event, void *unused);
46177 +static struct notifier_block otg_nb = {
46178 + .notifier_call = otg_handle_notification
46179 +};
46180 #endif
46181
46182 static struct regulator *ac_draw;
46183 @@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
46184
46185 #if IS_ENABLED(CONFIG_USB_PHY)
46186 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
46187 - otg_nb.notifier_call = otg_handle_notification;
46188 ret = usb_register_notifier(transceiver, &otg_nb);
46189 if (ret) {
46190 dev_err(dev, "failure to register otg notifier\n");
46191 diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
46192 index cc439fd..8fa30df 100644
46193 --- a/drivers/power/power_supply.h
46194 +++ b/drivers/power/power_supply.h
46195 @@ -16,12 +16,12 @@ struct power_supply;
46196
46197 #ifdef CONFIG_SYSFS
46198
46199 -extern void power_supply_init_attrs(struct device_type *dev_type);
46200 +extern void power_supply_init_attrs(void);
46201 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
46202
46203 #else
46204
46205 -static inline void power_supply_init_attrs(struct device_type *dev_type) {}
46206 +static inline void power_supply_init_attrs(void) {}
46207 #define power_supply_uevent NULL
46208
46209 #endif /* CONFIG_SYSFS */
46210 diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
46211 index 00e6672..2642c08 100644
46212 --- a/drivers/power/power_supply_core.c
46213 +++ b/drivers/power/power_supply_core.c
46214 @@ -24,7 +24,10 @@
46215 struct class *power_supply_class;
46216 EXPORT_SYMBOL_GPL(power_supply_class);
46217
46218 -static struct device_type power_supply_dev_type;
46219 +extern const struct attribute_group *power_supply_attr_groups[];
46220 +static struct device_type power_supply_dev_type = {
46221 + .groups = power_supply_attr_groups,
46222 +};
46223
46224 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
46225 struct power_supply *supply)
46226 @@ -584,7 +587,7 @@ static int __init power_supply_class_init(void)
46227 return PTR_ERR(power_supply_class);
46228
46229 power_supply_class->dev_uevent = power_supply_uevent;
46230 - power_supply_init_attrs(&power_supply_dev_type);
46231 + power_supply_init_attrs();
46232
46233 return 0;
46234 }
46235 diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
46236 index 44420d1..967126e 100644
46237 --- a/drivers/power/power_supply_sysfs.c
46238 +++ b/drivers/power/power_supply_sysfs.c
46239 @@ -230,17 +230,15 @@ static struct attribute_group power_supply_attr_group = {
46240 .is_visible = power_supply_attr_is_visible,
46241 };
46242
46243 -static const struct attribute_group *power_supply_attr_groups[] = {
46244 +const struct attribute_group *power_supply_attr_groups[] = {
46245 &power_supply_attr_group,
46246 NULL,
46247 };
46248
46249 -void power_supply_init_attrs(struct device_type *dev_type)
46250 +void power_supply_init_attrs(void)
46251 {
46252 int i;
46253
46254 - dev_type->groups = power_supply_attr_groups;
46255 -
46256 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
46257 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
46258 }
46259 diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
46260 index a01b8b3..37c2afe 100644
46261 --- a/drivers/regulator/core.c
46262 +++ b/drivers/regulator/core.c
46263 @@ -3307,7 +3307,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
46264 {
46265 const struct regulation_constraints *constraints = NULL;
46266 const struct regulator_init_data *init_data;
46267 - static atomic_t regulator_no = ATOMIC_INIT(0);
46268 + static atomic_unchecked_t regulator_no = ATOMIC_INIT(0);
46269 struct regulator_dev *rdev;
46270 struct device *dev;
46271 int ret, i;
46272 @@ -3377,7 +3377,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
46273 rdev->dev.of_node = config->of_node;
46274 rdev->dev.parent = dev;
46275 dev_set_name(&rdev->dev, "regulator.%d",
46276 - atomic_inc_return(&regulator_no) - 1);
46277 + atomic_inc_return_unchecked(&regulator_no) - 1);
46278 ret = device_register(&rdev->dev);
46279 if (ret != 0) {
46280 put_device(&rdev->dev);
46281 diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
46282 index 144bcac..d20e7db 100644
46283 --- a/drivers/regulator/max8660.c
46284 +++ b/drivers/regulator/max8660.c
46285 @@ -420,8 +420,10 @@ static int max8660_probe(struct i2c_client *client,
46286 max8660->shadow_regs[MAX8660_OVER1] = 5;
46287 } else {
46288 /* Otherwise devices can be toggled via software */
46289 - max8660_dcdc_ops.enable = max8660_dcdc_enable;
46290 - max8660_dcdc_ops.disable = max8660_dcdc_disable;
46291 + pax_open_kernel();
46292 + *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
46293 + *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
46294 + pax_close_kernel();
46295 }
46296
46297 /*
46298 diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
46299 index 5b77ab7..a62f061 100644
46300 --- a/drivers/regulator/max8973-regulator.c
46301 +++ b/drivers/regulator/max8973-regulator.c
46302 @@ -406,9 +406,11 @@ static int max8973_probe(struct i2c_client *client,
46303 if (!pdata || !pdata->enable_ext_control) {
46304 max->desc.enable_reg = MAX8973_VOUT;
46305 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
46306 - max->ops.enable = regulator_enable_regmap;
46307 - max->ops.disable = regulator_disable_regmap;
46308 - max->ops.is_enabled = regulator_is_enabled_regmap;
46309 + pax_open_kernel();
46310 + *(void **)&max->ops.enable = regulator_enable_regmap;
46311 + *(void **)&max->ops.disable = regulator_disable_regmap;
46312 + *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
46313 + pax_close_kernel();
46314 }
46315
46316 if (pdata) {
46317 diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
46318 index 1037e07..e64dea1 100644
46319 --- a/drivers/regulator/mc13892-regulator.c
46320 +++ b/drivers/regulator/mc13892-regulator.c
46321 @@ -582,10 +582,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
46322 }
46323 mc13xxx_unlock(mc13892);
46324
46325 - mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
46326 + pax_open_kernel();
46327 + *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
46328 = mc13892_vcam_set_mode;
46329 - mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
46330 + *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
46331 = mc13892_vcam_get_mode;
46332 + pax_close_kernel();
46333
46334 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
46335 ARRAY_SIZE(mc13892_regulators));
46336 diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
46337 index 24e733c..bfbaa3e 100644
46338 --- a/drivers/rtc/rtc-cmos.c
46339 +++ b/drivers/rtc/rtc-cmos.c
46340 @@ -731,7 +731,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
46341 hpet_rtc_timer_init();
46342
46343 /* export at least the first block of NVRAM */
46344 - nvram.size = address_space - NVRAM_OFFSET;
46345 + pax_open_kernel();
46346 + *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
46347 + pax_close_kernel();
46348 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
46349 if (retval < 0) {
46350 dev_dbg(dev, "can't create nvram file? %d\n", retval);
46351 diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
46352 index d049393..bb20be0 100644
46353 --- a/drivers/rtc/rtc-dev.c
46354 +++ b/drivers/rtc/rtc-dev.c
46355 @@ -16,6 +16,7 @@
46356 #include <linux/module.h>
46357 #include <linux/rtc.h>
46358 #include <linux/sched.h>
46359 +#include <linux/grsecurity.h>
46360 #include "rtc-core.h"
46361
46362 static dev_t rtc_devt;
46363 @@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
46364 if (copy_from_user(&tm, uarg, sizeof(tm)))
46365 return -EFAULT;
46366
46367 + gr_log_timechange();
46368 +
46369 return rtc_set_time(rtc, &tm);
46370
46371 case RTC_PIE_ON:
46372 diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
46373 index ca18fd1..055e42d 100644
46374 --- a/drivers/rtc/rtc-ds1307.c
46375 +++ b/drivers/rtc/rtc-ds1307.c
46376 @@ -107,7 +107,7 @@ struct ds1307 {
46377 u8 offset; /* register's offset */
46378 u8 regs[11];
46379 u16 nvram_offset;
46380 - struct bin_attribute *nvram;
46381 + bin_attribute_no_const *nvram;
46382 enum ds_type type;
46383 unsigned long flags;
46384 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
46385 diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
46386 index fcb0329..d77b7f2 100644
46387 --- a/drivers/rtc/rtc-m48t59.c
46388 +++ b/drivers/rtc/rtc-m48t59.c
46389 @@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
46390 if (IS_ERR(m48t59->rtc))
46391 return PTR_ERR(m48t59->rtc);
46392
46393 - m48t59_nvram_attr.size = pdata->offset;
46394 + pax_open_kernel();
46395 + *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
46396 + pax_close_kernel();
46397
46398 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
46399 if (ret)
46400 diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
46401 index 14b5f8d..cc9bd26 100644
46402 --- a/drivers/scsi/aic7xxx/aic79xx_pci.c
46403 +++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
46404 @@ -827,7 +827,7 @@ ahd_pci_intr(struct ahd_softc *ahd)
46405 for (bit = 0; bit < 8; bit++) {
46406
46407 if ((pci_status[i] & (0x1 << bit)) != 0) {
46408 - static const char *s;
46409 + const char *s;
46410
46411 s = pci_status_strings[bit];
46412 if (i == 7/*TARG*/ && bit == 3)
46413 @@ -887,23 +887,15 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat)
46414
46415 for (bit = 0; bit < 8; bit++) {
46416
46417 - if ((split_status[i] & (0x1 << bit)) != 0) {
46418 - static const char *s;
46419 -
46420 - s = split_status_strings[bit];
46421 - printk(s, ahd_name(ahd),
46422 + if ((split_status[i] & (0x1 << bit)) != 0)
46423 + printk(split_status_strings[bit], ahd_name(ahd),
46424 split_status_source[i]);
46425 - }
46426
46427 if (i > 1)
46428 continue;
46429
46430 - if ((sg_split_status[i] & (0x1 << bit)) != 0) {
46431 - static const char *s;
46432 -
46433 - s = split_status_strings[bit];
46434 - printk(s, ahd_name(ahd), "SG");
46435 - }
46436 + if ((sg_split_status[i] & (0x1 << bit)) != 0)
46437 + printk(split_status_strings[bit], ahd_name(ahd), "SG");
46438 }
46439 }
46440 /*
46441 diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
46442 index e693af6..2e525b6 100644
46443 --- a/drivers/scsi/bfa/bfa_fcpim.h
46444 +++ b/drivers/scsi/bfa/bfa_fcpim.h
46445 @@ -36,7 +36,7 @@ struct bfa_iotag_s {
46446
46447 struct bfa_itn_s {
46448 bfa_isr_func_t isr;
46449 -};
46450 +} __no_const;
46451
46452 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
46453 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
46454 diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
46455 index 90814fe..4384138 100644
46456 --- a/drivers/scsi/bfa/bfa_ioc.h
46457 +++ b/drivers/scsi/bfa/bfa_ioc.h
46458 @@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
46459 bfa_ioc_disable_cbfn_t disable_cbfn;
46460 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
46461 bfa_ioc_reset_cbfn_t reset_cbfn;
46462 -};
46463 +} __no_const;
46464
46465 /*
46466 * IOC event notification mechanism.
46467 @@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
46468 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
46469 enum bfi_ioc_state fwstate);
46470 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
46471 -};
46472 +} __no_const;
46473
46474 /*
46475 * Queue element to wait for room in request queue. FIFO order is
46476 diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
46477 index c9382d6..6619864 100644
46478 --- a/drivers/scsi/fcoe/fcoe_sysfs.c
46479 +++ b/drivers/scsi/fcoe/fcoe_sysfs.c
46480 @@ -33,8 +33,8 @@
46481 */
46482 #include "libfcoe.h"
46483
46484 -static atomic_t ctlr_num;
46485 -static atomic_t fcf_num;
46486 +static atomic_unchecked_t ctlr_num;
46487 +static atomic_unchecked_t fcf_num;
46488
46489 /*
46490 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
46491 @@ -681,7 +681,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
46492 if (!ctlr)
46493 goto out;
46494
46495 - ctlr->id = atomic_inc_return(&ctlr_num) - 1;
46496 + ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
46497 ctlr->f = f;
46498 ctlr->mode = FIP_CONN_TYPE_FABRIC;
46499 INIT_LIST_HEAD(&ctlr->fcfs);
46500 @@ -898,7 +898,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
46501 fcf->dev.parent = &ctlr->dev;
46502 fcf->dev.bus = &fcoe_bus_type;
46503 fcf->dev.type = &fcoe_fcf_device_type;
46504 - fcf->id = atomic_inc_return(&fcf_num) - 1;
46505 + fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
46506 fcf->state = FCOE_FCF_STATE_UNKNOWN;
46507
46508 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
46509 @@ -934,8 +934,8 @@ int __init fcoe_sysfs_setup(void)
46510 {
46511 int error;
46512
46513 - atomic_set(&ctlr_num, 0);
46514 - atomic_set(&fcf_num, 0);
46515 + atomic_set_unchecked(&ctlr_num, 0);
46516 + atomic_set_unchecked(&fcf_num, 0);
46517
46518 error = bus_register(&fcoe_bus_type);
46519 if (error)
46520 diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
46521 index 3cafe0d..f1e87f8 100644
46522 --- a/drivers/scsi/hosts.c
46523 +++ b/drivers/scsi/hosts.c
46524 @@ -42,7 +42,7 @@
46525 #include "scsi_logging.h"
46526
46527
46528 -static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
46529 +static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
46530
46531
46532 static void scsi_host_cls_release(struct device *dev)
46533 @@ -361,7 +361,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
46534 * subtract one because we increment first then return, but we need to
46535 * know what the next host number was before increment
46536 */
46537 - shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
46538 + shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
46539 shost->dma_channel = 0xff;
46540
46541 /* These three are default values which can be overridden */
46542 diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
46543 index 0eb0940..3ca9b79 100644
46544 --- a/drivers/scsi/hpsa.c
46545 +++ b/drivers/scsi/hpsa.c
46546 @@ -579,7 +579,7 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
46547 unsigned long flags;
46548
46549 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
46550 - return h->access.command_completed(h, q);
46551 + return h->access->command_completed(h, q);
46552
46553 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
46554 a = rq->head[rq->current_entry];
46555 @@ -3445,7 +3445,7 @@ static void start_io(struct ctlr_info *h)
46556 while (!list_empty(&h->reqQ)) {
46557 c = list_entry(h->reqQ.next, struct CommandList, list);
46558 /* can't do anything if fifo is full */
46559 - if ((h->access.fifo_full(h))) {
46560 + if ((h->access->fifo_full(h))) {
46561 dev_warn(&h->pdev->dev, "fifo full\n");
46562 break;
46563 }
46564 @@ -3467,7 +3467,7 @@ static void start_io(struct ctlr_info *h)
46565
46566 /* Tell the controller execute command */
46567 spin_unlock_irqrestore(&h->lock, flags);
46568 - h->access.submit_command(h, c);
46569 + h->access->submit_command(h, c);
46570 spin_lock_irqsave(&h->lock, flags);
46571 }
46572 spin_unlock_irqrestore(&h->lock, flags);
46573 @@ -3475,17 +3475,17 @@ static void start_io(struct ctlr_info *h)
46574
46575 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
46576 {
46577 - return h->access.command_completed(h, q);
46578 + return h->access->command_completed(h, q);
46579 }
46580
46581 static inline bool interrupt_pending(struct ctlr_info *h)
46582 {
46583 - return h->access.intr_pending(h);
46584 + return h->access->intr_pending(h);
46585 }
46586
46587 static inline long interrupt_not_for_us(struct ctlr_info *h)
46588 {
46589 - return (h->access.intr_pending(h) == 0) ||
46590 + return (h->access->intr_pending(h) == 0) ||
46591 (h->interrupts_enabled == 0);
46592 }
46593
46594 @@ -4387,7 +4387,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
46595 if (prod_index < 0)
46596 return -ENODEV;
46597 h->product_name = products[prod_index].product_name;
46598 - h->access = *(products[prod_index].access);
46599 + h->access = products[prod_index].access;
46600
46601 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
46602 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
46603 @@ -4669,7 +4669,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
46604
46605 assert_spin_locked(&lockup_detector_lock);
46606 remove_ctlr_from_lockup_detector_list(h);
46607 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
46608 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
46609 spin_lock_irqsave(&h->lock, flags);
46610 h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
46611 spin_unlock_irqrestore(&h->lock, flags);
46612 @@ -4846,7 +4846,7 @@ reinit_after_soft_reset:
46613 }
46614
46615 /* make sure the board interrupts are off */
46616 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
46617 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
46618
46619 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
46620 goto clean2;
46621 @@ -4880,7 +4880,7 @@ reinit_after_soft_reset:
46622 * fake ones to scoop up any residual completions.
46623 */
46624 spin_lock_irqsave(&h->lock, flags);
46625 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
46626 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
46627 spin_unlock_irqrestore(&h->lock, flags);
46628 free_irqs(h);
46629 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
46630 @@ -4899,9 +4899,9 @@ reinit_after_soft_reset:
46631 dev_info(&h->pdev->dev, "Board READY.\n");
46632 dev_info(&h->pdev->dev,
46633 "Waiting for stale completions to drain.\n");
46634 - h->access.set_intr_mask(h, HPSA_INTR_ON);
46635 + h->access->set_intr_mask(h, HPSA_INTR_ON);
46636 msleep(10000);
46637 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
46638 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
46639
46640 rc = controller_reset_failed(h->cfgtable);
46641 if (rc)
46642 @@ -4922,7 +4922,7 @@ reinit_after_soft_reset:
46643 }
46644
46645 /* Turn the interrupts on so we can service requests */
46646 - h->access.set_intr_mask(h, HPSA_INTR_ON);
46647 + h->access->set_intr_mask(h, HPSA_INTR_ON);
46648
46649 hpsa_hba_inquiry(h);
46650 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
46651 @@ -4977,7 +4977,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
46652 * To write all data in the battery backed cache to disks
46653 */
46654 hpsa_flush_cache(h);
46655 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
46656 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
46657 hpsa_free_irqs_and_disable_msix(h);
46658 }
46659
46660 @@ -5145,7 +5145,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 use_short_tags)
46661 return;
46662 }
46663 /* Change the access methods to the performant access methods */
46664 - h->access = SA5_performant_access;
46665 + h->access = &SA5_performant_access;
46666 h->transMethod = CFGTBL_Trans_Performant;
46667 }
46668
46669 diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
46670 index bc85e72..ae04a39 100644
46671 --- a/drivers/scsi/hpsa.h
46672 +++ b/drivers/scsi/hpsa.h
46673 @@ -79,7 +79,7 @@ struct ctlr_info {
46674 unsigned int msix_vector;
46675 unsigned int msi_vector;
46676 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
46677 - struct access_method access;
46678 + struct access_method *access;
46679
46680 /* queue and queue Info */
46681 struct list_head reqQ;
46682 diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
46683 index 5879929..32b241d 100644
46684 --- a/drivers/scsi/libfc/fc_exch.c
46685 +++ b/drivers/scsi/libfc/fc_exch.c
46686 @@ -100,12 +100,12 @@ struct fc_exch_mgr {
46687 u16 pool_max_index;
46688
46689 struct {
46690 - atomic_t no_free_exch;
46691 - atomic_t no_free_exch_xid;
46692 - atomic_t xid_not_found;
46693 - atomic_t xid_busy;
46694 - atomic_t seq_not_found;
46695 - atomic_t non_bls_resp;
46696 + atomic_unchecked_t no_free_exch;
46697 + atomic_unchecked_t no_free_exch_xid;
46698 + atomic_unchecked_t xid_not_found;
46699 + atomic_unchecked_t xid_busy;
46700 + atomic_unchecked_t seq_not_found;
46701 + atomic_unchecked_t non_bls_resp;
46702 } stats;
46703 };
46704
46705 @@ -736,7 +736,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
46706 /* allocate memory for exchange */
46707 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
46708 if (!ep) {
46709 - atomic_inc(&mp->stats.no_free_exch);
46710 + atomic_inc_unchecked(&mp->stats.no_free_exch);
46711 goto out;
46712 }
46713 memset(ep, 0, sizeof(*ep));
46714 @@ -797,7 +797,7 @@ out:
46715 return ep;
46716 err:
46717 spin_unlock_bh(&pool->lock);
46718 - atomic_inc(&mp->stats.no_free_exch_xid);
46719 + atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
46720 mempool_free(ep, mp->ep_pool);
46721 return NULL;
46722 }
46723 @@ -940,7 +940,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
46724 xid = ntohs(fh->fh_ox_id); /* we originated exch */
46725 ep = fc_exch_find(mp, xid);
46726 if (!ep) {
46727 - atomic_inc(&mp->stats.xid_not_found);
46728 + atomic_inc_unchecked(&mp->stats.xid_not_found);
46729 reject = FC_RJT_OX_ID;
46730 goto out;
46731 }
46732 @@ -970,7 +970,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
46733 ep = fc_exch_find(mp, xid);
46734 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
46735 if (ep) {
46736 - atomic_inc(&mp->stats.xid_busy);
46737 + atomic_inc_unchecked(&mp->stats.xid_busy);
46738 reject = FC_RJT_RX_ID;
46739 goto rel;
46740 }
46741 @@ -981,7 +981,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
46742 }
46743 xid = ep->xid; /* get our XID */
46744 } else if (!ep) {
46745 - atomic_inc(&mp->stats.xid_not_found);
46746 + atomic_inc_unchecked(&mp->stats.xid_not_found);
46747 reject = FC_RJT_RX_ID; /* XID not found */
46748 goto out;
46749 }
46750 @@ -998,7 +998,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
46751 } else {
46752 sp = &ep->seq;
46753 if (sp->id != fh->fh_seq_id) {
46754 - atomic_inc(&mp->stats.seq_not_found);
46755 + atomic_inc_unchecked(&mp->stats.seq_not_found);
46756 if (f_ctl & FC_FC_END_SEQ) {
46757 /*
46758 * Update sequence_id based on incoming last
46759 @@ -1448,22 +1448,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
46760
46761 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
46762 if (!ep) {
46763 - atomic_inc(&mp->stats.xid_not_found);
46764 + atomic_inc_unchecked(&mp->stats.xid_not_found);
46765 goto out;
46766 }
46767 if (ep->esb_stat & ESB_ST_COMPLETE) {
46768 - atomic_inc(&mp->stats.xid_not_found);
46769 + atomic_inc_unchecked(&mp->stats.xid_not_found);
46770 goto rel;
46771 }
46772 if (ep->rxid == FC_XID_UNKNOWN)
46773 ep->rxid = ntohs(fh->fh_rx_id);
46774 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
46775 - atomic_inc(&mp->stats.xid_not_found);
46776 + atomic_inc_unchecked(&mp->stats.xid_not_found);
46777 goto rel;
46778 }
46779 if (ep->did != ntoh24(fh->fh_s_id) &&
46780 ep->did != FC_FID_FLOGI) {
46781 - atomic_inc(&mp->stats.xid_not_found);
46782 + atomic_inc_unchecked(&mp->stats.xid_not_found);
46783 goto rel;
46784 }
46785 sof = fr_sof(fp);
46786 @@ -1472,7 +1472,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
46787 sp->ssb_stat |= SSB_ST_RESP;
46788 sp->id = fh->fh_seq_id;
46789 } else if (sp->id != fh->fh_seq_id) {
46790 - atomic_inc(&mp->stats.seq_not_found);
46791 + atomic_inc_unchecked(&mp->stats.seq_not_found);
46792 goto rel;
46793 }
46794
46795 @@ -1536,9 +1536,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
46796 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
46797
46798 if (!sp)
46799 - atomic_inc(&mp->stats.xid_not_found);
46800 + atomic_inc_unchecked(&mp->stats.xid_not_found);
46801 else
46802 - atomic_inc(&mp->stats.non_bls_resp);
46803 + atomic_inc_unchecked(&mp->stats.non_bls_resp);
46804
46805 fc_frame_free(fp);
46806 }
46807 @@ -2185,13 +2185,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
46808
46809 list_for_each_entry(ema, &lport->ema_list, ema_list) {
46810 mp = ema->mp;
46811 - st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
46812 + st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
46813 st->fc_no_free_exch_xid +=
46814 - atomic_read(&mp->stats.no_free_exch_xid);
46815 - st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
46816 - st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
46817 - st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
46818 - st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
46819 + atomic_read_unchecked(&mp->stats.no_free_exch_xid);
46820 + st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
46821 + st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
46822 + st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
46823 + st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
46824 }
46825 }
46826 EXPORT_SYMBOL(fc_exch_update_stats);
46827 diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
46828 index d289583..b745eec 100644
46829 --- a/drivers/scsi/libsas/sas_ata.c
46830 +++ b/drivers/scsi/libsas/sas_ata.c
46831 @@ -554,7 +554,7 @@ static struct ata_port_operations sas_sata_ops = {
46832 .postreset = ata_std_postreset,
46833 .error_handler = ata_std_error_handler,
46834 .post_internal_cmd = sas_ata_post_internal,
46835 - .qc_defer = ata_std_qc_defer,
46836 + .qc_defer = ata_std_qc_defer,
46837 .qc_prep = ata_noop_qc_prep,
46838 .qc_issue = sas_ata_qc_issue,
46839 .qc_fill_rtf = sas_ata_qc_fill_rtf,
46840 diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
46841 index 4e1b75c..0bbdfa9 100644
46842 --- a/drivers/scsi/lpfc/lpfc.h
46843 +++ b/drivers/scsi/lpfc/lpfc.h
46844 @@ -432,7 +432,7 @@ struct lpfc_vport {
46845 struct dentry *debug_nodelist;
46846 struct dentry *vport_debugfs_root;
46847 struct lpfc_debugfs_trc *disc_trc;
46848 - atomic_t disc_trc_cnt;
46849 + atomic_unchecked_t disc_trc_cnt;
46850 #endif
46851 uint8_t stat_data_enabled;
46852 uint8_t stat_data_blocked;
46853 @@ -865,8 +865,8 @@ struct lpfc_hba {
46854 struct timer_list fabric_block_timer;
46855 unsigned long bit_flags;
46856 #define FABRIC_COMANDS_BLOCKED 0
46857 - atomic_t num_rsrc_err;
46858 - atomic_t num_cmd_success;
46859 + atomic_unchecked_t num_rsrc_err;
46860 + atomic_unchecked_t num_cmd_success;
46861 unsigned long last_rsrc_error_time;
46862 unsigned long last_ramp_down_time;
46863 unsigned long last_ramp_up_time;
46864 @@ -902,7 +902,7 @@ struct lpfc_hba {
46865
46866 struct dentry *debug_slow_ring_trc;
46867 struct lpfc_debugfs_trc *slow_ring_trc;
46868 - atomic_t slow_ring_trc_cnt;
46869 + atomic_unchecked_t slow_ring_trc_cnt;
46870 /* iDiag debugfs sub-directory */
46871 struct dentry *idiag_root;
46872 struct dentry *idiag_pci_cfg;
46873 diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
46874 index 60084e6..0e2e700 100644
46875 --- a/drivers/scsi/lpfc/lpfc_debugfs.c
46876 +++ b/drivers/scsi/lpfc/lpfc_debugfs.c
46877 @@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
46878
46879 #include <linux/debugfs.h>
46880
46881 -static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
46882 +static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
46883 static unsigned long lpfc_debugfs_start_time = 0L;
46884
46885 /* iDiag */
46886 @@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
46887 lpfc_debugfs_enable = 0;
46888
46889 len = 0;
46890 - index = (atomic_read(&vport->disc_trc_cnt) + 1) &
46891 + index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
46892 (lpfc_debugfs_max_disc_trc - 1);
46893 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
46894 dtp = vport->disc_trc + i;
46895 @@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
46896 lpfc_debugfs_enable = 0;
46897
46898 len = 0;
46899 - index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
46900 + index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
46901 (lpfc_debugfs_max_slow_ring_trc - 1);
46902 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
46903 dtp = phba->slow_ring_trc + i;
46904 @@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
46905 !vport || !vport->disc_trc)
46906 return;
46907
46908 - index = atomic_inc_return(&vport->disc_trc_cnt) &
46909 + index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
46910 (lpfc_debugfs_max_disc_trc - 1);
46911 dtp = vport->disc_trc + index;
46912 dtp->fmt = fmt;
46913 dtp->data1 = data1;
46914 dtp->data2 = data2;
46915 dtp->data3 = data3;
46916 - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
46917 + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
46918 dtp->jif = jiffies;
46919 #endif
46920 return;
46921 @@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
46922 !phba || !phba->slow_ring_trc)
46923 return;
46924
46925 - index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
46926 + index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
46927 (lpfc_debugfs_max_slow_ring_trc - 1);
46928 dtp = phba->slow_ring_trc + index;
46929 dtp->fmt = fmt;
46930 dtp->data1 = data1;
46931 dtp->data2 = data2;
46932 dtp->data3 = data3;
46933 - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
46934 + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
46935 dtp->jif = jiffies;
46936 #endif
46937 return;
46938 @@ -4168,7 +4168,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
46939 "slow_ring buffer\n");
46940 goto debug_failed;
46941 }
46942 - atomic_set(&phba->slow_ring_trc_cnt, 0);
46943 + atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
46944 memset(phba->slow_ring_trc, 0,
46945 (sizeof(struct lpfc_debugfs_trc) *
46946 lpfc_debugfs_max_slow_ring_trc));
46947 @@ -4214,7 +4214,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
46948 "buffer\n");
46949 goto debug_failed;
46950 }
46951 - atomic_set(&vport->disc_trc_cnt, 0);
46952 + atomic_set_unchecked(&vport->disc_trc_cnt, 0);
46953
46954 snprintf(name, sizeof(name), "discovery_trace");
46955 vport->debug_disc_trc =
46956 diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
46957 index 647f5bf..d0068b9 100644
46958 --- a/drivers/scsi/lpfc/lpfc_init.c
46959 +++ b/drivers/scsi/lpfc/lpfc_init.c
46960 @@ -10952,8 +10952,10 @@ lpfc_init(void)
46961 "misc_register returned with status %d", error);
46962
46963 if (lpfc_enable_npiv) {
46964 - lpfc_transport_functions.vport_create = lpfc_vport_create;
46965 - lpfc_transport_functions.vport_delete = lpfc_vport_delete;
46966 + pax_open_kernel();
46967 + *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
46968 + *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
46969 + pax_close_kernel();
46970 }
46971 lpfc_transport_template =
46972 fc_attach_transport(&lpfc_transport_functions);
46973 diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
46974 index c913e8c..d34a119 100644
46975 --- a/drivers/scsi/lpfc/lpfc_scsi.c
46976 +++ b/drivers/scsi/lpfc/lpfc_scsi.c
46977 @@ -353,7 +353,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
46978 uint32_t evt_posted;
46979
46980 spin_lock_irqsave(&phba->hbalock, flags);
46981 - atomic_inc(&phba->num_rsrc_err);
46982 + atomic_inc_unchecked(&phba->num_rsrc_err);
46983 phba->last_rsrc_error_time = jiffies;
46984
46985 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
46986 @@ -394,7 +394,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
46987 unsigned long flags;
46988 struct lpfc_hba *phba = vport->phba;
46989 uint32_t evt_posted;
46990 - atomic_inc(&phba->num_cmd_success);
46991 + atomic_inc_unchecked(&phba->num_cmd_success);
46992
46993 if (vport->cfg_lun_queue_depth <= queue_depth)
46994 return;
46995 @@ -438,8 +438,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
46996 unsigned long num_rsrc_err, num_cmd_success;
46997 int i;
46998
46999 - num_rsrc_err = atomic_read(&phba->num_rsrc_err);
47000 - num_cmd_success = atomic_read(&phba->num_cmd_success);
47001 + num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
47002 + num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
47003
47004 /*
47005 * The error and success command counters are global per
47006 @@ -467,8 +467,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
47007 }
47008 }
47009 lpfc_destroy_vport_work_array(phba, vports);
47010 - atomic_set(&phba->num_rsrc_err, 0);
47011 - atomic_set(&phba->num_cmd_success, 0);
47012 + atomic_set_unchecked(&phba->num_rsrc_err, 0);
47013 + atomic_set_unchecked(&phba->num_cmd_success, 0);
47014 }
47015
47016 /**
47017 @@ -502,8 +502,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
47018 }
47019 }
47020 lpfc_destroy_vport_work_array(phba, vports);
47021 - atomic_set(&phba->num_rsrc_err, 0);
47022 - atomic_set(&phba->num_cmd_success, 0);
47023 + atomic_set_unchecked(&phba->num_rsrc_err, 0);
47024 + atomic_set_unchecked(&phba->num_cmd_success, 0);
47025 }
47026
47027 /**
47028 diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
47029 index 7f0af4f..193ac3e 100644
47030 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
47031 +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
47032 @@ -1557,7 +1557,7 @@ _scsih_get_resync(struct device *dev)
47033 {
47034 struct scsi_device *sdev = to_scsi_device(dev);
47035 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
47036 - static struct _raid_device *raid_device;
47037 + struct _raid_device *raid_device;
47038 unsigned long flags;
47039 Mpi2RaidVolPage0_t vol_pg0;
47040 Mpi2ConfigReply_t mpi_reply;
47041 @@ -1609,7 +1609,7 @@ _scsih_get_state(struct device *dev)
47042 {
47043 struct scsi_device *sdev = to_scsi_device(dev);
47044 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
47045 - static struct _raid_device *raid_device;
47046 + struct _raid_device *raid_device;
47047 unsigned long flags;
47048 Mpi2RaidVolPage0_t vol_pg0;
47049 Mpi2ConfigReply_t mpi_reply;
47050 @@ -6637,7 +6637,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
47051 struct fw_event_work *fw_event)
47052 {
47053 Mpi2EventDataIrOperationStatus_t *event_data = fw_event->event_data;
47054 - static struct _raid_device *raid_device;
47055 + struct _raid_device *raid_device;
47056 unsigned long flags;
47057 u16 handle;
47058
47059 @@ -7108,7 +7108,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
47060 u64 sas_address;
47061 struct _sas_device *sas_device;
47062 struct _sas_node *expander_device;
47063 - static struct _raid_device *raid_device;
47064 + struct _raid_device *raid_device;
47065 u8 retry_count;
47066 unsigned long flags;
47067
47068 diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
47069 index a38f71b..f3bc572 100644
47070 --- a/drivers/scsi/pmcraid.c
47071 +++ b/drivers/scsi/pmcraid.c
47072 @@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
47073 res->scsi_dev = scsi_dev;
47074 scsi_dev->hostdata = res;
47075 res->change_detected = 0;
47076 - atomic_set(&res->read_failures, 0);
47077 - atomic_set(&res->write_failures, 0);
47078 + atomic_set_unchecked(&res->read_failures, 0);
47079 + atomic_set_unchecked(&res->write_failures, 0);
47080 rc = 0;
47081 }
47082 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
47083 @@ -2676,9 +2676,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
47084
47085 /* If this was a SCSI read/write command keep count of errors */
47086 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
47087 - atomic_inc(&res->read_failures);
47088 + atomic_inc_unchecked(&res->read_failures);
47089 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
47090 - atomic_inc(&res->write_failures);
47091 + atomic_inc_unchecked(&res->write_failures);
47092
47093 if (!RES_IS_GSCSI(res->cfg_entry) &&
47094 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
47095 @@ -3534,7 +3534,7 @@ static int pmcraid_queuecommand_lck(
47096 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
47097 * hrrq_id assigned here in queuecommand
47098 */
47099 - ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
47100 + ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
47101 pinstance->num_hrrq;
47102 cmd->cmd_done = pmcraid_io_done;
47103
47104 @@ -3846,7 +3846,7 @@ static long pmcraid_ioctl_passthrough(
47105 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
47106 * hrrq_id assigned here in queuecommand
47107 */
47108 - ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
47109 + ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
47110 pinstance->num_hrrq;
47111
47112 if (request_size) {
47113 @@ -4484,7 +4484,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
47114
47115 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
47116 /* add resources only after host is added into system */
47117 - if (!atomic_read(&pinstance->expose_resources))
47118 + if (!atomic_read_unchecked(&pinstance->expose_resources))
47119 return;
47120
47121 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
47122 @@ -5311,8 +5311,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
47123 init_waitqueue_head(&pinstance->reset_wait_q);
47124
47125 atomic_set(&pinstance->outstanding_cmds, 0);
47126 - atomic_set(&pinstance->last_message_id, 0);
47127 - atomic_set(&pinstance->expose_resources, 0);
47128 + atomic_set_unchecked(&pinstance->last_message_id, 0);
47129 + atomic_set_unchecked(&pinstance->expose_resources, 0);
47130
47131 INIT_LIST_HEAD(&pinstance->free_res_q);
47132 INIT_LIST_HEAD(&pinstance->used_res_q);
47133 @@ -6025,7 +6025,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
47134 /* Schedule worker thread to handle CCN and take care of adding and
47135 * removing devices to OS
47136 */
47137 - atomic_set(&pinstance->expose_resources, 1);
47138 + atomic_set_unchecked(&pinstance->expose_resources, 1);
47139 schedule_work(&pinstance->worker_q);
47140 return rc;
47141
47142 diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
47143 index e1d150f..6c6df44 100644
47144 --- a/drivers/scsi/pmcraid.h
47145 +++ b/drivers/scsi/pmcraid.h
47146 @@ -748,7 +748,7 @@ struct pmcraid_instance {
47147 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
47148
47149 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
47150 - atomic_t last_message_id;
47151 + atomic_unchecked_t last_message_id;
47152
47153 /* configuration table */
47154 struct pmcraid_config_table *cfg_table;
47155 @@ -777,7 +777,7 @@ struct pmcraid_instance {
47156 atomic_t outstanding_cmds;
47157
47158 /* should add/delete resources to mid-layer now ?*/
47159 - atomic_t expose_resources;
47160 + atomic_unchecked_t expose_resources;
47161
47162
47163
47164 @@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
47165 struct pmcraid_config_table_entry_ext cfg_entry_ext;
47166 };
47167 struct scsi_device *scsi_dev; /* Link scsi_device structure */
47168 - atomic_t read_failures; /* count of failed READ commands */
47169 - atomic_t write_failures; /* count of failed WRITE commands */
47170 + atomic_unchecked_t read_failures; /* count of failed READ commands */
47171 + atomic_unchecked_t write_failures; /* count of failed WRITE commands */
47172
47173 /* To indicate add/delete/modify during CCN */
47174 u8 change_detected;
47175 diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
47176 index 5f174b8..98d32b0 100644
47177 --- a/drivers/scsi/qla2xxx/qla_attr.c
47178 +++ b/drivers/scsi/qla2xxx/qla_attr.c
47179 @@ -2040,7 +2040,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
47180 return 0;
47181 }
47182
47183 -struct fc_function_template qla2xxx_transport_functions = {
47184 +fc_function_template_no_const qla2xxx_transport_functions = {
47185
47186 .show_host_node_name = 1,
47187 .show_host_port_name = 1,
47188 @@ -2088,7 +2088,7 @@ struct fc_function_template qla2xxx_transport_functions = {
47189 .bsg_timeout = qla24xx_bsg_timeout,
47190 };
47191
47192 -struct fc_function_template qla2xxx_transport_vport_functions = {
47193 +fc_function_template_no_const qla2xxx_transport_vport_functions = {
47194
47195 .show_host_node_name = 1,
47196 .show_host_port_name = 1,
47197 diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
47198 index 4446bf5..9a3574d 100644
47199 --- a/drivers/scsi/qla2xxx/qla_gbl.h
47200 +++ b/drivers/scsi/qla2xxx/qla_gbl.h
47201 @@ -538,8 +538,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *);
47202 struct device_attribute;
47203 extern struct device_attribute *qla2x00_host_attrs[];
47204 struct fc_function_template;
47205 -extern struct fc_function_template qla2xxx_transport_functions;
47206 -extern struct fc_function_template qla2xxx_transport_vport_functions;
47207 +extern fc_function_template_no_const qla2xxx_transport_functions;
47208 +extern fc_function_template_no_const qla2xxx_transport_vport_functions;
47209 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
47210 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *);
47211 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
47212 diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
47213 index 9f01bbb..5e1dcee 100644
47214 --- a/drivers/scsi/qla2xxx/qla_os.c
47215 +++ b/drivers/scsi/qla2xxx/qla_os.c
47216 @@ -1572,8 +1572,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
47217 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
47218 /* Ok, a 64bit DMA mask is applicable. */
47219 ha->flags.enable_64bit_addressing = 1;
47220 - ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
47221 - ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
47222 + pax_open_kernel();
47223 + *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
47224 + *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
47225 + pax_close_kernel();
47226 return;
47227 }
47228 }
47229 diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
47230 index 41327d4..feb03d479 100644
47231 --- a/drivers/scsi/qla4xxx/ql4_def.h
47232 +++ b/drivers/scsi/qla4xxx/ql4_def.h
47233 @@ -296,7 +296,7 @@ struct ddb_entry {
47234 * (4000 only) */
47235 atomic_t relogin_timer; /* Max Time to wait for
47236 * relogin to complete */
47237 - atomic_t relogin_retry_count; /* Num of times relogin has been
47238 + atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
47239 * retried */
47240 uint32_t default_time2wait; /* Default Min time between
47241 * relogins (+aens) */
47242 diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
47243 index f8a0a26..ec03cee 100644
47244 --- a/drivers/scsi/qla4xxx/ql4_os.c
47245 +++ b/drivers/scsi/qla4xxx/ql4_os.c
47246 @@ -3066,12 +3066,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
47247 */
47248 if (!iscsi_is_session_online(cls_sess)) {
47249 /* Reset retry relogin timer */
47250 - atomic_inc(&ddb_entry->relogin_retry_count);
47251 + atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
47252 DEBUG2(ql4_printk(KERN_INFO, ha,
47253 "%s: index[%d] relogin timed out-retrying"
47254 " relogin (%d), retry (%d)\n", __func__,
47255 ddb_entry->fw_ddb_index,
47256 - atomic_read(&ddb_entry->relogin_retry_count),
47257 + atomic_read_unchecked(&ddb_entry->relogin_retry_count),
47258 ddb_entry->default_time2wait + 4));
47259 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
47260 atomic_set(&ddb_entry->retry_relogin_timer,
47261 @@ -5209,7 +5209,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
47262
47263 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
47264 atomic_set(&ddb_entry->relogin_timer, 0);
47265 - atomic_set(&ddb_entry->relogin_retry_count, 0);
47266 + atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
47267 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
47268 ddb_entry->default_relogin_timeout =
47269 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
47270 diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
47271 index eaa808e..95f8841 100644
47272 --- a/drivers/scsi/scsi.c
47273 +++ b/drivers/scsi/scsi.c
47274 @@ -661,7 +661,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
47275 unsigned long timeout;
47276 int rtn = 0;
47277
47278 - atomic_inc(&cmd->device->iorequest_cnt);
47279 + atomic_inc_unchecked(&cmd->device->iorequest_cnt);
47280
47281 /* check if the device is still usable */
47282 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
47283 diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
47284 index d1549b7..2f60767 100644
47285 --- a/drivers/scsi/scsi_lib.c
47286 +++ b/drivers/scsi/scsi_lib.c
47287 @@ -1474,7 +1474,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
47288 shost = sdev->host;
47289 scsi_init_cmd_errh(cmd);
47290 cmd->result = DID_NO_CONNECT << 16;
47291 - atomic_inc(&cmd->device->iorequest_cnt);
47292 + atomic_inc_unchecked(&cmd->device->iorequest_cnt);
47293
47294 /*
47295 * SCSI request completion path will do scsi_device_unbusy(),
47296 @@ -1500,9 +1500,9 @@ static void scsi_softirq_done(struct request *rq)
47297
47298 INIT_LIST_HEAD(&cmd->eh_entry);
47299
47300 - atomic_inc(&cmd->device->iodone_cnt);
47301 + atomic_inc_unchecked(&cmd->device->iodone_cnt);
47302 if (cmd->result)
47303 - atomic_inc(&cmd->device->ioerr_cnt);
47304 + atomic_inc_unchecked(&cmd->device->ioerr_cnt);
47305
47306 disposition = scsi_decide_disposition(cmd);
47307 if (disposition != SUCCESS &&
47308 diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
47309 index 40c6394..62356c2 100644
47310 --- a/drivers/scsi/scsi_sysfs.c
47311 +++ b/drivers/scsi/scsi_sysfs.c
47312 @@ -687,7 +687,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
47313 char *buf) \
47314 { \
47315 struct scsi_device *sdev = to_scsi_device(dev); \
47316 - unsigned long long count = atomic_read(&sdev->field); \
47317 + unsigned long long count = atomic_read_unchecked(&sdev->field); \
47318 return snprintf(buf, 20, "0x%llx\n", count); \
47319 } \
47320 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
47321 diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
47322 index 84a1fdf..693b0d6 100644
47323 --- a/drivers/scsi/scsi_tgt_lib.c
47324 +++ b/drivers/scsi/scsi_tgt_lib.c
47325 @@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
47326 int err;
47327
47328 dprintk("%lx %u\n", uaddr, len);
47329 - err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
47330 + err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
47331 if (err) {
47332 /*
47333 * TODO: need to fixup sg_tablesize, max_segment_size,
47334 diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
47335 index 4628fd5..a94a1c2 100644
47336 --- a/drivers/scsi/scsi_transport_fc.c
47337 +++ b/drivers/scsi/scsi_transport_fc.c
47338 @@ -497,7 +497,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
47339 * Netlink Infrastructure
47340 */
47341
47342 -static atomic_t fc_event_seq;
47343 +static atomic_unchecked_t fc_event_seq;
47344
47345 /**
47346 * fc_get_event_number - Obtain the next sequential FC event number
47347 @@ -510,7 +510,7 @@ static atomic_t fc_event_seq;
47348 u32
47349 fc_get_event_number(void)
47350 {
47351 - return atomic_add_return(1, &fc_event_seq);
47352 + return atomic_add_return_unchecked(1, &fc_event_seq);
47353 }
47354 EXPORT_SYMBOL(fc_get_event_number);
47355
47356 @@ -654,7 +654,7 @@ static __init int fc_transport_init(void)
47357 {
47358 int error;
47359
47360 - atomic_set(&fc_event_seq, 0);
47361 + atomic_set_unchecked(&fc_event_seq, 0);
47362
47363 error = transport_class_register(&fc_host_class);
47364 if (error)
47365 @@ -844,7 +844,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
47366 char *cp;
47367
47368 *val = simple_strtoul(buf, &cp, 0);
47369 - if ((*cp && (*cp != '\n')) || (*val < 0))
47370 + if (*cp && (*cp != '\n'))
47371 return -EINVAL;
47372 /*
47373 * Check for overflow; dev_loss_tmo is u32
47374 diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
47375 index e4a989f..293090c 100644
47376 --- a/drivers/scsi/scsi_transport_iscsi.c
47377 +++ b/drivers/scsi/scsi_transport_iscsi.c
47378 @@ -79,7 +79,7 @@ struct iscsi_internal {
47379 struct transport_container session_cont;
47380 };
47381
47382 -static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
47383 +static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
47384 static struct workqueue_struct *iscsi_eh_timer_workq;
47385
47386 static DEFINE_IDA(iscsi_sess_ida);
47387 @@ -1737,7 +1737,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
47388 int err;
47389
47390 ihost = shost->shost_data;
47391 - session->sid = atomic_add_return(1, &iscsi_session_nr);
47392 + session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
47393
47394 if (target_id == ISCSI_MAX_TARGET) {
47395 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
47396 @@ -4077,7 +4077,7 @@ static __init int iscsi_transport_init(void)
47397 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
47398 ISCSI_TRANSPORT_VERSION);
47399
47400 - atomic_set(&iscsi_session_nr, 0);
47401 + atomic_set_unchecked(&iscsi_session_nr, 0);
47402
47403 err = class_register(&iscsi_transport_class);
47404 if (err)
47405 diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
47406 index f379c7f..e8fc69c 100644
47407 --- a/drivers/scsi/scsi_transport_srp.c
47408 +++ b/drivers/scsi/scsi_transport_srp.c
47409 @@ -33,7 +33,7 @@
47410 #include "scsi_transport_srp_internal.h"
47411
47412 struct srp_host_attrs {
47413 - atomic_t next_port_id;
47414 + atomic_unchecked_t next_port_id;
47415 };
47416 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
47417
47418 @@ -61,7 +61,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
47419 struct Scsi_Host *shost = dev_to_shost(dev);
47420 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
47421
47422 - atomic_set(&srp_host->next_port_id, 0);
47423 + atomic_set_unchecked(&srp_host->next_port_id, 0);
47424 return 0;
47425 }
47426
47427 @@ -210,7 +210,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
47428 memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
47429 rport->roles = ids->roles;
47430
47431 - id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
47432 + id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
47433 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
47434
47435 transport_setup_device(&rport->dev);
47436 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
47437 index 2634d69..fcf7a81 100644
47438 --- a/drivers/scsi/sd.c
47439 +++ b/drivers/scsi/sd.c
47440 @@ -2940,7 +2940,7 @@ static int sd_probe(struct device *dev)
47441 sdkp->disk = gd;
47442 sdkp->index = index;
47443 atomic_set(&sdkp->openers, 0);
47444 - atomic_set(&sdkp->device->ioerr_cnt, 0);
47445 + atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
47446
47447 if (!sdp->request_queue->rq_timeout) {
47448 if (sdp->type != TYPE_MOD)
47449 diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
47450 index df5e961..df6b97f 100644
47451 --- a/drivers/scsi/sg.c
47452 +++ b/drivers/scsi/sg.c
47453 @@ -1102,7 +1102,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
47454 sdp->disk->disk_name,
47455 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
47456 NULL,
47457 - (char *)arg);
47458 + (char __user *)arg);
47459 case BLKTRACESTART:
47460 return blk_trace_startstop(sdp->device->request_queue, 1);
47461 case BLKTRACESTOP:
47462 diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
47463 index 9e039c6..ae9e800 100644
47464 --- a/drivers/spi/spi.c
47465 +++ b/drivers/spi/spi.c
47466 @@ -1762,7 +1762,7 @@ int spi_bus_unlock(struct spi_master *master)
47467 EXPORT_SYMBOL_GPL(spi_bus_unlock);
47468
47469 /* portable code must never pass more than 32 bytes */
47470 -#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES)
47471 +#define SPI_BUFSIZ max(32UL,SMP_CACHE_BYTES)
47472
47473 static u8 *buf;
47474
47475 diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
47476 index 2c61783..4d49e4e 100644
47477 --- a/drivers/staging/android/timed_output.c
47478 +++ b/drivers/staging/android/timed_output.c
47479 @@ -25,7 +25,7 @@
47480 #include "timed_output.h"
47481
47482 static struct class *timed_output_class;
47483 -static atomic_t device_count;
47484 +static atomic_unchecked_t device_count;
47485
47486 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
47487 char *buf)
47488 @@ -63,7 +63,7 @@ static int create_timed_output_class(void)
47489 timed_output_class = class_create(THIS_MODULE, "timed_output");
47490 if (IS_ERR(timed_output_class))
47491 return PTR_ERR(timed_output_class);
47492 - atomic_set(&device_count, 0);
47493 + atomic_set_unchecked(&device_count, 0);
47494 timed_output_class->dev_groups = timed_output_groups;
47495 }
47496
47497 @@ -81,7 +81,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
47498 if (ret < 0)
47499 return ret;
47500
47501 - tdev->index = atomic_inc_return(&device_count);
47502 + tdev->index = atomic_inc_return_unchecked(&device_count);
47503 tdev->dev = device_create(timed_output_class, NULL,
47504 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
47505 if (IS_ERR(tdev->dev))
47506 diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
47507 index 0247a20..cb9595c 100644
47508 --- a/drivers/staging/gdm724x/gdm_tty.c
47509 +++ b/drivers/staging/gdm724x/gdm_tty.c
47510 @@ -45,7 +45,7 @@
47511 #define gdm_tty_send_control(n, r, v, d, l) (\
47512 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
47513
47514 -#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
47515 +#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
47516
47517 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
47518 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
47519 diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
47520 index ef5064e..fce01db 100644
47521 --- a/drivers/staging/lustre/lnet/selftest/brw_test.c
47522 +++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
47523 @@ -478,13 +478,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
47524 return 0;
47525 }
47526
47527 -sfw_test_client_ops_t brw_test_client;
47528 -void brw_init_test_client(void)
47529 -{
47530 - brw_test_client.tso_init = brw_client_init;
47531 - brw_test_client.tso_fini = brw_client_fini;
47532 - brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
47533 - brw_test_client.tso_done_rpc = brw_client_done_rpc;
47534 +sfw_test_client_ops_t brw_test_client = {
47535 + .tso_init = brw_client_init,
47536 + .tso_fini = brw_client_fini,
47537 + .tso_prep_rpc = brw_client_prep_rpc,
47538 + .tso_done_rpc = brw_client_done_rpc,
47539 };
47540
47541 srpc_service_t brw_test_service;
47542 diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
47543 index 483c785..e1a2a7b 100644
47544 --- a/drivers/staging/lustre/lnet/selftest/framework.c
47545 +++ b/drivers/staging/lustre/lnet/selftest/framework.c
47546 @@ -1635,12 +1635,10 @@ static srpc_service_t sfw_services[] =
47547
47548 extern sfw_test_client_ops_t ping_test_client;
47549 extern srpc_service_t ping_test_service;
47550 -extern void ping_init_test_client(void);
47551 extern void ping_init_test_service(void);
47552
47553 extern sfw_test_client_ops_t brw_test_client;
47554 extern srpc_service_t brw_test_service;
47555 -extern void brw_init_test_client(void);
47556 extern void brw_init_test_service(void);
47557
47558
47559 @@ -1684,12 +1682,10 @@ sfw_startup (void)
47560 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
47561 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
47562
47563 - brw_init_test_client();
47564 brw_init_test_service();
47565 rc = sfw_register_test(&brw_test_service, &brw_test_client);
47566 LASSERT (rc == 0);
47567
47568 - ping_init_test_client();
47569 ping_init_test_service();
47570 rc = sfw_register_test(&ping_test_service, &ping_test_client);
47571 LASSERT (rc == 0);
47572 diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
47573 index f0f9194..b589047 100644
47574 --- a/drivers/staging/lustre/lnet/selftest/ping_test.c
47575 +++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
47576 @@ -210,14 +210,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
47577 return 0;
47578 }
47579
47580 -sfw_test_client_ops_t ping_test_client;
47581 -void ping_init_test_client(void)
47582 -{
47583 - ping_test_client.tso_init = ping_client_init;
47584 - ping_test_client.tso_fini = ping_client_fini;
47585 - ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
47586 - ping_test_client.tso_done_rpc = ping_client_done_rpc;
47587 -}
47588 +sfw_test_client_ops_t ping_test_client = {
47589 + .tso_init = ping_client_init,
47590 + .tso_fini = ping_client_fini,
47591 + .tso_prep_rpc = ping_client_prep_rpc,
47592 + .tso_done_rpc = ping_client_done_rpc,
47593 +};
47594
47595 srpc_service_t ping_test_service;
47596 void ping_init_test_service(void)
47597 diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
47598 index 7020d9c..0d3b580 100644
47599 --- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
47600 +++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
47601 @@ -1141,7 +1141,7 @@ struct ldlm_callback_suite {
47602 ldlm_completion_callback lcs_completion;
47603 ldlm_blocking_callback lcs_blocking;
47604 ldlm_glimpse_callback lcs_glimpse;
47605 -};
47606 +} __no_const;
47607
47608 /* ldlm_lockd.c */
47609 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
47610 diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
47611 index a612255..9a9e2dd 100644
47612 --- a/drivers/staging/lustre/lustre/include/obd.h
47613 +++ b/drivers/staging/lustre/lustre/include/obd.h
47614 @@ -1417,7 +1417,7 @@ struct md_ops {
47615 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
47616 * wrapper function in include/linux/obd_class.h.
47617 */
47618 -};
47619 +} __no_const;
47620
47621 struct lsm_operations {
47622 void (*lsm_free)(struct lov_stripe_md *);
47623 diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
47624 index fc6c977..df1f956 100644
47625 --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
47626 +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
47627 @@ -219,7 +219,7 @@ DECLARE_PROC_HANDLER(proc_debug_mb)
47628 int LL_PROC_PROTO(proc_console_max_delay_cs)
47629 {
47630 int rc, max_delay_cs;
47631 - ctl_table_t dummy = *table;
47632 + ctl_table_no_const dummy = *table;
47633 cfs_duration_t d;
47634
47635 dummy.data = &max_delay_cs;
47636 @@ -250,7 +250,7 @@ int LL_PROC_PROTO(proc_console_max_delay_cs)
47637 int LL_PROC_PROTO(proc_console_min_delay_cs)
47638 {
47639 int rc, min_delay_cs;
47640 - ctl_table_t dummy = *table;
47641 + ctl_table_no_const dummy = *table;
47642 cfs_duration_t d;
47643
47644 dummy.data = &min_delay_cs;
47645 @@ -281,7 +281,7 @@ int LL_PROC_PROTO(proc_console_min_delay_cs)
47646 int LL_PROC_PROTO(proc_console_backoff)
47647 {
47648 int rc, backoff;
47649 - ctl_table_t dummy = *table;
47650 + ctl_table_no_const dummy = *table;
47651
47652 dummy.data = &backoff;
47653 dummy.proc_handler = &proc_dointvec;
47654 diff --git a/drivers/staging/media/solo6x10/solo6x10-core.c b/drivers/staging/media/solo6x10/solo6x10-core.c
47655 index 3675020..e80d92c 100644
47656 --- a/drivers/staging/media/solo6x10/solo6x10-core.c
47657 +++ b/drivers/staging/media/solo6x10/solo6x10-core.c
47658 @@ -434,7 +434,7 @@ static void solo_device_release(struct device *dev)
47659
47660 static int solo_sysfs_init(struct solo_dev *solo_dev)
47661 {
47662 - struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
47663 + bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
47664 struct device *dev = &solo_dev->dev;
47665 const char *driver;
47666 int i;
47667 diff --git a/drivers/staging/media/solo6x10/solo6x10-p2m.c b/drivers/staging/media/solo6x10/solo6x10-p2m.c
47668 index 3335941..2b26186 100644
47669 --- a/drivers/staging/media/solo6x10/solo6x10-p2m.c
47670 +++ b/drivers/staging/media/solo6x10/solo6x10-p2m.c
47671 @@ -77,7 +77,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
47672
47673 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
47674 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
47675 - p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
47676 + p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
47677 if (p2m_id < 0)
47678 p2m_id = -p2m_id;
47679 }
47680 diff --git a/drivers/staging/media/solo6x10/solo6x10.h b/drivers/staging/media/solo6x10/solo6x10.h
47681 index 6f91d2e..3f011d2 100644
47682 --- a/drivers/staging/media/solo6x10/solo6x10.h
47683 +++ b/drivers/staging/media/solo6x10/solo6x10.h
47684 @@ -238,7 +238,7 @@ struct solo_dev {
47685
47686 /* P2M DMA Engine */
47687 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
47688 - atomic_t p2m_count;
47689 + atomic_unchecked_t p2m_count;
47690 int p2m_jiffies;
47691 unsigned int p2m_timeouts;
47692
47693 diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
47694 index e14a1bb..9cb9bbe 100644
47695 --- a/drivers/staging/octeon/ethernet-rx.c
47696 +++ b/drivers/staging/octeon/ethernet-rx.c
47697 @@ -419,11 +419,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
47698 /* Increment RX stats for virtual ports */
47699 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
47700 #ifdef CONFIG_64BIT
47701 - atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
47702 - atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
47703 + atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
47704 + atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
47705 #else
47706 - atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
47707 - atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
47708 + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
47709 + atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
47710 #endif
47711 }
47712 netif_receive_skb(skb);
47713 @@ -434,9 +434,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
47714 dev->name);
47715 */
47716 #ifdef CONFIG_64BIT
47717 - atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
47718 + atomic64_unchecked_add(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
47719 #else
47720 - atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
47721 + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
47722 #endif
47723 dev_kfree_skb_irq(skb);
47724 }
47725 diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
47726 index c3a90e7..023619a 100644
47727 --- a/drivers/staging/octeon/ethernet.c
47728 +++ b/drivers/staging/octeon/ethernet.c
47729 @@ -252,11 +252,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
47730 * since the RX tasklet also increments it.
47731 */
47732 #ifdef CONFIG_64BIT
47733 - atomic64_add(rx_status.dropped_packets,
47734 - (atomic64_t *)&priv->stats.rx_dropped);
47735 + atomic64_add_unchecked(rx_status.dropped_packets,
47736 + (atomic64_unchecked_t *)&priv->stats.rx_dropped);
47737 #else
47738 - atomic_add(rx_status.dropped_packets,
47739 - (atomic_t *)&priv->stats.rx_dropped);
47740 + atomic_add_unchecked(rx_status.dropped_packets,
47741 + (atomic_unchecked_t *)&priv->stats.rx_dropped);
47742 #endif
47743 }
47744
47745 diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
47746 index 439c3c9..2d74293 100644
47747 --- a/drivers/staging/rtl8188eu/include/hal_intf.h
47748 +++ b/drivers/staging/rtl8188eu/include/hal_intf.h
47749 @@ -271,7 +271,7 @@ struct hal_ops {
47750 s32 (*c2h_handler)(struct adapter *padapter,
47751 struct c2h_evt_hdr *c2h_evt);
47752 c2h_id_filter c2h_id_filter_ccx;
47753 -};
47754 +} __no_const;
47755
47756 enum rt_eeprom_type {
47757 EEPROM_93C46,
47758 diff --git a/drivers/staging/rtl8188eu/include/rtw_io.h b/drivers/staging/rtl8188eu/include/rtw_io.h
47759 index eb6f0e5..e6a0958 100644
47760 --- a/drivers/staging/rtl8188eu/include/rtw_io.h
47761 +++ b/drivers/staging/rtl8188eu/include/rtw_io.h
47762 @@ -126,7 +126,7 @@ struct _io_ops {
47763 u32 (*_write_scsi)(struct intf_hdl *pintfhdl,u32 cnt, u8 *pmem);
47764 void (*_read_port_cancel)(struct intf_hdl *pintfhdl);
47765 void (*_write_port_cancel)(struct intf_hdl *pintfhdl);
47766 -};
47767 +} __no_const;
47768
47769 struct io_req {
47770 struct list_head list;
47771 diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
47772 index dc23395..cf7e9b1 100644
47773 --- a/drivers/staging/rtl8712/rtl871x_io.h
47774 +++ b/drivers/staging/rtl8712/rtl871x_io.h
47775 @@ -108,7 +108,7 @@ struct _io_ops {
47776 u8 *pmem);
47777 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
47778 u8 *pmem);
47779 -};
47780 +} __no_const;
47781
47782 struct io_req {
47783 struct list_head list;
47784 diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
47785 index 1f5088b..0e59820 100644
47786 --- a/drivers/staging/sbe-2t3e3/netdev.c
47787 +++ b/drivers/staging/sbe-2t3e3/netdev.c
47788 @@ -51,7 +51,7 @@ static int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
47789 t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
47790
47791 if (rlen)
47792 - if (copy_to_user(data, &resp, rlen))
47793 + if (rlen > sizeof resp || copy_to_user(data, &resp, rlen))
47794 return -EFAULT;
47795
47796 return 0;
47797 diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
47798 index a863a98..d272795 100644
47799 --- a/drivers/staging/usbip/vhci.h
47800 +++ b/drivers/staging/usbip/vhci.h
47801 @@ -83,7 +83,7 @@ struct vhci_hcd {
47802 unsigned resuming:1;
47803 unsigned long re_timeout;
47804
47805 - atomic_t seqnum;
47806 + atomic_unchecked_t seqnum;
47807
47808 /*
47809 * NOTE:
47810 diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
47811 index d7974cb..d78076b 100644
47812 --- a/drivers/staging/usbip/vhci_hcd.c
47813 +++ b/drivers/staging/usbip/vhci_hcd.c
47814 @@ -441,7 +441,7 @@ static void vhci_tx_urb(struct urb *urb)
47815
47816 spin_lock(&vdev->priv_lock);
47817
47818 - priv->seqnum = atomic_inc_return(&the_controller->seqnum);
47819 + priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
47820 if (priv->seqnum == 0xffff)
47821 dev_info(&urb->dev->dev, "seqnum max\n");
47822
47823 @@ -687,7 +687,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
47824 return -ENOMEM;
47825 }
47826
47827 - unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
47828 + unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
47829 if (unlink->seqnum == 0xffff)
47830 pr_info("seqnum max\n");
47831
47832 @@ -891,7 +891,7 @@ static int vhci_start(struct usb_hcd *hcd)
47833 vdev->rhport = rhport;
47834 }
47835
47836 - atomic_set(&vhci->seqnum, 0);
47837 + atomic_set_unchecked(&vhci->seqnum, 0);
47838 spin_lock_init(&vhci->lock);
47839
47840 hcd->power_budget = 0; /* no limit */
47841 diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
47842 index d07fcb5..358e1e1 100644
47843 --- a/drivers/staging/usbip/vhci_rx.c
47844 +++ b/drivers/staging/usbip/vhci_rx.c
47845 @@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
47846 if (!urb) {
47847 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
47848 pr_info("max seqnum %d\n",
47849 - atomic_read(&the_controller->seqnum));
47850 + atomic_read_unchecked(&the_controller->seqnum));
47851 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
47852 return;
47853 }
47854 diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
47855 index 8acff44..bdb2fca 100644
47856 --- a/drivers/staging/vt6655/hostap.c
47857 +++ b/drivers/staging/vt6655/hostap.c
47858 @@ -69,14 +69,13 @@ static int msglevel = MSG_LEVEL_INFO;
47859 *
47860 */
47861
47862 +static net_device_ops_no_const apdev_netdev_ops;
47863 +
47864 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
47865 {
47866 PSDevice apdev_priv;
47867 struct net_device *dev = pDevice->dev;
47868 int ret;
47869 - const struct net_device_ops apdev_netdev_ops = {
47870 - .ndo_start_xmit = pDevice->tx_80211,
47871 - };
47872
47873 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
47874
47875 @@ -88,6 +87,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
47876 *apdev_priv = *pDevice;
47877 eth_hw_addr_inherit(pDevice->apdev, dev);
47878
47879 + /* only half broken now */
47880 + apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
47881 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
47882
47883 pDevice->apdev->type = ARPHRD_IEEE80211;
47884 diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
47885 index c699a30..b90a5fd 100644
47886 --- a/drivers/staging/vt6656/hostap.c
47887 +++ b/drivers/staging/vt6656/hostap.c
47888 @@ -60,14 +60,13 @@ static int msglevel =MSG_LEVEL_INFO;
47889 *
47890 */
47891
47892 +static net_device_ops_no_const apdev_netdev_ops;
47893 +
47894 static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
47895 {
47896 struct vnt_private *apdev_priv;
47897 struct net_device *dev = pDevice->dev;
47898 int ret;
47899 - const struct net_device_ops apdev_netdev_ops = {
47900 - .ndo_start_xmit = pDevice->tx_80211,
47901 - };
47902
47903 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
47904
47905 @@ -79,6 +78,8 @@ static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
47906 *apdev_priv = *pDevice;
47907 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
47908
47909 + /* only half broken now */
47910 + apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
47911 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
47912
47913 pDevice->apdev->type = ARPHRD_IEEE80211;
47914 diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
47915 index e51b09a..5ebac31 100644
47916 --- a/drivers/target/sbp/sbp_target.c
47917 +++ b/drivers/target/sbp/sbp_target.c
47918 @@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
47919
47920 #define SESSION_MAINTENANCE_INTERVAL HZ
47921
47922 -static atomic_t login_id = ATOMIC_INIT(0);
47923 +static atomic_unchecked_t login_id = ATOMIC_INIT(0);
47924
47925 static void session_maintenance_work(struct work_struct *);
47926 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
47927 @@ -444,7 +444,7 @@ static void sbp_management_request_login(
47928 login->lun = se_lun;
47929 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
47930 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
47931 - login->login_id = atomic_inc_return(&login_id);
47932 + login->login_id = atomic_inc_return_unchecked(&login_id);
47933
47934 login->tgt_agt = sbp_target_agent_register(login);
47935 if (IS_ERR(login->tgt_agt)) {
47936 diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
47937 index d90dbb0..6cbe585 100644
47938 --- a/drivers/target/target_core_device.c
47939 +++ b/drivers/target/target_core_device.c
47940 @@ -1431,7 +1431,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
47941 spin_lock_init(&dev->se_tmr_lock);
47942 spin_lock_init(&dev->qf_cmd_lock);
47943 sema_init(&dev->caw_sem, 1);
47944 - atomic_set(&dev->dev_ordered_id, 0);
47945 + atomic_set_unchecked(&dev->dev_ordered_id, 0);
47946 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
47947 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
47948 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
47949 diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
47950 index 0b0009b..215e88e 100644
47951 --- a/drivers/target/target_core_transport.c
47952 +++ b/drivers/target/target_core_transport.c
47953 @@ -1137,7 +1137,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
47954 * Used to determine when ORDERED commands should go from
47955 * Dormant to Active status.
47956 */
47957 - cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
47958 + cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
47959 smp_mb__after_atomic_inc();
47960 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
47961 cmd->se_ordered_id, cmd->sam_task_attr,
47962 diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
47963 index 33f83fe..d80f8e1 100644
47964 --- a/drivers/tty/cyclades.c
47965 +++ b/drivers/tty/cyclades.c
47966 @@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
47967 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
47968 info->port.count);
47969 #endif
47970 - info->port.count++;
47971 + atomic_inc(&info->port.count);
47972 #ifdef CY_DEBUG_COUNT
47973 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
47974 - current->pid, info->port.count);
47975 + current->pid, atomic_read(&info->port.count));
47976 #endif
47977
47978 /*
47979 @@ -3972,7 +3972,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
47980 for (j = 0; j < cy_card[i].nports; j++) {
47981 info = &cy_card[i].ports[j];
47982
47983 - if (info->port.count) {
47984 + if (atomic_read(&info->port.count)) {
47985 /* XXX is the ldisc num worth this? */
47986 struct tty_struct *tty;
47987 struct tty_ldisc *ld;
47988 diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
47989 index 9eba119..5070303 100644
47990 --- a/drivers/tty/hvc/hvc_console.c
47991 +++ b/drivers/tty/hvc/hvc_console.c
47992 @@ -338,7 +338,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
47993
47994 spin_lock_irqsave(&hp->port.lock, flags);
47995 /* Check and then increment for fast path open. */
47996 - if (hp->port.count++ > 0) {
47997 + if (atomic_inc_return(&hp->port.count) > 1) {
47998 spin_unlock_irqrestore(&hp->port.lock, flags);
47999 hvc_kick();
48000 return 0;
48001 @@ -393,7 +393,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
48002
48003 spin_lock_irqsave(&hp->port.lock, flags);
48004
48005 - if (--hp->port.count == 0) {
48006 + if (atomic_dec_return(&hp->port.count) == 0) {
48007 spin_unlock_irqrestore(&hp->port.lock, flags);
48008 /* We are done with the tty pointer now. */
48009 tty_port_tty_set(&hp->port, NULL);
48010 @@ -415,9 +415,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
48011 */
48012 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
48013 } else {
48014 - if (hp->port.count < 0)
48015 + if (atomic_read(&hp->port.count) < 0)
48016 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
48017 - hp->vtermno, hp->port.count);
48018 + hp->vtermno, atomic_read(&hp->port.count));
48019 spin_unlock_irqrestore(&hp->port.lock, flags);
48020 }
48021 }
48022 @@ -447,12 +447,12 @@ static void hvc_hangup(struct tty_struct *tty)
48023 * open->hangup case this can be called after the final close so prevent
48024 * that from happening for now.
48025 */
48026 - if (hp->port.count <= 0) {
48027 + if (atomic_read(&hp->port.count) <= 0) {
48028 spin_unlock_irqrestore(&hp->port.lock, flags);
48029 return;
48030 }
48031
48032 - hp->port.count = 0;
48033 + atomic_set(&hp->port.count, 0);
48034 spin_unlock_irqrestore(&hp->port.lock, flags);
48035 tty_port_tty_set(&hp->port, NULL);
48036
48037 @@ -500,7 +500,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
48038 return -EPIPE;
48039
48040 /* FIXME what's this (unprotected) check for? */
48041 - if (hp->port.count <= 0)
48042 + if (atomic_read(&hp->port.count) <= 0)
48043 return -EIO;
48044
48045 spin_lock_irqsave(&hp->lock, flags);
48046 diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
48047 index 81e939e..95ead10 100644
48048 --- a/drivers/tty/hvc/hvcs.c
48049 +++ b/drivers/tty/hvc/hvcs.c
48050 @@ -83,6 +83,7 @@
48051 #include <asm/hvcserver.h>
48052 #include <asm/uaccess.h>
48053 #include <asm/vio.h>
48054 +#include <asm/local.h>
48055
48056 /*
48057 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
48058 @@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
48059
48060 spin_lock_irqsave(&hvcsd->lock, flags);
48061
48062 - if (hvcsd->port.count > 0) {
48063 + if (atomic_read(&hvcsd->port.count) > 0) {
48064 spin_unlock_irqrestore(&hvcsd->lock, flags);
48065 printk(KERN_INFO "HVCS: vterm state unchanged. "
48066 "The hvcs device node is still in use.\n");
48067 @@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
48068 }
48069 }
48070
48071 - hvcsd->port.count = 0;
48072 + atomic_set(&hvcsd->port.count, 0);
48073 hvcsd->port.tty = tty;
48074 tty->driver_data = hvcsd;
48075
48076 @@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
48077 unsigned long flags;
48078
48079 spin_lock_irqsave(&hvcsd->lock, flags);
48080 - hvcsd->port.count++;
48081 + atomic_inc(&hvcsd->port.count);
48082 hvcsd->todo_mask |= HVCS_SCHED_READ;
48083 spin_unlock_irqrestore(&hvcsd->lock, flags);
48084
48085 @@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
48086 hvcsd = tty->driver_data;
48087
48088 spin_lock_irqsave(&hvcsd->lock, flags);
48089 - if (--hvcsd->port.count == 0) {
48090 + if (atomic_dec_and_test(&hvcsd->port.count)) {
48091
48092 vio_disable_interrupts(hvcsd->vdev);
48093
48094 @@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
48095
48096 free_irq(irq, hvcsd);
48097 return;
48098 - } else if (hvcsd->port.count < 0) {
48099 + } else if (atomic_read(&hvcsd->port.count) < 0) {
48100 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
48101 " is missmanaged.\n",
48102 - hvcsd->vdev->unit_address, hvcsd->port.count);
48103 + hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
48104 }
48105
48106 spin_unlock_irqrestore(&hvcsd->lock, flags);
48107 @@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
48108
48109 spin_lock_irqsave(&hvcsd->lock, flags);
48110 /* Preserve this so that we know how many kref refs to put */
48111 - temp_open_count = hvcsd->port.count;
48112 + temp_open_count = atomic_read(&hvcsd->port.count);
48113
48114 /*
48115 * Don't kref put inside the spinlock because the destruction
48116 @@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
48117 tty->driver_data = NULL;
48118 hvcsd->port.tty = NULL;
48119
48120 - hvcsd->port.count = 0;
48121 + atomic_set(&hvcsd->port.count, 0);
48122
48123 /* This will drop any buffered data on the floor which is OK in a hangup
48124 * scenario. */
48125 @@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
48126 * the middle of a write operation? This is a crummy place to do this
48127 * but we want to keep it all in the spinlock.
48128 */
48129 - if (hvcsd->port.count <= 0) {
48130 + if (atomic_read(&hvcsd->port.count) <= 0) {
48131 spin_unlock_irqrestore(&hvcsd->lock, flags);
48132 return -ENODEV;
48133 }
48134 @@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
48135 {
48136 struct hvcs_struct *hvcsd = tty->driver_data;
48137
48138 - if (!hvcsd || hvcsd->port.count <= 0)
48139 + if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
48140 return 0;
48141
48142 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
48143 diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
48144 index 4190199..48f2920 100644
48145 --- a/drivers/tty/hvc/hvsi.c
48146 +++ b/drivers/tty/hvc/hvsi.c
48147 @@ -85,7 +85,7 @@ struct hvsi_struct {
48148 int n_outbuf;
48149 uint32_t vtermno;
48150 uint32_t virq;
48151 - atomic_t seqno; /* HVSI packet sequence number */
48152 + atomic_unchecked_t seqno; /* HVSI packet sequence number */
48153 uint16_t mctrl;
48154 uint8_t state; /* HVSI protocol state */
48155 uint8_t flags;
48156 @@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
48157
48158 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
48159 packet.hdr.len = sizeof(struct hvsi_query_response);
48160 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
48161 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
48162 packet.verb = VSV_SEND_VERSION_NUMBER;
48163 packet.u.version = HVSI_VERSION;
48164 packet.query_seqno = query_seqno+1;
48165 @@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
48166
48167 packet.hdr.type = VS_QUERY_PACKET_HEADER;
48168 packet.hdr.len = sizeof(struct hvsi_query);
48169 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
48170 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
48171 packet.verb = verb;
48172
48173 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
48174 @@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
48175 int wrote;
48176
48177 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
48178 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
48179 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
48180 packet.hdr.len = sizeof(struct hvsi_control);
48181 packet.verb = VSV_SET_MODEM_CTL;
48182 packet.mask = HVSI_TSDTR;
48183 @@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
48184 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
48185
48186 packet.hdr.type = VS_DATA_PACKET_HEADER;
48187 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
48188 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
48189 packet.hdr.len = count + sizeof(struct hvsi_header);
48190 memcpy(&packet.data, buf, count);
48191
48192 @@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
48193 struct hvsi_control packet __ALIGNED__;
48194
48195 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
48196 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
48197 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
48198 packet.hdr.len = 6;
48199 packet.verb = VSV_CLOSE_PROTOCOL;
48200
48201 diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
48202 index ac27671..0f627ee 100644
48203 --- a/drivers/tty/hvc/hvsi_lib.c
48204 +++ b/drivers/tty/hvc/hvsi_lib.c
48205 @@ -9,7 +9,7 @@
48206
48207 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
48208 {
48209 - packet->seqno = atomic_inc_return(&pv->seqno);
48210 + packet->seqno = atomic_inc_return_unchecked(&pv->seqno);
48211
48212 /* Assumes that always succeeds, works in practice */
48213 return pv->put_chars(pv->termno, (char *)packet, packet->len);
48214 @@ -21,7 +21,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
48215
48216 /* Reset state */
48217 pv->established = 0;
48218 - atomic_set(&pv->seqno, 0);
48219 + atomic_set_unchecked(&pv->seqno, 0);
48220
48221 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
48222
48223 @@ -265,7 +265,7 @@ int hvsilib_read_mctrl(struct hvsi_priv *pv)
48224 pv->mctrl_update = 0;
48225 q.hdr.type = VS_QUERY_PACKET_HEADER;
48226 q.hdr.len = sizeof(struct hvsi_query);
48227 - q.hdr.seqno = atomic_inc_return(&pv->seqno);
48228 + q.hdr.seqno = atomic_inc_return_unchecked(&pv->seqno);
48229 q.verb = VSV_SEND_MODEM_CTL_STATUS;
48230 rc = hvsi_send_packet(pv, &q.hdr);
48231 if (rc <= 0) {
48232 diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
48233 index 8fd72ff..34a0bed 100644
48234 --- a/drivers/tty/ipwireless/tty.c
48235 +++ b/drivers/tty/ipwireless/tty.c
48236 @@ -29,6 +29,7 @@
48237 #include <linux/tty_driver.h>
48238 #include <linux/tty_flip.h>
48239 #include <linux/uaccess.h>
48240 +#include <asm/local.h>
48241
48242 #include "tty.h"
48243 #include "network.h"
48244 @@ -99,10 +100,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
48245 mutex_unlock(&tty->ipw_tty_mutex);
48246 return -ENODEV;
48247 }
48248 - if (tty->port.count == 0)
48249 + if (atomic_read(&tty->port.count) == 0)
48250 tty->tx_bytes_queued = 0;
48251
48252 - tty->port.count++;
48253 + atomic_inc(&tty->port.count);
48254
48255 tty->port.tty = linux_tty;
48256 linux_tty->driver_data = tty;
48257 @@ -118,9 +119,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
48258
48259 static void do_ipw_close(struct ipw_tty *tty)
48260 {
48261 - tty->port.count--;
48262 -
48263 - if (tty->port.count == 0) {
48264 + if (atomic_dec_return(&tty->port.count) == 0) {
48265 struct tty_struct *linux_tty = tty->port.tty;
48266
48267 if (linux_tty != NULL) {
48268 @@ -141,7 +140,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
48269 return;
48270
48271 mutex_lock(&tty->ipw_tty_mutex);
48272 - if (tty->port.count == 0) {
48273 + if (atomic_read(&tty->port.count) == 0) {
48274 mutex_unlock(&tty->ipw_tty_mutex);
48275 return;
48276 }
48277 @@ -164,7 +163,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
48278
48279 mutex_lock(&tty->ipw_tty_mutex);
48280
48281 - if (!tty->port.count) {
48282 + if (!atomic_read(&tty->port.count)) {
48283 mutex_unlock(&tty->ipw_tty_mutex);
48284 return;
48285 }
48286 @@ -206,7 +205,7 @@ static int ipw_write(struct tty_struct *linux_tty,
48287 return -ENODEV;
48288
48289 mutex_lock(&tty->ipw_tty_mutex);
48290 - if (!tty->port.count) {
48291 + if (!atomic_read(&tty->port.count)) {
48292 mutex_unlock(&tty->ipw_tty_mutex);
48293 return -EINVAL;
48294 }
48295 @@ -246,7 +245,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
48296 if (!tty)
48297 return -ENODEV;
48298
48299 - if (!tty->port.count)
48300 + if (!atomic_read(&tty->port.count))
48301 return -EINVAL;
48302
48303 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
48304 @@ -288,7 +287,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
48305 if (!tty)
48306 return 0;
48307
48308 - if (!tty->port.count)
48309 + if (!atomic_read(&tty->port.count))
48310 return 0;
48311
48312 return tty->tx_bytes_queued;
48313 @@ -369,7 +368,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
48314 if (!tty)
48315 return -ENODEV;
48316
48317 - if (!tty->port.count)
48318 + if (!atomic_read(&tty->port.count))
48319 return -EINVAL;
48320
48321 return get_control_lines(tty);
48322 @@ -385,7 +384,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
48323 if (!tty)
48324 return -ENODEV;
48325
48326 - if (!tty->port.count)
48327 + if (!atomic_read(&tty->port.count))
48328 return -EINVAL;
48329
48330 return set_control_lines(tty, set, clear);
48331 @@ -399,7 +398,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
48332 if (!tty)
48333 return -ENODEV;
48334
48335 - if (!tty->port.count)
48336 + if (!atomic_read(&tty->port.count))
48337 return -EINVAL;
48338
48339 /* FIXME: Exactly how is the tty object locked here .. */
48340 @@ -555,7 +554,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
48341 * are gone */
48342 mutex_lock(&ttyj->ipw_tty_mutex);
48343 }
48344 - while (ttyj->port.count)
48345 + while (atomic_read(&ttyj->port.count))
48346 do_ipw_close(ttyj);
48347 ipwireless_disassociate_network_ttys(network,
48348 ttyj->channel_idx);
48349 diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
48350 index 1deaca4..c8582d4 100644
48351 --- a/drivers/tty/moxa.c
48352 +++ b/drivers/tty/moxa.c
48353 @@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
48354 }
48355
48356 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
48357 - ch->port.count++;
48358 + atomic_inc(&ch->port.count);
48359 tty->driver_data = ch;
48360 tty_port_tty_set(&ch->port, tty);
48361 mutex_lock(&ch->port.mutex);
48362 diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
48363 index c0f76da..d974c32 100644
48364 --- a/drivers/tty/n_gsm.c
48365 +++ b/drivers/tty/n_gsm.c
48366 @@ -1632,7 +1632,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
48367 spin_lock_init(&dlci->lock);
48368 mutex_init(&dlci->mutex);
48369 dlci->fifo = &dlci->_fifo;
48370 - if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
48371 + if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
48372 kfree(dlci);
48373 return NULL;
48374 }
48375 @@ -2935,7 +2935,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
48376 struct gsm_dlci *dlci = tty->driver_data;
48377 struct tty_port *port = &dlci->port;
48378
48379 - port->count++;
48380 + atomic_inc(&port->count);
48381 dlci_get(dlci);
48382 dlci_get(dlci->gsm->dlci[0]);
48383 mux_get(dlci->gsm);
48384 diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
48385 index 4d6f430..0810fa9 100644
48386 --- a/drivers/tty/n_tty.c
48387 +++ b/drivers/tty/n_tty.c
48388 @@ -2504,6 +2504,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
48389 {
48390 *ops = tty_ldisc_N_TTY;
48391 ops->owner = NULL;
48392 - ops->refcount = ops->flags = 0;
48393 + atomic_set(&ops->refcount, 0);
48394 + ops->flags = 0;
48395 }
48396 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
48397 diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
48398 index 25c9bc7..24077b7 100644
48399 --- a/drivers/tty/pty.c
48400 +++ b/drivers/tty/pty.c
48401 @@ -790,8 +790,10 @@ static void __init unix98_pty_init(void)
48402 panic("Couldn't register Unix98 pts driver");
48403
48404 /* Now create the /dev/ptmx special device */
48405 + pax_open_kernel();
48406 tty_default_fops(&ptmx_fops);
48407 - ptmx_fops.open = ptmx_open;
48408 + *(void **)&ptmx_fops.open = ptmx_open;
48409 + pax_close_kernel();
48410
48411 cdev_init(&ptmx_cdev, &ptmx_fops);
48412 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
48413 diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
48414 index 354564e..fe50d9a 100644
48415 --- a/drivers/tty/rocket.c
48416 +++ b/drivers/tty/rocket.c
48417 @@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
48418 tty->driver_data = info;
48419 tty_port_tty_set(port, tty);
48420
48421 - if (port->count++ == 0) {
48422 + if (atomic_inc_return(&port->count) == 1) {
48423 atomic_inc(&rp_num_ports_open);
48424
48425 #ifdef ROCKET_DEBUG_OPEN
48426 @@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
48427 #endif
48428 }
48429 #ifdef ROCKET_DEBUG_OPEN
48430 - printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
48431 + printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
48432 #endif
48433
48434 /*
48435 @@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
48436 spin_unlock_irqrestore(&info->port.lock, flags);
48437 return;
48438 }
48439 - if (info->port.count)
48440 + if (atomic_read(&info->port.count))
48441 atomic_dec(&rp_num_ports_open);
48442 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
48443 spin_unlock_irqrestore(&info->port.lock, flags);
48444 diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
48445 index 1274499..f541382 100644
48446 --- a/drivers/tty/serial/ioc4_serial.c
48447 +++ b/drivers/tty/serial/ioc4_serial.c
48448 @@ -437,7 +437,7 @@ struct ioc4_soft {
48449 } is_intr_info[MAX_IOC4_INTR_ENTS];
48450
48451 /* Number of entries active in the above array */
48452 - atomic_t is_num_intrs;
48453 + atomic_unchecked_t is_num_intrs;
48454 } is_intr_type[IOC4_NUM_INTR_TYPES];
48455
48456 /* is_ir_lock must be held while
48457 @@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
48458 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
48459 || (type == IOC4_OTHER_INTR_TYPE)));
48460
48461 - i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
48462 + i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
48463 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
48464
48465 /* Save off the lower level interrupt handler */
48466 @@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
48467
48468 soft = arg;
48469 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
48470 - num_intrs = (int)atomic_read(
48471 + num_intrs = (int)atomic_read_unchecked(
48472 &soft->is_intr_type[intr_type].is_num_intrs);
48473
48474 this_mir = this_ir = pending_intrs(soft, intr_type);
48475 diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
48476 index a260cde..6b2b5ce 100644
48477 --- a/drivers/tty/serial/kgdboc.c
48478 +++ b/drivers/tty/serial/kgdboc.c
48479 @@ -24,8 +24,9 @@
48480 #define MAX_CONFIG_LEN 40
48481
48482 static struct kgdb_io kgdboc_io_ops;
48483 +static struct kgdb_io kgdboc_io_ops_console;
48484
48485 -/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
48486 +/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
48487 static int configured = -1;
48488
48489 static char config[MAX_CONFIG_LEN];
48490 @@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
48491 kgdboc_unregister_kbd();
48492 if (configured == 1)
48493 kgdb_unregister_io_module(&kgdboc_io_ops);
48494 + else if (configured == 2)
48495 + kgdb_unregister_io_module(&kgdboc_io_ops_console);
48496 }
48497
48498 static int configure_kgdboc(void)
48499 @@ -160,13 +163,13 @@ static int configure_kgdboc(void)
48500 int err;
48501 char *cptr = config;
48502 struct console *cons;
48503 + int is_console = 0;
48504
48505 err = kgdboc_option_setup(config);
48506 if (err || !strlen(config) || isspace(config[0]))
48507 goto noconfig;
48508
48509 err = -ENODEV;
48510 - kgdboc_io_ops.is_console = 0;
48511 kgdb_tty_driver = NULL;
48512
48513 kgdboc_use_kms = 0;
48514 @@ -187,7 +190,7 @@ static int configure_kgdboc(void)
48515 int idx;
48516 if (cons->device && cons->device(cons, &idx) == p &&
48517 idx == tty_line) {
48518 - kgdboc_io_ops.is_console = 1;
48519 + is_console = 1;
48520 break;
48521 }
48522 cons = cons->next;
48523 @@ -197,7 +200,13 @@ static int configure_kgdboc(void)
48524 kgdb_tty_line = tty_line;
48525
48526 do_register:
48527 - err = kgdb_register_io_module(&kgdboc_io_ops);
48528 + if (is_console) {
48529 + err = kgdb_register_io_module(&kgdboc_io_ops_console);
48530 + configured = 2;
48531 + } else {
48532 + err = kgdb_register_io_module(&kgdboc_io_ops);
48533 + configured = 1;
48534 + }
48535 if (err)
48536 goto noconfig;
48537
48538 @@ -205,8 +214,6 @@ do_register:
48539 if (err)
48540 goto nmi_con_failed;
48541
48542 - configured = 1;
48543 -
48544 return 0;
48545
48546 nmi_con_failed:
48547 @@ -223,7 +230,7 @@ noconfig:
48548 static int __init init_kgdboc(void)
48549 {
48550 /* Already configured? */
48551 - if (configured == 1)
48552 + if (configured >= 1)
48553 return 0;
48554
48555 return configure_kgdboc();
48556 @@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
48557 if (config[len - 1] == '\n')
48558 config[len - 1] = '\0';
48559
48560 - if (configured == 1)
48561 + if (configured >= 1)
48562 cleanup_kgdboc();
48563
48564 /* Go and configure with the new params. */
48565 @@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
48566 .post_exception = kgdboc_post_exp_handler,
48567 };
48568
48569 +static struct kgdb_io kgdboc_io_ops_console = {
48570 + .name = "kgdboc",
48571 + .read_char = kgdboc_get_char,
48572 + .write_char = kgdboc_put_char,
48573 + .pre_exception = kgdboc_pre_exp_handler,
48574 + .post_exception = kgdboc_post_exp_handler,
48575 + .is_console = 1
48576 +};
48577 +
48578 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
48579 /* This is only available if kgdboc is a built in for early debugging */
48580 static int __init kgdboc_early_init(char *opt)
48581 diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
48582 index b5d779c..3622cfe 100644
48583 --- a/drivers/tty/serial/msm_serial.c
48584 +++ b/drivers/tty/serial/msm_serial.c
48585 @@ -897,7 +897,7 @@ static struct uart_driver msm_uart_driver = {
48586 .cons = MSM_CONSOLE,
48587 };
48588
48589 -static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
48590 +static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
48591
48592 static const struct of_device_id msm_uartdm_table[] = {
48593 { .compatible = "qcom,msm-uartdm" },
48594 @@ -912,7 +912,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
48595 int irq;
48596
48597 if (pdev->id == -1)
48598 - pdev->id = atomic_inc_return(&msm_uart_next_id) - 1;
48599 + pdev->id = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
48600
48601 if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))
48602 return -ENXIO;
48603 diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
48604 index f3dfa19..342f2ff 100644
48605 --- a/drivers/tty/serial/samsung.c
48606 +++ b/drivers/tty/serial/samsung.c
48607 @@ -456,11 +456,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
48608 }
48609 }
48610
48611 +static int s3c64xx_serial_startup(struct uart_port *port);
48612 static int s3c24xx_serial_startup(struct uart_port *port)
48613 {
48614 struct s3c24xx_uart_port *ourport = to_ourport(port);
48615 int ret;
48616
48617 + /* Startup sequence is different for s3c64xx and higher SoC's */
48618 + if (s3c24xx_serial_has_interrupt_mask(port))
48619 + return s3c64xx_serial_startup(port);
48620 +
48621 dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n",
48622 port->mapbase, port->membase);
48623
48624 @@ -1127,10 +1132,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
48625 /* setup info for port */
48626 port->dev = &platdev->dev;
48627
48628 - /* Startup sequence is different for s3c64xx and higher SoC's */
48629 - if (s3c24xx_serial_has_interrupt_mask(port))
48630 - s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
48631 -
48632 port->uartclk = 1;
48633
48634 if (cfg->uart_flags & UPF_CONS_FLOW) {
48635 diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
48636 index 0f02351..07c59c5 100644
48637 --- a/drivers/tty/serial/serial_core.c
48638 +++ b/drivers/tty/serial/serial_core.c
48639 @@ -1448,7 +1448,7 @@ static void uart_hangup(struct tty_struct *tty)
48640 uart_flush_buffer(tty);
48641 uart_shutdown(tty, state);
48642 spin_lock_irqsave(&port->lock, flags);
48643 - port->count = 0;
48644 + atomic_set(&port->count, 0);
48645 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
48646 spin_unlock_irqrestore(&port->lock, flags);
48647 tty_port_tty_set(port, NULL);
48648 @@ -1544,7 +1544,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
48649 goto end;
48650 }
48651
48652 - port->count++;
48653 + atomic_inc(&port->count);
48654 if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
48655 retval = -ENXIO;
48656 goto err_dec_count;
48657 @@ -1572,7 +1572,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
48658 /*
48659 * Make sure the device is in D0 state.
48660 */
48661 - if (port->count == 1)
48662 + if (atomic_read(&port->count) == 1)
48663 uart_change_pm(state, UART_PM_STATE_ON);
48664
48665 /*
48666 @@ -1590,7 +1590,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
48667 end:
48668 return retval;
48669 err_dec_count:
48670 - port->count--;
48671 + atomic_inc(&port->count);
48672 mutex_unlock(&port->mutex);
48673 goto end;
48674 }
48675 diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
48676 index e1ce141..6d4ed80 100644
48677 --- a/drivers/tty/synclink.c
48678 +++ b/drivers/tty/synclink.c
48679 @@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
48680
48681 if (debug_level >= DEBUG_LEVEL_INFO)
48682 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
48683 - __FILE__,__LINE__, info->device_name, info->port.count);
48684 + __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
48685
48686 if (tty_port_close_start(&info->port, tty, filp) == 0)
48687 goto cleanup;
48688 @@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
48689 cleanup:
48690 if (debug_level >= DEBUG_LEVEL_INFO)
48691 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
48692 - tty->driver->name, info->port.count);
48693 + tty->driver->name, atomic_read(&info->port.count));
48694
48695 } /* end of mgsl_close() */
48696
48697 @@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
48698
48699 mgsl_flush_buffer(tty);
48700 shutdown(info);
48701 -
48702 - info->port.count = 0;
48703 +
48704 + atomic_set(&info->port.count, 0);
48705 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
48706 info->port.tty = NULL;
48707
48708 @@ -3297,12 +3297,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
48709
48710 if (debug_level >= DEBUG_LEVEL_INFO)
48711 printk("%s(%d):block_til_ready before block on %s count=%d\n",
48712 - __FILE__,__LINE__, tty->driver->name, port->count );
48713 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
48714
48715 spin_lock_irqsave(&info->irq_spinlock, flags);
48716 if (!tty_hung_up_p(filp)) {
48717 extra_count = true;
48718 - port->count--;
48719 + atomic_dec(&port->count);
48720 }
48721 spin_unlock_irqrestore(&info->irq_spinlock, flags);
48722 port->blocked_open++;
48723 @@ -3331,7 +3331,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
48724
48725 if (debug_level >= DEBUG_LEVEL_INFO)
48726 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
48727 - __FILE__,__LINE__, tty->driver->name, port->count );
48728 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
48729
48730 tty_unlock(tty);
48731 schedule();
48732 @@ -3343,12 +3343,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
48733
48734 /* FIXME: Racy on hangup during close wait */
48735 if (extra_count)
48736 - port->count++;
48737 + atomic_inc(&port->count);
48738 port->blocked_open--;
48739
48740 if (debug_level >= DEBUG_LEVEL_INFO)
48741 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
48742 - __FILE__,__LINE__, tty->driver->name, port->count );
48743 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
48744
48745 if (!retval)
48746 port->flags |= ASYNC_NORMAL_ACTIVE;
48747 @@ -3400,7 +3400,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
48748
48749 if (debug_level >= DEBUG_LEVEL_INFO)
48750 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
48751 - __FILE__,__LINE__,tty->driver->name, info->port.count);
48752 + __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
48753
48754 /* If port is closing, signal caller to try again */
48755 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
48756 @@ -3419,10 +3419,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
48757 spin_unlock_irqrestore(&info->netlock, flags);
48758 goto cleanup;
48759 }
48760 - info->port.count++;
48761 + atomic_inc(&info->port.count);
48762 spin_unlock_irqrestore(&info->netlock, flags);
48763
48764 - if (info->port.count == 1) {
48765 + if (atomic_read(&info->port.count) == 1) {
48766 /* 1st open on this device, init hardware */
48767 retval = startup(info);
48768 if (retval < 0)
48769 @@ -3446,8 +3446,8 @@ cleanup:
48770 if (retval) {
48771 if (tty->count == 1)
48772 info->port.tty = NULL; /* tty layer will release tty struct */
48773 - if(info->port.count)
48774 - info->port.count--;
48775 + if (atomic_read(&info->port.count))
48776 + atomic_dec(&info->port.count);
48777 }
48778
48779 return retval;
48780 @@ -7665,7 +7665,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
48781 unsigned short new_crctype;
48782
48783 /* return error if TTY interface open */
48784 - if (info->port.count)
48785 + if (atomic_read(&info->port.count))
48786 return -EBUSY;
48787
48788 switch (encoding)
48789 @@ -7760,7 +7760,7 @@ static int hdlcdev_open(struct net_device *dev)
48790
48791 /* arbitrate between network and tty opens */
48792 spin_lock_irqsave(&info->netlock, flags);
48793 - if (info->port.count != 0 || info->netcount != 0) {
48794 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
48795 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
48796 spin_unlock_irqrestore(&info->netlock, flags);
48797 return -EBUSY;
48798 @@ -7846,7 +7846,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48799 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
48800
48801 /* return error if TTY interface open */
48802 - if (info->port.count)
48803 + if (atomic_read(&info->port.count))
48804 return -EBUSY;
48805
48806 if (cmd != SIOCWANDEV)
48807 diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
48808 index 1abf946..1ee34fc 100644
48809 --- a/drivers/tty/synclink_gt.c
48810 +++ b/drivers/tty/synclink_gt.c
48811 @@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
48812 tty->driver_data = info;
48813 info->port.tty = tty;
48814
48815 - DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
48816 + DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
48817
48818 /* If port is closing, signal caller to try again */
48819 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
48820 @@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
48821 mutex_unlock(&info->port.mutex);
48822 goto cleanup;
48823 }
48824 - info->port.count++;
48825 + atomic_inc(&info->port.count);
48826 spin_unlock_irqrestore(&info->netlock, flags);
48827
48828 - if (info->port.count == 1) {
48829 + if (atomic_read(&info->port.count) == 1) {
48830 /* 1st open on this device, init hardware */
48831 retval = startup(info);
48832 if (retval < 0) {
48833 @@ -715,8 +715,8 @@ cleanup:
48834 if (retval) {
48835 if (tty->count == 1)
48836 info->port.tty = NULL; /* tty layer will release tty struct */
48837 - if(info->port.count)
48838 - info->port.count--;
48839 + if(atomic_read(&info->port.count))
48840 + atomic_dec(&info->port.count);
48841 }
48842
48843 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
48844 @@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
48845
48846 if (sanity_check(info, tty->name, "close"))
48847 return;
48848 - DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
48849 + DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
48850
48851 if (tty_port_close_start(&info->port, tty, filp) == 0)
48852 goto cleanup;
48853 @@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
48854 tty_port_close_end(&info->port, tty);
48855 info->port.tty = NULL;
48856 cleanup:
48857 - DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
48858 + DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
48859 }
48860
48861 static void hangup(struct tty_struct *tty)
48862 @@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
48863 shutdown(info);
48864
48865 spin_lock_irqsave(&info->port.lock, flags);
48866 - info->port.count = 0;
48867 + atomic_set(&info->port.count, 0);
48868 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
48869 info->port.tty = NULL;
48870 spin_unlock_irqrestore(&info->port.lock, flags);
48871 @@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
48872 unsigned short new_crctype;
48873
48874 /* return error if TTY interface open */
48875 - if (info->port.count)
48876 + if (atomic_read(&info->port.count))
48877 return -EBUSY;
48878
48879 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
48880 @@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
48881
48882 /* arbitrate between network and tty opens */
48883 spin_lock_irqsave(&info->netlock, flags);
48884 - if (info->port.count != 0 || info->netcount != 0) {
48885 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
48886 DBGINFO(("%s hdlc_open busy\n", dev->name));
48887 spin_unlock_irqrestore(&info->netlock, flags);
48888 return -EBUSY;
48889 @@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48890 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
48891
48892 /* return error if TTY interface open */
48893 - if (info->port.count)
48894 + if (atomic_read(&info->port.count))
48895 return -EBUSY;
48896
48897 if (cmd != SIOCWANDEV)
48898 @@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
48899 if (port == NULL)
48900 continue;
48901 spin_lock(&port->lock);
48902 - if ((port->port.count || port->netcount) &&
48903 + if ((atomic_read(&port->port.count) || port->netcount) &&
48904 port->pending_bh && !port->bh_running &&
48905 !port->bh_requested) {
48906 DBGISR(("%s bh queued\n", port->device_name));
48907 @@ -3302,7 +3302,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
48908 spin_lock_irqsave(&info->lock, flags);
48909 if (!tty_hung_up_p(filp)) {
48910 extra_count = true;
48911 - port->count--;
48912 + atomic_dec(&port->count);
48913 }
48914 spin_unlock_irqrestore(&info->lock, flags);
48915 port->blocked_open++;
48916 @@ -3339,7 +3339,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
48917 remove_wait_queue(&port->open_wait, &wait);
48918
48919 if (extra_count)
48920 - port->count++;
48921 + atomic_inc(&port->count);
48922 port->blocked_open--;
48923
48924 if (!retval)
48925 diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
48926 index dc6e969..5dc8786 100644
48927 --- a/drivers/tty/synclinkmp.c
48928 +++ b/drivers/tty/synclinkmp.c
48929 @@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
48930
48931 if (debug_level >= DEBUG_LEVEL_INFO)
48932 printk("%s(%d):%s open(), old ref count = %d\n",
48933 - __FILE__,__LINE__,tty->driver->name, info->port.count);
48934 + __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
48935
48936 /* If port is closing, signal caller to try again */
48937 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
48938 @@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
48939 spin_unlock_irqrestore(&info->netlock, flags);
48940 goto cleanup;
48941 }
48942 - info->port.count++;
48943 + atomic_inc(&info->port.count);
48944 spin_unlock_irqrestore(&info->netlock, flags);
48945
48946 - if (info->port.count == 1) {
48947 + if (atomic_read(&info->port.count) == 1) {
48948 /* 1st open on this device, init hardware */
48949 retval = startup(info);
48950 if (retval < 0)
48951 @@ -796,8 +796,8 @@ cleanup:
48952 if (retval) {
48953 if (tty->count == 1)
48954 info->port.tty = NULL; /* tty layer will release tty struct */
48955 - if(info->port.count)
48956 - info->port.count--;
48957 + if(atomic_read(&info->port.count))
48958 + atomic_dec(&info->port.count);
48959 }
48960
48961 return retval;
48962 @@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
48963
48964 if (debug_level >= DEBUG_LEVEL_INFO)
48965 printk("%s(%d):%s close() entry, count=%d\n",
48966 - __FILE__,__LINE__, info->device_name, info->port.count);
48967 + __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
48968
48969 if (tty_port_close_start(&info->port, tty, filp) == 0)
48970 goto cleanup;
48971 @@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
48972 cleanup:
48973 if (debug_level >= DEBUG_LEVEL_INFO)
48974 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
48975 - tty->driver->name, info->port.count);
48976 + tty->driver->name, atomic_read(&info->port.count));
48977 }
48978
48979 /* Called by tty_hangup() when a hangup is signaled.
48980 @@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
48981 shutdown(info);
48982
48983 spin_lock_irqsave(&info->port.lock, flags);
48984 - info->port.count = 0;
48985 + atomic_set(&info->port.count, 0);
48986 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
48987 info->port.tty = NULL;
48988 spin_unlock_irqrestore(&info->port.lock, flags);
48989 @@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
48990 unsigned short new_crctype;
48991
48992 /* return error if TTY interface open */
48993 - if (info->port.count)
48994 + if (atomic_read(&info->port.count))
48995 return -EBUSY;
48996
48997 switch (encoding)
48998 @@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
48999
49000 /* arbitrate between network and tty opens */
49001 spin_lock_irqsave(&info->netlock, flags);
49002 - if (info->port.count != 0 || info->netcount != 0) {
49003 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
49004 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
49005 spin_unlock_irqrestore(&info->netlock, flags);
49006 return -EBUSY;
49007 @@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49008 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
49009
49010 /* return error if TTY interface open */
49011 - if (info->port.count)
49012 + if (atomic_read(&info->port.count))
49013 return -EBUSY;
49014
49015 if (cmd != SIOCWANDEV)
49016 @@ -2620,7 +2620,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
49017 * do not request bottom half processing if the
49018 * device is not open in a normal mode.
49019 */
49020 - if ( port && (port->port.count || port->netcount) &&
49021 + if ( port && (atomic_read(&port->port.count) || port->netcount) &&
49022 port->pending_bh && !port->bh_running &&
49023 !port->bh_requested ) {
49024 if ( debug_level >= DEBUG_LEVEL_ISR )
49025 @@ -3318,12 +3318,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
49026
49027 if (debug_level >= DEBUG_LEVEL_INFO)
49028 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
49029 - __FILE__,__LINE__, tty->driver->name, port->count );
49030 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
49031
49032 spin_lock_irqsave(&info->lock, flags);
49033 if (!tty_hung_up_p(filp)) {
49034 extra_count = true;
49035 - port->count--;
49036 + atomic_dec(&port->count);
49037 }
49038 spin_unlock_irqrestore(&info->lock, flags);
49039 port->blocked_open++;
49040 @@ -3352,7 +3352,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
49041
49042 if (debug_level >= DEBUG_LEVEL_INFO)
49043 printk("%s(%d):%s block_til_ready() count=%d\n",
49044 - __FILE__,__LINE__, tty->driver->name, port->count );
49045 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
49046
49047 tty_unlock(tty);
49048 schedule();
49049 @@ -3363,12 +3363,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
49050 remove_wait_queue(&port->open_wait, &wait);
49051
49052 if (extra_count)
49053 - port->count++;
49054 + atomic_inc(&port->count);
49055 port->blocked_open--;
49056
49057 if (debug_level >= DEBUG_LEVEL_INFO)
49058 printk("%s(%d):%s block_til_ready() after, count=%d\n",
49059 - __FILE__,__LINE__, tty->driver->name, port->count );
49060 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
49061
49062 if (!retval)
49063 port->flags |= ASYNC_NORMAL_ACTIVE;
49064 diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
49065 index 40a9fe9..a3f10cc 100644
49066 --- a/drivers/tty/sysrq.c
49067 +++ b/drivers/tty/sysrq.c
49068 @@ -1075,7 +1075,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
49069 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
49070 size_t count, loff_t *ppos)
49071 {
49072 - if (count) {
49073 + if (count && capable(CAP_SYS_ADMIN)) {
49074 char c;
49075
49076 if (get_user(c, buf))
49077 diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
49078 index c74a00a..02cf211a 100644
49079 --- a/drivers/tty/tty_io.c
49080 +++ b/drivers/tty/tty_io.c
49081 @@ -3474,7 +3474,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
49082
49083 void tty_default_fops(struct file_operations *fops)
49084 {
49085 - *fops = tty_fops;
49086 + memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
49087 }
49088
49089 /*
49090 diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
49091 index 6458e11..6cfc218 100644
49092 --- a/drivers/tty/tty_ldisc.c
49093 +++ b/drivers/tty/tty_ldisc.c
49094 @@ -72,7 +72,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
49095 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
49096 tty_ldiscs[disc] = new_ldisc;
49097 new_ldisc->num = disc;
49098 - new_ldisc->refcount = 0;
49099 + atomic_set(&new_ldisc->refcount, 0);
49100 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
49101
49102 return ret;
49103 @@ -100,7 +100,7 @@ int tty_unregister_ldisc(int disc)
49104 return -EINVAL;
49105
49106 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
49107 - if (tty_ldiscs[disc]->refcount)
49108 + if (atomic_read(&tty_ldiscs[disc]->refcount))
49109 ret = -EBUSY;
49110 else
49111 tty_ldiscs[disc] = NULL;
49112 @@ -121,7 +121,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
49113 if (ldops) {
49114 ret = ERR_PTR(-EAGAIN);
49115 if (try_module_get(ldops->owner)) {
49116 - ldops->refcount++;
49117 + atomic_inc(&ldops->refcount);
49118 ret = ldops;
49119 }
49120 }
49121 @@ -134,7 +134,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
49122 unsigned long flags;
49123
49124 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
49125 - ldops->refcount--;
49126 + atomic_dec(&ldops->refcount);
49127 module_put(ldops->owner);
49128 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
49129 }
49130 diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
49131 index f597e88..b7f68ed 100644
49132 --- a/drivers/tty/tty_port.c
49133 +++ b/drivers/tty/tty_port.c
49134 @@ -232,7 +232,7 @@ void tty_port_hangup(struct tty_port *port)
49135 unsigned long flags;
49136
49137 spin_lock_irqsave(&port->lock, flags);
49138 - port->count = 0;
49139 + atomic_set(&port->count, 0);
49140 port->flags &= ~ASYNC_NORMAL_ACTIVE;
49141 tty = port->tty;
49142 if (tty)
49143 @@ -390,7 +390,7 @@ int tty_port_block_til_ready(struct tty_port *port,
49144 /* The port lock protects the port counts */
49145 spin_lock_irqsave(&port->lock, flags);
49146 if (!tty_hung_up_p(filp))
49147 - port->count--;
49148 + atomic_dec(&port->count);
49149 port->blocked_open++;
49150 spin_unlock_irqrestore(&port->lock, flags);
49151
49152 @@ -432,7 +432,7 @@ int tty_port_block_til_ready(struct tty_port *port,
49153 we must not mess that up further */
49154 spin_lock_irqsave(&port->lock, flags);
49155 if (!tty_hung_up_p(filp))
49156 - port->count++;
49157 + atomic_inc(&port->count);
49158 port->blocked_open--;
49159 if (retval == 0)
49160 port->flags |= ASYNC_NORMAL_ACTIVE;
49161 @@ -466,19 +466,19 @@ int tty_port_close_start(struct tty_port *port,
49162 return 0;
49163 }
49164
49165 - if (tty->count == 1 && port->count != 1) {
49166 + if (tty->count == 1 && atomic_read(&port->count) != 1) {
49167 printk(KERN_WARNING
49168 "tty_port_close_start: tty->count = 1 port count = %d.\n",
49169 - port->count);
49170 - port->count = 1;
49171 + atomic_read(&port->count));
49172 + atomic_set(&port->count, 1);
49173 }
49174 - if (--port->count < 0) {
49175 + if (atomic_dec_return(&port->count) < 0) {
49176 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
49177 - port->count);
49178 - port->count = 0;
49179 + atomic_read(&port->count));
49180 + atomic_set(&port->count, 0);
49181 }
49182
49183 - if (port->count) {
49184 + if (atomic_read(&port->count)) {
49185 spin_unlock_irqrestore(&port->lock, flags);
49186 if (port->ops->drop)
49187 port->ops->drop(port);
49188 @@ -564,7 +564,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
49189 {
49190 spin_lock_irq(&port->lock);
49191 if (!tty_hung_up_p(filp))
49192 - ++port->count;
49193 + atomic_inc(&port->count);
49194 spin_unlock_irq(&port->lock);
49195 tty_port_tty_set(port, tty);
49196
49197 diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
49198 index d0e3a44..5f8b754 100644
49199 --- a/drivers/tty/vt/keyboard.c
49200 +++ b/drivers/tty/vt/keyboard.c
49201 @@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
49202 kbd->kbdmode == VC_OFF) &&
49203 value != KVAL(K_SAK))
49204 return; /* SAK is allowed even in raw mode */
49205 +
49206 +#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
49207 + {
49208 + void *func = fn_handler[value];
49209 + if (func == fn_show_state || func == fn_show_ptregs ||
49210 + func == fn_show_mem)
49211 + return;
49212 + }
49213 +#endif
49214 +
49215 fn_handler[value](vc);
49216 }
49217
49218 @@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
49219 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
49220 return -EFAULT;
49221
49222 - if (!capable(CAP_SYS_TTY_CONFIG))
49223 - perm = 0;
49224 -
49225 switch (cmd) {
49226 case KDGKBENT:
49227 /* Ensure another thread doesn't free it under us */
49228 @@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
49229 spin_unlock_irqrestore(&kbd_event_lock, flags);
49230 return put_user(val, &user_kbe->kb_value);
49231 case KDSKBENT:
49232 + if (!capable(CAP_SYS_TTY_CONFIG))
49233 + perm = 0;
49234 +
49235 if (!perm)
49236 return -EPERM;
49237 if (!i && v == K_NOSUCHMAP) {
49238 @@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
49239 int i, j, k;
49240 int ret;
49241
49242 - if (!capable(CAP_SYS_TTY_CONFIG))
49243 - perm = 0;
49244 -
49245 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
49246 if (!kbs) {
49247 ret = -ENOMEM;
49248 @@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
49249 kfree(kbs);
49250 return ((p && *p) ? -EOVERFLOW : 0);
49251 case KDSKBSENT:
49252 + if (!capable(CAP_SYS_TTY_CONFIG))
49253 + perm = 0;
49254 +
49255 if (!perm) {
49256 ret = -EPERM;
49257 goto reterr;
49258 diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
49259 index 0e808cf..d7d274b 100644
49260 --- a/drivers/uio/uio.c
49261 +++ b/drivers/uio/uio.c
49262 @@ -25,6 +25,7 @@
49263 #include <linux/kobject.h>
49264 #include <linux/cdev.h>
49265 #include <linux/uio_driver.h>
49266 +#include <asm/local.h>
49267
49268 #define UIO_MAX_DEVICES (1U << MINORBITS)
49269
49270 @@ -32,7 +33,7 @@ struct uio_device {
49271 struct module *owner;
49272 struct device *dev;
49273 int minor;
49274 - atomic_t event;
49275 + atomic_unchecked_t event;
49276 struct fasync_struct *async_queue;
49277 wait_queue_head_t wait;
49278 struct uio_info *info;
49279 @@ -243,7 +244,7 @@ static ssize_t event_show(struct device *dev,
49280 struct device_attribute *attr, char *buf)
49281 {
49282 struct uio_device *idev = dev_get_drvdata(dev);
49283 - return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
49284 + return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
49285 }
49286 static DEVICE_ATTR_RO(event);
49287
49288 @@ -401,7 +402,7 @@ void uio_event_notify(struct uio_info *info)
49289 {
49290 struct uio_device *idev = info->uio_dev;
49291
49292 - atomic_inc(&idev->event);
49293 + atomic_inc_unchecked(&idev->event);
49294 wake_up_interruptible(&idev->wait);
49295 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
49296 }
49297 @@ -454,7 +455,7 @@ static int uio_open(struct inode *inode, struct file *filep)
49298 }
49299
49300 listener->dev = idev;
49301 - listener->event_count = atomic_read(&idev->event);
49302 + listener->event_count = atomic_read_unchecked(&idev->event);
49303 filep->private_data = listener;
49304
49305 if (idev->info->open) {
49306 @@ -505,7 +506,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
49307 return -EIO;
49308
49309 poll_wait(filep, &idev->wait, wait);
49310 - if (listener->event_count != atomic_read(&idev->event))
49311 + if (listener->event_count != atomic_read_unchecked(&idev->event))
49312 return POLLIN | POLLRDNORM;
49313 return 0;
49314 }
49315 @@ -530,7 +531,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
49316 do {
49317 set_current_state(TASK_INTERRUPTIBLE);
49318
49319 - event_count = atomic_read(&idev->event);
49320 + event_count = atomic_read_unchecked(&idev->event);
49321 if (event_count != listener->event_count) {
49322 if (copy_to_user(buf, &event_count, count))
49323 retval = -EFAULT;
49324 @@ -587,9 +588,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
49325 static int uio_find_mem_index(struct vm_area_struct *vma)
49326 {
49327 struct uio_device *idev = vma->vm_private_data;
49328 + unsigned long size;
49329
49330 if (vma->vm_pgoff < MAX_UIO_MAPS) {
49331 - if (idev->info->mem[vma->vm_pgoff].size == 0)
49332 + size = idev->info->mem[vma->vm_pgoff].size;
49333 + if (size == 0)
49334 + return -1;
49335 + if (vma->vm_end - vma->vm_start > size)
49336 return -1;
49337 return (int)vma->vm_pgoff;
49338 }
49339 @@ -647,6 +652,8 @@ static int uio_mmap_physical(struct vm_area_struct *vma)
49340 return -EINVAL;
49341 mem = idev->info->mem + mi;
49342
49343 + if (mem->addr & ~PAGE_MASK)
49344 + return -ENODEV;
49345 if (vma->vm_end - vma->vm_start > mem->size)
49346 return -EINVAL;
49347
49348 @@ -818,7 +825,7 @@ int __uio_register_device(struct module *owner,
49349 idev->owner = owner;
49350 idev->info = info;
49351 init_waitqueue_head(&idev->wait);
49352 - atomic_set(&idev->event, 0);
49353 + atomic_set_unchecked(&idev->event, 0);
49354
49355 ret = uio_get_minor(idev);
49356 if (ret)
49357 diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
49358 index 8a7eb77..c00402f 100644
49359 --- a/drivers/usb/atm/cxacru.c
49360 +++ b/drivers/usb/atm/cxacru.c
49361 @@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
49362 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
49363 if (ret < 2)
49364 return -EINVAL;
49365 - if (index < 0 || index > 0x7f)
49366 + if (index > 0x7f)
49367 return -EINVAL;
49368 pos += tmp;
49369
49370 diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
49371 index 25a7bfc..57f3cf5 100644
49372 --- a/drivers/usb/atm/usbatm.c
49373 +++ b/drivers/usb/atm/usbatm.c
49374 @@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
49375 if (printk_ratelimit())
49376 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
49377 __func__, vpi, vci);
49378 - atomic_inc(&vcc->stats->rx_err);
49379 + atomic_inc_unchecked(&vcc->stats->rx_err);
49380 return;
49381 }
49382
49383 @@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
49384 if (length > ATM_MAX_AAL5_PDU) {
49385 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
49386 __func__, length, vcc);
49387 - atomic_inc(&vcc->stats->rx_err);
49388 + atomic_inc_unchecked(&vcc->stats->rx_err);
49389 goto out;
49390 }
49391
49392 @@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
49393 if (sarb->len < pdu_length) {
49394 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
49395 __func__, pdu_length, sarb->len, vcc);
49396 - atomic_inc(&vcc->stats->rx_err);
49397 + atomic_inc_unchecked(&vcc->stats->rx_err);
49398 goto out;
49399 }
49400
49401 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
49402 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
49403 __func__, vcc);
49404 - atomic_inc(&vcc->stats->rx_err);
49405 + atomic_inc_unchecked(&vcc->stats->rx_err);
49406 goto out;
49407 }
49408
49409 @@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
49410 if (printk_ratelimit())
49411 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
49412 __func__, length);
49413 - atomic_inc(&vcc->stats->rx_drop);
49414 + atomic_inc_unchecked(&vcc->stats->rx_drop);
49415 goto out;
49416 }
49417
49418 @@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
49419
49420 vcc->push(vcc, skb);
49421
49422 - atomic_inc(&vcc->stats->rx);
49423 + atomic_inc_unchecked(&vcc->stats->rx);
49424 out:
49425 skb_trim(sarb, 0);
49426 }
49427 @@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
49428 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
49429
49430 usbatm_pop(vcc, skb);
49431 - atomic_inc(&vcc->stats->tx);
49432 + atomic_inc_unchecked(&vcc->stats->tx);
49433
49434 skb = skb_dequeue(&instance->sndqueue);
49435 }
49436 @@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
49437 if (!left--)
49438 return sprintf(page,
49439 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
49440 - atomic_read(&atm_dev->stats.aal5.tx),
49441 - atomic_read(&atm_dev->stats.aal5.tx_err),
49442 - atomic_read(&atm_dev->stats.aal5.rx),
49443 - atomic_read(&atm_dev->stats.aal5.rx_err),
49444 - atomic_read(&atm_dev->stats.aal5.rx_drop));
49445 + atomic_read_unchecked(&atm_dev->stats.aal5.tx),
49446 + atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
49447 + atomic_read_unchecked(&atm_dev->stats.aal5.rx),
49448 + atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
49449 + atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
49450
49451 if (!left--) {
49452 if (instance->disconnected)
49453 diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
49454 index 2a3bbdf..91d72cf 100644
49455 --- a/drivers/usb/core/devices.c
49456 +++ b/drivers/usb/core/devices.c
49457 @@ -126,7 +126,7 @@ static const char format_endpt[] =
49458 * time it gets called.
49459 */
49460 static struct device_connect_event {
49461 - atomic_t count;
49462 + atomic_unchecked_t count;
49463 wait_queue_head_t wait;
49464 } device_event = {
49465 .count = ATOMIC_INIT(1),
49466 @@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
49467
49468 void usbfs_conn_disc_event(void)
49469 {
49470 - atomic_add(2, &device_event.count);
49471 + atomic_add_unchecked(2, &device_event.count);
49472 wake_up(&device_event.wait);
49473 }
49474
49475 @@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
49476
49477 poll_wait(file, &device_event.wait, wait);
49478
49479 - event_count = atomic_read(&device_event.count);
49480 + event_count = atomic_read_unchecked(&device_event.count);
49481 if (file->f_version != event_count) {
49482 file->f_version = event_count;
49483 return POLLIN | POLLRDNORM;
49484 diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
49485 index 71dc5d7..300db0e 100644
49486 --- a/drivers/usb/core/devio.c
49487 +++ b/drivers/usb/core/devio.c
49488 @@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
49489 struct dev_state *ps = file->private_data;
49490 struct usb_device *dev = ps->dev;
49491 ssize_t ret = 0;
49492 - unsigned len;
49493 + size_t len;
49494 loff_t pos;
49495 int i;
49496
49497 @@ -229,16 +229,16 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
49498 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
49499 struct usb_config_descriptor *config =
49500 (struct usb_config_descriptor *)dev->rawdescriptors[i];
49501 - unsigned int length = le16_to_cpu(config->wTotalLength);
49502 + size_t length = le16_to_cpu(config->wTotalLength);
49503
49504 if (*ppos < pos + length) {
49505
49506 /* The descriptor may claim to be longer than it
49507 * really is. Here is the actual allocated length. */
49508 - unsigned alloclen =
49509 + size_t alloclen =
49510 le16_to_cpu(dev->config[i].desc.wTotalLength);
49511
49512 - len = length - (*ppos - pos);
49513 + len = length + pos - *ppos;
49514 if (len > nbytes)
49515 len = nbytes;
49516
49517 diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
49518 index f20a044..d1059aa 100644
49519 --- a/drivers/usb/core/hcd.c
49520 +++ b/drivers/usb/core/hcd.c
49521 @@ -1552,7 +1552,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
49522 */
49523 usb_get_urb(urb);
49524 atomic_inc(&urb->use_count);
49525 - atomic_inc(&urb->dev->urbnum);
49526 + atomic_inc_unchecked(&urb->dev->urbnum);
49527 usbmon_urb_submit(&hcd->self, urb);
49528
49529 /* NOTE requirements on root-hub callers (usbfs and the hub
49530 @@ -1579,7 +1579,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
49531 urb->hcpriv = NULL;
49532 INIT_LIST_HEAD(&urb->urb_list);
49533 atomic_dec(&urb->use_count);
49534 - atomic_dec(&urb->dev->urbnum);
49535 + atomic_dec_unchecked(&urb->dev->urbnum);
49536 if (atomic_read(&urb->reject))
49537 wake_up(&usb_kill_urb_queue);
49538 usb_put_urb(urb);
49539 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
49540 index c5c3667..e54e5cd 100644
49541 --- a/drivers/usb/core/hub.c
49542 +++ b/drivers/usb/core/hub.c
49543 @@ -27,6 +27,7 @@
49544 #include <linux/freezer.h>
49545 #include <linux/random.h>
49546 #include <linux/pm_qos.h>
49547 +#include <linux/grsecurity.h>
49548
49549 #include <asm/uaccess.h>
49550 #include <asm/byteorder.h>
49551 @@ -4467,6 +4468,10 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
49552 goto done;
49553 return;
49554 }
49555 +
49556 + if (gr_handle_new_usb())
49557 + goto done;
49558 +
49559 if (hub_is_superspeed(hub->hdev))
49560 unit_load = 150;
49561 else
49562 diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
49563 index 82927e1..4993dbf 100644
49564 --- a/drivers/usb/core/message.c
49565 +++ b/drivers/usb/core/message.c
49566 @@ -129,7 +129,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
49567 * Return: If successful, the number of bytes transferred. Otherwise, a negative
49568 * error number.
49569 */
49570 -int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
49571 +int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
49572 __u8 requesttype, __u16 value, __u16 index, void *data,
49573 __u16 size, int timeout)
49574 {
49575 @@ -181,7 +181,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
49576 * If successful, 0. Otherwise a negative error number. The number of actual
49577 * bytes transferred will be stored in the @actual_length paramater.
49578 */
49579 -int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
49580 +int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
49581 void *data, int len, int *actual_length, int timeout)
49582 {
49583 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
49584 @@ -221,7 +221,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
49585 * bytes transferred will be stored in the @actual_length paramater.
49586 *
49587 */
49588 -int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
49589 +int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
49590 void *data, int len, int *actual_length, int timeout)
49591 {
49592 struct urb *urb;
49593 diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
49594 index ca516ac..6c36ee4 100644
49595 --- a/drivers/usb/core/sysfs.c
49596 +++ b/drivers/usb/core/sysfs.c
49597 @@ -236,7 +236,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
49598 struct usb_device *udev;
49599
49600 udev = to_usb_device(dev);
49601 - return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
49602 + return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
49603 }
49604 static DEVICE_ATTR_RO(urbnum);
49605
49606 diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
49607 index 0a6ee2e..6f8d7e8 100644
49608 --- a/drivers/usb/core/usb.c
49609 +++ b/drivers/usb/core/usb.c
49610 @@ -433,7 +433,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
49611 set_dev_node(&dev->dev, dev_to_node(bus->controller));
49612 dev->state = USB_STATE_ATTACHED;
49613 dev->lpm_disable_count = 1;
49614 - atomic_set(&dev->urbnum, 0);
49615 + atomic_set_unchecked(&dev->urbnum, 0);
49616
49617 INIT_LIST_HEAD(&dev->ep0.urb_list);
49618 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
49619 diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
49620 index 02e44fc..3c4fe64 100644
49621 --- a/drivers/usb/dwc3/gadget.c
49622 +++ b/drivers/usb/dwc3/gadget.c
49623 @@ -532,8 +532,6 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
49624 if (!usb_endpoint_xfer_isoc(desc))
49625 return 0;
49626
49627 - memset(&trb_link, 0, sizeof(trb_link));
49628 -
49629 /* Link TRB for ISOC. The HWO bit is never reset */
49630 trb_st_hw = &dep->trb_pool[0];
49631
49632 diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
49633 index 5e29dde..eca992f 100644
49634 --- a/drivers/usb/early/ehci-dbgp.c
49635 +++ b/drivers/usb/early/ehci-dbgp.c
49636 @@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
49637
49638 #ifdef CONFIG_KGDB
49639 static struct kgdb_io kgdbdbgp_io_ops;
49640 -#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
49641 +static struct kgdb_io kgdbdbgp_io_ops_console;
49642 +#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
49643 #else
49644 #define dbgp_kgdb_mode (0)
49645 #endif
49646 @@ -1047,6 +1048,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
49647 .write_char = kgdbdbgp_write_char,
49648 };
49649
49650 +static struct kgdb_io kgdbdbgp_io_ops_console = {
49651 + .name = "kgdbdbgp",
49652 + .read_char = kgdbdbgp_read_char,
49653 + .write_char = kgdbdbgp_write_char,
49654 + .is_console = 1
49655 +};
49656 +
49657 static int kgdbdbgp_wait_time;
49658
49659 static int __init kgdbdbgp_parse_config(char *str)
49660 @@ -1062,8 +1070,10 @@ static int __init kgdbdbgp_parse_config(char *str)
49661 ptr++;
49662 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
49663 }
49664 - kgdb_register_io_module(&kgdbdbgp_io_ops);
49665 - kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
49666 + if (early_dbgp_console.index != -1)
49667 + kgdb_register_io_module(&kgdbdbgp_io_ops_console);
49668 + else
49669 + kgdb_register_io_module(&kgdbdbgp_io_ops);
49670
49671 return 0;
49672 }
49673 diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
49674 index b369292..9f3ba40 100644
49675 --- a/drivers/usb/gadget/u_serial.c
49676 +++ b/drivers/usb/gadget/u_serial.c
49677 @@ -733,9 +733,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
49678 spin_lock_irq(&port->port_lock);
49679
49680 /* already open? Great. */
49681 - if (port->port.count) {
49682 + if (atomic_read(&port->port.count)) {
49683 status = 0;
49684 - port->port.count++;
49685 + atomic_inc(&port->port.count);
49686
49687 /* currently opening/closing? wait ... */
49688 } else if (port->openclose) {
49689 @@ -794,7 +794,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
49690 tty->driver_data = port;
49691 port->port.tty = tty;
49692
49693 - port->port.count = 1;
49694 + atomic_set(&port->port.count, 1);
49695 port->openclose = false;
49696
49697 /* if connected, start the I/O stream */
49698 @@ -836,11 +836,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
49699
49700 spin_lock_irq(&port->port_lock);
49701
49702 - if (port->port.count != 1) {
49703 - if (port->port.count == 0)
49704 + if (atomic_read(&port->port.count) != 1) {
49705 + if (atomic_read(&port->port.count) == 0)
49706 WARN_ON(1);
49707 else
49708 - --port->port.count;
49709 + atomic_dec(&port->port.count);
49710 goto exit;
49711 }
49712
49713 @@ -850,7 +850,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
49714 * and sleep if necessary
49715 */
49716 port->openclose = true;
49717 - port->port.count = 0;
49718 + atomic_set(&port->port.count, 0);
49719
49720 gser = port->port_usb;
49721 if (gser && gser->disconnect)
49722 @@ -1066,7 +1066,7 @@ static int gs_closed(struct gs_port *port)
49723 int cond;
49724
49725 spin_lock_irq(&port->port_lock);
49726 - cond = (port->port.count == 0) && !port->openclose;
49727 + cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
49728 spin_unlock_irq(&port->port_lock);
49729 return cond;
49730 }
49731 @@ -1209,7 +1209,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
49732 /* if it's already open, start I/O ... and notify the serial
49733 * protocol about open/close status (connect/disconnect).
49734 */
49735 - if (port->port.count) {
49736 + if (atomic_read(&port->port.count)) {
49737 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
49738 gs_start_io(port);
49739 if (gser->connect)
49740 @@ -1256,7 +1256,7 @@ void gserial_disconnect(struct gserial *gser)
49741
49742 port->port_usb = NULL;
49743 gser->ioport = NULL;
49744 - if (port->port.count > 0 || port->openclose) {
49745 + if (atomic_read(&port->port.count) > 0 || port->openclose) {
49746 wake_up_interruptible(&port->drain_wait);
49747 if (port->port.tty)
49748 tty_hangup(port->port.tty);
49749 @@ -1272,7 +1272,7 @@ void gserial_disconnect(struct gserial *gser)
49750
49751 /* finally, free any unused/unusable I/O buffers */
49752 spin_lock_irqsave(&port->port_lock, flags);
49753 - if (port->port.count == 0 && !port->openclose)
49754 + if (atomic_read(&port->port.count) == 0 && !port->openclose)
49755 gs_buf_free(&port->port_write_buf);
49756 gs_free_requests(gser->out, &port->read_pool, NULL);
49757 gs_free_requests(gser->out, &port->read_queue, NULL);
49758 diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
49759 index 835fc08..f8b22bf 100644
49760 --- a/drivers/usb/host/ehci-hub.c
49761 +++ b/drivers/usb/host/ehci-hub.c
49762 @@ -762,7 +762,7 @@ static struct urb *request_single_step_set_feature_urb(
49763 urb->transfer_flags = URB_DIR_IN;
49764 usb_get_urb(urb);
49765 atomic_inc(&urb->use_count);
49766 - atomic_inc(&urb->dev->urbnum);
49767 + atomic_inc_unchecked(&urb->dev->urbnum);
49768 urb->setup_dma = dma_map_single(
49769 hcd->self.controller,
49770 urb->setup_packet,
49771 @@ -829,7 +829,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
49772 urb->status = -EINPROGRESS;
49773 usb_get_urb(urb);
49774 atomic_inc(&urb->use_count);
49775 - atomic_inc(&urb->dev->urbnum);
49776 + atomic_inc_unchecked(&urb->dev->urbnum);
49777 retval = submit_single_step_set_feature(hcd, urb, 0);
49778 if (!retval && !wait_for_completion_timeout(&done,
49779 msecs_to_jiffies(2000))) {
49780 diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
49781 index ba6a5d6..f88f7f3 100644
49782 --- a/drivers/usb/misc/appledisplay.c
49783 +++ b/drivers/usb/misc/appledisplay.c
49784 @@ -83,7 +83,7 @@ struct appledisplay {
49785 spinlock_t lock;
49786 };
49787
49788 -static atomic_t count_displays = ATOMIC_INIT(0);
49789 +static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
49790 static struct workqueue_struct *wq;
49791
49792 static void appledisplay_complete(struct urb *urb)
49793 @@ -281,7 +281,7 @@ static int appledisplay_probe(struct usb_interface *iface,
49794
49795 /* Register backlight device */
49796 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
49797 - atomic_inc_return(&count_displays) - 1);
49798 + atomic_inc_return_unchecked(&count_displays) - 1);
49799 memset(&props, 0, sizeof(struct backlight_properties));
49800 props.type = BACKLIGHT_RAW;
49801 props.max_brightness = 0xff;
49802 diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
49803 index c69bb50..215ef37 100644
49804 --- a/drivers/usb/serial/console.c
49805 +++ b/drivers/usb/serial/console.c
49806 @@ -124,7 +124,7 @@ static int usb_console_setup(struct console *co, char *options)
49807
49808 info->port = port;
49809
49810 - ++port->port.count;
49811 + atomic_inc(&port->port.count);
49812 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
49813 if (serial->type->set_termios) {
49814 /*
49815 @@ -170,7 +170,7 @@ static int usb_console_setup(struct console *co, char *options)
49816 }
49817 /* Now that any required fake tty operations are completed restore
49818 * the tty port count */
49819 - --port->port.count;
49820 + atomic_dec(&port->port.count);
49821 /* The console is special in terms of closing the device so
49822 * indicate this port is now acting as a system console. */
49823 port->port.console = 1;
49824 @@ -183,7 +183,7 @@ static int usb_console_setup(struct console *co, char *options)
49825 free_tty:
49826 kfree(tty);
49827 reset_open_count:
49828 - port->port.count = 0;
49829 + atomic_set(&port->port.count, 0);
49830 usb_autopm_put_interface(serial->interface);
49831 error_get_interface:
49832 usb_serial_put(serial);
49833 @@ -194,7 +194,7 @@ static int usb_console_setup(struct console *co, char *options)
49834 static void usb_console_write(struct console *co,
49835 const char *buf, unsigned count)
49836 {
49837 - static struct usbcons_info *info = &usbcons_info;
49838 + struct usbcons_info *info = &usbcons_info;
49839 struct usb_serial_port *port = info->port;
49840 struct usb_serial *serial;
49841 int retval = -ENODEV;
49842 diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
49843 index 75f70f0..d467e1a 100644
49844 --- a/drivers/usb/storage/usb.h
49845 +++ b/drivers/usb/storage/usb.h
49846 @@ -63,7 +63,7 @@ struct us_unusual_dev {
49847 __u8 useProtocol;
49848 __u8 useTransport;
49849 int (*initFunction)(struct us_data *);
49850 -};
49851 +} __do_const;
49852
49853
49854 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
49855 diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
49856 index cf250c2..ad9d904 100644
49857 --- a/drivers/usb/wusbcore/wa-hc.h
49858 +++ b/drivers/usb/wusbcore/wa-hc.h
49859 @@ -199,7 +199,7 @@ struct wahc {
49860 spinlock_t xfer_list_lock;
49861 struct work_struct xfer_enqueue_work;
49862 struct work_struct xfer_error_work;
49863 - atomic_t xfer_id_count;
49864 + atomic_unchecked_t xfer_id_count;
49865 };
49866
49867
49868 @@ -255,7 +255,7 @@ static inline void wa_init(struct wahc *wa)
49869 spin_lock_init(&wa->xfer_list_lock);
49870 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
49871 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
49872 - atomic_set(&wa->xfer_id_count, 1);
49873 + atomic_set_unchecked(&wa->xfer_id_count, 1);
49874 }
49875
49876 /**
49877 diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
49878 index 3dcf66f..8faaf6e 100644
49879 --- a/drivers/usb/wusbcore/wa-xfer.c
49880 +++ b/drivers/usb/wusbcore/wa-xfer.c
49881 @@ -300,7 +300,7 @@ out:
49882 */
49883 static void wa_xfer_id_init(struct wa_xfer *xfer)
49884 {
49885 - xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
49886 + xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
49887 }
49888
49889 /*
49890 diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
49891 index 1eab4ac..e21efc9 100644
49892 --- a/drivers/vfio/vfio.c
49893 +++ b/drivers/vfio/vfio.c
49894 @@ -488,7 +488,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
49895 return 0;
49896
49897 /* TODO Prevent device auto probing */
49898 - WARN("Device %s added to live group %d!\n", dev_name(dev),
49899 + WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
49900 iommu_group_id(group->iommu_group));
49901
49902 return 0;
49903 diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
49904 index 5174eba..86e764a 100644
49905 --- a/drivers/vhost/vringh.c
49906 +++ b/drivers/vhost/vringh.c
49907 @@ -800,7 +800,7 @@ static inline int getu16_kern(u16 *val, const u16 *p)
49908
49909 static inline int putu16_kern(u16 *p, u16 val)
49910 {
49911 - ACCESS_ONCE(*p) = val;
49912 + ACCESS_ONCE_RW(*p) = val;
49913 return 0;
49914 }
49915
49916 diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
49917 index e43401a..dd49b3f 100644
49918 --- a/drivers/video/arcfb.c
49919 +++ b/drivers/video/arcfb.c
49920 @@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
49921 return -ENOSPC;
49922
49923 err = 0;
49924 - if ((count + p) > fbmemlength) {
49925 + if (count > (fbmemlength - p)) {
49926 count = fbmemlength - p;
49927 err = -ENOSPC;
49928 }
49929 diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
49930 index a4dfe8c..297ddd9 100644
49931 --- a/drivers/video/aty/aty128fb.c
49932 +++ b/drivers/video/aty/aty128fb.c
49933 @@ -149,7 +149,7 @@ enum {
49934 };
49935
49936 /* Must match above enum */
49937 -static char * const r128_family[] = {
49938 +static const char * const r128_family[] = {
49939 "AGP",
49940 "PCI",
49941 "PRO AGP",
49942 diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
49943 index 9b0f12c..024673d 100644
49944 --- a/drivers/video/aty/atyfb_base.c
49945 +++ b/drivers/video/aty/atyfb_base.c
49946 @@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
49947 par->accel_flags = var->accel_flags; /* hack */
49948
49949 if (var->accel_flags) {
49950 - info->fbops->fb_sync = atyfb_sync;
49951 + pax_open_kernel();
49952 + *(void **)&info->fbops->fb_sync = atyfb_sync;
49953 + pax_close_kernel();
49954 info->flags &= ~FBINFO_HWACCEL_DISABLED;
49955 } else {
49956 - info->fbops->fb_sync = NULL;
49957 + pax_open_kernel();
49958 + *(void **)&info->fbops->fb_sync = NULL;
49959 + pax_close_kernel();
49960 info->flags |= FBINFO_HWACCEL_DISABLED;
49961 }
49962
49963 diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c
49964 index 95ec042..e6affdd 100644
49965 --- a/drivers/video/aty/mach64_cursor.c
49966 +++ b/drivers/video/aty/mach64_cursor.c
49967 @@ -7,6 +7,7 @@
49968 #include <linux/string.h>
49969
49970 #include <asm/io.h>
49971 +#include <asm/pgtable.h>
49972
49973 #ifdef __sparc__
49974 #include <asm/fbio.h>
49975 @@ -208,7 +209,9 @@ int aty_init_cursor(struct fb_info *info)
49976 info->sprite.buf_align = 16; /* and 64 lines tall. */
49977 info->sprite.flags = FB_PIXMAP_IO;
49978
49979 - info->fbops->fb_cursor = atyfb_cursor;
49980 + pax_open_kernel();
49981 + *(void **)&info->fbops->fb_cursor = atyfb_cursor;
49982 + pax_close_kernel();
49983
49984 return 0;
49985 }
49986 diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
49987 index bca6ccc..252107e 100644
49988 --- a/drivers/video/backlight/kb3886_bl.c
49989 +++ b/drivers/video/backlight/kb3886_bl.c
49990 @@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
49991 static unsigned long kb3886bl_flags;
49992 #define KB3886BL_SUSPENDED 0x01
49993
49994 -static struct dmi_system_id __initdata kb3886bl_device_table[] = {
49995 +static const struct dmi_system_id __initconst kb3886bl_device_table[] = {
49996 {
49997 .ident = "Sahara Touch-iT",
49998 .matches = {
49999 diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
50000 index 900aa4e..6d49418 100644
50001 --- a/drivers/video/fb_defio.c
50002 +++ b/drivers/video/fb_defio.c
50003 @@ -206,7 +206,9 @@ void fb_deferred_io_init(struct fb_info *info)
50004
50005 BUG_ON(!fbdefio);
50006 mutex_init(&fbdefio->lock);
50007 - info->fbops->fb_mmap = fb_deferred_io_mmap;
50008 + pax_open_kernel();
50009 + *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
50010 + pax_close_kernel();
50011 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
50012 INIT_LIST_HEAD(&fbdefio->pagelist);
50013 if (fbdefio->delay == 0) /* set a default of 1 s */
50014 @@ -237,7 +239,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
50015 page->mapping = NULL;
50016 }
50017
50018 - info->fbops->fb_mmap = NULL;
50019 + *(void **)&info->fbops->fb_mmap = NULL;
50020 mutex_destroy(&fbdefio->lock);
50021 }
50022 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
50023 diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
50024 index dacaf74..8478a46 100644
50025 --- a/drivers/video/fbmem.c
50026 +++ b/drivers/video/fbmem.c
50027 @@ -433,7 +433,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
50028 image->dx += image->width + 8;
50029 }
50030 } else if (rotate == FB_ROTATE_UD) {
50031 - for (x = 0; x < num && image->dx >= 0; x++) {
50032 + for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
50033 info->fbops->fb_imageblit(info, image);
50034 image->dx -= image->width + 8;
50035 }
50036 @@ -445,7 +445,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
50037 image->dy += image->height + 8;
50038 }
50039 } else if (rotate == FB_ROTATE_CCW) {
50040 - for (x = 0; x < num && image->dy >= 0; x++) {
50041 + for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
50042 info->fbops->fb_imageblit(info, image);
50043 image->dy -= image->height + 8;
50044 }
50045 @@ -1175,7 +1175,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
50046 return -EFAULT;
50047 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
50048 return -EINVAL;
50049 - if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
50050 + if (con2fb.framebuffer >= FB_MAX)
50051 return -EINVAL;
50052 if (!registered_fb[con2fb.framebuffer])
50053 request_module("fb%d", con2fb.framebuffer);
50054 diff --git a/drivers/video/hyperv_fb.c b/drivers/video/hyperv_fb.c
50055 index 8d456dc..b4fa44b 100644
50056 --- a/drivers/video/hyperv_fb.c
50057 +++ b/drivers/video/hyperv_fb.c
50058 @@ -233,7 +233,7 @@ static uint screen_fb_size;
50059 static inline int synthvid_send(struct hv_device *hdev,
50060 struct synthvid_msg *msg)
50061 {
50062 - static atomic64_t request_id = ATOMIC64_INIT(0);
50063 + static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
50064 int ret;
50065
50066 msg->pipe_hdr.type = PIPE_MSG_DATA;
50067 @@ -241,7 +241,7 @@ static inline int synthvid_send(struct hv_device *hdev,
50068
50069 ret = vmbus_sendpacket(hdev->channel, msg,
50070 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
50071 - atomic64_inc_return(&request_id),
50072 + atomic64_inc_return_unchecked(&request_id),
50073 VM_PKT_DATA_INBAND, 0);
50074
50075 if (ret)
50076 diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
50077 index 7672d2e..b56437f 100644
50078 --- a/drivers/video/i810/i810_accel.c
50079 +++ b/drivers/video/i810/i810_accel.c
50080 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
50081 }
50082 }
50083 printk("ringbuffer lockup!!!\n");
50084 + printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
50085 i810_report_error(mmio);
50086 par->dev_flags |= LOCKUP;
50087 info->pixmap.scan_align = 1;
50088 diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
50089 index 3c14e43..2630570 100644
50090 --- a/drivers/video/logo/logo_linux_clut224.ppm
50091 +++ b/drivers/video/logo/logo_linux_clut224.ppm
50092 @@ -2,1603 +2,1123 @@ P3
50093 # Standard 224-color Linux logo
50094 80 80
50095 255
50096 - 0 0 0 0 0 0 0 0 0 0 0 0
50097 - 0 0 0 0 0 0 0 0 0 0 0 0
50098 - 0 0 0 0 0 0 0 0 0 0 0 0
50099 - 0 0 0 0 0 0 0 0 0 0 0 0
50100 - 0 0 0 0 0 0 0 0 0 0 0 0
50101 - 0 0 0 0 0 0 0 0 0 0 0 0
50102 - 0 0 0 0 0 0 0 0 0 0 0 0
50103 - 0 0 0 0 0 0 0 0 0 0 0 0
50104 - 0 0 0 0 0 0 0 0 0 0 0 0
50105 - 6 6 6 6 6 6 10 10 10 10 10 10
50106 - 10 10 10 6 6 6 6 6 6 6 6 6
50107 - 0 0 0 0 0 0 0 0 0 0 0 0
50108 - 0 0 0 0 0 0 0 0 0 0 0 0
50109 - 0 0 0 0 0 0 0 0 0 0 0 0
50110 - 0 0 0 0 0 0 0 0 0 0 0 0
50111 - 0 0 0 0 0 0 0 0 0 0 0 0
50112 - 0 0 0 0 0 0 0 0 0 0 0 0
50113 - 0 0 0 0 0 0 0 0 0 0 0 0
50114 - 0 0 0 0 0 0 0 0 0 0 0 0
50115 - 0 0 0 0 0 0 0 0 0 0 0 0
50116 - 0 0 0 0 0 0 0 0 0 0 0 0
50117 - 0 0 0 0 0 0 0 0 0 0 0 0
50118 - 0 0 0 0 0 0 0 0 0 0 0 0
50119 - 0 0 0 0 0 0 0 0 0 0 0 0
50120 - 0 0 0 0 0 0 0 0 0 0 0 0
50121 - 0 0 0 0 0 0 0 0 0 0 0 0
50122 - 0 0 0 0 0 0 0 0 0 0 0 0
50123 - 0 0 0 0 0 0 0 0 0 0 0 0
50124 - 0 0 0 6 6 6 10 10 10 14 14 14
50125 - 22 22 22 26 26 26 30 30 30 34 34 34
50126 - 30 30 30 30 30 30 26 26 26 18 18 18
50127 - 14 14 14 10 10 10 6 6 6 0 0 0
50128 - 0 0 0 0 0 0 0 0 0 0 0 0
50129 - 0 0 0 0 0 0 0 0 0 0 0 0
50130 - 0 0 0 0 0 0 0 0 0 0 0 0
50131 - 0 0 0 0 0 0 0 0 0 0 0 0
50132 - 0 0 0 0 0 0 0 0 0 0 0 0
50133 - 0 0 0 0 0 0 0 0 0 0 0 0
50134 - 0 0 0 0 0 0 0 0 0 0 0 0
50135 - 0 0 0 0 0 0 0 0 0 0 0 0
50136 - 0 0 0 0 0 0 0 0 0 0 0 0
50137 - 0 0 0 0 0 1 0 0 1 0 0 0
50138 - 0 0 0 0 0 0 0 0 0 0 0 0
50139 - 0 0 0 0 0 0 0 0 0 0 0 0
50140 - 0 0 0 0 0 0 0 0 0 0 0 0
50141 - 0 0 0 0 0 0 0 0 0 0 0 0
50142 - 0 0 0 0 0 0 0 0 0 0 0 0
50143 - 0 0 0 0 0 0 0 0 0 0 0 0
50144 - 6 6 6 14 14 14 26 26 26 42 42 42
50145 - 54 54 54 66 66 66 78 78 78 78 78 78
50146 - 78 78 78 74 74 74 66 66 66 54 54 54
50147 - 42 42 42 26 26 26 18 18 18 10 10 10
50148 - 6 6 6 0 0 0 0 0 0 0 0 0
50149 - 0 0 0 0 0 0 0 0 0 0 0 0
50150 - 0 0 0 0 0 0 0 0 0 0 0 0
50151 - 0 0 0 0 0 0 0 0 0 0 0 0
50152 - 0 0 0 0 0 0 0 0 0 0 0 0
50153 - 0 0 0 0 0 0 0 0 0 0 0 0
50154 - 0 0 0 0 0 0 0 0 0 0 0 0
50155 - 0 0 0 0 0 0 0 0 0 0 0 0
50156 - 0 0 0 0 0 0 0 0 0 0 0 0
50157 - 0 0 1 0 0 0 0 0 0 0 0 0
50158 - 0 0 0 0 0 0 0 0 0 0 0 0
50159 - 0 0 0 0 0 0 0 0 0 0 0 0
50160 - 0 0 0 0 0 0 0 0 0 0 0 0
50161 - 0 0 0 0 0 0 0 0 0 0 0 0
50162 - 0 0 0 0 0 0 0 0 0 0 0 0
50163 - 0 0 0 0 0 0 0 0 0 10 10 10
50164 - 22 22 22 42 42 42 66 66 66 86 86 86
50165 - 66 66 66 38 38 38 38 38 38 22 22 22
50166 - 26 26 26 34 34 34 54 54 54 66 66 66
50167 - 86 86 86 70 70 70 46 46 46 26 26 26
50168 - 14 14 14 6 6 6 0 0 0 0 0 0
50169 - 0 0 0 0 0 0 0 0 0 0 0 0
50170 - 0 0 0 0 0 0 0 0 0 0 0 0
50171 - 0 0 0 0 0 0 0 0 0 0 0 0
50172 - 0 0 0 0 0 0 0 0 0 0 0 0
50173 - 0 0 0 0 0 0 0 0 0 0 0 0
50174 - 0 0 0 0 0 0 0 0 0 0 0 0
50175 - 0 0 0 0 0 0 0 0 0 0 0 0
50176 - 0 0 0 0 0 0 0 0 0 0 0 0
50177 - 0 0 1 0 0 1 0 0 1 0 0 0
50178 - 0 0 0 0 0 0 0 0 0 0 0 0
50179 - 0 0 0 0 0 0 0 0 0 0 0 0
50180 - 0 0 0 0 0 0 0 0 0 0 0 0
50181 - 0 0 0 0 0 0 0 0 0 0 0 0
50182 - 0 0 0 0 0 0 0 0 0 0 0 0
50183 - 0 0 0 0 0 0 10 10 10 26 26 26
50184 - 50 50 50 82 82 82 58 58 58 6 6 6
50185 - 2 2 6 2 2 6 2 2 6 2 2 6
50186 - 2 2 6 2 2 6 2 2 6 2 2 6
50187 - 6 6 6 54 54 54 86 86 86 66 66 66
50188 - 38 38 38 18 18 18 6 6 6 0 0 0
50189 - 0 0 0 0 0 0 0 0 0 0 0 0
50190 - 0 0 0 0 0 0 0 0 0 0 0 0
50191 - 0 0 0 0 0 0 0 0 0 0 0 0
50192 - 0 0 0 0 0 0 0 0 0 0 0 0
50193 - 0 0 0 0 0 0 0 0 0 0 0 0
50194 - 0 0 0 0 0 0 0 0 0 0 0 0
50195 - 0 0 0 0 0 0 0 0 0 0 0 0
50196 - 0 0 0 0 0 0 0 0 0 0 0 0
50197 - 0 0 0 0 0 0 0 0 0 0 0 0
50198 - 0 0 0 0 0 0 0 0 0 0 0 0
50199 - 0 0 0 0 0 0 0 0 0 0 0 0
50200 - 0 0 0 0 0 0 0 0 0 0 0 0
50201 - 0 0 0 0 0 0 0 0 0 0 0 0
50202 - 0 0 0 0 0 0 0 0 0 0 0 0
50203 - 0 0 0 6 6 6 22 22 22 50 50 50
50204 - 78 78 78 34 34 34 2 2 6 2 2 6
50205 - 2 2 6 2 2 6 2 2 6 2 2 6
50206 - 2 2 6 2 2 6 2 2 6 2 2 6
50207 - 2 2 6 2 2 6 6 6 6 70 70 70
50208 - 78 78 78 46 46 46 22 22 22 6 6 6
50209 - 0 0 0 0 0 0 0 0 0 0 0 0
50210 - 0 0 0 0 0 0 0 0 0 0 0 0
50211 - 0 0 0 0 0 0 0 0 0 0 0 0
50212 - 0 0 0 0 0 0 0 0 0 0 0 0
50213 - 0 0 0 0 0 0 0 0 0 0 0 0
50214 - 0 0 0 0 0 0 0 0 0 0 0 0
50215 - 0 0 0 0 0 0 0 0 0 0 0 0
50216 - 0 0 0 0 0 0 0 0 0 0 0 0
50217 - 0 0 1 0 0 1 0 0 1 0 0 0
50218 - 0 0 0 0 0 0 0 0 0 0 0 0
50219 - 0 0 0 0 0 0 0 0 0 0 0 0
50220 - 0 0 0 0 0 0 0 0 0 0 0 0
50221 - 0 0 0 0 0 0 0 0 0 0 0 0
50222 - 0 0 0 0 0 0 0 0 0 0 0 0
50223 - 6 6 6 18 18 18 42 42 42 82 82 82
50224 - 26 26 26 2 2 6 2 2 6 2 2 6
50225 - 2 2 6 2 2 6 2 2 6 2 2 6
50226 - 2 2 6 2 2 6 2 2 6 14 14 14
50227 - 46 46 46 34 34 34 6 6 6 2 2 6
50228 - 42 42 42 78 78 78 42 42 42 18 18 18
50229 - 6 6 6 0 0 0 0 0 0 0 0 0
50230 - 0 0 0 0 0 0 0 0 0 0 0 0
50231 - 0 0 0 0 0 0 0 0 0 0 0 0
50232 - 0 0 0 0 0 0 0 0 0 0 0 0
50233 - 0 0 0 0 0 0 0 0 0 0 0 0
50234 - 0 0 0 0 0 0 0 0 0 0 0 0
50235 - 0 0 0 0 0 0 0 0 0 0 0 0
50236 - 0 0 0 0 0 0 0 0 0 0 0 0
50237 - 0 0 1 0 0 0 0 0 1 0 0 0
50238 - 0 0 0 0 0 0 0 0 0 0 0 0
50239 - 0 0 0 0 0 0 0 0 0 0 0 0
50240 - 0 0 0 0 0 0 0 0 0 0 0 0
50241 - 0 0 0 0 0 0 0 0 0 0 0 0
50242 - 0 0 0 0 0 0 0 0 0 0 0 0
50243 - 10 10 10 30 30 30 66 66 66 58 58 58
50244 - 2 2 6 2 2 6 2 2 6 2 2 6
50245 - 2 2 6 2 2 6 2 2 6 2 2 6
50246 - 2 2 6 2 2 6 2 2 6 26 26 26
50247 - 86 86 86 101 101 101 46 46 46 10 10 10
50248 - 2 2 6 58 58 58 70 70 70 34 34 34
50249 - 10 10 10 0 0 0 0 0 0 0 0 0
50250 - 0 0 0 0 0 0 0 0 0 0 0 0
50251 - 0 0 0 0 0 0 0 0 0 0 0 0
50252 - 0 0 0 0 0 0 0 0 0 0 0 0
50253 - 0 0 0 0 0 0 0 0 0 0 0 0
50254 - 0 0 0 0 0 0 0 0 0 0 0 0
50255 - 0 0 0 0 0 0 0 0 0 0 0 0
50256 - 0 0 0 0 0 0 0 0 0 0 0 0
50257 - 0 0 1 0 0 1 0 0 1 0 0 0
50258 - 0 0 0 0 0 0 0 0 0 0 0 0
50259 - 0 0 0 0 0 0 0 0 0 0 0 0
50260 - 0 0 0 0 0 0 0 0 0 0 0 0
50261 - 0 0 0 0 0 0 0 0 0 0 0 0
50262 - 0 0 0 0 0 0 0 0 0 0 0 0
50263 - 14 14 14 42 42 42 86 86 86 10 10 10
50264 - 2 2 6 2 2 6 2 2 6 2 2 6
50265 - 2 2 6 2 2 6 2 2 6 2 2 6
50266 - 2 2 6 2 2 6 2 2 6 30 30 30
50267 - 94 94 94 94 94 94 58 58 58 26 26 26
50268 - 2 2 6 6 6 6 78 78 78 54 54 54
50269 - 22 22 22 6 6 6 0 0 0 0 0 0
50270 - 0 0 0 0 0 0 0 0 0 0 0 0
50271 - 0 0 0 0 0 0 0 0 0 0 0 0
50272 - 0 0 0 0 0 0 0 0 0 0 0 0
50273 - 0 0 0 0 0 0 0 0 0 0 0 0
50274 - 0 0 0 0 0 0 0 0 0 0 0 0
50275 - 0 0 0 0 0 0 0 0 0 0 0 0
50276 - 0 0 0 0 0 0 0 0 0 0 0 0
50277 - 0 0 0 0 0 0 0 0 0 0 0 0
50278 - 0 0 0 0 0 0 0 0 0 0 0 0
50279 - 0 0 0 0 0 0 0 0 0 0 0 0
50280 - 0 0 0 0 0 0 0 0 0 0 0 0
50281 - 0 0 0 0 0 0 0 0 0 0 0 0
50282 - 0 0 0 0 0 0 0 0 0 6 6 6
50283 - 22 22 22 62 62 62 62 62 62 2 2 6
50284 - 2 2 6 2 2 6 2 2 6 2 2 6
50285 - 2 2 6 2 2 6 2 2 6 2 2 6
50286 - 2 2 6 2 2 6 2 2 6 26 26 26
50287 - 54 54 54 38 38 38 18 18 18 10 10 10
50288 - 2 2 6 2 2 6 34 34 34 82 82 82
50289 - 38 38 38 14 14 14 0 0 0 0 0 0
50290 - 0 0 0 0 0 0 0 0 0 0 0 0
50291 - 0 0 0 0 0 0 0 0 0 0 0 0
50292 - 0 0 0 0 0 0 0 0 0 0 0 0
50293 - 0 0 0 0 0 0 0 0 0 0 0 0
50294 - 0 0 0 0 0 0 0 0 0 0 0 0
50295 - 0 0 0 0 0 0 0 0 0 0 0 0
50296 - 0 0 0 0 0 0 0 0 0 0 0 0
50297 - 0 0 0 0 0 1 0 0 1 0 0 0
50298 - 0 0 0 0 0 0 0 0 0 0 0 0
50299 - 0 0 0 0 0 0 0 0 0 0 0 0
50300 - 0 0 0 0 0 0 0 0 0 0 0 0
50301 - 0 0 0 0 0 0 0 0 0 0 0 0
50302 - 0 0 0 0 0 0 0 0 0 6 6 6
50303 - 30 30 30 78 78 78 30 30 30 2 2 6
50304 - 2 2 6 2 2 6 2 2 6 2 2 6
50305 - 2 2 6 2 2 6 2 2 6 2 2 6
50306 - 2 2 6 2 2 6 2 2 6 10 10 10
50307 - 10 10 10 2 2 6 2 2 6 2 2 6
50308 - 2 2 6 2 2 6 2 2 6 78 78 78
50309 - 50 50 50 18 18 18 6 6 6 0 0 0
50310 - 0 0 0 0 0 0 0 0 0 0 0 0
50311 - 0 0 0 0 0 0 0 0 0 0 0 0
50312 - 0 0 0 0 0 0 0 0 0 0 0 0
50313 - 0 0 0 0 0 0 0 0 0 0 0 0
50314 - 0 0 0 0 0 0 0 0 0 0 0 0
50315 - 0 0 0 0 0 0 0 0 0 0 0 0
50316 - 0 0 0 0 0 0 0 0 0 0 0 0
50317 - 0 0 1 0 0 0 0 0 0 0 0 0
50318 - 0 0 0 0 0 0 0 0 0 0 0 0
50319 - 0 0 0 0 0 0 0 0 0 0 0 0
50320 - 0 0 0 0 0 0 0 0 0 0 0 0
50321 - 0 0 0 0 0 0 0 0 0 0 0 0
50322 - 0 0 0 0 0 0 0 0 0 10 10 10
50323 - 38 38 38 86 86 86 14 14 14 2 2 6
50324 - 2 2 6 2 2 6 2 2 6 2 2 6
50325 - 2 2 6 2 2 6 2 2 6 2 2 6
50326 - 2 2 6 2 2 6 2 2 6 2 2 6
50327 - 2 2 6 2 2 6 2 2 6 2 2 6
50328 - 2 2 6 2 2 6 2 2 6 54 54 54
50329 - 66 66 66 26 26 26 6 6 6 0 0 0
50330 - 0 0 0 0 0 0 0 0 0 0 0 0
50331 - 0 0 0 0 0 0 0 0 0 0 0 0
50332 - 0 0 0 0 0 0 0 0 0 0 0 0
50333 - 0 0 0 0 0 0 0 0 0 0 0 0
50334 - 0 0 0 0 0 0 0 0 0 0 0 0
50335 - 0 0 0 0 0 0 0 0 0 0 0 0
50336 - 0 0 0 0 0 0 0 0 0 0 0 0
50337 - 0 0 0 0 0 1 0 0 1 0 0 0
50338 - 0 0 0 0 0 0 0 0 0 0 0 0
50339 - 0 0 0 0 0 0 0 0 0 0 0 0
50340 - 0 0 0 0 0 0 0 0 0 0 0 0
50341 - 0 0 0 0 0 0 0 0 0 0 0 0
50342 - 0 0 0 0 0 0 0 0 0 14 14 14
50343 - 42 42 42 82 82 82 2 2 6 2 2 6
50344 - 2 2 6 6 6 6 10 10 10 2 2 6
50345 - 2 2 6 2 2 6 2 2 6 2 2 6
50346 - 2 2 6 2 2 6 2 2 6 6 6 6
50347 - 14 14 14 10 10 10 2 2 6 2 2 6
50348 - 2 2 6 2 2 6 2 2 6 18 18 18
50349 - 82 82 82 34 34 34 10 10 10 0 0 0
50350 - 0 0 0 0 0 0 0 0 0 0 0 0
50351 - 0 0 0 0 0 0 0 0 0 0 0 0
50352 - 0 0 0 0 0 0 0 0 0 0 0 0
50353 - 0 0 0 0 0 0 0 0 0 0 0 0
50354 - 0 0 0 0 0 0 0 0 0 0 0 0
50355 - 0 0 0 0 0 0 0 0 0 0 0 0
50356 - 0 0 0 0 0 0 0 0 0 0 0 0
50357 - 0 0 1 0 0 0 0 0 0 0 0 0
50358 - 0 0 0 0 0 0 0 0 0 0 0 0
50359 - 0 0 0 0 0 0 0 0 0 0 0 0
50360 - 0 0 0 0 0 0 0 0 0 0 0 0
50361 - 0 0 0 0 0 0 0 0 0 0 0 0
50362 - 0 0 0 0 0 0 0 0 0 14 14 14
50363 - 46 46 46 86 86 86 2 2 6 2 2 6
50364 - 6 6 6 6 6 6 22 22 22 34 34 34
50365 - 6 6 6 2 2 6 2 2 6 2 2 6
50366 - 2 2 6 2 2 6 18 18 18 34 34 34
50367 - 10 10 10 50 50 50 22 22 22 2 2 6
50368 - 2 2 6 2 2 6 2 2 6 10 10 10
50369 - 86 86 86 42 42 42 14 14 14 0 0 0
50370 - 0 0 0 0 0 0 0 0 0 0 0 0
50371 - 0 0 0 0 0 0 0 0 0 0 0 0
50372 - 0 0 0 0 0 0 0 0 0 0 0 0
50373 - 0 0 0 0 0 0 0 0 0 0 0 0
50374 - 0 0 0 0 0 0 0 0 0 0 0 0
50375 - 0 0 0 0 0 0 0 0 0 0 0 0
50376 - 0 0 0 0 0 0 0 0 0 0 0 0
50377 - 0 0 1 0 0 1 0 0 1 0 0 0
50378 - 0 0 0 0 0 0 0 0 0 0 0 0
50379 - 0 0 0 0 0 0 0 0 0 0 0 0
50380 - 0 0 0 0 0 0 0 0 0 0 0 0
50381 - 0 0 0 0 0 0 0 0 0 0 0 0
50382 - 0 0 0 0 0 0 0 0 0 14 14 14
50383 - 46 46 46 86 86 86 2 2 6 2 2 6
50384 - 38 38 38 116 116 116 94 94 94 22 22 22
50385 - 22 22 22 2 2 6 2 2 6 2 2 6
50386 - 14 14 14 86 86 86 138 138 138 162 162 162
50387 -154 154 154 38 38 38 26 26 26 6 6 6
50388 - 2 2 6 2 2 6 2 2 6 2 2 6
50389 - 86 86 86 46 46 46 14 14 14 0 0 0
50390 - 0 0 0 0 0 0 0 0 0 0 0 0
50391 - 0 0 0 0 0 0 0 0 0 0 0 0
50392 - 0 0 0 0 0 0 0 0 0 0 0 0
50393 - 0 0 0 0 0 0 0 0 0 0 0 0
50394 - 0 0 0 0 0 0 0 0 0 0 0 0
50395 - 0 0 0 0 0 0 0 0 0 0 0 0
50396 - 0 0 0 0 0 0 0 0 0 0 0 0
50397 - 0 0 0 0 0 0 0 0 0 0 0 0
50398 - 0 0 0 0 0 0 0 0 0 0 0 0
50399 - 0 0 0 0 0 0 0 0 0 0 0 0
50400 - 0 0 0 0 0 0 0 0 0 0 0 0
50401 - 0 0 0 0 0 0 0 0 0 0 0 0
50402 - 0 0 0 0 0 0 0 0 0 14 14 14
50403 - 46 46 46 86 86 86 2 2 6 14 14 14
50404 -134 134 134 198 198 198 195 195 195 116 116 116
50405 - 10 10 10 2 2 6 2 2 6 6 6 6
50406 -101 98 89 187 187 187 210 210 210 218 218 218
50407 -214 214 214 134 134 134 14 14 14 6 6 6
50408 - 2 2 6 2 2 6 2 2 6 2 2 6
50409 - 86 86 86 50 50 50 18 18 18 6 6 6
50410 - 0 0 0 0 0 0 0 0 0 0 0 0
50411 - 0 0 0 0 0 0 0 0 0 0 0 0
50412 - 0 0 0 0 0 0 0 0 0 0 0 0
50413 - 0 0 0 0 0 0 0 0 0 0 0 0
50414 - 0 0 0 0 0 0 0 0 0 0 0 0
50415 - 0 0 0 0 0 0 0 0 0 0 0 0
50416 - 0 0 0 0 0 0 0 0 1 0 0 0
50417 - 0 0 1 0 0 1 0 0 1 0 0 0
50418 - 0 0 0 0 0 0 0 0 0 0 0 0
50419 - 0 0 0 0 0 0 0 0 0 0 0 0
50420 - 0 0 0 0 0 0 0 0 0 0 0 0
50421 - 0 0 0 0 0 0 0 0 0 0 0 0
50422 - 0 0 0 0 0 0 0 0 0 14 14 14
50423 - 46 46 46 86 86 86 2 2 6 54 54 54
50424 -218 218 218 195 195 195 226 226 226 246 246 246
50425 - 58 58 58 2 2 6 2 2 6 30 30 30
50426 -210 210 210 253 253 253 174 174 174 123 123 123
50427 -221 221 221 234 234 234 74 74 74 2 2 6
50428 - 2 2 6 2 2 6 2 2 6 2 2 6
50429 - 70 70 70 58 58 58 22 22 22 6 6 6
50430 - 0 0 0 0 0 0 0 0 0 0 0 0
50431 - 0 0 0 0 0 0 0 0 0 0 0 0
50432 - 0 0 0 0 0 0 0 0 0 0 0 0
50433 - 0 0 0 0 0 0 0 0 0 0 0 0
50434 - 0 0 0 0 0 0 0 0 0 0 0 0
50435 - 0 0 0 0 0 0 0 0 0 0 0 0
50436 - 0 0 0 0 0 0 0 0 0 0 0 0
50437 - 0 0 0 0 0 0 0 0 0 0 0 0
50438 - 0 0 0 0 0 0 0 0 0 0 0 0
50439 - 0 0 0 0 0 0 0 0 0 0 0 0
50440 - 0 0 0 0 0 0 0 0 0 0 0 0
50441 - 0 0 0 0 0 0 0 0 0 0 0 0
50442 - 0 0 0 0 0 0 0 0 0 14 14 14
50443 - 46 46 46 82 82 82 2 2 6 106 106 106
50444 -170 170 170 26 26 26 86 86 86 226 226 226
50445 -123 123 123 10 10 10 14 14 14 46 46 46
50446 -231 231 231 190 190 190 6 6 6 70 70 70
50447 - 90 90 90 238 238 238 158 158 158 2 2 6
50448 - 2 2 6 2 2 6 2 2 6 2 2 6
50449 - 70 70 70 58 58 58 22 22 22 6 6 6
50450 - 0 0 0 0 0 0 0 0 0 0 0 0
50451 - 0 0 0 0 0 0 0 0 0 0 0 0
50452 - 0 0 0 0 0 0 0 0 0 0 0 0
50453 - 0 0 0 0 0 0 0 0 0 0 0 0
50454 - 0 0 0 0 0 0 0 0 0 0 0 0
50455 - 0 0 0 0 0 0 0 0 0 0 0 0
50456 - 0 0 0 0 0 0 0 0 1 0 0 0
50457 - 0 0 1 0 0 1 0 0 1 0 0 0
50458 - 0 0 0 0 0 0 0 0 0 0 0 0
50459 - 0 0 0 0 0 0 0 0 0 0 0 0
50460 - 0 0 0 0 0 0 0 0 0 0 0 0
50461 - 0 0 0 0 0 0 0 0 0 0 0 0
50462 - 0 0 0 0 0 0 0 0 0 14 14 14
50463 - 42 42 42 86 86 86 6 6 6 116 116 116
50464 -106 106 106 6 6 6 70 70 70 149 149 149
50465 -128 128 128 18 18 18 38 38 38 54 54 54
50466 -221 221 221 106 106 106 2 2 6 14 14 14
50467 - 46 46 46 190 190 190 198 198 198 2 2 6
50468 - 2 2 6 2 2 6 2 2 6 2 2 6
50469 - 74 74 74 62 62 62 22 22 22 6 6 6
50470 - 0 0 0 0 0 0 0 0 0 0 0 0
50471 - 0 0 0 0 0 0 0 0 0 0 0 0
50472 - 0 0 0 0 0 0 0 0 0 0 0 0
50473 - 0 0 0 0 0 0 0 0 0 0 0 0
50474 - 0 0 0 0 0 0 0 0 0 0 0 0
50475 - 0 0 0 0 0 0 0 0 0 0 0 0
50476 - 0 0 0 0 0 0 0 0 1 0 0 0
50477 - 0 0 1 0 0 0 0 0 1 0 0 0
50478 - 0 0 0 0 0 0 0 0 0 0 0 0
50479 - 0 0 0 0 0 0 0 0 0 0 0 0
50480 - 0 0 0 0 0 0 0 0 0 0 0 0
50481 - 0 0 0 0 0 0 0 0 0 0 0 0
50482 - 0 0 0 0 0 0 0 0 0 14 14 14
50483 - 42 42 42 94 94 94 14 14 14 101 101 101
50484 -128 128 128 2 2 6 18 18 18 116 116 116
50485 -118 98 46 121 92 8 121 92 8 98 78 10
50486 -162 162 162 106 106 106 2 2 6 2 2 6
50487 - 2 2 6 195 195 195 195 195 195 6 6 6
50488 - 2 2 6 2 2 6 2 2 6 2 2 6
50489 - 74 74 74 62 62 62 22 22 22 6 6 6
50490 - 0 0 0 0 0 0 0 0 0 0 0 0
50491 - 0 0 0 0 0 0 0 0 0 0 0 0
50492 - 0 0 0 0 0 0 0 0 0 0 0 0
50493 - 0 0 0 0 0 0 0 0 0 0 0 0
50494 - 0 0 0 0 0 0 0 0 0 0 0 0
50495 - 0 0 0 0 0 0 0 0 0 0 0 0
50496 - 0 0 0 0 0 0 0 0 1 0 0 1
50497 - 0 0 1 0 0 0 0 0 1 0 0 0
50498 - 0 0 0 0 0 0 0 0 0 0 0 0
50499 - 0 0 0 0 0 0 0 0 0 0 0 0
50500 - 0 0 0 0 0 0 0 0 0 0 0 0
50501 - 0 0 0 0 0 0 0 0 0 0 0 0
50502 - 0 0 0 0 0 0 0 0 0 10 10 10
50503 - 38 38 38 90 90 90 14 14 14 58 58 58
50504 -210 210 210 26 26 26 54 38 6 154 114 10
50505 -226 170 11 236 186 11 225 175 15 184 144 12
50506 -215 174 15 175 146 61 37 26 9 2 2 6
50507 - 70 70 70 246 246 246 138 138 138 2 2 6
50508 - 2 2 6 2 2 6 2 2 6 2 2 6
50509 - 70 70 70 66 66 66 26 26 26 6 6 6
50510 - 0 0 0 0 0 0 0 0 0 0 0 0
50511 - 0 0 0 0 0 0 0 0 0 0 0 0
50512 - 0 0 0 0 0 0 0 0 0 0 0 0
50513 - 0 0 0 0 0 0 0 0 0 0 0 0
50514 - 0 0 0 0 0 0 0 0 0 0 0 0
50515 - 0 0 0 0 0 0 0 0 0 0 0 0
50516 - 0 0 0 0 0 0 0 0 0 0 0 0
50517 - 0 0 0 0 0 0 0 0 0 0 0 0
50518 - 0 0 0 0 0 0 0 0 0 0 0 0
50519 - 0 0 0 0 0 0 0 0 0 0 0 0
50520 - 0 0 0 0 0 0 0 0 0 0 0 0
50521 - 0 0 0 0 0 0 0 0 0 0 0 0
50522 - 0 0 0 0 0 0 0 0 0 10 10 10
50523 - 38 38 38 86 86 86 14 14 14 10 10 10
50524 -195 195 195 188 164 115 192 133 9 225 175 15
50525 -239 182 13 234 190 10 232 195 16 232 200 30
50526 -245 207 45 241 208 19 232 195 16 184 144 12
50527 -218 194 134 211 206 186 42 42 42 2 2 6
50528 - 2 2 6 2 2 6 2 2 6 2 2 6
50529 - 50 50 50 74 74 74 30 30 30 6 6 6
50530 - 0 0 0 0 0 0 0 0 0 0 0 0
50531 - 0 0 0 0 0 0 0 0 0 0 0 0
50532 - 0 0 0 0 0 0 0 0 0 0 0 0
50533 - 0 0 0 0 0 0 0 0 0 0 0 0
50534 - 0 0 0 0 0 0 0 0 0 0 0 0
50535 - 0 0 0 0 0 0 0 0 0 0 0 0
50536 - 0 0 0 0 0 0 0 0 0 0 0 0
50537 - 0 0 0 0 0 0 0 0 0 0 0 0
50538 - 0 0 0 0 0 0 0 0 0 0 0 0
50539 - 0 0 0 0 0 0 0 0 0 0 0 0
50540 - 0 0 0 0 0 0 0 0 0 0 0 0
50541 - 0 0 0 0 0 0 0 0 0 0 0 0
50542 - 0 0 0 0 0 0 0 0 0 10 10 10
50543 - 34 34 34 86 86 86 14 14 14 2 2 6
50544 -121 87 25 192 133 9 219 162 10 239 182 13
50545 -236 186 11 232 195 16 241 208 19 244 214 54
50546 -246 218 60 246 218 38 246 215 20 241 208 19
50547 -241 208 19 226 184 13 121 87 25 2 2 6
50548 - 2 2 6 2 2 6 2 2 6 2 2 6
50549 - 50 50 50 82 82 82 34 34 34 10 10 10
50550 - 0 0 0 0 0 0 0 0 0 0 0 0
50551 - 0 0 0 0 0 0 0 0 0 0 0 0
50552 - 0 0 0 0 0 0 0 0 0 0 0 0
50553 - 0 0 0 0 0 0 0 0 0 0 0 0
50554 - 0 0 0 0 0 0 0 0 0 0 0 0
50555 - 0 0 0 0 0 0 0 0 0 0 0 0
50556 - 0 0 0 0 0 0 0 0 0 0 0 0
50557 - 0 0 0 0 0 0 0 0 0 0 0 0
50558 - 0 0 0 0 0 0 0 0 0 0 0 0
50559 - 0 0 0 0 0 0 0 0 0 0 0 0
50560 - 0 0 0 0 0 0 0 0 0 0 0 0
50561 - 0 0 0 0 0 0 0 0 0 0 0 0
50562 - 0 0 0 0 0 0 0 0 0 10 10 10
50563 - 34 34 34 82 82 82 30 30 30 61 42 6
50564 -180 123 7 206 145 10 230 174 11 239 182 13
50565 -234 190 10 238 202 15 241 208 19 246 218 74
50566 -246 218 38 246 215 20 246 215 20 246 215 20
50567 -226 184 13 215 174 15 184 144 12 6 6 6
50568 - 2 2 6 2 2 6 2 2 6 2 2 6
50569 - 26 26 26 94 94 94 42 42 42 14 14 14
50570 - 0 0 0 0 0 0 0 0 0 0 0 0
50571 - 0 0 0 0 0 0 0 0 0 0 0 0
50572 - 0 0 0 0 0 0 0 0 0 0 0 0
50573 - 0 0 0 0 0 0 0 0 0 0 0 0
50574 - 0 0 0 0 0 0 0 0 0 0 0 0
50575 - 0 0 0 0 0 0 0 0 0 0 0 0
50576 - 0 0 0 0 0 0 0 0 0 0 0 0
50577 - 0 0 0 0 0 0 0 0 0 0 0 0
50578 - 0 0 0 0 0 0 0 0 0 0 0 0
50579 - 0 0 0 0 0 0 0 0 0 0 0 0
50580 - 0 0 0 0 0 0 0 0 0 0 0 0
50581 - 0 0 0 0 0 0 0 0 0 0 0 0
50582 - 0 0 0 0 0 0 0 0 0 10 10 10
50583 - 30 30 30 78 78 78 50 50 50 104 69 6
50584 -192 133 9 216 158 10 236 178 12 236 186 11
50585 -232 195 16 241 208 19 244 214 54 245 215 43
50586 -246 215 20 246 215 20 241 208 19 198 155 10
50587 -200 144 11 216 158 10 156 118 10 2 2 6
50588 - 2 2 6 2 2 6 2 2 6 2 2 6
50589 - 6 6 6 90 90 90 54 54 54 18 18 18
50590 - 6 6 6 0 0 0 0 0 0 0 0 0
50591 - 0 0 0 0 0 0 0 0 0 0 0 0
50592 - 0 0 0 0 0 0 0 0 0 0 0 0
50593 - 0 0 0 0 0 0 0 0 0 0 0 0
50594 - 0 0 0 0 0 0 0 0 0 0 0 0
50595 - 0 0 0 0 0 0 0 0 0 0 0 0
50596 - 0 0 0 0 0 0 0 0 0 0 0 0
50597 - 0 0 0 0 0 0 0 0 0 0 0 0
50598 - 0 0 0 0 0 0 0 0 0 0 0 0
50599 - 0 0 0 0 0 0 0 0 0 0 0 0
50600 - 0 0 0 0 0 0 0 0 0 0 0 0
50601 - 0 0 0 0 0 0 0 0 0 0 0 0
50602 - 0 0 0 0 0 0 0 0 0 10 10 10
50603 - 30 30 30 78 78 78 46 46 46 22 22 22
50604 -137 92 6 210 162 10 239 182 13 238 190 10
50605 -238 202 15 241 208 19 246 215 20 246 215 20
50606 -241 208 19 203 166 17 185 133 11 210 150 10
50607 -216 158 10 210 150 10 102 78 10 2 2 6
50608 - 6 6 6 54 54 54 14 14 14 2 2 6
50609 - 2 2 6 62 62 62 74 74 74 30 30 30
50610 - 10 10 10 0 0 0 0 0 0 0 0 0
50611 - 0 0 0 0 0 0 0 0 0 0 0 0
50612 - 0 0 0 0 0 0 0 0 0 0 0 0
50613 - 0 0 0 0 0 0 0 0 0 0 0 0
50614 - 0 0 0 0 0 0 0 0 0 0 0 0
50615 - 0 0 0 0 0 0 0 0 0 0 0 0
50616 - 0 0 0 0 0 0 0 0 0 0 0 0
50617 - 0 0 0 0 0 0 0 0 0 0 0 0
50618 - 0 0 0 0 0 0 0 0 0 0 0 0
50619 - 0 0 0 0 0 0 0 0 0 0 0 0
50620 - 0 0 0 0 0 0 0 0 0 0 0 0
50621 - 0 0 0 0 0 0 0 0 0 0 0 0
50622 - 0 0 0 0 0 0 0 0 0 10 10 10
50623 - 34 34 34 78 78 78 50 50 50 6 6 6
50624 - 94 70 30 139 102 15 190 146 13 226 184 13
50625 -232 200 30 232 195 16 215 174 15 190 146 13
50626 -168 122 10 192 133 9 210 150 10 213 154 11
50627 -202 150 34 182 157 106 101 98 89 2 2 6
50628 - 2 2 6 78 78 78 116 116 116 58 58 58
50629 - 2 2 6 22 22 22 90 90 90 46 46 46
50630 - 18 18 18 6 6 6 0 0 0 0 0 0
50631 - 0 0 0 0 0 0 0 0 0 0 0 0
50632 - 0 0 0 0 0 0 0 0 0 0 0 0
50633 - 0 0 0 0 0 0 0 0 0 0 0 0
50634 - 0 0 0 0 0 0 0 0 0 0 0 0
50635 - 0 0 0 0 0 0 0 0 0 0 0 0
50636 - 0 0 0 0 0 0 0 0 0 0 0 0
50637 - 0 0 0 0 0 0 0 0 0 0 0 0
50638 - 0 0 0 0 0 0 0 0 0 0 0 0
50639 - 0 0 0 0 0 0 0 0 0 0 0 0
50640 - 0 0 0 0 0 0 0 0 0 0 0 0
50641 - 0 0 0 0 0 0 0 0 0 0 0 0
50642 - 0 0 0 0 0 0 0 0 0 10 10 10
50643 - 38 38 38 86 86 86 50 50 50 6 6 6
50644 -128 128 128 174 154 114 156 107 11 168 122 10
50645 -198 155 10 184 144 12 197 138 11 200 144 11
50646 -206 145 10 206 145 10 197 138 11 188 164 115
50647 -195 195 195 198 198 198 174 174 174 14 14 14
50648 - 2 2 6 22 22 22 116 116 116 116 116 116
50649 - 22 22 22 2 2 6 74 74 74 70 70 70
50650 - 30 30 30 10 10 10 0 0 0 0 0 0
50651 - 0 0 0 0 0 0 0 0 0 0 0 0
50652 - 0 0 0 0 0 0 0 0 0 0 0 0
50653 - 0 0 0 0 0 0 0 0 0 0 0 0
50654 - 0 0 0 0 0 0 0 0 0 0 0 0
50655 - 0 0 0 0 0 0 0 0 0 0 0 0
50656 - 0 0 0 0 0 0 0 0 0 0 0 0
50657 - 0 0 0 0 0 0 0 0 0 0 0 0
50658 - 0 0 0 0 0 0 0 0 0 0 0 0
50659 - 0 0 0 0 0 0 0 0 0 0 0 0
50660 - 0 0 0 0 0 0 0 0 0 0 0 0
50661 - 0 0 0 0 0 0 0 0 0 0 0 0
50662 - 0 0 0 0 0 0 6 6 6 18 18 18
50663 - 50 50 50 101 101 101 26 26 26 10 10 10
50664 -138 138 138 190 190 190 174 154 114 156 107 11
50665 -197 138 11 200 144 11 197 138 11 192 133 9
50666 -180 123 7 190 142 34 190 178 144 187 187 187
50667 -202 202 202 221 221 221 214 214 214 66 66 66
50668 - 2 2 6 2 2 6 50 50 50 62 62 62
50669 - 6 6 6 2 2 6 10 10 10 90 90 90
50670 - 50 50 50 18 18 18 6 6 6 0 0 0
50671 - 0 0 0 0 0 0 0 0 0 0 0 0
50672 - 0 0 0 0 0 0 0 0 0 0 0 0
50673 - 0 0 0 0 0 0 0 0 0 0 0 0
50674 - 0 0 0 0 0 0 0 0 0 0 0 0
50675 - 0 0 0 0 0 0 0 0 0 0 0 0
50676 - 0 0 0 0 0 0 0 0 0 0 0 0
50677 - 0 0 0 0 0 0 0 0 0 0 0 0
50678 - 0 0 0 0 0 0 0 0 0 0 0 0
50679 - 0 0 0 0 0 0 0 0 0 0 0 0
50680 - 0 0 0 0 0 0 0 0 0 0 0 0
50681 - 0 0 0 0 0 0 0 0 0 0 0 0
50682 - 0 0 0 0 0 0 10 10 10 34 34 34
50683 - 74 74 74 74 74 74 2 2 6 6 6 6
50684 -144 144 144 198 198 198 190 190 190 178 166 146
50685 -154 121 60 156 107 11 156 107 11 168 124 44
50686 -174 154 114 187 187 187 190 190 190 210 210 210
50687 -246 246 246 253 253 253 253 253 253 182 182 182
50688 - 6 6 6 2 2 6 2 2 6 2 2 6
50689 - 2 2 6 2 2 6 2 2 6 62 62 62
50690 - 74 74 74 34 34 34 14 14 14 0 0 0
50691 - 0 0 0 0 0 0 0 0 0 0 0 0
50692 - 0 0 0 0 0 0 0 0 0 0 0 0
50693 - 0 0 0 0 0 0 0 0 0 0 0 0
50694 - 0 0 0 0 0 0 0 0 0 0 0 0
50695 - 0 0 0 0 0 0 0 0 0 0 0 0
50696 - 0 0 0 0 0 0 0 0 0 0 0 0
50697 - 0 0 0 0 0 0 0 0 0 0 0 0
50698 - 0 0 0 0 0 0 0 0 0 0 0 0
50699 - 0 0 0 0 0 0 0 0 0 0 0 0
50700 - 0 0 0 0 0 0 0 0 0 0 0 0
50701 - 0 0 0 0 0 0 0 0 0 0 0 0
50702 - 0 0 0 10 10 10 22 22 22 54 54 54
50703 - 94 94 94 18 18 18 2 2 6 46 46 46
50704 -234 234 234 221 221 221 190 190 190 190 190 190
50705 -190 190 190 187 187 187 187 187 187 190 190 190
50706 -190 190 190 195 195 195 214 214 214 242 242 242
50707 -253 253 253 253 253 253 253 253 253 253 253 253
50708 - 82 82 82 2 2 6 2 2 6 2 2 6
50709 - 2 2 6 2 2 6 2 2 6 14 14 14
50710 - 86 86 86 54 54 54 22 22 22 6 6 6
50711 - 0 0 0 0 0 0 0 0 0 0 0 0
50712 - 0 0 0 0 0 0 0 0 0 0 0 0
50713 - 0 0 0 0 0 0 0 0 0 0 0 0
50714 - 0 0 0 0 0 0 0 0 0 0 0 0
50715 - 0 0 0 0 0 0 0 0 0 0 0 0
50716 - 0 0 0 0 0 0 0 0 0 0 0 0
50717 - 0 0 0 0 0 0 0 0 0 0 0 0
50718 - 0 0 0 0 0 0 0 0 0 0 0 0
50719 - 0 0 0 0 0 0 0 0 0 0 0 0
50720 - 0 0 0 0 0 0 0 0 0 0 0 0
50721 - 0 0 0 0 0 0 0 0 0 0 0 0
50722 - 6 6 6 18 18 18 46 46 46 90 90 90
50723 - 46 46 46 18 18 18 6 6 6 182 182 182
50724 -253 253 253 246 246 246 206 206 206 190 190 190
50725 -190 190 190 190 190 190 190 190 190 190 190 190
50726 -206 206 206 231 231 231 250 250 250 253 253 253
50727 -253 253 253 253 253 253 253 253 253 253 253 253
50728 -202 202 202 14 14 14 2 2 6 2 2 6
50729 - 2 2 6 2 2 6 2 2 6 2 2 6
50730 - 42 42 42 86 86 86 42 42 42 18 18 18
50731 - 6 6 6 0 0 0 0 0 0 0 0 0
50732 - 0 0 0 0 0 0 0 0 0 0 0 0
50733 - 0 0 0 0 0 0 0 0 0 0 0 0
50734 - 0 0 0 0 0 0 0 0 0 0 0 0
50735 - 0 0 0 0 0 0 0 0 0 0 0 0
50736 - 0 0 0 0 0 0 0 0 0 0 0 0
50737 - 0 0 0 0 0 0 0 0 0 0 0 0
50738 - 0 0 0 0 0 0 0 0 0 0 0 0
50739 - 0 0 0 0 0 0 0 0 0 0 0 0
50740 - 0 0 0 0 0 0 0 0 0 0 0 0
50741 - 0 0 0 0 0 0 0 0 0 6 6 6
50742 - 14 14 14 38 38 38 74 74 74 66 66 66
50743 - 2 2 6 6 6 6 90 90 90 250 250 250
50744 -253 253 253 253 253 253 238 238 238 198 198 198
50745 -190 190 190 190 190 190 195 195 195 221 221 221
50746 -246 246 246 253 253 253 253 253 253 253 253 253
50747 -253 253 253 253 253 253 253 253 253 253 253 253
50748 -253 253 253 82 82 82 2 2 6 2 2 6
50749 - 2 2 6 2 2 6 2 2 6 2 2 6
50750 - 2 2 6 78 78 78 70 70 70 34 34 34
50751 - 14 14 14 6 6 6 0 0 0 0 0 0
50752 - 0 0 0 0 0 0 0 0 0 0 0 0
50753 - 0 0 0 0 0 0 0 0 0 0 0 0
50754 - 0 0 0 0 0 0 0 0 0 0 0 0
50755 - 0 0 0 0 0 0 0 0 0 0 0 0
50756 - 0 0 0 0 0 0 0 0 0 0 0 0
50757 - 0 0 0 0 0 0 0 0 0 0 0 0
50758 - 0 0 0 0 0 0 0 0 0 0 0 0
50759 - 0 0 0 0 0 0 0 0 0 0 0 0
50760 - 0 0 0 0 0 0 0 0 0 0 0 0
50761 - 0 0 0 0 0 0 0 0 0 14 14 14
50762 - 34 34 34 66 66 66 78 78 78 6 6 6
50763 - 2 2 6 18 18 18 218 218 218 253 253 253
50764 -253 253 253 253 253 253 253 253 253 246 246 246
50765 -226 226 226 231 231 231 246 246 246 253 253 253
50766 -253 253 253 253 253 253 253 253 253 253 253 253
50767 -253 253 253 253 253 253 253 253 253 253 253 253
50768 -253 253 253 178 178 178 2 2 6 2 2 6
50769 - 2 2 6 2 2 6 2 2 6 2 2 6
50770 - 2 2 6 18 18 18 90 90 90 62 62 62
50771 - 30 30 30 10 10 10 0 0 0 0 0 0
50772 - 0 0 0 0 0 0 0 0 0 0 0 0
50773 - 0 0 0 0 0 0 0 0 0 0 0 0
50774 - 0 0 0 0 0 0 0 0 0 0 0 0
50775 - 0 0 0 0 0 0 0 0 0 0 0 0
50776 - 0 0 0 0 0 0 0 0 0 0 0 0
50777 - 0 0 0 0 0 0 0 0 0 0 0 0
50778 - 0 0 0 0 0 0 0 0 0 0 0 0
50779 - 0 0 0 0 0 0 0 0 0 0 0 0
50780 - 0 0 0 0 0 0 0 0 0 0 0 0
50781 - 0 0 0 0 0 0 10 10 10 26 26 26
50782 - 58 58 58 90 90 90 18 18 18 2 2 6
50783 - 2 2 6 110 110 110 253 253 253 253 253 253
50784 -253 253 253 253 253 253 253 253 253 253 253 253
50785 -250 250 250 253 253 253 253 253 253 253 253 253
50786 -253 253 253 253 253 253 253 253 253 253 253 253
50787 -253 253 253 253 253 253 253 253 253 253 253 253
50788 -253 253 253 231 231 231 18 18 18 2 2 6
50789 - 2 2 6 2 2 6 2 2 6 2 2 6
50790 - 2 2 6 2 2 6 18 18 18 94 94 94
50791 - 54 54 54 26 26 26 10 10 10 0 0 0
50792 - 0 0 0 0 0 0 0 0 0 0 0 0
50793 - 0 0 0 0 0 0 0 0 0 0 0 0
50794 - 0 0 0 0 0 0 0 0 0 0 0 0
50795 - 0 0 0 0 0 0 0 0 0 0 0 0
50796 - 0 0 0 0 0 0 0 0 0 0 0 0
50797 - 0 0 0 0 0 0 0 0 0 0 0 0
50798 - 0 0 0 0 0 0 0 0 0 0 0 0
50799 - 0 0 0 0 0 0 0 0 0 0 0 0
50800 - 0 0 0 0 0 0 0 0 0 0 0 0
50801 - 0 0 0 6 6 6 22 22 22 50 50 50
50802 - 90 90 90 26 26 26 2 2 6 2 2 6
50803 - 14 14 14 195 195 195 250 250 250 253 253 253
50804 -253 253 253 253 253 253 253 253 253 253 253 253
50805 -253 253 253 253 253 253 253 253 253 253 253 253
50806 -253 253 253 253 253 253 253 253 253 253 253 253
50807 -253 253 253 253 253 253 253 253 253 253 253 253
50808 -250 250 250 242 242 242 54 54 54 2 2 6
50809 - 2 2 6 2 2 6 2 2 6 2 2 6
50810 - 2 2 6 2 2 6 2 2 6 38 38 38
50811 - 86 86 86 50 50 50 22 22 22 6 6 6
50812 - 0 0 0 0 0 0 0 0 0 0 0 0
50813 - 0 0 0 0 0 0 0 0 0 0 0 0
50814 - 0 0 0 0 0 0 0 0 0 0 0 0
50815 - 0 0 0 0 0 0 0 0 0 0 0 0
50816 - 0 0 0 0 0 0 0 0 0 0 0 0
50817 - 0 0 0 0 0 0 0 0 0 0 0 0
50818 - 0 0 0 0 0 0 0 0 0 0 0 0
50819 - 0 0 0 0 0 0 0 0 0 0 0 0
50820 - 0 0 0 0 0 0 0 0 0 0 0 0
50821 - 6 6 6 14 14 14 38 38 38 82 82 82
50822 - 34 34 34 2 2 6 2 2 6 2 2 6
50823 - 42 42 42 195 195 195 246 246 246 253 253 253
50824 -253 253 253 253 253 253 253 253 253 250 250 250
50825 -242 242 242 242 242 242 250 250 250 253 253 253
50826 -253 253 253 253 253 253 253 253 253 253 253 253
50827 -253 253 253 250 250 250 246 246 246 238 238 238
50828 -226 226 226 231 231 231 101 101 101 6 6 6
50829 - 2 2 6 2 2 6 2 2 6 2 2 6
50830 - 2 2 6 2 2 6 2 2 6 2 2 6
50831 - 38 38 38 82 82 82 42 42 42 14 14 14
50832 - 6 6 6 0 0 0 0 0 0 0 0 0
50833 - 0 0 0 0 0 0 0 0 0 0 0 0
50834 - 0 0 0 0 0 0 0 0 0 0 0 0
50835 - 0 0 0 0 0 0 0 0 0 0 0 0
50836 - 0 0 0 0 0 0 0 0 0 0 0 0
50837 - 0 0 0 0 0 0 0 0 0 0 0 0
50838 - 0 0 0 0 0 0 0 0 0 0 0 0
50839 - 0 0 0 0 0 0 0 0 0 0 0 0
50840 - 0 0 0 0 0 0 0 0 0 0 0 0
50841 - 10 10 10 26 26 26 62 62 62 66 66 66
50842 - 2 2 6 2 2 6 2 2 6 6 6 6
50843 - 70 70 70 170 170 170 206 206 206 234 234 234
50844 -246 246 246 250 250 250 250 250 250 238 238 238
50845 -226 226 226 231 231 231 238 238 238 250 250 250
50846 -250 250 250 250 250 250 246 246 246 231 231 231
50847 -214 214 214 206 206 206 202 202 202 202 202 202
50848 -198 198 198 202 202 202 182 182 182 18 18 18
50849 - 2 2 6 2 2 6 2 2 6 2 2 6
50850 - 2 2 6 2 2 6 2 2 6 2 2 6
50851 - 2 2 6 62 62 62 66 66 66 30 30 30
50852 - 10 10 10 0 0 0 0 0 0 0 0 0
50853 - 0 0 0 0 0 0 0 0 0 0 0 0
50854 - 0 0 0 0 0 0 0 0 0 0 0 0
50855 - 0 0 0 0 0 0 0 0 0 0 0 0
50856 - 0 0 0 0 0 0 0 0 0 0 0 0
50857 - 0 0 0 0 0 0 0 0 0 0 0 0
50858 - 0 0 0 0 0 0 0 0 0 0 0 0
50859 - 0 0 0 0 0 0 0 0 0 0 0 0
50860 - 0 0 0 0 0 0 0 0 0 0 0 0
50861 - 14 14 14 42 42 42 82 82 82 18 18 18
50862 - 2 2 6 2 2 6 2 2 6 10 10 10
50863 - 94 94 94 182 182 182 218 218 218 242 242 242
50864 -250 250 250 253 253 253 253 253 253 250 250 250
50865 -234 234 234 253 253 253 253 253 253 253 253 253
50866 -253 253 253 253 253 253 253 253 253 246 246 246
50867 -238 238 238 226 226 226 210 210 210 202 202 202
50868 -195 195 195 195 195 195 210 210 210 158 158 158
50869 - 6 6 6 14 14 14 50 50 50 14 14 14
50870 - 2 2 6 2 2 6 2 2 6 2 2 6
50871 - 2 2 6 6 6 6 86 86 86 46 46 46
50872 - 18 18 18 6 6 6 0 0 0 0 0 0
50873 - 0 0 0 0 0 0 0 0 0 0 0 0
50874 - 0 0 0 0 0 0 0 0 0 0 0 0
50875 - 0 0 0 0 0 0 0 0 0 0 0 0
50876 - 0 0 0 0 0 0 0 0 0 0 0 0
50877 - 0 0 0 0 0 0 0 0 0 0 0 0
50878 - 0 0 0 0 0 0 0 0 0 0 0 0
50879 - 0 0 0 0 0 0 0 0 0 0 0 0
50880 - 0 0 0 0 0 0 0 0 0 6 6 6
50881 - 22 22 22 54 54 54 70 70 70 2 2 6
50882 - 2 2 6 10 10 10 2 2 6 22 22 22
50883 -166 166 166 231 231 231 250 250 250 253 253 253
50884 -253 253 253 253 253 253 253 253 253 250 250 250
50885 -242 242 242 253 253 253 253 253 253 253 253 253
50886 -253 253 253 253 253 253 253 253 253 253 253 253
50887 -253 253 253 253 253 253 253 253 253 246 246 246
50888 -231 231 231 206 206 206 198 198 198 226 226 226
50889 - 94 94 94 2 2 6 6 6 6 38 38 38
50890 - 30 30 30 2 2 6 2 2 6 2 2 6
50891 - 2 2 6 2 2 6 62 62 62 66 66 66
50892 - 26 26 26 10 10 10 0 0 0 0 0 0
50893 - 0 0 0 0 0 0 0 0 0 0 0 0
50894 - 0 0 0 0 0 0 0 0 0 0 0 0
50895 - 0 0 0 0 0 0 0 0 0 0 0 0
50896 - 0 0 0 0 0 0 0 0 0 0 0 0
50897 - 0 0 0 0 0 0 0 0 0 0 0 0
50898 - 0 0 0 0 0 0 0 0 0 0 0 0
50899 - 0 0 0 0 0 0 0 0 0 0 0 0
50900 - 0 0 0 0 0 0 0 0 0 10 10 10
50901 - 30 30 30 74 74 74 50 50 50 2 2 6
50902 - 26 26 26 26 26 26 2 2 6 106 106 106
50903 -238 238 238 253 253 253 253 253 253 253 253 253
50904 -253 253 253 253 253 253 253 253 253 253 253 253
50905 -253 253 253 253 253 253 253 253 253 253 253 253
50906 -253 253 253 253 253 253 253 253 253 253 253 253
50907 -253 253 253 253 253 253 253 253 253 253 253 253
50908 -253 253 253 246 246 246 218 218 218 202 202 202
50909 -210 210 210 14 14 14 2 2 6 2 2 6
50910 - 30 30 30 22 22 22 2 2 6 2 2 6
50911 - 2 2 6 2 2 6 18 18 18 86 86 86
50912 - 42 42 42 14 14 14 0 0 0 0 0 0
50913 - 0 0 0 0 0 0 0 0 0 0 0 0
50914 - 0 0 0 0 0 0 0 0 0 0 0 0
50915 - 0 0 0 0 0 0 0 0 0 0 0 0
50916 - 0 0 0 0 0 0 0 0 0 0 0 0
50917 - 0 0 0 0 0 0 0 0 0 0 0 0
50918 - 0 0 0 0 0 0 0 0 0 0 0 0
50919 - 0 0 0 0 0 0 0 0 0 0 0 0
50920 - 0 0 0 0 0 0 0 0 0 14 14 14
50921 - 42 42 42 90 90 90 22 22 22 2 2 6
50922 - 42 42 42 2 2 6 18 18 18 218 218 218
50923 -253 253 253 253 253 253 253 253 253 253 253 253
50924 -253 253 253 253 253 253 253 253 253 253 253 253
50925 -253 253 253 253 253 253 253 253 253 253 253 253
50926 -253 253 253 253 253 253 253 253 253 253 253 253
50927 -253 253 253 253 253 253 253 253 253 253 253 253
50928 -253 253 253 253 253 253 250 250 250 221 221 221
50929 -218 218 218 101 101 101 2 2 6 14 14 14
50930 - 18 18 18 38 38 38 10 10 10 2 2 6
50931 - 2 2 6 2 2 6 2 2 6 78 78 78
50932 - 58 58 58 22 22 22 6 6 6 0 0 0
50933 - 0 0 0 0 0 0 0 0 0 0 0 0
50934 - 0 0 0 0 0 0 0 0 0 0 0 0
50935 - 0 0 0 0 0 0 0 0 0 0 0 0
50936 - 0 0 0 0 0 0 0 0 0 0 0 0
50937 - 0 0 0 0 0 0 0 0 0 0 0 0
50938 - 0 0 0 0 0 0 0 0 0 0 0 0
50939 - 0 0 0 0 0 0 0 0 0 0 0 0
50940 - 0 0 0 0 0 0 6 6 6 18 18 18
50941 - 54 54 54 82 82 82 2 2 6 26 26 26
50942 - 22 22 22 2 2 6 123 123 123 253 253 253
50943 -253 253 253 253 253 253 253 253 253 253 253 253
50944 -253 253 253 253 253 253 253 253 253 253 253 253
50945 -253 253 253 253 253 253 253 253 253 253 253 253
50946 -253 253 253 253 253 253 253 253 253 253 253 253
50947 -253 253 253 253 253 253 253 253 253 253 253 253
50948 -253 253 253 253 253 253 253 253 253 250 250 250
50949 -238 238 238 198 198 198 6 6 6 38 38 38
50950 - 58 58 58 26 26 26 38 38 38 2 2 6
50951 - 2 2 6 2 2 6 2 2 6 46 46 46
50952 - 78 78 78 30 30 30 10 10 10 0 0 0
50953 - 0 0 0 0 0 0 0 0 0 0 0 0
50954 - 0 0 0 0 0 0 0 0 0 0 0 0
50955 - 0 0 0 0 0 0 0 0 0 0 0 0
50956 - 0 0 0 0 0 0 0 0 0 0 0 0
50957 - 0 0 0 0 0 0 0 0 0 0 0 0
50958 - 0 0 0 0 0 0 0 0 0 0 0 0
50959 - 0 0 0 0 0 0 0 0 0 0 0 0
50960 - 0 0 0 0 0 0 10 10 10 30 30 30
50961 - 74 74 74 58 58 58 2 2 6 42 42 42
50962 - 2 2 6 22 22 22 231 231 231 253 253 253
50963 -253 253 253 253 253 253 253 253 253 253 253 253
50964 -253 253 253 253 253 253 253 253 253 250 250 250
50965 -253 253 253 253 253 253 253 253 253 253 253 253
50966 -253 253 253 253 253 253 253 253 253 253 253 253
50967 -253 253 253 253 253 253 253 253 253 253 253 253
50968 -253 253 253 253 253 253 253 253 253 253 253 253
50969 -253 253 253 246 246 246 46 46 46 38 38 38
50970 - 42 42 42 14 14 14 38 38 38 14 14 14
50971 - 2 2 6 2 2 6 2 2 6 6 6 6
50972 - 86 86 86 46 46 46 14 14 14 0 0 0
50973 - 0 0 0 0 0 0 0 0 0 0 0 0
50974 - 0 0 0 0 0 0 0 0 0 0 0 0
50975 - 0 0 0 0 0 0 0 0 0 0 0 0
50976 - 0 0 0 0 0 0 0 0 0 0 0 0
50977 - 0 0 0 0 0 0 0 0 0 0 0 0
50978 - 0 0 0 0 0 0 0 0 0 0 0 0
50979 - 0 0 0 0 0 0 0 0 0 0 0 0
50980 - 0 0 0 6 6 6 14 14 14 42 42 42
50981 - 90 90 90 18 18 18 18 18 18 26 26 26
50982 - 2 2 6 116 116 116 253 253 253 253 253 253
50983 -253 253 253 253 253 253 253 253 253 253 253 253
50984 -253 253 253 253 253 253 250 250 250 238 238 238
50985 -253 253 253 253 253 253 253 253 253 253 253 253
50986 -253 253 253 253 253 253 253 253 253 253 253 253
50987 -253 253 253 253 253 253 253 253 253 253 253 253
50988 -253 253 253 253 253 253 253 253 253 253 253 253
50989 -253 253 253 253 253 253 94 94 94 6 6 6
50990 - 2 2 6 2 2 6 10 10 10 34 34 34
50991 - 2 2 6 2 2 6 2 2 6 2 2 6
50992 - 74 74 74 58 58 58 22 22 22 6 6 6
50993 - 0 0 0 0 0 0 0 0 0 0 0 0
50994 - 0 0 0 0 0 0 0 0 0 0 0 0
50995 - 0 0 0 0 0 0 0 0 0 0 0 0
50996 - 0 0 0 0 0 0 0 0 0 0 0 0
50997 - 0 0 0 0 0 0 0 0 0 0 0 0
50998 - 0 0 0 0 0 0 0 0 0 0 0 0
50999 - 0 0 0 0 0 0 0 0 0 0 0 0
51000 - 0 0 0 10 10 10 26 26 26 66 66 66
51001 - 82 82 82 2 2 6 38 38 38 6 6 6
51002 - 14 14 14 210 210 210 253 253 253 253 253 253
51003 -253 253 253 253 253 253 253 253 253 253 253 253
51004 -253 253 253 253 253 253 246 246 246 242 242 242
51005 -253 253 253 253 253 253 253 253 253 253 253 253
51006 -253 253 253 253 253 253 253 253 253 253 253 253
51007 -253 253 253 253 253 253 253 253 253 253 253 253
51008 -253 253 253 253 253 253 253 253 253 253 253 253
51009 -253 253 253 253 253 253 144 144 144 2 2 6
51010 - 2 2 6 2 2 6 2 2 6 46 46 46
51011 - 2 2 6 2 2 6 2 2 6 2 2 6
51012 - 42 42 42 74 74 74 30 30 30 10 10 10
51013 - 0 0 0 0 0 0 0 0 0 0 0 0
51014 - 0 0 0 0 0 0 0 0 0 0 0 0
51015 - 0 0 0 0 0 0 0 0 0 0 0 0
51016 - 0 0 0 0 0 0 0 0 0 0 0 0
51017 - 0 0 0 0 0 0 0 0 0 0 0 0
51018 - 0 0 0 0 0 0 0 0 0 0 0 0
51019 - 0 0 0 0 0 0 0 0 0 0 0 0
51020 - 6 6 6 14 14 14 42 42 42 90 90 90
51021 - 26 26 26 6 6 6 42 42 42 2 2 6
51022 - 74 74 74 250 250 250 253 253 253 253 253 253
51023 -253 253 253 253 253 253 253 253 253 253 253 253
51024 -253 253 253 253 253 253 242 242 242 242 242 242
51025 -253 253 253 253 253 253 253 253 253 253 253 253
51026 -253 253 253 253 253 253 253 253 253 253 253 253
51027 -253 253 253 253 253 253 253 253 253 253 253 253
51028 -253 253 253 253 253 253 253 253 253 253 253 253
51029 -253 253 253 253 253 253 182 182 182 2 2 6
51030 - 2 2 6 2 2 6 2 2 6 46 46 46
51031 - 2 2 6 2 2 6 2 2 6 2 2 6
51032 - 10 10 10 86 86 86 38 38 38 10 10 10
51033 - 0 0 0 0 0 0 0 0 0 0 0 0
51034 - 0 0 0 0 0 0 0 0 0 0 0 0
51035 - 0 0 0 0 0 0 0 0 0 0 0 0
51036 - 0 0 0 0 0 0 0 0 0 0 0 0
51037 - 0 0 0 0 0 0 0 0 0 0 0 0
51038 - 0 0 0 0 0 0 0 0 0 0 0 0
51039 - 0 0 0 0 0 0 0 0 0 0 0 0
51040 - 10 10 10 26 26 26 66 66 66 82 82 82
51041 - 2 2 6 22 22 22 18 18 18 2 2 6
51042 -149 149 149 253 253 253 253 253 253 253 253 253
51043 -253 253 253 253 253 253 253 253 253 253 253 253
51044 -253 253 253 253 253 253 234 234 234 242 242 242
51045 -253 253 253 253 253 253 253 253 253 253 253 253
51046 -253 253 253 253 253 253 253 253 253 253 253 253
51047 -253 253 253 253 253 253 253 253 253 253 253 253
51048 -253 253 253 253 253 253 253 253 253 253 253 253
51049 -253 253 253 253 253 253 206 206 206 2 2 6
51050 - 2 2 6 2 2 6 2 2 6 38 38 38
51051 - 2 2 6 2 2 6 2 2 6 2 2 6
51052 - 6 6 6 86 86 86 46 46 46 14 14 14
51053 - 0 0 0 0 0 0 0 0 0 0 0 0
51054 - 0 0 0 0 0 0 0 0 0 0 0 0
51055 - 0 0 0 0 0 0 0 0 0 0 0 0
51056 - 0 0 0 0 0 0 0 0 0 0 0 0
51057 - 0 0 0 0 0 0 0 0 0 0 0 0
51058 - 0 0 0 0 0 0 0 0 0 0 0 0
51059 - 0 0 0 0 0 0 0 0 0 6 6 6
51060 - 18 18 18 46 46 46 86 86 86 18 18 18
51061 - 2 2 6 34 34 34 10 10 10 6 6 6
51062 -210 210 210 253 253 253 253 253 253 253 253 253
51063 -253 253 253 253 253 253 253 253 253 253 253 253
51064 -253 253 253 253 253 253 234 234 234 242 242 242
51065 -253 253 253 253 253 253 253 253 253 253 253 253
51066 -253 253 253 253 253 253 253 253 253 253 253 253
51067 -253 253 253 253 253 253 253 253 253 253 253 253
51068 -253 253 253 253 253 253 253 253 253 253 253 253
51069 -253 253 253 253 253 253 221 221 221 6 6 6
51070 - 2 2 6 2 2 6 6 6 6 30 30 30
51071 - 2 2 6 2 2 6 2 2 6 2 2 6
51072 - 2 2 6 82 82 82 54 54 54 18 18 18
51073 - 6 6 6 0 0 0 0 0 0 0 0 0
51074 - 0 0 0 0 0 0 0 0 0 0 0 0
51075 - 0 0 0 0 0 0 0 0 0 0 0 0
51076 - 0 0 0 0 0 0 0 0 0 0 0 0
51077 - 0 0 0 0 0 0 0 0 0 0 0 0
51078 - 0 0 0 0 0 0 0 0 0 0 0 0
51079 - 0 0 0 0 0 0 0 0 0 10 10 10
51080 - 26 26 26 66 66 66 62 62 62 2 2 6
51081 - 2 2 6 38 38 38 10 10 10 26 26 26
51082 -238 238 238 253 253 253 253 253 253 253 253 253
51083 -253 253 253 253 253 253 253 253 253 253 253 253
51084 -253 253 253 253 253 253 231 231 231 238 238 238
51085 -253 253 253 253 253 253 253 253 253 253 253 253
51086 -253 253 253 253 253 253 253 253 253 253 253 253
51087 -253 253 253 253 253 253 253 253 253 253 253 253
51088 -253 253 253 253 253 253 253 253 253 253 253 253
51089 -253 253 253 253 253 253 231 231 231 6 6 6
51090 - 2 2 6 2 2 6 10 10 10 30 30 30
51091 - 2 2 6 2 2 6 2 2 6 2 2 6
51092 - 2 2 6 66 66 66 58 58 58 22 22 22
51093 - 6 6 6 0 0 0 0 0 0 0 0 0
51094 - 0 0 0 0 0 0 0 0 0 0 0 0
51095 - 0 0 0 0 0 0 0 0 0 0 0 0
51096 - 0 0 0 0 0 0 0 0 0 0 0 0
51097 - 0 0 0 0 0 0 0 0 0 0 0 0
51098 - 0 0 0 0 0 0 0 0 0 0 0 0
51099 - 0 0 0 0 0 0 0 0 0 10 10 10
51100 - 38 38 38 78 78 78 6 6 6 2 2 6
51101 - 2 2 6 46 46 46 14 14 14 42 42 42
51102 -246 246 246 253 253 253 253 253 253 253 253 253
51103 -253 253 253 253 253 253 253 253 253 253 253 253
51104 -253 253 253 253 253 253 231 231 231 242 242 242
51105 -253 253 253 253 253 253 253 253 253 253 253 253
51106 -253 253 253 253 253 253 253 253 253 253 253 253
51107 -253 253 253 253 253 253 253 253 253 253 253 253
51108 -253 253 253 253 253 253 253 253 253 253 253 253
51109 -253 253 253 253 253 253 234 234 234 10 10 10
51110 - 2 2 6 2 2 6 22 22 22 14 14 14
51111 - 2 2 6 2 2 6 2 2 6 2 2 6
51112 - 2 2 6 66 66 66 62 62 62 22 22 22
51113 - 6 6 6 0 0 0 0 0 0 0 0 0
51114 - 0 0 0 0 0 0 0 0 0 0 0 0
51115 - 0 0 0 0 0 0 0 0 0 0 0 0
51116 - 0 0 0 0 0 0 0 0 0 0 0 0
51117 - 0 0 0 0 0 0 0 0 0 0 0 0
51118 - 0 0 0 0 0 0 0 0 0 0 0 0
51119 - 0 0 0 0 0 0 6 6 6 18 18 18
51120 - 50 50 50 74 74 74 2 2 6 2 2 6
51121 - 14 14 14 70 70 70 34 34 34 62 62 62
51122 -250 250 250 253 253 253 253 253 253 253 253 253
51123 -253 253 253 253 253 253 253 253 253 253 253 253
51124 -253 253 253 253 253 253 231 231 231 246 246 246
51125 -253 253 253 253 253 253 253 253 253 253 253 253
51126 -253 253 253 253 253 253 253 253 253 253 253 253
51127 -253 253 253 253 253 253 253 253 253 253 253 253
51128 -253 253 253 253 253 253 253 253 253 253 253 253
51129 -253 253 253 253 253 253 234 234 234 14 14 14
51130 - 2 2 6 2 2 6 30 30 30 2 2 6
51131 - 2 2 6 2 2 6 2 2 6 2 2 6
51132 - 2 2 6 66 66 66 62 62 62 22 22 22
51133 - 6 6 6 0 0 0 0 0 0 0 0 0
51134 - 0 0 0 0 0 0 0 0 0 0 0 0
51135 - 0 0 0 0 0 0 0 0 0 0 0 0
51136 - 0 0 0 0 0 0 0 0 0 0 0 0
51137 - 0 0 0 0 0 0 0 0 0 0 0 0
51138 - 0 0 0 0 0 0 0 0 0 0 0 0
51139 - 0 0 0 0 0 0 6 6 6 18 18 18
51140 - 54 54 54 62 62 62 2 2 6 2 2 6
51141 - 2 2 6 30 30 30 46 46 46 70 70 70
51142 -250 250 250 253 253 253 253 253 253 253 253 253
51143 -253 253 253 253 253 253 253 253 253 253 253 253
51144 -253 253 253 253 253 253 231 231 231 246 246 246
51145 -253 253 253 253 253 253 253 253 253 253 253 253
51146 -253 253 253 253 253 253 253 253 253 253 253 253
51147 -253 253 253 253 253 253 253 253 253 253 253 253
51148 -253 253 253 253 253 253 253 253 253 253 253 253
51149 -253 253 253 253 253 253 226 226 226 10 10 10
51150 - 2 2 6 6 6 6 30 30 30 2 2 6
51151 - 2 2 6 2 2 6 2 2 6 2 2 6
51152 - 2 2 6 66 66 66 58 58 58 22 22 22
51153 - 6 6 6 0 0 0 0 0 0 0 0 0
51154 - 0 0 0 0 0 0 0 0 0 0 0 0
51155 - 0 0 0 0 0 0 0 0 0 0 0 0
51156 - 0 0 0 0 0 0 0 0 0 0 0 0
51157 - 0 0 0 0 0 0 0 0 0 0 0 0
51158 - 0 0 0 0 0 0 0 0 0 0 0 0
51159 - 0 0 0 0 0 0 6 6 6 22 22 22
51160 - 58 58 58 62 62 62 2 2 6 2 2 6
51161 - 2 2 6 2 2 6 30 30 30 78 78 78
51162 -250 250 250 253 253 253 253 253 253 253 253 253
51163 -253 253 253 253 253 253 253 253 253 253 253 253
51164 -253 253 253 253 253 253 231 231 231 246 246 246
51165 -253 253 253 253 253 253 253 253 253 253 253 253
51166 -253 253 253 253 253 253 253 253 253 253 253 253
51167 -253 253 253 253 253 253 253 253 253 253 253 253
51168 -253 253 253 253 253 253 253 253 253 253 253 253
51169 -253 253 253 253 253 253 206 206 206 2 2 6
51170 - 22 22 22 34 34 34 18 14 6 22 22 22
51171 - 26 26 26 18 18 18 6 6 6 2 2 6
51172 - 2 2 6 82 82 82 54 54 54 18 18 18
51173 - 6 6 6 0 0 0 0 0 0 0 0 0
51174 - 0 0 0 0 0 0 0 0 0 0 0 0
51175 - 0 0 0 0 0 0 0 0 0 0 0 0
51176 - 0 0 0 0 0 0 0 0 0 0 0 0
51177 - 0 0 0 0 0 0 0 0 0 0 0 0
51178 - 0 0 0 0 0 0 0 0 0 0 0 0
51179 - 0 0 0 0 0 0 6 6 6 26 26 26
51180 - 62 62 62 106 106 106 74 54 14 185 133 11
51181 -210 162 10 121 92 8 6 6 6 62 62 62
51182 -238 238 238 253 253 253 253 253 253 253 253 253
51183 -253 253 253 253 253 253 253 253 253 253 253 253
51184 -253 253 253 253 253 253 231 231 231 246 246 246
51185 -253 253 253 253 253 253 253 253 253 253 253 253
51186 -253 253 253 253 253 253 253 253 253 253 253 253
51187 -253 253 253 253 253 253 253 253 253 253 253 253
51188 -253 253 253 253 253 253 253 253 253 253 253 253
51189 -253 253 253 253 253 253 158 158 158 18 18 18
51190 - 14 14 14 2 2 6 2 2 6 2 2 6
51191 - 6 6 6 18 18 18 66 66 66 38 38 38
51192 - 6 6 6 94 94 94 50 50 50 18 18 18
51193 - 6 6 6 0 0 0 0 0 0 0 0 0
51194 - 0 0 0 0 0 0 0 0 0 0 0 0
51195 - 0 0 0 0 0 0 0 0 0 0 0 0
51196 - 0 0 0 0 0 0 0 0 0 0 0 0
51197 - 0 0 0 0 0 0 0 0 0 0 0 0
51198 - 0 0 0 0 0 0 0 0 0 6 6 6
51199 - 10 10 10 10 10 10 18 18 18 38 38 38
51200 - 78 78 78 142 134 106 216 158 10 242 186 14
51201 -246 190 14 246 190 14 156 118 10 10 10 10
51202 - 90 90 90 238 238 238 253 253 253 253 253 253
51203 -253 253 253 253 253 253 253 253 253 253 253 253
51204 -253 253 253 253 253 253 231 231 231 250 250 250
51205 -253 253 253 253 253 253 253 253 253 253 253 253
51206 -253 253 253 253 253 253 253 253 253 253 253 253
51207 -253 253 253 253 253 253 253 253 253 253 253 253
51208 -253 253 253 253 253 253 253 253 253 246 230 190
51209 -238 204 91 238 204 91 181 142 44 37 26 9
51210 - 2 2 6 2 2 6 2 2 6 2 2 6
51211 - 2 2 6 2 2 6 38 38 38 46 46 46
51212 - 26 26 26 106 106 106 54 54 54 18 18 18
51213 - 6 6 6 0 0 0 0 0 0 0 0 0
51214 - 0 0 0 0 0 0 0 0 0 0 0 0
51215 - 0 0 0 0 0 0 0 0 0 0 0 0
51216 - 0 0 0 0 0 0 0 0 0 0 0 0
51217 - 0 0 0 0 0 0 0 0 0 0 0 0
51218 - 0 0 0 6 6 6 14 14 14 22 22 22
51219 - 30 30 30 38 38 38 50 50 50 70 70 70
51220 -106 106 106 190 142 34 226 170 11 242 186 14
51221 -246 190 14 246 190 14 246 190 14 154 114 10
51222 - 6 6 6 74 74 74 226 226 226 253 253 253
51223 -253 253 253 253 253 253 253 253 253 253 253 253
51224 -253 253 253 253 253 253 231 231 231 250 250 250
51225 -253 253 253 253 253 253 253 253 253 253 253 253
51226 -253 253 253 253 253 253 253 253 253 253 253 253
51227 -253 253 253 253 253 253 253 253 253 253 253 253
51228 -253 253 253 253 253 253 253 253 253 228 184 62
51229 -241 196 14 241 208 19 232 195 16 38 30 10
51230 - 2 2 6 2 2 6 2 2 6 2 2 6
51231 - 2 2 6 6 6 6 30 30 30 26 26 26
51232 -203 166 17 154 142 90 66 66 66 26 26 26
51233 - 6 6 6 0 0 0 0 0 0 0 0 0
51234 - 0 0 0 0 0 0 0 0 0 0 0 0
51235 - 0 0 0 0 0 0 0 0 0 0 0 0
51236 - 0 0 0 0 0 0 0 0 0 0 0 0
51237 - 0 0 0 0 0 0 0 0 0 0 0 0
51238 - 6 6 6 18 18 18 38 38 38 58 58 58
51239 - 78 78 78 86 86 86 101 101 101 123 123 123
51240 -175 146 61 210 150 10 234 174 13 246 186 14
51241 -246 190 14 246 190 14 246 190 14 238 190 10
51242 -102 78 10 2 2 6 46 46 46 198 198 198
51243 -253 253 253 253 253 253 253 253 253 253 253 253
51244 -253 253 253 253 253 253 234 234 234 242 242 242
51245 -253 253 253 253 253 253 253 253 253 253 253 253
51246 -253 253 253 253 253 253 253 253 253 253 253 253
51247 -253 253 253 253 253 253 253 253 253 253 253 253
51248 -253 253 253 253 253 253 253 253 253 224 178 62
51249 -242 186 14 241 196 14 210 166 10 22 18 6
51250 - 2 2 6 2 2 6 2 2 6 2 2 6
51251 - 2 2 6 2 2 6 6 6 6 121 92 8
51252 -238 202 15 232 195 16 82 82 82 34 34 34
51253 - 10 10 10 0 0 0 0 0 0 0 0 0
51254 - 0 0 0 0 0 0 0 0 0 0 0 0
51255 - 0 0 0 0 0 0 0 0 0 0 0 0
51256 - 0 0 0 0 0 0 0 0 0 0 0 0
51257 - 0 0 0 0 0 0 0 0 0 0 0 0
51258 - 14 14 14 38 38 38 70 70 70 154 122 46
51259 -190 142 34 200 144 11 197 138 11 197 138 11
51260 -213 154 11 226 170 11 242 186 14 246 190 14
51261 -246 190 14 246 190 14 246 190 14 246 190 14
51262 -225 175 15 46 32 6 2 2 6 22 22 22
51263 -158 158 158 250 250 250 253 253 253 253 253 253
51264 -253 253 253 253 253 253 253 253 253 253 253 253
51265 -253 253 253 253 253 253 253 253 253 253 253 253
51266 -253 253 253 253 253 253 253 253 253 253 253 253
51267 -253 253 253 253 253 253 253 253 253 253 253 253
51268 -253 253 253 250 250 250 242 242 242 224 178 62
51269 -239 182 13 236 186 11 213 154 11 46 32 6
51270 - 2 2 6 2 2 6 2 2 6 2 2 6
51271 - 2 2 6 2 2 6 61 42 6 225 175 15
51272 -238 190 10 236 186 11 112 100 78 42 42 42
51273 - 14 14 14 0 0 0 0 0 0 0 0 0
51274 - 0 0 0 0 0 0 0 0 0 0 0 0
51275 - 0 0 0 0 0 0 0 0 0 0 0 0
51276 - 0 0 0 0 0 0 0 0 0 0 0 0
51277 - 0 0 0 0 0 0 0 0 0 6 6 6
51278 - 22 22 22 54 54 54 154 122 46 213 154 11
51279 -226 170 11 230 174 11 226 170 11 226 170 11
51280 -236 178 12 242 186 14 246 190 14 246 190 14
51281 -246 190 14 246 190 14 246 190 14 246 190 14
51282 -241 196 14 184 144 12 10 10 10 2 2 6
51283 - 6 6 6 116 116 116 242 242 242 253 253 253
51284 -253 253 253 253 253 253 253 253 253 253 253 253
51285 -253 253 253 253 253 253 253 253 253 253 253 253
51286 -253 253 253 253 253 253 253 253 253 253 253 253
51287 -253 253 253 253 253 253 253 253 253 253 253 253
51288 -253 253 253 231 231 231 198 198 198 214 170 54
51289 -236 178 12 236 178 12 210 150 10 137 92 6
51290 - 18 14 6 2 2 6 2 2 6 2 2 6
51291 - 6 6 6 70 47 6 200 144 11 236 178 12
51292 -239 182 13 239 182 13 124 112 88 58 58 58
51293 - 22 22 22 6 6 6 0 0 0 0 0 0
51294 - 0 0 0 0 0 0 0 0 0 0 0 0
51295 - 0 0 0 0 0 0 0 0 0 0 0 0
51296 - 0 0 0 0 0 0 0 0 0 0 0 0
51297 - 0 0 0 0 0 0 0 0 0 10 10 10
51298 - 30 30 30 70 70 70 180 133 36 226 170 11
51299 -239 182 13 242 186 14 242 186 14 246 186 14
51300 -246 190 14 246 190 14 246 190 14 246 190 14
51301 -246 190 14 246 190 14 246 190 14 246 190 14
51302 -246 190 14 232 195 16 98 70 6 2 2 6
51303 - 2 2 6 2 2 6 66 66 66 221 221 221
51304 -253 253 253 253 253 253 253 253 253 253 253 253
51305 -253 253 253 253 253 253 253 253 253 253 253 253
51306 -253 253 253 253 253 253 253 253 253 253 253 253
51307 -253 253 253 253 253 253 253 253 253 253 253 253
51308 -253 253 253 206 206 206 198 198 198 214 166 58
51309 -230 174 11 230 174 11 216 158 10 192 133 9
51310 -163 110 8 116 81 8 102 78 10 116 81 8
51311 -167 114 7 197 138 11 226 170 11 239 182 13
51312 -242 186 14 242 186 14 162 146 94 78 78 78
51313 - 34 34 34 14 14 14 6 6 6 0 0 0
51314 - 0 0 0 0 0 0 0 0 0 0 0 0
51315 - 0 0 0 0 0 0 0 0 0 0 0 0
51316 - 0 0 0 0 0 0 0 0 0 0 0 0
51317 - 0 0 0 0 0 0 0 0 0 6 6 6
51318 - 30 30 30 78 78 78 190 142 34 226 170 11
51319 -239 182 13 246 190 14 246 190 14 246 190 14
51320 -246 190 14 246 190 14 246 190 14 246 190 14
51321 -246 190 14 246 190 14 246 190 14 246 190 14
51322 -246 190 14 241 196 14 203 166 17 22 18 6
51323 - 2 2 6 2 2 6 2 2 6 38 38 38
51324 -218 218 218 253 253 253 253 253 253 253 253 253
51325 -253 253 253 253 253 253 253 253 253 253 253 253
51326 -253 253 253 253 253 253 253 253 253 253 253 253
51327 -253 253 253 253 253 253 253 253 253 253 253 253
51328 -250 250 250 206 206 206 198 198 198 202 162 69
51329 -226 170 11 236 178 12 224 166 10 210 150 10
51330 -200 144 11 197 138 11 192 133 9 197 138 11
51331 -210 150 10 226 170 11 242 186 14 246 190 14
51332 -246 190 14 246 186 14 225 175 15 124 112 88
51333 - 62 62 62 30 30 30 14 14 14 6 6 6
51334 - 0 0 0 0 0 0 0 0 0 0 0 0
51335 - 0 0 0 0 0 0 0 0 0 0 0 0
51336 - 0 0 0 0 0 0 0 0 0 0 0 0
51337 - 0 0 0 0 0 0 0 0 0 10 10 10
51338 - 30 30 30 78 78 78 174 135 50 224 166 10
51339 -239 182 13 246 190 14 246 190 14 246 190 14
51340 -246 190 14 246 190 14 246 190 14 246 190 14
51341 -246 190 14 246 190 14 246 190 14 246 190 14
51342 -246 190 14 246 190 14 241 196 14 139 102 15
51343 - 2 2 6 2 2 6 2 2 6 2 2 6
51344 - 78 78 78 250 250 250 253 253 253 253 253 253
51345 -253 253 253 253 253 253 253 253 253 253 253 253
51346 -253 253 253 253 253 253 253 253 253 253 253 253
51347 -253 253 253 253 253 253 253 253 253 253 253 253
51348 -250 250 250 214 214 214 198 198 198 190 150 46
51349 -219 162 10 236 178 12 234 174 13 224 166 10
51350 -216 158 10 213 154 11 213 154 11 216 158 10
51351 -226 170 11 239 182 13 246 190 14 246 190 14
51352 -246 190 14 246 190 14 242 186 14 206 162 42
51353 -101 101 101 58 58 58 30 30 30 14 14 14
51354 - 6 6 6 0 0 0 0 0 0 0 0 0
51355 - 0 0 0 0 0 0 0 0 0 0 0 0
51356 - 0 0 0 0 0 0 0 0 0 0 0 0
51357 - 0 0 0 0 0 0 0 0 0 10 10 10
51358 - 30 30 30 74 74 74 174 135 50 216 158 10
51359 -236 178 12 246 190 14 246 190 14 246 190 14
51360 -246 190 14 246 190 14 246 190 14 246 190 14
51361 -246 190 14 246 190 14 246 190 14 246 190 14
51362 -246 190 14 246 190 14 241 196 14 226 184 13
51363 - 61 42 6 2 2 6 2 2 6 2 2 6
51364 - 22 22 22 238 238 238 253 253 253 253 253 253
51365 -253 253 253 253 253 253 253 253 253 253 253 253
51366 -253 253 253 253 253 253 253 253 253 253 253 253
51367 -253 253 253 253 253 253 253 253 253 253 253 253
51368 -253 253 253 226 226 226 187 187 187 180 133 36
51369 -216 158 10 236 178 12 239 182 13 236 178 12
51370 -230 174 11 226 170 11 226 170 11 230 174 11
51371 -236 178 12 242 186 14 246 190 14 246 190 14
51372 -246 190 14 246 190 14 246 186 14 239 182 13
51373 -206 162 42 106 106 106 66 66 66 34 34 34
51374 - 14 14 14 6 6 6 0 0 0 0 0 0
51375 - 0 0 0 0 0 0 0 0 0 0 0 0
51376 - 0 0 0 0 0 0 0 0 0 0 0 0
51377 - 0 0 0 0 0 0 0 0 0 6 6 6
51378 - 26 26 26 70 70 70 163 133 67 213 154 11
51379 -236 178 12 246 190 14 246 190 14 246 190 14
51380 -246 190 14 246 190 14 246 190 14 246 190 14
51381 -246 190 14 246 190 14 246 190 14 246 190 14
51382 -246 190 14 246 190 14 246 190 14 241 196 14
51383 -190 146 13 18 14 6 2 2 6 2 2 6
51384 - 46 46 46 246 246 246 253 253 253 253 253 253
51385 -253 253 253 253 253 253 253 253 253 253 253 253
51386 -253 253 253 253 253 253 253 253 253 253 253 253
51387 -253 253 253 253 253 253 253 253 253 253 253 253
51388 -253 253 253 221 221 221 86 86 86 156 107 11
51389 -216 158 10 236 178 12 242 186 14 246 186 14
51390 -242 186 14 239 182 13 239 182 13 242 186 14
51391 -242 186 14 246 186 14 246 190 14 246 190 14
51392 -246 190 14 246 190 14 246 190 14 246 190 14
51393 -242 186 14 225 175 15 142 122 72 66 66 66
51394 - 30 30 30 10 10 10 0 0 0 0 0 0
51395 - 0 0 0 0 0 0 0 0 0 0 0 0
51396 - 0 0 0 0 0 0 0 0 0 0 0 0
51397 - 0 0 0 0 0 0 0 0 0 6 6 6
51398 - 26 26 26 70 70 70 163 133 67 210 150 10
51399 -236 178 12 246 190 14 246 190 14 246 190 14
51400 -246 190 14 246 190 14 246 190 14 246 190 14
51401 -246 190 14 246 190 14 246 190 14 246 190 14
51402 -246 190 14 246 190 14 246 190 14 246 190 14
51403 -232 195 16 121 92 8 34 34 34 106 106 106
51404 -221 221 221 253 253 253 253 253 253 253 253 253
51405 -253 253 253 253 253 253 253 253 253 253 253 253
51406 -253 253 253 253 253 253 253 253 253 253 253 253
51407 -253 253 253 253 253 253 253 253 253 253 253 253
51408 -242 242 242 82 82 82 18 14 6 163 110 8
51409 -216 158 10 236 178 12 242 186 14 246 190 14
51410 -246 190 14 246 190 14 246 190 14 246 190 14
51411 -246 190 14 246 190 14 246 190 14 246 190 14
51412 -246 190 14 246 190 14 246 190 14 246 190 14
51413 -246 190 14 246 190 14 242 186 14 163 133 67
51414 - 46 46 46 18 18 18 6 6 6 0 0 0
51415 - 0 0 0 0 0 0 0 0 0 0 0 0
51416 - 0 0 0 0 0 0 0 0 0 0 0 0
51417 - 0 0 0 0 0 0 0 0 0 10 10 10
51418 - 30 30 30 78 78 78 163 133 67 210 150 10
51419 -236 178 12 246 186 14 246 190 14 246 190 14
51420 -246 190 14 246 190 14 246 190 14 246 190 14
51421 -246 190 14 246 190 14 246 190 14 246 190 14
51422 -246 190 14 246 190 14 246 190 14 246 190 14
51423 -241 196 14 215 174 15 190 178 144 253 253 253
51424 -253 253 253 253 253 253 253 253 253 253 253 253
51425 -253 253 253 253 253 253 253 253 253 253 253 253
51426 -253 253 253 253 253 253 253 253 253 253 253 253
51427 -253 253 253 253 253 253 253 253 253 218 218 218
51428 - 58 58 58 2 2 6 22 18 6 167 114 7
51429 -216 158 10 236 178 12 246 186 14 246 190 14
51430 -246 190 14 246 190 14 246 190 14 246 190 14
51431 -246 190 14 246 190 14 246 190 14 246 190 14
51432 -246 190 14 246 190 14 246 190 14 246 190 14
51433 -246 190 14 246 186 14 242 186 14 190 150 46
51434 - 54 54 54 22 22 22 6 6 6 0 0 0
51435 - 0 0 0 0 0 0 0 0 0 0 0 0
51436 - 0 0 0 0 0 0 0 0 0 0 0 0
51437 - 0 0 0 0 0 0 0 0 0 14 14 14
51438 - 38 38 38 86 86 86 180 133 36 213 154 11
51439 -236 178 12 246 186 14 246 190 14 246 190 14
51440 -246 190 14 246 190 14 246 190 14 246 190 14
51441 -246 190 14 246 190 14 246 190 14 246 190 14
51442 -246 190 14 246 190 14 246 190 14 246 190 14
51443 -246 190 14 232 195 16 190 146 13 214 214 214
51444 -253 253 253 253 253 253 253 253 253 253 253 253
51445 -253 253 253 253 253 253 253 253 253 253 253 253
51446 -253 253 253 253 253 253 253 253 253 253 253 253
51447 -253 253 253 250 250 250 170 170 170 26 26 26
51448 - 2 2 6 2 2 6 37 26 9 163 110 8
51449 -219 162 10 239 182 13 246 186 14 246 190 14
51450 -246 190 14 246 190 14 246 190 14 246 190 14
51451 -246 190 14 246 190 14 246 190 14 246 190 14
51452 -246 190 14 246 190 14 246 190 14 246 190 14
51453 -246 186 14 236 178 12 224 166 10 142 122 72
51454 - 46 46 46 18 18 18 6 6 6 0 0 0
51455 - 0 0 0 0 0 0 0 0 0 0 0 0
51456 - 0 0 0 0 0 0 0 0 0 0 0 0
51457 - 0 0 0 0 0 0 6 6 6 18 18 18
51458 - 50 50 50 109 106 95 192 133 9 224 166 10
51459 -242 186 14 246 190 14 246 190 14 246 190 14
51460 -246 190 14 246 190 14 246 190 14 246 190 14
51461 -246 190 14 246 190 14 246 190 14 246 190 14
51462 -246 190 14 246 190 14 246 190 14 246 190 14
51463 -242 186 14 226 184 13 210 162 10 142 110 46
51464 -226 226 226 253 253 253 253 253 253 253 253 253
51465 -253 253 253 253 253 253 253 253 253 253 253 253
51466 -253 253 253 253 253 253 253 253 253 253 253 253
51467 -198 198 198 66 66 66 2 2 6 2 2 6
51468 - 2 2 6 2 2 6 50 34 6 156 107 11
51469 -219 162 10 239 182 13 246 186 14 246 190 14
51470 -246 190 14 246 190 14 246 190 14 246 190 14
51471 -246 190 14 246 190 14 246 190 14 246 190 14
51472 -246 190 14 246 190 14 246 190 14 242 186 14
51473 -234 174 13 213 154 11 154 122 46 66 66 66
51474 - 30 30 30 10 10 10 0 0 0 0 0 0
51475 - 0 0 0 0 0 0 0 0 0 0 0 0
51476 - 0 0 0 0 0 0 0 0 0 0 0 0
51477 - 0 0 0 0 0 0 6 6 6 22 22 22
51478 - 58 58 58 154 121 60 206 145 10 234 174 13
51479 -242 186 14 246 186 14 246 190 14 246 190 14
51480 -246 190 14 246 190 14 246 190 14 246 190 14
51481 -246 190 14 246 190 14 246 190 14 246 190 14
51482 -246 190 14 246 190 14 246 190 14 246 190 14
51483 -246 186 14 236 178 12 210 162 10 163 110 8
51484 - 61 42 6 138 138 138 218 218 218 250 250 250
51485 -253 253 253 253 253 253 253 253 253 250 250 250
51486 -242 242 242 210 210 210 144 144 144 66 66 66
51487 - 6 6 6 2 2 6 2 2 6 2 2 6
51488 - 2 2 6 2 2 6 61 42 6 163 110 8
51489 -216 158 10 236 178 12 246 190 14 246 190 14
51490 -246 190 14 246 190 14 246 190 14 246 190 14
51491 -246 190 14 246 190 14 246 190 14 246 190 14
51492 -246 190 14 239 182 13 230 174 11 216 158 10
51493 -190 142 34 124 112 88 70 70 70 38 38 38
51494 - 18 18 18 6 6 6 0 0 0 0 0 0
51495 - 0 0 0 0 0 0 0 0 0 0 0 0
51496 - 0 0 0 0 0 0 0 0 0 0 0 0
51497 - 0 0 0 0 0 0 6 6 6 22 22 22
51498 - 62 62 62 168 124 44 206 145 10 224 166 10
51499 -236 178 12 239 182 13 242 186 14 242 186 14
51500 -246 186 14 246 190 14 246 190 14 246 190 14
51501 -246 190 14 246 190 14 246 190 14 246 190 14
51502 -246 190 14 246 190 14 246 190 14 246 190 14
51503 -246 190 14 236 178 12 216 158 10 175 118 6
51504 - 80 54 7 2 2 6 6 6 6 30 30 30
51505 - 54 54 54 62 62 62 50 50 50 38 38 38
51506 - 14 14 14 2 2 6 2 2 6 2 2 6
51507 - 2 2 6 2 2 6 2 2 6 2 2 6
51508 - 2 2 6 6 6 6 80 54 7 167 114 7
51509 -213 154 11 236 178 12 246 190 14 246 190 14
51510 -246 190 14 246 190 14 246 190 14 246 190 14
51511 -246 190 14 242 186 14 239 182 13 239 182 13
51512 -230 174 11 210 150 10 174 135 50 124 112 88
51513 - 82 82 82 54 54 54 34 34 34 18 18 18
51514 - 6 6 6 0 0 0 0 0 0 0 0 0
51515 - 0 0 0 0 0 0 0 0 0 0 0 0
51516 - 0 0 0 0 0 0 0 0 0 0 0 0
51517 - 0 0 0 0 0 0 6 6 6 18 18 18
51518 - 50 50 50 158 118 36 192 133 9 200 144 11
51519 -216 158 10 219 162 10 224 166 10 226 170 11
51520 -230 174 11 236 178 12 239 182 13 239 182 13
51521 -242 186 14 246 186 14 246 190 14 246 190 14
51522 -246 190 14 246 190 14 246 190 14 246 190 14
51523 -246 186 14 230 174 11 210 150 10 163 110 8
51524 -104 69 6 10 10 10 2 2 6 2 2 6
51525 - 2 2 6 2 2 6 2 2 6 2 2 6
51526 - 2 2 6 2 2 6 2 2 6 2 2 6
51527 - 2 2 6 2 2 6 2 2 6 2 2 6
51528 - 2 2 6 6 6 6 91 60 6 167 114 7
51529 -206 145 10 230 174 11 242 186 14 246 190 14
51530 -246 190 14 246 190 14 246 186 14 242 186 14
51531 -239 182 13 230 174 11 224 166 10 213 154 11
51532 -180 133 36 124 112 88 86 86 86 58 58 58
51533 - 38 38 38 22 22 22 10 10 10 6 6 6
51534 - 0 0 0 0 0 0 0 0 0 0 0 0
51535 - 0 0 0 0 0 0 0 0 0 0 0 0
51536 - 0 0 0 0 0 0 0 0 0 0 0 0
51537 - 0 0 0 0 0 0 0 0 0 14 14 14
51538 - 34 34 34 70 70 70 138 110 50 158 118 36
51539 -167 114 7 180 123 7 192 133 9 197 138 11
51540 -200 144 11 206 145 10 213 154 11 219 162 10
51541 -224 166 10 230 174 11 239 182 13 242 186 14
51542 -246 186 14 246 186 14 246 186 14 246 186 14
51543 -239 182 13 216 158 10 185 133 11 152 99 6
51544 -104 69 6 18 14 6 2 2 6 2 2 6
51545 - 2 2 6 2 2 6 2 2 6 2 2 6
51546 - 2 2 6 2 2 6 2 2 6 2 2 6
51547 - 2 2 6 2 2 6 2 2 6 2 2 6
51548 - 2 2 6 6 6 6 80 54 7 152 99 6
51549 -192 133 9 219 162 10 236 178 12 239 182 13
51550 -246 186 14 242 186 14 239 182 13 236 178 12
51551 -224 166 10 206 145 10 192 133 9 154 121 60
51552 - 94 94 94 62 62 62 42 42 42 22 22 22
51553 - 14 14 14 6 6 6 0 0 0 0 0 0
51554 - 0 0 0 0 0 0 0 0 0 0 0 0
51555 - 0 0 0 0 0 0 0 0 0 0 0 0
51556 - 0 0 0 0 0 0 0 0 0 0 0 0
51557 - 0 0 0 0 0 0 0 0 0 6 6 6
51558 - 18 18 18 34 34 34 58 58 58 78 78 78
51559 -101 98 89 124 112 88 142 110 46 156 107 11
51560 -163 110 8 167 114 7 175 118 6 180 123 7
51561 -185 133 11 197 138 11 210 150 10 219 162 10
51562 -226 170 11 236 178 12 236 178 12 234 174 13
51563 -219 162 10 197 138 11 163 110 8 130 83 6
51564 - 91 60 6 10 10 10 2 2 6 2 2 6
51565 - 18 18 18 38 38 38 38 38 38 38 38 38
51566 - 38 38 38 38 38 38 38 38 38 38 38 38
51567 - 38 38 38 38 38 38 26 26 26 2 2 6
51568 - 2 2 6 6 6 6 70 47 6 137 92 6
51569 -175 118 6 200 144 11 219 162 10 230 174 11
51570 -234 174 13 230 174 11 219 162 10 210 150 10
51571 -192 133 9 163 110 8 124 112 88 82 82 82
51572 - 50 50 50 30 30 30 14 14 14 6 6 6
51573 - 0 0 0 0 0 0 0 0 0 0 0 0
51574 - 0 0 0 0 0 0 0 0 0 0 0 0
51575 - 0 0 0 0 0 0 0 0 0 0 0 0
51576 - 0 0 0 0 0 0 0 0 0 0 0 0
51577 - 0 0 0 0 0 0 0 0 0 0 0 0
51578 - 6 6 6 14 14 14 22 22 22 34 34 34
51579 - 42 42 42 58 58 58 74 74 74 86 86 86
51580 -101 98 89 122 102 70 130 98 46 121 87 25
51581 -137 92 6 152 99 6 163 110 8 180 123 7
51582 -185 133 11 197 138 11 206 145 10 200 144 11
51583 -180 123 7 156 107 11 130 83 6 104 69 6
51584 - 50 34 6 54 54 54 110 110 110 101 98 89
51585 - 86 86 86 82 82 82 78 78 78 78 78 78
51586 - 78 78 78 78 78 78 78 78 78 78 78 78
51587 - 78 78 78 82 82 82 86 86 86 94 94 94
51588 -106 106 106 101 101 101 86 66 34 124 80 6
51589 -156 107 11 180 123 7 192 133 9 200 144 11
51590 -206 145 10 200 144 11 192 133 9 175 118 6
51591 -139 102 15 109 106 95 70 70 70 42 42 42
51592 - 22 22 22 10 10 10 0 0 0 0 0 0
51593 - 0 0 0 0 0 0 0 0 0 0 0 0
51594 - 0 0 0 0 0 0 0 0 0 0 0 0
51595 - 0 0 0 0 0 0 0 0 0 0 0 0
51596 - 0 0 0 0 0 0 0 0 0 0 0 0
51597 - 0 0 0 0 0 0 0 0 0 0 0 0
51598 - 0 0 0 0 0 0 6 6 6 10 10 10
51599 - 14 14 14 22 22 22 30 30 30 38 38 38
51600 - 50 50 50 62 62 62 74 74 74 90 90 90
51601 -101 98 89 112 100 78 121 87 25 124 80 6
51602 -137 92 6 152 99 6 152 99 6 152 99 6
51603 -138 86 6 124 80 6 98 70 6 86 66 30
51604 -101 98 89 82 82 82 58 58 58 46 46 46
51605 - 38 38 38 34 34 34 34 34 34 34 34 34
51606 - 34 34 34 34 34 34 34 34 34 34 34 34
51607 - 34 34 34 34 34 34 38 38 38 42 42 42
51608 - 54 54 54 82 82 82 94 86 76 91 60 6
51609 -134 86 6 156 107 11 167 114 7 175 118 6
51610 -175 118 6 167 114 7 152 99 6 121 87 25
51611 -101 98 89 62 62 62 34 34 34 18 18 18
51612 - 6 6 6 0 0 0 0 0 0 0 0 0
51613 - 0 0 0 0 0 0 0 0 0 0 0 0
51614 - 0 0 0 0 0 0 0 0 0 0 0 0
51615 - 0 0 0 0 0 0 0 0 0 0 0 0
51616 - 0 0 0 0 0 0 0 0 0 0 0 0
51617 - 0 0 0 0 0 0 0 0 0 0 0 0
51618 - 0 0 0 0 0 0 0 0 0 0 0 0
51619 - 0 0 0 6 6 6 6 6 6 10 10 10
51620 - 18 18 18 22 22 22 30 30 30 42 42 42
51621 - 50 50 50 66 66 66 86 86 86 101 98 89
51622 -106 86 58 98 70 6 104 69 6 104 69 6
51623 -104 69 6 91 60 6 82 62 34 90 90 90
51624 - 62 62 62 38 38 38 22 22 22 14 14 14
51625 - 10 10 10 10 10 10 10 10 10 10 10 10
51626 - 10 10 10 10 10 10 6 6 6 10 10 10
51627 - 10 10 10 10 10 10 10 10 10 14 14 14
51628 - 22 22 22 42 42 42 70 70 70 89 81 66
51629 - 80 54 7 104 69 6 124 80 6 137 92 6
51630 -134 86 6 116 81 8 100 82 52 86 86 86
51631 - 58 58 58 30 30 30 14 14 14 6 6 6
51632 - 0 0 0 0 0 0 0 0 0 0 0 0
51633 - 0 0 0 0 0 0 0 0 0 0 0 0
51634 - 0 0 0 0 0 0 0 0 0 0 0 0
51635 - 0 0 0 0 0 0 0 0 0 0 0 0
51636 - 0 0 0 0 0 0 0 0 0 0 0 0
51637 - 0 0 0 0 0 0 0 0 0 0 0 0
51638 - 0 0 0 0 0 0 0 0 0 0 0 0
51639 - 0 0 0 0 0 0 0 0 0 0 0 0
51640 - 0 0 0 6 6 6 10 10 10 14 14 14
51641 - 18 18 18 26 26 26 38 38 38 54 54 54
51642 - 70 70 70 86 86 86 94 86 76 89 81 66
51643 - 89 81 66 86 86 86 74 74 74 50 50 50
51644 - 30 30 30 14 14 14 6 6 6 0 0 0
51645 - 0 0 0 0 0 0 0 0 0 0 0 0
51646 - 0 0 0 0 0 0 0 0 0 0 0 0
51647 - 0 0 0 0 0 0 0 0 0 0 0 0
51648 - 6 6 6 18 18 18 34 34 34 58 58 58
51649 - 82 82 82 89 81 66 89 81 66 89 81 66
51650 - 94 86 66 94 86 76 74 74 74 50 50 50
51651 - 26 26 26 14 14 14 6 6 6 0 0 0
51652 - 0 0 0 0 0 0 0 0 0 0 0 0
51653 - 0 0 0 0 0 0 0 0 0 0 0 0
51654 - 0 0 0 0 0 0 0 0 0 0 0 0
51655 - 0 0 0 0 0 0 0 0 0 0 0 0
51656 - 0 0 0 0 0 0 0 0 0 0 0 0
51657 - 0 0 0 0 0 0 0 0 0 0 0 0
51658 - 0 0 0 0 0 0 0 0 0 0 0 0
51659 - 0 0 0 0 0 0 0 0 0 0 0 0
51660 - 0 0 0 0 0 0 0 0 0 0 0 0
51661 - 6 6 6 6 6 6 14 14 14 18 18 18
51662 - 30 30 30 38 38 38 46 46 46 54 54 54
51663 - 50 50 50 42 42 42 30 30 30 18 18 18
51664 - 10 10 10 0 0 0 0 0 0 0 0 0
51665 - 0 0 0 0 0 0 0 0 0 0 0 0
51666 - 0 0 0 0 0 0 0 0 0 0 0 0
51667 - 0 0 0 0 0 0 0 0 0 0 0 0
51668 - 0 0 0 6 6 6 14 14 14 26 26 26
51669 - 38 38 38 50 50 50 58 58 58 58 58 58
51670 - 54 54 54 42 42 42 30 30 30 18 18 18
51671 - 10 10 10 0 0 0 0 0 0 0 0 0
51672 - 0 0 0 0 0 0 0 0 0 0 0 0
51673 - 0 0 0 0 0 0 0 0 0 0 0 0
51674 - 0 0 0 0 0 0 0 0 0 0 0 0
51675 - 0 0 0 0 0 0 0 0 0 0 0 0
51676 - 0 0 0 0 0 0 0 0 0 0 0 0
51677 - 0 0 0 0 0 0 0 0 0 0 0 0
51678 - 0 0 0 0 0 0 0 0 0 0 0 0
51679 - 0 0 0 0 0 0 0 0 0 0 0 0
51680 - 0 0 0 0 0 0 0 0 0 0 0 0
51681 - 0 0 0 0 0 0 0 0 0 6 6 6
51682 - 6 6 6 10 10 10 14 14 14 18 18 18
51683 - 18 18 18 14 14 14 10 10 10 6 6 6
51684 - 0 0 0 0 0 0 0 0 0 0 0 0
51685 - 0 0 0 0 0 0 0 0 0 0 0 0
51686 - 0 0 0 0 0 0 0 0 0 0 0 0
51687 - 0 0 0 0 0 0 0 0 0 0 0 0
51688 - 0 0 0 0 0 0 0 0 0 6 6 6
51689 - 14 14 14 18 18 18 22 22 22 22 22 22
51690 - 18 18 18 14 14 14 10 10 10 6 6 6
51691 - 0 0 0 0 0 0 0 0 0 0 0 0
51692 - 0 0 0 0 0 0 0 0 0 0 0 0
51693 - 0 0 0 0 0 0 0 0 0 0 0 0
51694 - 0 0 0 0 0 0 0 0 0 0 0 0
51695 - 0 0 0 0 0 0 0 0 0 0 0 0
51696 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51697 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51698 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51699 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51700 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51701 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51702 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51703 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51704 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51705 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51706 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51707 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51708 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51709 +4 4 4 4 4 4
51710 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51711 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51712 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51713 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51714 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51715 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51716 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51717 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51718 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51719 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51720 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51721 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51722 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51723 +4 4 4 4 4 4
51724 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51725 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51726 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51727 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51728 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51729 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51730 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51731 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51732 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51733 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51734 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51735 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51736 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51737 +4 4 4 4 4 4
51738 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51739 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51740 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51741 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51742 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51743 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51744 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51745 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51746 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51747 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51748 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51749 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51750 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51751 +4 4 4 4 4 4
51752 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51753 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51754 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51755 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51756 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51757 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51758 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51759 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51760 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51761 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51762 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51763 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51764 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51765 +4 4 4 4 4 4
51766 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51767 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51768 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51769 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51770 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51771 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51772 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51773 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51774 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51775 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51776 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51777 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51778 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51779 +4 4 4 4 4 4
51780 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51781 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51782 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51783 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51784 +4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
51785 +0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
51786 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51787 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51788 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51789 +4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
51790 +0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
51791 +4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
51792 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51793 +4 4 4 4 4 4
51794 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51795 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51796 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51797 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51798 +4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
51799 +37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
51800 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51801 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51802 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51803 +4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
51804 +2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
51805 +4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
51806 +1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51807 +4 4 4 4 4 4
51808 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51809 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51810 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51811 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51812 +2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
51813 +153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
51814 +0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
51815 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51816 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51817 +4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
51818 +60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
51819 +4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
51820 +2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
51821 +4 4 4 4 4 4
51822 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51823 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51824 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51825 +4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
51826 +4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
51827 +165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
51828 +1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
51829 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51830 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
51831 +3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
51832 +163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
51833 +0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
51834 +37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
51835 +4 4 4 4 4 4
51836 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51837 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51838 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51839 +4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
51840 +37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
51841 +156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
51842 +125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
51843 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
51844 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
51845 +0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
51846 +174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
51847 +0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
51848 +64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
51849 +4 4 4 4 4 4
51850 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51851 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51852 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
51853 +5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
51854 +156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
51855 +156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
51856 +174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
51857 +1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
51858 +4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
51859 +13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
51860 +174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
51861 +22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
51862 +90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
51863 +4 4 4 4 4 4
51864 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51865 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51866 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
51867 +0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
51868 +174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
51869 +156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
51870 +163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
51871 +4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
51872 +5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
51873 +131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
51874 +190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
51875 +90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
51876 +31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
51877 +4 4 4 4 4 4
51878 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51879 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51880 +4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
51881 +4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
51882 +155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
51883 +167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
51884 +153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
51885 +41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
51886 +1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
51887 +177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
51888 +125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
51889 +136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
51890 +7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
51891 +4 4 4 4 4 4
51892 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51893 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51894 +4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
51895 +125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
51896 +156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
51897 +137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
51898 +156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
51899 +167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
51900 +0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
51901 +166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
51902 +6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
51903 +90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
51904 +1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
51905 +4 4 4 4 4 4
51906 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51907 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51908 +1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
51909 +167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
51910 +157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
51911 +26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
51912 +158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
51913 +165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
51914 +60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
51915 +137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
51916 +52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
51917 +13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
51918 +4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
51919 +4 4 4 4 4 4
51920 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51921 +4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
51922 +0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
51923 +158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
51924 +167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
51925 +4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
51926 +174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
51927 +155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
51928 +137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
51929 +16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
51930 +136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
51931 +2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
51932 +4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
51933 +4 4 4 4 4 4
51934 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51935 +4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
51936 +37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
51937 +157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
51938 +153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
51939 +4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
51940 +125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
51941 +156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
51942 +174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
51943 +4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
51944 +136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
51945 +1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
51946 +2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
51947 +0 0 0 4 4 4
51948 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
51949 +4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
51950 +158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
51951 +153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
51952 +37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
51953 +4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
51954 +4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
51955 +154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
51956 +174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
51957 +32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
51958 +28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
51959 +50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
51960 +0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
51961 +2 0 0 0 0 0
51962 +4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
51963 +0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
51964 +174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
51965 +165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
51966 +4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
51967 +4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
51968 +4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
51969 +174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
51970 +60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
51971 +136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
51972 +22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
51973 +136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
51974 +26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
51975 +37 38 37 0 0 0
51976 +4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
51977 +13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
51978 +153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
51979 +177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
51980 +4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
51981 +5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
51982 +6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
51983 +166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
51984 +4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
51985 +146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
51986 +71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
51987 +90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
51988 +125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
51989 +85 115 134 4 0 0
51990 +4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
51991 +125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
51992 +155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
51993 +125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
51994 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
51995 +0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
51996 +5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
51997 +37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
51998 +4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
51999 +90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
52000 +2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
52001 +13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
52002 +166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
52003 +60 73 81 4 0 0
52004 +4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
52005 +174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
52006 +156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
52007 +4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
52008 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
52009 +10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
52010 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
52011 +4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
52012 +80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
52013 +28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
52014 +50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
52015 +1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
52016 +167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
52017 +16 19 21 4 0 0
52018 +4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
52019 +158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
52020 +167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
52021 +4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
52022 +4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
52023 +80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
52024 +4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
52025 +3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
52026 +146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
52027 +68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
52028 +136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
52029 +24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
52030 +163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
52031 +4 0 0 4 3 3
52032 +3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
52033 +156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
52034 +155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
52035 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
52036 +2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
52037 +136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
52038 +0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
52039 +0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
52040 +136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
52041 +28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
52042 +22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
52043 +137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
52044 +60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
52045 +3 2 2 4 4 4
52046 +3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
52047 +157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
52048 +37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
52049 +4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
52050 +0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
52051 +101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
52052 +14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
52053 +22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
52054 +136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
52055 +17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
52056 +2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
52057 +166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
52058 +13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
52059 +4 4 4 4 4 4
52060 +1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
52061 +163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
52062 +4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
52063 +4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
52064 +40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
52065 +101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
52066 +101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
52067 +136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
52068 +136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
52069 +136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
52070 +3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
52071 +174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
52072 +4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
52073 +4 4 4 4 4 4
52074 +4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
52075 +155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
52076 +4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
52077 +4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
52078 +101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
52079 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
52080 +136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
52081 +136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
52082 +136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
52083 +90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
52084 +85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
52085 +167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
52086 +6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
52087 +5 5 5 5 5 5
52088 +1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
52089 +131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
52090 +6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
52091 +0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
52092 +101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
52093 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
52094 +101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
52095 +136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
52096 +101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
52097 +7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
52098 +174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
52099 +24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
52100 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
52101 +5 5 5 4 4 4
52102 +4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
52103 +131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
52104 +6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
52105 +13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
52106 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
52107 +101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
52108 +101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
52109 +136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
52110 +136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
52111 +2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
52112 +174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
52113 +4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
52114 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52115 +4 4 4 4 4 4
52116 +1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
52117 +137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
52118 +4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
52119 +64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
52120 +90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
52121 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
52122 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
52123 +136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
52124 +101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
52125 +37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
52126 +167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
52127 +3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
52128 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52129 +4 4 4 4 4 4
52130 +4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
52131 +153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
52132 +4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
52133 +90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
52134 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
52135 +90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
52136 +101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
52137 +101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
52138 +35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
52139 +154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
52140 +60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
52141 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52142 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52143 +4 4 4 4 4 4
52144 +1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
52145 +153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
52146 +4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
52147 +64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
52148 +64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
52149 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
52150 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
52151 +136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
52152 +13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
52153 +174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
52154 +6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
52155 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52156 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52157 +4 4 4 4 4 4
52158 +4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
52159 +156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
52160 +4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
52161 +90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
52162 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
52163 +90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
52164 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
52165 +101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
52166 +2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
52167 +174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
52168 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52169 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52170 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52171 +4 4 4 4 4 4
52172 +3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
52173 +158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
52174 +4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
52175 +37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
52176 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
52177 +90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
52178 +101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
52179 +90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
52180 +5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
52181 +167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
52182 +6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
52183 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52184 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52185 +4 4 4 4 4 4
52186 +4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
52187 +163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
52188 +4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
52189 +18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
52190 +64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
52191 +90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
52192 +101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
52193 +13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
52194 +3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
52195 +174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
52196 +4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
52197 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52198 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52199 +4 4 4 4 4 4
52200 +1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
52201 +167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
52202 +4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
52203 +18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
52204 +26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
52205 +90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
52206 +101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
52207 +7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
52208 +4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
52209 +174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
52210 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52211 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52212 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52213 +4 4 4 4 4 4
52214 +4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
52215 +174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
52216 +5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
52217 +18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
52218 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
52219 +90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
52220 +101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
52221 +2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
52222 +3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
52223 +153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
52224 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52225 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52226 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52227 +4 4 4 4 4 4
52228 +1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
52229 +174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
52230 +5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
52231 +18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
52232 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
52233 +26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
52234 +35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
52235 +2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
52236 +3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
52237 +131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
52238 +4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52239 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52240 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52241 +4 4 4 4 4 4
52242 +3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
52243 +174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
52244 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
52245 +18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
52246 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
52247 +26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
52248 +7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
52249 +4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
52250 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
52251 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52252 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52253 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52254 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52255 +4 4 4 4 4 4
52256 +1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
52257 +174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
52258 +5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
52259 +18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
52260 +18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
52261 +26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
52262 +28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
52263 +3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
52264 +4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
52265 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52266 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52267 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52268 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52269 +4 4 4 4 4 4
52270 +4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
52271 +174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
52272 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
52273 +10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
52274 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
52275 +18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
52276 +90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
52277 +3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
52278 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
52279 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52280 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52281 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52282 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52283 +4 4 4 4 4 4
52284 +1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
52285 +177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
52286 +5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
52287 +10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
52288 +26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
52289 +6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
52290 +10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
52291 +2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
52292 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
52293 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52294 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52295 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52296 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52297 +4 4 4 4 4 4
52298 +4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
52299 +177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
52300 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
52301 +10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
52302 +26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
52303 +7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
52304 +3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
52305 +21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
52306 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
52307 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52308 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52309 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52310 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52311 +4 4 4 4 4 4
52312 +3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
52313 +190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
52314 +5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
52315 +10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
52316 +24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
52317 +18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
52318 +28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
52319 +26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
52320 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
52321 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52322 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52323 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52324 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52325 +4 4 4 4 4 4
52326 +4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
52327 +190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
52328 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
52329 +10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
52330 +0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
52331 +26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
52332 +37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
52333 +90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
52334 +4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
52335 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52336 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52337 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52338 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52339 +4 4 4 4 4 4
52340 +4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
52341 +193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
52342 +5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
52343 +10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
52344 +1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
52345 +26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
52346 +22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
52347 +26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
52348 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
52349 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52350 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52351 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52352 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52353 +4 4 4 4 4 4
52354 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
52355 +190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
52356 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
52357 +10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
52358 +2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
52359 +26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
52360 +10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
52361 +26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
52362 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
52363 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52364 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52365 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52366 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52367 +4 4 4 4 4 4
52368 +4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
52369 +193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
52370 +5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
52371 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
52372 +13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
52373 +10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
52374 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
52375 +26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
52376 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
52377 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52378 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52379 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52380 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52381 +4 4 4 4 4 4
52382 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
52383 +190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
52384 +5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
52385 +28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
52386 +10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
52387 +28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
52388 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
52389 +26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
52390 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
52391 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52392 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52393 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52394 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52395 +4 4 4 4 4 4
52396 +4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
52397 +193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
52398 +5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
52399 +4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
52400 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
52401 +10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
52402 +18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
52403 +22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
52404 +4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
52405 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52406 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52407 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52408 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52409 +4 4 4 4 4 4
52410 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
52411 +190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
52412 +6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
52413 +1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
52414 +18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
52415 +10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
52416 +26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
52417 +1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
52418 +5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
52419 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52420 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52421 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52422 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52423 +4 4 4 4 4 4
52424 +4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
52425 +193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
52426 +2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
52427 +4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
52428 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
52429 +10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
52430 +26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
52431 +2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
52432 +3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
52433 +131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52434 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52435 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52436 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52437 +4 4 4 4 4 4
52438 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
52439 +193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
52440 +0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
52441 +4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
52442 +13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
52443 +10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
52444 +28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
52445 +4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
52446 +0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
52447 +125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52448 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52449 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52450 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52451 +4 4 4 4 4 4
52452 +4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
52453 +193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
52454 +120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
52455 +4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
52456 +4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
52457 +10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
52458 +4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
52459 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
52460 +24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
52461 +125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
52462 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52463 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52464 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52465 +4 4 4 4 4 4
52466 +4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
52467 +174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
52468 +220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
52469 +3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
52470 +4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
52471 +10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
52472 +1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
52473 +5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
52474 +137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
52475 +125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
52476 +0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52477 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52478 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52479 +4 4 4 4 4 4
52480 +5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
52481 +193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
52482 +220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
52483 +4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
52484 +4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
52485 +22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
52486 +4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52487 +1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
52488 +166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
52489 +125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
52490 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
52491 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52492 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52493 +4 4 4 4 4 4
52494 +4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
52495 +220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
52496 +205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
52497 +24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
52498 +4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
52499 +4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
52500 +4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
52501 +2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
52502 +156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
52503 +137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
52504 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52505 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52506 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52507 +4 4 4 4 4 4
52508 +5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
52509 +125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
52510 +205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
52511 +193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
52512 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
52513 +1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
52514 +5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
52515 +60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
52516 +153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
52517 +125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
52518 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52519 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52520 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52521 +4 4 4 4 4 4
52522 +4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
52523 +6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
52524 +193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
52525 +244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
52526 +0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
52527 +4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
52528 +3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
52529 +220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
52530 +153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
52531 +13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
52532 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52533 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52534 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52535 +4 4 4 4 4 4
52536 +5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
52537 +6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
52538 +244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
52539 +220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
52540 +3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
52541 +4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
52542 +0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
52543 +177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
52544 +158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
52545 +4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
52546 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52547 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52548 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52549 +4 4 4 4 4 4
52550 +5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
52551 +6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
52552 +177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
52553 +220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
52554 +125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
52555 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
52556 +37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
52557 +174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
52558 +158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
52559 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
52560 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52561 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52562 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52563 +4 4 4 4 4 4
52564 +4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
52565 +4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
52566 +26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
52567 +205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
52568 +244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
52569 +0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
52570 +177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
52571 +174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
52572 +60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
52573 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52574 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52575 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52576 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52577 +4 4 4 4 4 4
52578 +5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
52579 +6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
52580 +6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
52581 +220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
52582 +220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
52583 +0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
52584 +220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
52585 +174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
52586 +4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
52587 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52588 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52589 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52590 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52591 +4 4 4 4 4 4
52592 +4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
52593 +6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
52594 +4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
52595 +220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
52596 +205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
52597 +60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
52598 +177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
52599 +190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
52600 +4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52601 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52602 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52603 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52604 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52605 +4 4 4 4 4 4
52606 +4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
52607 +4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
52608 +6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
52609 +125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
52610 +205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
52611 +193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
52612 +190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
52613 +153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
52614 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52615 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52616 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52617 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52618 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52619 +4 4 4 4 4 4
52620 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
52621 +6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
52622 +4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
52623 +4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
52624 +205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
52625 +220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
52626 +174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
52627 +6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
52628 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52629 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52630 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52631 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52632 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52633 +4 4 4 4 4 4
52634 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
52635 +5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
52636 +6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
52637 +4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
52638 +220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
52639 +190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
52640 +193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
52641 +4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
52642 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52643 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52644 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52645 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52646 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52647 +4 4 4 4 4 4
52648 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52649 +4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
52650 +4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
52651 +6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
52652 +174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
52653 +193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
52654 +193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
52655 +6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
52656 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52657 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52658 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52659 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52660 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52661 +4 4 4 4 4 4
52662 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52663 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
52664 +5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
52665 +5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
52666 +6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
52667 +193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
52668 +60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
52669 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
52670 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52671 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52672 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52673 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52674 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52675 +4 4 4 4 4 4
52676 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52677 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52678 +4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
52679 +5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
52680 +4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
52681 +193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
52682 +6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
52683 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
52684 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52685 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52686 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52687 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52688 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52689 +4 4 4 4 4 4
52690 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52691 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52692 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
52693 +4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
52694 +6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
52695 +153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
52696 +6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
52697 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52698 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52699 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52700 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52701 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52702 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52703 +4 4 4 4 4 4
52704 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52705 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52706 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52707 +4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
52708 +6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
52709 +24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
52710 +6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
52711 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52712 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52713 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52714 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52715 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52716 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52717 +4 4 4 4 4 4
52718 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52719 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52720 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52721 +4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
52722 +4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
52723 +6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
52724 +4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
52725 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52726 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52727 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52728 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52729 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52730 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52731 +4 4 4 4 4 4
52732 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52733 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52734 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52735 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
52736 +5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
52737 +6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
52738 +6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
52739 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52740 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52741 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52742 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52743 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52744 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52745 +4 4 4 4 4 4
52746 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52747 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52748 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52749 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
52750 +4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
52751 +4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
52752 +6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52753 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52754 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52755 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52756 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52757 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52758 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52759 +4 4 4 4 4 4
52760 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52761 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52762 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52763 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52764 +4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
52765 +6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
52766 +4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
52767 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52768 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52769 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52770 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52771 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52772 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52773 +4 4 4 4 4 4
52774 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52775 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52776 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52777 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52778 +4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
52779 +4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
52780 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52781 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52782 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52783 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52784 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52785 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52786 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52787 +4 4 4 4 4 4
52788 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52789 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52790 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52791 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52792 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
52793 +5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
52794 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52795 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52796 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52797 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52798 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52799 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52800 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52801 +4 4 4 4 4 4
52802 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52803 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52804 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52805 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52806 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
52807 +5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
52808 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52809 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52810 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52811 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52812 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52813 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52814 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52815 +4 4 4 4 4 4
52816 diff --git a/drivers/video/mb862xx/mb862xxfb_accel.c b/drivers/video/mb862xx/mb862xxfb_accel.c
52817 index fe92eed..106e085 100644
52818 --- a/drivers/video/mb862xx/mb862xxfb_accel.c
52819 +++ b/drivers/video/mb862xx/mb862xxfb_accel.c
52820 @@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
52821 struct mb862xxfb_par *par = info->par;
52822
52823 if (info->var.bits_per_pixel == 32) {
52824 - info->fbops->fb_fillrect = cfb_fillrect;
52825 - info->fbops->fb_copyarea = cfb_copyarea;
52826 - info->fbops->fb_imageblit = cfb_imageblit;
52827 + pax_open_kernel();
52828 + *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
52829 + *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
52830 + *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
52831 + pax_close_kernel();
52832 } else {
52833 outreg(disp, GC_L0EM, 3);
52834 - info->fbops->fb_fillrect = mb86290fb_fillrect;
52835 - info->fbops->fb_copyarea = mb86290fb_copyarea;
52836 - info->fbops->fb_imageblit = mb86290fb_imageblit;
52837 + pax_open_kernel();
52838 + *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
52839 + *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
52840 + *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
52841 + pax_close_kernel();
52842 }
52843 outreg(draw, GDC_REG_DRAW_BASE, 0);
52844 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
52845 diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
52846 index ff22871..b129bed 100644
52847 --- a/drivers/video/nvidia/nvidia.c
52848 +++ b/drivers/video/nvidia/nvidia.c
52849 @@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
52850 info->fix.line_length = (info->var.xres_virtual *
52851 info->var.bits_per_pixel) >> 3;
52852 if (info->var.accel_flags) {
52853 - info->fbops->fb_imageblit = nvidiafb_imageblit;
52854 - info->fbops->fb_fillrect = nvidiafb_fillrect;
52855 - info->fbops->fb_copyarea = nvidiafb_copyarea;
52856 - info->fbops->fb_sync = nvidiafb_sync;
52857 + pax_open_kernel();
52858 + *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
52859 + *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
52860 + *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
52861 + *(void **)&info->fbops->fb_sync = nvidiafb_sync;
52862 + pax_close_kernel();
52863 info->pixmap.scan_align = 4;
52864 info->flags &= ~FBINFO_HWACCEL_DISABLED;
52865 info->flags |= FBINFO_READS_FAST;
52866 NVResetGraphics(info);
52867 } else {
52868 - info->fbops->fb_imageblit = cfb_imageblit;
52869 - info->fbops->fb_fillrect = cfb_fillrect;
52870 - info->fbops->fb_copyarea = cfb_copyarea;
52871 - info->fbops->fb_sync = NULL;
52872 + pax_open_kernel();
52873 + *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
52874 + *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
52875 + *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
52876 + *(void **)&info->fbops->fb_sync = NULL;
52877 + pax_close_kernel();
52878 info->pixmap.scan_align = 1;
52879 info->flags |= FBINFO_HWACCEL_DISABLED;
52880 info->flags &= ~FBINFO_READS_FAST;
52881 @@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
52882 info->pixmap.size = 8 * 1024;
52883 info->pixmap.flags = FB_PIXMAP_SYSTEM;
52884
52885 - if (!hwcur)
52886 - info->fbops->fb_cursor = NULL;
52887 + if (!hwcur) {
52888 + pax_open_kernel();
52889 + *(void **)&info->fbops->fb_cursor = NULL;
52890 + pax_close_kernel();
52891 + }
52892
52893 info->var.accel_flags = (!noaccel);
52894
52895 diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
52896 index fafe7c9..93197b9 100644
52897 --- a/drivers/video/omap2/dss/display.c
52898 +++ b/drivers/video/omap2/dss/display.c
52899 @@ -137,12 +137,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
52900 snprintf(dssdev->alias, sizeof(dssdev->alias),
52901 "display%d", disp_num_counter++);
52902
52903 + pax_open_kernel();
52904 if (drv && drv->get_resolution == NULL)
52905 - drv->get_resolution = omapdss_default_get_resolution;
52906 + *(void **)&drv->get_resolution = omapdss_default_get_resolution;
52907 if (drv && drv->get_recommended_bpp == NULL)
52908 - drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
52909 + *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
52910 if (drv && drv->get_timings == NULL)
52911 - drv->get_timings = omapdss_default_get_timings;
52912 + *(void **)&drv->get_timings = omapdss_default_get_timings;
52913 + pax_close_kernel();
52914
52915 mutex_lock(&panel_list_mutex);
52916 list_add_tail(&dssdev->panel_list, &panel_list);
52917 diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
52918 index 05c2dc3..ea1f391 100644
52919 --- a/drivers/video/s1d13xxxfb.c
52920 +++ b/drivers/video/s1d13xxxfb.c
52921 @@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
52922
52923 switch(prod_id) {
52924 case S1D13506_PROD_ID: /* activate acceleration */
52925 - s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
52926 - s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
52927 + pax_open_kernel();
52928 + *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
52929 + *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
52930 + pax_close_kernel();
52931 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
52932 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
52933 break;
52934 diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c
52935 index e188ada..aac63c8 100644
52936 --- a/drivers/video/smscufx.c
52937 +++ b/drivers/video/smscufx.c
52938 @@ -1175,7 +1175,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
52939 fb_deferred_io_cleanup(info);
52940 kfree(info->fbdefio);
52941 info->fbdefio = NULL;
52942 - info->fbops->fb_mmap = ufx_ops_mmap;
52943 + pax_open_kernel();
52944 + *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
52945 + pax_close_kernel();
52946 }
52947
52948 pr_debug("released /dev/fb%d user=%d count=%d",
52949 diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
52950 index d2e5bc3..4cb05d1 100644
52951 --- a/drivers/video/udlfb.c
52952 +++ b/drivers/video/udlfb.c
52953 @@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
52954 dlfb_urb_completion(urb);
52955
52956 error:
52957 - atomic_add(bytes_sent, &dev->bytes_sent);
52958 - atomic_add(bytes_identical, &dev->bytes_identical);
52959 - atomic_add(width*height*2, &dev->bytes_rendered);
52960 + atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
52961 + atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
52962 + atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
52963 end_cycles = get_cycles();
52964 - atomic_add(((unsigned int) ((end_cycles - start_cycles)
52965 + atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
52966 >> 10)), /* Kcycles */
52967 &dev->cpu_kcycles_used);
52968
52969 @@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
52970 dlfb_urb_completion(urb);
52971
52972 error:
52973 - atomic_add(bytes_sent, &dev->bytes_sent);
52974 - atomic_add(bytes_identical, &dev->bytes_identical);
52975 - atomic_add(bytes_rendered, &dev->bytes_rendered);
52976 + atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
52977 + atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
52978 + atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
52979 end_cycles = get_cycles();
52980 - atomic_add(((unsigned int) ((end_cycles - start_cycles)
52981 + atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
52982 >> 10)), /* Kcycles */
52983 &dev->cpu_kcycles_used);
52984 }
52985 @@ -993,7 +993,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
52986 fb_deferred_io_cleanup(info);
52987 kfree(info->fbdefio);
52988 info->fbdefio = NULL;
52989 - info->fbops->fb_mmap = dlfb_ops_mmap;
52990 + pax_open_kernel();
52991 + *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
52992 + pax_close_kernel();
52993 }
52994
52995 pr_warn("released /dev/fb%d user=%d count=%d\n",
52996 @@ -1376,7 +1378,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
52997 struct fb_info *fb_info = dev_get_drvdata(fbdev);
52998 struct dlfb_data *dev = fb_info->par;
52999 return snprintf(buf, PAGE_SIZE, "%u\n",
53000 - atomic_read(&dev->bytes_rendered));
53001 + atomic_read_unchecked(&dev->bytes_rendered));
53002 }
53003
53004 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
53005 @@ -1384,7 +1386,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
53006 struct fb_info *fb_info = dev_get_drvdata(fbdev);
53007 struct dlfb_data *dev = fb_info->par;
53008 return snprintf(buf, PAGE_SIZE, "%u\n",
53009 - atomic_read(&dev->bytes_identical));
53010 + atomic_read_unchecked(&dev->bytes_identical));
53011 }
53012
53013 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
53014 @@ -1392,7 +1394,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
53015 struct fb_info *fb_info = dev_get_drvdata(fbdev);
53016 struct dlfb_data *dev = fb_info->par;
53017 return snprintf(buf, PAGE_SIZE, "%u\n",
53018 - atomic_read(&dev->bytes_sent));
53019 + atomic_read_unchecked(&dev->bytes_sent));
53020 }
53021
53022 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
53023 @@ -1400,7 +1402,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
53024 struct fb_info *fb_info = dev_get_drvdata(fbdev);
53025 struct dlfb_data *dev = fb_info->par;
53026 return snprintf(buf, PAGE_SIZE, "%u\n",
53027 - atomic_read(&dev->cpu_kcycles_used));
53028 + atomic_read_unchecked(&dev->cpu_kcycles_used));
53029 }
53030
53031 static ssize_t edid_show(
53032 @@ -1460,10 +1462,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
53033 struct fb_info *fb_info = dev_get_drvdata(fbdev);
53034 struct dlfb_data *dev = fb_info->par;
53035
53036 - atomic_set(&dev->bytes_rendered, 0);
53037 - atomic_set(&dev->bytes_identical, 0);
53038 - atomic_set(&dev->bytes_sent, 0);
53039 - atomic_set(&dev->cpu_kcycles_used, 0);
53040 + atomic_set_unchecked(&dev->bytes_rendered, 0);
53041 + atomic_set_unchecked(&dev->bytes_identical, 0);
53042 + atomic_set_unchecked(&dev->bytes_sent, 0);
53043 + atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
53044
53045 return count;
53046 }
53047 diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
53048 index 7aec6f3..e3b2d55 100644
53049 --- a/drivers/video/uvesafb.c
53050 +++ b/drivers/video/uvesafb.c
53051 @@ -19,6 +19,7 @@
53052 #include <linux/io.h>
53053 #include <linux/mutex.h>
53054 #include <linux/slab.h>
53055 +#include <linux/moduleloader.h>
53056 #include <video/edid.h>
53057 #include <video/uvesafb.h>
53058 #ifdef CONFIG_X86
53059 @@ -566,10 +567,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
53060 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
53061 par->pmi_setpal = par->ypan = 0;
53062 } else {
53063 +
53064 +#ifdef CONFIG_PAX_KERNEXEC
53065 +#ifdef CONFIG_MODULES
53066 + par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
53067 +#endif
53068 + if (!par->pmi_code) {
53069 + par->pmi_setpal = par->ypan = 0;
53070 + return 0;
53071 + }
53072 +#endif
53073 +
53074 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
53075 + task->t.regs.edi);
53076 +
53077 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53078 + pax_open_kernel();
53079 + memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
53080 + pax_close_kernel();
53081 +
53082 + par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
53083 + par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
53084 +#else
53085 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
53086 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
53087 +#endif
53088 +
53089 printk(KERN_INFO "uvesafb: protected mode interface info at "
53090 "%04x:%04x\n",
53091 (u16)task->t.regs.es, (u16)task->t.regs.edi);
53092 @@ -814,13 +837,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
53093 par->ypan = ypan;
53094
53095 if (par->pmi_setpal || par->ypan) {
53096 +#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
53097 if (__supported_pte_mask & _PAGE_NX) {
53098 par->pmi_setpal = par->ypan = 0;
53099 printk(KERN_WARNING "uvesafb: NX protection is active, "
53100 "better not use the PMI.\n");
53101 - } else {
53102 + } else
53103 +#endif
53104 uvesafb_vbe_getpmi(task, par);
53105 - }
53106 }
53107 #else
53108 /* The protected mode interface is not available on non-x86. */
53109 @@ -1454,8 +1478,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
53110 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
53111
53112 /* Disable blanking if the user requested so. */
53113 - if (!blank)
53114 - info->fbops->fb_blank = NULL;
53115 + if (!blank) {
53116 + pax_open_kernel();
53117 + *(void **)&info->fbops->fb_blank = NULL;
53118 + pax_close_kernel();
53119 + }
53120
53121 /*
53122 * Find out how much IO memory is required for the mode with
53123 @@ -1531,8 +1558,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
53124 info->flags = FBINFO_FLAG_DEFAULT |
53125 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
53126
53127 - if (!par->ypan)
53128 - info->fbops->fb_pan_display = NULL;
53129 + if (!par->ypan) {
53130 + pax_open_kernel();
53131 + *(void **)&info->fbops->fb_pan_display = NULL;
53132 + pax_close_kernel();
53133 + }
53134 }
53135
53136 static void uvesafb_init_mtrr(struct fb_info *info)
53137 @@ -1796,6 +1826,11 @@ out:
53138 if (par->vbe_modes)
53139 kfree(par->vbe_modes);
53140
53141 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53142 + if (par->pmi_code)
53143 + module_free_exec(NULL, par->pmi_code);
53144 +#endif
53145 +
53146 framebuffer_release(info);
53147 return err;
53148 }
53149 @@ -1823,6 +1858,12 @@ static int uvesafb_remove(struct platform_device *dev)
53150 kfree(par->vbe_state_orig);
53151 if (par->vbe_state_saved)
53152 kfree(par->vbe_state_saved);
53153 +
53154 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53155 + if (par->pmi_code)
53156 + module_free_exec(NULL, par->pmi_code);
53157 +#endif
53158 +
53159 }
53160
53161 framebuffer_release(info);
53162 diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
53163 index bd83233..7d8a5aa 100644
53164 --- a/drivers/video/vesafb.c
53165 +++ b/drivers/video/vesafb.c
53166 @@ -9,6 +9,7 @@
53167 */
53168
53169 #include <linux/module.h>
53170 +#include <linux/moduleloader.h>
53171 #include <linux/kernel.h>
53172 #include <linux/errno.h>
53173 #include <linux/string.h>
53174 @@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
53175 static int vram_total; /* Set total amount of memory */
53176 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
53177 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
53178 -static void (*pmi_start)(void) __read_mostly;
53179 -static void (*pmi_pal) (void) __read_mostly;
53180 +static void (*pmi_start)(void) __read_only;
53181 +static void (*pmi_pal) (void) __read_only;
53182 static int depth __read_mostly;
53183 static int vga_compat __read_mostly;
53184 /* --------------------------------------------------------------------- */
53185 @@ -234,6 +235,7 @@ static int vesafb_probe(struct platform_device *dev)
53186 unsigned int size_remap;
53187 unsigned int size_total;
53188 char *option = NULL;
53189 + void *pmi_code = NULL;
53190
53191 /* ignore error return of fb_get_options */
53192 fb_get_options("vesafb", &option);
53193 @@ -280,10 +282,6 @@ static int vesafb_probe(struct platform_device *dev)
53194 size_remap = size_total;
53195 vesafb_fix.smem_len = size_remap;
53196
53197 -#ifndef __i386__
53198 - screen_info.vesapm_seg = 0;
53199 -#endif
53200 -
53201 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
53202 printk(KERN_WARNING
53203 "vesafb: cannot reserve video memory at 0x%lx\n",
53204 @@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
53205 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
53206 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
53207
53208 +#ifdef __i386__
53209 +
53210 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53211 + pmi_code = module_alloc_exec(screen_info.vesapm_size);
53212 + if (!pmi_code)
53213 +#elif !defined(CONFIG_PAX_KERNEXEC)
53214 + if (0)
53215 +#endif
53216 +
53217 +#endif
53218 + screen_info.vesapm_seg = 0;
53219 +
53220 if (screen_info.vesapm_seg) {
53221 - printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
53222 - screen_info.vesapm_seg,screen_info.vesapm_off);
53223 + printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
53224 + screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
53225 }
53226
53227 if (screen_info.vesapm_seg < 0xc000)
53228 @@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
53229
53230 if (ypan || pmi_setpal) {
53231 unsigned short *pmi_base;
53232 +
53233 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
53234 - pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
53235 - pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
53236 +
53237 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53238 + pax_open_kernel();
53239 + memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
53240 +#else
53241 + pmi_code = pmi_base;
53242 +#endif
53243 +
53244 + pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
53245 + pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
53246 +
53247 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53248 + pmi_start = ktva_ktla(pmi_start);
53249 + pmi_pal = ktva_ktla(pmi_pal);
53250 + pax_close_kernel();
53251 +#endif
53252 +
53253 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
53254 if (pmi_base[3]) {
53255 printk(KERN_INFO "vesafb: pmi: ports = ");
53256 @@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
53257 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
53258 (ypan ? FBINFO_HWACCEL_YPAN : 0);
53259
53260 - if (!ypan)
53261 - info->fbops->fb_pan_display = NULL;
53262 + if (!ypan) {
53263 + pax_open_kernel();
53264 + *(void **)&info->fbops->fb_pan_display = NULL;
53265 + pax_close_kernel();
53266 + }
53267
53268 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
53269 err = -ENOMEM;
53270 @@ -493,6 +522,11 @@ static int vesafb_probe(struct platform_device *dev)
53271 info->node, info->fix.id);
53272 return 0;
53273 err:
53274 +
53275 +#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53276 + module_free_exec(NULL, pmi_code);
53277 +#endif
53278 +
53279 if (info->screen_base)
53280 iounmap(info->screen_base);
53281 framebuffer_release(info);
53282 diff --git a/drivers/video/via/via_clock.h b/drivers/video/via/via_clock.h
53283 index 88714ae..16c2e11 100644
53284 --- a/drivers/video/via/via_clock.h
53285 +++ b/drivers/video/via/via_clock.h
53286 @@ -56,7 +56,7 @@ struct via_clock {
53287
53288 void (*set_engine_pll_state)(u8 state);
53289 void (*set_engine_pll)(struct via_pll_config config);
53290 -};
53291 +} __no_const;
53292
53293
53294 static inline u32 get_pll_internal_frequency(u32 ref_freq,
53295 diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
53296 index fef20db..d28b1ab 100644
53297 --- a/drivers/xen/xenfs/xenstored.c
53298 +++ b/drivers/xen/xenfs/xenstored.c
53299 @@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
53300 static int xsd_kva_open(struct inode *inode, struct file *file)
53301 {
53302 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
53303 +#ifdef CONFIG_GRKERNSEC_HIDESYM
53304 + NULL);
53305 +#else
53306 xen_store_interface);
53307 +#endif
53308 +
53309 if (!file->private_data)
53310 return -ENOMEM;
53311 return 0;
53312 diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
53313 index 9ff073f..05cef23 100644
53314 --- a/fs/9p/vfs_addr.c
53315 +++ b/fs/9p/vfs_addr.c
53316 @@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
53317
53318 retval = v9fs_file_write_internal(inode,
53319 v9inode->writeback_fid,
53320 - (__force const char __user *)buffer,
53321 + (const char __force_user *)buffer,
53322 len, &offset, 0);
53323 if (retval > 0)
53324 retval = 0;
53325 diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
53326 index 94de6d1..8d81256 100644
53327 --- a/fs/9p/vfs_inode.c
53328 +++ b/fs/9p/vfs_inode.c
53329 @@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
53330 void
53331 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
53332 {
53333 - char *s = nd_get_link(nd);
53334 + const char *s = nd_get_link(nd);
53335
53336 p9_debug(P9_DEBUG_VFS, " %s %s\n",
53337 dentry->d_name.name, IS_ERR(s) ? "<error>" : s);
53338 diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
53339 index 370b24c..ff0be7b 100644
53340 --- a/fs/Kconfig.binfmt
53341 +++ b/fs/Kconfig.binfmt
53342 @@ -103,7 +103,7 @@ config HAVE_AOUT
53343
53344 config BINFMT_AOUT
53345 tristate "Kernel support for a.out and ECOFF binaries"
53346 - depends on HAVE_AOUT
53347 + depends on HAVE_AOUT && BROKEN
53348 ---help---
53349 A.out (Assembler.OUTput) is a set of formats for libraries and
53350 executables used in the earliest versions of UNIX. Linux used
53351 diff --git a/fs/afs/inode.c b/fs/afs/inode.c
53352 index 789bc25..fafaeea 100644
53353 --- a/fs/afs/inode.c
53354 +++ b/fs/afs/inode.c
53355 @@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
53356 struct afs_vnode *vnode;
53357 struct super_block *sb;
53358 struct inode *inode;
53359 - static atomic_t afs_autocell_ino;
53360 + static atomic_unchecked_t afs_autocell_ino;
53361
53362 _enter("{%x:%u},%*.*s,",
53363 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
53364 @@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
53365 data.fid.unique = 0;
53366 data.fid.vnode = 0;
53367
53368 - inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
53369 + inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
53370 afs_iget5_autocell_test, afs_iget5_set,
53371 &data);
53372 if (!inode) {
53373 diff --git a/fs/aio.c b/fs/aio.c
53374 index 6efb7f6..ec354de 100644
53375 --- a/fs/aio.c
53376 +++ b/fs/aio.c
53377 @@ -338,7 +338,7 @@ static int aio_setup_ring(struct kioctx *ctx)
53378 size += sizeof(struct io_event) * nr_events;
53379
53380 nr_pages = PFN_UP(size);
53381 - if (nr_pages < 0)
53382 + if (nr_pages <= 0)
53383 return -EINVAL;
53384
53385 file = aio_private_file(ctx, nr_pages);
53386 @@ -652,7 +652,8 @@ static struct kioctx *ioctx_alloc(unsigned nr_events)
53387 aio_nr += ctx->max_reqs;
53388 spin_unlock(&aio_nr_lock);
53389
53390 - percpu_ref_get(&ctx->users); /* io_setup() will drop this ref */
53391 + percpu_ref_get(&ctx->users); /* io_setup() will drop this ref */
53392 + percpu_ref_get(&ctx->reqs); /* free_ioctx_users() will drop this */
53393
53394 err = ioctx_add_table(ctx, mm);
53395 if (err)
53396 diff --git a/fs/attr.c b/fs/attr.c
53397 index 1449adb..a2038c2 100644
53398 --- a/fs/attr.c
53399 +++ b/fs/attr.c
53400 @@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
53401 unsigned long limit;
53402
53403 limit = rlimit(RLIMIT_FSIZE);
53404 + gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
53405 if (limit != RLIM_INFINITY && offset > limit)
53406 goto out_sig;
53407 if (offset > inode->i_sb->s_maxbytes)
53408 diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
53409 index 689e40d..515cac5 100644
53410 --- a/fs/autofs4/waitq.c
53411 +++ b/fs/autofs4/waitq.c
53412 @@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
53413 {
53414 unsigned long sigpipe, flags;
53415 mm_segment_t fs;
53416 - const char *data = (const char *)addr;
53417 + const char __user *data = (const char __force_user *)addr;
53418 ssize_t wr = 0;
53419
53420 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
53421 @@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
53422 return 1;
53423 }
53424
53425 +#ifdef CONFIG_GRKERNSEC_HIDESYM
53426 +static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
53427 +#endif
53428 +
53429 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
53430 enum autofs_notify notify)
53431 {
53432 @@ -373,7 +377,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
53433
53434 /* If this is a direct mount request create a dummy name */
53435 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
53436 +#ifdef CONFIG_GRKERNSEC_HIDESYM
53437 + /* this name does get written to userland via autofs4_write() */
53438 + qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
53439 +#else
53440 qstr.len = sprintf(name, "%p", dentry);
53441 +#endif
53442 else {
53443 qstr.len = autofs4_getpath(sbi, dentry, &name);
53444 if (!qstr.len) {
53445 diff --git a/fs/befs/endian.h b/fs/befs/endian.h
53446 index 2722387..56059b5 100644
53447 --- a/fs/befs/endian.h
53448 +++ b/fs/befs/endian.h
53449 @@ -11,7 +11,7 @@
53450
53451 #include <asm/byteorder.h>
53452
53453 -static inline u64
53454 +static inline u64 __intentional_overflow(-1)
53455 fs64_to_cpu(const struct super_block *sb, fs64 n)
53456 {
53457 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
53458 @@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
53459 return (__force fs64)cpu_to_be64(n);
53460 }
53461
53462 -static inline u32
53463 +static inline u32 __intentional_overflow(-1)
53464 fs32_to_cpu(const struct super_block *sb, fs32 n)
53465 {
53466 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
53467 @@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
53468 return (__force fs32)cpu_to_be32(n);
53469 }
53470
53471 -static inline u16
53472 +static inline u16 __intentional_overflow(-1)
53473 fs16_to_cpu(const struct super_block *sb, fs16 n)
53474 {
53475 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
53476 diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
53477 index e9c75e2..1baece1 100644
53478 --- a/fs/befs/linuxvfs.c
53479 +++ b/fs/befs/linuxvfs.c
53480 @@ -514,7 +514,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
53481 {
53482 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
53483 if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
53484 - char *link = nd_get_link(nd);
53485 + const char *link = nd_get_link(nd);
53486 if (!IS_ERR(link))
53487 kfree(link);
53488 }
53489 diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
53490 index 89dec7f..361b0d75 100644
53491 --- a/fs/binfmt_aout.c
53492 +++ b/fs/binfmt_aout.c
53493 @@ -16,6 +16,7 @@
53494 #include <linux/string.h>
53495 #include <linux/fs.h>
53496 #include <linux/file.h>
53497 +#include <linux/security.h>
53498 #include <linux/stat.h>
53499 #include <linux/fcntl.h>
53500 #include <linux/ptrace.h>
53501 @@ -59,6 +60,8 @@ static int aout_core_dump(struct coredump_params *cprm)
53502 #endif
53503 # define START_STACK(u) ((void __user *)u.start_stack)
53504
53505 + memset(&dump, 0, sizeof(dump));
53506 +
53507 fs = get_fs();
53508 set_fs(KERNEL_DS);
53509 has_dumped = 1;
53510 @@ -69,10 +72,12 @@ static int aout_core_dump(struct coredump_params *cprm)
53511
53512 /* If the size of the dump file exceeds the rlimit, then see what would happen
53513 if we wrote the stack, but not the data area. */
53514 + gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
53515 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
53516 dump.u_dsize = 0;
53517
53518 /* Make sure we have enough room to write the stack and data areas. */
53519 + gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
53520 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
53521 dump.u_ssize = 0;
53522
53523 @@ -233,6 +238,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
53524 rlim = rlimit(RLIMIT_DATA);
53525 if (rlim >= RLIM_INFINITY)
53526 rlim = ~0;
53527 +
53528 + gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
53529 if (ex.a_data + ex.a_bss > rlim)
53530 return -ENOMEM;
53531
53532 @@ -265,6 +272,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
53533
53534 install_exec_creds(bprm);
53535
53536 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
53537 + current->mm->pax_flags = 0UL;
53538 +#endif
53539 +
53540 +#ifdef CONFIG_PAX_PAGEEXEC
53541 + if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
53542 + current->mm->pax_flags |= MF_PAX_PAGEEXEC;
53543 +
53544 +#ifdef CONFIG_PAX_EMUTRAMP
53545 + if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
53546 + current->mm->pax_flags |= MF_PAX_EMUTRAMP;
53547 +#endif
53548 +
53549 +#ifdef CONFIG_PAX_MPROTECT
53550 + if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
53551 + current->mm->pax_flags |= MF_PAX_MPROTECT;
53552 +#endif
53553 +
53554 + }
53555 +#endif
53556 +
53557 if (N_MAGIC(ex) == OMAGIC) {
53558 unsigned long text_addr, map_size;
53559 loff_t pos;
53560 @@ -322,7 +350,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
53561 }
53562
53563 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
53564 - PROT_READ | PROT_WRITE | PROT_EXEC,
53565 + PROT_READ | PROT_WRITE,
53566 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
53567 fd_offset + ex.a_text);
53568 if (error != N_DATADDR(ex)) {
53569 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
53570 index 4c94a79..2610454 100644
53571 --- a/fs/binfmt_elf.c
53572 +++ b/fs/binfmt_elf.c
53573 @@ -34,6 +34,7 @@
53574 #include <linux/utsname.h>
53575 #include <linux/coredump.h>
53576 #include <linux/sched.h>
53577 +#include <linux/xattr.h>
53578 #include <asm/uaccess.h>
53579 #include <asm/param.h>
53580 #include <asm/page.h>
53581 @@ -60,6 +61,14 @@ static int elf_core_dump(struct coredump_params *cprm);
53582 #define elf_core_dump NULL
53583 #endif
53584
53585 +#ifdef CONFIG_PAX_MPROTECT
53586 +static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
53587 +#endif
53588 +
53589 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
53590 +static void elf_handle_mmap(struct file *file);
53591 +#endif
53592 +
53593 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
53594 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
53595 #else
53596 @@ -79,6 +88,15 @@ static struct linux_binfmt elf_format = {
53597 .load_binary = load_elf_binary,
53598 .load_shlib = load_elf_library,
53599 .core_dump = elf_core_dump,
53600 +
53601 +#ifdef CONFIG_PAX_MPROTECT
53602 + .handle_mprotect= elf_handle_mprotect,
53603 +#endif
53604 +
53605 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
53606 + .handle_mmap = elf_handle_mmap,
53607 +#endif
53608 +
53609 .min_coredump = ELF_EXEC_PAGESIZE,
53610 };
53611
53612 @@ -86,6 +104,8 @@ static struct linux_binfmt elf_format = {
53613
53614 static int set_brk(unsigned long start, unsigned long end)
53615 {
53616 + unsigned long e = end;
53617 +
53618 start = ELF_PAGEALIGN(start);
53619 end = ELF_PAGEALIGN(end);
53620 if (end > start) {
53621 @@ -94,7 +114,7 @@ static int set_brk(unsigned long start, unsigned long end)
53622 if (BAD_ADDR(addr))
53623 return addr;
53624 }
53625 - current->mm->start_brk = current->mm->brk = end;
53626 + current->mm->start_brk = current->mm->brk = e;
53627 return 0;
53628 }
53629
53630 @@ -155,12 +175,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
53631 elf_addr_t __user *u_rand_bytes;
53632 const char *k_platform = ELF_PLATFORM;
53633 const char *k_base_platform = ELF_BASE_PLATFORM;
53634 - unsigned char k_rand_bytes[16];
53635 + u32 k_rand_bytes[4];
53636 int items;
53637 elf_addr_t *elf_info;
53638 int ei_index = 0;
53639 const struct cred *cred = current_cred();
53640 struct vm_area_struct *vma;
53641 + unsigned long saved_auxv[AT_VECTOR_SIZE];
53642
53643 /*
53644 * In some cases (e.g. Hyper-Threading), we want to avoid L1
53645 @@ -202,8 +223,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
53646 * Generate 16 random bytes for userspace PRNG seeding.
53647 */
53648 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
53649 - u_rand_bytes = (elf_addr_t __user *)
53650 - STACK_ALLOC(p, sizeof(k_rand_bytes));
53651 + prandom_seed(k_rand_bytes[0] ^ prandom_u32());
53652 + prandom_seed(k_rand_bytes[1] ^ prandom_u32());
53653 + prandom_seed(k_rand_bytes[2] ^ prandom_u32());
53654 + prandom_seed(k_rand_bytes[3] ^ prandom_u32());
53655 + p = STACK_ROUND(p, sizeof(k_rand_bytes));
53656 + u_rand_bytes = (elf_addr_t __user *) p;
53657 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
53658 return -EFAULT;
53659
53660 @@ -318,9 +343,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
53661 return -EFAULT;
53662 current->mm->env_end = p;
53663
53664 + memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
53665 +
53666 /* Put the elf_info on the stack in the right place. */
53667 sp = (elf_addr_t __user *)envp + 1;
53668 - if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
53669 + if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
53670 return -EFAULT;
53671 return 0;
53672 }
53673 @@ -388,15 +415,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
53674 an ELF header */
53675
53676 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
53677 - struct file *interpreter, unsigned long *interp_map_addr,
53678 - unsigned long no_base)
53679 + struct file *interpreter, unsigned long no_base)
53680 {
53681 struct elf_phdr *elf_phdata;
53682 struct elf_phdr *eppnt;
53683 - unsigned long load_addr = 0;
53684 + unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
53685 int load_addr_set = 0;
53686 unsigned long last_bss = 0, elf_bss = 0;
53687 - unsigned long error = ~0UL;
53688 + unsigned long error = -EINVAL;
53689 unsigned long total_size;
53690 int retval, i, size;
53691
53692 @@ -442,6 +468,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
53693 goto out_close;
53694 }
53695
53696 +#ifdef CONFIG_PAX_SEGMEXEC
53697 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
53698 + pax_task_size = SEGMEXEC_TASK_SIZE;
53699 +#endif
53700 +
53701 eppnt = elf_phdata;
53702 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
53703 if (eppnt->p_type == PT_LOAD) {
53704 @@ -465,8 +496,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
53705 map_addr = elf_map(interpreter, load_addr + vaddr,
53706 eppnt, elf_prot, elf_type, total_size);
53707 total_size = 0;
53708 - if (!*interp_map_addr)
53709 - *interp_map_addr = map_addr;
53710 error = map_addr;
53711 if (BAD_ADDR(map_addr))
53712 goto out_close;
53713 @@ -485,8 +514,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
53714 k = load_addr + eppnt->p_vaddr;
53715 if (BAD_ADDR(k) ||
53716 eppnt->p_filesz > eppnt->p_memsz ||
53717 - eppnt->p_memsz > TASK_SIZE ||
53718 - TASK_SIZE - eppnt->p_memsz < k) {
53719 + eppnt->p_memsz > pax_task_size ||
53720 + pax_task_size - eppnt->p_memsz < k) {
53721 error = -ENOMEM;
53722 goto out_close;
53723 }
53724 @@ -525,9 +554,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
53725 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
53726
53727 /* Map the last of the bss segment */
53728 - error = vm_brk(elf_bss, last_bss - elf_bss);
53729 - if (BAD_ADDR(error))
53730 - goto out_close;
53731 + if (last_bss > elf_bss) {
53732 + error = vm_brk(elf_bss, last_bss - elf_bss);
53733 + if (BAD_ADDR(error))
53734 + goto out_close;
53735 + }
53736 }
53737
53738 error = load_addr;
53739 @@ -538,6 +569,315 @@ out:
53740 return error;
53741 }
53742
53743 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
53744 +#ifdef CONFIG_PAX_SOFTMODE
53745 +static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
53746 +{
53747 + unsigned long pax_flags = 0UL;
53748 +
53749 +#ifdef CONFIG_PAX_PAGEEXEC
53750 + if (elf_phdata->p_flags & PF_PAGEEXEC)
53751 + pax_flags |= MF_PAX_PAGEEXEC;
53752 +#endif
53753 +
53754 +#ifdef CONFIG_PAX_SEGMEXEC
53755 + if (elf_phdata->p_flags & PF_SEGMEXEC)
53756 + pax_flags |= MF_PAX_SEGMEXEC;
53757 +#endif
53758 +
53759 +#ifdef CONFIG_PAX_EMUTRAMP
53760 + if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
53761 + pax_flags |= MF_PAX_EMUTRAMP;
53762 +#endif
53763 +
53764 +#ifdef CONFIG_PAX_MPROTECT
53765 + if (elf_phdata->p_flags & PF_MPROTECT)
53766 + pax_flags |= MF_PAX_MPROTECT;
53767 +#endif
53768 +
53769 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
53770 + if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
53771 + pax_flags |= MF_PAX_RANDMMAP;
53772 +#endif
53773 +
53774 + return pax_flags;
53775 +}
53776 +#endif
53777 +
53778 +static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
53779 +{
53780 + unsigned long pax_flags = 0UL;
53781 +
53782 +#ifdef CONFIG_PAX_PAGEEXEC
53783 + if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
53784 + pax_flags |= MF_PAX_PAGEEXEC;
53785 +#endif
53786 +
53787 +#ifdef CONFIG_PAX_SEGMEXEC
53788 + if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
53789 + pax_flags |= MF_PAX_SEGMEXEC;
53790 +#endif
53791 +
53792 +#ifdef CONFIG_PAX_EMUTRAMP
53793 + if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
53794 + pax_flags |= MF_PAX_EMUTRAMP;
53795 +#endif
53796 +
53797 +#ifdef CONFIG_PAX_MPROTECT
53798 + if (!(elf_phdata->p_flags & PF_NOMPROTECT))
53799 + pax_flags |= MF_PAX_MPROTECT;
53800 +#endif
53801 +
53802 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
53803 + if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
53804 + pax_flags |= MF_PAX_RANDMMAP;
53805 +#endif
53806 +
53807 + return pax_flags;
53808 +}
53809 +#endif
53810 +
53811 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
53812 +#ifdef CONFIG_PAX_SOFTMODE
53813 +static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
53814 +{
53815 + unsigned long pax_flags = 0UL;
53816 +
53817 +#ifdef CONFIG_PAX_PAGEEXEC
53818 + if (pax_flags_softmode & MF_PAX_PAGEEXEC)
53819 + pax_flags |= MF_PAX_PAGEEXEC;
53820 +#endif
53821 +
53822 +#ifdef CONFIG_PAX_SEGMEXEC
53823 + if (pax_flags_softmode & MF_PAX_SEGMEXEC)
53824 + pax_flags |= MF_PAX_SEGMEXEC;
53825 +#endif
53826 +
53827 +#ifdef CONFIG_PAX_EMUTRAMP
53828 + if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
53829 + pax_flags |= MF_PAX_EMUTRAMP;
53830 +#endif
53831 +
53832 +#ifdef CONFIG_PAX_MPROTECT
53833 + if (pax_flags_softmode & MF_PAX_MPROTECT)
53834 + pax_flags |= MF_PAX_MPROTECT;
53835 +#endif
53836 +
53837 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
53838 + if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
53839 + pax_flags |= MF_PAX_RANDMMAP;
53840 +#endif
53841 +
53842 + return pax_flags;
53843 +}
53844 +#endif
53845 +
53846 +static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
53847 +{
53848 + unsigned long pax_flags = 0UL;
53849 +
53850 +#ifdef CONFIG_PAX_PAGEEXEC
53851 + if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
53852 + pax_flags |= MF_PAX_PAGEEXEC;
53853 +#endif
53854 +
53855 +#ifdef CONFIG_PAX_SEGMEXEC
53856 + if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
53857 + pax_flags |= MF_PAX_SEGMEXEC;
53858 +#endif
53859 +
53860 +#ifdef CONFIG_PAX_EMUTRAMP
53861 + if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
53862 + pax_flags |= MF_PAX_EMUTRAMP;
53863 +#endif
53864 +
53865 +#ifdef CONFIG_PAX_MPROTECT
53866 + if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
53867 + pax_flags |= MF_PAX_MPROTECT;
53868 +#endif
53869 +
53870 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
53871 + if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
53872 + pax_flags |= MF_PAX_RANDMMAP;
53873 +#endif
53874 +
53875 + return pax_flags;
53876 +}
53877 +#endif
53878 +
53879 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
53880 +static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
53881 +{
53882 + unsigned long pax_flags = 0UL;
53883 +
53884 +#ifdef CONFIG_PAX_EI_PAX
53885 +
53886 +#ifdef CONFIG_PAX_PAGEEXEC
53887 + if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
53888 + pax_flags |= MF_PAX_PAGEEXEC;
53889 +#endif
53890 +
53891 +#ifdef CONFIG_PAX_SEGMEXEC
53892 + if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
53893 + pax_flags |= MF_PAX_SEGMEXEC;
53894 +#endif
53895 +
53896 +#ifdef CONFIG_PAX_EMUTRAMP
53897 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
53898 + pax_flags |= MF_PAX_EMUTRAMP;
53899 +#endif
53900 +
53901 +#ifdef CONFIG_PAX_MPROTECT
53902 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
53903 + pax_flags |= MF_PAX_MPROTECT;
53904 +#endif
53905 +
53906 +#ifdef CONFIG_PAX_ASLR
53907 + if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
53908 + pax_flags |= MF_PAX_RANDMMAP;
53909 +#endif
53910 +
53911 +#else
53912 +
53913 +#ifdef CONFIG_PAX_PAGEEXEC
53914 + pax_flags |= MF_PAX_PAGEEXEC;
53915 +#endif
53916 +
53917 +#ifdef CONFIG_PAX_SEGMEXEC
53918 + pax_flags |= MF_PAX_SEGMEXEC;
53919 +#endif
53920 +
53921 +#ifdef CONFIG_PAX_MPROTECT
53922 + pax_flags |= MF_PAX_MPROTECT;
53923 +#endif
53924 +
53925 +#ifdef CONFIG_PAX_RANDMMAP
53926 + if (randomize_va_space)
53927 + pax_flags |= MF_PAX_RANDMMAP;
53928 +#endif
53929 +
53930 +#endif
53931 +
53932 + return pax_flags;
53933 +}
53934 +
53935 +static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
53936 +{
53937 +
53938 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
53939 + unsigned long i;
53940 +
53941 + for (i = 0UL; i < elf_ex->e_phnum; i++)
53942 + if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
53943 + if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
53944 + ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
53945 + ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
53946 + ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
53947 + ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
53948 + return ~0UL;
53949 +
53950 +#ifdef CONFIG_PAX_SOFTMODE
53951 + if (pax_softmode)
53952 + return pax_parse_pt_pax_softmode(&elf_phdata[i]);
53953 + else
53954 +#endif
53955 +
53956 + return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
53957 + break;
53958 + }
53959 +#endif
53960 +
53961 + return ~0UL;
53962 +}
53963 +
53964 +static unsigned long pax_parse_xattr_pax(struct file * const file)
53965 +{
53966 +
53967 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
53968 + ssize_t xattr_size, i;
53969 + unsigned char xattr_value[sizeof("pemrs") - 1];
53970 + unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
53971 +
53972 + xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
53973 + if (xattr_size <= 0 || xattr_size > sizeof xattr_value)
53974 + return ~0UL;
53975 +
53976 + for (i = 0; i < xattr_size; i++)
53977 + switch (xattr_value[i]) {
53978 + default:
53979 + return ~0UL;
53980 +
53981 +#define parse_flag(option1, option2, flag) \
53982 + case option1: \
53983 + if (pax_flags_hardmode & MF_PAX_##flag) \
53984 + return ~0UL; \
53985 + pax_flags_hardmode |= MF_PAX_##flag; \
53986 + break; \
53987 + case option2: \
53988 + if (pax_flags_softmode & MF_PAX_##flag) \
53989 + return ~0UL; \
53990 + pax_flags_softmode |= MF_PAX_##flag; \
53991 + break;
53992 +
53993 + parse_flag('p', 'P', PAGEEXEC);
53994 + parse_flag('e', 'E', EMUTRAMP);
53995 + parse_flag('m', 'M', MPROTECT);
53996 + parse_flag('r', 'R', RANDMMAP);
53997 + parse_flag('s', 'S', SEGMEXEC);
53998 +
53999 +#undef parse_flag
54000 + }
54001 +
54002 + if (pax_flags_hardmode & pax_flags_softmode)
54003 + return ~0UL;
54004 +
54005 +#ifdef CONFIG_PAX_SOFTMODE
54006 + if (pax_softmode)
54007 + return pax_parse_xattr_pax_softmode(pax_flags_softmode);
54008 + else
54009 +#endif
54010 +
54011 + return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
54012 +#else
54013 + return ~0UL;
54014 +#endif
54015 +
54016 +}
54017 +
54018 +static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
54019 +{
54020 + unsigned long pax_flags, pt_pax_flags, xattr_pax_flags;
54021 +
54022 + pax_flags = pax_parse_ei_pax(elf_ex);
54023 + pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
54024 + xattr_pax_flags = pax_parse_xattr_pax(file);
54025 +
54026 + if (pt_pax_flags == ~0UL)
54027 + pt_pax_flags = xattr_pax_flags;
54028 + else if (xattr_pax_flags == ~0UL)
54029 + xattr_pax_flags = pt_pax_flags;
54030 + if (pt_pax_flags != xattr_pax_flags)
54031 + return -EINVAL;
54032 + if (pt_pax_flags != ~0UL)
54033 + pax_flags = pt_pax_flags;
54034 +
54035 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
54036 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
54037 + if ((__supported_pte_mask & _PAGE_NX))
54038 + pax_flags &= ~MF_PAX_SEGMEXEC;
54039 + else
54040 + pax_flags &= ~MF_PAX_PAGEEXEC;
54041 + }
54042 +#endif
54043 +
54044 + if (0 > pax_check_flags(&pax_flags))
54045 + return -EINVAL;
54046 +
54047 + current->mm->pax_flags = pax_flags;
54048 + return 0;
54049 +}
54050 +#endif
54051 +
54052 /*
54053 * These are the functions used to load ELF style executables and shared
54054 * libraries. There is no binary dependent code anywhere else.
54055 @@ -554,6 +894,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
54056 {
54057 unsigned int random_variable = 0;
54058
54059 +#ifdef CONFIG_PAX_RANDUSTACK
54060 + if (current->mm->pax_flags & MF_PAX_RANDMMAP)
54061 + return stack_top - current->mm->delta_stack;
54062 +#endif
54063 +
54064 if ((current->flags & PF_RANDOMIZE) &&
54065 !(current->personality & ADDR_NO_RANDOMIZE)) {
54066 random_variable = get_random_int() & STACK_RND_MASK;
54067 @@ -572,7 +917,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
54068 unsigned long load_addr = 0, load_bias = 0;
54069 int load_addr_set = 0;
54070 char * elf_interpreter = NULL;
54071 - unsigned long error;
54072 + unsigned long error = 0;
54073 struct elf_phdr *elf_ppnt, *elf_phdata;
54074 unsigned long elf_bss, elf_brk;
54075 int retval, i;
54076 @@ -582,12 +927,12 @@ static int load_elf_binary(struct linux_binprm *bprm)
54077 unsigned long start_code, end_code, start_data, end_data;
54078 unsigned long reloc_func_desc __maybe_unused = 0;
54079 int executable_stack = EXSTACK_DEFAULT;
54080 - unsigned long def_flags = 0;
54081 struct pt_regs *regs = current_pt_regs();
54082 struct {
54083 struct elfhdr elf_ex;
54084 struct elfhdr interp_elf_ex;
54085 } *loc;
54086 + unsigned long pax_task_size;
54087
54088 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
54089 if (!loc) {
54090 @@ -723,11 +1068,82 @@ static int load_elf_binary(struct linux_binprm *bprm)
54091 goto out_free_dentry;
54092
54093 /* OK, This is the point of no return */
54094 - current->mm->def_flags = def_flags;
54095 + current->mm->def_flags = 0;
54096
54097 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
54098 may depend on the personality. */
54099 SET_PERSONALITY(loc->elf_ex);
54100 +
54101 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
54102 + current->mm->pax_flags = 0UL;
54103 +#endif
54104 +
54105 +#ifdef CONFIG_PAX_DLRESOLVE
54106 + current->mm->call_dl_resolve = 0UL;
54107 +#endif
54108 +
54109 +#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
54110 + current->mm->call_syscall = 0UL;
54111 +#endif
54112 +
54113 +#ifdef CONFIG_PAX_ASLR
54114 + current->mm->delta_mmap = 0UL;
54115 + current->mm->delta_stack = 0UL;
54116 +#endif
54117 +
54118 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
54119 + if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
54120 + send_sig(SIGKILL, current, 0);
54121 + goto out_free_dentry;
54122 + }
54123 +#endif
54124 +
54125 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
54126 + pax_set_initial_flags(bprm);
54127 +#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
54128 + if (pax_set_initial_flags_func)
54129 + (pax_set_initial_flags_func)(bprm);
54130 +#endif
54131 +
54132 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
54133 + if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
54134 + current->mm->context.user_cs_limit = PAGE_SIZE;
54135 + current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
54136 + }
54137 +#endif
54138 +
54139 +#ifdef CONFIG_PAX_SEGMEXEC
54140 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
54141 + current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
54142 + current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
54143 + pax_task_size = SEGMEXEC_TASK_SIZE;
54144 + current->mm->def_flags |= VM_NOHUGEPAGE;
54145 + } else
54146 +#endif
54147 +
54148 + pax_task_size = TASK_SIZE;
54149 +
54150 +#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
54151 + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
54152 + set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
54153 + put_cpu();
54154 + }
54155 +#endif
54156 +
54157 +#ifdef CONFIG_PAX_ASLR
54158 + if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
54159 + current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
54160 + current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
54161 + }
54162 +#endif
54163 +
54164 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
54165 + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
54166 + executable_stack = EXSTACK_DISABLE_X;
54167 + current->personality &= ~READ_IMPLIES_EXEC;
54168 + } else
54169 +#endif
54170 +
54171 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
54172 current->personality |= READ_IMPLIES_EXEC;
54173
54174 @@ -817,6 +1233,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
54175 #else
54176 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
54177 #endif
54178 +
54179 +#ifdef CONFIG_PAX_RANDMMAP
54180 + /* PaX: randomize base address at the default exe base if requested */
54181 + if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
54182 +#ifdef CONFIG_SPARC64
54183 + load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
54184 +#else
54185 + load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
54186 +#endif
54187 + load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
54188 + elf_flags |= MAP_FIXED;
54189 + }
54190 +#endif
54191 +
54192 }
54193
54194 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
54195 @@ -849,9 +1279,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
54196 * allowed task size. Note that p_filesz must always be
54197 * <= p_memsz so it is only necessary to check p_memsz.
54198 */
54199 - if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
54200 - elf_ppnt->p_memsz > TASK_SIZE ||
54201 - TASK_SIZE - elf_ppnt->p_memsz < k) {
54202 + if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
54203 + elf_ppnt->p_memsz > pax_task_size ||
54204 + pax_task_size - elf_ppnt->p_memsz < k) {
54205 /* set_brk can never work. Avoid overflows. */
54206 send_sig(SIGKILL, current, 0);
54207 retval = -EINVAL;
54208 @@ -890,17 +1320,45 @@ static int load_elf_binary(struct linux_binprm *bprm)
54209 goto out_free_dentry;
54210 }
54211 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
54212 - send_sig(SIGSEGV, current, 0);
54213 - retval = -EFAULT; /* Nobody gets to see this, but.. */
54214 - goto out_free_dentry;
54215 + /*
54216 + * This bss-zeroing can fail if the ELF
54217 + * file specifies odd protections. So
54218 + * we don't check the return value
54219 + */
54220 }
54221
54222 +#ifdef CONFIG_PAX_RANDMMAP
54223 + if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
54224 + unsigned long start, size, flags;
54225 + vm_flags_t vm_flags;
54226 +
54227 + start = ELF_PAGEALIGN(elf_brk);
54228 + size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
54229 + flags = MAP_FIXED | MAP_PRIVATE;
54230 + vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
54231 +
54232 + down_write(&current->mm->mmap_sem);
54233 + start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
54234 + retval = -ENOMEM;
54235 + if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
54236 +// if (current->personality & ADDR_NO_RANDOMIZE)
54237 +// vm_flags |= VM_READ | VM_MAYREAD;
54238 + start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
54239 + retval = IS_ERR_VALUE(start) ? start : 0;
54240 + }
54241 + up_write(&current->mm->mmap_sem);
54242 + if (retval == 0)
54243 + retval = set_brk(start + size, start + size + PAGE_SIZE);
54244 + if (retval < 0) {
54245 + send_sig(SIGKILL, current, 0);
54246 + goto out_free_dentry;
54247 + }
54248 + }
54249 +#endif
54250 +
54251 if (elf_interpreter) {
54252 - unsigned long interp_map_addr = 0;
54253 -
54254 elf_entry = load_elf_interp(&loc->interp_elf_ex,
54255 interpreter,
54256 - &interp_map_addr,
54257 load_bias);
54258 if (!IS_ERR((void *)elf_entry)) {
54259 /*
54260 @@ -1122,7 +1580,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
54261 * Decide what to dump of a segment, part, all or none.
54262 */
54263 static unsigned long vma_dump_size(struct vm_area_struct *vma,
54264 - unsigned long mm_flags)
54265 + unsigned long mm_flags, long signr)
54266 {
54267 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
54268
54269 @@ -1160,7 +1618,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
54270 if (vma->vm_file == NULL)
54271 return 0;
54272
54273 - if (FILTER(MAPPED_PRIVATE))
54274 + if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
54275 goto whole;
54276
54277 /*
54278 @@ -1385,9 +1843,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
54279 {
54280 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
54281 int i = 0;
54282 - do
54283 + do {
54284 i += 2;
54285 - while (auxv[i - 2] != AT_NULL);
54286 + } while (auxv[i - 2] != AT_NULL);
54287 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
54288 }
54289
54290 @@ -1396,7 +1854,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
54291 {
54292 mm_segment_t old_fs = get_fs();
54293 set_fs(KERNEL_DS);
54294 - copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
54295 + copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
54296 set_fs(old_fs);
54297 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
54298 }
54299 @@ -2023,14 +2481,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
54300 }
54301
54302 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
54303 - unsigned long mm_flags)
54304 + struct coredump_params *cprm)
54305 {
54306 struct vm_area_struct *vma;
54307 size_t size = 0;
54308
54309 for (vma = first_vma(current, gate_vma); vma != NULL;
54310 vma = next_vma(vma, gate_vma))
54311 - size += vma_dump_size(vma, mm_flags);
54312 + size += vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
54313 return size;
54314 }
54315
54316 @@ -2123,7 +2581,7 @@ static int elf_core_dump(struct coredump_params *cprm)
54317
54318 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
54319
54320 - offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
54321 + offset += elf_core_vma_data_size(gate_vma, cprm);
54322 offset += elf_core_extra_data_size();
54323 e_shoff = offset;
54324
54325 @@ -2137,10 +2595,12 @@ static int elf_core_dump(struct coredump_params *cprm)
54326 offset = dataoff;
54327
54328 size += sizeof(*elf);
54329 + gr_learn_resource(current, RLIMIT_CORE, size, 1);
54330 if (size > cprm->limit || !dump_write(cprm->file, elf, sizeof(*elf)))
54331 goto end_coredump;
54332
54333 size += sizeof(*phdr4note);
54334 + gr_learn_resource(current, RLIMIT_CORE, size, 1);
54335 if (size > cprm->limit
54336 || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
54337 goto end_coredump;
54338 @@ -2154,7 +2614,7 @@ static int elf_core_dump(struct coredump_params *cprm)
54339 phdr.p_offset = offset;
54340 phdr.p_vaddr = vma->vm_start;
54341 phdr.p_paddr = 0;
54342 - phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
54343 + phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
54344 phdr.p_memsz = vma->vm_end - vma->vm_start;
54345 offset += phdr.p_filesz;
54346 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
54347 @@ -2165,6 +2625,7 @@ static int elf_core_dump(struct coredump_params *cprm)
54348 phdr.p_align = ELF_EXEC_PAGESIZE;
54349
54350 size += sizeof(phdr);
54351 + gr_learn_resource(current, RLIMIT_CORE, size, 1);
54352 if (size > cprm->limit
54353 || !dump_write(cprm->file, &phdr, sizeof(phdr)))
54354 goto end_coredump;
54355 @@ -2189,7 +2650,7 @@ static int elf_core_dump(struct coredump_params *cprm)
54356 unsigned long addr;
54357 unsigned long end;
54358
54359 - end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
54360 + end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
54361
54362 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
54363 struct page *page;
54364 @@ -2198,6 +2659,7 @@ static int elf_core_dump(struct coredump_params *cprm)
54365 page = get_dump_page(addr);
54366 if (page) {
54367 void *kaddr = kmap(page);
54368 + gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1);
54369 stop = ((size += PAGE_SIZE) > cprm->limit) ||
54370 !dump_write(cprm->file, kaddr,
54371 PAGE_SIZE);
54372 @@ -2215,6 +2677,7 @@ static int elf_core_dump(struct coredump_params *cprm)
54373
54374 if (e_phnum == PN_XNUM) {
54375 size += sizeof(*shdr4extnum);
54376 + gr_learn_resource(current, RLIMIT_CORE, size, 1);
54377 if (size > cprm->limit
54378 || !dump_write(cprm->file, shdr4extnum,
54379 sizeof(*shdr4extnum)))
54380 @@ -2235,6 +2698,167 @@ out:
54381
54382 #endif /* CONFIG_ELF_CORE */
54383
54384 +#ifdef CONFIG_PAX_MPROTECT
54385 +/* PaX: non-PIC ELF libraries need relocations on their executable segments
54386 + * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
54387 + * we'll remove VM_MAYWRITE for good on RELRO segments.
54388 + *
54389 + * The checks favour ld-linux.so behaviour which operates on a per ELF segment
54390 + * basis because we want to allow the common case and not the special ones.
54391 + */
54392 +static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
54393 +{
54394 + struct elfhdr elf_h;
54395 + struct elf_phdr elf_p;
54396 + unsigned long i;
54397 + unsigned long oldflags;
54398 + bool is_textrel_rw, is_textrel_rx, is_relro;
54399 +
54400 + if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
54401 + return;
54402 +
54403 + oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
54404 + newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
54405 +
54406 +#ifdef CONFIG_PAX_ELFRELOCS
54407 + /* possible TEXTREL */
54408 + is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
54409 + is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
54410 +#else
54411 + is_textrel_rw = false;
54412 + is_textrel_rx = false;
54413 +#endif
54414 +
54415 + /* possible RELRO */
54416 + is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
54417 +
54418 + if (!is_textrel_rw && !is_textrel_rx && !is_relro)
54419 + return;
54420 +
54421 + if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
54422 + memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
54423 +
54424 +#ifdef CONFIG_PAX_ETEXECRELOCS
54425 + ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
54426 +#else
54427 + ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
54428 +#endif
54429 +
54430 + (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
54431 + !elf_check_arch(&elf_h) ||
54432 + elf_h.e_phentsize != sizeof(struct elf_phdr) ||
54433 + elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
54434 + return;
54435 +
54436 + for (i = 0UL; i < elf_h.e_phnum; i++) {
54437 + if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
54438 + return;
54439 + switch (elf_p.p_type) {
54440 + case PT_DYNAMIC:
54441 + if (!is_textrel_rw && !is_textrel_rx)
54442 + continue;
54443 + i = 0UL;
54444 + while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
54445 + elf_dyn dyn;
54446 +
54447 + if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
54448 + break;
54449 + if (dyn.d_tag == DT_NULL)
54450 + break;
54451 + if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
54452 + gr_log_textrel(vma);
54453 + if (is_textrel_rw)
54454 + vma->vm_flags |= VM_MAYWRITE;
54455 + else
54456 + /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
54457 + vma->vm_flags &= ~VM_MAYWRITE;
54458 + break;
54459 + }
54460 + i++;
54461 + }
54462 + is_textrel_rw = false;
54463 + is_textrel_rx = false;
54464 + continue;
54465 +
54466 + case PT_GNU_RELRO:
54467 + if (!is_relro)
54468 + continue;
54469 + if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
54470 + vma->vm_flags &= ~VM_MAYWRITE;
54471 + is_relro = false;
54472 + continue;
54473 +
54474 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
54475 + case PT_PAX_FLAGS: {
54476 + const char *msg_mprotect = "", *msg_emutramp = "";
54477 + char *buffer_lib, *buffer_exe;
54478 +
54479 + if (elf_p.p_flags & PF_NOMPROTECT)
54480 + msg_mprotect = "MPROTECT disabled";
54481 +
54482 +#ifdef CONFIG_PAX_EMUTRAMP
54483 + if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
54484 + msg_emutramp = "EMUTRAMP enabled";
54485 +#endif
54486 +
54487 + if (!msg_mprotect[0] && !msg_emutramp[0])
54488 + continue;
54489 +
54490 + if (!printk_ratelimit())
54491 + continue;
54492 +
54493 + buffer_lib = (char *)__get_free_page(GFP_KERNEL);
54494 + buffer_exe = (char *)__get_free_page(GFP_KERNEL);
54495 + if (buffer_lib && buffer_exe) {
54496 + char *path_lib, *path_exe;
54497 +
54498 + path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
54499 + path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
54500 +
54501 + pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
54502 + (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
54503 +
54504 + }
54505 + free_page((unsigned long)buffer_exe);
54506 + free_page((unsigned long)buffer_lib);
54507 + continue;
54508 + }
54509 +#endif
54510 +
54511 + }
54512 + }
54513 +}
54514 +#endif
54515 +
54516 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
54517 +
54518 +extern int grsec_enable_log_rwxmaps;
54519 +
54520 +static void elf_handle_mmap(struct file *file)
54521 +{
54522 + struct elfhdr elf_h;
54523 + struct elf_phdr elf_p;
54524 + unsigned long i;
54525 +
54526 + if (!grsec_enable_log_rwxmaps)
54527 + return;
54528 +
54529 + if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
54530 + memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
54531 + (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
54532 + elf_h.e_phentsize != sizeof(struct elf_phdr) ||
54533 + elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
54534 + return;
54535 +
54536 + for (i = 0UL; i < elf_h.e_phnum; i++) {
54537 + if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
54538 + return;
54539 + if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
54540 + gr_log_ptgnustack(file);
54541 + }
54542 +}
54543 +#endif
54544 +
54545 static int __init init_elf_binfmt(void)
54546 {
54547 register_binfmt(&elf_format);
54548 diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
54549 index d50bbe5..af3b649 100644
54550 --- a/fs/binfmt_flat.c
54551 +++ b/fs/binfmt_flat.c
54552 @@ -566,7 +566,9 @@ static int load_flat_file(struct linux_binprm * bprm,
54553 realdatastart = (unsigned long) -ENOMEM;
54554 printk("Unable to allocate RAM for process data, errno %d\n",
54555 (int)-realdatastart);
54556 + down_write(&current->mm->mmap_sem);
54557 vm_munmap(textpos, text_len);
54558 + up_write(&current->mm->mmap_sem);
54559 ret = realdatastart;
54560 goto err;
54561 }
54562 @@ -590,8 +592,10 @@ static int load_flat_file(struct linux_binprm * bprm,
54563 }
54564 if (IS_ERR_VALUE(result)) {
54565 printk("Unable to read data+bss, errno %d\n", (int)-result);
54566 + down_write(&current->mm->mmap_sem);
54567 vm_munmap(textpos, text_len);
54568 vm_munmap(realdatastart, len);
54569 + up_write(&current->mm->mmap_sem);
54570 ret = result;
54571 goto err;
54572 }
54573 @@ -653,8 +657,10 @@ static int load_flat_file(struct linux_binprm * bprm,
54574 }
54575 if (IS_ERR_VALUE(result)) {
54576 printk("Unable to read code+data+bss, errno %d\n",(int)-result);
54577 + down_write(&current->mm->mmap_sem);
54578 vm_munmap(textpos, text_len + data_len + extra +
54579 MAX_SHARED_LIBS * sizeof(unsigned long));
54580 + up_write(&current->mm->mmap_sem);
54581 ret = result;
54582 goto err;
54583 }
54584 diff --git a/fs/bio.c b/fs/bio.c
54585 index ea5035d..a2932eb 100644
54586 --- a/fs/bio.c
54587 +++ b/fs/bio.c
54588 @@ -1106,7 +1106,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
54589 /*
54590 * Overflow, abort
54591 */
54592 - if (end < start)
54593 + if (end < start || end - start > INT_MAX - nr_pages)
54594 return ERR_PTR(-EINVAL);
54595
54596 nr_pages += end - start;
54597 @@ -1240,7 +1240,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
54598 /*
54599 * Overflow, abort
54600 */
54601 - if (end < start)
54602 + if (end < start || end - start > INT_MAX - nr_pages)
54603 return ERR_PTR(-EINVAL);
54604
54605 nr_pages += end - start;
54606 @@ -1502,7 +1502,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
54607 const int read = bio_data_dir(bio) == READ;
54608 struct bio_map_data *bmd = bio->bi_private;
54609 int i;
54610 - char *p = bmd->sgvecs[0].iov_base;
54611 + char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
54612
54613 bio_for_each_segment_all(bvec, bio, i) {
54614 char *addr = page_address(bvec->bv_page);
54615 diff --git a/fs/block_dev.c b/fs/block_dev.c
54616 index 1e86823..8e34695 100644
54617 --- a/fs/block_dev.c
54618 +++ b/fs/block_dev.c
54619 @@ -637,7 +637,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
54620 else if (bdev->bd_contains == bdev)
54621 return true; /* is a whole device which isn't held */
54622
54623 - else if (whole->bd_holder == bd_may_claim)
54624 + else if (whole->bd_holder == (void *)bd_may_claim)
54625 return true; /* is a partition of a device that is being partitioned */
54626 else if (whole->bd_holder != NULL)
54627 return false; /* is a partition of a held device */
54628 diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
54629 index b544a44..f3fb987 100644
54630 --- a/fs/btrfs/ctree.c
54631 +++ b/fs/btrfs/ctree.c
54632 @@ -1028,9 +1028,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
54633 free_extent_buffer(buf);
54634 add_root_to_dirty_list(root);
54635 } else {
54636 - if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
54637 - parent_start = parent->start;
54638 - else
54639 + if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
54640 + if (parent)
54641 + parent_start = parent->start;
54642 + else
54643 + parent_start = 0;
54644 + } else
54645 parent_start = 0;
54646
54647 WARN_ON(trans->transid != btrfs_header_generation(parent));
54648 diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
54649 index cbd9523..5cca781 100644
54650 --- a/fs/btrfs/delayed-inode.c
54651 +++ b/fs/btrfs/delayed-inode.c
54652 @@ -459,7 +459,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
54653
54654 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
54655 {
54656 - int seq = atomic_inc_return(&delayed_root->items_seq);
54657 + int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
54658 if ((atomic_dec_return(&delayed_root->items) <
54659 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
54660 waitqueue_active(&delayed_root->wait))
54661 @@ -1378,7 +1378,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
54662 static int refs_newer(struct btrfs_delayed_root *delayed_root,
54663 int seq, int count)
54664 {
54665 - int val = atomic_read(&delayed_root->items_seq);
54666 + int val = atomic_read_unchecked(&delayed_root->items_seq);
54667
54668 if (val < seq || val >= seq + count)
54669 return 1;
54670 @@ -1395,7 +1395,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
54671 if (atomic_read(&delayed_root->items) < BTRFS_DELAYED_BACKGROUND)
54672 return;
54673
54674 - seq = atomic_read(&delayed_root->items_seq);
54675 + seq = atomic_read_unchecked(&delayed_root->items_seq);
54676
54677 if (atomic_read(&delayed_root->items) >= BTRFS_DELAYED_WRITEBACK) {
54678 int ret;
54679 diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
54680 index a4b38f9..f86a509 100644
54681 --- a/fs/btrfs/delayed-inode.h
54682 +++ b/fs/btrfs/delayed-inode.h
54683 @@ -43,7 +43,7 @@ struct btrfs_delayed_root {
54684 */
54685 struct list_head prepare_list;
54686 atomic_t items; /* for delayed items */
54687 - atomic_t items_seq; /* for delayed items */
54688 + atomic_unchecked_t items_seq; /* for delayed items */
54689 int nodes; /* for delayed nodes */
54690 wait_queue_head_t wait;
54691 };
54692 @@ -87,7 +87,7 @@ static inline void btrfs_init_delayed_root(
54693 struct btrfs_delayed_root *delayed_root)
54694 {
54695 atomic_set(&delayed_root->items, 0);
54696 - atomic_set(&delayed_root->items_seq, 0);
54697 + atomic_set_unchecked(&delayed_root->items_seq, 0);
54698 delayed_root->nodes = 0;
54699 spin_lock_init(&delayed_root->lock);
54700 init_waitqueue_head(&delayed_root->wait);
54701 diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
54702 index 8747feb..ad1655c 100644
54703 --- a/fs/btrfs/ioctl.c
54704 +++ b/fs/btrfs/ioctl.c
54705 @@ -3465,9 +3465,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
54706 for (i = 0; i < num_types; i++) {
54707 struct btrfs_space_info *tmp;
54708
54709 + /* Don't copy in more than we allocated */
54710 if (!slot_count)
54711 break;
54712
54713 + slot_count--;
54714 +
54715 info = NULL;
54716 rcu_read_lock();
54717 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
54718 @@ -3489,10 +3492,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
54719 memcpy(dest, &space, sizeof(space));
54720 dest++;
54721 space_args.total_spaces++;
54722 - slot_count--;
54723 }
54724 - if (!slot_count)
54725 - break;
54726 }
54727 up_read(&info->groups_sem);
54728 }
54729 diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
54730 index e913328..a34fb36 100644
54731 --- a/fs/btrfs/super.c
54732 +++ b/fs/btrfs/super.c
54733 @@ -266,7 +266,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
54734 function, line, errstr);
54735 return;
54736 }
54737 - ACCESS_ONCE(trans->transaction->aborted) = errno;
54738 + ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
54739 /* Wake up anybody who may be waiting on this transaction */
54740 wake_up(&root->fs_info->transaction_wait);
54741 wake_up(&root->fs_info->transaction_blocked_wait);
54742 diff --git a/fs/buffer.c b/fs/buffer.c
54743 index 6024877..7bd000a 100644
54744 --- a/fs/buffer.c
54745 +++ b/fs/buffer.c
54746 @@ -3426,7 +3426,7 @@ void __init buffer_init(void)
54747 bh_cachep = kmem_cache_create("buffer_head",
54748 sizeof(struct buffer_head), 0,
54749 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
54750 - SLAB_MEM_SPREAD),
54751 + SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
54752 NULL);
54753
54754 /*
54755 diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
54756 index 622f469..e8d2d55 100644
54757 --- a/fs/cachefiles/bind.c
54758 +++ b/fs/cachefiles/bind.c
54759 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
54760 args);
54761
54762 /* start by checking things over */
54763 - ASSERT(cache->fstop_percent >= 0 &&
54764 - cache->fstop_percent < cache->fcull_percent &&
54765 + ASSERT(cache->fstop_percent < cache->fcull_percent &&
54766 cache->fcull_percent < cache->frun_percent &&
54767 cache->frun_percent < 100);
54768
54769 - ASSERT(cache->bstop_percent >= 0 &&
54770 - cache->bstop_percent < cache->bcull_percent &&
54771 + ASSERT(cache->bstop_percent < cache->bcull_percent &&
54772 cache->bcull_percent < cache->brun_percent &&
54773 cache->brun_percent < 100);
54774
54775 diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
54776 index 0a1467b..6a53245 100644
54777 --- a/fs/cachefiles/daemon.c
54778 +++ b/fs/cachefiles/daemon.c
54779 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
54780 if (n > buflen)
54781 return -EMSGSIZE;
54782
54783 - if (copy_to_user(_buffer, buffer, n) != 0)
54784 + if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
54785 return -EFAULT;
54786
54787 return n;
54788 @@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
54789 if (test_bit(CACHEFILES_DEAD, &cache->flags))
54790 return -EIO;
54791
54792 - if (datalen < 0 || datalen > PAGE_SIZE - 1)
54793 + if (datalen > PAGE_SIZE - 1)
54794 return -EOPNOTSUPP;
54795
54796 /* drag the command string into the kernel so we can parse it */
54797 @@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
54798 if (args[0] != '%' || args[1] != '\0')
54799 return -EINVAL;
54800
54801 - if (fstop < 0 || fstop >= cache->fcull_percent)
54802 + if (fstop >= cache->fcull_percent)
54803 return cachefiles_daemon_range_error(cache, args);
54804
54805 cache->fstop_percent = fstop;
54806 @@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
54807 if (args[0] != '%' || args[1] != '\0')
54808 return -EINVAL;
54809
54810 - if (bstop < 0 || bstop >= cache->bcull_percent)
54811 + if (bstop >= cache->bcull_percent)
54812 return cachefiles_daemon_range_error(cache, args);
54813
54814 cache->bstop_percent = bstop;
54815 diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
54816 index 5349473..d6c0b93 100644
54817 --- a/fs/cachefiles/internal.h
54818 +++ b/fs/cachefiles/internal.h
54819 @@ -59,7 +59,7 @@ struct cachefiles_cache {
54820 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
54821 struct rb_root active_nodes; /* active nodes (can't be culled) */
54822 rwlock_t active_lock; /* lock for active_nodes */
54823 - atomic_t gravecounter; /* graveyard uniquifier */
54824 + atomic_unchecked_t gravecounter; /* graveyard uniquifier */
54825 unsigned frun_percent; /* when to stop culling (% files) */
54826 unsigned fcull_percent; /* when to start culling (% files) */
54827 unsigned fstop_percent; /* when to stop allocating (% files) */
54828 @@ -171,19 +171,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
54829 * proc.c
54830 */
54831 #ifdef CONFIG_CACHEFILES_HISTOGRAM
54832 -extern atomic_t cachefiles_lookup_histogram[HZ];
54833 -extern atomic_t cachefiles_mkdir_histogram[HZ];
54834 -extern atomic_t cachefiles_create_histogram[HZ];
54835 +extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
54836 +extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
54837 +extern atomic_unchecked_t cachefiles_create_histogram[HZ];
54838
54839 extern int __init cachefiles_proc_init(void);
54840 extern void cachefiles_proc_cleanup(void);
54841 static inline
54842 -void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
54843 +void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
54844 {
54845 unsigned long jif = jiffies - start_jif;
54846 if (jif >= HZ)
54847 jif = HZ - 1;
54848 - atomic_inc(&histogram[jif]);
54849 + atomic_inc_unchecked(&histogram[jif]);
54850 }
54851
54852 #else
54853 diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
54854 index f4a08d7..5aa4599 100644
54855 --- a/fs/cachefiles/namei.c
54856 +++ b/fs/cachefiles/namei.c
54857 @@ -317,7 +317,7 @@ try_again:
54858 /* first step is to make up a grave dentry in the graveyard */
54859 sprintf(nbuffer, "%08x%08x",
54860 (uint32_t) get_seconds(),
54861 - (uint32_t) atomic_inc_return(&cache->gravecounter));
54862 + (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
54863
54864 /* do the multiway lock magic */
54865 trap = lock_rename(cache->graveyard, dir);
54866 diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
54867 index eccd339..4c1d995 100644
54868 --- a/fs/cachefiles/proc.c
54869 +++ b/fs/cachefiles/proc.c
54870 @@ -14,9 +14,9 @@
54871 #include <linux/seq_file.h>
54872 #include "internal.h"
54873
54874 -atomic_t cachefiles_lookup_histogram[HZ];
54875 -atomic_t cachefiles_mkdir_histogram[HZ];
54876 -atomic_t cachefiles_create_histogram[HZ];
54877 +atomic_unchecked_t cachefiles_lookup_histogram[HZ];
54878 +atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
54879 +atomic_unchecked_t cachefiles_create_histogram[HZ];
54880
54881 /*
54882 * display the latency histogram
54883 @@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
54884 return 0;
54885 default:
54886 index = (unsigned long) v - 3;
54887 - x = atomic_read(&cachefiles_lookup_histogram[index]);
54888 - y = atomic_read(&cachefiles_mkdir_histogram[index]);
54889 - z = atomic_read(&cachefiles_create_histogram[index]);
54890 + x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
54891 + y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
54892 + z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
54893 if (x == 0 && y == 0 && z == 0)
54894 return 0;
54895
54896 diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
54897 index ebaff36..7e3ea26 100644
54898 --- a/fs/cachefiles/rdwr.c
54899 +++ b/fs/cachefiles/rdwr.c
54900 @@ -950,7 +950,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
54901 old_fs = get_fs();
54902 set_fs(KERNEL_DS);
54903 ret = file->f_op->write(
54904 - file, (const void __user *) data, len, &pos);
54905 + file, (const void __force_user *) data, len, &pos);
54906 set_fs(old_fs);
54907 kunmap(page);
54908 file_end_write(file);
54909 diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
54910 index 868b61d..58835a5 100644
54911 --- a/fs/ceph/dir.c
54912 +++ b/fs/ceph/dir.c
54913 @@ -240,7 +240,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
54914 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
54915 struct ceph_mds_client *mdsc = fsc->mdsc;
54916 unsigned frag = fpos_frag(ctx->pos);
54917 - int off = fpos_off(ctx->pos);
54918 + unsigned int off = fpos_off(ctx->pos);
54919 int err;
54920 u32 ftype;
54921 struct ceph_mds_reply_info_parsed *rinfo;
54922 diff --git a/fs/ceph/super.c b/fs/ceph/super.c
54923 index 6a0951e..03fac6d 100644
54924 --- a/fs/ceph/super.c
54925 +++ b/fs/ceph/super.c
54926 @@ -870,7 +870,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
54927 /*
54928 * construct our own bdi so we can control readahead, etc.
54929 */
54930 -static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
54931 +static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
54932
54933 static int ceph_register_bdi(struct super_block *sb,
54934 struct ceph_fs_client *fsc)
54935 @@ -887,7 +887,7 @@ static int ceph_register_bdi(struct super_block *sb,
54936 default_backing_dev_info.ra_pages;
54937
54938 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
54939 - atomic_long_inc_return(&bdi_seq));
54940 + atomic_long_inc_return_unchecked(&bdi_seq));
54941 if (!err)
54942 sb->s_bdi = &fsc->backing_dev_info;
54943 return err;
54944 diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
54945 index f3ac415..3d2420c 100644
54946 --- a/fs/cifs/cifs_debug.c
54947 +++ b/fs/cifs/cifs_debug.c
54948 @@ -286,8 +286,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
54949
54950 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
54951 #ifdef CONFIG_CIFS_STATS2
54952 - atomic_set(&totBufAllocCount, 0);
54953 - atomic_set(&totSmBufAllocCount, 0);
54954 + atomic_set_unchecked(&totBufAllocCount, 0);
54955 + atomic_set_unchecked(&totSmBufAllocCount, 0);
54956 #endif /* CONFIG_CIFS_STATS2 */
54957 spin_lock(&cifs_tcp_ses_lock);
54958 list_for_each(tmp1, &cifs_tcp_ses_list) {
54959 @@ -300,7 +300,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
54960 tcon = list_entry(tmp3,
54961 struct cifs_tcon,
54962 tcon_list);
54963 - atomic_set(&tcon->num_smbs_sent, 0);
54964 + atomic_set_unchecked(&tcon->num_smbs_sent, 0);
54965 if (server->ops->clear_stats)
54966 server->ops->clear_stats(tcon);
54967 }
54968 @@ -332,8 +332,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
54969 smBufAllocCount.counter, cifs_min_small);
54970 #ifdef CONFIG_CIFS_STATS2
54971 seq_printf(m, "Total Large %d Small %d Allocations\n",
54972 - atomic_read(&totBufAllocCount),
54973 - atomic_read(&totSmBufAllocCount));
54974 + atomic_read_unchecked(&totBufAllocCount),
54975 + atomic_read_unchecked(&totSmBufAllocCount));
54976 #endif /* CONFIG_CIFS_STATS2 */
54977
54978 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
54979 @@ -362,7 +362,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
54980 if (tcon->need_reconnect)
54981 seq_puts(m, "\tDISCONNECTED ");
54982 seq_printf(m, "\nSMBs: %d",
54983 - atomic_read(&tcon->num_smbs_sent));
54984 + atomic_read_unchecked(&tcon->num_smbs_sent));
54985 if (server->ops->print_stats)
54986 server->ops->print_stats(m, tcon);
54987 }
54988 diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
54989 index 77fc5e1..e3d13e6 100644
54990 --- a/fs/cifs/cifsfs.c
54991 +++ b/fs/cifs/cifsfs.c
54992 @@ -1056,7 +1056,7 @@ cifs_init_request_bufs(void)
54993 */
54994 cifs_req_cachep = kmem_cache_create("cifs_request",
54995 CIFSMaxBufSize + max_hdr_size, 0,
54996 - SLAB_HWCACHE_ALIGN, NULL);
54997 + SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
54998 if (cifs_req_cachep == NULL)
54999 return -ENOMEM;
55000
55001 @@ -1083,7 +1083,7 @@ cifs_init_request_bufs(void)
55002 efficient to alloc 1 per page off the slab compared to 17K (5page)
55003 alloc of large cifs buffers even when page debugging is on */
55004 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
55005 - MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
55006 + MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
55007 NULL);
55008 if (cifs_sm_req_cachep == NULL) {
55009 mempool_destroy(cifs_req_poolp);
55010 @@ -1168,8 +1168,8 @@ init_cifs(void)
55011 atomic_set(&bufAllocCount, 0);
55012 atomic_set(&smBufAllocCount, 0);
55013 #ifdef CONFIG_CIFS_STATS2
55014 - atomic_set(&totBufAllocCount, 0);
55015 - atomic_set(&totSmBufAllocCount, 0);
55016 + atomic_set_unchecked(&totBufAllocCount, 0);
55017 + atomic_set_unchecked(&totSmBufAllocCount, 0);
55018 #endif /* CONFIG_CIFS_STATS2 */
55019
55020 atomic_set(&midCount, 0);
55021 diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
55022 index c8e03f8..75362f6 100644
55023 --- a/fs/cifs/cifsglob.h
55024 +++ b/fs/cifs/cifsglob.h
55025 @@ -758,35 +758,35 @@ struct cifs_tcon {
55026 __u16 Flags; /* optional support bits */
55027 enum statusEnum tidStatus;
55028 #ifdef CONFIG_CIFS_STATS
55029 - atomic_t num_smbs_sent;
55030 + atomic_unchecked_t num_smbs_sent;
55031 union {
55032 struct {
55033 - atomic_t num_writes;
55034 - atomic_t num_reads;
55035 - atomic_t num_flushes;
55036 - atomic_t num_oplock_brks;
55037 - atomic_t num_opens;
55038 - atomic_t num_closes;
55039 - atomic_t num_deletes;
55040 - atomic_t num_mkdirs;
55041 - atomic_t num_posixopens;
55042 - atomic_t num_posixmkdirs;
55043 - atomic_t num_rmdirs;
55044 - atomic_t num_renames;
55045 - atomic_t num_t2renames;
55046 - atomic_t num_ffirst;
55047 - atomic_t num_fnext;
55048 - atomic_t num_fclose;
55049 - atomic_t num_hardlinks;
55050 - atomic_t num_symlinks;
55051 - atomic_t num_locks;
55052 - atomic_t num_acl_get;
55053 - atomic_t num_acl_set;
55054 + atomic_unchecked_t num_writes;
55055 + atomic_unchecked_t num_reads;
55056 + atomic_unchecked_t num_flushes;
55057 + atomic_unchecked_t num_oplock_brks;
55058 + atomic_unchecked_t num_opens;
55059 + atomic_unchecked_t num_closes;
55060 + atomic_unchecked_t num_deletes;
55061 + atomic_unchecked_t num_mkdirs;
55062 + atomic_unchecked_t num_posixopens;
55063 + atomic_unchecked_t num_posixmkdirs;
55064 + atomic_unchecked_t num_rmdirs;
55065 + atomic_unchecked_t num_renames;
55066 + atomic_unchecked_t num_t2renames;
55067 + atomic_unchecked_t num_ffirst;
55068 + atomic_unchecked_t num_fnext;
55069 + atomic_unchecked_t num_fclose;
55070 + atomic_unchecked_t num_hardlinks;
55071 + atomic_unchecked_t num_symlinks;
55072 + atomic_unchecked_t num_locks;
55073 + atomic_unchecked_t num_acl_get;
55074 + atomic_unchecked_t num_acl_set;
55075 } cifs_stats;
55076 #ifdef CONFIG_CIFS_SMB2
55077 struct {
55078 - atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
55079 - atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
55080 + atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
55081 + atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
55082 } smb2_stats;
55083 #endif /* CONFIG_CIFS_SMB2 */
55084 } stats;
55085 @@ -1111,7 +1111,7 @@ convert_delimiter(char *path, char delim)
55086 }
55087
55088 #ifdef CONFIG_CIFS_STATS
55089 -#define cifs_stats_inc atomic_inc
55090 +#define cifs_stats_inc atomic_inc_unchecked
55091
55092 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
55093 unsigned int bytes)
55094 @@ -1477,8 +1477,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
55095 /* Various Debug counters */
55096 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
55097 #ifdef CONFIG_CIFS_STATS2
55098 -GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
55099 -GLOBAL_EXTERN atomic_t totSmBufAllocCount;
55100 +GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
55101 +GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
55102 #endif
55103 GLOBAL_EXTERN atomic_t smBufAllocCount;
55104 GLOBAL_EXTERN atomic_t midCount;
55105 diff --git a/fs/cifs/file.c b/fs/cifs/file.c
55106 index 7ddddf2..2e12dbc 100644
55107 --- a/fs/cifs/file.c
55108 +++ b/fs/cifs/file.c
55109 @@ -1900,10 +1900,14 @@ static int cifs_writepages(struct address_space *mapping,
55110 index = mapping->writeback_index; /* Start from prev offset */
55111 end = -1;
55112 } else {
55113 - index = wbc->range_start >> PAGE_CACHE_SHIFT;
55114 - end = wbc->range_end >> PAGE_CACHE_SHIFT;
55115 - if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
55116 + if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
55117 range_whole = true;
55118 + index = 0;
55119 + end = ULONG_MAX;
55120 + } else {
55121 + index = wbc->range_start >> PAGE_CACHE_SHIFT;
55122 + end = wbc->range_end >> PAGE_CACHE_SHIFT;
55123 + }
55124 scanned = true;
55125 }
55126 retry:
55127 diff --git a/fs/cifs/link.c b/fs/cifs/link.c
55128 index 7e36ceb..109252f 100644
55129 --- a/fs/cifs/link.c
55130 +++ b/fs/cifs/link.c
55131 @@ -624,7 +624,7 @@ symlink_exit:
55132
55133 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
55134 {
55135 - char *p = nd_get_link(nd);
55136 + const char *p = nd_get_link(nd);
55137 if (!IS_ERR(p))
55138 kfree(p);
55139 }
55140 diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
55141 index 138a011..cf9e13a 100644
55142 --- a/fs/cifs/misc.c
55143 +++ b/fs/cifs/misc.c
55144 @@ -170,7 +170,7 @@ cifs_buf_get(void)
55145 memset(ret_buf, 0, buf_size + 3);
55146 atomic_inc(&bufAllocCount);
55147 #ifdef CONFIG_CIFS_STATS2
55148 - atomic_inc(&totBufAllocCount);
55149 + atomic_inc_unchecked(&totBufAllocCount);
55150 #endif /* CONFIG_CIFS_STATS2 */
55151 }
55152
55153 @@ -205,7 +205,7 @@ cifs_small_buf_get(void)
55154 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
55155 atomic_inc(&smBufAllocCount);
55156 #ifdef CONFIG_CIFS_STATS2
55157 - atomic_inc(&totSmBufAllocCount);
55158 + atomic_inc_unchecked(&totSmBufAllocCount);
55159 #endif /* CONFIG_CIFS_STATS2 */
55160
55161 }
55162 diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
55163 index e50554b..c011413 100644
55164 --- a/fs/cifs/smb1ops.c
55165 +++ b/fs/cifs/smb1ops.c
55166 @@ -609,27 +609,27 @@ static void
55167 cifs_clear_stats(struct cifs_tcon *tcon)
55168 {
55169 #ifdef CONFIG_CIFS_STATS
55170 - atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
55171 - atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
55172 - atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
55173 - atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
55174 - atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
55175 - atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
55176 - atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
55177 - atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
55178 - atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
55179 - atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
55180 - atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
55181 - atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
55182 - atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
55183 - atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
55184 - atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
55185 - atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
55186 - atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
55187 - atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
55188 - atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
55189 - atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
55190 - atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
55191 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
55192 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
55193 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
55194 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
55195 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
55196 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
55197 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
55198 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
55199 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
55200 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
55201 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
55202 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
55203 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
55204 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
55205 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
55206 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
55207 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
55208 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
55209 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
55210 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
55211 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
55212 #endif
55213 }
55214
55215 @@ -638,36 +638,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
55216 {
55217 #ifdef CONFIG_CIFS_STATS
55218 seq_printf(m, " Oplocks breaks: %d",
55219 - atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
55220 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
55221 seq_printf(m, "\nReads: %d Bytes: %llu",
55222 - atomic_read(&tcon->stats.cifs_stats.num_reads),
55223 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
55224 (long long)(tcon->bytes_read));
55225 seq_printf(m, "\nWrites: %d Bytes: %llu",
55226 - atomic_read(&tcon->stats.cifs_stats.num_writes),
55227 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
55228 (long long)(tcon->bytes_written));
55229 seq_printf(m, "\nFlushes: %d",
55230 - atomic_read(&tcon->stats.cifs_stats.num_flushes));
55231 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
55232 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
55233 - atomic_read(&tcon->stats.cifs_stats.num_locks),
55234 - atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
55235 - atomic_read(&tcon->stats.cifs_stats.num_symlinks));
55236 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
55237 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
55238 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
55239 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
55240 - atomic_read(&tcon->stats.cifs_stats.num_opens),
55241 - atomic_read(&tcon->stats.cifs_stats.num_closes),
55242 - atomic_read(&tcon->stats.cifs_stats.num_deletes));
55243 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
55244 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
55245 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
55246 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
55247 - atomic_read(&tcon->stats.cifs_stats.num_posixopens),
55248 - atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
55249 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
55250 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
55251 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
55252 - atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
55253 - atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
55254 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
55255 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
55256 seq_printf(m, "\nRenames: %d T2 Renames %d",
55257 - atomic_read(&tcon->stats.cifs_stats.num_renames),
55258 - atomic_read(&tcon->stats.cifs_stats.num_t2renames));
55259 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
55260 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
55261 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
55262 - atomic_read(&tcon->stats.cifs_stats.num_ffirst),
55263 - atomic_read(&tcon->stats.cifs_stats.num_fnext),
55264 - atomic_read(&tcon->stats.cifs_stats.num_fclose));
55265 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
55266 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
55267 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
55268 #endif
55269 }
55270
55271 diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
55272 index 861b332..5506392 100644
55273 --- a/fs/cifs/smb2ops.c
55274 +++ b/fs/cifs/smb2ops.c
55275 @@ -282,8 +282,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
55276 #ifdef CONFIG_CIFS_STATS
55277 int i;
55278 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
55279 - atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
55280 - atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
55281 + atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
55282 + atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
55283 }
55284 #endif
55285 }
55286 @@ -311,65 +311,65 @@ static void
55287 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
55288 {
55289 #ifdef CONFIG_CIFS_STATS
55290 - atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
55291 - atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
55292 + atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
55293 + atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
55294 seq_printf(m, "\nNegotiates: %d sent %d failed",
55295 - atomic_read(&sent[SMB2_NEGOTIATE_HE]),
55296 - atomic_read(&failed[SMB2_NEGOTIATE_HE]));
55297 + atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
55298 + atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
55299 seq_printf(m, "\nSessionSetups: %d sent %d failed",
55300 - atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
55301 - atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
55302 + atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
55303 + atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
55304 seq_printf(m, "\nLogoffs: %d sent %d failed",
55305 - atomic_read(&sent[SMB2_LOGOFF_HE]),
55306 - atomic_read(&failed[SMB2_LOGOFF_HE]));
55307 + atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
55308 + atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
55309 seq_printf(m, "\nTreeConnects: %d sent %d failed",
55310 - atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
55311 - atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
55312 + atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
55313 + atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
55314 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
55315 - atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
55316 - atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
55317 + atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
55318 + atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
55319 seq_printf(m, "\nCreates: %d sent %d failed",
55320 - atomic_read(&sent[SMB2_CREATE_HE]),
55321 - atomic_read(&failed[SMB2_CREATE_HE]));
55322 + atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
55323 + atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
55324 seq_printf(m, "\nCloses: %d sent %d failed",
55325 - atomic_read(&sent[SMB2_CLOSE_HE]),
55326 - atomic_read(&failed[SMB2_CLOSE_HE]));
55327 + atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
55328 + atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
55329 seq_printf(m, "\nFlushes: %d sent %d failed",
55330 - atomic_read(&sent[SMB2_FLUSH_HE]),
55331 - atomic_read(&failed[SMB2_FLUSH_HE]));
55332 + atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
55333 + atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
55334 seq_printf(m, "\nReads: %d sent %d failed",
55335 - atomic_read(&sent[SMB2_READ_HE]),
55336 - atomic_read(&failed[SMB2_READ_HE]));
55337 + atomic_read_unchecked(&sent[SMB2_READ_HE]),
55338 + atomic_read_unchecked(&failed[SMB2_READ_HE]));
55339 seq_printf(m, "\nWrites: %d sent %d failed",
55340 - atomic_read(&sent[SMB2_WRITE_HE]),
55341 - atomic_read(&failed[SMB2_WRITE_HE]));
55342 + atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
55343 + atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
55344 seq_printf(m, "\nLocks: %d sent %d failed",
55345 - atomic_read(&sent[SMB2_LOCK_HE]),
55346 - atomic_read(&failed[SMB2_LOCK_HE]));
55347 + atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
55348 + atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
55349 seq_printf(m, "\nIOCTLs: %d sent %d failed",
55350 - atomic_read(&sent[SMB2_IOCTL_HE]),
55351 - atomic_read(&failed[SMB2_IOCTL_HE]));
55352 + atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
55353 + atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
55354 seq_printf(m, "\nCancels: %d sent %d failed",
55355 - atomic_read(&sent[SMB2_CANCEL_HE]),
55356 - atomic_read(&failed[SMB2_CANCEL_HE]));
55357 + atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
55358 + atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
55359 seq_printf(m, "\nEchos: %d sent %d failed",
55360 - atomic_read(&sent[SMB2_ECHO_HE]),
55361 - atomic_read(&failed[SMB2_ECHO_HE]));
55362 + atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
55363 + atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
55364 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
55365 - atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
55366 - atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
55367 + atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
55368 + atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
55369 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
55370 - atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
55371 - atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
55372 + atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
55373 + atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
55374 seq_printf(m, "\nQueryInfos: %d sent %d failed",
55375 - atomic_read(&sent[SMB2_QUERY_INFO_HE]),
55376 - atomic_read(&failed[SMB2_QUERY_INFO_HE]));
55377 + atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
55378 + atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
55379 seq_printf(m, "\nSetInfos: %d sent %d failed",
55380 - atomic_read(&sent[SMB2_SET_INFO_HE]),
55381 - atomic_read(&failed[SMB2_SET_INFO_HE]));
55382 + atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
55383 + atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
55384 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
55385 - atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
55386 - atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
55387 + atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
55388 + atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
55389 #endif
55390 }
55391
55392 diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
55393 index edccb52..16bc6db 100644
55394 --- a/fs/cifs/smb2pdu.c
55395 +++ b/fs/cifs/smb2pdu.c
55396 @@ -1957,8 +1957,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
55397 default:
55398 cifs_dbg(VFS, "info level %u isn't supported\n",
55399 srch_inf->info_level);
55400 - rc = -EINVAL;
55401 - goto qdir_exit;
55402 + return -EINVAL;
55403 }
55404
55405 req->FileIndex = cpu_to_le32(index);
55406 diff --git a/fs/coda/cache.c b/fs/coda/cache.c
55407 index 1da168c..8bc7ff6 100644
55408 --- a/fs/coda/cache.c
55409 +++ b/fs/coda/cache.c
55410 @@ -24,7 +24,7 @@
55411 #include "coda_linux.h"
55412 #include "coda_cache.h"
55413
55414 -static atomic_t permission_epoch = ATOMIC_INIT(0);
55415 +static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
55416
55417 /* replace or extend an acl cache hit */
55418 void coda_cache_enter(struct inode *inode, int mask)
55419 @@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
55420 struct coda_inode_info *cii = ITOC(inode);
55421
55422 spin_lock(&cii->c_lock);
55423 - cii->c_cached_epoch = atomic_read(&permission_epoch);
55424 + cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
55425 if (!uid_eq(cii->c_uid, current_fsuid())) {
55426 cii->c_uid = current_fsuid();
55427 cii->c_cached_perm = mask;
55428 @@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
55429 {
55430 struct coda_inode_info *cii = ITOC(inode);
55431 spin_lock(&cii->c_lock);
55432 - cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
55433 + cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
55434 spin_unlock(&cii->c_lock);
55435 }
55436
55437 /* remove all acl caches */
55438 void coda_cache_clear_all(struct super_block *sb)
55439 {
55440 - atomic_inc(&permission_epoch);
55441 + atomic_inc_unchecked(&permission_epoch);
55442 }
55443
55444
55445 @@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
55446 spin_lock(&cii->c_lock);
55447 hit = (mask & cii->c_cached_perm) == mask &&
55448 uid_eq(cii->c_uid, current_fsuid()) &&
55449 - cii->c_cached_epoch == atomic_read(&permission_epoch);
55450 + cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
55451 spin_unlock(&cii->c_lock);
55452
55453 return hit;
55454 diff --git a/fs/compat.c b/fs/compat.c
55455 index 6af20de..fec3fbb 100644
55456 --- a/fs/compat.c
55457 +++ b/fs/compat.c
55458 @@ -54,7 +54,7 @@
55459 #include <asm/ioctls.h>
55460 #include "internal.h"
55461
55462 -int compat_log = 1;
55463 +int compat_log = 0;
55464
55465 int compat_printk(const char *fmt, ...)
55466 {
55467 @@ -488,7 +488,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
55468
55469 set_fs(KERNEL_DS);
55470 /* The __user pointer cast is valid because of the set_fs() */
55471 - ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
55472 + ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
55473 set_fs(oldfs);
55474 /* truncating is ok because it's a user address */
55475 if (!ret)
55476 @@ -546,7 +546,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
55477 goto out;
55478
55479 ret = -EINVAL;
55480 - if (nr_segs > UIO_MAXIOV || nr_segs < 0)
55481 + if (nr_segs > UIO_MAXIOV)
55482 goto out;
55483 if (nr_segs > fast_segs) {
55484 ret = -ENOMEM;
55485 @@ -834,6 +834,7 @@ struct compat_old_linux_dirent {
55486 struct compat_readdir_callback {
55487 struct dir_context ctx;
55488 struct compat_old_linux_dirent __user *dirent;
55489 + struct file * file;
55490 int result;
55491 };
55492
55493 @@ -851,6 +852,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
55494 buf->result = -EOVERFLOW;
55495 return -EOVERFLOW;
55496 }
55497 +
55498 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
55499 + return 0;
55500 +
55501 buf->result++;
55502 dirent = buf->dirent;
55503 if (!access_ok(VERIFY_WRITE, dirent,
55504 @@ -882,6 +887,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
55505 if (!f.file)
55506 return -EBADF;
55507
55508 + buf.file = f.file;
55509 error = iterate_dir(f.file, &buf.ctx);
55510 if (buf.result)
55511 error = buf.result;
55512 @@ -901,6 +907,7 @@ struct compat_getdents_callback {
55513 struct dir_context ctx;
55514 struct compat_linux_dirent __user *current_dir;
55515 struct compat_linux_dirent __user *previous;
55516 + struct file * file;
55517 int count;
55518 int error;
55519 };
55520 @@ -922,6 +929,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
55521 buf->error = -EOVERFLOW;
55522 return -EOVERFLOW;
55523 }
55524 +
55525 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
55526 + return 0;
55527 +
55528 dirent = buf->previous;
55529 if (dirent) {
55530 if (__put_user(offset, &dirent->d_off))
55531 @@ -967,6 +978,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
55532 if (!f.file)
55533 return -EBADF;
55534
55535 + buf.file = f.file;
55536 error = iterate_dir(f.file, &buf.ctx);
55537 if (error >= 0)
55538 error = buf.error;
55539 @@ -987,6 +999,7 @@ struct compat_getdents_callback64 {
55540 struct dir_context ctx;
55541 struct linux_dirent64 __user *current_dir;
55542 struct linux_dirent64 __user *previous;
55543 + struct file * file;
55544 int count;
55545 int error;
55546 };
55547 @@ -1003,6 +1016,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
55548 buf->error = -EINVAL; /* only used if we fail.. */
55549 if (reclen > buf->count)
55550 return -EINVAL;
55551 +
55552 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
55553 + return 0;
55554 +
55555 dirent = buf->previous;
55556
55557 if (dirent) {
55558 @@ -1052,6 +1069,7 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
55559 if (!f.file)
55560 return -EBADF;
55561
55562 + buf.file = f.file;
55563 error = iterate_dir(f.file, &buf.ctx);
55564 if (error >= 0)
55565 error = buf.error;
55566 diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
55567 index a81147e..20bf2b5 100644
55568 --- a/fs/compat_binfmt_elf.c
55569 +++ b/fs/compat_binfmt_elf.c
55570 @@ -30,11 +30,13 @@
55571 #undef elf_phdr
55572 #undef elf_shdr
55573 #undef elf_note
55574 +#undef elf_dyn
55575 #undef elf_addr_t
55576 #define elfhdr elf32_hdr
55577 #define elf_phdr elf32_phdr
55578 #define elf_shdr elf32_shdr
55579 #define elf_note elf32_note
55580 +#define elf_dyn Elf32_Dyn
55581 #define elf_addr_t Elf32_Addr
55582
55583 /*
55584 diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
55585 index 5d19acf..9ab093b 100644
55586 --- a/fs/compat_ioctl.c
55587 +++ b/fs/compat_ioctl.c
55588 @@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
55589 return -EFAULT;
55590 if (__get_user(udata, &ss32->iomem_base))
55591 return -EFAULT;
55592 - ss.iomem_base = compat_ptr(udata);
55593 + ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
55594 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
55595 __get_user(ss.port_high, &ss32->port_high))
55596 return -EFAULT;
55597 @@ -702,8 +702,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
55598 for (i = 0; i < nmsgs; i++) {
55599 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
55600 return -EFAULT;
55601 - if (get_user(datap, &umsgs[i].buf) ||
55602 - put_user(compat_ptr(datap), &tmsgs[i].buf))
55603 + if (get_user(datap, (u8 __user * __user *)&umsgs[i].buf) ||
55604 + put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
55605 return -EFAULT;
55606 }
55607 return sys_ioctl(fd, cmd, (unsigned long)tdata);
55608 @@ -796,7 +796,7 @@ static int compat_ioctl_preallocate(struct file *file,
55609 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
55610 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
55611 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
55612 - copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
55613 + copy_in_user(p->l_pad, &p32->l_pad, 4*sizeof(u32)))
55614 return -EFAULT;
55615
55616 return ioctl_preallocate(file, p);
55617 @@ -1616,8 +1616,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
55618 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
55619 {
55620 unsigned int a, b;
55621 - a = *(unsigned int *)p;
55622 - b = *(unsigned int *)q;
55623 + a = *(const unsigned int *)p;
55624 + b = *(const unsigned int *)q;
55625 if (a > b)
55626 return 1;
55627 if (a < b)
55628 diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
55629 index 511d415..319d0e5 100644
55630 --- a/fs/configfs/dir.c
55631 +++ b/fs/configfs/dir.c
55632 @@ -1558,7 +1558,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
55633 }
55634 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
55635 struct configfs_dirent *next;
55636 - const char *name;
55637 + const unsigned char * name;
55638 + char d_name[sizeof(next->s_dentry->d_iname)];
55639 int len;
55640 struct inode *inode = NULL;
55641
55642 @@ -1567,7 +1568,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
55643 continue;
55644
55645 name = configfs_get_name(next);
55646 - len = strlen(name);
55647 + if (next->s_dentry && name == next->s_dentry->d_iname) {
55648 + len = next->s_dentry->d_name.len;
55649 + memcpy(d_name, name, len);
55650 + name = d_name;
55651 + } else
55652 + len = strlen(name);
55653
55654 /*
55655 * We'll have a dentry and an inode for
55656 diff --git a/fs/coredump.c b/fs/coredump.c
55657 index 9bdeca1..2a9b08d 100644
55658 --- a/fs/coredump.c
55659 +++ b/fs/coredump.c
55660 @@ -438,8 +438,8 @@ static void wait_for_dump_helpers(struct file *file)
55661 struct pipe_inode_info *pipe = file->private_data;
55662
55663 pipe_lock(pipe);
55664 - pipe->readers++;
55665 - pipe->writers--;
55666 + atomic_inc(&pipe->readers);
55667 + atomic_dec(&pipe->writers);
55668 wake_up_interruptible_sync(&pipe->wait);
55669 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
55670 pipe_unlock(pipe);
55671 @@ -448,11 +448,11 @@ static void wait_for_dump_helpers(struct file *file)
55672 * We actually want wait_event_freezable() but then we need
55673 * to clear TIF_SIGPENDING and improve dump_interrupted().
55674 */
55675 - wait_event_interruptible(pipe->wait, pipe->readers == 1);
55676 + wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
55677
55678 pipe_lock(pipe);
55679 - pipe->readers--;
55680 - pipe->writers++;
55681 + atomic_dec(&pipe->readers);
55682 + atomic_inc(&pipe->writers);
55683 pipe_unlock(pipe);
55684 }
55685
55686 @@ -499,7 +499,9 @@ void do_coredump(siginfo_t *siginfo)
55687 struct files_struct *displaced;
55688 bool need_nonrelative = false;
55689 bool core_dumped = false;
55690 - static atomic_t core_dump_count = ATOMIC_INIT(0);
55691 + static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
55692 + long signr = siginfo->si_signo;
55693 + int dumpable;
55694 struct coredump_params cprm = {
55695 .siginfo = siginfo,
55696 .regs = signal_pt_regs(),
55697 @@ -512,12 +514,17 @@ void do_coredump(siginfo_t *siginfo)
55698 .mm_flags = mm->flags,
55699 };
55700
55701 - audit_core_dumps(siginfo->si_signo);
55702 + audit_core_dumps(signr);
55703 +
55704 + dumpable = __get_dumpable(cprm.mm_flags);
55705 +
55706 + if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
55707 + gr_handle_brute_attach(dumpable);
55708
55709 binfmt = mm->binfmt;
55710 if (!binfmt || !binfmt->core_dump)
55711 goto fail;
55712 - if (!__get_dumpable(cprm.mm_flags))
55713 + if (!dumpable)
55714 goto fail;
55715
55716 cred = prepare_creds();
55717 @@ -536,7 +543,7 @@ void do_coredump(siginfo_t *siginfo)
55718 need_nonrelative = true;
55719 }
55720
55721 - retval = coredump_wait(siginfo->si_signo, &core_state);
55722 + retval = coredump_wait(signr, &core_state);
55723 if (retval < 0)
55724 goto fail_creds;
55725
55726 @@ -579,7 +586,7 @@ void do_coredump(siginfo_t *siginfo)
55727 }
55728 cprm.limit = RLIM_INFINITY;
55729
55730 - dump_count = atomic_inc_return(&core_dump_count);
55731 + dump_count = atomic_inc_return_unchecked(&core_dump_count);
55732 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
55733 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
55734 task_tgid_vnr(current), current->comm);
55735 @@ -611,6 +618,8 @@ void do_coredump(siginfo_t *siginfo)
55736 } else {
55737 struct inode *inode;
55738
55739 + gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
55740 +
55741 if (cprm.limit < binfmt->min_coredump)
55742 goto fail_unlock;
55743
55744 @@ -669,7 +678,7 @@ close_fail:
55745 filp_close(cprm.file, NULL);
55746 fail_dropcount:
55747 if (ispipe)
55748 - atomic_dec(&core_dump_count);
55749 + atomic_dec_unchecked(&core_dump_count);
55750 fail_unlock:
55751 kfree(cn.corename);
55752 coredump_finish(mm, core_dumped);
55753 @@ -689,7 +698,7 @@ int dump_write(struct file *file, const void *addr, int nr)
55754 {
55755 return !dump_interrupted() &&
55756 access_ok(VERIFY_READ, addr, nr) &&
55757 - file->f_op->write(file, addr, nr, &file->f_pos) == nr;
55758 + file->f_op->write(file, (const char __force_user *)addr, nr, &file->f_pos) == nr;
55759 }
55760 EXPORT_SYMBOL(dump_write);
55761
55762 diff --git a/fs/dcache.c b/fs/dcache.c
55763 index 89f9671..d2dce57 100644
55764 --- a/fs/dcache.c
55765 +++ b/fs/dcache.c
55766 @@ -1570,7 +1570,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
55767 */
55768 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
55769 if (name->len > DNAME_INLINE_LEN-1) {
55770 - dname = kmalloc(name->len + 1, GFP_KERNEL);
55771 + dname = kmalloc(round_up(name->len + 1, sizeof(unsigned long)), GFP_KERNEL);
55772 if (!dname) {
55773 kmem_cache_free(dentry_cache, dentry);
55774 return NULL;
55775 @@ -2893,6 +2893,7 @@ static int prepend_path(const struct path *path,
55776 restart:
55777 bptr = *buffer;
55778 blen = *buflen;
55779 + error = 0;
55780 dentry = path->dentry;
55781 vfsmnt = path->mnt;
55782 mnt = real_mount(vfsmnt);
55783 @@ -3432,7 +3433,8 @@ void __init vfs_caches_init(unsigned long mempages)
55784 mempages -= reserve;
55785
55786 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
55787 - SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
55788 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
55789 + SLAB_NO_SANITIZE, NULL);
55790
55791 dcache_init();
55792 inode_init();
55793 diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
55794 index c7c83ff..bda9461 100644
55795 --- a/fs/debugfs/inode.c
55796 +++ b/fs/debugfs/inode.c
55797 @@ -415,7 +415,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
55798 */
55799 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
55800 {
55801 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
55802 + return __create_file(name, S_IFDIR | S_IRWXU,
55803 +#else
55804 return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
55805 +#endif
55806 parent, NULL, NULL);
55807 }
55808 EXPORT_SYMBOL_GPL(debugfs_create_dir);
55809 diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
55810 index 67e9b63..a9adb68 100644
55811 --- a/fs/ecryptfs/inode.c
55812 +++ b/fs/ecryptfs/inode.c
55813 @@ -674,7 +674,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
55814 old_fs = get_fs();
55815 set_fs(get_ds());
55816 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
55817 - (char __user *)lower_buf,
55818 + (char __force_user *)lower_buf,
55819 PATH_MAX);
55820 set_fs(old_fs);
55821 if (rc < 0)
55822 @@ -706,7 +706,7 @@ out:
55823 static void
55824 ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
55825 {
55826 - char *buf = nd_get_link(nd);
55827 + const char *buf = nd_get_link(nd);
55828 if (!IS_ERR(buf)) {
55829 /* Free the char* */
55830 kfree(buf);
55831 diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
55832 index e4141f2..d8263e8 100644
55833 --- a/fs/ecryptfs/miscdev.c
55834 +++ b/fs/ecryptfs/miscdev.c
55835 @@ -304,7 +304,7 @@ check_list:
55836 goto out_unlock_msg_ctx;
55837 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
55838 if (msg_ctx->msg) {
55839 - if (copy_to_user(&buf[i], packet_length, packet_length_size))
55840 + if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
55841 goto out_unlock_msg_ctx;
55842 i += packet_length_size;
55843 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
55844 diff --git a/fs/exec.c b/fs/exec.c
55845 index bb8afc1..2f5087e 100644
55846 --- a/fs/exec.c
55847 +++ b/fs/exec.c
55848 @@ -55,8 +55,20 @@
55849 #include <linux/pipe_fs_i.h>
55850 #include <linux/oom.h>
55851 #include <linux/compat.h>
55852 +#include <linux/random.h>
55853 +#include <linux/seq_file.h>
55854 +#include <linux/coredump.h>
55855 +#include <linux/mman.h>
55856 +
55857 +#ifdef CONFIG_PAX_REFCOUNT
55858 +#include <linux/kallsyms.h>
55859 +#include <linux/kdebug.h>
55860 +#endif
55861 +
55862 +#include <trace/events/fs.h>
55863
55864 #include <asm/uaccess.h>
55865 +#include <asm/sections.h>
55866 #include <asm/mmu_context.h>
55867 #include <asm/tlb.h>
55868
55869 @@ -66,19 +78,34 @@
55870
55871 #include <trace/events/sched.h>
55872
55873 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
55874 +void __weak pax_set_initial_flags(struct linux_binprm *bprm)
55875 +{
55876 + 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");
55877 +}
55878 +#endif
55879 +
55880 +#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
55881 +void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
55882 +EXPORT_SYMBOL(pax_set_initial_flags_func);
55883 +#endif
55884 +
55885 int suid_dumpable = 0;
55886
55887 static LIST_HEAD(formats);
55888 static DEFINE_RWLOCK(binfmt_lock);
55889
55890 +extern int gr_process_kernel_exec_ban(void);
55891 +extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
55892 +
55893 void __register_binfmt(struct linux_binfmt * fmt, int insert)
55894 {
55895 BUG_ON(!fmt);
55896 if (WARN_ON(!fmt->load_binary))
55897 return;
55898 write_lock(&binfmt_lock);
55899 - insert ? list_add(&fmt->lh, &formats) :
55900 - list_add_tail(&fmt->lh, &formats);
55901 + insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
55902 + pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
55903 write_unlock(&binfmt_lock);
55904 }
55905
55906 @@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
55907 void unregister_binfmt(struct linux_binfmt * fmt)
55908 {
55909 write_lock(&binfmt_lock);
55910 - list_del(&fmt->lh);
55911 + pax_list_del((struct list_head *)&fmt->lh);
55912 write_unlock(&binfmt_lock);
55913 }
55914
55915 @@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
55916 int write)
55917 {
55918 struct page *page;
55919 - int ret;
55920
55921 -#ifdef CONFIG_STACK_GROWSUP
55922 - if (write) {
55923 - ret = expand_downwards(bprm->vma, pos);
55924 - if (ret < 0)
55925 - return NULL;
55926 - }
55927 -#endif
55928 - ret = get_user_pages(current, bprm->mm, pos,
55929 - 1, write, 1, &page, NULL);
55930 - if (ret <= 0)
55931 + if (0 > expand_downwards(bprm->vma, pos))
55932 + return NULL;
55933 + if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
55934 return NULL;
55935
55936 if (write) {
55937 @@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
55938 if (size <= ARG_MAX)
55939 return page;
55940
55941 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
55942 + // only allow 512KB for argv+env on suid/sgid binaries
55943 + // to prevent easy ASLR exhaustion
55944 + if (((!uid_eq(bprm->cred->euid, current_euid())) ||
55945 + (!gid_eq(bprm->cred->egid, current_egid()))) &&
55946 + (size > (512 * 1024))) {
55947 + put_page(page);
55948 + return NULL;
55949 + }
55950 +#endif
55951 +
55952 /*
55953 * Limit to 1/4-th the stack size for the argv+env strings.
55954 * This ensures that:
55955 @@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
55956 vma->vm_end = STACK_TOP_MAX;
55957 vma->vm_start = vma->vm_end - PAGE_SIZE;
55958 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
55959 +
55960 +#ifdef CONFIG_PAX_SEGMEXEC
55961 + vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
55962 +#endif
55963 +
55964 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
55965 INIT_LIST_HEAD(&vma->anon_vma_chain);
55966
55967 @@ -279,6 +314,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
55968 mm->stack_vm = mm->total_vm = 1;
55969 up_write(&mm->mmap_sem);
55970 bprm->p = vma->vm_end - sizeof(void *);
55971 +
55972 +#ifdef CONFIG_PAX_RANDUSTACK
55973 + if (randomize_va_space)
55974 + bprm->p ^= prandom_u32() & ~PAGE_MASK;
55975 +#endif
55976 +
55977 return 0;
55978 err:
55979 up_write(&mm->mmap_sem);
55980 @@ -399,7 +440,7 @@ struct user_arg_ptr {
55981 } ptr;
55982 };
55983
55984 -static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
55985 +const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
55986 {
55987 const char __user *native;
55988
55989 @@ -408,14 +449,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
55990 compat_uptr_t compat;
55991
55992 if (get_user(compat, argv.ptr.compat + nr))
55993 - return ERR_PTR(-EFAULT);
55994 + return (const char __force_user *)ERR_PTR(-EFAULT);
55995
55996 return compat_ptr(compat);
55997 }
55998 #endif
55999
56000 if (get_user(native, argv.ptr.native + nr))
56001 - return ERR_PTR(-EFAULT);
56002 + return (const char __force_user *)ERR_PTR(-EFAULT);
56003
56004 return native;
56005 }
56006 @@ -434,7 +475,7 @@ static int count(struct user_arg_ptr argv, int max)
56007 if (!p)
56008 break;
56009
56010 - if (IS_ERR(p))
56011 + if (IS_ERR((const char __force_kernel *)p))
56012 return -EFAULT;
56013
56014 if (i >= max)
56015 @@ -469,7 +510,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
56016
56017 ret = -EFAULT;
56018 str = get_user_arg_ptr(argv, argc);
56019 - if (IS_ERR(str))
56020 + if (IS_ERR((const char __force_kernel *)str))
56021 goto out;
56022
56023 len = strnlen_user(str, MAX_ARG_STRLEN);
56024 @@ -551,7 +592,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
56025 int r;
56026 mm_segment_t oldfs = get_fs();
56027 struct user_arg_ptr argv = {
56028 - .ptr.native = (const char __user *const __user *)__argv,
56029 + .ptr.native = (const char __force_user * const __force_user *)__argv,
56030 };
56031
56032 set_fs(KERNEL_DS);
56033 @@ -586,7 +627,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
56034 unsigned long new_end = old_end - shift;
56035 struct mmu_gather tlb;
56036
56037 - BUG_ON(new_start > new_end);
56038 + if (new_start >= new_end || new_start < mmap_min_addr)
56039 + return -ENOMEM;
56040
56041 /*
56042 * ensure there are no vmas between where we want to go
56043 @@ -595,6 +637,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
56044 if (vma != find_vma(mm, new_start))
56045 return -EFAULT;
56046
56047 +#ifdef CONFIG_PAX_SEGMEXEC
56048 + BUG_ON(pax_find_mirror_vma(vma));
56049 +#endif
56050 +
56051 /*
56052 * cover the whole range: [new_start, old_end)
56053 */
56054 @@ -675,10 +721,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
56055 stack_top = arch_align_stack(stack_top);
56056 stack_top = PAGE_ALIGN(stack_top);
56057
56058 - if (unlikely(stack_top < mmap_min_addr) ||
56059 - unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
56060 - return -ENOMEM;
56061 -
56062 stack_shift = vma->vm_end - stack_top;
56063
56064 bprm->p -= stack_shift;
56065 @@ -690,8 +732,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
56066 bprm->exec -= stack_shift;
56067
56068 down_write(&mm->mmap_sem);
56069 +
56070 + /* Move stack pages down in memory. */
56071 + if (stack_shift) {
56072 + ret = shift_arg_pages(vma, stack_shift);
56073 + if (ret)
56074 + goto out_unlock;
56075 + }
56076 +
56077 vm_flags = VM_STACK_FLAGS;
56078
56079 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
56080 + if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
56081 + vm_flags &= ~VM_EXEC;
56082 +
56083 +#ifdef CONFIG_PAX_MPROTECT
56084 + if (mm->pax_flags & MF_PAX_MPROTECT)
56085 + vm_flags &= ~VM_MAYEXEC;
56086 +#endif
56087 +
56088 + }
56089 +#endif
56090 +
56091 /*
56092 * Adjust stack execute permissions; explicitly enable for
56093 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
56094 @@ -710,13 +772,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
56095 goto out_unlock;
56096 BUG_ON(prev != vma);
56097
56098 - /* Move stack pages down in memory. */
56099 - if (stack_shift) {
56100 - ret = shift_arg_pages(vma, stack_shift);
56101 - if (ret)
56102 - goto out_unlock;
56103 - }
56104 -
56105 /* mprotect_fixup is overkill to remove the temporary stack flags */
56106 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
56107
56108 @@ -740,6 +795,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
56109 #endif
56110 current->mm->start_stack = bprm->p;
56111 ret = expand_stack(vma, stack_base);
56112 +
56113 +#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
56114 + if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
56115 + unsigned long size;
56116 + vm_flags_t vm_flags;
56117 +
56118 + size = STACK_TOP - vma->vm_end;
56119 + vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
56120 +
56121 + ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
56122 +
56123 +#ifdef CONFIG_X86
56124 + if (!ret) {
56125 + size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
56126 + ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
56127 + }
56128 +#endif
56129 +
56130 + }
56131 +#endif
56132 +
56133 if (ret)
56134 ret = -EFAULT;
56135
56136 @@ -776,6 +852,8 @@ struct file *open_exec(const char *name)
56137
56138 fsnotify_open(file);
56139
56140 + trace_open_exec(name);
56141 +
56142 err = deny_write_access(file);
56143 if (err)
56144 goto exit;
56145 @@ -799,7 +877,7 @@ int kernel_read(struct file *file, loff_t offset,
56146 old_fs = get_fs();
56147 set_fs(get_ds());
56148 /* The cast to a user pointer is valid due to the set_fs() */
56149 - result = vfs_read(file, (void __user *)addr, count, &pos);
56150 + result = vfs_read(file, (void __force_user *)addr, count, &pos);
56151 set_fs(old_fs);
56152 return result;
56153 }
56154 @@ -1255,7 +1333,7 @@ static int check_unsafe_exec(struct linux_binprm *bprm)
56155 }
56156 rcu_read_unlock();
56157
56158 - if (p->fs->users > n_fs) {
56159 + if (atomic_read(&p->fs->users) > n_fs) {
56160 bprm->unsafe |= LSM_UNSAFE_SHARE;
56161 } else {
56162 res = -EAGAIN;
56163 @@ -1451,6 +1529,31 @@ static int exec_binprm(struct linux_binprm *bprm)
56164 return ret;
56165 }
56166
56167 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
56168 +static DEFINE_PER_CPU(u64, exec_counter);
56169 +static int __init init_exec_counters(void)
56170 +{
56171 + unsigned int cpu;
56172 +
56173 + for_each_possible_cpu(cpu) {
56174 + per_cpu(exec_counter, cpu) = (u64)cpu;
56175 + }
56176 +
56177 + return 0;
56178 +}
56179 +early_initcall(init_exec_counters);
56180 +static inline void increment_exec_counter(void)
56181 +{
56182 + BUILD_BUG_ON(NR_CPUS > (1 << 16));
56183 + current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
56184 +}
56185 +#else
56186 +static inline void increment_exec_counter(void) {}
56187 +#endif
56188 +
56189 +extern void gr_handle_exec_args(struct linux_binprm *bprm,
56190 + struct user_arg_ptr argv);
56191 +
56192 /*
56193 * sys_execve() executes a new program.
56194 */
56195 @@ -1458,12 +1561,19 @@ static int do_execve_common(const char *filename,
56196 struct user_arg_ptr argv,
56197 struct user_arg_ptr envp)
56198 {
56199 +#ifdef CONFIG_GRKERNSEC
56200 + struct file *old_exec_file;
56201 + struct acl_subject_label *old_acl;
56202 + struct rlimit old_rlim[RLIM_NLIMITS];
56203 +#endif
56204 struct linux_binprm *bprm;
56205 struct file *file;
56206 struct files_struct *displaced;
56207 bool clear_in_exec;
56208 int retval;
56209
56210 + gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
56211 +
56212 /*
56213 * We move the actual failure in case of RLIMIT_NPROC excess from
56214 * set*uid() to execve() because too many poorly written programs
56215 @@ -1504,12 +1614,22 @@ static int do_execve_common(const char *filename,
56216 if (IS_ERR(file))
56217 goto out_unmark;
56218
56219 + if (gr_ptrace_readexec(file, bprm->unsafe)) {
56220 + retval = -EPERM;
56221 + goto out_file;
56222 + }
56223 +
56224 sched_exec();
56225
56226 bprm->file = file;
56227 bprm->filename = filename;
56228 bprm->interp = filename;
56229
56230 + if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
56231 + retval = -EACCES;
56232 + goto out_file;
56233 + }
56234 +
56235 retval = bprm_mm_init(bprm);
56236 if (retval)
56237 goto out_file;
56238 @@ -1526,24 +1646,70 @@ static int do_execve_common(const char *filename,
56239 if (retval < 0)
56240 goto out;
56241
56242 +#ifdef CONFIG_GRKERNSEC
56243 + old_acl = current->acl;
56244 + memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
56245 + old_exec_file = current->exec_file;
56246 + get_file(file);
56247 + current->exec_file = file;
56248 +#endif
56249 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
56250 + /* limit suid stack to 8MB
56251 + * we saved the old limits above and will restore them if this exec fails
56252 + */
56253 + if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
56254 + (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
56255 + current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
56256 +#endif
56257 +
56258 + if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
56259 + retval = -EPERM;
56260 + goto out_fail;
56261 + }
56262 +
56263 + if (!gr_tpe_allow(file)) {
56264 + retval = -EACCES;
56265 + goto out_fail;
56266 + }
56267 +
56268 + if (gr_check_crash_exec(file)) {
56269 + retval = -EACCES;
56270 + goto out_fail;
56271 + }
56272 +
56273 + retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
56274 + bprm->unsafe);
56275 + if (retval < 0)
56276 + goto out_fail;
56277 +
56278 retval = copy_strings_kernel(1, &bprm->filename, bprm);
56279 if (retval < 0)
56280 - goto out;
56281 + goto out_fail;
56282
56283 bprm->exec = bprm->p;
56284 retval = copy_strings(bprm->envc, envp, bprm);
56285 if (retval < 0)
56286 - goto out;
56287 + goto out_fail;
56288
56289 retval = copy_strings(bprm->argc, argv, bprm);
56290 if (retval < 0)
56291 - goto out;
56292 + goto out_fail;
56293 +
56294 + gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
56295 +
56296 + gr_handle_exec_args(bprm, argv);
56297
56298 retval = exec_binprm(bprm);
56299 if (retval < 0)
56300 - goto out;
56301 + goto out_fail;
56302 +#ifdef CONFIG_GRKERNSEC
56303 + if (old_exec_file)
56304 + fput(old_exec_file);
56305 +#endif
56306
56307 /* execve succeeded */
56308 +
56309 + increment_exec_counter();
56310 current->fs->in_exec = 0;
56311 current->in_execve = 0;
56312 acct_update_integrals(current);
56313 @@ -1552,6 +1718,14 @@ static int do_execve_common(const char *filename,
56314 put_files_struct(displaced);
56315 return retval;
56316
56317 +out_fail:
56318 +#ifdef CONFIG_GRKERNSEC
56319 + current->acl = old_acl;
56320 + memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
56321 + fput(current->exec_file);
56322 + current->exec_file = old_exec_file;
56323 +#endif
56324 +
56325 out:
56326 if (bprm->mm) {
56327 acct_arg_size(bprm, 0);
56328 @@ -1706,3 +1880,295 @@ asmlinkage long compat_sys_execve(const char __user * filename,
56329 return error;
56330 }
56331 #endif
56332 +
56333 +int pax_check_flags(unsigned long *flags)
56334 +{
56335 + int retval = 0;
56336 +
56337 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
56338 + if (*flags & MF_PAX_SEGMEXEC)
56339 + {
56340 + *flags &= ~MF_PAX_SEGMEXEC;
56341 + retval = -EINVAL;
56342 + }
56343 +#endif
56344 +
56345 + if ((*flags & MF_PAX_PAGEEXEC)
56346 +
56347 +#ifdef CONFIG_PAX_PAGEEXEC
56348 + && (*flags & MF_PAX_SEGMEXEC)
56349 +#endif
56350 +
56351 + )
56352 + {
56353 + *flags &= ~MF_PAX_PAGEEXEC;
56354 + retval = -EINVAL;
56355 + }
56356 +
56357 + if ((*flags & MF_PAX_MPROTECT)
56358 +
56359 +#ifdef CONFIG_PAX_MPROTECT
56360 + && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
56361 +#endif
56362 +
56363 + )
56364 + {
56365 + *flags &= ~MF_PAX_MPROTECT;
56366 + retval = -EINVAL;
56367 + }
56368 +
56369 + if ((*flags & MF_PAX_EMUTRAMP)
56370 +
56371 +#ifdef CONFIG_PAX_EMUTRAMP
56372 + && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
56373 +#endif
56374 +
56375 + )
56376 + {
56377 + *flags &= ~MF_PAX_EMUTRAMP;
56378 + retval = -EINVAL;
56379 + }
56380 +
56381 + return retval;
56382 +}
56383 +
56384 +EXPORT_SYMBOL(pax_check_flags);
56385 +
56386 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
56387 +char *pax_get_path(const struct path *path, char *buf, int buflen)
56388 +{
56389 + char *pathname = d_path(path, buf, buflen);
56390 +
56391 + if (IS_ERR(pathname))
56392 + goto toolong;
56393 +
56394 + pathname = mangle_path(buf, pathname, "\t\n\\");
56395 + if (!pathname)
56396 + goto toolong;
56397 +
56398 + *pathname = 0;
56399 + return buf;
56400 +
56401 +toolong:
56402 + return "<path too long>";
56403 +}
56404 +EXPORT_SYMBOL(pax_get_path);
56405 +
56406 +void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
56407 +{
56408 + struct task_struct *tsk = current;
56409 + struct mm_struct *mm = current->mm;
56410 + char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
56411 + char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
56412 + char *path_exec = NULL;
56413 + char *path_fault = NULL;
56414 + unsigned long start = 0UL, end = 0UL, offset = 0UL;
56415 + siginfo_t info = { };
56416 +
56417 + if (buffer_exec && buffer_fault) {
56418 + struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
56419 +
56420 + down_read(&mm->mmap_sem);
56421 + vma = mm->mmap;
56422 + while (vma && (!vma_exec || !vma_fault)) {
56423 + if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
56424 + vma_exec = vma;
56425 + if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
56426 + vma_fault = vma;
56427 + vma = vma->vm_next;
56428 + }
56429 + if (vma_exec)
56430 + path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
56431 + if (vma_fault) {
56432 + start = vma_fault->vm_start;
56433 + end = vma_fault->vm_end;
56434 + offset = vma_fault->vm_pgoff << PAGE_SHIFT;
56435 + if (vma_fault->vm_file)
56436 + path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
56437 + else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
56438 + path_fault = "<heap>";
56439 + else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
56440 + path_fault = "<stack>";
56441 + else
56442 + path_fault = "<anonymous mapping>";
56443 + }
56444 + up_read(&mm->mmap_sem);
56445 + }
56446 + if (tsk->signal->curr_ip)
56447 + printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
56448 + else
56449 + printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
56450 + 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),
56451 + from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
56452 + free_page((unsigned long)buffer_exec);
56453 + free_page((unsigned long)buffer_fault);
56454 + pax_report_insns(regs, pc, sp);
56455 + info.si_signo = SIGKILL;
56456 + info.si_errno = 0;
56457 + info.si_code = SI_KERNEL;
56458 + info.si_pid = 0;
56459 + info.si_uid = 0;
56460 + do_coredump(&info);
56461 +}
56462 +#endif
56463 +
56464 +#ifdef CONFIG_PAX_REFCOUNT
56465 +void pax_report_refcount_overflow(struct pt_regs *regs)
56466 +{
56467 + if (current->signal->curr_ip)
56468 + printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
56469 + &current->signal->curr_ip, current->comm, task_pid_nr(current),
56470 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
56471 + else
56472 + printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
56473 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
56474 + print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
56475 + preempt_disable();
56476 + show_regs(regs);
56477 + preempt_enable();
56478 + force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
56479 +}
56480 +#endif
56481 +
56482 +#ifdef CONFIG_PAX_USERCOPY
56483 +/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
56484 +static noinline int check_stack_object(const void *obj, unsigned long len)
56485 +{
56486 + const void * const stack = task_stack_page(current);
56487 + const void * const stackend = stack + THREAD_SIZE;
56488 +
56489 +#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
56490 + const void *frame = NULL;
56491 + const void *oldframe;
56492 +#endif
56493 +
56494 + if (obj + len < obj)
56495 + return -1;
56496 +
56497 + if (obj + len <= stack || stackend <= obj)
56498 + return 0;
56499 +
56500 + if (obj < stack || stackend < obj + len)
56501 + return -1;
56502 +
56503 +#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
56504 + oldframe = __builtin_frame_address(1);
56505 + if (oldframe)
56506 + frame = __builtin_frame_address(2);
56507 + /*
56508 + low ----------------------------------------------> high
56509 + [saved bp][saved ip][args][local vars][saved bp][saved ip]
56510 + ^----------------^
56511 + allow copies only within here
56512 + */
56513 + while (stack <= frame && frame < stackend) {
56514 + /* if obj + len extends past the last frame, this
56515 + check won't pass and the next frame will be 0,
56516 + causing us to bail out and correctly report
56517 + the copy as invalid
56518 + */
56519 + if (obj + len <= frame)
56520 + return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
56521 + oldframe = frame;
56522 + frame = *(const void * const *)frame;
56523 + }
56524 + return -1;
56525 +#else
56526 + return 1;
56527 +#endif
56528 +}
56529 +
56530 +static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
56531 +{
56532 + if (current->signal->curr_ip)
56533 + printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
56534 + &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
56535 + else
56536 + printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
56537 + to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
56538 + dump_stack();
56539 + gr_handle_kernel_exploit();
56540 + do_group_exit(SIGKILL);
56541 +}
56542 +#endif
56543 +
56544 +#ifdef CONFIG_PAX_USERCOPY
56545 +static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
56546 +{
56547 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
56548 + unsigned long textlow = ktla_ktva((unsigned long)_stext);
56549 +#ifdef CONFIG_MODULES
56550 + unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
56551 +#else
56552 + unsigned long texthigh = ktla_ktva((unsigned long)_etext);
56553 +#endif
56554 +
56555 +#else
56556 + unsigned long textlow = (unsigned long)_stext;
56557 + unsigned long texthigh = (unsigned long)_etext;
56558 +
56559 +#ifdef CONFIG_X86_64
56560 + /* check against linear mapping as well */
56561 + if (high > (unsigned long)__va(__pa(textlow)) &&
56562 + low <= (unsigned long)__va(__pa(texthigh)))
56563 + return true;
56564 +#endif
56565 +
56566 +#endif
56567 +
56568 + if (high <= textlow || low > texthigh)
56569 + return false;
56570 + else
56571 + return true;
56572 +}
56573 +#endif
56574 +
56575 +void __check_object_size(const void *ptr, unsigned long n, bool to_user)
56576 +{
56577 +
56578 +#ifdef CONFIG_PAX_USERCOPY
56579 + const char *type;
56580 +
56581 + if (!n)
56582 + return;
56583 +
56584 + type = check_heap_object(ptr, n);
56585 + if (!type) {
56586 + int ret = check_stack_object(ptr, n);
56587 + if (ret == 1 || ret == 2)
56588 + return;
56589 + if (ret == 0) {
56590 + if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
56591 + type = "<kernel text>";
56592 + else
56593 + return;
56594 + } else
56595 + type = "<process stack>";
56596 + }
56597 +
56598 + pax_report_usercopy(ptr, n, to_user, type);
56599 +#endif
56600 +
56601 +}
56602 +EXPORT_SYMBOL(__check_object_size);
56603 +
56604 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
56605 +void pax_track_stack(void)
56606 +{
56607 + unsigned long sp = (unsigned long)&sp;
56608 + if (sp < current_thread_info()->lowest_stack &&
56609 + sp > (unsigned long)task_stack_page(current))
56610 + current_thread_info()->lowest_stack = sp;
56611 +}
56612 +EXPORT_SYMBOL(pax_track_stack);
56613 +#endif
56614 +
56615 +#ifdef CONFIG_PAX_SIZE_OVERFLOW
56616 +void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
56617 +{
56618 + printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
56619 + dump_stack();
56620 + do_group_exit(SIGKILL);
56621 +}
56622 +EXPORT_SYMBOL(report_size_overflow);
56623 +#endif
56624 diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
56625 index 9f9992b..8b59411 100644
56626 --- a/fs/ext2/balloc.c
56627 +++ b/fs/ext2/balloc.c
56628 @@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
56629
56630 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
56631 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
56632 - if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
56633 + if (free_blocks < root_blocks + 1 &&
56634 !uid_eq(sbi->s_resuid, current_fsuid()) &&
56635 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
56636 - !in_group_p (sbi->s_resgid))) {
56637 + !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
56638 return 0;
56639 }
56640 return 1;
56641 diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
56642 index 2d7557d..14e38f94 100644
56643 --- a/fs/ext2/xattr.c
56644 +++ b/fs/ext2/xattr.c
56645 @@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
56646 struct buffer_head *bh = NULL;
56647 struct ext2_xattr_entry *entry;
56648 char *end;
56649 - size_t rest = buffer_size;
56650 + size_t rest = buffer_size, total_size = 0;
56651 int error;
56652
56653 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
56654 @@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
56655 buffer += size;
56656 }
56657 rest -= size;
56658 + total_size += size;
56659 }
56660 }
56661 - error = buffer_size - rest; /* total size */
56662 + error = total_size;
56663
56664 cleanup:
56665 brelse(bh);
56666 diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
56667 index 22548f5..41521d8 100644
56668 --- a/fs/ext3/balloc.c
56669 +++ b/fs/ext3/balloc.c
56670 @@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
56671
56672 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
56673 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
56674 - if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
56675 + if (free_blocks < root_blocks + 1 &&
56676 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
56677 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
56678 - !in_group_p (sbi->s_resgid))) {
56679 + !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
56680 return 0;
56681 }
56682 return 1;
56683 diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
56684 index b1fc963..881228c 100644
56685 --- a/fs/ext3/xattr.c
56686 +++ b/fs/ext3/xattr.c
56687 @@ -330,7 +330,7 @@ static int
56688 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
56689 char *buffer, size_t buffer_size)
56690 {
56691 - size_t rest = buffer_size;
56692 + size_t rest = buffer_size, total_size = 0;
56693
56694 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
56695 const struct xattr_handler *handler =
56696 @@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
56697 buffer += size;
56698 }
56699 rest -= size;
56700 + total_size += size;
56701 }
56702 }
56703 - return buffer_size - rest;
56704 + return total_size;
56705 }
56706
56707 static int
56708 diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
56709 index dc5d572..4c21f8e 100644
56710 --- a/fs/ext4/balloc.c
56711 +++ b/fs/ext4/balloc.c
56712 @@ -534,8 +534,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
56713 /* Hm, nope. Are (enough) root reserved clusters available? */
56714 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
56715 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
56716 - capable(CAP_SYS_RESOURCE) ||
56717 - (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
56718 + (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
56719 + capable_nolog(CAP_SYS_RESOURCE)) {
56720
56721 if (free_clusters >= (nclusters + dirty_clusters +
56722 resv_clusters))
56723 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
56724 index af815ea..99294a6 100644
56725 --- a/fs/ext4/ext4.h
56726 +++ b/fs/ext4/ext4.h
56727 @@ -1256,19 +1256,19 @@ struct ext4_sb_info {
56728 unsigned long s_mb_last_start;
56729
56730 /* stats for buddy allocator */
56731 - atomic_t s_bal_reqs; /* number of reqs with len > 1 */
56732 - atomic_t s_bal_success; /* we found long enough chunks */
56733 - atomic_t s_bal_allocated; /* in blocks */
56734 - atomic_t s_bal_ex_scanned; /* total extents scanned */
56735 - atomic_t s_bal_goals; /* goal hits */
56736 - atomic_t s_bal_breaks; /* too long searches */
56737 - atomic_t s_bal_2orders; /* 2^order hits */
56738 + atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
56739 + atomic_unchecked_t s_bal_success; /* we found long enough chunks */
56740 + atomic_unchecked_t s_bal_allocated; /* in blocks */
56741 + atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
56742 + atomic_unchecked_t s_bal_goals; /* goal hits */
56743 + atomic_unchecked_t s_bal_breaks; /* too long searches */
56744 + atomic_unchecked_t s_bal_2orders; /* 2^order hits */
56745 spinlock_t s_bal_lock;
56746 unsigned long s_mb_buddies_generated;
56747 unsigned long long s_mb_generation_time;
56748 - atomic_t s_mb_lost_chunks;
56749 - atomic_t s_mb_preallocated;
56750 - atomic_t s_mb_discarded;
56751 + atomic_unchecked_t s_mb_lost_chunks;
56752 + atomic_unchecked_t s_mb_preallocated;
56753 + atomic_unchecked_t s_mb_discarded;
56754 atomic_t s_lock_busy;
56755
56756 /* locality groups */
56757 diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
56758 index a41e3ba..e574a00 100644
56759 --- a/fs/ext4/mballoc.c
56760 +++ b/fs/ext4/mballoc.c
56761 @@ -1880,7 +1880,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
56762 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
56763
56764 if (EXT4_SB(sb)->s_mb_stats)
56765 - atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
56766 + atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
56767
56768 break;
56769 }
56770 @@ -2189,7 +2189,7 @@ repeat:
56771 ac->ac_status = AC_STATUS_CONTINUE;
56772 ac->ac_flags |= EXT4_MB_HINT_FIRST;
56773 cr = 3;
56774 - atomic_inc(&sbi->s_mb_lost_chunks);
56775 + atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
56776 goto repeat;
56777 }
56778 }
56779 @@ -2697,25 +2697,25 @@ int ext4_mb_release(struct super_block *sb)
56780 if (sbi->s_mb_stats) {
56781 ext4_msg(sb, KERN_INFO,
56782 "mballoc: %u blocks %u reqs (%u success)",
56783 - atomic_read(&sbi->s_bal_allocated),
56784 - atomic_read(&sbi->s_bal_reqs),
56785 - atomic_read(&sbi->s_bal_success));
56786 + atomic_read_unchecked(&sbi->s_bal_allocated),
56787 + atomic_read_unchecked(&sbi->s_bal_reqs),
56788 + atomic_read_unchecked(&sbi->s_bal_success));
56789 ext4_msg(sb, KERN_INFO,
56790 "mballoc: %u extents scanned, %u goal hits, "
56791 "%u 2^N hits, %u breaks, %u lost",
56792 - atomic_read(&sbi->s_bal_ex_scanned),
56793 - atomic_read(&sbi->s_bal_goals),
56794 - atomic_read(&sbi->s_bal_2orders),
56795 - atomic_read(&sbi->s_bal_breaks),
56796 - atomic_read(&sbi->s_mb_lost_chunks));
56797 + atomic_read_unchecked(&sbi->s_bal_ex_scanned),
56798 + atomic_read_unchecked(&sbi->s_bal_goals),
56799 + atomic_read_unchecked(&sbi->s_bal_2orders),
56800 + atomic_read_unchecked(&sbi->s_bal_breaks),
56801 + atomic_read_unchecked(&sbi->s_mb_lost_chunks));
56802 ext4_msg(sb, KERN_INFO,
56803 "mballoc: %lu generated and it took %Lu",
56804 sbi->s_mb_buddies_generated,
56805 sbi->s_mb_generation_time);
56806 ext4_msg(sb, KERN_INFO,
56807 "mballoc: %u preallocated, %u discarded",
56808 - atomic_read(&sbi->s_mb_preallocated),
56809 - atomic_read(&sbi->s_mb_discarded));
56810 + atomic_read_unchecked(&sbi->s_mb_preallocated),
56811 + atomic_read_unchecked(&sbi->s_mb_discarded));
56812 }
56813
56814 free_percpu(sbi->s_locality_groups);
56815 @@ -3169,16 +3169,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
56816 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
56817
56818 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
56819 - atomic_inc(&sbi->s_bal_reqs);
56820 - atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
56821 + atomic_inc_unchecked(&sbi->s_bal_reqs);
56822 + atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
56823 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
56824 - atomic_inc(&sbi->s_bal_success);
56825 - atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
56826 + atomic_inc_unchecked(&sbi->s_bal_success);
56827 + atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
56828 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
56829 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
56830 - atomic_inc(&sbi->s_bal_goals);
56831 + atomic_inc_unchecked(&sbi->s_bal_goals);
56832 if (ac->ac_found > sbi->s_mb_max_to_scan)
56833 - atomic_inc(&sbi->s_bal_breaks);
56834 + atomic_inc_unchecked(&sbi->s_bal_breaks);
56835 }
56836
56837 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
56838 @@ -3578,7 +3578,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
56839 trace_ext4_mb_new_inode_pa(ac, pa);
56840
56841 ext4_mb_use_inode_pa(ac, pa);
56842 - atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
56843 + atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
56844
56845 ei = EXT4_I(ac->ac_inode);
56846 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
56847 @@ -3638,7 +3638,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
56848 trace_ext4_mb_new_group_pa(ac, pa);
56849
56850 ext4_mb_use_group_pa(ac, pa);
56851 - atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
56852 + atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
56853
56854 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
56855 lg = ac->ac_lg;
56856 @@ -3727,7 +3727,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
56857 * from the bitmap and continue.
56858 */
56859 }
56860 - atomic_add(free, &sbi->s_mb_discarded);
56861 + atomic_add_unchecked(free, &sbi->s_mb_discarded);
56862
56863 return err;
56864 }
56865 @@ -3745,7 +3745,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
56866 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
56867 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
56868 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
56869 - atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
56870 + atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
56871 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
56872
56873 return 0;
56874 diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
56875 index 214461e..3614c89 100644
56876 --- a/fs/ext4/mmp.c
56877 +++ b/fs/ext4/mmp.c
56878 @@ -113,7 +113,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
56879 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
56880 const char *function, unsigned int line, const char *msg)
56881 {
56882 - __ext4_warning(sb, function, line, msg);
56883 + __ext4_warning(sb, function, line, "%s", msg);
56884 __ext4_warning(sb, function, line,
56885 "MMP failure info: last update time: %llu, last update "
56886 "node: %s, last update device: %s\n",
56887 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
56888 index 2c2e6cb..7c3ee62 100644
56889 --- a/fs/ext4/super.c
56890 +++ b/fs/ext4/super.c
56891 @@ -1251,7 +1251,7 @@ static ext4_fsblk_t get_sb_block(void **data)
56892 }
56893
56894 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
56895 -static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
56896 +static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
56897 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
56898
56899 #ifdef CONFIG_QUOTA
56900 @@ -2431,7 +2431,7 @@ struct ext4_attr {
56901 int offset;
56902 int deprecated_val;
56903 } u;
56904 -};
56905 +} __do_const;
56906
56907 static int parse_strtoull(const char *buf,
56908 unsigned long long max, unsigned long long *value)
56909 diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
56910 index 1423c48..9c0c6dc 100644
56911 --- a/fs/ext4/xattr.c
56912 +++ b/fs/ext4/xattr.c
56913 @@ -381,7 +381,7 @@ static int
56914 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
56915 char *buffer, size_t buffer_size)
56916 {
56917 - size_t rest = buffer_size;
56918 + size_t rest = buffer_size, total_size = 0;
56919
56920 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
56921 const struct xattr_handler *handler =
56922 @@ -398,9 +398,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
56923 buffer += size;
56924 }
56925 rest -= size;
56926 + total_size += size;
56927 }
56928 }
56929 - return buffer_size - rest;
56930 + return total_size;
56931 }
56932
56933 static int
56934 diff --git a/fs/fcntl.c b/fs/fcntl.c
56935 index 65343c3..9969dcf 100644
56936 --- a/fs/fcntl.c
56937 +++ b/fs/fcntl.c
56938 @@ -107,6 +107,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
56939 if (err)
56940 return err;
56941
56942 + if (gr_handle_chroot_fowner(pid, type))
56943 + return -ENOENT;
56944 + if (gr_check_protected_task_fowner(pid, type))
56945 + return -EACCES;
56946 +
56947 f_modown(filp, pid, type, force);
56948 return 0;
56949 }
56950 diff --git a/fs/fhandle.c b/fs/fhandle.c
56951 index 999ff5c..41f4109 100644
56952 --- a/fs/fhandle.c
56953 +++ b/fs/fhandle.c
56954 @@ -67,8 +67,7 @@ static long do_sys_name_to_handle(struct path *path,
56955 } else
56956 retval = 0;
56957 /* copy the mount id */
56958 - if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
56959 - sizeof(*mnt_id)) ||
56960 + if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
56961 copy_to_user(ufh, handle,
56962 sizeof(struct file_handle) + handle_bytes))
56963 retval = -EFAULT;
56964 diff --git a/fs/file.c b/fs/file.c
56965 index 4a78f98..f9a6d25 100644
56966 --- a/fs/file.c
56967 +++ b/fs/file.c
56968 @@ -16,6 +16,7 @@
56969 #include <linux/slab.h>
56970 #include <linux/vmalloc.h>
56971 #include <linux/file.h>
56972 +#include <linux/security.h>
56973 #include <linux/fdtable.h>
56974 #include <linux/bitops.h>
56975 #include <linux/interrupt.h>
56976 @@ -141,7 +142,7 @@ out:
56977 * Return <0 error code on error; 1 on successful completion.
56978 * The files->file_lock should be held on entry, and will be held on exit.
56979 */
56980 -static int expand_fdtable(struct files_struct *files, int nr)
56981 +static int expand_fdtable(struct files_struct *files, unsigned int nr)
56982 __releases(files->file_lock)
56983 __acquires(files->file_lock)
56984 {
56985 @@ -186,7 +187,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
56986 * expanded and execution may have blocked.
56987 * The files->file_lock should be held on entry, and will be held on exit.
56988 */
56989 -static int expand_files(struct files_struct *files, int nr)
56990 +static int expand_files(struct files_struct *files, unsigned int nr)
56991 {
56992 struct fdtable *fdt;
56993
56994 @@ -828,6 +829,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
56995 if (!file)
56996 return __close_fd(files, fd);
56997
56998 + gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
56999 if (fd >= rlimit(RLIMIT_NOFILE))
57000 return -EBADF;
57001
57002 @@ -854,6 +856,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
57003 if (unlikely(oldfd == newfd))
57004 return -EINVAL;
57005
57006 + gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
57007 if (newfd >= rlimit(RLIMIT_NOFILE))
57008 return -EBADF;
57009
57010 @@ -909,6 +912,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
57011 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
57012 {
57013 int err;
57014 + gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
57015 if (from >= rlimit(RLIMIT_NOFILE))
57016 return -EINVAL;
57017 err = alloc_fd(from, flags);
57018 diff --git a/fs/filesystems.c b/fs/filesystems.c
57019 index 92567d9..fcd8cbf 100644
57020 --- a/fs/filesystems.c
57021 +++ b/fs/filesystems.c
57022 @@ -273,7 +273,11 @@ struct file_system_type *get_fs_type(const char *name)
57023 int len = dot ? dot - name : strlen(name);
57024
57025 fs = __get_fs_type(name, len);
57026 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
57027 + if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
57028 +#else
57029 if (!fs && (request_module("fs-%.*s", len, name) == 0))
57030 +#endif
57031 fs = __get_fs_type(name, len);
57032
57033 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
57034 diff --git a/fs/fs_struct.c b/fs/fs_struct.c
57035 index d8ac61d..79a36f0 100644
57036 --- a/fs/fs_struct.c
57037 +++ b/fs/fs_struct.c
57038 @@ -4,6 +4,7 @@
57039 #include <linux/path.h>
57040 #include <linux/slab.h>
57041 #include <linux/fs_struct.h>
57042 +#include <linux/grsecurity.h>
57043 #include "internal.h"
57044
57045 /*
57046 @@ -19,6 +20,7 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
57047 write_seqcount_begin(&fs->seq);
57048 old_root = fs->root;
57049 fs->root = *path;
57050 + gr_set_chroot_entries(current, path);
57051 write_seqcount_end(&fs->seq);
57052 spin_unlock(&fs->lock);
57053 if (old_root.dentry)
57054 @@ -67,6 +69,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
57055 int hits = 0;
57056 spin_lock(&fs->lock);
57057 write_seqcount_begin(&fs->seq);
57058 + /* this root replacement is only done by pivot_root,
57059 + leave grsec's chroot tagging alone for this task
57060 + so that a pivoted root isn't treated as a chroot
57061 + */
57062 hits += replace_path(&fs->root, old_root, new_root);
57063 hits += replace_path(&fs->pwd, old_root, new_root);
57064 write_seqcount_end(&fs->seq);
57065 @@ -99,7 +105,8 @@ void exit_fs(struct task_struct *tsk)
57066 task_lock(tsk);
57067 spin_lock(&fs->lock);
57068 tsk->fs = NULL;
57069 - kill = !--fs->users;
57070 + gr_clear_chroot_entries(tsk);
57071 + kill = !atomic_dec_return(&fs->users);
57072 spin_unlock(&fs->lock);
57073 task_unlock(tsk);
57074 if (kill)
57075 @@ -112,7 +119,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
57076 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
57077 /* We don't need to lock fs - think why ;-) */
57078 if (fs) {
57079 - fs->users = 1;
57080 + atomic_set(&fs->users, 1);
57081 fs->in_exec = 0;
57082 spin_lock_init(&fs->lock);
57083 seqcount_init(&fs->seq);
57084 @@ -121,6 +128,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
57085 spin_lock(&old->lock);
57086 fs->root = old->root;
57087 path_get(&fs->root);
57088 + /* instead of calling gr_set_chroot_entries here,
57089 + we call it from every caller of this function
57090 + */
57091 fs->pwd = old->pwd;
57092 path_get(&fs->pwd);
57093 spin_unlock(&old->lock);
57094 @@ -139,8 +149,9 @@ int unshare_fs_struct(void)
57095
57096 task_lock(current);
57097 spin_lock(&fs->lock);
57098 - kill = !--fs->users;
57099 + kill = !atomic_dec_return(&fs->users);
57100 current->fs = new_fs;
57101 + gr_set_chroot_entries(current, &new_fs->root);
57102 spin_unlock(&fs->lock);
57103 task_unlock(current);
57104
57105 @@ -153,13 +164,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
57106
57107 int current_umask(void)
57108 {
57109 - return current->fs->umask;
57110 + return current->fs->umask | gr_acl_umask();
57111 }
57112 EXPORT_SYMBOL(current_umask);
57113
57114 /* to be mentioned only in INIT_TASK */
57115 struct fs_struct init_fs = {
57116 - .users = 1,
57117 + .users = ATOMIC_INIT(1),
57118 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
57119 .seq = SEQCNT_ZERO,
57120 .umask = 0022,
57121 diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
57122 index b2a86e3..37f425a 100644
57123 --- a/fs/fscache/cookie.c
57124 +++ b/fs/fscache/cookie.c
57125 @@ -19,7 +19,7 @@
57126
57127 struct kmem_cache *fscache_cookie_jar;
57128
57129 -static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
57130 +static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
57131
57132 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
57133 static int fscache_alloc_object(struct fscache_cache *cache,
57134 @@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
57135 parent ? (char *) parent->def->name : "<no-parent>",
57136 def->name, netfs_data);
57137
57138 - fscache_stat(&fscache_n_acquires);
57139 + fscache_stat_unchecked(&fscache_n_acquires);
57140
57141 /* if there's no parent cookie, then we don't create one here either */
57142 if (!parent) {
57143 - fscache_stat(&fscache_n_acquires_null);
57144 + fscache_stat_unchecked(&fscache_n_acquires_null);
57145 _leave(" [no parent]");
57146 return NULL;
57147 }
57148 @@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
57149 /* allocate and initialise a cookie */
57150 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
57151 if (!cookie) {
57152 - fscache_stat(&fscache_n_acquires_oom);
57153 + fscache_stat_unchecked(&fscache_n_acquires_oom);
57154 _leave(" [ENOMEM]");
57155 return NULL;
57156 }
57157 @@ -114,13 +114,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
57158
57159 switch (cookie->def->type) {
57160 case FSCACHE_COOKIE_TYPE_INDEX:
57161 - fscache_stat(&fscache_n_cookie_index);
57162 + fscache_stat_unchecked(&fscache_n_cookie_index);
57163 break;
57164 case FSCACHE_COOKIE_TYPE_DATAFILE:
57165 - fscache_stat(&fscache_n_cookie_data);
57166 + fscache_stat_unchecked(&fscache_n_cookie_data);
57167 break;
57168 default:
57169 - fscache_stat(&fscache_n_cookie_special);
57170 + fscache_stat_unchecked(&fscache_n_cookie_special);
57171 break;
57172 }
57173
57174 @@ -131,13 +131,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
57175 if (fscache_acquire_non_index_cookie(cookie) < 0) {
57176 atomic_dec(&parent->n_children);
57177 __fscache_cookie_put(cookie);
57178 - fscache_stat(&fscache_n_acquires_nobufs);
57179 + fscache_stat_unchecked(&fscache_n_acquires_nobufs);
57180 _leave(" = NULL");
57181 return NULL;
57182 }
57183 }
57184
57185 - fscache_stat(&fscache_n_acquires_ok);
57186 + fscache_stat_unchecked(&fscache_n_acquires_ok);
57187 _leave(" = %p", cookie);
57188 return cookie;
57189 }
57190 @@ -173,7 +173,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
57191 cache = fscache_select_cache_for_object(cookie->parent);
57192 if (!cache) {
57193 up_read(&fscache_addremove_sem);
57194 - fscache_stat(&fscache_n_acquires_no_cache);
57195 + fscache_stat_unchecked(&fscache_n_acquires_no_cache);
57196 _leave(" = -ENOMEDIUM [no cache]");
57197 return -ENOMEDIUM;
57198 }
57199 @@ -259,14 +259,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
57200 object = cache->ops->alloc_object(cache, cookie);
57201 fscache_stat_d(&fscache_n_cop_alloc_object);
57202 if (IS_ERR(object)) {
57203 - fscache_stat(&fscache_n_object_no_alloc);
57204 + fscache_stat_unchecked(&fscache_n_object_no_alloc);
57205 ret = PTR_ERR(object);
57206 goto error;
57207 }
57208
57209 - fscache_stat(&fscache_n_object_alloc);
57210 + fscache_stat_unchecked(&fscache_n_object_alloc);
57211
57212 - object->debug_id = atomic_inc_return(&fscache_object_debug_id);
57213 + object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
57214
57215 _debug("ALLOC OBJ%x: %s {%lx}",
57216 object->debug_id, cookie->def->name, object->events);
57217 @@ -380,7 +380,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
57218
57219 _enter("{%s}", cookie->def->name);
57220
57221 - fscache_stat(&fscache_n_invalidates);
57222 + fscache_stat_unchecked(&fscache_n_invalidates);
57223
57224 /* Only permit invalidation of data files. Invalidating an index will
57225 * require the caller to release all its attachments to the tree rooted
57226 @@ -438,10 +438,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
57227 {
57228 struct fscache_object *object;
57229
57230 - fscache_stat(&fscache_n_updates);
57231 + fscache_stat_unchecked(&fscache_n_updates);
57232
57233 if (!cookie) {
57234 - fscache_stat(&fscache_n_updates_null);
57235 + fscache_stat_unchecked(&fscache_n_updates_null);
57236 _leave(" [no cookie]");
57237 return;
57238 }
57239 @@ -473,12 +473,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
57240 {
57241 struct fscache_object *object;
57242
57243 - fscache_stat(&fscache_n_relinquishes);
57244 + fscache_stat_unchecked(&fscache_n_relinquishes);
57245 if (retire)
57246 - fscache_stat(&fscache_n_relinquishes_retire);
57247 + fscache_stat_unchecked(&fscache_n_relinquishes_retire);
57248
57249 if (!cookie) {
57250 - fscache_stat(&fscache_n_relinquishes_null);
57251 + fscache_stat_unchecked(&fscache_n_relinquishes_null);
57252 _leave(" [no cookie]");
57253 return;
57254 }
57255 @@ -598,7 +598,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
57256 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
57257 goto inconsistent;
57258
57259 - op->debug_id = atomic_inc_return(&fscache_op_debug_id);
57260 + op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
57261
57262 atomic_inc(&cookie->n_active);
57263 if (fscache_submit_op(object, op) < 0)
57264 diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
57265 index 4226f66..0fb3f45 100644
57266 --- a/fs/fscache/internal.h
57267 +++ b/fs/fscache/internal.h
57268 @@ -133,8 +133,8 @@ extern void fscache_operation_gc(struct work_struct *);
57269 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
57270 extern int fscache_wait_for_operation_activation(struct fscache_object *,
57271 struct fscache_operation *,
57272 - atomic_t *,
57273 - atomic_t *,
57274 + atomic_unchecked_t *,
57275 + atomic_unchecked_t *,
57276 void (*)(struct fscache_operation *));
57277 extern void fscache_invalidate_writes(struct fscache_cookie *);
57278
57279 @@ -153,101 +153,101 @@ extern void fscache_proc_cleanup(void);
57280 * stats.c
57281 */
57282 #ifdef CONFIG_FSCACHE_STATS
57283 -extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
57284 -extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
57285 +extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
57286 +extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
57287
57288 -extern atomic_t fscache_n_op_pend;
57289 -extern atomic_t fscache_n_op_run;
57290 -extern atomic_t fscache_n_op_enqueue;
57291 -extern atomic_t fscache_n_op_deferred_release;
57292 -extern atomic_t fscache_n_op_release;
57293 -extern atomic_t fscache_n_op_gc;
57294 -extern atomic_t fscache_n_op_cancelled;
57295 -extern atomic_t fscache_n_op_rejected;
57296 +extern atomic_unchecked_t fscache_n_op_pend;
57297 +extern atomic_unchecked_t fscache_n_op_run;
57298 +extern atomic_unchecked_t fscache_n_op_enqueue;
57299 +extern atomic_unchecked_t fscache_n_op_deferred_release;
57300 +extern atomic_unchecked_t fscache_n_op_release;
57301 +extern atomic_unchecked_t fscache_n_op_gc;
57302 +extern atomic_unchecked_t fscache_n_op_cancelled;
57303 +extern atomic_unchecked_t fscache_n_op_rejected;
57304
57305 -extern atomic_t fscache_n_attr_changed;
57306 -extern atomic_t fscache_n_attr_changed_ok;
57307 -extern atomic_t fscache_n_attr_changed_nobufs;
57308 -extern atomic_t fscache_n_attr_changed_nomem;
57309 -extern atomic_t fscache_n_attr_changed_calls;
57310 +extern atomic_unchecked_t fscache_n_attr_changed;
57311 +extern atomic_unchecked_t fscache_n_attr_changed_ok;
57312 +extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
57313 +extern atomic_unchecked_t fscache_n_attr_changed_nomem;
57314 +extern atomic_unchecked_t fscache_n_attr_changed_calls;
57315
57316 -extern atomic_t fscache_n_allocs;
57317 -extern atomic_t fscache_n_allocs_ok;
57318 -extern atomic_t fscache_n_allocs_wait;
57319 -extern atomic_t fscache_n_allocs_nobufs;
57320 -extern atomic_t fscache_n_allocs_intr;
57321 -extern atomic_t fscache_n_allocs_object_dead;
57322 -extern atomic_t fscache_n_alloc_ops;
57323 -extern atomic_t fscache_n_alloc_op_waits;
57324 +extern atomic_unchecked_t fscache_n_allocs;
57325 +extern atomic_unchecked_t fscache_n_allocs_ok;
57326 +extern atomic_unchecked_t fscache_n_allocs_wait;
57327 +extern atomic_unchecked_t fscache_n_allocs_nobufs;
57328 +extern atomic_unchecked_t fscache_n_allocs_intr;
57329 +extern atomic_unchecked_t fscache_n_allocs_object_dead;
57330 +extern atomic_unchecked_t fscache_n_alloc_ops;
57331 +extern atomic_unchecked_t fscache_n_alloc_op_waits;
57332
57333 -extern atomic_t fscache_n_retrievals;
57334 -extern atomic_t fscache_n_retrievals_ok;
57335 -extern atomic_t fscache_n_retrievals_wait;
57336 -extern atomic_t fscache_n_retrievals_nodata;
57337 -extern atomic_t fscache_n_retrievals_nobufs;
57338 -extern atomic_t fscache_n_retrievals_intr;
57339 -extern atomic_t fscache_n_retrievals_nomem;
57340 -extern atomic_t fscache_n_retrievals_object_dead;
57341 -extern atomic_t fscache_n_retrieval_ops;
57342 -extern atomic_t fscache_n_retrieval_op_waits;
57343 +extern atomic_unchecked_t fscache_n_retrievals;
57344 +extern atomic_unchecked_t fscache_n_retrievals_ok;
57345 +extern atomic_unchecked_t fscache_n_retrievals_wait;
57346 +extern atomic_unchecked_t fscache_n_retrievals_nodata;
57347 +extern atomic_unchecked_t fscache_n_retrievals_nobufs;
57348 +extern atomic_unchecked_t fscache_n_retrievals_intr;
57349 +extern atomic_unchecked_t fscache_n_retrievals_nomem;
57350 +extern atomic_unchecked_t fscache_n_retrievals_object_dead;
57351 +extern atomic_unchecked_t fscache_n_retrieval_ops;
57352 +extern atomic_unchecked_t fscache_n_retrieval_op_waits;
57353
57354 -extern atomic_t fscache_n_stores;
57355 -extern atomic_t fscache_n_stores_ok;
57356 -extern atomic_t fscache_n_stores_again;
57357 -extern atomic_t fscache_n_stores_nobufs;
57358 -extern atomic_t fscache_n_stores_oom;
57359 -extern atomic_t fscache_n_store_ops;
57360 -extern atomic_t fscache_n_store_calls;
57361 -extern atomic_t fscache_n_store_pages;
57362 -extern atomic_t fscache_n_store_radix_deletes;
57363 -extern atomic_t fscache_n_store_pages_over_limit;
57364 +extern atomic_unchecked_t fscache_n_stores;
57365 +extern atomic_unchecked_t fscache_n_stores_ok;
57366 +extern atomic_unchecked_t fscache_n_stores_again;
57367 +extern atomic_unchecked_t fscache_n_stores_nobufs;
57368 +extern atomic_unchecked_t fscache_n_stores_oom;
57369 +extern atomic_unchecked_t fscache_n_store_ops;
57370 +extern atomic_unchecked_t fscache_n_store_calls;
57371 +extern atomic_unchecked_t fscache_n_store_pages;
57372 +extern atomic_unchecked_t fscache_n_store_radix_deletes;
57373 +extern atomic_unchecked_t fscache_n_store_pages_over_limit;
57374
57375 -extern atomic_t fscache_n_store_vmscan_not_storing;
57376 -extern atomic_t fscache_n_store_vmscan_gone;
57377 -extern atomic_t fscache_n_store_vmscan_busy;
57378 -extern atomic_t fscache_n_store_vmscan_cancelled;
57379 -extern atomic_t fscache_n_store_vmscan_wait;
57380 +extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
57381 +extern atomic_unchecked_t fscache_n_store_vmscan_gone;
57382 +extern atomic_unchecked_t fscache_n_store_vmscan_busy;
57383 +extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
57384 +extern atomic_unchecked_t fscache_n_store_vmscan_wait;
57385
57386 -extern atomic_t fscache_n_marks;
57387 -extern atomic_t fscache_n_uncaches;
57388 +extern atomic_unchecked_t fscache_n_marks;
57389 +extern atomic_unchecked_t fscache_n_uncaches;
57390
57391 -extern atomic_t fscache_n_acquires;
57392 -extern atomic_t fscache_n_acquires_null;
57393 -extern atomic_t fscache_n_acquires_no_cache;
57394 -extern atomic_t fscache_n_acquires_ok;
57395 -extern atomic_t fscache_n_acquires_nobufs;
57396 -extern atomic_t fscache_n_acquires_oom;
57397 +extern atomic_unchecked_t fscache_n_acquires;
57398 +extern atomic_unchecked_t fscache_n_acquires_null;
57399 +extern atomic_unchecked_t fscache_n_acquires_no_cache;
57400 +extern atomic_unchecked_t fscache_n_acquires_ok;
57401 +extern atomic_unchecked_t fscache_n_acquires_nobufs;
57402 +extern atomic_unchecked_t fscache_n_acquires_oom;
57403
57404 -extern atomic_t fscache_n_invalidates;
57405 -extern atomic_t fscache_n_invalidates_run;
57406 +extern atomic_unchecked_t fscache_n_invalidates;
57407 +extern atomic_unchecked_t fscache_n_invalidates_run;
57408
57409 -extern atomic_t fscache_n_updates;
57410 -extern atomic_t fscache_n_updates_null;
57411 -extern atomic_t fscache_n_updates_run;
57412 +extern atomic_unchecked_t fscache_n_updates;
57413 +extern atomic_unchecked_t fscache_n_updates_null;
57414 +extern atomic_unchecked_t fscache_n_updates_run;
57415
57416 -extern atomic_t fscache_n_relinquishes;
57417 -extern atomic_t fscache_n_relinquishes_null;
57418 -extern atomic_t fscache_n_relinquishes_waitcrt;
57419 -extern atomic_t fscache_n_relinquishes_retire;
57420 +extern atomic_unchecked_t fscache_n_relinquishes;
57421 +extern atomic_unchecked_t fscache_n_relinquishes_null;
57422 +extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
57423 +extern atomic_unchecked_t fscache_n_relinquishes_retire;
57424
57425 -extern atomic_t fscache_n_cookie_index;
57426 -extern atomic_t fscache_n_cookie_data;
57427 -extern atomic_t fscache_n_cookie_special;
57428 +extern atomic_unchecked_t fscache_n_cookie_index;
57429 +extern atomic_unchecked_t fscache_n_cookie_data;
57430 +extern atomic_unchecked_t fscache_n_cookie_special;
57431
57432 -extern atomic_t fscache_n_object_alloc;
57433 -extern atomic_t fscache_n_object_no_alloc;
57434 -extern atomic_t fscache_n_object_lookups;
57435 -extern atomic_t fscache_n_object_lookups_negative;
57436 -extern atomic_t fscache_n_object_lookups_positive;
57437 -extern atomic_t fscache_n_object_lookups_timed_out;
57438 -extern atomic_t fscache_n_object_created;
57439 -extern atomic_t fscache_n_object_avail;
57440 -extern atomic_t fscache_n_object_dead;
57441 +extern atomic_unchecked_t fscache_n_object_alloc;
57442 +extern atomic_unchecked_t fscache_n_object_no_alloc;
57443 +extern atomic_unchecked_t fscache_n_object_lookups;
57444 +extern atomic_unchecked_t fscache_n_object_lookups_negative;
57445 +extern atomic_unchecked_t fscache_n_object_lookups_positive;
57446 +extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
57447 +extern atomic_unchecked_t fscache_n_object_created;
57448 +extern atomic_unchecked_t fscache_n_object_avail;
57449 +extern atomic_unchecked_t fscache_n_object_dead;
57450
57451 -extern atomic_t fscache_n_checkaux_none;
57452 -extern atomic_t fscache_n_checkaux_okay;
57453 -extern atomic_t fscache_n_checkaux_update;
57454 -extern atomic_t fscache_n_checkaux_obsolete;
57455 +extern atomic_unchecked_t fscache_n_checkaux_none;
57456 +extern atomic_unchecked_t fscache_n_checkaux_okay;
57457 +extern atomic_unchecked_t fscache_n_checkaux_update;
57458 +extern atomic_unchecked_t fscache_n_checkaux_obsolete;
57459
57460 extern atomic_t fscache_n_cop_alloc_object;
57461 extern atomic_t fscache_n_cop_lookup_object;
57462 @@ -272,6 +272,11 @@ static inline void fscache_stat(atomic_t *stat)
57463 atomic_inc(stat);
57464 }
57465
57466 +static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
57467 +{
57468 + atomic_inc_unchecked(stat);
57469 +}
57470 +
57471 static inline void fscache_stat_d(atomic_t *stat)
57472 {
57473 atomic_dec(stat);
57474 @@ -284,6 +289,7 @@ extern const struct file_operations fscache_stats_fops;
57475
57476 #define __fscache_stat(stat) (NULL)
57477 #define fscache_stat(stat) do {} while (0)
57478 +#define fscache_stat_unchecked(stat) do {} while (0)
57479 #define fscache_stat_d(stat) do {} while (0)
57480 #endif
57481
57482 diff --git a/fs/fscache/object.c b/fs/fscache/object.c
57483 index 86d75a6..5f3d7a0 100644
57484 --- a/fs/fscache/object.c
57485 +++ b/fs/fscache/object.c
57486 @@ -451,7 +451,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
57487 _debug("LOOKUP \"%s\" in \"%s\"",
57488 cookie->def->name, object->cache->tag->name);
57489
57490 - fscache_stat(&fscache_n_object_lookups);
57491 + fscache_stat_unchecked(&fscache_n_object_lookups);
57492 fscache_stat(&fscache_n_cop_lookup_object);
57493 ret = object->cache->ops->lookup_object(object);
57494 fscache_stat_d(&fscache_n_cop_lookup_object);
57495 @@ -461,7 +461,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
57496 if (ret == -ETIMEDOUT) {
57497 /* probably stuck behind another object, so move this one to
57498 * the back of the queue */
57499 - fscache_stat(&fscache_n_object_lookups_timed_out);
57500 + fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
57501 _leave(" [timeout]");
57502 return NO_TRANSIT;
57503 }
57504 @@ -489,7 +489,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
57505 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
57506
57507 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
57508 - fscache_stat(&fscache_n_object_lookups_negative);
57509 + fscache_stat_unchecked(&fscache_n_object_lookups_negative);
57510
57511 /* Allow write requests to begin stacking up and read requests to begin
57512 * returning ENODATA.
57513 @@ -523,7 +523,7 @@ void fscache_obtained_object(struct fscache_object *object)
57514 /* if we were still looking up, then we must have a positive lookup
57515 * result, in which case there may be data available */
57516 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
57517 - fscache_stat(&fscache_n_object_lookups_positive);
57518 + fscache_stat_unchecked(&fscache_n_object_lookups_positive);
57519
57520 /* We do (presumably) have data */
57521 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
57522 @@ -534,7 +534,7 @@ void fscache_obtained_object(struct fscache_object *object)
57523 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
57524 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
57525 } else {
57526 - fscache_stat(&fscache_n_object_created);
57527 + fscache_stat_unchecked(&fscache_n_object_created);
57528 }
57529
57530 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
57531 @@ -570,7 +570,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
57532 fscache_stat_d(&fscache_n_cop_lookup_complete);
57533
57534 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
57535 - fscache_stat(&fscache_n_object_avail);
57536 + fscache_stat_unchecked(&fscache_n_object_avail);
57537
57538 _leave("");
57539 return transit_to(JUMPSTART_DEPS);
57540 @@ -716,7 +716,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
57541
57542 /* this just shifts the object release to the work processor */
57543 fscache_put_object(object);
57544 - fscache_stat(&fscache_n_object_dead);
57545 + fscache_stat_unchecked(&fscache_n_object_dead);
57546
57547 _leave("");
57548 return transit_to(OBJECT_DEAD);
57549 @@ -881,7 +881,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
57550 enum fscache_checkaux result;
57551
57552 if (!object->cookie->def->check_aux) {
57553 - fscache_stat(&fscache_n_checkaux_none);
57554 + fscache_stat_unchecked(&fscache_n_checkaux_none);
57555 return FSCACHE_CHECKAUX_OKAY;
57556 }
57557
57558 @@ -890,17 +890,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
57559 switch (result) {
57560 /* entry okay as is */
57561 case FSCACHE_CHECKAUX_OKAY:
57562 - fscache_stat(&fscache_n_checkaux_okay);
57563 + fscache_stat_unchecked(&fscache_n_checkaux_okay);
57564 break;
57565
57566 /* entry requires update */
57567 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
57568 - fscache_stat(&fscache_n_checkaux_update);
57569 + fscache_stat_unchecked(&fscache_n_checkaux_update);
57570 break;
57571
57572 /* entry requires deletion */
57573 case FSCACHE_CHECKAUX_OBSOLETE:
57574 - fscache_stat(&fscache_n_checkaux_obsolete);
57575 + fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
57576 break;
57577
57578 default:
57579 @@ -986,7 +986,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
57580 {
57581 const struct fscache_state *s;
57582
57583 - fscache_stat(&fscache_n_invalidates_run);
57584 + fscache_stat_unchecked(&fscache_n_invalidates_run);
57585 fscache_stat(&fscache_n_cop_invalidate_object);
57586 s = _fscache_invalidate_object(object, event);
57587 fscache_stat_d(&fscache_n_cop_invalidate_object);
57588 @@ -1001,7 +1001,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
57589 {
57590 _enter("{OBJ%x},%d", object->debug_id, event);
57591
57592 - fscache_stat(&fscache_n_updates_run);
57593 + fscache_stat_unchecked(&fscache_n_updates_run);
57594 fscache_stat(&fscache_n_cop_update_object);
57595 object->cache->ops->update_object(object);
57596 fscache_stat_d(&fscache_n_cop_update_object);
57597 diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
57598 index 318071a..379938b 100644
57599 --- a/fs/fscache/operation.c
57600 +++ b/fs/fscache/operation.c
57601 @@ -17,7 +17,7 @@
57602 #include <linux/slab.h>
57603 #include "internal.h"
57604
57605 -atomic_t fscache_op_debug_id;
57606 +atomic_unchecked_t fscache_op_debug_id;
57607 EXPORT_SYMBOL(fscache_op_debug_id);
57608
57609 /**
57610 @@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
57611 ASSERTCMP(atomic_read(&op->usage), >, 0);
57612 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
57613
57614 - fscache_stat(&fscache_n_op_enqueue);
57615 + fscache_stat_unchecked(&fscache_n_op_enqueue);
57616 switch (op->flags & FSCACHE_OP_TYPE) {
57617 case FSCACHE_OP_ASYNC:
57618 _debug("queue async");
57619 @@ -73,7 +73,7 @@ static void fscache_run_op(struct fscache_object *object,
57620 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
57621 if (op->processor)
57622 fscache_enqueue_operation(op);
57623 - fscache_stat(&fscache_n_op_run);
57624 + fscache_stat_unchecked(&fscache_n_op_run);
57625 }
57626
57627 /*
57628 @@ -105,11 +105,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
57629 if (object->n_in_progress > 0) {
57630 atomic_inc(&op->usage);
57631 list_add_tail(&op->pend_link, &object->pending_ops);
57632 - fscache_stat(&fscache_n_op_pend);
57633 + fscache_stat_unchecked(&fscache_n_op_pend);
57634 } else if (!list_empty(&object->pending_ops)) {
57635 atomic_inc(&op->usage);
57636 list_add_tail(&op->pend_link, &object->pending_ops);
57637 - fscache_stat(&fscache_n_op_pend);
57638 + fscache_stat_unchecked(&fscache_n_op_pend);
57639 fscache_start_operations(object);
57640 } else {
57641 ASSERTCMP(object->n_in_progress, ==, 0);
57642 @@ -125,7 +125,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
57643 object->n_exclusive++; /* reads and writes must wait */
57644 atomic_inc(&op->usage);
57645 list_add_tail(&op->pend_link, &object->pending_ops);
57646 - fscache_stat(&fscache_n_op_pend);
57647 + fscache_stat_unchecked(&fscache_n_op_pend);
57648 ret = 0;
57649 } else {
57650 /* If we're in any other state, there must have been an I/O
57651 @@ -212,11 +212,11 @@ int fscache_submit_op(struct fscache_object *object,
57652 if (object->n_exclusive > 0) {
57653 atomic_inc(&op->usage);
57654 list_add_tail(&op->pend_link, &object->pending_ops);
57655 - fscache_stat(&fscache_n_op_pend);
57656 + fscache_stat_unchecked(&fscache_n_op_pend);
57657 } else if (!list_empty(&object->pending_ops)) {
57658 atomic_inc(&op->usage);
57659 list_add_tail(&op->pend_link, &object->pending_ops);
57660 - fscache_stat(&fscache_n_op_pend);
57661 + fscache_stat_unchecked(&fscache_n_op_pend);
57662 fscache_start_operations(object);
57663 } else {
57664 ASSERTCMP(object->n_exclusive, ==, 0);
57665 @@ -228,10 +228,10 @@ int fscache_submit_op(struct fscache_object *object,
57666 object->n_ops++;
57667 atomic_inc(&op->usage);
57668 list_add_tail(&op->pend_link, &object->pending_ops);
57669 - fscache_stat(&fscache_n_op_pend);
57670 + fscache_stat_unchecked(&fscache_n_op_pend);
57671 ret = 0;
57672 } else if (fscache_object_is_dying(object)) {
57673 - fscache_stat(&fscache_n_op_rejected);
57674 + fscache_stat_unchecked(&fscache_n_op_rejected);
57675 op->state = FSCACHE_OP_ST_CANCELLED;
57676 ret = -ENOBUFS;
57677 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
57678 @@ -310,7 +310,7 @@ int fscache_cancel_op(struct fscache_operation *op,
57679 ret = -EBUSY;
57680 if (op->state == FSCACHE_OP_ST_PENDING) {
57681 ASSERT(!list_empty(&op->pend_link));
57682 - fscache_stat(&fscache_n_op_cancelled);
57683 + fscache_stat_unchecked(&fscache_n_op_cancelled);
57684 list_del_init(&op->pend_link);
57685 if (do_cancel)
57686 do_cancel(op);
57687 @@ -342,7 +342,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
57688 while (!list_empty(&object->pending_ops)) {
57689 op = list_entry(object->pending_ops.next,
57690 struct fscache_operation, pend_link);
57691 - fscache_stat(&fscache_n_op_cancelled);
57692 + fscache_stat_unchecked(&fscache_n_op_cancelled);
57693 list_del_init(&op->pend_link);
57694
57695 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
57696 @@ -414,7 +414,7 @@ void fscache_put_operation(struct fscache_operation *op)
57697 op->state, ==, FSCACHE_OP_ST_CANCELLED);
57698 op->state = FSCACHE_OP_ST_DEAD;
57699
57700 - fscache_stat(&fscache_n_op_release);
57701 + fscache_stat_unchecked(&fscache_n_op_release);
57702
57703 if (op->release) {
57704 op->release(op);
57705 @@ -433,7 +433,7 @@ void fscache_put_operation(struct fscache_operation *op)
57706 * lock, and defer it otherwise */
57707 if (!spin_trylock(&object->lock)) {
57708 _debug("defer put");
57709 - fscache_stat(&fscache_n_op_deferred_release);
57710 + fscache_stat_unchecked(&fscache_n_op_deferred_release);
57711
57712 cache = object->cache;
57713 spin_lock(&cache->op_gc_list_lock);
57714 @@ -486,7 +486,7 @@ void fscache_operation_gc(struct work_struct *work)
57715
57716 _debug("GC DEFERRED REL OBJ%x OP%x",
57717 object->debug_id, op->debug_id);
57718 - fscache_stat(&fscache_n_op_gc);
57719 + fscache_stat_unchecked(&fscache_n_op_gc);
57720
57721 ASSERTCMP(atomic_read(&op->usage), ==, 0);
57722 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
57723 diff --git a/fs/fscache/page.c b/fs/fscache/page.c
57724 index 73899c1..ae40c58 100644
57725 --- a/fs/fscache/page.c
57726 +++ b/fs/fscache/page.c
57727 @@ -61,7 +61,7 @@ try_again:
57728 val = radix_tree_lookup(&cookie->stores, page->index);
57729 if (!val) {
57730 rcu_read_unlock();
57731 - fscache_stat(&fscache_n_store_vmscan_not_storing);
57732 + fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
57733 __fscache_uncache_page(cookie, page);
57734 return true;
57735 }
57736 @@ -91,11 +91,11 @@ try_again:
57737 spin_unlock(&cookie->stores_lock);
57738
57739 if (xpage) {
57740 - fscache_stat(&fscache_n_store_vmscan_cancelled);
57741 - fscache_stat(&fscache_n_store_radix_deletes);
57742 + fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
57743 + fscache_stat_unchecked(&fscache_n_store_radix_deletes);
57744 ASSERTCMP(xpage, ==, page);
57745 } else {
57746 - fscache_stat(&fscache_n_store_vmscan_gone);
57747 + fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
57748 }
57749
57750 wake_up_bit(&cookie->flags, 0);
57751 @@ -110,11 +110,11 @@ page_busy:
57752 * sleeping on memory allocation, so we may need to impose a timeout
57753 * too. */
57754 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
57755 - fscache_stat(&fscache_n_store_vmscan_busy);
57756 + fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
57757 return false;
57758 }
57759
57760 - fscache_stat(&fscache_n_store_vmscan_wait);
57761 + fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
57762 __fscache_wait_on_page_write(cookie, page);
57763 gfp &= ~__GFP_WAIT;
57764 goto try_again;
57765 @@ -140,7 +140,7 @@ static void fscache_end_page_write(struct fscache_object *object,
57766 FSCACHE_COOKIE_STORING_TAG);
57767 if (!radix_tree_tag_get(&cookie->stores, page->index,
57768 FSCACHE_COOKIE_PENDING_TAG)) {
57769 - fscache_stat(&fscache_n_store_radix_deletes);
57770 + fscache_stat_unchecked(&fscache_n_store_radix_deletes);
57771 xpage = radix_tree_delete(&cookie->stores, page->index);
57772 }
57773 spin_unlock(&cookie->stores_lock);
57774 @@ -161,7 +161,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
57775
57776 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
57777
57778 - fscache_stat(&fscache_n_attr_changed_calls);
57779 + fscache_stat_unchecked(&fscache_n_attr_changed_calls);
57780
57781 if (fscache_object_is_active(object) &&
57782 fscache_use_cookie(object)) {
57783 @@ -189,11 +189,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
57784
57785 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
57786
57787 - fscache_stat(&fscache_n_attr_changed);
57788 + fscache_stat_unchecked(&fscache_n_attr_changed);
57789
57790 op = kzalloc(sizeof(*op), GFP_KERNEL);
57791 if (!op) {
57792 - fscache_stat(&fscache_n_attr_changed_nomem);
57793 + fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
57794 _leave(" = -ENOMEM");
57795 return -ENOMEM;
57796 }
57797 @@ -211,7 +211,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
57798 if (fscache_submit_exclusive_op(object, op) < 0)
57799 goto nobufs;
57800 spin_unlock(&cookie->lock);
57801 - fscache_stat(&fscache_n_attr_changed_ok);
57802 + fscache_stat_unchecked(&fscache_n_attr_changed_ok);
57803 fscache_put_operation(op);
57804 _leave(" = 0");
57805 return 0;
57806 @@ -219,7 +219,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
57807 nobufs:
57808 spin_unlock(&cookie->lock);
57809 kfree(op);
57810 - fscache_stat(&fscache_n_attr_changed_nobufs);
57811 + fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
57812 _leave(" = %d", -ENOBUFS);
57813 return -ENOBUFS;
57814 }
57815 @@ -258,7 +258,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
57816 /* allocate a retrieval operation and attempt to submit it */
57817 op = kzalloc(sizeof(*op), GFP_NOIO);
57818 if (!op) {
57819 - fscache_stat(&fscache_n_retrievals_nomem);
57820 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
57821 return NULL;
57822 }
57823
57824 @@ -289,13 +289,13 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
57825 return 0;
57826 }
57827
57828 - fscache_stat(&fscache_n_retrievals_wait);
57829 + fscache_stat_unchecked(&fscache_n_retrievals_wait);
57830
57831 jif = jiffies;
57832 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
57833 fscache_wait_bit_interruptible,
57834 TASK_INTERRUPTIBLE) != 0) {
57835 - fscache_stat(&fscache_n_retrievals_intr);
57836 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
57837 _leave(" = -ERESTARTSYS");
57838 return -ERESTARTSYS;
57839 }
57840 @@ -324,8 +324,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
57841 */
57842 int fscache_wait_for_operation_activation(struct fscache_object *object,
57843 struct fscache_operation *op,
57844 - atomic_t *stat_op_waits,
57845 - atomic_t *stat_object_dead,
57846 + atomic_unchecked_t *stat_op_waits,
57847 + atomic_unchecked_t *stat_object_dead,
57848 void (*do_cancel)(struct fscache_operation *))
57849 {
57850 int ret;
57851 @@ -335,7 +335,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
57852
57853 _debug(">>> WT");
57854 if (stat_op_waits)
57855 - fscache_stat(stat_op_waits);
57856 + fscache_stat_unchecked(stat_op_waits);
57857 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
57858 fscache_wait_bit_interruptible,
57859 TASK_INTERRUPTIBLE) != 0) {
57860 @@ -353,7 +353,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
57861 check_if_dead:
57862 if (op->state == FSCACHE_OP_ST_CANCELLED) {
57863 if (stat_object_dead)
57864 - fscache_stat(stat_object_dead);
57865 + fscache_stat_unchecked(stat_object_dead);
57866 _leave(" = -ENOBUFS [cancelled]");
57867 return -ENOBUFS;
57868 }
57869 @@ -361,7 +361,7 @@ check_if_dead:
57870 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
57871 fscache_cancel_op(op, do_cancel);
57872 if (stat_object_dead)
57873 - fscache_stat(stat_object_dead);
57874 + fscache_stat_unchecked(stat_object_dead);
57875 return -ENOBUFS;
57876 }
57877 return 0;
57878 @@ -388,7 +388,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
57879
57880 _enter("%p,%p,,,", cookie, page);
57881
57882 - fscache_stat(&fscache_n_retrievals);
57883 + fscache_stat_unchecked(&fscache_n_retrievals);
57884
57885 if (hlist_empty(&cookie->backing_objects))
57886 goto nobufs;
57887 @@ -428,7 +428,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
57888 goto nobufs_unlock_dec;
57889 spin_unlock(&cookie->lock);
57890
57891 - fscache_stat(&fscache_n_retrieval_ops);
57892 + fscache_stat_unchecked(&fscache_n_retrieval_ops);
57893
57894 /* pin the netfs read context in case we need to do the actual netfs
57895 * read because we've encountered a cache read failure */
57896 @@ -459,15 +459,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
57897
57898 error:
57899 if (ret == -ENOMEM)
57900 - fscache_stat(&fscache_n_retrievals_nomem);
57901 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
57902 else if (ret == -ERESTARTSYS)
57903 - fscache_stat(&fscache_n_retrievals_intr);
57904 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
57905 else if (ret == -ENODATA)
57906 - fscache_stat(&fscache_n_retrievals_nodata);
57907 + fscache_stat_unchecked(&fscache_n_retrievals_nodata);
57908 else if (ret < 0)
57909 - fscache_stat(&fscache_n_retrievals_nobufs);
57910 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
57911 else
57912 - fscache_stat(&fscache_n_retrievals_ok);
57913 + fscache_stat_unchecked(&fscache_n_retrievals_ok);
57914
57915 fscache_put_retrieval(op);
57916 _leave(" = %d", ret);
57917 @@ -480,7 +480,7 @@ nobufs_unlock:
57918 atomic_dec(&cookie->n_active);
57919 kfree(op);
57920 nobufs:
57921 - fscache_stat(&fscache_n_retrievals_nobufs);
57922 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
57923 _leave(" = -ENOBUFS");
57924 return -ENOBUFS;
57925 }
57926 @@ -518,7 +518,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
57927
57928 _enter("%p,,%d,,,", cookie, *nr_pages);
57929
57930 - fscache_stat(&fscache_n_retrievals);
57931 + fscache_stat_unchecked(&fscache_n_retrievals);
57932
57933 if (hlist_empty(&cookie->backing_objects))
57934 goto nobufs;
57935 @@ -554,7 +554,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
57936 goto nobufs_unlock_dec;
57937 spin_unlock(&cookie->lock);
57938
57939 - fscache_stat(&fscache_n_retrieval_ops);
57940 + fscache_stat_unchecked(&fscache_n_retrieval_ops);
57941
57942 /* pin the netfs read context in case we need to do the actual netfs
57943 * read because we've encountered a cache read failure */
57944 @@ -585,15 +585,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
57945
57946 error:
57947 if (ret == -ENOMEM)
57948 - fscache_stat(&fscache_n_retrievals_nomem);
57949 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
57950 else if (ret == -ERESTARTSYS)
57951 - fscache_stat(&fscache_n_retrievals_intr);
57952 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
57953 else if (ret == -ENODATA)
57954 - fscache_stat(&fscache_n_retrievals_nodata);
57955 + fscache_stat_unchecked(&fscache_n_retrievals_nodata);
57956 else if (ret < 0)
57957 - fscache_stat(&fscache_n_retrievals_nobufs);
57958 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
57959 else
57960 - fscache_stat(&fscache_n_retrievals_ok);
57961 + fscache_stat_unchecked(&fscache_n_retrievals_ok);
57962
57963 fscache_put_retrieval(op);
57964 _leave(" = %d", ret);
57965 @@ -606,7 +606,7 @@ nobufs_unlock:
57966 atomic_dec(&cookie->n_active);
57967 kfree(op);
57968 nobufs:
57969 - fscache_stat(&fscache_n_retrievals_nobufs);
57970 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
57971 _leave(" = -ENOBUFS");
57972 return -ENOBUFS;
57973 }
57974 @@ -630,7 +630,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
57975
57976 _enter("%p,%p,,,", cookie, page);
57977
57978 - fscache_stat(&fscache_n_allocs);
57979 + fscache_stat_unchecked(&fscache_n_allocs);
57980
57981 if (hlist_empty(&cookie->backing_objects))
57982 goto nobufs;
57983 @@ -662,7 +662,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
57984 goto nobufs_unlock;
57985 spin_unlock(&cookie->lock);
57986
57987 - fscache_stat(&fscache_n_alloc_ops);
57988 + fscache_stat_unchecked(&fscache_n_alloc_ops);
57989
57990 ret = fscache_wait_for_operation_activation(
57991 object, &op->op,
57992 @@ -679,11 +679,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
57993
57994 error:
57995 if (ret == -ERESTARTSYS)
57996 - fscache_stat(&fscache_n_allocs_intr);
57997 + fscache_stat_unchecked(&fscache_n_allocs_intr);
57998 else if (ret < 0)
57999 - fscache_stat(&fscache_n_allocs_nobufs);
58000 + fscache_stat_unchecked(&fscache_n_allocs_nobufs);
58001 else
58002 - fscache_stat(&fscache_n_allocs_ok);
58003 + fscache_stat_unchecked(&fscache_n_allocs_ok);
58004
58005 fscache_put_retrieval(op);
58006 _leave(" = %d", ret);
58007 @@ -694,7 +694,7 @@ nobufs_unlock:
58008 atomic_dec(&cookie->n_active);
58009 kfree(op);
58010 nobufs:
58011 - fscache_stat(&fscache_n_allocs_nobufs);
58012 + fscache_stat_unchecked(&fscache_n_allocs_nobufs);
58013 _leave(" = -ENOBUFS");
58014 return -ENOBUFS;
58015 }
58016 @@ -770,7 +770,7 @@ static void fscache_write_op(struct fscache_operation *_op)
58017
58018 spin_lock(&cookie->stores_lock);
58019
58020 - fscache_stat(&fscache_n_store_calls);
58021 + fscache_stat_unchecked(&fscache_n_store_calls);
58022
58023 /* find a page to store */
58024 page = NULL;
58025 @@ -781,7 +781,7 @@ static void fscache_write_op(struct fscache_operation *_op)
58026 page = results[0];
58027 _debug("gang %d [%lx]", n, page->index);
58028 if (page->index > op->store_limit) {
58029 - fscache_stat(&fscache_n_store_pages_over_limit);
58030 + fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
58031 goto superseded;
58032 }
58033
58034 @@ -793,7 +793,7 @@ static void fscache_write_op(struct fscache_operation *_op)
58035 spin_unlock(&cookie->stores_lock);
58036 spin_unlock(&object->lock);
58037
58038 - fscache_stat(&fscache_n_store_pages);
58039 + fscache_stat_unchecked(&fscache_n_store_pages);
58040 fscache_stat(&fscache_n_cop_write_page);
58041 ret = object->cache->ops->write_page(op, page);
58042 fscache_stat_d(&fscache_n_cop_write_page);
58043 @@ -896,7 +896,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
58044 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
58045 ASSERT(PageFsCache(page));
58046
58047 - fscache_stat(&fscache_n_stores);
58048 + fscache_stat_unchecked(&fscache_n_stores);
58049
58050 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
58051 _leave(" = -ENOBUFS [invalidating]");
58052 @@ -954,7 +954,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
58053 spin_unlock(&cookie->stores_lock);
58054 spin_unlock(&object->lock);
58055
58056 - op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
58057 + op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
58058 op->store_limit = object->store_limit;
58059
58060 atomic_inc(&cookie->n_active);
58061 @@ -963,8 +963,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
58062
58063 spin_unlock(&cookie->lock);
58064 radix_tree_preload_end();
58065 - fscache_stat(&fscache_n_store_ops);
58066 - fscache_stat(&fscache_n_stores_ok);
58067 + fscache_stat_unchecked(&fscache_n_store_ops);
58068 + fscache_stat_unchecked(&fscache_n_stores_ok);
58069
58070 /* the work queue now carries its own ref on the object */
58071 fscache_put_operation(&op->op);
58072 @@ -972,14 +972,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
58073 return 0;
58074
58075 already_queued:
58076 - fscache_stat(&fscache_n_stores_again);
58077 + fscache_stat_unchecked(&fscache_n_stores_again);
58078 already_pending:
58079 spin_unlock(&cookie->stores_lock);
58080 spin_unlock(&object->lock);
58081 spin_unlock(&cookie->lock);
58082 radix_tree_preload_end();
58083 kfree(op);
58084 - fscache_stat(&fscache_n_stores_ok);
58085 + fscache_stat_unchecked(&fscache_n_stores_ok);
58086 _leave(" = 0");
58087 return 0;
58088
58089 @@ -999,14 +999,14 @@ nobufs:
58090 spin_unlock(&cookie->lock);
58091 radix_tree_preload_end();
58092 kfree(op);
58093 - fscache_stat(&fscache_n_stores_nobufs);
58094 + fscache_stat_unchecked(&fscache_n_stores_nobufs);
58095 _leave(" = -ENOBUFS");
58096 return -ENOBUFS;
58097
58098 nomem_free:
58099 kfree(op);
58100 nomem:
58101 - fscache_stat(&fscache_n_stores_oom);
58102 + fscache_stat_unchecked(&fscache_n_stores_oom);
58103 _leave(" = -ENOMEM");
58104 return -ENOMEM;
58105 }
58106 @@ -1024,7 +1024,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
58107 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
58108 ASSERTCMP(page, !=, NULL);
58109
58110 - fscache_stat(&fscache_n_uncaches);
58111 + fscache_stat_unchecked(&fscache_n_uncaches);
58112
58113 /* cache withdrawal may beat us to it */
58114 if (!PageFsCache(page))
58115 @@ -1075,7 +1075,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
58116 struct fscache_cookie *cookie = op->op.object->cookie;
58117
58118 #ifdef CONFIG_FSCACHE_STATS
58119 - atomic_inc(&fscache_n_marks);
58120 + atomic_inc_unchecked(&fscache_n_marks);
58121 #endif
58122
58123 _debug("- mark %p{%lx}", page, page->index);
58124 diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
58125 index 40d13c7..ddf52b9 100644
58126 --- a/fs/fscache/stats.c
58127 +++ b/fs/fscache/stats.c
58128 @@ -18,99 +18,99 @@
58129 /*
58130 * operation counters
58131 */
58132 -atomic_t fscache_n_op_pend;
58133 -atomic_t fscache_n_op_run;
58134 -atomic_t fscache_n_op_enqueue;
58135 -atomic_t fscache_n_op_requeue;
58136 -atomic_t fscache_n_op_deferred_release;
58137 -atomic_t fscache_n_op_release;
58138 -atomic_t fscache_n_op_gc;
58139 -atomic_t fscache_n_op_cancelled;
58140 -atomic_t fscache_n_op_rejected;
58141 +atomic_unchecked_t fscache_n_op_pend;
58142 +atomic_unchecked_t fscache_n_op_run;
58143 +atomic_unchecked_t fscache_n_op_enqueue;
58144 +atomic_unchecked_t fscache_n_op_requeue;
58145 +atomic_unchecked_t fscache_n_op_deferred_release;
58146 +atomic_unchecked_t fscache_n_op_release;
58147 +atomic_unchecked_t fscache_n_op_gc;
58148 +atomic_unchecked_t fscache_n_op_cancelled;
58149 +atomic_unchecked_t fscache_n_op_rejected;
58150
58151 -atomic_t fscache_n_attr_changed;
58152 -atomic_t fscache_n_attr_changed_ok;
58153 -atomic_t fscache_n_attr_changed_nobufs;
58154 -atomic_t fscache_n_attr_changed_nomem;
58155 -atomic_t fscache_n_attr_changed_calls;
58156 +atomic_unchecked_t fscache_n_attr_changed;
58157 +atomic_unchecked_t fscache_n_attr_changed_ok;
58158 +atomic_unchecked_t fscache_n_attr_changed_nobufs;
58159 +atomic_unchecked_t fscache_n_attr_changed_nomem;
58160 +atomic_unchecked_t fscache_n_attr_changed_calls;
58161
58162 -atomic_t fscache_n_allocs;
58163 -atomic_t fscache_n_allocs_ok;
58164 -atomic_t fscache_n_allocs_wait;
58165 -atomic_t fscache_n_allocs_nobufs;
58166 -atomic_t fscache_n_allocs_intr;
58167 -atomic_t fscache_n_allocs_object_dead;
58168 -atomic_t fscache_n_alloc_ops;
58169 -atomic_t fscache_n_alloc_op_waits;
58170 +atomic_unchecked_t fscache_n_allocs;
58171 +atomic_unchecked_t fscache_n_allocs_ok;
58172 +atomic_unchecked_t fscache_n_allocs_wait;
58173 +atomic_unchecked_t fscache_n_allocs_nobufs;
58174 +atomic_unchecked_t fscache_n_allocs_intr;
58175 +atomic_unchecked_t fscache_n_allocs_object_dead;
58176 +atomic_unchecked_t fscache_n_alloc_ops;
58177 +atomic_unchecked_t fscache_n_alloc_op_waits;
58178
58179 -atomic_t fscache_n_retrievals;
58180 -atomic_t fscache_n_retrievals_ok;
58181 -atomic_t fscache_n_retrievals_wait;
58182 -atomic_t fscache_n_retrievals_nodata;
58183 -atomic_t fscache_n_retrievals_nobufs;
58184 -atomic_t fscache_n_retrievals_intr;
58185 -atomic_t fscache_n_retrievals_nomem;
58186 -atomic_t fscache_n_retrievals_object_dead;
58187 -atomic_t fscache_n_retrieval_ops;
58188 -atomic_t fscache_n_retrieval_op_waits;
58189 +atomic_unchecked_t fscache_n_retrievals;
58190 +atomic_unchecked_t fscache_n_retrievals_ok;
58191 +atomic_unchecked_t fscache_n_retrievals_wait;
58192 +atomic_unchecked_t fscache_n_retrievals_nodata;
58193 +atomic_unchecked_t fscache_n_retrievals_nobufs;
58194 +atomic_unchecked_t fscache_n_retrievals_intr;
58195 +atomic_unchecked_t fscache_n_retrievals_nomem;
58196 +atomic_unchecked_t fscache_n_retrievals_object_dead;
58197 +atomic_unchecked_t fscache_n_retrieval_ops;
58198 +atomic_unchecked_t fscache_n_retrieval_op_waits;
58199
58200 -atomic_t fscache_n_stores;
58201 -atomic_t fscache_n_stores_ok;
58202 -atomic_t fscache_n_stores_again;
58203 -atomic_t fscache_n_stores_nobufs;
58204 -atomic_t fscache_n_stores_oom;
58205 -atomic_t fscache_n_store_ops;
58206 -atomic_t fscache_n_store_calls;
58207 -atomic_t fscache_n_store_pages;
58208 -atomic_t fscache_n_store_radix_deletes;
58209 -atomic_t fscache_n_store_pages_over_limit;
58210 +atomic_unchecked_t fscache_n_stores;
58211 +atomic_unchecked_t fscache_n_stores_ok;
58212 +atomic_unchecked_t fscache_n_stores_again;
58213 +atomic_unchecked_t fscache_n_stores_nobufs;
58214 +atomic_unchecked_t fscache_n_stores_oom;
58215 +atomic_unchecked_t fscache_n_store_ops;
58216 +atomic_unchecked_t fscache_n_store_calls;
58217 +atomic_unchecked_t fscache_n_store_pages;
58218 +atomic_unchecked_t fscache_n_store_radix_deletes;
58219 +atomic_unchecked_t fscache_n_store_pages_over_limit;
58220
58221 -atomic_t fscache_n_store_vmscan_not_storing;
58222 -atomic_t fscache_n_store_vmscan_gone;
58223 -atomic_t fscache_n_store_vmscan_busy;
58224 -atomic_t fscache_n_store_vmscan_cancelled;
58225 -atomic_t fscache_n_store_vmscan_wait;
58226 +atomic_unchecked_t fscache_n_store_vmscan_not_storing;
58227 +atomic_unchecked_t fscache_n_store_vmscan_gone;
58228 +atomic_unchecked_t fscache_n_store_vmscan_busy;
58229 +atomic_unchecked_t fscache_n_store_vmscan_cancelled;
58230 +atomic_unchecked_t fscache_n_store_vmscan_wait;
58231
58232 -atomic_t fscache_n_marks;
58233 -atomic_t fscache_n_uncaches;
58234 +atomic_unchecked_t fscache_n_marks;
58235 +atomic_unchecked_t fscache_n_uncaches;
58236
58237 -atomic_t fscache_n_acquires;
58238 -atomic_t fscache_n_acquires_null;
58239 -atomic_t fscache_n_acquires_no_cache;
58240 -atomic_t fscache_n_acquires_ok;
58241 -atomic_t fscache_n_acquires_nobufs;
58242 -atomic_t fscache_n_acquires_oom;
58243 +atomic_unchecked_t fscache_n_acquires;
58244 +atomic_unchecked_t fscache_n_acquires_null;
58245 +atomic_unchecked_t fscache_n_acquires_no_cache;
58246 +atomic_unchecked_t fscache_n_acquires_ok;
58247 +atomic_unchecked_t fscache_n_acquires_nobufs;
58248 +atomic_unchecked_t fscache_n_acquires_oom;
58249
58250 -atomic_t fscache_n_invalidates;
58251 -atomic_t fscache_n_invalidates_run;
58252 +atomic_unchecked_t fscache_n_invalidates;
58253 +atomic_unchecked_t fscache_n_invalidates_run;
58254
58255 -atomic_t fscache_n_updates;
58256 -atomic_t fscache_n_updates_null;
58257 -atomic_t fscache_n_updates_run;
58258 +atomic_unchecked_t fscache_n_updates;
58259 +atomic_unchecked_t fscache_n_updates_null;
58260 +atomic_unchecked_t fscache_n_updates_run;
58261
58262 -atomic_t fscache_n_relinquishes;
58263 -atomic_t fscache_n_relinquishes_null;
58264 -atomic_t fscache_n_relinquishes_waitcrt;
58265 -atomic_t fscache_n_relinquishes_retire;
58266 +atomic_unchecked_t fscache_n_relinquishes;
58267 +atomic_unchecked_t fscache_n_relinquishes_null;
58268 +atomic_unchecked_t fscache_n_relinquishes_waitcrt;
58269 +atomic_unchecked_t fscache_n_relinquishes_retire;
58270
58271 -atomic_t fscache_n_cookie_index;
58272 -atomic_t fscache_n_cookie_data;
58273 -atomic_t fscache_n_cookie_special;
58274 +atomic_unchecked_t fscache_n_cookie_index;
58275 +atomic_unchecked_t fscache_n_cookie_data;
58276 +atomic_unchecked_t fscache_n_cookie_special;
58277
58278 -atomic_t fscache_n_object_alloc;
58279 -atomic_t fscache_n_object_no_alloc;
58280 -atomic_t fscache_n_object_lookups;
58281 -atomic_t fscache_n_object_lookups_negative;
58282 -atomic_t fscache_n_object_lookups_positive;
58283 -atomic_t fscache_n_object_lookups_timed_out;
58284 -atomic_t fscache_n_object_created;
58285 -atomic_t fscache_n_object_avail;
58286 -atomic_t fscache_n_object_dead;
58287 +atomic_unchecked_t fscache_n_object_alloc;
58288 +atomic_unchecked_t fscache_n_object_no_alloc;
58289 +atomic_unchecked_t fscache_n_object_lookups;
58290 +atomic_unchecked_t fscache_n_object_lookups_negative;
58291 +atomic_unchecked_t fscache_n_object_lookups_positive;
58292 +atomic_unchecked_t fscache_n_object_lookups_timed_out;
58293 +atomic_unchecked_t fscache_n_object_created;
58294 +atomic_unchecked_t fscache_n_object_avail;
58295 +atomic_unchecked_t fscache_n_object_dead;
58296
58297 -atomic_t fscache_n_checkaux_none;
58298 -atomic_t fscache_n_checkaux_okay;
58299 -atomic_t fscache_n_checkaux_update;
58300 -atomic_t fscache_n_checkaux_obsolete;
58301 +atomic_unchecked_t fscache_n_checkaux_none;
58302 +atomic_unchecked_t fscache_n_checkaux_okay;
58303 +atomic_unchecked_t fscache_n_checkaux_update;
58304 +atomic_unchecked_t fscache_n_checkaux_obsolete;
58305
58306 atomic_t fscache_n_cop_alloc_object;
58307 atomic_t fscache_n_cop_lookup_object;
58308 @@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
58309 seq_puts(m, "FS-Cache statistics\n");
58310
58311 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
58312 - atomic_read(&fscache_n_cookie_index),
58313 - atomic_read(&fscache_n_cookie_data),
58314 - atomic_read(&fscache_n_cookie_special));
58315 + atomic_read_unchecked(&fscache_n_cookie_index),
58316 + atomic_read_unchecked(&fscache_n_cookie_data),
58317 + atomic_read_unchecked(&fscache_n_cookie_special));
58318
58319 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
58320 - atomic_read(&fscache_n_object_alloc),
58321 - atomic_read(&fscache_n_object_no_alloc),
58322 - atomic_read(&fscache_n_object_avail),
58323 - atomic_read(&fscache_n_object_dead));
58324 + atomic_read_unchecked(&fscache_n_object_alloc),
58325 + atomic_read_unchecked(&fscache_n_object_no_alloc),
58326 + atomic_read_unchecked(&fscache_n_object_avail),
58327 + atomic_read_unchecked(&fscache_n_object_dead));
58328 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
58329 - atomic_read(&fscache_n_checkaux_none),
58330 - atomic_read(&fscache_n_checkaux_okay),
58331 - atomic_read(&fscache_n_checkaux_update),
58332 - atomic_read(&fscache_n_checkaux_obsolete));
58333 + atomic_read_unchecked(&fscache_n_checkaux_none),
58334 + atomic_read_unchecked(&fscache_n_checkaux_okay),
58335 + atomic_read_unchecked(&fscache_n_checkaux_update),
58336 + atomic_read_unchecked(&fscache_n_checkaux_obsolete));
58337
58338 seq_printf(m, "Pages : mrk=%u unc=%u\n",
58339 - atomic_read(&fscache_n_marks),
58340 - atomic_read(&fscache_n_uncaches));
58341 + atomic_read_unchecked(&fscache_n_marks),
58342 + atomic_read_unchecked(&fscache_n_uncaches));
58343
58344 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
58345 " oom=%u\n",
58346 - atomic_read(&fscache_n_acquires),
58347 - atomic_read(&fscache_n_acquires_null),
58348 - atomic_read(&fscache_n_acquires_no_cache),
58349 - atomic_read(&fscache_n_acquires_ok),
58350 - atomic_read(&fscache_n_acquires_nobufs),
58351 - atomic_read(&fscache_n_acquires_oom));
58352 + atomic_read_unchecked(&fscache_n_acquires),
58353 + atomic_read_unchecked(&fscache_n_acquires_null),
58354 + atomic_read_unchecked(&fscache_n_acquires_no_cache),
58355 + atomic_read_unchecked(&fscache_n_acquires_ok),
58356 + atomic_read_unchecked(&fscache_n_acquires_nobufs),
58357 + atomic_read_unchecked(&fscache_n_acquires_oom));
58358
58359 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
58360 - atomic_read(&fscache_n_object_lookups),
58361 - atomic_read(&fscache_n_object_lookups_negative),
58362 - atomic_read(&fscache_n_object_lookups_positive),
58363 - atomic_read(&fscache_n_object_created),
58364 - atomic_read(&fscache_n_object_lookups_timed_out));
58365 + atomic_read_unchecked(&fscache_n_object_lookups),
58366 + atomic_read_unchecked(&fscache_n_object_lookups_negative),
58367 + atomic_read_unchecked(&fscache_n_object_lookups_positive),
58368 + atomic_read_unchecked(&fscache_n_object_created),
58369 + atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
58370
58371 seq_printf(m, "Invals : n=%u run=%u\n",
58372 - atomic_read(&fscache_n_invalidates),
58373 - atomic_read(&fscache_n_invalidates_run));
58374 + atomic_read_unchecked(&fscache_n_invalidates),
58375 + atomic_read_unchecked(&fscache_n_invalidates_run));
58376
58377 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
58378 - atomic_read(&fscache_n_updates),
58379 - atomic_read(&fscache_n_updates_null),
58380 - atomic_read(&fscache_n_updates_run));
58381 + atomic_read_unchecked(&fscache_n_updates),
58382 + atomic_read_unchecked(&fscache_n_updates_null),
58383 + atomic_read_unchecked(&fscache_n_updates_run));
58384
58385 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
58386 - atomic_read(&fscache_n_relinquishes),
58387 - atomic_read(&fscache_n_relinquishes_null),
58388 - atomic_read(&fscache_n_relinquishes_waitcrt),
58389 - atomic_read(&fscache_n_relinquishes_retire));
58390 + atomic_read_unchecked(&fscache_n_relinquishes),
58391 + atomic_read_unchecked(&fscache_n_relinquishes_null),
58392 + atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
58393 + atomic_read_unchecked(&fscache_n_relinquishes_retire));
58394
58395 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
58396 - atomic_read(&fscache_n_attr_changed),
58397 - atomic_read(&fscache_n_attr_changed_ok),
58398 - atomic_read(&fscache_n_attr_changed_nobufs),
58399 - atomic_read(&fscache_n_attr_changed_nomem),
58400 - atomic_read(&fscache_n_attr_changed_calls));
58401 + atomic_read_unchecked(&fscache_n_attr_changed),
58402 + atomic_read_unchecked(&fscache_n_attr_changed_ok),
58403 + atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
58404 + atomic_read_unchecked(&fscache_n_attr_changed_nomem),
58405 + atomic_read_unchecked(&fscache_n_attr_changed_calls));
58406
58407 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
58408 - atomic_read(&fscache_n_allocs),
58409 - atomic_read(&fscache_n_allocs_ok),
58410 - atomic_read(&fscache_n_allocs_wait),
58411 - atomic_read(&fscache_n_allocs_nobufs),
58412 - atomic_read(&fscache_n_allocs_intr));
58413 + atomic_read_unchecked(&fscache_n_allocs),
58414 + atomic_read_unchecked(&fscache_n_allocs_ok),
58415 + atomic_read_unchecked(&fscache_n_allocs_wait),
58416 + atomic_read_unchecked(&fscache_n_allocs_nobufs),
58417 + atomic_read_unchecked(&fscache_n_allocs_intr));
58418 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
58419 - atomic_read(&fscache_n_alloc_ops),
58420 - atomic_read(&fscache_n_alloc_op_waits),
58421 - atomic_read(&fscache_n_allocs_object_dead));
58422 + atomic_read_unchecked(&fscache_n_alloc_ops),
58423 + atomic_read_unchecked(&fscache_n_alloc_op_waits),
58424 + atomic_read_unchecked(&fscache_n_allocs_object_dead));
58425
58426 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
58427 " int=%u oom=%u\n",
58428 - atomic_read(&fscache_n_retrievals),
58429 - atomic_read(&fscache_n_retrievals_ok),
58430 - atomic_read(&fscache_n_retrievals_wait),
58431 - atomic_read(&fscache_n_retrievals_nodata),
58432 - atomic_read(&fscache_n_retrievals_nobufs),
58433 - atomic_read(&fscache_n_retrievals_intr),
58434 - atomic_read(&fscache_n_retrievals_nomem));
58435 + atomic_read_unchecked(&fscache_n_retrievals),
58436 + atomic_read_unchecked(&fscache_n_retrievals_ok),
58437 + atomic_read_unchecked(&fscache_n_retrievals_wait),
58438 + atomic_read_unchecked(&fscache_n_retrievals_nodata),
58439 + atomic_read_unchecked(&fscache_n_retrievals_nobufs),
58440 + atomic_read_unchecked(&fscache_n_retrievals_intr),
58441 + atomic_read_unchecked(&fscache_n_retrievals_nomem));
58442 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
58443 - atomic_read(&fscache_n_retrieval_ops),
58444 - atomic_read(&fscache_n_retrieval_op_waits),
58445 - atomic_read(&fscache_n_retrievals_object_dead));
58446 + atomic_read_unchecked(&fscache_n_retrieval_ops),
58447 + atomic_read_unchecked(&fscache_n_retrieval_op_waits),
58448 + atomic_read_unchecked(&fscache_n_retrievals_object_dead));
58449
58450 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
58451 - atomic_read(&fscache_n_stores),
58452 - atomic_read(&fscache_n_stores_ok),
58453 - atomic_read(&fscache_n_stores_again),
58454 - atomic_read(&fscache_n_stores_nobufs),
58455 - atomic_read(&fscache_n_stores_oom));
58456 + atomic_read_unchecked(&fscache_n_stores),
58457 + atomic_read_unchecked(&fscache_n_stores_ok),
58458 + atomic_read_unchecked(&fscache_n_stores_again),
58459 + atomic_read_unchecked(&fscache_n_stores_nobufs),
58460 + atomic_read_unchecked(&fscache_n_stores_oom));
58461 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
58462 - atomic_read(&fscache_n_store_ops),
58463 - atomic_read(&fscache_n_store_calls),
58464 - atomic_read(&fscache_n_store_pages),
58465 - atomic_read(&fscache_n_store_radix_deletes),
58466 - atomic_read(&fscache_n_store_pages_over_limit));
58467 + atomic_read_unchecked(&fscache_n_store_ops),
58468 + atomic_read_unchecked(&fscache_n_store_calls),
58469 + atomic_read_unchecked(&fscache_n_store_pages),
58470 + atomic_read_unchecked(&fscache_n_store_radix_deletes),
58471 + atomic_read_unchecked(&fscache_n_store_pages_over_limit));
58472
58473 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
58474 - atomic_read(&fscache_n_store_vmscan_not_storing),
58475 - atomic_read(&fscache_n_store_vmscan_gone),
58476 - atomic_read(&fscache_n_store_vmscan_busy),
58477 - atomic_read(&fscache_n_store_vmscan_cancelled),
58478 - atomic_read(&fscache_n_store_vmscan_wait));
58479 + atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
58480 + atomic_read_unchecked(&fscache_n_store_vmscan_gone),
58481 + atomic_read_unchecked(&fscache_n_store_vmscan_busy),
58482 + atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
58483 + atomic_read_unchecked(&fscache_n_store_vmscan_wait));
58484
58485 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
58486 - atomic_read(&fscache_n_op_pend),
58487 - atomic_read(&fscache_n_op_run),
58488 - atomic_read(&fscache_n_op_enqueue),
58489 - atomic_read(&fscache_n_op_cancelled),
58490 - atomic_read(&fscache_n_op_rejected));
58491 + atomic_read_unchecked(&fscache_n_op_pend),
58492 + atomic_read_unchecked(&fscache_n_op_run),
58493 + atomic_read_unchecked(&fscache_n_op_enqueue),
58494 + atomic_read_unchecked(&fscache_n_op_cancelled),
58495 + atomic_read_unchecked(&fscache_n_op_rejected));
58496 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
58497 - atomic_read(&fscache_n_op_deferred_release),
58498 - atomic_read(&fscache_n_op_release),
58499 - atomic_read(&fscache_n_op_gc));
58500 + atomic_read_unchecked(&fscache_n_op_deferred_release),
58501 + atomic_read_unchecked(&fscache_n_op_release),
58502 + atomic_read_unchecked(&fscache_n_op_gc));
58503
58504 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
58505 atomic_read(&fscache_n_cop_alloc_object),
58506 diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
58507 index adbfd66..4b25822 100644
58508 --- a/fs/fuse/cuse.c
58509 +++ b/fs/fuse/cuse.c
58510 @@ -603,10 +603,12 @@ static int __init cuse_init(void)
58511 INIT_LIST_HEAD(&cuse_conntbl[i]);
58512
58513 /* inherit and extend fuse_dev_operations */
58514 - cuse_channel_fops = fuse_dev_operations;
58515 - cuse_channel_fops.owner = THIS_MODULE;
58516 - cuse_channel_fops.open = cuse_channel_open;
58517 - cuse_channel_fops.release = cuse_channel_release;
58518 + pax_open_kernel();
58519 + memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
58520 + *(void **)&cuse_channel_fops.owner = THIS_MODULE;
58521 + *(void **)&cuse_channel_fops.open = cuse_channel_open;
58522 + *(void **)&cuse_channel_fops.release = cuse_channel_release;
58523 + pax_close_kernel();
58524
58525 cuse_class = class_create(THIS_MODULE, "cuse");
58526 if (IS_ERR(cuse_class))
58527 diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
58528 index ef74ad5..c9ac759e 100644
58529 --- a/fs/fuse/dev.c
58530 +++ b/fs/fuse/dev.c
58531 @@ -1339,7 +1339,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
58532 ret = 0;
58533 pipe_lock(pipe);
58534
58535 - if (!pipe->readers) {
58536 + if (!atomic_read(&pipe->readers)) {
58537 send_sig(SIGPIPE, current, 0);
58538 if (!ret)
58539 ret = -EPIPE;
58540 @@ -1364,7 +1364,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
58541 page_nr++;
58542 ret += buf->len;
58543
58544 - if (pipe->files)
58545 + if (atomic_read(&pipe->files))
58546 do_wakeup = 1;
58547 }
58548
58549 diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
58550 index b7989f2..1f72ec4 100644
58551 --- a/fs/fuse/dir.c
58552 +++ b/fs/fuse/dir.c
58553 @@ -1438,7 +1438,7 @@ static char *read_link(struct dentry *dentry)
58554 return link;
58555 }
58556
58557 -static void free_link(char *link)
58558 +static void free_link(const char *link)
58559 {
58560 if (!IS_ERR(link))
58561 free_page((unsigned long) link);
58562 diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
58563 index 1298766..c964c60 100644
58564 --- a/fs/gfs2/inode.c
58565 +++ b/fs/gfs2/inode.c
58566 @@ -1515,7 +1515,7 @@ out:
58567
58568 static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
58569 {
58570 - char *s = nd_get_link(nd);
58571 + const char *s = nd_get_link(nd);
58572 if (!IS_ERR(s))
58573 kfree(s);
58574 }
58575 diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
58576 index 2543728..14d7bd4 100644
58577 --- a/fs/hostfs/hostfs_kern.c
58578 +++ b/fs/hostfs/hostfs_kern.c
58579 @@ -904,7 +904,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
58580
58581 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
58582 {
58583 - char *s = nd_get_link(nd);
58584 + const char *s = nd_get_link(nd);
58585 if (!IS_ERR(s))
58586 __putname(s);
58587 }
58588 diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
58589 index d19b30a..ef89c36 100644
58590 --- a/fs/hugetlbfs/inode.c
58591 +++ b/fs/hugetlbfs/inode.c
58592 @@ -152,6 +152,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
58593 struct mm_struct *mm = current->mm;
58594 struct vm_area_struct *vma;
58595 struct hstate *h = hstate_file(file);
58596 + unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
58597 struct vm_unmapped_area_info info;
58598
58599 if (len & ~huge_page_mask(h))
58600 @@ -165,17 +166,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
58601 return addr;
58602 }
58603
58604 +#ifdef CONFIG_PAX_RANDMMAP
58605 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
58606 +#endif
58607 +
58608 if (addr) {
58609 addr = ALIGN(addr, huge_page_size(h));
58610 vma = find_vma(mm, addr);
58611 - if (TASK_SIZE - len >= addr &&
58612 - (!vma || addr + len <= vma->vm_start))
58613 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
58614 return addr;
58615 }
58616
58617 info.flags = 0;
58618 info.length = len;
58619 info.low_limit = TASK_UNMAPPED_BASE;
58620 +
58621 +#ifdef CONFIG_PAX_RANDMMAP
58622 + if (mm->pax_flags & MF_PAX_RANDMMAP)
58623 + info.low_limit += mm->delta_mmap;
58624 +#endif
58625 +
58626 info.high_limit = TASK_SIZE;
58627 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
58628 info.align_offset = 0;
58629 @@ -908,7 +918,7 @@ static struct file_system_type hugetlbfs_fs_type = {
58630 };
58631 MODULE_ALIAS_FS("hugetlbfs");
58632
58633 -static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
58634 +struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
58635
58636 static int can_do_hugetlb_shm(void)
58637 {
58638 diff --git a/fs/inode.c b/fs/inode.c
58639 index b33ba8e..3c79a47 100644
58640 --- a/fs/inode.c
58641 +++ b/fs/inode.c
58642 @@ -849,8 +849,8 @@ unsigned int get_next_ino(void)
58643
58644 #ifdef CONFIG_SMP
58645 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
58646 - static atomic_t shared_last_ino;
58647 - int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
58648 + static atomic_unchecked_t shared_last_ino;
58649 + int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
58650
58651 res = next - LAST_INO_BATCH;
58652 }
58653 diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
58654 index 4a6cf28..d3a29d3 100644
58655 --- a/fs/jffs2/erase.c
58656 +++ b/fs/jffs2/erase.c
58657 @@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
58658 struct jffs2_unknown_node marker = {
58659 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
58660 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
58661 - .totlen = cpu_to_je32(c->cleanmarker_size)
58662 + .totlen = cpu_to_je32(c->cleanmarker_size),
58663 + .hdr_crc = cpu_to_je32(0)
58664 };
58665
58666 jffs2_prealloc_raw_node_refs(c, jeb, 1);
58667 diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
58668 index a6597d6..41b30ec 100644
58669 --- a/fs/jffs2/wbuf.c
58670 +++ b/fs/jffs2/wbuf.c
58671 @@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
58672 {
58673 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
58674 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
58675 - .totlen = constant_cpu_to_je32(8)
58676 + .totlen = constant_cpu_to_je32(8),
58677 + .hdr_crc = constant_cpu_to_je32(0)
58678 };
58679
58680 /*
58681 diff --git a/fs/jfs/super.c b/fs/jfs/super.c
58682 index 6669aa2..36b033d 100644
58683 --- a/fs/jfs/super.c
58684 +++ b/fs/jfs/super.c
58685 @@ -882,7 +882,7 @@ static int __init init_jfs_fs(void)
58686
58687 jfs_inode_cachep =
58688 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
58689 - SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
58690 + SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
58691 init_once);
58692 if (jfs_inode_cachep == NULL)
58693 return -ENOMEM;
58694 diff --git a/fs/libfs.c b/fs/libfs.c
58695 index 193e0c2..7404665 100644
58696 --- a/fs/libfs.c
58697 +++ b/fs/libfs.c
58698 @@ -150,6 +150,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
58699
58700 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
58701 struct dentry *next = list_entry(p, struct dentry, d_u.d_child);
58702 + char d_name[sizeof(next->d_iname)];
58703 + const unsigned char *name;
58704 +
58705 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
58706 if (!simple_positive(next)) {
58707 spin_unlock(&next->d_lock);
58708 @@ -158,7 +161,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
58709
58710 spin_unlock(&next->d_lock);
58711 spin_unlock(&dentry->d_lock);
58712 - if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
58713 + name = next->d_name.name;
58714 + if (name == next->d_iname) {
58715 + memcpy(d_name, name, next->d_name.len);
58716 + name = d_name;
58717 + }
58718 + if (!dir_emit(ctx, name, next->d_name.len,
58719 next->d_inode->i_ino, dt_type(next->d_inode)))
58720 return 0;
58721 spin_lock(&dentry->d_lock);
58722 diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
58723 index acd3947..1f896e2 100644
58724 --- a/fs/lockd/clntproc.c
58725 +++ b/fs/lockd/clntproc.c
58726 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
58727 /*
58728 * Cookie counter for NLM requests
58729 */
58730 -static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
58731 +static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
58732
58733 void nlmclnt_next_cookie(struct nlm_cookie *c)
58734 {
58735 - u32 cookie = atomic_inc_return(&nlm_cookie);
58736 + u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
58737
58738 memcpy(c->data, &cookie, 4);
58739 c->len=4;
58740 diff --git a/fs/locks.c b/fs/locks.c
58741 index b27a300..4156d0b 100644
58742 --- a/fs/locks.c
58743 +++ b/fs/locks.c
58744 @@ -2183,16 +2183,16 @@ void locks_remove_flock(struct file *filp)
58745 return;
58746
58747 if (filp->f_op && filp->f_op->flock) {
58748 - struct file_lock fl = {
58749 + struct file_lock flock = {
58750 .fl_pid = current->tgid,
58751 .fl_file = filp,
58752 .fl_flags = FL_FLOCK,
58753 .fl_type = F_UNLCK,
58754 .fl_end = OFFSET_MAX,
58755 };
58756 - filp->f_op->flock(filp, F_SETLKW, &fl);
58757 - if (fl.fl_ops && fl.fl_ops->fl_release_private)
58758 - fl.fl_ops->fl_release_private(&fl);
58759 + filp->f_op->flock(filp, F_SETLKW, &flock);
58760 + if (flock.fl_ops && flock.fl_ops->fl_release_private)
58761 + flock.fl_ops->fl_release_private(&flock);
58762 }
58763
58764 spin_lock(&inode->i_lock);
58765 diff --git a/fs/namei.c b/fs/namei.c
58766 index 23ac50f..c6757a5 100644
58767 --- a/fs/namei.c
58768 +++ b/fs/namei.c
58769 @@ -319,16 +319,32 @@ int generic_permission(struct inode *inode, int mask)
58770 if (ret != -EACCES)
58771 return ret;
58772
58773 +#ifdef CONFIG_GRKERNSEC
58774 + /* we'll block if we have to log due to a denied capability use */
58775 + if (mask & MAY_NOT_BLOCK)
58776 + return -ECHILD;
58777 +#endif
58778 +
58779 if (S_ISDIR(inode->i_mode)) {
58780 /* DACs are overridable for directories */
58781 - if (inode_capable(inode, CAP_DAC_OVERRIDE))
58782 - return 0;
58783 if (!(mask & MAY_WRITE))
58784 - if (inode_capable(inode, CAP_DAC_READ_SEARCH))
58785 + if (inode_capable_nolog(inode, CAP_DAC_OVERRIDE) ||
58786 + inode_capable(inode, CAP_DAC_READ_SEARCH))
58787 return 0;
58788 + if (inode_capable(inode, CAP_DAC_OVERRIDE))
58789 + return 0;
58790 return -EACCES;
58791 }
58792 /*
58793 + * Searching includes executable on directories, else just read.
58794 + */
58795 + mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
58796 + if (mask == MAY_READ)
58797 + if (inode_capable_nolog(inode, CAP_DAC_OVERRIDE) ||
58798 + inode_capable(inode, CAP_DAC_READ_SEARCH))
58799 + return 0;
58800 +
58801 + /*
58802 * Read/write DACs are always overridable.
58803 * Executable DACs are overridable when there is
58804 * at least one exec bit set.
58805 @@ -337,14 +353,6 @@ int generic_permission(struct inode *inode, int mask)
58806 if (inode_capable(inode, CAP_DAC_OVERRIDE))
58807 return 0;
58808
58809 - /*
58810 - * Searching includes executable on directories, else just read.
58811 - */
58812 - mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
58813 - if (mask == MAY_READ)
58814 - if (inode_capable(inode, CAP_DAC_READ_SEARCH))
58815 - return 0;
58816 -
58817 return -EACCES;
58818 }
58819
58820 @@ -821,7 +829,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
58821 {
58822 struct dentry *dentry = link->dentry;
58823 int error;
58824 - char *s;
58825 + const char *s;
58826
58827 BUG_ON(nd->flags & LOOKUP_RCU);
58828
58829 @@ -842,6 +850,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
58830 if (error)
58831 goto out_put_nd_path;
58832
58833 + if (gr_handle_follow_link(dentry->d_parent->d_inode,
58834 + dentry->d_inode, dentry, nd->path.mnt)) {
58835 + error = -EACCES;
58836 + goto out_put_nd_path;
58837 + }
58838 +
58839 nd->last_type = LAST_BIND;
58840 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
58841 error = PTR_ERR(*p);
58842 @@ -1602,6 +1616,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
58843 if (res)
58844 break;
58845 res = walk_component(nd, path, LOOKUP_FOLLOW);
58846 + if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
58847 + res = -EACCES;
58848 put_link(nd, &link, cookie);
58849 } while (res > 0);
58850
58851 @@ -1700,7 +1716,7 @@ EXPORT_SYMBOL(full_name_hash);
58852 static inline unsigned long hash_name(const char *name, unsigned int *hashp)
58853 {
58854 unsigned long a, b, adata, bdata, mask, hash, len;
58855 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
58856 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
58857
58858 hash = a = 0;
58859 len = -sizeof(unsigned long);
58860 @@ -1981,6 +1997,8 @@ static int path_lookupat(int dfd, const char *name,
58861 if (err)
58862 break;
58863 err = lookup_last(nd, &path);
58864 + if (!err && gr_handle_symlink_owner(&link, nd->inode))
58865 + err = -EACCES;
58866 put_link(nd, &link, cookie);
58867 }
58868 }
58869 @@ -1988,6 +2006,13 @@ static int path_lookupat(int dfd, const char *name,
58870 if (!err)
58871 err = complete_walk(nd);
58872
58873 + if (!err && !(nd->flags & LOOKUP_PARENT)) {
58874 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
58875 + path_put(&nd->path);
58876 + err = -ENOENT;
58877 + }
58878 + }
58879 +
58880 if (!err && nd->flags & LOOKUP_DIRECTORY) {
58881 if (!can_lookup(nd->inode)) {
58882 path_put(&nd->path);
58883 @@ -2015,8 +2040,15 @@ static int filename_lookup(int dfd, struct filename *name,
58884 retval = path_lookupat(dfd, name->name,
58885 flags | LOOKUP_REVAL, nd);
58886
58887 - if (likely(!retval))
58888 + if (likely(!retval)) {
58889 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
58890 + if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
58891 + if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
58892 + path_put(&nd->path);
58893 + return -ENOENT;
58894 + }
58895 + }
58896 + }
58897 return retval;
58898 }
58899
58900 @@ -2587,6 +2619,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
58901 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
58902 return -EPERM;
58903
58904 + if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
58905 + return -EPERM;
58906 + if (gr_handle_rawio(inode))
58907 + return -EPERM;
58908 + if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
58909 + return -EACCES;
58910 +
58911 return 0;
58912 }
58913
58914 @@ -2818,7 +2857,7 @@ looked_up:
58915 * cleared otherwise prior to returning.
58916 */
58917 static int lookup_open(struct nameidata *nd, struct path *path,
58918 - struct file *file,
58919 + struct path *link, struct file *file,
58920 const struct open_flags *op,
58921 bool got_write, int *opened)
58922 {
58923 @@ -2853,6 +2892,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
58924 /* Negative dentry, just create the file */
58925 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
58926 umode_t mode = op->mode;
58927 +
58928 + if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
58929 + error = -EACCES;
58930 + goto out_dput;
58931 + }
58932 +
58933 + if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
58934 + error = -EACCES;
58935 + goto out_dput;
58936 + }
58937 +
58938 if (!IS_POSIXACL(dir->d_inode))
58939 mode &= ~current_umask();
58940 /*
58941 @@ -2874,6 +2924,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
58942 nd->flags & LOOKUP_EXCL);
58943 if (error)
58944 goto out_dput;
58945 + else
58946 + gr_handle_create(dentry, nd->path.mnt);
58947 }
58948 out_no_open:
58949 path->dentry = dentry;
58950 @@ -2888,7 +2940,7 @@ out_dput:
58951 /*
58952 * Handle the last step of open()
58953 */
58954 -static int do_last(struct nameidata *nd, struct path *path,
58955 +static int do_last(struct nameidata *nd, struct path *path, struct path *link,
58956 struct file *file, const struct open_flags *op,
58957 int *opened, struct filename *name)
58958 {
58959 @@ -2938,6 +2990,15 @@ static int do_last(struct nameidata *nd, struct path *path,
58960 if (error)
58961 return error;
58962
58963 + if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
58964 + error = -ENOENT;
58965 + goto out;
58966 + }
58967 + if (link && gr_handle_symlink_owner(link, nd->inode)) {
58968 + error = -EACCES;
58969 + goto out;
58970 + }
58971 +
58972 audit_inode(name, dir, LOOKUP_PARENT);
58973 error = -EISDIR;
58974 /* trailing slashes? */
58975 @@ -2957,7 +3018,7 @@ retry_lookup:
58976 */
58977 }
58978 mutex_lock(&dir->d_inode->i_mutex);
58979 - error = lookup_open(nd, path, file, op, got_write, opened);
58980 + error = lookup_open(nd, path, link, file, op, got_write, opened);
58981 mutex_unlock(&dir->d_inode->i_mutex);
58982
58983 if (error <= 0) {
58984 @@ -2981,11 +3042,28 @@ retry_lookup:
58985 goto finish_open_created;
58986 }
58987
58988 + if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
58989 + error = -ENOENT;
58990 + goto exit_dput;
58991 + }
58992 + if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
58993 + error = -EACCES;
58994 + goto exit_dput;
58995 + }
58996 +
58997 /*
58998 * create/update audit record if it already exists.
58999 */
59000 - if (path->dentry->d_inode)
59001 + if (path->dentry->d_inode) {
59002 + /* only check if O_CREAT is specified, all other checks need to go
59003 + into may_open */
59004 + if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
59005 + error = -EACCES;
59006 + goto exit_dput;
59007 + }
59008 +
59009 audit_inode(name, path->dentry, 0);
59010 + }
59011
59012 /*
59013 * If atomic_open() acquired write access it is dropped now due to
59014 @@ -3026,6 +3104,11 @@ finish_lookup:
59015 }
59016 }
59017 BUG_ON(inode != path->dentry->d_inode);
59018 + /* if we're resolving a symlink to another symlink */
59019 + if (link && gr_handle_symlink_owner(link, inode)) {
59020 + error = -EACCES;
59021 + goto out;
59022 + }
59023 return 1;
59024 }
59025
59026 @@ -3035,7 +3118,6 @@ finish_lookup:
59027 save_parent.dentry = nd->path.dentry;
59028 save_parent.mnt = mntget(path->mnt);
59029 nd->path.dentry = path->dentry;
59030 -
59031 }
59032 nd->inode = inode;
59033 /* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */
59034 @@ -3045,7 +3127,18 @@ finish_open:
59035 path_put(&save_parent);
59036 return error;
59037 }
59038 +
59039 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
59040 + error = -ENOENT;
59041 + goto out;
59042 + }
59043 + if (link && gr_handle_symlink_owner(link, nd->inode)) {
59044 + error = -EACCES;
59045 + goto out;
59046 + }
59047 +
59048 audit_inode(name, nd->path.dentry, 0);
59049 +
59050 error = -EISDIR;
59051 if ((open_flag & O_CREAT) && S_ISDIR(nd->inode->i_mode))
59052 goto out;
59053 @@ -3208,7 +3301,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
59054 if (unlikely(error))
59055 goto out;
59056
59057 - error = do_last(nd, &path, file, op, &opened, pathname);
59058 + error = do_last(nd, &path, NULL, file, op, &opened, pathname);
59059 while (unlikely(error > 0)) { /* trailing symlink */
59060 struct path link = path;
59061 void *cookie;
59062 @@ -3226,7 +3319,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
59063 error = follow_link(&link, nd, &cookie);
59064 if (unlikely(error))
59065 break;
59066 - error = do_last(nd, &path, file, op, &opened, pathname);
59067 + error = do_last(nd, &path, &link, file, op, &opened, pathname);
59068 put_link(nd, &link, cookie);
59069 }
59070 out:
59071 @@ -3326,8 +3419,12 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
59072 goto unlock;
59073
59074 error = -EEXIST;
59075 - if (dentry->d_inode)
59076 + if (dentry->d_inode) {
59077 + if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt)) {
59078 + error = -ENOENT;
59079 + }
59080 goto fail;
59081 + }
59082 /*
59083 * Special case - lookup gave negative, but... we had foo/bar/
59084 * From the vfs_mknod() POV we just have a negative dentry -
59085 @@ -3379,6 +3476,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
59086 }
59087 EXPORT_SYMBOL(user_path_create);
59088
59089 +static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
59090 +{
59091 + struct filename *tmp = getname(pathname);
59092 + struct dentry *res;
59093 + if (IS_ERR(tmp))
59094 + return ERR_CAST(tmp);
59095 + res = kern_path_create(dfd, tmp->name, path, lookup_flags);
59096 + if (IS_ERR(res))
59097 + putname(tmp);
59098 + else
59099 + *to = tmp;
59100 + return res;
59101 +}
59102 +
59103 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
59104 {
59105 int error = may_create(dir, dentry);
59106 @@ -3441,6 +3552,17 @@ retry:
59107
59108 if (!IS_POSIXACL(path.dentry->d_inode))
59109 mode &= ~current_umask();
59110 +
59111 + if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
59112 + error = -EPERM;
59113 + goto out;
59114 + }
59115 +
59116 + if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
59117 + error = -EACCES;
59118 + goto out;
59119 + }
59120 +
59121 error = security_path_mknod(&path, dentry, mode, dev);
59122 if (error)
59123 goto out;
59124 @@ -3457,6 +3579,8 @@ retry:
59125 break;
59126 }
59127 out:
59128 + if (!error)
59129 + gr_handle_create(dentry, path.mnt);
59130 done_path_create(&path, dentry);
59131 if (retry_estale(error, lookup_flags)) {
59132 lookup_flags |= LOOKUP_REVAL;
59133 @@ -3509,9 +3633,16 @@ retry:
59134
59135 if (!IS_POSIXACL(path.dentry->d_inode))
59136 mode &= ~current_umask();
59137 + if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
59138 + error = -EACCES;
59139 + goto out;
59140 + }
59141 error = security_path_mkdir(&path, dentry, mode);
59142 if (!error)
59143 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
59144 + if (!error)
59145 + gr_handle_create(dentry, path.mnt);
59146 +out:
59147 done_path_create(&path, dentry);
59148 if (retry_estale(error, lookup_flags)) {
59149 lookup_flags |= LOOKUP_REVAL;
59150 @@ -3592,6 +3723,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
59151 struct filename *name;
59152 struct dentry *dentry;
59153 struct nameidata nd;
59154 + ino_t saved_ino = 0;
59155 + dev_t saved_dev = 0;
59156 unsigned int lookup_flags = 0;
59157 retry:
59158 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
59159 @@ -3624,10 +3757,21 @@ retry:
59160 error = -ENOENT;
59161 goto exit3;
59162 }
59163 +
59164 + saved_ino = dentry->d_inode->i_ino;
59165 + saved_dev = gr_get_dev_from_dentry(dentry);
59166 +
59167 + if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
59168 + error = -EACCES;
59169 + goto exit3;
59170 + }
59171 +
59172 error = security_path_rmdir(&nd.path, dentry);
59173 if (error)
59174 goto exit3;
59175 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
59176 + if (!error && (saved_dev || saved_ino))
59177 + gr_handle_delete(saved_ino, saved_dev);
59178 exit3:
59179 dput(dentry);
59180 exit2:
59181 @@ -3693,6 +3837,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
59182 struct dentry *dentry;
59183 struct nameidata nd;
59184 struct inode *inode = NULL;
59185 + ino_t saved_ino = 0;
59186 + dev_t saved_dev = 0;
59187 unsigned int lookup_flags = 0;
59188 retry:
59189 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
59190 @@ -3719,10 +3865,22 @@ retry:
59191 if (!inode)
59192 goto slashes;
59193 ihold(inode);
59194 +
59195 + if (inode->i_nlink <= 1) {
59196 + saved_ino = inode->i_ino;
59197 + saved_dev = gr_get_dev_from_dentry(dentry);
59198 + }
59199 + if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
59200 + error = -EACCES;
59201 + goto exit2;
59202 + }
59203 +
59204 error = security_path_unlink(&nd.path, dentry);
59205 if (error)
59206 goto exit2;
59207 error = vfs_unlink(nd.path.dentry->d_inode, dentry);
59208 + if (!error && (saved_ino || saved_dev))
59209 + gr_handle_delete(saved_ino, saved_dev);
59210 exit2:
59211 dput(dentry);
59212 }
59213 @@ -3800,9 +3958,17 @@ retry:
59214 if (IS_ERR(dentry))
59215 goto out_putname;
59216
59217 + if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
59218 + error = -EACCES;
59219 + goto out;
59220 + }
59221 +
59222 error = security_path_symlink(&path, dentry, from->name);
59223 if (!error)
59224 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
59225 + if (!error)
59226 + gr_handle_create(dentry, path.mnt);
59227 +out:
59228 done_path_create(&path, dentry);
59229 if (retry_estale(error, lookup_flags)) {
59230 lookup_flags |= LOOKUP_REVAL;
59231 @@ -3882,6 +4048,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
59232 {
59233 struct dentry *new_dentry;
59234 struct path old_path, new_path;
59235 + struct filename *to = NULL;
59236 int how = 0;
59237 int error;
59238
59239 @@ -3905,7 +4072,7 @@ retry:
59240 if (error)
59241 return error;
59242
59243 - new_dentry = user_path_create(newdfd, newname, &new_path,
59244 + new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
59245 (how & LOOKUP_REVAL));
59246 error = PTR_ERR(new_dentry);
59247 if (IS_ERR(new_dentry))
59248 @@ -3917,11 +4084,28 @@ retry:
59249 error = may_linkat(&old_path);
59250 if (unlikely(error))
59251 goto out_dput;
59252 +
59253 + if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
59254 + old_path.dentry->d_inode,
59255 + old_path.dentry->d_inode->i_mode, to)) {
59256 + error = -EACCES;
59257 + goto out_dput;
59258 + }
59259 +
59260 + if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
59261 + old_path.dentry, old_path.mnt, to)) {
59262 + error = -EACCES;
59263 + goto out_dput;
59264 + }
59265 +
59266 error = security_path_link(old_path.dentry, &new_path, new_dentry);
59267 if (error)
59268 goto out_dput;
59269 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
59270 + if (!error)
59271 + gr_handle_create(new_dentry, new_path.mnt);
59272 out_dput:
59273 + putname(to);
59274 done_path_create(&new_path, new_dentry);
59275 if (retry_estale(error, how)) {
59276 how |= LOOKUP_REVAL;
59277 @@ -4167,12 +4351,21 @@ retry:
59278 if (new_dentry == trap)
59279 goto exit5;
59280
59281 + error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
59282 + old_dentry, old_dir->d_inode, oldnd.path.mnt,
59283 + to);
59284 + if (error)
59285 + goto exit5;
59286 +
59287 error = security_path_rename(&oldnd.path, old_dentry,
59288 &newnd.path, new_dentry);
59289 if (error)
59290 goto exit5;
59291 error = vfs_rename(old_dir->d_inode, old_dentry,
59292 new_dir->d_inode, new_dentry);
59293 + if (!error)
59294 + gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
59295 + new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
59296 exit5:
59297 dput(new_dentry);
59298 exit4:
59299 @@ -4204,6 +4397,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
59300
59301 int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
59302 {
59303 + char tmpbuf[64];
59304 + const char *newlink;
59305 int len;
59306
59307 len = PTR_ERR(link);
59308 @@ -4213,7 +4408,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
59309 len = strlen(link);
59310 if (len > (unsigned) buflen)
59311 len = buflen;
59312 - if (copy_to_user(buffer, link, len))
59313 +
59314 + if (len < sizeof(tmpbuf)) {
59315 + memcpy(tmpbuf, link, len);
59316 + newlink = tmpbuf;
59317 + } else
59318 + newlink = link;
59319 +
59320 + if (copy_to_user(buffer, newlink, len))
59321 len = -EFAULT;
59322 out:
59323 return len;
59324 diff --git a/fs/namespace.c b/fs/namespace.c
59325 index da5c494..a755a54 100644
59326 --- a/fs/namespace.c
59327 +++ b/fs/namespace.c
59328 @@ -1268,6 +1268,9 @@ static int do_umount(struct mount *mnt, int flags)
59329 if (!(sb->s_flags & MS_RDONLY))
59330 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
59331 up_write(&sb->s_umount);
59332 +
59333 + gr_log_remount(mnt->mnt_devname, retval);
59334 +
59335 return retval;
59336 }
59337
59338 @@ -1286,6 +1289,9 @@ static int do_umount(struct mount *mnt, int flags)
59339 }
59340 br_write_unlock(&vfsmount_lock);
59341 namespace_unlock();
59342 +
59343 + gr_log_unmount(mnt->mnt_devname, retval);
59344 +
59345 return retval;
59346 }
59347
59348 @@ -1305,7 +1311,7 @@ static inline bool may_mount(void)
59349 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
59350 */
59351
59352 -SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
59353 +SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
59354 {
59355 struct path path;
59356 struct mount *mnt;
59357 @@ -1347,7 +1353,7 @@ out:
59358 /*
59359 * The 2.0 compatible umount. No flags.
59360 */
59361 -SYSCALL_DEFINE1(oldumount, char __user *, name)
59362 +SYSCALL_DEFINE1(oldumount, const char __user *, name)
59363 {
59364 return sys_umount(name, 0);
59365 }
59366 @@ -2358,6 +2364,16 @@ long do_mount(const char *dev_name, const char *dir_name,
59367 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
59368 MS_STRICTATIME);
59369
59370 + if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
59371 + retval = -EPERM;
59372 + goto dput_out;
59373 + }
59374 +
59375 + if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
59376 + retval = -EPERM;
59377 + goto dput_out;
59378 + }
59379 +
59380 if (flags & MS_REMOUNT)
59381 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
59382 data_page);
59383 @@ -2372,6 +2388,9 @@ long do_mount(const char *dev_name, const char *dir_name,
59384 dev_name, data_page);
59385 dput_out:
59386 path_put(&path);
59387 +
59388 + gr_log_mount(dev_name, dir_name, retval);
59389 +
59390 return retval;
59391 }
59392
59393 @@ -2389,7 +2408,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
59394 * number incrementing at 10Ghz will take 12,427 years to wrap which
59395 * is effectively never, so we can ignore the possibility.
59396 */
59397 -static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
59398 +static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
59399
59400 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
59401 {
59402 @@ -2404,7 +2423,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
59403 kfree(new_ns);
59404 return ERR_PTR(ret);
59405 }
59406 - new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
59407 + new_ns->seq = atomic64_inc_return_unchecked(&mnt_ns_seq);
59408 atomic_set(&new_ns->count, 1);
59409 new_ns->root = NULL;
59410 INIT_LIST_HEAD(&new_ns->list);
59411 @@ -2418,7 +2437,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
59412 * Allocate a new namespace structure and populate it with contents
59413 * copied from the namespace of the passed in task structure.
59414 */
59415 -static struct mnt_namespace *dup_mnt_ns(struct mnt_namespace *mnt_ns,
59416 +static __latent_entropy struct mnt_namespace *dup_mnt_ns(struct mnt_namespace *mnt_ns,
59417 struct user_namespace *user_ns, struct fs_struct *fs)
59418 {
59419 struct mnt_namespace *new_ns;
59420 @@ -2549,8 +2568,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
59421 }
59422 EXPORT_SYMBOL(mount_subtree);
59423
59424 -SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
59425 - char __user *, type, unsigned long, flags, void __user *, data)
59426 +SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
59427 + const char __user *, type, unsigned long, flags, void __user *, data)
59428 {
59429 int ret;
59430 char *kernel_type;
59431 @@ -2663,6 +2682,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
59432 if (error)
59433 goto out2;
59434
59435 + if (gr_handle_chroot_pivot()) {
59436 + error = -EPERM;
59437 + goto out2;
59438 + }
59439 +
59440 get_fs_root(current->fs, &root);
59441 old_mp = lock_mount(&old);
59442 error = PTR_ERR(old_mp);
59443 @@ -2932,7 +2956,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
59444 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
59445 return -EPERM;
59446
59447 - if (fs->users != 1)
59448 + if (atomic_read(&fs->users) != 1)
59449 return -EINVAL;
59450
59451 get_mnt_ns(mnt_ns);
59452 diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
59453 index f4ccfe6..a5cf064 100644
59454 --- a/fs/nfs/callback_xdr.c
59455 +++ b/fs/nfs/callback_xdr.c
59456 @@ -51,7 +51,7 @@ struct callback_op {
59457 callback_decode_arg_t decode_args;
59458 callback_encode_res_t encode_res;
59459 long res_maxsize;
59460 -};
59461 +} __do_const;
59462
59463 static struct callback_op callback_ops[];
59464
59465 diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
59466 index eda8879..bfc6837 100644
59467 --- a/fs/nfs/inode.c
59468 +++ b/fs/nfs/inode.c
59469 @@ -1150,16 +1150,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
59470 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
59471 }
59472
59473 -static atomic_long_t nfs_attr_generation_counter;
59474 +static atomic_long_unchecked_t nfs_attr_generation_counter;
59475
59476 static unsigned long nfs_read_attr_generation_counter(void)
59477 {
59478 - return atomic_long_read(&nfs_attr_generation_counter);
59479 + return atomic_long_read_unchecked(&nfs_attr_generation_counter);
59480 }
59481
59482 unsigned long nfs_inc_attr_generation_counter(void)
59483 {
59484 - return atomic_long_inc_return(&nfs_attr_generation_counter);
59485 + return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
59486 }
59487
59488 void nfs_fattr_init(struct nfs_fattr *fattr)
59489 diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
59490 index 419572f..5414a23 100644
59491 --- a/fs/nfsd/nfs4proc.c
59492 +++ b/fs/nfsd/nfs4proc.c
59493 @@ -1168,7 +1168,7 @@ struct nfsd4_operation {
59494 nfsd4op_rsize op_rsize_bop;
59495 stateid_getter op_get_currentstateid;
59496 stateid_setter op_set_currentstateid;
59497 -};
59498 +} __do_const;
59499
59500 static struct nfsd4_operation nfsd4_ops[];
59501
59502 diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
59503 index ecc735e..79b2d31 100644
59504 --- a/fs/nfsd/nfs4xdr.c
59505 +++ b/fs/nfsd/nfs4xdr.c
59506 @@ -1500,7 +1500,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
59507
59508 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
59509
59510 -static nfsd4_dec nfsd4_dec_ops[] = {
59511 +static const nfsd4_dec nfsd4_dec_ops[] = {
59512 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
59513 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
59514 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
59515 @@ -1540,7 +1540,7 @@ static nfsd4_dec nfsd4_dec_ops[] = {
59516 [OP_RELEASE_LOCKOWNER] = (nfsd4_dec)nfsd4_decode_release_lockowner,
59517 };
59518
59519 -static nfsd4_dec nfsd41_dec_ops[] = {
59520 +static const nfsd4_dec nfsd41_dec_ops[] = {
59521 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
59522 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
59523 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
59524 @@ -1602,7 +1602,7 @@ static nfsd4_dec nfsd41_dec_ops[] = {
59525 };
59526
59527 struct nfsd4_minorversion_ops {
59528 - nfsd4_dec *decoders;
59529 + const nfsd4_dec *decoders;
59530 int nops;
59531 };
59532
59533 diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
59534 index b6af150..f6ec5e3 100644
59535 --- a/fs/nfsd/nfscache.c
59536 +++ b/fs/nfsd/nfscache.c
59537 @@ -547,14 +547,17 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
59538 {
59539 struct svc_cacherep *rp = rqstp->rq_cacherep;
59540 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
59541 - int len;
59542 + long len;
59543 size_t bufsize = 0;
59544
59545 if (!rp)
59546 return;
59547
59548 - len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
59549 - len >>= 2;
59550 + if (statp) {
59551 + len = (char*)statp - (char*)resv->iov_base;
59552 + len = resv->iov_len - len;
59553 + len >>= 2;
59554 + }
59555
59556 /* Don't cache excessive amounts of data and XDR failures */
59557 if (!statp || len > (256 >> 2)) {
59558 diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
59559 index 72cb28e..5b5f87d 100644
59560 --- a/fs/nfsd/vfs.c
59561 +++ b/fs/nfsd/vfs.c
59562 @@ -993,7 +993,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
59563 } else {
59564 oldfs = get_fs();
59565 set_fs(KERNEL_DS);
59566 - host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
59567 + host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
59568 set_fs(oldfs);
59569 }
59570
59571 @@ -1080,7 +1080,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
59572
59573 /* Write the data. */
59574 oldfs = get_fs(); set_fs(KERNEL_DS);
59575 - host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
59576 + host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
59577 set_fs(oldfs);
59578 if (host_err < 0)
59579 goto out_nfserr;
59580 @@ -1626,7 +1626,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
59581 */
59582
59583 oldfs = get_fs(); set_fs(KERNEL_DS);
59584 - host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
59585 + host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
59586 set_fs(oldfs);
59587
59588 if (host_err < 0)
59589 diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
59590 index fea6bd5..8ee9d81 100644
59591 --- a/fs/nls/nls_base.c
59592 +++ b/fs/nls/nls_base.c
59593 @@ -234,20 +234,22 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
59594
59595 int register_nls(struct nls_table * nls)
59596 {
59597 - struct nls_table ** tmp = &tables;
59598 + struct nls_table *tmp = tables;
59599
59600 if (nls->next)
59601 return -EBUSY;
59602
59603 spin_lock(&nls_lock);
59604 - while (*tmp) {
59605 - if (nls == *tmp) {
59606 + while (tmp) {
59607 + if (nls == tmp) {
59608 spin_unlock(&nls_lock);
59609 return -EBUSY;
59610 }
59611 - tmp = &(*tmp)->next;
59612 + tmp = tmp->next;
59613 }
59614 - nls->next = tables;
59615 + pax_open_kernel();
59616 + *(struct nls_table **)&nls->next = tables;
59617 + pax_close_kernel();
59618 tables = nls;
59619 spin_unlock(&nls_lock);
59620 return 0;
59621 @@ -255,12 +257,14 @@ int register_nls(struct nls_table * nls)
59622
59623 int unregister_nls(struct nls_table * nls)
59624 {
59625 - struct nls_table ** tmp = &tables;
59626 + struct nls_table * const * tmp = &tables;
59627
59628 spin_lock(&nls_lock);
59629 while (*tmp) {
59630 if (nls == *tmp) {
59631 - *tmp = nls->next;
59632 + pax_open_kernel();
59633 + *(struct nls_table **)tmp = nls->next;
59634 + pax_close_kernel();
59635 spin_unlock(&nls_lock);
59636 return 0;
59637 }
59638 diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
59639 index 7424929..35f6be5 100644
59640 --- a/fs/nls/nls_euc-jp.c
59641 +++ b/fs/nls/nls_euc-jp.c
59642 @@ -561,8 +561,10 @@ static int __init init_nls_euc_jp(void)
59643 p_nls = load_nls("cp932");
59644
59645 if (p_nls) {
59646 - table.charset2upper = p_nls->charset2upper;
59647 - table.charset2lower = p_nls->charset2lower;
59648 + pax_open_kernel();
59649 + *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
59650 + *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
59651 + pax_close_kernel();
59652 return register_nls(&table);
59653 }
59654
59655 diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
59656 index e7bc1d7..06bd4bb 100644
59657 --- a/fs/nls/nls_koi8-ru.c
59658 +++ b/fs/nls/nls_koi8-ru.c
59659 @@ -63,8 +63,10 @@ static int __init init_nls_koi8_ru(void)
59660 p_nls = load_nls("koi8-u");
59661
59662 if (p_nls) {
59663 - table.charset2upper = p_nls->charset2upper;
59664 - table.charset2lower = p_nls->charset2lower;
59665 + pax_open_kernel();
59666 + *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
59667 + *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
59668 + pax_close_kernel();
59669 return register_nls(&table);
59670 }
59671
59672 diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
59673 index e44cb64..4807084 100644
59674 --- a/fs/notify/fanotify/fanotify_user.c
59675 +++ b/fs/notify/fanotify/fanotify_user.c
59676 @@ -253,8 +253,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
59677
59678 fd = fanotify_event_metadata.fd;
59679 ret = -EFAULT;
59680 - if (copy_to_user(buf, &fanotify_event_metadata,
59681 - fanotify_event_metadata.event_len))
59682 + if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
59683 + copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
59684 goto out_close_fd;
59685
59686 ret = prepare_for_access_response(group, event, fd);
59687 diff --git a/fs/notify/notification.c b/fs/notify/notification.c
59688 index 7b51b05..5ea5ef6 100644
59689 --- a/fs/notify/notification.c
59690 +++ b/fs/notify/notification.c
59691 @@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event_holder_cachep;
59692 * get set to 0 so it will never get 'freed'
59693 */
59694 static struct fsnotify_event *q_overflow_event;
59695 -static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
59696 +static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
59697
59698 /**
59699 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
59700 @@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
59701 */
59702 u32 fsnotify_get_cookie(void)
59703 {
59704 - return atomic_inc_return(&fsnotify_sync_cookie);
59705 + return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
59706 }
59707 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
59708
59709 diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
59710 index 9e38daf..5727cae 100644
59711 --- a/fs/ntfs/dir.c
59712 +++ b/fs/ntfs/dir.c
59713 @@ -1310,7 +1310,7 @@ find_next_index_buffer:
59714 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
59715 ~(s64)(ndir->itype.index.block_size - 1)));
59716 /* Bounds checks. */
59717 - if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
59718 + if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
59719 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
59720 "inode 0x%lx or driver bug.", vdir->i_ino);
59721 goto err_out;
59722 diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
59723 index ea4ba9d..1e13d34 100644
59724 --- a/fs/ntfs/file.c
59725 +++ b/fs/ntfs/file.c
59726 @@ -1282,7 +1282,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
59727 char *addr;
59728 size_t total = 0;
59729 unsigned len;
59730 - int left;
59731 + unsigned left;
59732
59733 do {
59734 len = PAGE_CACHE_SIZE - ofs;
59735 diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
59736 index 82650d5..db37dcf 100644
59737 --- a/fs/ntfs/super.c
59738 +++ b/fs/ntfs/super.c
59739 @@ -685,7 +685,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
59740 if (!silent)
59741 ntfs_error(sb, "Primary boot sector is invalid.");
59742 } else if (!silent)
59743 - ntfs_error(sb, read_err_str, "primary");
59744 + ntfs_error(sb, read_err_str, "%s", "primary");
59745 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
59746 if (bh_primary)
59747 brelse(bh_primary);
59748 @@ -701,7 +701,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
59749 goto hotfix_primary_boot_sector;
59750 brelse(bh_backup);
59751 } else if (!silent)
59752 - ntfs_error(sb, read_err_str, "backup");
59753 + ntfs_error(sb, read_err_str, "%s", "backup");
59754 /* Try to read NT3.51- backup boot sector. */
59755 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
59756 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
59757 @@ -712,7 +712,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
59758 "sector.");
59759 brelse(bh_backup);
59760 } else if (!silent)
59761 - ntfs_error(sb, read_err_str, "backup");
59762 + ntfs_error(sb, read_err_str, "%s", "backup");
59763 /* We failed. Cleanup and return. */
59764 if (bh_primary)
59765 brelse(bh_primary);
59766 diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
59767 index cd5496b..26a1055 100644
59768 --- a/fs/ocfs2/localalloc.c
59769 +++ b/fs/ocfs2/localalloc.c
59770 @@ -1278,7 +1278,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
59771 goto bail;
59772 }
59773
59774 - atomic_inc(&osb->alloc_stats.moves);
59775 + atomic_inc_unchecked(&osb->alloc_stats.moves);
59776
59777 bail:
59778 if (handle)
59779 diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
59780 index 3a90347..c40bef8 100644
59781 --- a/fs/ocfs2/ocfs2.h
59782 +++ b/fs/ocfs2/ocfs2.h
59783 @@ -235,11 +235,11 @@ enum ocfs2_vol_state
59784
59785 struct ocfs2_alloc_stats
59786 {
59787 - atomic_t moves;
59788 - atomic_t local_data;
59789 - atomic_t bitmap_data;
59790 - atomic_t bg_allocs;
59791 - atomic_t bg_extends;
59792 + atomic_unchecked_t moves;
59793 + atomic_unchecked_t local_data;
59794 + atomic_unchecked_t bitmap_data;
59795 + atomic_unchecked_t bg_allocs;
59796 + atomic_unchecked_t bg_extends;
59797 };
59798
59799 enum ocfs2_local_alloc_state
59800 diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
59801 index 5397c07..54afc55 100644
59802 --- a/fs/ocfs2/suballoc.c
59803 +++ b/fs/ocfs2/suballoc.c
59804 @@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
59805 mlog_errno(status);
59806 goto bail;
59807 }
59808 - atomic_inc(&osb->alloc_stats.bg_extends);
59809 + atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
59810
59811 /* You should never ask for this much metadata */
59812 BUG_ON(bits_wanted >
59813 @@ -2000,7 +2000,7 @@ int ocfs2_claim_metadata(handle_t *handle,
59814 mlog_errno(status);
59815 goto bail;
59816 }
59817 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
59818 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
59819
59820 *suballoc_loc = res.sr_bg_blkno;
59821 *suballoc_bit_start = res.sr_bit_offset;
59822 @@ -2164,7 +2164,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
59823 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
59824 res->sr_bits);
59825
59826 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
59827 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
59828
59829 BUG_ON(res->sr_bits != 1);
59830
59831 @@ -2206,7 +2206,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
59832 mlog_errno(status);
59833 goto bail;
59834 }
59835 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
59836 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
59837
59838 BUG_ON(res.sr_bits != 1);
59839
59840 @@ -2310,7 +2310,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
59841 cluster_start,
59842 num_clusters);
59843 if (!status)
59844 - atomic_inc(&osb->alloc_stats.local_data);
59845 + atomic_inc_unchecked(&osb->alloc_stats.local_data);
59846 } else {
59847 if (min_clusters > (osb->bitmap_cpg - 1)) {
59848 /* The only paths asking for contiguousness
59849 @@ -2336,7 +2336,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
59850 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
59851 res.sr_bg_blkno,
59852 res.sr_bit_offset);
59853 - atomic_inc(&osb->alloc_stats.bitmap_data);
59854 + atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
59855 *num_clusters = res.sr_bits;
59856 }
59857 }
59858 diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
59859 index d4e81e4..ad89f5f 100644
59860 --- a/fs/ocfs2/super.c
59861 +++ b/fs/ocfs2/super.c
59862 @@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
59863 "%10s => GlobalAllocs: %d LocalAllocs: %d "
59864 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
59865 "Stats",
59866 - atomic_read(&osb->alloc_stats.bitmap_data),
59867 - atomic_read(&osb->alloc_stats.local_data),
59868 - atomic_read(&osb->alloc_stats.bg_allocs),
59869 - atomic_read(&osb->alloc_stats.moves),
59870 - atomic_read(&osb->alloc_stats.bg_extends));
59871 + atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
59872 + atomic_read_unchecked(&osb->alloc_stats.local_data),
59873 + atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
59874 + atomic_read_unchecked(&osb->alloc_stats.moves),
59875 + atomic_read_unchecked(&osb->alloc_stats.bg_extends));
59876
59877 out += snprintf(buf + out, len - out,
59878 "%10s => State: %u Descriptor: %llu Size: %u bits "
59879 @@ -2121,11 +2121,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
59880 spin_lock_init(&osb->osb_xattr_lock);
59881 ocfs2_init_steal_slots(osb);
59882
59883 - atomic_set(&osb->alloc_stats.moves, 0);
59884 - atomic_set(&osb->alloc_stats.local_data, 0);
59885 - atomic_set(&osb->alloc_stats.bitmap_data, 0);
59886 - atomic_set(&osb->alloc_stats.bg_allocs, 0);
59887 - atomic_set(&osb->alloc_stats.bg_extends, 0);
59888 + atomic_set_unchecked(&osb->alloc_stats.moves, 0);
59889 + atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
59890 + atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
59891 + atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
59892 + atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
59893
59894 /* Copy the blockcheck stats from the superblock probe */
59895 osb->osb_ecc_stats = *stats;
59896 diff --git a/fs/open.c b/fs/open.c
59897 index d420331..2dbb3fd 100644
59898 --- a/fs/open.c
59899 +++ b/fs/open.c
59900 @@ -32,6 +32,8 @@
59901 #include <linux/dnotify.h>
59902 #include <linux/compat.h>
59903
59904 +#define CREATE_TRACE_POINTS
59905 +#include <trace/events/fs.h>
59906 #include "internal.h"
59907
59908 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
59909 @@ -102,6 +104,8 @@ long vfs_truncate(struct path *path, loff_t length)
59910 error = locks_verify_truncate(inode, NULL, length);
59911 if (!error)
59912 error = security_path_truncate(path);
59913 + if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
59914 + error = -EACCES;
59915 if (!error)
59916 error = do_truncate(path->dentry, length, 0, NULL);
59917
59918 @@ -186,6 +190,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
59919 error = locks_verify_truncate(inode, f.file, length);
59920 if (!error)
59921 error = security_path_truncate(&f.file->f_path);
59922 + if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
59923 + error = -EACCES;
59924 if (!error)
59925 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
59926 sb_end_write(inode->i_sb);
59927 @@ -360,6 +366,9 @@ retry:
59928 if (__mnt_is_readonly(path.mnt))
59929 res = -EROFS;
59930
59931 + if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
59932 + res = -EACCES;
59933 +
59934 out_path_release:
59935 path_put(&path);
59936 if (retry_estale(res, lookup_flags)) {
59937 @@ -391,6 +400,8 @@ retry:
59938 if (error)
59939 goto dput_and_out;
59940
59941 + gr_log_chdir(path.dentry, path.mnt);
59942 +
59943 set_fs_pwd(current->fs, &path);
59944
59945 dput_and_out:
59946 @@ -420,6 +431,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
59947 goto out_putf;
59948
59949 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
59950 +
59951 + if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
59952 + error = -EPERM;
59953 +
59954 + if (!error)
59955 + gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
59956 +
59957 if (!error)
59958 set_fs_pwd(current->fs, &f.file->f_path);
59959 out_putf:
59960 @@ -449,7 +467,13 @@ retry:
59961 if (error)
59962 goto dput_and_out;
59963
59964 + if (gr_handle_chroot_chroot(path.dentry, path.mnt))
59965 + goto dput_and_out;
59966 +
59967 set_fs_root(current->fs, &path);
59968 +
59969 + gr_handle_chroot_chdir(&path);
59970 +
59971 error = 0;
59972 dput_and_out:
59973 path_put(&path);
59974 @@ -471,6 +495,16 @@ static int chmod_common(struct path *path, umode_t mode)
59975 if (error)
59976 return error;
59977 mutex_lock(&inode->i_mutex);
59978 +
59979 + if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
59980 + error = -EACCES;
59981 + goto out_unlock;
59982 + }
59983 + if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
59984 + error = -EACCES;
59985 + goto out_unlock;
59986 + }
59987 +
59988 error = security_path_chmod(path, mode);
59989 if (error)
59990 goto out_unlock;
59991 @@ -530,6 +564,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
59992 uid = make_kuid(current_user_ns(), user);
59993 gid = make_kgid(current_user_ns(), group);
59994
59995 + if (!gr_acl_handle_chown(path->dentry, path->mnt))
59996 + return -EACCES;
59997 +
59998 newattrs.ia_valid = ATTR_CTIME;
59999 if (user != (uid_t) -1) {
60000 if (!uid_valid(uid))
60001 @@ -974,6 +1011,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
60002 } else {
60003 fsnotify_open(f);
60004 fd_install(fd, f);
60005 + trace_do_sys_open(tmp->name, flags, mode);
60006 }
60007 }
60008 putname(tmp);
60009 diff --git a/fs/pipe.c b/fs/pipe.c
60010 index 0e0752e..7cfdd50 100644
60011 --- a/fs/pipe.c
60012 +++ b/fs/pipe.c
60013 @@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
60014
60015 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
60016 {
60017 - if (pipe->files)
60018 + if (atomic_read(&pipe->files))
60019 mutex_lock_nested(&pipe->mutex, subclass);
60020 }
60021
60022 @@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
60023
60024 void pipe_unlock(struct pipe_inode_info *pipe)
60025 {
60026 - if (pipe->files)
60027 + if (atomic_read(&pipe->files))
60028 mutex_unlock(&pipe->mutex);
60029 }
60030 EXPORT_SYMBOL(pipe_unlock);
60031 @@ -449,9 +449,9 @@ redo:
60032 }
60033 if (bufs) /* More to do? */
60034 continue;
60035 - if (!pipe->writers)
60036 + if (!atomic_read(&pipe->writers))
60037 break;
60038 - if (!pipe->waiting_writers) {
60039 + if (!atomic_read(&pipe->waiting_writers)) {
60040 /* syscall merging: Usually we must not sleep
60041 * if O_NONBLOCK is set, or if we got some data.
60042 * But if a writer sleeps in kernel space, then
60043 @@ -513,7 +513,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
60044 ret = 0;
60045 __pipe_lock(pipe);
60046
60047 - if (!pipe->readers) {
60048 + if (!atomic_read(&pipe->readers)) {
60049 send_sig(SIGPIPE, current, 0);
60050 ret = -EPIPE;
60051 goto out;
60052 @@ -562,7 +562,7 @@ redo1:
60053 for (;;) {
60054 int bufs;
60055
60056 - if (!pipe->readers) {
60057 + if (!atomic_read(&pipe->readers)) {
60058 send_sig(SIGPIPE, current, 0);
60059 if (!ret)
60060 ret = -EPIPE;
60061 @@ -653,9 +653,9 @@ redo2:
60062 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
60063 do_wakeup = 0;
60064 }
60065 - pipe->waiting_writers++;
60066 + atomic_inc(&pipe->waiting_writers);
60067 pipe_wait(pipe);
60068 - pipe->waiting_writers--;
60069 + atomic_dec(&pipe->waiting_writers);
60070 }
60071 out:
60072 __pipe_unlock(pipe);
60073 @@ -709,7 +709,7 @@ pipe_poll(struct file *filp, poll_table *wait)
60074 mask = 0;
60075 if (filp->f_mode & FMODE_READ) {
60076 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
60077 - if (!pipe->writers && filp->f_version != pipe->w_counter)
60078 + if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
60079 mask |= POLLHUP;
60080 }
60081
60082 @@ -719,7 +719,7 @@ pipe_poll(struct file *filp, poll_table *wait)
60083 * Most Unices do not set POLLERR for FIFOs but on Linux they
60084 * behave exactly like pipes for poll().
60085 */
60086 - if (!pipe->readers)
60087 + if (!atomic_read(&pipe->readers))
60088 mask |= POLLERR;
60089 }
60090
60091 @@ -731,7 +731,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
60092 int kill = 0;
60093
60094 spin_lock(&inode->i_lock);
60095 - if (!--pipe->files) {
60096 + if (atomic_dec_and_test(&pipe->files)) {
60097 inode->i_pipe = NULL;
60098 kill = 1;
60099 }
60100 @@ -748,11 +748,11 @@ pipe_release(struct inode *inode, struct file *file)
60101
60102 __pipe_lock(pipe);
60103 if (file->f_mode & FMODE_READ)
60104 - pipe->readers--;
60105 + atomic_dec(&pipe->readers);
60106 if (file->f_mode & FMODE_WRITE)
60107 - pipe->writers--;
60108 + atomic_dec(&pipe->writers);
60109
60110 - if (pipe->readers || pipe->writers) {
60111 + if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
60112 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
60113 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
60114 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
60115 @@ -817,7 +817,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
60116 kfree(pipe);
60117 }
60118
60119 -static struct vfsmount *pipe_mnt __read_mostly;
60120 +struct vfsmount *pipe_mnt __read_mostly;
60121
60122 /*
60123 * pipefs_dname() is called from d_path().
60124 @@ -847,8 +847,9 @@ static struct inode * get_pipe_inode(void)
60125 goto fail_iput;
60126
60127 inode->i_pipe = pipe;
60128 - pipe->files = 2;
60129 - pipe->readers = pipe->writers = 1;
60130 + atomic_set(&pipe->files, 2);
60131 + atomic_set(&pipe->readers, 1);
60132 + atomic_set(&pipe->writers, 1);
60133 inode->i_fop = &pipefifo_fops;
60134
60135 /*
60136 @@ -1027,17 +1028,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
60137 spin_lock(&inode->i_lock);
60138 if (inode->i_pipe) {
60139 pipe = inode->i_pipe;
60140 - pipe->files++;
60141 + atomic_inc(&pipe->files);
60142 spin_unlock(&inode->i_lock);
60143 } else {
60144 spin_unlock(&inode->i_lock);
60145 pipe = alloc_pipe_info();
60146 if (!pipe)
60147 return -ENOMEM;
60148 - pipe->files = 1;
60149 + atomic_set(&pipe->files, 1);
60150 spin_lock(&inode->i_lock);
60151 if (unlikely(inode->i_pipe)) {
60152 - inode->i_pipe->files++;
60153 + atomic_inc(&inode->i_pipe->files);
60154 spin_unlock(&inode->i_lock);
60155 free_pipe_info(pipe);
60156 pipe = inode->i_pipe;
60157 @@ -1062,10 +1063,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
60158 * opened, even when there is no process writing the FIFO.
60159 */
60160 pipe->r_counter++;
60161 - if (pipe->readers++ == 0)
60162 + if (atomic_inc_return(&pipe->readers) == 1)
60163 wake_up_partner(pipe);
60164
60165 - if (!is_pipe && !pipe->writers) {
60166 + if (!is_pipe && !atomic_read(&pipe->writers)) {
60167 if ((filp->f_flags & O_NONBLOCK)) {
60168 /* suppress POLLHUP until we have
60169 * seen a writer */
60170 @@ -1084,14 +1085,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
60171 * errno=ENXIO when there is no process reading the FIFO.
60172 */
60173 ret = -ENXIO;
60174 - if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
60175 + if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
60176 goto err;
60177
60178 pipe->w_counter++;
60179 - if (!pipe->writers++)
60180 + if (atomic_inc_return(&pipe->writers) == 1)
60181 wake_up_partner(pipe);
60182
60183 - if (!is_pipe && !pipe->readers) {
60184 + if (!is_pipe && !atomic_read(&pipe->readers)) {
60185 if (wait_for_partner(pipe, &pipe->r_counter))
60186 goto err_wr;
60187 }
60188 @@ -1105,11 +1106,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
60189 * the process can at least talk to itself.
60190 */
60191
60192 - pipe->readers++;
60193 - pipe->writers++;
60194 + atomic_inc(&pipe->readers);
60195 + atomic_inc(&pipe->writers);
60196 pipe->r_counter++;
60197 pipe->w_counter++;
60198 - if (pipe->readers == 1 || pipe->writers == 1)
60199 + if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
60200 wake_up_partner(pipe);
60201 break;
60202
60203 @@ -1123,13 +1124,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
60204 return 0;
60205
60206 err_rd:
60207 - if (!--pipe->readers)
60208 + if (atomic_dec_and_test(&pipe->readers))
60209 wake_up_interruptible(&pipe->wait);
60210 ret = -ERESTARTSYS;
60211 goto err;
60212
60213 err_wr:
60214 - if (!--pipe->writers)
60215 + if (atomic_dec_and_test(&pipe->writers))
60216 wake_up_interruptible(&pipe->wait);
60217 ret = -ERESTARTSYS;
60218 goto err;
60219 diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
60220 index 15af622..0e9f4467 100644
60221 --- a/fs/proc/Kconfig
60222 +++ b/fs/proc/Kconfig
60223 @@ -30,12 +30,12 @@ config PROC_FS
60224
60225 config PROC_KCORE
60226 bool "/proc/kcore support" if !ARM
60227 - depends on PROC_FS && MMU
60228 + depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
60229
60230 config PROC_VMCORE
60231 bool "/proc/vmcore support"
60232 - depends on PROC_FS && CRASH_DUMP
60233 - default y
60234 + depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
60235 + default n
60236 help
60237 Exports the dump image of crashed kernel in ELF format.
60238
60239 @@ -59,8 +59,8 @@ config PROC_SYSCTL
60240 limited in memory.
60241
60242 config PROC_PAGE_MONITOR
60243 - default y
60244 - depends on PROC_FS && MMU
60245 + default n
60246 + depends on PROC_FS && MMU && !GRKERNSEC
60247 bool "Enable /proc page monitoring" if EXPERT
60248 help
60249 Various /proc files exist to monitor process memory utilization:
60250 diff --git a/fs/proc/array.c b/fs/proc/array.c
60251 index cbd0f1b..adec3f0 100644
60252 --- a/fs/proc/array.c
60253 +++ b/fs/proc/array.c
60254 @@ -60,6 +60,7 @@
60255 #include <linux/tty.h>
60256 #include <linux/string.h>
60257 #include <linux/mman.h>
60258 +#include <linux/grsecurity.h>
60259 #include <linux/proc_fs.h>
60260 #include <linux/ioport.h>
60261 #include <linux/uaccess.h>
60262 @@ -363,6 +364,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
60263 seq_putc(m, '\n');
60264 }
60265
60266 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
60267 +static inline void task_pax(struct seq_file *m, struct task_struct *p)
60268 +{
60269 + if (p->mm)
60270 + seq_printf(m, "PaX:\t%c%c%c%c%c\n",
60271 + p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
60272 + p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
60273 + p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
60274 + p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
60275 + p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
60276 + else
60277 + seq_printf(m, "PaX:\t-----\n");
60278 +}
60279 +#endif
60280 +
60281 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
60282 struct pid *pid, struct task_struct *task)
60283 {
60284 @@ -381,9 +397,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
60285 task_cpus_allowed(m, task);
60286 cpuset_task_status_allowed(m, task);
60287 task_context_switch_counts(m, task);
60288 +
60289 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
60290 + task_pax(m, task);
60291 +#endif
60292 +
60293 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
60294 + task_grsec_rbac(m, task);
60295 +#endif
60296 +
60297 return 0;
60298 }
60299
60300 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60301 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
60302 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
60303 + _mm->pax_flags & MF_PAX_SEGMEXEC))
60304 +#endif
60305 +
60306 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
60307 struct pid *pid, struct task_struct *task, int whole)
60308 {
60309 @@ -405,6 +436,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
60310 char tcomm[sizeof(task->comm)];
60311 unsigned long flags;
60312
60313 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60314 + if (current->exec_id != m->exec_id) {
60315 + gr_log_badprocpid("stat");
60316 + return 0;
60317 + }
60318 +#endif
60319 +
60320 state = *get_task_state(task);
60321 vsize = eip = esp = 0;
60322 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
60323 @@ -476,6 +514,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
60324 gtime = task_gtime(task);
60325 }
60326
60327 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60328 + if (PAX_RAND_FLAGS(mm)) {
60329 + eip = 0;
60330 + esp = 0;
60331 + wchan = 0;
60332 + }
60333 +#endif
60334 +#ifdef CONFIG_GRKERNSEC_HIDESYM
60335 + wchan = 0;
60336 + eip =0;
60337 + esp =0;
60338 +#endif
60339 +
60340 /* scale priority and nice values from timeslices to -20..20 */
60341 /* to make it look like a "normal" Unix priority/nice value */
60342 priority = task_prio(task);
60343 @@ -512,9 +563,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
60344 seq_put_decimal_ull(m, ' ', vsize);
60345 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
60346 seq_put_decimal_ull(m, ' ', rsslim);
60347 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60348 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
60349 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
60350 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
60351 +#else
60352 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
60353 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
60354 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
60355 +#endif
60356 seq_put_decimal_ull(m, ' ', esp);
60357 seq_put_decimal_ull(m, ' ', eip);
60358 /* The signal information here is obsolete.
60359 @@ -536,7 +593,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
60360 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
60361 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
60362
60363 - if (mm && permitted) {
60364 + if (mm && permitted
60365 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60366 + && !PAX_RAND_FLAGS(mm)
60367 +#endif
60368 + ) {
60369 seq_put_decimal_ull(m, ' ', mm->start_data);
60370 seq_put_decimal_ull(m, ' ', mm->end_data);
60371 seq_put_decimal_ull(m, ' ', mm->start_brk);
60372 @@ -574,8 +635,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
60373 struct pid *pid, struct task_struct *task)
60374 {
60375 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
60376 - struct mm_struct *mm = get_task_mm(task);
60377 + struct mm_struct *mm;
60378
60379 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60380 + if (current->exec_id != m->exec_id) {
60381 + gr_log_badprocpid("statm");
60382 + return 0;
60383 + }
60384 +#endif
60385 + mm = get_task_mm(task);
60386 if (mm) {
60387 size = task_statm(mm, &shared, &text, &data, &resident);
60388 mmput(mm);
60389 @@ -598,6 +666,13 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
60390 return 0;
60391 }
60392
60393 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
60394 +int proc_pid_ipaddr(struct task_struct *task, char *buffer)
60395 +{
60396 + return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
60397 +}
60398 +#endif
60399 +
60400 #ifdef CONFIG_CHECKPOINT_RESTORE
60401 static struct pid *
60402 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
60403 diff --git a/fs/proc/base.c b/fs/proc/base.c
60404 index 1485e38..8ad4236 100644
60405 --- a/fs/proc/base.c
60406 +++ b/fs/proc/base.c
60407 @@ -113,6 +113,14 @@ struct pid_entry {
60408 union proc_op op;
60409 };
60410
60411 +struct getdents_callback {
60412 + struct linux_dirent __user * current_dir;
60413 + struct linux_dirent __user * previous;
60414 + struct file * file;
60415 + int count;
60416 + int error;
60417 +};
60418 +
60419 #define NOD(NAME, MODE, IOP, FOP, OP) { \
60420 .name = (NAME), \
60421 .len = sizeof(NAME) - 1, \
60422 @@ -210,6 +218,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
60423 if (!mm->arg_end)
60424 goto out_mm; /* Shh! No looking before we're done */
60425
60426 + if (gr_acl_handle_procpidmem(task))
60427 + goto out_mm;
60428 +
60429 len = mm->arg_end - mm->arg_start;
60430
60431 if (len > PAGE_SIZE)
60432 @@ -237,12 +248,28 @@ out:
60433 return res;
60434 }
60435
60436 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60437 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
60438 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
60439 + _mm->pax_flags & MF_PAX_SEGMEXEC))
60440 +#endif
60441 +
60442 static int proc_pid_auxv(struct task_struct *task, char *buffer)
60443 {
60444 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
60445 int res = PTR_ERR(mm);
60446 if (mm && !IS_ERR(mm)) {
60447 unsigned int nwords = 0;
60448 +
60449 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60450 + /* allow if we're currently ptracing this task */
60451 + if (PAX_RAND_FLAGS(mm) &&
60452 + (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
60453 + mmput(mm);
60454 + return 0;
60455 + }
60456 +#endif
60457 +
60458 do {
60459 nwords += 2;
60460 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
60461 @@ -256,7 +283,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
60462 }
60463
60464
60465 -#ifdef CONFIG_KALLSYMS
60466 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
60467 /*
60468 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
60469 * Returns the resolved symbol. If that fails, simply return the address.
60470 @@ -295,7 +322,7 @@ static void unlock_trace(struct task_struct *task)
60471 mutex_unlock(&task->signal->cred_guard_mutex);
60472 }
60473
60474 -#ifdef CONFIG_STACKTRACE
60475 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
60476
60477 #define MAX_STACK_TRACE_DEPTH 64
60478
60479 @@ -518,7 +545,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
60480 return count;
60481 }
60482
60483 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
60484 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
60485 static int proc_pid_syscall(struct task_struct *task, char *buffer)
60486 {
60487 long nr;
60488 @@ -547,7 +574,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
60489 /************************************************************************/
60490
60491 /* permission checks */
60492 -static int proc_fd_access_allowed(struct inode *inode)
60493 +static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
60494 {
60495 struct task_struct *task;
60496 int allowed = 0;
60497 @@ -557,7 +584,10 @@ static int proc_fd_access_allowed(struct inode *inode)
60498 */
60499 task = get_proc_task(inode);
60500 if (task) {
60501 - allowed = ptrace_may_access(task, PTRACE_MODE_READ);
60502 + if (log)
60503 + allowed = ptrace_may_access(task, PTRACE_MODE_READ);
60504 + else
60505 + allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
60506 put_task_struct(task);
60507 }
60508 return allowed;
60509 @@ -588,10 +618,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
60510 struct task_struct *task,
60511 int hide_pid_min)
60512 {
60513 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
60514 + return false;
60515 +
60516 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60517 + rcu_read_lock();
60518 + {
60519 + const struct cred *tmpcred = current_cred();
60520 + const struct cred *cred = __task_cred(task);
60521 +
60522 + if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
60523 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
60524 + || in_group_p(grsec_proc_gid)
60525 +#endif
60526 + ) {
60527 + rcu_read_unlock();
60528 + return true;
60529 + }
60530 + }
60531 + rcu_read_unlock();
60532 +
60533 + if (!pid->hide_pid)
60534 + return false;
60535 +#endif
60536 +
60537 if (pid->hide_pid < hide_pid_min)
60538 return true;
60539 if (in_group_p(pid->pid_gid))
60540 return true;
60541 +
60542 return ptrace_may_access(task, PTRACE_MODE_READ);
60543 }
60544
60545 @@ -609,7 +664,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
60546 put_task_struct(task);
60547
60548 if (!has_perms) {
60549 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60550 + {
60551 +#else
60552 if (pid->hide_pid == 2) {
60553 +#endif
60554 /*
60555 * Let's make getdents(), stat(), and open()
60556 * consistent with each other. If a process
60557 @@ -707,6 +766,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
60558 if (!task)
60559 return -ESRCH;
60560
60561 + if (gr_acl_handle_procpidmem(task)) {
60562 + put_task_struct(task);
60563 + return -EPERM;
60564 + }
60565 +
60566 mm = mm_access(task, mode);
60567 put_task_struct(task);
60568
60569 @@ -722,6 +786,10 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
60570
60571 file->private_data = mm;
60572
60573 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60574 + file->f_version = current->exec_id;
60575 +#endif
60576 +
60577 return 0;
60578 }
60579
60580 @@ -743,6 +811,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
60581 ssize_t copied;
60582 char *page;
60583
60584 +#ifdef CONFIG_GRKERNSEC
60585 + if (write)
60586 + return -EPERM;
60587 +#endif
60588 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60589 + if (file->f_version != current->exec_id) {
60590 + gr_log_badprocpid("mem");
60591 + return 0;
60592 + }
60593 +#endif
60594 +
60595 if (!mm)
60596 return 0;
60597
60598 @@ -755,7 +834,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
60599 goto free;
60600
60601 while (count > 0) {
60602 - int this_len = min_t(int, count, PAGE_SIZE);
60603 + ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
60604
60605 if (write && copy_from_user(page, buf, this_len)) {
60606 copied = -EFAULT;
60607 @@ -847,6 +926,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
60608 if (!mm)
60609 return 0;
60610
60611 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60612 + if (file->f_version != current->exec_id) {
60613 + gr_log_badprocpid("environ");
60614 + return 0;
60615 + }
60616 +#endif
60617 +
60618 page = (char *)__get_free_page(GFP_TEMPORARY);
60619 if (!page)
60620 return -ENOMEM;
60621 @@ -856,7 +942,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
60622 goto free;
60623 while (count > 0) {
60624 size_t this_len, max_len;
60625 - int retval;
60626 + ssize_t retval;
60627
60628 if (src >= (mm->env_end - mm->env_start))
60629 break;
60630 @@ -1461,7 +1547,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
60631 int error = -EACCES;
60632
60633 /* Are we allowed to snoop on the tasks file descriptors? */
60634 - if (!proc_fd_access_allowed(inode))
60635 + if (!proc_fd_access_allowed(inode, 0))
60636 goto out;
60637
60638 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
60639 @@ -1505,8 +1591,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
60640 struct path path;
60641
60642 /* Are we allowed to snoop on the tasks file descriptors? */
60643 - if (!proc_fd_access_allowed(inode))
60644 - goto out;
60645 + /* logging this is needed for learning on chromium to work properly,
60646 + but we don't want to flood the logs from 'ps' which does a readlink
60647 + on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
60648 + CAP_SYS_PTRACE as it's not necessary for its basic functionality
60649 + */
60650 + if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
60651 + if (!proc_fd_access_allowed(inode,0))
60652 + goto out;
60653 + } else {
60654 + if (!proc_fd_access_allowed(inode,1))
60655 + goto out;
60656 + }
60657
60658 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
60659 if (error)
60660 @@ -1556,7 +1652,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
60661 rcu_read_lock();
60662 cred = __task_cred(task);
60663 inode->i_uid = cred->euid;
60664 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
60665 + inode->i_gid = grsec_proc_gid;
60666 +#else
60667 inode->i_gid = cred->egid;
60668 +#endif
60669 rcu_read_unlock();
60670 }
60671 security_task_to_inode(task, inode);
60672 @@ -1592,10 +1692,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
60673 return -ENOENT;
60674 }
60675 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
60676 +#ifdef CONFIG_GRKERNSEC_PROC_USER
60677 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
60678 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60679 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
60680 +#endif
60681 task_dumpable(task)) {
60682 cred = __task_cred(task);
60683 stat->uid = cred->euid;
60684 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
60685 + stat->gid = grsec_proc_gid;
60686 +#else
60687 stat->gid = cred->egid;
60688 +#endif
60689 }
60690 }
60691 rcu_read_unlock();
60692 @@ -1633,11 +1742,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
60693
60694 if (task) {
60695 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
60696 +#ifdef CONFIG_GRKERNSEC_PROC_USER
60697 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
60698 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60699 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
60700 +#endif
60701 task_dumpable(task)) {
60702 rcu_read_lock();
60703 cred = __task_cred(task);
60704 inode->i_uid = cred->euid;
60705 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
60706 + inode->i_gid = grsec_proc_gid;
60707 +#else
60708 inode->i_gid = cred->egid;
60709 +#endif
60710 rcu_read_unlock();
60711 } else {
60712 inode->i_uid = GLOBAL_ROOT_UID;
60713 @@ -2166,6 +2284,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
60714 if (!task)
60715 goto out_no_task;
60716
60717 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
60718 + goto out;
60719 +
60720 /*
60721 * Yes, it does not scale. And it should not. Don't add
60722 * new entries into /proc/<tgid>/ without very good reasons.
60723 @@ -2196,6 +2317,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
60724 if (!task)
60725 return -ENOENT;
60726
60727 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
60728 + goto out;
60729 +
60730 if (!dir_emit_dots(file, ctx))
60731 goto out;
60732
60733 @@ -2585,7 +2709,7 @@ static const struct pid_entry tgid_base_stuff[] = {
60734 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
60735 #endif
60736 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
60737 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
60738 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
60739 INF("syscall", S_IRUGO, proc_pid_syscall),
60740 #endif
60741 INF("cmdline", S_IRUGO, proc_pid_cmdline),
60742 @@ -2610,10 +2734,10 @@ static const struct pid_entry tgid_base_stuff[] = {
60743 #ifdef CONFIG_SECURITY
60744 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
60745 #endif
60746 -#ifdef CONFIG_KALLSYMS
60747 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
60748 INF("wchan", S_IRUGO, proc_pid_wchan),
60749 #endif
60750 -#ifdef CONFIG_STACKTRACE
60751 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
60752 ONE("stack", S_IRUGO, proc_pid_stack),
60753 #endif
60754 #ifdef CONFIG_SCHEDSTATS
60755 @@ -2647,6 +2771,9 @@ static const struct pid_entry tgid_base_stuff[] = {
60756 #ifdef CONFIG_HARDWALL
60757 INF("hardwall", S_IRUGO, proc_pid_hardwall),
60758 #endif
60759 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
60760 + INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
60761 +#endif
60762 #ifdef CONFIG_USER_NS
60763 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
60764 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
60765 @@ -2777,7 +2904,14 @@ static int proc_pid_instantiate(struct inode *dir,
60766 if (!inode)
60767 goto out;
60768
60769 +#ifdef CONFIG_GRKERNSEC_PROC_USER
60770 + inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
60771 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60772 + inode->i_gid = grsec_proc_gid;
60773 + inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
60774 +#else
60775 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
60776 +#endif
60777 inode->i_op = &proc_tgid_base_inode_operations;
60778 inode->i_fop = &proc_tgid_base_operations;
60779 inode->i_flags|=S_IMMUTABLE;
60780 @@ -2815,7 +2949,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
60781 if (!task)
60782 goto out;
60783
60784 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
60785 + goto out_put_task;
60786 +
60787 result = proc_pid_instantiate(dir, dentry, task, NULL);
60788 +out_put_task:
60789 put_task_struct(task);
60790 out:
60791 return ERR_PTR(result);
60792 @@ -2921,7 +3059,7 @@ static const struct pid_entry tid_base_stuff[] = {
60793 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
60794 #endif
60795 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
60796 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
60797 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
60798 INF("syscall", S_IRUGO, proc_pid_syscall),
60799 #endif
60800 INF("cmdline", S_IRUGO, proc_pid_cmdline),
60801 @@ -2948,10 +3086,10 @@ static const struct pid_entry tid_base_stuff[] = {
60802 #ifdef CONFIG_SECURITY
60803 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
60804 #endif
60805 -#ifdef CONFIG_KALLSYMS
60806 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
60807 INF("wchan", S_IRUGO, proc_pid_wchan),
60808 #endif
60809 -#ifdef CONFIG_STACKTRACE
60810 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
60811 ONE("stack", S_IRUGO, proc_pid_stack),
60812 #endif
60813 #ifdef CONFIG_SCHEDSTATS
60814 diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
60815 index 82676e3..5f8518a 100644
60816 --- a/fs/proc/cmdline.c
60817 +++ b/fs/proc/cmdline.c
60818 @@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
60819
60820 static int __init proc_cmdline_init(void)
60821 {
60822 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
60823 + proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
60824 +#else
60825 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
60826 +#endif
60827 return 0;
60828 }
60829 module_init(proc_cmdline_init);
60830 diff --git a/fs/proc/devices.c b/fs/proc/devices.c
60831 index b143471..bb105e5 100644
60832 --- a/fs/proc/devices.c
60833 +++ b/fs/proc/devices.c
60834 @@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
60835
60836 static int __init proc_devices_init(void)
60837 {
60838 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
60839 + proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
60840 +#else
60841 proc_create("devices", 0, NULL, &proc_devinfo_operations);
60842 +#endif
60843 return 0;
60844 }
60845 module_init(proc_devices_init);
60846 diff --git a/fs/proc/fd.c b/fs/proc/fd.c
60847 index 985ea88..d118a0a 100644
60848 --- a/fs/proc/fd.c
60849 +++ b/fs/proc/fd.c
60850 @@ -25,7 +25,8 @@ static int seq_show(struct seq_file *m, void *v)
60851 if (!task)
60852 return -ENOENT;
60853
60854 - files = get_files_struct(task);
60855 + if (!gr_acl_handle_procpidmem(task))
60856 + files = get_files_struct(task);
60857 put_task_struct(task);
60858
60859 if (files) {
60860 @@ -283,11 +284,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
60861 */
60862 int proc_fd_permission(struct inode *inode, int mask)
60863 {
60864 + struct task_struct *task;
60865 int rv = generic_permission(inode, mask);
60866 - if (rv == 0)
60867 - return 0;
60868 +
60869 if (task_tgid(current) == proc_pid(inode))
60870 rv = 0;
60871 +
60872 + task = get_proc_task(inode);
60873 + if (task == NULL)
60874 + return rv;
60875 +
60876 + if (gr_acl_handle_procpidmem(task))
60877 + rv = -EACCES;
60878 +
60879 + put_task_struct(task);
60880 +
60881 return rv;
60882 }
60883
60884 diff --git a/fs/proc/inode.c b/fs/proc/inode.c
60885 index 8eaa1ba..cc6ff42 100644
60886 --- a/fs/proc/inode.c
60887 +++ b/fs/proc/inode.c
60888 @@ -23,11 +23,17 @@
60889 #include <linux/slab.h>
60890 #include <linux/mount.h>
60891 #include <linux/magic.h>
60892 +#include <linux/grsecurity.h>
60893
60894 #include <asm/uaccess.h>
60895
60896 #include "internal.h"
60897
60898 +#ifdef CONFIG_PROC_SYSCTL
60899 +extern const struct inode_operations proc_sys_inode_operations;
60900 +extern const struct inode_operations proc_sys_dir_operations;
60901 +#endif
60902 +
60903 static void proc_evict_inode(struct inode *inode)
60904 {
60905 struct proc_dir_entry *de;
60906 @@ -55,6 +61,13 @@ static void proc_evict_inode(struct inode *inode)
60907 ns = PROC_I(inode)->ns.ns;
60908 if (ns_ops && ns)
60909 ns_ops->put(ns);
60910 +
60911 +#ifdef CONFIG_PROC_SYSCTL
60912 + if (inode->i_op == &proc_sys_inode_operations ||
60913 + inode->i_op == &proc_sys_dir_operations)
60914 + gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
60915 +#endif
60916 +
60917 }
60918
60919 static struct kmem_cache * proc_inode_cachep;
60920 @@ -405,7 +418,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
60921 if (de->mode) {
60922 inode->i_mode = de->mode;
60923 inode->i_uid = de->uid;
60924 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
60925 + inode->i_gid = grsec_proc_gid;
60926 +#else
60927 inode->i_gid = de->gid;
60928 +#endif
60929 }
60930 if (de->size)
60931 inode->i_size = de->size;
60932 diff --git a/fs/proc/internal.h b/fs/proc/internal.h
60933 index 651d09a..60c73ae 100644
60934 --- a/fs/proc/internal.h
60935 +++ b/fs/proc/internal.h
60936 @@ -155,6 +155,9 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
60937 struct pid *, struct task_struct *);
60938 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
60939 struct pid *, struct task_struct *);
60940 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
60941 +extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
60942 +#endif
60943
60944 /*
60945 * base.c
60946 diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
60947 index 05029c0..7ea1987 100644
60948 --- a/fs/proc/interrupts.c
60949 +++ b/fs/proc/interrupts.c
60950 @@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
60951
60952 static int __init proc_interrupts_init(void)
60953 {
60954 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
60955 + proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
60956 +#else
60957 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
60958 +#endif
60959 return 0;
60960 }
60961 module_init(proc_interrupts_init);
60962 diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
60963 index 06ea155..9a798c7 100644
60964 --- a/fs/proc/kcore.c
60965 +++ b/fs/proc/kcore.c
60966 @@ -484,9 +484,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
60967 * the addresses in the elf_phdr on our list.
60968 */
60969 start = kc_offset_to_vaddr(*fpos - elf_buflen);
60970 - if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
60971 + tsz = PAGE_SIZE - (start & ~PAGE_MASK);
60972 + if (tsz > buflen)
60973 tsz = buflen;
60974 -
60975 +
60976 while (buflen) {
60977 struct kcore_list *m;
60978
60979 @@ -515,20 +516,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
60980 kfree(elf_buf);
60981 } else {
60982 if (kern_addr_valid(start)) {
60983 - unsigned long n;
60984 + char *elf_buf;
60985 + mm_segment_t oldfs;
60986
60987 - n = copy_to_user(buffer, (char *)start, tsz);
60988 - /*
60989 - * We cannot distinguish between fault on source
60990 - * and fault on destination. When this happens
60991 - * we clear too and hope it will trigger the
60992 - * EFAULT again.
60993 - */
60994 - if (n) {
60995 - if (clear_user(buffer + tsz - n,
60996 - n))
60997 + elf_buf = kmalloc(tsz, GFP_KERNEL);
60998 + if (!elf_buf)
60999 + return -ENOMEM;
61000 + oldfs = get_fs();
61001 + set_fs(KERNEL_DS);
61002 + if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
61003 + set_fs(oldfs);
61004 + if (copy_to_user(buffer, elf_buf, tsz)) {
61005 + kfree(elf_buf);
61006 return -EFAULT;
61007 + }
61008 }
61009 + set_fs(oldfs);
61010 + kfree(elf_buf);
61011 } else {
61012 if (clear_user(buffer, tsz))
61013 return -EFAULT;
61014 @@ -548,6 +552,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
61015
61016 static int open_kcore(struct inode *inode, struct file *filp)
61017 {
61018 +#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
61019 + return -EPERM;
61020 +#endif
61021 if (!capable(CAP_SYS_RAWIO))
61022 return -EPERM;
61023 if (kcore_need_update)
61024 diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
61025 index 59d85d6..ac6fc05 100644
61026 --- a/fs/proc/meminfo.c
61027 +++ b/fs/proc/meminfo.c
61028 @@ -153,7 +153,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
61029 vmi.used >> 10,
61030 vmi.largest_chunk >> 10
61031 #ifdef CONFIG_MEMORY_FAILURE
61032 - ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
61033 + ,atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
61034 #endif
61035 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
61036 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
61037 diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
61038 index ccfd99b..1b7e255 100644
61039 --- a/fs/proc/nommu.c
61040 +++ b/fs/proc/nommu.c
61041 @@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
61042 if (len < 1)
61043 len = 1;
61044 seq_printf(m, "%*c", len, ' ');
61045 - seq_path(m, &file->f_path, "");
61046 + seq_path(m, &file->f_path, "\n\\");
61047 }
61048
61049 seq_putc(m, '\n');
61050 diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
61051 index 4677bb7..408e936 100644
61052 --- a/fs/proc/proc_net.c
61053 +++ b/fs/proc/proc_net.c
61054 @@ -23,6 +23,7 @@
61055 #include <linux/nsproxy.h>
61056 #include <net/net_namespace.h>
61057 #include <linux/seq_file.h>
61058 +#include <linux/grsecurity.h>
61059
61060 #include "internal.h"
61061
61062 @@ -109,6 +110,17 @@ static struct net *get_proc_task_net(struct inode *dir)
61063 struct task_struct *task;
61064 struct nsproxy *ns;
61065 struct net *net = NULL;
61066 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
61067 + const struct cred *cred = current_cred();
61068 +#endif
61069 +
61070 +#ifdef CONFIG_GRKERNSEC_PROC_USER
61071 + if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
61072 + return net;
61073 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
61074 + if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
61075 + return net;
61076 +#endif
61077
61078 rcu_read_lock();
61079 task = pid_task(proc_pid(dir), PIDTYPE_PID);
61080 diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
61081 index 7129046..6914844 100644
61082 --- a/fs/proc/proc_sysctl.c
61083 +++ b/fs/proc/proc_sysctl.c
61084 @@ -11,13 +11,21 @@
61085 #include <linux/namei.h>
61086 #include <linux/mm.h>
61087 #include <linux/module.h>
61088 +#include <linux/nsproxy.h>
61089 +#ifdef CONFIG_GRKERNSEC
61090 +#include <net/net_namespace.h>
61091 +#endif
61092 #include "internal.h"
61093
61094 +extern int gr_handle_chroot_sysctl(const int op);
61095 +extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
61096 + const int op);
61097 +
61098 static const struct dentry_operations proc_sys_dentry_operations;
61099 static const struct file_operations proc_sys_file_operations;
61100 -static const struct inode_operations proc_sys_inode_operations;
61101 +const struct inode_operations proc_sys_inode_operations;
61102 static const struct file_operations proc_sys_dir_file_operations;
61103 -static const struct inode_operations proc_sys_dir_operations;
61104 +const struct inode_operations proc_sys_dir_operations;
61105
61106 void proc_sys_poll_notify(struct ctl_table_poll *poll)
61107 {
61108 @@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
61109
61110 err = NULL;
61111 d_set_d_op(dentry, &proc_sys_dentry_operations);
61112 +
61113 + gr_handle_proc_create(dentry, inode);
61114 +
61115 d_add(dentry, inode);
61116
61117 out:
61118 @@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
61119 struct inode *inode = file_inode(filp);
61120 struct ctl_table_header *head = grab_header(inode);
61121 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
61122 + int op = write ? MAY_WRITE : MAY_READ;
61123 ssize_t error;
61124 size_t res;
61125
61126 @@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
61127 * and won't be until we finish.
61128 */
61129 error = -EPERM;
61130 - if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
61131 + if (sysctl_perm(head, table, op))
61132 goto out;
61133
61134 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
61135 @@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
61136 if (!table->proc_handler)
61137 goto out;
61138
61139 +#ifdef CONFIG_GRKERNSEC
61140 + error = -EPERM;
61141 + if (gr_handle_chroot_sysctl(op))
61142 + goto out;
61143 + dget(filp->f_path.dentry);
61144 + if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
61145 + dput(filp->f_path.dentry);
61146 + goto out;
61147 + }
61148 + dput(filp->f_path.dentry);
61149 + if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
61150 + goto out;
61151 + if (write) {
61152 + if (current->nsproxy->net_ns != table->extra2) {
61153 + if (!capable(CAP_SYS_ADMIN))
61154 + goto out;
61155 + } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
61156 + goto out;
61157 + }
61158 +#endif
61159 +
61160 /* careful: calling conventions are nasty here */
61161 res = count;
61162 error = table->proc_handler(table, write, buf, &res, ppos);
61163 @@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
61164 return false;
61165 } else {
61166 d_set_d_op(child, &proc_sys_dentry_operations);
61167 +
61168 + gr_handle_proc_create(child, inode);
61169 +
61170 d_add(child, inode);
61171 }
61172 } else {
61173 @@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
61174 if ((*pos)++ < ctx->pos)
61175 return true;
61176
61177 + if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
61178 + return 0;
61179 +
61180 if (unlikely(S_ISLNK(table->mode)))
61181 res = proc_sys_link_fill_cache(file, ctx, head, table);
61182 else
61183 @@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
61184 if (IS_ERR(head))
61185 return PTR_ERR(head);
61186
61187 + if (table && !gr_acl_handle_hidden_file(dentry, mnt))
61188 + return -ENOENT;
61189 +
61190 generic_fillattr(inode, stat);
61191 if (table)
61192 stat->mode = (stat->mode & S_IFMT) | table->mode;
61193 @@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
61194 .llseek = generic_file_llseek,
61195 };
61196
61197 -static const struct inode_operations proc_sys_inode_operations = {
61198 +const struct inode_operations proc_sys_inode_operations = {
61199 .permission = proc_sys_permission,
61200 .setattr = proc_sys_setattr,
61201 .getattr = proc_sys_getattr,
61202 };
61203
61204 -static const struct inode_operations proc_sys_dir_operations = {
61205 +const struct inode_operations proc_sys_dir_operations = {
61206 .lookup = proc_sys_lookup,
61207 .permission = proc_sys_permission,
61208 .setattr = proc_sys_setattr,
61209 @@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
61210 static struct ctl_dir *new_dir(struct ctl_table_set *set,
61211 const char *name, int namelen)
61212 {
61213 - struct ctl_table *table;
61214 + ctl_table_no_const *table;
61215 struct ctl_dir *new;
61216 struct ctl_node *node;
61217 char *new_name;
61218 @@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
61219 return NULL;
61220
61221 node = (struct ctl_node *)(new + 1);
61222 - table = (struct ctl_table *)(node + 1);
61223 + table = (ctl_table_no_const *)(node + 1);
61224 new_name = (char *)(table + 2);
61225 memcpy(new_name, name, namelen);
61226 new_name[namelen] = '\0';
61227 @@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
61228 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
61229 struct ctl_table_root *link_root)
61230 {
61231 - struct ctl_table *link_table, *entry, *link;
61232 + ctl_table_no_const *link_table, *link;
61233 + struct ctl_table *entry;
61234 struct ctl_table_header *links;
61235 struct ctl_node *node;
61236 char *link_name;
61237 @@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
61238 return NULL;
61239
61240 node = (struct ctl_node *)(links + 1);
61241 - link_table = (struct ctl_table *)(node + nr_entries);
61242 + link_table = (ctl_table_no_const *)(node + nr_entries);
61243 link_name = (char *)&link_table[nr_entries + 1];
61244
61245 for (link = link_table, entry = table; entry->procname; link++, entry++) {
61246 @@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
61247 struct ctl_table_header ***subheader, struct ctl_table_set *set,
61248 struct ctl_table *table)
61249 {
61250 - struct ctl_table *ctl_table_arg = NULL;
61251 - struct ctl_table *entry, *files;
61252 + ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
61253 + struct ctl_table *entry;
61254 int nr_files = 0;
61255 int nr_dirs = 0;
61256 int err = -ENOMEM;
61257 @@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
61258 nr_files++;
61259 }
61260
61261 - files = table;
61262 /* If there are mixed files and directories we need a new table */
61263 if (nr_dirs && nr_files) {
61264 - struct ctl_table *new;
61265 + ctl_table_no_const *new;
61266 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
61267 GFP_KERNEL);
61268 if (!files)
61269 @@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
61270 /* Register everything except a directory full of subdirectories */
61271 if (nr_files || !nr_dirs) {
61272 struct ctl_table_header *header;
61273 - header = __register_sysctl_table(set, path, files);
61274 + header = __register_sysctl_table(set, path, files ? files : table);
61275 if (!header) {
61276 kfree(ctl_table_arg);
61277 goto out;
61278 diff --git a/fs/proc/root.c b/fs/proc/root.c
61279 index 87dbcbe..55e1b4d 100644
61280 --- a/fs/proc/root.c
61281 +++ b/fs/proc/root.c
61282 @@ -186,7 +186,15 @@ void __init proc_root_init(void)
61283 #ifdef CONFIG_PROC_DEVICETREE
61284 proc_device_tree_init();
61285 #endif
61286 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
61287 +#ifdef CONFIG_GRKERNSEC_PROC_USER
61288 + proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
61289 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
61290 + proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
61291 +#endif
61292 +#else
61293 proc_mkdir("bus", NULL);
61294 +#endif
61295 proc_sys_init();
61296 }
61297
61298 diff --git a/fs/proc/self.c b/fs/proc/self.c
61299 index 6b6a993..807cccc 100644
61300 --- a/fs/proc/self.c
61301 +++ b/fs/proc/self.c
61302 @@ -39,7 +39,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
61303 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
61304 void *cookie)
61305 {
61306 - char *s = nd_get_link(nd);
61307 + const char *s = nd_get_link(nd);
61308 if (!IS_ERR(s))
61309 kfree(s);
61310 }
61311 diff --git a/fs/proc/stat.c b/fs/proc/stat.c
61312 index 1cf86c0..5668e11 100644
61313 --- a/fs/proc/stat.c
61314 +++ b/fs/proc/stat.c
61315 @@ -218,7 +218,11 @@ static const struct file_operations proc_stat_operations = {
61316
61317 static int __init proc_stat_init(void)
61318 {
61319 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
61320 + proc_create_grsec("stat", 0, NULL, &proc_stat_operations);
61321 +#else
61322 proc_create("stat", 0, NULL, &proc_stat_operations);
61323 +#endif
61324 return 0;
61325 }
61326 module_init(proc_stat_init);
61327 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
61328 index 390bdab..83c1e8a 100644
61329 --- a/fs/proc/task_mmu.c
61330 +++ b/fs/proc/task_mmu.c
61331 @@ -12,12 +12,19 @@
61332 #include <linux/swap.h>
61333 #include <linux/swapops.h>
61334 #include <linux/mmu_notifier.h>
61335 +#include <linux/grsecurity.h>
61336
61337 #include <asm/elf.h>
61338 #include <asm/uaccess.h>
61339 #include <asm/tlbflush.h>
61340 #include "internal.h"
61341
61342 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61343 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
61344 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
61345 + _mm->pax_flags & MF_PAX_SEGMEXEC))
61346 +#endif
61347 +
61348 void task_mem(struct seq_file *m, struct mm_struct *mm)
61349 {
61350 unsigned long data, text, lib, swap;
61351 @@ -53,8 +60,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
61352 "VmExe:\t%8lu kB\n"
61353 "VmLib:\t%8lu kB\n"
61354 "VmPTE:\t%8lu kB\n"
61355 - "VmSwap:\t%8lu kB\n",
61356 - hiwater_vm << (PAGE_SHIFT-10),
61357 + "VmSwap:\t%8lu kB\n"
61358 +
61359 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
61360 + "CsBase:\t%8lx\nCsLim:\t%8lx\n"
61361 +#endif
61362 +
61363 + ,hiwater_vm << (PAGE_SHIFT-10),
61364 total_vm << (PAGE_SHIFT-10),
61365 mm->locked_vm << (PAGE_SHIFT-10),
61366 mm->pinned_vm << (PAGE_SHIFT-10),
61367 @@ -63,7 +75,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
61368 data << (PAGE_SHIFT-10),
61369 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
61370 (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
61371 - swap << (PAGE_SHIFT-10));
61372 + swap << (PAGE_SHIFT-10)
61373 +
61374 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
61375 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61376 + , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
61377 + , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
61378 +#else
61379 + , mm->context.user_cs_base
61380 + , mm->context.user_cs_limit
61381 +#endif
61382 +#endif
61383 +
61384 + );
61385 }
61386
61387 unsigned long task_vsize(struct mm_struct *mm)
61388 @@ -278,13 +302,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
61389 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
61390 }
61391
61392 - /* We don't show the stack guard page in /proc/maps */
61393 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61394 + start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
61395 + end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
61396 +#else
61397 start = vma->vm_start;
61398 - if (stack_guard_page_start(vma, start))
61399 - start += PAGE_SIZE;
61400 end = vma->vm_end;
61401 - if (stack_guard_page_end(vma, end))
61402 - end -= PAGE_SIZE;
61403 +#endif
61404
61405 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
61406 start,
61407 @@ -293,7 +317,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
61408 flags & VM_WRITE ? 'w' : '-',
61409 flags & VM_EXEC ? 'x' : '-',
61410 flags & VM_MAYSHARE ? 's' : 'p',
61411 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61412 + PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
61413 +#else
61414 pgoff,
61415 +#endif
61416 MAJOR(dev), MINOR(dev), ino, &len);
61417
61418 /*
61419 @@ -302,7 +330,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
61420 */
61421 if (file) {
61422 pad_len_spaces(m, len);
61423 - seq_path(m, &file->f_path, "\n");
61424 + seq_path(m, &file->f_path, "\n\\");
61425 goto done;
61426 }
61427
61428 @@ -328,8 +356,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
61429 * Thread stack in /proc/PID/task/TID/maps or
61430 * the main process stack.
61431 */
61432 - if (!is_pid || (vma->vm_start <= mm->start_stack &&
61433 - vma->vm_end >= mm->start_stack)) {
61434 + if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
61435 + (vma->vm_start <= mm->start_stack &&
61436 + vma->vm_end >= mm->start_stack)) {
61437 name = "[stack]";
61438 } else {
61439 /* Thread stack in /proc/PID/maps */
61440 @@ -353,6 +382,13 @@ static int show_map(struct seq_file *m, void *v, int is_pid)
61441 struct proc_maps_private *priv = m->private;
61442 struct task_struct *task = priv->task;
61443
61444 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61445 + if (current->exec_id != m->exec_id) {
61446 + gr_log_badprocpid("maps");
61447 + return 0;
61448 + }
61449 +#endif
61450 +
61451 show_map_vma(m, vma, is_pid);
61452
61453 if (m->count < m->size) /* vma is copied successfully */
61454 @@ -590,12 +626,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
61455 .private = &mss,
61456 };
61457
61458 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61459 + if (current->exec_id != m->exec_id) {
61460 + gr_log_badprocpid("smaps");
61461 + return 0;
61462 + }
61463 +#endif
61464 memset(&mss, 0, sizeof mss);
61465 - mss.vma = vma;
61466 - /* mmap_sem is held in m_start */
61467 - if (vma->vm_mm && !is_vm_hugetlb_page(vma))
61468 - walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
61469 -
61470 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61471 + if (!PAX_RAND_FLAGS(vma->vm_mm)) {
61472 +#endif
61473 + mss.vma = vma;
61474 + /* mmap_sem is held in m_start */
61475 + if (vma->vm_mm && !is_vm_hugetlb_page(vma))
61476 + walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
61477 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61478 + }
61479 +#endif
61480 show_map_vma(m, vma, is_pid);
61481
61482 seq_printf(m,
61483 @@ -613,7 +660,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
61484 "KernelPageSize: %8lu kB\n"
61485 "MMUPageSize: %8lu kB\n"
61486 "Locked: %8lu kB\n",
61487 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61488 + PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
61489 +#else
61490 (vma->vm_end - vma->vm_start) >> 10,
61491 +#endif
61492 mss.resident >> 10,
61493 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
61494 mss.shared_clean >> 10,
61495 @@ -1390,6 +1441,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
61496 int n;
61497 char buffer[50];
61498
61499 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61500 + if (current->exec_id != m->exec_id) {
61501 + gr_log_badprocpid("numa_maps");
61502 + return 0;
61503 + }
61504 +#endif
61505 +
61506 if (!mm)
61507 return 0;
61508
61509 @@ -1409,11 +1467,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
61510 if (n < 0)
61511 return n;
61512
61513 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61514 + seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
61515 +#else
61516 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
61517 +#endif
61518
61519 if (file) {
61520 seq_printf(m, " file=");
61521 - seq_path(m, &file->f_path, "\n\t= ");
61522 + seq_path(m, &file->f_path, "\n\t\\= ");
61523 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
61524 seq_printf(m, " heap");
61525 } else {
61526 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
61527 index 56123a6..5a2f6ec 100644
61528 --- a/fs/proc/task_nommu.c
61529 +++ b/fs/proc/task_nommu.c
61530 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
61531 else
61532 bytes += kobjsize(mm);
61533
61534 - if (current->fs && current->fs->users > 1)
61535 + if (current->fs && atomic_read(&current->fs->users) > 1)
61536 sbytes += kobjsize(current->fs);
61537 else
61538 bytes += kobjsize(current->fs);
61539 @@ -168,7 +168,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
61540
61541 if (file) {
61542 pad_len_spaces(m, len);
61543 - seq_path(m, &file->f_path, "");
61544 + seq_path(m, &file->f_path, "\n\\");
61545 } else if (mm) {
61546 pid_t tid = vm_is_stack(priv->task, vma, is_pid);
61547
61548 diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
61549 index 9100d69..f1f9fc9 100644
61550 --- a/fs/proc/vmcore.c
61551 +++ b/fs/proc/vmcore.c
61552 @@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
61553 nr_bytes = count;
61554
61555 /* If pfn is not ram, return zeros for sparse dump files */
61556 - if (pfn_is_ram(pfn) == 0)
61557 - memset(buf, 0, nr_bytes);
61558 - else {
61559 + if (pfn_is_ram(pfn) == 0) {
61560 + if (userbuf) {
61561 + if (clear_user((char __force_user *)buf, nr_bytes))
61562 + return -EFAULT;
61563 + } else
61564 + memset(buf, 0, nr_bytes);
61565 + } else {
61566 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
61567 offset, userbuf);
61568 if (tmp < 0)
61569 @@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
61570 if (*fpos < m->offset + m->size) {
61571 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
61572 start = m->paddr + *fpos - m->offset;
61573 - tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
61574 + tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
61575 if (tmp < 0)
61576 return tmp;
61577 buflen -= tsz;
61578 diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
61579 index b00fcc9..e0c6381 100644
61580 --- a/fs/qnx6/qnx6.h
61581 +++ b/fs/qnx6/qnx6.h
61582 @@ -74,7 +74,7 @@ enum {
61583 BYTESEX_BE,
61584 };
61585
61586 -static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
61587 +static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
61588 {
61589 if (sbi->s_bytesex == BYTESEX_LE)
61590 return le64_to_cpu((__force __le64)n);
61591 @@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
61592 return (__force __fs64)cpu_to_be64(n);
61593 }
61594
61595 -static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
61596 +static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
61597 {
61598 if (sbi->s_bytesex == BYTESEX_LE)
61599 return le32_to_cpu((__force __le32)n);
61600 diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
61601 index 16e8abb..2dcf914 100644
61602 --- a/fs/quota/netlink.c
61603 +++ b/fs/quota/netlink.c
61604 @@ -33,7 +33,7 @@ static struct genl_family quota_genl_family = {
61605 void quota_send_warning(struct kqid qid, dev_t dev,
61606 const char warntype)
61607 {
61608 - static atomic_t seq;
61609 + static atomic_unchecked_t seq;
61610 struct sk_buff *skb;
61611 void *msg_head;
61612 int ret;
61613 @@ -49,7 +49,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
61614 "VFS: Not enough memory to send quota warning.\n");
61615 return;
61616 }
61617 - msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
61618 + msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
61619 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
61620 if (!msg_head) {
61621 printk(KERN_ERR
61622 diff --git a/fs/read_write.c b/fs/read_write.c
61623 index e3cd280..a378473 100644
61624 --- a/fs/read_write.c
61625 +++ b/fs/read_write.c
61626 @@ -438,7 +438,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
61627
61628 old_fs = get_fs();
61629 set_fs(get_ds());
61630 - p = (__force const char __user *)buf;
61631 + p = (const char __force_user *)buf;
61632 if (count > MAX_RW_COUNT)
61633 count = MAX_RW_COUNT;
61634 if (file->f_op->write)
61635 diff --git a/fs/readdir.c b/fs/readdir.c
61636 index 93d71e5..6a14be8 100644
61637 --- a/fs/readdir.c
61638 +++ b/fs/readdir.c
61639 @@ -17,6 +17,7 @@
61640 #include <linux/security.h>
61641 #include <linux/syscalls.h>
61642 #include <linux/unistd.h>
61643 +#include <linux/namei.h>
61644
61645 #include <asm/uaccess.h>
61646
61647 @@ -69,6 +70,7 @@ struct old_linux_dirent {
61648 struct readdir_callback {
61649 struct dir_context ctx;
61650 struct old_linux_dirent __user * dirent;
61651 + struct file * file;
61652 int result;
61653 };
61654
61655 @@ -86,6 +88,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
61656 buf->result = -EOVERFLOW;
61657 return -EOVERFLOW;
61658 }
61659 +
61660 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
61661 + return 0;
61662 +
61663 buf->result++;
61664 dirent = buf->dirent;
61665 if (!access_ok(VERIFY_WRITE, dirent,
61666 @@ -117,6 +123,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
61667 if (!f.file)
61668 return -EBADF;
61669
61670 + buf.file = f.file;
61671 error = iterate_dir(f.file, &buf.ctx);
61672 if (buf.result)
61673 error = buf.result;
61674 @@ -142,6 +149,7 @@ struct getdents_callback {
61675 struct dir_context ctx;
61676 struct linux_dirent __user * current_dir;
61677 struct linux_dirent __user * previous;
61678 + struct file * file;
61679 int count;
61680 int error;
61681 };
61682 @@ -163,6 +171,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
61683 buf->error = -EOVERFLOW;
61684 return -EOVERFLOW;
61685 }
61686 +
61687 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
61688 + return 0;
61689 +
61690 dirent = buf->previous;
61691 if (dirent) {
61692 if (__put_user(offset, &dirent->d_off))
61693 @@ -208,6 +220,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
61694 if (!f.file)
61695 return -EBADF;
61696
61697 + buf.file = f.file;
61698 error = iterate_dir(f.file, &buf.ctx);
61699 if (error >= 0)
61700 error = buf.error;
61701 @@ -226,6 +239,7 @@ struct getdents_callback64 {
61702 struct dir_context ctx;
61703 struct linux_dirent64 __user * current_dir;
61704 struct linux_dirent64 __user * previous;
61705 + struct file *file;
61706 int count;
61707 int error;
61708 };
61709 @@ -241,6 +255,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
61710 buf->error = -EINVAL; /* only used if we fail.. */
61711 if (reclen > buf->count)
61712 return -EINVAL;
61713 +
61714 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
61715 + return 0;
61716 +
61717 dirent = buf->previous;
61718 if (dirent) {
61719 if (__put_user(offset, &dirent->d_off))
61720 @@ -288,6 +306,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
61721 if (!f.file)
61722 return -EBADF;
61723
61724 + buf.file = f.file;
61725 error = iterate_dir(f.file, &buf.ctx);
61726 if (error >= 0)
61727 error = buf.error;
61728 diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
61729 index 2b7882b..1c5ef48 100644
61730 --- a/fs/reiserfs/do_balan.c
61731 +++ b/fs/reiserfs/do_balan.c
61732 @@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
61733 return;
61734 }
61735
61736 - atomic_inc(&(fs_generation(tb->tb_sb)));
61737 + atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
61738 do_balance_starts(tb);
61739
61740 /* balance leaf returns 0 except if combining L R and S into
61741 diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
61742 index a958444..42b2323 100644
61743 --- a/fs/reiserfs/procfs.c
61744 +++ b/fs/reiserfs/procfs.c
61745 @@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
61746 "SMALL_TAILS " : "NO_TAILS ",
61747 replay_only(sb) ? "REPLAY_ONLY " : "",
61748 convert_reiserfs(sb) ? "CONV " : "",
61749 - atomic_read(&r->s_generation_counter),
61750 + atomic_read_unchecked(&r->s_generation_counter),
61751 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
61752 SF(s_do_balance), SF(s_unneeded_left_neighbor),
61753 SF(s_good_search_by_key_reada), SF(s_bmaps),
61754 diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
61755 index f8adaee..0eeeeca 100644
61756 --- a/fs/reiserfs/reiserfs.h
61757 +++ b/fs/reiserfs/reiserfs.h
61758 @@ -453,7 +453,7 @@ struct reiserfs_sb_info {
61759 /* Comment? -Hans */
61760 wait_queue_head_t s_wait;
61761 /* To be obsoleted soon by per buffer seals.. -Hans */
61762 - atomic_t s_generation_counter; // increased by one every time the
61763 + atomic_unchecked_t s_generation_counter; // increased by one every time the
61764 // tree gets re-balanced
61765 unsigned long s_properties; /* File system properties. Currently holds
61766 on-disk FS format */
61767 @@ -1982,7 +1982,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
61768 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
61769
61770 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
61771 -#define get_generation(s) atomic_read (&fs_generation(s))
61772 +#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
61773 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
61774 #define __fs_changed(gen,s) (gen != get_generation (s))
61775 #define fs_changed(gen,s) \
61776 diff --git a/fs/select.c b/fs/select.c
61777 index dfd5cb1..1754d57 100644
61778 --- a/fs/select.c
61779 +++ b/fs/select.c
61780 @@ -20,6 +20,7 @@
61781 #include <linux/export.h>
61782 #include <linux/slab.h>
61783 #include <linux/poll.h>
61784 +#include <linux/security.h>
61785 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
61786 #include <linux/file.h>
61787 #include <linux/fdtable.h>
61788 @@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
61789 struct poll_list *walk = head;
61790 unsigned long todo = nfds;
61791
61792 + gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
61793 if (nfds > rlimit(RLIMIT_NOFILE))
61794 return -EINVAL;
61795
61796 diff --git a/fs/seq_file.c b/fs/seq_file.c
61797 index a290157..ec3211a 100644
61798 --- a/fs/seq_file.c
61799 +++ b/fs/seq_file.c
61800 @@ -10,6 +10,7 @@
61801 #include <linux/seq_file.h>
61802 #include <linux/slab.h>
61803 #include <linux/cred.h>
61804 +#include <linux/sched.h>
61805
61806 #include <asm/uaccess.h>
61807 #include <asm/page.h>
61808 @@ -60,6 +61,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
61809 #ifdef CONFIG_USER_NS
61810 p->user_ns = file->f_cred->user_ns;
61811 #endif
61812 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61813 + p->exec_id = current->exec_id;
61814 +#endif
61815
61816 /*
61817 * Wrappers around seq_open(e.g. swaps_open) need to be
61818 @@ -96,7 +100,7 @@ static int traverse(struct seq_file *m, loff_t offset)
61819 return 0;
61820 }
61821 if (!m->buf) {
61822 - m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
61823 + m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
61824 if (!m->buf)
61825 return -ENOMEM;
61826 }
61827 @@ -136,7 +140,7 @@ static int traverse(struct seq_file *m, loff_t offset)
61828 Eoverflow:
61829 m->op->stop(m, p);
61830 kfree(m->buf);
61831 - m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
61832 + m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
61833 return !m->buf ? -ENOMEM : -EAGAIN;
61834 }
61835
61836 @@ -152,7 +156,7 @@ Eoverflow:
61837 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
61838 {
61839 struct seq_file *m = file->private_data;
61840 - size_t copied = 0;
61841 + ssize_t copied = 0;
61842 loff_t pos;
61843 size_t n;
61844 void *p;
61845 @@ -191,7 +195,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
61846
61847 /* grab buffer if we didn't have one */
61848 if (!m->buf) {
61849 - m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
61850 + m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
61851 if (!m->buf)
61852 goto Enomem;
61853 }
61854 @@ -232,7 +236,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
61855 goto Fill;
61856 m->op->stop(m, p);
61857 kfree(m->buf);
61858 - m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
61859 + m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
61860 if (!m->buf)
61861 goto Enomem;
61862 m->count = 0;
61863 @@ -583,7 +587,7 @@ static void single_stop(struct seq_file *p, void *v)
61864 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
61865 void *data)
61866 {
61867 - struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
61868 + seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
61869 int res = -ENOMEM;
61870
61871 if (op) {
61872 diff --git a/fs/splice.c b/fs/splice.c
61873 index 3b7ee65..87fc2e4 100644
61874 --- a/fs/splice.c
61875 +++ b/fs/splice.c
61876 @@ -196,7 +196,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
61877 pipe_lock(pipe);
61878
61879 for (;;) {
61880 - if (!pipe->readers) {
61881 + if (!atomic_read(&pipe->readers)) {
61882 send_sig(SIGPIPE, current, 0);
61883 if (!ret)
61884 ret = -EPIPE;
61885 @@ -219,7 +219,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
61886 page_nr++;
61887 ret += buf->len;
61888
61889 - if (pipe->files)
61890 + if (atomic_read(&pipe->files))
61891 do_wakeup = 1;
61892
61893 if (!--spd->nr_pages)
61894 @@ -250,9 +250,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
61895 do_wakeup = 0;
61896 }
61897
61898 - pipe->waiting_writers++;
61899 + atomic_inc(&pipe->waiting_writers);
61900 pipe_wait(pipe);
61901 - pipe->waiting_writers--;
61902 + atomic_dec(&pipe->waiting_writers);
61903 }
61904
61905 pipe_unlock(pipe);
61906 @@ -565,7 +565,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
61907 old_fs = get_fs();
61908 set_fs(get_ds());
61909 /* The cast to a user pointer is valid due to the set_fs() */
61910 - res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
61911 + res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
61912 set_fs(old_fs);
61913
61914 return res;
61915 @@ -580,7 +580,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
61916 old_fs = get_fs();
61917 set_fs(get_ds());
61918 /* The cast to a user pointer is valid due to the set_fs() */
61919 - res = vfs_write(file, (__force const char __user *)buf, count, &pos);
61920 + res = vfs_write(file, (const char __force_user *)buf, count, &pos);
61921 set_fs(old_fs);
61922
61923 return res;
61924 @@ -633,7 +633,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
61925 goto err;
61926
61927 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
61928 - vec[i].iov_base = (void __user *) page_address(page);
61929 + vec[i].iov_base = (void __force_user *) page_address(page);
61930 vec[i].iov_len = this_len;
61931 spd.pages[i] = page;
61932 spd.nr_pages++;
61933 @@ -829,7 +829,7 @@ int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_desc *sd,
61934 ops->release(pipe, buf);
61935 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
61936 pipe->nrbufs--;
61937 - if (pipe->files)
61938 + if (atomic_read(&pipe->files))
61939 sd->need_wakeup = true;
61940 }
61941
61942 @@ -854,10 +854,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
61943 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
61944 {
61945 while (!pipe->nrbufs) {
61946 - if (!pipe->writers)
61947 + if (!atomic_read(&pipe->writers))
61948 return 0;
61949
61950 - if (!pipe->waiting_writers && sd->num_spliced)
61951 + if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
61952 return 0;
61953
61954 if (sd->flags & SPLICE_F_NONBLOCK)
61955 @@ -1179,7 +1179,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
61956 * out of the pipe right after the splice_to_pipe(). So set
61957 * PIPE_READERS appropriately.
61958 */
61959 - pipe->readers = 1;
61960 + atomic_set(&pipe->readers, 1);
61961
61962 current->splice_pipe = pipe;
61963 }
61964 @@ -1475,6 +1475,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
61965
61966 partial[buffers].offset = off;
61967 partial[buffers].len = plen;
61968 + partial[buffers].private = 0;
61969
61970 off = 0;
61971 len -= plen;
61972 @@ -1777,9 +1778,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
61973 ret = -ERESTARTSYS;
61974 break;
61975 }
61976 - if (!pipe->writers)
61977 + if (!atomic_read(&pipe->writers))
61978 break;
61979 - if (!pipe->waiting_writers) {
61980 + if (!atomic_read(&pipe->waiting_writers)) {
61981 if (flags & SPLICE_F_NONBLOCK) {
61982 ret = -EAGAIN;
61983 break;
61984 @@ -1811,7 +1812,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
61985 pipe_lock(pipe);
61986
61987 while (pipe->nrbufs >= pipe->buffers) {
61988 - if (!pipe->readers) {
61989 + if (!atomic_read(&pipe->readers)) {
61990 send_sig(SIGPIPE, current, 0);
61991 ret = -EPIPE;
61992 break;
61993 @@ -1824,9 +1825,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
61994 ret = -ERESTARTSYS;
61995 break;
61996 }
61997 - pipe->waiting_writers++;
61998 + atomic_inc(&pipe->waiting_writers);
61999 pipe_wait(pipe);
62000 - pipe->waiting_writers--;
62001 + atomic_dec(&pipe->waiting_writers);
62002 }
62003
62004 pipe_unlock(pipe);
62005 @@ -1862,14 +1863,14 @@ retry:
62006 pipe_double_lock(ipipe, opipe);
62007
62008 do {
62009 - if (!opipe->readers) {
62010 + if (!atomic_read(&opipe->readers)) {
62011 send_sig(SIGPIPE, current, 0);
62012 if (!ret)
62013 ret = -EPIPE;
62014 break;
62015 }
62016
62017 - if (!ipipe->nrbufs && !ipipe->writers)
62018 + if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
62019 break;
62020
62021 /*
62022 @@ -1966,7 +1967,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
62023 pipe_double_lock(ipipe, opipe);
62024
62025 do {
62026 - if (!opipe->readers) {
62027 + if (!atomic_read(&opipe->readers)) {
62028 send_sig(SIGPIPE, current, 0);
62029 if (!ret)
62030 ret = -EPIPE;
62031 @@ -2011,7 +2012,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
62032 * return EAGAIN if we have the potential of some data in the
62033 * future, otherwise just return 0
62034 */
62035 - if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
62036 + if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
62037 ret = -EAGAIN;
62038
62039 pipe_unlock(ipipe);
62040 diff --git a/fs/stat.c b/fs/stat.c
62041 index ae0c3ce..9ee641c 100644
62042 --- a/fs/stat.c
62043 +++ b/fs/stat.c
62044 @@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
62045 stat->gid = inode->i_gid;
62046 stat->rdev = inode->i_rdev;
62047 stat->size = i_size_read(inode);
62048 - stat->atime = inode->i_atime;
62049 - stat->mtime = inode->i_mtime;
62050 + if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
62051 + stat->atime = inode->i_ctime;
62052 + stat->mtime = inode->i_ctime;
62053 + } else {
62054 + stat->atime = inode->i_atime;
62055 + stat->mtime = inode->i_mtime;
62056 + }
62057 stat->ctime = inode->i_ctime;
62058 stat->blksize = (1 << inode->i_blkbits);
62059 stat->blocks = inode->i_blocks;
62060 @@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
62061 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
62062 {
62063 struct inode *inode = path->dentry->d_inode;
62064 + int retval;
62065
62066 - if (inode->i_op->getattr)
62067 - return inode->i_op->getattr(path->mnt, path->dentry, stat);
62068 + if (inode->i_op->getattr) {
62069 + retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
62070 + if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
62071 + stat->atime = stat->ctime;
62072 + stat->mtime = stat->ctime;
62073 + }
62074 + return retval;
62075 + }
62076
62077 generic_fillattr(inode, stat);
62078 return 0;
62079 diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
62080 index c590cab..6dfd6fc 100644
62081 --- a/fs/sysfs/bin.c
62082 +++ b/fs/sysfs/bin.c
62083 @@ -234,13 +234,13 @@ static int bin_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
62084 return ret;
62085 }
62086
62087 -static int bin_access(struct vm_area_struct *vma, unsigned long addr,
62088 - void *buf, int len, int write)
62089 +static ssize_t bin_access(struct vm_area_struct *vma, unsigned long addr,
62090 + void *buf, size_t len, int write)
62091 {
62092 struct file *file = vma->vm_file;
62093 struct bin_buffer *bb = file->private_data;
62094 struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
62095 - int ret;
62096 + ssize_t ret;
62097
62098 if (!bb->vm_ops)
62099 return -EINVAL;
62100 diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
62101 index 4d83ced..049dc45 100644
62102 --- a/fs/sysfs/dir.c
62103 +++ b/fs/sysfs/dir.c
62104 @@ -40,7 +40,7 @@ static DEFINE_IDA(sysfs_ino_ida);
62105 *
62106 * Returns 31 bit hash of ns + name (so it fits in an off_t )
62107 */
62108 -static unsigned int sysfs_name_hash(const void *ns, const char *name)
62109 +static unsigned int sysfs_name_hash(const void *ns, const unsigned char *name)
62110 {
62111 unsigned long hash = init_name_hash();
62112 unsigned int len = strlen(name);
62113 @@ -675,6 +675,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
62114 struct sysfs_dirent *sd;
62115 int rc;
62116
62117 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
62118 + const char *parent_name = parent_sd->s_name;
62119 +
62120 + mode = S_IFDIR | S_IRWXU;
62121 +
62122 + if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
62123 + (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
62124 + (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
62125 + (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
62126 + mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
62127 +#endif
62128 +
62129 /* allocate */
62130 sd = sysfs_new_dirent(name, mode, SYSFS_DIR);
62131 if (!sd)
62132 diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
62133 index 15ef5eb..e474372 100644
62134 --- a/fs/sysfs/file.c
62135 +++ b/fs/sysfs/file.c
62136 @@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
62137
62138 struct sysfs_open_dirent {
62139 atomic_t refcnt;
62140 - atomic_t event;
62141 + atomic_unchecked_t event;
62142 wait_queue_head_t poll;
62143 struct list_head buffers; /* goes through sysfs_buffer.list */
62144 };
62145 @@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry *dentry, struct sysfs_buffer *buffer)
62146 if (!sysfs_get_active(attr_sd))
62147 return -ENODEV;
62148
62149 - buffer->event = atomic_read(&attr_sd->s_attr.open->event);
62150 + buffer->event = atomic_read_unchecked(&attr_sd->s_attr.open->event);
62151 count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
62152
62153 sysfs_put_active(attr_sd);
62154 @@ -284,7 +284,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
62155 return -ENOMEM;
62156
62157 atomic_set(&new_od->refcnt, 0);
62158 - atomic_set(&new_od->event, 1);
62159 + atomic_set_unchecked(&new_od->event, 1);
62160 init_waitqueue_head(&new_od->poll);
62161 INIT_LIST_HEAD(&new_od->buffers);
62162 goto retry;
62163 @@ -430,7 +430,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
62164
62165 sysfs_put_active(attr_sd);
62166
62167 - if (buffer->event != atomic_read(&od->event))
62168 + if (buffer->event != atomic_read_unchecked(&od->event))
62169 goto trigger;
62170
62171 return DEFAULT_POLLMASK;
62172 @@ -450,7 +450,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
62173 if (!WARN_ON(sysfs_type(sd) != SYSFS_KOBJ_ATTR)) {
62174 od = sd->s_attr.open;
62175 if (od) {
62176 - atomic_inc(&od->event);
62177 + atomic_inc_unchecked(&od->event);
62178 wake_up_interruptible(&od->poll);
62179 }
62180 }
62181 diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
62182 index 2dd4507..62a215a 100644
62183 --- a/fs/sysfs/symlink.c
62184 +++ b/fs/sysfs/symlink.c
62185 @@ -308,7 +308,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
62186 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd,
62187 void *cookie)
62188 {
62189 - char *page = nd_get_link(nd);
62190 + const char *page = nd_get_link(nd);
62191 if (!IS_ERR(page))
62192 free_page((unsigned long)page);
62193 }
62194 diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
62195 index 69d4889..a810bd4 100644
62196 --- a/fs/sysv/sysv.h
62197 +++ b/fs/sysv/sysv.h
62198 @@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
62199 #endif
62200 }
62201
62202 -static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
62203 +static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
62204 {
62205 if (sbi->s_bytesex == BYTESEX_PDP)
62206 return PDP_swab((__force __u32)n);
62207 diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
62208 index e18b988..f1d4ad0f 100644
62209 --- a/fs/ubifs/io.c
62210 +++ b/fs/ubifs/io.c
62211 @@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
62212 return err;
62213 }
62214
62215 -int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
62216 +int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
62217 {
62218 int err;
62219
62220 diff --git a/fs/udf/misc.c b/fs/udf/misc.c
62221 index c175b4d..8f36a16 100644
62222 --- a/fs/udf/misc.c
62223 +++ b/fs/udf/misc.c
62224 @@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
62225
62226 u8 udf_tag_checksum(const struct tag *t)
62227 {
62228 - u8 *data = (u8 *)t;
62229 + const u8 *data = (const u8 *)t;
62230 u8 checksum = 0;
62231 int i;
62232 for (i = 0; i < sizeof(struct tag); ++i)
62233 diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
62234 index 8d974c4..b82f6ec 100644
62235 --- a/fs/ufs/swab.h
62236 +++ b/fs/ufs/swab.h
62237 @@ -22,7 +22,7 @@ enum {
62238 BYTESEX_BE
62239 };
62240
62241 -static inline u64
62242 +static inline u64 __intentional_overflow(-1)
62243 fs64_to_cpu(struct super_block *sbp, __fs64 n)
62244 {
62245 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
62246 @@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
62247 return (__force __fs64)cpu_to_be64(n);
62248 }
62249
62250 -static inline u32
62251 +static inline u32 __intentional_overflow(-1)
62252 fs32_to_cpu(struct super_block *sbp, __fs32 n)
62253 {
62254 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
62255 diff --git a/fs/utimes.c b/fs/utimes.c
62256 index f4fb7ec..3fe03c0 100644
62257 --- a/fs/utimes.c
62258 +++ b/fs/utimes.c
62259 @@ -1,6 +1,7 @@
62260 #include <linux/compiler.h>
62261 #include <linux/file.h>
62262 #include <linux/fs.h>
62263 +#include <linux/security.h>
62264 #include <linux/linkage.h>
62265 #include <linux/mount.h>
62266 #include <linux/namei.h>
62267 @@ -101,6 +102,12 @@ static int utimes_common(struct path *path, struct timespec *times)
62268 goto mnt_drop_write_and_out;
62269 }
62270 }
62271 +
62272 + if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
62273 + error = -EACCES;
62274 + goto mnt_drop_write_and_out;
62275 + }
62276 +
62277 mutex_lock(&inode->i_mutex);
62278 error = notify_change(path->dentry, &newattrs);
62279 mutex_unlock(&inode->i_mutex);
62280 diff --git a/fs/xattr.c b/fs/xattr.c
62281 index 3377dff..f394815 100644
62282 --- a/fs/xattr.c
62283 +++ b/fs/xattr.c
62284 @@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
62285 return rc;
62286 }
62287
62288 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
62289 +ssize_t
62290 +pax_getxattr(struct dentry *dentry, void *value, size_t size)
62291 +{
62292 + struct inode *inode = dentry->d_inode;
62293 + ssize_t error;
62294 +
62295 + error = inode_permission(inode, MAY_EXEC);
62296 + if (error)
62297 + return error;
62298 +
62299 + if (inode->i_op->getxattr)
62300 + error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
62301 + else
62302 + error = -EOPNOTSUPP;
62303 +
62304 + return error;
62305 +}
62306 +EXPORT_SYMBOL(pax_getxattr);
62307 +#endif
62308 +
62309 ssize_t
62310 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
62311 {
62312 @@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
62313 * Extended attribute SET operations
62314 */
62315 static long
62316 -setxattr(struct dentry *d, const char __user *name, const void __user *value,
62317 +setxattr(struct path *path, const char __user *name, const void __user *value,
62318 size_t size, int flags)
62319 {
62320 int error;
62321 @@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
62322 posix_acl_fix_xattr_from_user(kvalue, size);
62323 }
62324
62325 - error = vfs_setxattr(d, kname, kvalue, size, flags);
62326 + if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
62327 + error = -EACCES;
62328 + goto out;
62329 + }
62330 +
62331 + error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
62332 out:
62333 if (vvalue)
62334 vfree(vvalue);
62335 @@ -377,7 +403,7 @@ retry:
62336 return error;
62337 error = mnt_want_write(path.mnt);
62338 if (!error) {
62339 - error = setxattr(path.dentry, name, value, size, flags);
62340 + error = setxattr(&path, name, value, size, flags);
62341 mnt_drop_write(path.mnt);
62342 }
62343 path_put(&path);
62344 @@ -401,7 +427,7 @@ retry:
62345 return error;
62346 error = mnt_want_write(path.mnt);
62347 if (!error) {
62348 - error = setxattr(path.dentry, name, value, size, flags);
62349 + error = setxattr(&path, name, value, size, flags);
62350 mnt_drop_write(path.mnt);
62351 }
62352 path_put(&path);
62353 @@ -416,16 +442,14 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
62354 const void __user *,value, size_t, size, int, flags)
62355 {
62356 struct fd f = fdget(fd);
62357 - struct dentry *dentry;
62358 int error = -EBADF;
62359
62360 if (!f.file)
62361 return error;
62362 - dentry = f.file->f_path.dentry;
62363 - audit_inode(NULL, dentry, 0);
62364 + audit_inode(NULL, f.file->f_path.dentry, 0);
62365 error = mnt_want_write_file(f.file);
62366 if (!error) {
62367 - error = setxattr(dentry, name, value, size, flags);
62368 + error = setxattr(&f.file->f_path, name, value, size, flags);
62369 mnt_drop_write_file(f.file);
62370 }
62371 fdput(f);
62372 @@ -626,7 +650,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
62373 * Extended attribute REMOVE operations
62374 */
62375 static long
62376 -removexattr(struct dentry *d, const char __user *name)
62377 +removexattr(struct path *path, const char __user *name)
62378 {
62379 int error;
62380 char kname[XATTR_NAME_MAX + 1];
62381 @@ -637,7 +661,10 @@ removexattr(struct dentry *d, const char __user *name)
62382 if (error < 0)
62383 return error;
62384
62385 - return vfs_removexattr(d, kname);
62386 + if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
62387 + return -EACCES;
62388 +
62389 + return vfs_removexattr(path->dentry, kname);
62390 }
62391
62392 SYSCALL_DEFINE2(removexattr, const char __user *, pathname,
62393 @@ -652,7 +679,7 @@ retry:
62394 return error;
62395 error = mnt_want_write(path.mnt);
62396 if (!error) {
62397 - error = removexattr(path.dentry, name);
62398 + error = removexattr(&path, name);
62399 mnt_drop_write(path.mnt);
62400 }
62401 path_put(&path);
62402 @@ -675,7 +702,7 @@ retry:
62403 return error;
62404 error = mnt_want_write(path.mnt);
62405 if (!error) {
62406 - error = removexattr(path.dentry, name);
62407 + error = removexattr(&path, name);
62408 mnt_drop_write(path.mnt);
62409 }
62410 path_put(&path);
62411 @@ -689,16 +716,16 @@ retry:
62412 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
62413 {
62414 struct fd f = fdget(fd);
62415 - struct dentry *dentry;
62416 + struct path *path;
62417 int error = -EBADF;
62418
62419 if (!f.file)
62420 return error;
62421 - dentry = f.file->f_path.dentry;
62422 - audit_inode(NULL, dentry, 0);
62423 + path = &f.file->f_path;
62424 + audit_inode(NULL, path->dentry, 0);
62425 error = mnt_want_write_file(f.file);
62426 if (!error) {
62427 - error = removexattr(dentry, name);
62428 + error = removexattr(path, name);
62429 mnt_drop_write_file(f.file);
62430 }
62431 fdput(f);
62432 diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
62433 index 9fbea87..6b19972 100644
62434 --- a/fs/xattr_acl.c
62435 +++ b/fs/xattr_acl.c
62436 @@ -76,8 +76,8 @@ struct posix_acl *
62437 posix_acl_from_xattr(struct user_namespace *user_ns,
62438 const void *value, size_t size)
62439 {
62440 - posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
62441 - posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
62442 + const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
62443 + const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
62444 int count;
62445 struct posix_acl *acl;
62446 struct posix_acl_entry *acl_e;
62447 diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
62448 index f47e65c..e7125d9 100644
62449 --- a/fs/xfs/xfs_bmap.c
62450 +++ b/fs/xfs/xfs_bmap.c
62451 @@ -586,7 +586,7 @@ xfs_bmap_validate_ret(
62452
62453 #else
62454 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
62455 -#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
62456 +#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
62457 #endif /* DEBUG */
62458
62459 /*
62460 diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
62461 index 8f84153..7ce60d0 100644
62462 --- a/fs/xfs/xfs_dir2_readdir.c
62463 +++ b/fs/xfs/xfs_dir2_readdir.c
62464 @@ -160,7 +160,12 @@ xfs_dir2_sf_getdents(
62465 ino = xfs_dir3_sfe_get_ino(mp, sfp, sfep);
62466 filetype = xfs_dir3_sfe_get_ftype(mp, sfp, sfep);
62467 ctx->pos = off & 0x7fffffff;
62468 - if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
62469 + if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
62470 + char name[sfep->namelen];
62471 + memcpy(name, sfep->name, sfep->namelen);
62472 + if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(mp, filetype)))
62473 + return 0;
62474 + } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
62475 xfs_dir3_get_dtype(mp, filetype)))
62476 return 0;
62477 sfep = xfs_dir3_sf_nextentry(mp, sfp, sfep);
62478 diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
62479 index 8c8ef24..689f742 100644
62480 --- a/fs/xfs/xfs_ioctl.c
62481 +++ b/fs/xfs/xfs_ioctl.c
62482 @@ -127,7 +127,7 @@ xfs_find_handle(
62483 }
62484
62485 error = -EFAULT;
62486 - if (copy_to_user(hreq->ohandle, &handle, hsize) ||
62487 + if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
62488 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
62489 goto out_put;
62490
62491 diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
62492 index 2b8952d..a60c6be 100644
62493 --- a/fs/xfs/xfs_iops.c
62494 +++ b/fs/xfs/xfs_iops.c
62495 @@ -401,7 +401,7 @@ xfs_vn_put_link(
62496 struct nameidata *nd,
62497 void *p)
62498 {
62499 - char *s = nd_get_link(nd);
62500 + const char *s = nd_get_link(nd);
62501
62502 if (!IS_ERR(s))
62503 kfree(s);
62504 diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
62505 new file mode 100644
62506 index 0000000..5b2538b
62507 --- /dev/null
62508 +++ b/grsecurity/Kconfig
62509 @@ -0,0 +1,1116 @@
62510 +#
62511 +# grecurity configuration
62512 +#
62513 +menu "Memory Protections"
62514 +depends on GRKERNSEC
62515 +
62516 +config GRKERNSEC_KMEM
62517 + bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
62518 + default y if GRKERNSEC_CONFIG_AUTO
62519 + select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
62520 + help
62521 + If you say Y here, /dev/kmem and /dev/mem won't be allowed to
62522 + be written to or read from to modify or leak the contents of the running
62523 + kernel. /dev/port will also not be allowed to be opened, and support
62524 + for /dev/cpu/*/msr and kexec will be removed. If you have module
62525 + support disabled, enabling this will close up six ways that are
62526 + currently used to insert malicious code into the running kernel.
62527 +
62528 + Even with this feature enabled, we still highly recommend that
62529 + you use the RBAC system, as it is still possible for an attacker to
62530 + modify the running kernel through other more obscure methods.
62531 +
62532 + Enabling this feature will prevent the "cpupower" and "powertop" tools
62533 + from working.
62534 +
62535 + It is highly recommended that you say Y here if you meet all the
62536 + conditions above.
62537 +
62538 +config GRKERNSEC_VM86
62539 + bool "Restrict VM86 mode"
62540 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
62541 + depends on X86_32
62542 +
62543 + help
62544 + If you say Y here, only processes with CAP_SYS_RAWIO will be able to
62545 + make use of a special execution mode on 32bit x86 processors called
62546 + Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
62547 + video cards and will still work with this option enabled. The purpose
62548 + of the option is to prevent exploitation of emulation errors in
62549 + virtualization of vm86 mode like the one discovered in VMWare in 2009.
62550 + Nearly all users should be able to enable this option.
62551 +
62552 +config GRKERNSEC_IO
62553 + bool "Disable privileged I/O"
62554 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
62555 + depends on X86
62556 + select RTC_CLASS
62557 + select RTC_INTF_DEV
62558 + select RTC_DRV_CMOS
62559 +
62560 + help
62561 + If you say Y here, all ioperm and iopl calls will return an error.
62562 + Ioperm and iopl can be used to modify the running kernel.
62563 + Unfortunately, some programs need this access to operate properly,
62564 + the most notable of which are XFree86 and hwclock. hwclock can be
62565 + remedied by having RTC support in the kernel, so real-time
62566 + clock support is enabled if this option is enabled, to ensure
62567 + that hwclock operates correctly.
62568 +
62569 + If you're using XFree86 or a version of Xorg from 2012 or earlier,
62570 + you may not be able to boot into a graphical environment with this
62571 + option enabled. In this case, you should use the RBAC system instead.
62572 +
62573 +config GRKERNSEC_JIT_HARDEN
62574 + bool "Harden BPF JIT against spray attacks"
62575 + default y if GRKERNSEC_CONFIG_AUTO
62576 + depends on BPF_JIT
62577 + help
62578 + If you say Y here, the native code generated by the kernel's Berkeley
62579 + Packet Filter (BPF) JIT engine will be hardened against JIT-spraying
62580 + attacks that attempt to fit attacker-beneficial instructions in
62581 + 32bit immediate fields of JIT-generated native instructions. The
62582 + attacker will generally aim to cause an unintended instruction sequence
62583 + of JIT-generated native code to execute by jumping into the middle of
62584 + a generated instruction. This feature effectively randomizes the 32bit
62585 + immediate constants present in the generated code to thwart such attacks.
62586 +
62587 + If you're using KERNEXEC, it's recommended that you enable this option
62588 + to supplement the hardening of the kernel.
62589 +
62590 +config GRKERNSEC_PERF_HARDEN
62591 + bool "Disable unprivileged PERF_EVENTS usage by default"
62592 + default y if GRKERNSEC_CONFIG_AUTO
62593 + depends on PERF_EVENTS
62594 + help
62595 + If you say Y here, the range of acceptable values for the
62596 + /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
62597 + default to a new value: 3. When the sysctl is set to this value, no
62598 + unprivileged use of the PERF_EVENTS syscall interface will be permitted.
62599 +
62600 + Though PERF_EVENTS can be used legitimately for performance monitoring
62601 + and low-level application profiling, it is forced on regardless of
62602 + configuration, has been at fault for several vulnerabilities, and
62603 + creates new opportunities for side channels and other information leaks.
62604 +
62605 + This feature puts PERF_EVENTS into a secure default state and permits
62606 + the administrator to change out of it temporarily if unprivileged
62607 + application profiling is needed.
62608 +
62609 +config GRKERNSEC_RAND_THREADSTACK
62610 + bool "Insert random gaps between thread stacks"
62611 + default y if GRKERNSEC_CONFIG_AUTO
62612 + depends on PAX_RANDMMAP && !PPC
62613 + help
62614 + If you say Y here, a random-sized gap will be enforced between allocated
62615 + thread stacks. Glibc's NPTL and other threading libraries that
62616 + pass MAP_STACK to the kernel for thread stack allocation are supported.
62617 + The implementation currently provides 8 bits of entropy for the gap.
62618 +
62619 + Many distributions do not compile threaded remote services with the
62620 + -fstack-check argument to GCC, causing the variable-sized stack-based
62621 + allocator, alloca(), to not probe the stack on allocation. This
62622 + permits an unbounded alloca() to skip over any guard page and potentially
62623 + modify another thread's stack reliably. An enforced random gap
62624 + reduces the reliability of such an attack and increases the chance
62625 + that such a read/write to another thread's stack instead lands in
62626 + an unmapped area, causing a crash and triggering grsecurity's
62627 + anti-bruteforcing logic.
62628 +
62629 +config GRKERNSEC_PROC_MEMMAP
62630 + bool "Harden ASLR against information leaks and entropy reduction"
62631 + default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
62632 + depends on PAX_NOEXEC || PAX_ASLR
62633 + help
62634 + If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
62635 + give no information about the addresses of its mappings if
62636 + PaX features that rely on random addresses are enabled on the task.
62637 + In addition to sanitizing this information and disabling other
62638 + dangerous sources of information, this option causes reads of sensitive
62639 + /proc/<pid> entries where the file descriptor was opened in a different
62640 + task than the one performing the read. Such attempts are logged.
62641 + This option also limits argv/env strings for suid/sgid binaries
62642 + to 512KB to prevent a complete exhaustion of the stack entropy provided
62643 + by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
62644 + binaries to prevent alternative mmap layouts from being abused.
62645 +
62646 + If you use PaX it is essential that you say Y here as it closes up
62647 + several holes that make full ASLR useless locally.
62648 +
62649 +config GRKERNSEC_BRUTE
62650 + bool "Deter exploit bruteforcing"
62651 + default y if GRKERNSEC_CONFIG_AUTO
62652 + help
62653 + If you say Y here, attempts to bruteforce exploits against forking
62654 + daemons such as apache or sshd, as well as against suid/sgid binaries
62655 + will be deterred. When a child of a forking daemon is killed by PaX
62656 + or crashes due to an illegal instruction or other suspicious signal,
62657 + the parent process will be delayed 30 seconds upon every subsequent
62658 + fork until the administrator is able to assess the situation and
62659 + restart the daemon.
62660 + In the suid/sgid case, the attempt is logged, the user has all their
62661 + existing instances of the suid/sgid binary terminated and will
62662 + be unable to execute any suid/sgid binaries for 15 minutes.
62663 +
62664 + It is recommended that you also enable signal logging in the auditing
62665 + section so that logs are generated when a process triggers a suspicious
62666 + signal.
62667 + If the sysctl option is enabled, a sysctl option with name
62668 + "deter_bruteforce" is created.
62669 +
62670 +
62671 +config GRKERNSEC_MODHARDEN
62672 + bool "Harden module auto-loading"
62673 + default y if GRKERNSEC_CONFIG_AUTO
62674 + depends on MODULES
62675 + help
62676 + If you say Y here, module auto-loading in response to use of some
62677 + feature implemented by an unloaded module will be restricted to
62678 + root users. Enabling this option helps defend against attacks
62679 + by unprivileged users who abuse the auto-loading behavior to
62680 + cause a vulnerable module to load that is then exploited.
62681 +
62682 + If this option prevents a legitimate use of auto-loading for a
62683 + non-root user, the administrator can execute modprobe manually
62684 + with the exact name of the module mentioned in the alert log.
62685 + Alternatively, the administrator can add the module to the list
62686 + of modules loaded at boot by modifying init scripts.
62687 +
62688 + Modification of init scripts will most likely be needed on
62689 + Ubuntu servers with encrypted home directory support enabled,
62690 + as the first non-root user logging in will cause the ecb(aes),
62691 + ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
62692 +
62693 +config GRKERNSEC_HIDESYM
62694 + bool "Hide kernel symbols"
62695 + default y if GRKERNSEC_CONFIG_AUTO
62696 + select PAX_USERCOPY_SLABS
62697 + help
62698 + If you say Y here, getting information on loaded modules, and
62699 + displaying all kernel symbols through a syscall will be restricted
62700 + to users with CAP_SYS_MODULE. For software compatibility reasons,
62701 + /proc/kallsyms will be restricted to the root user. The RBAC
62702 + system can hide that entry even from root.
62703 +
62704 + This option also prevents leaking of kernel addresses through
62705 + several /proc entries.
62706 +
62707 + Note that this option is only effective provided the following
62708 + conditions are met:
62709 + 1) The kernel using grsecurity is not precompiled by some distribution
62710 + 2) You have also enabled GRKERNSEC_DMESG
62711 + 3) You are using the RBAC system and hiding other files such as your
62712 + kernel image and System.map. Alternatively, enabling this option
62713 + causes the permissions on /boot, /lib/modules, and the kernel
62714 + source directory to change at compile time to prevent
62715 + reading by non-root users.
62716 + If the above conditions are met, this option will aid in providing a
62717 + useful protection against local kernel exploitation of overflows
62718 + and arbitrary read/write vulnerabilities.
62719 +
62720 + It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
62721 + in addition to this feature.
62722 +
62723 +config GRKERNSEC_KERN_LOCKOUT
62724 + bool "Active kernel exploit response"
62725 + default y if GRKERNSEC_CONFIG_AUTO
62726 + depends on X86 || ARM || PPC || SPARC
62727 + help
62728 + If you say Y here, when a PaX alert is triggered due to suspicious
62729 + activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
62730 + or an OOPS occurs due to bad memory accesses, instead of just
62731 + terminating the offending process (and potentially allowing
62732 + a subsequent exploit from the same user), we will take one of two
62733 + actions:
62734 + If the user was root, we will panic the system
62735 + If the user was non-root, we will log the attempt, terminate
62736 + all processes owned by the user, then prevent them from creating
62737 + any new processes until the system is restarted
62738 + This deters repeated kernel exploitation/bruteforcing attempts
62739 + and is useful for later forensics.
62740 +
62741 +config GRKERNSEC_OLD_ARM_USERLAND
62742 + bool "Old ARM userland compatibility"
62743 + depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
62744 + help
62745 + If you say Y here, stubs of executable code to perform such operations
62746 + as "compare-exchange" will be placed at fixed locations in the ARM vector
62747 + table. This is unfortunately needed for old ARM userland meant to run
62748 + across a wide range of processors. Without this option enabled,
62749 + the get_tls and data memory barrier stubs will be emulated by the kernel,
62750 + which is enough for Linaro userlands or other userlands designed for v6
62751 + and newer ARM CPUs. It's recommended that you try without this option enabled
62752 + first, and only enable it if your userland does not boot (it will likely fail
62753 + at init time).
62754 +
62755 +endmenu
62756 +menu "Role Based Access Control Options"
62757 +depends on GRKERNSEC
62758 +
62759 +config GRKERNSEC_RBAC_DEBUG
62760 + bool
62761 +
62762 +config GRKERNSEC_NO_RBAC
62763 + bool "Disable RBAC system"
62764 + help
62765 + If you say Y here, the /dev/grsec device will be removed from the kernel,
62766 + preventing the RBAC system from being enabled. You should only say Y
62767 + here if you have no intention of using the RBAC system, so as to prevent
62768 + an attacker with root access from misusing the RBAC system to hide files
62769 + and processes when loadable module support and /dev/[k]mem have been
62770 + locked down.
62771 +
62772 +config GRKERNSEC_ACL_HIDEKERN
62773 + bool "Hide kernel processes"
62774 + help
62775 + If you say Y here, all kernel threads will be hidden to all
62776 + processes but those whose subject has the "view hidden processes"
62777 + flag.
62778 +
62779 +config GRKERNSEC_ACL_MAXTRIES
62780 + int "Maximum tries before password lockout"
62781 + default 3
62782 + help
62783 + This option enforces the maximum number of times a user can attempt
62784 + to authorize themselves with the grsecurity RBAC system before being
62785 + denied the ability to attempt authorization again for a specified time.
62786 + The lower the number, the harder it will be to brute-force a password.
62787 +
62788 +config GRKERNSEC_ACL_TIMEOUT
62789 + int "Time to wait after max password tries, in seconds"
62790 + default 30
62791 + help
62792 + This option specifies the time the user must wait after attempting to
62793 + authorize to the RBAC system with the maximum number of invalid
62794 + passwords. The higher the number, the harder it will be to brute-force
62795 + a password.
62796 +
62797 +endmenu
62798 +menu "Filesystem Protections"
62799 +depends on GRKERNSEC
62800 +
62801 +config GRKERNSEC_PROC
62802 + bool "Proc restrictions"
62803 + default y if GRKERNSEC_CONFIG_AUTO
62804 + help
62805 + If you say Y here, the permissions of the /proc filesystem
62806 + will be altered to enhance system security and privacy. You MUST
62807 + choose either a user only restriction or a user and group restriction.
62808 + Depending upon the option you choose, you can either restrict users to
62809 + see only the processes they themselves run, or choose a group that can
62810 + view all processes and files normally restricted to root if you choose
62811 + the "restrict to user only" option. NOTE: If you're running identd or
62812 + ntpd as a non-root user, you will have to run it as the group you
62813 + specify here.
62814 +
62815 +config GRKERNSEC_PROC_USER
62816 + bool "Restrict /proc to user only"
62817 + depends on GRKERNSEC_PROC
62818 + help
62819 + If you say Y here, non-root users will only be able to view their own
62820 + processes, and restricts them from viewing network-related information,
62821 + and viewing kernel symbol and module information.
62822 +
62823 +config GRKERNSEC_PROC_USERGROUP
62824 + bool "Allow special group"
62825 + default y if GRKERNSEC_CONFIG_AUTO
62826 + depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
62827 + help
62828 + If you say Y here, you will be able to select a group that will be
62829 + able to view all processes and network-related information. If you've
62830 + enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
62831 + remain hidden. This option is useful if you want to run identd as
62832 + a non-root user. The group you select may also be chosen at boot time
62833 + via "grsec_proc_gid=" on the kernel commandline.
62834 +
62835 +config GRKERNSEC_PROC_GID
62836 + int "GID for special group"
62837 + depends on GRKERNSEC_PROC_USERGROUP
62838 + default 1001
62839 +
62840 +config GRKERNSEC_PROC_ADD
62841 + bool "Additional restrictions"
62842 + default y if GRKERNSEC_CONFIG_AUTO
62843 + depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
62844 + help
62845 + If you say Y here, additional restrictions will be placed on
62846 + /proc that keep normal users from viewing device information and
62847 + slabinfo information that could be useful for exploits.
62848 +
62849 +config GRKERNSEC_LINK
62850 + bool "Linking restrictions"
62851 + default y if GRKERNSEC_CONFIG_AUTO
62852 + help
62853 + If you say Y here, /tmp race exploits will be prevented, since users
62854 + will no longer be able to follow symlinks owned by other users in
62855 + world-writable +t directories (e.g. /tmp), unless the owner of the
62856 + symlink is the owner of the directory. users will also not be
62857 + able to hardlink to files they do not own. If the sysctl option is
62858 + enabled, a sysctl option with name "linking_restrictions" is created.
62859 +
62860 +config GRKERNSEC_SYMLINKOWN
62861 + bool "Kernel-enforced SymlinksIfOwnerMatch"
62862 + default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
62863 + help
62864 + Apache's SymlinksIfOwnerMatch option has an inherent race condition
62865 + that prevents it from being used as a security feature. As Apache
62866 + verifies the symlink by performing a stat() against the target of
62867 + the symlink before it is followed, an attacker can setup a symlink
62868 + to point to a same-owned file, then replace the symlink with one
62869 + that targets another user's file just after Apache "validates" the
62870 + symlink -- a classic TOCTOU race. If you say Y here, a complete,
62871 + race-free replacement for Apache's "SymlinksIfOwnerMatch" option
62872 + will be in place for the group you specify. If the sysctl option
62873 + is enabled, a sysctl option with name "enforce_symlinksifowner" is
62874 + created.
62875 +
62876 +config GRKERNSEC_SYMLINKOWN_GID
62877 + int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
62878 + depends on GRKERNSEC_SYMLINKOWN
62879 + default 1006
62880 + help
62881 + Setting this GID determines what group kernel-enforced
62882 + SymlinksIfOwnerMatch will be enabled for. If the sysctl option
62883 + is enabled, a sysctl option with name "symlinkown_gid" is created.
62884 +
62885 +config GRKERNSEC_FIFO
62886 + bool "FIFO restrictions"
62887 + default y if GRKERNSEC_CONFIG_AUTO
62888 + help
62889 + If you say Y here, users will not be able to write to FIFOs they don't
62890 + own in world-writable +t directories (e.g. /tmp), unless the owner of
62891 + the FIFO is the same owner of the directory it's held in. If the sysctl
62892 + option is enabled, a sysctl option with name "fifo_restrictions" is
62893 + created.
62894 +
62895 +config GRKERNSEC_SYSFS_RESTRICT
62896 + bool "Sysfs/debugfs restriction"
62897 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
62898 + depends on SYSFS
62899 + help
62900 + If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
62901 + any filesystem normally mounted under it (e.g. debugfs) will be
62902 + mostly accessible only by root. These filesystems generally provide access
62903 + to hardware and debug information that isn't appropriate for unprivileged
62904 + users of the system. Sysfs and debugfs have also become a large source
62905 + of new vulnerabilities, ranging from infoleaks to local compromise.
62906 + There has been very little oversight with an eye toward security involved
62907 + in adding new exporters of information to these filesystems, so their
62908 + use is discouraged.
62909 + For reasons of compatibility, a few directories have been whitelisted
62910 + for access by non-root users:
62911 + /sys/fs/selinux
62912 + /sys/fs/fuse
62913 + /sys/devices/system/cpu
62914 +
62915 +config GRKERNSEC_ROFS
62916 + bool "Runtime read-only mount protection"
62917 + depends on SYSCTL
62918 + help
62919 + If you say Y here, a sysctl option with name "romount_protect" will
62920 + be created. By setting this option to 1 at runtime, filesystems
62921 + will be protected in the following ways:
62922 + * No new writable mounts will be allowed
62923 + * Existing read-only mounts won't be able to be remounted read/write
62924 + * Write operations will be denied on all block devices
62925 + This option acts independently of grsec_lock: once it is set to 1,
62926 + it cannot be turned off. Therefore, please be mindful of the resulting
62927 + behavior if this option is enabled in an init script on a read-only
62928 + filesystem.
62929 + Also be aware that as with other root-focused features, GRKERNSEC_KMEM
62930 + and GRKERNSEC_IO should be enabled and module loading disabled via
62931 + config or at runtime.
62932 + This feature is mainly intended for secure embedded systems.
62933 +
62934 +
62935 +config GRKERNSEC_DEVICE_SIDECHANNEL
62936 + bool "Eliminate stat/notify-based device sidechannels"
62937 + default y if GRKERNSEC_CONFIG_AUTO
62938 + help
62939 + If you say Y here, timing analyses on block or character
62940 + devices like /dev/ptmx using stat or inotify/dnotify/fanotify
62941 + will be thwarted for unprivileged users. If a process without
62942 + CAP_MKNOD stats such a device, the last access and last modify times
62943 + will match the device's create time. No access or modify events
62944 + will be triggered through inotify/dnotify/fanotify for such devices.
62945 + This feature will prevent attacks that may at a minimum
62946 + allow an attacker to determine the administrator's password length.
62947 +
62948 +config GRKERNSEC_CHROOT
62949 + bool "Chroot jail restrictions"
62950 + default y if GRKERNSEC_CONFIG_AUTO
62951 + help
62952 + If you say Y here, you will be able to choose several options that will
62953 + make breaking out of a chrooted jail much more difficult. If you
62954 + encounter no software incompatibilities with the following options, it
62955 + is recommended that you enable each one.
62956 +
62957 +config GRKERNSEC_CHROOT_MOUNT
62958 + bool "Deny mounts"
62959 + default y if GRKERNSEC_CONFIG_AUTO
62960 + depends on GRKERNSEC_CHROOT
62961 + help
62962 + If you say Y here, processes inside a chroot will not be able to
62963 + mount or remount filesystems. If the sysctl option is enabled, a
62964 + sysctl option with name "chroot_deny_mount" is created.
62965 +
62966 +config GRKERNSEC_CHROOT_DOUBLE
62967 + bool "Deny double-chroots"
62968 + default y if GRKERNSEC_CONFIG_AUTO
62969 + depends on GRKERNSEC_CHROOT
62970 + help
62971 + If you say Y here, processes inside a chroot will not be able to chroot
62972 + again outside the chroot. This is a widely used method of breaking
62973 + out of a chroot jail and should not be allowed. If the sysctl
62974 + option is enabled, a sysctl option with name
62975 + "chroot_deny_chroot" is created.
62976 +
62977 +config GRKERNSEC_CHROOT_PIVOT
62978 + bool "Deny pivot_root in chroot"
62979 + default y if GRKERNSEC_CONFIG_AUTO
62980 + depends on GRKERNSEC_CHROOT
62981 + help
62982 + If you say Y here, processes inside a chroot will not be able to use
62983 + a function called pivot_root() that was introduced in Linux 2.3.41. It
62984 + works similar to chroot in that it changes the root filesystem. This
62985 + function could be misused in a chrooted process to attempt to break out
62986 + of the chroot, and therefore should not be allowed. If the sysctl
62987 + option is enabled, a sysctl option with name "chroot_deny_pivot" is
62988 + created.
62989 +
62990 +config GRKERNSEC_CHROOT_CHDIR
62991 + bool "Enforce chdir(\"/\") on all chroots"
62992 + default y if GRKERNSEC_CONFIG_AUTO
62993 + depends on GRKERNSEC_CHROOT
62994 + help
62995 + If you say Y here, the current working directory of all newly-chrooted
62996 + applications will be set to the the root directory of the chroot.
62997 + The man page on chroot(2) states:
62998 + Note that this call does not change the current working
62999 + directory, so that `.' can be outside the tree rooted at
63000 + `/'. In particular, the super-user can escape from a
63001 + `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
63002 +
63003 + It is recommended that you say Y here, since it's not known to break
63004 + any software. If the sysctl option is enabled, a sysctl option with
63005 + name "chroot_enforce_chdir" is created.
63006 +
63007 +config GRKERNSEC_CHROOT_CHMOD
63008 + bool "Deny (f)chmod +s"
63009 + default y if GRKERNSEC_CONFIG_AUTO
63010 + depends on GRKERNSEC_CHROOT
63011 + help
63012 + If you say Y here, processes inside a chroot will not be able to chmod
63013 + or fchmod files to make them have suid or sgid bits. This protects
63014 + against another published method of breaking a chroot. If the sysctl
63015 + option is enabled, a sysctl option with name "chroot_deny_chmod" is
63016 + created.
63017 +
63018 +config GRKERNSEC_CHROOT_FCHDIR
63019 + bool "Deny fchdir out of chroot"
63020 + default y if GRKERNSEC_CONFIG_AUTO
63021 + depends on GRKERNSEC_CHROOT
63022 + help
63023 + If you say Y here, a well-known method of breaking chroots by fchdir'ing
63024 + to a file descriptor of the chrooting process that points to a directory
63025 + outside the filesystem will be stopped. If the sysctl option
63026 + is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
63027 +
63028 +config GRKERNSEC_CHROOT_MKNOD
63029 + bool "Deny mknod"
63030 + default y if GRKERNSEC_CONFIG_AUTO
63031 + depends on GRKERNSEC_CHROOT
63032 + help
63033 + If you say Y here, processes inside a chroot will not be allowed to
63034 + mknod. The problem with using mknod inside a chroot is that it
63035 + would allow an attacker to create a device entry that is the same
63036 + as one on the physical root of your system, which could range from
63037 + anything from the console device to a device for your harddrive (which
63038 + they could then use to wipe the drive or steal data). It is recommended
63039 + that you say Y here, unless you run into software incompatibilities.
63040 + If the sysctl option is enabled, a sysctl option with name
63041 + "chroot_deny_mknod" is created.
63042 +
63043 +config GRKERNSEC_CHROOT_SHMAT
63044 + bool "Deny shmat() out of chroot"
63045 + default y if GRKERNSEC_CONFIG_AUTO
63046 + depends on GRKERNSEC_CHROOT
63047 + help
63048 + If you say Y here, processes inside a chroot will not be able to attach
63049 + to shared memory segments that were created outside of the chroot jail.
63050 + It is recommended that you say Y here. If the sysctl option is enabled,
63051 + a sysctl option with name "chroot_deny_shmat" is created.
63052 +
63053 +config GRKERNSEC_CHROOT_UNIX
63054 + bool "Deny access to abstract AF_UNIX sockets out of chroot"
63055 + default y if GRKERNSEC_CONFIG_AUTO
63056 + depends on GRKERNSEC_CHROOT
63057 + help
63058 + If you say Y here, processes inside a chroot will not be able to
63059 + connect to abstract (meaning not belonging to a filesystem) Unix
63060 + domain sockets that were bound outside of a chroot. It is recommended
63061 + that you say Y here. If the sysctl option is enabled, a sysctl option
63062 + with name "chroot_deny_unix" is created.
63063 +
63064 +config GRKERNSEC_CHROOT_FINDTASK
63065 + bool "Protect outside processes"
63066 + default y if GRKERNSEC_CONFIG_AUTO
63067 + depends on GRKERNSEC_CHROOT
63068 + help
63069 + If you say Y here, processes inside a chroot will not be able to
63070 + kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
63071 + getsid, or view any process outside of the chroot. If the sysctl
63072 + option is enabled, a sysctl option with name "chroot_findtask" is
63073 + created.
63074 +
63075 +config GRKERNSEC_CHROOT_NICE
63076 + bool "Restrict priority changes"
63077 + default y if GRKERNSEC_CONFIG_AUTO
63078 + depends on GRKERNSEC_CHROOT
63079 + help
63080 + If you say Y here, processes inside a chroot will not be able to raise
63081 + the priority of processes in the chroot, or alter the priority of
63082 + processes outside the chroot. This provides more security than simply
63083 + removing CAP_SYS_NICE from the process' capability set. If the
63084 + sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
63085 + is created.
63086 +
63087 +config GRKERNSEC_CHROOT_SYSCTL
63088 + bool "Deny sysctl writes"
63089 + default y if GRKERNSEC_CONFIG_AUTO
63090 + depends on GRKERNSEC_CHROOT
63091 + help
63092 + If you say Y here, an attacker in a chroot will not be able to
63093 + write to sysctl entries, either by sysctl(2) or through a /proc
63094 + interface. It is strongly recommended that you say Y here. If the
63095 + sysctl option is enabled, a sysctl option with name
63096 + "chroot_deny_sysctl" is created.
63097 +
63098 +config GRKERNSEC_CHROOT_CAPS
63099 + bool "Capability restrictions"
63100 + default y if GRKERNSEC_CONFIG_AUTO
63101 + depends on GRKERNSEC_CHROOT
63102 + help
63103 + If you say Y here, the capabilities on all processes within a
63104 + chroot jail will be lowered to stop module insertion, raw i/o,
63105 + system and net admin tasks, rebooting the system, modifying immutable
63106 + files, modifying IPC owned by another, and changing the system time.
63107 + This is left an option because it can break some apps. Disable this
63108 + if your chrooted apps are having problems performing those kinds of
63109 + tasks. If the sysctl option is enabled, a sysctl option with
63110 + name "chroot_caps" is created.
63111 +
63112 +config GRKERNSEC_CHROOT_INITRD
63113 + bool "Exempt initrd tasks from restrictions"
63114 + default y if GRKERNSEC_CONFIG_AUTO
63115 + depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
63116 + help
63117 + If you say Y here, tasks started prior to init will be exempted from
63118 + grsecurity's chroot restrictions. This option is mainly meant to
63119 + resolve Plymouth's performing privileged operations unnecessarily
63120 + in a chroot.
63121 +
63122 +endmenu
63123 +menu "Kernel Auditing"
63124 +depends on GRKERNSEC
63125 +
63126 +config GRKERNSEC_AUDIT_GROUP
63127 + bool "Single group for auditing"
63128 + help
63129 + If you say Y here, the exec and chdir logging features will only operate
63130 + on a group you specify. This option is recommended if you only want to
63131 + watch certain users instead of having a large amount of logs from the
63132 + entire system. If the sysctl option is enabled, a sysctl option with
63133 + name "audit_group" is created.
63134 +
63135 +config GRKERNSEC_AUDIT_GID
63136 + int "GID for auditing"
63137 + depends on GRKERNSEC_AUDIT_GROUP
63138 + default 1007
63139 +
63140 +config GRKERNSEC_EXECLOG
63141 + bool "Exec logging"
63142 + help
63143 + If you say Y here, all execve() calls will be logged (since the
63144 + other exec*() calls are frontends to execve(), all execution
63145 + will be logged). Useful for shell-servers that like to keep track
63146 + of their users. If the sysctl option is enabled, a sysctl option with
63147 + name "exec_logging" is created.
63148 + WARNING: This option when enabled will produce a LOT of logs, especially
63149 + on an active system.
63150 +
63151 +config GRKERNSEC_RESLOG
63152 + bool "Resource logging"
63153 + default y if GRKERNSEC_CONFIG_AUTO
63154 + help
63155 + If you say Y here, all attempts to overstep resource limits will
63156 + be logged with the resource name, the requested size, and the current
63157 + limit. It is highly recommended that you say Y here. If the sysctl
63158 + option is enabled, a sysctl option with name "resource_logging" is
63159 + created. If the RBAC system is enabled, the sysctl value is ignored.
63160 +
63161 +config GRKERNSEC_CHROOT_EXECLOG
63162 + bool "Log execs within chroot"
63163 + help
63164 + If you say Y here, all executions inside a chroot jail will be logged
63165 + to syslog. This can cause a large amount of logs if certain
63166 + applications (eg. djb's daemontools) are installed on the system, and
63167 + is therefore left as an option. If the sysctl option is enabled, a
63168 + sysctl option with name "chroot_execlog" is created.
63169 +
63170 +config GRKERNSEC_AUDIT_PTRACE
63171 + bool "Ptrace logging"
63172 + help
63173 + If you say Y here, all attempts to attach to a process via ptrace
63174 + will be logged. If the sysctl option is enabled, a sysctl option
63175 + with name "audit_ptrace" is created.
63176 +
63177 +config GRKERNSEC_AUDIT_CHDIR
63178 + bool "Chdir logging"
63179 + help
63180 + If you say Y here, all chdir() calls will be logged. If the sysctl
63181 + option is enabled, a sysctl option with name "audit_chdir" is created.
63182 +
63183 +config GRKERNSEC_AUDIT_MOUNT
63184 + bool "(Un)Mount logging"
63185 + help
63186 + If you say Y here, all mounts and unmounts will be logged. If the
63187 + sysctl option is enabled, a sysctl option with name "audit_mount" is
63188 + created.
63189 +
63190 +config GRKERNSEC_SIGNAL
63191 + bool "Signal logging"
63192 + default y if GRKERNSEC_CONFIG_AUTO
63193 + help
63194 + If you say Y here, certain important signals will be logged, such as
63195 + SIGSEGV, which will as a result inform you of when a error in a program
63196 + occurred, which in some cases could mean a possible exploit attempt.
63197 + If the sysctl option is enabled, a sysctl option with name
63198 + "signal_logging" is created.
63199 +
63200 +config GRKERNSEC_FORKFAIL
63201 + bool "Fork failure logging"
63202 + help
63203 + If you say Y here, all failed fork() attempts will be logged.
63204 + This could suggest a fork bomb, or someone attempting to overstep
63205 + their process limit. If the sysctl option is enabled, a sysctl option
63206 + with name "forkfail_logging" is created.
63207 +
63208 +config GRKERNSEC_TIME
63209 + bool "Time change logging"
63210 + default y if GRKERNSEC_CONFIG_AUTO
63211 + help
63212 + If you say Y here, any changes of the system clock will be logged.
63213 + If the sysctl option is enabled, a sysctl option with name
63214 + "timechange_logging" is created.
63215 +
63216 +config GRKERNSEC_PROC_IPADDR
63217 + bool "/proc/<pid>/ipaddr support"
63218 + default y if GRKERNSEC_CONFIG_AUTO
63219 + help
63220 + If you say Y here, a new entry will be added to each /proc/<pid>
63221 + directory that contains the IP address of the person using the task.
63222 + The IP is carried across local TCP and AF_UNIX stream sockets.
63223 + This information can be useful for IDS/IPSes to perform remote response
63224 + to a local attack. The entry is readable by only the owner of the
63225 + process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
63226 + the RBAC system), and thus does not create privacy concerns.
63227 +
63228 +config GRKERNSEC_RWXMAP_LOG
63229 + bool 'Denied RWX mmap/mprotect logging'
63230 + default y if GRKERNSEC_CONFIG_AUTO
63231 + depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
63232 + help
63233 + If you say Y here, calls to mmap() and mprotect() with explicit
63234 + usage of PROT_WRITE and PROT_EXEC together will be logged when
63235 + denied by the PAX_MPROTECT feature. This feature will also
63236 + log other problematic scenarios that can occur when PAX_MPROTECT
63237 + is enabled on a binary, like textrels and PT_GNU_STACK. If the
63238 + sysctl option is enabled, a sysctl option with name "rwxmap_logging"
63239 + is created.
63240 +
63241 +endmenu
63242 +
63243 +menu "Executable Protections"
63244 +depends on GRKERNSEC
63245 +
63246 +config GRKERNSEC_DMESG
63247 + bool "Dmesg(8) restriction"
63248 + default y if GRKERNSEC_CONFIG_AUTO
63249 + help
63250 + If you say Y here, non-root users will not be able to use dmesg(8)
63251 + to view the contents of the kernel's circular log buffer.
63252 + The kernel's log buffer often contains kernel addresses and other
63253 + identifying information useful to an attacker in fingerprinting a
63254 + system for a targeted exploit.
63255 + If the sysctl option is enabled, a sysctl option with name "dmesg" is
63256 + created.
63257 +
63258 +config GRKERNSEC_HARDEN_PTRACE
63259 + bool "Deter ptrace-based process snooping"
63260 + default y if GRKERNSEC_CONFIG_AUTO
63261 + help
63262 + If you say Y here, TTY sniffers and other malicious monitoring
63263 + programs implemented through ptrace will be defeated. If you
63264 + have been using the RBAC system, this option has already been
63265 + enabled for several years for all users, with the ability to make
63266 + fine-grained exceptions.
63267 +
63268 + This option only affects the ability of non-root users to ptrace
63269 + processes that are not a descendent of the ptracing process.
63270 + This means that strace ./binary and gdb ./binary will still work,
63271 + but attaching to arbitrary processes will not. If the sysctl
63272 + option is enabled, a sysctl option with name "harden_ptrace" is
63273 + created.
63274 +
63275 +config GRKERNSEC_PTRACE_READEXEC
63276 + bool "Require read access to ptrace sensitive binaries"
63277 + default y if GRKERNSEC_CONFIG_AUTO
63278 + help
63279 + If you say Y here, unprivileged users will not be able to ptrace unreadable
63280 + binaries. This option is useful in environments that
63281 + remove the read bits (e.g. file mode 4711) from suid binaries to
63282 + prevent infoleaking of their contents. This option adds
63283 + consistency to the use of that file mode, as the binary could normally
63284 + be read out when run without privileges while ptracing.
63285 +
63286 + If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
63287 + is created.
63288 +
63289 +config GRKERNSEC_SETXID
63290 + bool "Enforce consistent multithreaded privileges"
63291 + default y if GRKERNSEC_CONFIG_AUTO
63292 + depends on (X86 || SPARC64 || PPC || ARM || MIPS)
63293 + help
63294 + If you say Y here, a change from a root uid to a non-root uid
63295 + in a multithreaded application will cause the resulting uids,
63296 + gids, supplementary groups, and capabilities in that thread
63297 + to be propagated to the other threads of the process. In most
63298 + cases this is unnecessary, as glibc will emulate this behavior
63299 + on behalf of the application. Other libcs do not act in the
63300 + same way, allowing the other threads of the process to continue
63301 + running with root privileges. If the sysctl option is enabled,
63302 + a sysctl option with name "consistent_setxid" is created.
63303 +
63304 +config GRKERNSEC_HARDEN_IPC
63305 + bool "Disallow access to overly-permissive IPC objects"
63306 + default y if GRKERNSEC_CONFIG_AUTO
63307 + depends on SYSVIPC
63308 + help
63309 + If you say Y here, access to overly-permissive IPC objects (shared
63310 + memory, message queues, and semaphores) will be denied for processes
63311 + given the following criteria beyond normal permission checks:
63312 + 1) If the IPC object is world-accessible and the euid doesn't match
63313 + that of the creator or current uid for the IPC object
63314 + 2) If the IPC object is group-accessible and the egid doesn't
63315 + match that of the creator or current gid for the IPC object
63316 + It's a common error to grant too much permission to these objects,
63317 + with impact ranging from denial of service and information leaking to
63318 + privilege escalation. This feature was developed in response to
63319 + research by Tim Brown:
63320 + http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
63321 + who found hundreds of such insecure usages. Processes with
63322 + CAP_IPC_OWNER are still permitted to access these IPC objects.
63323 + If the sysctl option is enabled, a sysctl option with name
63324 + "harden_ipc" is created.
63325 +
63326 +config GRKERNSEC_TPE
63327 + bool "Trusted Path Execution (TPE)"
63328 + default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
63329 + help
63330 + If you say Y here, you will be able to choose a gid to add to the
63331 + supplementary groups of users you want to mark as "untrusted."
63332 + These users will not be able to execute any files that are not in
63333 + root-owned directories writable only by root. If the sysctl option
63334 + is enabled, a sysctl option with name "tpe" is created.
63335 +
63336 +config GRKERNSEC_TPE_ALL
63337 + bool "Partially restrict all non-root users"
63338 + depends on GRKERNSEC_TPE
63339 + help
63340 + If you say Y here, all non-root users will be covered under
63341 + a weaker TPE restriction. This is separate from, and in addition to,
63342 + the main TPE options that you have selected elsewhere. Thus, if a
63343 + "trusted" GID is chosen, this restriction applies to even that GID.
63344 + Under this restriction, all non-root users will only be allowed to
63345 + execute files in directories they own that are not group or
63346 + world-writable, or in directories owned by root and writable only by
63347 + root. If the sysctl option is enabled, a sysctl option with name
63348 + "tpe_restrict_all" is created.
63349 +
63350 +config GRKERNSEC_TPE_INVERT
63351 + bool "Invert GID option"
63352 + depends on GRKERNSEC_TPE
63353 + help
63354 + If you say Y here, the group you specify in the TPE configuration will
63355 + decide what group TPE restrictions will be *disabled* for. This
63356 + option is useful if you want TPE restrictions to be applied to most
63357 + users on the system. If the sysctl option is enabled, a sysctl option
63358 + with name "tpe_invert" is created. Unlike other sysctl options, this
63359 + entry will default to on for backward-compatibility.
63360 +
63361 +config GRKERNSEC_TPE_GID
63362 + int
63363 + default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
63364 + default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
63365 +
63366 +config GRKERNSEC_TPE_UNTRUSTED_GID
63367 + int "GID for TPE-untrusted users"
63368 + depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
63369 + default 1005
63370 + help
63371 + Setting this GID determines what group TPE restrictions will be
63372 + *enabled* for. If the sysctl option is enabled, a sysctl option
63373 + with name "tpe_gid" is created.
63374 +
63375 +config GRKERNSEC_TPE_TRUSTED_GID
63376 + int "GID for TPE-trusted users"
63377 + depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
63378 + default 1005
63379 + help
63380 + Setting this GID determines what group TPE restrictions will be
63381 + *disabled* for. If the sysctl option is enabled, a sysctl option
63382 + with name "tpe_gid" is created.
63383 +
63384 +endmenu
63385 +menu "Network Protections"
63386 +depends on GRKERNSEC
63387 +
63388 +config GRKERNSEC_RANDNET
63389 + bool "Larger entropy pools"
63390 + default y if GRKERNSEC_CONFIG_AUTO
63391 + help
63392 + If you say Y here, the entropy pools used for many features of Linux
63393 + and grsecurity will be doubled in size. Since several grsecurity
63394 + features use additional randomness, it is recommended that you say Y
63395 + here. Saying Y here has a similar effect as modifying
63396 + /proc/sys/kernel/random/poolsize.
63397 +
63398 +config GRKERNSEC_BLACKHOLE
63399 + bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
63400 + default y if GRKERNSEC_CONFIG_AUTO
63401 + depends on NET
63402 + help
63403 + If you say Y here, neither TCP resets nor ICMP
63404 + destination-unreachable packets will be sent in response to packets
63405 + sent to ports for which no associated listening process exists.
63406 + This feature supports both IPV4 and IPV6 and exempts the
63407 + loopback interface from blackholing. Enabling this feature
63408 + makes a host more resilient to DoS attacks and reduces network
63409 + visibility against scanners.
63410 +
63411 + The blackhole feature as-implemented is equivalent to the FreeBSD
63412 + blackhole feature, as it prevents RST responses to all packets, not
63413 + just SYNs. Under most application behavior this causes no
63414 + problems, but applications (like haproxy) may not close certain
63415 + connections in a way that cleanly terminates them on the remote
63416 + end, leaving the remote host in LAST_ACK state. Because of this
63417 + side-effect and to prevent intentional LAST_ACK DoSes, this
63418 + feature also adds automatic mitigation against such attacks.
63419 + The mitigation drastically reduces the amount of time a socket
63420 + can spend in LAST_ACK state. If you're using haproxy and not
63421 + all servers it connects to have this option enabled, consider
63422 + disabling this feature on the haproxy host.
63423 +
63424 + If the sysctl option is enabled, two sysctl options with names
63425 + "ip_blackhole" and "lastack_retries" will be created.
63426 + While "ip_blackhole" takes the standard zero/non-zero on/off
63427 + toggle, "lastack_retries" uses the same kinds of values as
63428 + "tcp_retries1" and "tcp_retries2". The default value of 4
63429 + prevents a socket from lasting more than 45 seconds in LAST_ACK
63430 + state.
63431 +
63432 +config GRKERNSEC_NO_SIMULT_CONNECT
63433 + bool "Disable TCP Simultaneous Connect"
63434 + default y if GRKERNSEC_CONFIG_AUTO
63435 + depends on NET
63436 + help
63437 + If you say Y here, a feature by Willy Tarreau will be enabled that
63438 + removes a weakness in Linux's strict implementation of TCP that
63439 + allows two clients to connect to each other without either entering
63440 + a listening state. The weakness allows an attacker to easily prevent
63441 + a client from connecting to a known server provided the source port
63442 + for the connection is guessed correctly.
63443 +
63444 + As the weakness could be used to prevent an antivirus or IPS from
63445 + fetching updates, or prevent an SSL gateway from fetching a CRL,
63446 + it should be eliminated by enabling this option. Though Linux is
63447 + one of few operating systems supporting simultaneous connect, it
63448 + has no legitimate use in practice and is rarely supported by firewalls.
63449 +
63450 +config GRKERNSEC_SOCKET
63451 + bool "Socket restrictions"
63452 + depends on NET
63453 + help
63454 + If you say Y here, you will be able to choose from several options.
63455 + If you assign a GID on your system and add it to the supplementary
63456 + groups of users you want to restrict socket access to, this patch
63457 + will perform up to three things, based on the option(s) you choose.
63458 +
63459 +config GRKERNSEC_SOCKET_ALL
63460 + bool "Deny any sockets to group"
63461 + depends on GRKERNSEC_SOCKET
63462 + help
63463 + If you say Y here, you will be able to choose a GID of whose users will
63464 + be unable to connect to other hosts from your machine or run server
63465 + applications from your machine. If the sysctl option is enabled, a
63466 + sysctl option with name "socket_all" is created.
63467 +
63468 +config GRKERNSEC_SOCKET_ALL_GID
63469 + int "GID to deny all sockets for"
63470 + depends on GRKERNSEC_SOCKET_ALL
63471 + default 1004
63472 + help
63473 + Here you can choose the GID to disable socket access for. Remember to
63474 + add the users you want socket access disabled for to the GID
63475 + specified here. If the sysctl option is enabled, a sysctl option
63476 + with name "socket_all_gid" is created.
63477 +
63478 +config GRKERNSEC_SOCKET_CLIENT
63479 + bool "Deny client sockets to group"
63480 + depends on GRKERNSEC_SOCKET
63481 + help
63482 + If you say Y here, you will be able to choose a GID of whose users will
63483 + be unable to connect to other hosts from your machine, but will be
63484 + able to run servers. If this option is enabled, all users in the group
63485 + you specify will have to use passive mode when initiating ftp transfers
63486 + from the shell on your machine. If the sysctl option is enabled, a
63487 + sysctl option with name "socket_client" is created.
63488 +
63489 +config GRKERNSEC_SOCKET_CLIENT_GID
63490 + int "GID to deny client sockets for"
63491 + depends on GRKERNSEC_SOCKET_CLIENT
63492 + default 1003
63493 + help
63494 + Here you can choose the GID to disable client socket access for.
63495 + Remember to add the users you want client socket access disabled for to
63496 + the GID specified here. If the sysctl option is enabled, a sysctl
63497 + option with name "socket_client_gid" is created.
63498 +
63499 +config GRKERNSEC_SOCKET_SERVER
63500 + bool "Deny server sockets to group"
63501 + depends on GRKERNSEC_SOCKET
63502 + help
63503 + If you say Y here, you will be able to choose a GID of whose users will
63504 + be unable to run server applications from your machine. If the sysctl
63505 + option is enabled, a sysctl option with name "socket_server" is created.
63506 +
63507 +config GRKERNSEC_SOCKET_SERVER_GID
63508 + int "GID to deny server sockets for"
63509 + depends on GRKERNSEC_SOCKET_SERVER
63510 + default 1002
63511 + help
63512 + Here you can choose the GID to disable server socket access for.
63513 + Remember to add the users you want server socket access disabled for to
63514 + the GID specified here. If the sysctl option is enabled, a sysctl
63515 + option with name "socket_server_gid" is created.
63516 +
63517 +endmenu
63518 +
63519 +menu "Physical Protections"
63520 +depends on GRKERNSEC
63521 +
63522 +config GRKERNSEC_DENYUSB
63523 + bool "Deny new USB connections after toggle"
63524 + default y if GRKERNSEC_CONFIG_AUTO
63525 + depends on SYSCTL && USB_SUPPORT
63526 + help
63527 + If you say Y here, a new sysctl option with name "deny_new_usb"
63528 + will be created. Setting its value to 1 will prevent any new
63529 + USB devices from being recognized by the OS. Any attempted USB
63530 + device insertion will be logged. This option is intended to be
63531 + used against custom USB devices designed to exploit vulnerabilities
63532 + in various USB device drivers.
63533 +
63534 + For greatest effectiveness, this sysctl should be set after any
63535 + relevant init scripts. This option is safe to enable in distros
63536 + as each user can choose whether or not to toggle the sysctl.
63537 +
63538 +config GRKERNSEC_DENYUSB_FORCE
63539 + bool "Reject all USB devices not connected at boot"
63540 + select USB
63541 + depends on GRKERNSEC_DENYUSB
63542 + help
63543 + If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
63544 + that doesn't involve a sysctl entry. This option should only be
63545 + enabled if you're sure you want to deny all new USB connections
63546 + at runtime and don't want to modify init scripts. This should not
63547 + be enabled by distros. It forces the core USB code to be built
63548 + into the kernel image so that all devices connected at boot time
63549 + can be recognized and new USB device connections can be prevented
63550 + prior to init running.
63551 +
63552 +endmenu
63553 +
63554 +menu "Sysctl Support"
63555 +depends on GRKERNSEC && SYSCTL
63556 +
63557 +config GRKERNSEC_SYSCTL
63558 + bool "Sysctl support"
63559 + default y if GRKERNSEC_CONFIG_AUTO
63560 + help
63561 + If you say Y here, you will be able to change the options that
63562 + grsecurity runs with at bootup, without having to recompile your
63563 + kernel. You can echo values to files in /proc/sys/kernel/grsecurity
63564 + to enable (1) or disable (0) various features. All the sysctl entries
63565 + are mutable until the "grsec_lock" entry is set to a non-zero value.
63566 + All features enabled in the kernel configuration are disabled at boot
63567 + if you do not say Y to the "Turn on features by default" option.
63568 + All options should be set at startup, and the grsec_lock entry should
63569 + be set to a non-zero value after all the options are set.
63570 + *THIS IS EXTREMELY IMPORTANT*
63571 +
63572 +config GRKERNSEC_SYSCTL_DISTRO
63573 + bool "Extra sysctl support for distro makers (READ HELP)"
63574 + depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
63575 + help
63576 + If you say Y here, additional sysctl options will be created
63577 + for features that affect processes running as root. Therefore,
63578 + it is critical when using this option that the grsec_lock entry be
63579 + enabled after boot. Only distros with prebuilt kernel packages
63580 + with this option enabled that can ensure grsec_lock is enabled
63581 + after boot should use this option.
63582 + *Failure to set grsec_lock after boot makes all grsec features
63583 + this option covers useless*
63584 +
63585 + Currently this option creates the following sysctl entries:
63586 + "Disable Privileged I/O": "disable_priv_io"
63587 +
63588 +config GRKERNSEC_SYSCTL_ON
63589 + bool "Turn on features by default"
63590 + default y if GRKERNSEC_CONFIG_AUTO
63591 + depends on GRKERNSEC_SYSCTL
63592 + help
63593 + If you say Y here, instead of having all features enabled in the
63594 + kernel configuration disabled at boot time, the features will be
63595 + enabled at boot time. It is recommended you say Y here unless
63596 + there is some reason you would want all sysctl-tunable features to
63597 + be disabled by default. As mentioned elsewhere, it is important
63598 + to enable the grsec_lock entry once you have finished modifying
63599 + the sysctl entries.
63600 +
63601 +endmenu
63602 +menu "Logging Options"
63603 +depends on GRKERNSEC
63604 +
63605 +config GRKERNSEC_FLOODTIME
63606 + int "Seconds in between log messages (minimum)"
63607 + default 10
63608 + help
63609 + This option allows you to enforce the number of seconds between
63610 + grsecurity log messages. The default should be suitable for most
63611 + people, however, if you choose to change it, choose a value small enough
63612 + to allow informative logs to be produced, but large enough to
63613 + prevent flooding.
63614 +
63615 +config GRKERNSEC_FLOODBURST
63616 + int "Number of messages in a burst (maximum)"
63617 + default 6
63618 + help
63619 + This option allows you to choose the maximum number of messages allowed
63620 + within the flood time interval you chose in a separate option. The
63621 + default should be suitable for most people, however if you find that
63622 + many of your logs are being interpreted as flooding, you may want to
63623 + raise this value.
63624 +
63625 +endmenu
63626 diff --git a/grsecurity/Makefile b/grsecurity/Makefile
63627 new file mode 100644
63628 index 0000000..85beb79
63629 --- /dev/null
63630 +++ b/grsecurity/Makefile
63631 @@ -0,0 +1,43 @@
63632 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
63633 +# during 2001-2009 it has been completely redesigned by Brad Spengler
63634 +# into an RBAC system
63635 +#
63636 +# All code in this directory and various hooks inserted throughout the kernel
63637 +# are copyright Brad Spengler - Open Source Security, Inc., and released
63638 +# under the GPL v2 or higher
63639 +
63640 +KBUILD_CFLAGS += -Werror
63641 +
63642 +obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
63643 + grsec_mount.o grsec_sig.o grsec_sysctl.o \
63644 + grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
63645 + grsec_usb.o grsec_ipc.o
63646 +
63647 +obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
63648 + gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
63649 + gracl_learn.o grsec_log.o gracl_policy.o
63650 +ifdef CONFIG_COMPAT
63651 +obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
63652 +endif
63653 +
63654 +obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
63655 +
63656 +ifdef CONFIG_NET
63657 +obj-y += grsec_sock.o
63658 +obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
63659 +endif
63660 +
63661 +ifndef CONFIG_GRKERNSEC
63662 +obj-y += grsec_disabled.o
63663 +endif
63664 +
63665 +ifdef CONFIG_GRKERNSEC_HIDESYM
63666 +extra-y := grsec_hidesym.o
63667 +$(obj)/grsec_hidesym.o:
63668 + @-chmod -f 500 /boot
63669 + @-chmod -f 500 /lib/modules
63670 + @-chmod -f 500 /lib64/modules
63671 + @-chmod -f 500 /lib32/modules
63672 + @-chmod -f 700 .
63673 + @echo ' grsec: protected kernel image paths'
63674 +endif
63675 diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
63676 new file mode 100644
63677 index 0000000..90f71ce
63678 --- /dev/null
63679 +++ b/grsecurity/gracl.c
63680 @@ -0,0 +1,2679 @@
63681 +#include <linux/kernel.h>
63682 +#include <linux/module.h>
63683 +#include <linux/sched.h>
63684 +#include <linux/mm.h>
63685 +#include <linux/file.h>
63686 +#include <linux/fs.h>
63687 +#include <linux/namei.h>
63688 +#include <linux/mount.h>
63689 +#include <linux/tty.h>
63690 +#include <linux/proc_fs.h>
63691 +#include <linux/lglock.h>
63692 +#include <linux/slab.h>
63693 +#include <linux/vmalloc.h>
63694 +#include <linux/types.h>
63695 +#include <linux/sysctl.h>
63696 +#include <linux/netdevice.h>
63697 +#include <linux/ptrace.h>
63698 +#include <linux/gracl.h>
63699 +#include <linux/gralloc.h>
63700 +#include <linux/security.h>
63701 +#include <linux/grinternal.h>
63702 +#include <linux/pid_namespace.h>
63703 +#include <linux/stop_machine.h>
63704 +#include <linux/fdtable.h>
63705 +#include <linux/percpu.h>
63706 +#include <linux/lglock.h>
63707 +#include <linux/hugetlb.h>
63708 +#include <linux/posix-timers.h>
63709 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
63710 +#include <linux/magic.h>
63711 +#include <linux/pagemap.h>
63712 +#include "../fs/btrfs/async-thread.h"
63713 +#include "../fs/btrfs/ctree.h"
63714 +#include "../fs/btrfs/btrfs_inode.h"
63715 +#endif
63716 +#include "../fs/mount.h"
63717 +
63718 +#include <asm/uaccess.h>
63719 +#include <asm/errno.h>
63720 +#include <asm/mman.h>
63721 +
63722 +#define FOR_EACH_ROLE_START(role) \
63723 + role = running_polstate.role_list; \
63724 + while (role) {
63725 +
63726 +#define FOR_EACH_ROLE_END(role) \
63727 + role = role->prev; \
63728 + }
63729 +
63730 +extern struct lglock vfsmount_lock;
63731 +
63732 +extern struct path gr_real_root;
63733 +
63734 +static struct gr_policy_state running_polstate;
63735 +struct gr_policy_state *polstate = &running_polstate;
63736 +extern struct gr_alloc_state *current_alloc_state;
63737 +
63738 +extern char *gr_shared_page[4];
63739 +DEFINE_RWLOCK(gr_inode_lock);
63740 +
63741 +static unsigned int gr_status __read_only = GR_STATUS_INIT;
63742 +
63743 +#ifdef CONFIG_NET
63744 +extern struct vfsmount *sock_mnt;
63745 +#endif
63746 +
63747 +extern struct vfsmount *pipe_mnt;
63748 +extern struct vfsmount *shm_mnt;
63749 +
63750 +#ifdef CONFIG_HUGETLBFS
63751 +extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
63752 +#endif
63753 +
63754 +extern u16 acl_sp_role_value;
63755 +extern struct acl_object_label *fakefs_obj_rw;
63756 +extern struct acl_object_label *fakefs_obj_rwx;
63757 +
63758 +int gr_acl_is_enabled(void)
63759 +{
63760 + return (gr_status & GR_READY);
63761 +}
63762 +
63763 +void gr_enable_rbac_system(void)
63764 +{
63765 + pax_open_kernel();
63766 + gr_status |= GR_READY;
63767 + pax_close_kernel();
63768 +}
63769 +
63770 +int gr_rbac_disable(void *unused)
63771 +{
63772 + pax_open_kernel();
63773 + gr_status &= ~GR_READY;
63774 + pax_close_kernel();
63775 +
63776 + return 0;
63777 +}
63778 +
63779 +static inline dev_t __get_dev(const struct dentry *dentry)
63780 +{
63781 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
63782 + if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
63783 + return BTRFS_I(dentry->d_inode)->root->anon_dev;
63784 + else
63785 +#endif
63786 + return dentry->d_sb->s_dev;
63787 +}
63788 +
63789 +dev_t gr_get_dev_from_dentry(struct dentry *dentry)
63790 +{
63791 + return __get_dev(dentry);
63792 +}
63793 +
63794 +static char gr_task_roletype_to_char(struct task_struct *task)
63795 +{
63796 + switch (task->role->roletype &
63797 + (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
63798 + GR_ROLE_SPECIAL)) {
63799 + case GR_ROLE_DEFAULT:
63800 + return 'D';
63801 + case GR_ROLE_USER:
63802 + return 'U';
63803 + case GR_ROLE_GROUP:
63804 + return 'G';
63805 + case GR_ROLE_SPECIAL:
63806 + return 'S';
63807 + }
63808 +
63809 + return 'X';
63810 +}
63811 +
63812 +char gr_roletype_to_char(void)
63813 +{
63814 + return gr_task_roletype_to_char(current);
63815 +}
63816 +
63817 +__inline__ int
63818 +gr_acl_tpe_check(void)
63819 +{
63820 + if (unlikely(!(gr_status & GR_READY)))
63821 + return 0;
63822 + if (current->role->roletype & GR_ROLE_TPE)
63823 + return 1;
63824 + else
63825 + return 0;
63826 +}
63827 +
63828 +int
63829 +gr_handle_rawio(const struct inode *inode)
63830 +{
63831 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
63832 + if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
63833 + grsec_enable_chroot_caps && proc_is_chrooted(current) &&
63834 + !capable(CAP_SYS_RAWIO))
63835 + return 1;
63836 +#endif
63837 + return 0;
63838 +}
63839 +
63840 +int
63841 +gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
63842 +{
63843 + if (likely(lena != lenb))
63844 + return 0;
63845 +
63846 + return !memcmp(a, b, lena);
63847 +}
63848 +
63849 +static int prepend(char **buffer, int *buflen, const char *str, int namelen)
63850 +{
63851 + *buflen -= namelen;
63852 + if (*buflen < 0)
63853 + return -ENAMETOOLONG;
63854 + *buffer -= namelen;
63855 + memcpy(*buffer, str, namelen);
63856 + return 0;
63857 +}
63858 +
63859 +static int prepend_name(char **buffer, int *buflen, struct qstr *name)
63860 +{
63861 + return prepend(buffer, buflen, name->name, name->len);
63862 +}
63863 +
63864 +static int prepend_path(const struct path *path, struct path *root,
63865 + char **buffer, int *buflen)
63866 +{
63867 + struct dentry *dentry = path->dentry;
63868 + struct vfsmount *vfsmnt = path->mnt;
63869 + struct mount *mnt = real_mount(vfsmnt);
63870 + bool slash = false;
63871 + int error = 0;
63872 +
63873 + while (dentry != root->dentry || vfsmnt != root->mnt) {
63874 + struct dentry * parent;
63875 +
63876 + if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
63877 + /* Global root? */
63878 + if (!mnt_has_parent(mnt)) {
63879 + goto out;
63880 + }
63881 + dentry = mnt->mnt_mountpoint;
63882 + mnt = mnt->mnt_parent;
63883 + vfsmnt = &mnt->mnt;
63884 + continue;
63885 + }
63886 + parent = dentry->d_parent;
63887 + prefetch(parent);
63888 + spin_lock(&dentry->d_lock);
63889 + error = prepend_name(buffer, buflen, &dentry->d_name);
63890 + spin_unlock(&dentry->d_lock);
63891 + if (!error)
63892 + error = prepend(buffer, buflen, "/", 1);
63893 + if (error)
63894 + break;
63895 +
63896 + slash = true;
63897 + dentry = parent;
63898 + }
63899 +
63900 +out:
63901 + if (!error && !slash)
63902 + error = prepend(buffer, buflen, "/", 1);
63903 +
63904 + return error;
63905 +}
63906 +
63907 +/* this must be called with vfsmount_lock and rename_lock held */
63908 +
63909 +static char *__our_d_path(const struct path *path, struct path *root,
63910 + char *buf, int buflen)
63911 +{
63912 + char *res = buf + buflen;
63913 + int error;
63914 +
63915 + prepend(&res, &buflen, "\0", 1);
63916 + error = prepend_path(path, root, &res, &buflen);
63917 + if (error)
63918 + return ERR_PTR(error);
63919 +
63920 + return res;
63921 +}
63922 +
63923 +static char *
63924 +gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
63925 +{
63926 + char *retval;
63927 +
63928 + retval = __our_d_path(path, root, buf, buflen);
63929 + if (unlikely(IS_ERR(retval)))
63930 + retval = strcpy(buf, "<path too long>");
63931 + else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
63932 + retval[1] = '\0';
63933 +
63934 + return retval;
63935 +}
63936 +
63937 +static char *
63938 +__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
63939 + char *buf, int buflen)
63940 +{
63941 + struct path path;
63942 + char *res;
63943 +
63944 + path.dentry = (struct dentry *)dentry;
63945 + path.mnt = (struct vfsmount *)vfsmnt;
63946 +
63947 + /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
63948 + by the RBAC system */
63949 + res = gen_full_path(&path, &gr_real_root, buf, buflen);
63950 +
63951 + return res;
63952 +}
63953 +
63954 +static char *
63955 +d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
63956 + char *buf, int buflen)
63957 +{
63958 + char *res;
63959 + struct path path;
63960 + struct path root;
63961 + struct task_struct *reaper = init_pid_ns.child_reaper;
63962 +
63963 + path.dentry = (struct dentry *)dentry;
63964 + path.mnt = (struct vfsmount *)vfsmnt;
63965 +
63966 + /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
63967 + get_fs_root(reaper->fs, &root);
63968 +
63969 + br_read_lock(&vfsmount_lock);
63970 + write_seqlock(&rename_lock);
63971 + res = gen_full_path(&path, &root, buf, buflen);
63972 + write_sequnlock(&rename_lock);
63973 + br_read_unlock(&vfsmount_lock);
63974 +
63975 + path_put(&root);
63976 + return res;
63977 +}
63978 +
63979 +char *
63980 +gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
63981 +{
63982 + char *ret;
63983 + br_read_lock(&vfsmount_lock);
63984 + write_seqlock(&rename_lock);
63985 + ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
63986 + PAGE_SIZE);
63987 + write_sequnlock(&rename_lock);
63988 + br_read_unlock(&vfsmount_lock);
63989 + return ret;
63990 +}
63991 +
63992 +static char *
63993 +gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
63994 +{
63995 + char *ret;
63996 + char *buf;
63997 + int buflen;
63998 +
63999 + br_read_lock(&vfsmount_lock);
64000 + write_seqlock(&rename_lock);
64001 + buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
64002 + ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
64003 + buflen = (int)(ret - buf);
64004 + if (buflen >= 5)
64005 + prepend(&ret, &buflen, "/proc", 5);
64006 + else
64007 + ret = strcpy(buf, "<path too long>");
64008 + write_sequnlock(&rename_lock);
64009 + br_read_unlock(&vfsmount_lock);
64010 + return ret;
64011 +}
64012 +
64013 +char *
64014 +gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
64015 +{
64016 + return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
64017 + PAGE_SIZE);
64018 +}
64019 +
64020 +char *
64021 +gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
64022 +{
64023 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
64024 + PAGE_SIZE);
64025 +}
64026 +
64027 +char *
64028 +gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
64029 +{
64030 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
64031 + PAGE_SIZE);
64032 +}
64033 +
64034 +char *
64035 +gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
64036 +{
64037 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
64038 + PAGE_SIZE);
64039 +}
64040 +
64041 +char *
64042 +gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
64043 +{
64044 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
64045 + PAGE_SIZE);
64046 +}
64047 +
64048 +__inline__ __u32
64049 +to_gr_audit(const __u32 reqmode)
64050 +{
64051 + /* masks off auditable permission flags, then shifts them to create
64052 + auditing flags, and adds the special case of append auditing if
64053 + we're requesting write */
64054 + return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
64055 +}
64056 +
64057 +struct acl_role_label *
64058 +__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
64059 + const gid_t gid)
64060 +{
64061 + unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
64062 + struct acl_role_label *match;
64063 + struct role_allowed_ip *ipp;
64064 + unsigned int x;
64065 + u32 curr_ip = task->signal->saved_ip;
64066 +
64067 + match = state->acl_role_set.r_hash[index];
64068 +
64069 + while (match) {
64070 + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
64071 + for (x = 0; x < match->domain_child_num; x++) {
64072 + if (match->domain_children[x] == uid)
64073 + goto found;
64074 + }
64075 + } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
64076 + break;
64077 + match = match->next;
64078 + }
64079 +found:
64080 + if (match == NULL) {
64081 + try_group:
64082 + index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
64083 + match = state->acl_role_set.r_hash[index];
64084 +
64085 + while (match) {
64086 + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
64087 + for (x = 0; x < match->domain_child_num; x++) {
64088 + if (match->domain_children[x] == gid)
64089 + goto found2;
64090 + }
64091 + } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
64092 + break;
64093 + match = match->next;
64094 + }
64095 +found2:
64096 + if (match == NULL)
64097 + match = state->default_role;
64098 + if (match->allowed_ips == NULL)
64099 + return match;
64100 + else {
64101 + for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
64102 + if (likely
64103 + ((ntohl(curr_ip) & ipp->netmask) ==
64104 + (ntohl(ipp->addr) & ipp->netmask)))
64105 + return match;
64106 + }
64107 + match = state->default_role;
64108 + }
64109 + } else if (match->allowed_ips == NULL) {
64110 + return match;
64111 + } else {
64112 + for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
64113 + if (likely
64114 + ((ntohl(curr_ip) & ipp->netmask) ==
64115 + (ntohl(ipp->addr) & ipp->netmask)))
64116 + return match;
64117 + }
64118 + goto try_group;
64119 + }
64120 +
64121 + return match;
64122 +}
64123 +
64124 +static struct acl_role_label *
64125 +lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
64126 + const gid_t gid)
64127 +{
64128 + return __lookup_acl_role_label(&running_polstate, task, uid, gid);
64129 +}
64130 +
64131 +struct acl_subject_label *
64132 +lookup_acl_subj_label(const ino_t ino, const dev_t dev,
64133 + const struct acl_role_label *role)
64134 +{
64135 + unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
64136 + struct acl_subject_label *match;
64137 +
64138 + match = role->subj_hash[index];
64139 +
64140 + while (match && (match->inode != ino || match->device != dev ||
64141 + (match->mode & GR_DELETED))) {
64142 + match = match->next;
64143 + }
64144 +
64145 + if (match && !(match->mode & GR_DELETED))
64146 + return match;
64147 + else
64148 + return NULL;
64149 +}
64150 +
64151 +struct acl_subject_label *
64152 +lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
64153 + const struct acl_role_label *role)
64154 +{
64155 + unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
64156 + struct acl_subject_label *match;
64157 +
64158 + match = role->subj_hash[index];
64159 +
64160 + while (match && (match->inode != ino || match->device != dev ||
64161 + !(match->mode & GR_DELETED))) {
64162 + match = match->next;
64163 + }
64164 +
64165 + if (match && (match->mode & GR_DELETED))
64166 + return match;
64167 + else
64168 + return NULL;
64169 +}
64170 +
64171 +static struct acl_object_label *
64172 +lookup_acl_obj_label(const ino_t ino, const dev_t dev,
64173 + const struct acl_subject_label *subj)
64174 +{
64175 + unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
64176 + struct acl_object_label *match;
64177 +
64178 + match = subj->obj_hash[index];
64179 +
64180 + while (match && (match->inode != ino || match->device != dev ||
64181 + (match->mode & GR_DELETED))) {
64182 + match = match->next;
64183 + }
64184 +
64185 + if (match && !(match->mode & GR_DELETED))
64186 + return match;
64187 + else
64188 + return NULL;
64189 +}
64190 +
64191 +static struct acl_object_label *
64192 +lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
64193 + const struct acl_subject_label *subj)
64194 +{
64195 + unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
64196 + struct acl_object_label *match;
64197 +
64198 + match = subj->obj_hash[index];
64199 +
64200 + while (match && (match->inode != ino || match->device != dev ||
64201 + !(match->mode & GR_DELETED))) {
64202 + match = match->next;
64203 + }
64204 +
64205 + if (match && (match->mode & GR_DELETED))
64206 + return match;
64207 +
64208 + match = subj->obj_hash[index];
64209 +
64210 + while (match && (match->inode != ino || match->device != dev ||
64211 + (match->mode & GR_DELETED))) {
64212 + match = match->next;
64213 + }
64214 +
64215 + if (match && !(match->mode & GR_DELETED))
64216 + return match;
64217 + else
64218 + return NULL;
64219 +}
64220 +
64221 +struct name_entry *
64222 +__lookup_name_entry(const struct gr_policy_state *state, const char *name)
64223 +{
64224 + unsigned int len = strlen(name);
64225 + unsigned int key = full_name_hash(name, len);
64226 + unsigned int index = key % state->name_set.n_size;
64227 + struct name_entry *match;
64228 +
64229 + match = state->name_set.n_hash[index];
64230 +
64231 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
64232 + match = match->next;
64233 +
64234 + return match;
64235 +}
64236 +
64237 +static struct name_entry *
64238 +lookup_name_entry(const char *name)
64239 +{
64240 + return __lookup_name_entry(&running_polstate, name);
64241 +}
64242 +
64243 +static struct name_entry *
64244 +lookup_name_entry_create(const char *name)
64245 +{
64246 + unsigned int len = strlen(name);
64247 + unsigned int key = full_name_hash(name, len);
64248 + unsigned int index = key % running_polstate.name_set.n_size;
64249 + struct name_entry *match;
64250 +
64251 + match = running_polstate.name_set.n_hash[index];
64252 +
64253 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
64254 + !match->deleted))
64255 + match = match->next;
64256 +
64257 + if (match && match->deleted)
64258 + return match;
64259 +
64260 + match = running_polstate.name_set.n_hash[index];
64261 +
64262 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
64263 + match->deleted))
64264 + match = match->next;
64265 +
64266 + if (match && !match->deleted)
64267 + return match;
64268 + else
64269 + return NULL;
64270 +}
64271 +
64272 +static struct inodev_entry *
64273 +lookup_inodev_entry(const ino_t ino, const dev_t dev)
64274 +{
64275 + unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
64276 + struct inodev_entry *match;
64277 +
64278 + match = running_polstate.inodev_set.i_hash[index];
64279 +
64280 + while (match && (match->nentry->inode != ino || match->nentry->device != dev))
64281 + match = match->next;
64282 +
64283 + return match;
64284 +}
64285 +
64286 +void
64287 +__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
64288 +{
64289 + unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
64290 + state->inodev_set.i_size);
64291 + struct inodev_entry **curr;
64292 +
64293 + entry->prev = NULL;
64294 +
64295 + curr = &state->inodev_set.i_hash[index];
64296 + if (*curr != NULL)
64297 + (*curr)->prev = entry;
64298 +
64299 + entry->next = *curr;
64300 + *curr = entry;
64301 +
64302 + return;
64303 +}
64304 +
64305 +static void
64306 +insert_inodev_entry(struct inodev_entry *entry)
64307 +{
64308 + __insert_inodev_entry(&running_polstate, entry);
64309 +}
64310 +
64311 +void
64312 +insert_acl_obj_label(struct acl_object_label *obj,
64313 + struct acl_subject_label *subj)
64314 +{
64315 + unsigned int index =
64316 + gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
64317 + struct acl_object_label **curr;
64318 +
64319 + obj->prev = NULL;
64320 +
64321 + curr = &subj->obj_hash[index];
64322 + if (*curr != NULL)
64323 + (*curr)->prev = obj;
64324 +
64325 + obj->next = *curr;
64326 + *curr = obj;
64327 +
64328 + return;
64329 +}
64330 +
64331 +void
64332 +insert_acl_subj_label(struct acl_subject_label *obj,
64333 + struct acl_role_label *role)
64334 +{
64335 + unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
64336 + struct acl_subject_label **curr;
64337 +
64338 + obj->prev = NULL;
64339 +
64340 + curr = &role->subj_hash[index];
64341 + if (*curr != NULL)
64342 + (*curr)->prev = obj;
64343 +
64344 + obj->next = *curr;
64345 + *curr = obj;
64346 +
64347 + return;
64348 +}
64349 +
64350 +/* derived from glibc fnmatch() 0: match, 1: no match*/
64351 +
64352 +static int
64353 +glob_match(const char *p, const char *n)
64354 +{
64355 + char c;
64356 +
64357 + while ((c = *p++) != '\0') {
64358 + switch (c) {
64359 + case '?':
64360 + if (*n == '\0')
64361 + return 1;
64362 + else if (*n == '/')
64363 + return 1;
64364 + break;
64365 + case '\\':
64366 + if (*n != c)
64367 + return 1;
64368 + break;
64369 + case '*':
64370 + for (c = *p++; c == '?' || c == '*'; c = *p++) {
64371 + if (*n == '/')
64372 + return 1;
64373 + else if (c == '?') {
64374 + if (*n == '\0')
64375 + return 1;
64376 + else
64377 + ++n;
64378 + }
64379 + }
64380 + if (c == '\0') {
64381 + return 0;
64382 + } else {
64383 + const char *endp;
64384 +
64385 + if ((endp = strchr(n, '/')) == NULL)
64386 + endp = n + strlen(n);
64387 +
64388 + if (c == '[') {
64389 + for (--p; n < endp; ++n)
64390 + if (!glob_match(p, n))
64391 + return 0;
64392 + } else if (c == '/') {
64393 + while (*n != '\0' && *n != '/')
64394 + ++n;
64395 + if (*n == '/' && !glob_match(p, n + 1))
64396 + return 0;
64397 + } else {
64398 + for (--p; n < endp; ++n)
64399 + if (*n == c && !glob_match(p, n))
64400 + return 0;
64401 + }
64402 +
64403 + return 1;
64404 + }
64405 + case '[':
64406 + {
64407 + int not;
64408 + char cold;
64409 +
64410 + if (*n == '\0' || *n == '/')
64411 + return 1;
64412 +
64413 + not = (*p == '!' || *p == '^');
64414 + if (not)
64415 + ++p;
64416 +
64417 + c = *p++;
64418 + for (;;) {
64419 + unsigned char fn = (unsigned char)*n;
64420 +
64421 + if (c == '\0')
64422 + return 1;
64423 + else {
64424 + if (c == fn)
64425 + goto matched;
64426 + cold = c;
64427 + c = *p++;
64428 +
64429 + if (c == '-' && *p != ']') {
64430 + unsigned char cend = *p++;
64431 +
64432 + if (cend == '\0')
64433 + return 1;
64434 +
64435 + if (cold <= fn && fn <= cend)
64436 + goto matched;
64437 +
64438 + c = *p++;
64439 + }
64440 + }
64441 +
64442 + if (c == ']')
64443 + break;
64444 + }
64445 + if (!not)
64446 + return 1;
64447 + break;
64448 + matched:
64449 + while (c != ']') {
64450 + if (c == '\0')
64451 + return 1;
64452 +
64453 + c = *p++;
64454 + }
64455 + if (not)
64456 + return 1;
64457 + }
64458 + break;
64459 + default:
64460 + if (c != *n)
64461 + return 1;
64462 + }
64463 +
64464 + ++n;
64465 + }
64466 +
64467 + if (*n == '\0')
64468 + return 0;
64469 +
64470 + if (*n == '/')
64471 + return 0;
64472 +
64473 + return 1;
64474 +}
64475 +
64476 +static struct acl_object_label *
64477 +chk_glob_label(struct acl_object_label *globbed,
64478 + const struct dentry *dentry, const struct vfsmount *mnt, char **path)
64479 +{
64480 + struct acl_object_label *tmp;
64481 +
64482 + if (*path == NULL)
64483 + *path = gr_to_filename_nolock(dentry, mnt);
64484 +
64485 + tmp = globbed;
64486 +
64487 + while (tmp) {
64488 + if (!glob_match(tmp->filename, *path))
64489 + return tmp;
64490 + tmp = tmp->next;
64491 + }
64492 +
64493 + return NULL;
64494 +}
64495 +
64496 +static struct acl_object_label *
64497 +__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
64498 + const ino_t curr_ino, const dev_t curr_dev,
64499 + const struct acl_subject_label *subj, char **path, const int checkglob)
64500 +{
64501 + struct acl_subject_label *tmpsubj;
64502 + struct acl_object_label *retval;
64503 + struct acl_object_label *retval2;
64504 +
64505 + tmpsubj = (struct acl_subject_label *) subj;
64506 + read_lock(&gr_inode_lock);
64507 + do {
64508 + retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
64509 + if (retval) {
64510 + if (checkglob && retval->globbed) {
64511 + retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
64512 + if (retval2)
64513 + retval = retval2;
64514 + }
64515 + break;
64516 + }
64517 + } while ((tmpsubj = tmpsubj->parent_subject));
64518 + read_unlock(&gr_inode_lock);
64519 +
64520 + return retval;
64521 +}
64522 +
64523 +static __inline__ struct acl_object_label *
64524 +full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
64525 + struct dentry *curr_dentry,
64526 + const struct acl_subject_label *subj, char **path, const int checkglob)
64527 +{
64528 + int newglob = checkglob;
64529 + ino_t inode;
64530 + dev_t device;
64531 +
64532 + /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
64533 + as we don't want a / * rule to match instead of the / object
64534 + don't do this for create lookups that call this function though, since they're looking up
64535 + on the parent and thus need globbing checks on all paths
64536 + */
64537 + if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
64538 + newglob = GR_NO_GLOB;
64539 +
64540 + spin_lock(&curr_dentry->d_lock);
64541 + inode = curr_dentry->d_inode->i_ino;
64542 + device = __get_dev(curr_dentry);
64543 + spin_unlock(&curr_dentry->d_lock);
64544 +
64545 + return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
64546 +}
64547 +
64548 +#ifdef CONFIG_HUGETLBFS
64549 +static inline bool
64550 +is_hugetlbfs_mnt(const struct vfsmount *mnt)
64551 +{
64552 + int i;
64553 + for (i = 0; i < HUGE_MAX_HSTATE; i++) {
64554 + if (unlikely(hugetlbfs_vfsmount[i] == mnt))
64555 + return true;
64556 + }
64557 +
64558 + return false;
64559 +}
64560 +#endif
64561 +
64562 +static struct acl_object_label *
64563 +__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
64564 + const struct acl_subject_label *subj, char *path, const int checkglob)
64565 +{
64566 + struct dentry *dentry = (struct dentry *) l_dentry;
64567 + struct vfsmount *mnt = (struct vfsmount *) l_mnt;
64568 + struct mount *real_mnt = real_mount(mnt);
64569 + struct acl_object_label *retval;
64570 + struct dentry *parent;
64571 +
64572 + br_read_lock(&vfsmount_lock);
64573 + write_seqlock(&rename_lock);
64574 +
64575 + if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
64576 +#ifdef CONFIG_NET
64577 + mnt == sock_mnt ||
64578 +#endif
64579 +#ifdef CONFIG_HUGETLBFS
64580 + (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
64581 +#endif
64582 + /* ignore Eric Biederman */
64583 + IS_PRIVATE(l_dentry->d_inode))) {
64584 + retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
64585 + goto out;
64586 + }
64587 +
64588 + for (;;) {
64589 + if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
64590 + break;
64591 +
64592 + if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
64593 + if (!mnt_has_parent(real_mnt))
64594 + break;
64595 +
64596 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
64597 + if (retval != NULL)
64598 + goto out;
64599 +
64600 + dentry = real_mnt->mnt_mountpoint;
64601 + real_mnt = real_mnt->mnt_parent;
64602 + mnt = &real_mnt->mnt;
64603 + continue;
64604 + }
64605 +
64606 + parent = dentry->d_parent;
64607 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
64608 + if (retval != NULL)
64609 + goto out;
64610 +
64611 + dentry = parent;
64612 + }
64613 +
64614 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
64615 +
64616 + /* gr_real_root is pinned so we don't have to hold a reference */
64617 + if (retval == NULL)
64618 + retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
64619 +out:
64620 + write_sequnlock(&rename_lock);
64621 + br_read_unlock(&vfsmount_lock);
64622 +
64623 + BUG_ON(retval == NULL);
64624 +
64625 + return retval;
64626 +}
64627 +
64628 +static __inline__ struct acl_object_label *
64629 +chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
64630 + const struct acl_subject_label *subj)
64631 +{
64632 + char *path = NULL;
64633 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
64634 +}
64635 +
64636 +static __inline__ struct acl_object_label *
64637 +chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
64638 + const struct acl_subject_label *subj)
64639 +{
64640 + char *path = NULL;
64641 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
64642 +}
64643 +
64644 +static __inline__ struct acl_object_label *
64645 +chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
64646 + const struct acl_subject_label *subj, char *path)
64647 +{
64648 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
64649 +}
64650 +
64651 +struct acl_subject_label *
64652 +chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
64653 + const struct acl_role_label *role)
64654 +{
64655 + struct dentry *dentry = (struct dentry *) l_dentry;
64656 + struct vfsmount *mnt = (struct vfsmount *) l_mnt;
64657 + struct mount *real_mnt = real_mount(mnt);
64658 + struct acl_subject_label *retval;
64659 + struct dentry *parent;
64660 +
64661 + br_read_lock(&vfsmount_lock);
64662 + write_seqlock(&rename_lock);
64663 +
64664 + for (;;) {
64665 + if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
64666 + break;
64667 + if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
64668 + if (!mnt_has_parent(real_mnt))
64669 + break;
64670 +
64671 + spin_lock(&dentry->d_lock);
64672 + read_lock(&gr_inode_lock);
64673 + retval =
64674 + lookup_acl_subj_label(dentry->d_inode->i_ino,
64675 + __get_dev(dentry), role);
64676 + read_unlock(&gr_inode_lock);
64677 + spin_unlock(&dentry->d_lock);
64678 + if (retval != NULL)
64679 + goto out;
64680 +
64681 + dentry = real_mnt->mnt_mountpoint;
64682 + real_mnt = real_mnt->mnt_parent;
64683 + mnt = &real_mnt->mnt;
64684 + continue;
64685 + }
64686 +
64687 + spin_lock(&dentry->d_lock);
64688 + read_lock(&gr_inode_lock);
64689 + retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
64690 + __get_dev(dentry), role);
64691 + read_unlock(&gr_inode_lock);
64692 + parent = dentry->d_parent;
64693 + spin_unlock(&dentry->d_lock);
64694 +
64695 + if (retval != NULL)
64696 + goto out;
64697 +
64698 + dentry = parent;
64699 + }
64700 +
64701 + spin_lock(&dentry->d_lock);
64702 + read_lock(&gr_inode_lock);
64703 + retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
64704 + __get_dev(dentry), role);
64705 + read_unlock(&gr_inode_lock);
64706 + spin_unlock(&dentry->d_lock);
64707 +
64708 + if (unlikely(retval == NULL)) {
64709 + /* gr_real_root is pinned, we don't need to hold a reference */
64710 + read_lock(&gr_inode_lock);
64711 + retval = lookup_acl_subj_label(gr_real_root.dentry->d_inode->i_ino,
64712 + __get_dev(gr_real_root.dentry), role);
64713 + read_unlock(&gr_inode_lock);
64714 + }
64715 +out:
64716 + write_sequnlock(&rename_lock);
64717 + br_read_unlock(&vfsmount_lock);
64718 +
64719 + BUG_ON(retval == NULL);
64720 +
64721 + return retval;
64722 +}
64723 +
64724 +void
64725 +assign_special_role(const char *rolename)
64726 +{
64727 + struct acl_object_label *obj;
64728 + struct acl_role_label *r;
64729 + struct acl_role_label *assigned = NULL;
64730 + struct task_struct *tsk;
64731 + struct file *filp;
64732 +
64733 + FOR_EACH_ROLE_START(r)
64734 + if (!strcmp(rolename, r->rolename) &&
64735 + (r->roletype & GR_ROLE_SPECIAL)) {
64736 + assigned = r;
64737 + break;
64738 + }
64739 + FOR_EACH_ROLE_END(r)
64740 +
64741 + if (!assigned)
64742 + return;
64743 +
64744 + read_lock(&tasklist_lock);
64745 + read_lock(&grsec_exec_file_lock);
64746 +
64747 + tsk = current->real_parent;
64748 + if (tsk == NULL)
64749 + goto out_unlock;
64750 +
64751 + filp = tsk->exec_file;
64752 + if (filp == NULL)
64753 + goto out_unlock;
64754 +
64755 + tsk->is_writable = 0;
64756 + tsk->inherited = 0;
64757 +
64758 + tsk->acl_sp_role = 1;
64759 + tsk->acl_role_id = ++acl_sp_role_value;
64760 + tsk->role = assigned;
64761 + tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
64762 +
64763 + /* ignore additional mmap checks for processes that are writable
64764 + by the default ACL */
64765 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
64766 + if (unlikely(obj->mode & GR_WRITE))
64767 + tsk->is_writable = 1;
64768 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
64769 + if (unlikely(obj->mode & GR_WRITE))
64770 + tsk->is_writable = 1;
64771 +
64772 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
64773 + printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
64774 + tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
64775 +#endif
64776 +
64777 +out_unlock:
64778 + read_unlock(&grsec_exec_file_lock);
64779 + read_unlock(&tasklist_lock);
64780 + return;
64781 +}
64782 +
64783 +
64784 +static void
64785 +gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
64786 +{
64787 + struct task_struct *task = current;
64788 + const struct cred *cred = current_cred();
64789 +
64790 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
64791 + GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
64792 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
64793 + 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
64794 +
64795 + return;
64796 +}
64797 +
64798 +static void
64799 +gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
64800 +{
64801 + struct task_struct *task = current;
64802 + const struct cred *cred = current_cred();
64803 +
64804 + security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
64805 + GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
64806 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
64807 + 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
64808 +
64809 + return;
64810 +}
64811 +
64812 +static void
64813 +gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
64814 +{
64815 + struct task_struct *task = current;
64816 + const struct cred *cred = current_cred();
64817 +
64818 + security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
64819 + GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
64820 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
64821 + 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
64822 +
64823 + return;
64824 +}
64825 +
64826 +static void
64827 +gr_set_proc_res(struct task_struct *task)
64828 +{
64829 + struct acl_subject_label *proc;
64830 + unsigned short i;
64831 +
64832 + proc = task->acl;
64833 +
64834 + if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
64835 + return;
64836 +
64837 + for (i = 0; i < RLIM_NLIMITS; i++) {
64838 + if (!(proc->resmask & (1U << i)))
64839 + continue;
64840 +
64841 + task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
64842 + task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
64843 +
64844 + if (i == RLIMIT_CPU)
64845 + update_rlimit_cpu(task, proc->res[i].rlim_cur);
64846 + }
64847 +
64848 + return;
64849 +}
64850 +
64851 +/* both of the below must be called with
64852 + rcu_read_lock();
64853 + read_lock(&tasklist_lock);
64854 + read_lock(&grsec_exec_file_lock);
64855 +*/
64856 +
64857 +struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename)
64858 +{
64859 + char *tmpname;
64860 + struct acl_subject_label *tmpsubj;
64861 + struct file *filp;
64862 + struct name_entry *nmatch;
64863 +
64864 + filp = task->exec_file;
64865 + if (filp == NULL)
64866 + return NULL;
64867 +
64868 + /* the following is to apply the correct subject
64869 + on binaries running when the RBAC system
64870 + is enabled, when the binaries have been
64871 + replaced or deleted since their execution
64872 + -----
64873 + when the RBAC system starts, the inode/dev
64874 + from exec_file will be one the RBAC system
64875 + is unaware of. It only knows the inode/dev
64876 + of the present file on disk, or the absence
64877 + of it.
64878 + */
64879 +
64880 + if (filename)
64881 + nmatch = __lookup_name_entry(state, filename);
64882 + else {
64883 + preempt_disable();
64884 + tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
64885 +
64886 + nmatch = __lookup_name_entry(state, tmpname);
64887 + preempt_enable();
64888 + }
64889 + tmpsubj = NULL;
64890 + if (nmatch) {
64891 + if (nmatch->deleted)
64892 + tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
64893 + else
64894 + tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
64895 + }
64896 + /* this also works for the reload case -- if we don't match a potentially inherited subject
64897 + then we fall back to a normal lookup based on the binary's ino/dev
64898 + */
64899 + if (tmpsubj == NULL)
64900 + tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
64901 +
64902 + return tmpsubj;
64903 +}
64904 +
64905 +static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename)
64906 +{
64907 + return __gr_get_subject_for_task(&running_polstate, task, filename);
64908 +}
64909 +
64910 +void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
64911 +{
64912 + struct acl_object_label *obj;
64913 + struct file *filp;
64914 +
64915 + filp = task->exec_file;
64916 +
64917 + task->acl = subj;
64918 + task->is_writable = 0;
64919 + /* ignore additional mmap checks for processes that are writable
64920 + by the default ACL */
64921 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
64922 + if (unlikely(obj->mode & GR_WRITE))
64923 + task->is_writable = 1;
64924 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
64925 + if (unlikely(obj->mode & GR_WRITE))
64926 + task->is_writable = 1;
64927 +
64928 + gr_set_proc_res(task);
64929 +
64930 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
64931 + 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);
64932 +#endif
64933 +}
64934 +
64935 +static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
64936 +{
64937 + __gr_apply_subject_to_task(&running_polstate, task, subj);
64938 +}
64939 +
64940 +__u32
64941 +gr_search_file(const struct dentry * dentry, const __u32 mode,
64942 + const struct vfsmount * mnt)
64943 +{
64944 + __u32 retval = mode;
64945 + struct acl_subject_label *curracl;
64946 + struct acl_object_label *currobj;
64947 +
64948 + if (unlikely(!(gr_status & GR_READY)))
64949 + return (mode & ~GR_AUDITS);
64950 +
64951 + curracl = current->acl;
64952 +
64953 + currobj = chk_obj_label(dentry, mnt, curracl);
64954 + retval = currobj->mode & mode;
64955 +
64956 + /* if we're opening a specified transfer file for writing
64957 + (e.g. /dev/initctl), then transfer our role to init
64958 + */
64959 + if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
64960 + current->role->roletype & GR_ROLE_PERSIST)) {
64961 + struct task_struct *task = init_pid_ns.child_reaper;
64962 +
64963 + if (task->role != current->role) {
64964 + struct acl_subject_label *subj;
64965 +
64966 + task->acl_sp_role = 0;
64967 + task->acl_role_id = current->acl_role_id;
64968 + task->role = current->role;
64969 + rcu_read_lock();
64970 + read_lock(&grsec_exec_file_lock);
64971 + subj = gr_get_subject_for_task(task, NULL);
64972 + gr_apply_subject_to_task(task, subj);
64973 + read_unlock(&grsec_exec_file_lock);
64974 + rcu_read_unlock();
64975 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
64976 + }
64977 + }
64978 +
64979 + if (unlikely
64980 + ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
64981 + && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
64982 + __u32 new_mode = mode;
64983 +
64984 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
64985 +
64986 + retval = new_mode;
64987 +
64988 + if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
64989 + new_mode |= GR_INHERIT;
64990 +
64991 + if (!(mode & GR_NOLEARN))
64992 + gr_log_learn(dentry, mnt, new_mode);
64993 + }
64994 +
64995 + return retval;
64996 +}
64997 +
64998 +struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
64999 + const struct dentry *parent,
65000 + const struct vfsmount *mnt)
65001 +{
65002 + struct name_entry *match;
65003 + struct acl_object_label *matchpo;
65004 + struct acl_subject_label *curracl;
65005 + char *path;
65006 +
65007 + if (unlikely(!(gr_status & GR_READY)))
65008 + return NULL;
65009 +
65010 + preempt_disable();
65011 + path = gr_to_filename_rbac(new_dentry, mnt);
65012 + match = lookup_name_entry_create(path);
65013 +
65014 + curracl = current->acl;
65015 +
65016 + if (match) {
65017 + read_lock(&gr_inode_lock);
65018 + matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
65019 + read_unlock(&gr_inode_lock);
65020 +
65021 + if (matchpo) {
65022 + preempt_enable();
65023 + return matchpo;
65024 + }
65025 + }
65026 +
65027 + // lookup parent
65028 +
65029 + matchpo = chk_obj_create_label(parent, mnt, curracl, path);
65030 +
65031 + preempt_enable();
65032 + return matchpo;
65033 +}
65034 +
65035 +__u32
65036 +gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
65037 + const struct vfsmount * mnt, const __u32 mode)
65038 +{
65039 + struct acl_object_label *matchpo;
65040 + __u32 retval;
65041 +
65042 + if (unlikely(!(gr_status & GR_READY)))
65043 + return (mode & ~GR_AUDITS);
65044 +
65045 + matchpo = gr_get_create_object(new_dentry, parent, mnt);
65046 +
65047 + retval = matchpo->mode & mode;
65048 +
65049 + if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
65050 + && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
65051 + __u32 new_mode = mode;
65052 +
65053 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
65054 +
65055 + gr_log_learn(new_dentry, mnt, new_mode);
65056 + return new_mode;
65057 + }
65058 +
65059 + return retval;
65060 +}
65061 +
65062 +__u32
65063 +gr_check_link(const struct dentry * new_dentry,
65064 + const struct dentry * parent_dentry,
65065 + const struct vfsmount * parent_mnt,
65066 + const struct dentry * old_dentry, const struct vfsmount * old_mnt)
65067 +{
65068 + struct acl_object_label *obj;
65069 + __u32 oldmode, newmode;
65070 + __u32 needmode;
65071 + __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
65072 + GR_DELETE | GR_INHERIT;
65073 +
65074 + if (unlikely(!(gr_status & GR_READY)))
65075 + return (GR_CREATE | GR_LINK);
65076 +
65077 + obj = chk_obj_label(old_dentry, old_mnt, current->acl);
65078 + oldmode = obj->mode;
65079 +
65080 + obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
65081 + newmode = obj->mode;
65082 +
65083 + needmode = newmode & checkmodes;
65084 +
65085 + // old name for hardlink must have at least the permissions of the new name
65086 + if ((oldmode & needmode) != needmode)
65087 + goto bad;
65088 +
65089 + // if old name had restrictions/auditing, make sure the new name does as well
65090 + needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
65091 +
65092 + // don't allow hardlinking of suid/sgid/fcapped files without permission
65093 + if (is_privileged_binary(old_dentry))
65094 + needmode |= GR_SETID;
65095 +
65096 + if ((newmode & needmode) != needmode)
65097 + goto bad;
65098 +
65099 + // enforce minimum permissions
65100 + if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
65101 + return newmode;
65102 +bad:
65103 + needmode = oldmode;
65104 + if (is_privileged_binary(old_dentry))
65105 + needmode |= GR_SETID;
65106 +
65107 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
65108 + gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
65109 + return (GR_CREATE | GR_LINK);
65110 + } else if (newmode & GR_SUPPRESS)
65111 + return GR_SUPPRESS;
65112 + else
65113 + return 0;
65114 +}
65115 +
65116 +int
65117 +gr_check_hidden_task(const struct task_struct *task)
65118 +{
65119 + if (unlikely(!(gr_status & GR_READY)))
65120 + return 0;
65121 +
65122 + if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
65123 + return 1;
65124 +
65125 + return 0;
65126 +}
65127 +
65128 +int
65129 +gr_check_protected_task(const struct task_struct *task)
65130 +{
65131 + if (unlikely(!(gr_status & GR_READY) || !task))
65132 + return 0;
65133 +
65134 + if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
65135 + task->acl != current->acl)
65136 + return 1;
65137 +
65138 + return 0;
65139 +}
65140 +
65141 +int
65142 +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
65143 +{
65144 + struct task_struct *p;
65145 + int ret = 0;
65146 +
65147 + if (unlikely(!(gr_status & GR_READY) || !pid))
65148 + return ret;
65149 +
65150 + read_lock(&tasklist_lock);
65151 + do_each_pid_task(pid, type, p) {
65152 + if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
65153 + p->acl != current->acl) {
65154 + ret = 1;
65155 + goto out;
65156 + }
65157 + } while_each_pid_task(pid, type, p);
65158 +out:
65159 + read_unlock(&tasklist_lock);
65160 +
65161 + return ret;
65162 +}
65163 +
65164 +void
65165 +gr_copy_label(struct task_struct *tsk)
65166 +{
65167 + struct task_struct *p = current;
65168 +
65169 + tsk->inherited = p->inherited;
65170 + tsk->acl_sp_role = 0;
65171 + tsk->acl_role_id = p->acl_role_id;
65172 + tsk->acl = p->acl;
65173 + tsk->role = p->role;
65174 + tsk->signal->used_accept = 0;
65175 + tsk->signal->curr_ip = p->signal->curr_ip;
65176 + tsk->signal->saved_ip = p->signal->saved_ip;
65177 + if (p->exec_file)
65178 + get_file(p->exec_file);
65179 + tsk->exec_file = p->exec_file;
65180 + tsk->is_writable = p->is_writable;
65181 + if (unlikely(p->signal->used_accept)) {
65182 + p->signal->curr_ip = 0;
65183 + p->signal->saved_ip = 0;
65184 + }
65185 +
65186 + return;
65187 +}
65188 +
65189 +extern int gr_process_kernel_setuid_ban(struct user_struct *user);
65190 +
65191 +int
65192 +gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
65193 +{
65194 + unsigned int i;
65195 + __u16 num;
65196 + uid_t *uidlist;
65197 + uid_t curuid;
65198 + int realok = 0;
65199 + int effectiveok = 0;
65200 + int fsok = 0;
65201 + uid_t globalreal, globaleffective, globalfs;
65202 +
65203 +#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
65204 + struct user_struct *user;
65205 +
65206 + if (!uid_valid(real))
65207 + goto skipit;
65208 +
65209 + /* find user based on global namespace */
65210 +
65211 + globalreal = GR_GLOBAL_UID(real);
65212 +
65213 + user = find_user(make_kuid(&init_user_ns, globalreal));
65214 + if (user == NULL)
65215 + goto skipit;
65216 +
65217 + if (gr_process_kernel_setuid_ban(user)) {
65218 + /* for find_user */
65219 + free_uid(user);
65220 + return 1;
65221 + }
65222 +
65223 + /* for find_user */
65224 + free_uid(user);
65225 +
65226 +skipit:
65227 +#endif
65228 +
65229 + if (unlikely(!(gr_status & GR_READY)))
65230 + return 0;
65231 +
65232 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
65233 + gr_log_learn_uid_change(real, effective, fs);
65234 +
65235 + num = current->acl->user_trans_num;
65236 + uidlist = current->acl->user_transitions;
65237 +
65238 + if (uidlist == NULL)
65239 + return 0;
65240 +
65241 + if (!uid_valid(real)) {
65242 + realok = 1;
65243 + globalreal = (uid_t)-1;
65244 + } else {
65245 + globalreal = GR_GLOBAL_UID(real);
65246 + }
65247 + if (!uid_valid(effective)) {
65248 + effectiveok = 1;
65249 + globaleffective = (uid_t)-1;
65250 + } else {
65251 + globaleffective = GR_GLOBAL_UID(effective);
65252 + }
65253 + if (!uid_valid(fs)) {
65254 + fsok = 1;
65255 + globalfs = (uid_t)-1;
65256 + } else {
65257 + globalfs = GR_GLOBAL_UID(fs);
65258 + }
65259 +
65260 + if (current->acl->user_trans_type & GR_ID_ALLOW) {
65261 + for (i = 0; i < num; i++) {
65262 + curuid = uidlist[i];
65263 + if (globalreal == curuid)
65264 + realok = 1;
65265 + if (globaleffective == curuid)
65266 + effectiveok = 1;
65267 + if (globalfs == curuid)
65268 + fsok = 1;
65269 + }
65270 + } else if (current->acl->user_trans_type & GR_ID_DENY) {
65271 + for (i = 0; i < num; i++) {
65272 + curuid = uidlist[i];
65273 + if (globalreal == curuid)
65274 + break;
65275 + if (globaleffective == curuid)
65276 + break;
65277 + if (globalfs == curuid)
65278 + break;
65279 + }
65280 + /* not in deny list */
65281 + if (i == num) {
65282 + realok = 1;
65283 + effectiveok = 1;
65284 + fsok = 1;
65285 + }
65286 + }
65287 +
65288 + if (realok && effectiveok && fsok)
65289 + return 0;
65290 + else {
65291 + gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
65292 + return 1;
65293 + }
65294 +}
65295 +
65296 +int
65297 +gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
65298 +{
65299 + unsigned int i;
65300 + __u16 num;
65301 + gid_t *gidlist;
65302 + gid_t curgid;
65303 + int realok = 0;
65304 + int effectiveok = 0;
65305 + int fsok = 0;
65306 + gid_t globalreal, globaleffective, globalfs;
65307 +
65308 + if (unlikely(!(gr_status & GR_READY)))
65309 + return 0;
65310 +
65311 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
65312 + gr_log_learn_gid_change(real, effective, fs);
65313 +
65314 + num = current->acl->group_trans_num;
65315 + gidlist = current->acl->group_transitions;
65316 +
65317 + if (gidlist == NULL)
65318 + return 0;
65319 +
65320 + if (!gid_valid(real)) {
65321 + realok = 1;
65322 + globalreal = (gid_t)-1;
65323 + } else {
65324 + globalreal = GR_GLOBAL_GID(real);
65325 + }
65326 + if (!gid_valid(effective)) {
65327 + effectiveok = 1;
65328 + globaleffective = (gid_t)-1;
65329 + } else {
65330 + globaleffective = GR_GLOBAL_GID(effective);
65331 + }
65332 + if (!gid_valid(fs)) {
65333 + fsok = 1;
65334 + globalfs = (gid_t)-1;
65335 + } else {
65336 + globalfs = GR_GLOBAL_GID(fs);
65337 + }
65338 +
65339 + if (current->acl->group_trans_type & GR_ID_ALLOW) {
65340 + for (i = 0; i < num; i++) {
65341 + curgid = gidlist[i];
65342 + if (globalreal == curgid)
65343 + realok = 1;
65344 + if (globaleffective == curgid)
65345 + effectiveok = 1;
65346 + if (globalfs == curgid)
65347 + fsok = 1;
65348 + }
65349 + } else if (current->acl->group_trans_type & GR_ID_DENY) {
65350 + for (i = 0; i < num; i++) {
65351 + curgid = gidlist[i];
65352 + if (globalreal == curgid)
65353 + break;
65354 + if (globaleffective == curgid)
65355 + break;
65356 + if (globalfs == curgid)
65357 + break;
65358 + }
65359 + /* not in deny list */
65360 + if (i == num) {
65361 + realok = 1;
65362 + effectiveok = 1;
65363 + fsok = 1;
65364 + }
65365 + }
65366 +
65367 + if (realok && effectiveok && fsok)
65368 + return 0;
65369 + else {
65370 + gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
65371 + return 1;
65372 + }
65373 +}
65374 +
65375 +extern int gr_acl_is_capable(const int cap);
65376 +
65377 +void
65378 +gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
65379 +{
65380 + struct acl_role_label *role = task->role;
65381 + struct acl_subject_label *subj = NULL;
65382 + struct acl_object_label *obj;
65383 + struct file *filp;
65384 + uid_t uid;
65385 + gid_t gid;
65386 +
65387 + if (unlikely(!(gr_status & GR_READY)))
65388 + return;
65389 +
65390 + uid = GR_GLOBAL_UID(kuid);
65391 + gid = GR_GLOBAL_GID(kgid);
65392 +
65393 + filp = task->exec_file;
65394 +
65395 + /* kernel process, we'll give them the kernel role */
65396 + if (unlikely(!filp)) {
65397 + task->role = running_polstate.kernel_role;
65398 + task->acl = running_polstate.kernel_role->root_label;
65399 + return;
65400 + } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
65401 + /* save the current ip at time of role lookup so that the proper
65402 + IP will be learned for role_allowed_ip */
65403 + task->signal->saved_ip = task->signal->curr_ip;
65404 + role = lookup_acl_role_label(task, uid, gid);
65405 + }
65406 +
65407 + /* don't change the role if we're not a privileged process */
65408 + if (role && task->role != role &&
65409 + (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
65410 + ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
65411 + return;
65412 +
65413 + /* perform subject lookup in possibly new role
65414 + we can use this result below in the case where role == task->role
65415 + */
65416 + subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
65417 +
65418 + /* if we changed uid/gid, but result in the same role
65419 + and are using inheritance, don't lose the inherited subject
65420 + if current subject is other than what normal lookup
65421 + would result in, we arrived via inheritance, don't
65422 + lose subject
65423 + */
65424 + if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
65425 + (subj == task->acl)))
65426 + task->acl = subj;
65427 +
65428 + /* leave task->inherited unaffected */
65429 +
65430 + task->role = role;
65431 +
65432 + task->is_writable = 0;
65433 +
65434 + /* ignore additional mmap checks for processes that are writable
65435 + by the default ACL */
65436 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
65437 + if (unlikely(obj->mode & GR_WRITE))
65438 + task->is_writable = 1;
65439 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
65440 + if (unlikely(obj->mode & GR_WRITE))
65441 + task->is_writable = 1;
65442 +
65443 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
65444 + 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);
65445 +#endif
65446 +
65447 + gr_set_proc_res(task);
65448 +
65449 + return;
65450 +}
65451 +
65452 +int
65453 +gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
65454 + const int unsafe_flags)
65455 +{
65456 + struct task_struct *task = current;
65457 + struct acl_subject_label *newacl;
65458 + struct acl_object_label *obj;
65459 + __u32 retmode;
65460 +
65461 + if (unlikely(!(gr_status & GR_READY)))
65462 + return 0;
65463 +
65464 + newacl = chk_subj_label(dentry, mnt, task->role);
65465 +
65466 + /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
65467 + did an exec
65468 + */
65469 + rcu_read_lock();
65470 + read_lock(&tasklist_lock);
65471 + if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
65472 + (task->parent->acl->mode & GR_POVERRIDE))) {
65473 + read_unlock(&tasklist_lock);
65474 + rcu_read_unlock();
65475 + goto skip_check;
65476 + }
65477 + read_unlock(&tasklist_lock);
65478 + rcu_read_unlock();
65479 +
65480 + if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
65481 + !(task->role->roletype & GR_ROLE_GOD) &&
65482 + !gr_search_file(dentry, GR_PTRACERD, mnt) &&
65483 + !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
65484 + if (unsafe_flags & LSM_UNSAFE_SHARE)
65485 + gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
65486 + else
65487 + gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
65488 + return -EACCES;
65489 + }
65490 +
65491 +skip_check:
65492 +
65493 + obj = chk_obj_label(dentry, mnt, task->acl);
65494 + retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
65495 +
65496 + if (!(task->acl->mode & GR_INHERITLEARN) &&
65497 + ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
65498 + if (obj->nested)
65499 + task->acl = obj->nested;
65500 + else
65501 + task->acl = newacl;
65502 + task->inherited = 0;
65503 + } else {
65504 + task->inherited = 1;
65505 + if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
65506 + gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
65507 + }
65508 +
65509 + task->is_writable = 0;
65510 +
65511 + /* ignore additional mmap checks for processes that are writable
65512 + by the default ACL */
65513 + obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
65514 + if (unlikely(obj->mode & GR_WRITE))
65515 + task->is_writable = 1;
65516 + obj = chk_obj_label(dentry, mnt, task->role->root_label);
65517 + if (unlikely(obj->mode & GR_WRITE))
65518 + task->is_writable = 1;
65519 +
65520 + gr_set_proc_res(task);
65521 +
65522 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
65523 + 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);
65524 +#endif
65525 + return 0;
65526 +}
65527 +
65528 +/* always called with valid inodev ptr */
65529 +static void
65530 +do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
65531 +{
65532 + struct acl_object_label *matchpo;
65533 + struct acl_subject_label *matchps;
65534 + struct acl_subject_label *subj;
65535 + struct acl_role_label *role;
65536 + unsigned int x;
65537 +
65538 + FOR_EACH_ROLE_START(role)
65539 + FOR_EACH_SUBJECT_START(role, subj, x)
65540 + if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
65541 + matchpo->mode |= GR_DELETED;
65542 + FOR_EACH_SUBJECT_END(subj,x)
65543 + FOR_EACH_NESTED_SUBJECT_START(role, subj)
65544 + /* nested subjects aren't in the role's subj_hash table */
65545 + if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
65546 + matchpo->mode |= GR_DELETED;
65547 + FOR_EACH_NESTED_SUBJECT_END(subj)
65548 + if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
65549 + matchps->mode |= GR_DELETED;
65550 + FOR_EACH_ROLE_END(role)
65551 +
65552 + inodev->nentry->deleted = 1;
65553 +
65554 + return;
65555 +}
65556 +
65557 +void
65558 +gr_handle_delete(const ino_t ino, const dev_t dev)
65559 +{
65560 + struct inodev_entry *inodev;
65561 +
65562 + if (unlikely(!(gr_status & GR_READY)))
65563 + return;
65564 +
65565 + write_lock(&gr_inode_lock);
65566 + inodev = lookup_inodev_entry(ino, dev);
65567 + if (inodev != NULL)
65568 + do_handle_delete(inodev, ino, dev);
65569 + write_unlock(&gr_inode_lock);
65570 +
65571 + return;
65572 +}
65573 +
65574 +static void
65575 +update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
65576 + const ino_t newinode, const dev_t newdevice,
65577 + struct acl_subject_label *subj)
65578 +{
65579 + unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
65580 + struct acl_object_label *match;
65581 +
65582 + match = subj->obj_hash[index];
65583 +
65584 + while (match && (match->inode != oldinode ||
65585 + match->device != olddevice ||
65586 + !(match->mode & GR_DELETED)))
65587 + match = match->next;
65588 +
65589 + if (match && (match->inode == oldinode)
65590 + && (match->device == olddevice)
65591 + && (match->mode & GR_DELETED)) {
65592 + if (match->prev == NULL) {
65593 + subj->obj_hash[index] = match->next;
65594 + if (match->next != NULL)
65595 + match->next->prev = NULL;
65596 + } else {
65597 + match->prev->next = match->next;
65598 + if (match->next != NULL)
65599 + match->next->prev = match->prev;
65600 + }
65601 + match->prev = NULL;
65602 + match->next = NULL;
65603 + match->inode = newinode;
65604 + match->device = newdevice;
65605 + match->mode &= ~GR_DELETED;
65606 +
65607 + insert_acl_obj_label(match, subj);
65608 + }
65609 +
65610 + return;
65611 +}
65612 +
65613 +static void
65614 +update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
65615 + const ino_t newinode, const dev_t newdevice,
65616 + struct acl_role_label *role)
65617 +{
65618 + unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
65619 + struct acl_subject_label *match;
65620 +
65621 + match = role->subj_hash[index];
65622 +
65623 + while (match && (match->inode != oldinode ||
65624 + match->device != olddevice ||
65625 + !(match->mode & GR_DELETED)))
65626 + match = match->next;
65627 +
65628 + if (match && (match->inode == oldinode)
65629 + && (match->device == olddevice)
65630 + && (match->mode & GR_DELETED)) {
65631 + if (match->prev == NULL) {
65632 + role->subj_hash[index] = match->next;
65633 + if (match->next != NULL)
65634 + match->next->prev = NULL;
65635 + } else {
65636 + match->prev->next = match->next;
65637 + if (match->next != NULL)
65638 + match->next->prev = match->prev;
65639 + }
65640 + match->prev = NULL;
65641 + match->next = NULL;
65642 + match->inode = newinode;
65643 + match->device = newdevice;
65644 + match->mode &= ~GR_DELETED;
65645 +
65646 + insert_acl_subj_label(match, role);
65647 + }
65648 +
65649 + return;
65650 +}
65651 +
65652 +static void
65653 +update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
65654 + const ino_t newinode, const dev_t newdevice)
65655 +{
65656 + unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
65657 + struct inodev_entry *match;
65658 +
65659 + match = running_polstate.inodev_set.i_hash[index];
65660 +
65661 + while (match && (match->nentry->inode != oldinode ||
65662 + match->nentry->device != olddevice || !match->nentry->deleted))
65663 + match = match->next;
65664 +
65665 + if (match && (match->nentry->inode == oldinode)
65666 + && (match->nentry->device == olddevice) &&
65667 + match->nentry->deleted) {
65668 + if (match->prev == NULL) {
65669 + running_polstate.inodev_set.i_hash[index] = match->next;
65670 + if (match->next != NULL)
65671 + match->next->prev = NULL;
65672 + } else {
65673 + match->prev->next = match->next;
65674 + if (match->next != NULL)
65675 + match->next->prev = match->prev;
65676 + }
65677 + match->prev = NULL;
65678 + match->next = NULL;
65679 + match->nentry->inode = newinode;
65680 + match->nentry->device = newdevice;
65681 + match->nentry->deleted = 0;
65682 +
65683 + insert_inodev_entry(match);
65684 + }
65685 +
65686 + return;
65687 +}
65688 +
65689 +static void
65690 +__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
65691 +{
65692 + struct acl_subject_label *subj;
65693 + struct acl_role_label *role;
65694 + unsigned int x;
65695 +
65696 + FOR_EACH_ROLE_START(role)
65697 + update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
65698 +
65699 + FOR_EACH_NESTED_SUBJECT_START(role, subj)
65700 + if ((subj->inode == ino) && (subj->device == dev)) {
65701 + subj->inode = ino;
65702 + subj->device = dev;
65703 + }
65704 + /* nested subjects aren't in the role's subj_hash table */
65705 + update_acl_obj_label(matchn->inode, matchn->device,
65706 + ino, dev, subj);
65707 + FOR_EACH_NESTED_SUBJECT_END(subj)
65708 + FOR_EACH_SUBJECT_START(role, subj, x)
65709 + update_acl_obj_label(matchn->inode, matchn->device,
65710 + ino, dev, subj);
65711 + FOR_EACH_SUBJECT_END(subj,x)
65712 + FOR_EACH_ROLE_END(role)
65713 +
65714 + update_inodev_entry(matchn->inode, matchn->device, ino, dev);
65715 +
65716 + return;
65717 +}
65718 +
65719 +static void
65720 +do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
65721 + const struct vfsmount *mnt)
65722 +{
65723 + ino_t ino = dentry->d_inode->i_ino;
65724 + dev_t dev = __get_dev(dentry);
65725 +
65726 + __do_handle_create(matchn, ino, dev);
65727 +
65728 + return;
65729 +}
65730 +
65731 +void
65732 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
65733 +{
65734 + struct name_entry *matchn;
65735 +
65736 + if (unlikely(!(gr_status & GR_READY)))
65737 + return;
65738 +
65739 + preempt_disable();
65740 + matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
65741 +
65742 + if (unlikely((unsigned long)matchn)) {
65743 + write_lock(&gr_inode_lock);
65744 + do_handle_create(matchn, dentry, mnt);
65745 + write_unlock(&gr_inode_lock);
65746 + }
65747 + preempt_enable();
65748 +
65749 + return;
65750 +}
65751 +
65752 +void
65753 +gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
65754 +{
65755 + struct name_entry *matchn;
65756 +
65757 + if (unlikely(!(gr_status & GR_READY)))
65758 + return;
65759 +
65760 + preempt_disable();
65761 + matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
65762 +
65763 + if (unlikely((unsigned long)matchn)) {
65764 + write_lock(&gr_inode_lock);
65765 + __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
65766 + write_unlock(&gr_inode_lock);
65767 + }
65768 + preempt_enable();
65769 +
65770 + return;
65771 +}
65772 +
65773 +void
65774 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
65775 + struct dentry *old_dentry,
65776 + struct dentry *new_dentry,
65777 + struct vfsmount *mnt, const __u8 replace)
65778 +{
65779 + struct name_entry *matchn;
65780 + struct inodev_entry *inodev;
65781 + struct inode *inode = new_dentry->d_inode;
65782 + ino_t old_ino = old_dentry->d_inode->i_ino;
65783 + dev_t old_dev = __get_dev(old_dentry);
65784 +
65785 + /* vfs_rename swaps the name and parent link for old_dentry and
65786 + new_dentry
65787 + at this point, old_dentry has the new name, parent link, and inode
65788 + for the renamed file
65789 + if a file is being replaced by a rename, new_dentry has the inode
65790 + and name for the replaced file
65791 + */
65792 +
65793 + if (unlikely(!(gr_status & GR_READY)))
65794 + return;
65795 +
65796 + preempt_disable();
65797 + matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
65798 +
65799 + /* we wouldn't have to check d_inode if it weren't for
65800 + NFS silly-renaming
65801 + */
65802 +
65803 + write_lock(&gr_inode_lock);
65804 + if (unlikely(replace && inode)) {
65805 + ino_t new_ino = inode->i_ino;
65806 + dev_t new_dev = __get_dev(new_dentry);
65807 +
65808 + inodev = lookup_inodev_entry(new_ino, new_dev);
65809 + if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
65810 + do_handle_delete(inodev, new_ino, new_dev);
65811 + }
65812 +
65813 + inodev = lookup_inodev_entry(old_ino, old_dev);
65814 + if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
65815 + do_handle_delete(inodev, old_ino, old_dev);
65816 +
65817 + if (unlikely((unsigned long)matchn))
65818 + do_handle_create(matchn, old_dentry, mnt);
65819 +
65820 + write_unlock(&gr_inode_lock);
65821 + preempt_enable();
65822 +
65823 + return;
65824 +}
65825 +
65826 +#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
65827 +static const unsigned long res_learn_bumps[GR_NLIMITS] = {
65828 + [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
65829 + [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
65830 + [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
65831 + [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
65832 + [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
65833 + [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
65834 + [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
65835 + [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
65836 + [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
65837 + [RLIMIT_AS] = GR_RLIM_AS_BUMP,
65838 + [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
65839 + [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
65840 + [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
65841 + [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
65842 + [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
65843 + [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
65844 +};
65845 +
65846 +void
65847 +gr_learn_resource(const struct task_struct *task,
65848 + const int res, const unsigned long wanted, const int gt)
65849 +{
65850 + struct acl_subject_label *acl;
65851 + const struct cred *cred;
65852 +
65853 + if (unlikely((gr_status & GR_READY) &&
65854 + task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
65855 + goto skip_reslog;
65856 +
65857 + gr_log_resource(task, res, wanted, gt);
65858 +skip_reslog:
65859 +
65860 + if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
65861 + return;
65862 +
65863 + acl = task->acl;
65864 +
65865 + if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
65866 + !(acl->resmask & (1U << (unsigned short) res))))
65867 + return;
65868 +
65869 + if (wanted >= acl->res[res].rlim_cur) {
65870 + unsigned long res_add;
65871 +
65872 + res_add = wanted + res_learn_bumps[res];
65873 +
65874 + acl->res[res].rlim_cur = res_add;
65875 +
65876 + if (wanted > acl->res[res].rlim_max)
65877 + acl->res[res].rlim_max = res_add;
65878 +
65879 + /* only log the subject filename, since resource logging is supported for
65880 + single-subject learning only */
65881 + rcu_read_lock();
65882 + cred = __task_cred(task);
65883 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
65884 + task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
65885 + acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
65886 + "", (unsigned long) res, &task->signal->saved_ip);
65887 + rcu_read_unlock();
65888 + }
65889 +
65890 + return;
65891 +}
65892 +EXPORT_SYMBOL(gr_learn_resource);
65893 +#endif
65894 +
65895 +#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
65896 +void
65897 +pax_set_initial_flags(struct linux_binprm *bprm)
65898 +{
65899 + struct task_struct *task = current;
65900 + struct acl_subject_label *proc;
65901 + unsigned long flags;
65902 +
65903 + if (unlikely(!(gr_status & GR_READY)))
65904 + return;
65905 +
65906 + flags = pax_get_flags(task);
65907 +
65908 + proc = task->acl;
65909 +
65910 + if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
65911 + flags &= ~MF_PAX_PAGEEXEC;
65912 + if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
65913 + flags &= ~MF_PAX_SEGMEXEC;
65914 + if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
65915 + flags &= ~MF_PAX_RANDMMAP;
65916 + if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
65917 + flags &= ~MF_PAX_EMUTRAMP;
65918 + if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
65919 + flags &= ~MF_PAX_MPROTECT;
65920 +
65921 + if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
65922 + flags |= MF_PAX_PAGEEXEC;
65923 + if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
65924 + flags |= MF_PAX_SEGMEXEC;
65925 + if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
65926 + flags |= MF_PAX_RANDMMAP;
65927 + if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
65928 + flags |= MF_PAX_EMUTRAMP;
65929 + if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
65930 + flags |= MF_PAX_MPROTECT;
65931 +
65932 + pax_set_flags(task, flags);
65933 +
65934 + return;
65935 +}
65936 +#endif
65937 +
65938 +int
65939 +gr_handle_proc_ptrace(struct task_struct *task)
65940 +{
65941 + struct file *filp;
65942 + struct task_struct *tmp = task;
65943 + struct task_struct *curtemp = current;
65944 + __u32 retmode;
65945 +
65946 +#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
65947 + if (unlikely(!(gr_status & GR_READY)))
65948 + return 0;
65949 +#endif
65950 +
65951 + read_lock(&tasklist_lock);
65952 + read_lock(&grsec_exec_file_lock);
65953 + filp = task->exec_file;
65954 +
65955 + while (task_pid_nr(tmp) > 0) {
65956 + if (tmp == curtemp)
65957 + break;
65958 + tmp = tmp->real_parent;
65959 + }
65960 +
65961 + if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
65962 + ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
65963 + read_unlock(&grsec_exec_file_lock);
65964 + read_unlock(&tasklist_lock);
65965 + return 1;
65966 + }
65967 +
65968 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
65969 + if (!(gr_status & GR_READY)) {
65970 + read_unlock(&grsec_exec_file_lock);
65971 + read_unlock(&tasklist_lock);
65972 + return 0;
65973 + }
65974 +#endif
65975 +
65976 + retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
65977 + read_unlock(&grsec_exec_file_lock);
65978 + read_unlock(&tasklist_lock);
65979 +
65980 + if (retmode & GR_NOPTRACE)
65981 + return 1;
65982 +
65983 + if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
65984 + && (current->acl != task->acl || (current->acl != current->role->root_label
65985 + && task_pid_nr(current) != task_pid_nr(task))))
65986 + return 1;
65987 +
65988 + return 0;
65989 +}
65990 +
65991 +void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
65992 +{
65993 + if (unlikely(!(gr_status & GR_READY)))
65994 + return;
65995 +
65996 + if (!(current->role->roletype & GR_ROLE_GOD))
65997 + return;
65998 +
65999 + seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
66000 + p->role->rolename, gr_task_roletype_to_char(p),
66001 + p->acl->filename);
66002 +}
66003 +
66004 +int
66005 +gr_handle_ptrace(struct task_struct *task, const long request)
66006 +{
66007 + struct task_struct *tmp = task;
66008 + struct task_struct *curtemp = current;
66009 + __u32 retmode;
66010 +
66011 +#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
66012 + if (unlikely(!(gr_status & GR_READY)))
66013 + return 0;
66014 +#endif
66015 + if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
66016 + read_lock(&tasklist_lock);
66017 + while (task_pid_nr(tmp) > 0) {
66018 + if (tmp == curtemp)
66019 + break;
66020 + tmp = tmp->real_parent;
66021 + }
66022 +
66023 + if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
66024 + ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
66025 + read_unlock(&tasklist_lock);
66026 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
66027 + return 1;
66028 + }
66029 + read_unlock(&tasklist_lock);
66030 + }
66031 +
66032 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
66033 + if (!(gr_status & GR_READY))
66034 + return 0;
66035 +#endif
66036 +
66037 + read_lock(&grsec_exec_file_lock);
66038 + if (unlikely(!task->exec_file)) {
66039 + read_unlock(&grsec_exec_file_lock);
66040 + return 0;
66041 + }
66042 +
66043 + retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
66044 + read_unlock(&grsec_exec_file_lock);
66045 +
66046 + if (retmode & GR_NOPTRACE) {
66047 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
66048 + return 1;
66049 + }
66050 +
66051 + if (retmode & GR_PTRACERD) {
66052 + switch (request) {
66053 + case PTRACE_SEIZE:
66054 + case PTRACE_POKETEXT:
66055 + case PTRACE_POKEDATA:
66056 + case PTRACE_POKEUSR:
66057 +#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
66058 + case PTRACE_SETREGS:
66059 + case PTRACE_SETFPREGS:
66060 +#endif
66061 +#ifdef CONFIG_X86
66062 + case PTRACE_SETFPXREGS:
66063 +#endif
66064 +#ifdef CONFIG_ALTIVEC
66065 + case PTRACE_SETVRREGS:
66066 +#endif
66067 + return 1;
66068 + default:
66069 + return 0;
66070 + }
66071 + } else if (!(current->acl->mode & GR_POVERRIDE) &&
66072 + !(current->role->roletype & GR_ROLE_GOD) &&
66073 + (current->acl != task->acl)) {
66074 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
66075 + return 1;
66076 + }
66077 +
66078 + return 0;
66079 +}
66080 +
66081 +static int is_writable_mmap(const struct file *filp)
66082 +{
66083 + struct task_struct *task = current;
66084 + struct acl_object_label *obj, *obj2;
66085 +
66086 + if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
66087 + !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))) {
66088 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
66089 + obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
66090 + task->role->root_label);
66091 + if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
66092 + gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
66093 + return 1;
66094 + }
66095 + }
66096 + return 0;
66097 +}
66098 +
66099 +int
66100 +gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
66101 +{
66102 + __u32 mode;
66103 +
66104 + if (unlikely(!file || !(prot & PROT_EXEC)))
66105 + return 1;
66106 +
66107 + if (is_writable_mmap(file))
66108 + return 0;
66109 +
66110 + mode =
66111 + gr_search_file(file->f_path.dentry,
66112 + GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
66113 + file->f_path.mnt);
66114 +
66115 + if (!gr_tpe_allow(file))
66116 + return 0;
66117 +
66118 + if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
66119 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
66120 + return 0;
66121 + } else if (unlikely(!(mode & GR_EXEC))) {
66122 + return 0;
66123 + } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
66124 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
66125 + return 1;
66126 + }
66127 +
66128 + return 1;
66129 +}
66130 +
66131 +int
66132 +gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
66133 +{
66134 + __u32 mode;
66135 +
66136 + if (unlikely(!file || !(prot & PROT_EXEC)))
66137 + return 1;
66138 +
66139 + if (is_writable_mmap(file))
66140 + return 0;
66141 +
66142 + mode =
66143 + gr_search_file(file->f_path.dentry,
66144 + GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
66145 + file->f_path.mnt);
66146 +
66147 + if (!gr_tpe_allow(file))
66148 + return 0;
66149 +
66150 + if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
66151 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
66152 + return 0;
66153 + } else if (unlikely(!(mode & GR_EXEC))) {
66154 + return 0;
66155 + } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
66156 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
66157 + return 1;
66158 + }
66159 +
66160 + return 1;
66161 +}
66162 +
66163 +void
66164 +gr_acl_handle_psacct(struct task_struct *task, const long code)
66165 +{
66166 + unsigned long runtime;
66167 + unsigned long cputime;
66168 + unsigned int wday, cday;
66169 + __u8 whr, chr;
66170 + __u8 wmin, cmin;
66171 + __u8 wsec, csec;
66172 + struct timespec timeval;
66173 +
66174 + if (unlikely(!(gr_status & GR_READY) || !task->acl ||
66175 + !(task->acl->mode & GR_PROCACCT)))
66176 + return;
66177 +
66178 + do_posix_clock_monotonic_gettime(&timeval);
66179 + runtime = timeval.tv_sec - task->start_time.tv_sec;
66180 + wday = runtime / (3600 * 24);
66181 + runtime -= wday * (3600 * 24);
66182 + whr = runtime / 3600;
66183 + runtime -= whr * 3600;
66184 + wmin = runtime / 60;
66185 + runtime -= wmin * 60;
66186 + wsec = runtime;
66187 +
66188 + cputime = (task->utime + task->stime) / HZ;
66189 + cday = cputime / (3600 * 24);
66190 + cputime -= cday * (3600 * 24);
66191 + chr = cputime / 3600;
66192 + cputime -= chr * 3600;
66193 + cmin = cputime / 60;
66194 + cputime -= cmin * 60;
66195 + csec = cputime;
66196 +
66197 + gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
66198 +
66199 + return;
66200 +}
66201 +
66202 +#ifdef CONFIG_TASKSTATS
66203 +int gr_is_taskstats_denied(int pid)
66204 +{
66205 + struct task_struct *task;
66206 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66207 + const struct cred *cred;
66208 +#endif
66209 + int ret = 0;
66210 +
66211 + /* restrict taskstats viewing to un-chrooted root users
66212 + who have the 'view' subject flag if the RBAC system is enabled
66213 + */
66214 +
66215 + rcu_read_lock();
66216 + read_lock(&tasklist_lock);
66217 + task = find_task_by_vpid(pid);
66218 + if (task) {
66219 +#ifdef CONFIG_GRKERNSEC_CHROOT
66220 + if (proc_is_chrooted(task))
66221 + ret = -EACCES;
66222 +#endif
66223 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66224 + cred = __task_cred(task);
66225 +#ifdef CONFIG_GRKERNSEC_PROC_USER
66226 + if (gr_is_global_nonroot(cred->uid))
66227 + ret = -EACCES;
66228 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66229 + if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
66230 + ret = -EACCES;
66231 +#endif
66232 +#endif
66233 + if (gr_status & GR_READY) {
66234 + if (!(task->acl->mode & GR_VIEW))
66235 + ret = -EACCES;
66236 + }
66237 + } else
66238 + ret = -ENOENT;
66239 +
66240 + read_unlock(&tasklist_lock);
66241 + rcu_read_unlock();
66242 +
66243 + return ret;
66244 +}
66245 +#endif
66246 +
66247 +/* AUXV entries are filled via a descendant of search_binary_handler
66248 + after we've already applied the subject for the target
66249 +*/
66250 +int gr_acl_enable_at_secure(void)
66251 +{
66252 + if (unlikely(!(gr_status & GR_READY)))
66253 + return 0;
66254 +
66255 + if (current->acl->mode & GR_ATSECURE)
66256 + return 1;
66257 +
66258 + return 0;
66259 +}
66260 +
66261 +int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
66262 +{
66263 + struct task_struct *task = current;
66264 + struct dentry *dentry = file->f_path.dentry;
66265 + struct vfsmount *mnt = file->f_path.mnt;
66266 + struct acl_object_label *obj, *tmp;
66267 + struct acl_subject_label *subj;
66268 + unsigned int bufsize;
66269 + int is_not_root;
66270 + char *path;
66271 + dev_t dev = __get_dev(dentry);
66272 +
66273 + if (unlikely(!(gr_status & GR_READY)))
66274 + return 1;
66275 +
66276 + if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
66277 + return 1;
66278 +
66279 + /* ignore Eric Biederman */
66280 + if (IS_PRIVATE(dentry->d_inode))
66281 + return 1;
66282 +
66283 + subj = task->acl;
66284 + read_lock(&gr_inode_lock);
66285 + do {
66286 + obj = lookup_acl_obj_label(ino, dev, subj);
66287 + if (obj != NULL) {
66288 + read_unlock(&gr_inode_lock);
66289 + return (obj->mode & GR_FIND) ? 1 : 0;
66290 + }
66291 + } while ((subj = subj->parent_subject));
66292 + read_unlock(&gr_inode_lock);
66293 +
66294 + /* this is purely an optimization since we're looking for an object
66295 + for the directory we're doing a readdir on
66296 + if it's possible for any globbed object to match the entry we're
66297 + filling into the directory, then the object we find here will be
66298 + an anchor point with attached globbed objects
66299 + */
66300 + obj = chk_obj_label_noglob(dentry, mnt, task->acl);
66301 + if (obj->globbed == NULL)
66302 + return (obj->mode & GR_FIND) ? 1 : 0;
66303 +
66304 + is_not_root = ((obj->filename[0] == '/') &&
66305 + (obj->filename[1] == '\0')) ? 0 : 1;
66306 + bufsize = PAGE_SIZE - namelen - is_not_root;
66307 +
66308 + /* check bufsize > PAGE_SIZE || bufsize == 0 */
66309 + if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
66310 + return 1;
66311 +
66312 + preempt_disable();
66313 + path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
66314 + bufsize);
66315 +
66316 + bufsize = strlen(path);
66317 +
66318 + /* if base is "/", don't append an additional slash */
66319 + if (is_not_root)
66320 + *(path + bufsize) = '/';
66321 + memcpy(path + bufsize + is_not_root, name, namelen);
66322 + *(path + bufsize + namelen + is_not_root) = '\0';
66323 +
66324 + tmp = obj->globbed;
66325 + while (tmp) {
66326 + if (!glob_match(tmp->filename, path)) {
66327 + preempt_enable();
66328 + return (tmp->mode & GR_FIND) ? 1 : 0;
66329 + }
66330 + tmp = tmp->next;
66331 + }
66332 + preempt_enable();
66333 + return (obj->mode & GR_FIND) ? 1 : 0;
66334 +}
66335 +
66336 +void gr_put_exec_file(struct task_struct *task)
66337 +{
66338 + struct file *filp;
66339 +
66340 + write_lock(&grsec_exec_file_lock);
66341 + filp = task->exec_file;
66342 + task->exec_file = NULL;
66343 + write_unlock(&grsec_exec_file_lock);
66344 +
66345 + if (filp)
66346 + fput(filp);
66347 +
66348 + return;
66349 +}
66350 +
66351 +
66352 +#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
66353 +EXPORT_SYMBOL(gr_acl_is_enabled);
66354 +#endif
66355 +#ifdef CONFIG_SECURITY
66356 +EXPORT_SYMBOL(gr_check_user_change);
66357 +EXPORT_SYMBOL(gr_check_group_change);
66358 +#endif
66359 +
66360 diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
66361 new file mode 100644
66362 index 0000000..18ffbbd
66363 --- /dev/null
66364 +++ b/grsecurity/gracl_alloc.c
66365 @@ -0,0 +1,105 @@
66366 +#include <linux/kernel.h>
66367 +#include <linux/mm.h>
66368 +#include <linux/slab.h>
66369 +#include <linux/vmalloc.h>
66370 +#include <linux/gracl.h>
66371 +#include <linux/grsecurity.h>
66372 +
66373 +static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
66374 +struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
66375 +
66376 +static __inline__ int
66377 +alloc_pop(void)
66378 +{
66379 + if (current_alloc_state->alloc_stack_next == 1)
66380 + return 0;
66381 +
66382 + kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
66383 +
66384 + current_alloc_state->alloc_stack_next--;
66385 +
66386 + return 1;
66387 +}
66388 +
66389 +static __inline__ int
66390 +alloc_push(void *buf)
66391 +{
66392 + if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
66393 + return 1;
66394 +
66395 + current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
66396 +
66397 + current_alloc_state->alloc_stack_next++;
66398 +
66399 + return 0;
66400 +}
66401 +
66402 +void *
66403 +acl_alloc(unsigned long len)
66404 +{
66405 + void *ret = NULL;
66406 +
66407 + if (!len || len > PAGE_SIZE)
66408 + goto out;
66409 +
66410 + ret = kmalloc(len, GFP_KERNEL);
66411 +
66412 + if (ret) {
66413 + if (alloc_push(ret)) {
66414 + kfree(ret);
66415 + ret = NULL;
66416 + }
66417 + }
66418 +
66419 +out:
66420 + return ret;
66421 +}
66422 +
66423 +void *
66424 +acl_alloc_num(unsigned long num, unsigned long len)
66425 +{
66426 + if (!len || (num > (PAGE_SIZE / len)))
66427 + return NULL;
66428 +
66429 + return acl_alloc(num * len);
66430 +}
66431 +
66432 +void
66433 +acl_free_all(void)
66434 +{
66435 + if (!current_alloc_state->alloc_stack)
66436 + return;
66437 +
66438 + while (alloc_pop()) ;
66439 +
66440 + if (current_alloc_state->alloc_stack) {
66441 + if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
66442 + kfree(current_alloc_state->alloc_stack);
66443 + else
66444 + vfree(current_alloc_state->alloc_stack);
66445 + }
66446 +
66447 + current_alloc_state->alloc_stack = NULL;
66448 + current_alloc_state->alloc_stack_size = 1;
66449 + current_alloc_state->alloc_stack_next = 1;
66450 +
66451 + return;
66452 +}
66453 +
66454 +int
66455 +acl_alloc_stack_init(unsigned long size)
66456 +{
66457 + if ((size * sizeof (void *)) <= PAGE_SIZE)
66458 + current_alloc_state->alloc_stack =
66459 + (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
66460 + else
66461 + current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
66462 +
66463 + current_alloc_state->alloc_stack_size = size;
66464 + current_alloc_state->alloc_stack_next = 1;
66465 +
66466 + if (!current_alloc_state->alloc_stack)
66467 + return 0;
66468 + else
66469 + return 1;
66470 +}
66471 diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
66472 new file mode 100644
66473 index 0000000..bdd51ea
66474 --- /dev/null
66475 +++ b/grsecurity/gracl_cap.c
66476 @@ -0,0 +1,110 @@
66477 +#include <linux/kernel.h>
66478 +#include <linux/module.h>
66479 +#include <linux/sched.h>
66480 +#include <linux/gracl.h>
66481 +#include <linux/grsecurity.h>
66482 +#include <linux/grinternal.h>
66483 +
66484 +extern const char *captab_log[];
66485 +extern int captab_log_entries;
66486 +
66487 +int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
66488 +{
66489 + struct acl_subject_label *curracl;
66490 + kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
66491 + kernel_cap_t cap_audit = __cap_empty_set;
66492 +
66493 + if (!gr_acl_is_enabled())
66494 + return 1;
66495 +
66496 + curracl = task->acl;
66497 +
66498 + cap_drop = curracl->cap_lower;
66499 + cap_mask = curracl->cap_mask;
66500 + cap_audit = curracl->cap_invert_audit;
66501 +
66502 + while ((curracl = curracl->parent_subject)) {
66503 + /* if the cap isn't specified in the current computed mask but is specified in the
66504 + current level subject, and is lowered in the current level subject, then add
66505 + it to the set of dropped capabilities
66506 + otherwise, add the current level subject's mask to the current computed mask
66507 + */
66508 + if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
66509 + cap_raise(cap_mask, cap);
66510 + if (cap_raised(curracl->cap_lower, cap))
66511 + cap_raise(cap_drop, cap);
66512 + if (cap_raised(curracl->cap_invert_audit, cap))
66513 + cap_raise(cap_audit, cap);
66514 + }
66515 + }
66516 +
66517 + if (!cap_raised(cap_drop, cap)) {
66518 + if (cap_raised(cap_audit, cap))
66519 + gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
66520 + return 1;
66521 + }
66522 +
66523 + curracl = task->acl;
66524 +
66525 + if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
66526 + && cap_raised(cred->cap_effective, cap)) {
66527 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
66528 + task->role->roletype, GR_GLOBAL_UID(cred->uid),
66529 + GR_GLOBAL_GID(cred->gid), task->exec_file ?
66530 + gr_to_filename(task->exec_file->f_path.dentry,
66531 + task->exec_file->f_path.mnt) : curracl->filename,
66532 + curracl->filename, 0UL,
66533 + 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
66534 + return 1;
66535 + }
66536 +
66537 + if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
66538 + gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
66539 +
66540 + return 0;
66541 +}
66542 +
66543 +int
66544 +gr_acl_is_capable(const int cap)
66545 +{
66546 + return gr_task_acl_is_capable(current, current_cred(), cap);
66547 +}
66548 +
66549 +int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
66550 +{
66551 + struct acl_subject_label *curracl;
66552 + kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
66553 +
66554 + if (!gr_acl_is_enabled())
66555 + return 1;
66556 +
66557 + curracl = task->acl;
66558 +
66559 + cap_drop = curracl->cap_lower;
66560 + cap_mask = curracl->cap_mask;
66561 +
66562 + while ((curracl = curracl->parent_subject)) {
66563 + /* if the cap isn't specified in the current computed mask but is specified in the
66564 + current level subject, and is lowered in the current level subject, then add
66565 + it to the set of dropped capabilities
66566 + otherwise, add the current level subject's mask to the current computed mask
66567 + */
66568 + if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
66569 + cap_raise(cap_mask, cap);
66570 + if (cap_raised(curracl->cap_lower, cap))
66571 + cap_raise(cap_drop, cap);
66572 + }
66573 + }
66574 +
66575 + if (!cap_raised(cap_drop, cap))
66576 + return 1;
66577 +
66578 + return 0;
66579 +}
66580 +
66581 +int
66582 +gr_acl_is_capable_nolog(const int cap)
66583 +{
66584 + return gr_task_acl_is_capable_nolog(current, cap);
66585 +}
66586 +
66587 diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
66588 new file mode 100644
66589 index 0000000..ca25605
66590 --- /dev/null
66591 +++ b/grsecurity/gracl_compat.c
66592 @@ -0,0 +1,270 @@
66593 +#include <linux/kernel.h>
66594 +#include <linux/gracl.h>
66595 +#include <linux/compat.h>
66596 +#include <linux/gracl_compat.h>
66597 +
66598 +#include <asm/uaccess.h>
66599 +
66600 +int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
66601 +{
66602 + struct gr_arg_wrapper_compat uwrapcompat;
66603 +
66604 + if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
66605 + return -EFAULT;
66606 +
66607 + if (((uwrapcompat.version != GRSECURITY_VERSION) &&
66608 + (uwrapcompat.version != 0x2901)) ||
66609 + (uwrapcompat.size != sizeof(struct gr_arg_compat)))
66610 + return -EINVAL;
66611 +
66612 + uwrap->arg = compat_ptr(uwrapcompat.arg);
66613 + uwrap->version = uwrapcompat.version;
66614 + uwrap->size = sizeof(struct gr_arg);
66615 +
66616 + return 0;
66617 +}
66618 +
66619 +int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
66620 +{
66621 + struct gr_arg_compat argcompat;
66622 +
66623 + if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
66624 + return -EFAULT;
66625 +
66626 + arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
66627 + arg->role_db.num_pointers = argcompat.role_db.num_pointers;
66628 + arg->role_db.num_roles = argcompat.role_db.num_roles;
66629 + arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
66630 + arg->role_db.num_subjects = argcompat.role_db.num_subjects;
66631 + arg->role_db.num_objects = argcompat.role_db.num_objects;
66632 +
66633 + memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
66634 + memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
66635 + memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
66636 + memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
66637 + arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
66638 + arg->segv_device = argcompat.segv_device;
66639 + arg->segv_inode = argcompat.segv_inode;
66640 + arg->segv_uid = argcompat.segv_uid;
66641 + arg->num_sprole_pws = argcompat.num_sprole_pws;
66642 + arg->mode = argcompat.mode;
66643 +
66644 + return 0;
66645 +}
66646 +
66647 +int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
66648 +{
66649 + struct acl_object_label_compat objcompat;
66650 +
66651 + if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
66652 + return -EFAULT;
66653 +
66654 + obj->filename = compat_ptr(objcompat.filename);
66655 + obj->inode = objcompat.inode;
66656 + obj->device = objcompat.device;
66657 + obj->mode = objcompat.mode;
66658 +
66659 + obj->nested = compat_ptr(objcompat.nested);
66660 + obj->globbed = compat_ptr(objcompat.globbed);
66661 +
66662 + obj->prev = compat_ptr(objcompat.prev);
66663 + obj->next = compat_ptr(objcompat.next);
66664 +
66665 + return 0;
66666 +}
66667 +
66668 +int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
66669 +{
66670 + unsigned int i;
66671 + struct acl_subject_label_compat subjcompat;
66672 +
66673 + if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
66674 + return -EFAULT;
66675 +
66676 + subj->filename = compat_ptr(subjcompat.filename);
66677 + subj->inode = subjcompat.inode;
66678 + subj->device = subjcompat.device;
66679 + subj->mode = subjcompat.mode;
66680 + subj->cap_mask = subjcompat.cap_mask;
66681 + subj->cap_lower = subjcompat.cap_lower;
66682 + subj->cap_invert_audit = subjcompat.cap_invert_audit;
66683 +
66684 + for (i = 0; i < GR_NLIMITS; i++) {
66685 + if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
66686 + subj->res[i].rlim_cur = RLIM_INFINITY;
66687 + else
66688 + subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
66689 + if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
66690 + subj->res[i].rlim_max = RLIM_INFINITY;
66691 + else
66692 + subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
66693 + }
66694 + subj->resmask = subjcompat.resmask;
66695 +
66696 + subj->user_trans_type = subjcompat.user_trans_type;
66697 + subj->group_trans_type = subjcompat.group_trans_type;
66698 + subj->user_transitions = compat_ptr(subjcompat.user_transitions);
66699 + subj->group_transitions = compat_ptr(subjcompat.group_transitions);
66700 + subj->user_trans_num = subjcompat.user_trans_num;
66701 + subj->group_trans_num = subjcompat.group_trans_num;
66702 +
66703 + memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
66704 + memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
66705 + subj->ip_type = subjcompat.ip_type;
66706 + subj->ips = compat_ptr(subjcompat.ips);
66707 + subj->ip_num = subjcompat.ip_num;
66708 + subj->inaddr_any_override = subjcompat.inaddr_any_override;
66709 +
66710 + subj->crashes = subjcompat.crashes;
66711 + subj->expires = subjcompat.expires;
66712 +
66713 + subj->parent_subject = compat_ptr(subjcompat.parent_subject);
66714 + subj->hash = compat_ptr(subjcompat.hash);
66715 + subj->prev = compat_ptr(subjcompat.prev);
66716 + subj->next = compat_ptr(subjcompat.next);
66717 +
66718 + subj->obj_hash = compat_ptr(subjcompat.obj_hash);
66719 + subj->obj_hash_size = subjcompat.obj_hash_size;
66720 + subj->pax_flags = subjcompat.pax_flags;
66721 +
66722 + return 0;
66723 +}
66724 +
66725 +int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
66726 +{
66727 + struct acl_role_label_compat rolecompat;
66728 +
66729 + if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
66730 + return -EFAULT;
66731 +
66732 + role->rolename = compat_ptr(rolecompat.rolename);
66733 + role->uidgid = rolecompat.uidgid;
66734 + role->roletype = rolecompat.roletype;
66735 +
66736 + role->auth_attempts = rolecompat.auth_attempts;
66737 + role->expires = rolecompat.expires;
66738 +
66739 + role->root_label = compat_ptr(rolecompat.root_label);
66740 + role->hash = compat_ptr(rolecompat.hash);
66741 +
66742 + role->prev = compat_ptr(rolecompat.prev);
66743 + role->next = compat_ptr(rolecompat.next);
66744 +
66745 + role->transitions = compat_ptr(rolecompat.transitions);
66746 + role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
66747 + role->domain_children = compat_ptr(rolecompat.domain_children);
66748 + role->domain_child_num = rolecompat.domain_child_num;
66749 +
66750 + role->umask = rolecompat.umask;
66751 +
66752 + role->subj_hash = compat_ptr(rolecompat.subj_hash);
66753 + role->subj_hash_size = rolecompat.subj_hash_size;
66754 +
66755 + return 0;
66756 +}
66757 +
66758 +int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
66759 +{
66760 + struct role_allowed_ip_compat roleip_compat;
66761 +
66762 + if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
66763 + return -EFAULT;
66764 +
66765 + roleip->addr = roleip_compat.addr;
66766 + roleip->netmask = roleip_compat.netmask;
66767 +
66768 + roleip->prev = compat_ptr(roleip_compat.prev);
66769 + roleip->next = compat_ptr(roleip_compat.next);
66770 +
66771 + return 0;
66772 +}
66773 +
66774 +int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
66775 +{
66776 + struct role_transition_compat trans_compat;
66777 +
66778 + if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
66779 + return -EFAULT;
66780 +
66781 + trans->rolename = compat_ptr(trans_compat.rolename);
66782 +
66783 + trans->prev = compat_ptr(trans_compat.prev);
66784 + trans->next = compat_ptr(trans_compat.next);
66785 +
66786 + return 0;
66787 +
66788 +}
66789 +
66790 +int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
66791 +{
66792 + struct gr_hash_struct_compat hash_compat;
66793 +
66794 + if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
66795 + return -EFAULT;
66796 +
66797 + hash->table = compat_ptr(hash_compat.table);
66798 + hash->nametable = compat_ptr(hash_compat.nametable);
66799 + hash->first = compat_ptr(hash_compat.first);
66800 +
66801 + hash->table_size = hash_compat.table_size;
66802 + hash->used_size = hash_compat.used_size;
66803 +
66804 + hash->type = hash_compat.type;
66805 +
66806 + return 0;
66807 +}
66808 +
66809 +int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
66810 +{
66811 + compat_uptr_t ptrcompat;
66812 +
66813 + if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
66814 + return -EFAULT;
66815 +
66816 + *(void **)ptr = compat_ptr(ptrcompat);
66817 +
66818 + return 0;
66819 +}
66820 +
66821 +int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
66822 +{
66823 + struct acl_ip_label_compat ip_compat;
66824 +
66825 + if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
66826 + return -EFAULT;
66827 +
66828 + ip->iface = compat_ptr(ip_compat.iface);
66829 + ip->addr = ip_compat.addr;
66830 + ip->netmask = ip_compat.netmask;
66831 + ip->low = ip_compat.low;
66832 + ip->high = ip_compat.high;
66833 + ip->mode = ip_compat.mode;
66834 + ip->type = ip_compat.type;
66835 +
66836 + memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
66837 +
66838 + ip->prev = compat_ptr(ip_compat.prev);
66839 + ip->next = compat_ptr(ip_compat.next);
66840 +
66841 + return 0;
66842 +}
66843 +
66844 +int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
66845 +{
66846 + struct sprole_pw_compat pw_compat;
66847 +
66848 + if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
66849 + return -EFAULT;
66850 +
66851 + pw->rolename = compat_ptr(pw_compat.rolename);
66852 + memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
66853 + memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
66854 +
66855 + return 0;
66856 +}
66857 +
66858 +size_t get_gr_arg_wrapper_size_compat(void)
66859 +{
66860 + return sizeof(struct gr_arg_wrapper_compat);
66861 +}
66862 +
66863 diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
66864 new file mode 100644
66865 index 0000000..deb6f3b
66866 --- /dev/null
66867 +++ b/grsecurity/gracl_fs.c
66868 @@ -0,0 +1,437 @@
66869 +#include <linux/kernel.h>
66870 +#include <linux/sched.h>
66871 +#include <linux/types.h>
66872 +#include <linux/fs.h>
66873 +#include <linux/file.h>
66874 +#include <linux/stat.h>
66875 +#include <linux/grsecurity.h>
66876 +#include <linux/grinternal.h>
66877 +#include <linux/gracl.h>
66878 +
66879 +umode_t
66880 +gr_acl_umask(void)
66881 +{
66882 + if (unlikely(!gr_acl_is_enabled()))
66883 + return 0;
66884 +
66885 + return current->role->umask;
66886 +}
66887 +
66888 +__u32
66889 +gr_acl_handle_hidden_file(const struct dentry * dentry,
66890 + const struct vfsmount * mnt)
66891 +{
66892 + __u32 mode;
66893 +
66894 + if (unlikely(!dentry->d_inode))
66895 + return GR_FIND;
66896 +
66897 + mode =
66898 + gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
66899 +
66900 + if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
66901 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
66902 + return mode;
66903 + } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
66904 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
66905 + return 0;
66906 + } else if (unlikely(!(mode & GR_FIND)))
66907 + return 0;
66908 +
66909 + return GR_FIND;
66910 +}
66911 +
66912 +__u32
66913 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
66914 + int acc_mode)
66915 +{
66916 + __u32 reqmode = GR_FIND;
66917 + __u32 mode;
66918 +
66919 + if (unlikely(!dentry->d_inode))
66920 + return reqmode;
66921 +
66922 + if (acc_mode & MAY_APPEND)
66923 + reqmode |= GR_APPEND;
66924 + else if (acc_mode & MAY_WRITE)
66925 + reqmode |= GR_WRITE;
66926 + if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
66927 + reqmode |= GR_READ;
66928 +
66929 + mode =
66930 + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
66931 + mnt);
66932 +
66933 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
66934 + gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
66935 + reqmode & GR_READ ? " reading" : "",
66936 + reqmode & GR_WRITE ? " writing" : reqmode &
66937 + GR_APPEND ? " appending" : "");
66938 + return reqmode;
66939 + } else
66940 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
66941 + {
66942 + gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
66943 + reqmode & GR_READ ? " reading" : "",
66944 + reqmode & GR_WRITE ? " writing" : reqmode &
66945 + GR_APPEND ? " appending" : "");
66946 + return 0;
66947 + } else if (unlikely((mode & reqmode) != reqmode))
66948 + return 0;
66949 +
66950 + return reqmode;
66951 +}
66952 +
66953 +__u32
66954 +gr_acl_handle_creat(const struct dentry * dentry,
66955 + const struct dentry * p_dentry,
66956 + const struct vfsmount * p_mnt, int open_flags, int acc_mode,
66957 + const int imode)
66958 +{
66959 + __u32 reqmode = GR_WRITE | GR_CREATE;
66960 + __u32 mode;
66961 +
66962 + if (acc_mode & MAY_APPEND)
66963 + reqmode |= GR_APPEND;
66964 + // if a directory was required or the directory already exists, then
66965 + // don't count this open as a read
66966 + if ((acc_mode & MAY_READ) &&
66967 + !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
66968 + reqmode |= GR_READ;
66969 + if ((open_flags & O_CREAT) &&
66970 + ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
66971 + reqmode |= GR_SETID;
66972 +
66973 + mode =
66974 + gr_check_create(dentry, p_dentry, p_mnt,
66975 + reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
66976 +
66977 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
66978 + gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
66979 + reqmode & GR_READ ? " reading" : "",
66980 + reqmode & GR_WRITE ? " writing" : reqmode &
66981 + GR_APPEND ? " appending" : "");
66982 + return reqmode;
66983 + } else
66984 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
66985 + {
66986 + gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
66987 + reqmode & GR_READ ? " reading" : "",
66988 + reqmode & GR_WRITE ? " writing" : reqmode &
66989 + GR_APPEND ? " appending" : "");
66990 + return 0;
66991 + } else if (unlikely((mode & reqmode) != reqmode))
66992 + return 0;
66993 +
66994 + return reqmode;
66995 +}
66996 +
66997 +__u32
66998 +gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
66999 + const int fmode)
67000 +{
67001 + __u32 mode, reqmode = GR_FIND;
67002 +
67003 + if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
67004 + reqmode |= GR_EXEC;
67005 + if (fmode & S_IWOTH)
67006 + reqmode |= GR_WRITE;
67007 + if (fmode & S_IROTH)
67008 + reqmode |= GR_READ;
67009 +
67010 + mode =
67011 + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
67012 + mnt);
67013 +
67014 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
67015 + gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
67016 + reqmode & GR_READ ? " reading" : "",
67017 + reqmode & GR_WRITE ? " writing" : "",
67018 + reqmode & GR_EXEC ? " executing" : "");
67019 + return reqmode;
67020 + } else
67021 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
67022 + {
67023 + gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
67024 + reqmode & GR_READ ? " reading" : "",
67025 + reqmode & GR_WRITE ? " writing" : "",
67026 + reqmode & GR_EXEC ? " executing" : "");
67027 + return 0;
67028 + } else if (unlikely((mode & reqmode) != reqmode))
67029 + return 0;
67030 +
67031 + return reqmode;
67032 +}
67033 +
67034 +static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
67035 +{
67036 + __u32 mode;
67037 +
67038 + mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
67039 +
67040 + if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
67041 + gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
67042 + return mode;
67043 + } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
67044 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
67045 + return 0;
67046 + } else if (unlikely((mode & (reqmode)) != (reqmode)))
67047 + return 0;
67048 +
67049 + return (reqmode);
67050 +}
67051 +
67052 +__u32
67053 +gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
67054 +{
67055 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
67056 +}
67057 +
67058 +__u32
67059 +gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
67060 +{
67061 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
67062 +}
67063 +
67064 +__u32
67065 +gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
67066 +{
67067 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
67068 +}
67069 +
67070 +__u32
67071 +gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
67072 +{
67073 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
67074 +}
67075 +
67076 +__u32
67077 +gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
67078 + umode_t *modeptr)
67079 +{
67080 + umode_t mode;
67081 +
67082 + *modeptr &= ~gr_acl_umask();
67083 + mode = *modeptr;
67084 +
67085 + if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
67086 + return 1;
67087 +
67088 + if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
67089 + ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
67090 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
67091 + GR_CHMOD_ACL_MSG);
67092 + } else {
67093 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
67094 + }
67095 +}
67096 +
67097 +__u32
67098 +gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
67099 +{
67100 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
67101 +}
67102 +
67103 +__u32
67104 +gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
67105 +{
67106 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
67107 +}
67108 +
67109 +__u32
67110 +gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
67111 +{
67112 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
67113 +}
67114 +
67115 +__u32
67116 +gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
67117 +{
67118 + return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
67119 +}
67120 +
67121 +__u32
67122 +gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
67123 +{
67124 + return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
67125 + GR_UNIXCONNECT_ACL_MSG);
67126 +}
67127 +
67128 +/* hardlinks require at minimum create and link permission,
67129 + any additional privilege required is based on the
67130 + privilege of the file being linked to
67131 +*/
67132 +__u32
67133 +gr_acl_handle_link(const struct dentry * new_dentry,
67134 + const struct dentry * parent_dentry,
67135 + const struct vfsmount * parent_mnt,
67136 + const struct dentry * old_dentry,
67137 + const struct vfsmount * old_mnt, const struct filename *to)
67138 +{
67139 + __u32 mode;
67140 + __u32 needmode = GR_CREATE | GR_LINK;
67141 + __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
67142 +
67143 + mode =
67144 + gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
67145 + old_mnt);
67146 +
67147 + if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
67148 + gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
67149 + return mode;
67150 + } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
67151 + gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
67152 + return 0;
67153 + } else if (unlikely((mode & needmode) != needmode))
67154 + return 0;
67155 +
67156 + return 1;
67157 +}
67158 +
67159 +__u32
67160 +gr_acl_handle_symlink(const struct dentry * new_dentry,
67161 + const struct dentry * parent_dentry,
67162 + const struct vfsmount * parent_mnt, const struct filename *from)
67163 +{
67164 + __u32 needmode = GR_WRITE | GR_CREATE;
67165 + __u32 mode;
67166 +
67167 + mode =
67168 + gr_check_create(new_dentry, parent_dentry, parent_mnt,
67169 + GR_CREATE | GR_AUDIT_CREATE |
67170 + GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
67171 +
67172 + if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
67173 + gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
67174 + return mode;
67175 + } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
67176 + gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
67177 + return 0;
67178 + } else if (unlikely((mode & needmode) != needmode))
67179 + return 0;
67180 +
67181 + return (GR_WRITE | GR_CREATE);
67182 +}
67183 +
67184 +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)
67185 +{
67186 + __u32 mode;
67187 +
67188 + mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
67189 +
67190 + if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
67191 + gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
67192 + return mode;
67193 + } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
67194 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
67195 + return 0;
67196 + } else if (unlikely((mode & (reqmode)) != (reqmode)))
67197 + return 0;
67198 +
67199 + return (reqmode);
67200 +}
67201 +
67202 +__u32
67203 +gr_acl_handle_mknod(const struct dentry * new_dentry,
67204 + const struct dentry * parent_dentry,
67205 + const struct vfsmount * parent_mnt,
67206 + const int mode)
67207 +{
67208 + __u32 reqmode = GR_WRITE | GR_CREATE;
67209 + if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
67210 + reqmode |= GR_SETID;
67211 +
67212 + return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
67213 + reqmode, GR_MKNOD_ACL_MSG);
67214 +}
67215 +
67216 +__u32
67217 +gr_acl_handle_mkdir(const struct dentry *new_dentry,
67218 + const struct dentry *parent_dentry,
67219 + const struct vfsmount *parent_mnt)
67220 +{
67221 + return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
67222 + GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
67223 +}
67224 +
67225 +#define RENAME_CHECK_SUCCESS(old, new) \
67226 + (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
67227 + ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
67228 +
67229 +int
67230 +gr_acl_handle_rename(struct dentry *new_dentry,
67231 + struct dentry *parent_dentry,
67232 + const struct vfsmount *parent_mnt,
67233 + struct dentry *old_dentry,
67234 + struct inode *old_parent_inode,
67235 + struct vfsmount *old_mnt, const struct filename *newname)
67236 +{
67237 + __u32 comp1, comp2;
67238 + int error = 0;
67239 +
67240 + if (unlikely(!gr_acl_is_enabled()))
67241 + return 0;
67242 +
67243 + if (!new_dentry->d_inode) {
67244 + comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
67245 + GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
67246 + GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
67247 + comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
67248 + GR_DELETE | GR_AUDIT_DELETE |
67249 + GR_AUDIT_READ | GR_AUDIT_WRITE |
67250 + GR_SUPPRESS, old_mnt);
67251 + } else {
67252 + comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
67253 + GR_CREATE | GR_DELETE |
67254 + GR_AUDIT_CREATE | GR_AUDIT_DELETE |
67255 + GR_AUDIT_READ | GR_AUDIT_WRITE |
67256 + GR_SUPPRESS, parent_mnt);
67257 + comp2 =
67258 + gr_search_file(old_dentry,
67259 + GR_READ | GR_WRITE | GR_AUDIT_READ |
67260 + GR_DELETE | GR_AUDIT_DELETE |
67261 + GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
67262 + }
67263 +
67264 + if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
67265 + ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
67266 + gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
67267 + else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
67268 + && !(comp2 & GR_SUPPRESS)) {
67269 + gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
67270 + error = -EACCES;
67271 + } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
67272 + error = -EACCES;
67273 +
67274 + return error;
67275 +}
67276 +
67277 +void
67278 +gr_acl_handle_exit(void)
67279 +{
67280 + u16 id;
67281 + char *rolename;
67282 +
67283 + if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
67284 + !(current->role->roletype & GR_ROLE_PERSIST))) {
67285 + id = current->acl_role_id;
67286 + rolename = current->role->rolename;
67287 + gr_set_acls(1);
67288 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
67289 + }
67290 +
67291 + gr_put_exec_file(current);
67292 + return;
67293 +}
67294 +
67295 +int
67296 +gr_acl_handle_procpidmem(const struct task_struct *task)
67297 +{
67298 + if (unlikely(!gr_acl_is_enabled()))
67299 + return 0;
67300 +
67301 + if (task != current && task->acl->mode & GR_PROTPROCFD)
67302 + return -EACCES;
67303 +
67304 + return 0;
67305 +}
67306 diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
67307 new file mode 100644
67308 index 0000000..f056b81
67309 --- /dev/null
67310 +++ b/grsecurity/gracl_ip.c
67311 @@ -0,0 +1,386 @@
67312 +#include <linux/kernel.h>
67313 +#include <asm/uaccess.h>
67314 +#include <asm/errno.h>
67315 +#include <net/sock.h>
67316 +#include <linux/file.h>
67317 +#include <linux/fs.h>
67318 +#include <linux/net.h>
67319 +#include <linux/in.h>
67320 +#include <linux/skbuff.h>
67321 +#include <linux/ip.h>
67322 +#include <linux/udp.h>
67323 +#include <linux/types.h>
67324 +#include <linux/sched.h>
67325 +#include <linux/netdevice.h>
67326 +#include <linux/inetdevice.h>
67327 +#include <linux/gracl.h>
67328 +#include <linux/grsecurity.h>
67329 +#include <linux/grinternal.h>
67330 +
67331 +#define GR_BIND 0x01
67332 +#define GR_CONNECT 0x02
67333 +#define GR_INVERT 0x04
67334 +#define GR_BINDOVERRIDE 0x08
67335 +#define GR_CONNECTOVERRIDE 0x10
67336 +#define GR_SOCK_FAMILY 0x20
67337 +
67338 +static const char * gr_protocols[IPPROTO_MAX] = {
67339 + "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
67340 + "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
67341 + "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
67342 + "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
67343 + "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
67344 + "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
67345 + "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
67346 + "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
67347 + "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
67348 + "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
67349 + "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
67350 + "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
67351 + "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
67352 + "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
67353 + "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
67354 + "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
67355 + "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
67356 + "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
67357 + "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
67358 + "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
67359 + "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
67360 + "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
67361 + "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
67362 + "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
67363 + "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
67364 + "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
67365 + "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
67366 + "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
67367 + "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
67368 + "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
67369 + "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
67370 + "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
67371 + };
67372 +
67373 +static const char * gr_socktypes[SOCK_MAX] = {
67374 + "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
67375 + "unknown:7", "unknown:8", "unknown:9", "packet"
67376 + };
67377 +
67378 +static const char * gr_sockfamilies[AF_MAX+1] = {
67379 + "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
67380 + "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
67381 + "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
67382 + "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
67383 + };
67384 +
67385 +const char *
67386 +gr_proto_to_name(unsigned char proto)
67387 +{
67388 + return gr_protocols[proto];
67389 +}
67390 +
67391 +const char *
67392 +gr_socktype_to_name(unsigned char type)
67393 +{
67394 + return gr_socktypes[type];
67395 +}
67396 +
67397 +const char *
67398 +gr_sockfamily_to_name(unsigned char family)
67399 +{
67400 + return gr_sockfamilies[family];
67401 +}
67402 +
67403 +extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
67404 +
67405 +int
67406 +gr_search_socket(const int domain, const int type, const int protocol)
67407 +{
67408 + struct acl_subject_label *curr;
67409 + const struct cred *cred = current_cred();
67410 +
67411 + if (unlikely(!gr_acl_is_enabled()))
67412 + goto exit;
67413 +
67414 + if ((domain < 0) || (type < 0) || (protocol < 0) ||
67415 + (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
67416 + goto exit; // let the kernel handle it
67417 +
67418 + curr = current->acl;
67419 +
67420 + if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
67421 + /* the family is allowed, if this is PF_INET allow it only if
67422 + the extra sock type/protocol checks pass */
67423 + if (domain == PF_INET)
67424 + goto inet_check;
67425 + goto exit;
67426 + } else {
67427 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
67428 + __u32 fakeip = 0;
67429 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
67430 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
67431 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
67432 + gr_to_filename(current->exec_file->f_path.dentry,
67433 + current->exec_file->f_path.mnt) :
67434 + curr->filename, curr->filename,
67435 + &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
67436 + &current->signal->saved_ip);
67437 + goto exit;
67438 + }
67439 + goto exit_fail;
67440 + }
67441 +
67442 +inet_check:
67443 + /* the rest of this checking is for IPv4 only */
67444 + if (!curr->ips)
67445 + goto exit;
67446 +
67447 + if ((curr->ip_type & (1U << type)) &&
67448 + (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
67449 + goto exit;
67450 +
67451 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
67452 + /* we don't place acls on raw sockets , and sometimes
67453 + dgram/ip sockets are opened for ioctl and not
67454 + bind/connect, so we'll fake a bind learn log */
67455 + if (type == SOCK_RAW || type == SOCK_PACKET) {
67456 + __u32 fakeip = 0;
67457 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
67458 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
67459 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
67460 + gr_to_filename(current->exec_file->f_path.dentry,
67461 + current->exec_file->f_path.mnt) :
67462 + curr->filename, curr->filename,
67463 + &fakeip, 0, type,
67464 + protocol, GR_CONNECT, &current->signal->saved_ip);
67465 + } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
67466 + __u32 fakeip = 0;
67467 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
67468 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
67469 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
67470 + gr_to_filename(current->exec_file->f_path.dentry,
67471 + current->exec_file->f_path.mnt) :
67472 + curr->filename, curr->filename,
67473 + &fakeip, 0, type,
67474 + protocol, GR_BIND, &current->signal->saved_ip);
67475 + }
67476 + /* we'll log when they use connect or bind */
67477 + goto exit;
67478 + }
67479 +
67480 +exit_fail:
67481 + if (domain == PF_INET)
67482 + gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
67483 + gr_socktype_to_name(type), gr_proto_to_name(protocol));
67484 + else if (rcu_access_pointer(net_families[domain]) != NULL)
67485 + gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
67486 + gr_socktype_to_name(type), protocol);
67487 +
67488 + return 0;
67489 +exit:
67490 + return 1;
67491 +}
67492 +
67493 +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)
67494 +{
67495 + if ((ip->mode & mode) &&
67496 + (ip_port >= ip->low) &&
67497 + (ip_port <= ip->high) &&
67498 + ((ntohl(ip_addr) & our_netmask) ==
67499 + (ntohl(our_addr) & our_netmask))
67500 + && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
67501 + && (ip->type & (1U << type))) {
67502 + if (ip->mode & GR_INVERT)
67503 + return 2; // specifically denied
67504 + else
67505 + return 1; // allowed
67506 + }
67507 +
67508 + return 0; // not specifically allowed, may continue parsing
67509 +}
67510 +
67511 +static int
67512 +gr_search_connectbind(const int full_mode, struct sock *sk,
67513 + struct sockaddr_in *addr, const int type)
67514 +{
67515 + char iface[IFNAMSIZ] = {0};
67516 + struct acl_subject_label *curr;
67517 + struct acl_ip_label *ip;
67518 + struct inet_sock *isk;
67519 + struct net_device *dev;
67520 + struct in_device *idev;
67521 + unsigned long i;
67522 + int ret;
67523 + int mode = full_mode & (GR_BIND | GR_CONNECT);
67524 + __u32 ip_addr = 0;
67525 + __u32 our_addr;
67526 + __u32 our_netmask;
67527 + char *p;
67528 + __u16 ip_port = 0;
67529 + const struct cred *cred = current_cred();
67530 +
67531 + if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
67532 + return 0;
67533 +
67534 + curr = current->acl;
67535 + isk = inet_sk(sk);
67536 +
67537 + /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
67538 + if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
67539 + addr->sin_addr.s_addr = curr->inaddr_any_override;
67540 + if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
67541 + struct sockaddr_in saddr;
67542 + int err;
67543 +
67544 + saddr.sin_family = AF_INET;
67545 + saddr.sin_addr.s_addr = curr->inaddr_any_override;
67546 + saddr.sin_port = isk->inet_sport;
67547 +
67548 + err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
67549 + if (err)
67550 + return err;
67551 +
67552 + err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
67553 + if (err)
67554 + return err;
67555 + }
67556 +
67557 + if (!curr->ips)
67558 + return 0;
67559 +
67560 + ip_addr = addr->sin_addr.s_addr;
67561 + ip_port = ntohs(addr->sin_port);
67562 +
67563 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
67564 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
67565 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
67566 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
67567 + gr_to_filename(current->exec_file->f_path.dentry,
67568 + current->exec_file->f_path.mnt) :
67569 + curr->filename, curr->filename,
67570 + &ip_addr, ip_port, type,
67571 + sk->sk_protocol, mode, &current->signal->saved_ip);
67572 + return 0;
67573 + }
67574 +
67575 + for (i = 0; i < curr->ip_num; i++) {
67576 + ip = *(curr->ips + i);
67577 + if (ip->iface != NULL) {
67578 + strncpy(iface, ip->iface, IFNAMSIZ - 1);
67579 + p = strchr(iface, ':');
67580 + if (p != NULL)
67581 + *p = '\0';
67582 + dev = dev_get_by_name(sock_net(sk), iface);
67583 + if (dev == NULL)
67584 + continue;
67585 + idev = in_dev_get(dev);
67586 + if (idev == NULL) {
67587 + dev_put(dev);
67588 + continue;
67589 + }
67590 + rcu_read_lock();
67591 + for_ifa(idev) {
67592 + if (!strcmp(ip->iface, ifa->ifa_label)) {
67593 + our_addr = ifa->ifa_address;
67594 + our_netmask = 0xffffffff;
67595 + ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
67596 + if (ret == 1) {
67597 + rcu_read_unlock();
67598 + in_dev_put(idev);
67599 + dev_put(dev);
67600 + return 0;
67601 + } else if (ret == 2) {
67602 + rcu_read_unlock();
67603 + in_dev_put(idev);
67604 + dev_put(dev);
67605 + goto denied;
67606 + }
67607 + }
67608 + } endfor_ifa(idev);
67609 + rcu_read_unlock();
67610 + in_dev_put(idev);
67611 + dev_put(dev);
67612 + } else {
67613 + our_addr = ip->addr;
67614 + our_netmask = ip->netmask;
67615 + ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
67616 + if (ret == 1)
67617 + return 0;
67618 + else if (ret == 2)
67619 + goto denied;
67620 + }
67621 + }
67622 +
67623 +denied:
67624 + if (mode == GR_BIND)
67625 + 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));
67626 + else if (mode == GR_CONNECT)
67627 + 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));
67628 +
67629 + return -EACCES;
67630 +}
67631 +
67632 +int
67633 +gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
67634 +{
67635 + /* always allow disconnection of dgram sockets with connect */
67636 + if (addr->sin_family == AF_UNSPEC)
67637 + return 0;
67638 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
67639 +}
67640 +
67641 +int
67642 +gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
67643 +{
67644 + return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
67645 +}
67646 +
67647 +int gr_search_listen(struct socket *sock)
67648 +{
67649 + struct sock *sk = sock->sk;
67650 + struct sockaddr_in addr;
67651 +
67652 + addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
67653 + addr.sin_port = inet_sk(sk)->inet_sport;
67654 +
67655 + return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
67656 +}
67657 +
67658 +int gr_search_accept(struct socket *sock)
67659 +{
67660 + struct sock *sk = sock->sk;
67661 + struct sockaddr_in addr;
67662 +
67663 + addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
67664 + addr.sin_port = inet_sk(sk)->inet_sport;
67665 +
67666 + return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
67667 +}
67668 +
67669 +int
67670 +gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
67671 +{
67672 + if (addr)
67673 + return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
67674 + else {
67675 + struct sockaddr_in sin;
67676 + const struct inet_sock *inet = inet_sk(sk);
67677 +
67678 + sin.sin_addr.s_addr = inet->inet_daddr;
67679 + sin.sin_port = inet->inet_dport;
67680 +
67681 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
67682 + }
67683 +}
67684 +
67685 +int
67686 +gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
67687 +{
67688 + struct sockaddr_in sin;
67689 +
67690 + if (unlikely(skb->len < sizeof (struct udphdr)))
67691 + return 0; // skip this packet
67692 +
67693 + sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
67694 + sin.sin_port = udp_hdr(skb)->source;
67695 +
67696 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
67697 +}
67698 diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
67699 new file mode 100644
67700 index 0000000..25f54ef
67701 --- /dev/null
67702 +++ b/grsecurity/gracl_learn.c
67703 @@ -0,0 +1,207 @@
67704 +#include <linux/kernel.h>
67705 +#include <linux/mm.h>
67706 +#include <linux/sched.h>
67707 +#include <linux/poll.h>
67708 +#include <linux/string.h>
67709 +#include <linux/file.h>
67710 +#include <linux/types.h>
67711 +#include <linux/vmalloc.h>
67712 +#include <linux/grinternal.h>
67713 +
67714 +extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
67715 + size_t count, loff_t *ppos);
67716 +extern int gr_acl_is_enabled(void);
67717 +
67718 +static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
67719 +static int gr_learn_attached;
67720 +
67721 +/* use a 512k buffer */
67722 +#define LEARN_BUFFER_SIZE (512 * 1024)
67723 +
67724 +static DEFINE_SPINLOCK(gr_learn_lock);
67725 +static DEFINE_MUTEX(gr_learn_user_mutex);
67726 +
67727 +/* we need to maintain two buffers, so that the kernel context of grlearn
67728 + uses a semaphore around the userspace copying, and the other kernel contexts
67729 + use a spinlock when copying into the buffer, since they cannot sleep
67730 +*/
67731 +static char *learn_buffer;
67732 +static char *learn_buffer_user;
67733 +static int learn_buffer_len;
67734 +static int learn_buffer_user_len;
67735 +
67736 +static ssize_t
67737 +read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
67738 +{
67739 + DECLARE_WAITQUEUE(wait, current);
67740 + ssize_t retval = 0;
67741 +
67742 + add_wait_queue(&learn_wait, &wait);
67743 + set_current_state(TASK_INTERRUPTIBLE);
67744 + do {
67745 + mutex_lock(&gr_learn_user_mutex);
67746 + spin_lock(&gr_learn_lock);
67747 + if (learn_buffer_len)
67748 + break;
67749 + spin_unlock(&gr_learn_lock);
67750 + mutex_unlock(&gr_learn_user_mutex);
67751 + if (file->f_flags & O_NONBLOCK) {
67752 + retval = -EAGAIN;
67753 + goto out;
67754 + }
67755 + if (signal_pending(current)) {
67756 + retval = -ERESTARTSYS;
67757 + goto out;
67758 + }
67759 +
67760 + schedule();
67761 + } while (1);
67762 +
67763 + memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
67764 + learn_buffer_user_len = learn_buffer_len;
67765 + retval = learn_buffer_len;
67766 + learn_buffer_len = 0;
67767 +
67768 + spin_unlock(&gr_learn_lock);
67769 +
67770 + if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
67771 + retval = -EFAULT;
67772 +
67773 + mutex_unlock(&gr_learn_user_mutex);
67774 +out:
67775 + set_current_state(TASK_RUNNING);
67776 + remove_wait_queue(&learn_wait, &wait);
67777 + return retval;
67778 +}
67779 +
67780 +static unsigned int
67781 +poll_learn(struct file * file, poll_table * wait)
67782 +{
67783 + poll_wait(file, &learn_wait, wait);
67784 +
67785 + if (learn_buffer_len)
67786 + return (POLLIN | POLLRDNORM);
67787 +
67788 + return 0;
67789 +}
67790 +
67791 +void
67792 +gr_clear_learn_entries(void)
67793 +{
67794 + char *tmp;
67795 +
67796 + mutex_lock(&gr_learn_user_mutex);
67797 + spin_lock(&gr_learn_lock);
67798 + tmp = learn_buffer;
67799 + learn_buffer = NULL;
67800 + spin_unlock(&gr_learn_lock);
67801 + if (tmp)
67802 + vfree(tmp);
67803 + if (learn_buffer_user != NULL) {
67804 + vfree(learn_buffer_user);
67805 + learn_buffer_user = NULL;
67806 + }
67807 + learn_buffer_len = 0;
67808 + mutex_unlock(&gr_learn_user_mutex);
67809 +
67810 + return;
67811 +}
67812 +
67813 +void
67814 +gr_add_learn_entry(const char *fmt, ...)
67815 +{
67816 + va_list args;
67817 + unsigned int len;
67818 +
67819 + if (!gr_learn_attached)
67820 + return;
67821 +
67822 + spin_lock(&gr_learn_lock);
67823 +
67824 + /* leave a gap at the end so we know when it's "full" but don't have to
67825 + compute the exact length of the string we're trying to append
67826 + */
67827 + if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
67828 + spin_unlock(&gr_learn_lock);
67829 + wake_up_interruptible(&learn_wait);
67830 + return;
67831 + }
67832 + if (learn_buffer == NULL) {
67833 + spin_unlock(&gr_learn_lock);
67834 + return;
67835 + }
67836 +
67837 + va_start(args, fmt);
67838 + len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
67839 + va_end(args);
67840 +
67841 + learn_buffer_len += len + 1;
67842 +
67843 + spin_unlock(&gr_learn_lock);
67844 + wake_up_interruptible(&learn_wait);
67845 +
67846 + return;
67847 +}
67848 +
67849 +static int
67850 +open_learn(struct inode *inode, struct file *file)
67851 +{
67852 + if (file->f_mode & FMODE_READ && gr_learn_attached)
67853 + return -EBUSY;
67854 + if (file->f_mode & FMODE_READ) {
67855 + int retval = 0;
67856 + mutex_lock(&gr_learn_user_mutex);
67857 + if (learn_buffer == NULL)
67858 + learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
67859 + if (learn_buffer_user == NULL)
67860 + learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
67861 + if (learn_buffer == NULL) {
67862 + retval = -ENOMEM;
67863 + goto out_error;
67864 + }
67865 + if (learn_buffer_user == NULL) {
67866 + retval = -ENOMEM;
67867 + goto out_error;
67868 + }
67869 + learn_buffer_len = 0;
67870 + learn_buffer_user_len = 0;
67871 + gr_learn_attached = 1;
67872 +out_error:
67873 + mutex_unlock(&gr_learn_user_mutex);
67874 + return retval;
67875 + }
67876 + return 0;
67877 +}
67878 +
67879 +static int
67880 +close_learn(struct inode *inode, struct file *file)
67881 +{
67882 + if (file->f_mode & FMODE_READ) {
67883 + char *tmp = NULL;
67884 + mutex_lock(&gr_learn_user_mutex);
67885 + spin_lock(&gr_learn_lock);
67886 + tmp = learn_buffer;
67887 + learn_buffer = NULL;
67888 + spin_unlock(&gr_learn_lock);
67889 + if (tmp)
67890 + vfree(tmp);
67891 + if (learn_buffer_user != NULL) {
67892 + vfree(learn_buffer_user);
67893 + learn_buffer_user = NULL;
67894 + }
67895 + learn_buffer_len = 0;
67896 + learn_buffer_user_len = 0;
67897 + gr_learn_attached = 0;
67898 + mutex_unlock(&gr_learn_user_mutex);
67899 + }
67900 +
67901 + return 0;
67902 +}
67903 +
67904 +const struct file_operations grsec_fops = {
67905 + .read = read_learn,
67906 + .write = write_grsec_handler,
67907 + .open = open_learn,
67908 + .release = close_learn,
67909 + .poll = poll_learn,
67910 +};
67911 diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
67912 new file mode 100644
67913 index 0000000..361a099
67914 --- /dev/null
67915 +++ b/grsecurity/gracl_policy.c
67916 @@ -0,0 +1,1782 @@
67917 +#include <linux/kernel.h>
67918 +#include <linux/module.h>
67919 +#include <linux/sched.h>
67920 +#include <linux/mm.h>
67921 +#include <linux/file.h>
67922 +#include <linux/fs.h>
67923 +#include <linux/namei.h>
67924 +#include <linux/mount.h>
67925 +#include <linux/tty.h>
67926 +#include <linux/proc_fs.h>
67927 +#include <linux/lglock.h>
67928 +#include <linux/slab.h>
67929 +#include <linux/vmalloc.h>
67930 +#include <linux/types.h>
67931 +#include <linux/sysctl.h>
67932 +#include <linux/netdevice.h>
67933 +#include <linux/ptrace.h>
67934 +#include <linux/gracl.h>
67935 +#include <linux/gralloc.h>
67936 +#include <linux/security.h>
67937 +#include <linux/grinternal.h>
67938 +#include <linux/pid_namespace.h>
67939 +#include <linux/stop_machine.h>
67940 +#include <linux/fdtable.h>
67941 +#include <linux/percpu.h>
67942 +#include <linux/lglock.h>
67943 +#include <linux/hugetlb.h>
67944 +#include <linux/posix-timers.h>
67945 +#include "../fs/mount.h"
67946 +
67947 +#include <asm/uaccess.h>
67948 +#include <asm/errno.h>
67949 +#include <asm/mman.h>
67950 +
67951 +extern struct gr_policy_state *polstate;
67952 +
67953 +#define FOR_EACH_ROLE_START(role) \
67954 + role = polstate->role_list; \
67955 + while (role) {
67956 +
67957 +#define FOR_EACH_ROLE_END(role) \
67958 + role = role->prev; \
67959 + }
67960 +
67961 +struct path gr_real_root;
67962 +
67963 +extern struct gr_alloc_state *current_alloc_state;
67964 +
67965 +u16 acl_sp_role_value;
67966 +
67967 +static DEFINE_MUTEX(gr_dev_mutex);
67968 +
67969 +extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
67970 +extern void gr_clear_learn_entries(void);
67971 +
67972 +static struct gr_arg gr_usermode;
67973 +static unsigned char gr_system_salt[GR_SALT_LEN];
67974 +static unsigned char gr_system_sum[GR_SHA_LEN];
67975 +
67976 +static unsigned int gr_auth_attempts = 0;
67977 +static unsigned long gr_auth_expires = 0UL;
67978 +
67979 +struct acl_object_label *fakefs_obj_rw;
67980 +struct acl_object_label *fakefs_obj_rwx;
67981 +
67982 +extern int gr_init_uidset(void);
67983 +extern void gr_free_uidset(void);
67984 +extern void gr_remove_uid(uid_t uid);
67985 +extern int gr_find_uid(uid_t uid);
67986 +
67987 +extern struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename);
67988 +extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
67989 +extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
67990 +extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
67991 +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);
67992 +extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
67993 +extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
67994 +extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
67995 +extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
67996 +extern struct acl_subject_label *lookup_acl_subj_label(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
67997 +extern struct acl_subject_label *lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
67998 +extern void assign_special_role(const char *rolename);
67999 +extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
68000 +extern int gr_rbac_disable(void *unused);
68001 +extern void gr_enable_rbac_system(void);
68002 +
68003 +static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
68004 +{
68005 + if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
68006 + return -EFAULT;
68007 +
68008 + return 0;
68009 +}
68010 +
68011 +static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
68012 +{
68013 + if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
68014 + return -EFAULT;
68015 +
68016 + return 0;
68017 +}
68018 +
68019 +static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
68020 +{
68021 + if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
68022 + return -EFAULT;
68023 +
68024 + return 0;
68025 +}
68026 +
68027 +static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
68028 +{
68029 + if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
68030 + return -EFAULT;
68031 +
68032 + return 0;
68033 +}
68034 +
68035 +static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
68036 +{
68037 + if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
68038 + return -EFAULT;
68039 +
68040 + return 0;
68041 +}
68042 +
68043 +static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
68044 +{
68045 + if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
68046 + return -EFAULT;
68047 +
68048 + return 0;
68049 +}
68050 +
68051 +static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
68052 +{
68053 + if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
68054 + return -EFAULT;
68055 +
68056 + return 0;
68057 +}
68058 +
68059 +static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
68060 +{
68061 + if (copy_from_user(trans, userp, sizeof(struct role_transition)))
68062 + return -EFAULT;
68063 +
68064 + return 0;
68065 +}
68066 +
68067 +int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
68068 +{
68069 + if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
68070 + return -EFAULT;
68071 +
68072 + return 0;
68073 +}
68074 +
68075 +static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
68076 +{
68077 + if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
68078 + return -EFAULT;
68079 +
68080 + if (((uwrap->version != GRSECURITY_VERSION) &&
68081 + (uwrap->version != 0x2901)) ||
68082 + (uwrap->size != sizeof(struct gr_arg)))
68083 + return -EINVAL;
68084 +
68085 + return 0;
68086 +}
68087 +
68088 +static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
68089 +{
68090 + if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
68091 + return -EFAULT;
68092 +
68093 + return 0;
68094 +}
68095 +
68096 +static size_t get_gr_arg_wrapper_size_normal(void)
68097 +{
68098 + return sizeof(struct gr_arg_wrapper);
68099 +}
68100 +
68101 +#ifdef CONFIG_COMPAT
68102 +extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
68103 +extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
68104 +extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
68105 +extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
68106 +extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
68107 +extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
68108 +extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
68109 +extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
68110 +extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
68111 +extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
68112 +extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
68113 +extern size_t get_gr_arg_wrapper_size_compat(void);
68114 +
68115 +int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
68116 +int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
68117 +int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
68118 +int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
68119 +int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
68120 +int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
68121 +int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
68122 +int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
68123 +int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
68124 +int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
68125 +int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
68126 +size_t (* get_gr_arg_wrapper_size)(void) __read_only;
68127 +
68128 +#else
68129 +#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
68130 +#define copy_gr_arg copy_gr_arg_normal
68131 +#define copy_gr_hash_struct copy_gr_hash_struct_normal
68132 +#define copy_acl_object_label copy_acl_object_label_normal
68133 +#define copy_acl_subject_label copy_acl_subject_label_normal
68134 +#define copy_acl_role_label copy_acl_role_label_normal
68135 +#define copy_acl_ip_label copy_acl_ip_label_normal
68136 +#define copy_pointer_from_array copy_pointer_from_array_normal
68137 +#define copy_sprole_pw copy_sprole_pw_normal
68138 +#define copy_role_transition copy_role_transition_normal
68139 +#define copy_role_allowed_ip copy_role_allowed_ip_normal
68140 +#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
68141 +#endif
68142 +
68143 +static struct acl_subject_label *
68144 +lookup_subject_map(const struct acl_subject_label *userp)
68145 +{
68146 + unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
68147 + struct subject_map *match;
68148 +
68149 + match = polstate->subj_map_set.s_hash[index];
68150 +
68151 + while (match && match->user != userp)
68152 + match = match->next;
68153 +
68154 + if (match != NULL)
68155 + return match->kernel;
68156 + else
68157 + return NULL;
68158 +}
68159 +
68160 +static void
68161 +insert_subj_map_entry(struct subject_map *subjmap)
68162 +{
68163 + unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
68164 + struct subject_map **curr;
68165 +
68166 + subjmap->prev = NULL;
68167 +
68168 + curr = &polstate->subj_map_set.s_hash[index];
68169 + if (*curr != NULL)
68170 + (*curr)->prev = subjmap;
68171 +
68172 + subjmap->next = *curr;
68173 + *curr = subjmap;
68174 +
68175 + return;
68176 +}
68177 +
68178 +static void
68179 +__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
68180 +{
68181 + unsigned int index =
68182 + gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
68183 + struct acl_role_label **curr;
68184 + struct acl_role_label *tmp, *tmp2;
68185 +
68186 + curr = &polstate->acl_role_set.r_hash[index];
68187 +
68188 + /* simple case, slot is empty, just set it to our role */
68189 + if (*curr == NULL) {
68190 + *curr = role;
68191 + } else {
68192 + /* example:
68193 + 1 -> 2 -> 3 (adding 2 -> 3 to here)
68194 + 2 -> 3
68195 + */
68196 + /* first check to see if we can already be reached via this slot */
68197 + tmp = *curr;
68198 + while (tmp && tmp != role)
68199 + tmp = tmp->next;
68200 + if (tmp == role) {
68201 + /* we don't need to add ourselves to this slot's chain */
68202 + return;
68203 + }
68204 + /* we need to add ourselves to this chain, two cases */
68205 + if (role->next == NULL) {
68206 + /* simple case, append the current chain to our role */
68207 + role->next = *curr;
68208 + *curr = role;
68209 + } else {
68210 + /* 1 -> 2 -> 3 -> 4
68211 + 2 -> 3 -> 4
68212 + 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
68213 + */
68214 + /* trickier case: walk our role's chain until we find
68215 + the role for the start of the current slot's chain */
68216 + tmp = role;
68217 + tmp2 = *curr;
68218 + while (tmp->next && tmp->next != tmp2)
68219 + tmp = tmp->next;
68220 + if (tmp->next == tmp2) {
68221 + /* from example above, we found 3, so just
68222 + replace this slot's chain with ours */
68223 + *curr = role;
68224 + } else {
68225 + /* we didn't find a subset of our role's chain
68226 + in the current slot's chain, so append their
68227 + chain to ours, and set us as the first role in
68228 + the slot's chain
68229 +
68230 + we could fold this case with the case above,
68231 + but making it explicit for clarity
68232 + */
68233 + tmp->next = tmp2;
68234 + *curr = role;
68235 + }
68236 + }
68237 + }
68238 +
68239 + return;
68240 +}
68241 +
68242 +static void
68243 +insert_acl_role_label(struct acl_role_label *role)
68244 +{
68245 + int i;
68246 +
68247 + if (polstate->role_list == NULL) {
68248 + polstate->role_list = role;
68249 + role->prev = NULL;
68250 + } else {
68251 + role->prev = polstate->role_list;
68252 + polstate->role_list = role;
68253 + }
68254 +
68255 + /* used for hash chains */
68256 + role->next = NULL;
68257 +
68258 + if (role->roletype & GR_ROLE_DOMAIN) {
68259 + for (i = 0; i < role->domain_child_num; i++)
68260 + __insert_acl_role_label(role, role->domain_children[i]);
68261 + } else
68262 + __insert_acl_role_label(role, role->uidgid);
68263 +}
68264 +
68265 +static int
68266 +insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
68267 +{
68268 + struct name_entry **curr, *nentry;
68269 + struct inodev_entry *ientry;
68270 + unsigned int len = strlen(name);
68271 + unsigned int key = full_name_hash(name, len);
68272 + unsigned int index = key % polstate->name_set.n_size;
68273 +
68274 + curr = &polstate->name_set.n_hash[index];
68275 +
68276 + while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
68277 + curr = &((*curr)->next);
68278 +
68279 + if (*curr != NULL)
68280 + return 1;
68281 +
68282 + nentry = acl_alloc(sizeof (struct name_entry));
68283 + if (nentry == NULL)
68284 + return 0;
68285 + ientry = acl_alloc(sizeof (struct inodev_entry));
68286 + if (ientry == NULL)
68287 + return 0;
68288 + ientry->nentry = nentry;
68289 +
68290 + nentry->key = key;
68291 + nentry->name = name;
68292 + nentry->inode = inode;
68293 + nentry->device = device;
68294 + nentry->len = len;
68295 + nentry->deleted = deleted;
68296 +
68297 + nentry->prev = NULL;
68298 + curr = &polstate->name_set.n_hash[index];
68299 + if (*curr != NULL)
68300 + (*curr)->prev = nentry;
68301 + nentry->next = *curr;
68302 + *curr = nentry;
68303 +
68304 + /* insert us into the table searchable by inode/dev */
68305 + __insert_inodev_entry(polstate, ientry);
68306 +
68307 + return 1;
68308 +}
68309 +
68310 +/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
68311 +
68312 +static void *
68313 +create_table(__u32 * len, int elementsize)
68314 +{
68315 + unsigned int table_sizes[] = {
68316 + 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
68317 + 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
68318 + 4194301, 8388593, 16777213, 33554393, 67108859
68319 + };
68320 + void *newtable = NULL;
68321 + unsigned int pwr = 0;
68322 +
68323 + while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
68324 + table_sizes[pwr] <= *len)
68325 + pwr++;
68326 +
68327 + if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
68328 + return newtable;
68329 +
68330 + if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
68331 + newtable =
68332 + kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
68333 + else
68334 + newtable = vmalloc(table_sizes[pwr] * elementsize);
68335 +
68336 + *len = table_sizes[pwr];
68337 +
68338 + return newtable;
68339 +}
68340 +
68341 +static int
68342 +init_variables(const struct gr_arg *arg, bool reload)
68343 +{
68344 + struct task_struct *reaper = init_pid_ns.child_reaper;
68345 + unsigned int stacksize;
68346 +
68347 + polstate->subj_map_set.s_size = arg->role_db.num_subjects;
68348 + polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
68349 + polstate->name_set.n_size = arg->role_db.num_objects;
68350 + polstate->inodev_set.i_size = arg->role_db.num_objects;
68351 +
68352 + if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
68353 + !polstate->name_set.n_size || !polstate->inodev_set.i_size)
68354 + return 1;
68355 +
68356 + if (!reload) {
68357 + if (!gr_init_uidset())
68358 + return 1;
68359 + }
68360 +
68361 + /* set up the stack that holds allocation info */
68362 +
68363 + stacksize = arg->role_db.num_pointers + 5;
68364 +
68365 + if (!acl_alloc_stack_init(stacksize))
68366 + return 1;
68367 +
68368 + if (!reload) {
68369 + /* grab reference for the real root dentry and vfsmount */
68370 + get_fs_root(reaper->fs, &gr_real_root);
68371 +
68372 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
68373 + 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);
68374 +#endif
68375 +
68376 + fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
68377 + if (fakefs_obj_rw == NULL)
68378 + return 1;
68379 + fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
68380 +
68381 + fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
68382 + if (fakefs_obj_rwx == NULL)
68383 + return 1;
68384 + fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
68385 + }
68386 +
68387 + polstate->subj_map_set.s_hash =
68388 + (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
68389 + polstate->acl_role_set.r_hash =
68390 + (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
68391 + polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
68392 + polstate->inodev_set.i_hash =
68393 + (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
68394 +
68395 + if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
68396 + !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
68397 + return 1;
68398 +
68399 + memset(polstate->subj_map_set.s_hash, 0,
68400 + sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
68401 + memset(polstate->acl_role_set.r_hash, 0,
68402 + sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
68403 + memset(polstate->name_set.n_hash, 0,
68404 + sizeof (struct name_entry *) * polstate->name_set.n_size);
68405 + memset(polstate->inodev_set.i_hash, 0,
68406 + sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
68407 +
68408 + return 0;
68409 +}
68410 +
68411 +/* free information not needed after startup
68412 + currently contains user->kernel pointer mappings for subjects
68413 +*/
68414 +
68415 +static void
68416 +free_init_variables(void)
68417 +{
68418 + __u32 i;
68419 +
68420 + if (polstate->subj_map_set.s_hash) {
68421 + for (i = 0; i < polstate->subj_map_set.s_size; i++) {
68422 + if (polstate->subj_map_set.s_hash[i]) {
68423 + kfree(polstate->subj_map_set.s_hash[i]);
68424 + polstate->subj_map_set.s_hash[i] = NULL;
68425 + }
68426 + }
68427 +
68428 + if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
68429 + PAGE_SIZE)
68430 + kfree(polstate->subj_map_set.s_hash);
68431 + else
68432 + vfree(polstate->subj_map_set.s_hash);
68433 + }
68434 +
68435 + return;
68436 +}
68437 +
68438 +static void
68439 +free_variables(bool reload)
68440 +{
68441 + struct acl_subject_label *s;
68442 + struct acl_role_label *r;
68443 + struct task_struct *task, *task2;
68444 + unsigned int x;
68445 +
68446 + if (!reload) {
68447 + gr_clear_learn_entries();
68448 +
68449 + read_lock(&tasklist_lock);
68450 + do_each_thread(task2, task) {
68451 + task->acl_sp_role = 0;
68452 + task->acl_role_id = 0;
68453 + task->inherited = 0;
68454 + task->acl = NULL;
68455 + task->role = NULL;
68456 + } while_each_thread(task2, task);
68457 + read_unlock(&tasklist_lock);
68458 +
68459 + kfree(fakefs_obj_rw);
68460 + fakefs_obj_rw = NULL;
68461 + kfree(fakefs_obj_rwx);
68462 + fakefs_obj_rwx = NULL;
68463 +
68464 + /* release the reference to the real root dentry and vfsmount */
68465 + path_put(&gr_real_root);
68466 + memset(&gr_real_root, 0, sizeof(gr_real_root));
68467 + }
68468 +
68469 + /* free all object hash tables */
68470 +
68471 + FOR_EACH_ROLE_START(r)
68472 + if (r->subj_hash == NULL)
68473 + goto next_role;
68474 + FOR_EACH_SUBJECT_START(r, s, x)
68475 + if (s->obj_hash == NULL)
68476 + break;
68477 + if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
68478 + kfree(s->obj_hash);
68479 + else
68480 + vfree(s->obj_hash);
68481 + FOR_EACH_SUBJECT_END(s, x)
68482 + FOR_EACH_NESTED_SUBJECT_START(r, s)
68483 + if (s->obj_hash == NULL)
68484 + break;
68485 + if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
68486 + kfree(s->obj_hash);
68487 + else
68488 + vfree(s->obj_hash);
68489 + FOR_EACH_NESTED_SUBJECT_END(s)
68490 + if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
68491 + kfree(r->subj_hash);
68492 + else
68493 + vfree(r->subj_hash);
68494 + r->subj_hash = NULL;
68495 +next_role:
68496 + FOR_EACH_ROLE_END(r)
68497 +
68498 + acl_free_all();
68499 +
68500 + if (polstate->acl_role_set.r_hash) {
68501 + if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
68502 + PAGE_SIZE)
68503 + kfree(polstate->acl_role_set.r_hash);
68504 + else
68505 + vfree(polstate->acl_role_set.r_hash);
68506 + }
68507 + if (polstate->name_set.n_hash) {
68508 + if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
68509 + PAGE_SIZE)
68510 + kfree(polstate->name_set.n_hash);
68511 + else
68512 + vfree(polstate->name_set.n_hash);
68513 + }
68514 +
68515 + if (polstate->inodev_set.i_hash) {
68516 + if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
68517 + PAGE_SIZE)
68518 + kfree(polstate->inodev_set.i_hash);
68519 + else
68520 + vfree(polstate->inodev_set.i_hash);
68521 + }
68522 +
68523 + if (!reload)
68524 + gr_free_uidset();
68525 +
68526 + memset(&polstate->name_set, 0, sizeof (struct name_db));
68527 + memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
68528 + memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
68529 + memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
68530 +
68531 + polstate->default_role = NULL;
68532 + polstate->kernel_role = NULL;
68533 + polstate->role_list = NULL;
68534 +
68535 + return;
68536 +}
68537 +
68538 +static struct acl_subject_label *
68539 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
68540 +
68541 +static int alloc_and_copy_string(char **name, unsigned int maxlen)
68542 +{
68543 + unsigned int len = strnlen_user(*name, maxlen);
68544 + char *tmp;
68545 +
68546 + if (!len || len >= maxlen)
68547 + return -EINVAL;
68548 +
68549 + if ((tmp = (char *) acl_alloc(len)) == NULL)
68550 + return -ENOMEM;
68551 +
68552 + if (copy_from_user(tmp, *name, len))
68553 + return -EFAULT;
68554 +
68555 + tmp[len-1] = '\0';
68556 + *name = tmp;
68557 +
68558 + return 0;
68559 +}
68560 +
68561 +static int
68562 +copy_user_glob(struct acl_object_label *obj)
68563 +{
68564 + struct acl_object_label *g_tmp, **guser;
68565 + int error;
68566 +
68567 + if (obj->globbed == NULL)
68568 + return 0;
68569 +
68570 + guser = &obj->globbed;
68571 + while (*guser) {
68572 + g_tmp = (struct acl_object_label *)
68573 + acl_alloc(sizeof (struct acl_object_label));
68574 + if (g_tmp == NULL)
68575 + return -ENOMEM;
68576 +
68577 + if (copy_acl_object_label(g_tmp, *guser))
68578 + return -EFAULT;
68579 +
68580 + error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
68581 + if (error)
68582 + return error;
68583 +
68584 + *guser = g_tmp;
68585 + guser = &(g_tmp->next);
68586 + }
68587 +
68588 + return 0;
68589 +}
68590 +
68591 +static int
68592 +copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
68593 + struct acl_role_label *role)
68594 +{
68595 + struct acl_object_label *o_tmp;
68596 + int ret;
68597 +
68598 + while (userp) {
68599 + if ((o_tmp = (struct acl_object_label *)
68600 + acl_alloc(sizeof (struct acl_object_label))) == NULL)
68601 + return -ENOMEM;
68602 +
68603 + if (copy_acl_object_label(o_tmp, userp))
68604 + return -EFAULT;
68605 +
68606 + userp = o_tmp->prev;
68607 +
68608 + ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
68609 + if (ret)
68610 + return ret;
68611 +
68612 + insert_acl_obj_label(o_tmp, subj);
68613 + if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
68614 + o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
68615 + return -ENOMEM;
68616 +
68617 + ret = copy_user_glob(o_tmp);
68618 + if (ret)
68619 + return ret;
68620 +
68621 + if (o_tmp->nested) {
68622 + int already_copied;
68623 +
68624 + o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
68625 + if (IS_ERR(o_tmp->nested))
68626 + return PTR_ERR(o_tmp->nested);
68627 +
68628 + /* insert into nested subject list if we haven't copied this one yet
68629 + to prevent duplicate entries */
68630 + if (!already_copied) {
68631 + o_tmp->nested->next = role->hash->first;
68632 + role->hash->first = o_tmp->nested;
68633 + }
68634 + }
68635 + }
68636 +
68637 + return 0;
68638 +}
68639 +
68640 +static __u32
68641 +count_user_subjs(struct acl_subject_label *userp)
68642 +{
68643 + struct acl_subject_label s_tmp;
68644 + __u32 num = 0;
68645 +
68646 + while (userp) {
68647 + if (copy_acl_subject_label(&s_tmp, userp))
68648 + break;
68649 +
68650 + userp = s_tmp.prev;
68651 + }
68652 +
68653 + return num;
68654 +}
68655 +
68656 +static int
68657 +copy_user_allowedips(struct acl_role_label *rolep)
68658 +{
68659 + struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
68660 +
68661 + ruserip = rolep->allowed_ips;
68662 +
68663 + while (ruserip) {
68664 + rlast = rtmp;
68665 +
68666 + if ((rtmp = (struct role_allowed_ip *)
68667 + acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
68668 + return -ENOMEM;
68669 +
68670 + if (copy_role_allowed_ip(rtmp, ruserip))
68671 + return -EFAULT;
68672 +
68673 + ruserip = rtmp->prev;
68674 +
68675 + if (!rlast) {
68676 + rtmp->prev = NULL;
68677 + rolep->allowed_ips = rtmp;
68678 + } else {
68679 + rlast->next = rtmp;
68680 + rtmp->prev = rlast;
68681 + }
68682 +
68683 + if (!ruserip)
68684 + rtmp->next = NULL;
68685 + }
68686 +
68687 + return 0;
68688 +}
68689 +
68690 +static int
68691 +copy_user_transitions(struct acl_role_label *rolep)
68692 +{
68693 + struct role_transition *rusertp, *rtmp = NULL, *rlast;
68694 + int error;
68695 +
68696 + rusertp = rolep->transitions;
68697 +
68698 + while (rusertp) {
68699 + rlast = rtmp;
68700 +
68701 + if ((rtmp = (struct role_transition *)
68702 + acl_alloc(sizeof (struct role_transition))) == NULL)
68703 + return -ENOMEM;
68704 +
68705 + if (copy_role_transition(rtmp, rusertp))
68706 + return -EFAULT;
68707 +
68708 + rusertp = rtmp->prev;
68709 +
68710 + error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
68711 + if (error)
68712 + return error;
68713 +
68714 + if (!rlast) {
68715 + rtmp->prev = NULL;
68716 + rolep->transitions = rtmp;
68717 + } else {
68718 + rlast->next = rtmp;
68719 + rtmp->prev = rlast;
68720 + }
68721 +
68722 + if (!rusertp)
68723 + rtmp->next = NULL;
68724 + }
68725 +
68726 + return 0;
68727 +}
68728 +
68729 +static __u32 count_user_objs(const struct acl_object_label __user *userp)
68730 +{
68731 + struct acl_object_label o_tmp;
68732 + __u32 num = 0;
68733 +
68734 + while (userp) {
68735 + if (copy_acl_object_label(&o_tmp, userp))
68736 + break;
68737 +
68738 + userp = o_tmp.prev;
68739 + num++;
68740 + }
68741 +
68742 + return num;
68743 +}
68744 +
68745 +static struct acl_subject_label *
68746 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
68747 +{
68748 + struct acl_subject_label *s_tmp = NULL, *s_tmp2;
68749 + __u32 num_objs;
68750 + struct acl_ip_label **i_tmp, *i_utmp2;
68751 + struct gr_hash_struct ghash;
68752 + struct subject_map *subjmap;
68753 + unsigned int i_num;
68754 + int err;
68755 +
68756 + if (already_copied != NULL)
68757 + *already_copied = 0;
68758 +
68759 + s_tmp = lookup_subject_map(userp);
68760 +
68761 + /* we've already copied this subject into the kernel, just return
68762 + the reference to it, and don't copy it over again
68763 + */
68764 + if (s_tmp) {
68765 + if (already_copied != NULL)
68766 + *already_copied = 1;
68767 + return(s_tmp);
68768 + }
68769 +
68770 + if ((s_tmp = (struct acl_subject_label *)
68771 + acl_alloc(sizeof (struct acl_subject_label))) == NULL)
68772 + return ERR_PTR(-ENOMEM);
68773 +
68774 + subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
68775 + if (subjmap == NULL)
68776 + return ERR_PTR(-ENOMEM);
68777 +
68778 + subjmap->user = userp;
68779 + subjmap->kernel = s_tmp;
68780 + insert_subj_map_entry(subjmap);
68781 +
68782 + if (copy_acl_subject_label(s_tmp, userp))
68783 + return ERR_PTR(-EFAULT);
68784 +
68785 + err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
68786 + if (err)
68787 + return ERR_PTR(err);
68788 +
68789 + if (!strcmp(s_tmp->filename, "/"))
68790 + role->root_label = s_tmp;
68791 +
68792 + if (copy_gr_hash_struct(&ghash, s_tmp->hash))
68793 + return ERR_PTR(-EFAULT);
68794 +
68795 + /* copy user and group transition tables */
68796 +
68797 + if (s_tmp->user_trans_num) {
68798 + uid_t *uidlist;
68799 +
68800 + uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
68801 + if (uidlist == NULL)
68802 + return ERR_PTR(-ENOMEM);
68803 + if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
68804 + return ERR_PTR(-EFAULT);
68805 +
68806 + s_tmp->user_transitions = uidlist;
68807 + }
68808 +
68809 + if (s_tmp->group_trans_num) {
68810 + gid_t *gidlist;
68811 +
68812 + gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
68813 + if (gidlist == NULL)
68814 + return ERR_PTR(-ENOMEM);
68815 + if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
68816 + return ERR_PTR(-EFAULT);
68817 +
68818 + s_tmp->group_transitions = gidlist;
68819 + }
68820 +
68821 + /* set up object hash table */
68822 + num_objs = count_user_objs(ghash.first);
68823 +
68824 + s_tmp->obj_hash_size = num_objs;
68825 + s_tmp->obj_hash =
68826 + (struct acl_object_label **)
68827 + create_table(&(s_tmp->obj_hash_size), sizeof(void *));
68828 +
68829 + if (!s_tmp->obj_hash)
68830 + return ERR_PTR(-ENOMEM);
68831 +
68832 + memset(s_tmp->obj_hash, 0,
68833 + s_tmp->obj_hash_size *
68834 + sizeof (struct acl_object_label *));
68835 +
68836 + /* add in objects */
68837 + err = copy_user_objs(ghash.first, s_tmp, role);
68838 +
68839 + if (err)
68840 + return ERR_PTR(err);
68841 +
68842 + /* set pointer for parent subject */
68843 + if (s_tmp->parent_subject) {
68844 + s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
68845 +
68846 + if (IS_ERR(s_tmp2))
68847 + return s_tmp2;
68848 +
68849 + s_tmp->parent_subject = s_tmp2;
68850 + }
68851 +
68852 + /* add in ip acls */
68853 +
68854 + if (!s_tmp->ip_num) {
68855 + s_tmp->ips = NULL;
68856 + goto insert;
68857 + }
68858 +
68859 + i_tmp =
68860 + (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
68861 + sizeof (struct acl_ip_label *));
68862 +
68863 + if (!i_tmp)
68864 + return ERR_PTR(-ENOMEM);
68865 +
68866 + for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
68867 + *(i_tmp + i_num) =
68868 + (struct acl_ip_label *)
68869 + acl_alloc(sizeof (struct acl_ip_label));
68870 + if (!*(i_tmp + i_num))
68871 + return ERR_PTR(-ENOMEM);
68872 +
68873 + if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
68874 + return ERR_PTR(-EFAULT);
68875 +
68876 + if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
68877 + return ERR_PTR(-EFAULT);
68878 +
68879 + if ((*(i_tmp + i_num))->iface == NULL)
68880 + continue;
68881 +
68882 + err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
68883 + if (err)
68884 + return ERR_PTR(err);
68885 + }
68886 +
68887 + s_tmp->ips = i_tmp;
68888 +
68889 +insert:
68890 + if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
68891 + s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
68892 + return ERR_PTR(-ENOMEM);
68893 +
68894 + return s_tmp;
68895 +}
68896 +
68897 +static int
68898 +copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
68899 +{
68900 + struct acl_subject_label s_pre;
68901 + struct acl_subject_label * ret;
68902 + int err;
68903 +
68904 + while (userp) {
68905 + if (copy_acl_subject_label(&s_pre, userp))
68906 + return -EFAULT;
68907 +
68908 + ret = do_copy_user_subj(userp, role, NULL);
68909 +
68910 + err = PTR_ERR(ret);
68911 + if (IS_ERR(ret))
68912 + return err;
68913 +
68914 + insert_acl_subj_label(ret, role);
68915 +
68916 + userp = s_pre.prev;
68917 + }
68918 +
68919 + return 0;
68920 +}
68921 +
68922 +static int
68923 +copy_user_acl(struct gr_arg *arg)
68924 +{
68925 + struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
68926 + struct acl_subject_label *subj_list;
68927 + struct sprole_pw *sptmp;
68928 + struct gr_hash_struct *ghash;
68929 + uid_t *domainlist;
68930 + unsigned int r_num;
68931 + int err = 0;
68932 + __u16 i;
68933 + __u32 num_subjs;
68934 +
68935 + /* we need a default and kernel role */
68936 + if (arg->role_db.num_roles < 2)
68937 + return -EINVAL;
68938 +
68939 + /* copy special role authentication info from userspace */
68940 +
68941 + polstate->num_sprole_pws = arg->num_sprole_pws;
68942 + polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
68943 +
68944 + if (!polstate->acl_special_roles && polstate->num_sprole_pws)
68945 + return -ENOMEM;
68946 +
68947 + for (i = 0; i < polstate->num_sprole_pws; i++) {
68948 + sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
68949 + if (!sptmp)
68950 + return -ENOMEM;
68951 + if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
68952 + return -EFAULT;
68953 +
68954 + err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
68955 + if (err)
68956 + return err;
68957 +
68958 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
68959 + printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
68960 +#endif
68961 +
68962 + polstate->acl_special_roles[i] = sptmp;
68963 + }
68964 +
68965 + r_utmp = (struct acl_role_label **) arg->role_db.r_table;
68966 +
68967 + for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
68968 + r_tmp = acl_alloc(sizeof (struct acl_role_label));
68969 +
68970 + if (!r_tmp)
68971 + return -ENOMEM;
68972 +
68973 + if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
68974 + return -EFAULT;
68975 +
68976 + if (copy_acl_role_label(r_tmp, r_utmp2))
68977 + return -EFAULT;
68978 +
68979 + err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
68980 + if (err)
68981 + return err;
68982 +
68983 + if (!strcmp(r_tmp->rolename, "default")
68984 + && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
68985 + polstate->default_role = r_tmp;
68986 + } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
68987 + polstate->kernel_role = r_tmp;
68988 + }
68989 +
68990 + if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
68991 + return -ENOMEM;
68992 +
68993 + if (copy_gr_hash_struct(ghash, r_tmp->hash))
68994 + return -EFAULT;
68995 +
68996 + r_tmp->hash = ghash;
68997 +
68998 + num_subjs = count_user_subjs(r_tmp->hash->first);
68999 +
69000 + r_tmp->subj_hash_size = num_subjs;
69001 + r_tmp->subj_hash =
69002 + (struct acl_subject_label **)
69003 + create_table(&(r_tmp->subj_hash_size), sizeof(void *));
69004 +
69005 + if (!r_tmp->subj_hash)
69006 + return -ENOMEM;
69007 +
69008 + err = copy_user_allowedips(r_tmp);
69009 + if (err)
69010 + return err;
69011 +
69012 + /* copy domain info */
69013 + if (r_tmp->domain_children != NULL) {
69014 + domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
69015 + if (domainlist == NULL)
69016 + return -ENOMEM;
69017 +
69018 + if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
69019 + return -EFAULT;
69020 +
69021 + r_tmp->domain_children = domainlist;
69022 + }
69023 +
69024 + err = copy_user_transitions(r_tmp);
69025 + if (err)
69026 + return err;
69027 +
69028 + memset(r_tmp->subj_hash, 0,
69029 + r_tmp->subj_hash_size *
69030 + sizeof (struct acl_subject_label *));
69031 +
69032 + /* acquire the list of subjects, then NULL out
69033 + the list prior to parsing the subjects for this role,
69034 + as during this parsing the list is replaced with a list
69035 + of *nested* subjects for the role
69036 + */
69037 + subj_list = r_tmp->hash->first;
69038 +
69039 + /* set nested subject list to null */
69040 + r_tmp->hash->first = NULL;
69041 +
69042 + err = copy_user_subjs(subj_list, r_tmp);
69043 +
69044 + if (err)
69045 + return err;
69046 +
69047 + insert_acl_role_label(r_tmp);
69048 + }
69049 +
69050 + if (polstate->default_role == NULL || polstate->kernel_role == NULL)
69051 + return -EINVAL;
69052 +
69053 + return err;
69054 +}
69055 +
69056 +static int gracl_reload_apply_policies(void *reload)
69057 +{
69058 + struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
69059 + struct task_struct *task, *task2;
69060 + struct acl_role_label *role, *rtmp;
69061 + struct acl_subject_label *subj;
69062 + const struct cred *cred;
69063 + int role_applied;
69064 + int ret = 0;
69065 +
69066 + memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
69067 + memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
69068 +
69069 + /* first make sure we'll be able to apply the new policy cleanly */
69070 + do_each_thread(task2, task) {
69071 + if (task->exec_file == NULL)
69072 + continue;
69073 + role_applied = 0;
69074 + if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
69075 + /* preserve special roles */
69076 + FOR_EACH_ROLE_START(role)
69077 + if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
69078 + rtmp = task->role;
69079 + task->role = role;
69080 + role_applied = 1;
69081 + break;
69082 + }
69083 + FOR_EACH_ROLE_END(role)
69084 + }
69085 + if (!role_applied) {
69086 + cred = __task_cred(task);
69087 + rtmp = task->role;
69088 + task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
69089 + }
69090 + /* this handles non-nested inherited subjects, nested subjects will still
69091 + be dropped currently */
69092 + subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
69093 + task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL);
69094 + /* change the role back so that we've made no modifications to the policy */
69095 + task->role = rtmp;
69096 +
69097 + if (subj == NULL || task->tmpacl == NULL) {
69098 + ret = -EINVAL;
69099 + goto out;
69100 + }
69101 + } while_each_thread(task2, task);
69102 +
69103 + /* now actually apply the policy */
69104 +
69105 + do_each_thread(task2, task) {
69106 + if (task->exec_file) {
69107 + role_applied = 0;
69108 + if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
69109 + /* preserve special roles */
69110 + FOR_EACH_ROLE_START(role)
69111 + if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
69112 + task->role = role;
69113 + role_applied = 1;
69114 + break;
69115 + }
69116 + FOR_EACH_ROLE_END(role)
69117 + }
69118 + if (!role_applied) {
69119 + cred = __task_cred(task);
69120 + task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
69121 + }
69122 + /* this handles non-nested inherited subjects, nested subjects will still
69123 + be dropped currently */
69124 + if (!reload_state->oldmode && task->inherited)
69125 + subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
69126 + else {
69127 + /* looked up and tagged to the task previously */
69128 + subj = task->tmpacl;
69129 + }
69130 + /* subj will be non-null */
69131 + __gr_apply_subject_to_task(polstate, task, subj);
69132 + if (reload_state->oldmode) {
69133 + task->acl_role_id = 0;
69134 + task->acl_sp_role = 0;
69135 + task->inherited = 0;
69136 + }
69137 + } else {
69138 + // it's a kernel process
69139 + task->role = polstate->kernel_role;
69140 + task->acl = polstate->kernel_role->root_label;
69141 +#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
69142 + task->acl->mode &= ~GR_PROCFIND;
69143 +#endif
69144 + }
69145 + } while_each_thread(task2, task);
69146 +
69147 + memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
69148 + memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
69149 +
69150 +out:
69151 +
69152 + return ret;
69153 +}
69154 +
69155 +static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
69156 +{
69157 + struct gr_reload_state new_reload_state = { };
69158 + int err;
69159 +
69160 + new_reload_state.oldpolicy_ptr = polstate;
69161 + new_reload_state.oldalloc_ptr = current_alloc_state;
69162 + new_reload_state.oldmode = oldmode;
69163 +
69164 + current_alloc_state = &new_reload_state.newalloc;
69165 + polstate = &new_reload_state.newpolicy;
69166 +
69167 + /* everything relevant is now saved off, copy in the new policy */
69168 + if (init_variables(args, true)) {
69169 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
69170 + err = -ENOMEM;
69171 + goto error;
69172 + }
69173 +
69174 + err = copy_user_acl(args);
69175 + free_init_variables();
69176 + if (err)
69177 + goto error;
69178 + /* the new policy is copied in, with the old policy available via saved_state
69179 + first go through applying roles, making sure to preserve special roles
69180 + then apply new subjects, making sure to preserve inherited and nested subjects,
69181 + though currently only inherited subjects will be preserved
69182 + */
69183 + err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
69184 + if (err)
69185 + goto error;
69186 +
69187 + /* we've now applied the new policy, so restore the old policy state to free it */
69188 + polstate = &new_reload_state.oldpolicy;
69189 + current_alloc_state = &new_reload_state.oldalloc;
69190 + free_variables(true);
69191 +
69192 + /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
69193 + to running_polstate/current_alloc_state inside stop_machine
69194 + */
69195 + err = 0;
69196 + goto out;
69197 +error:
69198 + /* on error of loading the new policy, we'll just keep the previous
69199 + policy set around
69200 + */
69201 + free_variables(true);
69202 +
69203 + /* doesn't affect runtime, but maintains consistent state */
69204 +out:
69205 + polstate = new_reload_state.oldpolicy_ptr;
69206 + current_alloc_state = new_reload_state.oldalloc_ptr;
69207 +
69208 + return err;
69209 +}
69210 +
69211 +static int
69212 +gracl_init(struct gr_arg *args)
69213 +{
69214 + int error = 0;
69215 +
69216 + memcpy(&gr_system_salt, args->salt, sizeof(gr_system_salt));
69217 + memcpy(&gr_system_sum, args->sum, sizeof(gr_system_sum));
69218 +
69219 + if (init_variables(args, false)) {
69220 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
69221 + error = -ENOMEM;
69222 + goto out;
69223 + }
69224 +
69225 + error = copy_user_acl(args);
69226 + free_init_variables();
69227 + if (error)
69228 + goto out;
69229 +
69230 + error = gr_set_acls(0);
69231 + if (error)
69232 + goto out;
69233 +
69234 + gr_enable_rbac_system();
69235 +
69236 + return 0;
69237 +
69238 +out:
69239 + free_variables(false);
69240 + return error;
69241 +}
69242 +
69243 +static int
69244 +lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
69245 + unsigned char **sum)
69246 +{
69247 + struct acl_role_label *r;
69248 + struct role_allowed_ip *ipp;
69249 + struct role_transition *trans;
69250 + unsigned int i;
69251 + int found = 0;
69252 + u32 curr_ip = current->signal->curr_ip;
69253 +
69254 + current->signal->saved_ip = curr_ip;
69255 +
69256 + /* check transition table */
69257 +
69258 + for (trans = current->role->transitions; trans; trans = trans->next) {
69259 + if (!strcmp(rolename, trans->rolename)) {
69260 + found = 1;
69261 + break;
69262 + }
69263 + }
69264 +
69265 + if (!found)
69266 + return 0;
69267 +
69268 + /* handle special roles that do not require authentication
69269 + and check ip */
69270 +
69271 + FOR_EACH_ROLE_START(r)
69272 + if (!strcmp(rolename, r->rolename) &&
69273 + (r->roletype & GR_ROLE_SPECIAL)) {
69274 + found = 0;
69275 + if (r->allowed_ips != NULL) {
69276 + for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
69277 + if ((ntohl(curr_ip) & ipp->netmask) ==
69278 + (ntohl(ipp->addr) & ipp->netmask))
69279 + found = 1;
69280 + }
69281 + } else
69282 + found = 2;
69283 + if (!found)
69284 + return 0;
69285 +
69286 + if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
69287 + ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
69288 + *salt = NULL;
69289 + *sum = NULL;
69290 + return 1;
69291 + }
69292 + }
69293 + FOR_EACH_ROLE_END(r)
69294 +
69295 + for (i = 0; i < polstate->num_sprole_pws; i++) {
69296 + if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
69297 + *salt = polstate->acl_special_roles[i]->salt;
69298 + *sum = polstate->acl_special_roles[i]->sum;
69299 + return 1;
69300 + }
69301 + }
69302 +
69303 + return 0;
69304 +}
69305 +
69306 +int gr_check_secure_terminal(struct task_struct *task)
69307 +{
69308 + struct task_struct *p, *p2, *p3;
69309 + struct files_struct *files;
69310 + struct fdtable *fdt;
69311 + struct file *our_file = NULL, *file;
69312 + int i;
69313 +
69314 + if (task->signal->tty == NULL)
69315 + return 1;
69316 +
69317 + files = get_files_struct(task);
69318 + if (files != NULL) {
69319 + rcu_read_lock();
69320 + fdt = files_fdtable(files);
69321 + for (i=0; i < fdt->max_fds; i++) {
69322 + file = fcheck_files(files, i);
69323 + if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
69324 + get_file(file);
69325 + our_file = file;
69326 + }
69327 + }
69328 + rcu_read_unlock();
69329 + put_files_struct(files);
69330 + }
69331 +
69332 + if (our_file == NULL)
69333 + return 1;
69334 +
69335 + read_lock(&tasklist_lock);
69336 + do_each_thread(p2, p) {
69337 + files = get_files_struct(p);
69338 + if (files == NULL ||
69339 + (p->signal && p->signal->tty == task->signal->tty)) {
69340 + if (files != NULL)
69341 + put_files_struct(files);
69342 + continue;
69343 + }
69344 + rcu_read_lock();
69345 + fdt = files_fdtable(files);
69346 + for (i=0; i < fdt->max_fds; i++) {
69347 + file = fcheck_files(files, i);
69348 + if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
69349 + file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
69350 + p3 = task;
69351 + while (task_pid_nr(p3) > 0) {
69352 + if (p3 == p)
69353 + break;
69354 + p3 = p3->real_parent;
69355 + }
69356 + if (p3 == p)
69357 + break;
69358 + gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
69359 + gr_handle_alertkill(p);
69360 + rcu_read_unlock();
69361 + put_files_struct(files);
69362 + read_unlock(&tasklist_lock);
69363 + fput(our_file);
69364 + return 0;
69365 + }
69366 + }
69367 + rcu_read_unlock();
69368 + put_files_struct(files);
69369 + } while_each_thread(p2, p);
69370 + read_unlock(&tasklist_lock);
69371 +
69372 + fput(our_file);
69373 + return 1;
69374 +}
69375 +
69376 +ssize_t
69377 +write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
69378 +{
69379 + struct gr_arg_wrapper uwrap;
69380 + unsigned char *sprole_salt = NULL;
69381 + unsigned char *sprole_sum = NULL;
69382 + int error = 0;
69383 + int error2 = 0;
69384 + size_t req_count = 0;
69385 + unsigned char oldmode = 0;
69386 +
69387 + mutex_lock(&gr_dev_mutex);
69388 +
69389 + if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
69390 + error = -EPERM;
69391 + goto out;
69392 + }
69393 +
69394 +#ifdef CONFIG_COMPAT
69395 + pax_open_kernel();
69396 + if (is_compat_task()) {
69397 + copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
69398 + copy_gr_arg = &copy_gr_arg_compat;
69399 + copy_acl_object_label = &copy_acl_object_label_compat;
69400 + copy_acl_subject_label = &copy_acl_subject_label_compat;
69401 + copy_acl_role_label = &copy_acl_role_label_compat;
69402 + copy_acl_ip_label = &copy_acl_ip_label_compat;
69403 + copy_role_allowed_ip = &copy_role_allowed_ip_compat;
69404 + copy_role_transition = &copy_role_transition_compat;
69405 + copy_sprole_pw = &copy_sprole_pw_compat;
69406 + copy_gr_hash_struct = &copy_gr_hash_struct_compat;
69407 + copy_pointer_from_array = &copy_pointer_from_array_compat;
69408 + get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
69409 + } else {
69410 + copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
69411 + copy_gr_arg = &copy_gr_arg_normal;
69412 + copy_acl_object_label = &copy_acl_object_label_normal;
69413 + copy_acl_subject_label = &copy_acl_subject_label_normal;
69414 + copy_acl_role_label = &copy_acl_role_label_normal;
69415 + copy_acl_ip_label = &copy_acl_ip_label_normal;
69416 + copy_role_allowed_ip = &copy_role_allowed_ip_normal;
69417 + copy_role_transition = &copy_role_transition_normal;
69418 + copy_sprole_pw = &copy_sprole_pw_normal;
69419 + copy_gr_hash_struct = &copy_gr_hash_struct_normal;
69420 + copy_pointer_from_array = &copy_pointer_from_array_normal;
69421 + get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
69422 + }
69423 + pax_close_kernel();
69424 +#endif
69425 +
69426 + req_count = get_gr_arg_wrapper_size();
69427 +
69428 + if (count != req_count) {
69429 + gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
69430 + error = -EINVAL;
69431 + goto out;
69432 + }
69433 +
69434 +
69435 + if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
69436 + gr_auth_expires = 0;
69437 + gr_auth_attempts = 0;
69438 + }
69439 +
69440 + error = copy_gr_arg_wrapper(buf, &uwrap);
69441 + if (error)
69442 + goto out;
69443 +
69444 + error = copy_gr_arg(uwrap.arg, &gr_usermode);
69445 + if (error)
69446 + goto out;
69447 +
69448 + if (gr_usermode.mode != GR_SPROLE && gr_usermode.mode != GR_SPROLEPAM &&
69449 + gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
69450 + time_after(gr_auth_expires, get_seconds())) {
69451 + error = -EBUSY;
69452 + goto out;
69453 + }
69454 +
69455 + /* if non-root trying to do anything other than use a special role,
69456 + do not attempt authentication, do not count towards authentication
69457 + locking
69458 + */
69459 +
69460 + if (gr_usermode.mode != GR_SPROLE && gr_usermode.mode != GR_STATUS &&
69461 + gr_usermode.mode != GR_UNSPROLE && gr_usermode.mode != GR_SPROLEPAM &&
69462 + gr_is_global_nonroot(current_uid())) {
69463 + error = -EPERM;
69464 + goto out;
69465 + }
69466 +
69467 + /* ensure pw and special role name are null terminated */
69468 +
69469 + gr_usermode.pw[GR_PW_LEN - 1] = '\0';
69470 + gr_usermode.sp_role[GR_SPROLE_LEN - 1] = '\0';
69471 +
69472 + /* Okay.
69473 + * We have our enough of the argument structure..(we have yet
69474 + * to copy_from_user the tables themselves) . Copy the tables
69475 + * only if we need them, i.e. for loading operations. */
69476 +
69477 + switch (gr_usermode.mode) {
69478 + case GR_STATUS:
69479 + if (gr_acl_is_enabled()) {
69480 + error = 1;
69481 + if (!gr_check_secure_terminal(current))
69482 + error = 3;
69483 + } else
69484 + error = 2;
69485 + goto out;
69486 + case GR_SHUTDOWN:
69487 + if (gr_acl_is_enabled() && !(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
69488 + stop_machine(gr_rbac_disable, NULL, NULL);
69489 + free_variables(false);
69490 + memset(&gr_usermode, 0, sizeof(gr_usermode));
69491 + memset(&gr_system_salt, 0, sizeof(gr_system_salt));
69492 + memset(&gr_system_sum, 0, sizeof(gr_system_sum));
69493 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
69494 + } else if (gr_acl_is_enabled()) {
69495 + gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
69496 + error = -EPERM;
69497 + } else {
69498 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
69499 + error = -EAGAIN;
69500 + }
69501 + break;
69502 + case GR_ENABLE:
69503 + if (!gr_acl_is_enabled() && !(error2 = gracl_init(&gr_usermode)))
69504 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
69505 + else {
69506 + if (gr_acl_is_enabled())
69507 + error = -EAGAIN;
69508 + else
69509 + error = error2;
69510 + gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
69511 + }
69512 + break;
69513 + case GR_OLDRELOAD:
69514 + oldmode = 1;
69515 + case GR_RELOAD:
69516 + if (!gr_acl_is_enabled()) {
69517 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
69518 + error = -EAGAIN;
69519 + } else if (!(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
69520 + error2 = gracl_reload(&gr_usermode, oldmode);
69521 + if (!error2)
69522 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
69523 + else {
69524 + gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
69525 + error = error2;
69526 + }
69527 + } else {
69528 + gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
69529 + error = -EPERM;
69530 + }
69531 + break;
69532 + case GR_SEGVMOD:
69533 + if (unlikely(!gr_acl_is_enabled())) {
69534 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
69535 + error = -EAGAIN;
69536 + break;
69537 + }
69538 +
69539 + if (!(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
69540 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
69541 + if (gr_usermode.segv_device && gr_usermode.segv_inode) {
69542 + struct acl_subject_label *segvacl;
69543 + segvacl =
69544 + lookup_acl_subj_label(gr_usermode.segv_inode,
69545 + gr_usermode.segv_device,
69546 + current->role);
69547 + if (segvacl) {
69548 + segvacl->crashes = 0;
69549 + segvacl->expires = 0;
69550 + }
69551 + } else if (gr_find_uid(gr_usermode.segv_uid) >= 0) {
69552 + gr_remove_uid(gr_usermode.segv_uid);
69553 + }
69554 + } else {
69555 + gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
69556 + error = -EPERM;
69557 + }
69558 + break;
69559 + case GR_SPROLE:
69560 + case GR_SPROLEPAM:
69561 + if (unlikely(!gr_acl_is_enabled())) {
69562 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
69563 + error = -EAGAIN;
69564 + break;
69565 + }
69566 +
69567 + if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
69568 + current->role->expires = 0;
69569 + current->role->auth_attempts = 0;
69570 + }
69571 +
69572 + if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
69573 + time_after(current->role->expires, get_seconds())) {
69574 + error = -EBUSY;
69575 + goto out;
69576 + }
69577 +
69578 + if (lookup_special_role_auth
69579 + (gr_usermode.mode, gr_usermode.sp_role, &sprole_salt, &sprole_sum)
69580 + && ((!sprole_salt && !sprole_sum)
69581 + || !(chkpw(&gr_usermode, sprole_salt, sprole_sum)))) {
69582 + char *p = "";
69583 + assign_special_role(gr_usermode.sp_role);
69584 + read_lock(&tasklist_lock);
69585 + if (current->real_parent)
69586 + p = current->real_parent->role->rolename;
69587 + read_unlock(&tasklist_lock);
69588 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
69589 + p, acl_sp_role_value);
69590 + } else {
69591 + gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode.sp_role);
69592 + error = -EPERM;
69593 + if(!(current->role->auth_attempts++))
69594 + current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
69595 +
69596 + goto out;
69597 + }
69598 + break;
69599 + case GR_UNSPROLE:
69600 + if (unlikely(!gr_acl_is_enabled())) {
69601 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
69602 + error = -EAGAIN;
69603 + break;
69604 + }
69605 +
69606 + if (current->role->roletype & GR_ROLE_SPECIAL) {
69607 + char *p = "";
69608 + int i = 0;
69609 +
69610 + read_lock(&tasklist_lock);
69611 + if (current->real_parent) {
69612 + p = current->real_parent->role->rolename;
69613 + i = current->real_parent->acl_role_id;
69614 + }
69615 + read_unlock(&tasklist_lock);
69616 +
69617 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
69618 + gr_set_acls(1);
69619 + } else {
69620 + error = -EPERM;
69621 + goto out;
69622 + }
69623 + break;
69624 + default:
69625 + gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode.mode);
69626 + error = -EINVAL;
69627 + break;
69628 + }
69629 +
69630 + if (error != -EPERM)
69631 + goto out;
69632 +
69633 + if(!(gr_auth_attempts++))
69634 + gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
69635 +
69636 + out:
69637 + mutex_unlock(&gr_dev_mutex);
69638 +
69639 + if (!error)
69640 + error = req_count;
69641 +
69642 + return error;
69643 +}
69644 +
69645 +int
69646 +gr_set_acls(const int type)
69647 +{
69648 + struct task_struct *task, *task2;
69649 + struct acl_role_label *role = current->role;
69650 + struct acl_subject_label *subj;
69651 + __u16 acl_role_id = current->acl_role_id;
69652 + const struct cred *cred;
69653 + int ret;
69654 +
69655 + rcu_read_lock();
69656 + read_lock(&tasklist_lock);
69657 + read_lock(&grsec_exec_file_lock);
69658 + do_each_thread(task2, task) {
69659 + /* check to see if we're called from the exit handler,
69660 + if so, only replace ACLs that have inherited the admin
69661 + ACL */
69662 +
69663 + if (type && (task->role != role ||
69664 + task->acl_role_id != acl_role_id))
69665 + continue;
69666 +
69667 + task->acl_role_id = 0;
69668 + task->acl_sp_role = 0;
69669 + task->inherited = 0;
69670 +
69671 + if (task->exec_file) {
69672 + cred = __task_cred(task);
69673 + task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
69674 + subj = __gr_get_subject_for_task(polstate, task, NULL);
69675 + if (subj == NULL) {
69676 + ret = -EINVAL;
69677 + read_unlock(&grsec_exec_file_lock);
69678 + read_unlock(&tasklist_lock);
69679 + rcu_read_unlock();
69680 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
69681 + return ret;
69682 + }
69683 + __gr_apply_subject_to_task(polstate, task, subj);
69684 + } else {
69685 + // it's a kernel process
69686 + task->role = polstate->kernel_role;
69687 + task->acl = polstate->kernel_role->root_label;
69688 +#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
69689 + task->acl->mode &= ~GR_PROCFIND;
69690 +#endif
69691 + }
69692 + } while_each_thread(task2, task);
69693 + read_unlock(&grsec_exec_file_lock);
69694 + read_unlock(&tasklist_lock);
69695 + rcu_read_unlock();
69696 +
69697 + return 0;
69698 +}
69699 diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
69700 new file mode 100644
69701 index 0000000..39645c9
69702 --- /dev/null
69703 +++ b/grsecurity/gracl_res.c
69704 @@ -0,0 +1,68 @@
69705 +#include <linux/kernel.h>
69706 +#include <linux/sched.h>
69707 +#include <linux/gracl.h>
69708 +#include <linux/grinternal.h>
69709 +
69710 +static const char *restab_log[] = {
69711 + [RLIMIT_CPU] = "RLIMIT_CPU",
69712 + [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
69713 + [RLIMIT_DATA] = "RLIMIT_DATA",
69714 + [RLIMIT_STACK] = "RLIMIT_STACK",
69715 + [RLIMIT_CORE] = "RLIMIT_CORE",
69716 + [RLIMIT_RSS] = "RLIMIT_RSS",
69717 + [RLIMIT_NPROC] = "RLIMIT_NPROC",
69718 + [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
69719 + [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
69720 + [RLIMIT_AS] = "RLIMIT_AS",
69721 + [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
69722 + [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
69723 + [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
69724 + [RLIMIT_NICE] = "RLIMIT_NICE",
69725 + [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
69726 + [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
69727 + [GR_CRASH_RES] = "RLIMIT_CRASH"
69728 +};
69729 +
69730 +void
69731 +gr_log_resource(const struct task_struct *task,
69732 + const int res, const unsigned long wanted, const int gt)
69733 +{
69734 + const struct cred *cred;
69735 + unsigned long rlim;
69736 +
69737 + if (!gr_acl_is_enabled() && !grsec_resource_logging)
69738 + return;
69739 +
69740 + // not yet supported resource
69741 + if (unlikely(!restab_log[res]))
69742 + return;
69743 +
69744 + if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
69745 + rlim = task_rlimit_max(task, res);
69746 + else
69747 + rlim = task_rlimit(task, res);
69748 +
69749 + if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
69750 + return;
69751 +
69752 + rcu_read_lock();
69753 + cred = __task_cred(task);
69754 +
69755 + if (res == RLIMIT_NPROC &&
69756 + (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
69757 + cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
69758 + goto out_rcu_unlock;
69759 + else if (res == RLIMIT_MEMLOCK &&
69760 + cap_raised(cred->cap_effective, CAP_IPC_LOCK))
69761 + goto out_rcu_unlock;
69762 + else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
69763 + goto out_rcu_unlock;
69764 + rcu_read_unlock();
69765 +
69766 + gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
69767 +
69768 + return;
69769 +out_rcu_unlock:
69770 + rcu_read_unlock();
69771 + return;
69772 +}
69773 diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
69774 new file mode 100644
69775 index 0000000..2040e61
69776 --- /dev/null
69777 +++ b/grsecurity/gracl_segv.c
69778 @@ -0,0 +1,313 @@
69779 +#include <linux/kernel.h>
69780 +#include <linux/mm.h>
69781 +#include <asm/uaccess.h>
69782 +#include <asm/errno.h>
69783 +#include <asm/mman.h>
69784 +#include <net/sock.h>
69785 +#include <linux/file.h>
69786 +#include <linux/fs.h>
69787 +#include <linux/net.h>
69788 +#include <linux/in.h>
69789 +#include <linux/slab.h>
69790 +#include <linux/types.h>
69791 +#include <linux/sched.h>
69792 +#include <linux/timer.h>
69793 +#include <linux/gracl.h>
69794 +#include <linux/grsecurity.h>
69795 +#include <linux/grinternal.h>
69796 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69797 +#include <linux/magic.h>
69798 +#include <linux/pagemap.h>
69799 +#include "../fs/btrfs/async-thread.h"
69800 +#include "../fs/btrfs/ctree.h"
69801 +#include "../fs/btrfs/btrfs_inode.h"
69802 +#endif
69803 +
69804 +static struct crash_uid *uid_set;
69805 +static unsigned short uid_used;
69806 +static DEFINE_SPINLOCK(gr_uid_lock);
69807 +extern rwlock_t gr_inode_lock;
69808 +extern struct acl_subject_label *
69809 + lookup_acl_subj_label(const ino_t inode, const dev_t dev,
69810 + struct acl_role_label *role);
69811 +
69812 +static inline dev_t __get_dev(const struct dentry *dentry)
69813 +{
69814 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69815 + if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
69816 + return BTRFS_I(dentry->d_inode)->root->anon_dev;
69817 + else
69818 +#endif
69819 + return dentry->d_sb->s_dev;
69820 +}
69821 +
69822 +int
69823 +gr_init_uidset(void)
69824 +{
69825 + uid_set =
69826 + kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
69827 + uid_used = 0;
69828 +
69829 + return uid_set ? 1 : 0;
69830 +}
69831 +
69832 +void
69833 +gr_free_uidset(void)
69834 +{
69835 + if (uid_set) {
69836 + struct crash_uid *tmpset;
69837 + spin_lock(&gr_uid_lock);
69838 + tmpset = uid_set;
69839 + uid_set = NULL;
69840 + uid_used = 0;
69841 + spin_unlock(&gr_uid_lock);
69842 + if (tmpset)
69843 + kfree(tmpset);
69844 + }
69845 +
69846 + return;
69847 +}
69848 +
69849 +int
69850 +gr_find_uid(const uid_t uid)
69851 +{
69852 + struct crash_uid *tmp = uid_set;
69853 + uid_t buid;
69854 + int low = 0, high = uid_used - 1, mid;
69855 +
69856 + while (high >= low) {
69857 + mid = (low + high) >> 1;
69858 + buid = tmp[mid].uid;
69859 + if (buid == uid)
69860 + return mid;
69861 + if (buid > uid)
69862 + high = mid - 1;
69863 + if (buid < uid)
69864 + low = mid + 1;
69865 + }
69866 +
69867 + return -1;
69868 +}
69869 +
69870 +static __inline__ void
69871 +gr_insertsort(void)
69872 +{
69873 + unsigned short i, j;
69874 + struct crash_uid index;
69875 +
69876 + for (i = 1; i < uid_used; i++) {
69877 + index = uid_set[i];
69878 + j = i;
69879 + while ((j > 0) && uid_set[j - 1].uid > index.uid) {
69880 + uid_set[j] = uid_set[j - 1];
69881 + j--;
69882 + }
69883 + uid_set[j] = index;
69884 + }
69885 +
69886 + return;
69887 +}
69888 +
69889 +static __inline__ void
69890 +gr_insert_uid(const kuid_t kuid, const unsigned long expires)
69891 +{
69892 + int loc;
69893 + uid_t uid = GR_GLOBAL_UID(kuid);
69894 +
69895 + if (uid_used == GR_UIDTABLE_MAX)
69896 + return;
69897 +
69898 + loc = gr_find_uid(uid);
69899 +
69900 + if (loc >= 0) {
69901 + uid_set[loc].expires = expires;
69902 + return;
69903 + }
69904 +
69905 + uid_set[uid_used].uid = uid;
69906 + uid_set[uid_used].expires = expires;
69907 + uid_used++;
69908 +
69909 + gr_insertsort();
69910 +
69911 + return;
69912 +}
69913 +
69914 +void
69915 +gr_remove_uid(const unsigned short loc)
69916 +{
69917 + unsigned short i;
69918 +
69919 + for (i = loc + 1; i < uid_used; i++)
69920 + uid_set[i - 1] = uid_set[i];
69921 +
69922 + uid_used--;
69923 +
69924 + return;
69925 +}
69926 +
69927 +int
69928 +gr_check_crash_uid(const kuid_t kuid)
69929 +{
69930 + int loc;
69931 + int ret = 0;
69932 + uid_t uid;
69933 +
69934 + if (unlikely(!gr_acl_is_enabled()))
69935 + return 0;
69936 +
69937 + uid = GR_GLOBAL_UID(kuid);
69938 +
69939 + spin_lock(&gr_uid_lock);
69940 + loc = gr_find_uid(uid);
69941 +
69942 + if (loc < 0)
69943 + goto out_unlock;
69944 +
69945 + if (time_before_eq(uid_set[loc].expires, get_seconds()))
69946 + gr_remove_uid(loc);
69947 + else
69948 + ret = 1;
69949 +
69950 +out_unlock:
69951 + spin_unlock(&gr_uid_lock);
69952 + return ret;
69953 +}
69954 +
69955 +static __inline__ int
69956 +proc_is_setxid(const struct cred *cred)
69957 +{
69958 + if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
69959 + !uid_eq(cred->uid, cred->fsuid))
69960 + return 1;
69961 + if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
69962 + !gid_eq(cred->gid, cred->fsgid))
69963 + return 1;
69964 +
69965 + return 0;
69966 +}
69967 +
69968 +extern int gr_fake_force_sig(int sig, struct task_struct *t);
69969 +
69970 +void
69971 +gr_handle_crash(struct task_struct *task, const int sig)
69972 +{
69973 + struct acl_subject_label *curr;
69974 + struct task_struct *tsk, *tsk2;
69975 + const struct cred *cred;
69976 + const struct cred *cred2;
69977 +
69978 + if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
69979 + return;
69980 +
69981 + if (unlikely(!gr_acl_is_enabled()))
69982 + return;
69983 +
69984 + curr = task->acl;
69985 +
69986 + if (!(curr->resmask & (1U << GR_CRASH_RES)))
69987 + return;
69988 +
69989 + if (time_before_eq(curr->expires, get_seconds())) {
69990 + curr->expires = 0;
69991 + curr->crashes = 0;
69992 + }
69993 +
69994 + curr->crashes++;
69995 +
69996 + if (!curr->expires)
69997 + curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
69998 +
69999 + if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
70000 + time_after(curr->expires, get_seconds())) {
70001 + rcu_read_lock();
70002 + cred = __task_cred(task);
70003 + if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
70004 + gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
70005 + spin_lock(&gr_uid_lock);
70006 + gr_insert_uid(cred->uid, curr->expires);
70007 + spin_unlock(&gr_uid_lock);
70008 + curr->expires = 0;
70009 + curr->crashes = 0;
70010 + read_lock(&tasklist_lock);
70011 + do_each_thread(tsk2, tsk) {
70012 + cred2 = __task_cred(tsk);
70013 + if (tsk != task && uid_eq(cred2->uid, cred->uid))
70014 + gr_fake_force_sig(SIGKILL, tsk);
70015 + } while_each_thread(tsk2, tsk);
70016 + read_unlock(&tasklist_lock);
70017 + } else {
70018 + gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
70019 + read_lock(&tasklist_lock);
70020 + read_lock(&grsec_exec_file_lock);
70021 + do_each_thread(tsk2, tsk) {
70022 + if (likely(tsk != task)) {
70023 + // if this thread has the same subject as the one that triggered
70024 + // RES_CRASH and it's the same binary, kill it
70025 + if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
70026 + gr_fake_force_sig(SIGKILL, tsk);
70027 + }
70028 + } while_each_thread(tsk2, tsk);
70029 + read_unlock(&grsec_exec_file_lock);
70030 + read_unlock(&tasklist_lock);
70031 + }
70032 + rcu_read_unlock();
70033 + }
70034 +
70035 + return;
70036 +}
70037 +
70038 +int
70039 +gr_check_crash_exec(const struct file *filp)
70040 +{
70041 + struct acl_subject_label *curr;
70042 +
70043 + if (unlikely(!gr_acl_is_enabled()))
70044 + return 0;
70045 +
70046 + read_lock(&gr_inode_lock);
70047 + curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
70048 + __get_dev(filp->f_path.dentry),
70049 + current->role);
70050 + read_unlock(&gr_inode_lock);
70051 +
70052 + if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
70053 + (!curr->crashes && !curr->expires))
70054 + return 0;
70055 +
70056 + if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
70057 + time_after(curr->expires, get_seconds()))
70058 + return 1;
70059 + else if (time_before_eq(curr->expires, get_seconds())) {
70060 + curr->crashes = 0;
70061 + curr->expires = 0;
70062 + }
70063 +
70064 + return 0;
70065 +}
70066 +
70067 +void
70068 +gr_handle_alertkill(struct task_struct *task)
70069 +{
70070 + struct acl_subject_label *curracl;
70071 + __u32 curr_ip;
70072 + struct task_struct *p, *p2;
70073 +
70074 + if (unlikely(!gr_acl_is_enabled()))
70075 + return;
70076 +
70077 + curracl = task->acl;
70078 + curr_ip = task->signal->curr_ip;
70079 +
70080 + if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
70081 + read_lock(&tasklist_lock);
70082 + do_each_thread(p2, p) {
70083 + if (p->signal->curr_ip == curr_ip)
70084 + gr_fake_force_sig(SIGKILL, p);
70085 + } while_each_thread(p2, p);
70086 + read_unlock(&tasklist_lock);
70087 + } else if (curracl->mode & GR_KILLPROC)
70088 + gr_fake_force_sig(SIGKILL, task);
70089 +
70090 + return;
70091 +}
70092 diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
70093 new file mode 100644
70094 index 0000000..98011b0
70095 --- /dev/null
70096 +++ b/grsecurity/gracl_shm.c
70097 @@ -0,0 +1,40 @@
70098 +#include <linux/kernel.h>
70099 +#include <linux/mm.h>
70100 +#include <linux/sched.h>
70101 +#include <linux/file.h>
70102 +#include <linux/ipc.h>
70103 +#include <linux/gracl.h>
70104 +#include <linux/grsecurity.h>
70105 +#include <linux/grinternal.h>
70106 +
70107 +int
70108 +gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
70109 + const time_t shm_createtime, const kuid_t cuid, const int shmid)
70110 +{
70111 + struct task_struct *task;
70112 +
70113 + if (!gr_acl_is_enabled())
70114 + return 1;
70115 +
70116 + rcu_read_lock();
70117 + read_lock(&tasklist_lock);
70118 +
70119 + task = find_task_by_vpid(shm_cprid);
70120 +
70121 + if (unlikely(!task))
70122 + task = find_task_by_vpid(shm_lapid);
70123 +
70124 + if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
70125 + (task_pid_nr(task) == shm_lapid)) &&
70126 + (task->acl->mode & GR_PROTSHM) &&
70127 + (task->acl != current->acl))) {
70128 + read_unlock(&tasklist_lock);
70129 + rcu_read_unlock();
70130 + gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
70131 + return 0;
70132 + }
70133 + read_unlock(&tasklist_lock);
70134 + rcu_read_unlock();
70135 +
70136 + return 1;
70137 +}
70138 diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
70139 new file mode 100644
70140 index 0000000..bc0be01
70141 --- /dev/null
70142 +++ b/grsecurity/grsec_chdir.c
70143 @@ -0,0 +1,19 @@
70144 +#include <linux/kernel.h>
70145 +#include <linux/sched.h>
70146 +#include <linux/fs.h>
70147 +#include <linux/file.h>
70148 +#include <linux/grsecurity.h>
70149 +#include <linux/grinternal.h>
70150 +
70151 +void
70152 +gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
70153 +{
70154 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
70155 + if ((grsec_enable_chdir && grsec_enable_group &&
70156 + in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
70157 + !grsec_enable_group)) {
70158 + gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
70159 + }
70160 +#endif
70161 + return;
70162 +}
70163 diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
70164 new file mode 100644
70165 index 0000000..e10b319
70166 --- /dev/null
70167 +++ b/grsecurity/grsec_chroot.c
70168 @@ -0,0 +1,370 @@
70169 +#include <linux/kernel.h>
70170 +#include <linux/module.h>
70171 +#include <linux/sched.h>
70172 +#include <linux/file.h>
70173 +#include <linux/fs.h>
70174 +#include <linux/mount.h>
70175 +#include <linux/types.h>
70176 +#include "../fs/mount.h"
70177 +#include <linux/grsecurity.h>
70178 +#include <linux/grinternal.h>
70179 +
70180 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
70181 +int gr_init_ran;
70182 +#endif
70183 +
70184 +void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
70185 +{
70186 +#ifdef CONFIG_GRKERNSEC
70187 + if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
70188 + path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
70189 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
70190 + && gr_init_ran
70191 +#endif
70192 + )
70193 + task->gr_is_chrooted = 1;
70194 + else {
70195 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
70196 + if (task_pid_nr(task) == 1 && !gr_init_ran)
70197 + gr_init_ran = 1;
70198 +#endif
70199 + task->gr_is_chrooted = 0;
70200 + }
70201 +
70202 + task->gr_chroot_dentry = path->dentry;
70203 +#endif
70204 + return;
70205 +}
70206 +
70207 +void gr_clear_chroot_entries(struct task_struct *task)
70208 +{
70209 +#ifdef CONFIG_GRKERNSEC
70210 + task->gr_is_chrooted = 0;
70211 + task->gr_chroot_dentry = NULL;
70212 +#endif
70213 + return;
70214 +}
70215 +
70216 +int
70217 +gr_handle_chroot_unix(const pid_t pid)
70218 +{
70219 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
70220 + struct task_struct *p;
70221 +
70222 + if (unlikely(!grsec_enable_chroot_unix))
70223 + return 1;
70224 +
70225 + if (likely(!proc_is_chrooted(current)))
70226 + return 1;
70227 +
70228 + rcu_read_lock();
70229 + read_lock(&tasklist_lock);
70230 + p = find_task_by_vpid_unrestricted(pid);
70231 + if (unlikely(p && !have_same_root(current, p))) {
70232 + read_unlock(&tasklist_lock);
70233 + rcu_read_unlock();
70234 + gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
70235 + return 0;
70236 + }
70237 + read_unlock(&tasklist_lock);
70238 + rcu_read_unlock();
70239 +#endif
70240 + return 1;
70241 +}
70242 +
70243 +int
70244 +gr_handle_chroot_nice(void)
70245 +{
70246 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
70247 + if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
70248 + gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
70249 + return -EPERM;
70250 + }
70251 +#endif
70252 + return 0;
70253 +}
70254 +
70255 +int
70256 +gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
70257 +{
70258 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
70259 + if (grsec_enable_chroot_nice && (niceval < task_nice(p))
70260 + && proc_is_chrooted(current)) {
70261 + gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
70262 + return -EACCES;
70263 + }
70264 +#endif
70265 + return 0;
70266 +}
70267 +
70268 +int
70269 +gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
70270 +{
70271 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
70272 + struct task_struct *p;
70273 + int ret = 0;
70274 + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
70275 + return ret;
70276 +
70277 + read_lock(&tasklist_lock);
70278 + do_each_pid_task(pid, type, p) {
70279 + if (!have_same_root(current, p)) {
70280 + ret = 1;
70281 + goto out;
70282 + }
70283 + } while_each_pid_task(pid, type, p);
70284 +out:
70285 + read_unlock(&tasklist_lock);
70286 + return ret;
70287 +#endif
70288 + return 0;
70289 +}
70290 +
70291 +int
70292 +gr_pid_is_chrooted(struct task_struct *p)
70293 +{
70294 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
70295 + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
70296 + return 0;
70297 +
70298 + if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
70299 + !have_same_root(current, p)) {
70300 + return 1;
70301 + }
70302 +#endif
70303 + return 0;
70304 +}
70305 +
70306 +EXPORT_SYMBOL(gr_pid_is_chrooted);
70307 +
70308 +#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
70309 +int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
70310 +{
70311 + struct path path, currentroot;
70312 + int ret = 0;
70313 +
70314 + path.dentry = (struct dentry *)u_dentry;
70315 + path.mnt = (struct vfsmount *)u_mnt;
70316 + get_fs_root(current->fs, &currentroot);
70317 + if (path_is_under(&path, &currentroot))
70318 + ret = 1;
70319 + path_put(&currentroot);
70320 +
70321 + return ret;
70322 +}
70323 +#endif
70324 +
70325 +int
70326 +gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
70327 +{
70328 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
70329 + if (!grsec_enable_chroot_fchdir)
70330 + return 1;
70331 +
70332 + if (!proc_is_chrooted(current))
70333 + return 1;
70334 + else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
70335 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
70336 + return 0;
70337 + }
70338 +#endif
70339 + return 1;
70340 +}
70341 +
70342 +int
70343 +gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
70344 + const time_t shm_createtime)
70345 +{
70346 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
70347 + struct task_struct *p;
70348 + time_t starttime;
70349 +
70350 + if (unlikely(!grsec_enable_chroot_shmat))
70351 + return 1;
70352 +
70353 + if (likely(!proc_is_chrooted(current)))
70354 + return 1;
70355 +
70356 + rcu_read_lock();
70357 + read_lock(&tasklist_lock);
70358 +
70359 + if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
70360 + starttime = p->start_time.tv_sec;
70361 + if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
70362 + if (have_same_root(current, p)) {
70363 + goto allow;
70364 + } else {
70365 + read_unlock(&tasklist_lock);
70366 + rcu_read_unlock();
70367 + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
70368 + return 0;
70369 + }
70370 + }
70371 + /* creator exited, pid reuse, fall through to next check */
70372 + }
70373 + if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
70374 + if (unlikely(!have_same_root(current, p))) {
70375 + read_unlock(&tasklist_lock);
70376 + rcu_read_unlock();
70377 + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
70378 + return 0;
70379 + }
70380 + }
70381 +
70382 +allow:
70383 + read_unlock(&tasklist_lock);
70384 + rcu_read_unlock();
70385 +#endif
70386 + return 1;
70387 +}
70388 +
70389 +void
70390 +gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
70391 +{
70392 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
70393 + if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
70394 + gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
70395 +#endif
70396 + return;
70397 +}
70398 +
70399 +int
70400 +gr_handle_chroot_mknod(const struct dentry *dentry,
70401 + const struct vfsmount *mnt, const int mode)
70402 +{
70403 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
70404 + if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
70405 + proc_is_chrooted(current)) {
70406 + gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
70407 + return -EPERM;
70408 + }
70409 +#endif
70410 + return 0;
70411 +}
70412 +
70413 +int
70414 +gr_handle_chroot_mount(const struct dentry *dentry,
70415 + const struct vfsmount *mnt, const char *dev_name)
70416 +{
70417 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
70418 + if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
70419 + gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
70420 + return -EPERM;
70421 + }
70422 +#endif
70423 + return 0;
70424 +}
70425 +
70426 +int
70427 +gr_handle_chroot_pivot(void)
70428 +{
70429 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
70430 + if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
70431 + gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
70432 + return -EPERM;
70433 + }
70434 +#endif
70435 + return 0;
70436 +}
70437 +
70438 +int
70439 +gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
70440 +{
70441 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
70442 + if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
70443 + !gr_is_outside_chroot(dentry, mnt)) {
70444 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
70445 + return -EPERM;
70446 + }
70447 +#endif
70448 + return 0;
70449 +}
70450 +
70451 +extern const char *captab_log[];
70452 +extern int captab_log_entries;
70453 +
70454 +int
70455 +gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
70456 +{
70457 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
70458 + if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
70459 + kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
70460 + if (cap_raised(chroot_caps, cap)) {
70461 + if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
70462 + gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
70463 + }
70464 + return 0;
70465 + }
70466 + }
70467 +#endif
70468 + return 1;
70469 +}
70470 +
70471 +int
70472 +gr_chroot_is_capable(const int cap)
70473 +{
70474 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
70475 + return gr_task_chroot_is_capable(current, current_cred(), cap);
70476 +#endif
70477 + return 1;
70478 +}
70479 +
70480 +int
70481 +gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
70482 +{
70483 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
70484 + if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
70485 + kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
70486 + if (cap_raised(chroot_caps, cap)) {
70487 + return 0;
70488 + }
70489 + }
70490 +#endif
70491 + return 1;
70492 +}
70493 +
70494 +int
70495 +gr_chroot_is_capable_nolog(const int cap)
70496 +{
70497 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
70498 + return gr_task_chroot_is_capable_nolog(current, cap);
70499 +#endif
70500 + return 1;
70501 +}
70502 +
70503 +int
70504 +gr_handle_chroot_sysctl(const int op)
70505 +{
70506 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
70507 + if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
70508 + proc_is_chrooted(current))
70509 + return -EACCES;
70510 +#endif
70511 + return 0;
70512 +}
70513 +
70514 +void
70515 +gr_handle_chroot_chdir(const struct path *path)
70516 +{
70517 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
70518 + if (grsec_enable_chroot_chdir)
70519 + set_fs_pwd(current->fs, path);
70520 +#endif
70521 + return;
70522 +}
70523 +
70524 +int
70525 +gr_handle_chroot_chmod(const struct dentry *dentry,
70526 + const struct vfsmount *mnt, const int mode)
70527 +{
70528 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
70529 + /* allow chmod +s on directories, but not files */
70530 + if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
70531 + ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
70532 + proc_is_chrooted(current)) {
70533 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
70534 + return -EPERM;
70535 + }
70536 +#endif
70537 + return 0;
70538 +}
70539 diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
70540 new file mode 100644
70541 index 0000000..52b3e30
70542 --- /dev/null
70543 +++ b/grsecurity/grsec_disabled.c
70544 @@ -0,0 +1,433 @@
70545 +#include <linux/kernel.h>
70546 +#include <linux/module.h>
70547 +#include <linux/sched.h>
70548 +#include <linux/file.h>
70549 +#include <linux/fs.h>
70550 +#include <linux/kdev_t.h>
70551 +#include <linux/net.h>
70552 +#include <linux/in.h>
70553 +#include <linux/ip.h>
70554 +#include <linux/skbuff.h>
70555 +#include <linux/sysctl.h>
70556 +
70557 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
70558 +void
70559 +pax_set_initial_flags(struct linux_binprm *bprm)
70560 +{
70561 + return;
70562 +}
70563 +#endif
70564 +
70565 +#ifdef CONFIG_SYSCTL
70566 +__u32
70567 +gr_handle_sysctl(const struct ctl_table * table, const int op)
70568 +{
70569 + return 0;
70570 +}
70571 +#endif
70572 +
70573 +#ifdef CONFIG_TASKSTATS
70574 +int gr_is_taskstats_denied(int pid)
70575 +{
70576 + return 0;
70577 +}
70578 +#endif
70579 +
70580 +int
70581 +gr_acl_is_enabled(void)
70582 +{
70583 + return 0;
70584 +}
70585 +
70586 +void
70587 +gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
70588 +{
70589 + return;
70590 +}
70591 +
70592 +int
70593 +gr_handle_rawio(const struct inode *inode)
70594 +{
70595 + return 0;
70596 +}
70597 +
70598 +void
70599 +gr_acl_handle_psacct(struct task_struct *task, const long code)
70600 +{
70601 + return;
70602 +}
70603 +
70604 +int
70605 +gr_handle_ptrace(struct task_struct *task, const long request)
70606 +{
70607 + return 0;
70608 +}
70609 +
70610 +int
70611 +gr_handle_proc_ptrace(struct task_struct *task)
70612 +{
70613 + return 0;
70614 +}
70615 +
70616 +int
70617 +gr_set_acls(const int type)
70618 +{
70619 + return 0;
70620 +}
70621 +
70622 +int
70623 +gr_check_hidden_task(const struct task_struct *tsk)
70624 +{
70625 + return 0;
70626 +}
70627 +
70628 +int
70629 +gr_check_protected_task(const struct task_struct *task)
70630 +{
70631 + return 0;
70632 +}
70633 +
70634 +int
70635 +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
70636 +{
70637 + return 0;
70638 +}
70639 +
70640 +void
70641 +gr_copy_label(struct task_struct *tsk)
70642 +{
70643 + return;
70644 +}
70645 +
70646 +void
70647 +gr_set_pax_flags(struct task_struct *task)
70648 +{
70649 + return;
70650 +}
70651 +
70652 +int
70653 +gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
70654 + const int unsafe_share)
70655 +{
70656 + return 0;
70657 +}
70658 +
70659 +void
70660 +gr_handle_delete(const ino_t ino, const dev_t dev)
70661 +{
70662 + return;
70663 +}
70664 +
70665 +void
70666 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
70667 +{
70668 + return;
70669 +}
70670 +
70671 +void
70672 +gr_handle_crash(struct task_struct *task, const int sig)
70673 +{
70674 + return;
70675 +}
70676 +
70677 +int
70678 +gr_check_crash_exec(const struct file *filp)
70679 +{
70680 + return 0;
70681 +}
70682 +
70683 +int
70684 +gr_check_crash_uid(const kuid_t uid)
70685 +{
70686 + return 0;
70687 +}
70688 +
70689 +void
70690 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
70691 + struct dentry *old_dentry,
70692 + struct dentry *new_dentry,
70693 + struct vfsmount *mnt, const __u8 replace)
70694 +{
70695 + return;
70696 +}
70697 +
70698 +int
70699 +gr_search_socket(const int family, const int type, const int protocol)
70700 +{
70701 + return 1;
70702 +}
70703 +
70704 +int
70705 +gr_search_connectbind(const int mode, const struct socket *sock,
70706 + const struct sockaddr_in *addr)
70707 +{
70708 + return 0;
70709 +}
70710 +
70711 +void
70712 +gr_handle_alertkill(struct task_struct *task)
70713 +{
70714 + return;
70715 +}
70716 +
70717 +__u32
70718 +gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
70719 +{
70720 + return 1;
70721 +}
70722 +
70723 +__u32
70724 +gr_acl_handle_hidden_file(const struct dentry * dentry,
70725 + const struct vfsmount * mnt)
70726 +{
70727 + return 1;
70728 +}
70729 +
70730 +__u32
70731 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
70732 + int acc_mode)
70733 +{
70734 + return 1;
70735 +}
70736 +
70737 +__u32
70738 +gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
70739 +{
70740 + return 1;
70741 +}
70742 +
70743 +__u32
70744 +gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
70745 +{
70746 + return 1;
70747 +}
70748 +
70749 +int
70750 +gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
70751 + unsigned int *vm_flags)
70752 +{
70753 + return 1;
70754 +}
70755 +
70756 +__u32
70757 +gr_acl_handle_truncate(const struct dentry * dentry,
70758 + const struct vfsmount * mnt)
70759 +{
70760 + return 1;
70761 +}
70762 +
70763 +__u32
70764 +gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
70765 +{
70766 + return 1;
70767 +}
70768 +
70769 +__u32
70770 +gr_acl_handle_access(const struct dentry * dentry,
70771 + const struct vfsmount * mnt, const int fmode)
70772 +{
70773 + return 1;
70774 +}
70775 +
70776 +__u32
70777 +gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
70778 + umode_t *mode)
70779 +{
70780 + return 1;
70781 +}
70782 +
70783 +__u32
70784 +gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
70785 +{
70786 + return 1;
70787 +}
70788 +
70789 +__u32
70790 +gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
70791 +{
70792 + return 1;
70793 +}
70794 +
70795 +__u32
70796 +gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
70797 +{
70798 + return 1;
70799 +}
70800 +
70801 +void
70802 +grsecurity_init(void)
70803 +{
70804 + return;
70805 +}
70806 +
70807 +umode_t gr_acl_umask(void)
70808 +{
70809 + return 0;
70810 +}
70811 +
70812 +__u32
70813 +gr_acl_handle_mknod(const struct dentry * new_dentry,
70814 + const struct dentry * parent_dentry,
70815 + const struct vfsmount * parent_mnt,
70816 + const int mode)
70817 +{
70818 + return 1;
70819 +}
70820 +
70821 +__u32
70822 +gr_acl_handle_mkdir(const struct dentry * new_dentry,
70823 + const struct dentry * parent_dentry,
70824 + const struct vfsmount * parent_mnt)
70825 +{
70826 + return 1;
70827 +}
70828 +
70829 +__u32
70830 +gr_acl_handle_symlink(const struct dentry * new_dentry,
70831 + const struct dentry * parent_dentry,
70832 + const struct vfsmount * parent_mnt, const struct filename *from)
70833 +{
70834 + return 1;
70835 +}
70836 +
70837 +__u32
70838 +gr_acl_handle_link(const struct dentry * new_dentry,
70839 + const struct dentry * parent_dentry,
70840 + const struct vfsmount * parent_mnt,
70841 + const struct dentry * old_dentry,
70842 + const struct vfsmount * old_mnt, const struct filename *to)
70843 +{
70844 + return 1;
70845 +}
70846 +
70847 +int
70848 +gr_acl_handle_rename(const struct dentry *new_dentry,
70849 + const struct dentry *parent_dentry,
70850 + const struct vfsmount *parent_mnt,
70851 + const struct dentry *old_dentry,
70852 + const struct inode *old_parent_inode,
70853 + const struct vfsmount *old_mnt, const struct filename *newname)
70854 +{
70855 + return 0;
70856 +}
70857 +
70858 +int
70859 +gr_acl_handle_filldir(const struct file *file, const char *name,
70860 + const int namelen, const ino_t ino)
70861 +{
70862 + return 1;
70863 +}
70864 +
70865 +int
70866 +gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
70867 + const time_t shm_createtime, const kuid_t cuid, const int shmid)
70868 +{
70869 + return 1;
70870 +}
70871 +
70872 +int
70873 +gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
70874 +{
70875 + return 0;
70876 +}
70877 +
70878 +int
70879 +gr_search_accept(const struct socket *sock)
70880 +{
70881 + return 0;
70882 +}
70883 +
70884 +int
70885 +gr_search_listen(const struct socket *sock)
70886 +{
70887 + return 0;
70888 +}
70889 +
70890 +int
70891 +gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
70892 +{
70893 + return 0;
70894 +}
70895 +
70896 +__u32
70897 +gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
70898 +{
70899 + return 1;
70900 +}
70901 +
70902 +__u32
70903 +gr_acl_handle_creat(const struct dentry * dentry,
70904 + const struct dentry * p_dentry,
70905 + const struct vfsmount * p_mnt, int open_flags, int acc_mode,
70906 + const int imode)
70907 +{
70908 + return 1;
70909 +}
70910 +
70911 +void
70912 +gr_acl_handle_exit(void)
70913 +{
70914 + return;
70915 +}
70916 +
70917 +int
70918 +gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
70919 +{
70920 + return 1;
70921 +}
70922 +
70923 +void
70924 +gr_set_role_label(const kuid_t uid, const kgid_t gid)
70925 +{
70926 + return;
70927 +}
70928 +
70929 +int
70930 +gr_acl_handle_procpidmem(const struct task_struct *task)
70931 +{
70932 + return 0;
70933 +}
70934 +
70935 +int
70936 +gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
70937 +{
70938 + return 0;
70939 +}
70940 +
70941 +int
70942 +gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
70943 +{
70944 + return 0;
70945 +}
70946 +
70947 +int
70948 +gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
70949 +{
70950 + return 0;
70951 +}
70952 +
70953 +int
70954 +gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
70955 +{
70956 + return 0;
70957 +}
70958 +
70959 +int gr_acl_enable_at_secure(void)
70960 +{
70961 + return 0;
70962 +}
70963 +
70964 +dev_t gr_get_dev_from_dentry(struct dentry *dentry)
70965 +{
70966 + return dentry->d_sb->s_dev;
70967 +}
70968 +
70969 +void gr_put_exec_file(struct task_struct *task)
70970 +{
70971 + return;
70972 +}
70973 +
70974 +#ifdef CONFIG_SECURITY
70975 +EXPORT_SYMBOL(gr_check_user_change);
70976 +EXPORT_SYMBOL(gr_check_group_change);
70977 +#endif
70978 diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
70979 new file mode 100644
70980 index 0000000..387032b
70981 --- /dev/null
70982 +++ b/grsecurity/grsec_exec.c
70983 @@ -0,0 +1,187 @@
70984 +#include <linux/kernel.h>
70985 +#include <linux/sched.h>
70986 +#include <linux/file.h>
70987 +#include <linux/binfmts.h>
70988 +#include <linux/fs.h>
70989 +#include <linux/types.h>
70990 +#include <linux/grdefs.h>
70991 +#include <linux/grsecurity.h>
70992 +#include <linux/grinternal.h>
70993 +#include <linux/capability.h>
70994 +#include <linux/module.h>
70995 +#include <linux/compat.h>
70996 +
70997 +#include <asm/uaccess.h>
70998 +
70999 +#ifdef CONFIG_GRKERNSEC_EXECLOG
71000 +static char gr_exec_arg_buf[132];
71001 +static DEFINE_MUTEX(gr_exec_arg_mutex);
71002 +#endif
71003 +
71004 +struct user_arg_ptr {
71005 +#ifdef CONFIG_COMPAT
71006 + bool is_compat;
71007 +#endif
71008 + union {
71009 + const char __user *const __user *native;
71010 +#ifdef CONFIG_COMPAT
71011 + const compat_uptr_t __user *compat;
71012 +#endif
71013 + } ptr;
71014 +};
71015 +
71016 +extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
71017 +
71018 +void
71019 +gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
71020 +{
71021 +#ifdef CONFIG_GRKERNSEC_EXECLOG
71022 + char *grarg = gr_exec_arg_buf;
71023 + unsigned int i, x, execlen = 0;
71024 + char c;
71025 +
71026 + if (!((grsec_enable_execlog && grsec_enable_group &&
71027 + in_group_p(grsec_audit_gid))
71028 + || (grsec_enable_execlog && !grsec_enable_group)))
71029 + return;
71030 +
71031 + mutex_lock(&gr_exec_arg_mutex);
71032 + memset(grarg, 0, sizeof(gr_exec_arg_buf));
71033 +
71034 + for (i = 0; i < bprm->argc && execlen < 128; i++) {
71035 + const char __user *p;
71036 + unsigned int len;
71037 +
71038 + p = get_user_arg_ptr(argv, i);
71039 + if (IS_ERR(p))
71040 + goto log;
71041 +
71042 + len = strnlen_user(p, 128 - execlen);
71043 + if (len > 128 - execlen)
71044 + len = 128 - execlen;
71045 + else if (len > 0)
71046 + len--;
71047 + if (copy_from_user(grarg + execlen, p, len))
71048 + goto log;
71049 +
71050 + /* rewrite unprintable characters */
71051 + for (x = 0; x < len; x++) {
71052 + c = *(grarg + execlen + x);
71053 + if (c < 32 || c > 126)
71054 + *(grarg + execlen + x) = ' ';
71055 + }
71056 +
71057 + execlen += len;
71058 + *(grarg + execlen) = ' ';
71059 + *(grarg + execlen + 1) = '\0';
71060 + execlen++;
71061 + }
71062 +
71063 + log:
71064 + gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
71065 + bprm->file->f_path.mnt, grarg);
71066 + mutex_unlock(&gr_exec_arg_mutex);
71067 +#endif
71068 + return;
71069 +}
71070 +
71071 +#ifdef CONFIG_GRKERNSEC
71072 +extern int gr_acl_is_capable(const int cap);
71073 +extern int gr_acl_is_capable_nolog(const int cap);
71074 +extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
71075 +extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
71076 +extern int gr_chroot_is_capable(const int cap);
71077 +extern int gr_chroot_is_capable_nolog(const int cap);
71078 +extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
71079 +extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
71080 +#endif
71081 +
71082 +const char *captab_log[] = {
71083 + "CAP_CHOWN",
71084 + "CAP_DAC_OVERRIDE",
71085 + "CAP_DAC_READ_SEARCH",
71086 + "CAP_FOWNER",
71087 + "CAP_FSETID",
71088 + "CAP_KILL",
71089 + "CAP_SETGID",
71090 + "CAP_SETUID",
71091 + "CAP_SETPCAP",
71092 + "CAP_LINUX_IMMUTABLE",
71093 + "CAP_NET_BIND_SERVICE",
71094 + "CAP_NET_BROADCAST",
71095 + "CAP_NET_ADMIN",
71096 + "CAP_NET_RAW",
71097 + "CAP_IPC_LOCK",
71098 + "CAP_IPC_OWNER",
71099 + "CAP_SYS_MODULE",
71100 + "CAP_SYS_RAWIO",
71101 + "CAP_SYS_CHROOT",
71102 + "CAP_SYS_PTRACE",
71103 + "CAP_SYS_PACCT",
71104 + "CAP_SYS_ADMIN",
71105 + "CAP_SYS_BOOT",
71106 + "CAP_SYS_NICE",
71107 + "CAP_SYS_RESOURCE",
71108 + "CAP_SYS_TIME",
71109 + "CAP_SYS_TTY_CONFIG",
71110 + "CAP_MKNOD",
71111 + "CAP_LEASE",
71112 + "CAP_AUDIT_WRITE",
71113 + "CAP_AUDIT_CONTROL",
71114 + "CAP_SETFCAP",
71115 + "CAP_MAC_OVERRIDE",
71116 + "CAP_MAC_ADMIN",
71117 + "CAP_SYSLOG",
71118 + "CAP_WAKE_ALARM"
71119 +};
71120 +
71121 +int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
71122 +
71123 +int gr_is_capable(const int cap)
71124 +{
71125 +#ifdef CONFIG_GRKERNSEC
71126 + if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
71127 + return 1;
71128 + return 0;
71129 +#else
71130 + return 1;
71131 +#endif
71132 +}
71133 +
71134 +int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
71135 +{
71136 +#ifdef CONFIG_GRKERNSEC
71137 + if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
71138 + return 1;
71139 + return 0;
71140 +#else
71141 + return 1;
71142 +#endif
71143 +}
71144 +
71145 +int gr_is_capable_nolog(const int cap)
71146 +{
71147 +#ifdef CONFIG_GRKERNSEC
71148 + if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
71149 + return 1;
71150 + return 0;
71151 +#else
71152 + return 1;
71153 +#endif
71154 +}
71155 +
71156 +int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
71157 +{
71158 +#ifdef CONFIG_GRKERNSEC
71159 + if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
71160 + return 1;
71161 + return 0;
71162 +#else
71163 + return 1;
71164 +#endif
71165 +}
71166 +
71167 +EXPORT_SYMBOL(gr_is_capable);
71168 +EXPORT_SYMBOL(gr_is_capable_nolog);
71169 +EXPORT_SYMBOL(gr_task_is_capable);
71170 +EXPORT_SYMBOL(gr_task_is_capable_nolog);
71171 diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
71172 new file mode 100644
71173 index 0000000..06cc6ea
71174 --- /dev/null
71175 +++ b/grsecurity/grsec_fifo.c
71176 @@ -0,0 +1,24 @@
71177 +#include <linux/kernel.h>
71178 +#include <linux/sched.h>
71179 +#include <linux/fs.h>
71180 +#include <linux/file.h>
71181 +#include <linux/grinternal.h>
71182 +
71183 +int
71184 +gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
71185 + const struct dentry *dir, const int flag, const int acc_mode)
71186 +{
71187 +#ifdef CONFIG_GRKERNSEC_FIFO
71188 + const struct cred *cred = current_cred();
71189 +
71190 + if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
71191 + !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
71192 + !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
71193 + !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
71194 + if (!inode_permission(dentry->d_inode, acc_mode))
71195 + 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));
71196 + return -EACCES;
71197 + }
71198 +#endif
71199 + return 0;
71200 +}
71201 diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
71202 new file mode 100644
71203 index 0000000..8ca18bf
71204 --- /dev/null
71205 +++ b/grsecurity/grsec_fork.c
71206 @@ -0,0 +1,23 @@
71207 +#include <linux/kernel.h>
71208 +#include <linux/sched.h>
71209 +#include <linux/grsecurity.h>
71210 +#include <linux/grinternal.h>
71211 +#include <linux/errno.h>
71212 +
71213 +void
71214 +gr_log_forkfail(const int retval)
71215 +{
71216 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
71217 + if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
71218 + switch (retval) {
71219 + case -EAGAIN:
71220 + gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
71221 + break;
71222 + case -ENOMEM:
71223 + gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
71224 + break;
71225 + }
71226 + }
71227 +#endif
71228 + return;
71229 +}
71230 diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
71231 new file mode 100644
71232 index 0000000..a88e901
71233 --- /dev/null
71234 +++ b/grsecurity/grsec_init.c
71235 @@ -0,0 +1,272 @@
71236 +#include <linux/kernel.h>
71237 +#include <linux/sched.h>
71238 +#include <linux/mm.h>
71239 +#include <linux/gracl.h>
71240 +#include <linux/slab.h>
71241 +#include <linux/vmalloc.h>
71242 +#include <linux/percpu.h>
71243 +#include <linux/module.h>
71244 +
71245 +int grsec_enable_ptrace_readexec;
71246 +int grsec_enable_setxid;
71247 +int grsec_enable_symlinkown;
71248 +kgid_t grsec_symlinkown_gid;
71249 +int grsec_enable_brute;
71250 +int grsec_enable_link;
71251 +int grsec_enable_dmesg;
71252 +int grsec_enable_harden_ptrace;
71253 +int grsec_enable_harden_ipc;
71254 +int grsec_enable_fifo;
71255 +int grsec_enable_execlog;
71256 +int grsec_enable_signal;
71257 +int grsec_enable_forkfail;
71258 +int grsec_enable_audit_ptrace;
71259 +int grsec_enable_time;
71260 +int grsec_enable_group;
71261 +kgid_t grsec_audit_gid;
71262 +int grsec_enable_chdir;
71263 +int grsec_enable_mount;
71264 +int grsec_enable_rofs;
71265 +int grsec_deny_new_usb;
71266 +int grsec_enable_chroot_findtask;
71267 +int grsec_enable_chroot_mount;
71268 +int grsec_enable_chroot_shmat;
71269 +int grsec_enable_chroot_fchdir;
71270 +int grsec_enable_chroot_double;
71271 +int grsec_enable_chroot_pivot;
71272 +int grsec_enable_chroot_chdir;
71273 +int grsec_enable_chroot_chmod;
71274 +int grsec_enable_chroot_mknod;
71275 +int grsec_enable_chroot_nice;
71276 +int grsec_enable_chroot_execlog;
71277 +int grsec_enable_chroot_caps;
71278 +int grsec_enable_chroot_sysctl;
71279 +int grsec_enable_chroot_unix;
71280 +int grsec_enable_tpe;
71281 +kgid_t grsec_tpe_gid;
71282 +int grsec_enable_blackhole;
71283 +#ifdef CONFIG_IPV6_MODULE
71284 +EXPORT_SYMBOL(grsec_enable_blackhole);
71285 +#endif
71286 +int grsec_lastack_retries;
71287 +int grsec_enable_tpe_all;
71288 +int grsec_enable_tpe_invert;
71289 +int grsec_enable_socket_all;
71290 +kgid_t grsec_socket_all_gid;
71291 +int grsec_enable_socket_client;
71292 +kgid_t grsec_socket_client_gid;
71293 +int grsec_enable_socket_server;
71294 +kgid_t grsec_socket_server_gid;
71295 +int grsec_resource_logging;
71296 +int grsec_disable_privio;
71297 +int grsec_enable_log_rwxmaps;
71298 +int grsec_lock;
71299 +
71300 +DEFINE_SPINLOCK(grsec_alert_lock);
71301 +unsigned long grsec_alert_wtime = 0;
71302 +unsigned long grsec_alert_fyet = 0;
71303 +
71304 +DEFINE_SPINLOCK(grsec_audit_lock);
71305 +
71306 +DEFINE_RWLOCK(grsec_exec_file_lock);
71307 +
71308 +char *gr_shared_page[4];
71309 +
71310 +char *gr_alert_log_fmt;
71311 +char *gr_audit_log_fmt;
71312 +char *gr_alert_log_buf;
71313 +char *gr_audit_log_buf;
71314 +
71315 +void __init
71316 +grsecurity_init(void)
71317 +{
71318 + int j;
71319 + /* create the per-cpu shared pages */
71320 +
71321 +#ifdef CONFIG_X86
71322 + memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
71323 +#endif
71324 +
71325 + for (j = 0; j < 4; j++) {
71326 + gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
71327 + if (gr_shared_page[j] == NULL) {
71328 + panic("Unable to allocate grsecurity shared page");
71329 + return;
71330 + }
71331 + }
71332 +
71333 + /* allocate log buffers */
71334 + gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
71335 + if (!gr_alert_log_fmt) {
71336 + panic("Unable to allocate grsecurity alert log format buffer");
71337 + return;
71338 + }
71339 + gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
71340 + if (!gr_audit_log_fmt) {
71341 + panic("Unable to allocate grsecurity audit log format buffer");
71342 + return;
71343 + }
71344 + gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
71345 + if (!gr_alert_log_buf) {
71346 + panic("Unable to allocate grsecurity alert log buffer");
71347 + return;
71348 + }
71349 + gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
71350 + if (!gr_audit_log_buf) {
71351 + panic("Unable to allocate grsecurity audit log buffer");
71352 + return;
71353 + }
71354 +
71355 +#ifdef CONFIG_GRKERNSEC_IO
71356 +#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
71357 + grsec_disable_privio = 1;
71358 +#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
71359 + grsec_disable_privio = 1;
71360 +#else
71361 + grsec_disable_privio = 0;
71362 +#endif
71363 +#endif
71364 +
71365 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
71366 + /* for backward compatibility, tpe_invert always defaults to on if
71367 + enabled in the kernel
71368 + */
71369 + grsec_enable_tpe_invert = 1;
71370 +#endif
71371 +
71372 +#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
71373 +#ifndef CONFIG_GRKERNSEC_SYSCTL
71374 + grsec_lock = 1;
71375 +#endif
71376 +
71377 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
71378 + grsec_enable_log_rwxmaps = 1;
71379 +#endif
71380 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
71381 + grsec_enable_group = 1;
71382 + grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
71383 +#endif
71384 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
71385 + grsec_enable_ptrace_readexec = 1;
71386 +#endif
71387 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
71388 + grsec_enable_chdir = 1;
71389 +#endif
71390 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
71391 + grsec_enable_harden_ptrace = 1;
71392 +#endif
71393 +#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
71394 + grsec_enable_harden_ipc = 1;
71395 +#endif
71396 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
71397 + grsec_enable_mount = 1;
71398 +#endif
71399 +#ifdef CONFIG_GRKERNSEC_LINK
71400 + grsec_enable_link = 1;
71401 +#endif
71402 +#ifdef CONFIG_GRKERNSEC_BRUTE
71403 + grsec_enable_brute = 1;
71404 +#endif
71405 +#ifdef CONFIG_GRKERNSEC_DMESG
71406 + grsec_enable_dmesg = 1;
71407 +#endif
71408 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
71409 + grsec_enable_blackhole = 1;
71410 + grsec_lastack_retries = 4;
71411 +#endif
71412 +#ifdef CONFIG_GRKERNSEC_FIFO
71413 + grsec_enable_fifo = 1;
71414 +#endif
71415 +#ifdef CONFIG_GRKERNSEC_EXECLOG
71416 + grsec_enable_execlog = 1;
71417 +#endif
71418 +#ifdef CONFIG_GRKERNSEC_SETXID
71419 + grsec_enable_setxid = 1;
71420 +#endif
71421 +#ifdef CONFIG_GRKERNSEC_SIGNAL
71422 + grsec_enable_signal = 1;
71423 +#endif
71424 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
71425 + grsec_enable_forkfail = 1;
71426 +#endif
71427 +#ifdef CONFIG_GRKERNSEC_TIME
71428 + grsec_enable_time = 1;
71429 +#endif
71430 +#ifdef CONFIG_GRKERNSEC_RESLOG
71431 + grsec_resource_logging = 1;
71432 +#endif
71433 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
71434 + grsec_enable_chroot_findtask = 1;
71435 +#endif
71436 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
71437 + grsec_enable_chroot_unix = 1;
71438 +#endif
71439 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
71440 + grsec_enable_chroot_mount = 1;
71441 +#endif
71442 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
71443 + grsec_enable_chroot_fchdir = 1;
71444 +#endif
71445 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
71446 + grsec_enable_chroot_shmat = 1;
71447 +#endif
71448 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
71449 + grsec_enable_audit_ptrace = 1;
71450 +#endif
71451 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
71452 + grsec_enable_chroot_double = 1;
71453 +#endif
71454 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
71455 + grsec_enable_chroot_pivot = 1;
71456 +#endif
71457 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
71458 + grsec_enable_chroot_chdir = 1;
71459 +#endif
71460 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
71461 + grsec_enable_chroot_chmod = 1;
71462 +#endif
71463 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
71464 + grsec_enable_chroot_mknod = 1;
71465 +#endif
71466 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
71467 + grsec_enable_chroot_nice = 1;
71468 +#endif
71469 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
71470 + grsec_enable_chroot_execlog = 1;
71471 +#endif
71472 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
71473 + grsec_enable_chroot_caps = 1;
71474 +#endif
71475 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
71476 + grsec_enable_chroot_sysctl = 1;
71477 +#endif
71478 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
71479 + grsec_enable_symlinkown = 1;
71480 + grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
71481 +#endif
71482 +#ifdef CONFIG_GRKERNSEC_TPE
71483 + grsec_enable_tpe = 1;
71484 + grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
71485 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
71486 + grsec_enable_tpe_all = 1;
71487 +#endif
71488 +#endif
71489 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
71490 + grsec_enable_socket_all = 1;
71491 + grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
71492 +#endif
71493 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
71494 + grsec_enable_socket_client = 1;
71495 + grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
71496 +#endif
71497 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
71498 + grsec_enable_socket_server = 1;
71499 + grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
71500 +#endif
71501 +#endif
71502 +#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
71503 + grsec_deny_new_usb = 1;
71504 +#endif
71505 +
71506 + return;
71507 +}
71508 diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
71509 new file mode 100644
71510 index 0000000..78d1680
71511 --- /dev/null
71512 +++ b/grsecurity/grsec_ipc.c
71513 @@ -0,0 +1,48 @@
71514 +#include <linux/kernel.h>
71515 +#include <linux/mm.h>
71516 +#include <linux/sched.h>
71517 +#include <linux/file.h>
71518 +#include <linux/ipc.h>
71519 +#include <linux/ipc_namespace.h>
71520 +#include <linux/grsecurity.h>
71521 +#include <linux/grinternal.h>
71522 +
71523 +int
71524 +gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
71525 +{
71526 +#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
71527 + int write;
71528 + int orig_granted_mode;
71529 + kuid_t euid;
71530 + kgid_t egid;
71531 +
71532 + if (!grsec_enable_harden_ipc)
71533 + return 0;
71534 +
71535 + euid = current_euid();
71536 + egid = current_egid();
71537 +
71538 + write = requested_mode & 00002;
71539 + orig_granted_mode = ipcp->mode;
71540 +
71541 + if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
71542 + orig_granted_mode >>= 6;
71543 + else {
71544 + /* if likely wrong permissions, lock to user */
71545 + if (orig_granted_mode & 0007)
71546 + orig_granted_mode = 0;
71547 + /* otherwise do a egid-only check */
71548 + else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
71549 + orig_granted_mode >>= 3;
71550 + /* otherwise, no access */
71551 + else
71552 + orig_granted_mode = 0;
71553 + }
71554 + if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
71555 + !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
71556 + gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
71557 + return 0;
71558 + }
71559 +#endif
71560 + return 1;
71561 +}
71562 diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
71563 new file mode 100644
71564 index 0000000..5e05e20
71565 --- /dev/null
71566 +++ b/grsecurity/grsec_link.c
71567 @@ -0,0 +1,58 @@
71568 +#include <linux/kernel.h>
71569 +#include <linux/sched.h>
71570 +#include <linux/fs.h>
71571 +#include <linux/file.h>
71572 +#include <linux/grinternal.h>
71573 +
71574 +int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
71575 +{
71576 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
71577 + const struct inode *link_inode = link->dentry->d_inode;
71578 +
71579 + if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
71580 + /* ignore root-owned links, e.g. /proc/self */
71581 + gr_is_global_nonroot(link_inode->i_uid) && target &&
71582 + !uid_eq(link_inode->i_uid, target->i_uid)) {
71583 + gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
71584 + return 1;
71585 + }
71586 +#endif
71587 + return 0;
71588 +}
71589 +
71590 +int
71591 +gr_handle_follow_link(const struct inode *parent,
71592 + const struct inode *inode,
71593 + const struct dentry *dentry, const struct vfsmount *mnt)
71594 +{
71595 +#ifdef CONFIG_GRKERNSEC_LINK
71596 + const struct cred *cred = current_cred();
71597 +
71598 + if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
71599 + (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
71600 + (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
71601 + gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
71602 + return -EACCES;
71603 + }
71604 +#endif
71605 + return 0;
71606 +}
71607 +
71608 +int
71609 +gr_handle_hardlink(const struct dentry *dentry,
71610 + const struct vfsmount *mnt,
71611 + struct inode *inode, const int mode, const struct filename *to)
71612 +{
71613 +#ifdef CONFIG_GRKERNSEC_LINK
71614 + const struct cred *cred = current_cred();
71615 +
71616 + if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
71617 + (!S_ISREG(mode) || is_privileged_binary(dentry) ||
71618 + (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
71619 + !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
71620 + gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
71621 + return -EPERM;
71622 + }
71623 +#endif
71624 + return 0;
71625 +}
71626 diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
71627 new file mode 100644
71628 index 0000000..dbe0a6b
71629 --- /dev/null
71630 +++ b/grsecurity/grsec_log.c
71631 @@ -0,0 +1,341 @@
71632 +#include <linux/kernel.h>
71633 +#include <linux/sched.h>
71634 +#include <linux/file.h>
71635 +#include <linux/tty.h>
71636 +#include <linux/fs.h>
71637 +#include <linux/mm.h>
71638 +#include <linux/grinternal.h>
71639 +
71640 +#ifdef CONFIG_TREE_PREEMPT_RCU
71641 +#define DISABLE_PREEMPT() preempt_disable()
71642 +#define ENABLE_PREEMPT() preempt_enable()
71643 +#else
71644 +#define DISABLE_PREEMPT()
71645 +#define ENABLE_PREEMPT()
71646 +#endif
71647 +
71648 +#define BEGIN_LOCKS(x) \
71649 + DISABLE_PREEMPT(); \
71650 + rcu_read_lock(); \
71651 + read_lock(&tasklist_lock); \
71652 + read_lock(&grsec_exec_file_lock); \
71653 + if (x != GR_DO_AUDIT) \
71654 + spin_lock(&grsec_alert_lock); \
71655 + else \
71656 + spin_lock(&grsec_audit_lock)
71657 +
71658 +#define END_LOCKS(x) \
71659 + if (x != GR_DO_AUDIT) \
71660 + spin_unlock(&grsec_alert_lock); \
71661 + else \
71662 + spin_unlock(&grsec_audit_lock); \
71663 + read_unlock(&grsec_exec_file_lock); \
71664 + read_unlock(&tasklist_lock); \
71665 + rcu_read_unlock(); \
71666 + ENABLE_PREEMPT(); \
71667 + if (x == GR_DONT_AUDIT) \
71668 + gr_handle_alertkill(current)
71669 +
71670 +enum {
71671 + FLOODING,
71672 + NO_FLOODING
71673 +};
71674 +
71675 +extern char *gr_alert_log_fmt;
71676 +extern char *gr_audit_log_fmt;
71677 +extern char *gr_alert_log_buf;
71678 +extern char *gr_audit_log_buf;
71679 +
71680 +static int gr_log_start(int audit)
71681 +{
71682 + char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
71683 + char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
71684 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
71685 +#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
71686 + unsigned long curr_secs = get_seconds();
71687 +
71688 + if (audit == GR_DO_AUDIT)
71689 + goto set_fmt;
71690 +
71691 + if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
71692 + grsec_alert_wtime = curr_secs;
71693 + grsec_alert_fyet = 0;
71694 + } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
71695 + && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
71696 + grsec_alert_fyet++;
71697 + } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
71698 + grsec_alert_wtime = curr_secs;
71699 + grsec_alert_fyet++;
71700 + printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
71701 + return FLOODING;
71702 + }
71703 + else return FLOODING;
71704 +
71705 +set_fmt:
71706 +#endif
71707 + memset(buf, 0, PAGE_SIZE);
71708 + if (current->signal->curr_ip && gr_acl_is_enabled()) {
71709 + sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
71710 + snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
71711 + } else if (current->signal->curr_ip) {
71712 + sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
71713 + snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
71714 + } else if (gr_acl_is_enabled()) {
71715 + sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
71716 + snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
71717 + } else {
71718 + sprintf(fmt, "%s%s", loglevel, "grsec: ");
71719 + strcpy(buf, fmt);
71720 + }
71721 +
71722 + return NO_FLOODING;
71723 +}
71724 +
71725 +static void gr_log_middle(int audit, const char *msg, va_list ap)
71726 + __attribute__ ((format (printf, 2, 0)));
71727 +
71728 +static void gr_log_middle(int audit, const char *msg, va_list ap)
71729 +{
71730 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
71731 + unsigned int len = strlen(buf);
71732 +
71733 + vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
71734 +
71735 + return;
71736 +}
71737 +
71738 +static void gr_log_middle_varargs(int audit, const char *msg, ...)
71739 + __attribute__ ((format (printf, 2, 3)));
71740 +
71741 +static void gr_log_middle_varargs(int audit, const char *msg, ...)
71742 +{
71743 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
71744 + unsigned int len = strlen(buf);
71745 + va_list ap;
71746 +
71747 + va_start(ap, msg);
71748 + vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
71749 + va_end(ap);
71750 +
71751 + return;
71752 +}
71753 +
71754 +static void gr_log_end(int audit, int append_default)
71755 +{
71756 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
71757 + if (append_default) {
71758 + struct task_struct *task = current;
71759 + struct task_struct *parent = task->real_parent;
71760 + const struct cred *cred = __task_cred(task);
71761 + const struct cred *pcred = __task_cred(parent);
71762 + unsigned int len = strlen(buf);
71763 +
71764 + 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));
71765 + }
71766 +
71767 + printk("%s\n", buf);
71768 +
71769 + return;
71770 +}
71771 +
71772 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
71773 +{
71774 + int logtype;
71775 + char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
71776 + char *str1 = NULL, *str2 = NULL, *str3 = NULL;
71777 + void *voidptr = NULL;
71778 + int num1 = 0, num2 = 0;
71779 + unsigned long ulong1 = 0, ulong2 = 0;
71780 + struct dentry *dentry = NULL;
71781 + struct vfsmount *mnt = NULL;
71782 + struct file *file = NULL;
71783 + struct task_struct *task = NULL;
71784 + struct vm_area_struct *vma = NULL;
71785 + const struct cred *cred, *pcred;
71786 + va_list ap;
71787 +
71788 + BEGIN_LOCKS(audit);
71789 + logtype = gr_log_start(audit);
71790 + if (logtype == FLOODING) {
71791 + END_LOCKS(audit);
71792 + return;
71793 + }
71794 + va_start(ap, argtypes);
71795 + switch (argtypes) {
71796 + case GR_TTYSNIFF:
71797 + task = va_arg(ap, struct task_struct *);
71798 + 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));
71799 + break;
71800 + case GR_SYSCTL_HIDDEN:
71801 + str1 = va_arg(ap, char *);
71802 + gr_log_middle_varargs(audit, msg, result, str1);
71803 + break;
71804 + case GR_RBAC:
71805 + dentry = va_arg(ap, struct dentry *);
71806 + mnt = va_arg(ap, struct vfsmount *);
71807 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
71808 + break;
71809 + case GR_RBAC_STR:
71810 + dentry = va_arg(ap, struct dentry *);
71811 + mnt = va_arg(ap, struct vfsmount *);
71812 + str1 = va_arg(ap, char *);
71813 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
71814 + break;
71815 + case GR_STR_RBAC:
71816 + str1 = va_arg(ap, char *);
71817 + dentry = va_arg(ap, struct dentry *);
71818 + mnt = va_arg(ap, struct vfsmount *);
71819 + gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
71820 + break;
71821 + case GR_RBAC_MODE2:
71822 + dentry = va_arg(ap, struct dentry *);
71823 + mnt = va_arg(ap, struct vfsmount *);
71824 + str1 = va_arg(ap, char *);
71825 + str2 = va_arg(ap, char *);
71826 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
71827 + break;
71828 + case GR_RBAC_MODE3:
71829 + dentry = va_arg(ap, struct dentry *);
71830 + mnt = va_arg(ap, struct vfsmount *);
71831 + str1 = va_arg(ap, char *);
71832 + str2 = va_arg(ap, char *);
71833 + str3 = va_arg(ap, char *);
71834 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
71835 + break;
71836 + case GR_FILENAME:
71837 + dentry = va_arg(ap, struct dentry *);
71838 + mnt = va_arg(ap, struct vfsmount *);
71839 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
71840 + break;
71841 + case GR_STR_FILENAME:
71842 + str1 = va_arg(ap, char *);
71843 + dentry = va_arg(ap, struct dentry *);
71844 + mnt = va_arg(ap, struct vfsmount *);
71845 + gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
71846 + break;
71847 + case GR_FILENAME_STR:
71848 + dentry = va_arg(ap, struct dentry *);
71849 + mnt = va_arg(ap, struct vfsmount *);
71850 + str1 = va_arg(ap, char *);
71851 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
71852 + break;
71853 + case GR_FILENAME_TWO_INT:
71854 + dentry = va_arg(ap, struct dentry *);
71855 + mnt = va_arg(ap, struct vfsmount *);
71856 + num1 = va_arg(ap, int);
71857 + num2 = va_arg(ap, int);
71858 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
71859 + break;
71860 + case GR_FILENAME_TWO_INT_STR:
71861 + dentry = va_arg(ap, struct dentry *);
71862 + mnt = va_arg(ap, struct vfsmount *);
71863 + num1 = va_arg(ap, int);
71864 + num2 = va_arg(ap, int);
71865 + str1 = va_arg(ap, char *);
71866 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
71867 + break;
71868 + case GR_TEXTREL:
71869 + file = va_arg(ap, struct file *);
71870 + ulong1 = va_arg(ap, unsigned long);
71871 + ulong2 = va_arg(ap, unsigned long);
71872 + gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
71873 + break;
71874 + case GR_PTRACE:
71875 + task = va_arg(ap, struct task_struct *);
71876 + 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));
71877 + break;
71878 + case GR_RESOURCE:
71879 + task = va_arg(ap, struct task_struct *);
71880 + cred = __task_cred(task);
71881 + pcred = __task_cred(task->real_parent);
71882 + ulong1 = va_arg(ap, unsigned long);
71883 + str1 = va_arg(ap, char *);
71884 + ulong2 = va_arg(ap, unsigned long);
71885 + 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));
71886 + break;
71887 + case GR_CAP:
71888 + task = va_arg(ap, struct task_struct *);
71889 + cred = __task_cred(task);
71890 + pcred = __task_cred(task->real_parent);
71891 + str1 = va_arg(ap, char *);
71892 + 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));
71893 + break;
71894 + case GR_SIG:
71895 + str1 = va_arg(ap, char *);
71896 + voidptr = va_arg(ap, void *);
71897 + gr_log_middle_varargs(audit, msg, str1, voidptr);
71898 + break;
71899 + case GR_SIG2:
71900 + task = va_arg(ap, struct task_struct *);
71901 + cred = __task_cred(task);
71902 + pcred = __task_cred(task->real_parent);
71903 + num1 = va_arg(ap, int);
71904 + 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));
71905 + break;
71906 + case GR_CRASH1:
71907 + task = va_arg(ap, struct task_struct *);
71908 + cred = __task_cred(task);
71909 + pcred = __task_cred(task->real_parent);
71910 + ulong1 = va_arg(ap, unsigned long);
71911 + 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);
71912 + break;
71913 + case GR_CRASH2:
71914 + task = va_arg(ap, struct task_struct *);
71915 + cred = __task_cred(task);
71916 + pcred = __task_cred(task->real_parent);
71917 + ulong1 = va_arg(ap, unsigned long);
71918 + 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);
71919 + break;
71920 + case GR_RWXMAP:
71921 + file = va_arg(ap, struct file *);
71922 + gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
71923 + break;
71924 + case GR_RWXMAPVMA:
71925 + vma = va_arg(ap, struct vm_area_struct *);
71926 + if (vma->vm_file)
71927 + str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
71928 + else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
71929 + str1 = "<stack>";
71930 + else if (vma->vm_start <= current->mm->brk &&
71931 + vma->vm_end >= current->mm->start_brk)
71932 + str1 = "<heap>";
71933 + else
71934 + str1 = "<anonymous mapping>";
71935 + gr_log_middle_varargs(audit, msg, str1);
71936 + break;
71937 + case GR_PSACCT:
71938 + {
71939 + unsigned int wday, cday;
71940 + __u8 whr, chr;
71941 + __u8 wmin, cmin;
71942 + __u8 wsec, csec;
71943 + char cur_tty[64] = { 0 };
71944 + char parent_tty[64] = { 0 };
71945 +
71946 + task = va_arg(ap, struct task_struct *);
71947 + wday = va_arg(ap, unsigned int);
71948 + cday = va_arg(ap, unsigned int);
71949 + whr = va_arg(ap, int);
71950 + chr = va_arg(ap, int);
71951 + wmin = va_arg(ap, int);
71952 + cmin = va_arg(ap, int);
71953 + wsec = va_arg(ap, int);
71954 + csec = va_arg(ap, int);
71955 + ulong1 = va_arg(ap, unsigned long);
71956 + cred = __task_cred(task);
71957 + pcred = __task_cred(task->real_parent);
71958 +
71959 + 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));
71960 + }
71961 + break;
71962 + default:
71963 + gr_log_middle(audit, msg, ap);
71964 + }
71965 + va_end(ap);
71966 + // these don't need DEFAULTSECARGS printed on the end
71967 + if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
71968 + gr_log_end(audit, 0);
71969 + else
71970 + gr_log_end(audit, 1);
71971 + END_LOCKS(audit);
71972 +}
71973 diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
71974 new file mode 100644
71975 index 0000000..f536303
71976 --- /dev/null
71977 +++ b/grsecurity/grsec_mem.c
71978 @@ -0,0 +1,40 @@
71979 +#include <linux/kernel.h>
71980 +#include <linux/sched.h>
71981 +#include <linux/mm.h>
71982 +#include <linux/mman.h>
71983 +#include <linux/grinternal.h>
71984 +
71985 +void
71986 +gr_handle_ioperm(void)
71987 +{
71988 + gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
71989 + return;
71990 +}
71991 +
71992 +void
71993 +gr_handle_iopl(void)
71994 +{
71995 + gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
71996 + return;
71997 +}
71998 +
71999 +void
72000 +gr_handle_mem_readwrite(u64 from, u64 to)
72001 +{
72002 + gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
72003 + return;
72004 +}
72005 +
72006 +void
72007 +gr_handle_vm86(void)
72008 +{
72009 + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
72010 + return;
72011 +}
72012 +
72013 +void
72014 +gr_log_badprocpid(const char *entry)
72015 +{
72016 + gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
72017 + return;
72018 +}
72019 diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
72020 new file mode 100644
72021 index 0000000..cd9e124
72022 --- /dev/null
72023 +++ b/grsecurity/grsec_mount.c
72024 @@ -0,0 +1,65 @@
72025 +#include <linux/kernel.h>
72026 +#include <linux/sched.h>
72027 +#include <linux/mount.h>
72028 +#include <linux/major.h>
72029 +#include <linux/grsecurity.h>
72030 +#include <linux/grinternal.h>
72031 +
72032 +void
72033 +gr_log_remount(const char *devname, const int retval)
72034 +{
72035 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
72036 + if (grsec_enable_mount && (retval >= 0))
72037 + gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
72038 +#endif
72039 + return;
72040 +}
72041 +
72042 +void
72043 +gr_log_unmount(const char *devname, const int retval)
72044 +{
72045 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
72046 + if (grsec_enable_mount && (retval >= 0))
72047 + gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
72048 +#endif
72049 + return;
72050 +}
72051 +
72052 +void
72053 +gr_log_mount(const char *from, const char *to, const int retval)
72054 +{
72055 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
72056 + if (grsec_enable_mount && (retval >= 0))
72057 + gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
72058 +#endif
72059 + return;
72060 +}
72061 +
72062 +int
72063 +gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
72064 +{
72065 +#ifdef CONFIG_GRKERNSEC_ROFS
72066 + if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
72067 + gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
72068 + return -EPERM;
72069 + } else
72070 + return 0;
72071 +#endif
72072 + return 0;
72073 +}
72074 +
72075 +int
72076 +gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
72077 +{
72078 +#ifdef CONFIG_GRKERNSEC_ROFS
72079 + struct inode *inode = dentry->d_inode;
72080 +
72081 + if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
72082 + inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
72083 + gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
72084 + return -EPERM;
72085 + } else
72086 + return 0;
72087 +#endif
72088 + return 0;
72089 +}
72090 diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
72091 new file mode 100644
72092 index 0000000..6ee9d50
72093 --- /dev/null
72094 +++ b/grsecurity/grsec_pax.c
72095 @@ -0,0 +1,45 @@
72096 +#include <linux/kernel.h>
72097 +#include <linux/sched.h>
72098 +#include <linux/mm.h>
72099 +#include <linux/file.h>
72100 +#include <linux/grinternal.h>
72101 +#include <linux/grsecurity.h>
72102 +
72103 +void
72104 +gr_log_textrel(struct vm_area_struct * vma)
72105 +{
72106 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72107 + if (grsec_enable_log_rwxmaps)
72108 + gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
72109 +#endif
72110 + return;
72111 +}
72112 +
72113 +void gr_log_ptgnustack(struct file *file)
72114 +{
72115 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72116 + if (grsec_enable_log_rwxmaps)
72117 + gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
72118 +#endif
72119 + return;
72120 +}
72121 +
72122 +void
72123 +gr_log_rwxmmap(struct file *file)
72124 +{
72125 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72126 + if (grsec_enable_log_rwxmaps)
72127 + gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
72128 +#endif
72129 + return;
72130 +}
72131 +
72132 +void
72133 +gr_log_rwxmprotect(struct vm_area_struct *vma)
72134 +{
72135 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72136 + if (grsec_enable_log_rwxmaps)
72137 + gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
72138 +#endif
72139 + return;
72140 +}
72141 diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
72142 new file mode 100644
72143 index 0000000..f7f29aa
72144 --- /dev/null
72145 +++ b/grsecurity/grsec_ptrace.c
72146 @@ -0,0 +1,30 @@
72147 +#include <linux/kernel.h>
72148 +#include <linux/sched.h>
72149 +#include <linux/grinternal.h>
72150 +#include <linux/security.h>
72151 +
72152 +void
72153 +gr_audit_ptrace(struct task_struct *task)
72154 +{
72155 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
72156 + if (grsec_enable_audit_ptrace)
72157 + gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
72158 +#endif
72159 + return;
72160 +}
72161 +
72162 +int
72163 +gr_ptrace_readexec(struct file *file, int unsafe_flags)
72164 +{
72165 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
72166 + const struct dentry *dentry = file->f_path.dentry;
72167 + const struct vfsmount *mnt = file->f_path.mnt;
72168 +
72169 + if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
72170 + (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
72171 + gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
72172 + return -EACCES;
72173 + }
72174 +#endif
72175 + return 0;
72176 +}
72177 diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
72178 new file mode 100644
72179 index 0000000..3860c7e
72180 --- /dev/null
72181 +++ b/grsecurity/grsec_sig.c
72182 @@ -0,0 +1,236 @@
72183 +#include <linux/kernel.h>
72184 +#include <linux/sched.h>
72185 +#include <linux/fs.h>
72186 +#include <linux/delay.h>
72187 +#include <linux/grsecurity.h>
72188 +#include <linux/grinternal.h>
72189 +#include <linux/hardirq.h>
72190 +
72191 +char *signames[] = {
72192 + [SIGSEGV] = "Segmentation fault",
72193 + [SIGILL] = "Illegal instruction",
72194 + [SIGABRT] = "Abort",
72195 + [SIGBUS] = "Invalid alignment/Bus error"
72196 +};
72197 +
72198 +void
72199 +gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
72200 +{
72201 +#ifdef CONFIG_GRKERNSEC_SIGNAL
72202 + if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
72203 + (sig == SIGABRT) || (sig == SIGBUS))) {
72204 + if (task_pid_nr(t) == task_pid_nr(current)) {
72205 + gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
72206 + } else {
72207 + gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
72208 + }
72209 + }
72210 +#endif
72211 + return;
72212 +}
72213 +
72214 +int
72215 +gr_handle_signal(const struct task_struct *p, const int sig)
72216 +{
72217 +#ifdef CONFIG_GRKERNSEC
72218 + /* ignore the 0 signal for protected task checks */
72219 + if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
72220 + gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
72221 + return -EPERM;
72222 + } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
72223 + return -EPERM;
72224 + }
72225 +#endif
72226 + return 0;
72227 +}
72228 +
72229 +#ifdef CONFIG_GRKERNSEC
72230 +extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
72231 +
72232 +int gr_fake_force_sig(int sig, struct task_struct *t)
72233 +{
72234 + unsigned long int flags;
72235 + int ret, blocked, ignored;
72236 + struct k_sigaction *action;
72237 +
72238 + spin_lock_irqsave(&t->sighand->siglock, flags);
72239 + action = &t->sighand->action[sig-1];
72240 + ignored = action->sa.sa_handler == SIG_IGN;
72241 + blocked = sigismember(&t->blocked, sig);
72242 + if (blocked || ignored) {
72243 + action->sa.sa_handler = SIG_DFL;
72244 + if (blocked) {
72245 + sigdelset(&t->blocked, sig);
72246 + recalc_sigpending_and_wake(t);
72247 + }
72248 + }
72249 + if (action->sa.sa_handler == SIG_DFL)
72250 + t->signal->flags &= ~SIGNAL_UNKILLABLE;
72251 + ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
72252 +
72253 + spin_unlock_irqrestore(&t->sighand->siglock, flags);
72254 +
72255 + return ret;
72256 +}
72257 +#endif
72258 +
72259 +#define GR_USER_BAN_TIME (15 * 60)
72260 +#define GR_DAEMON_BRUTE_TIME (30 * 60)
72261 +
72262 +void gr_handle_brute_attach(int dumpable)
72263 +{
72264 +#ifdef CONFIG_GRKERNSEC_BRUTE
72265 + struct task_struct *p = current;
72266 + kuid_t uid = GLOBAL_ROOT_UID;
72267 + int daemon = 0;
72268 +
72269 + if (!grsec_enable_brute)
72270 + return;
72271 +
72272 + rcu_read_lock();
72273 + read_lock(&tasklist_lock);
72274 + read_lock(&grsec_exec_file_lock);
72275 + if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
72276 + p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
72277 + p->real_parent->brute = 1;
72278 + daemon = 1;
72279 + } else {
72280 + const struct cred *cred = __task_cred(p), *cred2;
72281 + struct task_struct *tsk, *tsk2;
72282 +
72283 + if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
72284 + struct user_struct *user;
72285 +
72286 + uid = cred->uid;
72287 +
72288 + /* this is put upon execution past expiration */
72289 + user = find_user(uid);
72290 + if (user == NULL)
72291 + goto unlock;
72292 + user->suid_banned = 1;
72293 + user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
72294 + if (user->suid_ban_expires == ~0UL)
72295 + user->suid_ban_expires--;
72296 +
72297 + /* only kill other threads of the same binary, from the same user */
72298 + do_each_thread(tsk2, tsk) {
72299 + cred2 = __task_cred(tsk);
72300 + if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
72301 + gr_fake_force_sig(SIGKILL, tsk);
72302 + } while_each_thread(tsk2, tsk);
72303 + }
72304 + }
72305 +unlock:
72306 + read_unlock(&grsec_exec_file_lock);
72307 + read_unlock(&tasklist_lock);
72308 + rcu_read_unlock();
72309 +
72310 + if (gr_is_global_nonroot(uid))
72311 + 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);
72312 + else if (daemon)
72313 + gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
72314 +
72315 +#endif
72316 + return;
72317 +}
72318 +
72319 +void gr_handle_brute_check(void)
72320 +{
72321 +#ifdef CONFIG_GRKERNSEC_BRUTE
72322 + struct task_struct *p = current;
72323 +
72324 + if (unlikely(p->brute)) {
72325 + if (!grsec_enable_brute)
72326 + p->brute = 0;
72327 + else if (time_before(get_seconds(), p->brute_expires))
72328 + msleep(30 * 1000);
72329 + }
72330 +#endif
72331 + return;
72332 +}
72333 +
72334 +void gr_handle_kernel_exploit(void)
72335 +{
72336 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
72337 + const struct cred *cred;
72338 + struct task_struct *tsk, *tsk2;
72339 + struct user_struct *user;
72340 + kuid_t uid;
72341 +
72342 + if (in_irq() || in_serving_softirq() || in_nmi())
72343 + panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
72344 +
72345 + uid = current_uid();
72346 +
72347 + if (gr_is_global_root(uid))
72348 + panic("grsec: halting the system due to suspicious kernel crash caused by root");
72349 + else {
72350 + /* kill all the processes of this user, hold a reference
72351 + to their creds struct, and prevent them from creating
72352 + another process until system reset
72353 + */
72354 + printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
72355 + GR_GLOBAL_UID(uid));
72356 + /* we intentionally leak this ref */
72357 + user = get_uid(current->cred->user);
72358 + if (user)
72359 + user->kernel_banned = 1;
72360 +
72361 + /* kill all processes of this user */
72362 + read_lock(&tasklist_lock);
72363 + do_each_thread(tsk2, tsk) {
72364 + cred = __task_cred(tsk);
72365 + if (uid_eq(cred->uid, uid))
72366 + gr_fake_force_sig(SIGKILL, tsk);
72367 + } while_each_thread(tsk2, tsk);
72368 + read_unlock(&tasklist_lock);
72369 + }
72370 +#endif
72371 +}
72372 +
72373 +#ifdef CONFIG_GRKERNSEC_BRUTE
72374 +static bool suid_ban_expired(struct user_struct *user)
72375 +{
72376 + if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
72377 + user->suid_banned = 0;
72378 + user->suid_ban_expires = 0;
72379 + free_uid(user);
72380 + return true;
72381 + }
72382 +
72383 + return false;
72384 +}
72385 +#endif
72386 +
72387 +int gr_process_kernel_exec_ban(void)
72388 +{
72389 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
72390 + if (unlikely(current->cred->user->kernel_banned))
72391 + return -EPERM;
72392 +#endif
72393 + return 0;
72394 +}
72395 +
72396 +int gr_process_kernel_setuid_ban(struct user_struct *user)
72397 +{
72398 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
72399 + if (unlikely(user->kernel_banned))
72400 + gr_fake_force_sig(SIGKILL, current);
72401 +#endif
72402 + return 0;
72403 +}
72404 +
72405 +int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
72406 +{
72407 +#ifdef CONFIG_GRKERNSEC_BRUTE
72408 + struct user_struct *user = current->cred->user;
72409 + if (unlikely(user->suid_banned)) {
72410 + if (suid_ban_expired(user))
72411 + return 0;
72412 + /* disallow execution of suid binaries only */
72413 + else if (!uid_eq(bprm->cred->euid, current->cred->uid))
72414 + return -EPERM;
72415 + }
72416 +#endif
72417 + return 0;
72418 +}
72419 diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
72420 new file mode 100644
72421 index 0000000..4030d57
72422 --- /dev/null
72423 +++ b/grsecurity/grsec_sock.c
72424 @@ -0,0 +1,244 @@
72425 +#include <linux/kernel.h>
72426 +#include <linux/module.h>
72427 +#include <linux/sched.h>
72428 +#include <linux/file.h>
72429 +#include <linux/net.h>
72430 +#include <linux/in.h>
72431 +#include <linux/ip.h>
72432 +#include <net/sock.h>
72433 +#include <net/inet_sock.h>
72434 +#include <linux/grsecurity.h>
72435 +#include <linux/grinternal.h>
72436 +#include <linux/gracl.h>
72437 +
72438 +extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
72439 +extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
72440 +
72441 +EXPORT_SYMBOL(gr_search_udp_recvmsg);
72442 +EXPORT_SYMBOL(gr_search_udp_sendmsg);
72443 +
72444 +#ifdef CONFIG_UNIX_MODULE
72445 +EXPORT_SYMBOL(gr_acl_handle_unix);
72446 +EXPORT_SYMBOL(gr_acl_handle_mknod);
72447 +EXPORT_SYMBOL(gr_handle_chroot_unix);
72448 +EXPORT_SYMBOL(gr_handle_create);
72449 +#endif
72450 +
72451 +#ifdef CONFIG_GRKERNSEC
72452 +#define gr_conn_table_size 32749
72453 +struct conn_table_entry {
72454 + struct conn_table_entry *next;
72455 + struct signal_struct *sig;
72456 +};
72457 +
72458 +struct conn_table_entry *gr_conn_table[gr_conn_table_size];
72459 +DEFINE_SPINLOCK(gr_conn_table_lock);
72460 +
72461 +extern const char * gr_socktype_to_name(unsigned char type);
72462 +extern const char * gr_proto_to_name(unsigned char proto);
72463 +extern const char * gr_sockfamily_to_name(unsigned char family);
72464 +
72465 +static __inline__ int
72466 +conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
72467 +{
72468 + return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
72469 +}
72470 +
72471 +static __inline__ int
72472 +conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
72473 + __u16 sport, __u16 dport)
72474 +{
72475 + if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
72476 + sig->gr_sport == sport && sig->gr_dport == dport))
72477 + return 1;
72478 + else
72479 + return 0;
72480 +}
72481 +
72482 +static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
72483 +{
72484 + struct conn_table_entry **match;
72485 + unsigned int index;
72486 +
72487 + index = conn_hash(sig->gr_saddr, sig->gr_daddr,
72488 + sig->gr_sport, sig->gr_dport,
72489 + gr_conn_table_size);
72490 +
72491 + newent->sig = sig;
72492 +
72493 + match = &gr_conn_table[index];
72494 + newent->next = *match;
72495 + *match = newent;
72496 +
72497 + return;
72498 +}
72499 +
72500 +static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
72501 +{
72502 + struct conn_table_entry *match, *last = NULL;
72503 + unsigned int index;
72504 +
72505 + index = conn_hash(sig->gr_saddr, sig->gr_daddr,
72506 + sig->gr_sport, sig->gr_dport,
72507 + gr_conn_table_size);
72508 +
72509 + match = gr_conn_table[index];
72510 + while (match && !conn_match(match->sig,
72511 + sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
72512 + sig->gr_dport)) {
72513 + last = match;
72514 + match = match->next;
72515 + }
72516 +
72517 + if (match) {
72518 + if (last)
72519 + last->next = match->next;
72520 + else
72521 + gr_conn_table[index] = NULL;
72522 + kfree(match);
72523 + }
72524 +
72525 + return;
72526 +}
72527 +
72528 +static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
72529 + __u16 sport, __u16 dport)
72530 +{
72531 + struct conn_table_entry *match;
72532 + unsigned int index;
72533 +
72534 + index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
72535 +
72536 + match = gr_conn_table[index];
72537 + while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
72538 + match = match->next;
72539 +
72540 + if (match)
72541 + return match->sig;
72542 + else
72543 + return NULL;
72544 +}
72545 +
72546 +#endif
72547 +
72548 +void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
72549 +{
72550 +#ifdef CONFIG_GRKERNSEC
72551 + struct signal_struct *sig = task->signal;
72552 + struct conn_table_entry *newent;
72553 +
72554 + newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
72555 + if (newent == NULL)
72556 + return;
72557 + /* no bh lock needed since we are called with bh disabled */
72558 + spin_lock(&gr_conn_table_lock);
72559 + gr_del_task_from_ip_table_nolock(sig);
72560 + sig->gr_saddr = inet->inet_rcv_saddr;
72561 + sig->gr_daddr = inet->inet_daddr;
72562 + sig->gr_sport = inet->inet_sport;
72563 + sig->gr_dport = inet->inet_dport;
72564 + gr_add_to_task_ip_table_nolock(sig, newent);
72565 + spin_unlock(&gr_conn_table_lock);
72566 +#endif
72567 + return;
72568 +}
72569 +
72570 +void gr_del_task_from_ip_table(struct task_struct *task)
72571 +{
72572 +#ifdef CONFIG_GRKERNSEC
72573 + spin_lock_bh(&gr_conn_table_lock);
72574 + gr_del_task_from_ip_table_nolock(task->signal);
72575 + spin_unlock_bh(&gr_conn_table_lock);
72576 +#endif
72577 + return;
72578 +}
72579 +
72580 +void
72581 +gr_attach_curr_ip(const struct sock *sk)
72582 +{
72583 +#ifdef CONFIG_GRKERNSEC
72584 + struct signal_struct *p, *set;
72585 + const struct inet_sock *inet = inet_sk(sk);
72586 +
72587 + if (unlikely(sk->sk_protocol != IPPROTO_TCP))
72588 + return;
72589 +
72590 + set = current->signal;
72591 +
72592 + spin_lock_bh(&gr_conn_table_lock);
72593 + p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
72594 + inet->inet_dport, inet->inet_sport);
72595 + if (unlikely(p != NULL)) {
72596 + set->curr_ip = p->curr_ip;
72597 + set->used_accept = 1;
72598 + gr_del_task_from_ip_table_nolock(p);
72599 + spin_unlock_bh(&gr_conn_table_lock);
72600 + return;
72601 + }
72602 + spin_unlock_bh(&gr_conn_table_lock);
72603 +
72604 + set->curr_ip = inet->inet_daddr;
72605 + set->used_accept = 1;
72606 +#endif
72607 + return;
72608 +}
72609 +
72610 +int
72611 +gr_handle_sock_all(const int family, const int type, const int protocol)
72612 +{
72613 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
72614 + if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
72615 + (family != AF_UNIX)) {
72616 + if (family == AF_INET)
72617 + gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
72618 + else
72619 + gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
72620 + return -EACCES;
72621 + }
72622 +#endif
72623 + return 0;
72624 +}
72625 +
72626 +int
72627 +gr_handle_sock_server(const struct sockaddr *sck)
72628 +{
72629 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
72630 + if (grsec_enable_socket_server &&
72631 + in_group_p(grsec_socket_server_gid) &&
72632 + sck && (sck->sa_family != AF_UNIX) &&
72633 + (sck->sa_family != AF_LOCAL)) {
72634 + gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
72635 + return -EACCES;
72636 + }
72637 +#endif
72638 + return 0;
72639 +}
72640 +
72641 +int
72642 +gr_handle_sock_server_other(const struct sock *sck)
72643 +{
72644 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
72645 + if (grsec_enable_socket_server &&
72646 + in_group_p(grsec_socket_server_gid) &&
72647 + sck && (sck->sk_family != AF_UNIX) &&
72648 + (sck->sk_family != AF_LOCAL)) {
72649 + gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
72650 + return -EACCES;
72651 + }
72652 +#endif
72653 + return 0;
72654 +}
72655 +
72656 +int
72657 +gr_handle_sock_client(const struct sockaddr *sck)
72658 +{
72659 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
72660 + if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
72661 + sck && (sck->sa_family != AF_UNIX) &&
72662 + (sck->sa_family != AF_LOCAL)) {
72663 + gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
72664 + return -EACCES;
72665 + }
72666 +#endif
72667 + return 0;
72668 +}
72669 diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
72670 new file mode 100644
72671 index 0000000..8159888
72672 --- /dev/null
72673 +++ b/grsecurity/grsec_sysctl.c
72674 @@ -0,0 +1,479 @@
72675 +#include <linux/kernel.h>
72676 +#include <linux/sched.h>
72677 +#include <linux/sysctl.h>
72678 +#include <linux/grsecurity.h>
72679 +#include <linux/grinternal.h>
72680 +
72681 +int
72682 +gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
72683 +{
72684 +#ifdef CONFIG_GRKERNSEC_SYSCTL
72685 + if (dirname == NULL || name == NULL)
72686 + return 0;
72687 + if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
72688 + gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
72689 + return -EACCES;
72690 + }
72691 +#endif
72692 + return 0;
72693 +}
72694 +
72695 +#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
72696 +static int __maybe_unused __read_only one = 1;
72697 +#endif
72698 +
72699 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
72700 + defined(CONFIG_GRKERNSEC_DENYUSB)
72701 +struct ctl_table grsecurity_table[] = {
72702 +#ifdef CONFIG_GRKERNSEC_SYSCTL
72703 +#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
72704 +#ifdef CONFIG_GRKERNSEC_IO
72705 + {
72706 + .procname = "disable_priv_io",
72707 + .data = &grsec_disable_privio,
72708 + .maxlen = sizeof(int),
72709 + .mode = 0600,
72710 + .proc_handler = &proc_dointvec,
72711 + },
72712 +#endif
72713 +#endif
72714 +#ifdef CONFIG_GRKERNSEC_LINK
72715 + {
72716 + .procname = "linking_restrictions",
72717 + .data = &grsec_enable_link,
72718 + .maxlen = sizeof(int),
72719 + .mode = 0600,
72720 + .proc_handler = &proc_dointvec,
72721 + },
72722 +#endif
72723 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
72724 + {
72725 + .procname = "enforce_symlinksifowner",
72726 + .data = &grsec_enable_symlinkown,
72727 + .maxlen = sizeof(int),
72728 + .mode = 0600,
72729 + .proc_handler = &proc_dointvec,
72730 + },
72731 + {
72732 + .procname = "symlinkown_gid",
72733 + .data = &grsec_symlinkown_gid,
72734 + .maxlen = sizeof(int),
72735 + .mode = 0600,
72736 + .proc_handler = &proc_dointvec,
72737 + },
72738 +#endif
72739 +#ifdef CONFIG_GRKERNSEC_BRUTE
72740 + {
72741 + .procname = "deter_bruteforce",
72742 + .data = &grsec_enable_brute,
72743 + .maxlen = sizeof(int),
72744 + .mode = 0600,
72745 + .proc_handler = &proc_dointvec,
72746 + },
72747 +#endif
72748 +#ifdef CONFIG_GRKERNSEC_FIFO
72749 + {
72750 + .procname = "fifo_restrictions",
72751 + .data = &grsec_enable_fifo,
72752 + .maxlen = sizeof(int),
72753 + .mode = 0600,
72754 + .proc_handler = &proc_dointvec,
72755 + },
72756 +#endif
72757 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
72758 + {
72759 + .procname = "ptrace_readexec",
72760 + .data = &grsec_enable_ptrace_readexec,
72761 + .maxlen = sizeof(int),
72762 + .mode = 0600,
72763 + .proc_handler = &proc_dointvec,
72764 + },
72765 +#endif
72766 +#ifdef CONFIG_GRKERNSEC_SETXID
72767 + {
72768 + .procname = "consistent_setxid",
72769 + .data = &grsec_enable_setxid,
72770 + .maxlen = sizeof(int),
72771 + .mode = 0600,
72772 + .proc_handler = &proc_dointvec,
72773 + },
72774 +#endif
72775 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
72776 + {
72777 + .procname = "ip_blackhole",
72778 + .data = &grsec_enable_blackhole,
72779 + .maxlen = sizeof(int),
72780 + .mode = 0600,
72781 + .proc_handler = &proc_dointvec,
72782 + },
72783 + {
72784 + .procname = "lastack_retries",
72785 + .data = &grsec_lastack_retries,
72786 + .maxlen = sizeof(int),
72787 + .mode = 0600,
72788 + .proc_handler = &proc_dointvec,
72789 + },
72790 +#endif
72791 +#ifdef CONFIG_GRKERNSEC_EXECLOG
72792 + {
72793 + .procname = "exec_logging",
72794 + .data = &grsec_enable_execlog,
72795 + .maxlen = sizeof(int),
72796 + .mode = 0600,
72797 + .proc_handler = &proc_dointvec,
72798 + },
72799 +#endif
72800 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72801 + {
72802 + .procname = "rwxmap_logging",
72803 + .data = &grsec_enable_log_rwxmaps,
72804 + .maxlen = sizeof(int),
72805 + .mode = 0600,
72806 + .proc_handler = &proc_dointvec,
72807 + },
72808 +#endif
72809 +#ifdef CONFIG_GRKERNSEC_SIGNAL
72810 + {
72811 + .procname = "signal_logging",
72812 + .data = &grsec_enable_signal,
72813 + .maxlen = sizeof(int),
72814 + .mode = 0600,
72815 + .proc_handler = &proc_dointvec,
72816 + },
72817 +#endif
72818 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
72819 + {
72820 + .procname = "forkfail_logging",
72821 + .data = &grsec_enable_forkfail,
72822 + .maxlen = sizeof(int),
72823 + .mode = 0600,
72824 + .proc_handler = &proc_dointvec,
72825 + },
72826 +#endif
72827 +#ifdef CONFIG_GRKERNSEC_TIME
72828 + {
72829 + .procname = "timechange_logging",
72830 + .data = &grsec_enable_time,
72831 + .maxlen = sizeof(int),
72832 + .mode = 0600,
72833 + .proc_handler = &proc_dointvec,
72834 + },
72835 +#endif
72836 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
72837 + {
72838 + .procname = "chroot_deny_shmat",
72839 + .data = &grsec_enable_chroot_shmat,
72840 + .maxlen = sizeof(int),
72841 + .mode = 0600,
72842 + .proc_handler = &proc_dointvec,
72843 + },
72844 +#endif
72845 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
72846 + {
72847 + .procname = "chroot_deny_unix",
72848 + .data = &grsec_enable_chroot_unix,
72849 + .maxlen = sizeof(int),
72850 + .mode = 0600,
72851 + .proc_handler = &proc_dointvec,
72852 + },
72853 +#endif
72854 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
72855 + {
72856 + .procname = "chroot_deny_mount",
72857 + .data = &grsec_enable_chroot_mount,
72858 + .maxlen = sizeof(int),
72859 + .mode = 0600,
72860 + .proc_handler = &proc_dointvec,
72861 + },
72862 +#endif
72863 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
72864 + {
72865 + .procname = "chroot_deny_fchdir",
72866 + .data = &grsec_enable_chroot_fchdir,
72867 + .maxlen = sizeof(int),
72868 + .mode = 0600,
72869 + .proc_handler = &proc_dointvec,
72870 + },
72871 +#endif
72872 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
72873 + {
72874 + .procname = "chroot_deny_chroot",
72875 + .data = &grsec_enable_chroot_double,
72876 + .maxlen = sizeof(int),
72877 + .mode = 0600,
72878 + .proc_handler = &proc_dointvec,
72879 + },
72880 +#endif
72881 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
72882 + {
72883 + .procname = "chroot_deny_pivot",
72884 + .data = &grsec_enable_chroot_pivot,
72885 + .maxlen = sizeof(int),
72886 + .mode = 0600,
72887 + .proc_handler = &proc_dointvec,
72888 + },
72889 +#endif
72890 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
72891 + {
72892 + .procname = "chroot_enforce_chdir",
72893 + .data = &grsec_enable_chroot_chdir,
72894 + .maxlen = sizeof(int),
72895 + .mode = 0600,
72896 + .proc_handler = &proc_dointvec,
72897 + },
72898 +#endif
72899 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
72900 + {
72901 + .procname = "chroot_deny_chmod",
72902 + .data = &grsec_enable_chroot_chmod,
72903 + .maxlen = sizeof(int),
72904 + .mode = 0600,
72905 + .proc_handler = &proc_dointvec,
72906 + },
72907 +#endif
72908 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
72909 + {
72910 + .procname = "chroot_deny_mknod",
72911 + .data = &grsec_enable_chroot_mknod,
72912 + .maxlen = sizeof(int),
72913 + .mode = 0600,
72914 + .proc_handler = &proc_dointvec,
72915 + },
72916 +#endif
72917 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
72918 + {
72919 + .procname = "chroot_restrict_nice",
72920 + .data = &grsec_enable_chroot_nice,
72921 + .maxlen = sizeof(int),
72922 + .mode = 0600,
72923 + .proc_handler = &proc_dointvec,
72924 + },
72925 +#endif
72926 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
72927 + {
72928 + .procname = "chroot_execlog",
72929 + .data = &grsec_enable_chroot_execlog,
72930 + .maxlen = sizeof(int),
72931 + .mode = 0600,
72932 + .proc_handler = &proc_dointvec,
72933 + },
72934 +#endif
72935 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
72936 + {
72937 + .procname = "chroot_caps",
72938 + .data = &grsec_enable_chroot_caps,
72939 + .maxlen = sizeof(int),
72940 + .mode = 0600,
72941 + .proc_handler = &proc_dointvec,
72942 + },
72943 +#endif
72944 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
72945 + {
72946 + .procname = "chroot_deny_sysctl",
72947 + .data = &grsec_enable_chroot_sysctl,
72948 + .maxlen = sizeof(int),
72949 + .mode = 0600,
72950 + .proc_handler = &proc_dointvec,
72951 + },
72952 +#endif
72953 +#ifdef CONFIG_GRKERNSEC_TPE
72954 + {
72955 + .procname = "tpe",
72956 + .data = &grsec_enable_tpe,
72957 + .maxlen = sizeof(int),
72958 + .mode = 0600,
72959 + .proc_handler = &proc_dointvec,
72960 + },
72961 + {
72962 + .procname = "tpe_gid",
72963 + .data = &grsec_tpe_gid,
72964 + .maxlen = sizeof(int),
72965 + .mode = 0600,
72966 + .proc_handler = &proc_dointvec,
72967 + },
72968 +#endif
72969 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
72970 + {
72971 + .procname = "tpe_invert",
72972 + .data = &grsec_enable_tpe_invert,
72973 + .maxlen = sizeof(int),
72974 + .mode = 0600,
72975 + .proc_handler = &proc_dointvec,
72976 + },
72977 +#endif
72978 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
72979 + {
72980 + .procname = "tpe_restrict_all",
72981 + .data = &grsec_enable_tpe_all,
72982 + .maxlen = sizeof(int),
72983 + .mode = 0600,
72984 + .proc_handler = &proc_dointvec,
72985 + },
72986 +#endif
72987 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
72988 + {
72989 + .procname = "socket_all",
72990 + .data = &grsec_enable_socket_all,
72991 + .maxlen = sizeof(int),
72992 + .mode = 0600,
72993 + .proc_handler = &proc_dointvec,
72994 + },
72995 + {
72996 + .procname = "socket_all_gid",
72997 + .data = &grsec_socket_all_gid,
72998 + .maxlen = sizeof(int),
72999 + .mode = 0600,
73000 + .proc_handler = &proc_dointvec,
73001 + },
73002 +#endif
73003 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
73004 + {
73005 + .procname = "socket_client",
73006 + .data = &grsec_enable_socket_client,
73007 + .maxlen = sizeof(int),
73008 + .mode = 0600,
73009 + .proc_handler = &proc_dointvec,
73010 + },
73011 + {
73012 + .procname = "socket_client_gid",
73013 + .data = &grsec_socket_client_gid,
73014 + .maxlen = sizeof(int),
73015 + .mode = 0600,
73016 + .proc_handler = &proc_dointvec,
73017 + },
73018 +#endif
73019 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
73020 + {
73021 + .procname = "socket_server",
73022 + .data = &grsec_enable_socket_server,
73023 + .maxlen = sizeof(int),
73024 + .mode = 0600,
73025 + .proc_handler = &proc_dointvec,
73026 + },
73027 + {
73028 + .procname = "socket_server_gid",
73029 + .data = &grsec_socket_server_gid,
73030 + .maxlen = sizeof(int),
73031 + .mode = 0600,
73032 + .proc_handler = &proc_dointvec,
73033 + },
73034 +#endif
73035 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
73036 + {
73037 + .procname = "audit_group",
73038 + .data = &grsec_enable_group,
73039 + .maxlen = sizeof(int),
73040 + .mode = 0600,
73041 + .proc_handler = &proc_dointvec,
73042 + },
73043 + {
73044 + .procname = "audit_gid",
73045 + .data = &grsec_audit_gid,
73046 + .maxlen = sizeof(int),
73047 + .mode = 0600,
73048 + .proc_handler = &proc_dointvec,
73049 + },
73050 +#endif
73051 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
73052 + {
73053 + .procname = "audit_chdir",
73054 + .data = &grsec_enable_chdir,
73055 + .maxlen = sizeof(int),
73056 + .mode = 0600,
73057 + .proc_handler = &proc_dointvec,
73058 + },
73059 +#endif
73060 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
73061 + {
73062 + .procname = "audit_mount",
73063 + .data = &grsec_enable_mount,
73064 + .maxlen = sizeof(int),
73065 + .mode = 0600,
73066 + .proc_handler = &proc_dointvec,
73067 + },
73068 +#endif
73069 +#ifdef CONFIG_GRKERNSEC_DMESG
73070 + {
73071 + .procname = "dmesg",
73072 + .data = &grsec_enable_dmesg,
73073 + .maxlen = sizeof(int),
73074 + .mode = 0600,
73075 + .proc_handler = &proc_dointvec,
73076 + },
73077 +#endif
73078 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
73079 + {
73080 + .procname = "chroot_findtask",
73081 + .data = &grsec_enable_chroot_findtask,
73082 + .maxlen = sizeof(int),
73083 + .mode = 0600,
73084 + .proc_handler = &proc_dointvec,
73085 + },
73086 +#endif
73087 +#ifdef CONFIG_GRKERNSEC_RESLOG
73088 + {
73089 + .procname = "resource_logging",
73090 + .data = &grsec_resource_logging,
73091 + .maxlen = sizeof(int),
73092 + .mode = 0600,
73093 + .proc_handler = &proc_dointvec,
73094 + },
73095 +#endif
73096 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
73097 + {
73098 + .procname = "audit_ptrace",
73099 + .data = &grsec_enable_audit_ptrace,
73100 + .maxlen = sizeof(int),
73101 + .mode = 0600,
73102 + .proc_handler = &proc_dointvec,
73103 + },
73104 +#endif
73105 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
73106 + {
73107 + .procname = "harden_ptrace",
73108 + .data = &grsec_enable_harden_ptrace,
73109 + .maxlen = sizeof(int),
73110 + .mode = 0600,
73111 + .proc_handler = &proc_dointvec,
73112 + },
73113 +#endif
73114 +#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
73115 + {
73116 + .procname = "harden_ipc",
73117 + .data = &grsec_enable_harden_ipc,
73118 + .maxlen = sizeof(int),
73119 + .mode = 0600,
73120 + .proc_handler = &proc_dointvec,
73121 + },
73122 +#endif
73123 + {
73124 + .procname = "grsec_lock",
73125 + .data = &grsec_lock,
73126 + .maxlen = sizeof(int),
73127 + .mode = 0600,
73128 + .proc_handler = &proc_dointvec,
73129 + },
73130 +#endif
73131 +#ifdef CONFIG_GRKERNSEC_ROFS
73132 + {
73133 + .procname = "romount_protect",
73134 + .data = &grsec_enable_rofs,
73135 + .maxlen = sizeof(int),
73136 + .mode = 0600,
73137 + .proc_handler = &proc_dointvec_minmax,
73138 + .extra1 = &one,
73139 + .extra2 = &one,
73140 + },
73141 +#endif
73142 +#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
73143 + {
73144 + .procname = "deny_new_usb",
73145 + .data = &grsec_deny_new_usb,
73146 + .maxlen = sizeof(int),
73147 + .mode = 0600,
73148 + .proc_handler = &proc_dointvec,
73149 + },
73150 +#endif
73151 + { }
73152 +};
73153 +#endif
73154 diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
73155 new file mode 100644
73156 index 0000000..0dc13c3
73157 --- /dev/null
73158 +++ b/grsecurity/grsec_time.c
73159 @@ -0,0 +1,16 @@
73160 +#include <linux/kernel.h>
73161 +#include <linux/sched.h>
73162 +#include <linux/grinternal.h>
73163 +#include <linux/module.h>
73164 +
73165 +void
73166 +gr_log_timechange(void)
73167 +{
73168 +#ifdef CONFIG_GRKERNSEC_TIME
73169 + if (grsec_enable_time)
73170 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
73171 +#endif
73172 + return;
73173 +}
73174 +
73175 +EXPORT_SYMBOL(gr_log_timechange);
73176 diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
73177 new file mode 100644
73178 index 0000000..ee57dcf
73179 --- /dev/null
73180 +++ b/grsecurity/grsec_tpe.c
73181 @@ -0,0 +1,73 @@
73182 +#include <linux/kernel.h>
73183 +#include <linux/sched.h>
73184 +#include <linux/file.h>
73185 +#include <linux/fs.h>
73186 +#include <linux/grinternal.h>
73187 +
73188 +extern int gr_acl_tpe_check(void);
73189 +
73190 +int
73191 +gr_tpe_allow(const struct file *file)
73192 +{
73193 +#ifdef CONFIG_GRKERNSEC
73194 + struct inode *inode = file->f_path.dentry->d_parent->d_inode;
73195 + const struct cred *cred = current_cred();
73196 + char *msg = NULL;
73197 + char *msg2 = NULL;
73198 +
73199 + // never restrict root
73200 + if (gr_is_global_root(cred->uid))
73201 + return 1;
73202 +
73203 + if (grsec_enable_tpe) {
73204 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
73205 + if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
73206 + msg = "not being in trusted group";
73207 + else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
73208 + msg = "being in untrusted group";
73209 +#else
73210 + if (in_group_p(grsec_tpe_gid))
73211 + msg = "being in untrusted group";
73212 +#endif
73213 + }
73214 + if (!msg && gr_acl_tpe_check())
73215 + msg = "being in untrusted role";
73216 +
73217 + // not in any affected group/role
73218 + if (!msg)
73219 + goto next_check;
73220 +
73221 + if (gr_is_global_nonroot(inode->i_uid))
73222 + msg2 = "file in non-root-owned directory";
73223 + else if (inode->i_mode & S_IWOTH)
73224 + msg2 = "file in world-writable directory";
73225 + else if (inode->i_mode & S_IWGRP)
73226 + msg2 = "file in group-writable directory";
73227 +
73228 + if (msg && msg2) {
73229 + char fullmsg[70] = {0};
73230 + snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
73231 + gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
73232 + return 0;
73233 + }
73234 + msg = NULL;
73235 +next_check:
73236 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
73237 + if (!grsec_enable_tpe || !grsec_enable_tpe_all)
73238 + return 1;
73239 +
73240 + if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
73241 + msg = "directory not owned by user";
73242 + else if (inode->i_mode & S_IWOTH)
73243 + msg = "file in world-writable directory";
73244 + else if (inode->i_mode & S_IWGRP)
73245 + msg = "file in group-writable directory";
73246 +
73247 + if (msg) {
73248 + gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
73249 + return 0;
73250 + }
73251 +#endif
73252 +#endif
73253 + return 1;
73254 +}
73255 diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
73256 new file mode 100644
73257 index 0000000..ae02d8e
73258 --- /dev/null
73259 +++ b/grsecurity/grsec_usb.c
73260 @@ -0,0 +1,15 @@
73261 +#include <linux/kernel.h>
73262 +#include <linux/grinternal.h>
73263 +#include <linux/module.h>
73264 +
73265 +int gr_handle_new_usb(void)
73266 +{
73267 +#ifdef CONFIG_GRKERNSEC_DENYUSB
73268 + if (grsec_deny_new_usb) {
73269 + printk(KERN_ALERT "grsec: denied insert of new USB device\n");
73270 + return 1;
73271 + }
73272 +#endif
73273 + return 0;
73274 +}
73275 +EXPORT_SYMBOL_GPL(gr_handle_new_usb);
73276 diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
73277 new file mode 100644
73278 index 0000000..9f7b1ac
73279 --- /dev/null
73280 +++ b/grsecurity/grsum.c
73281 @@ -0,0 +1,61 @@
73282 +#include <linux/err.h>
73283 +#include <linux/kernel.h>
73284 +#include <linux/sched.h>
73285 +#include <linux/mm.h>
73286 +#include <linux/scatterlist.h>
73287 +#include <linux/crypto.h>
73288 +#include <linux/gracl.h>
73289 +
73290 +
73291 +#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
73292 +#error "crypto and sha256 must be built into the kernel"
73293 +#endif
73294 +
73295 +int
73296 +chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
73297 +{
73298 + char *p;
73299 + struct crypto_hash *tfm;
73300 + struct hash_desc desc;
73301 + struct scatterlist sg;
73302 + unsigned char temp_sum[GR_SHA_LEN];
73303 + volatile int retval = 0;
73304 + volatile int dummy = 0;
73305 + unsigned int i;
73306 +
73307 + sg_init_table(&sg, 1);
73308 +
73309 + tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
73310 + if (IS_ERR(tfm)) {
73311 + /* should never happen, since sha256 should be built in */
73312 + return 1;
73313 + }
73314 +
73315 + desc.tfm = tfm;
73316 + desc.flags = 0;
73317 +
73318 + crypto_hash_init(&desc);
73319 +
73320 + p = salt;
73321 + sg_set_buf(&sg, p, GR_SALT_LEN);
73322 + crypto_hash_update(&desc, &sg, sg.length);
73323 +
73324 + p = entry->pw;
73325 + sg_set_buf(&sg, p, strlen(p));
73326 +
73327 + crypto_hash_update(&desc, &sg, sg.length);
73328 +
73329 + crypto_hash_final(&desc, temp_sum);
73330 +
73331 + memset(entry->pw, 0, GR_PW_LEN);
73332 +
73333 + for (i = 0; i < GR_SHA_LEN; i++)
73334 + if (sum[i] != temp_sum[i])
73335 + retval = 1;
73336 + else
73337 + dummy = 1; // waste a cycle
73338 +
73339 + crypto_free_hash(tfm);
73340 +
73341 + return retval;
73342 +}
73343 diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
73344 index 77ff547..181834f 100644
73345 --- a/include/asm-generic/4level-fixup.h
73346 +++ b/include/asm-generic/4level-fixup.h
73347 @@ -13,8 +13,10 @@
73348 #define pmd_alloc(mm, pud, address) \
73349 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
73350 NULL: pmd_offset(pud, address))
73351 +#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
73352
73353 #define pud_alloc(mm, pgd, address) (pgd)
73354 +#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
73355 #define pud_offset(pgd, start) (pgd)
73356 #define pud_none(pud) 0
73357 #define pud_bad(pud) 0
73358 diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
73359 index b7babf0..97f4c4f 100644
73360 --- a/include/asm-generic/atomic-long.h
73361 +++ b/include/asm-generic/atomic-long.h
73362 @@ -22,6 +22,12 @@
73363
73364 typedef atomic64_t atomic_long_t;
73365
73366 +#ifdef CONFIG_PAX_REFCOUNT
73367 +typedef atomic64_unchecked_t atomic_long_unchecked_t;
73368 +#else
73369 +typedef atomic64_t atomic_long_unchecked_t;
73370 +#endif
73371 +
73372 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
73373
73374 static inline long atomic_long_read(atomic_long_t *l)
73375 @@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
73376 return (long)atomic64_read(v);
73377 }
73378
73379 +#ifdef CONFIG_PAX_REFCOUNT
73380 +static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
73381 +{
73382 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73383 +
73384 + return (long)atomic64_read_unchecked(v);
73385 +}
73386 +#endif
73387 +
73388 static inline void atomic_long_set(atomic_long_t *l, long i)
73389 {
73390 atomic64_t *v = (atomic64_t *)l;
73391 @@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
73392 atomic64_set(v, i);
73393 }
73394
73395 +#ifdef CONFIG_PAX_REFCOUNT
73396 +static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
73397 +{
73398 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73399 +
73400 + atomic64_set_unchecked(v, i);
73401 +}
73402 +#endif
73403 +
73404 static inline void atomic_long_inc(atomic_long_t *l)
73405 {
73406 atomic64_t *v = (atomic64_t *)l;
73407 @@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
73408 atomic64_inc(v);
73409 }
73410
73411 +#ifdef CONFIG_PAX_REFCOUNT
73412 +static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
73413 +{
73414 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73415 +
73416 + atomic64_inc_unchecked(v);
73417 +}
73418 +#endif
73419 +
73420 static inline void atomic_long_dec(atomic_long_t *l)
73421 {
73422 atomic64_t *v = (atomic64_t *)l;
73423 @@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
73424 atomic64_dec(v);
73425 }
73426
73427 +#ifdef CONFIG_PAX_REFCOUNT
73428 +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
73429 +{
73430 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73431 +
73432 + atomic64_dec_unchecked(v);
73433 +}
73434 +#endif
73435 +
73436 static inline void atomic_long_add(long i, atomic_long_t *l)
73437 {
73438 atomic64_t *v = (atomic64_t *)l;
73439 @@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
73440 atomic64_add(i, v);
73441 }
73442
73443 +#ifdef CONFIG_PAX_REFCOUNT
73444 +static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
73445 +{
73446 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73447 +
73448 + atomic64_add_unchecked(i, v);
73449 +}
73450 +#endif
73451 +
73452 static inline void atomic_long_sub(long i, atomic_long_t *l)
73453 {
73454 atomic64_t *v = (atomic64_t *)l;
73455 @@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
73456 atomic64_sub(i, v);
73457 }
73458
73459 +#ifdef CONFIG_PAX_REFCOUNT
73460 +static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
73461 +{
73462 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73463 +
73464 + atomic64_sub_unchecked(i, v);
73465 +}
73466 +#endif
73467 +
73468 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
73469 {
73470 atomic64_t *v = (atomic64_t *)l;
73471 @@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
73472 return atomic64_add_negative(i, v);
73473 }
73474
73475 -static inline long atomic_long_add_return(long i, atomic_long_t *l)
73476 +static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
73477 {
73478 atomic64_t *v = (atomic64_t *)l;
73479
73480 return (long)atomic64_add_return(i, v);
73481 }
73482
73483 +#ifdef CONFIG_PAX_REFCOUNT
73484 +static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
73485 +{
73486 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73487 +
73488 + return (long)atomic64_add_return_unchecked(i, v);
73489 +}
73490 +#endif
73491 +
73492 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
73493 {
73494 atomic64_t *v = (atomic64_t *)l;
73495 @@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
73496 return (long)atomic64_inc_return(v);
73497 }
73498
73499 +#ifdef CONFIG_PAX_REFCOUNT
73500 +static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
73501 +{
73502 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73503 +
73504 + return (long)atomic64_inc_return_unchecked(v);
73505 +}
73506 +#endif
73507 +
73508 static inline long atomic_long_dec_return(atomic_long_t *l)
73509 {
73510 atomic64_t *v = (atomic64_t *)l;
73511 @@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
73512
73513 typedef atomic_t atomic_long_t;
73514
73515 +#ifdef CONFIG_PAX_REFCOUNT
73516 +typedef atomic_unchecked_t atomic_long_unchecked_t;
73517 +#else
73518 +typedef atomic_t atomic_long_unchecked_t;
73519 +#endif
73520 +
73521 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
73522 static inline long atomic_long_read(atomic_long_t *l)
73523 {
73524 @@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
73525 return (long)atomic_read(v);
73526 }
73527
73528 +#ifdef CONFIG_PAX_REFCOUNT
73529 +static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
73530 +{
73531 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73532 +
73533 + return (long)atomic_read_unchecked(v);
73534 +}
73535 +#endif
73536 +
73537 static inline void atomic_long_set(atomic_long_t *l, long i)
73538 {
73539 atomic_t *v = (atomic_t *)l;
73540 @@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
73541 atomic_set(v, i);
73542 }
73543
73544 +#ifdef CONFIG_PAX_REFCOUNT
73545 +static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
73546 +{
73547 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73548 +
73549 + atomic_set_unchecked(v, i);
73550 +}
73551 +#endif
73552 +
73553 static inline void atomic_long_inc(atomic_long_t *l)
73554 {
73555 atomic_t *v = (atomic_t *)l;
73556 @@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
73557 atomic_inc(v);
73558 }
73559
73560 +#ifdef CONFIG_PAX_REFCOUNT
73561 +static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
73562 +{
73563 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73564 +
73565 + atomic_inc_unchecked(v);
73566 +}
73567 +#endif
73568 +
73569 static inline void atomic_long_dec(atomic_long_t *l)
73570 {
73571 atomic_t *v = (atomic_t *)l;
73572 @@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
73573 atomic_dec(v);
73574 }
73575
73576 +#ifdef CONFIG_PAX_REFCOUNT
73577 +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
73578 +{
73579 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73580 +
73581 + atomic_dec_unchecked(v);
73582 +}
73583 +#endif
73584 +
73585 static inline void atomic_long_add(long i, atomic_long_t *l)
73586 {
73587 atomic_t *v = (atomic_t *)l;
73588 @@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
73589 atomic_add(i, v);
73590 }
73591
73592 +#ifdef CONFIG_PAX_REFCOUNT
73593 +static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
73594 +{
73595 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73596 +
73597 + atomic_add_unchecked(i, v);
73598 +}
73599 +#endif
73600 +
73601 static inline void atomic_long_sub(long i, atomic_long_t *l)
73602 {
73603 atomic_t *v = (atomic_t *)l;
73604 @@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
73605 atomic_sub(i, v);
73606 }
73607
73608 +#ifdef CONFIG_PAX_REFCOUNT
73609 +static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
73610 +{
73611 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73612 +
73613 + atomic_sub_unchecked(i, v);
73614 +}
73615 +#endif
73616 +
73617 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
73618 {
73619 atomic_t *v = (atomic_t *)l;
73620 @@ -218,6 +356,16 @@ static inline long atomic_long_add_return(long i, atomic_long_t *l)
73621 return (long)atomic_add_return(i, v);
73622 }
73623
73624 +#ifdef CONFIG_PAX_REFCOUNT
73625 +static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
73626 +{
73627 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73628 +
73629 + return (long)atomic_add_return_unchecked(i, v);
73630 +}
73631 +
73632 +#endif
73633 +
73634 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
73635 {
73636 atomic_t *v = (atomic_t *)l;
73637 @@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
73638 return (long)atomic_inc_return(v);
73639 }
73640
73641 +#ifdef CONFIG_PAX_REFCOUNT
73642 +static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
73643 +{
73644 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73645 +
73646 + return (long)atomic_inc_return_unchecked(v);
73647 +}
73648 +#endif
73649 +
73650 static inline long atomic_long_dec_return(atomic_long_t *l)
73651 {
73652 atomic_t *v = (atomic_t *)l;
73653 @@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
73654
73655 #endif /* BITS_PER_LONG == 64 */
73656
73657 +#ifdef CONFIG_PAX_REFCOUNT
73658 +static inline void pax_refcount_needs_these_functions(void)
73659 +{
73660 + atomic_read_unchecked((atomic_unchecked_t *)NULL);
73661 + atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
73662 + atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
73663 + atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
73664 + atomic_inc_unchecked((atomic_unchecked_t *)NULL);
73665 + (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
73666 + atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
73667 + atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
73668 + atomic_dec_unchecked((atomic_unchecked_t *)NULL);
73669 + atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
73670 + (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
73671 +#ifdef CONFIG_X86
73672 + atomic_clear_mask_unchecked(0, NULL);
73673 + atomic_set_mask_unchecked(0, NULL);
73674 +#endif
73675 +
73676 + atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
73677 + atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
73678 + atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
73679 + atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
73680 + atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
73681 + atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
73682 + atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
73683 + atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
73684 +}
73685 +#else
73686 +#define atomic_read_unchecked(v) atomic_read(v)
73687 +#define atomic_set_unchecked(v, i) atomic_set((v), (i))
73688 +#define atomic_add_unchecked(i, v) atomic_add((i), (v))
73689 +#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
73690 +#define atomic_inc_unchecked(v) atomic_inc(v)
73691 +#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
73692 +#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
73693 +#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
73694 +#define atomic_dec_unchecked(v) atomic_dec(v)
73695 +#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
73696 +#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
73697 +#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
73698 +#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
73699 +
73700 +#define atomic_long_read_unchecked(v) atomic_long_read(v)
73701 +#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
73702 +#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
73703 +#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
73704 +#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
73705 +#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
73706 +#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
73707 +#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
73708 +#endif
73709 +
73710 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
73711 diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
73712 index 33bd2de..f31bff97 100644
73713 --- a/include/asm-generic/atomic.h
73714 +++ b/include/asm-generic/atomic.h
73715 @@ -153,7 +153,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
73716 * Atomically clears the bits set in @mask from @v
73717 */
73718 #ifndef atomic_clear_mask
73719 -static inline void atomic_clear_mask(unsigned long mask, atomic_t *v)
73720 +static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
73721 {
73722 unsigned long flags;
73723
73724 diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
73725 index b18ce4f..2ee2843 100644
73726 --- a/include/asm-generic/atomic64.h
73727 +++ b/include/asm-generic/atomic64.h
73728 @@ -16,6 +16,8 @@ typedef struct {
73729 long long counter;
73730 } atomic64_t;
73731
73732 +typedef atomic64_t atomic64_unchecked_t;
73733 +
73734 #define ATOMIC64_INIT(i) { (i) }
73735
73736 extern long long atomic64_read(const atomic64_t *v);
73737 @@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
73738 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
73739 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
73740
73741 +#define atomic64_read_unchecked(v) atomic64_read(v)
73742 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
73743 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
73744 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
73745 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
73746 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
73747 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
73748 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
73749 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
73750 +
73751 #endif /* _ASM_GENERIC_ATOMIC64_H */
73752 diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
73753 index a60a7cc..0fe12f2 100644
73754 --- a/include/asm-generic/bitops/__fls.h
73755 +++ b/include/asm-generic/bitops/__fls.h
73756 @@ -9,7 +9,7 @@
73757 *
73758 * Undefined if no set bit exists, so code should check against 0 first.
73759 */
73760 -static __always_inline unsigned long __fls(unsigned long word)
73761 +static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
73762 {
73763 int num = BITS_PER_LONG - 1;
73764
73765 diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
73766 index 0576d1f..dad6c71 100644
73767 --- a/include/asm-generic/bitops/fls.h
73768 +++ b/include/asm-generic/bitops/fls.h
73769 @@ -9,7 +9,7 @@
73770 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
73771 */
73772
73773 -static __always_inline int fls(int x)
73774 +static __always_inline int __intentional_overflow(-1) fls(int x)
73775 {
73776 int r = 32;
73777
73778 diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
73779 index b097cf8..3d40e14 100644
73780 --- a/include/asm-generic/bitops/fls64.h
73781 +++ b/include/asm-generic/bitops/fls64.h
73782 @@ -15,7 +15,7 @@
73783 * at position 64.
73784 */
73785 #if BITS_PER_LONG == 32
73786 -static __always_inline int fls64(__u64 x)
73787 +static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
73788 {
73789 __u32 h = x >> 32;
73790 if (h)
73791 @@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
73792 return fls(x);
73793 }
73794 #elif BITS_PER_LONG == 64
73795 -static __always_inline int fls64(__u64 x)
73796 +static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
73797 {
73798 if (x == 0)
73799 return 0;
73800 diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
73801 index 1bfcfe5..e04c5c9 100644
73802 --- a/include/asm-generic/cache.h
73803 +++ b/include/asm-generic/cache.h
73804 @@ -6,7 +6,7 @@
73805 * cache lines need to provide their own cache.h.
73806 */
73807
73808 -#define L1_CACHE_SHIFT 5
73809 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
73810 +#define L1_CACHE_SHIFT 5UL
73811 +#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
73812
73813 #endif /* __ASM_GENERIC_CACHE_H */
73814 diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
73815 index 0d68a1e..b74a761 100644
73816 --- a/include/asm-generic/emergency-restart.h
73817 +++ b/include/asm-generic/emergency-restart.h
73818 @@ -1,7 +1,7 @@
73819 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
73820 #define _ASM_GENERIC_EMERGENCY_RESTART_H
73821
73822 -static inline void machine_emergency_restart(void)
73823 +static inline __noreturn void machine_emergency_restart(void)
73824 {
73825 machine_restart(NULL);
73826 }
73827 diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
73828 index 90f99c7..00ce236 100644
73829 --- a/include/asm-generic/kmap_types.h
73830 +++ b/include/asm-generic/kmap_types.h
73831 @@ -2,9 +2,9 @@
73832 #define _ASM_GENERIC_KMAP_TYPES_H
73833
73834 #ifdef __WITH_KM_FENCE
73835 -# define KM_TYPE_NR 41
73836 +# define KM_TYPE_NR 42
73837 #else
73838 -# define KM_TYPE_NR 20
73839 +# define KM_TYPE_NR 21
73840 #endif
73841
73842 #endif
73843 diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
73844 index 9ceb03b..62b0b8f 100644
73845 --- a/include/asm-generic/local.h
73846 +++ b/include/asm-generic/local.h
73847 @@ -23,24 +23,37 @@ typedef struct
73848 atomic_long_t a;
73849 } local_t;
73850
73851 +typedef struct {
73852 + atomic_long_unchecked_t a;
73853 +} local_unchecked_t;
73854 +
73855 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
73856
73857 #define local_read(l) atomic_long_read(&(l)->a)
73858 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
73859 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
73860 +#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
73861 #define local_inc(l) atomic_long_inc(&(l)->a)
73862 +#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
73863 #define local_dec(l) atomic_long_dec(&(l)->a)
73864 +#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
73865 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
73866 +#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
73867 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
73868 +#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
73869
73870 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
73871 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
73872 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
73873 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
73874 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
73875 +#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
73876 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
73877 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
73878 +#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
73879
73880 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
73881 +#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
73882 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
73883 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
73884 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
73885 diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
73886 index 725612b..9cc513a 100644
73887 --- a/include/asm-generic/pgtable-nopmd.h
73888 +++ b/include/asm-generic/pgtable-nopmd.h
73889 @@ -1,14 +1,19 @@
73890 #ifndef _PGTABLE_NOPMD_H
73891 #define _PGTABLE_NOPMD_H
73892
73893 -#ifndef __ASSEMBLY__
73894 -
73895 #include <asm-generic/pgtable-nopud.h>
73896
73897 -struct mm_struct;
73898 -
73899 #define __PAGETABLE_PMD_FOLDED
73900
73901 +#define PMD_SHIFT PUD_SHIFT
73902 +#define PTRS_PER_PMD 1
73903 +#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
73904 +#define PMD_MASK (~(PMD_SIZE-1))
73905 +
73906 +#ifndef __ASSEMBLY__
73907 +
73908 +struct mm_struct;
73909 +
73910 /*
73911 * Having the pmd type consist of a pud gets the size right, and allows
73912 * us to conceptually access the pud entry that this pmd is folded into
73913 @@ -16,11 +21,6 @@ struct mm_struct;
73914 */
73915 typedef struct { pud_t pud; } pmd_t;
73916
73917 -#define PMD_SHIFT PUD_SHIFT
73918 -#define PTRS_PER_PMD 1
73919 -#define PMD_SIZE (1UL << PMD_SHIFT)
73920 -#define PMD_MASK (~(PMD_SIZE-1))
73921 -
73922 /*
73923 * The "pud_xxx()" functions here are trivial for a folded two-level
73924 * setup: the pmd is never bad, and a pmd always exists (as it's folded
73925 diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
73926 index 810431d..0ec4804f 100644
73927 --- a/include/asm-generic/pgtable-nopud.h
73928 +++ b/include/asm-generic/pgtable-nopud.h
73929 @@ -1,10 +1,15 @@
73930 #ifndef _PGTABLE_NOPUD_H
73931 #define _PGTABLE_NOPUD_H
73932
73933 -#ifndef __ASSEMBLY__
73934 -
73935 #define __PAGETABLE_PUD_FOLDED
73936
73937 +#define PUD_SHIFT PGDIR_SHIFT
73938 +#define PTRS_PER_PUD 1
73939 +#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
73940 +#define PUD_MASK (~(PUD_SIZE-1))
73941 +
73942 +#ifndef __ASSEMBLY__
73943 +
73944 /*
73945 * Having the pud type consist of a pgd gets the size right, and allows
73946 * us to conceptually access the pgd entry that this pud is folded into
73947 @@ -12,11 +17,6 @@
73948 */
73949 typedef struct { pgd_t pgd; } pud_t;
73950
73951 -#define PUD_SHIFT PGDIR_SHIFT
73952 -#define PTRS_PER_PUD 1
73953 -#define PUD_SIZE (1UL << PUD_SHIFT)
73954 -#define PUD_MASK (~(PUD_SIZE-1))
73955 -
73956 /*
73957 * The "pgd_xxx()" functions here are trivial for a folded two-level
73958 * setup: the pud is never bad, and a pud always exists (as it's folded
73959 @@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
73960 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
73961
73962 #define pgd_populate(mm, pgd, pud) do { } while (0)
73963 +#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
73964 /*
73965 * (puds are folded into pgds so this doesn't get actually called,
73966 * but the define is needed for a generic inline function.)
73967 diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
73968 index f330d28..d93bba9 100644
73969 --- a/include/asm-generic/pgtable.h
73970 +++ b/include/asm-generic/pgtable.h
73971 @@ -599,11 +599,10 @@ static inline int pmd_none_or_trans_huge_or_clear_bad(pmd_t *pmd)
73972 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
73973 barrier();
73974 #endif
73975 - if (pmd_none(pmdval))
73976 + if (pmd_none(pmdval) || pmd_trans_huge(pmdval))
73977 return 1;
73978 if (unlikely(pmd_bad(pmdval))) {
73979 - if (!pmd_trans_huge(pmdval))
73980 - pmd_clear_bad(pmd);
73981 + pmd_clear_bad(pmd);
73982 return 1;
73983 }
73984 return 0;
73985 @@ -737,6 +736,22 @@ static inline pmd_t pmd_mknuma(pmd_t pmd)
73986 }
73987 #endif /* CONFIG_NUMA_BALANCING */
73988
73989 +#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
73990 +#ifdef CONFIG_PAX_KERNEXEC
73991 +#error KERNEXEC requires pax_open_kernel
73992 +#else
73993 +static inline unsigned long pax_open_kernel(void) { return 0; }
73994 +#endif
73995 +#endif
73996 +
73997 +#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
73998 +#ifdef CONFIG_PAX_KERNEXEC
73999 +#error KERNEXEC requires pax_close_kernel
74000 +#else
74001 +static inline unsigned long pax_close_kernel(void) { return 0; }
74002 +#endif
74003 +#endif
74004 +
74005 #endif /* CONFIG_MMU */
74006
74007 #endif /* !__ASSEMBLY__ */
74008 diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
74009 index dc1269c..48a4f51 100644
74010 --- a/include/asm-generic/uaccess.h
74011 +++ b/include/asm-generic/uaccess.h
74012 @@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
74013 return __clear_user(to, n);
74014 }
74015
74016 +#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
74017 +#ifdef CONFIG_PAX_MEMORY_UDEREF
74018 +#error UDEREF requires pax_open_userland
74019 +#else
74020 +static inline unsigned long pax_open_userland(void) { return 0; }
74021 +#endif
74022 +#endif
74023 +
74024 +#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
74025 +#ifdef CONFIG_PAX_MEMORY_UDEREF
74026 +#error UDEREF requires pax_close_userland
74027 +#else
74028 +static inline unsigned long pax_close_userland(void) { return 0; }
74029 +#endif
74030 +#endif
74031 +
74032 #endif /* __ASM_GENERIC_UACCESS_H */
74033 diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
74034 index 83e2c31..eeb4a04 100644
74035 --- a/include/asm-generic/vmlinux.lds.h
74036 +++ b/include/asm-generic/vmlinux.lds.h
74037 @@ -232,6 +232,7 @@
74038 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
74039 VMLINUX_SYMBOL(__start_rodata) = .; \
74040 *(.rodata) *(.rodata.*) \
74041 + *(.data..read_only) \
74042 *(__vermagic) /* Kernel version magic */ \
74043 . = ALIGN(8); \
74044 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
74045 @@ -715,17 +716,18 @@
74046 * section in the linker script will go there too. @phdr should have
74047 * a leading colon.
74048 *
74049 - * Note that this macros defines __per_cpu_load as an absolute symbol.
74050 + * Note that this macros defines per_cpu_load as an absolute symbol.
74051 * If there is no need to put the percpu section at a predetermined
74052 * address, use PERCPU_SECTION.
74053 */
74054 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
74055 - VMLINUX_SYMBOL(__per_cpu_load) = .; \
74056 - .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
74057 + per_cpu_load = .; \
74058 + .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
74059 - LOAD_OFFSET) { \
74060 + VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
74061 PERCPU_INPUT(cacheline) \
74062 } phdr \
74063 - . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
74064 + . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
74065
74066 /**
74067 * PERCPU_SECTION - define output section for percpu area, simple version
74068 diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
74069 index 418d270..bfd2794 100644
74070 --- a/include/crypto/algapi.h
74071 +++ b/include/crypto/algapi.h
74072 @@ -34,7 +34,7 @@ struct crypto_type {
74073 unsigned int maskclear;
74074 unsigned int maskset;
74075 unsigned int tfmsize;
74076 -};
74077 +} __do_const;
74078
74079 struct crypto_instance {
74080 struct crypto_alg alg;
74081 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
74082 index b46fb45..b30d6d5 100644
74083 --- a/include/drm/drmP.h
74084 +++ b/include/drm/drmP.h
74085 @@ -66,6 +66,7 @@
74086 #include <linux/workqueue.h>
74087 #include <linux/poll.h>
74088 #include <asm/pgalloc.h>
74089 +#include <asm/local.h>
74090 #include <drm/drm.h>
74091 #include <drm/drm_sarea.h>
74092 #include <drm/drm_vma_manager.h>
74093 @@ -277,10 +278,12 @@ do { \
74094 * \param cmd command.
74095 * \param arg argument.
74096 */
74097 -typedef int drm_ioctl_t(struct drm_device *dev, void *data,
74098 +typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
74099 + struct drm_file *file_priv);
74100 +typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
74101 struct drm_file *file_priv);
74102
74103 -typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
74104 +typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
74105 unsigned long arg);
74106
74107 #define DRM_IOCTL_NR(n) _IOC_NR(n)
74108 @@ -296,10 +299,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
74109 struct drm_ioctl_desc {
74110 unsigned int cmd;
74111 int flags;
74112 - drm_ioctl_t *func;
74113 + drm_ioctl_t func;
74114 unsigned int cmd_drv;
74115 const char *name;
74116 -};
74117 +} __do_const;
74118
74119 /**
74120 * Creates a driver or general drm_ioctl_desc array entry for the given
74121 @@ -1027,7 +1030,7 @@ struct drm_info_list {
74122 int (*show)(struct seq_file*, void*); /** show callback */
74123 u32 driver_features; /**< Required driver features for this entry */
74124 void *data;
74125 -};
74126 +} __do_const;
74127
74128 /**
74129 * debugfs node structure. This structure represents a debugfs file.
74130 @@ -1098,7 +1101,7 @@ struct drm_device {
74131
74132 /** \name Usage Counters */
74133 /*@{ */
74134 - int open_count; /**< Outstanding files open */
74135 + local_t open_count; /**< Outstanding files open */
74136 atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
74137 atomic_t vma_count; /**< Outstanding vma areas open */
74138 int buf_use; /**< Buffers in use -- cannot alloc */
74139 @@ -1109,7 +1112,7 @@ struct drm_device {
74140 /*@{ */
74141 unsigned long counters;
74142 enum drm_stat_type types[15];
74143 - atomic_t counts[15];
74144 + atomic_unchecked_t counts[15];
74145 /*@} */
74146
74147 struct list_head filelist;
74148 diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
74149 index f43d556..94d9343 100644
74150 --- a/include/drm/drm_crtc_helper.h
74151 +++ b/include/drm/drm_crtc_helper.h
74152 @@ -109,7 +109,7 @@ struct drm_encoder_helper_funcs {
74153 struct drm_connector *connector);
74154 /* disable encoder when not in use - more explicit than dpms off */
74155 void (*disable)(struct drm_encoder *encoder);
74156 -};
74157 +} __no_const;
74158
74159 /**
74160 * drm_connector_helper_funcs - helper operations for connectors
74161 diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
74162 index 8a10f5c..5de7f5c 100644
74163 --- a/include/drm/i915_pciids.h
74164 +++ b/include/drm/i915_pciids.h
74165 @@ -37,7 +37,7 @@
74166 */
74167 #define INTEL_VGA_DEVICE(id, info) { \
74168 0x8086, id, \
74169 - ~0, ~0, \
74170 + PCI_ANY_ID, PCI_ANY_ID, \
74171 0x030000, 0xff0000, \
74172 (unsigned long) info }
74173
74174 diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
74175 index 72dcbe8..8db58d7 100644
74176 --- a/include/drm/ttm/ttm_memory.h
74177 +++ b/include/drm/ttm/ttm_memory.h
74178 @@ -48,7 +48,7 @@
74179
74180 struct ttm_mem_shrink {
74181 int (*do_shrink) (struct ttm_mem_shrink *);
74182 -};
74183 +} __no_const;
74184
74185 /**
74186 * struct ttm_mem_global - Global memory accounting structure.
74187 diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
74188 index 4b840e8..155d235 100644
74189 --- a/include/keys/asymmetric-subtype.h
74190 +++ b/include/keys/asymmetric-subtype.h
74191 @@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
74192 /* Verify the signature on a key of this subtype (optional) */
74193 int (*verify_signature)(const struct key *key,
74194 const struct public_key_signature *sig);
74195 -};
74196 +} __do_const;
74197
74198 /**
74199 * asymmetric_key_subtype - Get the subtype from an asymmetric key
74200 diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
74201 index c1da539..1dcec55 100644
74202 --- a/include/linux/atmdev.h
74203 +++ b/include/linux/atmdev.h
74204 @@ -28,7 +28,7 @@ struct compat_atm_iobuf {
74205 #endif
74206
74207 struct k_atm_aal_stats {
74208 -#define __HANDLE_ITEM(i) atomic_t i
74209 +#define __HANDLE_ITEM(i) atomic_unchecked_t i
74210 __AAL_STAT_ITEMS
74211 #undef __HANDLE_ITEM
74212 };
74213 @@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
74214 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
74215 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
74216 struct module *owner;
74217 -};
74218 +} __do_const ;
74219
74220 struct atmphy_ops {
74221 int (*start)(struct atm_dev *dev);
74222 diff --git a/include/linux/audit.h b/include/linux/audit.h
74223 index 729a4d1..9b304ae 100644
74224 --- a/include/linux/audit.h
74225 +++ b/include/linux/audit.h
74226 @@ -193,7 +193,7 @@ static inline void audit_ptrace(struct task_struct *t)
74227 extern unsigned int audit_serial(void);
74228 extern int auditsc_get_stamp(struct audit_context *ctx,
74229 struct timespec *t, unsigned int *serial);
74230 -extern int audit_set_loginuid(kuid_t loginuid);
74231 +extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
74232
74233 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
74234 {
74235 diff --git a/include/linux/auxvec.h b/include/linux/auxvec.h
74236 index 669fef5..3e0fbe4 100644
74237 --- a/include/linux/auxvec.h
74238 +++ b/include/linux/auxvec.h
74239 @@ -3,6 +3,6 @@
74240
74241 #include <uapi/linux/auxvec.h>
74242
74243 -#define AT_VECTOR_SIZE_BASE 19 /* NEW_AUX_ENT entries in auxiliary table */
74244 +#define AT_VECTOR_SIZE_BASE 20 /* NEW_AUX_ENT entries in auxiliary table */
74245 /* number of "#define AT_.*" above, minus {AT_NULL, AT_IGNORE, AT_NOTELF} */
74246 #endif /* _LINUX_AUXVEC_H */
74247 diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
74248 index 7554fd4..0f86379 100644
74249 --- a/include/linux/binfmts.h
74250 +++ b/include/linux/binfmts.h
74251 @@ -73,8 +73,10 @@ struct linux_binfmt {
74252 int (*load_binary)(struct linux_binprm *);
74253 int (*load_shlib)(struct file *);
74254 int (*core_dump)(struct coredump_params *cprm);
74255 + void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
74256 + void (*handle_mmap)(struct file *);
74257 unsigned long min_coredump; /* minimal dump size */
74258 -};
74259 +} __do_const;
74260
74261 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
74262
74263 diff --git a/include/linux/bitops.h b/include/linux/bitops.h
74264 index a3b6b82..2a7d758 100644
74265 --- a/include/linux/bitops.h
74266 +++ b/include/linux/bitops.h
74267 @@ -91,7 +91,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
74268 * @word: value to rotate
74269 * @shift: bits to roll
74270 */
74271 -static inline __u32 rol32(__u32 word, unsigned int shift)
74272 +static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
74273 {
74274 return (word << shift) | (word >> (32 - shift));
74275 }
74276 @@ -101,7 +101,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
74277 * @word: value to rotate
74278 * @shift: bits to roll
74279 */
74280 -static inline __u32 ror32(__u32 word, unsigned int shift)
74281 +static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
74282 {
74283 return (word >> shift) | (word << (32 - shift));
74284 }
74285 @@ -157,7 +157,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
74286 return (__s32)(value << shift) >> shift;
74287 }
74288
74289 -static inline unsigned fls_long(unsigned long l)
74290 +static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
74291 {
74292 if (sizeof(l) == 4)
74293 return fls(l);
74294 diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
74295 index 0e6f765..885bb2b 100644
74296 --- a/include/linux/blkdev.h
74297 +++ b/include/linux/blkdev.h
74298 @@ -1537,7 +1537,7 @@ struct block_device_operations {
74299 /* this callback is with swap_lock and sometimes page table lock held */
74300 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
74301 struct module *owner;
74302 -};
74303 +} __do_const;
74304
74305 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
74306 unsigned long);
74307 diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
74308 index 7c2e030..b72475d 100644
74309 --- a/include/linux/blktrace_api.h
74310 +++ b/include/linux/blktrace_api.h
74311 @@ -23,7 +23,7 @@ struct blk_trace {
74312 struct dentry *dir;
74313 struct dentry *dropped_file;
74314 struct dentry *msg_file;
74315 - atomic_t dropped;
74316 + atomic_unchecked_t dropped;
74317 };
74318
74319 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
74320 diff --git a/include/linux/cache.h b/include/linux/cache.h
74321 index 4c57065..40346da 100644
74322 --- a/include/linux/cache.h
74323 +++ b/include/linux/cache.h
74324 @@ -16,6 +16,14 @@
74325 #define __read_mostly
74326 #endif
74327
74328 +#ifndef __read_only
74329 +#ifdef CONFIG_PAX_KERNEXEC
74330 +#error KERNEXEC requires __read_only
74331 +#else
74332 +#define __read_only __read_mostly
74333 +#endif
74334 +#endif
74335 +
74336 #ifndef ____cacheline_aligned
74337 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
74338 #endif
74339 diff --git a/include/linux/capability.h b/include/linux/capability.h
74340 index a6ee1f9..e1ca49d 100644
74341 --- a/include/linux/capability.h
74342 +++ b/include/linux/capability.h
74343 @@ -212,8 +212,13 @@ extern bool capable(int cap);
74344 extern bool ns_capable(struct user_namespace *ns, int cap);
74345 extern bool inode_capable(const struct inode *inode, int cap);
74346 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
74347 +extern bool capable_nolog(int cap);
74348 +extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
74349 +extern bool inode_capable_nolog(const struct inode *inode, int cap);
74350
74351 /* audit system wants to get cap info from files as well */
74352 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
74353
74354 +extern int is_privileged_binary(const struct dentry *dentry);
74355 +
74356 #endif /* !_LINUX_CAPABILITY_H */
74357 diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
74358 index 8609d57..86e4d79 100644
74359 --- a/include/linux/cdrom.h
74360 +++ b/include/linux/cdrom.h
74361 @@ -87,7 +87,6 @@ struct cdrom_device_ops {
74362
74363 /* driver specifications */
74364 const int capability; /* capability flags */
74365 - int n_minors; /* number of active minor devices */
74366 /* handle uniform packets for scsi type devices (scsi,atapi) */
74367 int (*generic_packet) (struct cdrom_device_info *,
74368 struct packet_command *);
74369 diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
74370 index 4ce9056..86caac6 100644
74371 --- a/include/linux/cleancache.h
74372 +++ b/include/linux/cleancache.h
74373 @@ -31,7 +31,7 @@ struct cleancache_ops {
74374 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
74375 void (*invalidate_inode)(int, struct cleancache_filekey);
74376 void (*invalidate_fs)(int);
74377 -};
74378 +} __no_const;
74379
74380 extern struct cleancache_ops *
74381 cleancache_register_ops(struct cleancache_ops *ops);
74382 diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
74383 index 73bdb69..d66d47a 100644
74384 --- a/include/linux/clk-provider.h
74385 +++ b/include/linux/clk-provider.h
74386 @@ -141,6 +141,7 @@ struct clk_ops {
74387 unsigned long);
74388 void (*init)(struct clk_hw *hw);
74389 };
74390 +typedef struct clk_ops __no_const clk_ops_no_const;
74391
74392 /**
74393 * struct clk_init_data - holds init data that's common to all clocks and is
74394 diff --git a/include/linux/compat.h b/include/linux/compat.h
74395 index 345da00..b6eff26 100644
74396 --- a/include/linux/compat.h
74397 +++ b/include/linux/compat.h
74398 @@ -313,7 +313,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
74399 compat_size_t __user *len_ptr);
74400
74401 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
74402 -asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
74403 +asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
74404 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
74405 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
74406 compat_ssize_t msgsz, int msgflg);
74407 @@ -420,7 +420,7 @@ extern int compat_ptrace_request(struct task_struct *child,
74408 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
74409 compat_ulong_t addr, compat_ulong_t data);
74410 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
74411 - compat_long_t addr, compat_long_t data);
74412 + compat_ulong_t addr, compat_ulong_t data);
74413
74414 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, size_t);
74415 /*
74416 diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
74417 index ded4299..da50e3b 100644
74418 --- a/include/linux/compiler-gcc4.h
74419 +++ b/include/linux/compiler-gcc4.h
74420 @@ -39,9 +39,29 @@
74421 # define __compiletime_warning(message) __attribute__((warning(message)))
74422 # define __compiletime_error(message) __attribute__((error(message)))
74423 #endif /* __CHECKER__ */
74424 +
74425 +#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
74426 +#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
74427 +#define __bos0(ptr) __bos((ptr), 0)
74428 +#define __bos1(ptr) __bos((ptr), 1)
74429 #endif /* GCC_VERSION >= 40300 */
74430
74431 #if GCC_VERSION >= 40500
74432 +
74433 +#ifdef CONSTIFY_PLUGIN
74434 +#define __no_const __attribute__((no_const))
74435 +#define __do_const __attribute__((do_const))
74436 +#endif
74437 +
74438 +#ifdef SIZE_OVERFLOW_PLUGIN
74439 +#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
74440 +#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
74441 +#endif
74442 +
74443 +#ifdef LATENT_ENTROPY_PLUGIN
74444 +#define __latent_entropy __attribute__((latent_entropy))
74445 +#endif
74446 +
74447 /*
74448 * Mark a position in code as unreachable. This can be used to
74449 * suppress control flow warnings after asm blocks that transfer
74450 diff --git a/include/linux/compiler.h b/include/linux/compiler.h
74451 index 92669cd..1771a15 100644
74452 --- a/include/linux/compiler.h
74453 +++ b/include/linux/compiler.h
74454 @@ -5,11 +5,14 @@
74455
74456 #ifdef __CHECKER__
74457 # define __user __attribute__((noderef, address_space(1)))
74458 +# define __force_user __force __user
74459 # define __kernel __attribute__((address_space(0)))
74460 +# define __force_kernel __force __kernel
74461 # define __safe __attribute__((safe))
74462 # define __force __attribute__((force))
74463 # define __nocast __attribute__((nocast))
74464 # define __iomem __attribute__((noderef, address_space(2)))
74465 +# define __force_iomem __force __iomem
74466 # define __must_hold(x) __attribute__((context(x,1,1)))
74467 # define __acquires(x) __attribute__((context(x,0,1)))
74468 # define __releases(x) __attribute__((context(x,1,0)))
74469 @@ -17,20 +20,37 @@
74470 # define __release(x) __context__(x,-1)
74471 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
74472 # define __percpu __attribute__((noderef, address_space(3)))
74473 +# define __force_percpu __force __percpu
74474 #ifdef CONFIG_SPARSE_RCU_POINTER
74475 # define __rcu __attribute__((noderef, address_space(4)))
74476 +# define __force_rcu __force __rcu
74477 #else
74478 # define __rcu
74479 +# define __force_rcu
74480 #endif
74481 extern void __chk_user_ptr(const volatile void __user *);
74482 extern void __chk_io_ptr(const volatile void __iomem *);
74483 #else
74484 -# define __user
74485 -# define __kernel
74486 +# ifdef CHECKER_PLUGIN
74487 +//# define __user
74488 +//# define __force_user
74489 +//# define __kernel
74490 +//# define __force_kernel
74491 +# else
74492 +# ifdef STRUCTLEAK_PLUGIN
74493 +# define __user __attribute__((user))
74494 +# else
74495 +# define __user
74496 +# endif
74497 +# define __force_user
74498 +# define __kernel
74499 +# define __force_kernel
74500 +# endif
74501 # define __safe
74502 # define __force
74503 # define __nocast
74504 # define __iomem
74505 +# define __force_iomem
74506 # define __chk_user_ptr(x) (void)0
74507 # define __chk_io_ptr(x) (void)0
74508 # define __builtin_warning(x, y...) (1)
74509 @@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
74510 # define __release(x) (void)0
74511 # define __cond_lock(x,c) (c)
74512 # define __percpu
74513 +# define __force_percpu
74514 # define __rcu
74515 +# define __force_rcu
74516 #endif
74517
74518 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
74519 @@ -275,6 +297,26 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
74520 # define __attribute_const__ /* unimplemented */
74521 #endif
74522
74523 +#ifndef __no_const
74524 +# define __no_const
74525 +#endif
74526 +
74527 +#ifndef __do_const
74528 +# define __do_const
74529 +#endif
74530 +
74531 +#ifndef __size_overflow
74532 +# define __size_overflow(...)
74533 +#endif
74534 +
74535 +#ifndef __intentional_overflow
74536 +# define __intentional_overflow(...)
74537 +#endif
74538 +
74539 +#ifndef __latent_entropy
74540 +# define __latent_entropy
74541 +#endif
74542 +
74543 /*
74544 * Tell gcc if a function is cold. The compiler will assume any path
74545 * directly leading to the call is unlikely.
74546 @@ -284,6 +326,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
74547 #define __cold
74548 #endif
74549
74550 +#ifndef __alloc_size
74551 +#define __alloc_size(...)
74552 +#endif
74553 +
74554 +#ifndef __bos
74555 +#define __bos(ptr, arg)
74556 +#endif
74557 +
74558 +#ifndef __bos0
74559 +#define __bos0(ptr)
74560 +#endif
74561 +
74562 +#ifndef __bos1
74563 +#define __bos1(ptr)
74564 +#endif
74565 +
74566 /* Simple shorthand for a section definition */
74567 #ifndef __section
74568 # define __section(S) __attribute__ ((__section__(#S)))
74569 @@ -349,7 +407,8 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
74570 * use is to mediate communication between process-level code and irq/NMI
74571 * handlers, all running on the same CPU.
74572 */
74573 -#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
74574 +#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
74575 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
74576
74577 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
74578 #ifdef CONFIG_KPROBES
74579 diff --git a/include/linux/completion.h b/include/linux/completion.h
74580 index 3cd574d..240dcb0 100644
74581 --- a/include/linux/completion.h
74582 +++ b/include/linux/completion.h
74583 @@ -78,16 +78,16 @@ static inline void init_completion(struct completion *x)
74584
74585 extern void wait_for_completion(struct completion *);
74586 extern void wait_for_completion_io(struct completion *);
74587 -extern int wait_for_completion_interruptible(struct completion *x);
74588 -extern int wait_for_completion_killable(struct completion *x);
74589 +extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
74590 +extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
74591 extern unsigned long wait_for_completion_timeout(struct completion *x,
74592 - unsigned long timeout);
74593 + unsigned long timeout) __intentional_overflow(-1);
74594 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
74595 - unsigned long timeout);
74596 + unsigned long timeout) __intentional_overflow(-1);
74597 extern long wait_for_completion_interruptible_timeout(
74598 - struct completion *x, unsigned long timeout);
74599 + struct completion *x, unsigned long timeout) __intentional_overflow(-1);
74600 extern long wait_for_completion_killable_timeout(
74601 - struct completion *x, unsigned long timeout);
74602 + struct completion *x, unsigned long timeout) __intentional_overflow(-1);
74603 extern bool try_wait_for_completion(struct completion *x);
74604 extern bool completion_done(struct completion *x);
74605
74606 diff --git a/include/linux/configfs.h b/include/linux/configfs.h
74607 index 34025df..d94bbbc 100644
74608 --- a/include/linux/configfs.h
74609 +++ b/include/linux/configfs.h
74610 @@ -125,7 +125,7 @@ struct configfs_attribute {
74611 const char *ca_name;
74612 struct module *ca_owner;
74613 umode_t ca_mode;
74614 -};
74615 +} __do_const;
74616
74617 /*
74618 * Users often need to create attribute structures for their configurable
74619 diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
74620 index fcabc42..cba5d93 100644
74621 --- a/include/linux/cpufreq.h
74622 +++ b/include/linux/cpufreq.h
74623 @@ -167,6 +167,7 @@ struct global_attr {
74624 ssize_t (*store)(struct kobject *a, struct attribute *b,
74625 const char *c, size_t count);
74626 };
74627 +typedef struct global_attr __no_const global_attr_no_const;
74628
74629 #define define_one_global_ro(_name) \
74630 static struct global_attr _name = \
74631 @@ -208,7 +209,7 @@ struct cpufreq_driver {
74632 int (*suspend) (struct cpufreq_policy *policy);
74633 int (*resume) (struct cpufreq_policy *policy);
74634 struct freq_attr **attr;
74635 -};
74636 +} __do_const;
74637
74638 /* flags */
74639 #define CPUFREQ_STICKY 0x01 /* the driver isn't removed even if
74640 diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
74641 index 781addc..d1e1fe6 100644
74642 --- a/include/linux/cpuidle.h
74643 +++ b/include/linux/cpuidle.h
74644 @@ -50,7 +50,8 @@ struct cpuidle_state {
74645 int index);
74646
74647 int (*enter_dead) (struct cpuidle_device *dev, int index);
74648 -};
74649 +} __do_const;
74650 +typedef struct cpuidle_state __no_const cpuidle_state_no_const;
74651
74652 /* Idle State Flags */
74653 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
74654 @@ -192,7 +193,7 @@ struct cpuidle_governor {
74655 void (*reflect) (struct cpuidle_device *dev, int index);
74656
74657 struct module *owner;
74658 -};
74659 +} __do_const;
74660
74661 #ifdef CONFIG_CPU_IDLE
74662
74663 diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
74664 index d08e4d2..95fad61 100644
74665 --- a/include/linux/cpumask.h
74666 +++ b/include/linux/cpumask.h
74667 @@ -118,17 +118,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
74668 }
74669
74670 /* Valid inputs for n are -1 and 0. */
74671 -static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
74672 +static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
74673 {
74674 return n+1;
74675 }
74676
74677 -static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
74678 +static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
74679 {
74680 return n+1;
74681 }
74682
74683 -static inline unsigned int cpumask_next_and(int n,
74684 +static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
74685 const struct cpumask *srcp,
74686 const struct cpumask *andp)
74687 {
74688 @@ -167,7 +167,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
74689 *
74690 * Returns >= nr_cpu_ids if no further cpus set.
74691 */
74692 -static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
74693 +static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
74694 {
74695 /* -1 is a legal arg here. */
74696 if (n != -1)
74697 @@ -182,7 +182,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
74698 *
74699 * Returns >= nr_cpu_ids if no further cpus unset.
74700 */
74701 -static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
74702 +static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
74703 {
74704 /* -1 is a legal arg here. */
74705 if (n != -1)
74706 @@ -190,7 +190,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
74707 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
74708 }
74709
74710 -int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
74711 +int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
74712 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
74713
74714 /**
74715 diff --git a/include/linux/cred.h b/include/linux/cred.h
74716 index 04421e8..6bce4ef 100644
74717 --- a/include/linux/cred.h
74718 +++ b/include/linux/cred.h
74719 @@ -194,6 +194,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
74720 static inline void validate_process_creds(void)
74721 {
74722 }
74723 +static inline void validate_task_creds(struct task_struct *task)
74724 +{
74725 +}
74726 #endif
74727
74728 /**
74729 diff --git a/include/linux/crypto.h b/include/linux/crypto.h
74730 index b92eadf..b4ecdc1 100644
74731 --- a/include/linux/crypto.h
74732 +++ b/include/linux/crypto.h
74733 @@ -373,7 +373,7 @@ struct cipher_tfm {
74734 const u8 *key, unsigned int keylen);
74735 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
74736 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
74737 -};
74738 +} __no_const;
74739
74740 struct hash_tfm {
74741 int (*init)(struct hash_desc *desc);
74742 @@ -394,13 +394,13 @@ struct compress_tfm {
74743 int (*cot_decompress)(struct crypto_tfm *tfm,
74744 const u8 *src, unsigned int slen,
74745 u8 *dst, unsigned int *dlen);
74746 -};
74747 +} __no_const;
74748
74749 struct rng_tfm {
74750 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
74751 unsigned int dlen);
74752 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
74753 -};
74754 +} __no_const;
74755
74756 #define crt_ablkcipher crt_u.ablkcipher
74757 #define crt_aead crt_u.aead
74758 diff --git a/include/linux/ctype.h b/include/linux/ctype.h
74759 index 653589e..4ef254a 100644
74760 --- a/include/linux/ctype.h
74761 +++ b/include/linux/ctype.h
74762 @@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
74763 * Fast implementation of tolower() for internal usage. Do not use in your
74764 * code.
74765 */
74766 -static inline char _tolower(const char c)
74767 +static inline unsigned char _tolower(const unsigned char c)
74768 {
74769 return c | 0x20;
74770 }
74771 diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
74772 index 7925bf0..d5143d2 100644
74773 --- a/include/linux/decompress/mm.h
74774 +++ b/include/linux/decompress/mm.h
74775 @@ -77,7 +77,7 @@ static void free(void *where)
74776 * warnings when not needed (indeed large_malloc / large_free are not
74777 * needed by inflate */
74778
74779 -#define malloc(a) kmalloc(a, GFP_KERNEL)
74780 +#define malloc(a) kmalloc((a), GFP_KERNEL)
74781 #define free(a) kfree(a)
74782
74783 #define large_malloc(a) vmalloc(a)
74784 diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
74785 index 5f1ab92..39c35ae 100644
74786 --- a/include/linux/devfreq.h
74787 +++ b/include/linux/devfreq.h
74788 @@ -114,7 +114,7 @@ struct devfreq_governor {
74789 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
74790 int (*event_handler)(struct devfreq *devfreq,
74791 unsigned int event, void *data);
74792 -};
74793 +} __do_const;
74794
74795 /**
74796 * struct devfreq - Device devfreq structure
74797 diff --git a/include/linux/device.h b/include/linux/device.h
74798 index 2a9d6ed..d14551e3 100644
74799 --- a/include/linux/device.h
74800 +++ b/include/linux/device.h
74801 @@ -313,7 +313,7 @@ struct subsys_interface {
74802 struct list_head node;
74803 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
74804 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
74805 -};
74806 +} __do_const;
74807
74808 int subsys_interface_register(struct subsys_interface *sif);
74809 void subsys_interface_unregister(struct subsys_interface *sif);
74810 @@ -501,7 +501,7 @@ struct device_type {
74811 void (*release)(struct device *dev);
74812
74813 const struct dev_pm_ops *pm;
74814 -};
74815 +} __do_const;
74816
74817 /* interface for exporting device attributes */
74818 struct device_attribute {
74819 @@ -511,11 +511,12 @@ struct device_attribute {
74820 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
74821 const char *buf, size_t count);
74822 };
74823 +typedef struct device_attribute __no_const device_attribute_no_const;
74824
74825 struct dev_ext_attribute {
74826 struct device_attribute attr;
74827 void *var;
74828 -};
74829 +} __do_const;
74830
74831 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
74832 char *buf);
74833 diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
74834 index 3a8d0a2..c762be2 100644
74835 --- a/include/linux/dma-mapping.h
74836 +++ b/include/linux/dma-mapping.h
74837 @@ -54,7 +54,7 @@ struct dma_map_ops {
74838 u64 (*get_required_mask)(struct device *dev);
74839 #endif
74840 int is_phys;
74841 -};
74842 +} __do_const;
74843
74844 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
74845
74846 diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
74847 index 0bc7275..4ccbf11 100644
74848 --- a/include/linux/dmaengine.h
74849 +++ b/include/linux/dmaengine.h
74850 @@ -1078,9 +1078,9 @@ struct dma_pinned_list {
74851 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
74852 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
74853
74854 -dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
74855 +dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
74856 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
74857 -dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
74858 +dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
74859 struct dma_pinned_list *pinned_list, struct page *page,
74860 unsigned int offset, size_t len);
74861
74862 diff --git a/include/linux/efi.h b/include/linux/efi.h
74863 index 094ddd0..f1dfcd3 100644
74864 --- a/include/linux/efi.h
74865 +++ b/include/linux/efi.h
74866 @@ -745,6 +745,7 @@ struct efivar_operations {
74867 efi_set_variable_t *set_variable;
74868 efi_query_variable_store_t *query_variable_store;
74869 };
74870 +typedef struct efivar_operations __no_const efivar_operations_no_const;
74871
74872 struct efivars {
74873 /*
74874 diff --git a/include/linux/elf.h b/include/linux/elf.h
74875 index 40a3c0e0..4c45a38 100644
74876 --- a/include/linux/elf.h
74877 +++ b/include/linux/elf.h
74878 @@ -24,6 +24,7 @@ extern Elf32_Dyn _DYNAMIC [];
74879 #define elf_note elf32_note
74880 #define elf_addr_t Elf32_Off
74881 #define Elf_Half Elf32_Half
74882 +#define elf_dyn Elf32_Dyn
74883
74884 #else
74885
74886 @@ -34,6 +35,7 @@ extern Elf64_Dyn _DYNAMIC [];
74887 #define elf_note elf64_note
74888 #define elf_addr_t Elf64_Off
74889 #define Elf_Half Elf64_Half
74890 +#define elf_dyn Elf64_Dyn
74891
74892 #endif
74893
74894 diff --git a/include/linux/err.h b/include/linux/err.h
74895 index 15f92e0..e825a8e 100644
74896 --- a/include/linux/err.h
74897 +++ b/include/linux/err.h
74898 @@ -19,12 +19,12 @@
74899
74900 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
74901
74902 -static inline void * __must_check ERR_PTR(long error)
74903 +static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
74904 {
74905 return (void *) error;
74906 }
74907
74908 -static inline long __must_check PTR_ERR(__force const void *ptr)
74909 +static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
74910 {
74911 return (long) ptr;
74912 }
74913 diff --git a/include/linux/extcon.h b/include/linux/extcon.h
74914 index fcb51c8..bdafcf6 100644
74915 --- a/include/linux/extcon.h
74916 +++ b/include/linux/extcon.h
74917 @@ -134,7 +134,7 @@ struct extcon_dev {
74918 /* /sys/class/extcon/.../mutually_exclusive/... */
74919 struct attribute_group attr_g_muex;
74920 struct attribute **attrs_muex;
74921 - struct device_attribute *d_attrs_muex;
74922 + device_attribute_no_const *d_attrs_muex;
74923 };
74924
74925 /**
74926 diff --git a/include/linux/fb.h b/include/linux/fb.h
74927 index ffac70a..ca3e711 100644
74928 --- a/include/linux/fb.h
74929 +++ b/include/linux/fb.h
74930 @@ -304,7 +304,7 @@ struct fb_ops {
74931 /* called at KDB enter and leave time to prepare the console */
74932 int (*fb_debug_enter)(struct fb_info *info);
74933 int (*fb_debug_leave)(struct fb_info *info);
74934 -};
74935 +} __do_const;
74936
74937 #ifdef CONFIG_FB_TILEBLITTING
74938 #define FB_TILE_CURSOR_NONE 0
74939 diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
74940 index 085197b..0fa6f0b 100644
74941 --- a/include/linux/fdtable.h
74942 +++ b/include/linux/fdtable.h
74943 @@ -95,7 +95,7 @@ struct files_struct *get_files_struct(struct task_struct *);
74944 void put_files_struct(struct files_struct *fs);
74945 void reset_files_struct(struct files_struct *);
74946 int unshare_files(struct files_struct **);
74947 -struct files_struct *dup_fd(struct files_struct *, int *);
74948 +struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
74949 void do_close_on_exec(struct files_struct *);
74950 int iterate_fd(struct files_struct *, unsigned,
74951 int (*)(const void *, struct file *, unsigned),
74952 diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
74953 index 8293262..2b3b8bd 100644
74954 --- a/include/linux/frontswap.h
74955 +++ b/include/linux/frontswap.h
74956 @@ -11,7 +11,7 @@ struct frontswap_ops {
74957 int (*load)(unsigned, pgoff_t, struct page *);
74958 void (*invalidate_page)(unsigned, pgoff_t);
74959 void (*invalidate_area)(unsigned);
74960 -};
74961 +} __no_const;
74962
74963 extern bool frontswap_enabled;
74964 extern struct frontswap_ops *
74965 diff --git a/include/linux/fs.h b/include/linux/fs.h
74966 index 164d2a9..0ffa41d0 100644
74967 --- a/include/linux/fs.h
74968 +++ b/include/linux/fs.h
74969 @@ -1552,7 +1552,8 @@ struct file_operations {
74970 long (*fallocate)(struct file *file, int mode, loff_t offset,
74971 loff_t len);
74972 int (*show_fdinfo)(struct seq_file *m, struct file *f);
74973 -};
74974 +} __do_const;
74975 +typedef struct file_operations __no_const file_operations_no_const;
74976
74977 struct inode_operations {
74978 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
74979 @@ -2747,4 +2748,14 @@ static inline bool dir_relax(struct inode *inode)
74980 return !IS_DEADDIR(inode);
74981 }
74982
74983 +static inline bool is_sidechannel_device(const struct inode *inode)
74984 +{
74985 +#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
74986 + umode_t mode = inode->i_mode;
74987 + return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
74988 +#else
74989 + return false;
74990 +#endif
74991 +}
74992 +
74993 #endif /* _LINUX_FS_H */
74994 diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
74995 index 0efc3e6..e0e1e5f 100644
74996 --- a/include/linux/fs_struct.h
74997 +++ b/include/linux/fs_struct.h
74998 @@ -6,7 +6,7 @@
74999 #include <linux/seqlock.h>
75000
75001 struct fs_struct {
75002 - int users;
75003 + atomic_t users;
75004 spinlock_t lock;
75005 seqcount_t seq;
75006 int umask;
75007 diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
75008 index 7823e9e..56b6f2f 100644
75009 --- a/include/linux/fscache-cache.h
75010 +++ b/include/linux/fscache-cache.h
75011 @@ -113,7 +113,7 @@ struct fscache_operation {
75012 fscache_operation_release_t release;
75013 };
75014
75015 -extern atomic_t fscache_op_debug_id;
75016 +extern atomic_unchecked_t fscache_op_debug_id;
75017 extern void fscache_op_work_func(struct work_struct *work);
75018
75019 extern void fscache_enqueue_operation(struct fscache_operation *);
75020 @@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
75021 INIT_WORK(&op->work, fscache_op_work_func);
75022 atomic_set(&op->usage, 1);
75023 op->state = FSCACHE_OP_ST_INITIALISED;
75024 - op->debug_id = atomic_inc_return(&fscache_op_debug_id);
75025 + op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
75026 op->processor = processor;
75027 op->release = release;
75028 INIT_LIST_HEAD(&op->pend_link);
75029 diff --git a/include/linux/fscache.h b/include/linux/fscache.h
75030 index 19b4645..3b73dfc 100644
75031 --- a/include/linux/fscache.h
75032 +++ b/include/linux/fscache.h
75033 @@ -152,7 +152,7 @@ struct fscache_cookie_def {
75034 * - this is mandatory for any object that may have data
75035 */
75036 void (*now_uncached)(void *cookie_netfs_data);
75037 -};
75038 +} __do_const;
75039
75040 /*
75041 * fscache cached network filesystem type
75042 diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
75043 index 1c804b0..1432c2b 100644
75044 --- a/include/linux/fsnotify.h
75045 +++ b/include/linux/fsnotify.h
75046 @@ -195,6 +195,9 @@ static inline void fsnotify_access(struct file *file)
75047 struct inode *inode = file_inode(file);
75048 __u32 mask = FS_ACCESS;
75049
75050 + if (is_sidechannel_device(inode))
75051 + return;
75052 +
75053 if (S_ISDIR(inode->i_mode))
75054 mask |= FS_ISDIR;
75055
75056 @@ -213,6 +216,9 @@ static inline void fsnotify_modify(struct file *file)
75057 struct inode *inode = file_inode(file);
75058 __u32 mask = FS_MODIFY;
75059
75060 + if (is_sidechannel_device(inode))
75061 + return;
75062 +
75063 if (S_ISDIR(inode->i_mode))
75064 mask |= FS_ISDIR;
75065
75066 @@ -315,7 +321,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
75067 */
75068 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
75069 {
75070 - return kstrdup(name, GFP_KERNEL);
75071 + return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
75072 }
75073
75074 /*
75075 diff --git a/include/linux/genhd.h b/include/linux/genhd.h
75076 index 9f3c275..8bdff5d 100644
75077 --- a/include/linux/genhd.h
75078 +++ b/include/linux/genhd.h
75079 @@ -194,7 +194,7 @@ struct gendisk {
75080 struct kobject *slave_dir;
75081
75082 struct timer_rand_state *random;
75083 - atomic_t sync_io; /* RAID */
75084 + atomic_unchecked_t sync_io; /* RAID */
75085 struct disk_events *ev;
75086 #ifdef CONFIG_BLK_DEV_INTEGRITY
75087 struct blk_integrity *integrity;
75088 @@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
75089 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
75090
75091 /* drivers/char/random.c */
75092 -extern void add_disk_randomness(struct gendisk *disk);
75093 +extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
75094 extern void rand_initialize_disk(struct gendisk *disk);
75095
75096 static inline sector_t get_start_sect(struct block_device *bdev)
75097 diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
75098 index 023bc34..b02b46a 100644
75099 --- a/include/linux/genl_magic_func.h
75100 +++ b/include/linux/genl_magic_func.h
75101 @@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
75102 },
75103
75104 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
75105 -static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
75106 +static struct genl_ops ZZZ_genl_ops[] = {
75107 #include GENL_MAGIC_INCLUDE_FILE
75108 };
75109
75110 diff --git a/include/linux/gfp.h b/include/linux/gfp.h
75111 index 9b4dd49..61fd41d 100644
75112 --- a/include/linux/gfp.h
75113 +++ b/include/linux/gfp.h
75114 @@ -35,6 +35,13 @@ struct vm_area_struct;
75115 #define ___GFP_NO_KSWAPD 0x400000u
75116 #define ___GFP_OTHER_NODE 0x800000u
75117 #define ___GFP_WRITE 0x1000000u
75118 +
75119 +#ifdef CONFIG_PAX_USERCOPY_SLABS
75120 +#define ___GFP_USERCOPY 0x2000000u
75121 +#else
75122 +#define ___GFP_USERCOPY 0
75123 +#endif
75124 +
75125 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
75126
75127 /*
75128 @@ -92,6 +99,7 @@ struct vm_area_struct;
75129 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
75130 #define __GFP_KMEMCG ((__force gfp_t)___GFP_KMEMCG) /* Allocation comes from a memcg-accounted resource */
75131 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
75132 +#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
75133
75134 /*
75135 * This may seem redundant, but it's a way of annotating false positives vs.
75136 @@ -99,7 +107,7 @@ struct vm_area_struct;
75137 */
75138 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
75139
75140 -#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
75141 +#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
75142 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
75143
75144 /* This equals 0, but use constants in case they ever change */
75145 @@ -153,6 +161,8 @@ struct vm_area_struct;
75146 /* 4GB DMA on some platforms */
75147 #define GFP_DMA32 __GFP_DMA32
75148
75149 +#define GFP_USERCOPY __GFP_USERCOPY
75150 +
75151 /* Convert GFP flags to their corresponding migrate type */
75152 static inline int allocflags_to_migratetype(gfp_t gfp_flags)
75153 {
75154 diff --git a/include/linux/gracl.h b/include/linux/gracl.h
75155 new file mode 100644
75156 index 0000000..edb2cb6
75157 --- /dev/null
75158 +++ b/include/linux/gracl.h
75159 @@ -0,0 +1,340 @@
75160 +#ifndef GR_ACL_H
75161 +#define GR_ACL_H
75162 +
75163 +#include <linux/grdefs.h>
75164 +#include <linux/resource.h>
75165 +#include <linux/capability.h>
75166 +#include <linux/dcache.h>
75167 +#include <asm/resource.h>
75168 +
75169 +/* Major status information */
75170 +
75171 +#define GR_VERSION "grsecurity 3.0"
75172 +#define GRSECURITY_VERSION 0x3000
75173 +
75174 +enum {
75175 + GR_SHUTDOWN = 0,
75176 + GR_ENABLE = 1,
75177 + GR_SPROLE = 2,
75178 + GR_OLDRELOAD = 3,
75179 + GR_SEGVMOD = 4,
75180 + GR_STATUS = 5,
75181 + GR_UNSPROLE = 6,
75182 + GR_PASSSET = 7,
75183 + GR_SPROLEPAM = 8,
75184 + GR_RELOAD = 9,
75185 +};
75186 +
75187 +/* Password setup definitions
75188 + * kernel/grhash.c */
75189 +enum {
75190 + GR_PW_LEN = 128,
75191 + GR_SALT_LEN = 16,
75192 + GR_SHA_LEN = 32,
75193 +};
75194 +
75195 +enum {
75196 + GR_SPROLE_LEN = 64,
75197 +};
75198 +
75199 +enum {
75200 + GR_NO_GLOB = 0,
75201 + GR_REG_GLOB,
75202 + GR_CREATE_GLOB
75203 +};
75204 +
75205 +#define GR_NLIMITS 32
75206 +
75207 +/* Begin Data Structures */
75208 +
75209 +struct sprole_pw {
75210 + unsigned char *rolename;
75211 + unsigned char salt[GR_SALT_LEN];
75212 + unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
75213 +};
75214 +
75215 +struct name_entry {
75216 + __u32 key;
75217 + ino_t inode;
75218 + dev_t device;
75219 + char *name;
75220 + __u16 len;
75221 + __u8 deleted;
75222 + struct name_entry *prev;
75223 + struct name_entry *next;
75224 +};
75225 +
75226 +struct inodev_entry {
75227 + struct name_entry *nentry;
75228 + struct inodev_entry *prev;
75229 + struct inodev_entry *next;
75230 +};
75231 +
75232 +struct acl_role_db {
75233 + struct acl_role_label **r_hash;
75234 + __u32 r_size;
75235 +};
75236 +
75237 +struct inodev_db {
75238 + struct inodev_entry **i_hash;
75239 + __u32 i_size;
75240 +};
75241 +
75242 +struct name_db {
75243 + struct name_entry **n_hash;
75244 + __u32 n_size;
75245 +};
75246 +
75247 +struct crash_uid {
75248 + uid_t uid;
75249 + unsigned long expires;
75250 +};
75251 +
75252 +struct gr_hash_struct {
75253 + void **table;
75254 + void **nametable;
75255 + void *first;
75256 + __u32 table_size;
75257 + __u32 used_size;
75258 + int type;
75259 +};
75260 +
75261 +/* Userspace Grsecurity ACL data structures */
75262 +
75263 +struct acl_subject_label {
75264 + char *filename;
75265 + ino_t inode;
75266 + dev_t device;
75267 + __u32 mode;
75268 + kernel_cap_t cap_mask;
75269 + kernel_cap_t cap_lower;
75270 + kernel_cap_t cap_invert_audit;
75271 +
75272 + struct rlimit res[GR_NLIMITS];
75273 + __u32 resmask;
75274 +
75275 + __u8 user_trans_type;
75276 + __u8 group_trans_type;
75277 + uid_t *user_transitions;
75278 + gid_t *group_transitions;
75279 + __u16 user_trans_num;
75280 + __u16 group_trans_num;
75281 +
75282 + __u32 sock_families[2];
75283 + __u32 ip_proto[8];
75284 + __u32 ip_type;
75285 + struct acl_ip_label **ips;
75286 + __u32 ip_num;
75287 + __u32 inaddr_any_override;
75288 +
75289 + __u32 crashes;
75290 + unsigned long expires;
75291 +
75292 + struct acl_subject_label *parent_subject;
75293 + struct gr_hash_struct *hash;
75294 + struct acl_subject_label *prev;
75295 + struct acl_subject_label *next;
75296 +
75297 + struct acl_object_label **obj_hash;
75298 + __u32 obj_hash_size;
75299 + __u16 pax_flags;
75300 +};
75301 +
75302 +struct role_allowed_ip {
75303 + __u32 addr;
75304 + __u32 netmask;
75305 +
75306 + struct role_allowed_ip *prev;
75307 + struct role_allowed_ip *next;
75308 +};
75309 +
75310 +struct role_transition {
75311 + char *rolename;
75312 +
75313 + struct role_transition *prev;
75314 + struct role_transition *next;
75315 +};
75316 +
75317 +struct acl_role_label {
75318 + char *rolename;
75319 + uid_t uidgid;
75320 + __u16 roletype;
75321 +
75322 + __u16 auth_attempts;
75323 + unsigned long expires;
75324 +
75325 + struct acl_subject_label *root_label;
75326 + struct gr_hash_struct *hash;
75327 +
75328 + struct acl_role_label *prev;
75329 + struct acl_role_label *next;
75330 +
75331 + struct role_transition *transitions;
75332 + struct role_allowed_ip *allowed_ips;
75333 + uid_t *domain_children;
75334 + __u16 domain_child_num;
75335 +
75336 + umode_t umask;
75337 +
75338 + struct acl_subject_label **subj_hash;
75339 + __u32 subj_hash_size;
75340 +};
75341 +
75342 +struct user_acl_role_db {
75343 + struct acl_role_label **r_table;
75344 + __u32 num_pointers; /* Number of allocations to track */
75345 + __u32 num_roles; /* Number of roles */
75346 + __u32 num_domain_children; /* Number of domain children */
75347 + __u32 num_subjects; /* Number of subjects */
75348 + __u32 num_objects; /* Number of objects */
75349 +};
75350 +
75351 +struct acl_object_label {
75352 + char *filename;
75353 + ino_t inode;
75354 + dev_t device;
75355 + __u32 mode;
75356 +
75357 + struct acl_subject_label *nested;
75358 + struct acl_object_label *globbed;
75359 +
75360 + /* next two structures not used */
75361 +
75362 + struct acl_object_label *prev;
75363 + struct acl_object_label *next;
75364 +};
75365 +
75366 +struct acl_ip_label {
75367 + char *iface;
75368 + __u32 addr;
75369 + __u32 netmask;
75370 + __u16 low, high;
75371 + __u8 mode;
75372 + __u32 type;
75373 + __u32 proto[8];
75374 +
75375 + /* next two structures not used */
75376 +
75377 + struct acl_ip_label *prev;
75378 + struct acl_ip_label *next;
75379 +};
75380 +
75381 +struct gr_arg {
75382 + struct user_acl_role_db role_db;
75383 + unsigned char pw[GR_PW_LEN];
75384 + unsigned char salt[GR_SALT_LEN];
75385 + unsigned char sum[GR_SHA_LEN];
75386 + unsigned char sp_role[GR_SPROLE_LEN];
75387 + struct sprole_pw *sprole_pws;
75388 + dev_t segv_device;
75389 + ino_t segv_inode;
75390 + uid_t segv_uid;
75391 + __u16 num_sprole_pws;
75392 + __u16 mode;
75393 +};
75394 +
75395 +struct gr_arg_wrapper {
75396 + struct gr_arg *arg;
75397 + __u32 version;
75398 + __u32 size;
75399 +};
75400 +
75401 +struct subject_map {
75402 + struct acl_subject_label *user;
75403 + struct acl_subject_label *kernel;
75404 + struct subject_map *prev;
75405 + struct subject_map *next;
75406 +};
75407 +
75408 +struct acl_subj_map_db {
75409 + struct subject_map **s_hash;
75410 + __u32 s_size;
75411 +};
75412 +
75413 +struct gr_policy_state {
75414 + struct sprole_pw **acl_special_roles;
75415 + __u16 num_sprole_pws;
75416 + struct acl_role_label *kernel_role;
75417 + struct acl_role_label *role_list;
75418 + struct acl_role_label *default_role;
75419 + struct acl_role_db acl_role_set;
75420 + struct acl_subj_map_db subj_map_set;
75421 + struct name_db name_set;
75422 + struct inodev_db inodev_set;
75423 +};
75424 +
75425 +struct gr_alloc_state {
75426 + unsigned long alloc_stack_next;
75427 + unsigned long alloc_stack_size;
75428 + void **alloc_stack;
75429 +};
75430 +
75431 +struct gr_reload_state {
75432 + struct gr_policy_state oldpolicy;
75433 + struct gr_alloc_state oldalloc;
75434 + struct gr_policy_state newpolicy;
75435 + struct gr_alloc_state newalloc;
75436 + struct gr_policy_state *oldpolicy_ptr;
75437 + struct gr_alloc_state *oldalloc_ptr;
75438 + unsigned char oldmode;
75439 +};
75440 +
75441 +/* End Data Structures Section */
75442 +
75443 +/* Hash functions generated by empirical testing by Brad Spengler
75444 + Makes good use of the low bits of the inode. Generally 0-1 times
75445 + in loop for successful match. 0-3 for unsuccessful match.
75446 + Shift/add algorithm with modulus of table size and an XOR*/
75447 +
75448 +static __inline__ unsigned int
75449 +gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
75450 +{
75451 + return ((((uid + type) << (16 + type)) ^ uid) % sz);
75452 +}
75453 +
75454 + static __inline__ unsigned int
75455 +gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
75456 +{
75457 + return ((const unsigned long)userp % sz);
75458 +}
75459 +
75460 +static __inline__ unsigned int
75461 +gr_fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
75462 +{
75463 + return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
75464 +}
75465 +
75466 +static __inline__ unsigned int
75467 +gr_nhash(const char *name, const __u16 len, const unsigned int sz)
75468 +{
75469 + return full_name_hash((const unsigned char *)name, len) % sz;
75470 +}
75471 +
75472 +#define FOR_EACH_SUBJECT_START(role,subj,iter) \
75473 + subj = NULL; \
75474 + iter = 0; \
75475 + while (iter < role->subj_hash_size) { \
75476 + if (subj == NULL) \
75477 + subj = role->subj_hash[iter]; \
75478 + if (subj == NULL) { \
75479 + iter++; \
75480 + continue; \
75481 + }
75482 +
75483 +#define FOR_EACH_SUBJECT_END(subj,iter) \
75484 + subj = subj->next; \
75485 + if (subj == NULL) \
75486 + iter++; \
75487 + }
75488 +
75489 +
75490 +#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
75491 + subj = role->hash->first; \
75492 + while (subj != NULL) {
75493 +
75494 +#define FOR_EACH_NESTED_SUBJECT_END(subj) \
75495 + subj = subj->next; \
75496 + }
75497 +
75498 +#endif
75499 +
75500 diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
75501 new file mode 100644
75502 index 0000000..33ebd1f
75503 --- /dev/null
75504 +++ b/include/linux/gracl_compat.h
75505 @@ -0,0 +1,156 @@
75506 +#ifndef GR_ACL_COMPAT_H
75507 +#define GR_ACL_COMPAT_H
75508 +
75509 +#include <linux/resource.h>
75510 +#include <asm/resource.h>
75511 +
75512 +struct sprole_pw_compat {
75513 + compat_uptr_t rolename;
75514 + unsigned char salt[GR_SALT_LEN];
75515 + unsigned char sum[GR_SHA_LEN];
75516 +};
75517 +
75518 +struct gr_hash_struct_compat {
75519 + compat_uptr_t table;
75520 + compat_uptr_t nametable;
75521 + compat_uptr_t first;
75522 + __u32 table_size;
75523 + __u32 used_size;
75524 + int type;
75525 +};
75526 +
75527 +struct acl_subject_label_compat {
75528 + compat_uptr_t filename;
75529 + compat_ino_t inode;
75530 + __u32 device;
75531 + __u32 mode;
75532 + kernel_cap_t cap_mask;
75533 + kernel_cap_t cap_lower;
75534 + kernel_cap_t cap_invert_audit;
75535 +
75536 + struct compat_rlimit res[GR_NLIMITS];
75537 + __u32 resmask;
75538 +
75539 + __u8 user_trans_type;
75540 + __u8 group_trans_type;
75541 + compat_uptr_t user_transitions;
75542 + compat_uptr_t group_transitions;
75543 + __u16 user_trans_num;
75544 + __u16 group_trans_num;
75545 +
75546 + __u32 sock_families[2];
75547 + __u32 ip_proto[8];
75548 + __u32 ip_type;
75549 + compat_uptr_t ips;
75550 + __u32 ip_num;
75551 + __u32 inaddr_any_override;
75552 +
75553 + __u32 crashes;
75554 + compat_ulong_t expires;
75555 +
75556 + compat_uptr_t parent_subject;
75557 + compat_uptr_t hash;
75558 + compat_uptr_t prev;
75559 + compat_uptr_t next;
75560 +
75561 + compat_uptr_t obj_hash;
75562 + __u32 obj_hash_size;
75563 + __u16 pax_flags;
75564 +};
75565 +
75566 +struct role_allowed_ip_compat {
75567 + __u32 addr;
75568 + __u32 netmask;
75569 +
75570 + compat_uptr_t prev;
75571 + compat_uptr_t next;
75572 +};
75573 +
75574 +struct role_transition_compat {
75575 + compat_uptr_t rolename;
75576 +
75577 + compat_uptr_t prev;
75578 + compat_uptr_t next;
75579 +};
75580 +
75581 +struct acl_role_label_compat {
75582 + compat_uptr_t rolename;
75583 + uid_t uidgid;
75584 + __u16 roletype;
75585 +
75586 + __u16 auth_attempts;
75587 + compat_ulong_t expires;
75588 +
75589 + compat_uptr_t root_label;
75590 + compat_uptr_t hash;
75591 +
75592 + compat_uptr_t prev;
75593 + compat_uptr_t next;
75594 +
75595 + compat_uptr_t transitions;
75596 + compat_uptr_t allowed_ips;
75597 + compat_uptr_t domain_children;
75598 + __u16 domain_child_num;
75599 +
75600 + umode_t umask;
75601 +
75602 + compat_uptr_t subj_hash;
75603 + __u32 subj_hash_size;
75604 +};
75605 +
75606 +struct user_acl_role_db_compat {
75607 + compat_uptr_t r_table;
75608 + __u32 num_pointers;
75609 + __u32 num_roles;
75610 + __u32 num_domain_children;
75611 + __u32 num_subjects;
75612 + __u32 num_objects;
75613 +};
75614 +
75615 +struct acl_object_label_compat {
75616 + compat_uptr_t filename;
75617 + compat_ino_t inode;
75618 + __u32 device;
75619 + __u32 mode;
75620 +
75621 + compat_uptr_t nested;
75622 + compat_uptr_t globbed;
75623 +
75624 + compat_uptr_t prev;
75625 + compat_uptr_t next;
75626 +};
75627 +
75628 +struct acl_ip_label_compat {
75629 + compat_uptr_t iface;
75630 + __u32 addr;
75631 + __u32 netmask;
75632 + __u16 low, high;
75633 + __u8 mode;
75634 + __u32 type;
75635 + __u32 proto[8];
75636 +
75637 + compat_uptr_t prev;
75638 + compat_uptr_t next;
75639 +};
75640 +
75641 +struct gr_arg_compat {
75642 + struct user_acl_role_db_compat role_db;
75643 + unsigned char pw[GR_PW_LEN];
75644 + unsigned char salt[GR_SALT_LEN];
75645 + unsigned char sum[GR_SHA_LEN];
75646 + unsigned char sp_role[GR_SPROLE_LEN];
75647 + compat_uptr_t sprole_pws;
75648 + __u32 segv_device;
75649 + compat_ino_t segv_inode;
75650 + uid_t segv_uid;
75651 + __u16 num_sprole_pws;
75652 + __u16 mode;
75653 +};
75654 +
75655 +struct gr_arg_wrapper_compat {
75656 + compat_uptr_t arg;
75657 + __u32 version;
75658 + __u32 size;
75659 +};
75660 +
75661 +#endif
75662 diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
75663 new file mode 100644
75664 index 0000000..323ecf2
75665 --- /dev/null
75666 +++ b/include/linux/gralloc.h
75667 @@ -0,0 +1,9 @@
75668 +#ifndef __GRALLOC_H
75669 +#define __GRALLOC_H
75670 +
75671 +void acl_free_all(void);
75672 +int acl_alloc_stack_init(unsigned long size);
75673 +void *acl_alloc(unsigned long len);
75674 +void *acl_alloc_num(unsigned long num, unsigned long len);
75675 +
75676 +#endif
75677 diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
75678 new file mode 100644
75679 index 0000000..be66033
75680 --- /dev/null
75681 +++ b/include/linux/grdefs.h
75682 @@ -0,0 +1,140 @@
75683 +#ifndef GRDEFS_H
75684 +#define GRDEFS_H
75685 +
75686 +/* Begin grsecurity status declarations */
75687 +
75688 +enum {
75689 + GR_READY = 0x01,
75690 + GR_STATUS_INIT = 0x00 // disabled state
75691 +};
75692 +
75693 +/* Begin ACL declarations */
75694 +
75695 +/* Role flags */
75696 +
75697 +enum {
75698 + GR_ROLE_USER = 0x0001,
75699 + GR_ROLE_GROUP = 0x0002,
75700 + GR_ROLE_DEFAULT = 0x0004,
75701 + GR_ROLE_SPECIAL = 0x0008,
75702 + GR_ROLE_AUTH = 0x0010,
75703 + GR_ROLE_NOPW = 0x0020,
75704 + GR_ROLE_GOD = 0x0040,
75705 + GR_ROLE_LEARN = 0x0080,
75706 + GR_ROLE_TPE = 0x0100,
75707 + GR_ROLE_DOMAIN = 0x0200,
75708 + GR_ROLE_PAM = 0x0400,
75709 + GR_ROLE_PERSIST = 0x0800
75710 +};
75711 +
75712 +/* ACL Subject and Object mode flags */
75713 +enum {
75714 + GR_DELETED = 0x80000000
75715 +};
75716 +
75717 +/* ACL Object-only mode flags */
75718 +enum {
75719 + GR_READ = 0x00000001,
75720 + GR_APPEND = 0x00000002,
75721 + GR_WRITE = 0x00000004,
75722 + GR_EXEC = 0x00000008,
75723 + GR_FIND = 0x00000010,
75724 + GR_INHERIT = 0x00000020,
75725 + GR_SETID = 0x00000040,
75726 + GR_CREATE = 0x00000080,
75727 + GR_DELETE = 0x00000100,
75728 + GR_LINK = 0x00000200,
75729 + GR_AUDIT_READ = 0x00000400,
75730 + GR_AUDIT_APPEND = 0x00000800,
75731 + GR_AUDIT_WRITE = 0x00001000,
75732 + GR_AUDIT_EXEC = 0x00002000,
75733 + GR_AUDIT_FIND = 0x00004000,
75734 + GR_AUDIT_INHERIT= 0x00008000,
75735 + GR_AUDIT_SETID = 0x00010000,
75736 + GR_AUDIT_CREATE = 0x00020000,
75737 + GR_AUDIT_DELETE = 0x00040000,
75738 + GR_AUDIT_LINK = 0x00080000,
75739 + GR_PTRACERD = 0x00100000,
75740 + GR_NOPTRACE = 0x00200000,
75741 + GR_SUPPRESS = 0x00400000,
75742 + GR_NOLEARN = 0x00800000,
75743 + GR_INIT_TRANSFER= 0x01000000
75744 +};
75745 +
75746 +#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
75747 + GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
75748 + GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
75749 +
75750 +/* ACL subject-only mode flags */
75751 +enum {
75752 + GR_KILL = 0x00000001,
75753 + GR_VIEW = 0x00000002,
75754 + GR_PROTECTED = 0x00000004,
75755 + GR_LEARN = 0x00000008,
75756 + GR_OVERRIDE = 0x00000010,
75757 + /* just a placeholder, this mode is only used in userspace */
75758 + GR_DUMMY = 0x00000020,
75759 + GR_PROTSHM = 0x00000040,
75760 + GR_KILLPROC = 0x00000080,
75761 + GR_KILLIPPROC = 0x00000100,
75762 + /* just a placeholder, this mode is only used in userspace */
75763 + GR_NOTROJAN = 0x00000200,
75764 + GR_PROTPROCFD = 0x00000400,
75765 + GR_PROCACCT = 0x00000800,
75766 + GR_RELAXPTRACE = 0x00001000,
75767 + //GR_NESTED = 0x00002000,
75768 + GR_INHERITLEARN = 0x00004000,
75769 + GR_PROCFIND = 0x00008000,
75770 + GR_POVERRIDE = 0x00010000,
75771 + GR_KERNELAUTH = 0x00020000,
75772 + GR_ATSECURE = 0x00040000,
75773 + GR_SHMEXEC = 0x00080000
75774 +};
75775 +
75776 +enum {
75777 + GR_PAX_ENABLE_SEGMEXEC = 0x0001,
75778 + GR_PAX_ENABLE_PAGEEXEC = 0x0002,
75779 + GR_PAX_ENABLE_MPROTECT = 0x0004,
75780 + GR_PAX_ENABLE_RANDMMAP = 0x0008,
75781 + GR_PAX_ENABLE_EMUTRAMP = 0x0010,
75782 + GR_PAX_DISABLE_SEGMEXEC = 0x0100,
75783 + GR_PAX_DISABLE_PAGEEXEC = 0x0200,
75784 + GR_PAX_DISABLE_MPROTECT = 0x0400,
75785 + GR_PAX_DISABLE_RANDMMAP = 0x0800,
75786 + GR_PAX_DISABLE_EMUTRAMP = 0x1000,
75787 +};
75788 +
75789 +enum {
75790 + GR_ID_USER = 0x01,
75791 + GR_ID_GROUP = 0x02,
75792 +};
75793 +
75794 +enum {
75795 + GR_ID_ALLOW = 0x01,
75796 + GR_ID_DENY = 0x02,
75797 +};
75798 +
75799 +#define GR_CRASH_RES 31
75800 +#define GR_UIDTABLE_MAX 500
75801 +
75802 +/* begin resource learning section */
75803 +enum {
75804 + GR_RLIM_CPU_BUMP = 60,
75805 + GR_RLIM_FSIZE_BUMP = 50000,
75806 + GR_RLIM_DATA_BUMP = 10000,
75807 + GR_RLIM_STACK_BUMP = 1000,
75808 + GR_RLIM_CORE_BUMP = 10000,
75809 + GR_RLIM_RSS_BUMP = 500000,
75810 + GR_RLIM_NPROC_BUMP = 1,
75811 + GR_RLIM_NOFILE_BUMP = 5,
75812 + GR_RLIM_MEMLOCK_BUMP = 50000,
75813 + GR_RLIM_AS_BUMP = 500000,
75814 + GR_RLIM_LOCKS_BUMP = 2,
75815 + GR_RLIM_SIGPENDING_BUMP = 5,
75816 + GR_RLIM_MSGQUEUE_BUMP = 10000,
75817 + GR_RLIM_NICE_BUMP = 1,
75818 + GR_RLIM_RTPRIO_BUMP = 1,
75819 + GR_RLIM_RTTIME_BUMP = 1000000
75820 +};
75821 +
75822 +#endif
75823 diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
75824 new file mode 100644
75825 index 0000000..d25522e
75826 --- /dev/null
75827 +++ b/include/linux/grinternal.h
75828 @@ -0,0 +1,229 @@
75829 +#ifndef __GRINTERNAL_H
75830 +#define __GRINTERNAL_H
75831 +
75832 +#ifdef CONFIG_GRKERNSEC
75833 +
75834 +#include <linux/fs.h>
75835 +#include <linux/mnt_namespace.h>
75836 +#include <linux/nsproxy.h>
75837 +#include <linux/gracl.h>
75838 +#include <linux/grdefs.h>
75839 +#include <linux/grmsg.h>
75840 +
75841 +void gr_add_learn_entry(const char *fmt, ...)
75842 + __attribute__ ((format (printf, 1, 2)));
75843 +__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
75844 + const struct vfsmount *mnt);
75845 +__u32 gr_check_create(const struct dentry *new_dentry,
75846 + const struct dentry *parent,
75847 + const struct vfsmount *mnt, const __u32 mode);
75848 +int gr_check_protected_task(const struct task_struct *task);
75849 +__u32 to_gr_audit(const __u32 reqmode);
75850 +int gr_set_acls(const int type);
75851 +int gr_acl_is_enabled(void);
75852 +char gr_roletype_to_char(void);
75853 +
75854 +void gr_handle_alertkill(struct task_struct *task);
75855 +char *gr_to_filename(const struct dentry *dentry,
75856 + const struct vfsmount *mnt);
75857 +char *gr_to_filename1(const struct dentry *dentry,
75858 + const struct vfsmount *mnt);
75859 +char *gr_to_filename2(const struct dentry *dentry,
75860 + const struct vfsmount *mnt);
75861 +char *gr_to_filename3(const struct dentry *dentry,
75862 + const struct vfsmount *mnt);
75863 +
75864 +extern int grsec_enable_ptrace_readexec;
75865 +extern int grsec_enable_harden_ptrace;
75866 +extern int grsec_enable_link;
75867 +extern int grsec_enable_fifo;
75868 +extern int grsec_enable_execve;
75869 +extern int grsec_enable_shm;
75870 +extern int grsec_enable_execlog;
75871 +extern int grsec_enable_signal;
75872 +extern int grsec_enable_audit_ptrace;
75873 +extern int grsec_enable_forkfail;
75874 +extern int grsec_enable_time;
75875 +extern int grsec_enable_rofs;
75876 +extern int grsec_deny_new_usb;
75877 +extern int grsec_enable_chroot_shmat;
75878 +extern int grsec_enable_chroot_mount;
75879 +extern int grsec_enable_chroot_double;
75880 +extern int grsec_enable_chroot_pivot;
75881 +extern int grsec_enable_chroot_chdir;
75882 +extern int grsec_enable_chroot_chmod;
75883 +extern int grsec_enable_chroot_mknod;
75884 +extern int grsec_enable_chroot_fchdir;
75885 +extern int grsec_enable_chroot_nice;
75886 +extern int grsec_enable_chroot_execlog;
75887 +extern int grsec_enable_chroot_caps;
75888 +extern int grsec_enable_chroot_sysctl;
75889 +extern int grsec_enable_chroot_unix;
75890 +extern int grsec_enable_symlinkown;
75891 +extern kgid_t grsec_symlinkown_gid;
75892 +extern int grsec_enable_tpe;
75893 +extern kgid_t grsec_tpe_gid;
75894 +extern int grsec_enable_tpe_all;
75895 +extern int grsec_enable_tpe_invert;
75896 +extern int grsec_enable_socket_all;
75897 +extern kgid_t grsec_socket_all_gid;
75898 +extern int grsec_enable_socket_client;
75899 +extern kgid_t grsec_socket_client_gid;
75900 +extern int grsec_enable_socket_server;
75901 +extern kgid_t grsec_socket_server_gid;
75902 +extern kgid_t grsec_audit_gid;
75903 +extern int grsec_enable_group;
75904 +extern int grsec_enable_log_rwxmaps;
75905 +extern int grsec_enable_mount;
75906 +extern int grsec_enable_chdir;
75907 +extern int grsec_resource_logging;
75908 +extern int grsec_enable_blackhole;
75909 +extern int grsec_lastack_retries;
75910 +extern int grsec_enable_brute;
75911 +extern int grsec_enable_harden_ipc;
75912 +extern int grsec_lock;
75913 +
75914 +extern spinlock_t grsec_alert_lock;
75915 +extern unsigned long grsec_alert_wtime;
75916 +extern unsigned long grsec_alert_fyet;
75917 +
75918 +extern spinlock_t grsec_audit_lock;
75919 +
75920 +extern rwlock_t grsec_exec_file_lock;
75921 +
75922 +#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
75923 + gr_to_filename2((tsk)->exec_file->f_path.dentry, \
75924 + (tsk)->exec_file->f_path.mnt) : "/")
75925 +
75926 +#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
75927 + gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
75928 + (tsk)->real_parent->exec_file->f_path.mnt) : "/")
75929 +
75930 +#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
75931 + gr_to_filename((tsk)->exec_file->f_path.dentry, \
75932 + (tsk)->exec_file->f_path.mnt) : "/")
75933 +
75934 +#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
75935 + gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
75936 + (tsk)->real_parent->exec_file->f_path.mnt) : "/")
75937 +
75938 +#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
75939 +
75940 +#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
75941 +
75942 +static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
75943 +{
75944 + if (file1 && file2) {
75945 + const struct inode *inode1 = file1->f_path.dentry->d_inode;
75946 + const struct inode *inode2 = file2->f_path.dentry->d_inode;
75947 + if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
75948 + return true;
75949 + }
75950 +
75951 + return false;
75952 +}
75953 +
75954 +#define GR_CHROOT_CAPS {{ \
75955 + CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
75956 + CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
75957 + CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
75958 + CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
75959 + CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
75960 + CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
75961 + CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
75962 +
75963 +#define security_learn(normal_msg,args...) \
75964 +({ \
75965 + read_lock(&grsec_exec_file_lock); \
75966 + gr_add_learn_entry(normal_msg "\n", ## args); \
75967 + read_unlock(&grsec_exec_file_lock); \
75968 +})
75969 +
75970 +enum {
75971 + GR_DO_AUDIT,
75972 + GR_DONT_AUDIT,
75973 + /* used for non-audit messages that we shouldn't kill the task on */
75974 + GR_DONT_AUDIT_GOOD
75975 +};
75976 +
75977 +enum {
75978 + GR_TTYSNIFF,
75979 + GR_RBAC,
75980 + GR_RBAC_STR,
75981 + GR_STR_RBAC,
75982 + GR_RBAC_MODE2,
75983 + GR_RBAC_MODE3,
75984 + GR_FILENAME,
75985 + GR_SYSCTL_HIDDEN,
75986 + GR_NOARGS,
75987 + GR_ONE_INT,
75988 + GR_ONE_INT_TWO_STR,
75989 + GR_ONE_STR,
75990 + GR_STR_INT,
75991 + GR_TWO_STR_INT,
75992 + GR_TWO_INT,
75993 + GR_TWO_U64,
75994 + GR_THREE_INT,
75995 + GR_FIVE_INT_TWO_STR,
75996 + GR_TWO_STR,
75997 + GR_THREE_STR,
75998 + GR_FOUR_STR,
75999 + GR_STR_FILENAME,
76000 + GR_FILENAME_STR,
76001 + GR_FILENAME_TWO_INT,
76002 + GR_FILENAME_TWO_INT_STR,
76003 + GR_TEXTREL,
76004 + GR_PTRACE,
76005 + GR_RESOURCE,
76006 + GR_CAP,
76007 + GR_SIG,
76008 + GR_SIG2,
76009 + GR_CRASH1,
76010 + GR_CRASH2,
76011 + GR_PSACCT,
76012 + GR_RWXMAP,
76013 + GR_RWXMAPVMA
76014 +};
76015 +
76016 +#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
76017 +#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
76018 +#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
76019 +#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
76020 +#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
76021 +#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
76022 +#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)
76023 +#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
76024 +#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
76025 +#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
76026 +#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
76027 +#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
76028 +#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
76029 +#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
76030 +#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
76031 +#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
76032 +#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)
76033 +#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
76034 +#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
76035 +#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
76036 +#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
76037 +#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
76038 +#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
76039 +#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
76040 +#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)
76041 +#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
76042 +#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
76043 +#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
76044 +#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
76045 +#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
76046 +#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
76047 +#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
76048 +#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
76049 +#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)
76050 +#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
76051 +#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
76052 +
76053 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
76054 +
76055 +#endif
76056 +
76057 +#endif
76058 diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
76059 new file mode 100644
76060 index 0000000..195cbe4
76061 --- /dev/null
76062 +++ b/include/linux/grmsg.h
76063 @@ -0,0 +1,115 @@
76064 +#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"
76065 +#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"
76066 +#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
76067 +#define GR_STOPMOD_MSG "denied modification of module state by "
76068 +#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
76069 +#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
76070 +#define GR_IOPERM_MSG "denied use of ioperm() by "
76071 +#define GR_IOPL_MSG "denied use of iopl() by "
76072 +#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
76073 +#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
76074 +#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
76075 +#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
76076 +#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
76077 +#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"
76078 +#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"
76079 +#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
76080 +#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
76081 +#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
76082 +#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
76083 +#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
76084 +#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
76085 +#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
76086 +#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
76087 +#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
76088 +#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
76089 +#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
76090 +#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
76091 +#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
76092 +#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
76093 +#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
76094 +#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
76095 +#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
76096 +#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
76097 +#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
76098 +#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
76099 +#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
76100 +#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
76101 +#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
76102 +#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
76103 +#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
76104 +#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
76105 +#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
76106 +#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
76107 +#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
76108 +#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
76109 +#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
76110 +#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
76111 +#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
76112 +#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
76113 +#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
76114 +#define GR_INITF_ACL_MSG "init_variables() failed %s by "
76115 +#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"
76116 +#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
76117 +#define GR_SHUTS_ACL_MSG "shutdown auth success for "
76118 +#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
76119 +#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
76120 +#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
76121 +#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
76122 +#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
76123 +#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
76124 +#define GR_ENABLEF_ACL_MSG "unable to load %s for "
76125 +#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
76126 +#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
76127 +#define GR_RELOADF_ACL_MSG "failed reload of %s for "
76128 +#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
76129 +#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
76130 +#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
76131 +#define GR_SPROLEF_ACL_MSG "special role %s failure for "
76132 +#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
76133 +#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
76134 +#define GR_INVMODE_ACL_MSG "invalid mode %d by "
76135 +#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
76136 +#define GR_FAILFORK_MSG "failed fork with errno %s by "
76137 +#define GR_NICE_CHROOT_MSG "denied priority change by "
76138 +#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
76139 +#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
76140 +#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
76141 +#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
76142 +#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
76143 +#define GR_TIME_MSG "time set by "
76144 +#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
76145 +#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
76146 +#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
76147 +#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
76148 +#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
76149 +#define GR_BIND_MSG "denied bind() by "
76150 +#define GR_CONNECT_MSG "denied connect() by "
76151 +#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
76152 +#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
76153 +#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"
76154 +#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
76155 +#define GR_CAP_ACL_MSG "use of %s denied for "
76156 +#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
76157 +#define GR_CAP_ACL_MSG2 "use of %s permitted for "
76158 +#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
76159 +#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
76160 +#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
76161 +#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
76162 +#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
76163 +#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
76164 +#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
76165 +#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
76166 +#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
76167 +#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
76168 +#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
76169 +#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
76170 +#define GR_VM86_MSG "denied use of vm86 by "
76171 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
76172 +#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
76173 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
76174 +#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
76175 +#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
76176 +#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 "
76177 +#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 "
76178 +#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
76179 diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
76180 new file mode 100644
76181 index 0000000..d8b5b48
76182 --- /dev/null
76183 +++ b/include/linux/grsecurity.h
76184 @@ -0,0 +1,245 @@
76185 +#ifndef GR_SECURITY_H
76186 +#define GR_SECURITY_H
76187 +#include <linux/fs.h>
76188 +#include <linux/fs_struct.h>
76189 +#include <linux/binfmts.h>
76190 +#include <linux/gracl.h>
76191 +
76192 +/* notify of brain-dead configs */
76193 +#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
76194 +#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
76195 +#endif
76196 +#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
76197 +#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
76198 +#endif
76199 +#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
76200 +#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
76201 +#endif
76202 +#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
76203 +#error "CONFIG_PAX enabled, but no PaX options are enabled."
76204 +#endif
76205 +
76206 +int gr_handle_new_usb(void);
76207 +
76208 +void gr_handle_brute_attach(int dumpable);
76209 +void gr_handle_brute_check(void);
76210 +void gr_handle_kernel_exploit(void);
76211 +
76212 +char gr_roletype_to_char(void);
76213 +
76214 +int gr_acl_enable_at_secure(void);
76215 +
76216 +int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
76217 +int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
76218 +
76219 +void gr_del_task_from_ip_table(struct task_struct *p);
76220 +
76221 +int gr_pid_is_chrooted(struct task_struct *p);
76222 +int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
76223 +int gr_handle_chroot_nice(void);
76224 +int gr_handle_chroot_sysctl(const int op);
76225 +int gr_handle_chroot_setpriority(struct task_struct *p,
76226 + const int niceval);
76227 +int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
76228 +int gr_handle_chroot_chroot(const struct dentry *dentry,
76229 + const struct vfsmount *mnt);
76230 +void gr_handle_chroot_chdir(const struct path *path);
76231 +int gr_handle_chroot_chmod(const struct dentry *dentry,
76232 + const struct vfsmount *mnt, const int mode);
76233 +int gr_handle_chroot_mknod(const struct dentry *dentry,
76234 + const struct vfsmount *mnt, const int mode);
76235 +int gr_handle_chroot_mount(const struct dentry *dentry,
76236 + const struct vfsmount *mnt,
76237 + const char *dev_name);
76238 +int gr_handle_chroot_pivot(void);
76239 +int gr_handle_chroot_unix(const pid_t pid);
76240 +
76241 +int gr_handle_rawio(const struct inode *inode);
76242 +
76243 +void gr_handle_ioperm(void);
76244 +void gr_handle_iopl(void);
76245 +
76246 +umode_t gr_acl_umask(void);
76247 +
76248 +int gr_tpe_allow(const struct file *file);
76249 +
76250 +void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
76251 +void gr_clear_chroot_entries(struct task_struct *task);
76252 +
76253 +void gr_log_forkfail(const int retval);
76254 +void gr_log_timechange(void);
76255 +void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
76256 +void gr_log_chdir(const struct dentry *dentry,
76257 + const struct vfsmount *mnt);
76258 +void gr_log_chroot_exec(const struct dentry *dentry,
76259 + const struct vfsmount *mnt);
76260 +void gr_log_remount(const char *devname, const int retval);
76261 +void gr_log_unmount(const char *devname, const int retval);
76262 +void gr_log_mount(const char *from, const char *to, const int retval);
76263 +void gr_log_textrel(struct vm_area_struct *vma);
76264 +void gr_log_ptgnustack(struct file *file);
76265 +void gr_log_rwxmmap(struct file *file);
76266 +void gr_log_rwxmprotect(struct vm_area_struct *vma);
76267 +
76268 +int gr_handle_follow_link(const struct inode *parent,
76269 + const struct inode *inode,
76270 + const struct dentry *dentry,
76271 + const struct vfsmount *mnt);
76272 +int gr_handle_fifo(const struct dentry *dentry,
76273 + const struct vfsmount *mnt,
76274 + const struct dentry *dir, const int flag,
76275 + const int acc_mode);
76276 +int gr_handle_hardlink(const struct dentry *dentry,
76277 + const struct vfsmount *mnt,
76278 + struct inode *inode,
76279 + const int mode, const struct filename *to);
76280 +
76281 +int gr_is_capable(const int cap);
76282 +int gr_is_capable_nolog(const int cap);
76283 +int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
76284 +int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
76285 +
76286 +void gr_copy_label(struct task_struct *tsk);
76287 +void gr_handle_crash(struct task_struct *task, const int sig);
76288 +int gr_handle_signal(const struct task_struct *p, const int sig);
76289 +int gr_check_crash_uid(const kuid_t uid);
76290 +int gr_check_protected_task(const struct task_struct *task);
76291 +int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
76292 +int gr_acl_handle_mmap(const struct file *file,
76293 + const unsigned long prot);
76294 +int gr_acl_handle_mprotect(const struct file *file,
76295 + const unsigned long prot);
76296 +int gr_check_hidden_task(const struct task_struct *tsk);
76297 +__u32 gr_acl_handle_truncate(const struct dentry *dentry,
76298 + const struct vfsmount *mnt);
76299 +__u32 gr_acl_handle_utime(const struct dentry *dentry,
76300 + const struct vfsmount *mnt);
76301 +__u32 gr_acl_handle_access(const struct dentry *dentry,
76302 + const struct vfsmount *mnt, const int fmode);
76303 +__u32 gr_acl_handle_chmod(const struct dentry *dentry,
76304 + const struct vfsmount *mnt, umode_t *mode);
76305 +__u32 gr_acl_handle_chown(const struct dentry *dentry,
76306 + const struct vfsmount *mnt);
76307 +__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
76308 + const struct vfsmount *mnt);
76309 +__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
76310 + const struct vfsmount *mnt);
76311 +int gr_handle_ptrace(struct task_struct *task, const long request);
76312 +int gr_handle_proc_ptrace(struct task_struct *task);
76313 +__u32 gr_acl_handle_execve(const struct dentry *dentry,
76314 + const struct vfsmount *mnt);
76315 +int gr_check_crash_exec(const struct file *filp);
76316 +int gr_acl_is_enabled(void);
76317 +void gr_set_role_label(struct task_struct *task, const kuid_t uid,
76318 + const kgid_t gid);
76319 +int gr_set_proc_label(const struct dentry *dentry,
76320 + const struct vfsmount *mnt,
76321 + const int unsafe_flags);
76322 +__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
76323 + const struct vfsmount *mnt);
76324 +__u32 gr_acl_handle_open(const struct dentry *dentry,
76325 + const struct vfsmount *mnt, int acc_mode);
76326 +__u32 gr_acl_handle_creat(const struct dentry *dentry,
76327 + const struct dentry *p_dentry,
76328 + const struct vfsmount *p_mnt,
76329 + int open_flags, int acc_mode, const int imode);
76330 +void gr_handle_create(const struct dentry *dentry,
76331 + const struct vfsmount *mnt);
76332 +void gr_handle_proc_create(const struct dentry *dentry,
76333 + const struct inode *inode);
76334 +__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
76335 + const struct dentry *parent_dentry,
76336 + const struct vfsmount *parent_mnt,
76337 + const int mode);
76338 +__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
76339 + const struct dentry *parent_dentry,
76340 + const struct vfsmount *parent_mnt);
76341 +__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
76342 + const struct vfsmount *mnt);
76343 +void gr_handle_delete(const ino_t ino, const dev_t dev);
76344 +__u32 gr_acl_handle_unlink(const struct dentry *dentry,
76345 + const struct vfsmount *mnt);
76346 +__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
76347 + const struct dentry *parent_dentry,
76348 + const struct vfsmount *parent_mnt,
76349 + const struct filename *from);
76350 +__u32 gr_acl_handle_link(const struct dentry *new_dentry,
76351 + const struct dentry *parent_dentry,
76352 + const struct vfsmount *parent_mnt,
76353 + const struct dentry *old_dentry,
76354 + const struct vfsmount *old_mnt, const struct filename *to);
76355 +int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
76356 +int gr_acl_handle_rename(struct dentry *new_dentry,
76357 + struct dentry *parent_dentry,
76358 + const struct vfsmount *parent_mnt,
76359 + struct dentry *old_dentry,
76360 + struct inode *old_parent_inode,
76361 + struct vfsmount *old_mnt, const struct filename *newname);
76362 +void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
76363 + struct dentry *old_dentry,
76364 + struct dentry *new_dentry,
76365 + struct vfsmount *mnt, const __u8 replace);
76366 +__u32 gr_check_link(const struct dentry *new_dentry,
76367 + const struct dentry *parent_dentry,
76368 + const struct vfsmount *parent_mnt,
76369 + const struct dentry *old_dentry,
76370 + const struct vfsmount *old_mnt);
76371 +int gr_acl_handle_filldir(const struct file *file, const char *name,
76372 + const unsigned int namelen, const ino_t ino);
76373 +
76374 +__u32 gr_acl_handle_unix(const struct dentry *dentry,
76375 + const struct vfsmount *mnt);
76376 +void gr_acl_handle_exit(void);
76377 +void gr_acl_handle_psacct(struct task_struct *task, const long code);
76378 +int gr_acl_handle_procpidmem(const struct task_struct *task);
76379 +int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
76380 +int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
76381 +void gr_audit_ptrace(struct task_struct *task);
76382 +dev_t gr_get_dev_from_dentry(struct dentry *dentry);
76383 +void gr_put_exec_file(struct task_struct *task);
76384 +
76385 +int gr_ptrace_readexec(struct file *file, int unsafe_flags);
76386 +
76387 +#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
76388 +extern void gr_learn_resource(const struct task_struct *task, const int res,
76389 + const unsigned long wanted, const int gt);
76390 +#else
76391 +static inline void gr_learn_resource(const struct task_struct *task, const int res,
76392 + const unsigned long wanted, const int gt)
76393 +{
76394 +}
76395 +#endif
76396 +
76397 +#ifdef CONFIG_GRKERNSEC_RESLOG
76398 +extern void gr_log_resource(const struct task_struct *task, const int res,
76399 + const unsigned long wanted, const int gt);
76400 +#else
76401 +static inline void gr_log_resource(const struct task_struct *task, const int res,
76402 + const unsigned long wanted, const int gt)
76403 +{
76404 +}
76405 +#endif
76406 +
76407 +#ifdef CONFIG_GRKERNSEC
76408 +void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
76409 +void gr_handle_vm86(void);
76410 +void gr_handle_mem_readwrite(u64 from, u64 to);
76411 +
76412 +void gr_log_badprocpid(const char *entry);
76413 +
76414 +extern int grsec_enable_dmesg;
76415 +extern int grsec_disable_privio;
76416 +
76417 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
76418 +extern kgid_t grsec_proc_gid;
76419 +#endif
76420 +
76421 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
76422 +extern int grsec_enable_chroot_findtask;
76423 +#endif
76424 +#ifdef CONFIG_GRKERNSEC_SETXID
76425 +extern int grsec_enable_setxid;
76426 +#endif
76427 +#endif
76428 +
76429 +#endif
76430 diff --git a/include/linux/grsock.h b/include/linux/grsock.h
76431 new file mode 100644
76432 index 0000000..e7ffaaf
76433 --- /dev/null
76434 +++ b/include/linux/grsock.h
76435 @@ -0,0 +1,19 @@
76436 +#ifndef __GRSOCK_H
76437 +#define __GRSOCK_H
76438 +
76439 +extern void gr_attach_curr_ip(const struct sock *sk);
76440 +extern int gr_handle_sock_all(const int family, const int type,
76441 + const int protocol);
76442 +extern int gr_handle_sock_server(const struct sockaddr *sck);
76443 +extern int gr_handle_sock_server_other(const struct sock *sck);
76444 +extern int gr_handle_sock_client(const struct sockaddr *sck);
76445 +extern int gr_search_connect(struct socket * sock,
76446 + struct sockaddr_in * addr);
76447 +extern int gr_search_bind(struct socket * sock,
76448 + struct sockaddr_in * addr);
76449 +extern int gr_search_listen(struct socket * sock);
76450 +extern int gr_search_accept(struct socket * sock);
76451 +extern int gr_search_socket(const int domain, const int type,
76452 + const int protocol);
76453 +
76454 +#endif
76455 diff --git a/include/linux/highmem.h b/include/linux/highmem.h
76456 index 7fb31da..08b5114 100644
76457 --- a/include/linux/highmem.h
76458 +++ b/include/linux/highmem.h
76459 @@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
76460 kunmap_atomic(kaddr);
76461 }
76462
76463 +static inline void sanitize_highpage(struct page *page)
76464 +{
76465 + void *kaddr;
76466 + unsigned long flags;
76467 +
76468 + local_irq_save(flags);
76469 + kaddr = kmap_atomic(page);
76470 + clear_page(kaddr);
76471 + kunmap_atomic(kaddr);
76472 + local_irq_restore(flags);
76473 +}
76474 +
76475 static inline void zero_user_segments(struct page *page,
76476 unsigned start1, unsigned end1,
76477 unsigned start2, unsigned end2)
76478 diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
76479 index 1c7b89a..7dda400 100644
76480 --- a/include/linux/hwmon-sysfs.h
76481 +++ b/include/linux/hwmon-sysfs.h
76482 @@ -25,7 +25,8 @@
76483 struct sensor_device_attribute{
76484 struct device_attribute dev_attr;
76485 int index;
76486 -};
76487 +} __do_const;
76488 +typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
76489 #define to_sensor_dev_attr(_dev_attr) \
76490 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
76491
76492 @@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
76493 struct device_attribute dev_attr;
76494 u8 index;
76495 u8 nr;
76496 -};
76497 +} __do_const;
76498 +typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
76499 #define to_sensor_dev_attr_2(_dev_attr) \
76500 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
76501
76502 diff --git a/include/linux/i2c.h b/include/linux/i2c.h
76503 index 2ab11dc..663a3f2 100644
76504 --- a/include/linux/i2c.h
76505 +++ b/include/linux/i2c.h
76506 @@ -366,6 +366,7 @@ struct i2c_algorithm {
76507 /* To determine what the adapter supports */
76508 u32 (*functionality) (struct i2c_adapter *);
76509 };
76510 +typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
76511
76512 /**
76513 * struct i2c_bus_recovery_info - I2C bus recovery information
76514 diff --git a/include/linux/i2o.h b/include/linux/i2o.h
76515 index d23c3c2..eb63c81 100644
76516 --- a/include/linux/i2o.h
76517 +++ b/include/linux/i2o.h
76518 @@ -565,7 +565,7 @@ struct i2o_controller {
76519 struct i2o_device *exec; /* Executive */
76520 #if BITS_PER_LONG == 64
76521 spinlock_t context_list_lock; /* lock for context_list */
76522 - atomic_t context_list_counter; /* needed for unique contexts */
76523 + atomic_unchecked_t context_list_counter; /* needed for unique contexts */
76524 struct list_head context_list; /* list of context id's
76525 and pointers */
76526 #endif
76527 diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
76528 index aff7ad8..3942bbd 100644
76529 --- a/include/linux/if_pppox.h
76530 +++ b/include/linux/if_pppox.h
76531 @@ -76,7 +76,7 @@ struct pppox_proto {
76532 int (*ioctl)(struct socket *sock, unsigned int cmd,
76533 unsigned long arg);
76534 struct module *owner;
76535 -};
76536 +} __do_const;
76537
76538 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
76539 extern void unregister_pppox_proto(int proto_num);
76540 diff --git a/include/linux/init.h b/include/linux/init.h
76541 index f1c27a71..7d6010e 100644
76542 --- a/include/linux/init.h
76543 +++ b/include/linux/init.h
76544 @@ -39,9 +39,17 @@
76545 * Also note, that this data cannot be "const".
76546 */
76547
76548 +#define add_init_latent_entropy __latent_entropy
76549 +
76550 +#ifdef CONFIG_MEMORY_HOTPLUG
76551 +#define add_meminit_latent_entropy
76552 +#else
76553 +#define add_meminit_latent_entropy __latent_entropy
76554 +#endif
76555 +
76556 /* These are for everybody (although not all archs will actually
76557 discard it in modules) */
76558 -#define __init __section(.init.text) __cold notrace
76559 +#define __init __section(.init.text) __cold notrace add_init_latent_entropy
76560 #define __initdata __section(.init.data)
76561 #define __initconst __constsection(.init.rodata)
76562 #define __exitdata __section(.exit.data)
76563 @@ -102,7 +110,7 @@
76564 #define __cpuexitconst
76565
76566 /* Used for MEMORY_HOTPLUG */
76567 -#define __meminit __section(.meminit.text) __cold notrace
76568 +#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
76569 #define __meminitdata __section(.meminit.data)
76570 #define __meminitconst __constsection(.meminit.rodata)
76571 #define __memexit __section(.memexit.text) __exitused __cold notrace
76572 diff --git a/include/linux/init_task.h b/include/linux/init_task.h
76573 index 5cd0f09..c9f67cc 100644
76574 --- a/include/linux/init_task.h
76575 +++ b/include/linux/init_task.h
76576 @@ -154,6 +154,12 @@ extern struct task_group root_task_group;
76577
76578 #define INIT_TASK_COMM "swapper"
76579
76580 +#ifdef CONFIG_X86
76581 +#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
76582 +#else
76583 +#define INIT_TASK_THREAD_INFO
76584 +#endif
76585 +
76586 /*
76587 * INIT_TASK is used to set up the first task table, touch at
76588 * your own risk!. Base=0, limit=0x1fffff (=2MB)
76589 @@ -193,6 +199,7 @@ extern struct task_group root_task_group;
76590 RCU_POINTER_INITIALIZER(cred, &init_cred), \
76591 .comm = INIT_TASK_COMM, \
76592 .thread = INIT_THREAD, \
76593 + INIT_TASK_THREAD_INFO \
76594 .fs = &init_fs, \
76595 .files = &init_files, \
76596 .signal = &init_signals, \
76597 diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
76598 index 5e865b5..71bd258 100644
76599 --- a/include/linux/interrupt.h
76600 +++ b/include/linux/interrupt.h
76601 @@ -361,7 +361,7 @@ enum
76602 /* map softirq index to softirq name. update 'softirq_to_name' in
76603 * kernel/softirq.c when adding a new softirq.
76604 */
76605 -extern char *softirq_to_name[NR_SOFTIRQS];
76606 +extern const char * const softirq_to_name[NR_SOFTIRQS];
76607
76608 /* softirq mask and active fields moved to irq_cpustat_t in
76609 * asm/hardirq.h to get better cache usage. KAO
76610 @@ -369,12 +369,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
76611
76612 struct softirq_action
76613 {
76614 - void (*action)(struct softirq_action *);
76615 -};
76616 + void (*action)(void);
76617 +} __no_const;
76618
76619 asmlinkage void do_softirq(void);
76620 asmlinkage void __do_softirq(void);
76621 -extern void open_softirq(int nr, void (*action)(struct softirq_action *));
76622 +extern void open_softirq(int nr, void (*action)(void));
76623 extern void softirq_init(void);
76624 extern void __raise_softirq_irqoff(unsigned int nr);
76625
76626 diff --git a/include/linux/iommu.h b/include/linux/iommu.h
76627 index 7ea319e..f9e971d 100644
76628 --- a/include/linux/iommu.h
76629 +++ b/include/linux/iommu.h
76630 @@ -129,7 +129,7 @@ struct iommu_ops {
76631 u32 (*domain_get_windows)(struct iommu_domain *domain);
76632
76633 unsigned long pgsize_bitmap;
76634 -};
76635 +} __do_const;
76636
76637 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
76638 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
76639 diff --git a/include/linux/ioport.h b/include/linux/ioport.h
76640 index 89b7c24..382af74 100644
76641 --- a/include/linux/ioport.h
76642 +++ b/include/linux/ioport.h
76643 @@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
76644 int adjust_resource(struct resource *res, resource_size_t start,
76645 resource_size_t size);
76646 resource_size_t resource_alignment(struct resource *res);
76647 -static inline resource_size_t resource_size(const struct resource *res)
76648 +static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
76649 {
76650 return res->end - res->start + 1;
76651 }
76652 diff --git a/include/linux/irq.h b/include/linux/irq.h
76653 index 56bb0dc..8ae94d62 100644
76654 --- a/include/linux/irq.h
76655 +++ b/include/linux/irq.h
76656 @@ -333,7 +333,8 @@ struct irq_chip {
76657 void (*irq_print_chip)(struct irq_data *data, struct seq_file *p);
76658
76659 unsigned long flags;
76660 -};
76661 +} __do_const;
76662 +typedef struct irq_chip __no_const irq_chip_no_const;
76663
76664 /*
76665 * irq_chip specific flags
76666 diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
76667 index 0e5d9ec..46acb3a 100644
76668 --- a/include/linux/irqchip/arm-gic.h
76669 +++ b/include/linux/irqchip/arm-gic.h
76670 @@ -59,9 +59,11 @@
76671
76672 #ifndef __ASSEMBLY__
76673
76674 +#include <linux/irq.h>
76675 +
76676 struct device_node;
76677
76678 -extern struct irq_chip gic_arch_extn;
76679 +extern irq_chip_no_const gic_arch_extn;
76680
76681 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
76682 u32 offset, struct device_node *);
76683 diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
76684 index d235e88..8ccbe74 100644
76685 --- a/include/linux/jiffies.h
76686 +++ b/include/linux/jiffies.h
76687 @@ -292,14 +292,14 @@ extern unsigned long preset_lpj;
76688 /*
76689 * Convert various time units to each other:
76690 */
76691 -extern unsigned int jiffies_to_msecs(const unsigned long j);
76692 -extern unsigned int jiffies_to_usecs(const unsigned long j);
76693 -extern unsigned long msecs_to_jiffies(const unsigned int m);
76694 -extern unsigned long usecs_to_jiffies(const unsigned int u);
76695 -extern unsigned long timespec_to_jiffies(const struct timespec *value);
76696 +extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
76697 +extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
76698 +extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
76699 +extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
76700 +extern unsigned long timespec_to_jiffies(const struct timespec *value) __intentional_overflow(-1);
76701 extern void jiffies_to_timespec(const unsigned long jiffies,
76702 struct timespec *value);
76703 -extern unsigned long timeval_to_jiffies(const struct timeval *value);
76704 +extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
76705 extern void jiffies_to_timeval(const unsigned long jiffies,
76706 struct timeval *value);
76707
76708 diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
76709 index 6883e19..e854fcb 100644
76710 --- a/include/linux/kallsyms.h
76711 +++ b/include/linux/kallsyms.h
76712 @@ -15,7 +15,8 @@
76713
76714 struct module;
76715
76716 -#ifdef CONFIG_KALLSYMS
76717 +#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
76718 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
76719 /* Lookup the address for a symbol. Returns 0 if not found. */
76720 unsigned long kallsyms_lookup_name(const char *name);
76721
76722 @@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
76723 /* Stupid that this does nothing, but I didn't create this mess. */
76724 #define __print_symbol(fmt, addr)
76725 #endif /*CONFIG_KALLSYMS*/
76726 +#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
76727 + arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
76728 +extern unsigned long kallsyms_lookup_name(const char *name);
76729 +extern void __print_symbol(const char *fmt, unsigned long address);
76730 +extern int sprint_backtrace(char *buffer, unsigned long address);
76731 +extern int sprint_symbol(char *buffer, unsigned long address);
76732 +extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
76733 +const char *kallsyms_lookup(unsigned long addr,
76734 + unsigned long *symbolsize,
76735 + unsigned long *offset,
76736 + char **modname, char *namebuf);
76737 +extern int kallsyms_lookup_size_offset(unsigned long addr,
76738 + unsigned long *symbolsize,
76739 + unsigned long *offset);
76740 +#endif
76741
76742 /* This macro allows us to keep printk typechecking */
76743 static __printf(1, 2)
76744 diff --git a/include/linux/key-type.h b/include/linux/key-type.h
76745 index 518a53a..5e28358 100644
76746 --- a/include/linux/key-type.h
76747 +++ b/include/linux/key-type.h
76748 @@ -125,7 +125,7 @@ struct key_type {
76749 /* internal fields */
76750 struct list_head link; /* link in types list */
76751 struct lock_class_key lock_class; /* key->sem lock class */
76752 -};
76753 +} __do_const;
76754
76755 extern struct key_type key_type_keyring;
76756
76757 diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
76758 index c6e091b..a940adf 100644
76759 --- a/include/linux/kgdb.h
76760 +++ b/include/linux/kgdb.h
76761 @@ -52,7 +52,7 @@ extern int kgdb_connected;
76762 extern int kgdb_io_module_registered;
76763
76764 extern atomic_t kgdb_setting_breakpoint;
76765 -extern atomic_t kgdb_cpu_doing_single_step;
76766 +extern atomic_unchecked_t kgdb_cpu_doing_single_step;
76767
76768 extern struct task_struct *kgdb_usethread;
76769 extern struct task_struct *kgdb_contthread;
76770 @@ -254,7 +254,7 @@ struct kgdb_arch {
76771 void (*correct_hw_break)(void);
76772
76773 void (*enable_nmi)(bool on);
76774 -};
76775 +} __do_const;
76776
76777 /**
76778 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
76779 @@ -279,7 +279,7 @@ struct kgdb_io {
76780 void (*pre_exception) (void);
76781 void (*post_exception) (void);
76782 int is_console;
76783 -};
76784 +} __do_const;
76785
76786 extern struct kgdb_arch arch_kgdb_ops;
76787
76788 diff --git a/include/linux/kmod.h b/include/linux/kmod.h
76789 index 0555cc6..40116ce 100644
76790 --- a/include/linux/kmod.h
76791 +++ b/include/linux/kmod.h
76792 @@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
76793 * usually useless though. */
76794 extern __printf(2, 3)
76795 int __request_module(bool wait, const char *name, ...);
76796 +extern __printf(3, 4)
76797 +int ___request_module(bool wait, char *param_name, const char *name, ...);
76798 #define request_module(mod...) __request_module(true, mod)
76799 #define request_module_nowait(mod...) __request_module(false, mod)
76800 #define try_then_request_module(x, mod...) \
76801 @@ -57,6 +59,9 @@ struct subprocess_info {
76802 struct work_struct work;
76803 struct completion *complete;
76804 char *path;
76805 +#ifdef CONFIG_GRKERNSEC
76806 + char *origpath;
76807 +#endif
76808 char **argv;
76809 char **envp;
76810 int wait;
76811 diff --git a/include/linux/kobject.h b/include/linux/kobject.h
76812 index de6dcbcc..4735f88 100644
76813 --- a/include/linux/kobject.h
76814 +++ b/include/linux/kobject.h
76815 @@ -115,7 +115,7 @@ struct kobj_type {
76816 struct attribute **default_attrs;
76817 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
76818 const void *(*namespace)(struct kobject *kobj);
76819 -};
76820 +} __do_const;
76821
76822 struct kobj_uevent_env {
76823 char *envp[UEVENT_NUM_ENVP];
76824 @@ -138,6 +138,7 @@ struct kobj_attribute {
76825 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
76826 const char *buf, size_t count);
76827 };
76828 +typedef struct kobj_attribute __no_const kobj_attribute_no_const;
76829
76830 extern const struct sysfs_ops kobj_sysfs_ops;
76831
76832 diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
76833 index df32d25..fb52e27 100644
76834 --- a/include/linux/kobject_ns.h
76835 +++ b/include/linux/kobject_ns.h
76836 @@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
76837 const void *(*netlink_ns)(struct sock *sk);
76838 const void *(*initial_ns)(void);
76839 void (*drop_ns)(void *);
76840 -};
76841 +} __do_const;
76842
76843 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
76844 int kobj_ns_type_registered(enum kobj_ns_type type);
76845 diff --git a/include/linux/kref.h b/include/linux/kref.h
76846 index 484604d..0f6c5b6 100644
76847 --- a/include/linux/kref.h
76848 +++ b/include/linux/kref.h
76849 @@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
76850 static inline int kref_sub(struct kref *kref, unsigned int count,
76851 void (*release)(struct kref *kref))
76852 {
76853 - WARN_ON(release == NULL);
76854 + BUG_ON(release == NULL);
76855
76856 if (atomic_sub_and_test((int) count, &kref->refcount)) {
76857 release(kref);
76858 diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
76859 index 0fbbc7a..db081e3 100644
76860 --- a/include/linux/kvm_host.h
76861 +++ b/include/linux/kvm_host.h
76862 @@ -458,7 +458,7 @@ static inline void kvm_irqfd_exit(void)
76863 {
76864 }
76865 #endif
76866 -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
76867 +int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
76868 struct module *module);
76869 void kvm_exit(void);
76870
76871 @@ -632,7 +632,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
76872 struct kvm_guest_debug *dbg);
76873 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
76874
76875 -int kvm_arch_init(void *opaque);
76876 +int kvm_arch_init(const void *opaque);
76877 void kvm_arch_exit(void);
76878
76879 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
76880 diff --git a/include/linux/libata.h b/include/linux/libata.h
76881 index 0e23c26..6ad8c33 100644
76882 --- a/include/linux/libata.h
76883 +++ b/include/linux/libata.h
76884 @@ -972,7 +972,7 @@ struct ata_port_operations {
76885 * fields must be pointers.
76886 */
76887 const struct ata_port_operations *inherits;
76888 -};
76889 +} __do_const;
76890
76891 struct ata_port_info {
76892 unsigned long flags;
76893 diff --git a/include/linux/linkage.h b/include/linux/linkage.h
76894 index d3e8ad2..a949f68 100644
76895 --- a/include/linux/linkage.h
76896 +++ b/include/linux/linkage.h
76897 @@ -31,6 +31,7 @@
76898 #endif
76899
76900 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
76901 +#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
76902 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
76903
76904 /*
76905 diff --git a/include/linux/list.h b/include/linux/list.h
76906 index f4d8a2f..38e6e46 100644
76907 --- a/include/linux/list.h
76908 +++ b/include/linux/list.h
76909 @@ -112,6 +112,19 @@ extern void __list_del_entry(struct list_head *entry);
76910 extern void list_del(struct list_head *entry);
76911 #endif
76912
76913 +extern void __pax_list_add(struct list_head *new,
76914 + struct list_head *prev,
76915 + struct list_head *next);
76916 +static inline void pax_list_add(struct list_head *new, struct list_head *head)
76917 +{
76918 + __pax_list_add(new, head, head->next);
76919 +}
76920 +static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
76921 +{
76922 + __pax_list_add(new, head->prev, head);
76923 +}
76924 +extern void pax_list_del(struct list_head *entry);
76925 +
76926 /**
76927 * list_replace - replace old entry by new one
76928 * @old : the element to be replaced
76929 @@ -145,6 +158,8 @@ static inline void list_del_init(struct list_head *entry)
76930 INIT_LIST_HEAD(entry);
76931 }
76932
76933 +extern void pax_list_del_init(struct list_head *entry);
76934 +
76935 /**
76936 * list_move - delete from one list and add as another's head
76937 * @list: the entry to move
76938 diff --git a/include/linux/math64.h b/include/linux/math64.h
76939 index 69ed5f5..243ed51 100644
76940 --- a/include/linux/math64.h
76941 +++ b/include/linux/math64.h
76942 @@ -15,7 +15,7 @@
76943 * This is commonly provided by 32bit archs to provide an optimized 64bit
76944 * divide.
76945 */
76946 -static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
76947 +static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
76948 {
76949 *remainder = dividend % divisor;
76950 return dividend / divisor;
76951 @@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
76952 /**
76953 * div64_u64 - unsigned 64bit divide with 64bit divisor
76954 */
76955 -static inline u64 div64_u64(u64 dividend, u64 divisor)
76956 +static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
76957 {
76958 return dividend / divisor;
76959 }
76960 @@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
76961 #define div64_ul(x, y) div_u64((x), (y))
76962
76963 #ifndef div_u64_rem
76964 -static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
76965 +static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
76966 {
76967 *remainder = do_div(dividend, divisor);
76968 return dividend;
76969 @@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
76970 #endif
76971
76972 #ifndef div64_u64
76973 -extern u64 div64_u64(u64 dividend, u64 divisor);
76974 +extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
76975 #endif
76976
76977 #ifndef div64_s64
76978 @@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
76979 * divide.
76980 */
76981 #ifndef div_u64
76982 -static inline u64 div_u64(u64 dividend, u32 divisor)
76983 +static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
76984 {
76985 u32 remainder;
76986 return div_u64_rem(dividend, divisor, &remainder);
76987 diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
76988 index da6716b..2e31db3 100644
76989 --- a/include/linux/mempolicy.h
76990 +++ b/include/linux/mempolicy.h
76991 @@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
76992 }
76993
76994 #define vma_policy(vma) ((vma)->vm_policy)
76995 +static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
76996 +{
76997 + vma->vm_policy = pol;
76998 +}
76999
77000 static inline void mpol_get(struct mempolicy *pol)
77001 {
77002 @@ -240,6 +244,9 @@ mpol_shared_policy_lookup(struct shared_policy *sp, unsigned long idx)
77003 }
77004
77005 #define vma_policy(vma) NULL
77006 +static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
77007 +{
77008 +}
77009
77010 static inline int
77011 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
77012 diff --git a/include/linux/mm.h b/include/linux/mm.h
77013 index 8b6e55e..c4edf39 100644
77014 --- a/include/linux/mm.h
77015 +++ b/include/linux/mm.h
77016 @@ -113,6 +113,11 @@ extern unsigned int kobjsize(const void *objp);
77017 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
77018 #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */
77019 #define VM_ARCH_1 0x01000000 /* Architecture-specific flag */
77020 +
77021 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
77022 +#define VM_PAGEEXEC 0x02000000 /* vma->vm_page_prot needs special handling */
77023 +#endif
77024 +
77025 #define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */
77026
77027 #ifdef CONFIG_MEM_SOFT_DIRTY
77028 @@ -215,8 +220,8 @@ struct vm_operations_struct {
77029 /* called by access_process_vm when get_user_pages() fails, typically
77030 * for use by special VMAs that can switch between memory and hardware
77031 */
77032 - int (*access)(struct vm_area_struct *vma, unsigned long addr,
77033 - void *buf, int len, int write);
77034 + ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
77035 + void *buf, size_t len, int write);
77036 #ifdef CONFIG_NUMA
77037 /*
77038 * set_policy() op must add a reference to any non-NULL @new mempolicy
77039 @@ -246,6 +251,7 @@ struct vm_operations_struct {
77040 int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
77041 unsigned long size, pgoff_t pgoff);
77042 };
77043 +typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
77044
77045 struct mmu_gather;
77046 struct inode;
77047 @@ -977,8 +983,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
77048 unsigned long *pfn);
77049 int follow_phys(struct vm_area_struct *vma, unsigned long address,
77050 unsigned int flags, unsigned long *prot, resource_size_t *phys);
77051 -int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
77052 - void *buf, int len, int write);
77053 +ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
77054 + void *buf, size_t len, int write);
77055
77056 static inline void unmap_shared_mapping_range(struct address_space *mapping,
77057 loff_t const holebegin, loff_t const holelen)
77058 @@ -1017,9 +1023,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
77059 }
77060 #endif
77061
77062 -extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
77063 -extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
77064 - void *buf, int len, int write);
77065 +extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
77066 +extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
77067 + void *buf, size_t len, int write);
77068
77069 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
77070 unsigned long start, unsigned long nr_pages,
77071 @@ -1051,34 +1057,6 @@ int set_page_dirty(struct page *page);
77072 int set_page_dirty_lock(struct page *page);
77073 int clear_page_dirty_for_io(struct page *page);
77074
77075 -/* Is the vma a continuation of the stack vma above it? */
77076 -static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
77077 -{
77078 - return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
77079 -}
77080 -
77081 -static inline int stack_guard_page_start(struct vm_area_struct *vma,
77082 - unsigned long addr)
77083 -{
77084 - return (vma->vm_flags & VM_GROWSDOWN) &&
77085 - (vma->vm_start == addr) &&
77086 - !vma_growsdown(vma->vm_prev, addr);
77087 -}
77088 -
77089 -/* Is the vma a continuation of the stack vma below it? */
77090 -static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
77091 -{
77092 - return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
77093 -}
77094 -
77095 -static inline int stack_guard_page_end(struct vm_area_struct *vma,
77096 - unsigned long addr)
77097 -{
77098 - return (vma->vm_flags & VM_GROWSUP) &&
77099 - (vma->vm_end == addr) &&
77100 - !vma_growsup(vma->vm_next, addr);
77101 -}
77102 -
77103 extern pid_t
77104 vm_is_stack(struct task_struct *task, struct vm_area_struct *vma, int in_group);
77105
77106 @@ -1178,6 +1156,15 @@ static inline void sync_mm_rss(struct mm_struct *mm)
77107 }
77108 #endif
77109
77110 +#ifdef CONFIG_MMU
77111 +pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
77112 +#else
77113 +static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
77114 +{
77115 + return __pgprot(0);
77116 +}
77117 +#endif
77118 +
77119 int vma_wants_writenotify(struct vm_area_struct *vma);
77120
77121 extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
77122 @@ -1196,8 +1183,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
77123 {
77124 return 0;
77125 }
77126 +
77127 +static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
77128 + unsigned long address)
77129 +{
77130 + return 0;
77131 +}
77132 #else
77133 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
77134 +int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
77135 #endif
77136
77137 #ifdef __PAGETABLE_PMD_FOLDED
77138 @@ -1206,8 +1200,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
77139 {
77140 return 0;
77141 }
77142 +
77143 +static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
77144 + unsigned long address)
77145 +{
77146 + return 0;
77147 +}
77148 #else
77149 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
77150 +int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
77151 #endif
77152
77153 int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
77154 @@ -1225,11 +1226,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
77155 NULL: pud_offset(pgd, address);
77156 }
77157
77158 +static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
77159 +{
77160 + return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
77161 + NULL: pud_offset(pgd, address);
77162 +}
77163 +
77164 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
77165 {
77166 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
77167 NULL: pmd_offset(pud, address);
77168 }
77169 +
77170 +static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
77171 +{
77172 + return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
77173 + NULL: pmd_offset(pud, address);
77174 +}
77175 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
77176
77177 #if USE_SPLIT_PTLOCKS
77178 @@ -1517,7 +1530,7 @@ extern int install_special_mapping(struct mm_struct *mm,
77179 unsigned long addr, unsigned long len,
77180 unsigned long flags, struct page **pages);
77181
77182 -extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
77183 +extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
77184
77185 extern unsigned long mmap_region(struct file *file, unsigned long addr,
77186 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
77187 @@ -1525,6 +1538,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
77188 unsigned long len, unsigned long prot, unsigned long flags,
77189 unsigned long pgoff, unsigned long *populate);
77190 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
77191 +extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
77192
77193 #ifdef CONFIG_MMU
77194 extern int __mm_populate(unsigned long addr, unsigned long len,
77195 @@ -1553,10 +1567,11 @@ struct vm_unmapped_area_info {
77196 unsigned long high_limit;
77197 unsigned long align_mask;
77198 unsigned long align_offset;
77199 + unsigned long threadstack_offset;
77200 };
77201
77202 -extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
77203 -extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
77204 +extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
77205 +extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
77206
77207 /*
77208 * Search for an unmapped address range.
77209 @@ -1568,7 +1583,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
77210 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
77211 */
77212 static inline unsigned long
77213 -vm_unmapped_area(struct vm_unmapped_area_info *info)
77214 +vm_unmapped_area(const struct vm_unmapped_area_info *info)
77215 {
77216 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
77217 return unmapped_area(info);
77218 @@ -1631,6 +1646,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
77219 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
77220 struct vm_area_struct **pprev);
77221
77222 +extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
77223 +extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
77224 +extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
77225 +
77226 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
77227 NULL if none. Assume start_addr < end_addr. */
77228 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
77229 @@ -1659,15 +1678,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
77230 return vma;
77231 }
77232
77233 -#ifdef CONFIG_MMU
77234 -pgprot_t vm_get_page_prot(unsigned long vm_flags);
77235 -#else
77236 -static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
77237 -{
77238 - return __pgprot(0);
77239 -}
77240 -#endif
77241 -
77242 #ifdef CONFIG_ARCH_USES_NUMA_PROT_NONE
77243 unsigned long change_prot_numa(struct vm_area_struct *vma,
77244 unsigned long start, unsigned long end);
77245 @@ -1719,6 +1729,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
77246 static inline void vm_stat_account(struct mm_struct *mm,
77247 unsigned long flags, struct file *file, long pages)
77248 {
77249 +
77250 +#ifdef CONFIG_PAX_RANDMMAP
77251 + if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
77252 +#endif
77253 +
77254 mm->total_vm += pages;
77255 }
77256 #endif /* CONFIG_PROC_FS */
77257 @@ -1800,7 +1815,7 @@ extern int unpoison_memory(unsigned long pfn);
77258 extern int sysctl_memory_failure_early_kill;
77259 extern int sysctl_memory_failure_recovery;
77260 extern void shake_page(struct page *p, int access);
77261 -extern atomic_long_t num_poisoned_pages;
77262 +extern atomic_long_unchecked_t num_poisoned_pages;
77263 extern int soft_offline_page(struct page *page, int flags);
77264
77265 extern void dump_page(struct page *page);
77266 @@ -1837,5 +1852,11 @@ void __init setup_nr_node_ids(void);
77267 static inline void setup_nr_node_ids(void) {}
77268 #endif
77269
77270 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
77271 +extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
77272 +#else
77273 +static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
77274 +#endif
77275 +
77276 #endif /* __KERNEL__ */
77277 #endif /* _LINUX_MM_H */
77278 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
77279 index d9851ee..619492d 100644
77280 --- a/include/linux/mm_types.h
77281 +++ b/include/linux/mm_types.h
77282 @@ -289,6 +289,8 @@ struct vm_area_struct {
77283 #ifdef CONFIG_NUMA
77284 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
77285 #endif
77286 +
77287 + struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
77288 };
77289
77290 struct core_thread {
77291 @@ -436,6 +438,24 @@ struct mm_struct {
77292 int first_nid;
77293 #endif
77294 struct uprobes_state uprobes_state;
77295 +
77296 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
77297 + unsigned long pax_flags;
77298 +#endif
77299 +
77300 +#ifdef CONFIG_PAX_DLRESOLVE
77301 + unsigned long call_dl_resolve;
77302 +#endif
77303 +
77304 +#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
77305 + unsigned long call_syscall;
77306 +#endif
77307 +
77308 +#ifdef CONFIG_PAX_ASLR
77309 + unsigned long delta_mmap; /* randomized offset */
77310 + unsigned long delta_stack; /* randomized offset */
77311 +#endif
77312 +
77313 };
77314
77315 /* first nid will either be a valid NID or one of these values */
77316 diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
77317 index c5d5278..f0b68c8 100644
77318 --- a/include/linux/mmiotrace.h
77319 +++ b/include/linux/mmiotrace.h
77320 @@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
77321 /* Called from ioremap.c */
77322 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
77323 void __iomem *addr);
77324 -extern void mmiotrace_iounmap(volatile void __iomem *addr);
77325 +extern void mmiotrace_iounmap(const volatile void __iomem *addr);
77326
77327 /* For anyone to insert markers. Remember trailing newline. */
77328 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
77329 @@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
77330 {
77331 }
77332
77333 -static inline void mmiotrace_iounmap(volatile void __iomem *addr)
77334 +static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
77335 {
77336 }
77337
77338 diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
77339 index bd791e4..8617c34f 100644
77340 --- a/include/linux/mmzone.h
77341 +++ b/include/linux/mmzone.h
77342 @@ -396,7 +396,7 @@ struct zone {
77343 unsigned long flags; /* zone flags, see below */
77344
77345 /* Zone statistics */
77346 - atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
77347 + atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
77348
77349 /*
77350 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
77351 diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
77352 index 45e9214..a7227d6 100644
77353 --- a/include/linux/mod_devicetable.h
77354 +++ b/include/linux/mod_devicetable.h
77355 @@ -13,7 +13,7 @@
77356 typedef unsigned long kernel_ulong_t;
77357 #endif
77358
77359 -#define PCI_ANY_ID (~0)
77360 +#define PCI_ANY_ID ((__u16)~0)
77361
77362 struct pci_device_id {
77363 __u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/
77364 @@ -139,7 +139,7 @@ struct usb_device_id {
77365 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
77366 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
77367
77368 -#define HID_ANY_ID (~0)
77369 +#define HID_ANY_ID (~0U)
77370 #define HID_BUS_ANY 0xffff
77371 #define HID_GROUP_ANY 0x0000
77372
77373 @@ -467,7 +467,7 @@ struct dmi_system_id {
77374 const char *ident;
77375 struct dmi_strmatch matches[4];
77376 void *driver_data;
77377 -};
77378 +} __do_const;
77379 /*
77380 * struct dmi_device_id appears during expansion of
77381 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
77382 diff --git a/include/linux/module.h b/include/linux/module.h
77383 index 05f2447..2aee07c 100644
77384 --- a/include/linux/module.h
77385 +++ b/include/linux/module.h
77386 @@ -17,9 +17,11 @@
77387 #include <linux/moduleparam.h>
77388 #include <linux/tracepoint.h>
77389 #include <linux/export.h>
77390 +#include <linux/fs.h>
77391
77392 #include <linux/percpu.h>
77393 #include <asm/module.h>
77394 +#include <asm/pgtable.h>
77395
77396 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
77397 #define MODULE_SIG_STRING "~Module signature appended~\n"
77398 @@ -55,12 +57,13 @@ struct module_attribute {
77399 int (*test)(struct module *);
77400 void (*free)(struct module *);
77401 };
77402 +typedef struct module_attribute __no_const module_attribute_no_const;
77403
77404 struct module_version_attribute {
77405 struct module_attribute mattr;
77406 const char *module_name;
77407 const char *version;
77408 -} __attribute__ ((__aligned__(sizeof(void *))));
77409 +} __do_const __attribute__ ((__aligned__(sizeof(void *))));
77410
77411 extern ssize_t __modver_version_show(struct module_attribute *,
77412 struct module_kobject *, char *);
77413 @@ -238,7 +241,7 @@ struct module
77414
77415 /* Sysfs stuff. */
77416 struct module_kobject mkobj;
77417 - struct module_attribute *modinfo_attrs;
77418 + module_attribute_no_const *modinfo_attrs;
77419 const char *version;
77420 const char *srcversion;
77421 struct kobject *holders_dir;
77422 @@ -287,19 +290,16 @@ struct module
77423 int (*init)(void);
77424
77425 /* If this is non-NULL, vfree after init() returns */
77426 - void *module_init;
77427 + void *module_init_rx, *module_init_rw;
77428
77429 /* Here is the actual code + data, vfree'd on unload. */
77430 - void *module_core;
77431 + void *module_core_rx, *module_core_rw;
77432
77433 /* Here are the sizes of the init and core sections */
77434 - unsigned int init_size, core_size;
77435 + unsigned int init_size_rw, core_size_rw;
77436
77437 /* The size of the executable code in each section. */
77438 - unsigned int init_text_size, core_text_size;
77439 -
77440 - /* Size of RO sections of the module (text+rodata) */
77441 - unsigned int init_ro_size, core_ro_size;
77442 + unsigned int init_size_rx, core_size_rx;
77443
77444 /* Arch-specific module values */
77445 struct mod_arch_specific arch;
77446 @@ -355,6 +355,10 @@ struct module
77447 #ifdef CONFIG_EVENT_TRACING
77448 struct ftrace_event_call **trace_events;
77449 unsigned int num_trace_events;
77450 + struct file_operations trace_id;
77451 + struct file_operations trace_enable;
77452 + struct file_operations trace_format;
77453 + struct file_operations trace_filter;
77454 #endif
77455 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
77456 unsigned int num_ftrace_callsites;
77457 @@ -402,16 +406,46 @@ bool is_module_address(unsigned long addr);
77458 bool is_module_percpu_address(unsigned long addr);
77459 bool is_module_text_address(unsigned long addr);
77460
77461 +static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
77462 +{
77463 +
77464 +#ifdef CONFIG_PAX_KERNEXEC
77465 + if (ktla_ktva(addr) >= (unsigned long)start &&
77466 + ktla_ktva(addr) < (unsigned long)start + size)
77467 + return 1;
77468 +#endif
77469 +
77470 + return ((void *)addr >= start && (void *)addr < start + size);
77471 +}
77472 +
77473 +static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
77474 +{
77475 + return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
77476 +}
77477 +
77478 +static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
77479 +{
77480 + return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
77481 +}
77482 +
77483 +static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
77484 +{
77485 + return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
77486 +}
77487 +
77488 +static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
77489 +{
77490 + return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
77491 +}
77492 +
77493 static inline int within_module_core(unsigned long addr, const struct module *mod)
77494 {
77495 - return (unsigned long)mod->module_core <= addr &&
77496 - addr < (unsigned long)mod->module_core + mod->core_size;
77497 + return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
77498 }
77499
77500 static inline int within_module_init(unsigned long addr, const struct module *mod)
77501 {
77502 - return (unsigned long)mod->module_init <= addr &&
77503 - addr < (unsigned long)mod->module_init + mod->init_size;
77504 + return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
77505 }
77506
77507 /* Search for module by name: must hold module_mutex. */
77508 diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
77509 index 560ca53..ef621ef 100644
77510 --- a/include/linux/moduleloader.h
77511 +++ b/include/linux/moduleloader.h
77512 @@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
77513 sections. Returns NULL on failure. */
77514 void *module_alloc(unsigned long size);
77515
77516 +#ifdef CONFIG_PAX_KERNEXEC
77517 +void *module_alloc_exec(unsigned long size);
77518 +#else
77519 +#define module_alloc_exec(x) module_alloc(x)
77520 +#endif
77521 +
77522 /* Free memory returned from module_alloc. */
77523 void module_free(struct module *mod, void *module_region);
77524
77525 +#ifdef CONFIG_PAX_KERNEXEC
77526 +void module_free_exec(struct module *mod, void *module_region);
77527 +#else
77528 +#define module_free_exec(x, y) module_free((x), (y))
77529 +#endif
77530 +
77531 /*
77532 * Apply the given relocation to the (simplified) ELF. Return -error
77533 * or 0.
77534 @@ -45,7 +57,9 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
77535 unsigned int relsec,
77536 struct module *me)
77537 {
77538 +#ifdef CONFIG_MODULES
77539 printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
77540 +#endif
77541 return -ENOEXEC;
77542 }
77543 #endif
77544 @@ -67,7 +81,9 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
77545 unsigned int relsec,
77546 struct module *me)
77547 {
77548 +#ifdef CONFIG_MODULES
77549 printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
77550 +#endif
77551 return -ENOEXEC;
77552 }
77553 #endif
77554 diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
77555 index c3eb102..073c4a6 100644
77556 --- a/include/linux/moduleparam.h
77557 +++ b/include/linux/moduleparam.h
77558 @@ -295,7 +295,7 @@ static inline void __kernel_param_unlock(void)
77559 * @len is usually just sizeof(string).
77560 */
77561 #define module_param_string(name, string, len, perm) \
77562 - static const struct kparam_string __param_string_##name \
77563 + static const struct kparam_string __param_string_##name __used \
77564 = { len, string }; \
77565 __module_param_call(MODULE_PARAM_PREFIX, name, \
77566 &param_ops_string, \
77567 @@ -434,7 +434,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
77568 */
77569 #define module_param_array_named(name, array, type, nump, perm) \
77570 param_check_##type(name, &(array)[0]); \
77571 - static const struct kparam_array __param_arr_##name \
77572 + static const struct kparam_array __param_arr_##name __used \
77573 = { .max = ARRAY_SIZE(array), .num = nump, \
77574 .ops = &param_ops_##type, \
77575 .elemsize = sizeof(array[0]), .elem = array }; \
77576 diff --git a/include/linux/namei.h b/include/linux/namei.h
77577 index 8e47bc7..c70fd73 100644
77578 --- a/include/linux/namei.h
77579 +++ b/include/linux/namei.h
77580 @@ -19,7 +19,7 @@ struct nameidata {
77581 unsigned seq;
77582 int last_type;
77583 unsigned depth;
77584 - char *saved_names[MAX_NESTED_LINKS + 1];
77585 + const char *saved_names[MAX_NESTED_LINKS + 1];
77586 };
77587
77588 /*
77589 @@ -83,12 +83,12 @@ extern void unlock_rename(struct dentry *, struct dentry *);
77590
77591 extern void nd_jump_link(struct nameidata *nd, struct path *path);
77592
77593 -static inline void nd_set_link(struct nameidata *nd, char *path)
77594 +static inline void nd_set_link(struct nameidata *nd, const char *path)
77595 {
77596 nd->saved_names[nd->depth] = path;
77597 }
77598
77599 -static inline char *nd_get_link(struct nameidata *nd)
77600 +static inline const char *nd_get_link(const struct nameidata *nd)
77601 {
77602 return nd->saved_names[nd->depth];
77603 }
77604 diff --git a/include/linux/net.h b/include/linux/net.h
77605 index 8bd9d92..08b1c20 100644
77606 --- a/include/linux/net.h
77607 +++ b/include/linux/net.h
77608 @@ -191,7 +191,7 @@ struct net_proto_family {
77609 int (*create)(struct net *net, struct socket *sock,
77610 int protocol, int kern);
77611 struct module *owner;
77612 -};
77613 +} __do_const;
77614
77615 struct iovec;
77616 struct kvec;
77617 diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
77618 index 25f5d2d1..5cf2120 100644
77619 --- a/include/linux/netdevice.h
77620 +++ b/include/linux/netdevice.h
77621 @@ -1098,6 +1098,7 @@ struct net_device_ops {
77622 sa_family_t sa_family,
77623 __be16 port);
77624 };
77625 +typedef struct net_device_ops __no_const net_device_ops_no_const;
77626
77627 /*
77628 * The DEVICE structure.
77629 @@ -1169,7 +1170,7 @@ struct net_device {
77630 int iflink;
77631
77632 struct net_device_stats stats;
77633 - atomic_long_t rx_dropped; /* dropped packets by core network
77634 + atomic_long_unchecked_t rx_dropped; /* dropped packets by core network
77635 * Do not use this in drivers.
77636 */
77637
77638 diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
77639 index 708fe72ab9..77084a3 100644
77640 --- a/include/linux/netfilter.h
77641 +++ b/include/linux/netfilter.h
77642 @@ -82,7 +82,7 @@ struct nf_sockopt_ops {
77643 #endif
77644 /* Use the module struct to lock set/get code in place */
77645 struct module *owner;
77646 -};
77647 +} __do_const;
77648
77649 /* Function to register/unregister hook points. */
77650 int nf_register_hook(struct nf_hook_ops *reg);
77651 diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
77652 index cadb740..d7c37c0 100644
77653 --- a/include/linux/netfilter/nfnetlink.h
77654 +++ b/include/linux/netfilter/nfnetlink.h
77655 @@ -16,7 +16,7 @@ struct nfnl_callback {
77656 const struct nlattr * const cda[]);
77657 const struct nla_policy *policy; /* netlink attribute policy */
77658 const u_int16_t attr_count; /* number of nlattr's */
77659 -};
77660 +} __do_const;
77661
77662 struct nfnetlink_subsystem {
77663 const char *name;
77664 diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
77665 new file mode 100644
77666 index 0000000..33f4af8
77667 --- /dev/null
77668 +++ b/include/linux/netfilter/xt_gradm.h
77669 @@ -0,0 +1,9 @@
77670 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
77671 +#define _LINUX_NETFILTER_XT_GRADM_H 1
77672 +
77673 +struct xt_gradm_mtinfo {
77674 + __u16 flags;
77675 + __u16 invflags;
77676 +};
77677 +
77678 +#endif
77679 diff --git a/include/linux/nls.h b/include/linux/nls.h
77680 index 5dc635f..35f5e11 100644
77681 --- a/include/linux/nls.h
77682 +++ b/include/linux/nls.h
77683 @@ -31,7 +31,7 @@ struct nls_table {
77684 const unsigned char *charset2upper;
77685 struct module *owner;
77686 struct nls_table *next;
77687 -};
77688 +} __do_const;
77689
77690 /* this value hold the maximum octet of charset */
77691 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
77692 diff --git a/include/linux/notifier.h b/include/linux/notifier.h
77693 index d14a4c3..a078786 100644
77694 --- a/include/linux/notifier.h
77695 +++ b/include/linux/notifier.h
77696 @@ -54,7 +54,8 @@ struct notifier_block {
77697 notifier_fn_t notifier_call;
77698 struct notifier_block __rcu *next;
77699 int priority;
77700 -};
77701 +} __do_const;
77702 +typedef struct notifier_block __no_const notifier_block_no_const;
77703
77704 struct atomic_notifier_head {
77705 spinlock_t lock;
77706 diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
77707 index b2a0f15..4d7da32 100644
77708 --- a/include/linux/oprofile.h
77709 +++ b/include/linux/oprofile.h
77710 @@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
77711 int oprofilefs_create_ro_ulong(struct dentry * root,
77712 char const * name, ulong * val);
77713
77714 -/** Create a file for read-only access to an atomic_t. */
77715 +/** Create a file for read-only access to an atomic_unchecked_t. */
77716 int oprofilefs_create_ro_atomic(struct dentry * root,
77717 - char const * name, atomic_t * val);
77718 + char const * name, atomic_unchecked_t * val);
77719
77720 /** create a directory */
77721 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
77722 diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
77723 index 430dd96..544e26e 100644
77724 --- a/include/linux/pci_hotplug.h
77725 +++ b/include/linux/pci_hotplug.h
77726 @@ -71,7 +71,8 @@ struct hotplug_slot_ops {
77727 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
77728 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
77729 int (*reset_slot) (struct hotplug_slot *slot, int probe);
77730 -};
77731 +} __do_const;
77732 +typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
77733
77734 /**
77735 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
77736 diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
77737 index c8ba627..24bdfa8 100644
77738 --- a/include/linux/perf_event.h
77739 +++ b/include/linux/perf_event.h
77740 @@ -327,8 +327,8 @@ struct perf_event {
77741
77742 enum perf_event_active_state state;
77743 unsigned int attach_state;
77744 - local64_t count;
77745 - atomic64_t child_count;
77746 + local64_t count; /* PaX: fix it one day */
77747 + atomic64_unchecked_t child_count;
77748
77749 /*
77750 * These are the total time in nanoseconds that the event
77751 @@ -379,8 +379,8 @@ struct perf_event {
77752 * These accumulate total time (in nanoseconds) that children
77753 * events have been enabled and running, respectively.
77754 */
77755 - atomic64_t child_total_time_enabled;
77756 - atomic64_t child_total_time_running;
77757 + atomic64_unchecked_t child_total_time_enabled;
77758 + atomic64_unchecked_t child_total_time_running;
77759
77760 /*
77761 * Protect attach/detach and child_list:
77762 @@ -702,7 +702,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
77763 entry->ip[entry->nr++] = ip;
77764 }
77765
77766 -extern int sysctl_perf_event_paranoid;
77767 +extern int sysctl_perf_event_legitimately_concerned;
77768 extern int sysctl_perf_event_mlock;
77769 extern int sysctl_perf_event_sample_rate;
77770 extern int sysctl_perf_cpu_time_max_percent;
77771 @@ -717,19 +717,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
77772 loff_t *ppos);
77773
77774
77775 +static inline bool perf_paranoid_any(void)
77776 +{
77777 + return sysctl_perf_event_legitimately_concerned > 2;
77778 +}
77779 +
77780 static inline bool perf_paranoid_tracepoint_raw(void)
77781 {
77782 - return sysctl_perf_event_paranoid > -1;
77783 + return sysctl_perf_event_legitimately_concerned > -1;
77784 }
77785
77786 static inline bool perf_paranoid_cpu(void)
77787 {
77788 - return sysctl_perf_event_paranoid > 0;
77789 + return sysctl_perf_event_legitimately_concerned > 0;
77790 }
77791
77792 static inline bool perf_paranoid_kernel(void)
77793 {
77794 - return sysctl_perf_event_paranoid > 1;
77795 + return sysctl_perf_event_legitimately_concerned > 1;
77796 }
77797
77798 extern void perf_event_init(void);
77799 @@ -845,7 +850,7 @@ struct perf_pmu_events_attr {
77800 struct device_attribute attr;
77801 u64 id;
77802 const char *event_str;
77803 -};
77804 +} __do_const;
77805
77806 #define PMU_EVENT_ATTR(_name, _var, _id, _show) \
77807 static struct perf_pmu_events_attr _var = { \
77808 diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
77809 index b8809fe..ae4ccd0 100644
77810 --- a/include/linux/pipe_fs_i.h
77811 +++ b/include/linux/pipe_fs_i.h
77812 @@ -47,10 +47,10 @@ struct pipe_inode_info {
77813 struct mutex mutex;
77814 wait_queue_head_t wait;
77815 unsigned int nrbufs, curbuf, buffers;
77816 - unsigned int readers;
77817 - unsigned int writers;
77818 - unsigned int files;
77819 - unsigned int waiting_writers;
77820 + atomic_t readers;
77821 + atomic_t writers;
77822 + atomic_t files;
77823 + atomic_t waiting_writers;
77824 unsigned int r_counter;
77825 unsigned int w_counter;
77826 struct page *tmp_page;
77827 diff --git a/include/linux/platform_data/usb-ehci-s5p.h b/include/linux/platform_data/usb-ehci-s5p.h
77828 index 5f28cae..3d23723 100644
77829 --- a/include/linux/platform_data/usb-ehci-s5p.h
77830 +++ b/include/linux/platform_data/usb-ehci-s5p.h
77831 @@ -14,7 +14,7 @@
77832 struct s5p_ehci_platdata {
77833 int (*phy_init)(struct platform_device *pdev, int type);
77834 int (*phy_exit)(struct platform_device *pdev, int type);
77835 -};
77836 +} __no_const;
77837
77838 extern void s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd);
77839
77840 diff --git a/include/linux/platform_data/usb-ohci-exynos.h b/include/linux/platform_data/usb-ohci-exynos.h
77841 index c256c59..8ea94c7 100644
77842 --- a/include/linux/platform_data/usb-ohci-exynos.h
77843 +++ b/include/linux/platform_data/usb-ohci-exynos.h
77844 @@ -14,7 +14,7 @@
77845 struct exynos4_ohci_platdata {
77846 int (*phy_init)(struct platform_device *pdev, int type);
77847 int (*phy_exit)(struct platform_device *pdev, int type);
77848 -};
77849 +} __no_const;
77850
77851 extern void exynos4_ohci_set_platdata(struct exynos4_ohci_platdata *pd);
77852
77853 diff --git a/include/linux/pm.h b/include/linux/pm.h
77854 index a224c7f..92d8a97 100644
77855 --- a/include/linux/pm.h
77856 +++ b/include/linux/pm.h
77857 @@ -576,6 +576,7 @@ extern int dev_pm_put_subsys_data(struct device *dev);
77858 struct dev_pm_domain {
77859 struct dev_pm_ops ops;
77860 };
77861 +typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
77862
77863 /*
77864 * The PM_EVENT_ messages are also used by drivers implementing the legacy
77865 diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
77866 index 7c1d252..c5c773e 100644
77867 --- a/include/linux/pm_domain.h
77868 +++ b/include/linux/pm_domain.h
77869 @@ -48,7 +48,7 @@ struct gpd_dev_ops {
77870
77871 struct gpd_cpu_data {
77872 unsigned int saved_exit_latency;
77873 - struct cpuidle_state *idle_state;
77874 + cpuidle_state_no_const *idle_state;
77875 };
77876
77877 struct generic_pm_domain {
77878 diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
77879 index 6fa7cea..7bf6415 100644
77880 --- a/include/linux/pm_runtime.h
77881 +++ b/include/linux/pm_runtime.h
77882 @@ -103,7 +103,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
77883
77884 static inline void pm_runtime_mark_last_busy(struct device *dev)
77885 {
77886 - ACCESS_ONCE(dev->power.last_busy) = jiffies;
77887 + ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
77888 }
77889
77890 #else /* !CONFIG_PM_RUNTIME */
77891 diff --git a/include/linux/pnp.h b/include/linux/pnp.h
77892 index 195aafc..49a7bc2 100644
77893 --- a/include/linux/pnp.h
77894 +++ b/include/linux/pnp.h
77895 @@ -297,7 +297,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
77896 struct pnp_fixup {
77897 char id[7];
77898 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
77899 -};
77900 +} __do_const;
77901
77902 /* config parameters */
77903 #define PNP_CONFIG_NORMAL 0x0001
77904 diff --git a/include/linux/poison.h b/include/linux/poison.h
77905 index 2110a81..13a11bb 100644
77906 --- a/include/linux/poison.h
77907 +++ b/include/linux/poison.h
77908 @@ -19,8 +19,8 @@
77909 * under normal circumstances, used to verify that nobody uses
77910 * non-initialized list entries.
77911 */
77912 -#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
77913 -#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
77914 +#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
77915 +#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
77916
77917 /********** include/linux/timer.h **********/
77918 /*
77919 diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
77920 index d8b187c3..9a9257a 100644
77921 --- a/include/linux/power/smartreflex.h
77922 +++ b/include/linux/power/smartreflex.h
77923 @@ -238,7 +238,7 @@ struct omap_sr_class_data {
77924 int (*notify)(struct omap_sr *sr, u32 status);
77925 u8 notify_flags;
77926 u8 class_type;
77927 -};
77928 +} __do_const;
77929
77930 /**
77931 * struct omap_sr_nvalue_table - Smartreflex n-target value info
77932 diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
77933 index 4ea1d37..80f4b33 100644
77934 --- a/include/linux/ppp-comp.h
77935 +++ b/include/linux/ppp-comp.h
77936 @@ -84,7 +84,7 @@ struct compressor {
77937 struct module *owner;
77938 /* Extra skb space needed by the compressor algorithm */
77939 unsigned int comp_extra;
77940 -};
77941 +} __do_const;
77942
77943 /*
77944 * The return value from decompress routine is the length of the
77945 diff --git a/include/linux/preempt.h b/include/linux/preempt.h
77946 index f5d4723..a6ea2fa 100644
77947 --- a/include/linux/preempt.h
77948 +++ b/include/linux/preempt.h
77949 @@ -18,8 +18,13 @@
77950 # define sub_preempt_count(val) do { preempt_count() -= (val); } while (0)
77951 #endif
77952
77953 +#define raw_add_preempt_count(val) do { preempt_count() += (val); } while (0)
77954 +#define raw_sub_preempt_count(val) do { preempt_count() -= (val); } while (0)
77955 +
77956 #define inc_preempt_count() add_preempt_count(1)
77957 +#define raw_inc_preempt_count() raw_add_preempt_count(1)
77958 #define dec_preempt_count() sub_preempt_count(1)
77959 +#define raw_dec_preempt_count() raw_sub_preempt_count(1)
77960
77961 #define preempt_count() (current_thread_info()->preempt_count)
77962
77963 @@ -64,6 +69,12 @@ do { \
77964 barrier(); \
77965 } while (0)
77966
77967 +#define raw_preempt_disable() \
77968 +do { \
77969 + raw_inc_preempt_count(); \
77970 + barrier(); \
77971 +} while (0)
77972 +
77973 #define sched_preempt_enable_no_resched() \
77974 do { \
77975 barrier(); \
77976 @@ -72,6 +83,12 @@ do { \
77977
77978 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
77979
77980 +#define raw_preempt_enable_no_resched() \
77981 +do { \
77982 + barrier(); \
77983 + raw_dec_preempt_count(); \
77984 +} while (0)
77985 +
77986 #define preempt_enable() \
77987 do { \
77988 preempt_enable_no_resched(); \
77989 @@ -116,8 +133,10 @@ do { \
77990 * region.
77991 */
77992 #define preempt_disable() barrier()
77993 +#define raw_preempt_disable() barrier()
77994 #define sched_preempt_enable_no_resched() barrier()
77995 #define preempt_enable_no_resched() barrier()
77996 +#define raw_preempt_enable_no_resched() barrier()
77997 #define preempt_enable() barrier()
77998
77999 #define preempt_disable_notrace() barrier()
78000 diff --git a/include/linux/printk.h b/include/linux/printk.h
78001 index e6131a78..8e9fb61 100644
78002 --- a/include/linux/printk.h
78003 +++ b/include/linux/printk.h
78004 @@ -106,6 +106,8 @@ static inline __printf(1, 2) __cold
78005 void early_printk(const char *s, ...) { }
78006 #endif
78007
78008 +extern int kptr_restrict;
78009 +
78010 #ifdef CONFIG_PRINTK
78011 asmlinkage __printf(5, 0)
78012 int vprintk_emit(int facility, int level,
78013 @@ -140,7 +142,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
78014
78015 extern int printk_delay_msec;
78016 extern int dmesg_restrict;
78017 -extern int kptr_restrict;
78018
78019 extern void wake_up_klogd(void);
78020
78021 diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
78022 index 608e60a..c26f864 100644
78023 --- a/include/linux/proc_fs.h
78024 +++ b/include/linux/proc_fs.h
78025 @@ -34,6 +34,19 @@ static inline struct proc_dir_entry *proc_create(
78026 return proc_create_data(name, mode, parent, proc_fops, NULL);
78027 }
78028
78029 +static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
78030 + struct proc_dir_entry *parent, const struct file_operations *proc_fops)
78031 +{
78032 +#ifdef CONFIG_GRKERNSEC_PROC_USER
78033 + return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
78034 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
78035 + return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
78036 +#else
78037 + return proc_create_data(name, mode, parent, proc_fops, NULL);
78038 +#endif
78039 +}
78040 +
78041 +
78042 extern void proc_set_size(struct proc_dir_entry *, loff_t);
78043 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
78044 extern void *PDE_DATA(const struct inode *);
78045 diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
78046 index 34a1e10..03a6d03 100644
78047 --- a/include/linux/proc_ns.h
78048 +++ b/include/linux/proc_ns.h
78049 @@ -14,7 +14,7 @@ struct proc_ns_operations {
78050 void (*put)(void *ns);
78051 int (*install)(struct nsproxy *nsproxy, void *ns);
78052 unsigned int (*inum)(void *ns);
78053 -};
78054 +} __do_const;
78055
78056 struct proc_ns {
78057 void *ns;
78058 diff --git a/include/linux/quota.h b/include/linux/quota.h
78059 index cc7494a..1e27036 100644
78060 --- a/include/linux/quota.h
78061 +++ b/include/linux/quota.h
78062 @@ -70,7 +70,7 @@ struct kqid { /* Type in which we store the quota identifier */
78063
78064 extern bool qid_eq(struct kqid left, struct kqid right);
78065 extern bool qid_lt(struct kqid left, struct kqid right);
78066 -extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
78067 +extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
78068 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
78069 extern bool qid_valid(struct kqid qid);
78070
78071 diff --git a/include/linux/random.h b/include/linux/random.h
78072 index bf9085e..1e8bbcf 100644
78073 --- a/include/linux/random.h
78074 +++ b/include/linux/random.h
78075 @@ -10,9 +10,19 @@
78076
78077
78078 extern void add_device_randomness(const void *, unsigned int);
78079 +
78080 +static inline void add_latent_entropy(void)
78081 +{
78082 +
78083 +#ifdef LATENT_ENTROPY_PLUGIN
78084 + add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
78085 +#endif
78086 +
78087 +}
78088 +
78089 extern void add_input_randomness(unsigned int type, unsigned int code,
78090 - unsigned int value);
78091 -extern void add_interrupt_randomness(int irq, int irq_flags);
78092 + unsigned int value) __latent_entropy;
78093 +extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
78094
78095 extern void get_random_bytes(void *buf, int nbytes);
78096 extern void get_random_bytes_arch(void *buf, int nbytes);
78097 @@ -23,16 +33,21 @@ extern int random_int_secret_init(void);
78098 extern const struct file_operations random_fops, urandom_fops;
78099 #endif
78100
78101 -unsigned int get_random_int(void);
78102 +unsigned int __intentional_overflow(-1) get_random_int(void);
78103 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
78104
78105 -u32 prandom_u32(void);
78106 +u32 prandom_u32(void) __intentional_overflow(-1);
78107 void prandom_bytes(void *buf, int nbytes);
78108 void prandom_seed(u32 seed);
78109
78110 u32 prandom_u32_state(struct rnd_state *);
78111 void prandom_bytes_state(struct rnd_state *state, void *buf, int nbytes);
78112
78113 +static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
78114 +{
78115 + return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
78116 +}
78117 +
78118 /*
78119 * Handle minimum values for seeds
78120 */
78121 diff --git a/include/linux/rculist.h b/include/linux/rculist.h
78122 index 4106721..132d42c 100644
78123 --- a/include/linux/rculist.h
78124 +++ b/include/linux/rculist.h
78125 @@ -44,6 +44,9 @@ extern void __list_add_rcu(struct list_head *new,
78126 struct list_head *prev, struct list_head *next);
78127 #endif
78128
78129 +extern void __pax_list_add_rcu(struct list_head *new,
78130 + struct list_head *prev, struct list_head *next);
78131 +
78132 /**
78133 * list_add_rcu - add a new entry to rcu-protected list
78134 * @new: new entry to be added
78135 @@ -65,6 +68,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
78136 __list_add_rcu(new, head, head->next);
78137 }
78138
78139 +static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
78140 +{
78141 + __pax_list_add_rcu(new, head, head->next);
78142 +}
78143 +
78144 /**
78145 * list_add_tail_rcu - add a new entry to rcu-protected list
78146 * @new: new entry to be added
78147 @@ -87,6 +95,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
78148 __list_add_rcu(new, head->prev, head);
78149 }
78150
78151 +static inline void pax_list_add_tail_rcu(struct list_head *new,
78152 + struct list_head *head)
78153 +{
78154 + __pax_list_add_rcu(new, head->prev, head);
78155 +}
78156 +
78157 /**
78158 * list_del_rcu - deletes entry from list without re-initialization
78159 * @entry: the element to delete from the list.
78160 @@ -117,6 +131,8 @@ static inline void list_del_rcu(struct list_head *entry)
78161 entry->prev = LIST_POISON2;
78162 }
78163
78164 +extern void pax_list_del_rcu(struct list_head *entry);
78165 +
78166 /**
78167 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
78168 * @n: the element to delete from the hash list.
78169 diff --git a/include/linux/reboot.h b/include/linux/reboot.h
78170 index 8e00f9f..9449b55 100644
78171 --- a/include/linux/reboot.h
78172 +++ b/include/linux/reboot.h
78173 @@ -43,9 +43,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
78174 * Architecture-specific implementations of sys_reboot commands.
78175 */
78176
78177 -extern void machine_restart(char *cmd);
78178 -extern void machine_halt(void);
78179 -extern void machine_power_off(void);
78180 +extern void machine_restart(char *cmd) __noreturn;
78181 +extern void machine_halt(void) __noreturn;
78182 +extern void machine_power_off(void) __noreturn;
78183
78184 extern void machine_shutdown(void);
78185 struct pt_regs;
78186 @@ -56,9 +56,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
78187 */
78188
78189 extern void kernel_restart_prepare(char *cmd);
78190 -extern void kernel_restart(char *cmd);
78191 -extern void kernel_halt(void);
78192 -extern void kernel_power_off(void);
78193 +extern void kernel_restart(char *cmd) __noreturn;
78194 +extern void kernel_halt(void) __noreturn;
78195 +extern void kernel_power_off(void) __noreturn;
78196
78197 extern int C_A_D; /* for sysctl */
78198 void ctrl_alt_del(void);
78199 @@ -72,7 +72,7 @@ extern int orderly_poweroff(bool force);
78200 * Emergency restart, callable from an interrupt handler.
78201 */
78202
78203 -extern void emergency_restart(void);
78204 +extern void emergency_restart(void) __noreturn;
78205 #include <asm/emergency-restart.h>
78206
78207 #endif /* _LINUX_REBOOT_H */
78208 diff --git a/include/linux/regset.h b/include/linux/regset.h
78209 index 8e0c9fe..ac4d221 100644
78210 --- a/include/linux/regset.h
78211 +++ b/include/linux/regset.h
78212 @@ -161,7 +161,8 @@ struct user_regset {
78213 unsigned int align;
78214 unsigned int bias;
78215 unsigned int core_note_type;
78216 -};
78217 +} __do_const;
78218 +typedef struct user_regset __no_const user_regset_no_const;
78219
78220 /**
78221 * struct user_regset_view - available regsets
78222 diff --git a/include/linux/relay.h b/include/linux/relay.h
78223 index d7c8359..818daf5 100644
78224 --- a/include/linux/relay.h
78225 +++ b/include/linux/relay.h
78226 @@ -157,7 +157,7 @@ struct rchan_callbacks
78227 * The callback should return 0 if successful, negative if not.
78228 */
78229 int (*remove_buf_file)(struct dentry *dentry);
78230 -};
78231 +} __no_const;
78232
78233 /*
78234 * CONFIG_RELAY kernel API, kernel/relay.c
78235 diff --git a/include/linux/rio.h b/include/linux/rio.h
78236 index b71d573..2f940bd 100644
78237 --- a/include/linux/rio.h
78238 +++ b/include/linux/rio.h
78239 @@ -355,7 +355,7 @@ struct rio_ops {
78240 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
78241 u64 rstart, u32 size, u32 flags);
78242 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
78243 -};
78244 +} __no_const;
78245
78246 #define RIO_RESOURCE_MEM 0x00000100
78247 #define RIO_RESOURCE_DOORBELL 0x00000200
78248 diff --git a/include/linux/rmap.h b/include/linux/rmap.h
78249 index 6dacb93..6174423 100644
78250 --- a/include/linux/rmap.h
78251 +++ b/include/linux/rmap.h
78252 @@ -145,8 +145,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
78253 void anon_vma_init(void); /* create anon_vma_cachep */
78254 int anon_vma_prepare(struct vm_area_struct *);
78255 void unlink_anon_vmas(struct vm_area_struct *);
78256 -int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
78257 -int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
78258 +int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
78259 +int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
78260
78261 static inline void anon_vma_merge(struct vm_area_struct *vma,
78262 struct vm_area_struct *next)
78263 diff --git a/include/linux/sched.h b/include/linux/sched.h
78264 index b1e963e..114b8fd 100644
78265 --- a/include/linux/sched.h
78266 +++ b/include/linux/sched.h
78267 @@ -62,6 +62,7 @@ struct bio_list;
78268 struct fs_struct;
78269 struct perf_event_context;
78270 struct blk_plug;
78271 +struct linux_binprm;
78272
78273 /*
78274 * List of flags we want to share for kernel threads,
78275 @@ -295,7 +296,7 @@ extern char __sched_text_start[], __sched_text_end[];
78276 extern int in_sched_functions(unsigned long addr);
78277
78278 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
78279 -extern signed long schedule_timeout(signed long timeout);
78280 +extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
78281 extern signed long schedule_timeout_interruptible(signed long timeout);
78282 extern signed long schedule_timeout_killable(signed long timeout);
78283 extern signed long schedule_timeout_uninterruptible(signed long timeout);
78284 @@ -306,6 +307,19 @@ struct nsproxy;
78285 struct user_namespace;
78286
78287 #ifdef CONFIG_MMU
78288 +
78289 +#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
78290 +extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
78291 +#else
78292 +static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
78293 +{
78294 + return 0;
78295 +}
78296 +#endif
78297 +
78298 +extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
78299 +extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
78300 +
78301 extern void arch_pick_mmap_layout(struct mm_struct *mm);
78302 extern unsigned long
78303 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
78304 @@ -585,6 +599,17 @@ struct signal_struct {
78305 #ifdef CONFIG_TASKSTATS
78306 struct taskstats *stats;
78307 #endif
78308 +
78309 +#ifdef CONFIG_GRKERNSEC
78310 + u32 curr_ip;
78311 + u32 saved_ip;
78312 + u32 gr_saddr;
78313 + u32 gr_daddr;
78314 + u16 gr_sport;
78315 + u16 gr_dport;
78316 + u8 used_accept:1;
78317 +#endif
78318 +
78319 #ifdef CONFIG_AUDIT
78320 unsigned audit_tty;
78321 unsigned audit_tty_log_passwd;
78322 @@ -665,6 +690,14 @@ struct user_struct {
78323 struct key *session_keyring; /* UID's default session keyring */
78324 #endif
78325
78326 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
78327 + unsigned char kernel_banned;
78328 +#endif
78329 +#ifdef CONFIG_GRKERNSEC_BRUTE
78330 + unsigned char suid_banned;
78331 + unsigned long suid_ban_expires;
78332 +#endif
78333 +
78334 /* Hash table maintenance information */
78335 struct hlist_node uidhash_node;
78336 kuid_t uid;
78337 @@ -1150,8 +1183,8 @@ struct task_struct {
78338 struct list_head thread_group;
78339
78340 struct completion *vfork_done; /* for vfork() */
78341 - int __user *set_child_tid; /* CLONE_CHILD_SETTID */
78342 - int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
78343 + pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
78344 + pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
78345
78346 cputime_t utime, stime, utimescaled, stimescaled;
78347 cputime_t gtime;
78348 @@ -1176,11 +1209,6 @@ struct task_struct {
78349 struct task_cputime cputime_expires;
78350 struct list_head cpu_timers[3];
78351
78352 -/* process credentials */
78353 - const struct cred __rcu *real_cred; /* objective and real subjective task
78354 - * credentials (COW) */
78355 - const struct cred __rcu *cred; /* effective (overridable) subjective task
78356 - * credentials (COW) */
78357 char comm[TASK_COMM_LEN]; /* executable name excluding path
78358 - access with [gs]et_task_comm (which lock
78359 it with task_lock())
78360 @@ -1197,6 +1225,10 @@ struct task_struct {
78361 #endif
78362 /* CPU-specific state of this task */
78363 struct thread_struct thread;
78364 +/* thread_info moved to task_struct */
78365 +#ifdef CONFIG_X86
78366 + struct thread_info tinfo;
78367 +#endif
78368 /* filesystem information */
78369 struct fs_struct *fs;
78370 /* open file information */
78371 @@ -1270,6 +1302,10 @@ struct task_struct {
78372 gfp_t lockdep_reclaim_gfp;
78373 #endif
78374
78375 +/* process credentials */
78376 + const struct cred __rcu *real_cred; /* objective and real subjective task
78377 + * credentials (COW) */
78378 +
78379 /* journalling filesystem info */
78380 void *journal_info;
78381
78382 @@ -1308,6 +1344,10 @@ struct task_struct {
78383 /* cg_list protected by css_set_lock and tsk->alloc_lock */
78384 struct list_head cg_list;
78385 #endif
78386 +
78387 + const struct cred __rcu *cred; /* effective (overridable) subjective task
78388 + * credentials (COW) */
78389 +
78390 #ifdef CONFIG_FUTEX
78391 struct robust_list_head __user *robust_list;
78392 #ifdef CONFIG_COMPAT
78393 @@ -1411,8 +1451,78 @@ struct task_struct {
78394 unsigned int sequential_io;
78395 unsigned int sequential_io_avg;
78396 #endif
78397 +
78398 +#ifdef CONFIG_GRKERNSEC
78399 + /* grsecurity */
78400 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
78401 + u64 exec_id;
78402 +#endif
78403 +#ifdef CONFIG_GRKERNSEC_SETXID
78404 + const struct cred *delayed_cred;
78405 +#endif
78406 + struct dentry *gr_chroot_dentry;
78407 + struct acl_subject_label *acl;
78408 + struct acl_subject_label *tmpacl;
78409 + struct acl_role_label *role;
78410 + struct file *exec_file;
78411 + unsigned long brute_expires;
78412 + u16 acl_role_id;
78413 + u8 inherited;
78414 + /* is this the task that authenticated to the special role */
78415 + u8 acl_sp_role;
78416 + u8 is_writable;
78417 + u8 brute;
78418 + u8 gr_is_chrooted;
78419 +#endif
78420 +
78421 };
78422
78423 +#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
78424 +#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
78425 +#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
78426 +#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
78427 +/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
78428 +#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
78429 +
78430 +#ifdef CONFIG_PAX_SOFTMODE
78431 +extern int pax_softmode;
78432 +#endif
78433 +
78434 +extern int pax_check_flags(unsigned long *);
78435 +
78436 +/* if tsk != current then task_lock must be held on it */
78437 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
78438 +static inline unsigned long pax_get_flags(struct task_struct *tsk)
78439 +{
78440 + if (likely(tsk->mm))
78441 + return tsk->mm->pax_flags;
78442 + else
78443 + return 0UL;
78444 +}
78445 +
78446 +/* if tsk != current then task_lock must be held on it */
78447 +static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
78448 +{
78449 + if (likely(tsk->mm)) {
78450 + tsk->mm->pax_flags = flags;
78451 + return 0;
78452 + }
78453 + return -EINVAL;
78454 +}
78455 +#endif
78456 +
78457 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
78458 +extern void pax_set_initial_flags(struct linux_binprm *bprm);
78459 +#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
78460 +extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
78461 +#endif
78462 +
78463 +struct path;
78464 +extern char *pax_get_path(const struct path *path, char *buf, int buflen);
78465 +extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
78466 +extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
78467 +extern void pax_report_refcount_overflow(struct pt_regs *regs);
78468 +
78469 /* Future-safe accessor for struct task_struct's cpus_allowed. */
78470 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
78471
78472 @@ -1471,7 +1581,7 @@ struct pid_namespace;
78473 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
78474 struct pid_namespace *ns);
78475
78476 -static inline pid_t task_pid_nr(struct task_struct *tsk)
78477 +static inline pid_t task_pid_nr(const struct task_struct *tsk)
78478 {
78479 return tsk->pid;
78480 }
78481 @@ -1921,7 +2031,9 @@ void yield(void);
78482 extern struct exec_domain default_exec_domain;
78483
78484 union thread_union {
78485 +#ifndef CONFIG_X86
78486 struct thread_info thread_info;
78487 +#endif
78488 unsigned long stack[THREAD_SIZE/sizeof(long)];
78489 };
78490
78491 @@ -1954,6 +2066,7 @@ extern struct pid_namespace init_pid_ns;
78492 */
78493
78494 extern struct task_struct *find_task_by_vpid(pid_t nr);
78495 +extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
78496 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
78497 struct pid_namespace *ns);
78498
78499 @@ -2118,7 +2231,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
78500 extern void exit_itimers(struct signal_struct *);
78501 extern void flush_itimer_signals(void);
78502
78503 -extern void do_group_exit(int);
78504 +extern __noreturn void do_group_exit(int);
78505
78506 extern int allow_signal(int);
78507 extern int disallow_signal(int);
78508 @@ -2309,9 +2422,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
78509
78510 #endif
78511
78512 -static inline int object_is_on_stack(void *obj)
78513 +static inline int object_starts_on_stack(void *obj)
78514 {
78515 - void *stack = task_stack_page(current);
78516 + const void *stack = task_stack_page(current);
78517
78518 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
78519 }
78520 diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
78521 index bf8086b..962b035 100644
78522 --- a/include/linux/sched/sysctl.h
78523 +++ b/include/linux/sched/sysctl.h
78524 @@ -30,6 +30,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
78525 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
78526
78527 extern int sysctl_max_map_count;
78528 +extern unsigned long sysctl_heap_stack_gap;
78529
78530 extern unsigned int sysctl_sched_latency;
78531 extern unsigned int sysctl_sched_min_granularity;
78532 diff --git a/include/linux/security.h b/include/linux/security.h
78533 index 9d37e2b..43368e4 100644
78534 --- a/include/linux/security.h
78535 +++ b/include/linux/security.h
78536 @@ -27,6 +27,7 @@
78537 #include <linux/slab.h>
78538 #include <linux/err.h>
78539 #include <linux/string.h>
78540 +#include <linux/grsecurity.h>
78541
78542 struct linux_binprm;
78543 struct cred;
78544 @@ -116,8 +117,6 @@ struct seq_file;
78545
78546 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
78547
78548 -void reset_security_ops(void);
78549 -
78550 #ifdef CONFIG_MMU
78551 extern unsigned long mmap_min_addr;
78552 extern unsigned long dac_mmap_min_addr;
78553 diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
78554 index dc368b8..e895209 100644
78555 --- a/include/linux/semaphore.h
78556 +++ b/include/linux/semaphore.h
78557 @@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
78558 }
78559
78560 extern void down(struct semaphore *sem);
78561 -extern int __must_check down_interruptible(struct semaphore *sem);
78562 +extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
78563 extern int __must_check down_killable(struct semaphore *sem);
78564 extern int __must_check down_trylock(struct semaphore *sem);
78565 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
78566 diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
78567 index 4e32edc..f8f2d18 100644
78568 --- a/include/linux/seq_file.h
78569 +++ b/include/linux/seq_file.h
78570 @@ -26,6 +26,9 @@ struct seq_file {
78571 struct mutex lock;
78572 const struct seq_operations *op;
78573 int poll_event;
78574 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
78575 + u64 exec_id;
78576 +#endif
78577 #ifdef CONFIG_USER_NS
78578 struct user_namespace *user_ns;
78579 #endif
78580 @@ -38,6 +41,7 @@ struct seq_operations {
78581 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
78582 int (*show) (struct seq_file *m, void *v);
78583 };
78584 +typedef struct seq_operations __no_const seq_operations_no_const;
78585
78586 #define SEQ_SKIP 1
78587
78588 diff --git a/include/linux/shm.h b/include/linux/shm.h
78589 index 429c199..4d42e38 100644
78590 --- a/include/linux/shm.h
78591 +++ b/include/linux/shm.h
78592 @@ -21,6 +21,10 @@ struct shmid_kernel /* private to the kernel */
78593
78594 /* The task created the shm object. NULL if the task is dead. */
78595 struct task_struct *shm_creator;
78596 +#ifdef CONFIG_GRKERNSEC
78597 + time_t shm_createtime;
78598 + pid_t shm_lapid;
78599 +#endif
78600 };
78601
78602 /* shm_mode upper byte flags */
78603 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
78604 index f66f346..2e304d5 100644
78605 --- a/include/linux/skbuff.h
78606 +++ b/include/linux/skbuff.h
78607 @@ -639,7 +639,7 @@ extern bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
78608 extern struct sk_buff *__alloc_skb(unsigned int size,
78609 gfp_t priority, int flags, int node);
78610 extern struct sk_buff *build_skb(void *data, unsigned int frag_size);
78611 -static inline struct sk_buff *alloc_skb(unsigned int size,
78612 +static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
78613 gfp_t priority)
78614 {
78615 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
78616 @@ -755,7 +755,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
78617 */
78618 static inline int skb_queue_empty(const struct sk_buff_head *list)
78619 {
78620 - return list->next == (struct sk_buff *)list;
78621 + return list->next == (const struct sk_buff *)list;
78622 }
78623
78624 /**
78625 @@ -768,7 +768,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
78626 static inline bool skb_queue_is_last(const struct sk_buff_head *list,
78627 const struct sk_buff *skb)
78628 {
78629 - return skb->next == (struct sk_buff *)list;
78630 + return skb->next == (const struct sk_buff *)list;
78631 }
78632
78633 /**
78634 @@ -781,7 +781,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
78635 static inline bool skb_queue_is_first(const struct sk_buff_head *list,
78636 const struct sk_buff *skb)
78637 {
78638 - return skb->prev == (struct sk_buff *)list;
78639 + return skb->prev == (const struct sk_buff *)list;
78640 }
78641
78642 /**
78643 @@ -1741,7 +1741,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
78644 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
78645 */
78646 #ifndef NET_SKB_PAD
78647 -#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
78648 +#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
78649 #endif
78650
78651 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
78652 @@ -2339,7 +2339,7 @@ extern struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags,
78653 int noblock, int *err);
78654 extern unsigned int datagram_poll(struct file *file, struct socket *sock,
78655 struct poll_table_struct *wait);
78656 -extern int skb_copy_datagram_iovec(const struct sk_buff *from,
78657 +extern int __intentional_overflow(0) skb_copy_datagram_iovec(const struct sk_buff *from,
78658 int offset, struct iovec *to,
78659 int size);
78660 extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
78661 @@ -2618,6 +2618,9 @@ static inline void nf_reset(struct sk_buff *skb)
78662 nf_bridge_put(skb->nf_bridge);
78663 skb->nf_bridge = NULL;
78664 #endif
78665 +#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
78666 + skb->nf_trace = 0;
78667 +#endif
78668 }
78669
78670 static inline void nf_reset_trace(struct sk_buff *skb)
78671 diff --git a/include/linux/slab.h b/include/linux/slab.h
78672 index 74f1058..914b7da 100644
78673 --- a/include/linux/slab.h
78674 +++ b/include/linux/slab.h
78675 @@ -14,15 +14,29 @@
78676 #include <linux/gfp.h>
78677 #include <linux/types.h>
78678 #include <linux/workqueue.h>
78679 -
78680 +#include <linux/err.h>
78681
78682 /*
78683 * Flags to pass to kmem_cache_create().
78684 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
78685 */
78686 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
78687 +
78688 +#ifdef CONFIG_PAX_USERCOPY_SLABS
78689 +#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
78690 +#else
78691 +#define SLAB_USERCOPY 0x00000000UL
78692 +#endif
78693 +
78694 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
78695 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
78696 +
78697 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
78698 +#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
78699 +#else
78700 +#define SLAB_NO_SANITIZE 0x00000000UL
78701 +#endif
78702 +
78703 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
78704 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
78705 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
78706 @@ -91,10 +105,13 @@
78707 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
78708 * Both make kfree a no-op.
78709 */
78710 -#define ZERO_SIZE_PTR ((void *)16)
78711 +#define ZERO_SIZE_PTR \
78712 +({ \
78713 + BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
78714 + (void *)(-MAX_ERRNO-1L); \
78715 +})
78716
78717 -#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
78718 - (unsigned long)ZERO_SIZE_PTR)
78719 +#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
78720
78721 #include <linux/kmemleak.h>
78722
78723 @@ -135,6 +152,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
78724 void kfree(const void *);
78725 void kzfree(const void *);
78726 size_t ksize(const void *);
78727 +const char *check_heap_object(const void *ptr, unsigned long n);
78728 +bool is_usercopy_object(const void *ptr);
78729
78730 /*
78731 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
78732 @@ -167,7 +186,7 @@ struct kmem_cache {
78733 unsigned int align; /* Alignment as calculated */
78734 unsigned long flags; /* Active flags on the slab */
78735 const char *name; /* Slab name for sysfs */
78736 - int refcount; /* Use counter */
78737 + atomic_t refcount; /* Use counter */
78738 void (*ctor)(void *); /* Called on object slot creation */
78739 struct list_head list; /* List of all slab caches on the system */
78740 };
78741 @@ -241,6 +260,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
78742 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
78743 #endif
78744
78745 +#ifdef CONFIG_PAX_USERCOPY_SLABS
78746 +extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
78747 +#endif
78748 +
78749 /*
78750 * Figure out which kmalloc slab an allocation of a certain size
78751 * belongs to.
78752 @@ -249,7 +272,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
78753 * 2 = 120 .. 192 bytes
78754 * n = 2^(n-1) .. 2^n -1
78755 */
78756 -static __always_inline int kmalloc_index(size_t size)
78757 +static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
78758 {
78759 if (!size)
78760 return 0;
78761 @@ -292,11 +315,11 @@ static __always_inline int kmalloc_index(size_t size)
78762 }
78763 #endif /* !CONFIG_SLOB */
78764
78765 -void *__kmalloc(size_t size, gfp_t flags);
78766 +void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
78767 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
78768
78769 #ifdef CONFIG_NUMA
78770 -void *__kmalloc_node(size_t size, gfp_t flags, int node);
78771 +void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1);
78772 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
78773 #else
78774 static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
78775 diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
78776 index e9346b4..1494959 100644
78777 --- a/include/linux/slab_def.h
78778 +++ b/include/linux/slab_def.h
78779 @@ -36,7 +36,7 @@ struct kmem_cache {
78780 /* 4) cache creation/removal */
78781 const char *name;
78782 struct list_head list;
78783 - int refcount;
78784 + atomic_t refcount;
78785 int object_size;
78786 int align;
78787
78788 @@ -52,10 +52,14 @@ struct kmem_cache {
78789 unsigned long node_allocs;
78790 unsigned long node_frees;
78791 unsigned long node_overflow;
78792 - atomic_t allochit;
78793 - atomic_t allocmiss;
78794 - atomic_t freehit;
78795 - atomic_t freemiss;
78796 + atomic_unchecked_t allochit;
78797 + atomic_unchecked_t allocmiss;
78798 + atomic_unchecked_t freehit;
78799 + atomic_unchecked_t freemiss;
78800 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
78801 + atomic_unchecked_t sanitized;
78802 + atomic_unchecked_t not_sanitized;
78803 +#endif
78804
78805 /*
78806 * If debugging is enabled, then the allocator can add additional
78807 diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
78808 index cc0b67e..a0329b1 100644
78809 --- a/include/linux/slub_def.h
78810 +++ b/include/linux/slub_def.h
78811 @@ -74,7 +74,7 @@ struct kmem_cache {
78812 struct kmem_cache_order_objects max;
78813 struct kmem_cache_order_objects min;
78814 gfp_t allocflags; /* gfp flags to use on each alloc */
78815 - int refcount; /* Refcount for slab cache destroy */
78816 + atomic_t refcount; /* Refcount for slab cache destroy */
78817 void (*ctor)(void *);
78818 int inuse; /* Offset to metadata */
78819 int align; /* Alignment */
78820 diff --git a/include/linux/smp.h b/include/linux/smp.h
78821 index 731f523..3340268 100644
78822 --- a/include/linux/smp.h
78823 +++ b/include/linux/smp.h
78824 @@ -186,7 +186,9 @@ static inline void __smp_call_function_single(int cpuid,
78825 #endif
78826
78827 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
78828 +#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
78829 #define put_cpu() preempt_enable()
78830 +#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
78831
78832 /*
78833 * Callback to arch code if there's nosmp or maxcpus=0 on the
78834 diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
78835 index 54f91d3..be2c379 100644
78836 --- a/include/linux/sock_diag.h
78837 +++ b/include/linux/sock_diag.h
78838 @@ -11,7 +11,7 @@ struct sock;
78839 struct sock_diag_handler {
78840 __u8 family;
78841 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
78842 -};
78843 +} __do_const;
78844
78845 int sock_diag_register(const struct sock_diag_handler *h);
78846 void sock_diag_unregister(const struct sock_diag_handler *h);
78847 diff --git a/include/linux/sonet.h b/include/linux/sonet.h
78848 index 680f9a3..f13aeb0 100644
78849 --- a/include/linux/sonet.h
78850 +++ b/include/linux/sonet.h
78851 @@ -7,7 +7,7 @@
78852 #include <uapi/linux/sonet.h>
78853
78854 struct k_sonet_stats {
78855 -#define __HANDLE_ITEM(i) atomic_t i
78856 +#define __HANDLE_ITEM(i) atomic_unchecked_t i
78857 __SONET_ITEMS
78858 #undef __HANDLE_ITEM
78859 };
78860 diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
78861 index 07d8e53..dc934c9 100644
78862 --- a/include/linux/sunrpc/addr.h
78863 +++ b/include/linux/sunrpc/addr.h
78864 @@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
78865 {
78866 switch (sap->sa_family) {
78867 case AF_INET:
78868 - return ntohs(((struct sockaddr_in *)sap)->sin_port);
78869 + return ntohs(((const struct sockaddr_in *)sap)->sin_port);
78870 case AF_INET6:
78871 - return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
78872 + return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
78873 }
78874 return 0;
78875 }
78876 @@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
78877 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
78878 const struct sockaddr *src)
78879 {
78880 - const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
78881 + const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
78882 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
78883
78884 dsin->sin_family = ssin->sin_family;
78885 @@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
78886 if (sa->sa_family != AF_INET6)
78887 return 0;
78888
78889 - return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
78890 + return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
78891 }
78892
78893 #endif /* _LINUX_SUNRPC_ADDR_H */
78894 diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
78895 index 6740801..c535f27 100644
78896 --- a/include/linux/sunrpc/clnt.h
78897 +++ b/include/linux/sunrpc/clnt.h
78898 @@ -96,7 +96,7 @@ struct rpc_procinfo {
78899 unsigned int p_timer; /* Which RTT timer to use */
78900 u32 p_statidx; /* Which procedure to account */
78901 const char * p_name; /* name of procedure */
78902 -};
78903 +} __do_const;
78904
78905 #ifdef __KERNEL__
78906
78907 diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
78908 index 6eecfc2..7ada79d 100644
78909 --- a/include/linux/sunrpc/svc.h
78910 +++ b/include/linux/sunrpc/svc.h
78911 @@ -410,7 +410,7 @@ struct svc_procedure {
78912 unsigned int pc_count; /* call count */
78913 unsigned int pc_cachetype; /* cache info (NFS) */
78914 unsigned int pc_xdrressize; /* maximum size of XDR reply */
78915 -};
78916 +} __do_const;
78917
78918 /*
78919 * Function prototypes.
78920 diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
78921 index 0b8e3e6..33e0a01 100644
78922 --- a/include/linux/sunrpc/svc_rdma.h
78923 +++ b/include/linux/sunrpc/svc_rdma.h
78924 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
78925 extern unsigned int svcrdma_max_requests;
78926 extern unsigned int svcrdma_max_req_size;
78927
78928 -extern atomic_t rdma_stat_recv;
78929 -extern atomic_t rdma_stat_read;
78930 -extern atomic_t rdma_stat_write;
78931 -extern atomic_t rdma_stat_sq_starve;
78932 -extern atomic_t rdma_stat_rq_starve;
78933 -extern atomic_t rdma_stat_rq_poll;
78934 -extern atomic_t rdma_stat_rq_prod;
78935 -extern atomic_t rdma_stat_sq_poll;
78936 -extern atomic_t rdma_stat_sq_prod;
78937 +extern atomic_unchecked_t rdma_stat_recv;
78938 +extern atomic_unchecked_t rdma_stat_read;
78939 +extern atomic_unchecked_t rdma_stat_write;
78940 +extern atomic_unchecked_t rdma_stat_sq_starve;
78941 +extern atomic_unchecked_t rdma_stat_rq_starve;
78942 +extern atomic_unchecked_t rdma_stat_rq_poll;
78943 +extern atomic_unchecked_t rdma_stat_rq_prod;
78944 +extern atomic_unchecked_t rdma_stat_sq_poll;
78945 +extern atomic_unchecked_t rdma_stat_sq_prod;
78946
78947 #define RPCRDMA_VERSION 1
78948
78949 diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
78950 index 8d71d65..f79586e 100644
78951 --- a/include/linux/sunrpc/svcauth.h
78952 +++ b/include/linux/sunrpc/svcauth.h
78953 @@ -120,7 +120,7 @@ struct auth_ops {
78954 int (*release)(struct svc_rqst *rq);
78955 void (*domain_release)(struct auth_domain *);
78956 int (*set_client)(struct svc_rqst *rq);
78957 -};
78958 +} __do_const;
78959
78960 #define SVC_GARBAGE 1
78961 #define SVC_SYSERR 2
78962 diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
78963 index a5ffd32..0935dea 100644
78964 --- a/include/linux/swiotlb.h
78965 +++ b/include/linux/swiotlb.h
78966 @@ -60,7 +60,8 @@ extern void
78967
78968 extern void
78969 swiotlb_free_coherent(struct device *hwdev, size_t size,
78970 - void *vaddr, dma_addr_t dma_handle);
78971 + void *vaddr, dma_addr_t dma_handle,
78972 + struct dma_attrs *attrs);
78973
78974 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
78975 unsigned long offset, size_t size,
78976 diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
78977 index 7fac04e..de57300 100644
78978 --- a/include/linux/syscalls.h
78979 +++ b/include/linux/syscalls.h
78980 @@ -97,8 +97,14 @@ struct sigaltstack;
78981 #define __MAP(n,...) __MAP##n(__VA_ARGS__)
78982
78983 #define __SC_DECL(t, a) t a
78984 +#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))
78985 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
78986 -#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
78987 +#define __SC_LONG(t, a) __typeof( \
78988 + __builtin_choose_expr( \
78989 + sizeof(t) > sizeof(int), \
78990 + (t) 0, \
78991 + __builtin_choose_expr(__TYPE_IS_U(t), 0UL, 0L) \
78992 + )) a
78993 #define __SC_CAST(t, a) (t) a
78994 #define __SC_ARGS(t, a) a
78995 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
78996 @@ -363,11 +369,11 @@ asmlinkage long sys_sync(void);
78997 asmlinkage long sys_fsync(unsigned int fd);
78998 asmlinkage long sys_fdatasync(unsigned int fd);
78999 asmlinkage long sys_bdflush(int func, long data);
79000 -asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
79001 - char __user *type, unsigned long flags,
79002 +asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
79003 + const char __user *type, unsigned long flags,
79004 void __user *data);
79005 -asmlinkage long sys_umount(char __user *name, int flags);
79006 -asmlinkage long sys_oldumount(char __user *name);
79007 +asmlinkage long sys_umount(const char __user *name, int flags);
79008 +asmlinkage long sys_oldumount(const char __user *name);
79009 asmlinkage long sys_truncate(const char __user *path, long length);
79010 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
79011 asmlinkage long sys_stat(const char __user *filename,
79012 @@ -579,7 +585,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
79013 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
79014 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
79015 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
79016 - struct sockaddr __user *, int);
79017 + struct sockaddr __user *, int) __intentional_overflow(0);
79018 asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);
79019 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
79020 unsigned int vlen, unsigned flags);
79021 diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
79022 index 27b3b0b..e093dd9 100644
79023 --- a/include/linux/syscore_ops.h
79024 +++ b/include/linux/syscore_ops.h
79025 @@ -16,7 +16,7 @@ struct syscore_ops {
79026 int (*suspend)(void);
79027 void (*resume)(void);
79028 void (*shutdown)(void);
79029 -};
79030 +} __do_const;
79031
79032 extern void register_syscore_ops(struct syscore_ops *ops);
79033 extern void unregister_syscore_ops(struct syscore_ops *ops);
79034 diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
79035 index 14a8ff2..af52bad 100644
79036 --- a/include/linux/sysctl.h
79037 +++ b/include/linux/sysctl.h
79038 @@ -34,13 +34,13 @@ struct ctl_table_root;
79039 struct ctl_table_header;
79040 struct ctl_dir;
79041
79042 -typedef struct ctl_table ctl_table;
79043 -
79044 typedef int proc_handler (struct ctl_table *ctl, int write,
79045 void __user *buffer, size_t *lenp, loff_t *ppos);
79046
79047 extern int proc_dostring(struct ctl_table *, int,
79048 void __user *, size_t *, loff_t *);
79049 +extern int proc_dostring_modpriv(struct ctl_table *, int,
79050 + void __user *, size_t *, loff_t *);
79051 extern int proc_dointvec(struct ctl_table *, int,
79052 void __user *, size_t *, loff_t *);
79053 extern int proc_dointvec_minmax(struct ctl_table *, int,
79054 @@ -115,7 +115,9 @@ struct ctl_table
79055 struct ctl_table_poll *poll;
79056 void *extra1;
79057 void *extra2;
79058 -};
79059 +} __do_const;
79060 +typedef struct ctl_table __no_const ctl_table_no_const;
79061 +typedef struct ctl_table ctl_table;
79062
79063 struct ctl_node {
79064 struct rb_node node;
79065 diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
79066 index 11baec7..706f99f 100644
79067 --- a/include/linux/sysfs.h
79068 +++ b/include/linux/sysfs.h
79069 @@ -33,7 +33,8 @@ struct attribute {
79070 struct lock_class_key *key;
79071 struct lock_class_key skey;
79072 #endif
79073 -};
79074 +} __do_const;
79075 +typedef struct attribute __no_const attribute_no_const;
79076
79077 /**
79078 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
79079 @@ -62,7 +63,8 @@ struct attribute_group {
79080 struct attribute *, int);
79081 struct attribute **attrs;
79082 struct bin_attribute **bin_attrs;
79083 -};
79084 +} __do_const;
79085 +typedef struct attribute_group __no_const attribute_group_no_const;
79086
79087 /**
79088 * Use these macros to make defining attributes easier. See include/linux/device.h
79089 @@ -126,7 +128,8 @@ struct bin_attribute {
79090 char *, loff_t, size_t);
79091 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
79092 struct vm_area_struct *vma);
79093 -};
79094 +} __do_const;
79095 +typedef struct bin_attribute __no_const bin_attribute_no_const;
79096
79097 /**
79098 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
79099 diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
79100 index 7faf933..9b85a0c 100644
79101 --- a/include/linux/sysrq.h
79102 +++ b/include/linux/sysrq.h
79103 @@ -16,6 +16,7 @@
79104
79105 #include <linux/errno.h>
79106 #include <linux/types.h>
79107 +#include <linux/compiler.h>
79108
79109 /* Enable/disable SYSRQ support by default (0==no, 1==yes). */
79110 #define SYSRQ_DEFAULT_ENABLE 1
79111 @@ -36,7 +37,7 @@ struct sysrq_key_op {
79112 char *help_msg;
79113 char *action_msg;
79114 int enable_mask;
79115 -};
79116 +} __do_const;
79117
79118 #ifdef CONFIG_MAGIC_SYSRQ
79119
79120 diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
79121 index 4ae6f32..425d3e1 100644
79122 --- a/include/linux/thread_info.h
79123 +++ b/include/linux/thread_info.h
79124 @@ -150,6 +150,15 @@ static inline bool test_and_clear_restore_sigmask(void)
79125 #error "no set_restore_sigmask() provided and default one won't work"
79126 #endif
79127
79128 +extern void __check_object_size(const void *ptr, unsigned long n, bool to_user);
79129 +static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
79130 +{
79131 +#ifndef CONFIG_PAX_USERCOPY_DEBUG
79132 + if (!__builtin_constant_p(n))
79133 +#endif
79134 + __check_object_size(ptr, n, to_user);
79135 +}
79136 +
79137 #endif /* __KERNEL__ */
79138
79139 #endif /* _LINUX_THREAD_INFO_H */
79140 diff --git a/include/linux/tty.h b/include/linux/tty.h
79141 index 64f8646..1515fc7 100644
79142 --- a/include/linux/tty.h
79143 +++ b/include/linux/tty.h
79144 @@ -197,7 +197,7 @@ struct tty_port {
79145 const struct tty_port_operations *ops; /* Port operations */
79146 spinlock_t lock; /* Lock protecting tty field */
79147 int blocked_open; /* Waiting to open */
79148 - int count; /* Usage count */
79149 + atomic_t count; /* Usage count */
79150 wait_queue_head_t open_wait; /* Open waiters */
79151 wait_queue_head_t close_wait; /* Close waiters */
79152 wait_queue_head_t delta_msr_wait; /* Modem status change */
79153 @@ -546,7 +546,7 @@ extern int tty_port_open(struct tty_port *port,
79154 struct tty_struct *tty, struct file *filp);
79155 static inline int tty_port_users(struct tty_port *port)
79156 {
79157 - return port->count + port->blocked_open;
79158 + return atomic_read(&port->count) + port->blocked_open;
79159 }
79160
79161 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
79162 diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
79163 index 756a609..b302dd6 100644
79164 --- a/include/linux/tty_driver.h
79165 +++ b/include/linux/tty_driver.h
79166 @@ -285,7 +285,7 @@ struct tty_operations {
79167 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
79168 #endif
79169 const struct file_operations *proc_fops;
79170 -};
79171 +} __do_const;
79172
79173 struct tty_driver {
79174 int magic; /* magic number for this structure */
79175 diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
79176 index f15c898..207b7d1 100644
79177 --- a/include/linux/tty_ldisc.h
79178 +++ b/include/linux/tty_ldisc.h
79179 @@ -211,7 +211,7 @@ struct tty_ldisc_ops {
79180
79181 struct module *owner;
79182
79183 - int refcount;
79184 + atomic_t refcount;
79185 };
79186
79187 struct tty_ldisc {
79188 diff --git a/include/linux/types.h b/include/linux/types.h
79189 index 4d118ba..c3ee9bf 100644
79190 --- a/include/linux/types.h
79191 +++ b/include/linux/types.h
79192 @@ -176,10 +176,26 @@ typedef struct {
79193 int counter;
79194 } atomic_t;
79195
79196 +#ifdef CONFIG_PAX_REFCOUNT
79197 +typedef struct {
79198 + int counter;
79199 +} atomic_unchecked_t;
79200 +#else
79201 +typedef atomic_t atomic_unchecked_t;
79202 +#endif
79203 +
79204 #ifdef CONFIG_64BIT
79205 typedef struct {
79206 long counter;
79207 } atomic64_t;
79208 +
79209 +#ifdef CONFIG_PAX_REFCOUNT
79210 +typedef struct {
79211 + long counter;
79212 +} atomic64_unchecked_t;
79213 +#else
79214 +typedef atomic64_t atomic64_unchecked_t;
79215 +#endif
79216 #endif
79217
79218 struct list_head {
79219 diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
79220 index 5ca0951..ab496a5 100644
79221 --- a/include/linux/uaccess.h
79222 +++ b/include/linux/uaccess.h
79223 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
79224 long ret; \
79225 mm_segment_t old_fs = get_fs(); \
79226 \
79227 - set_fs(KERNEL_DS); \
79228 pagefault_disable(); \
79229 - ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
79230 - pagefault_enable(); \
79231 + set_fs(KERNEL_DS); \
79232 + ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
79233 set_fs(old_fs); \
79234 + pagefault_enable(); \
79235 ret; \
79236 })
79237
79238 diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
79239 index 8e522cbc..aa8572d 100644
79240 --- a/include/linux/uidgid.h
79241 +++ b/include/linux/uidgid.h
79242 @@ -197,4 +197,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
79243
79244 #endif /* CONFIG_USER_NS */
79245
79246 +#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
79247 +#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
79248 +#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
79249 +#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
79250 +
79251 #endif /* _LINUX_UIDGID_H */
79252 diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
79253 index 99c1b4d..562e6f3 100644
79254 --- a/include/linux/unaligned/access_ok.h
79255 +++ b/include/linux/unaligned/access_ok.h
79256 @@ -4,34 +4,34 @@
79257 #include <linux/kernel.h>
79258 #include <asm/byteorder.h>
79259
79260 -static inline u16 get_unaligned_le16(const void *p)
79261 +static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
79262 {
79263 - return le16_to_cpup((__le16 *)p);
79264 + return le16_to_cpup((const __le16 *)p);
79265 }
79266
79267 -static inline u32 get_unaligned_le32(const void *p)
79268 +static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
79269 {
79270 - return le32_to_cpup((__le32 *)p);
79271 + return le32_to_cpup((const __le32 *)p);
79272 }
79273
79274 -static inline u64 get_unaligned_le64(const void *p)
79275 +static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
79276 {
79277 - return le64_to_cpup((__le64 *)p);
79278 + return le64_to_cpup((const __le64 *)p);
79279 }
79280
79281 -static inline u16 get_unaligned_be16(const void *p)
79282 +static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
79283 {
79284 - return be16_to_cpup((__be16 *)p);
79285 + return be16_to_cpup((const __be16 *)p);
79286 }
79287
79288 -static inline u32 get_unaligned_be32(const void *p)
79289 +static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
79290 {
79291 - return be32_to_cpup((__be32 *)p);
79292 + return be32_to_cpup((const __be32 *)p);
79293 }
79294
79295 -static inline u64 get_unaligned_be64(const void *p)
79296 +static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
79297 {
79298 - return be64_to_cpup((__be64 *)p);
79299 + return be64_to_cpup((const __be64 *)p);
79300 }
79301
79302 static inline void put_unaligned_le16(u16 val, void *p)
79303 diff --git a/include/linux/usb.h b/include/linux/usb.h
79304 index 6b02370..2355ffa 100644
79305 --- a/include/linux/usb.h
79306 +++ b/include/linux/usb.h
79307 @@ -563,7 +563,7 @@ struct usb_device {
79308 int maxchild;
79309
79310 u32 quirks;
79311 - atomic_t urbnum;
79312 + atomic_unchecked_t urbnum;
79313
79314 unsigned long active_duration;
79315
79316 @@ -1639,7 +1639,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
79317
79318 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
79319 __u8 request, __u8 requesttype, __u16 value, __u16 index,
79320 - void *data, __u16 size, int timeout);
79321 + void *data, __u16 size, int timeout) __intentional_overflow(-1);
79322 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
79323 void *data, int len, int *actual_length, int timeout);
79324 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
79325 diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
79326 index e452ba6..78f8e80 100644
79327 --- a/include/linux/usb/renesas_usbhs.h
79328 +++ b/include/linux/usb/renesas_usbhs.h
79329 @@ -39,7 +39,7 @@ enum {
79330 */
79331 struct renesas_usbhs_driver_callback {
79332 int (*notify_hotplug)(struct platform_device *pdev);
79333 -};
79334 +} __no_const;
79335
79336 /*
79337 * callback functions for platform
79338 diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
79339 index 6f8fbcf..8259001 100644
79340 --- a/include/linux/vermagic.h
79341 +++ b/include/linux/vermagic.h
79342 @@ -25,9 +25,35 @@
79343 #define MODULE_ARCH_VERMAGIC ""
79344 #endif
79345
79346 +#ifdef CONFIG_PAX_REFCOUNT
79347 +#define MODULE_PAX_REFCOUNT "REFCOUNT "
79348 +#else
79349 +#define MODULE_PAX_REFCOUNT ""
79350 +#endif
79351 +
79352 +#ifdef CONSTIFY_PLUGIN
79353 +#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
79354 +#else
79355 +#define MODULE_CONSTIFY_PLUGIN ""
79356 +#endif
79357 +
79358 +#ifdef STACKLEAK_PLUGIN
79359 +#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
79360 +#else
79361 +#define MODULE_STACKLEAK_PLUGIN ""
79362 +#endif
79363 +
79364 +#ifdef CONFIG_GRKERNSEC
79365 +#define MODULE_GRSEC "GRSEC "
79366 +#else
79367 +#define MODULE_GRSEC ""
79368 +#endif
79369 +
79370 #define VERMAGIC_STRING \
79371 UTS_RELEASE " " \
79372 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
79373 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
79374 - MODULE_ARCH_VERMAGIC
79375 + MODULE_ARCH_VERMAGIC \
79376 + MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
79377 + MODULE_GRSEC
79378
79379 diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
79380 index 502073a..a7de024 100644
79381 --- a/include/linux/vga_switcheroo.h
79382 +++ b/include/linux/vga_switcheroo.h
79383 @@ -63,8 +63,8 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
79384
79385 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
79386
79387 -int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
79388 -int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
79389 +int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
79390 +int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
79391 #else
79392
79393 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
79394 @@ -81,8 +81,8 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
79395
79396 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
79397
79398 -static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
79399 -static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
79400 +static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
79401 +static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
79402
79403 #endif
79404 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
79405 diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
79406 index 4b8a891..cb8df6e 100644
79407 --- a/include/linux/vmalloc.h
79408 +++ b/include/linux/vmalloc.h
79409 @@ -16,6 +16,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
79410 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
79411 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
79412 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
79413 +
79414 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
79415 +#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
79416 +#endif
79417 +
79418 /* bits [20..32] reserved for arch specific ioremap internals */
79419
79420 /*
79421 @@ -142,7 +147,7 @@ extern void free_vm_area(struct vm_struct *area);
79422
79423 /* for /dev/kmem */
79424 extern long vread(char *buf, char *addr, unsigned long count);
79425 -extern long vwrite(char *buf, char *addr, unsigned long count);
79426 +extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
79427
79428 /*
79429 * Internals. Dont't use..
79430 diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
79431 index e4b9480..5a5f65a 100644
79432 --- a/include/linux/vmstat.h
79433 +++ b/include/linux/vmstat.h
79434 @@ -90,18 +90,18 @@ static inline void vm_events_fold_cpu(int cpu)
79435 /*
79436 * Zone based page accounting with per cpu differentials.
79437 */
79438 -extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
79439 +extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
79440
79441 static inline void zone_page_state_add(long x, struct zone *zone,
79442 enum zone_stat_item item)
79443 {
79444 - atomic_long_add(x, &zone->vm_stat[item]);
79445 - atomic_long_add(x, &vm_stat[item]);
79446 + atomic_long_add_unchecked(x, &zone->vm_stat[item]);
79447 + atomic_long_add_unchecked(x, &vm_stat[item]);
79448 }
79449
79450 -static inline unsigned long global_page_state(enum zone_stat_item item)
79451 +static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
79452 {
79453 - long x = atomic_long_read(&vm_stat[item]);
79454 + long x = atomic_long_read_unchecked(&vm_stat[item]);
79455 #ifdef CONFIG_SMP
79456 if (x < 0)
79457 x = 0;
79458 @@ -109,10 +109,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
79459 return x;
79460 }
79461
79462 -static inline unsigned long zone_page_state(struct zone *zone,
79463 +static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
79464 enum zone_stat_item item)
79465 {
79466 - long x = atomic_long_read(&zone->vm_stat[item]);
79467 + long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
79468 #ifdef CONFIG_SMP
79469 if (x < 0)
79470 x = 0;
79471 @@ -129,7 +129,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
79472 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
79473 enum zone_stat_item item)
79474 {
79475 - long x = atomic_long_read(&zone->vm_stat[item]);
79476 + long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
79477
79478 #ifdef CONFIG_SMP
79479 int cpu;
79480 @@ -220,8 +220,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
79481
79482 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
79483 {
79484 - atomic_long_inc(&zone->vm_stat[item]);
79485 - atomic_long_inc(&vm_stat[item]);
79486 + atomic_long_inc_unchecked(&zone->vm_stat[item]);
79487 + atomic_long_inc_unchecked(&vm_stat[item]);
79488 }
79489
79490 static inline void __inc_zone_page_state(struct page *page,
79491 @@ -232,8 +232,8 @@ static inline void __inc_zone_page_state(struct page *page,
79492
79493 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
79494 {
79495 - atomic_long_dec(&zone->vm_stat[item]);
79496 - atomic_long_dec(&vm_stat[item]);
79497 + atomic_long_dec_unchecked(&zone->vm_stat[item]);
79498 + atomic_long_dec_unchecked(&vm_stat[item]);
79499 }
79500
79501 static inline void __dec_zone_page_state(struct page *page,
79502 diff --git a/include/linux/xattr.h b/include/linux/xattr.h
79503 index 91b0a68..0e9adf6 100644
79504 --- a/include/linux/xattr.h
79505 +++ b/include/linux/xattr.h
79506 @@ -28,7 +28,7 @@ struct xattr_handler {
79507 size_t size, int handler_flags);
79508 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
79509 size_t size, int flags, int handler_flags);
79510 -};
79511 +} __do_const;
79512
79513 struct xattr {
79514 const char *name;
79515 @@ -37,6 +37,9 @@ struct xattr {
79516 };
79517
79518 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
79519 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
79520 +ssize_t pax_getxattr(struct dentry *, void *, size_t);
79521 +#endif
79522 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
79523 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
79524 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
79525 diff --git a/include/linux/zlib.h b/include/linux/zlib.h
79526 index 9c5a6b4..09c9438 100644
79527 --- a/include/linux/zlib.h
79528 +++ b/include/linux/zlib.h
79529 @@ -31,6 +31,7 @@
79530 #define _ZLIB_H
79531
79532 #include <linux/zconf.h>
79533 +#include <linux/compiler.h>
79534
79535 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
79536 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
79537 @@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
79538
79539 /* basic functions */
79540
79541 -extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
79542 +extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
79543 /*
79544 Returns the number of bytes that needs to be allocated for a per-
79545 stream workspace with the specified parameters. A pointer to this
79546 diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
79547 index c768c9f..bdcaa5a 100644
79548 --- a/include/media/v4l2-dev.h
79549 +++ b/include/media/v4l2-dev.h
79550 @@ -76,7 +76,7 @@ struct v4l2_file_operations {
79551 int (*mmap) (struct file *, struct vm_area_struct *);
79552 int (*open) (struct file *);
79553 int (*release) (struct file *);
79554 -};
79555 +} __do_const;
79556
79557 /*
79558 * Newer version of video_device, handled by videodev2.c
79559 diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
79560 index c9b1593..a572459 100644
79561 --- a/include/media/v4l2-device.h
79562 +++ b/include/media/v4l2-device.h
79563 @@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
79564 this function returns 0. If the name ends with a digit (e.g. cx18),
79565 then the name will be set to cx18-0 since cx180 looks really odd. */
79566 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
79567 - atomic_t *instance);
79568 + atomic_unchecked_t *instance);
79569
79570 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
79571 Since the parent disappears this ensures that v4l2_dev doesn't have an
79572 diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
79573 index 9a36d92..0aafe2a 100644
79574 --- a/include/net/9p/transport.h
79575 +++ b/include/net/9p/transport.h
79576 @@ -60,7 +60,7 @@ struct p9_trans_module {
79577 int (*cancel) (struct p9_client *, struct p9_req_t *req);
79578 int (*zc_request)(struct p9_client *, struct p9_req_t *,
79579 char *, char *, int , int, int, int);
79580 -};
79581 +} __do_const;
79582
79583 void v9fs_register_trans(struct p9_trans_module *m);
79584 void v9fs_unregister_trans(struct p9_trans_module *m);
79585 diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
79586 index 1a966af..2767cf6 100644
79587 --- a/include/net/bluetooth/l2cap.h
79588 +++ b/include/net/bluetooth/l2cap.h
79589 @@ -551,7 +551,7 @@ struct l2cap_ops {
79590 void (*defer) (struct l2cap_chan *chan);
79591 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
79592 unsigned long len, int nb);
79593 -};
79594 +} __do_const;
79595
79596 struct l2cap_conn {
79597 struct hci_conn *hcon;
79598 diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
79599 index f2ae33d..c457cf0 100644
79600 --- a/include/net/caif/cfctrl.h
79601 +++ b/include/net/caif/cfctrl.h
79602 @@ -52,7 +52,7 @@ struct cfctrl_rsp {
79603 void (*radioset_rsp)(void);
79604 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
79605 struct cflayer *client_layer);
79606 -};
79607 +} __no_const;
79608
79609 /* Link Setup Parameters for CAIF-Links. */
79610 struct cfctrl_link_param {
79611 @@ -101,8 +101,8 @@ struct cfctrl_request_info {
79612 struct cfctrl {
79613 struct cfsrvl serv;
79614 struct cfctrl_rsp res;
79615 - atomic_t req_seq_no;
79616 - atomic_t rsp_seq_no;
79617 + atomic_unchecked_t req_seq_no;
79618 + atomic_unchecked_t rsp_seq_no;
79619 struct list_head list;
79620 /* Protects from simultaneous access to first_req list */
79621 spinlock_t info_list_lock;
79622 diff --git a/include/net/flow.h b/include/net/flow.h
79623 index 628e11b..4c475df 100644
79624 --- a/include/net/flow.h
79625 +++ b/include/net/flow.h
79626 @@ -221,6 +221,6 @@ extern struct flow_cache_object *flow_cache_lookup(
79627
79628 extern void flow_cache_flush(void);
79629 extern void flow_cache_flush_deferred(void);
79630 -extern atomic_t flow_cache_genid;
79631 +extern atomic_unchecked_t flow_cache_genid;
79632
79633 #endif
79634 diff --git a/include/net/genetlink.h b/include/net/genetlink.h
79635 index 8e0b6c8..73cf605 100644
79636 --- a/include/net/genetlink.h
79637 +++ b/include/net/genetlink.h
79638 @@ -120,7 +120,7 @@ struct genl_ops {
79639 struct netlink_callback *cb);
79640 int (*done)(struct netlink_callback *cb);
79641 struct list_head ops_list;
79642 -};
79643 +} __do_const;
79644
79645 extern int __genl_register_family(struct genl_family *family);
79646
79647 diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
79648 index 734d9b5..48a9a4b 100644
79649 --- a/include/net/gro_cells.h
79650 +++ b/include/net/gro_cells.h
79651 @@ -29,7 +29,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
79652 cell += skb_get_rx_queue(skb) & gcells->gro_cells_mask;
79653
79654 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
79655 - atomic_long_inc(&dev->rx_dropped);
79656 + atomic_long_inc_unchecked(&dev->rx_dropped);
79657 kfree_skb(skb);
79658 return;
79659 }
79660 diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
79661 index de2c785..0588a6b 100644
79662 --- a/include/net/inet_connection_sock.h
79663 +++ b/include/net/inet_connection_sock.h
79664 @@ -62,7 +62,7 @@ struct inet_connection_sock_af_ops {
79665 void (*addr2sockaddr)(struct sock *sk, struct sockaddr *);
79666 int (*bind_conflict)(const struct sock *sk,
79667 const struct inet_bind_bucket *tb, bool relax);
79668 -};
79669 +} __do_const;
79670
79671 /** inet_connection_sock - INET connection oriented sock
79672 *
79673 diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
79674 index 53f464d..0bd0b49 100644
79675 --- a/include/net/inetpeer.h
79676 +++ b/include/net/inetpeer.h
79677 @@ -47,8 +47,8 @@ struct inet_peer {
79678 */
79679 union {
79680 struct {
79681 - atomic_t rid; /* Frag reception counter */
79682 - atomic_t ip_id_count; /* IP ID for the next packet */
79683 + atomic_unchecked_t rid; /* Frag reception counter */
79684 + atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
79685 };
79686 struct rcu_head rcu;
79687 struct inet_peer *gc_next;
79688 @@ -178,16 +178,13 @@ static inline void inet_peer_refcheck(const struct inet_peer *p)
79689 /* can be called with or without local BH being disabled */
79690 static inline int inet_getid(struct inet_peer *p, int more)
79691 {
79692 - int old, new;
79693 + int id;
79694 more++;
79695 inet_peer_refcheck(p);
79696 - do {
79697 - old = atomic_read(&p->ip_id_count);
79698 - new = old + more;
79699 - if (!new)
79700 - new = 1;
79701 - } while (atomic_cmpxchg(&p->ip_id_count, old, new) != old);
79702 - return new;
79703 + id = atomic_add_return_unchecked(more, &p->ip_id_count);
79704 + if (!id)
79705 + id = atomic_inc_return_unchecked(&p->ip_id_count);
79706 + return id;
79707 }
79708
79709 #endif /* _NET_INETPEER_H */
79710 diff --git a/include/net/ip.h b/include/net/ip.h
79711 index 301f10c..b52cdaf 100644
79712 --- a/include/net/ip.h
79713 +++ b/include/net/ip.h
79714 @@ -212,7 +212,7 @@ extern struct local_ports {
79715 } sysctl_local_ports;
79716 extern void inet_get_local_port_range(int *low, int *high);
79717
79718 -extern unsigned long *sysctl_local_reserved_ports;
79719 +extern unsigned long sysctl_local_reserved_ports[65536 / 8 / sizeof(unsigned long)];
79720 static inline int inet_is_reserved_local_port(int port)
79721 {
79722 return test_bit(port, sysctl_local_reserved_ports);
79723 diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
79724 index cbf2be3..3683f6d 100644
79725 --- a/include/net/ip_fib.h
79726 +++ b/include/net/ip_fib.h
79727 @@ -169,7 +169,7 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
79728
79729 #define FIB_RES_SADDR(net, res) \
79730 ((FIB_RES_NH(res).nh_saddr_genid == \
79731 - atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
79732 + atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
79733 FIB_RES_NH(res).nh_saddr : \
79734 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
79735 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
79736 diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
79737 index 772252d..1e69799 100644
79738 --- a/include/net/ip_vs.h
79739 +++ b/include/net/ip_vs.h
79740 @@ -558,7 +558,7 @@ struct ip_vs_conn {
79741 struct ip_vs_conn *control; /* Master control connection */
79742 atomic_t n_control; /* Number of controlled ones */
79743 struct ip_vs_dest *dest; /* real server */
79744 - atomic_t in_pkts; /* incoming packet counter */
79745 + atomic_unchecked_t in_pkts; /* incoming packet counter */
79746
79747 /* packet transmitter for different forwarding methods. If it
79748 mangles the packet, it must return NF_DROP or better NF_STOLEN,
79749 @@ -705,7 +705,7 @@ struct ip_vs_dest {
79750 __be16 port; /* port number of the server */
79751 union nf_inet_addr addr; /* IP address of the server */
79752 volatile unsigned int flags; /* dest status flags */
79753 - atomic_t conn_flags; /* flags to copy to conn */
79754 + atomic_unchecked_t conn_flags; /* flags to copy to conn */
79755 atomic_t weight; /* server weight */
79756
79757 atomic_t refcnt; /* reference counter */
79758 @@ -960,11 +960,11 @@ struct netns_ipvs {
79759 /* ip_vs_lblc */
79760 int sysctl_lblc_expiration;
79761 struct ctl_table_header *lblc_ctl_header;
79762 - struct ctl_table *lblc_ctl_table;
79763 + ctl_table_no_const *lblc_ctl_table;
79764 /* ip_vs_lblcr */
79765 int sysctl_lblcr_expiration;
79766 struct ctl_table_header *lblcr_ctl_header;
79767 - struct ctl_table *lblcr_ctl_table;
79768 + ctl_table_no_const *lblcr_ctl_table;
79769 /* ip_vs_est */
79770 struct list_head est_list; /* estimator list */
79771 spinlock_t est_lock;
79772 diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
79773 index 80ffde3..968b0f4 100644
79774 --- a/include/net/irda/ircomm_tty.h
79775 +++ b/include/net/irda/ircomm_tty.h
79776 @@ -35,6 +35,7 @@
79777 #include <linux/termios.h>
79778 #include <linux/timer.h>
79779 #include <linux/tty.h> /* struct tty_struct */
79780 +#include <asm/local.h>
79781
79782 #include <net/irda/irias_object.h>
79783 #include <net/irda/ircomm_core.h>
79784 diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
79785 index 714cc9a..ea05f3e 100644
79786 --- a/include/net/iucv/af_iucv.h
79787 +++ b/include/net/iucv/af_iucv.h
79788 @@ -149,7 +149,7 @@ struct iucv_skb_cb {
79789 struct iucv_sock_list {
79790 struct hlist_head head;
79791 rwlock_t lock;
79792 - atomic_t autobind_name;
79793 + atomic_unchecked_t autobind_name;
79794 };
79795
79796 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
79797 diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
79798 index df83f69..9b640b8 100644
79799 --- a/include/net/llc_c_ac.h
79800 +++ b/include/net/llc_c_ac.h
79801 @@ -87,7 +87,7 @@
79802 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
79803 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
79804
79805 -typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
79806 +typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
79807
79808 extern int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
79809 extern int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
79810 diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
79811 index 6ca3113..f8026dd 100644
79812 --- a/include/net/llc_c_ev.h
79813 +++ b/include/net/llc_c_ev.h
79814 @@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
79815 return (struct llc_conn_state_ev *)skb->cb;
79816 }
79817
79818 -typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
79819 -typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
79820 +typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
79821 +typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
79822
79823 extern int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
79824 extern int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
79825 diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
79826 index 0e79cfb..f46db31 100644
79827 --- a/include/net/llc_c_st.h
79828 +++ b/include/net/llc_c_st.h
79829 @@ -37,7 +37,7 @@ struct llc_conn_state_trans {
79830 u8 next_state;
79831 llc_conn_ev_qfyr_t *ev_qualifiers;
79832 llc_conn_action_t *ev_actions;
79833 -};
79834 +} __do_const;
79835
79836 struct llc_conn_state {
79837 u8 current_state;
79838 diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
79839 index 37a3bbd..55a4241 100644
79840 --- a/include/net/llc_s_ac.h
79841 +++ b/include/net/llc_s_ac.h
79842 @@ -23,7 +23,7 @@
79843 #define SAP_ACT_TEST_IND 9
79844
79845 /* All action functions must look like this */
79846 -typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
79847 +typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
79848
79849 extern int llc_sap_action_unitdata_ind(struct llc_sap *sap,
79850 struct sk_buff *skb);
79851 diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
79852 index 567c681..cd73ac0 100644
79853 --- a/include/net/llc_s_st.h
79854 +++ b/include/net/llc_s_st.h
79855 @@ -20,7 +20,7 @@ struct llc_sap_state_trans {
79856 llc_sap_ev_t ev;
79857 u8 next_state;
79858 llc_sap_action_t *ev_actions;
79859 -};
79860 +} __do_const;
79861
79862 struct llc_sap_state {
79863 u8 curr_state;
79864 diff --git a/include/net/mac80211.h b/include/net/mac80211.h
79865 index cc6035f..a8406fc 100644
79866 --- a/include/net/mac80211.h
79867 +++ b/include/net/mac80211.h
79868 @@ -4361,7 +4361,7 @@ struct rate_control_ops {
79869 void (*add_sta_debugfs)(void *priv, void *priv_sta,
79870 struct dentry *dir);
79871 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
79872 -};
79873 +} __do_const;
79874
79875 static inline int rate_supported(struct ieee80211_sta *sta,
79876 enum ieee80211_band band,
79877 diff --git a/include/net/neighbour.h b/include/net/neighbour.h
79878 index 536501a..7c6193c 100644
79879 --- a/include/net/neighbour.h
79880 +++ b/include/net/neighbour.h
79881 @@ -123,7 +123,7 @@ struct neigh_ops {
79882 void (*error_report)(struct neighbour *, struct sk_buff *);
79883 int (*output)(struct neighbour *, struct sk_buff *);
79884 int (*connected_output)(struct neighbour *, struct sk_buff *);
79885 -};
79886 +} __do_const;
79887
79888 struct pneigh_entry {
79889 struct pneigh_entry *next;
79890 diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
79891 index 9d22f08..980fbf8 100644
79892 --- a/include/net/net_namespace.h
79893 +++ b/include/net/net_namespace.h
79894 @@ -120,7 +120,7 @@ struct net {
79895 struct netns_ipvs *ipvs;
79896 #endif
79897 struct sock *diag_nlsk;
79898 - atomic_t fnhe_genid;
79899 + atomic_unchecked_t fnhe_genid;
79900 };
79901
79902 /*
79903 @@ -277,7 +277,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
79904 #define __net_init __init
79905 #define __net_exit __exit_refok
79906 #define __net_initdata __initdata
79907 +#ifdef CONSTIFY_PLUGIN
79908 #define __net_initconst __initconst
79909 +#else
79910 +#define __net_initconst __initdata
79911 +#endif
79912 #endif
79913
79914 struct pernet_operations {
79915 @@ -287,7 +291,7 @@ struct pernet_operations {
79916 void (*exit_batch)(struct list_head *net_exit_list);
79917 int *id;
79918 size_t size;
79919 -};
79920 +} __do_const;
79921
79922 /*
79923 * Use these carefully. If you implement a network device and it
79924 @@ -335,23 +339,23 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
79925
79926 static inline int rt_genid_ipv4(struct net *net)
79927 {
79928 - return atomic_read(&net->ipv4.rt_genid);
79929 + return atomic_read_unchecked(&net->ipv4.rt_genid);
79930 }
79931
79932 static inline void rt_genid_bump_ipv4(struct net *net)
79933 {
79934 - atomic_inc(&net->ipv4.rt_genid);
79935 + atomic_inc_unchecked(&net->ipv4.rt_genid);
79936 }
79937
79938 #if IS_ENABLED(CONFIG_IPV6)
79939 static inline int rt_genid_ipv6(struct net *net)
79940 {
79941 - return atomic_read(&net->ipv6.rt_genid);
79942 + return atomic_read_unchecked(&net->ipv6.rt_genid);
79943 }
79944
79945 static inline void rt_genid_bump_ipv6(struct net *net)
79946 {
79947 - atomic_inc(&net->ipv6.rt_genid);
79948 + atomic_inc_unchecked(&net->ipv6.rt_genid);
79949 }
79950 #else
79951 static inline int rt_genid_ipv6(struct net *net)
79952 @@ -373,12 +377,12 @@ static inline void rt_genid_bump_all(struct net *net)
79953
79954 static inline int fnhe_genid(struct net *net)
79955 {
79956 - return atomic_read(&net->fnhe_genid);
79957 + return atomic_read_unchecked(&net->fnhe_genid);
79958 }
79959
79960 static inline void fnhe_genid_bump(struct net *net)
79961 {
79962 - atomic_inc(&net->fnhe_genid);
79963 + atomic_inc_unchecked(&net->fnhe_genid);
79964 }
79965
79966 #endif /* __NET_NET_NAMESPACE_H */
79967 diff --git a/include/net/netdma.h b/include/net/netdma.h
79968 index 8ba8ce2..99b7fff 100644
79969 --- a/include/net/netdma.h
79970 +++ b/include/net/netdma.h
79971 @@ -24,7 +24,7 @@
79972 #include <linux/dmaengine.h>
79973 #include <linux/skbuff.h>
79974
79975 -int dma_skb_copy_datagram_iovec(struct dma_chan* chan,
79976 +int __intentional_overflow(3,5) dma_skb_copy_datagram_iovec(struct dma_chan* chan,
79977 struct sk_buff *skb, int offset, struct iovec *to,
79978 size_t len, struct dma_pinned_list *pinned_list);
79979
79980 diff --git a/include/net/netlink.h b/include/net/netlink.h
79981 index 9690b0f..87aded7 100644
79982 --- a/include/net/netlink.h
79983 +++ b/include/net/netlink.h
79984 @@ -534,7 +534,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
79985 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
79986 {
79987 if (mark)
79988 - skb_trim(skb, (unsigned char *) mark - skb->data);
79989 + skb_trim(skb, (const unsigned char *) mark - skb->data);
79990 }
79991
79992 /**
79993 diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
79994 index c9c0c53..53f24c3 100644
79995 --- a/include/net/netns/conntrack.h
79996 +++ b/include/net/netns/conntrack.h
79997 @@ -12,10 +12,10 @@ struct nf_conntrack_ecache;
79998 struct nf_proto_net {
79999 #ifdef CONFIG_SYSCTL
80000 struct ctl_table_header *ctl_table_header;
80001 - struct ctl_table *ctl_table;
80002 + ctl_table_no_const *ctl_table;
80003 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
80004 struct ctl_table_header *ctl_compat_header;
80005 - struct ctl_table *ctl_compat_table;
80006 + ctl_table_no_const *ctl_compat_table;
80007 #endif
80008 #endif
80009 unsigned int users;
80010 @@ -58,7 +58,7 @@ struct nf_ip_net {
80011 struct nf_icmp_net icmpv6;
80012 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
80013 struct ctl_table_header *ctl_table_header;
80014 - struct ctl_table *ctl_table;
80015 + ctl_table_no_const *ctl_table;
80016 #endif
80017 };
80018
80019 diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
80020 index bf2ec22..5e7f9d9 100644
80021 --- a/include/net/netns/ipv4.h
80022 +++ b/include/net/netns/ipv4.h
80023 @@ -67,7 +67,7 @@ struct netns_ipv4 {
80024 kgid_t sysctl_ping_group_range[2];
80025 long sysctl_tcp_mem[3];
80026
80027 - atomic_t dev_addr_genid;
80028 + atomic_unchecked_t dev_addr_genid;
80029
80030 #ifdef CONFIG_IP_MROUTE
80031 #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
80032 @@ -77,6 +77,6 @@ struct netns_ipv4 {
80033 struct fib_rules_ops *mr_rules_ops;
80034 #endif
80035 #endif
80036 - atomic_t rt_genid;
80037 + atomic_unchecked_t rt_genid;
80038 };
80039 #endif
80040 diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
80041 index 0fb2401..477d81c 100644
80042 --- a/include/net/netns/ipv6.h
80043 +++ b/include/net/netns/ipv6.h
80044 @@ -71,8 +71,8 @@ struct netns_ipv6 {
80045 struct fib_rules_ops *mr6_rules_ops;
80046 #endif
80047 #endif
80048 - atomic_t dev_addr_genid;
80049 - atomic_t rt_genid;
80050 + atomic_unchecked_t dev_addr_genid;
80051 + atomic_unchecked_t rt_genid;
80052 };
80053
80054 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
80055 diff --git a/include/net/ping.h b/include/net/ping.h
80056 index 2b496e9..935fd8d 100644
80057 --- a/include/net/ping.h
80058 +++ b/include/net/ping.h
80059 @@ -56,7 +56,7 @@ struct ping_iter_state {
80060 extern struct proto ping_prot;
80061 extern struct ping_table ping_table;
80062 #if IS_ENABLED(CONFIG_IPV6)
80063 -extern struct pingv6_ops pingv6_ops;
80064 +extern struct pingv6_ops *pingv6_ops;
80065 #endif
80066
80067 struct pingfakehdr {
80068 diff --git a/include/net/protocol.h b/include/net/protocol.h
80069 index 047c047..b9dad15 100644
80070 --- a/include/net/protocol.h
80071 +++ b/include/net/protocol.h
80072 @@ -44,7 +44,7 @@ struct net_protocol {
80073 void (*err_handler)(struct sk_buff *skb, u32 info);
80074 unsigned int no_policy:1,
80075 netns_ok:1;
80076 -};
80077 +} __do_const;
80078
80079 #if IS_ENABLED(CONFIG_IPV6)
80080 struct inet6_protocol {
80081 @@ -57,7 +57,7 @@ struct inet6_protocol {
80082 u8 type, u8 code, int offset,
80083 __be32 info);
80084 unsigned int flags; /* INET6_PROTO_xxx */
80085 -};
80086 +} __do_const;
80087
80088 #define INET6_PROTO_NOPOLICY 0x1
80089 #define INET6_PROTO_FINAL 0x2
80090 diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
80091 index 7026648..584cc8c 100644
80092 --- a/include/net/rtnetlink.h
80093 +++ b/include/net/rtnetlink.h
80094 @@ -81,7 +81,7 @@ struct rtnl_link_ops {
80095 const struct net_device *dev);
80096 unsigned int (*get_num_tx_queues)(void);
80097 unsigned int (*get_num_rx_queues)(void);
80098 -};
80099 +} __do_const;
80100
80101 extern int __rtnl_link_register(struct rtnl_link_ops *ops);
80102 extern void __rtnl_link_unregister(struct rtnl_link_ops *ops);
80103 diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
80104 index 4ef75af..5aa073a 100644
80105 --- a/include/net/sctp/sm.h
80106 +++ b/include/net/sctp/sm.h
80107 @@ -81,7 +81,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
80108 typedef struct {
80109 sctp_state_fn_t *fn;
80110 const char *name;
80111 -} sctp_sm_table_entry_t;
80112 +} __do_const sctp_sm_table_entry_t;
80113
80114 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
80115 * currently in use.
80116 @@ -293,7 +293,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
80117 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
80118
80119 /* Extern declarations for major data structures. */
80120 -extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
80121 +extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
80122
80123
80124 /* Get the size of a DATA chunk payload. */
80125 diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
80126 index 2174d8d..71d5257 100644
80127 --- a/include/net/sctp/structs.h
80128 +++ b/include/net/sctp/structs.h
80129 @@ -508,7 +508,7 @@ struct sctp_pf {
80130 struct sctp_association *asoc);
80131 void (*addr_v4map) (struct sctp_sock *, union sctp_addr *);
80132 struct sctp_af *af;
80133 -};
80134 +} __do_const;
80135
80136
80137 /* Structure to track chunk fragments that have been acked, but peer
80138 diff --git a/include/net/sock.h b/include/net/sock.h
80139 index 808cbc2..8617e9c 100644
80140 --- a/include/net/sock.h
80141 +++ b/include/net/sock.h
80142 @@ -332,7 +332,7 @@ struct sock {
80143 unsigned int sk_napi_id;
80144 unsigned int sk_ll_usec;
80145 #endif
80146 - atomic_t sk_drops;
80147 + atomic_unchecked_t sk_drops;
80148 int sk_rcvbuf;
80149
80150 struct sk_filter __rcu *sk_filter;
80151 @@ -1194,7 +1194,7 @@ static inline u64 memcg_memory_allocated_read(struct cg_proto *prot)
80152 return ret >> PAGE_SHIFT;
80153 }
80154
80155 -static inline long
80156 +static inline long __intentional_overflow(-1)
80157 sk_memory_allocated(const struct sock *sk)
80158 {
80159 struct proto *prot = sk->sk_prot;
80160 @@ -1821,7 +1821,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
80161 }
80162
80163 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
80164 - char __user *from, char *to,
80165 + char __user *from, unsigned char *to,
80166 int copy, int offset)
80167 {
80168 if (skb->ip_summed == CHECKSUM_NONE) {
80169 @@ -2083,7 +2083,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
80170 }
80171 }
80172
80173 -struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
80174 +struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
80175
80176 /**
80177 * sk_page_frag - return an appropriate page_frag
80178 diff --git a/include/net/tcp.h b/include/net/tcp.h
80179 index b1aa324..b8530ea 100644
80180 --- a/include/net/tcp.h
80181 +++ b/include/net/tcp.h
80182 @@ -527,7 +527,7 @@ extern void tcp_retransmit_timer(struct sock *sk);
80183 extern void tcp_xmit_retransmit_queue(struct sock *);
80184 extern void tcp_simple_retransmit(struct sock *);
80185 extern int tcp_trim_head(struct sock *, struct sk_buff *, u32);
80186 -extern int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
80187 +extern int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
80188
80189 extern void tcp_send_probe0(struct sock *);
80190 extern void tcp_send_partial(struct sock *);
80191 @@ -699,8 +699,8 @@ struct tcp_skb_cb {
80192 struct inet6_skb_parm h6;
80193 #endif
80194 } header; /* For incoming frames */
80195 - __u32 seq; /* Starting sequence number */
80196 - __u32 end_seq; /* SEQ + FIN + SYN + datalen */
80197 + __u32 seq __intentional_overflow(0); /* Starting sequence number */
80198 + __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
80199 __u32 when; /* used to compute rtt's */
80200 __u8 tcp_flags; /* TCP header flags. (tcp[13]) */
80201
80202 @@ -714,7 +714,7 @@ struct tcp_skb_cb {
80203
80204 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
80205 /* 1 byte hole */
80206 - __u32 ack_seq; /* Sequence number ACK'd */
80207 + __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
80208 };
80209
80210 #define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0]))
80211 diff --git a/include/net/xfrm.h b/include/net/xfrm.h
80212 index e253bf0..2278b4b 100644
80213 --- a/include/net/xfrm.h
80214 +++ b/include/net/xfrm.h
80215 @@ -287,7 +287,6 @@ struct xfrm_dst;
80216 struct xfrm_policy_afinfo {
80217 unsigned short family;
80218 struct dst_ops *dst_ops;
80219 - void (*garbage_collect)(struct net *net);
80220 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
80221 const xfrm_address_t *saddr,
80222 const xfrm_address_t *daddr);
80223 @@ -305,7 +304,7 @@ struct xfrm_policy_afinfo {
80224 struct net_device *dev,
80225 const struct flowi *fl);
80226 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
80227 -};
80228 +} __do_const;
80229
80230 extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
80231 extern int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
80232 @@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
80233 int (*transport_finish)(struct sk_buff *skb,
80234 int async);
80235 void (*local_error)(struct sk_buff *skb, u32 mtu);
80236 -};
80237 +} __do_const;
80238
80239 extern int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
80240 extern int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
80241 @@ -427,7 +426,7 @@ struct xfrm_mode {
80242 struct module *owner;
80243 unsigned int encap;
80244 int flags;
80245 -};
80246 +} __do_const;
80247
80248 /* Flags for xfrm_mode. */
80249 enum {
80250 @@ -524,7 +523,7 @@ struct xfrm_policy {
80251 struct timer_list timer;
80252
80253 struct flow_cache_object flo;
80254 - atomic_t genid;
80255 + atomic_unchecked_t genid;
80256 u32 priority;
80257 u32 index;
80258 struct xfrm_mark mark;
80259 @@ -1164,6 +1163,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
80260 }
80261
80262 extern void xfrm_garbage_collect(struct net *net);
80263 +extern void xfrm_garbage_collect_deferred(struct net *net);
80264
80265 #else
80266
80267 @@ -1202,6 +1202,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
80268 static inline void xfrm_garbage_collect(struct net *net)
80269 {
80270 }
80271 +static inline void xfrm_garbage_collect_deferred(struct net *net)
80272 +{
80273 +}
80274 #endif
80275
80276 static __inline__
80277 diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
80278 index 1017e0b..227aa4d 100644
80279 --- a/include/rdma/iw_cm.h
80280 +++ b/include/rdma/iw_cm.h
80281 @@ -122,7 +122,7 @@ struct iw_cm_verbs {
80282 int backlog);
80283
80284 int (*destroy_listen)(struct iw_cm_id *cm_id);
80285 -};
80286 +} __no_const;
80287
80288 /**
80289 * iw_create_cm_id - Create an IW CM identifier.
80290 diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
80291 index e1379b4..67eafbe 100644
80292 --- a/include/scsi/libfc.h
80293 +++ b/include/scsi/libfc.h
80294 @@ -762,6 +762,7 @@ struct libfc_function_template {
80295 */
80296 void (*disc_stop_final) (struct fc_lport *);
80297 };
80298 +typedef struct libfc_function_template __no_const libfc_function_template_no_const;
80299
80300 /**
80301 * struct fc_disc - Discovery context
80302 @@ -866,7 +867,7 @@ struct fc_lport {
80303 struct fc_vport *vport;
80304
80305 /* Operational Information */
80306 - struct libfc_function_template tt;
80307 + libfc_function_template_no_const tt;
80308 u8 link_up;
80309 u8 qfull;
80310 enum fc_lport_state state;
80311 diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
80312 index d65fbec..f80fef2 100644
80313 --- a/include/scsi/scsi_device.h
80314 +++ b/include/scsi/scsi_device.h
80315 @@ -180,9 +180,9 @@ struct scsi_device {
80316 unsigned int max_device_blocked; /* what device_blocked counts down from */
80317 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
80318
80319 - atomic_t iorequest_cnt;
80320 - atomic_t iodone_cnt;
80321 - atomic_t ioerr_cnt;
80322 + atomic_unchecked_t iorequest_cnt;
80323 + atomic_unchecked_t iodone_cnt;
80324 + atomic_unchecked_t ioerr_cnt;
80325
80326 struct device sdev_gendev,
80327 sdev_dev;
80328 diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
80329 index b797e8f..8e2c3aa 100644
80330 --- a/include/scsi/scsi_transport_fc.h
80331 +++ b/include/scsi/scsi_transport_fc.h
80332 @@ -751,7 +751,8 @@ struct fc_function_template {
80333 unsigned long show_host_system_hostname:1;
80334
80335 unsigned long disable_target_scan:1;
80336 -};
80337 +} __do_const;
80338 +typedef struct fc_function_template __no_const fc_function_template_no_const;
80339
80340
80341 /**
80342 diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
80343 index ae6c3b8..fd748ac 100644
80344 --- a/include/sound/compress_driver.h
80345 +++ b/include/sound/compress_driver.h
80346 @@ -128,7 +128,7 @@ struct snd_compr_ops {
80347 struct snd_compr_caps *caps);
80348 int (*get_codec_caps) (struct snd_compr_stream *stream,
80349 struct snd_compr_codec_caps *codec);
80350 -};
80351 +} __no_const;
80352
80353 /**
80354 * struct snd_compr: Compressed device
80355 diff --git a/include/sound/soc.h b/include/sound/soc.h
80356 index d22cb0a..c6ba150 100644
80357 --- a/include/sound/soc.h
80358 +++ b/include/sound/soc.h
80359 @@ -780,7 +780,7 @@ struct snd_soc_codec_driver {
80360 /* probe ordering - for components with runtime dependencies */
80361 int probe_order;
80362 int remove_order;
80363 -};
80364 +} __do_const;
80365
80366 /* SoC platform interface */
80367 struct snd_soc_platform_driver {
80368 @@ -826,7 +826,7 @@ struct snd_soc_platform_driver {
80369 unsigned int (*read)(struct snd_soc_platform *, unsigned int);
80370 int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
80371 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
80372 -};
80373 +} __do_const;
80374
80375 struct snd_soc_platform {
80376 const char *name;
80377 diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
80378 index 5bdb8b7..bb1096c 100644
80379 --- a/include/target/target_core_base.h
80380 +++ b/include/target/target_core_base.h
80381 @@ -663,7 +663,7 @@ struct se_device {
80382 spinlock_t stats_lock;
80383 /* Active commands on this virtual SE device */
80384 atomic_t simple_cmds;
80385 - atomic_t dev_ordered_id;
80386 + atomic_unchecked_t dev_ordered_id;
80387 atomic_t dev_ordered_sync;
80388 atomic_t dev_qf_count;
80389 int export_count;
80390 diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
80391 new file mode 100644
80392 index 0000000..fb634b7
80393 --- /dev/null
80394 +++ b/include/trace/events/fs.h
80395 @@ -0,0 +1,53 @@
80396 +#undef TRACE_SYSTEM
80397 +#define TRACE_SYSTEM fs
80398 +
80399 +#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
80400 +#define _TRACE_FS_H
80401 +
80402 +#include <linux/fs.h>
80403 +#include <linux/tracepoint.h>
80404 +
80405 +TRACE_EVENT(do_sys_open,
80406 +
80407 + TP_PROTO(const char *filename, int flags, int mode),
80408 +
80409 + TP_ARGS(filename, flags, mode),
80410 +
80411 + TP_STRUCT__entry(
80412 + __string( filename, filename )
80413 + __field( int, flags )
80414 + __field( int, mode )
80415 + ),
80416 +
80417 + TP_fast_assign(
80418 + __assign_str(filename, filename);
80419 + __entry->flags = flags;
80420 + __entry->mode = mode;
80421 + ),
80422 +
80423 + TP_printk("\"%s\" %x %o",
80424 + __get_str(filename), __entry->flags, __entry->mode)
80425 +);
80426 +
80427 +TRACE_EVENT(open_exec,
80428 +
80429 + TP_PROTO(const char *filename),
80430 +
80431 + TP_ARGS(filename),
80432 +
80433 + TP_STRUCT__entry(
80434 + __string( filename, filename )
80435 + ),
80436 +
80437 + TP_fast_assign(
80438 + __assign_str(filename, filename);
80439 + ),
80440 +
80441 + TP_printk("\"%s\"",
80442 + __get_str(filename))
80443 +);
80444 +
80445 +#endif /* _TRACE_FS_H */
80446 +
80447 +/* This part must be outside protection */
80448 +#include <trace/define_trace.h>
80449 diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
80450 index 1c09820..7f5ec79 100644
80451 --- a/include/trace/events/irq.h
80452 +++ b/include/trace/events/irq.h
80453 @@ -36,7 +36,7 @@ struct softirq_action;
80454 */
80455 TRACE_EVENT(irq_handler_entry,
80456
80457 - TP_PROTO(int irq, struct irqaction *action),
80458 + TP_PROTO(int irq, const struct irqaction *action),
80459
80460 TP_ARGS(irq, action),
80461
80462 @@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
80463 */
80464 TRACE_EVENT(irq_handler_exit,
80465
80466 - TP_PROTO(int irq, struct irqaction *action, int ret),
80467 + TP_PROTO(int irq, const struct irqaction *action, int ret),
80468
80469 TP_ARGS(irq, action, ret),
80470
80471 diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
80472 index 7caf44c..23c6f27 100644
80473 --- a/include/uapi/linux/a.out.h
80474 +++ b/include/uapi/linux/a.out.h
80475 @@ -39,6 +39,14 @@ enum machine_type {
80476 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
80477 };
80478
80479 +/* Constants for the N_FLAGS field */
80480 +#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
80481 +#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
80482 +#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
80483 +#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
80484 +/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
80485 +#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
80486 +
80487 #if !defined (N_MAGIC)
80488 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
80489 #endif
80490 diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
80491 index d876736..ccce5c0 100644
80492 --- a/include/uapi/linux/byteorder/little_endian.h
80493 +++ b/include/uapi/linux/byteorder/little_endian.h
80494 @@ -42,51 +42,51 @@
80495
80496 static inline __le64 __cpu_to_le64p(const __u64 *p)
80497 {
80498 - return (__force __le64)*p;
80499 + return (__force const __le64)*p;
80500 }
80501 -static inline __u64 __le64_to_cpup(const __le64 *p)
80502 +static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
80503 {
80504 - return (__force __u64)*p;
80505 + return (__force const __u64)*p;
80506 }
80507 static inline __le32 __cpu_to_le32p(const __u32 *p)
80508 {
80509 - return (__force __le32)*p;
80510 + return (__force const __le32)*p;
80511 }
80512 static inline __u32 __le32_to_cpup(const __le32 *p)
80513 {
80514 - return (__force __u32)*p;
80515 + return (__force const __u32)*p;
80516 }
80517 static inline __le16 __cpu_to_le16p(const __u16 *p)
80518 {
80519 - return (__force __le16)*p;
80520 + return (__force const __le16)*p;
80521 }
80522 static inline __u16 __le16_to_cpup(const __le16 *p)
80523 {
80524 - return (__force __u16)*p;
80525 + return (__force const __u16)*p;
80526 }
80527 static inline __be64 __cpu_to_be64p(const __u64 *p)
80528 {
80529 - return (__force __be64)__swab64p(p);
80530 + return (__force const __be64)__swab64p(p);
80531 }
80532 static inline __u64 __be64_to_cpup(const __be64 *p)
80533 {
80534 - return __swab64p((__u64 *)p);
80535 + return __swab64p((const __u64 *)p);
80536 }
80537 static inline __be32 __cpu_to_be32p(const __u32 *p)
80538 {
80539 - return (__force __be32)__swab32p(p);
80540 + return (__force const __be32)__swab32p(p);
80541 }
80542 -static inline __u32 __be32_to_cpup(const __be32 *p)
80543 +static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
80544 {
80545 - return __swab32p((__u32 *)p);
80546 + return __swab32p((const __u32 *)p);
80547 }
80548 static inline __be16 __cpu_to_be16p(const __u16 *p)
80549 {
80550 - return (__force __be16)__swab16p(p);
80551 + return (__force const __be16)__swab16p(p);
80552 }
80553 static inline __u16 __be16_to_cpup(const __be16 *p)
80554 {
80555 - return __swab16p((__u16 *)p);
80556 + return __swab16p((const __u16 *)p);
80557 }
80558 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
80559 #define __le64_to_cpus(x) do { (void)(x); } while (0)
80560 diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
80561 index ef6103b..d4e65dd 100644
80562 --- a/include/uapi/linux/elf.h
80563 +++ b/include/uapi/linux/elf.h
80564 @@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
80565 #define PT_GNU_EH_FRAME 0x6474e550
80566
80567 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
80568 +#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
80569 +
80570 +#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
80571 +
80572 +/* Constants for the e_flags field */
80573 +#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
80574 +#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
80575 +#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
80576 +#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
80577 +/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
80578 +#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
80579
80580 /*
80581 * Extended Numbering
80582 @@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
80583 #define DT_DEBUG 21
80584 #define DT_TEXTREL 22
80585 #define DT_JMPREL 23
80586 +#define DT_FLAGS 30
80587 + #define DF_TEXTREL 0x00000004
80588 #define DT_ENCODING 32
80589 #define OLD_DT_LOOS 0x60000000
80590 #define DT_LOOS 0x6000000d
80591 @@ -240,6 +253,19 @@ typedef struct elf64_hdr {
80592 #define PF_W 0x2
80593 #define PF_X 0x1
80594
80595 +#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
80596 +#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
80597 +#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
80598 +#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
80599 +#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
80600 +#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
80601 +/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
80602 +/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
80603 +#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
80604 +#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
80605 +#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
80606 +#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
80607 +
80608 typedef struct elf32_phdr{
80609 Elf32_Word p_type;
80610 Elf32_Off p_offset;
80611 @@ -332,6 +358,8 @@ typedef struct elf64_shdr {
80612 #define EI_OSABI 7
80613 #define EI_PAD 8
80614
80615 +#define EI_PAX 14
80616 +
80617 #define ELFMAG0 0x7f /* EI_MAG */
80618 #define ELFMAG1 'E'
80619 #define ELFMAG2 'L'
80620 diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
80621 index aa169c4..6a2771d 100644
80622 --- a/include/uapi/linux/personality.h
80623 +++ b/include/uapi/linux/personality.h
80624 @@ -30,6 +30,7 @@ enum {
80625 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
80626 ADDR_NO_RANDOMIZE | \
80627 ADDR_COMPAT_LAYOUT | \
80628 + ADDR_LIMIT_3GB | \
80629 MMAP_PAGE_ZERO)
80630
80631 /*
80632 diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
80633 index 7530e74..e714828 100644
80634 --- a/include/uapi/linux/screen_info.h
80635 +++ b/include/uapi/linux/screen_info.h
80636 @@ -43,7 +43,8 @@ struct screen_info {
80637 __u16 pages; /* 0x32 */
80638 __u16 vesa_attributes; /* 0x34 */
80639 __u32 capabilities; /* 0x36 */
80640 - __u8 _reserved[6]; /* 0x3a */
80641 + __u16 vesapm_size; /* 0x3a */
80642 + __u8 _reserved[4]; /* 0x3c */
80643 } __attribute__((packed));
80644
80645 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
80646 diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
80647 index 0e011eb..82681b1 100644
80648 --- a/include/uapi/linux/swab.h
80649 +++ b/include/uapi/linux/swab.h
80650 @@ -43,7 +43,7 @@
80651 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
80652 */
80653
80654 -static inline __attribute_const__ __u16 __fswab16(__u16 val)
80655 +static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
80656 {
80657 #ifdef __HAVE_BUILTIN_BSWAP16__
80658 return __builtin_bswap16(val);
80659 @@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
80660 #endif
80661 }
80662
80663 -static inline __attribute_const__ __u32 __fswab32(__u32 val)
80664 +static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
80665 {
80666 #ifdef __HAVE_BUILTIN_BSWAP32__
80667 return __builtin_bswap32(val);
80668 @@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
80669 #endif
80670 }
80671
80672 -static inline __attribute_const__ __u64 __fswab64(__u64 val)
80673 +static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
80674 {
80675 #ifdef __HAVE_BUILTIN_BSWAP64__
80676 return __builtin_bswap64(val);
80677 diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
80678 index 6d67213..8dab561 100644
80679 --- a/include/uapi/linux/sysctl.h
80680 +++ b/include/uapi/linux/sysctl.h
80681 @@ -155,7 +155,11 @@ enum
80682 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
80683 };
80684
80685 -
80686 +#ifdef CONFIG_PAX_SOFTMODE
80687 +enum {
80688 + PAX_SOFTMODE=1 /* PaX: disable/enable soft mode */
80689 +};
80690 +#endif
80691
80692 /* CTL_VM names: */
80693 enum
80694 diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
80695 index e4629b9..6958086 100644
80696 --- a/include/uapi/linux/xattr.h
80697 +++ b/include/uapi/linux/xattr.h
80698 @@ -63,5 +63,9 @@
80699 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
80700 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
80701
80702 +/* User namespace */
80703 +#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
80704 +#define XATTR_PAX_FLAGS_SUFFIX "flags"
80705 +#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
80706
80707 #endif /* _UAPI_LINUX_XATTR_H */
80708 diff --git a/include/video/udlfb.h b/include/video/udlfb.h
80709 index f9466fa..f4e2b81 100644
80710 --- a/include/video/udlfb.h
80711 +++ b/include/video/udlfb.h
80712 @@ -53,10 +53,10 @@ struct dlfb_data {
80713 u32 pseudo_palette[256];
80714 int blank_mode; /*one of FB_BLANK_ */
80715 /* blit-only rendering path metrics, exposed through sysfs */
80716 - atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
80717 - atomic_t bytes_identical; /* saved effort with backbuffer comparison */
80718 - atomic_t bytes_sent; /* to usb, after compression including overhead */
80719 - atomic_t cpu_kcycles_used; /* transpired during pixel processing */
80720 + atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
80721 + atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
80722 + atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
80723 + atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
80724 };
80725
80726 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
80727 diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
80728 index 30f5362..8ed8ac9 100644
80729 --- a/include/video/uvesafb.h
80730 +++ b/include/video/uvesafb.h
80731 @@ -122,6 +122,7 @@ struct uvesafb_par {
80732 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
80733 u8 pmi_setpal; /* PMI for palette changes */
80734 u16 *pmi_base; /* protected mode interface location */
80735 + u8 *pmi_code; /* protected mode code location */
80736 void *pmi_start;
80737 void *pmi_pal;
80738 u8 *vbe_state_orig; /*
80739 diff --git a/init/Kconfig b/init/Kconfig
80740 index 3ecd8a1..627843f 100644
80741 --- a/init/Kconfig
80742 +++ b/init/Kconfig
80743 @@ -1086,6 +1086,7 @@ endif # CGROUPS
80744
80745 config CHECKPOINT_RESTORE
80746 bool "Checkpoint/restore support" if EXPERT
80747 + depends on !GRKERNSEC
80748 default n
80749 help
80750 Enables additional kernel features in a sake of checkpoint/restore.
80751 @@ -1557,7 +1558,7 @@ config SLUB_DEBUG
80752
80753 config COMPAT_BRK
80754 bool "Disable heap randomization"
80755 - default y
80756 + default n
80757 help
80758 Randomizing heap placement makes heap exploits harder, but it
80759 also breaks ancient binaries (including anything libc5 based).
80760 @@ -1832,7 +1833,7 @@ config INIT_ALL_POSSIBLE
80761 config STOP_MACHINE
80762 bool
80763 default y
80764 - depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
80765 + depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
80766 help
80767 Need stop_machine() primitive.
80768
80769 diff --git a/init/Makefile b/init/Makefile
80770 index 7bc47ee..6da2dc7 100644
80771 --- a/init/Makefile
80772 +++ b/init/Makefile
80773 @@ -2,6 +2,9 @@
80774 # Makefile for the linux kernel.
80775 #
80776
80777 +ccflags-y := $(GCC_PLUGINS_CFLAGS)
80778 +asflags-y := $(GCC_PLUGINS_AFLAGS)
80779 +
80780 obj-y := main.o version.o mounts.o
80781 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
80782 obj-y += noinitramfs.o
80783 diff --git a/init/do_mounts.c b/init/do_mounts.c
80784 index a51cddc..25c2768 100644
80785 --- a/init/do_mounts.c
80786 +++ b/init/do_mounts.c
80787 @@ -357,11 +357,11 @@ static void __init get_fs_names(char *page)
80788 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
80789 {
80790 struct super_block *s;
80791 - int err = sys_mount(name, "/root", fs, flags, data);
80792 + int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
80793 if (err)
80794 return err;
80795
80796 - sys_chdir("/root");
80797 + sys_chdir((const char __force_user *)"/root");
80798 s = current->fs->pwd.dentry->d_sb;
80799 ROOT_DEV = s->s_dev;
80800 printk(KERN_INFO
80801 @@ -482,18 +482,18 @@ void __init change_floppy(char *fmt, ...)
80802 va_start(args, fmt);
80803 vsprintf(buf, fmt, args);
80804 va_end(args);
80805 - fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
80806 + fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
80807 if (fd >= 0) {
80808 sys_ioctl(fd, FDEJECT, 0);
80809 sys_close(fd);
80810 }
80811 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
80812 - fd = sys_open("/dev/console", O_RDWR, 0);
80813 + fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
80814 if (fd >= 0) {
80815 sys_ioctl(fd, TCGETS, (long)&termios);
80816 termios.c_lflag &= ~ICANON;
80817 sys_ioctl(fd, TCSETSF, (long)&termios);
80818 - sys_read(fd, &c, 1);
80819 + sys_read(fd, (char __user *)&c, 1);
80820 termios.c_lflag |= ICANON;
80821 sys_ioctl(fd, TCSETSF, (long)&termios);
80822 sys_close(fd);
80823 @@ -587,8 +587,8 @@ void __init prepare_namespace(void)
80824 mount_root();
80825 out:
80826 devtmpfs_mount("dev");
80827 - sys_mount(".", "/", NULL, MS_MOVE, NULL);
80828 - sys_chroot(".");
80829 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
80830 + sys_chroot((const char __force_user *)".");
80831 }
80832
80833 static bool is_tmpfs;
80834 diff --git a/init/do_mounts.h b/init/do_mounts.h
80835 index f5b978a..69dbfe8 100644
80836 --- a/init/do_mounts.h
80837 +++ b/init/do_mounts.h
80838 @@ -15,15 +15,15 @@ extern int root_mountflags;
80839
80840 static inline int create_dev(char *name, dev_t dev)
80841 {
80842 - sys_unlink(name);
80843 - return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
80844 + sys_unlink((char __force_user *)name);
80845 + return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
80846 }
80847
80848 #if BITS_PER_LONG == 32
80849 static inline u32 bstat(char *name)
80850 {
80851 struct stat64 stat;
80852 - if (sys_stat64(name, &stat) != 0)
80853 + if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
80854 return 0;
80855 if (!S_ISBLK(stat.st_mode))
80856 return 0;
80857 @@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
80858 static inline u32 bstat(char *name)
80859 {
80860 struct stat stat;
80861 - if (sys_newstat(name, &stat) != 0)
80862 + if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
80863 return 0;
80864 if (!S_ISBLK(stat.st_mode))
80865 return 0;
80866 diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
80867 index 3e0878e..8a9d7a0 100644
80868 --- a/init/do_mounts_initrd.c
80869 +++ b/init/do_mounts_initrd.c
80870 @@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
80871 {
80872 sys_unshare(CLONE_FS | CLONE_FILES);
80873 /* stdin/stdout/stderr for /linuxrc */
80874 - sys_open("/dev/console", O_RDWR, 0);
80875 + sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
80876 sys_dup(0);
80877 sys_dup(0);
80878 /* move initrd over / and chdir/chroot in initrd root */
80879 - sys_chdir("/root");
80880 - sys_mount(".", "/", NULL, MS_MOVE, NULL);
80881 - sys_chroot(".");
80882 + sys_chdir((const char __force_user *)"/root");
80883 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
80884 + sys_chroot((const char __force_user *)".");
80885 sys_setsid();
80886 return 0;
80887 }
80888 @@ -59,8 +59,8 @@ static void __init handle_initrd(void)
80889 create_dev("/dev/root.old", Root_RAM0);
80890 /* mount initrd on rootfs' /root */
80891 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
80892 - sys_mkdir("/old", 0700);
80893 - sys_chdir("/old");
80894 + sys_mkdir((const char __force_user *)"/old", 0700);
80895 + sys_chdir((const char __force_user *)"/old");
80896
80897 /* try loading default modules from initrd */
80898 load_default_modules();
80899 @@ -80,31 +80,31 @@ static void __init handle_initrd(void)
80900 current->flags &= ~PF_FREEZER_SKIP;
80901
80902 /* move initrd to rootfs' /old */
80903 - sys_mount("..", ".", NULL, MS_MOVE, NULL);
80904 + sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
80905 /* switch root and cwd back to / of rootfs */
80906 - sys_chroot("..");
80907 + sys_chroot((const char __force_user *)"..");
80908
80909 if (new_decode_dev(real_root_dev) == Root_RAM0) {
80910 - sys_chdir("/old");
80911 + sys_chdir((const char __force_user *)"/old");
80912 return;
80913 }
80914
80915 - sys_chdir("/");
80916 + sys_chdir((const char __force_user *)"/");
80917 ROOT_DEV = new_decode_dev(real_root_dev);
80918 mount_root();
80919
80920 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
80921 - error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
80922 + error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
80923 if (!error)
80924 printk("okay\n");
80925 else {
80926 - int fd = sys_open("/dev/root.old", O_RDWR, 0);
80927 + int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
80928 if (error == -ENOENT)
80929 printk("/initrd does not exist. Ignored.\n");
80930 else
80931 printk("failed\n");
80932 printk(KERN_NOTICE "Unmounting old root\n");
80933 - sys_umount("/old", MNT_DETACH);
80934 + sys_umount((char __force_user *)"/old", MNT_DETACH);
80935 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
80936 if (fd < 0) {
80937 error = fd;
80938 @@ -127,11 +127,11 @@ int __init initrd_load(void)
80939 * mounted in the normal path.
80940 */
80941 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
80942 - sys_unlink("/initrd.image");
80943 + sys_unlink((const char __force_user *)"/initrd.image");
80944 handle_initrd();
80945 return 1;
80946 }
80947 }
80948 - sys_unlink("/initrd.image");
80949 + sys_unlink((const char __force_user *)"/initrd.image");
80950 return 0;
80951 }
80952 diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
80953 index 8cb6db5..d729f50 100644
80954 --- a/init/do_mounts_md.c
80955 +++ b/init/do_mounts_md.c
80956 @@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
80957 partitioned ? "_d" : "", minor,
80958 md_setup_args[ent].device_names);
80959
80960 - fd = sys_open(name, 0, 0);
80961 + fd = sys_open((char __force_user *)name, 0, 0);
80962 if (fd < 0) {
80963 printk(KERN_ERR "md: open failed - cannot start "
80964 "array %s\n", name);
80965 @@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
80966 * array without it
80967 */
80968 sys_close(fd);
80969 - fd = sys_open(name, 0, 0);
80970 + fd = sys_open((char __force_user *)name, 0, 0);
80971 sys_ioctl(fd, BLKRRPART, 0);
80972 }
80973 sys_close(fd);
80974 @@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
80975
80976 wait_for_device_probe();
80977
80978 - fd = sys_open("/dev/md0", 0, 0);
80979 + fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
80980 if (fd >= 0) {
80981 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
80982 sys_close(fd);
80983 diff --git a/init/init_task.c b/init/init_task.c
80984 index ba0a7f36..2bcf1d5 100644
80985 --- a/init/init_task.c
80986 +++ b/init/init_task.c
80987 @@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
80988 * Initial thread structure. Alignment of this is handled by a special
80989 * linker map entry.
80990 */
80991 +#ifdef CONFIG_X86
80992 +union thread_union init_thread_union __init_task_data;
80993 +#else
80994 union thread_union init_thread_union __init_task_data =
80995 { INIT_THREAD_INFO(init_task) };
80996 +#endif
80997 diff --git a/init/initramfs.c b/init/initramfs.c
80998 index a67ef9d..2d17ed9 100644
80999 --- a/init/initramfs.c
81000 +++ b/init/initramfs.c
81001 @@ -84,7 +84,7 @@ static void __init free_hash(void)
81002 }
81003 }
81004
81005 -static long __init do_utime(char *filename, time_t mtime)
81006 +static long __init do_utime(char __force_user *filename, time_t mtime)
81007 {
81008 struct timespec t[2];
81009
81010 @@ -119,7 +119,7 @@ static void __init dir_utime(void)
81011 struct dir_entry *de, *tmp;
81012 list_for_each_entry_safe(de, tmp, &dir_list, list) {
81013 list_del(&de->list);
81014 - do_utime(de->name, de->mtime);
81015 + do_utime((char __force_user *)de->name, de->mtime);
81016 kfree(de->name);
81017 kfree(de);
81018 }
81019 @@ -281,7 +281,7 @@ static int __init maybe_link(void)
81020 if (nlink >= 2) {
81021 char *old = find_link(major, minor, ino, mode, collected);
81022 if (old)
81023 - return (sys_link(old, collected) < 0) ? -1 : 1;
81024 + return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
81025 }
81026 return 0;
81027 }
81028 @@ -290,11 +290,11 @@ static void __init clean_path(char *path, umode_t mode)
81029 {
81030 struct stat st;
81031
81032 - if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
81033 + if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
81034 if (S_ISDIR(st.st_mode))
81035 - sys_rmdir(path);
81036 + sys_rmdir((char __force_user *)path);
81037 else
81038 - sys_unlink(path);
81039 + sys_unlink((char __force_user *)path);
81040 }
81041 }
81042
81043 @@ -315,7 +315,7 @@ static int __init do_name(void)
81044 int openflags = O_WRONLY|O_CREAT;
81045 if (ml != 1)
81046 openflags |= O_TRUNC;
81047 - wfd = sys_open(collected, openflags, mode);
81048 + wfd = sys_open((char __force_user *)collected, openflags, mode);
81049
81050 if (wfd >= 0) {
81051 sys_fchown(wfd, uid, gid);
81052 @@ -327,17 +327,17 @@ static int __init do_name(void)
81053 }
81054 }
81055 } else if (S_ISDIR(mode)) {
81056 - sys_mkdir(collected, mode);
81057 - sys_chown(collected, uid, gid);
81058 - sys_chmod(collected, mode);
81059 + sys_mkdir((char __force_user *)collected, mode);
81060 + sys_chown((char __force_user *)collected, uid, gid);
81061 + sys_chmod((char __force_user *)collected, mode);
81062 dir_add(collected, mtime);
81063 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
81064 S_ISFIFO(mode) || S_ISSOCK(mode)) {
81065 if (maybe_link() == 0) {
81066 - sys_mknod(collected, mode, rdev);
81067 - sys_chown(collected, uid, gid);
81068 - sys_chmod(collected, mode);
81069 - do_utime(collected, mtime);
81070 + sys_mknod((char __force_user *)collected, mode, rdev);
81071 + sys_chown((char __force_user *)collected, uid, gid);
81072 + sys_chmod((char __force_user *)collected, mode);
81073 + do_utime((char __force_user *)collected, mtime);
81074 }
81075 }
81076 return 0;
81077 @@ -346,15 +346,15 @@ static int __init do_name(void)
81078 static int __init do_copy(void)
81079 {
81080 if (count >= body_len) {
81081 - sys_write(wfd, victim, body_len);
81082 + sys_write(wfd, (char __force_user *)victim, body_len);
81083 sys_close(wfd);
81084 - do_utime(vcollected, mtime);
81085 + do_utime((char __force_user *)vcollected, mtime);
81086 kfree(vcollected);
81087 eat(body_len);
81088 state = SkipIt;
81089 return 0;
81090 } else {
81091 - sys_write(wfd, victim, count);
81092 + sys_write(wfd, (char __force_user *)victim, count);
81093 body_len -= count;
81094 eat(count);
81095 return 1;
81096 @@ -365,9 +365,9 @@ static int __init do_symlink(void)
81097 {
81098 collected[N_ALIGN(name_len) + body_len] = '\0';
81099 clean_path(collected, 0);
81100 - sys_symlink(collected + N_ALIGN(name_len), collected);
81101 - sys_lchown(collected, uid, gid);
81102 - do_utime(collected, mtime);
81103 + sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
81104 + sys_lchown((char __force_user *)collected, uid, gid);
81105 + do_utime((char __force_user *)collected, mtime);
81106 state = SkipIt;
81107 next_state = Reset;
81108 return 0;
81109 @@ -583,7 +583,7 @@ static int __init populate_rootfs(void)
81110 {
81111 char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size);
81112 if (err)
81113 - panic(err); /* Failed to decompress INTERNAL initramfs */
81114 + panic("%s", err); /* Failed to decompress INTERNAL initramfs */
81115 if (initrd_start) {
81116 #ifdef CONFIG_BLK_DEV_RAM
81117 int fd;
81118 diff --git a/init/main.c b/init/main.c
81119 index 63d3e8f..50bd5f8 100644
81120 --- a/init/main.c
81121 +++ b/init/main.c
81122 @@ -103,6 +103,8 @@ static inline void mark_rodata_ro(void) { }
81123 extern void tc_init(void);
81124 #endif
81125
81126 +extern void grsecurity_init(void);
81127 +
81128 /*
81129 * Debug helper: via this flag we know that we are in 'early bootup code'
81130 * where only the boot processor is running with IRQ disabled. This means
81131 @@ -156,6 +158,75 @@ static int __init set_reset_devices(char *str)
81132
81133 __setup("reset_devices", set_reset_devices);
81134
81135 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
81136 +kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
81137 +static int __init setup_grsec_proc_gid(char *str)
81138 +{
81139 + grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
81140 + return 1;
81141 +}
81142 +__setup("grsec_proc_gid=", setup_grsec_proc_gid);
81143 +#endif
81144 +
81145 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
81146 +unsigned long pax_user_shadow_base __read_only;
81147 +EXPORT_SYMBOL(pax_user_shadow_base);
81148 +extern char pax_enter_kernel_user[];
81149 +extern char pax_exit_kernel_user[];
81150 +#endif
81151 +
81152 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
81153 +static int __init setup_pax_nouderef(char *str)
81154 +{
81155 +#ifdef CONFIG_X86_32
81156 + unsigned int cpu;
81157 + struct desc_struct *gdt;
81158 +
81159 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
81160 + gdt = get_cpu_gdt_table(cpu);
81161 + gdt[GDT_ENTRY_KERNEL_DS].type = 3;
81162 + gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
81163 + gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
81164 + gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
81165 + }
81166 + loadsegment(ds, __KERNEL_DS);
81167 + loadsegment(es, __KERNEL_DS);
81168 + loadsegment(ss, __KERNEL_DS);
81169 +#else
81170 + memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
81171 + memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
81172 + clone_pgd_mask = ~(pgdval_t)0UL;
81173 + pax_user_shadow_base = 0UL;
81174 + setup_clear_cpu_cap(X86_FEATURE_PCID);
81175 + setup_clear_cpu_cap(X86_FEATURE_INVPCID);
81176 +#endif
81177 +
81178 + return 0;
81179 +}
81180 +early_param("pax_nouderef", setup_pax_nouderef);
81181 +
81182 +#ifdef CONFIG_X86_64
81183 +static int __init setup_pax_weakuderef(char *str)
81184 +{
81185 + if (clone_pgd_mask != ~(pgdval_t)0UL)
81186 + pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
81187 + return 1;
81188 +}
81189 +__setup("pax_weakuderef", setup_pax_weakuderef);
81190 +#endif
81191 +#endif
81192 +
81193 +#ifdef CONFIG_PAX_SOFTMODE
81194 +int pax_softmode;
81195 +
81196 +static int __init setup_pax_softmode(char *str)
81197 +{
81198 + get_option(&str, &pax_softmode);
81199 + return 1;
81200 +}
81201 +__setup("pax_softmode=", setup_pax_softmode);
81202 +#endif
81203 +
81204 static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
81205 const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
81206 static const char *panic_later, *panic_param;
81207 @@ -682,25 +753,24 @@ int __init_or_module do_one_initcall(initcall_t fn)
81208 {
81209 int count = preempt_count();
81210 int ret;
81211 - char msgbuf[64];
81212 + const char *msg1 = "", *msg2 = "";
81213
81214 if (initcall_debug)
81215 ret = do_one_initcall_debug(fn);
81216 else
81217 ret = fn();
81218
81219 - msgbuf[0] = 0;
81220 -
81221 if (preempt_count() != count) {
81222 - sprintf(msgbuf, "preemption imbalance ");
81223 + msg1 = " preemption imbalance";
81224 preempt_count() = count;
81225 }
81226 if (irqs_disabled()) {
81227 - strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
81228 + msg2 = " disabled interrupts";
81229 local_irq_enable();
81230 }
81231 - WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
81232 + WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
81233
81234 + add_latent_entropy();
81235 return ret;
81236 }
81237
81238 @@ -807,10 +877,14 @@ static int run_init_process(const char *init_filename)
81239 {
81240 argv_init[0] = init_filename;
81241 return do_execve(init_filename,
81242 - (const char __user *const __user *)argv_init,
81243 - (const char __user *const __user *)envp_init);
81244 + (const char __user *const __force_user *)argv_init,
81245 + (const char __user *const __force_user *)envp_init);
81246 }
81247
81248 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
81249 +extern int gr_init_ran;
81250 +#endif
81251 +
81252 static noinline void __init kernel_init_freeable(void);
81253
81254 static int __ref kernel_init(void *unused)
81255 @@ -831,6 +905,11 @@ static int __ref kernel_init(void *unused)
81256 pr_err("Failed to execute %s\n", ramdisk_execute_command);
81257 }
81258
81259 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
81260 + /* if no initrd was used, be extra sure we enforce chroot restrictions */
81261 + gr_init_ran = 1;
81262 +#endif
81263 +
81264 /*
81265 * We try each of these until one succeeds.
81266 *
81267 @@ -885,7 +964,7 @@ static noinline void __init kernel_init_freeable(void)
81268 do_basic_setup();
81269
81270 /* Open the /dev/console on the rootfs, this should never fail */
81271 - if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
81272 + if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
81273 pr_err("Warning: unable to open an initial console.\n");
81274
81275 (void) sys_dup(0);
81276 @@ -898,11 +977,13 @@ static noinline void __init kernel_init_freeable(void)
81277 if (!ramdisk_execute_command)
81278 ramdisk_execute_command = "/init";
81279
81280 - if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
81281 + if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
81282 ramdisk_execute_command = NULL;
81283 prepare_namespace();
81284 }
81285
81286 + grsecurity_init();
81287 +
81288 /*
81289 * Ok, we have completed the initial bootup, and
81290 * we're essentially up and running. Get rid of the
81291 diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
81292 index b0e99de..09f385c 100644
81293 --- a/ipc/ipc_sysctl.c
81294 +++ b/ipc/ipc_sysctl.c
81295 @@ -30,7 +30,7 @@ static void *get_ipc(ctl_table *table)
81296 static int proc_ipc_dointvec(ctl_table *table, int write,
81297 void __user *buffer, size_t *lenp, loff_t *ppos)
81298 {
81299 - struct ctl_table ipc_table;
81300 + ctl_table_no_const ipc_table;
81301
81302 memcpy(&ipc_table, table, sizeof(ipc_table));
81303 ipc_table.data = get_ipc(table);
81304 @@ -41,7 +41,7 @@ static int proc_ipc_dointvec(ctl_table *table, int write,
81305 static int proc_ipc_dointvec_minmax(ctl_table *table, int write,
81306 void __user *buffer, size_t *lenp, loff_t *ppos)
81307 {
81308 - struct ctl_table ipc_table;
81309 + ctl_table_no_const ipc_table;
81310
81311 memcpy(&ipc_table, table, sizeof(ipc_table));
81312 ipc_table.data = get_ipc(table);
81313 @@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(ctl_table *table, int write,
81314 static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write,
81315 void __user *buffer, size_t *lenp, loff_t *ppos)
81316 {
81317 - struct ctl_table ipc_table;
81318 + ctl_table_no_const ipc_table;
81319 size_t lenp_bef = *lenp;
81320 int rc;
81321
81322 @@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write,
81323 static int proc_ipc_doulongvec_minmax(ctl_table *table, int write,
81324 void __user *buffer, size_t *lenp, loff_t *ppos)
81325 {
81326 - struct ctl_table ipc_table;
81327 + ctl_table_no_const ipc_table;
81328 memcpy(&ipc_table, table, sizeof(ipc_table));
81329 ipc_table.data = get_ipc(table);
81330
81331 @@ -122,7 +122,7 @@ static void ipc_auto_callback(int val)
81332 static int proc_ipcauto_dointvec_minmax(ctl_table *table, int write,
81333 void __user *buffer, size_t *lenp, loff_t *ppos)
81334 {
81335 - struct ctl_table ipc_table;
81336 + ctl_table_no_const ipc_table;
81337 size_t lenp_bef = *lenp;
81338 int oldval;
81339 int rc;
81340 diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
81341 index 383d638..943fdbb 100644
81342 --- a/ipc/mq_sysctl.c
81343 +++ b/ipc/mq_sysctl.c
81344 @@ -25,7 +25,7 @@ static void *get_mq(ctl_table *table)
81345 static int proc_mq_dointvec_minmax(ctl_table *table, int write,
81346 void __user *buffer, size_t *lenp, loff_t *ppos)
81347 {
81348 - struct ctl_table mq_table;
81349 + ctl_table_no_const mq_table;
81350 memcpy(&mq_table, table, sizeof(mq_table));
81351 mq_table.data = get_mq(table);
81352
81353 diff --git a/ipc/mqueue.c b/ipc/mqueue.c
81354 index ae1996d..a35f2cc 100644
81355 --- a/ipc/mqueue.c
81356 +++ b/ipc/mqueue.c
81357 @@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
81358 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
81359 info->attr.mq_msgsize);
81360
81361 + gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
81362 spin_lock(&mq_lock);
81363 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
81364 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
81365 diff --git a/ipc/msg.c b/ipc/msg.c
81366 index 558aa91..359e718 100644
81367 --- a/ipc/msg.c
81368 +++ b/ipc/msg.c
81369 @@ -297,18 +297,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
81370 return security_msg_queue_associate(msq, msgflg);
81371 }
81372
81373 +static struct ipc_ops msg_ops = {
81374 + .getnew = newque,
81375 + .associate = msg_security,
81376 + .more_checks = NULL
81377 +};
81378 +
81379 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
81380 {
81381 struct ipc_namespace *ns;
81382 - struct ipc_ops msg_ops;
81383 struct ipc_params msg_params;
81384
81385 ns = current->nsproxy->ipc_ns;
81386
81387 - msg_ops.getnew = newque;
81388 - msg_ops.associate = msg_security;
81389 - msg_ops.more_checks = NULL;
81390 -
81391 msg_params.key = key;
81392 msg_params.flg = msgflg;
81393
81394 diff --git a/ipc/sem.c b/ipc/sem.c
81395 index db9d241..bc8427c 100644
81396 --- a/ipc/sem.c
81397 +++ b/ipc/sem.c
81398 @@ -562,10 +562,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
81399 return 0;
81400 }
81401
81402 +static struct ipc_ops sem_ops = {
81403 + .getnew = newary,
81404 + .associate = sem_security,
81405 + .more_checks = sem_more_checks
81406 +};
81407 +
81408 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
81409 {
81410 struct ipc_namespace *ns;
81411 - struct ipc_ops sem_ops;
81412 struct ipc_params sem_params;
81413
81414 ns = current->nsproxy->ipc_ns;
81415 @@ -573,10 +578,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
81416 if (nsems < 0 || nsems > ns->sc_semmsl)
81417 return -EINVAL;
81418
81419 - sem_ops.getnew = newary;
81420 - sem_ops.associate = sem_security;
81421 - sem_ops.more_checks = sem_more_checks;
81422 -
81423 sem_params.key = key;
81424 sem_params.flg = semflg;
81425 sem_params.u.nsems = nsems;
81426 diff --git a/ipc/shm.c b/ipc/shm.c
81427 index 7a51443..3a257d8 100644
81428 --- a/ipc/shm.c
81429 +++ b/ipc/shm.c
81430 @@ -72,6 +72,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
81431 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
81432 #endif
81433
81434 +#ifdef CONFIG_GRKERNSEC
81435 +extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
81436 + const time_t shm_createtime, const kuid_t cuid,
81437 + const int shmid);
81438 +extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
81439 + const time_t shm_createtime);
81440 +#endif
81441 +
81442 void shm_init_ns(struct ipc_namespace *ns)
81443 {
81444 ns->shm_ctlmax = SHMMAX;
81445 @@ -554,6 +562,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
81446 shp->shm_lprid = 0;
81447 shp->shm_atim = shp->shm_dtim = 0;
81448 shp->shm_ctim = get_seconds();
81449 +#ifdef CONFIG_GRKERNSEC
81450 + {
81451 + struct timespec timeval;
81452 + do_posix_clock_monotonic_gettime(&timeval);
81453 +
81454 + shp->shm_createtime = timeval.tv_sec;
81455 + }
81456 +#endif
81457 shp->shm_segsz = size;
81458 shp->shm_nattch = 0;
81459 shp->shm_file = file;
81460 @@ -607,18 +623,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
81461 return 0;
81462 }
81463
81464 +static struct ipc_ops shm_ops = {
81465 + .getnew = newseg,
81466 + .associate = shm_security,
81467 + .more_checks = shm_more_checks
81468 +};
81469 +
81470 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
81471 {
81472 struct ipc_namespace *ns;
81473 - struct ipc_ops shm_ops;
81474 struct ipc_params shm_params;
81475
81476 ns = current->nsproxy->ipc_ns;
81477
81478 - shm_ops.getnew = newseg;
81479 - shm_ops.associate = shm_security;
81480 - shm_ops.more_checks = shm_more_checks;
81481 -
81482 shm_params.key = key;
81483 shm_params.flg = shmflg;
81484 shm_params.u.size = size;
81485 @@ -1089,6 +1106,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
81486 f_mode = FMODE_READ | FMODE_WRITE;
81487 }
81488 if (shmflg & SHM_EXEC) {
81489 +
81490 +#ifdef CONFIG_PAX_MPROTECT
81491 + if (current->mm->pax_flags & MF_PAX_MPROTECT)
81492 + goto out;
81493 +#endif
81494 +
81495 prot |= PROT_EXEC;
81496 acc_mode |= S_IXUGO;
81497 }
81498 @@ -1113,6 +1136,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
81499 if (err)
81500 goto out_unlock;
81501
81502 +#ifdef CONFIG_GRKERNSEC
81503 + if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
81504 + shp->shm_perm.cuid, shmid) ||
81505 + !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
81506 + err = -EACCES;
81507 + goto out_unlock;
81508 + }
81509 +#endif
81510 +
81511 ipc_lock_object(&shp->shm_perm);
81512
81513 /* check if shm_destroy() is tearing down shp */
81514 @@ -1125,6 +1157,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
81515 path = shp->shm_file->f_path;
81516 path_get(&path);
81517 shp->shm_nattch++;
81518 +#ifdef CONFIG_GRKERNSEC
81519 + shp->shm_lapid = current->pid;
81520 +#endif
81521 size = i_size_read(path.dentry->d_inode);
81522 ipc_unlock_object(&shp->shm_perm);
81523 rcu_read_unlock();
81524 diff --git a/ipc/util.c b/ipc/util.c
81525 index 7684f41..5bf1880 100644
81526 --- a/ipc/util.c
81527 +++ b/ipc/util.c
81528 @@ -71,6 +71,8 @@ struct ipc_proc_iface {
81529 int (*show)(struct seq_file *, void *);
81530 };
81531
81532 +extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
81533 +
81534 static void ipc_memory_notifier(struct work_struct *work)
81535 {
81536 ipcns_notify(IPCNS_MEMCHANGED);
81537 @@ -560,6 +562,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
81538 granted_mode >>= 6;
81539 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
81540 granted_mode >>= 3;
81541 +
81542 + if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
81543 + return -1;
81544 +
81545 /* is there some bit set in requested_mode but not in granted_mode? */
81546 if ((requested_mode & ~granted_mode & 0007) &&
81547 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
81548 diff --git a/kernel/acct.c b/kernel/acct.c
81549 index 8d6e145..33e0b1e 100644
81550 --- a/kernel/acct.c
81551 +++ b/kernel/acct.c
81552 @@ -556,7 +556,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
81553 */
81554 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
81555 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
81556 - file->f_op->write(file, (char *)&ac,
81557 + file->f_op->write(file, (char __force_user *)&ac,
81558 sizeof(acct_t), &file->f_pos);
81559 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
81560 set_fs(fs);
81561 diff --git a/kernel/audit.c b/kernel/audit.c
81562 index 7ddfd8a..49766eb 100644
81563 --- a/kernel/audit.c
81564 +++ b/kernel/audit.c
81565 @@ -118,7 +118,7 @@ u32 audit_sig_sid = 0;
81566 3) suppressed due to audit_rate_limit
81567 4) suppressed due to audit_backlog_limit
81568 */
81569 -static atomic_t audit_lost = ATOMIC_INIT(0);
81570 +static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
81571
81572 /* The netlink socket. */
81573 static struct sock *audit_sock;
81574 @@ -240,7 +240,7 @@ void audit_log_lost(const char *message)
81575 unsigned long now;
81576 int print;
81577
81578 - atomic_inc(&audit_lost);
81579 + atomic_inc_unchecked(&audit_lost);
81580
81581 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
81582
81583 @@ -259,7 +259,7 @@ void audit_log_lost(const char *message)
81584 printk(KERN_WARNING
81585 "audit: audit_lost=%d audit_rate_limit=%d "
81586 "audit_backlog_limit=%d\n",
81587 - atomic_read(&audit_lost),
81588 + atomic_read_unchecked(&audit_lost),
81589 audit_rate_limit,
81590 audit_backlog_limit);
81591 audit_panic(message);
81592 @@ -665,7 +665,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
81593 status_set.pid = audit_pid;
81594 status_set.rate_limit = audit_rate_limit;
81595 status_set.backlog_limit = audit_backlog_limit;
81596 - status_set.lost = atomic_read(&audit_lost);
81597 + status_set.lost = atomic_read_unchecked(&audit_lost);
81598 status_set.backlog = skb_queue_len(&audit_skb_queue);
81599 audit_send_reply(NETLINK_CB(skb).portid, seq, AUDIT_GET, 0, 0,
81600 &status_set, sizeof(status_set));
81601 @@ -1252,7 +1252,7 @@ void audit_log_n_hex(struct audit_buffer *ab, const unsigned char *buf,
81602 int i, avail, new_len;
81603 unsigned char *ptr;
81604 struct sk_buff *skb;
81605 - static const unsigned char *hex = "0123456789ABCDEF";
81606 + static const unsigned char hex[] = "0123456789ABCDEF";
81607
81608 if (!ab)
81609 return;
81610 diff --git a/kernel/auditsc.c b/kernel/auditsc.c
81611 index 9845cb3..3ec9369 100644
81612 --- a/kernel/auditsc.c
81613 +++ b/kernel/auditsc.c
81614 @@ -1962,7 +1962,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
81615 }
81616
81617 /* global counter which is incremented every time something logs in */
81618 -static atomic_t session_id = ATOMIC_INIT(0);
81619 +static atomic_unchecked_t session_id = ATOMIC_INIT(0);
81620
81621 /**
81622 * audit_set_loginuid - set current task's audit_context loginuid
81623 @@ -1986,7 +1986,7 @@ int audit_set_loginuid(kuid_t loginuid)
81624 return -EPERM;
81625 #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
81626
81627 - sessionid = atomic_inc_return(&session_id);
81628 + sessionid = atomic_inc_return_unchecked(&session_id);
81629 if (context && context->in_syscall) {
81630 struct audit_buffer *ab;
81631
81632 diff --git a/kernel/capability.c b/kernel/capability.c
81633 index 4e66bf9..cdccecf 100644
81634 --- a/kernel/capability.c
81635 +++ b/kernel/capability.c
81636 @@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
81637 * before modification is attempted and the application
81638 * fails.
81639 */
81640 + if (tocopy > ARRAY_SIZE(kdata))
81641 + return -EFAULT;
81642 +
81643 if (copy_to_user(dataptr, kdata, tocopy
81644 * sizeof(struct __user_cap_data_struct))) {
81645 return -EFAULT;
81646 @@ -303,10 +306,11 @@ bool has_ns_capability(struct task_struct *t,
81647 int ret;
81648
81649 rcu_read_lock();
81650 - ret = security_capable(__task_cred(t), ns, cap);
81651 + ret = security_capable(__task_cred(t), ns, cap) == 0 &&
81652 + gr_task_is_capable(t, __task_cred(t), cap);
81653 rcu_read_unlock();
81654
81655 - return (ret == 0);
81656 + return ret;
81657 }
81658
81659 /**
81660 @@ -343,10 +347,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
81661 int ret;
81662
81663 rcu_read_lock();
81664 - ret = security_capable_noaudit(__task_cred(t), ns, cap);
81665 + ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
81666 rcu_read_unlock();
81667
81668 - return (ret == 0);
81669 + return ret;
81670 }
81671
81672 /**
81673 @@ -384,7 +388,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
81674 BUG();
81675 }
81676
81677 - if (security_capable(current_cred(), ns, cap) == 0) {
81678 + if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
81679 current->flags |= PF_SUPERPRIV;
81680 return true;
81681 }
81682 @@ -392,6 +396,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
81683 }
81684 EXPORT_SYMBOL(ns_capable);
81685
81686 +bool ns_capable_nolog(struct user_namespace *ns, int cap)
81687 +{
81688 + if (unlikely(!cap_valid(cap))) {
81689 + printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
81690 + BUG();
81691 + }
81692 +
81693 + if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
81694 + current->flags |= PF_SUPERPRIV;
81695 + return true;
81696 + }
81697 + return false;
81698 +}
81699 +EXPORT_SYMBOL(ns_capable_nolog);
81700 +
81701 /**
81702 * file_ns_capable - Determine if the file's opener had a capability in effect
81703 * @file: The file we want to check
81704 @@ -432,6 +451,12 @@ bool capable(int cap)
81705 }
81706 EXPORT_SYMBOL(capable);
81707
81708 +bool capable_nolog(int cap)
81709 +{
81710 + return ns_capable_nolog(&init_user_ns, cap);
81711 +}
81712 +EXPORT_SYMBOL(capable_nolog);
81713 +
81714 /**
81715 * inode_capable - Check superior capability over inode
81716 * @inode: The inode in question
81717 @@ -453,3 +478,11 @@ bool inode_capable(const struct inode *inode, int cap)
81718 return ns_capable(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
81719 }
81720 EXPORT_SYMBOL(inode_capable);
81721 +
81722 +bool inode_capable_nolog(const struct inode *inode, int cap)
81723 +{
81724 + struct user_namespace *ns = current_user_ns();
81725 +
81726 + return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
81727 +}
81728 +EXPORT_SYMBOL(inode_capable_nolog);
81729 diff --git a/kernel/cgroup.c b/kernel/cgroup.c
81730 index 5c9127d..f871169 100644
81731 --- a/kernel/cgroup.c
81732 +++ b/kernel/cgroup.c
81733 @@ -5844,7 +5844,7 @@ static int cgroup_css_links_read(struct cgroup_subsys_state *css,
81734 struct css_set *cset = link->cset;
81735 struct task_struct *task;
81736 int count = 0;
81737 - seq_printf(seq, "css_set %p\n", cset);
81738 + seq_printf(seq, "css_set %pK\n", cset);
81739 list_for_each_entry(task, &cset->tasks, cg_list) {
81740 if (count++ > MAX_TASKS_SHOWN_PER_CSS) {
81741 seq_puts(seq, " ...\n");
81742 diff --git a/kernel/compat.c b/kernel/compat.c
81743 index 0a09e48..f44f3f0 100644
81744 --- a/kernel/compat.c
81745 +++ b/kernel/compat.c
81746 @@ -13,6 +13,7 @@
81747
81748 #include <linux/linkage.h>
81749 #include <linux/compat.h>
81750 +#include <linux/module.h>
81751 #include <linux/errno.h>
81752 #include <linux/time.h>
81753 #include <linux/signal.h>
81754 @@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
81755 mm_segment_t oldfs;
81756 long ret;
81757
81758 - restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
81759 + restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
81760 oldfs = get_fs();
81761 set_fs(KERNEL_DS);
81762 ret = hrtimer_nanosleep_restart(restart);
81763 @@ -252,7 +253,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
81764 oldfs = get_fs();
81765 set_fs(KERNEL_DS);
81766 ret = hrtimer_nanosleep(&tu,
81767 - rmtp ? (struct timespec __user *)&rmt : NULL,
81768 + rmtp ? (struct timespec __force_user *)&rmt : NULL,
81769 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
81770 set_fs(oldfs);
81771
81772 @@ -361,7 +362,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
81773 mm_segment_t old_fs = get_fs();
81774
81775 set_fs(KERNEL_DS);
81776 - ret = sys_sigpending((old_sigset_t __user *) &s);
81777 + ret = sys_sigpending((old_sigset_t __force_user *) &s);
81778 set_fs(old_fs);
81779 if (ret == 0)
81780 ret = put_user(s, set);
81781 @@ -451,7 +452,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
81782 mm_segment_t old_fs = get_fs();
81783
81784 set_fs(KERNEL_DS);
81785 - ret = sys_old_getrlimit(resource, &r);
81786 + ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
81787 set_fs(old_fs);
81788
81789 if (!ret) {
81790 @@ -533,8 +534,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
81791 set_fs (KERNEL_DS);
81792 ret = sys_wait4(pid,
81793 (stat_addr ?
81794 - (unsigned int __user *) &status : NULL),
81795 - options, (struct rusage __user *) &r);
81796 + (unsigned int __force_user *) &status : NULL),
81797 + options, (struct rusage __force_user *) &r);
81798 set_fs (old_fs);
81799
81800 if (ret > 0) {
81801 @@ -560,8 +561,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
81802 memset(&info, 0, sizeof(info));
81803
81804 set_fs(KERNEL_DS);
81805 - ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
81806 - uru ? (struct rusage __user *)&ru : NULL);
81807 + ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
81808 + uru ? (struct rusage __force_user *)&ru : NULL);
81809 set_fs(old_fs);
81810
81811 if ((ret < 0) || (info.si_signo == 0))
81812 @@ -695,8 +696,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
81813 oldfs = get_fs();
81814 set_fs(KERNEL_DS);
81815 err = sys_timer_settime(timer_id, flags,
81816 - (struct itimerspec __user *) &newts,
81817 - (struct itimerspec __user *) &oldts);
81818 + (struct itimerspec __force_user *) &newts,
81819 + (struct itimerspec __force_user *) &oldts);
81820 set_fs(oldfs);
81821 if (!err && old && put_compat_itimerspec(old, &oldts))
81822 return -EFAULT;
81823 @@ -713,7 +714,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
81824 oldfs = get_fs();
81825 set_fs(KERNEL_DS);
81826 err = sys_timer_gettime(timer_id,
81827 - (struct itimerspec __user *) &ts);
81828 + (struct itimerspec __force_user *) &ts);
81829 set_fs(oldfs);
81830 if (!err && put_compat_itimerspec(setting, &ts))
81831 return -EFAULT;
81832 @@ -732,7 +733,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
81833 oldfs = get_fs();
81834 set_fs(KERNEL_DS);
81835 err = sys_clock_settime(which_clock,
81836 - (struct timespec __user *) &ts);
81837 + (struct timespec __force_user *) &ts);
81838 set_fs(oldfs);
81839 return err;
81840 }
81841 @@ -747,7 +748,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
81842 oldfs = get_fs();
81843 set_fs(KERNEL_DS);
81844 err = sys_clock_gettime(which_clock,
81845 - (struct timespec __user *) &ts);
81846 + (struct timespec __force_user *) &ts);
81847 set_fs(oldfs);
81848 if (!err && put_compat_timespec(&ts, tp))
81849 return -EFAULT;
81850 @@ -767,7 +768,7 @@ long compat_sys_clock_adjtime(clockid_t which_clock,
81851
81852 oldfs = get_fs();
81853 set_fs(KERNEL_DS);
81854 - ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
81855 + ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
81856 set_fs(oldfs);
81857
81858 err = compat_put_timex(utp, &txc);
81859 @@ -787,7 +788,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
81860 oldfs = get_fs();
81861 set_fs(KERNEL_DS);
81862 err = sys_clock_getres(which_clock,
81863 - (struct timespec __user *) &ts);
81864 + (struct timespec __force_user *) &ts);
81865 set_fs(oldfs);
81866 if (!err && tp && put_compat_timespec(&ts, tp))
81867 return -EFAULT;
81868 @@ -799,9 +800,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
81869 long err;
81870 mm_segment_t oldfs;
81871 struct timespec tu;
81872 - struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
81873 + struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
81874
81875 - restart->nanosleep.rmtp = (struct timespec __user *) &tu;
81876 + restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
81877 oldfs = get_fs();
81878 set_fs(KERNEL_DS);
81879 err = clock_nanosleep_restart(restart);
81880 @@ -833,8 +834,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
81881 oldfs = get_fs();
81882 set_fs(KERNEL_DS);
81883 err = sys_clock_nanosleep(which_clock, flags,
81884 - (struct timespec __user *) &in,
81885 - (struct timespec __user *) &out);
81886 + (struct timespec __force_user *) &in,
81887 + (struct timespec __force_user *) &out);
81888 set_fs(oldfs);
81889
81890 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
81891 diff --git a/kernel/configs.c b/kernel/configs.c
81892 index c18b1f1..b9a0132 100644
81893 --- a/kernel/configs.c
81894 +++ b/kernel/configs.c
81895 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
81896 struct proc_dir_entry *entry;
81897
81898 /* create the current config file */
81899 +#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
81900 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
81901 + entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
81902 + &ikconfig_file_ops);
81903 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81904 + entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
81905 + &ikconfig_file_ops);
81906 +#endif
81907 +#else
81908 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
81909 &ikconfig_file_ops);
81910 +#endif
81911 +
81912 if (!entry)
81913 return -ENOMEM;
81914
81915 diff --git a/kernel/cred.c b/kernel/cred.c
81916 index e0573a4..3874e41 100644
81917 --- a/kernel/cred.c
81918 +++ b/kernel/cred.c
81919 @@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
81920 validate_creds(cred);
81921 alter_cred_subscribers(cred, -1);
81922 put_cred(cred);
81923 +
81924 +#ifdef CONFIG_GRKERNSEC_SETXID
81925 + cred = (struct cred *) tsk->delayed_cred;
81926 + if (cred != NULL) {
81927 + tsk->delayed_cred = NULL;
81928 + validate_creds(cred);
81929 + alter_cred_subscribers(cred, -1);
81930 + put_cred(cred);
81931 + }
81932 +#endif
81933 }
81934
81935 /**
81936 @@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
81937 * Always returns 0 thus allowing this function to be tail-called at the end
81938 * of, say, sys_setgid().
81939 */
81940 -int commit_creds(struct cred *new)
81941 +static int __commit_creds(struct cred *new)
81942 {
81943 struct task_struct *task = current;
81944 const struct cred *old = task->real_cred;
81945 @@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
81946
81947 get_cred(new); /* we will require a ref for the subj creds too */
81948
81949 + gr_set_role_label(task, new->uid, new->gid);
81950 +
81951 /* dumpability changes */
81952 if (!uid_eq(old->euid, new->euid) ||
81953 !gid_eq(old->egid, new->egid) ||
81954 @@ -479,6 +491,102 @@ int commit_creds(struct cred *new)
81955 put_cred(old);
81956 return 0;
81957 }
81958 +#ifdef CONFIG_GRKERNSEC_SETXID
81959 +extern int set_user(struct cred *new);
81960 +
81961 +void gr_delayed_cred_worker(void)
81962 +{
81963 + const struct cred *new = current->delayed_cred;
81964 + struct cred *ncred;
81965 +
81966 + current->delayed_cred = NULL;
81967 +
81968 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
81969 + // from doing get_cred on it when queueing this
81970 + put_cred(new);
81971 + return;
81972 + } else if (new == NULL)
81973 + return;
81974 +
81975 + ncred = prepare_creds();
81976 + if (!ncred)
81977 + goto die;
81978 + // uids
81979 + ncred->uid = new->uid;
81980 + ncred->euid = new->euid;
81981 + ncred->suid = new->suid;
81982 + ncred->fsuid = new->fsuid;
81983 + // gids
81984 + ncred->gid = new->gid;
81985 + ncred->egid = new->egid;
81986 + ncred->sgid = new->sgid;
81987 + ncred->fsgid = new->fsgid;
81988 + // groups
81989 + if (set_groups(ncred, new->group_info) < 0) {
81990 + abort_creds(ncred);
81991 + goto die;
81992 + }
81993 + // caps
81994 + ncred->securebits = new->securebits;
81995 + ncred->cap_inheritable = new->cap_inheritable;
81996 + ncred->cap_permitted = new->cap_permitted;
81997 + ncred->cap_effective = new->cap_effective;
81998 + ncred->cap_bset = new->cap_bset;
81999 +
82000 + if (set_user(ncred)) {
82001 + abort_creds(ncred);
82002 + goto die;
82003 + }
82004 +
82005 + // from doing get_cred on it when queueing this
82006 + put_cred(new);
82007 +
82008 + __commit_creds(ncred);
82009 + return;
82010 +die:
82011 + // from doing get_cred on it when queueing this
82012 + put_cred(new);
82013 + do_group_exit(SIGKILL);
82014 +}
82015 +#endif
82016 +
82017 +int commit_creds(struct cred *new)
82018 +{
82019 +#ifdef CONFIG_GRKERNSEC_SETXID
82020 + int ret;
82021 + int schedule_it = 0;
82022 + struct task_struct *t;
82023 +
82024 + /* we won't get called with tasklist_lock held for writing
82025 + and interrupts disabled as the cred struct in that case is
82026 + init_cred
82027 + */
82028 + if (grsec_enable_setxid && !current_is_single_threaded() &&
82029 + uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
82030 + !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
82031 + schedule_it = 1;
82032 + }
82033 + ret = __commit_creds(new);
82034 + if (schedule_it) {
82035 + rcu_read_lock();
82036 + read_lock(&tasklist_lock);
82037 + for (t = next_thread(current); t != current;
82038 + t = next_thread(t)) {
82039 + if (t->delayed_cred == NULL) {
82040 + t->delayed_cred = get_cred(new);
82041 + set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
82042 + set_tsk_need_resched(t);
82043 + }
82044 + }
82045 + read_unlock(&tasklist_lock);
82046 + rcu_read_unlock();
82047 + }
82048 + return ret;
82049 +#else
82050 + return __commit_creds(new);
82051 +#endif
82052 +}
82053 +
82054 EXPORT_SYMBOL(commit_creds);
82055
82056 /**
82057 diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
82058 index 0506d44..2c20034 100644
82059 --- a/kernel/debug/debug_core.c
82060 +++ b/kernel/debug/debug_core.c
82061 @@ -123,7 +123,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
82062 */
82063 static atomic_t masters_in_kgdb;
82064 static atomic_t slaves_in_kgdb;
82065 -static atomic_t kgdb_break_tasklet_var;
82066 +static atomic_unchecked_t kgdb_break_tasklet_var;
82067 atomic_t kgdb_setting_breakpoint;
82068
82069 struct task_struct *kgdb_usethread;
82070 @@ -133,7 +133,7 @@ int kgdb_single_step;
82071 static pid_t kgdb_sstep_pid;
82072
82073 /* to keep track of the CPU which is doing the single stepping*/
82074 -atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
82075 +atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
82076
82077 /*
82078 * If you are debugging a problem where roundup (the collection of
82079 @@ -541,7 +541,7 @@ return_normal:
82080 * kernel will only try for the value of sstep_tries before
82081 * giving up and continuing on.
82082 */
82083 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
82084 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
82085 (kgdb_info[cpu].task &&
82086 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
82087 atomic_set(&kgdb_active, -1);
82088 @@ -635,8 +635,8 @@ cpu_master_loop:
82089 }
82090
82091 kgdb_restore:
82092 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
82093 - int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
82094 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
82095 + int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
82096 if (kgdb_info[sstep_cpu].task)
82097 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
82098 else
82099 @@ -888,18 +888,18 @@ static void kgdb_unregister_callbacks(void)
82100 static void kgdb_tasklet_bpt(unsigned long ing)
82101 {
82102 kgdb_breakpoint();
82103 - atomic_set(&kgdb_break_tasklet_var, 0);
82104 + atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
82105 }
82106
82107 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
82108
82109 void kgdb_schedule_breakpoint(void)
82110 {
82111 - if (atomic_read(&kgdb_break_tasklet_var) ||
82112 + if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
82113 atomic_read(&kgdb_active) != -1 ||
82114 atomic_read(&kgdb_setting_breakpoint))
82115 return;
82116 - atomic_inc(&kgdb_break_tasklet_var);
82117 + atomic_inc_unchecked(&kgdb_break_tasklet_var);
82118 tasklet_schedule(&kgdb_tasklet_breakpoint);
82119 }
82120 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
82121 diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
82122 index 00eb8f7..d7e3244 100644
82123 --- a/kernel/debug/kdb/kdb_main.c
82124 +++ b/kernel/debug/kdb/kdb_main.c
82125 @@ -1974,7 +1974,7 @@ static int kdb_lsmod(int argc, const char **argv)
82126 continue;
82127
82128 kdb_printf("%-20s%8u 0x%p ", mod->name,
82129 - mod->core_size, (void *)mod);
82130 + mod->core_size_rx + mod->core_size_rw, (void *)mod);
82131 #ifdef CONFIG_MODULE_UNLOAD
82132 kdb_printf("%4ld ", module_refcount(mod));
82133 #endif
82134 @@ -1984,7 +1984,7 @@ static int kdb_lsmod(int argc, const char **argv)
82135 kdb_printf(" (Loading)");
82136 else
82137 kdb_printf(" (Live)");
82138 - kdb_printf(" 0x%p", mod->module_core);
82139 + kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
82140
82141 #ifdef CONFIG_MODULE_UNLOAD
82142 {
82143 diff --git a/kernel/events/core.c b/kernel/events/core.c
82144 index 953c143..5646bb1 100644
82145 --- a/kernel/events/core.c
82146 +++ b/kernel/events/core.c
82147 @@ -157,8 +157,15 @@ static struct srcu_struct pmus_srcu;
82148 * 0 - disallow raw tracepoint access for unpriv
82149 * 1 - disallow cpu events for unpriv
82150 * 2 - disallow kernel profiling for unpriv
82151 + * 3 - disallow all unpriv perf event use
82152 */
82153 -int sysctl_perf_event_paranoid __read_mostly = 1;
82154 +#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
82155 +int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
82156 +#elif defined(CONFIG_GRKERNSEC_HIDESYM)
82157 +int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
82158 +#else
82159 +int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
82160 +#endif
82161
82162 /* Minimum for 512 kiB + 1 user control page */
82163 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
82164 @@ -271,7 +278,7 @@ void perf_sample_event_took(u64 sample_len_ns)
82165 update_perf_cpu_limits();
82166 }
82167
82168 -static atomic64_t perf_event_id;
82169 +static atomic64_unchecked_t perf_event_id;
82170
82171 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
82172 enum event_type_t event_type);
82173 @@ -2940,7 +2947,7 @@ static void __perf_event_read(void *info)
82174
82175 static inline u64 perf_event_count(struct perf_event *event)
82176 {
82177 - return local64_read(&event->count) + atomic64_read(&event->child_count);
82178 + return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
82179 }
82180
82181 static u64 perf_event_read(struct perf_event *event)
82182 @@ -3308,9 +3315,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
82183 mutex_lock(&event->child_mutex);
82184 total += perf_event_read(event);
82185 *enabled += event->total_time_enabled +
82186 - atomic64_read(&event->child_total_time_enabled);
82187 + atomic64_read_unchecked(&event->child_total_time_enabled);
82188 *running += event->total_time_running +
82189 - atomic64_read(&event->child_total_time_running);
82190 + atomic64_read_unchecked(&event->child_total_time_running);
82191
82192 list_for_each_entry(child, &event->child_list, child_list) {
82193 total += perf_event_read(child);
82194 @@ -3725,10 +3732,10 @@ void perf_event_update_userpage(struct perf_event *event)
82195 userpg->offset -= local64_read(&event->hw.prev_count);
82196
82197 userpg->time_enabled = enabled +
82198 - atomic64_read(&event->child_total_time_enabled);
82199 + atomic64_read_unchecked(&event->child_total_time_enabled);
82200
82201 userpg->time_running = running +
82202 - atomic64_read(&event->child_total_time_running);
82203 + atomic64_read_unchecked(&event->child_total_time_running);
82204
82205 arch_perf_update_userpage(userpg, now);
82206
82207 @@ -4279,7 +4286,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
82208
82209 /* Data. */
82210 sp = perf_user_stack_pointer(regs);
82211 - rem = __output_copy_user(handle, (void *) sp, dump_size);
82212 + rem = __output_copy_user(handle, (void __user *) sp, dump_size);
82213 dyn_size = dump_size - rem;
82214
82215 perf_output_skip(handle, rem);
82216 @@ -4370,11 +4377,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
82217 values[n++] = perf_event_count(event);
82218 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
82219 values[n++] = enabled +
82220 - atomic64_read(&event->child_total_time_enabled);
82221 + atomic64_read_unchecked(&event->child_total_time_enabled);
82222 }
82223 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
82224 values[n++] = running +
82225 - atomic64_read(&event->child_total_time_running);
82226 + atomic64_read_unchecked(&event->child_total_time_running);
82227 }
82228 if (read_format & PERF_FORMAT_ID)
82229 values[n++] = primary_event_id(event);
82230 @@ -5112,12 +5119,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
82231 * need to add enough zero bytes after the string to handle
82232 * the 64bit alignment we do later.
82233 */
82234 - buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
82235 + buf = kzalloc(PATH_MAX, GFP_KERNEL);
82236 if (!buf) {
82237 name = strncpy(tmp, "//enomem", sizeof(tmp));
82238 goto got_name;
82239 }
82240 - name = d_path(&file->f_path, buf, PATH_MAX);
82241 + name = d_path(&file->f_path, buf, PATH_MAX - sizeof(u64));
82242 if (IS_ERR(name)) {
82243 name = strncpy(tmp, "//toolong", sizeof(tmp));
82244 goto got_name;
82245 @@ -6639,7 +6646,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
82246 event->parent = parent_event;
82247
82248 event->ns = get_pid_ns(task_active_pid_ns(current));
82249 - event->id = atomic64_inc_return(&perf_event_id);
82250 + event->id = atomic64_inc_return_unchecked(&perf_event_id);
82251
82252 event->state = PERF_EVENT_STATE_INACTIVE;
82253
82254 @@ -6938,6 +6945,11 @@ SYSCALL_DEFINE5(perf_event_open,
82255 if (flags & ~PERF_FLAG_ALL)
82256 return -EINVAL;
82257
82258 +#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
82259 + if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
82260 + return -EACCES;
82261 +#endif
82262 +
82263 err = perf_copy_attr(attr_uptr, &attr);
82264 if (err)
82265 return err;
82266 @@ -7271,10 +7283,10 @@ static void sync_child_event(struct perf_event *child_event,
82267 /*
82268 * Add back the child's count to the parent's count:
82269 */
82270 - atomic64_add(child_val, &parent_event->child_count);
82271 - atomic64_add(child_event->total_time_enabled,
82272 + atomic64_add_unchecked(child_val, &parent_event->child_count);
82273 + atomic64_add_unchecked(child_event->total_time_enabled,
82274 &parent_event->child_total_time_enabled);
82275 - atomic64_add(child_event->total_time_running,
82276 + atomic64_add_unchecked(child_event->total_time_running,
82277 &parent_event->child_total_time_running);
82278
82279 /*
82280 diff --git a/kernel/events/internal.h b/kernel/events/internal.h
82281 index ca65997..60df03d 100644
82282 --- a/kernel/events/internal.h
82283 +++ b/kernel/events/internal.h
82284 @@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
82285 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
82286 }
82287
82288 -#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
82289 -static inline unsigned int \
82290 +#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
82291 +static inline unsigned long \
82292 func_name(struct perf_output_handle *handle, \
82293 - const void *buf, unsigned int len) \
82294 + const void user *buf, unsigned long len) \
82295 { \
82296 unsigned long size, written; \
82297 \
82298 @@ -116,17 +116,17 @@ static inline int memcpy_common(void *dst, const void *src, size_t n)
82299 return n;
82300 }
82301
82302 -DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
82303 +DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
82304
82305 #define MEMCPY_SKIP(dst, src, n) (n)
82306
82307 -DEFINE_OUTPUT_COPY(__output_skip, MEMCPY_SKIP)
82308 +DEFINE_OUTPUT_COPY(__output_skip, MEMCPY_SKIP, )
82309
82310 #ifndef arch_perf_out_copy_user
82311 #define arch_perf_out_copy_user __copy_from_user_inatomic
82312 #endif
82313
82314 -DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
82315 +DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
82316
82317 /* Callchain handling */
82318 extern struct perf_callchain_entry *
82319 diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
82320 index ad8e1bd..fed7ba9 100644
82321 --- a/kernel/events/uprobes.c
82322 +++ b/kernel/events/uprobes.c
82323 @@ -1556,7 +1556,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
82324 {
82325 struct page *page;
82326 uprobe_opcode_t opcode;
82327 - int result;
82328 + long result;
82329
82330 pagefault_disable();
82331 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
82332 diff --git a/kernel/exit.c b/kernel/exit.c
82333 index a949819..a5f127d 100644
82334 --- a/kernel/exit.c
82335 +++ b/kernel/exit.c
82336 @@ -172,6 +172,10 @@ void release_task(struct task_struct * p)
82337 struct task_struct *leader;
82338 int zap_leader;
82339 repeat:
82340 +#ifdef CONFIG_NET
82341 + gr_del_task_from_ip_table(p);
82342 +#endif
82343 +
82344 /* don't need to get the RCU readlock here - the process is dead and
82345 * can't be modifying its own credentials. But shut RCU-lockdep up */
82346 rcu_read_lock();
82347 @@ -329,7 +333,7 @@ int allow_signal(int sig)
82348 * know it'll be handled, so that they don't get converted to
82349 * SIGKILL or just silently dropped.
82350 */
82351 - current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
82352 + current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
82353 recalc_sigpending();
82354 spin_unlock_irq(&current->sighand->siglock);
82355 return 0;
82356 @@ -698,6 +702,8 @@ void do_exit(long code)
82357 struct task_struct *tsk = current;
82358 int group_dead;
82359
82360 + set_fs(USER_DS);
82361 +
82362 profile_task_exit(tsk);
82363
82364 WARN_ON(blk_needs_flush_plug(tsk));
82365 @@ -714,7 +720,6 @@ void do_exit(long code)
82366 * mm_release()->clear_child_tid() from writing to a user-controlled
82367 * kernel address.
82368 */
82369 - set_fs(USER_DS);
82370
82371 ptrace_event(PTRACE_EVENT_EXIT, code);
82372
82373 @@ -773,6 +778,9 @@ void do_exit(long code)
82374 tsk->exit_code = code;
82375 taskstats_exit(tsk, group_dead);
82376
82377 + gr_acl_handle_psacct(tsk, code);
82378 + gr_acl_handle_exit();
82379 +
82380 exit_mm(tsk);
82381
82382 if (group_dead)
82383 @@ -894,7 +902,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
82384 * Take down every thread in the group. This is called by fatal signals
82385 * as well as by sys_exit_group (below).
82386 */
82387 -void
82388 +__noreturn void
82389 do_group_exit(int exit_code)
82390 {
82391 struct signal_struct *sig = current->signal;
82392 diff --git a/kernel/fork.c b/kernel/fork.c
82393 index 086fe73..72c1122 100644
82394 --- a/kernel/fork.c
82395 +++ b/kernel/fork.c
82396 @@ -319,7 +319,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
82397 *stackend = STACK_END_MAGIC; /* for overflow detection */
82398
82399 #ifdef CONFIG_CC_STACKPROTECTOR
82400 - tsk->stack_canary = get_random_int();
82401 + tsk->stack_canary = pax_get_random_long();
82402 #endif
82403
82404 /*
82405 @@ -345,12 +345,80 @@ free_tsk:
82406 }
82407
82408 #ifdef CONFIG_MMU
82409 -static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
82410 +static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
82411 +{
82412 + struct vm_area_struct *tmp;
82413 + unsigned long charge;
82414 + struct file *file;
82415 + int retval;
82416 +
82417 + charge = 0;
82418 + if (mpnt->vm_flags & VM_ACCOUNT) {
82419 + unsigned long len = vma_pages(mpnt);
82420 +
82421 + if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
82422 + goto fail_nomem;
82423 + charge = len;
82424 + }
82425 + tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
82426 + if (!tmp)
82427 + goto fail_nomem;
82428 + *tmp = *mpnt;
82429 + tmp->vm_mm = mm;
82430 + INIT_LIST_HEAD(&tmp->anon_vma_chain);
82431 + retval = vma_dup_policy(mpnt, tmp);
82432 + if (retval)
82433 + goto fail_nomem_policy;
82434 + if (anon_vma_fork(tmp, mpnt))
82435 + goto fail_nomem_anon_vma_fork;
82436 + tmp->vm_flags &= ~VM_LOCKED;
82437 + tmp->vm_next = tmp->vm_prev = NULL;
82438 + tmp->vm_mirror = NULL;
82439 + file = tmp->vm_file;
82440 + if (file) {
82441 + struct inode *inode = file_inode(file);
82442 + struct address_space *mapping = file->f_mapping;
82443 +
82444 + get_file(file);
82445 + if (tmp->vm_flags & VM_DENYWRITE)
82446 + atomic_dec(&inode->i_writecount);
82447 + mutex_lock(&mapping->i_mmap_mutex);
82448 + if (tmp->vm_flags & VM_SHARED)
82449 + mapping->i_mmap_writable++;
82450 + flush_dcache_mmap_lock(mapping);
82451 + /* insert tmp into the share list, just after mpnt */
82452 + if (unlikely(tmp->vm_flags & VM_NONLINEAR))
82453 + vma_nonlinear_insert(tmp, &mapping->i_mmap_nonlinear);
82454 + else
82455 + vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
82456 + flush_dcache_mmap_unlock(mapping);
82457 + mutex_unlock(&mapping->i_mmap_mutex);
82458 + }
82459 +
82460 + /*
82461 + * Clear hugetlb-related page reserves for children. This only
82462 + * affects MAP_PRIVATE mappings. Faults generated by the child
82463 + * are not guaranteed to succeed, even if read-only
82464 + */
82465 + if (is_vm_hugetlb_page(tmp))
82466 + reset_vma_resv_huge_pages(tmp);
82467 +
82468 + return tmp;
82469 +
82470 +fail_nomem_anon_vma_fork:
82471 + mpol_put(vma_policy(tmp));
82472 +fail_nomem_policy:
82473 + kmem_cache_free(vm_area_cachep, tmp);
82474 +fail_nomem:
82475 + vm_unacct_memory(charge);
82476 + return NULL;
82477 +}
82478 +
82479 +static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
82480 {
82481 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
82482 struct rb_node **rb_link, *rb_parent;
82483 int retval;
82484 - unsigned long charge;
82485
82486 uprobe_start_dup_mmap();
82487 down_write(&oldmm->mmap_sem);
82488 @@ -379,55 +447,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
82489
82490 prev = NULL;
82491 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
82492 - struct file *file;
82493 -
82494 if (mpnt->vm_flags & VM_DONTCOPY) {
82495 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
82496 -vma_pages(mpnt));
82497 continue;
82498 }
82499 - charge = 0;
82500 - if (mpnt->vm_flags & VM_ACCOUNT) {
82501 - unsigned long len = vma_pages(mpnt);
82502 -
82503 - if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
82504 - goto fail_nomem;
82505 - charge = len;
82506 - }
82507 - tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
82508 - if (!tmp)
82509 - goto fail_nomem;
82510 - *tmp = *mpnt;
82511 - INIT_LIST_HEAD(&tmp->anon_vma_chain);
82512 - retval = vma_dup_policy(mpnt, tmp);
82513 - if (retval)
82514 - goto fail_nomem_policy;
82515 - tmp->vm_mm = mm;
82516 - if (anon_vma_fork(tmp, mpnt))
82517 - goto fail_nomem_anon_vma_fork;
82518 - tmp->vm_flags &= ~VM_LOCKED;
82519 - tmp->vm_next = tmp->vm_prev = NULL;
82520 - file = tmp->vm_file;
82521 - if (file) {
82522 - struct inode *inode = file_inode(file);
82523 - struct address_space *mapping = file->f_mapping;
82524 -
82525 - get_file(file);
82526 - if (tmp->vm_flags & VM_DENYWRITE)
82527 - atomic_dec(&inode->i_writecount);
82528 - mutex_lock(&mapping->i_mmap_mutex);
82529 - if (tmp->vm_flags & VM_SHARED)
82530 - mapping->i_mmap_writable++;
82531 - flush_dcache_mmap_lock(mapping);
82532 - /* insert tmp into the share list, just after mpnt */
82533 - if (unlikely(tmp->vm_flags & VM_NONLINEAR))
82534 - vma_nonlinear_insert(tmp,
82535 - &mapping->i_mmap_nonlinear);
82536 - else
82537 - vma_interval_tree_insert_after(tmp, mpnt,
82538 - &mapping->i_mmap);
82539 - flush_dcache_mmap_unlock(mapping);
82540 - mutex_unlock(&mapping->i_mmap_mutex);
82541 + tmp = dup_vma(mm, oldmm, mpnt);
82542 + if (!tmp) {
82543 + retval = -ENOMEM;
82544 + goto out;
82545 }
82546
82547 /*
82548 @@ -459,6 +487,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
82549 if (retval)
82550 goto out;
82551 }
82552 +
82553 +#ifdef CONFIG_PAX_SEGMEXEC
82554 + if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
82555 + struct vm_area_struct *mpnt_m;
82556 +
82557 + for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
82558 + BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
82559 +
82560 + if (!mpnt->vm_mirror)
82561 + continue;
82562 +
82563 + if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
82564 + BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
82565 + mpnt->vm_mirror = mpnt_m;
82566 + } else {
82567 + BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
82568 + mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
82569 + mpnt_m->vm_mirror->vm_mirror = mpnt_m;
82570 + mpnt->vm_mirror->vm_mirror = mpnt;
82571 + }
82572 + }
82573 + BUG_ON(mpnt_m);
82574 + }
82575 +#endif
82576 +
82577 /* a new mm has just been created */
82578 arch_dup_mmap(oldmm, mm);
82579 retval = 0;
82580 @@ -468,14 +521,6 @@ out:
82581 up_write(&oldmm->mmap_sem);
82582 uprobe_end_dup_mmap();
82583 return retval;
82584 -fail_nomem_anon_vma_fork:
82585 - mpol_put(vma_policy(tmp));
82586 -fail_nomem_policy:
82587 - kmem_cache_free(vm_area_cachep, tmp);
82588 -fail_nomem:
82589 - retval = -ENOMEM;
82590 - vm_unacct_memory(charge);
82591 - goto out;
82592 }
82593
82594 static inline int mm_alloc_pgd(struct mm_struct *mm)
82595 @@ -688,8 +733,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
82596 return ERR_PTR(err);
82597
82598 mm = get_task_mm(task);
82599 - if (mm && mm != current->mm &&
82600 - !ptrace_may_access(task, mode)) {
82601 + if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
82602 + (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
82603 mmput(mm);
82604 mm = ERR_PTR(-EACCES);
82605 }
82606 @@ -911,13 +956,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
82607 spin_unlock(&fs->lock);
82608 return -EAGAIN;
82609 }
82610 - fs->users++;
82611 + atomic_inc(&fs->users);
82612 spin_unlock(&fs->lock);
82613 return 0;
82614 }
82615 tsk->fs = copy_fs_struct(fs);
82616 if (!tsk->fs)
82617 return -ENOMEM;
82618 + /* Carry through gr_chroot_dentry and is_chrooted instead
82619 + of recomputing it here. Already copied when the task struct
82620 + is duplicated. This allows pivot_root to not be treated as
82621 + a chroot
82622 + */
82623 + //gr_set_chroot_entries(tsk, &tsk->fs->root);
82624 +
82625 return 0;
82626 }
82627
82628 @@ -1128,7 +1180,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
82629 * parts of the process environment (as per the clone
82630 * flags). The actual kick-off is left to the caller.
82631 */
82632 -static struct task_struct *copy_process(unsigned long clone_flags,
82633 +static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
82634 unsigned long stack_start,
82635 unsigned long stack_size,
82636 int __user *child_tidptr,
82637 @@ -1200,6 +1252,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
82638 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
82639 #endif
82640 retval = -EAGAIN;
82641 +
82642 + gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
82643 +
82644 if (atomic_read(&p->real_cred->user->processes) >=
82645 task_rlimit(p, RLIMIT_NPROC)) {
82646 if (p->real_cred->user != INIT_USER &&
82647 @@ -1449,6 +1504,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
82648 goto bad_fork_free_pid;
82649 }
82650
82651 + /* synchronizes with gr_set_acls()
82652 + we need to call this past the point of no return for fork()
82653 + */
82654 + gr_copy_label(p);
82655 +
82656 if (likely(p->pid)) {
82657 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
82658
82659 @@ -1534,6 +1594,8 @@ bad_fork_cleanup_count:
82660 bad_fork_free:
82661 free_task(p);
82662 fork_out:
82663 + gr_log_forkfail(retval);
82664 +
82665 return ERR_PTR(retval);
82666 }
82667
82668 @@ -1595,6 +1657,7 @@ long do_fork(unsigned long clone_flags,
82669
82670 p = copy_process(clone_flags, stack_start, stack_size,
82671 child_tidptr, NULL, trace);
82672 + add_latent_entropy();
82673 /*
82674 * Do this prior waking up the new thread - the thread pointer
82675 * might get invalid after that point, if the thread exits quickly.
82676 @@ -1609,6 +1672,8 @@ long do_fork(unsigned long clone_flags,
82677 if (clone_flags & CLONE_PARENT_SETTID)
82678 put_user(nr, parent_tidptr);
82679
82680 + gr_handle_brute_check();
82681 +
82682 if (clone_flags & CLONE_VFORK) {
82683 p->vfork_done = &vfork;
82684 init_completion(&vfork);
82685 @@ -1725,7 +1790,7 @@ void __init proc_caches_init(void)
82686 mm_cachep = kmem_cache_create("mm_struct",
82687 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
82688 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
82689 - vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
82690 + vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
82691 mmap_init();
82692 nsproxy_cache_init();
82693 }
82694 @@ -1765,7 +1830,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
82695 return 0;
82696
82697 /* don't need lock here; in the worst case we'll do useless copy */
82698 - if (fs->users == 1)
82699 + if (atomic_read(&fs->users) == 1)
82700 return 0;
82701
82702 *new_fsp = copy_fs_struct(fs);
82703 @@ -1872,7 +1937,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
82704 fs = current->fs;
82705 spin_lock(&fs->lock);
82706 current->fs = new_fs;
82707 - if (--fs->users)
82708 + gr_set_chroot_entries(current, &current->fs->root);
82709 + if (atomic_dec_return(&fs->users))
82710 new_fs = NULL;
82711 else
82712 new_fs = fs;
82713 diff --git a/kernel/futex.c b/kernel/futex.c
82714 index 221a58f..1b8cfce 100644
82715 --- a/kernel/futex.c
82716 +++ b/kernel/futex.c
82717 @@ -54,6 +54,7 @@
82718 #include <linux/mount.h>
82719 #include <linux/pagemap.h>
82720 #include <linux/syscalls.h>
82721 +#include <linux/ptrace.h>
82722 #include <linux/signal.h>
82723 #include <linux/export.h>
82724 #include <linux/magic.h>
82725 @@ -243,6 +244,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
82726 struct page *page, *page_head;
82727 int err, ro = 0;
82728
82729 +#ifdef CONFIG_PAX_SEGMEXEC
82730 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
82731 + return -EFAULT;
82732 +#endif
82733 +
82734 /*
82735 * The futex address must be "naturally" aligned.
82736 */
82737 @@ -441,7 +447,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
82738
82739 static int get_futex_value_locked(u32 *dest, u32 __user *from)
82740 {
82741 - int ret;
82742 + unsigned long ret;
82743
82744 pagefault_disable();
82745 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
82746 @@ -2734,6 +2740,7 @@ static int __init futex_init(void)
82747 {
82748 u32 curval;
82749 int i;
82750 + mm_segment_t oldfs;
82751
82752 /*
82753 * This will fail and we want it. Some arch implementations do
82754 @@ -2745,8 +2752,11 @@ static int __init futex_init(void)
82755 * implementation, the non-functional ones will return
82756 * -ENOSYS.
82757 */
82758 + oldfs = get_fs();
82759 + set_fs(USER_DS);
82760 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
82761 futex_cmpxchg_enabled = 1;
82762 + set_fs(oldfs);
82763
82764 for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
82765 plist_head_init(&futex_queues[i].chain);
82766 diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
82767 index f9f44fd..29885e4 100644
82768 --- a/kernel/futex_compat.c
82769 +++ b/kernel/futex_compat.c
82770 @@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
82771 return 0;
82772 }
82773
82774 -static void __user *futex_uaddr(struct robust_list __user *entry,
82775 +static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
82776 compat_long_t futex_offset)
82777 {
82778 compat_uptr_t base = ptr_to_compat(entry);
82779 diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
82780 index 9b22d03..6295b62 100644
82781 --- a/kernel/gcov/base.c
82782 +++ b/kernel/gcov/base.c
82783 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
82784 }
82785
82786 #ifdef CONFIG_MODULES
82787 -static inline int within(void *addr, void *start, unsigned long size)
82788 -{
82789 - return ((addr >= start) && (addr < start + size));
82790 -}
82791 -
82792 /* Update list and generate events when modules are unloaded. */
82793 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
82794 void *data)
82795 @@ -121,7 +116,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
82796 prev = NULL;
82797 /* Remove entries located in module from linked list. */
82798 for (info = gcov_info_head; info; info = info->next) {
82799 - if (within(info, mod->module_core, mod->core_size)) {
82800 + if (within_module_core_rw((unsigned long)info, mod)) {
82801 if (prev)
82802 prev->next = info->next;
82803 else
82804 diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
82805 index 383319b..56ebb13 100644
82806 --- a/kernel/hrtimer.c
82807 +++ b/kernel/hrtimer.c
82808 @@ -1438,7 +1438,7 @@ void hrtimer_peek_ahead_timers(void)
82809 local_irq_restore(flags);
82810 }
82811
82812 -static void run_hrtimer_softirq(struct softirq_action *h)
82813 +static __latent_entropy void run_hrtimer_softirq(void)
82814 {
82815 hrtimer_peek_ahead_timers();
82816 }
82817 diff --git a/kernel/irq_work.c b/kernel/irq_work.c
82818 index 55fcce6..0e4cf34 100644
82819 --- a/kernel/irq_work.c
82820 +++ b/kernel/irq_work.c
82821 @@ -189,12 +189,13 @@ static int irq_work_cpu_notify(struct notifier_block *self,
82822 return NOTIFY_OK;
82823 }
82824
82825 -static struct notifier_block cpu_notify;
82826 +static struct notifier_block cpu_notify = {
82827 + .notifier_call = irq_work_cpu_notify,
82828 + .priority = 0,
82829 +};
82830
82831 static __init int irq_work_init_cpu_notifier(void)
82832 {
82833 - cpu_notify.notifier_call = irq_work_cpu_notify;
82834 - cpu_notify.priority = 0;
82835 register_cpu_notifier(&cpu_notify);
82836 return 0;
82837 }
82838 diff --git a/kernel/jump_label.c b/kernel/jump_label.c
82839 index 297a924..7290070 100644
82840 --- a/kernel/jump_label.c
82841 +++ b/kernel/jump_label.c
82842 @@ -14,6 +14,7 @@
82843 #include <linux/err.h>
82844 #include <linux/static_key.h>
82845 #include <linux/jump_label_ratelimit.h>
82846 +#include <linux/mm.h>
82847
82848 #ifdef HAVE_JUMP_LABEL
82849
82850 @@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
82851
82852 size = (((unsigned long)stop - (unsigned long)start)
82853 / sizeof(struct jump_entry));
82854 + pax_open_kernel();
82855 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
82856 + pax_close_kernel();
82857 }
82858
82859 static void jump_label_update(struct static_key *key, int enable);
82860 @@ -358,10 +361,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
82861 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
82862 struct jump_entry *iter;
82863
82864 + pax_open_kernel();
82865 for (iter = iter_start; iter < iter_stop; iter++) {
82866 if (within_module_init(iter->code, mod))
82867 iter->code = 0;
82868 }
82869 + pax_close_kernel();
82870 }
82871
82872 static int
82873 diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
82874 index 3127ad5..159d880 100644
82875 --- a/kernel/kallsyms.c
82876 +++ b/kernel/kallsyms.c
82877 @@ -11,6 +11,9 @@
82878 * Changed the compression method from stem compression to "table lookup"
82879 * compression (see scripts/kallsyms.c for a more complete description)
82880 */
82881 +#ifdef CONFIG_GRKERNSEC_HIDESYM
82882 +#define __INCLUDED_BY_HIDESYM 1
82883 +#endif
82884 #include <linux/kallsyms.h>
82885 #include <linux/module.h>
82886 #include <linux/init.h>
82887 @@ -53,12 +56,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
82888
82889 static inline int is_kernel_inittext(unsigned long addr)
82890 {
82891 + if (system_state != SYSTEM_BOOTING)
82892 + return 0;
82893 +
82894 if (addr >= (unsigned long)_sinittext
82895 && addr <= (unsigned long)_einittext)
82896 return 1;
82897 return 0;
82898 }
82899
82900 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
82901 +#ifdef CONFIG_MODULES
82902 +static inline int is_module_text(unsigned long addr)
82903 +{
82904 + if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
82905 + return 1;
82906 +
82907 + addr = ktla_ktva(addr);
82908 + return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
82909 +}
82910 +#else
82911 +static inline int is_module_text(unsigned long addr)
82912 +{
82913 + return 0;
82914 +}
82915 +#endif
82916 +#endif
82917 +
82918 static inline int is_kernel_text(unsigned long addr)
82919 {
82920 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
82921 @@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigned long addr)
82922
82923 static inline int is_kernel(unsigned long addr)
82924 {
82925 +
82926 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
82927 + if (is_kernel_text(addr) || is_kernel_inittext(addr))
82928 + return 1;
82929 +
82930 + if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
82931 +#else
82932 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
82933 +#endif
82934 +
82935 return 1;
82936 return in_gate_area_no_mm(addr);
82937 }
82938
82939 static int is_ksym_addr(unsigned long addr)
82940 {
82941 +
82942 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
82943 + if (is_module_text(addr))
82944 + return 0;
82945 +#endif
82946 +
82947 if (all_var)
82948 return is_kernel(addr);
82949
82950 @@ -480,7 +519,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
82951
82952 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
82953 {
82954 - iter->name[0] = '\0';
82955 iter->nameoff = get_symbol_offset(new_pos);
82956 iter->pos = new_pos;
82957 }
82958 @@ -528,6 +566,11 @@ static int s_show(struct seq_file *m, void *p)
82959 {
82960 struct kallsym_iter *iter = m->private;
82961
82962 +#ifdef CONFIG_GRKERNSEC_HIDESYM
82963 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
82964 + return 0;
82965 +#endif
82966 +
82967 /* Some debugging symbols have no name. Ignore them. */
82968 if (!iter->name[0])
82969 return 0;
82970 @@ -541,6 +584,7 @@ static int s_show(struct seq_file *m, void *p)
82971 */
82972 type = iter->exported ? toupper(iter->type) :
82973 tolower(iter->type);
82974 +
82975 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
82976 type, iter->name, iter->module_name);
82977 } else
82978 @@ -566,7 +610,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
82979 struct kallsym_iter *iter;
82980 int ret;
82981
82982 - iter = kmalloc(sizeof(*iter), GFP_KERNEL);
82983 + iter = kzalloc(sizeof(*iter), GFP_KERNEL);
82984 if (!iter)
82985 return -ENOMEM;
82986 reset_iter(iter, 0);
82987 diff --git a/kernel/kcmp.c b/kernel/kcmp.c
82988 index e30ac0f..3528cac 100644
82989 --- a/kernel/kcmp.c
82990 +++ b/kernel/kcmp.c
82991 @@ -99,6 +99,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
82992 struct task_struct *task1, *task2;
82993 int ret;
82994
82995 +#ifdef CONFIG_GRKERNSEC
82996 + return -ENOSYS;
82997 +#endif
82998 +
82999 rcu_read_lock();
83000
83001 /*
83002 diff --git a/kernel/kexec.c b/kernel/kexec.c
83003 index ecd783d..9aa270c 100644
83004 --- a/kernel/kexec.c
83005 +++ b/kernel/kexec.c
83006 @@ -1044,7 +1044,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
83007 unsigned long flags)
83008 {
83009 struct compat_kexec_segment in;
83010 - struct kexec_segment out, __user *ksegments;
83011 + struct kexec_segment out;
83012 + struct kexec_segment __user *ksegments;
83013 unsigned long i, result;
83014
83015 /* Don't allow clients that don't understand the native
83016 diff --git a/kernel/kmod.c b/kernel/kmod.c
83017 index b086006..6d2e579 100644
83018 --- a/kernel/kmod.c
83019 +++ b/kernel/kmod.c
83020 @@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
83021 kfree(info->argv);
83022 }
83023
83024 -static int call_modprobe(char *module_name, int wait)
83025 +static int call_modprobe(char *module_name, char *module_param, int wait)
83026 {
83027 struct subprocess_info *info;
83028 static char *envp[] = {
83029 @@ -85,7 +85,7 @@ static int call_modprobe(char *module_name, int wait)
83030 NULL
83031 };
83032
83033 - char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
83034 + char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
83035 if (!argv)
83036 goto out;
83037
83038 @@ -97,7 +97,8 @@ static int call_modprobe(char *module_name, int wait)
83039 argv[1] = "-q";
83040 argv[2] = "--";
83041 argv[3] = module_name; /* check free_modprobe_argv() */
83042 - argv[4] = NULL;
83043 + argv[4] = module_param;
83044 + argv[5] = NULL;
83045
83046 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
83047 NULL, free_modprobe_argv, NULL);
83048 @@ -129,9 +130,8 @@ out:
83049 * If module auto-loading support is disabled then this function
83050 * becomes a no-operation.
83051 */
83052 -int __request_module(bool wait, const char *fmt, ...)
83053 +static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
83054 {
83055 - va_list args;
83056 char module_name[MODULE_NAME_LEN];
83057 unsigned int max_modprobes;
83058 int ret;
83059 @@ -150,9 +150,7 @@ int __request_module(bool wait, const char *fmt, ...)
83060 if (!modprobe_path[0])
83061 return 0;
83062
83063 - va_start(args, fmt);
83064 - ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
83065 - va_end(args);
83066 + ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
83067 if (ret >= MODULE_NAME_LEN)
83068 return -ENAMETOOLONG;
83069
83070 @@ -160,6 +158,20 @@ int __request_module(bool wait, const char *fmt, ...)
83071 if (ret)
83072 return ret;
83073
83074 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
83075 + if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
83076 + /* hack to workaround consolekit/udisks stupidity */
83077 + read_lock(&tasklist_lock);
83078 + if (!strcmp(current->comm, "mount") &&
83079 + current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
83080 + read_unlock(&tasklist_lock);
83081 + printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
83082 + return -EPERM;
83083 + }
83084 + read_unlock(&tasklist_lock);
83085 + }
83086 +#endif
83087 +
83088 /* If modprobe needs a service that is in a module, we get a recursive
83089 * loop. Limit the number of running kmod threads to max_threads/2 or
83090 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
83091 @@ -188,11 +200,52 @@ int __request_module(bool wait, const char *fmt, ...)
83092
83093 trace_module_request(module_name, wait, _RET_IP_);
83094
83095 - ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
83096 + ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
83097
83098 atomic_dec(&kmod_concurrent);
83099 return ret;
83100 }
83101 +
83102 +int ___request_module(bool wait, char *module_param, const char *fmt, ...)
83103 +{
83104 + va_list args;
83105 + int ret;
83106 +
83107 + va_start(args, fmt);
83108 + ret = ____request_module(wait, module_param, fmt, args);
83109 + va_end(args);
83110 +
83111 + return ret;
83112 +}
83113 +
83114 +int __request_module(bool wait, const char *fmt, ...)
83115 +{
83116 + va_list args;
83117 + int ret;
83118 +
83119 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
83120 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
83121 + char module_param[MODULE_NAME_LEN];
83122 +
83123 + memset(module_param, 0, sizeof(module_param));
83124 +
83125 + snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
83126 +
83127 + va_start(args, fmt);
83128 + ret = ____request_module(wait, module_param, fmt, args);
83129 + va_end(args);
83130 +
83131 + return ret;
83132 + }
83133 +#endif
83134 +
83135 + va_start(args, fmt);
83136 + ret = ____request_module(wait, NULL, fmt, args);
83137 + va_end(args);
83138 +
83139 + return ret;
83140 +}
83141 +
83142 EXPORT_SYMBOL(__request_module);
83143 #endif /* CONFIG_MODULES */
83144
83145 @@ -218,6 +271,19 @@ static int ____call_usermodehelper(void *data)
83146 */
83147 set_user_nice(current, 0);
83148
83149 +#ifdef CONFIG_GRKERNSEC
83150 + /* this is race-free as far as userland is concerned as we copied
83151 + out the path to be used prior to this point and are now operating
83152 + on that copy
83153 + */
83154 + if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
83155 + strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7)) || strstr(sub_info->path, "..")) {
83156 + printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path);
83157 + retval = -EPERM;
83158 + goto fail;
83159 + }
83160 +#endif
83161 +
83162 retval = -ENOMEM;
83163 new = prepare_kernel_cred(current);
83164 if (!new)
83165 @@ -260,6 +326,10 @@ static int call_helper(void *data)
83166
83167 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
83168 {
83169 +#ifdef CONFIG_GRKERNSEC
83170 + kfree(info->path);
83171 + info->path = info->origpath;
83172 +#endif
83173 if (info->cleanup)
83174 (*info->cleanup)(info);
83175 kfree(info);
83176 @@ -303,7 +373,7 @@ static int wait_for_helper(void *data)
83177 *
83178 * Thus the __user pointer cast is valid here.
83179 */
83180 - sys_wait4(pid, (int __user *)&ret, 0, NULL);
83181 + sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
83182
83183 /*
83184 * If ret is 0, either ____call_usermodehelper failed and the
83185 @@ -542,7 +612,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
83186 goto out;
83187
83188 INIT_WORK(&sub_info->work, __call_usermodehelper);
83189 +#ifdef CONFIG_GRKERNSEC
83190 + sub_info->origpath = path;
83191 + sub_info->path = kstrdup(path, gfp_mask);
83192 +#else
83193 sub_info->path = path;
83194 +#endif
83195 sub_info->argv = argv;
83196 sub_info->envp = envp;
83197
83198 @@ -650,7 +725,7 @@ EXPORT_SYMBOL(call_usermodehelper);
83199 static int proc_cap_handler(struct ctl_table *table, int write,
83200 void __user *buffer, size_t *lenp, loff_t *ppos)
83201 {
83202 - struct ctl_table t;
83203 + ctl_table_no_const t;
83204 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
83205 kernel_cap_t new_cap;
83206 int err, i;
83207 diff --git a/kernel/kprobes.c b/kernel/kprobes.c
83208 index a0d367a..11c18b6 100644
83209 --- a/kernel/kprobes.c
83210 +++ b/kernel/kprobes.c
83211 @@ -31,6 +31,9 @@
83212 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
83213 * <prasanna@in.ibm.com> added function-return probes.
83214 */
83215 +#ifdef CONFIG_GRKERNSEC_HIDESYM
83216 +#define __INCLUDED_BY_HIDESYM 1
83217 +#endif
83218 #include <linux/kprobes.h>
83219 #include <linux/hash.h>
83220 #include <linux/init.h>
83221 @@ -135,12 +138,12 @@ enum kprobe_slot_state {
83222
83223 static void *alloc_insn_page(void)
83224 {
83225 - return module_alloc(PAGE_SIZE);
83226 + return module_alloc_exec(PAGE_SIZE);
83227 }
83228
83229 static void free_insn_page(void *page)
83230 {
83231 - module_free(NULL, page);
83232 + module_free_exec(NULL, page);
83233 }
83234
83235 struct kprobe_insn_cache kprobe_insn_slots = {
83236 @@ -2066,7 +2069,7 @@ static int __init init_kprobes(void)
83237 {
83238 int i, err = 0;
83239 unsigned long offset = 0, size = 0;
83240 - char *modname, namebuf[128];
83241 + char *modname, namebuf[KSYM_NAME_LEN];
83242 const char *symbol_name;
83243 void *addr;
83244 struct kprobe_blackpoint *kb;
83245 @@ -2151,11 +2154,11 @@ static void __kprobes report_probe(struct seq_file *pi, struct kprobe *p,
83246 kprobe_type = "k";
83247
83248 if (sym)
83249 - seq_printf(pi, "%p %s %s+0x%x %s ",
83250 + seq_printf(pi, "%pK %s %s+0x%x %s ",
83251 p->addr, kprobe_type, sym, offset,
83252 (modname ? modname : " "));
83253 else
83254 - seq_printf(pi, "%p %s %p ",
83255 + seq_printf(pi, "%pK %s %pK ",
83256 p->addr, kprobe_type, p->addr);
83257
83258 if (!pp)
83259 @@ -2192,7 +2195,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
83260 const char *sym = NULL;
83261 unsigned int i = *(loff_t *) v;
83262 unsigned long offset = 0;
83263 - char *modname, namebuf[128];
83264 + char *modname, namebuf[KSYM_NAME_LEN];
83265
83266 head = &kprobe_table[i];
83267 preempt_disable();
83268 diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
83269 index 9659d38..bffd520 100644
83270 --- a/kernel/ksysfs.c
83271 +++ b/kernel/ksysfs.c
83272 @@ -46,6 +46,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
83273 {
83274 if (count+1 > UEVENT_HELPER_PATH_LEN)
83275 return -ENOENT;
83276 + if (!capable(CAP_SYS_ADMIN))
83277 + return -EPERM;
83278 memcpy(uevent_helper, buf, count);
83279 uevent_helper[count] = '\0';
83280 if (count && uevent_helper[count-1] == '\n')
83281 @@ -172,7 +174,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
83282 return count;
83283 }
83284
83285 -static struct bin_attribute notes_attr = {
83286 +static bin_attribute_no_const notes_attr __read_only = {
83287 .attr = {
83288 .name = "notes",
83289 .mode = S_IRUGO,
83290 diff --git a/kernel/lockdep.c b/kernel/lockdep.c
83291 index e16c45b..6f49c48 100644
83292 --- a/kernel/lockdep.c
83293 +++ b/kernel/lockdep.c
83294 @@ -596,6 +596,10 @@ static int static_obj(void *obj)
83295 end = (unsigned long) &_end,
83296 addr = (unsigned long) obj;
83297
83298 +#ifdef CONFIG_PAX_KERNEXEC
83299 + start = ktla_ktva(start);
83300 +#endif
83301 +
83302 /*
83303 * static variable?
83304 */
83305 @@ -736,6 +740,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
83306 if (!static_obj(lock->key)) {
83307 debug_locks_off();
83308 printk("INFO: trying to register non-static key.\n");
83309 + printk("lock:%pS key:%pS.\n", lock, lock->key);
83310 printk("the code is fine but needs lockdep annotation.\n");
83311 printk("turning off the locking correctness validator.\n");
83312 dump_stack();
83313 @@ -3080,7 +3085,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
83314 if (!class)
83315 return 0;
83316 }
83317 - atomic_inc((atomic_t *)&class->ops);
83318 + atomic_inc_unchecked((atomic_unchecked_t *)&class->ops);
83319 if (very_verbose(class)) {
83320 printk("\nacquire class [%p] %s", class->key, class->name);
83321 if (class->name_version > 1)
83322 diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
83323 index b2c71c5..7b88d63 100644
83324 --- a/kernel/lockdep_proc.c
83325 +++ b/kernel/lockdep_proc.c
83326 @@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
83327 return 0;
83328 }
83329
83330 - seq_printf(m, "%p", class->key);
83331 + seq_printf(m, "%pK", class->key);
83332 #ifdef CONFIG_DEBUG_LOCKDEP
83333 seq_printf(m, " OPS:%8ld", class->ops);
83334 #endif
83335 @@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
83336
83337 list_for_each_entry(entry, &class->locks_after, entry) {
83338 if (entry->distance == 1) {
83339 - seq_printf(m, " -> [%p] ", entry->class->key);
83340 + seq_printf(m, " -> [%pK] ", entry->class->key);
83341 print_name(m, entry->class);
83342 seq_puts(m, "\n");
83343 }
83344 @@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
83345 if (!class->key)
83346 continue;
83347
83348 - seq_printf(m, "[%p] ", class->key);
83349 + seq_printf(m, "[%pK] ", class->key);
83350 print_name(m, class);
83351 seq_puts(m, "\n");
83352 }
83353 @@ -495,7 +495,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
83354 if (!i)
83355 seq_line(m, '-', 40-namelen, namelen);
83356
83357 - snprintf(ip, sizeof(ip), "[<%p>]",
83358 + snprintf(ip, sizeof(ip), "[<%pK>]",
83359 (void *)class->contention_point[i]);
83360 seq_printf(m, "%40s %14lu %29s %pS\n",
83361 name, stats->contention_point[i],
83362 @@ -510,7 +510,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
83363 if (!i)
83364 seq_line(m, '-', 40-namelen, namelen);
83365
83366 - snprintf(ip, sizeof(ip), "[<%p>]",
83367 + snprintf(ip, sizeof(ip), "[<%pK>]",
83368 (void *)class->contending_point[i]);
83369 seq_printf(m, "%40s %14lu %29s %pS\n",
83370 name, stats->contending_point[i],
83371 diff --git a/kernel/module.c b/kernel/module.c
83372 index dc58274..3ddfa55 100644
83373 --- a/kernel/module.c
83374 +++ b/kernel/module.c
83375 @@ -61,6 +61,7 @@
83376 #include <linux/pfn.h>
83377 #include <linux/bsearch.h>
83378 #include <linux/fips.h>
83379 +#include <linux/grsecurity.h>
83380 #include <uapi/linux/module.h>
83381 #include "module-internal.h"
83382
83383 @@ -157,7 +158,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
83384
83385 /* Bounds of module allocation, for speeding __module_address.
83386 * Protected by module_mutex. */
83387 -static unsigned long module_addr_min = -1UL, module_addr_max = 0;
83388 +static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
83389 +static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
83390
83391 int register_module_notifier(struct notifier_block * nb)
83392 {
83393 @@ -324,7 +326,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
83394 return true;
83395
83396 list_for_each_entry_rcu(mod, &modules, list) {
83397 - struct symsearch arr[] = {
83398 + struct symsearch modarr[] = {
83399 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
83400 NOT_GPL_ONLY, false },
83401 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
83402 @@ -349,7 +351,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
83403 if (mod->state == MODULE_STATE_UNFORMED)
83404 continue;
83405
83406 - if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
83407 + if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
83408 return true;
83409 }
83410 return false;
83411 @@ -491,7 +493,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
83412 if (!pcpusec->sh_size)
83413 return 0;
83414
83415 - if (align > PAGE_SIZE) {
83416 + if (align-1 >= PAGE_SIZE) {
83417 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
83418 mod->name, align, PAGE_SIZE);
83419 align = PAGE_SIZE;
83420 @@ -1097,7 +1099,7 @@ struct module_attribute module_uevent =
83421 static ssize_t show_coresize(struct module_attribute *mattr,
83422 struct module_kobject *mk, char *buffer)
83423 {
83424 - return sprintf(buffer, "%u\n", mk->mod->core_size);
83425 + return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
83426 }
83427
83428 static struct module_attribute modinfo_coresize =
83429 @@ -1106,7 +1108,7 @@ static struct module_attribute modinfo_coresize =
83430 static ssize_t show_initsize(struct module_attribute *mattr,
83431 struct module_kobject *mk, char *buffer)
83432 {
83433 - return sprintf(buffer, "%u\n", mk->mod->init_size);
83434 + return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
83435 }
83436
83437 static struct module_attribute modinfo_initsize =
83438 @@ -1321,7 +1323,7 @@ resolve_symbol_wait(struct module *mod,
83439 */
83440 #ifdef CONFIG_SYSFS
83441
83442 -#ifdef CONFIG_KALLSYMS
83443 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
83444 static inline bool sect_empty(const Elf_Shdr *sect)
83445 {
83446 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
83447 @@ -1461,7 +1463,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
83448 {
83449 unsigned int notes, loaded, i;
83450 struct module_notes_attrs *notes_attrs;
83451 - struct bin_attribute *nattr;
83452 + bin_attribute_no_const *nattr;
83453
83454 /* failed to create section attributes, so can't create notes */
83455 if (!mod->sect_attrs)
83456 @@ -1573,7 +1575,7 @@ static void del_usage_links(struct module *mod)
83457 static int module_add_modinfo_attrs(struct module *mod)
83458 {
83459 struct module_attribute *attr;
83460 - struct module_attribute *temp_attr;
83461 + module_attribute_no_const *temp_attr;
83462 int error = 0;
83463 int i;
83464
83465 @@ -1795,21 +1797,21 @@ static void set_section_ro_nx(void *base,
83466
83467 static void unset_module_core_ro_nx(struct module *mod)
83468 {
83469 - set_page_attributes(mod->module_core + mod->core_text_size,
83470 - mod->module_core + mod->core_size,
83471 + set_page_attributes(mod->module_core_rw,
83472 + mod->module_core_rw + mod->core_size_rw,
83473 set_memory_x);
83474 - set_page_attributes(mod->module_core,
83475 - mod->module_core + mod->core_ro_size,
83476 + set_page_attributes(mod->module_core_rx,
83477 + mod->module_core_rx + mod->core_size_rx,
83478 set_memory_rw);
83479 }
83480
83481 static void unset_module_init_ro_nx(struct module *mod)
83482 {
83483 - set_page_attributes(mod->module_init + mod->init_text_size,
83484 - mod->module_init + mod->init_size,
83485 + set_page_attributes(mod->module_init_rw,
83486 + mod->module_init_rw + mod->init_size_rw,
83487 set_memory_x);
83488 - set_page_attributes(mod->module_init,
83489 - mod->module_init + mod->init_ro_size,
83490 + set_page_attributes(mod->module_init_rx,
83491 + mod->module_init_rx + mod->init_size_rx,
83492 set_memory_rw);
83493 }
83494
83495 @@ -1822,14 +1824,14 @@ void set_all_modules_text_rw(void)
83496 list_for_each_entry_rcu(mod, &modules, list) {
83497 if (mod->state == MODULE_STATE_UNFORMED)
83498 continue;
83499 - if ((mod->module_core) && (mod->core_text_size)) {
83500 - set_page_attributes(mod->module_core,
83501 - mod->module_core + mod->core_text_size,
83502 + if ((mod->module_core_rx) && (mod->core_size_rx)) {
83503 + set_page_attributes(mod->module_core_rx,
83504 + mod->module_core_rx + mod->core_size_rx,
83505 set_memory_rw);
83506 }
83507 - if ((mod->module_init) && (mod->init_text_size)) {
83508 - set_page_attributes(mod->module_init,
83509 - mod->module_init + mod->init_text_size,
83510 + if ((mod->module_init_rx) && (mod->init_size_rx)) {
83511 + set_page_attributes(mod->module_init_rx,
83512 + mod->module_init_rx + mod->init_size_rx,
83513 set_memory_rw);
83514 }
83515 }
83516 @@ -1845,14 +1847,14 @@ void set_all_modules_text_ro(void)
83517 list_for_each_entry_rcu(mod, &modules, list) {
83518 if (mod->state == MODULE_STATE_UNFORMED)
83519 continue;
83520 - if ((mod->module_core) && (mod->core_text_size)) {
83521 - set_page_attributes(mod->module_core,
83522 - mod->module_core + mod->core_text_size,
83523 + if ((mod->module_core_rx) && (mod->core_size_rx)) {
83524 + set_page_attributes(mod->module_core_rx,
83525 + mod->module_core_rx + mod->core_size_rx,
83526 set_memory_ro);
83527 }
83528 - if ((mod->module_init) && (mod->init_text_size)) {
83529 - set_page_attributes(mod->module_init,
83530 - mod->module_init + mod->init_text_size,
83531 + if ((mod->module_init_rx) && (mod->init_size_rx)) {
83532 + set_page_attributes(mod->module_init_rx,
83533 + mod->module_init_rx + mod->init_size_rx,
83534 set_memory_ro);
83535 }
83536 }
83537 @@ -1903,16 +1905,19 @@ static void free_module(struct module *mod)
83538
83539 /* This may be NULL, but that's OK */
83540 unset_module_init_ro_nx(mod);
83541 - module_free(mod, mod->module_init);
83542 + module_free(mod, mod->module_init_rw);
83543 + module_free_exec(mod, mod->module_init_rx);
83544 kfree(mod->args);
83545 percpu_modfree(mod);
83546
83547 /* Free lock-classes: */
83548 - lockdep_free_key_range(mod->module_core, mod->core_size);
83549 + lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
83550 + lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
83551
83552 /* Finally, free the core (containing the module structure) */
83553 unset_module_core_ro_nx(mod);
83554 - module_free(mod, mod->module_core);
83555 + module_free_exec(mod, mod->module_core_rx);
83556 + module_free(mod, mod->module_core_rw);
83557
83558 #ifdef CONFIG_MPU
83559 update_protections(current->mm);
83560 @@ -1982,9 +1987,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
83561 int ret = 0;
83562 const struct kernel_symbol *ksym;
83563
83564 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
83565 + int is_fs_load = 0;
83566 + int register_filesystem_found = 0;
83567 + char *p;
83568 +
83569 + p = strstr(mod->args, "grsec_modharden_fs");
83570 + if (p) {
83571 + char *endptr = p + sizeof("grsec_modharden_fs") - 1;
83572 + /* copy \0 as well */
83573 + memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
83574 + is_fs_load = 1;
83575 + }
83576 +#endif
83577 +
83578 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
83579 const char *name = info->strtab + sym[i].st_name;
83580
83581 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
83582 + /* it's a real shame this will never get ripped and copied
83583 + upstream! ;(
83584 + */
83585 + if (is_fs_load && !strcmp(name, "register_filesystem"))
83586 + register_filesystem_found = 1;
83587 +#endif
83588 +
83589 switch (sym[i].st_shndx) {
83590 case SHN_COMMON:
83591 /* We compiled with -fno-common. These are not
83592 @@ -2005,7 +2032,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
83593 ksym = resolve_symbol_wait(mod, info, name);
83594 /* Ok if resolved. */
83595 if (ksym && !IS_ERR(ksym)) {
83596 + pax_open_kernel();
83597 sym[i].st_value = ksym->value;
83598 + pax_close_kernel();
83599 break;
83600 }
83601
83602 @@ -2024,11 +2053,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
83603 secbase = (unsigned long)mod_percpu(mod);
83604 else
83605 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
83606 + pax_open_kernel();
83607 sym[i].st_value += secbase;
83608 + pax_close_kernel();
83609 break;
83610 }
83611 }
83612
83613 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
83614 + if (is_fs_load && !register_filesystem_found) {
83615 + printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
83616 + ret = -EPERM;
83617 + }
83618 +#endif
83619 +
83620 return ret;
83621 }
83622
83623 @@ -2112,22 +2150,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
83624 || s->sh_entsize != ~0UL
83625 || strstarts(sname, ".init"))
83626 continue;
83627 - s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
83628 + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
83629 + s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
83630 + else
83631 + s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
83632 pr_debug("\t%s\n", sname);
83633 }
83634 - switch (m) {
83635 - case 0: /* executable */
83636 - mod->core_size = debug_align(mod->core_size);
83637 - mod->core_text_size = mod->core_size;
83638 - break;
83639 - case 1: /* RO: text and ro-data */
83640 - mod->core_size = debug_align(mod->core_size);
83641 - mod->core_ro_size = mod->core_size;
83642 - break;
83643 - case 3: /* whole core */
83644 - mod->core_size = debug_align(mod->core_size);
83645 - break;
83646 - }
83647 }
83648
83649 pr_debug("Init section allocation order:\n");
83650 @@ -2141,23 +2169,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
83651 || s->sh_entsize != ~0UL
83652 || !strstarts(sname, ".init"))
83653 continue;
83654 - s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
83655 - | INIT_OFFSET_MASK);
83656 + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
83657 + s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
83658 + else
83659 + s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
83660 + s->sh_entsize |= INIT_OFFSET_MASK;
83661 pr_debug("\t%s\n", sname);
83662 }
83663 - switch (m) {
83664 - case 0: /* executable */
83665 - mod->init_size = debug_align(mod->init_size);
83666 - mod->init_text_size = mod->init_size;
83667 - break;
83668 - case 1: /* RO: text and ro-data */
83669 - mod->init_size = debug_align(mod->init_size);
83670 - mod->init_ro_size = mod->init_size;
83671 - break;
83672 - case 3: /* whole init */
83673 - mod->init_size = debug_align(mod->init_size);
83674 - break;
83675 - }
83676 }
83677 }
83678
83679 @@ -2330,7 +2348,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
83680
83681 /* Put symbol section at end of init part of module. */
83682 symsect->sh_flags |= SHF_ALLOC;
83683 - symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
83684 + symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
83685 info->index.sym) | INIT_OFFSET_MASK;
83686 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
83687
83688 @@ -2347,13 +2365,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
83689 }
83690
83691 /* Append room for core symbols at end of core part. */
83692 - info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
83693 - info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
83694 - mod->core_size += strtab_size;
83695 + info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
83696 + info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
83697 + mod->core_size_rx += strtab_size;
83698
83699 /* Put string table section at end of init part of module. */
83700 strsect->sh_flags |= SHF_ALLOC;
83701 - strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
83702 + strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
83703 info->index.str) | INIT_OFFSET_MASK;
83704 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
83705 }
83706 @@ -2371,12 +2389,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
83707 /* Make sure we get permanent strtab: don't use info->strtab. */
83708 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
83709
83710 + pax_open_kernel();
83711 +
83712 /* Set types up while we still have access to sections. */
83713 for (i = 0; i < mod->num_symtab; i++)
83714 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
83715
83716 - mod->core_symtab = dst = mod->module_core + info->symoffs;
83717 - mod->core_strtab = s = mod->module_core + info->stroffs;
83718 + mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
83719 + mod->core_strtab = s = mod->module_core_rx + info->stroffs;
83720 src = mod->symtab;
83721 for (ndst = i = 0; i < mod->num_symtab; i++) {
83722 if (i == 0 ||
83723 @@ -2388,6 +2408,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
83724 }
83725 }
83726 mod->core_num_syms = ndst;
83727 +
83728 + pax_close_kernel();
83729 }
83730 #else
83731 static inline void layout_symtab(struct module *mod, struct load_info *info)
83732 @@ -2421,17 +2443,33 @@ void * __weak module_alloc(unsigned long size)
83733 return vmalloc_exec(size);
83734 }
83735
83736 -static void *module_alloc_update_bounds(unsigned long size)
83737 +static void *module_alloc_update_bounds_rw(unsigned long size)
83738 {
83739 void *ret = module_alloc(size);
83740
83741 if (ret) {
83742 mutex_lock(&module_mutex);
83743 /* Update module bounds. */
83744 - if ((unsigned long)ret < module_addr_min)
83745 - module_addr_min = (unsigned long)ret;
83746 - if ((unsigned long)ret + size > module_addr_max)
83747 - module_addr_max = (unsigned long)ret + size;
83748 + if ((unsigned long)ret < module_addr_min_rw)
83749 + module_addr_min_rw = (unsigned long)ret;
83750 + if ((unsigned long)ret + size > module_addr_max_rw)
83751 + module_addr_max_rw = (unsigned long)ret + size;
83752 + mutex_unlock(&module_mutex);
83753 + }
83754 + return ret;
83755 +}
83756 +
83757 +static void *module_alloc_update_bounds_rx(unsigned long size)
83758 +{
83759 + void *ret = module_alloc_exec(size);
83760 +
83761 + if (ret) {
83762 + mutex_lock(&module_mutex);
83763 + /* Update module bounds. */
83764 + if ((unsigned long)ret < module_addr_min_rx)
83765 + module_addr_min_rx = (unsigned long)ret;
83766 + if ((unsigned long)ret + size > module_addr_max_rx)
83767 + module_addr_max_rx = (unsigned long)ret + size;
83768 mutex_unlock(&module_mutex);
83769 }
83770 return ret;
83771 @@ -2706,8 +2744,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
83772 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
83773 {
83774 const char *modmagic = get_modinfo(info, "vermagic");
83775 + const char *license = get_modinfo(info, "license");
83776 int err;
83777
83778 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
83779 + if (!license || !license_is_gpl_compatible(license))
83780 + return -ENOEXEC;
83781 +#endif
83782 +
83783 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
83784 modmagic = NULL;
83785
83786 @@ -2733,7 +2777,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
83787 }
83788
83789 /* Set up license info based on the info section */
83790 - set_license(mod, get_modinfo(info, "license"));
83791 + set_license(mod, license);
83792
83793 return 0;
83794 }
83795 @@ -2814,7 +2858,7 @@ static int move_module(struct module *mod, struct load_info *info)
83796 void *ptr;
83797
83798 /* Do the allocs. */
83799 - ptr = module_alloc_update_bounds(mod->core_size);
83800 + ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
83801 /*
83802 * The pointer to this block is stored in the module structure
83803 * which is inside the block. Just mark it as not being a
83804 @@ -2824,11 +2868,11 @@ static int move_module(struct module *mod, struct load_info *info)
83805 if (!ptr)
83806 return -ENOMEM;
83807
83808 - memset(ptr, 0, mod->core_size);
83809 - mod->module_core = ptr;
83810 + memset(ptr, 0, mod->core_size_rw);
83811 + mod->module_core_rw = ptr;
83812
83813 - if (mod->init_size) {
83814 - ptr = module_alloc_update_bounds(mod->init_size);
83815 + if (mod->init_size_rw) {
83816 + ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
83817 /*
83818 * The pointer to this block is stored in the module structure
83819 * which is inside the block. This block doesn't need to be
83820 @@ -2837,13 +2881,45 @@ static int move_module(struct module *mod, struct load_info *info)
83821 */
83822 kmemleak_ignore(ptr);
83823 if (!ptr) {
83824 - module_free(mod, mod->module_core);
83825 + module_free(mod, mod->module_core_rw);
83826 return -ENOMEM;
83827 }
83828 - memset(ptr, 0, mod->init_size);
83829 - mod->module_init = ptr;
83830 + memset(ptr, 0, mod->init_size_rw);
83831 + mod->module_init_rw = ptr;
83832 } else
83833 - mod->module_init = NULL;
83834 + mod->module_init_rw = NULL;
83835 +
83836 + ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
83837 + kmemleak_not_leak(ptr);
83838 + if (!ptr) {
83839 + if (mod->module_init_rw)
83840 + module_free(mod, mod->module_init_rw);
83841 + module_free(mod, mod->module_core_rw);
83842 + return -ENOMEM;
83843 + }
83844 +
83845 + pax_open_kernel();
83846 + memset(ptr, 0, mod->core_size_rx);
83847 + pax_close_kernel();
83848 + mod->module_core_rx = ptr;
83849 +
83850 + if (mod->init_size_rx) {
83851 + ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
83852 + kmemleak_ignore(ptr);
83853 + if (!ptr && mod->init_size_rx) {
83854 + module_free_exec(mod, mod->module_core_rx);
83855 + if (mod->module_init_rw)
83856 + module_free(mod, mod->module_init_rw);
83857 + module_free(mod, mod->module_core_rw);
83858 + return -ENOMEM;
83859 + }
83860 +
83861 + pax_open_kernel();
83862 + memset(ptr, 0, mod->init_size_rx);
83863 + pax_close_kernel();
83864 + mod->module_init_rx = ptr;
83865 + } else
83866 + mod->module_init_rx = NULL;
83867
83868 /* Transfer each section which specifies SHF_ALLOC */
83869 pr_debug("final section addresses:\n");
83870 @@ -2854,16 +2930,45 @@ static int move_module(struct module *mod, struct load_info *info)
83871 if (!(shdr->sh_flags & SHF_ALLOC))
83872 continue;
83873
83874 - if (shdr->sh_entsize & INIT_OFFSET_MASK)
83875 - dest = mod->module_init
83876 - + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
83877 - else
83878 - dest = mod->module_core + shdr->sh_entsize;
83879 + if (shdr->sh_entsize & INIT_OFFSET_MASK) {
83880 + if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
83881 + dest = mod->module_init_rw
83882 + + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
83883 + else
83884 + dest = mod->module_init_rx
83885 + + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
83886 + } else {
83887 + if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
83888 + dest = mod->module_core_rw + shdr->sh_entsize;
83889 + else
83890 + dest = mod->module_core_rx + shdr->sh_entsize;
83891 + }
83892 +
83893 + if (shdr->sh_type != SHT_NOBITS) {
83894 +
83895 +#ifdef CONFIG_PAX_KERNEXEC
83896 +#ifdef CONFIG_X86_64
83897 + if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
83898 + set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
83899 +#endif
83900 + if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
83901 + pax_open_kernel();
83902 + memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
83903 + pax_close_kernel();
83904 + } else
83905 +#endif
83906
83907 - if (shdr->sh_type != SHT_NOBITS)
83908 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
83909 + }
83910 /* Update sh_addr to point to copy in image. */
83911 - shdr->sh_addr = (unsigned long)dest;
83912 +
83913 +#ifdef CONFIG_PAX_KERNEXEC
83914 + if (shdr->sh_flags & SHF_EXECINSTR)
83915 + shdr->sh_addr = ktva_ktla((unsigned long)dest);
83916 + else
83917 +#endif
83918 +
83919 + shdr->sh_addr = (unsigned long)dest;
83920 pr_debug("\t0x%lx %s\n",
83921 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
83922 }
83923 @@ -2920,12 +3025,12 @@ static void flush_module_icache(const struct module *mod)
83924 * Do it before processing of module parameters, so the module
83925 * can provide parameter accessor functions of its own.
83926 */
83927 - if (mod->module_init)
83928 - flush_icache_range((unsigned long)mod->module_init,
83929 - (unsigned long)mod->module_init
83930 - + mod->init_size);
83931 - flush_icache_range((unsigned long)mod->module_core,
83932 - (unsigned long)mod->module_core + mod->core_size);
83933 + if (mod->module_init_rx)
83934 + flush_icache_range((unsigned long)mod->module_init_rx,
83935 + (unsigned long)mod->module_init_rx
83936 + + mod->init_size_rx);
83937 + flush_icache_range((unsigned long)mod->module_core_rx,
83938 + (unsigned long)mod->module_core_rx + mod->core_size_rx);
83939
83940 set_fs(old_fs);
83941 }
83942 @@ -2982,8 +3087,10 @@ static struct module *layout_and_allocate(struct load_info *info, int flags)
83943 static void module_deallocate(struct module *mod, struct load_info *info)
83944 {
83945 percpu_modfree(mod);
83946 - module_free(mod, mod->module_init);
83947 - module_free(mod, mod->module_core);
83948 + module_free_exec(mod, mod->module_init_rx);
83949 + module_free_exec(mod, mod->module_core_rx);
83950 + module_free(mod, mod->module_init_rw);
83951 + module_free(mod, mod->module_core_rw);
83952 }
83953
83954 int __weak module_finalize(const Elf_Ehdr *hdr,
83955 @@ -2996,7 +3103,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
83956 static int post_relocation(struct module *mod, const struct load_info *info)
83957 {
83958 /* Sort exception table now relocations are done. */
83959 + pax_open_kernel();
83960 sort_extable(mod->extable, mod->extable + mod->num_exentries);
83961 + pax_close_kernel();
83962
83963 /* Copy relocated percpu area over. */
83964 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
83965 @@ -3050,16 +3159,16 @@ static int do_init_module(struct module *mod)
83966 MODULE_STATE_COMING, mod);
83967
83968 /* Set RO and NX regions for core */
83969 - set_section_ro_nx(mod->module_core,
83970 - mod->core_text_size,
83971 - mod->core_ro_size,
83972 - mod->core_size);
83973 + set_section_ro_nx(mod->module_core_rx,
83974 + mod->core_size_rx,
83975 + mod->core_size_rx,
83976 + mod->core_size_rx);
83977
83978 /* Set RO and NX regions for init */
83979 - set_section_ro_nx(mod->module_init,
83980 - mod->init_text_size,
83981 - mod->init_ro_size,
83982 - mod->init_size);
83983 + set_section_ro_nx(mod->module_init_rx,
83984 + mod->init_size_rx,
83985 + mod->init_size_rx,
83986 + mod->init_size_rx);
83987
83988 do_mod_ctors(mod);
83989 /* Start the module */
83990 @@ -3121,11 +3230,12 @@ static int do_init_module(struct module *mod)
83991 mod->strtab = mod->core_strtab;
83992 #endif
83993 unset_module_init_ro_nx(mod);
83994 - module_free(mod, mod->module_init);
83995 - mod->module_init = NULL;
83996 - mod->init_size = 0;
83997 - mod->init_ro_size = 0;
83998 - mod->init_text_size = 0;
83999 + module_free(mod, mod->module_init_rw);
84000 + module_free_exec(mod, mod->module_init_rx);
84001 + mod->module_init_rw = NULL;
84002 + mod->module_init_rx = NULL;
84003 + mod->init_size_rw = 0;
84004 + mod->init_size_rx = 0;
84005 mutex_unlock(&module_mutex);
84006 wake_up_all(&module_wq);
84007
84008 @@ -3269,9 +3379,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
84009 if (err)
84010 goto free_unload;
84011
84012 + /* Now copy in args */
84013 + mod->args = strndup_user(uargs, ~0UL >> 1);
84014 + if (IS_ERR(mod->args)) {
84015 + err = PTR_ERR(mod->args);
84016 + goto free_unload;
84017 + }
84018 +
84019 /* Set up MODINFO_ATTR fields */
84020 setup_modinfo(mod, info);
84021
84022 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
84023 + {
84024 + char *p, *p2;
84025 +
84026 + if (strstr(mod->args, "grsec_modharden_netdev")) {
84027 + 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);
84028 + err = -EPERM;
84029 + goto free_modinfo;
84030 + } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
84031 + p += sizeof("grsec_modharden_normal") - 1;
84032 + p2 = strstr(p, "_");
84033 + if (p2) {
84034 + *p2 = '\0';
84035 + printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
84036 + *p2 = '_';
84037 + }
84038 + err = -EPERM;
84039 + goto free_modinfo;
84040 + }
84041 + }
84042 +#endif
84043 +
84044 /* Fix up syms, so that st_value is a pointer to location. */
84045 err = simplify_symbols(mod, info);
84046 if (err < 0)
84047 @@ -3287,13 +3426,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
84048
84049 flush_module_icache(mod);
84050
84051 - /* Now copy in args */
84052 - mod->args = strndup_user(uargs, ~0UL >> 1);
84053 - if (IS_ERR(mod->args)) {
84054 - err = PTR_ERR(mod->args);
84055 - goto free_arch_cleanup;
84056 - }
84057 -
84058 dynamic_debug_setup(info->debug, info->num_debug);
84059
84060 /* Finally it's fully formed, ready to start executing. */
84061 @@ -3328,11 +3460,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
84062 ddebug_cleanup:
84063 dynamic_debug_remove(info->debug);
84064 synchronize_sched();
84065 - kfree(mod->args);
84066 - free_arch_cleanup:
84067 module_arch_cleanup(mod);
84068 free_modinfo:
84069 free_modinfo(mod);
84070 + kfree(mod->args);
84071 free_unload:
84072 module_unload_free(mod);
84073 unlink_mod:
84074 @@ -3415,10 +3546,16 @@ static const char *get_ksymbol(struct module *mod,
84075 unsigned long nextval;
84076
84077 /* At worse, next value is at end of module */
84078 - if (within_module_init(addr, mod))
84079 - nextval = (unsigned long)mod->module_init+mod->init_text_size;
84080 + if (within_module_init_rx(addr, mod))
84081 + nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
84082 + else if (within_module_init_rw(addr, mod))
84083 + nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
84084 + else if (within_module_core_rx(addr, mod))
84085 + nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
84086 + else if (within_module_core_rw(addr, mod))
84087 + nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
84088 else
84089 - nextval = (unsigned long)mod->module_core+mod->core_text_size;
84090 + return NULL;
84091
84092 /* Scan for closest preceding symbol, and next symbol. (ELF
84093 starts real symbols at 1). */
84094 @@ -3669,7 +3806,7 @@ static int m_show(struct seq_file *m, void *p)
84095 return 0;
84096
84097 seq_printf(m, "%s %u",
84098 - mod->name, mod->init_size + mod->core_size);
84099 + mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
84100 print_unload_info(m, mod);
84101
84102 /* Informative for users. */
84103 @@ -3678,7 +3815,7 @@ static int m_show(struct seq_file *m, void *p)
84104 mod->state == MODULE_STATE_COMING ? "Loading":
84105 "Live");
84106 /* Used by oprofile and other similar tools. */
84107 - seq_printf(m, " 0x%pK", mod->module_core);
84108 + seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
84109
84110 /* Taints info */
84111 if (mod->taints)
84112 @@ -3714,7 +3851,17 @@ static const struct file_operations proc_modules_operations = {
84113
84114 static int __init proc_modules_init(void)
84115 {
84116 +#ifndef CONFIG_GRKERNSEC_HIDESYM
84117 +#ifdef CONFIG_GRKERNSEC_PROC_USER
84118 + proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
84119 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
84120 + proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
84121 +#else
84122 proc_create("modules", 0, NULL, &proc_modules_operations);
84123 +#endif
84124 +#else
84125 + proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
84126 +#endif
84127 return 0;
84128 }
84129 module_init(proc_modules_init);
84130 @@ -3775,14 +3922,14 @@ struct module *__module_address(unsigned long addr)
84131 {
84132 struct module *mod;
84133
84134 - if (addr < module_addr_min || addr > module_addr_max)
84135 + if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
84136 + (addr < module_addr_min_rw || addr > module_addr_max_rw))
84137 return NULL;
84138
84139 list_for_each_entry_rcu(mod, &modules, list) {
84140 if (mod->state == MODULE_STATE_UNFORMED)
84141 continue;
84142 - if (within_module_core(addr, mod)
84143 - || within_module_init(addr, mod))
84144 + if (within_module_init(addr, mod) || within_module_core(addr, mod))
84145 return mod;
84146 }
84147 return NULL;
84148 @@ -3817,11 +3964,20 @@ bool is_module_text_address(unsigned long addr)
84149 */
84150 struct module *__module_text_address(unsigned long addr)
84151 {
84152 - struct module *mod = __module_address(addr);
84153 + struct module *mod;
84154 +
84155 +#ifdef CONFIG_X86_32
84156 + addr = ktla_ktva(addr);
84157 +#endif
84158 +
84159 + if (addr < module_addr_min_rx || addr > module_addr_max_rx)
84160 + return NULL;
84161 +
84162 + mod = __module_address(addr);
84163 +
84164 if (mod) {
84165 /* Make sure it's within the text section. */
84166 - if (!within(addr, mod->module_init, mod->init_text_size)
84167 - && !within(addr, mod->module_core, mod->core_text_size))
84168 + if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
84169 mod = NULL;
84170 }
84171 return mod;
84172 diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
84173 index 7e3443f..b2a1e6b 100644
84174 --- a/kernel/mutex-debug.c
84175 +++ b/kernel/mutex-debug.c
84176 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
84177 }
84178
84179 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
84180 - struct thread_info *ti)
84181 + struct task_struct *task)
84182 {
84183 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
84184
84185 /* Mark the current thread as blocked on the lock: */
84186 - ti->task->blocked_on = waiter;
84187 + task->blocked_on = waiter;
84188 }
84189
84190 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
84191 - struct thread_info *ti)
84192 + struct task_struct *task)
84193 {
84194 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
84195 - DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
84196 - DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
84197 - ti->task->blocked_on = NULL;
84198 + DEBUG_LOCKS_WARN_ON(waiter->task != task);
84199 + DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
84200 + task->blocked_on = NULL;
84201
84202 list_del_init(&waiter->list);
84203 waiter->task = NULL;
84204 diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h
84205 index 0799fd3..d06ae3b 100644
84206 --- a/kernel/mutex-debug.h
84207 +++ b/kernel/mutex-debug.h
84208 @@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
84209 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
84210 extern void debug_mutex_add_waiter(struct mutex *lock,
84211 struct mutex_waiter *waiter,
84212 - struct thread_info *ti);
84213 + struct task_struct *task);
84214 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
84215 - struct thread_info *ti);
84216 + struct task_struct *task);
84217 extern void debug_mutex_unlock(struct mutex *lock);
84218 extern void debug_mutex_init(struct mutex *lock, const char *name,
84219 struct lock_class_key *key);
84220 diff --git a/kernel/mutex.c b/kernel/mutex.c
84221 index d24105b..15648eb 100644
84222 --- a/kernel/mutex.c
84223 +++ b/kernel/mutex.c
84224 @@ -135,7 +135,7 @@ void mspin_lock(struct mspin_node **lock, struct mspin_node *node)
84225 node->locked = 1;
84226 return;
84227 }
84228 - ACCESS_ONCE(prev->next) = node;
84229 + ACCESS_ONCE_RW(prev->next) = node;
84230 smp_wmb();
84231 /* Wait until the lock holder passes the lock down */
84232 while (!ACCESS_ONCE(node->locked))
84233 @@ -156,7 +156,7 @@ static void mspin_unlock(struct mspin_node **lock, struct mspin_node *node)
84234 while (!(next = ACCESS_ONCE(node->next)))
84235 arch_mutex_cpu_relax();
84236 }
84237 - ACCESS_ONCE(next->locked) = 1;
84238 + ACCESS_ONCE_RW(next->locked) = 1;
84239 smp_wmb();
84240 }
84241
84242 @@ -520,7 +520,7 @@ slowpath:
84243 goto skip_wait;
84244
84245 debug_mutex_lock_common(lock, &waiter);
84246 - debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
84247 + debug_mutex_add_waiter(lock, &waiter, task);
84248
84249 /* add waiting tasks to the end of the waitqueue (FIFO): */
84250 list_add_tail(&waiter.list, &lock->wait_list);
84251 @@ -564,7 +564,7 @@ slowpath:
84252 schedule_preempt_disabled();
84253 spin_lock_mutex(&lock->wait_lock, flags);
84254 }
84255 - mutex_remove_waiter(lock, &waiter, current_thread_info());
84256 + mutex_remove_waiter(lock, &waiter, task);
84257 /* set it to 0 if there are no waiters left: */
84258 if (likely(list_empty(&lock->wait_list)))
84259 atomic_set(&lock->count, 0);
84260 @@ -601,7 +601,7 @@ skip_wait:
84261 return 0;
84262
84263 err:
84264 - mutex_remove_waiter(lock, &waiter, task_thread_info(task));
84265 + mutex_remove_waiter(lock, &waiter, task);
84266 spin_unlock_mutex(&lock->wait_lock, flags);
84267 debug_mutex_free_waiter(&waiter);
84268 mutex_release(&lock->dep_map, 1, ip);
84269 diff --git a/kernel/notifier.c b/kernel/notifier.c
84270 index 2d5cc4c..d9ea600 100644
84271 --- a/kernel/notifier.c
84272 +++ b/kernel/notifier.c
84273 @@ -5,6 +5,7 @@
84274 #include <linux/rcupdate.h>
84275 #include <linux/vmalloc.h>
84276 #include <linux/reboot.h>
84277 +#include <linux/mm.h>
84278
84279 /*
84280 * Notifier list for kernel code which wants to be called
84281 @@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
84282 while ((*nl) != NULL) {
84283 if (n->priority > (*nl)->priority)
84284 break;
84285 - nl = &((*nl)->next);
84286 + nl = (struct notifier_block **)&((*nl)->next);
84287 }
84288 - n->next = *nl;
84289 + pax_open_kernel();
84290 + *(const void **)&n->next = *nl;
84291 rcu_assign_pointer(*nl, n);
84292 + pax_close_kernel();
84293 return 0;
84294 }
84295
84296 @@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
84297 return 0;
84298 if (n->priority > (*nl)->priority)
84299 break;
84300 - nl = &((*nl)->next);
84301 + nl = (struct notifier_block **)&((*nl)->next);
84302 }
84303 - n->next = *nl;
84304 + pax_open_kernel();
84305 + *(const void **)&n->next = *nl;
84306 rcu_assign_pointer(*nl, n);
84307 + pax_close_kernel();
84308 return 0;
84309 }
84310
84311 @@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
84312 {
84313 while ((*nl) != NULL) {
84314 if ((*nl) == n) {
84315 + pax_open_kernel();
84316 rcu_assign_pointer(*nl, n->next);
84317 + pax_close_kernel();
84318 return 0;
84319 }
84320 - nl = &((*nl)->next);
84321 + nl = (struct notifier_block **)&((*nl)->next);
84322 }
84323 return -ENOENT;
84324 }
84325 diff --git a/kernel/panic.c b/kernel/panic.c
84326 index b6c482c..5578061 100644
84327 --- a/kernel/panic.c
84328 +++ b/kernel/panic.c
84329 @@ -407,7 +407,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
84330 disable_trace_on_warning();
84331
84332 pr_warn("------------[ cut here ]------------\n");
84333 - pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
84334 + pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
84335 raw_smp_processor_id(), current->pid, file, line, caller);
84336
84337 if (args)
84338 @@ -461,7 +461,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
84339 */
84340 void __stack_chk_fail(void)
84341 {
84342 - panic("stack-protector: Kernel stack is corrupted in: %p\n",
84343 + dump_stack();
84344 + panic("stack-protector: Kernel stack is corrupted in: %pA\n",
84345 __builtin_return_address(0));
84346 }
84347 EXPORT_SYMBOL(__stack_chk_fail);
84348 diff --git a/kernel/pid.c b/kernel/pid.c
84349 index 9b9a266..c20ef80 100644
84350 --- a/kernel/pid.c
84351 +++ b/kernel/pid.c
84352 @@ -33,6 +33,7 @@
84353 #include <linux/rculist.h>
84354 #include <linux/bootmem.h>
84355 #include <linux/hash.h>
84356 +#include <linux/security.h>
84357 #include <linux/pid_namespace.h>
84358 #include <linux/init_task.h>
84359 #include <linux/syscalls.h>
84360 @@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
84361
84362 int pid_max = PID_MAX_DEFAULT;
84363
84364 -#define RESERVED_PIDS 300
84365 +#define RESERVED_PIDS 500
84366
84367 int pid_max_min = RESERVED_PIDS + 1;
84368 int pid_max_max = PID_MAX_LIMIT;
84369 @@ -445,10 +446,18 @@ EXPORT_SYMBOL(pid_task);
84370 */
84371 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
84372 {
84373 + struct task_struct *task;
84374 +
84375 rcu_lockdep_assert(rcu_read_lock_held(),
84376 "find_task_by_pid_ns() needs rcu_read_lock()"
84377 " protection");
84378 - return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
84379 +
84380 + task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
84381 +
84382 + if (gr_pid_is_chrooted(task))
84383 + return NULL;
84384 +
84385 + return task;
84386 }
84387
84388 struct task_struct *find_task_by_vpid(pid_t vnr)
84389 @@ -456,6 +465,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
84390 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
84391 }
84392
84393 +struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
84394 +{
84395 + rcu_lockdep_assert(rcu_read_lock_held(),
84396 + "find_task_by_pid_ns() needs rcu_read_lock()"
84397 + " protection");
84398 + return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
84399 +}
84400 +
84401 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
84402 {
84403 struct pid *pid;
84404 diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
84405 index 4208655..19f36a5 100644
84406 --- a/kernel/pid_namespace.c
84407 +++ b/kernel/pid_namespace.c
84408 @@ -247,7 +247,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
84409 void __user *buffer, size_t *lenp, loff_t *ppos)
84410 {
84411 struct pid_namespace *pid_ns = task_active_pid_ns(current);
84412 - struct ctl_table tmp = *table;
84413 + ctl_table_no_const tmp = *table;
84414
84415 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
84416 return -EPERM;
84417 diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
84418 index c7f31aa..2b44977 100644
84419 --- a/kernel/posix-cpu-timers.c
84420 +++ b/kernel/posix-cpu-timers.c
84421 @@ -1521,14 +1521,14 @@ struct k_clock clock_posix_cpu = {
84422
84423 static __init int init_posix_cpu_timers(void)
84424 {
84425 - struct k_clock process = {
84426 + static struct k_clock process = {
84427 .clock_getres = process_cpu_clock_getres,
84428 .clock_get = process_cpu_clock_get,
84429 .timer_create = process_cpu_timer_create,
84430 .nsleep = process_cpu_nsleep,
84431 .nsleep_restart = process_cpu_nsleep_restart,
84432 };
84433 - struct k_clock thread = {
84434 + static struct k_clock thread = {
84435 .clock_getres = thread_cpu_clock_getres,
84436 .clock_get = thread_cpu_clock_get,
84437 .timer_create = thread_cpu_timer_create,
84438 diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
84439 index 424c2d4..679242f 100644
84440 --- a/kernel/posix-timers.c
84441 +++ b/kernel/posix-timers.c
84442 @@ -43,6 +43,7 @@
84443 #include <linux/hash.h>
84444 #include <linux/posix-clock.h>
84445 #include <linux/posix-timers.h>
84446 +#include <linux/grsecurity.h>
84447 #include <linux/syscalls.h>
84448 #include <linux/wait.h>
84449 #include <linux/workqueue.h>
84450 @@ -122,7 +123,7 @@ static DEFINE_SPINLOCK(hash_lock);
84451 * which we beg off on and pass to do_sys_settimeofday().
84452 */
84453
84454 -static struct k_clock posix_clocks[MAX_CLOCKS];
84455 +static struct k_clock *posix_clocks[MAX_CLOCKS];
84456
84457 /*
84458 * These ones are defined below.
84459 @@ -275,7 +276,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
84460 */
84461 static __init int init_posix_timers(void)
84462 {
84463 - struct k_clock clock_realtime = {
84464 + static struct k_clock clock_realtime = {
84465 .clock_getres = hrtimer_get_res,
84466 .clock_get = posix_clock_realtime_get,
84467 .clock_set = posix_clock_realtime_set,
84468 @@ -287,7 +288,7 @@ static __init int init_posix_timers(void)
84469 .timer_get = common_timer_get,
84470 .timer_del = common_timer_del,
84471 };
84472 - struct k_clock clock_monotonic = {
84473 + static struct k_clock clock_monotonic = {
84474 .clock_getres = hrtimer_get_res,
84475 .clock_get = posix_ktime_get_ts,
84476 .nsleep = common_nsleep,
84477 @@ -297,19 +298,19 @@ static __init int init_posix_timers(void)
84478 .timer_get = common_timer_get,
84479 .timer_del = common_timer_del,
84480 };
84481 - struct k_clock clock_monotonic_raw = {
84482 + static struct k_clock clock_monotonic_raw = {
84483 .clock_getres = hrtimer_get_res,
84484 .clock_get = posix_get_monotonic_raw,
84485 };
84486 - struct k_clock clock_realtime_coarse = {
84487 + static struct k_clock clock_realtime_coarse = {
84488 .clock_getres = posix_get_coarse_res,
84489 .clock_get = posix_get_realtime_coarse,
84490 };
84491 - struct k_clock clock_monotonic_coarse = {
84492 + static struct k_clock clock_monotonic_coarse = {
84493 .clock_getres = posix_get_coarse_res,
84494 .clock_get = posix_get_monotonic_coarse,
84495 };
84496 - struct k_clock clock_tai = {
84497 + static struct k_clock clock_tai = {
84498 .clock_getres = hrtimer_get_res,
84499 .clock_get = posix_get_tai,
84500 .nsleep = common_nsleep,
84501 @@ -319,7 +320,7 @@ static __init int init_posix_timers(void)
84502 .timer_get = common_timer_get,
84503 .timer_del = common_timer_del,
84504 };
84505 - struct k_clock clock_boottime = {
84506 + static struct k_clock clock_boottime = {
84507 .clock_getres = hrtimer_get_res,
84508 .clock_get = posix_get_boottime,
84509 .nsleep = common_nsleep,
84510 @@ -531,7 +532,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
84511 return;
84512 }
84513
84514 - posix_clocks[clock_id] = *new_clock;
84515 + posix_clocks[clock_id] = new_clock;
84516 }
84517 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
84518
84519 @@ -577,9 +578,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
84520 return (id & CLOCKFD_MASK) == CLOCKFD ?
84521 &clock_posix_dynamic : &clock_posix_cpu;
84522
84523 - if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
84524 + if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
84525 return NULL;
84526 - return &posix_clocks[id];
84527 + return posix_clocks[id];
84528 }
84529
84530 static int common_timer_create(struct k_itimer *new_timer)
84531 @@ -597,7 +598,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
84532 struct k_clock *kc = clockid_to_kclock(which_clock);
84533 struct k_itimer *new_timer;
84534 int error, new_timer_id;
84535 - sigevent_t event;
84536 + sigevent_t event = { };
84537 int it_id_set = IT_ID_NOT_SET;
84538
84539 if (!kc)
84540 @@ -1011,6 +1012,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
84541 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
84542 return -EFAULT;
84543
84544 + /* only the CLOCK_REALTIME clock can be set, all other clocks
84545 + have their clock_set fptr set to a nosettime dummy function
84546 + CLOCK_REALTIME has a NULL clock_set fptr which causes it to
84547 + call common_clock_set, which calls do_sys_settimeofday, which
84548 + we hook
84549 + */
84550 +
84551 return kc->clock_set(which_clock, &new_tp);
84552 }
84553
84554 diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
84555 index d444c4e..bc3de51 100644
84556 --- a/kernel/power/Kconfig
84557 +++ b/kernel/power/Kconfig
84558 @@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
84559 config HIBERNATION
84560 bool "Hibernation (aka 'suspend to disk')"
84561 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
84562 + depends on !GRKERNSEC_KMEM
84563 + depends on !PAX_MEMORY_SANITIZE
84564 select HIBERNATE_CALLBACKS
84565 select LZO_COMPRESS
84566 select LZO_DECOMPRESS
84567 diff --git a/kernel/power/process.c b/kernel/power/process.c
84568 index 06ec886..9dba35e 100644
84569 --- a/kernel/power/process.c
84570 +++ b/kernel/power/process.c
84571 @@ -34,6 +34,7 @@ static int try_to_freeze_tasks(bool user_only)
84572 unsigned int elapsed_msecs;
84573 bool wakeup = false;
84574 int sleep_usecs = USEC_PER_MSEC;
84575 + bool timedout = false;
84576
84577 do_gettimeofday(&start);
84578
84579 @@ -44,13 +45,20 @@ static int try_to_freeze_tasks(bool user_only)
84580
84581 while (true) {
84582 todo = 0;
84583 + if (time_after(jiffies, end_time))
84584 + timedout = true;
84585 read_lock(&tasklist_lock);
84586 do_each_thread(g, p) {
84587 if (p == current || !freeze_task(p))
84588 continue;
84589
84590 - if (!freezer_should_skip(p))
84591 + if (!freezer_should_skip(p)) {
84592 todo++;
84593 + if (timedout) {
84594 + printk(KERN_ERR "Task refusing to freeze:\n");
84595 + sched_show_task(p);
84596 + }
84597 + }
84598 } while_each_thread(g, p);
84599 read_unlock(&tasklist_lock);
84600
84601 @@ -59,7 +67,7 @@ static int try_to_freeze_tasks(bool user_only)
84602 todo += wq_busy;
84603 }
84604
84605 - if (!todo || time_after(jiffies, end_time))
84606 + if (!todo || timedout)
84607 break;
84608
84609 if (pm_wakeup_pending()) {
84610 diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
84611 index b4e8500..b457a6c 100644
84612 --- a/kernel/printk/printk.c
84613 +++ b/kernel/printk/printk.c
84614 @@ -385,6 +385,11 @@ static int check_syslog_permissions(int type, bool from_file)
84615 if (from_file && type != SYSLOG_ACTION_OPEN)
84616 return 0;
84617
84618 +#ifdef CONFIG_GRKERNSEC_DMESG
84619 + if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
84620 + return -EPERM;
84621 +#endif
84622 +
84623 if (syslog_action_restricted(type)) {
84624 if (capable(CAP_SYSLOG))
84625 return 0;
84626 diff --git a/kernel/profile.c b/kernel/profile.c
84627 index 6631e1e..310c266 100644
84628 --- a/kernel/profile.c
84629 +++ b/kernel/profile.c
84630 @@ -37,7 +37,7 @@ struct profile_hit {
84631 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
84632 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
84633
84634 -static atomic_t *prof_buffer;
84635 +static atomic_unchecked_t *prof_buffer;
84636 static unsigned long prof_len, prof_shift;
84637
84638 int prof_on __read_mostly;
84639 @@ -260,7 +260,7 @@ static void profile_flip_buffers(void)
84640 hits[i].pc = 0;
84641 continue;
84642 }
84643 - atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
84644 + atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
84645 hits[i].hits = hits[i].pc = 0;
84646 }
84647 }
84648 @@ -321,9 +321,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
84649 * Add the current hit(s) and flush the write-queue out
84650 * to the global buffer:
84651 */
84652 - atomic_add(nr_hits, &prof_buffer[pc]);
84653 + atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
84654 for (i = 0; i < NR_PROFILE_HIT; ++i) {
84655 - atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
84656 + atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
84657 hits[i].pc = hits[i].hits = 0;
84658 }
84659 out:
84660 @@ -398,7 +398,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
84661 {
84662 unsigned long pc;
84663 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
84664 - atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
84665 + atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
84666 }
84667 #endif /* !CONFIG_SMP */
84668
84669 @@ -494,7 +494,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
84670 return -EFAULT;
84671 buf++; p++; count--; read++;
84672 }
84673 - pnt = (char *)prof_buffer + p - sizeof(atomic_t);
84674 + pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
84675 if (copy_to_user(buf, (void *)pnt, count))
84676 return -EFAULT;
84677 read += count;
84678 @@ -525,7 +525,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
84679 }
84680 #endif
84681 profile_discard_flip_buffers();
84682 - memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
84683 + memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
84684 return count;
84685 }
84686
84687 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
84688 index 1f4bcb3..99cf7ab 100644
84689 --- a/kernel/ptrace.c
84690 +++ b/kernel/ptrace.c
84691 @@ -327,7 +327,7 @@ static int ptrace_attach(struct task_struct *task, long request,
84692 if (seize)
84693 flags |= PT_SEIZED;
84694 rcu_read_lock();
84695 - if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
84696 + if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
84697 flags |= PT_PTRACE_CAP;
84698 rcu_read_unlock();
84699 task->ptrace = flags;
84700 @@ -538,7 +538,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
84701 break;
84702 return -EIO;
84703 }
84704 - if (copy_to_user(dst, buf, retval))
84705 + if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
84706 return -EFAULT;
84707 copied += retval;
84708 src += retval;
84709 @@ -806,7 +806,7 @@ int ptrace_request(struct task_struct *child, long request,
84710 bool seized = child->ptrace & PT_SEIZED;
84711 int ret = -EIO;
84712 siginfo_t siginfo, *si;
84713 - void __user *datavp = (void __user *) data;
84714 + void __user *datavp = (__force void __user *) data;
84715 unsigned long __user *datalp = datavp;
84716 unsigned long flags;
84717
84718 @@ -1052,14 +1052,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
84719 goto out;
84720 }
84721
84722 + if (gr_handle_ptrace(child, request)) {
84723 + ret = -EPERM;
84724 + goto out_put_task_struct;
84725 + }
84726 +
84727 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
84728 ret = ptrace_attach(child, request, addr, data);
84729 /*
84730 * Some architectures need to do book-keeping after
84731 * a ptrace attach.
84732 */
84733 - if (!ret)
84734 + if (!ret) {
84735 arch_ptrace_attach(child);
84736 + gr_audit_ptrace(child);
84737 + }
84738 goto out_put_task_struct;
84739 }
84740
84741 @@ -1087,7 +1094,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
84742 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
84743 if (copied != sizeof(tmp))
84744 return -EIO;
84745 - return put_user(tmp, (unsigned long __user *)data);
84746 + return put_user(tmp, (__force unsigned long __user *)data);
84747 }
84748
84749 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
84750 @@ -1181,7 +1188,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
84751 }
84752
84753 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
84754 - compat_long_t addr, compat_long_t data)
84755 + compat_ulong_t addr, compat_ulong_t data)
84756 {
84757 struct task_struct *child;
84758 long ret;
84759 @@ -1197,14 +1204,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
84760 goto out;
84761 }
84762
84763 + if (gr_handle_ptrace(child, request)) {
84764 + ret = -EPERM;
84765 + goto out_put_task_struct;
84766 + }
84767 +
84768 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
84769 ret = ptrace_attach(child, request, addr, data);
84770 /*
84771 * Some architectures need to do book-keeping after
84772 * a ptrace attach.
84773 */
84774 - if (!ret)
84775 + if (!ret) {
84776 arch_ptrace_attach(child);
84777 + gr_audit_ptrace(child);
84778 + }
84779 goto out_put_task_struct;
84780 }
84781
84782 diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
84783 index b02a339..ce2d20c 100644
84784 --- a/kernel/rcupdate.c
84785 +++ b/kernel/rcupdate.c
84786 @@ -312,10 +312,10 @@ int rcu_jiffies_till_stall_check(void)
84787 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
84788 */
84789 if (till_stall_check < 3) {
84790 - ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
84791 + ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
84792 till_stall_check = 3;
84793 } else if (till_stall_check > 300) {
84794 - ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
84795 + ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
84796 till_stall_check = 300;
84797 }
84798 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
84799 diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
84800 index 9ed6075..c9e8a63 100644
84801 --- a/kernel/rcutiny.c
84802 +++ b/kernel/rcutiny.c
84803 @@ -45,7 +45,7 @@
84804 /* Forward declarations for rcutiny_plugin.h. */
84805 struct rcu_ctrlblk;
84806 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
84807 -static void rcu_process_callbacks(struct softirq_action *unused);
84808 +static void rcu_process_callbacks(void);
84809 static void __call_rcu(struct rcu_head *head,
84810 void (*func)(struct rcu_head *rcu),
84811 struct rcu_ctrlblk *rcp);
84812 @@ -309,7 +309,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
84813 false));
84814 }
84815
84816 -static void rcu_process_callbacks(struct softirq_action *unused)
84817 +static __latent_entropy void rcu_process_callbacks(void)
84818 {
84819 __rcu_process_callbacks(&rcu_sched_ctrlblk);
84820 __rcu_process_callbacks(&rcu_bh_ctrlblk);
84821 diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
84822 index be63101..05cf721 100644
84823 --- a/kernel/rcutorture.c
84824 +++ b/kernel/rcutorture.c
84825 @@ -170,12 +170,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
84826 { 0 };
84827 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
84828 { 0 };
84829 -static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
84830 -static atomic_t n_rcu_torture_alloc;
84831 -static atomic_t n_rcu_torture_alloc_fail;
84832 -static atomic_t n_rcu_torture_free;
84833 -static atomic_t n_rcu_torture_mberror;
84834 -static atomic_t n_rcu_torture_error;
84835 +static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
84836 +static atomic_unchecked_t n_rcu_torture_alloc;
84837 +static atomic_unchecked_t n_rcu_torture_alloc_fail;
84838 +static atomic_unchecked_t n_rcu_torture_free;
84839 +static atomic_unchecked_t n_rcu_torture_mberror;
84840 +static atomic_unchecked_t n_rcu_torture_error;
84841 static long n_rcu_torture_barrier_error;
84842 static long n_rcu_torture_boost_ktrerror;
84843 static long n_rcu_torture_boost_rterror;
84844 @@ -293,11 +293,11 @@ rcu_torture_alloc(void)
84845
84846 spin_lock_bh(&rcu_torture_lock);
84847 if (list_empty(&rcu_torture_freelist)) {
84848 - atomic_inc(&n_rcu_torture_alloc_fail);
84849 + atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
84850 spin_unlock_bh(&rcu_torture_lock);
84851 return NULL;
84852 }
84853 - atomic_inc(&n_rcu_torture_alloc);
84854 + atomic_inc_unchecked(&n_rcu_torture_alloc);
84855 p = rcu_torture_freelist.next;
84856 list_del_init(p);
84857 spin_unlock_bh(&rcu_torture_lock);
84858 @@ -310,7 +310,7 @@ rcu_torture_alloc(void)
84859 static void
84860 rcu_torture_free(struct rcu_torture *p)
84861 {
84862 - atomic_inc(&n_rcu_torture_free);
84863 + atomic_inc_unchecked(&n_rcu_torture_free);
84864 spin_lock_bh(&rcu_torture_lock);
84865 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
84866 spin_unlock_bh(&rcu_torture_lock);
84867 @@ -431,7 +431,7 @@ rcu_torture_cb(struct rcu_head *p)
84868 i = rp->rtort_pipe_count;
84869 if (i > RCU_TORTURE_PIPE_LEN)
84870 i = RCU_TORTURE_PIPE_LEN;
84871 - atomic_inc(&rcu_torture_wcount[i]);
84872 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
84873 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
84874 rp->rtort_mbtest = 0;
84875 rcu_torture_free(rp);
84876 @@ -821,7 +821,7 @@ rcu_torture_writer(void *arg)
84877 i = old_rp->rtort_pipe_count;
84878 if (i > RCU_TORTURE_PIPE_LEN)
84879 i = RCU_TORTURE_PIPE_LEN;
84880 - atomic_inc(&rcu_torture_wcount[i]);
84881 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
84882 old_rp->rtort_pipe_count++;
84883 if (gp_normal == gp_exp)
84884 exp = !!(rcu_random(&rand) & 0x80);
84885 @@ -839,7 +839,7 @@ rcu_torture_writer(void *arg)
84886 i = rp->rtort_pipe_count;
84887 if (i > RCU_TORTURE_PIPE_LEN)
84888 i = RCU_TORTURE_PIPE_LEN;
84889 - atomic_inc(&rcu_torture_wcount[i]);
84890 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
84891 if (++rp->rtort_pipe_count >=
84892 RCU_TORTURE_PIPE_LEN) {
84893 rp->rtort_mbtest = 0;
84894 @@ -938,7 +938,7 @@ static void rcu_torture_timer(unsigned long unused)
84895 return;
84896 }
84897 if (p->rtort_mbtest == 0)
84898 - atomic_inc(&n_rcu_torture_mberror);
84899 + atomic_inc_unchecked(&n_rcu_torture_mberror);
84900 spin_lock(&rand_lock);
84901 cur_ops->read_delay(&rand);
84902 n_rcu_torture_timers++;
84903 @@ -1008,7 +1008,7 @@ rcu_torture_reader(void *arg)
84904 continue;
84905 }
84906 if (p->rtort_mbtest == 0)
84907 - atomic_inc(&n_rcu_torture_mberror);
84908 + atomic_inc_unchecked(&n_rcu_torture_mberror);
84909 cur_ops->read_delay(&rand);
84910 preempt_disable();
84911 pipe_count = p->rtort_pipe_count;
84912 @@ -1071,11 +1071,11 @@ rcu_torture_printk(char *page)
84913 rcu_torture_current,
84914 rcu_torture_current_version,
84915 list_empty(&rcu_torture_freelist),
84916 - atomic_read(&n_rcu_torture_alloc),
84917 - atomic_read(&n_rcu_torture_alloc_fail),
84918 - atomic_read(&n_rcu_torture_free));
84919 + atomic_read_unchecked(&n_rcu_torture_alloc),
84920 + atomic_read_unchecked(&n_rcu_torture_alloc_fail),
84921 + atomic_read_unchecked(&n_rcu_torture_free));
84922 cnt += sprintf(&page[cnt], "rtmbe: %d rtbke: %ld rtbre: %ld ",
84923 - atomic_read(&n_rcu_torture_mberror),
84924 + atomic_read_unchecked(&n_rcu_torture_mberror),
84925 n_rcu_torture_boost_ktrerror,
84926 n_rcu_torture_boost_rterror);
84927 cnt += sprintf(&page[cnt], "rtbf: %ld rtb: %ld nt: %ld ",
84928 @@ -1094,14 +1094,14 @@ rcu_torture_printk(char *page)
84929 n_barrier_attempts,
84930 n_rcu_torture_barrier_error);
84931 cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
84932 - if (atomic_read(&n_rcu_torture_mberror) != 0 ||
84933 + if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
84934 n_rcu_torture_barrier_error != 0 ||
84935 n_rcu_torture_boost_ktrerror != 0 ||
84936 n_rcu_torture_boost_rterror != 0 ||
84937 n_rcu_torture_boost_failure != 0 ||
84938 i > 1) {
84939 cnt += sprintf(&page[cnt], "!!! ");
84940 - atomic_inc(&n_rcu_torture_error);
84941 + atomic_inc_unchecked(&n_rcu_torture_error);
84942 WARN_ON_ONCE(1);
84943 }
84944 cnt += sprintf(&page[cnt], "Reader Pipe: ");
84945 @@ -1115,7 +1115,7 @@ rcu_torture_printk(char *page)
84946 cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
84947 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
84948 cnt += sprintf(&page[cnt], " %d",
84949 - atomic_read(&rcu_torture_wcount[i]));
84950 + atomic_read_unchecked(&rcu_torture_wcount[i]));
84951 }
84952 cnt += sprintf(&page[cnt], "\n");
84953 if (cur_ops->stats)
84954 @@ -1830,7 +1830,7 @@ rcu_torture_cleanup(void)
84955
84956 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
84957
84958 - if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
84959 + if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
84960 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
84961 else if (n_online_successes != n_online_attempts ||
84962 n_offline_successes != n_offline_attempts)
84963 @@ -1952,18 +1952,18 @@ rcu_torture_init(void)
84964
84965 rcu_torture_current = NULL;
84966 rcu_torture_current_version = 0;
84967 - atomic_set(&n_rcu_torture_alloc, 0);
84968 - atomic_set(&n_rcu_torture_alloc_fail, 0);
84969 - atomic_set(&n_rcu_torture_free, 0);
84970 - atomic_set(&n_rcu_torture_mberror, 0);
84971 - atomic_set(&n_rcu_torture_error, 0);
84972 + atomic_set_unchecked(&n_rcu_torture_alloc, 0);
84973 + atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
84974 + atomic_set_unchecked(&n_rcu_torture_free, 0);
84975 + atomic_set_unchecked(&n_rcu_torture_mberror, 0);
84976 + atomic_set_unchecked(&n_rcu_torture_error, 0);
84977 n_rcu_torture_barrier_error = 0;
84978 n_rcu_torture_boost_ktrerror = 0;
84979 n_rcu_torture_boost_rterror = 0;
84980 n_rcu_torture_boost_failure = 0;
84981 n_rcu_torture_boosts = 0;
84982 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
84983 - atomic_set(&rcu_torture_wcount[i], 0);
84984 + atomic_set_unchecked(&rcu_torture_wcount[i], 0);
84985 for_each_possible_cpu(cpu) {
84986 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
84987 per_cpu(rcu_torture_count, cpu)[i] = 0;
84988 diff --git a/kernel/rcutree.c b/kernel/rcutree.c
84989 index 32618b3..c1fb822 100644
84990 --- a/kernel/rcutree.c
84991 +++ b/kernel/rcutree.c
84992 @@ -382,9 +382,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
84993 rcu_prepare_for_idle(smp_processor_id());
84994 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
84995 smp_mb__before_atomic_inc(); /* See above. */
84996 - atomic_inc(&rdtp->dynticks);
84997 + atomic_inc_unchecked(&rdtp->dynticks);
84998 smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */
84999 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
85000 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
85001
85002 /*
85003 * It is illegal to enter an extended quiescent state while
85004 @@ -501,10 +501,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
85005 int user)
85006 {
85007 smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
85008 - atomic_inc(&rdtp->dynticks);
85009 + atomic_inc_unchecked(&rdtp->dynticks);
85010 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
85011 smp_mb__after_atomic_inc(); /* See above. */
85012 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
85013 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
85014 rcu_cleanup_after_idle(smp_processor_id());
85015 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
85016 if (!user && !is_idle_task(current)) {
85017 @@ -623,14 +623,14 @@ void rcu_nmi_enter(void)
85018 struct rcu_dynticks *rdtp = &__get_cpu_var(rcu_dynticks);
85019
85020 if (rdtp->dynticks_nmi_nesting == 0 &&
85021 - (atomic_read(&rdtp->dynticks) & 0x1))
85022 + (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
85023 return;
85024 rdtp->dynticks_nmi_nesting++;
85025 smp_mb__before_atomic_inc(); /* Force delay from prior write. */
85026 - atomic_inc(&rdtp->dynticks);
85027 + atomic_inc_unchecked(&rdtp->dynticks);
85028 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
85029 smp_mb__after_atomic_inc(); /* See above. */
85030 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
85031 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
85032 }
85033
85034 /**
85035 @@ -649,9 +649,9 @@ void rcu_nmi_exit(void)
85036 return;
85037 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
85038 smp_mb__before_atomic_inc(); /* See above. */
85039 - atomic_inc(&rdtp->dynticks);
85040 + atomic_inc_unchecked(&rdtp->dynticks);
85041 smp_mb__after_atomic_inc(); /* Force delay to next write. */
85042 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
85043 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
85044 }
85045
85046 /**
85047 @@ -665,7 +665,7 @@ int rcu_is_cpu_idle(void)
85048 int ret;
85049
85050 preempt_disable();
85051 - ret = (atomic_read(&__get_cpu_var(rcu_dynticks).dynticks) & 0x1) == 0;
85052 + ret = (atomic_read_unchecked(&__get_cpu_var(rcu_dynticks).dynticks) & 0x1) == 0;
85053 preempt_enable();
85054 return ret;
85055 }
85056 @@ -734,7 +734,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
85057 static int dyntick_save_progress_counter(struct rcu_data *rdp,
85058 bool *isidle, unsigned long *maxj)
85059 {
85060 - rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
85061 + rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
85062 rcu_sysidle_check_cpu(rdp, isidle, maxj);
85063 return (rdp->dynticks_snap & 0x1) == 0;
85064 }
85065 @@ -751,7 +751,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
85066 unsigned int curr;
85067 unsigned int snap;
85068
85069 - curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
85070 + curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
85071 snap = (unsigned int)rdp->dynticks_snap;
85072
85073 /*
85074 @@ -1341,9 +1341,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
85075 rdp = this_cpu_ptr(rsp->rda);
85076 rcu_preempt_check_blocked_tasks(rnp);
85077 rnp->qsmask = rnp->qsmaskinit;
85078 - ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
85079 + ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
85080 WARN_ON_ONCE(rnp->completed != rsp->completed);
85081 - ACCESS_ONCE(rnp->completed) = rsp->completed;
85082 + ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
85083 if (rnp == rdp->mynode)
85084 __note_gp_changes(rsp, rnp, rdp);
85085 rcu_preempt_boost_start_gp(rnp);
85086 @@ -1434,7 +1434,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
85087 */
85088 rcu_for_each_node_breadth_first(rsp, rnp) {
85089 raw_spin_lock_irq(&rnp->lock);
85090 - ACCESS_ONCE(rnp->completed) = rsp->gpnum;
85091 + ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
85092 rdp = this_cpu_ptr(rsp->rda);
85093 if (rnp == rdp->mynode)
85094 __note_gp_changes(rsp, rnp, rdp);
85095 @@ -1766,7 +1766,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
85096 rsp->qlen += rdp->qlen;
85097 rdp->n_cbs_orphaned += rdp->qlen;
85098 rdp->qlen_lazy = 0;
85099 - ACCESS_ONCE(rdp->qlen) = 0;
85100 + ACCESS_ONCE_RW(rdp->qlen) = 0;
85101 }
85102
85103 /*
85104 @@ -2012,7 +2012,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
85105 }
85106 smp_mb(); /* List handling before counting for rcu_barrier(). */
85107 rdp->qlen_lazy -= count_lazy;
85108 - ACCESS_ONCE(rdp->qlen) -= count;
85109 + ACCESS_ONCE_RW(rdp->qlen) -= count;
85110 rdp->n_cbs_invoked += count;
85111
85112 /* Reinstate batch limit if we have worked down the excess. */
85113 @@ -2209,7 +2209,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
85114 /*
85115 * Do RCU core processing for the current CPU.
85116 */
85117 -static void rcu_process_callbacks(struct softirq_action *unused)
85118 +static __latent_entropy void rcu_process_callbacks(void)
85119 {
85120 struct rcu_state *rsp;
85121
85122 @@ -2316,7 +2316,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
85123 WARN_ON_ONCE((unsigned long)head & 0x3); /* Misaligned rcu_head! */
85124 if (debug_rcu_head_queue(head)) {
85125 /* Probable double call_rcu(), so leak the callback. */
85126 - ACCESS_ONCE(head->func) = rcu_leak_callback;
85127 + ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
85128 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
85129 return;
85130 }
85131 @@ -2344,7 +2344,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
85132 local_irq_restore(flags);
85133 return;
85134 }
85135 - ACCESS_ONCE(rdp->qlen)++;
85136 + ACCESS_ONCE_RW(rdp->qlen)++;
85137 if (lazy)
85138 rdp->qlen_lazy++;
85139 else
85140 @@ -2553,11 +2553,11 @@ void synchronize_sched_expedited(void)
85141 * counter wrap on a 32-bit system. Quite a few more CPUs would of
85142 * course be required on a 64-bit system.
85143 */
85144 - if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
85145 + if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
85146 (ulong)atomic_long_read(&rsp->expedited_done) +
85147 ULONG_MAX / 8)) {
85148 synchronize_sched();
85149 - atomic_long_inc(&rsp->expedited_wrap);
85150 + atomic_long_inc_unchecked(&rsp->expedited_wrap);
85151 return;
85152 }
85153
85154 @@ -2565,7 +2565,7 @@ void synchronize_sched_expedited(void)
85155 * Take a ticket. Note that atomic_inc_return() implies a
85156 * full memory barrier.
85157 */
85158 - snap = atomic_long_inc_return(&rsp->expedited_start);
85159 + snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
85160 firstsnap = snap;
85161 get_online_cpus();
85162 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
85163 @@ -2578,14 +2578,14 @@ void synchronize_sched_expedited(void)
85164 synchronize_sched_expedited_cpu_stop,
85165 NULL) == -EAGAIN) {
85166 put_online_cpus();
85167 - atomic_long_inc(&rsp->expedited_tryfail);
85168 + atomic_long_inc_unchecked(&rsp->expedited_tryfail);
85169
85170 /* Check to see if someone else did our work for us. */
85171 s = atomic_long_read(&rsp->expedited_done);
85172 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
85173 /* ensure test happens before caller kfree */
85174 smp_mb__before_atomic_inc(); /* ^^^ */
85175 - atomic_long_inc(&rsp->expedited_workdone1);
85176 + atomic_long_inc_unchecked(&rsp->expedited_workdone1);
85177 return;
85178 }
85179
85180 @@ -2594,7 +2594,7 @@ void synchronize_sched_expedited(void)
85181 udelay(trycount * num_online_cpus());
85182 } else {
85183 wait_rcu_gp(call_rcu_sched);
85184 - atomic_long_inc(&rsp->expedited_normal);
85185 + atomic_long_inc_unchecked(&rsp->expedited_normal);
85186 return;
85187 }
85188
85189 @@ -2603,7 +2603,7 @@ void synchronize_sched_expedited(void)
85190 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
85191 /* ensure test happens before caller kfree */
85192 smp_mb__before_atomic_inc(); /* ^^^ */
85193 - atomic_long_inc(&rsp->expedited_workdone2);
85194 + atomic_long_inc_unchecked(&rsp->expedited_workdone2);
85195 return;
85196 }
85197
85198 @@ -2615,10 +2615,10 @@ void synchronize_sched_expedited(void)
85199 * period works for us.
85200 */
85201 get_online_cpus();
85202 - snap = atomic_long_read(&rsp->expedited_start);
85203 + snap = atomic_long_read_unchecked(&rsp->expedited_start);
85204 smp_mb(); /* ensure read is before try_stop_cpus(). */
85205 }
85206 - atomic_long_inc(&rsp->expedited_stoppedcpus);
85207 + atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
85208
85209 /*
85210 * Everyone up to our most recent fetch is covered by our grace
85211 @@ -2627,16 +2627,16 @@ void synchronize_sched_expedited(void)
85212 * than we did already did their update.
85213 */
85214 do {
85215 - atomic_long_inc(&rsp->expedited_done_tries);
85216 + atomic_long_inc_unchecked(&rsp->expedited_done_tries);
85217 s = atomic_long_read(&rsp->expedited_done);
85218 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
85219 /* ensure test happens before caller kfree */
85220 smp_mb__before_atomic_inc(); /* ^^^ */
85221 - atomic_long_inc(&rsp->expedited_done_lost);
85222 + atomic_long_inc_unchecked(&rsp->expedited_done_lost);
85223 break;
85224 }
85225 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
85226 - atomic_long_inc(&rsp->expedited_done_exit);
85227 + atomic_long_inc_unchecked(&rsp->expedited_done_exit);
85228
85229 put_online_cpus();
85230 }
85231 @@ -2829,7 +2829,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
85232 * ACCESS_ONCE() to prevent the compiler from speculating
85233 * the increment to precede the early-exit check.
85234 */
85235 - ACCESS_ONCE(rsp->n_barrier_done)++;
85236 + ACCESS_ONCE_RW(rsp->n_barrier_done)++;
85237 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
85238 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
85239 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
85240 @@ -2879,7 +2879,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
85241
85242 /* Increment ->n_barrier_done to prevent duplicate work. */
85243 smp_mb(); /* Keep increment after above mechanism. */
85244 - ACCESS_ONCE(rsp->n_barrier_done)++;
85245 + ACCESS_ONCE_RW(rsp->n_barrier_done)++;
85246 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
85247 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
85248 smp_mb(); /* Keep increment before caller's subsequent code. */
85249 @@ -2924,10 +2924,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
85250 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
85251 init_callback_list(rdp);
85252 rdp->qlen_lazy = 0;
85253 - ACCESS_ONCE(rdp->qlen) = 0;
85254 + ACCESS_ONCE_RW(rdp->qlen) = 0;
85255 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
85256 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
85257 - WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
85258 + WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
85259 rdp->cpu = cpu;
85260 rdp->rsp = rsp;
85261 rcu_boot_init_nocb_percpu_data(rdp);
85262 @@ -2961,8 +2961,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
85263 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
85264 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
85265 rcu_sysidle_init_percpu_data(rdp->dynticks);
85266 - atomic_set(&rdp->dynticks->dynticks,
85267 - (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
85268 + atomic_set_unchecked(&rdp->dynticks->dynticks,
85269 + (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
85270 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
85271
85272 /* Add CPU to rcu_node bitmasks. */
85273 diff --git a/kernel/rcutree.h b/kernel/rcutree.h
85274 index 5f97eab..db8f687 100644
85275 --- a/kernel/rcutree.h
85276 +++ b/kernel/rcutree.h
85277 @@ -87,11 +87,11 @@ struct rcu_dynticks {
85278 long long dynticks_nesting; /* Track irq/process nesting level. */
85279 /* Process level is worth LLONG_MAX/2. */
85280 int dynticks_nmi_nesting; /* Track NMI nesting level. */
85281 - atomic_t dynticks; /* Even value for idle, else odd. */
85282 + atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
85283 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
85284 long long dynticks_idle_nesting;
85285 /* irq/process nesting level from idle. */
85286 - atomic_t dynticks_idle; /* Even value for idle, else odd. */
85287 + atomic_unchecked_t dynticks_idle; /* Even value for idle, else odd. */
85288 /* "Idle" excludes userspace execution. */
85289 unsigned long dynticks_idle_jiffies;
85290 /* End of last non-NMI non-idle period. */
85291 @@ -427,17 +427,17 @@ struct rcu_state {
85292 /* _rcu_barrier(). */
85293 /* End of fields guarded by barrier_mutex. */
85294
85295 - atomic_long_t expedited_start; /* Starting ticket. */
85296 - atomic_long_t expedited_done; /* Done ticket. */
85297 - atomic_long_t expedited_wrap; /* # near-wrap incidents. */
85298 - atomic_long_t expedited_tryfail; /* # acquisition failures. */
85299 - atomic_long_t expedited_workdone1; /* # done by others #1. */
85300 - atomic_long_t expedited_workdone2; /* # done by others #2. */
85301 - atomic_long_t expedited_normal; /* # fallbacks to normal. */
85302 - atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
85303 - atomic_long_t expedited_done_tries; /* # tries to update _done. */
85304 - atomic_long_t expedited_done_lost; /* # times beaten to _done. */
85305 - atomic_long_t expedited_done_exit; /* # times exited _done loop. */
85306 + atomic_long_unchecked_t expedited_start; /* Starting ticket. */
85307 + atomic_long_t expedited_done; /* Done ticket. */
85308 + atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
85309 + atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
85310 + atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
85311 + atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
85312 + atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
85313 + atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
85314 + atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
85315 + atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
85316 + atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
85317
85318 unsigned long jiffies_force_qs; /* Time at which to invoke */
85319 /* force_quiescent_state(). */
85320 diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
85321 index 130c97b..bcbe7f7 100644
85322 --- a/kernel/rcutree_plugin.h
85323 +++ b/kernel/rcutree_plugin.h
85324 @@ -744,7 +744,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
85325 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
85326 {
85327 return !rcu_preempted_readers_exp(rnp) &&
85328 - ACCESS_ONCE(rnp->expmask) == 0;
85329 + ACCESS_ONCE_RW(rnp->expmask) == 0;
85330 }
85331
85332 /*
85333 @@ -900,7 +900,7 @@ void synchronize_rcu_expedited(void)
85334
85335 /* Clean up and exit. */
85336 smp_mb(); /* ensure expedited GP seen before counter increment. */
85337 - ACCESS_ONCE(sync_rcu_preempt_exp_count)++;
85338 + ACCESS_ONCE_RW(sync_rcu_preempt_exp_count)++;
85339 unlock_mb_ret:
85340 mutex_unlock(&sync_rcu_preempt_exp_mutex);
85341 mb_ret:
85342 @@ -1474,7 +1474,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
85343 free_cpumask_var(cm);
85344 }
85345
85346 -static struct smp_hotplug_thread rcu_cpu_thread_spec = {
85347 +static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
85348 .store = &rcu_cpu_kthread_task,
85349 .thread_should_run = rcu_cpu_kthread_should_run,
85350 .thread_fn = rcu_cpu_kthread,
85351 @@ -1939,7 +1939,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
85352 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
85353 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n",
85354 cpu, ticks_value, ticks_title,
85355 - atomic_read(&rdtp->dynticks) & 0xfff,
85356 + atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
85357 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
85358 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
85359 fast_no_hz);
85360 @@ -2102,7 +2102,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
85361
85362 /* Enqueue the callback on the nocb list and update counts. */
85363 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
85364 - ACCESS_ONCE(*old_rhpp) = rhp;
85365 + ACCESS_ONCE_RW(*old_rhpp) = rhp;
85366 atomic_long_add(rhcount, &rdp->nocb_q_count);
85367 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
85368
85369 @@ -2242,12 +2242,12 @@ static int rcu_nocb_kthread(void *arg)
85370 * Extract queued callbacks, update counts, and wait
85371 * for a grace period to elapse.
85372 */
85373 - ACCESS_ONCE(rdp->nocb_head) = NULL;
85374 + ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
85375 tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
85376 c = atomic_long_xchg(&rdp->nocb_q_count, 0);
85377 cl = atomic_long_xchg(&rdp->nocb_q_count_lazy, 0);
85378 - ACCESS_ONCE(rdp->nocb_p_count) += c;
85379 - ACCESS_ONCE(rdp->nocb_p_count_lazy) += cl;
85380 + ACCESS_ONCE_RW(rdp->nocb_p_count) += c;
85381 + ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) += cl;
85382 rcu_nocb_wait_gp(rdp);
85383
85384 /* Each pass through the following loop invokes a callback. */
85385 @@ -2269,8 +2269,8 @@ static int rcu_nocb_kthread(void *arg)
85386 list = next;
85387 }
85388 trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
85389 - ACCESS_ONCE(rdp->nocb_p_count) -= c;
85390 - ACCESS_ONCE(rdp->nocb_p_count_lazy) -= cl;
85391 + ACCESS_ONCE_RW(rdp->nocb_p_count) -= c;
85392 + ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) -= cl;
85393 rdp->n_nocbs_invoked += c;
85394 }
85395 return 0;
85396 @@ -2297,7 +2297,7 @@ static void __init rcu_spawn_nocb_kthreads(struct rcu_state *rsp)
85397 t = kthread_run(rcu_nocb_kthread, rdp,
85398 "rcuo%c/%d", rsp->abbr, cpu);
85399 BUG_ON(IS_ERR(t));
85400 - ACCESS_ONCE(rdp->nocb_kthread) = t;
85401 + ACCESS_ONCE_RW(rdp->nocb_kthread) = t;
85402 }
85403 }
85404
85405 @@ -2423,11 +2423,11 @@ static void rcu_sysidle_enter(struct rcu_dynticks *rdtp, int irq)
85406
85407 /* Record start of fully idle period. */
85408 j = jiffies;
85409 - ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
85410 + ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
85411 smp_mb__before_atomic_inc();
85412 - atomic_inc(&rdtp->dynticks_idle);
85413 + atomic_inc_unchecked(&rdtp->dynticks_idle);
85414 smp_mb__after_atomic_inc();
85415 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
85416 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
85417 }
85418
85419 /*
85420 @@ -2492,9 +2492,9 @@ static void rcu_sysidle_exit(struct rcu_dynticks *rdtp, int irq)
85421
85422 /* Record end of idle period. */
85423 smp_mb__before_atomic_inc();
85424 - atomic_inc(&rdtp->dynticks_idle);
85425 + atomic_inc_unchecked(&rdtp->dynticks_idle);
85426 smp_mb__after_atomic_inc();
85427 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
85428 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
85429
85430 /*
85431 * If we are the timekeeping CPU, we are permitted to be non-idle
85432 @@ -2535,7 +2535,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
85433 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
85434
85435 /* Pick up current idle and NMI-nesting counter and check. */
85436 - cur = atomic_read(&rdtp->dynticks_idle);
85437 + cur = atomic_read_unchecked(&rdtp->dynticks_idle);
85438 if (cur & 0x1) {
85439 *isidle = false; /* We are not idle! */
85440 return;
85441 @@ -2598,7 +2598,7 @@ static void rcu_sysidle(unsigned long j)
85442 case RCU_SYSIDLE_NOT:
85443
85444 /* First time all are idle, so note a short idle period. */
85445 - ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
85446 + ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
85447 break;
85448
85449 case RCU_SYSIDLE_SHORT:
85450 @@ -2635,7 +2635,7 @@ static void rcu_sysidle(unsigned long j)
85451 static void rcu_sysidle_cancel(void)
85452 {
85453 smp_mb();
85454 - ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
85455 + ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
85456 }
85457
85458 /*
85459 @@ -2683,7 +2683,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
85460 smp_mb(); /* grace period precedes setting inuse. */
85461
85462 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
85463 - ACCESS_ONCE(rshp->inuse) = 0;
85464 + ACCESS_ONCE_RW(rshp->inuse) = 0;
85465 }
85466
85467 /*
85468 diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c
85469 index cf6c174..a8f4b50 100644
85470 --- a/kernel/rcutree_trace.c
85471 +++ b/kernel/rcutree_trace.c
85472 @@ -121,7 +121,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
85473 ulong2long(rdp->completed), ulong2long(rdp->gpnum),
85474 rdp->passed_quiesce, rdp->qs_pending);
85475 seq_printf(m, " dt=%d/%llx/%d df=%lu",
85476 - atomic_read(&rdp->dynticks->dynticks),
85477 + atomic_read_unchecked(&rdp->dynticks->dynticks),
85478 rdp->dynticks->dynticks_nesting,
85479 rdp->dynticks->dynticks_nmi_nesting,
85480 rdp->dynticks_fqs);
85481 @@ -182,17 +182,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
85482 struct rcu_state *rsp = (struct rcu_state *)m->private;
85483
85484 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",
85485 - atomic_long_read(&rsp->expedited_start),
85486 + atomic_long_read_unchecked(&rsp->expedited_start),
85487 atomic_long_read(&rsp->expedited_done),
85488 - atomic_long_read(&rsp->expedited_wrap),
85489 - atomic_long_read(&rsp->expedited_tryfail),
85490 - atomic_long_read(&rsp->expedited_workdone1),
85491 - atomic_long_read(&rsp->expedited_workdone2),
85492 - atomic_long_read(&rsp->expedited_normal),
85493 - atomic_long_read(&rsp->expedited_stoppedcpus),
85494 - atomic_long_read(&rsp->expedited_done_tries),
85495 - atomic_long_read(&rsp->expedited_done_lost),
85496 - atomic_long_read(&rsp->expedited_done_exit));
85497 + atomic_long_read_unchecked(&rsp->expedited_wrap),
85498 + atomic_long_read_unchecked(&rsp->expedited_tryfail),
85499 + atomic_long_read_unchecked(&rsp->expedited_workdone1),
85500 + atomic_long_read_unchecked(&rsp->expedited_workdone2),
85501 + atomic_long_read_unchecked(&rsp->expedited_normal),
85502 + atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
85503 + atomic_long_read_unchecked(&rsp->expedited_done_tries),
85504 + atomic_long_read_unchecked(&rsp->expedited_done_lost),
85505 + atomic_long_read_unchecked(&rsp->expedited_done_exit));
85506 return 0;
85507 }
85508
85509 diff --git a/kernel/resource.c b/kernel/resource.c
85510 index 3f285dc..5755f62 100644
85511 --- a/kernel/resource.c
85512 +++ b/kernel/resource.c
85513 @@ -152,8 +152,18 @@ static const struct file_operations proc_iomem_operations = {
85514
85515 static int __init ioresources_init(void)
85516 {
85517 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
85518 +#ifdef CONFIG_GRKERNSEC_PROC_USER
85519 + proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
85520 + proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
85521 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
85522 + proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
85523 + proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
85524 +#endif
85525 +#else
85526 proc_create("ioports", 0, NULL, &proc_ioports_operations);
85527 proc_create("iomem", 0, NULL, &proc_iomem_operations);
85528 +#endif
85529 return 0;
85530 }
85531 __initcall(ioresources_init);
85532 diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c
85533 index 1d96dd0..994ff19 100644
85534 --- a/kernel/rtmutex-tester.c
85535 +++ b/kernel/rtmutex-tester.c
85536 @@ -22,7 +22,7 @@
85537 #define MAX_RT_TEST_MUTEXES 8
85538
85539 static spinlock_t rttest_lock;
85540 -static atomic_t rttest_event;
85541 +static atomic_unchecked_t rttest_event;
85542
85543 struct test_thread_data {
85544 int opcode;
85545 @@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
85546
85547 case RTTEST_LOCKCONT:
85548 td->mutexes[td->opdata] = 1;
85549 - td->event = atomic_add_return(1, &rttest_event);
85550 + td->event = atomic_add_return_unchecked(1, &rttest_event);
85551 return 0;
85552
85553 case RTTEST_RESET:
85554 @@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
85555 return 0;
85556
85557 case RTTEST_RESETEVENT:
85558 - atomic_set(&rttest_event, 0);
85559 + atomic_set_unchecked(&rttest_event, 0);
85560 return 0;
85561
85562 default:
85563 @@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
85564 return ret;
85565
85566 td->mutexes[id] = 1;
85567 - td->event = atomic_add_return(1, &rttest_event);
85568 + td->event = atomic_add_return_unchecked(1, &rttest_event);
85569 rt_mutex_lock(&mutexes[id]);
85570 - td->event = atomic_add_return(1, &rttest_event);
85571 + td->event = atomic_add_return_unchecked(1, &rttest_event);
85572 td->mutexes[id] = 4;
85573 return 0;
85574
85575 @@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
85576 return ret;
85577
85578 td->mutexes[id] = 1;
85579 - td->event = atomic_add_return(1, &rttest_event);
85580 + td->event = atomic_add_return_unchecked(1, &rttest_event);
85581 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
85582 - td->event = atomic_add_return(1, &rttest_event);
85583 + td->event = atomic_add_return_unchecked(1, &rttest_event);
85584 td->mutexes[id] = ret ? 0 : 4;
85585 return ret ? -EINTR : 0;
85586
85587 @@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
85588 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
85589 return ret;
85590
85591 - td->event = atomic_add_return(1, &rttest_event);
85592 + td->event = atomic_add_return_unchecked(1, &rttest_event);
85593 rt_mutex_unlock(&mutexes[id]);
85594 - td->event = atomic_add_return(1, &rttest_event);
85595 + td->event = atomic_add_return_unchecked(1, &rttest_event);
85596 td->mutexes[id] = 0;
85597 return 0;
85598
85599 @@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
85600 break;
85601
85602 td->mutexes[dat] = 2;
85603 - td->event = atomic_add_return(1, &rttest_event);
85604 + td->event = atomic_add_return_unchecked(1, &rttest_event);
85605 break;
85606
85607 default:
85608 @@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
85609 return;
85610
85611 td->mutexes[dat] = 3;
85612 - td->event = atomic_add_return(1, &rttest_event);
85613 + td->event = atomic_add_return_unchecked(1, &rttest_event);
85614 break;
85615
85616 case RTTEST_LOCKNOWAIT:
85617 @@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
85618 return;
85619
85620 td->mutexes[dat] = 1;
85621 - td->event = atomic_add_return(1, &rttest_event);
85622 + td->event = atomic_add_return_unchecked(1, &rttest_event);
85623 return;
85624
85625 default:
85626 diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
85627 index 4a07353..66b5291 100644
85628 --- a/kernel/sched/auto_group.c
85629 +++ b/kernel/sched/auto_group.c
85630 @@ -11,7 +11,7 @@
85631
85632 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
85633 static struct autogroup autogroup_default;
85634 -static atomic_t autogroup_seq_nr;
85635 +static atomic_unchecked_t autogroup_seq_nr;
85636
85637 void __init autogroup_init(struct task_struct *init_task)
85638 {
85639 @@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
85640
85641 kref_init(&ag->kref);
85642 init_rwsem(&ag->lock);
85643 - ag->id = atomic_inc_return(&autogroup_seq_nr);
85644 + ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
85645 ag->tg = tg;
85646 #ifdef CONFIG_RT_GROUP_SCHED
85647 /*
85648 diff --git a/kernel/sched/core.c b/kernel/sched/core.c
85649 index 5ac63c9..d912786 100644
85650 --- a/kernel/sched/core.c
85651 +++ b/kernel/sched/core.c
85652 @@ -2868,7 +2868,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
85653 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
85654 * or number of jiffies left till timeout) if completed.
85655 */
85656 -long __sched
85657 +long __sched __intentional_overflow(-1)
85658 wait_for_completion_interruptible_timeout(struct completion *x,
85659 unsigned long timeout)
85660 {
85661 @@ -2885,7 +2885,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
85662 *
85663 * Return: -ERESTARTSYS if interrupted, 0 if completed.
85664 */
85665 -int __sched wait_for_completion_killable(struct completion *x)
85666 +int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
85667 {
85668 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
85669 if (t == -ERESTARTSYS)
85670 @@ -2906,7 +2906,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
85671 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
85672 * or number of jiffies left till timeout) if completed.
85673 */
85674 -long __sched
85675 +long __sched __intentional_overflow(-1)
85676 wait_for_completion_killable_timeout(struct completion *x,
85677 unsigned long timeout)
85678 {
85679 @@ -3132,6 +3132,8 @@ int can_nice(const struct task_struct *p, const int nice)
85680 /* convert nice value [19,-20] to rlimit style value [1,40] */
85681 int nice_rlim = 20 - nice;
85682
85683 + gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
85684 +
85685 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
85686 capable(CAP_SYS_NICE));
85687 }
85688 @@ -3165,7 +3167,8 @@ SYSCALL_DEFINE1(nice, int, increment)
85689 if (nice > 19)
85690 nice = 19;
85691
85692 - if (increment < 0 && !can_nice(current, nice))
85693 + if (increment < 0 && (!can_nice(current, nice) ||
85694 + gr_handle_chroot_nice()))
85695 return -EPERM;
85696
85697 retval = security_task_setnice(current, nice);
85698 @@ -3327,6 +3330,7 @@ recheck:
85699 unsigned long rlim_rtprio =
85700 task_rlimit(p, RLIMIT_RTPRIO);
85701
85702 + gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1);
85703 /* can't set/change the rt policy */
85704 if (policy != p->policy && !rlim_rtprio)
85705 return -EPERM;
85706 @@ -4456,7 +4460,7 @@ static void migrate_tasks(unsigned int dead_cpu)
85707
85708 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
85709
85710 -static struct ctl_table sd_ctl_dir[] = {
85711 +static ctl_table_no_const sd_ctl_dir[] __read_only = {
85712 {
85713 .procname = "sched_domain",
85714 .mode = 0555,
85715 @@ -4473,17 +4477,17 @@ static struct ctl_table sd_ctl_root[] = {
85716 {}
85717 };
85718
85719 -static struct ctl_table *sd_alloc_ctl_entry(int n)
85720 +static ctl_table_no_const *sd_alloc_ctl_entry(int n)
85721 {
85722 - struct ctl_table *entry =
85723 + ctl_table_no_const *entry =
85724 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
85725
85726 return entry;
85727 }
85728
85729 -static void sd_free_ctl_entry(struct ctl_table **tablep)
85730 +static void sd_free_ctl_entry(ctl_table_no_const *tablep)
85731 {
85732 - struct ctl_table *entry;
85733 + ctl_table_no_const *entry;
85734
85735 /*
85736 * In the intermediate directories, both the child directory and
85737 @@ -4491,22 +4495,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
85738 * will always be set. In the lowest directory the names are
85739 * static strings and all have proc handlers.
85740 */
85741 - for (entry = *tablep; entry->mode; entry++) {
85742 - if (entry->child)
85743 - sd_free_ctl_entry(&entry->child);
85744 + for (entry = tablep; entry->mode; entry++) {
85745 + if (entry->child) {
85746 + sd_free_ctl_entry(entry->child);
85747 + pax_open_kernel();
85748 + entry->child = NULL;
85749 + pax_close_kernel();
85750 + }
85751 if (entry->proc_handler == NULL)
85752 kfree(entry->procname);
85753 }
85754
85755 - kfree(*tablep);
85756 - *tablep = NULL;
85757 + kfree(tablep);
85758 }
85759
85760 static int min_load_idx = 0;
85761 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
85762
85763 static void
85764 -set_table_entry(struct ctl_table *entry,
85765 +set_table_entry(ctl_table_no_const *entry,
85766 const char *procname, void *data, int maxlen,
85767 umode_t mode, proc_handler *proc_handler,
85768 bool load_idx)
85769 @@ -4526,7 +4533,7 @@ set_table_entry(struct ctl_table *entry,
85770 static struct ctl_table *
85771 sd_alloc_ctl_domain_table(struct sched_domain *sd)
85772 {
85773 - struct ctl_table *table = sd_alloc_ctl_entry(13);
85774 + ctl_table_no_const *table = sd_alloc_ctl_entry(13);
85775
85776 if (table == NULL)
85777 return NULL;
85778 @@ -4561,9 +4568,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
85779 return table;
85780 }
85781
85782 -static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
85783 +static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
85784 {
85785 - struct ctl_table *entry, *table;
85786 + ctl_table_no_const *entry, *table;
85787 struct sched_domain *sd;
85788 int domain_num = 0, i;
85789 char buf[32];
85790 @@ -4590,11 +4597,13 @@ static struct ctl_table_header *sd_sysctl_header;
85791 static void register_sched_domain_sysctl(void)
85792 {
85793 int i, cpu_num = num_possible_cpus();
85794 - struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
85795 + ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
85796 char buf[32];
85797
85798 WARN_ON(sd_ctl_dir[0].child);
85799 + pax_open_kernel();
85800 sd_ctl_dir[0].child = entry;
85801 + pax_close_kernel();
85802
85803 if (entry == NULL)
85804 return;
85805 @@ -4617,8 +4626,12 @@ static void unregister_sched_domain_sysctl(void)
85806 if (sd_sysctl_header)
85807 unregister_sysctl_table(sd_sysctl_header);
85808 sd_sysctl_header = NULL;
85809 - if (sd_ctl_dir[0].child)
85810 - sd_free_ctl_entry(&sd_ctl_dir[0].child);
85811 + if (sd_ctl_dir[0].child) {
85812 + sd_free_ctl_entry(sd_ctl_dir[0].child);
85813 + pax_open_kernel();
85814 + sd_ctl_dir[0].child = NULL;
85815 + pax_close_kernel();
85816 + }
85817 }
85818 #else
85819 static void register_sched_domain_sysctl(void)
85820 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
85821 index 513fc2f..906a851 100644
85822 --- a/kernel/sched/fair.c
85823 +++ b/kernel/sched/fair.c
85824 @@ -869,7 +869,7 @@ void task_numa_fault(int node, int pages, bool migrated)
85825
85826 static void reset_ptenuma_scan(struct task_struct *p)
85827 {
85828 - ACCESS_ONCE(p->mm->numa_scan_seq)++;
85829 + ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
85830 p->mm->numa_scan_offset = 0;
85831 }
85832
85833 @@ -5840,7 +5840,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
85834 * run_rebalance_domains is triggered when needed from the scheduler tick.
85835 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
85836 */
85837 -static void run_rebalance_domains(struct softirq_action *h)
85838 +static __latent_entropy void run_rebalance_domains(void)
85839 {
85840 int this_cpu = smp_processor_id();
85841 struct rq *this_rq = cpu_rq(this_cpu);
85842 diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
85843 index b3c5653..a4d192a 100644
85844 --- a/kernel/sched/sched.h
85845 +++ b/kernel/sched/sched.h
85846 @@ -1004,7 +1004,7 @@ struct sched_class {
85847 #ifdef CONFIG_FAIR_GROUP_SCHED
85848 void (*task_move_group) (struct task_struct *p, int on_rq);
85849 #endif
85850 -};
85851 +} __do_const;
85852
85853 #define sched_class_highest (&stop_sched_class)
85854 #define for_each_class(class) \
85855 diff --git a/kernel/signal.c b/kernel/signal.c
85856 index ded28b9..6886c08 100644
85857 --- a/kernel/signal.c
85858 +++ b/kernel/signal.c
85859 @@ -51,12 +51,12 @@ static struct kmem_cache *sigqueue_cachep;
85860
85861 int print_fatal_signals __read_mostly;
85862
85863 -static void __user *sig_handler(struct task_struct *t, int sig)
85864 +static __sighandler_t sig_handler(struct task_struct *t, int sig)
85865 {
85866 return t->sighand->action[sig - 1].sa.sa_handler;
85867 }
85868
85869 -static int sig_handler_ignored(void __user *handler, int sig)
85870 +static int sig_handler_ignored(__sighandler_t handler, int sig)
85871 {
85872 /* Is it explicitly or implicitly ignored? */
85873 return handler == SIG_IGN ||
85874 @@ -65,7 +65,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
85875
85876 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
85877 {
85878 - void __user *handler;
85879 + __sighandler_t handler;
85880
85881 handler = sig_handler(t, sig);
85882
85883 @@ -369,6 +369,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
85884 atomic_inc(&user->sigpending);
85885 rcu_read_unlock();
85886
85887 + if (!override_rlimit)
85888 + gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
85889 +
85890 if (override_rlimit ||
85891 atomic_read(&user->sigpending) <=
85892 task_rlimit(t, RLIMIT_SIGPENDING)) {
85893 @@ -496,7 +499,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
85894
85895 int unhandled_signal(struct task_struct *tsk, int sig)
85896 {
85897 - void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
85898 + __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
85899 if (is_global_init(tsk))
85900 return 1;
85901 if (handler != SIG_IGN && handler != SIG_DFL)
85902 @@ -816,6 +819,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
85903 }
85904 }
85905
85906 + /* allow glibc communication via tgkill to other threads in our
85907 + thread group */
85908 + if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
85909 + sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
85910 + && gr_handle_signal(t, sig))
85911 + return -EPERM;
85912 +
85913 return security_task_kill(t, info, sig, 0);
85914 }
85915
85916 @@ -1199,7 +1209,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
85917 return send_signal(sig, info, p, 1);
85918 }
85919
85920 -static int
85921 +int
85922 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
85923 {
85924 return send_signal(sig, info, t, 0);
85925 @@ -1236,6 +1246,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
85926 unsigned long int flags;
85927 int ret, blocked, ignored;
85928 struct k_sigaction *action;
85929 + int is_unhandled = 0;
85930
85931 spin_lock_irqsave(&t->sighand->siglock, flags);
85932 action = &t->sighand->action[sig-1];
85933 @@ -1250,9 +1261,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
85934 }
85935 if (action->sa.sa_handler == SIG_DFL)
85936 t->signal->flags &= ~SIGNAL_UNKILLABLE;
85937 + if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
85938 + is_unhandled = 1;
85939 ret = specific_send_sig_info(sig, info, t);
85940 spin_unlock_irqrestore(&t->sighand->siglock, flags);
85941
85942 + /* only deal with unhandled signals, java etc trigger SIGSEGV during
85943 + normal operation */
85944 + if (is_unhandled) {
85945 + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
85946 + gr_handle_crash(t, sig);
85947 + }
85948 +
85949 return ret;
85950 }
85951
85952 @@ -1319,8 +1339,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
85953 ret = check_kill_permission(sig, info, p);
85954 rcu_read_unlock();
85955
85956 - if (!ret && sig)
85957 + if (!ret && sig) {
85958 ret = do_send_sig_info(sig, info, p, true);
85959 + if (!ret)
85960 + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
85961 + }
85962
85963 return ret;
85964 }
85965 @@ -2926,7 +2949,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
85966 int error = -ESRCH;
85967
85968 rcu_read_lock();
85969 - p = find_task_by_vpid(pid);
85970 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
85971 + /* allow glibc communication via tgkill to other threads in our
85972 + thread group */
85973 + if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
85974 + sig == (SIGRTMIN+1) && tgid == info->si_pid)
85975 + p = find_task_by_vpid_unrestricted(pid);
85976 + else
85977 +#endif
85978 + p = find_task_by_vpid(pid);
85979 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
85980 error = check_kill_permission(sig, info, p);
85981 /*
85982 @@ -3240,8 +3271,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
85983 }
85984 seg = get_fs();
85985 set_fs(KERNEL_DS);
85986 - ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
85987 - (stack_t __force __user *) &uoss,
85988 + ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
85989 + (stack_t __force_user *) &uoss,
85990 compat_user_stack_pointer());
85991 set_fs(seg);
85992 if (ret >= 0 && uoss_ptr) {
85993 diff --git a/kernel/smpboot.c b/kernel/smpboot.c
85994 index eb89e18..a4e6792 100644
85995 --- a/kernel/smpboot.c
85996 +++ b/kernel/smpboot.c
85997 @@ -288,7 +288,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
85998 }
85999 smpboot_unpark_thread(plug_thread, cpu);
86000 }
86001 - list_add(&plug_thread->list, &hotplug_threads);
86002 + pax_list_add(&plug_thread->list, &hotplug_threads);
86003 out:
86004 mutex_unlock(&smpboot_threads_lock);
86005 return ret;
86006 @@ -305,7 +305,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
86007 {
86008 get_online_cpus();
86009 mutex_lock(&smpboot_threads_lock);
86010 - list_del(&plug_thread->list);
86011 + pax_list_del(&plug_thread->list);
86012 smpboot_destroy_threads(plug_thread);
86013 mutex_unlock(&smpboot_threads_lock);
86014 put_online_cpus();
86015 diff --git a/kernel/softirq.c b/kernel/softirq.c
86016 index d7d498d..94fe0f7 100644
86017 --- a/kernel/softirq.c
86018 +++ b/kernel/softirq.c
86019 @@ -53,11 +53,11 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
86020 EXPORT_SYMBOL(irq_stat);
86021 #endif
86022
86023 -static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
86024 +static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
86025
86026 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
86027
86028 -char *softirq_to_name[NR_SOFTIRQS] = {
86029 +const char * const softirq_to_name[NR_SOFTIRQS] = {
86030 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
86031 "TASKLET", "SCHED", "HRTIMER", "RCU"
86032 };
86033 @@ -248,7 +248,7 @@ restart:
86034 kstat_incr_softirqs_this_cpu(vec_nr);
86035
86036 trace_softirq_entry(vec_nr);
86037 - h->action(h);
86038 + h->action();
86039 trace_softirq_exit(vec_nr);
86040 if (unlikely(prev_count != preempt_count())) {
86041 printk(KERN_ERR "huh, entered softirq %u %s %p"
86042 @@ -412,7 +412,7 @@ void __raise_softirq_irqoff(unsigned int nr)
86043 or_softirq_pending(1UL << nr);
86044 }
86045
86046 -void open_softirq(int nr, void (*action)(struct softirq_action *))
86047 +void __init open_softirq(int nr, void (*action)(void))
86048 {
86049 softirq_vec[nr].action = action;
86050 }
86051 @@ -468,7 +468,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
86052
86053 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
86054
86055 -static void tasklet_action(struct softirq_action *a)
86056 +static __latent_entropy void tasklet_action(void)
86057 {
86058 struct tasklet_struct *list;
86059
86060 @@ -503,7 +503,7 @@ static void tasklet_action(struct softirq_action *a)
86061 }
86062 }
86063
86064 -static void tasklet_hi_action(struct softirq_action *a)
86065 +static __latent_entropy void tasklet_hi_action(void)
86066 {
86067 struct tasklet_struct *list;
86068
86069 @@ -858,7 +858,7 @@ static struct notifier_block cpu_nfb = {
86070 .notifier_call = cpu_callback
86071 };
86072
86073 -static struct smp_hotplug_thread softirq_threads = {
86074 +static struct smp_hotplug_thread softirq_threads __read_only = {
86075 .store = &ksoftirqd,
86076 .thread_should_run = ksoftirqd_should_run,
86077 .thread_fn = run_ksoftirqd,
86078 diff --git a/kernel/srcu.c b/kernel/srcu.c
86079 index 01d5ccb..cdcbee6 100644
86080 --- a/kernel/srcu.c
86081 +++ b/kernel/srcu.c
86082 @@ -300,9 +300,9 @@ int __srcu_read_lock(struct srcu_struct *sp)
86083
86084 idx = ACCESS_ONCE(sp->completed) & 0x1;
86085 preempt_disable();
86086 - ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
86087 + ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
86088 smp_mb(); /* B */ /* Avoid leaking the critical section. */
86089 - ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
86090 + ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
86091 preempt_enable();
86092 return idx;
86093 }
86094 diff --git a/kernel/sys.c b/kernel/sys.c
86095 index c18ecca..b3c2dd2 100644
86096 --- a/kernel/sys.c
86097 +++ b/kernel/sys.c
86098 @@ -149,6 +149,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
86099 error = -EACCES;
86100 goto out;
86101 }
86102 +
86103 + if (gr_handle_chroot_setpriority(p, niceval)) {
86104 + error = -EACCES;
86105 + goto out;
86106 + }
86107 +
86108 no_nice = security_task_setnice(p, niceval);
86109 if (no_nice) {
86110 error = no_nice;
86111 @@ -352,6 +358,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
86112 goto error;
86113 }
86114
86115 + if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
86116 + goto error;
86117 +
86118 if (rgid != (gid_t) -1 ||
86119 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
86120 new->sgid = new->egid;
86121 @@ -387,6 +396,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
86122 old = current_cred();
86123
86124 retval = -EPERM;
86125 +
86126 + if (gr_check_group_change(kgid, kgid, kgid))
86127 + goto error;
86128 +
86129 if (ns_capable(old->user_ns, CAP_SETGID))
86130 new->gid = new->egid = new->sgid = new->fsgid = kgid;
86131 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
86132 @@ -404,7 +417,7 @@ error:
86133 /*
86134 * change the user struct in a credentials set to match the new UID
86135 */
86136 -static int set_user(struct cred *new)
86137 +int set_user(struct cred *new)
86138 {
86139 struct user_struct *new_user;
86140
86141 @@ -484,6 +497,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
86142 goto error;
86143 }
86144
86145 + if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
86146 + goto error;
86147 +
86148 if (!uid_eq(new->uid, old->uid)) {
86149 retval = set_user(new);
86150 if (retval < 0)
86151 @@ -534,6 +550,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
86152 old = current_cred();
86153
86154 retval = -EPERM;
86155 +
86156 + if (gr_check_crash_uid(kuid))
86157 + goto error;
86158 + if (gr_check_user_change(kuid, kuid, kuid))
86159 + goto error;
86160 +
86161 if (ns_capable(old->user_ns, CAP_SETUID)) {
86162 new->suid = new->uid = kuid;
86163 if (!uid_eq(kuid, old->uid)) {
86164 @@ -603,6 +625,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
86165 goto error;
86166 }
86167
86168 + if (gr_check_user_change(kruid, keuid, INVALID_UID))
86169 + goto error;
86170 +
86171 if (ruid != (uid_t) -1) {
86172 new->uid = kruid;
86173 if (!uid_eq(kruid, old->uid)) {
86174 @@ -685,6 +710,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
86175 goto error;
86176 }
86177
86178 + if (gr_check_group_change(krgid, kegid, INVALID_GID))
86179 + goto error;
86180 +
86181 if (rgid != (gid_t) -1)
86182 new->gid = krgid;
86183 if (egid != (gid_t) -1)
86184 @@ -746,12 +774,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
86185 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
86186 ns_capable(old->user_ns, CAP_SETUID)) {
86187 if (!uid_eq(kuid, old->fsuid)) {
86188 + if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
86189 + goto error;
86190 +
86191 new->fsuid = kuid;
86192 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
86193 goto change_okay;
86194 }
86195 }
86196
86197 +error:
86198 abort_creds(new);
86199 return old_fsuid;
86200
86201 @@ -784,12 +816,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
86202 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
86203 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
86204 ns_capable(old->user_ns, CAP_SETGID)) {
86205 + if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
86206 + goto error;
86207 +
86208 if (!gid_eq(kgid, old->fsgid)) {
86209 new->fsgid = kgid;
86210 goto change_okay;
86211 }
86212 }
86213
86214 +error:
86215 abort_creds(new);
86216 return old_fsgid;
86217
86218 @@ -1169,19 +1205,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
86219 return -EFAULT;
86220
86221 down_read(&uts_sem);
86222 - error = __copy_to_user(&name->sysname, &utsname()->sysname,
86223 + error = __copy_to_user(name->sysname, &utsname()->sysname,
86224 __OLD_UTS_LEN);
86225 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
86226 - error |= __copy_to_user(&name->nodename, &utsname()->nodename,
86227 + error |= __copy_to_user(name->nodename, &utsname()->nodename,
86228 __OLD_UTS_LEN);
86229 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
86230 - error |= __copy_to_user(&name->release, &utsname()->release,
86231 + error |= __copy_to_user(name->release, &utsname()->release,
86232 __OLD_UTS_LEN);
86233 error |= __put_user(0, name->release + __OLD_UTS_LEN);
86234 - error |= __copy_to_user(&name->version, &utsname()->version,
86235 + error |= __copy_to_user(name->version, &utsname()->version,
86236 __OLD_UTS_LEN);
86237 error |= __put_user(0, name->version + __OLD_UTS_LEN);
86238 - error |= __copy_to_user(&name->machine, &utsname()->machine,
86239 + error |= __copy_to_user(name->machine, &utsname()->machine,
86240 __OLD_UTS_LEN);
86241 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
86242 up_read(&uts_sem);
86243 @@ -1383,6 +1419,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
86244 */
86245 new_rlim->rlim_cur = 1;
86246 }
86247 + /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
86248 + is changed to a lower value. Since tasks can be created by the same
86249 + user in between this limit change and an execve by this task, force
86250 + a recheck only for this task by setting PF_NPROC_EXCEEDED
86251 + */
86252 + if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
86253 + tsk->flags |= PF_NPROC_EXCEEDED;
86254 }
86255 if (!retval) {
86256 if (old_rlim)
86257 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
86258 index b2f06f3..e6354ab 100644
86259 --- a/kernel/sysctl.c
86260 +++ b/kernel/sysctl.c
86261 @@ -93,7 +93,6 @@
86262
86263
86264 #if defined(CONFIG_SYSCTL)
86265 -
86266 /* External variables not in a header file. */
86267 extern int sysctl_overcommit_memory;
86268 extern int sysctl_overcommit_ratio;
86269 @@ -119,17 +118,18 @@ extern int blk_iopoll_enabled;
86270
86271 /* Constants used for minimum and maximum */
86272 #ifdef CONFIG_LOCKUP_DETECTOR
86273 -static int sixty = 60;
86274 +static int sixty __read_only = 60;
86275 #endif
86276
86277 -static int zero;
86278 -static int __maybe_unused one = 1;
86279 -static int __maybe_unused two = 2;
86280 -static int __maybe_unused three = 3;
86281 -static unsigned long one_ul = 1;
86282 -static int one_hundred = 100;
86283 +static int neg_one __read_only = -1;
86284 +static int zero __read_only = 0;
86285 +static int __maybe_unused one __read_only = 1;
86286 +static int __maybe_unused two __read_only = 2;
86287 +static int __maybe_unused three __read_only = 3;
86288 +static unsigned long one_ul __read_only = 1;
86289 +static int one_hundred __read_only = 100;
86290 #ifdef CONFIG_PRINTK
86291 -static int ten_thousand = 10000;
86292 +static int ten_thousand __read_only = 10000;
86293 #endif
86294
86295 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
86296 @@ -176,10 +176,8 @@ static int proc_taint(struct ctl_table *table, int write,
86297 void __user *buffer, size_t *lenp, loff_t *ppos);
86298 #endif
86299
86300 -#ifdef CONFIG_PRINTK
86301 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
86302 void __user *buffer, size_t *lenp, loff_t *ppos);
86303 -#endif
86304
86305 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
86306 void __user *buffer, size_t *lenp, loff_t *ppos);
86307 @@ -210,6 +208,8 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
86308
86309 #endif
86310
86311 +extern struct ctl_table grsecurity_table[];
86312 +
86313 static struct ctl_table kern_table[];
86314 static struct ctl_table vm_table[];
86315 static struct ctl_table fs_table[];
86316 @@ -224,6 +224,20 @@ extern struct ctl_table epoll_table[];
86317 int sysctl_legacy_va_layout;
86318 #endif
86319
86320 +#ifdef CONFIG_PAX_SOFTMODE
86321 +static ctl_table pax_table[] = {
86322 + {
86323 + .procname = "softmode",
86324 + .data = &pax_softmode,
86325 + .maxlen = sizeof(unsigned int),
86326 + .mode = 0600,
86327 + .proc_handler = &proc_dointvec,
86328 + },
86329 +
86330 + { }
86331 +};
86332 +#endif
86333 +
86334 /* The default sysctl tables: */
86335
86336 static struct ctl_table sysctl_base_table[] = {
86337 @@ -272,6 +286,22 @@ static int max_extfrag_threshold = 1000;
86338 #endif
86339
86340 static struct ctl_table kern_table[] = {
86341 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
86342 + {
86343 + .procname = "grsecurity",
86344 + .mode = 0500,
86345 + .child = grsecurity_table,
86346 + },
86347 +#endif
86348 +
86349 +#ifdef CONFIG_PAX_SOFTMODE
86350 + {
86351 + .procname = "pax",
86352 + .mode = 0500,
86353 + .child = pax_table,
86354 + },
86355 +#endif
86356 +
86357 {
86358 .procname = "sched_child_runs_first",
86359 .data = &sysctl_sched_child_runs_first,
86360 @@ -613,7 +643,7 @@ static struct ctl_table kern_table[] = {
86361 .data = &modprobe_path,
86362 .maxlen = KMOD_PATH_LEN,
86363 .mode = 0644,
86364 - .proc_handler = proc_dostring,
86365 + .proc_handler = proc_dostring_modpriv,
86366 },
86367 {
86368 .procname = "modules_disabled",
86369 @@ -780,16 +810,20 @@ static struct ctl_table kern_table[] = {
86370 .extra1 = &zero,
86371 .extra2 = &one,
86372 },
86373 +#endif
86374 {
86375 .procname = "kptr_restrict",
86376 .data = &kptr_restrict,
86377 .maxlen = sizeof(int),
86378 .mode = 0644,
86379 .proc_handler = proc_dointvec_minmax_sysadmin,
86380 +#ifdef CONFIG_GRKERNSEC_HIDESYM
86381 + .extra1 = &two,
86382 +#else
86383 .extra1 = &zero,
86384 +#endif
86385 .extra2 = &two,
86386 },
86387 -#endif
86388 {
86389 .procname = "ngroups_max",
86390 .data = &ngroups_max,
86391 @@ -1031,10 +1065,17 @@ static struct ctl_table kern_table[] = {
86392 */
86393 {
86394 .procname = "perf_event_paranoid",
86395 - .data = &sysctl_perf_event_paranoid,
86396 - .maxlen = sizeof(sysctl_perf_event_paranoid),
86397 + .data = &sysctl_perf_event_legitimately_concerned,
86398 + .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
86399 .mode = 0644,
86400 - .proc_handler = proc_dointvec,
86401 + /* go ahead, be a hero */
86402 + .proc_handler = proc_dointvec_minmax_sysadmin,
86403 + .extra1 = &neg_one,
86404 +#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
86405 + .extra2 = &three,
86406 +#else
86407 + .extra2 = &two,
86408 +#endif
86409 },
86410 {
86411 .procname = "perf_event_mlock_kb",
86412 @@ -1297,6 +1338,13 @@ static struct ctl_table vm_table[] = {
86413 .proc_handler = proc_dointvec_minmax,
86414 .extra1 = &zero,
86415 },
86416 + {
86417 + .procname = "heap_stack_gap",
86418 + .data = &sysctl_heap_stack_gap,
86419 + .maxlen = sizeof(sysctl_heap_stack_gap),
86420 + .mode = 0644,
86421 + .proc_handler = proc_doulongvec_minmax,
86422 + },
86423 #else
86424 {
86425 .procname = "nr_trim_pages",
86426 @@ -1761,6 +1809,16 @@ int proc_dostring(struct ctl_table *table, int write,
86427 buffer, lenp, ppos);
86428 }
86429
86430 +int proc_dostring_modpriv(struct ctl_table *table, int write,
86431 + void __user *buffer, size_t *lenp, loff_t *ppos)
86432 +{
86433 + if (write && !capable(CAP_SYS_MODULE))
86434 + return -EPERM;
86435 +
86436 + return _proc_do_string(table->data, table->maxlen, write,
86437 + buffer, lenp, ppos);
86438 +}
86439 +
86440 static size_t proc_skip_spaces(char **buf)
86441 {
86442 size_t ret;
86443 @@ -1866,6 +1924,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
86444 len = strlen(tmp);
86445 if (len > *size)
86446 len = *size;
86447 + if (len > sizeof(tmp))
86448 + len = sizeof(tmp);
86449 if (copy_to_user(*buf, tmp, len))
86450 return -EFAULT;
86451 *size -= len;
86452 @@ -2030,7 +2090,7 @@ int proc_dointvec(struct ctl_table *table, int write,
86453 static int proc_taint(struct ctl_table *table, int write,
86454 void __user *buffer, size_t *lenp, loff_t *ppos)
86455 {
86456 - struct ctl_table t;
86457 + ctl_table_no_const t;
86458 unsigned long tmptaint = get_taint();
86459 int err;
86460
86461 @@ -2058,7 +2118,6 @@ static int proc_taint(struct ctl_table *table, int write,
86462 return err;
86463 }
86464
86465 -#ifdef CONFIG_PRINTK
86466 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
86467 void __user *buffer, size_t *lenp, loff_t *ppos)
86468 {
86469 @@ -2067,7 +2126,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
86470
86471 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
86472 }
86473 -#endif
86474
86475 struct do_proc_dointvec_minmax_conv_param {
86476 int *min;
86477 @@ -2214,8 +2272,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
86478 *i = val;
86479 } else {
86480 val = convdiv * (*i) / convmul;
86481 - if (!first)
86482 + if (!first) {
86483 err = proc_put_char(&buffer, &left, '\t');
86484 + if (err)
86485 + break;
86486 + }
86487 err = proc_put_long(&buffer, &left, val, false);
86488 if (err)
86489 break;
86490 @@ -2611,6 +2672,12 @@ int proc_dostring(struct ctl_table *table, int write,
86491 return -ENOSYS;
86492 }
86493
86494 +int proc_dostring_modpriv(struct ctl_table *table, int write,
86495 + void __user *buffer, size_t *lenp, loff_t *ppos)
86496 +{
86497 + return -ENOSYS;
86498 +}
86499 +
86500 int proc_dointvec(struct ctl_table *table, int write,
86501 void __user *buffer, size_t *lenp, loff_t *ppos)
86502 {
86503 @@ -2667,5 +2734,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
86504 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
86505 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
86506 EXPORT_SYMBOL(proc_dostring);
86507 +EXPORT_SYMBOL(proc_dostring_modpriv);
86508 EXPORT_SYMBOL(proc_doulongvec_minmax);
86509 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
86510 diff --git a/kernel/taskstats.c b/kernel/taskstats.c
86511 index 145bb4d..b2aa969 100644
86512 --- a/kernel/taskstats.c
86513 +++ b/kernel/taskstats.c
86514 @@ -28,9 +28,12 @@
86515 #include <linux/fs.h>
86516 #include <linux/file.h>
86517 #include <linux/pid_namespace.h>
86518 +#include <linux/grsecurity.h>
86519 #include <net/genetlink.h>
86520 #include <linux/atomic.h>
86521
86522 +extern int gr_is_taskstats_denied(int pid);
86523 +
86524 /*
86525 * Maximum length of a cpumask that can be specified in
86526 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
86527 @@ -570,6 +573,9 @@ err:
86528
86529 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
86530 {
86531 + if (gr_is_taskstats_denied(current->pid))
86532 + return -EACCES;
86533 +
86534 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
86535 return cmd_attr_register_cpumask(info);
86536 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
86537 diff --git a/kernel/time.c b/kernel/time.c
86538 index 7c7964c..2a0d412 100644
86539 --- a/kernel/time.c
86540 +++ b/kernel/time.c
86541 @@ -172,6 +172,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
86542 return error;
86543
86544 if (tz) {
86545 + /* we log in do_settimeofday called below, so don't log twice
86546 + */
86547 + if (!tv)
86548 + gr_log_timechange();
86549 +
86550 sys_tz = *tz;
86551 update_vsyscall_tz();
86552 if (firsttime) {
86553 diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
86554 index 88c9c65..7497ebc 100644
86555 --- a/kernel/time/alarmtimer.c
86556 +++ b/kernel/time/alarmtimer.c
86557 @@ -795,7 +795,7 @@ static int __init alarmtimer_init(void)
86558 struct platform_device *pdev;
86559 int error = 0;
86560 int i;
86561 - struct k_clock alarm_clock = {
86562 + static struct k_clock alarm_clock = {
86563 .clock_getres = alarm_clock_getres,
86564 .clock_get = alarm_clock_get,
86565 .timer_create = alarm_timer_create,
86566 diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
86567 index 5cf6c70..ac341b0 100644
86568 --- a/kernel/time/timekeeping.c
86569 +++ b/kernel/time/timekeeping.c
86570 @@ -15,6 +15,7 @@
86571 #include <linux/init.h>
86572 #include <linux/mm.h>
86573 #include <linux/sched.h>
86574 +#include <linux/grsecurity.h>
86575 #include <linux/syscore_ops.h>
86576 #include <linux/clocksource.h>
86577 #include <linux/jiffies.h>
86578 @@ -500,6 +501,8 @@ int do_settimeofday(const struct timespec *tv)
86579 if (!timespec_valid_strict(tv))
86580 return -EINVAL;
86581
86582 + gr_log_timechange();
86583 +
86584 raw_spin_lock_irqsave(&timekeeper_lock, flags);
86585 write_seqcount_begin(&timekeeper_seq);
86586
86587 diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
86588 index 61ed862..3b52c65 100644
86589 --- a/kernel/time/timer_list.c
86590 +++ b/kernel/time/timer_list.c
86591 @@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
86592
86593 static void print_name_offset(struct seq_file *m, void *sym)
86594 {
86595 +#ifdef CONFIG_GRKERNSEC_HIDESYM
86596 + SEQ_printf(m, "<%p>", NULL);
86597 +#else
86598 char symname[KSYM_NAME_LEN];
86599
86600 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
86601 SEQ_printf(m, "<%pK>", sym);
86602 else
86603 SEQ_printf(m, "%s", symname);
86604 +#endif
86605 }
86606
86607 static void
86608 @@ -119,7 +123,11 @@ next_one:
86609 static void
86610 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
86611 {
86612 +#ifdef CONFIG_GRKERNSEC_HIDESYM
86613 + SEQ_printf(m, " .base: %p\n", NULL);
86614 +#else
86615 SEQ_printf(m, " .base: %pK\n", base);
86616 +#endif
86617 SEQ_printf(m, " .index: %d\n",
86618 base->index);
86619 SEQ_printf(m, " .resolution: %Lu nsecs\n",
86620 @@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
86621 {
86622 struct proc_dir_entry *pe;
86623
86624 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
86625 + pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
86626 +#else
86627 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
86628 +#endif
86629 if (!pe)
86630 return -ENOMEM;
86631 return 0;
86632 diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
86633 index 0b537f2..40d6c20 100644
86634 --- a/kernel/time/timer_stats.c
86635 +++ b/kernel/time/timer_stats.c
86636 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
86637 static unsigned long nr_entries;
86638 static struct entry entries[MAX_ENTRIES];
86639
86640 -static atomic_t overflow_count;
86641 +static atomic_unchecked_t overflow_count;
86642
86643 /*
86644 * The entries are in a hash-table, for fast lookup:
86645 @@ -140,7 +140,7 @@ static void reset_entries(void)
86646 nr_entries = 0;
86647 memset(entries, 0, sizeof(entries));
86648 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
86649 - atomic_set(&overflow_count, 0);
86650 + atomic_set_unchecked(&overflow_count, 0);
86651 }
86652
86653 static struct entry *alloc_entry(void)
86654 @@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
86655 if (likely(entry))
86656 entry->count++;
86657 else
86658 - atomic_inc(&overflow_count);
86659 + atomic_inc_unchecked(&overflow_count);
86660
86661 out_unlock:
86662 raw_spin_unlock_irqrestore(lock, flags);
86663 @@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
86664
86665 static void print_name_offset(struct seq_file *m, unsigned long addr)
86666 {
86667 +#ifdef CONFIG_GRKERNSEC_HIDESYM
86668 + seq_printf(m, "<%p>", NULL);
86669 +#else
86670 char symname[KSYM_NAME_LEN];
86671
86672 if (lookup_symbol_name(addr, symname) < 0)
86673 - seq_printf(m, "<%p>", (void *)addr);
86674 + seq_printf(m, "<%pK>", (void *)addr);
86675 else
86676 seq_printf(m, "%s", symname);
86677 +#endif
86678 }
86679
86680 static int tstats_show(struct seq_file *m, void *v)
86681 @@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *m, void *v)
86682
86683 seq_puts(m, "Timer Stats Version: v0.2\n");
86684 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
86685 - if (atomic_read(&overflow_count))
86686 + if (atomic_read_unchecked(&overflow_count))
86687 seq_printf(m, "Overflow: %d entries\n",
86688 - atomic_read(&overflow_count));
86689 + atomic_read_unchecked(&overflow_count));
86690
86691 for (i = 0; i < nr_entries; i++) {
86692 entry = entries + i;
86693 @@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
86694 {
86695 struct proc_dir_entry *pe;
86696
86697 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
86698 + pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
86699 +#else
86700 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
86701 +#endif
86702 if (!pe)
86703 return -ENOMEM;
86704 return 0;
86705 diff --git a/kernel/timer.c b/kernel/timer.c
86706 index 4296d13..0164b04 100644
86707 --- a/kernel/timer.c
86708 +++ b/kernel/timer.c
86709 @@ -1366,7 +1366,7 @@ void update_process_times(int user_tick)
86710 /*
86711 * This function runs timers and the timer-tq in bottom half context.
86712 */
86713 -static void run_timer_softirq(struct softirq_action *h)
86714 +static __latent_entropy void run_timer_softirq(void)
86715 {
86716 struct tvec_base *base = __this_cpu_read(tvec_bases);
86717
86718 @@ -1429,7 +1429,7 @@ static void process_timeout(unsigned long __data)
86719 *
86720 * In all cases the return value is guaranteed to be non-negative.
86721 */
86722 -signed long __sched schedule_timeout(signed long timeout)
86723 +signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
86724 {
86725 struct timer_list timer;
86726 unsigned long expire;
86727 diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
86728 index b8b8560..75b1a09 100644
86729 --- a/kernel/trace/blktrace.c
86730 +++ b/kernel/trace/blktrace.c
86731 @@ -317,7 +317,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
86732 struct blk_trace *bt = filp->private_data;
86733 char buf[16];
86734
86735 - snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
86736 + snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
86737
86738 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
86739 }
86740 @@ -375,7 +375,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
86741 return 1;
86742
86743 bt = buf->chan->private_data;
86744 - atomic_inc(&bt->dropped);
86745 + atomic_inc_unchecked(&bt->dropped);
86746 return 0;
86747 }
86748
86749 @@ -476,7 +476,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
86750
86751 bt->dir = dir;
86752 bt->dev = dev;
86753 - atomic_set(&bt->dropped, 0);
86754 + atomic_set_unchecked(&bt->dropped, 0);
86755
86756 ret = -EIO;
86757 bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
86758 diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
86759 index f3bd09ee..9bb9586 100644
86760 --- a/kernel/trace/ftrace.c
86761 +++ b/kernel/trace/ftrace.c
86762 @@ -1944,12 +1944,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
86763 if (unlikely(ftrace_disabled))
86764 return 0;
86765
86766 + ret = ftrace_arch_code_modify_prepare();
86767 + FTRACE_WARN_ON(ret);
86768 + if (ret)
86769 + return 0;
86770 +
86771 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
86772 + FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
86773 if (ret) {
86774 ftrace_bug(ret, ip);
86775 - return 0;
86776 }
86777 - return 1;
86778 + return ret ? 0 : 1;
86779 }
86780
86781 /*
86782 @@ -4043,8 +4048,10 @@ static int ftrace_process_locs(struct module *mod,
86783 if (!count)
86784 return 0;
86785
86786 + pax_open_kernel();
86787 sort(start, count, sizeof(*start),
86788 ftrace_cmp_ips, ftrace_swap_ips);
86789 + pax_close_kernel();
86790
86791 start_pg = ftrace_allocate_pages(count);
86792 if (!start_pg)
86793 @@ -4766,8 +4773,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
86794 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
86795
86796 static int ftrace_graph_active;
86797 -static struct notifier_block ftrace_suspend_notifier;
86798 -
86799 int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace)
86800 {
86801 return 0;
86802 @@ -4918,6 +4923,10 @@ static struct ftrace_ops fgraph_ops __read_mostly = {
86803 FTRACE_OPS_FL_RECURSION_SAFE,
86804 };
86805
86806 +static struct notifier_block ftrace_suspend_notifier = {
86807 + .notifier_call = ftrace_suspend_notifier_call
86808 +};
86809 +
86810 int register_ftrace_graph(trace_func_graph_ret_t retfunc,
86811 trace_func_graph_ent_t entryfunc)
86812 {
86813 @@ -4931,7 +4940,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
86814 goto out;
86815 }
86816
86817 - ftrace_suspend_notifier.notifier_call = ftrace_suspend_notifier_call;
86818 register_pm_notifier(&ftrace_suspend_notifier);
86819
86820 ftrace_graph_active++;
86821 diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
86822 index cc2f66f..05edd54 100644
86823 --- a/kernel/trace/ring_buffer.c
86824 +++ b/kernel/trace/ring_buffer.c
86825 @@ -352,9 +352,9 @@ struct buffer_data_page {
86826 */
86827 struct buffer_page {
86828 struct list_head list; /* list of buffer pages */
86829 - local_t write; /* index for next write */
86830 + local_unchecked_t write; /* index for next write */
86831 unsigned read; /* index for next read */
86832 - local_t entries; /* entries on this page */
86833 + local_unchecked_t entries; /* entries on this page */
86834 unsigned long real_end; /* real end of data */
86835 struct buffer_data_page *page; /* Actual data page */
86836 };
86837 @@ -473,8 +473,8 @@ struct ring_buffer_per_cpu {
86838 unsigned long last_overrun;
86839 local_t entries_bytes;
86840 local_t entries;
86841 - local_t overrun;
86842 - local_t commit_overrun;
86843 + local_unchecked_t overrun;
86844 + local_unchecked_t commit_overrun;
86845 local_t dropped_events;
86846 local_t committing;
86847 local_t commits;
86848 @@ -992,8 +992,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
86849 *
86850 * We add a counter to the write field to denote this.
86851 */
86852 - old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
86853 - old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
86854 + old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
86855 + old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
86856
86857 /*
86858 * Just make sure we have seen our old_write and synchronize
86859 @@ -1021,8 +1021,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
86860 * cmpxchg to only update if an interrupt did not already
86861 * do it for us. If the cmpxchg fails, we don't care.
86862 */
86863 - (void)local_cmpxchg(&next_page->write, old_write, val);
86864 - (void)local_cmpxchg(&next_page->entries, old_entries, eval);
86865 + (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
86866 + (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
86867
86868 /*
86869 * No need to worry about races with clearing out the commit.
86870 @@ -1386,12 +1386,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
86871
86872 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
86873 {
86874 - return local_read(&bpage->entries) & RB_WRITE_MASK;
86875 + return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
86876 }
86877
86878 static inline unsigned long rb_page_write(struct buffer_page *bpage)
86879 {
86880 - return local_read(&bpage->write) & RB_WRITE_MASK;
86881 + return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
86882 }
86883
86884 static int
86885 @@ -1486,7 +1486,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
86886 * bytes consumed in ring buffer from here.
86887 * Increment overrun to account for the lost events.
86888 */
86889 - local_add(page_entries, &cpu_buffer->overrun);
86890 + local_add_unchecked(page_entries, &cpu_buffer->overrun);
86891 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
86892 }
86893
86894 @@ -2064,7 +2064,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
86895 * it is our responsibility to update
86896 * the counters.
86897 */
86898 - local_add(entries, &cpu_buffer->overrun);
86899 + local_add_unchecked(entries, &cpu_buffer->overrun);
86900 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
86901
86902 /*
86903 @@ -2214,7 +2214,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
86904 if (tail == BUF_PAGE_SIZE)
86905 tail_page->real_end = 0;
86906
86907 - local_sub(length, &tail_page->write);
86908 + local_sub_unchecked(length, &tail_page->write);
86909 return;
86910 }
86911
86912 @@ -2249,7 +2249,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
86913 rb_event_set_padding(event);
86914
86915 /* Set the write back to the previous setting */
86916 - local_sub(length, &tail_page->write);
86917 + local_sub_unchecked(length, &tail_page->write);
86918 return;
86919 }
86920
86921 @@ -2261,7 +2261,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
86922
86923 /* Set write to end of buffer */
86924 length = (tail + length) - BUF_PAGE_SIZE;
86925 - local_sub(length, &tail_page->write);
86926 + local_sub_unchecked(length, &tail_page->write);
86927 }
86928
86929 /*
86930 @@ -2287,7 +2287,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
86931 * about it.
86932 */
86933 if (unlikely(next_page == commit_page)) {
86934 - local_inc(&cpu_buffer->commit_overrun);
86935 + local_inc_unchecked(&cpu_buffer->commit_overrun);
86936 goto out_reset;
86937 }
86938
86939 @@ -2343,7 +2343,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
86940 cpu_buffer->tail_page) &&
86941 (cpu_buffer->commit_page ==
86942 cpu_buffer->reader_page))) {
86943 - local_inc(&cpu_buffer->commit_overrun);
86944 + local_inc_unchecked(&cpu_buffer->commit_overrun);
86945 goto out_reset;
86946 }
86947 }
86948 @@ -2391,7 +2391,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
86949 length += RB_LEN_TIME_EXTEND;
86950
86951 tail_page = cpu_buffer->tail_page;
86952 - write = local_add_return(length, &tail_page->write);
86953 + write = local_add_return_unchecked(length, &tail_page->write);
86954
86955 /* set write to only the index of the write */
86956 write &= RB_WRITE_MASK;
86957 @@ -2408,7 +2408,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
86958 kmemcheck_annotate_bitfield(event, bitfield);
86959 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
86960
86961 - local_inc(&tail_page->entries);
86962 + local_inc_unchecked(&tail_page->entries);
86963
86964 /*
86965 * If this is the first commit on the page, then update
86966 @@ -2441,7 +2441,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
86967
86968 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
86969 unsigned long write_mask =
86970 - local_read(&bpage->write) & ~RB_WRITE_MASK;
86971 + local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
86972 unsigned long event_length = rb_event_length(event);
86973 /*
86974 * This is on the tail page. It is possible that
86975 @@ -2451,7 +2451,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
86976 */
86977 old_index += write_mask;
86978 new_index += write_mask;
86979 - index = local_cmpxchg(&bpage->write, old_index, new_index);
86980 + index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
86981 if (index == old_index) {
86982 /* update counters */
86983 local_sub(event_length, &cpu_buffer->entries_bytes);
86984 @@ -2843,7 +2843,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
86985
86986 /* Do the likely case first */
86987 if (likely(bpage->page == (void *)addr)) {
86988 - local_dec(&bpage->entries);
86989 + local_dec_unchecked(&bpage->entries);
86990 return;
86991 }
86992
86993 @@ -2855,7 +2855,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
86994 start = bpage;
86995 do {
86996 if (bpage->page == (void *)addr) {
86997 - local_dec(&bpage->entries);
86998 + local_dec_unchecked(&bpage->entries);
86999 return;
87000 }
87001 rb_inc_page(cpu_buffer, &bpage);
87002 @@ -3139,7 +3139,7 @@ static inline unsigned long
87003 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
87004 {
87005 return local_read(&cpu_buffer->entries) -
87006 - (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
87007 + (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
87008 }
87009
87010 /**
87011 @@ -3228,7 +3228,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
87012 return 0;
87013
87014 cpu_buffer = buffer->buffers[cpu];
87015 - ret = local_read(&cpu_buffer->overrun);
87016 + ret = local_read_unchecked(&cpu_buffer->overrun);
87017
87018 return ret;
87019 }
87020 @@ -3251,7 +3251,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
87021 return 0;
87022
87023 cpu_buffer = buffer->buffers[cpu];
87024 - ret = local_read(&cpu_buffer->commit_overrun);
87025 + ret = local_read_unchecked(&cpu_buffer->commit_overrun);
87026
87027 return ret;
87028 }
87029 @@ -3336,7 +3336,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
87030 /* if you care about this being correct, lock the buffer */
87031 for_each_buffer_cpu(buffer, cpu) {
87032 cpu_buffer = buffer->buffers[cpu];
87033 - overruns += local_read(&cpu_buffer->overrun);
87034 + overruns += local_read_unchecked(&cpu_buffer->overrun);
87035 }
87036
87037 return overruns;
87038 @@ -3512,8 +3512,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
87039 /*
87040 * Reset the reader page to size zero.
87041 */
87042 - local_set(&cpu_buffer->reader_page->write, 0);
87043 - local_set(&cpu_buffer->reader_page->entries, 0);
87044 + local_set_unchecked(&cpu_buffer->reader_page->write, 0);
87045 + local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
87046 local_set(&cpu_buffer->reader_page->page->commit, 0);
87047 cpu_buffer->reader_page->real_end = 0;
87048
87049 @@ -3547,7 +3547,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
87050 * want to compare with the last_overrun.
87051 */
87052 smp_mb();
87053 - overwrite = local_read(&(cpu_buffer->overrun));
87054 + overwrite = local_read_unchecked(&(cpu_buffer->overrun));
87055
87056 /*
87057 * Here's the tricky part.
87058 @@ -4117,8 +4117,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
87059
87060 cpu_buffer->head_page
87061 = list_entry(cpu_buffer->pages, struct buffer_page, list);
87062 - local_set(&cpu_buffer->head_page->write, 0);
87063 - local_set(&cpu_buffer->head_page->entries, 0);
87064 + local_set_unchecked(&cpu_buffer->head_page->write, 0);
87065 + local_set_unchecked(&cpu_buffer->head_page->entries, 0);
87066 local_set(&cpu_buffer->head_page->page->commit, 0);
87067
87068 cpu_buffer->head_page->read = 0;
87069 @@ -4128,14 +4128,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
87070
87071 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
87072 INIT_LIST_HEAD(&cpu_buffer->new_pages);
87073 - local_set(&cpu_buffer->reader_page->write, 0);
87074 - local_set(&cpu_buffer->reader_page->entries, 0);
87075 + local_set_unchecked(&cpu_buffer->reader_page->write, 0);
87076 + local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
87077 local_set(&cpu_buffer->reader_page->page->commit, 0);
87078 cpu_buffer->reader_page->read = 0;
87079
87080 local_set(&cpu_buffer->entries_bytes, 0);
87081 - local_set(&cpu_buffer->overrun, 0);
87082 - local_set(&cpu_buffer->commit_overrun, 0);
87083 + local_set_unchecked(&cpu_buffer->overrun, 0);
87084 + local_set_unchecked(&cpu_buffer->commit_overrun, 0);
87085 local_set(&cpu_buffer->dropped_events, 0);
87086 local_set(&cpu_buffer->entries, 0);
87087 local_set(&cpu_buffer->committing, 0);
87088 @@ -4540,8 +4540,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
87089 rb_init_page(bpage);
87090 bpage = reader->page;
87091 reader->page = *data_page;
87092 - local_set(&reader->write, 0);
87093 - local_set(&reader->entries, 0);
87094 + local_set_unchecked(&reader->write, 0);
87095 + local_set_unchecked(&reader->entries, 0);
87096 reader->read = 0;
87097 *data_page = bpage;
87098
87099 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
87100 index b778e96..4e84621 100644
87101 --- a/kernel/trace/trace.c
87102 +++ b/kernel/trace/trace.c
87103 @@ -3335,7 +3335,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
87104 return 0;
87105 }
87106
87107 -int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
87108 +int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
87109 {
87110 /* do nothing if flag is already set */
87111 if (!!(trace_flags & mask) == !!enabled)
87112 diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
87113 index 10c86fb..645ab0a 100644
87114 --- a/kernel/trace/trace.h
87115 +++ b/kernel/trace/trace.h
87116 @@ -1029,7 +1029,7 @@ extern const char *__stop___tracepoint_str[];
87117 void trace_printk_init_buffers(void);
87118 void trace_printk_start_comm(void);
87119 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
87120 -int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
87121 +int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
87122
87123 /*
87124 * Normal trace_printk() and friends allocates special buffers
87125 diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
87126 index 26dc348..8708ca7 100644
87127 --- a/kernel/trace/trace_clock.c
87128 +++ b/kernel/trace/trace_clock.c
87129 @@ -123,7 +123,7 @@ u64 notrace trace_clock_global(void)
87130 return now;
87131 }
87132
87133 -static atomic64_t trace_counter;
87134 +static atomic64_unchecked_t trace_counter;
87135
87136 /*
87137 * trace_clock_counter(): simply an atomic counter.
87138 @@ -132,5 +132,5 @@ static atomic64_t trace_counter;
87139 */
87140 u64 notrace trace_clock_counter(void)
87141 {
87142 - return atomic64_add_return(1, &trace_counter);
87143 + return atomic64_inc_return_unchecked(&trace_counter);
87144 }
87145 diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
87146 index 368a4d5..7b6d1d5 100644
87147 --- a/kernel/trace/trace_events.c
87148 +++ b/kernel/trace/trace_events.c
87149 @@ -1673,7 +1673,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
87150 return 0;
87151 }
87152
87153 -struct ftrace_module_file_ops;
87154 static void __add_event_to_tracers(struct ftrace_event_call *call);
87155
87156 /* Add an additional event_call dynamically */
87157 diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
87158 index b3dcfb2..ebee344 100644
87159 --- a/kernel/trace/trace_mmiotrace.c
87160 +++ b/kernel/trace/trace_mmiotrace.c
87161 @@ -24,7 +24,7 @@ struct header_iter {
87162 static struct trace_array *mmio_trace_array;
87163 static bool overrun_detected;
87164 static unsigned long prev_overruns;
87165 -static atomic_t dropped_count;
87166 +static atomic_unchecked_t dropped_count;
87167
87168 static void mmio_reset_data(struct trace_array *tr)
87169 {
87170 @@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
87171
87172 static unsigned long count_overruns(struct trace_iterator *iter)
87173 {
87174 - unsigned long cnt = atomic_xchg(&dropped_count, 0);
87175 + unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
87176 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
87177
87178 if (over > prev_overruns)
87179 @@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
87180 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
87181 sizeof(*entry), 0, pc);
87182 if (!event) {
87183 - atomic_inc(&dropped_count);
87184 + atomic_inc_unchecked(&dropped_count);
87185 return;
87186 }
87187 entry = ring_buffer_event_data(event);
87188 @@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
87189 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
87190 sizeof(*entry), 0, pc);
87191 if (!event) {
87192 - atomic_inc(&dropped_count);
87193 + atomic_inc_unchecked(&dropped_count);
87194 return;
87195 }
87196 entry = ring_buffer_event_data(event);
87197 diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
87198 index 34e7cba..6f9a729 100644
87199 --- a/kernel/trace/trace_output.c
87200 +++ b/kernel/trace/trace_output.c
87201 @@ -294,7 +294,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
87202
87203 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
87204 if (!IS_ERR(p)) {
87205 - p = mangle_path(s->buffer + s->len, p, "\n");
87206 + p = mangle_path(s->buffer + s->len, p, "\n\\");
87207 if (p) {
87208 s->len = p - s->buffer;
87209 return 1;
87210 @@ -893,14 +893,16 @@ int register_ftrace_event(struct trace_event *event)
87211 goto out;
87212 }
87213
87214 + pax_open_kernel();
87215 if (event->funcs->trace == NULL)
87216 - event->funcs->trace = trace_nop_print;
87217 + *(void **)&event->funcs->trace = trace_nop_print;
87218 if (event->funcs->raw == NULL)
87219 - event->funcs->raw = trace_nop_print;
87220 + *(void **)&event->funcs->raw = trace_nop_print;
87221 if (event->funcs->hex == NULL)
87222 - event->funcs->hex = trace_nop_print;
87223 + *(void **)&event->funcs->hex = trace_nop_print;
87224 if (event->funcs->binary == NULL)
87225 - event->funcs->binary = trace_nop_print;
87226 + *(void **)&event->funcs->binary = trace_nop_print;
87227 + pax_close_kernel();
87228
87229 key = event->type & (EVENT_HASHSIZE - 1);
87230
87231 diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
87232 index b20428c..4845a10 100644
87233 --- a/kernel/trace/trace_stack.c
87234 +++ b/kernel/trace/trace_stack.c
87235 @@ -68,7 +68,7 @@ check_stack(unsigned long ip, unsigned long *stack)
87236 return;
87237
87238 /* we do not handle interrupt stacks yet */
87239 - if (!object_is_on_stack(stack))
87240 + if (!object_starts_on_stack(stack))
87241 return;
87242
87243 local_irq_save(flags);
87244 diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
87245 index 13fb113..a6ced3f 100644
87246 --- a/kernel/user_namespace.c
87247 +++ b/kernel/user_namespace.c
87248 @@ -82,6 +82,21 @@ int create_user_ns(struct cred *new)
87249 !kgid_has_mapping(parent_ns, group))
87250 return -EPERM;
87251
87252 +#ifdef CONFIG_GRKERNSEC
87253 + /*
87254 + * This doesn't really inspire confidence:
87255 + * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
87256 + * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
87257 + * Increases kernel attack surface in areas developers
87258 + * previously cared little about ("low importance due
87259 + * to requiring "root" capability")
87260 + * To be removed when this code receives *proper* review
87261 + */
87262 + if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
87263 + !capable(CAP_SETGID))
87264 + return -EPERM;
87265 +#endif
87266 +
87267 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
87268 if (!ns)
87269 return -ENOMEM;
87270 @@ -860,7 +875,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
87271 if (atomic_read(&current->mm->mm_users) > 1)
87272 return -EINVAL;
87273
87274 - if (current->fs->users != 1)
87275 + if (atomic_read(&current->fs->users) != 1)
87276 return -EINVAL;
87277
87278 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
87279 diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
87280 index 4f69f9a..7c6f8f8 100644
87281 --- a/kernel/utsname_sysctl.c
87282 +++ b/kernel/utsname_sysctl.c
87283 @@ -47,7 +47,7 @@ static void put_uts(ctl_table *table, int write, void *which)
87284 static int proc_do_uts_string(ctl_table *table, int write,
87285 void __user *buffer, size_t *lenp, loff_t *ppos)
87286 {
87287 - struct ctl_table uts_table;
87288 + ctl_table_no_const uts_table;
87289 int r;
87290 memcpy(&uts_table, table, sizeof(uts_table));
87291 uts_table.data = get_uts(table, write);
87292 diff --git a/kernel/watchdog.c b/kernel/watchdog.c
87293 index 4431610..4265616 100644
87294 --- a/kernel/watchdog.c
87295 +++ b/kernel/watchdog.c
87296 @@ -475,7 +475,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
87297 static void watchdog_nmi_disable(unsigned int cpu) { return; }
87298 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
87299
87300 -static struct smp_hotplug_thread watchdog_threads = {
87301 +static struct smp_hotplug_thread watchdog_threads __read_only = {
87302 .store = &softlockup_watchdog,
87303 .thread_should_run = watchdog_should_run,
87304 .thread_fn = watchdog,
87305 diff --git a/kernel/workqueue.c b/kernel/workqueue.c
87306 index 93c2652..66a1cfd 100644
87307 --- a/kernel/workqueue.c
87308 +++ b/kernel/workqueue.c
87309 @@ -4668,7 +4668,7 @@ static void rebind_workers(struct worker_pool *pool)
87310 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
87311 worker_flags |= WORKER_REBOUND;
87312 worker_flags &= ~WORKER_UNBOUND;
87313 - ACCESS_ONCE(worker->flags) = worker_flags;
87314 + ACCESS_ONCE_RW(worker->flags) = worker_flags;
87315 }
87316
87317 spin_unlock_irq(&pool->lock);
87318 diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
87319 index 094f315..244a824 100644
87320 --- a/lib/Kconfig.debug
87321 +++ b/lib/Kconfig.debug
87322 @@ -836,7 +836,7 @@ config DEBUG_MUTEXES
87323
87324 config DEBUG_WW_MUTEX_SLOWPATH
87325 bool "Wait/wound mutex debugging: Slowpath testing"
87326 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
87327 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
87328 select DEBUG_LOCK_ALLOC
87329 select DEBUG_SPINLOCK
87330 select DEBUG_MUTEXES
87331 @@ -849,7 +849,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
87332
87333 config DEBUG_LOCK_ALLOC
87334 bool "Lock debugging: detect incorrect freeing of live locks"
87335 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
87336 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
87337 select DEBUG_SPINLOCK
87338 select DEBUG_MUTEXES
87339 select LOCKDEP
87340 @@ -863,7 +863,7 @@ config DEBUG_LOCK_ALLOC
87341
87342 config PROVE_LOCKING
87343 bool "Lock debugging: prove locking correctness"
87344 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
87345 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
87346 select LOCKDEP
87347 select DEBUG_SPINLOCK
87348 select DEBUG_MUTEXES
87349 @@ -914,7 +914,7 @@ config LOCKDEP
87350
87351 config LOCK_STAT
87352 bool "Lock usage statistics"
87353 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
87354 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
87355 select LOCKDEP
87356 select DEBUG_SPINLOCK
87357 select DEBUG_MUTEXES
87358 @@ -1376,6 +1376,7 @@ config LATENCYTOP
87359 depends on DEBUG_KERNEL
87360 depends on STACKTRACE_SUPPORT
87361 depends on PROC_FS
87362 + depends on !GRKERNSEC_HIDESYM
87363 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
87364 select KALLSYMS
87365 select KALLSYMS_ALL
87366 @@ -1392,7 +1393,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
87367 config DEBUG_STRICT_USER_COPY_CHECKS
87368 bool "Strict user copy size checks"
87369 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
87370 - depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
87371 + depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
87372 help
87373 Enabling this option turns a certain set of sanity checks for user
87374 copy operations into compile time failures.
87375 @@ -1502,7 +1503,7 @@ endmenu # runtime tests
87376
87377 config PROVIDE_OHCI1394_DMA_INIT
87378 bool "Remote debugging over FireWire early on boot"
87379 - depends on PCI && X86
87380 + depends on PCI && X86 && !GRKERNSEC
87381 help
87382 If you want to debug problems which hang or crash the kernel early
87383 on boot and the crashing machine has a FireWire port, you can use
87384 @@ -1531,7 +1532,7 @@ config PROVIDE_OHCI1394_DMA_INIT
87385
87386 config FIREWIRE_OHCI_REMOTE_DMA
87387 bool "Remote debugging over FireWire with firewire-ohci"
87388 - depends on FIREWIRE_OHCI
87389 + depends on FIREWIRE_OHCI && !GRKERNSEC
87390 help
87391 This option lets you use the FireWire bus for remote debugging
87392 with help of the firewire-ohci driver. It enables unfiltered
87393 diff --git a/lib/Makefile b/lib/Makefile
87394 index f3bb2cb..b358ace 100644
87395 --- a/lib/Makefile
87396 +++ b/lib/Makefile
87397 @@ -52,7 +52,7 @@ obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
87398
87399 obj-$(CONFIG_BTREE) += btree.o
87400 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
87401 -obj-$(CONFIG_DEBUG_LIST) += list_debug.o
87402 +obj-y += list_debug.o
87403 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
87404
87405 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
87406 diff --git a/lib/bitmap.c b/lib/bitmap.c
87407 index 06f7e4f..f3cf2b0 100644
87408 --- a/lib/bitmap.c
87409 +++ b/lib/bitmap.c
87410 @@ -422,7 +422,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
87411 {
87412 int c, old_c, totaldigits, ndigits, nchunks, nbits;
87413 u32 chunk;
87414 - const char __user __force *ubuf = (const char __user __force *)buf;
87415 + const char __user *ubuf = (const char __force_user *)buf;
87416
87417 bitmap_zero(maskp, nmaskbits);
87418
87419 @@ -507,7 +507,7 @@ int bitmap_parse_user(const char __user *ubuf,
87420 {
87421 if (!access_ok(VERIFY_READ, ubuf, ulen))
87422 return -EFAULT;
87423 - return __bitmap_parse((const char __force *)ubuf,
87424 + return __bitmap_parse((const char __force_kernel *)ubuf,
87425 ulen, 1, maskp, nmaskbits);
87426
87427 }
87428 @@ -598,7 +598,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
87429 {
87430 unsigned a, b;
87431 int c, old_c, totaldigits;
87432 - const char __user __force *ubuf = (const char __user __force *)buf;
87433 + const char __user *ubuf = (const char __force_user *)buf;
87434 int exp_digit, in_range;
87435
87436 totaldigits = c = 0;
87437 @@ -698,7 +698,7 @@ int bitmap_parselist_user(const char __user *ubuf,
87438 {
87439 if (!access_ok(VERIFY_READ, ubuf, ulen))
87440 return -EFAULT;
87441 - return __bitmap_parselist((const char __force *)ubuf,
87442 + return __bitmap_parselist((const char __force_kernel *)ubuf,
87443 ulen, 1, maskp, nmaskbits);
87444 }
87445 EXPORT_SYMBOL(bitmap_parselist_user);
87446 diff --git a/lib/bug.c b/lib/bug.c
87447 index 1686034..a9c00c8 100644
87448 --- a/lib/bug.c
87449 +++ b/lib/bug.c
87450 @@ -134,6 +134,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
87451 return BUG_TRAP_TYPE_NONE;
87452
87453 bug = find_bug(bugaddr);
87454 + if (!bug)
87455 + return BUG_TRAP_TYPE_NONE;
87456
87457 file = NULL;
87458 line = 0;
87459 diff --git a/lib/debugobjects.c b/lib/debugobjects.c
87460 index bf2c8b1..1d00ccf 100644
87461 --- a/lib/debugobjects.c
87462 +++ b/lib/debugobjects.c
87463 @@ -286,7 +286,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
87464 if (limit > 4)
87465 return;
87466
87467 - is_on_stack = object_is_on_stack(addr);
87468 + is_on_stack = object_starts_on_stack(addr);
87469 if (is_on_stack == onstack)
87470 return;
87471
87472 diff --git a/lib/devres.c b/lib/devres.c
87473 index 8235331..5881053 100644
87474 --- a/lib/devres.c
87475 +++ b/lib/devres.c
87476 @@ -81,7 +81,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
87477 void devm_iounmap(struct device *dev, void __iomem *addr)
87478 {
87479 WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
87480 - (void *)addr));
87481 + (void __force *)addr));
87482 iounmap(addr);
87483 }
87484 EXPORT_SYMBOL(devm_iounmap);
87485 @@ -224,7 +224,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
87486 {
87487 ioport_unmap(addr);
87488 WARN_ON(devres_destroy(dev, devm_ioport_map_release,
87489 - devm_ioport_map_match, (void *)addr));
87490 + devm_ioport_map_match, (void __force *)addr));
87491 }
87492 EXPORT_SYMBOL(devm_ioport_unmap);
87493 #endif /* CONFIG_HAS_IOPORT */
87494 diff --git a/lib/div64.c b/lib/div64.c
87495 index 4382ad7..08aa558 100644
87496 --- a/lib/div64.c
87497 +++ b/lib/div64.c
87498 @@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
87499 EXPORT_SYMBOL(__div64_32);
87500
87501 #ifndef div_s64_rem
87502 -s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
87503 +s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
87504 {
87505 u64 quotient;
87506
87507 @@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
87508 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
87509 */
87510 #ifndef div64_u64
87511 -u64 div64_u64(u64 dividend, u64 divisor)
87512 +u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
87513 {
87514 u32 high = divisor >> 32;
87515 u64 quot;
87516 diff --git a/lib/dma-debug.c b/lib/dma-debug.c
87517 index d87a17a..ac0d79a 100644
87518 --- a/lib/dma-debug.c
87519 +++ b/lib/dma-debug.c
87520 @@ -768,7 +768,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
87521
87522 void dma_debug_add_bus(struct bus_type *bus)
87523 {
87524 - struct notifier_block *nb;
87525 + notifier_block_no_const *nb;
87526
87527 if (global_disable)
87528 return;
87529 @@ -945,7 +945,7 @@ static void check_unmap(struct dma_debug_entry *ref)
87530
87531 static void check_for_stack(struct device *dev, void *addr)
87532 {
87533 - if (object_is_on_stack(addr))
87534 + if (object_starts_on_stack(addr))
87535 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
87536 "stack [addr=%p]\n", addr);
87537 }
87538 diff --git a/lib/inflate.c b/lib/inflate.c
87539 index 013a761..c28f3fc 100644
87540 --- a/lib/inflate.c
87541 +++ b/lib/inflate.c
87542 @@ -269,7 +269,7 @@ static void free(void *where)
87543 malloc_ptr = free_mem_ptr;
87544 }
87545 #else
87546 -#define malloc(a) kmalloc(a, GFP_KERNEL)
87547 +#define malloc(a) kmalloc((a), GFP_KERNEL)
87548 #define free(a) kfree(a)
87549 #endif
87550
87551 diff --git a/lib/ioremap.c b/lib/ioremap.c
87552 index 0c9216c..863bd89 100644
87553 --- a/lib/ioremap.c
87554 +++ b/lib/ioremap.c
87555 @@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
87556 unsigned long next;
87557
87558 phys_addr -= addr;
87559 - pmd = pmd_alloc(&init_mm, pud, addr);
87560 + pmd = pmd_alloc_kernel(&init_mm, pud, addr);
87561 if (!pmd)
87562 return -ENOMEM;
87563 do {
87564 @@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
87565 unsigned long next;
87566
87567 phys_addr -= addr;
87568 - pud = pud_alloc(&init_mm, pgd, addr);
87569 + pud = pud_alloc_kernel(&init_mm, pgd, addr);
87570 if (!pud)
87571 return -ENOMEM;
87572 do {
87573 diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
87574 index bd2bea9..6b3c95e 100644
87575 --- a/lib/is_single_threaded.c
87576 +++ b/lib/is_single_threaded.c
87577 @@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
87578 struct task_struct *p, *t;
87579 bool ret;
87580
87581 + if (!mm)
87582 + return true;
87583 +
87584 if (atomic_read(&task->signal->live) != 1)
87585 return false;
87586
87587 diff --git a/lib/kobject.c b/lib/kobject.c
87588 index 084f7b1..d265b8a 100644
87589 --- a/lib/kobject.c
87590 +++ b/lib/kobject.c
87591 @@ -875,9 +875,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
87592
87593
87594 static DEFINE_SPINLOCK(kobj_ns_type_lock);
87595 -static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
87596 +static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
87597
87598 -int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
87599 +int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
87600 {
87601 enum kobj_ns_type type = ops->type;
87602 int error;
87603 diff --git a/lib/list_debug.c b/lib/list_debug.c
87604 index c24c2f7..f0296f4 100644
87605 --- a/lib/list_debug.c
87606 +++ b/lib/list_debug.c
87607 @@ -11,7 +11,9 @@
87608 #include <linux/bug.h>
87609 #include <linux/kernel.h>
87610 #include <linux/rculist.h>
87611 +#include <linux/mm.h>
87612
87613 +#ifdef CONFIG_DEBUG_LIST
87614 /*
87615 * Insert a new entry between two known consecutive entries.
87616 *
87617 @@ -19,21 +21,40 @@
87618 * the prev/next entries already!
87619 */
87620
87621 +static bool __list_add_debug(struct list_head *new,
87622 + struct list_head *prev,
87623 + struct list_head *next)
87624 +{
87625 + if (unlikely(next->prev != prev)) {
87626 + printk(KERN_ERR "list_add corruption. next->prev should be "
87627 + "prev (%p), but was %p. (next=%p).\n",
87628 + prev, next->prev, next);
87629 + BUG();
87630 + return false;
87631 + }
87632 + if (unlikely(prev->next != next)) {
87633 + printk(KERN_ERR "list_add corruption. prev->next should be "
87634 + "next (%p), but was %p. (prev=%p).\n",
87635 + next, prev->next, prev);
87636 + BUG();
87637 + return false;
87638 + }
87639 + if (unlikely(new == prev || new == next)) {
87640 + printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
87641 + new, prev, next);
87642 + BUG();
87643 + return false;
87644 + }
87645 + return true;
87646 +}
87647 +
87648 void __list_add(struct list_head *new,
87649 - struct list_head *prev,
87650 - struct list_head *next)
87651 + struct list_head *prev,
87652 + struct list_head *next)
87653 {
87654 - WARN(next->prev != prev,
87655 - "list_add corruption. next->prev should be "
87656 - "prev (%p), but was %p. (next=%p).\n",
87657 - prev, next->prev, next);
87658 - WARN(prev->next != next,
87659 - "list_add corruption. prev->next should be "
87660 - "next (%p), but was %p. (prev=%p).\n",
87661 - next, prev->next, prev);
87662 - WARN(new == prev || new == next,
87663 - "list_add double add: new=%p, prev=%p, next=%p.\n",
87664 - new, prev, next);
87665 + if (!__list_add_debug(new, prev, next))
87666 + return;
87667 +
87668 next->prev = new;
87669 new->next = next;
87670 new->prev = prev;
87671 @@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
87672 }
87673 EXPORT_SYMBOL(__list_add);
87674
87675 -void __list_del_entry(struct list_head *entry)
87676 +static bool __list_del_entry_debug(struct list_head *entry)
87677 {
87678 struct list_head *prev, *next;
87679
87680 prev = entry->prev;
87681 next = entry->next;
87682
87683 - if (WARN(next == LIST_POISON1,
87684 - "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
87685 - entry, LIST_POISON1) ||
87686 - WARN(prev == LIST_POISON2,
87687 - "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
87688 - entry, LIST_POISON2) ||
87689 - WARN(prev->next != entry,
87690 - "list_del corruption. prev->next should be %p, "
87691 - "but was %p\n", entry, prev->next) ||
87692 - WARN(next->prev != entry,
87693 - "list_del corruption. next->prev should be %p, "
87694 - "but was %p\n", entry, next->prev))
87695 + if (unlikely(next == LIST_POISON1)) {
87696 + printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
87697 + entry, LIST_POISON1);
87698 + BUG();
87699 + return false;
87700 + }
87701 + if (unlikely(prev == LIST_POISON2)) {
87702 + printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
87703 + entry, LIST_POISON2);
87704 + BUG();
87705 + return false;
87706 + }
87707 + if (unlikely(entry->prev->next != entry)) {
87708 + printk(KERN_ERR "list_del corruption. prev->next should be %p, "
87709 + "but was %p\n", entry, prev->next);
87710 + BUG();
87711 + return false;
87712 + }
87713 + if (unlikely(entry->next->prev != entry)) {
87714 + printk(KERN_ERR "list_del corruption. next->prev should be %p, "
87715 + "but was %p\n", entry, next->prev);
87716 + BUG();
87717 + return false;
87718 + }
87719 + return true;
87720 +}
87721 +
87722 +void __list_del_entry(struct list_head *entry)
87723 +{
87724 + if (!__list_del_entry_debug(entry))
87725 return;
87726
87727 - __list_del(prev, next);
87728 + __list_del(entry->prev, entry->next);
87729 }
87730 EXPORT_SYMBOL(__list_del_entry);
87731
87732 @@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
87733 void __list_add_rcu(struct list_head *new,
87734 struct list_head *prev, struct list_head *next)
87735 {
87736 - WARN(next->prev != prev,
87737 - "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
87738 - prev, next->prev, next);
87739 - WARN(prev->next != next,
87740 - "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
87741 - next, prev->next, prev);
87742 + if (!__list_add_debug(new, prev, next))
87743 + return;
87744 +
87745 new->next = next;
87746 new->prev = prev;
87747 rcu_assign_pointer(list_next_rcu(prev), new);
87748 next->prev = new;
87749 }
87750 EXPORT_SYMBOL(__list_add_rcu);
87751 +#endif
87752 +
87753 +void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
87754 +{
87755 +#ifdef CONFIG_DEBUG_LIST
87756 + if (!__list_add_debug(new, prev, next))
87757 + return;
87758 +#endif
87759 +
87760 + pax_open_kernel();
87761 + next->prev = new;
87762 + new->next = next;
87763 + new->prev = prev;
87764 + prev->next = new;
87765 + pax_close_kernel();
87766 +}
87767 +EXPORT_SYMBOL(__pax_list_add);
87768 +
87769 +void pax_list_del(struct list_head *entry)
87770 +{
87771 +#ifdef CONFIG_DEBUG_LIST
87772 + if (!__list_del_entry_debug(entry))
87773 + return;
87774 +#endif
87775 +
87776 + pax_open_kernel();
87777 + __list_del(entry->prev, entry->next);
87778 + entry->next = LIST_POISON1;
87779 + entry->prev = LIST_POISON2;
87780 + pax_close_kernel();
87781 +}
87782 +EXPORT_SYMBOL(pax_list_del);
87783 +
87784 +void pax_list_del_init(struct list_head *entry)
87785 +{
87786 + pax_open_kernel();
87787 + __list_del(entry->prev, entry->next);
87788 + INIT_LIST_HEAD(entry);
87789 + pax_close_kernel();
87790 +}
87791 +EXPORT_SYMBOL(pax_list_del_init);
87792 +
87793 +void __pax_list_add_rcu(struct list_head *new,
87794 + struct list_head *prev, struct list_head *next)
87795 +{
87796 +#ifdef CONFIG_DEBUG_LIST
87797 + if (!__list_add_debug(new, prev, next))
87798 + return;
87799 +#endif
87800 +
87801 + pax_open_kernel();
87802 + new->next = next;
87803 + new->prev = prev;
87804 + rcu_assign_pointer(list_next_rcu(prev), new);
87805 + next->prev = new;
87806 + pax_close_kernel();
87807 +}
87808 +EXPORT_SYMBOL(__pax_list_add_rcu);
87809 +
87810 +void pax_list_del_rcu(struct list_head *entry)
87811 +{
87812 +#ifdef CONFIG_DEBUG_LIST
87813 + if (!__list_del_entry_debug(entry))
87814 + return;
87815 +#endif
87816 +
87817 + pax_open_kernel();
87818 + __list_del(entry->prev, entry->next);
87819 + entry->next = LIST_POISON1;
87820 + entry->prev = LIST_POISON2;
87821 + pax_close_kernel();
87822 +}
87823 +EXPORT_SYMBOL(pax_list_del_rcu);
87824 diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
87825 index 1a53d49..ace934c 100644
87826 --- a/lib/percpu-refcount.c
87827 +++ b/lib/percpu-refcount.c
87828 @@ -29,7 +29,7 @@
87829 * can't hit 0 before we've added up all the percpu refs.
87830 */
87831
87832 -#define PCPU_COUNT_BIAS (1U << 31)
87833 +#define PCPU_COUNT_BIAS (1U << 30)
87834
87835 /**
87836 * percpu_ref_init - initialize a percpu refcount
87837 diff --git a/lib/radix-tree.c b/lib/radix-tree.c
87838 index 7811ed3..f80ca19 100644
87839 --- a/lib/radix-tree.c
87840 +++ b/lib/radix-tree.c
87841 @@ -93,7 +93,7 @@ struct radix_tree_preload {
87842 int nr;
87843 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
87844 };
87845 -static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
87846 +static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
87847
87848 static inline void *ptr_to_indirect(void *ptr)
87849 {
87850 diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
87851 index bb2b201..46abaf9 100644
87852 --- a/lib/strncpy_from_user.c
87853 +++ b/lib/strncpy_from_user.c
87854 @@ -21,7 +21,7 @@
87855 */
87856 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
87857 {
87858 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
87859 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
87860 long res = 0;
87861
87862 /*
87863 diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
87864 index a28df52..3d55877 100644
87865 --- a/lib/strnlen_user.c
87866 +++ b/lib/strnlen_user.c
87867 @@ -26,7 +26,7 @@
87868 */
87869 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
87870 {
87871 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
87872 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
87873 long align, res = 0;
87874 unsigned long c;
87875
87876 diff --git a/lib/swiotlb.c b/lib/swiotlb.c
87877 index 4e8686c..3e8c92f 100644
87878 --- a/lib/swiotlb.c
87879 +++ b/lib/swiotlb.c
87880 @@ -664,7 +664,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
87881
87882 void
87883 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
87884 - dma_addr_t dev_addr)
87885 + dma_addr_t dev_addr, struct dma_attrs *attrs)
87886 {
87887 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
87888
87889 diff --git a/lib/usercopy.c b/lib/usercopy.c
87890 index 4f5b1dd..7cab418 100644
87891 --- a/lib/usercopy.c
87892 +++ b/lib/usercopy.c
87893 @@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
87894 WARN(1, "Buffer overflow detected!\n");
87895 }
87896 EXPORT_SYMBOL(copy_from_user_overflow);
87897 +
87898 +void copy_to_user_overflow(void)
87899 +{
87900 + WARN(1, "Buffer overflow detected!\n");
87901 +}
87902 +EXPORT_SYMBOL(copy_to_user_overflow);
87903 diff --git a/lib/vsprintf.c b/lib/vsprintf.c
87904 index d76555c..62d4bfe 100644
87905 --- a/lib/vsprintf.c
87906 +++ b/lib/vsprintf.c
87907 @@ -16,6 +16,9 @@
87908 * - scnprintf and vscnprintf
87909 */
87910
87911 +#ifdef CONFIG_GRKERNSEC_HIDESYM
87912 +#define __INCLUDED_BY_HIDESYM 1
87913 +#endif
87914 #include <stdarg.h>
87915 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
87916 #include <linux/types.h>
87917 @@ -1155,7 +1158,11 @@ char *netdev_feature_string(char *buf, char *end, const u8 *addr,
87918 return number(buf, end, *(const netdev_features_t *)addr, spec);
87919 }
87920
87921 +#ifdef CONFIG_GRKERNSEC_HIDESYM
87922 +int kptr_restrict __read_mostly = 2;
87923 +#else
87924 int kptr_restrict __read_mostly;
87925 +#endif
87926
87927 /*
87928 * Show a '%p' thing. A kernel extension is that the '%p' is followed
87929 @@ -1168,6 +1175,7 @@ int kptr_restrict __read_mostly;
87930 * - 'f' For simple symbolic function names without offset
87931 * - 'S' For symbolic direct pointers with offset
87932 * - 's' For symbolic direct pointers without offset
87933 + * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
87934 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
87935 * - 'B' For backtraced symbolic direct pointers with offset
87936 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
87937 @@ -1232,12 +1240,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
87938
87939 if (!ptr && *fmt != 'K') {
87940 /*
87941 - * Print (null) with the same width as a pointer so it makes
87942 + * Print (nil) with the same width as a pointer so it makes
87943 * tabular output look nice.
87944 */
87945 if (spec.field_width == -1)
87946 spec.field_width = default_width;
87947 - return string(buf, end, "(null)", spec);
87948 + return string(buf, end, "(nil)", spec);
87949 }
87950
87951 switch (*fmt) {
87952 @@ -1247,6 +1255,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
87953 /* Fallthrough */
87954 case 'S':
87955 case 's':
87956 +#ifdef CONFIG_GRKERNSEC_HIDESYM
87957 + break;
87958 +#else
87959 + return symbol_string(buf, end, ptr, spec, fmt);
87960 +#endif
87961 + case 'A':
87962 case 'B':
87963 return symbol_string(buf, end, ptr, spec, fmt);
87964 case 'R':
87965 @@ -1302,6 +1316,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
87966 va_end(va);
87967 return buf;
87968 }
87969 + case 'P':
87970 + break;
87971 case 'K':
87972 /*
87973 * %pK cannot be used in IRQ context because its test
87974 @@ -1363,6 +1379,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
87975 ((const struct file *)ptr)->f_path.dentry,
87976 spec, fmt);
87977 }
87978 +
87979 +#ifdef CONFIG_GRKERNSEC_HIDESYM
87980 + /* 'P' = approved pointers to copy to userland,
87981 + as in the /proc/kallsyms case, as we make it display nothing
87982 + for non-root users, and the real contents for root users
87983 + Also ignore 'K' pointers, since we force their NULLing for non-root users
87984 + above
87985 + */
87986 + if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'K' && is_usercopy_object(buf)) {
87987 + printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
87988 + dump_stack();
87989 + ptr = NULL;
87990 + }
87991 +#endif
87992 +
87993 spec.flags |= SMALL;
87994 if (spec.field_width == -1) {
87995 spec.field_width = default_width;
87996 @@ -2086,11 +2117,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
87997 typeof(type) value; \
87998 if (sizeof(type) == 8) { \
87999 args = PTR_ALIGN(args, sizeof(u32)); \
88000 - *(u32 *)&value = *(u32 *)args; \
88001 - *((u32 *)&value + 1) = *(u32 *)(args + 4); \
88002 + *(u32 *)&value = *(const u32 *)args; \
88003 + *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
88004 } else { \
88005 args = PTR_ALIGN(args, sizeof(type)); \
88006 - value = *(typeof(type) *)args; \
88007 + value = *(const typeof(type) *)args; \
88008 } \
88009 args += sizeof(type); \
88010 value; \
88011 @@ -2153,7 +2184,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
88012 case FORMAT_TYPE_STR: {
88013 const char *str_arg = args;
88014 args += strlen(str_arg) + 1;
88015 - str = string(str, end, (char *)str_arg, spec);
88016 + str = string(str, end, str_arg, spec);
88017 break;
88018 }
88019
88020 diff --git a/localversion-grsec b/localversion-grsec
88021 new file mode 100644
88022 index 0000000..7cd6065
88023 --- /dev/null
88024 +++ b/localversion-grsec
88025 @@ -0,0 +1 @@
88026 +-grsec
88027 diff --git a/mm/Kconfig b/mm/Kconfig
88028 index 394838f..0e5f816 100644
88029 --- a/mm/Kconfig
88030 +++ b/mm/Kconfig
88031 @@ -317,10 +317,11 @@ config KSM
88032 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
88033
88034 config DEFAULT_MMAP_MIN_ADDR
88035 - int "Low address space to protect from user allocation"
88036 + int "Low address space to protect from user allocation"
88037 depends on MMU
88038 - default 4096
88039 - help
88040 + default 32768 if ALPHA || ARM || PARISC || SPARC32
88041 + default 65536
88042 + help
88043 This is the portion of low virtual memory which should be protected
88044 from userspace allocation. Keeping a user from writing to low pages
88045 can help reduce the impact of kernel NULL pointer bugs.
88046 @@ -351,7 +352,7 @@ config MEMORY_FAILURE
88047
88048 config HWPOISON_INJECT
88049 tristate "HWPoison pages injector"
88050 - depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
88051 + depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
88052 select PROC_PAGE_MONITOR
88053
88054 config NOMMU_INITIAL_TRIM_EXCESS
88055 diff --git a/mm/backing-dev.c b/mm/backing-dev.c
88056 index ce682f7..1fb54f9 100644
88057 --- a/mm/backing-dev.c
88058 +++ b/mm/backing-dev.c
88059 @@ -12,7 +12,7 @@
88060 #include <linux/device.h>
88061 #include <trace/events/writeback.h>
88062
88063 -static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
88064 +static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
88065
88066 struct backing_dev_info default_backing_dev_info = {
88067 .name = "default",
88068 @@ -525,7 +525,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
88069 return err;
88070
88071 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
88072 - atomic_long_inc_return(&bdi_seq));
88073 + atomic_long_inc_return_unchecked(&bdi_seq));
88074 if (err) {
88075 bdi_destroy(bdi);
88076 return err;
88077 diff --git a/mm/filemap.c b/mm/filemap.c
88078 index ae4846f..b0acebe 100644
88079 --- a/mm/filemap.c
88080 +++ b/mm/filemap.c
88081 @@ -1768,7 +1768,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
88082 struct address_space *mapping = file->f_mapping;
88083
88084 if (!mapping->a_ops->readpage)
88085 - return -ENOEXEC;
88086 + return -ENODEV;
88087 file_accessed(file);
88088 vma->vm_ops = &generic_file_vm_ops;
88089 return 0;
88090 @@ -1950,7 +1950,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
88091
88092 while (bytes) {
88093 char __user *buf = iov->iov_base + base;
88094 - int copy = min(bytes, iov->iov_len - base);
88095 + size_t copy = min(bytes, iov->iov_len - base);
88096
88097 base = 0;
88098 left = __copy_from_user_inatomic(vaddr, buf, copy);
88099 @@ -1979,7 +1979,7 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,
88100 BUG_ON(!in_atomic());
88101 kaddr = kmap_atomic(page);
88102 if (likely(i->nr_segs == 1)) {
88103 - int left;
88104 + size_t left;
88105 char __user *buf = i->iov->iov_base + i->iov_offset;
88106 left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
88107 copied = bytes - left;
88108 @@ -2007,7 +2007,7 @@ size_t iov_iter_copy_from_user(struct page *page,
88109
88110 kaddr = kmap(page);
88111 if (likely(i->nr_segs == 1)) {
88112 - int left;
88113 + size_t left;
88114 char __user *buf = i->iov->iov_base + i->iov_offset;
88115 left = __copy_from_user(kaddr + offset, buf, bytes);
88116 copied = bytes - left;
88117 @@ -2037,7 +2037,7 @@ void iov_iter_advance(struct iov_iter *i, size_t bytes)
88118 * zero-length segments (without overruning the iovec).
88119 */
88120 while (bytes || unlikely(i->count && !iov->iov_len)) {
88121 - int copy;
88122 + size_t copy;
88123
88124 copy = min(bytes, iov->iov_len - base);
88125 BUG_ON(!i->count || i->count < copy);
88126 @@ -2108,6 +2108,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
88127 *pos = i_size_read(inode);
88128
88129 if (limit != RLIM_INFINITY) {
88130 + gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
88131 if (*pos >= limit) {
88132 send_sig(SIGXFSZ, current, 0);
88133 return -EFBIG;
88134 diff --git a/mm/fremap.c b/mm/fremap.c
88135 index 5bff081..bfa6e93 100644
88136 --- a/mm/fremap.c
88137 +++ b/mm/fremap.c
88138 @@ -163,6 +163,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
88139 retry:
88140 vma = find_vma(mm, start);
88141
88142 +#ifdef CONFIG_PAX_SEGMEXEC
88143 + if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
88144 + goto out;
88145 +#endif
88146 +
88147 /*
88148 * Make sure the vma is shared, that it supports prefaulting,
88149 * and that the remapped range is valid and fully within
88150 @@ -208,9 +213,10 @@ get_write_lock:
88151 if (mapping_cap_account_dirty(mapping)) {
88152 unsigned long addr;
88153 struct file *file = get_file(vma->vm_file);
88154 + /* mmap_region may free vma; grab the info now */
88155 + vm_flags = ACCESS_ONCE(vma->vm_flags);
88156
88157 - addr = mmap_region(file, start, size,
88158 - vma->vm_flags, pgoff);
88159 + addr = mmap_region(file, start, size, vm_flags, pgoff);
88160 fput(file);
88161 if (IS_ERR_VALUE(addr)) {
88162 err = addr;
88163 @@ -218,7 +224,7 @@ get_write_lock:
88164 BUG_ON(addr != start);
88165 err = 0;
88166 }
88167 - goto out;
88168 + goto out_freed;
88169 }
88170 mutex_lock(&mapping->i_mmap_mutex);
88171 flush_dcache_mmap_lock(mapping);
88172 @@ -253,6 +259,7 @@ get_write_lock:
88173 out:
88174 if (vma)
88175 vm_flags = vma->vm_flags;
88176 +out_freed:
88177 if (likely(!has_write_lock))
88178 up_read(&mm->mmap_sem);
88179 else
88180 diff --git a/mm/highmem.c b/mm/highmem.c
88181 index b32b70c..e512eb0 100644
88182 --- a/mm/highmem.c
88183 +++ b/mm/highmem.c
88184 @@ -138,8 +138,9 @@ static void flush_all_zero_pkmaps(void)
88185 * So no dangers, even with speculative execution.
88186 */
88187 page = pte_page(pkmap_page_table[i]);
88188 + pax_open_kernel();
88189 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
88190 -
88191 + pax_close_kernel();
88192 set_page_address(page, NULL);
88193 need_flush = 1;
88194 }
88195 @@ -198,9 +199,11 @@ start:
88196 }
88197 }
88198 vaddr = PKMAP_ADDR(last_pkmap_nr);
88199 +
88200 + pax_open_kernel();
88201 set_pte_at(&init_mm, vaddr,
88202 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
88203 -
88204 + pax_close_kernel();
88205 pkmap_count[last_pkmap_nr] = 1;
88206 set_page_address(page, (void *)vaddr);
88207
88208 diff --git a/mm/hugetlb.c b/mm/hugetlb.c
88209 index 0b7656e..d21cefc 100644
88210 --- a/mm/hugetlb.c
88211 +++ b/mm/hugetlb.c
88212 @@ -2094,15 +2094,17 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
88213 struct hstate *h = &default_hstate;
88214 unsigned long tmp;
88215 int ret;
88216 + ctl_table_no_const hugetlb_table;
88217
88218 tmp = h->max_huge_pages;
88219
88220 if (write && h->order >= MAX_ORDER)
88221 return -EINVAL;
88222
88223 - table->data = &tmp;
88224 - table->maxlen = sizeof(unsigned long);
88225 - ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
88226 + hugetlb_table = *table;
88227 + hugetlb_table.data = &tmp;
88228 + hugetlb_table.maxlen = sizeof(unsigned long);
88229 + ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
88230 if (ret)
88231 goto out;
88232
88233 @@ -2147,15 +2149,17 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
88234 struct hstate *h = &default_hstate;
88235 unsigned long tmp;
88236 int ret;
88237 + ctl_table_no_const hugetlb_table;
88238
88239 tmp = h->nr_overcommit_huge_pages;
88240
88241 if (write && h->order >= MAX_ORDER)
88242 return -EINVAL;
88243
88244 - table->data = &tmp;
88245 - table->maxlen = sizeof(unsigned long);
88246 - ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
88247 + hugetlb_table = *table;
88248 + hugetlb_table.data = &tmp;
88249 + hugetlb_table.maxlen = sizeof(unsigned long);
88250 + ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
88251 if (ret)
88252 goto out;
88253
88254 @@ -2605,6 +2609,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
88255 return 1;
88256 }
88257
88258 +#ifdef CONFIG_PAX_SEGMEXEC
88259 +static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
88260 +{
88261 + struct mm_struct *mm = vma->vm_mm;
88262 + struct vm_area_struct *vma_m;
88263 + unsigned long address_m;
88264 + pte_t *ptep_m;
88265 +
88266 + vma_m = pax_find_mirror_vma(vma);
88267 + if (!vma_m)
88268 + return;
88269 +
88270 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
88271 + address_m = address + SEGMEXEC_TASK_SIZE;
88272 + ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
88273 + get_page(page_m);
88274 + hugepage_add_anon_rmap(page_m, vma_m, address_m);
88275 + set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
88276 +}
88277 +#endif
88278 +
88279 /*
88280 * Hugetlb_cow() should be called with page lock of the original hugepage held.
88281 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
88282 @@ -2721,6 +2746,11 @@ retry_avoidcopy:
88283 make_huge_pte(vma, new_page, 1));
88284 page_remove_rmap(old_page);
88285 hugepage_add_new_anon_rmap(new_page, vma, address);
88286 +
88287 +#ifdef CONFIG_PAX_SEGMEXEC
88288 + pax_mirror_huge_pte(vma, address, new_page);
88289 +#endif
88290 +
88291 /* Make the old page be freed below */
88292 new_page = old_page;
88293 }
88294 @@ -2883,6 +2913,10 @@ retry:
88295 && (vma->vm_flags & VM_SHARED)));
88296 set_huge_pte_at(mm, address, ptep, new_pte);
88297
88298 +#ifdef CONFIG_PAX_SEGMEXEC
88299 + pax_mirror_huge_pte(vma, address, page);
88300 +#endif
88301 +
88302 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
88303 /* Optimization, do the COW without a second fault */
88304 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
88305 @@ -2912,6 +2946,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
88306 static DEFINE_MUTEX(hugetlb_instantiation_mutex);
88307 struct hstate *h = hstate_vma(vma);
88308
88309 +#ifdef CONFIG_PAX_SEGMEXEC
88310 + struct vm_area_struct *vma_m;
88311 +#endif
88312 +
88313 address &= huge_page_mask(h);
88314
88315 ptep = huge_pte_offset(mm, address);
88316 @@ -2925,6 +2963,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
88317 VM_FAULT_SET_HINDEX(hstate_index(h));
88318 }
88319
88320 +#ifdef CONFIG_PAX_SEGMEXEC
88321 + vma_m = pax_find_mirror_vma(vma);
88322 + if (vma_m) {
88323 + unsigned long address_m;
88324 +
88325 + if (vma->vm_start > vma_m->vm_start) {
88326 + address_m = address;
88327 + address -= SEGMEXEC_TASK_SIZE;
88328 + vma = vma_m;
88329 + h = hstate_vma(vma);
88330 + } else
88331 + address_m = address + SEGMEXEC_TASK_SIZE;
88332 +
88333 + if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
88334 + return VM_FAULT_OOM;
88335 + address_m &= HPAGE_MASK;
88336 + unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
88337 + }
88338 +#endif
88339 +
88340 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
88341 if (!ptep)
88342 return VM_FAULT_OOM;
88343 diff --git a/mm/internal.h b/mm/internal.h
88344 index 684f7aa..9eb9edc 100644
88345 --- a/mm/internal.h
88346 +++ b/mm/internal.h
88347 @@ -97,6 +97,7 @@ extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address);
88348 * in mm/page_alloc.c
88349 */
88350 extern void __free_pages_bootmem(struct page *page, unsigned int order);
88351 +extern void free_compound_page(struct page *page);
88352 extern void prep_compound_page(struct page *page, unsigned long order);
88353 #ifdef CONFIG_MEMORY_FAILURE
88354 extern bool is_free_buddy_page(struct page *page);
88355 @@ -352,7 +353,7 @@ extern u32 hwpoison_filter_enable;
88356
88357 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
88358 unsigned long, unsigned long,
88359 - unsigned long, unsigned long);
88360 + unsigned long, unsigned long) __intentional_overflow(-1);
88361
88362 extern void set_pageblock_order(void);
88363 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
88364 diff --git a/mm/kmemleak.c b/mm/kmemleak.c
88365 index e126b0e..e986018 100644
88366 --- a/mm/kmemleak.c
88367 +++ b/mm/kmemleak.c
88368 @@ -363,7 +363,7 @@ static void print_unreferenced(struct seq_file *seq,
88369
88370 for (i = 0; i < object->trace_len; i++) {
88371 void *ptr = (void *)object->trace[i];
88372 - seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
88373 + seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
88374 }
88375 }
88376
88377 @@ -1851,7 +1851,7 @@ static int __init kmemleak_late_init(void)
88378 return -ENOMEM;
88379 }
88380
88381 - dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
88382 + dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
88383 &kmemleak_fops);
88384 if (!dentry)
88385 pr_warning("Failed to create the debugfs kmemleak file\n");
88386 diff --git a/mm/maccess.c b/mm/maccess.c
88387 index d53adf9..03a24bf 100644
88388 --- a/mm/maccess.c
88389 +++ b/mm/maccess.c
88390 @@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
88391 set_fs(KERNEL_DS);
88392 pagefault_disable();
88393 ret = __copy_from_user_inatomic(dst,
88394 - (__force const void __user *)src, size);
88395 + (const void __force_user *)src, size);
88396 pagefault_enable();
88397 set_fs(old_fs);
88398
88399 @@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
88400
88401 set_fs(KERNEL_DS);
88402 pagefault_disable();
88403 - ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
88404 + ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
88405 pagefault_enable();
88406 set_fs(old_fs);
88407
88408 diff --git a/mm/madvise.c b/mm/madvise.c
88409 index 539eeb9..e24a987 100644
88410 --- a/mm/madvise.c
88411 +++ b/mm/madvise.c
88412 @@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
88413 pgoff_t pgoff;
88414 unsigned long new_flags = vma->vm_flags;
88415
88416 +#ifdef CONFIG_PAX_SEGMEXEC
88417 + struct vm_area_struct *vma_m;
88418 +#endif
88419 +
88420 switch (behavior) {
88421 case MADV_NORMAL:
88422 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
88423 @@ -126,6 +130,13 @@ success:
88424 /*
88425 * vm_flags is protected by the mmap_sem held in write mode.
88426 */
88427 +
88428 +#ifdef CONFIG_PAX_SEGMEXEC
88429 + vma_m = pax_find_mirror_vma(vma);
88430 + if (vma_m)
88431 + vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
88432 +#endif
88433 +
88434 vma->vm_flags = new_flags;
88435
88436 out:
88437 @@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct *vma,
88438 struct vm_area_struct **prev,
88439 unsigned long start, unsigned long end)
88440 {
88441 +
88442 +#ifdef CONFIG_PAX_SEGMEXEC
88443 + struct vm_area_struct *vma_m;
88444 +#endif
88445 +
88446 *prev = vma;
88447 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
88448 return -EINVAL;
88449 @@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct *vma,
88450 zap_page_range(vma, start, end - start, &details);
88451 } else
88452 zap_page_range(vma, start, end - start, NULL);
88453 +
88454 +#ifdef CONFIG_PAX_SEGMEXEC
88455 + vma_m = pax_find_mirror_vma(vma);
88456 + if (vma_m) {
88457 + if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
88458 + struct zap_details details = {
88459 + .nonlinear_vma = vma_m,
88460 + .last_index = ULONG_MAX,
88461 + };
88462 + zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
88463 + } else
88464 + zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
88465 + }
88466 +#endif
88467 +
88468 return 0;
88469 }
88470
88471 @@ -491,6 +522,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
88472 if (end < start)
88473 return error;
88474
88475 +#ifdef CONFIG_PAX_SEGMEXEC
88476 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
88477 + if (end > SEGMEXEC_TASK_SIZE)
88478 + return error;
88479 + } else
88480 +#endif
88481 +
88482 + if (end > TASK_SIZE)
88483 + return error;
88484 +
88485 error = 0;
88486 if (end == start)
88487 return error;
88488 diff --git a/mm/memory-failure.c b/mm/memory-failure.c
88489 index bf3351b..aea800d 100644
88490 --- a/mm/memory-failure.c
88491 +++ b/mm/memory-failure.c
88492 @@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
88493
88494 int sysctl_memory_failure_recovery __read_mostly = 1;
88495
88496 -atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
88497 +atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
88498
88499 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
88500
88501 @@ -202,7 +202,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
88502 pfn, t->comm, t->pid);
88503 si.si_signo = SIGBUS;
88504 si.si_errno = 0;
88505 - si.si_addr = (void *)addr;
88506 + si.si_addr = (void __user *)addr;
88507 #ifdef __ARCH_SI_TRAPNO
88508 si.si_trapno = trapno;
88509 #endif
88510 @@ -762,7 +762,7 @@ static struct page_state {
88511 unsigned long res;
88512 char *msg;
88513 int (*action)(struct page *p, unsigned long pfn);
88514 -} error_states[] = {
88515 +} __do_const error_states[] = {
88516 { reserved, reserved, "reserved kernel", me_kernel },
88517 /*
88518 * free pages are specially detected outside this table:
88519 @@ -1053,7 +1053,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
88520 nr_pages = 1 << compound_order(hpage);
88521 else /* normal page or thp */
88522 nr_pages = 1;
88523 - atomic_long_add(nr_pages, &num_poisoned_pages);
88524 + atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
88525
88526 /*
88527 * We need/can do nothing about count=0 pages.
88528 @@ -1083,7 +1083,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
88529 if (!PageHWPoison(hpage)
88530 || (hwpoison_filter(p) && TestClearPageHWPoison(p))
88531 || (p != hpage && TestSetPageHWPoison(hpage))) {
88532 - atomic_long_sub(nr_pages, &num_poisoned_pages);
88533 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
88534 return 0;
88535 }
88536 set_page_hwpoison_huge_page(hpage);
88537 @@ -1152,7 +1152,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
88538 }
88539 if (hwpoison_filter(p)) {
88540 if (TestClearPageHWPoison(p))
88541 - atomic_long_sub(nr_pages, &num_poisoned_pages);
88542 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
88543 unlock_page(hpage);
88544 put_page(hpage);
88545 return 0;
88546 @@ -1370,7 +1370,7 @@ int unpoison_memory(unsigned long pfn)
88547 return 0;
88548 }
88549 if (TestClearPageHWPoison(p))
88550 - atomic_long_dec(&num_poisoned_pages);
88551 + atomic_long_dec_unchecked(&num_poisoned_pages);
88552 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
88553 return 0;
88554 }
88555 @@ -1384,7 +1384,7 @@ int unpoison_memory(unsigned long pfn)
88556 */
88557 if (TestClearPageHWPoison(page)) {
88558 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
88559 - atomic_long_sub(nr_pages, &num_poisoned_pages);
88560 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
88561 freeit = 1;
88562 if (PageHuge(page))
88563 clear_page_hwpoison_huge_page(page);
88564 @@ -1521,7 +1521,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
88565 } else {
88566 set_page_hwpoison_huge_page(hpage);
88567 dequeue_hwpoisoned_huge_page(hpage);
88568 - atomic_long_add(1 << compound_order(hpage),
88569 + atomic_long_add_unchecked(1 << compound_order(hpage),
88570 &num_poisoned_pages);
88571 }
88572 return ret;
88573 @@ -1560,7 +1560,7 @@ static int __soft_offline_page(struct page *page, int flags)
88574 put_page(page);
88575 pr_info("soft_offline: %#lx: invalidated\n", pfn);
88576 SetPageHWPoison(page);
88577 - atomic_long_inc(&num_poisoned_pages);
88578 + atomic_long_inc_unchecked(&num_poisoned_pages);
88579 return 0;
88580 }
88581
88582 @@ -1605,7 +1605,7 @@ static int __soft_offline_page(struct page *page, int flags)
88583 if (!is_free_buddy_page(page))
88584 pr_info("soft offline: %#lx: page leaked\n",
88585 pfn);
88586 - atomic_long_inc(&num_poisoned_pages);
88587 + atomic_long_inc_unchecked(&num_poisoned_pages);
88588 }
88589 } else {
88590 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
88591 @@ -1666,11 +1666,11 @@ int soft_offline_page(struct page *page, int flags)
88592 if (PageHuge(page)) {
88593 set_page_hwpoison_huge_page(hpage);
88594 dequeue_hwpoisoned_huge_page(hpage);
88595 - atomic_long_add(1 << compound_order(hpage),
88596 + atomic_long_add_unchecked(1 << compound_order(hpage),
88597 &num_poisoned_pages);
88598 } else {
88599 SetPageHWPoison(page);
88600 - atomic_long_inc(&num_poisoned_pages);
88601 + atomic_long_inc_unchecked(&num_poisoned_pages);
88602 }
88603 }
88604 unset:
88605 diff --git a/mm/memory.c b/mm/memory.c
88606 index d176154..cd1b387 100644
88607 --- a/mm/memory.c
88608 +++ b/mm/memory.c
88609 @@ -402,6 +402,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
88610 free_pte_range(tlb, pmd, addr);
88611 } while (pmd++, addr = next, addr != end);
88612
88613 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
88614 start &= PUD_MASK;
88615 if (start < floor)
88616 return;
88617 @@ -416,6 +417,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
88618 pmd = pmd_offset(pud, start);
88619 pud_clear(pud);
88620 pmd_free_tlb(tlb, pmd, start);
88621 +#endif
88622 +
88623 }
88624
88625 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
88626 @@ -435,6 +438,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
88627 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
88628 } while (pud++, addr = next, addr != end);
88629
88630 +#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
88631 start &= PGDIR_MASK;
88632 if (start < floor)
88633 return;
88634 @@ -449,6 +453,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
88635 pud = pud_offset(pgd, start);
88636 pgd_clear(pgd);
88637 pud_free_tlb(tlb, pud, start);
88638 +#endif
88639 +
88640 }
88641
88642 /*
88643 @@ -1636,12 +1642,6 @@ no_page_table:
88644 return page;
88645 }
88646
88647 -static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
88648 -{
88649 - return stack_guard_page_start(vma, addr) ||
88650 - stack_guard_page_end(vma, addr+PAGE_SIZE);
88651 -}
88652 -
88653 /**
88654 * __get_user_pages() - pin user pages in memory
88655 * @tsk: task_struct of target task
88656 @@ -1728,10 +1728,10 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
88657
88658 i = 0;
88659
88660 - do {
88661 + while (nr_pages) {
88662 struct vm_area_struct *vma;
88663
88664 - vma = find_extend_vma(mm, start);
88665 + vma = find_vma(mm, start);
88666 if (!vma && in_gate_area(mm, start)) {
88667 unsigned long pg = start & PAGE_MASK;
88668 pgd_t *pgd;
88669 @@ -1780,7 +1780,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
88670 goto next_page;
88671 }
88672
88673 - if (!vma ||
88674 + if (!vma || start < vma->vm_start ||
88675 (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
88676 !(vm_flags & vma->vm_flags))
88677 return i ? : -EFAULT;
88678 @@ -1809,11 +1809,6 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
88679 int ret;
88680 unsigned int fault_flags = 0;
88681
88682 - /* For mlock, just skip the stack guard page. */
88683 - if (foll_flags & FOLL_MLOCK) {
88684 - if (stack_guard_page(vma, start))
88685 - goto next_page;
88686 - }
88687 if (foll_flags & FOLL_WRITE)
88688 fault_flags |= FAULT_FLAG_WRITE;
88689 if (nonblocking)
88690 @@ -1893,7 +1888,7 @@ next_page:
88691 start += page_increm * PAGE_SIZE;
88692 nr_pages -= page_increm;
88693 } while (nr_pages && start < vma->vm_end);
88694 - } while (nr_pages);
88695 + }
88696 return i;
88697 }
88698 EXPORT_SYMBOL(__get_user_pages);
88699 @@ -2100,6 +2095,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
88700 page_add_file_rmap(page);
88701 set_pte_at(mm, addr, pte, mk_pte(page, prot));
88702
88703 +#ifdef CONFIG_PAX_SEGMEXEC
88704 + pax_mirror_file_pte(vma, addr, page, ptl);
88705 +#endif
88706 +
88707 retval = 0;
88708 pte_unmap_unlock(pte, ptl);
88709 return retval;
88710 @@ -2144,9 +2143,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
88711 if (!page_count(page))
88712 return -EINVAL;
88713 if (!(vma->vm_flags & VM_MIXEDMAP)) {
88714 +
88715 +#ifdef CONFIG_PAX_SEGMEXEC
88716 + struct vm_area_struct *vma_m;
88717 +#endif
88718 +
88719 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
88720 BUG_ON(vma->vm_flags & VM_PFNMAP);
88721 vma->vm_flags |= VM_MIXEDMAP;
88722 +
88723 +#ifdef CONFIG_PAX_SEGMEXEC
88724 + vma_m = pax_find_mirror_vma(vma);
88725 + if (vma_m)
88726 + vma_m->vm_flags |= VM_MIXEDMAP;
88727 +#endif
88728 +
88729 }
88730 return insert_page(vma, addr, page, vma->vm_page_prot);
88731 }
88732 @@ -2229,6 +2240,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
88733 unsigned long pfn)
88734 {
88735 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
88736 + BUG_ON(vma->vm_mirror);
88737
88738 if (addr < vma->vm_start || addr >= vma->vm_end)
88739 return -EFAULT;
88740 @@ -2476,7 +2488,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
88741
88742 BUG_ON(pud_huge(*pud));
88743
88744 - pmd = pmd_alloc(mm, pud, addr);
88745 + pmd = (mm == &init_mm) ?
88746 + pmd_alloc_kernel(mm, pud, addr) :
88747 + pmd_alloc(mm, pud, addr);
88748 if (!pmd)
88749 return -ENOMEM;
88750 do {
88751 @@ -2496,7 +2510,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
88752 unsigned long next;
88753 int err;
88754
88755 - pud = pud_alloc(mm, pgd, addr);
88756 + pud = (mm == &init_mm) ?
88757 + pud_alloc_kernel(mm, pgd, addr) :
88758 + pud_alloc(mm, pgd, addr);
88759 if (!pud)
88760 return -ENOMEM;
88761 do {
88762 @@ -2584,6 +2600,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
88763 copy_user_highpage(dst, src, va, vma);
88764 }
88765
88766 +#ifdef CONFIG_PAX_SEGMEXEC
88767 +static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
88768 +{
88769 + struct mm_struct *mm = vma->vm_mm;
88770 + spinlock_t *ptl;
88771 + pte_t *pte, entry;
88772 +
88773 + pte = pte_offset_map_lock(mm, pmd, address, &ptl);
88774 + entry = *pte;
88775 + if (!pte_present(entry)) {
88776 + if (!pte_none(entry)) {
88777 + BUG_ON(pte_file(entry));
88778 + free_swap_and_cache(pte_to_swp_entry(entry));
88779 + pte_clear_not_present_full(mm, address, pte, 0);
88780 + }
88781 + } else {
88782 + struct page *page;
88783 +
88784 + flush_cache_page(vma, address, pte_pfn(entry));
88785 + entry = ptep_clear_flush(vma, address, pte);
88786 + BUG_ON(pte_dirty(entry));
88787 + page = vm_normal_page(vma, address, entry);
88788 + if (page) {
88789 + update_hiwater_rss(mm);
88790 + if (PageAnon(page))
88791 + dec_mm_counter_fast(mm, MM_ANONPAGES);
88792 + else
88793 + dec_mm_counter_fast(mm, MM_FILEPAGES);
88794 + page_remove_rmap(page);
88795 + page_cache_release(page);
88796 + }
88797 + }
88798 + pte_unmap_unlock(pte, ptl);
88799 +}
88800 +
88801 +/* PaX: if vma is mirrored, synchronize the mirror's PTE
88802 + *
88803 + * the ptl of the lower mapped page is held on entry and is not released on exit
88804 + * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
88805 + */
88806 +static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
88807 +{
88808 + struct mm_struct *mm = vma->vm_mm;
88809 + unsigned long address_m;
88810 + spinlock_t *ptl_m;
88811 + struct vm_area_struct *vma_m;
88812 + pmd_t *pmd_m;
88813 + pte_t *pte_m, entry_m;
88814 +
88815 + BUG_ON(!page_m || !PageAnon(page_m));
88816 +
88817 + vma_m = pax_find_mirror_vma(vma);
88818 + if (!vma_m)
88819 + return;
88820 +
88821 + BUG_ON(!PageLocked(page_m));
88822 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
88823 + address_m = address + SEGMEXEC_TASK_SIZE;
88824 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
88825 + pte_m = pte_offset_map(pmd_m, address_m);
88826 + ptl_m = pte_lockptr(mm, pmd_m);
88827 + if (ptl != ptl_m) {
88828 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
88829 + if (!pte_none(*pte_m))
88830 + goto out;
88831 + }
88832 +
88833 + entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
88834 + page_cache_get(page_m);
88835 + page_add_anon_rmap(page_m, vma_m, address_m);
88836 + inc_mm_counter_fast(mm, MM_ANONPAGES);
88837 + set_pte_at(mm, address_m, pte_m, entry_m);
88838 + update_mmu_cache(vma_m, address_m, pte_m);
88839 +out:
88840 + if (ptl != ptl_m)
88841 + spin_unlock(ptl_m);
88842 + pte_unmap(pte_m);
88843 + unlock_page(page_m);
88844 +}
88845 +
88846 +void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
88847 +{
88848 + struct mm_struct *mm = vma->vm_mm;
88849 + unsigned long address_m;
88850 + spinlock_t *ptl_m;
88851 + struct vm_area_struct *vma_m;
88852 + pmd_t *pmd_m;
88853 + pte_t *pte_m, entry_m;
88854 +
88855 + BUG_ON(!page_m || PageAnon(page_m));
88856 +
88857 + vma_m = pax_find_mirror_vma(vma);
88858 + if (!vma_m)
88859 + return;
88860 +
88861 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
88862 + address_m = address + SEGMEXEC_TASK_SIZE;
88863 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
88864 + pte_m = pte_offset_map(pmd_m, address_m);
88865 + ptl_m = pte_lockptr(mm, pmd_m);
88866 + if (ptl != ptl_m) {
88867 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
88868 + if (!pte_none(*pte_m))
88869 + goto out;
88870 + }
88871 +
88872 + entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
88873 + page_cache_get(page_m);
88874 + page_add_file_rmap(page_m);
88875 + inc_mm_counter_fast(mm, MM_FILEPAGES);
88876 + set_pte_at(mm, address_m, pte_m, entry_m);
88877 + update_mmu_cache(vma_m, address_m, pte_m);
88878 +out:
88879 + if (ptl != ptl_m)
88880 + spin_unlock(ptl_m);
88881 + pte_unmap(pte_m);
88882 +}
88883 +
88884 +static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
88885 +{
88886 + struct mm_struct *mm = vma->vm_mm;
88887 + unsigned long address_m;
88888 + spinlock_t *ptl_m;
88889 + struct vm_area_struct *vma_m;
88890 + pmd_t *pmd_m;
88891 + pte_t *pte_m, entry_m;
88892 +
88893 + vma_m = pax_find_mirror_vma(vma);
88894 + if (!vma_m)
88895 + return;
88896 +
88897 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
88898 + address_m = address + SEGMEXEC_TASK_SIZE;
88899 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
88900 + pte_m = pte_offset_map(pmd_m, address_m);
88901 + ptl_m = pte_lockptr(mm, pmd_m);
88902 + if (ptl != ptl_m) {
88903 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
88904 + if (!pte_none(*pte_m))
88905 + goto out;
88906 + }
88907 +
88908 + entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
88909 + set_pte_at(mm, address_m, pte_m, entry_m);
88910 +out:
88911 + if (ptl != ptl_m)
88912 + spin_unlock(ptl_m);
88913 + pte_unmap(pte_m);
88914 +}
88915 +
88916 +static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
88917 +{
88918 + struct page *page_m;
88919 + pte_t entry;
88920 +
88921 + if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
88922 + goto out;
88923 +
88924 + entry = *pte;
88925 + page_m = vm_normal_page(vma, address, entry);
88926 + if (!page_m)
88927 + pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
88928 + else if (PageAnon(page_m)) {
88929 + if (pax_find_mirror_vma(vma)) {
88930 + pte_unmap_unlock(pte, ptl);
88931 + lock_page(page_m);
88932 + pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
88933 + if (pte_same(entry, *pte))
88934 + pax_mirror_anon_pte(vma, address, page_m, ptl);
88935 + else
88936 + unlock_page(page_m);
88937 + }
88938 + } else
88939 + pax_mirror_file_pte(vma, address, page_m, ptl);
88940 +
88941 +out:
88942 + pte_unmap_unlock(pte, ptl);
88943 +}
88944 +#endif
88945 +
88946 /*
88947 * This routine handles present pages, when users try to write
88948 * to a shared page. It is done by copying the page to a new address
88949 @@ -2800,6 +2996,12 @@ gotten:
88950 */
88951 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
88952 if (likely(pte_same(*page_table, orig_pte))) {
88953 +
88954 +#ifdef CONFIG_PAX_SEGMEXEC
88955 + if (pax_find_mirror_vma(vma))
88956 + BUG_ON(!trylock_page(new_page));
88957 +#endif
88958 +
88959 if (old_page) {
88960 if (!PageAnon(old_page)) {
88961 dec_mm_counter_fast(mm, MM_FILEPAGES);
88962 @@ -2851,6 +3053,10 @@ gotten:
88963 page_remove_rmap(old_page);
88964 }
88965
88966 +#ifdef CONFIG_PAX_SEGMEXEC
88967 + pax_mirror_anon_pte(vma, address, new_page, ptl);
88968 +#endif
88969 +
88970 /* Free the old page.. */
88971 new_page = old_page;
88972 ret |= VM_FAULT_WRITE;
88973 @@ -3128,6 +3334,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
88974 swap_free(entry);
88975 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
88976 try_to_free_swap(page);
88977 +
88978 +#ifdef CONFIG_PAX_SEGMEXEC
88979 + if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
88980 +#endif
88981 +
88982 unlock_page(page);
88983 if (page != swapcache) {
88984 /*
88985 @@ -3151,6 +3362,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
88986
88987 /* No need to invalidate - it was non-present before */
88988 update_mmu_cache(vma, address, page_table);
88989 +
88990 +#ifdef CONFIG_PAX_SEGMEXEC
88991 + pax_mirror_anon_pte(vma, address, page, ptl);
88992 +#endif
88993 +
88994 unlock:
88995 pte_unmap_unlock(page_table, ptl);
88996 out:
88997 @@ -3170,40 +3386,6 @@ out_release:
88998 }
88999
89000 /*
89001 - * This is like a special single-page "expand_{down|up}wards()",
89002 - * except we must first make sure that 'address{-|+}PAGE_SIZE'
89003 - * doesn't hit another vma.
89004 - */
89005 -static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
89006 -{
89007 - address &= PAGE_MASK;
89008 - if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
89009 - struct vm_area_struct *prev = vma->vm_prev;
89010 -
89011 - /*
89012 - * Is there a mapping abutting this one below?
89013 - *
89014 - * That's only ok if it's the same stack mapping
89015 - * that has gotten split..
89016 - */
89017 - if (prev && prev->vm_end == address)
89018 - return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
89019 -
89020 - expand_downwards(vma, address - PAGE_SIZE);
89021 - }
89022 - if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
89023 - struct vm_area_struct *next = vma->vm_next;
89024 -
89025 - /* As VM_GROWSDOWN but s/below/above/ */
89026 - if (next && next->vm_start == address + PAGE_SIZE)
89027 - return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
89028 -
89029 - expand_upwards(vma, address + PAGE_SIZE);
89030 - }
89031 - return 0;
89032 -}
89033 -
89034 -/*
89035 * We enter with non-exclusive mmap_sem (to exclude vma changes,
89036 * but allow concurrent faults), and pte mapped but not yet locked.
89037 * We return with mmap_sem still held, but pte unmapped and unlocked.
89038 @@ -3212,27 +3394,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
89039 unsigned long address, pte_t *page_table, pmd_t *pmd,
89040 unsigned int flags)
89041 {
89042 - struct page *page;
89043 + struct page *page = NULL;
89044 spinlock_t *ptl;
89045 pte_t entry;
89046
89047 - pte_unmap(page_table);
89048 -
89049 - /* Check if we need to add a guard page to the stack */
89050 - if (check_stack_guard_page(vma, address) < 0)
89051 - return VM_FAULT_SIGBUS;
89052 -
89053 - /* Use the zero-page for reads */
89054 if (!(flags & FAULT_FLAG_WRITE)) {
89055 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
89056 vma->vm_page_prot));
89057 - page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
89058 + ptl = pte_lockptr(mm, pmd);
89059 + spin_lock(ptl);
89060 if (!pte_none(*page_table))
89061 goto unlock;
89062 goto setpte;
89063 }
89064
89065 /* Allocate our own private page. */
89066 + pte_unmap(page_table);
89067 +
89068 if (unlikely(anon_vma_prepare(vma)))
89069 goto oom;
89070 page = alloc_zeroed_user_highpage_movable(vma, address);
89071 @@ -3256,6 +3434,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
89072 if (!pte_none(*page_table))
89073 goto release;
89074
89075 +#ifdef CONFIG_PAX_SEGMEXEC
89076 + if (pax_find_mirror_vma(vma))
89077 + BUG_ON(!trylock_page(page));
89078 +#endif
89079 +
89080 inc_mm_counter_fast(mm, MM_ANONPAGES);
89081 page_add_new_anon_rmap(page, vma, address);
89082 setpte:
89083 @@ -3263,6 +3446,12 @@ setpte:
89084
89085 /* No need to invalidate - it was non-present before */
89086 update_mmu_cache(vma, address, page_table);
89087 +
89088 +#ifdef CONFIG_PAX_SEGMEXEC
89089 + if (page)
89090 + pax_mirror_anon_pte(vma, address, page, ptl);
89091 +#endif
89092 +
89093 unlock:
89094 pte_unmap_unlock(page_table, ptl);
89095 return 0;
89096 @@ -3406,6 +3595,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
89097 */
89098 /* Only go through if we didn't race with anybody else... */
89099 if (likely(pte_same(*page_table, orig_pte))) {
89100 +
89101 +#ifdef CONFIG_PAX_SEGMEXEC
89102 + if (anon && pax_find_mirror_vma(vma))
89103 + BUG_ON(!trylock_page(page));
89104 +#endif
89105 +
89106 flush_icache_page(vma, page);
89107 entry = mk_pte(page, vma->vm_page_prot);
89108 if (flags & FAULT_FLAG_WRITE)
89109 @@ -3427,6 +3622,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
89110
89111 /* no need to invalidate: a not-present page won't be cached */
89112 update_mmu_cache(vma, address, page_table);
89113 +
89114 +#ifdef CONFIG_PAX_SEGMEXEC
89115 + if (anon)
89116 + pax_mirror_anon_pte(vma, address, page, ptl);
89117 + else
89118 + pax_mirror_file_pte(vma, address, page, ptl);
89119 +#endif
89120 +
89121 } else {
89122 if (cow_page)
89123 mem_cgroup_uncharge_page(cow_page);
89124 @@ -3737,6 +3940,12 @@ static int handle_pte_fault(struct mm_struct *mm,
89125 if (flags & FAULT_FLAG_WRITE)
89126 flush_tlb_fix_spurious_fault(vma, address);
89127 }
89128 +
89129 +#ifdef CONFIG_PAX_SEGMEXEC
89130 + pax_mirror_pte(vma, address, pte, pmd, ptl);
89131 + return 0;
89132 +#endif
89133 +
89134 unlock:
89135 pte_unmap_unlock(pte, ptl);
89136 return 0;
89137 @@ -3753,9 +3962,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
89138 pmd_t *pmd;
89139 pte_t *pte;
89140
89141 +#ifdef CONFIG_PAX_SEGMEXEC
89142 + struct vm_area_struct *vma_m;
89143 +#endif
89144 +
89145 if (unlikely(is_vm_hugetlb_page(vma)))
89146 return hugetlb_fault(mm, vma, address, flags);
89147
89148 +#ifdef CONFIG_PAX_SEGMEXEC
89149 + vma_m = pax_find_mirror_vma(vma);
89150 + if (vma_m) {
89151 + unsigned long address_m;
89152 + pgd_t *pgd_m;
89153 + pud_t *pud_m;
89154 + pmd_t *pmd_m;
89155 +
89156 + if (vma->vm_start > vma_m->vm_start) {
89157 + address_m = address;
89158 + address -= SEGMEXEC_TASK_SIZE;
89159 + vma = vma_m;
89160 + } else
89161 + address_m = address + SEGMEXEC_TASK_SIZE;
89162 +
89163 + pgd_m = pgd_offset(mm, address_m);
89164 + pud_m = pud_alloc(mm, pgd_m, address_m);
89165 + if (!pud_m)
89166 + return VM_FAULT_OOM;
89167 + pmd_m = pmd_alloc(mm, pud_m, address_m);
89168 + if (!pmd_m)
89169 + return VM_FAULT_OOM;
89170 + if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
89171 + return VM_FAULT_OOM;
89172 + pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
89173 + }
89174 +#endif
89175 +
89176 retry:
89177 pgd = pgd_offset(mm, address);
89178 pud = pud_alloc(mm, pgd, address);
89179 @@ -3894,6 +4135,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
89180 spin_unlock(&mm->page_table_lock);
89181 return 0;
89182 }
89183 +
89184 +int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
89185 +{
89186 + pud_t *new = pud_alloc_one(mm, address);
89187 + if (!new)
89188 + return -ENOMEM;
89189 +
89190 + smp_wmb(); /* See comment in __pte_alloc */
89191 +
89192 + spin_lock(&mm->page_table_lock);
89193 + if (pgd_present(*pgd)) /* Another has populated it */
89194 + pud_free(mm, new);
89195 + else
89196 + pgd_populate_kernel(mm, pgd, new);
89197 + spin_unlock(&mm->page_table_lock);
89198 + return 0;
89199 +}
89200 #endif /* __PAGETABLE_PUD_FOLDED */
89201
89202 #ifndef __PAGETABLE_PMD_FOLDED
89203 @@ -3924,6 +4182,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
89204 spin_unlock(&mm->page_table_lock);
89205 return 0;
89206 }
89207 +
89208 +int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
89209 +{
89210 + pmd_t *new = pmd_alloc_one(mm, address);
89211 + if (!new)
89212 + return -ENOMEM;
89213 +
89214 + smp_wmb(); /* See comment in __pte_alloc */
89215 +
89216 + spin_lock(&mm->page_table_lock);
89217 +#ifndef __ARCH_HAS_4LEVEL_HACK
89218 + if (pud_present(*pud)) /* Another has populated it */
89219 + pmd_free(mm, new);
89220 + else
89221 + pud_populate_kernel(mm, pud, new);
89222 +#else
89223 + if (pgd_present(*pud)) /* Another has populated it */
89224 + pmd_free(mm, new);
89225 + else
89226 + pgd_populate_kernel(mm, pud, new);
89227 +#endif /* __ARCH_HAS_4LEVEL_HACK */
89228 + spin_unlock(&mm->page_table_lock);
89229 + return 0;
89230 +}
89231 #endif /* __PAGETABLE_PMD_FOLDED */
89232
89233 #if !defined(__HAVE_ARCH_GATE_AREA)
89234 @@ -3937,7 +4219,7 @@ static int __init gate_vma_init(void)
89235 gate_vma.vm_start = FIXADDR_USER_START;
89236 gate_vma.vm_end = FIXADDR_USER_END;
89237 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
89238 - gate_vma.vm_page_prot = __P101;
89239 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
89240
89241 return 0;
89242 }
89243 @@ -4071,8 +4353,8 @@ out:
89244 return ret;
89245 }
89246
89247 -int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
89248 - void *buf, int len, int write)
89249 +ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
89250 + void *buf, size_t len, int write)
89251 {
89252 resource_size_t phys_addr;
89253 unsigned long prot = 0;
89254 @@ -4098,8 +4380,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
89255 * Access another process' address space as given in mm. If non-NULL, use the
89256 * given task for page fault accounting.
89257 */
89258 -static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
89259 - unsigned long addr, void *buf, int len, int write)
89260 +static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
89261 + unsigned long addr, void *buf, size_t len, int write)
89262 {
89263 struct vm_area_struct *vma;
89264 void *old_buf = buf;
89265 @@ -4107,7 +4389,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
89266 down_read(&mm->mmap_sem);
89267 /* ignore errors, just check how much was successfully transferred */
89268 while (len) {
89269 - int bytes, ret, offset;
89270 + ssize_t bytes, ret, offset;
89271 void *maddr;
89272 struct page *page = NULL;
89273
89274 @@ -4166,8 +4448,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
89275 *
89276 * The caller must hold a reference on @mm.
89277 */
89278 -int access_remote_vm(struct mm_struct *mm, unsigned long addr,
89279 - void *buf, int len, int write)
89280 +ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
89281 + void *buf, size_t len, int write)
89282 {
89283 return __access_remote_vm(NULL, mm, addr, buf, len, write);
89284 }
89285 @@ -4177,11 +4459,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
89286 * Source/target buffer must be kernel space,
89287 * Do not walk the page table directly, use get_user_pages
89288 */
89289 -int access_process_vm(struct task_struct *tsk, unsigned long addr,
89290 - void *buf, int len, int write)
89291 +ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
89292 + void *buf, size_t len, int write)
89293 {
89294 struct mm_struct *mm;
89295 - int ret;
89296 + ssize_t ret;
89297
89298 mm = get_task_mm(tsk);
89299 if (!mm)
89300 diff --git a/mm/mempolicy.c b/mm/mempolicy.c
89301 index 0472964..7d5a0ea 100644
89302 --- a/mm/mempolicy.c
89303 +++ b/mm/mempolicy.c
89304 @@ -746,6 +746,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
89305 unsigned long vmstart;
89306 unsigned long vmend;
89307
89308 +#ifdef CONFIG_PAX_SEGMEXEC
89309 + struct vm_area_struct *vma_m;
89310 +#endif
89311 +
89312 vma = find_vma(mm, start);
89313 if (!vma || vma->vm_start > start)
89314 return -EFAULT;
89315 @@ -789,6 +793,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
89316 err = vma_replace_policy(vma, new_pol);
89317 if (err)
89318 goto out;
89319 +
89320 +#ifdef CONFIG_PAX_SEGMEXEC
89321 + vma_m = pax_find_mirror_vma(vma);
89322 + if (vma_m) {
89323 + err = vma_replace_policy(vma_m, new_pol);
89324 + if (err)
89325 + goto out;
89326 + }
89327 +#endif
89328 +
89329 }
89330
89331 out:
89332 @@ -1252,6 +1266,17 @@ static long do_mbind(unsigned long start, unsigned long len,
89333
89334 if (end < start)
89335 return -EINVAL;
89336 +
89337 +#ifdef CONFIG_PAX_SEGMEXEC
89338 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
89339 + if (end > SEGMEXEC_TASK_SIZE)
89340 + return -EINVAL;
89341 + } else
89342 +#endif
89343 +
89344 + if (end > TASK_SIZE)
89345 + return -EINVAL;
89346 +
89347 if (end == start)
89348 return 0;
89349
89350 @@ -1480,8 +1505,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
89351 */
89352 tcred = __task_cred(task);
89353 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
89354 - !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
89355 - !capable(CAP_SYS_NICE)) {
89356 + !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
89357 rcu_read_unlock();
89358 err = -EPERM;
89359 goto out_put;
89360 @@ -1512,6 +1536,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
89361 goto out;
89362 }
89363
89364 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
89365 + if (mm != current->mm &&
89366 + (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
89367 + mmput(mm);
89368 + err = -EPERM;
89369 + goto out;
89370 + }
89371 +#endif
89372 +
89373 err = do_migrate_pages(mm, old, new,
89374 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
89375
89376 diff --git a/mm/migrate.c b/mm/migrate.c
89377 index c046927..6996b40 100644
89378 --- a/mm/migrate.c
89379 +++ b/mm/migrate.c
89380 @@ -1404,8 +1404,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
89381 */
89382 tcred = __task_cred(task);
89383 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
89384 - !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
89385 - !capable(CAP_SYS_NICE)) {
89386 + !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
89387 rcu_read_unlock();
89388 err = -EPERM;
89389 goto out;
89390 diff --git a/mm/mlock.c b/mm/mlock.c
89391 index d480cd6..0f98458 100644
89392 --- a/mm/mlock.c
89393 +++ b/mm/mlock.c
89394 @@ -14,6 +14,7 @@
89395 #include <linux/pagevec.h>
89396 #include <linux/mempolicy.h>
89397 #include <linux/syscalls.h>
89398 +#include <linux/security.h>
89399 #include <linux/sched.h>
89400 #include <linux/export.h>
89401 #include <linux/rmap.h>
89402 @@ -568,7 +569,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
89403 {
89404 unsigned long nstart, end, tmp;
89405 struct vm_area_struct * vma, * prev;
89406 - int error;
89407 + int error = 0;
89408
89409 VM_BUG_ON(start & ~PAGE_MASK);
89410 VM_BUG_ON(len != PAGE_ALIGN(len));
89411 @@ -577,6 +578,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
89412 return -EINVAL;
89413 if (end == start)
89414 return 0;
89415 + if (end > TASK_SIZE)
89416 + return -EINVAL;
89417 +
89418 vma = find_vma(current->mm, start);
89419 if (!vma || vma->vm_start > start)
89420 return -ENOMEM;
89421 @@ -588,6 +592,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
89422 for (nstart = start ; ; ) {
89423 vm_flags_t newflags;
89424
89425 +#ifdef CONFIG_PAX_SEGMEXEC
89426 + if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
89427 + break;
89428 +#endif
89429 +
89430 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
89431
89432 newflags = vma->vm_flags & ~VM_LOCKED;
89433 @@ -700,6 +709,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
89434 lock_limit >>= PAGE_SHIFT;
89435
89436 /* check against resource limits */
89437 + gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
89438 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
89439 error = do_mlock(start, len, 1);
89440 up_write(&current->mm->mmap_sem);
89441 @@ -734,6 +744,11 @@ static int do_mlockall(int flags)
89442 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
89443 vm_flags_t newflags;
89444
89445 +#ifdef CONFIG_PAX_SEGMEXEC
89446 + if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
89447 + break;
89448 +#endif
89449 +
89450 newflags = vma->vm_flags & ~VM_LOCKED;
89451 if (flags & MCL_CURRENT)
89452 newflags |= VM_LOCKED;
89453 @@ -767,6 +782,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
89454 lock_limit >>= PAGE_SHIFT;
89455
89456 ret = -ENOMEM;
89457 + gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
89458 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
89459 capable(CAP_IPC_LOCK))
89460 ret = do_mlockall(flags);
89461 diff --git a/mm/mmap.c b/mm/mmap.c
89462 index 362e5f1..8968e02 100644
89463 --- a/mm/mmap.c
89464 +++ b/mm/mmap.c
89465 @@ -36,6 +36,7 @@
89466 #include <linux/sched/sysctl.h>
89467 #include <linux/notifier.h>
89468 #include <linux/memory.h>
89469 +#include <linux/random.h>
89470
89471 #include <asm/uaccess.h>
89472 #include <asm/cacheflush.h>
89473 @@ -52,6 +53,16 @@
89474 #define arch_rebalance_pgtables(addr, len) (addr)
89475 #endif
89476
89477 +static inline void verify_mm_writelocked(struct mm_struct *mm)
89478 +{
89479 +#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
89480 + if (unlikely(down_read_trylock(&mm->mmap_sem))) {
89481 + up_read(&mm->mmap_sem);
89482 + BUG();
89483 + }
89484 +#endif
89485 +}
89486 +
89487 static void unmap_region(struct mm_struct *mm,
89488 struct vm_area_struct *vma, struct vm_area_struct *prev,
89489 unsigned long start, unsigned long end);
89490 @@ -71,16 +82,25 @@ static void unmap_region(struct mm_struct *mm,
89491 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
89492 *
89493 */
89494 -pgprot_t protection_map[16] = {
89495 +pgprot_t protection_map[16] __read_only = {
89496 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
89497 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
89498 };
89499
89500 -pgprot_t vm_get_page_prot(unsigned long vm_flags)
89501 +pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
89502 {
89503 - return __pgprot(pgprot_val(protection_map[vm_flags &
89504 + pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
89505 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
89506 pgprot_val(arch_vm_get_page_prot(vm_flags)));
89507 +
89508 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
89509 + if (!(__supported_pte_mask & _PAGE_NX) &&
89510 + (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
89511 + (vm_flags & (VM_READ | VM_WRITE)))
89512 + prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
89513 +#endif
89514 +
89515 + return prot;
89516 }
89517 EXPORT_SYMBOL(vm_get_page_prot);
89518
89519 @@ -89,6 +109,7 @@ int sysctl_overcommit_ratio __read_mostly = 50; /* default is 50% */
89520 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
89521 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
89522 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
89523 +unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
89524 /*
89525 * Make sure vm_committed_as in one cacheline and not cacheline shared with
89526 * other variables. It can be updated by several CPUs frequently.
89527 @@ -247,6 +268,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
89528 struct vm_area_struct *next = vma->vm_next;
89529
89530 might_sleep();
89531 + BUG_ON(vma->vm_mirror);
89532 if (vma->vm_ops && vma->vm_ops->close)
89533 vma->vm_ops->close(vma);
89534 if (vma->vm_file)
89535 @@ -291,6 +313,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
89536 * not page aligned -Ram Gupta
89537 */
89538 rlim = rlimit(RLIMIT_DATA);
89539 + gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
89540 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
89541 (mm->end_data - mm->start_data) > rlim)
89542 goto out;
89543 @@ -933,6 +956,12 @@ static int
89544 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
89545 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
89546 {
89547 +
89548 +#ifdef CONFIG_PAX_SEGMEXEC
89549 + if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
89550 + return 0;
89551 +#endif
89552 +
89553 if (is_mergeable_vma(vma, file, vm_flags) &&
89554 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
89555 if (vma->vm_pgoff == vm_pgoff)
89556 @@ -952,6 +981,12 @@ static int
89557 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
89558 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
89559 {
89560 +
89561 +#ifdef CONFIG_PAX_SEGMEXEC
89562 + if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
89563 + return 0;
89564 +#endif
89565 +
89566 if (is_mergeable_vma(vma, file, vm_flags) &&
89567 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
89568 pgoff_t vm_pglen;
89569 @@ -994,13 +1029,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
89570 struct vm_area_struct *vma_merge(struct mm_struct *mm,
89571 struct vm_area_struct *prev, unsigned long addr,
89572 unsigned long end, unsigned long vm_flags,
89573 - struct anon_vma *anon_vma, struct file *file,
89574 + struct anon_vma *anon_vma, struct file *file,
89575 pgoff_t pgoff, struct mempolicy *policy)
89576 {
89577 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
89578 struct vm_area_struct *area, *next;
89579 int err;
89580
89581 +#ifdef CONFIG_PAX_SEGMEXEC
89582 + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
89583 + struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
89584 +
89585 + BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
89586 +#endif
89587 +
89588 /*
89589 * We later require that vma->vm_flags == vm_flags,
89590 * so this tests vma->vm_flags & VM_SPECIAL, too.
89591 @@ -1016,6 +1058,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
89592 if (next && next->vm_end == end) /* cases 6, 7, 8 */
89593 next = next->vm_next;
89594
89595 +#ifdef CONFIG_PAX_SEGMEXEC
89596 + if (prev)
89597 + prev_m = pax_find_mirror_vma(prev);
89598 + if (area)
89599 + area_m = pax_find_mirror_vma(area);
89600 + if (next)
89601 + next_m = pax_find_mirror_vma(next);
89602 +#endif
89603 +
89604 /*
89605 * Can it merge with the predecessor?
89606 */
89607 @@ -1035,9 +1086,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
89608 /* cases 1, 6 */
89609 err = vma_adjust(prev, prev->vm_start,
89610 next->vm_end, prev->vm_pgoff, NULL);
89611 - } else /* cases 2, 5, 7 */
89612 +
89613 +#ifdef CONFIG_PAX_SEGMEXEC
89614 + if (!err && prev_m)
89615 + err = vma_adjust(prev_m, prev_m->vm_start,
89616 + next_m->vm_end, prev_m->vm_pgoff, NULL);
89617 +#endif
89618 +
89619 + } else { /* cases 2, 5, 7 */
89620 err = vma_adjust(prev, prev->vm_start,
89621 end, prev->vm_pgoff, NULL);
89622 +
89623 +#ifdef CONFIG_PAX_SEGMEXEC
89624 + if (!err && prev_m)
89625 + err = vma_adjust(prev_m, prev_m->vm_start,
89626 + end_m, prev_m->vm_pgoff, NULL);
89627 +#endif
89628 +
89629 + }
89630 if (err)
89631 return NULL;
89632 khugepaged_enter_vma_merge(prev);
89633 @@ -1051,12 +1117,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
89634 mpol_equal(policy, vma_policy(next)) &&
89635 can_vma_merge_before(next, vm_flags,
89636 anon_vma, file, pgoff+pglen)) {
89637 - if (prev && addr < prev->vm_end) /* case 4 */
89638 + if (prev && addr < prev->vm_end) { /* case 4 */
89639 err = vma_adjust(prev, prev->vm_start,
89640 addr, prev->vm_pgoff, NULL);
89641 - else /* cases 3, 8 */
89642 +
89643 +#ifdef CONFIG_PAX_SEGMEXEC
89644 + if (!err && prev_m)
89645 + err = vma_adjust(prev_m, prev_m->vm_start,
89646 + addr_m, prev_m->vm_pgoff, NULL);
89647 +#endif
89648 +
89649 + } else { /* cases 3, 8 */
89650 err = vma_adjust(area, addr, next->vm_end,
89651 next->vm_pgoff - pglen, NULL);
89652 +
89653 +#ifdef CONFIG_PAX_SEGMEXEC
89654 + if (!err && area_m)
89655 + err = vma_adjust(area_m, addr_m, next_m->vm_end,
89656 + next_m->vm_pgoff - pglen, NULL);
89657 +#endif
89658 +
89659 + }
89660 if (err)
89661 return NULL;
89662 khugepaged_enter_vma_merge(area);
89663 @@ -1165,8 +1246,10 @@ none:
89664 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
89665 struct file *file, long pages)
89666 {
89667 - const unsigned long stack_flags
89668 - = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
89669 +
89670 +#ifdef CONFIG_PAX_RANDMMAP
89671 + if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
89672 +#endif
89673
89674 mm->total_vm += pages;
89675
89676 @@ -1174,7 +1257,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
89677 mm->shared_vm += pages;
89678 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
89679 mm->exec_vm += pages;
89680 - } else if (flags & stack_flags)
89681 + } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
89682 mm->stack_vm += pages;
89683 }
89684 #endif /* CONFIG_PROC_FS */
89685 @@ -1212,7 +1295,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
89686 * (the exception is when the underlying filesystem is noexec
89687 * mounted, in which case we dont add PROT_EXEC.)
89688 */
89689 - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
89690 + if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
89691 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
89692 prot |= PROT_EXEC;
89693
89694 @@ -1238,7 +1321,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
89695 /* Obtain the address to map to. we verify (or select) it and ensure
89696 * that it represents a valid section of the address space.
89697 */
89698 - addr = get_unmapped_area(file, addr, len, pgoff, flags);
89699 + addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
89700 if (addr & ~PAGE_MASK)
89701 return addr;
89702
89703 @@ -1249,6 +1332,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
89704 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
89705 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
89706
89707 +#ifdef CONFIG_PAX_MPROTECT
89708 + if (mm->pax_flags & MF_PAX_MPROTECT) {
89709 +
89710 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
89711 + if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
89712 + mm->binfmt->handle_mmap)
89713 + mm->binfmt->handle_mmap(file);
89714 +#endif
89715 +
89716 +#ifndef CONFIG_PAX_MPROTECT_COMPAT
89717 + if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
89718 + gr_log_rwxmmap(file);
89719 +
89720 +#ifdef CONFIG_PAX_EMUPLT
89721 + vm_flags &= ~VM_EXEC;
89722 +#else
89723 + return -EPERM;
89724 +#endif
89725 +
89726 + }
89727 +
89728 + if (!(vm_flags & VM_EXEC))
89729 + vm_flags &= ~VM_MAYEXEC;
89730 +#else
89731 + if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
89732 + vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
89733 +#endif
89734 + else
89735 + vm_flags &= ~VM_MAYWRITE;
89736 + }
89737 +#endif
89738 +
89739 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
89740 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
89741 + vm_flags &= ~VM_PAGEEXEC;
89742 +#endif
89743 +
89744 if (flags & MAP_LOCKED)
89745 if (!can_do_mlock())
89746 return -EPERM;
89747 @@ -1260,6 +1380,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
89748 locked += mm->locked_vm;
89749 lock_limit = rlimit(RLIMIT_MEMLOCK);
89750 lock_limit >>= PAGE_SHIFT;
89751 + gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
89752 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
89753 return -EAGAIN;
89754 }
89755 @@ -1344,6 +1465,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
89756 vm_flags |= VM_NORESERVE;
89757 }
89758
89759 + if (!gr_acl_handle_mmap(file, prot))
89760 + return -EACCES;
89761 +
89762 addr = mmap_region(file, addr, len, vm_flags, pgoff);
89763 if (!IS_ERR_VALUE(addr) &&
89764 ((vm_flags & VM_LOCKED) ||
89765 @@ -1437,7 +1561,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
89766 vm_flags_t vm_flags = vma->vm_flags;
89767
89768 /* If it was private or non-writable, the write bit is already clear */
89769 - if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
89770 + if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
89771 return 0;
89772
89773 /* The backer wishes to know when pages are first written to? */
89774 @@ -1483,7 +1607,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
89775 struct rb_node **rb_link, *rb_parent;
89776 unsigned long charged = 0;
89777
89778 +#ifdef CONFIG_PAX_SEGMEXEC
89779 + struct vm_area_struct *vma_m = NULL;
89780 +#endif
89781 +
89782 + /*
89783 + * mm->mmap_sem is required to protect against another thread
89784 + * changing the mappings in case we sleep.
89785 + */
89786 + verify_mm_writelocked(mm);
89787 +
89788 /* Check against address space limit. */
89789 +
89790 +#ifdef CONFIG_PAX_RANDMMAP
89791 + if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
89792 +#endif
89793 +
89794 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
89795 unsigned long nr_pages;
89796
89797 @@ -1502,11 +1641,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
89798
89799 /* Clear old maps */
89800 error = -ENOMEM;
89801 -munmap_back:
89802 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
89803 if (do_munmap(mm, addr, len))
89804 return -ENOMEM;
89805 - goto munmap_back;
89806 + BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
89807 }
89808
89809 /*
89810 @@ -1537,6 +1675,16 @@ munmap_back:
89811 goto unacct_error;
89812 }
89813
89814 +#ifdef CONFIG_PAX_SEGMEXEC
89815 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
89816 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
89817 + if (!vma_m) {
89818 + error = -ENOMEM;
89819 + goto free_vma;
89820 + }
89821 + }
89822 +#endif
89823 +
89824 vma->vm_mm = mm;
89825 vma->vm_start = addr;
89826 vma->vm_end = addr + len;
89827 @@ -1556,6 +1704,13 @@ munmap_back:
89828 if (error)
89829 goto unmap_and_free_vma;
89830
89831 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
89832 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
89833 + vma->vm_flags |= VM_PAGEEXEC;
89834 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
89835 + }
89836 +#endif
89837 +
89838 /* Can addr have changed??
89839 *
89840 * Answer: Yes, several device drivers can do it in their
89841 @@ -1589,6 +1744,12 @@ munmap_back:
89842 }
89843
89844 vma_link(mm, vma, prev, rb_link, rb_parent);
89845 +
89846 +#ifdef CONFIG_PAX_SEGMEXEC
89847 + if (vma_m)
89848 + BUG_ON(pax_mirror_vma(vma_m, vma));
89849 +#endif
89850 +
89851 /* Once vma denies write, undo our temporary denial count */
89852 if (vm_flags & VM_DENYWRITE)
89853 allow_write_access(file);
89854 @@ -1597,6 +1758,7 @@ out:
89855 perf_event_mmap(vma);
89856
89857 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
89858 + track_exec_limit(mm, addr, addr + len, vm_flags);
89859 if (vm_flags & VM_LOCKED) {
89860 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
89861 vma == get_gate_vma(current->mm)))
89862 @@ -1629,6 +1791,12 @@ unmap_and_free_vma:
89863 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
89864 charged = 0;
89865 free_vma:
89866 +
89867 +#ifdef CONFIG_PAX_SEGMEXEC
89868 + if (vma_m)
89869 + kmem_cache_free(vm_area_cachep, vma_m);
89870 +#endif
89871 +
89872 kmem_cache_free(vm_area_cachep, vma);
89873 unacct_error:
89874 if (charged)
89875 @@ -1636,7 +1804,63 @@ unacct_error:
89876 return error;
89877 }
89878
89879 -unsigned long unmapped_area(struct vm_unmapped_area_info *info)
89880 +#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
89881 +unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
89882 +{
89883 + if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
89884 + return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
89885 +
89886 + return 0;
89887 +}
89888 +#endif
89889 +
89890 +bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
89891 +{
89892 + if (!vma) {
89893 +#ifdef CONFIG_STACK_GROWSUP
89894 + if (addr > sysctl_heap_stack_gap)
89895 + vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
89896 + else
89897 + vma = find_vma(current->mm, 0);
89898 + if (vma && (vma->vm_flags & VM_GROWSUP))
89899 + return false;
89900 +#endif
89901 + return true;
89902 + }
89903 +
89904 + if (addr + len > vma->vm_start)
89905 + return false;
89906 +
89907 + if (vma->vm_flags & VM_GROWSDOWN)
89908 + return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
89909 +#ifdef CONFIG_STACK_GROWSUP
89910 + else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
89911 + return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
89912 +#endif
89913 + else if (offset)
89914 + return offset <= vma->vm_start - addr - len;
89915 +
89916 + return true;
89917 +}
89918 +
89919 +unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
89920 +{
89921 + if (vma->vm_start < len)
89922 + return -ENOMEM;
89923 +
89924 + if (!(vma->vm_flags & VM_GROWSDOWN)) {
89925 + if (offset <= vma->vm_start - len)
89926 + return vma->vm_start - len - offset;
89927 + else
89928 + return -ENOMEM;
89929 + }
89930 +
89931 + if (sysctl_heap_stack_gap <= vma->vm_start - len)
89932 + return vma->vm_start - len - sysctl_heap_stack_gap;
89933 + return -ENOMEM;
89934 +}
89935 +
89936 +unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
89937 {
89938 /*
89939 * We implement the search by looking for an rbtree node that
89940 @@ -1684,11 +1908,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
89941 }
89942 }
89943
89944 - gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
89945 + gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
89946 check_current:
89947 /* Check if current node has a suitable gap */
89948 if (gap_start > high_limit)
89949 return -ENOMEM;
89950 +
89951 + if (gap_end - gap_start > info->threadstack_offset)
89952 + gap_start += info->threadstack_offset;
89953 + else
89954 + gap_start = gap_end;
89955 +
89956 + if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
89957 + if (gap_end - gap_start > sysctl_heap_stack_gap)
89958 + gap_start += sysctl_heap_stack_gap;
89959 + else
89960 + gap_start = gap_end;
89961 + }
89962 + if (vma->vm_flags & VM_GROWSDOWN) {
89963 + if (gap_end - gap_start > sysctl_heap_stack_gap)
89964 + gap_end -= sysctl_heap_stack_gap;
89965 + else
89966 + gap_end = gap_start;
89967 + }
89968 if (gap_end >= low_limit && gap_end - gap_start >= length)
89969 goto found;
89970
89971 @@ -1738,7 +1980,7 @@ found:
89972 return gap_start;
89973 }
89974
89975 -unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
89976 +unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
89977 {
89978 struct mm_struct *mm = current->mm;
89979 struct vm_area_struct *vma;
89980 @@ -1792,6 +2034,24 @@ check_current:
89981 gap_end = vma->vm_start;
89982 if (gap_end < low_limit)
89983 return -ENOMEM;
89984 +
89985 + if (gap_end - gap_start > info->threadstack_offset)
89986 + gap_end -= info->threadstack_offset;
89987 + else
89988 + gap_end = gap_start;
89989 +
89990 + if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
89991 + if (gap_end - gap_start > sysctl_heap_stack_gap)
89992 + gap_start += sysctl_heap_stack_gap;
89993 + else
89994 + gap_start = gap_end;
89995 + }
89996 + if (vma->vm_flags & VM_GROWSDOWN) {
89997 + if (gap_end - gap_start > sysctl_heap_stack_gap)
89998 + gap_end -= sysctl_heap_stack_gap;
89999 + else
90000 + gap_end = gap_start;
90001 + }
90002 if (gap_start <= high_limit && gap_end - gap_start >= length)
90003 goto found;
90004
90005 @@ -1855,6 +2115,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
90006 struct mm_struct *mm = current->mm;
90007 struct vm_area_struct *vma;
90008 struct vm_unmapped_area_info info;
90009 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
90010
90011 if (len > TASK_SIZE - mmap_min_addr)
90012 return -ENOMEM;
90013 @@ -1862,19 +2123,30 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
90014 if (flags & MAP_FIXED)
90015 return addr;
90016
90017 +#ifdef CONFIG_PAX_RANDMMAP
90018 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
90019 +#endif
90020 +
90021 if (addr) {
90022 addr = PAGE_ALIGN(addr);
90023 vma = find_vma(mm, addr);
90024 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
90025 - (!vma || addr + len <= vma->vm_start))
90026 + check_heap_stack_gap(vma, addr, len, offset))
90027 return addr;
90028 }
90029
90030 info.flags = 0;
90031 info.length = len;
90032 info.low_limit = TASK_UNMAPPED_BASE;
90033 +
90034 +#ifdef CONFIG_PAX_RANDMMAP
90035 + if (mm->pax_flags & MF_PAX_RANDMMAP)
90036 + info.low_limit += mm->delta_mmap;
90037 +#endif
90038 +
90039 info.high_limit = TASK_SIZE;
90040 info.align_mask = 0;
90041 + info.threadstack_offset = offset;
90042 return vm_unmapped_area(&info);
90043 }
90044 #endif
90045 @@ -1893,6 +2165,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
90046 struct mm_struct *mm = current->mm;
90047 unsigned long addr = addr0;
90048 struct vm_unmapped_area_info info;
90049 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
90050
90051 /* requested length too big for entire address space */
90052 if (len > TASK_SIZE - mmap_min_addr)
90053 @@ -1901,12 +2174,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
90054 if (flags & MAP_FIXED)
90055 return addr;
90056
90057 +#ifdef CONFIG_PAX_RANDMMAP
90058 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
90059 +#endif
90060 +
90061 /* requesting a specific address */
90062 if (addr) {
90063 addr = PAGE_ALIGN(addr);
90064 vma = find_vma(mm, addr);
90065 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
90066 - (!vma || addr + len <= vma->vm_start))
90067 + check_heap_stack_gap(vma, addr, len, offset))
90068 return addr;
90069 }
90070
90071 @@ -1915,6 +2192,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
90072 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
90073 info.high_limit = mm->mmap_base;
90074 info.align_mask = 0;
90075 + info.threadstack_offset = offset;
90076 addr = vm_unmapped_area(&info);
90077
90078 /*
90079 @@ -1927,6 +2205,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
90080 VM_BUG_ON(addr != -ENOMEM);
90081 info.flags = 0;
90082 info.low_limit = TASK_UNMAPPED_BASE;
90083 +
90084 +#ifdef CONFIG_PAX_RANDMMAP
90085 + if (mm->pax_flags & MF_PAX_RANDMMAP)
90086 + info.low_limit += mm->delta_mmap;
90087 +#endif
90088 +
90089 info.high_limit = TASK_SIZE;
90090 addr = vm_unmapped_area(&info);
90091 }
90092 @@ -2028,6 +2312,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
90093 return vma;
90094 }
90095
90096 +#ifdef CONFIG_PAX_SEGMEXEC
90097 +struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
90098 +{
90099 + struct vm_area_struct *vma_m;
90100 +
90101 + BUG_ON(!vma || vma->vm_start >= vma->vm_end);
90102 + if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
90103 + BUG_ON(vma->vm_mirror);
90104 + return NULL;
90105 + }
90106 + BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
90107 + vma_m = vma->vm_mirror;
90108 + BUG_ON(!vma_m || vma_m->vm_mirror != vma);
90109 + BUG_ON(vma->vm_file != vma_m->vm_file);
90110 + BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
90111 + BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
90112 + BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
90113 + BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
90114 + return vma_m;
90115 +}
90116 +#endif
90117 +
90118 /*
90119 * Verify that the stack growth is acceptable and
90120 * update accounting. This is shared with both the
90121 @@ -2044,6 +2350,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
90122 return -ENOMEM;
90123
90124 /* Stack limit test */
90125 + gr_learn_resource(current, RLIMIT_STACK, size, 1);
90126 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
90127 return -ENOMEM;
90128
90129 @@ -2054,6 +2361,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
90130 locked = mm->locked_vm + grow;
90131 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
90132 limit >>= PAGE_SHIFT;
90133 + gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
90134 if (locked > limit && !capable(CAP_IPC_LOCK))
90135 return -ENOMEM;
90136 }
90137 @@ -2083,37 +2391,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
90138 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
90139 * vma is the last one with address > vma->vm_end. Have to extend vma.
90140 */
90141 +#ifndef CONFIG_IA64
90142 +static
90143 +#endif
90144 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
90145 {
90146 int error;
90147 + bool locknext;
90148
90149 if (!(vma->vm_flags & VM_GROWSUP))
90150 return -EFAULT;
90151
90152 + /* Also guard against wrapping around to address 0. */
90153 + if (address < PAGE_ALIGN(address+1))
90154 + address = PAGE_ALIGN(address+1);
90155 + else
90156 + return -ENOMEM;
90157 +
90158 /*
90159 * We must make sure the anon_vma is allocated
90160 * so that the anon_vma locking is not a noop.
90161 */
90162 if (unlikely(anon_vma_prepare(vma)))
90163 return -ENOMEM;
90164 + locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
90165 + if (locknext && anon_vma_prepare(vma->vm_next))
90166 + return -ENOMEM;
90167 vma_lock_anon_vma(vma);
90168 + if (locknext)
90169 + vma_lock_anon_vma(vma->vm_next);
90170
90171 /*
90172 * vma->vm_start/vm_end cannot change under us because the caller
90173 * is required to hold the mmap_sem in read mode. We need the
90174 - * anon_vma lock to serialize against concurrent expand_stacks.
90175 - * Also guard against wrapping around to address 0.
90176 + * anon_vma locks to serialize against concurrent expand_stacks
90177 + * and expand_upwards.
90178 */
90179 - if (address < PAGE_ALIGN(address+4))
90180 - address = PAGE_ALIGN(address+4);
90181 - else {
90182 - vma_unlock_anon_vma(vma);
90183 - return -ENOMEM;
90184 - }
90185 error = 0;
90186
90187 /* Somebody else might have raced and expanded it already */
90188 - if (address > vma->vm_end) {
90189 + 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)
90190 + error = -ENOMEM;
90191 + else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
90192 unsigned long size, grow;
90193
90194 size = address - vma->vm_start;
90195 @@ -2148,6 +2467,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
90196 }
90197 }
90198 }
90199 + if (locknext)
90200 + vma_unlock_anon_vma(vma->vm_next);
90201 vma_unlock_anon_vma(vma);
90202 khugepaged_enter_vma_merge(vma);
90203 validate_mm(vma->vm_mm);
90204 @@ -2162,6 +2483,8 @@ int expand_downwards(struct vm_area_struct *vma,
90205 unsigned long address)
90206 {
90207 int error;
90208 + bool lockprev = false;
90209 + struct vm_area_struct *prev;
90210
90211 /*
90212 * We must make sure the anon_vma is allocated
90213 @@ -2175,6 +2498,15 @@ int expand_downwards(struct vm_area_struct *vma,
90214 if (error)
90215 return error;
90216
90217 + prev = vma->vm_prev;
90218 +#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
90219 + lockprev = prev && (prev->vm_flags & VM_GROWSUP);
90220 +#endif
90221 + if (lockprev && anon_vma_prepare(prev))
90222 + return -ENOMEM;
90223 + if (lockprev)
90224 + vma_lock_anon_vma(prev);
90225 +
90226 vma_lock_anon_vma(vma);
90227
90228 /*
90229 @@ -2184,9 +2516,17 @@ int expand_downwards(struct vm_area_struct *vma,
90230 */
90231
90232 /* Somebody else might have raced and expanded it already */
90233 - if (address < vma->vm_start) {
90234 + if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
90235 + error = -ENOMEM;
90236 + else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
90237 unsigned long size, grow;
90238
90239 +#ifdef CONFIG_PAX_SEGMEXEC
90240 + struct vm_area_struct *vma_m;
90241 +
90242 + vma_m = pax_find_mirror_vma(vma);
90243 +#endif
90244 +
90245 size = vma->vm_end - address;
90246 grow = (vma->vm_start - address) >> PAGE_SHIFT;
90247
90248 @@ -2211,13 +2551,27 @@ int expand_downwards(struct vm_area_struct *vma,
90249 vma->vm_pgoff -= grow;
90250 anon_vma_interval_tree_post_update_vma(vma);
90251 vma_gap_update(vma);
90252 +
90253 +#ifdef CONFIG_PAX_SEGMEXEC
90254 + if (vma_m) {
90255 + anon_vma_interval_tree_pre_update_vma(vma_m);
90256 + vma_m->vm_start -= grow << PAGE_SHIFT;
90257 + vma_m->vm_pgoff -= grow;
90258 + anon_vma_interval_tree_post_update_vma(vma_m);
90259 + vma_gap_update(vma_m);
90260 + }
90261 +#endif
90262 +
90263 spin_unlock(&vma->vm_mm->page_table_lock);
90264
90265 + track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
90266 perf_event_mmap(vma);
90267 }
90268 }
90269 }
90270 vma_unlock_anon_vma(vma);
90271 + if (lockprev)
90272 + vma_unlock_anon_vma(prev);
90273 khugepaged_enter_vma_merge(vma);
90274 validate_mm(vma->vm_mm);
90275 return error;
90276 @@ -2315,6 +2669,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
90277 do {
90278 long nrpages = vma_pages(vma);
90279
90280 +#ifdef CONFIG_PAX_SEGMEXEC
90281 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
90282 + vma = remove_vma(vma);
90283 + continue;
90284 + }
90285 +#endif
90286 +
90287 if (vma->vm_flags & VM_ACCOUNT)
90288 nr_accounted += nrpages;
90289 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
90290 @@ -2359,6 +2720,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
90291 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
90292 vma->vm_prev = NULL;
90293 do {
90294 +
90295 +#ifdef CONFIG_PAX_SEGMEXEC
90296 + if (vma->vm_mirror) {
90297 + BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
90298 + vma->vm_mirror->vm_mirror = NULL;
90299 + vma->vm_mirror->vm_flags &= ~VM_EXEC;
90300 + vma->vm_mirror = NULL;
90301 + }
90302 +#endif
90303 +
90304 vma_rb_erase(vma, &mm->mm_rb);
90305 mm->map_count--;
90306 tail_vma = vma;
90307 @@ -2384,14 +2755,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
90308 struct vm_area_struct *new;
90309 int err = -ENOMEM;
90310
90311 +#ifdef CONFIG_PAX_SEGMEXEC
90312 + struct vm_area_struct *vma_m, *new_m = NULL;
90313 + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
90314 +#endif
90315 +
90316 if (is_vm_hugetlb_page(vma) && (addr &
90317 ~(huge_page_mask(hstate_vma(vma)))))
90318 return -EINVAL;
90319
90320 +#ifdef CONFIG_PAX_SEGMEXEC
90321 + vma_m = pax_find_mirror_vma(vma);
90322 +#endif
90323 +
90324 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
90325 if (!new)
90326 goto out_err;
90327
90328 +#ifdef CONFIG_PAX_SEGMEXEC
90329 + if (vma_m) {
90330 + new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
90331 + if (!new_m) {
90332 + kmem_cache_free(vm_area_cachep, new);
90333 + goto out_err;
90334 + }
90335 + }
90336 +#endif
90337 +
90338 /* most fields are the same, copy all, and then fixup */
90339 *new = *vma;
90340
90341 @@ -2404,6 +2794,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
90342 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
90343 }
90344
90345 +#ifdef CONFIG_PAX_SEGMEXEC
90346 + if (vma_m) {
90347 + *new_m = *vma_m;
90348 + INIT_LIST_HEAD(&new_m->anon_vma_chain);
90349 + new_m->vm_mirror = new;
90350 + new->vm_mirror = new_m;
90351 +
90352 + if (new_below)
90353 + new_m->vm_end = addr_m;
90354 + else {
90355 + new_m->vm_start = addr_m;
90356 + new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
90357 + }
90358 + }
90359 +#endif
90360 +
90361 err = vma_dup_policy(vma, new);
90362 if (err)
90363 goto out_free_vma;
90364 @@ -2423,6 +2829,38 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
90365 else
90366 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
90367
90368 +#ifdef CONFIG_PAX_SEGMEXEC
90369 + if (!err && vma_m) {
90370 + struct mempolicy *pol = vma_policy(new);
90371 +
90372 + if (anon_vma_clone(new_m, vma_m))
90373 + goto out_free_mpol;
90374 +
90375 + mpol_get(pol);
90376 + set_vma_policy(new_m, pol);
90377 +
90378 + if (new_m->vm_file)
90379 + get_file(new_m->vm_file);
90380 +
90381 + if (new_m->vm_ops && new_m->vm_ops->open)
90382 + new_m->vm_ops->open(new_m);
90383 +
90384 + if (new_below)
90385 + err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
90386 + ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
90387 + else
90388 + err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
90389 +
90390 + if (err) {
90391 + if (new_m->vm_ops && new_m->vm_ops->close)
90392 + new_m->vm_ops->close(new_m);
90393 + if (new_m->vm_file)
90394 + fput(new_m->vm_file);
90395 + mpol_put(pol);
90396 + }
90397 + }
90398 +#endif
90399 +
90400 /* Success. */
90401 if (!err)
90402 return 0;
90403 @@ -2432,10 +2870,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
90404 new->vm_ops->close(new);
90405 if (new->vm_file)
90406 fput(new->vm_file);
90407 - unlink_anon_vmas(new);
90408 out_free_mpol:
90409 mpol_put(vma_policy(new));
90410 out_free_vma:
90411 +
90412 +#ifdef CONFIG_PAX_SEGMEXEC
90413 + if (new_m) {
90414 + unlink_anon_vmas(new_m);
90415 + kmem_cache_free(vm_area_cachep, new_m);
90416 + }
90417 +#endif
90418 +
90419 + unlink_anon_vmas(new);
90420 kmem_cache_free(vm_area_cachep, new);
90421 out_err:
90422 return err;
90423 @@ -2448,6 +2894,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
90424 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
90425 unsigned long addr, int new_below)
90426 {
90427 +
90428 +#ifdef CONFIG_PAX_SEGMEXEC
90429 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
90430 + BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
90431 + if (mm->map_count >= sysctl_max_map_count-1)
90432 + return -ENOMEM;
90433 + } else
90434 +#endif
90435 +
90436 if (mm->map_count >= sysctl_max_map_count)
90437 return -ENOMEM;
90438
90439 @@ -2459,11 +2914,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
90440 * work. This now handles partial unmappings.
90441 * Jeremy Fitzhardinge <jeremy@goop.org>
90442 */
90443 +#ifdef CONFIG_PAX_SEGMEXEC
90444 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
90445 {
90446 + int ret = __do_munmap(mm, start, len);
90447 + if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
90448 + return ret;
90449 +
90450 + return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
90451 +}
90452 +
90453 +int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
90454 +#else
90455 +int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
90456 +#endif
90457 +{
90458 unsigned long end;
90459 struct vm_area_struct *vma, *prev, *last;
90460
90461 + /*
90462 + * mm->mmap_sem is required to protect against another thread
90463 + * changing the mappings in case we sleep.
90464 + */
90465 + verify_mm_writelocked(mm);
90466 +
90467 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
90468 return -EINVAL;
90469
90470 @@ -2538,6 +3012,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
90471 /* Fix up all other VM information */
90472 remove_vma_list(mm, vma);
90473
90474 + track_exec_limit(mm, start, end, 0UL);
90475 +
90476 return 0;
90477 }
90478
90479 @@ -2546,6 +3022,13 @@ int vm_munmap(unsigned long start, size_t len)
90480 int ret;
90481 struct mm_struct *mm = current->mm;
90482
90483 +
90484 +#ifdef CONFIG_PAX_SEGMEXEC
90485 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
90486 + (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
90487 + return -EINVAL;
90488 +#endif
90489 +
90490 down_write(&mm->mmap_sem);
90491 ret = do_munmap(mm, start, len);
90492 up_write(&mm->mmap_sem);
90493 @@ -2559,16 +3042,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
90494 return vm_munmap(addr, len);
90495 }
90496
90497 -static inline void verify_mm_writelocked(struct mm_struct *mm)
90498 -{
90499 -#ifdef CONFIG_DEBUG_VM
90500 - if (unlikely(down_read_trylock(&mm->mmap_sem))) {
90501 - WARN_ON(1);
90502 - up_read(&mm->mmap_sem);
90503 - }
90504 -#endif
90505 -}
90506 -
90507 /*
90508 * this is really a simplified "do_mmap". it only handles
90509 * anonymous maps. eventually we may be able to do some
90510 @@ -2582,6 +3055,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
90511 struct rb_node ** rb_link, * rb_parent;
90512 pgoff_t pgoff = addr >> PAGE_SHIFT;
90513 int error;
90514 + unsigned long charged;
90515
90516 len = PAGE_ALIGN(len);
90517 if (!len)
90518 @@ -2589,16 +3063,30 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
90519
90520 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
90521
90522 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
90523 + if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
90524 + flags &= ~VM_EXEC;
90525 +
90526 +#ifdef CONFIG_PAX_MPROTECT
90527 + if (mm->pax_flags & MF_PAX_MPROTECT)
90528 + flags &= ~VM_MAYEXEC;
90529 +#endif
90530 +
90531 + }
90532 +#endif
90533 +
90534 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
90535 if (error & ~PAGE_MASK)
90536 return error;
90537
90538 + charged = len >> PAGE_SHIFT;
90539 +
90540 /*
90541 * mlock MCL_FUTURE?
90542 */
90543 if (mm->def_flags & VM_LOCKED) {
90544 unsigned long locked, lock_limit;
90545 - locked = len >> PAGE_SHIFT;
90546 + locked = charged;
90547 locked += mm->locked_vm;
90548 lock_limit = rlimit(RLIMIT_MEMLOCK);
90549 lock_limit >>= PAGE_SHIFT;
90550 @@ -2615,21 +3103,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
90551 /*
90552 * Clear old maps. this also does some error checking for us
90553 */
90554 - munmap_back:
90555 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
90556 if (do_munmap(mm, addr, len))
90557 return -ENOMEM;
90558 - goto munmap_back;
90559 + BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
90560 }
90561
90562 /* Check against address space limits *after* clearing old maps... */
90563 - if (!may_expand_vm(mm, len >> PAGE_SHIFT))
90564 + if (!may_expand_vm(mm, charged))
90565 return -ENOMEM;
90566
90567 if (mm->map_count > sysctl_max_map_count)
90568 return -ENOMEM;
90569
90570 - if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
90571 + if (security_vm_enough_memory_mm(mm, charged))
90572 return -ENOMEM;
90573
90574 /* Can we just expand an old private anonymous mapping? */
90575 @@ -2643,7 +3130,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
90576 */
90577 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
90578 if (!vma) {
90579 - vm_unacct_memory(len >> PAGE_SHIFT);
90580 + vm_unacct_memory(charged);
90581 return -ENOMEM;
90582 }
90583
90584 @@ -2657,10 +3144,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
90585 vma_link(mm, vma, prev, rb_link, rb_parent);
90586 out:
90587 perf_event_mmap(vma);
90588 - mm->total_vm += len >> PAGE_SHIFT;
90589 + mm->total_vm += charged;
90590 if (flags & VM_LOCKED)
90591 - mm->locked_vm += (len >> PAGE_SHIFT);
90592 + mm->locked_vm += charged;
90593 vma->vm_flags |= VM_SOFTDIRTY;
90594 + track_exec_limit(mm, addr, addr + len, flags);
90595 return addr;
90596 }
90597
90598 @@ -2722,6 +3210,7 @@ void exit_mmap(struct mm_struct *mm)
90599 while (vma) {
90600 if (vma->vm_flags & VM_ACCOUNT)
90601 nr_accounted += vma_pages(vma);
90602 + vma->vm_mirror = NULL;
90603 vma = remove_vma(vma);
90604 }
90605 vm_unacct_memory(nr_accounted);
90606 @@ -2738,6 +3227,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
90607 struct vm_area_struct *prev;
90608 struct rb_node **rb_link, *rb_parent;
90609
90610 +#ifdef CONFIG_PAX_SEGMEXEC
90611 + struct vm_area_struct *vma_m = NULL;
90612 +#endif
90613 +
90614 + if (security_mmap_addr(vma->vm_start))
90615 + return -EPERM;
90616 +
90617 /*
90618 * The vm_pgoff of a purely anonymous vma should be irrelevant
90619 * until its first write fault, when page's anon_vma and index
90620 @@ -2761,7 +3257,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
90621 security_vm_enough_memory_mm(mm, vma_pages(vma)))
90622 return -ENOMEM;
90623
90624 +#ifdef CONFIG_PAX_SEGMEXEC
90625 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
90626 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
90627 + if (!vma_m)
90628 + return -ENOMEM;
90629 + }
90630 +#endif
90631 +
90632 vma_link(mm, vma, prev, rb_link, rb_parent);
90633 +
90634 +#ifdef CONFIG_PAX_SEGMEXEC
90635 + if (vma_m)
90636 + BUG_ON(pax_mirror_vma(vma_m, vma));
90637 +#endif
90638 +
90639 return 0;
90640 }
90641
90642 @@ -2780,6 +3290,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
90643 struct rb_node **rb_link, *rb_parent;
90644 bool faulted_in_anon_vma = true;
90645
90646 + BUG_ON(vma->vm_mirror);
90647 +
90648 /*
90649 * If anonymous vma has not yet been faulted, update new pgoff
90650 * to match new location, to increase its chance of merging.
90651 @@ -2844,6 +3356,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
90652 return NULL;
90653 }
90654
90655 +#ifdef CONFIG_PAX_SEGMEXEC
90656 +long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
90657 +{
90658 + struct vm_area_struct *prev_m;
90659 + struct rb_node **rb_link_m, *rb_parent_m;
90660 + struct mempolicy *pol_m;
90661 +
90662 + BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
90663 + BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
90664 + BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
90665 + *vma_m = *vma;
90666 + INIT_LIST_HEAD(&vma_m->anon_vma_chain);
90667 + if (anon_vma_clone(vma_m, vma))
90668 + return -ENOMEM;
90669 + pol_m = vma_policy(vma_m);
90670 + mpol_get(pol_m);
90671 + set_vma_policy(vma_m, pol_m);
90672 + vma_m->vm_start += SEGMEXEC_TASK_SIZE;
90673 + vma_m->vm_end += SEGMEXEC_TASK_SIZE;
90674 + vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
90675 + vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
90676 + if (vma_m->vm_file)
90677 + get_file(vma_m->vm_file);
90678 + if (vma_m->vm_ops && vma_m->vm_ops->open)
90679 + vma_m->vm_ops->open(vma_m);
90680 + BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
90681 + vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
90682 + vma_m->vm_mirror = vma;
90683 + vma->vm_mirror = vma_m;
90684 + return 0;
90685 +}
90686 +#endif
90687 +
90688 /*
90689 * Return true if the calling process may expand its vm space by the passed
90690 * number of pages
90691 @@ -2855,6 +3400,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
90692
90693 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
90694
90695 + gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
90696 if (cur + npages > lim)
90697 return 0;
90698 return 1;
90699 @@ -2925,6 +3471,22 @@ int install_special_mapping(struct mm_struct *mm,
90700 vma->vm_start = addr;
90701 vma->vm_end = addr + len;
90702
90703 +#ifdef CONFIG_PAX_MPROTECT
90704 + if (mm->pax_flags & MF_PAX_MPROTECT) {
90705 +#ifndef CONFIG_PAX_MPROTECT_COMPAT
90706 + if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
90707 + return -EPERM;
90708 + if (!(vm_flags & VM_EXEC))
90709 + vm_flags &= ~VM_MAYEXEC;
90710 +#else
90711 + if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
90712 + vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
90713 +#endif
90714 + else
90715 + vm_flags &= ~VM_MAYWRITE;
90716 + }
90717 +#endif
90718 +
90719 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
90720 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
90721
90722 diff --git a/mm/mprotect.c b/mm/mprotect.c
90723 index 6c3f56f..b2340b0 100644
90724 --- a/mm/mprotect.c
90725 +++ b/mm/mprotect.c
90726 @@ -23,10 +23,18 @@
90727 #include <linux/mmu_notifier.h>
90728 #include <linux/migrate.h>
90729 #include <linux/perf_event.h>
90730 +#include <linux/sched/sysctl.h>
90731 +
90732 +#ifdef CONFIG_PAX_MPROTECT
90733 +#include <linux/elf.h>
90734 +#include <linux/binfmts.h>
90735 +#endif
90736 +
90737 #include <asm/uaccess.h>
90738 #include <asm/pgtable.h>
90739 #include <asm/cacheflush.h>
90740 #include <asm/tlbflush.h>
90741 +#include <asm/mmu_context.h>
90742
90743 #ifndef pgprot_modify
90744 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
90745 @@ -241,6 +249,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
90746 return pages;
90747 }
90748
90749 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
90750 +/* called while holding the mmap semaphor for writing except stack expansion */
90751 +void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
90752 +{
90753 + unsigned long oldlimit, newlimit = 0UL;
90754 +
90755 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
90756 + return;
90757 +
90758 + spin_lock(&mm->page_table_lock);
90759 + oldlimit = mm->context.user_cs_limit;
90760 + if ((prot & VM_EXEC) && oldlimit < end)
90761 + /* USER_CS limit moved up */
90762 + newlimit = end;
90763 + else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
90764 + /* USER_CS limit moved down */
90765 + newlimit = start;
90766 +
90767 + if (newlimit) {
90768 + mm->context.user_cs_limit = newlimit;
90769 +
90770 +#ifdef CONFIG_SMP
90771 + wmb();
90772 + cpus_clear(mm->context.cpu_user_cs_mask);
90773 + cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
90774 +#endif
90775 +
90776 + set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
90777 + }
90778 + spin_unlock(&mm->page_table_lock);
90779 + if (newlimit == end) {
90780 + struct vm_area_struct *vma = find_vma(mm, oldlimit);
90781 +
90782 + for (; vma && vma->vm_start < end; vma = vma->vm_next)
90783 + if (is_vm_hugetlb_page(vma))
90784 + hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
90785 + else
90786 + change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
90787 + }
90788 +}
90789 +#endif
90790 +
90791 int
90792 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
90793 unsigned long start, unsigned long end, unsigned long newflags)
90794 @@ -253,11 +303,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
90795 int error;
90796 int dirty_accountable = 0;
90797
90798 +#ifdef CONFIG_PAX_SEGMEXEC
90799 + struct vm_area_struct *vma_m = NULL;
90800 + unsigned long start_m, end_m;
90801 +
90802 + start_m = start + SEGMEXEC_TASK_SIZE;
90803 + end_m = end + SEGMEXEC_TASK_SIZE;
90804 +#endif
90805 +
90806 if (newflags == oldflags) {
90807 *pprev = vma;
90808 return 0;
90809 }
90810
90811 + if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
90812 + struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
90813 +
90814 + if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
90815 + return -ENOMEM;
90816 +
90817 + if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
90818 + return -ENOMEM;
90819 + }
90820 +
90821 /*
90822 * If we make a private mapping writable we increase our commit;
90823 * but (without finer accounting) cannot reduce our commit if we
90824 @@ -274,6 +342,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
90825 }
90826 }
90827
90828 +#ifdef CONFIG_PAX_SEGMEXEC
90829 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
90830 + if (start != vma->vm_start) {
90831 + error = split_vma(mm, vma, start, 1);
90832 + if (error)
90833 + goto fail;
90834 + BUG_ON(!*pprev || (*pprev)->vm_next == vma);
90835 + *pprev = (*pprev)->vm_next;
90836 + }
90837 +
90838 + if (end != vma->vm_end) {
90839 + error = split_vma(mm, vma, end, 0);
90840 + if (error)
90841 + goto fail;
90842 + }
90843 +
90844 + if (pax_find_mirror_vma(vma)) {
90845 + error = __do_munmap(mm, start_m, end_m - start_m);
90846 + if (error)
90847 + goto fail;
90848 + } else {
90849 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
90850 + if (!vma_m) {
90851 + error = -ENOMEM;
90852 + goto fail;
90853 + }
90854 + vma->vm_flags = newflags;
90855 + error = pax_mirror_vma(vma_m, vma);
90856 + if (error) {
90857 + vma->vm_flags = oldflags;
90858 + goto fail;
90859 + }
90860 + }
90861 + }
90862 +#endif
90863 +
90864 /*
90865 * First try to merge with previous and/or next vma.
90866 */
90867 @@ -304,9 +408,21 @@ success:
90868 * vm_flags and vm_page_prot are protected by the mmap_sem
90869 * held in write mode.
90870 */
90871 +
90872 +#ifdef CONFIG_PAX_SEGMEXEC
90873 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
90874 + pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
90875 +#endif
90876 +
90877 vma->vm_flags = newflags;
90878 +
90879 +#ifdef CONFIG_PAX_MPROTECT
90880 + if (mm->binfmt && mm->binfmt->handle_mprotect)
90881 + mm->binfmt->handle_mprotect(vma, newflags);
90882 +#endif
90883 +
90884 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
90885 - vm_get_page_prot(newflags));
90886 + vm_get_page_prot(vma->vm_flags));
90887
90888 if (vma_wants_writenotify(vma)) {
90889 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
90890 @@ -345,6 +461,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
90891 end = start + len;
90892 if (end <= start)
90893 return -ENOMEM;
90894 +
90895 +#ifdef CONFIG_PAX_SEGMEXEC
90896 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
90897 + if (end > SEGMEXEC_TASK_SIZE)
90898 + return -EINVAL;
90899 + } else
90900 +#endif
90901 +
90902 + if (end > TASK_SIZE)
90903 + return -EINVAL;
90904 +
90905 if (!arch_validate_prot(prot))
90906 return -EINVAL;
90907
90908 @@ -352,7 +479,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
90909 /*
90910 * Does the application expect PROT_READ to imply PROT_EXEC:
90911 */
90912 - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
90913 + if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
90914 prot |= PROT_EXEC;
90915
90916 vm_flags = calc_vm_prot_bits(prot);
90917 @@ -384,6 +511,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
90918 if (start > vma->vm_start)
90919 prev = vma;
90920
90921 +#ifdef CONFIG_PAX_MPROTECT
90922 + if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
90923 + current->mm->binfmt->handle_mprotect(vma, vm_flags);
90924 +#endif
90925 +
90926 for (nstart = start ; ; ) {
90927 unsigned long newflags;
90928
90929 @@ -394,6 +526,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
90930
90931 /* newflags >> 4 shift VM_MAY% in place of VM_% */
90932 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
90933 + if (prot & (PROT_WRITE | PROT_EXEC))
90934 + gr_log_rwxmprotect(vma);
90935 +
90936 + error = -EACCES;
90937 + goto out;
90938 + }
90939 +
90940 + if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
90941 error = -EACCES;
90942 goto out;
90943 }
90944 @@ -408,6 +548,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
90945 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
90946 if (error)
90947 goto out;
90948 +
90949 + track_exec_limit(current->mm, nstart, tmp, vm_flags);
90950 +
90951 nstart = tmp;
90952
90953 if (nstart < prev->vm_end)
90954 diff --git a/mm/mremap.c b/mm/mremap.c
90955 index 0843feb..4f5b2e6 100644
90956 --- a/mm/mremap.c
90957 +++ b/mm/mremap.c
90958 @@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
90959 continue;
90960 pte = ptep_get_and_clear(mm, old_addr, old_pte);
90961 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
90962 +
90963 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
90964 + if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
90965 + pte = pte_exprotect(pte);
90966 +#endif
90967 +
90968 pte = move_soft_dirty_pte(pte);
90969 set_pte_at(mm, new_addr, new_pte, pte);
90970 }
90971 @@ -337,6 +343,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
90972 if (is_vm_hugetlb_page(vma))
90973 goto Einval;
90974
90975 +#ifdef CONFIG_PAX_SEGMEXEC
90976 + if (pax_find_mirror_vma(vma))
90977 + goto Einval;
90978 +#endif
90979 +
90980 /* We can't remap across vm area boundaries */
90981 if (old_len > vma->vm_end - addr)
90982 goto Efault;
90983 @@ -392,20 +403,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
90984 unsigned long ret = -EINVAL;
90985 unsigned long charged = 0;
90986 unsigned long map_flags;
90987 + unsigned long pax_task_size = TASK_SIZE;
90988
90989 if (new_addr & ~PAGE_MASK)
90990 goto out;
90991
90992 - if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
90993 +#ifdef CONFIG_PAX_SEGMEXEC
90994 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
90995 + pax_task_size = SEGMEXEC_TASK_SIZE;
90996 +#endif
90997 +
90998 + pax_task_size -= PAGE_SIZE;
90999 +
91000 + if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
91001 goto out;
91002
91003 /* Check if the location we're moving into overlaps the
91004 * old location at all, and fail if it does.
91005 */
91006 - if ((new_addr <= addr) && (new_addr+new_len) > addr)
91007 - goto out;
91008 -
91009 - if ((addr <= new_addr) && (addr+old_len) > new_addr)
91010 + if (addr + old_len > new_addr && new_addr + new_len > addr)
91011 goto out;
91012
91013 ret = do_munmap(mm, new_addr, new_len);
91014 @@ -474,6 +490,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
91015 unsigned long ret = -EINVAL;
91016 unsigned long charged = 0;
91017 bool locked = false;
91018 + unsigned long pax_task_size = TASK_SIZE;
91019
91020 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
91021 return ret;
91022 @@ -495,6 +512,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
91023 if (!new_len)
91024 return ret;
91025
91026 +#ifdef CONFIG_PAX_SEGMEXEC
91027 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
91028 + pax_task_size = SEGMEXEC_TASK_SIZE;
91029 +#endif
91030 +
91031 + pax_task_size -= PAGE_SIZE;
91032 +
91033 + if (new_len > pax_task_size || addr > pax_task_size-new_len ||
91034 + old_len > pax_task_size || addr > pax_task_size-old_len)
91035 + return ret;
91036 +
91037 down_write(&current->mm->mmap_sem);
91038
91039 if (flags & MREMAP_FIXED) {
91040 @@ -545,6 +573,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
91041 new_addr = addr;
91042 }
91043 ret = addr;
91044 + track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
91045 goto out;
91046 }
91047 }
91048 @@ -568,7 +597,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
91049 goto out;
91050 }
91051
91052 + map_flags = vma->vm_flags;
91053 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
91054 + if (!(ret & ~PAGE_MASK)) {
91055 + track_exec_limit(current->mm, addr, addr + old_len, 0UL);
91056 + track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
91057 + }
91058 }
91059 out:
91060 if (ret & ~PAGE_MASK)
91061 diff --git a/mm/nommu.c b/mm/nommu.c
91062 index ecd1f15..77039bd 100644
91063 --- a/mm/nommu.c
91064 +++ b/mm/nommu.c
91065 @@ -64,7 +64,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
91066 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
91067 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
91068 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
91069 -int heap_stack_gap = 0;
91070
91071 atomic_long_t mmap_pages_allocated;
91072
91073 @@ -844,15 +843,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
91074 EXPORT_SYMBOL(find_vma);
91075
91076 /*
91077 - * find a VMA
91078 - * - we don't extend stack VMAs under NOMMU conditions
91079 - */
91080 -struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
91081 -{
91082 - return find_vma(mm, addr);
91083 -}
91084 -
91085 -/*
91086 * expand a stack to a given address
91087 * - not supported under NOMMU conditions
91088 */
91089 @@ -1563,6 +1553,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
91090
91091 /* most fields are the same, copy all, and then fixup */
91092 *new = *vma;
91093 + INIT_LIST_HEAD(&new->anon_vma_chain);
91094 *region = *vma->vm_region;
91095 new->vm_region = region;
91096
91097 @@ -1993,8 +1984,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
91098 }
91099 EXPORT_SYMBOL(generic_file_remap_pages);
91100
91101 -static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
91102 - unsigned long addr, void *buf, int len, int write)
91103 +static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
91104 + unsigned long addr, void *buf, size_t len, int write)
91105 {
91106 struct vm_area_struct *vma;
91107
91108 @@ -2035,8 +2026,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
91109 *
91110 * The caller must hold a reference on @mm.
91111 */
91112 -int access_remote_vm(struct mm_struct *mm, unsigned long addr,
91113 - void *buf, int len, int write)
91114 +ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
91115 + void *buf, size_t len, int write)
91116 {
91117 return __access_remote_vm(NULL, mm, addr, buf, len, write);
91118 }
91119 @@ -2045,7 +2036,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
91120 * Access another process' address space.
91121 * - source/target buffer must be kernel space
91122 */
91123 -int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
91124 +ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
91125 {
91126 struct mm_struct *mm;
91127
91128 diff --git a/mm/page-writeback.c b/mm/page-writeback.c
91129 index 6380758..4064aec 100644
91130 --- a/mm/page-writeback.c
91131 +++ b/mm/page-writeback.c
91132 @@ -690,7 +690,7 @@ static inline long long pos_ratio_polynom(unsigned long setpoint,
91133 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
91134 * - the bdi dirty thresh drops quickly due to change of JBOD workload
91135 */
91136 -static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
91137 +static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
91138 unsigned long thresh,
91139 unsigned long bg_thresh,
91140 unsigned long dirty,
91141 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
91142 index dd886fa..7686339 100644
91143 --- a/mm/page_alloc.c
91144 +++ b/mm/page_alloc.c
91145 @@ -61,6 +61,7 @@
91146 #include <linux/page-debug-flags.h>
91147 #include <linux/hugetlb.h>
91148 #include <linux/sched/rt.h>
91149 +#include <linux/random.h>
91150
91151 #include <asm/sections.h>
91152 #include <asm/tlbflush.h>
91153 @@ -354,7 +355,7 @@ out:
91154 * This usage means that zero-order pages may not be compound.
91155 */
91156
91157 -static void free_compound_page(struct page *page)
91158 +void free_compound_page(struct page *page)
91159 {
91160 __free_pages_ok(page, compound_order(page));
91161 }
91162 @@ -712,6 +713,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
91163 int i;
91164 int bad = 0;
91165
91166 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
91167 + unsigned long index = 1UL << order;
91168 +#endif
91169 +
91170 trace_mm_page_free(page, order);
91171 kmemcheck_free_shadow(page, order);
91172
91173 @@ -728,6 +733,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
91174 debug_check_no_obj_freed(page_address(page),
91175 PAGE_SIZE << order);
91176 }
91177 +
91178 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
91179 + for (; index; --index)
91180 + sanitize_highpage(page + index - 1);
91181 +#endif
91182 +
91183 arch_free_page(page, order);
91184 kernel_map_pages(page, 1 << order, 0);
91185
91186 @@ -750,6 +761,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
91187 local_irq_restore(flags);
91188 }
91189
91190 +#ifdef CONFIG_PAX_LATENT_ENTROPY
91191 +bool __meminitdata extra_latent_entropy;
91192 +
91193 +static int __init setup_pax_extra_latent_entropy(char *str)
91194 +{
91195 + extra_latent_entropy = true;
91196 + return 0;
91197 +}
91198 +early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
91199 +
91200 +volatile u64 latent_entropy __latent_entropy;
91201 +EXPORT_SYMBOL(latent_entropy);
91202 +#endif
91203 +
91204 void __init __free_pages_bootmem(struct page *page, unsigned int order)
91205 {
91206 unsigned int nr_pages = 1 << order;
91207 @@ -765,6 +790,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
91208 __ClearPageReserved(p);
91209 set_page_count(p, 0);
91210
91211 +#ifdef CONFIG_PAX_LATENT_ENTROPY
91212 + if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
91213 + u64 hash = 0;
91214 + size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
91215 + const u64 *data = lowmem_page_address(page);
91216 +
91217 + for (index = 0; index < end; index++)
91218 + hash ^= hash + data[index];
91219 + latent_entropy ^= hash;
91220 + add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
91221 + }
91222 +#endif
91223 +
91224 page_zone(page)->managed_pages += nr_pages;
91225 set_page_refcounted(page);
91226 __free_pages(page, order);
91227 @@ -870,8 +908,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
91228 arch_alloc_page(page, order);
91229 kernel_map_pages(page, 1 << order, 1);
91230
91231 +#ifndef CONFIG_PAX_MEMORY_SANITIZE
91232 if (gfp_flags & __GFP_ZERO)
91233 prep_zero_page(page, order, gfp_flags);
91234 +#endif
91235
91236 if (order && (gfp_flags & __GFP_COMP))
91237 prep_compound_page(page, order);
91238 diff --git a/mm/page_io.c b/mm/page_io.c
91239 index 8c79a47..a689e0d 100644
91240 --- a/mm/page_io.c
91241 +++ b/mm/page_io.c
91242 @@ -260,7 +260,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
91243 struct file *swap_file = sis->swap_file;
91244 struct address_space *mapping = swap_file->f_mapping;
91245 struct iovec iov = {
91246 - .iov_base = kmap(page),
91247 + .iov_base = (void __force_user *)kmap(page),
91248 .iov_len = PAGE_SIZE,
91249 };
91250
91251 diff --git a/mm/percpu.c b/mm/percpu.c
91252 index 8c8e08f..73a5cda 100644
91253 --- a/mm/percpu.c
91254 +++ b/mm/percpu.c
91255 @@ -122,7 +122,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
91256 static unsigned int pcpu_high_unit_cpu __read_mostly;
91257
91258 /* the address of the first chunk which starts with the kernel static area */
91259 -void *pcpu_base_addr __read_mostly;
91260 +void *pcpu_base_addr __read_only;
91261 EXPORT_SYMBOL_GPL(pcpu_base_addr);
91262
91263 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
91264 diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
91265 index fd26d04..0cea1b0 100644
91266 --- a/mm/process_vm_access.c
91267 +++ b/mm/process_vm_access.c
91268 @@ -13,6 +13,7 @@
91269 #include <linux/uio.h>
91270 #include <linux/sched.h>
91271 #include <linux/highmem.h>
91272 +#include <linux/security.h>
91273 #include <linux/ptrace.h>
91274 #include <linux/slab.h>
91275 #include <linux/syscalls.h>
91276 @@ -258,19 +259,19 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
91277 size_t iov_l_curr_offset = 0;
91278 ssize_t iov_len;
91279
91280 + return -ENOSYS; // PaX: until properly audited
91281 +
91282 /*
91283 * Work out how many pages of struct pages we're going to need
91284 * when eventually calling get_user_pages
91285 */
91286 for (i = 0; i < riovcnt; i++) {
91287 iov_len = rvec[i].iov_len;
91288 - if (iov_len > 0) {
91289 - nr_pages_iov = ((unsigned long)rvec[i].iov_base
91290 - + iov_len)
91291 - / PAGE_SIZE - (unsigned long)rvec[i].iov_base
91292 - / PAGE_SIZE + 1;
91293 - nr_pages = max(nr_pages, nr_pages_iov);
91294 - }
91295 + if (iov_len <= 0)
91296 + continue;
91297 + nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
91298 + (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
91299 + nr_pages = max(nr_pages, nr_pages_iov);
91300 }
91301
91302 if (nr_pages == 0)
91303 @@ -298,6 +299,11 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
91304 goto free_proc_pages;
91305 }
91306
91307 + if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
91308 + rc = -EPERM;
91309 + goto put_task_struct;
91310 + }
91311 +
91312 mm = mm_access(task, PTRACE_MODE_ATTACH);
91313 if (!mm || IS_ERR(mm)) {
91314 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
91315 diff --git a/mm/rmap.c b/mm/rmap.c
91316 index fd3ee7a..e4baa1f 100644
91317 --- a/mm/rmap.c
91318 +++ b/mm/rmap.c
91319 @@ -163,6 +163,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
91320 struct anon_vma *anon_vma = vma->anon_vma;
91321 struct anon_vma_chain *avc;
91322
91323 +#ifdef CONFIG_PAX_SEGMEXEC
91324 + struct anon_vma_chain *avc_m = NULL;
91325 +#endif
91326 +
91327 might_sleep();
91328 if (unlikely(!anon_vma)) {
91329 struct mm_struct *mm = vma->vm_mm;
91330 @@ -172,6 +176,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
91331 if (!avc)
91332 goto out_enomem;
91333
91334 +#ifdef CONFIG_PAX_SEGMEXEC
91335 + avc_m = anon_vma_chain_alloc(GFP_KERNEL);
91336 + if (!avc_m)
91337 + goto out_enomem_free_avc;
91338 +#endif
91339 +
91340 anon_vma = find_mergeable_anon_vma(vma);
91341 allocated = NULL;
91342 if (!anon_vma) {
91343 @@ -185,6 +195,18 @@ int anon_vma_prepare(struct vm_area_struct *vma)
91344 /* page_table_lock to protect against threads */
91345 spin_lock(&mm->page_table_lock);
91346 if (likely(!vma->anon_vma)) {
91347 +
91348 +#ifdef CONFIG_PAX_SEGMEXEC
91349 + struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
91350 +
91351 + if (vma_m) {
91352 + BUG_ON(vma_m->anon_vma);
91353 + vma_m->anon_vma = anon_vma;
91354 + anon_vma_chain_link(vma_m, avc_m, anon_vma);
91355 + avc_m = NULL;
91356 + }
91357 +#endif
91358 +
91359 vma->anon_vma = anon_vma;
91360 anon_vma_chain_link(vma, avc, anon_vma);
91361 allocated = NULL;
91362 @@ -195,12 +217,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
91363
91364 if (unlikely(allocated))
91365 put_anon_vma(allocated);
91366 +
91367 +#ifdef CONFIG_PAX_SEGMEXEC
91368 + if (unlikely(avc_m))
91369 + anon_vma_chain_free(avc_m);
91370 +#endif
91371 +
91372 if (unlikely(avc))
91373 anon_vma_chain_free(avc);
91374 }
91375 return 0;
91376
91377 out_enomem_free_avc:
91378 +
91379 +#ifdef CONFIG_PAX_SEGMEXEC
91380 + if (avc_m)
91381 + anon_vma_chain_free(avc_m);
91382 +#endif
91383 +
91384 anon_vma_chain_free(avc);
91385 out_enomem:
91386 return -ENOMEM;
91387 @@ -236,7 +270,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
91388 * Attach the anon_vmas from src to dst.
91389 * Returns 0 on success, -ENOMEM on failure.
91390 */
91391 -int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
91392 +int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
91393 {
91394 struct anon_vma_chain *avc, *pavc;
91395 struct anon_vma *root = NULL;
91396 @@ -269,7 +303,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
91397 * the corresponding VMA in the parent process is attached to.
91398 * Returns 0 on success, non-zero on failure.
91399 */
91400 -int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
91401 +int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
91402 {
91403 struct anon_vma_chain *avc;
91404 struct anon_vma *anon_vma;
91405 @@ -373,8 +407,10 @@ static void anon_vma_ctor(void *data)
91406 void __init anon_vma_init(void)
91407 {
91408 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
91409 - 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
91410 - anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
91411 + 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
91412 + anon_vma_ctor);
91413 + anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
91414 + SLAB_PANIC|SLAB_NO_SANITIZE);
91415 }
91416
91417 /*
91418 @@ -600,7 +636,11 @@ pte_t *__page_check_address(struct page *page, struct mm_struct *mm,
91419 spinlock_t *ptl;
91420
91421 if (unlikely(PageHuge(page))) {
91422 + /* when pud is not present, pte will be NULL */
91423 pte = huge_pte_offset(mm, address);
91424 + if (!pte)
91425 + return NULL;
91426 +
91427 ptl = &mm->page_table_lock;
91428 goto check;
91429 }
91430 diff --git a/mm/shmem.c b/mm/shmem.c
91431 index 8297623..6b9dfe9 100644
91432 --- a/mm/shmem.c
91433 +++ b/mm/shmem.c
91434 @@ -33,7 +33,7 @@
91435 #include <linux/swap.h>
91436 #include <linux/aio.h>
91437
91438 -static struct vfsmount *shm_mnt;
91439 +struct vfsmount *shm_mnt;
91440
91441 #ifdef CONFIG_SHMEM
91442 /*
91443 @@ -77,7 +77,7 @@ static struct vfsmount *shm_mnt;
91444 #define BOGO_DIRENT_SIZE 20
91445
91446 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
91447 -#define SHORT_SYMLINK_LEN 128
91448 +#define SHORT_SYMLINK_LEN 64
91449
91450 /*
91451 * shmem_fallocate and shmem_writepage communicate via inode->i_private
91452 @@ -2232,6 +2232,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
91453 static int shmem_xattr_validate(const char *name)
91454 {
91455 struct { const char *prefix; size_t len; } arr[] = {
91456 +
91457 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
91458 + { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
91459 +#endif
91460 +
91461 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
91462 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
91463 };
91464 @@ -2287,6 +2292,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
91465 if (err)
91466 return err;
91467
91468 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
91469 + if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
91470 + if (strcmp(name, XATTR_NAME_PAX_FLAGS))
91471 + return -EOPNOTSUPP;
91472 + if (size > 8)
91473 + return -EINVAL;
91474 + }
91475 +#endif
91476 +
91477 return simple_xattr_set(&info->xattrs, name, value, size, flags);
91478 }
91479
91480 @@ -2599,8 +2613,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
91481 int err = -ENOMEM;
91482
91483 /* Round up to L1_CACHE_BYTES to resist false sharing */
91484 - sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
91485 - L1_CACHE_BYTES), GFP_KERNEL);
91486 + sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
91487 if (!sbinfo)
91488 return -ENOMEM;
91489
91490 diff --git a/mm/slab.c b/mm/slab.c
91491 index 2580db0..0523956 100644
91492 --- a/mm/slab.c
91493 +++ b/mm/slab.c
91494 @@ -366,10 +366,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
91495 if ((x)->max_freeable < i) \
91496 (x)->max_freeable = i; \
91497 } while (0)
91498 -#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
91499 -#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
91500 -#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
91501 -#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
91502 +#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
91503 +#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
91504 +#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
91505 +#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
91506 +#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
91507 +#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
91508 #else
91509 #define STATS_INC_ACTIVE(x) do { } while (0)
91510 #define STATS_DEC_ACTIVE(x) do { } while (0)
91511 @@ -386,6 +388,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
91512 #define STATS_INC_ALLOCMISS(x) do { } while (0)
91513 #define STATS_INC_FREEHIT(x) do { } while (0)
91514 #define STATS_INC_FREEMISS(x) do { } while (0)
91515 +#define STATS_INC_SANITIZED(x) do { } while (0)
91516 +#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
91517 #endif
91518
91519 #if DEBUG
91520 @@ -477,7 +481,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
91521 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
91522 */
91523 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
91524 - const struct slab *slab, void *obj)
91525 + const struct slab *slab, const void *obj)
91526 {
91527 u32 offset = (obj - slab->s_mem);
91528 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
91529 @@ -1571,12 +1575,12 @@ void __init kmem_cache_init(void)
91530 */
91531
91532 kmalloc_caches[INDEX_AC] = create_kmalloc_cache("kmalloc-ac",
91533 - kmalloc_size(INDEX_AC), ARCH_KMALLOC_FLAGS);
91534 + kmalloc_size(INDEX_AC), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
91535
91536 if (INDEX_AC != INDEX_NODE)
91537 kmalloc_caches[INDEX_NODE] =
91538 create_kmalloc_cache("kmalloc-node",
91539 - kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
91540 + kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
91541
91542 slab_early_init = 0;
91543
91544 @@ -3577,6 +3581,21 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
91545 struct array_cache *ac = cpu_cache_get(cachep);
91546
91547 check_irq_off();
91548 +
91549 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
91550 + if (pax_sanitize_slab) {
91551 + if (!(cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))) {
91552 + memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
91553 +
91554 + if (cachep->ctor)
91555 + cachep->ctor(objp);
91556 +
91557 + STATS_INC_SANITIZED(cachep);
91558 + } else
91559 + STATS_INC_NOT_SANITIZED(cachep);
91560 + }
91561 +#endif
91562 +
91563 kmemleak_free_recursive(objp, cachep->flags);
91564 objp = cache_free_debugcheck(cachep, objp, caller);
91565
91566 @@ -3805,6 +3824,7 @@ void kfree(const void *objp)
91567
91568 if (unlikely(ZERO_OR_NULL_PTR(objp)))
91569 return;
91570 + VM_BUG_ON(!virt_addr_valid(objp));
91571 local_irq_save(flags);
91572 kfree_debugcheck(objp);
91573 c = virt_to_cache(objp);
91574 @@ -4246,14 +4266,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
91575 }
91576 /* cpu stats */
91577 {
91578 - unsigned long allochit = atomic_read(&cachep->allochit);
91579 - unsigned long allocmiss = atomic_read(&cachep->allocmiss);
91580 - unsigned long freehit = atomic_read(&cachep->freehit);
91581 - unsigned long freemiss = atomic_read(&cachep->freemiss);
91582 + unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
91583 + unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
91584 + unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
91585 + unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
91586
91587 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
91588 allochit, allocmiss, freehit, freemiss);
91589 }
91590 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
91591 + {
91592 + unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
91593 + unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
91594 +
91595 + seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
91596 + }
91597 +#endif
91598 #endif
91599 }
91600
91601 @@ -4471,13 +4499,71 @@ static const struct file_operations proc_slabstats_operations = {
91602 static int __init slab_proc_init(void)
91603 {
91604 #ifdef CONFIG_DEBUG_SLAB_LEAK
91605 - proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
91606 + proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
91607 #endif
91608 return 0;
91609 }
91610 module_init(slab_proc_init);
91611 #endif
91612
91613 +bool is_usercopy_object(const void *ptr)
91614 +{
91615 + struct page *page;
91616 + struct kmem_cache *cachep;
91617 +
91618 + if (ZERO_OR_NULL_PTR(ptr))
91619 + return false;
91620 +
91621 + if (!slab_is_available())
91622 + return false;
91623 +
91624 + if (!virt_addr_valid(ptr))
91625 + return false;
91626 +
91627 + page = virt_to_head_page(ptr);
91628 +
91629 + if (!PageSlab(page))
91630 + return false;
91631 +
91632 + cachep = page->slab_cache;
91633 + return cachep->flags & SLAB_USERCOPY;
91634 +}
91635 +
91636 +#ifdef CONFIG_PAX_USERCOPY
91637 +const char *check_heap_object(const void *ptr, unsigned long n)
91638 +{
91639 + struct page *page;
91640 + struct kmem_cache *cachep;
91641 + struct slab *slabp;
91642 + unsigned int objnr;
91643 + unsigned long offset;
91644 +
91645 + if (ZERO_OR_NULL_PTR(ptr))
91646 + return "<null>";
91647 +
91648 + if (!virt_addr_valid(ptr))
91649 + return NULL;
91650 +
91651 + page = virt_to_head_page(ptr);
91652 +
91653 + if (!PageSlab(page))
91654 + return NULL;
91655 +
91656 + cachep = page->slab_cache;
91657 + if (!(cachep->flags & SLAB_USERCOPY))
91658 + return cachep->name;
91659 +
91660 + slabp = page->slab_page;
91661 + objnr = obj_to_index(cachep, slabp, ptr);
91662 + BUG_ON(objnr >= cachep->num);
91663 + offset = ptr - index_to_obj(cachep, slabp, objnr) - obj_offset(cachep);
91664 + if (offset <= cachep->object_size && n <= cachep->object_size - offset)
91665 + return NULL;
91666 +
91667 + return cachep->name;
91668 +}
91669 +#endif
91670 +
91671 /**
91672 * ksize - get the actual amount of memory allocated for a given object
91673 * @objp: Pointer to the object
91674 diff --git a/mm/slab.h b/mm/slab.h
91675 index a535033..2f98fe5 100644
91676 --- a/mm/slab.h
91677 +++ b/mm/slab.h
91678 @@ -32,6 +32,15 @@ extern struct list_head slab_caches;
91679 /* The slab cache that manages slab cache information */
91680 extern struct kmem_cache *kmem_cache;
91681
91682 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
91683 +#ifdef CONFIG_X86_64
91684 +#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
91685 +#else
91686 +#define PAX_MEMORY_SANITIZE_VALUE '\xff'
91687 +#endif
91688 +extern bool pax_sanitize_slab;
91689 +#endif
91690 +
91691 unsigned long calculate_alignment(unsigned long flags,
91692 unsigned long align, unsigned long size);
91693
91694 @@ -67,7 +76,8 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
91695
91696 /* Legal flag mask for kmem_cache_create(), for various configurations */
91697 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
91698 - SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
91699 + SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
91700 + SLAB_USERCOPY | SLAB_NO_SANITIZE)
91701
91702 #if defined(CONFIG_DEBUG_SLAB)
91703 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
91704 @@ -231,6 +241,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
91705 return s;
91706
91707 page = virt_to_head_page(x);
91708 +
91709 + BUG_ON(!PageSlab(page));
91710 +
91711 cachep = page->slab_cache;
91712 if (slab_equal_or_root(cachep, s))
91713 return cachep;
91714 diff --git a/mm/slab_common.c b/mm/slab_common.c
91715 index e2e98af..3b1a163 100644
91716 --- a/mm/slab_common.c
91717 +++ b/mm/slab_common.c
91718 @@ -23,11 +23,22 @@
91719
91720 #include "slab.h"
91721
91722 -enum slab_state slab_state;
91723 +enum slab_state slab_state __read_only;
91724 LIST_HEAD(slab_caches);
91725 DEFINE_MUTEX(slab_mutex);
91726 struct kmem_cache *kmem_cache;
91727
91728 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
91729 +bool pax_sanitize_slab __read_only = true;
91730 +static int __init pax_sanitize_slab_setup(char *str)
91731 +{
91732 + pax_sanitize_slab = !!simple_strtol(str, NULL, 0);
91733 + printk("%sabled PaX slab sanitization\n", pax_sanitize_slab ? "En" : "Dis");
91734 + return 1;
91735 +}
91736 +__setup("pax_sanitize_slab=", pax_sanitize_slab_setup);
91737 +#endif
91738 +
91739 #ifdef CONFIG_DEBUG_VM
91740 static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name,
91741 size_t size)
91742 @@ -212,7 +223,7 @@ kmem_cache_create_memcg(struct mem_cgroup *memcg, const char *name, size_t size,
91743
91744 err = __kmem_cache_create(s, flags);
91745 if (!err) {
91746 - s->refcount = 1;
91747 + atomic_set(&s->refcount, 1);
91748 list_add(&s->list, &slab_caches);
91749 memcg_cache_list_add(memcg, s);
91750 } else {
91751 @@ -258,8 +269,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
91752
91753 get_online_cpus();
91754 mutex_lock(&slab_mutex);
91755 - s->refcount--;
91756 - if (!s->refcount) {
91757 + if (atomic_dec_and_test(&s->refcount)) {
91758 list_del(&s->list);
91759
91760 if (!__kmem_cache_shutdown(s)) {
91761 @@ -305,7 +315,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
91762 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
91763 name, size, err);
91764
91765 - s->refcount = -1; /* Exempt from merging for now */
91766 + atomic_set(&s->refcount, -1); /* Exempt from merging for now */
91767 }
91768
91769 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
91770 @@ -318,7 +328,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
91771
91772 create_boot_cache(s, name, size, flags);
91773 list_add(&s->list, &slab_caches);
91774 - s->refcount = 1;
91775 + atomic_set(&s->refcount, 1);
91776 return s;
91777 }
91778
91779 @@ -330,6 +340,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
91780 EXPORT_SYMBOL(kmalloc_dma_caches);
91781 #endif
91782
91783 +#ifdef CONFIG_PAX_USERCOPY_SLABS
91784 +struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
91785 +EXPORT_SYMBOL(kmalloc_usercopy_caches);
91786 +#endif
91787 +
91788 /*
91789 * Conversion table for small slabs sizes / 8 to the index in the
91790 * kmalloc array. This is necessary for slabs < 192 since we have non power
91791 @@ -394,6 +409,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
91792 return kmalloc_dma_caches[index];
91793
91794 #endif
91795 +
91796 +#ifdef CONFIG_PAX_USERCOPY_SLABS
91797 + if (unlikely((flags & GFP_USERCOPY)))
91798 + return kmalloc_usercopy_caches[index];
91799 +
91800 +#endif
91801 +
91802 return kmalloc_caches[index];
91803 }
91804
91805 @@ -450,7 +472,7 @@ void __init create_kmalloc_caches(unsigned long flags)
91806 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
91807 if (!kmalloc_caches[i]) {
91808 kmalloc_caches[i] = create_kmalloc_cache(NULL,
91809 - 1 << i, flags);
91810 + 1 << i, SLAB_USERCOPY | flags);
91811 }
91812
91813 /*
91814 @@ -459,10 +481,10 @@ void __init create_kmalloc_caches(unsigned long flags)
91815 * earlier power of two caches
91816 */
91817 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
91818 - kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
91819 + kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
91820
91821 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
91822 - kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
91823 + kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
91824 }
91825
91826 /* Kmalloc array is now usable */
91827 @@ -495,6 +517,23 @@ void __init create_kmalloc_caches(unsigned long flags)
91828 }
91829 }
91830 #endif
91831 +
91832 +#ifdef CONFIG_PAX_USERCOPY_SLABS
91833 + for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
91834 + struct kmem_cache *s = kmalloc_caches[i];
91835 +
91836 + if (s) {
91837 + int size = kmalloc_size(i);
91838 + char *n = kasprintf(GFP_NOWAIT,
91839 + "usercopy-kmalloc-%d", size);
91840 +
91841 + BUG_ON(!n);
91842 + kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
91843 + size, SLAB_USERCOPY | flags);
91844 + }
91845 + }
91846 +#endif
91847 +
91848 }
91849 #endif /* !CONFIG_SLOB */
91850
91851 @@ -535,6 +574,9 @@ void print_slabinfo_header(struct seq_file *m)
91852 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
91853 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
91854 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
91855 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
91856 + seq_puts(m, " : pax <sanitized> <not_sanitized>");
91857 +#endif
91858 #endif
91859 seq_putc(m, '\n');
91860 }
91861 diff --git a/mm/slob.c b/mm/slob.c
91862 index 4bf8809..98a6914 100644
91863 --- a/mm/slob.c
91864 +++ b/mm/slob.c
91865 @@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
91866 /*
91867 * Return the size of a slob block.
91868 */
91869 -static slobidx_t slob_units(slob_t *s)
91870 +static slobidx_t slob_units(const slob_t *s)
91871 {
91872 if (s->units > 0)
91873 return s->units;
91874 @@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
91875 /*
91876 * Return the next free slob block pointer after this one.
91877 */
91878 -static slob_t *slob_next(slob_t *s)
91879 +static slob_t *slob_next(const slob_t *s)
91880 {
91881 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
91882 slobidx_t next;
91883 @@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
91884 /*
91885 * Returns true if s is the last free block in its page.
91886 */
91887 -static int slob_last(slob_t *s)
91888 +static int slob_last(const slob_t *s)
91889 {
91890 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
91891 }
91892
91893 -static void *slob_new_pages(gfp_t gfp, int order, int node)
91894 +static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
91895 {
91896 - void *page;
91897 + struct page *page;
91898
91899 #ifdef CONFIG_NUMA
91900 if (node != NUMA_NO_NODE)
91901 @@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
91902 if (!page)
91903 return NULL;
91904
91905 - return page_address(page);
91906 + __SetPageSlab(page);
91907 + return page;
91908 }
91909
91910 -static void slob_free_pages(void *b, int order)
91911 +static void slob_free_pages(struct page *sp, int order)
91912 {
91913 if (current->reclaim_state)
91914 current->reclaim_state->reclaimed_slab += 1 << order;
91915 - free_pages((unsigned long)b, order);
91916 + __ClearPageSlab(sp);
91917 + page_mapcount_reset(sp);
91918 + sp->private = 0;
91919 + __free_pages(sp, order);
91920 }
91921
91922 /*
91923 @@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
91924
91925 /* Not enough space: must allocate a new page */
91926 if (!b) {
91927 - b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
91928 - if (!b)
91929 + sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
91930 + if (!sp)
91931 return NULL;
91932 - sp = virt_to_page(b);
91933 - __SetPageSlab(sp);
91934 + b = page_address(sp);
91935
91936 spin_lock_irqsave(&slob_lock, flags);
91937 sp->units = SLOB_UNITS(PAGE_SIZE);
91938 sp->freelist = b;
91939 + sp->private = 0;
91940 INIT_LIST_HEAD(&sp->list);
91941 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
91942 set_slob_page_free(sp, slob_list);
91943 @@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
91944 if (slob_page_free(sp))
91945 clear_slob_page_free(sp);
91946 spin_unlock_irqrestore(&slob_lock, flags);
91947 - __ClearPageSlab(sp);
91948 - page_mapcount_reset(sp);
91949 - slob_free_pages(b, 0);
91950 + slob_free_pages(sp, 0);
91951 return;
91952 }
91953
91954 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
91955 + if (pax_sanitize_slab)
91956 + memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
91957 +#endif
91958 +
91959 if (!slob_page_free(sp)) {
91960 /* This slob page is about to become partially free. Easy! */
91961 sp->units = units;
91962 @@ -424,11 +431,10 @@ out:
91963 */
91964
91965 static __always_inline void *
91966 -__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
91967 +__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
91968 {
91969 - unsigned int *m;
91970 - int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
91971 - void *ret;
91972 + slob_t *m;
91973 + void *ret = NULL;
91974
91975 gfp &= gfp_allowed_mask;
91976
91977 @@ -442,23 +448,41 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
91978
91979 if (!m)
91980 return NULL;
91981 - *m = size;
91982 + BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
91983 + BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
91984 + m[0].units = size;
91985 + m[1].units = align;
91986 ret = (void *)m + align;
91987
91988 trace_kmalloc_node(caller, ret,
91989 size, size + align, gfp, node);
91990 } else {
91991 unsigned int order = get_order(size);
91992 + struct page *page;
91993
91994 if (likely(order))
91995 gfp |= __GFP_COMP;
91996 - ret = slob_new_pages(gfp, order, node);
91997 + page = slob_new_pages(gfp, order, node);
91998 + if (page) {
91999 + ret = page_address(page);
92000 + page->private = size;
92001 + }
92002
92003 trace_kmalloc_node(caller, ret,
92004 size, PAGE_SIZE << order, gfp, node);
92005 }
92006
92007 - kmemleak_alloc(ret, size, 1, gfp);
92008 + return ret;
92009 +}
92010 +
92011 +static __always_inline void *
92012 +__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
92013 +{
92014 + int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
92015 + void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
92016 +
92017 + if (!ZERO_OR_NULL_PTR(ret))
92018 + kmemleak_alloc(ret, size, 1, gfp);
92019 return ret;
92020 }
92021
92022 @@ -493,34 +517,112 @@ void kfree(const void *block)
92023 return;
92024 kmemleak_free(block);
92025
92026 + VM_BUG_ON(!virt_addr_valid(block));
92027 sp = virt_to_page(block);
92028 - if (PageSlab(sp)) {
92029 + VM_BUG_ON(!PageSlab(sp));
92030 + if (!sp->private) {
92031 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
92032 - unsigned int *m = (unsigned int *)(block - align);
92033 - slob_free(m, *m + align);
92034 - } else
92035 + slob_t *m = (slob_t *)(block - align);
92036 + slob_free(m, m[0].units + align);
92037 + } else {
92038 + __ClearPageSlab(sp);
92039 + page_mapcount_reset(sp);
92040 + sp->private = 0;
92041 __free_pages(sp, compound_order(sp));
92042 + }
92043 }
92044 EXPORT_SYMBOL(kfree);
92045
92046 +bool is_usercopy_object(const void *ptr)
92047 +{
92048 + if (!slab_is_available())
92049 + return false;
92050 +
92051 + // PAX: TODO
92052 +
92053 + return false;
92054 +}
92055 +
92056 +#ifdef CONFIG_PAX_USERCOPY
92057 +const char *check_heap_object(const void *ptr, unsigned long n)
92058 +{
92059 + struct page *page;
92060 + const slob_t *free;
92061 + const void *base;
92062 + unsigned long flags;
92063 +
92064 + if (ZERO_OR_NULL_PTR(ptr))
92065 + return "<null>";
92066 +
92067 + if (!virt_addr_valid(ptr))
92068 + return NULL;
92069 +
92070 + page = virt_to_head_page(ptr);
92071 + if (!PageSlab(page))
92072 + return NULL;
92073 +
92074 + if (page->private) {
92075 + base = page;
92076 + if (base <= ptr && n <= page->private - (ptr - base))
92077 + return NULL;
92078 + return "<slob>";
92079 + }
92080 +
92081 + /* some tricky double walking to find the chunk */
92082 + spin_lock_irqsave(&slob_lock, flags);
92083 + base = (void *)((unsigned long)ptr & PAGE_MASK);
92084 + free = page->freelist;
92085 +
92086 + while (!slob_last(free) && (void *)free <= ptr) {
92087 + base = free + slob_units(free);
92088 + free = slob_next(free);
92089 + }
92090 +
92091 + while (base < (void *)free) {
92092 + slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
92093 + int size = SLOB_UNIT * SLOB_UNITS(m + align);
92094 + int offset;
92095 +
92096 + if (ptr < base + align)
92097 + break;
92098 +
92099 + offset = ptr - base - align;
92100 + if (offset >= m) {
92101 + base += size;
92102 + continue;
92103 + }
92104 +
92105 + if (n > m - offset)
92106 + break;
92107 +
92108 + spin_unlock_irqrestore(&slob_lock, flags);
92109 + return NULL;
92110 + }
92111 +
92112 + spin_unlock_irqrestore(&slob_lock, flags);
92113 + return "<slob>";
92114 +}
92115 +#endif
92116 +
92117 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
92118 size_t ksize(const void *block)
92119 {
92120 struct page *sp;
92121 int align;
92122 - unsigned int *m;
92123 + slob_t *m;
92124
92125 BUG_ON(!block);
92126 if (unlikely(block == ZERO_SIZE_PTR))
92127 return 0;
92128
92129 sp = virt_to_page(block);
92130 - if (unlikely(!PageSlab(sp)))
92131 - return PAGE_SIZE << compound_order(sp);
92132 + VM_BUG_ON(!PageSlab(sp));
92133 + if (sp->private)
92134 + return sp->private;
92135
92136 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
92137 - m = (unsigned int *)(block - align);
92138 - return SLOB_UNITS(*m) * SLOB_UNIT;
92139 + m = (slob_t *)(block - align);
92140 + return SLOB_UNITS(m[0].units) * SLOB_UNIT;
92141 }
92142 EXPORT_SYMBOL(ksize);
92143
92144 @@ -536,23 +638,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
92145
92146 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
92147 {
92148 - void *b;
92149 + void *b = NULL;
92150
92151 flags &= gfp_allowed_mask;
92152
92153 lockdep_trace_alloc(flags);
92154
92155 +#ifdef CONFIG_PAX_USERCOPY_SLABS
92156 + b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
92157 +#else
92158 if (c->size < PAGE_SIZE) {
92159 b = slob_alloc(c->size, flags, c->align, node);
92160 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
92161 SLOB_UNITS(c->size) * SLOB_UNIT,
92162 flags, node);
92163 } else {
92164 - b = slob_new_pages(flags, get_order(c->size), node);
92165 + struct page *sp;
92166 +
92167 + sp = slob_new_pages(flags, get_order(c->size), node);
92168 + if (sp) {
92169 + b = page_address(sp);
92170 + sp->private = c->size;
92171 + }
92172 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
92173 PAGE_SIZE << get_order(c->size),
92174 flags, node);
92175 }
92176 +#endif
92177
92178 if (b && c->ctor)
92179 c->ctor(b);
92180 @@ -584,10 +696,14 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
92181
92182 static void __kmem_cache_free(void *b, int size)
92183 {
92184 - if (size < PAGE_SIZE)
92185 + struct page *sp;
92186 +
92187 + sp = virt_to_page(b);
92188 + BUG_ON(!PageSlab(sp));
92189 + if (!sp->private)
92190 slob_free(b, size);
92191 else
92192 - slob_free_pages(b, get_order(size));
92193 + slob_free_pages(sp, get_order(size));
92194 }
92195
92196 static void kmem_rcu_free(struct rcu_head *head)
92197 @@ -600,17 +716,31 @@ static void kmem_rcu_free(struct rcu_head *head)
92198
92199 void kmem_cache_free(struct kmem_cache *c, void *b)
92200 {
92201 + int size = c->size;
92202 +
92203 +#ifdef CONFIG_PAX_USERCOPY_SLABS
92204 + if (size + c->align < PAGE_SIZE) {
92205 + size += c->align;
92206 + b -= c->align;
92207 + }
92208 +#endif
92209 +
92210 kmemleak_free_recursive(b, c->flags);
92211 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
92212 struct slob_rcu *slob_rcu;
92213 - slob_rcu = b + (c->size - sizeof(struct slob_rcu));
92214 - slob_rcu->size = c->size;
92215 + slob_rcu = b + (size - sizeof(struct slob_rcu));
92216 + slob_rcu->size = size;
92217 call_rcu(&slob_rcu->head, kmem_rcu_free);
92218 } else {
92219 - __kmem_cache_free(b, c->size);
92220 + __kmem_cache_free(b, size);
92221 }
92222
92223 +#ifdef CONFIG_PAX_USERCOPY_SLABS
92224 + trace_kfree(_RET_IP_, b);
92225 +#else
92226 trace_kmem_cache_free(_RET_IP_, b);
92227 +#endif
92228 +
92229 }
92230 EXPORT_SYMBOL(kmem_cache_free);
92231
92232 diff --git a/mm/slub.c b/mm/slub.c
92233 index 96f2169..9111a59 100644
92234 --- a/mm/slub.c
92235 +++ b/mm/slub.c
92236 @@ -207,7 +207,7 @@ struct track {
92237
92238 enum track_item { TRACK_ALLOC, TRACK_FREE };
92239
92240 -#ifdef CONFIG_SYSFS
92241 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
92242 static int sysfs_slab_add(struct kmem_cache *);
92243 static int sysfs_slab_alias(struct kmem_cache *, const char *);
92244 static void sysfs_slab_remove(struct kmem_cache *);
92245 @@ -530,7 +530,7 @@ static void print_track(const char *s, struct track *t)
92246 if (!t->addr)
92247 return;
92248
92249 - printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
92250 + printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
92251 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
92252 #ifdef CONFIG_STACKTRACE
92253 {
92254 @@ -2616,6 +2616,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
92255
92256 slab_free_hook(s, x);
92257
92258 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
92259 + if (pax_sanitize_slab && !(s->flags & SLAB_NO_SANITIZE)) {
92260 + memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
92261 + if (s->ctor)
92262 + s->ctor(x);
92263 + }
92264 +#endif
92265 +
92266 redo:
92267 /*
92268 * Determine the currently cpus per cpu slab.
92269 @@ -2683,7 +2691,7 @@ static int slub_min_objects;
92270 * Merge control. If this is set then no merging of slab caches will occur.
92271 * (Could be removed. This was introduced to pacify the merge skeptics.)
92272 */
92273 -static int slub_nomerge;
92274 +static int slub_nomerge = 1;
92275
92276 /*
92277 * Calculate the order of allocation given an slab object size.
92278 @@ -2960,6 +2968,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
92279 s->inuse = size;
92280
92281 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
92282 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
92283 + (pax_sanitize_slab && !(flags & SLAB_NO_SANITIZE)) ||
92284 +#endif
92285 s->ctor)) {
92286 /*
92287 * Relocate free pointer after the object if it is not
92288 @@ -3305,6 +3316,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
92289 EXPORT_SYMBOL(__kmalloc_node);
92290 #endif
92291
92292 +bool is_usercopy_object(const void *ptr)
92293 +{
92294 + struct page *page;
92295 + struct kmem_cache *s;
92296 +
92297 + if (ZERO_OR_NULL_PTR(ptr))
92298 + return false;
92299 +
92300 + if (!slab_is_available())
92301 + return false;
92302 +
92303 + if (!virt_addr_valid(ptr))
92304 + return false;
92305 +
92306 + page = virt_to_head_page(ptr);
92307 +
92308 + if (!PageSlab(page))
92309 + return false;
92310 +
92311 + s = page->slab_cache;
92312 + return s->flags & SLAB_USERCOPY;
92313 +}
92314 +
92315 +#ifdef CONFIG_PAX_USERCOPY
92316 +const char *check_heap_object(const void *ptr, unsigned long n)
92317 +{
92318 + struct page *page;
92319 + struct kmem_cache *s;
92320 + unsigned long offset;
92321 +
92322 + if (ZERO_OR_NULL_PTR(ptr))
92323 + return "<null>";
92324 +
92325 + if (!virt_addr_valid(ptr))
92326 + return NULL;
92327 +
92328 + page = virt_to_head_page(ptr);
92329 +
92330 + if (!PageSlab(page))
92331 + return NULL;
92332 +
92333 + s = page->slab_cache;
92334 + if (!(s->flags & SLAB_USERCOPY))
92335 + return s->name;
92336 +
92337 + offset = (ptr - page_address(page)) % s->size;
92338 + if (offset <= s->object_size && n <= s->object_size - offset)
92339 + return NULL;
92340 +
92341 + return s->name;
92342 +}
92343 +#endif
92344 +
92345 size_t ksize(const void *object)
92346 {
92347 struct page *page;
92348 @@ -3333,6 +3397,7 @@ void kfree(const void *x)
92349 if (unlikely(ZERO_OR_NULL_PTR(x)))
92350 return;
92351
92352 + VM_BUG_ON(!virt_addr_valid(x));
92353 page = virt_to_head_page(x);
92354 if (unlikely(!PageSlab(page))) {
92355 BUG_ON(!PageCompound(page));
92356 @@ -3638,7 +3703,7 @@ static int slab_unmergeable(struct kmem_cache *s)
92357 /*
92358 * We may have set a slab to be unmergeable during bootstrap.
92359 */
92360 - if (s->refcount < 0)
92361 + if (atomic_read(&s->refcount) < 0)
92362 return 1;
92363
92364 return 0;
92365 @@ -3696,7 +3761,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
92366
92367 s = find_mergeable(memcg, size, align, flags, name, ctor);
92368 if (s) {
92369 - s->refcount++;
92370 + atomic_inc(&s->refcount);
92371 /*
92372 * Adjust the object sizes so that we clear
92373 * the complete object on kzalloc.
92374 @@ -3705,7 +3770,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
92375 s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
92376
92377 if (sysfs_slab_alias(s, name)) {
92378 - s->refcount--;
92379 + atomic_dec(&s->refcount);
92380 s = NULL;
92381 }
92382 }
92383 @@ -3825,7 +3890,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
92384 }
92385 #endif
92386
92387 -#ifdef CONFIG_SYSFS
92388 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
92389 static int count_inuse(struct page *page)
92390 {
92391 return page->inuse;
92392 @@ -4214,12 +4279,12 @@ static void resiliency_test(void)
92393 validate_slab_cache(kmalloc_caches[9]);
92394 }
92395 #else
92396 -#ifdef CONFIG_SYSFS
92397 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
92398 static void resiliency_test(void) {};
92399 #endif
92400 #endif
92401
92402 -#ifdef CONFIG_SYSFS
92403 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
92404 enum slab_stat_type {
92405 SL_ALL, /* All slabs */
92406 SL_PARTIAL, /* Only partially allocated slabs */
92407 @@ -4459,7 +4524,7 @@ SLAB_ATTR_RO(ctor);
92408
92409 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
92410 {
92411 - return sprintf(buf, "%d\n", s->refcount - 1);
92412 + return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
92413 }
92414 SLAB_ATTR_RO(aliases);
92415
92416 @@ -4547,6 +4612,14 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
92417 SLAB_ATTR_RO(cache_dma);
92418 #endif
92419
92420 +#ifdef CONFIG_PAX_USERCOPY_SLABS
92421 +static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
92422 +{
92423 + return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
92424 +}
92425 +SLAB_ATTR_RO(usercopy);
92426 +#endif
92427 +
92428 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
92429 {
92430 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
92431 @@ -4881,6 +4954,9 @@ static struct attribute *slab_attrs[] = {
92432 #ifdef CONFIG_ZONE_DMA
92433 &cache_dma_attr.attr,
92434 #endif
92435 +#ifdef CONFIG_PAX_USERCOPY_SLABS
92436 + &usercopy_attr.attr,
92437 +#endif
92438 #ifdef CONFIG_NUMA
92439 &remote_node_defrag_ratio_attr.attr,
92440 #endif
92441 @@ -5113,6 +5189,7 @@ static char *create_unique_id(struct kmem_cache *s)
92442 return name;
92443 }
92444
92445 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
92446 static int sysfs_slab_add(struct kmem_cache *s)
92447 {
92448 int err;
92449 @@ -5136,7 +5213,7 @@ static int sysfs_slab_add(struct kmem_cache *s)
92450 }
92451
92452 s->kobj.kset = slab_kset;
92453 - err = kobject_init_and_add(&s->kobj, &slab_ktype, NULL, name);
92454 + err = kobject_init_and_add(&s->kobj, &slab_ktype, NULL, "%s", name);
92455 if (err) {
92456 kobject_put(&s->kobj);
92457 return err;
92458 @@ -5170,6 +5247,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
92459 kobject_del(&s->kobj);
92460 kobject_put(&s->kobj);
92461 }
92462 +#endif
92463
92464 /*
92465 * Need to buffer aliases during bootup until sysfs becomes
92466 @@ -5183,6 +5261,7 @@ struct saved_alias {
92467
92468 static struct saved_alias *alias_list;
92469
92470 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
92471 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
92472 {
92473 struct saved_alias *al;
92474 @@ -5205,6 +5284,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
92475 alias_list = al;
92476 return 0;
92477 }
92478 +#endif
92479
92480 static int __init slab_sysfs_init(void)
92481 {
92482 diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
92483 index 27eeab3..7c3f7f2 100644
92484 --- a/mm/sparse-vmemmap.c
92485 +++ b/mm/sparse-vmemmap.c
92486 @@ -130,7 +130,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
92487 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
92488 if (!p)
92489 return NULL;
92490 - pud_populate(&init_mm, pud, p);
92491 + pud_populate_kernel(&init_mm, pud, p);
92492 }
92493 return pud;
92494 }
92495 @@ -142,7 +142,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
92496 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
92497 if (!p)
92498 return NULL;
92499 - pgd_populate(&init_mm, pgd, p);
92500 + pgd_populate_kernel(&init_mm, pgd, p);
92501 }
92502 return pgd;
92503 }
92504 diff --git a/mm/sparse.c b/mm/sparse.c
92505 index 4ac1d7e..bbfcb1f 100644
92506 --- a/mm/sparse.c
92507 +++ b/mm/sparse.c
92508 @@ -745,7 +745,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
92509
92510 for (i = 0; i < PAGES_PER_SECTION; i++) {
92511 if (PageHWPoison(&memmap[i])) {
92512 - atomic_long_sub(1, &num_poisoned_pages);
92513 + atomic_long_sub_unchecked(1, &num_poisoned_pages);
92514 ClearPageHWPoison(&memmap[i]);
92515 }
92516 }
92517 diff --git a/mm/swap.c b/mm/swap.c
92518 index 759c3ca..7c1a5b4 100644
92519 --- a/mm/swap.c
92520 +++ b/mm/swap.c
92521 @@ -77,6 +77,8 @@ static void __put_compound_page(struct page *page)
92522
92523 __page_cache_release(page);
92524 dtor = get_compound_page_dtor(page);
92525 + if (!PageHuge(page))
92526 + BUG_ON(dtor != free_compound_page);
92527 (*dtor)(page);
92528 }
92529
92530 diff --git a/mm/swapfile.c b/mm/swapfile.c
92531 index de7c904..c84bf11 100644
92532 --- a/mm/swapfile.c
92533 +++ b/mm/swapfile.c
92534 @@ -66,7 +66,7 @@ static DEFINE_MUTEX(swapon_mutex);
92535
92536 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
92537 /* Activity counter to indicate that a swapon or swapoff has occurred */
92538 -static atomic_t proc_poll_event = ATOMIC_INIT(0);
92539 +static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
92540
92541 static inline unsigned char swap_count(unsigned char ent)
92542 {
92543 @@ -1949,7 +1949,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
92544 }
92545 filp_close(swap_file, NULL);
92546 err = 0;
92547 - atomic_inc(&proc_poll_event);
92548 + atomic_inc_unchecked(&proc_poll_event);
92549 wake_up_interruptible(&proc_poll_wait);
92550
92551 out_dput:
92552 @@ -1966,8 +1966,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
92553
92554 poll_wait(file, &proc_poll_wait, wait);
92555
92556 - if (seq->poll_event != atomic_read(&proc_poll_event)) {
92557 - seq->poll_event = atomic_read(&proc_poll_event);
92558 + if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
92559 + seq->poll_event = atomic_read_unchecked(&proc_poll_event);
92560 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
92561 }
92562
92563 @@ -2065,7 +2065,7 @@ static int swaps_open(struct inode *inode, struct file *file)
92564 return ret;
92565
92566 seq = file->private_data;
92567 - seq->poll_event = atomic_read(&proc_poll_event);
92568 + seq->poll_event = atomic_read_unchecked(&proc_poll_event);
92569 return 0;
92570 }
92571
92572 @@ -2524,7 +2524,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
92573 (frontswap_map) ? "FS" : "");
92574
92575 mutex_unlock(&swapon_mutex);
92576 - atomic_inc(&proc_poll_event);
92577 + atomic_inc_unchecked(&proc_poll_event);
92578 wake_up_interruptible(&proc_poll_wait);
92579
92580 if (S_ISREG(inode->i_mode))
92581 diff --git a/mm/util.c b/mm/util.c
92582 index eaf63fc2..32b2629 100644
92583 --- a/mm/util.c
92584 +++ b/mm/util.c
92585 @@ -294,6 +294,12 @@ done:
92586 void arch_pick_mmap_layout(struct mm_struct *mm)
92587 {
92588 mm->mmap_base = TASK_UNMAPPED_BASE;
92589 +
92590 +#ifdef CONFIG_PAX_RANDMMAP
92591 + if (mm->pax_flags & MF_PAX_RANDMMAP)
92592 + mm->mmap_base += mm->delta_mmap;
92593 +#endif
92594 +
92595 mm->get_unmapped_area = arch_get_unmapped_area;
92596 }
92597 #endif
92598 diff --git a/mm/vmalloc.c b/mm/vmalloc.c
92599 index 1074543..136dbe0 100644
92600 --- a/mm/vmalloc.c
92601 +++ b/mm/vmalloc.c
92602 @@ -59,8 +59,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
92603
92604 pte = pte_offset_kernel(pmd, addr);
92605 do {
92606 - pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
92607 - WARN_ON(!pte_none(ptent) && !pte_present(ptent));
92608 +
92609 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
92610 + if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
92611 + BUG_ON(!pte_exec(*pte));
92612 + set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
92613 + continue;
92614 + }
92615 +#endif
92616 +
92617 + {
92618 + pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
92619 + WARN_ON(!pte_none(ptent) && !pte_present(ptent));
92620 + }
92621 } while (pte++, addr += PAGE_SIZE, addr != end);
92622 }
92623
92624 @@ -120,16 +131,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
92625 pte = pte_alloc_kernel(pmd, addr);
92626 if (!pte)
92627 return -ENOMEM;
92628 +
92629 + pax_open_kernel();
92630 do {
92631 struct page *page = pages[*nr];
92632
92633 - if (WARN_ON(!pte_none(*pte)))
92634 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
92635 + if (pgprot_val(prot) & _PAGE_NX)
92636 +#endif
92637 +
92638 + if (!pte_none(*pte)) {
92639 + pax_close_kernel();
92640 + WARN_ON(1);
92641 return -EBUSY;
92642 - if (WARN_ON(!page))
92643 + }
92644 + if (!page) {
92645 + pax_close_kernel();
92646 + WARN_ON(1);
92647 return -ENOMEM;
92648 + }
92649 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
92650 (*nr)++;
92651 } while (pte++, addr += PAGE_SIZE, addr != end);
92652 + pax_close_kernel();
92653 return 0;
92654 }
92655
92656 @@ -139,7 +163,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
92657 pmd_t *pmd;
92658 unsigned long next;
92659
92660 - pmd = pmd_alloc(&init_mm, pud, addr);
92661 + pmd = pmd_alloc_kernel(&init_mm, pud, addr);
92662 if (!pmd)
92663 return -ENOMEM;
92664 do {
92665 @@ -156,7 +180,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
92666 pud_t *pud;
92667 unsigned long next;
92668
92669 - pud = pud_alloc(&init_mm, pgd, addr);
92670 + pud = pud_alloc_kernel(&init_mm, pgd, addr);
92671 if (!pud)
92672 return -ENOMEM;
92673 do {
92674 @@ -216,6 +240,12 @@ int is_vmalloc_or_module_addr(const void *x)
92675 if (addr >= MODULES_VADDR && addr < MODULES_END)
92676 return 1;
92677 #endif
92678 +
92679 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
92680 + if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
92681 + return 1;
92682 +#endif
92683 +
92684 return is_vmalloc_addr(x);
92685 }
92686
92687 @@ -236,8 +266,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
92688
92689 if (!pgd_none(*pgd)) {
92690 pud_t *pud = pud_offset(pgd, addr);
92691 +#ifdef CONFIG_X86
92692 + if (!pud_large(*pud))
92693 +#endif
92694 if (!pud_none(*pud)) {
92695 pmd_t *pmd = pmd_offset(pud, addr);
92696 +#ifdef CONFIG_X86
92697 + if (!pmd_large(*pmd))
92698 +#endif
92699 if (!pmd_none(*pmd)) {
92700 pte_t *ptep, pte;
92701
92702 @@ -1303,6 +1339,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
92703 struct vm_struct *area;
92704
92705 BUG_ON(in_interrupt());
92706 +
92707 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
92708 + if (flags & VM_KERNEXEC) {
92709 + if (start != VMALLOC_START || end != VMALLOC_END)
92710 + return NULL;
92711 + start = (unsigned long)MODULES_EXEC_VADDR;
92712 + end = (unsigned long)MODULES_EXEC_END;
92713 + }
92714 +#endif
92715 +
92716 if (flags & VM_IOREMAP)
92717 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
92718
92719 @@ -1528,6 +1574,11 @@ void *vmap(struct page **pages, unsigned int count,
92720 if (count > totalram_pages)
92721 return NULL;
92722
92723 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
92724 + if (!(pgprot_val(prot) & _PAGE_NX))
92725 + flags |= VM_KERNEXEC;
92726 +#endif
92727 +
92728 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
92729 __builtin_return_address(0));
92730 if (!area)
92731 @@ -1629,6 +1680,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
92732 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
92733 goto fail;
92734
92735 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
92736 + if (!(pgprot_val(prot) & _PAGE_NX))
92737 + area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | VM_KERNEXEC,
92738 + VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
92739 + else
92740 +#endif
92741 +
92742 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED,
92743 start, end, node, gfp_mask, caller);
92744 if (!area)
92745 @@ -1805,10 +1863,9 @@ EXPORT_SYMBOL(vzalloc_node);
92746 * For tight control over page level allocator and protection flags
92747 * use __vmalloc() instead.
92748 */
92749 -
92750 void *vmalloc_exec(unsigned long size)
92751 {
92752 - return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
92753 + return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
92754 NUMA_NO_NODE, __builtin_return_address(0));
92755 }
92756
92757 @@ -2115,6 +2172,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
92758 {
92759 struct vm_struct *area;
92760
92761 + BUG_ON(vma->vm_mirror);
92762 +
92763 size = PAGE_ALIGN(size);
92764
92765 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
92766 @@ -2600,7 +2659,11 @@ static int s_show(struct seq_file *m, void *p)
92767 v->addr, v->addr + v->size, v->size);
92768
92769 if (v->caller)
92770 +#ifdef CONFIG_GRKERNSEC_HIDESYM
92771 + seq_printf(m, " %pK", v->caller);
92772 +#else
92773 seq_printf(m, " %pS", v->caller);
92774 +#endif
92775
92776 if (v->nr_pages)
92777 seq_printf(m, " pages=%d", v->nr_pages);
92778 diff --git a/mm/vmstat.c b/mm/vmstat.c
92779 index 5a442a7..5eb281e 100644
92780 --- a/mm/vmstat.c
92781 +++ b/mm/vmstat.c
92782 @@ -79,7 +79,7 @@ void vm_events_fold_cpu(int cpu)
92783 *
92784 * vm_stat contains the global counters
92785 */
92786 -atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
92787 +atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
92788 EXPORT_SYMBOL(vm_stat);
92789
92790 #ifdef CONFIG_SMP
92791 @@ -423,7 +423,7 @@ static inline void fold_diff(int *diff)
92792
92793 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
92794 if (diff[i])
92795 - atomic_long_add(diff[i], &vm_stat[i]);
92796 + atomic_long_add_unchecked(diff[i], &vm_stat[i]);
92797 }
92798
92799 /*
92800 @@ -455,7 +455,7 @@ static void refresh_cpu_vm_stats(void)
92801 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
92802 if (v) {
92803
92804 - atomic_long_add(v, &zone->vm_stat[i]);
92805 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
92806 global_diff[i] += v;
92807 #ifdef CONFIG_NUMA
92808 /* 3 seconds idle till flush */
92809 @@ -517,7 +517,7 @@ void cpu_vm_stats_fold(int cpu)
92810
92811 v = p->vm_stat_diff[i];
92812 p->vm_stat_diff[i] = 0;
92813 - atomic_long_add(v, &zone->vm_stat[i]);
92814 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
92815 global_diff[i] += v;
92816 }
92817 }
92818 @@ -537,8 +537,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
92819 if (pset->vm_stat_diff[i]) {
92820 int v = pset->vm_stat_diff[i];
92821 pset->vm_stat_diff[i] = 0;
92822 - atomic_long_add(v, &zone->vm_stat[i]);
92823 - atomic_long_add(v, &vm_stat[i]);
92824 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
92825 + atomic_long_add_unchecked(v, &vm_stat[i]);
92826 }
92827 }
92828 #endif
92829 @@ -1281,10 +1281,20 @@ static int __init setup_vmstat(void)
92830 start_cpu_timer(cpu);
92831 #endif
92832 #ifdef CONFIG_PROC_FS
92833 - proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
92834 - proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
92835 - proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
92836 - proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
92837 + {
92838 + mode_t gr_mode = S_IRUGO;
92839 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
92840 + gr_mode = S_IRUSR;
92841 +#endif
92842 + proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
92843 + proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
92844 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
92845 + proc_create("vmstat", gr_mode | S_IRGRP, NULL, &proc_vmstat_file_operations);
92846 +#else
92847 + proc_create("vmstat", gr_mode, NULL, &proc_vmstat_file_operations);
92848 +#endif
92849 + proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
92850 + }
92851 #endif
92852 return 0;
92853 }
92854 diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
92855 index 61fc573..b5e47d0 100644
92856 --- a/net/8021q/vlan.c
92857 +++ b/net/8021q/vlan.c
92858 @@ -472,7 +472,7 @@ out:
92859 return NOTIFY_DONE;
92860 }
92861
92862 -static struct notifier_block vlan_notifier_block __read_mostly = {
92863 +static struct notifier_block vlan_notifier_block = {
92864 .notifier_call = vlan_device_event,
92865 };
92866
92867 @@ -547,8 +547,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
92868 err = -EPERM;
92869 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
92870 break;
92871 - if ((args.u.name_type >= 0) &&
92872 - (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
92873 + if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
92874 struct vlan_net *vn;
92875
92876 vn = net_generic(net, vlan_net_id);
92877 diff --git a/net/9p/mod.c b/net/9p/mod.c
92878 index 6ab36ae..6f1841b 100644
92879 --- a/net/9p/mod.c
92880 +++ b/net/9p/mod.c
92881 @@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
92882 void v9fs_register_trans(struct p9_trans_module *m)
92883 {
92884 spin_lock(&v9fs_trans_lock);
92885 - list_add_tail(&m->list, &v9fs_trans_list);
92886 + pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
92887 spin_unlock(&v9fs_trans_lock);
92888 }
92889 EXPORT_SYMBOL(v9fs_register_trans);
92890 @@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
92891 void v9fs_unregister_trans(struct p9_trans_module *m)
92892 {
92893 spin_lock(&v9fs_trans_lock);
92894 - list_del_init(&m->list);
92895 + pax_list_del_init((struct list_head *)&m->list);
92896 spin_unlock(&v9fs_trans_lock);
92897 }
92898 EXPORT_SYMBOL(v9fs_unregister_trans);
92899 diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
92900 index 3ffda1b..fceac96 100644
92901 --- a/net/9p/trans_fd.c
92902 +++ b/net/9p/trans_fd.c
92903 @@ -432,7 +432,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
92904 oldfs = get_fs();
92905 set_fs(get_ds());
92906 /* The cast to a user pointer is valid due to the set_fs() */
92907 - ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
92908 + ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
92909 set_fs(oldfs);
92910
92911 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
92912 diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
92913 index 876fbe8..8bbea9f 100644
92914 --- a/net/atm/atm_misc.c
92915 +++ b/net/atm/atm_misc.c
92916 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
92917 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
92918 return 1;
92919 atm_return(vcc, truesize);
92920 - atomic_inc(&vcc->stats->rx_drop);
92921 + atomic_inc_unchecked(&vcc->stats->rx_drop);
92922 return 0;
92923 }
92924 EXPORT_SYMBOL(atm_charge);
92925 @@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
92926 }
92927 }
92928 atm_return(vcc, guess);
92929 - atomic_inc(&vcc->stats->rx_drop);
92930 + atomic_inc_unchecked(&vcc->stats->rx_drop);
92931 return NULL;
92932 }
92933 EXPORT_SYMBOL(atm_alloc_charge);
92934 @@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
92935
92936 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
92937 {
92938 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
92939 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
92940 __SONET_ITEMS
92941 #undef __HANDLE_ITEM
92942 }
92943 @@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
92944
92945 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
92946 {
92947 -#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
92948 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
92949 __SONET_ITEMS
92950 #undef __HANDLE_ITEM
92951 }
92952 diff --git a/net/atm/lec.h b/net/atm/lec.h
92953 index 4149db1..f2ab682 100644
92954 --- a/net/atm/lec.h
92955 +++ b/net/atm/lec.h
92956 @@ -48,7 +48,7 @@ struct lane2_ops {
92957 const u8 *tlvs, u32 sizeoftlvs);
92958 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
92959 const u8 *tlvs, u32 sizeoftlvs);
92960 -};
92961 +} __no_const;
92962
92963 /*
92964 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
92965 diff --git a/net/atm/proc.c b/net/atm/proc.c
92966 index bbb6461..cf04016 100644
92967 --- a/net/atm/proc.c
92968 +++ b/net/atm/proc.c
92969 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
92970 const struct k_atm_aal_stats *stats)
92971 {
92972 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
92973 - atomic_read(&stats->tx), atomic_read(&stats->tx_err),
92974 - atomic_read(&stats->rx), atomic_read(&stats->rx_err),
92975 - atomic_read(&stats->rx_drop));
92976 + atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
92977 + atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
92978 + atomic_read_unchecked(&stats->rx_drop));
92979 }
92980
92981 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
92982 diff --git a/net/atm/resources.c b/net/atm/resources.c
92983 index 0447d5d..3cf4728 100644
92984 --- a/net/atm/resources.c
92985 +++ b/net/atm/resources.c
92986 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
92987 static void copy_aal_stats(struct k_atm_aal_stats *from,
92988 struct atm_aal_stats *to)
92989 {
92990 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
92991 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
92992 __AAL_STAT_ITEMS
92993 #undef __HANDLE_ITEM
92994 }
92995 @@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
92996 static void subtract_aal_stats(struct k_atm_aal_stats *from,
92997 struct atm_aal_stats *to)
92998 {
92999 -#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
93000 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
93001 __AAL_STAT_ITEMS
93002 #undef __HANDLE_ITEM
93003 }
93004 diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
93005 index 919a5ce..cc6b444 100644
93006 --- a/net/ax25/sysctl_net_ax25.c
93007 +++ b/net/ax25/sysctl_net_ax25.c
93008 @@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
93009 {
93010 char path[sizeof("net/ax25/") + IFNAMSIZ];
93011 int k;
93012 - struct ctl_table *table;
93013 + ctl_table_no_const *table;
93014
93015 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
93016 if (!table)
93017 diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
93018 index 0a8a80c..f7e89aa 100644
93019 --- a/net/batman-adv/bat_iv_ogm.c
93020 +++ b/net/batman-adv/bat_iv_ogm.c
93021 @@ -121,7 +121,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
93022
93023 /* randomize initial seqno to avoid collision */
93024 get_random_bytes(&random_seqno, sizeof(random_seqno));
93025 - atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
93026 + atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
93027
93028 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
93029 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
93030 @@ -703,9 +703,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
93031 batadv_ogm_packet = (struct batadv_ogm_packet *)(*ogm_buff);
93032
93033 /* change sequence number to network order */
93034 - seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
93035 + seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
93036 batadv_ogm_packet->seqno = htonl(seqno);
93037 - atomic_inc(&hard_iface->bat_iv.ogm_seqno);
93038 + atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
93039
93040 batadv_ogm_packet->ttvn = atomic_read(&bat_priv->tt.vn);
93041 batadv_ogm_packet->tt_crc = htons(bat_priv->tt.local_crc);
93042 @@ -1111,7 +1111,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr,
93043 return;
93044
93045 /* could be changed by schedule_own_packet() */
93046 - if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
93047 + if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
93048
93049 if (batadv_ogm_packet->flags & BATADV_DIRECTLINK)
93050 has_directlink_flag = 1;
93051 diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
93052 index c478e6b..469fd2f 100644
93053 --- a/net/batman-adv/hard-interface.c
93054 +++ b/net/batman-adv/hard-interface.c
93055 @@ -453,7 +453,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
93056 hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
93057 dev_add_pack(&hard_iface->batman_adv_ptype);
93058
93059 - atomic_set(&hard_iface->frag_seqno, 1);
93060 + atomic_set_unchecked(&hard_iface->frag_seqno, 1);
93061 batadv_info(hard_iface->soft_iface, "Adding interface: %s\n",
93062 hard_iface->net_dev->name);
93063
93064 diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
93065 index 813db4e..847edac 100644
93066 --- a/net/batman-adv/soft-interface.c
93067 +++ b/net/batman-adv/soft-interface.c
93068 @@ -263,7 +263,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
93069 primary_if->net_dev->dev_addr, ETH_ALEN);
93070
93071 /* set broadcast sequence number */
93072 - seqno = atomic_inc_return(&bat_priv->bcast_seqno);
93073 + seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
93074 bcast_packet->seqno = htonl(seqno);
93075
93076 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
93077 @@ -483,7 +483,7 @@ static int batadv_softif_init_late(struct net_device *dev)
93078 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
93079
93080 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
93081 - atomic_set(&bat_priv->bcast_seqno, 1);
93082 + atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
93083 atomic_set(&bat_priv->tt.vn, 0);
93084 atomic_set(&bat_priv->tt.local_changes, 0);
93085 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
93086 diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
93087 index b2c94e1..3d47e07 100644
93088 --- a/net/batman-adv/types.h
93089 +++ b/net/batman-adv/types.h
93090 @@ -51,7 +51,7 @@
93091 struct batadv_hard_iface_bat_iv {
93092 unsigned char *ogm_buff;
93093 int ogm_buff_len;
93094 - atomic_t ogm_seqno;
93095 + atomic_unchecked_t ogm_seqno;
93096 };
93097
93098 /**
93099 @@ -76,7 +76,7 @@ struct batadv_hard_iface {
93100 int16_t if_num;
93101 char if_status;
93102 struct net_device *net_dev;
93103 - atomic_t frag_seqno;
93104 + atomic_unchecked_t frag_seqno;
93105 uint8_t num_bcasts;
93106 struct kobject *hardif_obj;
93107 atomic_t refcount;
93108 @@ -560,7 +560,7 @@ struct batadv_priv {
93109 #ifdef CONFIG_BATMAN_ADV_DEBUG
93110 atomic_t log_level;
93111 #endif
93112 - atomic_t bcast_seqno;
93113 + atomic_unchecked_t bcast_seqno;
93114 atomic_t bcast_queue_left;
93115 atomic_t batman_queue_left;
93116 char num_ifaces;
93117 diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
93118 index 48b31d3..62a0bcb 100644
93119 --- a/net/batman-adv/unicast.c
93120 +++ b/net/batman-adv/unicast.c
93121 @@ -272,7 +272,7 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv,
93122 frag1->flags = BATADV_UNI_FRAG_HEAD | large_tail;
93123 frag2->flags = large_tail;
93124
93125 - seqno = atomic_add_return(2, &hard_iface->frag_seqno);
93126 + seqno = atomic_add_return_unchecked(2, &hard_iface->frag_seqno);
93127 frag1->seqno = htons(seqno - 1);
93128 frag2->seqno = htons(seqno);
93129
93130 diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
93131 index fa4bf66..e92948f 100644
93132 --- a/net/bluetooth/hci_sock.c
93133 +++ b/net/bluetooth/hci_sock.c
93134 @@ -932,7 +932,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
93135 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
93136 }
93137
93138 - len = min_t(unsigned int, len, sizeof(uf));
93139 + len = min((size_t)len, sizeof(uf));
93140 if (copy_from_user(&uf, optval, len)) {
93141 err = -EFAULT;
93142 break;
93143 diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
93144 index 63fa111..b166ec6 100644
93145 --- a/net/bluetooth/l2cap_core.c
93146 +++ b/net/bluetooth/l2cap_core.c
93147 @@ -3511,8 +3511,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
93148 break;
93149
93150 case L2CAP_CONF_RFC:
93151 - if (olen == sizeof(rfc))
93152 - memcpy(&rfc, (void *)val, olen);
93153 + if (olen != sizeof(rfc))
93154 + break;
93155 +
93156 + memcpy(&rfc, (void *)val, olen);
93157
93158 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
93159 rfc.mode != chan->mode)
93160 diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
93161 index 0098af8..fb5a31f 100644
93162 --- a/net/bluetooth/l2cap_sock.c
93163 +++ b/net/bluetooth/l2cap_sock.c
93164 @@ -485,7 +485,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
93165 struct sock *sk = sock->sk;
93166 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
93167 struct l2cap_options opts;
93168 - int len, err = 0;
93169 + int err = 0;
93170 + size_t len = optlen;
93171 u32 opt;
93172
93173 BT_DBG("sk %p", sk);
93174 @@ -507,7 +508,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
93175 opts.max_tx = chan->max_tx;
93176 opts.txwin_size = chan->tx_win;
93177
93178 - len = min_t(unsigned int, sizeof(opts), optlen);
93179 + len = min(sizeof(opts), len);
93180 if (copy_from_user((char *) &opts, optval, len)) {
93181 err = -EFAULT;
93182 break;
93183 @@ -587,7 +588,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
93184 struct bt_security sec;
93185 struct bt_power pwr;
93186 struct l2cap_conn *conn;
93187 - int len, err = 0;
93188 + int err = 0;
93189 + size_t len = optlen;
93190 u32 opt;
93191
93192 BT_DBG("sk %p", sk);
93193 @@ -610,7 +612,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
93194
93195 sec.level = BT_SECURITY_LOW;
93196
93197 - len = min_t(unsigned int, sizeof(sec), optlen);
93198 + len = min(sizeof(sec), len);
93199 if (copy_from_user((char *) &sec, optval, len)) {
93200 err = -EFAULT;
93201 break;
93202 @@ -707,7 +709,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
93203
93204 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
93205
93206 - len = min_t(unsigned int, sizeof(pwr), optlen);
93207 + len = min(sizeof(pwr), len);
93208 if (copy_from_user((char *) &pwr, optval, len)) {
93209 err = -EFAULT;
93210 break;
93211 diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
93212 index c1c6028..17e8dcc 100644
93213 --- a/net/bluetooth/rfcomm/sock.c
93214 +++ b/net/bluetooth/rfcomm/sock.c
93215 @@ -665,7 +665,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
93216 struct sock *sk = sock->sk;
93217 struct bt_security sec;
93218 int err = 0;
93219 - size_t len;
93220 + size_t len = optlen;
93221 u32 opt;
93222
93223 BT_DBG("sk %p", sk);
93224 @@ -687,7 +687,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
93225
93226 sec.level = BT_SECURITY_LOW;
93227
93228 - len = min_t(unsigned int, sizeof(sec), optlen);
93229 + len = min(sizeof(sec), len);
93230 if (copy_from_user((char *) &sec, optval, len)) {
93231 err = -EFAULT;
93232 break;
93233 diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
93234 index 84fcf9f..e389b27 100644
93235 --- a/net/bluetooth/rfcomm/tty.c
93236 +++ b/net/bluetooth/rfcomm/tty.c
93237 @@ -684,7 +684,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
93238 BT_DBG("tty %p id %d", tty, tty->index);
93239
93240 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
93241 - dev->channel, dev->port.count);
93242 + dev->channel, atomic_read(&dev->port.count));
93243
93244 err = tty_port_open(&dev->port, tty, filp);
93245 if (err)
93246 @@ -707,7 +707,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
93247 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
93248
93249 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
93250 - dev->port.count);
93251 + atomic_read(&dev->port.count));
93252
93253 tty_port_close(&dev->port, tty, filp);
93254 }
93255 diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
93256 index 5180938..7c470c3 100644
93257 --- a/net/bridge/netfilter/ebt_ulog.c
93258 +++ b/net/bridge/netfilter/ebt_ulog.c
93259 @@ -181,6 +181,7 @@ static void ebt_ulog_packet(struct net *net, unsigned int hooknr,
93260 ub->qlen++;
93261
93262 pm = nlmsg_data(nlh);
93263 + memset(pm, 0, sizeof(*pm));
93264
93265 /* Fill in the ulog data */
93266 pm->version = EBT_ULOG_VERSION;
93267 @@ -193,8 +194,6 @@ static void ebt_ulog_packet(struct net *net, unsigned int hooknr,
93268 pm->hook = hooknr;
93269 if (uloginfo->prefix != NULL)
93270 strcpy(pm->prefix, uloginfo->prefix);
93271 - else
93272 - *(pm->prefix) = '\0';
93273
93274 if (in) {
93275 strcpy(pm->physindev, in->name);
93276 @@ -204,16 +203,14 @@ static void ebt_ulog_packet(struct net *net, unsigned int hooknr,
93277 strcpy(pm->indev, br_port_get_rcu(in)->br->dev->name);
93278 else
93279 strcpy(pm->indev, in->name);
93280 - } else
93281 - pm->indev[0] = pm->physindev[0] = '\0';
93282 + }
93283
93284 if (out) {
93285 /* If out exists, then out is a bridge port */
93286 strcpy(pm->physoutdev, out->name);
93287 /* rcu_read_lock()ed by nf_hook_slow */
93288 strcpy(pm->outdev, br_port_get_rcu(out)->br->dev->name);
93289 - } else
93290 - pm->outdev[0] = pm->physoutdev[0] = '\0';
93291 + }
93292
93293 if (skb_copy_bits(skb, -ETH_HLEN, pm->data, copy_len) < 0)
93294 BUG();
93295 diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
93296 index ac78024..161a80c 100644
93297 --- a/net/bridge/netfilter/ebtables.c
93298 +++ b/net/bridge/netfilter/ebtables.c
93299 @@ -1525,7 +1525,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
93300 tmp.valid_hooks = t->table->valid_hooks;
93301 }
93302 mutex_unlock(&ebt_mutex);
93303 - if (copy_to_user(user, &tmp, *len) != 0){
93304 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0){
93305 BUGPRINT("c2u Didn't work\n");
93306 ret = -EFAULT;
93307 break;
93308 @@ -2331,7 +2331,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
93309 goto out;
93310 tmp.valid_hooks = t->valid_hooks;
93311
93312 - if (copy_to_user(user, &tmp, *len) != 0) {
93313 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
93314 ret = -EFAULT;
93315 break;
93316 }
93317 @@ -2342,7 +2342,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
93318 tmp.entries_size = t->table->entries_size;
93319 tmp.valid_hooks = t->table->valid_hooks;
93320
93321 - if (copy_to_user(user, &tmp, *len) != 0) {
93322 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
93323 ret = -EFAULT;
93324 break;
93325 }
93326 diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
93327 index 0f45522..dab651f 100644
93328 --- a/net/caif/cfctrl.c
93329 +++ b/net/caif/cfctrl.c
93330 @@ -10,6 +10,7 @@
93331 #include <linux/spinlock.h>
93332 #include <linux/slab.h>
93333 #include <linux/pkt_sched.h>
93334 +#include <linux/sched.h>
93335 #include <net/caif/caif_layer.h>
93336 #include <net/caif/cfpkt.h>
93337 #include <net/caif/cfctrl.h>
93338 @@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
93339 memset(&dev_info, 0, sizeof(dev_info));
93340 dev_info.id = 0xff;
93341 cfsrvl_init(&this->serv, 0, &dev_info, false);
93342 - atomic_set(&this->req_seq_no, 1);
93343 - atomic_set(&this->rsp_seq_no, 1);
93344 + atomic_set_unchecked(&this->req_seq_no, 1);
93345 + atomic_set_unchecked(&this->rsp_seq_no, 1);
93346 this->serv.layer.receive = cfctrl_recv;
93347 sprintf(this->serv.layer.name, "ctrl");
93348 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
93349 @@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
93350 struct cfctrl_request_info *req)
93351 {
93352 spin_lock_bh(&ctrl->info_list_lock);
93353 - atomic_inc(&ctrl->req_seq_no);
93354 - req->sequence_no = atomic_read(&ctrl->req_seq_no);
93355 + atomic_inc_unchecked(&ctrl->req_seq_no);
93356 + req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
93357 list_add_tail(&req->list, &ctrl->list);
93358 spin_unlock_bh(&ctrl->info_list_lock);
93359 }
93360 @@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
93361 if (p != first)
93362 pr_warn("Requests are not received in order\n");
93363
93364 - atomic_set(&ctrl->rsp_seq_no,
93365 + atomic_set_unchecked(&ctrl->rsp_seq_no,
93366 p->sequence_no);
93367 list_del(&p->list);
93368 goto out;
93369 diff --git a/net/can/af_can.c b/net/can/af_can.c
93370 index 3ab8dd2..b9aef13 100644
93371 --- a/net/can/af_can.c
93372 +++ b/net/can/af_can.c
93373 @@ -862,7 +862,7 @@ static const struct net_proto_family can_family_ops = {
93374 };
93375
93376 /* notifier block for netdevice event */
93377 -static struct notifier_block can_netdev_notifier __read_mostly = {
93378 +static struct notifier_block can_netdev_notifier = {
93379 .notifier_call = can_notifier,
93380 };
93381
93382 diff --git a/net/can/gw.c b/net/can/gw.c
93383 index 3f9b0f3..fc6d4fa 100644
93384 --- a/net/can/gw.c
93385 +++ b/net/can/gw.c
93386 @@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
93387 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
93388
93389 static HLIST_HEAD(cgw_list);
93390 -static struct notifier_block notifier;
93391
93392 static struct kmem_cache *cgw_cache __read_mostly;
93393
93394 @@ -954,6 +953,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
93395 return err;
93396 }
93397
93398 +static struct notifier_block notifier = {
93399 + .notifier_call = cgw_notifier
93400 +};
93401 +
93402 static __init int cgw_module_init(void)
93403 {
93404 /* sanitize given module parameter */
93405 @@ -969,7 +972,6 @@ static __init int cgw_module_init(void)
93406 return -ENOMEM;
93407
93408 /* set notifier */
93409 - notifier.notifier_call = cgw_notifier;
93410 register_netdevice_notifier(&notifier);
93411
93412 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
93413 diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
93414 index 4a5df7b..9ad1f1d 100644
93415 --- a/net/ceph/messenger.c
93416 +++ b/net/ceph/messenger.c
93417 @@ -186,7 +186,7 @@ static void con_fault(struct ceph_connection *con);
93418 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
93419
93420 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
93421 -static atomic_t addr_str_seq = ATOMIC_INIT(0);
93422 +static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
93423
93424 static struct page *zero_page; /* used in certain error cases */
93425
93426 @@ -197,7 +197,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
93427 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
93428 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
93429
93430 - i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
93431 + i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
93432 s = addr_str[i];
93433
93434 switch (ss->ss_family) {
93435 diff --git a/net/compat.c b/net/compat.c
93436 index dd32e34..6066f87 100644
93437 --- a/net/compat.c
93438 +++ b/net/compat.c
93439 @@ -73,9 +73,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
93440 return -EFAULT;
93441 if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
93442 kmsg->msg_namelen = sizeof(struct sockaddr_storage);
93443 - kmsg->msg_name = compat_ptr(tmp1);
93444 - kmsg->msg_iov = compat_ptr(tmp2);
93445 - kmsg->msg_control = compat_ptr(tmp3);
93446 + kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
93447 + kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
93448 + kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
93449 return 0;
93450 }
93451
93452 @@ -87,7 +87,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
93453
93454 if (kern_msg->msg_namelen) {
93455 if (mode == VERIFY_READ) {
93456 - int err = move_addr_to_kernel(kern_msg->msg_name,
93457 + int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
93458 kern_msg->msg_namelen,
93459 kern_address);
93460 if (err < 0)
93461 @@ -99,7 +99,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
93462 kern_msg->msg_name = NULL;
93463
93464 tot_len = iov_from_user_compat_to_kern(kern_iov,
93465 - (struct compat_iovec __user *)kern_msg->msg_iov,
93466 + (struct compat_iovec __force_user *)kern_msg->msg_iov,
93467 kern_msg->msg_iovlen);
93468 if (tot_len >= 0)
93469 kern_msg->msg_iov = kern_iov;
93470 @@ -119,20 +119,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
93471
93472 #define CMSG_COMPAT_FIRSTHDR(msg) \
93473 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
93474 - (struct compat_cmsghdr __user *)((msg)->msg_control) : \
93475 + (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
93476 (struct compat_cmsghdr __user *)NULL)
93477
93478 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
93479 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
93480 (ucmlen) <= (unsigned long) \
93481 ((mhdr)->msg_controllen - \
93482 - ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
93483 + ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
93484
93485 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
93486 struct compat_cmsghdr __user *cmsg, int cmsg_len)
93487 {
93488 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
93489 - if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
93490 + if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
93491 msg->msg_controllen)
93492 return NULL;
93493 return (struct compat_cmsghdr __user *)ptr;
93494 @@ -222,7 +222,7 @@ Efault:
93495
93496 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
93497 {
93498 - struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
93499 + struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
93500 struct compat_cmsghdr cmhdr;
93501 struct compat_timeval ctv;
93502 struct compat_timespec cts[3];
93503 @@ -278,7 +278,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
93504
93505 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
93506 {
93507 - struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
93508 + struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
93509 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
93510 int fdnum = scm->fp->count;
93511 struct file **fp = scm->fp->fp;
93512 @@ -366,7 +366,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
93513 return -EFAULT;
93514 old_fs = get_fs();
93515 set_fs(KERNEL_DS);
93516 - err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
93517 + err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
93518 set_fs(old_fs);
93519
93520 return err;
93521 @@ -427,7 +427,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
93522 len = sizeof(ktime);
93523 old_fs = get_fs();
93524 set_fs(KERNEL_DS);
93525 - err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
93526 + err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
93527 set_fs(old_fs);
93528
93529 if (!err) {
93530 @@ -570,7 +570,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
93531 case MCAST_JOIN_GROUP:
93532 case MCAST_LEAVE_GROUP:
93533 {
93534 - struct compat_group_req __user *gr32 = (void *)optval;
93535 + struct compat_group_req __user *gr32 = (void __user *)optval;
93536 struct group_req __user *kgr =
93537 compat_alloc_user_space(sizeof(struct group_req));
93538 u32 interface;
93539 @@ -591,7 +591,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
93540 case MCAST_BLOCK_SOURCE:
93541 case MCAST_UNBLOCK_SOURCE:
93542 {
93543 - struct compat_group_source_req __user *gsr32 = (void *)optval;
93544 + struct compat_group_source_req __user *gsr32 = (void __user *)optval;
93545 struct group_source_req __user *kgsr = compat_alloc_user_space(
93546 sizeof(struct group_source_req));
93547 u32 interface;
93548 @@ -612,7 +612,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
93549 }
93550 case MCAST_MSFILTER:
93551 {
93552 - struct compat_group_filter __user *gf32 = (void *)optval;
93553 + struct compat_group_filter __user *gf32 = (void __user *)optval;
93554 struct group_filter __user *kgf;
93555 u32 interface, fmode, numsrc;
93556
93557 @@ -650,7 +650,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
93558 char __user *optval, int __user *optlen,
93559 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
93560 {
93561 - struct compat_group_filter __user *gf32 = (void *)optval;
93562 + struct compat_group_filter __user *gf32 = (void __user *)optval;
93563 struct group_filter __user *kgf;
93564 int __user *koptlen;
93565 u32 interface, fmode, numsrc;
93566 @@ -808,7 +808,7 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args)
93567
93568 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
93569 return -EINVAL;
93570 - if (copy_from_user(a, args, nas[call]))
93571 + if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
93572 return -EFAULT;
93573 a0 = a[0];
93574 a1 = a[1];
93575 diff --git a/net/core/datagram.c b/net/core/datagram.c
93576 index af814e7..3d761de 100644
93577 --- a/net/core/datagram.c
93578 +++ b/net/core/datagram.c
93579 @@ -301,7 +301,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
93580 }
93581
93582 kfree_skb(skb);
93583 - atomic_inc(&sk->sk_drops);
93584 + atomic_inc_unchecked(&sk->sk_drops);
93585 sk_mem_reclaim_partial(sk);
93586
93587 return err;
93588 diff --git a/net/core/dev.c b/net/core/dev.c
93589 index 3d13874..6e78dc7 100644
93590 --- a/net/core/dev.c
93591 +++ b/net/core/dev.c
93592 @@ -1680,14 +1680,14 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
93593 {
93594 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
93595 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
93596 - atomic_long_inc(&dev->rx_dropped);
93597 + atomic_long_inc_unchecked(&dev->rx_dropped);
93598 kfree_skb(skb);
93599 return NET_RX_DROP;
93600 }
93601 }
93602
93603 if (unlikely(!is_skb_forwardable(dev, skb))) {
93604 - atomic_long_inc(&dev->rx_dropped);
93605 + atomic_long_inc_unchecked(&dev->rx_dropped);
93606 kfree_skb(skb);
93607 return NET_RX_DROP;
93608 }
93609 @@ -2428,7 +2428,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
93610
93611 struct dev_gso_cb {
93612 void (*destructor)(struct sk_buff *skb);
93613 -};
93614 +} __no_const;
93615
93616 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
93617
93618 @@ -3203,7 +3203,7 @@ enqueue:
93619
93620 local_irq_restore(flags);
93621
93622 - atomic_long_inc(&skb->dev->rx_dropped);
93623 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
93624 kfree_skb(skb);
93625 return NET_RX_DROP;
93626 }
93627 @@ -3275,7 +3275,7 @@ int netif_rx_ni(struct sk_buff *skb)
93628 }
93629 EXPORT_SYMBOL(netif_rx_ni);
93630
93631 -static void net_tx_action(struct softirq_action *h)
93632 +static __latent_entropy void net_tx_action(void)
93633 {
93634 struct softnet_data *sd = &__get_cpu_var(softnet_data);
93635
93636 @@ -3609,7 +3609,7 @@ ncls:
93637 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
93638 } else {
93639 drop:
93640 - atomic_long_inc(&skb->dev->rx_dropped);
93641 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
93642 kfree_skb(skb);
93643 /* Jamal, now you will not able to escape explaining
93644 * me how you were going to use this. :-)
93645 @@ -4269,7 +4269,7 @@ void netif_napi_del(struct napi_struct *napi)
93646 }
93647 EXPORT_SYMBOL(netif_napi_del);
93648
93649 -static void net_rx_action(struct softirq_action *h)
93650 +static __latent_entropy void net_rx_action(void)
93651 {
93652 struct softnet_data *sd = &__get_cpu_var(softnet_data);
93653 unsigned long time_limit = jiffies + 2;
93654 @@ -5973,7 +5973,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
93655 } else {
93656 netdev_stats_to_stats64(storage, &dev->stats);
93657 }
93658 - storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
93659 + storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
93660 return storage;
93661 }
93662 EXPORT_SYMBOL(dev_get_stats);
93663 diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
93664 index 5b7d0e1..cb960fc 100644
93665 --- a/net/core/dev_ioctl.c
93666 +++ b/net/core/dev_ioctl.c
93667 @@ -365,9 +365,13 @@ void dev_load(struct net *net, const char *name)
93668 if (no_module && capable(CAP_NET_ADMIN))
93669 no_module = request_module("netdev-%s", name);
93670 if (no_module && capable(CAP_SYS_MODULE)) {
93671 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
93672 + ___request_module(true, "grsec_modharden_netdev", "%s", name);
93673 +#else
93674 if (!request_module("%s", name))
93675 pr_warn("Loading kernel module for a network device with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s instead.\n",
93676 name);
93677 +#endif
93678 }
93679 }
93680 EXPORT_SYMBOL(dev_load);
93681 diff --git a/net/core/flow.c b/net/core/flow.c
93682 index dfa602c..3103d88 100644
93683 --- a/net/core/flow.c
93684 +++ b/net/core/flow.c
93685 @@ -61,7 +61,7 @@ struct flow_cache {
93686 struct timer_list rnd_timer;
93687 };
93688
93689 -atomic_t flow_cache_genid = ATOMIC_INIT(0);
93690 +atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
93691 EXPORT_SYMBOL(flow_cache_genid);
93692 static struct flow_cache flow_cache_global;
93693 static struct kmem_cache *flow_cachep __read_mostly;
93694 @@ -86,7 +86,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
93695
93696 static int flow_entry_valid(struct flow_cache_entry *fle)
93697 {
93698 - if (atomic_read(&flow_cache_genid) != fle->genid)
93699 + if (atomic_read_unchecked(&flow_cache_genid) != fle->genid)
93700 return 0;
93701 if (fle->object && !fle->object->ops->check(fle->object))
93702 return 0;
93703 @@ -258,7 +258,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
93704 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
93705 fcp->hash_count++;
93706 }
93707 - } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) {
93708 + } else if (likely(fle->genid == atomic_read_unchecked(&flow_cache_genid))) {
93709 flo = fle->object;
93710 if (!flo)
93711 goto ret_object;
93712 @@ -279,7 +279,7 @@ nocache:
93713 }
93714 flo = resolver(net, key, family, dir, flo, ctx);
93715 if (fle) {
93716 - fle->genid = atomic_read(&flow_cache_genid);
93717 + fle->genid = atomic_read_unchecked(&flow_cache_genid);
93718 if (!IS_ERR(flo))
93719 fle->object = flo;
93720 else
93721 diff --git a/net/core/iovec.c b/net/core/iovec.c
93722 index 7d84ea1..55385ae 100644
93723 --- a/net/core/iovec.c
93724 +++ b/net/core/iovec.c
93725 @@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
93726 if (m->msg_namelen) {
93727 if (mode == VERIFY_READ) {
93728 void __user *namep;
93729 - namep = (void __user __force *) m->msg_name;
93730 + namep = (void __force_user *) m->msg_name;
93731 err = move_addr_to_kernel(namep, m->msg_namelen,
93732 address);
93733 if (err < 0)
93734 @@ -55,7 +55,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
93735 }
93736
93737 size = m->msg_iovlen * sizeof(struct iovec);
93738 - if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
93739 + if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
93740 return -EFAULT;
93741
93742 m->msg_iov = iov;
93743 diff --git a/net/core/neighbour.c b/net/core/neighbour.c
93744 index 6072610..7374c18 100644
93745 --- a/net/core/neighbour.c
93746 +++ b/net/core/neighbour.c
93747 @@ -2774,7 +2774,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
93748 void __user *buffer, size_t *lenp, loff_t *ppos)
93749 {
93750 int size, ret;
93751 - struct ctl_table tmp = *ctl;
93752 + ctl_table_no_const tmp = *ctl;
93753
93754 tmp.extra1 = &zero;
93755 tmp.extra2 = &unres_qlen_max;
93756 diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
93757 index 2bf8329..7960607 100644
93758 --- a/net/core/net-procfs.c
93759 +++ b/net/core/net-procfs.c
93760 @@ -283,8 +283,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
93761 else
93762 seq_printf(seq, "%04x", ntohs(pt->type));
93763
93764 +#ifdef CONFIG_GRKERNSEC_HIDESYM
93765 + seq_printf(seq, " %-8s %pf\n",
93766 + pt->dev ? pt->dev->name : "", NULL);
93767 +#else
93768 seq_printf(seq, " %-8s %pf\n",
93769 pt->dev ? pt->dev->name : "", pt->func);
93770 +#endif
93771 }
93772
93773 return 0;
93774 diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
93775 index d954b56..b0a0f7a 100644
93776 --- a/net/core/net-sysfs.c
93777 +++ b/net/core/net-sysfs.c
93778 @@ -1356,7 +1356,7 @@ void netdev_class_remove_file(struct class_attribute *class_attr)
93779 }
93780 EXPORT_SYMBOL(netdev_class_remove_file);
93781
93782 -int netdev_kobject_init(void)
93783 +int __init netdev_kobject_init(void)
93784 {
93785 kobj_ns_type_register(&net_ns_type_operations);
93786 return class_register(&net_class);
93787 diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
93788 index 81d3a9a..a0bd7a8 100644
93789 --- a/net/core/net_namespace.c
93790 +++ b/net/core/net_namespace.c
93791 @@ -443,7 +443,7 @@ static int __register_pernet_operations(struct list_head *list,
93792 int error;
93793 LIST_HEAD(net_exit_list);
93794
93795 - list_add_tail(&ops->list, list);
93796 + pax_list_add_tail((struct list_head *)&ops->list, list);
93797 if (ops->init || (ops->id && ops->size)) {
93798 for_each_net(net) {
93799 error = ops_init(ops, net);
93800 @@ -456,7 +456,7 @@ static int __register_pernet_operations(struct list_head *list,
93801
93802 out_undo:
93803 /* If I have an error cleanup all namespaces I initialized */
93804 - list_del(&ops->list);
93805 + pax_list_del((struct list_head *)&ops->list);
93806 ops_exit_list(ops, &net_exit_list);
93807 ops_free_list(ops, &net_exit_list);
93808 return error;
93809 @@ -467,7 +467,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
93810 struct net *net;
93811 LIST_HEAD(net_exit_list);
93812
93813 - list_del(&ops->list);
93814 + pax_list_del((struct list_head *)&ops->list);
93815 for_each_net(net)
93816 list_add_tail(&net->exit_list, &net_exit_list);
93817 ops_exit_list(ops, &net_exit_list);
93818 @@ -601,7 +601,7 @@ int register_pernet_device(struct pernet_operations *ops)
93819 mutex_lock(&net_mutex);
93820 error = register_pernet_operations(&pernet_list, ops);
93821 if (!error && (first_device == &pernet_list))
93822 - first_device = &ops->list;
93823 + first_device = (struct list_head *)&ops->list;
93824 mutex_unlock(&net_mutex);
93825 return error;
93826 }
93827 diff --git a/net/core/netpoll.c b/net/core/netpoll.c
93828 index fc75c9e..8c8e9be 100644
93829 --- a/net/core/netpoll.c
93830 +++ b/net/core/netpoll.c
93831 @@ -428,7 +428,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
93832 struct udphdr *udph;
93833 struct iphdr *iph;
93834 struct ethhdr *eth;
93835 - static atomic_t ip_ident;
93836 + static atomic_unchecked_t ip_ident;
93837 struct ipv6hdr *ip6h;
93838
93839 udp_len = len + sizeof(*udph);
93840 @@ -499,7 +499,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
93841 put_unaligned(0x45, (unsigned char *)iph);
93842 iph->tos = 0;
93843 put_unaligned(htons(ip_len), &(iph->tot_len));
93844 - iph->id = htons(atomic_inc_return(&ip_ident));
93845 + iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
93846 iph->frag_off = 0;
93847 iph->ttl = 64;
93848 iph->protocol = IPPROTO_UDP;
93849 diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
93850 index 2a0e21d..6ad7642 100644
93851 --- a/net/core/rtnetlink.c
93852 +++ b/net/core/rtnetlink.c
93853 @@ -58,7 +58,7 @@ struct rtnl_link {
93854 rtnl_doit_func doit;
93855 rtnl_dumpit_func dumpit;
93856 rtnl_calcit_func calcit;
93857 -};
93858 +} __no_const;
93859
93860 static DEFINE_MUTEX(rtnl_mutex);
93861
93862 @@ -299,10 +299,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
93863 if (rtnl_link_ops_get(ops->kind))
93864 return -EEXIST;
93865
93866 - if (!ops->dellink)
93867 - ops->dellink = unregister_netdevice_queue;
93868 + if (!ops->dellink) {
93869 + pax_open_kernel();
93870 + *(void **)&ops->dellink = unregister_netdevice_queue;
93871 + pax_close_kernel();
93872 + }
93873
93874 - list_add_tail(&ops->list, &link_ops);
93875 + pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
93876 return 0;
93877 }
93878 EXPORT_SYMBOL_GPL(__rtnl_link_register);
93879 @@ -349,7 +352,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
93880 for_each_net(net) {
93881 __rtnl_kill_links(net, ops);
93882 }
93883 - list_del(&ops->list);
93884 + pax_list_del((struct list_head *)&ops->list);
93885 }
93886 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
93887
93888 diff --git a/net/core/scm.c b/net/core/scm.c
93889 index b442e7e..6f5b5a2 100644
93890 --- a/net/core/scm.c
93891 +++ b/net/core/scm.c
93892 @@ -210,7 +210,7 @@ EXPORT_SYMBOL(__scm_send);
93893 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
93894 {
93895 struct cmsghdr __user *cm
93896 - = (__force struct cmsghdr __user *)msg->msg_control;
93897 + = (struct cmsghdr __force_user *)msg->msg_control;
93898 struct cmsghdr cmhdr;
93899 int cmlen = CMSG_LEN(len);
93900 int err;
93901 @@ -233,7 +233,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
93902 err = -EFAULT;
93903 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
93904 goto out;
93905 - if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
93906 + if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
93907 goto out;
93908 cmlen = CMSG_SPACE(len);
93909 if (msg->msg_controllen < cmlen)
93910 @@ -249,7 +249,7 @@ EXPORT_SYMBOL(put_cmsg);
93911 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
93912 {
93913 struct cmsghdr __user *cm
93914 - = (__force struct cmsghdr __user*)msg->msg_control;
93915 + = (struct cmsghdr __force_user *)msg->msg_control;
93916
93917 int fdmax = 0;
93918 int fdnum = scm->fp->count;
93919 @@ -269,7 +269,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
93920 if (fdnum < fdmax)
93921 fdmax = fdnum;
93922
93923 - for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
93924 + for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
93925 i++, cmfptr++)
93926 {
93927 struct socket *sock;
93928 diff --git a/net/core/skbuff.c b/net/core/skbuff.c
93929 index c28c7fe..a399a6d 100644
93930 --- a/net/core/skbuff.c
93931 +++ b/net/core/skbuff.c
93932 @@ -3104,13 +3104,15 @@ void __init skb_init(void)
93933 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
93934 sizeof(struct sk_buff),
93935 0,
93936 - SLAB_HWCACHE_ALIGN|SLAB_PANIC,
93937 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|
93938 + SLAB_NO_SANITIZE,
93939 NULL);
93940 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
93941 (2*sizeof(struct sk_buff)) +
93942 sizeof(atomic_t),
93943 0,
93944 - SLAB_HWCACHE_ALIGN|SLAB_PANIC,
93945 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|
93946 + SLAB_NO_SANITIZE,
93947 NULL);
93948 }
93949
93950 @@ -3541,6 +3543,7 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet)
93951 skb->tstamp.tv64 = 0;
93952 skb->pkt_type = PACKET_HOST;
93953 skb->skb_iif = 0;
93954 + skb->local_df = 0;
93955 skb_dst_drop(skb);
93956 skb->mark = 0;
93957 secpath_reset(skb);
93958 diff --git a/net/core/sock.c b/net/core/sock.c
93959 index 0b39e7a..5e9f91e 100644
93960 --- a/net/core/sock.c
93961 +++ b/net/core/sock.c
93962 @@ -393,7 +393,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
93963 struct sk_buff_head *list = &sk->sk_receive_queue;
93964
93965 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
93966 - atomic_inc(&sk->sk_drops);
93967 + atomic_inc_unchecked(&sk->sk_drops);
93968 trace_sock_rcvqueue_full(sk, skb);
93969 return -ENOMEM;
93970 }
93971 @@ -403,7 +403,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
93972 return err;
93973
93974 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
93975 - atomic_inc(&sk->sk_drops);
93976 + atomic_inc_unchecked(&sk->sk_drops);
93977 return -ENOBUFS;
93978 }
93979
93980 @@ -423,7 +423,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
93981 skb_dst_force(skb);
93982
93983 spin_lock_irqsave(&list->lock, flags);
93984 - skb->dropcount = atomic_read(&sk->sk_drops);
93985 + skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
93986 __skb_queue_tail(list, skb);
93987 spin_unlock_irqrestore(&list->lock, flags);
93988
93989 @@ -443,7 +443,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
93990 skb->dev = NULL;
93991
93992 if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) {
93993 - atomic_inc(&sk->sk_drops);
93994 + atomic_inc_unchecked(&sk->sk_drops);
93995 goto discard_and_relse;
93996 }
93997 if (nested)
93998 @@ -461,7 +461,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
93999 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
94000 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
94001 bh_unlock_sock(sk);
94002 - atomic_inc(&sk->sk_drops);
94003 + atomic_inc_unchecked(&sk->sk_drops);
94004 goto discard_and_relse;
94005 }
94006
94007 @@ -949,12 +949,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
94008 struct timeval tm;
94009 } v;
94010
94011 - int lv = sizeof(int);
94012 - int len;
94013 + unsigned int lv = sizeof(int);
94014 + unsigned int len;
94015
94016 if (get_user(len, optlen))
94017 return -EFAULT;
94018 - if (len < 0)
94019 + if (len > INT_MAX)
94020 return -EINVAL;
94021
94022 memset(&v, 0, sizeof(v));
94023 @@ -1106,11 +1106,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
94024
94025 case SO_PEERNAME:
94026 {
94027 - char address[128];
94028 + char address[_K_SS_MAXSIZE];
94029
94030 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
94031 return -ENOTCONN;
94032 - if (lv < len)
94033 + if (lv < len || sizeof address < len)
94034 return -EINVAL;
94035 if (copy_to_user(optval, address, len))
94036 return -EFAULT;
94037 @@ -1183,7 +1183,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
94038
94039 if (len > lv)
94040 len = lv;
94041 - if (copy_to_user(optval, &v, len))
94042 + if (len > sizeof(v) || copy_to_user(optval, &v, len))
94043 return -EFAULT;
94044 lenout:
94045 if (put_user(len, optlen))
94046 @@ -2326,7 +2326,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
94047 */
94048 smp_wmb();
94049 atomic_set(&sk->sk_refcnt, 1);
94050 - atomic_set(&sk->sk_drops, 0);
94051 + atomic_set_unchecked(&sk->sk_drops, 0);
94052 }
94053 EXPORT_SYMBOL(sock_init_data);
94054
94055 @@ -2451,6 +2451,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
94056 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
94057 int level, int type)
94058 {
94059 + struct sock_extended_err ee;
94060 struct sock_exterr_skb *serr;
94061 struct sk_buff *skb, *skb2;
94062 int copied, err;
94063 @@ -2472,7 +2473,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
94064 sock_recv_timestamp(msg, sk, skb);
94065
94066 serr = SKB_EXT_ERR(skb);
94067 - put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
94068 + ee = serr->ee;
94069 + put_cmsg(msg, level, type, sizeof ee, &ee);
94070
94071 msg->msg_flags |= MSG_ERRQUEUE;
94072 err = copied;
94073 diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
94074 index a0e9cf6..ef7f9ed 100644
94075 --- a/net/core/sock_diag.c
94076 +++ b/net/core/sock_diag.c
94077 @@ -9,26 +9,33 @@
94078 #include <linux/inet_diag.h>
94079 #include <linux/sock_diag.h>
94080
94081 -static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
94082 +static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
94083 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
94084 static DEFINE_MUTEX(sock_diag_table_mutex);
94085
94086 int sock_diag_check_cookie(void *sk, __u32 *cookie)
94087 {
94088 +#ifndef CONFIG_GRKERNSEC_HIDESYM
94089 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
94090 cookie[1] != INET_DIAG_NOCOOKIE) &&
94091 ((u32)(unsigned long)sk != cookie[0] ||
94092 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
94093 return -ESTALE;
94094 else
94095 +#endif
94096 return 0;
94097 }
94098 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
94099
94100 void sock_diag_save_cookie(void *sk, __u32 *cookie)
94101 {
94102 +#ifdef CONFIG_GRKERNSEC_HIDESYM
94103 + cookie[0] = 0;
94104 + cookie[1] = 0;
94105 +#else
94106 cookie[0] = (u32)(unsigned long)sk;
94107 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
94108 +#endif
94109 }
94110 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
94111
94112 @@ -113,8 +120,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
94113 mutex_lock(&sock_diag_table_mutex);
94114 if (sock_diag_handlers[hndl->family])
94115 err = -EBUSY;
94116 - else
94117 + else {
94118 + pax_open_kernel();
94119 sock_diag_handlers[hndl->family] = hndl;
94120 + pax_close_kernel();
94121 + }
94122 mutex_unlock(&sock_diag_table_mutex);
94123
94124 return err;
94125 @@ -130,7 +140,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
94126
94127 mutex_lock(&sock_diag_table_mutex);
94128 BUG_ON(sock_diag_handlers[family] != hnld);
94129 + pax_open_kernel();
94130 sock_diag_handlers[family] = NULL;
94131 + pax_close_kernel();
94132 mutex_unlock(&sock_diag_table_mutex);
94133 }
94134 EXPORT_SYMBOL_GPL(sock_diag_unregister);
94135 diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
94136 index cca4441..5e616de 100644
94137 --- a/net/core/sysctl_net_core.c
94138 +++ b/net/core/sysctl_net_core.c
94139 @@ -32,7 +32,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
94140 {
94141 unsigned int orig_size, size;
94142 int ret, i;
94143 - struct ctl_table tmp = {
94144 + ctl_table_no_const tmp = {
94145 .data = &size,
94146 .maxlen = sizeof(size),
94147 .mode = table->mode
94148 @@ -199,7 +199,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
94149 void __user *buffer, size_t *lenp, loff_t *ppos)
94150 {
94151 char id[IFNAMSIZ];
94152 - struct ctl_table tbl = {
94153 + ctl_table_no_const tbl = {
94154 .data = id,
94155 .maxlen = IFNAMSIZ,
94156 };
94157 @@ -378,13 +378,12 @@ static struct ctl_table netns_core_table[] = {
94158
94159 static __net_init int sysctl_core_net_init(struct net *net)
94160 {
94161 - struct ctl_table *tbl;
94162 + ctl_table_no_const *tbl = NULL;
94163
94164 net->core.sysctl_somaxconn = SOMAXCONN;
94165
94166 - tbl = netns_core_table;
94167 if (!net_eq(net, &init_net)) {
94168 - tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
94169 + tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
94170 if (tbl == NULL)
94171 goto err_dup;
94172
94173 @@ -394,17 +393,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
94174 if (net->user_ns != &init_user_ns) {
94175 tbl[0].procname = NULL;
94176 }
94177 - }
94178 -
94179 - net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
94180 + net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
94181 + } else
94182 + net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
94183 if (net->core.sysctl_hdr == NULL)
94184 goto err_reg;
94185
94186 return 0;
94187
94188 err_reg:
94189 - if (tbl != netns_core_table)
94190 - kfree(tbl);
94191 + kfree(tbl);
94192 err_dup:
94193 return -ENOMEM;
94194 }
94195 @@ -419,7 +417,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
94196 kfree(tbl);
94197 }
94198
94199 -static __net_initdata struct pernet_operations sysctl_core_ops = {
94200 +static __net_initconst struct pernet_operations sysctl_core_ops = {
94201 .init = sysctl_core_net_init,
94202 .exit = sysctl_core_net_exit,
94203 };
94204 diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
94205 index dd4d506..fb2fb87 100644
94206 --- a/net/decnet/af_decnet.c
94207 +++ b/net/decnet/af_decnet.c
94208 @@ -465,6 +465,7 @@ static struct proto dn_proto = {
94209 .sysctl_rmem = sysctl_decnet_rmem,
94210 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
94211 .obj_size = sizeof(struct dn_sock),
94212 + .slab_flags = SLAB_USERCOPY,
94213 };
94214
94215 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
94216 diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
94217 index 5325b54..a0d4d69 100644
94218 --- a/net/decnet/sysctl_net_decnet.c
94219 +++ b/net/decnet/sysctl_net_decnet.c
94220 @@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
94221
94222 if (len > *lenp) len = *lenp;
94223
94224 - if (copy_to_user(buffer, addr, len))
94225 + if (len > sizeof addr || copy_to_user(buffer, addr, len))
94226 return -EFAULT;
94227
94228 *lenp = len;
94229 @@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
94230
94231 if (len > *lenp) len = *lenp;
94232
94233 - if (copy_to_user(buffer, devname, len))
94234 + if (len > sizeof devname || copy_to_user(buffer, devname, len))
94235 return -EFAULT;
94236
94237 *lenp = len;
94238 diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
94239 index 008f337..b03b8c9 100644
94240 --- a/net/ieee802154/6lowpan.c
94241 +++ b/net/ieee802154/6lowpan.c
94242 @@ -548,7 +548,7 @@ static int lowpan_header_create(struct sk_buff *skb,
94243 hc06_ptr += 3;
94244 } else {
94245 /* compress nothing */
94246 - memcpy(hc06_ptr, &hdr, 4);
94247 + memcpy(hc06_ptr, hdr, 4);
94248 /* replace the top byte with new ECN | DSCP format */
94249 *hc06_ptr = tmp;
94250 hc06_ptr += 4;
94251 diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
94252 index cfeb85c..385989a 100644
94253 --- a/net/ipv4/af_inet.c
94254 +++ b/net/ipv4/af_inet.c
94255 @@ -1675,13 +1675,9 @@ static int __init inet_init(void)
94256
94257 BUILD_BUG_ON(sizeof(struct inet_skb_parm) > FIELD_SIZEOF(struct sk_buff, cb));
94258
94259 - sysctl_local_reserved_ports = kzalloc(65536 / 8, GFP_KERNEL);
94260 - if (!sysctl_local_reserved_ports)
94261 - goto out;
94262 -
94263 rc = proto_register(&tcp_prot, 1);
94264 if (rc)
94265 - goto out_free_reserved_ports;
94266 + goto out;
94267
94268 rc = proto_register(&udp_prot, 1);
94269 if (rc)
94270 @@ -1790,8 +1786,6 @@ out_unregister_udp_proto:
94271 proto_unregister(&udp_prot);
94272 out_unregister_tcp_proto:
94273 proto_unregister(&tcp_prot);
94274 -out_free_reserved_ports:
94275 - kfree(sysctl_local_reserved_ports);
94276 goto out;
94277 }
94278
94279 diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
94280 index a1b5bcb..62ec5c6 100644
94281 --- a/net/ipv4/devinet.c
94282 +++ b/net/ipv4/devinet.c
94283 @@ -1533,7 +1533,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
94284 idx = 0;
94285 head = &net->dev_index_head[h];
94286 rcu_read_lock();
94287 - cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
94288 + cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
94289 net->dev_base_seq;
94290 hlist_for_each_entry_rcu(dev, head, index_hlist) {
94291 if (idx < s_idx)
94292 @@ -1844,7 +1844,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
94293 idx = 0;
94294 head = &net->dev_index_head[h];
94295 rcu_read_lock();
94296 - cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
94297 + cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
94298 net->dev_base_seq;
94299 hlist_for_each_entry_rcu(dev, head, index_hlist) {
94300 if (idx < s_idx)
94301 @@ -2069,7 +2069,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
94302 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
94303 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
94304
94305 -static struct devinet_sysctl_table {
94306 +static const struct devinet_sysctl_table {
94307 struct ctl_table_header *sysctl_header;
94308 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
94309 } devinet_sysctl = {
94310 @@ -2191,7 +2191,7 @@ static __net_init int devinet_init_net(struct net *net)
94311 int err;
94312 struct ipv4_devconf *all, *dflt;
94313 #ifdef CONFIG_SYSCTL
94314 - struct ctl_table *tbl = ctl_forward_entry;
94315 + ctl_table_no_const *tbl = NULL;
94316 struct ctl_table_header *forw_hdr;
94317 #endif
94318
94319 @@ -2209,7 +2209,7 @@ static __net_init int devinet_init_net(struct net *net)
94320 goto err_alloc_dflt;
94321
94322 #ifdef CONFIG_SYSCTL
94323 - tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
94324 + tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
94325 if (tbl == NULL)
94326 goto err_alloc_ctl;
94327
94328 @@ -2229,7 +2229,10 @@ static __net_init int devinet_init_net(struct net *net)
94329 goto err_reg_dflt;
94330
94331 err = -ENOMEM;
94332 - forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
94333 + if (!net_eq(net, &init_net))
94334 + forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
94335 + else
94336 + forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
94337 if (forw_hdr == NULL)
94338 goto err_reg_ctl;
94339 net->ipv4.forw_hdr = forw_hdr;
94340 @@ -2245,8 +2248,7 @@ err_reg_ctl:
94341 err_reg_dflt:
94342 __devinet_sysctl_unregister(all);
94343 err_reg_all:
94344 - if (tbl != ctl_forward_entry)
94345 - kfree(tbl);
94346 + kfree(tbl);
94347 err_alloc_ctl:
94348 #endif
94349 if (dflt != &ipv4_devconf_dflt)
94350 diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
94351 index b3f627a..b0f3e99 100644
94352 --- a/net/ipv4/fib_frontend.c
94353 +++ b/net/ipv4/fib_frontend.c
94354 @@ -1017,12 +1017,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
94355 #ifdef CONFIG_IP_ROUTE_MULTIPATH
94356 fib_sync_up(dev);
94357 #endif
94358 - atomic_inc(&net->ipv4.dev_addr_genid);
94359 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
94360 rt_cache_flush(dev_net(dev));
94361 break;
94362 case NETDEV_DOWN:
94363 fib_del_ifaddr(ifa, NULL);
94364 - atomic_inc(&net->ipv4.dev_addr_genid);
94365 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
94366 if (ifa->ifa_dev->ifa_list == NULL) {
94367 /* Last address was deleted from this interface.
94368 * Disable IP.
94369 @@ -1058,7 +1058,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
94370 #ifdef CONFIG_IP_ROUTE_MULTIPATH
94371 fib_sync_up(dev);
94372 #endif
94373 - atomic_inc(&net->ipv4.dev_addr_genid);
94374 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
94375 rt_cache_flush(net);
94376 break;
94377 case NETDEV_DOWN:
94378 diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
94379 index d5dbca5..6251d5f 100644
94380 --- a/net/ipv4/fib_semantics.c
94381 +++ b/net/ipv4/fib_semantics.c
94382 @@ -766,7 +766,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
94383 nh->nh_saddr = inet_select_addr(nh->nh_dev,
94384 nh->nh_gw,
94385 nh->nh_parent->fib_scope);
94386 - nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
94387 + nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
94388
94389 return nh->nh_saddr;
94390 }
94391 diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
94392 index 6acb541..9ea617d 100644
94393 --- a/net/ipv4/inet_connection_sock.c
94394 +++ b/net/ipv4/inet_connection_sock.c
94395 @@ -37,7 +37,7 @@ struct local_ports sysctl_local_ports __read_mostly = {
94396 .range = { 32768, 61000 },
94397 };
94398
94399 -unsigned long *sysctl_local_reserved_ports;
94400 +unsigned long sysctl_local_reserved_ports[65536 / 8 / sizeof(unsigned long)];
94401 EXPORT_SYMBOL(sysctl_local_reserved_ports);
94402
94403 void inet_get_local_port_range(int *low, int *high)
94404 diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
94405 index 5f64875..31cf54d 100644
94406 --- a/net/ipv4/inet_diag.c
94407 +++ b/net/ipv4/inet_diag.c
94408 @@ -106,6 +106,10 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,
94409
94410 r->id.idiag_sport = inet->inet_sport;
94411 r->id.idiag_dport = inet->inet_dport;
94412 +
94413 + memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
94414 + memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
94415 +
94416 r->id.idiag_src[0] = inet->inet_rcv_saddr;
94417 r->id.idiag_dst[0] = inet->inet_daddr;
94418
94419 @@ -240,12 +244,19 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
94420
94421 r->idiag_family = tw->tw_family;
94422 r->idiag_retrans = 0;
94423 +
94424 r->id.idiag_if = tw->tw_bound_dev_if;
94425 sock_diag_save_cookie(tw, r->id.idiag_cookie);
94426 +
94427 r->id.idiag_sport = tw->tw_sport;
94428 r->id.idiag_dport = tw->tw_dport;
94429 +
94430 + memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
94431 + memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
94432 +
94433 r->id.idiag_src[0] = tw->tw_rcv_saddr;
94434 r->id.idiag_dst[0] = tw->tw_daddr;
94435 +
94436 r->idiag_state = tw->tw_substate;
94437 r->idiag_timer = 3;
94438 r->idiag_expires = DIV_ROUND_UP(tmo * 1000, HZ);
94439 @@ -732,8 +743,13 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
94440
94441 r->id.idiag_sport = inet->inet_sport;
94442 r->id.idiag_dport = ireq->rmt_port;
94443 +
94444 + memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
94445 + memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
94446 +
94447 r->id.idiag_src[0] = ireq->loc_addr;
94448 r->id.idiag_dst[0] = ireq->rmt_addr;
94449 +
94450 r->idiag_expires = jiffies_to_msecs(tmo);
94451 r->idiag_rqueue = 0;
94452 r->idiag_wqueue = 0;
94453 diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
94454 index 96da9c7..b956690 100644
94455 --- a/net/ipv4/inet_hashtables.c
94456 +++ b/net/ipv4/inet_hashtables.c
94457 @@ -18,12 +18,15 @@
94458 #include <linux/sched.h>
94459 #include <linux/slab.h>
94460 #include <linux/wait.h>
94461 +#include <linux/security.h>
94462
94463 #include <net/inet_connection_sock.h>
94464 #include <net/inet_hashtables.h>
94465 #include <net/secure_seq.h>
94466 #include <net/ip.h>
94467
94468 +extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
94469 +
94470 /*
94471 * Allocate and initialize a new local port bind bucket.
94472 * The bindhash mutex for snum's hash chain must be held here.
94473 @@ -554,6 +557,8 @@ ok:
94474 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
94475 spin_unlock(&head->lock);
94476
94477 + gr_update_task_in_ip_table(current, inet_sk(sk));
94478 +
94479 if (tw) {
94480 inet_twsk_deschedule(tw, death_row);
94481 while (twrefcnt) {
94482 diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
94483 index 33d5537..da337a4 100644
94484 --- a/net/ipv4/inetpeer.c
94485 +++ b/net/ipv4/inetpeer.c
94486 @@ -503,8 +503,8 @@ relookup:
94487 if (p) {
94488 p->daddr = *daddr;
94489 atomic_set(&p->refcnt, 1);
94490 - atomic_set(&p->rid, 0);
94491 - atomic_set(&p->ip_id_count,
94492 + atomic_set_unchecked(&p->rid, 0);
94493 + atomic_set_unchecked(&p->ip_id_count,
94494 (daddr->family == AF_INET) ?
94495 secure_ip_id(daddr->addr.a4) :
94496 secure_ipv6_id(daddr->addr.a6));
94497 diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
94498 index b66910a..cfe416e 100644
94499 --- a/net/ipv4/ip_fragment.c
94500 +++ b/net/ipv4/ip_fragment.c
94501 @@ -282,7 +282,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
94502 return 0;
94503
94504 start = qp->rid;
94505 - end = atomic_inc_return(&peer->rid);
94506 + end = atomic_inc_return_unchecked(&peer->rid);
94507 qp->rid = end;
94508
94509 rc = qp->q.fragments && (end - start) > max;
94510 @@ -759,12 +759,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
94511
94512 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
94513 {
94514 - struct ctl_table *table;
94515 + ctl_table_no_const *table = NULL;
94516 struct ctl_table_header *hdr;
94517
94518 - table = ip4_frags_ns_ctl_table;
94519 if (!net_eq(net, &init_net)) {
94520 - table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
94521 + table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
94522 if (table == NULL)
94523 goto err_alloc;
94524
94525 @@ -775,9 +774,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
94526 /* Don't export sysctls to unprivileged users */
94527 if (net->user_ns != &init_user_ns)
94528 table[0].procname = NULL;
94529 - }
94530 + hdr = register_net_sysctl(net, "net/ipv4", table);
94531 + } else
94532 + hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
94533
94534 - hdr = register_net_sysctl(net, "net/ipv4", table);
94535 if (hdr == NULL)
94536 goto err_reg;
94537
94538 @@ -785,8 +785,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
94539 return 0;
94540
94541 err_reg:
94542 - if (!net_eq(net, &init_net))
94543 - kfree(table);
94544 + kfree(table);
94545 err_alloc:
94546 return -ENOMEM;
94547 }
94548 diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
94549 index d7aea4c..a8ee872 100644
94550 --- a/net/ipv4/ip_gre.c
94551 +++ b/net/ipv4/ip_gre.c
94552 @@ -115,7 +115,7 @@ static bool log_ecn_error = true;
94553 module_param(log_ecn_error, bool, 0644);
94554 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
94555
94556 -static struct rtnl_link_ops ipgre_link_ops __read_mostly;
94557 +static struct rtnl_link_ops ipgre_link_ops;
94558 static int ipgre_tunnel_init(struct net_device *dev);
94559
94560 static int ipgre_net_id __read_mostly;
94561 @@ -731,7 +731,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
94562 [IFLA_GRE_PMTUDISC] = { .type = NLA_U8 },
94563 };
94564
94565 -static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
94566 +static struct rtnl_link_ops ipgre_link_ops = {
94567 .kind = "gre",
94568 .maxtype = IFLA_GRE_MAX,
94569 .policy = ipgre_policy,
94570 @@ -745,7 +745,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
94571 .fill_info = ipgre_fill_info,
94572 };
94573
94574 -static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
94575 +static struct rtnl_link_ops ipgre_tap_ops = {
94576 .kind = "gretap",
94577 .maxtype = IFLA_GRE_MAX,
94578 .policy = ipgre_policy,
94579 diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
94580 index 23e6ab0..be67a57 100644
94581 --- a/net/ipv4/ip_sockglue.c
94582 +++ b/net/ipv4/ip_sockglue.c
94583 @@ -1153,7 +1153,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
94584 len = min_t(unsigned int, len, opt->optlen);
94585 if (put_user(len, optlen))
94586 return -EFAULT;
94587 - if (copy_to_user(optval, opt->__data, len))
94588 + if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
94589 + copy_to_user(optval, opt->__data, len))
94590 return -EFAULT;
94591 return 0;
94592 }
94593 @@ -1284,7 +1285,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
94594 if (sk->sk_type != SOCK_STREAM)
94595 return -ENOPROTOOPT;
94596
94597 - msg.msg_control = optval;
94598 + msg.msg_control = (void __force_kernel *)optval;
94599 msg.msg_controllen = len;
94600 msg.msg_flags = flags;
94601
94602 diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
94603 index 26847e1..75d2d2f 100644
94604 --- a/net/ipv4/ip_vti.c
94605 +++ b/net/ipv4/ip_vti.c
94606 @@ -44,7 +44,7 @@
94607 #include <net/net_namespace.h>
94608 #include <net/netns/generic.h>
94609
94610 -static struct rtnl_link_ops vti_link_ops __read_mostly;
94611 +static struct rtnl_link_ops vti_link_ops;
94612
94613 static int vti_net_id __read_mostly;
94614 static int vti_tunnel_init(struct net_device *dev);
94615 @@ -425,7 +425,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
94616 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
94617 };
94618
94619 -static struct rtnl_link_ops vti_link_ops __read_mostly = {
94620 +static struct rtnl_link_ops vti_link_ops = {
94621 .kind = "vti",
94622 .maxtype = IFLA_VTI_MAX,
94623 .policy = vti_policy,
94624 diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
94625 index efa1138..20dbba0 100644
94626 --- a/net/ipv4/ipconfig.c
94627 +++ b/net/ipv4/ipconfig.c
94628 @@ -334,7 +334,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
94629
94630 mm_segment_t oldfs = get_fs();
94631 set_fs(get_ds());
94632 - res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
94633 + res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
94634 set_fs(oldfs);
94635 return res;
94636 }
94637 @@ -345,7 +345,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
94638
94639 mm_segment_t oldfs = get_fs();
94640 set_fs(get_ds());
94641 - res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
94642 + res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
94643 set_fs(oldfs);
94644 return res;
94645 }
94646 @@ -356,7 +356,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
94647
94648 mm_segment_t oldfs = get_fs();
94649 set_fs(get_ds());
94650 - res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
94651 + res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
94652 set_fs(oldfs);
94653 return res;
94654 }
94655 diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
94656 index 7f80fb4..b0328f6 100644
94657 --- a/net/ipv4/ipip.c
94658 +++ b/net/ipv4/ipip.c
94659 @@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
94660 static int ipip_net_id __read_mostly;
94661
94662 static int ipip_tunnel_init(struct net_device *dev);
94663 -static struct rtnl_link_ops ipip_link_ops __read_mostly;
94664 +static struct rtnl_link_ops ipip_link_ops;
94665
94666 static int ipip_err(struct sk_buff *skb, u32 info)
94667 {
94668 @@ -408,7 +408,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
94669 [IFLA_IPTUN_PMTUDISC] = { .type = NLA_U8 },
94670 };
94671
94672 -static struct rtnl_link_ops ipip_link_ops __read_mostly = {
94673 +static struct rtnl_link_ops ipip_link_ops = {
94674 .kind = "ipip",
94675 .maxtype = IFLA_IPTUN_MAX,
94676 .policy = ipip_policy,
94677 diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
94678 index 85a4f21..1beb1f5 100644
94679 --- a/net/ipv4/netfilter/arp_tables.c
94680 +++ b/net/ipv4/netfilter/arp_tables.c
94681 @@ -880,14 +880,14 @@ static int compat_table_info(const struct xt_table_info *info,
94682 #endif
94683
94684 static int get_info(struct net *net, void __user *user,
94685 - const int *len, int compat)
94686 + int len, int compat)
94687 {
94688 char name[XT_TABLE_MAXNAMELEN];
94689 struct xt_table *t;
94690 int ret;
94691
94692 - if (*len != sizeof(struct arpt_getinfo)) {
94693 - duprintf("length %u != %Zu\n", *len,
94694 + if (len != sizeof(struct arpt_getinfo)) {
94695 + duprintf("length %u != %Zu\n", len,
94696 sizeof(struct arpt_getinfo));
94697 return -EINVAL;
94698 }
94699 @@ -924,7 +924,7 @@ static int get_info(struct net *net, void __user *user,
94700 info.size = private->size;
94701 strcpy(info.name, name);
94702
94703 - if (copy_to_user(user, &info, *len) != 0)
94704 + if (copy_to_user(user, &info, len) != 0)
94705 ret = -EFAULT;
94706 else
94707 ret = 0;
94708 @@ -1683,7 +1683,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
94709
94710 switch (cmd) {
94711 case ARPT_SO_GET_INFO:
94712 - ret = get_info(sock_net(sk), user, len, 1);
94713 + ret = get_info(sock_net(sk), user, *len, 1);
94714 break;
94715 case ARPT_SO_GET_ENTRIES:
94716 ret = compat_get_entries(sock_net(sk), user, len);
94717 @@ -1728,7 +1728,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
94718
94719 switch (cmd) {
94720 case ARPT_SO_GET_INFO:
94721 - ret = get_info(sock_net(sk), user, len, 0);
94722 + ret = get_info(sock_net(sk), user, *len, 0);
94723 break;
94724
94725 case ARPT_SO_GET_ENTRIES:
94726 diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
94727 index d23118d..6ad7277 100644
94728 --- a/net/ipv4/netfilter/ip_tables.c
94729 +++ b/net/ipv4/netfilter/ip_tables.c
94730 @@ -1068,14 +1068,14 @@ static int compat_table_info(const struct xt_table_info *info,
94731 #endif
94732
94733 static int get_info(struct net *net, void __user *user,
94734 - const int *len, int compat)
94735 + int len, int compat)
94736 {
94737 char name[XT_TABLE_MAXNAMELEN];
94738 struct xt_table *t;
94739 int ret;
94740
94741 - if (*len != sizeof(struct ipt_getinfo)) {
94742 - duprintf("length %u != %zu\n", *len,
94743 + if (len != sizeof(struct ipt_getinfo)) {
94744 + duprintf("length %u != %zu\n", len,
94745 sizeof(struct ipt_getinfo));
94746 return -EINVAL;
94747 }
94748 @@ -1112,7 +1112,7 @@ static int get_info(struct net *net, void __user *user,
94749 info.size = private->size;
94750 strcpy(info.name, name);
94751
94752 - if (copy_to_user(user, &info, *len) != 0)
94753 + if (copy_to_user(user, &info, len) != 0)
94754 ret = -EFAULT;
94755 else
94756 ret = 0;
94757 @@ -1966,7 +1966,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
94758
94759 switch (cmd) {
94760 case IPT_SO_GET_INFO:
94761 - ret = get_info(sock_net(sk), user, len, 1);
94762 + ret = get_info(sock_net(sk), user, *len, 1);
94763 break;
94764 case IPT_SO_GET_ENTRIES:
94765 ret = compat_get_entries(sock_net(sk), user, len);
94766 @@ -2013,7 +2013,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
94767
94768 switch (cmd) {
94769 case IPT_SO_GET_INFO:
94770 - ret = get_info(sock_net(sk), user, len, 0);
94771 + ret = get_info(sock_net(sk), user, *len, 0);
94772 break;
94773
94774 case IPT_SO_GET_ENTRIES:
94775 diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
94776 index cbc2215..9cb993c 100644
94777 --- a/net/ipv4/netfilter/ipt_ULOG.c
94778 +++ b/net/ipv4/netfilter/ipt_ULOG.c
94779 @@ -220,6 +220,7 @@ static void ipt_ulog_packet(struct net *net,
94780 ub->qlen++;
94781
94782 pm = nlmsg_data(nlh);
94783 + memset(pm, 0, sizeof(*pm));
94784
94785 /* We might not have a timestamp, get one */
94786 if (skb->tstamp.tv64 == 0)
94787 @@ -238,8 +239,6 @@ static void ipt_ulog_packet(struct net *net,
94788 }
94789 else if (loginfo->prefix[0] != '\0')
94790 strncpy(pm->prefix, loginfo->prefix, sizeof(pm->prefix));
94791 - else
94792 - *(pm->prefix) = '\0';
94793
94794 if (in && in->hard_header_len > 0 &&
94795 skb->mac_header != skb->network_header &&
94796 @@ -251,13 +250,9 @@ static void ipt_ulog_packet(struct net *net,
94797
94798 if (in)
94799 strncpy(pm->indev_name, in->name, sizeof(pm->indev_name));
94800 - else
94801 - pm->indev_name[0] = '\0';
94802
94803 if (out)
94804 strncpy(pm->outdev_name, out->name, sizeof(pm->outdev_name));
94805 - else
94806 - pm->outdev_name[0] = '\0';
94807
94808 /* copy_len <= skb->len, so can't fail. */
94809 if (skb_copy_bits(skb, 0, pm->payload, copy_len) < 0)
94810 diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
94811 index c482f7c..2784262 100644
94812 --- a/net/ipv4/ping.c
94813 +++ b/net/ipv4/ping.c
94814 @@ -55,7 +55,7 @@
94815
94816
94817 struct ping_table ping_table;
94818 -struct pingv6_ops pingv6_ops;
94819 +struct pingv6_ops *pingv6_ops;
94820 EXPORT_SYMBOL_GPL(pingv6_ops);
94821
94822 static u16 ping_port_rover;
94823 @@ -335,7 +335,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
94824 return -ENODEV;
94825 }
94826 }
94827 - has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
94828 + has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
94829 scoped);
94830 rcu_read_unlock();
94831
94832 @@ -541,7 +541,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
94833 }
94834 #if IS_ENABLED(CONFIG_IPV6)
94835 } else if (skb->protocol == htons(ETH_P_IPV6)) {
94836 - harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
94837 + harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
94838 #endif
94839 }
94840
94841 @@ -559,7 +559,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
94842 info, (u8 *)icmph);
94843 #if IS_ENABLED(CONFIG_IPV6)
94844 } else if (family == AF_INET6) {
94845 - pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
94846 + pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
94847 info, (u8 *)icmph);
94848 #endif
94849 }
94850 @@ -841,7 +841,7 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
94851 return ip_recv_error(sk, msg, len, addr_len);
94852 #if IS_ENABLED(CONFIG_IPV6)
94853 } else if (family == AF_INET6) {
94854 - return pingv6_ops.ipv6_recv_error(sk, msg, len,
94855 + return pingv6_ops->ipv6_recv_error(sk, msg, len,
94856 addr_len);
94857 #endif
94858 }
94859 @@ -900,7 +900,7 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
94860 }
94861
94862 if (inet6_sk(sk)->rxopt.all)
94863 - pingv6_ops.ip6_datagram_recv_ctl(sk, msg, skb);
94864 + pingv6_ops->ip6_datagram_recv_ctl(sk, msg, skb);
94865 #endif
94866 } else {
94867 BUG();
94868 @@ -1090,7 +1090,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
94869 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
94870 0, sock_i_ino(sp),
94871 atomic_read(&sp->sk_refcnt), sp,
94872 - atomic_read(&sp->sk_drops), len);
94873 + atomic_read_unchecked(&sp->sk_drops), len);
94874 }
94875
94876 static int ping_v4_seq_show(struct seq_file *seq, void *v)
94877 diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
94878 index 7d3db78..9fd511d 100644
94879 --- a/net/ipv4/raw.c
94880 +++ b/net/ipv4/raw.c
94881 @@ -311,7 +311,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
94882 int raw_rcv(struct sock *sk, struct sk_buff *skb)
94883 {
94884 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
94885 - atomic_inc(&sk->sk_drops);
94886 + atomic_inc_unchecked(&sk->sk_drops);
94887 kfree_skb(skb);
94888 return NET_RX_DROP;
94889 }
94890 @@ -746,16 +746,20 @@ static int raw_init(struct sock *sk)
94891
94892 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
94893 {
94894 + struct icmp_filter filter;
94895 +
94896 if (optlen > sizeof(struct icmp_filter))
94897 optlen = sizeof(struct icmp_filter);
94898 - if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
94899 + if (copy_from_user(&filter, optval, optlen))
94900 return -EFAULT;
94901 + raw_sk(sk)->filter = filter;
94902 return 0;
94903 }
94904
94905 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
94906 {
94907 int len, ret = -EFAULT;
94908 + struct icmp_filter filter;
94909
94910 if (get_user(len, optlen))
94911 goto out;
94912 @@ -765,8 +769,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
94913 if (len > sizeof(struct icmp_filter))
94914 len = sizeof(struct icmp_filter);
94915 ret = -EFAULT;
94916 - if (put_user(len, optlen) ||
94917 - copy_to_user(optval, &raw_sk(sk)->filter, len))
94918 + filter = raw_sk(sk)->filter;
94919 + if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
94920 goto out;
94921 ret = 0;
94922 out: return ret;
94923 @@ -995,7 +999,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
94924 0, 0L, 0,
94925 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
94926 0, sock_i_ino(sp),
94927 - atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
94928 + atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
94929 }
94930
94931 static int raw_seq_show(struct seq_file *seq, void *v)
94932 diff --git a/net/ipv4/route.c b/net/ipv4/route.c
94933 index 62290b5..f0d944f 100644
94934 --- a/net/ipv4/route.c
94935 +++ b/net/ipv4/route.c
94936 @@ -2617,34 +2617,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
94937 .maxlen = sizeof(int),
94938 .mode = 0200,
94939 .proc_handler = ipv4_sysctl_rtcache_flush,
94940 + .extra1 = &init_net,
94941 },
94942 { },
94943 };
94944
94945 static __net_init int sysctl_route_net_init(struct net *net)
94946 {
94947 - struct ctl_table *tbl;
94948 + ctl_table_no_const *tbl = NULL;
94949
94950 - tbl = ipv4_route_flush_table;
94951 if (!net_eq(net, &init_net)) {
94952 - tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
94953 + tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
94954 if (tbl == NULL)
94955 goto err_dup;
94956
94957 /* Don't export sysctls to unprivileged users */
94958 if (net->user_ns != &init_user_ns)
94959 tbl[0].procname = NULL;
94960 - }
94961 - tbl[0].extra1 = net;
94962 + tbl[0].extra1 = net;
94963 + net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
94964 + } else
94965 + net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
94966
94967 - net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
94968 if (net->ipv4.route_hdr == NULL)
94969 goto err_reg;
94970 return 0;
94971
94972 err_reg:
94973 - if (tbl != ipv4_route_flush_table)
94974 - kfree(tbl);
94975 + kfree(tbl);
94976 err_dup:
94977 return -ENOMEM;
94978 }
94979 @@ -2667,8 +2667,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
94980
94981 static __net_init int rt_genid_init(struct net *net)
94982 {
94983 - atomic_set(&net->ipv4.rt_genid, 0);
94984 - atomic_set(&net->fnhe_genid, 0);
94985 + atomic_set_unchecked(&net->ipv4.rt_genid, 0);
94986 + atomic_set_unchecked(&net->fnhe_genid, 0);
94987 get_random_bytes(&net->ipv4.dev_addr_genid,
94988 sizeof(net->ipv4.dev_addr_genid));
94989 return 0;
94990 diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
94991 index 540279f..9855b16 100644
94992 --- a/net/ipv4/sysctl_net_ipv4.c
94993 +++ b/net/ipv4/sysctl_net_ipv4.c
94994 @@ -58,7 +58,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
94995 {
94996 int ret;
94997 int range[2];
94998 - struct ctl_table tmp = {
94999 + ctl_table_no_const tmp = {
95000 .data = &range,
95001 .maxlen = sizeof(range),
95002 .mode = table->mode,
95003 @@ -111,7 +111,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
95004 int ret;
95005 gid_t urange[2];
95006 kgid_t low, high;
95007 - struct ctl_table tmp = {
95008 + ctl_table_no_const tmp = {
95009 .data = &urange,
95010 .maxlen = sizeof(urange),
95011 .mode = table->mode,
95012 @@ -142,7 +142,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
95013 void __user *buffer, size_t *lenp, loff_t *ppos)
95014 {
95015 char val[TCP_CA_NAME_MAX];
95016 - struct ctl_table tbl = {
95017 + ctl_table_no_const tbl = {
95018 .data = val,
95019 .maxlen = TCP_CA_NAME_MAX,
95020 };
95021 @@ -161,7 +161,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
95022 void __user *buffer, size_t *lenp,
95023 loff_t *ppos)
95024 {
95025 - struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
95026 + ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
95027 int ret;
95028
95029 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
95030 @@ -178,7 +178,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
95031 void __user *buffer, size_t *lenp,
95032 loff_t *ppos)
95033 {
95034 - struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
95035 + ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
95036 int ret;
95037
95038 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
95039 @@ -204,15 +204,17 @@ static int ipv4_tcp_mem(struct ctl_table *ctl, int write,
95040 struct mem_cgroup *memcg;
95041 #endif
95042
95043 - struct ctl_table tmp = {
95044 + ctl_table_no_const tmp = {
95045 .data = &vec,
95046 .maxlen = sizeof(vec),
95047 .mode = ctl->mode,
95048 };
95049
95050 if (!write) {
95051 - ctl->data = &net->ipv4.sysctl_tcp_mem;
95052 - return proc_doulongvec_minmax(ctl, write, buffer, lenp, ppos);
95053 + ctl_table_no_const tcp_mem = *ctl;
95054 +
95055 + tcp_mem.data = &net->ipv4.sysctl_tcp_mem;
95056 + return proc_doulongvec_minmax(&tcp_mem, write, buffer, lenp, ppos);
95057 }
95058
95059 ret = proc_doulongvec_minmax(&tmp, write, buffer, lenp, ppos);
95060 @@ -240,7 +242,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
95061 void __user *buffer, size_t *lenp,
95062 loff_t *ppos)
95063 {
95064 - struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
95065 + ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
95066 struct tcp_fastopen_context *ctxt;
95067 int ret;
95068 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
95069 @@ -483,7 +485,7 @@ static struct ctl_table ipv4_table[] = {
95070 },
95071 {
95072 .procname = "ip_local_reserved_ports",
95073 - .data = NULL, /* initialized in sysctl_ipv4_init */
95074 + .data = sysctl_local_reserved_ports,
95075 .maxlen = 65536,
95076 .mode = 0644,
95077 .proc_handler = proc_do_large_bitmap,
95078 @@ -864,11 +866,10 @@ static struct ctl_table ipv4_net_table[] = {
95079
95080 static __net_init int ipv4_sysctl_init_net(struct net *net)
95081 {
95082 - struct ctl_table *table;
95083 + ctl_table_no_const *table = NULL;
95084
95085 - table = ipv4_net_table;
95086 if (!net_eq(net, &init_net)) {
95087 - table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
95088 + table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
95089 if (table == NULL)
95090 goto err_alloc;
95091
95092 @@ -903,15 +904,17 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
95093
95094 tcp_init_mem(net);
95095
95096 - net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
95097 + if (!net_eq(net, &init_net))
95098 + net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
95099 + else
95100 + net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
95101 if (net->ipv4.ipv4_hdr == NULL)
95102 goto err_reg;
95103
95104 return 0;
95105
95106 err_reg:
95107 - if (!net_eq(net, &init_net))
95108 - kfree(table);
95109 + kfree(table);
95110 err_alloc:
95111 return -ENOMEM;
95112 }
95113 @@ -933,16 +936,6 @@ static __net_initdata struct pernet_operations ipv4_sysctl_ops = {
95114 static __init int sysctl_ipv4_init(void)
95115 {
95116 struct ctl_table_header *hdr;
95117 - struct ctl_table *i;
95118 -
95119 - for (i = ipv4_table; i->procname; i++) {
95120 - if (strcmp(i->procname, "ip_local_reserved_ports") == 0) {
95121 - i->data = sysctl_local_reserved_ports;
95122 - break;
95123 - }
95124 - }
95125 - if (!i->procname)
95126 - return -EINVAL;
95127
95128 hdr = register_net_sysctl(&init_net, "net/ipv4", ipv4_table);
95129 if (hdr == NULL)
95130 diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
95131 index 068c8fb..a755c52 100644
95132 --- a/net/ipv4/tcp_input.c
95133 +++ b/net/ipv4/tcp_input.c
95134 @@ -4435,7 +4435,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
95135 * simplifies code)
95136 */
95137 static void
95138 -tcp_collapse(struct sock *sk, struct sk_buff_head *list,
95139 +__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
95140 struct sk_buff *head, struct sk_buff *tail,
95141 u32 start, u32 end)
95142 {
95143 @@ -5520,6 +5520,7 @@ discard:
95144 tcp_paws_reject(&tp->rx_opt, 0))
95145 goto discard_and_undo;
95146
95147 +#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
95148 if (th->syn) {
95149 /* We see SYN without ACK. It is attempt of
95150 * simultaneous connect with crossed SYNs.
95151 @@ -5570,6 +5571,7 @@ discard:
95152 goto discard;
95153 #endif
95154 }
95155 +#endif
95156 /* "fifth, if neither of the SYN or RST bits is set then
95157 * drop the segment and return."
95158 */
95159 @@ -5616,7 +5618,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
95160 goto discard;
95161
95162 if (th->syn) {
95163 - if (th->fin)
95164 + if (th->fin || th->urg || th->psh)
95165 goto discard;
95166 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
95167 return 1;
95168 diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
95169 index 5031f68..91569e2 100644
95170 --- a/net/ipv4/tcp_ipv4.c
95171 +++ b/net/ipv4/tcp_ipv4.c
95172 @@ -91,6 +91,10 @@ int sysctl_tcp_low_latency __read_mostly;
95173 EXPORT_SYMBOL(sysctl_tcp_low_latency);
95174
95175
95176 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95177 +extern int grsec_enable_blackhole;
95178 +#endif
95179 +
95180 #ifdef CONFIG_TCP_MD5SIG
95181 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
95182 __be32 daddr, __be32 saddr, const struct tcphdr *th);
95183 @@ -1829,6 +1833,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
95184 return 0;
95185
95186 reset:
95187 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95188 + if (!grsec_enable_blackhole)
95189 +#endif
95190 tcp_v4_send_reset(rsk, skb);
95191 discard:
95192 kfree_skb(skb);
95193 @@ -1974,12 +1981,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
95194 TCP_SKB_CB(skb)->sacked = 0;
95195
95196 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
95197 - if (!sk)
95198 + if (!sk) {
95199 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95200 + ret = 1;
95201 +#endif
95202 goto no_tcp_socket;
95203 -
95204 + }
95205 process:
95206 - if (sk->sk_state == TCP_TIME_WAIT)
95207 + if (sk->sk_state == TCP_TIME_WAIT) {
95208 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95209 + ret = 2;
95210 +#endif
95211 goto do_time_wait;
95212 + }
95213
95214 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
95215 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
95216 @@ -2033,6 +2047,10 @@ csum_error:
95217 bad_packet:
95218 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
95219 } else {
95220 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95221 + if (!grsec_enable_blackhole || (ret == 1 &&
95222 + (skb->dev->flags & IFF_LOOPBACK)))
95223 +#endif
95224 tcp_v4_send_reset(NULL, skb);
95225 }
95226
95227 diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
95228 index 58a3e69..7f0626e 100644
95229 --- a/net/ipv4/tcp_minisocks.c
95230 +++ b/net/ipv4/tcp_minisocks.c
95231 @@ -27,6 +27,10 @@
95232 #include <net/inet_common.h>
95233 #include <net/xfrm.h>
95234
95235 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95236 +extern int grsec_enable_blackhole;
95237 +#endif
95238 +
95239 int sysctl_tcp_syncookies __read_mostly = 1;
95240 EXPORT_SYMBOL(sysctl_tcp_syncookies);
95241
95242 @@ -711,7 +715,10 @@ embryonic_reset:
95243 * avoid becoming vulnerable to outside attack aiming at
95244 * resetting legit local connections.
95245 */
95246 - req->rsk_ops->send_reset(sk, skb);
95247 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95248 + if (!grsec_enable_blackhole)
95249 +#endif
95250 + req->rsk_ops->send_reset(sk, skb);
95251 } else if (fastopen) { /* received a valid RST pkt */
95252 reqsk_fastopen_remove(sk, req, true);
95253 tcp_reset(sk);
95254 diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
95255 index 611beab..c4b6e1d 100644
95256 --- a/net/ipv4/tcp_probe.c
95257 +++ b/net/ipv4/tcp_probe.c
95258 @@ -245,7 +245,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
95259 if (cnt + width >= len)
95260 break;
95261
95262 - if (copy_to_user(buf + cnt, tbuf, width))
95263 + if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
95264 return -EFAULT;
95265 cnt += width;
95266 }
95267 diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
95268 index 4b85e6f..22f9ac9 100644
95269 --- a/net/ipv4/tcp_timer.c
95270 +++ b/net/ipv4/tcp_timer.c
95271 @@ -22,6 +22,10 @@
95272 #include <linux/gfp.h>
95273 #include <net/tcp.h>
95274
95275 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95276 +extern int grsec_lastack_retries;
95277 +#endif
95278 +
95279 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
95280 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
95281 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
95282 @@ -185,6 +189,13 @@ static int tcp_write_timeout(struct sock *sk)
95283 }
95284 }
95285
95286 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95287 + if ((sk->sk_state == TCP_LAST_ACK) &&
95288 + (grsec_lastack_retries > 0) &&
95289 + (grsec_lastack_retries < retry_until))
95290 + retry_until = grsec_lastack_retries;
95291 +#endif
95292 +
95293 if (retransmits_timed_out(sk, retry_until,
95294 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
95295 /* Has it gone just too far? */
95296 diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
95297 index 5e2c2f1..6473c22 100644
95298 --- a/net/ipv4/udp.c
95299 +++ b/net/ipv4/udp.c
95300 @@ -87,6 +87,7 @@
95301 #include <linux/types.h>
95302 #include <linux/fcntl.h>
95303 #include <linux/module.h>
95304 +#include <linux/security.h>
95305 #include <linux/socket.h>
95306 #include <linux/sockios.h>
95307 #include <linux/igmp.h>
95308 @@ -112,6 +113,10 @@
95309 #include <net/busy_poll.h>
95310 #include "udp_impl.h"
95311
95312 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95313 +extern int grsec_enable_blackhole;
95314 +#endif
95315 +
95316 struct udp_table udp_table __read_mostly;
95317 EXPORT_SYMBOL(udp_table);
95318
95319 @@ -595,6 +600,9 @@ found:
95320 return s;
95321 }
95322
95323 +extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
95324 +extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
95325 +
95326 /*
95327 * This routine is called by the ICMP module when it gets some
95328 * sort of error condition. If err < 0 then the socket should
95329 @@ -892,9 +900,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
95330 dport = usin->sin_port;
95331 if (dport == 0)
95332 return -EINVAL;
95333 +
95334 + err = gr_search_udp_sendmsg(sk, usin);
95335 + if (err)
95336 + return err;
95337 } else {
95338 if (sk->sk_state != TCP_ESTABLISHED)
95339 return -EDESTADDRREQ;
95340 +
95341 + err = gr_search_udp_sendmsg(sk, NULL);
95342 + if (err)
95343 + return err;
95344 +
95345 daddr = inet->inet_daddr;
95346 dport = inet->inet_dport;
95347 /* Open fast path for connected socket.
95348 @@ -1141,7 +1158,7 @@ static unsigned int first_packet_length(struct sock *sk)
95349 IS_UDPLITE(sk));
95350 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
95351 IS_UDPLITE(sk));
95352 - atomic_inc(&sk->sk_drops);
95353 + atomic_inc_unchecked(&sk->sk_drops);
95354 __skb_unlink(skb, rcvq);
95355 __skb_queue_tail(&list_kill, skb);
95356 }
95357 @@ -1221,6 +1238,10 @@ try_again:
95358 if (!skb)
95359 goto out;
95360
95361 + err = gr_search_udp_recvmsg(sk, skb);
95362 + if (err)
95363 + goto out_free;
95364 +
95365 ulen = skb->len - sizeof(struct udphdr);
95366 copied = len;
95367 if (copied > ulen)
95368 @@ -1254,7 +1275,7 @@ try_again:
95369 if (unlikely(err)) {
95370 trace_kfree_skb(skb, udp_recvmsg);
95371 if (!peeked) {
95372 - atomic_inc(&sk->sk_drops);
95373 + atomic_inc_unchecked(&sk->sk_drops);
95374 UDP_INC_STATS_USER(sock_net(sk),
95375 UDP_MIB_INERRORS, is_udplite);
95376 }
95377 @@ -1542,7 +1563,7 @@ csum_error:
95378 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
95379 drop:
95380 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
95381 - atomic_inc(&sk->sk_drops);
95382 + atomic_inc_unchecked(&sk->sk_drops);
95383 kfree_skb(skb);
95384 return -1;
95385 }
95386 @@ -1561,7 +1582,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
95387 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
95388
95389 if (!skb1) {
95390 - atomic_inc(&sk->sk_drops);
95391 + atomic_inc_unchecked(&sk->sk_drops);
95392 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
95393 IS_UDPLITE(sk));
95394 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
95395 @@ -1733,6 +1754,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
95396 goto csum_error;
95397
95398 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
95399 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95400 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
95401 +#endif
95402 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
95403
95404 /*
95405 @@ -2165,7 +2189,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
95406 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
95407 0, sock_i_ino(sp),
95408 atomic_read(&sp->sk_refcnt), sp,
95409 - atomic_read(&sp->sk_drops), len);
95410 + atomic_read_unchecked(&sp->sk_drops), len);
95411 }
95412
95413 int udp4_seq_show(struct seq_file *seq, void *v)
95414 diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
95415 index adf9983..8e45d0a 100644
95416 --- a/net/ipv4/xfrm4_policy.c
95417 +++ b/net/ipv4/xfrm4_policy.c
95418 @@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
95419 fl4->flowi4_tos = iph->tos;
95420 }
95421
95422 -static inline int xfrm4_garbage_collect(struct dst_ops *ops)
95423 +static int xfrm4_garbage_collect(struct dst_ops *ops)
95424 {
95425 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
95426
95427 - xfrm4_policy_afinfo.garbage_collect(net);
95428 + xfrm_garbage_collect_deferred(net);
95429 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
95430 }
95431
95432 @@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
95433
95434 static int __net_init xfrm4_net_init(struct net *net)
95435 {
95436 - struct ctl_table *table;
95437 + ctl_table_no_const *table = NULL;
95438 struct ctl_table_header *hdr;
95439
95440 - table = xfrm4_policy_table;
95441 if (!net_eq(net, &init_net)) {
95442 - table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
95443 + table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
95444 if (!table)
95445 goto err_alloc;
95446
95447 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
95448 - }
95449 -
95450 - hdr = register_net_sysctl(net, "net/ipv4", table);
95451 + hdr = register_net_sysctl(net, "net/ipv4", table);
95452 + } else
95453 + hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
95454 if (!hdr)
95455 goto err_reg;
95456
95457 @@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
95458 return 0;
95459
95460 err_reg:
95461 - if (!net_eq(net, &init_net))
95462 - kfree(table);
95463 + kfree(table);
95464 err_alloc:
95465 return -ENOMEM;
95466 }
95467 diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
95468 index cd3fb30..b7dfef7 100644
95469 --- a/net/ipv6/addrconf.c
95470 +++ b/net/ipv6/addrconf.c
95471 @@ -586,7 +586,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
95472 idx = 0;
95473 head = &net->dev_index_head[h];
95474 rcu_read_lock();
95475 - cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
95476 + cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
95477 net->dev_base_seq;
95478 hlist_for_each_entry_rcu(dev, head, index_hlist) {
95479 if (idx < s_idx)
95480 @@ -2364,7 +2364,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
95481 p.iph.ihl = 5;
95482 p.iph.protocol = IPPROTO_IPV6;
95483 p.iph.ttl = 64;
95484 - ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
95485 + ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
95486
95487 if (ops->ndo_do_ioctl) {
95488 mm_segment_t oldfs = get_fs();
95489 @@ -3977,7 +3977,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
95490 s_ip_idx = ip_idx = cb->args[2];
95491
95492 rcu_read_lock();
95493 - cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
95494 + cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
95495 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
95496 idx = 0;
95497 head = &net->dev_index_head[h];
95498 @@ -4603,7 +4603,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
95499 dst_free(&ifp->rt->dst);
95500 break;
95501 }
95502 - atomic_inc(&net->ipv6.dev_addr_genid);
95503 + atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
95504 rt_genid_bump_ipv6(net);
95505 }
95506
95507 @@ -4624,7 +4624,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
95508 int *valp = ctl->data;
95509 int val = *valp;
95510 loff_t pos = *ppos;
95511 - struct ctl_table lctl;
95512 + ctl_table_no_const lctl;
95513 int ret;
95514
95515 /*
95516 @@ -4709,7 +4709,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
95517 int *valp = ctl->data;
95518 int val = *valp;
95519 loff_t pos = *ppos;
95520 - struct ctl_table lctl;
95521 + ctl_table_no_const lctl;
95522 int ret;
95523
95524 /*
95525 diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
95526 index 8132b44..b8eca70 100644
95527 --- a/net/ipv6/af_inet6.c
95528 +++ b/net/ipv6/af_inet6.c
95529 @@ -767,7 +767,7 @@ static int __net_init inet6_net_init(struct net *net)
95530
95531 net->ipv6.sysctl.bindv6only = 0;
95532 net->ipv6.sysctl.icmpv6_time = 1*HZ;
95533 - atomic_set(&net->ipv6.rt_genid, 0);
95534 + atomic_set_unchecked(&net->ipv6.rt_genid, 0);
95535
95536 err = ipv6_init_mibs(net);
95537 if (err)
95538 diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
95539 index c66c6df..f375d3c 100644
95540 --- a/net/ipv6/datagram.c
95541 +++ b/net/ipv6/datagram.c
95542 @@ -908,5 +908,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
95543 0,
95544 sock_i_ino(sp),
95545 atomic_read(&sp->sk_refcnt), sp,
95546 - atomic_read(&sp->sk_drops));
95547 + atomic_read_unchecked(&sp->sk_drops));
95548 }
95549 diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
95550 index eef8d94..cfa1852 100644
95551 --- a/net/ipv6/icmp.c
95552 +++ b/net/ipv6/icmp.c
95553 @@ -997,7 +997,7 @@ struct ctl_table ipv6_icmp_table_template[] = {
95554
95555 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
95556 {
95557 - struct ctl_table *table;
95558 + ctl_table_no_const *table;
95559
95560 table = kmemdup(ipv6_icmp_table_template,
95561 sizeof(ipv6_icmp_table_template),
95562 diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
95563 index bf4a9a0..e5f6ac5 100644
95564 --- a/net/ipv6/ip6_gre.c
95565 +++ b/net/ipv6/ip6_gre.c
95566 @@ -74,7 +74,7 @@ struct ip6gre_net {
95567 struct net_device *fb_tunnel_dev;
95568 };
95569
95570 -static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
95571 +static struct rtnl_link_ops ip6gre_link_ops;
95572 static int ip6gre_tunnel_init(struct net_device *dev);
95573 static void ip6gre_tunnel_setup(struct net_device *dev);
95574 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
95575 @@ -1286,7 +1286,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
95576 }
95577
95578
95579 -static struct inet6_protocol ip6gre_protocol __read_mostly = {
95580 +static struct inet6_protocol ip6gre_protocol = {
95581 .handler = ip6gre_rcv,
95582 .err_handler = ip6gre_err,
95583 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
95584 @@ -1622,7 +1622,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
95585 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
95586 };
95587
95588 -static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
95589 +static struct rtnl_link_ops ip6gre_link_ops = {
95590 .kind = "ip6gre",
95591 .maxtype = IFLA_GRE_MAX,
95592 .policy = ip6gre_policy,
95593 @@ -1635,7 +1635,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
95594 .fill_info = ip6gre_fill_info,
95595 };
95596
95597 -static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
95598 +static struct rtnl_link_ops ip6gre_tap_ops = {
95599 .kind = "ip6gretap",
95600 .maxtype = IFLA_GRE_MAX,
95601 .policy = ip6gre_policy,
95602 diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
95603 index c1e11b5..568e633 100644
95604 --- a/net/ipv6/ip6_tunnel.c
95605 +++ b/net/ipv6/ip6_tunnel.c
95606 @@ -89,7 +89,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
95607
95608 static int ip6_tnl_dev_init(struct net_device *dev);
95609 static void ip6_tnl_dev_setup(struct net_device *dev);
95610 -static struct rtnl_link_ops ip6_link_ops __read_mostly;
95611 +static struct rtnl_link_ops ip6_link_ops;
95612
95613 static int ip6_tnl_net_id __read_mostly;
95614 struct ip6_tnl_net {
95615 @@ -1699,7 +1699,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
95616 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
95617 };
95618
95619 -static struct rtnl_link_ops ip6_link_ops __read_mostly = {
95620 +static struct rtnl_link_ops ip6_link_ops = {
95621 .kind = "ip6tnl",
95622 .maxtype = IFLA_IPTUN_MAX,
95623 .policy = ip6_tnl_policy,
95624 diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
95625 index d1e2e8e..51c19ae 100644
95626 --- a/net/ipv6/ipv6_sockglue.c
95627 +++ b/net/ipv6/ipv6_sockglue.c
95628 @@ -991,7 +991,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
95629 if (sk->sk_type != SOCK_STREAM)
95630 return -ENOPROTOOPT;
95631
95632 - msg.msg_control = optval;
95633 + msg.msg_control = (void __force_kernel *)optval;
95634 msg.msg_controllen = len;
95635 msg.msg_flags = flags;
95636
95637 diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
95638 index 44400c2..8e11f52 100644
95639 --- a/net/ipv6/netfilter/ip6_tables.c
95640 +++ b/net/ipv6/netfilter/ip6_tables.c
95641 @@ -1078,14 +1078,14 @@ static int compat_table_info(const struct xt_table_info *info,
95642 #endif
95643
95644 static int get_info(struct net *net, void __user *user,
95645 - const int *len, int compat)
95646 + int len, int compat)
95647 {
95648 char name[XT_TABLE_MAXNAMELEN];
95649 struct xt_table *t;
95650 int ret;
95651
95652 - if (*len != sizeof(struct ip6t_getinfo)) {
95653 - duprintf("length %u != %zu\n", *len,
95654 + if (len != sizeof(struct ip6t_getinfo)) {
95655 + duprintf("length %u != %zu\n", len,
95656 sizeof(struct ip6t_getinfo));
95657 return -EINVAL;
95658 }
95659 @@ -1122,7 +1122,7 @@ static int get_info(struct net *net, void __user *user,
95660 info.size = private->size;
95661 strcpy(info.name, name);
95662
95663 - if (copy_to_user(user, &info, *len) != 0)
95664 + if (copy_to_user(user, &info, len) != 0)
95665 ret = -EFAULT;
95666 else
95667 ret = 0;
95668 @@ -1976,7 +1976,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
95669
95670 switch (cmd) {
95671 case IP6T_SO_GET_INFO:
95672 - ret = get_info(sock_net(sk), user, len, 1);
95673 + ret = get_info(sock_net(sk), user, *len, 1);
95674 break;
95675 case IP6T_SO_GET_ENTRIES:
95676 ret = compat_get_entries(sock_net(sk), user, len);
95677 @@ -2023,7 +2023,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
95678
95679 switch (cmd) {
95680 case IP6T_SO_GET_INFO:
95681 - ret = get_info(sock_net(sk), user, len, 0);
95682 + ret = get_info(sock_net(sk), user, *len, 0);
95683 break;
95684
95685 case IP6T_SO_GET_ENTRIES:
95686 diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
95687 index 253566a..9fa50c7 100644
95688 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c
95689 +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
95690 @@ -90,12 +90,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
95691
95692 static int nf_ct_frag6_sysctl_register(struct net *net)
95693 {
95694 - struct ctl_table *table;
95695 + ctl_table_no_const *table = NULL;
95696 struct ctl_table_header *hdr;
95697
95698 - table = nf_ct_frag6_sysctl_table;
95699 if (!net_eq(net, &init_net)) {
95700 - table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
95701 + table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
95702 GFP_KERNEL);
95703 if (table == NULL)
95704 goto err_alloc;
95705 @@ -103,9 +102,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
95706 table[0].data = &net->nf_frag.frags.timeout;
95707 table[1].data = &net->nf_frag.frags.low_thresh;
95708 table[2].data = &net->nf_frag.frags.high_thresh;
95709 - }
95710 -
95711 - hdr = register_net_sysctl(net, "net/netfilter", table);
95712 + hdr = register_net_sysctl(net, "net/netfilter", table);
95713 + } else
95714 + hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
95715 if (hdr == NULL)
95716 goto err_reg;
95717
95718 @@ -113,8 +112,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
95719 return 0;
95720
95721 err_reg:
95722 - if (!net_eq(net, &init_net))
95723 - kfree(table);
95724 + kfree(table);
95725 err_alloc:
95726 return -ENOMEM;
95727 }
95728 diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
95729 index 827f795..7e28e82 100644
95730 --- a/net/ipv6/output_core.c
95731 +++ b/net/ipv6/output_core.c
95732 @@ -9,8 +9,8 @@
95733
95734 void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
95735 {
95736 - static atomic_t ipv6_fragmentation_id;
95737 - int old, new;
95738 + static atomic_unchecked_t ipv6_fragmentation_id;
95739 + int id;
95740
95741 #if IS_ENABLED(CONFIG_IPV6)
95742 if (rt && !(rt->dst.flags & DST_NOPEER)) {
95743 @@ -26,13 +26,10 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
95744 }
95745 }
95746 #endif
95747 - do {
95748 - old = atomic_read(&ipv6_fragmentation_id);
95749 - new = old + 1;
95750 - if (!new)
95751 - new = 1;
95752 - } while (atomic_cmpxchg(&ipv6_fragmentation_id, old, new) != old);
95753 - fhdr->identification = htonl(new);
95754 + id = atomic_inc_return_unchecked(&ipv6_fragmentation_id);
95755 + if (!id)
95756 + id = atomic_inc_return_unchecked(&ipv6_fragmentation_id);
95757 + fhdr->identification = htonl(id);
95758 }
95759 EXPORT_SYMBOL(ipv6_select_ident);
95760
95761 diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
95762 index 7856e96..75ebc7f 100644
95763 --- a/net/ipv6/ping.c
95764 +++ b/net/ipv6/ping.c
95765 @@ -246,6 +246,22 @@ static struct pernet_operations ping_v6_net_ops = {
95766 };
95767 #endif
95768
95769 +static struct pingv6_ops real_pingv6_ops = {
95770 + .ipv6_recv_error = ipv6_recv_error,
95771 + .ip6_datagram_recv_ctl = ip6_datagram_recv_ctl,
95772 + .icmpv6_err_convert = icmpv6_err_convert,
95773 + .ipv6_icmp_error = ipv6_icmp_error,
95774 + .ipv6_chk_addr = ipv6_chk_addr,
95775 +};
95776 +
95777 +static struct pingv6_ops dummy_pingv6_ops = {
95778 + .ipv6_recv_error = dummy_ipv6_recv_error,
95779 + .ip6_datagram_recv_ctl = dummy_ip6_datagram_recv_ctl,
95780 + .icmpv6_err_convert = dummy_icmpv6_err_convert,
95781 + .ipv6_icmp_error = dummy_ipv6_icmp_error,
95782 + .ipv6_chk_addr = dummy_ipv6_chk_addr,
95783 +};
95784 +
95785 int __init pingv6_init(void)
95786 {
95787 #ifdef CONFIG_PROC_FS
95788 @@ -253,11 +269,7 @@ int __init pingv6_init(void)
95789 if (ret)
95790 return ret;
95791 #endif
95792 - pingv6_ops.ipv6_recv_error = ipv6_recv_error;
95793 - pingv6_ops.ip6_datagram_recv_ctl = ip6_datagram_recv_ctl;
95794 - pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
95795 - pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
95796 - pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
95797 + pingv6_ops = &real_pingv6_ops;
95798 return inet6_register_protosw(&pingv6_protosw);
95799 }
95800
95801 @@ -266,11 +278,7 @@ int __init pingv6_init(void)
95802 */
95803 void pingv6_exit(void)
95804 {
95805 - pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
95806 - pingv6_ops.ip6_datagram_recv_ctl = dummy_ip6_datagram_recv_ctl;
95807 - pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
95808 - pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
95809 - pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
95810 + pingv6_ops = &dummy_pingv6_ops;
95811 #ifdef CONFIG_PROC_FS
95812 unregister_pernet_subsys(&ping_v6_net_ops);
95813 #endif
95814 diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
95815 index 430067c..4adf088 100644
95816 --- a/net/ipv6/raw.c
95817 +++ b/net/ipv6/raw.c
95818 @@ -385,7 +385,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
95819 {
95820 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
95821 skb_checksum_complete(skb)) {
95822 - atomic_inc(&sk->sk_drops);
95823 + atomic_inc_unchecked(&sk->sk_drops);
95824 kfree_skb(skb);
95825 return NET_RX_DROP;
95826 }
95827 @@ -413,7 +413,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
95828 struct raw6_sock *rp = raw6_sk(sk);
95829
95830 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
95831 - atomic_inc(&sk->sk_drops);
95832 + atomic_inc_unchecked(&sk->sk_drops);
95833 kfree_skb(skb);
95834 return NET_RX_DROP;
95835 }
95836 @@ -437,7 +437,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
95837
95838 if (inet->hdrincl) {
95839 if (skb_checksum_complete(skb)) {
95840 - atomic_inc(&sk->sk_drops);
95841 + atomic_inc_unchecked(&sk->sk_drops);
95842 kfree_skb(skb);
95843 return NET_RX_DROP;
95844 }
95845 @@ -607,7 +607,7 @@ out:
95846 return err;
95847 }
95848
95849 -static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
95850 +static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
95851 struct flowi6 *fl6, struct dst_entry **dstp,
95852 unsigned int flags)
95853 {
95854 @@ -920,12 +920,15 @@ do_confirm:
95855 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
95856 char __user *optval, int optlen)
95857 {
95858 + struct icmp6_filter filter;
95859 +
95860 switch (optname) {
95861 case ICMPV6_FILTER:
95862 if (optlen > sizeof(struct icmp6_filter))
95863 optlen = sizeof(struct icmp6_filter);
95864 - if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
95865 + if (copy_from_user(&filter, optval, optlen))
95866 return -EFAULT;
95867 + raw6_sk(sk)->filter = filter;
95868 return 0;
95869 default:
95870 return -ENOPROTOOPT;
95871 @@ -938,6 +941,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
95872 char __user *optval, int __user *optlen)
95873 {
95874 int len;
95875 + struct icmp6_filter filter;
95876
95877 switch (optname) {
95878 case ICMPV6_FILTER:
95879 @@ -949,7 +953,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
95880 len = sizeof(struct icmp6_filter);
95881 if (put_user(len, optlen))
95882 return -EFAULT;
95883 - if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
95884 + filter = raw6_sk(sk)->filter;
95885 + if (len > sizeof filter || copy_to_user(optval, &filter, len))
95886 return -EFAULT;
95887 return 0;
95888 default:
95889 diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
95890 index 1aeb473..bea761c 100644
95891 --- a/net/ipv6/reassembly.c
95892 +++ b/net/ipv6/reassembly.c
95893 @@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
95894
95895 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
95896 {
95897 - struct ctl_table *table;
95898 + ctl_table_no_const *table = NULL;
95899 struct ctl_table_header *hdr;
95900
95901 - table = ip6_frags_ns_ctl_table;
95902 if (!net_eq(net, &init_net)) {
95903 - table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
95904 + table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
95905 if (table == NULL)
95906 goto err_alloc;
95907
95908 @@ -642,9 +641,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
95909 /* Don't export sysctls to unprivileged users */
95910 if (net->user_ns != &init_user_ns)
95911 table[0].procname = NULL;
95912 - }
95913 + hdr = register_net_sysctl(net, "net/ipv6", table);
95914 + } else
95915 + hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
95916
95917 - hdr = register_net_sysctl(net, "net/ipv6", table);
95918 if (hdr == NULL)
95919 goto err_reg;
95920
95921 @@ -652,8 +652,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
95922 return 0;
95923
95924 err_reg:
95925 - if (!net_eq(net, &init_net))
95926 - kfree(table);
95927 + kfree(table);
95928 err_alloc:
95929 return -ENOMEM;
95930 }
95931 diff --git a/net/ipv6/route.c b/net/ipv6/route.c
95932 index 77308af..36ed509 100644
95933 --- a/net/ipv6/route.c
95934 +++ b/net/ipv6/route.c
95935 @@ -3009,7 +3009,7 @@ struct ctl_table ipv6_route_table_template[] = {
95936
95937 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
95938 {
95939 - struct ctl_table *table;
95940 + ctl_table_no_const *table;
95941
95942 table = kmemdup(ipv6_route_table_template,
95943 sizeof(ipv6_route_table_template),
95944 diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
95945 index b433884..3875266 100644
95946 --- a/net/ipv6/sit.c
95947 +++ b/net/ipv6/sit.c
95948 @@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
95949 static void ipip6_dev_free(struct net_device *dev);
95950 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
95951 __be32 *v4dst);
95952 -static struct rtnl_link_ops sit_link_ops __read_mostly;
95953 +static struct rtnl_link_ops sit_link_ops;
95954
95955 static int sit_net_id __read_mostly;
95956 struct sit_net {
95957 @@ -1603,7 +1603,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
95958 unregister_netdevice_queue(dev, head);
95959 }
95960
95961 -static struct rtnl_link_ops sit_link_ops __read_mostly = {
95962 +static struct rtnl_link_ops sit_link_ops = {
95963 .kind = "sit",
95964 .maxtype = IFLA_IPTUN_MAX,
95965 .policy = ipip6_policy,
95966 diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
95967 index 107b2f1..72741a9 100644
95968 --- a/net/ipv6/sysctl_net_ipv6.c
95969 +++ b/net/ipv6/sysctl_net_ipv6.c
95970 @@ -40,7 +40,7 @@ static struct ctl_table ipv6_rotable[] = {
95971
95972 static int __net_init ipv6_sysctl_net_init(struct net *net)
95973 {
95974 - struct ctl_table *ipv6_table;
95975 + ctl_table_no_const *ipv6_table;
95976 struct ctl_table *ipv6_route_table;
95977 struct ctl_table *ipv6_icmp_table;
95978 int err;
95979 diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
95980 index 5c71501..7e8d5d3 100644
95981 --- a/net/ipv6/tcp_ipv6.c
95982 +++ b/net/ipv6/tcp_ipv6.c
95983 @@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
95984 inet6_sk(sk)->rx_dst_cookie = rt->rt6i_node->fn_sernum;
95985 }
95986
95987 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95988 +extern int grsec_enable_blackhole;
95989 +#endif
95990 +
95991 static void tcp_v6_hash(struct sock *sk)
95992 {
95993 if (sk->sk_state != TCP_CLOSE) {
95994 @@ -1397,6 +1401,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
95995 return 0;
95996
95997 reset:
95998 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95999 + if (!grsec_enable_blackhole)
96000 +#endif
96001 tcp_v6_send_reset(sk, skb);
96002 discard:
96003 if (opt_skb)
96004 @@ -1479,12 +1486,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
96005 TCP_SKB_CB(skb)->sacked = 0;
96006
96007 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
96008 - if (!sk)
96009 + if (!sk) {
96010 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
96011 + ret = 1;
96012 +#endif
96013 goto no_tcp_socket;
96014 + }
96015
96016 process:
96017 - if (sk->sk_state == TCP_TIME_WAIT)
96018 + if (sk->sk_state == TCP_TIME_WAIT) {
96019 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
96020 + ret = 2;
96021 +#endif
96022 goto do_time_wait;
96023 + }
96024
96025 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
96026 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
96027 @@ -1536,6 +1551,10 @@ csum_error:
96028 bad_packet:
96029 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
96030 } else {
96031 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
96032 + if (!grsec_enable_blackhole || (ret == 1 &&
96033 + (skb->dev->flags & IFF_LOOPBACK)))
96034 +#endif
96035 tcp_v6_send_reset(NULL, skb);
96036 }
96037
96038 diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
96039 index 3d2758d..626c422 100644
96040 --- a/net/ipv6/udp.c
96041 +++ b/net/ipv6/udp.c
96042 @@ -53,6 +53,10 @@
96043 #include <trace/events/skb.h>
96044 #include "udp_impl.h"
96045
96046 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
96047 +extern int grsec_enable_blackhole;
96048 +#endif
96049 +
96050 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
96051 {
96052 const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
96053 @@ -417,7 +421,7 @@ try_again:
96054 if (unlikely(err)) {
96055 trace_kfree_skb(skb, udpv6_recvmsg);
96056 if (!peeked) {
96057 - atomic_inc(&sk->sk_drops);
96058 + atomic_inc_unchecked(&sk->sk_drops);
96059 if (is_udp4)
96060 UDP_INC_STATS_USER(sock_net(sk),
96061 UDP_MIB_INERRORS,
96062 @@ -665,7 +669,7 @@ csum_error:
96063 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
96064 drop:
96065 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
96066 - atomic_inc(&sk->sk_drops);
96067 + atomic_inc_unchecked(&sk->sk_drops);
96068 kfree_skb(skb);
96069 return -1;
96070 }
96071 @@ -723,7 +727,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
96072 if (likely(skb1 == NULL))
96073 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
96074 if (!skb1) {
96075 - atomic_inc(&sk->sk_drops);
96076 + atomic_inc_unchecked(&sk->sk_drops);
96077 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
96078 IS_UDPLITE(sk));
96079 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
96080 @@ -863,6 +867,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
96081 goto csum_error;
96082
96083 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
96084 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
96085 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
96086 +#endif
96087 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
96088
96089 kfree_skb(skb);
96090 diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
96091 index 550b195..6acea83 100644
96092 --- a/net/ipv6/xfrm6_policy.c
96093 +++ b/net/ipv6/xfrm6_policy.c
96094 @@ -212,11 +212,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
96095 }
96096 }
96097
96098 -static inline int xfrm6_garbage_collect(struct dst_ops *ops)
96099 +static int xfrm6_garbage_collect(struct dst_ops *ops)
96100 {
96101 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
96102
96103 - xfrm6_policy_afinfo.garbage_collect(net);
96104 + xfrm_garbage_collect_deferred(net);
96105 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
96106 }
96107
96108 @@ -329,19 +329,19 @@ static struct ctl_table xfrm6_policy_table[] = {
96109
96110 static int __net_init xfrm6_net_init(struct net *net)
96111 {
96112 - struct ctl_table *table;
96113 + ctl_table_no_const *table = NULL;
96114 struct ctl_table_header *hdr;
96115
96116 - table = xfrm6_policy_table;
96117 if (!net_eq(net, &init_net)) {
96118 - table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
96119 + table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
96120 if (!table)
96121 goto err_alloc;
96122
96123 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
96124 - }
96125 + hdr = register_net_sysctl(net, "net/ipv6", table);
96126 + } else
96127 + hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
96128
96129 - hdr = register_net_sysctl(net, "net/ipv6", table);
96130 if (!hdr)
96131 goto err_reg;
96132
96133 @@ -349,8 +349,7 @@ static int __net_init xfrm6_net_init(struct net *net)
96134 return 0;
96135
96136 err_reg:
96137 - if (!net_eq(net, &init_net))
96138 - kfree(table);
96139 + kfree(table);
96140 err_alloc:
96141 return -ENOMEM;
96142 }
96143 diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
96144 index 41ac7938..75e3bb1 100644
96145 --- a/net/irda/ircomm/ircomm_tty.c
96146 +++ b/net/irda/ircomm/ircomm_tty.c
96147 @@ -319,11 +319,11 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
96148 add_wait_queue(&port->open_wait, &wait);
96149
96150 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
96151 - __FILE__, __LINE__, tty->driver->name, port->count);
96152 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
96153
96154 spin_lock_irqsave(&port->lock, flags);
96155 if (!tty_hung_up_p(filp))
96156 - port->count--;
96157 + atomic_dec(&port->count);
96158 port->blocked_open++;
96159 spin_unlock_irqrestore(&port->lock, flags);
96160
96161 @@ -358,7 +358,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
96162 }
96163
96164 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
96165 - __FILE__, __LINE__, tty->driver->name, port->count);
96166 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
96167
96168 schedule();
96169 }
96170 @@ -368,12 +368,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
96171
96172 spin_lock_irqsave(&port->lock, flags);
96173 if (!tty_hung_up_p(filp))
96174 - port->count++;
96175 + atomic_inc(&port->count);
96176 port->blocked_open--;
96177 spin_unlock_irqrestore(&port->lock, flags);
96178
96179 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
96180 - __FILE__, __LINE__, tty->driver->name, port->count);
96181 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
96182
96183 if (!retval)
96184 port->flags |= ASYNC_NORMAL_ACTIVE;
96185 @@ -447,12 +447,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
96186
96187 /* ++ is not atomic, so this should be protected - Jean II */
96188 spin_lock_irqsave(&self->port.lock, flags);
96189 - self->port.count++;
96190 + atomic_inc(&self->port.count);
96191 spin_unlock_irqrestore(&self->port.lock, flags);
96192 tty_port_tty_set(&self->port, tty);
96193
96194 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
96195 - self->line, self->port.count);
96196 + self->line, atomic_read(&self->port.count));
96197
96198 /* Not really used by us, but lets do it anyway */
96199 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
96200 @@ -989,7 +989,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
96201 tty_kref_put(port->tty);
96202 }
96203 port->tty = NULL;
96204 - port->count = 0;
96205 + atomic_set(&port->count, 0);
96206 spin_unlock_irqrestore(&port->lock, flags);
96207
96208 wake_up_interruptible(&port->open_wait);
96209 @@ -1346,7 +1346,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
96210 seq_putc(m, '\n');
96211
96212 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
96213 - seq_printf(m, "Open count: %d\n", self->port.count);
96214 + seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
96215 seq_printf(m, "Max data size: %d\n", self->max_data_size);
96216 seq_printf(m, "Max header size: %d\n", self->max_header_size);
96217
96218 diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
96219 index c4b7218..3e83259 100644
96220 --- a/net/iucv/af_iucv.c
96221 +++ b/net/iucv/af_iucv.c
96222 @@ -773,10 +773,10 @@ static int iucv_sock_autobind(struct sock *sk)
96223
96224 write_lock_bh(&iucv_sk_list.lock);
96225
96226 - sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
96227 + sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
96228 while (__iucv_get_sock_by_name(name)) {
96229 sprintf(name, "%08x",
96230 - atomic_inc_return(&iucv_sk_list.autobind_name));
96231 + atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
96232 }
96233
96234 write_unlock_bh(&iucv_sk_list.lock);
96235 diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
96236 index cd5b8ec..f205e6b 100644
96237 --- a/net/iucv/iucv.c
96238 +++ b/net/iucv/iucv.c
96239 @@ -690,7 +690,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
96240 return NOTIFY_OK;
96241 }
96242
96243 -static struct notifier_block __refdata iucv_cpu_notifier = {
96244 +static struct notifier_block iucv_cpu_notifier = {
96245 .notifier_call = iucv_cpu_notify,
96246 };
96247
96248 diff --git a/net/key/af_key.c b/net/key/af_key.c
96249 index 545f047..9757a9d 100644
96250 --- a/net/key/af_key.c
96251 +++ b/net/key/af_key.c
96252 @@ -3041,10 +3041,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
96253 static u32 get_acqseq(void)
96254 {
96255 u32 res;
96256 - static atomic_t acqseq;
96257 + static atomic_unchecked_t acqseq;
96258
96259 do {
96260 - res = atomic_inc_return(&acqseq);
96261 + res = atomic_inc_return_unchecked(&acqseq);
96262 } while (!res);
96263 return res;
96264 }
96265 diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
96266 index 9903ee5..18978be 100644
96267 --- a/net/mac80211/cfg.c
96268 +++ b/net/mac80211/cfg.c
96269 @@ -826,7 +826,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
96270 ret = ieee80211_vif_use_channel(sdata, chandef,
96271 IEEE80211_CHANCTX_EXCLUSIVE);
96272 }
96273 - } else if (local->open_count == local->monitors) {
96274 + } else if (local_read(&local->open_count) == local->monitors) {
96275 local->_oper_chandef = *chandef;
96276 ieee80211_hw_config(local, 0);
96277 }
96278 @@ -3124,7 +3124,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
96279 else
96280 local->probe_req_reg--;
96281
96282 - if (!local->open_count)
96283 + if (!local_read(&local->open_count))
96284 break;
96285
96286 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
96287 @@ -3587,8 +3587,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
96288 if (chanctx_conf) {
96289 *chandef = chanctx_conf->def;
96290 ret = 0;
96291 - } else if (local->open_count > 0 &&
96292 - local->open_count == local->monitors &&
96293 + } else if (local_read(&local->open_count) > 0 &&
96294 + local_read(&local->open_count) == local->monitors &&
96295 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
96296 if (local->use_chanctx)
96297 *chandef = local->monitor_chandef;
96298 diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
96299 index 611abfc..8c2c7e4 100644
96300 --- a/net/mac80211/ieee80211_i.h
96301 +++ b/net/mac80211/ieee80211_i.h
96302 @@ -28,6 +28,7 @@
96303 #include <net/ieee80211_radiotap.h>
96304 #include <net/cfg80211.h>
96305 #include <net/mac80211.h>
96306 +#include <asm/local.h>
96307 #include "key.h"
96308 #include "sta_info.h"
96309 #include "debug.h"
96310 @@ -945,7 +946,7 @@ struct ieee80211_local {
96311 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
96312 spinlock_t queue_stop_reason_lock;
96313
96314 - int open_count;
96315 + local_t open_count;
96316 int monitors, cooked_mntrs;
96317 /* number of interfaces with corresponding FIF_ flags */
96318 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
96319 diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
96320 index fcecd63..a404454 100644
96321 --- a/net/mac80211/iface.c
96322 +++ b/net/mac80211/iface.c
96323 @@ -519,7 +519,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
96324 break;
96325 }
96326
96327 - if (local->open_count == 0) {
96328 + if (local_read(&local->open_count) == 0) {
96329 res = drv_start(local);
96330 if (res)
96331 goto err_del_bss;
96332 @@ -566,7 +566,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
96333 res = drv_add_interface(local, sdata);
96334 if (res)
96335 goto err_stop;
96336 - } else if (local->monitors == 0 && local->open_count == 0) {
96337 + } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
96338 res = ieee80211_add_virtual_monitor(local);
96339 if (res)
96340 goto err_stop;
96341 @@ -675,7 +675,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
96342 atomic_inc(&local->iff_promiscs);
96343
96344 if (coming_up)
96345 - local->open_count++;
96346 + local_inc(&local->open_count);
96347
96348 if (hw_reconf_flags)
96349 ieee80211_hw_config(local, hw_reconf_flags);
96350 @@ -713,7 +713,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
96351 err_del_interface:
96352 drv_remove_interface(local, sdata);
96353 err_stop:
96354 - if (!local->open_count)
96355 + if (!local_read(&local->open_count))
96356 drv_stop(local);
96357 err_del_bss:
96358 sdata->bss = NULL;
96359 @@ -852,7 +852,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
96360 }
96361
96362 if (going_down)
96363 - local->open_count--;
96364 + local_dec(&local->open_count);
96365
96366 switch (sdata->vif.type) {
96367 case NL80211_IFTYPE_AP_VLAN:
96368 @@ -919,7 +919,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
96369 }
96370 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
96371
96372 - if (local->open_count == 0)
96373 + if (local_read(&local->open_count) == 0)
96374 ieee80211_clear_tx_pending(local);
96375
96376 /*
96377 @@ -959,7 +959,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
96378
96379 ieee80211_recalc_ps(local, -1);
96380
96381 - if (local->open_count == 0) {
96382 + if (local_read(&local->open_count) == 0) {
96383 ieee80211_stop_device(local);
96384
96385 /* no reconfiguring after stop! */
96386 @@ -970,7 +970,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
96387 ieee80211_configure_filter(local);
96388 ieee80211_hw_config(local, hw_reconf_flags);
96389
96390 - if (local->monitors == local->open_count)
96391 + if (local->monitors == local_read(&local->open_count))
96392 ieee80211_add_virtual_monitor(local);
96393 }
96394
96395 diff --git a/net/mac80211/main.c b/net/mac80211/main.c
96396 index e765f77..dfd72e7 100644
96397 --- a/net/mac80211/main.c
96398 +++ b/net/mac80211/main.c
96399 @@ -172,7 +172,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
96400 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
96401 IEEE80211_CONF_CHANGE_POWER);
96402
96403 - if (changed && local->open_count) {
96404 + if (changed && local_read(&local->open_count)) {
96405 ret = drv_config(local, changed);
96406 /*
96407 * Goal:
96408 diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
96409 index 3401262..d5cd68d 100644
96410 --- a/net/mac80211/pm.c
96411 +++ b/net/mac80211/pm.c
96412 @@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
96413 struct ieee80211_sub_if_data *sdata;
96414 struct sta_info *sta;
96415
96416 - if (!local->open_count)
96417 + if (!local_read(&local->open_count))
96418 goto suspend;
96419
96420 ieee80211_scan_cancel(local);
96421 @@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
96422 cancel_work_sync(&local->dynamic_ps_enable_work);
96423 del_timer_sync(&local->dynamic_ps_timer);
96424
96425 - local->wowlan = wowlan && local->open_count;
96426 + local->wowlan = wowlan && local_read(&local->open_count);
96427 if (local->wowlan) {
96428 int err = drv_suspend(local, wowlan);
96429 if (err < 0) {
96430 @@ -116,7 +116,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
96431 WARN_ON(!list_empty(&local->chanctx_list));
96432
96433 /* stop hardware - this must stop RX */
96434 - if (local->open_count)
96435 + if (local_read(&local->open_count))
96436 ieee80211_stop_device(local);
96437
96438 suspend:
96439 diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
96440 index e126605..73d2c39 100644
96441 --- a/net/mac80211/rate.c
96442 +++ b/net/mac80211/rate.c
96443 @@ -725,7 +725,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
96444
96445 ASSERT_RTNL();
96446
96447 - if (local->open_count)
96448 + if (local_read(&local->open_count))
96449 return -EBUSY;
96450
96451 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
96452 diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
96453 index c97a065..ff61928 100644
96454 --- a/net/mac80211/rc80211_pid_debugfs.c
96455 +++ b/net/mac80211/rc80211_pid_debugfs.c
96456 @@ -193,7 +193,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
96457
96458 spin_unlock_irqrestore(&events->lock, status);
96459
96460 - if (copy_to_user(buf, pb, p))
96461 + if (p > sizeof(pb) || copy_to_user(buf, pb, p))
96462 return -EFAULT;
96463
96464 return p;
96465 diff --git a/net/mac80211/util.c b/net/mac80211/util.c
96466 index 69e4ef5..e8e4b92 100644
96467 --- a/net/mac80211/util.c
96468 +++ b/net/mac80211/util.c
96469 @@ -1470,7 +1470,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
96470 }
96471 #endif
96472 /* everything else happens only if HW was up & running */
96473 - if (!local->open_count)
96474 + if (!local_read(&local->open_count))
96475 goto wake_up;
96476
96477 /*
96478 @@ -1695,7 +1695,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
96479 local->in_reconfig = false;
96480 barrier();
96481
96482 - if (local->monitors == local->open_count && local->monitors > 0)
96483 + if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
96484 ieee80211_add_virtual_monitor(local);
96485
96486 /*
96487 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
96488 index 6e839b6..002a233 100644
96489 --- a/net/netfilter/Kconfig
96490 +++ b/net/netfilter/Kconfig
96491 @@ -950,6 +950,16 @@ config NETFILTER_XT_MATCH_ESP
96492
96493 To compile it as a module, choose M here. If unsure, say N.
96494
96495 +config NETFILTER_XT_MATCH_GRADM
96496 + tristate '"gradm" match support'
96497 + depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
96498 + depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
96499 + ---help---
96500 + The gradm match allows to match on grsecurity RBAC being enabled.
96501 + It is useful when iptables rules are applied early on bootup to
96502 + prevent connections to the machine (except from a trusted host)
96503 + while the RBAC system is disabled.
96504 +
96505 config NETFILTER_XT_MATCH_HASHLIMIT
96506 tristate '"hashlimit" match support'
96507 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
96508 diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
96509 index c3a0a12..90b587f 100644
96510 --- a/net/netfilter/Makefile
96511 +++ b/net/netfilter/Makefile
96512 @@ -112,6 +112,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
96513 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
96514 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
96515 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
96516 +obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
96517 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
96518 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
96519 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
96520 diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
96521 index f2e30fb..f131862 100644
96522 --- a/net/netfilter/ipset/ip_set_core.c
96523 +++ b/net/netfilter/ipset/ip_set_core.c
96524 @@ -1819,7 +1819,7 @@ done:
96525 return ret;
96526 }
96527
96528 -static struct nf_sockopt_ops so_set __read_mostly = {
96529 +static struct nf_sockopt_ops so_set = {
96530 .pf = PF_INET,
96531 .get_optmin = SO_IP_SET,
96532 .get_optmax = SO_IP_SET + 1,
96533 diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
96534 index 4c8e5c0..5a79b4d 100644
96535 --- a/net/netfilter/ipvs/ip_vs_conn.c
96536 +++ b/net/netfilter/ipvs/ip_vs_conn.c
96537 @@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
96538 /* Increase the refcnt counter of the dest */
96539 ip_vs_dest_hold(dest);
96540
96541 - conn_flags = atomic_read(&dest->conn_flags);
96542 + conn_flags = atomic_read_unchecked(&dest->conn_flags);
96543 if (cp->protocol != IPPROTO_UDP)
96544 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
96545 flags = cp->flags;
96546 @@ -900,7 +900,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
96547
96548 cp->control = NULL;
96549 atomic_set(&cp->n_control, 0);
96550 - atomic_set(&cp->in_pkts, 0);
96551 + atomic_set_unchecked(&cp->in_pkts, 0);
96552
96553 cp->packet_xmit = NULL;
96554 cp->app = NULL;
96555 @@ -1188,7 +1188,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
96556
96557 /* Don't drop the entry if its number of incoming packets is not
96558 located in [0, 8] */
96559 - i = atomic_read(&cp->in_pkts);
96560 + i = atomic_read_unchecked(&cp->in_pkts);
96561 if (i > 8 || i < 0) return 0;
96562
96563 if (!todrop_rate[i]) return 0;
96564 diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
96565 index 3581736..c0453e9 100644
96566 --- a/net/netfilter/ipvs/ip_vs_core.c
96567 +++ b/net/netfilter/ipvs/ip_vs_core.c
96568 @@ -567,7 +567,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
96569 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
96570 /* do not touch skb anymore */
96571
96572 - atomic_inc(&cp->in_pkts);
96573 + atomic_inc_unchecked(&cp->in_pkts);
96574 ip_vs_conn_put(cp);
96575 return ret;
96576 }
96577 @@ -1706,7 +1706,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
96578 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
96579 pkts = sysctl_sync_threshold(ipvs);
96580 else
96581 - pkts = atomic_add_return(1, &cp->in_pkts);
96582 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
96583
96584 if (ipvs->sync_state & IP_VS_STATE_MASTER)
96585 ip_vs_sync_conn(net, cp, pkts);
96586 diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
96587 index a3df9bd..895ae09 100644
96588 --- a/net/netfilter/ipvs/ip_vs_ctl.c
96589 +++ b/net/netfilter/ipvs/ip_vs_ctl.c
96590 @@ -794,7 +794,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
96591 */
96592 ip_vs_rs_hash(ipvs, dest);
96593 }
96594 - atomic_set(&dest->conn_flags, conn_flags);
96595 + atomic_set_unchecked(&dest->conn_flags, conn_flags);
96596
96597 /* bind the service */
96598 old_svc = rcu_dereference_protected(dest->svc, 1);
96599 @@ -1641,7 +1641,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
96600 * align with netns init in ip_vs_control_net_init()
96601 */
96602
96603 -static struct ctl_table vs_vars[] = {
96604 +static ctl_table_no_const vs_vars[] __read_only = {
96605 {
96606 .procname = "amemthresh",
96607 .maxlen = sizeof(int),
96608 @@ -2062,7 +2062,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
96609 " %-7s %-6d %-10d %-10d\n",
96610 &dest->addr.in6,
96611 ntohs(dest->port),
96612 - ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
96613 + ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
96614 atomic_read(&dest->weight),
96615 atomic_read(&dest->activeconns),
96616 atomic_read(&dest->inactconns));
96617 @@ -2073,7 +2073,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
96618 "%-7s %-6d %-10d %-10d\n",
96619 ntohl(dest->addr.ip),
96620 ntohs(dest->port),
96621 - ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
96622 + ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
96623 atomic_read(&dest->weight),
96624 atomic_read(&dest->activeconns),
96625 atomic_read(&dest->inactconns));
96626 @@ -2551,7 +2551,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
96627
96628 entry.addr = dest->addr.ip;
96629 entry.port = dest->port;
96630 - entry.conn_flags = atomic_read(&dest->conn_flags);
96631 + entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
96632 entry.weight = atomic_read(&dest->weight);
96633 entry.u_threshold = dest->u_threshold;
96634 entry.l_threshold = dest->l_threshold;
96635 @@ -3094,7 +3094,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
96636 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
96637 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
96638 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
96639 - (atomic_read(&dest->conn_flags) &
96640 + (atomic_read_unchecked(&dest->conn_flags) &
96641 IP_VS_CONN_F_FWD_MASK)) ||
96642 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
96643 atomic_read(&dest->weight)) ||
96644 @@ -3684,7 +3684,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
96645 {
96646 int idx;
96647 struct netns_ipvs *ipvs = net_ipvs(net);
96648 - struct ctl_table *tbl;
96649 + ctl_table_no_const *tbl;
96650
96651 atomic_set(&ipvs->dropentry, 0);
96652 spin_lock_init(&ipvs->dropentry_lock);
96653 diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
96654 index eff13c9..c1aab3e 100644
96655 --- a/net/netfilter/ipvs/ip_vs_lblc.c
96656 +++ b/net/netfilter/ipvs/ip_vs_lblc.c
96657 @@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
96658 * IPVS LBLC sysctl table
96659 */
96660 #ifdef CONFIG_SYSCTL
96661 -static struct ctl_table vs_vars_table[] = {
96662 +static ctl_table_no_const vs_vars_table[] __read_only = {
96663 {
96664 .procname = "lblc_expiration",
96665 .data = NULL,
96666 diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
96667 index 0b85500..8513fa5 100644
96668 --- a/net/netfilter/ipvs/ip_vs_lblcr.c
96669 +++ b/net/netfilter/ipvs/ip_vs_lblcr.c
96670 @@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
96671 * IPVS LBLCR sysctl table
96672 */
96673
96674 -static struct ctl_table vs_vars_table[] = {
96675 +static ctl_table_no_const vs_vars_table[] __read_only = {
96676 {
96677 .procname = "lblcr_expiration",
96678 .data = NULL,
96679 diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
96680 index f448471..995f131 100644
96681 --- a/net/netfilter/ipvs/ip_vs_sync.c
96682 +++ b/net/netfilter/ipvs/ip_vs_sync.c
96683 @@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
96684 cp = cp->control;
96685 if (cp) {
96686 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
96687 - pkts = atomic_add_return(1, &cp->in_pkts);
96688 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
96689 else
96690 pkts = sysctl_sync_threshold(ipvs);
96691 ip_vs_sync_conn(net, cp->control, pkts);
96692 @@ -771,7 +771,7 @@ control:
96693 if (!cp)
96694 return;
96695 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
96696 - pkts = atomic_add_return(1, &cp->in_pkts);
96697 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
96698 else
96699 pkts = sysctl_sync_threshold(ipvs);
96700 goto sloop;
96701 @@ -895,7 +895,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
96702
96703 if (opt)
96704 memcpy(&cp->in_seq, opt, sizeof(*opt));
96705 - atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
96706 + atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
96707 cp->state = state;
96708 cp->old_state = cp->state;
96709 /*
96710 diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
96711 index c47444e..b0961c6 100644
96712 --- a/net/netfilter/ipvs/ip_vs_xmit.c
96713 +++ b/net/netfilter/ipvs/ip_vs_xmit.c
96714 @@ -1102,7 +1102,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
96715 else
96716 rc = NF_ACCEPT;
96717 /* do not touch skb anymore */
96718 - atomic_inc(&cp->in_pkts);
96719 + atomic_inc_unchecked(&cp->in_pkts);
96720 goto out;
96721 }
96722
96723 @@ -1194,7 +1194,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
96724 else
96725 rc = NF_ACCEPT;
96726 /* do not touch skb anymore */
96727 - atomic_inc(&cp->in_pkts);
96728 + atomic_inc_unchecked(&cp->in_pkts);
96729 goto out;
96730 }
96731
96732 diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
96733 index 2d3030a..7ba1c0a 100644
96734 --- a/net/netfilter/nf_conntrack_acct.c
96735 +++ b/net/netfilter/nf_conntrack_acct.c
96736 @@ -60,7 +60,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
96737 #ifdef CONFIG_SYSCTL
96738 static int nf_conntrack_acct_init_sysctl(struct net *net)
96739 {
96740 - struct ctl_table *table;
96741 + ctl_table_no_const *table;
96742
96743 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
96744 GFP_KERNEL);
96745 diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
96746 index 5d892fe..d2fc9d8 100644
96747 --- a/net/netfilter/nf_conntrack_core.c
96748 +++ b/net/netfilter/nf_conntrack_core.c
96749 @@ -1600,6 +1600,10 @@ void nf_conntrack_init_end(void)
96750 #define DYING_NULLS_VAL ((1<<30)+1)
96751 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
96752
96753 +#ifdef CONFIG_GRKERNSEC_HIDESYM
96754 +static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
96755 +#endif
96756 +
96757 int nf_conntrack_init_net(struct net *net)
96758 {
96759 int ret;
96760 @@ -1614,7 +1618,11 @@ int nf_conntrack_init_net(struct net *net)
96761 goto err_stat;
96762 }
96763
96764 +#ifdef CONFIG_GRKERNSEC_HIDESYM
96765 + net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08lx", atomic_inc_return_unchecked(&conntrack_cache_id));
96766 +#else
96767 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
96768 +#endif
96769 if (!net->ct.slabname) {
96770 ret = -ENOMEM;
96771 goto err_slabname;
96772 diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
96773 index 1df1761..ce8b88a 100644
96774 --- a/net/netfilter/nf_conntrack_ecache.c
96775 +++ b/net/netfilter/nf_conntrack_ecache.c
96776 @@ -188,7 +188,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
96777 #ifdef CONFIG_SYSCTL
96778 static int nf_conntrack_event_init_sysctl(struct net *net)
96779 {
96780 - struct ctl_table *table;
96781 + ctl_table_no_const *table;
96782
96783 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
96784 GFP_KERNEL);
96785 diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
96786 index 974a2a4..52cc6ff 100644
96787 --- a/net/netfilter/nf_conntrack_helper.c
96788 +++ b/net/netfilter/nf_conntrack_helper.c
96789 @@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
96790
96791 static int nf_conntrack_helper_init_sysctl(struct net *net)
96792 {
96793 - struct ctl_table *table;
96794 + ctl_table_no_const *table;
96795
96796 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
96797 GFP_KERNEL);
96798 diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
96799 index ce30041..3861b5d 100644
96800 --- a/net/netfilter/nf_conntrack_proto.c
96801 +++ b/net/netfilter/nf_conntrack_proto.c
96802 @@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
96803
96804 static void
96805 nf_ct_unregister_sysctl(struct ctl_table_header **header,
96806 - struct ctl_table **table,
96807 + ctl_table_no_const **table,
96808 unsigned int users)
96809 {
96810 if (users > 0)
96811 diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c
96812 index a99b6c3..cb372f9 100644
96813 --- a/net/netfilter/nf_conntrack_proto_dccp.c
96814 +++ b/net/netfilter/nf_conntrack_proto_dccp.c
96815 @@ -428,7 +428,7 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb,
96816 const char *msg;
96817 u_int8_t state;
96818
96819 - dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &dh);
96820 + dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh);
96821 BUG_ON(dh == NULL);
96822
96823 state = dccp_state_table[CT_DCCP_ROLE_CLIENT][dh->dccph_type][CT_DCCP_NONE];
96824 @@ -457,7 +457,7 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb,
96825 out_invalid:
96826 if (LOG_INVALID(net, IPPROTO_DCCP))
96827 nf_log_packet(net, nf_ct_l3num(ct), 0, skb, NULL, NULL,
96828 - NULL, msg);
96829 + NULL, "%s", msg);
96830 return false;
96831 }
96832
96833 @@ -486,7 +486,7 @@ static int dccp_packet(struct nf_conn *ct, const struct sk_buff *skb,
96834 u_int8_t type, old_state, new_state;
96835 enum ct_dccp_roles role;
96836
96837 - dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &dh);
96838 + dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh);
96839 BUG_ON(dh == NULL);
96840 type = dh->dccph_type;
96841
96842 @@ -577,7 +577,7 @@ static int dccp_error(struct net *net, struct nf_conn *tmpl,
96843 unsigned int cscov;
96844 const char *msg;
96845
96846 - dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &dh);
96847 + dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh);
96848 if (dh == NULL) {
96849 msg = "nf_ct_dccp: short packet ";
96850 goto out_invalid;
96851 @@ -614,7 +614,7 @@ static int dccp_error(struct net *net, struct nf_conn *tmpl,
96852
96853 out_invalid:
96854 if (LOG_INVALID(net, IPPROTO_DCCP))
96855 - nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL, msg);
96856 + nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL, "%s", msg);
96857 return -NF_ACCEPT;
96858 }
96859
96860 diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
96861 index f641751..d3c5b51 100644
96862 --- a/net/netfilter/nf_conntrack_standalone.c
96863 +++ b/net/netfilter/nf_conntrack_standalone.c
96864 @@ -471,7 +471,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
96865
96866 static int nf_conntrack_standalone_init_sysctl(struct net *net)
96867 {
96868 - struct ctl_table *table;
96869 + ctl_table_no_const *table;
96870
96871 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
96872 GFP_KERNEL);
96873 diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
96874 index 902fb0a..87f7fdb 100644
96875 --- a/net/netfilter/nf_conntrack_timestamp.c
96876 +++ b/net/netfilter/nf_conntrack_timestamp.c
96877 @@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
96878 #ifdef CONFIG_SYSCTL
96879 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
96880 {
96881 - struct ctl_table *table;
96882 + ctl_table_no_const *table;
96883
96884 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
96885 GFP_KERNEL);
96886 diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
96887 index 85296d4..8becdec 100644
96888 --- a/net/netfilter/nf_log.c
96889 +++ b/net/netfilter/nf_log.c
96890 @@ -243,7 +243,7 @@ static const struct file_operations nflog_file_ops = {
96891
96892 #ifdef CONFIG_SYSCTL
96893 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
96894 -static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
96895 +static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
96896
96897 static int nf_log_proc_dostring(struct ctl_table *table, int write,
96898 void __user *buffer, size_t *lenp, loff_t *ppos)
96899 @@ -274,14 +274,16 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
96900 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
96901 mutex_unlock(&nf_log_mutex);
96902 } else {
96903 + ctl_table_no_const nf_log_table = *table;
96904 +
96905 mutex_lock(&nf_log_mutex);
96906 logger = rcu_dereference_protected(net->nf.nf_loggers[tindex],
96907 lockdep_is_held(&nf_log_mutex));
96908 if (!logger)
96909 - table->data = "NONE";
96910 + nf_log_table.data = "NONE";
96911 else
96912 - table->data = logger->name;
96913 - r = proc_dostring(table, write, buffer, lenp, ppos);
96914 + nf_log_table.data = logger->name;
96915 + r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
96916 mutex_unlock(&nf_log_mutex);
96917 }
96918
96919 diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
96920 index f042ae5..30ea486 100644
96921 --- a/net/netfilter/nf_sockopt.c
96922 +++ b/net/netfilter/nf_sockopt.c
96923 @@ -45,7 +45,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
96924 }
96925 }
96926
96927 - list_add(&reg->list, &nf_sockopts);
96928 + pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
96929 out:
96930 mutex_unlock(&nf_sockopt_mutex);
96931 return ret;
96932 @@ -55,7 +55,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
96933 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
96934 {
96935 mutex_lock(&nf_sockopt_mutex);
96936 - list_del(&reg->list);
96937 + pax_list_del((struct list_head *)&reg->list);
96938 mutex_unlock(&nf_sockopt_mutex);
96939 }
96940 EXPORT_SYMBOL(nf_unregister_sockopt);
96941 diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
96942 index d92cc31..e46f350 100644
96943 --- a/net/netfilter/nfnetlink_log.c
96944 +++ b/net/netfilter/nfnetlink_log.c
96945 @@ -82,7 +82,7 @@ static int nfnl_log_net_id __read_mostly;
96946 struct nfnl_log_net {
96947 spinlock_t instances_lock;
96948 struct hlist_head instance_table[INSTANCE_BUCKETS];
96949 - atomic_t global_seq;
96950 + atomic_unchecked_t global_seq;
96951 };
96952
96953 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
96954 @@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
96955 /* global sequence number */
96956 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
96957 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
96958 - htonl(atomic_inc_return(&log->global_seq))))
96959 + htonl(atomic_inc_return_unchecked(&log->global_seq))))
96960 goto nla_put_failure;
96961
96962 if (data_len) {
96963 diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
96964 new file mode 100644
96965 index 0000000..c566332
96966 --- /dev/null
96967 +++ b/net/netfilter/xt_gradm.c
96968 @@ -0,0 +1,51 @@
96969 +/*
96970 + * gradm match for netfilter
96971 + * Copyright © Zbigniew Krzystolik, 2010
96972 + *
96973 + * This program is free software; you can redistribute it and/or modify
96974 + * it under the terms of the GNU General Public License; either version
96975 + * 2 or 3 as published by the Free Software Foundation.
96976 + */
96977 +#include <linux/module.h>
96978 +#include <linux/moduleparam.h>
96979 +#include <linux/skbuff.h>
96980 +#include <linux/netfilter/x_tables.h>
96981 +#include <linux/grsecurity.h>
96982 +#include <linux/netfilter/xt_gradm.h>
96983 +
96984 +static bool
96985 +gradm_mt(const struct sk_buff *skb, struct xt_action_param *par)
96986 +{
96987 + const struct xt_gradm_mtinfo *info = par->matchinfo;
96988 + bool retval = false;
96989 + if (gr_acl_is_enabled())
96990 + retval = true;
96991 + return retval ^ info->invflags;
96992 +}
96993 +
96994 +static struct xt_match gradm_mt_reg __read_mostly = {
96995 + .name = "gradm",
96996 + .revision = 0,
96997 + .family = NFPROTO_UNSPEC,
96998 + .match = gradm_mt,
96999 + .matchsize = XT_ALIGN(sizeof(struct xt_gradm_mtinfo)),
97000 + .me = THIS_MODULE,
97001 +};
97002 +
97003 +static int __init gradm_mt_init(void)
97004 +{
97005 + return xt_register_match(&gradm_mt_reg);
97006 +}
97007 +
97008 +static void __exit gradm_mt_exit(void)
97009 +{
97010 + xt_unregister_match(&gradm_mt_reg);
97011 +}
97012 +
97013 +module_init(gradm_mt_init);
97014 +module_exit(gradm_mt_exit);
97015 +MODULE_AUTHOR("Zbigniew Krzystolik <zbyniu@destrukcja.pl>");
97016 +MODULE_DESCRIPTION("Xtables: Grsecurity RBAC match");
97017 +MODULE_LICENSE("GPL");
97018 +MODULE_ALIAS("ipt_gradm");
97019 +MODULE_ALIAS("ip6t_gradm");
97020 diff --git a/net/netfilter/xt_statistic.c b/net/netfilter/xt_statistic.c
97021 index 4fe4fb4..87a89e5 100644
97022 --- a/net/netfilter/xt_statistic.c
97023 +++ b/net/netfilter/xt_statistic.c
97024 @@ -19,7 +19,7 @@
97025 #include <linux/module.h>
97026
97027 struct xt_statistic_priv {
97028 - atomic_t count;
97029 + atomic_unchecked_t count;
97030 } ____cacheline_aligned_in_smp;
97031
97032 MODULE_LICENSE("GPL");
97033 @@ -42,9 +42,9 @@ statistic_mt(const struct sk_buff *skb, struct xt_action_param *par)
97034 break;
97035 case XT_STATISTIC_MODE_NTH:
97036 do {
97037 - oval = atomic_read(&info->master->count);
97038 + oval = atomic_read_unchecked(&info->master->count);
97039 nval = (oval == info->u.nth.every) ? 0 : oval + 1;
97040 - } while (atomic_cmpxchg(&info->master->count, oval, nval) != oval);
97041 + } while (atomic_cmpxchg_unchecked(&info->master->count, oval, nval) != oval);
97042 if (nval == 0)
97043 ret = !ret;
97044 break;
97045 @@ -64,7 +64,7 @@ static int statistic_mt_check(const struct xt_mtchk_param *par)
97046 info->master = kzalloc(sizeof(*info->master), GFP_KERNEL);
97047 if (info->master == NULL)
97048 return -ENOMEM;
97049 - atomic_set(&info->master->count, info->u.nth.count);
97050 + atomic_set_unchecked(&info->master->count, info->u.nth.count);
97051
97052 return 0;
97053 }
97054 diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
97055 index 6135635..5bdc54a 100644
97056 --- a/net/netlink/af_netlink.c
97057 +++ b/net/netlink/af_netlink.c
97058 @@ -249,7 +249,7 @@ static void netlink_overrun(struct sock *sk)
97059 sk->sk_error_report(sk);
97060 }
97061 }
97062 - atomic_inc(&sk->sk_drops);
97063 + atomic_inc_unchecked(&sk->sk_drops);
97064 }
97065
97066 static void netlink_rcv_wake(struct sock *sk)
97067 @@ -2940,7 +2940,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
97068 sk_wmem_alloc_get(s),
97069 nlk->cb_running,
97070 atomic_read(&s->sk_refcnt),
97071 - atomic_read(&s->sk_drops),
97072 + atomic_read_unchecked(&s->sk_drops),
97073 sock_i_ino(s)
97074 );
97075
97076 diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
97077 index 0c741ce..f8c8ca7 100644
97078 --- a/net/netlink/genetlink.c
97079 +++ b/net/netlink/genetlink.c
97080 @@ -310,18 +310,20 @@ int genl_register_ops(struct genl_family *family, struct genl_ops *ops)
97081 goto errout;
97082 }
97083
97084 + pax_open_kernel();
97085 if (ops->dumpit)
97086 - ops->flags |= GENL_CMD_CAP_DUMP;
97087 + *(unsigned int *)&ops->flags |= GENL_CMD_CAP_DUMP;
97088 if (ops->doit)
97089 - ops->flags |= GENL_CMD_CAP_DO;
97090 + *(unsigned int *)&ops->flags |= GENL_CMD_CAP_DO;
97091 if (ops->policy)
97092 - ops->flags |= GENL_CMD_CAP_HASPOL;
97093 + *(unsigned int *)&ops->flags |= GENL_CMD_CAP_HASPOL;
97094 + pax_close_kernel();
97095
97096 genl_lock_all();
97097 - list_add_tail(&ops->ops_list, &family->ops_list);
97098 + pax_list_add_tail((struct list_head *)&ops->ops_list, &family->ops_list);
97099 genl_unlock_all();
97100
97101 - genl_ctrl_event(CTRL_CMD_NEWOPS, ops);
97102 + genl_ctrl_event(CTRL_CMD_NEWOPS, (void *)ops);
97103 err = 0;
97104 errout:
97105 return err;
97106 @@ -351,9 +353,9 @@ int genl_unregister_ops(struct genl_family *family, struct genl_ops *ops)
97107 genl_lock_all();
97108 list_for_each_entry(rc, &family->ops_list, ops_list) {
97109 if (rc == ops) {
97110 - list_del(&ops->ops_list);
97111 + pax_list_del((struct list_head *)&ops->ops_list);
97112 genl_unlock_all();
97113 - genl_ctrl_event(CTRL_CMD_DELOPS, ops);
97114 + genl_ctrl_event(CTRL_CMD_DELOPS, (void *)ops);
97115 return 0;
97116 }
97117 }
97118 diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
97119 index 53c19a3..b0ac04a 100644
97120 --- a/net/netrom/af_netrom.c
97121 +++ b/net/netrom/af_netrom.c
97122 @@ -850,7 +850,6 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
97123 *uaddr_len = sizeof(struct full_sockaddr_ax25);
97124 } else {
97125 sax->fsa_ax25.sax25_family = AF_NETROM;
97126 - sax->fsa_ax25.sax25_ndigis = 0;
97127 sax->fsa_ax25.sax25_call = nr->source_addr;
97128 *uaddr_len = sizeof(struct sockaddr_ax25);
97129 }
97130 diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
97131 index ba2548b..1a4e98e 100644
97132 --- a/net/packet/af_packet.c
97133 +++ b/net/packet/af_packet.c
97134 @@ -1699,7 +1699,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
97135
97136 spin_lock(&sk->sk_receive_queue.lock);
97137 po->stats.stats1.tp_packets++;
97138 - skb->dropcount = atomic_read(&sk->sk_drops);
97139 + skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
97140 __skb_queue_tail(&sk->sk_receive_queue, skb);
97141 spin_unlock(&sk->sk_receive_queue.lock);
97142 sk->sk_data_ready(sk, skb->len);
97143 @@ -1708,7 +1708,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
97144 drop_n_acct:
97145 spin_lock(&sk->sk_receive_queue.lock);
97146 po->stats.stats1.tp_drops++;
97147 - atomic_inc(&sk->sk_drops);
97148 + atomic_inc_unchecked(&sk->sk_drops);
97149 spin_unlock(&sk->sk_receive_queue.lock);
97150
97151 drop_n_restore:
97152 @@ -3261,7 +3261,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
97153 case PACKET_HDRLEN:
97154 if (len > sizeof(int))
97155 len = sizeof(int);
97156 - if (copy_from_user(&val, optval, len))
97157 + if (len > sizeof(val) || copy_from_user(&val, optval, len))
97158 return -EFAULT;
97159 switch (val) {
97160 case TPACKET_V1:
97161 @@ -3304,7 +3304,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
97162 len = lv;
97163 if (put_user(len, optlen))
97164 return -EFAULT;
97165 - if (copy_to_user(optval, data, len))
97166 + if (len > sizeof(st) || copy_to_user(optval, data, len))
97167 return -EFAULT;
97168 return 0;
97169 }
97170 diff --git a/net/phonet/pep.c b/net/phonet/pep.c
97171 index e774117..900b8b7 100644
97172 --- a/net/phonet/pep.c
97173 +++ b/net/phonet/pep.c
97174 @@ -388,7 +388,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
97175
97176 case PNS_PEP_CTRL_REQ:
97177 if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX) {
97178 - atomic_inc(&sk->sk_drops);
97179 + atomic_inc_unchecked(&sk->sk_drops);
97180 break;
97181 }
97182 __skb_pull(skb, 4);
97183 @@ -409,7 +409,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
97184 }
97185
97186 if (pn->rx_credits == 0) {
97187 - atomic_inc(&sk->sk_drops);
97188 + atomic_inc_unchecked(&sk->sk_drops);
97189 err = -ENOBUFS;
97190 break;
97191 }
97192 @@ -580,7 +580,7 @@ static int pipe_handler_do_rcv(struct sock *sk, struct sk_buff *skb)
97193 }
97194
97195 if (pn->rx_credits == 0) {
97196 - atomic_inc(&sk->sk_drops);
97197 + atomic_inc_unchecked(&sk->sk_drops);
97198 err = NET_RX_DROP;
97199 break;
97200 }
97201 diff --git a/net/phonet/socket.c b/net/phonet/socket.c
97202 index 77e38f7..f4ef5c3 100644
97203 --- a/net/phonet/socket.c
97204 +++ b/net/phonet/socket.c
97205 @@ -612,7 +612,7 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)
97206 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sk)),
97207 sock_i_ino(sk),
97208 atomic_read(&sk->sk_refcnt), sk,
97209 - atomic_read(&sk->sk_drops), &len);
97210 + atomic_read_unchecked(&sk->sk_drops), &len);
97211 }
97212 seq_printf(seq, "%*s\n", 127 - len, "");
97213 return 0;
97214 diff --git a/net/phonet/sysctl.c b/net/phonet/sysctl.c
97215 index c02a8c4..3c5b600 100644
97216 --- a/net/phonet/sysctl.c
97217 +++ b/net/phonet/sysctl.c
97218 @@ -67,7 +67,7 @@ static int proc_local_port_range(struct ctl_table *table, int write,
97219 {
97220 int ret;
97221 int range[2] = {local_port_range[0], local_port_range[1]};
97222 - struct ctl_table tmp = {
97223 + ctl_table_no_const tmp = {
97224 .data = &range,
97225 .maxlen = sizeof(range),
97226 .mode = table->mode,
97227 diff --git a/net/rds/cong.c b/net/rds/cong.c
97228 index e5b65ac..f3b6fb7 100644
97229 --- a/net/rds/cong.c
97230 +++ b/net/rds/cong.c
97231 @@ -78,7 +78,7 @@
97232 * finds that the saved generation number is smaller than the global generation
97233 * number, it wakes up the process.
97234 */
97235 -static atomic_t rds_cong_generation = ATOMIC_INIT(0);
97236 +static atomic_unchecked_t rds_cong_generation = ATOMIC_INIT(0);
97237
97238 /*
97239 * Congestion monitoring
97240 @@ -233,7 +233,7 @@ void rds_cong_map_updated(struct rds_cong_map *map, uint64_t portmask)
97241 rdsdebug("waking map %p for %pI4\n",
97242 map, &map->m_addr);
97243 rds_stats_inc(s_cong_update_received);
97244 - atomic_inc(&rds_cong_generation);
97245 + atomic_inc_unchecked(&rds_cong_generation);
97246 if (waitqueue_active(&map->m_waitq))
97247 wake_up(&map->m_waitq);
97248 if (waitqueue_active(&rds_poll_waitq))
97249 @@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(rds_cong_map_updated);
97250
97251 int rds_cong_updated_since(unsigned long *recent)
97252 {
97253 - unsigned long gen = atomic_read(&rds_cong_generation);
97254 + unsigned long gen = atomic_read_unchecked(&rds_cong_generation);
97255
97256 if (likely(*recent == gen))
97257 return 0;
97258 diff --git a/net/rds/ib.h b/net/rds/ib.h
97259 index 7280ab8..e04f4ea 100644
97260 --- a/net/rds/ib.h
97261 +++ b/net/rds/ib.h
97262 @@ -128,7 +128,7 @@ struct rds_ib_connection {
97263 /* sending acks */
97264 unsigned long i_ack_flags;
97265 #ifdef KERNEL_HAS_ATOMIC64
97266 - atomic64_t i_ack_next; /* next ACK to send */
97267 + atomic64_unchecked_t i_ack_next; /* next ACK to send */
97268 #else
97269 spinlock_t i_ack_lock; /* protect i_ack_next */
97270 u64 i_ack_next; /* next ACK to send */
97271 diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
97272 index 31b74f5..dc1fbfa 100644
97273 --- a/net/rds/ib_cm.c
97274 +++ b/net/rds/ib_cm.c
97275 @@ -717,7 +717,7 @@ void rds_ib_conn_shutdown(struct rds_connection *conn)
97276 /* Clear the ACK state */
97277 clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
97278 #ifdef KERNEL_HAS_ATOMIC64
97279 - atomic64_set(&ic->i_ack_next, 0);
97280 + atomic64_set_unchecked(&ic->i_ack_next, 0);
97281 #else
97282 ic->i_ack_next = 0;
97283 #endif
97284 diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
97285 index 8eb9501..0c386ff 100644
97286 --- a/net/rds/ib_recv.c
97287 +++ b/net/rds/ib_recv.c
97288 @@ -597,7 +597,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
97289 static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq,
97290 int ack_required)
97291 {
97292 - atomic64_set(&ic->i_ack_next, seq);
97293 + atomic64_set_unchecked(&ic->i_ack_next, seq);
97294 if (ack_required) {
97295 smp_mb__before_clear_bit();
97296 set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
97297 @@ -609,7 +609,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
97298 clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
97299 smp_mb__after_clear_bit();
97300
97301 - return atomic64_read(&ic->i_ack_next);
97302 + return atomic64_read_unchecked(&ic->i_ack_next);
97303 }
97304 #endif
97305
97306 diff --git a/net/rds/iw.h b/net/rds/iw.h
97307 index 04ce3b1..48119a6 100644
97308 --- a/net/rds/iw.h
97309 +++ b/net/rds/iw.h
97310 @@ -134,7 +134,7 @@ struct rds_iw_connection {
97311 /* sending acks */
97312 unsigned long i_ack_flags;
97313 #ifdef KERNEL_HAS_ATOMIC64
97314 - atomic64_t i_ack_next; /* next ACK to send */
97315 + atomic64_unchecked_t i_ack_next; /* next ACK to send */
97316 #else
97317 spinlock_t i_ack_lock; /* protect i_ack_next */
97318 u64 i_ack_next; /* next ACK to send */
97319 diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c
97320 index a91e1db..cf3053f 100644
97321 --- a/net/rds/iw_cm.c
97322 +++ b/net/rds/iw_cm.c
97323 @@ -663,7 +663,7 @@ void rds_iw_conn_shutdown(struct rds_connection *conn)
97324 /* Clear the ACK state */
97325 clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
97326 #ifdef KERNEL_HAS_ATOMIC64
97327 - atomic64_set(&ic->i_ack_next, 0);
97328 + atomic64_set_unchecked(&ic->i_ack_next, 0);
97329 #else
97330 ic->i_ack_next = 0;
97331 #endif
97332 diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c
97333 index 4503335..db566b4 100644
97334 --- a/net/rds/iw_recv.c
97335 +++ b/net/rds/iw_recv.c
97336 @@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
97337 static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq,
97338 int ack_required)
97339 {
97340 - atomic64_set(&ic->i_ack_next, seq);
97341 + atomic64_set_unchecked(&ic->i_ack_next, seq);
97342 if (ack_required) {
97343 smp_mb__before_clear_bit();
97344 set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
97345 @@ -439,7 +439,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
97346 clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
97347 smp_mb__after_clear_bit();
97348
97349 - return atomic64_read(&ic->i_ack_next);
97350 + return atomic64_read_unchecked(&ic->i_ack_next);
97351 }
97352 #endif
97353
97354 diff --git a/net/rds/rds.h b/net/rds/rds.h
97355 index ec1d731..90a3a8d 100644
97356 --- a/net/rds/rds.h
97357 +++ b/net/rds/rds.h
97358 @@ -449,7 +449,7 @@ struct rds_transport {
97359 void (*sync_mr)(void *trans_private, int direction);
97360 void (*free_mr)(void *trans_private, int invalidate);
97361 void (*flush_mrs)(void);
97362 -};
97363 +} __do_const;
97364
97365 struct rds_sock {
97366 struct sock rs_sk;
97367 diff --git a/net/rds/tcp.c b/net/rds/tcp.c
97368 index edac9ef..16bcb98 100644
97369 --- a/net/rds/tcp.c
97370 +++ b/net/rds/tcp.c
97371 @@ -59,7 +59,7 @@ void rds_tcp_nonagle(struct socket *sock)
97372 int val = 1;
97373
97374 set_fs(KERNEL_DS);
97375 - sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __user *)&val,
97376 + sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __force_user *)&val,
97377 sizeof(val));
97378 set_fs(oldfs);
97379 }
97380 diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c
97381 index 81cf5a4..b5826ff 100644
97382 --- a/net/rds/tcp_send.c
97383 +++ b/net/rds/tcp_send.c
97384 @@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket *sock, int val)
97385
97386 oldfs = get_fs();
97387 set_fs(KERNEL_DS);
97388 - sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __user *)&val,
97389 + sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __force_user *)&val,
97390 sizeof(val));
97391 set_fs(oldfs);
97392 }
97393 diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
97394 index e61aa60..f07cc89 100644
97395 --- a/net/rxrpc/af_rxrpc.c
97396 +++ b/net/rxrpc/af_rxrpc.c
97397 @@ -40,7 +40,7 @@ static const struct proto_ops rxrpc_rpc_ops;
97398 __be32 rxrpc_epoch;
97399
97400 /* current debugging ID */
97401 -atomic_t rxrpc_debug_id;
97402 +atomic_unchecked_t rxrpc_debug_id;
97403
97404 /* count of skbs currently in use */
97405 atomic_t rxrpc_n_skbs;
97406 diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
97407 index e4d9cbc..b229649 100644
97408 --- a/net/rxrpc/ar-ack.c
97409 +++ b/net/rxrpc/ar-ack.c
97410 @@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
97411
97412 _enter("{%d,%d,%d,%d},",
97413 call->acks_hard, call->acks_unacked,
97414 - atomic_read(&call->sequence),
97415 + atomic_read_unchecked(&call->sequence),
97416 CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz));
97417
97418 stop = 0;
97419 @@ -199,7 +199,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
97420
97421 /* each Tx packet has a new serial number */
97422 sp->hdr.serial =
97423 - htonl(atomic_inc_return(&call->conn->serial));
97424 + htonl(atomic_inc_return_unchecked(&call->conn->serial));
97425
97426 hdr = (struct rxrpc_header *) txb->head;
97427 hdr->serial = sp->hdr.serial;
97428 @@ -403,7 +403,7 @@ static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
97429 */
97430 static void rxrpc_clear_tx_window(struct rxrpc_call *call)
97431 {
97432 - rxrpc_rotate_tx_window(call, atomic_read(&call->sequence));
97433 + rxrpc_rotate_tx_window(call, atomic_read_unchecked(&call->sequence));
97434 }
97435
97436 /*
97437 @@ -629,7 +629,7 @@ process_further:
97438
97439 latest = ntohl(sp->hdr.serial);
97440 hard = ntohl(ack.firstPacket);
97441 - tx = atomic_read(&call->sequence);
97442 + tx = atomic_read_unchecked(&call->sequence);
97443
97444 _proto("Rx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
97445 latest,
97446 @@ -1161,7 +1161,7 @@ void rxrpc_process_call(struct work_struct *work)
97447 goto maybe_reschedule;
97448
97449 send_ACK_with_skew:
97450 - ack.maxSkew = htons(atomic_read(&call->conn->hi_serial) -
97451 + ack.maxSkew = htons(atomic_read_unchecked(&call->conn->hi_serial) -
97452 ntohl(ack.serial));
97453 send_ACK:
97454 mtu = call->conn->trans->peer->if_mtu;
97455 @@ -1173,7 +1173,7 @@ send_ACK:
97456 ackinfo.rxMTU = htonl(5692);
97457 ackinfo.jumbo_max = htonl(4);
97458
97459 - hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
97460 + hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
97461 _proto("Tx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
97462 ntohl(hdr.serial),
97463 ntohs(ack.maxSkew),
97464 @@ -1191,7 +1191,7 @@ send_ACK:
97465 send_message:
97466 _debug("send message");
97467
97468 - hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
97469 + hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
97470 _proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
97471 send_message_2:
97472
97473 diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c
97474 index a3bbb36..3341fb9 100644
97475 --- a/net/rxrpc/ar-call.c
97476 +++ b/net/rxrpc/ar-call.c
97477 @@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp)
97478 spin_lock_init(&call->lock);
97479 rwlock_init(&call->state_lock);
97480 atomic_set(&call->usage, 1);
97481 - call->debug_id = atomic_inc_return(&rxrpc_debug_id);
97482 + call->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
97483 call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
97484
97485 memset(&call->sock_node, 0xed, sizeof(call->sock_node));
97486 diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c
97487 index 4106ca9..a338d7a 100644
97488 --- a/net/rxrpc/ar-connection.c
97489 +++ b/net/rxrpc/ar-connection.c
97490 @@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_alloc_connection(gfp_t gfp)
97491 rwlock_init(&conn->lock);
97492 spin_lock_init(&conn->state_lock);
97493 atomic_set(&conn->usage, 1);
97494 - conn->debug_id = atomic_inc_return(&rxrpc_debug_id);
97495 + conn->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
97496 conn->avail_calls = RXRPC_MAXCALLS;
97497 conn->size_align = 4;
97498 conn->header_size = sizeof(struct rxrpc_header);
97499 diff --git a/net/rxrpc/ar-connevent.c b/net/rxrpc/ar-connevent.c
97500 index e7ed43a..6afa140 100644
97501 --- a/net/rxrpc/ar-connevent.c
97502 +++ b/net/rxrpc/ar-connevent.c
97503 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct rxrpc_connection *conn,
97504
97505 len = iov[0].iov_len + iov[1].iov_len;
97506
97507 - hdr.serial = htonl(atomic_inc_return(&conn->serial));
97508 + hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
97509 _proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
97510
97511 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
97512 diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c
97513 index 529572f..c758ca7 100644
97514 --- a/net/rxrpc/ar-input.c
97515 +++ b/net/rxrpc/ar-input.c
97516 @@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb)
97517 /* track the latest serial number on this connection for ACK packet
97518 * information */
97519 serial = ntohl(sp->hdr.serial);
97520 - hi_serial = atomic_read(&call->conn->hi_serial);
97521 + hi_serial = atomic_read_unchecked(&call->conn->hi_serial);
97522 while (serial > hi_serial)
97523 - hi_serial = atomic_cmpxchg(&call->conn->hi_serial, hi_serial,
97524 + hi_serial = atomic_cmpxchg_unchecked(&call->conn->hi_serial, hi_serial,
97525 serial);
97526
97527 /* request ACK generation for any ACK or DATA packet that requests
97528 diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
97529 index a693aca..81e7293 100644
97530 --- a/net/rxrpc/ar-internal.h
97531 +++ b/net/rxrpc/ar-internal.h
97532 @@ -272,8 +272,8 @@ struct rxrpc_connection {
97533 int error; /* error code for local abort */
97534 int debug_id; /* debug ID for printks */
97535 unsigned int call_counter; /* call ID counter */
97536 - atomic_t serial; /* packet serial number counter */
97537 - atomic_t hi_serial; /* highest serial number received */
97538 + atomic_unchecked_t serial; /* packet serial number counter */
97539 + atomic_unchecked_t hi_serial; /* highest serial number received */
97540 u8 avail_calls; /* number of calls available */
97541 u8 size_align; /* data size alignment (for security) */
97542 u8 header_size; /* rxrpc + security header size */
97543 @@ -346,7 +346,7 @@ struct rxrpc_call {
97544 spinlock_t lock;
97545 rwlock_t state_lock; /* lock for state transition */
97546 atomic_t usage;
97547 - atomic_t sequence; /* Tx data packet sequence counter */
97548 + atomic_unchecked_t sequence; /* Tx data packet sequence counter */
97549 u32 abort_code; /* local/remote abort code */
97550 enum { /* current state of call */
97551 RXRPC_CALL_CLIENT_SEND_REQUEST, /* - client sending request phase */
97552 @@ -420,7 +420,7 @@ static inline void rxrpc_abort_call(struct rxrpc_call *call, u32 abort_code)
97553 */
97554 extern atomic_t rxrpc_n_skbs;
97555 extern __be32 rxrpc_epoch;
97556 -extern atomic_t rxrpc_debug_id;
97557 +extern atomic_unchecked_t rxrpc_debug_id;
97558 extern struct workqueue_struct *rxrpc_workqueue;
97559
97560 /*
97561 diff --git a/net/rxrpc/ar-local.c b/net/rxrpc/ar-local.c
97562 index 87f7135..74d3703 100644
97563 --- a/net/rxrpc/ar-local.c
97564 +++ b/net/rxrpc/ar-local.c
97565 @@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(struct sockaddr_rxrpc *srx)
97566 spin_lock_init(&local->lock);
97567 rwlock_init(&local->services_lock);
97568 atomic_set(&local->usage, 1);
97569 - local->debug_id = atomic_inc_return(&rxrpc_debug_id);
97570 + local->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
97571 memcpy(&local->srx, srx, sizeof(*srx));
97572 }
97573
97574 diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
97575 index e1ac183..b43e10e 100644
97576 --- a/net/rxrpc/ar-output.c
97577 +++ b/net/rxrpc/ar-output.c
97578 @@ -682,9 +682,9 @@ static int rxrpc_send_data(struct kiocb *iocb,
97579 sp->hdr.cid = call->cid;
97580 sp->hdr.callNumber = call->call_id;
97581 sp->hdr.seq =
97582 - htonl(atomic_inc_return(&call->sequence));
97583 + htonl(atomic_inc_return_unchecked(&call->sequence));
97584 sp->hdr.serial =
97585 - htonl(atomic_inc_return(&conn->serial));
97586 + htonl(atomic_inc_return_unchecked(&conn->serial));
97587 sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
97588 sp->hdr.userStatus = 0;
97589 sp->hdr.securityIndex = conn->security_ix;
97590 diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/ar-peer.c
97591 index bebaa43..2644591 100644
97592 --- a/net/rxrpc/ar-peer.c
97593 +++ b/net/rxrpc/ar-peer.c
97594 @@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_peer(struct sockaddr_rxrpc *srx,
97595 INIT_LIST_HEAD(&peer->error_targets);
97596 spin_lock_init(&peer->lock);
97597 atomic_set(&peer->usage, 1);
97598 - peer->debug_id = atomic_inc_return(&rxrpc_debug_id);
97599 + peer->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
97600 memcpy(&peer->srx, srx, sizeof(*srx));
97601
97602 rxrpc_assess_MTU_size(peer);
97603 diff --git a/net/rxrpc/ar-proc.c b/net/rxrpc/ar-proc.c
97604 index 38047f7..9f48511 100644
97605 --- a/net/rxrpc/ar-proc.c
97606 +++ b/net/rxrpc/ar-proc.c
97607 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(struct seq_file *seq, void *v)
97608 atomic_read(&conn->usage),
97609 rxrpc_conn_states[conn->state],
97610 key_serial(conn->key),
97611 - atomic_read(&conn->serial),
97612 - atomic_read(&conn->hi_serial));
97613 + atomic_read_unchecked(&conn->serial),
97614 + atomic_read_unchecked(&conn->hi_serial));
97615
97616 return 0;
97617 }
97618 diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c
97619 index 92df566..87ec1bf 100644
97620 --- a/net/rxrpc/ar-transport.c
97621 +++ b/net/rxrpc/ar-transport.c
97622 @@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_alloc_transport(struct rxrpc_local *local,
97623 spin_lock_init(&trans->client_lock);
97624 rwlock_init(&trans->conn_lock);
97625 atomic_set(&trans->usage, 1);
97626 - trans->debug_id = atomic_inc_return(&rxrpc_debug_id);
97627 + trans->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
97628
97629 if (peer->srx.transport.family == AF_INET) {
97630 switch (peer->srx.transport_type) {
97631 diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
97632 index f226709..0e735a8 100644
97633 --- a/net/rxrpc/rxkad.c
97634 +++ b/net/rxrpc/rxkad.c
97635 @@ -610,7 +610,7 @@ static int rxkad_issue_challenge(struct rxrpc_connection *conn)
97636
97637 len = iov[0].iov_len + iov[1].iov_len;
97638
97639 - hdr.serial = htonl(atomic_inc_return(&conn->serial));
97640 + hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
97641 _proto("Tx CHALLENGE %%%u", ntohl(hdr.serial));
97642
97643 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
97644 @@ -660,7 +660,7 @@ static int rxkad_send_response(struct rxrpc_connection *conn,
97645
97646 len = iov[0].iov_len + iov[1].iov_len + iov[2].iov_len;
97647
97648 - hdr->serial = htonl(atomic_inc_return(&conn->serial));
97649 + hdr->serial = htonl(atomic_inc_return_unchecked(&conn->serial));
97650 _proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
97651
97652 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
97653 diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
97654 index e7b2d4f..bb1efd0 100644
97655 --- a/net/sctp/ipv6.c
97656 +++ b/net/sctp/ipv6.c
97657 @@ -962,7 +962,7 @@ static const struct inet6_protocol sctpv6_protocol = {
97658 .flags = INET6_PROTO_NOPOLICY | INET6_PROTO_FINAL,
97659 };
97660
97661 -static struct sctp_af sctp_af_inet6 = {
97662 +static struct sctp_af sctp_af_inet6 __read_only = {
97663 .sa_family = AF_INET6,
97664 .sctp_xmit = sctp_v6_xmit,
97665 .setsockopt = ipv6_setsockopt,
97666 @@ -994,7 +994,7 @@ static struct sctp_af sctp_af_inet6 = {
97667 #endif
97668 };
97669
97670 -static struct sctp_pf sctp_pf_inet6 = {
97671 +static struct sctp_pf sctp_pf_inet6 __read_only = {
97672 .event_msgname = sctp_inet6_event_msgname,
97673 .skb_msgname = sctp_inet6_skb_msgname,
97674 .af_supported = sctp_inet6_af_supported,
97675 @@ -1019,7 +1019,7 @@ void sctp_v6_pf_init(void)
97676
97677 void sctp_v6_pf_exit(void)
97678 {
97679 - list_del(&sctp_af_inet6.list);
97680 + pax_list_del(&sctp_af_inet6.list);
97681 }
97682
97683 /* Initialize IPv6 support and register with socket layer. */
97684 diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
97685 index 5e17092..19be1d4 100644
97686 --- a/net/sctp/protocol.c
97687 +++ b/net/sctp/protocol.c
97688 @@ -832,8 +832,10 @@ int sctp_register_af(struct sctp_af *af)
97689 return 0;
97690 }
97691
97692 + pax_open_kernel();
97693 INIT_LIST_HEAD(&af->list);
97694 - list_add_tail(&af->list, &sctp_address_families);
97695 + pax_close_kernel();
97696 + pax_list_add_tail(&af->list, &sctp_address_families);
97697 return 1;
97698 }
97699
97700 @@ -963,7 +965,7 @@ static inline int sctp_v4_xmit(struct sk_buff *skb,
97701
97702 static struct sctp_af sctp_af_inet;
97703
97704 -static struct sctp_pf sctp_pf_inet = {
97705 +static struct sctp_pf sctp_pf_inet __read_only = {
97706 .event_msgname = sctp_inet_event_msgname,
97707 .skb_msgname = sctp_inet_skb_msgname,
97708 .af_supported = sctp_inet_af_supported,
97709 @@ -1034,7 +1036,7 @@ static const struct net_protocol sctp_protocol = {
97710 };
97711
97712 /* IPv4 address related functions. */
97713 -static struct sctp_af sctp_af_inet = {
97714 +static struct sctp_af sctp_af_inet __read_only = {
97715 .sa_family = AF_INET,
97716 .sctp_xmit = sctp_v4_xmit,
97717 .setsockopt = ip_setsockopt,
97718 @@ -1119,7 +1121,7 @@ static void sctp_v4_pf_init(void)
97719
97720 static void sctp_v4_pf_exit(void)
97721 {
97722 - list_del(&sctp_af_inet.list);
97723 + pax_list_del(&sctp_af_inet.list);
97724 }
97725
97726 static int sctp_v4_protosw_init(void)
97727 diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
97728 index 1a6eef3..17e898f 100644
97729 --- a/net/sctp/sm_sideeffect.c
97730 +++ b/net/sctp/sm_sideeffect.c
97731 @@ -440,7 +440,7 @@ static void sctp_generate_sack_event(unsigned long data)
97732 sctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_SACK);
97733 }
97734
97735 -sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES] = {
97736 +sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES] = {
97737 NULL,
97738 sctp_generate_t1_cookie_event,
97739 sctp_generate_t1_init_event,
97740 diff --git a/net/sctp/socket.c b/net/sctp/socket.c
97741 index 911b71b..90ade0a 100644
97742 --- a/net/sctp/socket.c
97743 +++ b/net/sctp/socket.c
97744 @@ -2153,11 +2153,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
97745 {
97746 struct sctp_association *asoc;
97747 struct sctp_ulpevent *event;
97748 + struct sctp_event_subscribe subscribe;
97749
97750 if (optlen > sizeof(struct sctp_event_subscribe))
97751 return -EINVAL;
97752 - if (copy_from_user(&sctp_sk(sk)->subscribe, optval, optlen))
97753 + if (copy_from_user(&subscribe, optval, optlen))
97754 return -EFAULT;
97755 + sctp_sk(sk)->subscribe = subscribe;
97756
97757 /*
97758 * At the time when a user app subscribes to SCTP_SENDER_DRY_EVENT,
97759 @@ -4213,13 +4215,16 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
97760 static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
97761 int __user *optlen)
97762 {
97763 + struct sctp_event_subscribe subscribe;
97764 +
97765 if (len <= 0)
97766 return -EINVAL;
97767 if (len > sizeof(struct sctp_event_subscribe))
97768 len = sizeof(struct sctp_event_subscribe);
97769 if (put_user(len, optlen))
97770 return -EFAULT;
97771 - if (copy_to_user(optval, &sctp_sk(sk)->subscribe, len))
97772 + subscribe = sctp_sk(sk)->subscribe;
97773 + if (copy_to_user(optval, &subscribe, len))
97774 return -EFAULT;
97775 return 0;
97776 }
97777 @@ -4237,6 +4242,8 @@ static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
97778 */
97779 static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optval, int __user *optlen)
97780 {
97781 + __u32 autoclose;
97782 +
97783 /* Applicable to UDP-style socket only */
97784 if (sctp_style(sk, TCP))
97785 return -EOPNOTSUPP;
97786 @@ -4245,7 +4252,8 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
97787 len = sizeof(int);
97788 if (put_user(len, optlen))
97789 return -EFAULT;
97790 - if (copy_to_user(optval, &sctp_sk(sk)->autoclose, sizeof(int)))
97791 + autoclose = sctp_sk(sk)->autoclose;
97792 + if (copy_to_user(optval, &autoclose, sizeof(int)))
97793 return -EFAULT;
97794 return 0;
97795 }
97796 @@ -4617,12 +4625,15 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len,
97797 */
97798 static int sctp_getsockopt_initmsg(struct sock *sk, int len, char __user *optval, int __user *optlen)
97799 {
97800 + struct sctp_initmsg initmsg;
97801 +
97802 if (len < sizeof(struct sctp_initmsg))
97803 return -EINVAL;
97804 len = sizeof(struct sctp_initmsg);
97805 if (put_user(len, optlen))
97806 return -EFAULT;
97807 - if (copy_to_user(optval, &sctp_sk(sk)->initmsg, len))
97808 + initmsg = sctp_sk(sk)->initmsg;
97809 + if (copy_to_user(optval, &initmsg, len))
97810 return -EFAULT;
97811 return 0;
97812 }
97813 @@ -4663,6 +4674,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
97814 addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
97815 if (space_left < addrlen)
97816 return -ENOMEM;
97817 + if (addrlen > sizeof(temp) || addrlen < 0)
97818 + return -EFAULT;
97819 if (copy_to_user(to, &temp, addrlen))
97820 return -EFAULT;
97821 to += addrlen;
97822 diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
97823 index 6b36561..4f21064 100644
97824 --- a/net/sctp/sysctl.c
97825 +++ b/net/sctp/sysctl.c
97826 @@ -301,7 +301,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl,
97827 {
97828 struct net *net = current->nsproxy->net_ns;
97829 char tmp[8];
97830 - struct ctl_table tbl;
97831 + ctl_table_no_const tbl;
97832 int ret;
97833 int changed = 0;
97834 char *none = "none";
97835 @@ -344,7 +344,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl,
97836
97837 int sctp_sysctl_net_register(struct net *net)
97838 {
97839 - struct ctl_table *table;
97840 + ctl_table_no_const *table;
97841 int i;
97842
97843 table = kmemdup(sctp_net_table, sizeof(sctp_net_table), GFP_KERNEL);
97844 diff --git a/net/socket.c b/net/socket.c
97845 index e83c416..9169305 100644
97846 --- a/net/socket.c
97847 +++ b/net/socket.c
97848 @@ -88,6 +88,7 @@
97849 #include <linux/magic.h>
97850 #include <linux/slab.h>
97851 #include <linux/xattr.h>
97852 +#include <linux/in.h>
97853
97854 #include <asm/uaccess.h>
97855 #include <asm/unistd.h>
97856 @@ -111,6 +112,8 @@ unsigned int sysctl_net_busy_read __read_mostly;
97857 unsigned int sysctl_net_busy_poll __read_mostly;
97858 #endif
97859
97860 +#include <linux/grsock.h>
97861 +
97862 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
97863 static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
97864 unsigned long nr_segs, loff_t pos);
97865 @@ -162,7 +165,7 @@ static const struct file_operations socket_file_ops = {
97866 */
97867
97868 static DEFINE_SPINLOCK(net_family_lock);
97869 -static const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
97870 +const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
97871
97872 /*
97873 * Statistics counters of the socket lists
97874 @@ -328,7 +331,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type,
97875 &sockfs_dentry_operations, SOCKFS_MAGIC);
97876 }
97877
97878 -static struct vfsmount *sock_mnt __read_mostly;
97879 +struct vfsmount *sock_mnt __read_mostly;
97880
97881 static struct file_system_type sock_fs_type = {
97882 .name = "sockfs",
97883 @@ -1255,6 +1258,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
97884 return -EAFNOSUPPORT;
97885 if (type < 0 || type >= SOCK_MAX)
97886 return -EINVAL;
97887 + if (protocol < 0)
97888 + return -EINVAL;
97889
97890 /* Compatibility.
97891
97892 @@ -1275,6 +1280,20 @@ int __sock_create(struct net *net, int family, int type, int protocol,
97893 if (err)
97894 return err;
97895
97896 + if(!kern && !gr_search_socket(family, type, protocol)) {
97897 + if (rcu_access_pointer(net_families[family]) == NULL)
97898 + return -EAFNOSUPPORT;
97899 + else
97900 + return -EACCES;
97901 + }
97902 +
97903 + if (!kern && gr_handle_sock_all(family, type, protocol)) {
97904 + if (rcu_access_pointer(net_families[family]) == NULL)
97905 + return -EAFNOSUPPORT;
97906 + else
97907 + return -EACCES;
97908 + }
97909 +
97910 /*
97911 * Allocate the socket and allow the family to set things up. if
97912 * the protocol is 0, the family is instructed to select an appropriate
97913 @@ -1513,6 +1532,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
97914 if (sock) {
97915 err = move_addr_to_kernel(umyaddr, addrlen, &address);
97916 if (err >= 0) {
97917 + if (gr_handle_sock_server((struct sockaddr *)&address)) {
97918 + err = -EACCES;
97919 + goto error;
97920 + }
97921 + err = gr_search_bind(sock, (struct sockaddr_in *)&address);
97922 + if (err)
97923 + goto error;
97924 +
97925 err = security_socket_bind(sock,
97926 (struct sockaddr *)&address,
97927 addrlen);
97928 @@ -1521,6 +1548,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
97929 (struct sockaddr *)
97930 &address, addrlen);
97931 }
97932 +error:
97933 fput_light(sock->file, fput_needed);
97934 }
97935 return err;
97936 @@ -1544,10 +1572,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
97937 if ((unsigned int)backlog > somaxconn)
97938 backlog = somaxconn;
97939
97940 + if (gr_handle_sock_server_other(sock->sk)) {
97941 + err = -EPERM;
97942 + goto error;
97943 + }
97944 +
97945 + err = gr_search_listen(sock);
97946 + if (err)
97947 + goto error;
97948 +
97949 err = security_socket_listen(sock, backlog);
97950 if (!err)
97951 err = sock->ops->listen(sock, backlog);
97952
97953 +error:
97954 fput_light(sock->file, fput_needed);
97955 }
97956 return err;
97957 @@ -1591,6 +1629,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
97958 newsock->type = sock->type;
97959 newsock->ops = sock->ops;
97960
97961 + if (gr_handle_sock_server_other(sock->sk)) {
97962 + err = -EPERM;
97963 + sock_release(newsock);
97964 + goto out_put;
97965 + }
97966 +
97967 + err = gr_search_accept(sock);
97968 + if (err) {
97969 + sock_release(newsock);
97970 + goto out_put;
97971 + }
97972 +
97973 /*
97974 * We don't need try_module_get here, as the listening socket (sock)
97975 * has the protocol module (sock->ops->owner) held.
97976 @@ -1636,6 +1686,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
97977 fd_install(newfd, newfile);
97978 err = newfd;
97979
97980 + gr_attach_curr_ip(newsock->sk);
97981 +
97982 out_put:
97983 fput_light(sock->file, fput_needed);
97984 out:
97985 @@ -1668,6 +1720,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
97986 int, addrlen)
97987 {
97988 struct socket *sock;
97989 + struct sockaddr *sck;
97990 struct sockaddr_storage address;
97991 int err, fput_needed;
97992
97993 @@ -1678,6 +1731,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
97994 if (err < 0)
97995 goto out_put;
97996
97997 + sck = (struct sockaddr *)&address;
97998 +
97999 + if (gr_handle_sock_client(sck)) {
98000 + err = -EACCES;
98001 + goto out_put;
98002 + }
98003 +
98004 + err = gr_search_connect(sock, (struct sockaddr_in *)sck);
98005 + if (err)
98006 + goto out_put;
98007 +
98008 err =
98009 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
98010 if (err)
98011 @@ -1759,6 +1823,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
98012 * the protocol.
98013 */
98014
98015 +asmlinkage long sys_sendto(int, void *, size_t, unsigned, struct sockaddr *, int);
98016 +
98017 SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len,
98018 unsigned int, flags, struct sockaddr __user *, addr,
98019 int, addr_len)
98020 @@ -1825,7 +1891,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
98021 struct socket *sock;
98022 struct iovec iov;
98023 struct msghdr msg;
98024 - struct sockaddr_storage address;
98025 + struct sockaddr_storage address = { };
98026 int err, err2;
98027 int fput_needed;
98028
98029 @@ -2047,7 +2113,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
98030 * checking falls down on this.
98031 */
98032 if (copy_from_user(ctl_buf,
98033 - (void __user __force *)msg_sys->msg_control,
98034 + (void __force_user *)msg_sys->msg_control,
98035 ctl_len))
98036 goto out_freectl;
98037 msg_sys->msg_control = ctl_buf;
98038 @@ -2198,7 +2264,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
98039 int err, total_len, len;
98040
98041 /* kernel mode address */
98042 - struct sockaddr_storage addr;
98043 + struct sockaddr_storage addr = { };
98044
98045 /* user mode address pointers */
98046 struct sockaddr __user *uaddr;
98047 @@ -2227,7 +2293,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
98048 /* Save the user-mode address (verify_iovec will change the
98049 * kernel msghdr to use the kernel address space)
98050 */
98051 - uaddr = (__force void __user *)msg_sys->msg_name;
98052 + uaddr = (void __force_user *)msg_sys->msg_name;
98053 uaddr_len = COMPAT_NAMELEN(msg);
98054 if (MSG_CMSG_COMPAT & flags)
98055 err = verify_compat_iovec(msg_sys, iov, &addr, VERIFY_WRITE);
98056 @@ -2985,7 +3051,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
98057 old_fs = get_fs();
98058 set_fs(KERNEL_DS);
98059 err = dev_ioctl(net, cmd,
98060 - (struct ifreq __user __force *) &kifr);
98061 + (struct ifreq __force_user *) &kifr);
98062 set_fs(old_fs);
98063
98064 return err;
98065 @@ -3094,7 +3160,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
98066
98067 old_fs = get_fs();
98068 set_fs(KERNEL_DS);
98069 - err = dev_ioctl(net, cmd, (void __user __force *)&ifr);
98070 + err = dev_ioctl(net, cmd, (void __force_user *)&ifr);
98071 set_fs(old_fs);
98072
98073 if (cmd == SIOCGIFMAP && !err) {
98074 @@ -3199,7 +3265,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
98075 ret |= get_user(rtdev, &(ur4->rt_dev));
98076 if (rtdev) {
98077 ret |= copy_from_user(devname, compat_ptr(rtdev), 15);
98078 - r4.rt_dev = (char __user __force *)devname;
98079 + r4.rt_dev = (char __force_user *)devname;
98080 devname[15] = 0;
98081 } else
98082 r4.rt_dev = NULL;
98083 @@ -3425,8 +3491,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
98084 int __user *uoptlen;
98085 int err;
98086
98087 - uoptval = (char __user __force *) optval;
98088 - uoptlen = (int __user __force *) optlen;
98089 + uoptval = (char __force_user *) optval;
98090 + uoptlen = (int __force_user *) optlen;
98091
98092 set_fs(KERNEL_DS);
98093 if (level == SOL_SOCKET)
98094 @@ -3446,7 +3512,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
98095 char __user *uoptval;
98096 int err;
98097
98098 - uoptval = (char __user __force *) optval;
98099 + uoptval = (char __force_user *) optval;
98100
98101 set_fs(KERNEL_DS);
98102 if (level == SOL_SOCKET)
98103 diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
98104 index 09fb638..2e6a5c5 100644
98105 --- a/net/sunrpc/auth_gss/svcauth_gss.c
98106 +++ b/net/sunrpc/auth_gss/svcauth_gss.c
98107 @@ -1140,7 +1140,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
98108 uint64_t *handle)
98109 {
98110 struct rsc rsci, *rscp = NULL;
98111 - static atomic64_t ctxhctr;
98112 + static atomic64_unchecked_t ctxhctr = ATOMIC64_INIT(0);
98113 long long ctxh;
98114 struct gss_api_mech *gm = NULL;
98115 time_t expiry;
98116 @@ -1151,7 +1151,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
98117 status = -ENOMEM;
98118 /* the handle needs to be just a unique id,
98119 * use a static counter */
98120 - ctxh = atomic64_inc_return(&ctxhctr);
98121 + ctxh = atomic64_inc_return_unchecked(&ctxhctr);
98122
98123 /* make a copy for the caller */
98124 *handle = ctxh;
98125 diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
98126 index 941d19f..c85ff07 100644
98127 --- a/net/sunrpc/clnt.c
98128 +++ b/net/sunrpc/clnt.c
98129 @@ -1319,7 +1319,9 @@ call_start(struct rpc_task *task)
98130 (RPC_IS_ASYNC(task) ? "async" : "sync"));
98131
98132 /* Increment call count */
98133 - task->tk_msg.rpc_proc->p_count++;
98134 + pax_open_kernel();
98135 + (*(unsigned int *)&task->tk_msg.rpc_proc->p_count)++;
98136 + pax_close_kernel();
98137 clnt->cl_stats->rpccnt++;
98138 task->tk_action = call_reserve;
98139 }
98140 diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
98141 index ff3cc4b..7612a9e 100644
98142 --- a/net/sunrpc/sched.c
98143 +++ b/net/sunrpc/sched.c
98144 @@ -261,9 +261,9 @@ static int rpc_wait_bit_killable(void *word)
98145 #if defined(RPC_DEBUG) || defined(RPC_TRACEPOINTS)
98146 static void rpc_task_set_debuginfo(struct rpc_task *task)
98147 {
98148 - static atomic_t rpc_pid;
98149 + static atomic_unchecked_t rpc_pid;
98150
98151 - task->tk_pid = atomic_inc_return(&rpc_pid);
98152 + task->tk_pid = atomic_inc_return_unchecked(&rpc_pid);
98153 }
98154 #else
98155 static inline void rpc_task_set_debuginfo(struct rpc_task *task)
98156 diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
98157 index b974571..678ed90 100644
98158 --- a/net/sunrpc/svc.c
98159 +++ b/net/sunrpc/svc.c
98160 @@ -1160,7 +1160,9 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
98161 svc_putnl(resv, RPC_SUCCESS);
98162
98163 /* Bump per-procedure stats counter */
98164 - procp->pc_count++;
98165 + pax_open_kernel();
98166 + (*(unsigned int *)&procp->pc_count)++;
98167 + pax_close_kernel();
98168
98169 /* Initialize storage for argp and resp */
98170 memset(rqstp->rq_argp, 0, procp->pc_argsize);
98171 diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
98172 index 621ca7b..59421dd 100644
98173 --- a/net/sunrpc/svcauth_unix.c
98174 +++ b/net/sunrpc/svcauth_unix.c
98175 @@ -414,7 +414,7 @@ struct unix_gid {
98176 struct group_info *gi;
98177 };
98178
98179 -static int unix_gid_hash(kuid_t uid)
98180 +static int __intentional_overflow(-1) unix_gid_hash(kuid_t uid)
98181 {
98182 return hash_long(from_kuid(&init_user_ns, uid), GID_HASHBITS);
98183 }
98184 @@ -470,7 +470,7 @@ static void unix_gid_request(struct cache_detail *cd,
98185 (*bpp)[-1] = '\n';
98186 }
98187
98188 -static struct unix_gid *unix_gid_lookup(struct cache_detail *cd, kuid_t uid);
98189 +static struct unix_gid * __intentional_overflow(-1) unix_gid_lookup(struct cache_detail *cd, kuid_t uid);
98190
98191 static int unix_gid_parse(struct cache_detail *cd,
98192 char *mesg, int mlen)
98193 diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c
98194 index c1b6270..05089c1 100644
98195 --- a/net/sunrpc/xprtrdma/svc_rdma.c
98196 +++ b/net/sunrpc/xprtrdma/svc_rdma.c
98197 @@ -62,15 +62,15 @@ unsigned int svcrdma_max_req_size = RPCRDMA_MAX_REQ_SIZE;
98198 static unsigned int min_max_inline = 4096;
98199 static unsigned int max_max_inline = 65536;
98200
98201 -atomic_t rdma_stat_recv;
98202 -atomic_t rdma_stat_read;
98203 -atomic_t rdma_stat_write;
98204 -atomic_t rdma_stat_sq_starve;
98205 -atomic_t rdma_stat_rq_starve;
98206 -atomic_t rdma_stat_rq_poll;
98207 -atomic_t rdma_stat_rq_prod;
98208 -atomic_t rdma_stat_sq_poll;
98209 -atomic_t rdma_stat_sq_prod;
98210 +atomic_unchecked_t rdma_stat_recv;
98211 +atomic_unchecked_t rdma_stat_read;
98212 +atomic_unchecked_t rdma_stat_write;
98213 +atomic_unchecked_t rdma_stat_sq_starve;
98214 +atomic_unchecked_t rdma_stat_rq_starve;
98215 +atomic_unchecked_t rdma_stat_rq_poll;
98216 +atomic_unchecked_t rdma_stat_rq_prod;
98217 +atomic_unchecked_t rdma_stat_sq_poll;
98218 +atomic_unchecked_t rdma_stat_sq_prod;
98219
98220 /* Temporary NFS request map and context caches */
98221 struct kmem_cache *svc_rdma_map_cachep;
98222 @@ -110,7 +110,7 @@ static int read_reset_stat(struct ctl_table *table, int write,
98223 len -= *ppos;
98224 if (len > *lenp)
98225 len = *lenp;
98226 - if (len && copy_to_user(buffer, str_buf, len))
98227 + if (len > sizeof str_buf || (len && copy_to_user(buffer, str_buf, len)))
98228 return -EFAULT;
98229 *lenp = len;
98230 *ppos += len;
98231 @@ -151,63 +151,63 @@ static struct ctl_table svcrdma_parm_table[] = {
98232 {
98233 .procname = "rdma_stat_read",
98234 .data = &rdma_stat_read,
98235 - .maxlen = sizeof(atomic_t),
98236 + .maxlen = sizeof(atomic_unchecked_t),
98237 .mode = 0644,
98238 .proc_handler = read_reset_stat,
98239 },
98240 {
98241 .procname = "rdma_stat_recv",
98242 .data = &rdma_stat_recv,
98243 - .maxlen = sizeof(atomic_t),
98244 + .maxlen = sizeof(atomic_unchecked_t),
98245 .mode = 0644,
98246 .proc_handler = read_reset_stat,
98247 },
98248 {
98249 .procname = "rdma_stat_write",
98250 .data = &rdma_stat_write,
98251 - .maxlen = sizeof(atomic_t),
98252 + .maxlen = sizeof(atomic_unchecked_t),
98253 .mode = 0644,
98254 .proc_handler = read_reset_stat,
98255 },
98256 {
98257 .procname = "rdma_stat_sq_starve",
98258 .data = &rdma_stat_sq_starve,
98259 - .maxlen = sizeof(atomic_t),
98260 + .maxlen = sizeof(atomic_unchecked_t),
98261 .mode = 0644,
98262 .proc_handler = read_reset_stat,
98263 },
98264 {
98265 .procname = "rdma_stat_rq_starve",
98266 .data = &rdma_stat_rq_starve,
98267 - .maxlen = sizeof(atomic_t),
98268 + .maxlen = sizeof(atomic_unchecked_t),
98269 .mode = 0644,
98270 .proc_handler = read_reset_stat,
98271 },
98272 {
98273 .procname = "rdma_stat_rq_poll",
98274 .data = &rdma_stat_rq_poll,
98275 - .maxlen = sizeof(atomic_t),
98276 + .maxlen = sizeof(atomic_unchecked_t),
98277 .mode = 0644,
98278 .proc_handler = read_reset_stat,
98279 },
98280 {
98281 .procname = "rdma_stat_rq_prod",
98282 .data = &rdma_stat_rq_prod,
98283 - .maxlen = sizeof(atomic_t),
98284 + .maxlen = sizeof(atomic_unchecked_t),
98285 .mode = 0644,
98286 .proc_handler = read_reset_stat,
98287 },
98288 {
98289 .procname = "rdma_stat_sq_poll",
98290 .data = &rdma_stat_sq_poll,
98291 - .maxlen = sizeof(atomic_t),
98292 + .maxlen = sizeof(atomic_unchecked_t),
98293 .mode = 0644,
98294 .proc_handler = read_reset_stat,
98295 },
98296 {
98297 .procname = "rdma_stat_sq_prod",
98298 .data = &rdma_stat_sq_prod,
98299 - .maxlen = sizeof(atomic_t),
98300 + .maxlen = sizeof(atomic_unchecked_t),
98301 .mode = 0644,
98302 .proc_handler = read_reset_stat,
98303 },
98304 diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
98305 index 0ce7552..d074459 100644
98306 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
98307 +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
98308 @@ -501,7 +501,7 @@ next_sge:
98309 svc_rdma_put_context(ctxt, 0);
98310 goto out;
98311 }
98312 - atomic_inc(&rdma_stat_read);
98313 + atomic_inc_unchecked(&rdma_stat_read);
98314
98315 if (read_wr.num_sge < chl_map->ch[ch_no].count) {
98316 chl_map->ch[ch_no].count -= read_wr.num_sge;
98317 @@ -611,7 +611,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
98318 dto_q);
98319 list_del_init(&ctxt->dto_q);
98320 } else {
98321 - atomic_inc(&rdma_stat_rq_starve);
98322 + atomic_inc_unchecked(&rdma_stat_rq_starve);
98323 clear_bit(XPT_DATA, &xprt->xpt_flags);
98324 ctxt = NULL;
98325 }
98326 @@ -631,7 +631,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
98327 dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n",
98328 ctxt, rdma_xprt, rqstp, ctxt->wc_status);
98329 BUG_ON(ctxt->wc_status != IB_WC_SUCCESS);
98330 - atomic_inc(&rdma_stat_recv);
98331 + atomic_inc_unchecked(&rdma_stat_recv);
98332
98333 /* Build up the XDR from the receive buffers. */
98334 rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
98335 diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
98336 index c1d124d..acfc59e 100644
98337 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
98338 +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
98339 @@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp,
98340 write_wr.wr.rdma.remote_addr = to;
98341
98342 /* Post It */
98343 - atomic_inc(&rdma_stat_write);
98344 + atomic_inc_unchecked(&rdma_stat_write);
98345 if (svc_rdma_send(xprt, &write_wr))
98346 goto err;
98347 return 0;
98348 diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
98349 index 62e4f9b..dd3f2d7 100644
98350 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
98351 +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
98352 @@ -292,7 +292,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
98353 return;
98354
98355 ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP);
98356 - atomic_inc(&rdma_stat_rq_poll);
98357 + atomic_inc_unchecked(&rdma_stat_rq_poll);
98358
98359 while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) {
98360 ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id;
98361 @@ -314,7 +314,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
98362 }
98363
98364 if (ctxt)
98365 - atomic_inc(&rdma_stat_rq_prod);
98366 + atomic_inc_unchecked(&rdma_stat_rq_prod);
98367
98368 set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags);
98369 /*
98370 @@ -386,7 +386,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
98371 return;
98372
98373 ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP);
98374 - atomic_inc(&rdma_stat_sq_poll);
98375 + atomic_inc_unchecked(&rdma_stat_sq_poll);
98376 while ((ret = ib_poll_cq(cq, 1, &wc)) > 0) {
98377 if (wc.status != IB_WC_SUCCESS)
98378 /* Close the transport */
98379 @@ -404,7 +404,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
98380 }
98381
98382 if (ctxt)
98383 - atomic_inc(&rdma_stat_sq_prod);
98384 + atomic_inc_unchecked(&rdma_stat_sq_prod);
98385 }
98386
98387 static void sq_comp_handler(struct ib_cq *cq, void *cq_context)
98388 @@ -1262,7 +1262,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
98389 spin_lock_bh(&xprt->sc_lock);
98390 if (xprt->sc_sq_depth < atomic_read(&xprt->sc_sq_count) + wr_count) {
98391 spin_unlock_bh(&xprt->sc_lock);
98392 - atomic_inc(&rdma_stat_sq_starve);
98393 + atomic_inc_unchecked(&rdma_stat_sq_starve);
98394
98395 /* See if we can opportunistically reap SQ WR to make room */
98396 sq_cq_reap(xprt);
98397 diff --git a/net/sysctl_net.c b/net/sysctl_net.c
98398 index e7000be..e3b0ba7 100644
98399 --- a/net/sysctl_net.c
98400 +++ b/net/sysctl_net.c
98401 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ctl_table_header *head,
98402 kgid_t root_gid = make_kgid(net->user_ns, 0);
98403
98404 /* Allow network administrator to have same access as root. */
98405 - if (ns_capable(net->user_ns, CAP_NET_ADMIN) ||
98406 + if (ns_capable_nolog(net->user_ns, CAP_NET_ADMIN) ||
98407 uid_eq(root_uid, current_euid())) {
98408 int mode = (table->mode >> 6) & 7;
98409 return (mode << 6) | (mode << 3) | mode;
98410 diff --git a/net/tipc/link.c b/net/tipc/link.c
98411 index 0cc3d90..cc42021 100644
98412 --- a/net/tipc/link.c
98413 +++ b/net/tipc/link.c
98414 @@ -1165,7 +1165,7 @@ static int link_send_sections_long(struct tipc_port *sender,
98415 struct tipc_msg fragm_hdr;
98416 struct sk_buff *buf, *buf_chain, *prev;
98417 u32 fragm_crs, fragm_rest, hsz, sect_rest;
98418 - const unchar *sect_crs;
98419 + const unchar __user *sect_crs;
98420 int curr_sect;
98421 u32 fragm_no;
98422 int res = 0;
98423 @@ -1207,7 +1207,7 @@ again:
98424
98425 if (!sect_rest) {
98426 sect_rest = msg_sect[++curr_sect].iov_len;
98427 - sect_crs = (const unchar *)msg_sect[curr_sect].iov_base;
98428 + sect_crs = (const unchar __user *)msg_sect[curr_sect].iov_base;
98429 }
98430
98431 if (sect_rest < fragm_rest)
98432 diff --git a/net/tipc/msg.c b/net/tipc/msg.c
98433 index ced60e2..54eab6c 100644
98434 --- a/net/tipc/msg.c
98435 +++ b/net/tipc/msg.c
98436 @@ -93,7 +93,7 @@ int tipc_msg_build(struct tipc_msg *hdr, struct iovec const *msg_sect,
98437 skb_copy_to_linear_data(*buf, hdr, hsz);
98438 for (res = 1, cnt = 0; res && (cnt < num_sect); cnt++) {
98439 skb_copy_to_linear_data_offset(*buf, pos,
98440 - msg_sect[cnt].iov_base,
98441 + (const void __force_kernel *)msg_sect[cnt].iov_base,
98442 msg_sect[cnt].iov_len);
98443 pos += msg_sect[cnt].iov_len;
98444 }
98445 diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
98446 index d38bb45..4fd6ac6 100644
98447 --- a/net/tipc/subscr.c
98448 +++ b/net/tipc/subscr.c
98449 @@ -98,7 +98,7 @@ static void subscr_send_event(struct tipc_subscription *sub, u32 found_lower,
98450 struct kvec msg_sect;
98451 int ret;
98452
98453 - msg_sect.iov_base = (void *)&sub->evt;
98454 + msg_sect.iov_base = (void __force_user *)&sub->evt;
98455 msg_sect.iov_len = sizeof(struct tipc_event);
98456
98457 sub->evt.event = htohl(event, sub->swap);
98458 diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
98459 index 01625cc..d486b64 100644
98460 --- a/net/unix/af_unix.c
98461 +++ b/net/unix/af_unix.c
98462 @@ -784,6 +784,12 @@ static struct sock *unix_find_other(struct net *net,
98463 err = -ECONNREFUSED;
98464 if (!S_ISSOCK(inode->i_mode))
98465 goto put_fail;
98466 +
98467 + if (!gr_acl_handle_unix(path.dentry, path.mnt)) {
98468 + err = -EACCES;
98469 + goto put_fail;
98470 + }
98471 +
98472 u = unix_find_socket_byinode(inode);
98473 if (!u)
98474 goto put_fail;
98475 @@ -804,6 +810,13 @@ static struct sock *unix_find_other(struct net *net,
98476 if (u) {
98477 struct dentry *dentry;
98478 dentry = unix_sk(u)->path.dentry;
98479 +
98480 + if (!gr_handle_chroot_unix(pid_vnr(u->sk_peer_pid))) {
98481 + err = -EPERM;
98482 + sock_put(u);
98483 + goto fail;
98484 + }
98485 +
98486 if (dentry)
98487 touch_atime(&unix_sk(u)->path);
98488 } else
98489 @@ -837,12 +850,18 @@ static int unix_mknod(const char *sun_path, umode_t mode, struct path *res)
98490 */
98491 err = security_path_mknod(&path, dentry, mode, 0);
98492 if (!err) {
98493 + if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
98494 + err = -EACCES;
98495 + goto out;
98496 + }
98497 err = vfs_mknod(path.dentry->d_inode, dentry, mode, 0);
98498 if (!err) {
98499 res->mnt = mntget(path.mnt);
98500 res->dentry = dget(dentry);
98501 + gr_handle_create(dentry, path.mnt);
98502 }
98503 }
98504 +out:
98505 done_path_create(&path, dentry);
98506 return err;
98507 }
98508 @@ -2328,9 +2347,13 @@ static int unix_seq_show(struct seq_file *seq, void *v)
98509 seq_puts(seq, "Num RefCount Protocol Flags Type St "
98510 "Inode Path\n");
98511 else {
98512 - struct sock *s = v;
98513 + struct sock *s = v, *peer;
98514 struct unix_sock *u = unix_sk(s);
98515 unix_state_lock(s);
98516 + peer = unix_peer(s);
98517 + unix_state_unlock(s);
98518 +
98519 + unix_state_double_lock(s, peer);
98520
98521 seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu",
98522 s,
98523 @@ -2357,8 +2380,10 @@ static int unix_seq_show(struct seq_file *seq, void *v)
98524 }
98525 for ( ; i < len; i++)
98526 seq_putc(seq, u->addr->name->sun_path[i]);
98527 - }
98528 - unix_state_unlock(s);
98529 + } else if (peer)
98530 + seq_printf(seq, " P%lu", sock_i_ino(peer));
98531 +
98532 + unix_state_double_unlock(s, peer);
98533 seq_putc(seq, '\n');
98534 }
98535
98536 diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
98537 index b3d5150..ff3a837 100644
98538 --- a/net/unix/sysctl_net_unix.c
98539 +++ b/net/unix/sysctl_net_unix.c
98540 @@ -28,7 +28,7 @@ static struct ctl_table unix_table[] = {
98541
98542 int __net_init unix_sysctl_register(struct net *net)
98543 {
98544 - struct ctl_table *table;
98545 + ctl_table_no_const *table;
98546
98547 table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);
98548 if (table == NULL)
98549 diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
98550 index c8717c1..08539f5 100644
98551 --- a/net/wireless/wext-core.c
98552 +++ b/net/wireless/wext-core.c
98553 @@ -748,8 +748,7 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
98554 */
98555
98556 /* Support for very large requests */
98557 - if ((descr->flags & IW_DESCR_FLAG_NOMAX) &&
98558 - (user_length > descr->max_tokens)) {
98559 + if (user_length > descr->max_tokens) {
98560 /* Allow userspace to GET more than max so
98561 * we can support any size GET requests.
98562 * There is still a limit : -ENOMEM.
98563 @@ -788,22 +787,6 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
98564 }
98565 }
98566
98567 - if (IW_IS_GET(cmd) && !(descr->flags & IW_DESCR_FLAG_NOMAX)) {
98568 - /*
98569 - * If this is a GET, but not NOMAX, it means that the extra
98570 - * data is not bounded by userspace, but by max_tokens. Thus
98571 - * set the length to max_tokens. This matches the extra data
98572 - * allocation.
98573 - * The driver should fill it with the number of tokens it
98574 - * provided, and it may check iwp->length rather than having
98575 - * knowledge of max_tokens. If the driver doesn't change the
98576 - * iwp->length, this ioctl just copies back max_token tokens
98577 - * filled with zeroes. Hopefully the driver isn't claiming
98578 - * them to be valid data.
98579 - */
98580 - iwp->length = descr->max_tokens;
98581 - }
98582 -
98583 err = handler(dev, info, (union iwreq_data *) iwp, extra);
98584
98585 iwp->length += essid_compat;
98586 diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
98587 index 76e1873..4a12664 100644
98588 --- a/net/xfrm/xfrm_policy.c
98589 +++ b/net/xfrm/xfrm_policy.c
98590 @@ -332,7 +332,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
98591 {
98592 policy->walk.dead = 1;
98593
98594 - atomic_inc(&policy->genid);
98595 + atomic_inc_unchecked(&policy->genid);
98596
98597 if (del_timer(&policy->polq.hold_timer))
98598 xfrm_pol_put(policy);
98599 @@ -660,7 +660,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
98600 hlist_add_head(&policy->bydst, chain);
98601 xfrm_pol_hold(policy);
98602 net->xfrm.policy_count[dir]++;
98603 - atomic_inc(&flow_cache_genid);
98604 + atomic_inc_unchecked(&flow_cache_genid);
98605
98606 /* After previous checking, family can either be AF_INET or AF_INET6 */
98607 if (policy->family == AF_INET)
98608 @@ -1636,7 +1636,7 @@ free_dst:
98609 goto out;
98610 }
98611
98612 -static int inline
98613 +static inline int
98614 xfrm_dst_alloc_copy(void **target, const void *src, int size)
98615 {
98616 if (!*target) {
98617 @@ -1648,7 +1648,7 @@ xfrm_dst_alloc_copy(void **target, const void *src, int size)
98618 return 0;
98619 }
98620
98621 -static int inline
98622 +static inline int
98623 xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
98624 {
98625 #ifdef CONFIG_XFRM_SUB_POLICY
98626 @@ -1660,7 +1660,7 @@ xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
98627 #endif
98628 }
98629
98630 -static int inline
98631 +static inline int
98632 xfrm_dst_update_origin(struct dst_entry *dst, const struct flowi *fl)
98633 {
98634 #ifdef CONFIG_XFRM_SUB_POLICY
98635 @@ -1754,7 +1754,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
98636
98637 xdst->num_pols = num_pols;
98638 memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols);
98639 - xdst->policy_genid = atomic_read(&pols[0]->genid);
98640 + xdst->policy_genid = atomic_read_unchecked(&pols[0]->genid);
98641
98642 return xdst;
98643 }
98644 @@ -2575,11 +2575,12 @@ void xfrm_garbage_collect(struct net *net)
98645 }
98646 EXPORT_SYMBOL(xfrm_garbage_collect);
98647
98648 -static void xfrm_garbage_collect_deferred(struct net *net)
98649 +void xfrm_garbage_collect_deferred(struct net *net)
98650 {
98651 flow_cache_flush_deferred();
98652 __xfrm_garbage_collect(net);
98653 }
98654 +EXPORT_SYMBOL(xfrm_garbage_collect_deferred);
98655
98656 static void xfrm_init_pmtu(struct dst_entry *dst)
98657 {
98658 @@ -2629,7 +2630,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first)
98659 if (xdst->xfrm_genid != dst->xfrm->genid)
98660 return 0;
98661 if (xdst->num_pols > 0 &&
98662 - xdst->policy_genid != atomic_read(&xdst->pols[0]->genid))
98663 + xdst->policy_genid != atomic_read_unchecked(&xdst->pols[0]->genid))
98664 return 0;
98665
98666 mtu = dst_mtu(dst->child);
98667 @@ -2717,8 +2718,6 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
98668 dst_ops->link_failure = xfrm_link_failure;
98669 if (likely(dst_ops->neigh_lookup == NULL))
98670 dst_ops->neigh_lookup = xfrm_neigh_lookup;
98671 - if (likely(afinfo->garbage_collect == NULL))
98672 - afinfo->garbage_collect = xfrm_garbage_collect_deferred;
98673 rcu_assign_pointer(xfrm_policy_afinfo[afinfo->family], afinfo);
98674 }
98675 spin_unlock(&xfrm_policy_afinfo_lock);
98676 @@ -2772,7 +2771,6 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo)
98677 dst_ops->check = NULL;
98678 dst_ops->negative_advice = NULL;
98679 dst_ops->link_failure = NULL;
98680 - afinfo->garbage_collect = NULL;
98681 }
98682 return err;
98683 }
98684 @@ -3155,7 +3153,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,
98685 sizeof(pol->xfrm_vec[i].saddr));
98686 pol->xfrm_vec[i].encap_family = mp->new_family;
98687 /* flush bundles */
98688 - atomic_inc(&pol->genid);
98689 + atomic_inc_unchecked(&pol->genid);
98690 }
98691 }
98692
98693 diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
98694 index b9c3f9e..4767526 100644
98695 --- a/net/xfrm/xfrm_state.c
98696 +++ b/net/xfrm/xfrm_state.c
98697 @@ -174,12 +174,14 @@ int xfrm_register_type(const struct xfrm_type *type, unsigned short family)
98698
98699 if (unlikely(afinfo == NULL))
98700 return -EAFNOSUPPORT;
98701 - typemap = afinfo->type_map;
98702 + typemap = (const struct xfrm_type **)afinfo->type_map;
98703 spin_lock_bh(&xfrm_type_lock);
98704
98705 - if (likely(typemap[type->proto] == NULL))
98706 + if (likely(typemap[type->proto] == NULL)) {
98707 + pax_open_kernel();
98708 typemap[type->proto] = type;
98709 - else
98710 + pax_close_kernel();
98711 + } else
98712 err = -EEXIST;
98713 spin_unlock_bh(&xfrm_type_lock);
98714 xfrm_state_put_afinfo(afinfo);
98715 @@ -195,13 +197,16 @@ int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family)
98716
98717 if (unlikely(afinfo == NULL))
98718 return -EAFNOSUPPORT;
98719 - typemap = afinfo->type_map;
98720 + typemap = (const struct xfrm_type **)afinfo->type_map;
98721 spin_lock_bh(&xfrm_type_lock);
98722
98723 if (unlikely(typemap[type->proto] != type))
98724 err = -ENOENT;
98725 - else
98726 + else {
98727 + pax_open_kernel();
98728 typemap[type->proto] = NULL;
98729 + pax_close_kernel();
98730 + }
98731 spin_unlock_bh(&xfrm_type_lock);
98732 xfrm_state_put_afinfo(afinfo);
98733 return err;
98734 @@ -211,7 +216,6 @@ EXPORT_SYMBOL(xfrm_unregister_type);
98735 static const struct xfrm_type *xfrm_get_type(u8 proto, unsigned short family)
98736 {
98737 struct xfrm_state_afinfo *afinfo;
98738 - const struct xfrm_type **typemap;
98739 const struct xfrm_type *type;
98740 int modload_attempted = 0;
98741
98742 @@ -219,9 +223,8 @@ retry:
98743 afinfo = xfrm_state_get_afinfo(family);
98744 if (unlikely(afinfo == NULL))
98745 return NULL;
98746 - typemap = afinfo->type_map;
98747
98748 - type = typemap[proto];
98749 + type = afinfo->type_map[proto];
98750 if (unlikely(type && !try_module_get(type->owner)))
98751 type = NULL;
98752 if (!type && !modload_attempted) {
98753 @@ -255,7 +258,7 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
98754 return -EAFNOSUPPORT;
98755
98756 err = -EEXIST;
98757 - modemap = afinfo->mode_map;
98758 + modemap = (struct xfrm_mode **)afinfo->mode_map;
98759 spin_lock_bh(&xfrm_mode_lock);
98760 if (modemap[mode->encap])
98761 goto out;
98762 @@ -264,8 +267,10 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
98763 if (!try_module_get(afinfo->owner))
98764 goto out;
98765
98766 - mode->afinfo = afinfo;
98767 + pax_open_kernel();
98768 + *(const void **)&mode->afinfo = afinfo;
98769 modemap[mode->encap] = mode;
98770 + pax_close_kernel();
98771 err = 0;
98772
98773 out:
98774 @@ -289,10 +294,12 @@ int xfrm_unregister_mode(struct xfrm_mode *mode, int family)
98775 return -EAFNOSUPPORT;
98776
98777 err = -ENOENT;
98778 - modemap = afinfo->mode_map;
98779 + modemap = (struct xfrm_mode **)afinfo->mode_map;
98780 spin_lock_bh(&xfrm_mode_lock);
98781 if (likely(modemap[mode->encap] == mode)) {
98782 + pax_open_kernel();
98783 modemap[mode->encap] = NULL;
98784 + pax_close_kernel();
98785 module_put(mode->afinfo->owner);
98786 err = 0;
98787 }
98788 @@ -1486,10 +1493,10 @@ EXPORT_SYMBOL(xfrm_find_acq_byseq);
98789 u32 xfrm_get_acqseq(void)
98790 {
98791 u32 res;
98792 - static atomic_t acqseq;
98793 + static atomic_unchecked_t acqseq;
98794
98795 do {
98796 - res = atomic_inc_return(&acqseq);
98797 + res = atomic_inc_return_unchecked(&acqseq);
98798 } while (!res);
98799
98800 return res;
98801 diff --git a/net/xfrm/xfrm_sysctl.c b/net/xfrm/xfrm_sysctl.c
98802 index 05a6e3d..6716ec9 100644
98803 --- a/net/xfrm/xfrm_sysctl.c
98804 +++ b/net/xfrm/xfrm_sysctl.c
98805 @@ -42,7 +42,7 @@ static struct ctl_table xfrm_table[] = {
98806
98807 int __net_init xfrm_sysctl_init(struct net *net)
98808 {
98809 - struct ctl_table *table;
98810 + ctl_table_no_const *table;
98811
98812 __xfrm_sysctl_init(net);
98813
98814 diff --git a/scripts/Makefile.build b/scripts/Makefile.build
98815 index d5d859c..781cbcb 100644
98816 --- a/scripts/Makefile.build
98817 +++ b/scripts/Makefile.build
98818 @@ -111,7 +111,7 @@ endif
98819 endif
98820
98821 # Do not include host rules unless needed
98822 -ifneq ($(hostprogs-y)$(hostprogs-m),)
98823 +ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m)$(hostcxxlibs-y)$(hostcxxlibs-m),)
98824 include scripts/Makefile.host
98825 endif
98826
98827 diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
98828 index 686cb0d..9d653bf 100644
98829 --- a/scripts/Makefile.clean
98830 +++ b/scripts/Makefile.clean
98831 @@ -43,7 +43,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn))
98832 __clean-files := $(extra-y) $(always) \
98833 $(targets) $(clean-files) \
98834 $(host-progs) \
98835 - $(hostprogs-y) $(hostprogs-m) $(hostprogs-)
98836 + $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \
98837 + $(hostlibs-y) $(hostlibs-m) $(hostlibs-)
98838
98839 __clean-files := $(filter-out $(no-clean-files), $(__clean-files))
98840
98841 diff --git a/scripts/Makefile.host b/scripts/Makefile.host
98842 index 1ac414f..38575f7 100644
98843 --- a/scripts/Makefile.host
98844 +++ b/scripts/Makefile.host
98845 @@ -31,6 +31,8 @@
98846 # Note: Shared libraries consisting of C++ files are not supported
98847
98848 __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
98849 +__hostlibs := $(sort $(hostlibs-y) $(hostlibs-m))
98850 +__hostcxxlibs := $(sort $(hostcxxlibs-y) $(hostcxxlibs-m))
98851
98852 # C code
98853 # Executables compiled from a single .c file
98854 @@ -54,11 +56,15 @@ host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs)))
98855 # Shared libaries (only .c supported)
98856 # Shared libraries (.so) - all .so files referenced in "xxx-objs"
98857 host-cshlib := $(sort $(filter %.so, $(host-cobjs)))
98858 +host-cshlib += $(sort $(filter %.so, $(__hostlibs)))
98859 +host-cxxshlib := $(sort $(filter %.so, $(__hostcxxlibs)))
98860 # Remove .so files from "xxx-objs"
98861 host-cobjs := $(filter-out %.so,$(host-cobjs))
98862 +host-cxxobjs := $(filter-out %.so,$(host-cxxobjs))
98863
98864 -#Object (.o) files used by the shared libaries
98865 +# Object (.o) files used by the shared libaries
98866 host-cshobjs := $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs))))
98867 +host-cxxshobjs := $(sort $(foreach m,$(host-cxxshlib),$($(m:.so=-objs))))
98868
98869 # output directory for programs/.o files
98870 # hostprogs-y := tools/build may have been specified. Retrieve directory
98871 @@ -82,7 +88,9 @@ host-cobjs := $(addprefix $(obj)/,$(host-cobjs))
98872 host-cxxmulti := $(addprefix $(obj)/,$(host-cxxmulti))
98873 host-cxxobjs := $(addprefix $(obj)/,$(host-cxxobjs))
98874 host-cshlib := $(addprefix $(obj)/,$(host-cshlib))
98875 +host-cxxshlib := $(addprefix $(obj)/,$(host-cxxshlib))
98876 host-cshobjs := $(addprefix $(obj)/,$(host-cshobjs))
98877 +host-cxxshobjs := $(addprefix $(obj)/,$(host-cxxshobjs))
98878 host-objdirs := $(addprefix $(obj)/,$(host-objdirs))
98879
98880 obj-dirs += $(host-objdirs)
98881 @@ -156,6 +164,13 @@ quiet_cmd_host-cshobjs = HOSTCC -fPIC $@
98882 $(host-cshobjs): $(obj)/%.o: $(src)/%.c FORCE
98883 $(call if_changed_dep,host-cshobjs)
98884
98885 +# Compile .c file, create position independent .o file
98886 +# host-cxxshobjs -> .o
98887 +quiet_cmd_host-cxxshobjs = HOSTCXX -fPIC $@
98888 + cmd_host-cxxshobjs = $(HOSTCXX) $(hostcxx_flags) -fPIC -c -o $@ $<
98889 +$(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE
98890 + $(call if_changed_dep,host-cxxshobjs)
98891 +
98892 # Link a shared library, based on position independent .o files
98893 # *.o -> .so shared library (host-cshlib)
98894 quiet_cmd_host-cshlib = HOSTLLD -shared $@
98895 @@ -165,6 +180,15 @@ quiet_cmd_host-cshlib = HOSTLLD -shared $@
98896 $(host-cshlib): $(obj)/%: $(host-cshobjs) FORCE
98897 $(call if_changed,host-cshlib)
98898
98899 +# Link a shared library, based on position independent .o files
98900 +# *.o -> .so shared library (host-cxxshlib)
98901 +quiet_cmd_host-cxxshlib = HOSTLLD -shared $@
98902 + cmd_host-cxxshlib = $(HOSTCXX) $(HOSTLDFLAGS) -shared -o $@ \
98903 + $(addprefix $(obj)/,$($(@F:.so=-objs))) \
98904 + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
98905 +$(host-cxxshlib): $(obj)/%: $(host-cxxshobjs) FORCE
98906 + $(call if_changed,host-cxxshlib)
98907 +
98908 targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\
98909 - $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
98910 + $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) $(host-cxxshlib) $(host-cxxshobjs)
98911
98912 diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
98913 index 078fe1d..fbdb363 100644
98914 --- a/scripts/basic/fixdep.c
98915 +++ b/scripts/basic/fixdep.c
98916 @@ -161,7 +161,7 @@ static unsigned int strhash(const char *str, unsigned int sz)
98917 /*
98918 * Lookup a value in the configuration string.
98919 */
98920 -static int is_defined_config(const char *name, int len, unsigned int hash)
98921 +static int is_defined_config(const char *name, unsigned int len, unsigned int hash)
98922 {
98923 struct item *aux;
98924
98925 @@ -211,10 +211,10 @@ static void clear_config(void)
98926 /*
98927 * Record the use of a CONFIG_* word.
98928 */
98929 -static void use_config(const char *m, int slen)
98930 +static void use_config(const char *m, unsigned int slen)
98931 {
98932 unsigned int hash = strhash(m, slen);
98933 - int c, i;
98934 + unsigned int c, i;
98935
98936 if (is_defined_config(m, slen, hash))
98937 return;
98938 @@ -235,9 +235,9 @@ static void use_config(const char *m, int slen)
98939
98940 static void parse_config_file(const char *map, size_t len)
98941 {
98942 - const int *end = (const int *) (map + len);
98943 + const unsigned int *end = (const unsigned int *) (map + len);
98944 /* start at +1, so that p can never be < map */
98945 - const int *m = (const int *) map + 1;
98946 + const unsigned int *m = (const unsigned int *) map + 1;
98947 const char *p, *q;
98948
98949 for (; m < end; m++) {
98950 @@ -435,7 +435,7 @@ static void print_deps(void)
98951 static void traps(void)
98952 {
98953 static char test[] __attribute__((aligned(sizeof(int)))) = "CONF";
98954 - int *p = (int *)test;
98955 + unsigned int *p = (unsigned int *)test;
98956
98957 if (*p != INT_CONF) {
98958 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianness? %#x\n",
98959 diff --git a/scripts/gcc-plugin.sh b/scripts/gcc-plugin.sh
98960 new file mode 100644
98961 index 0000000..5e0222d
98962 --- /dev/null
98963 +++ b/scripts/gcc-plugin.sh
98964 @@ -0,0 +1,17 @@
98965 +#!/bin/bash
98966 +plugincc=`$1 -E -shared - -o /dev/null -I\`$3 -print-file-name=plugin\`/include 2>&1 <<EOF
98967 +#include "gcc-plugin.h"
98968 +#include "tree.h"
98969 +#include "tm.h"
98970 +#include "rtl.h"
98971 +#ifdef ENABLE_BUILD_WITH_CXX
98972 +#warning $2
98973 +#else
98974 +#warning $1
98975 +#endif
98976 +EOF`
98977 +if [ $? -eq 0 ]
98978 +then
98979 + [[ "$plugincc" =~ "$1" ]] && echo "$1"
98980 + [[ "$plugincc" =~ "$2" ]] && echo "$2"
98981 +fi
98982 diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh
98983 index 5de5660..d3deb89 100644
98984 --- a/scripts/headers_install.sh
98985 +++ b/scripts/headers_install.sh
98986 @@ -32,6 +32,7 @@ do
98987 FILE="$(basename "$i")"
98988 sed -r \
98989 -e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \
98990 + -e 's/__intentional_overflow\([- \t,0-9]*\)//g' \
98991 -e 's/__attribute_const__([ \t]|$)/\1/g' \
98992 -e 's@^#include <linux/compiler.h>@@' \
98993 -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
98994 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
98995 index 32b10f5..64eeb30 100644
98996 --- a/scripts/link-vmlinux.sh
98997 +++ b/scripts/link-vmlinux.sh
98998 @@ -82,7 +82,9 @@ kallsyms()
98999 kallsymopt="${kallsymopt} --all-symbols"
99000 fi
99001
99002 - kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
99003 + if [ -z "${CONFIG_X86_32}" ] || [ -z "${CONFIG_PAX_KERNEXEC}" ]; then
99004 + kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
99005 + fi
99006
99007 local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \
99008 ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
99009 @@ -160,7 +162,7 @@ else
99010 fi;
99011
99012 # final build of init/
99013 -${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init
99014 +${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init GCC_PLUGINS_CFLAGS="${GCC_PLUGINS_CFLAGS}" GCC_PLUGINS_AFLAGS="${GCC_PLUGINS_AFLAGS}"
99015
99016 kallsymso=""
99017 kallsyms_vmlinux=""
99018 diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
99019 index 2370863..212fbca 100644
99020 --- a/scripts/mod/file2alias.c
99021 +++ b/scripts/mod/file2alias.c
99022 @@ -142,7 +142,7 @@ static void device_id_check(const char *modname, const char *device_id,
99023 unsigned long size, unsigned long id_size,
99024 void *symval)
99025 {
99026 - int i;
99027 + unsigned int i;
99028
99029 if (size % id_size || size < id_size) {
99030 fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo "
99031 @@ -170,7 +170,7 @@ static void device_id_check(const char *modname, const char *device_id,
99032 /* USB is special because the bcdDevice can be matched against a numeric range */
99033 /* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipNinN" */
99034 static void do_usb_entry(void *symval,
99035 - unsigned int bcdDevice_initial, int bcdDevice_initial_digits,
99036 + unsigned int bcdDevice_initial, unsigned int bcdDevice_initial_digits,
99037 unsigned char range_lo, unsigned char range_hi,
99038 unsigned char max, struct module *mod)
99039 {
99040 @@ -280,7 +280,7 @@ static void do_usb_entry_multi(void *symval, struct module *mod)
99041 {
99042 unsigned int devlo, devhi;
99043 unsigned char chi, clo, max;
99044 - int ndigits;
99045 + unsigned int ndigits;
99046
99047 DEF_FIELD(symval, usb_device_id, match_flags);
99048 DEF_FIELD(symval, usb_device_id, idVendor);
99049 @@ -533,7 +533,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
99050 for (i = 0; i < count; i++) {
99051 DEF_FIELD_ADDR(symval + i*id_size, pnp_device_id, id);
99052 char acpi_id[sizeof(*id)];
99053 - int j;
99054 + unsigned int j;
99055
99056 buf_printf(&mod->dev_table_buf,
99057 "MODULE_ALIAS(\"pnp:d%s*\");\n", *id);
99058 @@ -562,7 +562,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
99059
99060 for (j = 0; j < PNP_MAX_DEVICES; j++) {
99061 const char *id = (char *)(*devs)[j].id;
99062 - int i2, j2;
99063 + unsigned int i2, j2;
99064 int dup = 0;
99065
99066 if (!id[0])
99067 @@ -588,7 +588,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
99068 /* add an individual alias for every device entry */
99069 if (!dup) {
99070 char acpi_id[PNP_ID_LEN];
99071 - int k;
99072 + unsigned int k;
99073
99074 buf_printf(&mod->dev_table_buf,
99075 "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
99076 @@ -940,7 +940,7 @@ static void dmi_ascii_filter(char *d, const char *s)
99077 static int do_dmi_entry(const char *filename, void *symval,
99078 char *alias)
99079 {
99080 - int i, j;
99081 + unsigned int i, j;
99082 DEF_FIELD_ADDR(symval, dmi_system_id, matches);
99083 sprintf(alias, "dmi*");
99084
99085 diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
99086 index 8247979..815ec76 100644
99087 --- a/scripts/mod/modpost.c
99088 +++ b/scripts/mod/modpost.c
99089 @@ -931,6 +931,7 @@ enum mismatch {
99090 ANY_INIT_TO_ANY_EXIT,
99091 ANY_EXIT_TO_ANY_INIT,
99092 EXPORT_TO_INIT_EXIT,
99093 + DATA_TO_TEXT
99094 };
99095
99096 struct sectioncheck {
99097 @@ -1017,6 +1018,12 @@ const struct sectioncheck sectioncheck[] = {
99098 .tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
99099 .mismatch = EXPORT_TO_INIT_EXIT,
99100 .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
99101 +},
99102 +/* Do not reference code from writable data */
99103 +{
99104 + .fromsec = { DATA_SECTIONS, NULL },
99105 + .tosec = { TEXT_SECTIONS, NULL },
99106 + .mismatch = DATA_TO_TEXT
99107 }
99108 };
99109
99110 @@ -1137,10 +1144,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
99111 continue;
99112 if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
99113 continue;
99114 - if (sym->st_value == addr)
99115 - return sym;
99116 /* Find a symbol nearby - addr are maybe negative */
99117 d = sym->st_value - addr;
99118 + if (d == 0)
99119 + return sym;
99120 if (d < 0)
99121 d = addr - sym->st_value;
99122 if (d < distance) {
99123 @@ -1418,6 +1425,14 @@ static void report_sec_mismatch(const char *modname,
99124 tosym, prl_to, prl_to, tosym);
99125 free(prl_to);
99126 break;
99127 + case DATA_TO_TEXT:
99128 +#if 0
99129 + fprintf(stderr,
99130 + "The %s %s:%s references\n"
99131 + "the %s %s:%s%s\n",
99132 + from, fromsec, fromsym, to, tosec, tosym, to_p);
99133 +#endif
99134 + break;
99135 }
99136 fprintf(stderr, "\n");
99137 }
99138 @@ -1652,7 +1667,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
99139 static void check_sec_ref(struct module *mod, const char *modname,
99140 struct elf_info *elf)
99141 {
99142 - int i;
99143 + unsigned int i;
99144 Elf_Shdr *sechdrs = elf->sechdrs;
99145
99146 /* Walk through all sections */
99147 @@ -1771,7 +1786,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
99148 va_end(ap);
99149 }
99150
99151 -void buf_write(struct buffer *buf, const char *s, int len)
99152 +void buf_write(struct buffer *buf, const char *s, unsigned int len)
99153 {
99154 if (buf->size - buf->pos < len) {
99155 buf->size += len + SZ;
99156 @@ -1990,7 +2005,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
99157 if (fstat(fileno(file), &st) < 0)
99158 goto close_write;
99159
99160 - if (st.st_size != b->pos)
99161 + if (st.st_size != (off_t)b->pos)
99162 goto close_write;
99163
99164 tmp = NOFAIL(malloc(b->pos));
99165 diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
99166 index 51207e4..f7d603d 100644
99167 --- a/scripts/mod/modpost.h
99168 +++ b/scripts/mod/modpost.h
99169 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *expr);
99170
99171 struct buffer {
99172 char *p;
99173 - int pos;
99174 - int size;
99175 + unsigned int pos;
99176 + unsigned int size;
99177 };
99178
99179 void __attribute__((format(printf, 2, 3)))
99180 buf_printf(struct buffer *buf, const char *fmt, ...);
99181
99182 void
99183 -buf_write(struct buffer *buf, const char *s, int len);
99184 +buf_write(struct buffer *buf, const char *s, unsigned int len);
99185
99186 struct module {
99187 struct module *next;
99188 diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
99189 index 9dfcd6d..099068e 100644
99190 --- a/scripts/mod/sumversion.c
99191 +++ b/scripts/mod/sumversion.c
99192 @@ -470,7 +470,7 @@ static void write_version(const char *filename, const char *sum,
99193 goto out;
99194 }
99195
99196 - if (write(fd, sum, strlen(sum)+1) != strlen(sum)+1) {
99197 + if (write(fd, sum, strlen(sum)+1) != (ssize_t)strlen(sum)+1) {
99198 warn("writing sum in %s failed: %s\n",
99199 filename, strerror(errno));
99200 goto out;
99201 diff --git a/scripts/module-common.lds b/scripts/module-common.lds
99202 index 0865b3e..7235dd4 100644
99203 --- a/scripts/module-common.lds
99204 +++ b/scripts/module-common.lds
99205 @@ -6,6 +6,10 @@
99206 SECTIONS {
99207 /DISCARD/ : { *(.discard) }
99208
99209 + .rodata : {
99210 + *(.rodata) *(.rodata.*)
99211 + *(.data..read_only)
99212 + }
99213 __ksymtab : { *(SORT(___ksymtab+*)) }
99214 __ksymtab_gpl : { *(SORT(___ksymtab_gpl+*)) }
99215 __ksymtab_unused : { *(SORT(___ksymtab_unused+*)) }
99216 diff --git a/scripts/package/builddeb b/scripts/package/builddeb
99217 index 90e521f..e9eaf8f 100644
99218 --- a/scripts/package/builddeb
99219 +++ b/scripts/package/builddeb
99220 @@ -281,6 +281,7 @@ fi
99221 (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
99222 (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
99223 (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
99224 +(cd $objtree; find tools/gcc -name \*.so >> "$objtree/debian/hdrobjfiles")
99225 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
99226 mkdir -p "$destdir"
99227 (cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)
99228 diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
99229 index 68bb4ef..2f419e1 100644
99230 --- a/scripts/pnmtologo.c
99231 +++ b/scripts/pnmtologo.c
99232 @@ -244,14 +244,14 @@ static void write_header(void)
99233 fprintf(out, " * Linux logo %s\n", logoname);
99234 fputs(" */\n\n", out);
99235 fputs("#include <linux/linux_logo.h>\n\n", out);
99236 - fprintf(out, "static unsigned char %s_data[] __initdata = {\n",
99237 + fprintf(out, "static unsigned char %s_data[] = {\n",
99238 logoname);
99239 }
99240
99241 static void write_footer(void)
99242 {
99243 fputs("\n};\n\n", out);
99244 - fprintf(out, "const struct linux_logo %s __initconst = {\n", logoname);
99245 + fprintf(out, "const struct linux_logo %s = {\n", logoname);
99246 fprintf(out, "\t.type\t\t= %s,\n", logo_types[logo_type]);
99247 fprintf(out, "\t.width\t\t= %d,\n", logo_width);
99248 fprintf(out, "\t.height\t\t= %d,\n", logo_height);
99249 @@ -381,7 +381,7 @@ static void write_logo_clut224(void)
99250 fputs("\n};\n\n", out);
99251
99252 /* write logo clut */
99253 - fprintf(out, "static unsigned char %s_clut[] __initdata = {\n",
99254 + fprintf(out, "static unsigned char %s_clut[] = {\n",
99255 logoname);
99256 write_hex_cnt = 0;
99257 for (i = 0; i < logo_clutsize; i++) {
99258 diff --git a/scripts/sortextable.h b/scripts/sortextable.h
99259 index f5eb43d..1814de8 100644
99260 --- a/scripts/sortextable.h
99261 +++ b/scripts/sortextable.h
99262 @@ -106,9 +106,9 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
99263 const char *secstrtab;
99264 const char *strtab;
99265 char *extab_image;
99266 - int extab_index = 0;
99267 - int i;
99268 - int idx;
99269 + unsigned int extab_index = 0;
99270 + unsigned int i;
99271 + unsigned int idx;
99272
99273 shdr = (Elf_Shdr *)((char *)ehdr + _r(&ehdr->e_shoff));
99274 shstrtab_sec = shdr + r2(&ehdr->e_shstrndx);
99275 diff --git a/security/Kconfig b/security/Kconfig
99276 index e9c6ac7..8433964 100644
99277 --- a/security/Kconfig
99278 +++ b/security/Kconfig
99279 @@ -4,6 +4,959 @@
99280
99281 menu "Security options"
99282
99283 +menu "Grsecurity"
99284 +
99285 + config ARCH_TRACK_EXEC_LIMIT
99286 + bool
99287 +
99288 + config PAX_KERNEXEC_PLUGIN
99289 + bool
99290 +
99291 + config PAX_PER_CPU_PGD
99292 + bool
99293 +
99294 + config TASK_SIZE_MAX_SHIFT
99295 + int
99296 + depends on X86_64
99297 + default 47 if !PAX_PER_CPU_PGD
99298 + default 42 if PAX_PER_CPU_PGD
99299 +
99300 + config PAX_ENABLE_PAE
99301 + bool
99302 + default y if (X86_32 && (MPENTIUM4 || MK8 || MPSC || MCORE2 || MATOM))
99303 +
99304 + config PAX_USERCOPY_SLABS
99305 + bool
99306 +
99307 +config GRKERNSEC
99308 + bool "Grsecurity"
99309 + select CRYPTO
99310 + select CRYPTO_SHA256
99311 + select PROC_FS
99312 + select STOP_MACHINE
99313 + select TTY
99314 + select DEBUG_LIST
99315 + help
99316 + If you say Y here, you will be able to configure many features
99317 + that will enhance the security of your system. It is highly
99318 + recommended that you say Y here and read through the help
99319 + for each option so that you fully understand the features and
99320 + can evaluate their usefulness for your machine.
99321 +
99322 +choice
99323 + prompt "Configuration Method"
99324 + depends on GRKERNSEC
99325 + default GRKERNSEC_CONFIG_CUSTOM
99326 + help
99327 +
99328 +config GRKERNSEC_CONFIG_AUTO
99329 + bool "Automatic"
99330 + help
99331 + If you choose this configuration method, you'll be able to answer a small
99332 + number of simple questions about how you plan to use this kernel.
99333 + The settings of grsecurity and PaX will be automatically configured for
99334 + the highest commonly-used settings within the provided constraints.
99335 +
99336 + If you require additional configuration, custom changes can still be made
99337 + from the "custom configuration" menu.
99338 +
99339 +config GRKERNSEC_CONFIG_CUSTOM
99340 + bool "Custom"
99341 + help
99342 + If you choose this configuration method, you'll be able to configure all
99343 + grsecurity and PaX settings manually. Via this method, no options are
99344 + automatically enabled.
99345 +
99346 +endchoice
99347 +
99348 +choice
99349 + prompt "Usage Type"
99350 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
99351 + default GRKERNSEC_CONFIG_SERVER
99352 + help
99353 +
99354 +config GRKERNSEC_CONFIG_SERVER
99355 + bool "Server"
99356 + help
99357 + Choose this option if you plan to use this kernel on a server.
99358 +
99359 +config GRKERNSEC_CONFIG_DESKTOP
99360 + bool "Desktop"
99361 + help
99362 + Choose this option if you plan to use this kernel on a desktop.
99363 +
99364 +endchoice
99365 +
99366 +choice
99367 + prompt "Virtualization Type"
99368 + depends on (GRKERNSEC && X86 && GRKERNSEC_CONFIG_AUTO)
99369 + default GRKERNSEC_CONFIG_VIRT_NONE
99370 + help
99371 +
99372 +config GRKERNSEC_CONFIG_VIRT_NONE
99373 + bool "None"
99374 + help
99375 + Choose this option if this kernel will be run on bare metal.
99376 +
99377 +config GRKERNSEC_CONFIG_VIRT_GUEST
99378 + bool "Guest"
99379 + help
99380 + Choose this option if this kernel will be run as a VM guest.
99381 +
99382 +config GRKERNSEC_CONFIG_VIRT_HOST
99383 + bool "Host"
99384 + help
99385 + Choose this option if this kernel will be run as a VM host.
99386 +
99387 +endchoice
99388 +
99389 +choice
99390 + prompt "Virtualization Hardware"
99391 + depends on (GRKERNSEC && X86 && GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_GUEST || GRKERNSEC_CONFIG_VIRT_HOST))
99392 + help
99393 +
99394 +config GRKERNSEC_CONFIG_VIRT_EPT
99395 + bool "EPT/RVI Processor Support"
99396 + depends on X86
99397 + help
99398 + Choose this option if your CPU supports the EPT or RVI features of 2nd-gen
99399 + hardware virtualization. This allows for additional kernel hardening protections
99400 + to operate without additional performance impact.
99401 +
99402 + To see if your Intel processor supports EPT, see:
99403 + http://ark.intel.com/Products/VirtualizationTechnology
99404 + (Most Core i3/5/7 support EPT)
99405 +
99406 + To see if your AMD processor supports RVI, see:
99407 + http://support.amd.com/us/kbarticles/Pages/GPU120AMDRVICPUsHyperVWin8.aspx
99408 +
99409 +config GRKERNSEC_CONFIG_VIRT_SOFT
99410 + bool "First-gen/No Hardware Virtualization"
99411 + help
99412 + Choose this option if you use an Atom/Pentium/Core 2 processor that either doesn't
99413 + support hardware virtualization or doesn't support the EPT/RVI extensions.
99414 +
99415 +endchoice
99416 +
99417 +choice
99418 + prompt "Virtualization Software"
99419 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_GUEST || GRKERNSEC_CONFIG_VIRT_HOST))
99420 + help
99421 +
99422 +config GRKERNSEC_CONFIG_VIRT_XEN
99423 + bool "Xen"
99424 + help
99425 + Choose this option if this kernel is running as a Xen guest or host.
99426 +
99427 +config GRKERNSEC_CONFIG_VIRT_VMWARE
99428 + bool "VMWare"
99429 + help
99430 + Choose this option if this kernel is running as a VMWare guest or host.
99431 +
99432 +config GRKERNSEC_CONFIG_VIRT_KVM
99433 + bool "KVM"
99434 + help
99435 + Choose this option if this kernel is running as a KVM guest or host.
99436 +
99437 +config GRKERNSEC_CONFIG_VIRT_VIRTUALBOX
99438 + bool "VirtualBox"
99439 + help
99440 + Choose this option if this kernel is running as a VirtualBox guest or host.
99441 +
99442 +endchoice
99443 +
99444 +choice
99445 + prompt "Required Priorities"
99446 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
99447 + default GRKERNSEC_CONFIG_PRIORITY_PERF
99448 + help
99449 +
99450 +config GRKERNSEC_CONFIG_PRIORITY_PERF
99451 + bool "Performance"
99452 + help
99453 + Choose this option if performance is of highest priority for this deployment
99454 + of grsecurity. Features like UDEREF on a 64bit kernel, kernel stack clearing,
99455 + clearing of structures intended for userland, and freed memory sanitizing will
99456 + be disabled.
99457 +
99458 +config GRKERNSEC_CONFIG_PRIORITY_SECURITY
99459 + bool "Security"
99460 + help
99461 + Choose this option if security is of highest priority for this deployment of
99462 + grsecurity. UDEREF, kernel stack clearing, clearing of structures intended
99463 + for userland, and freed memory sanitizing will be enabled for this kernel.
99464 + In a worst-case scenario, these features can introduce a 20% performance hit
99465 + (UDEREF on x64 contributing half of this hit).
99466 +
99467 +endchoice
99468 +
99469 +menu "Default Special Groups"
99470 +depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
99471 +
99472 +config GRKERNSEC_PROC_GID
99473 + int "GID exempted from /proc restrictions"
99474 + default 1001
99475 + help
99476 + Setting this GID determines which group will be exempted from
99477 + grsecurity's /proc restrictions, allowing users of the specified
99478 + group to view network statistics and the existence of other users'
99479 + processes on the system. This GID may also be chosen at boot time
99480 + via "grsec_proc_gid=" on the kernel commandline.
99481 +
99482 +config GRKERNSEC_TPE_UNTRUSTED_GID
99483 + int "GID for TPE-untrusted users"
99484 + depends on GRKERNSEC_CONFIG_SERVER && GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
99485 + default 1005
99486 + help
99487 + Setting this GID determines which group untrusted users should
99488 + be added to. These users will be placed under grsecurity's Trusted Path
99489 + Execution mechanism, preventing them from executing their own binaries.
99490 + The users will only be able to execute binaries in directories owned and
99491 + writable only by the root user. If the sysctl option is enabled, a sysctl
99492 + option with name "tpe_gid" is created.
99493 +
99494 +config GRKERNSEC_TPE_TRUSTED_GID
99495 + int "GID for TPE-trusted users"
99496 + depends on GRKERNSEC_CONFIG_SERVER && GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
99497 + default 1005
99498 + help
99499 + Setting this GID determines what group TPE restrictions will be
99500 + *disabled* for. If the sysctl option is enabled, a sysctl option
99501 + with name "tpe_gid" is created.
99502 +
99503 +config GRKERNSEC_SYMLINKOWN_GID
99504 + int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
99505 + depends on GRKERNSEC_CONFIG_SERVER
99506 + default 1006
99507 + help
99508 + Setting this GID determines what group kernel-enforced
99509 + SymlinksIfOwnerMatch will be enabled for. If the sysctl option
99510 + is enabled, a sysctl option with name "symlinkown_gid" is created.
99511 +
99512 +
99513 +endmenu
99514 +
99515 +menu "Customize Configuration"
99516 +depends on GRKERNSEC
99517 +
99518 +menu "PaX"
99519 +
99520 +config PAX
99521 + bool "Enable various PaX features"
99522 + default y if GRKERNSEC_CONFIG_AUTO
99523 + depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS || PARISC || PPC || SPARC || X86)
99524 + help
99525 + This allows you to enable various PaX features. PaX adds
99526 + intrusion prevention mechanisms to the kernel that reduce
99527 + the risks posed by exploitable memory corruption bugs.
99528 +
99529 +menu "PaX Control"
99530 + depends on PAX
99531 +
99532 +config PAX_SOFTMODE
99533 + bool 'Support soft mode'
99534 + help
99535 + Enabling this option will allow you to run PaX in soft mode, that
99536 + is, PaX features will not be enforced by default, only on executables
99537 + marked explicitly. You must also enable PT_PAX_FLAGS or XATTR_PAX_FLAGS
99538 + support as they are the only way to mark executables for soft mode use.
99539 +
99540 + Soft mode can be activated by using the "pax_softmode=1" kernel command
99541 + line option on boot. Furthermore you can control various PaX features
99542 + at runtime via the entries in /proc/sys/kernel/pax.
99543 +
99544 +config PAX_EI_PAX
99545 + bool 'Use legacy ELF header marking'
99546 + default y if GRKERNSEC_CONFIG_AUTO
99547 + help
99548 + Enabling this option will allow you to control PaX features on
99549 + a per executable basis via the 'chpax' utility available at
99550 + http://pax.grsecurity.net/. The control flags will be read from
99551 + an otherwise reserved part of the ELF header. This marking has
99552 + numerous drawbacks (no support for soft-mode, toolchain does not
99553 + know about the non-standard use of the ELF header) therefore it
99554 + has been deprecated in favour of PT_PAX_FLAGS and XATTR_PAX_FLAGS
99555 + support.
99556 +
99557 + Note that if you enable PT_PAX_FLAGS or XATTR_PAX_FLAGS marking
99558 + support as well, they will override the legacy EI_PAX marks.
99559 +
99560 + If you enable none of the marking options then all applications
99561 + will run with PaX enabled on them by default.
99562 +
99563 +config PAX_PT_PAX_FLAGS
99564 + bool 'Use ELF program header marking'
99565 + default y if GRKERNSEC_CONFIG_AUTO
99566 + help
99567 + Enabling this option will allow you to control PaX features on
99568 + a per executable basis via the 'paxctl' utility available at
99569 + http://pax.grsecurity.net/. The control flags will be read from
99570 + a PaX specific ELF program header (PT_PAX_FLAGS). This marking
99571 + has the benefits of supporting both soft mode and being fully
99572 + integrated into the toolchain (the binutils patch is available
99573 + from http://pax.grsecurity.net).
99574 +
99575 + Note that if you enable the legacy EI_PAX marking support as well,
99576 + the EI_PAX marks will be overridden by the PT_PAX_FLAGS marks.
99577 +
99578 + If you enable both PT_PAX_FLAGS and XATTR_PAX_FLAGS support then you
99579 + must make sure that the marks are the same if a binary has both marks.
99580 +
99581 + If you enable none of the marking options then all applications
99582 + will run with PaX enabled on them by default.
99583 +
99584 +config PAX_XATTR_PAX_FLAGS
99585 + bool 'Use filesystem extended attributes marking'
99586 + default y if GRKERNSEC_CONFIG_AUTO
99587 + select CIFS_XATTR if CIFS
99588 + select EXT2_FS_XATTR if EXT2_FS
99589 + select EXT3_FS_XATTR if EXT3_FS
99590 + select EXT4_FS_XATTR if EXT4_FS
99591 + select JFFS2_FS_XATTR if JFFS2_FS
99592 + select REISERFS_FS_XATTR if REISERFS_FS
99593 + select SQUASHFS_XATTR if SQUASHFS
99594 + select TMPFS_XATTR if TMPFS
99595 + select UBIFS_FS_XATTR if UBIFS_FS
99596 + help
99597 + Enabling this option will allow you to control PaX features on
99598 + a per executable basis via the 'setfattr' utility. The control
99599 + flags will be read from the user.pax.flags extended attribute of
99600 + the file. This marking has the benefit of supporting binary-only
99601 + applications that self-check themselves (e.g., skype) and would
99602 + not tolerate chpax/paxctl changes. The main drawback is that
99603 + extended attributes are not supported by some filesystems (e.g.,
99604 + isofs, udf, vfat) so copying files through such filesystems will
99605 + lose the extended attributes and these PaX markings.
99606 +
99607 + Note that if you enable the legacy EI_PAX marking support as well,
99608 + the EI_PAX marks will be overridden by the XATTR_PAX_FLAGS marks.
99609 +
99610 + If you enable both PT_PAX_FLAGS and XATTR_PAX_FLAGS support then you
99611 + must make sure that the marks are the same if a binary has both marks.
99612 +
99613 + If you enable none of the marking options then all applications
99614 + will run with PaX enabled on them by default.
99615 +
99616 +choice
99617 + prompt 'MAC system integration'
99618 + default PAX_HAVE_ACL_FLAGS
99619 + help
99620 + Mandatory Access Control systems have the option of controlling
99621 + PaX flags on a per executable basis, choose the method supported
99622 + by your particular system.
99623 +
99624 + - "none": if your MAC system does not interact with PaX,
99625 + - "direct": if your MAC system defines pax_set_initial_flags() itself,
99626 + - "hook": if your MAC system uses the pax_set_initial_flags_func callback.
99627 +
99628 + NOTE: this option is for developers/integrators only.
99629 +
99630 + config PAX_NO_ACL_FLAGS
99631 + bool 'none'
99632 +
99633 + config PAX_HAVE_ACL_FLAGS
99634 + bool 'direct'
99635 +
99636 + config PAX_HOOK_ACL_FLAGS
99637 + bool 'hook'
99638 +endchoice
99639 +
99640 +endmenu
99641 +
99642 +menu "Non-executable pages"
99643 + depends on PAX
99644 +
99645 +config PAX_NOEXEC
99646 + bool "Enforce non-executable pages"
99647 + default y if GRKERNSEC_CONFIG_AUTO
99648 + depends on ALPHA || (ARM && (CPU_V6 || CPU_V6K || CPU_V7)) || IA64 || MIPS || PARISC || PPC || S390 || SPARC || X86
99649 + help
99650 + By design some architectures do not allow for protecting memory
99651 + pages against execution or even if they do, Linux does not make
99652 + use of this feature. In practice this means that if a page is
99653 + readable (such as the stack or heap) it is also executable.
99654 +
99655 + There is a well known exploit technique that makes use of this
99656 + fact and a common programming mistake where an attacker can
99657 + introduce code of his choice somewhere in the attacked program's
99658 + memory (typically the stack or the heap) and then execute it.
99659 +
99660 + If the attacked program was running with different (typically
99661 + higher) privileges than that of the attacker, then he can elevate
99662 + his own privilege level (e.g. get a root shell, write to files for
99663 + which he does not have write access to, etc).
99664 +
99665 + Enabling this option will let you choose from various features
99666 + that prevent the injection and execution of 'foreign' code in
99667 + a program.
99668 +
99669 + This will also break programs that rely on the old behaviour and
99670 + expect that dynamically allocated memory via the malloc() family
99671 + of functions is executable (which it is not). Notable examples
99672 + are the XFree86 4.x server, the java runtime and wine.
99673 +
99674 +config PAX_PAGEEXEC
99675 + bool "Paging based non-executable pages"
99676 + default y if GRKERNSEC_CONFIG_AUTO
99677 + 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)
99678 + select ARCH_TRACK_EXEC_LIMIT if X86_32
99679 + help
99680 + This implementation is based on the paging feature of the CPU.
99681 + On i386 without hardware non-executable bit support there is a
99682 + variable but usually low performance impact, however on Intel's
99683 + P4 core based CPUs it is very high so you should not enable this
99684 + for kernels meant to be used on such CPUs.
99685 +
99686 + On alpha, avr32, ia64, parisc, sparc, sparc64, x86_64 and i386
99687 + with hardware non-executable bit support there is no performance
99688 + impact, on ppc the impact is negligible.
99689 +
99690 + Note that several architectures require various emulations due to
99691 + badly designed userland ABIs, this will cause a performance impact
99692 + but will disappear as soon as userland is fixed. For example, ppc
99693 + userland MUST have been built with secure-plt by a recent toolchain.
99694 +
99695 +config PAX_SEGMEXEC
99696 + bool "Segmentation based non-executable pages"
99697 + default y if GRKERNSEC_CONFIG_AUTO
99698 + depends on PAX_NOEXEC && X86_32
99699 + help
99700 + This implementation is based on the segmentation feature of the
99701 + CPU and has a very small performance impact, however applications
99702 + will be limited to a 1.5 GB address space instead of the normal
99703 + 3 GB.
99704 +
99705 +config PAX_EMUTRAMP
99706 + bool "Emulate trampolines" if (PAX_PAGEEXEC || PAX_SEGMEXEC) && (PARISC || X86)
99707 + default y if PARISC
99708 + help
99709 + There are some programs and libraries that for one reason or
99710 + another attempt to execute special small code snippets from
99711 + non-executable memory pages. Most notable examples are the
99712 + signal handler return code generated by the kernel itself and
99713 + the GCC trampolines.
99714 +
99715 + If you enabled CONFIG_PAX_PAGEEXEC or CONFIG_PAX_SEGMEXEC then
99716 + such programs will no longer work under your kernel.
99717 +
99718 + As a remedy you can say Y here and use the 'chpax' or 'paxctl'
99719 + utilities to enable trampoline emulation for the affected programs
99720 + yet still have the protection provided by the non-executable pages.
99721 +
99722 + On parisc you MUST enable this option and EMUSIGRT as well, otherwise
99723 + your system will not even boot.
99724 +
99725 + Alternatively you can say N here and use the 'chpax' or 'paxctl'
99726 + utilities to disable CONFIG_PAX_PAGEEXEC and CONFIG_PAX_SEGMEXEC
99727 + for the affected files.
99728 +
99729 + NOTE: enabling this feature *may* open up a loophole in the
99730 + protection provided by non-executable pages that an attacker
99731 + could abuse. Therefore the best solution is to not have any
99732 + files on your system that would require this option. This can
99733 + be achieved by not using libc5 (which relies on the kernel
99734 + signal handler return code) and not using or rewriting programs
99735 + that make use of the nested function implementation of GCC.
99736 + Skilled users can just fix GCC itself so that it implements
99737 + nested function calls in a way that does not interfere with PaX.
99738 +
99739 +config PAX_EMUSIGRT
99740 + bool "Automatically emulate sigreturn trampolines"
99741 + depends on PAX_EMUTRAMP && PARISC
99742 + default y
99743 + help
99744 + Enabling this option will have the kernel automatically detect
99745 + and emulate signal return trampolines executing on the stack
99746 + that would otherwise lead to task termination.
99747 +
99748 + This solution is intended as a temporary one for users with
99749 + legacy versions of libc (libc5, glibc 2.0, uClibc before 0.9.17,
99750 + Modula-3 runtime, etc) or executables linked to such, basically
99751 + everything that does not specify its own SA_RESTORER function in
99752 + normal executable memory like glibc 2.1+ does.
99753 +
99754 + On parisc you MUST enable this option, otherwise your system will
99755 + not even boot.
99756 +
99757 + NOTE: this feature cannot be disabled on a per executable basis
99758 + and since it *does* open up a loophole in the protection provided
99759 + by non-executable pages, the best solution is to not have any
99760 + files on your system that would require this option.
99761 +
99762 +config PAX_MPROTECT
99763 + bool "Restrict mprotect()"
99764 + default y if GRKERNSEC_CONFIG_AUTO
99765 + depends on (PAX_PAGEEXEC || PAX_SEGMEXEC)
99766 + help
99767 + Enabling this option will prevent programs from
99768 + - changing the executable status of memory pages that were
99769 + not originally created as executable,
99770 + - making read-only executable pages writable again,
99771 + - creating executable pages from anonymous memory,
99772 + - making read-only-after-relocations (RELRO) data pages writable again.
99773 +
99774 + You should say Y here to complete the protection provided by
99775 + the enforcement of non-executable pages.
99776 +
99777 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control
99778 + this feature on a per file basis.
99779 +
99780 +config PAX_MPROTECT_COMPAT
99781 + bool "Use legacy/compat protection demoting (read help)"
99782 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_DESKTOP)
99783 + depends on PAX_MPROTECT
99784 + help
99785 + The current implementation of PAX_MPROTECT denies RWX allocations/mprotects
99786 + by sending the proper error code to the application. For some broken
99787 + userland, this can cause problems with Python or other applications. The
99788 + current implementation however allows for applications like clamav to
99789 + detect if JIT compilation/execution is allowed and to fall back gracefully
99790 + to an interpreter-based mode if it does not. While we encourage everyone
99791 + to use the current implementation as-is and push upstream to fix broken
99792 + userland (note that the RWX logging option can assist with this), in some
99793 + environments this may not be possible. Having to disable MPROTECT
99794 + completely on certain binaries reduces the security benefit of PaX,
99795 + so this option is provided for those environments to revert to the old
99796 + behavior.
99797 +
99798 +config PAX_ELFRELOCS
99799 + bool "Allow ELF text relocations (read help)"
99800 + depends on PAX_MPROTECT
99801 + default n
99802 + help
99803 + Non-executable pages and mprotect() restrictions are effective
99804 + in preventing the introduction of new executable code into an
99805 + attacked task's address space. There remain only two venues
99806 + for this kind of attack: if the attacker can execute already
99807 + existing code in the attacked task then he can either have it
99808 + create and mmap() a file containing his code or have it mmap()
99809 + an already existing ELF library that does not have position
99810 + independent code in it and use mprotect() on it to make it
99811 + writable and copy his code there. While protecting against
99812 + the former approach is beyond PaX, the latter can be prevented
99813 + by having only PIC ELF libraries on one's system (which do not
99814 + need to relocate their code). If you are sure this is your case,
99815 + as is the case with all modern Linux distributions, then leave
99816 + this option disabled. You should say 'n' here.
99817 +
99818 +config PAX_ETEXECRELOCS
99819 + bool "Allow ELF ET_EXEC text relocations"
99820 + depends on PAX_MPROTECT && (ALPHA || IA64 || PARISC)
99821 + select PAX_ELFRELOCS
99822 + default y
99823 + help
99824 + On some architectures there are incorrectly created applications
99825 + that require text relocations and would not work without enabling
99826 + this option. If you are an alpha, ia64 or parisc user, you should
99827 + enable this option and disable it once you have made sure that
99828 + none of your applications need it.
99829 +
99830 +config PAX_EMUPLT
99831 + bool "Automatically emulate ELF PLT"
99832 + depends on PAX_MPROTECT && (ALPHA || PARISC || SPARC)
99833 + default y
99834 + help
99835 + Enabling this option will have the kernel automatically detect
99836 + and emulate the Procedure Linkage Table entries in ELF files.
99837 + On some architectures such entries are in writable memory, and
99838 + become non-executable leading to task termination. Therefore
99839 + it is mandatory that you enable this option on alpha, parisc,
99840 + sparc and sparc64, otherwise your system would not even boot.
99841 +
99842 + NOTE: this feature *does* open up a loophole in the protection
99843 + provided by the non-executable pages, therefore the proper
99844 + solution is to modify the toolchain to produce a PLT that does
99845 + not need to be writable.
99846 +
99847 +config PAX_DLRESOLVE
99848 + bool 'Emulate old glibc resolver stub'
99849 + depends on PAX_EMUPLT && SPARC
99850 + default n
99851 + help
99852 + This option is needed if userland has an old glibc (before 2.4)
99853 + that puts a 'save' instruction into the runtime generated resolver
99854 + stub that needs special emulation.
99855 +
99856 +config PAX_KERNEXEC
99857 + bool "Enforce non-executable kernel pages"
99858 + default y if GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_NONE || (GRKERNSEC_CONFIG_VIRT_EPT && GRKERNSEC_CONFIG_VIRT_GUEST) || (GRKERNSEC_CONFIG_VIRT_EPT && GRKERNSEC_CONFIG_VIRT_KVM))
99859 + depends on (X86 || (ARM && (CPU_V6 || CPU_V6K || CPU_V7) && !(ARM_LPAE && MODULES))) && !XEN
99860 + select PAX_PER_CPU_PGD if X86_64 || (X86_32 && X86_PAE)
99861 + select PAX_KERNEXEC_PLUGIN if X86_64
99862 + help
99863 + This is the kernel land equivalent of PAGEEXEC and MPROTECT,
99864 + that is, enabling this option will make it harder to inject
99865 + and execute 'foreign' code in kernel memory itself.
99866 +
99867 +choice
99868 + prompt "Return Address Instrumentation Method"
99869 + default PAX_KERNEXEC_PLUGIN_METHOD_BTS
99870 + depends on PAX_KERNEXEC_PLUGIN
99871 + help
99872 + Select the method used to instrument function pointer dereferences.
99873 + Note that binary modules cannot be instrumented by this approach.
99874 +
99875 + Note that the implementation requires a gcc with plugin support,
99876 + i.e., gcc 4.5 or newer. You may need to install the supporting
99877 + headers explicitly in addition to the normal gcc package.
99878 +
99879 + config PAX_KERNEXEC_PLUGIN_METHOD_BTS
99880 + bool "bts"
99881 + help
99882 + This method is compatible with binary only modules but has
99883 + a higher runtime overhead.
99884 +
99885 + config PAX_KERNEXEC_PLUGIN_METHOD_OR
99886 + bool "or"
99887 + depends on !PARAVIRT
99888 + help
99889 + This method is incompatible with binary only modules but has
99890 + a lower runtime overhead.
99891 +endchoice
99892 +
99893 +config PAX_KERNEXEC_PLUGIN_METHOD
99894 + string
99895 + default "bts" if PAX_KERNEXEC_PLUGIN_METHOD_BTS
99896 + default "or" if PAX_KERNEXEC_PLUGIN_METHOD_OR
99897 + default ""
99898 +
99899 +config PAX_KERNEXEC_MODULE_TEXT
99900 + int "Minimum amount of memory reserved for module code"
99901 + default "4" if (!GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_SERVER)
99902 + default "12" if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_DESKTOP)
99903 + depends on PAX_KERNEXEC && X86_32
99904 + help
99905 + Due to implementation details the kernel must reserve a fixed
99906 + amount of memory for runtime allocated code (such as modules)
99907 + at compile time that cannot be changed at runtime. Here you
99908 + can specify the minimum amount in MB that will be reserved.
99909 + Due to the same implementation details this size will always
99910 + be rounded up to the next 2/4 MB boundary (depends on PAE) so
99911 + the actually available memory for runtime allocated code will
99912 + usually be more than this minimum.
99913 +
99914 + The default 4 MB should be enough for most users but if you have
99915 + an excessive number of modules (e.g., most distribution configs
99916 + compile many drivers as modules) or use huge modules such as
99917 + nvidia's kernel driver, you will need to adjust this amount.
99918 + A good rule of thumb is to look at your currently loaded kernel
99919 + modules and add up their sizes.
99920 +
99921 +endmenu
99922 +
99923 +menu "Address Space Layout Randomization"
99924 + depends on PAX
99925 +
99926 +config PAX_ASLR
99927 + bool "Address Space Layout Randomization"
99928 + default y if GRKERNSEC_CONFIG_AUTO
99929 + help
99930 + Many if not most exploit techniques rely on the knowledge of
99931 + certain addresses in the attacked program. The following options
99932 + will allow the kernel to apply a certain amount of randomization
99933 + to specific parts of the program thereby forcing an attacker to
99934 + guess them in most cases. Any failed guess will most likely crash
99935 + the attacked program which allows the kernel to detect such attempts
99936 + and react on them. PaX itself provides no reaction mechanisms,
99937 + instead it is strongly encouraged that you make use of Nergal's
99938 + segvguard (ftp://ftp.pl.openwall.com/misc/segvguard/) or grsecurity's
99939 + (http://www.grsecurity.net/) built-in crash detection features or
99940 + develop one yourself.
99941 +
99942 + By saying Y here you can choose to randomize the following areas:
99943 + - top of the task's kernel stack
99944 + - top of the task's userland stack
99945 + - base address for mmap() requests that do not specify one
99946 + (this includes all libraries)
99947 + - base address of the main executable
99948 +
99949 + It is strongly recommended to say Y here as address space layout
99950 + randomization has negligible impact on performance yet it provides
99951 + a very effective protection.
99952 +
99953 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control
99954 + this feature on a per file basis.
99955 +
99956 +config PAX_RANDKSTACK
99957 + bool "Randomize kernel stack base"
99958 + default y if GRKERNSEC_CONFIG_AUTO && !(GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_VIRTUALBOX)
99959 + depends on X86_TSC && X86
99960 + help
99961 + By saying Y here the kernel will randomize every task's kernel
99962 + stack on every system call. This will not only force an attacker
99963 + to guess it but also prevent him from making use of possible
99964 + leaked information about it.
99965 +
99966 + Since the kernel stack is a rather scarce resource, randomization
99967 + may cause unexpected stack overflows, therefore you should very
99968 + carefully test your system. Note that once enabled in the kernel
99969 + configuration, this feature cannot be disabled on a per file basis.
99970 +
99971 +config PAX_RANDUSTACK
99972 + bool "Randomize user stack base"
99973 + default y if GRKERNSEC_CONFIG_AUTO
99974 + depends on PAX_ASLR
99975 + help
99976 + By saying Y here the kernel will randomize every task's userland
99977 + stack. The randomization is done in two steps where the second
99978 + one may apply a big amount of shift to the top of the stack and
99979 + cause problems for programs that want to use lots of memory (more
99980 + than 2.5 GB if SEGMEXEC is not active, or 1.25 GB when it is).
99981 + For this reason the second step can be controlled by 'chpax' or
99982 + 'paxctl' on a per file basis.
99983 +
99984 +config PAX_RANDMMAP
99985 + bool "Randomize mmap() base"
99986 + default y if GRKERNSEC_CONFIG_AUTO
99987 + depends on PAX_ASLR
99988 + help
99989 + By saying Y here the kernel will use a randomized base address for
99990 + mmap() requests that do not specify one themselves. As a result
99991 + all dynamically loaded libraries will appear at random addresses
99992 + and therefore be harder to exploit by a technique where an attacker
99993 + attempts to execute library code for his purposes (e.g. spawn a
99994 + shell from an exploited program that is running at an elevated
99995 + privilege level).
99996 +
99997 + Furthermore, if a program is relinked as a dynamic ELF file, its
99998 + base address will be randomized as well, completing the full
99999 + randomization of the address space layout. Attacking such programs
100000 + becomes a guess game. You can find an example of doing this at
100001 + http://pax.grsecurity.net/et_dyn.tar.gz and practical samples at
100002 + http://www.grsecurity.net/grsec-gcc-specs.tar.gz .
100003 +
100004 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control this
100005 + feature on a per file basis.
100006 +
100007 +endmenu
100008 +
100009 +menu "Miscellaneous hardening features"
100010 +
100011 +config PAX_MEMORY_SANITIZE
100012 + bool "Sanitize all freed memory"
100013 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
100014 + help
100015 + By saying Y here the kernel will erase memory pages and slab objects
100016 + as soon as they are freed. This in turn reduces the lifetime of data
100017 + stored in them, making it less likely that sensitive information such
100018 + as passwords, cryptographic secrets, etc stay in memory for too long.
100019 +
100020 + This is especially useful for programs whose runtime is short, long
100021 + lived processes and the kernel itself benefit from this as long as
100022 + they ensure timely freeing of memory that may hold sensitive
100023 + information.
100024 +
100025 + A nice side effect of the sanitization of slab objects is the
100026 + reduction of possible info leaks caused by padding bytes within the
100027 + leaky structures. Use-after-free bugs for structures containing
100028 + pointers can also be detected as dereferencing the sanitized pointer
100029 + will generate an access violation.
100030 +
100031 + The tradeoff is performance impact, on a single CPU system kernel
100032 + compilation sees a 3% slowdown, other systems and workloads may vary
100033 + and you are advised to test this feature on your expected workload
100034 + before deploying it.
100035 +
100036 + To reduce the performance penalty by sanitizing pages only, albeit
100037 + limiting the effectiveness of this feature at the same time, slab
100038 + sanitization can be disabled with the kernel commandline parameter
100039 + "pax_sanitize_slab=0".
100040 +
100041 + Note that this feature does not protect data stored in live pages,
100042 + e.g., process memory swapped to disk may stay there for a long time.
100043 +
100044 +config PAX_MEMORY_STACKLEAK
100045 + bool "Sanitize kernel stack"
100046 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
100047 + depends on X86
100048 + help
100049 + By saying Y here the kernel will erase the kernel stack before it
100050 + returns from a system call. This in turn reduces the information
100051 + that a kernel stack leak bug can reveal.
100052 +
100053 + Note that such a bug can still leak information that was put on
100054 + the stack by the current system call (the one eventually triggering
100055 + the bug) but traces of earlier system calls on the kernel stack
100056 + cannot leak anymore.
100057 +
100058 + The tradeoff is performance impact: on a single CPU system kernel
100059 + compilation sees a 1% slowdown, other systems and workloads may vary
100060 + and you are advised to test this feature on your expected workload
100061 + before deploying it.
100062 +
100063 + Note that the full feature requires a gcc with plugin support,
100064 + i.e., gcc 4.5 or newer. You may need to install the supporting
100065 + headers explicitly in addition to the normal gcc package. Using
100066 + older gcc versions means that functions with large enough stack
100067 + frames may leave uninitialized memory behind that may be exposed
100068 + to a later syscall leaking the stack.
100069 +
100070 +config PAX_MEMORY_STRUCTLEAK
100071 + bool "Forcibly initialize local variables copied to userland"
100072 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
100073 + help
100074 + By saying Y here the kernel will zero initialize some local
100075 + variables that are going to be copied to userland. This in
100076 + turn prevents unintended information leakage from the kernel
100077 + stack should later code forget to explicitly set all parts of
100078 + the copied variable.
100079 +
100080 + The tradeoff is less performance impact than PAX_MEMORY_STACKLEAK
100081 + at a much smaller coverage.
100082 +
100083 + Note that the implementation requires a gcc with plugin support,
100084 + i.e., gcc 4.5 or newer. You may need to install the supporting
100085 + headers explicitly in addition to the normal gcc package.
100086 +
100087 +config PAX_MEMORY_UDEREF
100088 + bool "Prevent invalid userland pointer dereference"
100089 + default y if GRKERNSEC_CONFIG_AUTO && !(X86_64 && GRKERNSEC_CONFIG_PRIORITY_PERF) && (GRKERNSEC_CONFIG_VIRT_NONE || GRKERNSEC_CONFIG_VIRT_EPT)
100090 + depends on (X86 || (ARM && (CPU_V6 || CPU_V6K || CPU_V7) && !ARM_LPAE)) && !UML_X86 && !XEN
100091 + select PAX_PER_CPU_PGD if X86_64
100092 + help
100093 + By saying Y here the kernel will be prevented from dereferencing
100094 + userland pointers in contexts where the kernel expects only kernel
100095 + pointers. This is both a useful runtime debugging feature and a
100096 + security measure that prevents exploiting a class of kernel bugs.
100097 +
100098 + The tradeoff is that some virtualization solutions may experience
100099 + a huge slowdown and therefore you should not enable this feature
100100 + for kernels meant to run in such environments. Whether a given VM
100101 + solution is affected or not is best determined by simply trying it
100102 + out, the performance impact will be obvious right on boot as this
100103 + mechanism engages from very early on. A good rule of thumb is that
100104 + VMs running on CPUs without hardware virtualization support (i.e.,
100105 + the majority of IA-32 CPUs) will likely experience the slowdown.
100106 +
100107 + On X86_64 the kernel will make use of PCID support when available
100108 + (Intel's Westmere, Sandy Bridge, etc) for better security (default)
100109 + or performance impact. Pass pax_weakuderef on the kernel command
100110 + line to choose the latter.
100111 +
100112 +config PAX_REFCOUNT
100113 + bool "Prevent various kernel object reference counter overflows"
100114 + default y if GRKERNSEC_CONFIG_AUTO
100115 + depends on GRKERNSEC && ((ARM && (CPU_V6 || CPU_V6K || CPU_V7)) || MIPS || SPARC64 || X86)
100116 + help
100117 + By saying Y here the kernel will detect and prevent overflowing
100118 + various (but not all) kinds of object reference counters. Such
100119 + overflows can normally occur due to bugs only and are often, if
100120 + not always, exploitable.
100121 +
100122 + The tradeoff is that data structures protected by an overflowed
100123 + refcount will never be freed and therefore will leak memory. Note
100124 + that this leak also happens even without this protection but in
100125 + that case the overflow can eventually trigger the freeing of the
100126 + data structure while it is still being used elsewhere, resulting
100127 + in the exploitable situation that this feature prevents.
100128 +
100129 + Since this has a negligible performance impact, you should enable
100130 + this feature.
100131 +
100132 +config PAX_CONSTIFY_PLUGIN
100133 + bool "Automatically constify eligible structures"
100134 + default y
100135 + depends on !UML && PAX_KERNEXEC
100136 + help
100137 + By saying Y here the compiler will automatically constify a class
100138 + of types that contain only function pointers. This reduces the
100139 + kernel's attack surface and also produces a better memory layout.
100140 +
100141 + Note that the implementation requires a gcc with plugin support,
100142 + i.e., gcc 4.5 or newer. You may need to install the supporting
100143 + headers explicitly in addition to the normal gcc package.
100144 +
100145 + Note that if some code really has to modify constified variables
100146 + then the source code will have to be patched to allow it. Examples
100147 + can be found in PaX itself (the no_const attribute) and for some
100148 + out-of-tree modules at http://www.grsecurity.net/~paxguy1/ .
100149 +
100150 +config PAX_USERCOPY
100151 + bool "Harden heap object copies between kernel and userland"
100152 + default y if GRKERNSEC_CONFIG_AUTO
100153 + depends on ARM || IA64 || PPC || SPARC || X86
100154 + depends on GRKERNSEC && (SLAB || SLUB || SLOB)
100155 + select PAX_USERCOPY_SLABS
100156 + help
100157 + By saying Y here the kernel will enforce the size of heap objects
100158 + when they are copied in either direction between the kernel and
100159 + userland, even if only a part of the heap object is copied.
100160 +
100161 + Specifically, this checking prevents information leaking from the
100162 + kernel heap during kernel to userland copies (if the kernel heap
100163 + object is otherwise fully initialized) and prevents kernel heap
100164 + overflows during userland to kernel copies.
100165 +
100166 + Note that the current implementation provides the strictest bounds
100167 + checks for the SLUB allocator.
100168 +
100169 + Enabling this option also enables per-slab cache protection against
100170 + data in a given cache being copied into/out of via userland
100171 + accessors. Though the whitelist of regions will be reduced over
100172 + time, it notably protects important data structures like task structs.
100173 +
100174 + If frame pointers are enabled on x86, this option will also restrict
100175 + copies into and out of the kernel stack to local variables within a
100176 + single frame.
100177 +
100178 + Since this has a negligible performance impact, you should enable
100179 + this feature.
100180 +
100181 +config PAX_USERCOPY_DEBUG
100182 + bool
100183 + depends on X86 && PAX_USERCOPY
100184 + default n
100185 +
100186 +config PAX_SIZE_OVERFLOW
100187 + bool "Prevent various integer overflows in function size parameters"
100188 + default y if GRKERNSEC_CONFIG_AUTO
100189 + depends on X86
100190 + help
100191 + By saying Y here the kernel recomputes expressions of function
100192 + arguments marked by a size_overflow attribute with double integer
100193 + precision (DImode/TImode for 32/64 bit integer types).
100194 +
100195 + The recomputed argument is checked against TYPE_MAX and an event
100196 + is logged on overflow and the triggering process is killed.
100197 +
100198 + Homepage: http://www.grsecurity.net/~ephox/overflow_plugin/
100199 +
100200 + Note that the implementation requires a gcc with plugin support,
100201 + i.e., gcc 4.5 or newer. You may need to install the supporting
100202 + headers explicitly in addition to the normal gcc package.
100203 +
100204 +config PAX_LATENT_ENTROPY
100205 + bool "Generate some entropy during boot and runtime"
100206 + default y if GRKERNSEC_CONFIG_AUTO
100207 + help
100208 + By saying Y here the kernel will instrument some kernel code to
100209 + extract some entropy from both original and artificially created
100210 + program state. This will help especially embedded systems where
100211 + there is little 'natural' source of entropy normally. The cost
100212 + is some slowdown of the boot process and fork and irq processing.
100213 +
100214 + When pax_extra_latent_entropy is passed on the kernel command line,
100215 + entropy will be extracted from up to the first 4GB of RAM while the
100216 + runtime memory allocator is being initialized. This costs even more
100217 + slowdown of the boot process.
100218 +
100219 + Note that the implementation requires a gcc with plugin support,
100220 + i.e., gcc 4.5 or newer. You may need to install the supporting
100221 + headers explicitly in addition to the normal gcc package.
100222 +
100223 + Note that entropy extracted this way is not cryptographically
100224 + secure!
100225 +
100226 +endmenu
100227 +
100228 +endmenu
100229 +
100230 +source grsecurity/Kconfig
100231 +
100232 +endmenu
100233 +
100234 +endmenu
100235 +
100236 source security/keys/Kconfig
100237
100238 config SECURITY_DMESG_RESTRICT
100239 @@ -103,7 +1056,7 @@ config INTEL_TXT
100240 config LSM_MMAP_MIN_ADDR
100241 int "Low address space for LSM to protect from user allocation"
100242 depends on SECURITY && SECURITY_SELINUX
100243 - default 32768 if ARM
100244 + default 32768 if ALPHA || ARM || PARISC || SPARC32
100245 default 65536
100246 help
100247 This is the portion of low virtual memory which should be protected
100248 diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
100249 index fb99e18..b3e0bbb 100644
100250 --- a/security/apparmor/lsm.c
100251 +++ b/security/apparmor/lsm.c
100252 @@ -615,7 +615,7 @@ static int apparmor_task_setrlimit(struct task_struct *task,
100253 return error;
100254 }
100255
100256 -static struct security_operations apparmor_ops = {
100257 +static struct security_operations apparmor_ops __read_only = {
100258 .name = "apparmor",
100259
100260 .ptrace_access_check = apparmor_ptrace_access_check,
100261 diff --git a/security/commoncap.c b/security/commoncap.c
100262 index b9d613e..f68305c 100644
100263 --- a/security/commoncap.c
100264 +++ b/security/commoncap.c
100265 @@ -424,6 +424,32 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
100266 return 0;
100267 }
100268
100269 +/* returns:
100270 + 1 for suid privilege
100271 + 2 for sgid privilege
100272 + 3 for fscap privilege
100273 +*/
100274 +int is_privileged_binary(const struct dentry *dentry)
100275 +{
100276 + struct cpu_vfs_cap_data capdata;
100277 + struct inode *inode = dentry->d_inode;
100278 +
100279 + if (!inode || S_ISDIR(inode->i_mode))
100280 + return 0;
100281 +
100282 + if (inode->i_mode & S_ISUID)
100283 + return 1;
100284 + if ((inode->i_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))
100285 + return 2;
100286 +
100287 + if (!get_vfs_caps_from_disk(dentry, &capdata)) {
100288 + if (!cap_isclear(capdata.inheritable) || !cap_isclear(capdata.permitted))
100289 + return 3;
100290 + }
100291 +
100292 + return 0;
100293 +}
100294 +
100295 /*
100296 * Attempt to get the on-exec apply capability sets for an executable file from
100297 * its xattrs and, if present, apply them to the proposed credentials being
100298 @@ -592,6 +618,9 @@ int cap_bprm_secureexec(struct linux_binprm *bprm)
100299 const struct cred *cred = current_cred();
100300 kuid_t root_uid = make_kuid(cred->user_ns, 0);
100301
100302 + if (gr_acl_enable_at_secure())
100303 + return 1;
100304 +
100305 if (!uid_eq(cred->uid, root_uid)) {
100306 if (bprm->cap_effective)
100307 return 1;
100308 diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
100309 index b3dd616..4bb17f3 100644
100310 --- a/security/integrity/ima/ima.h
100311 +++ b/security/integrity/ima/ima.h
100312 @@ -83,8 +83,8 @@ int ima_init_crypto(void);
100313 extern spinlock_t ima_queue_lock;
100314
100315 struct ima_h_table {
100316 - atomic_long_t len; /* number of stored measurements in the list */
100317 - atomic_long_t violations;
100318 + atomic_long_unchecked_t len; /* number of stored measurements in the list */
100319 + atomic_long_unchecked_t violations;
100320 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
100321 };
100322 extern struct ima_h_table ima_htable;
100323 diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
100324 index 1c03e8f1..398a941 100644
100325 --- a/security/integrity/ima/ima_api.c
100326 +++ b/security/integrity/ima/ima_api.c
100327 @@ -79,7 +79,7 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename,
100328 int result;
100329
100330 /* can overflow, only indicator */
100331 - atomic_long_inc(&ima_htable.violations);
100332 + atomic_long_inc_unchecked(&ima_htable.violations);
100333
100334 entry = kmalloc(sizeof(*entry), GFP_KERNEL);
100335 if (!entry) {
100336 diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
100337 index 38477c9..87a60c7 100644
100338 --- a/security/integrity/ima/ima_fs.c
100339 +++ b/security/integrity/ima/ima_fs.c
100340 @@ -28,12 +28,12 @@
100341 static int valid_policy = 1;
100342 #define TMPBUFLEN 12
100343 static ssize_t ima_show_htable_value(char __user *buf, size_t count,
100344 - loff_t *ppos, atomic_long_t *val)
100345 + loff_t *ppos, atomic_long_unchecked_t *val)
100346 {
100347 char tmpbuf[TMPBUFLEN];
100348 ssize_t len;
100349
100350 - len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
100351 + len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
100352 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
100353 }
100354
100355 diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
100356 index ff63fe0..809cd96 100644
100357 --- a/security/integrity/ima/ima_queue.c
100358 +++ b/security/integrity/ima/ima_queue.c
100359 @@ -80,7 +80,7 @@ static int ima_add_digest_entry(struct ima_template_entry *entry)
100360 INIT_LIST_HEAD(&qe->later);
100361 list_add_tail_rcu(&qe->later, &ima_measurements);
100362
100363 - atomic_long_inc(&ima_htable.len);
100364 + atomic_long_inc_unchecked(&ima_htable.len);
100365 key = ima_hash_key(entry->digest);
100366 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
100367 return 0;
100368 diff --git a/security/keys/compat.c b/security/keys/compat.c
100369 index d65fa7f..cbfe366 100644
100370 --- a/security/keys/compat.c
100371 +++ b/security/keys/compat.c
100372 @@ -44,7 +44,7 @@ static long compat_keyctl_instantiate_key_iov(
100373 if (ret == 0)
100374 goto no_payload_free;
100375
100376 - ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
100377 + ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid);
100378 err:
100379 if (iov != iovstack)
100380 kfree(iov);
100381 diff --git a/security/keys/internal.h b/security/keys/internal.h
100382 index d4f1468..cc52f92 100644
100383 --- a/security/keys/internal.h
100384 +++ b/security/keys/internal.h
100385 @@ -242,7 +242,7 @@ extern long keyctl_instantiate_key_iov(key_serial_t,
100386 extern long keyctl_invalidate_key(key_serial_t);
100387
100388 extern long keyctl_instantiate_key_common(key_serial_t,
100389 - const struct iovec *,
100390 + const struct iovec __user *,
100391 unsigned, size_t, key_serial_t);
100392
100393 /*
100394 diff --git a/security/keys/key.c b/security/keys/key.c
100395 index 8fb7c7b..ba3610d 100644
100396 --- a/security/keys/key.c
100397 +++ b/security/keys/key.c
100398 @@ -284,7 +284,7 @@ struct key *key_alloc(struct key_type *type, const char *desc,
100399
100400 atomic_set(&key->usage, 1);
100401 init_rwsem(&key->sem);
100402 - lockdep_set_class(&key->sem, &type->lock_class);
100403 + lockdep_set_class(&key->sem, (struct lock_class_key *)&type->lock_class);
100404 key->type = type;
100405 key->user = user;
100406 key->quotalen = quotalen;
100407 @@ -1032,7 +1032,9 @@ int register_key_type(struct key_type *ktype)
100408 struct key_type *p;
100409 int ret;
100410
100411 - memset(&ktype->lock_class, 0, sizeof(ktype->lock_class));
100412 + pax_open_kernel();
100413 + memset((void *)&ktype->lock_class, 0, sizeof(ktype->lock_class));
100414 + pax_close_kernel();
100415
100416 ret = -EEXIST;
100417 down_write(&key_types_sem);
100418 @@ -1044,7 +1046,7 @@ int register_key_type(struct key_type *ktype)
100419 }
100420
100421 /* store the type */
100422 - list_add(&ktype->link, &key_types_list);
100423 + pax_list_add((struct list_head *)&ktype->link, &key_types_list);
100424
100425 pr_notice("Key type %s registered\n", ktype->name);
100426 ret = 0;
100427 @@ -1066,7 +1068,7 @@ EXPORT_SYMBOL(register_key_type);
100428 void unregister_key_type(struct key_type *ktype)
100429 {
100430 down_write(&key_types_sem);
100431 - list_del_init(&ktype->link);
100432 + pax_list_del_init((struct list_head *)&ktype->link);
100433 downgrade_write(&key_types_sem);
100434 key_gc_keytype(ktype);
100435 pr_notice("Key type %s unregistered\n", ktype->name);
100436 @@ -1084,10 +1086,10 @@ void __init key_init(void)
100437 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
100438
100439 /* add the special key types */
100440 - list_add_tail(&key_type_keyring.link, &key_types_list);
100441 - list_add_tail(&key_type_dead.link, &key_types_list);
100442 - list_add_tail(&key_type_user.link, &key_types_list);
100443 - list_add_tail(&key_type_logon.link, &key_types_list);
100444 + pax_list_add_tail((struct list_head *)&key_type_keyring.link, &key_types_list);
100445 + pax_list_add_tail((struct list_head *)&key_type_dead.link, &key_types_list);
100446 + pax_list_add_tail((struct list_head *)&key_type_user.link, &key_types_list);
100447 + pax_list_add_tail((struct list_head *)&key_type_logon.link, &key_types_list);
100448
100449 /* record the root user tracking */
100450 rb_link_node(&root_key_user.node,
100451 diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
100452 index 33cfd27..842fc5a 100644
100453 --- a/security/keys/keyctl.c
100454 +++ b/security/keys/keyctl.c
100455 @@ -987,7 +987,7 @@ static int keyctl_change_reqkey_auth(struct key *key)
100456 /*
100457 * Copy the iovec data from userspace
100458 */
100459 -static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
100460 +static long copy_from_user_iovec(void *buffer, const struct iovec __user *iov,
100461 unsigned ioc)
100462 {
100463 for (; ioc > 0; ioc--) {
100464 @@ -1009,7 +1009,7 @@ static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
100465 * If successful, 0 will be returned.
100466 */
100467 long keyctl_instantiate_key_common(key_serial_t id,
100468 - const struct iovec *payload_iov,
100469 + const struct iovec __user *payload_iov,
100470 unsigned ioc,
100471 size_t plen,
100472 key_serial_t ringid)
100473 @@ -1104,7 +1104,7 @@ long keyctl_instantiate_key(key_serial_t id,
100474 [0].iov_len = plen
100475 };
100476
100477 - return keyctl_instantiate_key_common(id, iov, 1, plen, ringid);
100478 + return keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, 1, plen, ringid);
100479 }
100480
100481 return keyctl_instantiate_key_common(id, NULL, 0, 0, ringid);
100482 @@ -1137,7 +1137,7 @@ long keyctl_instantiate_key_iov(key_serial_t id,
100483 if (ret == 0)
100484 goto no_payload_free;
100485
100486 - ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
100487 + ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid);
100488 err:
100489 if (iov != iovstack)
100490 kfree(iov);
100491 diff --git a/security/keys/keyring.c b/security/keys/keyring.c
100492 index 6ece7f2..ecdb55c 100644
100493 --- a/security/keys/keyring.c
100494 +++ b/security/keys/keyring.c
100495 @@ -227,16 +227,16 @@ static long keyring_read(const struct key *keyring,
100496 ret = -EFAULT;
100497
100498 for (loop = 0; loop < klist->nkeys; loop++) {
100499 + key_serial_t serial;
100500 key = rcu_deref_link_locked(klist, loop,
100501 keyring);
100502 + serial = key->serial;
100503
100504 tmp = sizeof(key_serial_t);
100505 if (tmp > buflen)
100506 tmp = buflen;
100507
100508 - if (copy_to_user(buffer,
100509 - &key->serial,
100510 - tmp) != 0)
100511 + if (copy_to_user(buffer, &serial, tmp))
100512 goto error;
100513
100514 buflen -= tmp;
100515 diff --git a/security/min_addr.c b/security/min_addr.c
100516 index f728728..6457a0c 100644
100517 --- a/security/min_addr.c
100518 +++ b/security/min_addr.c
100519 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
100520 */
100521 static void update_mmap_min_addr(void)
100522 {
100523 +#ifndef SPARC
100524 #ifdef CONFIG_LSM_MMAP_MIN_ADDR
100525 if (dac_mmap_min_addr > CONFIG_LSM_MMAP_MIN_ADDR)
100526 mmap_min_addr = dac_mmap_min_addr;
100527 @@ -22,6 +23,7 @@ static void update_mmap_min_addr(void)
100528 #else
100529 mmap_min_addr = dac_mmap_min_addr;
100530 #endif
100531 +#endif
100532 }
100533
100534 /*
100535 diff --git a/security/security.c b/security/security.c
100536 index 4dc31f4..eabcf41 100644
100537 --- a/security/security.c
100538 +++ b/security/security.c
100539 @@ -33,8 +33,8 @@
100540 static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
100541 CONFIG_DEFAULT_SECURITY;
100542
100543 -static struct security_operations *security_ops;
100544 -static struct security_operations default_security_ops = {
100545 +struct security_operations *security_ops __read_only;
100546 +struct security_operations default_security_ops __read_only = {
100547 .name = "default",
100548 };
100549
100550 @@ -73,11 +73,6 @@ int __init security_init(void)
100551 return 0;
100552 }
100553
100554 -void reset_security_ops(void)
100555 -{
100556 - security_ops = &default_security_ops;
100557 -}
100558 -
100559 /* Save user chosen LSM */
100560 static int __init choose_lsm(char *str)
100561 {
100562 diff --git a/security/selinux/avc.c b/security/selinux/avc.c
100563 index fc3e662..7844c60 100644
100564 --- a/security/selinux/avc.c
100565 +++ b/security/selinux/avc.c
100566 @@ -59,7 +59,7 @@ struct avc_node {
100567 struct avc_cache {
100568 struct hlist_head slots[AVC_CACHE_SLOTS]; /* head for avc_node->list */
100569 spinlock_t slots_lock[AVC_CACHE_SLOTS]; /* lock for writes */
100570 - atomic_t lru_hint; /* LRU hint for reclaim scan */
100571 + atomic_unchecked_t lru_hint; /* LRU hint for reclaim scan */
100572 atomic_t active_nodes;
100573 u32 latest_notif; /* latest revocation notification */
100574 };
100575 @@ -167,7 +167,7 @@ void __init avc_init(void)
100576 spin_lock_init(&avc_cache.slots_lock[i]);
100577 }
100578 atomic_set(&avc_cache.active_nodes, 0);
100579 - atomic_set(&avc_cache.lru_hint, 0);
100580 + atomic_set_unchecked(&avc_cache.lru_hint, 0);
100581
100582 avc_node_cachep = kmem_cache_create("avc_node", sizeof(struct avc_node),
100583 0, SLAB_PANIC, NULL);
100584 @@ -242,7 +242,7 @@ static inline int avc_reclaim_node(void)
100585 spinlock_t *lock;
100586
100587 for (try = 0, ecx = 0; try < AVC_CACHE_SLOTS; try++) {
100588 - hvalue = atomic_inc_return(&avc_cache.lru_hint) & (AVC_CACHE_SLOTS - 1);
100589 + hvalue = atomic_inc_return_unchecked(&avc_cache.lru_hint) & (AVC_CACHE_SLOTS - 1);
100590 head = &avc_cache.slots[hvalue];
100591 lock = &avc_cache.slots_lock[hvalue];
100592
100593 diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
100594 index d9a78fd..ae3ad22 100644
100595 --- a/security/selinux/hooks.c
100596 +++ b/security/selinux/hooks.c
100597 @@ -4297,8 +4297,10 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
100598 }
100599 err = avc_has_perm(sk_sid, peer_sid, SECCLASS_PEER,
100600 PEER__RECV, &ad);
100601 - if (err)
100602 + if (err) {
100603 selinux_netlbl_err(skb, err, 0);
100604 + return err;
100605 + }
100606 }
100607
100608 if (secmark_active) {
100609 @@ -5521,11 +5523,11 @@ static int selinux_setprocattr(struct task_struct *p,
100610 /* Check for ptracing, and update the task SID if ok.
100611 Otherwise, leave SID unchanged and fail. */
100612 ptsid = 0;
100613 - task_lock(p);
100614 + rcu_read_lock();
100615 tracer = ptrace_parent(p);
100616 if (tracer)
100617 ptsid = task_sid(tracer);
100618 - task_unlock(p);
100619 + rcu_read_unlock();
100620
100621 if (tracer) {
100622 error = avc_has_perm(ptsid, sid, SECCLASS_PROCESS,
100623 @@ -5662,7 +5664,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
100624
100625 #endif
100626
100627 -static struct security_operations selinux_ops = {
100628 +static struct security_operations selinux_ops __read_only = {
100629 .name = "selinux",
100630
100631 .ptrace_access_check = selinux_ptrace_access_check,
100632 @@ -6014,6 +6016,9 @@ static void selinux_nf_ip_exit(void)
100633 #ifdef CONFIG_SECURITY_SELINUX_DISABLE
100634 static int selinux_disabled;
100635
100636 +extern struct security_operations *security_ops;
100637 +extern struct security_operations default_security_ops;
100638 +
100639 int selinux_disable(void)
100640 {
100641 if (ss_initialized) {
100642 @@ -6031,7 +6036,9 @@ int selinux_disable(void)
100643 selinux_disabled = 1;
100644 selinux_enabled = 0;
100645
100646 - reset_security_ops();
100647 + pax_open_kernel();
100648 + security_ops = &default_security_ops;
100649 + pax_close_kernel();
100650
100651 /* Try to destroy the avc node cache */
100652 avc_disable();
100653 diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
100654 index 6713f04..c57ecef 100644
100655 --- a/security/selinux/include/xfrm.h
100656 +++ b/security/selinux/include/xfrm.h
100657 @@ -52,7 +52,7 @@ static inline void selinux_xfrm_notify_policyload(void)
100658 {
100659 struct net *net;
100660
100661 - atomic_inc(&flow_cache_genid);
100662 + atomic_inc_unchecked(&flow_cache_genid);
100663 rtnl_lock();
100664 for_each_net(net)
100665 rt_genid_bump_all(net);
100666 diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
100667 index 8825375..97a623b 100644
100668 --- a/security/smack/smack_lsm.c
100669 +++ b/security/smack/smack_lsm.c
100670 @@ -3726,7 +3726,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
100671 return 0;
100672 }
100673
100674 -struct security_operations smack_ops = {
100675 +struct security_operations smack_ops __read_only = {
100676 .name = "smack",
100677
100678 .ptrace_access_check = smack_ptrace_access_check,
100679 diff --git a/security/tomoyo/mount.c b/security/tomoyo/mount.c
100680 index 390c646..f2f8db3 100644
100681 --- a/security/tomoyo/mount.c
100682 +++ b/security/tomoyo/mount.c
100683 @@ -118,6 +118,10 @@ static int tomoyo_mount_acl(struct tomoyo_request_info *r,
100684 type == tomoyo_mounts[TOMOYO_MOUNT_MOVE]) {
100685 need_dev = -1; /* dev_name is a directory */
100686 } else {
100687 + if (!capable(CAP_SYS_ADMIN)) {
100688 + error = -EPERM;
100689 + goto out;
100690 + }
100691 fstype = get_fs_type(type);
100692 if (!fstype) {
100693 error = -ENODEV;
100694 diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
100695 index f0b756e..b129202 100644
100696 --- a/security/tomoyo/tomoyo.c
100697 +++ b/security/tomoyo/tomoyo.c
100698 @@ -503,7 +503,7 @@ static int tomoyo_socket_sendmsg(struct socket *sock, struct msghdr *msg,
100699 * tomoyo_security_ops is a "struct security_operations" which is used for
100700 * registering TOMOYO.
100701 */
100702 -static struct security_operations tomoyo_security_ops = {
100703 +static struct security_operations tomoyo_security_ops __read_only = {
100704 .name = "tomoyo",
100705 .cred_alloc_blank = tomoyo_cred_alloc_blank,
100706 .cred_prepare = tomoyo_cred_prepare,
100707 diff --git a/security/yama/Kconfig b/security/yama/Kconfig
100708 index 20ef514..4182bed 100644
100709 --- a/security/yama/Kconfig
100710 +++ b/security/yama/Kconfig
100711 @@ -1,6 +1,6 @@
100712 config SECURITY_YAMA
100713 bool "Yama support"
100714 - depends on SECURITY
100715 + depends on SECURITY && !GRKERNSEC
100716 select SECURITYFS
100717 select SECURITY_PATH
100718 default n
100719 diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
100720 index 13c88fbc..f8c115e 100644
100721 --- a/security/yama/yama_lsm.c
100722 +++ b/security/yama/yama_lsm.c
100723 @@ -365,7 +365,7 @@ int yama_ptrace_traceme(struct task_struct *parent)
100724 }
100725
100726 #ifndef CONFIG_SECURITY_YAMA_STACKED
100727 -static struct security_operations yama_ops = {
100728 +static struct security_operations yama_ops __read_only = {
100729 .name = "yama",
100730
100731 .ptrace_access_check = yama_ptrace_access_check,
100732 @@ -376,28 +376,24 @@ static struct security_operations yama_ops = {
100733 #endif
100734
100735 #ifdef CONFIG_SYSCTL
100736 +static int zero __read_only;
100737 +static int max_scope __read_only = YAMA_SCOPE_NO_ATTACH;
100738 +
100739 static int yama_dointvec_minmax(struct ctl_table *table, int write,
100740 void __user *buffer, size_t *lenp, loff_t *ppos)
100741 {
100742 - int rc;
100743 + ctl_table_no_const yama_table;
100744
100745 if (write && !capable(CAP_SYS_PTRACE))
100746 return -EPERM;
100747
100748 - rc = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
100749 - if (rc)
100750 - return rc;
100751 -
100752 + yama_table = *table;
100753 /* Lock the max value if it ever gets set. */
100754 - if (write && *(int *)table->data == *(int *)table->extra2)
100755 - table->extra1 = table->extra2;
100756 -
100757 - return rc;
100758 + if (ptrace_scope == max_scope)
100759 + yama_table.extra1 = &max_scope;
100760 + return proc_dointvec_minmax(&yama_table, write, buffer, lenp, ppos);
100761 }
100762
100763 -static int zero;
100764 -static int max_scope = YAMA_SCOPE_NO_ATTACH;
100765 -
100766 struct ctl_path yama_sysctl_path[] = {
100767 { .procname = "kernel", },
100768 { .procname = "yama", },
100769 diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
100770 index 4cedc69..e59d8a3 100644
100771 --- a/sound/aoa/codecs/onyx.c
100772 +++ b/sound/aoa/codecs/onyx.c
100773 @@ -54,7 +54,7 @@ struct onyx {
100774 spdif_locked:1,
100775 analog_locked:1,
100776 original_mute:2;
100777 - int open_count;
100778 + local_t open_count;
100779 struct codec_info *codec_info;
100780
100781 /* mutex serializes concurrent access to the device
100782 @@ -753,7 +753,7 @@ static int onyx_open(struct codec_info_item *cii,
100783 struct onyx *onyx = cii->codec_data;
100784
100785 mutex_lock(&onyx->mutex);
100786 - onyx->open_count++;
100787 + local_inc(&onyx->open_count);
100788 mutex_unlock(&onyx->mutex);
100789
100790 return 0;
100791 @@ -765,8 +765,7 @@ static int onyx_close(struct codec_info_item *cii,
100792 struct onyx *onyx = cii->codec_data;
100793
100794 mutex_lock(&onyx->mutex);
100795 - onyx->open_count--;
100796 - if (!onyx->open_count)
100797 + if (local_dec_and_test(&onyx->open_count))
100798 onyx->spdif_locked = onyx->analog_locked = 0;
100799 mutex_unlock(&onyx->mutex);
100800
100801 diff --git a/sound/aoa/codecs/onyx.h b/sound/aoa/codecs/onyx.h
100802 index ffd2025..df062c9 100644
100803 --- a/sound/aoa/codecs/onyx.h
100804 +++ b/sound/aoa/codecs/onyx.h
100805 @@ -11,6 +11,7 @@
100806 #include <linux/i2c.h>
100807 #include <asm/pmac_low_i2c.h>
100808 #include <asm/prom.h>
100809 +#include <asm/local.h>
100810
100811 /* PCM3052 register definitions */
100812
100813 diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
100814 index 4c1cc51..16040040 100644
100815 --- a/sound/core/oss/pcm_oss.c
100816 +++ b/sound/core/oss/pcm_oss.c
100817 @@ -1189,10 +1189,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream, const
100818 if (in_kernel) {
100819 mm_segment_t fs;
100820 fs = snd_enter_user();
100821 - ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
100822 + ret = snd_pcm_lib_write(substream, (void __force_user *)ptr, frames);
100823 snd_leave_user(fs);
100824 } else {
100825 - ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
100826 + ret = snd_pcm_lib_write(substream, (void __force_user *)ptr, frames);
100827 }
100828 if (ret != -EPIPE && ret != -ESTRPIPE)
100829 break;
100830 @@ -1234,10 +1234,10 @@ snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, char *p
100831 if (in_kernel) {
100832 mm_segment_t fs;
100833 fs = snd_enter_user();
100834 - ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
100835 + ret = snd_pcm_lib_read(substream, (void __force_user *)ptr, frames);
100836 snd_leave_user(fs);
100837 } else {
100838 - ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
100839 + ret = snd_pcm_lib_read(substream, (void __force_user *)ptr, frames);
100840 }
100841 if (ret == -EPIPE) {
100842 if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
100843 @@ -1337,7 +1337,7 @@ static ssize_t snd_pcm_oss_write2(struct snd_pcm_substream *substream, const cha
100844 struct snd_pcm_plugin_channel *channels;
100845 size_t oss_frame_bytes = (runtime->oss.plugin_first->src_width * runtime->oss.plugin_first->src_format.channels) / 8;
100846 if (!in_kernel) {
100847 - if (copy_from_user(runtime->oss.buffer, (const char __force __user *)buf, bytes))
100848 + if (copy_from_user(runtime->oss.buffer, (const char __force_user *)buf, bytes))
100849 return -EFAULT;
100850 buf = runtime->oss.buffer;
100851 }
100852 @@ -1407,7 +1407,7 @@ static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const cha
100853 }
100854 } else {
100855 tmp = snd_pcm_oss_write2(substream,
100856 - (const char __force *)buf,
100857 + (const char __force_kernel *)buf,
100858 runtime->oss.period_bytes, 0);
100859 if (tmp <= 0)
100860 goto err;
100861 @@ -1433,7 +1433,7 @@ static ssize_t snd_pcm_oss_read2(struct snd_pcm_substream *substream, char *buf,
100862 struct snd_pcm_runtime *runtime = substream->runtime;
100863 snd_pcm_sframes_t frames, frames1;
100864 #ifdef CONFIG_SND_PCM_OSS_PLUGINS
100865 - char __user *final_dst = (char __force __user *)buf;
100866 + char __user *final_dst = (char __force_user *)buf;
100867 if (runtime->oss.plugin_first) {
100868 struct snd_pcm_plugin_channel *channels;
100869 size_t oss_frame_bytes = (runtime->oss.plugin_last->dst_width * runtime->oss.plugin_last->dst_format.channels) / 8;
100870 @@ -1495,7 +1495,7 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __use
100871 xfer += tmp;
100872 runtime->oss.buffer_used -= tmp;
100873 } else {
100874 - tmp = snd_pcm_oss_read2(substream, (char __force *)buf,
100875 + tmp = snd_pcm_oss_read2(substream, (char __force_kernel *)buf,
100876 runtime->oss.period_bytes, 0);
100877 if (tmp <= 0)
100878 goto err;
100879 @@ -1663,7 +1663,7 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file)
100880 size1);
100881 size1 /= runtime->channels; /* frames */
100882 fs = snd_enter_user();
100883 - snd_pcm_lib_write(substream, (void __force __user *)runtime->oss.buffer, size1);
100884 + snd_pcm_lib_write(substream, (void __force_user *)runtime->oss.buffer, size1);
100885 snd_leave_user(fs);
100886 }
100887 } else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
100888 diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
100889 index af49721..e85058e 100644
100890 --- a/sound/core/pcm_compat.c
100891 +++ b/sound/core/pcm_compat.c
100892 @@ -31,7 +31,7 @@ static int snd_pcm_ioctl_delay_compat(struct snd_pcm_substream *substream,
100893 int err;
100894
100895 fs = snd_enter_user();
100896 - err = snd_pcm_delay(substream, &delay);
100897 + err = snd_pcm_delay(substream, (snd_pcm_sframes_t __force_user *)&delay);
100898 snd_leave_user(fs);
100899 if (err < 0)
100900 return err;
100901 diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
100902 index a68d4c6..72af3cf 100644
100903 --- a/sound/core/pcm_native.c
100904 +++ b/sound/core/pcm_native.c
100905 @@ -2809,11 +2809,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
100906 switch (substream->stream) {
100907 case SNDRV_PCM_STREAM_PLAYBACK:
100908 result = snd_pcm_playback_ioctl1(NULL, substream, cmd,
100909 - (void __user *)arg);
100910 + (void __force_user *)arg);
100911 break;
100912 case SNDRV_PCM_STREAM_CAPTURE:
100913 result = snd_pcm_capture_ioctl1(NULL, substream, cmd,
100914 - (void __user *)arg);
100915 + (void __force_user *)arg);
100916 break;
100917 default:
100918 result = -EINVAL;
100919 diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
100920 index 040c60e..989a19a 100644
100921 --- a/sound/core/seq/seq_device.c
100922 +++ b/sound/core/seq/seq_device.c
100923 @@ -64,7 +64,7 @@ struct ops_list {
100924 int argsize; /* argument size */
100925
100926 /* operators */
100927 - struct snd_seq_dev_ops ops;
100928 + struct snd_seq_dev_ops *ops;
100929
100930 /* registered devices */
100931 struct list_head dev_list; /* list of devices */
100932 @@ -333,7 +333,7 @@ int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry,
100933
100934 mutex_lock(&ops->reg_mutex);
100935 /* copy driver operators */
100936 - ops->ops = *entry;
100937 + ops->ops = entry;
100938 ops->driver |= DRIVER_LOADED;
100939 ops->argsize = argsize;
100940
100941 @@ -463,7 +463,7 @@ static int init_device(struct snd_seq_device *dev, struct ops_list *ops)
100942 dev->name, ops->id, ops->argsize, dev->argsize);
100943 return -EINVAL;
100944 }
100945 - if (ops->ops.init_device(dev) >= 0) {
100946 + if (ops->ops->init_device(dev) >= 0) {
100947 dev->status = SNDRV_SEQ_DEVICE_REGISTERED;
100948 ops->num_init_devices++;
100949 } else {
100950 @@ -490,7 +490,7 @@ static int free_device(struct snd_seq_device *dev, struct ops_list *ops)
100951 dev->name, ops->id, ops->argsize, dev->argsize);
100952 return -EINVAL;
100953 }
100954 - if ((result = ops->ops.free_device(dev)) >= 0 || result == -ENXIO) {
100955 + if ((result = ops->ops->free_device(dev)) >= 0 || result == -ENXIO) {
100956 dev->status = SNDRV_SEQ_DEVICE_FREE;
100957 dev->driver_data = NULL;
100958 ops->num_init_devices--;
100959 diff --git a/sound/core/sound.c b/sound/core/sound.c
100960 index f002bd9..c462985 100644
100961 --- a/sound/core/sound.c
100962 +++ b/sound/core/sound.c
100963 @@ -86,7 +86,7 @@ static void snd_request_other(int minor)
100964 case SNDRV_MINOR_TIMER: str = "snd-timer"; break;
100965 default: return;
100966 }
100967 - request_module(str);
100968 + request_module("%s", str);
100969 }
100970
100971 #endif /* modular kernel */
100972 diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
100973 index 4e0dd22..7a1f32c 100644
100974 --- a/sound/drivers/mts64.c
100975 +++ b/sound/drivers/mts64.c
100976 @@ -29,6 +29,7 @@
100977 #include <sound/initval.h>
100978 #include <sound/rawmidi.h>
100979 #include <sound/control.h>
100980 +#include <asm/local.h>
100981
100982 #define CARD_NAME "Miditerminal 4140"
100983 #define DRIVER_NAME "MTS64"
100984 @@ -67,7 +68,7 @@ struct mts64 {
100985 struct pardevice *pardev;
100986 int pardev_claimed;
100987
100988 - int open_count;
100989 + local_t open_count;
100990 int current_midi_output_port;
100991 int current_midi_input_port;
100992 u8 mode[MTS64_NUM_INPUT_PORTS];
100993 @@ -697,7 +698,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
100994 {
100995 struct mts64 *mts = substream->rmidi->private_data;
100996
100997 - if (mts->open_count == 0) {
100998 + if (local_read(&mts->open_count) == 0) {
100999 /* We don't need a spinlock here, because this is just called
101000 if the device has not been opened before.
101001 So there aren't any IRQs from the device */
101002 @@ -705,7 +706,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
101003
101004 msleep(50);
101005 }
101006 - ++(mts->open_count);
101007 + local_inc(&mts->open_count);
101008
101009 return 0;
101010 }
101011 @@ -715,8 +716,7 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
101012 struct mts64 *mts = substream->rmidi->private_data;
101013 unsigned long flags;
101014
101015 - --(mts->open_count);
101016 - if (mts->open_count == 0) {
101017 + if (local_dec_return(&mts->open_count) == 0) {
101018 /* We need the spinlock_irqsave here because we can still
101019 have IRQs at this point */
101020 spin_lock_irqsave(&mts->lock, flags);
101021 @@ -725,8 +725,8 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
101022
101023 msleep(500);
101024
101025 - } else if (mts->open_count < 0)
101026 - mts->open_count = 0;
101027 + } else if (local_read(&mts->open_count) < 0)
101028 + local_set(&mts->open_count, 0);
101029
101030 return 0;
101031 }
101032 diff --git a/sound/drivers/opl4/opl4_lib.c b/sound/drivers/opl4/opl4_lib.c
101033 index b953fb4..1999c01 100644
101034 --- a/sound/drivers/opl4/opl4_lib.c
101035 +++ b/sound/drivers/opl4/opl4_lib.c
101036 @@ -29,7 +29,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
101037 MODULE_DESCRIPTION("OPL4 driver");
101038 MODULE_LICENSE("GPL");
101039
101040 -static void inline snd_opl4_wait(struct snd_opl4 *opl4)
101041 +static inline void snd_opl4_wait(struct snd_opl4 *opl4)
101042 {
101043 int timeout = 10;
101044 while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
101045 diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
101046 index 991018d..8984740 100644
101047 --- a/sound/drivers/portman2x4.c
101048 +++ b/sound/drivers/portman2x4.c
101049 @@ -48,6 +48,7 @@
101050 #include <sound/initval.h>
101051 #include <sound/rawmidi.h>
101052 #include <sound/control.h>
101053 +#include <asm/local.h>
101054
101055 #define CARD_NAME "Portman 2x4"
101056 #define DRIVER_NAME "portman"
101057 @@ -85,7 +86,7 @@ struct portman {
101058 struct pardevice *pardev;
101059 int pardev_claimed;
101060
101061 - int open_count;
101062 + local_t open_count;
101063 int mode[PORTMAN_NUM_INPUT_PORTS];
101064 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
101065 };
101066 diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c
101067 index ea995af..f1bfa37 100644
101068 --- a/sound/firewire/amdtp.c
101069 +++ b/sound/firewire/amdtp.c
101070 @@ -389,7 +389,7 @@ static void queue_out_packet(struct amdtp_out_stream *s, unsigned int cycle)
101071 ptr = s->pcm_buffer_pointer + data_blocks;
101072 if (ptr >= pcm->runtime->buffer_size)
101073 ptr -= pcm->runtime->buffer_size;
101074 - ACCESS_ONCE(s->pcm_buffer_pointer) = ptr;
101075 + ACCESS_ONCE_RW(s->pcm_buffer_pointer) = ptr;
101076
101077 s->pcm_period_pointer += data_blocks;
101078 if (s->pcm_period_pointer >= pcm->runtime->period_size) {
101079 @@ -557,7 +557,7 @@ EXPORT_SYMBOL(amdtp_out_stream_pcm_pointer);
101080 */
101081 void amdtp_out_stream_update(struct amdtp_out_stream *s)
101082 {
101083 - ACCESS_ONCE(s->source_node_id_field) =
101084 + ACCESS_ONCE_RW(s->source_node_id_field) =
101085 (fw_parent_device(s->unit)->card->node_id & 0x3f) << 24;
101086 }
101087 EXPORT_SYMBOL(amdtp_out_stream_update);
101088 diff --git a/sound/firewire/amdtp.h b/sound/firewire/amdtp.h
101089 index f6103d6..4843fbf 100644
101090 --- a/sound/firewire/amdtp.h
101091 +++ b/sound/firewire/amdtp.h
101092 @@ -138,7 +138,7 @@ static inline bool amdtp_out_streaming_error(struct amdtp_out_stream *s)
101093 static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream *s,
101094 struct snd_pcm_substream *pcm)
101095 {
101096 - ACCESS_ONCE(s->pcm) = pcm;
101097 + ACCESS_ONCE_RW(s->pcm) = pcm;
101098 }
101099
101100 static inline bool cip_sfc_is_base_44100(enum cip_sfc sfc)
101101 diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
101102 index 58a5afe..af5bd64 100644
101103 --- a/sound/firewire/isight.c
101104 +++ b/sound/firewire/isight.c
101105 @@ -96,7 +96,7 @@ static void isight_update_pointers(struct isight *isight, unsigned int count)
101106 ptr += count;
101107 if (ptr >= runtime->buffer_size)
101108 ptr -= runtime->buffer_size;
101109 - ACCESS_ONCE(isight->buffer_pointer) = ptr;
101110 + ACCESS_ONCE_RW(isight->buffer_pointer) = ptr;
101111
101112 isight->period_counter += count;
101113 if (isight->period_counter >= runtime->period_size) {
101114 @@ -307,7 +307,7 @@ static int isight_hw_params(struct snd_pcm_substream *substream,
101115 if (err < 0)
101116 return err;
101117
101118 - ACCESS_ONCE(isight->pcm_active) = true;
101119 + ACCESS_ONCE_RW(isight->pcm_active) = true;
101120
101121 return 0;
101122 }
101123 @@ -340,7 +340,7 @@ static int isight_hw_free(struct snd_pcm_substream *substream)
101124 {
101125 struct isight *isight = substream->private_data;
101126
101127 - ACCESS_ONCE(isight->pcm_active) = false;
101128 + ACCESS_ONCE_RW(isight->pcm_active) = false;
101129
101130 mutex_lock(&isight->mutex);
101131 isight_stop_streaming(isight);
101132 @@ -433,10 +433,10 @@ static int isight_trigger(struct snd_pcm_substream *substream, int cmd)
101133
101134 switch (cmd) {
101135 case SNDRV_PCM_TRIGGER_START:
101136 - ACCESS_ONCE(isight->pcm_running) = true;
101137 + ACCESS_ONCE_RW(isight->pcm_running) = true;
101138 break;
101139 case SNDRV_PCM_TRIGGER_STOP:
101140 - ACCESS_ONCE(isight->pcm_running) = false;
101141 + ACCESS_ONCE_RW(isight->pcm_running) = false;
101142 break;
101143 default:
101144 return -EINVAL;
101145 diff --git a/sound/firewire/scs1x.c b/sound/firewire/scs1x.c
101146 index 505fc81..62e569e 100644
101147 --- a/sound/firewire/scs1x.c
101148 +++ b/sound/firewire/scs1x.c
101149 @@ -74,7 +74,7 @@ static void scs_output_trigger(struct snd_rawmidi_substream *stream, int up)
101150 {
101151 struct scs *scs = stream->rmidi->private_data;
101152
101153 - ACCESS_ONCE(scs->output) = up ? stream : NULL;
101154 + ACCESS_ONCE_RW(scs->output) = up ? stream : NULL;
101155 if (up) {
101156 scs->output_idle = false;
101157 tasklet_schedule(&scs->tasklet);
101158 @@ -257,7 +257,7 @@ static void scs_input_trigger(struct snd_rawmidi_substream *stream, int up)
101159 {
101160 struct scs *scs = stream->rmidi->private_data;
101161
101162 - ACCESS_ONCE(scs->input) = up ? stream : NULL;
101163 + ACCESS_ONCE_RW(scs->input) = up ? stream : NULL;
101164 }
101165
101166 static void scs_input_escaped_byte(struct snd_rawmidi_substream *stream,
101167 @@ -469,8 +469,8 @@ static void scs_remove(struct fw_unit *unit)
101168
101169 snd_card_disconnect(scs->card);
101170
101171 - ACCESS_ONCE(scs->output) = NULL;
101172 - ACCESS_ONCE(scs->input) = NULL;
101173 + ACCESS_ONCE_RW(scs->output) = NULL;
101174 + ACCESS_ONCE_RW(scs->input) = NULL;
101175
101176 wait_event(scs->idle_wait, scs->output_idle);
101177
101178 diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
101179 index 048439a..3be9f6f 100644
101180 --- a/sound/oss/sb_audio.c
101181 +++ b/sound/oss/sb_audio.c
101182 @@ -904,7 +904,7 @@ sb16_copy_from_user(int dev,
101183 buf16 = (signed short *)(localbuf + localoffs);
101184 while (c)
101185 {
101186 - locallen = (c >= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);
101187 + locallen = ((unsigned)c >= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);
101188 if (copy_from_user(lbuf8,
101189 userbuf+useroffs + p,
101190 locallen))
101191 diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
101192 index 7d8803a..559f8d0 100644
101193 --- a/sound/oss/swarm_cs4297a.c
101194 +++ b/sound/oss/swarm_cs4297a.c
101195 @@ -2621,7 +2621,6 @@ static int __init cs4297a_init(void)
101196 {
101197 struct cs4297a_state *s;
101198 u32 pwr, id;
101199 - mm_segment_t fs;
101200 int rval;
101201 #ifndef CONFIG_BCM_CS4297A_CSWARM
101202 u64 cfg;
101203 @@ -2711,22 +2710,23 @@ static int __init cs4297a_init(void)
101204 if (!rval) {
101205 char *sb1250_duart_present;
101206
101207 +#if 0
101208 + mm_segment_t fs;
101209 fs = get_fs();
101210 set_fs(KERNEL_DS);
101211 -#if 0
101212 val = SOUND_MASK_LINE;
101213 mixer_ioctl(s, SOUND_MIXER_WRITE_RECSRC, (unsigned long) &val);
101214 for (i = 0; i < ARRAY_SIZE(initvol); i++) {
101215 val = initvol[i].vol;
101216 mixer_ioctl(s, initvol[i].mixch, (unsigned long) &val);
101217 }
101218 + set_fs(fs);
101219 // cs4297a_write_ac97(s, 0x18, 0x0808);
101220 #else
101221 // cs4297a_write_ac97(s, 0x5e, 0x180);
101222 cs4297a_write_ac97(s, 0x02, 0x0808);
101223 cs4297a_write_ac97(s, 0x18, 0x0808);
101224 #endif
101225 - set_fs(fs);
101226
101227 list_add(&s->list, &cs4297a_devs);
101228
101229 diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
101230 index e938a68..2a728ad 100644
101231 --- a/sound/pci/hda/hda_codec.c
101232 +++ b/sound/pci/hda/hda_codec.c
101233 @@ -976,14 +976,10 @@ find_codec_preset(struct hda_codec *codec)
101234 mutex_unlock(&preset_mutex);
101235
101236 if (mod_requested < HDA_MODREQ_MAX_COUNT) {
101237 - char name[32];
101238 if (!mod_requested)
101239 - snprintf(name, sizeof(name), "snd-hda-codec-id:%08x",
101240 - codec->vendor_id);
101241 + request_module("snd-hda-codec-id:%08x", codec->vendor_id);
101242 else
101243 - snprintf(name, sizeof(name), "snd-hda-codec-id:%04x*",
101244 - (codec->vendor_id >> 16) & 0xffff);
101245 - request_module(name);
101246 + request_module("snd-hda-codec-id:%04x*", (codec->vendor_id >> 16) & 0xffff);
101247 mod_requested++;
101248 goto again;
101249 }
101250 diff --git a/sound/pci/ymfpci/ymfpci.h b/sound/pci/ymfpci/ymfpci.h
101251 index 4631a23..001ae57 100644
101252 --- a/sound/pci/ymfpci/ymfpci.h
101253 +++ b/sound/pci/ymfpci/ymfpci.h
101254 @@ -358,7 +358,7 @@ struct snd_ymfpci {
101255 spinlock_t reg_lock;
101256 spinlock_t voice_lock;
101257 wait_queue_head_t interrupt_sleep;
101258 - atomic_t interrupt_sleep_count;
101259 + atomic_unchecked_t interrupt_sleep_count;
101260 struct snd_info_entry *proc_entry;
101261 const struct firmware *dsp_microcode;
101262 const struct firmware *controller_microcode;
101263 diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
101264 index d591c15..8cb8f94 100644
101265 --- a/sound/pci/ymfpci/ymfpci_main.c
101266 +++ b/sound/pci/ymfpci/ymfpci_main.c
101267 @@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct snd_ymfpci *chip)
101268 if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
101269 break;
101270 }
101271 - if (atomic_read(&chip->interrupt_sleep_count)) {
101272 - atomic_set(&chip->interrupt_sleep_count, 0);
101273 + if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
101274 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
101275 wake_up(&chip->interrupt_sleep);
101276 }
101277 __end:
101278 @@ -787,7 +787,7 @@ static void snd_ymfpci_irq_wait(struct snd_ymfpci *chip)
101279 continue;
101280 init_waitqueue_entry(&wait, current);
101281 add_wait_queue(&chip->interrupt_sleep, &wait);
101282 - atomic_inc(&chip->interrupt_sleep_count);
101283 + atomic_inc_unchecked(&chip->interrupt_sleep_count);
101284 schedule_timeout_uninterruptible(msecs_to_jiffies(50));
101285 remove_wait_queue(&chip->interrupt_sleep, &wait);
101286 }
101287 @@ -825,8 +825,8 @@ static irqreturn_t snd_ymfpci_interrupt(int irq, void *dev_id)
101288 snd_ymfpci_writel(chip, YDSXGR_MODE, mode);
101289 spin_unlock(&chip->reg_lock);
101290
101291 - if (atomic_read(&chip->interrupt_sleep_count)) {
101292 - atomic_set(&chip->interrupt_sleep_count, 0);
101293 + if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
101294 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
101295 wake_up(&chip->interrupt_sleep);
101296 }
101297 }
101298 @@ -2421,7 +2421,7 @@ int snd_ymfpci_create(struct snd_card *card,
101299 spin_lock_init(&chip->reg_lock);
101300 spin_lock_init(&chip->voice_lock);
101301 init_waitqueue_head(&chip->interrupt_sleep);
101302 - atomic_set(&chip->interrupt_sleep_count, 0);
101303 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
101304 chip->card = card;
101305 chip->pci = pci;
101306 chip->irq = -1;
101307 diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
101308 index 6b81d0c..031c056 100644
101309 --- a/sound/soc/fsl/fsl_ssi.c
101310 +++ b/sound/soc/fsl/fsl_ssi.c
101311 @@ -864,7 +864,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
101312 {
101313 struct fsl_ssi_private *ssi_private;
101314 int ret = 0;
101315 - struct device_attribute *dev_attr = NULL;
101316 + device_attribute_no_const *dev_attr = NULL;
101317 struct device_node *np = pdev->dev.of_node;
101318 const char *p, *sprop;
101319 const uint32_t *iprop;
101320 diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
101321 index 1a38be0..66809d1 100644
101322 --- a/sound/soc/soc-core.c
101323 +++ b/sound/soc/soc-core.c
101324 @@ -2248,8 +2248,10 @@ int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops,
101325 if (ret)
101326 return ret;
101327
101328 - ops->warm_reset = snd_soc_ac97_warm_reset;
101329 - ops->reset = snd_soc_ac97_reset;
101330 + pax_open_kernel();
101331 + *(void **)&ops->warm_reset = snd_soc_ac97_warm_reset;
101332 + *(void **)&ops->reset = snd_soc_ac97_reset;
101333 + pax_close_kernel();
101334
101335 snd_ac97_rst_cfg = cfg;
101336 return 0;
101337 diff --git a/tools/gcc/.gitignore b/tools/gcc/.gitignore
101338 new file mode 100644
101339 index 0000000..50f2f2f
101340 --- /dev/null
101341 +++ b/tools/gcc/.gitignore
101342 @@ -0,0 +1 @@
101343 +size_overflow_hash.h
101344 diff --git a/tools/gcc/Makefile b/tools/gcc/Makefile
101345 new file mode 100644
101346 index 0000000..144dbee
101347 --- /dev/null
101348 +++ b/tools/gcc/Makefile
101349 @@ -0,0 +1,45 @@
101350 +#CC := gcc
101351 +#PLUGIN_SOURCE_FILES := pax_plugin.c
101352 +#PLUGIN_OBJECT_FILES := $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES))
101353 +GCCPLUGINS_DIR := $(shell $(CC) -print-file-name=plugin)
101354 +#CFLAGS += -I$(GCCPLUGINS_DIR)/include -fPIC -O2 -Wall -W -std=gnu99
101355 +
101356 +ifeq ($(PLUGINCC),$(HOSTCC))
101357 +HOSTLIBS := hostlibs
101358 +HOST_EXTRACFLAGS += -I$(GCCPLUGINS_DIR)/include -std=gnu99 -ggdb
101359 +else
101360 +HOSTLIBS := hostcxxlibs
101361 +HOST_EXTRACXXFLAGS += -I$(GCCPLUGINS_DIR)/include -std=gnu++98 -ggdb -Wno-unused-parameter
101362 +endif
101363 +
101364 +$(HOSTLIBS)-$(CONFIG_PAX_CONSTIFY_PLUGIN) := constify_plugin.so
101365 +$(HOSTLIBS)-$(CONFIG_PAX_MEMORY_STACKLEAK) += stackleak_plugin.so
101366 +$(HOSTLIBS)-$(CONFIG_KALLOCSTAT_PLUGIN) += kallocstat_plugin.so
101367 +$(HOSTLIBS)-$(CONFIG_PAX_KERNEXEC_PLUGIN) += kernexec_plugin.so
101368 +$(HOSTLIBS)-$(CONFIG_CHECKER_PLUGIN) += checker_plugin.so
101369 +$(HOSTLIBS)-y += colorize_plugin.so
101370 +$(HOSTLIBS)-$(CONFIG_PAX_SIZE_OVERFLOW) += size_overflow_plugin.so
101371 +$(HOSTLIBS)-$(CONFIG_PAX_LATENT_ENTROPY) += latent_entropy_plugin.so
101372 +$(HOSTLIBS)-$(CONFIG_PAX_MEMORY_STRUCTLEAK) += structleak_plugin.so
101373 +
101374 +always := $($(HOSTLIBS)-y)
101375 +
101376 +constify_plugin-objs := constify_plugin.o
101377 +stackleak_plugin-objs := stackleak_plugin.o
101378 +kallocstat_plugin-objs := kallocstat_plugin.o
101379 +kernexec_plugin-objs := kernexec_plugin.o
101380 +checker_plugin-objs := checker_plugin.o
101381 +colorize_plugin-objs := colorize_plugin.o
101382 +size_overflow_plugin-objs := size_overflow_plugin.o
101383 +latent_entropy_plugin-objs := latent_entropy_plugin.o
101384 +structleak_plugin-objs := structleak_plugin.o
101385 +
101386 +$(obj)/size_overflow_plugin.o: $(objtree)/$(obj)/size_overflow_hash.h
101387 +
101388 +quiet_cmd_build_size_overflow_hash = GENHASH $@
101389 + cmd_build_size_overflow_hash = \
101390 + $(CONFIG_SHELL) $(srctree)/$(src)/generate_size_overflow_hash.sh -d $< -o $@
101391 +$(objtree)/$(obj)/size_overflow_hash.h: $(src)/size_overflow_hash.data FORCE
101392 + $(call if_changed,build_size_overflow_hash)
101393 +
101394 +targets += size_overflow_hash.h
101395 diff --git a/tools/gcc/checker_plugin.c b/tools/gcc/checker_plugin.c
101396 new file mode 100644
101397 index 0000000..22f03c0
101398 --- /dev/null
101399 +++ b/tools/gcc/checker_plugin.c
101400 @@ -0,0 +1,172 @@
101401 +/*
101402 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
101403 + * Licensed under the GPL v2
101404 + *
101405 + * Note: the choice of the license means that the compilation process is
101406 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
101407 + * but for the kernel it doesn't matter since it doesn't link against
101408 + * any of the gcc libraries
101409 + *
101410 + * gcc plugin to implement various sparse (source code checker) features
101411 + *
101412 + * TODO:
101413 + * - define separate __iomem, __percpu and __rcu address spaces (lots of code to patch)
101414 + *
101415 + * BUGS:
101416 + * - none known
101417 + */
101418 +#include "gcc-plugin.h"
101419 +#include "config.h"
101420 +#include "system.h"
101421 +#include "coretypes.h"
101422 +#include "tree.h"
101423 +#include "tree-pass.h"
101424 +#include "flags.h"
101425 +#include "intl.h"
101426 +#include "toplev.h"
101427 +#include "plugin.h"
101428 +//#include "expr.h" where are you...
101429 +#include "diagnostic.h"
101430 +#include "plugin-version.h"
101431 +#include "tm.h"
101432 +#include "function.h"
101433 +#include "basic-block.h"
101434 +#include "gimple.h"
101435 +#include "rtl.h"
101436 +#include "emit-rtl.h"
101437 +#include "tree-flow.h"
101438 +#include "target.h"
101439 +
101440 +extern void c_register_addr_space (const char *str, addr_space_t as);
101441 +extern enum machine_mode default_addr_space_pointer_mode (addr_space_t);
101442 +extern enum machine_mode default_addr_space_address_mode (addr_space_t);
101443 +extern bool default_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as);
101444 +extern bool default_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as);
101445 +extern rtx default_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as);
101446 +
101447 +extern void print_gimple_stmt(FILE *, gimple, int, int);
101448 +extern rtx emit_move_insn(rtx x, rtx y);
101449 +
101450 +int plugin_is_GPL_compatible;
101451 +
101452 +static struct plugin_info checker_plugin_info = {
101453 + .version = "201111150100",
101454 + .help = NULL,
101455 +};
101456 +
101457 +#define ADDR_SPACE_KERNEL 0
101458 +#define ADDR_SPACE_FORCE_KERNEL 1
101459 +#define ADDR_SPACE_USER 2
101460 +#define ADDR_SPACE_FORCE_USER 3
101461 +#define ADDR_SPACE_IOMEM 0
101462 +#define ADDR_SPACE_FORCE_IOMEM 0
101463 +#define ADDR_SPACE_PERCPU 0
101464 +#define ADDR_SPACE_FORCE_PERCPU 0
101465 +#define ADDR_SPACE_RCU 0
101466 +#define ADDR_SPACE_FORCE_RCU 0
101467 +
101468 +static enum machine_mode checker_addr_space_pointer_mode(addr_space_t addrspace)
101469 +{
101470 + return default_addr_space_pointer_mode(ADDR_SPACE_GENERIC);
101471 +}
101472 +
101473 +static enum machine_mode checker_addr_space_address_mode(addr_space_t addrspace)
101474 +{
101475 + return default_addr_space_address_mode(ADDR_SPACE_GENERIC);
101476 +}
101477 +
101478 +static bool checker_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as)
101479 +{
101480 + return default_addr_space_valid_pointer_mode(mode, as);
101481 +}
101482 +
101483 +static bool checker_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as)
101484 +{
101485 + return default_addr_space_legitimate_address_p(mode, mem, strict, ADDR_SPACE_GENERIC);
101486 +}
101487 +
101488 +static rtx checker_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as)
101489 +{
101490 + return default_addr_space_legitimize_address(x, oldx, mode, as);
101491 +}
101492 +
101493 +static bool checker_addr_space_subset_p(addr_space_t subset, addr_space_t superset)
101494 +{
101495 + if (subset == ADDR_SPACE_FORCE_KERNEL && superset == ADDR_SPACE_KERNEL)
101496 + return true;
101497 +
101498 + if (subset == ADDR_SPACE_FORCE_USER && superset == ADDR_SPACE_USER)
101499 + return true;
101500 +
101501 + if (subset == ADDR_SPACE_FORCE_IOMEM && superset == ADDR_SPACE_IOMEM)
101502 + return true;
101503 +
101504 + if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_USER)
101505 + return true;
101506 +
101507 + if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_IOMEM)
101508 + return true;
101509 +
101510 + if (subset == ADDR_SPACE_USER && superset == ADDR_SPACE_FORCE_KERNEL)
101511 + return true;
101512 +
101513 + if (subset == ADDR_SPACE_IOMEM && superset == ADDR_SPACE_FORCE_KERNEL)
101514 + return true;
101515 +
101516 + return subset == superset;
101517 +}
101518 +
101519 +static rtx checker_addr_space_convert(rtx op, tree from_type, tree to_type)
101520 +{
101521 +// addr_space_t from_as = TYPE_ADDR_SPACE(TREE_TYPE(from_type));
101522 +// addr_space_t to_as = TYPE_ADDR_SPACE(TREE_TYPE(to_type));
101523 +
101524 + return op;
101525 +}
101526 +
101527 +static void register_checker_address_spaces(void *event_data, void *data)
101528 +{
101529 + c_register_addr_space("__kernel", ADDR_SPACE_KERNEL);
101530 + c_register_addr_space("__force_kernel", ADDR_SPACE_FORCE_KERNEL);
101531 + c_register_addr_space("__user", ADDR_SPACE_USER);
101532 + c_register_addr_space("__force_user", ADDR_SPACE_FORCE_USER);
101533 +// c_register_addr_space("__iomem", ADDR_SPACE_IOMEM);
101534 +// c_register_addr_space("__force_iomem", ADDR_SPACE_FORCE_IOMEM);
101535 +// c_register_addr_space("__percpu", ADDR_SPACE_PERCPU);
101536 +// c_register_addr_space("__force_percpu", ADDR_SPACE_FORCE_PERCPU);
101537 +// c_register_addr_space("__rcu", ADDR_SPACE_RCU);
101538 +// c_register_addr_space("__force_rcu", ADDR_SPACE_FORCE_RCU);
101539 +
101540 + targetm.addr_space.pointer_mode = checker_addr_space_pointer_mode;
101541 + targetm.addr_space.address_mode = checker_addr_space_address_mode;
101542 + targetm.addr_space.valid_pointer_mode = checker_addr_space_valid_pointer_mode;
101543 + targetm.addr_space.legitimate_address_p = checker_addr_space_legitimate_address_p;
101544 +// targetm.addr_space.legitimize_address = checker_addr_space_legitimize_address;
101545 + targetm.addr_space.subset_p = checker_addr_space_subset_p;
101546 + targetm.addr_space.convert = checker_addr_space_convert;
101547 +}
101548 +
101549 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
101550 +{
101551 + const char * const plugin_name = plugin_info->base_name;
101552 + const int argc = plugin_info->argc;
101553 + const struct plugin_argument * const argv = plugin_info->argv;
101554 + int i;
101555 +
101556 + if (!plugin_default_version_check(version, &gcc_version)) {
101557 + error(G_("incompatible gcc/plugin versions"));
101558 + return 1;
101559 + }
101560 +
101561 + register_callback(plugin_name, PLUGIN_INFO, NULL, &checker_plugin_info);
101562 +
101563 + for (i = 0; i < argc; ++i)
101564 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
101565 +
101566 + if (TARGET_64BIT == 0)
101567 + return 0;
101568 +
101569 + register_callback(plugin_name, PLUGIN_PRAGMAS, register_checker_address_spaces, NULL);
101570 +
101571 + return 0;
101572 +}
101573 diff --git a/tools/gcc/colorize_plugin.c b/tools/gcc/colorize_plugin.c
101574 new file mode 100644
101575 index 0000000..414fe5e
101576 --- /dev/null
101577 +++ b/tools/gcc/colorize_plugin.c
101578 @@ -0,0 +1,151 @@
101579 +/*
101580 + * Copyright 2012-2013 by PaX Team <pageexec@freemail.hu>
101581 + * Licensed under the GPL v2
101582 + *
101583 + * Note: the choice of the license means that the compilation process is
101584 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
101585 + * but for the kernel it doesn't matter since it doesn't link against
101586 + * any of the gcc libraries
101587 + *
101588 + * gcc plugin to colorize diagnostic output
101589 + *
101590 + */
101591 +
101592 +#include "gcc-plugin.h"
101593 +#include "config.h"
101594 +#include "system.h"
101595 +#include "coretypes.h"
101596 +#include "tree.h"
101597 +#include "tree-pass.h"
101598 +#include "flags.h"
101599 +#include "intl.h"
101600 +#include "toplev.h"
101601 +#include "plugin.h"
101602 +#include "diagnostic.h"
101603 +#include "plugin-version.h"
101604 +#include "tm.h"
101605 +
101606 +int plugin_is_GPL_compatible;
101607 +
101608 +static struct plugin_info colorize_plugin_info = {
101609 + .version = "201302112000",
101610 + .help = NULL,
101611 +};
101612 +
101613 +#define GREEN "\033[32m\033[2m"
101614 +#define LIGHTGREEN "\033[32m\033[1m"
101615 +#define YELLOW "\033[33m\033[2m"
101616 +#define LIGHTYELLOW "\033[33m\033[1m"
101617 +#define RED "\033[31m\033[2m"
101618 +#define LIGHTRED "\033[31m\033[1m"
101619 +#define BLUE "\033[34m\033[2m"
101620 +#define LIGHTBLUE "\033[34m\033[1m"
101621 +#define BRIGHT "\033[m\033[1m"
101622 +#define NORMAL "\033[m"
101623 +
101624 +static diagnostic_starter_fn old_starter;
101625 +static diagnostic_finalizer_fn old_finalizer;
101626 +
101627 +static void start_colorize(diagnostic_context *context, diagnostic_info *diagnostic)
101628 +{
101629 + const char *color;
101630 + char *newprefix;
101631 +
101632 + switch (diagnostic->kind) {
101633 + case DK_NOTE:
101634 + color = LIGHTBLUE;
101635 + break;
101636 +
101637 + case DK_PEDWARN:
101638 + case DK_WARNING:
101639 + color = LIGHTYELLOW;
101640 + break;
101641 +
101642 + case DK_ERROR:
101643 + case DK_FATAL:
101644 + case DK_ICE:
101645 + case DK_PERMERROR:
101646 + case DK_SORRY:
101647 + color = LIGHTRED;
101648 + break;
101649 +
101650 + default:
101651 + color = NORMAL;
101652 + }
101653 +
101654 + old_starter(context, diagnostic);
101655 + if (-1 == asprintf(&newprefix, "%s%s" NORMAL, color, context->printer->prefix))
101656 + return;
101657 + pp_destroy_prefix(context->printer);
101658 + pp_set_prefix(context->printer, newprefix);
101659 +}
101660 +
101661 +static void finalize_colorize(diagnostic_context *context, diagnostic_info *diagnostic)
101662 +{
101663 + old_finalizer(context, diagnostic);
101664 +}
101665 +
101666 +static void colorize_arm(void)
101667 +{
101668 + old_starter = diagnostic_starter(global_dc);
101669 + old_finalizer = diagnostic_finalizer(global_dc);
101670 +
101671 + diagnostic_starter(global_dc) = start_colorize;
101672 + diagnostic_finalizer(global_dc) = finalize_colorize;
101673 +}
101674 +
101675 +static unsigned int execute_colorize_rearm(void)
101676 +{
101677 + if (diagnostic_starter(global_dc) == start_colorize)
101678 + return 0;
101679 +
101680 + colorize_arm();
101681 + return 0;
101682 +}
101683 +
101684 +struct simple_ipa_opt_pass pass_ipa_colorize_rearm = {
101685 + .pass = {
101686 + .type = SIMPLE_IPA_PASS,
101687 + .name = "colorize_rearm",
101688 +#if BUILDING_GCC_VERSION >= 4008
101689 + .optinfo_flags = OPTGROUP_NONE,
101690 +#endif
101691 + .gate = NULL,
101692 + .execute = execute_colorize_rearm,
101693 + .sub = NULL,
101694 + .next = NULL,
101695 + .static_pass_number = 0,
101696 + .tv_id = TV_NONE,
101697 + .properties_required = 0,
101698 + .properties_provided = 0,
101699 + .properties_destroyed = 0,
101700 + .todo_flags_start = 0,
101701 + .todo_flags_finish = 0
101702 + }
101703 +};
101704 +
101705 +static void colorize_start_unit(void *gcc_data, void *user_data)
101706 +{
101707 + colorize_arm();
101708 +}
101709 +
101710 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
101711 +{
101712 + const char * const plugin_name = plugin_info->base_name;
101713 + struct register_pass_info colorize_rearm_pass_info = {
101714 + .pass = &pass_ipa_colorize_rearm.pass,
101715 + .reference_pass_name = "*free_lang_data",
101716 + .ref_pass_instance_number = 1,
101717 + .pos_op = PASS_POS_INSERT_AFTER
101718 + };
101719 +
101720 + if (!plugin_default_version_check(version, &gcc_version)) {
101721 + error(G_("incompatible gcc/plugin versions"));
101722 + return 1;
101723 + }
101724 +
101725 + register_callback(plugin_name, PLUGIN_INFO, NULL, &colorize_plugin_info);
101726 + register_callback(plugin_name, PLUGIN_START_UNIT, &colorize_start_unit, NULL);
101727 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &colorize_rearm_pass_info);
101728 + return 0;
101729 +}
101730 diff --git a/tools/gcc/constify_plugin.c b/tools/gcc/constify_plugin.c
101731 new file mode 100644
101732 index 0000000..ba59e50
101733 --- /dev/null
101734 +++ b/tools/gcc/constify_plugin.c
101735 @@ -0,0 +1,558 @@
101736 +/*
101737 + * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
101738 + * Copyright 2011-2013 by PaX Team <pageexec@freemail.hu>
101739 + * Licensed under the GPL v2, or (at your option) v3
101740 + *
101741 + * This gcc plugin constifies all structures which contain only function pointers or are explicitly marked for constification.
101742 + *
101743 + * Homepage:
101744 + * http://www.grsecurity.net/~ephox/const_plugin/
101745 + *
101746 + * Usage:
101747 + * $ gcc -I`gcc -print-file-name=plugin`/include -fPIC -shared -O2 -o constify_plugin.so constify_plugin.c
101748 + * $ gcc -fplugin=constify_plugin.so test.c -O2
101749 + */
101750 +
101751 +#include "gcc-plugin.h"
101752 +#include "config.h"
101753 +#include "system.h"
101754 +#include "coretypes.h"
101755 +#include "tree.h"
101756 +#include "tree-pass.h"
101757 +#include "flags.h"
101758 +#include "intl.h"
101759 +#include "toplev.h"
101760 +#include "plugin.h"
101761 +#include "diagnostic.h"
101762 +#include "plugin-version.h"
101763 +#include "tm.h"
101764 +#include "function.h"
101765 +#include "basic-block.h"
101766 +#include "gimple.h"
101767 +#include "rtl.h"
101768 +#include "emit-rtl.h"
101769 +#include "tree-flow.h"
101770 +#include "target.h"
101771 +#include "langhooks.h"
101772 +
101773 +// should come from c-tree.h if only it were installed for gcc 4.5...
101774 +#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1(TYPE)
101775 +
101776 +// unused type flag in all versions 4.5-4.8
101777 +#define TYPE_CONSTIFY_VISITED(TYPE) TYPE_LANG_FLAG_4(TYPE)
101778 +
101779 +int plugin_is_GPL_compatible;
101780 +
101781 +static struct plugin_info const_plugin_info = {
101782 + .version = "201312032345",
101783 + .help = "no-constify\tturn off constification\n",
101784 +};
101785 +
101786 +typedef struct {
101787 + bool has_fptr_field;
101788 + bool has_writable_field;
101789 + bool has_do_const_field;
101790 + bool has_no_const_field;
101791 +} constify_info;
101792 +
101793 +static const_tree get_field_type(const_tree field)
101794 +{
101795 + return strip_array_types(TREE_TYPE(field));
101796 +}
101797 +
101798 +static bool is_fptr(const_tree field)
101799 +{
101800 + const_tree ptr = get_field_type(field);
101801 +
101802 + if (TREE_CODE(ptr) != POINTER_TYPE)
101803 + return false;
101804 +
101805 + return TREE_CODE(TREE_TYPE(ptr)) == FUNCTION_TYPE;
101806 +}
101807 +
101808 +/*
101809 + * determine whether the given structure type meets the requirements for automatic constification,
101810 + * including the constification attributes on nested structure types
101811 + */
101812 +static void constifiable(const_tree node, constify_info *cinfo)
101813 +{
101814 + const_tree field;
101815 +
101816 + gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);
101817 +
101818 + // e.g., pointer to structure fields while still constructing the structure type
101819 + if (TYPE_FIELDS(node) == NULL_TREE)
101820 + return;
101821 +
101822 + for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
101823 + const_tree type = get_field_type(field);
101824 + enum tree_code code = TREE_CODE(type);
101825 +
101826 + if (node == type)
101827 + continue;
101828 +
101829 + if (is_fptr(field))
101830 + cinfo->has_fptr_field = true;
101831 + else if (!TREE_READONLY(field))
101832 + cinfo->has_writable_field = true;
101833 +
101834 + if (code == RECORD_TYPE || code == UNION_TYPE) {
101835 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type)))
101836 + cinfo->has_do_const_field = true;
101837 + else if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type)))
101838 + cinfo->has_no_const_field = true;
101839 + else
101840 + constifiable(type, cinfo);
101841 + }
101842 + }
101843 +}
101844 +
101845 +static bool constified(const_tree node)
101846 +{
101847 + constify_info cinfo = {
101848 + .has_fptr_field = false,
101849 + .has_writable_field = false,
101850 + .has_do_const_field = false,
101851 + .has_no_const_field = false
101852 + };
101853 +
101854 + gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);
101855 +
101856 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(node))) {
101857 + gcc_assert(!TYPE_READONLY(node));
101858 + return false;
101859 + }
101860 +
101861 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(node))) {
101862 + gcc_assert(TYPE_READONLY(node));
101863 + return true;
101864 + }
101865 +
101866 + constifiable(node, &cinfo);
101867 + if ((!cinfo.has_fptr_field || cinfo.has_writable_field) && !cinfo.has_do_const_field)
101868 + return false;
101869 +
101870 + return TYPE_READONLY(node);
101871 +}
101872 +
101873 +static void deconstify_tree(tree node);
101874 +
101875 +static void deconstify_type(tree type)
101876 +{
101877 + tree field;
101878 +
101879 + gcc_assert(TREE_CODE(type) == RECORD_TYPE || TREE_CODE(type) == UNION_TYPE);
101880 +
101881 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
101882 + const_tree fieldtype = get_field_type(field);
101883 +
101884 + // special case handling of simple ptr-to-same-array-type members
101885 + if (TREE_CODE(TREE_TYPE(field)) == POINTER_TYPE) {
101886 + const_tree ptrtype = TREE_TYPE(TREE_TYPE(field));
101887 +
101888 + if (TREE_CODE(ptrtype) != RECORD_TYPE && TREE_CODE(ptrtype) != UNION_TYPE)
101889 + continue;
101890 + if (TREE_TYPE(TREE_TYPE(field)) == type)
101891 + continue;
101892 + if (TYPE_MAIN_VARIANT(ptrtype) == TYPE_MAIN_VARIANT(type)) {
101893 + TREE_TYPE(field) = copy_node(TREE_TYPE(field));
101894 + TREE_TYPE(TREE_TYPE(field)) = type;
101895 + }
101896 + continue;
101897 + }
101898 + if (TREE_CODE(fieldtype) != RECORD_TYPE && TREE_CODE(fieldtype) != UNION_TYPE)
101899 + continue;
101900 + if (!constified(fieldtype))
101901 + continue;
101902 +
101903 + deconstify_tree(field);
101904 + TREE_READONLY(field) = 0;
101905 + }
101906 + TYPE_READONLY(type) = 0;
101907 + C_TYPE_FIELDS_READONLY(type) = 0;
101908 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type)))
101909 + TYPE_ATTRIBUTES(type) = remove_attribute("do_const", TYPE_ATTRIBUTES(type));
101910 +}
101911 +
101912 +static void deconstify_tree(tree node)
101913 +{
101914 + tree old_type, new_type, field;
101915 +
101916 + old_type = TREE_TYPE(node);
101917 + while (TREE_CODE(old_type) == ARRAY_TYPE && TREE_CODE(TREE_TYPE(old_type)) != ARRAY_TYPE) {
101918 + node = TREE_TYPE(node) = copy_node(old_type);
101919 + old_type = TREE_TYPE(old_type);
101920 + }
101921 +
101922 + gcc_assert(TREE_CODE(old_type) == RECORD_TYPE || TREE_CODE(old_type) == UNION_TYPE);
101923 + gcc_assert(TYPE_READONLY(old_type) && (TYPE_QUALS(old_type) & TYPE_QUAL_CONST));
101924 +
101925 + new_type = build_qualified_type(old_type, TYPE_QUALS(old_type) & ~TYPE_QUAL_CONST);
101926 + TYPE_FIELDS(new_type) = copy_list(TYPE_FIELDS(new_type));
101927 + for (field = TYPE_FIELDS(new_type); field; field = TREE_CHAIN(field))
101928 + DECL_FIELD_CONTEXT(field) = new_type;
101929 +
101930 + deconstify_type(new_type);
101931 +
101932 + TREE_TYPE(node) = new_type;
101933 +}
101934 +
101935 +static tree handle_no_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
101936 +{
101937 + tree type;
101938 + constify_info cinfo = {
101939 + .has_fptr_field = false,
101940 + .has_writable_field = false,
101941 + .has_do_const_field = false,
101942 + .has_no_const_field = false
101943 + };
101944 +
101945 + *no_add_attrs = true;
101946 + if (TREE_CODE(*node) == FUNCTION_DECL) {
101947 + error("%qE attribute does not apply to functions (%qF)", name, *node);
101948 + return NULL_TREE;
101949 + }
101950 +
101951 + if (TREE_CODE(*node) == PARM_DECL) {
101952 + error("%qE attribute does not apply to function parameters (%qD)", name, *node);
101953 + return NULL_TREE;
101954 + }
101955 +
101956 + if (TREE_CODE(*node) == VAR_DECL) {
101957 + error("%qE attribute does not apply to variables (%qD)", name, *node);
101958 + return NULL_TREE;
101959 + }
101960 +
101961 + if (TYPE_P(*node)) {
101962 + *no_add_attrs = false;
101963 + type = *node;
101964 + } else {
101965 + gcc_assert(TREE_CODE(*node) == TYPE_DECL);
101966 + type = TREE_TYPE(*node);
101967 + }
101968 +
101969 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE) {
101970 + error("%qE attribute used on %qT applies to struct and union types only", name, type);
101971 + return NULL_TREE;
101972 + }
101973 +
101974 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(type))) {
101975 + error("%qE attribute is already applied to the type %qT", name, type);
101976 + return NULL_TREE;
101977 + }
101978 +
101979 + if (TYPE_P(*node)) {
101980 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type)))
101981 + error("%qE attribute used on type %qT is incompatible with 'do_const'", name, type);
101982 + return NULL_TREE;
101983 + }
101984 +
101985 + constifiable(type, &cinfo);
101986 + if ((cinfo.has_fptr_field && !cinfo.has_writable_field) || lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
101987 + deconstify_tree(*node);
101988 + TYPE_CONSTIFY_VISITED(TREE_TYPE(*node)) = 1;
101989 + return NULL_TREE;
101990 + }
101991 +
101992 + error("%qE attribute used on type %qT that is not constified", name, type);
101993 + return NULL_TREE;
101994 +}
101995 +
101996 +static void constify_type(tree type)
101997 +{
101998 + TYPE_READONLY(type) = 1;
101999 + C_TYPE_FIELDS_READONLY(type) = 1;
102000 + TYPE_CONSTIFY_VISITED(type) = 1;
102001 +// TYPE_ATTRIBUTES(type) = tree_cons(get_identifier("do_const"), NULL_TREE, TYPE_ATTRIBUTES(type));
102002 +}
102003 +
102004 +static tree handle_do_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
102005 +{
102006 + *no_add_attrs = true;
102007 + if (!TYPE_P(*node)) {
102008 + error("%qE attribute applies to types only (%qD)", name, *node);
102009 + return NULL_TREE;
102010 + }
102011 +
102012 + if (TREE_CODE(*node) != RECORD_TYPE && TREE_CODE(*node) != UNION_TYPE) {
102013 + error("%qE attribute used on %qT applies to struct and union types only", name, *node);
102014 + return NULL_TREE;
102015 + }
102016 +
102017 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(*node))) {
102018 + error("%qE attribute used on %qT is already applied to the type", name, *node);
102019 + return NULL_TREE;
102020 + }
102021 +
102022 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(*node))) {
102023 + error("%qE attribute used on %qT is incompatible with 'no_const'", name, *node);
102024 + return NULL_TREE;
102025 + }
102026 +
102027 + *no_add_attrs = false;
102028 + return NULL_TREE;
102029 +}
102030 +
102031 +static struct attribute_spec no_const_attr = {
102032 + .name = "no_const",
102033 + .min_length = 0,
102034 + .max_length = 0,
102035 + .decl_required = false,
102036 + .type_required = false,
102037 + .function_type_required = false,
102038 + .handler = handle_no_const_attribute,
102039 +#if BUILDING_GCC_VERSION >= 4007
102040 + .affects_type_identity = true
102041 +#endif
102042 +};
102043 +
102044 +static struct attribute_spec do_const_attr = {
102045 + .name = "do_const",
102046 + .min_length = 0,
102047 + .max_length = 0,
102048 + .decl_required = false,
102049 + .type_required = false,
102050 + .function_type_required = false,
102051 + .handler = handle_do_const_attribute,
102052 +#if BUILDING_GCC_VERSION >= 4007
102053 + .affects_type_identity = true
102054 +#endif
102055 +};
102056 +
102057 +static void register_attributes(void *event_data, void *data)
102058 +{
102059 + register_attribute(&no_const_attr);
102060 + register_attribute(&do_const_attr);
102061 +}
102062 +
102063 +static void finish_type(void *event_data, void *data)
102064 +{
102065 + tree type = (tree)event_data;
102066 + constify_info cinfo = {
102067 + .has_fptr_field = false,
102068 + .has_writable_field = false,
102069 + .has_do_const_field = false,
102070 + .has_no_const_field = false
102071 + };
102072 +
102073 + if (type == NULL_TREE || type == error_mark_node)
102074 + return;
102075 +
102076 + if (TYPE_FIELDS(type) == NULL_TREE || TYPE_CONSTIFY_VISITED(type))
102077 + return;
102078 +
102079 + constifiable(type, &cinfo);
102080 +
102081 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type))) {
102082 + if ((cinfo.has_fptr_field && !cinfo.has_writable_field) || cinfo.has_do_const_field) {
102083 + deconstify_type(type);
102084 + TYPE_CONSTIFY_VISITED(type) = 1;
102085 + } else
102086 + error("'no_const' attribute used on type %qT that is not constified", type);
102087 + return;
102088 + }
102089 +
102090 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
102091 + if (!cinfo.has_writable_field) {
102092 + error("'do_const' attribute used on type %qT that is%sconstified", type, cinfo.has_fptr_field ? " " : " not ");
102093 + return;
102094 + }
102095 + constify_type(type);
102096 + return;
102097 + }
102098 +
102099 + if (cinfo.has_fptr_field && !cinfo.has_writable_field) {
102100 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
102101 + error("'do_const' attribute used on type %qT that is constified", type);
102102 + return;
102103 + }
102104 + constify_type(type);
102105 + return;
102106 + }
102107 +
102108 + deconstify_type(type);
102109 + TYPE_CONSTIFY_VISITED(type) = 1;
102110 +}
102111 +
102112 +static void check_global_variables(void)
102113 +{
102114 + struct varpool_node *node;
102115 +
102116 +#if BUILDING_GCC_VERSION <= 4007
102117 + for (node = varpool_nodes; node; node = node->next) {
102118 + tree var = node->decl;
102119 +#else
102120 + FOR_EACH_VARIABLE(node) {
102121 + tree var = node->symbol.decl;
102122 +#endif
102123 + tree type = TREE_TYPE(var);
102124 +
102125 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
102126 + continue;
102127 +
102128 + if (!TYPE_READONLY(type) || !C_TYPE_FIELDS_READONLY(type))
102129 + continue;
102130 +
102131 + if (!TYPE_CONSTIFY_VISITED(type))
102132 + continue;
102133 +
102134 + if (DECL_EXTERNAL(var))
102135 + continue;
102136 +
102137 + if (DECL_INITIAL(var))
102138 + continue;
102139 +
102140 + // this works around a gcc bug/feature where uninitialized globals
102141 + // are moved into the .bss section regardless of any constification
102142 + DECL_INITIAL(var) = build_constructor(type, NULL);
102143 +// inform(DECL_SOURCE_LOCATION(var), "constified variable %qE moved into .rodata", var);
102144 + }
102145 +}
102146 +
102147 +static unsigned int check_local_variables(void)
102148 +{
102149 + unsigned int ret = 0;
102150 + tree var;
102151 +
102152 +#if BUILDING_GCC_VERSION == 4005
102153 + tree vars;
102154 +#else
102155 + unsigned int i;
102156 +#endif
102157 +
102158 +#if BUILDING_GCC_VERSION == 4005
102159 + for (vars = cfun->local_decls; vars; vars = TREE_CHAIN(vars)) {
102160 + var = TREE_VALUE(vars);
102161 +#else
102162 + FOR_EACH_LOCAL_DECL(cfun, i, var) {
102163 +#endif
102164 + tree type = TREE_TYPE(var);
102165 +
102166 + gcc_assert(DECL_P(var));
102167 + if (is_global_var(var))
102168 + continue;
102169 +
102170 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
102171 + continue;
102172 +
102173 + if (!TYPE_READONLY(type) || !C_TYPE_FIELDS_READONLY(type))
102174 + continue;
102175 +
102176 + if (!TYPE_CONSTIFY_VISITED(type))
102177 + continue;
102178 +
102179 + error_at(DECL_SOURCE_LOCATION(var), "constified variable %qE cannot be local", var);
102180 + ret = 1;
102181 + }
102182 + return ret;
102183 +}
102184 +
102185 +static unsigned int check_variables(void)
102186 +{
102187 + check_global_variables();
102188 + return check_local_variables();
102189 +}
102190 +
102191 +static struct gimple_opt_pass pass_local_variable = {
102192 + {
102193 + .type = GIMPLE_PASS,
102194 + .name = "check_variables",
102195 +#if BUILDING_GCC_VERSION >= 4008
102196 + .optinfo_flags = OPTGROUP_NONE,
102197 +#endif
102198 + .gate = NULL,
102199 + .execute = check_variables,
102200 + .sub = NULL,
102201 + .next = NULL,
102202 + .static_pass_number = 0,
102203 + .tv_id = TV_NONE,
102204 + .properties_required = 0,
102205 + .properties_provided = 0,
102206 + .properties_destroyed = 0,
102207 + .todo_flags_start = 0,
102208 + .todo_flags_finish = 0
102209 + }
102210 +};
102211 +
102212 +static struct {
102213 + const char *name;
102214 + const char *asm_op;
102215 +} sections[] = {
102216 + {".init.rodata", "\t.section\t.init.rodata,\"a\""},
102217 + {".ref.rodata", "\t.section\t.ref.rodata,\"a\""},
102218 + {".devinit.rodata", "\t.section\t.devinit.rodata,\"a\""},
102219 + {".devexit.rodata", "\t.section\t.devexit.rodata,\"a\""},
102220 + {".cpuinit.rodata", "\t.section\t.cpuinit.rodata,\"a\""},
102221 + {".cpuexit.rodata", "\t.section\t.cpuexit.rodata,\"a\""},
102222 + {".meminit.rodata", "\t.section\t.meminit.rodata,\"a\""},
102223 + {".memexit.rodata", "\t.section\t.memexit.rodata,\"a\""},
102224 + {".data..read_only", "\t.section\t.data..read_only,\"a\""},
102225 +};
102226 +
102227 +static unsigned int (*old_section_type_flags)(tree decl, const char *name, int reloc);
102228 +
102229 +static unsigned int constify_section_type_flags(tree decl, const char *name, int reloc)
102230 +{
102231 + size_t i;
102232 +
102233 + for (i = 0; i < ARRAY_SIZE(sections); i++)
102234 + if (!strcmp(sections[i].name, name))
102235 + return 0;
102236 + return old_section_type_flags(decl, name, reloc);
102237 +}
102238 +
102239 +static void constify_start_unit(void *gcc_data, void *user_data)
102240 +{
102241 +// size_t i;
102242 +
102243 +// for (i = 0; i < ARRAY_SIZE(sections); i++)
102244 +// sections[i].section = get_unnamed_section(0, output_section_asm_op, sections[i].asm_op);
102245 +// sections[i].section = get_section(sections[i].name, 0, NULL);
102246 +
102247 + old_section_type_flags = targetm.section_type_flags;
102248 + targetm.section_type_flags = constify_section_type_flags;
102249 +}
102250 +
102251 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
102252 +{
102253 + const char * const plugin_name = plugin_info->base_name;
102254 + const int argc = plugin_info->argc;
102255 + const struct plugin_argument * const argv = plugin_info->argv;
102256 + int i;
102257 + bool constify = true;
102258 +
102259 + struct register_pass_info local_variable_pass_info = {
102260 + .pass = &pass_local_variable.pass,
102261 + .reference_pass_name = "ssa",
102262 + .ref_pass_instance_number = 1,
102263 + .pos_op = PASS_POS_INSERT_BEFORE
102264 + };
102265 +
102266 + if (!plugin_default_version_check(version, &gcc_version)) {
102267 + error(G_("incompatible gcc/plugin versions"));
102268 + return 1;
102269 + }
102270 +
102271 + for (i = 0; i < argc; ++i) {
102272 + if (!(strcmp(argv[i].key, "no-constify"))) {
102273 + constify = false;
102274 + continue;
102275 + }
102276 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
102277 + }
102278 +
102279 + if (strcmp(lang_hooks.name, "GNU C")) {
102280 + inform(UNKNOWN_LOCATION, G_("%s supports C only"), plugin_name);
102281 + constify = false;
102282 + }
102283 +
102284 + register_callback(plugin_name, PLUGIN_INFO, NULL, &const_plugin_info);
102285 + if (constify) {
102286 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
102287 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &local_variable_pass_info);
102288 + register_callback(plugin_name, PLUGIN_START_UNIT, constify_start_unit, NULL);
102289 + }
102290 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
102291 +
102292 + return 0;
102293 +}
102294 diff --git a/tools/gcc/generate_size_overflow_hash.sh b/tools/gcc/generate_size_overflow_hash.sh
102295 new file mode 100644
102296 index 0000000..e518932
102297 --- /dev/null
102298 +++ b/tools/gcc/generate_size_overflow_hash.sh
102299 @@ -0,0 +1,94 @@
102300 +#!/bin/bash
102301 +
102302 +# This script generates the hash table (size_overflow_hash.h) for the size_overflow gcc plugin (size_overflow_plugin.c).
102303 +
102304 +header1="size_overflow_hash.h"
102305 +database="size_overflow_hash.data"
102306 +n=65536
102307 +
102308 +usage() {
102309 +cat <<EOF
102310 +usage: $0 options
102311 +OPTIONS:
102312 + -h|--help help
102313 + -o header file
102314 + -d database file
102315 + -n hash array size
102316 +EOF
102317 + return 0
102318 +}
102319 +
102320 +while true
102321 +do
102322 + case "$1" in
102323 + -h|--help) usage && exit 0;;
102324 + -n) n=$2; shift 2;;
102325 + -o) header1="$2"; shift 2;;
102326 + -d) database="$2"; shift 2;;
102327 + --) shift 1; break ;;
102328 + *) break ;;
102329 + esac
102330 +done
102331 +
102332 +create_defines() {
102333 + for i in `seq 0 31`
102334 + do
102335 + echo -e "#define PARAM"$i" (1U << "$i")" >> "$header1"
102336 + done
102337 + echo >> "$header1"
102338 +}
102339 +
102340 +create_structs() {
102341 + rm -f "$header1"
102342 +
102343 + create_defines
102344 +
102345 + cat "$database" | while read data
102346 + do
102347 + data_array=($data)
102348 + struct_hash_name="${data_array[0]}"
102349 + funcn="${data_array[1]}"
102350 + params="${data_array[2]}"
102351 + next="${data_array[4]}"
102352 +
102353 + echo "const struct size_overflow_hash $struct_hash_name = {" >> "$header1"
102354 +
102355 + echo -e "\t.next\t= $next,\n\t.name\t= \"$funcn\"," >> "$header1"
102356 + echo -en "\t.param\t= " >> "$header1"
102357 + line=
102358 + for param_num in ${params//-/ };
102359 + do
102360 + line="${line}PARAM"$param_num"|"
102361 + done
102362 +
102363 + echo -e "${line%?},\n};\n" >> "$header1"
102364 + done
102365 +}
102366 +
102367 +create_headers() {
102368 + echo "const struct size_overflow_hash * const size_overflow_hash[$n] = {" >> "$header1"
102369 +}
102370 +
102371 +create_array_elements() {
102372 + index=0
102373 + grep -v "nohasharray" $database | sort -n -k 4 | while read data
102374 + do
102375 + data_array=($data)
102376 + i="${data_array[3]}"
102377 + hash="${data_array[0]}"
102378 + while [[ $index -lt $i ]]
102379 + do
102380 + echo -e "\t["$index"]\t= NULL," >> "$header1"
102381 + index=$(($index + 1))
102382 + done
102383 + index=$(($index + 1))
102384 + echo -e "\t["$i"]\t= &"$hash"," >> "$header1"
102385 + done
102386 + echo '};' >> $header1
102387 +}
102388 +
102389 +create_structs
102390 +create_headers
102391 +create_array_elements
102392 +
102393 +exit 0
102394 diff --git a/tools/gcc/kallocstat_plugin.c b/tools/gcc/kallocstat_plugin.c
102395 new file mode 100644
102396 index 0000000..568b360
102397 --- /dev/null
102398 +++ b/tools/gcc/kallocstat_plugin.c
102399 @@ -0,0 +1,170 @@
102400 +/*
102401 + * Copyright 2011-2013 by the PaX Team <pageexec@freemail.hu>
102402 + * Licensed under the GPL v2
102403 + *
102404 + * Note: the choice of the license means that the compilation process is
102405 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
102406 + * but for the kernel it doesn't matter since it doesn't link against
102407 + * any of the gcc libraries
102408 + *
102409 + * gcc plugin to find the distribution of k*alloc sizes
102410 + *
102411 + * TODO:
102412 + *
102413 + * BUGS:
102414 + * - none known
102415 + */
102416 +#include "gcc-plugin.h"
102417 +#include "config.h"
102418 +#include "system.h"
102419 +#include "coretypes.h"
102420 +#include "tree.h"
102421 +#include "tree-pass.h"
102422 +#include "flags.h"
102423 +#include "intl.h"
102424 +#include "toplev.h"
102425 +#include "plugin.h"
102426 +//#include "expr.h" where are you...
102427 +#include "diagnostic.h"
102428 +#include "plugin-version.h"
102429 +#include "tm.h"
102430 +#include "function.h"
102431 +#include "basic-block.h"
102432 +#include "gimple.h"
102433 +#include "rtl.h"
102434 +#include "emit-rtl.h"
102435 +
102436 +extern void print_gimple_stmt(FILE *, gimple, int, int);
102437 +
102438 +int plugin_is_GPL_compatible;
102439 +
102440 +static const char * const kalloc_functions[] = {
102441 + "__kmalloc",
102442 + "kmalloc",
102443 + "kmalloc_large",
102444 + "kmalloc_node",
102445 + "kmalloc_order",
102446 + "kmalloc_order_trace",
102447 + "kmalloc_slab",
102448 + "kzalloc",
102449 + "kzalloc_node",
102450 +};
102451 +
102452 +static struct plugin_info kallocstat_plugin_info = {
102453 + .version = "201302112000",
102454 +};
102455 +
102456 +static unsigned int execute_kallocstat(void);
102457 +
102458 +static struct gimple_opt_pass kallocstat_pass = {
102459 + .pass = {
102460 + .type = GIMPLE_PASS,
102461 + .name = "kallocstat",
102462 +#if BUILDING_GCC_VERSION >= 4008
102463 + .optinfo_flags = OPTGROUP_NONE,
102464 +#endif
102465 + .gate = NULL,
102466 + .execute = execute_kallocstat,
102467 + .sub = NULL,
102468 + .next = NULL,
102469 + .static_pass_number = 0,
102470 + .tv_id = TV_NONE,
102471 + .properties_required = 0,
102472 + .properties_provided = 0,
102473 + .properties_destroyed = 0,
102474 + .todo_flags_start = 0,
102475 + .todo_flags_finish = 0
102476 + }
102477 +};
102478 +
102479 +static bool is_kalloc(const char *fnname)
102480 +{
102481 + size_t i;
102482 +
102483 + for (i = 0; i < ARRAY_SIZE(kalloc_functions); i++)
102484 + if (!strcmp(fnname, kalloc_functions[i]))
102485 + return true;
102486 + return false;
102487 +}
102488 +
102489 +static unsigned int execute_kallocstat(void)
102490 +{
102491 + basic_block bb;
102492 +
102493 + // 1. loop through BBs and GIMPLE statements
102494 + FOR_EACH_BB(bb) {
102495 + gimple_stmt_iterator gsi;
102496 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
102497 + // gimple match:
102498 + tree fndecl, size;
102499 + gimple call_stmt;
102500 + const char *fnname;
102501 +
102502 + // is it a call
102503 + call_stmt = gsi_stmt(gsi);
102504 + if (!is_gimple_call(call_stmt))
102505 + continue;
102506 + fndecl = gimple_call_fndecl(call_stmt);
102507 + if (fndecl == NULL_TREE)
102508 + continue;
102509 + if (TREE_CODE(fndecl) != FUNCTION_DECL)
102510 + continue;
102511 +
102512 + // is it a call to k*alloc
102513 + fnname = IDENTIFIER_POINTER(DECL_NAME(fndecl));
102514 + if (!is_kalloc(fnname))
102515 + continue;
102516 +
102517 + // is the size arg the result of a simple const assignment
102518 + size = gimple_call_arg(call_stmt, 0);
102519 + while (true) {
102520 + gimple def_stmt;
102521 + expanded_location xloc;
102522 + size_t size_val;
102523 +
102524 + if (TREE_CODE(size) != SSA_NAME)
102525 + break;
102526 + def_stmt = SSA_NAME_DEF_STMT(size);
102527 + if (!def_stmt || !is_gimple_assign(def_stmt))
102528 + break;
102529 + if (gimple_num_ops(def_stmt) != 2)
102530 + break;
102531 + size = gimple_assign_rhs1(def_stmt);
102532 + if (!TREE_CONSTANT(size))
102533 + continue;
102534 + xloc = expand_location(gimple_location(def_stmt));
102535 + if (!xloc.file)
102536 + xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl));
102537 + size_val = TREE_INT_CST_LOW(size);
102538 + fprintf(stderr, "kallocsize: %8zu %8zx %s %s:%u\n", size_val, size_val, fnname, xloc.file, xloc.line);
102539 + break;
102540 + }
102541 +//print_gimple_stmt(stderr, call_stmt, 0, TDF_LINENO);
102542 +//debug_tree(gimple_call_fn(call_stmt));
102543 +//print_node(stderr, "pax", fndecl, 4);
102544 + }
102545 + }
102546 +
102547 + return 0;
102548 +}
102549 +
102550 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
102551 +{
102552 + const char * const plugin_name = plugin_info->base_name;
102553 + struct register_pass_info kallocstat_pass_info = {
102554 + .pass = &kallocstat_pass.pass,
102555 + .reference_pass_name = "ssa",
102556 + .ref_pass_instance_number = 1,
102557 + .pos_op = PASS_POS_INSERT_AFTER
102558 + };
102559 +
102560 + if (!plugin_default_version_check(version, &gcc_version)) {
102561 + error(G_("incompatible gcc/plugin versions"));
102562 + return 1;
102563 + }
102564 +
102565 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kallocstat_plugin_info);
102566 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kallocstat_pass_info);
102567 +
102568 + return 0;
102569 +}
102570 diff --git a/tools/gcc/kernexec_plugin.c b/tools/gcc/kernexec_plugin.c
102571 new file mode 100644
102572 index 0000000..a25306b
102573 --- /dev/null
102574 +++ b/tools/gcc/kernexec_plugin.c
102575 @@ -0,0 +1,474 @@
102576 +/*
102577 + * Copyright 2011-2013 by the PaX Team <pageexec@freemail.hu>
102578 + * Licensed under the GPL v2
102579 + *
102580 + * Note: the choice of the license means that the compilation process is
102581 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
102582 + * but for the kernel it doesn't matter since it doesn't link against
102583 + * any of the gcc libraries
102584 + *
102585 + * gcc plugin to make KERNEXEC/amd64 almost as good as it is on i386
102586 + *
102587 + * TODO:
102588 + *
102589 + * BUGS:
102590 + * - none known
102591 + */
102592 +#include "gcc-plugin.h"
102593 +#include "config.h"
102594 +#include "system.h"
102595 +#include "coretypes.h"
102596 +#include "tree.h"
102597 +#include "tree-pass.h"
102598 +#include "flags.h"
102599 +#include "intl.h"
102600 +#include "toplev.h"
102601 +#include "plugin.h"
102602 +//#include "expr.h" where are you...
102603 +#include "diagnostic.h"
102604 +#include "plugin-version.h"
102605 +#include "tm.h"
102606 +#include "function.h"
102607 +#include "basic-block.h"
102608 +#include "gimple.h"
102609 +#include "rtl.h"
102610 +#include "emit-rtl.h"
102611 +#include "tree-flow.h"
102612 +
102613 +extern void print_gimple_stmt(FILE *, gimple, int, int);
102614 +extern rtx emit_move_insn(rtx x, rtx y);
102615 +
102616 +#if BUILDING_GCC_VERSION <= 4006
102617 +#define ANY_RETURN_P(rtx) (GET_CODE(rtx) == RETURN)
102618 +#endif
102619 +
102620 +#if BUILDING_GCC_VERSION >= 4008
102621 +#define TODO_dump_func 0
102622 +#endif
102623 +
102624 +int plugin_is_GPL_compatible;
102625 +
102626 +static struct plugin_info kernexec_plugin_info = {
102627 + .version = "201308230150",
102628 + .help = "method=[bts|or]\tinstrumentation method\n"
102629 +};
102630 +
102631 +static unsigned int execute_kernexec_reload(void);
102632 +static unsigned int execute_kernexec_fptr(void);
102633 +static unsigned int execute_kernexec_retaddr(void);
102634 +static bool kernexec_cmodel_check(void);
102635 +
102636 +static void (*kernexec_instrument_fptr)(gimple_stmt_iterator *);
102637 +static void (*kernexec_instrument_retaddr)(rtx);
102638 +
102639 +static struct gimple_opt_pass kernexec_reload_pass = {
102640 + .pass = {
102641 + .type = GIMPLE_PASS,
102642 + .name = "kernexec_reload",
102643 +#if BUILDING_GCC_VERSION >= 4008
102644 + .optinfo_flags = OPTGROUP_NONE,
102645 +#endif
102646 + .gate = kernexec_cmodel_check,
102647 + .execute = execute_kernexec_reload,
102648 + .sub = NULL,
102649 + .next = NULL,
102650 + .static_pass_number = 0,
102651 + .tv_id = TV_NONE,
102652 + .properties_required = 0,
102653 + .properties_provided = 0,
102654 + .properties_destroyed = 0,
102655 + .todo_flags_start = 0,
102656 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa_no_phi
102657 + }
102658 +};
102659 +
102660 +static struct gimple_opt_pass kernexec_fptr_pass = {
102661 + .pass = {
102662 + .type = GIMPLE_PASS,
102663 + .name = "kernexec_fptr",
102664 +#if BUILDING_GCC_VERSION >= 4008
102665 + .optinfo_flags = OPTGROUP_NONE,
102666 +#endif
102667 + .gate = kernexec_cmodel_check,
102668 + .execute = execute_kernexec_fptr,
102669 + .sub = NULL,
102670 + .next = NULL,
102671 + .static_pass_number = 0,
102672 + .tv_id = TV_NONE,
102673 + .properties_required = 0,
102674 + .properties_provided = 0,
102675 + .properties_destroyed = 0,
102676 + .todo_flags_start = 0,
102677 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa_no_phi
102678 + }
102679 +};
102680 +
102681 +static struct rtl_opt_pass kernexec_retaddr_pass = {
102682 + .pass = {
102683 + .type = RTL_PASS,
102684 + .name = "kernexec_retaddr",
102685 +#if BUILDING_GCC_VERSION >= 4008
102686 + .optinfo_flags = OPTGROUP_NONE,
102687 +#endif
102688 + .gate = kernexec_cmodel_check,
102689 + .execute = execute_kernexec_retaddr,
102690 + .sub = NULL,
102691 + .next = NULL,
102692 + .static_pass_number = 0,
102693 + .tv_id = TV_NONE,
102694 + .properties_required = 0,
102695 + .properties_provided = 0,
102696 + .properties_destroyed = 0,
102697 + .todo_flags_start = 0,
102698 + .todo_flags_finish = TODO_dump_func | TODO_ggc_collect
102699 + }
102700 +};
102701 +
102702 +static bool kernexec_cmodel_check(void)
102703 +{
102704 + tree section;
102705 +
102706 + if (ix86_cmodel != CM_KERNEL)
102707 + return false;
102708 +
102709 + section = lookup_attribute("section", DECL_ATTRIBUTES(current_function_decl));
102710 + if (!section || !TREE_VALUE(section))
102711 + return true;
102712 +
102713 + section = TREE_VALUE(TREE_VALUE(section));
102714 + if (strncmp(TREE_STRING_POINTER(section), ".vsyscall_", 10))
102715 + return true;
102716 +
102717 + return false;
102718 +}
102719 +
102720 +/*
102721 + * add special KERNEXEC instrumentation: reload %r12 after it has been clobbered
102722 + */
102723 +static void kernexec_reload_fptr_mask(gimple_stmt_iterator *gsi)
102724 +{
102725 + gimple asm_movabs_stmt;
102726 +
102727 + // build asm volatile("movabs $0x8000000000000000, %%r12\n\t" : : : );
102728 + asm_movabs_stmt = gimple_build_asm_vec("movabs $0x8000000000000000, %%r12\n\t", NULL, NULL, NULL, NULL);
102729 + gimple_asm_set_volatile(asm_movabs_stmt, true);
102730 + gsi_insert_after(gsi, asm_movabs_stmt, GSI_CONTINUE_LINKING);
102731 + update_stmt(asm_movabs_stmt);
102732 +}
102733 +
102734 +/*
102735 + * find all asm() stmts that clobber r12 and add a reload of r12
102736 + */
102737 +static unsigned int execute_kernexec_reload(void)
102738 +{
102739 + basic_block bb;
102740 +
102741 + // 1. loop through BBs and GIMPLE statements
102742 + FOR_EACH_BB(bb) {
102743 + gimple_stmt_iterator gsi;
102744 +
102745 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
102746 + // gimple match: __asm__ ("" : : : "r12");
102747 + gimple asm_stmt;
102748 + size_t nclobbers;
102749 +
102750 + // is it an asm ...
102751 + asm_stmt = gsi_stmt(gsi);
102752 + if (gimple_code(asm_stmt) != GIMPLE_ASM)
102753 + continue;
102754 +
102755 + // ... clobbering r12
102756 + nclobbers = gimple_asm_nclobbers(asm_stmt);
102757 + while (nclobbers--) {
102758 + tree op = gimple_asm_clobber_op(asm_stmt, nclobbers);
102759 + if (strcmp(TREE_STRING_POINTER(TREE_VALUE(op)), "r12"))
102760 + continue;
102761 + kernexec_reload_fptr_mask(&gsi);
102762 +//print_gimple_stmt(stderr, asm_stmt, 0, TDF_LINENO);
102763 + break;
102764 + }
102765 + }
102766 + }
102767 +
102768 + return 0;
102769 +}
102770 +
102771 +/*
102772 + * add special KERNEXEC instrumentation: force MSB of fptr to 1, which will produce
102773 + * a non-canonical address from a userland ptr and will just trigger a GPF on dereference
102774 + */
102775 +static void kernexec_instrument_fptr_bts(gimple_stmt_iterator *gsi)
102776 +{
102777 + gimple assign_intptr, assign_new_fptr, call_stmt;
102778 + tree intptr, orptr, old_fptr, new_fptr, kernexec_mask;
102779 +
102780 + call_stmt = gsi_stmt(*gsi);
102781 + old_fptr = gimple_call_fn(call_stmt);
102782 +
102783 + // create temporary unsigned long variable used for bitops and cast fptr to it
102784 + intptr = create_tmp_var(long_unsigned_type_node, "kernexec_bts");
102785 +#if BUILDING_GCC_VERSION <= 4007
102786 + add_referenced_var(intptr);
102787 +#endif
102788 + intptr = make_ssa_name(intptr, NULL);
102789 + assign_intptr = gimple_build_assign(intptr, fold_convert(long_unsigned_type_node, old_fptr));
102790 + SSA_NAME_DEF_STMT(intptr) = assign_intptr;
102791 + gsi_insert_before(gsi, assign_intptr, GSI_SAME_STMT);
102792 + update_stmt(assign_intptr);
102793 +
102794 + // apply logical or to temporary unsigned long and bitmask
102795 + kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0x8000000000000000LL);
102796 +// kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0xffffffff80000000LL);
102797 + orptr = fold_build2(BIT_IOR_EXPR, long_long_unsigned_type_node, intptr, kernexec_mask);
102798 + intptr = make_ssa_name(SSA_NAME_VAR(intptr), NULL);
102799 + assign_intptr = gimple_build_assign(intptr, orptr);
102800 + SSA_NAME_DEF_STMT(intptr) = assign_intptr;
102801 + gsi_insert_before(gsi, assign_intptr, GSI_SAME_STMT);
102802 + update_stmt(assign_intptr);
102803 +
102804 + // cast temporary unsigned long back to a temporary fptr variable
102805 + new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_fptr");
102806 +#if BUILDING_GCC_VERSION <= 4007
102807 + add_referenced_var(new_fptr);
102808 +#endif
102809 + new_fptr = make_ssa_name(new_fptr, NULL);
102810 + assign_new_fptr = gimple_build_assign(new_fptr, fold_convert(TREE_TYPE(old_fptr), intptr));
102811 + SSA_NAME_DEF_STMT(new_fptr) = assign_new_fptr;
102812 + gsi_insert_before(gsi, assign_new_fptr, GSI_SAME_STMT);
102813 + update_stmt(assign_new_fptr);
102814 +
102815 + // replace call stmt fn with the new fptr
102816 + gimple_call_set_fn(call_stmt, new_fptr);
102817 + update_stmt(call_stmt);
102818 +}
102819 +
102820 +static void kernexec_instrument_fptr_or(gimple_stmt_iterator *gsi)
102821 +{
102822 + gimple asm_or_stmt, call_stmt;
102823 + tree old_fptr, new_fptr, input, output;
102824 +#if BUILDING_GCC_VERSION <= 4007
102825 + VEC(tree, gc) *inputs = NULL;
102826 + VEC(tree, gc) *outputs = NULL;
102827 +#else
102828 + vec<tree, va_gc> *inputs = NULL;
102829 + vec<tree, va_gc> *outputs = NULL;
102830 +#endif
102831 +
102832 + call_stmt = gsi_stmt(*gsi);
102833 + old_fptr = gimple_call_fn(call_stmt);
102834 +
102835 + // create temporary fptr variable
102836 + new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_or");
102837 +#if BUILDING_GCC_VERSION <= 4007
102838 + add_referenced_var(new_fptr);
102839 +#endif
102840 + new_fptr = make_ssa_name(new_fptr, NULL);
102841 +
102842 + // build asm volatile("orq %%r12, %0\n\t" : "=r"(new_fptr) : "0"(old_fptr));
102843 + input = build_tree_list(NULL_TREE, build_string(1, "0"));
102844 + input = chainon(NULL_TREE, build_tree_list(input, old_fptr));
102845 + output = build_tree_list(NULL_TREE, build_string(2, "=r"));
102846 + output = chainon(NULL_TREE, build_tree_list(output, new_fptr));
102847 +#if BUILDING_GCC_VERSION <= 4007
102848 + VEC_safe_push(tree, gc, inputs, input);
102849 + VEC_safe_push(tree, gc, outputs, output);
102850 +#else
102851 + vec_safe_push(inputs, input);
102852 + vec_safe_push(outputs, output);
102853 +#endif
102854 + asm_or_stmt = gimple_build_asm_vec("orq %%r12, %0\n\t", inputs, outputs, NULL, NULL);
102855 + SSA_NAME_DEF_STMT(new_fptr) = asm_or_stmt;
102856 + gimple_asm_set_volatile(asm_or_stmt, true);
102857 + gsi_insert_before(gsi, asm_or_stmt, GSI_SAME_STMT);
102858 + update_stmt(asm_or_stmt);
102859 +
102860 + // replace call stmt fn with the new fptr
102861 + gimple_call_set_fn(call_stmt, new_fptr);
102862 + update_stmt(call_stmt);
102863 +}
102864 +
102865 +/*
102866 + * find all C level function pointer dereferences and forcibly set the highest bit of the pointer
102867 + */
102868 +static unsigned int execute_kernexec_fptr(void)
102869 +{
102870 + basic_block bb;
102871 +
102872 + // 1. loop through BBs and GIMPLE statements
102873 + FOR_EACH_BB(bb) {
102874 + gimple_stmt_iterator gsi;
102875 +
102876 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
102877 + // gimple match: h_1 = get_fptr (); D.2709_3 = h_1 (x_2(D));
102878 + tree fn;
102879 + gimple call_stmt;
102880 +
102881 + // is it a call ...
102882 + call_stmt = gsi_stmt(gsi);
102883 + if (!is_gimple_call(call_stmt))
102884 + continue;
102885 + fn = gimple_call_fn(call_stmt);
102886 + if (TREE_CODE(fn) == ADDR_EXPR)
102887 + continue;
102888 + if (TREE_CODE(fn) != SSA_NAME)
102889 + gcc_unreachable();
102890 +
102891 + // ... through a function pointer
102892 + if (SSA_NAME_VAR(fn) != NULL_TREE) {
102893 + fn = SSA_NAME_VAR(fn);
102894 + if (TREE_CODE(fn) != VAR_DECL && TREE_CODE(fn) != PARM_DECL) {
102895 + debug_tree(fn);
102896 + gcc_unreachable();
102897 + }
102898 + }
102899 + fn = TREE_TYPE(fn);
102900 + if (TREE_CODE(fn) != POINTER_TYPE)
102901 + continue;
102902 + fn = TREE_TYPE(fn);
102903 + if (TREE_CODE(fn) != FUNCTION_TYPE)
102904 + continue;
102905 +
102906 + kernexec_instrument_fptr(&gsi);
102907 +
102908 +//debug_tree(gimple_call_fn(call_stmt));
102909 +//print_gimple_stmt(stderr, call_stmt, 0, TDF_LINENO);
102910 + }
102911 + }
102912 +
102913 + return 0;
102914 +}
102915 +
102916 +// add special KERNEXEC instrumentation: btsq $63,(%rsp) just before retn
102917 +static void kernexec_instrument_retaddr_bts(rtx insn)
102918 +{
102919 + rtx btsq;
102920 + rtvec argvec, constraintvec, labelvec;
102921 + int line;
102922 +
102923 + // create asm volatile("btsq $63,(%%rsp)":::)
102924 + argvec = rtvec_alloc(0);
102925 + constraintvec = rtvec_alloc(0);
102926 + labelvec = rtvec_alloc(0);
102927 + line = expand_location(RTL_LOCATION(insn)).line;
102928 + btsq = gen_rtx_ASM_OPERANDS(VOIDmode, "btsq $63,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
102929 + MEM_VOLATILE_P(btsq) = 1;
102930 +// RTX_FRAME_RELATED_P(btsq) = 1; // not for ASM_OPERANDS
102931 + emit_insn_before(btsq, insn);
102932 +}
102933 +
102934 +// add special KERNEXEC instrumentation: orq %r12,(%rsp) just before retn
102935 +static void kernexec_instrument_retaddr_or(rtx insn)
102936 +{
102937 + rtx orq;
102938 + rtvec argvec, constraintvec, labelvec;
102939 + int line;
102940 +
102941 + // create asm volatile("orq %%r12,(%%rsp)":::)
102942 + argvec = rtvec_alloc(0);
102943 + constraintvec = rtvec_alloc(0);
102944 + labelvec = rtvec_alloc(0);
102945 + line = expand_location(RTL_LOCATION(insn)).line;
102946 + orq = gen_rtx_ASM_OPERANDS(VOIDmode, "orq %%r12,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
102947 + MEM_VOLATILE_P(orq) = 1;
102948 +// RTX_FRAME_RELATED_P(orq) = 1; // not for ASM_OPERANDS
102949 + emit_insn_before(orq, insn);
102950 +}
102951 +
102952 +/*
102953 + * find all asm level function returns and forcibly set the highest bit of the return address
102954 + */
102955 +static unsigned int execute_kernexec_retaddr(void)
102956 +{
102957 + rtx insn;
102958 +
102959 +// if (stack_realign_drap)
102960 +// inform(DECL_SOURCE_LOCATION(current_function_decl), "drap detected in %s\n", IDENTIFIER_POINTER(DECL_NAME(current_function_decl)));
102961 +
102962 + // 1. find function returns
102963 + for (insn = get_insns(); insn; insn = NEXT_INSN(insn)) {
102964 + // rtl match: (jump_insn 41 40 42 2 (return) fptr.c:42 634 {return_internal} (nil))
102965 + // (jump_insn 12 9 11 2 (parallel [ (return) (unspec [ (0) ] UNSPEC_REP) ]) fptr.c:46 635 {return_internal_long} (nil))
102966 + // (jump_insn 97 96 98 6 (simple_return) fptr.c:50 -1 (nil) -> simple_return)
102967 + rtx body;
102968 +
102969 + // is it a retn
102970 + if (!JUMP_P(insn))
102971 + continue;
102972 + body = PATTERN(insn);
102973 + if (GET_CODE(body) == PARALLEL)
102974 + body = XVECEXP(body, 0, 0);
102975 + if (!ANY_RETURN_P(body))
102976 + continue;
102977 + kernexec_instrument_retaddr(insn);
102978 + }
102979 +
102980 +// print_simple_rtl(stderr, get_insns());
102981 +// print_rtl(stderr, get_insns());
102982 +
102983 + return 0;
102984 +}
102985 +
102986 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
102987 +{
102988 + const char * const plugin_name = plugin_info->base_name;
102989 + const int argc = plugin_info->argc;
102990 + const struct plugin_argument * const argv = plugin_info->argv;
102991 + int i;
102992 + struct register_pass_info kernexec_reload_pass_info = {
102993 + .pass = &kernexec_reload_pass.pass,
102994 + .reference_pass_name = "ssa",
102995 + .ref_pass_instance_number = 1,
102996 + .pos_op = PASS_POS_INSERT_AFTER
102997 + };
102998 + struct register_pass_info kernexec_fptr_pass_info = {
102999 + .pass = &kernexec_fptr_pass.pass,
103000 + .reference_pass_name = "ssa",
103001 + .ref_pass_instance_number = 1,
103002 + .pos_op = PASS_POS_INSERT_AFTER
103003 + };
103004 + struct register_pass_info kernexec_retaddr_pass_info = {
103005 + .pass = &kernexec_retaddr_pass.pass,
103006 + .reference_pass_name = "pro_and_epilogue",
103007 + .ref_pass_instance_number = 1,
103008 + .pos_op = PASS_POS_INSERT_AFTER
103009 + };
103010 +
103011 + if (!plugin_default_version_check(version, &gcc_version)) {
103012 + error(G_("incompatible gcc/plugin versions"));
103013 + return 1;
103014 + }
103015 +
103016 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kernexec_plugin_info);
103017 +
103018 + if (TARGET_64BIT == 0)
103019 + return 0;
103020 +
103021 + for (i = 0; i < argc; ++i) {
103022 + if (!strcmp(argv[i].key, "method")) {
103023 + if (!argv[i].value) {
103024 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
103025 + continue;
103026 + }
103027 + if (!strcmp(argv[i].value, "bts")) {
103028 + kernexec_instrument_fptr = kernexec_instrument_fptr_bts;
103029 + kernexec_instrument_retaddr = kernexec_instrument_retaddr_bts;
103030 + } else if (!strcmp(argv[i].value, "or")) {
103031 + kernexec_instrument_fptr = kernexec_instrument_fptr_or;
103032 + kernexec_instrument_retaddr = kernexec_instrument_retaddr_or;
103033 + fix_register("r12", 1, 1);
103034 + } else
103035 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
103036 + continue;
103037 + }
103038 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
103039 + }
103040 + if (!kernexec_instrument_fptr || !kernexec_instrument_retaddr)
103041 + error(G_("no instrumentation method was selected via '-fplugin-arg-%s-method'"), plugin_name);
103042 +
103043 + if (kernexec_instrument_fptr == kernexec_instrument_fptr_or)
103044 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_reload_pass_info);
103045 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_fptr_pass_info);
103046 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_retaddr_pass_info);
103047 +
103048 + return 0;
103049 +}
103050 diff --git a/tools/gcc/latent_entropy_plugin.c b/tools/gcc/latent_entropy_plugin.c
103051 new file mode 100644
103052 index 0000000..679b9ef
103053 --- /dev/null
103054 +++ b/tools/gcc/latent_entropy_plugin.c
103055 @@ -0,0 +1,335 @@
103056 +/*
103057 + * Copyright 2012-2013 by the PaX Team <pageexec@freemail.hu>
103058 + * Licensed under the GPL v2
103059 + *
103060 + * Note: the choice of the license means that the compilation process is
103061 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
103062 + * but for the kernel it doesn't matter since it doesn't link against
103063 + * any of the gcc libraries
103064 + *
103065 + * gcc plugin to help generate a little bit of entropy from program state,
103066 + * used during boot in the kernel
103067 + *
103068 + * TODO:
103069 + * - add ipa pass to identify not explicitly marked candidate functions
103070 + * - mix in more program state (function arguments/return values, loop variables, etc)
103071 + * - more instrumentation control via attribute parameters
103072 + *
103073 + * BUGS:
103074 + * - LTO needs -flto-partition=none for now
103075 + */
103076 +#include "gcc-plugin.h"
103077 +#include "config.h"
103078 +#include "system.h"
103079 +#include "coretypes.h"
103080 +#include "tree.h"
103081 +#include "tree-pass.h"
103082 +#include "flags.h"
103083 +#include "intl.h"
103084 +#include "toplev.h"
103085 +#include "plugin.h"
103086 +//#include "expr.h" where are you...
103087 +#include "diagnostic.h"
103088 +#include "plugin-version.h"
103089 +#include "tm.h"
103090 +#include "function.h"
103091 +#include "basic-block.h"
103092 +#include "gimple.h"
103093 +#include "rtl.h"
103094 +#include "emit-rtl.h"
103095 +#include "tree-flow.h"
103096 +#include "langhooks.h"
103097 +
103098 +#if BUILDING_GCC_VERSION >= 4008
103099 +#define TODO_dump_func 0
103100 +#endif
103101 +
103102 +int plugin_is_GPL_compatible;
103103 +
103104 +static tree latent_entropy_decl;
103105 +
103106 +static struct plugin_info latent_entropy_plugin_info = {
103107 + .version = "201308230230",
103108 + .help = NULL
103109 +};
103110 +
103111 +static unsigned int execute_latent_entropy(void);
103112 +static bool gate_latent_entropy(void);
103113 +
103114 +static struct gimple_opt_pass latent_entropy_pass = {
103115 + .pass = {
103116 + .type = GIMPLE_PASS,
103117 + .name = "latent_entropy",
103118 +#if BUILDING_GCC_VERSION >= 4008
103119 + .optinfo_flags = OPTGROUP_NONE,
103120 +#endif
103121 + .gate = gate_latent_entropy,
103122 + .execute = execute_latent_entropy,
103123 + .sub = NULL,
103124 + .next = NULL,
103125 + .static_pass_number = 0,
103126 + .tv_id = TV_NONE,
103127 + .properties_required = PROP_gimple_leh | PROP_cfg,
103128 + .properties_provided = 0,
103129 + .properties_destroyed = 0,
103130 + .todo_flags_start = 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
103131 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa
103132 + }
103133 +};
103134 +
103135 +static unsigned HOST_WIDE_INT seed;
103136 +static unsigned HOST_WIDE_INT get_random_const(void)
103137 +{
103138 + seed = (seed >> 1U) ^ (-(seed & 1ULL) & 0xD800000000000000ULL);
103139 + return seed;
103140 +}
103141 +
103142 +static tree handle_latent_entropy_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
103143 +{
103144 + switch (TREE_CODE(*node)) {
103145 + default:
103146 + *no_add_attrs = true;
103147 + error("%qE attribute only applies to functions and variables", name);
103148 + break;
103149 +
103150 + case VAR_DECL:
103151 + if (DECL_INITIAL(*node)) {
103152 + *no_add_attrs = true;
103153 + error("variable %qD with %qE attribute must not be initialized", *node, name);
103154 + break;
103155 + }
103156 + DECL_INITIAL(*node) = build_int_cstu(long_long_unsigned_type_node, get_random_const());
103157 + break;
103158 +
103159 + case FUNCTION_DECL:
103160 + break;
103161 + }
103162 +
103163 + return NULL_TREE;
103164 +}
103165 +
103166 +static struct attribute_spec latent_entropy_attr = {
103167 + .name = "latent_entropy",
103168 + .min_length = 0,
103169 + .max_length = 0,
103170 + .decl_required = true,
103171 + .type_required = false,
103172 + .function_type_required = false,
103173 + .handler = handle_latent_entropy_attribute,
103174 +#if BUILDING_GCC_VERSION >= 4007
103175 + .affects_type_identity = false
103176 +#endif
103177 +};
103178 +
103179 +static void register_attributes(void *event_data, void *data)
103180 +{
103181 + register_attribute(&latent_entropy_attr);
103182 +}
103183 +
103184 +static bool gate_latent_entropy(void)
103185 +{
103186 + tree latent_entropy_attr;
103187 +
103188 + latent_entropy_attr = lookup_attribute("latent_entropy", DECL_ATTRIBUTES(current_function_decl));
103189 + return latent_entropy_attr != NULL_TREE;
103190 +}
103191 +
103192 +static enum tree_code get_op(tree *rhs)
103193 +{
103194 + static enum tree_code op;
103195 + unsigned HOST_WIDE_INT random_const;
103196 +
103197 + random_const = get_random_const();
103198 +
103199 + switch (op) {
103200 + case BIT_XOR_EXPR:
103201 + op = PLUS_EXPR;
103202 + break;
103203 +
103204 + case PLUS_EXPR:
103205 + if (rhs) {
103206 + op = LROTATE_EXPR;
103207 + random_const &= HOST_BITS_PER_WIDE_INT - 1;
103208 + break;
103209 + }
103210 +
103211 + case LROTATE_EXPR:
103212 + default:
103213 + op = BIT_XOR_EXPR;
103214 + break;
103215 + }
103216 + if (rhs)
103217 + *rhs = build_int_cstu(unsigned_intDI_type_node, random_const);
103218 + return op;
103219 +}
103220 +
103221 +static void perturb_local_entropy(basic_block bb, tree local_entropy)
103222 +{
103223 + gimple_stmt_iterator gsi;
103224 + gimple assign;
103225 + tree addxorrol, rhs;
103226 + enum tree_code op;
103227 +
103228 + op = get_op(&rhs);
103229 + addxorrol = fold_build2_loc(UNKNOWN_LOCATION, op, unsigned_intDI_type_node, local_entropy, rhs);
103230 + assign = gimple_build_assign(local_entropy, addxorrol);
103231 + gsi = gsi_after_labels(bb);
103232 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
103233 + update_stmt(assign);
103234 +//debug_bb(bb);
103235 +}
103236 +
103237 +static void perturb_latent_entropy(basic_block bb, tree rhs)
103238 +{
103239 + gimple_stmt_iterator gsi;
103240 + gimple assign;
103241 + tree addxorrol, temp;
103242 +
103243 + // 1. create temporary copy of latent_entropy
103244 + temp = create_tmp_var(unsigned_intDI_type_node, "temp_latent_entropy");
103245 +#if BUILDING_GCC_VERSION <= 4007
103246 + add_referenced_var(temp);
103247 +#endif
103248 +
103249 + // 2. read...
103250 + temp = make_ssa_name(temp, NULL);
103251 + assign = gimple_build_assign(temp, latent_entropy_decl);
103252 + SSA_NAME_DEF_STMT(temp) = assign;
103253 +#if BUILDING_GCC_VERSION <= 4007
103254 + add_referenced_var(latent_entropy_decl);
103255 +#endif
103256 + gsi = gsi_after_labels(bb);
103257 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
103258 + update_stmt(assign);
103259 +
103260 + // 3. ...modify...
103261 + addxorrol = fold_build2_loc(UNKNOWN_LOCATION, get_op(NULL), unsigned_intDI_type_node, temp, rhs);
103262 + temp = make_ssa_name(SSA_NAME_VAR(temp), NULL);
103263 + assign = gimple_build_assign(temp, addxorrol);
103264 + SSA_NAME_DEF_STMT(temp) = assign;
103265 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
103266 + update_stmt(assign);
103267 +
103268 + // 4. ...write latent_entropy
103269 + assign = gimple_build_assign(latent_entropy_decl, temp);
103270 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
103271 + update_stmt(assign);
103272 +}
103273 +
103274 +static unsigned int execute_latent_entropy(void)
103275 +{
103276 + basic_block bb;
103277 + gimple assign;
103278 + gimple_stmt_iterator gsi;
103279 + tree local_entropy;
103280 +
103281 + if (!latent_entropy_decl) {
103282 + struct varpool_node *node;
103283 +
103284 +#if BUILDING_GCC_VERSION <= 4007
103285 + for (node = varpool_nodes; node; node = node->next) {
103286 + tree var = node->decl;
103287 +#else
103288 + FOR_EACH_VARIABLE(node) {
103289 + tree var = node->symbol.decl;
103290 +#endif
103291 + if (strcmp(IDENTIFIER_POINTER(DECL_NAME(var)), "latent_entropy"))
103292 + continue;
103293 + latent_entropy_decl = var;
103294 +// debug_tree(var);
103295 + break;
103296 + }
103297 + if (!latent_entropy_decl) {
103298 +// debug_tree(current_function_decl);
103299 + return 0;
103300 + }
103301 + }
103302 +
103303 +//fprintf(stderr, "latent_entropy: %s\n", IDENTIFIER_POINTER(DECL_NAME(current_function_decl)));
103304 +
103305 + // 1. create local entropy variable
103306 + local_entropy = create_tmp_var(unsigned_intDI_type_node, "local_entropy");
103307 +#if BUILDING_GCC_VERSION <= 4007
103308 + add_referenced_var(local_entropy);
103309 + mark_sym_for_renaming(local_entropy);
103310 +#endif
103311 +
103312 + // 2. initialize local entropy variable
103313 + bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest;
103314 + if (dom_info_available_p(CDI_DOMINATORS))
103315 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR);
103316 + gsi = gsi_start_bb(bb);
103317 +
103318 + assign = gimple_build_assign(local_entropy, build_int_cstu(unsigned_intDI_type_node, get_random_const()));
103319 +// gimple_set_location(assign, loc);
103320 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
103321 + update_stmt(assign);
103322 +//debug_bb(bb);
103323 + bb = bb->next_bb;
103324 +
103325 + // 3. instrument each BB with an operation on the local entropy variable
103326 + while (bb != EXIT_BLOCK_PTR) {
103327 + perturb_local_entropy(bb, local_entropy);
103328 +//debug_bb(bb);
103329 + bb = bb->next_bb;
103330 + };
103331 +
103332 + // 4. mix local entropy into the global entropy variable
103333 + perturb_latent_entropy(EXIT_BLOCK_PTR->prev_bb, local_entropy);
103334 +//debug_bb(EXIT_BLOCK_PTR->prev_bb);
103335 + return 0;
103336 +}
103337 +
103338 +static void start_unit_callback(void *gcc_data, void *user_data)
103339 +{
103340 + tree latent_entropy_type;
103341 +
103342 +#if BUILDING_GCC_VERSION >= 4007
103343 + seed = get_random_seed(false);
103344 +#else
103345 + sscanf(get_random_seed(false), "%" HOST_WIDE_INT_PRINT "x", &seed);
103346 + seed *= seed;
103347 +#endif
103348 +
103349 + if (in_lto_p)
103350 + return;
103351 +
103352 + // extern volatile u64 latent_entropy
103353 + gcc_assert(TYPE_PRECISION(long_long_unsigned_type_node) == 64);
103354 + latent_entropy_type = build_qualified_type(long_long_unsigned_type_node, TYPE_QUALS(long_long_unsigned_type_node) | TYPE_QUAL_VOLATILE);
103355 + latent_entropy_decl = build_decl(UNKNOWN_LOCATION, VAR_DECL, get_identifier("latent_entropy"), latent_entropy_type);
103356 +
103357 + TREE_STATIC(latent_entropy_decl) = 1;
103358 + TREE_PUBLIC(latent_entropy_decl) = 1;
103359 + TREE_USED(latent_entropy_decl) = 1;
103360 + TREE_THIS_VOLATILE(latent_entropy_decl) = 1;
103361 + DECL_EXTERNAL(latent_entropy_decl) = 1;
103362 + DECL_ARTIFICIAL(latent_entropy_decl) = 1;
103363 + lang_hooks.decls.pushdecl(latent_entropy_decl);
103364 +// DECL_ASSEMBLER_NAME(latent_entropy_decl);
103365 +// varpool_finalize_decl(latent_entropy_decl);
103366 +// varpool_mark_needed_node(latent_entropy_decl);
103367 +}
103368 +
103369 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
103370 +{
103371 + const char * const plugin_name = plugin_info->base_name;
103372 + struct register_pass_info latent_entropy_pass_info = {
103373 + .pass = &latent_entropy_pass.pass,
103374 + .reference_pass_name = "optimized",
103375 + .ref_pass_instance_number = 1,
103376 + .pos_op = PASS_POS_INSERT_BEFORE
103377 + };
103378 +
103379 + if (!plugin_default_version_check(version, &gcc_version)) {
103380 + error(G_("incompatible gcc/plugin versions"));
103381 + return 1;
103382 + }
103383 +
103384 + register_callback(plugin_name, PLUGIN_INFO, NULL, &latent_entropy_plugin_info);
103385 + register_callback ("start_unit", PLUGIN_START_UNIT, &start_unit_callback, NULL);
103386 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &latent_entropy_pass_info);
103387 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
103388 +
103389 + return 0;
103390 +}
103391 diff --git a/tools/gcc/size_overflow_hash.data b/tools/gcc/size_overflow_hash.data
103392 new file mode 100644
103393 index 0000000..a0c9844
103394 --- /dev/null
103395 +++ b/tools/gcc/size_overflow_hash.data
103396 @@ -0,0 +1,7723 @@
103397 +intel_fake_agp_alloc_by_type_1 intel_fake_agp_alloc_by_type 1 1 NULL
103398 +ocfs2_get_refcount_tree_3 ocfs2_get_refcount_tree 0 3 NULL
103399 +batadv_orig_node_del_if_4 batadv_orig_node_del_if 2 4 NULL
103400 +storvsc_connect_to_vsp_22 storvsc_connect_to_vsp 2 22 NULL
103401 +compat_sock_setsockopt_23 compat_sock_setsockopt 5 23 NULL
103402 +carl9170_alloc_27 carl9170_alloc 1 27 NULL
103403 +sel_read_policyvers_55 sel_read_policyvers 3 55 NULL nohasharray
103404 +padzero_55 padzero 1 55 &sel_read_policyvers_55
103405 +cfg80211_disconnected_57 cfg80211_disconnected 4 57 NULL
103406 +__skb_to_sgvec_72 __skb_to_sgvec 0 72 NULL
103407 +crypto_authenc_setkey_80 crypto_authenc_setkey 3 80 NULL
103408 +snd_korg1212_copy_to_92 snd_korg1212_copy_to 6 92 NULL
103409 +load_msg_95 load_msg 2 95 NULL
103410 +device_flush_iotlb_115 device_flush_iotlb 2-3 115 NULL
103411 +ipath_verbs_send_117 ipath_verbs_send 5-3 117 NULL nohasharray
103412 +write_all_supers_117 write_all_supers 0 117 &ipath_verbs_send_117
103413 +init_q_132 init_q 4 132 NULL
103414 +ocfs2_local_alloc_slide_window_134 ocfs2_local_alloc_slide_window 0 134 NULL
103415 +memstick_alloc_host_142 memstick_alloc_host 1 142 NULL
103416 +hva_to_gfn_memslot_149 hva_to_gfn_memslot 0-1 149 NULL
103417 +ping_v6_sendmsg_152 ping_v6_sendmsg 4 152 NULL
103418 +ext4_ext_get_actual_len_153 ext4_ext_get_actual_len 0 153 NULL nohasharray
103419 +tracing_trace_options_write_153 tracing_trace_options_write 3 153 &ext4_ext_get_actual_len_153
103420 +nvme_create_queue_170 nvme_create_queue 3 170 NULL
103421 +xfs_buf_item_get_format_189 xfs_buf_item_get_format 2 189 NULL
103422 +iscsi_session_setup_196 iscsi_session_setup 4-5 196 NULL
103423 +device_add_bin_attributes_205 device_add_bin_attributes 0 205 NULL
103424 +br_port_info_size_268 br_port_info_size 0 268 NULL
103425 +generic_file_direct_write_291 generic_file_direct_write 0 291 NULL
103426 +read_file_war_stats_292 read_file_war_stats 3 292 NULL
103427 +SYSC_connect_304 SYSC_connect 3 304 NULL
103428 +syslog_print_307 syslog_print 2 307 NULL
103429 +dn_setsockopt_314 dn_setsockopt 5 314 NULL
103430 +next_node_allowed_318 next_node_allowed 1-0 318 NULL
103431 +mlx5_core_access_reg_361 mlx5_core_access_reg 5-3 361 NULL
103432 +xfs_get_blocks_364 xfs_get_blocks 2 364 NULL
103433 +get_more_blocks_367 get_more_blocks 0 367 NULL
103434 +sysfs_create_dir_398 sysfs_create_dir 0 398 NULL
103435 +hw_device_state_409 hw_device_state 0 409 NULL
103436 +aio_read_events_ring_410 aio_read_events_ring 3 410 NULL
103437 +lbs_rdmac_read_418 lbs_rdmac_read 3 418 NULL
103438 +snd_ca0106_ptr_read_467 snd_ca0106_ptr_read 0 467 NULL
103439 +sparse_index_init_482 sparse_index_init 2 482 NULL
103440 +cfs_trace_set_debug_mb_usrstr_486 cfs_trace_set_debug_mb_usrstr 2 486 NULL
103441 +nvme_trans_modesel_data_488 nvme_trans_modesel_data 4 488 NULL
103442 +iwl_dbgfs_protection_mode_write_502 iwl_dbgfs_protection_mode_write 3 502 NULL
103443 +rx_rx_defrag_end_read_505 rx_rx_defrag_end_read 3 505 NULL
103444 +_snd_pcm_hw_param_first_516 _snd_pcm_hw_param_first 0 516 NULL
103445 +ocfs2_validate_meta_ecc_bhs_527 ocfs2_validate_meta_ecc_bhs 0 527 NULL
103446 +zlib_deflate_workspacesize_537 zlib_deflate_workspacesize 0-1-2 537 NULL
103447 +iwl_dbgfs_wowlan_sram_read_540 iwl_dbgfs_wowlan_sram_read 3 540 NULL
103448 +sco_sock_setsockopt_552 sco_sock_setsockopt 5 552 NULL
103449 +lpfc_nlp_state_name_556 lpfc_nlp_state_name 2 556 NULL
103450 +snd_aw2_saa7146_get_hw_ptr_playback_558 snd_aw2_saa7146_get_hw_ptr_playback 0 558 NULL
103451 +dev_hard_header_565 dev_hard_header 0 565 NULL nohasharray
103452 +start_isoc_chain_565 start_isoc_chain 2 565 &dev_hard_header_565
103453 +ocfs2_refcounted_xattr_delete_need_584 ocfs2_refcounted_xattr_delete_need 0 584 NULL
103454 +smk_write_load_self2_591 smk_write_load_self2 3 591 NULL
103455 +cl_page_own0_599 cl_page_own0 0 599 NULL
103456 +btrfs_stack_file_extent_offset_607 btrfs_stack_file_extent_offset 0 607 NULL
103457 +ni_gpct_device_construct_610 ni_gpct_device_construct 5 610 NULL
103458 +fuse_request_alloc_nofs_617 fuse_request_alloc_nofs 1 617 NULL
103459 +ptlrpc_lprocfs_nrs_seq_write_621 ptlrpc_lprocfs_nrs_seq_write 3 621 NULL
103460 +viafb_dfpl_proc_write_627 viafb_dfpl_proc_write 3 627 NULL
103461 +ocfs2_num_free_extents_632 ocfs2_num_free_extents 0 632 NULL
103462 +clone_split_bio_633 clone_split_bio 6 633 NULL
103463 +ceph_osdc_new_request_635 ceph_osdc_new_request 6 635 NULL
103464 +remap_to_cache_640 remap_to_cache 3 640 NULL
103465 +cfs_hash_bkt_size_643 cfs_hash_bkt_size 0 643 NULL nohasharray
103466 +drbd_bm_find_next_643 drbd_bm_find_next 2 643 &cfs_hash_bkt_size_643
103467 +unlink_queued_645 unlink_queued 4 645 NULL
103468 +dtim_interval_read_654 dtim_interval_read 3 654 NULL
103469 +div_u64_rem_672 div_u64_rem 0 672 NULL
103470 +mem_rx_free_mem_blks_read_675 mem_rx_free_mem_blks_read 3 675 NULL
103471 +persistent_ram_vmap_709 persistent_ram_vmap 1-2 709 NULL
103472 +ipath_resize_cq_712 ipath_resize_cq 2 712 NULL
103473 +disk_max_parts_719 disk_max_parts 0 719 NULL
103474 +sctp_setsockopt_peer_addr_params_734 sctp_setsockopt_peer_addr_params 3 734 NULL
103475 +dvb_video_write_754 dvb_video_write 3 754 NULL
103476 +cfs_trace_allocate_string_buffer_781 cfs_trace_allocate_string_buffer 2 781 NULL
103477 +jbd2_journal_dirty_metadata_784 jbd2_journal_dirty_metadata 0 784 NULL
103478 +ath6kl_disconnect_timeout_write_794 ath6kl_disconnect_timeout_write 3 794 NULL
103479 +__vmalloc_node_range_811 __vmalloc_node_range 7 811 NULL nohasharray
103480 +snd_pcm_drain_811 snd_pcm_drain 0 811 &__vmalloc_node_range_811
103481 +if_writecmd_815 if_writecmd 2 815 NULL
103482 +aac_change_queue_depth_825 aac_change_queue_depth 2 825 NULL
103483 +SyS_write_846 SyS_write 3 846 NULL
103484 +um_idi_read_850 um_idi_read 3 850 NULL
103485 +error_state_read_859 error_state_read 6 859 NULL
103486 +o2net_send_message_vec_879 o2net_send_message_vec 4 879 NULL nohasharray
103487 +iwl_dbgfs_fh_reg_read_879 iwl_dbgfs_fh_reg_read 3 879 &o2net_send_message_vec_879
103488 +intel_alloc_iova_883 intel_alloc_iova 3 883 NULL
103489 +snd_pcm_action_single_905 snd_pcm_action_single 0 905 NULL
103490 +readw_931 readw 0 931 NULL
103491 +carl9170_cmd_buf_950 carl9170_cmd_buf 3 950 NULL
103492 +__nodes_weight_956 __nodes_weight 2-0 956 NULL
103493 +bnx2x_fill_fw_str_968 bnx2x_fill_fw_str 3 968 NULL
103494 +memcmp_990 memcmp 0 990 NULL
103495 +pte_prefetch_gfn_to_pfn_997 pte_prefetch_gfn_to_pfn 2 997 NULL
103496 +free_ind_block_999 free_ind_block 0 999 NULL
103497 +dm_cache_set_dirty_1016 dm_cache_set_dirty 2 1016 NULL
103498 +readreg_1017 readreg 0-1 1017 NULL
103499 +_do_truncate_1019 _do_truncate 2 1019 NULL
103500 +smk_write_cipso2_1021 smk_write_cipso2 3 1021 NULL
103501 +gigaset_initdriver_1060 gigaset_initdriver 2 1060 NULL
103502 +mce_request_packet_1073 mce_request_packet 3 1073 NULL
103503 +agp_create_memory_1075 agp_create_memory 1 1075 NULL
103504 +ext4_orphan_add_1080 ext4_orphan_add 0 1080 NULL
103505 +_scsih_adjust_queue_depth_1083 _scsih_adjust_queue_depth 2 1083 NULL
103506 +llcp_sock_sendmsg_1092 llcp_sock_sendmsg 4 1092 NULL
103507 +inode_ref_info_1094 inode_ref_info 0 1094 NULL nohasharray
103508 +llc_mac_hdr_init_1094 llc_mac_hdr_init 0 1094 &inode_ref_info_1094
103509 +nfs4_init_nonuniform_client_string_1097 nfs4_init_nonuniform_client_string 3 1097 NULL
103510 +utf8s_to_utf16s_1115 utf8s_to_utf16s 0 1115 NULL
103511 +__btrfs_cow_block_1125 __btrfs_cow_block 7-0 1125 NULL nohasharray
103512 +__ext4_journal_stop_1125 __ext4_journal_stop 0 1125 &__btrfs_cow_block_1125
103513 +cfg80211_report_obss_beacon_1133 cfg80211_report_obss_beacon 3 1133 NULL
103514 +vmalloc_32_1135 vmalloc_32 1 1135 NULL
103515 +i2400m_rx_ctl_1157 i2400m_rx_ctl 4 1157 NULL
103516 +find_free_extent_1173 find_free_extent 4-0 1173 NULL
103517 +ipc_alloc_1192 ipc_alloc 1 1192 NULL
103518 +ib_create_send_mad_1196 ib_create_send_mad 5 1196 NULL
103519 +pstore_ftrace_knob_write_1198 pstore_ftrace_knob_write 3 1198 NULL
103520 +i2400m_rx_ctl_ack_1199 i2400m_rx_ctl_ack 3 1199 NULL
103521 +dgrp_dpa_read_1204 dgrp_dpa_read 3 1204 NULL
103522 +i2cdev_read_1206 i2cdev_read 3 1206 NULL
103523 +lov_ost_pool_init_1215 lov_ost_pool_init 2 1215 NULL
103524 +acpi_battery_write_alarm_1240 acpi_battery_write_alarm 3 1240 NULL
103525 +nested_get_page_1252 nested_get_page 2 1252 NULL
103526 +ocfs2_extend_file_1266 ocfs2_extend_file 3 1266 NULL
103527 +qla4xxx_change_queue_depth_1268 qla4xxx_change_queue_depth 2 1268 NULL
103528 +ioctl_private_iw_point_1273 ioctl_private_iw_point 7 1273 NULL
103529 +batadv_tt_prepare_packet_buff_1280 batadv_tt_prepare_packet_buff 4 1280 NULL
103530 +SyS_flistxattr_1287 SyS_flistxattr 3 1287 NULL
103531 +tx_frag_in_process_called_read_1290 tx_frag_in_process_called_read 3 1290 NULL
103532 +ocfs2_append_rec_to_path_1321 ocfs2_append_rec_to_path 0 1321 NULL
103533 +ffs_1322 ffs 0 1322 NULL
103534 +qlcnic_pci_sriov_configure_1327 qlcnic_pci_sriov_configure 2 1327 NULL nohasharray
103535 +push_node_left_1327 push_node_left 0 1327 &qlcnic_pci_sriov_configure_1327
103536 +btrfs_submit_compressed_write_1347 btrfs_submit_compressed_write 5 1347 NULL
103537 +gen_pool_best_fit_1348 gen_pool_best_fit 2-3-4 1348 NULL
103538 +btrfs_alloc_logged_file_extent_1354 btrfs_alloc_logged_file_extent 0 1354 NULL
103539 +snd_pcm_lib_write1_1358 snd_pcm_lib_write1 0-3 1358 NULL
103540 +ipx_sendmsg_1362 ipx_sendmsg 4 1362 NULL
103541 +iov_num_pages_1364 iov_num_pages 0 1364 NULL
103542 +fw_stats_raw_read_1369 fw_stats_raw_read 3 1369 NULL
103543 +ocfs2_prepare_inode_for_write_1372 ocfs2_prepare_inode_for_write 3 1372 NULL
103544 +sctp_setsockopt_initmsg_1383 sctp_setsockopt_initmsg 3 1383 NULL
103545 +do_msgsnd_1387 do_msgsnd 4 1387 NULL
103546 +SYSC_io_getevents_1392 SYSC_io_getevents 3 1392 NULL
103547 +zone_page_state_1393 zone_page_state 0 1393 NULL
103548 +file_read_actor_1401 file_read_actor 4 1401 NULL
103549 +vb2_vmalloc_alloc_1402 vb2_vmalloc_alloc 2 1402 NULL
103550 +cfs_trace_copyout_string_1416 cfs_trace_copyout_string 2 1416 NULL
103551 +pq_init_1423 pq_init 1 1423 NULL
103552 +init_rs_internal_1436 init_rs_internal 1 1436 NULL
103553 +vb2_dc_get_user_pages_1442 vb2_dc_get_user_pages 1-3 1442 NULL
103554 +stack_max_size_read_1445 stack_max_size_read 3 1445 NULL
103555 +tx_queue_len_read_1463 tx_queue_len_read 3 1463 NULL
103556 +xprt_alloc_1475 xprt_alloc 2 1475 NULL
103557 +SYSC_syslog_1477 SYSC_syslog 3 1477 NULL
103558 +sta_num_ps_buf_frames_read_1488 sta_num_ps_buf_frames_read 3 1488 NULL
103559 +posix_acl_permission_1495 posix_acl_permission 0 1495 NULL
103560 +fpregs_set_1497 fpregs_set 4 1497 NULL
103561 +ocfs2_alloc_dinode_update_counts_1507 ocfs2_alloc_dinode_update_counts 0 1507 NULL
103562 +tomoyo_round2_1518 tomoyo_round2 0 1518 NULL
103563 +alloc_perm_bits_1532 alloc_perm_bits 2 1532 NULL
103564 +ath6kl_init_get_fwcaps_1557 ath6kl_init_get_fwcaps 3 1557 NULL
103565 +extent_from_logical_1585 extent_from_logical 0 1585 NULL
103566 +ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime_1589 ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime 3 1589 NULL
103567 +ipath_ht_handle_hwerrors_1592 ipath_ht_handle_hwerrors 3 1592 NULL
103568 +packet_buffer_init_1607 packet_buffer_init 2 1607 NULL
103569 +btmrvl_hscmd_read_1614 btmrvl_hscmd_read 3 1614 NULL
103570 +v9fs_fid_xattr_get_1618 v9fs_fid_xattr_get 0 1618 NULL
103571 +run_delayed_extent_op_1637 run_delayed_extent_op 0 1637 NULL
103572 +ikconfig_read_current_1658 ikconfig_read_current 3 1658 NULL
103573 +qgroup_rescan_init_1664 qgroup_rescan_init 0 1664 NULL
103574 +mei_cl_recv_1665 mei_cl_recv 3 1665 NULL
103575 +rmap_add_1677 rmap_add 3 1677 NULL
103576 +configfs_read_file_1683 configfs_read_file 3 1683 NULL
103577 +pdu_write_u_1710 pdu_write_u 3 1710 NULL
103578 +coda_psdev_write_1711 coda_psdev_write 3 1711 NULL nohasharray
103579 +gfn_to_hva_prot_1711 gfn_to_hva_prot 2 1711 &coda_psdev_write_1711
103580 +btrfs_dir_data_len_1714 btrfs_dir_data_len 0 1714 NULL
103581 +dma_memcpy_pg_to_iovec_1725 dma_memcpy_pg_to_iovec 6 1725 NULL
103582 +internal_create_group_1733 internal_create_group 0 1733 NULL
103583 +dev_irnet_read_1741 dev_irnet_read 3 1741 NULL
103584 +tx_frag_called_read_1748 tx_frag_called_read 3 1748 NULL
103585 +ebt_size_mwt_1768 ebt_size_mwt 0 1768 NULL
103586 +cosa_write_1774 cosa_write 3 1774 NULL
103587 +fcoe_ctlr_device_add_1793 fcoe_ctlr_device_add 3 1793 NULL
103588 +__nodelist_scnprintf_1815 __nodelist_scnprintf 4-2-0 1815 NULL
103589 +sb_issue_zeroout_1884 sb_issue_zeroout 3-0 1884 NULL
103590 +rx_defrag_called_read_1897 rx_defrag_called_read 3 1897 NULL
103591 +nfs_parse_server_name_1899 nfs_parse_server_name 2 1899 NULL
103592 +SyS_add_key_1900 SyS_add_key 4 1900 NULL
103593 +uhid_char_read_1920 uhid_char_read 3 1920 NULL
103594 +tx_tx_retry_data_read_1926 tx_tx_retry_data_read 3 1926 NULL
103595 +bdev_erase_1933 bdev_erase 3 1933 NULL
103596 +ext3_fiemap_1936 ext3_fiemap 4 1936 NULL
103597 +cyttsp_probe_1940 cyttsp_probe 4 1940 NULL
103598 +ieee80211_if_fmt_dot11MeshConfirmTimeout_1945 ieee80211_if_fmt_dot11MeshConfirmTimeout 3 1945 NULL
103599 +read_swap_header_1957 read_swap_header 0 1957 NULL
103600 +ivtv_v4l2_read_1964 ivtv_v4l2_read 3 1964 NULL
103601 +sel_read_avc_hash_stats_1984 sel_read_avc_hash_stats 3 1984 NULL
103602 +gpio_power_write_1991 gpio_power_write 3 1991 NULL
103603 +__alloc_bootmem_node_1992 __alloc_bootmem_node 2 1992 NULL
103604 +atomic_read_unchecked_1995 atomic_read_unchecked 0 1995 NULL
103605 +sb_min_blocksize_2004 sb_min_blocksize 0-2 2004 NULL
103606 +batadv_tt_commit_changes_2008 batadv_tt_commit_changes 4 2008 NULL
103607 +sep_prepare_input_dma_table_2009 sep_prepare_input_dma_table 2-3 2009 NULL
103608 +rx_rx_defrag_read_2010 rx_rx_defrag_read 3 2010 NULL
103609 +ksm_madvise_2012 ksm_madvise 0 2012 NULL
103610 +ocfs2_global_qinit_alloc_2018 ocfs2_global_qinit_alloc 0 2018 NULL
103611 +write_flush_pipefs_2021 write_flush_pipefs 3 2021 NULL
103612 +BcmCopySection_2035 BcmCopySection 5-0 2035 NULL
103613 +ath6kl_fwlog_mask_read_2050 ath6kl_fwlog_mask_read 3 2050 NULL
103614 +ocfs2_expand_inline_dir_2063 ocfs2_expand_inline_dir 3 2063 NULL
103615 +__generic_copy_from_user_intel_2073 __generic_copy_from_user_intel 0-3 2073 NULL
103616 +diva_set_driver_dbg_mask_2077 diva_set_driver_dbg_mask 0 2077 NULL nohasharray
103617 +alloc_retstack_tasklist_2077 alloc_retstack_tasklist 0 2077 &diva_set_driver_dbg_mask_2077
103618 +iwl_dbgfs_current_sleep_command_read_2081 iwl_dbgfs_current_sleep_command_read 3 2081 NULL
103619 +get_unaligned_le32_2092 get_unaligned_le32 0 2092 NULL
103620 +idetape_chrdev_read_2097 idetape_chrdev_read 3 2097 NULL
103621 +audit_expand_2098 audit_expand 0 2098 NULL
103622 +num_pages_spanned_2105 num_pages_spanned 0 2105 NULL
103623 +shrd128_2106 shrd128 0-1-3-2 2106 NULL
103624 +iwl_dbgfs_log_event_read_2107 iwl_dbgfs_log_event_read 3 2107 NULL
103625 +ecryptfs_encrypt_and_encode_filename_2109 ecryptfs_encrypt_and_encode_filename 6 2109 NULL
103626 +enable_read_2117 enable_read 3 2117 NULL
103627 +pcf50633_write_block_2124 pcf50633_write_block 2-3 2124 NULL
103628 +snd_interval_refine_last_2127 snd_interval_refine_last 0 2127 NULL
103629 +check_load_and_stores_2143 check_load_and_stores 2 2143 NULL
103630 +lp_gpio_irq_map_2149 lp_gpio_irq_map 2 2149 NULL
103631 +iov_iter_count_2152 iov_iter_count 0 2152 NULL
103632 +__copy_to_user_ll_2157 __copy_to_user_ll 0-3 2157 NULL
103633 +ocfs2_et_sanity_check_2164 ocfs2_et_sanity_check 0 2164 NULL
103634 +_ore_get_io_state_2166 _ore_get_io_state 5-3-4 2166 NULL
103635 +bio_integrity_alloc_2194 bio_integrity_alloc 3 2194 NULL
103636 +picolcd_debug_reset_write_2195 picolcd_debug_reset_write 3 2195 NULL
103637 +mei_dbgfs_read_meclients_2219 mei_dbgfs_read_meclients 3 2219 NULL nohasharray
103638 +u32_array_read_2219 u32_array_read 3 2219 &mei_dbgfs_read_meclients_2219
103639 +vhci_write_2224 vhci_write 3 2224 NULL
103640 +__ocfs2_journal_access_2241 __ocfs2_journal_access 0 2241 NULL
103641 +ieee80211_if_read_dot11MeshHWMPRannInterval_2249 ieee80211_if_read_dot11MeshHWMPRannInterval 3 2249 NULL
103642 +netlbl_secattr_catmap_walk_2255 netlbl_secattr_catmap_walk 0-2 2255 NULL
103643 +sel_write_avc_cache_threshold_2256 sel_write_avc_cache_threshold 3 2256 NULL
103644 +do_update_counters_2259 do_update_counters 4 2259 NULL
103645 +ath6kl_wmi_bssinfo_event_rx_2275 ath6kl_wmi_bssinfo_event_rx 3 2275 NULL
103646 +debug_debug5_read_2291 debug_debug5_read 3 2291 NULL
103647 +ocfs2_shift_tree_depth_2292 ocfs2_shift_tree_depth 0 2292 NULL
103648 +kvm_clear_guest_page_2308 kvm_clear_guest_page 2-4 2308 NULL
103649 +intel_sdvo_set_value_2311 intel_sdvo_set_value 4 2311 NULL
103650 +picolcd_fb_write_2318 picolcd_fb_write 3 2318 NULL nohasharray
103651 +hfsplus_find_init_2318 hfsplus_find_init 0 2318 &picolcd_fb_write_2318
103652 +gart_map_page_2325 gart_map_page 4-3 2325 NULL
103653 +__erst_read_to_erange_2341 __erst_read_to_erange 0 2341 NULL
103654 +zr364xx_read_2354 zr364xx_read 3 2354 NULL
103655 +viafb_iga2_odev_proc_write_2363 viafb_iga2_odev_proc_write 3 2363 NULL
103656 +SyS_mremap_2367 SyS_mremap 2-3-1-5 2367 NULL
103657 +xfs_buf_map_from_irec_2368 xfs_buf_map_from_irec 5 2368 NULL nohasharray
103658 +rose_recvmsg_2368 rose_recvmsg 4 2368 &xfs_buf_map_from_irec_2368
103659 +il_dbgfs_sensitivity_read_2370 il_dbgfs_sensitivity_read 3 2370 NULL
103660 +rxpipe_rx_prep_beacon_drop_read_2403 rxpipe_rx_prep_beacon_drop_read 3 2403 NULL
103661 +SYSC_mlock_2415 SYSC_mlock 1-2 2415 NULL
103662 +isdn_v110_open_2418 isdn_v110_open 3 2418 NULL
103663 +raid1_size_2419 raid1_size 0-2 2419 NULL
103664 +timespec_to_jiffies_timeout_2428 timespec_to_jiffies_timeout 0 2428 NULL
103665 +tty_buffer_find_2443 tty_buffer_find 2 2443 NULL
103666 +b43legacy_debugfs_read_2473 b43legacy_debugfs_read 3 2473 NULL
103667 +wiphy_new_2482 wiphy_new 2 2482 NULL
103668 +bio_alloc_bioset_2484 bio_alloc_bioset 2 2484 NULL
103669 +hfsplus_user_setxattr_2485 hfsplus_user_setxattr 4 2485 NULL
103670 +lookup_cache_entry_2494 lookup_cache_entry 2 2494 NULL
103671 +squashfs_read_fragment_index_table_2506 squashfs_read_fragment_index_table 4 2506 NULL
103672 +v9fs_cached_file_read_2514 v9fs_cached_file_read 3 2514 NULL
103673 +ext4_get_inode_loc_2516 ext4_get_inode_loc 0 2516 NULL
103674 +gspca_dev_probe_2570 gspca_dev_probe 4 2570 NULL
103675 +pcm_sanity_check_2574 pcm_sanity_check 0 2574 NULL
103676 +mdc_max_rpcs_in_flight_seq_write_2594 mdc_max_rpcs_in_flight_seq_write 3 2594 NULL
103677 +slot_bytes_2609 slot_bytes 0 2609 NULL
103678 +smk_write_logging_2618 smk_write_logging 3 2618 NULL
103679 +switch_status_2629 switch_status 5 2629 NULL
103680 +tlv_put_string_2631 tlv_put_string 0 2631 NULL
103681 +kvm_gfn_to_hva_cache_init_2636 kvm_gfn_to_hva_cache_init 3 2636 NULL
103682 +tcp_xmit_size_goal_2661 tcp_xmit_size_goal 2 2661 NULL
103683 +osc_build_ppga_2670 osc_build_ppga 2 2670 NULL
103684 +ffs_ep0_read_2672 ffs_ep0_read 3 2672 NULL
103685 +ocfs2_rotate_subtree_right_2674 ocfs2_rotate_subtree_right 0 2674 NULL
103686 +oti6858_write_2692 oti6858_write 4 2692 NULL
103687 +nfc_llcp_send_ui_frame_2702 nfc_llcp_send_ui_frame 5 2702 NULL
103688 +memcpy_fromiovecend_2707 memcpy_fromiovecend 4-3 2707 NULL
103689 +SyS_pwrite64_2708 SyS_pwrite64 3 2708 NULL nohasharray
103690 +lprocfs_stats_counter_size_2708 lprocfs_stats_counter_size 0 2708 &SyS_pwrite64_2708
103691 +__xip_file_write_2733 __xip_file_write 3-4 2733 NULL
103692 +can_nocow_extent_2744 can_nocow_extent 3 2744 NULL
103693 +xfs_readdir_2767 xfs_readdir 3 2767 NULL
103694 +mon_bin_ioctl_2771 mon_bin_ioctl 3 2771 NULL nohasharray
103695 +bictcp_update_2771 bictcp_update 2 2771 &mon_bin_ioctl_2771
103696 +__next_cpu_2782 __next_cpu 1-0 2782 NULL
103697 +set_msr_hyperv_pw_2785 set_msr_hyperv_pw 3 2785 NULL
103698 +device_add_attrs_2789 device_add_attrs 0 2789 NULL
103699 +iwl_dbgfs_clear_ucode_statistics_write_2804 iwl_dbgfs_clear_ucode_statistics_write 3 2804 NULL
103700 +sel_read_enforce_2828 sel_read_enforce 3 2828 NULL
103701 +vb2_dc_get_userptr_2829 vb2_dc_get_userptr 2-3 2829 NULL nohasharray
103702 +snd_pcm_reset_2829 snd_pcm_reset 0 2829 &vb2_dc_get_userptr_2829
103703 +sock_create_2838 sock_create 0 2838 NULL
103704 +wait_for_avail_2847 wait_for_avail 0 2847 NULL
103705 +ufs_free_fragments_2857 ufs_free_fragments 2 2857 NULL
103706 +sfq_alloc_2861 sfq_alloc 1 2861 NULL
103707 +irnet_ctrl_read_2863 irnet_ctrl_read 4 2863 NULL
103708 +move_addr_to_user_2868 move_addr_to_user 2 2868 NULL
103709 +mq_map_2871 mq_map 2 2871 NULL
103710 +__swab64p_2875 __swab64p 0 2875 NULL
103711 +nla_padlen_2883 nla_padlen 1 2883 NULL
103712 +cmm_write_2896 cmm_write 3 2896 NULL
103713 +alloc_page_cgroup_2919 alloc_page_cgroup 1-2 2919 NULL
103714 +osc_import_seq_write_2923 osc_import_seq_write 3 2923 NULL
103715 +xfs_trans_get_buf_map_2927 xfs_trans_get_buf_map 4 2927 NULL
103716 +nes_read_indexed_2946 nes_read_indexed 0 2946 NULL
103717 +tm6000_i2c_recv_regs16_2949 tm6000_i2c_recv_regs16 5 2949 NULL
103718 +i40e_dbg_prep_dump_buf_2951 i40e_dbg_prep_dump_buf 2 2951 NULL
103719 +set_fast_connectable_2952 set_fast_connectable 4 2952 NULL
103720 +free_area_init_core_2962 free_area_init_core 2-3 2962 NULL
103721 +do_strnlen_user_2976 do_strnlen_user 0-2 2976 NULL
103722 +ocfs2_find_branch_target_2989 ocfs2_find_branch_target 0 2989 NULL
103723 +p9_nr_pages_2992 p9_nr_pages 0-2 2992 NULL
103724 +lov_stripetype_seq_write_3013 lov_stripetype_seq_write 3 3013 NULL
103725 +btrfs_add_block_group_cache_3016 btrfs_add_block_group_cache 0 3016 NULL
103726 +do_dmabuf_dirty_sou_3017 do_dmabuf_dirty_sou 7 3017 NULL
103727 +depth_write_3021 depth_write 3 3021 NULL
103728 +snd_azf3328_codec_inl_3022 snd_azf3328_codec_inl 0 3022 NULL
103729 +kvm_unmap_hva_3028 kvm_unmap_hva 2 3028 NULL
103730 +xfrm_dst_alloc_copy_3034 xfrm_dst_alloc_copy 3 3034 NULL
103731 +lpfc_idiag_mbxacc_write_3038 lpfc_idiag_mbxacc_write 3 3038 NULL nohasharray
103732 +iwl_dbgfs_sleep_level_override_read_3038 iwl_dbgfs_sleep_level_override_read 3 3038 &lpfc_idiag_mbxacc_write_3038
103733 +nr_free_buffer_pages_3044 nr_free_buffer_pages 0 3044 NULL
103734 +il3945_ucode_rx_stats_read_3048 il3945_ucode_rx_stats_read 3 3048 NULL
103735 +qp_alloc_ppn_set_3068 qp_alloc_ppn_set 2-4 3068 NULL
103736 +__blk_end_bidi_request_3070 __blk_end_bidi_request 4-3 3070 NULL
103737 +dac960_user_command_proc_write_3071 dac960_user_command_proc_write 3 3071 NULL
103738 +read_file_antenna_diversity_3077 read_file_antenna_diversity 3 3077 NULL
103739 +free_coherent_3082 free_coherent 4-2 3082 NULL
103740 +ocfs2_get_right_path_3097 ocfs2_get_right_path 0 3097 NULL
103741 +clone_bio_3100 clone_bio 6 3100 NULL nohasharray
103742 +ttusb2_msg_3100 ttusb2_msg 4 3100 &clone_bio_3100
103743 +rb_alloc_3102 rb_alloc 1 3102 NULL
103744 +simple_write_to_buffer_3122 simple_write_to_buffer 2-5 3122 NULL
103745 +print_time_3132 print_time 0 3132 NULL
103746 +fill_write_buffer_3142 fill_write_buffer 3 3142 NULL
103747 +find_free_extent_3153 find_free_extent 5 3153 NULL
103748 +CIFSSMBSetPosixACL_3154 CIFSSMBSetPosixACL 5 3154 NULL
103749 +compat_sys_migrate_pages_3157 compat_sys_migrate_pages 2 3157 NULL
103750 +i915_gem_obj_ggtt_offset_3162 i915_gem_obj_ggtt_offset 0 3162 NULL
103751 +uv_num_possible_blades_3177 uv_num_possible_blades 0 3177 NULL
103752 +uvc_video_stats_dump_3181 uvc_video_stats_dump 3 3181 NULL
103753 +compat_do_ip6t_set_ctl_3184 compat_do_ip6t_set_ctl 4 3184 NULL
103754 +wait_table_bits_3187 wait_table_bits 1 3187 NULL
103755 +mempool_create_node_3191 mempool_create_node 1-6 3191 NULL
103756 +alloc_context_3194 alloc_context 1 3194 NULL
103757 +shmem_pread_slow_3198 shmem_pread_slow 3-2 3198 NULL
103758 +codec_reg_write_file_3204 codec_reg_write_file 3 3204 NULL
103759 +SyS_sendto_3219 SyS_sendto 6 3219 NULL
103760 +btrfs_prealloc_file_range_3227 btrfs_prealloc_file_range 3 3227 NULL
103761 +btrfs_next_leaf_3232 btrfs_next_leaf 0 3232 NULL
103762 +kimage_crash_alloc_3233 kimage_crash_alloc 3 3233 NULL
103763 +write_adapter_mem_3234 write_adapter_mem 3 3234 NULL
103764 +do_read_log_to_user_3236 do_read_log_to_user 4 3236 NULL
103765 +ext3_xattr_find_entry_3237 ext3_xattr_find_entry 0 3237 NULL
103766 +key_key_read_3241 key_key_read 3 3241 NULL
103767 +mmap_piobufs_3244 mmap_piobufs 4 3244 NULL
103768 +did_overwrite_first_ref_3259 did_overwrite_first_ref 0 3259 NULL
103769 +__ilog2_u64_3284 __ilog2_u64 0 3284 NULL
103770 +__iovec_copy_from_user_inatomic_3314 __iovec_copy_from_user_inatomic 0-4-3 3314 NULL
103771 +dbDiscardAG_3322 dbDiscardAG 3 3322 NULL
103772 +compat_sys_setsockopt_3326 compat_sys_setsockopt 5 3326 NULL
103773 +read_from_oldmem_3337 read_from_oldmem 2 3337 NULL
103774 +sysfs_create_group_3339 sysfs_create_group 0 3339 NULL
103775 +tty_port_register_device_attr_3341 tty_port_register_device_attr 3 3341 NULL
103776 +il_dbgfs_interrupt_read_3351 il_dbgfs_interrupt_read 3 3351 NULL
103777 +gsm_control_rls_3353 gsm_control_rls 3 3353 NULL
103778 +scnprintf_3360 scnprintf 0-2 3360 NULL
103779 +ReadByteAmd7930_3365 ReadByteAmd7930 0 3365 NULL
103780 +sr_read_3366 sr_read 3 3366 NULL
103781 +count_inode_refs_3375 count_inode_refs 0 3375 NULL
103782 +x86_emulate_instruction_3389 x86_emulate_instruction 2 3389 NULL
103783 +mtdchar_writeoob_3393 mtdchar_writeoob 4 3393 NULL
103784 +send_stream_3397 send_stream 4 3397 NULL
103785 +isdn_readbchan_3401 isdn_readbchan 0-5 3401 NULL
103786 +mei_io_cb_alloc_resp_buf_3414 mei_io_cb_alloc_resp_buf 2 3414 NULL
103787 +zone_to_nid_3415 zone_to_nid 0 3415 NULL
103788 +pci_add_cap_save_buffer_3426 pci_add_cap_save_buffer 3 3426 NULL
103789 +crystalhd_create_dio_pool_3427 crystalhd_create_dio_pool 2 3427 NULL
103790 +SyS_msgsnd_3436 SyS_msgsnd 3 3436 NULL
103791 +send_unlink_3438 send_unlink 0 3438 NULL
103792 +pipe_iov_copy_to_user_3447 pipe_iov_copy_to_user 3 3447 NULL
103793 +map_single_3449 map_single 0 3449 NULL
103794 +softsynth_write_3455 softsynth_write 3 3455 NULL
103795 +jffs2_acl_setxattr_3464 jffs2_acl_setxattr 4 3464 NULL nohasharray
103796 +snd_pcm_lib_readv_transfer_3464 snd_pcm_lib_readv_transfer 5-4-2 3464 &jffs2_acl_setxattr_3464
103797 +security_context_to_sid_default_3492 security_context_to_sid_default 2 3492 NULL
103798 +xfrm_migrate_msgsize_3496 xfrm_migrate_msgsize 1 3496 NULL
103799 +run_one_delayed_ref_3503 run_one_delayed_ref 0 3503 NULL nohasharray
103800 +kvm_handle_bad_page_3503 kvm_handle_bad_page 2 3503 &run_one_delayed_ref_3503
103801 +mem_tx_free_mem_blks_read_3521 mem_tx_free_mem_blks_read 3 3521 NULL
103802 +SyS_semtimedop_3532 SyS_semtimedop 3 3532 NULL
103803 +SyS_readv_3539 SyS_readv 3 3539 NULL
103804 +btrfs_dir_name_len_3549 btrfs_dir_name_len 0 3549 NULL
103805 +iommu_map_3554 iommu_map 3-2 3554 NULL
103806 +btrfs_delayed_update_inode_3557 btrfs_delayed_update_inode 0 3557 NULL
103807 +i915_gem_execbuffer_reserve_3558 i915_gem_execbuffer_reserve 0 3558 NULL
103808 +alloc_smp_resp_3566 alloc_smp_resp 1 3566 NULL
103809 +evtchn_read_3569 evtchn_read 3 3569 NULL
103810 +ll_track_ppid_seq_write_3582 ll_track_ppid_seq_write 3 3582 NULL
103811 +vc_resize_3585 vc_resize 3-2 3585 NULL
103812 +kvm_mmu_notifier_change_pte_3596 kvm_mmu_notifier_change_pte 3 3596 NULL
103813 +sctp_getsockopt_events_3607 sctp_getsockopt_events 2 3607 NULL
103814 +edac_mc_alloc_3611 edac_mc_alloc 4 3611 NULL
103815 +tx_tx_starts_read_3617 tx_tx_starts_read 3 3617 NULL
103816 +aligned_kmalloc_3628 aligned_kmalloc 1 3628 NULL
103817 +x86_swiotlb_alloc_coherent_3649 x86_swiotlb_alloc_coherent 2 3649 NULL
103818 +ath6kl_disconnect_timeout_read_3650 ath6kl_disconnect_timeout_read 3 3650 NULL
103819 +i915_compat_ioctl_3656 i915_compat_ioctl 2 3656 NULL
103820 +replace_pin_at_irq_node_3687 replace_pin_at_irq_node 2 3687 NULL
103821 +ntfs_attr_make_non_resident_3694 ntfs_attr_make_non_resident 0-2 3694 NULL
103822 +snd_m3_assp_read_3703 snd_m3_assp_read 0 3703 NULL nohasharray
103823 +create_irq_3703 create_irq 0 3703 &snd_m3_assp_read_3703
103824 +videobuf_pages_to_sg_3708 videobuf_pages_to_sg 2 3708 NULL
103825 +ci_ll_write_3740 ci_ll_write 4 3740 NULL nohasharray
103826 +ath6kl_mgmt_tx_3740 ath6kl_mgmt_tx 7 3740 &ci_ll_write_3740
103827 +uar_index2pfn_3741 uar_index2pfn 0-2 3741 NULL
103828 +sctp_setsockopt_auth_key_3793 sctp_setsockopt_auth_key 3 3793 NULL
103829 +btrfs_alloc_chunk_3808 btrfs_alloc_chunk 0 3808 NULL
103830 +ncp_file_write_3813 ncp_file_write 3 3813 NULL
103831 +llc_ui_recvmsg_3826 llc_ui_recvmsg 4 3826 NULL
103832 +btrfs_uuid_iter_rem_3831 btrfs_uuid_iter_rem 0 3831 NULL
103833 +hfsplus_direct_IO_3835 hfsplus_direct_IO 4 3835 NULL
103834 +stringify_nodemap_3842 stringify_nodemap 2 3842 NULL
103835 +ubi_eba_read_leb_3847 ubi_eba_read_leb 0 3847 NULL
103836 +create_one_cdev_3852 create_one_cdev 2 3852 NULL
103837 +smk_read_onlycap_3855 smk_read_onlycap 3 3855 NULL
103838 +get_fd_set_3866 get_fd_set 1 3866 NULL
103839 +apei_res_sub_3873 apei_res_sub 0 3873 NULL
103840 +garp_attr_create_3883 garp_attr_create 3 3883 NULL
103841 +efivarfs_file_read_3893 efivarfs_file_read 3 3893 NULL
103842 +nvram_write_3894 nvram_write 3 3894 NULL
103843 +pipeline_pre_proc_swi_read_3898 pipeline_pre_proc_swi_read 3 3898 NULL
103844 +comedi_buf_read_n_available_3899 comedi_buf_read_n_available 0 3899 NULL
103845 +vcs_write_3910 vcs_write 3 3910 NULL
103846 +SyS_move_pages_3920 SyS_move_pages 2 3920 NULL
103847 +hdlc_irq_one_3944 hdlc_irq_one 2 3944 NULL
103848 +brcmf_debugfs_fws_stats_read_3947 brcmf_debugfs_fws_stats_read 3 3947 NULL
103849 +mite_bytes_written_to_memory_lb_3987 mite_bytes_written_to_memory_lb 0 3987 NULL
103850 +do_add_counters_3992 do_add_counters 3 3992 NULL
103851 +obd_alloc_memmd_4002 obd_alloc_memmd 0 4002 NULL
103852 +userspace_status_4004 userspace_status 4 4004 NULL
103853 +mei_write_4005 mei_write 3 4005 NULL nohasharray
103854 +xfs_check_block_4005 xfs_check_block 4 4005 &mei_write_4005
103855 +snd_hdsp_capture_copy_4011 snd_hdsp_capture_copy 5 4011 NULL
103856 +mm_populate_4016 mm_populate 1-2 4016 NULL nohasharray
103857 +i915_gem_object_unbind_4016 i915_gem_object_unbind 0 4016 &mm_populate_4016
103858 +blk_end_request_4024 blk_end_request 3 4024 NULL
103859 +ext4_xattr_find_entry_4025 ext4_xattr_find_entry 0 4025 NULL
103860 +mtip_hw_read_registers_4037 mtip_hw_read_registers 3 4037 NULL
103861 +i915_gpu_idle_4062 i915_gpu_idle 0 4062 NULL
103862 +read_file_queues_4078 read_file_queues 3 4078 NULL
103863 +fbcon_do_set_font_4079 fbcon_do_set_font 2-3 4079 NULL
103864 +btrfs_inc_ref_4084 btrfs_inc_ref 0 4084 NULL
103865 +da9052_free_irq_4090 da9052_free_irq 2 4090 NULL
103866 +tm6000_read_4151 tm6000_read 3 4151 NULL
103867 +mpt_raid_phys_disk_get_num_paths_4155 mpt_raid_phys_disk_get_num_paths 0 4155 NULL
103868 +msg_bits_4158 msg_bits 0-3-4 4158 NULL
103869 +get_alua_req_4166 get_alua_req 3 4166 NULL
103870 +blk_dropped_read_4168 blk_dropped_read 3 4168 NULL
103871 +read_file_bool_4180 read_file_bool 3 4180 NULL
103872 +ocfs2_find_cpos_for_right_leaf_4194 ocfs2_find_cpos_for_right_leaf 0 4194 NULL
103873 +f1x_determine_channel_4202 f1x_determine_channel 2 4202 NULL
103874 +_osd_req_list_objects_4204 _osd_req_list_objects 6 4204 NULL
103875 +__snd_gf1_read_addr_4210 __snd_gf1_read_addr 0 4210 NULL
103876 +ath6kl_force_roam_write_4282 ath6kl_force_roam_write 3 4282 NULL
103877 +goldfish_audio_write_4284 goldfish_audio_write 3 4284 NULL
103878 +msb_do_write_request_4286 msb_do_write_request 2 4286 NULL
103879 +paging32_page_fault_4288 paging32_page_fault 2 4288 NULL
103880 +xt_compat_add_offset_4289 xt_compat_add_offset 0 4289 NULL
103881 +__usbnet_read_cmd_4299 __usbnet_read_cmd 7 4299 NULL
103882 +dvb_ringbuffer_pkt_read_user_4303 dvb_ringbuffer_pkt_read_user 3-2-5 4303 NULL
103883 +__pool_find_4308 __pool_find 3 4308 NULL
103884 +count_strings_4315 count_strings 0 4315 NULL
103885 +nouveau_fifo_create__4327 nouveau_fifo_create_ 5-6 4327 NULL
103886 +snd_rawmidi_kernel_read_4328 snd_rawmidi_kernel_read 3 4328 NULL
103887 +kvm_apic_get_reg_4354 kvm_apic_get_reg 0 4354 NULL
103888 +__copy_from_user_inatomic_4365 __copy_from_user_inatomic 0-3 4365 NULL nohasharray
103889 +lookup_string_4365 lookup_string 0 4365 &__copy_from_user_inatomic_4365
103890 +btrfs_set_disk_extent_flags_4374 btrfs_set_disk_extent_flags 0 4374 NULL
103891 +irda_sendmsg_4388 irda_sendmsg 4 4388 NULL
103892 +access_process_vm_4412 access_process_vm 0-4-2 4412 NULL nohasharray
103893 +cxacru_cm_get_array_4412 cxacru_cm_get_array 4 4412 &access_process_vm_4412
103894 +libfc_vport_create_4415 libfc_vport_create 2 4415 NULL
103895 +rtw_android_get_rssi_4421 rtw_android_get_rssi 0 4421 NULL
103896 +do_pages_stat_4437 do_pages_stat 2 4437 NULL
103897 +memparse_4444 memparse 0 4444 NULL
103898 +tcp_dma_try_early_copy_4457 tcp_dma_try_early_copy 3 4457 NULL
103899 +at76_set_card_command_4471 at76_set_card_command 4 4471 NULL
103900 +snd_seq_expand_var_event_4481 snd_seq_expand_var_event 5-0 4481 NULL
103901 +ocfs2_grow_tree_4492 ocfs2_grow_tree 0 4492 NULL
103902 +vmbus_establish_gpadl_4495 vmbus_establish_gpadl 3 4495 NULL
103903 +set_link_security_4502 set_link_security 4 4502 NULL
103904 +dm_cache_remove_mapping_4513 dm_cache_remove_mapping 2 4513 NULL
103905 +__gfn_to_pfn_memslot_4530 __gfn_to_pfn_memslot 2-0 4530 NULL
103906 +ll_max_readahead_per_file_mb_seq_write_4531 ll_max_readahead_per_file_mb_seq_write 3 4531 NULL
103907 +da9052_group_write_4534 da9052_group_write 2-3 4534 NULL
103908 +tty_register_device_4544 tty_register_device 2 4544 NULL
103909 +videobuf_vmalloc_to_sg_4548 videobuf_vmalloc_to_sg 2 4548 NULL
103910 +btrfs_file_extent_inline_item_len_4575 btrfs_file_extent_inline_item_len 0 4575 NULL
103911 +xfs_buf_get_maps_4581 xfs_buf_get_maps 2 4581 NULL
103912 +iommu_map_page_4588 iommu_map_page 5 4588 NULL
103913 +bch_alloc_4593 bch_alloc 1 4593 NULL
103914 +ocfs2_refcount_lock_4595 ocfs2_refcount_lock 0 4595 NULL
103915 +__wb_force_remove_mapping_4622 __wb_force_remove_mapping 2 4622 NULL
103916 +ll_rw_extents_stats_seq_write_4633 ll_rw_extents_stats_seq_write 3 4633 NULL
103917 +iwl_dbgfs_tx_queue_read_4635 iwl_dbgfs_tx_queue_read 3 4635 NULL
103918 +ext3_orphan_add_4665 ext3_orphan_add 0 4665 NULL
103919 +skb_add_data_nocache_4682 skb_add_data_nocache 4 4682 NULL
103920 +cx18_read_pos_4683 cx18_read_pos 3 4683 NULL
103921 +short_retry_limit_read_4687 short_retry_limit_read 3 4687 NULL
103922 +kone_receive_4690 kone_receive 4 4690 NULL
103923 +link_to_fixup_dir_4699 link_to_fixup_dir 0 4699 NULL
103924 +cxgbi_alloc_big_mem_4707 cxgbi_alloc_big_mem 1 4707 NULL
103925 +konepure_sysfs_read_4709 konepure_sysfs_read 6 4709 NULL
103926 +ati_create_gatt_pages_4722 ati_create_gatt_pages 1 4722 NULL nohasharray
103927 +show_header_4722 show_header 3 4722 &ati_create_gatt_pages_4722
103928 +gfs2_bit_search_4728 gfs2_bit_search 0-2 4728 NULL
103929 +ll_rw_offset_stats_seq_write_4736 ll_rw_offset_stats_seq_write 3 4736 NULL nohasharray
103930 +bitmap_startwrite_4736 bitmap_startwrite 2 4736 &ll_rw_offset_stats_seq_write_4736
103931 +__find_free_cblock_4741 __find_free_cblock 2 4741 NULL
103932 +lu_buf_alloc_4753 lu_buf_alloc 2 4753 NULL
103933 +find_next_best_node_4774 find_next_best_node 1-0 4774 NULL nohasharray
103934 +pwr_rcvd_bcns_cnt_read_4774 pwr_rcvd_bcns_cnt_read 3 4774 &find_next_best_node_4774
103935 +btrfs_del_items_4791 btrfs_del_items 0 4791 NULL nohasharray
103936 +create_subvol_4791 create_subvol 4 4791 &btrfs_del_items_4791
103937 +ncp__vol2io_4804 ncp__vol2io 5 4804 NULL
103938 +repair_io_failure_4815 repair_io_failure 4-3 4815 NULL
103939 +comedi_buf_write_free_4847 comedi_buf_write_free 2 4847 NULL
103940 +gigaset_if_receive_4861 gigaset_if_receive 3 4861 NULL
103941 +key_tx_spec_read_4862 key_tx_spec_read 3 4862 NULL
103942 +get_new_location_4866 get_new_location 0 4866 NULL
103943 +ocfs2_defrag_extent_4873 ocfs2_defrag_extent 3-2 4873 NULL
103944 +hid_register_field_4874 hid_register_field 2-3 4874 NULL
103945 +vga_arb_read_4886 vga_arb_read 3 4886 NULL
103946 +ntfs_rl_insert_4931 ntfs_rl_insert 4-2 4931 NULL
103947 +ieee80211_if_fmt_ave_beacon_4941 ieee80211_if_fmt_ave_beacon 3 4941 NULL
103948 +ocfs2_should_refresh_lock_res_4958 ocfs2_should_refresh_lock_res 0 4958 NULL
103949 +compat_rawv6_setsockopt_4967 compat_rawv6_setsockopt 5 4967 NULL
103950 +skb_network_header_len_4971 skb_network_header_len 0 4971 NULL
103951 +ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval_4976 ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval 3 4976 NULL
103952 +do_sync_read_4977 do_sync_read 0 4977 NULL
103953 +vmw_surface_define_size_4993 vmw_surface_define_size 0 4993 NULL
103954 +compat_SyS_ipc_5000 compat_SyS_ipc 3 5000 NULL
103955 +do_mincore_5018 do_mincore 0-2-1 5018 NULL
103956 +btrfs_punch_hole_5041 btrfs_punch_hole 2 5041 NULL
103957 +cfg80211_rx_mgmt_5056 cfg80211_rx_mgmt 5 5056 NULL
103958 +ocfs2_check_range_for_holes_5066 ocfs2_check_range_for_holes 3-2 5066 NULL
103959 +snd_mixart_BA1_read_5082 snd_mixart_BA1_read 5 5082 NULL
103960 +snd_emu10k1_ptr20_read_5087 snd_emu10k1_ptr20_read 0 5087 NULL
103961 +get_random_bytes_5091 get_random_bytes 2 5091 NULL nohasharray
103962 +kfifo_copy_from_user_5091 kfifo_copy_from_user 4-3-0 5091 &get_random_bytes_5091 nohasharray
103963 +blk_rq_sectors_5091 blk_rq_sectors 0 5091 &kfifo_copy_from_user_5091
103964 +sound_write_5102 sound_write 3 5102 NULL
103965 +clear_dirty_5105 clear_dirty 3 5105 NULL
103966 +i40e_dbg_netdev_ops_write_5117 i40e_dbg_netdev_ops_write 3 5117 NULL
103967 +qib_7220_handle_hwerrors_5142 qib_7220_handle_hwerrors 3 5142 NULL
103968 +ufs_add_fragments_5144 ufs_add_fragments 2 5144 NULL
103969 +ocfs2_inode_lock_full_nested_5148 ocfs2_inode_lock_full_nested 0 5148 NULL
103970 +__uwb_addr_print_5161 __uwb_addr_print 2 5161 NULL
103971 +iwl_dbgfs_status_read_5171 iwl_dbgfs_status_read 3 5171 NULL
103972 +acpi_pcc_get_sqty_5176 acpi_pcc_get_sqty 0 5176 NULL
103973 +ppp_cp_parse_cr_5214 ppp_cp_parse_cr 4 5214 NULL nohasharray
103974 +r600_mip_minify_5214 r600_mip_minify 2-1-0 5214 &ppp_cp_parse_cr_5214
103975 +dwc2_hcd_urb_alloc_5217 dwc2_hcd_urb_alloc 2 5217 NULL
103976 +ath6kl_debug_roam_tbl_event_5224 ath6kl_debug_roam_tbl_event 3 5224 NULL
103977 +nouveau_fb_create__5244 nouveau_fb_create_ 5 5244 NULL
103978 +gfn_to_hva_memslot_5265 gfn_to_hva_memslot 2 5265 NULL
103979 +btrfs_alloc_reserved_file_extent_5274 btrfs_alloc_reserved_file_extent 0 5274 NULL
103980 +iommu_domain_identity_map_5284 iommu_domain_identity_map 2-3 5284 NULL
103981 +alloc_cache_blocks_with_hash_5285 alloc_cache_blocks_with_hash 2 5285 NULL
103982 +usb_descriptor_fillbuf_5302 usb_descriptor_fillbuf 0 5302 NULL
103983 +__gfn_to_hva_memslot_5304 __gfn_to_hva_memslot 0-2 5304 NULL
103984 +r592_write_fifo_pio_5315 r592_write_fifo_pio 3 5315 NULL
103985 +sbc_get_write_same_sectors_5317 sbc_get_write_same_sectors 0 5317 NULL
103986 +pwr_elp_enter_read_5324 pwr_elp_enter_read 3 5324 NULL
103987 +allocate_cnodes_5329 allocate_cnodes 1 5329 NULL
103988 +vm_insert_pfn_5341 vm_insert_pfn 3-0 5341 NULL
103989 +cq_free_res_5355 cq_free_res 5 5355 NULL
103990 +ps_pspoll_utilization_read_5361 ps_pspoll_utilization_read 3 5361 NULL
103991 +cciss_allocate_sg_chain_blocks_5368 cciss_allocate_sg_chain_blocks 2-3 5368 NULL
103992 +kvm_pin_pages_5369 kvm_pin_pages 2-0 5369 NULL
103993 +bitmap_fold_5396 bitmap_fold 4 5396 NULL
103994 +security_inode_init_security_5408 security_inode_init_security 0 5408 NULL
103995 +__resolve_indirect_refs_5409 __resolve_indirect_refs 0 5409 NULL
103996 +nilfs_palloc_entries_per_group_5418 nilfs_palloc_entries_per_group 0 5418 NULL
103997 +check_item_in_log_5440 check_item_in_log 0 5440 NULL
103998 +__split_bvec_across_targets_5454 __split_bvec_across_targets 3 5454 NULL
103999 +xfs_efd_init_5463 xfs_efd_init 3 5463 NULL
104000 +xfs_efi_init_5476 xfs_efi_init 2 5476 NULL
104001 +ubi_leb_write_5478 ubi_leb_write 4-5 5478 NULL
104002 +cifs_security_flags_proc_write_5484 cifs_security_flags_proc_write 3 5484 NULL
104003 +tty_write_5494 tty_write 3 5494 NULL
104004 +tomoyo_update_domain_5498 tomoyo_update_domain 2 5498 NULL nohasharray
104005 +ieee80211_if_fmt_last_beacon_5498 ieee80211_if_fmt_last_beacon 3 5498 &tomoyo_update_domain_5498
104006 +__max_nr_grant_frames_5505 __max_nr_grant_frames 0 5505 NULL
104007 +ieee80211_if_fmt_auto_open_plinks_5534 ieee80211_if_fmt_auto_open_plinks 3 5534 NULL
104008 +iommu_prepare_identity_map_5540 iommu_prepare_identity_map 2-3 5540 NULL
104009 +get_entry_msg_len_5552 get_entry_msg_len 0 5552 NULL
104010 +le_readq_5557 le_readq 0 5557 NULL
104011 +inw_5558 inw 0 5558 NULL
104012 +bioset_create_5580 bioset_create 1 5580 NULL
104013 +domain_sg_mapping_5586 domain_sg_mapping 4 5586 NULL
104014 +oz_ep_alloc_5587 oz_ep_alloc 1 5587 NULL
104015 +ldm_frag_add_5611 ldm_frag_add 2 5611 NULL
104016 +compat_copy_entries_5617 compat_copy_entries 0 5617 NULL
104017 +SYSC_init_module_5626 SYSC_init_module 2 5626 NULL
104018 +iterate_extent_inodes_5631 iterate_extent_inodes 0 5631 NULL
104019 +SYSC_fsetxattr_5639 SYSC_fsetxattr 4 5639 NULL
104020 +ext4_xattr_get_5661 ext4_xattr_get 0 5661 NULL
104021 +posix_clock_register_5662 posix_clock_register 2 5662 NULL
104022 +kgdb_arch_pc_5673 kgdb_arch_pc 0 5673 NULL
104023 +wb_clear_dirty_5684 wb_clear_dirty 2 5684 NULL
104024 +get_arg_5694 get_arg 3 5694 NULL
104025 +subbuf_read_actor_5708 subbuf_read_actor 3 5708 NULL
104026 +ntfs_attr_record_resize_5720 ntfs_attr_record_resize 0 5720 NULL
104027 +vmw_kms_readback_5727 vmw_kms_readback 6 5727 NULL
104028 +rts51x_transfer_data_partial_5735 rts51x_transfer_data_partial 6 5735 NULL
104029 +ubi_calc_fm_size_5749 ubi_calc_fm_size 0 5749 NULL
104030 +sctp_setsockopt_autoclose_5775 sctp_setsockopt_autoclose 3 5775 NULL
104031 +__vxge_hw_blockpool_malloc_5786 __vxge_hw_blockpool_malloc 2 5786 NULL
104032 +nvme_trans_bdev_char_page_5797 nvme_trans_bdev_char_page 3 5797 NULL
104033 +skb_copy_datagram_iovec_5806 skb_copy_datagram_iovec 2-4 5806 NULL
104034 +nv50_disp_pioc_create__5812 nv50_disp_pioc_create_ 5 5812 NULL
104035 +ceph_x_encrypt_buflen_5829 ceph_x_encrypt_buflen 0-1 5829 NULL
104036 +ceph_msg_new_5846 ceph_msg_new 2 5846 NULL
104037 +setup_req_5848 setup_req 3 5848 NULL
104038 +ria_page_count_5849 ria_page_count 0 5849 NULL
104039 +rx_filter_max_arp_queue_dep_read_5851 rx_filter_max_arp_queue_dep_read 3 5851 NULL
104040 +config_buf_5862 config_buf 0 5862 NULL
104041 +ext4_ext_correct_indexes_5865 ext4_ext_correct_indexes 0 5865 NULL
104042 +paging64_walk_addr_5887 paging64_walk_addr 3 5887 NULL
104043 +scan_bitmap_5888 scan_bitmap 3 5888 NULL
104044 +lprocfs_fid_width_seq_write_5889 lprocfs_fid_width_seq_write 3 5889 NULL
104045 +port_show_regs_5904 port_show_regs 3 5904 NULL
104046 +rbd_segment_length_5907 rbd_segment_length 0-3-2 5907 NULL
104047 +uhci_debug_read_5911 uhci_debug_read 3 5911 NULL
104048 +lbs_highsnr_read_5931 lbs_highsnr_read 3 5931 NULL
104049 +ps_poll_ps_poll_timeouts_read_5934 ps_poll_ps_poll_timeouts_read 3 5934 NULL
104050 +edac_device_alloc_ctl_info_5941 edac_device_alloc_ctl_info 1 5941 NULL
104051 +find_parent_nodes_5948 find_parent_nodes 0 5948 NULL
104052 +ll_statahead_one_5962 ll_statahead_one 3 5962 NULL
104053 +__apu_get_register_5967 __apu_get_register 0 5967 NULL
104054 +ieee80211_if_fmt_rc_rateidx_mask_5ghz_5971 ieee80211_if_fmt_rc_rateidx_mask_5ghz 3 5971 NULL
104055 +native_pte_val_5978 native_pte_val 0 5978 NULL
104056 +jbd2_journal_stop_5979 jbd2_journal_stop 0 5979 NULL
104057 +ntfs_rl_append_6037 ntfs_rl_append 4-2 6037 NULL
104058 +da9052_request_irq_6058 da9052_request_irq 2 6058 NULL nohasharray
104059 +device_add_attributes_6058 device_add_attributes 0 6058 &da9052_request_irq_6058
104060 +alloc_msg_6072 alloc_msg 1 6072 NULL
104061 +sctp_setsockopt_connectx_6073 sctp_setsockopt_connectx 3 6073 NULL
104062 +rts51x_ms_rw_multi_sector_6076 rts51x_ms_rw_multi_sector 3-4 6076 NULL
104063 +md_trim_bio_6078 md_trim_bio 2 6078 NULL
104064 +finish_inode_if_needed_6098 finish_inode_if_needed 0 6098 NULL
104065 +ipmi_addr_length_6110 ipmi_addr_length 0 6110 NULL
104066 +dfs_global_file_write_6112 dfs_global_file_write 3 6112 NULL
104067 +nouveau_parent_create__6131 nouveau_parent_create_ 7 6131 NULL
104068 +__btrfs_commit_inode_delayed_items_6150 __btrfs_commit_inode_delayed_items 0 6150 NULL
104069 +ieee80211_if_fmt_beacon_timeout_6153 ieee80211_if_fmt_beacon_timeout 3 6153 NULL
104070 +ivtv_copy_buf_to_user_6159 ivtv_copy_buf_to_user 4 6159 NULL
104071 +vdma_mem_alloc_6171 vdma_mem_alloc 1 6171 NULL
104072 +wl1251_cmd_template_set_6172 wl1251_cmd_template_set 4 6172 NULL
104073 +paging64_walk_addr_generic_6180 paging64_walk_addr_generic 4 6180 NULL
104074 +SyS_setgroups_6182 SyS_setgroups 1 6182 NULL
104075 +__add_pin_to_irq_node_6188 __add_pin_to_irq_node 2 6188 NULL
104076 +qp_host_get_user_memory_6189 qp_host_get_user_memory 1-2 6189 NULL
104077 +cl_sync_io_wait_6196 cl_sync_io_wait 0 6196 NULL
104078 +i915_gem_execbuffer_move_to_gpu_6197 i915_gem_execbuffer_move_to_gpu 0 6197 NULL
104079 +mxt_show_instance_6207 mxt_show_instance 2-0 6207 NULL
104080 +v4l2_ctrl_new_std_menu_6221 v4l2_ctrl_new_std_menu 4 6221 NULL
104081 +mqueue_read_file_6228 mqueue_read_file 3 6228 NULL
104082 +f_hidg_read_6238 f_hidg_read 3 6238 NULL
104083 +changed_ref_6242 changed_ref 0 6242 NULL
104084 +fbcon_prepare_logo_6246 fbcon_prepare_logo 5 6246 NULL
104085 +ext4_ext_split_6249 ext4_ext_split 0 6249 NULL
104086 +pcpu_next_pop_6277 pcpu_next_pop 4 6277 NULL
104087 +tx_tx_start_null_frame_read_6281 tx_tx_start_null_frame_read 3 6281 NULL
104088 +snd_hda_override_conn_list_6282 snd_hda_override_conn_list 3-0 6282 NULL nohasharray
104089 +xenbus_file_write_6282 xenbus_file_write 3 6282 &snd_hda_override_conn_list_6282
104090 +posix_acl_fix_xattr_to_user_6283 posix_acl_fix_xattr_to_user 2 6283 NULL
104091 +paging64_gva_to_gpa_nested_6287 paging64_gva_to_gpa_nested 2 6287 NULL
104092 +qlcnic_sriov_alloc_bc_msg_6309 qlcnic_sriov_alloc_bc_msg 2 6309 NULL
104093 +exclude_super_stripes_6326 exclude_super_stripes 0 6326 NULL
104094 +SyS_mincore_6329 SyS_mincore 2-1 6329 NULL nohasharray
104095 +hfa384x_inw_6329 hfa384x_inw 0 6329 &SyS_mincore_6329
104096 +fuse_get_req_for_background_6337 fuse_get_req_for_background 2 6337 NULL
104097 +ucs2_strnlen_6342 ucs2_strnlen 0 6342 NULL
104098 +utc2ntfs_6347 utc2ntfs 0 6347 NULL
104099 +regcache_sync_block_raw_6350 regcache_sync_block_raw 5-4 6350 NULL
104100 +mei_dbgfs_read_devstate_6352 mei_dbgfs_read_devstate 3 6352 NULL
104101 +_proc_do_string_6376 _proc_do_string 2 6376 NULL
104102 +osd_req_read_sg_kern_6378 osd_req_read_sg_kern 5 6378 NULL
104103 +msb_write_block_6379 msb_write_block 3 6379 NULL
104104 +BcmFlash2xBulkRead_6395 BcmFlash2xBulkRead 0 6395 NULL
104105 +posix_acl_fix_xattr_userns_6420 posix_acl_fix_xattr_userns 4 6420 NULL
104106 +add_transaction_credits_6422 add_transaction_credits 2-3 6422 NULL
104107 +ipr_change_queue_depth_6431 ipr_change_queue_depth 2 6431 NULL
104108 +__alloc_bootmem_node_nopanic_6432 __alloc_bootmem_node_nopanic 2 6432 NULL
104109 +add_to_list_6433 add_to_list 0 6433 NULL
104110 +paging32_gva_to_gpa_nested_6442 paging32_gva_to_gpa_nested 2 6442 NULL
104111 +i915_gem_object_wait_rendering_6446 i915_gem_object_wait_rendering 0 6446 NULL
104112 +mlx4_ib_reg_user_mr_6471 mlx4_ib_reg_user_mr 2-3 6471 NULL
104113 +ieee80211_if_fmt_dot11MeshMaxRetries_6476 ieee80211_if_fmt_dot11MeshMaxRetries 3 6476 NULL
104114 +qp_memcpy_from_queue_6479 qp_memcpy_from_queue 5-4 6479 NULL
104115 +cipso_v4_map_lvl_hton_6490 cipso_v4_map_lvl_hton 0 6490 NULL
104116 +ntfs_cluster_free_6497 ntfs_cluster_free 0 6497 NULL
104117 +dbg_intr_buf_6501 dbg_intr_buf 2 6501 NULL
104118 +mei_read_6507 mei_read 3 6507 NULL
104119 +__start_delalloc_inodes_6528 __start_delalloc_inodes 0 6528 NULL
104120 +rndis_set_oid_6547 rndis_set_oid 4 6547 NULL
104121 +wdm_read_6549 wdm_read 3 6549 NULL
104122 +dm_stats_create_6551 dm_stats_create 4-2-3 6551 NULL
104123 +fb_alloc_cmap_6554 fb_alloc_cmap 2 6554 NULL
104124 +SyS_semtimedop_6563 SyS_semtimedop 3 6563 NULL
104125 +SyS_fcntl64_6582 SyS_fcntl64 3 6582 NULL
104126 +snd_pcm_hw_refine_old_user_6586 snd_pcm_hw_refine_old_user 0 6586 NULL
104127 +btrfs_start_all_delalloc_inodes_6596 btrfs_start_all_delalloc_inodes 0 6596 NULL
104128 +snmp_mib_init_6604 snmp_mib_init 2-3 6604 NULL
104129 +ecryptfs_filldir_6622 ecryptfs_filldir 3 6622 NULL
104130 +xfs_do_div_6649 xfs_do_div 0-2 6649 NULL
104131 +journal_dirty_metadata_6658 journal_dirty_metadata 0 6658 NULL
104132 +process_rcvd_data_6679 process_rcvd_data 3 6679 NULL
104133 +btrfs_lookup_csums_range_6696 btrfs_lookup_csums_range 2-3-0 6696 NULL
104134 +ps_pspoll_max_apturn_read_6699 ps_pspoll_max_apturn_read 3 6699 NULL
104135 +bnad_debugfs_write_regrd_6706 bnad_debugfs_write_regrd 3 6706 NULL
104136 +mpeg_read_6708 mpeg_read 3 6708 NULL
104137 +ibmpex_query_sensor_count_6709 ibmpex_query_sensor_count 0 6709 NULL
104138 +set_orig_insn_6712 set_orig_insn 3 6712 NULL
104139 +video_proc_write_6724 video_proc_write 3 6724 NULL
104140 +posix_acl_xattr_count_6725 posix_acl_xattr_count 0-1 6725 NULL
104141 +ocfs2_insert_extent_6737 ocfs2_insert_extent 0 6737 NULL
104142 +btrfs_inode_delayed_dir_index_count_6759 btrfs_inode_delayed_dir_index_count 0 6759 NULL
104143 +kobject_add_varg_6781 kobject_add_varg 0 6781 NULL
104144 +iwl_dbgfs_channels_read_6784 iwl_dbgfs_channels_read 3 6784 NULL
104145 +ieee80211_if_read_6785 ieee80211_if_read 3 6785 NULL
104146 +zone_spanned_pages_in_node_6787 zone_spanned_pages_in_node 0-3-4 6787 NULL
104147 +hdlcdrv_register_6792 hdlcdrv_register 2 6792 NULL
104148 +tx_tx_done_data_read_6799 tx_tx_done_data_read 3 6799 NULL
104149 +ocfs2_calc_refcount_meta_credits_6802 ocfs2_calc_refcount_meta_credits 0 6802 NULL
104150 +lbs_rdrf_write_6826 lbs_rdrf_write 3 6826 NULL
104151 +make_8259A_irq_6828 make_8259A_irq 1 6828 NULL
104152 +calc_pages_for_6838 calc_pages_for 0-1-2 6838 NULL
104153 +mon_bin_read_6841 mon_bin_read 3 6841 NULL
104154 +snd_cs4281_BA0_read_6847 snd_cs4281_BA0_read 5 6847 NULL
104155 +ecryptfs_write_lower_6870 ecryptfs_write_lower 4 6870 NULL
104156 +dio_complete_6879 dio_complete 0-2-3 6879 NULL
104157 +ieee80211_if_fmt_path_refresh_time_6888 ieee80211_if_fmt_path_refresh_time 3 6888 NULL nohasharray
104158 +raw_seticmpfilter_6888 raw_seticmpfilter 3 6888 &ieee80211_if_fmt_path_refresh_time_6888
104159 +dlmfs_file_write_6892 dlmfs_file_write 3 6892 NULL
104160 +ext4_inode_bitmap_6902 ext4_inode_bitmap 0 6902 NULL
104161 +spi_show_regs_6911 spi_show_regs 3 6911 NULL nohasharray
104162 +proc_sessionid_read_6911 proc_sessionid_read 3 6911 &spi_show_regs_6911 nohasharray
104163 +acm_alloc_minor_6911 acm_alloc_minor 0 6911 &proc_sessionid_read_6911
104164 +__kfifo_dma_in_finish_r_6913 __kfifo_dma_in_finish_r 2-3 6913 NULL
104165 +do_msgrcv_6921 do_msgrcv 3 6921 NULL
104166 +__vxge_hw_mempool_create_6923 __vxge_hw_mempool_create 3-2-6 6923 NULL
104167 +cache_do_downcall_6926 cache_do_downcall 3 6926 NULL
104168 +ipath_verbs_send_dma_6929 ipath_verbs_send_dma 6 6929 NULL
104169 +qsfp_cks_6945 qsfp_cks 2-0 6945 NULL
104170 +tg3_nvram_write_block_unbuffered_6955 tg3_nvram_write_block_unbuffered 3 6955 NULL
104171 +pch_uart_hal_read_6961 pch_uart_hal_read 0 6961 NULL
104172 +videobuf_dma_init_kernel_6963 videobuf_dma_init_kernel 3 6963 NULL
104173 +i40e_dbg_dump_write_6973 i40e_dbg_dump_write 3 6973 NULL nohasharray
104174 +rsa_extract_mpi_6973 rsa_extract_mpi 5 6973 &i40e_dbg_dump_write_6973
104175 +crypto_authenc_esn_setkey_6985 crypto_authenc_esn_setkey 3 6985 NULL
104176 +request_key_async_6990 request_key_async 4 6990 NULL
104177 +tpl_write_6998 tpl_write 3 6998 NULL
104178 +r871x_set_wpa_ie_7000 r871x_set_wpa_ie 3 7000 NULL
104179 +log_wait_commit_7005 log_wait_commit 0 7005 NULL
104180 +cipso_v4_gentag_enum_7006 cipso_v4_gentag_enum 0 7006 NULL
104181 +tracing_cpumask_read_7010 tracing_cpumask_read 3 7010 NULL
104182 +ld_usb_write_7022 ld_usb_write 3 7022 NULL
104183 +wimax_msg_7030 wimax_msg 4 7030 NULL
104184 +ipath_get_base_info_7043 ipath_get_base_info 3 7043 NULL
104185 +snd_pcm_oss_bytes_7051 snd_pcm_oss_bytes 2 7051 NULL
104186 +hci_sock_recvmsg_7072 hci_sock_recvmsg 4 7072 NULL
104187 +event_enable_read_7074 event_enable_read 3 7074 NULL
104188 +ip_vs_sync_conn_7075 ip_vs_sync_conn 3 7075 NULL
104189 +beacon_interval_read_7091 beacon_interval_read 3 7091 NULL
104190 +pipeline_enc_rx_stat_fifo_int_read_7107 pipeline_enc_rx_stat_fifo_int_read 3 7107 NULL
104191 +check_header_7108 check_header 0 7108 NULL
104192 +osc_resend_count_seq_write_7120 osc_resend_count_seq_write 3 7120 NULL
104193 +qib_format_hwerrors_7133 qib_format_hwerrors 5 7133 NULL
104194 +kvm_mmu_notifier_test_young_7139 kvm_mmu_notifier_test_young 3 7139 NULL
104195 +ipv6_recv_rxpmtu_7142 ipv6_recv_rxpmtu 3 7142 NULL
104196 +qlcnic_enable_msix_7144 qlcnic_enable_msix 2 7144 NULL
104197 +ocfs2_get_left_path_7159 ocfs2_get_left_path 0 7159 NULL
104198 +core_alua_write_tpg_metadata_7168 core_alua_write_tpg_metadata 3 7168 NULL
104199 +ext3_xattr_ibody_list_7201 ext3_xattr_ibody_list 3-0 7201 NULL
104200 +__alloc_objio_seg_7203 __alloc_objio_seg 1 7203 NULL
104201 +get_param_h_7247 get_param_h 0 7247 NULL
104202 +af_alg_make_sg_7254 af_alg_make_sg 3-0 7254 NULL
104203 +hdlc_loop_7255 hdlc_loop 0 7255 NULL
104204 +vm_mmap_pgoff_7259 vm_mmap_pgoff 0 7259 NULL
104205 +snd_mask_refine_7267 snd_mask_refine 0 7267 NULL
104206 +f_midi_start_ep_7270 f_midi_start_ep 0 7270 NULL
104207 +dma_ops_alloc_addresses_7272 dma_ops_alloc_addresses 3-4-5-0 7272 NULL
104208 +rx_rate_rx_frames_per_rates_read_7282 rx_rate_rx_frames_per_rates_read 3 7282 NULL
104209 +get_string_7302 get_string 0 7302 NULL
104210 +wb_remove_mapping_7307 wb_remove_mapping 2 7307 NULL
104211 +wait_on_sync_kiocb_7327 wait_on_sync_kiocb 0 7327 NULL
104212 +mgmt_control_7349 mgmt_control 3 7349 NULL
104213 +max8998_irq_domain_map_7359 max8998_irq_domain_map 2 7359 NULL
104214 +i915_gem_do_execbuffer_7362 i915_gem_do_execbuffer 0 7362 NULL nohasharray
104215 +ext3_free_blocks_7362 ext3_free_blocks 3-4 7362 &i915_gem_do_execbuffer_7362
104216 +at_est2timeout_7365 at_est2timeout 0-1 7365 NULL
104217 +ieee80211_if_read_dot11MeshHWMPactivePathTimeout_7368 ieee80211_if_read_dot11MeshHWMPactivePathTimeout 3 7368 NULL
104218 +schedule_timeout_7371 schedule_timeout 0 7371 NULL
104219 +ath10k_read_fw_stats_7387 ath10k_read_fw_stats 3 7387 NULL
104220 +hweight_long_7388 hweight_long 1-0 7388 NULL
104221 +sl_change_mtu_7396 sl_change_mtu 2 7396 NULL
104222 +_ore_add_stripe_unit_7399 _ore_add_stripe_unit 6-3 7399 NULL
104223 +readb_7401 readb 0 7401 NULL
104224 +drm_property_create_blob_7414 drm_property_create_blob 2 7414 NULL
104225 +ip_options_get_alloc_7448 ip_options_get_alloc 1 7448 NULL
104226 +SYSC_setgroups_7454 SYSC_setgroups 1 7454 NULL
104227 +rt2x00debug_read_queue_stats_7455 rt2x00debug_read_queue_stats 3 7455 NULL
104228 +l2tp_ip6_sendmsg_7461 l2tp_ip6_sendmsg 4 7461 NULL
104229 +ReadHSCX_7471 ReadHSCX 0 7471 NULL nohasharray
104230 +garp_request_join_7471 garp_request_join 4 7471 &ReadHSCX_7471
104231 +snd_pcm_lib_read1_7491 snd_pcm_lib_read1 0-3 7491 NULL
104232 +iwl_mvm_power_dbgfs_read_7502 iwl_mvm_power_dbgfs_read 0 7502 NULL
104233 +sdhci_alloc_host_7509 sdhci_alloc_host 2 7509 NULL nohasharray
104234 +ahash_instance_headroom_7509 ahash_instance_headroom 0 7509 &sdhci_alloc_host_7509
104235 +array_zalloc_7519 array_zalloc 2-1 7519 NULL
104236 +btrfs_insert_xattr_item_7545 btrfs_insert_xattr_item 0 7545 NULL
104237 +goal_in_my_reservation_7553 goal_in_my_reservation 3 7553 NULL
104238 +smk_read_mapped_7562 smk_read_mapped 3 7562 NULL
104239 +cfs_cpt_num_estimate_7571 cfs_cpt_num_estimate 0 7571 NULL
104240 +ext4_ext_insert_extent_7576 ext4_ext_insert_extent 0 7576 NULL
104241 +btrfs_block_rsv_add_7579 btrfs_block_rsv_add 3-0 7579 NULL
104242 +ext3_try_to_allocate_7590 ext3_try_to_allocate 5-3-0 7590 NULL
104243 +ocfs2_lock_create_7612 ocfs2_lock_create 0 7612 NULL
104244 +create_dir_7614 create_dir 0 7614 NULL nohasharray
104245 +groups_alloc_7614 groups_alloc 1 7614 &create_dir_7614
104246 +_rtw_zmalloc_7636 _rtw_zmalloc 1 7636 NULL
104247 +fault_inject_write_7662 fault_inject_write 3 7662 NULL
104248 +acpi_ex_allocate_name_string_7685 acpi_ex_allocate_name_string 1-2 7685 NULL
104249 +acpi_ns_get_pathname_length_7699 acpi_ns_get_pathname_length 0 7699 NULL
104250 +dev_write_7708 dev_write 3 7708 NULL
104251 +unmap_region_7709 unmap_region 1 7709 NULL
104252 +dbg_check_cats_7713 dbg_check_cats 0 7713 NULL
104253 +pci_raw_set_power_state_7729 pci_raw_set_power_state 0 7729 NULL
104254 +vxge_device_register_7752 vxge_device_register 4 7752 NULL
104255 +ubi_io_read_vid_hdr_7766 ubi_io_read_vid_hdr 0 7766 NULL
104256 +paths_from_inode_7774 paths_from_inode 0 7774 NULL
104257 +alloc_candev_7776 alloc_candev 1-2 7776 NULL
104258 +dfs_global_file_read_7787 dfs_global_file_read 3 7787 NULL
104259 +bnx2_nvram_write_7790 bnx2_nvram_write 2-4 7790 NULL
104260 +diva_os_copy_from_user_7792 diva_os_copy_from_user 4 7792 NULL nohasharray
104261 +lustre_packed_msg_size_7792 lustre_packed_msg_size 0 7792 &diva_os_copy_from_user_7792
104262 +ubifs_leb_read_7828 ubifs_leb_read 0 7828 NULL
104263 +cfs_trace_dump_debug_buffer_usrstr_7861 cfs_trace_dump_debug_buffer_usrstr 2 7861 NULL
104264 +tipc_alloc_entry_7875 tipc_alloc_entry 2 7875 NULL
104265 +btrfs_find_space_for_alloc_7876 btrfs_find_space_for_alloc 2 7876 NULL
104266 +config_desc_7878 config_desc 0 7878 NULL
104267 +dvb_dmxdev_read_sec_7892 dvb_dmxdev_read_sec 4 7892 NULL
104268 +xfs_trans_get_efi_7898 xfs_trans_get_efi 2 7898 NULL
104269 +ext3_group_extend_7911 ext3_group_extend 3 7911 NULL
104270 +libfc_host_alloc_7917 libfc_host_alloc 2 7917 NULL
104271 +f_hidg_write_7932 f_hidg_write 3 7932 NULL
104272 +io_apic_setup_irq_pin_once_7934 io_apic_setup_irq_pin_once 1-2 7934 NULL
104273 +compare_refs_7938 compare_refs 0 7938 NULL
104274 +fsnotify_7943 fsnotify 0 7943 NULL
104275 +hash_netiface6_expire_7944 hash_netiface6_expire 3 7944 NULL
104276 +integrity_digsig_verify_7956 integrity_digsig_verify 3 7956 NULL
104277 +smk_write_load_self_7958 smk_write_load_self 3 7958 NULL
104278 +bch_btree_to_text_7960 bch_btree_to_text 2 7960 NULL
104279 +fixup_inode_link_count_8002 fixup_inode_link_count 0 8002 NULL
104280 +extend_or_restart_transaction_8008 extend_or_restart_transaction 0 8008 NULL
104281 +tt3650_ci_msg_locked_8013 tt3650_ci_msg_locked 4 8013 NULL
104282 +vcs_read_8017 vcs_read 3 8017 NULL
104283 +vhost_add_used_and_signal_n_8038 vhost_add_used_and_signal_n 4 8038 NULL
104284 +ms_read_multiple_pages_8052 ms_read_multiple_pages 5-4 8052 NULL
104285 +dgrp_mon_read_8065 dgrp_mon_read 3 8065 NULL
104286 +leb_read_lock_8070 leb_read_lock 0 8070 NULL
104287 +spi_write_then_read_8073 spi_write_then_read 5-3 8073 NULL
104288 +alloc_targets_8074 alloc_targets 2 8074 NULL nohasharray
104289 +qla4xxx_post_ping_evt_work_8074 qla4xxx_post_ping_evt_work 4 8074 &alloc_targets_8074
104290 +ext4_ext_map_blocks_8078 ext4_ext_map_blocks 0 8078 NULL
104291 +venus_lookup_8121 venus_lookup 4 8121 NULL
104292 +ieee80211_if_fmt_num_buffered_multicast_8127 ieee80211_if_fmt_num_buffered_multicast 3 8127 NULL
104293 +xfs_iomap_prealloc_size_8141 xfs_iomap_prealloc_size 3 8141 NULL
104294 +dma_map_area_8178 dma_map_area 3-2-5-0 8178 NULL
104295 +ore_truncate_8181 ore_truncate 3 8181 NULL
104296 +__sk_mem_schedule_8185 __sk_mem_schedule 2 8185 NULL
104297 +ieee80211_if_fmt_dot11MeshHoldingTimeout_8187 ieee80211_if_fmt_dot11MeshHoldingTimeout 3 8187 NULL
104298 +update_cowonly_root_8200 update_cowonly_root 0 8200 NULL
104299 +recent_mt_proc_write_8206 recent_mt_proc_write 3 8206 NULL
104300 +__ocfs2_lock_refcount_tree_8207 __ocfs2_lock_refcount_tree 0 8207 NULL
104301 +rt2x00debug_write_bbp_8212 rt2x00debug_write_bbp 3 8212 NULL
104302 +ad7879_spi_multi_read_8218 ad7879_spi_multi_read 3 8218 NULL
104303 +play_iframe_8219 play_iframe 3 8219 NULL
104304 +create_log_8225 create_log 2 8225 NULL nohasharray
104305 +kvm_mmu_page_set_gfn_8225 kvm_mmu_page_set_gfn 2 8225 &create_log_8225
104306 +sctp_ssnmap_size_8228 sctp_ssnmap_size 0-1-2 8228 NULL
104307 +ceph_sync_write_8233 ceph_sync_write 4 8233 NULL
104308 +bnx2x_iov_get_max_queue_count_8235 bnx2x_iov_get_max_queue_count 0 8235 NULL
104309 +check_xattr_ref_inode_8244 check_xattr_ref_inode 0 8244 NULL
104310 +t3_init_l2t_8261 t3_init_l2t 1 8261 NULL
104311 +init_cdev_8274 init_cdev 1 8274 NULL
104312 +rproc_recovery_write_8281 rproc_recovery_write 3 8281 NULL
104313 +qib_decode_7220_err_8315 qib_decode_7220_err 3 8315 NULL
104314 +snd_pcm_update_state_8320 snd_pcm_update_state 0 8320 NULL
104315 +construct_key_and_link_8321 construct_key_and_link 4 8321 NULL
104316 +ipwireless_send_packet_8328 ipwireless_send_packet 4 8328 NULL
104317 +cfs_cpt_spread_node_8338 cfs_cpt_spread_node 0 8338 NULL
104318 +tracing_entries_read_8345 tracing_entries_read 3 8345 NULL
104319 +ieee80211_if_fmt_ht_opmode_8347 ieee80211_if_fmt_ht_opmode 3 8347 NULL
104320 +generic_write_sync_8358 generic_write_sync 0 8358 NULL
104321 +ping_getfrag_8360 ping_getfrag 4-3 8360 NULL
104322 +ath6kl_lrssi_roam_write_8362 ath6kl_lrssi_roam_write 3 8362 NULL
104323 +ocfs2_decrease_refcount_rec_8385 ocfs2_decrease_refcount_rec 0 8385 NULL
104324 +xdi_copy_from_user_8395 xdi_copy_from_user 4 8395 NULL
104325 +zd_rf_scnprint_id_8406 zd_rf_scnprint_id 0-3 8406 NULL
104326 +smk_write_change_rule_8411 smk_write_change_rule 3 8411 NULL nohasharray
104327 +uvc_v4l2_ioctl_8411 uvc_v4l2_ioctl 2 8411 &smk_write_change_rule_8411
104328 +pca953x_gpio_to_irq_8424 pca953x_gpio_to_irq 2 8424 NULL
104329 +irq_create_mapping_8437 irq_create_mapping 2-0 8437 NULL
104330 +generic_bin_search_8440 generic_bin_search 0 8440 NULL
104331 +ring_wait_for_space_8457 ring_wait_for_space 0 8457 NULL
104332 +dir_changed_8471 dir_changed 0 8471 NULL
104333 +afs_cell_lookup_8482 afs_cell_lookup 2 8482 NULL
104334 +fore200e_chunk_alloc_8501 fore200e_chunk_alloc 4-3 8501 NULL
104335 +batadv_tt_len_8502 batadv_tt_len 0-1 8502 NULL
104336 +dev_config_8506 dev_config 3 8506 NULL
104337 +ACL_to_cifs_posix_8509 ACL_to_cifs_posix 3 8509 NULL
104338 +opticon_process_data_packet_8524 opticon_process_data_packet 3 8524 NULL
104339 +alloc_pg_vec_8533 alloc_pg_vec 2 8533 NULL
104340 +ocfs2_read_virt_blocks_8538 ocfs2_read_virt_blocks 2-3 8538 NULL
104341 +user_on_off_8552 user_on_off 2 8552 NULL
104342 +profile_remove_8556 profile_remove 3 8556 NULL
104343 +remove_extent_backref_8559 remove_extent_backref 0 8559 NULL
104344 +cache_slow_downcall_8570 cache_slow_downcall 2 8570 NULL
104345 +isr_dma0_done_read_8574 isr_dma0_done_read 3 8574 NULL
104346 +tower_write_8580 tower_write 3 8580 NULL
104347 +ocfs2_reserve_local_alloc_bits_8581 ocfs2_reserve_local_alloc_bits 0 8581 NULL
104348 +cfs_cpt_number_8618 cfs_cpt_number 0 8618 NULL
104349 +shash_setkey_unaligned_8620 shash_setkey_unaligned 3 8620 NULL
104350 +iommu_unmap_8624 iommu_unmap 2-0 8624 NULL
104351 +it821x_firmware_command_8628 it821x_firmware_command 3 8628 NULL
104352 +scsi_dma_map_8632 scsi_dma_map 0 8632 NULL
104353 +fuse_send_write_pages_8636 fuse_send_write_pages 0-5 8636 NULL
104354 +generic_acl_set_8658 generic_acl_set 4 8658 NULL
104355 +mlx5_vzalloc_8663 mlx5_vzalloc 1 8663 NULL
104356 +dio_bio_alloc_8677 dio_bio_alloc 5 8677 NULL
104357 +lbs_bcnmiss_read_8678 lbs_bcnmiss_read 3 8678 NULL
104358 +tc3589x_gpio_irq_unmap_8680 tc3589x_gpio_irq_unmap 2 8680 NULL
104359 +rproc_trace_read_8686 rproc_trace_read 3 8686 NULL
104360 +skb_frag_size_8695 skb_frag_size 0 8695 NULL
104361 +arcfb_write_8702 arcfb_write 3 8702 NULL
104362 +i_size_read_8703 i_size_read 0 8703 NULL nohasharray
104363 +init_header_8703 init_header 0 8703 &i_size_read_8703
104364 +HDLC_irq_8709 HDLC_irq 2 8709 NULL
104365 +ctrl_out_8712 ctrl_out 5-3 8712 NULL
104366 +__create_free_space_inode_8724 __create_free_space_inode 0 8724 NULL
104367 +tracing_max_lat_write_8728 tracing_max_lat_write 3 8728 NULL
104368 +jffs2_acl_count_8729 jffs2_acl_count 0-1 8729 NULL
104369 +f_dupfd_8730 f_dupfd 1 8730 NULL
104370 +__create_irqs_8733 __create_irqs 2-1-0-3 8733 NULL
104371 +pca953x_gpio_irq_map_8737 pca953x_gpio_irq_map 2 8737 NULL
104372 +tx_tx_exch_expiry_read_8749 tx_tx_exch_expiry_read 3 8749 NULL
104373 +compound_order_8750 compound_order 0 8750 NULL
104374 +ocfs2_find_path_8754 ocfs2_find_path 0 8754 NULL
104375 +yurex_write_8761 yurex_write 3 8761 NULL
104376 +joydev_compat_ioctl_8765 joydev_compat_ioctl 2 8765 NULL
104377 +x32_arch_ptrace_8767 x32_arch_ptrace 3 8767 NULL
104378 +kstrtoint_from_user_8778 kstrtoint_from_user 2 8778 NULL
104379 +paging32_prefetch_gpte_8783 paging32_prefetch_gpte 4 8783 NULL
104380 +ext4_try_to_write_inline_data_8785 ext4_try_to_write_inline_data 3-4 8785 NULL
104381 +aligned_nrpages_8791 aligned_nrpages 0-1-2 8791 NULL
104382 +__bitmap_weight_8796 __bitmap_weight 0-2 8796 NULL
104383 +cpuset_common_file_read_8800 cpuset_common_file_read 5 8800 NULL
104384 +intel_ring_begin_8808 intel_ring_begin 0 8808 NULL
104385 +ntfs_commit_pages_after_write_8809 ntfs_commit_pages_after_write 4-3 8809 NULL
104386 +metronomefb_write_8823 metronomefb_write 3 8823 NULL
104387 +SyS_llistxattr_8824 SyS_llistxattr 3 8824 NULL
104388 +get_queue_depth_8833 get_queue_depth 0 8833 NULL
104389 +dvb_ringbuffer_pkt_next_8834 dvb_ringbuffer_pkt_next 0-2 8834 NULL
104390 +usb_ep_queue_8839 usb_ep_queue 0 8839 NULL
104391 +clear_bitset_8840 clear_bitset 2 8840 NULL
104392 +debug_debug1_read_8856 debug_debug1_read 3 8856 NULL
104393 +wa_nep_queue_8858 wa_nep_queue 2 8858 NULL
104394 +sk_memory_allocated_8882 sk_memory_allocated 0 8882 NULL
104395 +compressed_bio_size_8887 compressed_bio_size 0-2 8887 NULL
104396 +ab3100_get_set_reg_8890 ab3100_get_set_reg 3 8890 NULL nohasharray
104397 +tracing_max_lat_read_8890 tracing_max_lat_read 3 8890 &ab3100_get_set_reg_8890
104398 +xfs_contig_bits_8904 xfs_contig_bits 3-0 8904 NULL
104399 +sdio_max_byte_size_8907 sdio_max_byte_size 0 8907 NULL
104400 +sysfs_merge_group_8917 sysfs_merge_group 0 8917 NULL
104401 +write_file_ani_8918 write_file_ani 3 8918 NULL
104402 +layout_commit_8926 layout_commit 3 8926 NULL
104403 +adjust_priv_size_8935 adjust_priv_size 0-1 8935 NULL
104404 +driver_stats_read_8944 driver_stats_read 3 8944 NULL
104405 +lookup_zone_8956 lookup_zone 2 8956 NULL
104406 +read_file_tgt_stats_8959 read_file_tgt_stats 3 8959 NULL
104407 +seq_bitmap_list_8963 seq_bitmap_list 3 8963 NULL
104408 +usb_allocate_stream_buffers_8964 usb_allocate_stream_buffers 3 8964 NULL
104409 +qib_qsfp_dump_8966 qib_qsfp_dump 0-3 8966 NULL
104410 +venus_mkdir_8967 venus_mkdir 4 8967 NULL
104411 +seq_open_net_8968 seq_open_net 4 8968 NULL nohasharray
104412 +vol_cdev_read_8968 vol_cdev_read 3 8968 &seq_open_net_8968
104413 +bio_integrity_get_tag_8974 bio_integrity_get_tag 3 8974 NULL
104414 +btrfs_alloc_free_block_8986 btrfs_alloc_free_block 3-8 8986 NULL
104415 +jbd2_journal_blocks_per_page_9004 jbd2_journal_blocks_per_page 0 9004 NULL
104416 +il_dbgfs_clear_ucode_stats_write_9016 il_dbgfs_clear_ucode_stats_write 3 9016 NULL
104417 +sparse_index_alloc_9021 sparse_index_alloc 1 9021 NULL
104418 +snd_emu10k1_ptr_read_9026 snd_emu10k1_ptr_read 0-2 9026 NULL
104419 +fd_ioctl_9028 fd_ioctl 3 9028 NULL
104420 +nla_put_9042 nla_put 3 9042 NULL
104421 +offset_il_node_9059 offset_il_node 0 9059 NULL
104422 +snd_emu10k1_synth_copy_from_user_9061 snd_emu10k1_synth_copy_from_user 5-3 9061 NULL
104423 +snd_gus_dram_peek_9062 snd_gus_dram_peek 4 9062 NULL
104424 +fib_info_hash_alloc_9075 fib_info_hash_alloc 1 9075 NULL
104425 +create_queues_9088 create_queues 3-2 9088 NULL
104426 +ftdi_prepare_write_buffer_9093 ftdi_prepare_write_buffer 3 9093 NULL
104427 +adxl34x_spi_read_block_9108 adxl34x_spi_read_block 3 9108 NULL
104428 +alloc_slabmgmt_9109 alloc_slabmgmt 5 9109 NULL
104429 +caif_stream_sendmsg_9110 caif_stream_sendmsg 4 9110 NULL nohasharray
104430 +gfn_to_rmap_9110 gfn_to_rmap 3-2 9110 &caif_stream_sendmsg_9110
104431 +udf_direct_IO_9111 udf_direct_IO 4 9111 NULL
104432 +pmcraid_change_queue_depth_9116 pmcraid_change_queue_depth 2 9116 NULL
104433 +mq_remove_mapping_9124 mq_remove_mapping 2 9124 NULL
104434 +mlx4_alloc_resize_umem_9132 mlx4_alloc_resize_umem 3 9132 NULL
104435 +ext4_list_backups_9138 ext4_list_backups 0 9138 NULL
104436 +apei_resources_merge_9149 apei_resources_merge 0 9149 NULL
104437 +vb2_dma_sg_alloc_9157 vb2_dma_sg_alloc 2 9157 NULL
104438 +dbg_command_buf_9165 dbg_command_buf 2 9165 NULL
104439 +__btrfs_add_delayed_deletion_item_9177 __btrfs_add_delayed_deletion_item 0 9177 NULL
104440 +isr_irqs_read_9181 isr_irqs_read 3 9181 NULL
104441 +count_leading_zeros_9183 count_leading_zeros 0 9183 NULL
104442 +altera_swap_ir_9194 altera_swap_ir 2 9194 NULL
104443 +snd_m3_get_pointer_9206 snd_m3_get_pointer 0 9206 NULL
104444 +get_pfn_9207 get_pfn 1 9207 NULL
104445 +virtqueue_add_9217 virtqueue_add 4-5 9217 NULL
104446 +tx_tx_prepared_descs_read_9221 tx_tx_prepared_descs_read 3 9221 NULL
104447 +sctp_getsockopt_delayed_ack_9232 sctp_getsockopt_delayed_ack 2 9232 NULL
104448 +ext4_mark_iloc_dirty_9239 ext4_mark_iloc_dirty 0 9239 NULL
104449 +ocfs2_clear_ext_refcount_9256 ocfs2_clear_ext_refcount 4-0 9256 NULL
104450 +hfsplus_bnode_read_u16_9262 hfsplus_bnode_read_u16 0 9262 NULL
104451 +btrfs_search_slot_9264 btrfs_search_slot 0 9264 NULL
104452 +ocfs2_merge_rec_right_9267 ocfs2_merge_rec_right 0 9267 NULL
104453 +sparse_early_usemaps_alloc_node_9269 sparse_early_usemaps_alloc_node 4 9269 NULL
104454 +hdpvr_read_9273 hdpvr_read 3 9273 NULL
104455 +flakey_status_9274 flakey_status 5 9274 NULL
104456 +iwl_dbgfs_stations_read_9309 iwl_dbgfs_stations_read 3 9309 NULL
104457 +ceph_sync_setxattr_9310 ceph_sync_setxattr 4 9310 NULL
104458 +ieee80211_if_fmt_txpower_9334 ieee80211_if_fmt_txpower 3 9334 NULL
104459 +nvme_trans_fmt_get_parm_header_9340 nvme_trans_fmt_get_parm_header 2 9340 NULL
104460 +ocfs2_orphan_for_truncate_9342 ocfs2_orphan_for_truncate 4 9342 NULL
104461 +__ksm_enter_9347 __ksm_enter 0 9347 NULL
104462 +ll_direct_rw_pages_9361 ll_direct_rw_pages 0 9361 NULL
104463 +of_node_to_nid_9367 of_node_to_nid 0 9367 NULL
104464 +sta_beacon_loss_count_read_9370 sta_beacon_loss_count_read 3 9370 NULL
104465 +get_request_type_9393 get_request_type 0 9393 NULL nohasharray
104466 +mlx4_bitmap_init_9393 mlx4_bitmap_init 5-2 9393 &get_request_type_9393
104467 +virtqueue_add_outbuf_9395 virtqueue_add_outbuf 3 9395 NULL
104468 +read_9397 read 3 9397 NULL
104469 +btrfs_drop_extents_9423 btrfs_drop_extents 4-0 9423 NULL
104470 +bm_realloc_pages_9431 bm_realloc_pages 2 9431 NULL
104471 +ffs_ep0_write_9438 ffs_ep0_write 3 9438 NULL
104472 +ieee80211_if_fmt_fwded_unicast_9454 ieee80211_if_fmt_fwded_unicast 3 9454 NULL
104473 +ext3_xattr_set_acl_9467 ext3_xattr_set_acl 4 9467 NULL
104474 +agp_generic_alloc_user_9470 agp_generic_alloc_user 1 9470 NULL nohasharray
104475 +get_registers_9470 get_registers 4 9470 &agp_generic_alloc_user_9470
104476 +btrfs_csum_file_blocks_9491 btrfs_csum_file_blocks 0 9491 NULL
104477 +crypt_status_9492 crypt_status 5 9492 NULL
104478 +lbs_threshold_write_9502 lbs_threshold_write 5 9502 NULL
104479 +btrfs_add_delayed_data_ref_9508 btrfs_add_delayed_data_ref 0 9508 NULL
104480 +lp_write_9511 lp_write 3 9511 NULL
104481 +mext_calc_swap_extents_9517 mext_calc_swap_extents 4 9517 NULL
104482 +scsi_tgt_kspace_exec_9522 scsi_tgt_kspace_exec 8 9522 NULL
104483 +ll_max_read_ahead_whole_mb_seq_write_9528 ll_max_read_ahead_whole_mb_seq_write 3 9528 NULL
104484 +read_file_dma_9530 read_file_dma 3 9530 NULL
104485 +ext3_alloc_branch_9534 ext3_alloc_branch 5 9534 NULL
104486 +iwl_dbgfs_bf_params_read_9542 iwl_dbgfs_bf_params_read 3 9542 NULL
104487 +unmerge_ksm_pages_9546 unmerge_ksm_pages 0 9546 NULL nohasharray
104488 +il_dbgfs_missed_beacon_write_9546 il_dbgfs_missed_beacon_write 3 9546 &unmerge_ksm_pages_9546
104489 +compat_SyS_pwritev64_9548 compat_SyS_pwritev64 3 9548 NULL
104490 +readl_9557 readl 0 9557 NULL
104491 +fw_node_create_9559 fw_node_create 2 9559 NULL
104492 +ipath_get_user_pages_9561 ipath_get_user_pages 1-2 9561 NULL
104493 +kobj_map_9566 kobj_map 3-2 9566 NULL
104494 +f2fs_read_data_pages_9574 f2fs_read_data_pages 4 9574 NULL
104495 +use_block_rsv_9597 use_block_rsv 3 9597 NULL
104496 +snd_emu10k1_fx8010_read_9605 snd_emu10k1_fx8010_read 5-6 9605 NULL
104497 +ocfs2_claim_suballoc_bits_9615 ocfs2_claim_suballoc_bits 0 9615 NULL
104498 +lov_ost_pool_add_9626 lov_ost_pool_add 3 9626 NULL
104499 +saa7164_buffer_alloc_user_9627 saa7164_buffer_alloc_user 2 9627 NULL
104500 +ceph_copy_user_to_page_vector_9635 ceph_copy_user_to_page_vector 3-4 9635 NULL
104501 +acpi_ex_insert_into_field_9638 acpi_ex_insert_into_field 3 9638 NULL
104502 +compat_sys_keyctl_9639 compat_sys_keyctl 4 9639 NULL
104503 +ll_checksum_seq_write_9648 ll_checksum_seq_write 3 9648 NULL
104504 +ocfs2_xattr_get_rec_9652 ocfs2_xattr_get_rec 0 9652 NULL
104505 +queue_received_packet_9657 queue_received_packet 5 9657 NULL
104506 +snd_opl4_mem_proc_write_9670 snd_opl4_mem_proc_write 5 9670 NULL
104507 +dns_query_9676 dns_query 3 9676 NULL
104508 +qib_7322_handle_hwerrors_9678 qib_7322_handle_hwerrors 3 9678 NULL
104509 +__erst_read_from_storage_9690 __erst_read_from_storage 0 9690 NULL
104510 +vx_transfer_end_9701 vx_transfer_end 0 9701 NULL
104511 +fnb_9703 fnb 2-3-0 9703 NULL
104512 +fuse_iter_npages_9705 fuse_iter_npages 0 9705 NULL nohasharray
104513 +ieee80211_if_read_aid_9705 ieee80211_if_read_aid 3 9705 &fuse_iter_npages_9705
104514 +cfg80211_tx_mlme_mgmt_9715 cfg80211_tx_mlme_mgmt 3 9715 NULL
104515 +btrfs_stack_file_extent_num_bytes_9720 btrfs_stack_file_extent_num_bytes 0 9720 NULL
104516 +SYSC_ppoll_9721 SYSC_ppoll 2 9721 NULL
104517 +nla_get_u8_9736 nla_get_u8 0 9736 NULL
104518 +ieee80211_if_fmt_num_mcast_sta_9738 ieee80211_if_fmt_num_mcast_sta 3 9738 NULL
104519 +shmem_replace_page_9740 shmem_replace_page 0 9740 NULL
104520 +ddb_input_read_9743 ddb_input_read 3-0 9743 NULL
104521 +sta_last_ack_signal_read_9751 sta_last_ack_signal_read 3 9751 NULL
104522 +ni_calculate_power_boost_limit_9757 ni_calculate_power_boost_limit 3 9757 NULL
104523 +btrfs_super_root_9763 btrfs_super_root 0 9763 NULL
104524 +__alloc_percpu_9764 __alloc_percpu 2-1 9764 NULL
104525 +btrfs_write_and_wait_transaction_9768 btrfs_write_and_wait_transaction 0 9768 NULL
104526 +__blk_queue_init_tags_9778 __blk_queue_init_tags 2 9778 NULL
104527 +snd_mem_proc_write_9786 snd_mem_proc_write 3 9786 NULL
104528 +kvm_age_hva_9795 kvm_age_hva 2 9795 NULL
104529 +parse_uac2_sample_rate_range_9801 parse_uac2_sample_rate_range 0 9801 NULL
104530 +tpm_data_in_9802 tpm_data_in 0 9802 NULL
104531 +ttm_bo_fbdev_io_9805 ttm_bo_fbdev_io 4 9805 NULL
104532 +udpv6_recvmsg_9813 udpv6_recvmsg 4 9813 NULL nohasharray
104533 +ieee80211_if_read_state_9813 ieee80211_if_read_state 3 9813 &udpv6_recvmsg_9813
104534 +svc_pool_map_get_node_9817 svc_pool_map_get_node 0 9817 NULL
104535 +dvb_dvr_set_buffer_size_9840 dvb_dvr_set_buffer_size 2 9840 NULL
104536 +pmcraid_alloc_sglist_9864 pmcraid_alloc_sglist 1 9864 NULL
104537 +btrfs_free_reserved_extent_9867 btrfs_free_reserved_extent 2 9867 NULL
104538 +f1x_translate_sysaddr_to_cs_9868 f1x_translate_sysaddr_to_cs 2 9868 NULL
104539 +mlx4_bitmap_alloc_range_9876 mlx4_bitmap_alloc_range 2-3 9876 NULL
104540 +wil_read_file_ioblob_9878 wil_read_file_ioblob 3 9878 NULL
104541 +bm_register_write_9893 bm_register_write 3 9893 NULL nohasharray
104542 +snd_midi_event_new_9893 snd_midi_event_new 1 9893 &bm_register_write_9893
104543 +snd_gf1_pcm_playback_copy_9895 snd_gf1_pcm_playback_copy 5-3 9895 NULL
104544 +nonpaging_page_fault_9908 nonpaging_page_fault 2 9908 NULL
104545 +ext4_map_blocks_9916 ext4_map_blocks 0 9916 NULL
104546 +root_nfs_parse_options_9937 root_nfs_parse_options 3 9937 NULL
104547 +tc3589x_reg_read_9940 tc3589x_reg_read 0 9940 NULL
104548 +pstore_ftrace_knob_read_9947 pstore_ftrace_knob_read 3 9947 NULL
104549 +read_file_misc_9948 read_file_misc 3 9948 NULL
104550 +ext2_new_blocks_9954 ext2_new_blocks 2-0 9954 NULL
104551 +csum_partial_copy_fromiovecend_9957 csum_partial_copy_fromiovecend 4-3 9957 NULL
104552 +SyS_gethostname_9964 SyS_gethostname 2 9964 NULL
104553 +get_free_serial_index_9969 get_free_serial_index 0 9969 NULL
104554 +btrfs_add_link_9973 btrfs_add_link 5-0 9973 NULL
104555 +SYSC_move_pages_9986 SYSC_move_pages 2 9986 NULL
104556 +aat2870_dump_reg_10019 aat2870_dump_reg 0 10019 NULL
104557 +batadv_orig_hash_add_if_10033 batadv_orig_hash_add_if 2 10033 NULL
104558 +iterate_inodes_from_logical_10037 iterate_inodes_from_logical 0 10037 NULL
104559 +vm_iomap_memory_10038 vm_iomap_memory 2 10038 NULL
104560 +ieee80211_set_probe_resp_10077 ieee80211_set_probe_resp 3 10077 NULL
104561 +ufs_bitmap_search_10105 ufs_bitmap_search 0-3 10105 NULL
104562 +get_elem_size_10110 get_elem_size 0-2 10110 NULL nohasharray
104563 +dynamic_ps_timeout_read_10110 dynamic_ps_timeout_read 3 10110 &get_elem_size_10110
104564 +gfs2_meta_read_10112 gfs2_meta_read 0 10112 NULL
104565 +SyS_migrate_pages_10134 SyS_migrate_pages 2 10134 NULL nohasharray
104566 +offset_to_bit_10134 offset_to_bit 0-2-1-3 10134 &SyS_migrate_pages_10134
104567 +aes_decrypt_packets_read_10155 aes_decrypt_packets_read 3 10155 NULL
104568 +rx_out_of_mem_read_10157 rx_out_of_mem_read 3 10157 NULL
104569 +hidg_alloc_ep_req_10159 hidg_alloc_ep_req 2 10159 NULL nohasharray
104570 +ol_chunk_entries_10159 ol_chunk_entries 0 10159 &hidg_alloc_ep_req_10159
104571 +stmpe_irq_unmap_10164 stmpe_irq_unmap 2 10164 NULL
104572 +asd_store_update_bios_10165 asd_store_update_bios 4 10165 NULL
104573 +kstrtol_from_user_10168 kstrtol_from_user 2 10168 NULL
104574 +proc_pid_attr_read_10173 proc_pid_attr_read 3 10173 NULL
104575 +jffs2_user_setxattr_10182 jffs2_user_setxattr 4 10182 NULL
104576 +register_ftrace_function_10218 register_ftrace_function 0 10218 NULL
104577 +hdlc_rpr_irq_10240 hdlc_rpr_irq 2 10240 NULL
104578 +mutex_lock_killable_10244 mutex_lock_killable 0 10244 NULL
104579 +insert_orphan_item_10249 insert_orphan_item 0 10249 NULL
104580 +cciss_proc_write_10259 cciss_proc_write 3 10259 NULL
104581 +gpiochip_add_to_list_10262 gpiochip_add_to_list 0 10262 NULL
104582 +__qlcnic_pci_sriov_enable_10281 __qlcnic_pci_sriov_enable 2 10281 NULL
104583 +snd_rme9652_capture_copy_10287 snd_rme9652_capture_copy 5 10287 NULL
104584 +ubi_leb_change_10289 ubi_leb_change 0-4 10289 NULL
104585 +read_emulate_10310 read_emulate 2-4 10310 NULL
104586 +read_file_spectral_count_10320 read_file_spectral_count 3 10320 NULL
104587 +ttm_object_device_init_10321 ttm_object_device_init 2 10321 NULL
104588 +compat_SyS_writev_10327 compat_SyS_writev 3 10327 NULL
104589 +ubi_leb_read_10328 ubi_leb_read 0 10328 NULL
104590 +tun_sendmsg_10337 tun_sendmsg 4 10337 NULL
104591 +get_dump_page_10338 get_dump_page 1 10338 NULL
104592 +ufx_alloc_urb_list_10349 ufx_alloc_urb_list 3 10349 NULL
104593 +whci_add_cap_10350 whci_add_cap 0 10350 NULL
104594 +dbAllocAny_10354 dbAllocAny 0 10354 NULL
104595 +ath6kl_listen_int_read_10355 ath6kl_listen_int_read 3 10355 NULL
104596 +__ntfs_cluster_free_10360 __ntfs_cluster_free 0 10360 NULL
104597 +ms_write_multiple_pages_10362 ms_write_multiple_pages 6-5 10362 NULL
104598 +sta_ht_capa_read_10366 sta_ht_capa_read 3 10366 NULL
104599 +ecryptfs_decode_and_decrypt_filename_10379 ecryptfs_decode_and_decrypt_filename 5 10379 NULL
104600 +do_compat_pselect_10398 do_compat_pselect 1 10398 NULL
104601 +fwtty_rx_10434 fwtty_rx 3 10434 NULL
104602 +event_phy_transmit_error_read_10471 event_phy_transmit_error_read 3 10471 NULL
104603 +ext4_itable_unused_count_10501 ext4_itable_unused_count 0 10501 NULL
104604 +qib_alloc_fast_reg_page_list_10507 qib_alloc_fast_reg_page_list 2 10507 NULL
104605 +sel_write_disable_10511 sel_write_disable 3 10511 NULL
104606 +osd_req_write_sg_kern_10514 osd_req_write_sg_kern 5 10514 NULL
104607 +rds_message_alloc_10517 rds_message_alloc 1 10517 NULL
104608 +qlcnic_pci_sriov_enable_10519 qlcnic_pci_sriov_enable 2 10519 NULL nohasharray
104609 +hash_netiface4_expire_10519 hash_netiface4_expire 3 10519 &qlcnic_pci_sriov_enable_10519
104610 +snd_pcm_hw_params_user_10520 snd_pcm_hw_params_user 0 10520 NULL
104611 +ocfs2_add_refcounted_extent_10526 ocfs2_add_refcounted_extent 6 10526 NULL
104612 +snd_pcm_lib_read_10536 snd_pcm_lib_read 0-3 10536 NULL nohasharray
104613 +kstrtouint_from_user_10536 kstrtouint_from_user 2 10536 &snd_pcm_lib_read_10536
104614 +SYSC_read_10545 SYSC_read 3 10545 NULL
104615 +ext4_write_begin_10576 ext4_write_begin 3-4 10576 NULL
104616 +scrub_remap_extent_10588 scrub_remap_extent 2 10588 NULL
104617 +otp_read_10594 otp_read 5-4-2 10594 NULL
104618 +supply_map_read_file_10608 supply_map_read_file 3 10608 NULL
104619 +ima_show_htable_violations_10619 ima_show_htable_violations 3 10619 NULL
104620 +alloc_coherent_10632 alloc_coherent 2 10632 NULL
104621 +ubi_io_write_vid_hdr_10660 ubi_io_write_vid_hdr 0 10660 NULL nohasharray
104622 +nfs_idmap_lookup_id_10660 nfs_idmap_lookup_id 2 10660 &ubi_io_write_vid_hdr_10660
104623 +efx_max_tx_len_10662 efx_max_tx_len 0-2 10662 NULL
104624 +dtf_read_device_10663 dtf_read_device 3 10663 NULL
104625 +parport_write_10669 parport_write 0 10669 NULL
104626 +alloc_vmap_area_10682 alloc_vmap_area 5 10682 NULL
104627 +edge_write_10692 edge_write 4 10692 NULL
104628 +ubi_wl_get_peb_10699 ubi_wl_get_peb 0 10699 NULL
104629 +inl_10708 inl 0 10708 NULL nohasharray
104630 +selinux_inode_setxattr_10708 selinux_inode_setxattr 4 10708 &inl_10708
104631 +pvr2_ioread_read_10720 pvr2_ioread_read 3 10720 NULL nohasharray
104632 +shash_async_setkey_10720 shash_async_setkey 3 10720 &pvr2_ioread_read_10720
104633 +spi_sync_10731 spi_sync 0 10731 NULL
104634 +sctp_getsockopt_maxseg_10737 sctp_getsockopt_maxseg 2 10737 NULL nohasharray
104635 +apu_get_register_10737 apu_get_register 0 10737 &sctp_getsockopt_maxseg_10737
104636 +alloc_one_pg_vec_page_10747 alloc_one_pg_vec_page 1 10747 NULL
104637 +ttm_ref_object_add_10748 ttm_ref_object_add 0 10748 NULL
104638 +SyS_io_getevents_10756 SyS_io_getevents 3 10756 NULL
104639 +vhost_add_used_n_10760 vhost_add_used_n 3 10760 NULL
104640 +kvm_read_guest_atomic_10765 kvm_read_guest_atomic 2-4 10765 NULL
104641 +wb_set_dirty_10778 wb_set_dirty 2 10778 NULL
104642 +__qp_memcpy_to_queue_10779 __qp_memcpy_to_queue 2-4 10779 NULL
104643 +i915_gem_wait_for_error_10791 i915_gem_wait_for_error 0 10791 NULL
104644 +snd_mask_value_10794 snd_mask_value 0 10794 NULL
104645 +diva_set_trace_filter_10820 diva_set_trace_filter 0-1 10820 NULL
104646 +lbs_sleepparams_read_10840 lbs_sleepparams_read 3 10840 NULL
104647 +ida_get_new_above_10853 ida_get_new_above 2-0 10853 NULL
104648 +fuse_conn_max_background_read_10855 fuse_conn_max_background_read 3 10855 NULL
104649 +ol_chunk_blocks_10864 ol_chunk_blocks 0 10864 NULL
104650 +snd_pcm_oss_write1_10872 snd_pcm_oss_write1 3 10872 NULL
104651 +drm_ht_insert_item_10877 drm_ht_insert_item 0 10877 NULL
104652 +wiidebug_drm_write_10879 wiidebug_drm_write 3 10879 NULL
104653 +get_scq_10897 get_scq 2 10897 NULL
104654 +cgroup_write_string_10900 cgroup_write_string 5 10900 NULL
104655 +tifm_alloc_adapter_10903 tifm_alloc_adapter 1 10903 NULL
104656 +lprocfs_wr_atomic_10912 lprocfs_wr_atomic 3 10912 NULL
104657 +__copy_from_user_10918 __copy_from_user 3-0 10918 NULL
104658 +kobject_add_10919 kobject_add 0 10919 NULL
104659 +da9052_map_irq_10952 da9052_map_irq 2 10952 NULL
104660 +ci_port_test_write_10962 ci_port_test_write 3 10962 NULL
104661 +bm_entry_read_10976 bm_entry_read 3 10976 NULL
104662 +sched_autogroup_write_10984 sched_autogroup_write 3 10984 NULL
104663 +__hci_num_ctrl_10985 __hci_num_ctrl 0 10985 NULL
104664 +lz4_compress_10986 lz4_compress 2 10986 NULL
104665 +do_switch_10994 do_switch 0 10994 NULL
104666 +xfrm_hash_alloc_10997 xfrm_hash_alloc 1 10997 NULL
104667 +btrfs_add_delayed_extent_op_11000 btrfs_add_delayed_extent_op 0 11000 NULL
104668 +rx_filter_accum_arp_pend_requests_read_11003 rx_filter_accum_arp_pend_requests_read 3 11003 NULL
104669 +SetLineNumber_11023 SetLineNumber 0 11023 NULL
104670 +btrfs_find_space_for_alloc_11028 btrfs_find_space_for_alloc 2 11028 NULL
104671 +mb_find_next_bit_11037 mb_find_next_bit 0-2-3 11037 NULL
104672 +tda10048_writeregbulk_11050 tda10048_writeregbulk 4 11050 NULL
104673 +insert_inline_extent_backref_11063 insert_inline_extent_backref 8-0 11063 NULL
104674 +tcp_send_mss_11079 tcp_send_mss 0 11079 NULL
104675 +snd_pcm_delay_11081 snd_pcm_delay 0 11081 NULL
104676 +count_argc_11083 count_argc 0 11083 NULL
104677 +kvm_write_guest_cached_11106 kvm_write_guest_cached 4 11106 NULL
104678 +stmpe_gpio_to_irq_11110 stmpe_gpio_to_irq 2 11110 NULL
104679 +tw_change_queue_depth_11116 tw_change_queue_depth 2 11116 NULL
104680 +page_offset_11120 page_offset 0 11120 NULL
104681 +tracing_buffers_read_11124 tracing_buffers_read 3 11124 NULL nohasharray
104682 +cea_db_payload_len_11124 cea_db_payload_len 0 11124 &tracing_buffers_read_11124
104683 +alloc_alien_cache_11127 alloc_alien_cache 2-1 11127 NULL
104684 +eb_lookup_objects_11163 eb_lookup_objects 0 11163 NULL
104685 +snd_gf1_pcm_playback_silence_11172 snd_gf1_pcm_playback_silence 4-3 11172 NULL
104686 +il_dbgfs_rx_queue_read_11221 il_dbgfs_rx_queue_read 3 11221 NULL
104687 +comedi_alloc_spriv_11234 comedi_alloc_spriv 2 11234 NULL
104688 +mmap_region_11247 mmap_region 0-2 11247 NULL
104689 +ubifs_write_node_11258 ubifs_write_node 5-3 11258 NULL
104690 +dm_cache_discard_bitset_resize_11262 dm_cache_discard_bitset_resize 3 11262 NULL
104691 +hugetlbfs_read_11268 hugetlbfs_read 3 11268 NULL
104692 +ath6kl_power_params_write_11274 ath6kl_power_params_write 3 11274 NULL
104693 +__proc_daemon_file_11305 __proc_daemon_file 5 11305 NULL
104694 +split_vma_11312 split_vma 0 11312 NULL
104695 +btrfs_update_inode_fallback_11313 btrfs_update_inode_fallback 0 11313 NULL
104696 +ext4_xattr_check_names_11314 ext4_xattr_check_names 0 11314 NULL
104697 +sk_filter_size_11316 sk_filter_size 0 11316 NULL nohasharray
104698 +tcp_send_rcvq_11316 tcp_send_rcvq 3 11316 &sk_filter_size_11316
104699 +shmem_radix_tree_replace_11325 shmem_radix_tree_replace 0 11325 NULL
104700 +construct_key_11329 construct_key 3 11329 NULL nohasharray
104701 +__kfifo_out_peek_11329 __kfifo_out_peek 0-3 11329 &construct_key_11329
104702 +next_segment_11330 next_segment 0-2-1 11330 NULL
104703 +persistent_ram_buffer_map_11332 persistent_ram_buffer_map 2-1 11332 NULL
104704 +ext4_get_inline_size_11349 ext4_get_inline_size 0 11349 NULL
104705 +nl80211_send_mgmt_11353 nl80211_send_mgmt 7 11353 NULL nohasharray
104706 +sel_write_create_11353 sel_write_create 3 11353 &nl80211_send_mgmt_11353
104707 +drm_vblank_init_11362 drm_vblank_init 2 11362 NULL
104708 +qib_get_base_info_11369 qib_get_base_info 3 11369 NULL
104709 +isku_sysfs_read_keys_capslock_11392 isku_sysfs_read_keys_capslock 6 11392 NULL
104710 +dev_irnet_write_11398 dev_irnet_write 3 11398 NULL
104711 +__btrfs_add_delayed_insertion_item_11400 __btrfs_add_delayed_insertion_item 0 11400 NULL
104712 +lprocfs_wr_evict_client_11402 lprocfs_wr_evict_client 3 11402 NULL
104713 +___alloc_bootmem_11410 ___alloc_bootmem 1 11410 NULL
104714 +str_to_user_11411 str_to_user 2 11411 NULL
104715 +mem_fw_gen_free_mem_blks_read_11413 mem_fw_gen_free_mem_blks_read 3 11413 NULL
104716 +ath6kl_wmi_test_rx_11414 ath6kl_wmi_test_rx 3 11414 NULL
104717 +relocate_entry_gtt_11416 relocate_entry_gtt 0 11416 NULL
104718 +adis16480_show_firmware_revision_11417 adis16480_show_firmware_revision 3 11417 NULL
104719 +trace_options_read_11419 trace_options_read 3 11419 NULL
104720 +i40e_dbg_command_write_11421 i40e_dbg_command_write 3 11421 NULL
104721 +__irq_set_trigger_11422 __irq_set_trigger 0 11422 NULL nohasharray
104722 +xd_read_multiple_pages_11422 xd_read_multiple_pages 5-4 11422 &__irq_set_trigger_11422
104723 +prepare_image_11424 prepare_image 0 11424 NULL
104724 +ext3_xattr_block_list_11428 ext3_xattr_block_list 3 11428 NULL
104725 +bttv_read_11432 bttv_read 3 11432 NULL
104726 +create_zero_mask_11453 create_zero_mask 0-1 11453 NULL
104727 +do_blockdev_direct_IO_11455 do_blockdev_direct_IO 0-6 11455 NULL
104728 +swp_offset_11475 swp_offset 0 11475 NULL
104729 +st_sensors_write_data_with_mask_11476 st_sensors_write_data_with_mask 3 11476 NULL
104730 +pci_set_power_state_11479 pci_set_power_state 0 11479 NULL nohasharray
104731 +sca3000_read_first_n_hw_rb_11479 sca3000_read_first_n_hw_rb 2 11479 &pci_set_power_state_11479
104732 +xfs_file_buffered_aio_write_11492 xfs_file_buffered_aio_write 4 11492 NULL
104733 +sd_do_mode_sense_11507 sd_do_mode_sense 5 11507 NULL
104734 +kmem_zalloc_11510 kmem_zalloc 1 11510 NULL
104735 +ll_direct_IO_26_seg_11518 ll_direct_IO_26_seg 0 11518 NULL
104736 +twl_direction_in_11527 twl_direction_in 2 11527 NULL
104737 +setup_IO_APIC_irq_extra_11537 setup_IO_APIC_irq_extra 1 11537 NULL
104738 +radix_tree_extend_11555 radix_tree_extend 0 11555 NULL
104739 +skb_cow_data_11565 skb_cow_data 0 11565 NULL
104740 +posix_acl_create_masq_11567 posix_acl_create_masq 0 11567 NULL
104741 +qgroup_account_ref_step2_11575 qgroup_account_ref_step2 0 11575 NULL
104742 +lpfc_idiag_ctlacc_write_11576 lpfc_idiag_ctlacc_write 3 11576 NULL
104743 +oprofilefs_ulong_to_user_11582 oprofilefs_ulong_to_user 3 11582 NULL
104744 +snd_pcm_action_11589 snd_pcm_action 0 11589 NULL
104745 +fw_device_op_ioctl_11595 fw_device_op_ioctl 2 11595 NULL
104746 +btrfs_uuid_tree_add_11598 btrfs_uuid_tree_add 0 11598 NULL
104747 +SYSC_mq_timedsend_11607 SYSC_mq_timedsend 3 11607 NULL
104748 +i915_gem_object_pin_11630 i915_gem_object_pin 0 11630 NULL
104749 +add_new_bitmap_11644 add_new_bitmap 3 11644 NULL
104750 +sisusb_send_bridge_packet_11649 sisusb_send_bridge_packet 2 11649 NULL
104751 +nla_total_size_11658 nla_total_size 0-1 11658 NULL
104752 +slab_ksize_11664 slab_ksize 0 11664 NULL
104753 +__btrfs_run_delayed_items_11671 __btrfs_run_delayed_items 0 11671 NULL
104754 +ide_queue_pc_tail_11673 ide_queue_pc_tail 5 11673 NULL
104755 +compat_SyS_msgsnd_11675 compat_SyS_msgsnd 3 11675 NULL
104756 +btrfs_alloc_delayed_item_11678 btrfs_alloc_delayed_item 1 11678 NULL
104757 +dsp_buffer_alloc_11684 dsp_buffer_alloc 2 11684 NULL
104758 +sctp_setsockopt_hmac_ident_11687 sctp_setsockopt_hmac_ident 3 11687 NULL
104759 +split_11691 split 2 11691 NULL
104760 +snd_ctl_elem_user_tlv_11695 snd_ctl_elem_user_tlv 3 11695 NULL
104761 +blk_rq_cur_bytes_11723 blk_rq_cur_bytes 0 11723 NULL
104762 +dm_bio_prison_create_11749 dm_bio_prison_create 1 11749 NULL
104763 +iwl_dbgfs_qos_read_11753 iwl_dbgfs_qos_read 3 11753 NULL
104764 +intel_map_page_11762 intel_map_page 4-3 11762 NULL
104765 +ocfs2_relink_block_group_11769 ocfs2_relink_block_group 0 11769 NULL
104766 +ps_pspoll_timeouts_read_11776 ps_pspoll_timeouts_read 3 11776 NULL
104767 +ebt_buf_add_11779 ebt_buf_add 0 11779 NULL
104768 +btrfs_key_blockptr_11786 btrfs_key_blockptr 0 11786 NULL
104769 +rtw_alloc_etherdev_11792 rtw_alloc_etherdev 1 11792 NULL
104770 +pcpu_fc_alloc_11818 pcpu_fc_alloc 2 11818 NULL
104771 +umc_device_register_11824 umc_device_register 0 11824 NULL
104772 +zerocopy_sg_from_iovec_11828 zerocopy_sg_from_iovec 3 11828 NULL
104773 +sctp_setsockopt_maxseg_11829 sctp_setsockopt_maxseg 3 11829 NULL
104774 +rts51x_read_status_11830 rts51x_read_status 4 11830 NULL
104775 +unix_stream_connect_11844 unix_stream_connect 3 11844 NULL
104776 +ecryptfs_copy_filename_11868 ecryptfs_copy_filename 4 11868 NULL
104777 +ieee80211_rx_bss_info_11887 ieee80211_rx_bss_info 3 11887 NULL
104778 +mdc_rename_11899 mdc_rename 4-6 11899 NULL
104779 +xstateregs_get_11906 xstateregs_get 4 11906 NULL
104780 +ti_write_11916 ti_write 4 11916 NULL
104781 +fs_devrw_entry_11924 fs_devrw_entry 3 11924 NULL
104782 +bitmap_remap_11929 bitmap_remap 5 11929 NULL
104783 +atomic_sub_return_11939 atomic_sub_return 0-1 11939 NULL
104784 +r1_sync_page_io_11963 r1_sync_page_io 3 11963 NULL
104785 +f1x_swap_interleaved_region_11970 f1x_swap_interleaved_region 0-2 11970 NULL
104786 +usc_InReg_11976 usc_InReg 0 11976 NULL nohasharray
104787 +split_node_11976 split_node 0 11976 &usc_InReg_11976
104788 +BeceemFlashBulkRead_11979 BeceemFlashBulkRead 0 11979 NULL
104789 +read_and_add_raw_conns_11987 read_and_add_raw_conns 0 11987 NULL
104790 +i40e_pci_sriov_configure_12011 i40e_pci_sriov_configure 2 12011 NULL
104791 +intel_init_ring_buffer_12016 intel_init_ring_buffer 0 12016 NULL
104792 +ftdi_elan_total_command_size_12045 ftdi_elan_total_command_size 0 12045 NULL
104793 +did_overwrite_ref_12046 did_overwrite_ref 0 12046 NULL
104794 +ieee80211_if_read_user_power_level_12050 ieee80211_if_read_user_power_level 3 12050 NULL
104795 +il4965_ucode_tx_stats_read_12064 il4965_ucode_tx_stats_read 3 12064 NULL
104796 +ptc_proc_write_12076 ptc_proc_write 3 12076 NULL
104797 +ubifs_recover_log_leb_12079 ubifs_recover_log_leb 3 12079 NULL
104798 +pse36_gfn_delta_12087 pse36_gfn_delta 0-1 12087 NULL
104799 +rtw_malloc2d_12102 rtw_malloc2d 1-2-3 12102 NULL
104800 +twl6030_irq_map_12105 twl6030_irq_map 2 12105 NULL
104801 +i915_gem_evict_something_12118 i915_gem_evict_something 0 12118 NULL
104802 +alloc_bulk_urbs_generic_12127 alloc_bulk_urbs_generic 5 12127 NULL
104803 +set_powered_12129 set_powered 4 12129 NULL
104804 +ramoops_init_prz_12134 ramoops_init_prz 5 12134 NULL
104805 +xfs_handle_to_dentry_12135 xfs_handle_to_dentry 3 12135 NULL
104806 +rawv6_seticmpfilter_12137 rawv6_seticmpfilter 5 12137 NULL
104807 +vmw_fifo_reserve_12141 vmw_fifo_reserve 2 12141 NULL
104808 +rawsock_recvmsg_12144 rawsock_recvmsg 4 12144 NULL
104809 +get_idx_gc_leb_12148 get_idx_gc_leb 0 12148 NULL
104810 +btmrvl_sdio_host_to_card_12152 btmrvl_sdio_host_to_card 3 12152 NULL
104811 +ocfs2_local_alloc_new_window_12153 ocfs2_local_alloc_new_window 0 12153 NULL
104812 +vmbus_open_12154 vmbus_open 2-3 12154 NULL
104813 +dma_memcpy_to_iovec_12173 dma_memcpy_to_iovec 5 12173 NULL
104814 +LNetEQAlloc_12178 LNetEQAlloc 1 12178 NULL
104815 +ddp_make_gl_12179 ddp_make_gl 1 12179 NULL
104816 +compat_do_arpt_set_ctl_12184 compat_do_arpt_set_ctl 4 12184 NULL
104817 +ip_generic_getfrag_12187 ip_generic_getfrag 3-4 12187 NULL
104818 +scaled_div_12201 scaled_div 2-1-0 12201 NULL
104819 +snd_pcm_kernel_ioctl_12219 snd_pcm_kernel_ioctl 0 12219 NULL
104820 +fuse_get_req_12221 fuse_get_req 2 12221 NULL nohasharray
104821 +aat2870_reg_read_file_12221 aat2870_reg_read_file 3 12221 &fuse_get_req_12221
104822 +__alloc_bootmem_low_nopanic_12235 __alloc_bootmem_low_nopanic 1 12235 NULL
104823 +kvirt_to_pa_12247 kvirt_to_pa 0 12247 NULL
104824 +ib_uverbs_unmarshall_recv_12251 ib_uverbs_unmarshall_recv 5 12251 NULL
104825 +shash_compat_setkey_12267 shash_compat_setkey 3 12267 NULL
104826 +add_sctp_bind_addr_12269 add_sctp_bind_addr 3 12269 NULL
104827 +note_last_dentry_12285 note_last_dentry 3 12285 NULL
104828 +il_dbgfs_nvm_read_12288 il_dbgfs_nvm_read 3 12288 NULL nohasharray
104829 +roundup_to_multiple_of_64_12288 roundup_to_multiple_of_64 0-1 12288 &il_dbgfs_nvm_read_12288
104830 +wrap_min_12303 wrap_min 0-1-2 12303 NULL
104831 +bt_sock_recvmsg_12316 bt_sock_recvmsg 4 12316 NULL
104832 +pcbit_writecmd_12332 pcbit_writecmd 2 12332 NULL
104833 +btrfs_lookup_file_extent_12341 btrfs_lookup_file_extent 0 12341 NULL
104834 +mptctl_ioctl_12355 mptctl_ioctl 2 12355 NULL
104835 +paging32_walk_addr_12359 paging32_walk_addr 3 12359 NULL
104836 +__nf_ct_ext_add_length_12364 __nf_ct_ext_add_length 3 12364 NULL
104837 +xfs_iext_inline_to_direct_12384 xfs_iext_inline_to_direct 2 12384 NULL
104838 +btrfs_file_extent_ram_bytes_12391 btrfs_file_extent_ram_bytes 0 12391 NULL nohasharray
104839 +populate_dir_12391 populate_dir 0 12391 &btrfs_file_extent_ram_bytes_12391
104840 +ntfs_get_size_for_mapping_pairs_12413 ntfs_get_size_for_mapping_pairs 0 12413 NULL nohasharray
104841 +ext4_bg_num_gdb_nometa_12413 ext4_bg_num_gdb_nometa 0 12413 &ntfs_get_size_for_mapping_pairs_12413
104842 +hbucket_elem_add_12416 hbucket_elem_add 3 12416 NULL
104843 +ieee80211_if_read_num_mcast_sta_12419 ieee80211_if_read_num_mcast_sta 3 12419 NULL
104844 +cfs_array_alloc_12441 cfs_array_alloc 2 12441 NULL
104845 +skb_do_copy_data_nocache_12465 skb_do_copy_data_nocache 5 12465 NULL
104846 +x25_sendmsg_12487 x25_sendmsg 4 12487 NULL
104847 +fnic_trace_ctrl_read_12497 fnic_trace_ctrl_read 3 12497 NULL
104848 +qib_alloc_fast_reg_mr_12526 qib_alloc_fast_reg_mr 2 12526 NULL
104849 +xfs_get_extsz_hint_12531 xfs_get_extsz_hint 0 12531 NULL
104850 +kvm_setup_async_pf_12555 kvm_setup_async_pf 3 12555 NULL
104851 +ib_umem_get_12557 ib_umem_get 2-3 12557 NULL
104852 +ceph_osdc_wait_request_12572 ceph_osdc_wait_request 0 12572 NULL
104853 +hvc_alloc_12579 hvc_alloc 4 12579 NULL
104854 +snd_pcm_plugin_alloc_12580 snd_pcm_plugin_alloc 2 12580 NULL
104855 +pcpu_extend_area_map_12589 pcpu_extend_area_map 2 12589 NULL
104856 +tlbflush_write_file_12598 tlbflush_write_file 3 12598 NULL
104857 +vhci_put_user_12604 vhci_put_user 4 12604 NULL
104858 +ipath_mmap_mem_12625 ipath_mmap_mem 3 12625 NULL
104859 +sdhci_pltfm_init_12627 sdhci_pltfm_init 3 12627 NULL
104860 +pwr_rcvd_awake_bcns_cnt_read_12632 pwr_rcvd_awake_bcns_cnt_read 3 12632 NULL
104861 +pn_sendmsg_12640 pn_sendmsg 4 12640 NULL
104862 +dwc3_link_state_write_12641 dwc3_link_state_write 3 12641 NULL
104863 +nr_recvmsg_12649 nr_recvmsg 4 12649 NULL
104864 +wb_create_12651 wb_create 1 12651 NULL
104865 +rtw_android_get_link_speed_12655 rtw_android_get_link_speed 0 12655 NULL
104866 +ocfs2_read_block_12659 ocfs2_read_block 0 12659 NULL
104867 +sel_read_class_12669 sel_read_class 3 12669 NULL nohasharray
104868 +sparse_mem_maps_populate_node_12669 sparse_mem_maps_populate_node 4 12669 &sel_read_class_12669
104869 +ext4_writepage_trans_blocks_12674 ext4_writepage_trans_blocks 0 12674 NULL
104870 +ext4_bg_num_gdb_meta_12702 ext4_bg_num_gdb_meta 0 12702 NULL
104871 +iwl_dbgfs_calib_disabled_write_12707 iwl_dbgfs_calib_disabled_write 3 12707 NULL
104872 +ieee80211_if_read_num_buffered_multicast_12716 ieee80211_if_read_num_buffered_multicast 3 12716 NULL
104873 +ivtv_write_12721 ivtv_write 3 12721 NULL
104874 +key_rx_spec_read_12736 key_rx_spec_read 3 12736 NULL
104875 +__mei_cl_async_send_12737 __mei_cl_async_send 3 12737 NULL
104876 +run_delayed_data_ref_12749 run_delayed_data_ref 0 12749 NULL
104877 +ieee80211_if_read_dot11MeshMaxRetries_12756 ieee80211_if_read_dot11MeshMaxRetries 3 12756 NULL
104878 +listxattr_12769 listxattr 3 12769 NULL
104879 +sctp_ssnmap_init_12772 sctp_ssnmap_init 2-3 12772 NULL
104880 +btrfs_remove_free_space_12793 btrfs_remove_free_space 2-0 12793 NULL
104881 +scsi_adjust_queue_depth_12802 scsi_adjust_queue_depth 3 12802 NULL
104882 +xfs_inumbers_fmt_12817 xfs_inumbers_fmt 3 12817 NULL
104883 +tlv_put_uuid_12824 tlv_put_uuid 0 12824 NULL
104884 +readq_12825 readq 0 12825 NULL
104885 +SyS_add_key_12834 SyS_add_key 4 12834 NULL
104886 +TSS_authhmac_12839 TSS_authhmac 3 12839 NULL
104887 +spidev_sync_12842 spidev_sync 0 12842 NULL
104888 +spidev_ioctl_12846 spidev_ioctl 2 12846 NULL
104889 +get_leb_cnt_12892 get_leb_cnt 0-2 12892 NULL
104890 +ocfs2_hamming_encode_block_12904 ocfs2_hamming_encode_block 2 12904 NULL
104891 +get_virtual_node_size_12908 get_virtual_node_size 0 12908 NULL
104892 +rds_pages_in_vec_12922 rds_pages_in_vec 0 12922 NULL
104893 +free_tind_blocks_12926 free_tind_blocks 0 12926 NULL
104894 +ci_ll_init_12930 ci_ll_init 3 12930 NULL
104895 +SYSC_sendfile_12936 SYSC_sendfile 4 12936 NULL
104896 +do_inode_permission_12946 do_inode_permission 0 12946 NULL
104897 +bm_status_write_12964 bm_status_write 3 12964 NULL
104898 +raid56_parity_recover_12987 raid56_parity_recover 5 12987 NULL
104899 +TransmitTcb_12989 TransmitTcb 4 12989 NULL
104900 +sk_peek_offset_12991 sk_peek_offset 0 12991 NULL
104901 +subsystem_filter_write_13022 subsystem_filter_write 3 13022 NULL
104902 +btrfs_write_dirty_block_groups_13030 btrfs_write_dirty_block_groups 0 13030 NULL
104903 +generic_segment_checks_13041 generic_segment_checks 0 13041 NULL
104904 +SyS_sendfile64_13043 SyS_sendfile64 4 13043 NULL
104905 +ocfs2_write_begin_13045 ocfs2_write_begin 3-4 13045 NULL
104906 +ptlrpc_lprocfs_threads_min_seq_write_13060 ptlrpc_lprocfs_threads_min_seq_write 3 13060 NULL nohasharray
104907 +__dn_setsockopt_13060 __dn_setsockopt 5 13060 &ptlrpc_lprocfs_threads_min_seq_write_13060
104908 +biovec_create_pool_13079 biovec_create_pool 2 13079 NULL
104909 +_ocfs2_free_suballoc_bits_13085 _ocfs2_free_suballoc_bits 0 13085 NULL
104910 +irq_set_chip_and_handler_13088 irq_set_chip_and_handler 1 13088 NULL
104911 +xattr_getsecurity_13090 xattr_getsecurity 0 13090 NULL
104912 +mb_find_next_zero_bit_13100 mb_find_next_zero_bit 2-3-0 13100 NULL
104913 +ttm_dma_pool_alloc_new_pages_13105 ttm_dma_pool_alloc_new_pages 3 13105 NULL
104914 +SyS_msgrcv_13109 SyS_msgrcv 3 13109 NULL
104915 +snd_rme96_playback_copy_13111 snd_rme96_playback_copy 5 13111 NULL
104916 +xen_allocate_irq_dynamic_13116 xen_allocate_irq_dynamic 0 13116 NULL
104917 +bfad_debugfs_read_13119 bfad_debugfs_read 3 13119 NULL
104918 +blk_update_request_13146 blk_update_request 3 13146 NULL
104919 +caif_stream_recvmsg_13173 caif_stream_recvmsg 4 13173 NULL
104920 +pwr_disable_ps_read_13176 pwr_disable_ps_read 3 13176 NULL
104921 +ucs2_strlen_13178 ucs2_strlen 0 13178 NULL
104922 +dgrp_net_ioctl_13183 dgrp_net_ioctl 2 13183 NULL
104923 +create_trace_uprobe_13184 create_trace_uprobe 1 13184 NULL
104924 +__cmpxchg64_13187 __cmpxchg64 0 13187 NULL
104925 +comedi_read_13199 comedi_read 3 13199 NULL
104926 +mmc_ext_csd_read_13205 mmc_ext_csd_read 3 13205 NULL
104927 +__nodes_fold_13215 __nodes_fold 4 13215 NULL
104928 +get_unaligned_le64_13219 get_unaligned_le64 0 13219 NULL
104929 +svm_msrpm_offset_13220 svm_msrpm_offset 0-1 13220 NULL
104930 +fnic_trace_ctrl_write_13229 fnic_trace_ctrl_write 3 13229 NULL
104931 +asix_read_cmd_13245 asix_read_cmd 5 13245 NULL
104932 +kvm_lapic_enable_pv_eoi_13249 kvm_lapic_enable_pv_eoi 2 13249 NULL
104933 +init_tid_tabs_13252 init_tid_tabs 2-3-4 13252 NULL
104934 +bio_integrity_trim_13259 bio_integrity_trim 3 13259 NULL
104935 +simple_attr_write_13260 simple_attr_write 3 13260 NULL
104936 +c4iw_reg_user_mr_13269 c4iw_reg_user_mr 2-3 13269 NULL
104937 +pmcraid_notify_aen_13274 pmcraid_notify_aen 3 13274 NULL
104938 +il4965_stats_flag_13281 il4965_stats_flag 0-3 13281 NULL
104939 +lpfc_idiag_mbxacc_get_setup_13282 lpfc_idiag_mbxacc_get_setup 0 13282 NULL
104940 +sd_major_13294 sd_major 0-1 13294 NULL
104941 +kempld_read16_13297 kempld_read16 0 13297 NULL
104942 +reexecute_instruction_13321 reexecute_instruction 2 13321 NULL
104943 +__clone_and_map_data_bio_13334 __clone_and_map_data_bio 4-8 13334 NULL
104944 +kvm_read_nested_guest_page_13337 kvm_read_nested_guest_page 5-2 13337 NULL
104945 +get_bits_13353 get_bits 0-2 13353 NULL
104946 +hscx_empty_fifo_13360 hscx_empty_fifo 2 13360 NULL
104947 +iso_sched_alloc_13377 iso_sched_alloc 1 13377 NULL nohasharray
104948 +wep_key_not_found_read_13377 wep_key_not_found_read 3 13377 &iso_sched_alloc_13377
104949 +ext4_meta_trans_blocks_13380 ext4_meta_trans_blocks 0-3-2 13380 NULL
104950 +lov_mds_md_size_13388 lov_mds_md_size 0-1 13388 NULL nohasharray
104951 +dis_bypass_write_13388 dis_bypass_write 3 13388 &lov_mds_md_size_13388
104952 +BcmSetActiveSection_13389 BcmSetActiveSection 0 13389 NULL
104953 +ocfs2_inode_lock_update_13414 ocfs2_inode_lock_update 0 13414 NULL
104954 +netxen_alloc_sds_rings_13417 netxen_alloc_sds_rings 2 13417 NULL
104955 +compat_SyS_sendfile64_13420 compat_SyS_sendfile64 4 13420 NULL
104956 +keyring_read_13438 keyring_read 3 13438 NULL
104957 +sctp_setsockopt_peer_primary_addr_13440 sctp_setsockopt_peer_primary_addr 3 13440 NULL
104958 +ath6kl_cfg80211_connect_event_13443 ath6kl_cfg80211_connect_event 8-9-7 13443 NULL
104959 +sb_init_dio_done_wq_13482 sb_init_dio_done_wq 0 13482 NULL
104960 +data_read_13494 data_read 3 13494 NULL
104961 +i915_switch_context_13498 i915_switch_context 0 13498 NULL
104962 +ioat_chansts_32_13506 ioat_chansts_32 0 13506 NULL
104963 +ocfs2_align_bytes_to_blocks_13512 ocfs2_align_bytes_to_blocks 2-0 13512 NULL
104964 +core_status_13515 core_status 4 13515 NULL
104965 +smk_write_mapped_13519 smk_write_mapped 3 13519 NULL
104966 +bm_init_13529 bm_init 2 13529 NULL
104967 +kvm_get_cr8_13538 kvm_get_cr8 0 13538 NULL
104968 +SYSC_remap_file_pages_13540 SYSC_remap_file_pages 1-2 13540 NULL nohasharray
104969 +non_atomic_pte_lookup_13540 non_atomic_pte_lookup 2 13540 &SYSC_remap_file_pages_13540
104970 +__btrfs_alloc_chunk_13554 __btrfs_alloc_chunk 0 13554 NULL
104971 +llcp_sock_recvmsg_13556 llcp_sock_recvmsg 4 13556 NULL
104972 +ieee80211_if_read_ap_power_level_13558 ieee80211_if_read_ap_power_level 3 13558 NULL
104973 +ubifs_get_idx_gc_leb_13566 ubifs_get_idx_gc_leb 0 13566 NULL
104974 +read_file_antenna_13574 read_file_antenna 3 13574 NULL
104975 +cache_write_13589 cache_write 3 13589 NULL
104976 +Rd_Indx_13602 Rd_Indx 3-2 13602 NULL
104977 +swap_cgroup_swapon_13614 swap_cgroup_swapon 2 13614 NULL
104978 +wm8994_bulk_write_13615 wm8994_bulk_write 2-3 13615 NULL
104979 +pmcraid_get_minor_13619 pmcraid_get_minor 0 13619 NULL
104980 +packet_snd_13634 packet_snd 3 13634 NULL
104981 +blk_msg_write_13655 blk_msg_write 3 13655 NULL
104982 +cache_downcall_13666 cache_downcall 3 13666 NULL
104983 +ext3_xattr_list_entries_13682 ext3_xattr_list_entries 0-4 13682 NULL
104984 +nv94_aux_13689 nv94_aux 2-5 13689 NULL
104985 +usb_get_string_13693 usb_get_string 0 13693 NULL
104986 +atomic_cmpxchg_13700 atomic_cmpxchg 0 13700 NULL
104987 +fw_iso_buffer_alloc_13704 fw_iso_buffer_alloc 2 13704 NULL
104988 +ocfs2_cache_block_dealloc_13731 ocfs2_cache_block_dealloc 0 13731 NULL
104989 +netdev_queue_numa_node_read_13732 netdev_queue_numa_node_read 0 13732 NULL
104990 +audit_unpack_string_13748 audit_unpack_string 3 13748 NULL
104991 +ufs_dtog_13750 ufs_dtog 0-2 13750 NULL
104992 +ieee802154_alloc_device_13767 ieee802154_alloc_device 1 13767 NULL
104993 +fb_sys_read_13778 fb_sys_read 3 13778 NULL
104994 +ath6kl_mgmt_powersave_ap_13791 ath6kl_mgmt_powersave_ap 6 13791 NULL
104995 +random_read_13815 random_read 3 13815 NULL
104996 +mutex_lock_interruptible_nested_13817 mutex_lock_interruptible_nested 0 13817 NULL
104997 +hsi_register_board_info_13820 hsi_register_board_info 2 13820 NULL
104998 +___mei_cl_send_13821 ___mei_cl_send 3 13821 NULL
104999 +enc_pools_insert_13849 enc_pools_insert 3 13849 NULL
105000 +evdev_ioctl_compat_13851 evdev_ioctl_compat 2 13851 NULL
105001 +compat_ip_setsockopt_13870 compat_ip_setsockopt 5 13870 NULL
105002 +btrfs_insert_empty_item_13885 btrfs_insert_empty_item 0 13885 NULL
105003 +qp_memcpy_to_queue_13886 qp_memcpy_to_queue 5-2 13886 NULL nohasharray
105004 +__fsnotify_parent_13886 __fsnotify_parent 0 13886 &qp_memcpy_to_queue_13886
105005 +window_alignment_13895 window_alignment 0 13895 NULL
105006 +snd_pcm_aio_read_13900 snd_pcm_aio_read 3 13900 NULL
105007 +is_inode_existent_13913 is_inode_existent 0 13913 NULL
105008 +cfg80211_inform_bss_width_13933 cfg80211_inform_bss_width 9 13933 NULL
105009 +ext3_xattr_block_get_13936 ext3_xattr_block_get 0 13936 NULL
105010 +ieee80211_if_read_dot11MeshForwarding_13940 ieee80211_if_read_dot11MeshForwarding 3 13940 NULL nohasharray
105011 +ocfs2_xa_value_truncate_13940 ocfs2_xa_value_truncate 2 13940 &ieee80211_if_read_dot11MeshForwarding_13940
105012 +iwl_dbgfs_protection_mode_read_13943 iwl_dbgfs_protection_mode_read 3 13943 NULL
105013 +ieee80211_if_read_min_discovery_timeout_13946 ieee80211_if_read_min_discovery_timeout 3 13946 NULL
105014 +qib_mmap_mem_13947 qib_mmap_mem 3 13947 NULL
105015 +lpfc_idiag_queacc_read_13950 lpfc_idiag_queacc_read 3 13950 NULL
105016 +osc_grant_shrink_interval_seq_write_13952 osc_grant_shrink_interval_seq_write 3 13952 NULL
105017 +ocfs2_refresh_slot_info_13957 ocfs2_refresh_slot_info 0 13957 NULL
105018 +snd_pcm_plug_slave_size_13967 snd_pcm_plug_slave_size 0-2 13967 NULL
105019 +qcam_read_13977 qcam_read 3 13977 NULL
105020 +dsp_read_13980 dsp_read 2 13980 NULL
105021 +bm_block_bits_13981 bm_block_bits 0 13981 NULL nohasharray
105022 +dvb_demux_read_13981 dvb_demux_read 3 13981 &bm_block_bits_13981
105023 +create_files_14003 create_files 0 14003 NULL
105024 +sddr09_write_data_14014 sddr09_write_data 3 14014 NULL
105025 +btrfs_get_blocks_direct_14016 btrfs_get_blocks_direct 2 14016 NULL
105026 +dmi_format_ids_14018 dmi_format_ids 2 14018 NULL
105027 +iscsi_create_flashnode_conn_14022 iscsi_create_flashnode_conn 4 14022 NULL
105028 +dvb_usercopy_14036 dvb_usercopy 2 14036 NULL
105029 +read_def_modal_eeprom_14041 read_def_modal_eeprom 3 14041 NULL
105030 +ieee80211_if_fmt_aid_14055 ieee80211_if_fmt_aid 3 14055 NULL
105031 +sta_agg_status_read_14058 sta_agg_status_read 3 14058 NULL
105032 +ovs_flow_actions_alloc_14072 ovs_flow_actions_alloc 1 14072 NULL
105033 +lov_stripeoffset_seq_write_14078 lov_stripeoffset_seq_write 3 14078 NULL
105034 +do_proc_readlink_14096 do_proc_readlink 3 14096 NULL
105035 +compat_sys_pselect6_14105 compat_sys_pselect6 1 14105 NULL
105036 +intel_ring_wait_seqno_14107 intel_ring_wait_seqno 0 14107 NULL
105037 +ext4_journal_blocks_per_page_14127 ext4_journal_blocks_per_page 0 14127 NULL
105038 +ntfs_rl_replace_14136 ntfs_rl_replace 4-2 14136 NULL
105039 +qfq_ffs_14139 qfq_ffs 2 14139 NULL
105040 +isku_sysfs_read_light_14140 isku_sysfs_read_light 6 14140 NULL
105041 +em_canid_change_14150 em_canid_change 3 14150 NULL
105042 +gsm_dlci_data_14155 gsm_dlci_data 3 14155 NULL
105043 +print_input_mask_14168 print_input_mask 3-0 14168 NULL
105044 +ocfs2_split_and_insert_14171 ocfs2_split_and_insert 0 14171 NULL
105045 +ocfs2_xattr_value_truncate_14183 ocfs2_xattr_value_truncate 3 14183 NULL
105046 +datafab_read_data_14186 datafab_read_data 4 14186 NULL
105047 +do_splice_14196 do_splice 5 14196 NULL
105048 +hfsplus_brec_find_14200 hfsplus_brec_find 0 14200 NULL
105049 +alloc_async_14208 alloc_async 1 14208 NULL
105050 +ath6kl_regread_write_14220 ath6kl_regread_write 3 14220 NULL
105051 +ieee80211_if_write_uapsd_max_sp_len_14233 ieee80211_if_write_uapsd_max_sp_len 3 14233 NULL
105052 +dma_declare_coherent_memory_14244 dma_declare_coherent_memory 4 14244 NULL
105053 +snd_soc_hw_bulk_write_raw_14245 snd_soc_hw_bulk_write_raw 2-4 14245 NULL
105054 +ext4_journal_restart_14251 ext4_journal_restart 0 14251 NULL
105055 +will_overwrite_ref_14252 will_overwrite_ref 0 14252 NULL
105056 +ath6kl_connect_event_14267 ath6kl_connect_event 7-8-9 14267 NULL
105057 +numa_mem_id_14279 numa_mem_id 0 14279 NULL
105058 +rr_status_14293 rr_status 5 14293 NULL
105059 +read_default_ldt_14302 read_default_ldt 2 14302 NULL
105060 +__readl_14308 __readl 0 14308 NULL
105061 +send_chown_14309 send_chown 0 14309 NULL
105062 +i915_gem_object_finish_gpu_14312 i915_gem_object_finish_gpu 0 14312 NULL
105063 +oo_objects_14319 oo_objects 0 14319 NULL
105064 +ww_mutex_deadlock_injection_14321 ww_mutex_deadlock_injection 0 14321 NULL
105065 +ll_get_user_pages_14328 ll_get_user_pages 2-3-0 14328 NULL
105066 +down_write_failed_14331 down_write_failed 2 14331 NULL
105067 +p9_client_zc_rpc_14345 p9_client_zc_rpc 7 14345 NULL
105068 +alloc_tx_struct_14349 alloc_tx_struct 1 14349 NULL
105069 +snd_pcm_lib_readv_14363 snd_pcm_lib_readv 0-3 14363 NULL
105070 +btrfs_set_inode_index_14379 btrfs_set_inode_index 0 14379 NULL
105071 +acpi_get_override_irq_14381 acpi_get_override_irq 1 14381 NULL
105072 +ath6kl_regdump_read_14393 ath6kl_regdump_read 3 14393 NULL
105073 +smk_write_onlycap_14400 smk_write_onlycap 3 14400 NULL
105074 +first_logical_byte_14403 first_logical_byte 0 14403 NULL
105075 +mtd_concat_create_14416 mtd_concat_create 2 14416 NULL
105076 +get_kcore_size_14425 get_kcore_size 0 14425 NULL
105077 +qib_user_sdma_page_length_14432 qib_user_sdma_page_length 0-2-1 14432 NULL
105078 +check_lpt_crc_14442 check_lpt_crc 0 14442 NULL
105079 +block_size_14443 block_size 0 14443 NULL
105080 +lmv_user_md_size_14456 lmv_user_md_size 0-1 14456 NULL
105081 +snd_emu10k1_proc_spdif_status_14457 snd_emu10k1_proc_spdif_status 4-5 14457 NULL
105082 +lustre_msg_size_v2_14470 lustre_msg_size_v2 0 14470 NULL
105083 +dma_transfer_size_14473 dma_transfer_size 0 14473 NULL
105084 +udplite_getfrag_14479 udplite_getfrag 3-4 14479 NULL
105085 +efx_mdio_check_mmds_14486 efx_mdio_check_mmds 2 14486 NULL nohasharray
105086 +ieee80211_if_read_dot11MeshGateAnnouncementProtocol_14486 ieee80211_if_read_dot11MeshGateAnnouncementProtocol 3 14486 &efx_mdio_check_mmds_14486
105087 +ocfs2_debug_read_14507 ocfs2_debug_read 3 14507 NULL
105088 +ep0_write_14536 ep0_write 3 14536 NULL nohasharray
105089 +dataflash_read_user_otp_14536 dataflash_read_user_otp 3-2 14536 &ep0_write_14536
105090 +register_trace_sched_switch_14545 register_trace_sched_switch 0 14545 NULL
105091 +picolcd_debug_eeprom_read_14549 picolcd_debug_eeprom_read 3 14549 NULL
105092 +drm_vmalloc_dma_14550 drm_vmalloc_dma 1 14550 NULL
105093 +qp_host_alloc_queue_14566 qp_host_alloc_queue 1 14566 NULL
105094 +SyS_setdomainname_14569 SyS_setdomainname 2 14569 NULL
105095 +remap_to_origin_then_cache_14583 remap_to_origin_then_cache 3 14583 NULL
105096 +idmap_pipe_downcall_14591 idmap_pipe_downcall 3 14591 NULL
105097 +ceph_osdc_alloc_request_14597 ceph_osdc_alloc_request 3 14597 NULL
105098 +ocfs2_steal_meta_14602 ocfs2_steal_meta 0 14602 NULL
105099 +ocfs2_trim_group_14641 ocfs2_trim_group 4-3 14641 NULL
105100 +dbJoin_14644 dbJoin 0 14644 NULL
105101 +profile_replace_14652 profile_replace 3 14652 NULL
105102 +add_to_page_cache_locked_14668 add_to_page_cache_locked 0 14668 NULL
105103 +min_bytes_needed_14675 min_bytes_needed 0 14675 NULL
105104 +nvme_trans_log_info_exceptions_14677 nvme_trans_log_info_exceptions 3 14677 NULL
105105 +pipeline_enc_tx_stat_fifo_int_read_14680 pipeline_enc_tx_stat_fifo_int_read 3 14680 NULL
105106 +ieee80211_if_fmt_rc_rateidx_mask_2ghz_14683 ieee80211_if_fmt_rc_rateidx_mask_2ghz 3 14683 NULL
105107 +SyS_fsetxattr_14702 SyS_fsetxattr 4 14702 NULL
105108 +persistent_ram_ecc_string_14704 persistent_ram_ecc_string 0 14704 NULL
105109 +u_audio_playback_14709 u_audio_playback 3 14709 NULL
105110 +rtw_cbuf_alloc_14710 rtw_cbuf_alloc 1 14710 NULL
105111 +cgroup_path_14713 cgroup_path 3 14713 NULL
105112 +get_bio_block_14714 get_bio_block 0 14714 NULL
105113 +vfd_write_14717 vfd_write 3 14717 NULL
105114 +SyS_sendfile_14718 SyS_sendfile 4 14718 NULL
105115 +__blk_end_request_14729 __blk_end_request 3 14729 NULL
105116 +raid1_resize_14740 raid1_resize 2 14740 NULL
105117 +i915_error_state_buf_init_14742 i915_error_state_buf_init 2 14742 NULL
105118 +btrfs_inode_extref_name_len_14752 btrfs_inode_extref_name_len 0 14752 NULL
105119 +rx_rx_cmplt_read_14753 rx_rx_cmplt_read 3 14753 NULL
105120 +regmap_range_read_file_14775 regmap_range_read_file 3 14775 NULL
105121 +sta_dev_read_14782 sta_dev_read 3 14782 NULL
105122 +keys_proc_write_14792 keys_proc_write 3 14792 NULL
105123 +ext4_kvmalloc_14796 ext4_kvmalloc 1 14796 NULL
105124 +__kfifo_in_14797 __kfifo_in 3-0 14797 NULL
105125 +hpet_readl_14801 hpet_readl 0 14801 NULL nohasharray
105126 +snd_als300_gcr_read_14801 snd_als300_gcr_read 0 14801 &hpet_readl_14801
105127 +changed_cb_14819 changed_cb 0 14819 NULL
105128 +do_tune_cpucache_14828 do_tune_cpucache 2 14828 NULL
105129 +mrp_attr_create_14853 mrp_attr_create 3 14853 NULL
105130 +lcd_write_14857 lcd_write 3 14857 NULL
105131 +get_user_cpu_mask_14861 get_user_cpu_mask 2 14861 NULL
105132 +gmux_index_read8_14890 gmux_index_read8 0 14890 NULL
105133 +acpi_os_allocate_14892 acpi_os_allocate 1 14892 NULL
105134 +SYSC_readv_14901 SYSC_readv 3 14901 NULL
105135 +regmap_irq_get_virq_14910 regmap_irq_get_virq 2-0 14910 NULL
105136 +__arch_hweight64_14923 __arch_hweight64 0 14923 NULL nohasharray
105137 +qp_memcpy_to_queue_iov_14923 qp_memcpy_to_queue_iov 5-2 14923 &__arch_hweight64_14923
105138 +ocfs2_expand_nonsparse_inode_14936 ocfs2_expand_nonsparse_inode 3-4 14936 NULL
105139 +range_to_mtrr_14940 range_to_mtrr 2 14940 NULL
105140 +queue_cnt_14951 queue_cnt 0 14951 NULL
105141 +unix_dgram_recvmsg_14952 unix_dgram_recvmsg 4 14952 NULL
105142 +i915_vma_unbind_14954 i915_vma_unbind 0 14954 NULL
105143 +videobuf_read_stream_14956 videobuf_read_stream 3 14956 NULL
105144 +mce_flush_rx_buffer_14976 mce_flush_rx_buffer 2 14976 NULL
105145 +setkey_14987 setkey 3 14987 NULL nohasharray
105146 +gpio_twl4030_write_14987 gpio_twl4030_write 1 14987 &setkey_14987
105147 +xfs_dinode_size_14996 xfs_dinode_size 0 14996 NULL
105148 +blk_integrity_tuple_size_15027 blk_integrity_tuple_size 0 15027 NULL
105149 +irq_get_next_irq_15053 irq_get_next_irq 1-0 15053 NULL
105150 +cld_pipe_downcall_15058 cld_pipe_downcall 3 15058 NULL
105151 +ieee80211_if_read_uapsd_max_sp_len_15067 ieee80211_if_read_uapsd_max_sp_len 3 15067 NULL
105152 +nfs4_write_cached_acl_15070 nfs4_write_cached_acl 4 15070 NULL
105153 +ntfs_copy_from_user_15072 ntfs_copy_from_user 3-5-0 15072 NULL
105154 +pppoe_recvmsg_15073 pppoe_recvmsg 4 15073 NULL
105155 +ceph_calc_ceph_pg_15075 ceph_calc_ceph_pg 0 15075 NULL
105156 +perf_trace_sched_stat_runtime_15115 perf_trace_sched_stat_runtime 3 15115 NULL
105157 +hex_dump_to_buffer_15121 hex_dump_to_buffer 6 15121 NULL
105158 +start_port_15124 start_port 0 15124 NULL
105159 +ipwireless_ppp_mru_15153 ipwireless_ppp_mru 0 15153 NULL
105160 +iwl_dbgfs_sta_drain_write_15167 iwl_dbgfs_sta_drain_write 3 15167 NULL
105161 +self_check_not_bad_15175 self_check_not_bad 0 15175 NULL
105162 +SYSC_setdomainname_15180 SYSC_setdomainname 2 15180 NULL
105163 +iscsi_create_endpoint_15193 iscsi_create_endpoint 1 15193 NULL
105164 +reserve_resources_15194 reserve_resources 3 15194 NULL
105165 +mtt_alloc_res_15211 mtt_alloc_res 5 15211 NULL
105166 +bfad_debugfs_write_regrd_15218 bfad_debugfs_write_regrd 3 15218 NULL
105167 +iwl_dbgfs_sram_write_15239 iwl_dbgfs_sram_write 3 15239 NULL
105168 +il_dbgfs_rx_stats_read_15243 il_dbgfs_rx_stats_read 3 15243 NULL
105169 +div64_u64_15263 div64_u64 0-1-2 15263 NULL
105170 +simple_strtol_15273 simple_strtol 0 15273 NULL
105171 +fw_realloc_buffer_15280 fw_realloc_buffer 2 15280 NULL
105172 +arch_enable_uv_irq_15294 arch_enable_uv_irq 2 15294 NULL
105173 +acpi_ev_create_gpe_block_15297 acpi_ev_create_gpe_block 5 15297 NULL
105174 +ocfs2_read_refcount_block_15305 ocfs2_read_refcount_block 0 15305 NULL
105175 +__ocfs2_remove_xattr_range_15330 __ocfs2_remove_xattr_range 4-3-5 15330 NULL
105176 +bfloat_mantissa_15334 bfloat_mantissa 0 15334 NULL
105177 +xlog_ticket_alloc_15335 xlog_ticket_alloc 2 15335 NULL
105178 +kovaplus_sysfs_read_15337 kovaplus_sysfs_read 6 15337 NULL
105179 +ioread16_15342 ioread16 0 15342 NULL
105180 +ept_prefetch_gpte_15348 ept_prefetch_gpte 4 15348 NULL
105181 +acpi_ut_create_string_object_15360 acpi_ut_create_string_object 1 15360 NULL
105182 +count_inode_extrefs_15366 count_inode_extrefs 0 15366 NULL
105183 +ext4_direct_IO_15369 ext4_direct_IO 4 15369 NULL
105184 +graph_depth_read_15371 graph_depth_read 3 15371 NULL
105185 +compat_sys_process_vm_readv_15374 compat_sys_process_vm_readv 3-5 15374 NULL
105186 +fq_codel_zalloc_15378 fq_codel_zalloc 1 15378 NULL
105187 +domain_flush_pages_15379 domain_flush_pages 2-3 15379 NULL
105188 +alloc_fddidev_15382 alloc_fddidev 1 15382 NULL
105189 +btrfs_level_size_15392 btrfs_level_size 0 15392 NULL
105190 +pipeline_csum_to_rx_xfer_swi_read_15403 pipeline_csum_to_rx_xfer_swi_read 3 15403 NULL
105191 +get_modalias_15406 get_modalias 2 15406 NULL
105192 +blockdev_direct_IO_15408 blockdev_direct_IO 0-5 15408 NULL
105193 +dm_cache_resize_15422 dm_cache_resize 2 15422 NULL
105194 +__videobuf_copy_to_user_15423 __videobuf_copy_to_user 4-0 15423 NULL
105195 +tcp_mtu_to_mss_15438 tcp_mtu_to_mss 2-0 15438 NULL
105196 +hpsa_change_queue_depth_15449 hpsa_change_queue_depth 2 15449 NULL
105197 +memweight_15450 memweight 2 15450 NULL
105198 +vmalloc_15464 vmalloc 1 15464 NULL
105199 +__mutex_lock_killable_slowpath_15472 __mutex_lock_killable_slowpath 0 15472 NULL
105200 +insert_old_idx_znode_15500 insert_old_idx_znode 0 15500 NULL
105201 +zd_chip_is_zd1211b_15518 zd_chip_is_zd1211b 0 15518 NULL
105202 +ifx_spi_write_15531 ifx_spi_write 3 15531 NULL
105203 +da9052_bat_irq_15533 da9052_bat_irq 1 15533 NULL
105204 +p9_check_zc_errors_15534 p9_check_zc_errors 4 15534 NULL
105205 +xfrm_state_mtu_15548 xfrm_state_mtu 0-2 15548 NULL
105206 +snd_pcm_channel_info_15572 snd_pcm_channel_info 0 15572 NULL
105207 +persistent_status_15574 persistent_status 4 15574 NULL
105208 +bnx2fc_process_unsol_compl_15576 bnx2fc_process_unsol_compl 2 15576 NULL
105209 +cl_io_submit_sync_15579 cl_io_submit_sync 0 15579 NULL
105210 +vme_user_write_15587 vme_user_write 3 15587 NULL
105211 +ocfs2_truncate_rec_15595 ocfs2_truncate_rec 7-0 15595 NULL
105212 +sx150x_install_irq_chip_15609 sx150x_install_irq_chip 3 15609 NULL
105213 +iommu_device_max_index_15620 iommu_device_max_index 0-3-2-1 15620 NULL nohasharray
105214 +compat_fillonedir_15620 compat_fillonedir 3 15620 &iommu_device_max_index_15620
105215 +proc_loginuid_read_15631 proc_loginuid_read 3 15631 NULL
105216 +tomoyo_scan_bprm_15642 tomoyo_scan_bprm 4-2 15642 NULL nohasharray
105217 +sk_memory_allocated_add_15642 sk_memory_allocated_add 2 15642 &tomoyo_scan_bprm_15642 nohasharray
105218 +pipeline_hs_tx_stat_fifo_int_read_15642 pipeline_hs_tx_stat_fifo_int_read 3 15642 &sk_memory_allocated_add_15642
105219 +joydev_handle_JSIOCSBTNMAP_15643 joydev_handle_JSIOCSBTNMAP 3 15643 NULL
105220 +fs_path_add_15648 fs_path_add 3-0 15648 NULL
105221 +xsd_read_15653 xsd_read 3 15653 NULL
105222 +unix_bind_15668 unix_bind 3 15668 NULL
105223 +SyS_connect_15674 SyS_connect 3 15674 NULL nohasharray
105224 +dm_read_15674 dm_read 3 15674 &SyS_connect_15674
105225 +pstore_mkfile_15675 pstore_mkfile 6 15675 NULL
105226 +i915_gem_object_set_to_cpu_domain_15705 i915_gem_object_set_to_cpu_domain 0 15705 NULL nohasharray
105227 +uncore_alloc_box_15705 uncore_alloc_box 2 15705 &i915_gem_object_set_to_cpu_domain_15705
105228 +ocfs2_split_tree_15716 ocfs2_split_tree 5-0 15716 NULL
105229 +tracing_snapshot_write_15719 tracing_snapshot_write 3 15719 NULL
105230 +HiSax_readstatus_15752 HiSax_readstatus 2 15752 NULL
105231 +ftrace_profile_init_cpu_15761 ftrace_profile_init_cpu 0 15761 NULL
105232 +bitmap_search_next_usable_block_15762 bitmap_search_next_usable_block 3-1-0 15762 NULL
105233 +i915_gem_init_seqno_15793 i915_gem_init_seqno 0 15793 NULL
105234 +smk_read_direct_15803 smk_read_direct 3 15803 NULL
105235 +nameseq_list_15817 nameseq_list 3-0 15817 NULL nohasharray
105236 +gnttab_expand_15817 gnttab_expand 1 15817 &nameseq_list_15817
105237 +afs_proc_rootcell_write_15822 afs_proc_rootcell_write 3 15822 NULL
105238 +brcmf_sdbrcm_died_dump_15841 brcmf_sdbrcm_died_dump 3 15841 NULL
105239 +table_size_15851 table_size 0-1-2 15851 NULL
105240 +ubi_io_write_15870 ubi_io_write 0-5-4 15870 NULL nohasharray
105241 +media_entity_init_15870 media_entity_init 2-4 15870 &ubi_io_write_15870
105242 +__mptctl_ioctl_15875 __mptctl_ioctl 2 15875 NULL
105243 +profile_pc_15887 profile_pc 0 15887 NULL
105244 +nfs_map_group_to_gid_15892 nfs_map_group_to_gid 3 15892 NULL
105245 +native_read_msr_15905 native_read_msr 0 15905 NULL
105246 +parse_audio_stream_data_15937 parse_audio_stream_data 3 15937 NULL
105247 +power_read_15939 power_read 3 15939 NULL
105248 +lpfc_idiag_drbacc_read_15948 lpfc_idiag_drbacc_read 3 15948 NULL
105249 +snd_pcm_lib_read_transfer_15952 snd_pcm_lib_read_transfer 5-2-4 15952 NULL
105250 +tfrc_calc_x_15975 tfrc_calc_x 2-1 15975 NULL
105251 +frame_alloc_15981 frame_alloc 4 15981 NULL
105252 +hdpvr_register_videodev_16010 hdpvr_register_videodev 3 16010 NULL
105253 +viafb_vt1636_proc_write_16018 viafb_vt1636_proc_write 3 16018 NULL
105254 +i915_gem_object_pin_16032 i915_gem_object_pin 0 16032 NULL
105255 +dccp_recvmsg_16056 dccp_recvmsg 4 16056 NULL
105256 +read_file_spectral_period_16057 read_file_spectral_period 3 16057 NULL
105257 +si5351_msynth_params_address_16062 si5351_msynth_params_address 0-1 16062 NULL
105258 +ocfs2_sync_local_to_main_16076 ocfs2_sync_local_to_main 0 16076 NULL
105259 +isr_tx_exch_complete_read_16103 isr_tx_exch_complete_read 3 16103 NULL
105260 +dma_tx_requested_read_16110 dma_tx_requested_read 3 16110 NULL nohasharray
105261 +isr_hw_pm_mode_changes_read_16110 isr_hw_pm_mode_changes_read 3 16110 &dma_tx_requested_read_16110
105262 +irq_set_chip_and_handler_name_16111 irq_set_chip_and_handler_name 1 16111 NULL
105263 +snd_dma_pointer_16126 snd_dma_pointer 0-2 16126 NULL
105264 +compat_sys_select_16131 compat_sys_select 1 16131 NULL
105265 +fsm_init_16134 fsm_init 2 16134 NULL
105266 +ext4_xattr_block_get_16148 ext4_xattr_block_get 0 16148 NULL
105267 +update_block_group_16155 update_block_group 0 16155 NULL
105268 +optimal_reclaimed_pages_16172 optimal_reclaimed_pages 0 16172 NULL
105269 +mapping_level_16188 mapping_level 2-0 16188 NULL
105270 +i40e_allocate_virt_mem_d_16191 i40e_allocate_virt_mem_d 3 16191 NULL
105271 +tcp_syn_options_16197 tcp_syn_options 0 16197 NULL
105272 +ath10k_htt_rx_ring_size_16201 ath10k_htt_rx_ring_size 0 16201 NULL
105273 +cipso_v4_map_cat_rng_hton_16203 cipso_v4_map_cat_rng_hton 0 16203 NULL
105274 +SyS_pselect6_16210 SyS_pselect6 1 16210 NULL
105275 +create_table_16213 create_table 2 16213 NULL
105276 +atomic_read_file_16227 atomic_read_file 3 16227 NULL
105277 +BcmGetSectionValStartOffset_16235 BcmGetSectionValStartOffset 0 16235 NULL
105278 +lov_prep_brw_set_16246 lov_prep_brw_set 3 16246 NULL
105279 +i40e_dbg_dump_read_16247 i40e_dbg_dump_read 3 16247 NULL nohasharray
105280 +btrfs_dev_extent_chunk_offset_16247 btrfs_dev_extent_chunk_offset 0 16247 &i40e_dbg_dump_read_16247
105281 +il_dbgfs_disable_ht40_write_16249 il_dbgfs_disable_ht40_write 3 16249 NULL
105282 +SyS_fgetxattr_16254 SyS_fgetxattr 4 16254 NULL
105283 +reiserfs_acl_count_16265 reiserfs_acl_count 0-1 16265 NULL
105284 +mq_force_mapping_16277 mq_force_mapping 2 16277 NULL
105285 +ocfs2_xattr_bucket_value_truncate_16279 ocfs2_xattr_bucket_value_truncate 4 16279 NULL
105286 +drbd_setsockopt_16280 drbd_setsockopt 5 16280 NULL nohasharray
105287 +nand_bch_init_16280 nand_bch_init 2-3 16280 &drbd_setsockopt_16280
105288 +account_16283 account 0-4-2 16283 NULL nohasharray
105289 +mirror_status_16283 mirror_status 5 16283 &account_16283
105290 +retry_instruction_16285 retry_instruction 2 16285 NULL
105291 +jumpshot_read_data_16287 jumpshot_read_data 4 16287 NULL
105292 +mo_xattr_get_16288 mo_xattr_get 0 16288 NULL
105293 +stk_allocate_buffers_16291 stk_allocate_buffers 2 16291 NULL
105294 +rbd_segment_offset_16293 rbd_segment_offset 0-2 16293 NULL
105295 +tfrc_invert_loss_event_rate_16295 tfrc_invert_loss_event_rate 1 16295 NULL
105296 +rsc_mgr_init_16299 rsc_mgr_init 3 16299 NULL
105297 +wb_map_16301 wb_map 2 16301 NULL
105298 +kvm_handle_hva_range_16312 kvm_handle_hva_range 3-2 16312 NULL
105299 +ext4_blocks_count_16320 ext4_blocks_count 0 16320 NULL
105300 +vmw_cursor_update_image_16332 vmw_cursor_update_image 3-4 16332 NULL
105301 +btrfs_insert_item_16357 btrfs_insert_item 0 16357 NULL
105302 +sysfs_create_groups_16360 sysfs_create_groups 0 16360 NULL
105303 +total_ps_buffered_read_16365 total_ps_buffered_read 3 16365 NULL
105304 +iscsi_tcp_conn_setup_16376 iscsi_tcp_conn_setup 2 16376 NULL
105305 +diva_os_malloc_16406 diva_os_malloc 2 16406 NULL
105306 +ieee80211_if_read_tsf_16420 ieee80211_if_read_tsf 3 16420 NULL
105307 +rxrpc_server_keyring_16431 rxrpc_server_keyring 3 16431 NULL
105308 +__bio_add_page_16435 __bio_add_page 0-4 16435 NULL
105309 +btrfs_truncate_inode_items_16452 btrfs_truncate_inode_items 0-4 16452 NULL
105310 +ocfs2_expand_refcount_tree_16455 ocfs2_expand_refcount_tree 0 16455 NULL
105311 +netlink_change_ngroups_16457 netlink_change_ngroups 2 16457 NULL
105312 +alloc_disk_node_16458 alloc_disk_node 2 16458 NULL
105313 +req_capsule_get_size_16467 req_capsule_get_size 0 16467 NULL
105314 +ocfs2_block_group_set_bits_16488 ocfs2_block_group_set_bits 0 16488 NULL
105315 +add_qgroup_item_16492 add_qgroup_item 0 16492 NULL
105316 +tracing_readme_read_16493 tracing_readme_read 3 16493 NULL
105317 +filemap_write_and_wait_16506 filemap_write_and_wait 0 16506 NULL
105318 +start_this_handle_16519 start_this_handle 0 16519 NULL
105319 +snd_interval_max_16529 snd_interval_max 0 16529 NULL
105320 +raid10_resize_16537 raid10_resize 2 16537 NULL
105321 +lpfc_debugfs_read_16566 lpfc_debugfs_read 3 16566 NULL
105322 +perf_event_set_period_16574 perf_event_set_period 2-3 16574 NULL
105323 +agp_allocate_memory_wrap_16576 agp_allocate_memory_wrap 1 16576 NULL
105324 +lustre_msg_hdr_size_v2_16589 lustre_msg_hdr_size_v2 0 16589 NULL
105325 +btrfs_insert_orphan_item_16602 btrfs_insert_orphan_item 0 16602 NULL
105326 +gmux_index_read32_16604 gmux_index_read32 0 16604 NULL
105327 +btrfs_end_transaction_16610 btrfs_end_transaction 0 16610 NULL
105328 +palmas_irq_get_virq_16613 palmas_irq_get_virq 2 16613 NULL
105329 +btrfs_wait_marked_extents_16615 btrfs_wait_marked_extents 0 16615 NULL
105330 +rtw_set_wpa_ie_16633 rtw_set_wpa_ie 3 16633 NULL
105331 +btrfs_get_token_32_16651 btrfs_get_token_32 0 16651 NULL
105332 +packet_recv_error_16669 packet_recv_error 3 16669 NULL
105333 +__proc_lnet_buffers_16717 __proc_lnet_buffers 5 16717 NULL
105334 +__copy_to_user_swizzled_16748 __copy_to_user_swizzled 3-4 16748 NULL
105335 +arcmsr_adjust_disk_queue_depth_16756 arcmsr_adjust_disk_queue_depth 2 16756 NULL
105336 +blk_rq_map_user_iov_16772 blk_rq_map_user_iov 5 16772 NULL
105337 +i2o_parm_issue_16790 i2o_parm_issue 0 16790 NULL
105338 +get_server_iovec_16804 get_server_iovec 2 16804 NULL
105339 +tipc_send2name_16809 tipc_send2name 6 16809 NULL
105340 +dm_vcalloc_16814 dm_vcalloc 1-2 16814 NULL
105341 +cache_grow_16818 cache_grow 3 16818 NULL
105342 +drm_malloc_ab_16831 drm_malloc_ab 1-2 16831 NULL
105343 +scsi_mode_sense_16835 scsi_mode_sense 5 16835 NULL
105344 +hfsplus_min_io_size_16859 hfsplus_min_io_size 0 16859 NULL
105345 +alloc_idx_lebs_16872 alloc_idx_lebs 2 16872 NULL
105346 +carl9170_debugfs_ampdu_state_read_16873 carl9170_debugfs_ampdu_state_read 3 16873 NULL
105347 +st_write_16874 st_write 3 16874 NULL
105348 +__kfifo_peek_n_16877 __kfifo_peek_n 0 16877 NULL
105349 +transport_init_session_tags_16878 transport_init_session_tags 1-2 16878 NULL
105350 +ext4_ext_zeroout_16895 ext4_ext_zeroout 0 16895 NULL
105351 +psb_unlocked_ioctl_16926 psb_unlocked_ioctl 2 16926 NULL nohasharray
105352 +snd_gf1_mem_proc_dump_16926 snd_gf1_mem_proc_dump 5 16926 &psb_unlocked_ioctl_16926
105353 +_sp2d_alloc_16944 _sp2d_alloc 3-2-1 16944 NULL
105354 +squashfs_read_table_16945 squashfs_read_table 3 16945 NULL
105355 +wrm_16966 wrm 0 16966 NULL
105356 +keyctl_instantiate_key_iov_16969 keyctl_instantiate_key_iov 3 16969 NULL
105357 +ocfs2_read_quota_phys_block_16990 ocfs2_read_quota_phys_block 0 16990 NULL
105358 +ceph_read_dir_17005 ceph_read_dir 3 17005 NULL
105359 +snd_mask_refine_first_17026 snd_mask_refine_first 0 17026 NULL
105360 +copy_counters_to_user_17027 copy_counters_to_user 5 17027 NULL
105361 +btrfs_unlink_inode_17043 btrfs_unlink_inode 0 17043 NULL
105362 +jffs2_trusted_setxattr_17048 jffs2_trusted_setxattr 4 17048 NULL
105363 +__arch_hweight32_17060 __arch_hweight32 0 17060 NULL
105364 +__copy_user_nocache_17065 __copy_user_nocache 0 17065 NULL
105365 +sddr55_read_data_17072 sddr55_read_data 4 17072 NULL
105366 +dvb_dvr_read_17073 dvb_dvr_read 3 17073 NULL
105367 +simple_transaction_read_17076 simple_transaction_read 3 17076 NULL
105368 +__kmalloc_reserve_17080 __kmalloc_reserve 3 17080 NULL
105369 +carl9170_debugfs_mem_usage_read_17084 carl9170_debugfs_mem_usage_read 3 17084 NULL
105370 +entry_length_17093 entry_length 0 17093 NULL
105371 +ocfs2_get_refcount_cpos_end_17113 ocfs2_get_refcount_cpos_end 0 17113 NULL
105372 +write_mem_17114 write_mem 3 17114 NULL
105373 +pvr2_hdw_state_report_17121 pvr2_hdw_state_report 3 17121 NULL
105374 +wrmaltWithLock_17139 wrmaltWithLock 0 17139 NULL
105375 +nouveau_instobj_create__17144 nouveau_instobj_create_ 4 17144 NULL
105376 +jumpshot_write_data_17151 jumpshot_write_data 4 17151 NULL
105377 +sep_read_17161 sep_read 3 17161 NULL
105378 +befs_nls2utf_17163 befs_nls2utf 3 17163 NULL
105379 +tx_tx_start_templates_read_17164 tx_tx_start_templates_read 3 17164 NULL
105380 +UniStrnlen_17169 UniStrnlen 0 17169 NULL
105381 +ocfs2_flock_handle_signal_17189 ocfs2_flock_handle_signal 0 17189 NULL nohasharray
105382 +access_remote_vm_17189 access_remote_vm 0-4-2 17189 &ocfs2_flock_handle_signal_17189 nohasharray
105383 +iwl_dbgfs_txfifo_flush_write_17189 iwl_dbgfs_txfifo_flush_write 3 17189 &access_remote_vm_17189
105384 +driver_state_read_17194 driver_state_read 3 17194 NULL nohasharray
105385 +iscsit_find_cmd_from_itt_or_dump_17194 iscsit_find_cmd_from_itt_or_dump 3 17194 &driver_state_read_17194
105386 +sync_request_17208 sync_request 2 17208 NULL
105387 +dn_recvmsg_17213 dn_recvmsg 4 17213 NULL
105388 +send_write_or_clone_17241 send_write_or_clone 0 17241 NULL
105389 +to_oblock_17254 to_oblock 0-1 17254 NULL
105390 +unpack_value_17259 unpack_value 1 17259 NULL
105391 +lprocfs_read_frac_helper_17261 lprocfs_read_frac_helper 0 17261 NULL
105392 +error_error_frame_cts_nul_flid_read_17262 error_error_frame_cts_nul_flid_read 3 17262 NULL
105393 +alloc_reserved_file_extent_17267 alloc_reserved_file_extent 0 17267 NULL
105394 +alloc_ep_17269 alloc_ep 1 17269 NULL
105395 +hw_test_and_write_17271 hw_test_and_write 3 17271 NULL
105396 +pg_read_17276 pg_read 3 17276 NULL
105397 +raw_recvmsg_17277 raw_recvmsg 4 17277 NULL
105398 +hmac_sha256_17278 hmac_sha256 2 17278 NULL
105399 +neigh_hash_grow_17283 neigh_hash_grow 2 17283 NULL
105400 +minstrel_stats_read_17290 minstrel_stats_read 3 17290 NULL
105401 +install_breakpoint_17292 install_breakpoint 4 17292 NULL
105402 +ieee80211_if_fmt_dot11MeshForwarding_17301 ieee80211_if_fmt_dot11MeshForwarding 3 17301 NULL
105403 +mb_cache_create_17307 mb_cache_create 2 17307 NULL
105404 +gnttab_map_frames_v2_17314 gnttab_map_frames_v2 2 17314 NULL
105405 +SYSC_pread64_17337 SYSC_pread64 3 17337 NULL
105406 +ieee80211_if_read_dot11MeshHWMPperrMinInterval_17346 ieee80211_if_read_dot11MeshHWMPperrMinInterval 3 17346 NULL
105407 +ath6kl_wmi_send_mgmt_cmd_17347 ath6kl_wmi_send_mgmt_cmd 7 17347 NULL
105408 +mdc_import_seq_write_17409 mdc_import_seq_write 3 17409 NULL
105409 +lpfc_debugfs_dif_err_write_17424 lpfc_debugfs_dif_err_write 3 17424 NULL
105410 +compat_sys_ppoll_17430 compat_sys_ppoll 2 17430 NULL
105411 +sta_connected_time_read_17435 sta_connected_time_read 3 17435 NULL
105412 +SYSC_fcntl_17441 SYSC_fcntl 3 17441 NULL
105413 +libcfs_ipif_enumerate_17445 libcfs_ipif_enumerate 0 17445 NULL
105414 +nla_get_u32_17455 nla_get_u32 0 17455 NULL
105415 +__ref_totlen_17461 __ref_totlen 0 17461 NULL
105416 +probe_kernel_write_17481 probe_kernel_write 3 17481 NULL
105417 +TSS_rawhmac_17486 TSS_rawhmac 3 17486 NULL
105418 +lookup_tree_block_ref_17494 lookup_tree_block_ref 0 17494 NULL
105419 +bitmap_pos_to_ord_17503 bitmap_pos_to_ord 3 17503 NULL
105420 +lbs_highrssi_write_17515 lbs_highrssi_write 3 17515 NULL
105421 +qp_free_res_17541 qp_free_res 5 17541 NULL
105422 +xlog_do_log_recovery_17550 xlog_do_log_recovery 3 17550 NULL
105423 +__copy_to_user_17551 __copy_to_user 3-0 17551 NULL
105424 +copy_from_user_17559 copy_from_user 3-0 17559 NULL
105425 +snd_pcm_action_lock_irq_17569 snd_pcm_action_lock_irq 0 17569 NULL
105426 +acpi_ut_create_package_object_17594 acpi_ut_create_package_object 1 17594 NULL
105427 +neigh_hash_alloc_17595 neigh_hash_alloc 1 17595 NULL
105428 +__inode_info_17603 __inode_info 0 17603 NULL
105429 +wm8994_gpio_to_irq_17604 wm8994_gpio_to_irq 2 17604 NULL
105430 +osst_execute_17607 osst_execute 7-6 17607 NULL
105431 +ocfs2_mark_extent_written_17615 ocfs2_mark_extent_written 6 17615 NULL
105432 +ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout_17618 ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout 3 17618 NULL
105433 +dma_map_page_17628 dma_map_page 0 17628 NULL
105434 +ocfs2_rotate_subtree_left_17634 ocfs2_rotate_subtree_left 0 17634 NULL
105435 +twl4030_set_gpio_direction_17645 twl4030_set_gpio_direction 1 17645 NULL
105436 +SYSC_migrate_pages_17657 SYSC_migrate_pages 2 17657 NULL
105437 +packet_setsockopt_17662 packet_setsockopt 5 17662 NULL nohasharray
105438 +ubi_io_read_data_17662 ubi_io_read_data 0 17662 &packet_setsockopt_17662
105439 +kernel_write_17665 kernel_write 3 17665 NULL
105440 +pwr_enable_ps_read_17686 pwr_enable_ps_read 3 17686 NULL
105441 +filemap_fdatawait_17688 filemap_fdatawait 0 17688 NULL
105442 +gfn_to_pfn_memslot_17693 gfn_to_pfn_memslot 2-0 17693 NULL
105443 +__einj_error_trigger_17707 __einj_error_trigger 0 17707 NULL nohasharray
105444 +venus_rename_17707 venus_rename 4-5 17707 &__einj_error_trigger_17707
105445 +exofs_read_lookup_dev_table_17733 exofs_read_lookup_dev_table 3 17733 NULL
105446 +sctpprobe_read_17741 sctpprobe_read 3 17741 NULL
105447 +mark_unsafe_pages_17759 mark_unsafe_pages 0 17759 NULL
105448 +dgap_do_fep_load_17765 dgap_do_fep_load 3 17765 NULL
105449 +dtf_read_run_17768 dtf_read_run 3 17768 NULL
105450 +brcmf_sdio_chip_verifynvram_17776 brcmf_sdio_chip_verifynvram 4 17776 NULL
105451 +hash_ipport6_expire_17784 hash_ipport6_expire 3 17784 NULL
105452 +perf_clock_17787 perf_clock 0 17787 NULL
105453 +ubifs_leb_change_17789 ubifs_leb_change 0-4 17789 NULL
105454 +get_unaligned_be64_17794 get_unaligned_be64 0 17794 NULL nohasharray
105455 +shrink_slab_node_17794 shrink_slab_node 3-4 17794 &get_unaligned_be64_17794
105456 +bkey_to_cacheline_17811 bkey_to_cacheline 0 17811 NULL
105457 +_snd_pcm_lib_alloc_vmalloc_buffer_17820 _snd_pcm_lib_alloc_vmalloc_buffer 2 17820 NULL
105458 +gnet_stats_copy_app_17821 gnet_stats_copy_app 3 17821 NULL
105459 +cipso_v4_gentag_rbm_17836 cipso_v4_gentag_rbm 0 17836 NULL
105460 +dm_stats_message_17863 dm_stats_message 5 17863 NULL
105461 +sisusb_send_bulk_msg_17864 sisusb_send_bulk_msg 3 17864 NULL
105462 +alloc_sja1000dev_17868 alloc_sja1000dev 1 17868 NULL
105463 +ray_cs_essid_proc_write_17875 ray_cs_essid_proc_write 3 17875 NULL
105464 +orinoco_set_key_17878 orinoco_set_key 7-5 17878 NULL nohasharray
105465 +i40e_align_l2obj_base_17878 i40e_align_l2obj_base 0-1 17878 &orinoco_set_key_17878
105466 +init_per_cpu_17880 init_per_cpu 1 17880 NULL
105467 +ieee80211_if_fmt_dot11MeshMaxPeerLinks_17883 ieee80211_if_fmt_dot11MeshMaxPeerLinks 3 17883 NULL
105468 +ieee80211_if_fmt_dot11MeshHWMPRootMode_17890 ieee80211_if_fmt_dot11MeshHWMPRootMode 3 17890 NULL
105469 +ocfs2_clusters_to_blocks_17896 ocfs2_clusters_to_blocks 0-2 17896 NULL
105470 +recover_head_17904 recover_head 3 17904 NULL
105471 +xfs_buf_associate_memory_17915 xfs_buf_associate_memory 3 17915 NULL
105472 +scsi_bufflen_17933 scsi_bufflen 0 17933 NULL
105473 +__mutex_lock_check_stamp_17947 __mutex_lock_check_stamp 0 17947 NULL
105474 +beacon_interval_write_17952 beacon_interval_write 3 17952 NULL
105475 +ufs_free_blocks_17963 ufs_free_blocks 3-2 17963 NULL nohasharray
105476 +tlv_put_u64_17963 tlv_put_u64 0 17963 &ufs_free_blocks_17963
105477 +calc_nr_buckets_17976 calc_nr_buckets 0 17976 NULL
105478 +ext4_ext_calc_credits_for_single_extent_17983 ext4_ext_calc_credits_for_single_extent 0-2 17983 NULL
105479 +smk_write_cipso_17989 smk_write_cipso 3 17989 NULL
105480 +gnttab_max_grant_frames_17993 gnttab_max_grant_frames 0 17993 NULL
105481 +ext4_num_overhead_clusters_18001 ext4_num_overhead_clusters 2 18001 NULL
105482 +pvr2_v4l2_read_18006 pvr2_v4l2_read 3 18006 NULL
105483 +alloc_rx_desc_ring_18016 alloc_rx_desc_ring 2 18016 NULL
105484 +fill_read_18019 fill_read 0 18019 NULL
105485 +o2hb_highest_node_18034 o2hb_highest_node 2-0 18034 NULL
105486 +__posix_lock_file_18035 __posix_lock_file 0 18035 NULL
105487 +ocfs2_cache_cluster_dealloc_18043 ocfs2_cache_cluster_dealloc 0 18043 NULL
105488 +cryptd_alloc_instance_18048 cryptd_alloc_instance 3-2 18048 NULL
105489 +find_next_inuse_18051 find_next_inuse 2-3-0 18051 NULL
105490 +ddebug_proc_write_18055 ddebug_proc_write 3 18055 NULL
105491 +lua_sysfs_read_18062 lua_sysfs_read 6 18062 NULL
105492 +fpregs_get_18066 fpregs_get 4 18066 NULL
105493 +kvm_read_guest_page_18074 kvm_read_guest_page 5-2 18074 NULL
105494 +SYSC_pselect6_18076 SYSC_pselect6 1 18076 NULL
105495 +SYSC_semtimedop_18091 SYSC_semtimedop 3 18091 NULL
105496 +mpi_alloc_18094 mpi_alloc 1 18094 NULL
105497 +hfs_direct_IO_18104 hfs_direct_IO 4 18104 NULL
105498 +dfs_file_read_18116 dfs_file_read 3 18116 NULL
105499 +svc_getnl_18120 svc_getnl 0 18120 NULL
105500 +paging32_gpte_to_gfn_lvl_18131 paging32_gpte_to_gfn_lvl 0-2-1 18131 NULL
105501 +vmw_surface_dma_size_18132 vmw_surface_dma_size 0 18132 NULL
105502 +selinux_inode_setsecurity_18148 selinux_inode_setsecurity 4 18148 NULL
105503 +is_idx_node_in_use_18165 is_idx_node_in_use 0 18165 NULL
105504 +pccard_store_cis_18176 pccard_store_cis 6 18176 NULL
105505 +snd_pcm_hw_refine_user_18204 snd_pcm_hw_refine_user 0 18204 NULL
105506 +orinoco_add_extscan_result_18207 orinoco_add_extscan_result 3 18207 NULL
105507 +gsm_control_message_18209 gsm_control_message 4 18209 NULL
105508 +ocfs2_divide_leaf_refcount_block_18214 ocfs2_divide_leaf_refcount_block 0 18214 NULL
105509 +do_ipv6_setsockopt_18215 do_ipv6_setsockopt 5 18215 NULL
105510 +gnttab_alloc_grant_references_18240 gnttab_alloc_grant_references 1 18240 NULL
105511 +alloc_trace_uprobe_18247 alloc_trace_uprobe 3 18247 NULL
105512 +rfcomm_sock_setsockopt_18254 rfcomm_sock_setsockopt 5 18254 NULL
105513 +__sysfs_add_one_18258 __sysfs_add_one 0 18258 NULL
105514 +qdisc_class_hash_alloc_18262 qdisc_class_hash_alloc 1 18262 NULL
105515 +gfs2_alloc_sort_buffer_18275 gfs2_alloc_sort_buffer 1 18275 NULL
105516 +alloc_ring_18278 alloc_ring 4-2-8 18278 NULL
105517 +find_dirty_idx_leb_18280 find_dirty_idx_leb 0 18280 NULL
105518 +nouveau_subdev_create__18281 nouveau_subdev_create_ 7 18281 NULL nohasharray
105519 +bio_phys_segments_18281 bio_phys_segments 0 18281 &nouveau_subdev_create__18281
105520 +ext4_readpages_18283 ext4_readpages 4 18283 NULL
105521 +mmc_send_bus_test_18285 mmc_send_bus_test 4 18285 NULL
105522 +um_idi_write_18293 um_idi_write 3 18293 NULL
105523 +nouveau_disp_create__18305 nouveau_disp_create_ 4-7 18305 NULL
105524 +vga_r_18310 vga_r 0 18310 NULL
105525 +class_add_profile_18315 class_add_profile 1-3-5 18315 NULL
105526 +csio_mem_read_18319 csio_mem_read 3 18319 NULL
105527 +alloc_and_copy_string_18321 alloc_and_copy_string 2 18321 NULL
105528 +ecryptfs_send_message_18322 ecryptfs_send_message 2 18322 NULL
105529 +bio_integrity_advance_18324 bio_integrity_advance 2 18324 NULL
105530 +__inorder_to_tree_18329 __inorder_to_tree 0-3-1 18329 NULL
105531 +lcd_proc_write_18351 lcd_proc_write 3 18351 NULL
105532 +pwr_power_save_off_read_18355 pwr_power_save_off_read 3 18355 NULL
105533 +xlbd_reserve_minors_18365 xlbd_reserve_minors 1-2 18365 NULL
105534 +SyS_process_vm_readv_18366 SyS_process_vm_readv 5-3 18366 NULL
105535 +ep_io_18367 ep_io 0 18367 NULL
105536 +qib_user_sdma_num_pages_18371 qib_user_sdma_num_pages 0 18371 NULL
105537 +ci_role_write_18388 ci_role_write 3 18388 NULL nohasharray
105538 +irq_find_mapping_18388 irq_find_mapping 0-2 18388 &ci_role_write_18388
105539 +btrfs_update_inode_18394 btrfs_update_inode 0 18394 NULL
105540 +hdlc_empty_fifo_18397 hdlc_empty_fifo 2 18397 NULL
105541 +__video_register_device_18399 __video_register_device 3 18399 NULL
105542 +hash_ip4_expire_18402 hash_ip4_expire 3 18402 NULL nohasharray
105543 +adis16136_show_serial_18402 adis16136_show_serial 3 18402 &hash_ip4_expire_18402
105544 +btrfs_rmap_block_18403 btrfs_rmap_block 0 18403 NULL
105545 +crystalhd_user_data_18407 crystalhd_user_data 3 18407 NULL
105546 +batadv_orig_node_add_if_18433 batadv_orig_node_add_if 2 18433 NULL nohasharray
105547 +iscsi_create_flashnode_sess_18433 iscsi_create_flashnode_sess 4 18433 &batadv_orig_node_add_if_18433
105548 +snd_hda_get_connections_18437 snd_hda_get_connections 0 18437 NULL
105549 +btrfs_uuid_tree_lookup_18451 btrfs_uuid_tree_lookup 0 18451 NULL
105550 +flash_dev_cache_miss_18454 flash_dev_cache_miss 4 18454 NULL
105551 +fuse_perform_write_18457 fuse_perform_write 4 18457 NULL
105552 +regset_tls_set_18459 regset_tls_set 4 18459 NULL
105553 +pcibios_window_alignment_18460 pcibios_window_alignment 0 18460 NULL
105554 +dma_alloc_from_contiguous_18466 dma_alloc_from_contiguous 3-2 18466 NULL
105555 +pci_vpd_lrdt_size_18479 pci_vpd_lrdt_size 0 18479 NULL nohasharray
105556 +mite_bytes_in_transit_18479 mite_bytes_in_transit 0 18479 &pci_vpd_lrdt_size_18479
105557 +r600_texture_size_18487 r600_texture_size 4-5-6 18487 NULL nohasharray
105558 +udpv6_setsockopt_18487 udpv6_setsockopt 5 18487 &r600_texture_size_18487
105559 +btrfs_fiemap_18501 btrfs_fiemap 3 18501 NULL nohasharray
105560 +remap_pmd_range_18501 remap_pmd_range 3-4-5 18501 &btrfs_fiemap_18501
105561 +i915_gem_object_wait_fence_18508 i915_gem_object_wait_fence 0 18508 NULL
105562 +__copy_user_zeroing_intel_18510 __copy_user_zeroing_intel 0-3 18510 NULL
105563 +snd_vx_inb_18514 snd_vx_inb 0 18514 NULL
105564 +snd_gus_dram_poke_18525 snd_gus_dram_poke 4 18525 NULL
105565 +nouveau_fifo_channel_create__18530 nouveau_fifo_channel_create_ 9 18530 NULL
105566 +seq_copy_in_user_18543 seq_copy_in_user 3 18543 NULL
105567 +acpi_register_gsi_ioapic_18550 acpi_register_gsi_ioapic 2 18550 NULL
105568 +sas_change_queue_depth_18555 sas_change_queue_depth 2 18555 NULL
105569 +vb2_streamon_18562 vb2_streamon 0 18562 NULL
105570 +smk_write_rules_list_18565 smk_write_rules_list 3 18565 NULL
105571 +debug_output_18575 debug_output 3 18575 NULL
105572 +is_extent_unchanged_18576 is_extent_unchanged 0 18576 NULL
105573 +check_lpt_type_18577 check_lpt_type 0 18577 NULL
105574 +numa_node_id_18596 numa_node_id 0 18596 NULL
105575 +filemap_fdatawait_range_18600 filemap_fdatawait_range 0 18600 NULL nohasharray
105576 +slabinfo_write_18600 slabinfo_write 3 18600 &filemap_fdatawait_range_18600
105577 +iowarrior_write_18604 iowarrior_write 3 18604 NULL
105578 +audio_get_endpoint_req_18624 audio_get_endpoint_req 0 18624 NULL
105579 +from_buffer_18625 from_buffer 3 18625 NULL
105580 +snd_pcm_oss_write3_18657 snd_pcm_oss_write3 0-3 18657 NULL
105581 +ieee80211_if_fmt_rssi_threshold_18664 ieee80211_if_fmt_rssi_threshold 3 18664 NULL
105582 +unmap_page_18665 unmap_page 2-3 18665 NULL
105583 +xfs_iext_insert_18667 xfs_iext_insert 3 18667 NULL
105584 +__alloc_skb_head_18683 __alloc_skb_head 2 18683 NULL
105585 +echo_client_prep_commit_18693 echo_client_prep_commit 8 18693 NULL
105586 +replay_log_leb_18704 replay_log_leb 3 18704 NULL
105587 +iwl_dbgfs_rx_handlers_read_18708 iwl_dbgfs_rx_handlers_read 3 18708 NULL
105588 +ceph_alloc_page_vector_18710 ceph_alloc_page_vector 1 18710 NULL
105589 +ocfs2_trim_extent_18711 ocfs2_trim_extent 3-4 18711 NULL
105590 +blk_rq_bytes_18715 blk_rq_bytes 0 18715 NULL
105591 +byt_gpio_to_irq_18721 byt_gpio_to_irq 2 18721 NULL
105592 +ext4_es_insert_extent_18729 ext4_es_insert_extent 0 18729 NULL
105593 +snd_als4k_gcr_read_addr_18741 snd_als4k_gcr_read_addr 0 18741 NULL
105594 +o2hb_debug_create_18744 o2hb_debug_create 4 18744 NULL
105595 +__erst_read_to_erange_from_nvram_18748 __erst_read_to_erange_from_nvram 0 18748 NULL
105596 +wep_packets_read_18751 wep_packets_read 3 18751 NULL
105597 +read_file_dump_nfcal_18766 read_file_dump_nfcal 3 18766 NULL
105598 +ffs_epfile_read_18775 ffs_epfile_read 3 18775 NULL
105599 +SyS_lsetxattr_18776 SyS_lsetxattr 4 18776 NULL
105600 +alloc_fcdev_18780 alloc_fcdev 1 18780 NULL
105601 +prealloc_18800 prealloc 0 18800 NULL
105602 +madvise_hwpoison_18812 madvise_hwpoison 2 18812 NULL
105603 +setup_ioapic_irq_18813 setup_ioapic_irq 1 18813 NULL
105604 +dm_stats_print_18815 dm_stats_print 7 18815 NULL
105605 +sys_modify_ldt_18824 sys_modify_ldt 3 18824 NULL
105606 +mtf_test_write_18844 mtf_test_write 3 18844 NULL
105607 +iterate_inode_refs_18846 iterate_inode_refs 0 18846 NULL
105608 +drm_ht_create_18853 drm_ht_create 2 18853 NULL
105609 +sctp_setsockopt_events_18862 sctp_setsockopt_events 3 18862 NULL
105610 +ieee80211_if_read_element_ttl_18869 ieee80211_if_read_element_ttl 3 18869 NULL nohasharray
105611 +heads_to_leaves_18869 heads_to_leaves 2-0 18869 &ieee80211_if_read_element_ttl_18869
105612 +xlog_find_verify_log_record_18870 xlog_find_verify_log_record 2 18870 NULL
105613 +width_to_agaw_18883 width_to_agaw 0-1 18883 NULL
105614 +overwrite_item_18896 overwrite_item 0 18896 NULL
105615 +kmem_cache_alloc_node_18899 kmem_cache_alloc_node 3 18899 NULL
105616 +ceph_setxattr_18913 ceph_setxattr 4 18913 NULL
105617 +ext4_block_in_group_18922 ext4_block_in_group 2 18922 NULL
105618 +ieee80211_rx_mgmt_disassoc_18927 ieee80211_rx_mgmt_disassoc 3 18927 NULL
105619 +create_pending_snapshot_18936 create_pending_snapshot 0 18936 NULL
105620 +snapshot_write_next_18937 snapshot_write_next 0 18937 NULL
105621 +regcache_sync_block_18963 regcache_sync_block 4-3 18963 NULL
105622 +__nla_reserve_18974 __nla_reserve 3 18974 NULL
105623 +__blockdev_direct_IO_18977 __blockdev_direct_IO 0-6 18977 NULL
105624 +gfn_to_pfn_atomic_18981 gfn_to_pfn_atomic 2 18981 NULL
105625 +get_inode_path_18988 get_inode_path 0 18988 NULL
105626 +find_dirtiest_idx_leb_19001 find_dirtiest_idx_leb 0 19001 NULL nohasharray
105627 +test_check_exists_19001 test_check_exists 2 19001 &find_dirtiest_idx_leb_19001
105628 +layout_in_gaps_19006 layout_in_gaps 2 19006 NULL
105629 +huge_page_size_19008 huge_page_size 0 19008 NULL
105630 +push_leaf_right_19017 push_leaf_right 0 19017 NULL
105631 +prepare_highmem_image_19028 prepare_highmem_image 0 19028 NULL
105632 +ocfs2_steal_resource_19036 ocfs2_steal_resource 0 19036 NULL
105633 +revalidate_19043 revalidate 2 19043 NULL
105634 +afs_vnode_store_data_19048 afs_vnode_store_data 2-3-4-5 19048 NULL
105635 +osc_pinger_recov_seq_write_19056 osc_pinger_recov_seq_write 3 19056 NULL
105636 +create_gpadl_header_19064 create_gpadl_header 2 19064 NULL
105637 +ieee80211_key_alloc_19065 ieee80211_key_alloc 3 19065 NULL
105638 +ceph_create_snap_context_19082 ceph_create_snap_context 1 19082 NULL
105639 +kvm_lapic_set_vapic_addr_19083 kvm_lapic_set_vapic_addr 2 19083 NULL
105640 +sta_last_seq_ctrl_read_19106 sta_last_seq_ctrl_read 3 19106 NULL
105641 +cifs_readv_from_socket_19109 cifs_readv_from_socket 3 19109 NULL
105642 +ATOMIC_SUB_RETURN_19115 ATOMIC_SUB_RETURN 2 19115 NULL
105643 +ext4_inode_table_19125 ext4_inode_table 0 19125 NULL
105644 +snd_als4k_iobase_readl_19136 snd_als4k_iobase_readl 0 19136 NULL
105645 +btrfs_run_delayed_refs_19137 btrfs_run_delayed_refs 0 19137 NULL
105646 +alloc_irdadev_19140 alloc_irdadev 1 19140 NULL
105647 +sleep_auth_read_19159 sleep_auth_read 3 19159 NULL
105648 +ext3_reserve_inode_write_19163 ext3_reserve_inode_write 0 19163 NULL
105649 +smk_write_access2_19170 smk_write_access2 3 19170 NULL
105650 +iwl_dbgfs_reply_tx_error_read_19205 iwl_dbgfs_reply_tx_error_read 3 19205 NULL
105651 +vmw_unlocked_ioctl_19212 vmw_unlocked_ioctl 2 19212 NULL
105652 +__copy_to_user_inatomic_19214 __copy_to_user_inatomic 3-0 19214 NULL
105653 +dev_counters_read_19216 dev_counters_read 3 19216 NULL
105654 +wbcir_tx_19219 wbcir_tx 3 19219 NULL
105655 +gsi_to_irq_19220 gsi_to_irq 0-1 19220 NULL
105656 +snd_mask_max_19224 snd_mask_max 0 19224 NULL
105657 +snd_pcm_capture_rewind_19229 snd_pcm_capture_rewind 0-2 19229 NULL
105658 +bio_alloc_mddev_19238 bio_alloc_mddev 2 19238 NULL
105659 +ucma_query_19260 ucma_query 4 19260 NULL
105660 +write_one_cache_group_19261 write_one_cache_group 0 19261 NULL
105661 +il_dbgfs_rxon_filter_flags_read_19281 il_dbgfs_rxon_filter_flags_read 3 19281 NULL
105662 +cfg80211_rx_unprot_mlme_mgmt_19288 cfg80211_rx_unprot_mlme_mgmt 3 19288 NULL
105663 +____cache_alloc_node_19297 ____cache_alloc_node 3 19297 NULL
105664 +qc_capture_19298 qc_capture 3 19298 NULL
105665 +ocfs2_prepare_inode_for_refcount_19303 ocfs2_prepare_inode_for_refcount 4-3 19303 NULL
105666 +event_tx_stuck_read_19305 event_tx_stuck_read 3 19305 NULL
105667 +gfn_to_gpa_19320 gfn_to_gpa 0-1 19320 NULL
105668 +debug_read_19322 debug_read 3 19322 NULL
105669 +SYSC_sendfile64_19327 SYSC_sendfile64 4 19327 NULL
105670 +cfg80211_inform_bss_19332 cfg80211_inform_bss 8 19332 NULL nohasharray
105671 +lbs_host_sleep_write_19332 lbs_host_sleep_write 3 19332 &cfg80211_inform_bss_19332
105672 +closure_sub_19359 closure_sub 2 19359 NULL
105673 +firmware_data_write_19360 firmware_data_write 6-5 19360 NULL
105674 +read_zero_19366 read_zero 3 19366 NULL
105675 +interpret_user_input_19393 interpret_user_input 2 19393 NULL
105676 +sync_fill_pt_info_19397 sync_fill_pt_info 0 19397 NULL
105677 +get_unaligned_be16_19400 get_unaligned_be16 0 19400 NULL
105678 +get_n_events_by_type_19401 get_n_events_by_type 0 19401 NULL
105679 +pep_recvmsg_19402 pep_recvmsg 4 19402 NULL
105680 +dvbdmx_write_19423 dvbdmx_write 3 19423 NULL
105681 +__phys_addr_19434 __phys_addr 0 19434 NULL
105682 +SyS_sched_getaffinity_19444 SyS_sched_getaffinity 2 19444 NULL
105683 +xfrm_alg_auth_len_19454 xfrm_alg_auth_len 0 19454 NULL
105684 +gnet_stats_copy_19458 gnet_stats_copy 4 19458 NULL
105685 +sky2_read16_19475 sky2_read16 0 19475 NULL
105686 +__read_status_pciv2_19492 __read_status_pciv2 0 19492 NULL
105687 +kstrtoll_from_user_19500 kstrtoll_from_user 2 19500 NULL
105688 +ext4_add_new_descs_19509 ext4_add_new_descs 3 19509 NULL
105689 +cfc_write_array_to_buffer_19529 cfc_write_array_to_buffer 3 19529 NULL nohasharray
105690 +apei_exec_pre_map_gars_19529 apei_exec_pre_map_gars 0 19529 &cfc_write_array_to_buffer_19529
105691 +nfc_llcp_build_tlv_19536 nfc_llcp_build_tlv 3 19536 NULL
105692 +howmany_64_19548 howmany_64 2 19548 NULL
105693 +btrfs_xattr_security_init_19553 btrfs_xattr_security_init 0 19553 NULL
105694 +gfn_to_index_19558 gfn_to_index 0-1-3-2 19558 NULL
105695 +kernel_read_19559 kernel_read 4-0 19559 NULL
105696 +ocfs2_control_message_19564 ocfs2_control_message 3 19564 NULL
105697 +ieee80211_if_read_tkip_mic_test_19565 ieee80211_if_read_tkip_mic_test 3 19565 NULL
105698 +nfsd_read_19568 nfsd_read 5 19568 NULL
105699 +cgroup_read_s64_19570 cgroup_read_s64 5 19570 NULL
105700 +bm_status_read_19583 bm_status_read 3 19583 NULL
105701 +batadv_tt_update_orig_19586 batadv_tt_update_orig 4 19586 NULL
105702 +load_xattr_datum_19594 load_xattr_datum 0 19594 NULL
105703 +__mei_cl_recv_19636 __mei_cl_recv 3 19636 NULL
105704 +usbvision_rvmalloc_19655 usbvision_rvmalloc 1 19655 NULL
105705 +LoadBitmap_19658 LoadBitmap 2 19658 NULL
105706 +i915_gem_object_bind_to_gtt_19682 i915_gem_object_bind_to_gtt 0 19682 NULL
105707 +bio_detain_19690 bio_detain 2 19690 NULL
105708 +btrfs_del_inode_extref_19692 btrfs_del_inode_extref 0 19692 NULL
105709 +mem_cgroup_swappiness_19718 mem_cgroup_swappiness 0 19718 NULL
105710 +btrfs_write_marked_extents_19720 btrfs_write_marked_extents 0 19720 NULL
105711 +read_reg_19723 read_reg 0 19723 NULL
105712 +wm8350_block_write_19727 wm8350_block_write 2-3 19727 NULL
105713 +memcpy_toiovecend_19736 memcpy_toiovecend 3-4-0 19736 NULL
105714 +snd_es1968_get_dma_ptr_19747 snd_es1968_get_dma_ptr 0 19747 NULL
105715 +p9_client_read_19750 p9_client_read 0-5 19750 NULL
105716 +pnpbios_proc_write_19758 pnpbios_proc_write 3 19758 NULL
105717 +ocfs2_readpages_19759 ocfs2_readpages 4 19759 NULL
105718 +jffs2_acl_from_medium_19762 jffs2_acl_from_medium 2 19762 NULL
105719 +readhscx_19769 readhscx 0 19769 NULL
105720 +ocfs2_read_group_descriptor_19771 ocfs2_read_group_descriptor 0 19771 NULL
105721 +__set_print_fmt_19776 __set_print_fmt 0 19776 NULL
105722 +saa7146_vmalloc_build_pgtable_19780 saa7146_vmalloc_build_pgtable 2 19780 NULL
105723 +irda_setsockopt_19824 irda_setsockopt 5 19824 NULL
105724 +pcpu_next_unpop_19831 pcpu_next_unpop 4 19831 NULL
105725 +vfs_getxattr_19832 vfs_getxattr 0 19832 NULL
105726 +security_context_to_sid_19839 security_context_to_sid 2 19839 NULL
105727 +crypt_alloc_buffer_19846 crypt_alloc_buffer 2 19846 NULL
105728 +cfg80211_mlme_register_mgmt_19852 cfg80211_mlme_register_mgmt 5 19852 NULL
105729 +__nla_put_19857 __nla_put 3 19857 NULL
105730 +mrp_request_join_19882 mrp_request_join 4 19882 NULL
105731 +blk_alloc_queue_node_19887 blk_alloc_queue_node 2 19887 NULL
105732 +aes_decrypt_interrupt_read_19910 aes_decrypt_interrupt_read 3 19910 NULL
105733 +ps_upsd_max_apturn_read_19918 ps_upsd_max_apturn_read 3 19918 NULL
105734 +mangle_name_19923 mangle_name 0 19923 NULL
105735 +cgroup_task_count_19930 cgroup_task_count 0 19930 NULL
105736 +guest_read_tsc_19931 guest_read_tsc 0 19931 NULL
105737 +iwl_dbgfs_rx_queue_read_19943 iwl_dbgfs_rx_queue_read 3 19943 NULL
105738 +cfg80211_rx_assoc_resp_19944 cfg80211_rx_assoc_resp 4 19944 NULL
105739 +alloc_elfnotes_buf_19974 alloc_elfnotes_buf 1 19974 NULL
105740 +get_jack_mode_name_19976 get_jack_mode_name 4 19976 NULL
105741 +attach_hdlc_protocol_19986 attach_hdlc_protocol 3 19986 NULL
105742 +rtw_set_wps_probe_resp_19989 rtw_set_wps_probe_resp 3 19989 NULL
105743 +diva_um_idi_read_20003 diva_um_idi_read 0 20003 NULL
105744 +lov_stripe_md_size_20009 lov_stripe_md_size 0-1 20009 NULL
105745 +SYSC_fgetxattr_20027 SYSC_fgetxattr 4 20027 NULL
105746 +split_scan_timeout_read_20029 split_scan_timeout_read 3 20029 NULL
105747 +mlx5_ib_db_map_user_20037 mlx5_ib_db_map_user 2 20037 NULL
105748 +btrfs_block_rsv_migrate_20050 btrfs_block_rsv_migrate 0 20050 NULL
105749 +__be32_to_cpup_20056 __be32_to_cpup 0 20056 NULL
105750 +alloc_ieee80211_20063 alloc_ieee80211 1 20063 NULL
105751 +iwl_mvm_power_mac_dbgfs_read_20067 iwl_mvm_power_mac_dbgfs_read 4 20067 NULL
105752 +btrfs_pin_extent_for_log_replay_20069 btrfs_pin_extent_for_log_replay 2 20069 NULL
105753 +target_message_20072 target_message 2 20072 NULL
105754 +rawv6_sendmsg_20080 rawv6_sendmsg 4 20080 NULL
105755 +fuse_conn_limit_read_20084 fuse_conn_limit_read 3 20084 NULL
105756 +aat2870_reg_write_file_20086 aat2870_reg_write_file 3 20086 NULL
105757 +team_options_register_20091 team_options_register 3 20091 NULL
105758 +qla2x00_adjust_sdev_qdepth_up_20097 qla2x00_adjust_sdev_qdepth_up 2 20097 NULL
105759 +read_int_20098 read_int 0 20098 NULL
105760 +root_nfs_copy_20111 root_nfs_copy 3 20111 NULL
105761 +hptiop_adjust_disk_queue_depth_20122 hptiop_adjust_disk_queue_depth 2 20122 NULL
105762 +self_check_vid_hdr_20131 self_check_vid_hdr 0 20131 NULL
105763 +tomoyo_commit_ok_20167 tomoyo_commit_ok 2 20167 NULL
105764 +read_flush_pipefs_20171 read_flush_pipefs 3 20171 NULL
105765 +wep_addr_key_count_read_20174 wep_addr_key_count_read 3 20174 NULL
105766 +create_trace_probe_20175 create_trace_probe 1 20175 NULL
105767 +crystalhd_map_dio_20181 crystalhd_map_dio 3 20181 NULL
105768 +udf_bitmap_new_block_20214 udf_bitmap_new_block 4 20214 NULL
105769 +pvr2_ctrl_value_to_sym_20229 pvr2_ctrl_value_to_sym 5 20229 NULL
105770 +rose_sendmsg_20249 rose_sendmsg 4 20249 NULL
105771 +tm6000_i2c_send_regs_20250 tm6000_i2c_send_regs 5 20250 NULL
105772 +pcpu_alloc_20255 pcpu_alloc 1-2 20255 NULL
105773 +resource_size_20256 resource_size 0 20256 NULL
105774 +uv_blade_to_memory_nid_20259 uv_blade_to_memory_nid 0 20259 NULL
105775 +r10_sync_page_io_20307 r10_sync_page_io 3 20307 NULL
105776 +dm_get_reserved_bio_based_ios_20315 dm_get_reserved_bio_based_ios 0 20315 NULL
105777 +tx_tx_burst_programmed_read_20320 tx_tx_burst_programmed_read 3 20320 NULL
105778 +vx_send_msg_nolock_20322 vx_send_msg_nolock 0 20322 NULL
105779 +snd_cs4281_BA1_read_20323 snd_cs4281_BA1_read 5 20323 NULL
105780 +ocfs2_et_insert_check_20341 ocfs2_et_insert_check 0 20341 NULL
105781 +gfs2_glock_nq_m_20347 gfs2_glock_nq_m 1 20347 NULL
105782 +handle_arr_calc_size_20355 handle_arr_calc_size 0-1 20355 NULL
105783 +snd_pcm_stop_20376 snd_pcm_stop 0 20376 NULL
105784 +smk_set_cipso_20379 smk_set_cipso 3 20379 NULL
105785 +block_read_full_page_20380 block_read_full_page 0 20380 NULL
105786 +snd_nm256_readl_20394 snd_nm256_readl 0 20394 NULL nohasharray
105787 +read_7220_creg32_20394 read_7220_creg32 0 20394 &snd_nm256_readl_20394
105788 +__kfifo_from_user_20399 __kfifo_from_user 3 20399 NULL nohasharray
105789 +SyS_get_mempolicy_20399 SyS_get_mempolicy 3-4 20399 &__kfifo_from_user_20399
105790 +btrfs_set_acl_20440 btrfs_set_acl 0 20440 NULL
105791 +nfs3_setxattr_20458 nfs3_setxattr 4 20458 NULL
105792 +compat_ipv6_setsockopt_20468 compat_ipv6_setsockopt 5 20468 NULL
105793 +read_buf_20469 read_buf 2 20469 NULL
105794 +btrfs_get_32_20476 btrfs_get_32 0 20476 NULL
105795 +fast_user_write_20494 fast_user_write 5 20494 NULL
105796 +ocfs2_db_frozen_trigger_20503 ocfs2_db_frozen_trigger 4 20503 NULL
105797 +pcpu_alloc_area_20511 pcpu_alloc_area 0-3 20511 NULL
105798 +link_free_space_20512 link_free_space 0 20512 NULL
105799 +pcpu_depopulate_chunk_20517 pcpu_depopulate_chunk 3-2 20517 NULL
105800 +xfs_iext_realloc_direct_20521 xfs_iext_realloc_direct 2 20521 NULL
105801 +drbd_bm_resize_20522 drbd_bm_resize 2 20522 NULL
105802 +amd_create_gatt_pages_20537 amd_create_gatt_pages 1 20537 NULL
105803 +scsi_report_opcode_20551 scsi_report_opcode 3 20551 NULL
105804 +venus_create_20555 venus_create 4 20555 NULL
105805 +btrfs_super_log_root_20565 btrfs_super_log_root 0 20565 NULL
105806 +crypto_ahash_reqsize_20569 crypto_ahash_reqsize 0 20569 NULL
105807 +batadv_tt_append_diff_20588 batadv_tt_append_diff 4 20588 NULL nohasharray
105808 +ocfs2_cluster_lock_20588 ocfs2_cluster_lock 0 20588 &batadv_tt_append_diff_20588
105809 +kvm_test_age_hva_20593 kvm_test_age_hva 2 20593 NULL
105810 +sync_timeline_create_20601 sync_timeline_create 2 20601 NULL
105811 +lirc_write_20604 lirc_write 3 20604 NULL
105812 +qib_qsfp_write_20614 qib_qsfp_write 0-2-4 20614 NULL
105813 +snd_pcm_oss_prepare_20641 snd_pcm_oss_prepare 0 20641 NULL
105814 +get_extent_skip_holes_20642 get_extent_skip_holes 2 20642 NULL
105815 +kfifo_copy_to_user_20646 kfifo_copy_to_user 4-3 20646 NULL
105816 +cpulist_scnprintf_20648 cpulist_scnprintf 2-0 20648 NULL
105817 +oz_add_farewell_20652 oz_add_farewell 5 20652 NULL
105818 +oz_cdev_read_20659 oz_cdev_read 3 20659 NULL
105819 +snd_hdsp_playback_copy_20676 snd_hdsp_playback_copy 5 20676 NULL nohasharray
105820 +btrfs_qgroup_reserve_20676 btrfs_qgroup_reserve 0 20676 &snd_hdsp_playback_copy_20676
105821 +get_user_page_nowait_20682 get_user_page_nowait 3 20682 NULL nohasharray
105822 +dvb_dmxdev_buffer_read_20682 dvb_dmxdev_buffer_read 0-4 20682 &get_user_page_nowait_20682
105823 +cpumask_size_20683 cpumask_size 0 20683 NULL
105824 +btrfs_node_blockptr_20685 btrfs_node_blockptr 0 20685 NULL
105825 +gru_vtop_20689 gru_vtop 2 20689 NULL
105826 +read_file_tgt_int_stats_20697 read_file_tgt_int_stats 3 20697 NULL
105827 +i915_gem_obj_ggtt_pin_20698 i915_gem_obj_ggtt_pin 0 20698 NULL
105828 +__maestro_read_20700 __maestro_read 0 20700 NULL
105829 +cipso_v4_gentag_rng_20703 cipso_v4_gentag_rng 0 20703 NULL
105830 +pcpu_page_first_chunk_20712 pcpu_page_first_chunk 1 20712 NULL
105831 +ocfs2_read_xattr_bucket_20722 ocfs2_read_xattr_bucket 0 20722 NULL
105832 +security_context_to_sid_force_20724 security_context_to_sid_force 2 20724 NULL
105833 +io_apic_set_pci_routing_20740 io_apic_set_pci_routing 2 20740 NULL
105834 +fb_prepare_logo_20743 fb_prepare_logo 0 20743 NULL
105835 +vol_cdev_direct_write_20751 vol_cdev_direct_write 3 20751 NULL
105836 +ocfs2_align_bytes_to_clusters_20754 ocfs2_align_bytes_to_clusters 2 20754 NULL
105837 +brcmf_p2p_escan_20763 brcmf_p2p_escan 2 20763 NULL
105838 +ubi_io_read_20767 ubi_io_read 0 20767 NULL
105839 +ext4_r_blocks_count_20768 ext4_r_blocks_count 0 20768 NULL
105840 +fb_alloc_cmap_gfp_20792 fb_alloc_cmap_gfp 2 20792 NULL
105841 +iommu_range_alloc_20794 iommu_range_alloc 3 20794 NULL
105842 +iwl_dbgfs_rxon_flags_read_20795 iwl_dbgfs_rxon_flags_read 3 20795 NULL
105843 +ext4_convert_unwritten_extents_endio_20812 ext4_convert_unwritten_extents_endio 0 20812 NULL
105844 +strndup_user_20819 strndup_user 2 20819 NULL
105845 +dtf_read_channel_20831 dtf_read_channel 3 20831 NULL
105846 +wl1271_format_buffer_20834 wl1271_format_buffer 2 20834 NULL
105847 +uvc_alloc_entity_20836 uvc_alloc_entity 3-4 20836 NULL
105848 +btrfs_orphan_add_20840 btrfs_orphan_add 0 20840 NULL
105849 +p9_tag_alloc_20845 p9_tag_alloc 3 20845 NULL
105850 +nvme_trans_supported_vpd_pages_20847 nvme_trans_supported_vpd_pages 4 20847 NULL
105851 +get_name_20855 get_name 4 20855 NULL
105852 +iwl_dbgfs_pm_params_read_20866 iwl_dbgfs_pm_params_read 3 20866 NULL
105853 +snd_pcm_capture_avail_20867 snd_pcm_capture_avail 0 20867 NULL
105854 +srq_free_res_20868 srq_free_res 5 20868 NULL
105855 +ocfs2_bmap_20874 ocfs2_bmap 2 20874 NULL
105856 +cfs_cpt_table_create_20884 cfs_cpt_table_create 1 20884 NULL
105857 +rb_simple_write_20890 rb_simple_write 3 20890 NULL
105858 +sisusb_send_packet_20891 sisusb_send_packet 2 20891 NULL
105859 +key_icverrors_read_20895 key_icverrors_read 3 20895 NULL
105860 +vfio_msi_enable_20906 vfio_msi_enable 2 20906 NULL
105861 +lbs_rdbbp_write_20918 lbs_rdbbp_write 3 20918 NULL
105862 +htable_bits_20933 htable_bits 0 20933 NULL
105863 +check_eofblocks_fl_20942 check_eofblocks_fl 0 20942 NULL
105864 +altera_set_ir_post_20948 altera_set_ir_post 2 20948 NULL
105865 +rx_rx_phy_hdr_read_20950 rx_rx_phy_hdr_read 3 20950 NULL
105866 +rsxx_cram_read_20957 rsxx_cram_read 3 20957 NULL
105867 +nfs_map_name_to_uid_20962 nfs_map_name_to_uid 3 20962 NULL
105868 +snd_rme9652_playback_copy_20970 snd_rme9652_playback_copy 5 20970 NULL
105869 +alg_setsockopt_20985 alg_setsockopt 5 20985 NULL
105870 +qib_verbs_send_20999 qib_verbs_send 5-3 20999 NULL
105871 +ocfs2_free_clusters_21001 ocfs2_free_clusters 4-0 21001 NULL
105872 +btrfs_inode_ref_name_len_21024 btrfs_inode_ref_name_len 0 21024 NULL
105873 +rx_defrag_tkip_called_read_21031 rx_defrag_tkip_called_read 3 21031 NULL
105874 +lbs_threshold_read_21046 lbs_threshold_read 5 21046 NULL
105875 +reiserfs_direct_IO_21051 reiserfs_direct_IO 4 21051 NULL
105876 +proc_fault_inject_write_21058 proc_fault_inject_write 3 21058 NULL
105877 +btrfs_insert_root_21061 btrfs_insert_root 0 21061 NULL
105878 +qdisc_get_default_21072 qdisc_get_default 2 21072 NULL
105879 +event_calibration_read_21083 event_calibration_read 3 21083 NULL
105880 +bl_add_page_to_bio_21094 bl_add_page_to_bio 2 21094 NULL nohasharray
105881 +multipath_status_21094 multipath_status 5 21094 &bl_add_page_to_bio_21094
105882 +ext2_valid_block_bitmap_21101 ext2_valid_block_bitmap 3 21101 NULL
105883 +ath6kl_send_go_probe_resp_21113 ath6kl_send_go_probe_resp 3 21113 NULL
105884 +bitset_size_in_bytes_21124 bitset_size_in_bytes 0-1 21124 NULL
105885 +i2400m_rx_trace_21127 i2400m_rx_trace 3 21127 NULL
105886 +tps6586x_irq_init_21144 tps6586x_irq_init 3 21144 NULL
105887 +chunk_size_21146 chunk_size 0 21146 NULL
105888 +ocfs2_block_check_validate_21149 ocfs2_block_check_validate 2 21149 NULL
105889 +alloc_pg_vec_21159 alloc_pg_vec 3 21159 NULL
105890 +btrfs_add_root_ref_21186 btrfs_add_root_ref 0 21186 NULL
105891 +cx18_v4l2_read_21196 cx18_v4l2_read 3 21196 NULL
105892 +get_current_ntfs_time_21198 get_current_ntfs_time 0 21198 NULL
105893 +ipc_rcu_alloc_21208 ipc_rcu_alloc 1 21208 NULL
105894 +scsi_execute_req_flags_21215 scsi_execute_req_flags 5 21215 NULL
105895 +_ocfs2_free_clusters_21220 _ocfs2_free_clusters 4-0 21220 NULL
105896 +get_numpages_21227 get_numpages 0-1-2 21227 NULL
105897 +SyS_mlock_21238 SyS_mlock 1-2 21238 NULL
105898 +input_ff_create_21240 input_ff_create 2 21240 NULL
105899 +cfg80211_notify_new_peer_candidate_21242 cfg80211_notify_new_peer_candidate 4 21242 NULL
105900 +fru_length_21257 fru_length 0 21257 NULL
105901 +rtw_set_wps_beacon_21262 rtw_set_wps_beacon 3 21262 NULL
105902 +ocfs2_blocks_for_bytes_21268 ocfs2_blocks_for_bytes 0-2 21268 NULL
105903 +vmw_gmr2_bind_21305 vmw_gmr2_bind 3 21305 NULL
105904 +do_msg_fill_21307 do_msg_fill 3 21307 NULL
105905 +add_res_range_21310 add_res_range 4 21310 NULL
105906 +get_zeroed_page_21322 get_zeroed_page 0 21322 NULL
105907 +ftrace_profile_read_21327 ftrace_profile_read 3 21327 NULL
105908 +gfs2_ea_get_copy_21353 gfs2_ea_get_copy 0 21353 NULL
105909 +max77693_irq_domain_map_21357 max77693_irq_domain_map 2 21357 NULL
105910 +alloc_orinocodev_21371 alloc_orinocodev 1 21371 NULL
105911 +split_leaf_21378 split_leaf 0 21378 NULL
105912 +SYSC_rt_sigpending_21379 SYSC_rt_sigpending 2 21379 NULL
105913 +video_ioctl2_21380 video_ioctl2 2 21380 NULL
105914 +diva_get_driver_dbg_mask_21399 diva_get_driver_dbg_mask 0 21399 NULL
105915 +sle64_to_cpu_21400 sle64_to_cpu 0-1 21400 NULL
105916 +snd_m3_inw_21406 snd_m3_inw 0 21406 NULL
105917 +snapshot_read_next_21426 snapshot_read_next 0 21426 NULL
105918 +tcp_bound_to_half_wnd_21429 tcp_bound_to_half_wnd 0-2 21429 NULL
105919 +tracing_saved_cmdlines_read_21434 tracing_saved_cmdlines_read 3 21434 NULL
105920 +aggr_size_tx_agg_vs_rate_read_21438 aggr_size_tx_agg_vs_rate_read 3 21438 NULL
105921 +__ertm_hdr_size_21450 __ertm_hdr_size 0 21450 NULL
105922 +ReadISAR_21453 ReadISAR 0 21453 NULL
105923 +mei_nfc_send_21477 mei_nfc_send 3 21477 NULL
105924 +read_file_xmit_21487 read_file_xmit 3 21487 NULL
105925 +mmc_alloc_sg_21504 mmc_alloc_sg 1 21504 NULL
105926 +dma_skb_copy_datagram_iovec_21516 dma_skb_copy_datagram_iovec 3-5 21516 NULL
105927 +btrfs_file_aio_write_21520 btrfs_file_aio_write 4 21520 NULL
105928 +il_dbgfs_stations_read_21532 il_dbgfs_stations_read 3 21532 NULL
105929 +cipso_v4_map_cat_enum_hton_21540 cipso_v4_map_cat_enum_hton 0 21540 NULL
105930 +rxrpc_send_data_21553 rxrpc_send_data 5 21553 NULL
105931 +rx_rx_beacon_early_term_read_21559 rx_rx_beacon_early_term_read 3 21559 NULL
105932 +xfs_buf_read_uncached_21585 xfs_buf_read_uncached 3 21585 NULL
105933 +snd_es18xx_mixer_read_21586 snd_es18xx_mixer_read 0 21586 NULL
105934 +ocfs2_acl_from_xattr_21604 ocfs2_acl_from_xattr 2 21604 NULL
105935 +filemap_get_page_21606 filemap_get_page 2 21606 NULL
105936 +xlog_do_recovery_pass_21618 xlog_do_recovery_pass 3 21618 NULL
105937 +pci_cardbus_resource_alignment_21625 pci_cardbus_resource_alignment 0 21625 NULL
105938 +add_pin_to_irq_node_21628 add_pin_to_irq_node 2 21628 NULL
105939 +ocfs2_refcount_cow_hunk_21630 ocfs2_refcount_cow_hunk 3-4 21630 NULL
105940 +__jfs_getxattr_21631 __jfs_getxattr 0 21631 NULL
105941 +validate_nnode_21638 validate_nnode 0 21638 NULL
105942 +__irq_alloc_descs_21639 __irq_alloc_descs 2-1-0-3-4 21639 NULL
105943 +ocfs2_lock_refcount_allocators_21646 ocfs2_lock_refcount_allocators 0 21646 NULL
105944 +atalk_sendmsg_21677 atalk_sendmsg 4 21677 NULL
105945 +ocfs2_xattr_get_nolock_21678 ocfs2_xattr_get_nolock 0 21678 NULL
105946 +rtllib_alloc_txb_21687 rtllib_alloc_txb 1 21687 NULL
105947 +evdev_ioctl_handler_21705 evdev_ioctl_handler 2 21705 NULL
105948 +btrfs_find_all_leafs_21712 btrfs_find_all_leafs 0 21712 NULL
105949 +unix_skb_len_21722 unix_skb_len 0 21722 NULL
105950 +lprocfs_wr_import_21728 lprocfs_wr_import 3 21728 NULL
105951 +ocfs2_remove_rightmost_path_21729 ocfs2_remove_rightmost_path 0 21729 NULL
105952 +reiserfs_allocate_list_bitmaps_21732 reiserfs_allocate_list_bitmaps 3 21732 NULL nohasharray
105953 +ext4_split_extent_at_21732 ext4_split_extent_at 0 21732 &reiserfs_allocate_list_bitmaps_21732
105954 +vm_brk_21739 vm_brk 1-2 21739 NULL
105955 +mthca_alloc_init_21754 mthca_alloc_init 2 21754 NULL
105956 +usbat_flash_read_data_21762 usbat_flash_read_data 4 21762 NULL
105957 +gen_pool_add_21776 gen_pool_add 3-4 21776 NULL
105958 +SyS_sendfile_21777 SyS_sendfile 4 21777 NULL
105959 +atomic64_cmpxchg_21782 atomic64_cmpxchg 0 21782 NULL
105960 +xfs_da_grow_inode_int_21785 xfs_da_grow_inode_int 3 21785 NULL
105961 +dvb_generic_ioctl_21810 dvb_generic_ioctl 2 21810 NULL
105962 +__ocfs2_cluster_lock_21812 __ocfs2_cluster_lock 0 21812 NULL
105963 +wm8994_request_irq_21822 wm8994_request_irq 2 21822 NULL
105964 +oom_adj_read_21847 oom_adj_read 3 21847 NULL
105965 +gen_unique_name_21852 gen_unique_name 0 21852 NULL
105966 +lpfc_idiag_extacc_avail_get_21865 lpfc_idiag_extacc_avail_get 0-3 21865 NULL
105967 +brcms_debugfs_hardware_read_21867 brcms_debugfs_hardware_read 3 21867 NULL
105968 +sisusbcon_bmove_21873 sisusbcon_bmove 6-5-7 21873 NULL
105969 +ldlm_lock_create_21888 ldlm_lock_create 7 21888 NULL
105970 +__alloc_reserved_percpu_21895 __alloc_reserved_percpu 2-1 21895 NULL
105971 +rio_destid_first_21900 rio_destid_first 0 21900 NULL
105972 +dbAllocCtl_21911 dbAllocCtl 0 21911 NULL
105973 +qsfp_1_read_21915 qsfp_1_read 3 21915 NULL
105974 +ast_ttm_tt_create_21917 ast_ttm_tt_create 2 21917 NULL
105975 +__ocfs2_claim_clusters_21936 __ocfs2_claim_clusters 0 21936 NULL
105976 +alloc_ldt_21972 alloc_ldt 2 21972 NULL
105977 +SYSC_prctl_21980 SYSC_prctl 4 21980 NULL
105978 +rxpipe_descr_host_int_trig_rx_data_read_22001 rxpipe_descr_host_int_trig_rx_data_read 3 22001 NULL nohasharray
105979 +compat_rw_copy_check_uvector_22001 compat_rw_copy_check_uvector 3-0 22001 &rxpipe_descr_host_int_trig_rx_data_read_22001
105980 +ocfs2_reserve_cluster_bitmap_bits_22016 ocfs2_reserve_cluster_bitmap_bits 0 22016 NULL
105981 +regcache_sync_block_raw_flush_22021 regcache_sync_block_raw_flush 3-4 22021 NULL
105982 +btrfs_get_16_22023 btrfs_get_16 0 22023 NULL
105983 +i915_gem_evict_something_22028 i915_gem_evict_something 0 22028 NULL
105984 +_sp2d_min_pg_22032 _sp2d_min_pg 0 22032 NULL
105985 +zd_usb_read_fw_22049 zd_usb_read_fw 4 22049 NULL
105986 +atalk_recvmsg_22053 atalk_recvmsg 4 22053 NULL
105987 +ieee80211_if_fmt_dropped_frames_ttl_22054 ieee80211_if_fmt_dropped_frames_ttl 3 22054 NULL
105988 +btrfs_reloc_clone_csums_22077 btrfs_reloc_clone_csums 2-3 22077 NULL
105989 +write_opcode_22082 write_opcode 2 22082 NULL
105990 +mem_rw_22085 mem_rw 3 22085 NULL
105991 +snd_pcm_xrun_22088 snd_pcm_xrun 0 22088 NULL
105992 +sched_clock_cpu_22098 sched_clock_cpu 0 22098 NULL
105993 +rt2x00debug_read_crypto_stats_22109 rt2x00debug_read_crypto_stats 3 22109 NULL
105994 +shmem_add_to_page_cache_22121 shmem_add_to_page_cache 0 22121 NULL
105995 +snd_hda_codec_read_22130 snd_hda_codec_read 0 22130 NULL
105996 +SyS_sched_setaffinity_22148 SyS_sched_setaffinity 2 22148 NULL
105997 +do_tcp_sendpages_22155 do_tcp_sendpages 4 22155 NULL
105998 +remap_pud_range_22164 remap_pud_range 3-4-5 22164 NULL
105999 +__kfifo_alloc_22173 __kfifo_alloc 3 22173 NULL nohasharray
106000 +vmci_qp_broker_map_22173 vmci_qp_broker_map 3 22173 &__kfifo_alloc_22173
106001 +fls_22210 fls 0 22210 NULL
106002 +rfcomm_sock_recvmsg_22227 rfcomm_sock_recvmsg 4 22227 NULL nohasharray
106003 +bitmap_clear_bits_22227 bitmap_clear_bits 3 22227 &rfcomm_sock_recvmsg_22227
106004 +mem_write_22232 mem_write 3 22232 NULL
106005 +p9_virtio_zc_request_22240 p9_virtio_zc_request 6-5 22240 NULL
106006 +fsnotify_parent_22243 fsnotify_parent 0 22243 NULL
106007 +compat_process_vm_rw_22254 compat_process_vm_rw 3-5 22254 NULL
106008 +ping_common_sendmsg_22261 ping_common_sendmsg 5 22261 NULL
106009 +add_res_tree_22263 add_res_tree 7 22263 NULL
106010 +__btrfs_direct_write_22273 __btrfs_direct_write 4 22273 NULL
106011 +queue_max_sectors_22280 queue_max_sectors 0 22280 NULL
106012 +i915_gem_execbuffer_relocate_22294 i915_gem_execbuffer_relocate 0 22294 NULL
106013 +pci_vpd_srdt_size_22300 pci_vpd_srdt_size 0 22300 NULL nohasharray
106014 +__tun_chr_ioctl_22300 __tun_chr_ioctl 4 22300 &pci_vpd_srdt_size_22300
106015 +mesh_table_alloc_22305 mesh_table_alloc 1 22305 NULL
106016 +lov_setstripe_22307 lov_setstripe 2 22307 NULL
106017 +udpv6_sendmsg_22316 udpv6_sendmsg 4 22316 NULL
106018 +C_SYSC_msgrcv_22320 C_SYSC_msgrcv 3 22320 NULL
106019 +radix_tree_find_next_bit_22334 radix_tree_find_next_bit 3-2-0 22334 NULL
106020 +atomic_read_22342 atomic_read 0 22342 NULL
106021 +ll_lazystatfs_seq_write_22353 ll_lazystatfs_seq_write 3 22353 NULL
106022 +mlx4_db_alloc_22358 mlx4_db_alloc 3 22358 NULL
106023 +irq_reserve_irq_22360 irq_reserve_irq 1 22360 NULL nohasharray
106024 +memcg_size_22360 memcg_size 0 22360 &irq_reserve_irq_22360
106025 +snd_pcm_alsa_frames_22363 snd_pcm_alsa_frames 2 22363 NULL
106026 +tps6586x_gpio_to_irq_22365 tps6586x_gpio_to_irq 2 22365 NULL
106027 +evdev_ioctl_22371 evdev_ioctl 2 22371 NULL
106028 +alloc_large_system_hash_22391 alloc_large_system_hash 2-8-9 22391 NULL
106029 +ocfs2_assign_bh_22392 ocfs2_assign_bh 0 22392 NULL
106030 +zoran_write_22404 zoran_write 3 22404 NULL
106031 +ATOMIC_ADD_RETURN_22413 ATOMIC_ADD_RETURN 2 22413 NULL
106032 +queue_reply_22416 queue_reply 3 22416 NULL
106033 +__set_enter_print_fmt_22431 __set_enter_print_fmt 0 22431 NULL
106034 +queue_max_segments_22441 queue_max_segments 0 22441 NULL
106035 +_rtw_vmalloc_22444 _rtw_vmalloc 1 22444 NULL
106036 +handle_received_packet_22457 handle_received_packet 3 22457 NULL
106037 +mem_cgroup_read_22461 mem_cgroup_read 5 22461 NULL
106038 +btrfs_write_out_cache_22471 btrfs_write_out_cache 0 22471 NULL nohasharray
106039 +dtf_write_device_22471 dtf_write_device 3 22471 &btrfs_write_out_cache_22471
106040 +source_sink_start_ep_22472 source_sink_start_ep 0 22472 NULL
106041 +alloc_desc_22487 alloc_desc 2 22487 NULL
106042 +ecryptfs_write_22488 ecryptfs_write 4-3 22488 NULL
106043 +qib_user_sdma_alloc_header_22490 qib_user_sdma_alloc_header 2 22490 NULL
106044 +cache_write_procfs_22491 cache_write_procfs 3 22491 NULL
106045 +mp_find_ioapic_pin_22499 mp_find_ioapic_pin 0-2 22499 NULL
106046 +mutex_lock_interruptible_22505 mutex_lock_interruptible 0 22505 NULL
106047 +__btrfs_add_delayed_item_22511 __btrfs_add_delayed_item 0 22511 NULL
106048 +trim_no_bitmap_22524 trim_no_bitmap 4-3 22524 NULL
106049 +ocfs2_read_extent_block_22550 ocfs2_read_extent_block 0 22550 NULL
106050 +agp_alloc_page_array_22554 agp_alloc_page_array 1 22554 NULL
106051 +snd_pcm_hw_params_choose_22560 snd_pcm_hw_params_choose 0 22560 NULL
106052 +dbFindCtl_22587 dbFindCtl 0 22587 NULL
106053 +snapshot_read_22601 snapshot_read 3 22601 NULL
106054 +ocfs2_get_refcount_block_22610 ocfs2_get_refcount_block 0 22610 NULL
106055 +remove_breakpoint_22628 remove_breakpoint 3 22628 NULL
106056 +sctp_setsockopt_connectx_old_22631 sctp_setsockopt_connectx_old 3 22631 NULL
106057 +ide_core_cp_entry_22636 ide_core_cp_entry 3 22636 NULL
106058 +wl1271_rx_filter_get_fields_size_22638 wl1271_rx_filter_get_fields_size 0 22638 NULL
106059 +pwr_wake_on_timer_exp_read_22640 pwr_wake_on_timer_exp_read 3 22640 NULL
106060 +sysfs_attr_ns_22645 sysfs_attr_ns 0 22645 NULL
106061 +iwl_dbgfs_calib_disabled_read_22649 iwl_dbgfs_calib_disabled_read 3 22649 NULL
106062 +compat_SyS_msgrcv_22661 compat_SyS_msgrcv 3 22661 NULL
106063 +ubifs_leb_write_22679 ubifs_leb_write 4-5 22679 NULL nohasharray
106064 +ext4_ext_direct_IO_22679 ext4_ext_direct_IO 4 22679 &ubifs_leb_write_22679
106065 +fill_gap_22681 fill_gap 0 22681 NULL nohasharray
106066 +l2tp_ip_recvmsg_22681 l2tp_ip_recvmsg 4 22681 &fill_gap_22681
106067 +bch_dump_read_22685 bch_dump_read 3 22685 NULL
106068 +reg_umr_22686 reg_umr 5 22686 NULL
106069 +ocfs2_get_block_22687 ocfs2_get_block 2 22687 NULL
106070 +map_22700 map 2 22700 NULL nohasharray
106071 +btrfs_del_inode_ref_in_log_22700 btrfs_del_inode_ref_in_log 0 22700 &map_22700
106072 +alloc_libipw_22708 alloc_libipw 1 22708 NULL
106073 +ecryptfs_write_metadata_to_contents_22721 ecryptfs_write_metadata_to_contents 3 22721 NULL
106074 +cx18_copy_buf_to_user_22735 cx18_copy_buf_to_user 4-0 22735 NULL
106075 +ceph_decode_32_22738 ceph_decode_32 0 22738 NULL nohasharray
106076 +__mei_cl_send_22738 __mei_cl_send 3 22738 &ceph_decode_32_22738
106077 +iio_debugfs_write_reg_22742 iio_debugfs_write_reg 3 22742 NULL
106078 +qlcnic_sriov_init_22762 qlcnic_sriov_init 2 22762 NULL
106079 +print_frame_22769 print_frame 0 22769 NULL
106080 +ftrace_arch_read_dyn_info_22773 ftrace_arch_read_dyn_info 0 22773 NULL
106081 +ocfs2_block_group_alloc_22774 ocfs2_block_group_alloc 0 22774 NULL
106082 +pla_ocp_write_22802 pla_ocp_write 4 22802 NULL
106083 +__generic_copy_to_user_intel_22806 __generic_copy_to_user_intel 0-3 22806 NULL
106084 +clone_bio_integrity_22842 clone_bio_integrity 4 22842 NULL
106085 +read_file_rcstat_22854 read_file_rcstat 3 22854 NULL
106086 +create_attr_set_22861 create_attr_set 1 22861 NULL
106087 +vmw_execbuf_process_22885 vmw_execbuf_process 5 22885 NULL
106088 +usblp_new_writeurb_22894 usblp_new_writeurb 2 22894 NULL
106089 +mdc800_device_read_22896 mdc800_device_read 3 22896 NULL
106090 +policy_emit_config_values_22900 policy_emit_config_values 3 22900 NULL
106091 +__btrfs_add_free_space_22917 __btrfs_add_free_space 0 22917 NULL
106092 +xstateregs_set_22932 xstateregs_set 4 22932 NULL
106093 +pcpu_mem_zalloc_22948 pcpu_mem_zalloc 1 22948 NULL
106094 +alloc_sglist_22960 alloc_sglist 3-2 22960 NULL
106095 +caif_seqpkt_sendmsg_22961 caif_seqpkt_sendmsg 4 22961 NULL
106096 +vme_get_size_22964 vme_get_size 0 22964 NULL
106097 +tx_frag_key_not_found_read_22971 tx_frag_key_not_found_read 3 22971 NULL
106098 +cached_dev_cache_miss_22979 cached_dev_cache_miss 4 22979 NULL
106099 +usb_get_langid_22983 usb_get_langid 0 22983 NULL
106100 +set_msr_hyperv_22985 set_msr_hyperv 3 22985 NULL
106101 +remote_settings_file_write_22987 remote_settings_file_write 3 22987 NULL
106102 +brcmf_sdio_chip_exit_download_23001 brcmf_sdio_chip_exit_download 4 23001 NULL
106103 +viafb_dvp0_proc_write_23023 viafb_dvp0_proc_write 3 23023 NULL
106104 +cifs_local_to_utf16_bytes_23025 cifs_local_to_utf16_bytes 0 23025 NULL
106105 +ocfs2_refcount_cow_xattr_23029 ocfs2_refcount_cow_xattr 0-6-7 23029 NULL
106106 +st_status_23032 st_status 5 23032 NULL
106107 +nv50_disp_chan_create__23056 nv50_disp_chan_create_ 5 23056 NULL
106108 +comedi_buf_write_n_available_23057 comedi_buf_write_n_available 0 23057 NULL
106109 +reiserfs_add_entry_23062 reiserfs_add_entry 4 23062 NULL nohasharray
106110 +unix_seqpacket_recvmsg_23062 unix_seqpacket_recvmsg 4 23062 &reiserfs_add_entry_23062
106111 +mei_cl_send_23068 mei_cl_send 3 23068 NULL
106112 +filp_close_23071 filp_close 0 23071 NULL
106113 +kvm_mmu_gva_to_gpa_write_23075 kvm_mmu_gva_to_gpa_write 0 23075 NULL
106114 +vm_map_ram_23078 vm_map_ram 3 23078 NULL nohasharray
106115 +raw_sendmsg_23078 raw_sendmsg 4 23078 &vm_map_ram_23078
106116 +get_user_hdr_len_23079 get_user_hdr_len 0 23079 NULL
106117 +isr_tx_procs_read_23084 isr_tx_procs_read 3 23084 NULL
106118 +lnw_gpio_irq_map_23087 lnw_gpio_irq_map 2 23087 NULL
106119 +rt2x00debug_write_eeprom_23091 rt2x00debug_write_eeprom 3 23091 NULL
106120 +__add_prelim_ref_23095 __add_prelim_ref 0 23095 NULL
106121 +fls_long_23096 fls_long 0 23096 NULL
106122 +ntfs_ucstonls_23097 ntfs_ucstonls 5-3 23097 NULL
106123 +pipe_iov_copy_from_user_23102 pipe_iov_copy_from_user 3 23102 NULL
106124 +dgram_recvmsg_23104 dgram_recvmsg 4 23104 NULL
106125 +ip_recv_error_23109 ip_recv_error 3 23109 NULL
106126 +mwl8k_cmd_set_beacon_23110 mwl8k_cmd_set_beacon 4 23110 NULL
106127 +nl80211_send_rx_auth_23111 nl80211_send_rx_auth 4 23111 NULL
106128 +__clear_user_23118 __clear_user 0-2 23118 NULL
106129 +drm_mode_create_tv_properties_23122 drm_mode_create_tv_properties 2 23122 NULL
106130 +ata_scsi_change_queue_depth_23126 ata_scsi_change_queue_depth 2 23126 NULL
106131 +ext3_listxattr_23137 ext3_listxattr 3 23137 NULL
106132 +read_file_ani_23161 read_file_ani 3 23161 NULL
106133 +tg_get_cfs_quota_23176 tg_get_cfs_quota 0 23176 NULL
106134 +usblp_write_23178 usblp_write 3 23178 NULL
106135 +msnd_fifo_alloc_23179 msnd_fifo_alloc 2 23179 NULL
106136 +gss_pipe_downcall_23182 gss_pipe_downcall 3 23182 NULL
106137 +fix_unclean_leb_23188 fix_unclean_leb 3 23188 NULL
106138 +mpi_alloc_limb_space_23190 mpi_alloc_limb_space 1 23190 NULL
106139 +convert_ip_to_linear_23198 convert_ip_to_linear 0 23198 NULL
106140 +pm80x_free_irq_23210 pm80x_free_irq 2 23210 NULL
106141 +tty_buffer_request_room_23228 tty_buffer_request_room 2-0 23228 NULL
106142 +__read_status_pci_23229 __read_status_pci 0 23229 NULL nohasharray
106143 +xlog_get_bp_23229 xlog_get_bp 2 23229 &__read_status_pci_23229
106144 +ft1000_read_dpram_mag_32_23232 ft1000_read_dpram_mag_32 0 23232 NULL
106145 +rxrpc_client_sendmsg_23236 rxrpc_client_sendmsg 5 23236 NULL
106146 +__gfn_to_rmap_23240 __gfn_to_rmap 2-1 23240 NULL
106147 +sctp_recvmsg_23265 sctp_recvmsg 4 23265 NULL
106148 +uwb_dev_addr_print_23282 uwb_dev_addr_print 2 23282 NULL
106149 +diva_get_trace_filter_23286 diva_get_trace_filter 0 23286 NULL
106150 +gru_preload_tlb_23305 gru_preload_tlb 7-4 23305 NULL
106151 +i2cdev_write_23310 i2cdev_write 3 23310 NULL
106152 +__aa_kvmalloc_23320 __aa_kvmalloc 1 23320 NULL
106153 +__es_remove_extent_23323 __es_remove_extent 0 23323 NULL
106154 +page_readlink_23346 page_readlink 3 23346 NULL
106155 +kmem_zalloc_large_23351 kmem_zalloc_large 1 23351 NULL
106156 +get_dst_timing_23358 get_dst_timing 0 23358 NULL
106157 +fd_setup_write_same_buf_23369 fd_setup_write_same_buf 3 23369 NULL
106158 +iscsi_change_queue_depth_23416 iscsi_change_queue_depth 2 23416 NULL
106159 +vga_mm_r_23419 vga_mm_r 0 23419 NULL
106160 +vzalloc_node_23424 vzalloc_node 1-2 23424 NULL
106161 +__ctzsi2_23444 __ctzsi2 1 23444 NULL
106162 +ocfs2_zero_tail_23447 ocfs2_zero_tail 3 23447 NULL
106163 +hidraw_send_report_23449 hidraw_send_report 3 23449 NULL
106164 +__ata_change_queue_depth_23484 __ata_change_queue_depth 3-0 23484 NULL
106165 +linear_conf_23485 linear_conf 2 23485 NULL
106166 +copy_module_from_user_23492 copy_module_from_user 2 23492 NULL
106167 +event_filter_read_23494 event_filter_read 3 23494 NULL
106168 +ext4_remove_blocks_23497 ext4_remove_blocks 0 23497 NULL
106169 +lustre_acl_xattr_merge2ext_23502 lustre_acl_xattr_merge2ext 2 23502 NULL
106170 +__gfn_to_hva_many_23508 __gfn_to_hva_many 0-2 23508 NULL
106171 +devm_iio_device_alloc_23511 devm_iio_device_alloc 2 23511 NULL
106172 +__proc_cpt_table_23516 __proc_cpt_table 5 23516 NULL
106173 +ima_show_measurements_count_23536 ima_show_measurements_count 3 23536 NULL
106174 +__es_insert_extent_23543 __es_insert_extent 0 23543 NULL
106175 +xen_allocate_irq_gsi_23546 xen_allocate_irq_gsi 1-0 23546 NULL
106176 +tcp_current_mss_23552 tcp_current_mss 0 23552 NULL
106177 +dbg_leb_change_23555 dbg_leb_change 0-4 23555 NULL
106178 +btrfs_super_bytenr_23561 btrfs_super_bytenr 0 23561 NULL
106179 +venus_symlink_23570 venus_symlink 6-4 23570 NULL
106180 +iwl_dbgfs_interrupt_read_23574 iwl_dbgfs_interrupt_read 3 23574 NULL
106181 +xfpregs_get_23586 xfpregs_get 4 23586 NULL
106182 +snd_interval_min_23590 snd_interval_min 0 23590 NULL
106183 +do_mmap_pgoff_23600 do_mmap_pgoff 0 23600 NULL
106184 +islpci_mgt_transaction_23610 islpci_mgt_transaction 5 23610 NULL
106185 +ocfs2_journal_access_23616 ocfs2_journal_access 0 23616 NULL
106186 +alloc_pte_23642 alloc_pte 3 23642 NULL
106187 +__i2400mu_send_barker_23652 __i2400mu_send_barker 3 23652 NULL
106188 +sInW_23663 sInW 0 23663 NULL
106189 +SyS_connect_23669 SyS_connect 3 23669 NULL
106190 +cx18_read_23699 cx18_read 3 23699 NULL
106191 +btrfs_insert_delayed_item_23705 btrfs_insert_delayed_item 0 23705 NULL
106192 +at_get_23708 at_get 0 23708 NULL
106193 +snd_pcm_hw_refine_23721 snd_pcm_hw_refine 0 23721 NULL
106194 +mp_config_acpi_gsi_23728 mp_config_acpi_gsi 2 23728 NULL
106195 +rx_rx_dropped_frame_read_23748 rx_rx_dropped_frame_read 3 23748 NULL
106196 +__kfifo_max_r_23768 __kfifo_max_r 0-2-1 23768 NULL
106197 +svc_prepare_thread_23772 svc_prepare_thread 3 23772 NULL
106198 +__build_packet_message_23778 __build_packet_message 4-10 23778 NULL
106199 +security_inode_getxattr_23781 security_inode_getxattr 0 23781 NULL
106200 +cfg80211_inform_bss_width_frame_23782 cfg80211_inform_bss_width_frame 5 23782 NULL
106201 +mpt_free_res_23793 mpt_free_res 5 23793 NULL
106202 +map_write_23795 map_write 3 23795 NULL
106203 +diva_alloc_dma_map_23798 diva_alloc_dma_map 2 23798 NULL
106204 +rx_path_reset_read_23801 rx_path_reset_read 3 23801 NULL
106205 +ocfs2_replace_cow_23803 ocfs2_replace_cow 0 23803 NULL
106206 +__earlyonly_bootmem_alloc_23824 __earlyonly_bootmem_alloc 2 23824 NULL
106207 +lustre_msg_buflen_23827 lustre_msg_buflen 0 23827 NULL
106208 +ceph_copy_page_vector_to_user_23829 ceph_copy_page_vector_to_user 0-4-3 23829 NULL
106209 +tfrc_binsearch_23833 tfrc_binsearch 0 23833 NULL
106210 +pgdat_end_pfn_23842 pgdat_end_pfn 0 23842 NULL
106211 +iwl_dbgfs_nvm_read_23845 iwl_dbgfs_nvm_read 3 23845 NULL
106212 +p54_init_common_23850 p54_init_common 1 23850 NULL
106213 +gart_alloc_coherent_23852 gart_alloc_coherent 2 23852 NULL
106214 +bin_to_hex_dup_23853 bin_to_hex_dup 2 23853 NULL
106215 +ocfs2_xattr_get_clusters_23857 ocfs2_xattr_get_clusters 0 23857 NULL
106216 +ieee80211_if_read_dot11MeshMaxPeerLinks_23878 ieee80211_if_read_dot11MeshMaxPeerLinks 3 23878 NULL
106217 +nes_alloc_resource_23891 nes_alloc_resource 3 23891 NULL
106218 +_rtw_zvmalloc_23892 _rtw_zvmalloc 1 23892 NULL
106219 +tipc_snprintf_23893 tipc_snprintf 2-0 23893 NULL
106220 +usbg_prepare_w_request_23895 usbg_prepare_w_request 0 23895 NULL
106221 +add_new_gdb_meta_bg_23911 add_new_gdb_meta_bg 3 23911 NULL nohasharray
106222 +ieee80211_if_read_hw_queues_23911 ieee80211_if_read_hw_queues 3 23911 &add_new_gdb_meta_bg_23911
106223 +device_create_bin_file_23914 device_create_bin_file 0 23914 NULL
106224 +f2fs_getxattr_23917 f2fs_getxattr 0 23917 NULL
106225 +ipath_reg_phys_mr_23918 ipath_reg_phys_mr 3 23918 NULL nohasharray
106226 +mpihelp_mul_karatsuba_case_23918 mpihelp_mul_karatsuba_case 5-3 23918 &ipath_reg_phys_mr_23918
106227 +kvm_read_guest_23928 kvm_read_guest 4-2 23928 NULL nohasharray
106228 +intel_ring_alloc_seqno_23928 intel_ring_alloc_seqno 0 23928 &kvm_read_guest_23928
106229 +__alloc_skb_23940 __alloc_skb 4 23940 NULL
106230 +uvc_endpoint_max_bpi_23944 uvc_endpoint_max_bpi 0 23944 NULL
106231 +cifs_setxattr_23957 cifs_setxattr 4 23957 NULL
106232 +size_roundup_power2_23958 size_roundup_power2 0-1 23958 NULL
106233 +vfs_write_23971 vfs_write 0-3 23971 NULL
106234 +sddr55_write_data_23983 sddr55_write_data 4 23983 NULL
106235 +zd_usb_iowrite16v_async_23984 zd_usb_iowrite16v_async 3 23984 NULL
106236 +cxgb_alloc_mem_24007 cxgb_alloc_mem 1 24007 NULL
106237 +intel_ring_idle_24014 intel_ring_idle 0 24014 NULL
106238 +give_pages_24021 give_pages 3 24021 NULL
106239 +ocfs2_mark_extent_refcounted_24035 ocfs2_mark_extent_refcounted 6 24035 NULL
106240 +adis16400_show_serial_number_24037 adis16400_show_serial_number 3 24037 NULL
106241 +hmac_setkey_24043 hmac_setkey 3 24043 NULL
106242 +afs_cell_alloc_24052 afs_cell_alloc 2 24052 NULL
106243 +blkcipher_copy_iv_24075 blkcipher_copy_iv 3 24075 NULL
106244 +vb2_fop_read_24080 vb2_fop_read 3 24080 NULL
106245 +ocfs2_cannibalize_resv_24090 ocfs2_cannibalize_resv 3 24090 NULL
106246 +pipeline_post_proc_swi_read_24108 pipeline_post_proc_swi_read 3 24108 NULL
106247 +request_key_auth_read_24109 request_key_auth_read 3 24109 NULL
106248 +lov_brw_24122 lov_brw 4 24122 NULL
106249 +mpu401_read_24126 mpu401_read 3-0 24126 NULL
106250 +_picolcd_flash_write_24134 _picolcd_flash_write 4 24134 NULL
106251 +irnet_ctrl_write_24139 irnet_ctrl_write 3 24139 NULL
106252 +SyS_sethostname_24150 SyS_sethostname 2 24150 NULL
106253 +trim_bitmaps_24158 trim_bitmaps 3 24158 NULL
106254 +set_discard_24162 set_discard 2 24162 NULL
106255 +__copy_user_zeroing_intel_nocache_24163 __copy_user_zeroing_intel_nocache 0-3 24163 NULL
106256 +adu_read_24177 adu_read 3 24177 NULL
106257 +safe_prepare_write_buffer_24187 safe_prepare_write_buffer 3 24187 NULL
106258 +shrink_tnc_24190 shrink_tnc 0 24190 NULL
106259 +irq_remapping_setup_msi_irqs_24194 irq_remapping_setup_msi_irqs 2 24194 NULL
106260 +ieee80211_if_read_dot11MeshHWMPpreqMinInterval_24208 ieee80211_if_read_dot11MeshHWMPpreqMinInterval 3 24208 NULL
106261 +efx_vf_size_24213 efx_vf_size 0 24213 NULL
106262 +SyS_sendfile64_24220 SyS_sendfile64 4 24220 NULL
106263 +tcpprobe_sprint_24222 tcpprobe_sprint 0-2 24222 NULL
106264 +pcpu_embed_first_chunk_24224 pcpu_embed_first_chunk 3-2-1 24224 NULL nohasharray
106265 +mei_amthif_read_24224 mei_amthif_read 4 24224 &pcpu_embed_first_chunk_24224
106266 +pci_num_vf_24235 pci_num_vf 0 24235 NULL
106267 +sel_read_bool_24236 sel_read_bool 3 24236 NULL
106268 +dm_cache_save_hint_24257 dm_cache_save_hint 2 24257 NULL
106269 +em28xx_alloc_urbs_24260 em28xx_alloc_urbs 4-6 24260 NULL
106270 +calculate_sizes_24273 calculate_sizes 2 24273 NULL
106271 +thin_status_24278 thin_status 5 24278 NULL
106272 +msg_size_24288 msg_size 0 24288 NULL
106273 +ext2_free_blocks_24292 ext2_free_blocks 3-2 24292 NULL
106274 +i2c_smbus_check_pec_24297 i2c_smbus_check_pec 0 24297 NULL
106275 +map_page_24298 map_page 3-4 24298 NULL
106276 +gserial_connect_24302 gserial_connect 0 24302 NULL
106277 +btmrvl_pscmd_read_24308 btmrvl_pscmd_read 3 24308 NULL
106278 +reserve_metadata_bytes_24313 reserve_metadata_bytes 3-0 24313 NULL
106279 +ath6kl_add_bss_if_needed_24317 ath6kl_add_bss_if_needed 6 24317 NULL
106280 +ocfs2_direct_IO_get_blocks_24333 ocfs2_direct_IO_get_blocks 2 24333 NULL
106281 +si476x_radio_read_acf_blob_24336 si476x_radio_read_acf_blob 3 24336 NULL
106282 +kzalloc_node_24352 kzalloc_node 1-3 24352 NULL
106283 +qla2x00_handle_queue_full_24365 qla2x00_handle_queue_full 2 24365 NULL
106284 +cfi_read_pri_24366 cfi_read_pri 3 24366 NULL
106285 +btrfs_item_size_nr_24367 btrfs_item_size_nr 0 24367 NULL
106286 +igetword_24373 igetword 0 24373 NULL
106287 +max_io_len_24384 max_io_len 0-1 24384 NULL
106288 +mpt_alloc_res_24387 mpt_alloc_res 5 24387 NULL
106289 +osc_cur_grant_bytes_seq_write_24396 osc_cur_grant_bytes_seq_write 3 24396 NULL
106290 +pvr2_v4l2_ioctl_24398 pvr2_v4l2_ioctl 2 24398 NULL nohasharray
106291 +getxattr_24398 getxattr 4 24398 &pvr2_v4l2_ioctl_24398 nohasharray
106292 +__btrfs_write_out_cache_24398 __btrfs_write_out_cache 0 24398 &getxattr_24398
106293 +blk_update_bidi_request_24415 blk_update_bidi_request 3-4 24415 NULL
106294 +nvme_trans_log_supp_pages_24418 nvme_trans_log_supp_pages 3 24418 NULL
106295 +b43_debugfs_read_24425 b43_debugfs_read 3 24425 NULL
106296 +xenbus_file_read_24427 xenbus_file_read 3 24427 NULL
106297 +ieee80211_rx_mgmt_beacon_24430 ieee80211_rx_mgmt_beacon 3 24430 NULL
106298 +copy_and_ioctl_24434 copy_and_ioctl 4 24434 NULL
106299 +ixgbe_alloc_q_vector_24439 ixgbe_alloc_q_vector 6-4 24439 NULL
106300 +smk_user_access_24440 smk_user_access 3 24440 NULL nohasharray
106301 +rtw_set_wps_assoc_resp_24440 rtw_set_wps_assoc_resp 3 24440 &smk_user_access_24440
106302 +__push_leaf_left_24456 __push_leaf_left 0 24456 NULL
106303 +evdev_do_ioctl_24459 evdev_do_ioctl 2 24459 NULL
106304 +lbs_highsnr_write_24460 lbs_highsnr_write 3 24460 NULL
106305 +skb_copy_and_csum_datagram_iovec_24466 skb_copy_and_csum_datagram_iovec 2 24466 NULL nohasharray
106306 +ocfs2_write_cluster_by_desc_24466 ocfs2_write_cluster_by_desc 6-5 24466 &skb_copy_and_csum_datagram_iovec_24466
106307 +snd_pcm_hw_param_first_24487 snd_pcm_hw_param_first 0 24487 NULL
106308 +read_file_spec_scan_ctl_24491 read_file_spec_scan_ctl 3 24491 NULL
106309 +i915_gem_obj_offset_24494 i915_gem_obj_offset 0 24494 NULL
106310 +push_nodes_for_insert_24496 push_nodes_for_insert 0 24496 NULL
106311 +pd_video_read_24510 pd_video_read 3 24510 NULL
106312 +request_key_with_auxdata_24515 request_key_with_auxdata 4 24515 NULL
106313 +xfs_buf_get_map_24522 xfs_buf_get_map 3 24522 NULL
106314 +do_mpage_readpage_24536 do_mpage_readpage 3 24536 NULL
106315 +write_cache_pages_24562 write_cache_pages 0 24562 NULL
106316 +SyS_pselect6_24582 SyS_pselect6 1 24582 NULL
106317 +udf_compute_nr_groups_24594 udf_compute_nr_groups 0 24594 NULL
106318 +sensor_hub_get_physical_device_count_24605 sensor_hub_get_physical_device_count 0 24605 NULL nohasharray
106319 +lov_alloc_memmd_24605 lov_alloc_memmd 2 24605 &sensor_hub_get_physical_device_count_24605
106320 +SyS_poll_24620 SyS_poll 2 24620 NULL
106321 +kvm_pv_enable_async_pf_24637 kvm_pv_enable_async_pf 2 24637 NULL
106322 +context_alloc_24645 context_alloc 3 24645 NULL
106323 +blk_rq_err_bytes_24650 blk_rq_err_bytes 0 24650 NULL
106324 +btrfs_check_data_free_space_24692 btrfs_check_data_free_space 0 24692 NULL
106325 +datafab_write_data_24696 datafab_write_data 4 24696 NULL
106326 +intelfbhw_get_p1p2_24703 intelfbhw_get_p1p2 2 24703 NULL
106327 +simple_attr_read_24738 simple_attr_read 3 24738 NULL
106328 +qla2x00_change_queue_depth_24742 qla2x00_change_queue_depth 2 24742 NULL
106329 +get_dma_residue_24749 get_dma_residue 0 24749 NULL
106330 +ocfs2_cow_file_pos_24751 ocfs2_cow_file_pos 3 24751 NULL
106331 +kgdb_hex2mem_24755 kgdb_hex2mem 3 24755 NULL
106332 +kempld_read8_24756 kempld_read8 0 24756 NULL
106333 +ocfs2_read_blocks_24777 ocfs2_read_blocks 0 24777 NULL
106334 +datablob_hmac_verify_24786 datablob_hmac_verify 4 24786 NULL
106335 +cache_read_24790 cache_read 3 24790 NULL
106336 +__xfs_get_blocks_24791 __xfs_get_blocks 2 24791 NULL
106337 +i915_gem_check_wedge_24793 i915_gem_check_wedge 0 24793 NULL
106338 +user_regset_copyout_24796 user_regset_copyout 7 24796 NULL
106339 +kvm_read_guest_virt_helper_24804 kvm_read_guest_virt_helper 3-1 24804 NULL
106340 +__next_cpu_nr_24805 __next_cpu_nr 1 24805 NULL
106341 +sb_set_blocksize_24807 sb_set_blocksize 0-2 24807 NULL
106342 +ath6kl_fwlog_mask_write_24810 ath6kl_fwlog_mask_write 3 24810 NULL
106343 +comedi_buf_alloc_24822 comedi_buf_alloc 3 24822 NULL
106344 +net2272_read_24825 net2272_read 0 24825 NULL
106345 +snd_als4k_gcr_read_24840 snd_als4k_gcr_read 0 24840 NULL
106346 +btrfs_next_old_item_24843 btrfs_next_old_item 0 24843 NULL
106347 +xfs_free_file_space_24853 xfs_free_file_space 2-3 24853 NULL
106348 +snd_pcm_lib_buffer_bytes_24865 snd_pcm_lib_buffer_bytes 0 24865 NULL
106349 +pnp_alloc_24869 pnp_alloc 1 24869 NULL nohasharray
106350 +l2cap_create_basic_pdu_24869 l2cap_create_basic_pdu 3 24869 &pnp_alloc_24869
106351 +setup_buffering_24872 setup_buffering 3 24872 NULL
106352 +queues_read_24877 queues_read 3 24877 NULL
106353 +__vxge_hw_vp_initialize_24885 __vxge_hw_vp_initialize 2 24885 NULL
106354 +codec_list_read_file_24910 codec_list_read_file 3 24910 NULL
106355 +__btrfs_free_extent_24927 __btrfs_free_extent 7-0 24927 NULL nohasharray
106356 +v4l2_ctrl_new_24927 v4l2_ctrl_new 7 24927 &__btrfs_free_extent_24927
106357 +ocfs2_fiemap_24949 ocfs2_fiemap 4-3 24949 NULL
106358 +packet_sendmsg_24954 packet_sendmsg 4 24954 NULL
106359 +ensure_wear_leveling_24971 ensure_wear_leveling 0 24971 NULL
106360 +twl_i2c_write_u8_24976 twl_i2c_write_u8 3 24976 NULL
106361 +llc_ui_sendmsg_24987 llc_ui_sendmsg 4 24987 NULL
106362 +btrfs_update_delayed_inode_24988 btrfs_update_delayed_inode 0 24988 NULL
106363 +key_conf_hw_key_idx_read_25003 key_conf_hw_key_idx_read 3 25003 NULL
106364 +il_dbgfs_channels_read_25005 il_dbgfs_channels_read 3 25005 NULL
106365 +twl6030_irq_unmap_25014 twl6030_irq_unmap 2 25014 NULL
106366 +ni_660x_num_counters_25031 ni_660x_num_counters 0 25031 NULL
106367 +nfs_dns_resolve_name_25036 nfs_dns_resolve_name 3 25036 NULL
106368 +load_unaligned_zeropad_25050 load_unaligned_zeropad 0 25050 NULL
106369 +btrfs_stack_key_blockptr_25058 btrfs_stack_key_blockptr 0 25058 NULL
106370 +gs_buf_alloc_25067 gs_buf_alloc 2 25067 NULL
106371 +ll_track_pid_seq_write_25068 ll_track_pid_seq_write 3 25068 NULL
106372 +SYSC_listxattr_25072 SYSC_listxattr 3 25072 NULL
106373 +iwl_dbgfs_tx_flush_write_25091 iwl_dbgfs_tx_flush_write 3 25091 NULL
106374 +gfs2_iter_unstuffed_25099 gfs2_iter_unstuffed 0 25099 NULL nohasharray
106375 +blkg_path_25099 blkg_path 3 25099 &gfs2_iter_unstuffed_25099
106376 +snd_rawmidi_kernel_write_25106 snd_rawmidi_kernel_write 3 25106 NULL
106377 +fs32_to_cpu_25143 fs32_to_cpu 0 25143 NULL
106378 +record_new_ref_25154 record_new_ref 0 25154 NULL
106379 +ipath_init_qp_table_25167 ipath_init_qp_table 2 25167 NULL nohasharray
106380 +btrfs_delete_delayed_items_25167 btrfs_delete_delayed_items 0 25167 &ipath_init_qp_table_25167
106381 +kvm_mmu_notifier_change_pte_25169 kvm_mmu_notifier_change_pte 3 25169 NULL
106382 +sctp_getsockopt_local_addrs_25178 sctp_getsockopt_local_addrs 2 25178 NULL
106383 +res_counter_read_u64_25180 res_counter_read_u64 0 25180 NULL
106384 +send_create_inode_if_needed_25211 send_create_inode_if_needed 0 25211 NULL
106385 +security_socket_post_create_25221 security_socket_post_create 0 25221 NULL
106386 +ocfs2_block_check_compute_25223 ocfs2_block_check_compute 2 25223 NULL
106387 +dtf_write_string_25232 dtf_write_string 5 25232 NULL
106388 +mon_stat_read_25238 mon_stat_read 3 25238 NULL
106389 +nilfs_palloc_find_available_slot_25245 nilfs_palloc_find_available_slot 5-3 25245 NULL
106390 +stripe_status_25259 stripe_status 5 25259 NULL
106391 +snd_pcm_start_25273 snd_pcm_start 0 25273 NULL
106392 +crypto_alloc_instance2_25277 crypto_alloc_instance2 3 25277 NULL
106393 +vfs_writev_25278 vfs_writev 3 25278 NULL
106394 +l2tp_session_create_25286 l2tp_session_create 1 25286 NULL
106395 +ath9k_debugfs_read_buf_25316 ath9k_debugfs_read_buf 3 25316 NULL
106396 +rng_buffer_size_25348 rng_buffer_size 0 25348 NULL
106397 +SYSC_kexec_load_25361 SYSC_kexec_load 2 25361 NULL
106398 +rio_destid_next_25368 rio_destid_next 2-0 25368 NULL nohasharray
106399 +unix_mkname_25368 unix_mkname 0-2 25368 &rio_destid_next_25368
106400 +sel_read_mls_25369 sel_read_mls 3 25369 NULL
106401 +tc3589x_gpio_to_irq_25371 tc3589x_gpio_to_irq 2 25371 NULL
106402 +orphanize_inode_25382 orphanize_inode 0 25382 NULL
106403 +SyS_splice_25390 SyS_splice 5 25390 NULL
106404 +btrfs_update_reserved_bytes_25393 btrfs_update_reserved_bytes 0 25393 NULL
106405 +vsp1_entity_init_25407 vsp1_entity_init 3 25407 NULL
106406 +ebt_buf_add_pad_25413 ebt_buf_add_pad 0 25413 NULL
106407 +dai_list_read_file_25421 dai_list_read_file 3 25421 NULL
106408 +generic_file_buffered_write_25464 generic_file_buffered_write 4 25464 NULL
106409 +ipath_decode_err_25468 ipath_decode_err 3 25468 NULL
106410 +crypto_hash_digestsize_25469 crypto_hash_digestsize 0 25469 NULL
106411 +ocfs2_hamming_encode_25501 ocfs2_hamming_encode 3 25501 NULL
106412 +ivtv_buf_copy_from_user_25502 ivtv_buf_copy_from_user 4-0 25502 NULL
106413 +evm_init_hmac_25504 evm_init_hmac 0 25504 NULL
106414 +snd_pcm_plugin_build_25505 snd_pcm_plugin_build 5 25505 NULL
106415 +sb_permission_25523 sb_permission 0 25523 NULL
106416 +down_read_failed_25532 down_read_failed 2 25532 NULL
106417 +ext3_get_inode_loc_25542 ext3_get_inode_loc 0 25542 NULL
106418 +ieee80211_if_read_path_refresh_time_25545 ieee80211_if_read_path_refresh_time 3 25545 NULL
106419 +wimax_addr_scnprint_25548 wimax_addr_scnprint 2 25548 NULL
106420 +mgag200_ttm_tt_create_25550 mgag200_ttm_tt_create 2 25550 NULL
106421 +ht_print_chan_25556 ht_print_chan 0 25556 NULL
106422 +skb_tailroom_25567 skb_tailroom 0 25567 NULL
106423 +ping_recvmsg_25597 ping_recvmsg 4 25597 NULL nohasharray
106424 +find_extend_vma_25597 find_extend_vma 2 25597 &ping_recvmsg_25597
106425 +copy_user_generic_25611 copy_user_generic 0 25611 NULL
106426 +proc_coredump_filter_write_25625 proc_coredump_filter_write 3 25625 NULL
106427 +__get_user_pages_25628 __get_user_pages 0-3-4 25628 NULL nohasharray
106428 +befs_utf2nls_25628 befs_utf2nls 3 25628 &__get_user_pages_25628
106429 +__direct_map_25647 __direct_map 6-5 25647 NULL
106430 +ext2_try_to_allocate_25667 ext2_try_to_allocate 4-2-0 25667 NULL
106431 +aircable_prepare_write_buffer_25669 aircable_prepare_write_buffer 3 25669 NULL
106432 +lpfc_idiag_cmd_get_25672 lpfc_idiag_cmd_get 2 25672 NULL
106433 +sta_inactive_ms_read_25690 sta_inactive_ms_read 3 25690 NULL
106434 +ebitmap_start_positive_25703 ebitmap_start_positive 0 25703 NULL
106435 +wl1271_tx_enabled_rates_get_25712 wl1271_tx_enabled_rates_get 0 25712 NULL nohasharray
106436 +rx_filter_mc_filter_read_25712 rx_filter_mc_filter_read 3 25712 &wl1271_tx_enabled_rates_get_25712
106437 +ibmasm_new_command_25714 ibmasm_new_command 2 25714 NULL
106438 +ttm_tt_init_25717 ttm_tt_init 3 25717 NULL
106439 +sel_write_context_25726 sel_write_context 3 25726 NULL nohasharray
106440 +__alloc_bootmem_low_node_25726 __alloc_bootmem_low_node 2 25726 &sel_write_context_25726
106441 +ext2_find_near_25734 ext2_find_near 0 25734 NULL
106442 +__set_clear_dirty_25744 __set_clear_dirty 2 25744 NULL
106443 +cxgbi_device_portmap_create_25747 cxgbi_device_portmap_create 3 25747 NULL
106444 +dtf_write_channel_25748 dtf_write_channel 3 25748 NULL
106445 +event_rx_pool_read_25792 event_rx_pool_read 3 25792 NULL
106446 +sg_read_25799 sg_read 3 25799 NULL
106447 +system_enable_read_25815 system_enable_read 3 25815 NULL
106448 +realloc_buffer_25816 realloc_buffer 2 25816 NULL
106449 +ftrace_profile_init_25821 ftrace_profile_init 0 25821 NULL
106450 +mthca_map_user_db_25823 mthca_map_user_db 5 25823 NULL
106451 +pwr_missing_bcns_read_25824 pwr_missing_bcns_read 3 25824 NULL
106452 +parport_read_25855 parport_read 0 25855 NULL
106453 +xfs_dir2_sf_hdr_size_25858 xfs_dir2_sf_hdr_size 0 25858 NULL
106454 +key_attr_size_25865 key_attr_size 0 25865 NULL
106455 +ath6kl_regread_read_25884 ath6kl_regread_read 3 25884 NULL
106456 +run_delalloc_nocow_25896 run_delalloc_nocow 3-4 25896 NULL
106457 +sisusbcon_scroll_area_25899 sisusbcon_scroll_area 4-3 25899 NULL
106458 +lpfc_change_queue_depth_25905 lpfc_change_queue_depth 2 25905 NULL
106459 +nvme_trans_mode_page_create_25908 nvme_trans_mode_page_create 7-4 25908 NULL
106460 +do_jffs2_setxattr_25910 do_jffs2_setxattr 5 25910 NULL
106461 +rcname_read_25919 rcname_read 3 25919 NULL
106462 +snd_es1938_capture_copy_25930 snd_es1938_capture_copy 5 25930 NULL
106463 +key_flags_read_25931 key_flags_read 3 25931 NULL
106464 +copy_play_buf_25932 copy_play_buf 3 25932 NULL
106465 +flush_25957 flush 2 25957 NULL
106466 +video_register_device_25971 video_register_device 3 25971 NULL
106467 +udp_setsockopt_25985 udp_setsockopt 5 25985 NULL
106468 +lustre_msg_buflen_v2_25997 lustre_msg_buflen_v2 0 25997 NULL
106469 +ebt_compat_entry_padsize_26001 ebt_compat_entry_padsize 0 26001 NULL
106470 +blk_init_queue_node_26015 blk_init_queue_node 3 26015 NULL
106471 +SyS_process_vm_readv_26019 SyS_process_vm_readv 3-5 26019 NULL
106472 +irq_create_strict_mappings_26025 irq_create_strict_mappings 2-4 26025 NULL
106473 +xfs_xattr_acl_set_26028 xfs_xattr_acl_set 4 26028 NULL
106474 +mptscsih_change_queue_depth_26036 mptscsih_change_queue_depth 2 26036 NULL
106475 +selinux_inode_post_setxattr_26037 selinux_inode_post_setxattr 4 26037 NULL
106476 +tun_do_read_26047 tun_do_read 5 26047 NULL
106477 +make_bfloat_26056 make_bfloat 2 26056 NULL
106478 +keyctl_update_key_26061 keyctl_update_key 3 26061 NULL
106479 +rx_rx_wa_density_dropped_frame_read_26095 rx_rx_wa_density_dropped_frame_read 3 26095 NULL
106480 +__add_inline_refs_26096 __add_inline_refs 0 26096 NULL
106481 +dup_ref_26100 dup_ref 0 26100 NULL
106482 +intel_wrap_ring_buffer_26117 intel_wrap_ring_buffer 0 26117 NULL
106483 +read_sb_page_26119 read_sb_page 5 26119 NULL
106484 +__fswab64_26155 __fswab64 0 26155 NULL
106485 +copy_oldmem_page_26164 copy_oldmem_page 3 26164 NULL
106486 +gfs2_xattr_acl_get_26166 gfs2_xattr_acl_get 0 26166 NULL nohasharray
106487 +ath6kl_roam_table_read_26166 ath6kl_roam_table_read 3 26166 &gfs2_xattr_acl_get_26166
106488 +disk_devt_26180 disk_devt 0 26180 NULL
106489 +cgroup_setxattr_26188 cgroup_setxattr 4 26188 NULL
106490 +ieee80211_if_fmt_dot11MeshTTL_26198 ieee80211_if_fmt_dot11MeshTTL 3 26198 NULL
106491 +xfs_idata_realloc_26199 xfs_idata_realloc 2 26199 NULL
106492 +mce_write_26201 mce_write 3 26201 NULL
106493 +SyS_splice_26206 SyS_splice 5 26206 NULL
106494 +mwifiex_regrdwr_write_26225 mwifiex_regrdwr_write 3 26225 NULL
106495 +_scsih_change_queue_depth_26230 _scsih_change_queue_depth 2 26230 NULL
106496 +rxrpc_recvmsg_26233 rxrpc_recvmsg 4 26233 NULL
106497 +bio_split_26235 bio_split 2 26235 NULL
106498 +btrfs_delayed_inode_reserve_metadata_26236 btrfs_delayed_inode_reserve_metadata 0 26236 NULL
106499 +ecryptfs_read_lower_page_segment_26244 ecryptfs_read_lower_page_segment 4 26244 NULL
106500 +do_setxattr_26264 do_setxattr 0 26264 NULL
106501 +crypto_ctxsize_26278 crypto_ctxsize 0 26278 NULL
106502 +apei_resources_request_26279 apei_resources_request 0 26279 NULL
106503 +wacom_set_device_mode_26280 wacom_set_device_mode 3 26280 NULL
106504 +ext2_find_goal_26306 ext2_find_goal 0 26306 NULL
106505 +snd_pcm_plug_client_channels_buf_26309 snd_pcm_plug_client_channels_buf 0-3 26309 NULL nohasharray
106506 +pax_get_random_long_26309 pax_get_random_long 0 26309 &snd_pcm_plug_client_channels_buf_26309
106507 +pwr_wake_on_host_read_26321 pwr_wake_on_host_read 3 26321 NULL
106508 +check_can_nocow_26336 check_can_nocow 2 26336 NULL
106509 +snd_vx_check_reg_bit_26344 snd_vx_check_reg_bit 0 26344 NULL
106510 +ocfs2_duplicate_clusters_by_page_26357 ocfs2_duplicate_clusters_by_page 5-0-6-3 26357 NULL
106511 +cifs_readdata_alloc_26360 cifs_readdata_alloc 1 26360 NULL
106512 +invalidate_inode_pages2_range_26403 invalidate_inode_pages2_range 0 26403 NULL
106513 +ntty_write_26404 ntty_write 3 26404 NULL
106514 +pagemap_read_26441 pagemap_read 3 26441 NULL
106515 +tower_read_26461 tower_read 3 26461 NULL nohasharray
106516 +enc_pools_add_pages_26461 enc_pools_add_pages 1 26461 &tower_read_26461 nohasharray
106517 +numa_cpu_node_26461 numa_cpu_node 0 26461 &enc_pools_add_pages_26461
106518 +memory_present_26470 memory_present 1 26470 NULL
106519 +ib_alloc_device_26483 ib_alloc_device 1 26483 NULL
106520 +ulong_write_file_26485 ulong_write_file 3 26485 NULL
106521 +dvb_ca_en50221_io_ioctl_26490 dvb_ca_en50221_io_ioctl 2 26490 NULL
106522 +vfio_pin_pages_26494 vfio_pin_pages 1 26494 NULL
106523 +read_vmcore_26501 read_vmcore 3 26501 NULL
106524 +uhid_char_write_26502 uhid_char_write 3 26502 NULL
106525 +vfio_pci_set_msi_trigger_26507 vfio_pci_set_msi_trigger 4-3 26507 NULL
106526 +iwl_dbgfs_rf_reset_read_26512 iwl_dbgfs_rf_reset_read 3 26512 NULL
106527 +SyS_rt_sigpending_26538 SyS_rt_sigpending 2 26538 NULL
106528 +rds_message_inc_copy_to_user_26540 rds_message_inc_copy_to_user 3 26540 NULL
106529 +__vhost_add_used_n_26554 __vhost_add_used_n 3 26554 NULL
106530 +qgroup_account_ref_step3_26558 qgroup_account_ref_step3 0 26558 NULL
106531 +dio_new_bio_26562 dio_new_bio 0 26562 NULL
106532 +kvm_iommu_put_pages_26571 kvm_iommu_put_pages 2 26571 NULL
106533 +rts51x_read_mem_26577 rts51x_read_mem 4 26577 NULL
106534 +regcache_set_reg_present_26598 regcache_set_reg_present 2 26598 NULL
106535 +__unmap_single_26604 __unmap_single 2-3 26604 NULL
106536 +dev_to_node_26617 dev_to_node 0 26617 NULL
106537 +iommu_alloc_26621 iommu_alloc 4 26621 NULL
106538 +pack_value_26625 pack_value 1 26625 NULL
106539 +pwr_fix_tsf_ps_read_26627 pwr_fix_tsf_ps_read 3 26627 NULL
106540 +drm_ht_find_item_26637 drm_ht_find_item 0 26637 NULL
106541 +process_extent_26646 process_extent 0 26646 NULL nohasharray
106542 +btrfs_lookup_inode_26646 btrfs_lookup_inode 0 26646 &process_extent_26646
106543 +irq_alloc_generic_chip_26650 irq_alloc_generic_chip 2 26650 NULL nohasharray
106544 +inb_p_26650 inb_p 0 26650 &irq_alloc_generic_chip_26650
106545 +usb_reset_device_26661 usb_reset_device 0 26661 NULL
106546 +cipso_v4_map_cat_rbm_hton_26680 cipso_v4_map_cat_rbm_hton 0 26680 NULL
106547 +nouveau_namedb_create__26732 nouveau_namedb_create_ 7 26732 NULL
106548 +SyS_fcntl_26737 SyS_fcntl 3 26737 NULL
106549 +pipeline_tcp_rx_stat_fifo_int_read_26745 pipeline_tcp_rx_stat_fifo_int_read 3 26745 NULL
106550 +bos_desc_26752 bos_desc 0 26752 NULL
106551 +snd_hda_get_raw_connections_26762 snd_hda_get_raw_connections 0 26762 NULL
106552 +dma_map_single_attrs_26779 dma_map_single_attrs 0 26779 NULL
106553 +cache_save_setup_26783 cache_save_setup 0 26783 NULL
106554 +qlcnic_alloc_sds_rings_26795 qlcnic_alloc_sds_rings 2 26795 NULL
106555 +cipso_v4_genopt_26812 cipso_v4_genopt 0 26812 NULL
106556 +iwl_trans_read_mem32_26825 iwl_trans_read_mem32 0 26825 NULL
106557 +smk_write_load_26829 smk_write_load 3 26829 NULL
106558 +ept_get_level1_sp_gpa_26831 ept_get_level1_sp_gpa 0 26831 NULL
106559 +__nodes_onto_26838 __nodes_onto 4 26838 NULL
106560 +scnprint_id_26842 scnprint_id 3-0 26842 NULL
106561 +ecryptfs_miscdev_write_26847 ecryptfs_miscdev_write 3 26847 NULL
106562 +tipc_conn_sendmsg_26867 tipc_conn_sendmsg 5 26867 NULL
106563 +ath6kl_create_qos_write_26879 ath6kl_create_qos_write 3 26879 NULL
106564 +svc_print_xprts_26881 svc_print_xprts 0 26881 NULL
106565 +cfg80211_process_auth_26916 cfg80211_process_auth 3 26916 NULL
106566 +x25_asy_change_mtu_26928 x25_asy_change_mtu 2 26928 NULL
106567 +compat_mtw_from_user_26932 compat_mtw_from_user 0 26932 NULL
106568 +scsi_tgt_copy_sense_26933 scsi_tgt_copy_sense 3 26933 NULL
106569 +pwr_ps_enter_read_26935 pwr_ps_enter_read 3 26935 NULL nohasharray
106570 +sctp_setsockopt_adaptation_layer_26935 sctp_setsockopt_adaptation_layer 3 26935 &pwr_ps_enter_read_26935
106571 +remove_from_bitmap_26939 remove_from_bitmap 0 26939 NULL
106572 +create_bm_block_list_26940 create_bm_block_list 0 26940 NULL
106573 +hecubafb_write_26942 hecubafb_write 3 26942 NULL
106574 +extract_entropy_user_26952 extract_entropy_user 3 26952 NULL nohasharray
106575 +do_trimming_26952 do_trimming 3 26952 &extract_entropy_user_26952
106576 +xlog_grant_push_ail_26972 xlog_grant_push_ail 2 26972 NULL
106577 +do_direct_IO_26979 do_direct_IO 0 26979 NULL
106578 +pcf857x_irq_domain_map_26998 pcf857x_irq_domain_map 2 26998 NULL
106579 +i2c_smbus_xfer_27006 i2c_smbus_xfer 0 27006 NULL
106580 +omfs_allocate_range_27034 omfs_allocate_range 3 27034 NULL
106581 +fill_read_buf_27036 fill_read_buf 0 27036 NULL
106582 +ufs_alloc_fragments_27059 ufs_alloc_fragments 3-0-2 27059 NULL
106583 +__videobuf_alloc_vb_27062 __videobuf_alloc_vb 1 27062 NULL
106584 +ext4_convert_unwritten_extents_27064 ext4_convert_unwritten_extents 4-3-0 27064 NULL
106585 +snd_pcm_lib_period_bytes_27071 snd_pcm_lib_period_bytes 0 27071 NULL
106586 +paravirt_read_msr_27077 paravirt_read_msr 0 27077 NULL
106587 +snd_mixer_oss_set_recsrc_27080 snd_mixer_oss_set_recsrc 2 27080 NULL
106588 +alloc_fdmem_27083 alloc_fdmem 1 27083 NULL
106589 +find_first_bit_27088 find_first_bit 0-2 27088 NULL
106590 +btmrvl_hscmd_write_27089 btmrvl_hscmd_write 3 27089 NULL
106591 +nes_reg_user_mr_27106 nes_reg_user_mr 2-3 27106 NULL
106592 +__devcgroup_inode_permission_27108 __devcgroup_inode_permission 0 27108 NULL
106593 +i915_gem_execbuffer_relocate_slow_27116 i915_gem_execbuffer_relocate_slow 0 27116 NULL
106594 +get_kernel_page_27133 get_kernel_page 0 27133 NULL
106595 +__ext4_handle_dirty_metadata_27137 __ext4_handle_dirty_metadata 0 27137 NULL
106596 +drbd_get_capacity_27141 drbd_get_capacity 0 27141 NULL
106597 +pms_capture_27142 pms_capture 4 27142 NULL
106598 +btmrvl_hscfgcmd_write_27143 btmrvl_hscfgcmd_write 3 27143 NULL
106599 +snd_compr_calc_avail_27165 snd_compr_calc_avail 0 27165 NULL
106600 +ieee80211_if_read_rc_rateidx_mask_5ghz_27183 ieee80211_if_read_rc_rateidx_mask_5ghz 3 27183 NULL
106601 +get_unaligned_be32_27184 get_unaligned_be32 0 27184 NULL
106602 +__intel_ring_begin_27197 __intel_ring_begin 0 27197 NULL
106603 +__sg_alloc_table_27198 __sg_alloc_table 0 27198 NULL
106604 +ocfs2_read_blocks_sync_27210 ocfs2_read_blocks_sync 0 27210 NULL
106605 +write_kmem_27225 write_kmem 3 27225 NULL
106606 +dbAllocAG_27228 dbAllocAG 0 27228 NULL
106607 +rxrpc_request_key_27235 rxrpc_request_key 3 27235 NULL
106608 +ocfs2_journal_access_path_27243 ocfs2_journal_access_path 0 27243 NULL
106609 +ll_track_gid_seq_write_27267 ll_track_gid_seq_write 3 27267 NULL
106610 +qfq_unblock_groups_27269 qfq_unblock_groups 2 27269 NULL
106611 +comedi_alloc_devpriv_27272 comedi_alloc_devpriv 2 27272 NULL
106612 +__dma_map_cont_27289 __dma_map_cont 5 27289 NULL
106613 +copy_from_buf_27308 copy_from_buf 2-4 27308 NULL
106614 +virtqueue_add_inbuf_27312 virtqueue_add_inbuf 3 27312 NULL
106615 +write_buf_27316 write_buf 0-3 27316 NULL
106616 +ocfs2_blocks_to_clusters_27327 ocfs2_blocks_to_clusters 0-2 27327 NULL
106617 +snd_pcm_oss_write2_27332 snd_pcm_oss_write2 3-0 27332 NULL
106618 +afs_cell_create_27346 afs_cell_create 2 27346 NULL
106619 +iwl_dbgfs_csr_write_27363 iwl_dbgfs_csr_write 3 27363 NULL
106620 +pcbit_stat_27364 pcbit_stat 2 27364 NULL
106621 +lz4_compress_crypto_27387 lz4_compress_crypto 3 27387 NULL
106622 +seq_read_27411 seq_read 3 27411 NULL
106623 +ib_dma_map_sg_27413 ib_dma_map_sg 0 27413 NULL nohasharray
106624 +zalloc_cpumask_var_node_27413 zalloc_cpumask_var_node 3 27413 &ib_dma_map_sg_27413
106625 +ieee80211_if_read_smps_27416 ieee80211_if_read_smps 3 27416 NULL
106626 +ocfs2_refcount_cal_cow_clusters_27422 ocfs2_refcount_cal_cow_clusters 0-3-4 27422 NULL nohasharray
106627 +evm_inode_init_security_27422 evm_inode_init_security 0 27422 &ocfs2_refcount_cal_cow_clusters_27422
106628 +cypress_write_27423 cypress_write 4 27423 NULL
106629 +sddr09_read_data_27447 sddr09_read_data 3 27447 NULL
106630 +ktime_to_us_27455 ktime_to_us 0 27455 NULL
106631 +sk_extract_addr_27474 sk_extract_addr 0 27474 NULL
106632 +v4l2_ctrl_new_std_menu_items_27487 v4l2_ctrl_new_std_menu_items 4 27487 NULL
106633 +hcd_buffer_alloc_27495 hcd_buffer_alloc 2 27495 NULL
106634 +qib_create_cq_27497 qib_create_cq 2 27497 NULL
106635 +ip_set_get_h32_27498 ip_set_get_h32 0 27498 NULL
106636 +btrfs_get_64_27499 btrfs_get_64 0 27499 NULL
106637 +ept_walk_addr_generic_27501 ept_walk_addr_generic 4 27501 NULL
106638 +garmin_read_process_27509 garmin_read_process 3 27509 NULL
106639 +oti_alloc_cookies_27510 oti_alloc_cookies 2 27510 NULL
106640 +ib_copy_to_udata_27525 ib_copy_to_udata 3 27525 NULL
106641 +snd_sonicvibes_getdmaa_27552 snd_sonicvibes_getdmaa 0 27552 NULL
106642 +SyS_fgetxattr_27571 SyS_fgetxattr 4 27571 NULL
106643 +sco_sock_recvmsg_27572 sco_sock_recvmsg 4 27572 NULL
106644 +libipw_alloc_txb_27579 libipw_alloc_txb 1 27579 NULL
106645 +read_flush_procfs_27642 read_flush_procfs 3 27642 NULL nohasharray
106646 +nl80211_send_connect_result_27642 nl80211_send_connect_result 5-7 27642 &read_flush_procfs_27642 nohasharray
106647 +ocfs2_direct_IO_27642 ocfs2_direct_IO 4 27642 &nl80211_send_connect_result_27642 nohasharray
106648 +ocfs2_xattr_ibody_get_27642 ocfs2_xattr_ibody_get 0 27642 &ocfs2_direct_IO_27642
106649 +add_new_gdb_27643 add_new_gdb 3 27643 NULL
106650 +btrfs_fallocate_27647 btrfs_fallocate 3-4 27647 NULL
106651 +qnx6_readpages_27657 qnx6_readpages 4 27657 NULL
106652 +cdrom_read_cdda_old_27664 cdrom_read_cdda_old 4 27664 NULL
106653 +record_changed_ref_27665 record_changed_ref 0 27665 NULL
106654 +iommu_pgsize_27677 iommu_pgsize 2-0 27677 NULL
106655 +ocfs2_extend_dir_27695 ocfs2_extend_dir 4 27695 NULL
106656 +fs_path_add_from_extent_buffer_27702 fs_path_add_from_extent_buffer 4-0 27702 NULL
106657 +evm_write_key_27715 evm_write_key 3 27715 NULL
106658 +ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol_27722 ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol 3 27722 NULL
106659 +xfs_dir2_block_sfsize_27727 xfs_dir2_block_sfsize 0 27727 NULL
106660 +macvtap_skb_to_vnet_hdr_27747 macvtap_skb_to_vnet_hdr 0 27747 NULL
106661 +SyS_setsockopt_27759 SyS_setsockopt 5 27759 NULL
106662 +gpiochip_export_27776 gpiochip_export 0 27776 NULL
106663 +__lov_setstripe_27782 __lov_setstripe 2 27782 NULL
106664 +twl4030_set_gpio_dataout_27792 twl4030_set_gpio_dataout 1 27792 NULL
106665 +DivaSTraceGetMemotyRequirement_27797 DivaSTraceGetMemotyRequirement 0-1 27797 NULL
106666 +ttm_object_file_init_27804 ttm_object_file_init 2 27804 NULL nohasharray
106667 +SyS_readv_27804 SyS_readv 3 27804 &ttm_object_file_init_27804
106668 +mpihelp_mul_27805 mpihelp_mul 5-3 27805 NULL
106669 +fwtty_buffer_rx_27821 fwtty_buffer_rx 3 27821 NULL
106670 +hpt374_read_freq_27828 hpt374_read_freq 0 27828 NULL
106671 +init_header_complete_27833 init_header_complete 0 27833 NULL
106672 +read_profile_27859 read_profile 3 27859 NULL
106673 +sky2_pci_read16_27863 sky2_pci_read16 0 27863 NULL
106674 +ieee80211_if_read_dot11MeshHWMProotInterval_27873 ieee80211_if_read_dot11MeshHWMProotInterval 3 27873 NULL
106675 +process_all_extents_27879 process_all_extents 0 27879 NULL
106676 +unix_seqpacket_sendmsg_27893 unix_seqpacket_sendmsg 4 27893 NULL
106677 +gluebi_write_27905 gluebi_write 3-2 27905 NULL
106678 +SyS_ptrace_27924 SyS_ptrace 3 27924 NULL
106679 +bm_find_next_27929 bm_find_next 2 27929 NULL
106680 +check_mapped_name_27943 check_mapped_name 3 27943 NULL
106681 +i915_gem_execbuffer_reserve_object_27956 i915_gem_execbuffer_reserve_object 0 27956 NULL
106682 +tracing_clock_write_27961 tracing_clock_write 3 27961 NULL
106683 +tipc_media_addr_printf_27971 tipc_media_addr_printf 2 27971 NULL
106684 +device_register_27972 device_register 0 27972 NULL nohasharray
106685 +mic_rx_pkts_read_27972 mic_rx_pkts_read 3 27972 &device_register_27972
106686 +pci_enable_device_flags_27977 pci_enable_device_flags 0 27977 NULL
106687 +f2fs_bio_alloc_27983 f2fs_bio_alloc 2 27983 NULL
106688 +edt_ft5x06_debugfs_raw_data_read_28002 edt_ft5x06_debugfs_raw_data_read 3 28002 NULL
106689 +snd_rawmidi_write_28008 snd_rawmidi_write 3 28008 NULL
106690 +remove_extent_data_ref_28023 remove_extent_data_ref 0 28023 NULL
106691 +alloc_one_pg_vec_page_28031 alloc_one_pg_vec_page 1 28031 NULL
106692 +record_deleted_ref_28039 record_deleted_ref 0 28039 NULL
106693 +sctp_setsockopt_maxburst_28041 sctp_setsockopt_maxburst 3 28041 NULL
106694 +rts51x_xd_rw_28046 rts51x_xd_rw 3-4 28046 NULL
106695 +p9_fd_write_28050 p9_fd_write 3 28050 NULL
106696 +cx231xx_init_vbi_isoc_28053 cx231xx_init_vbi_isoc 3-2-4 28053 NULL
106697 +pool_status_28055 pool_status 5 28055 NULL
106698 +init_rs_non_canonical_28059 init_rs_non_canonical 1 28059 NULL
106699 +lpfc_idiag_mbxacc_read_28061 lpfc_idiag_mbxacc_read 3 28061 NULL
106700 +tx_frag_bad_mblk_num_read_28064 tx_frag_bad_mblk_num_read 3 28064 NULL
106701 +ext4_read_block_bitmap_nowait_28078 ext4_read_block_bitmap_nowait 2 28078 NULL
106702 +platform_get_irq_28088 platform_get_irq 0 28088 NULL
106703 +SyS_brk_28096 SyS_brk 1 28096 NULL
106704 +mmc_test_alloc_mem_28102 mmc_test_alloc_mem 2-3 28102 NULL
106705 +rx_defrag_need_defrag_read_28117 rx_defrag_need_defrag_read 3 28117 NULL
106706 +vgacon_adjust_height_28124 vgacon_adjust_height 2 28124 NULL
106707 +tipc_msg_init_28128 tipc_msg_init 4-2 28128 NULL
106708 +video_read_28148 video_read 3 28148 NULL
106709 +snd_midi_channel_alloc_set_28153 snd_midi_channel_alloc_set 1 28153 NULL
106710 +stats_dot11FCSErrorCount_read_28154 stats_dot11FCSErrorCount_read 3 28154 NULL
106711 +__add_reloc_root_28155 __add_reloc_root 0 28155 NULL
106712 +vread_28173 vread 0-3 28173 NULL
106713 +macvtap_get_user_28185 macvtap_get_user 4 28185 NULL
106714 +counter_free_res_28187 counter_free_res 5 28187 NULL
106715 +read_disk_sb_28188 read_disk_sb 2 28188 NULL
106716 +nouveau_mxm_create__28200 nouveau_mxm_create_ 4 28200 NULL
106717 +__exclude_logged_extent_28212 __exclude_logged_extent 2-0 28212 NULL
106718 +__qp_memcpy_from_queue_28220 __qp_memcpy_from_queue 3-4 28220 NULL
106719 +ocfs2_cow_sync_writeback_28221 ocfs2_cow_sync_writeback 0 28221 NULL
106720 +line6_alloc_sysex_buffer_28225 line6_alloc_sysex_buffer 4 28225 NULL
106721 +amd_nb_num_28228 amd_nb_num 0 28228 NULL
106722 +ext4_validate_block_bitmap_28243 ext4_validate_block_bitmap 3 28243 NULL
106723 +fuse_direct_IO_28275 fuse_direct_IO 4 28275 NULL
106724 +usemap_size_28281 usemap_size 0 28281 NULL
106725 +inline_xattr_size_28285 inline_xattr_size 0 28285 NULL
106726 +dma_map_sg_attrs_28289 dma_map_sg_attrs 0 28289 NULL
106727 +SyS_ppoll_28290 SyS_ppoll 2 28290 NULL
106728 +kstrtos16_from_user_28300 kstrtos16_from_user 2 28300 NULL
106729 +acpi_register_gsi_xen_28305 acpi_register_gsi_xen 2 28305 NULL nohasharray
106730 +nouveau_compat_ioctl_28305 nouveau_compat_ioctl 2 28305 &acpi_register_gsi_xen_28305
106731 +create_io_context_28306 create_io_context 2 28306 NULL
106732 +__mlock_vma_pages_range_28315 __mlock_vma_pages_range 2-3-0 28315 NULL
106733 +snd_pcm_oss_read_28317 snd_pcm_oss_read 3 28317 NULL
106734 +bm_entry_write_28338 bm_entry_write 3 28338 NULL
106735 +tcp_copy_to_iovec_28344 tcp_copy_to_iovec 3 28344 NULL
106736 +cpuset_spread_node_28351 cpuset_spread_node 0 28351 NULL nohasharray
106737 +snapshot_write_28351 snapshot_write 3 28351 &cpuset_spread_node_28351
106738 +xfs_iomap_write_unwritten_28365 xfs_iomap_write_unwritten 3-2 28365 NULL
106739 +dlmfs_file_read_28385 dlmfs_file_read 3 28385 NULL
106740 +tx_frag_cache_miss_read_28394 tx_frag_cache_miss_read 3 28394 NULL
106741 +bypass_pwup_write_28416 bypass_pwup_write 3 28416 NULL
106742 +subdev_ioctl_28417 subdev_ioctl 2 28417 NULL
106743 +get_extent_allocation_hint_28423 get_extent_allocation_hint 0 28423 NULL
106744 +ksocknal_alloc_tx_28426 ksocknal_alloc_tx 2 28426 NULL
106745 +mpage_readpages_28436 mpage_readpages 3 28436 NULL
106746 +snd_emu10k1_efx_read_28452 snd_emu10k1_efx_read 2 28452 NULL
106747 +key_mic_failures_read_28457 key_mic_failures_read 3 28457 NULL
106748 +alloc_irq_cpu_rmap_28459 alloc_irq_cpu_rmap 1 28459 NULL
106749 +vmw_du_crtc_cursor_set_28479 vmw_du_crtc_cursor_set 4-5 28479 NULL
106750 +ocfs2_backup_super_blkno_28484 ocfs2_backup_super_blkno 0-2 28484 NULL
106751 +__filemap_fdatawrite_28485 __filemap_fdatawrite 0 28485 NULL
106752 +clear_discard_28494 clear_discard 2 28494 NULL
106753 +ps_poll_upsd_utilization_read_28519 ps_poll_upsd_utilization_read 3 28519 NULL
106754 +__next_node_28521 __next_node 1-0 28521 NULL
106755 +i2400m_tx_stats_read_28527 i2400m_tx_stats_read 3 28527 NULL
106756 +sel_read_policycap_28544 sel_read_policycap 3 28544 NULL
106757 +run_delalloc_range_28545 run_delalloc_range 3-4 28545 NULL nohasharray
106758 +mptctl_getiocinfo_28545 mptctl_getiocinfo 2 28545 &run_delalloc_range_28545 nohasharray
106759 +aio_read_events_28545 aio_read_events 3 28545 &mptctl_getiocinfo_28545
106760 +sysfs_create_bin_file_28551 sysfs_create_bin_file 0 28551 NULL
106761 +b43legacy_debugfs_write_28556 b43legacy_debugfs_write 3 28556 NULL
106762 +i2o_msg_post_wait_mem_28558 i2o_msg_post_wait_mem 0 28558 NULL
106763 +asymmetric_verify_28567 asymmetric_verify 3 28567 NULL
106764 +oxygen_read32_28582 oxygen_read32 0 28582 NULL
106765 +ocfs2_read_dir_block_28587 ocfs2_read_dir_block 2 28587 NULL
106766 +extract_entropy_28604 extract_entropy 5-3 28604 NULL
106767 +kfifo_unused_28612 kfifo_unused 0 28612 NULL
106768 +mp_override_legacy_irq_28618 mp_override_legacy_irq 4 28618 NULL
106769 +snd_nm256_capture_copy_28622 snd_nm256_capture_copy 5-3 28622 NULL
106770 +setup_usemap_28636 setup_usemap 3-4 28636 NULL
106771 +qib_handle_6120_hwerrors_28642 qib_handle_6120_hwerrors 3 28642 NULL
106772 +p9_fcall_alloc_28652 p9_fcall_alloc 1 28652 NULL
106773 +read_nic_io_byte_28654 read_nic_io_byte 0 28654 NULL
106774 +btrfs_previous_item_28667 btrfs_previous_item 0 28667 NULL
106775 +blk_queue_resize_tags_28670 blk_queue_resize_tags 2 28670 NULL
106776 +__perf_sw_event_28684 __perf_sw_event 2 28684 NULL
106777 +SyS_setgroups16_28686 SyS_setgroups16 1 28686 NULL
106778 +kvm_mmu_get_page_28692 kvm_mmu_get_page 2 28692 NULL
106779 +balance_level_28707 balance_level 0 28707 NULL
106780 +drm_plane_init_28731 drm_plane_init 6 28731 NULL
106781 +alloc_irq_cfg_28734 alloc_irq_cfg 2 28734 NULL
106782 +spi_execute_28736 spi_execute 5 28736 NULL
106783 +snd_pcm_aio_write_28738 snd_pcm_aio_write 3 28738 NULL
106784 +read_file_btcoex_28743 read_file_btcoex 3 28743 NULL
106785 +max_hw_blocks_28748 max_hw_blocks 0 28748 NULL
106786 +rpc_pipe_generic_upcall_28766 rpc_pipe_generic_upcall 4 28766 NULL
106787 +atomic_inc_return_unchecked_28778 atomic_inc_return_unchecked 0 28778 NULL
106788 +ath6kl_get_num_reg_28780 ath6kl_get_num_reg 0 28780 NULL
106789 +btrfs_block_rsv_refill_28800 btrfs_block_rsv_refill 3 28800 NULL nohasharray
106790 +sel_write_member_28800 sel_write_member 3 28800 &btrfs_block_rsv_refill_28800
106791 +cgroup_file_read_28804 cgroup_file_read 3 28804 NULL
106792 +memory_bm_create_28814 memory_bm_create 0 28814 NULL
106793 +iwl_dbgfs_rxon_filter_flags_read_28832 iwl_dbgfs_rxon_filter_flags_read 3 28832 NULL
106794 +vp_request_msix_vectors_28849 vp_request_msix_vectors 2 28849 NULL
106795 +ipv6_renew_options_28867 ipv6_renew_options 5 28867 NULL
106796 +max_io_len_target_boundary_28879 max_io_len_target_boundary 0-1 28879 NULL
106797 +packet_sendmsg_spkt_28885 packet_sendmsg_spkt 4 28885 NULL
106798 +to_cblock_28899 to_cblock 0-1 28899 NULL
106799 +da9055_group_write_28904 da9055_group_write 2-3 28904 NULL
106800 +ps_upsd_timeouts_read_28924 ps_upsd_timeouts_read 3 28924 NULL
106801 +iwl_dbgfs_sleep_level_override_write_28925 iwl_dbgfs_sleep_level_override_write 3 28925 NULL
106802 +ocfs2_frozen_trigger_28929 ocfs2_frozen_trigger 4 28929 NULL
106803 +push_rx_28939 push_rx 3 28939 NULL
106804 +btrfs_trim_block_group_28963 btrfs_trim_block_group 4-3 28963 NULL
106805 +alloc_sched_domains_28972 alloc_sched_domains 1 28972 NULL
106806 +remap_pfn_range_28976 remap_pfn_range 3-4-2 28976 NULL
106807 +ext4_mb_add_groupinfo_28988 ext4_mb_add_groupinfo 2 28988 NULL
106808 +hci_sock_setsockopt_28993 hci_sock_setsockopt 5 28993 NULL
106809 +bin_uuid_28999 bin_uuid 3 28999 NULL
106810 +fd_execute_rw_29004 fd_execute_rw 3 29004 NULL nohasharray
106811 +offset_to_bitmap_29004 offset_to_bitmap 2 29004 &fd_execute_rw_29004
106812 +xz_dec_init_29029 xz_dec_init 2 29029 NULL
106813 +i915_gem_object_bind_to_vm_29035 i915_gem_object_bind_to_vm 0 29035 NULL
106814 +ieee80211_if_read_ht_opmode_29044 ieee80211_if_read_ht_opmode 3 29044 NULL
106815 +ProcessGetHostMibs_29049 ProcessGetHostMibs 0 29049 NULL nohasharray
106816 +rxrpc_sendmsg_29049 rxrpc_sendmsg 4 29049 &ProcessGetHostMibs_29049
106817 +btrfs_root_bytenr_29058 btrfs_root_bytenr 0 29058 NULL
106818 +iso_packets_buffer_init_29061 iso_packets_buffer_init 3-4 29061 NULL
106819 +roundup_64_29066 roundup_64 2-0-1 29066 NULL
106820 +lpfc_idiag_extacc_drivr_get_29067 lpfc_idiag_extacc_drivr_get 0-3 29067 NULL
106821 +sctp_getsockopt_assoc_stats_29074 sctp_getsockopt_assoc_stats 2 29074 NULL
106822 +iwl_dbgfs_log_event_write_29088 iwl_dbgfs_log_event_write 3 29088 NULL
106823 +i915_error_object_create_sized_29091 i915_error_object_create_sized 3 29091 NULL
106824 +init_cache_node_node_29092 init_cache_node_node 1 29092 NULL
106825 +isdn_ppp_write_29109 isdn_ppp_write 4 29109 NULL
106826 +snprintf_29125 snprintf 0 29125 NULL
106827 +iov_shorten_29130 iov_shorten 0 29130 NULL
106828 +proc_scsi_write_29142 proc_scsi_write 3 29142 NULL
106829 +alloc_irqs_from_29152 alloc_irqs_from 1-2-0-3 29152 NULL
106830 +kvm_mmu_notifier_clear_flush_young_29154 kvm_mmu_notifier_clear_flush_young 3 29154 NULL
106831 +drm_property_create_enum_29201 drm_property_create_enum 5 29201 NULL
106832 +wusb_prf_256_29203 wusb_prf_256 7 29203 NULL
106833 +__mm_populate_29204 __mm_populate 1-2 29204 NULL
106834 +do_shrinker_shrink_29208 do_shrinker_shrink 0 29208 NULL
106835 +rds_iw_inc_copy_to_user_29214 rds_iw_inc_copy_to_user 3 29214 NULL
106836 +iwl_dbgfs_temperature_read_29224 iwl_dbgfs_temperature_read 3 29224 NULL
106837 +nvme_trans_copy_from_user_29227 nvme_trans_copy_from_user 3 29227 NULL
106838 +irq_domain_add_linear_29236 irq_domain_add_linear 2 29236 NULL
106839 +recover_peb_29238 recover_peb 0-7-6 29238 NULL
106840 +evdev_handle_get_val_29242 evdev_handle_get_val 5-6 29242 NULL
106841 +rw_verify_area_29243 rw_verify_area 0-4 29243 NULL
106842 +security_context_to_sid_core_29248 security_context_to_sid_core 2 29248 NULL
106843 +block_div_29268 block_div 0-1-2 29268 NULL
106844 +prism2_set_genericelement_29277 prism2_set_genericelement 3 29277 NULL
106845 +bitmap_ord_to_pos_29279 bitmap_ord_to_pos 3 29279 NULL
106846 +ext4_fiemap_29296 ext4_fiemap 4 29296 NULL
106847 +sn9c102_read_29305 sn9c102_read 3 29305 NULL
106848 +replace_file_extents_29312 replace_file_extents 0 29312 NULL
106849 +__fuse_get_req_29315 __fuse_get_req 2 29315 NULL
106850 +lprocfs_write_helper_29323 lprocfs_write_helper 2 29323 NULL
106851 +kvm_handle_hva_29326 kvm_handle_hva 2 29326 NULL
106852 +tun_put_user_29337 tun_put_user 5 29337 NULL
106853 +__alloc_ei_netdev_29338 __alloc_ei_netdev 1 29338 NULL
106854 +ide_read_altstatus_29343 ide_read_altstatus 0 29343 NULL
106855 +l2cap_sock_setsockopt_old_29346 l2cap_sock_setsockopt_old 4 29346 NULL
106856 +gpiochip_find_base_29366 gpiochip_find_base 0-1 29366 NULL
106857 +ktime_us_delta_29375 ktime_us_delta 0 29375 NULL
106858 +mwifiex_cfg80211_mgmt_tx_29387 mwifiex_cfg80211_mgmt_tx 7 29387 NULL
106859 +pca953x_irq_setup_29407 pca953x_irq_setup 3 29407 NULL
106860 +btrfs_run_delayed_items_29428 btrfs_run_delayed_items 0 29428 NULL
106861 +mempool_create_29437 mempool_create 1 29437 NULL
106862 +crypto_ahash_alignmask_29445 crypto_ahash_alignmask 0 29445 NULL
106863 +p9_client_prepare_req_29448 p9_client_prepare_req 3 29448 NULL
106864 +ept_page_fault_29450 ept_page_fault 2 29450 NULL
106865 +__kmalloc_node_29455 __kmalloc_node 3 29455 NULL
106866 +validate_scan_freqs_29462 validate_scan_freqs 0 29462 NULL
106867 +SyS_flistxattr_29474 SyS_flistxattr 3 29474 NULL
106868 +do_register_entry_29478 do_register_entry 4 29478 NULL
106869 +simple_strtoul_29480 simple_strtoul 0 29480 NULL
106870 +sched_clock_local_29498 sched_clock_local 0 29498 NULL
106871 +btmrvl_pscmd_write_29504 btmrvl_pscmd_write 3 29504 NULL
106872 +btrfs_file_extent_disk_bytenr_29505 btrfs_file_extent_disk_bytenr 0 29505 NULL
106873 +write_file_regidx_29517 write_file_regidx 3 29517 NULL
106874 +atk_debugfs_ggrp_read_29522 atk_debugfs_ggrp_read 3 29522 NULL
106875 +_regmap_raw_write_29541 _regmap_raw_write 2-4 29541 NULL
106876 +vfs_read_29543 vfs_read 0-3 29543 NULL
106877 +set_brk_29551 set_brk 1-2 29551 NULL nohasharray
106878 +ftrace_write_29551 ftrace_write 3 29551 &set_brk_29551
106879 +idetape_queue_rw_tail_29562 idetape_queue_rw_tail 3 29562 NULL
106880 +leaf_dealloc_29566 leaf_dealloc 3 29566 NULL
106881 +kvm_read_guest_virt_system_29569 kvm_read_guest_virt_system 4-2 29569 NULL
106882 +p9_fd_read_29570 p9_fd_read 3 29570 NULL
106883 +lbs_lowsnr_read_29571 lbs_lowsnr_read 3 29571 NULL
106884 +iwl_dbgfs_missed_beacon_write_29586 iwl_dbgfs_missed_beacon_write 3 29586 NULL
106885 +pvr2_hdw_report_unlocked_29589 pvr2_hdw_report_unlocked 4-0 29589 NULL
106886 +dio_set_defer_completion_29599 dio_set_defer_completion 0 29599 NULL
106887 +slots_per_page_29601 slots_per_page 0 29601 NULL
106888 +osc_cached_mb_seq_write_29610 osc_cached_mb_seq_write 3 29610 NULL
106889 +nla_get_u16_29624 nla_get_u16 0 29624 NULL
106890 +tx_frag_cache_hit_read_29639 tx_frag_cache_hit_read 3 29639 NULL
106891 +sctp_make_abort_user_29654 sctp_make_abort_user 3 29654 NULL
106892 +sisusb_write_mem_bulk_29678 sisusb_write_mem_bulk 4 29678 NULL
106893 +tracepoint_probe_register_29688 tracepoint_probe_register 0 29688 NULL
106894 +__btrfs_setxattr_29689 __btrfs_setxattr 0 29689 NULL
106895 +jbd2_journal_restart_29692 jbd2_journal_restart 0 29692 NULL
106896 +lustre_posix_acl_xattr_2ext_29693 lustre_posix_acl_xattr_2ext 2 29693 NULL
106897 +posix_acl_from_xattr_29708 posix_acl_from_xattr 3 29708 NULL
106898 +probes_write_29711 probes_write 3 29711 NULL
106899 +read_cis_cache_29735 read_cis_cache 4 29735 NULL
106900 +xfs_new_eof_29737 xfs_new_eof 2 29737 NULL
106901 +std_nic_write_29752 std_nic_write 3 29752 NULL
106902 +dbAlloc_29794 dbAlloc 0 29794 NULL
106903 +ext4_trim_all_free_29806 ext4_trim_all_free 4-3-2 29806 NULL
106904 +tcp_sendpage_29829 tcp_sendpage 4 29829 NULL
106905 +scan_bitmap_block_29840 scan_bitmap_block 4 29840 NULL
106906 +__probe_kernel_write_29842 __probe_kernel_write 3 29842 NULL
106907 +kvm_read_hva_atomic_29848 kvm_read_hva_atomic 3 29848 NULL
106908 +count_partial_29850 count_partial 0 29850 NULL
106909 +radeon_ttm_tt_create_29859 radeon_ttm_tt_create 2 29859 NULL
106910 +solo_enc_alloc_29860 solo_enc_alloc 3 29860 NULL
106911 +ipv6_setsockopt_29871 ipv6_setsockopt 5 29871 NULL
106912 +tlv_put_29872 tlv_put 0 29872 NULL
106913 +scsi_end_request_29876 scsi_end_request 3 29876 NULL
106914 +changed_extent_29881 changed_extent 0 29881 NULL
106915 +crypto_aead_alignmask_29885 crypto_aead_alignmask 0 29885 NULL
106916 +lov_ost_pool_extend_29914 lov_ost_pool_extend 2 29914 NULL
106917 +write_file_queue_29922 write_file_queue 3 29922 NULL
106918 +ext4_xattr_set_acl_29930 ext4_xattr_set_acl 4 29930 NULL
106919 +__btrfs_getxattr_29947 __btrfs_getxattr 0 29947 NULL nohasharray
106920 +ipv6_recv_error_29947 ipv6_recv_error 3 29947 &__btrfs_getxattr_29947
106921 +diva_os_get_context_size_29983 diva_os_get_context_size 0 29983 NULL
106922 +arch_setup_dmar_msi_29992 arch_setup_dmar_msi 1 29992 NULL
106923 +vmci_host_setup_notify_30002 vmci_host_setup_notify 2 30002 NULL
106924 +dev_mem_write_30028 dev_mem_write 3 30028 NULL
106925 +alloc_netdev_mqs_30030 alloc_netdev_mqs 1 30030 NULL
106926 +scsi_vpd_inquiry_30040 scsi_vpd_inquiry 4 30040 NULL
106927 +drp_wmove_30043 drp_wmove 4 30043 NULL nohasharray
106928 +wrmalt_30043 wrmalt 0 30043 &drp_wmove_30043
106929 +mem_cgroup_charge_common_30047 mem_cgroup_charge_common 0 30047 NULL
106930 +SyS_write_30059 SyS_write 3 30059 NULL
106931 +cxgbi_ddp_reserve_30091 cxgbi_ddp_reserve 4 30091 NULL
106932 +snd_midi_channel_init_set_30092 snd_midi_channel_init_set 1 30092 NULL
106933 +rx_filter_data_filter_read_30098 rx_filter_data_filter_read 3 30098 NULL
106934 +defragment_dma_buffer_30113 defragment_dma_buffer 0 30113 NULL
106935 +spi_async_locked_30117 spi_async_locked 0 30117 NULL
106936 +calgary_unmap_page_30130 calgary_unmap_page 3-2 30130 NULL
106937 +recv_stream_30138 recv_stream 4 30138 NULL
106938 +u_memcpya_30139 u_memcpya 3-2 30139 NULL
106939 +elfcorehdr_read_30159 elfcorehdr_read 2 30159 NULL
106940 +alloc_switch_ctx_30165 alloc_switch_ctx 2 30165 NULL
106941 +expand_inode_data_30169 expand_inode_data 2-3 30169 NULL
106942 +btrfs_start_transaction_lflush_30178 btrfs_start_transaction_lflush 2 30178 NULL
106943 +mempool_create_page_pool_30189 mempool_create_page_pool 1 30189 NULL
106944 +drm_property_create_bitmask_30195 drm_property_create_bitmask 5 30195 NULL
106945 +snd_pcm_playback_forward_30201 snd_pcm_playback_forward 0-2 30201 NULL
106946 +usblp_ioctl_30203 usblp_ioctl 2 30203 NULL
106947 +read_4k_modal_eeprom_30212 read_4k_modal_eeprom 3 30212 NULL
106948 +bitmap_file_set_bit_30228 bitmap_file_set_bit 2 30228 NULL
106949 +shmem_unuse_inode_30263 shmem_unuse_inode 0 30263 NULL
106950 +rawv6_recvmsg_30265 rawv6_recvmsg 4 30265 NULL
106951 +hfsplus_trusted_setxattr_30270 hfsplus_trusted_setxattr 4 30270 NULL
106952 +isr_pci_pm_read_30271 isr_pci_pm_read 3 30271 NULL
106953 +compat_readv_30273 compat_readv 3 30273 NULL
106954 +lapic_register_intr_30279 lapic_register_intr 1 30279 NULL
106955 +skcipher_sendmsg_30290 skcipher_sendmsg 4 30290 NULL
106956 +pipeline_sec_frag_swi_read_30294 pipeline_sec_frag_swi_read 3 30294 NULL
106957 +tcp_sendmsg_30296 tcp_sendmsg 4 30296 NULL
106958 +osc_contention_seconds_seq_write_30305 osc_contention_seconds_seq_write 3 30305 NULL
106959 +drm_core_get_reg_ofs_30309 drm_core_get_reg_ofs 0 30309 NULL
106960 +ext4_acl_from_disk_30320 ext4_acl_from_disk 2 30320 NULL
106961 +i8254_read_30330 i8254_read 0 30330 NULL
106962 +generic_ptrace_pokedata_30338 generic_ptrace_pokedata 2 30338 NULL
106963 +resource_from_user_30341 resource_from_user 3 30341 NULL
106964 +o2nm_this_node_30342 o2nm_this_node 0 30342 NULL
106965 +__vmalloc_node_flags_30352 __vmalloc_node_flags 1-2 30352 NULL
106966 +kstrtou32_from_user_30361 kstrtou32_from_user 2 30361 NULL
106967 +inet_getid_30365 inet_getid 2 30365 NULL
106968 +C_SYSC_readv_30369 C_SYSC_readv 3 30369 NULL
106969 +blkdev_issue_zeroout_30392 blkdev_issue_zeroout 3-0 30392 NULL
106970 +c4iw_init_resource_30393 c4iw_init_resource 2-3 30393 NULL
106971 +get_kernel_pages_30397 get_kernel_pages 0 30397 NULL
106972 +_drbd_bm_find_next_zero_30415 _drbd_bm_find_next_zero 2 30415 NULL
106973 +ext3_xattr_list_30419 ext3_xattr_list 3 30419 NULL
106974 +vb2_fop_write_30420 vb2_fop_write 3 30420 NULL
106975 +tx_tx_template_prepared_read_30424 tx_tx_template_prepared_read 3 30424 NULL
106976 +mq_create_30425 mq_create 1 30425 NULL nohasharray
106977 +lstcon_session_info_30425 lstcon_session_info 6 30425 &mq_create_30425
106978 +ext4_ext_create_new_leaf_30428 ext4_ext_create_new_leaf 0 30428 NULL
106979 +enable_write_30456 enable_write 3 30456 NULL
106980 +pci_resource_alignment_30457 pci_resource_alignment 0 30457 NULL
106981 +tx_tx_template_programmed_read_30461 tx_tx_template_programmed_read 3 30461 NULL
106982 +urandom_read_30462 urandom_read 3 30462 NULL
106983 +zoran_ioctl_30465 zoran_ioctl 2 30465 NULL
106984 +i2c_ctrl_read_30467 i2c_ctrl_read 0 30467 NULL
106985 +send_rmdir_30470 send_rmdir 0 30470 NULL
106986 +i915_mutex_lock_interruptible_30474 i915_mutex_lock_interruptible 0 30474 NULL nohasharray
106987 +ocrdma_reg_user_mr_30474 ocrdma_reg_user_mr 2-3 30474 &i915_mutex_lock_interruptible_30474
106988 +write_head_30481 write_head 4 30481 NULL
106989 +adu_write_30487 adu_write 3 30487 NULL
106990 +dtim_interval_write_30489 dtim_interval_write 3 30489 NULL
106991 +btrfs_free_extent_30515 btrfs_free_extent 0 30515 NULL
106992 +dwc3_testmode_write_30516 dwc3_testmode_write 3 30516 NULL
106993 +debug_debug2_read_30526 debug_debug2_read 3 30526 NULL nohasharray
106994 +set_config_30526 set_config 0 30526 &debug_debug2_read_30526
106995 +disk_expand_part_tbl_30561 disk_expand_part_tbl 2 30561 NULL
106996 +set_le_30581 set_le 4 30581 NULL
106997 +from_cblock_30582 from_cblock 0-1 30582 NULL
106998 +blk_init_tags_30592 blk_init_tags 1 30592 NULL
106999 +i2c_hid_get_report_length_30598 i2c_hid_get_report_length 0 30598 NULL
107000 +sgl_map_user_pages_30610 sgl_map_user_pages 2-3-4 30610 NULL
107001 +SyS_msgrcv_30611 SyS_msgrcv 3 30611 NULL
107002 +macvtap_sendmsg_30629 macvtap_sendmsg 4 30629 NULL
107003 +ieee80211_if_read_dot11MeshAwakeWindowDuration_30631 ieee80211_if_read_dot11MeshAwakeWindowDuration 3 30631 NULL
107004 +compat_raw_setsockopt_30634 compat_raw_setsockopt 5 30634 NULL
107005 +mlx5_ib_alloc_fast_reg_page_list_30638 mlx5_ib_alloc_fast_reg_page_list 2 30638 NULL
107006 +SyS_listxattr_30647 SyS_listxattr 3 30647 NULL
107007 +agp_remap_30665 agp_remap 2 30665 NULL
107008 +jffs2_flash_read_30667 jffs2_flash_read 0 30667 NULL
107009 +ni_ai_fifo_read_30681 ni_ai_fifo_read 3 30681 NULL
107010 +dccp_setsockopt_ccid_30701 dccp_setsockopt_ccid 4 30701 NULL
107011 +lbs_wrbbp_write_30712 lbs_wrbbp_write 3 30712 NULL
107012 +ocfs2_find_cpos_for_left_leaf_30713 ocfs2_find_cpos_for_left_leaf 0 30713 NULL
107013 +__mutex_lock_common_30717 __mutex_lock_common 0 30717 NULL
107014 +lbs_debugfs_read_30721 lbs_debugfs_read 3 30721 NULL
107015 +snd_nm256_playback_silence_30727 snd_nm256_playback_silence 4-3 30727 NULL
107016 +snapshot_status_30744 snapshot_status 5 30744 NULL
107017 +fuse_conn_limit_write_30777 fuse_conn_limit_write 3 30777 NULL
107018 +SyS_pread64_30778 SyS_pread64 3 30778 NULL
107019 +btrfs_run_ordered_operations_30793 btrfs_run_ordered_operations 0 30793 NULL
107020 +smk_read_doi_30813 smk_read_doi 3 30813 NULL
107021 +SYSC_splice_30820 SYSC_splice 5 30820 NULL
107022 +xlog_grant_head_wait_30829 xlog_grant_head_wait 4 30829 NULL
107023 +get_kobj_path_length_30831 get_kobj_path_length 0 30831 NULL
107024 +sctp_setsockopt_auth_chunk_30843 sctp_setsockopt_auth_chunk 3 30843 NULL
107025 +cfg80211_rx_mgmt_30844 cfg80211_rx_mgmt 5 30844 NULL
107026 +wd_autoreset_write_30862 wd_autoreset_write 3 30862 NULL
107027 +ieee80211_if_fmt_dropped_frames_no_route_30884 ieee80211_if_fmt_dropped_frames_no_route 3 30884 NULL
107028 +pn_recvmsg_30887 pn_recvmsg 4 30887 NULL
107029 +sctp_setsockopt_rtoinfo_30941 sctp_setsockopt_rtoinfo 3 30941 NULL
107030 +find_free_dev_extent_30963 find_free_dev_extent 0 30963 NULL
107031 +tty_insert_flip_string_flags_30969 tty_insert_flip_string_flags 4 30969 NULL
107032 +huge_page_mask_30981 huge_page_mask 0 30981 NULL
107033 +read_file_bt_ant_diversity_30983 read_file_bt_ant_diversity 3 30983 NULL
107034 +lbs_host_sleep_read_31013 lbs_host_sleep_read 3 31013 NULL
107035 +do_setup_msi_irqs_31043 do_setup_msi_irqs 2 31043 NULL
107036 +stride_pg_count_31053 stride_pg_count 0-2-1-4-3-5 31053 NULL
107037 +lbs_failcount_read_31063 lbs_failcount_read 3 31063 NULL
107038 +find_next_bit_le_31064 find_next_bit_le 0-2-3 31064 NULL
107039 +sctp_setsockopt_context_31091 sctp_setsockopt_context 3 31091 NULL
107040 +proc_gid_map_write_31093 proc_gid_map_write 3 31093 NULL
107041 +compat_sys_get_mempolicy_31109 compat_sys_get_mempolicy 3 31109 NULL
107042 +si_calculate_power_efficiency_ratio_31111 si_calculate_power_efficiency_ratio 3-2 31111 NULL
107043 +depth_read_31112 depth_read 3 31112 NULL
107044 +kimage_normal_alloc_31140 kimage_normal_alloc 3 31140 NULL
107045 +size_inside_page_31141 size_inside_page 0-1-2 31141 NULL
107046 +w9966_v4l_read_31148 w9966_v4l_read 3 31148 NULL
107047 +ch_do_scsi_31171 ch_do_scsi 4 31171 NULL
107048 +r592_read_fifo_pio_31198 r592_read_fifo_pio 3 31198 NULL
107049 +mtdchar_readoob_31200 mtdchar_readoob 4 31200 NULL
107050 +__btrfs_free_reserved_extent_31207 __btrfs_free_reserved_extent 2 31207 NULL
107051 +kvm_mmu_page_fault_31213 kvm_mmu_page_fault 2 31213 NULL
107052 +cpumask_weight_31215 cpumask_weight 0 31215 NULL
107053 +__read_reg_31216 __read_reg 0 31216 NULL
107054 +atm_get_addr_31221 atm_get_addr 3 31221 NULL
107055 +ulist_rbtree_insert_31235 ulist_rbtree_insert 0 31235 NULL
107056 +tcp_recvmsg_31238 tcp_recvmsg 4 31238 NULL
107057 +cyy_readb_31240 cyy_readb 0 31240 NULL
107058 +_create_sg_bios_31244 _create_sg_bios 4 31244 NULL
107059 +ieee80211_if_read_last_beacon_31257 ieee80211_if_read_last_beacon 3 31257 NULL
107060 +sctp_tsnmap_find_gap_ack_31272 sctp_tsnmap_find_gap_ack 3-2 31272 NULL
107061 +uvc_simplify_fraction_31303 uvc_simplify_fraction 3 31303 NULL
107062 +push_leaf_left_31306 push_leaf_left 0 31306 NULL
107063 +sisusbcon_scroll_31315 sisusbcon_scroll 5-2-3 31315 NULL
107064 +command_file_write_31318 command_file_write 3 31318 NULL
107065 +ext4_xattr_block_list_31325 ext4_xattr_block_list 3 31325 NULL
107066 +hwerr_crcbits_31334 hwerr_crcbits 4 31334 NULL
107067 +radix_tree_insert_31336 radix_tree_insert 0 31336 NULL
107068 +em28xx_init_usb_xfer_31337 em28xx_init_usb_xfer 4-6 31337 NULL
107069 +__cpu_to_node_31345 __cpu_to_node 0 31345 NULL
107070 +outlen_write_31358 outlen_write 3 31358 NULL
107071 +ieee80211_rx_mgmt_auth_31366 ieee80211_rx_mgmt_auth 3 31366 NULL
107072 +xprt_rdma_allocate_31372 xprt_rdma_allocate 2 31372 NULL
107073 +vb2_vmalloc_get_userptr_31374 vb2_vmalloc_get_userptr 2-3 31374 NULL
107074 +trace_parser_get_init_31379 trace_parser_get_init 2 31379 NULL
107075 +inb_31388 inb 0 31388 NULL
107076 +key_ifindex_read_31411 key_ifindex_read 3 31411 NULL
107077 +i915_gem_object_put_fence_31413 i915_gem_object_put_fence 0 31413 NULL
107078 +_sp2d_max_pg_31422 _sp2d_max_pg 0 31422 NULL
107079 +TSS_checkhmac1_31429 TSS_checkhmac1 5 31429 NULL
107080 +snd_aw2_saa7146_get_hw_ptr_capture_31431 snd_aw2_saa7146_get_hw_ptr_capture 0 31431 NULL
107081 +acpi_sci_ioapic_setup_31445 acpi_sci_ioapic_setup 4 31445 NULL
107082 +transport_alloc_session_tags_31449 transport_alloc_session_tags 2-3 31449 NULL
107083 +opera1_xilinx_rw_31453 opera1_xilinx_rw 5 31453 NULL
107084 +register_ftrace_graph_31456 register_ftrace_graph 0 31456 NULL
107085 +input_get_new_minor_31464 input_get_new_minor 1 31464 NULL
107086 +do_fcntl_31468 do_fcntl 3 31468 NULL
107087 +xfs_btree_get_numrecs_31477 xfs_btree_get_numrecs 0 31477 NULL
107088 +__ext4_journal_get_write_access_31482 __ext4_journal_get_write_access 0 31482 NULL
107089 +alg_setkey_31485 alg_setkey 3 31485 NULL
107090 +rds_message_map_pages_31487 rds_message_map_pages 2 31487 NULL
107091 +qsfp_2_read_31491 qsfp_2_read 3 31491 NULL
107092 +__alloc_bootmem_31498 __alloc_bootmem 1 31498 NULL
107093 +nouveau_mc_create__31513 nouveau_mc_create_ 5 31513 NULL
107094 +hidraw_write_31536 hidraw_write 3 31536 NULL
107095 +mtd_div_by_eb_31543 mtd_div_by_eb 0-1 31543 NULL
107096 +usbvision_read_31555 usbvision_read 3 31555 NULL
107097 +tx_frag_tkip_called_read_31575 tx_frag_tkip_called_read 3 31575 NULL
107098 +get_max_inline_xattr_value_size_31578 get_max_inline_xattr_value_size 0 31578 NULL
107099 +osst_write_31581 osst_write 3 31581 NULL
107100 +snd_compr_get_avail_31584 snd_compr_get_avail 0 31584 NULL
107101 +iwl_dbgfs_ucode_tx_stats_read_31611 iwl_dbgfs_ucode_tx_stats_read 3 31611 NULL
107102 +mtd_get_user_prot_info_31616 mtd_get_user_prot_info 0 31616 NULL
107103 +arvo_sysfs_read_31617 arvo_sysfs_read 6 31617 NULL
107104 +videobuf_read_one_31637 videobuf_read_one 3 31637 NULL
107105 +pod_alloc_sysex_buffer_31651 pod_alloc_sysex_buffer 3 31651 NULL
107106 +xfer_secondary_pool_31661 xfer_secondary_pool 2 31661 NULL
107107 +emulator_set_cr_31665 emulator_set_cr 3 31665 NULL
107108 +__lgread_31668 __lgread 4 31668 NULL
107109 +forced_ps_read_31685 forced_ps_read 3 31685 NULL
107110 +fst_recover_rx_error_31687 fst_recover_rx_error 3 31687 NULL
107111 +reiserfs_in_journal_31689 reiserfs_in_journal 3 31689 NULL
107112 +gfn_to_hva_read_31728 gfn_to_hva_read 2 31728 NULL
107113 +utf16s_to_utf8s_31735 utf16s_to_utf8s 0 31735 NULL nohasharray
107114 +lu_buf_check_and_grow_31735 lu_buf_check_and_grow 2 31735 &utf16s_to_utf8s_31735
107115 +shmem_pwrite_slow_31741 shmem_pwrite_slow 3-2 31741 NULL
107116 +NCR_700_change_queue_depth_31742 NCR_700_change_queue_depth 2 31742 NULL nohasharray
107117 +input_abs_get_max_31742 input_abs_get_max 0 31742 &NCR_700_change_queue_depth_31742
107118 +muldiv64_31743 muldiv64 3-2-0 31743 NULL
107119 +stmpe_set_altfunc_31750 stmpe_set_altfunc 2 31750 NULL nohasharray
107120 +bcm_char_read_31750 bcm_char_read 3 31750 &stmpe_set_altfunc_31750
107121 +snd_seq_device_new_31753 snd_seq_device_new 4 31753 NULL
107122 +SyS_lsetxattr_31766 SyS_lsetxattr 4 31766 NULL
107123 +usblp_cache_device_id_string_31790 usblp_cache_device_id_string 0 31790 NULL
107124 +ecryptfs_send_message_locked_31801 ecryptfs_send_message_locked 2 31801 NULL
107125 +isr_rx_procs_read_31804 isr_rx_procs_read 3 31804 NULL
107126 +data_write_31805 data_write 3 31805 NULL
107127 +SyS_msgsnd_31814 SyS_msgsnd 3 31814 NULL
107128 +strnlen_user_31815 strnlen_user 0-2 31815 NULL
107129 +sta_last_signal_read_31818 sta_last_signal_read 3 31818 NULL
107130 +fsnotify_perm_31843 fsnotify_perm 0 31843 NULL
107131 +SyS_ppoll_31855 SyS_ppoll 2 31855 NULL
107132 +iwl_dbgfs_disable_ht40_write_31876 iwl_dbgfs_disable_ht40_write 3 31876 NULL
107133 +drm_mode_crtc_set_gamma_size_31881 drm_mode_crtc_set_gamma_size 2 31881 NULL
107134 +ddb_output_write_31902 ddb_output_write 3-0 31902 NULL
107135 +xattr_permission_31907 xattr_permission 0 31907 NULL
107136 +lu_buf_realloc_31915 lu_buf_realloc 2 31915 NULL
107137 +new_dir_31919 new_dir 3 31919 NULL
107138 +kmem_alloc_31920 kmem_alloc 1 31920 NULL
107139 +guestwidth_to_adjustwidth_31937 guestwidth_to_adjustwidth 0-1 31937 NULL
107140 +process_recorded_refs_if_needed_31938 process_recorded_refs_if_needed 0 31938 NULL
107141 +SYSC_sethostname_31940 SYSC_sethostname 2 31940 NULL
107142 +iov_iter_copy_from_user_31942 iov_iter_copy_from_user 4-0 31942 NULL nohasharray
107143 +read_mem_31942 read_mem 3 31942 &iov_iter_copy_from_user_31942
107144 +vb2_write_31948 vb2_write 3 31948 NULL
107145 +pvr2_ctrl_get_valname_31951 pvr2_ctrl_get_valname 4 31951 NULL
107146 +regcache_rbtree_sync_31964 regcache_rbtree_sync 2 31964 NULL
107147 +copy_from_user_toio_31966 copy_from_user_toio 3 31966 NULL
107148 +mtd_add_partition_31971 mtd_add_partition 3 31971 NULL
107149 +btrfs_insert_empty_inode_31975 btrfs_insert_empty_inode 0 31975 NULL
107150 +vx_read_status_31982 vx_read_status 0 31982 NULL nohasharray
107151 +iblock_execute_rw_31982 iblock_execute_rw 3 31982 &vx_read_status_31982
107152 +find_next_zero_bit_31990 find_next_zero_bit 3-2-0 31990 NULL
107153 +default_setup_hpet_msi_31991 default_setup_hpet_msi 1 31991 NULL
107154 +lustre_acl_xattr_merge2posix_31992 lustre_acl_xattr_merge2posix 2 31992 NULL
107155 +sysfs_create_file_31996 sysfs_create_file 0 31996 NULL
107156 +tps6586x_irq_map_32002 tps6586x_irq_map 2 32002 NULL
107157 +calc_hmac_32010 calc_hmac 3 32010 NULL
107158 +vmcs_read64_32012 vmcs_read64 0 32012 NULL
107159 +resource_alignment_32020 resource_alignment 0 32020 NULL
107160 +aead_len_32021 aead_len 0 32021 NULL
107161 +ocfs2_remove_extent_32032 ocfs2_remove_extent 4-3-0 32032 NULL
107162 +posix_acl_set_32037 posix_acl_set 4 32037 NULL
107163 +stk_read_32038 stk_read 3 32038 NULL
107164 +vmw_cursor_update_dmabuf_32045 vmw_cursor_update_dmabuf 3-4 32045 NULL
107165 +ocfs2_update_edge_lengths_32046 ocfs2_update_edge_lengths 0 32046 NULL
107166 +SYSC_llistxattr_32061 SYSC_llistxattr 3 32061 NULL
107167 +proc_scsi_devinfo_write_32064 proc_scsi_devinfo_write 3 32064 NULL
107168 +cow_file_range_inline_32091 cow_file_range_inline 3 32091 NULL
107169 +bio_alloc_32095 bio_alloc 2 32095 NULL
107170 +alloc_pwms_32100 alloc_pwms 1-2 32100 NULL
107171 +ath6kl_fwlog_read_32101 ath6kl_fwlog_read 3 32101 NULL
107172 +disk_status_32120 disk_status 4 32120 NULL
107173 +kobject_add_internal_32133 kobject_add_internal 0 32133 NULL
107174 +btrfs_split_item_32164 btrfs_split_item 0 32164 NULL
107175 +venus_link_32165 venus_link 5 32165 NULL
107176 +do_writepages_32173 do_writepages 0 32173 NULL nohasharray
107177 +ntfs_rl_realloc_nofail_32173 ntfs_rl_realloc_nofail 3 32173 &do_writepages_32173
107178 +load_header_32183 load_header 0 32183 NULL
107179 +ubi_wl_scrub_peb_32196 ubi_wl_scrub_peb 0 32196 NULL
107180 +wusb_ccm_mac_32199 wusb_ccm_mac 7 32199 NULL
107181 +__mem_cgroup_try_charge_swapin_32204 __mem_cgroup_try_charge_swapin 0 32204 NULL
107182 +riva_get_cmap_len_32218 riva_get_cmap_len 0 32218 NULL
107183 +caif_seqpkt_recvmsg_32241 caif_seqpkt_recvmsg 4 32241 NULL
107184 +lbs_lowrssi_read_32242 lbs_lowrssi_read 3 32242 NULL
107185 +ocfs2_xattr_find_entry_32260 ocfs2_xattr_find_entry 0 32260 NULL
107186 +vmalloc_user_32308 vmalloc_user 1 32308 NULL
107187 +kvm_set_spte_hva_32312 kvm_set_spte_hva 2 32312 NULL
107188 +cas_calc_tabort_32316 cas_calc_tabort 0 32316 NULL
107189 +SyS_select_32319 SyS_select 1 32319 NULL
107190 +nouveau_bar_create__32332 nouveau_bar_create_ 4 32332 NULL
107191 +nl80211_send_mlme_event_32337 nl80211_send_mlme_event 4 32337 NULL
107192 +apic_get_tmcct_32338 apic_get_tmcct 0 32338 NULL
107193 +t4_alloc_mem_32342 t4_alloc_mem 1 32342 NULL
107194 +dispatch_ioctl_32357 dispatch_ioctl 2 32357 NULL nohasharray
107195 +rx_streaming_always_write_32357 rx_streaming_always_write 3 32357 &dispatch_ioctl_32357
107196 +sel_read_initcon_32362 sel_read_initcon 3 32362 NULL nohasharray
107197 +ReadHDLCPCI_32362 ReadHDLCPCI 0 32362 &sel_read_initcon_32362
107198 +__wait_seqno_32370 __wait_seqno 0 32370 NULL
107199 +_drbd_bm_find_next_32372 _drbd_bm_find_next 2 32372 NULL
107200 +cpuset_slab_spread_node_32376 cpuset_slab_spread_node 0 32376 NULL
107201 +intel_iommu_map_32384 intel_iommu_map 4-3 32384 NULL
107202 +local_clock_32385 local_clock 0 32385 NULL
107203 +ocfs2_cancel_convert_32392 ocfs2_cancel_convert 0 32392 NULL
107204 +ll_setxattr_common_32398 ll_setxattr_common 4 32398 NULL
107205 +xfs_iext_add_indirect_multi_32400 xfs_iext_add_indirect_multi 3 32400 NULL
107206 +__add_missing_keys_32402 __add_missing_keys 0 32402 NULL
107207 +vmci_qp_alloc_32405 vmci_qp_alloc 5-3 32405 NULL
107208 +regmap_irq_map_32429 regmap_irq_map 2 32429 NULL
107209 +break_ksm_32439 break_ksm 0 32439 NULL
107210 +__ext4_handle_dirty_super_32458 __ext4_handle_dirty_super 0 32458 NULL
107211 +snd_pcm_sync_ptr_32461 snd_pcm_sync_ptr 0 32461 NULL
107212 +cache_status_32462 cache_status 5 32462 NULL
107213 +fill_readbuf_32464 fill_readbuf 3 32464 NULL
107214 +dgap_usertoboard_32490 dgap_usertoboard 4 32490 NULL
107215 +ide_driver_proc_write_32493 ide_driver_proc_write 3 32493 NULL
107216 +bypass_pwoff_write_32499 bypass_pwoff_write 3 32499 NULL
107217 +mdc_pinger_recov_seq_write_32510 mdc_pinger_recov_seq_write 3 32510 NULL
107218 +ctrl_std_val_to_sym_32516 ctrl_std_val_to_sym 5 32516 NULL
107219 +ocfs2_local_alloc_reserve_for_window_32518 ocfs2_local_alloc_reserve_for_window 0 32518 NULL
107220 +disconnect_32521 disconnect 4 32521 NULL
107221 +qsfp_read_32522 qsfp_read 0-2-4 32522 NULL
107222 +audio_get_intf_req_32524 audio_get_intf_req 0 32524 NULL nohasharray
107223 +ocfs2_refresh_qinfo_32524 ocfs2_refresh_qinfo 0 32524 &audio_get_intf_req_32524
107224 +ilo_read_32531 ilo_read 3 32531 NULL
107225 +ieee80211_if_read_estab_plinks_32533 ieee80211_if_read_estab_plinks 3 32533 NULL
107226 +format_devstat_counter_32550 format_devstat_counter 3 32550 NULL
107227 +__first_node_32558 __first_node 0 32558 NULL
107228 +aes_encrypt_fail_read_32562 aes_encrypt_fail_read 3 32562 NULL
107229 +osc_iocontrol_32565 osc_iocontrol 3 32565 NULL
107230 +mem_swapout_entry_32586 mem_swapout_entry 3 32586 NULL
107231 +pipeline_tcp_tx_stat_fifo_int_read_32589 pipeline_tcp_tx_stat_fifo_int_read 3 32589 NULL
107232 +read_file_beacon_32595 read_file_beacon 3 32595 NULL
107233 +ieee80211_if_read_dropped_frames_congestion_32603 ieee80211_if_read_dropped_frames_congestion 3 32603 NULL
107234 +irda_recvmsg_dgram_32631 irda_recvmsg_dgram 4 32631 NULL
107235 +cfg80211_roamed_32632 cfg80211_roamed 5-7 32632 NULL
107236 +ite_decode_bytes_32642 ite_decode_bytes 3 32642 NULL
107237 +kvmalloc_32646 kvmalloc 1 32646 NULL
107238 +ib_sg_dma_len_32649 ib_sg_dma_len 0 32649 NULL
107239 +generic_readlink_32654 generic_readlink 3 32654 NULL nohasharray
107240 +ftrace_startup_32654 ftrace_startup 0 32654 &generic_readlink_32654
107241 +get_unaligned_be24_32667 get_unaligned_be24 0 32667 NULL
107242 +move_addr_to_kernel_32673 move_addr_to_kernel 2 32673 NULL
107243 +apei_res_add_32674 apei_res_add 0 32674 NULL
107244 +jfs_readpages_32702 jfs_readpages 4 32702 NULL
107245 +rt2x00debug_read_queue_dump_32712 rt2x00debug_read_queue_dump 3 32712 NULL
107246 +i40e_pci_sriov_enable_32742 i40e_pci_sriov_enable 2 32742 NULL
107247 +get_arg_page_32746 get_arg_page 2 32746 NULL
107248 +megasas_change_queue_depth_32747 megasas_change_queue_depth 2 32747 NULL
107249 +stats_read_ul_32751 stats_read_ul 3 32751 NULL
107250 +begin_cmd_32766 begin_cmd 0 32766 NULL
107251 +vmci_transport_dgram_dequeue_32775 vmci_transport_dgram_dequeue 4 32775 NULL
107252 +sctp_tsnmap_grow_32784 sctp_tsnmap_grow 2 32784 NULL
107253 +ocfs2_read_inode_block_full_32790 ocfs2_read_inode_block_full 0 32790 NULL
107254 +rproc_name_read_32805 rproc_name_read 3 32805 NULL
107255 +new_tape_buffer_32866 new_tape_buffer 2 32866 NULL
107256 +io_apic_setup_irq_pin_32868 io_apic_setup_irq_pin 1-2 32868 NULL
107257 +ath6kl_usb_submit_ctrl_in_32880 ath6kl_usb_submit_ctrl_in 6 32880 NULL nohasharray
107258 +cifs_writedata_alloc_32880 cifs_writedata_alloc 1 32880 &ath6kl_usb_submit_ctrl_in_32880
107259 +vp702x_usb_inout_cmd_32884 vp702x_usb_inout_cmd 6-4 32884 NULL
107260 +ext4_get_group_number_32899 ext4_get_group_number 0-2 32899 NULL
107261 +il_dbgfs_tx_stats_read_32913 il_dbgfs_tx_stats_read 3 32913 NULL
107262 +zlib_inflate_workspacesize_32927 zlib_inflate_workspacesize 0 32927 NULL
107263 +rmap_recycle_32938 rmap_recycle 3 32938 NULL
107264 +irq_reserve_irqs_32946 irq_reserve_irqs 1-2 32946 NULL
107265 +ext4_valid_block_bitmap_32958 ext4_valid_block_bitmap 3 32958 NULL
107266 +xfs_log_reserve_32959 xfs_log_reserve 2 32959 NULL
107267 +ext4_group_overhead_blocks_32971 ext4_group_overhead_blocks 0 32971 NULL
107268 +arch_ptrace_32981 arch_ptrace 3 32981 NULL
107269 +compat_filldir_32999 compat_filldir 3 32999 NULL
107270 +btrfs_lookup_extent_info_33000 btrfs_lookup_extent_info 0 33000 NULL
107271 +ext3_alloc_blocks_33007 ext3_alloc_blocks 3-0 33007 NULL nohasharray
107272 +SyS_syslog_33007 SyS_syslog 3 33007 &ext3_alloc_blocks_33007
107273 +br_multicast_set_hash_max_33012 br_multicast_set_hash_max 2 33012 NULL
107274 +write_file_bt_ant_diversity_33019 write_file_bt_ant_diversity 3 33019 NULL
107275 +snd_pcm_prepare_33036 snd_pcm_prepare 0 33036 NULL
107276 +SYSC_lgetxattr_33049 SYSC_lgetxattr 4 33049 NULL
107277 +pipeline_dec_packet_in_fifo_full_read_33052 pipeline_dec_packet_in_fifo_full_read 3 33052 NULL
107278 +ebt_compat_match_offset_33053 ebt_compat_match_offset 0-2 33053 NULL
107279 +bitmap_resize_33054 bitmap_resize 2-3 33054 NULL
107280 +intel_ring_flush_all_caches_33059 intel_ring_flush_all_caches 0 33059 NULL
107281 +stats_dot11RTSSuccessCount_read_33065 stats_dot11RTSSuccessCount_read 3 33065 NULL
107282 +sel_read_checkreqprot_33068 sel_read_checkreqprot 3 33068 NULL
107283 +alloc_tio_33077 alloc_tio 3 33077 NULL
107284 +acl_permission_check_33083 acl_permission_check 0 33083 NULL
107285 +write_node_33121 write_node 4 33121 NULL
107286 +fb_sys_write_33130 fb_sys_write 3 33130 NULL
107287 +__len_within_target_33132 __len_within_target 0 33132 NULL
107288 +SyS_poll_33152 SyS_poll 2 33152 NULL
107289 +debug_debug6_read_33168 debug_debug6_read 3 33168 NULL
107290 +dataflash_read_fact_otp_33204 dataflash_read_fact_otp 3-2 33204 NULL
107291 +pp_read_33210 pp_read 3 33210 NULL
107292 +xfs_file_aio_write_33234 xfs_file_aio_write 4 33234 NULL nohasharray
107293 +i915_gem_object_wait_rendering__tail_33234 i915_gem_object_wait_rendering__tail 0 33234 &xfs_file_aio_write_33234
107294 +__vb2_wait_for_done_vb_33246 __vb2_wait_for_done_vb 0 33246 NULL
107295 +snd_pcm_plug_client_size_33267 snd_pcm_plug_client_size 0-2 33267 NULL
107296 +cachefiles_cook_key_33274 cachefiles_cook_key 2 33274 NULL
107297 +sync_pt_create_33282 sync_pt_create 2 33282 NULL
107298 +btrfs_delete_one_dir_name_33303 btrfs_delete_one_dir_name 0 33303 NULL
107299 +mcs7830_get_reg_33308 mcs7830_get_reg 3 33308 NULL
107300 +isku_sysfs_read_keys_easyzone_33318 isku_sysfs_read_keys_easyzone 6 33318 NULL
107301 +vx_send_irq_dsp_33329 vx_send_irq_dsp 0 33329 NULL
107302 +joydev_ioctl_33343 joydev_ioctl 2 33343 NULL
107303 +lov_stripesize_seq_write_33353 lov_stripesize_seq_write 3 33353 NULL
107304 +create_xattr_datum_33356 create_xattr_datum 5 33356 NULL nohasharray
107305 +irq_pkt_threshold_read_33356 irq_pkt_threshold_read 3 33356 &create_xattr_datum_33356
107306 +read_file_regidx_33370 read_file_regidx 3 33370 NULL
107307 +ocfs2_quota_read_33382 ocfs2_quota_read 5 33382 NULL
107308 +ieee80211_if_read_dropped_frames_no_route_33383 ieee80211_if_read_dropped_frames_no_route 3 33383 NULL
107309 +scsi_varlen_cdb_length_33385 scsi_varlen_cdb_length 0 33385 NULL
107310 +tg_get_cfs_period_33390 tg_get_cfs_period 0 33390 NULL
107311 +ocfs2_allocate_unwritten_extents_33394 ocfs2_allocate_unwritten_extents 3-2 33394 NULL
107312 +cfs_trace_copyin_string_33396 cfs_trace_copyin_string 4 33396 NULL
107313 +ext4_meta_bg_first_block_no_33408 ext4_meta_bg_first_block_no 2 33408 NULL nohasharray
107314 +snd_pcm_capture_ioctl1_33408 snd_pcm_capture_ioctl1 0 33408 &ext4_meta_bg_first_block_no_33408
107315 +ufs_getfrag_block_33409 ufs_getfrag_block 2 33409 NULL
107316 +filemap_fdatawrite_33415 filemap_fdatawrite 0 33415 NULL
107317 +dis_tap_write_33426 dis_tap_write 3 33426 NULL
107318 +ubh_scanc_33436 ubh_scanc 0-3-4 33436 NULL
107319 +message_stats_list_33440 message_stats_list 5 33440 NULL
107320 +ovs_vport_alloc_33475 ovs_vport_alloc 1 33475 NULL
107321 +create_entry_33479 create_entry 2 33479 NULL
107322 +ip_setsockopt_33487 ip_setsockopt 5 33487 NULL nohasharray
107323 +elf_map_33487 elf_map 0-2 33487 &ip_setsockopt_33487
107324 +ol_dqblk_chunk_off_33489 ol_dqblk_chunk_off 2 33489 NULL
107325 +res_counter_read_33499 res_counter_read 4 33499 NULL
107326 +fb_read_33506 fb_read 3 33506 NULL
107327 +musb_test_mode_write_33518 musb_test_mode_write 3 33518 NULL
107328 +ahash_setkey_unaligned_33521 ahash_setkey_unaligned 3 33521 NULL
107329 +nes_alloc_fast_reg_page_list_33523 nes_alloc_fast_reg_page_list 2 33523 NULL
107330 +aggr_size_rx_size_read_33526 aggr_size_rx_size_read 3 33526 NULL
107331 +acpi_gsi_to_irq_33533 acpi_gsi_to_irq 1 33533 NULL
107332 +osc_max_rpcs_in_flight_seq_write_33539 osc_max_rpcs_in_flight_seq_write 3 33539 NULL nohasharray
107333 +tomoyo_read_self_33539 tomoyo_read_self 3 33539 &osc_max_rpcs_in_flight_seq_write_33539
107334 +read_symlink_33572 read_symlink 0 33572 NULL
107335 +count_subheaders_33591 count_subheaders 0 33591 NULL
107336 +scsi_execute_33596 scsi_execute 5 33596 NULL
107337 +comedi_buf_write_n_allocated_33604 comedi_buf_write_n_allocated 0 33604 NULL
107338 +xt_compat_target_offset_33608 xt_compat_target_offset 0 33608 NULL
107339 +usb_gstrings_attach_33615 usb_gstrings_attach 3 33615 NULL nohasharray
107340 +il_dbgfs_qos_read_33615 il_dbgfs_qos_read 3 33615 &usb_gstrings_attach_33615
107341 +do_sync_write_33624 do_sync_write 0 33624 NULL
107342 +stride_page_count_33641 stride_page_count 2 33641 NULL
107343 +slab_alloc_node_33663 slab_alloc_node 3 33663 NULL
107344 +irq_blk_threshold_read_33666 irq_blk_threshold_read 3 33666 NULL
107345 +inw_p_33668 inw_p 0 33668 NULL
107346 +arp_hdr_len_33671 arp_hdr_len 0 33671 NULL
107347 +i2c_hid_alloc_buffers_33673 i2c_hid_alloc_buffers 2 33673 NULL
107348 +nv50_disp_dmac_create__33696 nv50_disp_dmac_create_ 6 33696 NULL
107349 +netlink_sendmsg_33708 netlink_sendmsg 4 33708 NULL
107350 +tipc_link_stats_33716 tipc_link_stats 3 33716 NULL
107351 +ext4_wb_update_i_disksize_33717 ext4_wb_update_i_disksize 2 33717 NULL
107352 +pvr2_stream_buffer_count_33719 pvr2_stream_buffer_count 2 33719 NULL
107353 +ocfs2_extent_map_get_blocks_33720 ocfs2_extent_map_get_blocks 2 33720 NULL
107354 +write_file_spectral_count_33723 write_file_spectral_count 3 33723 NULL nohasharray
107355 +ocfs2_lock_allocators_move_extents_33723 ocfs2_lock_allocators_move_extents 0 33723 &write_file_spectral_count_33723
107356 +__mutex_lock_interruptible_slowpath_33735 __mutex_lock_interruptible_slowpath 0 33735 NULL
107357 +do_munmap_33752 do_munmap 0 33752 NULL
107358 +vifs_state_read_33762 vifs_state_read 3 33762 NULL
107359 +hashtab_create_33769 hashtab_create 3 33769 NULL
107360 +btrfs_delayed_refs_qgroup_accounting_33775 btrfs_delayed_refs_qgroup_accounting 0 33775 NULL
107361 +irq_map_generic_chip_33793 irq_map_generic_chip 2 33793 NULL
107362 +if_sdio_read_rx_len_33800 if_sdio_read_rx_len 0 33800 NULL
107363 +find_next_offset_33804 find_next_offset 3-0 33804 NULL
107364 +filter_write_33819 filter_write 3 33819 NULL
107365 +sep_create_msgarea_context_33829 sep_create_msgarea_context 4 33829 NULL
107366 +scrub_setup_recheck_block_33831 scrub_setup_recheck_block 5-4 33831 NULL
107367 +ext4_journal_extend_33835 ext4_journal_extend 2-0 33835 NULL
107368 +snd_pcm_action_nonatomic_33844 snd_pcm_action_nonatomic 0 33844 NULL
107369 +calgary_alloc_coherent_33851 calgary_alloc_coherent 2 33851 NULL
107370 +oz_cdev_write_33852 oz_cdev_write 3 33852 NULL
107371 +bin_string_33884 bin_string 3-5 33884 NULL
107372 +get_user_pages_33908 get_user_pages 0-3-4 33908 NULL
107373 +ath6kl_roam_mode_write_33912 ath6kl_roam_mode_write 3 33912 NULL
107374 +queue_logical_block_size_33918 queue_logical_block_size 0 33918 NULL
107375 +sel_read_avc_cache_threshold_33942 sel_read_avc_cache_threshold 3 33942 NULL
107376 +lpfc_idiag_ctlacc_read_33943 lpfc_idiag_ctlacc_read 3 33943 NULL
107377 +read_file_tgt_rx_stats_33944 read_file_tgt_rx_stats 3 33944 NULL nohasharray
107378 +btrfs_uuid_tree_rem_33944 btrfs_uuid_tree_rem 0 33944 &read_file_tgt_rx_stats_33944
107379 +hfsplus_osx_setxattr_33952 hfsplus_osx_setxattr 4 33952 NULL
107380 +__proc_dump_kernel_33954 __proc_dump_kernel 5 33954 NULL
107381 +ocfs2_create_new_meta_bhs_33955 ocfs2_create_new_meta_bhs 0 33955 NULL
107382 +vga_switcheroo_debugfs_write_33984 vga_switcheroo_debugfs_write 3 33984 NULL
107383 +snd_interval_refine_33987 snd_interval_refine 0 33987 NULL
107384 +__ntfs_malloc_34022 __ntfs_malloc 1 34022 NULL
107385 +lbs_lowrssi_write_34025 lbs_lowrssi_write 3 34025 NULL
107386 +ppp_write_34034 ppp_write 3 34034 NULL
107387 +tty_insert_flip_string_34042 tty_insert_flip_string 3-0 34042 NULL
107388 +__domain_flush_pages_34045 __domain_flush_pages 2-3 34045 NULL
107389 +is_trap_at_addr_34047 is_trap_at_addr 2 34047 NULL
107390 +memcg_update_all_caches_34068 memcg_update_all_caches 1 34068 NULL
107391 +pipeline_pipeline_fifo_full_read_34095 pipeline_pipeline_fifo_full_read 3 34095 NULL
107392 +__irq_domain_add_34101 __irq_domain_add 2 34101 NULL
107393 +i915_gem_object_set_cache_level_34107 i915_gem_object_set_cache_level 0 34107 NULL nohasharray
107394 +proc_scsi_host_write_34107 proc_scsi_host_write 3 34107 &i915_gem_object_set_cache_level_34107
107395 +is_discarded_oblock_34120 is_discarded_oblock 2 34120 NULL
107396 +islpci_mgt_transmit_34133 islpci_mgt_transmit 5 34133 NULL
107397 +ttm_dma_page_pool_free_34135 ttm_dma_page_pool_free 2-0 34135 NULL
107398 +ixgbe_dbg_netdev_ops_write_34141 ixgbe_dbg_netdev_ops_write 3 34141 NULL
107399 +shmem_pread_fast_34147 shmem_pread_fast 3 34147 NULL
107400 +ext4_xattr_list_34162 ext4_xattr_list 3 34162 NULL
107401 +ocfs2_xattr_list_entry_34165 ocfs2_xattr_list_entry 0 34165 NULL
107402 +skb_to_sgvec_34171 skb_to_sgvec 0 34171 NULL
107403 +dtf_write_run_34196 dtf_write_run 3 34196 NULL
107404 +ext4_da_write_begin_34215 ext4_da_write_begin 3-4 34215 NULL
107405 +i915_gem_execbuffer_reserve_object_34224 i915_gem_execbuffer_reserve_object 0 34224 NULL
107406 +setup_nodes_for_search_34248 setup_nodes_for_search 0 34248 NULL
107407 +numa_migrate_prep_34256 numa_migrate_prep 0 34256 NULL
107408 +btrfs_bitmap_cluster_34257 btrfs_bitmap_cluster 4 34257 NULL
107409 +bl_pipe_downcall_34264 bl_pipe_downcall 3 34264 NULL
107410 +ocfs2_dlm_lock_34265 ocfs2_dlm_lock 0 34265 NULL
107411 +pcf857x_to_irq_34273 pcf857x_to_irq 2 34273 NULL
107412 +device_private_init_34279 device_private_init 0 34279 NULL
107413 +get_task_io_context_34316 get_task_io_context 3 34316 NULL
107414 +ext4_get_groups_count_34324 ext4_get_groups_count 0 34324 NULL
107415 +iov_iter_single_seg_count_34326 iov_iter_single_seg_count 0 34326 NULL nohasharray
107416 +pcpu_need_to_extend_34326 pcpu_need_to_extend 0 34326 &iov_iter_single_seg_count_34326
107417 +SYSC_brk_34331 SYSC_brk 1 34331 NULL
107418 +__insert_34349 __insert 2-3 34349 NULL
107419 +sync_page_io_34363 sync_page_io 3 34363 NULL nohasharray
107420 +crypto_ablkcipher_ivsize_34363 crypto_ablkcipher_ivsize 0 34363 &sync_page_io_34363
107421 +rngapi_reset_34366 rngapi_reset 3 34366 NULL
107422 +reiserfs_resize_34377 reiserfs_resize 2 34377 NULL
107423 +ea_read_34378 ea_read 0 34378 NULL
107424 +fuse_send_read_34379 fuse_send_read 4 34379 NULL
107425 +av7110_vbi_write_34384 av7110_vbi_write 3 34384 NULL
107426 +usbvision_v4l2_read_34386 usbvision_v4l2_read 3 34386 NULL
107427 +read_rbu_image_type_34387 read_rbu_image_type 6 34387 NULL
107428 +iwl_calib_set_34400 iwl_calib_set 3 34400 NULL nohasharray
107429 +ivtv_read_pos_34400 ivtv_read_pos 3 34400 &iwl_calib_set_34400
107430 +wd_exp_mode_write_34407 wd_exp_mode_write 3 34407 NULL
107431 +nl80211_send_disassoc_34424 nl80211_send_disassoc 4 34424 NULL
107432 +security_socket_create_34439 security_socket_create 0 34439 NULL
107433 +usbtest_alloc_urb_34446 usbtest_alloc_urb 5-3 34446 NULL
107434 +mwifiex_regrdwr_read_34472 mwifiex_regrdwr_read 3 34472 NULL
107435 +skcipher_sndbuf_34476 skcipher_sndbuf 0 34476 NULL
107436 +i2o_parm_field_get_34477 i2o_parm_field_get 5 34477 NULL
107437 +ocfs2_block_group_clear_bits_34484 ocfs2_block_group_clear_bits 0 34484 NULL
107438 +security_inode_permission_34488 security_inode_permission 0 34488 NULL
107439 +SyS_pwritev_34494 SyS_pwritev 3 34494 NULL nohasharray
107440 +__ffs64_34494 __ffs64 1-0 34494 &SyS_pwritev_34494
107441 +qp_alloc_res_34496 qp_alloc_res 5 34496 NULL
107442 +lu_buf_check_and_alloc_34505 lu_buf_check_and_alloc 2 34505 NULL
107443 +snd_pcm_hw_param_value_34525 snd_pcm_hw_param_value 0 34525 NULL
107444 +ext4_fallocate_34537 ext4_fallocate 4-3 34537 NULL nohasharray
107445 +tracing_stats_read_34537 tracing_stats_read 3 34537 &ext4_fallocate_34537
107446 +hugetlbfs_read_actor_34547 hugetlbfs_read_actor 4-5-2-0 34547 NULL
107447 +dbBackSplit_34561 dbBackSplit 0 34561 NULL
107448 +alloc_ieee80211_rsl_34564 alloc_ieee80211_rsl 1 34564 NULL nohasharray
107449 +self_check_peb_ec_hdr_34564 self_check_peb_ec_hdr 0 34564 &alloc_ieee80211_rsl_34564
107450 +i915_gem_execbuffer_relocate_object_34575 i915_gem_execbuffer_relocate_object 0 34575 NULL
107451 +lov_stripecount_seq_write_34582 lov_stripecount_seq_write 3 34582 NULL
107452 +init_send_hfcd_34586 init_send_hfcd 1 34586 NULL
107453 +inet6_ifla6_size_34591 inet6_ifla6_size 0 34591 NULL
107454 +ceph_msgpool_init_34599 ceph_msgpool_init 4 34599 NULL nohasharray
107455 +cw1200_queue_init_34599 cw1200_queue_init 4 34599 &ceph_msgpool_init_34599
107456 +__add_prelim_ref_34600 __add_prelim_ref 0 34600 NULL
107457 +brcmf_cfg80211_mgmt_tx_34608 brcmf_cfg80211_mgmt_tx 7 34608 NULL
107458 +__jffs2_ref_totlen_34609 __jffs2_ref_totlen 0 34609 NULL nohasharray
107459 +mtd_write_34609 mtd_write 0 34609 &__jffs2_ref_totlen_34609
107460 +apei_get_nvs_resources_34616 apei_get_nvs_resources 0 34616 NULL
107461 +__cfg80211_disconnected_34622 __cfg80211_disconnected 3 34622 NULL
107462 +cnic_alloc_dma_34641 cnic_alloc_dma 3 34641 NULL
107463 +tomoyo_dump_page_34649 tomoyo_dump_page 2 34649 NULL
107464 +kvm_set_spte_hva_34671 kvm_set_spte_hva 2 34671 NULL
107465 +sleep_auth_write_34676 sleep_auth_write 3 34676 NULL
107466 +isr_fiqs_read_34687 isr_fiqs_read 3 34687 NULL
107467 +port_print_34704 port_print 3 34704 NULL
107468 +alloc_irq_and_cfg_at_34706 alloc_irq_and_cfg_at 1-2 34706 NULL
107469 +ext4_listxattr_34712 ext4_listxattr 3 34712 NULL
107470 +ieee80211_if_read_num_sta_ps_34722 ieee80211_if_read_num_sta_ps 3 34722 NULL
107471 +platform_list_read_file_34734 platform_list_read_file 3 34734 NULL
107472 +reg_w_ixbuf_34736 reg_w_ixbuf 4 34736 NULL
107473 +lsm_alloc_plain_34755 lsm_alloc_plain 1 34755 NULL
107474 +device_add_34766 device_add 0 34766 NULL
107475 +qib_cdev_init_34778 qib_cdev_init 1 34778 NULL
107476 +SYSC_keyctl_34800 SYSC_keyctl 4 34800 NULL
107477 +can_nocow_extent_34801 can_nocow_extent 2 34801 NULL
107478 +drbd_get_max_capacity_34804 drbd_get_max_capacity 0 34804 NULL
107479 +ll_setxattr_34806 ll_setxattr 4 34806 NULL
107480 +file_page_index_34820 file_page_index 0-2 34820 NULL
107481 +b43_debugfs_write_34838 b43_debugfs_write 3 34838 NULL
107482 +nl_portid_hash_zalloc_34843 nl_portid_hash_zalloc 1 34843 NULL
107483 +acpi_system_write_wakeup_device_34853 acpi_system_write_wakeup_device 3 34853 NULL
107484 +usb_serial_generic_prepare_write_buffer_34857 usb_serial_generic_prepare_write_buffer 3 34857 NULL
107485 +ieee80211_if_read_txpower_34871 ieee80211_if_read_txpower 3 34871 NULL
107486 +msg_print_text_34889 msg_print_text 0 34889 NULL
107487 +ieee80211_if_write_34894 ieee80211_if_write 3 34894 NULL
107488 +si476x_radio_read_rsq_primary_blob_34916 si476x_radio_read_rsq_primary_blob 3 34916 NULL
107489 +__inode_permission_34925 __inode_permission 0 34925 NULL nohasharray
107490 +btrfs_super_chunk_root_34925 btrfs_super_chunk_root 0 34925 &__inode_permission_34925
107491 +ODM_AllocateMemory_34929 ODM_AllocateMemory 3 34929 NULL
107492 +ceph_aio_write_34930 ceph_aio_write 4 34930 NULL
107493 +sec_flags2str_34933 sec_flags2str 3 34933 NULL
107494 +snd_info_entry_read_34938 snd_info_entry_read 3 34938 NULL
107495 +i2c_transfer_34958 i2c_transfer 0 34958 NULL
107496 +do_add_page_to_bio_34974 do_add_page_to_bio 2-10 34974 NULL
107497 +mq_lookup_34990 mq_lookup 2 34990 NULL
107498 +i915_gem_gtt_prepare_object_34991 i915_gem_gtt_prepare_object 0 34991 NULL
107499 +schedule_erase_34996 schedule_erase 0 34996 NULL
107500 +rx_rx_hdr_overflow_read_35002 rx_rx_hdr_overflow_read 3 35002 NULL
107501 +l2cap_skbuff_fromiovec_35003 l2cap_skbuff_fromiovec 4-3 35003 NULL
107502 +dm_cache_insert_mapping_35005 dm_cache_insert_mapping 2-3 35005 NULL
107503 +sisusb_copy_memory_35016 sisusb_copy_memory 4 35016 NULL
107504 +snd_pcm_hw_params_35020 snd_pcm_hw_params 0 35020 NULL
107505 +process_changed_xattr_35025 process_changed_xattr 0 35025 NULL
107506 +coda_psdev_read_35029 coda_psdev_read 3 35029 NULL
107507 +brcmf_sdio_chip_writenvram_35042 brcmf_sdio_chip_writenvram 4 35042 NULL
107508 +pwr_connection_out_of_sync_read_35061 pwr_connection_out_of_sync_read 3 35061 NULL
107509 +ext4_split_unwritten_extents_35063 ext4_split_unwritten_extents 0 35063 NULL
107510 +ntfs_attr_extend_initialized_35084 ntfs_attr_extend_initialized 2 35084 NULL
107511 +store_ifalias_35088 store_ifalias 4 35088 NULL
107512 +__kfifo_uint_must_check_helper_35097 __kfifo_uint_must_check_helper 0-1 35097 NULL
107513 +capi_write_35104 capi_write 3 35104 NULL nohasharray
107514 +tx_tx_done_template_read_35104 tx_tx_done_template_read 3 35104 &capi_write_35104
107515 +ide_settings_proc_write_35110 ide_settings_proc_write 3 35110 NULL
107516 +ceph_osdc_start_request_35122 ceph_osdc_start_request 0 35122 NULL
107517 +message_stats_print_35158 message_stats_print 6 35158 NULL
107518 +iscsi_conn_setup_35159 iscsi_conn_setup 2 35159 NULL
107519 +ieee80211_if_read_bssid_35161 ieee80211_if_read_bssid 3 35161 NULL
107520 +relocate_entry_cpu_35176 relocate_entry_cpu 0 35176 NULL
107521 +solo_v4l2_init_35179 solo_v4l2_init 2 35179 NULL
107522 +SyS_init_module_35180 SyS_init_module 2 35180 NULL
107523 +mlx4_ib_get_cq_umem_35184 mlx4_ib_get_cq_umem 5-6 35184 NULL
107524 +uprobe_get_swbp_addr_35201 uprobe_get_swbp_addr 0 35201 NULL
107525 +unix_stream_recvmsg_35210 unix_stream_recvmsg 4 35210 NULL
107526 +striped_read_35218 striped_read 0-3-2 35218 NULL nohasharray
107527 +security_key_getsecurity_35218 security_key_getsecurity 0 35218 &striped_read_35218
107528 +video_register_device_no_warn_35226 video_register_device_no_warn 3 35226 NULL nohasharray
107529 +rx_rx_cmplt_task_read_35226 rx_rx_cmplt_task_read 3 35226 &video_register_device_no_warn_35226
107530 +gfn_to_page_many_atomic_35234 gfn_to_page_many_atomic 2 35234 NULL nohasharray
107531 +may_commit_transaction_35234 may_commit_transaction 0 35234 &gfn_to_page_many_atomic_35234
107532 +SYSC_madvise_35241 SYSC_madvise 1-2 35241 NULL
107533 +set_fd_set_35249 set_fd_set 1 35249 NULL
107534 +ioapic_setup_resources_35255 ioapic_setup_resources 1 35255 NULL
107535 +alloc_thread_groups_35256 alloc_thread_groups 2 35256 NULL
107536 +jbd2_journal_get_write_access_35263 jbd2_journal_get_write_access 0 35263 NULL
107537 +dis_disc_write_35265 dis_disc_write 3 35265 NULL
107538 +dma_show_regs_35266 dma_show_regs 3 35266 NULL
107539 +irda_recvmsg_stream_35280 irda_recvmsg_stream 4 35280 NULL
107540 +i2o_block_end_request_35282 i2o_block_end_request 3 35282 NULL
107541 +isr_rx_rdys_read_35283 isr_rx_rdys_read 3 35283 NULL
107542 +brcmf_sdio_forensic_read_35311 brcmf_sdio_forensic_read 3 35311 NULL nohasharray
107543 +__btrfs_buffered_write_35311 __btrfs_buffered_write 3 35311 &brcmf_sdio_forensic_read_35311
107544 +tracing_read_pipe_35312 tracing_read_pipe 3 35312 NULL
107545 +fallback_on_nodma_alloc_35332 fallback_on_nodma_alloc 2 35332 NULL
107546 +ieee80211_if_fmt_ap_power_level_35347 ieee80211_if_fmt_ap_power_level 3 35347 NULL
107547 +nouveau_devinit_create__35348 nouveau_devinit_create_ 4 35348 NULL
107548 +ieee80211_rx_mgmt_deauth_35351 ieee80211_rx_mgmt_deauth 3 35351 NULL
107549 +compat_filldir64_35354 compat_filldir64 3 35354 NULL
107550 +amd_iommu_map_35355 amd_iommu_map 4 35355 NULL
107551 +read_kmem_35372 read_kmem 3 35372 NULL
107552 +ocfs2_journal_access_di_35393 ocfs2_journal_access_di 0 35393 NULL
107553 +create_pending_snapshots_35402 create_pending_snapshots 0 35402 NULL
107554 +btrfs_search_old_slot_35406 btrfs_search_old_slot 0 35406 NULL
107555 +SyS_getxattr_35408 SyS_getxattr 4 35408 NULL
107556 +rawv6_send_hdrinc_35425 rawv6_send_hdrinc 3 35425 NULL
107557 +C_SYSC_sendfile_35432 C_SYSC_sendfile 4 35432 NULL
107558 +__set_test_and_free_35436 __set_test_and_free 2 35436 NULL
107559 +buffer_to_user_35439 buffer_to_user 3 35439 NULL
107560 +memcg_memory_allocated_read_35469 memcg_memory_allocated_read 0 35469 NULL
107561 +fiemap_prepare_and_copy_exts_35494 fiemap_prepare_and_copy_exts 5 35494 NULL
107562 +btrfs_prealloc_file_range_trans_35500 btrfs_prealloc_file_range_trans 4-0 35500 NULL
107563 +async_setkey_35521 async_setkey 3 35521 NULL
107564 +inet_mask_len_35527 inet_mask_len 1 35527 NULL
107565 +__filemap_fdatawrite_range_35528 __filemap_fdatawrite_range 0 35528 NULL
107566 +iwl_dbgfs_bt_traffic_read_35534 iwl_dbgfs_bt_traffic_read 3 35534 NULL
107567 +pstore_mkfile_35536 pstore_mkfile 7 35536 NULL
107568 +rxpipe_tx_xfr_host_int_trig_rx_data_read_35538 rxpipe_tx_xfr_host_int_trig_rx_data_read 3 35538 NULL
107569 +ibnl_put_attr_35541 ibnl_put_attr 3 35541 NULL
107570 +ieee80211_if_write_smps_35550 ieee80211_if_write_smps 3 35550 NULL
107571 +send_update_extent_35556 send_update_extent 0 35556 NULL
107572 +vb2_dqbuf_35559 vb2_dqbuf 0 35559 NULL
107573 +sysfs_create_subdir_35567 sysfs_create_subdir 0 35567 NULL
107574 +ext4_blocks_for_truncate_35579 ext4_blocks_for_truncate 0 35579 NULL
107575 +ext2_acl_from_disk_35580 ext2_acl_from_disk 2 35580 NULL
107576 +spk_msg_set_35586 spk_msg_set 3 35586 NULL
107577 +kernel_readv_35617 kernel_readv 3 35617 NULL
107578 +reiserfs_readpages_35629 reiserfs_readpages 4 35629 NULL
107579 +ptlrpcd_steal_rqset_35637 ptlrpcd_steal_rqset 0 35637 NULL
107580 +nv50_vm_create_35643 nv50_vm_create 2-3 35643 NULL
107581 +spi_register_board_info_35651 spi_register_board_info 2 35651 NULL
107582 +rdmaltWithLock_35669 rdmaltWithLock 0 35669 NULL
107583 +cpu_to_sle64_35677 cpu_to_sle64 0-1 35677 NULL
107584 +ext3_mark_iloc_dirty_35686 ext3_mark_iloc_dirty 0 35686 NULL
107585 +dm_table_create_35687 dm_table_create 3 35687 NULL
107586 +SYSC_pwritev_35690 SYSC_pwritev 3 35690 NULL
107587 +rds_page_copy_user_35691 rds_page_copy_user 4 35691 NULL
107588 +md_super_write_35703 md_super_write 4 35703 NULL
107589 +btrfs_commit_transaction_35725 btrfs_commit_transaction 0 35725 NULL
107590 +rtw_IOL_cmd_tx_pkt_buf_dump_35732 rtw_IOL_cmd_tx_pkt_buf_dump 2 35732 NULL
107591 +ext4_truncate_restart_trans_35750 ext4_truncate_restart_trans 0 35750 NULL
107592 +iwl_dbgfs_disable_ht40_read_35761 iwl_dbgfs_disable_ht40_read 3 35761 NULL
107593 +udf_alloc_i_data_35786 udf_alloc_i_data 2 35786 NULL
107594 +pvr2_hdw_cpufw_get_35824 pvr2_hdw_cpufw_get 0-4-2 35824 NULL
107595 +tx_tx_cmplt_read_35854 tx_tx_cmplt_read 3 35854 NULL
107596 +vx_query_hbuffer_size_35859 vx_query_hbuffer_size 0 35859 NULL
107597 +changed_xattr_35860 changed_xattr 0 35860 NULL
107598 +mthca_buf_alloc_35861 mthca_buf_alloc 2 35861 NULL
107599 +fls64_35862 fls64 0 35862 NULL
107600 +kvm_dirty_bitmap_bytes_35886 kvm_dirty_bitmap_bytes 0 35886 NULL
107601 +ieee80211_if_fmt_dot11MeshRetryTimeout_35890 ieee80211_if_fmt_dot11MeshRetryTimeout 3 35890 NULL
107602 +uwb_rc_cmd_done_35892 uwb_rc_cmd_done 4 35892 NULL
107603 +SyS_set_mempolicy_35909 SyS_set_mempolicy 3 35909 NULL
107604 +kernel_setsockopt_35913 kernel_setsockopt 5 35913 NULL
107605 +rbio_nr_pages_35916 rbio_nr_pages 0-1-2 35916 NULL
107606 +balance_node_right_35920 balance_node_right 0 35920 NULL
107607 +sctp_tsnmap_mark_35929 sctp_tsnmap_mark 2 35929 NULL
107608 +rx_defrag_init_called_read_35935 rx_defrag_init_called_read 3 35935 NULL
107609 +put_cmsg_compat_35937 put_cmsg_compat 4 35937 NULL
107610 +ext_rts51x_sd_execute_write_data_35971 ext_rts51x_sd_execute_write_data 9 35971 NULL
107611 +ceph_buffer_new_35974 ceph_buffer_new 1 35974 NULL nohasharray
107612 +generic_ocp_read_35974 generic_ocp_read 3 35974 &ceph_buffer_new_35974
107613 +acl_alloc_35979 acl_alloc 1 35979 NULL
107614 +device_add_class_symlinks_35985 device_add_class_symlinks 0 35985 NULL
107615 +generic_file_aio_read_35987 generic_file_aio_read 0 35987 NULL
107616 +write_file_antenna_35998 write_file_antenna 3 35998 NULL nohasharray
107617 +kuc_alloc_35998 kuc_alloc 1 35998 &write_file_antenna_35998
107618 +locks_mandatory_area_35999 locks_mandatory_area 0 35999 NULL
107619 +il3945_ucode_tx_stats_read_36016 il3945_ucode_tx_stats_read 3 36016 NULL
107620 +ubi_eba_write_leb_36029 ubi_eba_write_leb 0-6-5 36029 NULL
107621 +__videobuf_alloc_36031 __videobuf_alloc 1 36031 NULL
107622 +account_shadowed_36048 account_shadowed 2 36048 NULL
107623 +gpio_power_read_36059 gpio_power_read 3 36059 NULL
107624 +snd_pcm_playback_hw_avail_36061 snd_pcm_playback_hw_avail 0 36061 NULL
107625 +did_create_dir_36062 did_create_dir 0 36062 NULL
107626 +write_emulate_36065 write_emulate 2-4 36065 NULL
107627 +stack_max_size_write_36068 stack_max_size_write 3 36068 NULL
107628 +radeon_vm_num_pdes_36070 radeon_vm_num_pdes 0 36070 NULL
107629 +ieee80211_if_fmt_peer_36071 ieee80211_if_fmt_peer 3 36071 NULL
107630 +ext3_new_blocks_36073 ext3_new_blocks 3-0 36073 NULL
107631 +ieee80211_if_write_tsf_36077 ieee80211_if_write_tsf 3 36077 NULL
107632 +snd_pcm_plug_read_transfer_36080 snd_pcm_plug_read_transfer 0-3 36080 NULL
107633 +mtip_hw_read_device_status_36082 mtip_hw_read_device_status 3 36082 NULL
107634 +vga_arb_write_36112 vga_arb_write 3 36112 NULL
107635 +simple_xattr_alloc_36118 simple_xattr_alloc 2 36118 NULL
107636 +compat_ptrace_request_36131 compat_ptrace_request 3 36131 NULL
107637 +vmalloc_exec_36132 vmalloc_exec 1 36132 NULL
107638 +max8925_irq_domain_map_36133 max8925_irq_domain_map 2 36133 NULL
107639 +set_flexbg_block_bitmap_36136 set_flexbg_block_bitmap 0-4-5 36136 NULL
107640 +ext3_readpages_36144 ext3_readpages 4 36144 NULL
107641 +twl_set_36154 twl_set 2 36154 NULL
107642 +b1_alloc_card_36155 b1_alloc_card 1 36155 NULL
107643 +btrfs_file_extent_inline_len_36158 btrfs_file_extent_inline_len 0 36158 NULL
107644 +snd_korg1212_copy_from_36169 snd_korg1212_copy_from 6 36169 NULL
107645 +wm8994_edge_irq_map_36170 wm8994_edge_irq_map 2 36170 NULL
107646 +SyS_kexec_load_36176 SyS_kexec_load 2 36176 NULL
107647 +ramoops_init_przs_36199 ramoops_init_przs 4 36199 NULL
107648 +SYSC_sched_getaffinity_36208 SYSC_sched_getaffinity 2 36208 NULL
107649 +SYSC_process_vm_readv_36216 SYSC_process_vm_readv 5-3 36216 NULL
107650 +ubifs_read_nnode_36221 ubifs_read_nnode 0 36221 NULL
107651 +is_dirty_36223 is_dirty 2 36223 NULL
107652 +ept_walk_addr_36226 ept_walk_addr 3 36226 NULL
107653 +atomic_stats_read_36228 atomic_stats_read 3 36228 NULL
107654 +viafb_iga1_odev_proc_write_36241 viafb_iga1_odev_proc_write 3 36241 NULL
107655 +SYSC_getxattr_36242 SYSC_getxattr 4 36242 NULL
107656 +rproc_recovery_read_36245 rproc_recovery_read 3 36245 NULL
107657 +scrub_stripe_36248 scrub_stripe 5-4 36248 NULL
107658 +compat_sys_mbind_36256 compat_sys_mbind 5 36256 NULL
107659 +usb_buffer_alloc_36276 usb_buffer_alloc 2 36276 NULL nohasharray
107660 +cfs_hash_buckets_realloc_36276 cfs_hash_buckets_realloc 4 36276 &usb_buffer_alloc_36276
107661 +codec_reg_read_file_36280 codec_reg_read_file 3 36280 NULL
107662 +crypto_shash_digestsize_36284 crypto_shash_digestsize 0 36284 NULL
107663 +nouveau_cli_create_36293 nouveau_cli_create 3 36293 NULL
107664 +lpfc_debugfs_dif_err_read_36303 lpfc_debugfs_dif_err_read 3 36303 NULL
107665 +cfg80211_rx_mlme_mgmt_36306 cfg80211_rx_mlme_mgmt 3 36306 NULL
107666 +ad7879_spi_xfer_36311 ad7879_spi_xfer 3 36311 NULL
107667 +fuse_get_user_addr_36312 fuse_get_user_addr 0 36312 NULL
107668 +fat_compat_ioctl_filldir_36328 fat_compat_ioctl_filldir 3 36328 NULL
107669 +lc_create_36332 lc_create 4 36332 NULL
107670 +jbd2_journal_init_revoke_table_36336 jbd2_journal_init_revoke_table 1 36336 NULL
107671 +isku_sysfs_read_key_mask_36343 isku_sysfs_read_key_mask 6 36343 NULL
107672 +ath6kl_regwrite_write_36351 ath6kl_regwrite_write 3 36351 NULL
107673 +v9fs_file_readn_36353 v9fs_file_readn 4 36353 NULL nohasharray
107674 +xz_dec_lzma2_create_36353 xz_dec_lzma2_create 2 36353 &v9fs_file_readn_36353
107675 +to_sector_36361 to_sector 0-1 36361 NULL
107676 +irq_domain_disassociate_36367 irq_domain_disassociate 2 36367 NULL
107677 +posix_acl_create_36383 posix_acl_create 0 36383 NULL
107678 +tunables_read_36385 tunables_read 3 36385 NULL
107679 +afs_alloc_flat_call_36399 afs_alloc_flat_call 3-2 36399 NULL
107680 +sierra_write_36402 sierra_write 4 36402 NULL
107681 +msb_update_block_36412 msb_update_block 2 36412 NULL
107682 +SyS_sethostname_36417 SyS_sethostname 2 36417 NULL
107683 +ReadW6692B_36445 ReadW6692B 0 36445 NULL
107684 +sctp_tsnmap_init_36446 sctp_tsnmap_init 2 36446 NULL
107685 +alloc_etherdev_mqs_36450 alloc_etherdev_mqs 1 36450 NULL
107686 +check_extent_in_eb_36467 check_extent_in_eb 0 36467 NULL
107687 +SyS_process_vm_writev_36476 SyS_process_vm_writev 5-3 36476 NULL
107688 +b43_nphy_load_samples_36481 b43_nphy_load_samples 3 36481 NULL
107689 +set_var_mtrr_range_36483 set_var_mtrr_range 2 36483 NULL
107690 +ip6_append_data_36490 ip6_append_data 4 36490 NULL nohasharray
107691 +tx_tx_checksum_result_read_36490 tx_tx_checksum_result_read 3 36490 &ip6_append_data_36490
107692 +cmd_loop_36491 cmd_loop 0 36491 NULL
107693 +__hwahc_op_set_ptk_36510 __hwahc_op_set_ptk 5 36510 NULL
107694 +mcam_v4l_read_36513 mcam_v4l_read 3 36513 NULL
107695 +get_param_l_36518 get_param_l 0 36518 NULL
107696 +ieee80211_if_read_fwded_frames_36520 ieee80211_if_read_fwded_frames 3 36520 NULL
107697 +lguest_setup_irq_36531 lguest_setup_irq 1 36531 NULL
107698 +crypto_aead_authsize_36537 crypto_aead_authsize 0 36537 NULL
107699 +cpu_type_read_36540 cpu_type_read 3 36540 NULL
107700 +__kfifo_to_user_36555 __kfifo_to_user 3-0 36555 NULL nohasharray
107701 +macvtap_do_read_36555 macvtap_do_read 4 36555 &__kfifo_to_user_36555
107702 +btrfs_get_token_64_36572 btrfs_get_token_64 0 36572 NULL
107703 +__erst_read_36579 __erst_read 0 36579 NULL
107704 +put_cmsg_36589 put_cmsg 4 36589 NULL
107705 +do_sendfile_36610 do_sendfile 4-5 36610 NULL
107706 +fat_ioctl_filldir_36621 fat_ioctl_filldir 3 36621 NULL
107707 +i915_gem_execbuffer_relocate_slow_36634 i915_gem_execbuffer_relocate_slow 0 36634 NULL
107708 +vxge_config_vpaths_36636 vxge_config_vpaths 0 36636 NULL
107709 +convert_extent_item_v0_36645 convert_extent_item_v0 4-0 36645 NULL
107710 +ced_ioctl_36647 ced_ioctl 2 36647 NULL
107711 +lpfc_idiag_extacc_alloc_get_36648 lpfc_idiag_extacc_alloc_get 0-3 36648 NULL
107712 +osd_req_list_collection_objects_36664 osd_req_list_collection_objects 5 36664 NULL
107713 +iscsi_host_alloc_36671 iscsi_host_alloc 2 36671 NULL
107714 +xillybus_read_36678 xillybus_read 3 36678 NULL
107715 +tlv_put_btrfs_timespec_36685 tlv_put_btrfs_timespec 0 36685 NULL nohasharray
107716 +ext4_mb_discard_group_preallocations_36685 ext4_mb_discard_group_preallocations 2 36685 &tlv_put_btrfs_timespec_36685
107717 +gsmtty_write_36702 gsmtty_write 3 36702 NULL
107718 +sched_clock_36717 sched_clock 0 36717 NULL
107719 +ocfs2_rotate_tree_right_36723 ocfs2_rotate_tree_right 0 36723 NULL
107720 +snd_rawmidi_kernel_read1_36740 snd_rawmidi_kernel_read1 4-0 36740 NULL
107721 +cxgbi_device_register_36746 cxgbi_device_register 2-1 36746 NULL
107722 +fc_exch_mgr_alloc_36751 fc_exch_mgr_alloc 3-4 36751 NULL
107723 +ps_poll_upsd_timeouts_read_36755 ps_poll_upsd_timeouts_read 3 36755 NULL
107724 +ext4_ext_convert_to_initialized_36765 ext4_ext_convert_to_initialized 0 36765 NULL
107725 +ptp_filter_init_36780 ptp_filter_init 2 36780 NULL
107726 +i40e_init_lan_hmc_36796 i40e_init_lan_hmc 2-3-4-5 36796 NULL
107727 +proc_fault_inject_read_36802 proc_fault_inject_read 3 36802 NULL
107728 +hiddev_ioctl_36816 hiddev_ioctl 2 36816 NULL
107729 +ocfs2_journal_access_rb_36823 ocfs2_journal_access_rb 0 36823 NULL
107730 +int_hardware_entry_36833 int_hardware_entry 3 36833 NULL
107731 +fc_change_queue_depth_36841 fc_change_queue_depth 2 36841 NULL
107732 +keyctl_describe_key_36853 keyctl_describe_key 3 36853 NULL
107733 +cm_write_36858 cm_write 3 36858 NULL
107734 +range_to_mtrr_with_hole_36861 range_to_mtrr_with_hole 2 36861 NULL
107735 +tx_tx_data_programmed_read_36871 tx_tx_data_programmed_read 3 36871 NULL
107736 +svc_setsockopt_36876 svc_setsockopt 5 36876 NULL
107737 +raid56_parity_write_36877 raid56_parity_write 5 36877 NULL
107738 +__btrfs_map_block_36883 __btrfs_map_block 3 36883 NULL
107739 +ib_ucm_alloc_data_36885 ib_ucm_alloc_data 3 36885 NULL
107740 +selinux_inode_notifysecctx_36896 selinux_inode_notifysecctx 3 36896 NULL
107741 +OS_kmalloc_36909 OS_kmalloc 1 36909 NULL
107742 +audio_set_endpoint_req_36918 audio_set_endpoint_req 0 36918 NULL
107743 +build_key_36931 build_key 1 36931 NULL
107744 +crypto_blkcipher_ivsize_36944 crypto_blkcipher_ivsize 0 36944 NULL
107745 +div_u64_36951 div_u64 0 36951 NULL
107746 +write_leb_36957 write_leb 0-5 36957 NULL
107747 +ntfs_external_attr_find_36963 ntfs_external_attr_find 0 36963 NULL
107748 +sparse_early_mem_maps_alloc_node_36971 sparse_early_mem_maps_alloc_node 4 36971 NULL
107749 +il4965_rs_sta_dbgfs_scale_table_write_36979 il4965_rs_sta_dbgfs_scale_table_write 3 36979 NULL
107750 +drbd_new_dev_size_36998 drbd_new_dev_size 0-3 36998 NULL
107751 +auok190xfb_write_37001 auok190xfb_write 3 37001 NULL
107752 +setxattr_37006 setxattr 4 37006 NULL
107753 +btrfs_update_root_37035 btrfs_update_root 0 37035 NULL
107754 +ocfs2_dlm_unlock_37037 ocfs2_dlm_unlock 0 37037 NULL
107755 +command_file_read_37038 command_file_read 3 37038 NULL
107756 +__hfsplus_brec_find_37048 __hfsplus_brec_find 0 37048 NULL
107757 +figure_loop_size_37051 figure_loop_size 2-3 37051 NULL
107758 +qp_broker_create_37053 qp_broker_create 6-5 37053 NULL nohasharray
107759 +ieee80211_if_read_drop_unencrypted_37053 ieee80211_if_read_drop_unencrypted 3 37053 &qp_broker_create_37053
107760 +SYSC_setxattr_37078 SYSC_setxattr 4 37078 NULL
107761 +parse_command_37079 parse_command 2 37079 NULL
107762 +pipeline_cs_rx_packet_in_read_37089 pipeline_cs_rx_packet_in_read 3 37089 NULL
107763 +tun_get_user_37094 tun_get_user 5 37094 NULL
107764 +has_wrprotected_page_37123 has_wrprotected_page 3-2 37123 NULL
107765 +snd_hda_get_conn_list_37132 snd_hda_get_conn_list 0 37132 NULL
107766 +mtt_free_res_37144 mtt_free_res 5 37144 NULL
107767 +msg_word_37164 msg_word 0 37164 NULL
107768 +BeceemNVMRead_37166 BeceemNVMRead 0 37166 NULL
107769 +f2fs_direct_IO_37167 f2fs_direct_IO 4 37167 NULL
107770 +can_set_xattr_37182 can_set_xattr 4 37182 NULL
107771 +btrfs_insert_delayed_items_37191 btrfs_insert_delayed_items 0 37191 NULL
107772 +vcc_recvmsg_37198 vcc_recvmsg 4 37198 NULL
107773 +sysfs_add_file_37200 sysfs_add_file 0 37200 NULL
107774 +mpol_misplaced_37205 mpol_misplaced 0 37205 NULL
107775 +forced_ps_write_37209 forced_ps_write 3 37209 NULL
107776 +crypto_shash_descsize_37212 crypto_shash_descsize 0 37212 NULL nohasharray
107777 +ext4_ind_direct_IO_37212 ext4_ind_direct_IO 0-4 37212 &crypto_shash_descsize_37212
107778 +bchannel_get_rxbuf_37213 bchannel_get_rxbuf 2-0 37213 NULL
107779 +regmap_access_read_file_37223 regmap_access_read_file 3 37223 NULL
107780 +__do_replace_37227 __do_replace 5 37227 NULL
107781 +produce_free_peb_37232 produce_free_peb 0 37232 NULL
107782 +iwl_dbgfs_d3_sram_read_37237 iwl_dbgfs_d3_sram_read 3 37237 NULL
107783 +rx_filter_dup_filter_read_37238 rx_filter_dup_filter_read 3 37238 NULL
107784 +BeceemFlashBulkWrite_37255 BeceemFlashBulkWrite 0 37255 NULL
107785 +prot_queue_del_37258 prot_queue_del 0 37258 NULL
107786 +exofs_max_io_pages_37263 exofs_max_io_pages 0-2 37263 NULL
107787 +__add_keyed_refs_37264 __add_keyed_refs 0 37264 NULL
107788 +nested_svm_map_37268 nested_svm_map 2 37268 NULL
107789 +create_cq_user_37278 create_cq_user 5 37278 NULL
107790 +request_threaded_irq_37303 request_threaded_irq 0 37303 NULL
107791 +ieee80211_if_read_power_mode_37305 ieee80211_if_read_power_mode 3 37305 NULL
107792 +ext3_direct_IO_37308 ext3_direct_IO 4 37308 NULL
107793 +jffs2_write_dirent_37311 jffs2_write_dirent 5 37311 NULL
107794 +send_msg_37323 send_msg 4 37323 NULL
107795 +l2cap_create_connless_pdu_37327 l2cap_create_connless_pdu 3 37327 NULL nohasharray
107796 +bnx2x_vf_fill_fw_str_37327 bnx2x_vf_fill_fw_str 3 37327 &l2cap_create_connless_pdu_37327
107797 +scsi_mode_select_37330 scsi_mode_select 6 37330 NULL
107798 +rxrpc_server_sendmsg_37331 rxrpc_server_sendmsg 4 37331 NULL
107799 +lz4_compressbound_37337 lz4_compressbound 0-1 37337 NULL
107800 +move_vma_37341 move_vma 0-5 37341 NULL
107801 +security_inode_getsecurity_37354 security_inode_getsecurity 0 37354 NULL
107802 +cl_io_submit_rw_37374 cl_io_submit_rw 0 37374 NULL
107803 +iterate_leaf_refs_37385 iterate_leaf_refs 0 37385 NULL
107804 +iommu_num_pages_37391 iommu_num_pages 0-1-3-2 37391 NULL
107805 +btrfs_find_free_objectid_37412 btrfs_find_free_objectid 0 37412 NULL
107806 +hci_sock_sendmsg_37420 hci_sock_sendmsg 4 37420 NULL
107807 +acpi_os_allocate_zeroed_37422 acpi_os_allocate_zeroed 1 37422 NULL nohasharray
107808 +find_next_bit_37422 find_next_bit 0-3-2 37422 &acpi_os_allocate_zeroed_37422
107809 +ocfs2_insert_path_37425 ocfs2_insert_path 0 37425 NULL
107810 +tty_insert_flip_string_fixed_flag_37428 tty_insert_flip_string_fixed_flag 4-0 37428 NULL
107811 +iwl_print_last_event_logs_37433 iwl_print_last_event_logs 0-7-9 37433 NULL
107812 +fru_alloc_37442 fru_alloc 1 37442 NULL
107813 +tcp_established_options_37450 tcp_established_options 0 37450 NULL
107814 +brcmf_sdio_dump_console_37455 brcmf_sdio_dump_console 4 37455 NULL
107815 +__remove_37457 __remove 2 37457 NULL
107816 +ufs_data_ptr_to_cpu_37475 ufs_data_ptr_to_cpu 0 37475 NULL
107817 +get_est_timing_37484 get_est_timing 0 37484 NULL
107818 +kmem_realloc_37489 kmem_realloc 2 37489 NULL
107819 +__hfsplus_setxattr_37499 __hfsplus_setxattr 4 37499 NULL
107820 +bitmap_dirty_bits_37503 bitmap_dirty_bits 2 37503 NULL
107821 +osc_active_seq_write_37514 osc_active_seq_write 3 37514 NULL
107822 +bdev_writeseg_37519 bdev_writeseg 2-3 37519 NULL nohasharray
107823 +vmalloc_32_user_37519 vmalloc_32_user 1 37519 &bdev_writeseg_37519
107824 +xz_dec_test_write_37527 xz_dec_test_write 3 37527 NULL
107825 +fault_inject_read_37534 fault_inject_read 3 37534 NULL
107826 +hdr_size_37536 hdr_size 0 37536 NULL
107827 +extent_map_end_37550 extent_map_end 0 37550 NULL
107828 +sep_create_dcb_dmatables_context_37551 sep_create_dcb_dmatables_context 6 37551 NULL
107829 +ioat_chansts_37558 ioat_chansts 0 37558 NULL
107830 +xhci_alloc_streams_37586 xhci_alloc_streams 5 37586 NULL
107831 +ocfs2_add_branch_37588 ocfs2_add_branch 0 37588 NULL
107832 +alloc_descs_37593 alloc_descs 0-1-3 37593 NULL
107833 +qla2x00_debounce_register_37597 qla2x00_debounce_register 0 37597 NULL
107834 +find_extent_clone_37603 find_extent_clone 0 37603 NULL
107835 +btrfs_write_and_wait_marked_extents_37604 btrfs_write_and_wait_marked_extents 0 37604 NULL
107836 +kvm_read_guest_page_mmu_37611 kvm_read_guest_page_mmu 6-3 37611 NULL
107837 +SYSC_mbind_37622 SYSC_mbind 5 37622 NULL nohasharray
107838 +ocfs2_split_refcount_rec_37622 ocfs2_split_refcount_rec 0 37622 &SYSC_mbind_37622
107839 +btrfs_calc_trans_metadata_size_37629 btrfs_calc_trans_metadata_size 0-2 37629 NULL nohasharray
107840 +policy_residency_37629 policy_residency 0 37629 &btrfs_calc_trans_metadata_size_37629
107841 +alloc_fd_37637 alloc_fd 1 37637 NULL
107842 +SyS_mbind_37638 SyS_mbind 5 37638 NULL
107843 +bio_copy_user_iov_37660 bio_copy_user_iov 4 37660 NULL
107844 +rfcomm_sock_sendmsg_37661 rfcomm_sock_sendmsg 4 37661 NULL nohasharray
107845 +vmw_framebuffer_dmabuf_dirty_37661 vmw_framebuffer_dmabuf_dirty 6 37661 &rfcomm_sock_sendmsg_37661
107846 +SYSC_get_mempolicy_37664 SYSC_get_mempolicy 4-3 37664 NULL
107847 +lnw_gpio_to_irq_37665 lnw_gpio_to_irq 2 37665 NULL
107848 +ieee80211_if_read_rc_rateidx_mcs_mask_2ghz_37675 ieee80211_if_read_rc_rateidx_mcs_mask_2ghz 3 37675 NULL
107849 +regmap_map_read_file_37685 regmap_map_read_file 3 37685 NULL
107850 +page_chain_free_37697 page_chain_free 0 37697 NULL
107851 +nametbl_header_37698 nametbl_header 2-0 37698 NULL
107852 +__le32_to_cpup_37702 __le32_to_cpup 0 37702 NULL
107853 +dynamic_ps_timeout_write_37713 dynamic_ps_timeout_write 3 37713 NULL
107854 +dm_thin_remove_block_37724 dm_thin_remove_block 2 37724 NULL
107855 +find_active_uprobe_37733 find_active_uprobe 1 37733 NULL
107856 +read_enabled_file_bool_37744 read_enabled_file_bool 3 37744 NULL
107857 +ocfs2_duplicate_clusters_by_jbd_37749 ocfs2_duplicate_clusters_by_jbd 5-4-6 37749 NULL
107858 +ocfs2_control_cfu_37750 ocfs2_control_cfu 2 37750 NULL
107859 +ipath_cdev_init_37752 ipath_cdev_init 1 37752 NULL
107860 +dccp_setsockopt_cscov_37766 dccp_setsockopt_cscov 2 37766 NULL
107861 +il4965_rs_sta_dbgfs_rate_scale_data_read_37792 il4965_rs_sta_dbgfs_rate_scale_data_read 3 37792 NULL
107862 +smk_read_logging_37804 smk_read_logging 3 37804 NULL
107863 +deny_write_access_37813 deny_write_access 0 37813 NULL
107864 +ocrdma_alloc_frmr_page_list_37815 ocrdma_alloc_frmr_page_list 2 37815 NULL
107865 +rx_decrypt_key_not_found_read_37820 rx_decrypt_key_not_found_read 3 37820 NULL
107866 +bitmap_find_next_zero_area_37827 bitmap_find_next_zero_area 2-3-0-5-4 37827 NULL
107867 +android_get_p2p_addr_37832 android_get_p2p_addr 0 37832 NULL
107868 +jbd2_journal_get_undo_access_37837 jbd2_journal_get_undo_access 0 37837 NULL
107869 +o2hb_debug_read_37851 o2hb_debug_read 3 37851 NULL
107870 +SYSC_pwrite64_37862 SYSC_pwrite64 3 37862 NULL
107871 +xfs_dir2_block_to_sf_37868 xfs_dir2_block_to_sf 3 37868 NULL
107872 +set_registers_37883 set_registers 4 37883 NULL
107873 +btrfs_stack_file_extent_disk_bytenr_37888 btrfs_stack_file_extent_disk_bytenr 0 37888 NULL
107874 +max77686_irq_domain_map_37897 max77686_irq_domain_map 2 37897 NULL
107875 +tipc_link_send_sections_fast_37920 tipc_link_send_sections_fast 4 37920 NULL
107876 +_rtw_malloc_37928 _rtw_malloc 1 37928 NULL nohasharray
107877 +pkt_alloc_packet_data_37928 pkt_alloc_packet_data 1 37928 &_rtw_malloc_37928
107878 +read_rbu_packet_size_37939 read_rbu_packet_size 6 37939 NULL
107879 +write_file_bool_37957 write_file_bool 3 37957 NULL
107880 +fifo_alloc_37961 fifo_alloc 1 37961 NULL
107881 +ext3_free_blocks_sb_37967 ext3_free_blocks_sb 4-3 37967 NULL
107882 +rds_rdma_extra_size_37990 rds_rdma_extra_size 0 37990 NULL
107883 +persistent_ram_old_size_37997 persistent_ram_old_size 0 37997 NULL
107884 +vfs_readv_38011 vfs_readv 3 38011 NULL
107885 +aggr_recv_addba_req_evt_38037 aggr_recv_addba_req_evt 4 38037 NULL
107886 +SyS_pwrite64_38041 SyS_pwrite64 3 38041 NULL
107887 +klsi_105_prepare_write_buffer_38044 klsi_105_prepare_write_buffer 3 38044 NULL nohasharray
107888 +il_dbgfs_chain_noise_read_38044 il_dbgfs_chain_noise_read 3 38044 &klsi_105_prepare_write_buffer_38044
107889 +SyS_llistxattr_38048 SyS_llistxattr 3 38048 NULL
107890 +sysfs_do_create_link_38051 sysfs_do_create_link 0 38051 NULL
107891 +_xfs_buf_alloc_38058 _xfs_buf_alloc 3 38058 NULL nohasharray
107892 +is_discarded_38058 is_discarded 2 38058 &_xfs_buf_alloc_38058
107893 +nsm_create_handle_38060 nsm_create_handle 4 38060 NULL
107894 +alloc_ltalkdev_38071 alloc_ltalkdev 1 38071 NULL
107895 +xfs_buf_readahead_map_38081 xfs_buf_readahead_map 3 38081 NULL
107896 +uwb_mac_addr_print_38085 uwb_mac_addr_print 2 38085 NULL
107897 +request_key_auth_new_38092 request_key_auth_new 3 38092 NULL
107898 +proc_self_readlink_38094 proc_self_readlink 3 38094 NULL
107899 +ep0_read_38095 ep0_read 3 38095 NULL
107900 +sk_wmem_schedule_38096 sk_wmem_schedule 2 38096 NULL nohasharray
107901 +osc_checksum_seq_write_38096 osc_checksum_seq_write 3 38096 &sk_wmem_schedule_38096
107902 +o2hb_read_slots_38105 o2hb_read_slots 2 38105 NULL
107903 +snd_pcm_oss_write_38108 snd_pcm_oss_write 3 38108 NULL
107904 +_get_val_38115 _get_val 2 38115 NULL
107905 +vmw_kms_present_38130 vmw_kms_present 9 38130 NULL
107906 +__ntfs_copy_from_user_iovec_inatomic_38153 __ntfs_copy_from_user_iovec_inatomic 0-4-3 38153 NULL
107907 +btrfs_extent_same_38163 btrfs_extent_same 3-2 38163 NULL
107908 +kvm_clear_guest_38164 kvm_clear_guest 3-2 38164 NULL
107909 +cirrus_ttm_tt_create_38167 cirrus_ttm_tt_create 2 38167 NULL
107910 +send_rename_38170 send_rename 0 38170 NULL
107911 +cdev_add_38176 cdev_add 2-3 38176 NULL
107912 +create_srq_user_38191 create_srq_user 5 38191 NULL
107913 +rt2x00debug_write_rf_38195 rt2x00debug_write_rf 3 38195 NULL
107914 +do_chunk_alloc_38200 do_chunk_alloc 0 38200 NULL
107915 +get_ucode_user_38202 get_ucode_user 3 38202 NULL
107916 +ext3_new_block_38208 ext3_new_block 3-0 38208 NULL
107917 +stmpe_gpio_irq_map_38222 stmpe_gpio_irq_map 3 38222 NULL
107918 +osd_req_list_partition_collections_38223 osd_req_list_partition_collections 5 38223 NULL
107919 +palmas_gpio_to_irq_38235 palmas_gpio_to_irq 2 38235 NULL
107920 +ceph_decode_16_38239 ceph_decode_16 0 38239 NULL
107921 +_ipw_read_reg32_38245 _ipw_read_reg32 0 38245 NULL
107922 +snd_pcm_playback_rewind_38249 snd_pcm_playback_rewind 0-2 38249 NULL
107923 +from_dblock_38256 from_dblock 0-1 38256 NULL
107924 +vmci_qp_broker_set_page_store_38260 vmci_qp_broker_set_page_store 3-2 38260 NULL
107925 +SYSC_msgrcv_38268 SYSC_msgrcv 3 38268 NULL nohasharray
107926 +ieee80211_if_read_auto_open_plinks_38268 ieee80211_if_read_auto_open_plinks 3 38268 &SYSC_msgrcv_38268 nohasharray
107927 +mthca_alloc_icm_table_38268 mthca_alloc_icm_table 4-3 38268 &ieee80211_if_read_auto_open_plinks_38268
107928 +xfs_bmdr_to_bmbt_38275 xfs_bmdr_to_bmbt 5 38275 NULL nohasharray
107929 +xfs_bmbt_to_bmdr_38275 xfs_bmbt_to_bmdr 3 38275 &xfs_bmdr_to_bmbt_38275
107930 +ftdi_process_packet_38281 ftdi_process_packet 4 38281 NULL
107931 +gpa_to_gfn_38291 gpa_to_gfn 0-1 38291 NULL
107932 +ucma_query_path_38305 ucma_query_path 3 38305 NULL
107933 +isr_rx_headers_read_38325 isr_rx_headers_read 3 38325 NULL
107934 +ida_simple_get_38326 ida_simple_get 2-0 38326 NULL
107935 +ocfs2_rotate_rightmost_leaf_left_38330 ocfs2_rotate_rightmost_leaf_left 0 38330 NULL
107936 +__snd_gf1_look8_38333 __snd_gf1_look8 0 38333 NULL
107937 +ocfs2_replace_extent_rec_38357 ocfs2_replace_extent_rec 0 38357 NULL
107938 +btrfs_file_extent_disk_num_bytes_38363 btrfs_file_extent_disk_num_bytes 0 38363 NULL
107939 +dn_sendmsg_38390 dn_sendmsg 4 38390 NULL
107940 +get_valid_node_allowed_38412 get_valid_node_allowed 1-0 38412 NULL
107941 +ocfs2_which_cluster_group_38413 ocfs2_which_cluster_group 0-2 38413 NULL
107942 +ht_destroy_irq_38418 ht_destroy_irq 1 38418 NULL
107943 +ieee80211_if_read_dtim_count_38419 ieee80211_if_read_dtim_count 3 38419 NULL
107944 +pmcraid_copy_sglist_38431 pmcraid_copy_sglist 3 38431 NULL
107945 +kvm_write_guest_38454 kvm_write_guest 4-2 38454 NULL
107946 +btrfs_next_old_leaf_38465 btrfs_next_old_leaf 0 38465 NULL
107947 +kvm_arch_setup_async_pf_38481 kvm_arch_setup_async_pf 3 38481 NULL
107948 +blk_end_bidi_request_38482 blk_end_bidi_request 4-3 38482 NULL
107949 +cpu_to_mem_38501 cpu_to_mem 0 38501 NULL
107950 +dev_names_read_38509 dev_names_read 3 38509 NULL
107951 +iscsi_create_iface_38510 iscsi_create_iface 5 38510 NULL
107952 +event_rx_mismatch_read_38518 event_rx_mismatch_read 3 38518 NULL
107953 +mlx4_ib_db_map_user_38529 mlx4_ib_db_map_user 2 38529 NULL
107954 +ubifs_idx_node_sz_38546 ubifs_idx_node_sz 0-2 38546 NULL
107955 +btrfs_discard_extent_38547 btrfs_discard_extent 2 38547 NULL
107956 +kuc_len_38557 kuc_len 0-1 38557 NULL
107957 +cpu_to_node_38561 cpu_to_node 0 38561 NULL
107958 +irda_sendmsg_dgram_38563 irda_sendmsg_dgram 4 38563 NULL
107959 +il4965_rs_sta_dbgfs_scale_table_read_38564 il4965_rs_sta_dbgfs_scale_table_read 3 38564 NULL
107960 +_ipw_read32_38565 _ipw_read32 0 38565 NULL
107961 +snd_nm256_playback_copy_38567 snd_nm256_playback_copy 5-3 38567 NULL
107962 +copy_ctl_value_to_user_38587 copy_ctl_value_to_user 4 38587 NULL
107963 +compat_sys_ptrace_38595 compat_sys_ptrace 3 38595 NULL
107964 +blkg_stat_read_38612 blkg_stat_read 0 38612 NULL
107965 +icn_writecmd_38629 icn_writecmd 2 38629 NULL
107966 +write_enabled_file_bool_38630 write_enabled_file_bool 3 38630 NULL
107967 +ext2_readpages_38640 ext2_readpages 4 38640 NULL
107968 +cma_create_area_38642 cma_create_area 2 38642 NULL
107969 +audit_init_entry_38644 audit_init_entry 1 38644 NULL
107970 +qp_broker_alloc_38646 qp_broker_alloc 6-5 38646 NULL
107971 +mmc_send_cxd_data_38655 mmc_send_cxd_data 5 38655 NULL
107972 +nouveau_instmem_create__38664 nouveau_instmem_create_ 4 38664 NULL
107973 +snd_es1371_wait_src_ready_38673 snd_es1371_wait_src_ready 0 38673 NULL
107974 +iscsit_dump_data_payload_38683 iscsit_dump_data_payload 2 38683 NULL
107975 +ext4_wait_block_bitmap_38695 ext4_wait_block_bitmap 2 38695 NULL
107976 +validate_vid_hdr_38699 validate_vid_hdr 0 38699 NULL
107977 +rbio_add_io_page_38700 rbio_add_io_page 6 38700 NULL
107978 +find_next_usable_block_38716 find_next_usable_block 3-1-0 38716 NULL
107979 +alloc_trace_probe_38720 alloc_trace_probe 6 38720 NULL
107980 +w83977af_sir_interrupt_38738 w83977af_sir_interrupt 0 38738 NULL
107981 +udf_readpages_38761 udf_readpages 4 38761 NULL
107982 +iwl_dbgfs_thermal_throttling_read_38779 iwl_dbgfs_thermal_throttling_read 3 38779 NULL
107983 +bcache_device_init_38781 bcache_device_init 3 38781 NULL
107984 +snd_gus_dram_write_38784 snd_gus_dram_write 4 38784 NULL
107985 +slab_order_38794 slab_order 0 38794 NULL
107986 +do_pci_enable_device_38802 do_pci_enable_device 0 38802 NULL
107987 +err_decode_38804 err_decode 2 38804 NULL
107988 +btrfs_find_space_cluster_38812 btrfs_find_space_cluster 4-0 38812 NULL
107989 +ipv6_renew_option_38813 ipv6_renew_option 3 38813 NULL
107990 +direct_entry_38836 direct_entry 3 38836 NULL
107991 +compat_udp_setsockopt_38840 compat_udp_setsockopt 5 38840 NULL
107992 +read_nic_io_word_38853 read_nic_io_word 0 38853 NULL
107993 +interfaces_38859 interfaces 2 38859 NULL
107994 +pci_msix_table_size_38867 pci_msix_table_size 0 38867 NULL
107995 +dbgfs_state_38894 dbgfs_state 3 38894 NULL
107996 +f2fs_xattr_set_acl_38895 f2fs_xattr_set_acl 4 38895 NULL
107997 +traverse_38897 traverse 0 38897 NULL
107998 +__fswab16_38898 __fswab16 0 38898 NULL
107999 +ext3_trim_all_free_38929 ext3_trim_all_free 4-3-2 38929 NULL
108000 +il_dbgfs_sram_write_38942 il_dbgfs_sram_write 3 38942 NULL
108001 +__ath6kl_wmi_send_mgmt_cmd_38971 __ath6kl_wmi_send_mgmt_cmd 7 38971 NULL
108002 +C_SYSC_preadv64_38977 C_SYSC_preadv64 3 38977 NULL nohasharray
108003 +usb_maxpacket_38977 usb_maxpacket 0 38977 &C_SYSC_preadv64_38977
108004 +OSDSetBlock_38986 OSDSetBlock 2-4 38986 NULL
108005 +lpfc_idiag_extacc_write_38998 lpfc_idiag_extacc_write 3 38998 NULL
108006 +udf_new_block_38999 udf_new_block 4 38999 NULL
108007 +get_nodes_39012 get_nodes 3 39012 NULL
108008 +twl6030_interrupt_unmask_39013 twl6030_interrupt_unmask 2 39013 NULL
108009 +__blkdev_issue_zeroout_39020 __blkdev_issue_zeroout 3-0 39020 NULL
108010 +qgroup_account_ref_step1_39024 qgroup_account_ref_step1 0 39024 NULL
108011 +acpi_install_gpe_block_39031 acpi_install_gpe_block 4 39031 NULL
108012 +_zd_iowrite32v_async_locked_39034 _zd_iowrite32v_async_locked 3 39034 NULL
108013 +do_write_kmem_39051 do_write_kmem 1-3-0 39051 NULL
108014 +gen_pool_create_39064 gen_pool_create 2 39064 NULL
108015 +ext4_init_block_bitmap_39071 ext4_init_block_bitmap 3 39071 NULL
108016 +ReadHFC_39104 ReadHFC 0 39104 NULL
108017 +tomoyo_truncate_39105 tomoyo_truncate 0 39105 NULL
108018 +leb_write_lock_39111 leb_write_lock 0 39111 NULL
108019 +__kfifo_to_user_r_39123 __kfifo_to_user_r 5-3 39123 NULL
108020 +ttm_mem_global_alloc_zone_39125 ttm_mem_global_alloc_zone 0 39125 NULL
108021 +ea_foreach_39133 ea_foreach 0 39133 NULL
108022 +generic_permission_39150 generic_permission 0 39150 NULL
108023 +proc_coredump_filter_read_39153 proc_coredump_filter_read 3 39153 NULL
108024 +echo_client_kbrw_39170 echo_client_kbrw 6 39170 NULL
108025 +btrfs_start_delalloc_flush_39173 btrfs_start_delalloc_flush 0 39173 NULL
108026 +ext3_xattr_check_names_39174 ext3_xattr_check_names 0 39174 NULL
108027 +ubi_more_update_data_39189 ubi_more_update_data 4-0 39189 NULL
108028 +qcam_read_bytes_39205 qcam_read_bytes 0 39205 NULL
108029 +ivtv_v4l2_write_39226 ivtv_v4l2_write 3 39226 NULL
108030 +posix_acl_to_xattr_39237 posix_acl_to_xattr 0 39237 NULL
108031 +drm_order_39244 drm_order 0 39244 NULL
108032 +snd_pcm_capture_forward_39248 snd_pcm_capture_forward 0-2 39248 NULL
108033 +r128_compat_ioctl_39250 r128_compat_ioctl 2 39250 NULL nohasharray
108034 +pwr_cont_miss_bcns_spread_read_39250 pwr_cont_miss_bcns_spread_read 3 39250 &r128_compat_ioctl_39250
108035 +i915_error_state_read_39254 i915_error_state_read 3 39254 NULL
108036 +bitmap_set_bits_39272 bitmap_set_bits 3 39272 NULL
108037 +rx_filter_protection_filter_read_39282 rx_filter_protection_filter_read 3 39282 NULL
108038 +__vmalloc_node_39308 __vmalloc_node 1-5 39308 NULL
108039 +__cfg80211_connect_result_39326 __cfg80211_connect_result 4-6 39326 NULL
108040 +insert_reserved_file_extent_39327 insert_reserved_file_extent 3-0 39327 NULL
108041 +wimax_msg_alloc_39343 wimax_msg_alloc 4 39343 NULL
108042 +__copy_from_user_nocache_39351 __copy_from_user_nocache 3-0 39351 NULL
108043 +ide_complete_rq_39354 ide_complete_rq 3 39354 NULL
108044 +do_write_log_from_user_39362 do_write_log_from_user 3-0 39362 NULL
108045 +vortex_wtdma_getlinearpos_39371 vortex_wtdma_getlinearpos 0 39371 NULL
108046 +regmap_name_read_file_39379 regmap_name_read_file 3 39379 NULL
108047 +fnic_trace_debugfs_read_39380 fnic_trace_debugfs_read 3 39380 NULL
108048 +ps_poll_ps_poll_utilization_read_39383 ps_poll_ps_poll_utilization_read 3 39383 NULL
108049 +__send_to_port_39386 __send_to_port 3 39386 NULL
108050 +perf_trace_buf_submit_39413 perf_trace_buf_submit 5 39413 NULL
108051 +user_power_read_39414 user_power_read 3 39414 NULL
108052 +alloc_agpphysmem_i8xx_39427 alloc_agpphysmem_i8xx 1 39427 NULL
108053 +__vb2_get_done_vb_39448 __vb2_get_done_vb 0 39448 NULL
108054 +apei_resources_add_39470 apei_resources_add 0 39470 NULL
108055 +setkey_unaligned_39474 setkey_unaligned 3 39474 NULL
108056 +do_get_mempolicy_39485 do_get_mempolicy 3 39485 NULL
108057 +ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries_39499 ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries 3 39499 NULL
108058 +cl_req_alloc_39523 cl_req_alloc 4 39523 NULL
108059 +int_proc_write_39542 int_proc_write 3 39542 NULL
108060 +pp_write_39554 pp_write 3 39554 NULL
108061 +ol_dqblk_block_39558 ol_dqblk_block 2-0-3 39558 NULL
108062 +datablob_format_39571 datablob_format 2 39571 NULL nohasharray
108063 +ieee80211_if_read_fwded_mcast_39571 ieee80211_if_read_fwded_mcast 3 39571 &datablob_format_39571
108064 +ext_depth_39607 ext_depth 0 39607 NULL
108065 +nfs_idmap_get_key_39616 nfs_idmap_get_key 2 39616 NULL
108066 +sdio_readb_39618 sdio_readb 0 39618 NULL
108067 +set_dev_class_39645 set_dev_class 4 39645 NULL nohasharray
108068 +dm_exception_table_init_39645 dm_exception_table_init 2 39645 &set_dev_class_39645
108069 +snd_rme32_capture_copy_39653 snd_rme32_capture_copy 5 39653 NULL
108070 +tcp_try_rmem_schedule_39657 tcp_try_rmem_schedule 3 39657 NULL
108071 +kvm_read_guest_cached_39666 kvm_read_guest_cached 4 39666 NULL
108072 +v4l_stk_read_39672 v4l_stk_read 3 39672 NULL
108073 +hsc_msg_len_get_39673 hsc_msg_len_get 0 39673 NULL
108074 +do_surface_dirty_sou_39678 do_surface_dirty_sou 7 39678 NULL
108075 +vmx_set_cr3_39688 vmx_set_cr3 2 39688 NULL
108076 +sd_completed_bytes_39705 sd_completed_bytes 0 39705 NULL
108077 +ftrace_pid_write_39710 ftrace_pid_write 3 39710 NULL
108078 +test_add_free_space_entry_39754 test_add_free_space_entry 2-3 39754 NULL
108079 +adt7316_spi_multi_read_39765 adt7316_spi_multi_read 3 39765 NULL
108080 +remap_to_origin_clear_discard_39767 remap_to_origin_clear_discard 3 39767 NULL
108081 +crypto_ablkcipher_blocksize_39811 crypto_ablkcipher_blocksize 0 39811 NULL
108082 +security_inode_listsecurity_39812 security_inode_listsecurity 0 39812 NULL
108083 +snd_pcm_oss_writev3_39818 snd_pcm_oss_writev3 3 39818 NULL
108084 +get_priv_size_39828 get_priv_size 0-1 39828 NULL
108085 +can_rmdir_39890 can_rmdir 0 39890 NULL
108086 +pkt_add_39897 pkt_add 3 39897 NULL
108087 +read_file_modal_eeprom_39909 read_file_modal_eeprom 3 39909 NULL
108088 +gen_pool_add_virt_39913 gen_pool_add_virt 4-5 39913 NULL
108089 +dw210x_op_rw_39915 dw210x_op_rw 6 39915 NULL
108090 +dma_to_mm_pfn_39916 dma_to_mm_pfn 0-1 39916 NULL
108091 +aes_encrypt_interrupt_read_39919 aes_encrypt_interrupt_read 3 39919 NULL
108092 +exofs_read_kern_39921 exofs_read_kern 6 39921 NULL nohasharray
108093 +oom_score_adj_read_39921 oom_score_adj_read 3 39921 &exofs_read_kern_39921
108094 +__spi_async_39932 __spi_async 0 39932 NULL
108095 +__get_order_39935 __get_order 0 39935 NULL
108096 +error_error_frame_read_39947 error_error_frame_read 3 39947 NULL
108097 +tty_prepare_flip_string_39955 tty_prepare_flip_string 3-0 39955 NULL
108098 +lstcon_group_list_39958 lstcon_group_list 2 39958 NULL
108099 +dma_push_rx_39973 dma_push_rx 2 39973 NULL
108100 +broadsheetfb_write_39976 broadsheetfb_write 3 39976 NULL
108101 +mthca_array_init_39987 mthca_array_init 2 39987 NULL
108102 +fw_device_op_read_39990 fw_device_op_read 3 39990 NULL
108103 +server_name2svname_39998 server_name2svname 4 39998 NULL
108104 +xen_hvm_config_40018 xen_hvm_config 2 40018 NULL
108105 +ivtvfb_write_40023 ivtvfb_write 3 40023 NULL
108106 +disc_pwup_write_40027 disc_pwup_write 3 40027 NULL
108107 +ea_foreach_i_40028 ea_foreach_i 0 40028 NULL
108108 +datablob_hmac_append_40038 datablob_hmac_append 3 40038 NULL
108109 +regmap_add_irq_chip_40042 regmap_add_irq_chip 4 40042 NULL
108110 +ocfs2_claim_clusters_40050 ocfs2_claim_clusters 0 40050 NULL
108111 +add_tty_40055 add_tty 1 40055 NULL nohasharray
108112 +l2cap_create_iframe_pdu_40055 l2cap_create_iframe_pdu 3 40055 &add_tty_40055
108113 +atomic_xchg_40070 atomic_xchg 0 40070 NULL
108114 +snd_pcm_sw_params_user_40095 snd_pcm_sw_params_user 0 40095 NULL
108115 +gen_pool_first_fit_40110 gen_pool_first_fit 2-3-4 40110 NULL
108116 +sctp_setsockopt_delayed_ack_40129 sctp_setsockopt_delayed_ack 3 40129 NULL
108117 +dwc2_max_desc_num_40132 dwc2_max_desc_num 0 40132 NULL
108118 +rx_rx_frame_checksum_read_40140 rx_rx_frame_checksum_read 3 40140 NULL
108119 +ath10k_write_simulate_fw_crash_40143 ath10k_write_simulate_fw_crash 3 40143 NULL
108120 +iwch_alloc_fastreg_pbl_40153 iwch_alloc_fastreg_pbl 2 40153 NULL
108121 +clone_backref_node_40154 clone_backref_node 0 40154 NULL
108122 +pt_write_40159 pt_write 3 40159 NULL
108123 +scsi_sg_count_40182 scsi_sg_count 0 40182 NULL
108124 +ipr_alloc_ucode_buffer_40199 ipr_alloc_ucode_buffer 1 40199 NULL nohasharray
108125 +devnode_find_40199 devnode_find 3-2 40199 &ipr_alloc_ucode_buffer_40199
108126 +allocate_probes_40204 allocate_probes 1 40204 NULL
108127 +acpi_system_write_alarm_40205 acpi_system_write_alarm 3 40205 NULL
108128 +au0828_v4l2_read_40220 au0828_v4l2_read 3 40220 NULL
108129 +compress_file_range_40225 compress_file_range 3-4 40225 NULL
108130 +osst_read_40237 osst_read 3 40237 NULL
108131 +lpage_info_slot_40243 lpage_info_slot 3-1 40243 NULL
108132 +ocfs2_zero_extend_get_range_40248 ocfs2_zero_extend_get_range 4-3 40248 NULL
108133 +rs_sta_dbgfs_scale_table_read_40262 rs_sta_dbgfs_scale_table_read 3 40262 NULL
108134 +ext2_fiemap_40271 ext2_fiemap 4 40271 NULL
108135 +usbnet_read_cmd_40275 usbnet_read_cmd 7 40275 NULL
108136 +rx_xfr_hint_trig_read_40283 rx_xfr_hint_trig_read 3 40283 NULL
108137 +vfio_unmap_unpin_40284 vfio_unmap_unpin 3 40284 NULL
108138 +_calc_trunk_info_40291 _calc_trunk_info 2 40291 NULL
108139 +SyS_bind_40303 SyS_bind 3 40303 NULL
108140 +ubi_io_write_data_40305 ubi_io_write_data 0-5-4 40305 NULL
108141 +batadv_tt_changes_fill_buff_40323 batadv_tt_changes_fill_buff 4 40323 NULL
108142 +ib_get_mad_data_offset_40336 ib_get_mad_data_offset 0 40336 NULL
108143 +mmio_read_40348 mmio_read 4 40348 NULL
108144 +ocfs2_release_clusters_40355 ocfs2_release_clusters 4-0 40355 NULL
108145 +event_rx_mem_empty_read_40363 event_rx_mem_empty_read 3 40363 NULL
108146 +ocfs2_check_range_for_refcount_40365 ocfs2_check_range_for_refcount 3-2 40365 NULL
108147 +get_chars_40373 get_chars 3 40373 NULL
108148 +submit_page_section_40408 submit_page_section 0 40408 NULL
108149 +ecryptfs_read_lower_40419 ecryptfs_read_lower 3 40419 NULL
108150 +slab_node_40421 slab_node 0 40421 NULL
108151 +fb_prepare_extra_logos_40429 fb_prepare_extra_logos 0-2 40429 NULL
108152 +tomoyo_update_policy_40458 tomoyo_update_policy 2 40458 NULL
108153 +zd_usb_scnprint_id_40459 zd_usb_scnprint_id 0-3 40459 NULL
108154 +SyS_writev_40467 SyS_writev 3 40467 NULL
108155 +__i915_add_request_40469 __i915_add_request 0 40469 NULL
108156 +SyS_select_40473 SyS_select 1 40473 NULL
108157 +afs_fs_store_data_40484 afs_fs_store_data 3-4-5-6 40484 NULL
108158 +batadv_hash_new_40491 batadv_hash_new 1 40491 NULL
108159 +devcgroup_inode_permission_40492 devcgroup_inode_permission 0 40492 NULL
108160 +drm_vma_node_start_40500 drm_vma_node_start 0 40500 NULL
108161 +sg_phys_40507 sg_phys 0 40507 NULL
108162 +__ethtool_get_sset_count_40511 __ethtool_get_sset_count 0 40511 NULL
108163 +TSS_checkhmac2_40520 TSS_checkhmac2 7-5 40520 NULL
108164 +ixgbe_dbg_reg_ops_read_40540 ixgbe_dbg_reg_ops_read 3 40540 NULL
108165 +i915_gem_execbuffer_relocate_object_slow_40546 i915_gem_execbuffer_relocate_object_slow 0 40546 NULL
108166 +ima_write_policy_40548 ima_write_policy 3 40548 NULL
108167 +btrfs_flush_all_pending_stuffs_40553 btrfs_flush_all_pending_stuffs 0 40553 NULL
108168 +esp_alloc_tmp_40558 esp_alloc_tmp 2-3 40558 NULL
108169 +ufs_inode_getfrag_40560 ufs_inode_getfrag 2-4 40560 NULL
108170 +bdev_sectors_40564 bdev_sectors 0 40564 NULL
108171 +lba_to_map_index_40580 lba_to_map_index 0-1 40580 NULL
108172 +b1_get_byte_40597 b1_get_byte 0 40597 NULL
108173 +get_priv_descr_and_size_40612 get_priv_descr_and_size 0 40612 NULL
108174 +qla8044_rd_reg_40652 qla8044_rd_reg 0 40652 NULL
108175 +pid_nr_ns_40654 pid_nr_ns 0 40654 NULL
108176 +twl4030_kpwrite_u8_40665 twl4030_kpwrite_u8 3 40665 NULL
108177 +__cfg80211_roamed_40668 __cfg80211_roamed 4-6 40668 NULL
108178 +pipeline_rx_complete_stat_fifo_int_read_40671 pipeline_rx_complete_stat_fifo_int_read 3 40671 NULL
108179 +fops_read_40672 fops_read 3 40672 NULL
108180 +ext4_mark_inode_dirty_40673 ext4_mark_inode_dirty 0 40673 NULL
108181 +idr_get_empty_slot_40674 idr_get_empty_slot 0 40674 NULL
108182 +alloc_rbio_40676 alloc_rbio 4 40676 NULL
108183 +videobuf_dma_init_user_locked_40678 videobuf_dma_init_user_locked 3-4 40678 NULL
108184 +pci_enable_resources_40680 pci_enable_resources 0 40680 NULL
108185 +nfc_hci_set_param_40697 nfc_hci_set_param 5 40697 NULL
108186 +__seq_open_private_40715 __seq_open_private 3 40715 NULL
108187 +btrfs_find_one_extref_40724 btrfs_find_one_extref 0 40724 NULL
108188 +fuse_readpages_40737 fuse_readpages 4 40737 NULL
108189 +xfs_iext_remove_direct_40744 xfs_iext_remove_direct 3 40744 NULL nohasharray
108190 +find_next_zero_bit_le_40744 find_next_zero_bit_le 2-3-0 40744 &xfs_iext_remove_direct_40744
108191 +i915_gem_execbuffer_relocate_entry_40750 i915_gem_execbuffer_relocate_entry 0 40750 NULL
108192 +security_inode_listxattr_40752 security_inode_listxattr 0 40752 NULL
108193 +card_send_command_40757 card_send_command 3 40757 NULL
108194 +ad1889_readl_40765 ad1889_readl 0 40765 NULL
108195 +pg_write_40766 pg_write 3 40766 NULL
108196 +show_list_40775 show_list 3-0 40775 NULL
108197 +calcu_metadata_size_40782 calcu_metadata_size 0 40782 NULL
108198 +kfifo_out_copy_r_40784 kfifo_out_copy_r 3-0 40784 NULL
108199 +bitmap_weight_40791 bitmap_weight 0-2 40791 NULL
108200 +pyra_sysfs_read_40795 pyra_sysfs_read 6 40795 NULL
108201 +add_action_40811 add_action 4 40811 NULL
108202 +nl80211_send_roamed_40825 nl80211_send_roamed 5-7 40825 NULL
108203 +SyS_mbind_40828 SyS_mbind 5 40828 NULL
108204 +__mlx4_qp_reserve_range_40847 __mlx4_qp_reserve_range 2-3 40847 NULL
108205 +nilfs_mdt_init_40849 nilfs_mdt_init 3 40849 NULL
108206 +ocfs2_zero_partial_clusters_40856 ocfs2_zero_partial_clusters 2-3 40856 NULL
108207 +v9fs_file_read_40858 v9fs_file_read 3 40858 NULL
108208 +read_file_queue_40895 read_file_queue 3 40895 NULL
108209 +btrfs_set_inode_index_count_40901 btrfs_set_inode_index_count 0 40901 NULL
108210 +waiters_read_40902 waiters_read 3 40902 NULL
108211 +isdn_add_channels_40905 isdn_add_channels 3 40905 NULL
108212 +gfs2_ea_find_40913 gfs2_ea_find 0 40913 NULL
108213 +vol_cdev_write_40915 vol_cdev_write 3 40915 NULL
108214 +snd_vx_create_40948 snd_vx_create 4 40948 NULL nohasharray
108215 +sg_alloc_table_40948 sg_alloc_table 0 40948 &snd_vx_create_40948
108216 +wm8994_free_irq_40951 wm8994_free_irq 2 40951 NULL
108217 +rds_sendmsg_40976 rds_sendmsg 4 40976 NULL
108218 +btrfs_find_orphan_item_40977 btrfs_find_orphan_item 0 40977 NULL
108219 +insert_old_idx_40987 insert_old_idx 0 40987 NULL
108220 +il_dbgfs_fh_reg_read_40993 il_dbgfs_fh_reg_read 3 40993 NULL
108221 +mac80211_format_buffer_41010 mac80211_format_buffer 2 41010 NULL
108222 +mtd_block_isbad_41015 mtd_block_isbad 0 41015 NULL
108223 +__proc_dobitmasks_41029 __proc_dobitmasks 5 41029 NULL
108224 +_req_append_segment_41031 _req_append_segment 2 41031 NULL
108225 +mISDN_sock_sendmsg_41035 mISDN_sock_sendmsg 4 41035 NULL
108226 +ocfs2_xattr_index_block_find_41040 ocfs2_xattr_index_block_find 0 41040 NULL
108227 +lprocfs_write_frac_helper_41050 lprocfs_write_frac_helper 2 41050 NULL
108228 +BcmFlash2xBulkWrite_41054 BcmFlash2xBulkWrite 0 41054 NULL
108229 +calculate_order_41061 calculate_order 0 41061 NULL
108230 +vfs_listxattr_41062 vfs_listxattr 0 41062 NULL nohasharray
108231 +beacon_filtering_write_41062 beacon_filtering_write 3 41062 &vfs_listxattr_41062
108232 +cfg80211_inform_bss_frame_41078 cfg80211_inform_bss_frame 4 41078 NULL
108233 +roccat_read_41093 roccat_read 3 41093 NULL nohasharray
108234 +nvme_map_user_pages_41093 nvme_map_user_pages 4-3 41093 &roccat_read_41093
108235 +dma_attach_41094 dma_attach 6-5 41094 NULL
108236 +provide_user_output_41105 provide_user_output 3 41105 NULL
108237 +f_audio_buffer_alloc_41110 f_audio_buffer_alloc 1 41110 NULL
108238 +ath10k_read_wmi_services_41112 ath10k_read_wmi_services 3 41112 NULL
108239 +ocfs2_extend_trans_41116 ocfs2_extend_trans 0 41116 NULL
108240 +btrfs_subvolume_reserve_metadata_41130 btrfs_subvolume_reserve_metadata 3 41130 NULL
108241 +v4l2_ctrl_new_int_menu_41151 v4l2_ctrl_new_int_menu 4 41151 NULL
108242 +tx_frag_mpdu_alloc_failed_read_41167 tx_frag_mpdu_alloc_failed_read 3 41167 NULL
108243 +dvb_ca_write_41171 dvb_ca_write 3 41171 NULL
108244 +ol_quota_chunk_block_41177 ol_quota_chunk_block 0-2 41177 NULL
108245 +dgap_driver_kzmalloc_41189 dgap_driver_kzmalloc 1 41189 NULL
108246 +compat_sys_process_vm_writev_41194 compat_sys_process_vm_writev 3-5 41194 NULL
108247 +dfs_file_write_41196 dfs_file_write 3 41196 NULL
108248 +ocfs2_read_quota_block_41207 ocfs2_read_quota_block 2 41207 NULL
108249 +nfs_page_array_len_41219 nfs_page_array_len 0-2-1 41219 NULL
108250 +cfg80211_process_disassoc_41231 cfg80211_process_disassoc 3 41231 NULL
108251 +hiddev_compat_ioctl_41255 hiddev_compat_ioctl 2 41255 NULL
108252 +create_dir_41256 create_dir 0 41256 NULL
108253 +erst_read_41260 erst_read 0 41260 NULL
108254 +setup_cluster_bitmap_41270 setup_cluster_bitmap 4-0 41270 NULL
108255 +alloc_context_41283 alloc_context 1 41283 NULL
108256 +objio_alloc_io_state_41316 objio_alloc_io_state 7-6 41316 NULL
108257 +o2hb_setup_one_bio_41341 o2hb_setup_one_bio 4 41341 NULL
108258 +twl_change_queue_depth_41342 twl_change_queue_depth 2 41342 NULL
108259 +rtw_android_set_block_41347 rtw_android_set_block 0 41347 NULL
108260 +irq_expand_nr_irqs_41351 irq_expand_nr_irqs 0 41351 NULL
108261 +cnic_init_id_tbl_41354 cnic_init_id_tbl 2 41354 NULL
108262 +jbd2_alloc_41359 jbd2_alloc 1 41359 NULL
108263 +kmp_init_41373 kmp_init 2 41373 NULL
108264 +netlink_alloc_large_skb_41375 netlink_alloc_large_skb 1 41375 NULL
108265 +isr_commands_read_41398 isr_commands_read 3 41398 NULL
108266 +is_writethrough_io_41406 is_writethrough_io 3 41406 NULL
108267 +rx_defrag_decrypt_failed_read_41411 rx_defrag_decrypt_failed_read 3 41411 NULL
108268 +xfs_iext_add_41422 xfs_iext_add 3 41422 NULL
108269 +isdn_ppp_fill_rq_41428 isdn_ppp_fill_rq 2 41428 NULL
108270 +lbs_rdrf_read_41431 lbs_rdrf_read 3 41431 NULL
108271 +iio_device_alloc_41440 iio_device_alloc 1 41440 NULL
108272 +ntfs_file_buffered_write_41442 ntfs_file_buffered_write 6-4 41442 NULL
108273 +pcpu_build_alloc_info_41443 pcpu_build_alloc_info 1-2-3 41443 NULL
108274 +layout_leb_in_gaps_41470 layout_leb_in_gaps 0 41470 NULL
108275 +snd_pcm_status_41472 snd_pcm_status 0 41472 NULL
108276 +rt2x00debug_write_rfcsr_41473 rt2x00debug_write_rfcsr 3 41473 NULL
108277 +bl_alloc_init_bio_41478 bl_alloc_init_bio 1 41478 NULL
108278 +split_item_41483 split_item 0 41483 NULL
108279 +kvm_unmap_hva_range_41484 kvm_unmap_hva_range 3-2 41484 NULL
108280 +ipath_user_sdma_page_length_41490 ipath_user_sdma_page_length 0-2-1 41490 NULL
108281 +wep_interrupt_read_41492 wep_interrupt_read 3 41492 NULL
108282 +SyS_get_mempolicy_41495 SyS_get_mempolicy 3-4 41495 NULL
108283 +hpfs_translate_name_41497 hpfs_translate_name 3 41497 NULL
108284 +xfrm_hash_new_size_41505 xfrm_hash_new_size 0-1 41505 NULL
108285 +perf_sw_event_41517 perf_sw_event 2 41517 NULL
108286 +SyS_preadv_41523 SyS_preadv 3 41523 NULL
108287 +dm_get_reserved_rq_based_ios_41529 dm_get_reserved_rq_based_ios 0 41529 NULL
108288 +add_excluded_extent_41547 add_excluded_extent 0 41547 NULL
108289 +tx_tx_frame_checksum_read_41553 tx_tx_frame_checksum_read 3 41553 NULL
108290 +ath6kl_endpoint_stats_read_41554 ath6kl_endpoint_stats_read 3 41554 NULL
108291 +si476x_radio_fops_read_41559 si476x_radio_fops_read 3 41559 NULL nohasharray
108292 +nr_status_frames_41559 nr_status_frames 0-1 41559 &si476x_radio_fops_read_41559
108293 +rng_dev_read_41581 rng_dev_read 3 41581 NULL
108294 +vga_io_r_41609 vga_io_r 0 41609 NULL
108295 +tcp_hdrlen_41610 tcp_hdrlen 0 41610 NULL
108296 +lbs_bcnmiss_write_41613 lbs_bcnmiss_write 3 41613 NULL nohasharray
108297 +usb_endpoint_maxp_41613 usb_endpoint_maxp 0 41613 &lbs_bcnmiss_write_41613
108298 +a2mp_send_41615 a2mp_send 4 41615 NULL
108299 +btrfs_calc_trunc_metadata_size_41626 btrfs_calc_trunc_metadata_size 0-2 41626 NULL
108300 +lstcon_batch_list_41627 lstcon_batch_list 2 41627 NULL
108301 +mempool_create_kmalloc_pool_41650 mempool_create_kmalloc_pool 1 41650 NULL
108302 +rx_rx_pre_complt_read_41653 rx_rx_pre_complt_read 3 41653 NULL
108303 +get_std_timing_41654 get_std_timing 0 41654 NULL
108304 +start_graph_tracing_41656 start_graph_tracing 0 41656 NULL
108305 +ieee80211_if_fmt_bssid_41677 ieee80211_if_fmt_bssid 3 41677 NULL
108306 +params_period_bytes_41683 params_period_bytes 0 41683 NULL
108307 +fill_pcm_stream_name_41685 fill_pcm_stream_name 2 41685 NULL
108308 +lov_unpackmd_41701 lov_unpackmd 4 41701 NULL
108309 +__ext3_journal_get_write_access_41705 __ext3_journal_get_write_access 0 41705 NULL
108310 +apei_exec_for_each_entry_41717 apei_exec_for_each_entry 0 41717 NULL
108311 +bdx_tx_db_init_41719 bdx_tx_db_init 2 41719 NULL
108312 +ocfs2_block_group_fill_41744 ocfs2_block_group_fill 0 41744 NULL
108313 +fillonedir_41746 fillonedir 3 41746 NULL
108314 +ocfs2_dx_dir_rebalance_41793 ocfs2_dx_dir_rebalance 7 41793 NULL
108315 +iwl_dbgfs_bt_notif_read_41794 iwl_dbgfs_bt_notif_read 3 41794 NULL
108316 +remap_pte_range_41800 remap_pte_range 5 41800 NULL
108317 +hsi_alloc_controller_41802 hsi_alloc_controller 1 41802 NULL
108318 +regcache_sync_block_raw_41803 regcache_sync_block_raw 4-3 41803 NULL
108319 +rtw_android_get_macaddr_41812 rtw_android_get_macaddr 0 41812 NULL
108320 +da9052_enable_irq_41814 da9052_enable_irq 2 41814 NULL
108321 +sco_send_frame_41815 sco_send_frame 3 41815 NULL
108322 +lp_gpio_to_irq_41822 lp_gpio_to_irq 2 41822 NULL
108323 +ixgbe_dbg_netdev_ops_read_41839 ixgbe_dbg_netdev_ops_read 3 41839 NULL
108324 +do_ip_setsockopt_41852 do_ip_setsockopt 5 41852 NULL
108325 +keyctl_instantiate_key_41855 keyctl_instantiate_key 3 41855 NULL
108326 +pci_map_single_41869 pci_map_single 0 41869 NULL
108327 +usb_gadget_get_string_41871 usb_gadget_get_string 0 41871 NULL
108328 +v_APCI3120_InterruptDmaMoveBlock16bit_41914 v_APCI3120_InterruptDmaMoveBlock16bit 4 41914 NULL
108329 +get_fdb_entries_41916 get_fdb_entries 3 41916 NULL
108330 +find_ge_pid_41918 find_ge_pid 1 41918 NULL
108331 +build_inv_iotlb_pages_41922 build_inv_iotlb_pages 4-5 41922 NULL
108332 +nfsd_getxattr_41934 nfsd_getxattr 0 41934 NULL
108333 +ext4_da_write_inline_data_begin_41935 ext4_da_write_inline_data_begin 3-4 41935 NULL
108334 +read_gssp_41947 read_gssp 3 41947 NULL
108335 +ocfs2_xattr_bucket_get_name_value_41949 ocfs2_xattr_bucket_get_name_value 0 41949 NULL
108336 +portnames_read_41958 portnames_read 3 41958 NULL
108337 +ubi_self_check_all_ff_41959 ubi_self_check_all_ff 0-4 41959 NULL
108338 +dst_mtu_41969 dst_mtu 0 41969 NULL
108339 +btrfs_check_trunc_cache_free_space_41973 btrfs_check_trunc_cache_free_space 0 41973 NULL
108340 +cx24116_writeregN_41975 cx24116_writeregN 4 41975 NULL
108341 +ubi_io_is_bad_41983 ubi_io_is_bad 0 41983 NULL
108342 +pool_allocate_42012 pool_allocate 3 42012 NULL
108343 +spidev_sync_read_42014 spidev_sync_read 0 42014 NULL
108344 +rs_sta_dbgfs_scale_table_write_42017 rs_sta_dbgfs_scale_table_write 3 42017 NULL
108345 +nouveau_ttm_tt_create_42026 nouveau_ttm_tt_create 2 42026 NULL
108346 +acpi_ut_create_buffer_object_42030 acpi_ut_create_buffer_object 1 42030 NULL
108347 +__btrfs_drop_extents_42032 __btrfs_drop_extents 5-0 42032 NULL
108348 +__hwahc_op_set_gtk_42038 __hwahc_op_set_gtk 4 42038 NULL
108349 +irda_sendmsg_ultra_42047 irda_sendmsg_ultra 4 42047 NULL
108350 +dma_generic_alloc_coherent_42048 dma_generic_alloc_coherent 2 42048 NULL nohasharray
108351 +jffs2_do_link_42048 jffs2_do_link 6 42048 &dma_generic_alloc_coherent_42048
108352 +ps_poll_upsd_max_ap_turn_read_42050 ps_poll_upsd_max_ap_turn_read 3 42050 NULL
108353 +InterfaceTransmitPacket_42058 InterfaceTransmitPacket 3 42058 NULL
108354 +alloc_bitset_42085 alloc_bitset 1 42085 NULL
108355 +scsi_execute_req_42088 scsi_execute_req 5 42088 NULL
108356 +sk_chk_filter_42095 sk_chk_filter 2 42095 NULL
108357 +send_truncate_42107 send_truncate 0 42107 NULL
108358 +submit_inquiry_42108 submit_inquiry 3 42108 NULL
108359 +sysfs_read_file_42113 sysfs_read_file 3 42113 NULL nohasharray
108360 +dw_dma_cyclic_prep_42113 dw_dma_cyclic_prep 3-4 42113 &sysfs_read_file_42113
108361 +__btrfs_unlink_inode_42114 __btrfs_unlink_inode 0 42114 NULL
108362 +ext4_do_update_inode_42127 ext4_do_update_inode 0 42127 NULL
108363 +blk_ioctl_zeroout_42160 blk_ioctl_zeroout 3 42160 NULL
108364 +mmc_align_data_size_42161 mmc_align_data_size 0-2 42161 NULL
108365 +kvm_lapic_get_cr8_42166 kvm_lapic_get_cr8 0 42166 NULL
108366 +read_file_base_eeprom_42168 read_file_base_eeprom 3 42168 NULL
108367 +oprofilefs_str_to_user_42182 oprofilefs_str_to_user 3 42182 NULL
108368 +write_file_beacon_42185 write_file_beacon 3 42185 NULL
108369 +get_znodes_to_commit_42201 get_znodes_to_commit 0 42201 NULL
108370 +ocfs2_resv_window_bits_42207 ocfs2_resv_window_bits 0 42207 NULL
108371 +pla_ocp_read_42235 pla_ocp_read 3 42235 NULL
108372 +rx_defrag_need_decrypt_read_42253 rx_defrag_need_decrypt_read 3 42253 NULL
108373 +vfio_remove_dma_overlap_42255 vfio_remove_dma_overlap 2 42255 NULL
108374 +__pcpu_size_to_slot_42271 __pcpu_size_to_slot 0 42271 NULL
108375 +snd_pcm_hw_param_value_max_42280 snd_pcm_hw_param_value_max 0 42280 NULL
108376 +__cpus_weight_42299 __cpus_weight 2-0 42299 NULL
108377 +sel_read_perm_42302 sel_read_perm 3 42302 NULL
108378 +sctp_setsockopt_del_key_42304 sctp_setsockopt_del_key 3 42304 NULL nohasharray
108379 +ulong_read_file_42304 ulong_read_file 3 42304 &sctp_setsockopt_del_key_42304
108380 +gfn_to_hva_42305 gfn_to_hva 2-0 42305 NULL
108381 +close_cur_inode_file_42308 close_cur_inode_file 0 42308 NULL nohasharray
108382 +xfs_vm_readpages_42308 xfs_vm_readpages 4 42308 &close_cur_inode_file_42308
108383 +free_cblock_42318 free_cblock 2 42318 NULL
108384 +hysdn_conf_read_42324 hysdn_conf_read 3 42324 NULL
108385 +tcp_sync_mss_42330 tcp_sync_mss 2-0 42330 NULL
108386 +snd_pcm_plug_alloc_42339 snd_pcm_plug_alloc 2 42339 NULL
108387 +ide_raw_taskfile_42355 ide_raw_taskfile 4 42355 NULL
108388 +drbd_md_last_sector_42378 drbd_md_last_sector 0 42378 NULL
108389 +il_dbgfs_disable_ht40_read_42386 il_dbgfs_disable_ht40_read 3 42386 NULL
108390 +hash_ipportnet4_expire_42391 hash_ipportnet4_expire 3 42391 NULL
108391 +msnd_fifo_read_42406 msnd_fifo_read 0-3 42406 NULL
108392 +krng_get_random_42420 krng_get_random 3 42420 NULL
108393 +gsm_data_alloc_42437 gsm_data_alloc 3 42437 NULL
108394 +key_conf_keyidx_read_42443 key_conf_keyidx_read 3 42443 NULL
108395 +alloc_request_42448 alloc_request 0 42448 NULL
108396 +snd_pcm_action_group_42452 snd_pcm_action_group 0 42452 NULL
108397 +tcm_loop_change_queue_depth_42454 tcm_loop_change_queue_depth 2 42454 NULL
108398 +kuc_free_42455 kuc_free 2 42455 NULL
108399 +tc3589x_gpio_irq_get_virq_42457 tc3589x_gpio_irq_get_virq 2 42457 NULL
108400 +ext3_valid_block_bitmap_42459 ext3_valid_block_bitmap 3 42459 NULL
108401 +__simple_xattr_set_42474 __simple_xattr_set 4 42474 NULL
108402 +follow_hugetlb_page_42486 follow_hugetlb_page 0-7 42486 NULL
108403 +omfs_readpages_42490 omfs_readpages 4 42490 NULL
108404 +bypass_write_42498 bypass_write 3 42498 NULL
108405 +SyS_mincore_42511 SyS_mincore 1-2 42511 NULL
108406 +jbd2_log_wait_commit_42519 jbd2_log_wait_commit 0 42519 NULL
108407 +kvm_write_wall_clock_42520 kvm_write_wall_clock 2 42520 NULL
108408 +dio_bio_complete_42524 dio_bio_complete 0 42524 NULL
108409 +smk_write_netlbladdr_42525 smk_write_netlbladdr 3 42525 NULL
108410 +self_check_ec_hdr_42528 self_check_ec_hdr 0 42528 NULL
108411 +__register_ftrace_function_42543 __register_ftrace_function 0 42543 NULL
108412 +dbAllocNear_42546 dbAllocNear 0 42546 NULL
108413 +inorder_next_42548 inorder_next 1-0 42548 NULL
108414 +ath6kl_wmi_proc_events_vif_42549 ath6kl_wmi_proc_events_vif 5 42549 NULL
108415 +udp_recvmsg_42558 udp_recvmsg 4 42558 NULL
108416 +iwl_print_event_log_42566 iwl_print_event_log 0-5-7 42566 NULL
108417 +ocfs2_reserve_suballoc_bits_42569 ocfs2_reserve_suballoc_bits 0 42569 NULL
108418 +xfrm_new_hash_mask_42579 xfrm_new_hash_mask 0-1 42579 NULL
108419 +oom_score_adj_write_42594 oom_score_adj_write 3 42594 NULL
108420 +map_state_42602 map_state 1 42602 NULL
108421 +resp_write_42628 resp_write 2 42628 NULL
108422 +ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout_42635 ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout 3 42635 NULL
108423 +scsi_activate_tcq_42640 scsi_activate_tcq 2 42640 NULL
108424 +br_mdb_rehash_42643 br_mdb_rehash 2 42643 NULL
108425 +parport_pc_compat_write_block_pio_42644 parport_pc_compat_write_block_pio 3 42644 NULL
108426 +ocfs2_search_chain_42655 ocfs2_search_chain 0 42655 NULL
108427 +request_key_and_link_42693 request_key_and_link 4 42693 NULL
108428 +acpi_dev_get_irqresource_42694 acpi_dev_get_irqresource 2 42694 NULL
108429 +vb2_read_42703 vb2_read 3 42703 NULL
108430 +__ocfs2_decrease_refcount_42717 __ocfs2_decrease_refcount 5-4-0 42717 NULL
108431 +read_status_42722 read_status 0 42722 NULL
108432 +dvb_demux_ioctl_42733 dvb_demux_ioctl 2 42733 NULL
108433 +set_aoe_iflist_42737 set_aoe_iflist 2 42737 NULL
108434 +ax25_setsockopt_42740 ax25_setsockopt 5 42740 NULL
108435 +xen_bind_pirq_gsi_to_irq_42750 xen_bind_pirq_gsi_to_irq 1 42750 NULL
108436 +dpm_sysfs_add_42756 dpm_sysfs_add 0 42756 NULL
108437 +x25_recvmsg_42777 x25_recvmsg 4 42777 NULL
108438 +snd_midi_event_decode_42780 snd_midi_event_decode 0 42780 NULL
108439 +cryptd_hash_setkey_42781 cryptd_hash_setkey 3 42781 NULL nohasharray
108440 +isku_sysfs_read_info_42781 isku_sysfs_read_info 6 42781 &cryptd_hash_setkey_42781
108441 +elfcorehdr_read_notes_42786 elfcorehdr_read_notes 2 42786 NULL
108442 +koneplus_sysfs_read_42792 koneplus_sysfs_read 6 42792 NULL
108443 +ntfs_attr_extend_allocation_42796 ntfs_attr_extend_allocation 0-2-3 42796 NULL
108444 +fw_device_op_compat_ioctl_42804 fw_device_op_compat_ioctl 2 42804 NULL
108445 +drm_ioctl_42813 drm_ioctl 2 42813 NULL
108446 +iwl_dbgfs_ucode_bt_stats_read_42820 iwl_dbgfs_ucode_bt_stats_read 3 42820 NULL
108447 +xfs_iomap_eof_prealloc_initial_size_42822 xfs_iomap_eof_prealloc_initial_size 0-3 42822 NULL
108448 +set_arg_42824 set_arg 3 42824 NULL
108449 +si476x_radio_read_rsq_blob_42827 si476x_radio_read_rsq_blob 3 42827 NULL
108450 +ocfs2_desc_bitmap_to_cluster_off_42831 ocfs2_desc_bitmap_to_cluster_off 2 42831 NULL
108451 +prandom_u32_42853 prandom_u32 0 42853 NULL
108452 +ntfs_mapping_pairs_build_42859 ntfs_mapping_pairs_build 0 42859 NULL
108453 +nouveau_vm_create_42869 nouveau_vm_create 3-2 42869 NULL
108454 +ocfs2_clusters_for_bytes_42872 ocfs2_clusters_for_bytes 0-2 42872 NULL
108455 +nvme_trans_unit_serial_page_42879 nvme_trans_unit_serial_page 4 42879 NULL
108456 +xpc_kmalloc_cacheline_aligned_42895 xpc_kmalloc_cacheline_aligned 1 42895 NULL
108457 +hd_end_request_42904 hd_end_request 2 42904 NULL
108458 +sta_last_rx_rate_read_42909 sta_last_rx_rate_read 3 42909 NULL
108459 +sctp_getsockopt_maxburst_42941 sctp_getsockopt_maxburst 2 42941 NULL
108460 +get_unmapped_area_42944 get_unmapped_area 0 42944 NULL
108461 +vx_reset_chk_42946 vx_reset_chk 0 42946 NULL
108462 +send_link_42948 send_link 0 42948 NULL
108463 +blkdev_direct_IO_42962 blkdev_direct_IO 4 42962 NULL
108464 +read_file_node_stat_42964 read_file_node_stat 3 42964 NULL
108465 +compat_udpv6_setsockopt_42981 compat_udpv6_setsockopt 5 42981 NULL
108466 +nfs_idmap_get_desc_42990 nfs_idmap_get_desc 2-4 42990 NULL nohasharray
108467 +rtw_os_xmit_resource_alloc_42990 rtw_os_xmit_resource_alloc 3 42990 &nfs_idmap_get_desc_42990
108468 +mlx4_qp_reserve_range_43000 mlx4_qp_reserve_range 2-3 43000 NULL
108469 +isr_rx_mem_overflow_read_43025 isr_rx_mem_overflow_read 3 43025 NULL
108470 +add_bytes_to_bitmap_43026 add_bytes_to_bitmap 0-3-4 43026 NULL
108471 +init_phys_status_page_43028 init_phys_status_page 0 43028 NULL
108472 +wep_default_key_count_read_43035 wep_default_key_count_read 3 43035 NULL
108473 +send_to_group_43051 send_to_group 0 43051 NULL
108474 +nouveau_gpuobj_create__43072 nouveau_gpuobj_create_ 9 43072 NULL
108475 +nfs_map_group_to_gid_43082 nfs_map_group_to_gid 3 43082 NULL
108476 +ieee80211_if_fmt_drop_unencrypted_43107 ieee80211_if_fmt_drop_unencrypted 3 43107 NULL
108477 +calculate_node_totalpages_43118 calculate_node_totalpages 2-3 43118 NULL
108478 +cow_file_range_inline_43132 cow_file_range_inline 4 43132 NULL
108479 +read_file_dfs_43145 read_file_dfs 3 43145 NULL
108480 +cfs_cpt_table_alloc_43159 cfs_cpt_table_alloc 1 43159 NULL
108481 +usb_string_sub_43164 usb_string_sub 0 43164 NULL
108482 +il_dbgfs_power_save_status_read_43165 il_dbgfs_power_save_status_read 3 43165 NULL
108483 +send_cmd_43168 send_cmd 0 43168 NULL
108484 +ath6kl_set_assoc_req_ies_43185 ath6kl_set_assoc_req_ies 3 43185 NULL
108485 +ext4_xattr_ibody_get_43200 ext4_xattr_ibody_get 0 43200 NULL
108486 +uio_write_43202 uio_write 3 43202 NULL
108487 +iso_callback_43208 iso_callback 3 43208 NULL
108488 +ath10k_p2p_calc_noa_ie_len_43209 ath10k_p2p_calc_noa_ie_len 0 43209 NULL
108489 +f2fs_acl_from_disk_43210 f2fs_acl_from_disk 2 43210 NULL
108490 +atomic_long_add_return_43217 atomic_long_add_return 1-0 43217 NULL
108491 +vmemmap_alloc_block_43245 vmemmap_alloc_block 1 43245 NULL
108492 +fixup_leb_43256 fixup_leb 3 43256 NULL
108493 +ide_end_rq_43269 ide_end_rq 4 43269 NULL
108494 +nilfs_direct_IO_43271 nilfs_direct_IO 4 43271 NULL
108495 +mlx5_ib_reg_user_mr_43275 mlx5_ib_reg_user_mr 2-3 43275 NULL
108496 +parport_pc_ecp_write_block_pio_43278 parport_pc_ecp_write_block_pio 3 43278 NULL nohasharray
108497 +evtchn_write_43278 evtchn_write 3 43278 &parport_pc_ecp_write_block_pio_43278
108498 +filemap_write_and_wait_range_43279 filemap_write_and_wait_range 0 43279 NULL
108499 +mpage_alloc_43299 mpage_alloc 3 43299 NULL
108500 +get_nr_irqs_gsi_43315 get_nr_irqs_gsi 0 43315 NULL
108501 +mmu_set_spte_43327 mmu_set_spte 7-6 43327 NULL
108502 +__ext4_get_inode_loc_43332 __ext4_get_inode_loc 0 43332 NULL
108503 +kvm_host_page_size_43348 kvm_host_page_size 2-0 43348 NULL
108504 +activation_descriptor_init_43358 activation_descriptor_init 1 43358 NULL
108505 +gart_free_coherent_43362 gart_free_coherent 4-2 43362 NULL
108506 +hash_net4_expire_43378 hash_net4_expire 3 43378 NULL
108507 +xenfb_write_43412 xenfb_write 3 43412 NULL
108508 +__alloc_bootmem_low_43423 __alloc_bootmem_low 1 43423 NULL
108509 +usb_alloc_urb_43436 usb_alloc_urb 1 43436 NULL
108510 +ath6kl_wmi_roam_tbl_event_rx_43440 ath6kl_wmi_roam_tbl_event_rx 3 43440 NULL
108511 +ocfs2_rotate_tree_left_43442 ocfs2_rotate_tree_left 0 43442 NULL
108512 +usemap_size_43443 usemap_size 0-2-1 43443 NULL nohasharray
108513 +usb_string_43443 usb_string 0 43443 &usemap_size_43443
108514 +get_vm_area_size_43444 get_vm_area_size 0 43444 NULL
108515 +nvme_trans_device_id_page_43466 nvme_trans_device_id_page 4 43466 NULL
108516 +calculate_discard_block_size_43480 calculate_discard_block_size 0 43480 NULL nohasharray
108517 +alloc_new_reservation_43480 alloc_new_reservation 4-0-2 43480 &calculate_discard_block_size_43480
108518 +tx_tx_data_prepared_read_43497 tx_tx_data_prepared_read 3 43497 NULL
108519 +ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime_43505 ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime 3 43505 NULL
108520 +do_readlink_43518 do_readlink 2 43518 NULL
108521 +dvb_ca_en50221_io_write_43533 dvb_ca_en50221_io_write 3 43533 NULL
108522 +read_events_43534 read_events 3 43534 NULL
108523 +cachefiles_daemon_write_43535 cachefiles_daemon_write 3 43535 NULL
108524 +tx_frag_failed_read_43540 tx_frag_failed_read 3 43540 NULL nohasharray
108525 +ufs_alloccg_block_43540 ufs_alloccg_block 3-0 43540 &tx_frag_failed_read_43540
108526 +request_resource_43548 request_resource 0 43548 NULL
108527 +rpc_malloc_43573 rpc_malloc 2 43573 NULL
108528 +handle_frequent_errors_43599 handle_frequent_errors 4 43599 NULL
108529 +lpfc_idiag_drbacc_read_reg_43606 lpfc_idiag_drbacc_read_reg 0-3 43606 NULL
108530 +proc_read_43614 proc_read 3 43614 NULL
108531 +i915_gem_execbuffer_relocate_object_slow_43618 i915_gem_execbuffer_relocate_object_slow 0 43618 NULL nohasharray
108532 +disable_dma_on_even_43618 disable_dma_on_even 0 43618 &i915_gem_execbuffer_relocate_object_slow_43618
108533 +alloc_thread_groups_43625 alloc_thread_groups 2 43625 NULL
108534 +random_write_43656 random_write 3 43656 NULL
108535 +bio_integrity_tag_43658 bio_integrity_tag 3 43658 NULL
108536 +ext4_acl_count_43659 ext4_acl_count 0-1 43659 NULL
108537 +fs_path_copy_43673 fs_path_copy 0 43673 NULL
108538 +dmam_declare_coherent_memory_43679 dmam_declare_coherent_memory 4 43679 NULL
108539 +calgary_map_page_43686 calgary_map_page 4 43686 NULL
108540 +max77693_bulk_write_43698 max77693_bulk_write 2-3 43698 NULL
108541 +wait_for_completion_interruptible_43723 wait_for_completion_interruptible 0 43723 NULL
108542 +drbd_md_first_sector_43729 drbd_md_first_sector 0 43729 NULL
108543 +reset_card_proc_43731 reset_card_proc 0 43731 NULL
108544 +snd_rme32_playback_copy_43732 snd_rme32_playback_copy 5 43732 NULL
108545 +ocfs2_replace_clusters_43733 ocfs2_replace_clusters 5-0 43733 NULL
108546 +fuse_conn_congestion_threshold_write_43736 fuse_conn_congestion_threshold_write 3 43736 NULL
108547 +__bm_find_next_43748 __bm_find_next 2 43748 NULL
108548 +gigaset_initcs_43753 gigaset_initcs 2 43753 NULL
108549 +sctp_setsockopt_active_key_43755 sctp_setsockopt_active_key 3 43755 NULL
108550 +ocfs2_xattr_get_value_outside_43787 ocfs2_xattr_get_value_outside 0 43787 NULL nohasharray
108551 +byte_pos_43787 byte_pos 0-2 43787 &ocfs2_xattr_get_value_outside_43787
108552 +btrfs_copy_from_user_43806 btrfs_copy_from_user 0-3-1 43806 NULL
108553 +ext4_read_block_bitmap_43814 ext4_read_block_bitmap 2 43814 NULL
108554 +div64_u64_safe_43815 div64_u64_safe 2-1 43815 NULL
108555 +ext4_split_extent_43818 ext4_split_extent 0 43818 NULL
108556 +i915_gem_execbuffer_relocate_entry_43822 i915_gem_execbuffer_relocate_entry 0 43822 NULL
108557 +ieee80211_if_fmt_element_ttl_43825 ieee80211_if_fmt_element_ttl 3 43825 NULL
108558 +ieee80211_alloc_hw_43829 ieee80211_alloc_hw 1 43829 NULL
108559 +read_flush_43851 read_flush 3 43851 NULL
108560 +ocfs2_block_group_find_clear_bits_43874 ocfs2_block_group_find_clear_bits 4 43874 NULL
108561 +pm860x_bulk_write_43875 pm860x_bulk_write 2-3 43875 NULL
108562 +SendString_43928 SendString 3 43928 NULL
108563 +xen_register_gsi_43946 xen_register_gsi 2-1 43946 NULL
108564 +stats_dot11RTSFailureCount_read_43948 stats_dot11RTSFailureCount_read 3 43948 NULL
108565 +perf_tp_event_43971 perf_tp_event 2 43971 NULL
108566 +__get_required_blob_size_43980 __get_required_blob_size 0-3-2 43980 NULL
108567 +nla_reserve_43984 nla_reserve 3 43984 NULL
108568 +__clkdev_alloc_43990 __clkdev_alloc 1 43990 NULL
108569 +scsi_command_size_43992 scsi_command_size 0 43992 NULL nohasharray
108570 +kvm_read_guest_virt_43992 kvm_read_guest_virt 4-2 43992 &scsi_command_size_43992 nohasharray
108571 +bcm_recvmsg_43992 bcm_recvmsg 4 43992 &kvm_read_guest_virt_43992
108572 +ulist_add_43994 ulist_add 0 43994 NULL
108573 +emit_flags_44006 emit_flags 4-3 44006 NULL
108574 +write_flush_procfs_44011 write_flush_procfs 3 44011 NULL
108575 +fru_strlen_44046 fru_strlen 0 44046 NULL
108576 +tree_insert_offset_44069 tree_insert_offset 0 44069 NULL
108577 +SYSC_add_key_44079 SYSC_add_key 4 44079 NULL
108578 +btrfs_prev_leaf_44083 btrfs_prev_leaf 0 44083 NULL nohasharray
108579 +load_discard_44083 load_discard 3 44083 &btrfs_prev_leaf_44083
108580 +__vxge_hw_vpath_tim_configure_44093 __vxge_hw_vpath_tim_configure 2 44093 NULL
108581 +xlog_recover_add_to_cont_trans_44102 xlog_recover_add_to_cont_trans 4 44102 NULL
108582 +skb_frag_dma_map_44112 skb_frag_dma_map 0 44112 NULL
108583 +tracing_set_trace_read_44122 tracing_set_trace_read 3 44122 NULL
108584 +hwif_to_node_44127 hwif_to_node 0 44127 NULL
108585 +SyS_process_vm_writev_44129 SyS_process_vm_writev 3-5 44129 NULL
108586 +vmw_gmr_bind_44130 vmw_gmr_bind 3 44130 NULL
108587 +lookup_extent_data_ref_44136 lookup_extent_data_ref 0 44136 NULL
108588 +ttm_get_pages_44142 ttm_get_pages 2 44142 NULL
108589 +scsi_get_resid_44147 scsi_get_resid 0 44147 NULL
108590 +ubifs_find_dirty_idx_leb_44169 ubifs_find_dirty_idx_leb 0 44169 NULL
108591 +ocfs2_xattr_bucket_find_44174 ocfs2_xattr_bucket_find 0 44174 NULL
108592 +SYSC_set_mempolicy_44176 SYSC_set_mempolicy 3 44176 NULL
108593 +readreg_ipac_44186 readreg_ipac 0 44186 NULL
108594 +handle_eviocgbit_44193 handle_eviocgbit 3 44193 NULL
108595 +IO_APIC_get_PCI_irq_vector_44198 IO_APIC_get_PCI_irq_vector 0 44198 NULL
108596 +__set_free_44211 __set_free 2 44211 NULL
108597 +claim_ptd_buffers_44213 claim_ptd_buffers 3 44213 NULL
108598 +srp_alloc_iu_44227 srp_alloc_iu 2 44227 NULL
108599 +ioapic_register_intr_44238 ioapic_register_intr 1 44238 NULL
108600 +scsi_track_queue_full_44239 scsi_track_queue_full 2 44239 NULL
108601 +sigma_action_write_regmap_44240 sigma_action_write_regmap 3 44240 NULL
108602 +tc3589x_gpio_irq_map_44245 tc3589x_gpio_irq_map 2 44245 NULL
108603 +apei_resources_sub_44252 apei_resources_sub 0 44252 NULL
108604 +byt_gpio_irq_map_44275 byt_gpio_irq_map 2 44275 NULL
108605 +device_create_file_44285 device_create_file 0 44285 NULL
108606 +ufs_clusteracct_44293 ufs_clusteracct 3 44293 NULL
108607 +ocfs2_zero_range_for_truncate_44294 ocfs2_zero_range_for_truncate 3 44294 NULL
108608 +ath6kl_keepalive_read_44303 ath6kl_keepalive_read 3 44303 NULL
108609 +bitmap_scnprintf_44318 bitmap_scnprintf 0-2 44318 NULL
108610 +dispatch_proc_write_44320 dispatch_proc_write 3 44320 NULL
108611 +rs_init_44327 rs_init 1 44327 NULL
108612 +create_free_space_inode_44332 create_free_space_inode 0 44332 NULL
108613 +insert_into_bitmap_44340 insert_into_bitmap 0 44340 NULL
108614 +ubi_eba_write_leb_st_44343 ubi_eba_write_leb_st 0-5 44343 NULL
108615 +radix_tree_maybe_preload_44346 radix_tree_maybe_preload 0 44346 NULL
108616 +nfs_fscache_get_super_cookie_44355 nfs_fscache_get_super_cookie 3 44355 NULL nohasharray
108617 +blk_queue_init_tags_44355 blk_queue_init_tags 2 44355 &nfs_fscache_get_super_cookie_44355
108618 +__is_discarded_44359 __is_discarded 2 44359 NULL
108619 +ipx_recvmsg_44366 ipx_recvmsg 4 44366 NULL
108620 +alloc_requests_44372 alloc_requests 0 44372 NULL
108621 +rts_threshold_read_44384 rts_threshold_read 3 44384 NULL
108622 +iterate_dir_item_44386 iterate_dir_item 0 44386 NULL
108623 +mtip_hw_read_flags_44396 mtip_hw_read_flags 3 44396 NULL
108624 +aoedev_flush_44398 aoedev_flush 2 44398 NULL
108625 +strlcpy_44400 strlcpy 3 44400 NULL
108626 +drm_buffer_alloc_44405 drm_buffer_alloc 2 44405 NULL
108627 +osst_do_scsi_44410 osst_do_scsi 4 44410 NULL
108628 +check_user_page_hwpoison_44412 check_user_page_hwpoison 1 44412 NULL
108629 +ieee80211_if_read_rc_rateidx_mcs_mask_5ghz_44423 ieee80211_if_read_rc_rateidx_mcs_mask_5ghz 3 44423 NULL
108630 +iwl_dbgfs_bf_params_write_44450 iwl_dbgfs_bf_params_write 3 44450 NULL
108631 +write_file_debug_44476 write_file_debug 3 44476 NULL
108632 +btrfs_chunk_item_size_44478 btrfs_chunk_item_size 0-1 44478 NULL
108633 +sdio_align_size_44489 sdio_align_size 0-2 44489 NULL
108634 +bio_advance_44496 bio_advance 2 44496 NULL
108635 +ieee80211_if_read_dropped_frames_ttl_44500 ieee80211_if_read_dropped_frames_ttl 3 44500 NULL
108636 +ac_register_board_44504 ac_register_board 3 44504 NULL
108637 +security_getprocattr_44505 security_getprocattr 0 44505 NULL nohasharray
108638 +iwl_dbgfs_sram_read_44505 iwl_dbgfs_sram_read 3 44505 &security_getprocattr_44505
108639 +spidev_write_44510 spidev_write 3 44510 NULL
108640 +SyS_io_getevents_44519 SyS_io_getevents 3 44519 NULL
108641 +ieee80211_rx_mgmt_assoc_resp_44525 ieee80211_rx_mgmt_assoc_resp 3 44525 NULL
108642 +comm_write_44537 comm_write 3 44537 NULL
108643 +xfs_log_calc_unit_res_44540 xfs_log_calc_unit_res 0-2 44540 NULL
108644 +snd_pcm_drop_44542 snd_pcm_drop 0 44542 NULL
108645 +dbg_chk_pnode_44555 dbg_chk_pnode 0 44555 NULL
108646 +shmem_getpage_gfp_44556 shmem_getpage_gfp 0 44556 NULL
108647 +hash_ipport4_expire_44564 hash_ipport4_expire 3 44564 NULL
108648 +dgrp_config_proc_write_44571 dgrp_config_proc_write 3 44571 NULL
108649 +snd_pcm_alloc_vmalloc_buffer_44595 snd_pcm_alloc_vmalloc_buffer 2 44595 NULL
108650 +btrfs_qgroup_account_ref_44604 btrfs_qgroup_account_ref 0 44604 NULL
108651 +huge_page_shift_44618 huge_page_shift 0 44618 NULL
108652 +sysfs_add_one_44629 sysfs_add_one 0 44629 NULL
108653 +msb_get_free_block_44633 msb_get_free_block 2 44633 NULL
108654 +ext2_new_block_44645 ext2_new_block 2-0 44645 NULL
108655 +alloc_ctrl_packet_44667 alloc_ctrl_packet 1 44667 NULL
108656 +mpi_resize_44674 mpi_resize 2 44674 NULL
108657 +sysfs_create_link_44685 sysfs_create_link 0 44685 NULL nohasharray
108658 +__copy_user_intel_nocache_44685 __copy_user_intel_nocache 0-3 44685 &sysfs_create_link_44685
108659 +ts_read_44687 ts_read 3 44687 NULL
108660 +qib_get_user_pages_44689 qib_get_user_pages 1-2 44689 NULL
108661 +lov_emerg_alloc_44698 lov_emerg_alloc 1 44698 NULL
108662 +__ocfs2_rotate_tree_left_44705 __ocfs2_rotate_tree_left 0 44705 NULL
108663 +xfer_to_user_44713 xfer_to_user 3 44713 NULL nohasharray
108664 +__generic_block_fiemap_44713 __generic_block_fiemap 4 44713 &xfer_to_user_44713
108665 +_zd_iowrite32v_locked_44725 _zd_iowrite32v_locked 3 44725 NULL
108666 +clusterip_proc_write_44729 clusterip_proc_write 3 44729 NULL
108667 +fib_count_nexthops_44730 fib_count_nexthops 0 44730 NULL
108668 +SyS_read_44732 SyS_read 3 44732 NULL
108669 +vm_insert_mixed_44738 vm_insert_mixed 3 44738 NULL
108670 +key_tx_rx_count_read_44742 key_tx_rx_count_read 3 44742 NULL
108671 +set_brk_44749 set_brk 1-2 44749 NULL
108672 +tnode_new_44757 tnode_new 3 44757 NULL nohasharray
108673 +pty_write_44757 pty_write 3 44757 &tnode_new_44757
108674 +__videobuf_copy_stream_44769 __videobuf_copy_stream 4-0 44769 NULL
108675 +handsfree_ramp_44777 handsfree_ramp 2 44777 NULL
108676 +irq_domain_add_legacy_44781 irq_domain_add_legacy 4-2 44781 NULL
108677 +sctp_setsockopt_44788 sctp_setsockopt 5 44788 NULL
108678 +rx_dropped_read_44799 rx_dropped_read 3 44799 NULL
108679 +qla4xxx_alloc_work_44813 qla4xxx_alloc_work 2 44813 NULL
108680 +mei_cl_read_start_44824 mei_cl_read_start 2 44824 NULL
108681 +rmap_write_protect_44833 rmap_write_protect 2 44833 NULL
108682 +sisusb_write_44834 sisusb_write 3 44834 NULL
108683 +kvm_read_hva_44847 kvm_read_hva 3 44847 NULL
108684 +cubic_root_44848 cubic_root 1 44848 NULL
108685 +qib_verbs_send_dma_44850 qib_verbs_send_dma 6 44850 NULL
108686 +copydesc_user_44855 copydesc_user 3 44855 NULL
108687 +i915_gem_execbuffer_relocate_44868 i915_gem_execbuffer_relocate 0 44868 NULL
108688 +init_rs_44873 init_rs 1 44873 NULL
108689 +skb_availroom_44883 skb_availroom 0 44883 NULL
108690 +ocfs2_wait_for_mask_44893 ocfs2_wait_for_mask 0 44893 NULL
108691 +do_tty_write_44896 do_tty_write 5 44896 NULL
108692 +regmap_spi_read_44921 regmap_spi_read 3-5 44921 NULL
108693 +_snd_pcm_hw_param_last_44947 _snd_pcm_hw_param_last 0 44947 NULL
108694 +__add_delayed_refs_44977 __add_delayed_refs 0 44977 NULL
108695 +tx_queue_status_read_44978 tx_queue_status_read 3 44978 NULL
108696 +map_index_to_lba_44993 map_index_to_lba 0-1 44993 NULL
108697 +send_chmod_45011 send_chmod 0 45011 NULL
108698 +i915_gem_do_execbuffer_45012 i915_gem_do_execbuffer 0 45012 NULL
108699 +bytepos_delta_45017 bytepos_delta 0-2 45017 NULL
108700 +read_block_bitmap_45021 read_block_bitmap 2 45021 NULL nohasharray
108701 +ptrace_writedata_45021 ptrace_writedata 4-3 45021 &read_block_bitmap_45021
108702 +dm_kvzalloc_45025 dm_kvzalloc 1-2 45025 NULL
108703 +vhci_get_user_45039 vhci_get_user 3 45039 NULL
108704 +sysfs_do_create_link_sd_45057 sysfs_do_create_link_sd 0 45057 NULL
108705 +remap_oldmem_pfn_range_45060 remap_oldmem_pfn_range 2-3-4 45060 NULL nohasharray
108706 +sel_write_user_45060 sel_write_user 3 45060 &remap_oldmem_pfn_range_45060
108707 +vmscan_swappiness_45062 vmscan_swappiness 0 45062 NULL
108708 +snd_mixart_BA0_read_45069 snd_mixart_BA0_read 5 45069 NULL
108709 +kvm_mmu_page_get_gfn_45110 kvm_mmu_page_get_gfn 0-2 45110 NULL
108710 +pwr_missing_bcns_cnt_read_45113 pwr_missing_bcns_cnt_read 3 45113 NULL
108711 +usbdev_read_45114 usbdev_read 3 45114 NULL
108712 +send_to_tty_45141 send_to_tty 3 45141 NULL
108713 +stmpe_irq_map_45146 stmpe_irq_map 2 45146 NULL
108714 +cfs_trace_daemon_command_usrstr_45147 cfs_trace_daemon_command_usrstr 2 45147 NULL
108715 +gen_bitmask_string_45149 gen_bitmask_string 6 45149 NULL
108716 +ocfs2_remove_inode_range_45156 ocfs2_remove_inode_range 3-4 45156 NULL nohasharray
108717 +device_write_45156 device_write 3 45156 &ocfs2_remove_inode_range_45156
108718 +ocfs2_dq_frozen_trigger_45159 ocfs2_dq_frozen_trigger 4 45159 NULL
108719 +SYSC_write_45160 SYSC_write 3 45160 NULL
108720 +tomoyo_write_self_45161 tomoyo_write_self 3 45161 NULL
108721 +sta_agg_status_write_45164 sta_agg_status_write 3 45164 NULL
108722 +sctp_pack_cookie_45190 sctp_pack_cookie 6 45190 NULL nohasharray
108723 +snd_sb_csp_load_user_45190 snd_sb_csp_load_user 3 45190 &sctp_pack_cookie_45190
108724 +num_clusters_in_group_45194 num_clusters_in_group 2 45194 NULL
108725 +__radix_tree_preload_45197 __radix_tree_preload 0 45197 NULL
108726 +iso_alloc_urb_45206 iso_alloc_urb 4-5 45206 NULL
108727 +spi_alloc_master_45223 spi_alloc_master 2 45223 NULL
108728 +__dirty_45228 __dirty 2 45228 NULL
108729 +ieee80211_if_read_peer_45233 ieee80211_if_read_peer 3 45233 NULL
108730 +event_enable_write_45238 event_enable_write 3 45238 NULL
108731 +prism2_pda_proc_read_45246 prism2_pda_proc_read 3 45246 NULL
108732 +input_mt_init_slots_45279 input_mt_init_slots 2 45279 NULL
108733 +gfs2_fiemap_45282 gfs2_fiemap 4 45282 NULL
108734 +snd_pcm_oss_sync1_45298 snd_pcm_oss_sync1 2 45298 NULL
108735 +e1000_tx_map_45309 e1000_tx_map 5 45309 NULL
108736 +pte_val_45313 pte_val 0 45313 NULL
108737 +copy_vm86_regs_from_user_45340 copy_vm86_regs_from_user 3 45340 NULL
108738 +null_alloc_repbuf_45375 null_alloc_repbuf 3 45375 NULL
108739 +sock_recv_errqueue_45412 sock_recv_errqueue 3 45412 NULL
108740 +paging64_gva_to_gpa_45421 paging64_gva_to_gpa 2 45421 NULL nohasharray
108741 +ieee80211_if_fmt_dot11MeshHWMProotInterval_45421 ieee80211_if_fmt_dot11MeshHWMProotInterval 3 45421 &paging64_gva_to_gpa_45421
108742 +alloc_task_struct_node_45426 alloc_task_struct_node 1 45426 NULL
108743 +ll_iocontrol_register_45430 ll_iocontrol_register 2 45430 NULL
108744 +tty_buffer_alloc_45437 tty_buffer_alloc 2 45437 NULL
108745 +SYSC_mremap_45446 SYSC_mremap 5-1-2-3 45446 NULL
108746 +__node_remap_45458 __node_remap 4 45458 NULL
108747 +rds_ib_set_wr_signal_state_45463 rds_ib_set_wr_signal_state 0 45463 NULL
108748 +tracing_read_dyn_info_45468 tracing_read_dyn_info 3 45468 NULL
108749 +snd_pcm_hwsync_45479 snd_pcm_hwsync 0 45479 NULL
108750 +arizona_init_fll_45503 arizona_init_fll 5 45503 NULL
108751 +rds_message_copy_from_user_45510 rds_message_copy_from_user 3 45510 NULL
108752 +i40e_alloc_vfs_45511 i40e_alloc_vfs 2 45511 NULL
108753 +__split_vma_45522 __split_vma 0 45522 NULL
108754 +cgroup_read_u64_45532 cgroup_read_u64 5 45532 NULL
108755 +copy_macs_45534 copy_macs 4 45534 NULL
108756 +nla_attr_size_45545 nla_attr_size 0-1 45545 NULL
108757 +v9fs_direct_read_45546 v9fs_direct_read 3 45546 NULL
108758 +cx18_copy_mdl_to_user_45549 cx18_copy_mdl_to_user 4 45549 NULL
108759 +ext3_group_first_block_no_45555 ext3_group_first_block_no 0-2 45555 NULL
108760 +stats_dot11ACKFailureCount_read_45558 stats_dot11ACKFailureCount_read 3 45558 NULL
108761 +_regmap_bus_raw_write_45559 _regmap_bus_raw_write 2 45559 NULL
108762 +posix_acl_xattr_size_45561 posix_acl_xattr_size 0-1 45561 NULL
108763 +venus_rmdir_45564 venus_rmdir 4 45564 NULL
108764 +btrfs_find_free_ino_45585 btrfs_find_free_ino 0 45585 NULL
108765 +ipath_create_cq_45586 ipath_create_cq 2 45586 NULL
108766 +ath6kl_keepalive_write_45600 ath6kl_keepalive_write 3 45600 NULL
108767 +hidraw_get_report_45609 hidraw_get_report 3 45609 NULL
108768 +commit_cowonly_roots_45640 commit_cowonly_roots 0 45640 NULL
108769 +ebitmap_next_positive_45651 ebitmap_next_positive 3-0 45651 NULL
108770 +ext4_reserve_inode_write_45654 ext4_reserve_inode_write 0 45654 NULL
108771 +dma_map_cont_45668 dma_map_cont 5 45668 NULL
108772 +compat_mpctl_ioctl_45671 compat_mpctl_ioctl 2 45671 NULL
108773 +dgram_sendmsg_45679 dgram_sendmsg 4 45679 NULL
108774 +smk_write_ambient_45691 smk_write_ambient 3 45691 NULL
108775 +unix_dgram_sendmsg_45699 unix_dgram_sendmsg 4 45699 NULL nohasharray
108776 +bscnl_emit_45699 bscnl_emit 0-2-5 45699 &unix_dgram_sendmsg_45699
108777 +sg_proc_write_adio_45704 sg_proc_write_adio 3 45704 NULL
108778 +snd_cs46xx_io_read_45734 snd_cs46xx_io_read 5 45734 NULL nohasharray
108779 +task_cgroup_path_45734 task_cgroup_path 3 45734 &snd_cs46xx_io_read_45734
108780 +rw_copy_check_uvector_45748 rw_copy_check_uvector 3-0 45748 NULL nohasharray
108781 +v4l2_ctrl_new_std_45748 v4l2_ctrl_new_std 5 45748 &rw_copy_check_uvector_45748
108782 +lkdtm_debugfs_read_45752 lkdtm_debugfs_read 3 45752 NULL
108783 +btrfs_delete_delayed_dir_index_45757 btrfs_delete_delayed_dir_index 0 45757 NULL
108784 +alloc_ts_config_45775 alloc_ts_config 1 45775 NULL
108785 +osc_checksum_type_seq_write_45785 osc_checksum_type_seq_write 3 45785 NULL
108786 +raw_setsockopt_45800 raw_setsockopt 5 45800 NULL
108787 +rds_tcp_inc_copy_to_user_45804 rds_tcp_inc_copy_to_user 3 45804 NULL
108788 +lbs_rdbbp_read_45805 lbs_rdbbp_read 3 45805 NULL
108789 +pcpu_alloc_alloc_info_45813 pcpu_alloc_alloc_info 1-2 45813 NULL
108790 +ll_max_readahead_mb_seq_write_45815 ll_max_readahead_mb_seq_write 3 45815 NULL
108791 +fm_v4l2_init_video_device_45821 fm_v4l2_init_video_device 2 45821 NULL
108792 +memcg_update_cache_size_45828 memcg_update_cache_size 2 45828 NULL
108793 +ipv6_recv_rxpmtu_45830 ipv6_recv_rxpmtu 3 45830 NULL
108794 +task_state_char_45839 task_state_char 1 45839 NULL
108795 +__ip_select_ident_45851 __ip_select_ident 3 45851 NULL
108796 +x509_process_extension_45854 x509_process_extension 5 45854 NULL
108797 +efx_tx_queue_insert_45859 efx_tx_queue_insert 2 45859 NULL
108798 +isdn_write_45863 isdn_write 3 45863 NULL
108799 +unpack_orig_pfns_45867 unpack_orig_pfns 0 45867 NULL
108800 +tpm_config_in_45880 tpm_config_in 0 45880 NULL
108801 +get_rdac_req_45882 get_rdac_req 3 45882 NULL
108802 +ocfs2_xattr_block_find_45891 ocfs2_xattr_block_find 0 45891 NULL
108803 +online_page_cgroup_45894 online_page_cgroup 3 45894 NULL
108804 +cfs_cpt_weight_45903 cfs_cpt_weight 0 45903 NULL
108805 +wm_adsp_region_to_reg_45915 wm_adsp_region_to_reg 0-2 45915 NULL
108806 +dbgfs_frame_45917 dbgfs_frame 3 45917 NULL
108807 +alloc_mr_45935 alloc_mr 1 45935 NULL
108808 +kmem_cache_alloc_node_trace_45968 kmem_cache_alloc_node_trace 3 45968 NULL
108809 +copy_to_45969 copy_to 3 45969 NULL
108810 +rb_simple_read_45972 rb_simple_read 3 45972 NULL
108811 +ioat2_dca_count_dca_slots_45984 ioat2_dca_count_dca_slots 0 45984 NULL
108812 +ore_calc_stripe_info_46023 ore_calc_stripe_info 2 46023 NULL
108813 +sierra_setup_urb_46029 sierra_setup_urb 5 46029 NULL
108814 +get_free_entries_46030 get_free_entries 1 46030 NULL
108815 +__access_remote_vm_46031 __access_remote_vm 0-3-5 46031 NULL
108816 +snd_emu10k1x_ptr_read_46049 snd_emu10k1x_ptr_read 0 46049 NULL
108817 +acpi_register_gsi_xen_hvm_46052 acpi_register_gsi_xen_hvm 2 46052 NULL
108818 +__ocfs2_move_extent_46060 __ocfs2_move_extent 5-6-4-0-3 46060 NULL nohasharray
108819 +dma_tx_errors_read_46060 dma_tx_errors_read 3 46060 &__ocfs2_move_extent_46060
108820 +sel_commit_bools_write_46077 sel_commit_bools_write 3 46077 NULL
108821 +arizona_set_irq_wake_46101 arizona_set_irq_wake 2 46101 NULL
108822 +memcg_update_array_size_46111 memcg_update_array_size 1 46111 NULL nohasharray
108823 +il3945_ucode_general_stats_read_46111 il3945_ucode_general_stats_read 3 46111 &memcg_update_array_size_46111
108824 +C_SYSC_writev_46113 C_SYSC_writev 3 46113 NULL
108825 +mlx4_ib_alloc_fast_reg_page_list_46119 mlx4_ib_alloc_fast_reg_page_list 2 46119 NULL
108826 +paging32_walk_addr_nested_46121 paging32_walk_addr_nested 3 46121 NULL
108827 +replay_dir_deletes_46136 replay_dir_deletes 0 46136 NULL
108828 +rtw_buf_update_46138 rtw_buf_update 4 46138 NULL
108829 +vb2_dma_sg_get_userptr_46146 vb2_dma_sg_get_userptr 2-3 46146 NULL
108830 +__netlink_change_ngroups_46156 __netlink_change_ngroups 2 46156 NULL
108831 +alloc_iova_46160 alloc_iova 2 46160 NULL
108832 +twl_direction_out_46182 twl_direction_out 2 46182 NULL
108833 +vxge_os_dma_malloc_46184 vxge_os_dma_malloc 2 46184 NULL
108834 +fq_resize_46195 fq_resize 2 46195 NULL
108835 +add_conn_list_46197 add_conn_list 3-0 46197 NULL
108836 +i2400m_op_msg_from_user_46213 i2400m_op_msg_from_user 4 46213 NULL
108837 +tm6000_i2c_recv_regs_46215 tm6000_i2c_recv_regs 5 46215 NULL
108838 +dsp_write_46218 dsp_write 2 46218 NULL
108839 +xen_setup_msi_irqs_46245 xen_setup_msi_irqs 2 46245 NULL
108840 +mpi_read_raw_data_46248 mpi_read_raw_data 2 46248 NULL
108841 +ReadReg_46277 ReadReg 0 46277 NULL
108842 +sg_proc_write_dressz_46316 sg_proc_write_dressz 3 46316 NULL
108843 +__hwahc_dev_set_key_46328 __hwahc_dev_set_key 5 46328 NULL nohasharray
108844 +compat_SyS_readv_46328 compat_SyS_readv 3 46328 &__hwahc_dev_set_key_46328
108845 +iwl_dbgfs_chain_noise_read_46355 iwl_dbgfs_chain_noise_read 3 46355 NULL
108846 +smk_write_direct_46363 smk_write_direct 3 46363 NULL
108847 +__iommu_calculate_agaw_46366 __iommu_calculate_agaw 2 46366 NULL
108848 +ubi_dump_flash_46381 ubi_dump_flash 4 46381 NULL
108849 +mmap_ureg_46388 mmap_ureg 3 46388 NULL
108850 +vma_adjust_46390 vma_adjust 0 46390 NULL
108851 +fuse_file_aio_write_46399 fuse_file_aio_write 4 46399 NULL
108852 +crypto_ablkcipher_reqsize_46411 crypto_ablkcipher_reqsize 0 46411 NULL
108853 +ttm_page_pool_get_pages_46431 ttm_page_pool_get_pages 0-5 46431 NULL
108854 +cfs_power2_roundup_46433 cfs_power2_roundup 0-1 46433 NULL
108855 +hash_ipportip6_expire_46443 hash_ipportip6_expire 3 46443 NULL
108856 +cp210x_set_config_46447 cp210x_set_config 4 46447 NULL
108857 +parport_pc_fifo_write_block_46455 parport_pc_fifo_write_block 3 46455 NULL
108858 +il_dbgfs_clear_traffic_stats_write_46458 il_dbgfs_clear_traffic_stats_write 3 46458 NULL
108859 +filldir64_46469 filldir64 3 46469 NULL
108860 +ocfs2_reserve_clusters_with_limit_46479 ocfs2_reserve_clusters_with_limit 0 46479 NULL
108861 +fill_in_write_vector_46498 fill_in_write_vector 0 46498 NULL
108862 +p9pdu_vreadf_46500 p9pdu_vreadf 0 46500 NULL
108863 +pin_code_reply_46510 pin_code_reply 4 46510 NULL
108864 +mthca_alloc_cq_buf_46512 mthca_alloc_cq_buf 3 46512 NULL
108865 +nouveau_drm_ioctl_46514 nouveau_drm_ioctl 2 46514 NULL nohasharray
108866 +kmsg_read_46514 kmsg_read 3 46514 &nouveau_drm_ioctl_46514
108867 +bdx_rxdb_create_46525 bdx_rxdb_create 1 46525 NULL
108868 +nl80211_send_rx_assoc_46538 nl80211_send_rx_assoc 4 46538 NULL
108869 +pm860x_irq_domain_map_46553 pm860x_irq_domain_map 2 46553 NULL
108870 +link_send_sections_long_46556 link_send_sections_long 4 46556 NULL
108871 +dn_current_mss_46574 dn_current_mss 0 46574 NULL nohasharray
108872 +blk_flush_complete_seq_46574 blk_flush_complete_seq 2 46574 &dn_current_mss_46574
108873 +serverworks_create_gatt_pages_46582 serverworks_create_gatt_pages 1 46582 NULL
108874 +snd_compr_write_data_46592 snd_compr_write_data 3 46592 NULL
108875 +il3945_stats_flag_46606 il3945_stats_flag 0-3 46606 NULL
108876 +vscnprintf_46617 vscnprintf 0-2 46617 NULL
108877 +__kfifo_out_r_46623 __kfifo_out_r 3-0 46623 NULL
108878 +request_key_async_with_auxdata_46624 request_key_async_with_auxdata 4 46624 NULL
108879 +pci_enable_device_46642 pci_enable_device 0 46642 NULL
108880 +vfs_getxattr_alloc_46649 vfs_getxattr_alloc 0 46649 NULL
108881 +av7110_ipack_init_46655 av7110_ipack_init 2 46655 NULL
108882 +e1000_tx_map_46672 e1000_tx_map 4 46672 NULL
108883 +alloc_data_packet_46698 alloc_data_packet 1 46698 NULL
108884 +__ilog2_u32_46706 __ilog2_u32 0 46706 NULL
108885 +erst_dbg_write_46715 erst_dbg_write 3 46715 NULL
108886 +ide_read_status_46719 ide_read_status 0 46719 NULL
108887 +wl1271_rx_filter_alloc_field_46721 wl1271_rx_filter_alloc_field 5 46721 NULL
108888 +irq_domain_add_simple_46734 irq_domain_add_simple 2-3 46734 NULL
108889 +ext4_count_free_46754 ext4_count_free 2 46754 NULL nohasharray
108890 +pte_pfn_46754 pte_pfn 0 46754 &ext4_count_free_46754
108891 +ntfs2utc_46762 ntfs2utc 1 46762 NULL
108892 +hest_ghes_dev_register_46766 hest_ghes_dev_register 1 46766 NULL
108893 +int_hw_irq_en_46776 int_hw_irq_en 3 46776 NULL
108894 +regcache_lzo_sync_46777 regcache_lzo_sync 2 46777 NULL
108895 +_xfs_buf_get_pages_46811 _xfs_buf_get_pages 2 46811 NULL
108896 +btrfs_insert_empty_items_46822 btrfs_insert_empty_items 0 46822 NULL
108897 +xfs_iroot_realloc_46826 xfs_iroot_realloc 2 46826 NULL
108898 +shmem_pwrite_fast_46842 shmem_pwrite_fast 3 46842 NULL
108899 +readreg_46845 readreg 0 46845 NULL
108900 +spi_async_46857 spi_async 0 46857 NULL
108901 +vsnprintf_46863 vsnprintf 0 46863 NULL nohasharray
108902 +SyS_move_pages_46863 SyS_move_pages 2 46863 &vsnprintf_46863
108903 +nvme_alloc_queue_46865 nvme_alloc_queue 3 46865 NULL
108904 +rvmalloc_46873 rvmalloc 1 46873 NULL
108905 +qp_memcpy_from_queue_iov_46874 qp_memcpy_from_queue_iov 5-4 46874 NULL
108906 +lov_iocontrol_46876 lov_iocontrol 3 46876 NULL
108907 +stmpe_gpio_irq_unmap_46884 stmpe_gpio_irq_unmap 2 46884 NULL
108908 +ixgbe_dbg_reg_ops_write_46895 ixgbe_dbg_reg_ops_write 3 46895 NULL
108909 +sk_mem_pages_46896 sk_mem_pages 0-1 46896 NULL
108910 +ol_dqblk_off_46904 ol_dqblk_off 2-3 46904 NULL
108911 +ieee80211_if_fmt_power_mode_46906 ieee80211_if_fmt_power_mode 3 46906 NULL
108912 +wlcore_alloc_hw_46917 wlcore_alloc_hw 1-3 46917 NULL
108913 +fb_write_46924 fb_write 3 46924 NULL
108914 +i915_gem_check_olr_46925 i915_gem_check_olr 0 46925 NULL
108915 +kvm_register_read_46948 kvm_register_read 0 46948 NULL
108916 +__sctp_setsockopt_connectx_46949 __sctp_setsockopt_connectx 3 46949 NULL
108917 +qla4xxx_post_aen_work_46953 qla4xxx_post_aen_work 3 46953 NULL
108918 +SYSC_poll_46965 SYSC_poll 2 46965 NULL
108919 +crypto_tfm_alg_alignmask_46971 crypto_tfm_alg_alignmask 0 46971 NULL
108920 +mgmt_pending_add_46976 mgmt_pending_add 5 46976 NULL
108921 +strlcat_46985 strlcat 3 46985 NULL
108922 +bitmap_file_clear_bit_46990 bitmap_file_clear_bit 2 46990 NULL
108923 +gfs2_xattr_system_set_46996 gfs2_xattr_system_set 4 46996 NULL nohasharray
108924 +sel_write_bool_46996 sel_write_bool 3 46996 &gfs2_xattr_system_set_46996
108925 +ttm_bo_io_47000 ttm_bo_io 5 47000 NULL
108926 +blk_rq_map_kern_47004 blk_rq_map_kern 4 47004 NULL
108927 +__map_single_47020 __map_single 3-4-7-0 47020 NULL
108928 +cx231xx_init_bulk_47024 cx231xx_init_bulk 3-2-4 47024 NULL
108929 +fs_path_len_47060 fs_path_len 0 47060 NULL
108930 +ufs_new_fragments_47070 ufs_new_fragments 4-3-5 47070 NULL nohasharray
108931 +ext4_xattr_list_entries_47070 ext4_xattr_list_entries 0-4 47070 &ufs_new_fragments_47070
108932 +pipeline_dec_packet_in_read_47076 pipeline_dec_packet_in_read 3 47076 NULL
108933 +scsi_deactivate_tcq_47086 scsi_deactivate_tcq 2 47086 NULL
108934 +iwl_dump_nic_event_log_47089 iwl_dump_nic_event_log 0 47089 NULL
108935 +ptlrpc_lprocfs_threads_max_seq_write_47104 ptlrpc_lprocfs_threads_max_seq_write 3 47104 NULL
108936 +tboot_log_read_47110 tboot_log_read 3 47110 NULL
108937 +mousedev_read_47123 mousedev_read 3 47123 NULL
108938 +ubi_compare_lebs_47141 ubi_compare_lebs 0 47141 NULL
108939 +ses_recv_diag_47143 ses_recv_diag 4 47143 NULL nohasharray
108940 +acpi_ut_initialize_buffer_47143 acpi_ut_initialize_buffer 2 47143 &ses_recv_diag_47143
108941 +mxms_headerlen_47161 mxms_headerlen 0 47161 NULL
108942 +rs_sta_dbgfs_rate_scale_data_read_47165 rs_sta_dbgfs_rate_scale_data_read 3 47165 NULL
108943 +alloc_cpumask_var_node_47167 alloc_cpumask_var_node 3 47167 NULL
108944 +bpf_alloc_binary_47170 bpf_alloc_binary 1 47170 NULL
108945 +rts51x_ms_rw_47171 rts51x_ms_rw 3-4 47171 NULL
108946 +btrfs_del_inode_ref_47181 btrfs_del_inode_ref 0 47181 NULL
108947 +can_set_system_xattr_47182 can_set_system_xattr 4 47182 NULL
108948 +options_write_47243 options_write 3 47243 NULL
108949 +portcntrs_1_read_47253 portcntrs_1_read 3 47253 NULL
108950 +da9052_disable_irq_nosync_47260 da9052_disable_irq_nosync 2 47260 NULL
108951 +p9pdu_readf_47269 p9pdu_readf 0 47269 NULL
108952 +ablkcipher_next_slow_47274 ablkcipher_next_slow 3-4 47274 NULL
108953 +gfs2_readpages_47285 gfs2_readpages 4 47285 NULL
108954 +vsnprintf_47291 vsnprintf 0 47291 NULL
108955 +tx_internal_desc_overflow_read_47300 tx_internal_desc_overflow_read 3 47300 NULL
108956 +iterate_inode_ref_47322 iterate_inode_ref 0 47322 NULL
108957 +SyS_madvise_47354 SyS_madvise 1-2 47354 NULL
108958 +ieee80211_if_read_dot11MeshHoldingTimeout_47356 ieee80211_if_read_dot11MeshHoldingTimeout 3 47356 NULL
108959 +avc_get_hash_stats_47359 avc_get_hash_stats 0 47359 NULL
108960 +find_first_zero_bit_le_47369 find_first_zero_bit_le 2 47369 NULL
108961 +__bio_map_kern_47379 __bio_map_kern 3 47379 NULL
108962 +nv_rd32_47390 nv_rd32 0 47390 NULL nohasharray
108963 +trace_options_core_read_47390 trace_options_core_read 3 47390 &nv_rd32_47390
108964 +nametbl_list_47391 nametbl_list 2 47391 NULL
108965 +dgrp_net_write_47392 dgrp_net_write 3 47392 NULL
108966 +pfkey_sendmsg_47394 pfkey_sendmsg 4 47394 NULL
108967 +gfn_to_pfn_prot_47398 gfn_to_pfn_prot 2 47398 NULL
108968 +lbs_wrmac_write_47400 lbs_wrmac_write 3 47400 NULL
108969 +ocfs2_resv_end_47408 ocfs2_resv_end 0 47408 NULL
108970 +sta_vht_capa_read_47409 sta_vht_capa_read 3 47409 NULL
108971 +crypto_ablkcipher_alignmask_47410 crypto_ablkcipher_alignmask 0 47410 NULL
108972 +lbs_wrrf_write_47418 lbs_wrrf_write 3 47418 NULL
108973 +vzalloc_47421 vzalloc 1 47421 NULL
108974 +hash_ipportip4_expire_47426 hash_ipportip4_expire 3 47426 NULL
108975 +posix_acl_from_disk_47445 posix_acl_from_disk 2 47445 NULL
108976 +numaq_apicid_to_cpu_present_47449 numaq_apicid_to_cpu_present 1 47449 NULL
108977 +environ_read_47451 environ_read 3 47451 NULL
108978 +__load_mapping_47460 __load_mapping 2 47460 NULL
108979 +try_lock_extent_47465 try_lock_extent 0 47465 NULL
108980 +nvme_trans_send_fw_cmd_47479 nvme_trans_send_fw_cmd 4 47479 NULL
108981 +wb_force_mapping_47485 wb_force_mapping 2 47485 NULL nohasharray
108982 +newpart_47485 newpart 6-4 47485 &wb_force_mapping_47485
108983 +mcp23s17_read_regs_47491 mcp23s17_read_regs 4 47491 NULL
108984 +core_sys_select_47494 core_sys_select 1 47494 NULL
108985 +read_block_for_search_47502 read_block_for_search 0 47502 NULL
108986 +alloc_arraycache_47505 alloc_arraycache 2-1 47505 NULL nohasharray
108987 +btrfs_init_inode_security_47505 btrfs_init_inode_security 0 47505 &alloc_arraycache_47505
108988 +unlink_simple_47506 unlink_simple 3 47506 NULL
108989 +pstore_decompress_47510 pstore_decompress 0 47510 NULL
108990 +ufs_inode_getblock_47512 ufs_inode_getblock 4 47512 NULL
108991 +__proc_lnet_portal_rotor_47529 __proc_lnet_portal_rotor 5 47529 NULL
108992 +snd_pcm_resume_47530 snd_pcm_resume 0 47530 NULL
108993 +vscnprintf_47533 vscnprintf 0-2 47533 NULL nohasharray
108994 +process_vm_rw_47533 process_vm_rw 3-5 47533 &vscnprintf_47533
108995 +einj_check_trigger_header_47534 einj_check_trigger_header 0 47534 NULL
108996 +ieee80211_if_fmt_min_discovery_timeout_47539 ieee80211_if_fmt_min_discovery_timeout 3 47539 NULL
108997 +ocfs2_resv_find_window_47557 ocfs2_resv_find_window 3 47557 NULL
108998 +read_ldt_47570 read_ldt 2 47570 NULL
108999 +isku_sysfs_read_last_set_47572 isku_sysfs_read_last_set 6 47572 NULL
109000 +rpipe_get_idx_47579 rpipe_get_idx 2-0 47579 NULL
109001 +SYSC_fcntl64_47581 SYSC_fcntl64 3 47581 NULL
109002 +vendorextnReadSection_47583 vendorextnReadSection 0 47583 NULL
109003 +btrfs_stack_header_bytenr_47589 btrfs_stack_header_bytenr 0 47589 NULL
109004 +ext4_kvzalloc_47605 ext4_kvzalloc 1 47605 NULL
109005 +sctp_ssnmap_new_47608 sctp_ssnmap_new 2-1 47608 NULL
109006 +cache_read_pipefs_47615 cache_read_pipefs 3 47615 NULL
109007 +twl4030_clear_set_47624 twl4030_clear_set 4 47624 NULL
109008 +irq_set_chip_47638 irq_set_chip 1 47638 NULL
109009 +get_size_47644 get_size 1-2 47644 NULL
109010 +snd_pcm_info_47699 snd_pcm_info 0 47699 NULL
109011 +packet_recvmsg_47700 packet_recvmsg 4 47700 NULL nohasharray
109012 +ipath_format_hwmsg_47700 ipath_format_hwmsg 2 47700 &packet_recvmsg_47700
109013 +global_rt_runtime_47712 global_rt_runtime 0 47712 NULL
109014 +save_microcode_47717 save_microcode 3 47717 NULL
109015 +bits_to_user_47733 bits_to_user 3-2 47733 NULL
109016 +carl9170_debugfs_read_47738 carl9170_debugfs_read 3 47738 NULL
109017 +ir_prepare_write_buffer_47747 ir_prepare_write_buffer 3 47747 NULL
109018 +mvumi_alloc_mem_resource_47750 mvumi_alloc_mem_resource 3 47750 NULL
109019 +ext3_find_near_47752 ext3_find_near 0 47752 NULL
109020 +alloc_sched_domains_47756 alloc_sched_domains 1 47756 NULL
109021 +uwb_ie_dump_hex_47774 uwb_ie_dump_hex 4 47774 NULL
109022 +SyS_setgroups16_47780 SyS_setgroups16 1 47780 NULL
109023 +error_error_numll_frame_cts_start_read_47781 error_error_numll_frame_cts_start_read 3 47781 NULL
109024 +posix_acl_fix_xattr_from_user_47793 posix_acl_fix_xattr_from_user 2 47793 NULL
109025 +W6692_empty_Bfifo_47804 W6692_empty_Bfifo 2 47804 NULL
109026 +lov_packmd_47810 lov_packmd 0 47810 NULL
109027 +pinconf_dbg_config_write_47835 pinconf_dbg_config_write 3 47835 NULL
109028 +KEY_SIZE_47855 KEY_SIZE 0 47855 NULL
109029 +ubifs_unpack_nnode_47866 ubifs_unpack_nnode 0 47866 NULL
109030 +vhci_read_47878 vhci_read 3 47878 NULL
109031 +ubi_wl_put_peb_47886 ubi_wl_put_peb 0 47886 NULL
109032 +keyctl_instantiate_key_common_47889 keyctl_instantiate_key_common 4 47889 NULL
109033 +load_mapping_47904 load_mapping 3 47904 NULL
109034 +btrfs_duplicate_item_47910 btrfs_duplicate_item 0 47910 NULL
109035 +cfs_percpt_alloc_47918 cfs_percpt_alloc 2 47918 NULL
109036 +comedi_write_47926 comedi_write 3 47926 NULL
109037 +nvme_trans_get_blk_desc_len_47946 nvme_trans_get_blk_desc_len 0-2 47946 NULL
109038 +lp8788_irq_map_47964 lp8788_irq_map 2 47964 NULL
109039 +gether_get_ifname_47972 gether_get_ifname 3 47972 NULL
109040 +iwl_dbgfs_ucode_tracing_read_47983 iwl_dbgfs_ucode_tracing_read 3 47983 NULL nohasharray
109041 +mempool_resize_47983 mempool_resize 2 47983 &iwl_dbgfs_ucode_tracing_read_47983
109042 +dbg_port_buf_47990 dbg_port_buf 2 47990 NULL
109043 +ib_umad_write_47993 ib_umad_write 3 47993 NULL
109044 +ocfs2_find_refcount_split_pos_48001 ocfs2_find_refcount_split_pos 0 48001 NULL
109045 +lustre_cfg_len_48002 lustre_cfg_len 0 48002 NULL
109046 +gdm_tty_recv_complete_48011 gdm_tty_recv_complete 2 48011 NULL
109047 +ffs_epfile_write_48014 ffs_epfile_write 3 48014 NULL
109048 +bio_integrity_set_tag_48035 bio_integrity_set_tag 3 48035 NULL
109049 +pppoe_sendmsg_48039 pppoe_sendmsg 4 48039 NULL
109050 +SYSC_writev_48040 SYSC_writev 3 48040 NULL
109051 +btrfs_reserve_extent_48044 btrfs_reserve_extent 6 48044 NULL
109052 +wpan_phy_alloc_48056 wpan_phy_alloc 1 48056 NULL
109053 +ocfs2_change_refcount_rec_48059 ocfs2_change_refcount_rec 0 48059 NULL
109054 +posix_acl_alloc_48063 posix_acl_alloc 1 48063 NULL
109055 +palmas_bulk_write_48068 palmas_bulk_write 2-3-5 48068 NULL
109056 +disc_write_48070 disc_write 3 48070 NULL
109057 +mmc_alloc_host_48097 mmc_alloc_host 1 48097 NULL
109058 +skb_copy_datagram_const_iovec_48102 skb_copy_datagram_const_iovec 4-2-5-0 48102 NULL
109059 +radio_isa_common_probe_48107 radio_isa_common_probe 3 48107 NULL
109060 +vmw_framebuffer_surface_dirty_48132 vmw_framebuffer_surface_dirty 6 48132 NULL
109061 +set_discoverable_48141 set_discoverable 4 48141 NULL
109062 +dn_fib_count_nhs_48145 dn_fib_count_nhs 0 48145 NULL
109063 +get_cur_inode_state_48149 get_cur_inode_state 0 48149 NULL
109064 +_add_to_r4w_48152 _add_to_r4w 4 48152 NULL nohasharray
109065 +bitmap_onto_48152 bitmap_onto 4 48152 &_add_to_r4w_48152
109066 +isr_dma1_done_read_48159 isr_dma1_done_read 3 48159 NULL
109067 +c4iw_id_table_alloc_48163 c4iw_id_table_alloc 3 48163 NULL
109068 +ocfs2_find_next_zero_bit_unaligned_48170 ocfs2_find_next_zero_bit_unaligned 2-3 48170 NULL nohasharray
109069 +rbd_obj_method_sync_48170 rbd_obj_method_sync 8 48170 &ocfs2_find_next_zero_bit_unaligned_48170
109070 +alloc_cc770dev_48186 alloc_cc770dev 1 48186 NULL
109071 +init_ipath_48187 init_ipath 1 48187 NULL
109072 +brcmf_sdio_chip_cm3_exitdl_48192 brcmf_sdio_chip_cm3_exitdl 4 48192 NULL
109073 +cfg80211_process_deauth_48200 cfg80211_process_deauth 3 48200 NULL
109074 +ext4_index_trans_blocks_48205 ext4_index_trans_blocks 0-2 48205 NULL
109075 +snd_seq_dump_var_event_48209 snd_seq_dump_var_event 0 48209 NULL
109076 +ll_direct_IO_26_48216 ll_direct_IO_26 4 48216 NULL
109077 +is_block_in_journal_48223 is_block_in_journal 3 48223 NULL
109078 +uv_blade_nr_possible_cpus_48226 uv_blade_nr_possible_cpus 0 48226 NULL
109079 +nilfs_readpages_48229 nilfs_readpages 4 48229 NULL
109080 +read_file_recv_48232 read_file_recv 3 48232 NULL
109081 +unaccount_shadowed_48233 unaccount_shadowed 2 48233 NULL nohasharray
109082 +blk_rq_pos_48233 blk_rq_pos 0 48233 &unaccount_shadowed_48233
109083 +nouveau_i2c_port_create__48240 nouveau_i2c_port_create_ 7 48240 NULL
109084 +nfsctl_transaction_read_48250 nfsctl_transaction_read 3 48250 NULL
109085 +batadv_socket_read_48257 batadv_socket_read 3 48257 NULL
109086 +cache_write_pipefs_48270 cache_write_pipefs 3 48270 NULL
109087 +trace_options_write_48275 trace_options_write 3 48275 NULL
109088 +send_set_info_48288 send_set_info 7 48288 NULL
109089 +lpfc_idiag_extacc_read_48301 lpfc_idiag_extacc_read 3 48301 NULL
109090 +timblogiw_read_48305 timblogiw_read 3 48305 NULL
109091 +hash_setkey_48310 hash_setkey 3 48310 NULL
109092 +audio_set_intf_req_48319 audio_set_intf_req 0 48319 NULL
109093 +kvm_mmu_pte_write_48340 kvm_mmu_pte_write 2 48340 NULL
109094 +__alloc_fd_48356 __alloc_fd 2 48356 NULL
109095 +skb_add_data_48363 skb_add_data 3 48363 NULL
109096 +tx_frag_init_called_read_48377 tx_frag_init_called_read 3 48377 NULL
109097 +lbs_debugfs_write_48413 lbs_debugfs_write 3 48413 NULL
109098 +uhid_event_from_user_48417 uhid_event_from_user 2 48417 NULL
109099 +div64_u64_rem_48418 div64_u64_rem 0-1-2 48418 NULL
109100 +snd_power_wait_48422 snd_power_wait 0 48422 NULL
109101 +pwr_tx_without_ps_read_48423 pwr_tx_without_ps_read 3 48423 NULL
109102 +hugepage_madvise_48435 hugepage_madvise 0 48435 NULL
109103 +print_filtered_48442 print_filtered 2-0 48442 NULL
109104 +tun_recvmsg_48463 tun_recvmsg 4 48463 NULL
109105 +compat_SyS_preadv64_48469 compat_SyS_preadv64 3 48469 NULL
109106 +ipath_format_hwerrors_48487 ipath_format_hwerrors 5 48487 NULL
109107 +init_section_page_cgroup_48489 init_section_page_cgroup 2 48489 NULL nohasharray
109108 +r8712_usbctrl_vendorreq_48489 r8712_usbctrl_vendorreq 6 48489 &init_section_page_cgroup_48489
109109 +ocfs2_refcount_cow_48495 ocfs2_refcount_cow 3 48495 NULL
109110 +send_control_msg_48498 send_control_msg 6 48498 NULL
109111 +mlx4_en_create_tx_ring_48501 mlx4_en_create_tx_ring 4 48501 NULL
109112 +count_masked_bytes_48507 count_masked_bytes 0-1 48507 NULL
109113 +diva_os_copy_to_user_48508 diva_os_copy_to_user 4 48508 NULL
109114 +brcmf_sdio_trap_info_48510 brcmf_sdio_trap_info 4 48510 NULL
109115 +phantom_get_free_48514 phantom_get_free 0 48514 NULL
109116 +drbd_bm_capacity_48530 drbd_bm_capacity 0 48530 NULL
109117 +ext3_splice_branch_48531 ext3_splice_branch 6 48531 NULL
109118 +raid10_size_48571 raid10_size 0-2-3 48571 NULL
109119 +llog_data_len_48607 llog_data_len 1 48607 NULL
109120 +ufs_dtogd_48616 ufs_dtogd 0-2 48616 NULL
109121 +do_ip_vs_set_ctl_48641 do_ip_vs_set_ctl 4 48641 NULL
109122 +ll_rw_extents_stats_pp_seq_write_48651 ll_rw_extents_stats_pp_seq_write 3 48651 NULL
109123 +mtd_read_48655 mtd_read 0 48655 NULL
109124 +aes_encrypt_packets_read_48666 aes_encrypt_packets_read 3 48666 NULL
109125 +ore_get_rw_state_48667 ore_get_rw_state 5-4 48667 NULL
109126 +sm501_create_subdev_48668 sm501_create_subdev 4-3 48668 NULL
109127 +ubi_eba_unmap_leb_48671 ubi_eba_unmap_leb 0 48671 NULL
109128 +hysdn_log_write_48694 hysdn_log_write 3 48694 NULL
109129 +altera_drscan_48698 altera_drscan 2 48698 NULL
109130 +kvm_set_irq_routing_48704 kvm_set_irq_routing 3 48704 NULL
109131 +recv_msg_48709 recv_msg 4 48709 NULL
109132 +lpfc_idiag_drbacc_write_48712 lpfc_idiag_drbacc_write 3 48712 NULL
109133 +SyS_lgetxattr_48719 SyS_lgetxattr 4 48719 NULL
109134 +ath6kl_usb_bmi_read_48745 ath6kl_usb_bmi_read 3 48745 NULL
109135 +ath6kl_regwrite_read_48747 ath6kl_regwrite_read 3 48747 NULL
109136 +event_buffer_read_48772 event_buffer_read 3 48772 NULL nohasharray
109137 +l2cap_segment_sdu_48772 l2cap_segment_sdu 4 48772 &event_buffer_read_48772
109138 +gfs2_direct_IO_48774 gfs2_direct_IO 4 48774 NULL
109139 +il3945_sta_dbgfs_stats_table_read_48802 il3945_sta_dbgfs_stats_table_read 3 48802 NULL
109140 +twa_change_queue_depth_48808 twa_change_queue_depth 2 48808 NULL
109141 +register_ftrace_profiler_48816 register_ftrace_profiler 0 48816 NULL
109142 +atomic_counters_read_48827 atomic_counters_read 3 48827 NULL
109143 +azx_get_position_48841 azx_get_position 0 48841 NULL
109144 +vc_do_resize_48842 vc_do_resize 4-3 48842 NULL
109145 +comedi_buf_write_alloc_48846 comedi_buf_write_alloc 0-2 48846 NULL
109146 +suspend_dtim_interval_write_48854 suspend_dtim_interval_write 3 48854 NULL
109147 +C_SYSC_pwritev64_48864 C_SYSC_pwritev64 3 48864 NULL nohasharray
109148 +viafb_dvp1_proc_write_48864 viafb_dvp1_proc_write 3 48864 &C_SYSC_pwritev64_48864
109149 +ide_port_alloc_devices_48866 ide_port_alloc_devices 2 48866 NULL
109150 +__ffs_ep0_read_events_48868 __ffs_ep0_read_events 3 48868 NULL
109151 +ext2_alloc_branch_48889 ext2_alloc_branch 4 48889 NULL
109152 +crypto_cipher_ctxsize_48890 crypto_cipher_ctxsize 0 48890 NULL
109153 +joydev_handle_JSIOCSAXMAP_48898 joydev_handle_JSIOCSAXMAP 3 48898 NULL
109154 +xdi_copy_to_user_48900 xdi_copy_to_user 4 48900 NULL
109155 +msg_hdr_sz_48908 msg_hdr_sz 0 48908 NULL
109156 +snd_pcm_update_hw_ptr_48925 snd_pcm_update_hw_ptr 0 48925 NULL
109157 +sep_crypto_dma_48937 sep_crypto_dma 0 48937 NULL
109158 +si5351_write_parameters_48940 si5351_write_parameters 2 48940 NULL
109159 +event_heart_beat_read_48961 event_heart_beat_read 3 48961 NULL
109160 +nand_ecc_test_run_48966 nand_ecc_test_run 1 48966 NULL
109161 +vmci_handle_arr_create_48971 vmci_handle_arr_create 1 48971 NULL
109162 +batadv_orig_hash_del_if_48972 batadv_orig_hash_del_if 2 48972 NULL
109163 +btrfs_delete_delayed_insertion_item_48981 btrfs_delete_delayed_insertion_item 0 48981 NULL
109164 +rds_rm_size_48996 rds_rm_size 0-2 48996 NULL
109165 +sel_write_enforce_48998 sel_write_enforce 3 48998 NULL
109166 +null_alloc_rs_49019 null_alloc_rs 2 49019 NULL
109167 +filemap_check_errors_49022 filemap_check_errors 0 49022 NULL
109168 +aic_inb_49023 aic_inb 0 49023 NULL
109169 +transient_status_49027 transient_status 4 49027 NULL
109170 +iwl_mvm_power_legacy_dbgfs_read_49038 iwl_mvm_power_legacy_dbgfs_read 4 49038 NULL nohasharray
109171 +ipath_reg_user_mr_49038 ipath_reg_user_mr 2-3 49038 &iwl_mvm_power_legacy_dbgfs_read_49038
109172 +aic7xxx_rem_scb_from_disc_list_49041 aic7xxx_rem_scb_from_disc_list 0 49041 NULL
109173 +setup_msi_irq_49052 setup_msi_irq 3-4 49052 NULL
109174 +ubi_read_49061 ubi_read 0 49061 NULL
109175 +scsi_register_49094 scsi_register 2 49094 NULL
109176 +paging64_walk_addr_nested_49100 paging64_walk_addr_nested 3 49100 NULL
109177 +compat_do_readv_writev_49102 compat_do_readv_writev 4 49102 NULL
109178 +xfrm_replay_state_esn_len_49119 xfrm_replay_state_esn_len 0 49119 NULL
109179 +ll_max_cached_mb_seq_write_49122 ll_max_cached_mb_seq_write 3 49122 NULL
109180 +qib_user_sdma_pin_pages_49136 qib_user_sdma_pin_pages 4-5-6 49136 NULL nohasharray
109181 +pt_read_49136 pt_read 3 49136 &qib_user_sdma_pin_pages_49136
109182 +read_file_49137 read_file 4 49137 NULL
109183 +ipwireless_tty_received_49154 ipwireless_tty_received 3 49154 NULL
109184 +f2fs_acl_count_49155 f2fs_acl_count 0-1 49155 NULL
109185 +ipw_queue_tx_init_49161 ipw_queue_tx_init 3 49161 NULL
109186 +ext4_free_clusters_after_init_49174 ext4_free_clusters_after_init 2 49174 NULL
109187 +__jfs_setxattr_49175 __jfs_setxattr 5 49175 NULL
109188 +ath6kl_bgscan_int_write_49178 ath6kl_bgscan_int_write 3 49178 NULL
109189 +dvb_dvr_ioctl_49182 dvb_dvr_ioctl 2 49182 NULL
109190 +print_queue_49191 print_queue 0 49191 NULL
109191 +root_nfs_cat_49192 root_nfs_cat 3 49192 NULL
109192 +iwl_dbgfs_ucode_general_stats_read_49199 iwl_dbgfs_ucode_general_stats_read 3 49199 NULL
109193 +il4965_rs_sta_dbgfs_stats_table_read_49206 il4965_rs_sta_dbgfs_stats_table_read 3 49206 NULL
109194 +do_jffs2_getxattr_49210 do_jffs2_getxattr 0 49210 NULL
109195 +resp_write_same_49217 resp_write_same 2 49217 NULL
109196 +nouveau_therm_create__49228 nouveau_therm_create_ 4 49228 NULL
109197 +hugetlb_cgroup_read_49259 hugetlb_cgroup_read 5 49259 NULL
109198 +ieee80211_if_read_rssi_threshold_49260 ieee80211_if_read_rssi_threshold 3 49260 NULL
109199 +isku_sysfs_read_keys_media_49268 isku_sysfs_read_keys_media 6 49268 NULL
109200 +ptlrpc_check_set_49277 ptlrpc_check_set 0 49277 NULL
109201 +rx_filter_beacon_filter_read_49279 rx_filter_beacon_filter_read 3 49279 NULL
109202 +__ext4_ext_dirty_49284 __ext4_ext_dirty 0 49284 NULL
109203 +ext4_xattr_ibody_list_49287 ext4_xattr_ibody_list 3-0 49287 NULL
109204 +viafb_dfph_proc_write_49288 viafb_dfph_proc_write 3 49288 NULL
109205 +uio_read_49300 uio_read 3 49300 NULL
109206 +ocfs2_resmap_find_free_bits_49301 ocfs2_resmap_find_free_bits 3 49301 NULL
109207 +isku_sysfs_read_keys_macro_49312 isku_sysfs_read_keys_macro 6 49312 NULL
109208 +update_ref_for_cow_49313 update_ref_for_cow 0 49313 NULL
109209 +SYSC_mincore_49319 SYSC_mincore 2-1 49319 NULL
109210 +fwtty_port_handler_49327 fwtty_port_handler 9 49327 NULL
109211 +srpt_alloc_ioctx_ring_49330 srpt_alloc_ioctx_ring 2-4-3 49330 NULL
109212 +__intel_map_single_49338 __intel_map_single 3-2 49338 NULL
109213 +intel_ring_invalidate_all_caches_49346 intel_ring_invalidate_all_caches 0 49346 NULL
109214 +joydev_ioctl_common_49359 joydev_ioctl_common 2 49359 NULL
109215 +ocfs2_remove_btree_range_49370 ocfs2_remove_btree_range 4-3-5 49370 NULL
109216 +iscsi_alloc_session_49390 iscsi_alloc_session 3 49390 NULL
109217 +ext4_ext_index_trans_blocks_49396 ext4_ext_index_trans_blocks 0 49396 NULL
109218 +rx_streaming_always_read_49401 rx_streaming_always_read 3 49401 NULL
109219 +tnode_alloc_49407 tnode_alloc 1 49407 NULL
109220 +samples_to_bytes_49426 samples_to_bytes 0-2 49426 NULL
109221 +ubi_add_to_av_49432 ubi_add_to_av 0 49432 NULL nohasharray
109222 +md_domain_init_49432 md_domain_init 2 49432 &ubi_add_to_av_49432
109223 +compat_do_msg_fill_49440 compat_do_msg_fill 3 49440 NULL
109224 +get_lru_size_49441 get_lru_size 0 49441 NULL
109225 +i915_gem_object_set_to_gtt_domain_49450 i915_gem_object_set_to_gtt_domain 0 49450 NULL
109226 +ocfs2_merge_rec_left_49455 ocfs2_merge_rec_left 0 49455 NULL
109227 +__hfsplus_getxattr_49460 __hfsplus_getxattr 0 49460 NULL
109228 +agp_3_5_isochronous_node_enable_49465 agp_3_5_isochronous_node_enable 3 49465 NULL
109229 +xfs_iformat_local_49472 xfs_iformat_local 4 49472 NULL
109230 +savu_sysfs_read_49473 savu_sysfs_read 6 49473 NULL
109231 +isr_decrypt_done_read_49490 isr_decrypt_done_read 3 49490 NULL
109232 +SyS_listxattr_49519 SyS_listxattr 3 49519 NULL
109233 +emulator_write_phys_49520 emulator_write_phys 2-4 49520 NULL
109234 +btrfs_add_free_space_49524 btrfs_add_free_space 0 49524 NULL
109235 +smk_write_access_49561 smk_write_access 3 49561 NULL
109236 +ntfs_malloc_nofs_49572 ntfs_malloc_nofs 1 49572 NULL
109237 +alloc_chunk_49575 alloc_chunk 1 49575 NULL
109238 +sctp_setsockopt_default_send_param_49578 sctp_setsockopt_default_send_param 3 49578 NULL
109239 +readfifo_49583 readfifo 1 49583 NULL
109240 +tap_write_49595 tap_write 3 49595 NULL
109241 +create_task_io_context_49601 create_task_io_context 3 49601 NULL
109242 +isr_wakeups_read_49607 isr_wakeups_read 3 49607 NULL
109243 +btrfs_mksubvol_49616 btrfs_mksubvol 3 49616 NULL
109244 +heap_init_49617 heap_init 2 49617 NULL
109245 +smk_write_doi_49621 smk_write_doi 3 49621 NULL
109246 +port_fops_read_49626 port_fops_read 3 49626 NULL
109247 +btrfsic_cmp_log_and_dev_bytenr_49628 btrfsic_cmp_log_and_dev_bytenr 2 49628 NULL
109248 +__swab32p_49657 __swab32p 0 49657 NULL
109249 +ubi_wl_flush_49682 ubi_wl_flush 0 49682 NULL
109250 +aa_simple_write_to_buffer_49683 aa_simple_write_to_buffer 3-4 49683 NULL
109251 +SyS_pwritev_49688 SyS_pwritev 3 49688 NULL
109252 +__setup_irq_49696 __setup_irq 0 49696 NULL
109253 +cx2341x_ctrl_new_menu_49700 cx2341x_ctrl_new_menu 3 49700 NULL
109254 +do_splice_to_49714 do_splice_to 4 49714 NULL
109255 +write_pool_49718 write_pool 3 49718 NULL
109256 +dm_thin_insert_block_49720 dm_thin_insert_block 2-3 49720 NULL
109257 +kvm_mmu_notifier_invalidate_page_49723 kvm_mmu_notifier_invalidate_page 3 49723 NULL
109258 +sep_create_dcb_dmatables_context_kernel_49728 sep_create_dcb_dmatables_context_kernel 6 49728 NULL
109259 +zd_usb_iowrite16v_49744 zd_usb_iowrite16v 3 49744 NULL
109260 +btrfs_chunk_num_stripes_49751 btrfs_chunk_num_stripes 0 49751 NULL
109261 +fuse_wr_pages_49753 fuse_wr_pages 0-1-2 49753 NULL
109262 +key_conf_keylen_read_49758 key_conf_keylen_read 3 49758 NULL
109263 +fuse_conn_waiting_read_49762 fuse_conn_waiting_read 3 49762 NULL
109264 +w83977af_fir_interrupt_49775 w83977af_fir_interrupt 0 49775 NULL
109265 +ceph_osdc_readpages_49789 ceph_osdc_readpages 0 49789 NULL
109266 +nfs4_acl_new_49806 nfs4_acl_new 1 49806 NULL
109267 +ntfs_copy_from_user_iovec_49829 ntfs_copy_from_user_iovec 3-6-0 49829 NULL
109268 +add_uuid_49831 add_uuid 4 49831 NULL
109269 +ath6kl_fwlog_block_read_49836 ath6kl_fwlog_block_read 3 49836 NULL
109270 +iraw_loop_49842 iraw_loop 0-1 49842 NULL
109271 +twl4030_write_49846 twl4030_write 2 49846 NULL
109272 +scsi_dispatch_cmd_entry_49848 scsi_dispatch_cmd_entry 3 49848 NULL
109273 +timeradd_entry_49850 timeradd_entry 3 49850 NULL
109274 +ubifs_destroy_tnc_subtree_49853 ubifs_destroy_tnc_subtree 0 49853 NULL
109275 +btrfs_subvolume_reserve_metadata_49859 btrfs_subvolume_reserve_metadata 3 49859 NULL
109276 +fiemap_count_to_size_49869 fiemap_count_to_size 0-1 49869 NULL
109277 +sctp_setsockopt_bindx_49870 sctp_setsockopt_bindx 3 49870 NULL
109278 +snd_mask_eq_49889 snd_mask_eq 0 49889 NULL
109279 +ceph_get_caps_49890 ceph_get_caps 0 49890 NULL
109280 +osc_brw_49896 osc_brw 4 49896 NULL
109281 +__cow_file_range_49901 __cow_file_range 5 49901 NULL
109282 +__copy_from_user_inatomic_nocache_49921 __copy_from_user_inatomic_nocache 3 49921 NULL
109283 +config_ep_by_speed_49939 config_ep_by_speed 0 49939 NULL
109284 +batadv_tt_realloc_packet_buff_49960 batadv_tt_realloc_packet_buff 4 49960 NULL
109285 +ieee80211_if_fmt_dtim_count_49987 ieee80211_if_fmt_dtim_count 3 49987 NULL
109286 +drm_buffer_copy_from_user_49990 drm_buffer_copy_from_user 3 49990 NULL
109287 +sta2x11_swiotlb_alloc_coherent_49994 sta2x11_swiotlb_alloc_coherent 2 49994 NULL
109288 +l2cap_chan_send_49995 l2cap_chan_send 3 49995 NULL
109289 +__module_alloc_50004 __module_alloc 1 50004 NULL
109290 +dn_mss_from_pmtu_50011 dn_mss_from_pmtu 0-2 50011 NULL
109291 +ptrace_readdata_50020 ptrace_readdata 2-4 50020 NULL
109292 +isdn_read_50021 isdn_read 3 50021 NULL
109293 +mdc_rename_pack_50023 mdc_rename_pack 4-6 50023 NULL
109294 +qp_alloc_queue_50028 qp_alloc_queue 1 50028 NULL
109295 +ioread8_50049 ioread8 0 50049 NULL
109296 +fuse_conn_max_background_write_50061 fuse_conn_max_background_write 3 50061 NULL
109297 +vmw_surface_destroy_size_50072 vmw_surface_destroy_size 0 50072 NULL
109298 +arch_setup_ht_irq_50073 arch_setup_ht_irq 1 50073 NULL
109299 +__kfifo_dma_in_prepare_50081 __kfifo_dma_in_prepare 4 50081 NULL
109300 +dev_set_alias_50084 dev_set_alias 3 50084 NULL
109301 +libcfs_ioctl_popdata_50087 libcfs_ioctl_popdata 3 50087 NULL
109302 +sock_setsockopt_50088 sock_setsockopt 5 50088 NULL
109303 +altera_swap_dr_50090 altera_swap_dr 2 50090 NULL
109304 +android_set_cntry_50100 android_set_cntry 0 50100 NULL
109305 +process_recorded_refs_50110 process_recorded_refs 0 50110 NULL
109306 +read_file_slot_50111 read_file_slot 3 50111 NULL
109307 +xfs_dir3_sf_entsize_50112 xfs_dir3_sf_entsize 0-3 50112 NULL
109308 +rx_streaming_interval_write_50120 rx_streaming_interval_write 3 50120 NULL
109309 +ocfs2_search_one_group_50125 ocfs2_search_one_group 0 50125 NULL nohasharray
109310 +jfs_direct_IO_50125 jfs_direct_IO 4 50125 &ocfs2_search_one_group_50125
109311 +SYSC_preadv_50134 SYSC_preadv 3 50134 NULL
109312 +copy_items_50140 copy_items 6 50140 NULL
109313 +tx_frag_need_fragmentation_read_50153 tx_frag_need_fragmentation_read 3 50153 NULL
109314 +reiserfs_bmap_count_50160 reiserfs_bmap_count 0 50160 NULL
109315 +kmalloc_node_50163 kmalloc_node 1-3 50163 NULL
109316 +rx_filter_ibss_filter_read_50167 rx_filter_ibss_filter_read 3 50167 NULL
109317 +ahd_probe_stack_size_50168 ahd_probe_stack_size 0 50168 NULL
109318 +odev_update_50169 odev_update 2 50169 NULL
109319 +ieee80211_if_fmt_dot11MeshHWMPRannInterval_50172 ieee80211_if_fmt_dot11MeshHWMPRannInterval 3 50172 NULL nohasharray
109320 +xfs_get_blocks_direct_50172 xfs_get_blocks_direct 2 50172 &ieee80211_if_fmt_dot11MeshHWMPRannInterval_50172 nohasharray
109321 +ubi_resize_volume_50172 ubi_resize_volume 2 50172 &xfs_get_blocks_direct_50172
109322 +ext3_do_update_inode_50178 ext3_do_update_inode 0 50178 NULL
109323 +cfg80211_roamed_bss_50198 cfg80211_roamed_bss 6-4 50198 NULL
109324 +cyttsp4_probe_50201 cyttsp4_probe 4 50201 NULL
109325 +rx_rx_timeout_wa_read_50204 rx_rx_timeout_wa_read 3 50204 NULL
109326 +compat_SyS_sendfile_50206 compat_SyS_sendfile 4 50206 NULL nohasharray
109327 +mthca_buddy_init_50206 mthca_buddy_init 2 50206 &compat_SyS_sendfile_50206
109328 +l2cap_sock_setsockopt_50207 l2cap_sock_setsockopt 5 50207 NULL
109329 +mon_bin_compat_ioctl_50234 mon_bin_compat_ioctl 3 50234 NULL
109330 +sg_kmalloc_50240 sg_kmalloc 1 50240 NULL
109331 +vma_dup_policy_50269 vma_dup_policy 0 50269 NULL
109332 +rxrpc_setsockopt_50286 rxrpc_setsockopt 5 50286 NULL
109333 +soc_codec_reg_show_50302 soc_codec_reg_show 0-3 50302 NULL
109334 +SYSC_flistxattr_50307 SYSC_flistxattr 3 50307 NULL
109335 +SYSC_sched_setaffinity_50310 SYSC_sched_setaffinity 2 50310 NULL
109336 +iterate_irefs_50313 iterate_irefs 0 50313 NULL
109337 +soc_camera_read_50319 soc_camera_read 3 50319 NULL
109338 +do_launder_page_50329 do_launder_page 0 50329 NULL
109339 +nouveau_engine_create__50331 nouveau_engine_create_ 7 50331 NULL
109340 +lpfc_idiag_pcicfg_read_50334 lpfc_idiag_pcicfg_read 3 50334 NULL
109341 +ocfs2_block_to_cluster_group_50337 ocfs2_block_to_cluster_group 2 50337 NULL nohasharray
109342 +snd_pcm_lib_writev_50337 snd_pcm_lib_writev 0-3 50337 &ocfs2_block_to_cluster_group_50337
109343 +tpm_read_50344 tpm_read 3 50344 NULL
109344 +sched_clock_remote_50347 sched_clock_remote 0 50347 NULL
109345 +efx_nic_update_stats_50352 efx_nic_update_stats 2 50352 NULL
109346 +kvm_arch_create_memslot_50354 kvm_arch_create_memslot 2 50354 NULL
109347 +isdn_ppp_read_50356 isdn_ppp_read 4 50356 NULL
109348 +ocfs2_figure_insert_type_50362 ocfs2_figure_insert_type 0 50362 NULL nohasharray
109349 +iwl_dbgfs_echo_test_write_50362 iwl_dbgfs_echo_test_write 3 50362 &ocfs2_figure_insert_type_50362
109350 +xfrm_send_migrate_50365 xfrm_send_migrate 5 50365 NULL
109351 +roccat_common2_receive_50369 roccat_common2_receive 4 50369 NULL
109352 +sl_alloc_bufs_50380 sl_alloc_bufs 2 50380 NULL
109353 +hash_ip6_expire_50390 hash_ip6_expire 3 50390 NULL
109354 +snd_mask_refine_last_50406 snd_mask_refine_last 0 50406 NULL
109355 +l2tp_ip_sendmsg_50411 l2tp_ip_sendmsg 4 50411 NULL
109356 +iscsi_create_conn_50425 iscsi_create_conn 2 50425 NULL
109357 +validate_acl_mac_addrs_50429 validate_acl_mac_addrs 0 50429 NULL
109358 +btrfs_error_discard_extent_50444 btrfs_error_discard_extent 2 50444 NULL nohasharray
109359 +ecryptfs_write_lower_page_segment_50444 ecryptfs_write_lower_page_segment 4 50444 &btrfs_error_discard_extent_50444
109360 +calc_csum_metadata_size_50448 calc_csum_metadata_size 0 50448 NULL
109361 +pgctrl_write_50453 pgctrl_write 3 50453 NULL
109362 +device_create_sys_dev_entry_50458 device_create_sys_dev_entry 0 50458 NULL
109363 +force_mapping_50464 force_mapping 2 50464 NULL
109364 +cfs_size_round_50472 cfs_size_round 0-1 50472 NULL
109365 +cdrom_read_cdda_50478 cdrom_read_cdda 4 50478 NULL
109366 +mei_io_cb_alloc_req_buf_50493 mei_io_cb_alloc_req_buf 2 50493 NULL
109367 +pwr_rcvd_awake_beacons_read_50505 pwr_rcvd_awake_beacons_read 3 50505 NULL
109368 +__ctzdi2_50536 __ctzdi2 1 50536 NULL
109369 +ath6kl_set_ap_probe_resp_ies_50539 ath6kl_set_ap_probe_resp_ies 3 50539 NULL
109370 +usbat_flash_write_data_50553 usbat_flash_write_data 4 50553 NULL
109371 +self_check_peb_vid_hdr_50563 self_check_peb_vid_hdr 0 50563 NULL nohasharray
109372 +ttm_agp_tt_create_50563 ttm_agp_tt_create 3 50563 &self_check_peb_vid_hdr_50563
109373 +fat_readpages_50582 fat_readpages 4 50582 NULL
109374 +iwl_dbgfs_missed_beacon_read_50584 iwl_dbgfs_missed_beacon_read 3 50584 NULL
109375 +build_inv_iommu_pages_50589 build_inv_iommu_pages 2-3 50589 NULL
109376 +xillybus_write_50605 xillybus_write 3 50605 NULL
109377 +rx_rx_checksum_result_read_50617 rx_rx_checksum_result_read 3 50617 NULL
109378 +ocfs2_split_extent_50618 ocfs2_split_extent 0 50618 NULL
109379 +sparse_early_usemaps_alloc_node_50623 sparse_early_usemaps_alloc_node 4 50623 NULL
109380 +__ffs_50625 __ffs 0-1 50625 NULL
109381 +regcache_rbtree_write_50629 regcache_rbtree_write 2 50629 NULL
109382 +simple_transaction_get_50633 simple_transaction_get 3 50633 NULL
109383 +ocfs2_do_insert_extent_50658 ocfs2_do_insert_extent 0 50658 NULL
109384 +ath6kl_tm_rx_event_50664 ath6kl_tm_rx_event 3 50664 NULL
109385 +bnad_debugfs_read_50665 bnad_debugfs_read 3 50665 NULL
109386 +ext2_try_to_allocate_with_rsv_50669 ext2_try_to_allocate_with_rsv 4-2-0 50669 NULL
109387 +prism2_read_fid_reg_50689 prism2_read_fid_reg 0 50689 NULL nohasharray
109388 +i2c_smbus_read_byte_data_50689 i2c_smbus_read_byte_data 0 50689 &prism2_read_fid_reg_50689
109389 +paging32_gva_to_gpa_50696 paging32_gva_to_gpa 2 50696 NULL
109390 +xfs_growfs_get_hdr_buf_50697 xfs_growfs_get_hdr_buf 3 50697 NULL
109391 +dev_mem_read_50706 dev_mem_read 3 50706 NULL
109392 +blk_check_plugged_50736 blk_check_plugged 3 50736 NULL
109393 +__ext3_get_inode_loc_50744 __ext3_get_inode_loc 0 50744 NULL
109394 +btrfs_truncate_free_space_cache_50769 btrfs_truncate_free_space_cache 0 50769 NULL
109395 +ocfs2_xattr_block_get_50773 ocfs2_xattr_block_get 0 50773 NULL
109396 +tm6000_read_write_usb_50774 tm6000_read_write_usb 7 50774 NULL
109397 +bio_alloc_map_data_50782 bio_alloc_map_data 2-1 50782 NULL
109398 +tpm_write_50798 tpm_write 3 50798 NULL
109399 +write_flush_50803 write_flush 3 50803 NULL
109400 +dvb_play_50814 dvb_play 3 50814 NULL
109401 +dpcm_show_state_50827 dpcm_show_state 0 50827 NULL
109402 +acpi_ev_install_gpe_block_50829 acpi_ev_install_gpe_block 2 50829 NULL
109403 +SetArea_50835 SetArea 4 50835 NULL nohasharray
109404 +create_mem_extents_50835 create_mem_extents 0 50835 &SetArea_50835 nohasharray
109405 +mask_from_50835 mask_from 0-1-2 50835 &create_mem_extents_50835
109406 +videobuf_dma_init_user_50839 videobuf_dma_init_user 3-4 50839 NULL
109407 +btrfs_search_slot_for_read_50843 btrfs_search_slot_for_read 0 50843 NULL
109408 +self_check_write_50856 self_check_write 0-5 50856 NULL
109409 +carl9170_debugfs_write_50857 carl9170_debugfs_write 3 50857 NULL
109410 +alloc_masks_50861 alloc_masks 3 50861 NULL
109411 +__percpu_counter_init_50878 __percpu_counter_init 0 50878 NULL
109412 +btrfs_insert_inode_ref_50884 btrfs_insert_inode_ref 0 50884 NULL
109413 +SyS_lgetxattr_50889 SyS_lgetxattr 4 50889 NULL
109414 +netlbl_secattr_catmap_walk_rng_50894 netlbl_secattr_catmap_walk_rng 0-2 50894 NULL
109415 +__bdev_writeseg_50903 __bdev_writeseg 4 50903 NULL
109416 +xfs_iext_remove_50909 xfs_iext_remove 3 50909 NULL
109417 +blk_rq_cur_sectors_50910 blk_rq_cur_sectors 0 50910 NULL
109418 +hash_recvmsg_50924 hash_recvmsg 4 50924 NULL
109419 +chd_dec_fetch_cdata_50926 chd_dec_fetch_cdata 3 50926 NULL
109420 +show_device_status_50947 show_device_status 0 50947 NULL
109421 +irq_timeout_write_50950 irq_timeout_write 3 50950 NULL
109422 +ocfs2_add_refcount_flag_50952 ocfs2_add_refcount_flag 6 50952 NULL
109423 +sdio_uart_write_50954 sdio_uart_write 3 50954 NULL
109424 +SyS_setxattr_50957 SyS_setxattr 4 50957 NULL
109425 +btrfs_del_csums_50969 btrfs_del_csums 0 50969 NULL
109426 +__btrfs_mod_ref_50973 __btrfs_mod_ref 0 50973 NULL
109427 +iwl_statistics_flag_50981 iwl_statistics_flag 0-3 50981 NULL
109428 +timeout_write_50991 timeout_write 3 50991 NULL
109429 +wm831x_irq_map_50995 wm831x_irq_map 2 50995 NULL
109430 +proc_write_51003 proc_write 3 51003 NULL
109431 +jbd2_journal_extend_51012 jbd2_journal_extend 2-0 51012 NULL
109432 +lbs_dev_info_51023 lbs_dev_info 3 51023 NULL
109433 +ntfs_attr_find_51028 ntfs_attr_find 0 51028 NULL nohasharray
109434 +fuse_conn_congestion_threshold_read_51028 fuse_conn_congestion_threshold_read 3 51028 &ntfs_attr_find_51028
109435 +BcmGetSectionValEndOffset_51039 BcmGetSectionValEndOffset 0 51039 NULL
109436 +dump_midi_51040 dump_midi 3 51040 NULL
109437 +usb_get_descriptor_51041 usb_get_descriptor 0 51041 NULL
109438 +srpt_alloc_ioctx_51042 srpt_alloc_ioctx 2-3 51042 NULL
109439 +do_arpt_set_ctl_51053 do_arpt_set_ctl 4 51053 NULL
109440 +wusb_prf_64_51065 wusb_prf_64 7 51065 NULL
109441 +jbd2_journal_init_revoke_51088 jbd2_journal_init_revoke 2 51088 NULL
109442 +solo_enc_v4l2_init_51094 solo_enc_v4l2_init 2 51094 NULL
109443 +__ocfs2_find_path_51096 __ocfs2_find_path 0 51096 NULL
109444 +btrfs_del_item_51110 btrfs_del_item 0 51110 NULL nohasharray
109445 +ti_recv_51110 ti_recv 3 51110 &btrfs_del_item_51110
109446 +uasp_prepare_r_request_51124 uasp_prepare_r_request 0 51124 NULL
109447 +nfs_map_name_to_uid_51132 nfs_map_name_to_uid 3 51132 NULL
109448 +alloc_rtllib_51136 alloc_rtllib 1 51136 NULL
109449 +simple_xattr_set_51140 simple_xattr_set 4 51140 NULL
109450 +set_dirty_51144 set_dirty 3 51144 NULL
109451 +xfs_trans_get_efd_51148 xfs_trans_get_efd 3 51148 NULL
109452 +walk_page_buffers_51170 walk_page_buffers 0 51170 NULL
109453 +snd_pcm_unlink_51210 snd_pcm_unlink 0 51210 NULL
109454 +uhci_frame_skel_link_51213 uhci_frame_skel_link 2 51213 NULL
109455 +nf_ct_ext_create_51232 nf_ct_ext_create 3 51232 NULL
109456 +snd_pcm_write_51235 snd_pcm_write 3 51235 NULL
109457 +tipc_send_51238 tipc_send 4 51238 NULL
109458 +drm_property_create_51239 drm_property_create 4 51239 NULL
109459 +__mxt_read_reg_51249 __mxt_read_reg 0 51249 NULL
109460 +st_read_51251 st_read 3 51251 NULL
109461 +compat_dccp_setsockopt_51263 compat_dccp_setsockopt 5 51263 NULL
109462 +target_alloc_sgl_51264 target_alloc_sgl 3 51264 NULL
109463 +dvb_audio_write_51275 dvb_audio_write 3 51275 NULL
109464 +ipwireless_network_packet_received_51277 ipwireless_network_packet_received 4 51277 NULL
109465 +zone_reclaimable_pages_51283 zone_reclaimable_pages 0 51283 NULL nohasharray
109466 +__get_cur_name_and_parent_51283 __get_cur_name_and_parent 0 51283 &zone_reclaimable_pages_51283
109467 +pvr2_std_id_to_str_51288 pvr2_std_id_to_str 2 51288 NULL
109468 +bnad_debugfs_read_regrd_51308 bnad_debugfs_read_regrd 3 51308 NULL
109469 +get_cell_51316 get_cell 2 51316 NULL
109470 +init_map_ipmac_51317 init_map_ipmac 4-3-5 51317 NULL
109471 +ocfs2_read_inode_block_51319 ocfs2_read_inode_block 0 51319 NULL
109472 +alloc_hippi_dev_51320 alloc_hippi_dev 1 51320 NULL
109473 +ext2_xattr_get_51327 ext2_xattr_get 0 51327 NULL
109474 +alloc_smp_req_51337 alloc_smp_req 1 51337 NULL nohasharray
109475 +compat_arch_ptrace_51337 compat_arch_ptrace 3 51337 &alloc_smp_req_51337
109476 +ipw_get_event_log_len_51341 ipw_get_event_log_len 0 51341 NULL
109477 +ieee80211_if_fmt_estab_plinks_51370 ieee80211_if_fmt_estab_plinks 3 51370 NULL
109478 +radeon_kms_compat_ioctl_51371 radeon_kms_compat_ioctl 2 51371 NULL
109479 +pci_sriov_resource_alignment_51406 pci_sriov_resource_alignment 0 51406 NULL
109480 +ceph_sync_read_51410 ceph_sync_read 3-0 51410 NULL
109481 +get_first_ref_51413 get_first_ref 0 51413 NULL
109482 +__btrfs_end_transaction_51420 __btrfs_end_transaction 0 51420 NULL
109483 +blk_register_region_51424 blk_register_region 1-2 51424 NULL
109484 +mwifiex_rdeeprom_read_51429 mwifiex_rdeeprom_read 3 51429 NULL
109485 +hfsplus_brec_read_51436 hfsplus_brec_read 0 51436 NULL
109486 +ieee80211_if_read_dot11MeshHWMPRootMode_51441 ieee80211_if_read_dot11MeshHWMPRootMode 3 51441 NULL
109487 +print_devstats_dot11ACKFailureCount_51443 print_devstats_dot11ACKFailureCount 3 51443 NULL
109488 +____alloc_ei_netdev_51475 ____alloc_ei_netdev 1 51475 NULL
109489 +xfs_buf_get_uncached_51477 xfs_buf_get_uncached 2 51477 NULL
109490 +btrfs_find_space_cluster_51482 btrfs_find_space_cluster 5 51482 NULL
109491 +kvm_fetch_guest_virt_51493 kvm_fetch_guest_virt 4-2 51493 NULL
109492 +ieee80211_if_write_uapsd_queues_51526 ieee80211_if_write_uapsd_queues 3 51526 NULL
109493 +key_search_51533 key_search 0 51533 NULL
109494 +load_pdptrs_51541 load_pdptrs 3 51541 NULL
109495 +__alloc_eip_netdev_51549 __alloc_eip_netdev 1 51549 NULL
109496 +ixgb_get_eeprom_len_51586 ixgb_get_eeprom_len 0 51586 NULL
109497 +get_cur_path_51589 get_cur_path 0 51589 NULL nohasharray
109498 +snd_interval_refine_first_51589 snd_interval_refine_first 0 51589 &get_cur_path_51589
109499 +aac_convert_sgraw2_51598 aac_convert_sgraw2 4 51598 NULL
109500 +table_size_to_number_of_entries_51613 table_size_to_number_of_entries 0-1 51613 NULL
109501 +extent_fiemap_51621 extent_fiemap 3 51621 NULL
109502 +sctp_auth_create_key_51641 sctp_auth_create_key 1 51641 NULL
109503 +iscsi_create_session_51647 iscsi_create_session 3 51647 NULL
109504 +get_new_cssid_51665 get_new_cssid 2 51665 NULL
109505 +ps_upsd_utilization_read_51669 ps_upsd_utilization_read 3 51669 NULL
109506 +sctp_setsockopt_associnfo_51684 sctp_setsockopt_associnfo 3 51684 NULL
109507 +host_mapping_level_51696 host_mapping_level 2-0 51696 NULL
109508 +sel_write_access_51704 sel_write_access 3 51704 NULL
109509 +tty_cdev_add_51714 tty_cdev_add 2-4 51714 NULL
109510 +v9fs_alloc_rdir_buf_51716 v9fs_alloc_rdir_buf 2 51716 NULL
109511 +drm_compat_ioctl_51717 drm_compat_ioctl 2 51717 NULL
109512 +sg_read_oxfer_51724 sg_read_oxfer 3 51724 NULL
109513 +dbg_check_lpt_nodes_51727 dbg_check_lpt_nodes 0 51727 NULL
109514 +cm4040_read_51732 cm4040_read 3 51732 NULL
109515 +get_user_pages_fast_51751 get_user_pages_fast 1-2-0 51751 NULL
109516 +ifx_spi_insert_flip_string_51752 ifx_spi_insert_flip_string 3 51752 NULL
109517 +if_write_51756 if_write 3 51756 NULL
109518 +ext4_ext_create_new_leaf_51763 ext4_ext_create_new_leaf 0 51763 NULL
109519 +__fswab32_51781 __fswab32 0 51781 NULL
109520 +to_ratio_51809 to_ratio 1-2 51809 NULL
109521 +qib_alloc_devdata_51819 qib_alloc_devdata 2 51819 NULL
109522 +buffer_from_user_51826 buffer_from_user 3 51826 NULL
109523 +max732x_irq_pending_51840 max732x_irq_pending 0 51840 NULL
109524 +ioread32_51847 ioread32 0 51847 NULL nohasharray
109525 +read_file_tgt_tx_stats_51847 read_file_tgt_tx_stats 3 51847 &ioread32_51847
109526 +do_readv_writev_51849 do_readv_writev 4 51849 NULL
109527 +SYSC_sendto_51852 SYSC_sendto 6 51852 NULL
109528 +bm_page_io_async_51858 bm_page_io_async 2 51858 NULL
109529 +pointer_size_read_51863 pointer_size_read 3 51863 NULL
109530 +mlx4_alloc_db_from_pgdir_51865 mlx4_alloc_db_from_pgdir 3 51865 NULL
109531 +get_indirect_ea_51869 get_indirect_ea 4 51869 NULL
109532 +user_read_51881 user_read 3 51881 NULL
109533 +dbAdjCtl_51888 dbAdjCtl 0 51888 NULL
109534 +SyS_mq_timedsend_51896 SyS_mq_timedsend 3 51896 NULL nohasharray
109535 +virt_to_phys_51896 virt_to_phys 0 51896 &SyS_mq_timedsend_51896
109536 +commit_fs_roots_51898 commit_fs_roots 0 51898 NULL
109537 +uvhub_to_first_node_51916 uvhub_to_first_node 0 51916 NULL
109538 +wmi_set_ie_51919 wmi_set_ie 3 51919 NULL
109539 +dbg_status_buf_51930 dbg_status_buf 2 51930 NULL
109540 +__tcp_mtu_to_mss_51938 __tcp_mtu_to_mss 0-2 51938 NULL
109541 +xfrm_alg_len_51940 xfrm_alg_len 0 51940 NULL
109542 +irq_dispose_mapping_51941 irq_dispose_mapping 1 51941 NULL
109543 +scsi_get_vpd_page_51951 scsi_get_vpd_page 4 51951 NULL
109544 +arizona_free_irq_51969 arizona_free_irq 2 51969 NULL nohasharray
109545 +snd_mask_min_51969 snd_mask_min 0 51969 &arizona_free_irq_51969
109546 +__blkdev_get_51972 __blkdev_get 0 51972 NULL nohasharray
109547 +read_page_51972 read_page 2 51972 &__blkdev_get_51972
109548 +get_zone_51981 get_zone 0-1 51981 NULL
109549 +ath6kl_sdio_alloc_prep_scat_req_51986 ath6kl_sdio_alloc_prep_scat_req 2 51986 NULL
109550 +_c4iw_write_mem_dma_51991 _c4iw_write_mem_dma 3 51991 NULL
109551 +ntfs_attr_size_51994 ntfs_attr_size 0 51994 NULL
109552 +dwc3_mode_write_51997 dwc3_mode_write 3 51997 NULL
109553 +skb_copy_datagram_from_iovec_52014 skb_copy_datagram_from_iovec 4-2-5 52014 NULL
109554 +rdmalt_52022 rdmalt 0 52022 NULL
109555 +override_release_52032 override_release 2 52032 NULL
109556 +end_port_52042 end_port 0 52042 NULL
109557 +dma_rx_errors_read_52045 dma_rx_errors_read 3 52045 NULL
109558 +msnd_fifo_write_52052 msnd_fifo_write 0-3 52052 NULL
109559 +dvb_ringbuffer_avail_52057 dvb_ringbuffer_avail 0 52057 NULL
109560 +__fuse_request_alloc_52060 __fuse_request_alloc 1 52060 NULL
109561 +isofs_readpages_52067 isofs_readpages 4 52067 NULL
109562 +nsm_get_handle_52089 nsm_get_handle 4 52089 NULL
109563 +ulist_add_merge_52096 ulist_add_merge 0 52096 NULL
109564 +o2net_debug_read_52105 o2net_debug_read 3 52105 NULL
109565 +split_scan_timeout_write_52128 split_scan_timeout_write 3 52128 NULL
109566 +retry_count_read_52129 retry_count_read 3 52129 NULL
109567 +snd_pcm_channel_info_user_52135 snd_pcm_channel_info_user 0 52135 NULL
109568 +gdm_usb_hci_send_52138 gdm_usb_hci_send 3 52138 NULL
109569 +sub_alloc_52140 sub_alloc 0 52140 NULL nohasharray
109570 +zram_meta_alloc_52140 zram_meta_alloc 1 52140 &sub_alloc_52140
109571 +hysdn_conf_write_52145 hysdn_conf_write 3 52145 NULL nohasharray
109572 +ext2_alloc_blocks_52145 ext2_alloc_blocks 2-0 52145 &hysdn_conf_write_52145
109573 +htable_size_52148 htable_size 0-1 52148 NULL
109574 +smk_write_load2_52155 smk_write_load2 3 52155 NULL
109575 +ieee80211_if_read_dot11MeshRetryTimeout_52168 ieee80211_if_read_dot11MeshRetryTimeout 3 52168 NULL
109576 +mga_compat_ioctl_52170 mga_compat_ioctl 2 52170 NULL
109577 +print_prefix_52176 print_prefix 0 52176 NULL
109578 +proc_pid_readlink_52186 proc_pid_readlink 3 52186 NULL
109579 +vmci_qp_broker_alloc_52216 vmci_qp_broker_alloc 6-5 52216 NULL
109580 +do_dmabuf_dirty_ldu_52241 do_dmabuf_dirty_ldu 6 52241 NULL
109581 +fuse_request_alloc_52243 fuse_request_alloc 1 52243 NULL nohasharray
109582 +xfs_iomap_eof_align_last_fsb_52243 xfs_iomap_eof_align_last_fsb 3 52243 &fuse_request_alloc_52243
109583 +ocfs2_try_to_merge_extent_52244 ocfs2_try_to_merge_extent 0 52244 NULL
109584 +pm80x_request_irq_52250 pm80x_request_irq 2 52250 NULL
109585 +mdiobus_alloc_size_52259 mdiobus_alloc_size 1 52259 NULL
109586 +shrink_slab_52261 shrink_slab 2-3 52261 NULL
109587 +hva_to_pfn_slow_52262 hva_to_pfn_slow 1 52262 NULL
109588 +sisusbcon_do_font_op_52271 sisusbcon_do_font_op 9 52271 NULL
109589 +handle_supp_msgs_52284 handle_supp_msgs 4 52284 NULL
109590 +kobject_set_name_vargs_52309 kobject_set_name_vargs 0 52309 NULL
109591 +read_file_reset_52310 read_file_reset 3 52310 NULL
109592 +request_asymmetric_key_52317 request_asymmetric_key 4-2 52317 NULL
109593 +hwflags_read_52318 hwflags_read 3 52318 NULL
109594 +snd_pcm_hw_free_52327 snd_pcm_hw_free 0 52327 NULL
109595 +ntfs_rl_split_52328 ntfs_rl_split 4-2 52328 NULL
109596 +test_unaligned_bulk_52333 test_unaligned_bulk 3 52333 NULL
109597 +hur_len_52339 hur_len 0 52339 NULL
109598 +bytes_to_frames_52362 bytes_to_frames 0-2 52362 NULL
109599 +copy_entries_to_user_52367 copy_entries_to_user 1 52367 NULL
109600 +iwl_dump_fh_52371 iwl_dump_fh 0 52371 NULL
109601 +hfsplus_find_attr_52374 hfsplus_find_attr 0 52374 NULL
109602 +ocfs2_journal_access_eb_52377 ocfs2_journal_access_eb 0 52377 NULL
109603 +mq_emit_config_values_52378 mq_emit_config_values 3 52378 NULL
109604 +isdn_writebuf_stub_52383 isdn_writebuf_stub 4 52383 NULL
109605 +jfs_setxattr_52389 jfs_setxattr 4 52389 NULL
109606 +aer_inject_write_52399 aer_inject_write 3 52399 NULL nohasharray
109607 +cl_page_own_52399 cl_page_own 0 52399 &aer_inject_write_52399
109608 +cgroup_file_write_52417 cgroup_file_write 3 52417 NULL
109609 +line6_midibuf_init_52425 line6_midibuf_init 2 52425 NULL
109610 +hso_serial_common_create_52428 hso_serial_common_create 4 52428 NULL
109611 +delay_status_52431 delay_status 5 52431 NULL
109612 +ath6kl_delete_qos_write_52435 ath6kl_delete_qos_write 3 52435 NULL
109613 +ieee80211_if_fmt_num_sta_ps_52438 ieee80211_if_fmt_num_sta_ps 3 52438 NULL
109614 +acpi_nvs_for_each_region_52448 acpi_nvs_for_each_region 0 52448 NULL
109615 +alauda_read_data_52452 alauda_read_data 3 52452 NULL
109616 +ieee80211_alloc_txb_52477 ieee80211_alloc_txb 1 52477 NULL
109617 +usb_tranzport_write_52479 usb_tranzport_write 3 52479 NULL
109618 +ocfs2_extend_no_holes_52483 ocfs2_extend_no_holes 3-4 52483 NULL
109619 +fd_do_rw_52495 fd_do_rw 3 52495 NULL
109620 +qib_user_sdma_pin_pages_52498 qib_user_sdma_pin_pages 3-5-4 52498 NULL
109621 +int_tasklet_entry_52500 int_tasklet_entry 3 52500 NULL
109622 +lmv_get_easize_52504 lmv_get_easize 0 52504 NULL
109623 +pm_qos_power_write_52513 pm_qos_power_write 3 52513 NULL
109624 +bt_sock_stream_recvmsg_52518 bt_sock_stream_recvmsg 4 52518 NULL
109625 +dup_variable_bug_52525 dup_variable_bug 3 52525 NULL
109626 +raw_recvmsg_52529 raw_recvmsg 4 52529 NULL
109627 +from_oblock_52546 from_oblock 0-1 52546 NULL
109628 +dccpprobe_read_52549 dccpprobe_read 3 52549 NULL
109629 +ocfs2_make_right_split_rec_52562 ocfs2_make_right_split_rec 3 52562 NULL
109630 +debug_level_proc_write_52572 debug_level_proc_write 3 52572 NULL
109631 +isku_sysfs_read_macro_52587 isku_sysfs_read_macro 6 52587 NULL
109632 +snd_pcm_sw_params_52594 snd_pcm_sw_params 0 52594 NULL
109633 +SyS_setsockopt_52610 SyS_setsockopt 5 52610 NULL
109634 +ll_sa_entry_alloc_52611 ll_sa_entry_alloc 4 52611 NULL
109635 +affs_set_blocksize_52625 affs_set_blocksize 2 52625 NULL
109636 +tps80031_writes_52638 tps80031_writes 3-4 52638 NULL
109637 +brcmf_sdio_assert_info_52653 brcmf_sdio_assert_info 4 52653 NULL
109638 +perf_trace_sched_stat_template_52656 perf_trace_sched_stat_template 3 52656 NULL
109639 +nvme_queue_extra_52661 nvme_queue_extra 0-1 52661 NULL
109640 +htb_add_class_to_row_52663 htb_add_class_to_row 3 52663 NULL
109641 +posix_acl_equiv_mode_52666 posix_acl_equiv_mode 0 52666 NULL
109642 +SYSC_gethostname_52677 SYSC_gethostname 2 52677 NULL
109643 +ntfs_get_nr_significant_bytes_52688 ntfs_get_nr_significant_bytes 0 52688 NULL
109644 +nvd0_disp_pioc_create__52693 nvd0_disp_pioc_create_ 5 52693 NULL
109645 +vendorextnWriteSection_52698 vendorextnWriteSection 0 52698 NULL
109646 +nouveau_client_create__52715 nouveau_client_create_ 5 52715 NULL
109647 +__dm_stat_bio_52722 __dm_stat_bio 3 52722 NULL
109648 +cx25840_ir_rx_read_52724 cx25840_ir_rx_read 3 52724 NULL
109649 +blkcipher_next_slow_52733 blkcipher_next_slow 4-3 52733 NULL
109650 +relay_alloc_page_array_52735 relay_alloc_page_array 1 52735 NULL
109651 +hfcsusb_rx_frame_52745 hfcsusb_rx_frame 3 52745 NULL
109652 +carl9170_debugfs_vif_dump_read_52755 carl9170_debugfs_vif_dump_read 3 52755 NULL
109653 +ieee80211_if_read_beacon_timeout_52756 ieee80211_if_read_beacon_timeout 3 52756 NULL
109654 +radeon_get_ib_value_52757 radeon_get_ib_value 0 52757 NULL
109655 +nvme_trans_ext_inq_page_52776 nvme_trans_ext_inq_page 3 52776 NULL
109656 +pwr_rcvd_beacons_read_52836 pwr_rcvd_beacons_read 3 52836 NULL
109657 +map_try_harder_52846 map_try_harder 2-3 52846 NULL
109658 +ext2_xattr_set_acl_52857 ext2_xattr_set_acl 4 52857 NULL
109659 +process_deleted_xattr_52861 process_deleted_xattr 0 52861 NULL
109660 +mon_bin_get_event_52863 mon_bin_get_event 6-4 52863 NULL
109661 +twl6030_gpadc_write_52867 twl6030_gpadc_write 1 52867 NULL
109662 +qib_decode_6120_err_52876 qib_decode_6120_err 3 52876 NULL
109663 +twlreg_write_52880 twlreg_write 3 52880 NULL
109664 +pvr2_ctrl_value_to_sym_internal_52881 pvr2_ctrl_value_to_sym_internal 5 52881 NULL
109665 +cache_read_procfs_52882 cache_read_procfs 3 52882 NULL
109666 +kvm_kvzalloc_52894 kvm_kvzalloc 1 52894 NULL
109667 +arizona_request_irq_52908 arizona_request_irq 2 52908 NULL
109668 +create_vtbl_52909 create_vtbl 0 52909 NULL
109669 +dio_bio_reap_52913 dio_bio_reap 0 52913 NULL
109670 +__kfifo_out_peek_r_52919 __kfifo_out_peek_r 3 52919 NULL
109671 +iblock_get_bio_52936 iblock_get_bio 3 52936 NULL
109672 +__nodes_remap_52951 __nodes_remap 5 52951 NULL
109673 +send_packet_52960 send_packet 4 52960 NULL
109674 +ieee80211_if_fmt_fwded_mcast_52961 ieee80211_if_fmt_fwded_mcast 3 52961 NULL
109675 +tx_tx_exch_read_52986 tx_tx_exch_read 3 52986 NULL
109676 +num_node_state_52989 num_node_state 0 52989 NULL
109677 +efivarfs_file_write_53000 efivarfs_file_write 3 53000 NULL
109678 +uasp_alloc_stream_res_53015 uasp_alloc_stream_res 0 53015 NULL
109679 +btrfs_free_and_pin_reserved_extent_53016 btrfs_free_and_pin_reserved_extent 2 53016 NULL
109680 +tx_tx_exch_pending_read_53018 tx_tx_exch_pending_read 3 53018 NULL
109681 +ext4_meta_bg_first_group_53031 ext4_meta_bg_first_group 0-2 53031 NULL
109682 +ocfs2_new_leaf_refcount_block_53036 ocfs2_new_leaf_refcount_block 0 53036 NULL
109683 +bio_cur_bytes_53037 bio_cur_bytes 0 53037 NULL
109684 +regcache_lzo_block_count_53056 regcache_lzo_block_count 0 53056 NULL
109685 +cfi_read_query_53066 cfi_read_query 0 53066 NULL
109686 +iwl_dbgfs_interrupt_write_53069 iwl_dbgfs_interrupt_write 3 53069 NULL
109687 +mwifiex_debug_read_53074 mwifiex_debug_read 3 53074 NULL
109688 +page_to_nid_53085 page_to_nid 0 53085 NULL
109689 +qib_resize_cq_53090 qib_resize_cq 2 53090 NULL
109690 +insert_new_root_53097 insert_new_root 0 53097 NULL
109691 +verity_status_53120 verity_status 5 53120 NULL
109692 +__copy_from_user_ll_nocache_nozero_53123 __copy_from_user_ll_nocache_nozero 0-3 53123 NULL
109693 +brcmf_usb_dl_cmd_53130 brcmf_usb_dl_cmd 4 53130 NULL
109694 +btrfs_search_forward_53137 btrfs_search_forward 0 53137 NULL
109695 +ps_poll_ps_poll_max_ap_turn_read_53140 ps_poll_ps_poll_max_ap_turn_read 3 53140 NULL
109696 +ieee80211_bss_info_update_53170 ieee80211_bss_info_update 4 53170 NULL
109697 +btrfs_io_bio_alloc_53179 btrfs_io_bio_alloc 2 53179 NULL
109698 +clear_capture_buf_53192 clear_capture_buf 2 53192 NULL
109699 +SyS_init_module_53202 SyS_init_module 2 53202 NULL
109700 +mtdoops_erase_block_53206 mtdoops_erase_block 2 53206 NULL
109701 +fixup_user_fault_53210 fixup_user_fault 3 53210 NULL
109702 +tx_tx_start_data_read_53219 tx_tx_start_data_read 3 53219 NULL
109703 +ptlrpc_lprocfs_req_history_max_seq_write_53243 ptlrpc_lprocfs_req_history_max_seq_write 3 53243 NULL
109704 +hfsplus_xattr_set_posix_acl_53249 hfsplus_xattr_set_posix_acl 4 53249 NULL
109705 +xfs_trans_read_buf_map_53258 xfs_trans_read_buf_map 5 53258 NULL
109706 +wil_write_file_ssid_53266 wil_write_file_ssid 3 53266 NULL
109707 +btrfs_file_extent_num_bytes_53269 btrfs_file_extent_num_bytes 0 53269 NULL
109708 +tsk_fork_get_node_53271 tsk_fork_get_node 0 53271 NULL
109709 +btrfs_find_highest_objectid_53284 btrfs_find_highest_objectid 0 53284 NULL
109710 +setup_leaf_for_split_53312 setup_leaf_for_split 0 53312 NULL
109711 +ftrace_profile_write_53327 ftrace_profile_write 3 53327 NULL
109712 +setup_cluster_no_bitmap_53328 setup_cluster_no_bitmap 0 53328 NULL
109713 +gsm_control_reply_53333 gsm_control_reply 4 53333 NULL
109714 +vm_mmap_53339 vm_mmap 0 53339 NULL
109715 +vendorextnIoctl_53350 vendorextnIoctl 0 53350 NULL nohasharray
109716 +btrfs_find_all_roots_53350 btrfs_find_all_roots 0 53350 &vendorextnIoctl_53350
109717 +read_6120_creg32_53363 read_6120_creg32 0 53363 NULL
109718 +sock_setbindtodevice_53369 sock_setbindtodevice 3 53369 NULL
109719 +get_random_bytes_arch_53370 get_random_bytes_arch 2 53370 NULL
109720 +isolate_lru_page_53417 isolate_lru_page 0 53417 NULL
109721 +i915_gem_execbuffer_relocate_object_53435 i915_gem_execbuffer_relocate_object 0 53435 NULL
109722 +isr_cmd_cmplt_read_53439 isr_cmd_cmplt_read 3 53439 NULL
109723 +mwifiex_info_read_53447 mwifiex_info_read 3 53447 NULL
109724 +apei_exec_run_optional_53452 apei_exec_run_optional 0 53452 NULL
109725 +paging64_prefetch_gpte_53468 paging64_prefetch_gpte 4 53468 NULL
109726 +iowarrior_read_53483 iowarrior_read 3 53483 NULL
109727 +osd_req_write_kern_53486 osd_req_write_kern 5 53486 NULL
109728 +do_verify_xattr_datum_53499 do_verify_xattr_datum 0 53499 NULL
109729 +ext4_ext_grow_indepth_53503 ext4_ext_grow_indepth 0 53503 NULL
109730 +snd_pcm_format_physical_width_53505 snd_pcm_format_physical_width 0 53505 NULL
109731 +dbAllocNext_53506 dbAllocNext 0 53506 NULL
109732 +ocfs2_xattr_set_acl_53508 ocfs2_xattr_set_acl 4 53508 NULL
109733 +check_acl_53512 check_acl 0 53512 NULL
109734 +send_utimes_53516 send_utimes 0 53516 NULL
109735 +SYSC_bind_53582 SYSC_bind 3 53582 NULL
109736 +cifs_utf16_bytes_53593 cifs_utf16_bytes 0 53593 NULL
109737 +proc_uid_map_write_53596 proc_uid_map_write 3 53596 NULL
109738 +gfn_to_pfn_async_53597 gfn_to_pfn_async 2 53597 NULL
109739 +pfkey_recvmsg_53604 pfkey_recvmsg 4 53604 NULL
109740 +___alloc_bootmem_nopanic_53626 ___alloc_bootmem_nopanic 1 53626 NULL
109741 +xd_write_multiple_pages_53633 xd_write_multiple_pages 6-5 53633 NULL
109742 +stmpe_gpio_request_53634 stmpe_gpio_request 2 53634 NULL nohasharray
109743 +ccid_getsockopt_builtin_ccids_53634 ccid_getsockopt_builtin_ccids 2 53634 &stmpe_gpio_request_53634
109744 +nr_sendmsg_53656 nr_sendmsg 4 53656 NULL
109745 +fuse_fill_write_pages_53682 fuse_fill_write_pages 0-4 53682 NULL
109746 +v4l2_event_subscribe_53687 v4l2_event_subscribe 3 53687 NULL
109747 +bdev_logical_block_size_53690 bdev_logical_block_size 0 53690 NULL nohasharray
109748 +igb_alloc_q_vector_53690 igb_alloc_q_vector 6-4 53690 &bdev_logical_block_size_53690
109749 +find_overflow_devnum_53711 find_overflow_devnum 0 53711 NULL
109750 +bio_integrity_split_53714 bio_integrity_split 3 53714 NULL
109751 +__ocfs2_resv_find_window_53721 __ocfs2_resv_find_window 3 53721 NULL
109752 +__proc_debug_mb_53732 __proc_debug_mb 5 53732 NULL
109753 +wdm_write_53735 wdm_write 3 53735 NULL
109754 +ext3_try_to_allocate_with_rsv_53737 ext3_try_to_allocate_with_rsv 5-3-0 53737 NULL
109755 +da9052_disable_irq_53745 da9052_disable_irq 2 53745 NULL
109756 +lpfc_idiag_queacc_read_qe_53755 lpfc_idiag_queacc_read_qe 0-2 53755 NULL nohasharray
109757 +amdtp_out_stream_get_max_payload_53755 amdtp_out_stream_get_max_payload 0 53755 &lpfc_idiag_queacc_read_qe_53755
109758 +ext2_acl_count_53773 ext2_acl_count 0-1 53773 NULL
109759 +__kfifo_dma_in_prepare_r_53792 __kfifo_dma_in_prepare_r 4-5 53792 NULL
109760 +qp_alloc_host_work_53798 qp_alloc_host_work 5-3 53798 NULL
109761 +regmap_raw_write_53803 regmap_raw_write 2-4 53803 NULL
109762 +lpfc_idiag_ctlacc_read_reg_53809 lpfc_idiag_ctlacc_read_reg 0-3 53809 NULL
109763 +nls_nullsize_53815 nls_nullsize 0 53815 NULL
109764 +insert_pfn_53816 insert_pfn 3-0 53816 NULL
109765 +setup_data_read_53822 setup_data_read 3 53822 NULL
109766 +pms_read_53873 pms_read 3 53873 NULL
109767 +ieee80211_if_fmt_dropped_frames_congestion_53883 ieee80211_if_fmt_dropped_frames_congestion 3 53883 NULL
109768 +ocfs2_rm_xattr_cluster_53900 ocfs2_rm_xattr_cluster 4-5-3 53900 NULL nohasharray
109769 +SyS_setgroups_53900 SyS_setgroups 1 53900 &ocfs2_rm_xattr_cluster_53900
109770 +azx_via_get_position_53916 azx_via_get_position 0 53916 NULL
109771 +usb_serial_generic_write_53927 usb_serial_generic_write 4 53927 NULL
109772 +ocfs2_make_clusters_writable_53938 ocfs2_make_clusters_writable 5-4-0 53938 NULL
109773 +idetape_chrdev_write_53976 idetape_chrdev_write 3 53976 NULL
109774 +mthca_reg_user_mr_53980 mthca_reg_user_mr 2-3 53980 NULL
109775 +__ocfs2_xattr_set_value_outside_53981 __ocfs2_xattr_set_value_outside 5 53981 NULL
109776 +ieee80211_if_fmt_dot11MeshHWMPperrMinInterval_53998 ieee80211_if_fmt_dot11MeshHWMPperrMinInterval 3 53998 NULL
109777 +send_clone_54011 send_clone 0 54011 NULL
109778 +hfsplus_attr_build_key_54013 hfsplus_attr_build_key 0 54013 NULL
109779 +snd_pcm_lib_write_transfer_54018 snd_pcm_lib_write_transfer 5-2-4 54018 NULL
109780 +mdc_kuc_write_54019 mdc_kuc_write 3 54019 NULL
109781 +ipxrtr_route_packet_54036 ipxrtr_route_packet 4 54036 NULL
109782 +pipeline_dec_packet_out_read_54052 pipeline_dec_packet_out_read 3 54052 NULL
109783 +nl80211_send_disconnected_54056 nl80211_send_disconnected 5 54056 NULL
109784 +rproc_state_read_54057 rproc_state_read 3 54057 NULL
109785 +btrfs_start_transaction_54066 btrfs_start_transaction 2 54066 NULL
109786 +_malloc_54077 _malloc 1 54077 NULL
109787 +bitmap_bitremap_54096 bitmap_bitremap 4 54096 NULL
109788 +altera_set_ir_pre_54103 altera_set_ir_pre 2 54103 NULL nohasharray
109789 +lustre_posix_acl_xattr_filter_54103 lustre_posix_acl_xattr_filter 2 54103 &altera_set_ir_pre_54103
109790 +__comedi_buf_write_alloc_54112 __comedi_buf_write_alloc 0-2 54112 NULL
109791 +strn_len_54122 strn_len 0 54122 NULL
109792 +isku_receive_54130 isku_receive 4 54130 NULL
109793 +isr_host_acknowledges_read_54136 isr_host_acknowledges_read 3 54136 NULL
109794 +irq_blk_threshold_write_54138 irq_blk_threshold_write 3 54138 NULL
109795 +memcpy_toiovec_54166 memcpy_toiovec 3 54166 NULL
109796 +nouveau_falcon_create__54169 nouveau_falcon_create_ 8 54169 NULL
109797 +p9_client_prepare_req_54175 p9_client_prepare_req 3 54175 NULL
109798 +devm_request_threaded_irq_54215 devm_request_threaded_irq 0 54215 NULL
109799 +do_sys_poll_54221 do_sys_poll 2 54221 NULL
109800 +__register_chrdev_54223 __register_chrdev 2-3 54223 NULL
109801 +pi_read_regr_54231 pi_read_regr 0 54231 NULL
109802 +mcp23s08_read_regs_54246 mcp23s08_read_regs 4 54246 NULL
109803 +reada_add_block_54247 reada_add_block 2 54247 NULL
109804 +write_file_spec_scan_ctl_54248 write_file_spec_scan_ctl 3 54248 NULL
109805 +jbd2__journal_restart_54249 jbd2__journal_restart 0 54249 NULL
109806 +barrier_all_devices_54254 barrier_all_devices 0 54254 NULL nohasharray
109807 +xfs_dir2_sf_addname_hard_54254 xfs_dir2_sf_addname_hard 3 54254 &barrier_all_devices_54254
109808 +ceph_msgpool_get_54258 ceph_msgpool_get 2 54258 NULL
109809 +wusb_prf_54261 wusb_prf 7 54261 NULL nohasharray
109810 +audio_write_54261 audio_write 4 54261 &wusb_prf_54261
109811 +mwifiex_getlog_read_54269 mwifiex_getlog_read 3 54269 NULL
109812 +kstrtou16_from_user_54274 kstrtou16_from_user 2 54274 NULL
109813 +ubi_calc_data_len_54279 ubi_calc_data_len 0-3 54279 NULL
109814 +altera_set_dr_post_54291 altera_set_dr_post 2 54291 NULL
109815 +dlm_alloc_pagevec_54296 dlm_alloc_pagevec 1 54296 NULL
109816 +get_iovec_page_array_54298 get_iovec_page_array 6 54298 NULL
109817 +ttm_mem_global_alloc_54299 ttm_mem_global_alloc 0 54299 NULL
109818 +reclaim_pages_54301 reclaim_pages 3 54301 NULL
109819 +sprintf_54306 sprintf 0 54306 NULL
109820 +bio_add_pc_page_54319 bio_add_pc_page 4 54319 NULL
109821 +br_fdb_fillbuf_54339 br_fdb_fillbuf 0 54339 NULL
109822 +__alloc_dev_table_54343 __alloc_dev_table 2 54343 NULL
109823 +__get_free_pages_54352 __get_free_pages 0 54352 NULL
109824 +tcf_hash_create_54360 tcf_hash_create 4 54360 NULL
109825 +read_file_credit_dist_stats_54367 read_file_credit_dist_stats 3 54367 NULL
109826 +vfs_readlink_54368 vfs_readlink 3 54368 NULL
109827 +do_dccp_setsockopt_54377 do_dccp_setsockopt 5 54377 NULL nohasharray
109828 +intel_sdvo_write_cmd_54377 intel_sdvo_write_cmd 4 54377 &do_dccp_setsockopt_54377
109829 +ah_alloc_tmp_54378 ah_alloc_tmp 2-3 54378 NULL
109830 +gart_unmap_page_54379 gart_unmap_page 3-2 54379 NULL
109831 +snd_pcm_oss_read2_54387 snd_pcm_oss_read2 3-0 54387 NULL
109832 +iwl_dbgfs_power_save_status_read_54392 iwl_dbgfs_power_save_status_read 3 54392 NULL
109833 +efx_nic_describe_stats_54407 efx_nic_describe_stats 2 54407 NULL
109834 +ll_ra_count_get_54410 ll_ra_count_get 3 54410 NULL
109835 +copy_gadget_strings_54417 copy_gadget_strings 3-2 54417 NULL
109836 +btrfs_inc_extent_ref_54442 btrfs_inc_extent_ref 0 54442 NULL
109837 +sparse_early_mem_maps_alloc_node_54485 sparse_early_mem_maps_alloc_node 4 54485 NULL
109838 +simple_strtoull_54493 simple_strtoull 0 54493 NULL
109839 +swiotlb_tbl_map_single_54495 swiotlb_tbl_map_single 0 54495 NULL
109840 +btrfs_ordered_sum_size_54509 btrfs_ordered_sum_size 0-2 54509 NULL
109841 +cgroup_write_X64_54514 cgroup_write_X64 5 54514 NULL
109842 +rfc4106_set_key_54519 rfc4106_set_key 3 54519 NULL
109843 +vmci_transport_dgram_enqueue_54525 vmci_transport_dgram_enqueue 4 54525 NULL
109844 +viacam_read_54526 viacam_read 3 54526 NULL
109845 +unix_dgram_connect_54535 unix_dgram_connect 3 54535 NULL
109846 +setsockopt_54539 setsockopt 5 54539 NULL
109847 +i915_reset_gen7_sol_offsets_54547 i915_reset_gen7_sol_offsets 0 54547 NULL
109848 +lbs_lowsnr_write_54549 lbs_lowsnr_write 3 54549 NULL
109849 +ntfs_commit_pages_after_non_resident_write_54555 ntfs_commit_pages_after_non_resident_write 4-3 54555 NULL nohasharray
109850 +i915_gem_get_seqno_54555 i915_gem_get_seqno 0 54555 &ntfs_commit_pages_after_non_resident_write_54555
109851 +btrfs_update_inode_item_54561 btrfs_update_inode_item 0 54561 NULL nohasharray
109852 +SYSC_setsockopt_54561 SYSC_setsockopt 5 54561 &btrfs_update_inode_item_54561
109853 +nfsd_vfs_write_54577 nfsd_vfs_write 6 54577 NULL
109854 +fw_iso_buffer_init_54582 fw_iso_buffer_init 3 54582 NULL
109855 +nvme_npages_54601 nvme_npages 0-1 54601 NULL
109856 +irq_pkt_threshold_write_54605 irq_pkt_threshold_write 3 54605 NULL
109857 +devm_gen_pool_create_54607 devm_gen_pool_create 3 54607 NULL
109858 +port_fops_write_54627 port_fops_write 3 54627 NULL
109859 +irq_timeout_read_54653 irq_timeout_read 3 54653 NULL
109860 +dns_resolver_read_54658 dns_resolver_read 3 54658 NULL
109861 +twl6030_interrupt_mask_54659 twl6030_interrupt_mask 2 54659 NULL
109862 +kvm_read_cr3_54662 kvm_read_cr3 0 54662 NULL
109863 +tdp_page_fault_54663 tdp_page_fault 2 54663 NULL
109864 +bus_add_device_54665 bus_add_device 0 54665 NULL
109865 +cw1200_queue_stats_init_54670 cw1200_queue_stats_init 2 54670 NULL
109866 +bio_kmalloc_54672 bio_kmalloc 2 54672 NULL
109867 +vring_new_virtqueue_54673 vring_new_virtqueue 2 54673 NULL
109868 +evm_read_key_54674 evm_read_key 3 54674 NULL
109869 +fs_path_add_path_54680 fs_path_add_path 0 54680 NULL
109870 +platform_get_irq_byname_54700 platform_get_irq_byname 0 54700 NULL
109871 +__btrfs_inc_extent_ref_54706 __btrfs_inc_extent_ref 7-0 54706 NULL
109872 +rfkill_fop_read_54711 rfkill_fop_read 3 54711 NULL
109873 +clk_divider_set_rate_54726 clk_divider_set_rate 3-2 54726 NULL
109874 +ocfs2_control_write_54737 ocfs2_control_write 3 54737 NULL
109875 +kzalloc_54740 kzalloc 1 54740 NULL
109876 +wep_iv_read_54744 wep_iv_read 3 54744 NULL
109877 +lpfc_idiag_pcicfg_write_54749 lpfc_idiag_pcicfg_write 3 54749 NULL
109878 +iio_event_chrdev_read_54757 iio_event_chrdev_read 3 54757 NULL
109879 +adis16480_show_firmware_date_54762 adis16480_show_firmware_date 3 54762 NULL
109880 +ldsem_atomic_update_54774 ldsem_atomic_update 1-0 54774 NULL
109881 +gpiochip_add_54781 gpiochip_add 0 54781 NULL
109882 +flexcop_device_kmalloc_54793 flexcop_device_kmalloc 1 54793 NULL
109883 +domain_init_54797 domain_init 2 54797 NULL
109884 +ext3_find_goal_54801 ext3_find_goal 0 54801 NULL
109885 +get_dev_size_54807 get_dev_size 0 54807 NULL
109886 +nfsd_write_54809 nfsd_write 6 54809 NULL
109887 +aes_decrypt_fail_read_54815 aes_decrypt_fail_read 3 54815 NULL nohasharray
109888 +kvzalloc_54815 kvzalloc 1 54815 &aes_decrypt_fail_read_54815 nohasharray
109889 +crypto_tfm_ctx_alignment_54815 crypto_tfm_ctx_alignment 0 54815 &kvzalloc_54815
109890 +generic_perform_write_54832 generic_perform_write 3 54832 NULL
109891 +write_rio_54837 write_rio 3 54837 NULL
109892 +nouveau_engctx_create__54839 nouveau_engctx_create_ 8 54839 NULL nohasharray
109893 +ext3_acl_from_disk_54839 ext3_acl_from_disk 2 54839 &nouveau_engctx_create__54839
109894 +ufx_ops_write_54848 ufx_ops_write 3 54848 NULL
109895 +printer_read_54851 printer_read 3 54851 NULL
109896 +qib_reg_user_mr_54858 qib_reg_user_mr 2-3 54858 NULL
109897 +alloc_ep_req_54860 alloc_ep_req 2 54860 NULL
109898 +broadsheet_spiflash_rewrite_sector_54864 broadsheet_spiflash_rewrite_sector 2 54864 NULL
109899 +prism_build_supp_rates_54865 prism_build_supp_rates 0 54865 NULL
109900 +iscsi_pool_init_54913 iscsi_pool_init 4-2 54913 NULL nohasharray
109901 +kobject_set_name_vargs_54913 kobject_set_name_vargs 0 54913 &iscsi_pool_init_54913
109902 +btrfs_stack_chunk_num_stripes_54923 btrfs_stack_chunk_num_stripes 0 54923 NULL
109903 +bio_add_page_54933 bio_add_page 0-3 54933 NULL
109904 +mxms_structlen_54939 mxms_structlen 0 54939 NULL
109905 +add_port_54941 add_port 2 54941 NULL
109906 +ath9k_dump_btcoex_54949 ath9k_dump_btcoex 0 54949 NULL
109907 +alauda_write_data_54967 alauda_write_data 3 54967 NULL
109908 +c4_add_card_54968 c4_add_card 3 54968 NULL
109909 +iwl_pcie_dump_fh_54975 iwl_pcie_dump_fh 0 54975 NULL
109910 +ubi_change_vtbl_record_54979 ubi_change_vtbl_record 0 54979 NULL
109911 +ext3_xattr_get_54989 ext3_xattr_get 0 54989 NULL
109912 +rds_ib_inc_copy_to_user_55007 rds_ib_inc_copy_to_user 3 55007 NULL
109913 +mem_cgroup_get_lru_size_55008 mem_cgroup_get_lru_size 0 55008 NULL
109914 +cx231xx_v4l2_read_55014 cx231xx_v4l2_read 3 55014 NULL
109915 +paging32_get_level1_sp_gpa_55022 paging32_get_level1_sp_gpa 0 55022 NULL
109916 +error_error_null_Frame_tx_start_read_55024 error_error_null_Frame_tx_start_read 3 55024 NULL
109917 +dgap_do_bios_load_55025 dgap_do_bios_load 3 55025 NULL
109918 +btrfs_init_acl_55028 btrfs_init_acl 0 55028 NULL
109919 +write_ctree_super_55039 write_ctree_super 0 55039 NULL
109920 +ext4_ext_handle_uninitialized_extents_55059 ext4_ext_handle_uninitialized_extents 0-6 55059 NULL
109921 +apei_exec_run_55075 apei_exec_run 0 55075 NULL
109922 +bitmap_storage_alloc_55077 bitmap_storage_alloc 2 55077 NULL
109923 +snd_pcm_capture_hw_avail_55086 snd_pcm_capture_hw_avail 0 55086 NULL nohasharray
109924 +read_dma_55086 read_dma 3 55086 &snd_pcm_capture_hw_avail_55086
109925 +rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read_55106 rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read 3 55106 NULL
109926 +corrupt_data_55120 corrupt_data 0-3 55120 NULL
109927 +crypto_ahash_setkey_55134 crypto_ahash_setkey 3 55134 NULL
109928 +ocfs2_prepare_refcount_change_for_del_55137 ocfs2_prepare_refcount_change_for_del 3-0 55137 NULL nohasharray
109929 +filldir_55137 filldir 3 55137 &ocfs2_prepare_refcount_change_for_del_55137
109930 +validate_vid_hdr_55145 validate_vid_hdr 0 55145 NULL
109931 +ocfs2_truncate_file_55148 ocfs2_truncate_file 3 55148 NULL
109932 +npages_to_npools_55149 npages_to_npools 0-1 55149 NULL
109933 +ieee80211_if_read_uapsd_queues_55150 ieee80211_if_read_uapsd_queues 3 55150 NULL
109934 +mtd_get_fact_prot_info_55186 mtd_get_fact_prot_info 0 55186 NULL
109935 +sel_write_relabel_55195 sel_write_relabel 3 55195 NULL
109936 +sched_feat_write_55202 sched_feat_write 3 55202 NULL
109937 +ht40allow_map_read_55209 ht40allow_map_read 3 55209 NULL
109938 +__kfifo_dma_out_prepare_r_55211 __kfifo_dma_out_prepare_r 4-5 55211 NULL
109939 +do_raw_setsockopt_55215 do_raw_setsockopt 5 55215 NULL
109940 +qxl_alloc_client_monitors_config_55216 qxl_alloc_client_monitors_config 2 55216 NULL
109941 +dbAllocDmap_55227 dbAllocDmap 0 55227 NULL
109942 +hash_netport6_expire_55232 hash_netport6_expire 3 55232 NULL
109943 +memcpy_fromiovec_55247 memcpy_fromiovec 3 55247 NULL
109944 +lbs_failcount_write_55276 lbs_failcount_write 3 55276 NULL
109945 +persistent_ram_new_55286 persistent_ram_new 2-1 55286 NULL
109946 +ptrace_request_55288 ptrace_request 3 55288 NULL
109947 +rx_streaming_interval_read_55291 rx_streaming_interval_read 3 55291 NULL
109948 +lov_get_stripecnt_55297 lov_get_stripecnt 0-3 55297 NULL
109949 +gsm_control_modem_55303 gsm_control_modem 3 55303 NULL
109950 +wimax_msg_len_55304 wimax_msg_len 0 55304 NULL
109951 +__get_vm_area_node_55305 __get_vm_area_node 6 55305 NULL nohasharray
109952 +qp_alloc_guest_work_55305 qp_alloc_guest_work 5-3 55305 &__get_vm_area_node_55305
109953 +__vxge_hw_vpath_initialize_55328 __vxge_hw_vpath_initialize 2 55328 NULL
109954 +do_shmat_55336 do_shmat 5 55336 NULL
109955 +vme_user_read_55338 vme_user_read 3 55338 NULL
109956 +sctp_datamsg_from_user_55342 sctp_datamsg_from_user 4 55342 NULL nohasharray
109957 +__wa_xfer_setup_sizes_55342 __wa_xfer_setup_sizes 0 55342 &sctp_datamsg_from_user_55342
109958 +iterate_inode_extrefs_55362 iterate_inode_extrefs 0 55362 NULL nohasharray
109959 +acpi_system_read_event_55362 acpi_system_read_event 3 55362 &iterate_inode_extrefs_55362
109960 +cw1200_sdio_align_size_55391 cw1200_sdio_align_size 2 55391 NULL
109961 +__domain_mapping_55393 __domain_mapping 5 55393 NULL
109962 +iwl_dbgfs_plcp_delta_read_55407 iwl_dbgfs_plcp_delta_read 3 55407 NULL
109963 +si476x_radio_read_rds_blckcnt_blob_55427 si476x_radio_read_rds_blckcnt_blob 3 55427 NULL
109964 +SyS_read_55449 SyS_read 3 55449 NULL
109965 +add_relation_rb_55451 add_relation_rb 0 55451 NULL
109966 +__vxge_hw_channel_allocate_55462 __vxge_hw_channel_allocate 3 55462 NULL
109967 +cx23888_ir_rx_read_55473 cx23888_ir_rx_read 3 55473 NULL
109968 +snd_pcm_lib_write_55483 snd_pcm_lib_write 0-3 55483 NULL
109969 +i2o_pool_alloc_55485 i2o_pool_alloc 4 55485 NULL
109970 +ocfs2_rec_clusters_55501 ocfs2_rec_clusters 0 55501 NULL nohasharray
109971 +ras_stride_increase_window_55501 ras_stride_increase_window 3 55501 &ocfs2_rec_clusters_55501
109972 +ext4_flex_bg_size_55502 ext4_flex_bg_size 0 55502 NULL
109973 +tx_tx_done_int_template_read_55511 tx_tx_done_int_template_read 3 55511 NULL
109974 +ea_get_55522 ea_get 3-0 55522 NULL
109975 +buffer_size_55534 buffer_size 0 55534 NULL
109976 +set_msr_interception_55538 set_msr_interception 2 55538 NULL
109977 +tty_port_register_device_55543 tty_port_register_device 3 55543 NULL
109978 +dgap_do_config_load_55548 dgap_do_config_load 2 55548 NULL
109979 +dm_stats_list_55551 dm_stats_list 4 55551 NULL
109980 +gfs2_bitfit_55566 gfs2_bitfit 2-3-0 55566 NULL
109981 +hash_netport4_expire_55584 hash_netport4_expire 3 55584 NULL
109982 +add_partition_55588 add_partition 2 55588 NULL
109983 +kstrtou8_from_user_55599 kstrtou8_from_user 2 55599 NULL
109984 +SyS_keyctl_55602 SyS_keyctl 4 55602 NULL
109985 +allocate_without_wrapping_disk_55607 allocate_without_wrapping_disk 4 55607 NULL
109986 +macvtap_put_user_55609 macvtap_put_user 4 55609 NULL
109987 +selinux_setprocattr_55611 selinux_setprocattr 4 55611 NULL
109988 +edge_tty_recv_55622 edge_tty_recv 3 55622 NULL
109989 +snd_pcm_hw_param_last_55624 snd_pcm_hw_param_last 0 55624 NULL
109990 +reiserfs_xattr_get_55628 reiserfs_xattr_get 0 55628 NULL nohasharray
109991 +pktgen_if_write_55628 pktgen_if_write 3 55628 &reiserfs_xattr_get_55628
109992 +osc_obd_max_pages_per_rpc_seq_write_55636 osc_obd_max_pages_per_rpc_seq_write 3 55636 NULL
109993 +dvb_dmxdev_set_buffer_size_55643 dvb_dmxdev_set_buffer_size 2 55643 NULL
109994 +mlx4_buddy_alloc_55647 mlx4_buddy_alloc 2 55647 NULL
109995 +xfs_bmbt_maxrecs_55649 xfs_bmbt_maxrecs 0-2 55649 NULL
109996 +lpfc_idiag_queinfo_read_55662 lpfc_idiag_queinfo_read 3 55662 NULL
109997 +il_dbgfs_tx_queue_read_55668 il_dbgfs_tx_queue_read 3 55668 NULL
109998 +btrfs_reloc_cow_block_55672 btrfs_reloc_cow_block 0 55672 NULL
109999 +get_info_55681 get_info 3 55681 NULL
110000 +iwl_dbgfs_plcp_delta_write_55682 iwl_dbgfs_plcp_delta_write 3 55682 NULL
110001 +pm8001_store_update_fw_55716 pm8001_store_update_fw 4 55716 NULL
110002 +ocfs2_lock_refcount_tree_55719 ocfs2_lock_refcount_tree 0 55719 NULL nohasharray
110003 +mtdswap_init_55719 mtdswap_init 2 55719 &ocfs2_lock_refcount_tree_55719
110004 +tap_pwup_write_55723 tap_pwup_write 3 55723 NULL
110005 +__iio_allocate_kfifo_55738 __iio_allocate_kfifo 2 55738 NULL
110006 +set_local_name_55757 set_local_name 4 55757 NULL
110007 +strlen_55778 strlen 0 55778 NULL nohasharray
110008 +is_idx_node_in_tnc_55778 is_idx_node_in_tnc 0 55778 &strlen_55778
110009 +set_spte_55783 set_spte 4-5 55783 NULL
110010 +req_bio_endio_55786 req_bio_endio 3 55786 NULL nohasharray
110011 +conf_read_55786 conf_read 3 55786 &req_bio_endio_55786
110012 +uwb_rc_neh_grok_event_55799 uwb_rc_neh_grok_event 3 55799 NULL
110013 +sb16_copy_from_user_55836 sb16_copy_from_user 7-6-10 55836 NULL
110014 +ept_gva_to_gpa_55848 ept_gva_to_gpa 2 55848 NULL
110015 +ip_hdrlen_55849 ip_hdrlen 0 55849 NULL
110016 +hcd_alloc_coherent_55862 hcd_alloc_coherent 5 55862 NULL
110017 +shmem_setxattr_55867 shmem_setxattr 4 55867 NULL
110018 +__check_block_validity_55869 __check_block_validity 0 55869 NULL
110019 +hsc_write_55875 hsc_write 3 55875 NULL
110020 +pm_qos_power_read_55891 pm_qos_power_read 3 55891 NULL
110021 +snd_pcm_hw_param_value_min_55917 snd_pcm_hw_param_value_min 0 55917 NULL
110022 +ext2_direct_IO_55932 ext2_direct_IO 4 55932 NULL
110023 +paging64_page_fault_55942 paging64_page_fault 2 55942 NULL
110024 +kvm_write_guest_virt_system_55944 kvm_write_guest_virt_system 4-2 55944 NULL
110025 +sel_read_policy_55947 sel_read_policy 3 55947 NULL
110026 +ceph_get_direct_page_vector_55956 ceph_get_direct_page_vector 2 55956 NULL
110027 +simple_read_from_buffer_55957 simple_read_from_buffer 5-2 55957 NULL
110028 +tx_tx_imm_resp_read_55964 tx_tx_imm_resp_read 3 55964 NULL
110029 +btrfs_clone_55977 btrfs_clone 5-3 55977 NULL
110030 +wa_xfer_create_subset_sg_55992 wa_xfer_create_subset_sg 2-3 55992 NULL
110031 +nvme_alloc_iod_56027 nvme_alloc_iod 1-2 56027 NULL
110032 +dccp_sendmsg_56058 dccp_sendmsg 4 56058 NULL
110033 +__set_discard_56081 __set_discard 2 56081 NULL
110034 +pscsi_get_bio_56103 pscsi_get_bio 1 56103 NULL
110035 +usb_alloc_stream_buffers_56123 usb_alloc_stream_buffers 3 56123 NULL
110036 +sel_read_handle_status_56139 sel_read_handle_status 3 56139 NULL
110037 +write_file_frameerrors_56145 write_file_frameerrors 3 56145 NULL
110038 +add_extent_mapping_56157 add_extent_mapping 0 56157 NULL
110039 +__i2c_transfer_56162 __i2c_transfer 0 56162 NULL
110040 +rawv6_setsockopt_56165 rawv6_setsockopt 5 56165 NULL
110041 +create_irq_nr_56180 create_irq_nr 1-0-2 56180 NULL
110042 +ath9k_dump_legacy_btcoex_56194 ath9k_dump_legacy_btcoex 0 56194 NULL
110043 +ocfs2_journal_access_gd_56209 ocfs2_journal_access_gd 0 56209 NULL
110044 +update_space_info_56213 update_space_info 0 56213 NULL
110045 +ncp_read_bounce_size_56221 ncp_read_bounce_size 0-1 56221 NULL
110046 +vring_add_indirect_56222 vring_add_indirect 4 56222 NULL
110047 +ocfs2_find_xe_in_bucket_56224 ocfs2_find_xe_in_bucket 0 56224 NULL
110048 +do_ipt_set_ctl_56238 do_ipt_set_ctl 4 56238 NULL
110049 +fd_copyin_56247 fd_copyin 3 56247 NULL
110050 +sk_rmem_schedule_56255 sk_rmem_schedule 3 56255 NULL
110051 +p9pdu_vreadf_56271 p9pdu_vreadf 0 56271 NULL
110052 +il4965_ucode_general_stats_read_56277 il4965_ucode_general_stats_read 3 56277 NULL
110053 +ieee80211_if_fmt_user_power_level_56283 ieee80211_if_fmt_user_power_level 3 56283 NULL
110054 +RESIZE_IF_NEEDED_56286 RESIZE_IF_NEEDED 2 56286 NULL
110055 +dvb_aplay_56296 dvb_aplay 3 56296 NULL
110056 +btmrvl_hscfgcmd_read_56303 btmrvl_hscfgcmd_read 3 56303 NULL
110057 +speakup_file_write_56310 speakup_file_write 3 56310 NULL
110058 +pipeline_pre_to_defrag_swi_read_56321 pipeline_pre_to_defrag_swi_read 3 56321 NULL
110059 +journal_init_revoke_table_56331 journal_init_revoke_table 1 56331 NULL
110060 +snd_rawmidi_read_56337 snd_rawmidi_read 3 56337 NULL
110061 +ipv6_recv_error_56347 ipv6_recv_error 3 56347 NULL
110062 +vxge_os_dma_malloc_async_56348 vxge_os_dma_malloc_async 3 56348 NULL
110063 +mite_device_bytes_transferred_56355 mite_device_bytes_transferred 0 56355 NULL
110064 +iov_iter_copy_from_user_atomic_56368 iov_iter_copy_from_user_atomic 0-4 56368 NULL
110065 +dev_read_56369 dev_read 3 56369 NULL
110066 +ath10k_read_simulate_fw_crash_56371 ath10k_read_simulate_fw_crash 3 56371 NULL
110067 +ata_qc_complete_multiple_56376 ata_qc_complete_multiple 2 56376 NULL
110068 +snd_pcm_common_ioctl1_56382 snd_pcm_common_ioctl1 0 56382 NULL
110069 +write_gssp_56404 write_gssp 3 56404 NULL
110070 +ocfs2_control_read_56405 ocfs2_control_read 3 56405 NULL
110071 +do_get_write_access_56410 do_get_write_access 0 56410 NULL
110072 +i915_gem_object_sync_56417 i915_gem_object_sync 0 56417 NULL nohasharray
110073 +store_msg_56417 store_msg 3 56417 &i915_gem_object_sync_56417
110074 +pppol2tp_sendmsg_56420 pppol2tp_sendmsg 4 56420 NULL
110075 +fl_create_56435 fl_create 5 56435 NULL
110076 +gnttab_map_56439 gnttab_map 2 56439 NULL
110077 +cx231xx_init_isoc_56453 cx231xx_init_isoc 3-2-4 56453 NULL
110078 +set_connectable_56458 set_connectable 4 56458 NULL
110079 +osd_req_list_partition_objects_56464 osd_req_list_partition_objects 5 56464 NULL
110080 +putused_user_56467 putused_user 3 56467 NULL
110081 +lbs_rdmac_write_56471 lbs_rdmac_write 3 56471 NULL
110082 +calc_linear_pos_56472 calc_linear_pos 0-3 56472 NULL
110083 +global_rt_period_56476 global_rt_period 0 56476 NULL
110084 +crypto_shash_alignmask_56486 crypto_shash_alignmask 0 56486 NULL
110085 +ieee80211_rx_mgmt_probe_beacon_56491 ieee80211_rx_mgmt_probe_beacon 3 56491 NULL
110086 +cfs_access_process_vm_56503 cfs_access_process_vm 2-4-0 56503 NULL
110087 +init_map_ip_56508 init_map_ip 5 56508 NULL
110088 +lustre_posix_acl_xattr_reduce_space_56512 lustre_posix_acl_xattr_reduce_space 3 56512 NULL
110089 +ext4_zeroout_es_56514 ext4_zeroout_es 0 56514 NULL
110090 +cfg80211_connect_result_56515 cfg80211_connect_result 6-4 56515 NULL
110091 +ip_options_get_56538 ip_options_get 4 56538 NULL
110092 +ll_wr_track_id_56544 ll_wr_track_id 2 56544 NULL
110093 +vb2_queue_or_prepare_buf_56547 vb2_queue_or_prepare_buf 0 56547 NULL
110094 +ocfs2_change_extent_flag_56549 ocfs2_change_extent_flag 5 56549 NULL
110095 +alloc_apertures_56561 alloc_apertures 1 56561 NULL
110096 +rs_sta_dbgfs_stats_table_read_56573 rs_sta_dbgfs_stats_table_read 3 56573 NULL
110097 +portcntrs_2_read_56586 portcntrs_2_read 3 56586 NULL
110098 +event_filter_write_56609 event_filter_write 3 56609 NULL
110099 +nvme_trans_log_temperature_56613 nvme_trans_log_temperature 3 56613 NULL
110100 +gather_array_56641 gather_array 3 56641 NULL
110101 +lookup_extent_backref_56644 lookup_extent_backref 9-0 56644 NULL
110102 +uvc_debugfs_stats_read_56651 uvc_debugfs_stats_read 3 56651 NULL
110103 +tg3_nvram_write_block_56666 tg3_nvram_write_block 3 56666 NULL
110104 +btrfs_cow_block_56678 btrfs_cow_block 0 56678 NULL
110105 +snd_gus_dram_read_56686 snd_gus_dram_read 4 56686 NULL nohasharray
110106 +da9055_gpio_to_irq_56686 da9055_gpio_to_irq 2 56686 &snd_gus_dram_read_56686
110107 +build_map_info_56696 build_map_info 2 56696 NULL
110108 +dvb_ringbuffer_read_user_56702 dvb_ringbuffer_read_user 3-0 56702 NULL
110109 +sta_flags_read_56710 sta_flags_read 3 56710 NULL
110110 +ipv6_getsockopt_sticky_56711 ipv6_getsockopt_sticky 5 56711 NULL
110111 +__wa_xfer_setup_segs_56725 __wa_xfer_setup_segs 2 56725 NULL
110112 +__copy_from_user_ll_56738 __copy_from_user_ll 0-3 56738 NULL
110113 +pcpu_populate_chunk_56741 pcpu_populate_chunk 3-2 56741 NULL
110114 +drm_agp_bind_pages_56748 drm_agp_bind_pages 3 56748 NULL
110115 +btrfsic_map_block_56751 btrfsic_map_block 2 56751 NULL
110116 +alloc_iommu_56778 alloc_iommu 2-3-0 56778 NULL
110117 +hash_lookup_56792 hash_lookup 2 56792 NULL nohasharray
110118 +ttm_alloc_new_pages_56792 ttm_alloc_new_pages 5 56792 &hash_lookup_56792
110119 +do_syslog_56807 do_syslog 3 56807 NULL
110120 +ext4_ext_rm_idx_56827 ext4_ext_rm_idx 0 56827 NULL
110121 +mtdchar_write_56831 mtdchar_write 3 56831 NULL nohasharray
110122 +ntfs_rl_realloc_56831 ntfs_rl_realloc 3 56831 &mtdchar_write_56831
110123 +sysctl_sync_threshold_56835 sysctl_sync_threshold 0 56835 NULL
110124 +snd_rawmidi_kernel_write1_56847 snd_rawmidi_kernel_write1 4-0 56847 NULL
110125 +si476x_radio_read_agc_blob_56849 si476x_radio_read_agc_blob 3 56849 NULL
110126 +wb_lookup_56858 wb_lookup 2 56858 NULL
110127 +ext3_xattr_ibody_get_56880 ext3_xattr_ibody_get 0 56880 NULL
110128 +pvr2_debugifc_print_status_56890 pvr2_debugifc_print_status 3 56890 NULL
110129 +debug_debug3_read_56894 debug_debug3_read 3 56894 NULL
110130 +batadv_tt_update_changes_56895 batadv_tt_update_changes 3 56895 NULL
110131 +hfsplus_find_cat_56899 hfsplus_find_cat 0 56899 NULL
110132 +hfsplus_setxattr_56902 hfsplus_setxattr 4 56902 NULL
110133 +__bitmap_clear_bits_56912 __bitmap_clear_bits 3 56912 NULL
110134 +strcspn_56913 strcspn 0 56913 NULL
110135 +__kfifo_out_56927 __kfifo_out 0-3 56927 NULL
110136 +CopyBufferToControlPacket_56933 CopyBufferToControlPacket 0 56933 NULL nohasharray
110137 +journal_init_revoke_56933 journal_init_revoke 2 56933 &CopyBufferToControlPacket_56933
110138 +nouveau_xtensa_create__56952 nouveau_xtensa_create_ 8 56952 NULL
110139 +diva_get_driver_info_56967 diva_get_driver_info 0 56967 NULL
110140 +nouveau_device_create__56984 nouveau_device_create_ 6 56984 NULL
110141 +sptlrpc_secflags2str_56995 sptlrpc_secflags2str 3 56995 NULL
110142 +vlsi_alloc_ring_57003 vlsi_alloc_ring 3-4 57003 NULL
110143 +btrfs_super_csum_size_57004 btrfs_super_csum_size 0 57004 NULL
110144 +aircable_process_packet_57027 aircable_process_packet 4 57027 NULL
110145 +i915_gem_evict_everything_57038 i915_gem_evict_everything 0 57038 NULL
110146 +skb_network_offset_57043 skb_network_offset 0 57043 NULL nohasharray
110147 +ieee80211_if_fmt_state_57043 ieee80211_if_fmt_state 3 57043 &skb_network_offset_57043
110148 +bytes_to_samples_57049 bytes_to_samples 0-2 57049 NULL
110149 +xfs_buf_read_map_57053 xfs_buf_read_map 3 57053 NULL
110150 +__wl_get_peb_57058 __wl_get_peb 0 57058 NULL
110151 +cx2341x_ctrl_new_std_57061 cx2341x_ctrl_new_std 4 57061 NULL
110152 +sca3000_read_data_57064 sca3000_read_data 4 57064 NULL
110153 +pcmcia_replace_cis_57066 pcmcia_replace_cis 3 57066 NULL
110154 +tracing_set_trace_write_57096 tracing_set_trace_write 3 57096 NULL
110155 +altera_get_note_57099 altera_get_note 6 57099 NULL
110156 +hpfs_readpages_57106 hpfs_readpages 4 57106 NULL
110157 +snd_pcm_hw_params_old_user_57108 snd_pcm_hw_params_old_user 0 57108 NULL
110158 +crypto_compress_ctxsize_57109 crypto_compress_ctxsize 0 57109 NULL
110159 +sysfs_write_file_57116 sysfs_write_file 3 57116 NULL
110160 +cipso_v4_gentag_loc_57119 cipso_v4_gentag_loc 0 57119 NULL
110161 +nl80211_send_deauth_57136 nl80211_send_deauth 4 57136 NULL nohasharray
110162 +rds_ib_sub_signaled_57136 rds_ib_sub_signaled 2 57136 &nl80211_send_deauth_57136 nohasharray
110163 +ima_show_htable_value_57136 ima_show_htable_value 2 57136 &rds_ib_sub_signaled_57136
110164 +snd_sonicvibes_getdmac_57140 snd_sonicvibes_getdmac 0 57140 NULL
110165 +changed_inode_57156 changed_inode 0 57156 NULL
110166 +udl_prime_create_57159 udl_prime_create 2 57159 NULL
110167 +__ipath_get_user_pages_57166 __ipath_get_user_pages 1-2 57166 NULL
110168 +stk_prepare_sio_buffers_57168 stk_prepare_sio_buffers 2 57168 NULL
110169 +rx_hw_stuck_read_57179 rx_hw_stuck_read 3 57179 NULL
110170 +ocfs2_claim_metadata_57192 ocfs2_claim_metadata 0 57192 NULL
110171 +tt3650_ci_msg_57219 tt3650_ci_msg 4 57219 NULL
110172 +dma_fifo_alloc_57236 dma_fifo_alloc 5-3-2 57236 NULL
110173 +flush_space_57241 flush_space 3-0 57241 NULL
110174 +rsxx_cram_write_57244 rsxx_cram_write 3 57244 NULL
110175 +ieee80211_if_fmt_tsf_57249 ieee80211_if_fmt_tsf 3 57249 NULL
110176 +oprofilefs_ulong_from_user_57251 oprofilefs_ulong_from_user 3 57251 NULL
110177 +alloc_flex_gd_57259 alloc_flex_gd 1 57259 NULL
110178 +lbs_sleepparams_write_57283 lbs_sleepparams_write 3 57283 NULL
110179 +pstore_file_read_57288 pstore_file_read 3 57288 NULL
110180 +snd_pcm_read_57289 snd_pcm_read 3 57289 NULL
110181 +fw_file_size_57307 fw_file_size 0 57307 NULL
110182 +ftdi_elan_write_57309 ftdi_elan_write 3 57309 NULL
110183 +write_file_regval_57313 write_file_regval 3 57313 NULL
110184 +__mxt_write_reg_57326 __mxt_write_reg 3 57326 NULL
110185 +ocfs2_xattr_shrink_size_57328 ocfs2_xattr_shrink_size 3 57328 NULL
110186 +usblp_read_57342 usblp_read 3 57342 NULL
110187 +print_devstats_dot11RTSFailureCount_57347 print_devstats_dot11RTSFailureCount 3 57347 NULL
110188 +dio_send_cur_page_57348 dio_send_cur_page 0 57348 NULL
110189 +tipc_bclink_stats_57372 tipc_bclink_stats 2 57372 NULL
110190 +max8997_irq_domain_map_57375 max8997_irq_domain_map 2 57375 NULL
110191 +tty_register_device_attr_57381 tty_register_device_attr 2 57381 NULL
110192 +read_file_blob_57406 read_file_blob 3 57406 NULL
110193 +enclosure_register_57412 enclosure_register 3 57412 NULL
110194 +compat_keyctl_instantiate_key_iov_57431 compat_keyctl_instantiate_key_iov 3 57431 NULL
110195 +copy_to_user_fromio_57432 copy_to_user_fromio 3 57432 NULL
110196 +__roundup_pow_of_two_57461 __roundup_pow_of_two 0 57461 NULL
110197 +crypto_tfm_alg_blocksize_57463 crypto_tfm_alg_blocksize 0 57463 NULL
110198 +sisusb_clear_vram_57466 sisusb_clear_vram 2-3 57466 NULL
110199 +blk_flush_cur_seq_57467 blk_flush_cur_seq 0 57467 NULL
110200 +ieee80211_if_read_flags_57470 ieee80211_if_read_flags 3 57470 NULL nohasharray
110201 +sep_lock_user_pages_57470 sep_lock_user_pages 2-3 57470 &ieee80211_if_read_flags_57470
110202 +ocfs2_write_cluster_57483 ocfs2_write_cluster 9-8-2 57483 NULL
110203 +bnad_debugfs_write_regwr_57500 bnad_debugfs_write_regwr 3 57500 NULL
110204 +skb_headlen_57501 skb_headlen 0 57501 NULL
110205 +copy_in_user_57502 copy_in_user 3 57502 NULL
110206 +ckhdid_printf_57505 ckhdid_printf 2 57505 NULL
110207 +init_tag_map_57515 init_tag_map 3 57515 NULL
110208 +wil_read_file_ssid_57517 wil_read_file_ssid 3 57517 NULL nohasharray
110209 +il_dbgfs_force_reset_read_57517 il_dbgfs_force_reset_read 3 57517 &wil_read_file_ssid_57517 nohasharray
110210 +btrfs_insert_inode_extref_57517 btrfs_insert_inode_extref 0 57517 &il_dbgfs_force_reset_read_57517
110211 +cmm_read_57520 cmm_read 3 57520 NULL
110212 +inode_permission_57531 inode_permission 0 57531 NULL
110213 +acpi_dev_get_resources_57534 acpi_dev_get_resources 0 57534 NULL
110214 +ptlrpc_lprocfs_hp_ratio_seq_write_57537 ptlrpc_lprocfs_hp_ratio_seq_write 3 57537 NULL
110215 +ReadHDLCPnP_57559 ReadHDLCPnP 0 57559 NULL nohasharray
110216 +ext4_group_first_block_no_57559 ext4_group_first_block_no 0-2 57559 &ReadHDLCPnP_57559
110217 +obd_unpackmd_57563 obd_unpackmd 0 57563 NULL
110218 +snd_pcm_playback_ioctl1_57569 snd_pcm_playback_ioctl1 0 57569 NULL
110219 +get_bridge_ifindices_57579 get_bridge_ifindices 0 57579 NULL
110220 +ldlm_cli_enqueue_local_57582 ldlm_cli_enqueue_local 11 57582 NULL
110221 +il_dbgfs_interrupt_write_57591 il_dbgfs_interrupt_write 3 57591 NULL
110222 +read_file_spectral_fft_period_57593 read_file_spectral_fft_period 3 57593 NULL
110223 +wm831x_gpio_to_irq_57614 wm831x_gpio_to_irq 2 57614 NULL
110224 +vma_kernel_pagesize_57616 vma_kernel_pagesize 0 57616 NULL
110225 +tx_tx_retry_template_read_57623 tx_tx_retry_template_read 3 57623 NULL
110226 +sisusbcon_putcs_57630 sisusbcon_putcs 3 57630 NULL
110227 +mem_read_57631 mem_read 3 57631 NULL
110228 +tc3589x_irq_map_57639 tc3589x_irq_map 2 57639 NULL
110229 +r3964_write_57662 r3964_write 4 57662 NULL
110230 +proc_ns_readlink_57664 proc_ns_readlink 3 57664 NULL
110231 +__lgwrite_57669 __lgwrite 4 57669 NULL
110232 +f1x_match_to_this_node_57695 f1x_match_to_this_node 3 57695 NULL
110233 +i2400m_rx_stats_read_57706 i2400m_rx_stats_read 3 57706 NULL
110234 +snd_interval_value_57713 snd_interval_value 0 57713 NULL
110235 +ieee80211_if_read_dot11MeshHWMPconfirmationInterval_57722 ieee80211_if_read_dot11MeshHWMPconfirmationInterval 3 57722 NULL
110236 +i915_gem_object_get_pages_57734 i915_gem_object_get_pages 0 57734 NULL
110237 +nouveau_gpio_create__57735 nouveau_gpio_create_ 4-5 57735 NULL
110238 +compat_sys_set_mempolicy_57742 compat_sys_set_mempolicy 3 57742 NULL nohasharray
110239 +pppol2tp_recvmsg_57742 pppol2tp_recvmsg 4 57742 &compat_sys_set_mempolicy_57742
110240 +ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval_57762 ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval 3 57762 NULL
110241 +SYSC_process_vm_writev_57776 SYSC_process_vm_writev 5-3 57776 NULL
110242 +apei_exec_collect_resources_57788 apei_exec_collect_resources 0 57788 NULL
110243 +ld2_57794 ld2 0 57794 NULL
110244 +ivtv_read_57796 ivtv_read 3 57796 NULL
110245 +generic_ptrace_peekdata_57806 generic_ptrace_peekdata 2 57806 NULL
110246 +ipath_user_sdma_num_pages_57813 ipath_user_sdma_num_pages 0 57813 NULL
110247 +bfad_debugfs_read_regrd_57830 bfad_debugfs_read_regrd 3 57830 NULL
110248 +copy_to_user_57835 copy_to_user 3-0 57835 NULL
110249 +flash_read_57843 flash_read 3 57843 NULL
110250 +kiblnd_create_tx_pool_57846 kiblnd_create_tx_pool 2 57846 NULL
110251 +process_all_new_xattrs_57881 process_all_new_xattrs 0 57881 NULL
110252 +xt_alloc_table_info_57903 xt_alloc_table_info 1 57903 NULL
110253 +iio_read_first_n_kfifo_57910 iio_read_first_n_kfifo 2 57910 NULL nohasharray
110254 +atomic_add_return_unchecked_57910 atomic_add_return_unchecked 0-1 57910 &iio_read_first_n_kfifo_57910
110255 +memcg_caches_array_size_57918 memcg_caches_array_size 0-1 57918 NULL
110256 +twl_i2c_write_57923 twl_i2c_write 3-4 57923 NULL
110257 +__snd_gf1_look16_57925 __snd_gf1_look16 0 57925 NULL
110258 +sel_read_handle_unknown_57933 sel_read_handle_unknown 3 57933 NULL
110259 +nvc0_vm_create_57942 nvc0_vm_create 2-3 57942 NULL
110260 +xfs_mru_cache_create_57943 xfs_mru_cache_create 3 57943 NULL
110261 +key_algorithm_read_57946 key_algorithm_read 3 57946 NULL
110262 +ip_set_alloc_57953 ip_set_alloc 1 57953 NULL nohasharray
110263 +ioat3_dca_count_dca_slots_57953 ioat3_dca_count_dca_slots 0 57953 &ip_set_alloc_57953
110264 +c2_reg_user_mr_57982 c2_reg_user_mr 2-3 57982 NULL
110265 +interleave_nodes_57992 interleave_nodes 0 57992 NULL
110266 +do_rx_dma_57996 do_rx_dma 5 57996 NULL
110267 +rx_reset_counter_read_58001 rx_reset_counter_read 3 58001 NULL
110268 +iwl_dbgfs_ucode_rx_stats_read_58023 iwl_dbgfs_ucode_rx_stats_read 3 58023 NULL
110269 +io_playback_transfer_58030 io_playback_transfer 4 58030 NULL
110270 +ext4_block_bitmap_58033 ext4_block_bitmap 0 58033 NULL
110271 +mce_async_out_58056 mce_async_out 3 58056 NULL
110272 +ocfs2_find_leaf_58065 ocfs2_find_leaf 0 58065 NULL
110273 +dt3155_alloc_coherent_58073 dt3155_alloc_coherent 2 58073 NULL
110274 +cm4040_write_58079 cm4040_write 3 58079 NULL
110275 +ipv6_flowlabel_opt_58135 ipv6_flowlabel_opt 3 58135 NULL nohasharray
110276 +slhc_init_58135 slhc_init 2-1 58135 &ipv6_flowlabel_opt_58135
110277 +ocfs2_reserve_clusters_58164 ocfs2_reserve_clusters 0 58164 NULL
110278 +ext4_bg_num_gdb_58171 ext4_bg_num_gdb 0 58171 NULL
110279 +garmin_write_bulk_58191 garmin_write_bulk 3 58191 NULL
110280 +ieee80211_if_fmt_flags_58205 ieee80211_if_fmt_flags 3 58205 NULL
110281 +sysfs_add_file_mode_58222 sysfs_add_file_mode 0 58222 NULL
110282 +hva_to_pfn_58241 hva_to_pfn 1-0 58241 NULL
110283 +btrfsic_create_link_to_next_block_58246 btrfsic_create_link_to_next_block 4 58246 NULL
110284 +read_file_debug_58256 read_file_debug 3 58256 NULL
110285 +osc_max_dirty_mb_seq_write_58263 osc_max_dirty_mb_seq_write 3 58263 NULL
110286 +cfg80211_mgmt_tx_status_58266 cfg80211_mgmt_tx_status 4 58266 NULL
110287 +profile_load_58267 profile_load 3 58267 NULL
110288 +kstrtos8_from_user_58268 kstrtos8_from_user 2 58268 NULL
110289 +acpi_ds_build_internal_package_obj_58271 acpi_ds_build_internal_package_obj 3 58271 NULL
110290 +iscsi_decode_text_input_58292 iscsi_decode_text_input 4 58292 NULL
110291 +intel_alloc_coherent_58302 intel_alloc_coherent 2 58302 NULL
110292 +ieee80211_if_read_dot11MeshTTL_58307 ieee80211_if_read_dot11MeshTTL 3 58307 NULL
110293 +i915_wait_seqno_58309 i915_wait_seqno 0 58309 NULL
110294 +tx_tx_start_int_templates_read_58324 tx_tx_start_int_templates_read 3 58324 NULL
110295 +ext4_ext_truncate_extend_restart_58331 ext4_ext_truncate_extend_restart 3 58331 NULL
110296 +diva_init_dma_map_58336 diva_init_dma_map 3 58336 NULL
110297 +__copy_from_user_swizzled_58337 __copy_from_user_swizzled 2-4 58337 NULL
110298 +next_pidmap_58347 next_pidmap 2-0 58347 NULL
110299 +SyS_migrate_pages_58348 SyS_migrate_pages 2 58348 NULL
110300 +save_hint_58359 save_hint 2 58359 NULL
110301 +vmw_ttm_tt_create_58369 vmw_ttm_tt_create 2 58369 NULL nohasharray
110302 +brcmf_debugfs_sdio_counter_read_58369 brcmf_debugfs_sdio_counter_read 3 58369 &vmw_ttm_tt_create_58369
110303 +hash_ipportnet6_expire_58379 hash_ipportnet6_expire 3 58379 NULL
110304 +il_dbgfs_status_read_58388 il_dbgfs_status_read 3 58388 NULL
110305 +_drbd_md_sync_page_io_58403 _drbd_md_sync_page_io 6 58403 NULL
110306 +kvm_mmu_write_protect_pt_masked_58406 kvm_mmu_write_protect_pt_masked 3-4 58406 NULL nohasharray
110307 +idetape_pad_zeros_58406 idetape_pad_zeros 2 58406 &kvm_mmu_write_protect_pt_masked_58406
110308 +i2400m_pld_size_58415 i2400m_pld_size 0 58415 NULL
110309 +__mlx4_alloc_mtt_range_58418 __mlx4_alloc_mtt_range 2 58418 NULL
110310 +capabilities_read_58457 capabilities_read 3 58457 NULL
110311 +batadv_iv_ogm_aggr_packet_58462 batadv_iv_ogm_aggr_packet 3 58462 NULL
110312 +lpfc_idiag_baracc_read_58466 lpfc_idiag_baracc_read 3 58466 NULL nohasharray
110313 +compat_do_ipt_set_ctl_58466 compat_do_ipt_set_ctl 4 58466 &lpfc_idiag_baracc_read_58466
110314 +nv_rd08_58472 nv_rd08 0 58472 NULL
110315 +snd_gf1_read_addr_58483 snd_gf1_read_addr 0 58483 NULL
110316 +snd_rme96_capture_copy_58484 snd_rme96_capture_copy 5 58484 NULL
110317 +btrfs_cont_expand_58498 btrfs_cont_expand 2-3 58498 NULL
110318 +rndis_add_response_58544 rndis_add_response 2 58544 NULL
110319 +__clear_discard_58546 __clear_discard 2 58546 NULL
110320 +wrap_max_58548 wrap_max 0-1-2 58548 NULL
110321 +wep_decrypt_fail_read_58567 wep_decrypt_fail_read 3 58567 NULL
110322 +scnprint_mac_oui_58578 scnprint_mac_oui 3-0 58578 NULL
110323 +get_rhf_errstring_58582 get_rhf_errstring 3 58582 NULL
110324 +ea_read_inline_58589 ea_read_inline 0 58589 NULL
110325 +isku_sysfs_read_keys_thumbster_58590 isku_sysfs_read_keys_thumbster 6 58590 NULL
110326 +xip_file_read_58592 xip_file_read 3 58592 NULL
110327 +ecryptfs_write_end_58594 ecryptfs_write_end 5-3 58594 NULL
110328 +radeon_bo_size_58606 radeon_bo_size 0 58606 NULL
110329 +ebt_buf_count_58607 ebt_buf_count 0 58607 NULL
110330 +xfs_iomap_write_delay_58616 xfs_iomap_write_delay 2 58616 NULL
110331 +skb_copy_to_page_nocache_58624 skb_copy_to_page_nocache 6 58624 NULL
110332 +filemap_fdatawrite_range_58630 filemap_fdatawrite_range 0 58630 NULL
110333 +vb2_qbuf_58631 vb2_qbuf 0 58631 NULL
110334 +module_alloc_update_bounds_rx_58634 module_alloc_update_bounds_rx 1 58634 NULL
110335 +tx_tx_start_fw_gen_read_58648 tx_tx_start_fw_gen_read 3 58648 NULL
110336 +ocfs2_block_to_cluster_start_58653 ocfs2_block_to_cluster_start 2 58653 NULL
110337 +iwl_dbgfs_rx_handlers_write_58655 iwl_dbgfs_rx_handlers_write 3 58655 NULL
110338 +__gfn_to_pfn_58671 __gfn_to_pfn 2 58671 NULL
110339 +find_zero_58685 find_zero 0-1 58685 NULL
110340 +uwb_bce_print_IEs_58686 uwb_bce_print_IEs 4 58686 NULL
110341 +tps6586x_writes_58689 tps6586x_writes 2-3 58689 NULL
110342 +vmalloc_node_58700 vmalloc_node 1-2 58700 NULL
110343 +vx_send_msg_58711 vx_send_msg 0 58711 NULL
110344 +i915_gem_execbuffer_reserve_58722 i915_gem_execbuffer_reserve 0 58722 NULL
110345 +da9052_gpio_to_irq_58729 da9052_gpio_to_irq 2 58729 NULL
110346 +csum_exist_in_range_58730 csum_exist_in_range 2-3 58730 NULL
110347 +frames_to_bytes_58741 frames_to_bytes 0-2 58741 NULL
110348 +ieee80211_if_write_tkip_mic_test_58748 ieee80211_if_write_tkip_mic_test 3 58748 NULL
110349 +agp_allocate_memory_58761 agp_allocate_memory 2 58761 NULL
110350 +oblock_to_dblock_58762 oblock_to_dblock 0-2 58762 NULL
110351 +regmap_calc_reg_len_58795 regmap_calc_reg_len 0 58795 NULL
110352 +raw_send_hdrinc_58803 raw_send_hdrinc 4 58803 NULL
110353 +isku_sysfs_read_58806 isku_sysfs_read 5 58806 NULL
110354 +write_file_58812 write_file 4 58812 NULL
110355 +ep_read_58813 ep_read 3 58813 NULL
110356 +command_write_58841 command_write 3 58841 NULL
110357 +ocfs2_truncate_log_append_58850 ocfs2_truncate_log_append 3-0 58850 NULL
110358 +ath6kl_wmi_send_action_cmd_58860 ath6kl_wmi_send_action_cmd 7 58860 NULL
110359 +gs_alloc_req_58883 gs_alloc_req 2 58883 NULL
110360 +esas2r_change_queue_depth_58886 esas2r_change_queue_depth 2 58886 NULL
110361 +lprocfs_wr_pinger_recov_58914 lprocfs_wr_pinger_recov 3 58914 NULL
110362 +print_devstats_dot11FCSErrorCount_58919 print_devstats_dot11FCSErrorCount 3 58919 NULL
110363 +pipeline_cs_rx_packet_out_read_58926 pipeline_cs_rx_packet_out_read 3 58926 NULL
110364 +SyS_pread64_58935 SyS_pread64 3 58935 NULL
110365 +wait_table_hash_nr_entries_58962 wait_table_hash_nr_entries 0 58962 NULL
110366 +ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout_58965 ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout 3 58965 NULL
110367 +crypto_aead_ivsize_58970 crypto_aead_ivsize 0 58970 NULL
110368 +__mem_cgroup_try_charge_58976 __mem_cgroup_try_charge 0 58976 NULL
110369 +init_list_58990 init_list 3 58990 NULL
110370 +remap_to_cache_dirty_58991 remap_to_cache_dirty 4-3 58991 NULL
110371 +ep_write_59008 ep_write 3 59008 NULL
110372 +lpfc_idiag_baracc_write_59014 lpfc_idiag_baracc_write 3 59014 NULL
110373 +SyS_preadv_59029 SyS_preadv 3 59029 NULL
110374 +init_pci_cap_msi_perm_59033 init_pci_cap_msi_perm 2 59033 NULL
110375 +selinux_transaction_write_59038 selinux_transaction_write 3 59038 NULL
110376 +crypto_aead_reqsize_59039 crypto_aead_reqsize 0 59039 NULL
110377 +regmap_bulk_write_59049 regmap_bulk_write 2-4 59049 NULL
110378 +sysfs_link_sibling_59078 sysfs_link_sibling 0 59078 NULL
110379 +do_perf_sw_event_59099 do_perf_sw_event 3 59099 NULL
110380 +mmc_sd_num_wr_blocks_59112 mmc_sd_num_wr_blocks 0 59112 NULL
110381 +scsi_io_completion_59122 scsi_io_completion 2 59122 NULL
110382 +init_status_page_59124 init_status_page 0 59124 NULL
110383 +nfc_llcp_send_i_frame_59130 nfc_llcp_send_i_frame 3 59130 NULL
110384 +print_devstats_dot11RTSSuccessCount_59145 print_devstats_dot11RTSSuccessCount 3 59145 NULL nohasharray
110385 +framebuffer_alloc_59145 framebuffer_alloc 1 59145 &print_devstats_dot11RTSSuccessCount_59145
110386 +ocfs2_claim_local_alloc_bits_59147 ocfs2_claim_local_alloc_bits 0 59147 NULL
110387 +radeon_compat_ioctl_59150 radeon_compat_ioctl 2 59150 NULL
110388 +pvr2_hdw_report_clients_59152 pvr2_hdw_report_clients 3 59152 NULL
110389 +ksize_59176 ksize 0 59176 NULL
110390 +setup_window_59178 setup_window 4-2-5-7 59178 NULL
110391 +ocfs2_move_extent_59187 ocfs2_move_extent 3-5-2 59187 NULL
110392 +validate_exec_list_59204 validate_exec_list 0 59204 NULL
110393 +xfs_iext_realloc_indirect_59211 xfs_iext_realloc_indirect 2 59211 NULL
110394 +check_mapped_selector_name_59216 check_mapped_selector_name 5 59216 NULL
110395 +dt3155_read_59226 dt3155_read 3 59226 NULL
110396 +paging64_gpte_to_gfn_lvl_59229 paging64_gpte_to_gfn_lvl 0-1-2 59229 NULL
110397 +tty_prepare_flip_string_flags_59240 tty_prepare_flip_string_flags 4 59240 NULL
110398 +nla_len_59258 nla_len 0 59258 NULL
110399 +drbd_bm_write_page_59290 drbd_bm_write_page 2 59290 NULL
110400 +__push_leaf_right_59302 __push_leaf_right 0 59302 NULL
110401 +btrfs_insert_dir_item_59304 btrfs_insert_dir_item 4-0 59304 NULL
110402 +fd_copyout_59323 fd_copyout 3 59323 NULL
110403 +read_9287_modal_eeprom_59327 read_9287_modal_eeprom 3 59327 NULL
110404 +rx_defrag_in_process_called_read_59338 rx_defrag_in_process_called_read 3 59338 NULL
110405 +paging64_get_level1_sp_gpa_59346 paging64_get_level1_sp_gpa 0 59346 NULL nohasharray
110406 +xfs_attrmulti_attr_set_59346 xfs_attrmulti_attr_set 4 59346 &paging64_get_level1_sp_gpa_59346
110407 +__map_request_59350 __map_request 0 59350 NULL
110408 +xfs_dir2_sf_entsize_59366 xfs_dir2_sf_entsize 0-2 59366 NULL
110409 +blk_flush_policy_59368 blk_flush_policy 0 59368 NULL
110410 +f2fs_fallocate_59377 f2fs_fallocate 3-4 59377 NULL
110411 +pvr2_debugifc_print_info_59380 pvr2_debugifc_print_info 3 59380 NULL
110412 +ocfs2_replay_truncate_records_59382 ocfs2_replay_truncate_records 0 59382 NULL
110413 +journal_init_dev_59384 journal_init_dev 5 59384 NULL
110414 +isku_sysfs_read_keys_function_59412 isku_sysfs_read_keys_function 6 59412 NULL
110415 +pci_ctrl_read_59424 pci_ctrl_read 0 59424 NULL
110416 +vxge_hw_ring_rxds_per_block_get_59425 vxge_hw_ring_rxds_per_block_get 0 59425 NULL
110417 +snd_pcm_tstamp_59431 snd_pcm_tstamp 0 59431 NULL
110418 +SyS_sched_setaffinity_59442 SyS_sched_setaffinity 2 59442 NULL
110419 +fs_path_ensure_buf_59445 fs_path_ensure_buf 2-0 59445 NULL
110420 +descriptor_loc_59446 descriptor_loc 3 59446 NULL
110421 +block_rsv_use_bytes_59464 block_rsv_use_bytes 0 59464 NULL
110422 +shrink_tnc_trees_59481 shrink_tnc_trees 0 59481 NULL
110423 +btrfs_del_dir_entries_in_log_59490 btrfs_del_dir_entries_in_log 0 59490 NULL
110424 +ib_copy_from_udata_59502 ib_copy_from_udata 3 59502 NULL
110425 +rds_pin_pages_59507 rds_pin_pages 1-2 59507 NULL
110426 +ext4_resize_fs_59543 ext4_resize_fs 2 59543 NULL
110427 +mpi_get_nbits_59551 mpi_get_nbits 0 59551 NULL
110428 +tunables_write_59563 tunables_write 3 59563 NULL
110429 +__copy_from_user_ll_nozero_59571 __copy_from_user_ll_nozero 0-3 59571 NULL
110430 +write_pbl_59583 write_pbl 4 59583 NULL
110431 +memdup_user_59590 memdup_user 2 59590 NULL
110432 +tps6586x_irq_get_virq_59601 tps6586x_irq_get_virq 2 59601 NULL
110433 +mem_fwlog_free_mem_blks_read_59616 mem_fwlog_free_mem_blks_read 3 59616 NULL nohasharray
110434 +xrcdn_free_res_59616 xrcdn_free_res 5 59616 &mem_fwlog_free_mem_blks_read_59616
110435 +ath6kl_endpoint_stats_write_59621 ath6kl_endpoint_stats_write 3 59621 NULL
110436 +mtrr_write_59622 mtrr_write 3 59622 NULL
110437 +ocfs2_adjust_rightmost_branch_59623 ocfs2_adjust_rightmost_branch 0 59623 NULL
110438 +find_first_zero_bit_59636 find_first_zero_bit 0-2 59636 NULL
110439 +SyS_setdomainname_59646 SyS_setdomainname 2 59646 NULL
110440 +hidraw_read_59650 hidraw_read 3 59650 NULL
110441 +v9fs_xattr_set_acl_59651 v9fs_xattr_set_acl 4 59651 NULL
110442 +paravirt_sched_clock_59660 paravirt_sched_clock 0 59660 NULL
110443 +__devcgroup_check_permission_59665 __devcgroup_check_permission 0 59665 NULL
110444 +iwl_dbgfs_mac_params_read_59666 iwl_dbgfs_mac_params_read 3 59666 NULL
110445 +alloc_dca_provider_59670 alloc_dca_provider 2 59670 NULL
110446 +mic_calc_failure_read_59700 mic_calc_failure_read 3 59700 NULL
110447 +ioperm_get_59701 ioperm_get 4-3 59701 NULL
110448 +snd_pcm_info_user_59711 snd_pcm_info_user 0 59711 NULL
110449 +prism2_info_scanresults_59729 prism2_info_scanresults 3 59729 NULL
110450 +ieee80211_if_read_fwded_unicast_59740 ieee80211_if_read_fwded_unicast 3 59740 NULL
110451 +fat_direct_IO_59741 fat_direct_IO 4 59741 NULL
110452 +qib_decode_7220_sdma_errs_59745 qib_decode_7220_sdma_errs 4 59745 NULL
110453 +strnlen_59746 strnlen 0 59746 NULL
110454 +process_all_refs_59754 process_all_refs 0 59754 NULL nohasharray
110455 +ext3_acl_count_59754 ext3_acl_count 0-1 59754 &process_all_refs_59754
110456 +process_new_xattr_59755 process_new_xattr 0 59755 NULL
110457 +long_retry_limit_read_59766 long_retry_limit_read 3 59766 NULL
110458 +venus_remove_59781 venus_remove 4 59781 NULL
110459 +mei_nfc_recv_59784 mei_nfc_recv 3 59784 NULL
110460 +xlog_do_recover_59789 xlog_do_recover 3 59789 NULL
110461 +msb_get_zone_from_lba_59800 msb_get_zone_from_lba 0-1 59800 NULL
110462 +ipw_write_59807 ipw_write 3 59807 NULL
110463 +scsi_init_shared_tag_map_59812 scsi_init_shared_tag_map 2 59812 NULL
110464 +ieee80211_if_read_dot11MeshHWMPmaxPREQretries_59829 ieee80211_if_read_dot11MeshHWMPmaxPREQretries 3 59829 NULL
110465 +gspca_dev_probe2_59833 gspca_dev_probe2 4 59833 NULL
110466 +fs64_to_cpu_59845 fs64_to_cpu 0 59845 NULL
110467 +regmap_raw_write_async_59849 regmap_raw_write_async 2-4 59849 NULL
110468 +intel_ring_wait_request_59865 intel_ring_wait_request 0 59865 NULL
110469 +pvr2_ioread_set_sync_key_59882 pvr2_ioread_set_sync_key 3 59882 NULL
110470 +shmem_zero_setup_59885 shmem_zero_setup 0 59885 NULL nohasharray
110471 +start_transaction_59885 start_transaction 2 59885 &shmem_zero_setup_59885
110472 +l2cap_sock_recvmsg_59886 l2cap_sock_recvmsg 4 59886 NULL
110473 +ffs_prepare_buffer_59892 ffs_prepare_buffer 2 59892 NULL
110474 +ocfs2_extend_rotate_transaction_59894 ocfs2_extend_rotate_transaction 0 59894 NULL
110475 +swiotlb_map_page_59909 swiotlb_map_page 3 59909 NULL
110476 +aic7xxx_abort_waiting_scb_59932 aic7xxx_abort_waiting_scb 0 59932 NULL
110477 +kvm_mmu_notifier_invalidate_range_start_59944 kvm_mmu_notifier_invalidate_range_start 3-4 59944 NULL
110478 +ocfs2_expand_inline_ref_root_59945 ocfs2_expand_inline_ref_root 0 59945 NULL
110479 +il_dbgfs_rxon_flags_read_59950 il_dbgfs_rxon_flags_read 3 59950 NULL nohasharray
110480 +dapm_widget_power_read_file_59950 dapm_widget_power_read_file 3 59950 &il_dbgfs_rxon_flags_read_59950
110481 +lookup_node_59953 lookup_node 2 59953 NULL
110482 +il_dbgfs_missed_beacon_read_59956 il_dbgfs_missed_beacon_read 3 59956 NULL
110483 +kvm_set_cr3_59965 kvm_set_cr3 2 59965 NULL
110484 +__arch_hweight16_59975 __arch_hweight16 0 59975 NULL
110485 +osd_req_read_kern_59990 osd_req_read_kern 5 59990 NULL
110486 +ghash_async_setkey_60001 ghash_async_setkey 3 60001 NULL
110487 +ieee80211_if_fmt_dot11MeshAwakeWindowDuration_60006 ieee80211_if_fmt_dot11MeshAwakeWindowDuration 3 60006 NULL
110488 +rawsock_sendmsg_60010 rawsock_sendmsg 4 60010 NULL
110489 +mthca_init_cq_60011 mthca_init_cq 2 60011 NULL
110490 +osd_req_list_dev_partitions_60027 osd_req_list_dev_partitions 4 60027 NULL
110491 +xlog_bread_offset_60030 xlog_bread_offset 3 60030 NULL
110492 +bio_integrity_hw_sectors_60039 bio_integrity_hw_sectors 0-2 60039 NULL
110493 +do_ip6t_set_ctl_60040 do_ip6t_set_ctl 4 60040 NULL
110494 +vcs_size_60050 vcs_size 0 60050 NULL nohasharray
110495 +pin_2_irq_60050 pin_2_irq 0-3 60050 &vcs_size_60050
110496 +gru_alloc_gts_60056 gru_alloc_gts 3-2 60056 NULL
110497 +open_cur_inode_file_60057 open_cur_inode_file 0 60057 NULL
110498 +compat_writev_60063 compat_writev 3 60063 NULL
110499 +ath6kl_listen_int_write_60066 ath6kl_listen_int_write 3 60066 NULL
110500 +c4iw_num_stags_60073 c4iw_num_stags 0 60073 NULL
110501 +mp_register_gsi_60079 mp_register_gsi 2 60079 NULL
110502 +rxrpc_kernel_send_data_60083 rxrpc_kernel_send_data 3 60083 NULL
110503 +ieee80211_if_fmt_fwded_frames_60103 ieee80211_if_fmt_fwded_frames 3 60103 NULL
110504 +SYSC_msgsnd_60113 SYSC_msgsnd 3 60113 NULL
110505 +nfs_idmap_request_key_60124 nfs_idmap_request_key 2 60124 NULL
110506 +__mutex_lock_common_60134 __mutex_lock_common 0 60134 NULL
110507 +ld_usb_read_60156 ld_usb_read 3 60156 NULL
110508 +jmb38x_ms_count_slots_60164 jmb38x_ms_count_slots 0 60164 NULL
110509 +init_state_60165 init_state 2 60165 NULL
110510 +sg_build_sgat_60179 sg_build_sgat 3 60179 NULL nohasharray
110511 +jffs2_alloc_full_dirent_60179 jffs2_alloc_full_dirent 1 60179 &sg_build_sgat_60179
110512 +fuse_async_req_send_60183 fuse_async_req_send 0-3 60183 NULL
110513 +rx_rx_tkip_replays_read_60193 rx_rx_tkip_replays_read 3 60193 NULL
110514 +qib_reg_phys_mr_60202 qib_reg_phys_mr 3 60202 NULL
110515 +btrfs_get_token_16_60220 btrfs_get_token_16 0 60220 NULL
110516 +arizona_map_irq_60230 arizona_map_irq 2 60230 NULL nohasharray
110517 +__phys_addr_nodebug_60230 __phys_addr_nodebug 0 60230 &arizona_map_irq_60230
110518 +wm831x_irq_60254 wm831x_irq 2 60254 NULL
110519 +irq_alloc_domain_generic_chips_60264 irq_alloc_domain_generic_chips 3-2 60264 NULL
110520 +printer_write_60276 printer_write 3 60276 NULL
110521 +alloc_irq_pin_list_60277 alloc_irq_pin_list 1 60277 NULL
110522 +do_xip_mapping_read_60297 do_xip_mapping_read 5 60297 NULL
110523 +getDataLength_60301 getDataLength 0 60301 NULL
110524 +xfs_next_bit_60322 xfs_next_bit 0-3 60322 NULL
110525 +inorder_to_tree_60331 inorder_to_tree 1-0 60331 NULL
110526 +usb_alphatrack_write_60341 usb_alphatrack_write 3 60341 NULL
110527 +__kfifo_from_user_r_60345 __kfifo_from_user_r 5-3 60345 NULL
110528 +max_unfragmented_pages_60362 max_unfragmented_pages 0 60362 NULL
110529 +dccp_setsockopt_60367 dccp_setsockopt 5 60367 NULL
110530 +ubi_eba_atomic_leb_change_60379 ubi_eba_atomic_leb_change 0-5 60379 NULL
110531 +instruction_pointer_60384 instruction_pointer 0 60384 NULL
110532 +drop_outstanding_extent_60390 drop_outstanding_extent 0 60390 NULL
110533 +mthca_alloc_resize_buf_60394 mthca_alloc_resize_buf 3 60394 NULL
110534 +ocfs2_zero_extend_60396 ocfs2_zero_extend 3 60396 NULL
110535 +driver_names_read_60399 driver_names_read 3 60399 NULL
110536 +paging32_walk_addr_generic_60415 paging32_walk_addr_generic 4 60415 NULL
110537 +simple_alloc_urb_60420 simple_alloc_urb 3 60420 NULL
110538 +excessive_retries_read_60425 excessive_retries_read 3 60425 NULL
110539 +tstats_write_60432 tstats_write 3 60432 NULL nohasharray
110540 +kmalloc_60432 kmalloc 1 60432 &tstats_write_60432
110541 +scaled_div32_60442 scaled_div32 2-1-0 60442 NULL
110542 +snd_hda_get_num_raw_conns_60462 snd_hda_get_num_raw_conns 0 60462 NULL
110543 +crypto_shash_setkey_60483 crypto_shash_setkey 3 60483 NULL
110544 +lustre_msg_early_size_60496 lustre_msg_early_size 0 60496 NULL
110545 +v9fs_fid_readn_60544 v9fs_fid_readn 4 60544 NULL
110546 +nonpaging_map_60551 nonpaging_map 4 60551 NULL
110547 +osc_lockless_truncate_seq_write_60553 osc_lockless_truncate_seq_write 3 60553 NULL
110548 +tracing_entries_write_60563 tracing_entries_write 3 60563 NULL
110549 +hash_net6_expire_60598 hash_net6_expire 3 60598 NULL
110550 +btrfs_add_delayed_tree_ref_60602 btrfs_add_delayed_tree_ref 0 60602 NULL
110551 +skb_transport_offset_60619 skb_transport_offset 0 60619 NULL
110552 +wl1273_fm_fops_write_60621 wl1273_fm_fops_write 3 60621 NULL
110553 +usb_control_msg_60624 usb_control_msg 0 60624 NULL
110554 +acl_alloc_stack_init_60630 acl_alloc_stack_init 1 60630 NULL
110555 +free_dind_blocks_60635 free_dind_blocks 0 60635 NULL
110556 +ubifs_recover_leb_60639 ubifs_recover_leb 3 60639 NULL
110557 +__proc_lnet_stats_60647 __proc_lnet_stats 5 60647 NULL
110558 +mv_ffc64_60648 mv_ffc64 1 60648 NULL
110559 +if_sdio_host_to_card_60666 if_sdio_host_to_card 4 60666 NULL
110560 +run_clustered_refs_60668 run_clustered_refs 0 60668 NULL
110561 +ieee80211_if_read_dot11MeshConfirmTimeout_60670 ieee80211_if_read_dot11MeshConfirmTimeout 3 60670 NULL
110562 +btrfs_reserve_extent_60674 btrfs_reserve_extent 5-0 60674 NULL
110563 +init_data_container_60709 init_data_container 1 60709 NULL
110564 +vga_rcrt_60731 vga_rcrt 0 60731 NULL
110565 +snd_ice1712_ds_read_60754 snd_ice1712_ds_read 0 60754 NULL
110566 +raid_status_60755 raid_status 5 60755 NULL
110567 +sel_write_checkreqprot_60774 sel_write_checkreqprot 3 60774 NULL
110568 +opticon_write_60775 opticon_write 4 60775 NULL
110569 +acl_alloc_num_60778 acl_alloc_num 1-2 60778 NULL
110570 +snd_pcm_oss_readv3_60792 snd_pcm_oss_readv3 3 60792 NULL
110571 +block_rsv_migrate_bytes_60843 block_rsv_migrate_bytes 0 60843 NULL
110572 +pwr_tx_with_ps_read_60851 pwr_tx_with_ps_read 3 60851 NULL
110573 +alloc_buf_60864 alloc_buf 2-3 60864 NULL
110574 +generic_writepages_60871 generic_writepages 0 60871 NULL
110575 +tipc_createport_60875 tipc_createport 4 60875 NULL
110576 +ubifs_read_one_lp_60882 ubifs_read_one_lp 0 60882 NULL
110577 +ext4_update_inline_data_60888 ext4_update_inline_data 3 60888 NULL
110578 +iio_debugfs_read_reg_60908 iio_debugfs_read_reg 3 60908 NULL
110579 +libcfs_sock_ioctl_60915 libcfs_sock_ioctl 0 60915 NULL
110580 +mgt_set_varlen_60916 mgt_set_varlen 4 60916 NULL
110581 +scrub_chunk_60926 scrub_chunk 5 60926 NULL
110582 +submit_extent_page_60928 submit_extent_page 5 60928 NULL
110583 +pti_char_write_60960 pti_char_write 3 60960 NULL
110584 +mwifiex_alloc_sdio_mpa_buffers_60961 mwifiex_alloc_sdio_mpa_buffers 3-2 60961 NULL
110585 +__a2mp_build_60987 __a2mp_build 3 60987 NULL
110586 +hsc_msg_alloc_60990 hsc_msg_alloc 1 60990 NULL
110587 +ath6kl_lrssi_roam_read_61022 ath6kl_lrssi_roam_read 3 61022 NULL
110588 +graph_depth_write_61024 graph_depth_write 3 61024 NULL
110589 +sdhci_pltfm_register_61031 sdhci_pltfm_register 3 61031 NULL
110590 +lpfc_idiag_queacc_write_61043 lpfc_idiag_queacc_write 3 61043 NULL
110591 +symtab_init_61050 symtab_init 2 61050 NULL
110592 +fuse_send_write_61053 fuse_send_write 0-4 61053 NULL
110593 +snd_pcm_pause_61054 snd_pcm_pause 0 61054 NULL
110594 +bitmap_scnlistprintf_61062 bitmap_scnlistprintf 0-4-2 61062 NULL
110595 +ahash_align_buffer_size_61070 ahash_align_buffer_size 0-1-2 61070 NULL
110596 +journal_stop_61080 journal_stop 0 61080 NULL
110597 +snd_pcm_update_hw_ptr0_61084 snd_pcm_update_hw_ptr0 0 61084 NULL
110598 +get_derived_key_61100 get_derived_key 4 61100 NULL
110599 +mem_cgroup_cache_charge_61101 mem_cgroup_cache_charge 0 61101 NULL
110600 +i40e_calculate_l2fpm_size_61104 i40e_calculate_l2fpm_size 0-1-2-3-4 61104 NULL
110601 +alloc_chrdev_region_61112 alloc_chrdev_region 0 61112 NULL
110602 +__probe_kernel_read_61119 __probe_kernel_read 3 61119 NULL
110603 +vmemmap_alloc_block_buf_61126 vmemmap_alloc_block_buf 1 61126 NULL
110604 +afs_proc_cells_write_61139 afs_proc_cells_write 3 61139 NULL
110605 +brcmf_sdio_chip_cr4_exitdl_61143 brcmf_sdio_chip_cr4_exitdl 4 61143 NULL
110606 +__vmalloc_61168 __vmalloc 1 61168 NULL
110607 +event_oom_late_read_61175 event_oom_late_read 3 61175 NULL nohasharray
110608 +pair_device_61175 pair_device 4 61175 &event_oom_late_read_61175
110609 +dio_bio_add_page_61178 dio_bio_add_page 0 61178 NULL
110610 +btrfs_reloc_post_snapshot_61189 btrfs_reloc_post_snapshot 0 61189 NULL
110611 +SyS_prctl_61202 SyS_prctl 4 61202 NULL
110612 +arch_hibernation_header_save_61212 arch_hibernation_header_save 0 61212 NULL
110613 +smk_read_ambient_61220 smk_read_ambient 3 61220 NULL
110614 +__verify_planes_array_61249 __verify_planes_array 0 61249 NULL
110615 +find_get_pages_tag_61270 find_get_pages_tag 0 61270 NULL nohasharray
110616 +ifalias_store_61270 ifalias_store 4 61270 &find_get_pages_tag_61270 nohasharray
110617 +btrfs_bio_alloc_61270 btrfs_bio_alloc 3 61270 &ifalias_store_61270
110618 +kick_a_thread_61273 kick_a_thread 0 61273 NULL
110619 +hfsplus_getxattr_finder_info_61283 hfsplus_getxattr_finder_info 0 61283 NULL nohasharray
110620 +vortex_adbdma_getlinearpos_61283 vortex_adbdma_getlinearpos 0 61283 &hfsplus_getxattr_finder_info_61283
110621 +nvme_trans_copy_to_user_61288 nvme_trans_copy_to_user 3 61288 NULL
110622 +ext4_issue_discard_61305 ext4_issue_discard 2 61305 NULL
110623 +xfer_from_user_61307 xfer_from_user 3 61307 NULL
110624 +ocfs2_get_sector_61309 ocfs2_get_sector 4 61309 NULL
110625 +timespec_to_ns_61317 timespec_to_ns 0 61317 NULL
110626 +xfrm_user_sec_ctx_size_61320 xfrm_user_sec_ctx_size 0 61320 NULL
110627 +C_SYSC_msgsnd_61330 C_SYSC_msgsnd 3 61330 NULL
110628 +write_file_spectral_short_repeat_61335 write_file_spectral_short_repeat 3 61335 NULL
110629 +__fls_61340 __fls 0 61340 NULL nohasharray
110630 +st5481_setup_isocpipes_61340 st5481_setup_isocpipes 6-4 61340 &__fls_61340
110631 +do_splice_direct_61341 do_splice_direct 5 61341 NULL nohasharray
110632 +rx_rx_wa_ba_not_expected_read_61341 rx_rx_wa_ba_not_expected_read 3 61341 &do_splice_direct_61341
110633 +__dm_get_reserved_ios_61342 __dm_get_reserved_ios 0-2-3 61342 NULL
110634 +f1x_map_sysaddr_to_csrow_61344 f1x_map_sysaddr_to_csrow 2 61344 NULL
110635 +kvm_apic_id_61363 kvm_apic_id 0 61363 NULL
110636 +debug_debug4_read_61367 debug_debug4_read 3 61367 NULL
110637 +get_inode_info_61387 get_inode_info 0 61387 NULL
110638 +system_enable_write_61396 system_enable_write 3 61396 NULL
110639 +size_entry_mwt_61400 size_entry_mwt 0 61400 NULL
110640 +xfs_zero_remaining_bytes_61423 xfs_zero_remaining_bytes 3 61423 NULL
110641 +i915_emit_box_61436 i915_emit_box 0 61436 NULL
110642 +dma_ops_area_alloc_61440 dma_ops_area_alloc 3-4-5-0 61440 NULL
110643 +tc3589x_irq_unmap_61447 tc3589x_irq_unmap 2 61447 NULL
110644 +unix_stream_sendmsg_61455 unix_stream_sendmsg 4 61455 NULL
110645 +snd_pcm_lib_writev_transfer_61483 snd_pcm_lib_writev_transfer 5-4-2 61483 NULL
110646 +btrfs_item_size_61485 btrfs_item_size 0 61485 NULL
110647 +ocfs2_get_refcount_rec_61514 ocfs2_get_refcount_rec 0 61514 NULL
110648 +__vmalloc_area_node_61525 __vmalloc_area_node 4 61525 NULL
110649 +erst_errno_61526 erst_errno 0 61526 NULL
110650 +ntfs_attr_lookup_61539 ntfs_attr_lookup 0 61539 NULL
110651 +get_ohm_of_thermistor_61545 get_ohm_of_thermistor 2 61545 NULL
110652 +trace_options_core_write_61551 trace_options_core_write 3 61551 NULL
110653 +o2hb_pop_count_61553 o2hb_pop_count 2 61553 NULL
110654 +dvb_net_ioctl_61559 dvb_net_ioctl 2 61559 NULL
110655 +parport_pc_fifo_write_block_dma_61568 parport_pc_fifo_write_block_dma 3 61568 NULL
110656 +fan_proc_write_61569 fan_proc_write 3 61569 NULL
110657 +ieee80211_if_read_rc_rateidx_mask_2ghz_61570 ieee80211_if_read_rc_rateidx_mask_2ghz 3 61570 NULL
110658 +ldlm_pool_rw_atomic_seq_write_61572 ldlm_pool_rw_atomic_seq_write 3 61572 NULL
110659 +seq_open_private_61589 seq_open_private 3 61589 NULL
110660 +ept_gpte_to_gfn_lvl_61591 ept_gpte_to_gfn_lvl 0-2-1 61591 NULL
110661 +netlink_recvmsg_61600 netlink_recvmsg 4 61600 NULL
110662 +nfs4_init_uniform_client_string_61601 nfs4_init_uniform_client_string 3 61601 NULL
110663 +configfs_write_file_61621 configfs_write_file 3 61621 NULL
110664 +ieee80211_if_fmt_hw_queues_61629 ieee80211_if_fmt_hw_queues 3 61629 NULL
110665 +i2o_parm_table_get_61635 i2o_parm_table_get 6 61635 NULL
110666 +snd_pcm_oss_read3_61643 snd_pcm_oss_read3 0-3 61643 NULL
110667 +resize_stripes_61650 resize_stripes 2 61650 NULL
110668 +ttm_page_pool_free_61661 ttm_page_pool_free 2-0 61661 NULL
110669 +insert_one_name_61668 insert_one_name 7 61668 NULL
110670 +snd_pcm_playback_avail_61671 snd_pcm_playback_avail 0 61671 NULL
110671 +qib_format_hwmsg_61679 qib_format_hwmsg 2 61679 NULL
110672 +lock_loop_61681 lock_loop 1 61681 NULL
110673 +__do_tune_cpucache_61684 __do_tune_cpucache 2 61684 NULL
110674 +filter_read_61692 filter_read 3 61692 NULL
110675 +prog_page_61711 prog_page 2 61711 NULL
110676 +iov_length_61716 iov_length 0 61716 NULL
110677 +fragmentation_threshold_read_61718 fragmentation_threshold_read 3 61718 NULL
110678 +null_alloc_reqbuf_61719 null_alloc_reqbuf 3 61719 NULL
110679 +read_file_interrupt_61742 read_file_interrupt 3 61742 NULL nohasharray
110680 +read_file_regval_61742 read_file_regval 3 61742 &read_file_interrupt_61742
110681 +SyS_sendto_61763 SyS_sendto 6 61763 NULL
110682 +gfs2_meta_wait_61773 gfs2_meta_wait 0 61773 NULL
110683 +num_counter_active_61789 num_counter_active 0 61789 NULL
110684 +mls_compute_context_len_61812 mls_compute_context_len 0 61812 NULL
110685 +tps80031_irq_init_61830 tps80031_irq_init 3 61830 NULL
110686 +bfad_debugfs_write_regwr_61841 bfad_debugfs_write_regwr 3 61841 NULL
110687 +regcache_sync_block_61846 regcache_sync_block 4-5 61846 NULL
110688 +fs_path_prepare_for_add_61854 fs_path_prepare_for_add 2-0 61854 NULL
110689 +evdev_compute_buffer_size_61863 evdev_compute_buffer_size 0 61863 NULL
110690 +SYSC_lsetxattr_61869 SYSC_lsetxattr 4 61869 NULL
110691 +get_fw_name_61874 get_fw_name 3 61874 NULL
110692 +twl4030_sih_setup_61878 twl4030_sih_setup 3-0 61878 NULL
110693 +btrfs_ioctl_clone_61886 btrfs_ioctl_clone 4-3-5 61886 NULL
110694 +lprocfs_write_frac_u64_helper_61897 lprocfs_write_frac_u64_helper 2 61897 NULL
110695 +lov_mds_md_stripecnt_61899 lov_mds_md_stripecnt 0-1 61899 NULL
110696 +clear_refs_write_61904 clear_refs_write 3 61904 NULL
110697 +rx_filter_arp_filter_read_61914 rx_filter_arp_filter_read 3 61914 NULL
110698 +au0828_init_isoc_61917 au0828_init_isoc 3-2-4 61917 NULL
110699 +sctp_sendmsg_61919 sctp_sendmsg 4 61919 NULL
110700 +ocfs2_reserve_new_metadata_blocks_61926 ocfs2_reserve_new_metadata_blocks 0 61926 NULL
110701 +SyS_kexec_load_61946 SyS_kexec_load 2 61946 NULL
110702 +gfn_to_pfn_memslot_atomic_61947 gfn_to_pfn_memslot_atomic 2 61947 NULL
110703 +il4965_ucode_rx_stats_read_61948 il4965_ucode_rx_stats_read 3 61948 NULL
110704 +squashfs_read_id_index_table_61961 squashfs_read_id_index_table 4 61961 NULL
110705 +fix_read_error_61965 fix_read_error 4 61965 NULL
110706 +mlx4_alloc_mtt_range_61966 mlx4_alloc_mtt_range 2 61966 NULL
110707 +ocfs2_quota_write_61972 ocfs2_quota_write 5-4 61972 NULL
110708 +fd_locked_ioctl_61978 fd_locked_ioctl 3 61978 NULL
110709 +cow_file_range_61979 cow_file_range 3 61979 NULL
110710 +module_alloc_exec_61991 module_alloc_exec 1 61991 NULL
110711 +dequeue_event_62000 dequeue_event 3 62000 NULL
110712 +xt_compat_match_offset_62011 xt_compat_match_offset 0 62011 NULL
110713 +SyS_setxattr_62019 SyS_setxattr 4 62019 NULL
110714 +jffs2_do_unlink_62020 jffs2_do_unlink 4 62020 NULL
110715 +SYSC_select_62024 SYSC_select 1 62024 NULL
110716 +pmcraid_build_passthrough_ioadls_62034 pmcraid_build_passthrough_ioadls 2 62034 NULL
110717 +sctp_user_addto_chunk_62047 sctp_user_addto_chunk 2-3 62047 NULL
110718 +do_pselect_62061 do_pselect 1 62061 NULL
110719 +pcpu_alloc_bootmem_62074 pcpu_alloc_bootmem 2 62074 NULL
110720 +get_domain_for_dev_62099 get_domain_for_dev 2 62099 NULL
110721 +ipath_user_sdma_pin_pages_62100 ipath_user_sdma_pin_pages 3-5-4 62100 NULL
110722 +jffs2_security_setxattr_62107 jffs2_security_setxattr 4 62107 NULL
110723 +btrfs_direct_IO_62114 btrfs_direct_IO 4 62114 NULL
110724 +ip_recv_error_62117 ip_recv_error 3 62117 NULL
110725 +generic_block_fiemap_62122 generic_block_fiemap 4 62122 NULL
110726 +llc_ui_header_len_62131 llc_ui_header_len 0 62131 NULL
110727 +qib_diag_write_62133 qib_diag_write 3 62133 NULL nohasharray
110728 +kobject_add_varg_62133 kobject_add_varg 0 62133 &qib_diag_write_62133
110729 +ql_status_62135 ql_status 5 62135 NULL nohasharray
110730 +device_add_attrs_62135 device_add_attrs 0 62135 &ql_status_62135
110731 +video_usercopy_62151 video_usercopy 2 62151 NULL
110732 +wrmWithLock_62164 wrmWithLock 0 62164 NULL
110733 +SyS_getxattr_62166 SyS_getxattr 4 62166 NULL
110734 +prism54_wpa_bss_ie_get_62173 prism54_wpa_bss_ie_get 0 62173 NULL
110735 +write_file_dfs_62180 write_file_dfs 3 62180 NULL
110736 +alloc_upcall_62186 alloc_upcall 2 62186 NULL
110737 +btrfs_xattr_acl_set_62203 btrfs_xattr_acl_set 4 62203 NULL
110738 +sock_kmalloc_62205 sock_kmalloc 2 62205 NULL
110739 +SYSC_setgroups16_62232 SYSC_setgroups16 1 62232 NULL
110740 +nfsd_read_file_62241 nfsd_read_file 6 62241 NULL
110741 +allocate_partition_62245 allocate_partition 4 62245 NULL
110742 +security_file_permission_62278 security_file_permission 0 62278 NULL
110743 +get_random_int_62279 get_random_int 0 62279 NULL
110744 +__qib_get_user_pages_62287 __qib_get_user_pages 1-2 62287 NULL
110745 +il_dbgfs_sram_read_62296 il_dbgfs_sram_read 3 62296 NULL
110746 +sparse_early_usemaps_alloc_pgdat_section_62304 sparse_early_usemaps_alloc_pgdat_section 2 62304 NULL
110747 +ocfs2_find_victim_alloc_group_62306 ocfs2_find_victim_alloc_group 0 62306 NULL
110748 +subsystem_filter_read_62310 subsystem_filter_read 3 62310 NULL
110749 +timespec_to_jiffies_62321 timespec_to_jiffies 0 62321 NULL
110750 +Wb35Reg_BurstWrite_62327 Wb35Reg_BurstWrite 4 62327 NULL
110751 +subseq_list_62332 subseq_list 3-0 62332 NULL
110752 +ll_statahead_max_seq_write_62333 ll_statahead_max_seq_write 3 62333 NULL
110753 +flash_write_62354 flash_write 3 62354 NULL
110754 +xfpregs_set_62363 xfpregs_set 4 62363 NULL
110755 +rx_rx_timeout_read_62389 rx_rx_timeout_read 3 62389 NULL
110756 +altera_irscan_62396 altera_irscan 2 62396 NULL
110757 +set_ssp_62411 set_ssp 4 62411 NULL
110758 +mlx4_en_create_rx_ring_62498 mlx4_en_create_rx_ring 3 62498 NULL
110759 +ext_rts51x_sd_execute_read_data_62501 ext_rts51x_sd_execute_read_data 9 62501 NULL
110760 +mtip_get_next_rr_node_62502 mtip_get_next_rr_node 0 62502 NULL
110761 +ocfs2_path_bh_journal_access_62504 ocfs2_path_bh_journal_access 0 62504 NULL
110762 +pep_sendmsg_62524 pep_sendmsg 4 62524 NULL
110763 +test_iso_queue_62534 test_iso_queue 5 62534 NULL nohasharray
110764 +__kmalloc_node_track_caller_62534 __kmalloc_node_track_caller 3 62534 &test_iso_queue_62534
110765 +debugfs_read_62535 debugfs_read 3 62535 NULL
110766 +sco_sock_sendmsg_62542 sco_sock_sendmsg 4 62542 NULL
110767 +qib_refresh_qsfp_cache_62547 qib_refresh_qsfp_cache 0 62547 NULL
110768 +xfrm_user_policy_62573 xfrm_user_policy 4 62573 NULL
110769 +get_subdir_62581 get_subdir 3 62581 NULL
110770 +nfsd_vfs_read_62605 nfsd_vfs_read 6 62605 NULL
110771 +get_desc_base_62617 get_desc_base 0 62617 NULL
110772 +iommu_area_alloc_62619 iommu_area_alloc 2-3-4-7-0 62619 NULL
110773 +vfs_fsync_range_62635 vfs_fsync_range 0 62635 NULL
110774 +lpfc_sli4_queue_alloc_62646 lpfc_sli4_queue_alloc 3 62646 NULL
110775 +write_62671 write 3 62671 NULL
110776 +ocfs2_wait_for_mask_interruptible_62675 ocfs2_wait_for_mask_interruptible 0 62675 NULL
110777 +printer_req_alloc_62687 printer_req_alloc 2 62687 NULL
110778 +ext4_ind_map_blocks_62690 ext4_ind_map_blocks 0 62690 NULL
110779 +htb_remove_class_from_row_62692 htb_remove_class_from_row 3 62692 NULL
110780 +qla4_83xx_rd_reg_62693 qla4_83xx_rd_reg 0 62693 NULL
110781 +bioset_integrity_create_62708 bioset_integrity_create 2 62708 NULL
110782 +gfs2_log_write_62717 gfs2_log_write 3 62717 NULL
110783 +rdm_62719 rdm 0 62719 NULL
110784 +obd_ioctl_popdata_62741 obd_ioctl_popdata 3 62741 NULL
110785 +key_replays_read_62746 key_replays_read 3 62746 NULL
110786 +lov_verify_lmm_62747 lov_verify_lmm 2 62747 NULL
110787 +mwifiex_rdeeprom_write_62754 mwifiex_rdeeprom_write 3 62754 NULL
110788 +ax25_sendmsg_62770 ax25_sendmsg 4 62770 NULL
110789 +page_key_alloc_62771 page_key_alloc 0 62771 NULL
110790 +C_SYSC_ipc_62776 C_SYSC_ipc 3 62776 NULL
110791 +SyS_sched_getaffinity_62786 SyS_sched_getaffinity 2 62786 NULL
110792 +dm_stats_account_io_62787 dm_stats_account_io 3 62787 NULL
110793 +posix_acl_valid_62788 posix_acl_valid 0 62788 NULL
110794 +is_first_ref_62805 is_first_ref 0 62805 NULL
110795 +tracing_total_entries_read_62817 tracing_total_entries_read 3 62817 NULL
110796 +name_cache_insert_62822 name_cache_insert 0 62822 NULL
110797 +BeceemEEPROMBulkRead_62835 BeceemEEPROMBulkRead 0 62835 NULL
110798 +__rounddown_pow_of_two_62836 __rounddown_pow_of_two 0 62836 NULL
110799 +bio_get_nr_vecs_62838 bio_get_nr_vecs 0 62838 NULL
110800 +xlog_recover_add_to_trans_62839 xlog_recover_add_to_trans 4 62839 NULL
110801 +rx_fcs_err_read_62844 rx_fcs_err_read 3 62844 NULL
110802 +set_swbp_62853 set_swbp 3 62853 NULL
110803 +read_nic_io_dword_62859 read_nic_io_dword 0 62859 NULL
110804 +l2tp_ip6_recvmsg_62874 l2tp_ip6_recvmsg 4 62874 NULL
110805 +aoechr_write_62883 aoechr_write 3 62883 NULL
110806 +if_spi_host_to_card_62890 if_spi_host_to_card 4 62890 NULL
110807 +ocfs2_validate_gd_parent_62905 ocfs2_validate_gd_parent 0 62905 NULL
110808 +mempool_create_slab_pool_62907 mempool_create_slab_pool 1 62907 NULL
110809 +getdqbuf_62908 getdqbuf 1 62908 NULL
110810 +try_async_pf_62914 try_async_pf 3 62914 NULL nohasharray
110811 +SyS_remap_file_pages_62914 SyS_remap_file_pages 1-2 62914 &try_async_pf_62914
110812 +ll_statahead_agl_seq_write_62928 ll_statahead_agl_seq_write 3 62928 NULL
110813 +atomic64_sub_return_62941 atomic64_sub_return 1 62941 NULL
110814 +agp_create_user_memory_62955 agp_create_user_memory 1 62955 NULL
110815 +send_write_62969 send_write 0-3 62969 NULL
110816 +__ext3_journal_stop_63017 __ext3_journal_stop 0 63017 NULL
110817 +alloc_mem_cgroup_per_zone_info_63024 alloc_mem_cgroup_per_zone_info 2 63024 NULL
110818 +kstrtoull_from_user_63026 kstrtoull_from_user 2 63026 NULL
110819 +PTR_ERR_63033 PTR_ERR 0 63033 NULL nohasharray
110820 +__vb2_perform_fileio_63033 __vb2_perform_fileio 3 63033 &PTR_ERR_63033
110821 +pipeline_defrag_to_csum_swi_read_63037 pipeline_defrag_to_csum_swi_read 3 63037 NULL
110822 +scsi_host_alloc_63041 scsi_host_alloc 2 63041 NULL
110823 +run_delayed_tree_ref_63042 run_delayed_tree_ref 0 63042 NULL
110824 +unlink1_63059 unlink1 3 63059 NULL
110825 +__do_munmap_63063 __do_munmap 0 63063 NULL
110826 +xen_set_nslabs_63066 xen_set_nslabs 0 63066 NULL
110827 +iwl_dbgfs_fw_rx_stats_read_63070 iwl_dbgfs_fw_rx_stats_read 3 63070 NULL
110828 +ocfs2_decrease_refcount_63078 ocfs2_decrease_refcount 4-3-0 63078 NULL
110829 +find_extent_in_eb_63082 find_extent_in_eb 0 63082 NULL
110830 +sep_prepare_input_output_dma_table_in_dcb_63087 sep_prepare_input_output_dma_table_in_dcb 4-5-3-2 63087 NULL
110831 +__ocfs2_flush_truncate_log_63097 __ocfs2_flush_truncate_log 0 63097 NULL
110832 +iwl_dbgfs_sensitivity_read_63116 iwl_dbgfs_sensitivity_read 3 63116 NULL
110833 +ext4_chunk_trans_blocks_63123 ext4_chunk_trans_blocks 0-2 63123 NULL
110834 +alloc_cblock_63133 alloc_cblock 2 63133 NULL
110835 +snd_pcm_status_user_63140 snd_pcm_status_user 0 63140 NULL
110836 +ubifs_change_one_lp_63157 ubifs_change_one_lp 0 63157 NULL
110837 +smk_write_revoke_subj_63173 smk_write_revoke_subj 3 63173 NULL
110838 +SyS_syslog_63178 SyS_syslog 3 63178 NULL
110839 +security_policydb_len_63198 security_policydb_len 0 63198 NULL
110840 +vme_master_read_63221 vme_master_read 0 63221 NULL
110841 +SyS_gethostname_63227 SyS_gethostname 2 63227 NULL
110842 +module_alloc_update_bounds_rw_63233 module_alloc_update_bounds_rw 1 63233 NULL
110843 +ptp_read_63251 ptp_read 4 63251 NULL
110844 +xfs_dir2_leaf_getdents_63262 xfs_dir2_leaf_getdents 3 63262 NULL
110845 +ntfs_attr_can_be_non_resident_63267 ntfs_attr_can_be_non_resident 0 63267 NULL
110846 +raid5_resize_63306 raid5_resize 2 63306 NULL
110847 +proc_info_read_63344 proc_info_read 3 63344 NULL
110848 +ps_upsd_max_sptime_read_63362 ps_upsd_max_sptime_read 3 63362 NULL
110849 +idmouse_read_63374 idmouse_read 3 63374 NULL
110850 +edac_pci_alloc_ctl_info_63388 edac_pci_alloc_ctl_info 1 63388 NULL nohasharray
110851 +usbnet_read_cmd_nopm_63388 usbnet_read_cmd_nopm 7 63388 &edac_pci_alloc_ctl_info_63388
110852 +rxpipe_missed_beacon_host_int_trig_rx_data_read_63405 rxpipe_missed_beacon_host_int_trig_rx_data_read 3 63405 NULL
110853 +nouveau_event_create_63411 nouveau_event_create 1 63411 NULL
110854 +l2cap_sock_sendmsg_63427 l2cap_sock_sendmsg 4 63427 NULL
110855 +sep_prepare_input_output_dma_table_63429 sep_prepare_input_output_dma_table 3-4-2 63429 NULL
110856 +gfn_to_hva_many_63437 gfn_to_hva_many 2-0 63437 NULL
110857 +nfsd_symlink_63442 nfsd_symlink 6 63442 NULL
110858 +lookup_dir_item_inode_63447 lookup_dir_item_inode 0 63447 NULL
110859 +i915_gem_object_get_fence_63455 i915_gem_object_get_fence 0 63455 NULL
110860 +__do_kmalloc_node_63461 __do_kmalloc_node 3 63461 NULL
110861 +si5351_bulk_write_63468 si5351_bulk_write 2-3 63468 NULL
110862 +snd_info_entry_write_63474 snd_info_entry_write 3 63474 NULL
110863 +do_work_63483 do_work 0 63483 NULL
110864 +reada_find_extent_63486 reada_find_extent 2 63486 NULL
110865 +__copy_from_user_ll_nocache_63487 __copy_from_user_ll_nocache 0-3 63487 NULL
110866 +read_kcore_63488 read_kcore 3 63488 NULL nohasharray
110867 +alloc_reserved_tree_block_63488 alloc_reserved_tree_block 0 63488 &read_kcore_63488
110868 +save_hint_63497 save_hint 2 63497 NULL
110869 +wl1271_tx_min_rate_get_63498 wl1271_tx_min_rate_get 2 63498 NULL
110870 +sis_voice_irq_63501 sis_voice_irq 1 63501 NULL
110871 +snd_pcm_plug_write_transfer_63503 snd_pcm_plug_write_transfer 0-3 63503 NULL
110872 +efx_mcdi_rpc_async_63529 efx_mcdi_rpc_async 5-4 63529 NULL
110873 +ubi_more_leb_change_data_63534 ubi_more_leb_change_data 4-0 63534 NULL
110874 +write_file_spectral_period_63536 write_file_spectral_period 3 63536 NULL
110875 +if_sdio_read_scratch_63540 if_sdio_read_scratch 0 63540 NULL
110876 +append_to_buffer_63550 append_to_buffer 3 63550 NULL
110877 +dbg_leb_write_63555 dbg_leb_write 4-5 63555 NULL nohasharray
110878 +kvm_write_guest_page_63555 kvm_write_guest_page 2-5 63555 &dbg_leb_write_63555
110879 +ubifs_lpt_scan_nolock_63572 ubifs_lpt_scan_nolock 0 63572 NULL
110880 +iwch_reg_user_mr_63575 iwch_reg_user_mr 2-3 63575 NULL
110881 +ocfs2_calc_trunc_pos_63576 ocfs2_calc_trunc_pos 4 63576 NULL
110882 +rproc_alloc_63577 rproc_alloc 5 63577 NULL
110883 +ext3_clear_blocks_63597 ext3_clear_blocks 4-5 63597 NULL
110884 +write_debug_level_63613 write_debug_level 3 63613 NULL
110885 +module_alloc_63630 module_alloc 1 63630 NULL
110886 +ntfs_malloc_nofs_nofail_63631 ntfs_malloc_nofs_nofail 1 63631 NULL
110887 +symbol_build_supp_rates_63634 symbol_build_supp_rates 0 63634 NULL
110888 +_ubh_find_next_zero_bit__63640 _ubh_find_next_zero_bit_ 3-5-4 63640 NULL
110889 +ext4_ext_get_access_63642 ext4_ext_get_access 0 63642 NULL
110890 +proc_loginuid_write_63648 proc_loginuid_write 3 63648 NULL
110891 +ValidateDSDParamsChecksum_63654 ValidateDSDParamsChecksum 3 63654 NULL
110892 +ldlm_cli_enqueue_63657 ldlm_cli_enqueue 8 63657 NULL
110893 +hidraw_ioctl_63658 hidraw_ioctl 2 63658 NULL
110894 +vbi_read_63673 vbi_read 3 63673 NULL nohasharray
110895 +xen_register_pirq_63673 xen_register_pirq 1-2 63673 &vbi_read_63673
110896 +write_file_spectral_fft_period_63696 write_file_spectral_fft_period 3 63696 NULL
110897 +bin_search_63697 bin_search 0 63697 NULL
110898 +arizona_irq_map_63709 arizona_irq_map 2 63709 NULL
110899 +ocfs2_et_root_journal_access_63713 ocfs2_et_root_journal_access 0 63713 NULL
110900 +nouveau_object_create__63715 nouveau_object_create_ 5 63715 NULL
110901 +btrfs_insert_delayed_dir_index_63720 btrfs_insert_delayed_dir_index 4-0 63720 NULL
110902 +selinux_secctx_to_secid_63744 selinux_secctx_to_secid 2 63744 NULL
110903 +snd_pcm_oss_read1_63771 snd_pcm_oss_read1 3 63771 NULL
110904 +snd_pcm_link_63772 snd_pcm_link 0 63772 NULL
110905 +snd_opl4_mem_proc_read_63774 snd_opl4_mem_proc_read 5 63774 NULL
110906 +spidev_compat_ioctl_63778 spidev_compat_ioctl 2 63778 NULL
110907 +mwifiex_11n_create_rx_reorder_tbl_63806 mwifiex_11n_create_rx_reorder_tbl 4 63806 NULL
110908 +copy_nodes_to_user_63807 copy_nodes_to_user 2 63807 NULL
110909 +prepare_copy_63826 prepare_copy 2 63826 NULL
110910 +sel_write_load_63830 sel_write_load 3 63830 NULL
110911 +ll_readlink_63836 ll_readlink 3 63836 NULL
110912 +IsSectionWritable_63842 IsSectionWritable 0 63842 NULL
110913 +proc_pid_attr_write_63845 proc_pid_attr_write 3 63845 NULL
110914 +divas_write_63901 divas_write 3 63901 NULL
110915 +IsOffsetWritable_63902 IsOffsetWritable 0 63902 NULL nohasharray
110916 +xhci_alloc_stream_info_63902 xhci_alloc_stream_info 3 63902 &IsOffsetWritable_63902
110917 +uvc_alloc_urb_buffers_63922 uvc_alloc_urb_buffers 0-2-3 63922 NULL
110918 +snd_compr_write_63923 snd_compr_write 3 63923 NULL
110919 +acpi_ev_get_gpe_xrupt_block_63924 acpi_ev_get_gpe_xrupt_block 1 63924 NULL
110920 +tipc_send2port_63935 tipc_send2port 5 63935 NULL
110921 +afs_send_simple_reply_63940 afs_send_simple_reply 3 63940 NULL
110922 +__team_options_register_63941 __team_options_register 3 63941 NULL
110923 +macvtap_recvmsg_63949 macvtap_recvmsg 4 63949 NULL
110924 +generic_acl_init_63955 generic_acl_init 0 63955 NULL
110925 +domain_pfn_mapping_63957 domain_pfn_mapping 4 63957 NULL
110926 +diva_xdi_write_63975 diva_xdi_write 4 63975 NULL
110927 +rs_extent_to_bm_page_63996 rs_extent_to_bm_page 0-1 63996 NULL
110928 +read_file_frameerrors_64001 read_file_frameerrors 3 64001 NULL
110929 +hfsplus_security_setxattr_64009 hfsplus_security_setxattr 4 64009 NULL
110930 +C_SYSC_sendfile64_64017 C_SYSC_sendfile64 4 64017 NULL
110931 +SyS_rt_sigpending_64018 SyS_rt_sigpending 2 64018 NULL
110932 +offset_to_vaddr_64025 offset_to_vaddr 0-2 64025 NULL
110933 +dbAllocDmapLev_64030 dbAllocDmapLev 0 64030 NULL
110934 +resize_async_buffer_64031 resize_async_buffer 4 64031 NULL
110935 +SyS_fsetxattr_64039 SyS_fsetxattr 4 64039 NULL
110936 +tfrc_calc_x_reverse_lookup_64057 tfrc_calc_x_reverse_lookup 0 64057 NULL
110937 +__sock_create_64069 __sock_create 0 64069 NULL
110938 +get_u8_64076 get_u8 0 64076 NULL
110939 +xilly_malloc_64077 xilly_malloc 2 64077 NULL
110940 +btrfs_copy_root_64079 btrfs_copy_root 0 64079 NULL
110941 +sl_realloc_bufs_64086 sl_realloc_bufs 2 64086 NULL
110942 +clear_update_marker_64088 clear_update_marker 0 64088 NULL nohasharray
110943 +vmci_handle_arr_get_size_64088 vmci_handle_arr_get_size 0 64088 &clear_update_marker_64088
110944 +lbs_highrssi_read_64089 lbs_highrssi_read 3 64089 NULL
110945 +SyS_set_mempolicy_64096 SyS_set_mempolicy 3 64096 NULL
110946 +SyS_mq_timedsend_64107 SyS_mq_timedsend 3 64107 NULL
110947 +rdma_addr_size_64116 rdma_addr_size 0 64116 NULL
110948 +do_load_xattr_datum_64118 do_load_xattr_datum 0 64118 NULL
110949 +bypass_wd_write_64120 bypass_wd_write 3 64120 NULL
110950 +ol_quota_entries_per_block_64122 ol_quota_entries_per_block 0 64122 NULL
110951 +ext4_prepare_inline_data_64124 ext4_prepare_inline_data 3 64124 NULL
110952 +init_bch_64130 init_bch 2-1 64130 NULL
110953 +SYSC_ptrace_64136 SYSC_ptrace 3 64136 NULL
110954 +ablkcipher_copy_iv_64140 ablkcipher_copy_iv 3 64140 NULL
110955 +dlfb_ops_write_64150 dlfb_ops_write 3 64150 NULL
110956 +__comedi_buf_alloc_64155 __comedi_buf_alloc 3 64155 NULL
110957 +cpumask_scnprintf_64170 cpumask_scnprintf 0-2 64170 NULL
110958 +ocfs2_reserve_blocks_for_rec_trunc_64206 ocfs2_reserve_blocks_for_rec_trunc 0 64206 NULL
110959 +xfs_vm_direct_IO_64223 xfs_vm_direct_IO 4 64223 NULL
110960 +read_pulse_64227 read_pulse 0-3 64227 NULL
110961 +ea_len_64229 ea_len 0 64229 NULL
110962 +btrfs_make_block_group_64241 btrfs_make_block_group 0 64241 NULL
110963 +__btrfs_update_delayed_inode_64248 __btrfs_update_delayed_inode 0 64248 NULL
110964 +io_capture_transfer_64276 io_capture_transfer 4 64276 NULL
110965 +btrfs_file_extent_offset_64278 btrfs_file_extent_offset 0 64278 NULL
110966 +btrfs_next_item_64285 btrfs_next_item 0 64285 NULL
110967 +sta_current_tx_rate_read_64286 sta_current_tx_rate_read 3 64286 NULL
110968 +event_id_read_64288 event_id_read 3 64288 NULL nohasharray
110969 +xfs_dir_cilookup_result_64288 xfs_dir_cilookup_result 3 64288 &event_id_read_64288
110970 +ocfs2_block_check_validate_bhs_64302 ocfs2_block_check_validate_bhs 0 64302 NULL
110971 +snd_hda_get_sub_nodes_64304 snd_hda_get_sub_nodes 0 64304 NULL
110972 +error_error_bar_retry_read_64305 error_error_bar_retry_read 3 64305 NULL
110973 +ffz_64324 ffz 0-1 64324 NULL
110974 +map_region_64328 map_region 1 64328 NULL
110975 +sisusbcon_clear_64329 sisusbcon_clear 4-3-5 64329 NULL
110976 +ts_write_64336 ts_write 3 64336 NULL
110977 +usbtmc_write_64340 usbtmc_write 3 64340 NULL
110978 +do_write_orph_node_64343 do_write_orph_node 2 64343 NULL
110979 +ft1000_read_reg_64352 ft1000_read_reg 0 64352 NULL
110980 +bnx2x_vfop_mcast_cmd_64354 bnx2x_vfop_mcast_cmd 5 64354 NULL
110981 +user_regset_copyin_64360 user_regset_copyin 7 64360 NULL
110982 +wlc_phy_loadsampletable_nphy_64367 wlc_phy_loadsampletable_nphy 3 64367 NULL
110983 +reg_create_64372 reg_create 5 64372 NULL
110984 +ilo_write_64378 ilo_write 3 64378 NULL
110985 +btrfs_map_block_64379 btrfs_map_block 3 64379 NULL
110986 +vmcs_readl_64381 vmcs_readl 0 64381 NULL
110987 +nilfs_alloc_seg_bio_64383 nilfs_alloc_seg_bio 3 64383 NULL
110988 +ir_lirc_transmit_ir_64403 ir_lirc_transmit_ir 3 64403 NULL
110989 +pidlist_allocate_64404 pidlist_allocate 1 64404 NULL
110990 +rx_hdr_overflow_read_64407 rx_hdr_overflow_read 3 64407 NULL
110991 +snd_card_create_64418 snd_card_create 4 64418 NULL nohasharray
110992 +keyctl_get_security_64418 keyctl_get_security 3 64418 &snd_card_create_64418
110993 +nl80211_send_mgmt_64419 nl80211_send_mgmt 7 64419 NULL
110994 +oom_adj_write_64428 oom_adj_write 3 64428 NULL
110995 +ext4_trim_extent_64431 ext4_trim_extent 4 64431 NULL nohasharray
110996 +read_file_spectral_short_repeat_64431 read_file_spectral_short_repeat 3 64431 &ext4_trim_extent_64431
110997 +ax25_recvmsg_64441 ax25_recvmsg 4 64441 NULL
110998 +single_open_size_64483 single_open_size 4 64483 NULL
110999 +p54_parse_rssical_64493 p54_parse_rssical 3 64493 NULL
111000 +msg_data_sz_64503 msg_data_sz 0 64503 NULL
111001 +remove_uuid_64505 remove_uuid 4 64505 NULL nohasharray
111002 +handle_abnormal_pfn_64505 handle_abnormal_pfn 3 64505 &remove_uuid_64505
111003 +crypto_blkcipher_alignmask_64520 crypto_blkcipher_alignmask 0 64520 NULL
111004 +opera1_usb_i2c_msgxfer_64521 opera1_usb_i2c_msgxfer 4 64521 NULL
111005 +iwl_dbgfs_ucode_tracing_write_64524 iwl_dbgfs_ucode_tracing_write 3 64524 NULL
111006 +ses_send_diag_64527 ses_send_diag 4 64527 NULL
111007 +prctl_set_mm_64538 prctl_set_mm 3 64538 NULL
111008 +SyS_bind_64544 SyS_bind 3 64544 NULL
111009 +rbd_obj_read_sync_64554 rbd_obj_read_sync 4-3 64554 NULL
111010 +__btrfs_prealloc_file_range_64557 __btrfs_prealloc_file_range 3-0 64557 NULL
111011 +__spi_sync_64561 __spi_sync 0 64561 NULL nohasharray
111012 +ll_max_rw_chunk_seq_write_64561 ll_max_rw_chunk_seq_write 3 64561 &__spi_sync_64561
111013 +__apei_exec_run_64563 __apei_exec_run 0 64563 NULL
111014 +kstrtoul_from_user_64569 kstrtoul_from_user 2 64569 NULL
111015 +do_erase_64574 do_erase 4 64574 NULL
111016 +fanotify_write_64623 fanotify_write 3 64623 NULL
111017 +ocfs2_remove_refcount_extent_64631 ocfs2_remove_refcount_extent 0 64631 NULL
111018 +to_dblock_64655 to_dblock 0-1 64655 NULL
111019 +regmap_read_debugfs_64658 regmap_read_debugfs 5 64658 NULL
111020 +ocfs2_read_xattr_block_64661 ocfs2_read_xattr_block 0 64661 NULL nohasharray
111021 +tlbflush_read_file_64661 tlbflush_read_file 3 64661 &ocfs2_read_xattr_block_64661 nohasharray
111022 +pool_create_64661 pool_create 3 64661 &tlbflush_read_file_64661
111023 +efx_tsoh_get_buffer_64664 efx_tsoh_get_buffer 3 64664 NULL
111024 +rx_rx_out_of_mpdu_nodes_read_64668 rx_rx_out_of_mpdu_nodes_read 3 64668 NULL
111025 +nr_free_zone_pages_64680 nr_free_zone_pages 0 64680 NULL
111026 +sec_bulk_write_64691 sec_bulk_write 2-3 64691 NULL nohasharray
111027 +mremap_to_64691 mremap_to 0-3 64691 &sec_bulk_write_64691
111028 +pfn_to_hpa_64703 pfn_to_hpa 0-1 64703 NULL
111029 +ip_select_ident_more_64707 ip_select_ident_more 4 64707 NULL
111030 +snd_pcm_oss_capture_position_fixup_64713 snd_pcm_oss_capture_position_fixup 0 64713 NULL
111031 +dapm_bias_read_file_64715 dapm_bias_read_file 3 64715 NULL
111032 +atomic_add_return_64720 atomic_add_return 0-1 64720 NULL
111033 +i2400m_msg_to_dev_64722 i2400m_msg_to_dev 3 64722 NULL
111034 +AscGetChipVersion_64737 AscGetChipVersion 0 64737 NULL
111035 +squashfs_read_inode_lookup_table_64739 squashfs_read_inode_lookup_table 4 64739 NULL
111036 +perf_swevent_event_64745 perf_swevent_event 2 64745 NULL
111037 +bio_map_kern_64751 bio_map_kern 3 64751 NULL
111038 +rt2x00debug_write_csr_64753 rt2x00debug_write_csr 3 64753 NULL
111039 +message_for_md_64777 message_for_md 5 64777 NULL
111040 +isr_low_rssi_read_64789 isr_low_rssi_read 3 64789 NULL
111041 +regmap_reg_ranges_read_file_64798 regmap_reg_ranges_read_file 3 64798 NULL
111042 +nfsctl_transaction_write_64800 nfsctl_transaction_write 3 64800 NULL
111043 +rfkill_fop_write_64808 rfkill_fop_write 3 64808 NULL
111044 +proc_projid_map_write_64810 proc_projid_map_write 3 64810 NULL
111045 +megaraid_change_queue_depth_64815 megaraid_change_queue_depth 2 64815 NULL
111046 +ecryptfs_send_miscdev_64816 ecryptfs_send_miscdev 2 64816 NULL
111047 +vaddr_get_pfn_64818 vaddr_get_pfn 1 64818 NULL
111048 +gfn_to_page_64826 gfn_to_page 2 64826 NULL
111049 +do_kimage_alloc_64827 do_kimage_alloc 3 64827 NULL
111050 +altera_set_dr_pre_64862 altera_set_dr_pre 2 64862 NULL
111051 +gfn_to_pfn_64870 gfn_to_pfn 2 64870 NULL
111052 +lprocfs_write_u64_helper_64880 lprocfs_write_u64_helper 2 64880 NULL
111053 +ffs_epfile_io_64886 ffs_epfile_io 3 64886 NULL
111054 +mk_pid_64894 mk_pid 0-3 64894 NULL
111055 +ieee80211_if_read_ave_beacon_64924 ieee80211_if_read_ave_beacon 3 64924 NULL
111056 +usb_reset_and_verify_device_64933 usb_reset_and_verify_device 0 64933 NULL
111057 +ubifs_wbuf_write_nolock_64946 ubifs_wbuf_write_nolock 3 64946 NULL
111058 +ip_options_get_from_user_64958 ip_options_get_from_user 4 64958 NULL
111059 +acpi_os_install_interrupt_handler_64968 acpi_os_install_interrupt_handler 1 64968 NULL
111060 +traceprobe_probes_write_64969 traceprobe_probes_write 3 64969 NULL
111061 +suspend_dtim_interval_read_64971 suspend_dtim_interval_read 3 64971 NULL
111062 +ext2_group_first_block_no_64972 ext2_group_first_block_no 0-2 64972 NULL
111063 +crypto_ahash_digestsize_65014 crypto_ahash_digestsize 0 65014 NULL
111064 +insert_dent_65034 insert_dent 7 65034 NULL
111065 +snd_hda_get_pin_label_65035 snd_hda_get_pin_label 5 65035 NULL
111066 +ext4_ind_trans_blocks_65053 ext4_ind_trans_blocks 0-2 65053 NULL
111067 +pcibios_enable_device_65059 pcibios_enable_device 0 65059 NULL
111068 +make_idx_node_65068 make_idx_node 0 65068 NULL
111069 +count_run_65072 count_run 0-2-4-5 65072 NULL
111070 +__alloc_bootmem_node_high_65076 __alloc_bootmem_node_high 2 65076 NULL
111071 +ocfs2_truncate_cluster_pages_65086 ocfs2_truncate_cluster_pages 2 65086 NULL
111072 +send_create_inode_65090 send_create_inode 0 65090 NULL nohasharray
111073 +ath9k_dump_mci_btcoex_65090 ath9k_dump_mci_btcoex 0 65090 &send_create_inode_65090
111074 +uasp_alloc_cmd_65097 uasp_alloc_cmd 0 65097 NULL
111075 +__ext3_journal_dirty_metadata_65103 __ext3_journal_dirty_metadata 0 65103 NULL
111076 +generic_ocp_write_65107 generic_ocp_write 4 65107 NULL
111077 +kswapd_shrink_zone_65174 kswapd_shrink_zone 4 65174 NULL
111078 +i2c_smbus_xfer_emulated_65183 i2c_smbus_xfer_emulated 0 65183 NULL
111079 +btrfs_run_delayed_items_nr_65204 btrfs_run_delayed_items_nr 0 65204 NULL
111080 +rx_rx_done_read_65217 rx_rx_done_read 3 65217 NULL
111081 +print_endpoint_stat_65232 print_endpoint_stat 3-4-0 65232 NULL
111082 +journal_get_write_access_65243 journal_get_write_access 0 65243 NULL
111083 +whci_n_caps_65247 whci_n_caps 0 65247 NULL
111084 +kmem_zalloc_greedy_65268 kmem_zalloc_greedy 3-2 65268 NULL
111085 +kmalloc_parameter_65279 kmalloc_parameter 1 65279 NULL
111086 +compat_core_sys_select_65285 compat_core_sys_select 1 65285 NULL
111087 +get_unaligned_le16_65293 get_unaligned_le16 0 65293 NULL
111088 +mpi_set_buffer_65294 mpi_set_buffer 3 65294 NULL
111089 +redirected_tty_write_65297 redirected_tty_write 3 65297 NULL
111090 +get_var_len_65304 get_var_len 0 65304 NULL
111091 +unpack_array_65318 unpack_array 0 65318 NULL
111092 +pci_vpd_find_tag_65325 pci_vpd_find_tag 0-2 65325 NULL
111093 +dccp_setsockopt_service_65336 dccp_setsockopt_service 4 65336 NULL
111094 +init_list_set_65351 init_list_set 3-2 65351 NULL
111095 +dma_rx_requested_read_65354 dma_rx_requested_read 3 65354 NULL
111096 +batadv_tt_save_orig_buffer_65361 batadv_tt_save_orig_buffer 4 65361 NULL
111097 +alloc_cpu_rmap_65363 alloc_cpu_rmap 1 65363 NULL
111098 +__ext4_new_inode_65370 __ext4_new_inode 5 65370 NULL
111099 +SyS_writev_65372 SyS_writev 3 65372 NULL
111100 +mi_set_context_65395 mi_set_context 0 65395 NULL
111101 +__alloc_bootmem_nopanic_65397 __alloc_bootmem_nopanic 1 65397 NULL
111102 +trace_seq_to_user_65398 trace_seq_to_user 3 65398 NULL
111103 +mtd_get_device_size_65400 mtd_get_device_size 0 65400 NULL
111104 +__read_vmcore_65402 __read_vmcore 2 65402 NULL
111105 +usb_ep_enable_65405 usb_ep_enable 0 65405 NULL
111106 +ocfs2_write_begin_nolock_65410 ocfs2_write_begin_nolock 4-3 65410 NULL
111107 +drm_calloc_large_65421 drm_calloc_large 2-1 65421 NULL
111108 +device_add_groups_65423 device_add_groups 0 65423 NULL
111109 +xpc_kzalloc_cacheline_aligned_65433 xpc_kzalloc_cacheline_aligned 1 65433 NULL
111110 +vmalloc_to_pfn_65437 vmalloc_to_pfn 0 65437 NULL
111111 +usb_alloc_coherent_65444 usb_alloc_coherent 2 65444 NULL
111112 +il_dbgfs_wd_timeout_write_65464 il_dbgfs_wd_timeout_write 3 65464 NULL
111113 +ext4_es_zeroout_65465 ext4_es_zeroout 0 65465 NULL
111114 +clear_user_65470 clear_user 2 65470 NULL
111115 +__pcibus_to_node_65489 __pcibus_to_node 0 65489 NULL nohasharray
111116 +dpcm_state_read_file_65489 dpcm_state_read_file 3 65489 &__pcibus_to_node_65489
111117 +lookup_inline_extent_backref_65493 lookup_inline_extent_backref 9-0 65493 NULL
111118 +qib_create_ctxtdata_65497 qib_create_ctxtdata 3 65497 NULL
111119 +nvme_trans_standard_inquiry_page_65526 nvme_trans_standard_inquiry_page 4 65526 NULL
111120 diff --git a/tools/gcc/size_overflow_plugin.c b/tools/gcc/size_overflow_plugin.c
111121 new file mode 100644
111122 index 0000000..5515dcb
111123 --- /dev/null
111124 +++ b/tools/gcc/size_overflow_plugin.c
111125 @@ -0,0 +1,3927 @@
111126 +/*
111127 + * Copyright 2011, 2012, 2013 by Emese Revfy <re.emese@gmail.com>
111128 + * Licensed under the GPL v2, or (at your option) v3
111129 + *
111130 + * Homepage:
111131 + * http://www.grsecurity.net/~ephox/overflow_plugin/
111132 + *
111133 + * Documentation:
111134 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
111135 + *
111136 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
111137 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
111138 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
111139 + *
111140 + * Usage:
111141 + * $ gcc -I`gcc -print-file-name=plugin`/include/c-family -I`gcc -print-file-name=plugin`/include -fPIC -shared -O2 -ggdb -Wall -W -o size_overflow_plugin.so size_overflow_plugin.c
111142 + * $ gcc -fplugin=size_overflow_plugin.so test.c -O2
111143 + */
111144 +
111145 +#include "gcc-plugin.h"
111146 +#include "config.h"
111147 +#include "system.h"
111148 +#include "coretypes.h"
111149 +#include "tree.h"
111150 +#include "tree-pass.h"
111151 +#include "intl.h"
111152 +#include "plugin-version.h"
111153 +#include "tm.h"
111154 +#include "toplev.h"
111155 +#include "function.h"
111156 +#include "tree-flow.h"
111157 +#include "plugin.h"
111158 +#include "gimple.h"
111159 +#include "diagnostic.h"
111160 +#include "cfgloop.h"
111161 +
111162 +#if BUILDING_GCC_VERSION >= 4008
111163 +#define TODO_dump_func 0
111164 +#define TODO_dump_cgraph 0
111165 +#endif
111166 +
111167 +#define __unused __attribute__((__unused__))
111168 +#define ASM_NAME(node) IDENTIFIER_POINTER(DECL_ASSEMBLER_NAME(node))
111169 +#define NAME(node) IDENTIFIER_POINTER(DECL_NAME(node))
111170 +#define NAME_LEN(node) IDENTIFIER_LENGTH(DECL_NAME(node))
111171 +#define BEFORE_STMT true
111172 +#define AFTER_STMT false
111173 +#define CREATE_NEW_VAR NULL_TREE
111174 +#define CODES_LIMIT 32
111175 +#define MAX_PARAM 31
111176 +#define VEC_LEN 128
111177 +#define MY_STMT GF_PLF_1
111178 +#define NO_CAST_CHECK GF_PLF_2
111179 +#define RET_CHECK NULL_TREE
111180 +#define CANNOT_FIND_ARG 32
111181 +#define WRONG_NODE 32
111182 +#define NOT_INTENTIONAL_ASM NULL
111183 +#define MIN_CHECK true
111184 +#define MAX_CHECK false
111185 +
111186 +#define TURN_OFF_ASM_STR "# size_overflow MARK_TURN_OFF\n\t"
111187 +#define YES_ASM_STR "# size_overflow MARK_YES\n\t"
111188 +#define OK_ASM_STR "# size_overflow\n\t"
111189 +
111190 +#if BUILDING_GCC_VERSION == 4005
111191 +#define DECL_CHAIN(NODE) (TREE_CHAIN(DECL_MINIMAL_CHECK(NODE)))
111192 +#endif
111193 +
111194 +struct size_overflow_hash {
111195 + const struct size_overflow_hash * const next;
111196 + const char * const name;
111197 + const unsigned int param;
111198 +};
111199 +
111200 +#include "size_overflow_hash.h"
111201 +
111202 +enum mark {
111203 + MARK_NO, MARK_YES, MARK_NOT_INTENTIONAL, MARK_TURN_OFF
111204 +};
111205 +
111206 +static unsigned int call_count;
111207 +
111208 +struct visited {
111209 + struct visited *next;
111210 + const_tree fndecl;
111211 + unsigned int num;
111212 + const_gimple first_stmt;
111213 +};
111214 +
111215 +struct next_cgraph_node {
111216 + struct next_cgraph_node *next;
111217 + struct cgraph_node *current_function;
111218 + tree callee_fndecl;
111219 + unsigned int num;
111220 +};
111221 +
111222 +struct interesting_node {
111223 + struct interesting_node *next;
111224 + gimple first_stmt;
111225 + const_tree fndecl;
111226 + tree node;
111227 +#if BUILDING_GCC_VERSION <= 4007
111228 + VEC(tree, gc) *last_nodes;
111229 +#else
111230 + vec<tree, va_gc> *last_nodes;
111231 +#endif
111232 + unsigned int num;
111233 + enum mark intentional_attr_decl;
111234 + enum mark intentional_attr_cur_fndecl;
111235 + gimple intentional_mark_from_gimple;
111236 +};
111237 +
111238 +int plugin_is_GPL_compatible;
111239 +void debug_gimple_stmt(gimple gs);
111240 +
111241 +static tree report_size_overflow_decl;
111242 +static const_tree const_char_ptr_type_node;
111243 +
111244 +static tree expand(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree lhs);
111245 +static void set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree lhs);
111246 +static void walk_use_def(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs);
111247 +static enum mark search_intentional(struct pointer_set_t *visited, const_tree lhs);
111248 +static void search_size_overflow_attribute(struct pointer_set_t *visited, tree lhs);
111249 +
111250 +static void check_size_overflow(struct cgraph_node *caller_node, gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before);
111251 +static tree get_size_overflow_type(gimple stmt, const_tree node);
111252 +static tree dup_assign(struct pointer_set_t *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3);
111253 +
111254 +static struct plugin_info size_overflow_plugin_info = {
111255 + .version = "20131214beta",
111256 + .help = "no-size-overflow\tturn off size overflow checking\n",
111257 +};
111258 +
111259 +static tree handle_size_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs)
111260 +{
111261 + unsigned int arg_count;
111262 + enum tree_code code = TREE_CODE(*node);
111263 +
111264 + switch (code) {
111265 + case FUNCTION_DECL:
111266 + arg_count = type_num_arguments(TREE_TYPE(*node));
111267 + break;
111268 + case FUNCTION_TYPE:
111269 + case METHOD_TYPE:
111270 + arg_count = type_num_arguments(*node);
111271 + break;
111272 + default:
111273 + *no_add_attrs = true;
111274 + error("%s: %qE attribute only applies to functions", __func__, name);
111275 + return NULL_TREE;
111276 + }
111277 +
111278 + for (; args; args = TREE_CHAIN(args)) {
111279 + tree position = TREE_VALUE(args);
111280 + if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_LOW(position) > arg_count ) {
111281 + error("%s: parameter %u is outside range.", __func__, (unsigned int)TREE_INT_CST_LOW(position));
111282 + *no_add_attrs = true;
111283 + }
111284 + }
111285 + return NULL_TREE;
111286 +}
111287 +
111288 +static tree handle_intentional_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs)
111289 +{
111290 + unsigned int arg_count;
111291 + enum tree_code code = TREE_CODE(*node);
111292 +
111293 + switch (code) {
111294 + case FUNCTION_DECL:
111295 + arg_count = type_num_arguments(TREE_TYPE(*node));
111296 + break;
111297 + case FUNCTION_TYPE:
111298 + case METHOD_TYPE:
111299 + arg_count = type_num_arguments(*node);
111300 + break;
111301 + case FIELD_DECL:
111302 + return NULL_TREE;
111303 + default:
111304 + *no_add_attrs = true;
111305 + error("%qE attribute only applies to functions", name);
111306 + return NULL_TREE;
111307 + }
111308 +
111309 + if (TREE_INT_CST_HIGH(TREE_VALUE(args)) != 0)
111310 + return NULL_TREE;
111311 +
111312 + for (; args; args = TREE_CHAIN(args)) {
111313 + tree position = TREE_VALUE(args);
111314 + if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_LOW(position) > arg_count ) {
111315 + error("%s: parameter %u is outside range.", __func__, (unsigned int)TREE_INT_CST_LOW(position));
111316 + *no_add_attrs = true;
111317 + }
111318 + }
111319 + return NULL_TREE;
111320 +}
111321 +
111322 +static struct attribute_spec size_overflow_attr = {
111323 + .name = "size_overflow",
111324 + .min_length = 1,
111325 + .max_length = -1,
111326 + .decl_required = true,
111327 + .type_required = false,
111328 + .function_type_required = false,
111329 + .handler = handle_size_overflow_attribute,
111330 +#if BUILDING_GCC_VERSION >= 4007
111331 + .affects_type_identity = false
111332 +#endif
111333 +};
111334 +
111335 +static struct attribute_spec intentional_overflow_attr = {
111336 + .name = "intentional_overflow",
111337 + .min_length = 1,
111338 + .max_length = -1,
111339 + .decl_required = true,
111340 + .type_required = false,
111341 + .function_type_required = false,
111342 + .handler = handle_intentional_overflow_attribute,
111343 +#if BUILDING_GCC_VERSION >= 4007
111344 + .affects_type_identity = false
111345 +#endif
111346 +};
111347 +
111348 +static void register_attributes(void __unused *event_data, void __unused *data)
111349 +{
111350 + register_attribute(&size_overflow_attr);
111351 + register_attribute(&intentional_overflow_attr);
111352 +}
111353 +
111354 +static bool is_bool(const_tree node)
111355 +{
111356 + const_tree type;
111357 +
111358 + if (node == NULL_TREE)
111359 + return false;
111360 +
111361 + type = TREE_TYPE(node);
111362 + if (!INTEGRAL_TYPE_P(type))
111363 + return false;
111364 + if (TREE_CODE(type) == BOOLEAN_TYPE)
111365 + return true;
111366 + if (TYPE_PRECISION(type) == 1)
111367 + return true;
111368 + return false;
111369 +}
111370 +
111371 +static bool skip_types(const_tree var)
111372 +{
111373 + tree type;
111374 + enum tree_code code;
111375 +
111376 + if (is_gimple_constant(var))
111377 + return true;
111378 +
111379 + switch (TREE_CODE(var)) {
111380 + case ADDR_EXPR:
111381 +#if BUILDING_GCC_VERSION >= 4006
111382 + case MEM_REF:
111383 +#endif
111384 + case ARRAY_REF:
111385 + case BIT_FIELD_REF:
111386 + case INDIRECT_REF:
111387 + case TARGET_MEM_REF:
111388 + case COMPONENT_REF:
111389 + case VAR_DECL:
111390 + case VIEW_CONVERT_EXPR:
111391 + return true;
111392 + default:
111393 + break;
111394 + }
111395 +
111396 + code = TREE_CODE(var);
111397 + gcc_assert(code == SSA_NAME || code == PARM_DECL);
111398 +
111399 + type = TREE_TYPE(var);
111400 + switch (TREE_CODE(type)) {
111401 + case INTEGER_TYPE:
111402 + case ENUMERAL_TYPE:
111403 + return false;
111404 + case BOOLEAN_TYPE:
111405 + return is_bool(var);
111406 + default:
111407 + return true;
111408 + }
111409 +}
111410 +
111411 +static inline gimple get_def_stmt(const_tree node)
111412 +{
111413 + gcc_assert(node != NULL_TREE);
111414 +
111415 + if (skip_types(node))
111416 + return NULL;
111417 +
111418 + if (TREE_CODE(node) != SSA_NAME)
111419 + return NULL;
111420 + return SSA_NAME_DEF_STMT(node);
111421 +}
111422 +
111423 +static unsigned char get_tree_code(const_tree type)
111424 +{
111425 + switch (TREE_CODE(type)) {
111426 + case ARRAY_TYPE:
111427 + return 0;
111428 + case BOOLEAN_TYPE:
111429 + return 1;
111430 + case ENUMERAL_TYPE:
111431 + return 2;
111432 + case FUNCTION_TYPE:
111433 + return 3;
111434 + case INTEGER_TYPE:
111435 + return 4;
111436 + case POINTER_TYPE:
111437 + return 5;
111438 + case RECORD_TYPE:
111439 + return 6;
111440 + case UNION_TYPE:
111441 + return 7;
111442 + case VOID_TYPE:
111443 + return 8;
111444 + case REAL_TYPE:
111445 + return 9;
111446 + case VECTOR_TYPE:
111447 + return 10;
111448 + case REFERENCE_TYPE:
111449 + return 11;
111450 + case OFFSET_TYPE:
111451 + return 12;
111452 + case COMPLEX_TYPE:
111453 + return 13;
111454 + default:
111455 + debug_tree((tree)type);
111456 + gcc_unreachable();
111457 + }
111458 +}
111459 +
111460 +struct function_hash {
111461 + size_t tree_codes_len;
111462 + unsigned char tree_codes[CODES_LIMIT];
111463 + tree fndecl;
111464 + unsigned int hash;
111465 +};
111466 +
111467 +// http://www.team5150.com/~andrew/noncryptohashzoo2~/CrapWow.html
111468 +static unsigned int CrapWow(const char *key, unsigned int len, unsigned int seed)
111469 +{
111470 +#define cwfold( a, b, lo, hi ) { p = (unsigned int)(a) * (unsigned long long)(b); lo ^= (unsigned int)p; hi ^= (unsigned int)(p >> 32); }
111471 +#define cwmixa( in ) { cwfold( in, m, k, h ); }
111472 +#define cwmixb( in ) { cwfold( in, n, h, k ); }
111473 +
111474 + unsigned int m = 0x57559429;
111475 + unsigned int n = 0x5052acdb;
111476 + const unsigned int *key4 = (const unsigned int *)key;
111477 + unsigned int h = len;
111478 + unsigned int k = len + seed + n;
111479 + unsigned long long p;
111480 +
111481 + while (len >= 8) {
111482 + cwmixb(key4[0]) cwmixa(key4[1]) key4 += 2;
111483 + len -= 8;
111484 + }
111485 + if (len >= 4) {
111486 + cwmixb(key4[0]) key4 += 1;
111487 + len -= 4;
111488 + }
111489 + if (len)
111490 + cwmixa(key4[0] & ((1 << (len * 8)) - 1 ));
111491 + cwmixb(h ^ (k + n));
111492 + return k ^ h;
111493 +
111494 +#undef cwfold
111495 +#undef cwmixa
111496 +#undef cwmixb
111497 +}
111498 +
111499 +static void set_hash(const char *fn_name, struct function_hash *fn_hash_data)
111500 +{
111501 + unsigned int fn, codes, seed = 0;
111502 +
111503 + fn = CrapWow(fn_name, strlen(fn_name), seed) & 0xffff;
111504 + codes = CrapWow((const char*)fn_hash_data->tree_codes, fn_hash_data->tree_codes_len, seed) & 0xffff;
111505 +
111506 + fn_hash_data->hash = fn ^ codes;
111507 +}
111508 +
111509 +static void set_node_codes(const_tree type, struct function_hash *fn_hash_data)
111510 +{
111511 + gcc_assert(type != NULL_TREE);
111512 + gcc_assert(TREE_CODE_CLASS(TREE_CODE(type)) == tcc_type);
111513 +
111514 + while (type && fn_hash_data->tree_codes_len < CODES_LIMIT) {
111515 + fn_hash_data->tree_codes[fn_hash_data->tree_codes_len] = get_tree_code(type);
111516 + fn_hash_data->tree_codes_len++;
111517 + type = TREE_TYPE(type);
111518 + }
111519 +}
111520 +
111521 +static void set_result_codes(const_tree node, struct function_hash *fn_hash_data)
111522 +{
111523 + const_tree result;
111524 +
111525 + gcc_assert(node != NULL_TREE);
111526 +
111527 + if (DECL_P(node)) {
111528 + result = DECL_RESULT(node);
111529 + if (result != NULL_TREE)
111530 + return set_node_codes(TREE_TYPE(result), fn_hash_data);
111531 + return set_result_codes(TREE_TYPE(node), fn_hash_data);
111532 + }
111533 +
111534 + gcc_assert(TYPE_P(node));
111535 +
111536 + if (TREE_CODE(node) == FUNCTION_TYPE)
111537 + return set_result_codes(TREE_TYPE(node), fn_hash_data);
111538 +
111539 + return set_node_codes(node, fn_hash_data);
111540 +}
111541 +
111542 +static void set_function_codes(struct function_hash *fn_hash_data)
111543 +{
111544 + const_tree arg, type = TREE_TYPE(fn_hash_data->fndecl);
111545 + enum tree_code code = TREE_CODE(type);
111546 +
111547 + gcc_assert(code == FUNCTION_TYPE || code == METHOD_TYPE);
111548 +
111549 + set_result_codes(fn_hash_data->fndecl, fn_hash_data);
111550 +
111551 + for (arg = TYPE_ARG_TYPES(type); arg != NULL_TREE && fn_hash_data->tree_codes_len < CODES_LIMIT; arg = TREE_CHAIN(arg))
111552 + set_node_codes(TREE_VALUE(arg), fn_hash_data);
111553 +}
111554 +
111555 +static const struct size_overflow_hash *get_function_hash(tree fndecl)
111556 +{
111557 + const struct size_overflow_hash *entry;
111558 + struct function_hash fn_hash_data;
111559 + const char *func_name;
111560 +
111561 + // skip builtins __builtin_constant_p
111562 + if (DECL_BUILT_IN(fndecl))
111563 + return NULL;
111564 +
111565 + fn_hash_data.fndecl = fndecl;
111566 + fn_hash_data.tree_codes_len = 0;
111567 +
111568 + set_function_codes(&fn_hash_data);
111569 + gcc_assert(fn_hash_data.tree_codes_len != 0);
111570 +
111571 + func_name = ASM_NAME(fn_hash_data.fndecl);
111572 + set_hash(func_name, &fn_hash_data);
111573 +
111574 + entry = size_overflow_hash[fn_hash_data.hash];
111575 +
111576 + while (entry) {
111577 + if (!strcmp(entry->name, func_name))
111578 + return entry;
111579 + entry = entry->next;
111580 + }
111581 + return NULL;
111582 +}
111583 +
111584 +static void print_missing_msg(tree func, unsigned int argnum)
111585 +{
111586 + location_t loc;
111587 + const char *curfunc;
111588 + struct function_hash fn_hash_data;
111589 +
111590 + fn_hash_data.fndecl = DECL_ORIGIN(func);
111591 + fn_hash_data.tree_codes_len = 0;
111592 +
111593 + loc = DECL_SOURCE_LOCATION(fn_hash_data.fndecl);
111594 + curfunc = ASM_NAME(fn_hash_data.fndecl);
111595 +
111596 + set_function_codes(&fn_hash_data);
111597 + set_hash(curfunc, &fn_hash_data);
111598 +
111599 + inform(loc, "Function %s is missing from the size_overflow hash table +%s+%u+%u+", curfunc, curfunc, argnum, fn_hash_data.hash);
111600 +}
111601 +
111602 +static unsigned int find_arg_number_tree(const_tree arg, const_tree func)
111603 +{
111604 + tree var;
111605 + unsigned int argnum = 1;
111606 +
111607 + if (TREE_CODE(arg) == SSA_NAME)
111608 + arg = SSA_NAME_VAR(arg);
111609 +
111610 + for (var = DECL_ARGUMENTS(func); var; var = TREE_CHAIN(var), argnum++) {
111611 + if (!operand_equal_p(arg, var, 0) && strcmp(NAME(var), NAME(arg)))
111612 + continue;
111613 + if (!skip_types(var))
111614 + return argnum;
111615 + }
111616 +
111617 + return CANNOT_FIND_ARG;
111618 +}
111619 +
111620 +static tree create_new_var(tree type)
111621 +{
111622 + tree new_var = create_tmp_var(type, "cicus");
111623 +
111624 +#if BUILDING_GCC_VERSION <= 4007
111625 + add_referenced_var(new_var);
111626 +#endif
111627 + return new_var;
111628 +}
111629 +
111630 +static gimple create_binary_assign(enum tree_code code, gimple stmt, tree rhs1, tree rhs2)
111631 +{
111632 + gimple assign;
111633 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
111634 + tree type = TREE_TYPE(rhs1);
111635 + tree lhs = create_new_var(type);
111636 +
111637 + gcc_assert(types_compatible_p(type, TREE_TYPE(rhs2)));
111638 + assign = gimple_build_assign_with_ops(code, lhs, rhs1, rhs2);
111639 + gimple_assign_set_lhs(assign, make_ssa_name(lhs, assign));
111640 +
111641 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
111642 + update_stmt(assign);
111643 + gimple_set_plf(assign, MY_STMT, true);
111644 + return assign;
111645 +}
111646 +
111647 +static tree cast_a_tree(tree type, tree var)
111648 +{
111649 + gcc_assert(type != NULL_TREE);
111650 + gcc_assert(var != NULL_TREE);
111651 + gcc_assert(fold_convertible_p(type, var));
111652 +
111653 + return fold_convert(type, var);
111654 +}
111655 +
111656 +static tree get_lhs(const_gimple stmt)
111657 +{
111658 + switch (gimple_code(stmt)) {
111659 + case GIMPLE_ASSIGN:
111660 + case GIMPLE_CALL:
111661 + return gimple_get_lhs(stmt);
111662 + case GIMPLE_PHI:
111663 + return gimple_phi_result(stmt);
111664 + default:
111665 + return NULL_TREE;
111666 + }
111667 +}
111668 +
111669 +static bool skip_cast(tree dst_type, const_tree rhs, bool force)
111670 +{
111671 + const_gimple def_stmt = get_def_stmt(rhs);
111672 +
111673 + if (force)
111674 + return false;
111675 +
111676 + if (is_gimple_constant(rhs))
111677 + return false;
111678 +
111679 + if (!def_stmt || gimple_code(def_stmt) == GIMPLE_NOP)
111680 + return false;
111681 +
111682 + if (!types_compatible_p(dst_type, TREE_TYPE(rhs)))
111683 + return false;
111684 +
111685 + // DI type can be on 32 bit (from create_assign) but overflow type stays DI
111686 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode))
111687 + return false;
111688 +
111689 + return true;
111690 +}
111691 +
111692 +static gimple build_cast_stmt(tree dst_type, tree rhs, tree lhs, gimple_stmt_iterator *gsi, bool before, bool force)
111693 +{
111694 + gimple assign, def_stmt;
111695 +
111696 + gcc_assert(dst_type != NULL_TREE && rhs != NULL_TREE);
111697 + if (gsi_end_p(*gsi) && before == AFTER_STMT)
111698 + gcc_unreachable();
111699 +
111700 + def_stmt = get_def_stmt(rhs);
111701 + if (def_stmt && gimple_code(def_stmt) != GIMPLE_NOP && skip_cast(dst_type, rhs, force) && gimple_plf(def_stmt, MY_STMT))
111702 + return def_stmt;
111703 +
111704 + if (lhs == CREATE_NEW_VAR)
111705 + lhs = create_new_var(dst_type);
111706 +
111707 + assign = gimple_build_assign(lhs, cast_a_tree(dst_type, rhs));
111708 +
111709 + if (!gsi_end_p(*gsi)) {
111710 + location_t loc = gimple_location(gsi_stmt(*gsi));
111711 + gimple_set_location(assign, loc);
111712 + }
111713 +
111714 + gimple_assign_set_lhs(assign, make_ssa_name(lhs, assign));
111715 +
111716 + if (before)
111717 + gsi_insert_before(gsi, assign, GSI_NEW_STMT);
111718 + else
111719 + gsi_insert_after(gsi, assign, GSI_NEW_STMT);
111720 + update_stmt(assign);
111721 + return assign;
111722 +}
111723 +
111724 +static tree cast_to_new_size_overflow_type(gimple stmt, tree rhs, tree size_overflow_type, bool before)
111725 +{
111726 + gimple_stmt_iterator gsi;
111727 + tree lhs;
111728 + gimple new_stmt;
111729 +
111730 + if (rhs == NULL_TREE)
111731 + return NULL_TREE;
111732 +
111733 + gsi = gsi_for_stmt(stmt);
111734 + new_stmt = build_cast_stmt(size_overflow_type, rhs, CREATE_NEW_VAR, &gsi, before, false);
111735 + gimple_set_plf(new_stmt, MY_STMT, true);
111736 +
111737 + lhs = get_lhs(new_stmt);
111738 + gcc_assert(lhs != NULL_TREE);
111739 + return lhs;
111740 +}
111741 +
111742 +static tree cast_to_TI_type(gimple stmt, tree node)
111743 +{
111744 + gimple_stmt_iterator gsi;
111745 + gimple cast_stmt;
111746 + tree type = TREE_TYPE(node);
111747 +
111748 + if (types_compatible_p(type, intTI_type_node))
111749 + return node;
111750 +
111751 + gsi = gsi_for_stmt(stmt);
111752 + cast_stmt = build_cast_stmt(intTI_type_node, node, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
111753 + gimple_set_plf(cast_stmt, MY_STMT, true);
111754 + return gimple_assign_lhs(cast_stmt);
111755 +}
111756 +
111757 +static tree create_assign(struct pointer_set_t *visited, gimple oldstmt, tree rhs1, bool before)
111758 +{
111759 + tree lhs, new_lhs;
111760 + gimple_stmt_iterator gsi;
111761 +
111762 + if (rhs1 == NULL_TREE) {
111763 + debug_gimple_stmt(oldstmt);
111764 + error("%s: rhs1 is NULL_TREE", __func__);
111765 + gcc_unreachable();
111766 + }
111767 +
111768 + switch (gimple_code(oldstmt)) {
111769 + case GIMPLE_ASM:
111770 + lhs = rhs1;
111771 + break;
111772 + case GIMPLE_CALL:
111773 + case GIMPLE_ASSIGN:
111774 + lhs = gimple_get_lhs(oldstmt);
111775 + break;
111776 + default:
111777 + debug_gimple_stmt(oldstmt);
111778 + gcc_unreachable();
111779 + }
111780 +
111781 + gsi = gsi_for_stmt(oldstmt);
111782 + pointer_set_insert(visited, oldstmt);
111783 + if (lookup_stmt_eh_lp(oldstmt) != 0) {
111784 + basic_block next_bb, cur_bb;
111785 + const_edge e;
111786 +
111787 + gcc_assert(before == false);
111788 + gcc_assert(stmt_can_throw_internal(oldstmt));
111789 + gcc_assert(gimple_code(oldstmt) == GIMPLE_CALL);
111790 + gcc_assert(!gsi_end_p(gsi));
111791 +
111792 + cur_bb = gimple_bb(oldstmt);
111793 + next_bb = cur_bb->next_bb;
111794 + e = find_edge(cur_bb, next_bb);
111795 + gcc_assert(e != NULL);
111796 + gcc_assert(e->flags & EDGE_FALLTHRU);
111797 +
111798 + gsi = gsi_after_labels(next_bb);
111799 + gcc_assert(!gsi_end_p(gsi));
111800 +
111801 + before = true;
111802 + oldstmt = gsi_stmt(gsi);
111803 + }
111804 +
111805 + new_lhs = cast_to_new_size_overflow_type(oldstmt, rhs1, get_size_overflow_type(oldstmt, lhs), before);
111806 + return new_lhs;
111807 +}
111808 +
111809 +static tree dup_assign(struct pointer_set_t *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3)
111810 +{
111811 + gimple stmt;
111812 + gimple_stmt_iterator gsi;
111813 + tree size_overflow_type, new_var, lhs = gimple_assign_lhs(oldstmt);
111814 +
111815 + if (gimple_plf(oldstmt, MY_STMT))
111816 + return lhs;
111817 +
111818 + if (gimple_num_ops(oldstmt) != 4 && rhs1 == NULL_TREE) {
111819 + rhs1 = gimple_assign_rhs1(oldstmt);
111820 + rhs1 = create_assign(visited, oldstmt, rhs1, BEFORE_STMT);
111821 + }
111822 + if (gimple_num_ops(oldstmt) == 3 && rhs2 == NULL_TREE) {
111823 + rhs2 = gimple_assign_rhs2(oldstmt);
111824 + rhs2 = create_assign(visited, oldstmt, rhs2, BEFORE_STMT);
111825 + }
111826 +
111827 + stmt = gimple_copy(oldstmt);
111828 + gimple_set_location(stmt, gimple_location(oldstmt));
111829 + gimple_set_plf(stmt, MY_STMT, true);
111830 +
111831 + if (gimple_assign_rhs_code(oldstmt) == WIDEN_MULT_EXPR)
111832 + gimple_assign_set_rhs_code(stmt, MULT_EXPR);
111833 +
111834 + size_overflow_type = get_size_overflow_type(oldstmt, node);
111835 +
111836 + new_var = create_new_var(size_overflow_type);
111837 + new_var = make_ssa_name(new_var, stmt);
111838 + gimple_assign_set_lhs(stmt, new_var);
111839 +
111840 + if (rhs1 != NULL_TREE)
111841 + gimple_assign_set_rhs1(stmt, rhs1);
111842 +
111843 + if (rhs2 != NULL_TREE)
111844 + gimple_assign_set_rhs2(stmt, rhs2);
111845 +#if BUILDING_GCC_VERSION >= 4007
111846 + if (rhs3 != NULL_TREE)
111847 + gimple_assign_set_rhs3(stmt, rhs3);
111848 +#endif
111849 + gimple_set_vuse(stmt, gimple_vuse(oldstmt));
111850 + gimple_set_vdef(stmt, gimple_vdef(oldstmt));
111851 +
111852 + gsi = gsi_for_stmt(oldstmt);
111853 + gsi_insert_after(&gsi, stmt, GSI_SAME_STMT);
111854 + update_stmt(stmt);
111855 + pointer_set_insert(visited, oldstmt);
111856 + return gimple_assign_lhs(stmt);
111857 +}
111858 +
111859 +static tree cast_parm_decl(tree phi_ssa_name, tree arg, tree size_overflow_type, basic_block bb)
111860 +{
111861 + gimple assign;
111862 + gimple_stmt_iterator gsi;
111863 + basic_block first_bb;
111864 +
111865 + gcc_assert(SSA_NAME_IS_DEFAULT_DEF(arg));
111866 +
111867 + if (bb->index == 0) {
111868 + first_bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest;
111869 + gcc_assert(dom_info_available_p(CDI_DOMINATORS));
111870 + set_immediate_dominator(CDI_DOMINATORS, first_bb, ENTRY_BLOCK_PTR);
111871 + bb = first_bb;
111872 + }
111873 +
111874 + gsi = gsi_after_labels(bb);
111875 + assign = build_cast_stmt(size_overflow_type, arg, phi_ssa_name, &gsi, BEFORE_STMT, false);
111876 + gimple_set_plf(assign, MY_STMT, true);
111877 +
111878 + return gimple_assign_lhs(assign);
111879 +}
111880 +
111881 +static tree use_phi_ssa_name(tree ssa_name_var, tree new_arg)
111882 +{
111883 + gimple_stmt_iterator gsi;
111884 + gimple assign, def_stmt = get_def_stmt(new_arg);
111885 +
111886 + if (gimple_code(def_stmt) == GIMPLE_PHI) {
111887 + gsi = gsi_after_labels(gimple_bb(def_stmt));
111888 + assign = build_cast_stmt(TREE_TYPE(new_arg), new_arg, ssa_name_var, &gsi, BEFORE_STMT, true);
111889 + } else {
111890 + gsi = gsi_for_stmt(def_stmt);
111891 + assign = build_cast_stmt(TREE_TYPE(new_arg), new_arg, ssa_name_var, &gsi, AFTER_STMT, true);
111892 + }
111893 +
111894 + gimple_set_plf(assign, MY_STMT, true);
111895 + return gimple_assign_lhs(assign);
111896 +}
111897 +
111898 +static tree cast_visited_phi_arg(tree ssa_name_var, tree arg, tree size_overflow_type)
111899 +{
111900 + basic_block bb;
111901 + gimple_stmt_iterator gsi;
111902 + const_gimple def_stmt;
111903 + gimple assign;
111904 +
111905 + def_stmt = get_def_stmt(arg);
111906 + bb = gimple_bb(def_stmt);
111907 + gcc_assert(bb->index != 0);
111908 + gsi = gsi_after_labels(bb);
111909 +
111910 + assign = build_cast_stmt(size_overflow_type, arg, ssa_name_var, &gsi, BEFORE_STMT, false);
111911 + gimple_set_plf(assign, MY_STMT, true);
111912 + return gimple_assign_lhs(assign);
111913 +}
111914 +
111915 +static tree create_new_phi_arg(tree ssa_name_var, tree new_arg, gimple oldstmt, unsigned int i)
111916 +{
111917 + tree size_overflow_type;
111918 + tree arg;
111919 + const_gimple def_stmt;
111920 +
111921 + if (new_arg != NULL_TREE && is_gimple_constant(new_arg))
111922 + return new_arg;
111923 +
111924 + arg = gimple_phi_arg_def(oldstmt, i);
111925 + def_stmt = get_def_stmt(arg);
111926 + gcc_assert(def_stmt != NULL);
111927 + size_overflow_type = get_size_overflow_type(oldstmt, arg);
111928 +
111929 + switch (gimple_code(def_stmt)) {
111930 + case GIMPLE_PHI:
111931 + return cast_visited_phi_arg(ssa_name_var, arg, size_overflow_type);
111932 + case GIMPLE_NOP: {
111933 + basic_block bb;
111934 +
111935 + bb = gimple_phi_arg_edge(oldstmt, i)->src;
111936 + return cast_parm_decl(ssa_name_var, arg, size_overflow_type, bb);
111937 + }
111938 + case GIMPLE_ASM: {
111939 + gimple_stmt_iterator gsi;
111940 + gimple assign, stmt = get_def_stmt(arg);
111941 +
111942 + gsi = gsi_for_stmt(stmt);
111943 + assign = build_cast_stmt(size_overflow_type, arg, ssa_name_var, &gsi, AFTER_STMT, false);
111944 + gimple_set_plf(assign, MY_STMT, true);
111945 + return gimple_assign_lhs(assign);
111946 + }
111947 + default:
111948 + gcc_assert(new_arg != NULL_TREE);
111949 + gcc_assert(types_compatible_p(TREE_TYPE(new_arg), size_overflow_type));
111950 + return use_phi_ssa_name(ssa_name_var, new_arg);
111951 + }
111952 +}
111953 +
111954 +static gimple overflow_create_phi_node(gimple oldstmt, tree result)
111955 +{
111956 + basic_block bb;
111957 + gimple phi;
111958 + gimple_seq seq;
111959 + gimple_stmt_iterator gsi = gsi_for_stmt(oldstmt);
111960 +
111961 + bb = gsi_bb(gsi);
111962 +
111963 + if (result == NULL_TREE) {
111964 + tree old_result = gimple_phi_result(oldstmt);
111965 + tree size_overflow_type = get_size_overflow_type(oldstmt, old_result);
111966 +
111967 + result = create_new_var(size_overflow_type);
111968 + }
111969 +
111970 + phi = create_phi_node(result, bb);
111971 + gimple_phi_set_result(phi, make_ssa_name(result, phi));
111972 + seq = phi_nodes(bb);
111973 + gsi = gsi_last(seq);
111974 + gsi_remove(&gsi, false);
111975 +
111976 + gsi = gsi_for_stmt(oldstmt);
111977 + gsi_insert_after(&gsi, phi, GSI_NEW_STMT);
111978 + gimple_set_bb(phi, bb);
111979 + gimple_set_plf(phi, MY_STMT, true);
111980 + return phi;
111981 +}
111982 +
111983 +#if BUILDING_GCC_VERSION <= 4007
111984 +static tree create_new_phi_node(VEC(tree, gc) *args, tree ssa_name_var, gimple oldstmt)
111985 +#else
111986 +static tree create_new_phi_node(vec<tree, va_gc> *args, tree ssa_name_var, gimple oldstmt)
111987 +#endif
111988 +{
111989 + gimple new_phi;
111990 + unsigned int i;
111991 + tree arg, result;
111992 + location_t loc = gimple_location(oldstmt);
111993 +
111994 +#if BUILDING_GCC_VERSION <= 4007
111995 + gcc_assert(!VEC_empty(tree, args));
111996 +#else
111997 + gcc_assert(!args->is_empty());
111998 +#endif
111999 +
112000 + new_phi = overflow_create_phi_node(oldstmt, ssa_name_var);
112001 + result = gimple_phi_result(new_phi);
112002 + ssa_name_var = SSA_NAME_VAR(result);
112003 +
112004 +
112005 +#if BUILDING_GCC_VERSION == 4005
112006 + for (i = 0; i < VEC_length(tree, args); i++) {
112007 + arg = VEC_index(tree, args, i);
112008 +#elif BUILDING_GCC_VERSION <= 4007
112009 + FOR_EACH_VEC_ELT(tree, args, i, arg) {
112010 +#else
112011 + FOR_EACH_VEC_ELT(*args, i, arg) {
112012 +#endif
112013 + arg = create_new_phi_arg(ssa_name_var, arg, oldstmt, i);
112014 + add_phi_arg(new_phi, arg, gimple_phi_arg_edge(oldstmt, i), loc);
112015 + }
112016 +
112017 +#if BUILDING_GCC_VERSION <= 4007
112018 + VEC_free(tree, gc, args);
112019 +#else
112020 + vec_free(args);
112021 +#endif
112022 + update_stmt(new_phi);
112023 + return result;
112024 +}
112025 +
112026 +static tree handle_phi(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree orig_result)
112027 +{
112028 + tree ssa_name_var = NULL_TREE;
112029 +#if BUILDING_GCC_VERSION <= 4007
112030 + VEC(tree, gc) *args;
112031 +#else
112032 + vec<tree, va_gc> *args;
112033 +#endif
112034 + gimple oldstmt = get_def_stmt(orig_result);
112035 + unsigned int i, len = gimple_phi_num_args(oldstmt);
112036 +
112037 + pointer_set_insert(visited, oldstmt);
112038 +#if BUILDING_GCC_VERSION <= 4007
112039 + args = VEC_alloc(tree, gc, len);
112040 +#else
112041 + vec_alloc(args, len);
112042 +#endif
112043 + for (i = 0; i < len; i++) {
112044 + tree arg, new_arg;
112045 +
112046 + arg = gimple_phi_arg_def(oldstmt, i);
112047 + new_arg = expand(visited, caller_node, arg);
112048 +
112049 + if (ssa_name_var == NULL_TREE && new_arg != NULL_TREE)
112050 + ssa_name_var = SSA_NAME_VAR(new_arg);
112051 +
112052 + if (is_gimple_constant(arg)) {
112053 + tree size_overflow_type = get_size_overflow_type(oldstmt, arg);
112054 +
112055 + new_arg = cast_a_tree(size_overflow_type, arg);
112056 + }
112057 +
112058 +#if BUILDING_GCC_VERSION <= 4007
112059 + VEC_safe_push(tree, gc, args, new_arg);
112060 +#else
112061 + vec_safe_push(args, new_arg);
112062 +#endif
112063 + }
112064 +
112065 + return create_new_phi_node(args, ssa_name_var, oldstmt);
112066 +}
112067 +
112068 +static tree change_assign_rhs(gimple stmt, const_tree orig_rhs, tree new_rhs)
112069 +{
112070 + gimple assign;
112071 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
112072 + tree origtype = TREE_TYPE(orig_rhs);
112073 +
112074 + gcc_assert(is_gimple_assign(stmt));
112075 +
112076 + assign = build_cast_stmt(origtype, new_rhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
112077 + gimple_set_plf(assign, MY_STMT, true);
112078 + return gimple_assign_lhs(assign);
112079 +}
112080 +
112081 +static bool is_a_cast_and_const_overflow(const_tree no_const_rhs)
112082 +{
112083 + const_tree rhs1, lhs, rhs1_type, lhs_type;
112084 + enum machine_mode lhs_mode, rhs_mode;
112085 + gimple def_stmt = get_def_stmt(no_const_rhs);
112086 +
112087 + if (!def_stmt || !gimple_assign_cast_p(def_stmt))
112088 + return false;
112089 +
112090 + rhs1 = gimple_assign_rhs1(def_stmt);
112091 + lhs = gimple_assign_lhs(def_stmt);
112092 + rhs1_type = TREE_TYPE(rhs1);
112093 + lhs_type = TREE_TYPE(lhs);
112094 + rhs_mode = TYPE_MODE(rhs1_type);
112095 + lhs_mode = TYPE_MODE(lhs_type);
112096 + if (TYPE_UNSIGNED(lhs_type) == TYPE_UNSIGNED(rhs1_type) || lhs_mode != rhs_mode)
112097 + return false;
112098 +
112099 + return true;
112100 +}
112101 +
112102 +static tree create_cast_assign(struct pointer_set_t *visited, gimple stmt)
112103 +{
112104 + tree rhs1 = gimple_assign_rhs1(stmt);
112105 + tree lhs = gimple_assign_lhs(stmt);
112106 + const_tree rhs1_type = TREE_TYPE(rhs1);
112107 + const_tree lhs_type = TREE_TYPE(lhs);
112108 +
112109 + if (TYPE_UNSIGNED(rhs1_type) == TYPE_UNSIGNED(lhs_type))
112110 + return create_assign(visited, stmt, lhs, AFTER_STMT);
112111 +
112112 + return create_assign(visited, stmt, rhs1, AFTER_STMT);
112113 +}
112114 +
112115 +static bool no_uses(tree node)
112116 +{
112117 + imm_use_iterator imm_iter;
112118 + use_operand_p use_p;
112119 +
112120 + FOR_EACH_IMM_USE_FAST(use_p, imm_iter, node) {
112121 + const_gimple use_stmt = USE_STMT(use_p);
112122 +
112123 + if (use_stmt == NULL)
112124 + return true;
112125 + if (is_gimple_debug(use_stmt))
112126 + continue;
112127 + return false;
112128 + }
112129 + return true;
112130 +}
112131 +
112132 +// 3.8.5 mm/page-writeback.c __ilog2_u64(): ret, uint + uintmax; uint -> int; int max
112133 +static bool is_const_plus_unsigned_signed_truncation(const_tree lhs)
112134 +{
112135 + tree rhs1, lhs_type, rhs_type, rhs2, not_const_rhs;
112136 + gimple def_stmt = get_def_stmt(lhs);
112137 +
112138 + if (!def_stmt || !gimple_assign_cast_p(def_stmt))
112139 + return false;
112140 +
112141 + rhs1 = gimple_assign_rhs1(def_stmt);
112142 + rhs_type = TREE_TYPE(rhs1);
112143 + lhs_type = TREE_TYPE(lhs);
112144 + if (TYPE_UNSIGNED(lhs_type) || !TYPE_UNSIGNED(rhs_type))
112145 + return false;
112146 + if (TYPE_MODE(lhs_type) != TYPE_MODE(rhs_type))
112147 + return false;
112148 +
112149 + def_stmt = get_def_stmt(rhs1);
112150 + if (!def_stmt || !is_gimple_assign(def_stmt) || gimple_num_ops(def_stmt) != 3)
112151 + return false;
112152 +
112153 + if (gimple_assign_rhs_code(def_stmt) != PLUS_EXPR)
112154 + return false;
112155 +
112156 + rhs1 = gimple_assign_rhs1(def_stmt);
112157 + rhs2 = gimple_assign_rhs2(def_stmt);
112158 + if (!is_gimple_constant(rhs1) && !is_gimple_constant(rhs2))
112159 + return false;
112160 +
112161 + if (is_gimple_constant(rhs2))
112162 + not_const_rhs = rhs1;
112163 + else
112164 + not_const_rhs = rhs2;
112165 +
112166 + return no_uses(not_const_rhs);
112167 +}
112168 +
112169 +static bool skip_lhs_cast_check(const_gimple stmt)
112170 +{
112171 + const_tree rhs = gimple_assign_rhs1(stmt);
112172 + const_gimple def_stmt = get_def_stmt(rhs);
112173 +
112174 + // 3.8.2 kernel/futex_compat.c compat_exit_robust_list(): get_user() 64 ulong -> int (compat_long_t), int max
112175 + if (gimple_code(def_stmt) == GIMPLE_ASM)
112176 + return true;
112177 +
112178 + if (is_const_plus_unsigned_signed_truncation(rhs))
112179 + return true;
112180 +
112181 + return false;
112182 +}
112183 +
112184 +static tree create_cast_overflow_check(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree new_rhs1, gimple stmt)
112185 +{
112186 + bool cast_lhs, cast_rhs;
112187 + tree lhs = gimple_assign_lhs(stmt);
112188 + tree rhs = gimple_assign_rhs1(stmt);
112189 + const_tree lhs_type = TREE_TYPE(lhs);
112190 + const_tree rhs_type = TREE_TYPE(rhs);
112191 + enum machine_mode lhs_mode = TYPE_MODE(lhs_type);
112192 + enum machine_mode rhs_mode = TYPE_MODE(rhs_type);
112193 + unsigned int lhs_size = GET_MODE_BITSIZE(lhs_mode);
112194 + unsigned int rhs_size = GET_MODE_BITSIZE(rhs_mode);
112195 +
112196 + static bool check_lhs[3][4] = {
112197 + // ss su us uu
112198 + { false, true, true, false }, // lhs > rhs
112199 + { false, false, false, false }, // lhs = rhs
112200 + { true, true, true, true }, // lhs < rhs
112201 + };
112202 +
112203 + static bool check_rhs[3][4] = {
112204 + // ss su us uu
112205 + { true, false, true, true }, // lhs > rhs
112206 + { true, false, true, true }, // lhs = rhs
112207 + { true, false, true, true }, // lhs < rhs
112208 + };
112209 +
112210 + // skip lhs check on signed SI -> HI cast or signed SI -> QI cast !!!!
112211 + if (rhs_mode == SImode && !TYPE_UNSIGNED(rhs_type) && (lhs_mode == HImode || lhs_mode == QImode))
112212 + return create_assign(visited, stmt, lhs, AFTER_STMT);
112213 +
112214 + if (lhs_size > rhs_size) {
112215 + cast_lhs = check_lhs[0][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
112216 + cast_rhs = check_rhs[0][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
112217 + } else if (lhs_size == rhs_size) {
112218 + cast_lhs = check_lhs[1][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
112219 + cast_rhs = check_rhs[1][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
112220 + } else {
112221 + cast_lhs = check_lhs[2][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
112222 + cast_rhs = check_rhs[2][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
112223 + }
112224 +
112225 + if (!cast_lhs && !cast_rhs)
112226 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
112227 +
112228 + if (cast_lhs && !skip_lhs_cast_check(stmt))
112229 + check_size_overflow(caller_node, stmt, TREE_TYPE(new_rhs1), new_rhs1, lhs, BEFORE_STMT);
112230 +
112231 + if (cast_rhs)
112232 + check_size_overflow(caller_node, stmt, TREE_TYPE(new_rhs1), new_rhs1, rhs, BEFORE_STMT);
112233 +
112234 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
112235 +}
112236 +
112237 +static tree handle_unary_rhs(struct pointer_set_t *visited, struct cgraph_node *caller_node, gimple stmt)
112238 +{
112239 + tree rhs1, new_rhs1, lhs = gimple_assign_lhs(stmt);
112240 +
112241 + if (gimple_plf(stmt, MY_STMT))
112242 + return lhs;
112243 +
112244 + rhs1 = gimple_assign_rhs1(stmt);
112245 + if (TREE_CODE(TREE_TYPE(rhs1)) == POINTER_TYPE)
112246 + return create_assign(visited, stmt, lhs, AFTER_STMT);
112247 +
112248 + new_rhs1 = expand(visited, caller_node, rhs1);
112249 +
112250 + if (new_rhs1 == NULL_TREE)
112251 + return create_cast_assign(visited, stmt);
112252 +
112253 + if (gimple_plf(stmt, NO_CAST_CHECK))
112254 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
112255 +
112256 + if (gimple_assign_rhs_code(stmt) == BIT_NOT_EXPR) {
112257 + tree size_overflow_type = get_size_overflow_type(stmt, rhs1);
112258 +
112259 + new_rhs1 = cast_to_new_size_overflow_type(stmt, new_rhs1, size_overflow_type, BEFORE_STMT);
112260 + check_size_overflow(caller_node, stmt, size_overflow_type, new_rhs1, rhs1, BEFORE_STMT);
112261 + return create_assign(visited, stmt, lhs, AFTER_STMT);
112262 + }
112263 +
112264 + if (!gimple_assign_cast_p(stmt))
112265 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
112266 +
112267 + return create_cast_overflow_check(visited, caller_node, new_rhs1, stmt);
112268 +}
112269 +
112270 +static tree handle_unary_ops(struct pointer_set_t *visited, struct cgraph_node *caller_node, gimple stmt)
112271 +{
112272 + tree rhs1, lhs = gimple_assign_lhs(stmt);
112273 + gimple def_stmt = get_def_stmt(lhs);
112274 +
112275 + gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP);
112276 + rhs1 = gimple_assign_rhs1(def_stmt);
112277 +
112278 + if (is_gimple_constant(rhs1))
112279 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
112280 +
112281 + switch (TREE_CODE(rhs1)) {
112282 + case SSA_NAME:
112283 + return handle_unary_rhs(visited, caller_node, def_stmt);
112284 + case ARRAY_REF:
112285 + case BIT_FIELD_REF:
112286 + case ADDR_EXPR:
112287 + case COMPONENT_REF:
112288 + case INDIRECT_REF:
112289 +#if BUILDING_GCC_VERSION >= 4006
112290 + case MEM_REF:
112291 +#endif
112292 + case TARGET_MEM_REF:
112293 + case VIEW_CONVERT_EXPR:
112294 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
112295 + case PARM_DECL:
112296 + case VAR_DECL:
112297 + return create_assign(visited, stmt, lhs, AFTER_STMT);
112298 +
112299 + default:
112300 + debug_gimple_stmt(def_stmt);
112301 + debug_tree(rhs1);
112302 + gcc_unreachable();
112303 + }
112304 +}
112305 +
112306 +static void insert_cond(basic_block cond_bb, tree arg, enum tree_code cond_code, tree type_value)
112307 +{
112308 + gimple cond_stmt;
112309 + gimple_stmt_iterator gsi = gsi_last_bb(cond_bb);
112310 +
112311 + cond_stmt = gimple_build_cond(cond_code, arg, type_value, NULL_TREE, NULL_TREE);
112312 + gsi_insert_after(&gsi, cond_stmt, GSI_CONTINUE_LINKING);
112313 + update_stmt(cond_stmt);
112314 +}
112315 +
112316 +static tree create_string_param(tree string)
112317 +{
112318 + tree i_type, a_type;
112319 + const int length = TREE_STRING_LENGTH(string);
112320 +
112321 + gcc_assert(length > 0);
112322 +
112323 + i_type = build_index_type(build_int_cst(NULL_TREE, length - 1));
112324 + a_type = build_array_type(char_type_node, i_type);
112325 +
112326 + TREE_TYPE(string) = a_type;
112327 + TREE_CONSTANT(string) = 1;
112328 + TREE_READONLY(string) = 1;
112329 +
112330 + return build1(ADDR_EXPR, ptr_type_node, string);
112331 +}
112332 +
112333 +#if BUILDING_GCC_VERSION <= 4006
112334 +struct cgraph_node *cgraph_get_create_node(tree decl);
112335 +
112336 +struct cgraph_node *cgraph_get_create_node(tree decl)
112337 +{
112338 + struct cgraph_node *node;
112339 +
112340 + node = cgraph_get_node(decl);
112341 + if (node)
112342 + return node;
112343 + return cgraph_node(decl);
112344 +}
112345 +#endif
112346 +
112347 +static void insert_cond_result(struct cgraph_node *caller_node, basic_block bb_true, const_gimple stmt, const_tree arg, bool min)
112348 +{
112349 + gimple func_stmt;
112350 + const_gimple def_stmt;
112351 + const_tree loc_line;
112352 + tree loc_file, ssa_name, current_func;
112353 + expanded_location xloc;
112354 + char *ssa_name_buf;
112355 + int len;
112356 + struct cgraph_edge *edge;
112357 + struct cgraph_node *callee_node;
112358 + int frequency;
112359 + gimple_stmt_iterator gsi = gsi_start_bb(bb_true);
112360 +
112361 + def_stmt = get_def_stmt(arg);
112362 + xloc = expand_location(gimple_location(def_stmt));
112363 +
112364 + if (!gimple_has_location(def_stmt)) {
112365 + xloc = expand_location(gimple_location(stmt));
112366 + if (!gimple_has_location(stmt))
112367 + xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl));
112368 + }
112369 +
112370 + loc_line = build_int_cstu(unsigned_type_node, xloc.line);
112371 +
112372 + loc_file = build_string(strlen(xloc.file) + 1, xloc.file);
112373 + loc_file = create_string_param(loc_file);
112374 +
112375 + current_func = build_string(NAME_LEN(current_function_decl) + 1, NAME(current_function_decl));
112376 + current_func = create_string_param(current_func);
112377 +
112378 + gcc_assert(DECL_NAME(SSA_NAME_VAR(arg)) != NULL);
112379 + call_count++;
112380 + len = asprintf(&ssa_name_buf, "%s_%u %s, count: %u\n", NAME(SSA_NAME_VAR(arg)), SSA_NAME_VERSION(arg), min ? "min" : "max", call_count);
112381 + gcc_assert(len > 0);
112382 + ssa_name = build_string(len + 1, ssa_name_buf);
112383 + free(ssa_name_buf);
112384 + ssa_name = create_string_param(ssa_name);
112385 +
112386 + // void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
112387 + func_stmt = gimple_build_call(report_size_overflow_decl, 4, loc_file, loc_line, current_func, ssa_name);
112388 + gsi_insert_after(&gsi, func_stmt, GSI_CONTINUE_LINKING);
112389 +
112390 + callee_node = cgraph_get_create_node(report_size_overflow_decl);
112391 + frequency = compute_call_stmt_bb_frequency(current_function_decl, bb_true);
112392 +
112393 +#if BUILDING_GCC_VERSION <= 4006
112394 + edge = cgraph_create_edge(caller_node, callee_node, func_stmt, bb_true->count, frequency, bb_true->loop_depth);
112395 +#else
112396 + edge = cgraph_create_edge(caller_node, callee_node, func_stmt, bb_true->count, frequency);
112397 +#endif
112398 + gcc_assert(edge != NULL);
112399 +}
112400 +
112401 +static void __unused print_the_code_insertions(const_gimple stmt)
112402 +{
112403 + location_t loc = gimple_location(stmt);
112404 +
112405 + inform(loc, "Integer size_overflow check applied here.");
112406 +}
112407 +
112408 +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)
112409 +{
112410 + basic_block cond_bb, join_bb, bb_true;
112411 + edge e;
112412 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
112413 +
112414 + cond_bb = gimple_bb(stmt);
112415 + if (before)
112416 + gsi_prev(&gsi);
112417 + if (gsi_end_p(gsi))
112418 + e = split_block_after_labels(cond_bb);
112419 + else
112420 + e = split_block(cond_bb, gsi_stmt(gsi));
112421 + cond_bb = e->src;
112422 + join_bb = e->dest;
112423 + e->flags = EDGE_FALSE_VALUE;
112424 + e->probability = REG_BR_PROB_BASE;
112425 +
112426 + bb_true = create_empty_bb(cond_bb);
112427 + make_edge(cond_bb, bb_true, EDGE_TRUE_VALUE);
112428 + make_edge(cond_bb, join_bb, EDGE_FALSE_VALUE);
112429 + make_edge(bb_true, join_bb, EDGE_FALLTHRU);
112430 +
112431 + gcc_assert(dom_info_available_p(CDI_DOMINATORS));
112432 + set_immediate_dominator(CDI_DOMINATORS, bb_true, cond_bb);
112433 + set_immediate_dominator(CDI_DOMINATORS, join_bb, cond_bb);
112434 +
112435 + if (current_loops != NULL) {
112436 + gcc_assert(cond_bb->loop_father == join_bb->loop_father);
112437 + add_bb_to_loop(bb_true, cond_bb->loop_father);
112438 + }
112439 +
112440 + insert_cond(cond_bb, arg, cond_code, type_value);
112441 + insert_cond_result(caller_node, bb_true, stmt, arg, min);
112442 +
112443 +// print_the_code_insertions(stmt);
112444 +}
112445 +
112446 +static void check_size_overflow(struct cgraph_node *caller_node, gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before)
112447 +{
112448 + const_tree rhs_type = TREE_TYPE(rhs);
112449 + tree cast_rhs_type, type_max_type, type_min_type, type_max, type_min;
112450 +
112451 + gcc_assert(rhs_type != NULL_TREE);
112452 + if (TREE_CODE(rhs_type) == POINTER_TYPE)
112453 + return;
112454 +
112455 + gcc_assert(TREE_CODE(rhs_type) == INTEGER_TYPE || TREE_CODE(rhs_type) == ENUMERAL_TYPE);
112456 +
112457 + if (is_const_plus_unsigned_signed_truncation(rhs))
112458 + return;
112459 +
112460 + type_max = cast_a_tree(size_overflow_type, TYPE_MAX_VALUE(rhs_type));
112461 + // typemax (-1) < typemin (0)
112462 + if (TREE_OVERFLOW(type_max))
112463 + return;
112464 +
112465 + type_min = cast_a_tree(size_overflow_type, TYPE_MIN_VALUE(rhs_type));
112466 +
112467 + cast_rhs_type = TREE_TYPE(cast_rhs);
112468 + type_max_type = TREE_TYPE(type_max);
112469 + gcc_assert(types_compatible_p(cast_rhs_type, type_max_type));
112470 +
112471 + insert_check_size_overflow(caller_node, stmt, GT_EXPR, cast_rhs, type_max, before, MAX_CHECK);
112472 +
112473 + // special case: get_size_overflow_type(), 32, u64->s
112474 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode) && TYPE_UNSIGNED(size_overflow_type) && !TYPE_UNSIGNED(rhs_type))
112475 + return;
112476 +
112477 + type_min_type = TREE_TYPE(type_min);
112478 + gcc_assert(types_compatible_p(type_max_type, type_min_type));
112479 + insert_check_size_overflow(caller_node, stmt, LT_EXPR, cast_rhs, type_min, before, MIN_CHECK);
112480 +}
112481 +
112482 +static bool is_a_constant_overflow(const_gimple stmt, const_tree rhs)
112483 +{
112484 + if (gimple_assign_rhs_code(stmt) == MIN_EXPR)
112485 + return false;
112486 + if (!is_gimple_constant(rhs))
112487 + return false;
112488 + return true;
112489 +}
112490 +
112491 +static tree get_def_stmt_rhs(const_tree var)
112492 +{
112493 + tree rhs1, def_stmt_rhs1;
112494 + gimple rhs1_def_stmt, def_stmt_rhs1_def_stmt, def_stmt;
112495 +
112496 + def_stmt = get_def_stmt(var);
112497 + if (!gimple_assign_cast_p(def_stmt))
112498 + return NULL_TREE;
112499 + gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP && gimple_plf(def_stmt, MY_STMT) && gimple_assign_cast_p(def_stmt));
112500 +
112501 + rhs1 = gimple_assign_rhs1(def_stmt);
112502 + rhs1_def_stmt = get_def_stmt(rhs1);
112503 + if (!gimple_assign_cast_p(rhs1_def_stmt))
112504 + return rhs1;
112505 +
112506 + def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt);
112507 + def_stmt_rhs1_def_stmt = get_def_stmt(def_stmt_rhs1);
112508 +
112509 + switch (gimple_code(def_stmt_rhs1_def_stmt)) {
112510 + case GIMPLE_CALL:
112511 + case GIMPLE_NOP:
112512 + case GIMPLE_ASM:
112513 + case GIMPLE_PHI:
112514 + return def_stmt_rhs1;
112515 + case GIMPLE_ASSIGN:
112516 + return rhs1;
112517 + default:
112518 + debug_gimple_stmt(def_stmt_rhs1_def_stmt);
112519 + gcc_unreachable();
112520 + }
112521 +}
112522 +
112523 +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)
112524 +{
112525 + tree new_rhs, orig_rhs;
112526 + void (*gimple_assign_set_rhs)(gimple, tree);
112527 + tree rhs1 = gimple_assign_rhs1(stmt);
112528 + tree rhs2 = gimple_assign_rhs2(stmt);
112529 + tree lhs = gimple_assign_lhs(stmt);
112530 +
112531 + if (!check_overflow)
112532 + return create_assign(visited, stmt, lhs, AFTER_STMT);
112533 +
112534 + if (change_rhs == NULL_TREE)
112535 + return create_assign(visited, stmt, lhs, AFTER_STMT);
112536 +
112537 + if (new_rhs2 == NULL_TREE) {
112538 + orig_rhs = rhs1;
112539 + gimple_assign_set_rhs = &gimple_assign_set_rhs1;
112540 + } else {
112541 + orig_rhs = rhs2;
112542 + gimple_assign_set_rhs = &gimple_assign_set_rhs2;
112543 + }
112544 +
112545 + check_size_overflow(caller_node, stmt, TREE_TYPE(change_rhs), change_rhs, orig_rhs, BEFORE_STMT);
112546 +
112547 + new_rhs = change_assign_rhs(stmt, orig_rhs, change_rhs);
112548 + gimple_assign_set_rhs(stmt, new_rhs);
112549 + update_stmt(stmt);
112550 +
112551 + return create_assign(visited, stmt, lhs, AFTER_STMT);
112552 +}
112553 +
112554 +static bool is_subtraction_special(const_gimple stmt)
112555 +{
112556 + gimple rhs1_def_stmt, rhs2_def_stmt;
112557 + const_tree rhs1_def_stmt_rhs1, rhs2_def_stmt_rhs1, rhs1_def_stmt_lhs, rhs2_def_stmt_lhs;
112558 + enum machine_mode rhs1_def_stmt_rhs1_mode, rhs2_def_stmt_rhs1_mode, rhs1_def_stmt_lhs_mode, rhs2_def_stmt_lhs_mode;
112559 + const_tree rhs1 = gimple_assign_rhs1(stmt);
112560 + const_tree rhs2 = gimple_assign_rhs2(stmt);
112561 +
112562 + if (is_gimple_constant(rhs1) || is_gimple_constant(rhs2))
112563 + return false;
112564 +
112565 + gcc_assert(TREE_CODE(rhs1) == SSA_NAME && TREE_CODE(rhs2) == SSA_NAME);
112566 +
112567 + if (gimple_assign_rhs_code(stmt) != MINUS_EXPR)
112568 + return false;
112569 +
112570 + rhs1_def_stmt = get_def_stmt(rhs1);
112571 + rhs2_def_stmt = get_def_stmt(rhs2);
112572 + if (!gimple_assign_cast_p(rhs1_def_stmt) || !gimple_assign_cast_p(rhs2_def_stmt))
112573 + return false;
112574 +
112575 + rhs1_def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt);
112576 + rhs2_def_stmt_rhs1 = gimple_assign_rhs1(rhs2_def_stmt);
112577 + rhs1_def_stmt_lhs = gimple_assign_lhs(rhs1_def_stmt);
112578 + rhs2_def_stmt_lhs = gimple_assign_lhs(rhs2_def_stmt);
112579 + rhs1_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_rhs1));
112580 + rhs2_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_rhs1));
112581 + rhs1_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_lhs));
112582 + rhs2_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_lhs));
112583 + if (GET_MODE_BITSIZE(rhs1_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs1_def_stmt_lhs_mode))
112584 + return false;
112585 + if (GET_MODE_BITSIZE(rhs2_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs2_def_stmt_lhs_mode))
112586 + return false;
112587 +
112588 + gimple_set_plf(rhs1_def_stmt, NO_CAST_CHECK, true);
112589 + gimple_set_plf(rhs2_def_stmt, NO_CAST_CHECK, true);
112590 + return true;
112591 +}
112592 +
112593 +static tree handle_integer_truncation(struct pointer_set_t *visited, struct cgraph_node *caller_node, const_tree lhs)
112594 +{
112595 + tree new_rhs1, new_rhs2;
112596 + tree new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1, new_lhs;
112597 + gimple assign, stmt = get_def_stmt(lhs);
112598 + tree rhs1 = gimple_assign_rhs1(stmt);
112599 + tree rhs2 = gimple_assign_rhs2(stmt);
112600 +
112601 + if (!is_subtraction_special(stmt))
112602 + return NULL_TREE;
112603 +
112604 + new_rhs1 = expand(visited, caller_node, rhs1);
112605 + new_rhs2 = expand(visited, caller_node, rhs2);
112606 +
112607 + new_rhs1_def_stmt_rhs1 = get_def_stmt_rhs(new_rhs1);
112608 + new_rhs2_def_stmt_rhs1 = get_def_stmt_rhs(new_rhs2);
112609 +
112610 + if (new_rhs1_def_stmt_rhs1 == NULL_TREE || new_rhs2_def_stmt_rhs1 == NULL_TREE)
112611 + return NULL_TREE;
112612 +
112613 + if (!types_compatible_p(TREE_TYPE(new_rhs1_def_stmt_rhs1), TREE_TYPE(new_rhs2_def_stmt_rhs1))) {
112614 + new_rhs1_def_stmt_rhs1 = cast_to_TI_type(stmt, new_rhs1_def_stmt_rhs1);
112615 + new_rhs2_def_stmt_rhs1 = cast_to_TI_type(stmt, new_rhs2_def_stmt_rhs1);
112616 + }
112617 +
112618 + assign = create_binary_assign(MINUS_EXPR, stmt, new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1);
112619 + new_lhs = gimple_assign_lhs(assign);
112620 + check_size_overflow(caller_node, assign, TREE_TYPE(new_lhs), new_lhs, rhs1, AFTER_STMT);
112621 +
112622 + return dup_assign(visited, stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
112623 +}
112624 +
112625 +static bool is_a_neg_overflow(const_gimple stmt, const_tree rhs)
112626 +{
112627 + const_gimple def_stmt;
112628 +
112629 + if (TREE_CODE(rhs) != SSA_NAME)
112630 + return false;
112631 +
112632 + if (gimple_assign_rhs_code(stmt) != PLUS_EXPR)
112633 + return false;
112634 +
112635 + def_stmt = get_def_stmt(rhs);
112636 + if (!is_gimple_assign(def_stmt) || gimple_assign_rhs_code(def_stmt) != BIT_NOT_EXPR)
112637 + return false;
112638 +
112639 + return true;
112640 +}
112641 +
112642 +static tree handle_binary_ops(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree lhs)
112643 +{
112644 + tree rhs1, rhs2, new_lhs;
112645 + gimple def_stmt = get_def_stmt(lhs);
112646 + tree new_rhs1 = NULL_TREE;
112647 + tree new_rhs2 = NULL_TREE;
112648 +
112649 + rhs1 = gimple_assign_rhs1(def_stmt);
112650 + rhs2 = gimple_assign_rhs2(def_stmt);
112651 +
112652 + /* no DImode/TImode division in the 32/64 bit kernel */
112653 + switch (gimple_assign_rhs_code(def_stmt)) {
112654 + case RDIV_EXPR:
112655 + case TRUNC_DIV_EXPR:
112656 + case CEIL_DIV_EXPR:
112657 + case FLOOR_DIV_EXPR:
112658 + case ROUND_DIV_EXPR:
112659 + case TRUNC_MOD_EXPR:
112660 + case CEIL_MOD_EXPR:
112661 + case FLOOR_MOD_EXPR:
112662 + case ROUND_MOD_EXPR:
112663 + case EXACT_DIV_EXPR:
112664 + case POINTER_PLUS_EXPR:
112665 + case BIT_AND_EXPR:
112666 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
112667 + default:
112668 + break;
112669 + }
112670 +
112671 + new_lhs = handle_integer_truncation(visited, caller_node, lhs);
112672 + if (new_lhs != NULL_TREE)
112673 + return new_lhs;
112674 +
112675 + if (TREE_CODE(rhs1) == SSA_NAME)
112676 + new_rhs1 = expand(visited, caller_node, rhs1);
112677 + if (TREE_CODE(rhs2) == SSA_NAME)
112678 + new_rhs2 = expand(visited, caller_node, rhs2);
112679 +
112680 + if (is_a_neg_overflow(def_stmt, rhs2))
112681 + return handle_intentional_overflow(visited, caller_node, true, def_stmt, new_rhs1, NULL_TREE);
112682 + if (is_a_neg_overflow(def_stmt, rhs1))
112683 + return handle_intentional_overflow(visited, caller_node, true, def_stmt, new_rhs2, new_rhs2);
112684 +
112685 +
112686 + if (is_a_constant_overflow(def_stmt, rhs2))
112687 + return handle_intentional_overflow(visited, caller_node, !is_a_cast_and_const_overflow(rhs1), def_stmt, new_rhs1, NULL_TREE);
112688 + if (is_a_constant_overflow(def_stmt, rhs1))
112689 + return handle_intentional_overflow(visited, caller_node, !is_a_cast_and_const_overflow(rhs2), def_stmt, new_rhs2, new_rhs2);
112690 +
112691 + return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
112692 +}
112693 +
112694 +#if BUILDING_GCC_VERSION >= 4007
112695 +static tree get_new_rhs(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree size_overflow_type, tree rhs)
112696 +{
112697 + if (is_gimple_constant(rhs))
112698 + return cast_a_tree(size_overflow_type, rhs);
112699 + if (TREE_CODE(rhs) != SSA_NAME)
112700 + return NULL_TREE;
112701 + return expand(visited, caller_node, rhs);
112702 +}
112703 +
112704 +static tree handle_ternary_ops(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree lhs)
112705 +{
112706 + tree rhs1, rhs2, rhs3, new_rhs1, new_rhs2, new_rhs3, size_overflow_type;
112707 + gimple def_stmt = get_def_stmt(lhs);
112708 +
112709 + size_overflow_type = get_size_overflow_type(def_stmt, lhs);
112710 +
112711 + rhs1 = gimple_assign_rhs1(def_stmt);
112712 + rhs2 = gimple_assign_rhs2(def_stmt);
112713 + rhs3 = gimple_assign_rhs3(def_stmt);
112714 + new_rhs1 = get_new_rhs(visited, caller_node, size_overflow_type, rhs1);
112715 + new_rhs2 = get_new_rhs(visited, caller_node, size_overflow_type, rhs2);
112716 + new_rhs3 = get_new_rhs(visited, caller_node, size_overflow_type, rhs3);
112717 +
112718 + return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, new_rhs3);
112719 +}
112720 +#endif
112721 +
112722 +static tree get_size_overflow_type(gimple stmt, const_tree node)
112723 +{
112724 + const_tree type;
112725 + tree new_type;
112726 +
112727 + gcc_assert(node != NULL_TREE);
112728 +
112729 + type = TREE_TYPE(node);
112730 +
112731 + if (gimple_plf(stmt, MY_STMT))
112732 + return TREE_TYPE(node);
112733 +
112734 + switch (TYPE_MODE(type)) {
112735 + case QImode:
112736 + new_type = intHI_type_node;
112737 + break;
112738 + case HImode:
112739 + new_type = intSI_type_node;
112740 + break;
112741 + case SImode:
112742 + new_type = intDI_type_node;
112743 + break;
112744 + case DImode:
112745 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode))
112746 + new_type = TYPE_UNSIGNED(type) ? unsigned_intDI_type_node : intDI_type_node;
112747 + else
112748 + new_type = intTI_type_node;
112749 + break;
112750 + case TImode:
112751 + gcc_assert(!TYPE_UNSIGNED(type));
112752 + new_type = intTI_type_node;
112753 + break;
112754 + default:
112755 + debug_tree((tree)node);
112756 + error("%s: unsupported gcc configuration (%qE).", __func__, current_function_decl);
112757 + gcc_unreachable();
112758 + }
112759 +
112760 + if (TYPE_QUALS(type) != 0)
112761 + return build_qualified_type(new_type, TYPE_QUALS(type));
112762 + return new_type;
112763 +}
112764 +
112765 +static tree expand_visited(gimple def_stmt)
112766 +{
112767 + const_gimple next_stmt;
112768 + gimple_stmt_iterator gsi;
112769 + enum gimple_code code = gimple_code(def_stmt);
112770 +
112771 + if (code == GIMPLE_ASM)
112772 + return NULL_TREE;
112773 +
112774 + gsi = gsi_for_stmt(def_stmt);
112775 + gsi_next(&gsi);
112776 +
112777 + if (gimple_code(def_stmt) == GIMPLE_PHI && gsi_end_p(gsi))
112778 + return NULL_TREE;
112779 + gcc_assert(!gsi_end_p(gsi));
112780 + next_stmt = gsi_stmt(gsi);
112781 +
112782 + if (gimple_code(def_stmt) == GIMPLE_PHI && !gimple_plf((gimple)next_stmt, MY_STMT))
112783 + return NULL_TREE;
112784 + gcc_assert(gimple_plf((gimple)next_stmt, MY_STMT));
112785 +
112786 + return get_lhs(next_stmt);
112787 +}
112788 +
112789 +static tree expand(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree lhs)
112790 +{
112791 + gimple def_stmt;
112792 +
112793 + def_stmt = get_def_stmt(lhs);
112794 +
112795 + if (!def_stmt || gimple_code(def_stmt) == GIMPLE_NOP)
112796 + return NULL_TREE;
112797 +
112798 + if (gimple_plf(def_stmt, MY_STMT))
112799 + return lhs;
112800 +
112801 + if (pointer_set_contains(visited, def_stmt))
112802 + return expand_visited(def_stmt);
112803 +
112804 + switch (gimple_code(def_stmt)) {
112805 + case GIMPLE_PHI:
112806 + return handle_phi(visited, caller_node, lhs);
112807 + case GIMPLE_CALL:
112808 + case GIMPLE_ASM:
112809 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
112810 + case GIMPLE_ASSIGN:
112811 + switch (gimple_num_ops(def_stmt)) {
112812 + case 2:
112813 + return handle_unary_ops(visited, caller_node, def_stmt);
112814 + case 3:
112815 + return handle_binary_ops(visited, caller_node, lhs);
112816 +#if BUILDING_GCC_VERSION >= 4007
112817 + case 4:
112818 + return handle_ternary_ops(visited, caller_node, lhs);
112819 +#endif
112820 + }
112821 + default:
112822 + debug_gimple_stmt(def_stmt);
112823 + error("%s: unknown gimple code", __func__);
112824 + gcc_unreachable();
112825 + }
112826 +}
112827 +
112828 +static tree cast_to_orig_type(gimple stmt, const_tree orig_node, tree new_node)
112829 +{
112830 + const_gimple assign;
112831 + tree orig_type = TREE_TYPE(orig_node);
112832 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
112833 +
112834 + assign = build_cast_stmt(orig_type, new_node, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
112835 + return gimple_assign_lhs(assign);
112836 +}
112837 +
112838 +static void change_orig_node(struct interesting_node *cur_node, tree new_node)
112839 +{
112840 + void (*set_rhs)(gimple, tree);
112841 + gimple stmt = cur_node->first_stmt;
112842 + const_tree orig_node = cur_node->node;
112843 +
112844 + switch (gimple_code(stmt)) {
112845 + case GIMPLE_RETURN:
112846 + gimple_return_set_retval(stmt, cast_to_orig_type(stmt, orig_node, new_node));
112847 + break;
112848 + case GIMPLE_CALL:
112849 + gimple_call_set_arg(stmt, cur_node->num - 1, cast_to_orig_type(stmt, orig_node, new_node));
112850 + break;
112851 + case GIMPLE_ASSIGN:
112852 + switch (cur_node->num) {
112853 + case 1:
112854 + set_rhs = &gimple_assign_set_rhs1;
112855 + break;
112856 + case 2:
112857 + set_rhs = &gimple_assign_set_rhs2;
112858 + break;
112859 +#if BUILDING_GCC_VERSION > 4005
112860 + case 3:
112861 + set_rhs = &gimple_assign_set_rhs3;
112862 + break;
112863 +#endif
112864 + default:
112865 + gcc_unreachable();
112866 + }
112867 +
112868 + set_rhs(stmt, cast_to_orig_type(stmt, orig_node, new_node));
112869 + break;
112870 + default:
112871 + debug_gimple_stmt(stmt);
112872 + gcc_unreachable();
112873 + }
112874 +
112875 + update_stmt(stmt);
112876 +}
112877 +
112878 +static unsigned int get_correct_arg_count(unsigned int argnum, tree fndecl)
112879 +{
112880 + const struct size_overflow_hash *hash;
112881 + unsigned int new_argnum;
112882 + tree arg;
112883 + const_tree origarg;
112884 +
112885 + if (argnum == 0)
112886 + return argnum;
112887 +
112888 + hash = get_function_hash(fndecl);
112889 + if (hash && hash->param & (1U << argnum))
112890 + return argnum;
112891 +
112892 + if (DECL_EXTERNAL(fndecl))
112893 + return argnum;
112894 +
112895 + origarg = DECL_ARGUMENTS(DECL_ORIGIN(fndecl));
112896 + argnum--;
112897 + while (origarg && argnum) {
112898 + origarg = TREE_CHAIN(origarg);
112899 + argnum--;
112900 + }
112901 + gcc_assert(argnum == 0);
112902 + gcc_assert(origarg != NULL_TREE);
112903 +
112904 + for (arg = DECL_ARGUMENTS(fndecl), new_argnum = 1; arg; arg = TREE_CHAIN(arg), new_argnum++)
112905 + if (operand_equal_p(origarg, arg, 0) || !strcmp(NAME(origarg), NAME(arg)))
112906 + return new_argnum;
112907 +
112908 + return CANNOT_FIND_ARG;
112909 +}
112910 +
112911 +// Don't want to duplicate entries in next_cgraph_node
112912 +static bool is_in_next_cgraph_node(struct next_cgraph_node *head, struct cgraph_node *node, const_tree fndecl, unsigned int num)
112913 +{
112914 + const_tree new_callee_fndecl;
112915 + struct next_cgraph_node *cur_node;
112916 +
112917 + if (fndecl == RET_CHECK)
112918 +#if BUILDING_GCC_VERSION <= 4007
112919 + new_callee_fndecl = node->decl;
112920 +#else
112921 + new_callee_fndecl = node->symbol.decl;
112922 +#endif
112923 + else
112924 + new_callee_fndecl = fndecl;
112925 +
112926 + for (cur_node = head; cur_node; cur_node = cur_node->next) {
112927 +#if BUILDING_GCC_VERSION <= 4007
112928 + if (!operand_equal_p(cur_node->current_function->decl, node->decl, 0))
112929 +#else
112930 + if (!operand_equal_p(cur_node->current_function->symbol.decl, node->symbol.decl, 0))
112931 +#endif
112932 + continue;
112933 + if (!operand_equal_p(cur_node->callee_fndecl, new_callee_fndecl, 0))
112934 + continue;
112935 + if (num == cur_node->num)
112936 + return true;
112937 + }
112938 + return false;
112939 +}
112940 +
112941 +/* Add a next_cgraph_node into the list for handle_function().
112942 + * handle_function() iterates over all the next cgraph nodes and
112943 + * starts the overflow check insertion process.
112944 + */
112945 +static struct next_cgraph_node *create_new_next_cgraph_node(struct next_cgraph_node *head, struct cgraph_node *node, tree fndecl, unsigned int num)
112946 +{
112947 + struct next_cgraph_node *new_node;
112948 +
112949 + if (is_in_next_cgraph_node(head, node, fndecl, num))
112950 + return head;
112951 +
112952 + new_node = (struct next_cgraph_node *)xmalloc(sizeof(*new_node));
112953 + new_node->current_function = node;
112954 + new_node->next = NULL;
112955 + new_node->num = num;
112956 + if (fndecl == RET_CHECK)
112957 +#if BUILDING_GCC_VERSION <= 4007
112958 + new_node->callee_fndecl = node->decl;
112959 +#else
112960 + new_node->callee_fndecl = node->symbol.decl;
112961 +#endif
112962 + else
112963 + new_node->callee_fndecl = fndecl;
112964 +
112965 + if (!head)
112966 + return new_node;
112967 +
112968 + new_node->next = head;
112969 + return new_node;
112970 +}
112971 +
112972 +static struct next_cgraph_node *create_new_next_cgraph_nodes(struct next_cgraph_node *head, struct cgraph_node *node, unsigned int num)
112973 +{
112974 + struct cgraph_edge *e;
112975 +
112976 + if (num == 0)
112977 + return create_new_next_cgraph_node(head, node, RET_CHECK, num);
112978 +
112979 + for (e = node->callers; e; e = e->next_caller) {
112980 + tree fndecl = gimple_call_fndecl(e->call_stmt);
112981 +
112982 + gcc_assert(fndecl != NULL_TREE);
112983 + head = create_new_next_cgraph_node(head, e->caller, fndecl, num);
112984 + }
112985 +
112986 + return head;
112987 +}
112988 +
112989 +static bool is_a_return_check(const_tree node)
112990 +{
112991 + if (TREE_CODE(node) == FUNCTION_DECL)
112992 + return true;
112993 +
112994 + gcc_assert(TREE_CODE(node) == PARM_DECL);
112995 + return false;
112996 +}
112997 +
112998 +static bool is_in_hash_table(tree fndecl, unsigned int num)
112999 +{
113000 + const struct size_overflow_hash *hash;
113001 +
113002 + hash = get_function_hash(fndecl);
113003 + if (hash && (hash->param & (1U << num)))
113004 + return true;
113005 + return false;
113006 +}
113007 +
113008 +struct missing_functions {
113009 + struct missing_functions *next;
113010 + const_tree node;
113011 + tree fndecl;
113012 +};
113013 +
113014 +static struct missing_functions *create_new_missing_function(struct missing_functions *missing_fn_head, tree node)
113015 +{
113016 + struct missing_functions *new_function;
113017 +
113018 + new_function = (struct missing_functions *)xmalloc(sizeof(*new_function));
113019 + new_function->node = node;
113020 + new_function->next = NULL;
113021 +
113022 + if (TREE_CODE(node) == FUNCTION_DECL)
113023 + new_function->fndecl = node;
113024 + else
113025 + new_function->fndecl = current_function_decl;
113026 + gcc_assert(new_function->fndecl);
113027 +
113028 + if (!missing_fn_head)
113029 + return new_function;
113030 +
113031 + new_function->next = missing_fn_head;
113032 + return new_function;
113033 +}
113034 +
113035 +/* Check if the function has a size_overflow attribute or it is in the size_overflow hash table.
113036 + * If the function is missing everywhere then print the missing message into stderr.
113037 + */
113038 +static bool is_missing_function(tree orig_fndecl, unsigned int num)
113039 +{
113040 + switch (DECL_FUNCTION_CODE(orig_fndecl)) {
113041 +#if BUILDING_GCC_VERSION >= 4008
113042 + case BUILT_IN_BSWAP16:
113043 +#endif
113044 + case BUILT_IN_BSWAP32:
113045 + case BUILT_IN_BSWAP64:
113046 + case BUILT_IN_EXPECT:
113047 + case BUILT_IN_MEMCMP:
113048 + return false;
113049 + default:
113050 + break;
113051 + }
113052 +
113053 + // skip test.c
113054 + if (strcmp(NAME(current_function_decl), "coolmalloc")) {
113055 + if (lookup_attribute("size_overflow", DECL_ATTRIBUTES(orig_fndecl)))
113056 + warning(0, "unnecessary size_overflow attribute on: %s\n", NAME(orig_fndecl));
113057 + }
113058 +
113059 + if (is_in_hash_table(orig_fndecl, num))
113060 + return false;
113061 +
113062 + print_missing_msg(orig_fndecl, num);
113063 + return true;
113064 +}
113065 +
113066 +// Get the argnum of a function decl, if node is a return then the argnum is 0
113067 +static unsigned int get_function_num(const_tree node, const_tree orig_fndecl)
113068 +{
113069 + if (is_a_return_check(node))
113070 + return 0;
113071 + else
113072 + return find_arg_number_tree(node, orig_fndecl);
113073 +}
113074 +
113075 +/* If the function is missing from the hash table and it is a static function
113076 + * then create a next_cgraph_node from it for handle_function()
113077 + */
113078 +static struct next_cgraph_node *check_missing_overflow_attribute_and_create_next_node(struct next_cgraph_node *cnodes, struct missing_functions *missing_fn_head)
113079 +{
113080 + unsigned int num;
113081 + tree orig_fndecl;
113082 + struct cgraph_node *next_node = NULL;
113083 +
113084 + orig_fndecl = DECL_ORIGIN(missing_fn_head->fndecl);
113085 +
113086 + num = get_function_num(missing_fn_head->node, orig_fndecl);
113087 + if (num == CANNOT_FIND_ARG)
113088 + return cnodes;
113089 +
113090 + if (!is_missing_function(orig_fndecl, num))
113091 + return cnodes;
113092 +
113093 + next_node = cgraph_get_node(missing_fn_head->fndecl);
113094 + if (next_node && next_node->local.local)
113095 + cnodes = create_new_next_cgraph_nodes(cnodes, next_node, num);
113096 + return cnodes;
113097 +}
113098 +
113099 +/* Search for missing size_overflow attributes on the last nodes in ipa and collect them
113100 + * into the next_cgraph_node list. They will be the next interesting returns or callees.
113101 + */
113102 +static struct next_cgraph_node *search_overflow_attribute(struct next_cgraph_node *cnodes, struct interesting_node *cur_node)
113103 +{
113104 + unsigned int i;
113105 + tree node;
113106 + struct missing_functions *cur, *missing_fn_head = NULL;
113107 +
113108 +#if BUILDING_GCC_VERSION == 4005
113109 + for (i = 0; i < VEC_length(tree, cur_node->last_nodes); i++) {
113110 + node = VEC_index(tree, cur_node->last_nodes, i);
113111 +#elif BUILDING_GCC_VERSION <= 4007
113112 + FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, node) {
113113 +#else
113114 + FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, node) {
113115 +#endif
113116 + switch (TREE_CODE(node)) {
113117 + case PARM_DECL:
113118 + if (TREE_CODE(TREE_TYPE(node)) != INTEGER_TYPE)
113119 + break;
113120 + case FUNCTION_DECL:
113121 + missing_fn_head = create_new_missing_function(missing_fn_head, node);
113122 + break;
113123 + default:
113124 + break;
113125 + }
113126 + }
113127 +
113128 + while (missing_fn_head) {
113129 + cnodes = check_missing_overflow_attribute_and_create_next_node(cnodes, missing_fn_head);
113130 +
113131 + cur = missing_fn_head->next;
113132 + free(missing_fn_head);
113133 + missing_fn_head = cur;
113134 + }
113135 +
113136 + return cnodes;
113137 +}
113138 +
113139 +static void walk_phi_set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree result)
113140 +{
113141 + gimple phi = get_def_stmt(result);
113142 + unsigned int i, n = gimple_phi_num_args(phi);
113143 +
113144 + pointer_set_insert(visited, phi);
113145 + for (i = 0; i < n; i++) {
113146 + const_tree arg = gimple_phi_arg_def(phi, i);
113147 +
113148 + set_conditions(visited, interesting_conditions, arg);
113149 + }
113150 +}
113151 +
113152 +enum conditions {
113153 + FROM_CONST, NOT_UNARY, CAST
113154 +};
113155 +
113156 +// Search for constants, cast assignments and binary/ternary assignments
113157 +static void set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree lhs)
113158 +{
113159 + gimple def_stmt = get_def_stmt(lhs);
113160 +
113161 + if (is_gimple_constant(lhs)) {
113162 + interesting_conditions[FROM_CONST] = true;
113163 + return;
113164 + }
113165 +
113166 + if (!def_stmt)
113167 + return;
113168 +
113169 + if (pointer_set_contains(visited, def_stmt))
113170 + return;
113171 +
113172 + switch (gimple_code(def_stmt)) {
113173 + case GIMPLE_NOP:
113174 + case GIMPLE_CALL:
113175 + case GIMPLE_ASM:
113176 + return;
113177 + case GIMPLE_PHI:
113178 + return walk_phi_set_conditions(visited, interesting_conditions, lhs);
113179 + case GIMPLE_ASSIGN:
113180 + if (gimple_num_ops(def_stmt) == 2) {
113181 + const_tree rhs = gimple_assign_rhs1(def_stmt);
113182 +
113183 + if (gimple_assign_cast_p(def_stmt))
113184 + interesting_conditions[CAST] = true;
113185 +
113186 + return set_conditions(visited, interesting_conditions, rhs);
113187 + } else {
113188 + interesting_conditions[NOT_UNARY] = true;
113189 + return;
113190 + }
113191 + default:
113192 + debug_gimple_stmt(def_stmt);
113193 + gcc_unreachable();
113194 + }
113195 +}
113196 +
113197 +// determine whether duplication will be necessary or not.
113198 +static void search_interesting_conditions(struct interesting_node *cur_node, bool *interesting_conditions)
113199 +{
113200 + struct pointer_set_t *visited;
113201 +
113202 + if (gimple_assign_cast_p(cur_node->first_stmt))
113203 + interesting_conditions[CAST] = true;
113204 + else if (is_gimple_assign(cur_node->first_stmt) && gimple_num_ops(cur_node->first_stmt) > 2)
113205 + interesting_conditions[NOT_UNARY] = true;
113206 +
113207 + visited = pointer_set_create();
113208 + set_conditions(visited, interesting_conditions, cur_node->node);
113209 + pointer_set_destroy(visited);
113210 +}
113211 +
113212 +// Remove the size_overflow asm stmt and create an assignment from the input and output of the asm
113213 +static void replace_size_overflow_asm_with_assign(gimple asm_stmt, tree lhs, tree rhs)
113214 +{
113215 + gimple assign;
113216 + gimple_stmt_iterator gsi;
113217 +
113218 + // already removed
113219 + if (gimple_bb(asm_stmt) == NULL)
113220 + return;
113221 + gsi = gsi_for_stmt(asm_stmt);
113222 +
113223 + assign = gimple_build_assign(lhs, rhs);
113224 + gsi_insert_before(&gsi, assign, GSI_SAME_STMT);
113225 + SSA_NAME_DEF_STMT(lhs) = assign;
113226 +
113227 + gsi_remove(&gsi, true);
113228 +}
113229 +
113230 +// Get the field decl of a component ref for intentional_overflow checking
113231 +static const_tree search_field_decl(const_tree comp_ref)
113232 +{
113233 + const_tree field = NULL_TREE;
113234 + unsigned int i, len = TREE_OPERAND_LENGTH(comp_ref);
113235 +
113236 + for (i = 0; i < len; i++) {
113237 + field = TREE_OPERAND(comp_ref, i);
113238 + if (TREE_CODE(field) == FIELD_DECL)
113239 + break;
113240 + }
113241 + gcc_assert(TREE_CODE(field) == FIELD_DECL);
113242 + return field;
113243 +}
113244 +
113245 +/* Get the fndecl of an interesting stmt, the fndecl is the caller function if the interesting
113246 + * stmt is a return otherwise it is the callee function.
113247 + */
113248 +static const_tree get_interesting_orig_fndecl(const_gimple stmt, unsigned int argnum)
113249 +{
113250 + const_tree fndecl;
113251 +
113252 + if (argnum == 0)
113253 + fndecl = current_function_decl;
113254 + else
113255 + fndecl = gimple_call_fndecl(stmt);
113256 +
113257 + if (fndecl == NULL_TREE)
113258 + return NULL_TREE;
113259 +
113260 + return DECL_ORIGIN(fndecl);
113261 +}
113262 +
113263 +/* Get the param of the intentional_overflow attribute.
113264 + * * 0: MARK_NOT_INTENTIONAL
113265 + * * 1..MAX_PARAM: MARK_YES
113266 + * * -1: MARK_TURN_OFF
113267 + */
113268 +static tree get_attribute_param(const_tree decl)
113269 +{
113270 + const_tree attr;
113271 +
113272 + if (decl == NULL_TREE)
113273 + return NULL_TREE;
113274 +
113275 + attr = lookup_attribute("intentional_overflow", DECL_ATTRIBUTES(decl));
113276 + if (!attr || !TREE_VALUE(attr))
113277 + return NULL_TREE;
113278 +
113279 + return TREE_VALUE(attr);
113280 +}
113281 +
113282 +// MARK_TURN_OFF
113283 +static bool is_turn_off_intentional_attr(const_tree decl)
113284 +{
113285 + const_tree param_head;
113286 +
113287 + param_head = get_attribute_param(decl);
113288 + if (param_head == NULL_TREE)
113289 + return false;
113290 +
113291 + if (TREE_INT_CST_HIGH(TREE_VALUE(param_head)) == -1)
113292 + return true;
113293 + return false;
113294 +}
113295 +
113296 +// MARK_NOT_INTENTIONAL
113297 +static bool is_end_intentional_intentional_attr(const_tree decl, unsigned int argnum)
113298 +{
113299 + const_tree param_head;
113300 +
113301 + if (argnum == 0)
113302 + return false;
113303 +
113304 + param_head = get_attribute_param(decl);
113305 + if (param_head == NULL_TREE)
113306 + return false;
113307 +
113308 + if (!TREE_INT_CST_LOW(TREE_VALUE(param_head)))
113309 + return true;
113310 + return false;
113311 +}
113312 +
113313 +// MARK_YES
113314 +static bool is_yes_intentional_attr(const_tree decl, unsigned int argnum)
113315 +{
113316 + tree param, param_head;
113317 +
113318 + if (argnum == 0)
113319 + return false;
113320 +
113321 + param_head = get_attribute_param(decl);
113322 + for (param = param_head; param; param = TREE_CHAIN(param))
113323 + if (argnum == TREE_INT_CST_LOW(TREE_VALUE(param)))
113324 + return true;
113325 + return false;
113326 +}
113327 +
113328 +static const char *get_asm_string(const_gimple stmt)
113329 +{
113330 + if (!stmt)
113331 + return NULL;
113332 + if (gimple_code(stmt) != GIMPLE_ASM)
113333 + return NULL;
113334 +
113335 + return gimple_asm_string(stmt);
113336 +}
113337 +
113338 +static bool is_size_overflow_intentional_asm_turn_off(const_gimple stmt)
113339 +{
113340 + const char *str;
113341 +
113342 + str = get_asm_string(stmt);
113343 + if (!str)
113344 + return false;
113345 + return !strcmp(str, TURN_OFF_ASM_STR);
113346 +}
113347 +
113348 +static bool is_size_overflow_intentional_asm_yes(const_gimple stmt)
113349 +{
113350 + const char *str;
113351 +
113352 + str = get_asm_string(stmt);
113353 + if (!str)
113354 + return false;
113355 + return !strcmp(str, YES_ASM_STR);
113356 +}
113357 +
113358 +static bool is_size_overflow_asm(const_gimple stmt)
113359 +{
113360 + const char *str;
113361 +
113362 + str = get_asm_string(stmt);
113363 + if (!str)
113364 + return false;
113365 + return !strncmp(str, "# size_overflow", 15);
113366 +}
113367 +
113368 +static void print_missing_intentional(enum mark callee_attr, enum mark caller_attr, const_tree decl, unsigned int argnum)
113369 +{
113370 + location_t loc;
113371 +
113372 + if (caller_attr == MARK_NO || caller_attr == MARK_NOT_INTENTIONAL || caller_attr == MARK_TURN_OFF)
113373 + return;
113374 +
113375 + if (callee_attr == MARK_NOT_INTENTIONAL || callee_attr == MARK_YES)
113376 + return;
113377 +
113378 + loc = DECL_SOURCE_LOCATION(decl);
113379 + inform(loc, "The intentional_overflow attribute is missing from +%s+%u+", NAME(decl), argnum);
113380 +}
113381 +
113382 +/* Get the type of the intentional_overflow attribute of a node
113383 + * * MARK_TURN_OFF
113384 + * * MARK_YES
113385 + * * MARK_NO
113386 + * * MARK_NOT_INTENTIONAL
113387 + */
113388 +static enum mark get_intentional_attr_type(const_tree node)
113389 +{
113390 + const_tree cur_decl;
113391 +
113392 + if (node == NULL_TREE)
113393 + return MARK_NO;
113394 +
113395 + switch (TREE_CODE(node)) {
113396 + case COMPONENT_REF:
113397 + cur_decl = search_field_decl(node);
113398 + if (is_turn_off_intentional_attr(cur_decl))
113399 + return MARK_TURN_OFF;
113400 + if (is_end_intentional_intentional_attr(cur_decl, 1))
113401 + return MARK_YES;
113402 + break;
113403 + case PARM_DECL: {
113404 + unsigned int argnum;
113405 +
113406 + cur_decl = DECL_ORIGIN(current_function_decl);
113407 + argnum = find_arg_number_tree(node, cur_decl);
113408 + if (argnum == CANNOT_FIND_ARG)
113409 + return MARK_NO;
113410 + if (is_yes_intentional_attr(cur_decl, argnum))
113411 + return MARK_YES;
113412 + if (is_end_intentional_intentional_attr(cur_decl, argnum))
113413 + return MARK_NOT_INTENTIONAL;
113414 + break;
113415 + }
113416 + case FUNCTION_DECL:
113417 + if (is_turn_off_intentional_attr(DECL_ORIGIN(node)))
113418 + return MARK_TURN_OFF;
113419 + break;
113420 + default:
113421 + break;
113422 + }
113423 + return MARK_NO;
113424 +}
113425 +
113426 +// Search for the intentional_overflow attribute on the last nodes
113427 +static enum mark search_last_nodes_intentional(struct interesting_node *cur_node)
113428 +{
113429 + unsigned int i;
113430 + tree last_node;
113431 + enum mark mark = MARK_NO;
113432 +
113433 +#if BUILDING_GCC_VERSION == 4005
113434 + for (i = 0; i < VEC_length(tree, cur_node->last_nodes); i++) {
113435 + last_node = VEC_index(tree, cur_node->last_nodes, i);
113436 +#elif BUILDING_GCC_VERSION <= 4007
113437 + FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, last_node) {
113438 +#else
113439 + FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, last_node) {
113440 +#endif
113441 + mark = get_intentional_attr_type(last_node);
113442 + if (mark != MARK_NO)
113443 + break;
113444 + }
113445 + return mark;
113446 +}
113447 +
113448 +/* Check the intentional kind of size_overflow asm stmt (created by the gimple pass) and
113449 + * set the appropriate intentional_overflow type. Delete the asm stmt in the end.
113450 + */
113451 +static bool is_intentional_attribute_from_gimple(struct interesting_node *cur_node)
113452 +{
113453 + if (!cur_node->intentional_mark_from_gimple)
113454 + return false;
113455 +
113456 + if (is_size_overflow_intentional_asm_yes(cur_node->intentional_mark_from_gimple))
113457 + cur_node->intentional_attr_cur_fndecl = MARK_YES;
113458 + else
113459 + cur_node->intentional_attr_cur_fndecl = MARK_TURN_OFF;
113460 +
113461 + // skip param decls
113462 + if (gimple_asm_noutputs(cur_node->intentional_mark_from_gimple) == 0)
113463 + return true;
113464 + return true;
113465 +}
113466 +
113467 +/* Search intentional_overflow attribute on caller and on callee too.
113468 + * 0</MARK_YES: no dup, search size_overflow and intentional_overflow attributes
113469 + * 0/MARK_NOT_INTENTIONAL: no dup, search size_overflow attribute (int)
113470 + * -1/MARK_TURN_OFF: no dup, no search, current_function_decl -> no dup
113471 +*/
113472 +static void check_intentional_attribute_ipa(struct interesting_node *cur_node)
113473 +{
113474 + const_tree fndecl;
113475 +
113476 + if (is_intentional_attribute_from_gimple(cur_node))
113477 + return;
113478 +
113479 + if (is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl))) {
113480 + cur_node->intentional_attr_cur_fndecl = MARK_TURN_OFF;
113481 + return;
113482 + }
113483 +
113484 + if (gimple_code(cur_node->first_stmt) == GIMPLE_ASM) {
113485 + cur_node->intentional_attr_cur_fndecl = MARK_NOT_INTENTIONAL;
113486 + return;
113487 + }
113488 +
113489 + if (gimple_code(cur_node->first_stmt) == GIMPLE_ASSIGN)
113490 + return;
113491 +
113492 + fndecl = get_interesting_orig_fndecl(cur_node->first_stmt, cur_node->num);
113493 + if (is_turn_off_intentional_attr(fndecl)) {
113494 + cur_node->intentional_attr_decl = MARK_TURN_OFF;
113495 + return;
113496 + }
113497 +
113498 + if (is_end_intentional_intentional_attr(fndecl, cur_node->num))
113499 + cur_node->intentional_attr_decl = MARK_NOT_INTENTIONAL;
113500 + else if (is_yes_intentional_attr(fndecl, cur_node->num))
113501 + cur_node->intentional_attr_decl = MARK_YES;
113502 +
113503 + cur_node->intentional_attr_cur_fndecl = search_last_nodes_intentional(cur_node);
113504 + print_missing_intentional(cur_node->intentional_attr_decl, cur_node->intentional_attr_cur_fndecl, cur_node->fndecl, cur_node->num);
113505 +}
113506 +
113507 +// e.g., 3.8.2, 64, arch/x86/ia32/ia32_signal.c copy_siginfo_from_user32(): compat_ptr() u32 max
113508 +static bool skip_asm(const_tree arg)
113509 +{
113510 + gimple def_stmt = get_def_stmt(arg);
113511 +
113512 + if (!def_stmt || !gimple_assign_cast_p(def_stmt))
113513 + return false;
113514 +
113515 + def_stmt = get_def_stmt(gimple_assign_rhs1(def_stmt));
113516 + return def_stmt && gimple_code(def_stmt) == GIMPLE_ASM;
113517 +}
113518 +
113519 +static void walk_use_def_phi(struct pointer_set_t *visited, struct interesting_node *cur_node, tree result)
113520 +{
113521 + gimple phi = get_def_stmt(result);
113522 + unsigned int i, n = gimple_phi_num_args(phi);
113523 +
113524 + pointer_set_insert(visited, phi);
113525 + for (i = 0; i < n; i++) {
113526 + tree arg = gimple_phi_arg_def(phi, i);
113527 +
113528 + walk_use_def(visited, cur_node, arg);
113529 + }
113530 +}
113531 +
113532 +static void walk_use_def_binary(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs)
113533 +{
113534 + gimple def_stmt = get_def_stmt(lhs);
113535 + tree rhs1, rhs2;
113536 +
113537 + rhs1 = gimple_assign_rhs1(def_stmt);
113538 + rhs2 = gimple_assign_rhs2(def_stmt);
113539 +
113540 + walk_use_def(visited, cur_node, rhs1);
113541 + walk_use_def(visited, cur_node, rhs2);
113542 +}
113543 +
113544 +static void insert_last_node(struct interesting_node *cur_node, tree node)
113545 +{
113546 + unsigned int i;
113547 + tree element;
113548 + enum tree_code code;
113549 +
113550 + gcc_assert(node != NULL_TREE);
113551 +
113552 + if (is_gimple_constant(node))
113553 + return;
113554 +
113555 + code = TREE_CODE(node);
113556 + if (code == VAR_DECL) {
113557 + node = DECL_ORIGIN(node);
113558 + code = TREE_CODE(node);
113559 + }
113560 +
113561 + if (code != PARM_DECL && code != FUNCTION_DECL && code != COMPONENT_REF)
113562 + return;
113563 +
113564 +#if BUILDING_GCC_VERSION == 4005
113565 + for (i = 0; i < VEC_length(tree, cur_node->last_nodes); i++) {
113566 + element = VEC_index(tree, cur_node->last_nodes, i);
113567 +#elif BUILDING_GCC_VERSION <= 4007
113568 + FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, element) {
113569 +#else
113570 + FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, element) {
113571 +#endif
113572 + if (operand_equal_p(node, element, 0))
113573 + return;
113574 + }
113575 +
113576 +#if BUILDING_GCC_VERSION <= 4007
113577 + gcc_assert(VEC_length(tree, cur_node->last_nodes) < VEC_LEN);
113578 + VEC_safe_push(tree, gc, cur_node->last_nodes, node);
113579 +#else
113580 + gcc_assert(cur_node->last_nodes->length() < VEC_LEN);
113581 + vec_safe_push(cur_node->last_nodes, node);
113582 +#endif
113583 +}
113584 +
113585 +// a size_overflow asm stmt in the control flow doesn't stop the recursion
113586 +static void handle_asm_stmt(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs, const_gimple stmt)
113587 +{
113588 + if (!is_size_overflow_asm(stmt))
113589 + walk_use_def(visited, cur_node, SSA_NAME_VAR(lhs));
113590 +}
113591 +
113592 +/* collect the parm_decls and fndecls (for checking a missing size_overflow attribute (ret or arg) or intentional_overflow)
113593 + * and component refs (for checking the intentional_overflow attribute).
113594 + */
113595 +static void walk_use_def(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs)
113596 +{
113597 + const_gimple def_stmt;
113598 +
113599 + if (TREE_CODE(lhs) != SSA_NAME) {
113600 + insert_last_node(cur_node, lhs);
113601 + return;
113602 + }
113603 +
113604 + def_stmt = get_def_stmt(lhs);
113605 + if (!def_stmt)
113606 + return;
113607 +
113608 + if (pointer_set_insert(visited, def_stmt))
113609 + return;
113610 +
113611 + switch (gimple_code(def_stmt)) {
113612 + case GIMPLE_NOP:
113613 + return walk_use_def(visited, cur_node, SSA_NAME_VAR(lhs));
113614 + case GIMPLE_ASM:
113615 + return handle_asm_stmt(visited, cur_node, lhs, def_stmt);
113616 + case GIMPLE_CALL: {
113617 + tree fndecl = gimple_call_fndecl(def_stmt);
113618 +
113619 + if (fndecl == NULL_TREE)
113620 + return;
113621 + insert_last_node(cur_node, fndecl);
113622 + return;
113623 + }
113624 + case GIMPLE_PHI:
113625 + return walk_use_def_phi(visited, cur_node, lhs);
113626 + case GIMPLE_ASSIGN:
113627 + switch (gimple_num_ops(def_stmt)) {
113628 + case 2:
113629 + return walk_use_def(visited, cur_node, gimple_assign_rhs1(def_stmt));
113630 + case 3:
113631 + return walk_use_def_binary(visited, cur_node, lhs);
113632 + }
113633 + default:
113634 + debug_gimple_stmt((gimple)def_stmt);
113635 + error("%s: unknown gimple code", __func__);
113636 + gcc_unreachable();
113637 + }
113638 +}
113639 +
113640 +// Collect all the last nodes for checking the intentional_overflow and size_overflow attributes
113641 +static void set_last_nodes(struct interesting_node *cur_node)
113642 +{
113643 + struct pointer_set_t *visited;
113644 +
113645 + visited = pointer_set_create();
113646 + walk_use_def(visited, cur_node, cur_node->node);
113647 + pointer_set_destroy(visited);
113648 +}
113649 +
113650 +enum precond {
113651 + NO_ATTRIBUTE_SEARCH, NO_CHECK_INSERT, NONE
113652 +};
113653 +
113654 +/* 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.
113655 + * There is only missing size_overflow attribute checking if the intentional_overflow attribute is the mark_no type.
113656 + * Stmt duplication is unnecessary if there are no binary/ternary assignements or if the unary assignment isn't a cast.
113657 + * 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.
113658 + */
113659 +static enum precond check_preconditions(struct interesting_node *cur_node)
113660 +{
113661 + bool interesting_conditions[3] = {false, false, false};
113662 +
113663 + set_last_nodes(cur_node);
113664 +
113665 + check_intentional_attribute_ipa(cur_node);
113666 + if (cur_node->intentional_attr_decl == MARK_TURN_OFF || cur_node->intentional_attr_cur_fndecl == MARK_TURN_OFF)
113667 + return NO_ATTRIBUTE_SEARCH;
113668 +
113669 + search_interesting_conditions(cur_node, interesting_conditions);
113670 +
113671 + // error code
113672 + if (interesting_conditions[CAST] && interesting_conditions[FROM_CONST] && !interesting_conditions[NOT_UNARY])
113673 + return NO_ATTRIBUTE_SEARCH;
113674 +
113675 + // unnecessary overflow check
113676 + if (!interesting_conditions[CAST] && !interesting_conditions[NOT_UNARY])
113677 + return NO_CHECK_INSERT;
113678 +
113679 + if (cur_node->intentional_attr_cur_fndecl != MARK_NO)
113680 + return NO_CHECK_INSERT;
113681 +
113682 + return NONE;
113683 +}
113684 +
113685 +/* This function calls the main recursion function (expand) that duplicates the stmts. Before that it checks the intentional_overflow attribute and asm stmts,
113686 + * 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
113687 + * in the original stmt (first stmt) and it inserts the overflow check for the arg of the callee or for the return value.
113688 + */
113689 +static struct next_cgraph_node *handle_interesting_stmt(struct next_cgraph_node *cnodes, struct interesting_node *cur_node, struct cgraph_node *caller_node)
113690 +{
113691 + enum precond ret;
113692 + struct pointer_set_t *visited;
113693 + tree new_node, orig_node = cur_node->node;
113694 +
113695 + ret = check_preconditions(cur_node);
113696 + if (ret == NO_ATTRIBUTE_SEARCH)
113697 + return cnodes;
113698 +
113699 + cnodes = search_overflow_attribute(cnodes, cur_node);
113700 +
113701 + if (ret == NO_CHECK_INSERT)
113702 + return cnodes;
113703 +
113704 + visited = pointer_set_create();
113705 + new_node = expand(visited, caller_node, orig_node);
113706 + pointer_set_destroy(visited);
113707 +
113708 + if (new_node == NULL_TREE)
113709 + return cnodes;
113710 +
113711 + change_orig_node(cur_node, new_node);
113712 + check_size_overflow(caller_node, cur_node->first_stmt, TREE_TYPE(new_node), new_node, orig_node, BEFORE_STMT);
113713 +
113714 + return cnodes;
113715 +}
113716 +
113717 +// Check visited interesting nodes.
113718 +static bool is_in_interesting_node(struct interesting_node *head, const_gimple first_stmt, const_tree node, unsigned int num)
113719 +{
113720 + struct interesting_node *cur;
113721 +
113722 + for (cur = head; cur; cur = cur->next) {
113723 + if (!operand_equal_p(node, cur->node, 0))
113724 + continue;
113725 + if (num != cur->num)
113726 + continue;
113727 + if (first_stmt == cur->first_stmt)
113728 + return true;
113729 + }
113730 + return false;
113731 +}
113732 +
113733 +/* Create an interesting node. The ipa pass starts to duplicate from these stmts.
113734 + 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
113735 + 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
113736 + the intentional_overflow attribute check. They are collected by set_last_nodes().
113737 + num: arg count of a call stmt or 0 when it is a ret
113738 + node: the recursion starts from here, it is a call arg or a return value
113739 + 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.
113740 + intentional_attr_decl: intentional_overflow attribute of the callee function
113741 + intentional_attr_cur_fndecl: intentional_overflow attribute of the caller function
113742 + intentional_mark_from_gimple: the intentional overflow type of size_overflow asm stmt from gimple if it exists
113743 + */
113744 +static struct interesting_node *create_new_interesting_node(struct interesting_node *head, gimple first_stmt, tree node, unsigned int num, gimple asm_stmt)
113745 +{
113746 + struct interesting_node *new_node;
113747 + tree fndecl;
113748 + enum gimple_code code;
113749 +
113750 + gcc_assert(node != NULL_TREE);
113751 + code = gimple_code(first_stmt);
113752 + gcc_assert(code == GIMPLE_CALL || code == GIMPLE_ASM || code == GIMPLE_ASSIGN || code == GIMPLE_RETURN);
113753 +
113754 + if (num == CANNOT_FIND_ARG)
113755 + return head;
113756 +
113757 + if (skip_types(node))
113758 + return head;
113759 +
113760 + if (skip_asm(node))
113761 + return head;
113762 +
113763 + if (is_gimple_call(first_stmt))
113764 + fndecl = gimple_call_fndecl(first_stmt);
113765 + else
113766 + fndecl = current_function_decl;
113767 +
113768 + if (fndecl == NULL_TREE)
113769 + return head;
113770 +
113771 + if (is_in_interesting_node(head, first_stmt, node, num))
113772 + return head;
113773 +
113774 + new_node = (struct interesting_node *)xmalloc(sizeof(*new_node));
113775 +
113776 + new_node->next = NULL;
113777 + new_node->first_stmt = first_stmt;
113778 +#if BUILDING_GCC_VERSION <= 4007
113779 + new_node->last_nodes = VEC_alloc(tree, gc, VEC_LEN);
113780 +#else
113781 + vec_alloc(new_node->last_nodes, VEC_LEN);
113782 +#endif
113783 + new_node->num = num;
113784 + new_node->node = node;
113785 + new_node->fndecl = fndecl;
113786 + new_node->intentional_attr_decl = MARK_NO;
113787 + new_node->intentional_attr_cur_fndecl = MARK_NO;
113788 + new_node->intentional_mark_from_gimple = asm_stmt;
113789 +
113790 + if (!head)
113791 + return new_node;
113792 +
113793 + new_node->next = head;
113794 + return new_node;
113795 +}
113796 +
113797 +/* 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).
113798 + * If the ret stmt is in the next cgraph node list then it's an interesting ret.
113799 + */
113800 +static struct interesting_node *handle_stmt_by_cgraph_nodes_ret(struct interesting_node *head, gimple stmt, struct next_cgraph_node *next_node)
113801 +{
113802 + struct next_cgraph_node *cur_node;
113803 + tree ret = gimple_return_retval(stmt);
113804 +
113805 + if (ret == NULL_TREE)
113806 + return head;
113807 +
113808 + for (cur_node = next_node; cur_node; cur_node = cur_node->next) {
113809 + if (!operand_equal_p(cur_node->callee_fndecl, DECL_ORIGIN(current_function_decl), 0))
113810 + continue;
113811 + if (cur_node->num == 0)
113812 + head = create_new_interesting_node(head, stmt, ret, 0, NOT_INTENTIONAL_ASM);
113813 + }
113814 +
113815 + return head;
113816 +}
113817 +
113818 +/* 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).
113819 + * If the call stmt is in the next cgraph node list then it's an interesting call.
113820 + */
113821 +static struct interesting_node *handle_stmt_by_cgraph_nodes_call(struct interesting_node *head, gimple stmt, struct next_cgraph_node *next_node)
113822 +{
113823 + unsigned int argnum;
113824 + tree fndecl, arg;
113825 + struct next_cgraph_node *cur_node;
113826 +
113827 + fndecl = gimple_call_fndecl(stmt);
113828 + if (fndecl == NULL_TREE)
113829 + return head;
113830 +
113831 + for (cur_node = next_node; cur_node; cur_node = cur_node->next) {
113832 + if (!operand_equal_p(cur_node->callee_fndecl, fndecl, 0))
113833 + continue;
113834 + argnum = get_correct_arg_count(cur_node->num, fndecl);
113835 + gcc_assert(argnum != CANNOT_FIND_ARG);
113836 + if (argnum == 0)
113837 + continue;
113838 +
113839 + arg = gimple_call_arg(stmt, argnum - 1);
113840 + head = create_new_interesting_node(head, stmt, arg, argnum, NOT_INTENTIONAL_ASM);
113841 + }
113842 +
113843 + return head;
113844 +}
113845 +
113846 +static unsigned int check_ops(const_tree orig_node, const_tree node, unsigned int ret_count)
113847 +{
113848 + if (!operand_equal_p(orig_node, node, 0))
113849 + return WRONG_NODE;
113850 + if (skip_types(node))
113851 + return WRONG_NODE;
113852 + return ret_count;
113853 +}
113854 +
113855 +// Get the index of the rhs node in an assignment
113856 +static unsigned int get_assign_ops_count(const_gimple stmt, tree node)
113857 +{
113858 + const_tree rhs1, rhs2;
113859 + unsigned int ret;
113860 +
113861 + gcc_assert(stmt);
113862 + gcc_assert(is_gimple_assign(stmt));
113863 +
113864 + rhs1 = gimple_assign_rhs1(stmt);
113865 + gcc_assert(rhs1 != NULL_TREE);
113866 +
113867 + switch (gimple_num_ops(stmt)) {
113868 + case 2:
113869 + return check_ops(node, rhs1, 1);
113870 + case 3:
113871 + ret = check_ops(node, rhs1, 1);
113872 + if (ret != WRONG_NODE)
113873 + return ret;
113874 +
113875 + rhs2 = gimple_assign_rhs2(stmt);
113876 + gcc_assert(rhs2 != NULL_TREE);
113877 + return check_ops(node, rhs2, 2);
113878 + default:
113879 + gcc_unreachable();
113880 + }
113881 +}
113882 +
113883 +// Find the correct arg number of a call stmt. It is needed when the interesting function is a cloned function.
113884 +static unsigned int find_arg_number_gimple(const_tree arg, const_gimple stmt)
113885 +{
113886 + unsigned int i;
113887 +
113888 + if (gimple_call_fndecl(stmt) == NULL_TREE)
113889 + return CANNOT_FIND_ARG;
113890 +
113891 + for (i = 0; i < gimple_call_num_args(stmt); i++) {
113892 + tree node;
113893 +
113894 + node = gimple_call_arg(stmt, i);
113895 + if (!operand_equal_p(arg, node, 0))
113896 + continue;
113897 + if (!skip_types(node))
113898 + return i + 1;
113899 + }
113900 +
113901 + return CANNOT_FIND_ARG;
113902 +}
113903 +
113904 +/* starting from the size_overflow asm stmt collect interesting stmts. They can be
113905 + * any of return, call or assignment stmts (because of inlining).
113906 + */
113907 +static struct interesting_node *get_interesting_ret_or_call(struct pointer_set_t *visited, struct interesting_node *head, tree node, gimple intentional_asm)
113908 +{
113909 + use_operand_p use_p;
113910 + imm_use_iterator imm_iter;
113911 + unsigned int argnum;
113912 +
113913 + gcc_assert(TREE_CODE(node) == SSA_NAME);
113914 +
113915 + if (pointer_set_insert(visited, node))
113916 + return head;
113917 +
113918 + FOR_EACH_IMM_USE_FAST(use_p, imm_iter, node) {
113919 + gimple stmt = USE_STMT(use_p);
113920 +
113921 + if (stmt == NULL)
113922 + return head;
113923 + if (is_gimple_debug(stmt))
113924 + continue;
113925 +
113926 + switch (gimple_code(stmt)) {
113927 + case GIMPLE_CALL:
113928 + argnum = find_arg_number_gimple(node, stmt);
113929 + head = create_new_interesting_node(head, stmt, node, argnum, intentional_asm);
113930 + break;
113931 + case GIMPLE_RETURN:
113932 + head = create_new_interesting_node(head, stmt, node, 0, intentional_asm);
113933 + break;
113934 + case GIMPLE_ASSIGN:
113935 + argnum = get_assign_ops_count(stmt, node);
113936 + head = create_new_interesting_node(head, stmt, node, argnum, intentional_asm);
113937 + break;
113938 + case GIMPLE_PHI: {
113939 + tree result = gimple_phi_result(stmt);
113940 + head = get_interesting_ret_or_call(visited, head, result, intentional_asm);
113941 + break;
113942 + }
113943 + case GIMPLE_ASM:
113944 + if (gimple_asm_noutputs(stmt) != 0)
113945 + break;
113946 + if (!is_size_overflow_asm(stmt))
113947 + break;
113948 + head = create_new_interesting_node(head, stmt, node, 1, intentional_asm);
113949 + break;
113950 + case GIMPLE_COND:
113951 + case GIMPLE_SWITCH:
113952 + break;
113953 + default:
113954 + debug_gimple_stmt(stmt);
113955 + gcc_unreachable();
113956 + break;
113957 + }
113958 + }
113959 + return head;
113960 +}
113961 +
113962 +static void remove_size_overflow_asm(gimple stmt)
113963 +{
113964 + gimple_stmt_iterator gsi;
113965 + tree input, output;
113966 +
113967 + if (!is_size_overflow_asm(stmt))
113968 + return;
113969 +
113970 + if (gimple_asm_noutputs(stmt) == 0) {
113971 + gsi = gsi_for_stmt(stmt);
113972 + gsi_remove(&gsi, true);
113973 + return;
113974 + }
113975 +
113976 + input = gimple_asm_input_op(stmt, 0);
113977 + output = gimple_asm_output_op(stmt, 0);
113978 + replace_size_overflow_asm_with_assign(stmt, TREE_VALUE(output), TREE_VALUE(input));
113979 +}
113980 +
113981 +/* handle the size_overflow asm stmts from the gimple pass and collect the interesting stmts.
113982 + * If the asm stmt is a parm_decl kind (noutputs == 0) then remove it.
113983 + * If it is a simple asm stmt then replace it with an assignment from the asm input to the asm output.
113984 + */
113985 +static struct interesting_node *handle_stmt_by_size_overflow_asm(gimple stmt, struct interesting_node *head)
113986 +{
113987 + const_tree output;
113988 + struct pointer_set_t *visited;
113989 + gimple intentional_asm = NOT_INTENTIONAL_ASM;
113990 +
113991 + if (!is_size_overflow_asm(stmt))
113992 + return head;
113993 +
113994 + if (is_size_overflow_intentional_asm_yes(stmt) || is_size_overflow_intentional_asm_turn_off(stmt))
113995 + intentional_asm = stmt;
113996 +
113997 + gcc_assert(gimple_asm_ninputs(stmt) == 1);
113998 +
113999 + if (gimple_asm_noutputs(stmt) == 0 && is_size_overflow_intentional_asm_turn_off(stmt))
114000 + return head;
114001 +
114002 + if (gimple_asm_noutputs(stmt) == 0) {
114003 + const_tree input;
114004 +
114005 + if (!is_size_overflow_intentional_asm_turn_off(stmt))
114006 + return head;
114007 +
114008 + input = gimple_asm_input_op(stmt, 0);
114009 + remove_size_overflow_asm(stmt);
114010 + if (is_gimple_constant(TREE_VALUE(input)))
114011 + return head;
114012 + visited = pointer_set_create();
114013 + head = get_interesting_ret_or_call(visited, head, TREE_VALUE(input), intentional_asm);
114014 + pointer_set_destroy(visited);
114015 + return head;
114016 + }
114017 +
114018 + if (!is_size_overflow_intentional_asm_yes(stmt) && !is_size_overflow_intentional_asm_turn_off(stmt))
114019 + remove_size_overflow_asm(stmt);
114020 +
114021 + visited = pointer_set_create();
114022 + output = gimple_asm_output_op(stmt, 0);
114023 + head = get_interesting_ret_or_call(visited, head, TREE_VALUE(output), intentional_asm);
114024 + pointer_set_destroy(visited);
114025 + return head;
114026 +}
114027 +
114028 +/* Iterate over all the stmts of a function and look for the size_overflow asm stmts (they were created in the gimple pass)
114029 + * or a call stmt or a return stmt and store them in the interesting_node list
114030 + */
114031 +static struct interesting_node *collect_interesting_stmts(struct next_cgraph_node *next_node)
114032 +{
114033 + basic_block bb;
114034 + struct interesting_node *head = NULL;
114035 +
114036 + FOR_ALL_BB(bb) {
114037 + gimple_stmt_iterator gsi;
114038 +
114039 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
114040 + enum gimple_code code;
114041 + gimple stmt = gsi_stmt(gsi);
114042 +
114043 + code = gimple_code(stmt);
114044 +
114045 + if (code == GIMPLE_ASM)
114046 + head = handle_stmt_by_size_overflow_asm(stmt, head);
114047 +
114048 + if (!next_node)
114049 + continue;
114050 + if (code == GIMPLE_CALL)
114051 + head = handle_stmt_by_cgraph_nodes_call(head, stmt, next_node);
114052 + if (code == GIMPLE_RETURN)
114053 + head = handle_stmt_by_cgraph_nodes_ret(head, stmt, next_node);
114054 + }
114055 + }
114056 + return head;
114057 +}
114058 +
114059 +static void set_current_function_decl(tree fndecl)
114060 +{
114061 + gcc_assert(fndecl != NULL_TREE);
114062 +
114063 + push_cfun(DECL_STRUCT_FUNCTION(fndecl));
114064 + calculate_dominance_info(CDI_DOMINATORS);
114065 + current_function_decl = fndecl;
114066 +}
114067 +
114068 +static void unset_current_function_decl(void)
114069 +{
114070 + free_dominance_info(CDI_DOMINATORS);
114071 + pop_cfun();
114072 + current_function_decl = NULL_TREE;
114073 +}
114074 +
114075 +static void free_interesting_node(struct interesting_node *head)
114076 +{
114077 + struct interesting_node *cur;
114078 +
114079 + while (head) {
114080 + cur = head->next;
114081 +#if BUILDING_GCC_VERSION <= 4007
114082 + VEC_free(tree, gc, head->last_nodes);
114083 +#else
114084 + vec_free(head->last_nodes);
114085 +#endif
114086 + free(head);
114087 + head = cur;
114088 + }
114089 +}
114090 +
114091 +static struct visited *insert_visited_function(struct visited *head, struct interesting_node *cur_node)
114092 +{
114093 + struct visited *new_visited;
114094 +
114095 + new_visited = (struct visited *)xmalloc(sizeof(*new_visited));
114096 + new_visited->fndecl = cur_node->fndecl;
114097 + new_visited->num = cur_node->num;
114098 + new_visited->first_stmt = cur_node->first_stmt;
114099 + new_visited->next = NULL;
114100 +
114101 + if (!head)
114102 + return new_visited;
114103 +
114104 + new_visited->next = head;
114105 + return new_visited;
114106 +}
114107 +
114108 +/* 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
114109 + * it is a visited function.
114110 + */
114111 +static bool is_visited_function(struct visited *head, struct interesting_node *cur_node)
114112 +{
114113 + struct visited *cur;
114114 +
114115 + if (!head)
114116 + return false;
114117 +
114118 + for (cur = head; cur; cur = cur->next) {
114119 + if (!operand_equal_p(cur_node->fndecl, cur->fndecl, 0))
114120 + continue;
114121 + if (cur_node->num != cur->num)
114122 + continue;
114123 + if (cur_node->first_stmt == cur->first_stmt)
114124 + return true;
114125 + }
114126 + return false;
114127 +}
114128 +
114129 +static void free_next_cgraph_node(struct next_cgraph_node *head)
114130 +{
114131 + struct next_cgraph_node *cur;
114132 +
114133 + while (head) {
114134 + cur = head->next;
114135 + free(head);
114136 + head = cur;
114137 + }
114138 +}
114139 +
114140 +static void remove_all_size_overflow_asm(void)
114141 +{
114142 + basic_block bb;
114143 +
114144 + FOR_ALL_BB(bb) {
114145 + gimple_stmt_iterator si;
114146 +
114147 + for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
114148 + remove_size_overflow_asm(gsi_stmt(si));
114149 + }
114150 +}
114151 +
114152 +/* Main recursive walk of the ipa pass: iterate over the collected interesting stmts in a function
114153 + * (they are interesting if they have an associated size_overflow asm stmt) and recursively walk
114154 + * the newly collected interesting functions (they are interesting if there is control flow between
114155 + * the interesting stmts and them).
114156 + */
114157 +static struct visited *handle_function(struct cgraph_node *node, struct next_cgraph_node *next_node, struct visited *visited)
114158 +{
114159 + struct interesting_node *head, *cur_node;
114160 + struct next_cgraph_node *cur_cnodes, *cnodes_head = NULL;
114161 +
114162 +#if BUILDING_GCC_VERSION <= 4007
114163 + set_current_function_decl(node->decl);
114164 +#else
114165 + set_current_function_decl(node->symbol.decl);
114166 +#endif
114167 + call_count = 0;
114168 +
114169 + head = collect_interesting_stmts(next_node);
114170 + for (cur_node = head; cur_node; cur_node = cur_node->next) {
114171 + if (is_visited_function(visited, cur_node))
114172 + continue;
114173 + cnodes_head = handle_interesting_stmt(cnodes_head, cur_node, node);
114174 + visited = insert_visited_function(visited, cur_node);
114175 + }
114176 +
114177 + free_interesting_node(head);
114178 + remove_all_size_overflow_asm();
114179 + unset_current_function_decl();
114180 +
114181 + for (cur_cnodes = cnodes_head; cur_cnodes; cur_cnodes = cur_cnodes->next)
114182 + visited = handle_function(cur_cnodes->current_function, cur_cnodes, visited);
114183 +
114184 + free_next_cgraph_node(cnodes_head);
114185 + return visited;
114186 +}
114187 +
114188 +static void free_visited(struct visited *head)
114189 +{
114190 + struct visited *cur;
114191 +
114192 + while (head) {
114193 + cur = head->next;
114194 + free(head);
114195 + head = cur;
114196 + }
114197 +}
114198 +
114199 +// erase the local flag
114200 +static void set_plf_false(void)
114201 +{
114202 + basic_block bb;
114203 +
114204 + FOR_ALL_BB(bb) {
114205 + gimple_stmt_iterator si;
114206 +
114207 + for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
114208 + gimple_set_plf(gsi_stmt(si), MY_STMT, false);
114209 + for (si = gsi_start_phis(bb); !gsi_end_p(si); gsi_next(&si))
114210 + gimple_set_plf(gsi_stmt(si), MY_STMT, false);
114211 + }
114212 +}
114213 +
114214 +#if BUILDING_GCC_VERSION <= 4006
114215 +static bool cgraph_function_with_gimple_body_p(struct cgraph_node *node)
114216 +{
114217 + return node->analyzed && !node->thunk.thunk_p && !node->alias;
114218 +}
114219 +
114220 +static struct cgraph_node *cgraph_first_function_with_gimple_body(void)
114221 +{
114222 + struct cgraph_node *node;
114223 +
114224 + for (node = cgraph_nodes; node; node = node->next) {
114225 + if (cgraph_function_with_gimple_body_p(node))
114226 + return node;
114227 + }
114228 + return NULL;
114229 +}
114230 +
114231 +static inline struct cgraph_node *cgraph_next_function_with_gimple_body(struct cgraph_node *node)
114232 +{
114233 + for (node = node->next; node; node = node->next) {
114234 + if (cgraph_function_with_gimple_body_p(node))
114235 + return node;
114236 + }
114237 + return NULL;
114238 +}
114239 +
114240 +#define FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) \
114241 + for ((node) = cgraph_first_function_with_gimple_body (); (node); \
114242 + (node) = cgraph_next_function_with_gimple_body (node))
114243 +
114244 +#endif
114245 +
114246 +// Main entry point of the ipa pass: erases the plf flag of all stmts and iterates over all the functions
114247 +static unsigned int search_function(void)
114248 +{
114249 + struct cgraph_node *node;
114250 + struct visited *visited = NULL;
114251 +
114252 + FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) {
114253 +#if BUILDING_GCC_VERSION <= 4007
114254 + set_current_function_decl(node->decl);
114255 +#else
114256 + set_current_function_decl(node->symbol.decl);
114257 +#endif
114258 + set_plf_false();
114259 + unset_current_function_decl();
114260 + }
114261 +
114262 + FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) {
114263 + gcc_assert(cgraph_function_flags_ready);
114264 +#if BUILDING_GCC_VERSION <= 4007
114265 + gcc_assert(node->reachable);
114266 +#endif
114267 +
114268 + visited = handle_function(node, NULL, visited);
114269 + }
114270 +
114271 + free_visited(visited);
114272 + return 0;
114273 +}
114274 +
114275 +static struct ipa_opt_pass_d pass_ipa = {
114276 + .pass = {
114277 + .type = SIMPLE_IPA_PASS,
114278 + .name = "size_overflow",
114279 +#if BUILDING_GCC_VERSION >= 4008
114280 + .optinfo_flags = OPTGROUP_NONE,
114281 +#endif
114282 + .gate = NULL,
114283 + .execute = search_function,
114284 + .sub = NULL,
114285 + .next = NULL,
114286 + .static_pass_number = 0,
114287 + .tv_id = TV_NONE,
114288 + .properties_required = 0,
114289 + .properties_provided = 0,
114290 + .properties_destroyed = 0,
114291 + .todo_flags_start = 0,
114292 + .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,
114293 + },
114294 + .generate_summary = NULL,
114295 + .write_summary = NULL,
114296 + .read_summary = NULL,
114297 +#if BUILDING_GCC_VERSION >= 4006
114298 + .write_optimization_summary = NULL,
114299 + .read_optimization_summary = NULL,
114300 +#endif
114301 + .stmt_fixup = NULL,
114302 + .function_transform_todo_flags_start = 0,
114303 + .function_transform = NULL,
114304 + .variable_transform = NULL,
114305 +};
114306 +
114307 +// data for the size_overflow asm stmt
114308 +struct asm_data {
114309 + gimple def_stmt;
114310 + tree input;
114311 + tree output;
114312 +};
114313 +
114314 +#if BUILDING_GCC_VERSION <= 4007
114315 +static VEC(tree, gc) *create_asm_io_list(tree string, tree io)
114316 +#else
114317 +static vec<tree, va_gc> *create_asm_io_list(tree string, tree io)
114318 +#endif
114319 +{
114320 + tree list;
114321 +#if BUILDING_GCC_VERSION <= 4007
114322 + VEC(tree, gc) *vec_list = NULL;
114323 +#else
114324 + vec<tree, va_gc> *vec_list = NULL;
114325 +#endif
114326 +
114327 + list = build_tree_list(NULL_TREE, string);
114328 + list = chainon(NULL_TREE, build_tree_list(list, io));
114329 +#if BUILDING_GCC_VERSION <= 4007
114330 + VEC_safe_push(tree, gc, vec_list, list);
114331 +#else
114332 + vec_safe_push(vec_list, list);
114333 +#endif
114334 + return vec_list;
114335 +}
114336 +
114337 +static void create_asm_stmt(const char *str, tree str_input, tree str_output, struct asm_data *asm_data)
114338 +{
114339 + gimple asm_stmt;
114340 + gimple_stmt_iterator gsi;
114341 +#if BUILDING_GCC_VERSION <= 4007
114342 + VEC(tree, gc) *input, *output = NULL;
114343 +#else
114344 + vec<tree, va_gc> *input, *output = NULL;
114345 +#endif
114346 +
114347 + input = create_asm_io_list(str_input, asm_data->input);
114348 +
114349 + if (asm_data->output)
114350 + output = create_asm_io_list(str_output, asm_data->output);
114351 +
114352 + asm_stmt = gimple_build_asm_vec(str, input, output, NULL, NULL);
114353 + gsi = gsi_for_stmt(asm_data->def_stmt);
114354 + gsi_insert_after(&gsi, asm_stmt, GSI_NEW_STMT);
114355 +
114356 + if (asm_data->output)
114357 + SSA_NAME_DEF_STMT(asm_data->output) = asm_stmt;
114358 +}
114359 +
114360 +static void replace_call_lhs(const struct asm_data *asm_data)
114361 +{
114362 + gimple_set_lhs(asm_data->def_stmt, asm_data->input);
114363 + update_stmt(asm_data->def_stmt);
114364 + SSA_NAME_DEF_STMT(asm_data->input) = asm_data->def_stmt;
114365 +}
114366 +
114367 +static enum mark search_intentional_phi(struct pointer_set_t *visited, const_tree result)
114368 +{
114369 + enum mark cur_fndecl_attr;
114370 + gimple phi = get_def_stmt(result);
114371 + unsigned int i, n = gimple_phi_num_args(phi);
114372 +
114373 + pointer_set_insert(visited, phi);
114374 + for (i = 0; i < n; i++) {
114375 + tree arg = gimple_phi_arg_def(phi, i);
114376 +
114377 + cur_fndecl_attr = search_intentional(visited, arg);
114378 + if (cur_fndecl_attr != MARK_NO)
114379 + return cur_fndecl_attr;
114380 + }
114381 + return MARK_NO;
114382 +}
114383 +
114384 +static enum mark search_intentional_binary(struct pointer_set_t *visited, const_tree lhs)
114385 +{
114386 + enum mark cur_fndecl_attr;
114387 + const_tree rhs1, rhs2;
114388 + gimple def_stmt = get_def_stmt(lhs);
114389 +
114390 + rhs1 = gimple_assign_rhs1(def_stmt);
114391 + rhs2 = gimple_assign_rhs2(def_stmt);
114392 +
114393 + cur_fndecl_attr = search_intentional(visited, rhs1);
114394 + if (cur_fndecl_attr != MARK_NO)
114395 + return cur_fndecl_attr;
114396 + return search_intentional(visited, rhs2);
114397 +}
114398 +
114399 +// Look up the intentional_overflow attribute on the caller and the callee functions.
114400 +static enum mark search_intentional(struct pointer_set_t *visited, const_tree lhs)
114401 +{
114402 + const_gimple def_stmt;
114403 +
114404 + if (TREE_CODE(lhs) != SSA_NAME)
114405 + return get_intentional_attr_type(lhs);
114406 +
114407 + def_stmt = get_def_stmt(lhs);
114408 + if (!def_stmt)
114409 + return MARK_NO;
114410 +
114411 + if (pointer_set_contains(visited, def_stmt))
114412 + return MARK_NO;
114413 +
114414 + switch (gimple_code(def_stmt)) {
114415 + case GIMPLE_NOP:
114416 + return search_intentional(visited, SSA_NAME_VAR(lhs));
114417 + case GIMPLE_ASM:
114418 + if (is_size_overflow_intentional_asm_turn_off(def_stmt))
114419 + return MARK_TURN_OFF;
114420 + return MARK_NO;
114421 + case GIMPLE_CALL:
114422 + return MARK_NO;
114423 + case GIMPLE_PHI:
114424 + return search_intentional_phi(visited, lhs);
114425 + case GIMPLE_ASSIGN:
114426 + switch (gimple_num_ops(def_stmt)) {
114427 + case 2:
114428 + return search_intentional(visited, gimple_assign_rhs1(def_stmt));
114429 + case 3:
114430 + return search_intentional_binary(visited, lhs);
114431 + }
114432 + case GIMPLE_RETURN:
114433 + return MARK_NO;
114434 + default:
114435 + debug_gimple_stmt((gimple)def_stmt);
114436 + error("%s: unknown gimple code", __func__);
114437 + gcc_unreachable();
114438 + }
114439 +}
114440 +
114441 +// Check the intentional_overflow attribute and create the asm comment string for the size_overflow asm stmt.
114442 +static enum mark check_intentional_attribute_gimple(const_tree arg, const_gimple stmt, unsigned int argnum)
114443 +{
114444 + const_tree fndecl;
114445 + struct pointer_set_t *visited;
114446 + enum mark cur_fndecl_attr, decl_attr = MARK_NO;
114447 +
114448 + fndecl = get_interesting_orig_fndecl(stmt, argnum);
114449 + if (is_end_intentional_intentional_attr(fndecl, argnum))
114450 + decl_attr = MARK_NOT_INTENTIONAL;
114451 + else if (is_yes_intentional_attr(fndecl, argnum))
114452 + decl_attr = MARK_YES;
114453 + else if (is_turn_off_intentional_attr(fndecl) || is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl))) {
114454 + return MARK_TURN_OFF;
114455 + }
114456 +
114457 + visited = pointer_set_create();
114458 + cur_fndecl_attr = search_intentional(visited, arg);
114459 + pointer_set_destroy(visited);
114460 +
114461 + switch (cur_fndecl_attr) {
114462 + case MARK_NO:
114463 + return MARK_NO;
114464 + case MARK_TURN_OFF:
114465 + return MARK_TURN_OFF;
114466 + default:
114467 + print_missing_intentional(decl_attr, cur_fndecl_attr, fndecl, argnum);
114468 + return MARK_YES;
114469 + }
114470 +}
114471 +
114472 +static void check_missing_size_overflow_attribute(tree var)
114473 +{
114474 + tree orig_fndecl;
114475 + unsigned int num;
114476 +
114477 + if (is_a_return_check(var))
114478 + orig_fndecl = DECL_ORIGIN(var);
114479 + else
114480 + orig_fndecl = DECL_ORIGIN(current_function_decl);
114481 +
114482 + num = get_function_num(var, orig_fndecl);
114483 + if (num == CANNOT_FIND_ARG)
114484 + return;
114485 +
114486 + is_missing_function(orig_fndecl, num);
114487 +}
114488 +
114489 +static void search_size_overflow_attribute_phi(struct pointer_set_t *visited, const_tree result)
114490 +{
114491 + gimple phi = get_def_stmt(result);
114492 + unsigned int i, n = gimple_phi_num_args(phi);
114493 +
114494 + pointer_set_insert(visited, phi);
114495 + for (i = 0; i < n; i++) {
114496 + tree arg = gimple_phi_arg_def(phi, i);
114497 +
114498 + search_size_overflow_attribute(visited, arg);
114499 + }
114500 +}
114501 +
114502 +static void search_size_overflow_attribute_binary(struct pointer_set_t *visited, const_tree lhs)
114503 +{
114504 + const_gimple def_stmt = get_def_stmt(lhs);
114505 + tree rhs1, rhs2;
114506 +
114507 + rhs1 = gimple_assign_rhs1(def_stmt);
114508 + rhs2 = gimple_assign_rhs2(def_stmt);
114509 +
114510 + search_size_overflow_attribute(visited, rhs1);
114511 + search_size_overflow_attribute(visited, rhs2);
114512 +}
114513 +
114514 +static void search_size_overflow_attribute(struct pointer_set_t *visited, tree lhs)
114515 +{
114516 + const_gimple def_stmt;
114517 +
114518 + if (TREE_CODE(lhs) == PARM_DECL) {
114519 + check_missing_size_overflow_attribute(lhs);
114520 + return;
114521 + }
114522 +
114523 + def_stmt = get_def_stmt(lhs);
114524 + if (!def_stmt)
114525 + return;
114526 +
114527 + if (pointer_set_insert(visited, def_stmt))
114528 + return;
114529 +
114530 + switch (gimple_code(def_stmt)) {
114531 + case GIMPLE_NOP:
114532 + return search_size_overflow_attribute(visited, SSA_NAME_VAR(lhs));
114533 + case GIMPLE_ASM:
114534 + return;
114535 + case GIMPLE_CALL: {
114536 + tree fndecl = gimple_call_fndecl(def_stmt);
114537 +
114538 + if (fndecl == NULL_TREE)
114539 + return;
114540 + check_missing_size_overflow_attribute(fndecl);
114541 + return;
114542 + }
114543 + case GIMPLE_PHI:
114544 + return search_size_overflow_attribute_phi(visited, lhs);
114545 + case GIMPLE_ASSIGN:
114546 + switch (gimple_num_ops(def_stmt)) {
114547 + case 2:
114548 + return search_size_overflow_attribute(visited, gimple_assign_rhs1(def_stmt));
114549 + case 3:
114550 + return search_size_overflow_attribute_binary(visited, lhs);
114551 + }
114552 + default:
114553 + debug_gimple_stmt((gimple)def_stmt);
114554 + error("%s: unknown gimple code", __func__);
114555 + gcc_unreachable();
114556 + }
114557 +}
114558 +
114559 +// Search missing entries in the hash table (invoked from the gimple pass)
114560 +static void search_missing_size_overflow_attribute_gimple(const_gimple stmt, unsigned int num)
114561 +{
114562 + tree fndecl = NULL_TREE;
114563 + tree lhs;
114564 + struct pointer_set_t *visited;
114565 +
114566 + if (is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl)))
114567 + return;
114568 +
114569 + if (num == 0) {
114570 + gcc_assert(gimple_code(stmt) == GIMPLE_RETURN);
114571 + lhs = gimple_return_retval(stmt);
114572 + } else {
114573 + gcc_assert(is_gimple_call(stmt));
114574 + lhs = gimple_call_arg(stmt, num - 1);
114575 + fndecl = gimple_call_fndecl(stmt);
114576 + }
114577 +
114578 + if (fndecl != NULL_TREE && is_turn_off_intentional_attr(DECL_ORIGIN(fndecl)))
114579 + return;
114580 +
114581 + visited = pointer_set_create();
114582 + search_size_overflow_attribute(visited, lhs);
114583 + pointer_set_destroy(visited);
114584 +}
114585 +
114586 +static void create_output_from_phi(gimple stmt, unsigned int argnum, struct asm_data *asm_data)
114587 +{
114588 + gimple_stmt_iterator gsi;
114589 + gimple assign;
114590 +
114591 + assign = gimple_build_assign(asm_data->input, asm_data->output);
114592 + gsi = gsi_for_stmt(stmt);
114593 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
114594 + asm_data->def_stmt = assign;
114595 +
114596 + asm_data->output = create_new_var(TREE_TYPE(asm_data->output));
114597 + asm_data->output = make_ssa_name(asm_data->output, stmt);
114598 + if (gimple_code(stmt) == GIMPLE_RETURN)
114599 + gimple_return_set_retval(stmt, asm_data->output);
114600 + else
114601 + gimple_call_set_arg(stmt, argnum - 1, asm_data->output);
114602 + update_stmt(stmt);
114603 +}
114604 +
114605 +static const char *convert_mark_to_str(enum mark mark)
114606 +{
114607 + switch (mark) {
114608 + case MARK_NO:
114609 + return OK_ASM_STR;
114610 + case MARK_YES:
114611 + case MARK_NOT_INTENTIONAL:
114612 + return YES_ASM_STR;
114613 + case MARK_TURN_OFF:
114614 + return TURN_OFF_ASM_STR;
114615 + }
114616 +
114617 + gcc_unreachable();
114618 +}
114619 +
114620 +/* Create the input of the size_overflow asm stmt.
114621 + * When the arg of the callee function is a parm_decl it creates this kind of size_overflow asm stmt:
114622 + * __asm__("# size_overflow MARK_YES" : : "rm" size_1(D));
114623 + * The input field in asm_data will be empty if there is no need for further size_overflow asm stmt insertion.
114624 + * otherwise create the input (for a phi stmt the output too) of the asm stmt.
114625 + */
114626 +static void create_asm_input(gimple stmt, unsigned int argnum, struct asm_data *asm_data)
114627 +{
114628 + if (!asm_data->def_stmt) {
114629 + asm_data->input = NULL_TREE;
114630 + return;
114631 + }
114632 +
114633 + gcc_assert(!is_size_overflow_intentional_asm_turn_off(asm_data->def_stmt));
114634 +
114635 + asm_data->input = create_new_var(TREE_TYPE(asm_data->output));
114636 + asm_data->input = make_ssa_name(asm_data->input, asm_data->def_stmt);
114637 +
114638 + switch (gimple_code(asm_data->def_stmt)) {
114639 + case GIMPLE_ASSIGN:
114640 + case GIMPLE_CALL:
114641 + replace_call_lhs(asm_data);
114642 + break;
114643 + case GIMPLE_PHI:
114644 + create_output_from_phi(stmt, argnum, asm_data);
114645 + break;
114646 + case GIMPLE_NOP: {
114647 + enum mark mark;
114648 + const char *str;
114649 +
114650 + mark = check_intentional_attribute_gimple(asm_data->output, stmt, argnum);
114651 + str = convert_mark_to_str(mark);
114652 +
114653 + asm_data->input = asm_data->output;
114654 + asm_data->output = NULL;
114655 + asm_data->def_stmt = stmt;
114656 +
114657 + create_asm_stmt(str, build_string(2, "rm"), NULL, asm_data);
114658 + asm_data->input = NULL_TREE;
114659 + break;
114660 + }
114661 + case GIMPLE_ASM:
114662 + if (is_size_overflow_asm(asm_data->def_stmt)) {
114663 + asm_data->input = NULL_TREE;
114664 + break;
114665 + }
114666 + default:
114667 + debug_gimple_stmt(asm_data->def_stmt);
114668 + gcc_unreachable();
114669 + }
114670 +}
114671 +
114672 +/* This is the gimple part of searching for a missing size_overflow attribute. If the intentional_overflow attribute type
114673 + * is of the right kind create the appropriate size_overflow asm stmts:
114674 + * __asm__("# size_overflow" : =rm" D.3344_8 : "0" cicus.4_16);
114675 + * __asm__("# size_overflow MARK_YES" : : "rm" size_1(D));
114676 + */
114677 +static void create_size_overflow_asm(gimple stmt, tree output_node, unsigned int argnum)
114678 +{
114679 + struct asm_data asm_data;
114680 + const char *str;
114681 + enum mark mark;
114682 +
114683 + if (is_gimple_constant(output_node))
114684 + return;
114685 +
114686 + asm_data.output = output_node;
114687 + mark = check_intentional_attribute_gimple(asm_data.output, stmt, argnum);
114688 + if (mark == MARK_TURN_OFF)
114689 + return;
114690 +
114691 + search_missing_size_overflow_attribute_gimple(stmt, argnum);
114692 +
114693 + asm_data.def_stmt = get_def_stmt(asm_data.output);
114694 + create_asm_input(stmt, argnum, &asm_data);
114695 + if (asm_data.input == NULL_TREE)
114696 + return;
114697 +
114698 + str = convert_mark_to_str(mark);
114699 + create_asm_stmt(str, build_string(1, "0"), build_string(3, "=rm"), &asm_data);
114700 +}
114701 +
114702 +// Determine the return value and insert the asm stmt to mark the return stmt.
114703 +static void insert_asm_ret(gimple stmt)
114704 +{
114705 + tree ret;
114706 +
114707 + ret = gimple_return_retval(stmt);
114708 + create_size_overflow_asm(stmt, ret, 0);
114709 +}
114710 +
114711 +// Determine the correct arg index and arg and insert the asm stmt to mark the stmt.
114712 +static void insert_asm_arg(gimple stmt, unsigned int orig_argnum)
114713 +{
114714 + tree arg;
114715 + unsigned int argnum;
114716 +
114717 + argnum = get_correct_arg_count(orig_argnum, gimple_call_fndecl(stmt));
114718 + gcc_assert(argnum != 0);
114719 + if (argnum == CANNOT_FIND_ARG)
114720 + return;
114721 +
114722 + arg = gimple_call_arg(stmt, argnum - 1);
114723 + gcc_assert(arg != NULL_TREE);
114724 + create_size_overflow_asm(stmt, arg, argnum);
114725 +}
114726 +
114727 +// If a function arg or the return value is marked by the size_overflow attribute then set its index in the array.
114728 +static void set_argnum_attribute(const_tree attr, bool *argnums)
114729 +{
114730 + unsigned int argnum;
114731 + tree attr_value;
114732 +
114733 + for (attr_value = TREE_VALUE(attr); attr_value; attr_value = TREE_CHAIN(attr_value)) {
114734 + argnum = TREE_INT_CST_LOW(TREE_VALUE(attr_value));
114735 + argnums[argnum] = true;
114736 + }
114737 +}
114738 +
114739 +// If a function arg or the return value is in the hash table then set its index in the array.
114740 +static void set_argnum_hash(tree fndecl, bool *argnums)
114741 +{
114742 + unsigned int num;
114743 + const struct size_overflow_hash *hash;
114744 +
114745 + hash = get_function_hash(DECL_ORIGIN(fndecl));
114746 + if (!hash)
114747 + return;
114748 +
114749 + for (num = 0; num <= MAX_PARAM; num++) {
114750 + if (!(hash->param & (1U << num)))
114751 + continue;
114752 +
114753 + argnums[num] = true;
114754 + }
114755 +}
114756 +
114757 +static bool is_all_the_argnums_empty(bool *argnums)
114758 +{
114759 + unsigned int i;
114760 +
114761 + for (i = 0; i <= MAX_PARAM; i++)
114762 + if (argnums[i])
114763 + return false;
114764 + return true;
114765 +}
114766 +
114767 +// Check whether the arguments or the return value of the function are in the hash table or are marked by the size_overflow attribute.
114768 +static void search_interesting_args(tree fndecl, bool *argnums)
114769 +{
114770 + const_tree attr;
114771 +
114772 + set_argnum_hash(fndecl, argnums);
114773 + if (!is_all_the_argnums_empty(argnums))
114774 + return;
114775 +
114776 + attr = lookup_attribute("size_overflow", DECL_ATTRIBUTES(fndecl));
114777 + if (attr && TREE_VALUE(attr))
114778 + set_argnum_attribute(attr, argnums);
114779 +}
114780 +
114781 +/*
114782 + * Look up the intentional_overflow attribute that turns off ipa based duplication
114783 + * on the callee function, if found insert an asm stmt with "MARK_TURN_OFF".
114784 + */
114785 +static bool create_mark_turn_off_asm(gimple stmt)
114786 +{
114787 + enum mark mark;
114788 + struct asm_data asm_data;
114789 + const_tree fndecl = gimple_call_fndecl(stmt);
114790 +
114791 + mark = get_intentional_attr_type(DECL_ORIGIN(fndecl));
114792 + if (mark != MARK_TURN_OFF)
114793 + return false;
114794 +
114795 + asm_data.def_stmt = stmt;
114796 + asm_data.output = gimple_call_lhs(stmt);
114797 +
114798 + if (asm_data.output == NULL_TREE) {
114799 + asm_data.input = gimple_call_arg(stmt, 0);
114800 + if (is_gimple_constant(asm_data.input))
114801 + return false;
114802 + asm_data.output = NULL;
114803 + create_asm_stmt(TURN_OFF_ASM_STR, build_string(2, "rm"), NULL, &asm_data);
114804 + return true;
114805 + }
114806 +
114807 + create_asm_input(stmt, 0, &asm_data);
114808 + gcc_assert(asm_data.input != NULL_TREE);
114809 +
114810 + create_asm_stmt(TURN_OFF_ASM_STR, build_string(1, "0"), build_string(3, "=rm"), &asm_data);
114811 + return true;
114812 +}
114813 +
114814 +// 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
114815 +static void handle_interesting_function(gimple stmt)
114816 +{
114817 + unsigned int argnum;
114818 + tree fndecl;
114819 + bool orig_argnums[MAX_PARAM + 1] = {false};
114820 +
114821 + if (gimple_call_num_args(stmt) == 0)
114822 + return;
114823 + fndecl = gimple_call_fndecl(stmt);
114824 + if (fndecl == NULL_TREE)
114825 + return;
114826 + fndecl = DECL_ORIGIN(fndecl);
114827 +
114828 + if (create_mark_turn_off_asm(stmt))
114829 + return;
114830 +
114831 + search_interesting_args(fndecl, orig_argnums);
114832 +
114833 + for (argnum = 1; argnum < MAX_PARAM; argnum++)
114834 + if (orig_argnums[argnum])
114835 + insert_asm_arg(stmt, argnum);
114836 +}
114837 +
114838 +// 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
114839 +static void handle_interesting_ret(gimple stmt)
114840 +{
114841 + bool orig_argnums[MAX_PARAM + 1] = {false};
114842 +
114843 + search_interesting_args(current_function_decl, orig_argnums);
114844 +
114845 + if (orig_argnums[0])
114846 + insert_asm_ret(stmt);
114847 +}
114848 +
114849 +// Iterate over all the stmts and search for call and return stmts and mark them if they're in the hash table
114850 +static unsigned int search_interesting_functions(void)
114851 +{
114852 + basic_block bb;
114853 +
114854 + FOR_ALL_BB(bb) {
114855 + gimple_stmt_iterator gsi;
114856 +
114857 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
114858 + gimple stmt = gsi_stmt(gsi);
114859 +
114860 + if (is_size_overflow_asm(stmt))
114861 + continue;
114862 +
114863 + if (is_gimple_call(stmt))
114864 + handle_interesting_function(stmt);
114865 + else if (gimple_code(stmt) == GIMPLE_RETURN)
114866 + handle_interesting_ret(stmt);
114867 + }
114868 + }
114869 + return 0;
114870 +}
114871 +
114872 +/*
114873 + * A lot of functions get inlined before the ipa passes so after the build_ssa gimple pass
114874 + * this pass inserts asm stmts to mark the interesting args
114875 + * that the ipa pass will detect and insert the size overflow checks for.
114876 + */
114877 +static struct gimple_opt_pass insert_size_overflow_asm_pass = {
114878 + .pass = {
114879 + .type = GIMPLE_PASS,
114880 + .name = "insert_size_overflow_asm",
114881 +#if BUILDING_GCC_VERSION >= 4008
114882 + .optinfo_flags = OPTGROUP_NONE,
114883 +#endif
114884 + .gate = NULL,
114885 + .execute = search_interesting_functions,
114886 + .sub = NULL,
114887 + .next = NULL,
114888 + .static_pass_number = 0,
114889 + .tv_id = TV_NONE,
114890 + .properties_required = PROP_cfg,
114891 + .properties_provided = 0,
114892 + .properties_destroyed = 0,
114893 + .todo_flags_start = 0,
114894 + .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
114895 + }
114896 +};
114897 +
114898 +// Create the noreturn report_size_overflow() function decl.
114899 +static void start_unit_callback(void __unused *gcc_data, void __unused *user_data)
114900 +{
114901 + tree fntype;
114902 +
114903 + const_char_ptr_type_node = build_pointer_type(build_type_variant(char_type_node, 1, 0));
114904 +
114905 + // void report_size_overflow(const char *loc_file, unsigned int loc_line, const char *current_func, const char *ssa_var)
114906 + fntype = build_function_type_list(void_type_node,
114907 + const_char_ptr_type_node,
114908 + unsigned_type_node,
114909 + const_char_ptr_type_node,
114910 + const_char_ptr_type_node,
114911 + NULL_TREE);
114912 + report_size_overflow_decl = build_fn_decl("report_size_overflow", fntype);
114913 +
114914 + DECL_ASSEMBLER_NAME(report_size_overflow_decl);
114915 + TREE_PUBLIC(report_size_overflow_decl) = 1;
114916 + DECL_EXTERNAL(report_size_overflow_decl) = 1;
114917 + DECL_ARTIFICIAL(report_size_overflow_decl) = 1;
114918 + TREE_THIS_VOLATILE(report_size_overflow_decl) = 1;
114919 +}
114920 +
114921 +static unsigned int dump_functions(void)
114922 +{
114923 + struct cgraph_node *node;
114924 +
114925 + FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) {
114926 + basic_block bb;
114927 +
114928 +#if BUILDING_GCC_VERSION <= 4007
114929 + push_cfun(DECL_STRUCT_FUNCTION(node->decl));
114930 + current_function_decl = node->decl;
114931 +#else
114932 + push_cfun(DECL_STRUCT_FUNCTION(node->symbol.decl));
114933 + current_function_decl = node->symbol.decl;
114934 +#endif
114935 +
114936 + fprintf(stderr, "-----------------------------------------\n%s\n-----------------------------------------\n", NAME(current_function_decl));
114937 +
114938 + FOR_ALL_BB(bb) {
114939 + gimple_stmt_iterator si;
114940 +
114941 + fprintf(stderr, "<bb %u>:\n", bb->index);
114942 + for (si = gsi_start_phis(bb); !gsi_end_p(si); gsi_next(&si))
114943 + debug_gimple_stmt(gsi_stmt(si));
114944 + for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
114945 + debug_gimple_stmt(gsi_stmt(si));
114946 + fprintf(stderr, "\n");
114947 + }
114948 +
114949 + fprintf(stderr, "-------------------------------------------------------------------------\n");
114950 +
114951 + pop_cfun();
114952 + current_function_decl = NULL_TREE;
114953 + }
114954 +
114955 + fprintf(stderr, "###############################################################################\n");
114956 +
114957 + return 0;
114958 +}
114959 +
114960 +static struct ipa_opt_pass_d pass_dump = {
114961 + .pass = {
114962 + .type = SIMPLE_IPA_PASS,
114963 + .name = "dump",
114964 +#if BUILDING_GCC_VERSION >= 4008
114965 + .optinfo_flags = OPTGROUP_NONE,
114966 +#endif
114967 + .gate = NULL,
114968 + .execute = dump_functions,
114969 + .sub = NULL,
114970 + .next = NULL,
114971 + .static_pass_number = 0,
114972 + .tv_id = TV_NONE,
114973 + .properties_required = 0,
114974 + .properties_provided = 0,
114975 + .properties_destroyed = 0,
114976 + .todo_flags_start = 0,
114977 + .todo_flags_finish = 0,
114978 + },
114979 + .generate_summary = NULL,
114980 + .write_summary = NULL,
114981 + .read_summary = NULL,
114982 +#if BUILDING_GCC_VERSION >= 4006
114983 + .write_optimization_summary = NULL,
114984 + .read_optimization_summary = NULL,
114985 +#endif
114986 + .stmt_fixup = NULL,
114987 + .function_transform_todo_flags_start = 0,
114988 + .function_transform = NULL,
114989 + .variable_transform = NULL,
114990 +};
114991 +
114992 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
114993 +{
114994 + int i;
114995 + const char * const plugin_name = plugin_info->base_name;
114996 + const int argc = plugin_info->argc;
114997 + const struct plugin_argument * const argv = plugin_info->argv;
114998 + bool enable = true;
114999 +
115000 + struct register_pass_info insert_size_overflow_asm_pass_info = {
115001 + .pass = &insert_size_overflow_asm_pass.pass,
115002 + .reference_pass_name = "ssa",
115003 + .ref_pass_instance_number = 1,
115004 + .pos_op = PASS_POS_INSERT_AFTER
115005 + };
115006 +
115007 + struct register_pass_info __unused dump_before_pass_info = {
115008 + .pass = &pass_dump.pass,
115009 + .reference_pass_name = "increase_alignment",
115010 + .ref_pass_instance_number = 1,
115011 + .pos_op = PASS_POS_INSERT_BEFORE
115012 + };
115013 +
115014 + struct register_pass_info ipa_pass_info = {
115015 + .pass = &pass_ipa.pass,
115016 + .reference_pass_name = "increase_alignment",
115017 + .ref_pass_instance_number = 1,
115018 + .pos_op = PASS_POS_INSERT_BEFORE
115019 + };
115020 +
115021 + struct register_pass_info __unused dump_after_pass_info = {
115022 + .pass = &pass_dump.pass,
115023 + .reference_pass_name = "increase_alignment",
115024 + .ref_pass_instance_number = 1,
115025 + .pos_op = PASS_POS_INSERT_BEFORE
115026 + };
115027 +
115028 + if (!plugin_default_version_check(version, &gcc_version)) {
115029 + error(G_("incompatible gcc/plugin versions"));
115030 + return 1;
115031 + }
115032 +
115033 + for (i = 0; i < argc; ++i) {
115034 + if (!strcmp(argv[i].key, "no-size-overflow")) {
115035 + enable = false;
115036 + continue;
115037 + }
115038 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
115039 + }
115040 +
115041 + register_callback(plugin_name, PLUGIN_INFO, NULL, &size_overflow_plugin_info);
115042 + if (enable) {
115043 + register_callback("start_unit", PLUGIN_START_UNIT, &start_unit_callback, NULL);
115044 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &insert_size_overflow_asm_pass_info);
115045 +// register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dump_before_pass_info);
115046 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &ipa_pass_info);
115047 +// register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dump_after_pass_info);
115048 + }
115049 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
115050 +
115051 + return 0;
115052 +}
115053 diff --git a/tools/gcc/stackleak_plugin.c b/tools/gcc/stackleak_plugin.c
115054 new file mode 100644
115055 index 0000000..ac2901e
115056 --- /dev/null
115057 +++ b/tools/gcc/stackleak_plugin.c
115058 @@ -0,0 +1,327 @@
115059 +/*
115060 + * Copyright 2011-2013 by the PaX Team <pageexec@freemail.hu>
115061 + * Licensed under the GPL v2
115062 + *
115063 + * Note: the choice of the license means that the compilation process is
115064 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
115065 + * but for the kernel it doesn't matter since it doesn't link against
115066 + * any of the gcc libraries
115067 + *
115068 + * gcc plugin to help implement various PaX features
115069 + *
115070 + * - track lowest stack pointer
115071 + *
115072 + * TODO:
115073 + * - initialize all local variables
115074 + *
115075 + * BUGS:
115076 + * - none known
115077 + */
115078 +#include "gcc-plugin.h"
115079 +#include "config.h"
115080 +#include "system.h"
115081 +#include "coretypes.h"
115082 +#include "tree.h"
115083 +#include "tree-pass.h"
115084 +#include "flags.h"
115085 +#include "intl.h"
115086 +#include "toplev.h"
115087 +#include "plugin.h"
115088 +//#include "expr.h" where are you...
115089 +#include "diagnostic.h"
115090 +#include "plugin-version.h"
115091 +#include "tm.h"
115092 +#include "function.h"
115093 +#include "basic-block.h"
115094 +#include "gimple.h"
115095 +#include "rtl.h"
115096 +#include "emit-rtl.h"
115097 +
115098 +#if BUILDING_GCC_VERSION >= 4008
115099 +#define TODO_dump_func 0
115100 +#endif
115101 +
115102 +extern void print_gimple_stmt(FILE *, gimple, int, int);
115103 +
115104 +int plugin_is_GPL_compatible;
115105 +
115106 +static int track_frame_size = -1;
115107 +static const char track_function[] = "pax_track_stack";
115108 +static const char check_function[] = "pax_check_alloca";
115109 +static bool init_locals;
115110 +
115111 +static struct plugin_info stackleak_plugin_info = {
115112 + .version = "201302112000",
115113 + .help = "track-lowest-sp=nn\ttrack sp in functions whose frame size is at least nn bytes\n"
115114 +// "initialize-locals\t\tforcibly initialize all stack frames\n"
115115 +};
115116 +
115117 +static bool gate_stackleak_track_stack(void);
115118 +static unsigned int execute_stackleak_tree_instrument(void);
115119 +static unsigned int execute_stackleak_final(void);
115120 +
115121 +static struct gimple_opt_pass stackleak_tree_instrument_pass = {
115122 + .pass = {
115123 + .type = GIMPLE_PASS,
115124 + .name = "stackleak_tree_instrument",
115125 +#if BUILDING_GCC_VERSION >= 4008
115126 + .optinfo_flags = OPTGROUP_NONE,
115127 +#endif
115128 + .gate = gate_stackleak_track_stack,
115129 + .execute = execute_stackleak_tree_instrument,
115130 + .sub = NULL,
115131 + .next = NULL,
115132 + .static_pass_number = 0,
115133 + .tv_id = TV_NONE,
115134 + .properties_required = PROP_gimple_leh | PROP_cfg,
115135 + .properties_provided = 0,
115136 + .properties_destroyed = 0,
115137 + .todo_flags_start = 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
115138 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa
115139 + }
115140 +};
115141 +
115142 +static struct rtl_opt_pass stackleak_final_rtl_opt_pass = {
115143 + .pass = {
115144 + .type = RTL_PASS,
115145 + .name = "stackleak_final",
115146 +#if BUILDING_GCC_VERSION >= 4008
115147 + .optinfo_flags = OPTGROUP_NONE,
115148 +#endif
115149 + .gate = gate_stackleak_track_stack,
115150 + .execute = execute_stackleak_final,
115151 + .sub = NULL,
115152 + .next = NULL,
115153 + .static_pass_number = 0,
115154 + .tv_id = TV_NONE,
115155 + .properties_required = 0,
115156 + .properties_provided = 0,
115157 + .properties_destroyed = 0,
115158 + .todo_flags_start = 0,
115159 + .todo_flags_finish = TODO_dump_func
115160 + }
115161 +};
115162 +
115163 +static bool gate_stackleak_track_stack(void)
115164 +{
115165 + return track_frame_size >= 0;
115166 +}
115167 +
115168 +static void stackleak_check_alloca(gimple_stmt_iterator *gsi)
115169 +{
115170 + gimple check_alloca;
115171 + tree fntype, fndecl, alloca_size;
115172 +
115173 + fntype = build_function_type_list(void_type_node, long_unsigned_type_node, NULL_TREE);
115174 + fndecl = build_fn_decl(check_function, fntype);
115175 + DECL_ASSEMBLER_NAME(fndecl); // for LTO
115176 +
115177 + // insert call to void pax_check_alloca(unsigned long size)
115178 + alloca_size = gimple_call_arg(gsi_stmt(*gsi), 0);
115179 + check_alloca = gimple_build_call(fndecl, 1, alloca_size);
115180 + gsi_insert_before(gsi, check_alloca, GSI_SAME_STMT);
115181 +}
115182 +
115183 +static void stackleak_add_instrumentation(gimple_stmt_iterator *gsi)
115184 +{
115185 + gimple track_stack;
115186 + tree fntype, fndecl;
115187 +
115188 + fntype = build_function_type_list(void_type_node, NULL_TREE);
115189 + fndecl = build_fn_decl(track_function, fntype);
115190 + DECL_ASSEMBLER_NAME(fndecl); // for LTO
115191 +
115192 + // insert call to void pax_track_stack(void)
115193 + track_stack = gimple_build_call(fndecl, 0);
115194 + gsi_insert_after(gsi, track_stack, GSI_CONTINUE_LINKING);
115195 +}
115196 +
115197 +#if BUILDING_GCC_VERSION == 4005
115198 +static bool gimple_call_builtin_p(gimple stmt, enum built_in_function code)
115199 +{
115200 + tree fndecl;
115201 +
115202 + if (!is_gimple_call(stmt))
115203 + return false;
115204 + fndecl = gimple_call_fndecl(stmt);
115205 + if (!fndecl)
115206 + return false;
115207 + if (DECL_BUILT_IN_CLASS(fndecl) != BUILT_IN_NORMAL)
115208 + return false;
115209 +// print_node(stderr, "pax", fndecl, 4);
115210 + return DECL_FUNCTION_CODE(fndecl) == code;
115211 +}
115212 +#endif
115213 +
115214 +static bool is_alloca(gimple stmt)
115215 +{
115216 + if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA))
115217 + return true;
115218 +
115219 +#if BUILDING_GCC_VERSION >= 4007
115220 + if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA_WITH_ALIGN))
115221 + return true;
115222 +#endif
115223 +
115224 + return false;
115225 +}
115226 +
115227 +static unsigned int execute_stackleak_tree_instrument(void)
115228 +{
115229 + basic_block bb, entry_bb;
115230 + bool prologue_instrumented = false, is_leaf = true;
115231 +
115232 + entry_bb = ENTRY_BLOCK_PTR_FOR_FUNCTION(cfun)->next_bb;
115233 +
115234 + // 1. loop through BBs and GIMPLE statements
115235 + FOR_EACH_BB(bb) {
115236 + gimple_stmt_iterator gsi;
115237 +
115238 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
115239 + gimple stmt;
115240 +
115241 + stmt = gsi_stmt(gsi);
115242 +
115243 + if (is_gimple_call(stmt))
115244 + is_leaf = false;
115245 +
115246 + // gimple match: align 8 built-in BUILT_IN_NORMAL:BUILT_IN_ALLOCA attributes <tree_list 0xb7576450>
115247 + if (!is_alloca(stmt))
115248 + continue;
115249 +
115250 + // 2. insert stack overflow check before each __builtin_alloca call
115251 + stackleak_check_alloca(&gsi);
115252 +
115253 + // 3. insert track call after each __builtin_alloca call
115254 + stackleak_add_instrumentation(&gsi);
115255 + if (bb == entry_bb)
115256 + prologue_instrumented = true;
115257 + }
115258 + }
115259 +
115260 + // special cases for some bad linux code: taking the address of static inline functions will materialize them
115261 + // but we mustn't instrument some of them as the resulting stack alignment required by the function call ABI
115262 + // will break other assumptions regarding the expected (but not otherwise enforced) register clobbering ABI.
115263 + // case in point: native_save_fl on amd64 when optimized for size clobbers rdx if it were instrumented here.
115264 + if (is_leaf && !TREE_PUBLIC(current_function_decl) && DECL_DECLARED_INLINE_P(current_function_decl))
115265 + return 0;
115266 + if (is_leaf && !strncmp(IDENTIFIER_POINTER(DECL_NAME(current_function_decl)), "_paravirt_", 10))
115267 + return 0;
115268 +
115269 + // 4. insert track call at the beginning
115270 + if (!prologue_instrumented) {
115271 + gimple_stmt_iterator gsi;
115272 +
115273 + bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest;
115274 + if (dom_info_available_p(CDI_DOMINATORS))
115275 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR);
115276 + gsi = gsi_start_bb(bb);
115277 + stackleak_add_instrumentation(&gsi);
115278 + }
115279 +
115280 + return 0;
115281 +}
115282 +
115283 +static unsigned int execute_stackleak_final(void)
115284 +{
115285 + rtx insn, next;
115286 +
115287 + if (cfun->calls_alloca)
115288 + return 0;
115289 +
115290 + // keep calls only if function frame is big enough
115291 + if (get_frame_size() >= track_frame_size)
115292 + return 0;
115293 +
115294 + // 1. find pax_track_stack calls
115295 + for (insn = get_insns(); insn; insn = next) {
115296 + // 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))
115297 + rtx body;
115298 +
115299 + next = NEXT_INSN(insn);
115300 + if (!CALL_P(insn))
115301 + continue;
115302 + body = PATTERN(insn);
115303 + if (GET_CODE(body) != CALL)
115304 + continue;
115305 + body = XEXP(body, 0);
115306 + if (GET_CODE(body) != MEM)
115307 + continue;
115308 + body = XEXP(body, 0);
115309 + if (GET_CODE(body) != SYMBOL_REF)
115310 + continue;
115311 + if (strcmp(XSTR(body, 0), track_function))
115312 + continue;
115313 +// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
115314 + // 2. delete call
115315 + delete_insn_and_edges(insn);
115316 +#if BUILDING_GCC_VERSION >= 4007
115317 + if (GET_CODE(next) == NOTE && NOTE_KIND(next) == NOTE_INSN_CALL_ARG_LOCATION) {
115318 + insn = next;
115319 + next = NEXT_INSN(insn);
115320 + delete_insn_and_edges(insn);
115321 + }
115322 +#endif
115323 + }
115324 +
115325 +// print_simple_rtl(stderr, get_insns());
115326 +// print_rtl(stderr, get_insns());
115327 +// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
115328 +
115329 + return 0;
115330 +}
115331 +
115332 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
115333 +{
115334 + const char * const plugin_name = plugin_info->base_name;
115335 + const int argc = plugin_info->argc;
115336 + const struct plugin_argument * const argv = plugin_info->argv;
115337 + int i;
115338 + struct register_pass_info stackleak_tree_instrument_pass_info = {
115339 + .pass = &stackleak_tree_instrument_pass.pass,
115340 +// .reference_pass_name = "tree_profile",
115341 + .reference_pass_name = "optimized",
115342 + .ref_pass_instance_number = 1,
115343 + .pos_op = PASS_POS_INSERT_BEFORE
115344 + };
115345 + struct register_pass_info stackleak_final_pass_info = {
115346 + .pass = &stackleak_final_rtl_opt_pass.pass,
115347 + .reference_pass_name = "final",
115348 + .ref_pass_instance_number = 1,
115349 + .pos_op = PASS_POS_INSERT_BEFORE
115350 + };
115351 +
115352 + if (!plugin_default_version_check(version, &gcc_version)) {
115353 + error(G_("incompatible gcc/plugin versions"));
115354 + return 1;
115355 + }
115356 +
115357 + register_callback(plugin_name, PLUGIN_INFO, NULL, &stackleak_plugin_info);
115358 +
115359 + for (i = 0; i < argc; ++i) {
115360 + if (!strcmp(argv[i].key, "track-lowest-sp")) {
115361 + if (!argv[i].value) {
115362 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
115363 + continue;
115364 + }
115365 + track_frame_size = atoi(argv[i].value);
115366 + if (argv[i].value[0] < '0' || argv[i].value[0] > '9' || track_frame_size < 0)
115367 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
115368 + continue;
115369 + }
115370 + if (!strcmp(argv[i].key, "initialize-locals")) {
115371 + if (argv[i].value) {
115372 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
115373 + continue;
115374 + }
115375 + init_locals = true;
115376 + continue;
115377 + }
115378 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
115379 + }
115380 +
115381 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_tree_instrument_pass_info);
115382 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_final_pass_info);
115383 +
115384 + return 0;
115385 +}
115386 diff --git a/tools/gcc/structleak_plugin.c b/tools/gcc/structleak_plugin.c
115387 new file mode 100644
115388 index 0000000..4fae911
115389 --- /dev/null
115390 +++ b/tools/gcc/structleak_plugin.c
115391 @@ -0,0 +1,277 @@
115392 +/*
115393 + * Copyright 2013 by PaX Team <pageexec@freemail.hu>
115394 + * Licensed under the GPL v2
115395 + *
115396 + * Note: the choice of the license means that the compilation process is
115397 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
115398 + * but for the kernel it doesn't matter since it doesn't link against
115399 + * any of the gcc libraries
115400 + *
115401 + * gcc plugin to forcibly initialize certain local variables that could
115402 + * otherwise leak kernel stack to userland if they aren't properly initialized
115403 + * by later code
115404 + *
115405 + * Homepage: http://pax.grsecurity.net/
115406 + *
115407 + * Usage:
115408 + * $ # for 4.5/4.6/C based 4.7
115409 + * $ 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
115410 + * $ # for C++ based 4.7/4.8+
115411 + * $ 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
115412 + * $ gcc -fplugin=./structleak_plugin.so test.c -O2
115413 + *
115414 + * TODO: eliminate redundant initializers
115415 + * increase type coverage
115416 + */
115417 +
115418 +#include "gcc-plugin.h"
115419 +#include "config.h"
115420 +#include "system.h"
115421 +#include "coretypes.h"
115422 +#include "tree.h"
115423 +#include "tree-pass.h"
115424 +#include "intl.h"
115425 +#include "plugin-version.h"
115426 +#include "tm.h"
115427 +#include "toplev.h"
115428 +#include "function.h"
115429 +#include "tree-flow.h"
115430 +#include "plugin.h"
115431 +#include "gimple.h"
115432 +#include "diagnostic.h"
115433 +#include "cfgloop.h"
115434 +#include "langhooks.h"
115435 +
115436 +#if BUILDING_GCC_VERSION >= 4008
115437 +#define TODO_dump_func 0
115438 +#endif
115439 +
115440 +#define NAME(node) IDENTIFIER_POINTER(DECL_NAME(node))
115441 +
115442 +// unused type flag in all versions 4.5-4.8
115443 +#define TYPE_USERSPACE(TYPE) TYPE_LANG_FLAG_3(TYPE)
115444 +
115445 +int plugin_is_GPL_compatible;
115446 +void debug_gimple_stmt(gimple gs);
115447 +
115448 +static struct plugin_info structleak_plugin_info = {
115449 + .version = "201304082245",
115450 + .help = "disable\tdo not activate plugin\n",
115451 +};
115452 +
115453 +static tree handle_user_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
115454 +{
115455 + *no_add_attrs = true;
115456 +
115457 + // check for types? for now accept everything linux has to offer
115458 + if (TREE_CODE(*node) != FIELD_DECL)
115459 + return NULL_TREE;
115460 +
115461 + *no_add_attrs = false;
115462 + return NULL_TREE;
115463 +}
115464 +
115465 +static struct attribute_spec user_attr = {
115466 + .name = "user",
115467 + .min_length = 0,
115468 + .max_length = 0,
115469 + .decl_required = false,
115470 + .type_required = false,
115471 + .function_type_required = false,
115472 + .handler = handle_user_attribute,
115473 +#if BUILDING_GCC_VERSION >= 4007
115474 + .affects_type_identity = true
115475 +#endif
115476 +};
115477 +
115478 +static void register_attributes(void *event_data, void *data)
115479 +{
115480 + register_attribute(&user_attr);
115481 +// register_attribute(&force_attr);
115482 +}
115483 +
115484 +static tree get_field_type(tree field)
115485 +{
115486 + return strip_array_types(TREE_TYPE(field));
115487 +}
115488 +
115489 +static bool is_userspace_type(tree type)
115490 +{
115491 + tree field;
115492 +
115493 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
115494 + tree fieldtype = get_field_type(field);
115495 + enum tree_code code = TREE_CODE(fieldtype);
115496 +
115497 + if (code == RECORD_TYPE || code == UNION_TYPE)
115498 + if (is_userspace_type(fieldtype))
115499 + return true;
115500 +
115501 + if (lookup_attribute("user", DECL_ATTRIBUTES(field)))
115502 + return true;
115503 + }
115504 + return false;
115505 +}
115506 +
115507 +static void finish_type(void *event_data, void *data)
115508 +{
115509 + tree type = (tree)event_data;
115510 +
115511 + if (TYPE_USERSPACE(type))
115512 + return;
115513 +
115514 + if (is_userspace_type(type))
115515 + TYPE_USERSPACE(type) = 1;
115516 +}
115517 +
115518 +static void initialize(tree var)
115519 +{
115520 + basic_block bb;
115521 + gimple_stmt_iterator gsi;
115522 + tree initializer;
115523 + gimple init_stmt;
115524 +
115525 + // this is the original entry bb before the forced split
115526 + // TODO: check further BBs in case more splits occured before us
115527 + bb = ENTRY_BLOCK_PTR->next_bb->next_bb;
115528 +
115529 + // first check if the variable is already initialized, warn otherwise
115530 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
115531 + gimple stmt = gsi_stmt(gsi);
115532 + tree rhs1;
115533 +
115534 + // we're looking for an assignment of a single rhs...
115535 + if (!gimple_assign_single_p(stmt))
115536 + continue;
115537 + rhs1 = gimple_assign_rhs1(stmt);
115538 +#if BUILDING_GCC_VERSION >= 4007
115539 + // ... of a non-clobbering expression...
115540 + if (TREE_CLOBBER_P(rhs1))
115541 + continue;
115542 +#endif
115543 + // ... to our variable...
115544 + if (gimple_get_lhs(stmt) != var)
115545 + continue;
115546 + // if it's an initializer then we're good
115547 + if (TREE_CODE(rhs1) == CONSTRUCTOR)
115548 + return;
115549 + }
115550 +
115551 + // these aren't the 0days you're looking for
115552 +// inform(DECL_SOURCE_LOCATION(var), "userspace variable will be forcibly initialized");
115553 +
115554 + // build the initializer expression
115555 + initializer = build_constructor(TREE_TYPE(var), NULL);
115556 +
115557 + // build the initializer stmt
115558 + init_stmt = gimple_build_assign(var, initializer);
115559 + gsi = gsi_start_bb(ENTRY_BLOCK_PTR->next_bb);
115560 + gsi_insert_before(&gsi, init_stmt, GSI_NEW_STMT);
115561 + update_stmt(init_stmt);
115562 +}
115563 +
115564 +static unsigned int handle_function(void)
115565 +{
115566 + basic_block bb;
115567 + unsigned int ret = 0;
115568 + tree var;
115569 +
115570 +#if BUILDING_GCC_VERSION == 4005
115571 + tree vars;
115572 +#else
115573 + unsigned int i;
115574 +#endif
115575 +
115576 + // split the first bb where we can put the forced initializers
115577 + bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest;
115578 + if (dom_info_available_p(CDI_DOMINATORS))
115579 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR);
115580 +
115581 + // enumarate all local variables and forcibly initialize our targets
115582 +#if BUILDING_GCC_VERSION == 4005
115583 + for (vars = cfun->local_decls; vars; vars = TREE_CHAIN(vars)) {
115584 + var = TREE_VALUE(vars);
115585 +#else
115586 + FOR_EACH_LOCAL_DECL(cfun, i, var) {
115587 +#endif
115588 + tree type = TREE_TYPE(var);
115589 +
115590 + gcc_assert(DECL_P(var));
115591 + if (!auto_var_in_fn_p(var, current_function_decl))
115592 + continue;
115593 +
115594 + // only care about structure types
115595 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
115596 + continue;
115597 +
115598 + // if the type is of interest, examine the variable
115599 + if (TYPE_USERSPACE(type))
115600 + initialize(var);
115601 + }
115602 +
115603 + return ret;
115604 +}
115605 +
115606 +static struct gimple_opt_pass structleak_pass = {
115607 + .pass = {
115608 + .type = GIMPLE_PASS,
115609 + .name = "structleak",
115610 +#if BUILDING_GCC_VERSION >= 4008
115611 + .optinfo_flags = OPTGROUP_NONE,
115612 +#endif
115613 + .gate = NULL,
115614 + .execute = handle_function,
115615 + .sub = NULL,
115616 + .next = NULL,
115617 + .static_pass_number = 0,
115618 + .tv_id = TV_NONE,
115619 + .properties_required = PROP_cfg,
115620 + .properties_provided = 0,
115621 + .properties_destroyed = 0,
115622 + .todo_flags_start = 0,
115623 + .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
115624 + }
115625 +};
115626 +
115627 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
115628 +{
115629 + int i;
115630 + const char * const plugin_name = plugin_info->base_name;
115631 + const int argc = plugin_info->argc;
115632 + const struct plugin_argument * const argv = plugin_info->argv;
115633 + bool enable = true;
115634 +
115635 + struct register_pass_info structleak_pass_info = {
115636 + .pass = &structleak_pass.pass,
115637 + .reference_pass_name = "ssa",
115638 + .ref_pass_instance_number = 1,
115639 + .pos_op = PASS_POS_INSERT_AFTER
115640 + };
115641 +
115642 + if (!plugin_default_version_check(version, &gcc_version)) {
115643 + error(G_("incompatible gcc/plugin versions"));
115644 + return 1;
115645 + }
115646 +
115647 + if (strcmp(lang_hooks.name, "GNU C")) {
115648 + inform(UNKNOWN_LOCATION, G_("%s supports C only"), plugin_name);
115649 + enable = false;
115650 + }
115651 +
115652 + for (i = 0; i < argc; ++i) {
115653 + if (!strcmp(argv[i].key, "disable")) {
115654 + enable = false;
115655 + continue;
115656 + }
115657 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
115658 + }
115659 +
115660 + register_callback(plugin_name, PLUGIN_INFO, NULL, &structleak_plugin_info);
115661 + if (enable) {
115662 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &structleak_pass_info);
115663 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
115664 + }
115665 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
115666 +
115667 + return 0;
115668 +}
115669 diff --git a/tools/lib/lk/Makefile b/tools/lib/lk/Makefile
115670 index 3dba0a4..97175dc 100644
115671 --- a/tools/lib/lk/Makefile
115672 +++ b/tools/lib/lk/Makefile
115673 @@ -13,7 +13,7 @@ LIB_OBJS += $(OUTPUT)debugfs.o
115674
115675 LIBFILE = liblk.a
115676
115677 -CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC
115678 +CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC
115679 EXTLIBS = -lelf -lpthread -lrt -lm
115680 ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
115681 ALL_LDFLAGS = $(LDFLAGS)
115682 diff --git a/tools/perf/util/include/asm/alternative-asm.h b/tools/perf/util/include/asm/alternative-asm.h
115683 index 6789d78..4afd019e 100644
115684 --- a/tools/perf/util/include/asm/alternative-asm.h
115685 +++ b/tools/perf/util/include/asm/alternative-asm.h
115686 @@ -5,4 +5,7 @@
115687
115688 #define altinstruction_entry #
115689
115690 + .macro pax_force_retaddr rip=0, reload=0
115691 + .endm
115692 +
115693 #endif
115694 diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h
115695 index 96b919d..c49bb74 100644
115696 --- a/tools/perf/util/include/linux/compiler.h
115697 +++ b/tools/perf/util/include/linux/compiler.h
115698 @@ -18,4 +18,12 @@
115699 #define __force
115700 #endif
115701
115702 +#ifndef __size_overflow
115703 +# define __size_overflow(...)
115704 +#endif
115705 +
115706 +#ifndef __intentional_overflow
115707 +# define __intentional_overflow(...)
115708 +#endif
115709 +
115710 #endif
115711 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
115712 index aac732d..bc87a5d 100644
115713 --- a/virt/kvm/kvm_main.c
115714 +++ b/virt/kvm/kvm_main.c
115715 @@ -75,12 +75,17 @@ LIST_HEAD(vm_list);
115716
115717 static cpumask_var_t cpus_hardware_enabled;
115718 static int kvm_usage_count = 0;
115719 -static atomic_t hardware_enable_failed;
115720 +static atomic_unchecked_t hardware_enable_failed;
115721
115722 struct kmem_cache *kvm_vcpu_cache;
115723 EXPORT_SYMBOL_GPL(kvm_vcpu_cache);
115724
115725 -static __read_mostly struct preempt_ops kvm_preempt_ops;
115726 +static void kvm_sched_in(struct preempt_notifier *pn, int cpu);
115727 +static void kvm_sched_out(struct preempt_notifier *pn, struct task_struct *next);
115728 +static struct preempt_ops kvm_preempt_ops = {
115729 + .sched_in = kvm_sched_in,
115730 + .sched_out = kvm_sched_out,
115731 +};
115732
115733 struct dentry *kvm_debugfs_dir;
115734
115735 @@ -749,7 +754,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
115736 /* We can read the guest memory with __xxx_user() later on. */
115737 if ((mem->slot < KVM_USER_MEM_SLOTS) &&
115738 ((mem->userspace_addr & (PAGE_SIZE - 1)) ||
115739 - !access_ok(VERIFY_WRITE,
115740 + !__access_ok(VERIFY_WRITE,
115741 (void __user *)(unsigned long)mem->userspace_addr,
115742 mem->memory_size)))
115743 goto out;
115744 @@ -1613,8 +1618,17 @@ EXPORT_SYMBOL_GPL(kvm_read_guest_cached);
115745
115746 int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len)
115747 {
115748 - return kvm_write_guest_page(kvm, gfn, (const void *) empty_zero_page,
115749 - offset, len);
115750 + int r;
115751 + unsigned long addr;
115752 +
115753 + addr = gfn_to_hva(kvm, gfn);
115754 + if (kvm_is_error_hva(addr))
115755 + return -EFAULT;
115756 + r = __clear_user((void __user *)addr + offset, len);
115757 + if (r)
115758 + return -EFAULT;
115759 + mark_page_dirty(kvm, gfn);
115760 + return 0;
115761 }
115762 EXPORT_SYMBOL_GPL(kvm_clear_guest_page);
115763
115764 @@ -1867,7 +1881,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp)
115765 return 0;
115766 }
115767
115768 -static struct file_operations kvm_vcpu_fops = {
115769 +static file_operations_no_const kvm_vcpu_fops __read_only = {
115770 .release = kvm_vcpu_release,
115771 .unlocked_ioctl = kvm_vcpu_ioctl,
115772 #ifdef CONFIG_COMPAT
115773 @@ -2553,7 +2567,7 @@ static int kvm_vm_mmap(struct file *file, struct vm_area_struct *vma)
115774 return 0;
115775 }
115776
115777 -static struct file_operations kvm_vm_fops = {
115778 +static file_operations_no_const kvm_vm_fops __read_only = {
115779 .release = kvm_vm_release,
115780 .unlocked_ioctl = kvm_vm_ioctl,
115781 #ifdef CONFIG_COMPAT
115782 @@ -2654,7 +2668,7 @@ out:
115783 return r;
115784 }
115785
115786 -static struct file_operations kvm_chardev_ops = {
115787 +static file_operations_no_const kvm_chardev_ops __read_only = {
115788 .unlocked_ioctl = kvm_dev_ioctl,
115789 .compat_ioctl = kvm_dev_ioctl,
115790 .llseek = noop_llseek,
115791 @@ -2680,7 +2694,7 @@ static void hardware_enable_nolock(void *junk)
115792
115793 if (r) {
115794 cpumask_clear_cpu(cpu, cpus_hardware_enabled);
115795 - atomic_inc(&hardware_enable_failed);
115796 + atomic_inc_unchecked(&hardware_enable_failed);
115797 printk(KERN_INFO "kvm: enabling virtualization on "
115798 "CPU%d failed\n", cpu);
115799 }
115800 @@ -2734,10 +2748,10 @@ static int hardware_enable_all(void)
115801
115802 kvm_usage_count++;
115803 if (kvm_usage_count == 1) {
115804 - atomic_set(&hardware_enable_failed, 0);
115805 + atomic_set_unchecked(&hardware_enable_failed, 0);
115806 on_each_cpu(hardware_enable_nolock, NULL, 1);
115807
115808 - if (atomic_read(&hardware_enable_failed)) {
115809 + if (atomic_read_unchecked(&hardware_enable_failed)) {
115810 hardware_disable_all_nolock();
115811 r = -EBUSY;
115812 }
115813 @@ -3171,7 +3185,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
115814 kvm_arch_vcpu_put(vcpu);
115815 }
115816
115817 -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
115818 +int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
115819 struct module *module)
115820 {
115821 int r;
115822 @@ -3218,7 +3232,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
115823 if (!vcpu_align)
115824 vcpu_align = __alignof__(struct kvm_vcpu);
115825 kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align,
115826 - 0, NULL);
115827 + SLAB_USERCOPY, NULL);
115828 if (!kvm_vcpu_cache) {
115829 r = -ENOMEM;
115830 goto out_free_3;
115831 @@ -3228,9 +3242,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
115832 if (r)
115833 goto out_free;
115834
115835 + pax_open_kernel();
115836 kvm_chardev_ops.owner = module;
115837 kvm_vm_fops.owner = module;
115838 kvm_vcpu_fops.owner = module;
115839 + pax_close_kernel();
115840
115841 r = misc_register(&kvm_dev);
115842 if (r) {
115843 @@ -3240,9 +3256,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
115844
115845 register_syscore_ops(&kvm_syscore_ops);
115846
115847 - kvm_preempt_ops.sched_in = kvm_sched_in;
115848 - kvm_preempt_ops.sched_out = kvm_sched_out;
115849 -
115850 r = kvm_init_debug();
115851 if (r) {
115852 printk(KERN_ERR "kvm: create debugfs files failed\n");
Unofficial grsecurity patch archive (https://github.com/slashbeast/grsecurity-scrape)